diff --git a/Makefile b/Makefile
index e1730741ffa0..e89a5b11c790 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,6 @@
 #
 # $FreeBSD$
 #
-# Copyright (c) 2014 Kevin Lo. All rights reserved.
-#
-# 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 AUTHOR 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 AUTHOR 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.
-#
-
-S=     ${.CURDIR}/../../..
-
-.PATH: $S/dev/usb/misc
-
-KMOD=	uled
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
-	uled.c
-
-.include <bsd.kmod.mk>
-#
-# $FreeBSD$
-#
 # The user-driven targets are:
 #
 # universe            - *Really* build *everything* (buildworld and
diff --git a/Makefile.inc1 b/Makefile.inc1
index 98362bd5dfae..c3b6d197789a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -336,11 +336,11 @@ XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .else
 XFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
-.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
-.if ${TARGET_ARCH:M*eb*} == ""
-TARGET_ABI=	gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET} == "arm"
+.if ${TARGET_ARCH:M*hf*} != ""
 TARGET_ABI=	gnueabihf
+.else
+TARGET_ABI=	gnueabi
 .endif
 .endif
 TARGET_ABI?=	unknown
@@ -352,6 +352,7 @@ WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
+LIB32_OBJTREE=	${OBJTREE}${.CURDIR}/world32
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
 .if ${TARGET_ARCH} == "amd64"
@@ -387,7 +388,7 @@ LIB32FLAGS+=		--sysroot=${WORLDTMP}
 .endif
 
 # Yes, the flags are redundant.
-LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
+LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
@@ -611,7 +612,7 @@ build32:
 	cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor
@@ -910,7 +911,7 @@ packageworld:
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
-reinstall:
+reinstall: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
@@ -925,7 +926,7 @@ reinstall:
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
-redistribute:
+redistribute: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
@@ -935,7 +936,7 @@ redistribute:
 	    DISTRIBUTION=lib32
 .endif
 
-distrib-dirs distribution:
+distrib-dirs distribution: .MAKE
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
@@ -1463,7 +1464,7 @@ native-xtools: .MAKE
 #
 # hierarchy - ensure that all the needed directories are present
 #
-hierarchy hier:
+hierarchy hier: .MAKE
 	cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
 
 #
@@ -1530,7 +1531,9 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
+		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+		${_cddl_lib_libuutil} \
 		${_cddl_lib_libavl} \
 		${_cddl_lib_libzfs_core} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
@@ -1542,6 +1545,8 @@ gnu/lib/libstdc++__L: lib/msun__L
 gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
+lib/libgeom__L: lib/libexpat__L
+
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
 .if !defined(WITH_ATF)
 # Ensure that the ATF libraries will be built during make libraries, even
@@ -1579,9 +1584,11 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
+_cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib= cddl/lib
 cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+cddl/lib/libzfs__L: lib/libgeom__L
 .endif
 
 .if ${MK_CRYPT} != "no"
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index ede94fdd130e..3c4878b587de 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,14 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
+OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
+OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
+# 20140917: hv_kvpd rc.d script removed in favor of devd configuration
+OLD_FILES+=etc/rc.d/hv_kvpd
+# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
+OLD_LIBS+=usr/lib/libnv.a
+OLD_LIBS+=usr/lib/libnv.so.0
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7
@@ -1488,6 +1496,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libproc.so.2
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
diff --git a/UPDATING b/UPDATING
index cb00e10d167b..04fe7a66a427 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140923:
+	pjdfstest has been moved from tools/regression/pjdfstest to
+	contrib/pjdfstest .
+
+20140922:
+	At svn r271982, The default linux compat kernel ABI has been adjusted
+	to 2.6.18 in support of the linux-c6 compat ports infrastructure
+	update.  If you wish to continue using the linux-f10 compat ports,
+	add compat.linux.osrelease=2.6.16 to your local sysctl.conf.  Users are
+	encouraged to update their linux-compat packages to linux-c6 during
+	their next update cycle.
+
 20140729:
 	The ofwfb driver, used to provide a graphics console on PowerPC when
 	using vt(4), no longer allows mmap() of all of physical memory. This
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 9f305b4f5f04..fd345245eb0b 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -94,7 +94,7 @@ GENHDRS+= iconv.h
 SRCS+=	iconv_stub.c
 
 iconv.h: ${.CURDIR}/iconv_stub.h
-	cp ${.CURDIR}/iconv_stub.h ${.TARGET}
+	cp -f ${.CURDIR}/iconv_stub.h ${.TARGET}
 .endif
 .endif
 
diff --git a/bin/pkill/tests/pgrep-j_test.sh b/bin/pkill/tests/pgrep-j_test.sh
index 6656a9bd789f..6acfb4be35ad 100644
--- a/bin/pkill/tests/pgrep-j_test.sh
+++ b/bin/pkill/tests/pgrep-j_test.sh
@@ -1,7 +1,23 @@
 #!/bin/sh
 # $FreeBSD$
 
-base=`basename $0`
+jail_name_to_jid()
+{
+	local check_name="$1"
+	(
+		line="$(jls -n 2> /dev/null | grep  name=$check_name  )"
+		for nv in $line; do
+			local name="${nv%=*}"
+			if [ "${name}" = "jid" ]; then
+				eval $nv
+				echo $jid
+				break
+			fi
+		done
+	)
+}
+
+base=pgrep_j_test
 
 echo "1..3"
 
@@ -9,21 +25,25 @@ name="pgrep -j <jid>"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	jail / $base-1 127.0.0.1 $sleep 5 &
-	chpid=$!
-	jail / $base-2 127.0.0.1 $sleep 5 &
-	chpid2=$!
-	$sleep 5 &
-	chpid3=$!
-	sleep 0.5
-	jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
-	pid=`pgrep -f -j $jid $sleep`
-	if [ "$pid" = "$chpid" ]; then
+	jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+	    command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+
+	jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+	    command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+
+	jid1=$(jail_name_to_jid ${base}_1_1)
+	jid2=$(jail_name_to_jid ${base}_1_2)
+	jid="${jid1},${jid2}"
+	pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
+	pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+	    $(cat ${PWD}/${base}_1_2.pid) | sort)
+	if [ "$pid1" = "$pid2" ]; then
 		echo "ok 1 - $name"
 	else
 		echo "not ok 1 - $name"
 	fi
-	kill $chpid $chpid2 $chpid3
+	[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+	[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
 	rm -f $sleep
 else
 	echo "ok 1 - $name # skip Test needs uid 0."
@@ -33,21 +53,23 @@ name="pgrep -j any"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	jail / $base-1 127.0.0.1 $sleep 5 &
-	chpid=$!
-	jail / $base-2 127.0.0.1 $sleep 5 &
-	chpid2=$!
-	$sleep 5 &
-	chpid3=$!
-	sleep 0.5
-	pids=`pgrep -f -j any $sleep | sort`
-	refpids=`{ echo $chpid; echo $chpid2; } | sort`
-	if [ "$pids" = "$refpids" ]; then
+	jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+	    command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
+
+	jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+	    command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
+
+	sleep 2
+	pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
+	pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+	    $(cat ${PWD}/${base}_2_2.pid) | sort)
+	if [ "$pid1" = "$pid2" ]; then
 		echo "ok 2 - $name"
 	else
 		echo "not ok 2 - $name"
 	fi
-	kill $chpid $chpid2 $chpid3
+	[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+	[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
 	rm -f $sleep
 else
 	echo "ok 2 - $name # skip Test needs uid 0."
@@ -57,19 +79,19 @@ name="pgrep -j none"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	$sleep 5 &
-	chpid=$!
-	jail / $base 127.0.0.1 $sleep 5 &
-	chpid2=$!
-	sleep 0.5
-	pid=`pgrep -f -j none $sleep`
-	if [ "$pid" = "$chpid" ]; then
+	daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
+	jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+	    command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
+	sleep 2
+	pid="$(pgrep -f -x -j none "$sleep 5")"
+	if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
 		echo "ok 3 - $name"
 	else
 		echo "not ok 3 - $name"
 	fi
-	kill $chpid $chpid2
 	rm -f $sleep
+	[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 
+	[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) 
 else
 	echo "ok 3 - $name # skip Test needs uid 0."
 fi
diff --git a/bin/pkill/tests/pkill-j_test.sh b/bin/pkill/tests/pkill-j_test.sh
index 48e7c721bbec..a844149cedb0 100644
--- a/bin/pkill/tests/pkill-j_test.sh
+++ b/bin/pkill/tests/pkill-j_test.sh
@@ -1,7 +1,23 @@
 #!/bin/sh
 # $FreeBSD$
 
-base=`basename $0`
+jail_name_to_jid()
+{
+	local check_name="$1"
+	(
+		line="$(jls -n 2> /dev/null | grep  name=$check_name  )"
+		for nv in $line; do
+			local name="${nv%=*}"
+			if [ "${name}" = "jid" ]; then
+				eval $nv
+				echo $jid
+				break
+			fi
+		done
+	)
+}
+
+base=pkill_j_test
 
 echo "1..3"
 
@@ -9,21 +25,28 @@ name="pkill -j <jid>"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	jail / $base-1 127.0.0.1 $sleep 5 &
-	chpid=$!
-	jail / $base-2 127.0.0.1 $sleep 5 &
-	chpid2=$!
+        jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+            command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+
+        jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+            command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+
 	$sleep 5 &
-	chpid3=$!
 	sleep 0.5
-	jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
-	if pkill -f -j $jid $sleep && sleep 0.5 &&
-	    ! kill $chpid && kill $chpid2 $chpid3; then
+	jid1=$(jail_name_to_jid ${base}_1_1)
+	jid2=$(jail_name_to_jid ${base}_1_2)
+	jid="${jid1},${jid2}"
+	if pkill -f -j "$jid" $sleep && sleep 0.5 &&
+	    ! -f ${PWD}/${base}_1_1.pid &&
+	    ! -f ${PWD}/${base}_1_2.pid ; then
 		echo "ok 1 - $name"
 	else
 		echo "not ok 1 - $name"
 	fi 2>/dev/null
 	rm -f $sleep
+	[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+	[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+	wait
 else
 	echo "ok 1 - $name # skip Test needs uid 0."
 fi
@@ -32,20 +55,26 @@ name="pkill -j any"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	jail / $base-1 127.0.0.1 $sleep 5 &
-	chpid=$!
-	jail / $base-2 127.0.0.1 $sleep 5 &
-	chpid2=$!
+        jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+            command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
+
+        jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+            command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
+
 	$sleep 5 &
-	chpid3=$!
 	sleep 0.5
+	chpid3=$!
 	if pkill -f -j any $sleep && sleep 0.5 &&
-	    ! kill $chpid && ! kill $chpid2 && kill $chpid3; then
+	    [ ! -f ${PWD}/${base}_2_1.pid -a
+	      ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
 		echo "ok 2 - $name"
 	else
 		echo "not ok 2 - $name"
 	fi 2>/dev/null
 	rm -f $sleep
+	[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+	[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+	wait
 else
 	echo "ok 2 - $name # skip Test needs uid 0."
 fi
@@ -54,18 +83,20 @@ name="pkill -j none"
 if [ `id -u` -eq 0 ]; then
 	sleep=$(pwd)/sleep.txt
 	ln -sf /bin/sleep $sleep
-	$sleep 5 &
-	chpid=$!
-	jail / $base 127.0.0.1 $sleep 5 &
-	chpid2=$!
-	sleep 0.5
-	if pkill -f -j none $sleep && sleep 0.5 &&
-	    ! kill $chpid && kill $chpid2; then
+	daemon -p ${PWD}/${base}_3_1.pid $sleep 5
+	jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+            command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
+	sleep 1
+	if pkill -f -j none "$sleep 5" && sleep 1 &&
+	    [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
 		echo "ok 3 - $name"
 	else
+		ls ${PWD}/*.pid
 		echo "not ok 3 - $name"
 	fi 2>/dev/null
 	rm -f $sleep
+	[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
+	[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
 else
 	echo "ok 3 - $name # skip Test needs uid 0."
 fi
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 05cc1ebe606f..412f1442b08c 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -116,33 +116,6 @@ resetinput(void)
 }
 
 
-/*
- * Read a line from the script.
- */
-
-char *
-pfgets(char *line, int len)
-{
-	char *p = line;
-	int nleft = len;
-	int c;
-
-	while (--nleft > 0) {
-		c = pgetc_macro();
-		if (c == PEOF) {
-			if (p == line)
-				return NULL;
-			break;
-		}
-		*p++ = c;
-		if (c == '\n')
-			break;
-	}
-	*p = '\0';
-	return line;
-}
-
-
 
 /*
  * Read a character from the script, returning PEOF on end of file.
@@ -338,7 +311,7 @@ pungetc(void)
  * We handle aliases this way.
  */
 void
-pushstring(char *s, int len, struct alias *ap)
+pushstring(const char *s, int len, struct alias *ap)
 {
 	struct strpush *sp;
 
diff --git a/bin/sh/input.h b/bin/sh/input.h
index cc54eedb185a..cb0af77b4bbc 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -48,12 +48,11 @@ struct alias;
 struct parsefile;
 
 void resetinput(void);
-char *pfgets(char *, int);
 int pgetc(void);
 int preadbuffer(void);
 int preadateof(void);
 void pungetc(void);
-void pushstring(char *, int, struct alias *);
+void pushstring(const char *, int, struct alias *);
 void setinputfile(const char *, int);
 void setinputfd(int, int);
 void setinputstring(const char *, int);
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index e6e9f82ccfd7..f1f4e0713a88 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
  * Shell command parser.
  */
 
-#define	EOFMARKLEN	79
 #define	PROMPTLEN	128
 
 /* values of checkkwd variable */
@@ -718,7 +717,6 @@ parsefname(void)
 	if (n->type == NHERE) {
 		struct heredoc *here = heredoc;
 		struct heredoc *p;
-		int i;
 
 		if (quoteflag == 0)
 			n->type = NXHERE;
@@ -727,7 +725,7 @@ parsefname(void)
 			while (*wordtext == '\t')
 				wordtext++;
 		}
-		if (! noexpand(wordtext) || (i = strlen(wordtext)) == 0 || i > EOFMARKLEN)
+		if (! noexpand(wordtext))
 			synerror("Illegal eof marker for << redirection");
 		rmescapes(wordtext);
 		here->eofmark = wordtext;
@@ -945,6 +943,41 @@ struct tokenstate
 };
 
 
+/*
+ * Check to see whether we are at the end of the here document.  When this
+ * is called, c is set to the first character of the next input line.  If
+ * we are at the end of the here document, this routine sets the c to PEOF.
+ * The new value of c is returned.
+ */
+
+static int
+checkend(int c, const char *eofmark, int striptabs)
+{
+	if (striptabs) {
+		while (c == '\t')
+			c = pgetc();
+	}
+	if (c == *eofmark) {
+		int c2;
+		const char *q;
+
+		for (q = eofmark + 1; c2 = pgetc(), *q != '\0' && c2 == *q; q++)
+			;
+		if ((c2 == PEOF || c2 == '\n') && *q == '\0') {
+			c = PEOF;
+			if (c2 == '\n') {
+				plinno++;
+				needprompt = doprompt;
+			}
+		} else {
+			pungetc();
+			pushstring(eofmark + 1, q - (eofmark + 1), NULL);
+		}
+	}
+	return (c);
+}
+
+
 /*
  * Called to parse command substitutions.
  */
@@ -1246,6 +1279,13 @@ readcstyleesc(char *out)
 				c = pgetc();
 			if (c == PEOF)
 				synerror("Unterminated quoted string");
+			if (c == '\n') {
+				plinno++;
+				if (doprompt)
+					setprompt(2);
+				else
+					setprompt(0);
+			}
 		}
 		pungetc();
 		return out;
@@ -1269,7 +1309,6 @@ readcstyleesc(char *out)
  * will run code that appears at the end of readtoken1.
  */
 
-#define CHECKEND()	{goto checkend; checkend_return:;}
 #define PARSEREDIR()	{goto parseredir; parseredir_return:;}
 #define PARSESUB()	{goto parsesub; parsesub_return:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
@@ -1281,7 +1320,6 @@ readtoken1(int firstc, char const *initialsyntax, const char *eofmark,
 	int c = firstc;
 	char *out;
 	int len;
-	char line[EOFMARKLEN + 1];
 	struct nodelist *bqlist;
 	int quotef;
 	int newvarnest;
@@ -1303,7 +1341,9 @@ readtoken1(int firstc, char const *initialsyntax, const char *eofmark,
 
 	STARTSTACKSTR(out);
 	loop: {	/* for each line, until end of word */
-		CHECKEND();	/* set c to PEOF if at end of here document */
+		if (eofmark)
+			/* set c to PEOF if at end of here document */
+			c = checkend(c, eofmark, striptabs);
 		for (;;) {	/* until end of line or end of word */
 			CHECKSTRSPACE(4, out);	/* permit 4 calls to USTPUTC */
 
@@ -1483,40 +1523,6 @@ readtoken1(int firstc, char const *initialsyntax, const char *eofmark,
 /* end of readtoken routine */
 
 
-/*
- * Check to see whether we are at the end of the here document.  When this
- * is called, c is set to the first character of the next input line.  If
- * we are at the end of the here document, this routine sets the c to PEOF.
- */
-
-checkend: {
-	if (eofmark) {
-		if (striptabs) {
-			while (c == '\t')
-				c = pgetc();
-		}
-		if (c == *eofmark) {
-			if (pfgets(line, sizeof line) != NULL) {
-				const char *p, *q;
-
-				p = line;
-				for (q = eofmark + 1 ; *q && *p == *q ; p++, q++);
-				if ((*p == '\0' || *p == '\n') && *q == '\0') {
-					c = PEOF;
-					if (*p == '\n') {
-						plinno++;
-						needprompt = doprompt;
-					}
-				} else {
-					pushstring(line, strlen(line), NULL);
-				}
-			}
-		}
-	}
-	goto checkend_return;
-}
-
-
 /*
  * Parse a redirection operator.  The variable "out" points to a string
  * specifying the fd to be redirected.  The variable "c" contains the
@@ -1915,7 +1921,7 @@ char *
 getprompt(void *unused __unused)
 {
 	static char ps[PROMPTLEN];
-	char *fmt;
+	const char *fmt;
 	const char *pwd;
 	int i, trim;
 	static char internal_error[] = "??";
@@ -2029,7 +2035,7 @@ expandstr(const char *ps)
 		parser_temp = NULL;
 		setinputstring(ps, 1);
 		doprompt = 0;
-		readtoken1(pgetc(), DQSYNTAX, "\n\n", 0);
+		readtoken1(pgetc(), DQSYNTAX, "", 0);
 		if (backquotelist != NULL)
 			error("Command substitution not allowed here");
 
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 4679d455ec50..47b1b36c59f1 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd September 4, 2014
+.Dd September 21, 2014
 .Dt SH 1
 .Os
 .Sh NAME
@@ -590,7 +590,8 @@ the following actions:
 Leading words of the form
 .Dq Li name=value
 are stripped off and assigned to the environment of
-the simple command.
+the simple command
+(they do not affect expansions).
 Redirection operators and
 their arguments (as described below) are stripped
 off and saved for processing.
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
index 07c8098e22b7..d5d96b58a48c 100644
--- a/bin/sh/tests/builtins/Makefile
+++ b/bin/sh/tests/builtins/Makefile
@@ -100,6 +100,7 @@ FILES+=		jobid2.0
 FILES+=		kill1.0 kill2.0
 FILES+=		lineno.0 lineno.0.stdout
 FILES+=		lineno2.0
+FILES+=		lineno3.0 lineno3.0.stdout
 FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		local3.0
diff --git a/bin/sh/tests/builtins/lineno3.0 b/bin/sh/tests/builtins/lineno3.0
new file mode 100644
index 000000000000..eb8f9ab7db94
--- /dev/null
+++ b/bin/sh/tests/builtins/lineno3.0
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO
diff --git a/bin/sh/tests/builtins/lineno3.0.stdout b/bin/sh/tests/builtins/lineno3.0.stdout
new file mode 100644
index 000000000000..6e0e4ac8ca57
--- /dev/null
+++ b/bin/sh/tests/builtins/lineno3.0.stdout
@@ -0,0 +1,2 @@
+before: 3
+after: 6
diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
index 4b2e76dce51e..7b77cb8203c8 100644
--- a/bin/sh/tests/parser/Makefile
+++ b/bin/sh/tests/parser/Makefile
@@ -54,6 +54,7 @@ FILES+=		heredoc8.0
 FILES+=		heredoc9.0
 FILES+=		heredoc10.0
 FILES+=		heredoc11.0
+FILES+=		heredoc12.0
 FILES+=		no-space1.0
 FILES+=		no-space2.0
 FILES+=		only-redir1.0
diff --git a/bin/sh/tests/parser/heredoc12.0 b/bin/sh/tests/parser/heredoc12.0
new file mode 100644
index 000000000000..964838453237
--- /dev/null
+++ b/bin/sh/tests/parser/heredoc12.0
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+failures=0
+
+check() {
+	if ! eval "[ $* ]"; then
+		echo "Failed: $*"
+		: $((failures += 1))
+	fi
+}
+
+longmark=`printf %01000d 4`
+longmarkstripped=`printf %0999d 0`
+
+check '"$(cat <<'"$longmark
+$longmark"'
+echo yes)" = "yes"'
+
+check '"$(cat <<\'"$longmark
+$longmark"'
+echo yes)" = "yes"'
+
+check '"$(cat <<'"$longmark
+yes
+$longmark"'
+)" = "yes"'
+
+check '"$(cat <<\'"$longmark
+yes
+$longmark"'
+)" = "yes"'
+
+check '"$(cat <<'"$longmark
+$longmarkstripped
+$longmark.
+$longmark"'
+)" = "'"$longmarkstripped
+$longmark."'"'
+
+check '"$(cat <<\'"$longmark
+$longmarkstripped
+$longmark.
+$longmark"'
+)" = "'"$longmarkstripped
+$longmark."'"'
+
+exit $((failures != 0))
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index cc3a3112df7c..2d210a2cde84 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -277,6 +277,19 @@ Generate a header file containing macros that correspond to probes in the
 specified provider definitions.
 This option should be used to generate a header file that is included by other
 source files for later use with the
+.Fl G
+option.
+If the
+.Fl o
+option is present, the header file is saved using the pathname specified as the
+argument for that option.
+If the
+.Fl o
+option is not present and the DTrace program is contained within a file whose
+name is
+.Ar filename.d ,
+then the header file is saved using the name
+.Ar filename.h .
 .It Fl H
 Print the pathnames of included files when invoking
 .Xr cpp 1
@@ -289,20 +302,6 @@ option to each
 .Xr cpp 1
 invocation, causing it to display the list of pathnames, one for each line, to
 standard error.
-.Fl G
-option.
-If the
-.Fl o
-option
-is present, the header file is saved using the pathname specified as the
-argument for that option.
-If the
-.Fl o
-option is not present and the DTrace program is contained with a file whose
-name is
-.Ar filename.d ,
-then the header file is saved using the name
-.Ar filename.h .
 .It Fl i Ar probe-id Op Oo Ar predicate Oc Ar action
 Specify probe identifier
 .Ar ( probe-id )
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
index 4cbb866cfad7..3a954ed40482 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *arg)
 	if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
 		print_probe_info(&p);
 
+	if (g_intr != 0)
+		return (1);
+
 	return (0);
 }
 
@@ -1220,11 +1223,34 @@ intr(int signo)
 		g_impatient = 1;
 }
 
+static void
+installsighands(void)
+{
+	struct sigaction act, oact;
+
+	(void) sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	act.sa_handler = intr;
+
+	if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGINT, &act, NULL);
+
+	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGTERM, &act, NULL);
+
+#if !defined(sun)
+	if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGPIPE, &act, NULL);
+
+	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+		(void) sigaction(SIGUSR1, &act, NULL);
+#endif
+}
+
 int
 main(int argc, char *argv[])
 {
 	dtrace_bufdesc_t buf;
-	struct sigaction act, oact;
 	dtrace_status_t status[2];
 	dtrace_optval_t opt;
 	dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
 		if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
 			fatal("failed to open output file '%s'", g_ofile);
 
+		installsighands();
+
 		oprintf("%5s %10s %17s %33s %s\n",
 		    "ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
 
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
 	if (opt != DTRACEOPT_UNSET)
 		notice("allowing destructive actions\n");
 
-	(void) sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
-	act.sa_handler = intr;
-
-	if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGINT, &act, NULL);
-
-	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGTERM, &act, NULL);
-
-#if !defined(sun)
-	if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
-		(void) sigaction(SIGUSR1, &act, NULL);
-#endif
+	installsighands();
 
 	/*
 	 * Now that tracing is active and we are ready to consume trace data,
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
index 8dabbe6e33ac..bb571d2ea33e 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
@@ -34,14 +34,14 @@
  * leading underscores.
  */
 
-#pragma weak _go = go
-
 static int
 go(int a)
 {
 	return (a + 1);
 }
 
+#pragma weak _go = go
+
 static void
 handle(int sig)
 {
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
index 978cde3cf0ef..432a9fccb44f 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
@@ -29,6 +29,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"`
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }"
+rc=$?
 
 exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
index e64ed526ed37..d1b48769ba6c 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
@@ -30,6 +30,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" -p $pid
+rc=$?
 
 exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh
index d987c8da7a47..4eaf169f06dd 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh
@@ -31,7 +31,7 @@ dtrace=$1
 t="zelda_info_t"
 exe="tst.chasestrings.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
index 151a93676d6d..95b26c82d7ab 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
@@ -25,10 +25,10 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-t="season_7_lisa_the_vegetrian_t *"
+t="season_7_lisa_the_vegetarian_t *"
 exe="tst.aouttype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
@@ -37,7 +37,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid
 
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh
index 25028460db43..d754c194b4b4 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh
@@ -29,7 +29,7 @@ dtrace=$1
 t="zelda_info_t"
 exe="tst.chasestrings.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
index af7c6c8fe13a..233616619e7d 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
@@ -29,7 +29,7 @@ dtrace=$1
 t="int"
 exe="tst.libtype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -eq 0 ]]; then
 	echo "CTF exists in $exe, that's a bug" >&2
 	exit 1
@@ -38,7 +38,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid
 
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh
index febb0159185a..e5902faf2cb2 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh
@@ -28,7 +28,7 @@ dtrace=$1
 t="final_fantasy_info_t"
 exe="tst.printtype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh
index 7398dc41d9da..5e92cf924c2a 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh
@@ -29,7 +29,7 @@ dtrace=$1
 t="final_fantasy_info_t"
 exe="tst.printtype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh
index dfc15358290d..a93a3b8722c3 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh
@@ -28,7 +28,7 @@ dtrace=$1
 t="final_fantasy_info_t"
 exe="tst.printtype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh
index 025d4a8c02df..fa080a53f3ff 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh
@@ -29,7 +29,7 @@ dtrace=$1
 t="final_fantasy_info_t"
 exe="tst.printtype.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
index 58811ff6fb5a..54d975f63aff 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
@@ -29,7 +29,7 @@ dtrace=$1
 t="zelda_info_t"
 exe="tst.chasestrings.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
@@ -38,7 +38,7 @@ fi
 ./$exe &
 pid=$!
 
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
 typedef struct info {
         char    *zi_gamename;
         int     zi_ndungeons;
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh
index 79d79de8aec6..c5a105b3a55c 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh
@@ -28,7 +28,7 @@ fi
 dtrace=$1
 exe="tst.chasestrings.exe"
 
-elfdump "./$exe" | grep -q '.SUNW_ctf' 
+elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
 if [[ $? -ne 0 ]]; then
 	echo "CTF does not exist in $exe, that's a bug" >&2
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index 437b37413b9a..27e63a9438f4 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
@@ -414,7 +414,7 @@ or smaller can take advantage of this feature.
 When this feature is enabled, the contents of highly-compressible blocks are
 stored in the block "pointer" itself
 .Po a misnomer in this case, as it contains
-the compresseed data, rather than a pointer to its location on disk
+the compressed data, rather than a pointer to its location on disk
 .Pc .
 Thus
 the space of the block
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index fe731691d9e1..31340b053a7a 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -2857,10 +2857,7 @@ print_pool(zpool_handle_t *zhp, list_cbdata_t *cb)
 
 		right_justify = B_FALSE;
 		if (pl->pl_prop != ZPROP_INVAL) {
-			if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
-			    zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
-				propstr = "-";
-			else if (zpool_get_prop(zhp, pl->pl_prop, property,
+			if (zpool_get_prop(zhp, pl->pl_prop, property,
 			    sizeof (property), NULL, cb->cb_literal) != 0)
 				propstr = "-";
 			else
@@ -2894,21 +2891,37 @@ print_pool(zpool_handle_t *zhp, list_cbdata_t *cb)
 }
 
 static void
-print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted,
+    boolean_t valid)
 {
 	char propval[64];
 	boolean_t fixed;
 	size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
 
-
-	if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
-		(void) strlcpy(propval, "-", sizeof (propval));
-	else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
-		(void) strlcpy(propval, "-", sizeof (propval));
-	else if (prop == ZPOOL_PROP_FRAGMENTATION)
+	switch (prop) {
+	case ZPOOL_PROP_EXPANDSZ:
+		if (value == 0)
+			(void) strlcpy(propval, "-", sizeof (propval));
+		else
+			zfs_nicenum(value, propval, sizeof (propval));
+		break;
+	case ZPOOL_PROP_FRAGMENTATION:
+		if (value == ZFS_FRAG_INVALID) {
+			(void) strlcpy(propval, "-", sizeof (propval));
+		} else {
+			(void) snprintf(propval, sizeof (propval), "%llu%%",
+			    value);
+		}
+		break;
+	case ZPOOL_PROP_CAPACITY:
 		(void) snprintf(propval, sizeof (propval), "%llu%%", value);
-	else
+		break;
+	default:
 		zfs_nicenum(value, propval, sizeof (propval));
+	}
+
+	if (!valid)
+		(void) strlcpy(propval, "-", sizeof (propval));
 
 	if (scripted)
 		(void) printf("\t%s", propval);
@@ -2930,6 +2943,9 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
 	    (uint64_t **)&vs, &c) == 0);
 
 	if (name != NULL) {
+		boolean_t toplevel = (vs->vs_space != 0);
+		uint64_t cap;
+
 		if (scripted)
 			(void) printf("\t%s", name);
 		else if (strlen(name) + depth > cb->cb_namewidth)
@@ -2938,24 +2954,26 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
 			(void) printf("%*s%s%*s", depth, "", name,
 			    (int)(cb->cb_namewidth - strlen(name) - depth), "");
 
-		/* only toplevel vdevs have capacity stats */
-		if (vs->vs_space == 0) {
-			if (scripted)
-				(void) printf("\t-\t-\t-\t-");
-			else
-				(void) printf("      -      -      -      -");
-		} else {
-			print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
-			    scripted);
-			print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
-			    scripted);
-			print_one_column(ZPOOL_PROP_FREE,
-			    vs->vs_space - vs->vs_alloc, scripted);
-			print_one_column(ZPOOL_PROP_FRAGMENTATION,
-			    vs->vs_fragmentation, scripted);
-		}
-		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
-		    scripted);
+		/*
+		 * Print the properties for the individual vdevs. Some
+		 * properties are only applicable to toplevel vdevs. The
+		 * 'toplevel' boolean value is passed to the print_one_column()
+		 * to indicate that the value is valid.
+		 */
+		print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted,
+		    toplevel);
+		print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted,
+		    toplevel);
+		print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc,
+		    scripted, toplevel);
+		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted,
+		    B_TRUE);
+		print_one_column(ZPOOL_PROP_FRAGMENTATION,
+		    vs->vs_fragmentation, scripted,
+		    (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel));
+		cap = (vs->vs_space == 0) ? 0 :
+		    (vs->vs_alloc * 100 / vs->vs_space);
+		print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel);
 		(void) printf("\n");
 	}
 
@@ -3024,7 +3042,8 @@ list_callback(zpool_handle_t *zhp, void *data)
  *	-H	Scripted mode.  Don't display headers, and separate properties
  *		by a single tab.
  *	-o	List of properties to display.  Defaults to
- *		"name,size,allocated,free,capacity,health,altroot"
+ *		"name,size,allocated,free,expandsize,fragmentation,capacity,"
+ *		"dedupratio,health,altroot"
  * 	-p	Diplay values in parsable (exact) format.
  *	-T	Display a timestamp in date(1) or Unix format
  *
@@ -3038,7 +3057,7 @@ zpool_do_list(int argc, char **argv)
 	int ret;
 	list_cbdata_t cb = { 0 };
 	static char default_props[] =
-	    "name,size,allocated,free,fragmentation,expandsize,capacity,"
+	    "name,size,allocated,free,expandsize,fragmentation,capacity,"
 	    "dedupratio,health,altroot";
 	char *props = default_props;
 	unsigned long interval = 0, count = 0;
@@ -4524,7 +4543,8 @@ is_root_pool(zpool_handle_t *zhp)
 }
 
 static void
-root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size) {
+root_pool_upgrade_check(zpool_handle_t *zhp, char *poolname, int size)
+{
 
 	if (poolname[0] == '\0' && is_root_pool(zhp))
 		(void) strlcpy(poolname, zpool_get_name(zhp), size);
@@ -4623,7 +4643,7 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
 #ifdef __FreeBSD__
 		root_pool_upgrade_check(zhp, cbp->cb_poolname,
 		    sizeof(cbp->cb_poolname));
-#endif	/* ___FreeBSD__ */
+#endif	/* __FreeBSD__ */
 		printnl = B_TRUE;
 
 #ifdef illumos
@@ -4647,6 +4667,10 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
 		if (count > 0) {
 			cbp->cb_first = B_FALSE;
 			printnl = B_TRUE;
+#ifdef __FreeBSD__
+			root_pool_upgrade_check(zhp, cbp->cb_poolname,
+			    sizeof(cbp->cb_poolname));
+#endif	/* __FreeBSD__ */
 			/*
 			 * If they did "zpool upgrade -a", then we could
 			 * be doing ioctls to different pools.  We need
@@ -4788,7 +4812,7 @@ upgrade_one(zpool_handle_t *zhp, void *data)
 #ifdef __FreeBSD__
 		root_pool_upgrade_check(zhp, cbp->cb_poolname,
 		    sizeof(cbp->cb_poolname));
-#endif	/* ___FreeBSD__ */
+#endif	/* __FreeBSD__ */
 	}
 
 	if (cbp->cb_version >= SPA_VERSION_FEATURES) {
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
index 374798b5e72d..e974b7519b02 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 /*
@@ -652,6 +653,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 			dontreport = 0;
 			vdev_size = -1ULL;
 			for (c = 0; c < children; c++) {
+				boolean_t is_replacing, is_spare;
 				nvlist_t *cnv = child[c];
 				char *path;
 				struct stat64 statbuf;
@@ -668,16 +670,19 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 				 * If this is a replacing or spare vdev, then
 				 * get the real first child of the vdev.
 				 */
-				if (strcmp(childtype,
-				    VDEV_TYPE_REPLACING) == 0 ||
-				    strcmp(childtype, VDEV_TYPE_SPARE) == 0) {
+				is_replacing = strcmp(childtype,
+				    VDEV_TYPE_REPLACING) == 0;
+				is_spare = strcmp(childtype,
+				    VDEV_TYPE_SPARE) == 0;
+				if (is_replacing || is_spare) {
 					nvlist_t **rchild;
 					uint_t rchildren;
 
 					verify(nvlist_lookup_nvlist_array(cnv,
 					    ZPOOL_CONFIG_CHILDREN, &rchild,
 					    &rchildren) == 0);
-					assert(rchildren == 2);
+					assert((is_replacing && rchildren == 2)
+					    || (is_spare && rchildren >= 2));
 					cnv = rchild[0];
 
 					verify(nvlist_lookup_string(cnv,
@@ -1068,8 +1073,8 @@ is_spare(nvlist_t *config, const char *path)
  * Go through and find any devices that are in use.  We rely on libdiskmgt for
  * the majority of this task.
  */
-static int
-check_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
+static boolean_t
+is_device_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
     boolean_t replacing, boolean_t isspare)
 {
 	nvlist_t **child;
@@ -1078,6 +1083,7 @@ check_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
 	int ret;
 	char buf[MAXPATHLEN];
 	uint64_t wholedisk;
+	boolean_t anyinuse = B_FALSE;
 
 	verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0);
 
@@ -1102,38 +1108,37 @@ check_in_use(nvlist_t *config, nvlist_t *nv, boolean_t force,
 				(void) strlcpy(buf, path, sizeof (buf));
 
 			if (is_spare(config, buf))
-				return (0);
+				return (B_FALSE);
 		}
 
 		if (strcmp(type, VDEV_TYPE_DISK) == 0)
 			ret = check_device(path, force, isspare);
-
-		if (strcmp(type, VDEV_TYPE_FILE) == 0)
+		else if (strcmp(type, VDEV_TYPE_FILE) == 0)
 			ret = check_file(path, force, isspare);
 
-		return (ret);
+		return (ret != 0);
 	}
 
 	for (c = 0; c < children; c++)
-		if ((ret = check_in_use(config, child[c], force,
-		    replacing, B_FALSE)) != 0)
-			return (ret);
+		if (is_device_in_use(config, child[c], force, replacing,
+		    B_FALSE))
+			anyinuse = B_TRUE;
 
 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_SPARES,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = check_in_use(config, child[c], force,
-			    replacing, B_TRUE)) != 0)
-				return (ret);
+			if (is_device_in_use(config, child[c], force, replacing,
+			    B_TRUE))
+				anyinuse = B_TRUE;
 
 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_L2CACHE,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = check_in_use(config, child[c], force,
-			    replacing, B_FALSE)) != 0)
-				return (ret);
+			if (is_device_in_use(config, child[c], force, replacing,
+			    B_FALSE))
+				anyinuse = B_TRUE;
 
-	return (0);
+	return (anyinuse);
 }
 
 static const char *
@@ -1487,7 +1492,7 @@ make_root_vdev(zpool_handle_t *zhp, int force, int check_rep,
 	 * uses (such as a dedicated dump device) that even '-f' cannot
 	 * override.
 	 */
-	if (check_in_use(poolconfig, newroot, force, replacing, B_FALSE) != 0) {
+	if (is_device_in_use(poolconfig, newroot, force, replacing, B_FALSE)) {
 		nvlist_free(newroot);
 		return (NULL);
 	}
diff --git a/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c b/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
index 0df44cfda938..58222670f4ff 100644
--- a/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
+++ b/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
@@ -274,7 +274,7 @@ ctf_fdopen(int fd, int *errp)
 	 */
 	if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) &&
 	    bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) {
-#ifdef	_BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 		uchar_t order = ELFDATA2MSB;
 #else
 		uchar_t order = ELFDATA2LSB;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c b/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
index bb02d8cf499a..ccd4f9b7fb8d 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
@@ -90,36 +90,6 @@ dprintf(int debug, const char *fmt, ...)
 	va_end(ap);
 }
 
-#if !defined(sun)
-static void
-fixsymbol(Elf *e, Elf_Data *data, size_t idx, int nprobes, char *buf,
-    dof_sec_t *sec, int *fixedprobes, char *dofstrtab)
-{
-	GElf_Sym sym;
-	char *s;
-	unsigned char *funcname;
-	dof_probe_t *prb;
-	int j = 0;
-	int ndx;
-
-	while (gelf_getsym(data, j++, &sym) != NULL) {
-		prb = (dof_probe_t *)(void *)(buf + sec->dofs_offset);
-
-		for (ndx = nprobes; ndx; ndx--, prb += 1) {
-			funcname = dofstrtab + prb->dofpr_func;
-			s = elf_strptr(e, idx, sym.st_name);
-			if (strcmp(s, funcname) == 0) {
-				dprintf(1, "fixing %s() symbol\n", s);
-				prb->dofpr_addr = sym.st_value;
-				(*fixedprobes)++;
-			}
-		}
-		if (*fixedprobes == nprobes)
-			break;
-	}
-}
-#endif
-
 #if defined(sun)
 #pragma init(dtrace_dof_init)
 #else
@@ -145,24 +115,18 @@ dtrace_dof_init(void)
 	Lmid_t lmid;
 #else
 	u_long lmid = 0;
-	dof_sec_t *sec, *secstart, *dofstrtab, *dofprobes;
-	dof_provider_t *dofprovider;
-	size_t i;
 #endif
 	int fd;
 	const char *p;
 #if !defined(sun)
 	Elf *e;
 	Elf_Scn *scn = NULL;
-	Elf_Data *symtabdata = NULL, *dynsymdata = NULL, *dofdata = NULL;
+	Elf_Data *dofdata = NULL;
 	dof_hdr_t *dof_next = NULL;
 	GElf_Shdr shdr;
-	int efd, nprobes;
+	int efd;
 	char *s;
-	char *dofstrtabraw;
-	size_t shstridx, symtabidx = 0, dynsymidx = 0;
-	unsigned char *buf;
-	int fixedprobes;
+	size_t shstridx;
 #endif
 
 	if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL)
@@ -183,7 +147,6 @@ dtrace_dof_init(void)
 	}
 #endif
 
-
 	if ((modname = strrchr(lmp->l_name, '/')) == NULL)
 		modname = lmp->l_name;
 	else
@@ -203,15 +166,9 @@ dtrace_dof_init(void)
 	dof = NULL;
 	while ((scn = elf_nextscn(e, scn)) != NULL) {
 		gelf_getshdr(scn, &shdr);
-		if (shdr.sh_type == SHT_SYMTAB) {
-			symtabidx = shdr.sh_link;
-			symtabdata = elf_getdata(scn, NULL);
-		} else if (shdr.sh_type == SHT_DYNSYM) {
-			dynsymidx = shdr.sh_link;
-			dynsymdata = elf_getdata(scn, NULL);
-		} else if (shdr.sh_type == SHT_PROGBITS) {
+		if (shdr.sh_type == SHT_SUNW_dof) {
 			s = elf_strptr(e, shstridx, shdr.sh_name);
-			if  (s && strcmp(s, ".SUNW_dof") == 0) {
+			if (s != NULL && strcmp(s, ".SUNW_dof") == 0) {
 				dofdata = elf_getdata(scn, NULL);
 				dof = dofdata->d_buf;
 			}
@@ -225,7 +182,6 @@ dtrace_dof_init(void)
 	}
 
 	while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) {
-		fixedprobes = 0;
 		dof_next = (void *) ((char *) dof + dof->dofh_filesz);
 #endif
 
@@ -273,76 +229,6 @@ dtrace_dof_init(void)
 		return;
 #endif
 	}
-#if !defined(sun)
-	/*
-	 * We need to fix the base address of each probe since this wasn't
-	 * done by ld(1). (ld(1) needs to grow support for parsing the
-	 * SUNW_dof section).
-	 *
-	 * The complexity of this is not that great. The first for loop
-	 * iterates over the sections inside the DOF file. There are usually
-	 * 10 sections here. We asume the STRTAB section comes first and the
-	 * PROBES section comes after. Since we are only interested in fixing
-	 * data inside the PROBES section we quit the for loop after processing
-	 * the PROBES section. It's usually the case that the first section
-	 * is the STRTAB section and the second section is the PROBES section,
-	 * so this for loop is not meaningful when doing complexity analysis.
-	 *
-	 * After finding the probes section, we iterate over the symbols
-	 * in the symtab section. When we find a symbol name that matches
-	 * the probe function name, we fix it. If we have fixed all the
-	 * probes, we exit all the loops and we are done.
-	 * The number of probes is given by the variable 'nprobes' and this
-	 * depends entirely on the user, but some optimizations were done.
-	 *
-	 * We are assuming the number of probes is less than the number of
-	 * symbols (libc can have 4k symbols, for example).
-	 */
-	secstart = sec = (dof_sec_t *)(dof + 1);
-	buf = (char *)dof;
-	for (i = 0; i < dof->dofh_secnum; i++, sec++) {
-		if (sec->dofs_type != DOF_SECT_PROVIDER)
-			continue;
-
-		dofprovider = (void *) (buf + sec->dofs_offset);
-		dofstrtab = secstart + dofprovider->dofpv_strtab;
-		dofprobes = secstart + dofprovider->dofpv_probes;
-
-		if (dofstrtab->dofs_type != DOF_SECT_STRTAB) {
-			fprintf(stderr, "WARNING: expected STRTAB section, but got %d\n",
-					dofstrtab->dofs_type);
-			break;
-		}
-		if (dofprobes->dofs_type != DOF_SECT_PROBES) {
-			fprintf(stderr, "WARNING: expected PROBES section, but got %d\n",
-			    dofprobes->dofs_type);
-			break;
-		}
-
-		dprintf(1, "found provider %p\n", dofprovider);
-		dofstrtabraw = (char *)(buf + dofstrtab->dofs_offset);
-		nprobes = dofprobes->dofs_size / dofprobes->dofs_entsize;
-		fixsymbol(e, symtabdata, symtabidx, nprobes, buf, dofprobes, &fixedprobes,
-				dofstrtabraw);
-		if (fixedprobes != nprobes) {
-			/*
-			 * If we haven't fixed all the probes using the
-			 * symtab section, look inside the dynsym
-			 * section.
-			 */
-			fixsymbol(e, dynsymdata, dynsymidx, nprobes, buf, dofprobes,
-					&fixedprobes, dofstrtabraw);
-		}
-		if (fixedprobes != nprobes) {
-			fprintf(stderr, "WARNING: number of probes "
-			    "fixed does not match the number of "
-			    "defined probes (%d != %d, "
-			    "respectively)\n", fixedprobes, nprobes);
-			fprintf(stderr, "WARNING: some probes might "
-			    "not fire or your program might crash\n");
-		}
-	}
-#endif
 	if ((gen = ioctl(fd, DTRACEHIOC_ADDDOF, &dh)) == -1)
 		dprintf(1, "DTrace ioctl failed for DOF at %p", dof);
 	else {
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index 13300b086358..597fef47f982 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -322,7 +322,11 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 	char *strtab;
 	int i, j, nrel;
 	size_t strtabsz = 1;
+#if defined(sun)
 	uint32_t count = 0;
+#else
+	uint64_t count = 0;
+#endif
 	size_t base;
 	Elf64_Sym *sym;
 	Elf64_Rela *rel;
@@ -418,7 +422,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 		s = &dofs[dofrh->dofr_tgtsec];
 
 		for (j = 0; j < nrel; j++) {
-#ifdef DOODAD
 #if defined(__arm__)
 /* XXX */
 #elif defined(__mips__)
@@ -431,8 +434,13 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
+#if defined(sun)
 			rel->r_info = ELF64_R_INFO(count + dep->de_global,
 			    R_AMD64_64);
+#else
+			rel->r_info = ELF64_R_INFO(count + dep->de_global,
+			    R_X86_64_RELATIVE);
+#endif
 #elif defined(__sparc)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -440,7 +448,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 			    R_SPARC_64);
 #else
 #error unknown ISA
-#endif
 #endif
 
 			sym->st_name = base + dofr[j].dofr_name - 1;
@@ -704,7 +711,11 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
 
 	shp = &elf_file.shdr[ESHDR_DOF];
 	shp->sh_name = 11; /* DTRACE_SHSTRTAB64[11] = ".SUNW_dof" */
+#if defined(sun)
 	shp->sh_flags = SHF_ALLOC;
+#else
+	shp->sh_flags = SHF_WRITE | SHF_ALLOC;
+#endif
 	shp->sh_type = SHT_SUNW_dof;
 	shp->sh_offset = off;
 	shp->sh_size = dof->dofh_filesz;
@@ -1662,19 +1673,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 {
 #if !defined(sun)
 	char tfile[PATH_MAX];
-	Elf *e;
-	Elf_Scn *scn;
-	Elf_Data *data;
-	GElf_Shdr shdr;
-	int efd;
-	size_t stridx;
-	unsigned char *buf;
-	char *s;
-	int loc;
-	GElf_Ehdr ehdr;
-	Elf_Scn *scn0;
-	GElf_Shdr shdr0;
-	uint64_t off, rc;
 #endif
 	char drti[PATH_MAX];
 	dof_hdr_t *dof;
@@ -1810,21 +1808,21 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		(void) unlink(file);
 #endif
 
-#if defined(sun)
 	if (dtp->dt_oflags & DTRACE_O_LP64)
 		status = dump_elf64(dtp, dof, fd);
 	else
 		status = dump_elf32(dtp, dof, fd);
 
+#if defined(sun)
 	if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
 		return (dt_link_error(dtp, NULL, -1, NULL,
 		    "failed to write %s: %s", file, strerror(errno)));
 	}
 #else
-	/* We don't write the ELF header, just the DOF section */
-	if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz)
+	if (status != 0)
 		return (dt_link_error(dtp, NULL, -1, NULL,
-		    "failed to write %s: %s", tfile, strerror(errno)));
+		    "failed to write %s: %s", tfile,
+		    strerror(dtrace_errno(dtp))));
 #endif
 
 	if (!dtp->dt_lazyload) {
@@ -1846,7 +1844,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, fd, drti);
 #else
-		const char *fmt = "%s -o %s -r %s";
+		const char *fmt = "%s -o %s -r %s %s";
 
 #if defined(__amd64__)
 		/*
@@ -1868,10 +1866,9 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;
 
-		len *= 2;
 		cmd = alloca(len);
 
-		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file,
+		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file, tfile,
 		    drti);
 #endif
 		if ((status = system(cmd)) == -1) {
@@ -1894,85 +1891,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 			    file, dtp->dt_ld_path, WEXITSTATUS(status));
 			goto done;
 		}
-#if !defined(sun)
-		/*
-		 * FreeBSD's ld(1) is not instructed to interpret and add
-		 * correctly the SUNW_dof section present in tfile.
-		 * We use libelf to add this section manually and hope the next
-		 * ld invocation won't remove it.
-		 */
-		elf_version(EV_CURRENT);
-		if ((efd = open(file, O_RDWR, 0)) < 0) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to open file %s: %s",
-			    file, strerror(errno));
-			goto done;
-		}
-		if ((e = elf_begin(efd, ELF_C_RDWR, NULL)) == NULL) {
-			close(efd);
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to open elf file: %s",
-			    elf_errmsg(elf_errno()));
-			goto done;
-		}
-		/*
-		 * Add the string '.SUWN_dof' to the shstrtab section.
-		 */
-		elf_getshdrstrndx(e, &stridx);
-		scn = elf_getscn(e, stridx);
-		gelf_getshdr(scn, &shdr);
-		data = elf_newdata(scn);
-		data->d_off = shdr.sh_size;
-		data->d_buf = ".SUNW_dof";
-		data->d_size = 10;
-		data->d_type = ELF_T_BYTE;
-		loc = shdr.sh_size;
-		shdr.sh_size += data->d_size;
-		gelf_update_shdr(scn, &shdr);
-		/*
-		 * Construct the .SUNW_dof section.
-		 */
-		scn = elf_newscn(e);
-		data = elf_newdata(scn);
-		buf = mmap(NULL, dof->dofh_filesz, PROT_READ, MAP_SHARED,
-		    fd, 0);
-		if (buf == MAP_FAILED) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to mmap buffer %s", strerror(errno));
-			elf_end(e);
-			close(efd);
-			goto done;
-		}
-		data->d_buf = buf;
-		data->d_align = 4;
-		data->d_size = dof->dofh_filesz;
-		data->d_version = EV_CURRENT;
-		gelf_getshdr(scn, &shdr);
-		shdr.sh_name = loc;
-		shdr.sh_flags = SHF_ALLOC;
-		/*
-		 * Actually this should be SHT_SUNW_dof, but FreeBSD's ld(1)
-		 * will remove this 'unknown' section when we try to create an
-		 * executable using the object we are modifying, so we stop
-		 * playing by the rules and use SHT_PROGBITS.
-		 * Also, note that our drti has modifications to handle this.
-		 */
-		shdr.sh_type = SHT_PROGBITS;
-		shdr.sh_addralign = 4;
-		gelf_update_shdr(scn, &shdr);
-		if (elf_update(e, ELF_C_WRITE) < 0) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to add the SUNW_dof section: %s",
-			    elf_errmsg(elf_errno()));
-			munmap(buf, dof->dofh_filesz);
-			elf_end(e);
-			close(efd);
-			goto done;
-		}
-		munmap(buf, dof->dofh_filesz);
-		elf_end(e);
-		close(efd);
-#endif
 		(void) close(fd); /* release temporary file */
 	} else {
 		(void) close(fd);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
index c865a2df7702..6c529e5e6033 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
@@ -434,15 +434,10 @@ static const prmap_t *
 dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
 {
 	char m[MAXPATHLEN];
-#if defined(sun)
 	Lmid_t lmid = PR_LMID_EVERY;
-#else
-	Lmid_t lmid = 0;
-#endif
 	const char *obj;
 	const prmap_t *pmp;
 
-#if defined(sun)
 	/*
 	 * Pick apart the link map from the library name.
 	 */
@@ -463,20 +458,17 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
 	} else {
 		obj = pdp->dtpd_mod;
 	}
-#else
-	obj = pdp->dtpd_mod;
-#endif
 
 	if ((pmp = Plmid_to_map(P, lmid, obj)) == NULL)
 		return (NULL);
 
-#if defined(sun)
 	(void) Pobjname(P, pmp->pr_vaddr, m, sizeof (m));
 	if ((obj = strrchr(m, '/')) == NULL)
 		obj = &m[0];
 	else
 		obj++;
 
+#if defined(sun)
 	(void) Plmid(P, pmp->pr_vaddr, &lmid);
 #endif
 
@@ -571,9 +563,7 @@ dt_pid_usdt_mapping(void *data, const prmap_t *pmp, const char *oname)
 {
 	struct ps_prochandle *P = data;
 	GElf_Sym sym;
-#if defined(sun)
 	prsyminfo_t sip;
-#endif
 	dof_helper_t dh;
 	GElf_Half e_type;
 	const char *mname;
@@ -852,11 +842,7 @@ dt_pid_get_types(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp,
 	ctf_funcinfo_t f;
 	ctf_id_t argv[32];
 	GElf_Sym sym;
-#if defined(sun)
 	prsyminfo_t si;
-#else
-	void *si;
-#endif
 	struct ps_prochandle *p;
 	int i, args;
 	char buf[DTRACE_ARGTYPELEN];
@@ -941,13 +927,11 @@ dt_pid_get_types(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp,
 		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
 		goto out;
 	}
-#if defined(sun)
 	if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
 		dt_dprintf("failed to get ctf information for %s in %s`%s\n",
 		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
 		goto out;
 	}
-#endif
 
 	(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
 	    pdp->dtpd_mod);
@@ -977,7 +961,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp,
 		(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
 		    ret, DTRACE_ARGTYPELEN - ret, buf);
 		*nargs = 2;
-#if defined(sun)
 	} else {
 		if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
 			goto out;
@@ -993,7 +976,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp,
 			(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
 			    ret, DTRACE_ARGTYPELEN - ret, buf);
 		}
-#endif
 	}
 out:
 	dt_proc_unlock(dtp, p);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
index fb8ea16289ef..4be0f03d4a43 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
@@ -167,7 +167,7 @@ print_bitfield(dt_printarg_t *pap, ulong_t off, ctf_encoding_t *ep)
 	 * to the lowest 'size' bytes in 'value', and we need to shift based on
 	 * the offset from the end of the data, not the offset of the start.
 	 */
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 	buf += sizeof (value) - size;
 	off += ep->cte_bits;
 #endif
@@ -178,7 +178,7 @@ print_bitfield(dt_printarg_t *pap, ulong_t off, ctf_encoding_t *ep)
 	 * Offsets are counted from opposite ends on little- and
 	 * big-endian machines.
 	 */
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 	shift = NBBY - shift;
 #endif
 
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
index d7126bf77bbe..265038ab1bf9 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
@@ -1457,6 +1457,12 @@ zfs_setprop_error(libzfs_handle_t *hdl, zfs_prop_t prop, int err,
 		(void) zfs_error(hdl, EZFS_DSREADONLY, errbuf);
 		break;
 
+	case E2BIG:
+		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+		    "property value too long"));
+		(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
+		break;
+
 	case ENOTSUP:
 		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 		    "pool and or dataset must be upgraded to set this "
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
index 868961d96d66..49a43855d5fe 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  */
 
@@ -1426,21 +1426,15 @@ zpool_find_import_cached(libzfs_handle_t *hdl, const char *cachefile,
 
 	elem = NULL;
 	while ((elem = nvlist_next_nvpair(raw, elem)) != NULL) {
-		verify(nvpair_value_nvlist(elem, &src) == 0);
+		src = fnvpair_value_nvlist(elem);
 
-		verify(nvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME,
-		    &name) == 0);
+		name = fnvlist_lookup_string(src, ZPOOL_CONFIG_POOL_NAME);
 		if (poolname != NULL && strcmp(poolname, name) != 0)
 			continue;
 
-		verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
-		    &this_guid) == 0);
-		if (guid != 0) {
-			verify(nvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID,
-			    &this_guid) == 0);
-			if (guid != this_guid)
-				continue;
-		}
+		this_guid = fnvlist_lookup_uint64(src, ZPOOL_CONFIG_POOL_GUID);
+		if (guid != 0 && guid != this_guid)
+			continue;
 
 		if (pool_active(hdl, name, this_guid, &active) != 0) {
 			nvlist_free(raw);
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
index 30b2d87ce66d..e09417aa2dfb 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
@@ -304,7 +304,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 		case ZPOOL_PROP_FREE:
 		case ZPOOL_PROP_FREEING:
 		case ZPOOL_PROP_LEAKED:
-		case ZPOOL_PROP_EXPANDSZ:
 			if (literal) {
 				(void) snprintf(buf, len, "%llu",
 				    (u_longlong_t)intval);
@@ -312,7 +311,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 				(void) zfs_nicenum(intval, buf, len);
 			}
 			break;
-
+		case ZPOOL_PROP_EXPANDSZ:
+			if (intval == 0) {
+				(void) strlcpy(buf, "-", len);
+			} else if (literal) {
+				(void) snprintf(buf, len, "%llu",
+				    (u_longlong_t)intval);
+			} else {
+				(void) zfs_nicenum(intval, buf, len);
+			}
+			break;
 		case ZPOOL_PROP_CAPACITY:
 			if (literal) {
 				(void) snprintf(buf, len, "%llu",
@@ -330,13 +338,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 				    (u_longlong_t)intval);
 			}
 			break;
-
 		case ZPOOL_PROP_DEDUPRATIO:
 			(void) snprintf(buf, len, "%llu.%02llux",
 			    (u_longlong_t)(intval / 100),
 			    (u_longlong_t)(intval % 100));
 			break;
-
 		case ZPOOL_PROP_HEALTH:
 			verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL),
 			    ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
index 1a2c2ac0fd98..ef386968e858 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -650,6 +650,9 @@ dprintf_setup(int *argc, char **argv)
 	 */
 	if (dprintf_find_string("on"))
 		dprintf_print_all = 1;
+
+	if (dprintf_string != NULL)
+		zfs_flags |= ZFS_DEBUG_DPRINTF;
 }
 
 int
diff --git a/cddl/lib/libdtrace/libproc_compat.h b/cddl/lib/libdtrace/libproc_compat.h
index 84433362d0c5..0d99d967553a 100644
--- a/cddl/lib/libdtrace/libproc_compat.h
+++ b/cddl/lib/libdtrace/libproc_compat.h
@@ -38,7 +38,7 @@
 #define	Pxlookup_by_addr(p, a, n, s, sym, i) \
     proc_addr2sym(p, a, n, s, sym)
 #define	Pxlookup_by_name(p, l, s1, s2, sym, a) \
-    proc_name2sym((p), (s1), (s2), (sym))
+    proc_name2sym(p, s1, s2, sym, a)
 #define	Paddr_to_map proc_addr2map
 #define	Pcreate_error strerror
 #define	Pdelbkpt proc_bkptdel
@@ -46,10 +46,10 @@
 #define	Plmid(p, a, l) (-1)
 #define	Plmid_to_map(p, l, o) proc_obj2map((p), (o))
 #define	Plookup_by_addr proc_addr2sym
-#define	Pname_to_ctf(p, obj) NULL
+#define	Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
 #define	Pname_to_map proc_name2map
 #define	Pobject_iter proc_iter_objs
-#define	Pobject_iter_resolved(p, f, arg) 1
+#define	Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
 #define	Pobjname proc_objname
 #define	Pread proc_read
 #define	Prd_agent proc_rdagent
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 4010ac177a5e..b2f4352bf915 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,8 +7,11 @@
 
 LIB=	zfs
 DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
-	${LIBAVL} ${LIBZFS_CORE}
-LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
+	${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+	${LIBNVPAIR}
+
+LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+	-lbsdxml -lgeom -lnvpair -lzfs_core
 
 SRCS=	deviceid.c \
 	fsshare.c \
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 8f60a20a23a7..b80af0448a59 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -56,8 +56,9 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/thread
 CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
 CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
 
-DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
-LDADD=		-lmd -lpthread -lz
+DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+		${LIBAVL} ${LIBUMEM}
+LDADD=		-lmd -lpthread -lz -lnvpair -lavl -lumem
 
 # atomic.S doesn't like profiling.
 MK_PROFILE=	no
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 537b8e52792f..0d34afd025bb 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,6 +5,7 @@
 SUBDIR=	${_dtrace} \
 	${_dtruss} \
 	${_lockstat} \
+	${_plockstat} \
 	${_tests} \
 	${_zdb} \
 	${_zhack}
@@ -24,6 +25,9 @@ _zhack=	zhack
 _dtrace=	dtrace
 _dtruss=	dtruss
 _lockstat=	lockstat
+.if defined(WITH_PLOCKSTAT)
+_plockstat=	plockstat
+.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
diff --git a/contrib/apr-util/CHANGES b/contrib/apr-util/CHANGES
index 7626c50b52b1..a0dc3789a89d 100644
--- a/contrib/apr-util/CHANGES
+++ b/contrib/apr-util/CHANGES
@@ -1,4 +1,30 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.5.4
+
+  *) MySQL driver: Fix incorrect handling of bad parameter in the
+     driver support for apr_dbd_transaction_end().  PR 56330.
+     [Weiqiang Li <weiqiang_li hotmail.com>]
+
+  *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
+     [Philip Martin <philip.martin wandisco.com>]
+
+  *) Fix compile failure for Android.  PR 56627.  [Fredrik Fornwall 
+     <fredrik fornwall.net>, Jeff Trawick]
+
+  *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
+     [Tom Donovan]
+
+  *) Windows cmake build: Fix incompatiblities with Visual Studio
+     generators with all cmake versions, and the NMake Makefile generator
+     with cmake 2.8.12 and later.  PR 56616 and other bugs.  [Jeff Trawick,
+     Bert Huijben]
+
+  *) Fix detection of Berkeley DB 6.0. PR 55277.
+     [Lars Wendler <polynomial-c gentoo.org>]
+
+  *) Improve platform detection for bundled expat by updating
+     config.guess and config.sub. [Rainer Jung]
+
 Changes with APR-util 1.5.3
 
   *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.
diff --git a/contrib/apr-util/NOTICE b/contrib/apr-util/NOTICE
index aaf9cd046c8e..a107139ef37e 100644
--- a/contrib/apr-util/NOTICE
+++ b/contrib/apr-util/NOTICE
@@ -1,7 +1,7 @@
 Apache Portable Runtime Utility Library
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Portions of this software were developed at the National Center
diff --git a/contrib/apr-util/apr-util.spec b/contrib/apr-util/apr-util.spec
index d08400dff4f8..e9dc24b08da7 100644
--- a/contrib/apr-util/apr-util.spec
+++ b/contrib/apr-util/apr-util.spec
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.5.3
+Version: 1.5.4
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
diff --git a/contrib/apr-util/configure b/contrib/apr-util/configure
index ccfc3e603675..8ddd0e88f058 100755
--- a/contrib/apr-util/configure
+++ b/contrib/apr-util/configure
@@ -11608,19 +11608,34 @@ fi
   apu_db_version=0
 
   # Maximum supported version announced in help string.
-  # Although we search for all versions up to 5.9,
+  # Although we search for all versions up to 6.9,
   # we should only include existing versions in our
   # help string.
-  db_max_version=53
-  db_min_version=41
   dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
+  db_max_version=48
+  db_min_version=41
+  db_version="$db_min_version"
+  while [ $db_version -le $db_max_version ]
+  do
+    dbm_list="$dbm_list, db$db_version"
+    db_version=`expr $db_version + 1`
+  done
+  db_max_version=53
+  db_min_version=50
+  db_version="$db_min_version"
+  while [ $db_version -le $db_max_version ]
+  do
+    dbm_list="$dbm_list, db$db_version"
+    db_version=`expr $db_version + 1`
+  done
+  db_max_version=60
+  db_min_version=60
   db_version="$db_min_version"
   while [ $db_version -le $db_max_version ]
   do
     dbm_list="$dbm_list, db$db_version"
     db_version=`expr $db_version + 1`
   done
-  dbm_list="$dbm_list, db60"
 
 
 # Check whether --with-dbm was given.
@@ -12093,8 +12108,8 @@ if test "${with_berkeley_db+set}" = set; then :
 
   all_places="$check_places"
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [ $db_version -ge 40 ]
   do
     db_major=`echo $db_version | sed -e 's/.$//'`
@@ -12178,7 +12193,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -12580,7 +12595,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -12978,7 +12993,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -13376,7 +13391,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -13774,7 +13789,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14186,7 +14201,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14587,7 +14602,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -14988,7 +15003,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -15389,7 +15404,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -15794,7 +15809,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -16202,7 +16217,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -16534,8 +16549,8 @@ fi
 
   all_places="$check_places"
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [ $db_version -ge 40 ]
   do
     db_major=`echo $db_version | sed -e 's/.$//'`
@@ -16619,7 +16634,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+          if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17021,7 +17036,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+          if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17419,7 +17434,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+          if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -17817,7 +17832,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -18215,7 +18230,7 @@ $as_echo "" >&6; }
 ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 
-          if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+          if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
diff --git a/contrib/apr-util/crypto/apr_crypto.c b/contrib/apr-util/crypto/apr_crypto.c
index 35ce3752a9b7..fe66582d124f 100644
--- a/contrib/apr-util/crypto/apr_crypto.c
+++ b/contrib/apr-util/crypto/apr_crypto.c
@@ -204,7 +204,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_driver(
         if (err && buffer) {
             apr_dso_error(dso, buffer, ERROR_SIZE - 1);
             err->msg = buffer;
-            err->reason = modname;
+            err->reason = apr_pstrdup(pool, modname);
             *result = err;
         }
     }
diff --git a/contrib/apr-util/crypto/apr_passwd.c b/contrib/apr-util/crypto/apr_passwd.c
index 1b4b47bdf314..c961de2b9349 100644
--- a/contrib/apr-util/crypto/apr_passwd.c
+++ b/contrib/apr-util/crypto/apr_passwd.c
@@ -66,6 +66,12 @@ static void crypt_mutex_unlock(void)
 #endif
 #endif
 
+#if defined(WIN32) || defined(BEOS) || defined(NETWARE) || defined(__ANDROID__)
+#define CRYPT_MISSING 1
+#else
+#define CRYPT_MISSING 0
+#endif
+
 /*
  * Validate a plaintext password against a smashed one.  Uses either
  * crypt() (if available) or apr_md5_encode() or apr_sha1_base64(), depending
@@ -77,7 +83,7 @@ APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd,
                                                 const char *hash)
 {
     char sample[200];
-#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !CRYPT_MISSING
     char *crypt_pw;
 #endif
     if (hash[0] == '$'
@@ -100,7 +106,7 @@ APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd,
         /*
          * It's not our algorithm, so feed it to crypt() if possible.
          */
-#if defined(WIN32) || defined(BEOS) || defined(NETWARE)
+#if CRYPT_MISSING
         return (strcmp(passwd, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
 #elif defined(CRYPT_R_CRYPTD)
         apr_status_t rv;
diff --git a/contrib/apr-util/dbd/apr_dbd_mysql.c b/contrib/apr-util/dbd/apr_dbd_mysql.c
index 1141c6fd9772..3b8017d85249 100644
--- a/contrib/apr-util/dbd/apr_dbd_mysql.c
+++ b/contrib/apr-util/dbd/apr_dbd_mysql.c
@@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
         else {
             ret = mysql_commit(trans->handle->conn);
         }
+        ret |= mysql_autocommit(trans->handle->conn, 1);
+        trans->handle->trans = NULL;
     }
-    ret |= mysql_autocommit(trans->handle->conn, 1);
-    trans->handle->trans = NULL;
     return ret;
 }
 /* Whether or not transactions work depends on whether the
diff --git a/contrib/apr-util/dbd/apr_dbd_odbc.c b/contrib/apr-util/dbd/apr_dbd_odbc.c
index 6ee8a7d570f0..8a3c0fdce9b1 100644
--- a/contrib/apr-util/dbd/apr_dbd_odbc.c
+++ b/contrib/apr-util/dbd/apr_dbd_odbc.c
@@ -47,6 +47,21 @@
 #include <odbc/sqlext.h>
 #endif
 
+/*
+* MSVC6 does not support intptr_t (C99)
+* APR does not have a signed inptr type until 2.0  (r1557720)
+*/
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#if APR_SIZEOF_VOIDP == 8
+#define   ODBC_INTPTR_T  apr_int64_t
+#else
+#define   ODBC_INTPTR_T  apr_int32_t
+#endif
+#else
+#define   ODBC_INTPTR_T  intptr_t
+#endif
+
+
 /* Driver name is "odbc" and the entry point is 'apr_dbd_odbc_driver' 
  * unless ODBC_DRIVER_NAME is defined and it is linked with another db library which
  * is ODBC source-compatible. e.g. DB2, Informix, TimesTen, mysql.  
@@ -114,9 +129,9 @@ struct apr_dbd_t
     char lastError[MAX_ERROR_STRING];
     int defaultBufferSize;      /* used for CLOBs in text mode, 
                                  * and when fld size is indeterminate */
-    intptr_t transaction_mode;
-    intptr_t dboptions;         /* driver options re SQLGetData */
-    intptr_t default_transaction_mode;
+    ODBC_INTPTR_T transaction_mode;
+    ODBC_INTPTR_T dboptions;         /* driver options re SQLGetData */
+    ODBC_INTPTR_T default_transaction_mode;
     int can_commit;             /* controls end_trans behavior */
 };
 
@@ -359,7 +374,7 @@ static SQLRETURN odbc_set_result_column(int icol, apr_dbd_results_t *res,
                                         SQLHANDLE stmt)
 {
     SQLRETURN rc;
-    intptr_t maxsize, textsize, realsize, type, isunsigned = 1;
+    ODBC_INTPTR_T maxsize, textsize, realsize, type, isunsigned = 1;
 
     /* discover the sql type */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL,
@@ -747,7 +762,7 @@ static void *odbc_get(const apr_dbd_row_t *row, const int col,
     SQLRETURN rc;
     SQLLEN indicator;
     int state = row->res->colstate[col];
-    intptr_t options = row->res->apr_dbd->dboptions;
+    ODBC_INTPTR_T options = row->res->apr_dbd->dboptions;
 
     switch (state) {
     case (COL_UNAVAIL):
@@ -817,13 +832,13 @@ static apr_status_t odbc_parse_params(apr_pool_t *pool, const char *params,
                                int *connect, SQLCHAR **datasource, 
                                SQLCHAR **user, SQLCHAR **password, 
                                int *defaultBufferSize, int *nattrs,
-                               int **attrs, intptr_t **attrvals)
+                               int **attrs, ODBC_INTPTR_T **attrvals)
 {
     char *seps, *last, *next, *name[MAX_PARAMS], *val[MAX_PARAMS];
     int nparams = 0, i, j;
 
     *attrs = apr_pcalloc(pool, MAX_PARAMS * sizeof(char *));
-    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t));
+    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(ODBC_INTPTR_T));
     *nattrs = 0;
     seps = DEFAULTSEPS;
     name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last);
@@ -1063,7 +1078,7 @@ static apr_dbd_t *odbc_open(apr_pool_t *pool, const char *params, const char **e
     SQLCHAR  *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"",
              *password = (SQLCHAR *)"";
     int nattrs = 0, *attrs = NULL,  connect = 0;
-    intptr_t *attrvals = NULL;
+    ODBC_INTPTR_T *attrvals = NULL;
 
     err_step = "SQLAllocHandle (SQL_HANDLE_DBC)";
     err_htype = SQL_HANDLE_ENV;
@@ -1117,10 +1132,10 @@ static apr_dbd_t *odbc_open(apr_pool_t *pool, const char *params, const char **e
         handle->default_transaction_mode = 0;
         handle->can_commit = APR_DBD_TRANSACTION_IGNORE_ERRORS;
         SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION,
-                   &(handle->default_transaction_mode), sizeof(intptr_t), NULL);
+                   &(handle->default_transaction_mode), sizeof(ODBC_INTPTR_T), NULL);
         handle->transaction_mode = handle->default_transaction_mode;
         SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions),
-                   sizeof(intptr_t), NULL);
+                   sizeof(ODBC_INTPTR_T), NULL);
         apr_pool_cleanup_register(pool, handle, odbc_close_cleanup, apr_pool_cleanup_null);
         return handle;
     }
diff --git a/contrib/apr-util/dbm/NWGNUmakefile b/contrib/apr-util/dbm/NWGNUmakefile
index 9307b8450095..7e610fec270a 100644
--- a/contrib/apr-util/dbm/NWGNUmakefile
+++ b/contrib/apr-util/dbm/NWGNUmakefile
@@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+	$(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
 
 #
 # Any specialized rules here
diff --git a/contrib/apr-util/include/apu_version.h b/contrib/apr-util/include/apu_version.h
index a7a587876244..8d976291ff6d 100644
--- a/contrib/apr-util/include/apu_version.h
+++ b/contrib/apr-util/include/apu_version.h
@@ -38,7 +38,7 @@
  */
 
 
-#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
 /* The numeric compile-time version constants. These constants are the
@@ -62,7 +62,7 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION       3
+#define APU_PATCH_VERSION       4
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
diff --git a/contrib/apr-util/test/Makefile.win b/contrib/apr-util/test/Makefile.win
index 030585009c56..a30f39e2b520 100644
--- a/contrib/apr-util/test/Makefile.win
+++ b/contrib/apr-util/test/Makefile.win
@@ -88,6 +88,8 @@ APROUTDIR=$(OUTDIR)
 !IF "$(MODEL)" == "static"
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
+	$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
+	..\xml\expat\lib\$(OUTDIR)\xml.lib \
 	..\$(OUTDIR)\aprutil-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
 STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib 
diff --git a/contrib/atf/FREEBSD-upgrade b/contrib/atf/FREEBSD-upgrade
index 1b1970f2e9c7..e9d7a4cb7b4f 100644
--- a/contrib/atf/FREEBSD-upgrade
+++ b/contrib/atf/FREEBSD-upgrade
@@ -7,10 +7,9 @@ branches and you are supposed to follow those:
 
 	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
 
-The ATF source code is hosted on Google Code as a subcomponent of the
-Kyua project:
+The ATF source code is hosted on GitHub:
 
-	http://code.google.com/p/kyua/downloads/list
+	https://github.com/jmmv/atf
 
 and is imported into the atf vendor branch (see base/vendor/atf/).
 
@@ -42,7 +41,7 @@ the vendor branch as you easily risk committing build products into the
 tree.
 
 Lastly, with the list of old and new files in this import, make sure
-to udpate the reachover Makefiles accordingly.
+to update the reachover Makefiles accordingly.
 
 Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and,
 if all looks good, you are ready to commit all the changes in one go.
diff --git a/contrib/atf/NEWS b/contrib/atf/NEWS
index 709f5941c105..7a7ed2fb9d02 100644
--- a/contrib/atf/NEWS
+++ b/contrib/atf/NEWS
@@ -14,6 +14,9 @@ the 'tools' directory for your own consumption.
 * Removed the deprecated tools.  This includes atf-config, atf-report,
   atf-run and atf-version.
 
+* Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang
+  that ships with FreeBSD 11.0-CURRENT.
+
 
 Changes in version 0.19
 ***********************
diff --git a/contrib/atf/atf-c++/atf-c++-api.3 b/contrib/atf/atf-c++/atf-c++-api.3
index c086c9096718..da1441ed205a 100644
--- a/contrib/atf/atf-c++/atf-c++-api.3
+++ b/contrib/atf/atf-c++/atf-c++-api.3
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 15, 2013
+.Dd March 2, 2014
 .Dt ATF-C++-API 3
 .Os
 .Sh NAME
@@ -330,9 +330,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn expect_fail "reason"
 Any failure (be it fatal or non-fatal) raised in this mode is recorded.
@@ -368,9 +367,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn expect_timeout "reason"
 Expects the test case to execute for longer than its timeout.
@@ -631,5 +629,4 @@ ATF_INIT_TEST_CASES(tcs)
 .Ed
 .Sh SEE ALSO
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4
diff --git a/contrib/atf/atf-c/atf-c-api.3 b/contrib/atf/atf-c/atf-c-api.3
index 366caec79c8f..b3b308655739 100644
--- a/contrib/atf/atf-c/atf-c-api.3
+++ b/contrib/atf/atf-c/atf-c-api.3
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 15, 2013
+.Dd March 2, 2014
 .Dt ATF-C-API 3
 .Os
 .Sh NAME
@@ -409,9 +409,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_tc_expect_fail "reason" "..."
 Any failure (be it fatal or non-fatal) raised in this mode is recorded.
@@ -443,9 +442,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_tc_expect_timeout "reason" "..."
 Expects the test case to execute for longer than its timeout.
@@ -771,5 +769,4 @@ ATF_TP_ADD_TCS(tp)
 .Ed
 .Sh SEE ALSO
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4
diff --git a/contrib/atf/atf-c/macros_h_test.c b/contrib/atf/atf-c/macros_h_test.c
index 3dae471e4dd7..64c6786e477f 100644
--- a/contrib/atf/atf-c/macros_h_test.c
+++ b/contrib/atf/atf-c/macros_h_test.c
@@ -87,6 +87,7 @@ ATF_TC(TEST_MACRO_1);
 ATF_TC_HEAD(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 ATF_TC_BODY(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_1 = &ATF_TC_NAME(TEST_MACRO_1);
+atf_tc_pack_t *test_pack_1 = &ATF_TC_PACK_NAME(TEST_MACRO_1);
 void (*head_1)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_1);
 void (*body_1)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_1);
 ATF_TC_WITH_CLEANUP(TEST_MACRO_2);
@@ -94,10 +95,12 @@ ATF_TC_HEAD(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 ATF_TC_BODY(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 ATF_TC_CLEANUP(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_2 = &ATF_TC_NAME(TEST_MACRO_2);
+atf_tc_pack_t *test_pack_2 = &ATF_TC_PACK_NAME(TEST_MACRO_2);
 void (*head_2)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_2);
 void (*body_2)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_2);
 void (*cleanup_2)(const atf_tc_t *) = ATF_TC_CLEANUP_NAME(TEST_MACRO_2);
 ATF_TC_WITHOUT_HEAD(TEST_MACRO_3);
 ATF_TC_BODY(TEST_MACRO_3, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_3 = &ATF_TC_NAME(TEST_MACRO_3);
+atf_tc_pack_t *test_pack_3 = &ATF_TC_PACK_NAME(TEST_MACRO_3);
 void (*body_3)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_3);
diff --git a/contrib/atf/atf-sh/atf-check.1 b/contrib/atf/atf-sh/atf-check.1
index 06904bc3ffd3..66f931892501 100644
--- a/contrib/atf/atf-sh/atf-check.1
+++ b/contrib/atf/atf-sh/atf-check.1
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 27, 2010
+.Dd March 2, 2014
 .Dt ATF-CHECK 1
 .Os
 .Sh NAME
@@ -118,15 +118,20 @@ Analyzes standard error (syntax identical to above)
 Executes
 .Ar command
 as a shell command line, executing it with the system shell defined by
-.Va ATF_SHELL
-in
-.Xr atf-config 1 .
+.Va ATF_SHELL .
 You should avoid using this flag if at all possible to prevent shell quoting
 issues.
 .El
 .Sh EXIT STATUS
 .Nm
 exits 0 on success, and other (unspecified) value on failure.
+.Sh ENVIRONMENT
+.Bl -tag -width ATFXSHELLXX -compact
+.It Va ATF_SHELL
+Path to the system shell to be used when the
+.Fl x
+is given to run commands.
+.El
 .Sh EXAMPLES
 .Bd -literal -offset indent
 # Exit code 0, nothing on stdout/stderr
@@ -146,6 +151,3 @@ atf-check -s signal:sigsegv my_program
 # Combined checks
 atf-check -o match:foo -o not-match:bar echo foo baz
 .Ed
-.Sh SEE ALSO
-.Xr atf-config 1 ,
-.Xr atf 7
diff --git a/contrib/atf/atf-sh/atf-sh-api.3 b/contrib/atf/atf-sh/atf-sh-api.3
index d63804cd73fe..a30aee76e3d9 100644
--- a/contrib/atf/atf-sh/atf-sh-api.3
+++ b/contrib/atf/atf-sh/atf-sh-api.3
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 13, 2013
+.Dd March 2, 2014
 .Dt ATF-SH-API 3
 .Os
 .Sh NAME
@@ -224,9 +224,8 @@ If
 .Va exitcode
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the exit code of the test case matches the one provided
-in this call.
+the runtime engine will validate that the exit code of the test case
+matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_expect_fail "reason"
 Any failure raised in this mode is recorded, but such failures do not report
@@ -258,9 +257,8 @@ If
 .Va signo
 is not
 .Sq -1 ,
-.Xr atf-run 1
-will validate that the signal that terminated the test case matches the one
-provided in this call.
+the runtime engine will validate that the signal that terminated the test
+case matches the one provided in this call.
 Otherwise, the exact value will be ignored.
 .It Fn atf_expect_timeout "reason" "..."
 Expects the test case to execute for longer than its timeout.
@@ -339,5 +337,4 @@ atf_check -s exit:0 -o match:"^foo$" -e empty 'ls'
 .Sh SEE ALSO
 .Xr atf-sh 1 ,
 .Xr atf-test-program 1 ,
-.Xr atf-test-case 4 ,
-.Xr atf 7
+.Xr atf-test-case 4
diff --git a/contrib/atf/atf-sh/atf-sh.1 b/contrib/atf/atf-sh/atf-sh.1
index 7578ba0a4da3..ad77f04d3e22 100644
--- a/contrib/atf/atf-sh/atf-sh.1
+++ b/contrib/atf/atf-sh/atf-sh.1
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 15, 2013
+.Dd March 2, 2014
 .Dt ATF-SH 1
 .Os
 .Sh NAME
@@ -47,10 +47,8 @@ library.
 .Pp
 .Nm
 is not a real interpreter though: it is just a wrapper around
-the system-wide shell defined by the
-.Sq atf_shell
-configuration value in
-.Xr atf-config 1 .
+the system-wide shell defined by
+.Va ATF_SHELL .
 .Nm
 executes the interpreter, loads the
 .Xr atf-sh-api 3
@@ -68,7 +66,10 @@ The following options are available:
 .It Fl h
 Shows a short summary of all available options and their purpose.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width ATFXSHELLXX -compact
+.It Va ATF_SHELL
+Path to the system shell to be used in the generated scripts.
+.El
 .Sh SEE ALSO
-.Xr atf-config 1 ,
-.Xr atf-sh-api 3 ,
-.Xr atf 7
+.Xr atf-sh-api 3
diff --git a/contrib/atf/doc/atf-test-case.4 b/contrib/atf/doc/atf-test-case.4
index c5e9e662a8e0..7f253ede915e 100644
--- a/contrib/atf/doc/atf-test-case.4
+++ b/contrib/atf/doc/atf-test-case.4
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 13, 2011
+.Dd March 2, 2014
 .Dt ATF-TEST-CASE 4
 .Os
 .Sh NAME
@@ -171,9 +171,7 @@ Type: boolean.
 Optional.
 .Pp
 If set to true, specifies that the test case has a cleanup routine that has
-to be executed by
-.Xr atf-run 1
-during the cleanup phase of the execution.
+to be executed by the runtime engine during the cleanup phase of the execution.
 This property is automatically set by the framework when defining a test case
 with a cleanup routine, so it should never be set by hand.
 .It ident
@@ -251,8 +249,7 @@ the test case is
 .Pp
 If the test case is running as root and this property is
 .Sq unprivileged ,
-.Xr atf-run 1
-will automatically drop the privileges if the
+the runtime engine will automatically drop the privileges if the
 .Sq unprivileged-user
 configuration property is set; otherwise the test case is
 .Em skipped .
@@ -314,7 +311,4 @@ Test cases are always executed with a file creation mode mask (umask) of
 .Sq 0022 .
 The test case's code is free to change this during execution.
 .Sh SEE ALSO
-.Xr atf-run 1 ,
-.Xr atf-test-program 1 ,
-.Xr atf-formats 5 ,
-.Xr atf 7
+.Xr atf-test-program 1
diff --git a/contrib/atf/doc/atf-test-program.1 b/contrib/atf/doc/atf-test-program.1
index 49ee12ddff25..c2f73261fc4c 100644
--- a/contrib/atf/doc/atf-test-program.1
+++ b/contrib/atf/doc/atf-test-program.1
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 6, 2011
+.Dd March 2, 2014
 .Dt ATF-TEST-PROGRAM 1
 .Os
 .Sh NAME
@@ -61,16 +61,17 @@ instead of the test case body; see
 Note that the test case is
 .Em executed without isolation ,
 so it can and probably will create and modify files in the current directory.
-To execute test cases in a controller manner, refer to
-.Xr atf-run 1 ,
-which is the preferred way to run test cases.
+To execute test cases in a controller manner, you need a runtime engine
+that understands the ATF interface.
+The recommended runtime engine is
+.Xr kyua 1 .
 You should only execute test cases by hand for debugging purposes.
 .Pp
 In the second synopsis form, the test program will list all available
 test cases alongside their meta-data properties in a format that is
 machine parseable.
 This list is processed by
-.Xr atf-run 1
+.Xr kyua 1
 to know how to execute the test cases of a given test program.
 .Pp
 The following options are available:
@@ -99,5 +100,4 @@ to the value
 .Ar value .
 .El
 .Sh SEE ALSO
-.Xr atf-run 1 ,
-.Xr atf 7
+.Xr kyua 1
diff --git a/contrib/binutils/gas/config/tc-arm.c b/contrib/binutils/gas/config/tc-arm.c
index 08dbb6fff888..1d9e27c0e834 100644
--- a/contrib/binutils/gas/config/tc-arm.c
+++ b/contrib/binutils/gas/config/tc-arm.c
@@ -4688,6 +4688,23 @@ parse_address_main (char **str, int i, int group_relocations,
 	      return PARSE_OPERAND_FAIL;
 	}
     }
+  else if (skip_past_char (&p, ':') == SUCCESS)
+    {
+      /* FIXME: '@' should be used here, but it's filtered out by generic
+         code before we get to see it here. This may be subject to
+         change.  */
+      expressionS exp;
+      my_get_expression (&exp, &p, GE_NO_PREFIX);
+      if (exp.X_op != O_constant)
+        {
+          inst.error = _("alignment must be constant");
+          return PARSE_OPERAND_FAIL;
+        }
+      inst.operands[i].imm = exp.X_add_number << 8;
+      inst.operands[i].immisalign = 1;
+      /* Alignments are not pre-indexes.  */
+      inst.operands[i].preind = 0;
+    }
 
   if (skip_past_char (&p, ']') == FAIL)
     {
@@ -6571,6 +6588,7 @@ do_barrier (void)
   if (inst.operands[0].present)
     {
       constraint ((inst.instruction & 0xf0) != 0x40
+		  && (inst.instruction & 0xf0) != 0x50
 		  && inst.operands[0].imm != 0xf,
 		  "bad barrier type");
       inst.instruction |= inst.operands[0].imm;
@@ -14694,10 +14712,18 @@ static const struct asm_cond conds[] =
 
 static struct asm_barrier_opt barrier_opt_names[] =
 {
-  { "sy",   0xf },
-  { "un",   0x7 },
-  { "st",   0xe },
-  { "unst", 0x6 }
+  { "sy",    0xf },
+  { "un",    0x7 },
+  { "st",    0xe },
+  { "unst",  0x6 },
+  { "ish",   0xb },
+  { "sh",    0xb },
+  { "ishst", 0xa },
+  { "shst",  0xa },
+  { "nsh",   0x7 },
+  { "nshst", 0x6 },
+  { "osh",   0x3 },
+  { "oshst", 0x2 }
 };
 
 /* Table of ARM-format instructions.	*/
diff --git a/contrib/hyperv/tools/hv_kvp_daemon.8 b/contrib/hyperv/tools/hv_kvp_daemon.8
new file mode 100644
index 000000000000..af574edef3a0
--- /dev/null
+++ b/contrib/hyperv/tools/hv_kvp_daemon.8
@@ -0,0 +1,68 @@
+.\" Copyright (c) 2014 Microsoft Corp.
+.\" All rights reserved.
+.\"
+.\" 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 AUTHOR 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 AUTHOR 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.
+.\"
+.Dd September 10, 2013
+.Dt HYPER-V 4
+.Os
+.Sh NAME
+.Nm hv_kvp_daemon
+.Nd Hyper-V Key Value Pair Daemon
+.Sh SYNOPSIS
+The \fBhv_kvp_daemon\fP daemon provides the ability to store, retrieve, modify and delete 
+Key Value pairs for FreeBSD guest partitions running on Hyper-V.
+.Sh DESCRIPTION
+Hyper-V allows administrators to store custom metadata in the form
+of Key Value pairs inside the FreeBSD guest partition. Administrators can
+use Windows Powershell scripts to add, read, modify and delete such
+Key Value pairs.
+
+The \fBhv_kvp_daemon\fP accepts Key Value pair management requests from the
+\fBhv_utils\fP driver and performs the actual metadata management on the file-system.
+
+The same daemon and driver combination is also used to set and get
+IP addresses from a FreeBSD guest. 
+
+The set functionality is particularly
+useful when the FreeBSD guest is assigned a static IP address and is failed
+over from one Hyper-V host to another. After failover, Hyper-V uses the set IP
+functionality to automatically
+update the FreeBSD guest's IP address to its original static value. 
+
+On the other hand, the get IP functionality is used to update the guest IP
+address in the Hyper-V management console window.
+.Sh SEE ALSO
+.Xr hv_vmbus 4 ,
+.Xr hv_utils 4 ,
+.Xr hv_netvsc 4 ,
+.Xr hv_storvsc 4 ,
+.Xr hv_ata_pci_disengage 4
+.Sh HISTORY
+Support for Hyper-V in the form of ports was first released in September 2013.
+The daemon was developed through a joint effort between Citrix Inc., 
+Microsoft Corp. and Network Appliance Inc..
+.Sh AUTHORS
+.An -nosplit
+.Fx
+support for \fBhv_kvp_daemon\fP was first added by
+.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
diff --git a/contrib/hyperv/tools/hv_kvp_daemon.c b/contrib/hyperv/tools/hv_kvp_daemon.c
new file mode 100644
index 000000000000..b0a84d411095
--- /dev/null
+++ b/contrib/hyperv/tools/hv_kvp_daemon.c
@@ -0,0 +1,1517 @@
+/*-
+ * Copyright (c) 2014 Microsoft Corp.
+ * All rights reserved.
+ *
+ * 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 unmodified, 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/poll.h>
+#include <sys/utsname.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <netdb.h>
+
+#include <netinet/in.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+
+#include <assert.h>
+
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#include "hv_kvp.h"
+
+typedef uint8_t		__u8;
+typedef uint16_t	__u16;
+typedef uint32_t	__u32;
+typedef uint64_t	__u64;
+
+/*
+ * ENUM Data
+ */
+
+enum key_index {
+	FullyQualifiedDomainName = 0,
+	IntegrationServicesVersion, /*This key is serviced in the kernel*/
+	NetworkAddressIPv4,
+	NetworkAddressIPv6,
+	OSBuildNumber,
+	OSName,
+	OSMajorVersion,
+	OSMinorVersion,
+	OSVersion,
+	ProcessorArchitecture
+};
+
+
+enum {
+	IPADDR = 0,
+	NETMASK,
+	GATEWAY,
+	DNS
+};
+
+
+/* Global Variables */
+
+/*
+ * The structure for operation handlers.
+ */
+struct kvp_op_hdlr {
+	int	kvp_op_key;
+	void	(*kvp_op_init)(void);
+ 	int	(*kvp_op_exec)(struct hv_kvp_msg *kvp_op_msg, void *data);
+};
+
+static struct kvp_op_hdlr kvp_op_hdlrs[HV_KVP_OP_COUNT];
+
+/* OS information */
+
+static const char *os_name = "";
+static const char *os_major = "";
+static const char *os_minor = "";
+static const char *processor_arch;
+static const char *os_build;
+static const char *lic_version = "BSD Pre-Release version";
+static struct utsname uts_buf;
+
+/* Global flags */
+static int is_daemon = 1;
+static int is_debugging = 0;
+
+#define	KVP_LOG(priority, format, args...) do	{			\
+		if (is_debugging == 1) {				\
+			if (is_daemon == 1)				\
+				syslog(priority, format, ## args);	\
+			else						\
+				printf(format, ## args);		\
+		} else {						\
+			if (priority < LOG_DEBUG) {			\
+				if (is_daemon == 1)			\
+					syslog(priority, format, ## args);	\
+				else					\
+					printf(format, ## args);	\
+			}						\
+		}							\
+	} while(0)
+
+/*
+ * For KVP pool file
+ */
+
+#define MAX_FILE_NAME		100
+#define ENTRIES_PER_BLOCK	50
+
+struct kvp_record {
+	char	key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
+	char	value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
+};
+
+struct kvp_pool {
+	int			pool_fd;
+	int			num_blocks;
+	struct kvp_record	*records;
+	int			num_records;
+	char			fname[MAX_FILE_NAME];
+};
+
+static struct kvp_pool kvp_pools[HV_KVP_POOL_COUNT];
+
+
+static void
+kvp_acquire_lock(int pool)
+{
+	struct flock fl = { 0, 0, 0, F_WRLCK, SEEK_SET, 0 };
+
+	fl.l_pid = getpid();
+
+	if (fcntl(kvp_pools[pool].pool_fd, F_SETLKW, &fl) == -1) {
+		KVP_LOG(LOG_ERR, "Failed to acquire the lock pool: %d", pool);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+static void
+kvp_release_lock(int pool)
+{
+	struct flock fl = { 0, 0, 0, F_UNLCK, SEEK_SET, 0 };
+
+	fl.l_pid = getpid();
+
+	if (fcntl(kvp_pools[pool].pool_fd, F_SETLK, &fl) == -1) {
+		perror("fcntl");
+		KVP_LOG(LOG_ERR, "Failed to release the lock pool: %d\n", pool);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+/*
+ * Write in-memory copy of KVP to pool files
+ */
+static void
+kvp_update_file(int pool)
+{
+	FILE *filep;
+	size_t bytes_written;
+
+	kvp_acquire_lock(pool);
+
+	filep = fopen(kvp_pools[pool].fname, "w");
+	if (!filep) {
+		kvp_release_lock(pool);
+		KVP_LOG(LOG_ERR, "Failed to open file, pool: %d\n", pool);
+		exit(EXIT_FAILURE);
+	}
+
+	bytes_written = fwrite(kvp_pools[pool].records,
+		sizeof(struct kvp_record),
+		kvp_pools[pool].num_records, filep);
+
+	if (ferror(filep) || fclose(filep)) {
+		kvp_release_lock(pool);
+		KVP_LOG(LOG_ERR, "Failed to write file, pool: %d\n", pool);
+		exit(EXIT_FAILURE);
+	}
+
+	kvp_release_lock(pool);
+}
+
+
+/*
+ * Read KVPs from pool files and store in memory
+ */
+static void
+kvp_update_mem_state(int pool)
+{
+	FILE *filep;
+	size_t records_read = 0;
+	struct kvp_record *record = kvp_pools[pool].records;
+	struct kvp_record *readp;
+	int num_blocks = kvp_pools[pool].num_blocks;
+	int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
+
+	kvp_acquire_lock(pool);
+
+	filep = fopen(kvp_pools[pool].fname, "r");
+	if (!filep) {
+		kvp_release_lock(pool);
+		KVP_LOG(LOG_ERR, "Failed to open file, pool: %d\n", pool);
+		exit(EXIT_FAILURE);
+	}
+	for ( ; ; )
+	{
+		readp = &record[records_read];
+		records_read += fread(readp, sizeof(struct kvp_record),
+			ENTRIES_PER_BLOCK * num_blocks,
+			filep);
+
+		if (ferror(filep)) {
+			KVP_LOG(LOG_ERR, "Failed to read file, pool: %d\n", pool);
+			exit(EXIT_FAILURE);
+		}
+
+		if (!feof(filep)) {
+			/*
+			 * Have more data to read. Expand the memory.
+			 */
+			num_blocks++;
+			record = realloc(record, alloc_unit * num_blocks);
+
+			if (record == NULL) {
+				KVP_LOG(LOG_ERR, "malloc failed\n");
+				exit(EXIT_FAILURE);
+			}
+			continue;
+		}
+		break;
+	}
+
+	kvp_pools[pool].num_blocks = num_blocks;
+	kvp_pools[pool].records = record;
+	kvp_pools[pool].num_records = records_read;
+
+	fclose(filep);
+	kvp_release_lock(pool);
+}
+
+
+static int
+kvp_file_init(void)
+{
+	int fd;
+	FILE *filep;
+	size_t records_read;
+	char *fname;
+	struct kvp_record *record;
+	struct kvp_record *readp;
+	int num_blocks;
+	int i;
+	int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
+
+	if (mkdir("/var/db/hyperv/pool", S_IRUSR | S_IWUSR | S_IROTH) < 0 &&
+	    errno != EISDIR) {
+		KVP_LOG(LOG_ERR, " Failed to create /var/db/hyperv/pool\n");
+		exit(EXIT_FAILURE);
+	}
+
+	for (i = 0; i < HV_KVP_POOL_COUNT; i++)
+	{
+		fname = kvp_pools[i].fname;
+		records_read = 0;
+		num_blocks = 1;
+		snprintf(fname, MAX_FILE_NAME, "/var/db/hyperv/pool/.kvp_pool_%d", i);
+		fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IROTH);
+
+		if (fd == -1) {
+			return (1);
+		}
+
+
+		filep = fopen(fname, "r");
+		if (!filep) {
+			close(fd);
+			return (1);
+		}
+
+		record = malloc(alloc_unit * num_blocks);
+		if (record == NULL) {
+			close(fd);
+			fclose(filep);
+			return (1);
+		}
+		for ( ; ; )
+		{
+			readp = &record[records_read];
+			records_read += fread(readp, sizeof(struct kvp_record),
+				ENTRIES_PER_BLOCK,
+				filep);
+
+			if (ferror(filep)) {
+				KVP_LOG(LOG_ERR, "Failed to read file, pool: %d\n",
+				    i);
+				exit(EXIT_FAILURE);
+			}
+
+			if (!feof(filep)) {
+				/*
+				 * More data to read.
+				 */
+				num_blocks++;
+				record = realloc(record, alloc_unit *
+					num_blocks);
+				if (record == NULL) {
+					close(fd);
+					fclose(filep);
+					return (1);
+				}
+				continue;
+			}
+			break;
+		}
+		kvp_pools[i].pool_fd = fd;
+		kvp_pools[i].num_blocks = num_blocks;
+		kvp_pools[i].records = record;
+		kvp_pools[i].num_records = records_read;
+		fclose(filep);
+	}
+
+	return (0);
+}
+
+
+static int
+kvp_key_delete(int pool, __u8 *key, int key_size)
+{
+	int i;
+	int j, k;
+	int num_records;
+	struct kvp_record *record;
+
+	KVP_LOG(LOG_DEBUG, "kvp_key_delete: pool =  %d, "
+	    "key = %s\n", pool, key);
+
+	/* Update in-memory state */
+	kvp_update_mem_state(pool);
+
+	num_records = kvp_pools[pool].num_records;
+	record = kvp_pools[pool].records;
+
+	for (i = 0; i < num_records; i++)
+	{
+		if (memcmp(key, record[i].key, key_size)) {
+			continue;
+		}
+
+		KVP_LOG(LOG_DEBUG, "Found delete key in pool %d.\n",
+		    pool);
+		/*
+		 * We found a match at the end; Just update the number of
+		 * entries and we are done.
+		 */
+		if (i == num_records) {
+			kvp_pools[pool].num_records--;
+			kvp_update_file(pool);
+			return (0);
+		}
+
+		/*
+		 * We found a match in the middle; Move the remaining
+		 * entries up.
+		 */
+		j = i;
+		k = j + 1;
+		for ( ; k < num_records; k++)
+		{
+			strcpy(record[j].key, record[k].key);
+			strcpy(record[j].value, record[k].value);
+			j++;
+		}
+		kvp_pools[pool].num_records--;
+		kvp_update_file(pool);
+		return (0);
+	}
+	KVP_LOG(LOG_DEBUG, "Not found delete key in pool %d.\n",
+	    pool);
+	return (1);
+}
+
+
+static int
+kvp_key_add_or_modify(int pool, __u8 *key, __u32 key_size, __u8 *value,
+    __u32 value_size)
+{
+	int i;
+	int num_records;
+	struct kvp_record *record;
+	int num_blocks;
+
+	KVP_LOG(LOG_DEBUG, "kvp_key_add_or_modify: pool =  %d, "
+	    "key = %s, value = %s\n,", pool, key, value);
+
+	if ((key_size > HV_KVP_EXCHANGE_MAX_KEY_SIZE) ||
+	    (value_size > HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) {
+		KVP_LOG(LOG_ERR, "kvp_key_add_or_modify: returning 1\n");
+		return (1);
+	}
+
+	/* Update the in-memory state. */
+	kvp_update_mem_state(pool);
+
+	num_records = kvp_pools[pool].num_records;
+	record = kvp_pools[pool].records;
+	num_blocks = kvp_pools[pool].num_blocks;
+
+	for (i = 0; i < num_records; i++)
+	{
+		if (memcmp(key, record[i].key, key_size)) {
+			continue;
+		}
+
+		/*
+		 * Key exists. Just update the value and we are done.
+		 */
+		memcpy(record[i].value, value, value_size);
+		kvp_update_file(pool);
+		return (0);
+	}
+
+	/*
+	 * Key doesn't exist; Add a new KVP.
+	 */
+	if (num_records == (ENTRIES_PER_BLOCK * num_blocks)) {
+		/* Increase the size of the recodrd array. */
+		record = realloc(record, sizeof(struct kvp_record) *
+			ENTRIES_PER_BLOCK * (num_blocks + 1));
+
+		if (record == NULL) {
+			return (1);
+		}
+		kvp_pools[pool].num_blocks++;
+	}
+	memcpy(record[i].value, value, value_size);
+	memcpy(record[i].key, key, key_size);
+	kvp_pools[pool].records = record;
+	kvp_pools[pool].num_records++;
+	kvp_update_file(pool);
+	return (0);
+}
+
+
+static int
+kvp_get_value(int pool, __u8 *key, int key_size, __u8 *value,
+    int value_size)
+{
+	int i;
+	int num_records;
+	struct kvp_record *record;
+
+	KVP_LOG(LOG_DEBUG, "kvp_get_value: pool =  %d, key = %s\n,",
+	    pool, key);
+
+	if ((key_size > HV_KVP_EXCHANGE_MAX_KEY_SIZE) ||
+	    (value_size > HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) {
+		return (1);
+	}
+
+	/* Update the in-memory state first. */
+	kvp_update_mem_state(pool);
+
+	num_records = kvp_pools[pool].num_records;
+	record = kvp_pools[pool].records;
+
+	for (i = 0; i < num_records; i++)
+	{
+		if (memcmp(key, record[i].key, key_size)) {
+			continue;
+		}
+
+		/* Found the key */
+		memcpy(value, record[i].value, value_size);
+		return (0);
+	}
+
+	return (1);
+}
+
+
+static int
+kvp_pool_enumerate(int pool, int index, __u8 *key, int key_size,
+    __u8 *value, int value_size)
+{
+	struct kvp_record *record;
+
+	KVP_LOG(LOG_DEBUG, "kvp_pool_enumerate: pool = %d, index = %d\n,",
+	    pool, index);
+
+	/* First update our in-memory state first. */
+	kvp_update_mem_state(pool);
+	record = kvp_pools[pool].records;
+
+	/* Index starts with 0 */
+	if (index >= kvp_pools[pool].num_records) {
+		return (1);
+	}
+
+	memcpy(key, record[index].key, key_size);
+	memcpy(value, record[index].value, value_size);
+	return (0);
+}
+
+
+static void
+kvp_get_os_info(void)
+{
+	char *p;
+
+	uname(&uts_buf);
+	os_build = uts_buf.release;
+	os_name = uts_buf.sysname;
+	processor_arch = uts_buf.machine;
+
+	/*
+	 * Win7 host expects the build string to be of the form: x.y.z
+	 * Strip additional information we may have.
+	 */
+	p = strchr(os_build, '-');
+	if (p) {
+		*p = '\0';
+	}
+
+	/*
+	 * We don't have any other information about the FreeBSD os.
+	 */
+	return;
+}
+
+/*
+ * Given the interface name, return the MAC address.
+ */
+static char *
+kvp_if_name_to_mac(char *if_name)
+{
+	char *mac_addr = NULL;
+	struct ifaddrs *ifaddrs_ptr;
+	struct ifaddrs *head_ifaddrs_ptr;
+	struct sockaddr_dl *sdl;
+	int status;
+
+	status = getifaddrs(&ifaddrs_ptr);
+
+	if (status >= 0) {
+		head_ifaddrs_ptr = ifaddrs_ptr;
+		do {
+			sdl = (struct sockaddr_dl *)(uintptr_t)ifaddrs_ptr->ifa_addr;
+			if ((sdl->sdl_type == IFT_ETHER) &&
+			    (strcmp(ifaddrs_ptr->ifa_name, if_name) == 0)) {
+				mac_addr = strdup(ether_ntoa((struct ether_addr *)(LLADDR(sdl))));
+				break;
+			}
+		} while ((ifaddrs_ptr = ifaddrs_ptr->ifa_next) != NULL);
+		freeifaddrs(head_ifaddrs_ptr);
+	}
+
+	return (mac_addr);
+}
+
+
+/*
+ * Given the MAC address, return the interface name.
+ */
+static char *
+kvp_mac_to_if_name(char *mac)
+{
+	char *if_name = NULL;
+	struct ifaddrs *ifaddrs_ptr;
+	struct ifaddrs *head_ifaddrs_ptr;
+	struct sockaddr_dl *sdl;
+	int status;
+	char *buf_ptr, *p;
+
+	status = getifaddrs(&ifaddrs_ptr);
+
+	if (status >= 0) {
+		head_ifaddrs_ptr = ifaddrs_ptr;
+		do {
+			sdl = (struct sockaddr_dl *)(uintptr_t)ifaddrs_ptr->ifa_addr;
+			if (sdl->sdl_type == IFT_ETHER) {
+				buf_ptr = strdup(ether_ntoa((struct ether_addr *)(LLADDR(sdl))));
+				if (buf_ptr != NULL) {
+					for (p = buf_ptr; *p != '\0'; p++)
+						*p = toupper(*p);
+
+					if (strncmp(buf_ptr, mac, strlen(mac)) == 0) {
+						/* Caller will free the memory */
+						if_name = strdup(ifaddrs_ptr->ifa_name);
+						free(buf_ptr);
+						break;
+					} else
+						free(buf_ptr);
+				}
+			}
+		} while ((ifaddrs_ptr = ifaddrs_ptr->ifa_next) != NULL);
+		freeifaddrs(head_ifaddrs_ptr);
+	}
+	return (if_name);
+}
+
+
+static void
+kvp_process_ipconfig_file(char *cmd,
+    char *config_buf, size_t len,
+    size_t element_size, int offset)
+{
+	char buf[256];
+	char *p;
+	char *x;
+	FILE *file;
+
+	/*
+	 * First execute the command.
+	 */
+	file = popen(cmd, "r");
+	if (file == NULL) {
+		return;
+	}
+
+	if (offset == 0) {
+		memset(config_buf, 0, len);
+	}
+	while ((p = fgets(buf, sizeof(buf), file)) != NULL) {
+		if ((len - strlen(config_buf)) < (element_size + 1)) {
+			break;
+		}
+
+		x = strchr(p, '\n');
+		*x = '\0';
+		strlcat(config_buf, p, len);
+		strlcat(config_buf, ";", len);
+	}
+	pclose(file);
+}
+
+
+static void
+kvp_get_ipconfig_info(char *if_name, struct hv_kvp_ipaddr_value *buffer)
+{
+	char cmd[512];
+	char dhcp_info[128];
+	char *p;
+	FILE *file;
+
+	/*
+	 * Retrieve the IPV4 address of default gateway.
+	 */
+	snprintf(cmd, sizeof(cmd), "netstat -rn | grep %s | awk '/default/ {print $2 }'", if_name);
+
+	/*
+	 * Execute the command to gather gateway IPV4 info.
+	 */
+	kvp_process_ipconfig_file(cmd, (char *)buffer->gate_way,
+	    (MAX_GATEWAY_SIZE * 2), INET_ADDRSTRLEN, 0);
+
+	/*
+	 * Retrieve the IPV6 address of default gateway.
+	 */
+	snprintf(cmd, sizeof(cmd), "netstat -rn inet6 | grep %s | awk '/default/ {print $2 }", if_name);
+
+	/*
+	 * Execute the command to gather gateway IPV6 info.
+	 */
+	kvp_process_ipconfig_file(cmd, (char *)buffer->gate_way,
+	    (MAX_GATEWAY_SIZE * 2), INET6_ADDRSTRLEN, 1);
+
+	/*
+	 * we just invoke an external script to get the DNS info.
+	 *
+	 * Following is the expected format of the information from the script:
+	 *
+	 * ipaddr1 (nameserver1)
+	 * ipaddr2 (nameserver2)
+	 * .
+	 * .
+	 */
+	/* Scripts are stored in /usr/libexec/hyperv/ directory */
+	snprintf(cmd, sizeof(cmd), "%s", "sh /usr/libexec/hyperv/hv_get_dns_info");
+
+	/*
+	 * Execute the command to get DNS info.
+	 */
+	kvp_process_ipconfig_file(cmd, (char *)buffer->dns_addr,
+	    (MAX_IP_ADDR_SIZE * 2), INET_ADDRSTRLEN, 0);
+
+	/*
+	 * Invoke an external script to get the DHCP state info.
+	 * The parameter to the script is the interface name.
+	 * Here is the expected output:
+	 *
+	 * Enabled: DHCP enabled.
+	 */
+
+
+	snprintf(cmd, sizeof(cmd), "%s %s",
+	    "sh /usr/libexec/hyperv/hv_get_dhcp_info", if_name);
+
+	file = popen(cmd, "r");
+	if (file == NULL) {
+		return;
+	}
+
+	p = fgets(dhcp_info, sizeof(dhcp_info), file);
+	if (p == NULL) {
+		pclose(file);
+		return;
+	}
+
+	if (!strncmp(p, "Enabled", 7)) {
+		buffer->dhcp_enabled = 1;
+	} else{
+		buffer->dhcp_enabled = 0;
+	}
+
+	pclose(file);
+}
+
+
+static unsigned int
+hweight32(unsigned int *w)
+{
+	unsigned int res = *w - ((*w >> 1) & 0x55555555);
+
+	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+	res = (res + (res >> 4)) & 0x0F0F0F0F;
+	res = res + (res >> 8);
+	return ((res + (res >> 16)) & 0x000000FF);
+}
+
+
+static int
+kvp_process_ip_address(void *addrp,
+    int family, char *buffer,
+    int length, int *offset)
+{
+	struct sockaddr_in *addr;
+	struct sockaddr_in6 *addr6;
+	int addr_length;
+	char tmp[50];
+	const char *str;
+
+	if (family == AF_INET) {
+		addr = (struct sockaddr_in *)addrp;
+		str = inet_ntop(family, &addr->sin_addr, tmp, 50);
+		addr_length = INET_ADDRSTRLEN;
+	} else {
+		addr6 = (struct sockaddr_in6 *)addrp;
+		str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50);
+		addr_length = INET6_ADDRSTRLEN;
+	}
+
+	if ((length - *offset) < addr_length + 1) {
+		return (HV_KVP_E_FAIL);
+	}
+	if (str == NULL) {
+		strlcpy(buffer, "inet_ntop failed\n", length);
+		return (HV_KVP_E_FAIL);
+	}
+	if (*offset == 0) {
+		strlcpy(buffer, tmp, length);
+	} else{
+		strlcat(buffer, tmp, length);
+	}
+	strlcat(buffer, ";", length);
+
+	*offset += strlen(str) + 1;
+	return (0);
+}
+
+
+static int
+kvp_get_ip_info(int family, char *if_name, int op,
+    void *out_buffer, size_t length)
+{
+	struct ifaddrs *ifap;
+	struct ifaddrs *curp;
+	int offset = 0;
+	int sn_offset = 0;
+	int error = 0;
+	char *buffer;
+	size_t buffer_length;
+	struct hv_kvp_ipaddr_value *ip_buffer;
+	char cidr_mask[5];
+	int weight;
+	int i;
+	unsigned int *w = NULL;
+	char *sn_str;
+	size_t sn_str_length;
+	struct sockaddr_in6 *addr6;
+
+	if (op == HV_KVP_OP_ENUMERATE) {
+		buffer = out_buffer;
+		buffer_length = length;
+	} else {
+		ip_buffer = out_buffer;
+		buffer = (char *)ip_buffer->ip_addr;
+		buffer_length = sizeof(ip_buffer->ip_addr);
+		ip_buffer->addr_family = 0;
+	}
+
+	if (getifaddrs(&ifap)) {
+		strlcpy(buffer, "getifaddrs failed\n", buffer_length);
+		return (HV_KVP_E_FAIL);
+	}
+
+	curp = ifap;
+	while (curp != NULL) {
+		if (curp->ifa_addr == NULL) {
+			curp = curp->ifa_next;
+			continue;
+		}
+
+		if ((if_name != NULL) &&
+		    (strncmp(curp->ifa_name, if_name, strlen(if_name)))) {
+			/*
+			 * We want info about a specific interface;
+			 * just continue.
+			 */
+			curp = curp->ifa_next;
+			continue;
+		}
+
+		/*
+		 * We support two address families: AF_INET and AF_INET6.
+		 * If family value is 0, we gather both supported
+		 * address families; if not we gather info on
+		 * the specified address family.
+		 */
+		if ((family != 0) && (curp->ifa_addr->sa_family != family)) {
+			curp = curp->ifa_next;
+			continue;
+		}
+		if ((curp->ifa_addr->sa_family != AF_INET) &&
+		    (curp->ifa_addr->sa_family != AF_INET6)) {
+			curp = curp->ifa_next;
+			continue;
+		}
+
+		if (op == HV_KVP_OP_GET_IP_INFO) {
+			/*
+			 * Get the info other than the IP address.
+			 */
+			if (curp->ifa_addr->sa_family == AF_INET) {
+				ip_buffer->addr_family |= ADDR_FAMILY_IPV4;
+
+				/*
+				 * Get subnet info.
+				 */
+				error = kvp_process_ip_address(
+					curp->ifa_netmask,
+					AF_INET,
+					(char *)
+					ip_buffer->sub_net,
+					length,
+					&sn_offset);
+				if (error) {
+					goto kvp_get_ip_info_ipaddr;
+				}
+			} else {
+				ip_buffer->addr_family |= ADDR_FAMILY_IPV6;
+
+				/*
+				 * Get subnet info in CIDR format.
+				 */
+				weight = 0;
+				sn_str = (char *)ip_buffer->sub_net;
+				sn_str_length = sizeof(ip_buffer->sub_net);
+				addr6 = (struct sockaddr_in6 *)(uintptr_t)
+				    curp->ifa_netmask;
+				w = (unsigned int *)(uintptr_t)addr6->sin6_addr.s6_addr;
+
+				for (i = 0; i < 4; i++)
+				{
+					weight += hweight32(&w[i]);
+				}
+
+				snprintf(cidr_mask, sizeof(cidr_mask), "/%d", weight);
+				if ((length - sn_offset) <
+				    (strlen(cidr_mask) + 1)) {
+					goto kvp_get_ip_info_ipaddr;
+				}
+
+				if (sn_offset == 0) {
+					strlcpy(sn_str, cidr_mask, sn_str_length);
+				} else{
+					strlcat(sn_str, cidr_mask, sn_str_length);
+				}
+				strlcat((char *)ip_buffer->sub_net, ";", sn_str_length);
+				sn_offset += strlen(sn_str) + 1;
+			}
+
+			/*
+			 * Collect other ip configuration info.
+			 */
+
+			kvp_get_ipconfig_info(if_name, ip_buffer);
+		}
+
+kvp_get_ip_info_ipaddr:
+		error = kvp_process_ip_address(curp->ifa_addr,
+			curp->ifa_addr->sa_family,
+			buffer,
+			length, &offset);
+		if (error) {
+			goto kvp_get_ip_info_done;
+		}
+
+		curp = curp->ifa_next;
+	}
+
+kvp_get_ip_info_done:
+	freeifaddrs(ifap);
+	return (error);
+}
+
+
+static int
+kvp_write_file(FILE *f, const char *s1, const char *s2, const char *s3)
+{
+	int ret;
+
+	ret = fprintf(f, "%s%s%s%s\n", s1, s2, "=", s3);
+
+	if (ret < 0) {
+		return (HV_KVP_E_FAIL);
+	}
+
+	return (0);
+}
+
+
+static int
+kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
+{
+	int error = 0;
+	char if_file[128];
+	FILE *file;
+	char cmd[512];
+	char *mac_addr;
+
+	/*
+	 * FreeBSD - Configuration File
+	 */
+	snprintf(if_file, sizeof(if_file), "%s%s", "/var/db/hyperv",
+	    "hv_set_ip_data");
+	file = fopen(if_file, "w");
+
+	if (file == NULL) {
+		KVP_LOG(LOG_ERR, "FreeBSD Failed to open config file\n");
+		return (HV_KVP_E_FAIL);
+	}
+
+	/*
+	 * Write out the MAC address.
+	 */
+
+	mac_addr = kvp_if_name_to_mac(if_name);
+	if (mac_addr == NULL) {
+		error = HV_KVP_E_FAIL;
+		goto kvp_set_ip_info_error;
+	}
+	/* MAC Address */
+	error = kvp_write_file(file, "HWADDR", "", mac_addr);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	/* Interface Name  */
+	error = kvp_write_file(file, "IF_NAME", "", if_name);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	/* IP Address  */
+	error = kvp_write_file(file, "IP_ADDR", "",
+	    (char *)new_val->ip_addr);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	/* Subnet Mask */
+	error = kvp_write_file(file, "SUBNET", "",
+	    (char *)new_val->sub_net);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+
+	/* Gateway */
+	error = kvp_write_file(file, "GATEWAY", "",
+	    (char *)new_val->gate_way);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	/* DNS */
+	error = kvp_write_file(file, "DNS", "", (char *)new_val->dns_addr);
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	/* DHCP */
+	if (new_val->dhcp_enabled) {
+		error = kvp_write_file(file, "DHCP", "", "1");
+	} else{
+		error = kvp_write_file(file, "DHCP", "", "0");
+	}
+
+	if (error) {
+		goto kvp_set_ip_info_error;
+	}
+
+	free(mac_addr);
+	fclose(file);
+
+	/*
+	 * Invoke the external script with the populated
+	 * configuration file.
+	 */
+
+	snprintf(cmd, sizeof(cmd), "%s %s",
+	    "sh /usr/libexec/hyperv/hv_set_ifconfig", if_file);
+	system(cmd);
+	return (0);
+
+kvp_set_ip_info_error:
+	KVP_LOG(LOG_ERR, "Failed to write config file\n");
+	free(mac_addr);
+	fclose(file);
+	return (error);
+}
+
+
+static int
+kvp_get_domain_name(char *buffer, int length)
+{
+	struct addrinfo hints, *info;
+	int error = 0;
+
+	gethostname(buffer, length);
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;    /* Get only ipv4 addrinfo. */
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = AI_CANONNAME;
+
+	error = getaddrinfo(buffer, NULL, &hints, &info);
+	if (error != 0) {
+		strlcpy(buffer, "getaddrinfo failed\n", length);
+		return (error);
+	}
+	strlcpy(buffer, info->ai_canonname, length);
+	freeaddrinfo(info);
+	return (error);
+}
+
+
+static int
+kvp_op_getipinfo(struct hv_kvp_msg *op_msg, void *data __unused)
+{
+	struct hv_kvp_ipaddr_value *ip_val;
+	char *if_name;
+
+	assert(op_msg != NULL);
+	KVP_LOG(LOG_DEBUG, "In kvp_op_getipinfo.\n");
+
+	ip_val = &op_msg->body.kvp_ip_val;
+	op_msg->hdr.error = HV_KVP_S_OK;
+
+	if_name = kvp_mac_to_if_name((char *)ip_val->adapter_id);
+
+	if (if_name == NULL) {
+		/* No interface found with the mac address. */
+		op_msg->hdr.error = HV_KVP_E_FAIL;
+		goto kvp_op_getipinfo_done;
+	}
+
+	op_msg->hdr.error = kvp_get_ip_info(0, if_name,
+	    HV_KVP_OP_GET_IP_INFO, ip_val, (MAX_IP_ADDR_SIZE * 2));
+
+	free(if_name);
+
+kvp_op_getipinfo_done:
+	return(op_msg->hdr.error);
+}
+
+
+static int
+kvp_op_setipinfo(struct hv_kvp_msg *op_msg, void *data __unused)
+{
+	struct hv_kvp_ipaddr_value *ip_val;
+	char *if_name;
+
+	assert(op_msg != NULL);
+	KVP_LOG(LOG_DEBUG, "In kvp_op_setipinfo.\n");
+
+	ip_val = &op_msg->body.kvp_ip_val;
+	op_msg->hdr.error = HV_KVP_S_OK;
+
+	if_name = (char *)ip_val->adapter_id;
+
+	if (if_name == NULL) {
+		/* No adapter provided. */
+		op_msg->hdr.error = HV_KVP_GUID_NOTFOUND;
+		goto kvp_op_setipinfo_done;
+	}
+
+	op_msg->hdr.error = kvp_set_ip_info(if_name, ip_val);
+
+kvp_op_setipinfo_done:
+	return(op_msg->hdr.error);
+}
+
+
+static int
+kvp_op_setgetdel(struct hv_kvp_msg *op_msg, void *data)
+{
+	struct kvp_op_hdlr *op_hdlr = (struct kvp_op_hdlr *)data;
+	int error = 0;
+	int op_pool;
+
+	assert(op_msg != NULL);
+	assert(op_hdlr != NULL);
+
+	op_pool = op_msg->hdr.kvp_hdr.pool;
+	op_msg->hdr.error = HV_KVP_S_OK;
+
+	switch(op_hdlr->kvp_op_key) {
+	case HV_KVP_OP_SET:
+		if (op_pool == HV_KVP_POOL_AUTO) {
+			/* Auto Pool is not writeable from host side. */
+			error = 1;
+			KVP_LOG(LOG_ERR, "Ilegal to write to pool %d from host\n",
+			    op_pool);
+		} else {
+			error = kvp_key_add_or_modify(op_pool,
+			    op_msg->body.kvp_set.data.key,
+			    op_msg->body.kvp_set.data.key_size,
+			    op_msg->body.kvp_set.data.msg_value.value,
+			    op_msg->body.kvp_set.data.value_size);
+		}
+		break;
+
+	case HV_KVP_OP_GET:
+		error = kvp_get_value(op_pool,
+		    op_msg->body.kvp_get.data.key,
+		    op_msg->body.kvp_get.data.key_size,
+		    op_msg->body.kvp_get.data.msg_value.value,
+		    op_msg->body.kvp_get.data.value_size);
+		break;
+
+	case HV_KVP_OP_DELETE:
+		if (op_pool == HV_KVP_POOL_AUTO) {
+			/* Auto Pool is not writeable from host side. */
+			error = 1;
+			KVP_LOG(LOG_ERR, "Ilegal to change pool %d from host\n",
+			    op_pool);
+		} else {
+			error = kvp_key_delete(op_pool,
+			    op_msg->body.kvp_delete.key,
+			    op_msg->body.kvp_delete.key_size);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	if (error != 0)
+		op_msg->hdr.error = HV_KVP_S_CONT;
+
+	return(error);
+}
+
+
+static int
+kvp_op_enumerate(struct hv_kvp_msg *op_msg, void *data __unused)
+{
+	char *key_name, *key_value;
+	int error = 0;
+	int op_pool;
+	int op;
+
+	assert(op_msg != NULL);
+
+	op = op_msg->hdr.kvp_hdr.operation;
+	op_pool = op_msg->hdr.kvp_hdr.pool;
+	op_msg->hdr.error = HV_KVP_S_OK;
+
+	/*
+	 * If the pool is not HV_KVP_POOL_AUTO, read from the appropriate
+	 * pool and return the KVP according to the index requested.
+	 */
+	if (op_pool != HV_KVP_POOL_AUTO) {
+		if (kvp_pool_enumerate(op_pool,
+		    op_msg->body.kvp_enum_data.index,
+		    op_msg->body.kvp_enum_data.data.key,
+		    HV_KVP_EXCHANGE_MAX_KEY_SIZE,
+		    op_msg->body.kvp_enum_data.data.msg_value.value,
+		    HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) {
+			op_msg->hdr.error = HV_KVP_S_CONT;
+			error = -1;
+		}
+		goto kvp_op_enumerate_done;
+	}
+
+	key_name = (char *)op_msg->body.kvp_enum_data.data.key;
+	key_value = (char *)op_msg->body.kvp_enum_data.data.msg_value.value;
+
+	switch (op_msg->body.kvp_enum_data.index)
+	{
+	case FullyQualifiedDomainName:
+		kvp_get_domain_name(key_value,
+		    HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "FullyQualifiedDomainName");
+		break;
+
+	case IntegrationServicesVersion:
+		strcpy(key_name, "IntegrationServicesVersion");
+		strlcpy(key_value, lic_version, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		break;
+
+	case NetworkAddressIPv4:
+		kvp_get_ip_info(AF_INET, NULL, HV_KVP_OP_ENUMERATE,
+		    key_value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "NetworkAddressIPv4");
+		break;
+
+	case NetworkAddressIPv6:
+		kvp_get_ip_info(AF_INET6, NULL, HV_KVP_OP_ENUMERATE,
+		    key_value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "NetworkAddressIPv6");
+		break;
+
+	case OSBuildNumber:
+		strlcpy(key_value, os_build, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "OSBuildNumber");
+		break;
+
+	case OSName:
+		strlcpy(key_value, os_name, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "OSName");
+		break;
+
+	case OSMajorVersion:
+		strlcpy(key_value, os_major, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "OSMajorVersion");
+		break;
+
+	case OSMinorVersion:
+		strlcpy(key_value, os_minor, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "OSMinorVersion");
+		break;
+
+	case OSVersion:
+		strlcpy(key_value, os_build, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "OSVersion");
+		break;
+
+	case ProcessorArchitecture:
+		strlcpy(key_value, processor_arch, HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
+		strcpy(key_name, "ProcessorArchitecture");
+		break;
+
+	default:
+#ifdef DEBUG
+		KVP_LOG(LOG_ERR, "Auto pool Index %d not found.\n",
+		    op_msg->body.kvp_enum_data.index);
+#endif
+		op_msg->hdr.error = HV_KVP_S_CONT;
+		error = -1;
+		break;
+	}
+
+kvp_op_enumerate_done:
+	return(error);
+}
+
+
+/*
+ * Load handler, and call init routine if provided.
+ */
+static int
+kvp_op_load(int key, void (*init)(void),
+	    int (*exec)(struct hv_kvp_msg *, void *))
+{
+	int error = 0;
+
+	if (key < 0 || key >= HV_KVP_OP_COUNT) {
+		KVP_LOG(LOG_ERR, "Operation key out of supported range\n");
+		error = -1;
+		goto kvp_op_load_done;
+	}
+
+	kvp_op_hdlrs[key].kvp_op_key = key;
+	kvp_op_hdlrs[key].kvp_op_init = init;
+	kvp_op_hdlrs[key].kvp_op_exec = exec;
+
+	if (kvp_op_hdlrs[key].kvp_op_init != NULL)
+		kvp_op_hdlrs[key].kvp_op_init();
+
+kvp_op_load_done:
+	return(error);
+}
+
+
+/*
+ * Initialize the operation hanlders.
+ */
+static int
+kvp_ops_init(void)
+{
+	int i;
+
+	/* Set the initial values. */
+	for (i = 0; i < HV_KVP_OP_COUNT; i++) {
+		kvp_op_hdlrs[i].kvp_op_key = -1;
+		kvp_op_hdlrs[i].kvp_op_init = NULL;
+		kvp_op_hdlrs[i].kvp_op_exec = NULL;
+	}
+
+	return(kvp_op_load(HV_KVP_OP_GET, NULL, kvp_op_setgetdel) |
+	    kvp_op_load(HV_KVP_OP_SET, NULL, kvp_op_setgetdel) |
+	    kvp_op_load(HV_KVP_OP_DELETE, NULL, kvp_op_setgetdel) |
+	    kvp_op_load(HV_KVP_OP_ENUMERATE, kvp_get_os_info,
+	        kvp_op_enumerate) |
+	    kvp_op_load(HV_KVP_OP_GET_IP_INFO, NULL, kvp_op_getipinfo) |
+	    kvp_op_load(HV_KVP_OP_SET_IP_INFO, NULL, kvp_op_setipinfo));
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	struct hv_kvp_msg *hv_kvp_dev_buf;
+	struct hv_kvp_msg *hv_msg;
+	struct pollfd hv_kvp_poll_fd[1];
+	int op, pool;
+	int hv_kvp_dev_fd, error, len, r;
+	int ch;
+
+	while ((ch = getopt(argc, argv, "dn")) != -1) {
+		switch (ch) {
+		case 'n':
+			/* Run as regular process for debugging purpose. */
+			is_daemon = 0;
+			break;
+		case 'd':
+			/* Generate debugging output */
+			is_debugging = 1;
+			break;
+		default:
+			break;
+		}
+	}
+
+	openlog("HV_KVP", 0, LOG_USER);
+
+	/* Become daemon first. */
+	if (is_daemon == 1)
+		daemon(1, 0);
+	else
+		KVP_LOG(LOG_DEBUG, "Run as regular process.\n");
+
+	KVP_LOG(LOG_INFO, "HV_KVP starting; pid is: %d\n", getpid());
+
+	/* Communication buffer hv_kvp_dev_buf */
+	hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf));
+	/* Buffer for daemon internal use */
+	hv_msg = malloc(sizeof(*hv_msg));
+
+	/* Memory allocation failed */
+	if (hv_kvp_dev_buf == NULL || hv_msg == NULL) {
+		KVP_LOG(LOG_ERR, "Failed to allocate memory for hv buffer\n");
+		exit(EXIT_FAILURE);
+	}
+
+	/* Initialize op handlers */
+	if (kvp_ops_init() != 0) {
+		KVP_LOG(LOG_ERR, "Failed to initizlize operation handlers\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (kvp_file_init()) {
+		KVP_LOG(LOG_ERR, "Failed to initialize the pools\n");
+		exit(EXIT_FAILURE);
+	}
+
+	/* Open the Character Device */
+	hv_kvp_dev_fd = open("/dev/hv_kvp_dev", O_RDWR);
+
+	if (hv_kvp_dev_fd < 0) {
+		KVP_LOG(LOG_ERR, "open /dev/hv_kvp_dev failed; error: %d %s\n",
+		    errno, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	/* Initialize the struct for polling the char device */
+	hv_kvp_poll_fd[0].fd = hv_kvp_dev_fd;
+	hv_kvp_poll_fd[0].events = (POLLIN | POLLRDNORM);
+
+	/* Register the daemon to the KVP driver */
+	memset(hv_kvp_dev_buf, 0, sizeof(*hv_kvp_dev_buf));
+	hv_kvp_dev_buf->hdr.kvp_hdr.operation = HV_KVP_OP_REGISTER;
+	len = write(hv_kvp_dev_fd, hv_kvp_dev_buf, sizeof(*hv_kvp_dev_buf));
+
+
+	for (;;) {
+		r = poll (hv_kvp_poll_fd, 1, 100);
+
+		KVP_LOG(LOG_DEBUG, "poll returned r = %d, revent = 0x%x\n",
+		    r, hv_kvp_poll_fd[0].revents);
+
+		if (r == 0 || (r < 0 && errno == EAGAIN) ||
+		    (r < 0 && errno == EINTR)) {
+			/* Nothing to read */
+			continue;
+		}
+
+		if (r < 0) {
+			/*
+			 * For pread return failure other than EAGAIN,
+			 * we want to exit.
+			 */
+			KVP_LOG(LOG_ERR, "Poll failed.\n");
+			perror("poll");
+			exit(EIO);
+		}
+
+		/* Read from character device */
+		len = pread(hv_kvp_dev_fd, hv_kvp_dev_buf,
+		    sizeof(*hv_kvp_dev_buf), 0);
+
+		if (len < 0) {
+			KVP_LOG(LOG_ERR, "Read failed.\n");
+			perror("pread");
+			exit(EIO);
+		}
+
+		if (len != sizeof(struct hv_kvp_msg)) {
+			KVP_LOG(LOG_ERR, "read len is: %d\n", len);
+			continue;
+		}
+
+		/* Copy hv_kvp_dev_buf to hv_msg */
+		memcpy(hv_msg, hv_kvp_dev_buf, sizeof(*hv_msg));
+
+		/*
+		 * We will use the KVP header information to pass back
+		 * the error from this daemon. So, first save the op
+		 * and pool info to local variables.
+		 */
+
+		op = hv_msg->hdr.kvp_hdr.operation;
+		pool = hv_msg->hdr.kvp_hdr.pool;
+
+		if (op < 0 || op >= HV_KVP_OP_COUNT ||
+		    kvp_op_hdlrs[op].kvp_op_exec == NULL) {
+			KVP_LOG(LOG_WARNING,
+			    "Unsupported operation OP = %d\n", op);
+			hv_msg->hdr.error = HV_ERROR_NOT_SUPPORTED;
+		} else {
+			/*
+			 * Call the operateion handler's execution routine.
+			 */
+			error = kvp_op_hdlrs[op].kvp_op_exec(hv_msg,
+			    (void *)&kvp_op_hdlrs[op]);
+			if (error != 0 && hv_msg->hdr.error != HV_KVP_S_CONT)
+				KVP_LOG(LOG_WARNING,
+				    "Operation failed OP = %d, error = 0x%x\n",
+				    op, error);
+		}
+
+		/*
+		 * Send the value back to the kernel. The response is
+		 * already in the receive buffer.
+		 */
+hv_kvp_done:
+		len = pwrite(hv_kvp_dev_fd, hv_msg, sizeof(*hv_kvp_dev_buf), 0);
+
+		if (len != sizeof(struct hv_kvp_msg)) {
+			KVP_LOG(LOG_ERR, "write len is: %d\n", len);
+			goto hv_kvp_done;
+		}
+	}
+}
diff --git a/contrib/hyperv/tools/scripts/hv_get_dhcp_info b/contrib/hyperv/tools/scripts/hv_get_dhcp_info
new file mode 100644
index 000000000000..b56efd30f4e4
--- /dev/null
+++ b/contrib/hyperv/tools/scripts/hv_get_dhcp_info
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# This is the script retrieves the DHCP state of a given interface.
+# The kvp daemon code invokes this external script to gather
+# DHCP setting for the specific interface.
+#
+# Input: Name of the interface
+#
+# Output: The script prints the string "Enabled" to stdout to indicate
+#	that DHCP is enabled on the interface. If DHCP is not enabled,
+#	the script prints the string "Disabled" to stdout.
+#
+
+. /etc/rc.subr
+. /etc/network.subr
+
+load_rc_config netif
+
+if dhcpif hn0;
+then
+echo "Enabled"
+else
+echo "Disabled"
+fi
diff --git a/contrib/hyperv/tools/scripts/hv_get_dns_info b/contrib/hyperv/tools/scripts/hv_get_dns_info
new file mode 100644
index 000000000000..7a34440fd902
--- /dev/null
+++ b/contrib/hyperv/tools/scripts/hv_get_dns_info
@@ -0,0 +1,12 @@
+#!/bin/sh
+# This script parses /etc/resolv.conf to retrive DNS information.
+# Khe kvp daemon code invokes this external script to gather
+# DNS information.
+# This script is expected to print the nameserver values to stdout.
+
+#if test -r /etc/resolv.conf
+#then	
+#	awk -- '/^nameserver/ { print $2 }' /etc/resolv.conf
+#fi
+cat /etc/resolv.conf 2>/dev/null | awk '/^nameserver/ { print $2 }'
+
diff --git a/contrib/hyperv/tools/scripts/hv_set_ifconfig b/contrib/hyperv/tools/scripts/hv_set_ifconfig
new file mode 100644
index 000000000000..3dc42e7bbf82
--- /dev/null
+++ b/contrib/hyperv/tools/scripts/hv_set_ifconfig
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# This script activates an interface based on the specified
+# configuration. The kvp daemon code invokes this external script
+# to configure the interface.
+#
+# The only argument to this script is the configuration file that is to
+# be used to configure the interface.
+#
+# Here is the format of the ip configuration file:
+#
+# HWADDR=macaddr
+# IF_NAME=interface name
+# DHCP=yes (This is optional; if yes, DHCP is configured)
+#
+# IPADDR=ipaddr1
+# IPADDR_1=ipaddr2
+# IPADDR_x=ipaddry (where y = x + 1)
+#
+# NETMASK=netmask1
+# NETMASK_x=netmasky (where y = x + 1)
+#
+# GATEWAY=ipaddr1
+# GATEWAY_x=ipaddry (where y = x + 1)
+#
+# DNSx=ipaddrx (where first DNS address is tagged as DNS1 etc)
+#
+# IPV6 addresses will be tagged as IPV6ADDR, IPV6 gateway will be
+# tagged as IPV6_DEFAULTGW and IPV6 NETMASK will be tagged as
+# IPV6NETMASK.
+#
+# The host can specify multiple ipv4 and ipv6 addresses to be
+# configured for the interface. Furthermore, the configuration
+# needs to be persistent. A subsequent GET call on the interface
+# is expected to return the configuration that is set via the SET
+# call.
+#
+
+. $1
+
+sed -i".bak" '/ifconfig_hn0="SYNCDHCP"/d' /etc/rc.conf
+sed -i".bak" '/ifconfig_hn0="DHCP"/d' /etc/rc.conf
+
+# MAC Address
+ifconfig $IF_NAME ether $HWADDR 
+
+# IP and Subnet Mask
+ifconfig $IF_NAME inet $IP_ADDR netmask $SUBNET 
+
+# DNS
+sed -i".bak" '/nameserver/d' /etc/resolv.conf
+echo "nameserver" $DNS >> /etc/resolv.conf 
+
+#Gateway
+# Need to implment if Gateway is not present 
+route flush
+route add default $GATEWAY
+#route change default $GATEWAY
+
+#/etc/rc.d/netif restart 
+#/etc/rc.d/routing restart
+
+
+# DHCP
+if [ $DHCP -eq 1 ]
+then
+	echo ifconfig_hn0=\"DHCP\" >> /etc/rc.conf
+	echo Enabled 
+else
+	echo Disabled DHCP >> /var/log/messages
+	echo Disabled
+fi
+echo "Set IP-Injection Success"
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index a11b09b2e49f..14099e25c372 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -19,16 +19,17 @@ int gethost(family, name, hostp)
 	struct netent *n;
 	u_32_t addr;
 
+	bzero(hostp, sizeof(*hostp));
 	if (!strcmp(name, "test.host.dots")) {
 		if (family == AF_INET) {
 			hostp->in4.s_addr = htonl(0xfedcba98);
 		}
 #ifdef USE_INET6
 		if (family == AF_INET6) {
-			hostp->i6[0] = 0xfe80aa55;
-			hostp->i6[1] = 0x12345678;
-			hostp->i6[2] = 0x5a5aa5a5;
-			hostp->i6[3] = 0xfedcba98;
+			hostp->i6[0] = htonl(0xfe80aa55);
+			hostp->i6[1] = htonl(0x12345678);
+			hostp->i6[2] = htonl(0x5a5aa5a5);
+			hostp->i6[3] = htonl(0xfedcba98);
 		}
 #endif
 		return 0;
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 37a7e12d527e..a94d4ee6105e 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/contrib/ipfilter/lib/printnat.c
@@ -153,7 +153,8 @@ printnat(np, opts)
 
 	} else if (np->in_redir & NAT_REWRITE) {
 		PRINTF(" -> src ");
-		if (np->in_nsrc.na_type == IPLT_DSTLIST) {
+		if (np->in_nsrc.na_atype == FRI_LOOKUP &&
+		    np->in_nsrc.na_type == IPLT_DSTLIST) {
 			PRINTF("dstlist/");
 			if (np->in_nsrc.na_subtype == 0)
 				PRINTF("%d", np->in_nsrc.na_num);
@@ -174,7 +175,8 @@ printnat(np, opts)
 			}
 		}
 		PRINTF(" dst ");
-		if (np->in_ndst.na_type == IPLT_DSTLIST) {
+		if (np->in_ndst.na_atype == FRI_LOOKUP &&
+		    np->in_ndst.na_type == IPLT_DSTLIST) {
 			PRINTF("dstlist/");
 			if (np->in_ndst.na_subtype == 0)
 				PRINTF("%d", np->in_nsrc.na_num);
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 822e9a5ab0ca..e0dc847a100e 100644
--- a/contrib/ipfilter/tools/ipf_y.y
+++ b/contrib/ipfilter/tools/ipf_y.y
@@ -1020,12 +1020,13 @@ addr:	pool '/' YY_NUMBER		{ pooled = 1;
 					  yyexpectaddr = 0; }
 	;
 
-ipaddr:	IPFY_ANY			{ bzero(&($$), sizeof($$));
+ipaddr:	IPFY_ANY			{ memset(&($$), 0, sizeof($$));
 					  $$.type = FRI_NORMAL;
 					  $$.ifpos = -1;
 					  yyexpectaddr = 0;
 					}
-	| hostname			{ $$.a = $1.adr;
+	| hostname			{ memset(&($$), 0, sizeof($$));
+					  $$.a = $1.adr;
 					  $$.f = $1.f;
 					  if ($1.f == AF_INET6)
 						  fill6bits(128, $$.m.i6);
@@ -1038,7 +1039,8 @@ ipaddr:	IPFY_ANY			{ bzero(&($$), sizeof($$));
 	| hostname			{ yyresetdict(); }
 		maskspace		{ yysetdict(maskwords);
 					  yyexpectaddr = 2; }
-		ipmask			{ ntomask($1.f, $5, $$.m.i6);
+		ipmask			{ memset(&($$), 0, sizeof($$));
+					  ntomask($1.f, $5, $$.m.i6);
 					  $$.a = $1.adr;
 					  $$.a.i6[0] &= $$.m.i6[0];
 					  $$.a.i6[1] &= $$.m.i6[1];
@@ -1060,7 +1062,8 @@ ipaddr:	IPFY_ANY			{ bzero(&($$), sizeof($$));
 					  yyresetdict();
 					  yyexpectaddr = 0;
 					}
-	| '(' YY_STR ')'		{ $$.type = FRI_DYNAMIC;
+	| '(' YY_STR ')'		{ memset(&($$), 0, sizeof($$));
+					  $$.type = FRI_DYNAMIC;
 					  ifpflag = FRI_DYNAMIC;
 					  $$.ifpos = addname(&fr, $2);
 					  $$.lif = 0;
@@ -1068,7 +1071,8 @@ ipaddr:	IPFY_ANY			{ bzero(&($$), sizeof($$));
 	| '(' YY_STR ')' '/'
 	  { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); }
 	  maskopts
-					{ $$.type = ifpflag;
+					{ memset(&($$), 0, sizeof($$));
+					  $$.type = ifpflag;
 					  $$.ifpos = addname(&fr, $2);
 					  $$.lif = 0;
 					  if (frc->fr_family == AF_UNSPEC)
@@ -1083,7 +1087,8 @@ ipaddr:	IPFY_ANY			{ bzero(&($$), sizeof($$));
 	| '(' YY_STR ':' YY_NUMBER ')' '/'
 	  { ifpflag = FRI_DYNAMIC; yysetdict(maskwords); }
 	  maskopts
-					{ $$.type = ifpflag;
+					{ memset(&($$), 0, sizeof($$));
+					  $$.type = ifpflag;
 					  $$.ifpos = addname(&fr, $2);
 					  $$.lif = $4;
 					  if (frc->fr_family == AF_UNSPEC)
@@ -1142,30 +1147,35 @@ maskopts:
 	;
 
 hostname:
-	ipv4				{ $$.adr.in4 = $1;
+	ipv4				{ memset(&($$), 0, sizeof($$));
+					  $$.adr.in4 = $1;
 					  if (frc->fr_family == AF_INET6)
 						YYERROR;
 					  $$.f = AF_INET;
 					  yyexpectaddr = 2;
 					}
-	| YY_NUMBER			{ if (frc->fr_family == AF_INET6)
+	| YY_NUMBER			{ memset(&($$), 0, sizeof($$));
+					  if (frc->fr_family == AF_INET6)
 						YYERROR;
 					  $$.adr.in4_addr = $1;
 					  $$.f = AF_INET;
 					  yyexpectaddr = 2;
 					}
-	| YY_HEX			{ if (frc->fr_family == AF_INET6)
+	| YY_HEX			{ memset(&($$), 0, sizeof($$));
+					  if (frc->fr_family == AF_INET6)
 						YYERROR;
 					  $$.adr.in4_addr = $1;
 					  $$.f = AF_INET;
 					  yyexpectaddr = 2;
 					}
-	| YY_STR			{ if (lookuphost($1, &$$.adr) == 0)
+	| YY_STR			{ memset(&($$), 0, sizeof($$));
+					  if (lookuphost($1, &$$.adr) == 0)
 						  $$.f = AF_INET;
 					  free($1);
 					  yyexpectaddr = 2;
 					}
-	| YY_IPV6			{ if (frc->fr_family == AF_INET)
+	| YY_IPV6			{ memset(&($$), 0, sizeof($$));
+					  if (frc->fr_family == AF_INET)
 						YYERROR;
 					  $$.adr = $1;
 					  $$.f = AF_INET6;
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index 71fb8ee37106..8c23403b3e03 100644
--- a/contrib/ipfilter/tools/ipnat_y.y
+++ b/contrib/ipfilter/tools/ipnat_y.y
@@ -871,9 +871,9 @@ mapport:
 			  }
 			  free($2);
 			  if ($3.p1 < 0 || $3.p1 > 65535)
-				yyerror("invalid ICMP Id number");
+				yyerror("invalid 1st ICMP Id number");
 			  if ($3.p2 < 0 || $3.p2 > 65535)
-				yyerror("invalid ICMP Id number");
+				yyerror("invalid 2nd ICMP Id number");
 			  if (strcmp($2, "ipv6-icmp") == 0) {
 				nat->in_pr[0] = IPPROTO_ICMPV6;
 				nat->in_pr[1] = IPPROTO_ICMPV6;
@@ -1058,7 +1058,7 @@ hash:	IPNY_HASH			{ if (!(nat->in_flags & IPN_FILTER)) {
 	;
 
 portstuff:
-	compare portspec		{ $$.pc = $1; $$.p1 = $2; }
+	compare portspec		{ $$.pc = $1; $$.p1 = $2; $$.p2 = 0; }
 	| portspec range portspec	{ $$.pc = $2; $$.p1 = $1; $$.p2 = $3; }
 	;
 
@@ -1151,7 +1151,7 @@ proto:	YY_NUMBER			{ $$ = $1;
 	| YY_STR			{ $$ = getproto($1);
 					  free($1);
 					  if ($$ == -1)
-						yyerror("unknwon protocol");
+						yyerror("unknown protocol");
 					  if ($$ != IPPROTO_TCP &&
 					      $$ != IPPROTO_UDP)
 						suggest_port = 0;
@@ -1164,17 +1164,20 @@ hexnumber:
 
 hostname:
 	YY_STR				{ i6addr_t addr;
+					  int family;
 
-					  bzero(&$$, sizeof($$));
-					  if (gethost(AF_INET, $1,
+#ifdef USE_INET6
+					  if (nat->in_v[0] == 6)
+						family = AF_INET6;
+					  else
+#endif
+						family = AF_INET;
+					  memset(&($$), 0, sizeof($$));
+					  memset(&addr, 0, sizeof(addr));
+					  $$.f = family;
+					  if (gethost(family, $1,
 						      &addr) == 0) {
 						$$.a = addr;
-						$$.f = AF_INET;
-					  } else
-					  if (gethost(AF_INET6, $1,
-						      &addr) == 0) {
-						$$.a = addr;
-						$$.f = AF_INET6;
 					  } else {
 						FPRINTF(stderr,
 							"Unknown host '%s'\n",
@@ -1182,17 +1185,17 @@ hostname:
 					  }
 					  free($1);
 					}
-	| YY_NUMBER			{ bzero(&$$, sizeof($$));
+	| YY_NUMBER			{ memset(&($$), 0, sizeof($$));
 					  $$.a.in4.s_addr = htonl($1);
 					  if ($$.a.in4.s_addr != 0)
 						$$.f = AF_INET;
 					}
 	| ipv4				{ $$ = $1; }
-	| YY_IPV6			{ bzero(&$$, sizeof($$));
+	| YY_IPV6			{ memset(&($$), 0, sizeof($$));
 					  $$.a = $1;
 					  $$.f = AF_INET6;
 					}
-	| YY_NUMBER YY_IPV6		{ bzero(&$$, sizeof($$));
+	| YY_NUMBER YY_IPV6		{ memset(&($$), 0, sizeof($$));
 					  $$.a = $2;
 					  $$.f = AF_INET6;
 					}
@@ -1427,6 +1430,9 @@ setnatproto(p)
 		nat->in_flags |= IPN_UDP;
 		nat->in_flags &= ~IPN_TCP;
 		break;
+#ifdef USE_INET6
+	case IPPROTO_ICMPV6 :
+#endif
 	case IPPROTO_ICMP :
 		nat->in_flags &= ~IPN_TCPUDP;
 		if (!(nat->in_flags & IPN_ICMPQUERY) &&
@@ -1506,7 +1512,7 @@ ipnat_addrule(fd, ioctlfunc, ptr)
 		printnat(ipn, opts);
 
 	if (opts & OPT_DEBUG)
-		binprint(ipn, sizeof(*ipn));
+		binprint(ipn, ipn->in_size);
 
 	if ((opts & OPT_ZERORULEST) != 0) {
 		if ((*ioctlfunc)(fd, add, (void *)&obj) == -1) {
diff --git a/contrib/libc-vis/vis.c b/contrib/libc-vis/vis.c
index 2ba6b5b23d71..4863bbea8596 100644
--- a/contrib/libc-vis/vis.c
+++ b/contrib/libc-vis/vis.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $	*/
+/*	$NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $");
+__RCSID("$NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
@@ -357,7 +357,7 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
 	ssize_t mbslength, maxolen;
 
 	_DIAGASSERT(mbdst != NULL);
-	_DIAGASSERT(mbsrc != NULL);
+	_DIAGASSERT(mbsrc != NULL || mblength == 0);
 	_DIAGASSERT(mbextra != NULL);
 
 	/*
@@ -375,8 +375,6 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
 
 	/* Allocate space for the wide char strings */
 	psrc = pdst = extra = NULL;
-	if (!mblength)
-		mblength = strlen(mbsrc);
 	if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
 		return -1;
 	if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
@@ -528,6 +526,15 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
 	free(psrc);
 	return error;
 }
+
+static int
+istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
+    int flags, const char *mbextra, int *cerr_ptr)
+{
+	return istrsenvisx(mbdst, dlen, mbsrc,
+	    mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
+}
+
 #endif
 
 #if !HAVE_SVIS
@@ -571,13 +578,13 @@ snvis(char *mbdst, size_t dlen, int c, int flags, int nextc, const char *mbextra
 int
 strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
 {
-	return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, mbextra, NULL);
+	return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
 }
 
 int
 strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
 {
-	return istrsenvisx(mbdst, &dlen, mbsrc, 0, flags, mbextra, NULL);
+	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, mbextra, NULL);
 }
 
 int
@@ -646,13 +653,13 @@ nvis(char *mbdst, size_t dlen, int c, int flags, int nextc)
 int
 strvis(char *mbdst, const char *mbsrc, int flags)
 {
-	return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, "", NULL);
+	return istrsenvisxl(mbdst, NULL, mbsrc, flags, "", NULL);
 }
 
 int
 strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
 {
-	return istrsenvisx(mbdst, &dlen, mbsrc, 0, flags, "", NULL);
+	return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
 }
 
 /*
diff --git a/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp b/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
index 716c146811a1..1f20e29606b3 100644
--- a/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -300,6 +300,8 @@ void X86TargetLowering::resetOperationActions() {
   setTruncStoreAction(MVT::i32, MVT::i8 , Expand);
   setTruncStoreAction(MVT::i16, MVT::i8,  Expand);
 
+  setTruncStoreAction(MVT::f64, MVT::f32, Expand);
+
   // SETOEQ and SETUNE require checking two conditions.
   setCondCodeAction(ISD::SETOEQ, MVT::f32, Expand);
   setCondCodeAction(ISD::SETOEQ, MVT::f64, Expand);
@@ -1011,8 +1013,6 @@ void X86TargetLowering::resetOperationActions() {
       AddPromotedToType (ISD::SELECT, VT, MVT::v2i64);
     }
 
-    setTruncStoreAction(MVT::f64, MVT::f32, Expand);
-
     // Custom lower v2i64 and v2f64 selects.
     setOperationAction(ISD::LOAD,               MVT::v2f64, Legal);
     setOperationAction(ISD::LOAD,               MVT::v2i64, Legal);
diff --git a/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff b/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff
new file mode 100644
index 000000000000..fea76a1cebed
--- /dev/null
+++ b/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff
@@ -0,0 +1,34 @@
+Update the ARMv6 core clang targets to be an arm1176jzf-s. This brings us
+in line with gcc in base as this makes llvm generate code for the armv6k
+variant of the instruction set.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/269387
+
+Index: tools/clang/lib/Driver/ToolChain.cpp
+===================================================================
+--- tools/clang/lib/Driver/ToolChain.cpp	(revision 269386)
++++ tools/clang/lib/Driver/ToolChain.cpp	(revision 269387)
+@@ -183,7 +183,8 @@ static const char *getARMTargetCPU(const ArgList &
+     MArch = Triple.getArchName();
+   }
+ 
+-  if (Triple.getOS() == llvm::Triple::NetBSD) {
++  if (Triple.getOS() == llvm::Triple::NetBSD ||
++      Triple.getOS() == llvm::Triple::FreeBSD) {
+     if (MArch == "armv6")
+       return "arm1176jzf-s";
+   }
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp	(revision 269386)
++++ tools/clang/lib/Driver/Tools.cpp	(revision 269387)
+@@ -499,7 +499,8 @@ static std::string getARMTargetCPU(const ArgList &
+     MArch = Triple.getArchName();
+   }
+ 
+-  if (Triple.getOS() == llvm::Triple::NetBSD) {
++  if (Triple.getOS() == llvm::Triple::NetBSD ||
++      Triple.getOS() == llvm::Triple::FreeBSD) {
+     if (MArch == "armv6")
+       return "arm1176jzf-s";
+   }
diff --git a/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff b/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
index 4603a0a69dc7..a3bd4c9fb988 100644
--- a/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
+++ b/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
@@ -1,7 +1,31 @@
-Index: contrib/llvm/include/llvm/Support/ELF.h
+Backport r197824, r213427 and r213960 from LLVM trunk:
+
+  r197824 | rdivacky | 2013-12-20 19:08:54 +0100 (Fri, 20 Dec 2013) | 2 lines
+
+  Implement initial-exec TLS for PPC32.
+
+  r213427 | hfinkel | 2014-07-19 01:29:49 +0200 (Sat, 19 Jul 2014) | 7 lines
+
+  [PowerPC] 32-bit ELF PIC support
+
+  This adds initial support for PPC32 ELF PIC (Position Independent Code; the
+  -fPIC variety), thus rectifying a long-standing deficiency in the PowerPC
+  backend.
+
+  Patch by Justin Hibbits!
+
+  r213960 | hfinkel | 2014-07-25 19:47:22 +0200 (Fri, 25 Jul 2014) | 3 lines
+
+  [PowerPC] Support TLS on PPC32/ELF
+
+  Patch by Justin Hibbits!
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/270147
+
+Index: include/llvm/Support/ELF.h
 ===================================================================
---- contrib/llvm/include/llvm/Support/ELF.h	(revision 270019)
-+++ contrib/llvm/include/llvm/Support/ELF.h	(working copy)
+--- include/llvm/Support/ELF.h	(revision 270019)
++++ include/llvm/Support/ELF.h	(working copy)
 @@ -437,6 +437,7 @@
    R_PPC_GOT16_LO              = 15,
    R_PPC_GOT16_HI              = 16,
@@ -10,10 +34,10 @@ Index: contrib/llvm/include/llvm/Support/ELF.h
    R_PPC_REL32                 = 26,
    R_PPC_TLS                   = 67,
    R_PPC_DTPMOD32              = 68,
-Index: contrib/llvm/lib/Object/ELF.cpp
+Index: lib/Object/ELF.cpp
 ===================================================================
---- contrib/llvm/lib/Object/ELF.cpp	(revision 270019)
-+++ contrib/llvm/lib/Object/ELF.cpp	(working copy)
+--- lib/Object/ELF.cpp	(revision 270019)
++++ lib/Object/ELF.cpp	(working copy)
 @@ -507,6 +507,7 @@
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_LO);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HI);
@@ -22,10 +46,10 @@ Index: contrib/llvm/lib/Object/ELF.cpp
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_REL32);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_TLS);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_DTPMOD32);
-Index: contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
+Index: lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(working copy)
+--- lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(revision 270019)
++++ lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp	(working copy)
 @@ -18,6 +18,7 @@
  #include "llvm/MC/MCExpr.h"
  #include "llvm/MC/MCInst.h"
@@ -52,10 +76,10 @@ Index: contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
  }
  
  
-Index: contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+Index: lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(working copy)
+--- lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(revision 270019)
++++ lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp	(working copy)
 @@ -64,7 +64,15 @@
        llvm_unreachable("Unimplemented");
      case PPC::fixup_ppc_br24:
@@ -123,10 +147,10 @@ Index: contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
          break;
        }
        break;
-Index: contrib/llvm/lib/Target/PowerPC/PPC.h
+Index: lib/Target/PowerPC/PPC.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPC.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPC.h	(working copy)
+--- lib/Target/PowerPC/PPC.h	(revision 270019)
++++ lib/Target/PowerPC/PPC.h	(working copy)
 @@ -53,10 +53,11 @@
      // PPC Specific MachineOperand flags.
      MO_NO_FLAG,
@@ -143,10 +167,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPC.h
      
      /// MO_PIC_FLAG - If this bit is set, the symbol reference is relative to
      /// the function's picbase, e.g. lo16(symbol-picbase).
-Index: contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+Index: lib/Target/PowerPC/PPCAsmPrinter.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	(working copy)
+--- lib/Target/PowerPC/PPCAsmPrinter.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCAsmPrinter.cpp	(working copy)
 @@ -19,6 +19,7 @@
  #define DEBUG_TYPE "asmprinter"
  #include "PPC.h"
@@ -578,10 +602,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
      }
    }
  
-Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
+Index: lib/Target/PowerPC/PPCFrameLowering.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp	(working copy)
+--- lib/Target/PowerPC/PPCFrameLowering.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCFrameLowering.cpp	(working copy)
 @@ -299,7 +299,7 @@
    const PPCRegisterInfo *RegInfo =
      static_cast<const PPCRegisterInfo*>(MF.getTarget().getRegisterInfo());
@@ -664,10 +688,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
      // Allocate the frame index for the base pointer save area.
      BPSI = MFI->CreateFixedObject(isPPC64? 8 : 4, BPOffset, true);
      // Save the result.
-Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
+Index: lib/Target/PowerPC/PPCFrameLowering.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h	(working copy)
+--- lib/Target/PowerPC/PPCFrameLowering.h	(revision 270019)
++++ lib/Target/PowerPC/PPCFrameLowering.h	(working copy)
 @@ -96,12 +96,14 @@
  
    /// getBasePointerSaveOffset - Return the previous frame offset to save the
@@ -685,10 +709,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
    }
  
    /// getLinkageSize - Return the size of the PowerPC ABI linkage area.
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+Index: lib/Target/PowerPC/PPCISelDAGToDAG.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(working copy)
+--- lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCISelDAGToDAG.cpp	(working copy)
 @@ -15,6 +15,7 @@
  #define DEBUG_TYPE "ppc-codegen"
  #include "PPC.h"
@@ -748,10 +772,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
    case PPCISD::VADD_SPLAT: {
      // This expands into one of three sequences, depending on whether
      // the first operand is odd or even, positive or negative.
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+Index: lib/Target/PowerPC/PPCISelLowering.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp	(working copy)
+--- lib/Target/PowerPC/PPCISelLowering.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCISelLowering.cpp	(working copy)
 @@ -670,6 +670,7 @@
    case PPCISD::ADDIS_TOC_HA:    return "PPCISD::ADDIS_TOC_HA";
    case PPCISD::LD_TOC_L:        return "PPCISD::LD_TOC_L";
@@ -972,10 +996,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  
    MachineInstrBuilder MIB;
  
-Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
+Index: lib/Target/PowerPC/PPCISelLowering.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h	(working copy)
+--- lib/Target/PowerPC/PPCISelLowering.h	(revision 270019)
++++ lib/Target/PowerPC/PPCISelLowering.h	(working copy)
 @@ -177,6 +177,12 @@
        CR6SET,
        CR6UNSET,
@@ -989,10 +1013,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
        /// G8RC = ADDIS_GOT_TPREL_HA %X2, Symbol - Used by the initial-exec
        /// TLS model, produces an ADDIS8 instruction that adds the GOT
        /// base to sym\@got\@tprel\@ha.
-Index: contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
+Index: lib/Target/PowerPC/PPCInstr64Bit.td
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td	(working copy)
+--- lib/Target/PowerPC/PPCInstr64Bit.td	(revision 270019)
++++ lib/Target/PowerPC/PPCInstr64Bit.td	(working copy)
 @@ -36,10 +36,6 @@
  def tocentry : Operand<iPTR> {
    let MIOperandInfo = (ops i64imm:$imm);
@@ -1004,10 +1028,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
  def tlsreg : Operand<i64> {
    let EncoderMethod = "getTLSRegEncoding";
    let ParserMatchClass = PPCTLSRegOperand;
-Index: contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
+Index: lib/Target/PowerPC/PPCInstrInfo.td
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td	(working copy)
+--- lib/Target/PowerPC/PPCInstrInfo.td	(revision 270019)
++++ lib/Target/PowerPC/PPCInstrInfo.td	(working copy)
 @@ -57,6 +57,9 @@
    SDTCisPtrTy<0>, SDTCisVT<1, i32>
  ]>;
@@ -1130,10 +1154,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
  // Standard shifts.  These are represented separately from the real shifts above
  // so that we can distinguish between shifts that allow 5-bit and 6-bit shift
  // amounts.
-Index: contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
+Index: lib/Target/PowerPC/PPCMCInstLower.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp	(working copy)
+--- lib/Target/PowerPC/PPCMCInstLower.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCMCInstLower.cpp	(working copy)
 @@ -13,6 +13,7 @@
  //===----------------------------------------------------------------------===//
  
@@ -1188,10 +1212,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
    const MCExpr *Expr = MCSymbolRefExpr::Create(Symbol, RefKind, Ctx);
  
    if (!MO.isJTI() && MO.getOffset())
-Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
+Index: lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(working copy)
+--- lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCMachineFunctionInfo.cpp	(working copy)
 @@ -8,8 +8,16 @@
  //===----------------------------------------------------------------------===//
  
@@ -1209,10 +1233,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
 +  return MF.getContext().GetOrCreateSymbol(Twine(MAI->getPrivateGlobalPrefix())+
 +    Twine(MF.getFunctionNumber())+"$poff");
 +}
-Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
+Index: lib/Target/PowerPC/PPCMachineFunctionInfo.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h	(working copy)
+--- lib/Target/PowerPC/PPCMachineFunctionInfo.h	(revision 270019)
++++ lib/Target/PowerPC/PPCMachineFunctionInfo.h	(working copy)
 @@ -92,6 +92,12 @@
    /// 64-bit SVR4 ABI.
    SmallVector<unsigned, 3> MustSaveCRs;
@@ -1249,10 +1273,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
  };
  
  } // end of namespace llvm
-Index: contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
+Index: lib/Target/PowerPC/PPCRegisterInfo.cpp
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	(working copy)
+--- lib/Target/PowerPC/PPCRegisterInfo.cpp	(revision 270019)
++++ lib/Target/PowerPC/PPCRegisterInfo.cpp	(working copy)
 @@ -199,7 +199,16 @@
    if (PPCFI->needsFP(MF))
      Reserved.set(PPC::R31);
@@ -1287,10 +1311,10 @@ Index: contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
  }
  
  bool PPCRegisterInfo::hasBasePointer(const MachineFunction &MF) const {
-Index: contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h
+Index: lib/Target/PowerPC/PPCSubtarget.h
 ===================================================================
---- contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h	(revision 270019)
-+++ contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h	(working copy)
+--- lib/Target/PowerPC/PPCSubtarget.h	(revision 270019)
++++ lib/Target/PowerPC/PPCSubtarget.h	(working copy)
 @@ -189,6 +189,9 @@
    /// isBGQ - True if this is a BG/Q platform.
    bool isBGQ() const { return TargetTriple.getVendor() == Triple::BGQ; }
diff --git a/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff b/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff
deleted file mode 100644
index 30577e7d5658..000000000000
--- a/contrib/llvm/patches/patch-r271024-llvm-r216989-fix-movm-armv6.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: lib/Target/ARM/ARMInstrInfo.td
-===================================================================
---- lib/Target/ARM/ARMInstrInfo.td	(revision 271024)
-+++ lib/Target/ARM/ARMInstrInfo.td	(revision 271026)
-@@ -3248,7 +3248,8 @@
- def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR),
-              (SBCri   GPR:$src, so_imm_not:$imm)>;
- def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR),
--             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>;
-+             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>,
-+             Requires<[IsARM, HasV6T2]>;
- 
- // Note: These are implemented in C++ code, because they have to generate
- // ADD/SUBrs instructions, which use a complex pattern that a xform function
diff --git a/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff b/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff
new file mode 100644
index 000000000000..f477390094dc
--- /dev/null
+++ b/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff
@@ -0,0 +1,78 @@
+Pull in r216989 from upstream llvm trunk (by Renato Golin):
+
+  MFV:  Only emit movw on ARMv6T2+
+
+Pull in r216990 from upstream llvm trunk (by Renato Golin):
+
+  Missing test from r216989
+
+Building for the FreeBSD default target ARMv6 was emitting movw ASM on certain
+test cases (found building qmake4/5 for ARM).  Don't do that, moreover, the AS
+in base doesn't understand this instruction for this target.  One would need
+to use --integrated-as to get this to build if desired.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/271025
+
+Index: lib/Target/ARM/ARMInstrInfo.td
+===================================================================
+--- lib/Target/ARM/ARMInstrInfo.td
++++ lib/Target/ARM/ARMInstrInfo.td
+@@ -3248,7 +3248,8 @@
+ def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR),
+              (SBCri   GPR:$src, so_imm_not:$imm)>;
+ def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR),
+-             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>;
++             (SBCrr   GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>,
++             Requires<[IsARM, HasV6T2]>;
+ 
+ // Note: These are implemented in C++ code, because they have to generate
+ // ADD/SUBrs instructions, which use a complex pattern that a xform function
+Index: test/CodeGen/ARM/carry.ll
+===================================================================
+--- test/CodeGen/ARM/carry.ll
++++ test/CodeGen/ARM/carry.ll
+@@ -1,4 +1,4 @@
+-; RUN: llc < %s -march=arm | FileCheck %s
++; RUN: llc < %s -mtriple=armv6t2-eabi | FileCheck %s
+ 
+ define i64 @f1(i64 %a, i64 %b) {
+ ; CHECK-LABEL: f1:
+Index: test/CodeGen/ARM/pr18364-movw.ll
+===================================================================
+--- test/CodeGen/ARM/pr18364-movw.ll
++++ test/CodeGen/ARM/pr18364-movw.ll
+@@ -0,0 +1,34 @@
++; RUN: llc < %s -mtriple=armv5te | FileCheck %s --check-prefix=V5
++; RUN: llc < %s -mtriple=armv6   | FileCheck %s --check-prefix=V6
++; RUN: llc < %s -mtriple=armv6t2 | FileCheck %s --check-prefix=V6T2
++; RUN: llc < %s -mtriple=armv7   | FileCheck %s --check-prefix=V7
++; PR18364
++
++define i64 @f() #0 {
++entry:
++; V5-NOT: movw
++; V6-NOT: movw
++; V6T2: movw
++; V7: movw
++  %y = alloca i64, align 8
++  %z = alloca i64, align 8
++  store i64 1, i64* %y, align 8
++  store i64 11579764786944, i64* %z, align 8
++  %0 = load i64* %y, align 8
++  %1 = load i64* %z, align 8
++  %sub = sub i64 %0, %1
++  ret i64 %sub
++}
++
++define i64 @g(i64 %a, i32 %b) #0 {
++entry:
++; V5-NOT: movw
++; V6-NOT: movw
++; V6T2: movw
++; V7: movw
++  %0 = mul i64 %a, 86400000
++  %mul = add i64 %0, -210866803200000
++  %conv = sext i32 %b to i64
++  %add = add nsw i64 %mul, %conv
++  ret i64 %add
++}
diff --git a/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff b/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff
new file mode 100644
index 000000000000..4088dbb6dc7d
--- /dev/null
+++ b/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff
@@ -0,0 +1,68 @@
+Pull in r200797 from upstream clang trunk (by Adrian Prantl):
+
+  Debug info: fix a crasher when when emitting debug info for
+  not-yet-completed templated types. getTypeSize() needs a complete type.
+
+  rdar://problem/15931354
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/271282
+
+Index: tools/clang/lib/CodeGen/CGDebugInfo.cpp
+===================================================================
+--- tools/clang/lib/CodeGen/CGDebugInfo.cpp
++++ tools/clang/lib/CodeGen/CGDebugInfo.cpp
+@@ -2251,9 +2251,10 @@ llvm::DICompositeType CGDebugInfo::CreateLimitedTy
+   if (T && (!T.isForwardDecl() || !RD->getDefinition()))
+       return T;
+ 
+-  // If this is just a forward declaration, construct an appropriately
+-  // marked node and just return it.
+-  if (!RD->getDefinition())
++  // If this is just a forward or incomplete declaration, construct an
++  // appropriately marked node and just return it.
++  const RecordDecl *D = RD->getDefinition();
++  if (!D || !D->isCompleteDefinition())
+     return getOrCreateRecordFwdDecl(Ty, RDContext);
+ 
+   uint64_t Size = CGM.getContext().getTypeSize(Ty);
+Index: tools/clang/test/CodeGenCXX/debug-info-template-fwd.cpp
+===================================================================
+--- tools/clang/test/CodeGenCXX/debug-info-template-fwd.cpp
++++ tools/clang/test/CodeGenCXX/debug-info-template-fwd.cpp
+@@ -0,0 +1,36 @@
++// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -g -emit-llvm -o - | FileCheck %s
++// This test is for a crash when emitting debug info for not-yet-completed types.
++// Test that we don't actually emit a forward decl for the offending class:
++// CHECK:  [ DW_TAG_class_type ] [Derived<const __CFString, Foo>] {{.*}} [def]
++// rdar://problem/15931354
++typedef const struct __CFString * CFStringRef;
++template <class R> class Returner {};
++typedef const __CFString String;
++
++template <class A, class B> class Derived;
++
++template <class A, class B>
++class Base
++{
++  static Derived<A, B>* create();
++};
++
++template <class A, class B>
++class Derived : public Base<A, B> {
++public:
++  static void foo();
++};
++
++class Foo
++{
++  Foo();
++  static Returner<Base<String,Foo> > all();
++};
++
++Foo::Foo(){}
++
++Returner<Base<String,Foo> > Foo::all()
++{
++  Derived<String,Foo>::foo();
++  return Foo::all();
++}
diff --git a/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff b/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff
new file mode 100644
index 000000000000..a14020699363
--- /dev/null
+++ b/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff
@@ -0,0 +1,43 @@
+Pull in r205331 from upstream clang trunk (by Adrian Prantl):
+
+  Debug info: fix a crash when emitting IndirectFieldDecls, which were
+  previously not handled at all.
+  rdar://problem/16348575
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/271432
+
+Index: tools/clang/lib/CodeGen/CGDebugInfo.cpp
+===================================================================
+--- tools/clang/lib/CodeGen/CGDebugInfo.cpp	(revision 205330)
++++ tools/clang/lib/CodeGen/CGDebugInfo.cpp	(revision 205331)
+@@ -1252,7 +1252,7 @@ CollectTemplateParams(const TemplateParameterList
+         V = CGM.GetAddrOfFunction(FD);
+       // Member data pointers have special handling too to compute the fixed
+       // offset within the object.
+-      if (isa<FieldDecl>(D)) {
++      if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
+         // These five lines (& possibly the above member function pointer
+         // handling) might be able to be refactored to use similar code in
+         // CodeGenModule::getMemberPointerConstant
+Index: tools/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
+===================================================================
+--- tools/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp	(revision 0)
++++ tools/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp	(revision 205331)
+@@ -0,0 +1,17 @@
++// RUN: %clang_cc1 -emit-llvm -g -triple x86_64-apple-darwin %s -o - | FileCheck %s
++//
++// Test that indirect field decls are handled gracefully.
++// rdar://problem/16348575
++//
++template <class T, int T::*ptr> class Foo {  };
++
++struct Bar {
++  int i1;
++  // CHECK: [ DW_TAG_member ] [line [[@LINE+1]], size 32, align 32, offset 32] [from _ZTSN3BarUt_E]
++  union {
++    // CHECK: [ DW_TAG_member ] [i2] [line [[@LINE+1]], size 32, align 32, offset 0] [from int]
++    int i2;
++  };
++};
++
++Foo<Bar, &Bar::i2> the_foo;
diff --git a/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff b/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff
new file mode 100644
index 000000000000..c16279a6bc06
--- /dev/null
+++ b/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff
@@ -0,0 +1,64 @@
+Pull in r217410 from upstream llvm trunk (by Bob Wilson):
+
+  Set trunc store action to Expand for all X86 targets.
+
+  When compiling without SSE2, isTruncStoreLegal(F64, F32) would return
+  Legal, whereas with SSE2 it would return Expand. And since the Target
+  doesn't seem to actually handle a truncstore for double -> float, it
+  would just output a store of a full double in the space for a float
+  hence overwriting other bits on the stack.
+
+  Patch by Luqman Aden!
+
+This should fix clang -O0 on i386 assigning garbage to floats, in
+certain scenarios.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/271597
+
+Index: lib/Target/X86/X86ISelLowering.cpp
+===================================================================
+--- lib/Target/X86/X86ISelLowering.cpp	(revision 208032)
++++ lib/Target/X86/X86ISelLowering.cpp	(working copy)
+@@ -300,6 +300,8 @@ void X86TargetLowering::resetOperationActions() {
+   setTruncStoreAction(MVT::i32, MVT::i8 , Expand);
+   setTruncStoreAction(MVT::i16, MVT::i8,  Expand);
+ 
++  setTruncStoreAction(MVT::f64, MVT::f32, Expand);
++
+   // SETOEQ and SETUNE require checking two conditions.
+   setCondCodeAction(ISD::SETOEQ, MVT::f32, Expand);
+   setCondCodeAction(ISD::SETOEQ, MVT::f64, Expand);
+@@ -1011,8 +1013,6 @@ void X86TargetLowering::resetOperationActions() {
+       AddPromotedToType (ISD::SELECT, VT, MVT::v2i64);
+     }
+ 
+-    setTruncStoreAction(MVT::f64, MVT::f32, Expand);
+-
+     // Custom lower v2i64 and v2f64 selects.
+     setOperationAction(ISD::LOAD,               MVT::v2f64, Legal);
+     setOperationAction(ISD::LOAD,               MVT::v2i64, Legal);
+Index: test/CodeGen/X86/dont-trunc-store-double-to-float.ll
+===================================================================
+--- test/CodeGen/X86/dont-trunc-store-double-to-float.ll	(revision 0)
++++ test/CodeGen/X86/dont-trunc-store-double-to-float.ll	(working copy)
+@@ -0,0 +1,20 @@
++; RUN: llc -march=x86 < %s | FileCheck %s
++
++; CHECK-LABEL: @bar
++; CHECK: movl $1074339512,
++; CHECK: movl $1374389535,
++; CHECK: movl $1078523331,
++define void @bar() unnamed_addr {
++entry-block:
++  %a = alloca double
++  %b = alloca float
++
++  store double 3.140000e+00, double* %a
++  %0 = load double* %a
++
++  %1 = fptrunc double %0 to float
++
++  store float %1, float* %b
++
++  ret void
++}
diff --git a/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp b/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
index 8be351ead4ac..b7b9d8c6a3d9 100644
--- a/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1241,7 +1241,7 @@ CollectTemplateParams(const TemplateParameterList *TPList,
         V = CGM.GetAddrOfFunction(FD);
       // Member data pointers have special handling too to compute the fixed
       // offset within the object.
-      if (isa<FieldDecl>(D)) {
+      if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
         // These five lines (& possibly the above member function pointer
         // handling) might be able to be refactored to use similar code in
         // CodeGenModule::getMemberPointerConstant
@@ -2235,9 +2235,10 @@ llvm::DICompositeType CGDebugInfo::CreateLimitedType(const RecordType *Ty) {
   if (T && (!T.isForwardDecl() || !RD->getDefinition()))
       return T;
 
-  // If this is just a forward declaration, construct an appropriately
-  // marked node and just return it.
-  if (!RD->getDefinition())
+  // If this is just a forward or incomplete declaration, construct an
+  // appropriately marked node and just return it.
+  const RecordDecl *D = RD->getDefinition();
+  if (!D || !D->isCompleteDefinition())
     return getOrCreateRecordFwdDecl(Ty, RDContext);
 
   uint64_t Size = CGM.getContext().getTypeSize(Ty);
diff --git a/contrib/netbsd-tests/FREEBSD-upgrade b/contrib/netbsd-tests/FREEBSD-upgrade
new file mode 100644
index 000000000000..edeba708cb18
--- /dev/null
+++ b/contrib/netbsd-tests/FREEBSD-upgrade
@@ -0,0 +1,38 @@
+$FreeBSD$
+
+This document contains a collection of notes specific to the import
+of the NetBSD test suite into head.  These notes are built on the instructions
+in the FreeBSD Subversion Primer that detail how to deal with vendor
+branches and you are supposed to follow those:
+
+	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
+
+The NetBSD test source code was originally obtained via NetBSD anoncvs as
+described in the NetBSD handbook:
+
+	http://www.netbsd.org/docs/guide/en/chap-fetch.html#chap-fetch-cvs
+
+and is imported into the NetBSD/tests vendor branch (see
+base/vendor/NetBSD/tests/).
+
+The process used to bootstrap the vendor tree was similar to the following:
+
+	/bin/sh
+	export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
+	cvs -z9 co -D "09/30/2014 20:45" -P src/tests
+	mv src/tests/* tests/dist/.
+
+Please adjust the checkout date spec (the argument passed via -D) to match
+the desired checkout time.
+
+To merge the vendor branch into head do something like this:
+
+	cd .../base/head/contrib/netbsd-tests
+	svn merge --accept=postpone \
+	    svn+ssh://svn.freebsd.org/base/vendor/NetBSD/tests/dist .
+	find . -name Makefile\* | xargs svn rm --force
+
+and resolve any conflicts that may arise at this point.
+
+Lastly, with the list of old and new files in this import, make sure
+to update the reachover Makefiles accordingly.
diff --git a/contrib/netbsd-tests/bin/cat/d_align.in b/contrib/netbsd-tests/bin/cat/d_align.in
new file mode 100644
index 000000000000..31bf4a7a143f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/cat/d_align.in
@@ -0,0 +1,3 @@
+a b c
+1 2 3
+x y z
diff --git a/contrib/netbsd-tests/bin/cat/d_align.out b/contrib/netbsd-tests/bin/cat/d_align.out
new file mode 100644
index 000000000000..fd324697185b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/cat/d_align.out
@@ -0,0 +1,3 @@
+     1	a b c$
+     2	1 2 3$
+     3	x y z$
diff --git a/contrib/netbsd-tests/bin/cat/t_cat.sh b/contrib/netbsd-tests/bin/cat/t_cat.sh
new file mode 100755
index 000000000000..1b7a9307eeeb
--- /dev/null
+++ b/contrib/netbsd-tests/bin/cat/t_cat.sh
@@ -0,0 +1,59 @@
+# $NetBSD: t_cat.sh,v 1.2 2012/03/27 17:57:02 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case align
+align_head() {
+	atf_set "descr" "Test that cat(1) aligns the output " \
+			"right with options '-be' (PR bin/4841)"
+}
+
+align_body() {
+
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \
+		-x "cat -be $(atf_get_srcdir)/d_align.in"
+}
+
+atf_test_case nonexistent
+nonexistent_head() {
+	atf_set "descr" "Test that cat(1) doesn't return zero exit " \
+			"status for a nonexistent file (PR bin/3538)"
+}
+
+nonexistent_body() {
+
+	atf_check -s not-exit:0 -o empty -e not-empty \
+		-x "cat /some/name/that/does/not/exist"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case align
+	atf_add_test_case nonexistent
+}
diff --git a/contrib/netbsd-tests/bin/cp/t_cp.sh b/contrib/netbsd-tests/bin/cp/t_cp.sh
new file mode 100755
index 000000000000..be55c7cb0ef3
--- /dev/null
+++ b/contrib/netbsd-tests/bin/cp/t_cp.sh
@@ -0,0 +1,294 @@
+# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+FILES="file file2 file3 link dir dir2 dirlink target"
+
+cleanup() {
+        rm -fr ${FILES}
+}
+
+cp_compare() {
+	echo "Ensuring that $2 and $3 are identical"
+	cmp -s $2 $3 || atf_fail "$2 and $3 are different"
+}
+
+reset() {
+	cleanup
+	echo "I'm a file" > file
+	echo "I'm a file, 2" > file2
+	echo "I'm a file, 3" > file3
+	ln -s file link
+	mkdir dir
+	ln -s dir dirlink
+}
+
+atf_test_case file_to_file
+file_to_file_head() {
+	atf_set "descr" "Checks the copy of a file to a file"
+}
+file_to_file_body() {
+	reset
+
+	file_to_file_simple
+	file_to_file_preserve
+	file_to_file_noflags
+}
+
+file_to_file_simple() {
+	rm -f file2
+	umask 022
+	chmod 777 file
+	atf_check -s eq:0 -o empty -e empty cp file file2
+	cp_compare file_to_file_simple file file2
+	if [ `stat -f "%Lp" file2` != "755" ]; then
+		atf_fail "new file not created with umask"
+	fi
+
+	chmod 644 file
+	chmod 777 file2
+	cp_compare file_to_file_simple file file2
+	if [ `stat -f "%Lp" file2` != "777" ]; then
+		atf_fail "existing files permissions not retained"
+	fi
+}
+
+file_to_file_preserve() {
+	rm file3
+	chmod 644 file
+	chflags nodump file
+	atf_check -s eq:0 -o empty -e empty cp -p file file3
+	finfo=`stat -f "%p%u%g%m%z%f" file`
+	f3info=`stat -f "%p%u%g%m%z%f" file3`
+	if [ $finfo != $f3info ]; then
+		atf_fail "attributes not preserved"
+	fi
+}
+
+file_to_file_noflags() {
+	rm file3
+	chmod 644 file
+	chflags nodump file
+	atf_check -s eq:0 -o empty -e empty cp -p -N file file3
+	finfo=`stat -f "%f" file`
+	f3info=`stat -f "%f" file3`
+	if [ $finfo = $f3info ]; then
+		atf_fail "-p -N preserved file flags"
+	fi
+}
+
+atf_test_case file_to_link
+file_to_link_head() {
+	atf_set "descr" "Checks the copy of a file to a symbolic link"
+}
+file_to_link_body() {
+	reset
+	atf_check -s eq:0 -o empty -e empty cp file2 link
+	cp_compare file_to_link file file2
+}
+
+atf_test_case link_to_file
+link_to_file_head() {
+	atf_set "descr" "Checks the copy of a symbolic link to a file"
+}
+link_to_file_body() {
+	reset
+	# file and link are identical (not copied).
+	atf_check -s eq:1 -o empty -e ignore cp link file
+	atf_check -s eq:0 -o empty -e empty cp link file2
+	cp_compare link_to_file file file2
+}
+
+atf_test_case file_over_link
+file_over_link_head() {
+	atf_set "descr" "Checks the copy of a file to a symbolic link" \
+	                "without following it"
+}
+file_over_link_body() {
+	reset
+	atf_check -s eq:0 -o empty -e empty cp -P file link
+	cp_compare file_over_link file link
+}
+
+atf_test_case link_over_file
+link_over_file_head() {
+	atf_set "descr" "Checks the copy of a symbolic link to a file" \
+	                "without following the former"
+}
+link_over_file_body() {
+	reset
+	atf_check -s eq:0 -o empty -e empty cp -P link file
+	if [ `readlink link` != `readlink file` ]; then
+		atf_fail "readlink link != readlink file"
+	fi
+}
+
+atf_test_case files_to_dir
+files_to_dir_head() {
+	atf_set "descr" "Checks the copy of multiple files into a directory"
+}
+files_to_dir_body() {
+	reset
+	# can't copy multiple files to a file
+	atf_check -s eq:1 -o empty -e ignore cp file file2 file3
+	atf_check -s eq:0 -o empty -e empty cp file file2 link dir
+	cp_compare files_to_dir file "dir/file"
+}
+
+atf_test_case dir_to_file
+dir_to_file_head() {
+	atf_set "descr" "Checks the copy of a directory onto a file, which" \
+	                "should not work"
+}
+dir_to_file_body() {
+	reset
+	# can't copy a dir onto a file
+	atf_check -s eq:1 -o empty -e ignore cp dir file
+	atf_check -s eq:1 -o empty -e ignore cp -R dir file
+}
+
+atf_test_case file_to_linkdir
+file_to_linkdir_head() {
+	atf_set "descr" "Checks the copy of a file to a symbolic link that" \
+	                "points to a directory"
+}
+file_to_linkdir_body() {
+	reset
+	atf_check -s eq:0 -o empty -e empty cp file dirlink
+	cp_compare file_to_linkdir file "dir/file"
+
+	# overwrite the link
+	atf_check -s eq:0 -o empty -e empty cp -P file dirlink
+	atf_check -s eq:1 -o empty -e empty readlink dirlink
+	cp_compare file_to_linkdir file dirlink
+}
+
+atf_test_case linkdir_to_file
+linkdir_to_file_head() {
+	atf_set "descr" "Checks the copy of a symbolic link that points to" \
+	                "a directory onto a file"
+}
+linkdir_to_file_body() {
+	reset
+	# cannot copy a dir onto a file
+	atf_check -s eq:1 -o empty -e ignore cp dirlink file
+
+	# overwrite the link
+	atf_check -s eq:0 -o empty -e empty cp -P dirlink file
+	if [ `readlink file` != `readlink dirlink` ]; then
+		atf_fail "readlink link != readlink file"
+	fi
+}
+
+dir_to_dne_no_R() {
+	atf_check -s eq:1 -o empty -e ignore cp dir dir2
+}
+
+dir_to_dne() {
+	atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+	cp_compare dir_to_dne "dir/file" "dir2/file"
+	readlink dir2/link >/dev/null
+	if [ $? -gt 0 ]; then
+		atf_fail "-R didn't copy a link as a link"
+	fi
+}
+
+dir_to_dir_H() {
+	dir_to_dir_setup
+	atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+
+	chmod 777 dir
+
+	# copy a dir into a dir, only command-line links are followed
+	atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2
+	cp_compare dir_to_dir_H "dir/file" "dir2/dirlink/file"
+	readlink dir2/dirlink/link >/dev/null
+	if [ $? -gt 0 ]; then
+		atf_fail "didn't copy a link as a link"
+	fi
+
+	# Created directories have the same mode as the corresponding
+        # source directory, unmodified by the process's umask.
+	if [ `stat -f "%Lp" dir2/dirlink` != "777" ]; then
+		atf_fail "-R modified dir perms with umask"
+	fi
+}
+
+dir_to_dir_L() {
+	dir_to_dir_setup
+	atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+	atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2
+
+	# copy a dir into a dir, following all links
+	atf_check -s eq:0 -o empty -e empty cp -R -H -L dirlink dir2/dirlink
+	cp_compare dir_to_dir_L "dir/file" "dir2/dirlink/dirlink/file"
+	# fail if -R -L copied a link as a link
+	atf_check -s eq:1 -o ignore -e empty readlink dir2/dirlink/dirlink/link
+}
+
+dir_to_dir_subdir_exists() {
+	# recursively copy a dir into another dir, with some subdirs already
+	# existing
+	cleanup
+
+	mkdir -p dir/1 dir/2 dir/3 target/2
+	echo "file" > dir/2/file
+	atf_check -s eq:0 -o empty -e empty cp -R dir/* target
+	cp_compare dir_to_dir_subdir_exists "dir/2/file" "target/2/file"
+}
+
+dir_to_dir_setup() {
+	reset
+	umask 077
+	cp -P file file2 file3 link dir
+}
+
+atf_test_case dir_to_dir
+dir_to_dir_head() {
+	atf_set "descr" "Checks the copy of a directory onto another directory"
+}
+dir_to_dir_body() {
+	dir_to_dir_setup
+	dir_to_dne_no_R
+	dir_to_dne
+	dir_to_dir_H
+	dir_to_dir_L
+	dir_to_dir_subdir_exists
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case file_to_file
+	atf_add_test_case file_to_link
+	atf_add_test_case link_to_file
+	atf_add_test_case file_over_link
+	atf_add_test_case link_over_file
+	atf_add_test_case files_to_dir
+	atf_add_test_case file_to_linkdir
+	atf_add_test_case linkdir_to_file
+	atf_add_test_case dir_to_file
+	atf_add_test_case dir_to_dir
+}
diff --git a/contrib/netbsd-tests/bin/dd/t_dd.sh b/contrib/netbsd-tests/bin/dd/t_dd.sh
new file mode 100755
index 000000000000..d713ad9cb246
--- /dev/null
+++ b/contrib/netbsd-tests/bin/dd/t_dd.sh
@@ -0,0 +1,130 @@
+# $NetBSD: t_dd.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+test_dd_length() {
+	result=$1
+	cmd=$2
+	set -- x `eval $cmd | wc -c`
+	res=$2
+	if [ x"$res" != x"$result" ]; then
+		atf_fail "Expected $result bytes of output, got $res: $cmd"
+	fi
+}
+
+atf_test_case length
+length_head() {
+	# XXX The PR should be stored in a tag.
+	atf_set "descr" "Test for result messages accidentally pumped into" \
+	                "the output file if the standard IO descriptors are" \
+	                "closed.  The last of the three following tests is" \
+	                "the one expected to fail.  (NetBSD PR bin/8521)"
+}
+length_body() {
+	test_dd_length 512 \
+	    "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >/dev/null 2>/dev/null"
+	test_dd_length 512 \
+	    "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >&- 2>/dev/null"
+	test_dd_length 512 \
+	    "dd if=/dev/zero of=/dev/fd/5 count=1 5>&1 >&- 2>&-"
+}
+
+test_dd_io() {
+	res="`echo -n "$2" | eval $1`"
+        if [ x"$res" != x"$3" ]; then
+		atf_fail "Expected \"$3\", got \"$res\": $1"
+	fi
+}
+
+allbits1="\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377"
+
+ebcdicbits1="\000\001\002\003\067\055\056\057\026\005\045\013\014\015\016\017\020\021\022\023\074\075\062\046\030\031\077\047\034\035\036\037\100\132\177\173\133\154\120\175\115\135\134\116\153\140\113\141\360\361\362\363\364\365\366\367\370\371\172\136\114\176\156\157\174\301\302\303\304\305\306\307\310\311\321\322\323\324\325\326\327\330\331\342\343\344\345\346\347\350\351\255\340\275\232\155\171\201\202\203\204\205\206\207\210\211\221\222\223\224\225\226\227\230\231\242\243\244\245\246\247\250\251\300\117\320\137\007\040\041\042\043\044\025\006\027\050\051\052\053\054\011\012\033\060\061\032\063\064\065\066\010\070\071\072\073\004\024\076\341\101\102\103\104\105\106\107\110\111\121\122\123\124\125\126\127\130\131\142\143\144\145\146\147\150\151\160\161\162\163\164\165\166\167\170\200\212\213\214\215\216\217\220\152\233\234\235\236\237\240\252\253\254\112\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\241\276\277\312\313\314\315\316\317\332\333\334\335\336\337\352\353\354\355\356\357\372\373\374\375\376\377"
+
+allvisbits=`echo -n "$allbits1" | unvis | vis`
+ebcdicvisbits=`echo -n "$ebcdicbits1" | unvis | vis`
+
+atf_test_case io
+io_head() {
+	atf_set "descr" "This checks the combination of bs= with" \
+	                "conv=ebcdic.  Prior to revision 1.24 of dd's" \
+	                "args.c, the conv option would be ignored."
+}
+io_body() {
+	test_dd_io "unvis | dd 2>/dev/null | vis" \
+	           "$allvisbits" "$allvisbits"
+	test_dd_io "unvis | dd ibs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$allvisbits"
+	test_dd_io "unvis | dd obs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$allvisbits"
+	test_dd_io "unvis | dd bs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$allvisbits"
+
+	test_dd_io "unvis | dd conv=ebcdic 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic ibs=512 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic obs=512 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic bs=512 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+
+	test_dd_io "unvis | dd conv=ebcdic 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic ibs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic obs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+	test_dd_io "unvis | dd conv=ebcdic bs=1 2>/dev/null | vis" \
+	           "$allvisbits" "$ebcdicvisbits"
+}
+
+atf_test_case seek
+seek_head() {
+	atf_set "descr" "Tests output file seeking"
+}
+
+seek_body() {
+	echo TEST1234 > testfile
+	atf_check -s exit:0 -e ignore \
+	    dd if=/dev/zero of=testfile seek=1 bs=8k count=1
+	atf_check -s exit:0 -e ignore -o match:'^TEST1234$' dd if=testfile
+	eval $(stat -s testfile)
+	atf_check_equal $st_size $((2*8192))
+
+	echo -n TEST1234 > tf2
+	atf_check -s exit:0 -e ignore -x \
+	    'dd bs=4 if=/dev/zero count=1 | tr \\0 \\n | dd of=tf2 bs=4 seek=1'
+	atf_check -s exit:0 -e ignore -o match:'^TEST$' dd if=tf2
+	eval $(stat -s tf2)
+	atf_check_equal $st_size 8
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case length
+	atf_add_test_case io
+	atf_add_test_case seek
+}
diff --git a/contrib/netbsd-tests/bin/df/getmntinfo.c b/contrib/netbsd-tests/bin/df/getmntinfo.c
new file mode 100644
index 000000000000..4ad1f40ce6be
--- /dev/null
+++ b/contrib/netbsd-tests/bin/df/getmntinfo.c
@@ -0,0 +1,218 @@
+/*	$NetBSD: getmntinfo.c,v 1.1 2012/03/17 16:33:11 jruoho Exp $	*/
+/*
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+
+#include <err.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define	KB		* 1024
+#define	MB		* 1024 KB
+#define	GB		* 1024 MB
+
+static struct statvfs *getnewstatvfs(void);
+static void other_variants(const struct statvfs *, const int *, int,
+    const int *, int);
+static void setup_filer(void);
+static void setup_ld0g(void);
+static void setup_strpct(void);
+
+static struct statvfs *allstatvfs;
+static int sftotal, sfused;
+
+struct statvfs *
+getnewstatvfs(void)
+{
+
+	if (sftotal == sfused) {
+		sftotal = sftotal ? sftotal * 2 : 1;
+		allstatvfs = realloc(allstatvfs,
+		    sftotal * sizeof(struct statvfs));
+		if (allstatvfs == NULL)
+			err(EXIT_FAILURE, "realloc");
+	}
+
+	return (&allstatvfs[sfused++]);
+}
+
+void
+other_variants(const struct statvfs *tmpl, const int *minfree, int minfreecnt,
+    const int *consumed, int consumedcnt)
+{
+	int64_t total, used;
+	struct statvfs *sf;
+	int i, j;
+
+	for (i = 0; i < minfreecnt; i++)
+		for (j = 0; j < consumedcnt; j++) {
+			sf = getnewstatvfs();
+			*sf = *tmpl;
+			total = (int64_t)(u_long)sf->f_blocks * sf->f_bsize;
+			used =  total * consumed[j] / 100;
+			sf->f_bfree = (total - used) / sf->f_bsize;
+			sf->f_bavail = (total * (100 - minfree[i]) / 100 -
+			    used) / (int)sf->f_bsize;
+			sf->f_bresvd = sf->f_bfree - sf->f_bavail;
+		}
+}
+
+/*
+ * Parameter taken from:
+ * http://mail-index.NetBSD.org/tech-userlevel/2004/03/24/0001.html
+ */
+void
+setup_filer(void)
+{
+	static const struct statvfs tmpl = {
+#define	BSIZE	512
+#define	TOTAL	1147ULL GB
+#define	USED	132ULL MB
+		.f_bsize = BSIZE,
+		.f_frsize = BSIZE,
+		.f_blocks = TOTAL / BSIZE,
+		.f_bfree = (TOTAL - USED) / BSIZE,
+		.f_bavail = (TOTAL - USED) / BSIZE,
+		.f_bresvd = 0,
+		.f_mntfromname = "filer:/",
+		.f_mntonname = "/filer",
+#undef USED
+#undef TOTAL
+#undef BSIZE
+	};
+	static const int minfree[] = { 0, 5, 10, 15, };
+	static const int consumed[] = { 0, 20, 60, 95, 100 };
+
+	*getnewstatvfs() = tmpl;
+	other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]),
+	    consumed, sizeof(consumed) / sizeof(consumed[0]));
+}
+
+/*
+ * Parameter taken from:
+ * http://mail-index.NetBSD.org/current-users/2004/03/01/0038.html
+ */
+void
+setup_ld0g(void)
+{
+	static const struct statvfs tmpl = {
+#define	BSIZE	4096			/* Guess */
+#define	TOTAL	1308726116ULL KB
+#define	USED	17901268ULL KB
+#define	AVAIL	1225388540ULL KB
+		.f_bsize = BSIZE,
+		.f_frsize = BSIZE,
+		.f_blocks = TOTAL / BSIZE,
+		.f_bfree = (TOTAL - USED) / BSIZE,
+		.f_bavail = AVAIL / BSIZE,
+		.f_bresvd = (TOTAL - USED) / BSIZE - AVAIL / BSIZE,
+		.f_mntfromname = "/dev/ld0g",
+		.f_mntonname = "/anon-root",
+#undef AVAIL
+#undef USED
+#undef TOTAL
+#undef BSIZE
+	};
+	static const int minfree[] = { 0, 5, 10, 15, };
+	static const int consumed[] = { 0, 20, 60, 95, 100 };
+
+	*getnewstatvfs() = tmpl;
+	other_variants(&tmpl, minfree, sizeof(minfree) / sizeof(minfree[0]),
+	    consumed, sizeof(consumed) / sizeof(consumed[0]));
+}
+
+/*
+ * Test of strpct() with huge number.
+ */
+void
+setup_strpct(void)
+{
+	static const struct statvfs tmpl = {
+#define	BSIZE	4096			/* Guess */
+#define	TOTAL	0x4ffffffffULL KB
+#define	USED	(TOTAL / 2)
+#define	AVAIL	(TOTAL / 2)
+		.f_bsize = BSIZE,
+		.f_frsize = BSIZE,
+		.f_blocks = TOTAL / BSIZE,
+		.f_bfree = (TOTAL - USED) / BSIZE,
+		.f_bavail = AVAIL / BSIZE,
+		.f_bresvd = (TOTAL - USED) / BSIZE - AVAIL / BSIZE,
+		.f_mntfromname = "/dev/strpct",
+		.f_mntonname = "/strpct",
+#undef AVAIL
+#undef USED
+#undef TOTAL
+#undef BSIZE
+	};
+
+	*getnewstatvfs() = tmpl;
+}
+
+/*
+ * Parameter taken from:
+ * http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=23600
+ */
+static void
+setup_pr23600(void)
+{
+	static const struct statvfs tmpl = {
+#define	BSIZE	512
+#define	TOTAL	20971376ULL
+#define	USED	5719864ULL
+#define	AVAIL	15251512ULL
+		.f_bsize = BSIZE,
+		.f_frsize = BSIZE,
+		.f_blocks = TOTAL,
+		.f_bfree = TOTAL - USED,
+		.f_bavail = AVAIL,
+		.f_bresvd = TOTAL - USED - AVAIL,
+		.f_mntfromname = "/dev/wd0e",
+		.f_mntonname = "/mount/windows/C",
+#undef AVAIL
+#undef USED
+#undef TOTAL
+#undef BSIZE
+	};
+
+	*getnewstatvfs() = tmpl;
+}
+
+int
+getmntinfo(struct statvfs **mntbuf, int flags)
+{
+
+	setup_filer();
+	setup_ld0g();
+	setup_strpct();
+	setup_pr23600();
+
+	*mntbuf = allstatvfs;
+	return (sfused);
+}
diff --git a/contrib/netbsd-tests/bin/df/t_df.sh b/contrib/netbsd-tests/bin/df/t_df.sh
new file mode 100755
index 000000000000..ffb5aad3e0d0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/df/t_df.sh
@@ -0,0 +1,148 @@
+# $NetBSD: t_df.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case normal
+normal_head() {
+	atf_set "descr" "Checks that the output of df without flags is" \
+	                "correct according to some already-known, sane" \
+	                "output"
+}
+normal_body() {
+	cat >expout <<EOF
+Filesystem    1K-blocks       Used      Avail %Cap Mounted on
+filer:/      1202716672     135168 1202581504   0% /filer
+filer:/      1202716672          0 1202716672   0% /filer
+filer:/      1202716672  240543334  962173337  20% /filer
+filer:/      1202716672  721630003  481086668  60% /filer
+filer:/      1202716672 1142580838   60135833  95% /filer
+filer:/      1202716672 1202716672          0 100% /filer
+filer:/      1202716672          0 1142580838   0% /filer
+filer:/      1202716672  240543334  902037504  21% /filer
+filer:/      1202716672  721630003  420950835  63% /filer
+filer:/      1202716672 1142580838          0 100% /filer
+filer:/      1202716672 1202716672  -60135833 105% /filer
+filer:/      1202716672          0 1082445004   0% /filer
+filer:/      1202716672  240543334  841901670  22% /filer
+filer:/      1202716672  721630003  360815001  66% /filer
+filer:/      1202716672 1142580838  -60135833 105% /filer
+filer:/      1202716672 1202716672 -120271667 111% /filer
+filer:/      1202716672          0 1022309171   0% /filer
+filer:/      1202716672  240543334  781765836  23% /filer
+filer:/      1202716672  721630003  300679168  70% /filer
+filer:/      1202716672 1142580838 -120271667 111% /filer
+filer:/      1202716672 1202716672 -180407500 117% /filer
+/dev/ld0g    1308726116   17901268 1225388540   1% /anon-root
+/dev/ld0g    1308726116          0 1308726116   0% /anon-root
+/dev/ld0g    1308726116  261745224 1046980892  20% /anon-root
+/dev/ld0g    1308726116  785235672  523490444  60% /anon-root
+/dev/ld0g    1308726116 1243289812   65436304  95% /anon-root
+/dev/ld0g    1308726116 1308726116          0 100% /anon-root
+/dev/ld0g    1308726116          0 1243289808   0% /anon-root
+/dev/ld0g    1308726116  261745224  981544584  21% /anon-root
+/dev/ld0g    1308726116  785235672  458054140  63% /anon-root
+/dev/ld0g    1308726116 1243289812          0 100% /anon-root
+/dev/ld0g    1308726116 1308726116  -65436304 105% /anon-root
+/dev/ld0g    1308726116          0 1177853504   0% /anon-root
+/dev/ld0g    1308726116  261745224  916108280  22% /anon-root
+/dev/ld0g    1308726116  785235672  392617832  66% /anon-root
+/dev/ld0g    1308726116 1243289812  -65436304 105% /anon-root
+/dev/ld0g    1308726116 1308726116 -130872608 111% /anon-root
+/dev/ld0g    1308726116          0 1112417196   0% /anon-root
+/dev/ld0g    1308726116  261745224  850671972  23% /anon-root
+/dev/ld0g    1308726116  785235672  327181528  70% /anon-root
+/dev/ld0g    1308726116 1243289812 -130872608 111% /anon-root
+/dev/ld0g    1308726116 1308726116 -196308916 117% /anon-root
+/dev/strpct  21474836476 10737418240 10737418236  50% /strpct
+/dev/wd0e      10485688    2859932    7625756  27% /mount/windows/C
+EOF
+	atf_check -s eq:0 -o file:expout -e empty \
+	    -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n"
+}
+
+atf_test_case hflag
+hflag_head() {
+	atf_set "descr" "Checks that the output of df is correct according" \
+	                "to some already-known, sane output when using the" \
+	                "human readable format"
+}
+hflag_body() {
+	cat >expout <<EOF
+Filesystem         Size       Used      Avail %Cap Mounted on
+filer:/            1.1T       132M       1.1T   0% /filer
+filer:/            1.1T         0B       1.1T   0% /filer
+filer:/            1.1T       229G       918G  20% /filer
+filer:/            1.1T       688G       459G  60% /filer
+filer:/            1.1T       1.1T        57G  95% /filer
+filer:/            1.1T       1.1T         0B 100% /filer
+filer:/            1.1T         0B       1.1T   0% /filer
+filer:/            1.1T       229G       860G  21% /filer
+filer:/            1.1T       688G       401G  63% /filer
+filer:/            1.1T       1.1T         0B 100% /filer
+filer:/            1.1T       1.1T       -57G 105% /filer
+filer:/            1.1T         0B       1.0T   0% /filer
+filer:/            1.1T       229G       803G  22% /filer
+filer:/            1.1T       688G       344G  66% /filer
+filer:/            1.1T       1.1T       -57G 105% /filer
+filer:/            1.1T       1.1T      -115G 111% /filer
+filer:/            1.1T         0B       975G   0% /filer
+filer:/            1.1T       229G       746G  23% /filer
+filer:/            1.1T       688G       287G  70% /filer
+filer:/            1.1T       1.1T      -115G 111% /filer
+filer:/            1.1T       1.1T      -172G 117% /filer
+/dev/ld0g          1.2T        17G       1.1T   1% /anon-root
+/dev/ld0g          1.2T         0B       1.2T   0% /anon-root
+/dev/ld0g          1.2T       250G       998G  20% /anon-root
+/dev/ld0g          1.2T       749G       499G  60% /anon-root
+/dev/ld0g          1.2T       1.2T        62G  95% /anon-root
+/dev/ld0g          1.2T       1.2T         0B 100% /anon-root
+/dev/ld0g          1.2T         0B       1.2T   0% /anon-root
+/dev/ld0g          1.2T       250G       936G  21% /anon-root
+/dev/ld0g          1.2T       749G       437G  63% /anon-root
+/dev/ld0g          1.2T       1.2T         0B 100% /anon-root
+/dev/ld0g          1.2T       1.2T       -62G 105% /anon-root
+/dev/ld0g          1.2T         0B       1.1T   0% /anon-root
+/dev/ld0g          1.2T       250G       874G  22% /anon-root
+/dev/ld0g          1.2T       749G       374G  66% /anon-root
+/dev/ld0g          1.2T       1.2T       -62G 105% /anon-root
+/dev/ld0g          1.2T       1.2T      -125G 111% /anon-root
+/dev/ld0g          1.2T         0B       1.0T   0% /anon-root
+/dev/ld0g          1.2T       250G       811G  23% /anon-root
+/dev/ld0g          1.2T       749G       312G  70% /anon-root
+/dev/ld0g          1.2T       1.2T      -125G 111% /anon-root
+/dev/ld0g          1.2T       1.2T      -187G 117% /anon-root
+/dev/strpct         20T        10T        10T  50% /strpct
+/dev/wd0e           10G       2.7G       7.3G  27% /mount/windows/C
+EOF
+	atf_check -s eq:0 -o file:expout -e empty \
+	    -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case normal
+	atf_add_test_case hflag
+}
diff --git a/contrib/netbsd-tests/bin/expr/t_expr.sh b/contrib/netbsd-tests/bin/expr/t_expr.sh
new file mode 100755
index 000000000000..4f9d5963187e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/expr/t_expr.sh
@@ -0,0 +1,228 @@
+# $NetBSD: t_expr.sh,v 1.3 2012/03/27 07:23:06 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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 first arg will get eval'd so escape any meta characters
+# The 2nd arg is an expected string/response from expr for that op.
+test_expr() {
+	echo "Expression '${1}', expecting '${2}'"
+	res=`eval expr $1 2>&1`
+	if [ "$res" != "$2" ]; then
+		atf_fail "Expected $2, got $res from expression: " \
+		         "`eval echo $1`"
+	fi
+}
+
+atf_test_case lang
+lang_ops_head() {
+	atf_set "descr" "Test that expr(1) works with non-C LANG (PR bin/2486)"
+}
+lang_body() {
+
+	export LANG=nonexistent
+	atf_check -s exit:0 -o inline:"21\n" -e empty -x "expr 10 + 11"
+
+	export LANG=ru_RU.KOI8-R
+	atf_check -s exit:0 -o inline:"21\n" -e empty -x "expr 10 + 11"
+}
+
+atf_test_case overflow
+overflow_head() {
+	atf_set "descr" "Test overflow cases"
+}
+overflow_body() {
+	test_expr '4611686018427387904 + 4611686018427387903' \
+	          '9223372036854775807'
+	test_expr '4611686018427387904 + 4611686018427387904' \
+	          "expr: integer overflow or underflow occurred for operation '4611686018427387904 + 4611686018427387904'"
+	test_expr '4611686018427387904 - -4611686018427387904' \
+	          "expr: integer overflow or underflow occurred for operation '4611686018427387904 - -4611686018427387904'"
+	test_expr '-4611686018427387904 - 4611686018427387903' \
+	          '-9223372036854775807'
+	test_expr '-4611686018427387904 - 4611686018427387905' \
+	          "expr: integer overflow or underflow occurred for operation '-4611686018427387904 - 4611686018427387905'"
+	test_expr '-4611686018427387904 \* 1' '-4611686018427387904'
+	test_expr '-4611686018427387904 \* -1' '4611686018427387904'
+	test_expr '-4611686018427387904 \* 2' '-9223372036854775808'
+	test_expr '-4611686018427387904 \* 3' \
+	          "expr: integer overflow or underflow occurred for operation '-4611686018427387904 * 3'"
+	test_expr '-4611686018427387904 \* -2' \
+	          "expr: integer overflow or underflow occurred for operation '-4611686018427387904 * -2'"
+	test_expr '4611686018427387904 \* 1' '4611686018427387904'
+	test_expr '4611686018427387904 \* 2' \
+	          "expr: integer overflow or underflow occurred for operation '4611686018427387904 * 2'"
+	test_expr '4611686018427387904 \* 3' \
+	          "expr: integer overflow or underflow occurred for operation '4611686018427387904 * 3'"
+}
+
+atf_test_case gtkmm
+gtkmm_head() {
+	atf_set "descr" "Test from gtk-- configure that cause problems on old expr"
+}
+gtkmm_body() {
+	test_expr '3 \> 3 \| 3 = 3 \& 4 \> 4 \| 3 = 3 \& 4 = 4 \& 5 \>= 5' '1'
+	test_expr '3 \> 3 \| 3 = 3 \& 4 \> 4 \| 3 = 3 \& 4 = 4 \& 5 \>= 6' '0'
+	test_expr '3 \> 3 \| 3 = 3 \& 4 \> 4 \| 3 = 3 \& 4 = 3 \& 5 \>= 5' '0'
+	test_expr '3 \> 3 \| 3 = 3 \& 4 \> 4 \| 3 = 2 \& 4 = 4 \& 5 \>= 5' '0'
+	test_expr '3 \> 2 \| 3 = 3 \& 4 \> 4 \| 3 = 3 \& 4 = 4 \& 5 \>= 6' '1'
+	test_expr '3 \> 3 \| 3 = 3 \& 4 \> 3 \| 3 = 3 \& 4 = 4 \& 5 \>= 5' '1'
+}
+
+atf_test_case colon_vs_math
+colon_vs_math_head() {
+	atf_set "descr" "Basic precendence test with the : operator vs. math"
+}
+colon_vs_math_body() {
+	test_expr '2 : 4 / 2' '0'
+	test_expr '4 : 4 % 3' '1'
+}
+
+atf_test_case arithmetic_ops
+arithmetic_ops_head() {
+	atf_set "descr" "Dangling arithemtic operator"
+}
+arithmetic_ops_body() {
+	test_expr '.java_wrapper : /' '0'
+	test_expr '4 : \*' '0'
+	test_expr '4 : +' '0'
+	test_expr '4 : -' '0'
+	test_expr '4 : /' '0'
+	test_expr '4 : %' '0'
+}
+
+atf_test_case basic_math
+basic_math_head() {
+	atf_set "descr" "Basic math test"
+}
+basic_math_body() {
+	test_expr '2 + 4 \* 5' '22'
+}
+
+atf_test_case basic_functional
+basic_functional_head() {
+	atf_set "descr" "Basic functional tests"
+}
+basic_functional_body() {
+	test_expr '2' '2'
+	test_expr '-4' '-4'
+	test_expr 'hello' 'hello'
+}
+
+atf_test_case compare_ops_precedence
+compare_ops_precedence_head() {
+	atf_set "descr" "Compare operator precendence test"
+}
+compare_ops_precedence_body() {
+	test_expr '2 \> 1 \* 17' '0'
+}
+
+atf_test_case compare_ops
+compare_ops_head() {
+	atf_set "descr" "Compare operator tests"
+}
+compare_ops_body() {
+	test_expr '2 \!= 5' '1'
+	test_expr '2 \!= 2' '0'
+	test_expr '2 \<= 3' '1'
+	test_expr '2 \<= 2' '1'
+	test_expr '2 \<= 1' '0'
+	test_expr '2 \< 3' '1'
+	test_expr '2 \< 2' '0'
+	test_expr '2 = 2' '1'
+	test_expr '2 = 4' '0'
+	test_expr '2 \>= 1' '1'
+	test_expr '2 \>= 2' '1'
+	test_expr '2 \>= 3' '0'
+	test_expr '2 \> 1' '1'
+	test_expr '2 \> 2' '0'
+}
+
+atf_test_case multiply
+multiply_head() {
+	atf_set "descr" "Test the multiply operator (PR bin/12838)"
+}
+multiply_body() {
+	test_expr '1 \* -1' '-1'
+	test_expr '2 \> 1 \* 17' '0'
+}
+
+atf_test_case negative
+negative_head() {
+	atf_set "descr" "Test the additive inverse"
+}
+negative_body() {
+	test_expr '-1 + 5' '4'
+	test_expr '- 1 + 5' 'expr: syntax error'
+
+	test_expr '5 + -1' '4'
+	test_expr '5 + - 1' 'expr: syntax error'
+
+	test_expr '1 - -5' '6'
+}
+
+atf_test_case math_precedence
+math_precedence_head() {
+	atf_set "descr" "More complex math test for precedence"
+}
+math_precedence_body() {
+	test_expr '-3 + -1 \* 4 + 3 / -6' '-7'
+}
+
+atf_test_case precedence
+precedence_head() {
+	atf_set "descr" "Test precedence"
+}
+precedence_body() {
+	# This is messy but the shell escapes cause that
+	test_expr 'X1/2/3 : X\\\(.\*[^/]\\\)//\*[^/][^/]\*/\*$ \| . : \\\(.\\\)' '1/2'
+}
+
+atf_test_case regex
+regex_head() {
+	atf_set "descr" "Test proper () returning \1 from a regex"
+}
+regex_body() {
+	# This is messy but the shell escapes cause that
+	test_expr '1/2 : .\*/\\\(.\*\\\)' '2'
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case lang
+	atf_add_test_case overflow
+	atf_add_test_case gtkmm
+	atf_add_test_case colon_vs_math
+	atf_add_test_case arithmetic_ops
+	atf_add_test_case basic_math
+	atf_add_test_case basic_functional
+	atf_add_test_case compare_ops_precedence
+	atf_add_test_case compare_ops
+	atf_add_test_case multiply
+	atf_add_test_case negative
+	atf_add_test_case math_precedence
+	atf_add_test_case precedence
+	atf_add_test_case regex
+}
diff --git a/contrib/netbsd-tests/bin/pax/t_pax.sh b/contrib/netbsd-tests/bin/pax/t_pax.sh
new file mode 100755
index 000000000000..63ae7f8965ce
--- /dev/null
+++ b/contrib/netbsd-tests/bin/pax/t_pax.sh
@@ -0,0 +1,54 @@
+# $NetBSD: t_pax.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case append
+append_head() {
+	atf_set "descr" "Ensure that appending a file to an archive" \
+	                "produces the same results as if the file" \
+	                "had been there during the archive's creation"
+}
+append_body() {
+	touch foo bar
+
+	# store both foo and bar into file1.tar
+	atf_check -s eq:0 -o empty -e empty \
+	    pax -w -b 512 -x ustar -f file1.tar foo bar
+
+	# store foo into file2.tar, then append bar to file2.tar
+	atf_check -s eq:0 -o empty -e empty \
+	    pax -w -b 512 -x ustar -f file2.tar foo
+	atf_check -s eq:0 -o empty -e empty \
+	    pax -w -b 512 -x ustar -f file2.tar -a bar
+
+	# ensure that file1.tar and file2.tar are equal
+	atf_check -s eq:0 -o empty -e empty cmp file1.tar file2.tar
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case append
+}
diff --git a/contrib/netbsd-tests/bin/ps/keywords b/contrib/netbsd-tests/bin/ps/keywords
new file mode 100644
index 000000000000..3f05f5464b84
--- /dev/null
+++ b/contrib/netbsd-tests/bin/ps/keywords
@@ -0,0 +1,123 @@
+# $NetBSD: keywords,v 1.2 2014/01/16 04:16:32 mlelstv Exp $
+#
+# Table of keywords for use with ps "-o" option.
+#
+# The first column (keyword) is the name of a keyword.
+#
+# The second column (header) is the default column header associated
+# with the keyword, except if the keyword is an alias, in which case the
+# second column is the name of another keyword.
+#
+# The third column (flag) may be blank, "LJUST", or "ALIAS".  "ALIAS"
+# means that the keyword is an alias.  "LJUST" means that the keyword
+# should be displayed in a left-justified column.  The default is that
+# the keyword should be displayed in a right-justified column.
+#
+# keyword	header		flag
+#
+ktracep		KTRACEP
+nwchan		WCHAN
+p_ru		P_RU
+paddr		PADDR
+rlink		RLINK
+%cpu		%CPU
+%mem		%MEM
+acflag		ACFLG
+acflg		acflag		ALIAS
+args		command		ALIAS
+blocked		sigmask		ALIAS
+caught		sigcatch	ALIAS
+comm		COMMAND		LJUST
+command		COMMAND		LJUST
+cpu		CPU
+cputime		time		ALIAS
+ctime		CTIME
+egid		EGID
+egroup		EGROUP		LJUST
+etime		ELAPSED
+euid		EUID
+euser		EUSER		LJUST
+f		F
+flags		f		ALIAS
+gid		GID
+group		GROUP		LJUST
+groupnames	GROUPNAMES	LJUST
+groups		GROUPS		LJUST
+holdcnt		HOLDCNT
+ignored		sigignore	ALIAS
+inblk		INBLK
+inblock		inblk		ALIAS
+jobc		JOBC
+ktrace		KTRACE
+laddr		LADDR
+lid		LID
+lim		LIM
+login		LOGIN		LJUST
+logname		login		ALIAS
+lstart		STARTED		LJUST
+lstate		STAT		LJUST
+ltime		LTIME
+majflt		MAJFLT
+minflt		MINFLT
+msgrcv		MSGRCV
+msgsnd		MSGSND
+ni		nice		ALIAS
+nice		NI
+nivcsw		NIVCSW
+nlwp		NLWP
+nsignals	nsigs		ALIAS
+nsigs		NSIGS
+nswap		NSWAP
+nvcsw		NVCSW
+oublk		OUBLK
+oublock		oublk		ALIAS
+pagein		PAGEIN
+pcpu		%cpu		ALIAS
+pending		sig		ALIAS
+pgid		PGID
+pid		PID
+pmem		%mem		ALIAS
+ppid		PPID
+pri		PRI
+re		RE
+rgid		RGID
+rgroup		RGROUP		LJUST
+rlwp		RLWP
+rss		RSS
+rssize		rsz		ALIAS
+rsz		RSZ
+ruid		RUID
+ruser		RUSER		LJUST
+sess		SESS
+sid		SID
+sig		PENDING
+sigcatch	CAUGHT
+sigignore	IGNORED
+sigmask		BLOCKED
+sl		SL
+start		STARTED
+stat		state		ALIAS
+state		STAT		LJUST
+stime		STIME
+svgid		SVGID
+svgroup		SVGROUP		LJUST
+svuid		SVUID
+svuser		SVUSER		LJUST
+tdev		TDEV
+time		TIME
+tpgid		TPGID
+tsess		TSESS
+tsiz		TSIZ
+tt		TTY		LJUST
+tty		TTY		LJUST
+uaddr		UADDR
+ucomm		UCOMM		LJUST
+uid		UID
+upr		UPR
+user		USER		LJUST
+usrpri		upr		ALIAS
+utime		UTIME
+vsize		vsz		ALIAS
+vsz		VSZ
+wchan		WCHAN		LJUST
+xstat		XSTAT
diff --git a/contrib/netbsd-tests/bin/ps/t_ps.sh b/contrib/netbsd-tests/bin/ps/t_ps.sh
new file mode 100755
index 000000000000..8f8829bc3543
--- /dev/null
+++ b/contrib/netbsd-tests/bin/ps/t_ps.sh
@@ -0,0 +1,404 @@
+# $NetBSD: t_ps.sh,v 1.2 2014/01/16 04:16:32 mlelstv Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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 implementation of "ps" to test
+: ${TEST_PS:="ps"}
+# tab and newline characters
+tab="$(printf '\t')"
+# nl="$(printf '\n')" doesn't work
+nl='
+'
+
+#
+# Parse the "keywords" file into a load of shell variables
+#
+setup_keywords()
+{
+	# Set variables representing the header text
+	# for all normal keywords (except aliases), and
+	# for regular expressions to match the text in left- or
+	# right-justified columns.
+	# For example, head_text_p_cpu="%CPU" head_regexp_p_cpu=" *%CPU".
+	while read keyword heading flag
+	do
+		case "$keyword" in
+		''|\#*)	continue
+			;;
+		esac
+		[ x"$flag" = x"ALIAS" ] && continue
+		kvar="${keyword}"
+		case "${keyword}" in
+		%*)	kvar="p_${keyword#%}"
+			;;
+		esac
+		eval head_text_${kvar}=\'"${heading}"\'
+		case "${flag}" in
+		'')	# right justified
+			eval head_regexp_${kvar}=\'" *${heading}"\'
+			;;
+		LJUST)	# left justified
+			eval head_regexp_${kvar}=\'"${heading} *"\'
+			;;
+		*)	atf_fail "unknown flag in keywords"
+			;;
+		esac
+	done <"$(atf_get_srcdir)/keywords"
+
+	# Now do the aliases.
+	while read keyword heading flag
+	do
+		case "$keyword" in
+		''|\#*)	continue
+			;;
+		esac
+		[ x"$flag" != x"ALIAS" ] && continue
+		kvar="${keyword}"
+		avar="${heading}"
+		case "${keyword}" in
+		%*)	kvar="p_${keyword#%}"
+			;;
+		esac
+		case "${heading}" in
+		%*)	avar="p_${heading#%}"
+			;;
+		esac
+		eval head_text_${kvar}=\"\$head_text_${avar}\"
+		eval head_regexp_${kvar}=\"\$head_regexp_${avar}\"
+	done <"$(atf_get_srcdir)/keywords"
+
+	# default sets of keywords
+	default_keywords='pid tty stat time command'
+	j_keywords='user pid ppid pgid sess jobc state tt time command'
+	l_keywords='uid pid ppid cpu pri nice vsz rss wchan state tt time command'
+	s_keywords='uid pid ppid cpu lid nlwp pri nice vsz rss wchan lstate tt ltime command'
+	u_keywords='user pid %cpu %mem vsz rss tt state start time command'
+	v_keywords='pid state time sl re pagein vsz rss lim tsiz %cpu %mem command'
+}
+
+# Convert a list of keywords like "pid comm" to a regexp
+# like " *PID COMMAND *"
+heading_keywords_to_regexp()
+{
+	local keywords="$1"
+	local regexp
+	regexp="$(echo "$keywords" | \
+		sed -E -e 's/\%/p_/g' -e 's/(^| )/\1\$head_regexp_/g')"
+	eval regexp=\""${regexp}"\"
+	regexp="^${regexp}\$"
+	echo "$regexp"
+}
+
+#
+# Check that a string matches a regexp; use the specified id
+# in error or success messages.
+#
+check_regexp() {
+	local id="$1" string="$2" regexp="$3"
+	if ! expr "$string" : "$regexp" >/dev/null
+	then
+		atf_fail "${id}: expected [${regexp}], got [${string}]"
+		false
+	fi
+}
+
+#
+# Run "ps $args -p $$"; check that only one line is printed,
+# without a preceding header line.
+#
+check_no_heading_line()
+{
+	local args="$1"
+	local output="$(eval "${TEST_PS} $args -p $$")"
+	case "$output" in
+	*"$nl"*)
+		local firstline="${output%%${nl}*}"
+		atf_fail "check_no_heading_line [$args] got [$firstline]"
+		;;
+	*)
+		;;
+	esac
+}
+
+#
+# Run "ps $args"; check that the heading matches the expected regexp.
+#
+check_heading_regexp()
+{
+	args="$1"
+	regexp="$2"
+	actual="$( eval "${TEST_PS} $args" | sed -e 1q )"
+	check_regexp "heading [$args]" "${actual}" "${regexp}"
+}
+
+#
+# Run "ps $args"; check that the heading matches a regexp constructed
+# from the specified keywords.
+#
+check_heading_keywords()
+{
+	args="$1"
+	keywords="$2"
+	check_heading_regexp "$args" "$(heading_keywords_to_regexp "$keywords")"
+}
+
+#
+# Try several variations on "ps $flag", "ps -$flag", etc.,
+# and check that the heading always has the correct keywords.
+#
+check_heading_variations()
+{
+	flag="$1"
+	keywords="$2"
+	for args in "$flag" "-$flag" "-$flag$flag -$flag"; do
+		check_heading_keywords "$args" "$keywords"
+	done
+}
+
+atf_test_case default_columns
+default_columns_head()
+{
+	atf_set "descr" "Checks that the default set of columns is correct" \
+	                "and also check that the columns printed by the -j," \
+	                "-l, -s, -u and -v flags alone are correct"
+}
+default_columns_body()
+{
+	setup_keywords
+	check_heading_keywords '' "$default_keywords"
+	check_heading_variations 'j' "$j_keywords"
+	check_heading_variations 'l' "$l_keywords"
+	check_heading_variations 's' "$s_keywords"
+	check_heading_variations 'u' "$u_keywords"
+	check_heading_variations 'v' "$v_keywords"
+}
+
+atf_test_case minus_O
+minus_O_head()
+{
+	atf_set "descr" "Checks that 'ps -O foo' inserts columns just after" \
+	                "the pid column"
+}
+minus_O_body()
+{
+	setup_keywords
+	check_heading_keywords '-O %cpu,%mem' \
+		"$(echo "${default_keywords}" | sed -e 's/pid/pid %cpu %mem/')"
+	check_heading_keywords '-O %cpu -O %mem' \
+		"$(echo "${default_keywords}" | sed -e 's/pid/pid %cpu %mem/')"
+	check_heading_keywords '-O%cpu -O%mem' \
+		"$(echo "${default_keywords}" | sed -e 's/pid/pid %cpu %mem/')"
+}
+
+atf_test_case minus_o
+minus_o_head()
+{
+	atf_set "descr" "Checks simple cases of 'ps -o foo' to control which" \
+	                "columns are printed; this does not test header" \
+	                "overriding via 'ps -o foo=BAR'"
+}
+minus_o_body()
+{
+	setup_keywords
+	# Keywords for "-o name" override the default display
+	check_heading_keywords '-o pid,%cpu,%mem' \
+		"pid %cpu %mem"
+	check_heading_keywords '-o pid -o %cpu,%mem' \
+		"pid %cpu %mem"
+	check_heading_keywords '-opid -o %cpu,%mem' \
+		"pid %cpu %mem"
+	# Space works like comma
+	check_heading_keywords '-opid -o "%cpu %mem"' \
+		"pid %cpu %mem"
+	# Check missing pid
+	check_heading_keywords '-o comm' \
+		"comm"
+	# Check pid present but not first
+	check_heading_keywords '-o comm,pid' \
+		"comm pid"
+}
+
+atf_test_case override_heading_simple
+override_heading_simple_head()
+{
+	atf_set "descr" "Tests simple uses of header overriding via" \
+	                "'ps -o foo=BAR'.  This does not test columns " \
+	                "with null headings, or headings with embedded" \
+	                "space, ',' or '='."
+}
+override_heading_simple_body()
+{
+	setup_keywords
+	check_heading_regexp '-o pid=PPP -o comm' \
+		'^ *PPP '"${head_text_comm}"'$' # no trailing space
+	check_heading_regexp '-o pid=PPP -o comm=CCC' \
+		'^ *PPP CCC$'
+	check_heading_regexp '-o pid,comm=CCC' \
+		'^'"${head_regexp_pid}"' CCC$'
+	check_heading_regexp '-o pid -o comm=CCC' \
+		'^'"${head_regexp_pid}"' CCC$'
+	# Check missing pid
+	check_heading_regexp '-o comm=CCC' \
+		'^CCC$'
+	# Check pid present but not first
+	check_heading_regexp '-o comm=CCC -o pid=PPP' \
+		'^CCC  *PPP$'
+	check_heading_regexp '-o comm,pid=PPP' \
+		'^'"${head_regexp_comm}"'  *PPP$'
+}
+
+atf_test_case override_heading_embedded_specials
+override_heading_embedded_specials_head()
+{
+	atf_set "descr" "Tests header overriding with embedded space," \
+	                "',' or '='.  Everything after the first '='" \
+	                "is part of the heading."
+}
+override_heading_embedded_specials_body()
+{
+	setup_keywords
+	# Check embedded "," or "=" in override header.
+	check_heading_regexp '-o comm,pid==' \
+		'^'"${head_regexp_comm}"'  *=$'
+	check_heading_regexp '-o comm,pid=,' \
+		'^'"${head_regexp_comm}"'  *,$'
+	check_heading_regexp '-o pid=PPP,comm' \
+		'^ *PPP,comm$' # not like '-o pid=PPP -o comm'
+	check_heading_regexp '-o pid=PPP,comm=CCC' \
+		'^ *PPP,comm=CCC$' # not like '-o pid=PPP -o comm=CCC'
+	check_heading_regexp '-o comm,pid=PPP,QQQ' \
+		'^'"${head_regexp_comm}"'  *PPP,QQQ$'
+	check_heading_regexp '-o comm,pid=ppid,tty=state' \
+		'^'"${head_regexp_comm}"'  *ppid,tty=state$'
+	# Check embedded space or tab in override header.
+	check_heading_regexp '-o comm,pid="PPP QQQ"' \
+		'^'"${head_regexp_comm}"'  *PPP QQQ$'
+	check_heading_regexp '-o comm,pid="PPP${tab}QQQ"' \
+		'^'"${head_regexp_comm}"'  *PPP'"${tab}"'QQQ$'
+}
+
+atf_test_case override_heading_some_null
+override_heading_some_null_head()
+{
+	atf_set "descr" "Tests simple uses of null column headings" \
+	                "overriding via 'ps -o foo=BAR -o baz='.  This" \
+	                "does not test the case where all columns have" \
+	                "null headings."
+}
+override_heading_some_null_body()
+{
+	setup_keywords
+	check_heading_regexp '-o pid=PPP -o comm=' \
+		'^ *PPP *$'
+	check_heading_regexp '-o pid= -o comm=CCC' \
+		'^ * CCC$'
+	check_heading_regexp '-o pid -o comm=' \
+		'^'"${head_regexp_pid}"' *$'
+	# Check missing pid
+	check_heading_regexp '-o ppid= -o comm=CCC' \
+		'^ * CCC$'
+	check_heading_regexp '-o ppid=PPP -o comm=' \
+		'^ *PPP *$'
+	# Check pid present but not first
+	check_heading_regexp '-o comm= -o pid=PPP' \
+		'^ * PPP$'
+	check_heading_regexp '-o comm,pid=' \
+		'^'"${head_regexp_comm}"' *$'
+	# A field with a null custom heading retains a minimum width
+	# derived from the default heading.  This does not apply
+	# to a field with a very short (non-null) custom heading.
+	#
+	# We choose "holdcnt" as a column whose width is likely to be
+	# determined entirely by the header width, because the values
+	# are likely to be very small.
+	check_heading_regexp '-o holdcnt -o holdcnt -o holdcnt' \
+		'^HOLDCNT HOLDCNT HOLDCNT$'
+	check_heading_regexp '-o holdcnt -o holdcnt= -o holdcnt' \
+		'^HOLDCNT         HOLDCNT$'
+	check_heading_regexp '-o holdcnt -o holdcnt=HH -o holdcnt' \
+		'^HOLDCNT HH HOLDCNT$'
+}
+
+atf_test_case override_heading_all_null
+override_heading_all_null_head()
+{
+	atf_set "descr" "Tests the use of 'ps -o foo= -o bar=' (with a" \
+	                "null heading for every column).  The heading" \
+	                "should not be printed at all in this case."
+}
+override_heading_all_null_body()
+{
+	setup_keywords
+	# A heading with a space is not a null heading,
+	# so should not be suppressed
+	check_heading_regexp '-o comm=" "' \
+		'^ *$'
+	# Null headings should be suppressed
+	check_no_heading_line '-o pid= -o comm='
+	check_no_heading_line '-o pid= -o comm='
+	# Check missing pid
+	check_no_heading_line '-o ppid='
+	check_no_heading_line '-o comm='
+	check_no_heading_line '-o command='
+	check_no_heading_line '-o ppid= -o comm='
+	check_no_heading_line '-o comm= -o ppid='
+	# Check pid present but not first
+	check_no_heading_line '-o comm= -o pid='
+	check_no_heading_line '-o ppid= -o pid= -o command='
+}
+
+atf_test_case duplicate_column
+duplicate_column_head()
+{
+	atf_set "descr" "Tests the use of -o options to display the" \
+	                "same column more than once"
+}
+duplicate_column_body()
+{
+	setup_keywords
+	# two custom headers
+	check_heading_regexp '-o pid=PPP -o pid=QQQ' \
+		'^ *PPP  *QQQ$'
+	# one custom header, before and after default header
+	check_heading_regexp '-o pid=PPP -o pid' \
+		'^ *PPP '"${head_regexp_pid}"'$'
+	check_heading_regexp '-o pid -o pid=QQQ' \
+		'^'"${head_regexp_pid}"'  *QQQ$'
+	# custom headers both before and after default header
+	check_heading_regexp '-o pid=PPP -o pid -o pid=QQQ' \
+		'^ *PPP '"${head_regexp_pid}"'  *QQQ$'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case default_columns
+	atf_add_test_case minus_O
+	atf_add_test_case minus_o
+	atf_add_test_case override_heading_simple
+	atf_add_test_case override_heading_embedded_specials
+	atf_add_test_case override_heading_some_null
+	atf_add_test_case override_heading_all_null
+	atf_add_test_case duplicate_column
+}
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_case.out
new file mode 100644
index 000000000000..4c4205563e80
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_case.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before case
+before break
+after break, return value: 0
+after case
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_compound.out
new file mode 100644
index 000000000000..01113ca97a69
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_compound.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+compound start
+before break
+after break, return value: 0
+compound end
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_file.out
new file mode 100644
index 000000000000..52640203d8da
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_file.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before break
+after break, return value: 0
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_for.out
new file mode 100644
index 000000000000..e116ee2b6a66
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_for.out
@@ -0,0 +1,7 @@
+before case
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_func.out
new file mode 100644
index 000000000000..906a804d2185
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_func.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before function
+before break
+after break
+after function
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_subshell.out
new file mode 100644
index 000000000000..073caff318ba
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_subshell.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+subshell start
+before break
+after break, return value: 0
+subshell end
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_until.out
new file mode 100644
index 000000000000..f47bd43cccba
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_until.out
@@ -0,0 +1,7 @@
+before case
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_while.out
new file mode 100644
index 000000000000..e9a73f8112b1
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_break_while.out
@@ -0,0 +1,7 @@
+before case
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_case.out
new file mode 100644
index 000000000000..7919427ae304
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_case.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before case
+before continue
+after continue, return value: 0
+after case
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_compound.out
new file mode 100644
index 000000000000..9195e0889eb9
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_compound.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+compound start
+before continue
+after continue, return value: 0
+compound end
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_file.out
new file mode 100644
index 000000000000..100a5906f0a4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_file.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before continue
+after continue, return value: 0
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_for.out
new file mode 100644
index 000000000000..9a078d0abc1e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_for.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_func.out
new file mode 100644
index 000000000000..6282c89d7437
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_func.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before function
+before continue
+after continue
+after function
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_subshell.out
new file mode 100644
index 000000000000..b066ab64b7d7
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_subshell.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+subshell start
+before continue
+after continue, return value: 0
+subshell end
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_until.out
new file mode 100644
index 000000000000..afc85b6561a1
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_until.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_while.out
new file mode 100644
index 000000000000..cb4137d23391
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_continue_while.out
@@ -0,0 +1,8 @@
+before case
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_case.out
new file mode 100644
index 000000000000..734369d564e3
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_case.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_compound.out
new file mode 100644
index 000000000000..2fae84e35df0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_compound.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_file.out
new file mode 100644
index 000000000000..f97ecc6dab50
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_file.out
@@ -0,0 +1,5 @@
+before case
+before dotcmd
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_for.out
new file mode 100644
index 000000000000..d863537007be
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_for.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_func.out
new file mode 100644
index 000000000000..aed8fa4db71a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_func.out
@@ -0,0 +1,7 @@
+before case
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_subshell.out
new file mode 100644
index 000000000000..364d2458e604
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_subshell.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_until.out
new file mode 100644
index 000000000000..daf3811e2e9a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_until.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_while.out
new file mode 100644
index 000000000000..ef6a6764d515
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/case_return_while.out
@@ -0,0 +1,6 @@
+before case
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+after case
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_case.out
new file mode 100644
index 000000000000..144bcd6d00f4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_case.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before case
+before break
+after break, return value: 0
+after case
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_compound.out
new file mode 100644
index 000000000000..3fd7b2f92e2a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_compound.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+compound start
+before break
+after break, return value: 0
+compound end
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_file.out
new file mode 100644
index 000000000000..5ad5ed396a74
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_file.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before break
+after break, return value: 0
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_for.out
new file mode 100644
index 000000000000..7f03e495bcde
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_for.out
@@ -0,0 +1,7 @@
+compound start
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_func.out
new file mode 100644
index 000000000000..82e86b3c778e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_func.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before function
+before break
+after break
+after function
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_subshell.out
new file mode 100644
index 000000000000..e26e980f7ebf
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_subshell.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+subshell start
+before break
+after break, return value: 0
+subshell end
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_until.out
new file mode 100644
index 000000000000..34dd25adeaa0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_until.out
@@ -0,0 +1,7 @@
+compound start
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_while.out
new file mode 100644
index 000000000000..7019045bc39f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_break_while.out
@@ -0,0 +1,7 @@
+compound start
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_case.out
new file mode 100644
index 000000000000..206548ccff38
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_case.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before case
+before continue
+after continue, return value: 0
+after case
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_compound.out
new file mode 100644
index 000000000000..a8c7efc159ec
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_compound.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+compound start
+before continue
+after continue, return value: 0
+compound end
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_file.out
new file mode 100644
index 000000000000..c619ad560f9d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_file.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before continue
+after continue, return value: 0
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_for.out
new file mode 100644
index 000000000000..35b092a42fb3
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_for.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_func.out
new file mode 100644
index 000000000000..198dbd6af513
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_func.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before function
+before continue
+after continue
+after function
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_subshell.out
new file mode 100644
index 000000000000..1ecaa96e422f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_subshell.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+subshell start
+before continue
+after continue, return value: 0
+subshell end
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_until.out
new file mode 100644
index 000000000000..4a74a8e8e431
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_until.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_while.out
new file mode 100644
index 000000000000..b2d939ed538c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_continue_while.out
@@ -0,0 +1,8 @@
+compound start
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_case.out
new file mode 100644
index 000000000000..995d5b556f42
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_case.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_compound.out
new file mode 100644
index 000000000000..f6e4858e6f5d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_compound.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_file.out
new file mode 100644
index 000000000000..84347b28f74d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_file.out
@@ -0,0 +1,5 @@
+compound start
+before dotcmd
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_for.out
new file mode 100644
index 000000000000..ec234472aa6d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_for.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_func.out
new file mode 100644
index 000000000000..12798d0e0322
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_func.out
@@ -0,0 +1,7 @@
+compound start
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_subshell.out
new file mode 100644
index 000000000000..af0ab785fbb4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_subshell.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_until.out
new file mode 100644
index 000000000000..a108f502d2c6
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_until.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_while.out
new file mode 100644
index 000000000000..ef34c037a9f8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/compound_return_while.out
@@ -0,0 +1,6 @@
+compound start
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+compound end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_case.out
new file mode 100644
index 000000000000..2f34f10c726b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_case.out
@@ -0,0 +1,6 @@
+before dotcmd
+before case
+before break
+after break, return value: 0
+after case
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_compound.out
new file mode 100644
index 000000000000..0c7300d6a3ee
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_compound.out
@@ -0,0 +1,6 @@
+before dotcmd
+compound start
+before break
+after break, return value: 0
+compound end
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_file.out
new file mode 100644
index 000000000000..fb4db197ddac
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_file.out
@@ -0,0 +1,4 @@
+before dotcmd
+before break
+after break, return value: 0
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_for.out
new file mode 100644
index 000000000000..66f445287d5b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_for.out
@@ -0,0 +1,5 @@
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_func.out
new file mode 100644
index 000000000000..c5488abadbc5
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_func.out
@@ -0,0 +1,6 @@
+before dotcmd
+before function
+before break
+after break
+after function
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_subshell.out
new file mode 100644
index 000000000000..47e2394084af
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_subshell.out
@@ -0,0 +1,6 @@
+before dotcmd
+subshell start
+before break
+after break, return value: 0
+subshell end
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_until.out
new file mode 100644
index 000000000000..b51ff195bd84
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_until.out
@@ -0,0 +1,5 @@
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_while.out
new file mode 100644
index 000000000000..0fd3a83ce03d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_break_while.out
@@ -0,0 +1,5 @@
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_case.out
new file mode 100644
index 000000000000..2cf3be6d3b4e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_case.out
@@ -0,0 +1,6 @@
+before dotcmd
+before case
+before continue
+after continue, return value: 0
+after case
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_compound.out
new file mode 100644
index 000000000000..7bec42019aee
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_compound.out
@@ -0,0 +1,6 @@
+before dotcmd
+compound start
+before continue
+after continue, return value: 0
+compound end
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_file.out
new file mode 100644
index 000000000000..2f8806c60b6d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_file.out
@@ -0,0 +1,4 @@
+before dotcmd
+before continue
+after continue, return value: 0
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_for.out
new file mode 100644
index 000000000000..e8da2390bbbf
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_for.out
@@ -0,0 +1,6 @@
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_func.out
new file mode 100644
index 000000000000..da683c02a158
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_func.out
@@ -0,0 +1,6 @@
+before dotcmd
+before function
+before continue
+after continue
+after function
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_subshell.out
new file mode 100644
index 000000000000..388558b060e6
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_subshell.out
@@ -0,0 +1,6 @@
+before dotcmd
+subshell start
+before continue
+after continue, return value: 0
+subshell end
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_until.out
new file mode 100644
index 000000000000..bb0f28134eee
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_until.out
@@ -0,0 +1,6 @@
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_while.out
new file mode 100644
index 000000000000..63338234aa4c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_continue_while.out
@@ -0,0 +1,6 @@
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_case.out
new file mode 100644
index 000000000000..486685242bda
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_case.out
@@ -0,0 +1,4 @@
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_compound.out
new file mode 100644
index 000000000000..6b831451d867
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_compound.out
@@ -0,0 +1,4 @@
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_file.out
new file mode 100644
index 000000000000..2d6742310a0f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_file.out
@@ -0,0 +1,3 @@
+before dotcmd
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_for.out
new file mode 100644
index 000000000000..83f8e002950f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_for.out
@@ -0,0 +1,4 @@
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_func.out
new file mode 100644
index 000000000000..a0db2c99cfa8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_func.out
@@ -0,0 +1,5 @@
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_subshell.out
new file mode 100644
index 000000000000..83cd0e4ed0b0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_subshell.out
@@ -0,0 +1,4 @@
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_until.out
new file mode 100644
index 000000000000..fdf2449045a1
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_until.out
@@ -0,0 +1,4 @@
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_while.out
new file mode 100644
index 000000000000..a733aa38912b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/file_return_while.out
@@ -0,0 +1,4 @@
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_case.out
new file mode 100644
index 000000000000..262db24358d4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_case.out
@@ -0,0 +1,5 @@
+before for
+before dotcmd
+before case
+before break
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_compound.out
new file mode 100644
index 000000000000..418a4de73c0c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_compound.out
@@ -0,0 +1,5 @@
+before for
+before dotcmd
+compound start
+before break
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_file.out
new file mode 100644
index 000000000000..752c95c9815c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_file.out
@@ -0,0 +1,4 @@
+before for
+before dotcmd
+before break
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_for.out
new file mode 100644
index 000000000000..20af6224fc55
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_for.out
@@ -0,0 +1,12 @@
+before for
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_func.out
new file mode 100644
index 000000000000..fe0cab4fa49b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_func.out
@@ -0,0 +1,5 @@
+before for
+before dotcmd
+before function
+before break
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_subshell.out
new file mode 100644
index 000000000000..985aab6270c4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_subshell.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_until.out
new file mode 100644
index 000000000000..b47c90198f18
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_until.out
@@ -0,0 +1,12 @@
+before for
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_while.out
new file mode 100644
index 000000000000..deb4cebaece8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_break_while.out
@@ -0,0 +1,12 @@
+before for
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_case.out
new file mode 100644
index 000000000000..e989063290ea
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_case.out
@@ -0,0 +1,8 @@
+before for
+before dotcmd
+before case
+before continue
+before dotcmd
+before case
+before continue
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_compound.out
new file mode 100644
index 000000000000..0fd23b628719
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_compound.out
@@ -0,0 +1,8 @@
+before for
+before dotcmd
+compound start
+before continue
+before dotcmd
+compound start
+before continue
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_file.out
new file mode 100644
index 000000000000..286bb88c1ea1
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_file.out
@@ -0,0 +1,6 @@
+before for
+before dotcmd
+before continue
+before dotcmd
+before continue
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_for.out
new file mode 100644
index 000000000000..044d5a35c55e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_for.out
@@ -0,0 +1,14 @@
+before for
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_func.out
new file mode 100644
index 000000000000..a0cc6cc18fd8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_func.out
@@ -0,0 +1,8 @@
+before for
+before dotcmd
+before function
+before continue
+before dotcmd
+before function
+before continue
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_subshell.out
new file mode 100644
index 000000000000..f1ae7aab16d0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_subshell.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_until.out
new file mode 100644
index 000000000000..b1c4147a9730
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_until.out
@@ -0,0 +1,14 @@
+before for
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_while.out
new file mode 100644
index 000000000000..f8e5c5d11830
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_continue_while.out
@@ -0,0 +1,14 @@
+before for
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_case.out
new file mode 100644
index 000000000000..24b7145a05c4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_case.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_compound.out
new file mode 100644
index 000000000000..30b4dac3988e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_compound.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_file.out
new file mode 100644
index 000000000000..88555621c77f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_file.out
@@ -0,0 +1,8 @@
+before for
+before dotcmd
+before return
+after dotcmd, return value: 0
+before dotcmd
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_for.out
new file mode 100644
index 000000000000..52a72a9fb0c8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_for.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_func.out
new file mode 100644
index 000000000000..4f0fee21740b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_func.out
@@ -0,0 +1,12 @@
+before for
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_subshell.out
new file mode 100644
index 000000000000..4b8f36c1a331
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_subshell.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_until.out
new file mode 100644
index 000000000000..3eaf9df84b8b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_until.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_while.out
new file mode 100644
index 000000000000..8cbad954cdad
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/for_return_while.out
@@ -0,0 +1,10 @@
+before for
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+after for
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_case.out
new file mode 100644
index 000000000000..7373371e511b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_case.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before case
+before break
+after break, return value: 0
+after case
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_compound.out
new file mode 100644
index 000000000000..e87b4a2e8e14
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_compound.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+compound start
+before break
+after break, return value: 0
+compound end
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_file.out
new file mode 100644
index 000000000000..cf144227aefe
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_file.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before break
+after break, return value: 0
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_for.out
new file mode 100644
index 000000000000..c3853488a517
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_for.out
@@ -0,0 +1,7 @@
+before function
+before dotcmd
+before for
+before break
+after for
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_func.out
new file mode 100644
index 000000000000..5c1c4c830164
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_func.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before function
+before break
+after break
+after function
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_subshell.out
new file mode 100644
index 000000000000..affe3e4bdefb
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_subshell.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+subshell start
+before break
+after break, return value: 0
+subshell end
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_until.out
new file mode 100644
index 000000000000..b0f942a04fbf
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_until.out
@@ -0,0 +1,7 @@
+before function
+before dotcmd
+before until
+before break
+after until
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_while.out
new file mode 100644
index 000000000000..d687aa766498
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_break_while.out
@@ -0,0 +1,7 @@
+before function
+before dotcmd
+before while
+before break
+after while
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_case.out
new file mode 100644
index 000000000000..b1ad4be38bfd
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_case.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before case
+before continue
+after continue, return value: 0
+after case
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_compound.out
new file mode 100644
index 000000000000..d6a5edd9940f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_compound.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+compound start
+before continue
+after continue, return value: 0
+compound end
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_file.out
new file mode 100644
index 000000000000..f300d6afee79
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_file.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before continue
+after continue, return value: 0
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_for.out
new file mode 100644
index 000000000000..d46095d58d36
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_for.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_func.out
new file mode 100644
index 000000000000..3ff73a2bdaa9
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_func.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before function
+before continue
+after continue
+after function
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_subshell.out
new file mode 100644
index 000000000000..fd295aad8542
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_subshell.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+subshell start
+before continue
+after continue, return value: 0
+subshell end
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_until.out
new file mode 100644
index 000000000000..7a6508328e00
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_until.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_while.out
new file mode 100644
index 000000000000..6ecbe8261164
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_continue_while.out
@@ -0,0 +1,8 @@
+before function
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_case.out
new file mode 100644
index 000000000000..8f0c0948357a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_case.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before case
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_compound.out
new file mode 100644
index 000000000000..e3d86704f79d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_compound.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+compound start
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_file.out
new file mode 100644
index 000000000000..95e341525799
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_file.out
@@ -0,0 +1,5 @@
+before function
+before dotcmd
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_for.out
new file mode 100644
index 000000000000..511cc39ca34f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_for.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before for
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_func.out
new file mode 100644
index 000000000000..a87d3a780043
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_func.out
@@ -0,0 +1,7 @@
+before function
+before dotcmd
+before function
+before return
+after function
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_subshell.out
new file mode 100644
index 000000000000..fdb37b20979e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_subshell.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+subshell start
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_until.out
new file mode 100644
index 000000000000..08b45be42f4f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_until.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before until
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_while.out
new file mode 100644
index 000000000000..27fbcaf88b22
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/func_return_while.out
@@ -0,0 +1,6 @@
+before function
+before dotcmd
+before while
+before return
+after dotcmd
+after function
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_case.out
new file mode 100644
index 000000000000..155daea6606d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_case.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before case
+before break
+after break, return value: 0
+after case
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_compound.out
new file mode 100644
index 000000000000..a643ac080d91
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_compound.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+compound start
+before break
+after break, return value: 0
+compound end
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_file.out
new file mode 100644
index 000000000000..2556d89acbbe
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_file.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before break
+after break, return value: 0
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_for.out
new file mode 100644
index 000000000000..27040a992adf
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_for.out
@@ -0,0 +1,7 @@
+subshell start
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_func.out
new file mode 100644
index 000000000000..83ec062eed6a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_func.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before function
+before break
+after break
+after function
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_subshell.out
new file mode 100644
index 000000000000..8a53ac59e578
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_subshell.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+subshell start
+before break
+after break, return value: 0
+subshell end
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_until.out
new file mode 100644
index 000000000000..a31fa5bfa332
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_until.out
@@ -0,0 +1,7 @@
+subshell start
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_while.out
new file mode 100644
index 000000000000..42eb970ef81d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_break_while.out
@@ -0,0 +1,7 @@
+subshell start
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_case.out
new file mode 100644
index 000000000000..4d74b7b151e2
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_case.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before case
+before continue
+after continue, return value: 0
+after case
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_compound.out
new file mode 100644
index 000000000000..4328df396efb
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_compound.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+compound start
+before continue
+after continue, return value: 0
+compound end
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_file.out
new file mode 100644
index 000000000000..a4a6e4ae0411
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_file.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before continue
+after continue, return value: 0
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_for.out
new file mode 100644
index 000000000000..e82988936104
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_for.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_func.out
new file mode 100644
index 000000000000..e0ead4c87cb9
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_func.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before function
+before continue
+after continue
+after function
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_subshell.out
new file mode 100644
index 000000000000..dfcdfb46a662
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_subshell.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+subshell start
+before continue
+after continue, return value: 0
+subshell end
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_until.out
new file mode 100644
index 000000000000..66e8f9f269ae
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_until.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_while.out
new file mode 100644
index 000000000000..f1c83f43d394
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_continue_while.out
@@ -0,0 +1,8 @@
+subshell start
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_case.out
new file mode 100644
index 000000000000..008d9396a260
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_case.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_compound.out
new file mode 100644
index 000000000000..bdab2314d44b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_compound.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_file.out
new file mode 100644
index 000000000000..43d011dfb970
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_file.out
@@ -0,0 +1,5 @@
+subshell start
+before dotcmd
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_for.out
new file mode 100644
index 000000000000..7cfed898d338
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_for.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_func.out
new file mode 100644
index 000000000000..b695c53484c8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_func.out
@@ -0,0 +1,7 @@
+subshell start
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_subshell.out
new file mode 100644
index 000000000000..c5ccf597e61c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_subshell.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_until.out
new file mode 100644
index 000000000000..64737ad7341f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_until.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_while.out
new file mode 100644
index 000000000000..de520c4493ef
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/subshell_return_while.out
@@ -0,0 +1,6 @@
+subshell start
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+subshell end
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_case.out
new file mode 100644
index 000000000000..f0483b459129
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_case.out
@@ -0,0 +1,5 @@
+before until
+before dotcmd
+before case
+before break
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_compound.out
new file mode 100644
index 000000000000..a5e37ba7ab5d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_compound.out
@@ -0,0 +1,5 @@
+before until
+before dotcmd
+compound start
+before break
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_file.out
new file mode 100644
index 000000000000..a2fde4dafe28
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_file.out
@@ -0,0 +1,4 @@
+before until
+before dotcmd
+before break
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_for.out
new file mode 100644
index 000000000000..8b3faf520a8f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_for.out
@@ -0,0 +1,12 @@
+before until
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_func.out
new file mode 100644
index 000000000000..a83ce2b82c0c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_func.out
@@ -0,0 +1,5 @@
+before until
+before dotcmd
+before function
+before break
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_subshell.out
new file mode 100644
index 000000000000..008d30dfc7d6
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_subshell.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_until.out
new file mode 100644
index 000000000000..05fb94a46af3
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_until.out
@@ -0,0 +1,12 @@
+before until
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_while.out
new file mode 100644
index 000000000000..6ae1f9c4225d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_break_while.out
@@ -0,0 +1,12 @@
+before until
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_case.out
new file mode 100644
index 000000000000..40028fb08139
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_case.out
@@ -0,0 +1,8 @@
+before until
+before dotcmd
+before case
+before continue
+before dotcmd
+before case
+before continue
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_compound.out
new file mode 100644
index 000000000000..3641e1e3f5c2
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_compound.out
@@ -0,0 +1,8 @@
+before until
+before dotcmd
+compound start
+before continue
+before dotcmd
+compound start
+before continue
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_file.out
new file mode 100644
index 000000000000..c9f5193b740f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_file.out
@@ -0,0 +1,6 @@
+before until
+before dotcmd
+before continue
+before dotcmd
+before continue
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_for.out
new file mode 100644
index 000000000000..fd582401d026
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_for.out
@@ -0,0 +1,14 @@
+before until
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_func.out
new file mode 100644
index 000000000000..6beb16323068
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_func.out
@@ -0,0 +1,8 @@
+before until
+before dotcmd
+before function
+before continue
+before dotcmd
+before function
+before continue
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_subshell.out
new file mode 100644
index 000000000000..534509e7e69d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_subshell.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_until.out
new file mode 100644
index 000000000000..ddfeb2797a7e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_until.out
@@ -0,0 +1,14 @@
+before until
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_while.out
new file mode 100644
index 000000000000..5707821eca00
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_continue_while.out
@@ -0,0 +1,14 @@
+before until
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_case.out
new file mode 100644
index 000000000000..70dd420505cd
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_case.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_compound.out
new file mode 100644
index 000000000000..145d2c580f07
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_compound.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_file.out
new file mode 100644
index 000000000000..5b0adb198c6d
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_file.out
@@ -0,0 +1,8 @@
+before until
+before dotcmd
+before return
+after dotcmd, return value: 0
+before dotcmd
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_for.out
new file mode 100644
index 000000000000..b113e8c0552a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_for.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_func.out
new file mode 100644
index 000000000000..1ab16ab70360
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_func.out
@@ -0,0 +1,12 @@
+before until
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_subshell.out
new file mode 100644
index 000000000000..d44463108242
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_subshell.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_until.out
new file mode 100644
index 000000000000..39980179a781
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_until.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_while.out
new file mode 100644
index 000000000000..9b140cf7a0a3
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/until_return_while.out
@@ -0,0 +1,10 @@
+before until
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+after until
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_case.out
new file mode 100644
index 000000000000..1b0731fcaf38
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_case.out
@@ -0,0 +1,5 @@
+before while
+before dotcmd
+before case
+before break
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_compound.out
new file mode 100644
index 000000000000..05c23eb4284c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_compound.out
@@ -0,0 +1,5 @@
+before while
+before dotcmd
+compound start
+before break
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_file.out
new file mode 100644
index 000000000000..cb70ae19221e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_file.out
@@ -0,0 +1,4 @@
+before while
+before dotcmd
+before break
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_for.out
new file mode 100644
index 000000000000..b94eac165604
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_for.out
@@ -0,0 +1,12 @@
+before while
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before break
+after for
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_func.out
new file mode 100644
index 000000000000..7d54c1514a67
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_func.out
@@ -0,0 +1,5 @@
+before while
+before dotcmd
+before function
+before break
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_subshell.out
new file mode 100644
index 000000000000..234cd663c2e0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_subshell.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before break
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_until.out
new file mode 100644
index 000000000000..f3602302673f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_until.out
@@ -0,0 +1,12 @@
+before while
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before break
+after until
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_while.out
new file mode 100644
index 000000000000..451b0a23671b
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_break_while.out
@@ -0,0 +1,12 @@
+before while
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before break
+after while
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_case.out
new file mode 100644
index 000000000000..d7f412c0d554
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_case.out
@@ -0,0 +1,8 @@
+before while
+before dotcmd
+before case
+before continue
+before dotcmd
+before case
+before continue
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_compound.out
new file mode 100644
index 000000000000..001904764a68
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_compound.out
@@ -0,0 +1,8 @@
+before while
+before dotcmd
+compound start
+before continue
+before dotcmd
+compound start
+before continue
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_file.out
new file mode 100644
index 000000000000..9070dea4528e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_file.out
@@ -0,0 +1,6 @@
+before while
+before dotcmd
+before continue
+before dotcmd
+before continue
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_for.out
new file mode 100644
index 000000000000..98696ee40190
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_for.out
@@ -0,0 +1,14 @@
+before while
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+before dotcmd
+before for
+before continue
+before continue
+after for
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_func.out
new file mode 100644
index 000000000000..77efc2c9c87a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_func.out
@@ -0,0 +1,8 @@
+before while
+before dotcmd
+before function
+before continue
+before dotcmd
+before function
+before continue
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_subshell.out
new file mode 100644
index 000000000000..b4106a1e2d83
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_subshell.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before continue
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_until.out
new file mode 100644
index 000000000000..7f893a015a6a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_until.out
@@ -0,0 +1,14 @@
+before while
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+before dotcmd
+before until
+before continue
+before continue
+after until
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_while.out
new file mode 100644
index 000000000000..317be17fadc4
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_continue_while.out
@@ -0,0 +1,14 @@
+before while
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+before dotcmd
+before while
+before continue
+before continue
+after while
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_case.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_case.out
new file mode 100644
index 000000000000..abb6a4afcfab
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_case.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+before dotcmd
+before case
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_compound.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_compound.out
new file mode 100644
index 000000000000..b37418b3d34e
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_compound.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+before dotcmd
+compound start
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_file.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_file.out
new file mode 100644
index 000000000000..1c4791ef7639
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_file.out
@@ -0,0 +1,8 @@
+before while
+before dotcmd
+before return
+after dotcmd, return value: 0
+before dotcmd
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_for.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_for.out
new file mode 100644
index 000000000000..0569d6fe6707
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_for.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+before dotcmd
+before for
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_func.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_func.out
new file mode 100644
index 000000000000..cb5a30853a10
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_func.out
@@ -0,0 +1,12 @@
+before while
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+before dotcmd
+before function
+before return
+after function
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_subshell.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_subshell.out
new file mode 100644
index 000000000000..161a227239bc
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_subshell.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+before dotcmd
+subshell start
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_until.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_until.out
new file mode 100644
index 000000000000..d84a5f71dca8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_until.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+before dotcmd
+before until
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_while.out b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_while.out
new file mode 100644
index 000000000000..4eeaaa9b5244
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/out/while_return_while.out
@@ -0,0 +1,10 @@
+before while
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+before dotcmd
+before while
+before return
+after dotcmd, return value: 0
+after while
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command b/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command
new file mode 100755
index 000000000000..fda4e53a302a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command
@@ -0,0 +1,129 @@
+#!/bin/sh
+#
+# $NetBSD: scoped_command,v 1.1 2014/05/31 14:29:06 christos Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jarmo Jaakkola.
+#
+# 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.
+#
+
+set -e
+
+# USAGE:
+#   scoped_command scope cmd msg var_suffix
+#
+# Write to stdout a piece of Bourne Shell script with _cmd_ in specific
+# _scope_.  The execution of _cmd_ is bracketed by prints of "before _msg_"
+# and "after _msg_, return value ${?}".  If the generated script uses
+# variables, __var_suffix_ is appended to their names to allow nesting of
+# scripts generated this way.
+#
+# _scope_ should be one of: case, compound, file, for, func, subshell,
+# until, while.
+# _cmd_ is the command line to execute.  Remember proper quoting!
+# _msg_ is text that will be used inside single quotes.
+# _var_suffix_ is a syntactically valid identifier name.
+
+# don't rely on command lists (';')
+cmd="echo 'before ${3}'
+${2}
+echo 'after ${3}, return value:' ${?}"
+
+echo "#!/bin/sh"
+
+[ 'func' = "${1}" ] && cat <<EOF
+func()
+{
+    echo 'before ${3}'
+    \${1}
+    echo 'after ${3}'
+}
+
+echo 'before function'
+func "${2}" "${3}"  # don't rely on 'shift'
+echo 'after function'
+EOF
+
+[ 'case' = "${1}" ] && cat <<EOF
+echo 'before case'
+case 'a' in
+    a)  ${cmd};;
+esac
+echo 'after case'
+EOF
+
+[ 'file' = "${1}" ] && cat <<EOF
+${cmd}
+EOF
+
+[ 'while' = "${1}" ] && cat <<EOF
+echo 'before while'
+cond_${4}='true true false'
+while \${cond_${4}}
+do
+    cond_${4}="\${cond_${4}#* }"
+    ${cmd}
+done
+echo 'after while'
+EOF
+
+[ 'until' = "${1}" ] && cat <<EOF
+echo 'before until'
+cond_${4}='false false true'
+until \${cond_${4}}
+do
+    cond_${4}="\${cond_${4}#* }"
+    ${cmd}
+done
+echo 'after until'
+EOF
+
+[ 'for' = "${1}" ] && cat <<EOF
+echo 'before for'
+for i_${4} in 1 2
+do
+    ${cmd}
+done
+echo 'after for'
+EOF
+
+[ 'subshell' = "${1}" ] && cat <<EOF
+(
+    echo 'subshell start'
+    ${cmd}
+    echo 'subshell end'
+)
+EOF
+
+[ 'compound' = "${1}" ] && cat <<EOF
+{
+    echo 'compound start'
+    ${cmd};
+    echo 'compound end'
+}
+EOF
+
+exit 0
diff --git a/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh b/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh
new file mode 100755
index 000000000000..b365b1de4676
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh
@@ -0,0 +1,76 @@
+# $NetBSD: t_dotcmd.sh,v 1.1 2014/05/31 14:29:06 christos Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jarmo Jaakkola.
+#
+# 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.
+#
+
+# Test loop and function flow control statements in various scopes in a file
+# sourced by a dotcmd in various scopes.  Basically, dotcmd is like #include
+# in C/C++ so, for example, if the dotcmd is in a loop's body, a break in
+# the sourced file can be used to break out of that loop.
+
+cmds='return break continue'
+scopes='case compound file for func subshell until while'
+
+case_ids=''
+
+for dot_scope in ${scopes}
+do
+    for cmd in ${cmds}
+    do
+        for cmd_scope in ${scopes}
+        do
+            case_id="${dot_scope}_${cmd}_${cmd_scope}"
+	    case_ids="${case_ids} ${case_id}"
+            atf_test_case "${case_id}"
+            eval "
+${case_id}_head()
+{
+    atf_set 'descr' \\
+        'dotcmd in ${dot_scope}, file contains ${cmd} in ${cmd_scope}'
+}
+
+${case_id}_body()
+{
+    srcdir=\$(atf_get_srcdir)
+    # for dotcmd to find the sourced files
+    PATH=\"\${PATH}:\${srcdir}\"
+    atf_check -o file:\"\${srcdir}/out/${case_id}.out\" \\
+            \"\${srcdir}/${case_id}\"
+}
+" # end eval
+        done
+    done
+done
+
+atf_init_test_cases()
+{
+    for case_id in ${case_ids}
+    do
+        atf_add_test_case "${case_id}"
+    done
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_compexit.sh b/contrib/netbsd-tests/bin/sh/t_compexit.sh
new file mode 100755
index 000000000000..019b740065b0
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_compexit.sh
@@ -0,0 +1,63 @@
+# $NetBSD: t_compexit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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 standard
+# http://www.opengroup.org/onlinepubs/007904975/utilities/set.html
+# says:
+#
+# -e
+#
+# When this option is on, if a simple command fails for any of the
+# reasons listed in Consequences of Shell Errors or returns an exit
+# status value >0, and is not part of the compound list following a
+# while, until, or if keyword, and is not a part of an AND or OR list,
+# and is not a pipeline preceded by the !  reserved word, then the shell
+# shall immediately exit.
+
+crud() {
+	set -e
+	for x in a
+	do
+		BAR="foo"
+		false && echo true
+		echo mumble
+	done
+}
+
+atf_test_case set_e
+set_e_head() {
+	atf_set "descr" "Tests that 'set -e' turns on error detection" \
+	                "and that it behaves as defined by the standard"
+}
+set_e_body() {
+	foo=`crud`
+	atf_check_equal 'x$foo' 'xmumble'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case set_e
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_evaltested.sh b/contrib/netbsd-tests/bin/sh/t_evaltested.sh
new file mode 100755
index 000000000000..e40f8bd4b3be
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_evaltested.sh
@@ -0,0 +1,60 @@
+# $NetBSD: t_evaltested.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case evaltested
+
+evaltested_head() {
+	atf_set "descr" "Tests that eval in a tested context does not exit"
+}
+
+evaltested_body() {
+	set -e
+cat > helper.sh << EOF
+set -e
+if eval false
+then
+	echo "'eval false' returned true"
+	exit 1
+fi
+echo "passed"
+exit 0
+EOF
+	output="$(/bin/sh helper.sh)"
+	[ $? = 0 ] && return
+
+	if [ -n "$output" ]
+	then
+		atf_fail "$output"
+	else
+		atf_fail "'eval false' exited from a tested context"
+	fi
+
+}
+
+atf_init_test_cases() {
+	atf_add_test_case evaltested
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_exit.sh b/contrib/netbsd-tests/bin/sh/t_exit.sh
new file mode 100755
index 000000000000..62c5869c009c
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_exit.sh
@@ -0,0 +1,105 @@
+# $NetBSD: t_exit.sh,v 1.3 2012/04/13 06:12:32 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+crud() {
+	test yes = no
+
+	cat <<EOF
+$?
+EOF
+}
+
+atf_test_case background
+background_head() {
+	atf_set "descr" "Tests that sh(1) sets '$?' properly when running " \
+	                "a command in the background (PR bin/46327)"
+}
+background_body() {
+	atf_check -s exit:0 -o ignore -e ignore -x "true; true & echo $?"
+	atf_check -s exit:0 -o ignore -e ignore -x "false; true & echo $?"
+}
+
+atf_test_case function
+function_head() {
+	atf_set "descr" "Tests that \$? is correctly updated inside" \
+	                "a function"
+}
+function_body() {
+	foo=`crud`
+	atf_check_equal 'x$foo' 'x1'
+}
+
+atf_test_case readout
+readout_head() {
+	atf_set "descr" "Tests that \$? is correctly updated in a" \
+	                "compound expression"
+}
+readout_body() {
+	atf_check_equal '$( true && ! true | false; echo $? )' '0'
+}
+
+atf_test_case trap_subshell
+trap_subshell_head() {
+	atf_set "descr" "Tests that the trap statement in a subshell" \
+	    "works when the subshell exits"
+}
+trap_subshell_body() {
+	atf_check -s eq:0 -o inline:'exiting\n' -x \
+	    '( trap "echo exiting" EXIT; /usr/bin/true )'
+}
+
+atf_test_case trap_zero__implicit_exit
+trap_zero__implicit_exit_body() {
+	# PR bin/6764: sh works but ksh does not"
+	echo '( trap "echo exiting" 0 )' >helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
+atf_test_case trap_zero__explicit_exit
+trap_zero__explicit_exit_body() {
+	echo '( trap "echo exiting" 0; exit )' >helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
+atf_test_case trap_zero__explicit_return
+trap_zero__explicit_return_body() {
+	echo '( trap "echo exiting" 0; return )' >helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+	atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
+atf_init_test_cases() {
+	atf_add_test_case background
+	atf_add_test_case function
+	atf_add_test_case readout
+	atf_add_test_case trap_subshell
+	atf_add_test_case trap_zero__implicit_exit
+	atf_add_test_case trap_zero__explicit_exit
+	atf_add_test_case trap_zero__explicit_return
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_expand.sh b/contrib/netbsd-tests/bin/sh/t_expand.sh
new file mode 100755
index 000000000000..eeaad5f7db71
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_expand.sh
@@ -0,0 +1,142 @@
+# $NetBSD: t_expand.sh,v 1.2 2013/10/06 21:05:50 ast Exp $
+#
+# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# This file tests the functions in expand.c.
+#
+
+delim_argv() {
+	str=
+	while [ $# -gt 0 ]; do
+		if [ -z "${str}" ]; then
+			str=">$1<"
+		else
+			str="${str} >$1<"
+		fi
+		shift
+	done
+	echo ${str}
+}
+
+atf_test_case dollar_at
+dollar_at_head() {
+	atf_set "descr" "Somewhere between 2.0.2 and 3.0 the expansion" \
+	                "of the \$@ variable had been broken.  Check for" \
+			"this behavior."
+}
+dollar_at_body() {
+	# This one should work everywhere.
+	got=`echo "" "" | sed 's,$,EOL,'`
+	atf_check_equal ' EOL' '$got'
+
+	# This code triggered the bug.
+	set -- "" ""
+	got=`echo "$@" | sed 's,$,EOL,'`
+	atf_check_equal ' EOL' '$got'
+
+	set -- -
+	shift
+	n_arg() { echo $#; }
+	n_args=`n_arg "$@"`
+	atf_check_equal '0' '$n_args'
+}
+
+atf_test_case dollar_at_with_text
+dollar_at_with_text_head() {
+	atf_set "descr" "Test \$@ expansion when it is surrounded by text" \
+	                "within the quotes.  PR bin/33956."
+}
+dollar_at_with_text_body() {
+	set --
+	atf_check_equal '' "$(delim_argv "$@")"
+	atf_check_equal '>foobar<' "$(delim_argv "foo$@bar")"
+	atf_check_equal '>foo  bar<' "$(delim_argv "foo $@ bar")"
+
+	set -- a b c
+	atf_check_equal '>a< >b< >c<' "$(delim_argv "$@")"
+	atf_check_equal '>fooa< >b< >cbar<' "$(delim_argv "foo$@bar")"
+	atf_check_equal '>foo a< >b< >c bar<' "$(delim_argv "foo $@ bar")"
+}
+
+atf_test_case strip
+strip_head() {
+	atf_set "descr" "Checks that the %% operator works and strips" \
+	                "the contents of a variable from the given point" \
+			"to the end"
+}
+strip_body() {
+	line='#define bindir "/usr/bin" /* comment */'
+	stripped='#define bindir "/usr/bin" '
+	atf_expect_fail "PR bin/43469"
+	atf_check_equal '$stripped' '${line%%/\**}'
+}
+
+atf_test_case varpattern_backslashes
+varpattern_backslashes_head() {
+	atf_set "descr" "Tests that protecting wildcards with backslashes" \
+	                "works in variable patterns."
+}
+varpattern_backslashes_body() {
+	line='/foo/bar/*/baz'
+	stripped='/foo/bar/'
+	atf_check_equal $stripped ${line%%\**}
+}
+
+atf_test_case arithmetic
+arithmetic_head() {
+	atf_set "descr" "POSIX requires shell arithmetic to use signed" \
+	                "long or a wider type.  We use intmax_t, so at" \
+			"least 64 bits should be available.  Make sure" \
+			"this is true."
+}
+arithmetic_body() {
+	atf_check_equal '3' '$((1 + 2))'
+	atf_check_equal '2147483647' '$((0x7fffffff))'
+	atf_check_equal '9223372036854775807' '$(((1 << 63) - 1))'
+}
+
+atf_test_case iteration_on_null_parameter
+iteration_on_null_parameter_head() {
+	atf_set "descr" "Check iteration of \$@ in for loop when set to null;" \
+	                "the error \"sh: @: parameter not set\" is incorrect." \
+	                "PR bin/48202."
+}
+iteration_on_null_parameter_body() {
+	s1=`/bin/sh -uc 'N=; set -- ${N};   for X; do echo "[$X]"; done' 2>&1`
+	s2=`/bin/sh -uc 'N=; set -- ${N:-}; for X; do echo "[$X]"; done' 2>&1`
+	atf_check_equal ''   '$s1'
+	atf_check_equal '[]' '$s2'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case dollar_at
+	atf_add_test_case dollar_at_with_text
+	atf_add_test_case strip
+	atf_add_test_case varpattern_backslashes
+	atf_add_test_case arithmetic
+	atf_add_test_case iteration_on_null_parameter
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_fsplit.sh b/contrib/netbsd-tests/bin/sh/t_fsplit.sh
new file mode 100755
index 000000000000..2c3dbae23dc8
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_fsplit.sh
@@ -0,0 +1,186 @@
+# $NetBSD: t_fsplit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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 standard
+# http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+# explains (section 2.6) that Field splitting should be performed on the
+# result of variable expansions.
+# In particular this means that in ${x-word}, 'word' must be expanded as if
+# the "${x-" and "}" were absent from the input line.
+#
+# So: sh -c 'set ${x-a b c}; echo $#' should give 3.
+#
+
+nl='
+'
+
+check()
+{
+	result="$(eval $1)"
+	# Remove newlines
+	oifs="$IFS"
+	IFS="$nl"
+	result="$(echo $result)"
+	IFS="$oifs"
+	if [ "$2" != "$result" ]
+	then
+		atf_fail "expected [$2], found [$result]"
+	fi
+}
+
+atf_test_case for
+for_head() {
+	atf_set "descr" "Checks field splitting in for loops"
+}
+for_body() {
+	unset x
+
+	# Since I managed to break this, leave the test in
+	check 'for f in $x; do echo x${f}y; done' ''
+}
+
+atf_test_case default_val
+default_val_head() {
+	atf_set "descr" "Checks field splitting in variable default values"
+}
+default_val_body() {
+	unset x
+
+	# Check that IFS is applied to text from ${x-...} unless it is inside
+	# any set of "..."
+	check 'set ${x-a b c}; echo $#' 3
+	check 'for i in ${x-a b c};            do echo "z${i}z"; done' 'zaz zbz zcz'
+	check 'for i in ${x-"a b" c};          do echo "z${i}z"; done' 'za bz zcz'
+	check 'for i in ${x-"a ${x-b c}" d};   do echo "z${i}z"; done' 'za b cz zdz'
+	check 'for i in ${x-"a ${x-"b c"}" d}; do echo "z${i}z"; done' 'za b cz zdz'
+	check 'for i in ${x-a ${x-"b c"} d};   do echo "z${i}z"; done' 'zaz zb cz zdz'
+	check 'for i in ${x-a ${x-b c} d};     do echo "z${i}z"; done' 'zaz zbz zcz zdz'
+}
+
+atf_test_case ifs_alpha
+ifs_alpha_head() {
+	atf_set "descr" "Checks that field splitting works with alphabetic" \
+	                "characters"
+}
+ifs_alpha_body() {
+	unset x
+
+	# repeat with an alphabetic in IFS
+	check 'IFS=q; set ${x-aqbqc}; echo $#' 3
+	check 'IFS=q; for i in ${x-aqbqc};            do echo "z${i}z"; done' 'zaz zbz zcz'
+	check 'IFS=q; for i in ${x-"aqb"qc};          do echo "z${i}z"; done' 'zaqbz zcz'
+	check 'IFS=q; for i in ${x-"aq${x-bqc}"qd};   do echo "z${i}z"; done' 'zaqbqcz zdz'
+	check 'IFS=q; for i in ${x-"aq${x-"bqc"}"qd}; do echo "z${i}z"; done' 'zaqbqcz zdz'
+	check 'IFS=q; for i in ${x-aq${x-"bqc"}qd};  do echo "z${i}z"; done' 'zaz zbqcz zdz'
+}
+
+atf_test_case quote
+quote_head() {
+	atf_set "descr" "Checks that field splitting works with multi-word" \
+	                "fields"
+}
+quote_body() {
+	unset x
+
+	# Some quote propagation checks
+	check 'set "${x-a b c}";   echo $#' 1
+	check 'set "${x-"a b" c}"; echo $1' 'a b c'
+	check 'for i in "${x-a b c}"; do echo "z${i}z"; done' 'za b cz'
+}
+
+atf_test_case dollar_at
+dollar_at_head() {
+	atf_set "descr" "Checks that field splitting works when expanding" \
+	                "\$@"
+}
+dollar_at_body() {
+	unset x
+
+	# Check we get "$@" right
+	check 'set "";        for i;           do echo "z${i}z"; done' 'zz'
+	check 'set "";        for i in "$@";   do echo "z${i}z"; done' 'zz'
+	check 'set "" "";     for i;           do echo "z${i}z"; done' 'zz zz'
+	check 'set "" "";     for i in "$@";   do echo "z${i}z"; done' 'zz zz'
+	check 'set "" "";     for i in $@;     do echo "z${i}z"; done' ''
+	check 'set "a b" c;   for i;           do echo "z${i}z"; done' 'za bz zcz'
+	check 'set "a b" c;   for i in "$@";   do echo "z${i}z"; done' 'za bz zcz'
+	check 'set "a b" c;   for i in $@;     do echo "z${i}z"; done' 'zaz zbz zcz'
+	check 'set " a b " c; for i in "$@";   do echo "z${i}z"; done' 'z a b z zcz'
+	check 'set --;        for i in x"$@"x; do echo "z${i}z"; done' 'zxxz'
+	check 'set a;         for i in x"$@"x; do echo "z${i}z"; done' 'zxaxz'
+	check 'set a b;       for i in x"$@"x; do echo "z${i}z"; done' 'zxaz zbxz'
+}
+
+atf_test_case ifs
+ifs_head() {
+	atf_set "descr" "Checks that IFS correctly configures field" \
+	                "splitting behavior"
+}
+ifs_body() {
+	unset x
+
+	# Some IFS tests
+	check 't="-- ";    IFS=" ";  set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '0'
+	check 't=" x";     IFS=" x"; set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '1'
+	check 't=" x ";    IFS=" x"; set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '1'
+	check 't=axb;      IFS="x";  set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '2 a:b'
+	check 't="a x b";  IFS="x";  set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '2 a : b'
+	check 't="a xx b"; IFS="x";  set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '3 a :: b'
+	check 't="a xx b"; IFS="x "; set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '3 a::b'
+	# A recent 'clarification' means that a single trailing IFS non-whitespace
+	# doesn't generate an empty parameter
+	check 't="xax";  IFS="x";     set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '2 :a'
+	check 't="xax "; IFS="x ";   set $t; IFS=":"; r="$*"; IFS=; echo $# $r' '2 :a'
+	# Verify that IFS isn't being applied where it shouldn't be.
+	check 'IFS="x";             set axb; IFS=":"; r="$*"; IFS=; echo $# $r' '1 axb'
+}
+
+atf_test_case var_length
+var_length_head() {
+	atf_set "descr" "Checks that field splitting works when expanding" \
+	                "a variable's length"
+}
+var_length_body() {
+	unset x
+
+	# Check that we apply IFS to ${#var}
+	long=12345678123456781234567812345678
+	long=$long$long$long$long
+	check 'echo ${#long}; IFS=2; echo ${#long}; set 1 ${#long};echo $#' '128 1 8 3'
+	check 'IFS=2; set ${x-${#long}};   IFS=" "; echo $* $#' '1 8 2'
+	check 'IFS=2; set ${x-"${#long}"}; IFS=" "; echo $* $#' '128 1'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case for
+	atf_add_test_case default_val
+	atf_add_test_case ifs_alpha
+	atf_add_test_case quote
+	atf_add_test_case dollar_at
+	atf_add_test_case ifs
+	atf_add_test_case var_length
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_here.sh b/contrib/netbsd-tests/bin/sh/t_here.sh
new file mode 100755
index 000000000000..250c686aa39a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_here.sh
@@ -0,0 +1,73 @@
+# $NetBSD: t_here.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+nl='
+'
+
+check()
+{
+	SVIFS="$IFS"
+	result="$(eval $1)"
+	# Remove newlines
+	oifs="$IFS"
+	IFS="$nl"
+	result="$(echo $result)"
+	IFS="$oifs"
+	if [ "$2" != "$result" ]
+	then
+		atf_fail "expected [$2], found [$result]"
+	fi
+	IFS="$SVIFS"
+}
+
+atf_test_case all
+all_head() {
+	atf_set "descr" "Basic tests for here documents"
+}
+all_body() {
+	y=x
+
+	IFS=
+	check 'x=`cat <<EOF'$nl'text'${nl}EOF$nl'`; echo $x' 'text'
+	check 'x=`cat <<\EOF'$nl'text'${nl}EOF$nl'`; echo $x' 'text'
+
+	check 'x=`cat <<EOF'$nl'te${y}t'${nl}EOF$nl'`; echo $x' 'text'
+	check 'x=`cat <<\EOF'$nl'te${y}t'${nl}EOF$nl'`; echo $x' 'te${y}t'
+	check 'x=`cat <<"EOF"'$nl'te${y}t'${nl}EOF$nl'`; echo $x' 'te${y}t'
+	check 'x=`cat <<'"'EOF'"$nl'te${y}t'${nl}EOF$nl'`; echo $x' 'te${y}t'
+
+	check 'x=`cat <<EOF'$nl'te'"'"'xt'${nl}EOF$nl'`; echo $x' 'te'"'"'xt'
+	check 'x=`cat <<\EOF'$nl'te'"'"'xt'${nl}EOF$nl'`; echo $x' 'te'"'"'xt'
+	check 'x=`cat <<"EOF"'$nl'te'"'"'xt'${nl}EOF$nl'`; echo $x' 'te'"'"'xt'
+
+	check 'x=`cat <<EOF'$nl'te'"'"'${y}t'${nl}EOF$nl'`; echo $x' 'te'"'"'xt'
+	check 'x=`cat <<EOF'$nl'te'"''"'${y}t'${nl}EOF$nl'`; echo $x' 'te'"''"'xt'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case all
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_set_e.sh b/contrib/netbsd-tests/bin/sh/t_set_e.sh
new file mode 100755
index 000000000000..8dfe6e411746
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_set_e.sh
@@ -0,0 +1,289 @@
+# $NetBSD: t_set_e.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# references:
+#   http://www.opengroup.org/onlinepubs/009695399/utilities/set.html
+#   http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+
+# the implementation of "sh" to test
+: ${TEST_SH:="sh"}
+
+failwith()
+{
+	case "$SH_FAILS" in
+		"") SH_FAILS=`echo "$1"`;;
+		*) SH_FAILS="$SH_FAILS"`echo; echo "$1"`;;
+	esac
+}
+
+check1()
+{
+	#echo "$TEST_SH -c $1"
+	result=`$TEST_SH -c "$1" 2>/dev/null | tr '\n' ' ' | sed 's/ *$//'`
+	if [ "$result" != "$2" ]; then
+		MSG=`printf "%-56s %-8s  %s" "$3" "$result" "$2"`
+		failwith "$MSG"
+		failcount=`expr $failcount + 1`
+	fi
+	count=`expr $count + 1`
+}
+
+# direct check: try the given expression.
+dcheck()
+{
+	check1 "$1" "$2" "$1"
+}
+
+# eval check: indirect through eval.
+# as of this writing, this changes the behavior pretty drastically and
+# is thus important to test. (PR bin/29861)
+echeck()
+{
+	check1 'eval '"'($1)'" "$2" "eval '($1)'"
+}
+
+atf_test_case all
+all_head() {
+	atf_set "descr" "Tests that 'set -e' works correctly"
+}
+all_body() {
+	count=0
+	failcount=0
+
+	# make sure exiting from a subshell behaves as expected
+	dcheck '(set -e; exit 1; echo ERR$?); echo OK$?' 'OK1'
+	echeck '(set -e; exit 1; echo ERR$?); echo OK$?' 'OK1'
+
+	# first, check basic functioning.
+	# The ERR shouldn't print; the result of the () should be 1.
+	# Henceforth we'll assume that we don't need to check $?.
+	dcheck '(set -e; false; echo ERR$?); echo -n OK$?' 'OK1'
+	echeck '(set -e; false; echo ERR$?); echo -n OK$?' 'OK1'
+
+	# these cases should be equivalent to the preceding.
+	dcheck '(set -e; /nonexistent; echo ERR); echo OK' 'OK'
+	echeck '(set -e; /nonexistent; echo ERR); echo OK' 'OK'
+	dcheck '(set -e; nonexistent-program-on-path; echo ERR); echo OK' 'OK'
+	echeck '(set -e; nonexistent-program-on-path; echo ERR); echo OK' 'OK'
+	dcheck 'f() { false; }; (set -e; f; echo ERR); echo OK' 'OK'
+	echeck 'f() { false; }; (set -e; f; echo ERR); echo OK' 'OK'
+	dcheck 'f() { return 1; }; (set -e; f; echo ERR); echo OK' 'OK'
+	echeck 'f() { return 1; }; (set -e; f; echo ERR); echo OK' 'OK'
+
+	# but! with set -e, the false should cause an *immediate* exit.
+	# The return form should not, as such, but there's no way to
+	# distinguish it.
+	dcheck 'f() { false; echo ERR; }; (set -e; f); echo OK' 'OK'
+	echeck 'f() { false; echo ERR; }; (set -e; f); echo OK' 'OK'
+
+	# set is not scoped, so these should not exit at all.
+	dcheck 'f() { set +e; false; echo OK; }; (set -e; f); echo OK' 'OK OK'
+	echeck 'f() { set +e; false; echo OK; }; (set -e; f); echo OK' 'OK OK'
+
+	# according to the standard, only failing *simple* commands
+	# cause an exit under -e. () is not a simple command.
+	#   Correct (per POSIX):
+	#dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK'
+	#echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK'
+	#   Wrong current behavior:
+	dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK'
+	echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK'
+
+	# make sure an inner nested shell does exit though.
+	dcheck '(set -e; (false; echo ERR)); echo OK' 'OK'
+
+	# The left hand side of an || or && is explicitly tested and
+	# thus should not cause an exit. Furthermore, because a || or
+	# && expression is not a simple command, there should be no
+	# exit even if the overall result is false.
+	dcheck '(set -e; false || true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; false || true; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; false && true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; false && true; echo OK); echo OK' 'OK OK'
+
+	# However, the right hand side is not tested, so a failure
+	# there *should* cause an exit, regardless of whether it
+	# appears inside a non-simple command.
+	#
+	# Note that in at least one place the standard does not
+	# distinguish between the left and right hand sides of
+	# logical operators. It is possible that for strict
+	# compliance these need to not exit; however, if so that
+	# should probably be limited to when some strict-posix setting
+	# is in effect and tested accordingly.
+	#
+	dcheck '(set -e; false || false; echo ERR); echo OK' 'OK'
+	dcheck '(set -e; true && false; echo ERR); echo OK' 'OK'
+	echeck '(set -e; false || false; echo ERR); echo OK' 'OK'
+	echeck '(set -e; true && false; echo ERR); echo OK' 'OK'
+
+	# correct:
+	#dcheck '(set -e; false && false; echo ERR); echo OK' 'OK'
+	#echeck '(set -e; false && false; echo ERR); echo OK' 'OK'
+
+	# wrong current behavior:
+	dcheck '(set -e; false && false; echo ERR); echo OK' 'ERR OK'
+	echeck '(set -e; false && false; echo ERR); echo OK' 'ERR OK'
+
+	# A failure that is not reached because of short-circuit
+	# evaluation should not cause an exit, however.
+	dcheck '(set -e; true || false; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; true || false; echo OK); echo OK' 'OK OK'
+
+	# For completeness, test the other two combinations.
+	dcheck '(set -e; true || true; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; true && true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; true || true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; true && true; echo OK); echo OK' 'OK OK'
+
+	# likewise, none of these should exit.
+	dcheck '(set -e; while false; do :; done; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; if false; then :; fi; echo OK); echo OK' 'OK OK'
+	# problematic :-)
+	#dcheck '(set -e; until false; do :; done; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; until [ "$t" = 1 ]; do t=1; done; echo OK); echo OK' \
+	  'OK OK'
+	echeck '(set -e; while false; do :; done; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; if false; then :; fi; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; until [ "$t" = 1 ]; do t=1; done; echo OK); echo OK' \
+	  'OK OK'
+
+	# the bang operator tests its argument and thus the argument
+	# should not cause an exit. it is also not a simple command (I
+	# believe) so it also shouldn't exit even if it yields a false
+	# result.
+	dcheck '(set -e; ! false; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; ! true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; ! false; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; ! true; echo OK); echo OK' 'OK OK'
+
+	# combined case with () and &&; the inner expression is false
+	# but does not itself exit, and the () should not cause an 
+	# exit even when failing.
+	# correct:
+	#dcheck '(set -e; (false && true); echo OK); echo OK' 'OK OK'
+	#echeck '(set -e; (false && true); echo OK); echo OK' 'OK OK'
+	# wrong current behavior:
+	dcheck '(set -e; (false && true); echo OK); echo OK' 'OK'
+	echeck '(set -e; (false && true); echo OK); echo OK' 'OK'
+
+	# pipelines. only the right-hand end is significant.
+	dcheck '(set -e; false | true; echo OK); echo OK' 'OK OK'
+	echeck '(set -e; false | true; echo OK); echo OK' 'OK OK'
+	dcheck '(set -e; true | false; echo ERR); echo OK' 'OK'
+	echeck '(set -e; true | false; echo ERR); echo OK' 'OK'
+
+	dcheck '(set -e; while true | false; do :; done; echo OK); echo OK' \
+	    'OK OK'
+	dcheck '(set -e; if true | false; then :; fi; echo OK); echo OK' \
+	    'OK OK'
+
+
+	# According to dsl@ in PR bin/32282, () is not defined as a
+	# subshell, only as a grouping operator [and a scope, I guess]
+	# so the nested false ought to cause the whole shell to exit,
+	# not just the subshell. dholland@ would like to see C&V,
+	# because that seems like a bad idea. (Among other things, it
+	# would break all the above test logic, which relies on being
+	# able to isolate set -e behavior inside ().) However, I'm
+	# going to put these tests here to make sure the issue gets
+	# dealt with sometime.
+	#
+	# XXX: the second set has been disabled in the name of making
+	# all tests "pass".
+
+	# 1. error if the whole shell exits (current behavior)
+	dcheck 'echo OK; (set -e; false); echo OK' 'OK OK'
+	echeck 'echo OK; (set -e; false); echo OK' 'OK OK'
+	# 2. error if the whole shell does not exit (dsl's suggested behavior)
+	#dcheck 'echo OK; (set -e; false); echo ERR' 'OK'
+	#echeck 'echo OK; (set -e; false); echo ERR' 'OK'
+
+	# The current behavior of the shell is that it exits out as
+	# far as -e is set and then stops. This is probably a
+	# consequence of it handling () wrong, but it's a somewhat
+	# curious compromise position between 1. and 2. above.
+	dcheck '(set -e; (false; echo ERR); echo ERR); echo OK' 'OK'
+	echeck '(set -e; (false; echo ERR); echo ERR); echo OK' 'OK'
+
+	# backquote expansion (PR bin/17514)
+
+	# correct
+	#dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK'
+	#dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK'
+	#dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK'
+	#dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK'
+	# wrong current behavior
+	dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'ERR ERR OK'
+	dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'ERR ERR OK'
+	dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'ERR ERR OK'
+	dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'ERR ERR OK'
+
+	dcheck '(set -e; x=`false`; echo ERR); echo OK' 'OK'
+	dcheck '(set -e; x=$(false); echo ERR); echo OK' 'OK'
+	dcheck '(set -e; x=`exit 3`; echo ERR); echo OK' 'OK'
+	dcheck '(set -e; x=$(exit 3); echo ERR); echo OK' 'OK'
+
+	# correct
+	#echeck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK'
+	#echeck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK'
+	#echeck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK'
+	#echeck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK'
+
+	# wrong current behavior
+	echeck '(set -e; echo ERR `false`; echo ERR); echo OK' 'ERR ERR OK'
+	echeck '(set -e; echo ERR $(false); echo ERR); echo OK' 'ERR ERR OK'
+	echeck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'ERR ERR OK'
+	echeck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'ERR ERR OK'
+
+	echeck '(set -e; x=`false`; echo ERR); echo OK' 'OK'
+	echeck '(set -e; x=$(false); echo ERR); echo OK' 'OK'
+	echeck '(set -e; x=`exit 3`; echo ERR); echo OK' 'OK'
+	echeck '(set -e; x=$(exit 3); echo ERR); echo OK' 'OK'
+
+	# shift (PR bin/37493)
+	# correct
+	#dcheck '(set -e; shift || true; echo OK); echo OK' 'OK OK'
+	#echeck '(set -e; shift || true; echo OK); echo OK' 'OK OK'
+	# wrong current behavior
+	dcheck '(set -e; shift || true; echo OK); echo OK' 'OK'
+	echeck '(set -e; shift || true; echo OK); echo OK' 'OK'
+
+	# Done.
+
+	if [ "x$SH_FAILS" != x ]; then
+	    printf '%-56s %-8s  %s\n' "Expression" "Result" "Should be"
+	    echo "$SH_FAILS"
+	    atf_fail "$failcount of $count failed cases"
+	else
+	    atf_pass
+	fi
+}
+
+atf_init_test_cases() {
+	atf_add_test_case all
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_ulimit.sh b/contrib/netbsd-tests/bin/sh/t_ulimit.sh
new file mode 100755
index 000000000000..3e7c0a68e70f
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_ulimit.sh
@@ -0,0 +1,46 @@
+# $NetBSD: t_ulimit.sh,v 1.1 2012/06/11 18:32:59 njoly Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# ulimit builtin test.
+
+atf_test_case limits
+limits_head() {
+	atf_set "descr" "Checks for limits flags"
+}
+limits_body() {
+	atf_check -s eq:0 -o ignore -e empty \
+	    /bin/sh -c "ulimit -a"
+	for l in $(ulimit -a | sed 's,^.*(,,;s, .*$,,');
+	do
+	    atf_check -s eq:0 -o ignore -e empty \
+	        /bin/sh -c "ulimit $l"
+	done
+}
+
+atf_init_test_cases() {
+	atf_add_test_case limits
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_varquote.sh b/contrib/netbsd-tests/bin/sh/t_varquote.sh
new file mode 100755
index 000000000000..17687779637a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_varquote.sh
@@ -0,0 +1,81 @@
+# $NetBSD: t_varquote.sh,v 1.2 2012/03/25 18:50:19 christos Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# Variable quoting test.
+
+check() {
+	if [ "$1" != "$2" ]
+	then
+		atf_fail "expected [$2], found [$1]" 1>&2
+	fi
+}
+
+atf_test_case all
+all_head() {
+	atf_set "descr" "Basic checks for variable quoting"
+}
+all_body() {
+	foo='${a:-foo}'
+	check "$foo" '${a:-foo}'
+
+	foo="${a:-foo}"
+	check "$foo" "foo"
+
+	foo=${a:-"'{}'"}
+	check "$foo" "'{}'"
+
+	foo=${a:-${b:-"'{}'"}}
+	check "$foo" "'{}'"
+
+	foo="${a:-"'{}'"}"
+	check "$foo" "'{}'"
+
+	foo="${a:-${b:-"${c:-${d:-"x}"}}y}"}}z}"
+	#   "                                z*"
+	#    ${a:-                          }
+	#         ${b:-                    }
+	#              "                y*"
+	#               ${c:-          }
+	#                    ${d:-    }
+	#                         "x*"
+	check "$foo" "x}y}z}"
+}
+
+atf_test_case nested_quotes_multiword
+nested_quotes_multiword_head() {
+	atf_set "descr" "Tests that having nested quoting in a multi-word" \
+	    "string works (PR bin/43597)"
+}
+nested_quotes_multiword_body() {
+	atf_check -s eq:0 -o match:"first-word second-word" -e empty \
+	    /bin/sh -c 'echo "${foo:="first-word"} second-word"'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case all
+	atf_add_test_case nested_quotes_multiword
+}
diff --git a/contrib/netbsd-tests/bin/sh/t_wait.sh b/contrib/netbsd-tests/bin/sh/t_wait.sh
new file mode 100755
index 000000000000..99b47df7ad27
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sh/t_wait.sh
@@ -0,0 +1,59 @@
+# $NetBSD: t_wait.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case individual
+individual_head() {
+	atf_set "descr" "Tests that waiting for individual jobs works"
+}
+individual_body() {
+	# atf-sh confuses wait for some reason; work it around by creating
+	# a helper script that executes /bin/sh directly.
+	cat >helper.sh <<EOF
+sleep 3 &
+sleep 1 &
+
+wait %1
+if [ \$? -ne 0 ]; then
+    echo "Waiting of first job failed"
+    exit 1
+fi
+
+wait %2
+if [ \$? -ne 0 ]; then
+    echo "Waiting of second job failed"
+    exit 1
+fi
+
+exit 0
+EOF
+	output=$(/bin/sh helper.sh)
+	[ $? -eq 0 ] || atf_fail "${output}"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case individual
+}
diff --git a/contrib/netbsd-tests/bin/sleep/t_sleep.sh b/contrib/netbsd-tests/bin/sleep/t_sleep.sh
new file mode 100755
index 000000000000..d79ab6722685
--- /dev/null
+++ b/contrib/netbsd-tests/bin/sleep/t_sleep.sh
@@ -0,0 +1,72 @@
+# $NetBSD: t_sleep.sh,v 1.1 2012/03/30 09:27:10 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case fraction
+fraction_head() {
+	atf_set "descr" "Test that sleep(1) handles " \
+			"fractions of a second (PR bin/3914)"
+}
+
+fraction_body() {
+
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0.1"
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0.2"
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0.3"
+}
+
+atf_test_case hex
+hex_head() {
+	atf_set "descr" "Test that sleep(1) handles hexadecimal arguments"
+}
+
+hex_body() {
+
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0x01"
+}
+
+atf_test_case nonnumeric
+nonnumeric_head() {
+	atf_set "descr" "Test that sleep(1) errors out with " \
+			"non-numeric argument (PR bin/27140)"
+}
+
+nonnumeric_body() {
+
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep xyz"
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep x21"
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep  /3"
+}
+
+atf_init_test_cases() {
+
+	atf_add_test_case fraction
+	atf_add_test_case hex
+	atf_add_test_case nonnumeric
+}
diff --git a/contrib/netbsd-tests/bin/tar/t_tar.sh b/contrib/netbsd-tests/bin/tar/t_tar.sh
new file mode 100755
index 000000000000..133d39c1272a
--- /dev/null
+++ b/contrib/netbsd-tests/bin/tar/t_tar.sh
@@ -0,0 +1,51 @@
+# $NetBSD: t_tar.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case append
+append_head() {
+	atf_set "descr" "Ensure that appending a file to an archive" \
+	                "produces the same results as if the file" \
+	                "had been there during the archive's creation"
+}
+append_body() {
+	touch foo bar
+
+	# store both foo and bar into file1.tar
+	atf_check -s eq:0 -o empty -e empty tar -cf file1.tar foo bar
+
+	# store foo into file2.tar, then append bar to file2.tar
+	atf_check -s eq:0 -o empty -e empty tar -cf file2.tar foo
+	atf_check -s eq:0 -o empty -e empty tar -rf file2.tar bar
+
+	# ensure that file1.tar and file2.tar are equal
+	atf_check -s eq:0 -o empty -e empty cmp file1.tar file2.tar
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case append
+}
diff --git a/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf.out b/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf.out
new file mode 100644
index 000000000000..6bd76a2da5ff
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf.out
@@ -0,0 +1,94 @@
+num_items             = 47
+num_nodes             = 24
+num_alloc_nodes       = 32
+num_expands           = 16
+num_expand_reallocs   = 1
+num_contracts         = 0
+num_contract_reallocs = 0
+num_hash_calls        = 60
+num_comp_calls        = 5
+num_insert            = 47
+num_replace           = 0
+num_delete            = 0
+num_no_delete         = 0
+num_retrieve          = 5
+num_retrieve_miss     = 8
+num_hash_comps        = 132
+node      0 ->   4
+node      1 ->   1
+node      2 ->   1
+node      3 ->   4
+node      4 ->   0
+node      5 ->   2
+node      6 ->   1
+node      7 ->   1
+node      8 ->   6
+node      9 ->   2
+node     10 ->   1
+node     11 ->   1
+node     12 ->   3
+node     13 ->   1
+node     14 ->   4
+node     15 ->   3
+node     16 ->   5
+node     17 ->   0
+node     18 ->   2
+node     19 ->   0
+node     20 ->   2
+node     21 ->   2
+node     22 ->   0
+node     23 ->   1
+20 nodes used out of 24
+47 items
+load 1.95  actual load 2.35
+init2=10
+cipher1=NULL
+s_client:cipher1=DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5cipher2		= DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
+---------------------------- DUMP ------------------------
+[req] Attribute_text_7=Email Address
+[req] Attribute_text_2=State or Province Name (full name)
+[default] tmp_cert_dir=/tmp/eay/.ca_certs
+[req] Attribute_text_1=Country Name (2 letter code)
+[[genrsa]]
+[req] Attribute_default_5=TR
+[req] Attribute_text_6=Common Name (eg, YOUR name)
+[req] Attribute_default_1=AU
+[[req]]
+[[special]]
+[[gendh]]
+[req] Attribute_text_3=Locality Name (eg, city)
+[req] Attribute_type_1=countryName
+[default] init5==10' again
+[req] Attribute_type_3=localityName
+[s_client] cipher3=DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
+[default] in\#it1=10
+[req] Attribute_text_4=Organization Name (eg, company)
+[req] Attribute_type_7=emailAddress
+[gendh] def_generator=2
+[default] HOME=/tmp/eay
+[s_client] cipher4=DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
+[default] init=5
+[SSLeay] version=0.5.0
+[req] Attribute_type_4=organizationName
+[default] tmp2_cert_dir=thisis/tmp/eaystuff
+[req] Attribute_type_5=organizationalUnitName
+[[SSLEAY]]
+[default] init4=10'
+[[default]]
+[default] LOGNAME=Eric Young (home=/tmp/eay)
+[special] RANDFILE=/tmp/eay/.rand
+[req] default_keyfile=privkey.pem
+[req] Attribute_default_4=Mincom Pty Ltd
+[req] Attribute_default_2=Queensland
+[gendh] default_bits=512
+[req] default_bits=512
+[default] init2=10
+[SSLEAY] version=0.5.0
+[s_client] cipher1=DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5cipher2		= DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
+[req] Attribute_text_5=Organizational Unit Name (eg, section)
+[req] Attribute_type_2=stateOrProvinceName
+[genrsa] default_bits=512
+[default] init3=10'
+[[SSLeay]]
+[[s_client]]
+[req] Attribute_type_6=commonName
diff --git a/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf_ssleay.cnf b/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf_ssleay.cnf
new file mode 100644
index 000000000000..3fdde34dd264
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/conf/d_conf_ssleay.cnf
@@ -0,0 +1,78 @@
+#
+# This is a test configuration file for use in SSLeay etc...
+#
+
+init = 5
+in\#it1 =10
+init2='10'
+init3='10\''
+init4="10'"
+init5='='10\'' again'
+
+SSLeay::version = 0.5.0
+
+[genrsa]
+default_bits	= 512
+SSLEAY::version = 0.5.0
+
+[gendh]
+default_bits	= 512
+def_generator	= 2
+
+[s_client]
+cipher1		= DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5\
+cipher2		= 'DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5'
+cipher3		= "DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5"
+cipher4		= DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
+
+[ default ]
+#cert_dir	= $ENV::HOME/.ca_certs
+
+HOME		= /tmp/eay
+
+tmp_cert_dir	= $HOME/.ca_certs
+tmp2_cert_dir	= thisis$(HOME)stuff
+
+LOGNAME	= Eric Young (home=$HOME)
+
+[ special ]
+
+#H=$HOME
+#H=$default::HOME
+#H=$ENV::HOME
+#
+# SSLeay example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+RANDFILE		= $HOME/.rand
+
+[ req ]
+default_bits		= 512
+default_keyfile 	= privkey.pem
+
+Attribute_type_1	= countryName
+Attribute_text_1	= Country Name (2 letter code)
+Attribute_default_1	= AU
+
+Attribute_type_2	= stateOrProvinceName
+Attribute_text_2	= State or Province Name (full name)
+Attribute_default_2	= Queensland
+
+Attribute_type_3	= localityName
+Attribute_text_3	= Locality Name (eg, city)
+
+Attribute_type_4	= organizationName
+Attribute_text_4	= Organization Name (eg, company)
+Attribute_default_4	= Mincom Pty Ltd
+
+Attribute_type_5	= organizationalUnitName
+Attribute_text_5	= Organizational Unit Name (eg, section)
+Attribute_default_5	= TR
+
+Attribute_type_6	= commonName
+Attribute_text_6	= Common Name (eg, YOUR name)
+
+Attribute_type_7	= emailAddress
+Attribute_text_7	= Email Address
+
diff --git a/contrib/netbsd-tests/crypto/libcrypto/t_certs.sh b/contrib/netbsd-tests/crypto/libcrypto/t_certs.sh
new file mode 100755
index 000000000000..6965a5727022
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/t_certs.sh
@@ -0,0 +1,41 @@
+# $NetBSD: t_certs.sh,v 1.1 2010/07/10 16:43:25 jmmv Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case x509v3
+x509v3_head()
+{
+	atf_set "descr" "Checks x509v3 certificates"
+}
+x509v3_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_x509v3test"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case x509v3
+}
diff --git a/contrib/netbsd-tests/crypto/libcrypto/t_ciphers.sh b/contrib/netbsd-tests/crypto/libcrypto/t_ciphers.sh
new file mode 100755
index 000000000000..127040773aa7
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/t_ciphers.sh
@@ -0,0 +1,122 @@
+# $NetBSD: t_ciphers.sh,v 1.4 2012/07/14 16:04:06 spz Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case bf
+bf_head()
+{
+	atf_set "descr" "Checks blowfish cipher"
+}
+bf_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_bftest"
+}
+
+atf_test_case cast
+cast_head()
+{
+	atf_set "descr" "Checks CAST cipher"
+	atf_set "timeout" "300"
+}
+cast_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_casttest"
+}
+
+atf_test_case des
+des_head()
+{
+	atf_set "descr" "Checks DES cipher (libdes)"
+}
+des_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_destest"
+}
+
+atf_test_case evp
+evp_head()
+{
+	atf_set "descr" "Checks EVP cipher"
+}
+evp_body()
+{
+	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $(atf_get_srcdir)/evptests.txt
+}
+
+atf_test_case rc2
+rc2_head()
+{
+	atf_set "descr" "Checks RC2 cipher"
+}
+rc2_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc2test"
+}
+
+atf_test_case rc4
+rc4_head()
+{
+	atf_set "descr" "Checks RC4 cipher"
+}
+rc4_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc4test"
+}
+
+atf_test_case idea
+idea_head()
+{
+	atf_set "descr" "Checks IDEA cipher"
+}
+idea_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ideatest"
+}
+
+atf_test_case rc5
+rc5_head()
+{
+	atf_set "descr" "Checks RC5 cipher"
+}
+rc5_body()
+{
+	[ -x "$(atf_get_srcdir)/h_rc5test" ] \
+	    || atf_skip "RC5 support not available; system built" \
+	                "with MKCRYPTO_RC5=no"
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc5test"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case bf
+	atf_add_test_case cast
+	atf_add_test_case des
+	atf_add_test_case evp
+	atf_add_test_case rc2
+	atf_add_test_case rc4
+	atf_add_test_case idea
+	atf_add_test_case rc5
+}
diff --git a/contrib/netbsd-tests/crypto/libcrypto/t_hashes.sh b/contrib/netbsd-tests/crypto/libcrypto/t_hashes.sh
new file mode 100755
index 000000000000..700dbdbf9fc9
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/t_hashes.sh
@@ -0,0 +1,108 @@
+# $NetBSD: t_hashes.sh,v 1.2 2012/07/14 16:04:06 spz Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case hmac
+hmac_head()
+{
+	atf_set "descr" "Checks HMAC message authentication code"
+}
+hmac_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_hmactest"
+}
+
+atf_test_case md2
+md2_head()
+{
+	atf_set "descr" "Checks MD2 digest"
+}
+md2_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md2test"
+}
+
+atf_test_case md4
+md4_head()
+{
+	atf_set "descr" "Checks MD4 digest"
+}
+md4_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md4test"
+}
+
+atf_test_case md5
+md5_head()
+{
+	atf_set "descr" "Checks MD5 digest"
+}
+md5_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md5test"
+}
+
+atf_test_case ripemd
+ripemd_head()
+{
+	atf_set "descr" "Checks RMD-160 digest"
+}
+ripemd_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ripemdtest"
+}
+
+atf_test_case sha
+sha_head()
+{
+	atf_set "descr" "Checks SHA-1 digest"
+}
+sha_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_shatest"
+}
+
+
+atf_test_case mdc2
+mdc2_head()
+{
+	atf_set "descr" "Checks MDC2 digest"
+}
+mdc2_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_mdc2test"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case hmac
+	atf_add_test_case md2
+	atf_add_test_case md4
+	atf_add_test_case md5
+	atf_add_test_case ripemd
+	atf_add_test_case sha
+	atf_add_test_case mdc2
+}
diff --git a/contrib/netbsd-tests/crypto/libcrypto/t_libcrypto.sh b/contrib/netbsd-tests/crypto/libcrypto/t_libcrypto.sh
new file mode 100755
index 000000000000..aa7af27ceee4
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/t_libcrypto.sh
@@ -0,0 +1,107 @@
+# $NetBSD: t_libcrypto.sh,v 1.3 2010/11/08 19:06:12 pooka Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case engine
+engine_head()
+{
+	atf_set "descr" "Checks ENGINE framework"
+}
+engine_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_enginetest"
+}
+
+atf_test_case rand
+rand_head()
+{
+	atf_set "descr" "Checks peudo-random number generator"
+}
+rand_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_randtest"
+}
+
+atf_test_case bn
+bn_head()
+{
+	atf_set "descr" "Checks BIGNUM library"
+	atf_set "timeout" "300"
+}
+bn_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_bntest"
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_divtest"
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_exptest"
+}
+
+atf_test_case conf
+conf_head()
+{
+	atf_set "descr" "Checks configuration modules"
+}
+conf_body()
+{
+	cp $(atf_get_srcdir)/d_conf_ssleay.cnf ssleay.cnf
+
+	atf_check -o file:$(atf_get_srcdir)/d_conf.out \
+		$(atf_get_srcdir)/h_conftest
+}
+
+atf_test_case lhash
+lhash_head()
+{
+	atf_set "descr" "Checks lhash - dynamic hash tables"
+}
+lhash_body()
+{
+	atf_check -o ignore -e ignore -x \
+		"echo hoge | $(atf_get_srcdir)/h_lhashtest"
+}
+
+atf_test_case threads
+threads_head()
+{
+	atf_set "descr" "Checks threading"
+}
+threads_body()
+{
+	$(atf_get_srcdir)/h_threadstest \
+	    -cert $(atf_get_srcdir)/d_server.pem \
+	    -ccert $(atf_get_srcdir)/d_client.pem \
+	    2>&1 | tee out
+	atf_check -s eq:1 -o empty -e empty grep :error: out
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case engine
+	atf_add_test_case rand
+	atf_add_test_case bn
+	atf_add_test_case conf
+	atf_add_test_case lhash
+	atf_add_test_case threads
+}
diff --git a/contrib/netbsd-tests/crypto/libcrypto/t_pubkey.sh b/contrib/netbsd-tests/crypto/libcrypto/t_pubkey.sh
new file mode 100755
index 000000000000..1453e757a4cc
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/libcrypto/t_pubkey.sh
@@ -0,0 +1,110 @@
+# $NetBSD: t_pubkey.sh,v 1.3 2011/06/09 05:25:21 spz Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case dsa
+dsa_head()
+{
+	atf_set "descr" "Checks DSA cipher"
+}
+dsa_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_dsatest"
+}
+
+atf_test_case dh
+dh_head()
+{
+	atf_set "descr" "Checks Diffie-Hellman key agreement protocol"
+}
+dh_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_dhtest"
+}
+
+atf_test_case rsa
+rsa_head()
+{
+	atf_set "descr" "Checks RSA"
+	atf_set "timeout" "300"
+}
+rsa_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rsatest"
+}
+
+atf_test_case ec
+ec_head()
+{
+	atf_set "descr" "Checks EC cipher"
+	atf_set "timeout" "300"
+}
+ec_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ectest"
+}
+
+atf_test_case ecdh
+ecdh_head()
+{
+	atf_set "descr" "Checks ECDH key agreement protocol"
+}
+ecdh_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ecdhtest"
+}
+
+atf_test_case ecdsa
+ecdsa_head()
+{
+	atf_set "descr" "Checks ECDSA algorithm"
+	atf_set "timeout" "300"
+}
+ecdsa_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ecdsatest"
+}
+
+atf_test_case srp
+srp_head()
+{
+	atf_set "descr" "Checks SRP key agreement protocol"
+}
+srp_body()
+{
+	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_srptest"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case dsa
+	atf_add_test_case dh
+	atf_add_test_case rsa
+	atf_add_test_case ec
+	atf_add_test_case ecdh
+	atf_add_test_case ecdsa
+	atf_add_test_case srp
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_aesctr1.c b/contrib/netbsd-tests/crypto/opencrypto/h_aesctr1.c
new file mode 100644
index 000000000000..41d866cf17cb
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_aesctr1.c
@@ -0,0 +1,250 @@
+/* $NetBSD: h_aesctr1.c,v 1.4 2014/01/19 13:40:59 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+/*
+ * Test vectors from RFC 3686
+ *
+ * Test vectors 3, 6, and 9 are disabled because we don't support
+ * 36-byte (ie, unpadded) operations.
+ */
+
+const struct {
+	size_t len;
+	size_t key_len;
+	unsigned char key[36];		/* Includes 32-bit nonce */
+	unsigned char iv[8];
+	unsigned char plaintx[36];
+	unsigned char ciphertx[36];
+} tests[] = {
+	/* Test Vector #1: Encrypting 16 octets using AES-CTR w/ 128-bit key*/
+	{ 16, 20, 
+	  { 0xAE, 0x68, 0x52, 0xF8, 0x12, 0x10, 0x67, 0xCC,
+	    0x4B, 0xF7, 0xA5, 0x76, 0x55, 0x77, 0xF3, 0x9E,
+	    0x00, 0x00, 0x00, 0x30 },
+	  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+	  { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+	    0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+	  { 0xE4, 0x09, 0x5D, 0x4F, 0xB7, 0xA7, 0xB3, 0x79,
+	    0x2D, 0x61, 0x75, 0xA3, 0x26, 0x13, 0x11, 0xB8 }
+	},
+
+	/* Test Vector #2: Encrypting 32 octets using AES-CTR w/ 128-bit key */
+	{ 32, 20, 
+	  { 0x7E, 0x24, 0x06, 0x78, 0x17, 0xFA, 0xE0, 0xD7,
+	    0x43, 0xD6, 0xCE, 0x1F, 0x32, 0x53, 0x91, 0x63,
+	    0x00, 0x6C, 0xB6, 0xDB },
+	  { 0xC0, 0x54, 0x3B, 0x59, 0xDA, 0x48, 0xD9, 0x0B },
+	  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+	  { 0x51, 0x04, 0xA1, 0x06, 0x16, 0x8A, 0x72, 0xD9,
+	    0x79, 0x0D, 0x41, 0xEE, 0x8E, 0xDA, 0xD3, 0x88,
+	    0xEB, 0x2E, 0x1E, 0xFC, 0x46, 0xDA, 0x57, 0xC8,
+	    0xFC, 0xE6, 0x30, 0xDF, 0x91, 0x41, 0xBE, 0x28 }
+	},
+
+	/* Test Vector #3: Encrypting 36 octets using AES-CTR w/ 128-bit key */
+/*	{ 36, 20,
+	  { 0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
+	    0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC,
+	    0x00, 0xE0, 0x01, 0x7B },
+	  { 0x27, 0x77, 0x7F, 0x3F, 0x4A, 0x17, 0x86, 0xF0 },
+	  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+	    0x20, 0x21, 0x22, 0x23 },
+	  { 0xC1, 0xCF, 0x48, 0xA8, 0x9F, 0x2F, 0xFD, 0xD9,
+	    0xCF, 0x46, 0x52, 0xE9, 0xEF, 0xDB, 0x72, 0xD7,
+	    0x45, 0x40, 0xA4, 0x2B, 0xDE, 0x6D, 0x78, 0x36,
+	    0xD5, 0x9A, 0x5C, 0xEA, 0xAE, 0xF3, 0x10, 0x53,
+	    0x25, 0xB2, 0x07, 0x2F }
+	},
+*/
+	/* Test Vector #4: Encrypting 16 octets using AES-CTR w/ 192-bit key */
+	{ 16, 28,
+	  { 0x16, 0xAF, 0x5B, 0x14, 0x5F, 0xC9, 0xF5, 0x79,
+	    0xC1, 0x75, 0xF9, 0x3E, 0x3B, 0xFB, 0x0E, 0xED,
+	    0x86, 0x3D, 0x06, 0xCC, 0xFD, 0xB7, 0x85, 0x15,
+	    0x00, 0x00, 0x00, 0x48 },
+	  { 0x36, 0x73, 0x3C, 0x14, 0x7D, 0x6D, 0x93, 0xCB },
+	  { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+	    0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+	  { 0x4B, 0x55, 0x38, 0x4F, 0xE2, 0x59, 0xC9, 0xC8,
+	    0x4E, 0x79, 0x35, 0xA0, 0x03, 0xCB, 0xE9, 0x28 }
+	},
+
+	/* Test Vector #5: Encrypting 32 octets using AES-CTR w/ 192-bit key */
+	{ 32, 28,
+	  { 0x7C, 0x5C, 0xB2, 0x40, 0x1B, 0x3D, 0xC3, 0x3C,
+	    0x19, 0xE7, 0x34, 0x08, 0x19, 0xE0, 0xF6, 0x9C,
+	    0x67, 0x8C, 0x3D, 0xB8, 0xE6, 0xF6, 0xA9, 0x1A,
+	    0x00, 0x96, 0xB0, 0x3B },
+	  { 0x02, 0x0C, 0x6E, 0xAD, 0xC2, 0xCB, 0x50, 0x0D },
+	  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+	  { 0x45, 0x32, 0x43, 0xFC, 0x60, 0x9B, 0x23, 0x32,
+	    0x7E, 0xDF, 0xAA, 0xFA, 0x71, 0x31, 0xCD, 0x9F,
+	    0x84, 0x90, 0x70, 0x1C, 0x5A, 0xD4, 0xA7, 0x9C,
+	    0xFC, 0x1F, 0xE0, 0xFF, 0x42, 0xF4, 0xFB, 0x00 }
+	},
+
+	/* Test Vector #6: Encrypting 36 octets using AES-CTR w/ 192-bit key */
+/*
+	{ 36, 28,
+	  { 0x02, 0xBF, 0x39, 0x1E, 0xE8, 0xEC, 0xB1, 0x59,
+	    0xB9, 0x59, 0x61, 0x7B, 0x09, 0x65, 0x27, 0x9B,
+	    0xF5, 0x9B, 0x60, 0xA7, 0x86, 0xD3, 0xE0, 0xFE,
+	    0x00, 0x07, 0xBD, 0xFD },
+	  { 0x5C, 0xBD, 0x60, 0x27, 0x8D, 0xCC, 0x09, 0x12 },
+	  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+	    0x20, 0x21, 0x22, 0x23 },
+	  { 0x96, 0x89, 0x3F, 0xC5, 0x5E, 0x5C, 0x72, 0x2F,
+	    0x54, 0x0B, 0x7D, 0xD1, 0xDD, 0xF7, 0xE7, 0x58,
+	    0xD2, 0x88, 0xBC, 0x95, 0xC6, 0x91, 0x65, 0x88,
+	    0x45, 0x36, 0xC8, 0x11, 0x66, 0x2F, 0x21, 0x88,
+	    0xAB, 0xEE, 0x09, 0x35 },
+	},
+*/
+	/* Test Vector #7: Encrypting 16 octets using AES-CTR w/ 256-bit key */
+	{ 16, 36,
+	  { 0x77, 0x6B, 0xEF, 0xF2, 0x85, 0x1D, 0xB0, 0x6F,
+	    0x4C, 0x8A, 0x05, 0x42, 0xC8, 0x69, 0x6F, 0x6C,
+	    0x6A, 0x81, 0xAF, 0x1E, 0xEC, 0x96, 0xB4, 0xD3,
+	    0x7F, 0xC1, 0xD6, 0x89, 0xE6, 0xC1, 0xC1, 0x04,
+	    0x00, 0x00, 0x00, 0x60 },
+	  { 0xDB, 0x56, 0x72, 0xC9, 0x7A, 0xA8, 0xF0, 0xB2 },
+	  { 0x53, 0x69, 0x6E, 0x67, 0x6C, 0x65, 0x20, 0x62,
+	    0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x6D, 0x73, 0x67 },
+	  { 0x14, 0x5A, 0xD0, 0x1D, 0xBF, 0x82, 0x4E, 0xC7,
+	    0x56, 0x08, 0x63, 0xDC, 0x71, 0xE3, 0xE0, 0xC0 },
+	},
+
+	/* Test Vector #8: Encrypting 32 octets using AES-CTR w/ 256-bit key */
+	{ 32, 36,
+	  { 0xF6, 0xD6, 0x6D, 0x6B, 0xD5, 0x2D, 0x59, 0xBB,
+	    0x07, 0x96, 0x36, 0x58, 0x79, 0xEF, 0xF8, 0x86,
+	    0xC6, 0x6D, 0xD5, 0x1A, 0x5B, 0x6A, 0x99, 0x74,
+	    0x4B, 0x50, 0x59, 0x0C, 0x87, 0xA2, 0x38, 0x84,
+	    0x00, 0xFA, 0xAC, 0x24 },
+	  { 0xC1, 0x58, 0x5E, 0xF1, 0x5A, 0x43, 0xD8, 0x75 },
+	  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F },
+	  { 0xF0, 0x5E, 0x23, 0x1B, 0x38, 0x94, 0x61, 0x2C,
+	    0x49, 0xEE, 0x00, 0x0B, 0x80, 0x4E, 0xB2, 0xA9,
+	    0xB8, 0x30, 0x6B, 0x50, 0x8F, 0x83, 0x9D, 0x6A,
+	    0x55, 0x30, 0x83, 0x1D, 0x93, 0x44, 0xAF, 0x1C },
+	},
+
+	/* Test Vector #9: Encrypting 36 octets using AES-CTR w/ 256-bit key */
+/*
+	{ 36, 36,
+	  { 0xFF 0x7A 0x61 0x7C 0xE6 0x91 0x48 0xE4,
+	    0xF1 0x72 0x6E 0x2F 0x43 0x58 0x1D 0xE2,
+	    0xAA 0x62 0xD9 0xF8 0x05 0x53 0x2E 0xDF,
+	    0xF1 0xEE 0xD6 0x87 0xFB 0x54 0x15 0x3D,
+	    0x00 0x1C 0xC5 0xB7 },
+	  { 0x51 0xA5 0x1D 0x70 0xA1 0xC1 0x11 0x48 },
+	  { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07,
+	    0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F,
+	    0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17,
+	    0x18 0x19 0x1A 0x1B 0x1C 0x1D 0x1E 0x1F,
+	    0x20 0x21 0x22 0x23 },
+	  { 0xEB 0x6C 0x52 0x82 0x1D 0x0B 0xBB 0xF7,
+	    0xCE 0x75 0x94 0x46 0x2A 0xCA 0x4F 0xAA,
+	    0xB4 0x07 0xDF 0x86 0x65 0x69 0xFD 0x07,
+	    0xF4 0x8C 0xC0 0xB5 0x83 0xD6 0x07 0x1F,
+	    0x1E 0xC0 0xE6 0xB8 },
+	},
+*/
+};
+
+int
+main(void)
+{
+	int fd, res;
+	size_t i;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[36];
+
+	for (i = 0; i < __arraycount(tests); i++) {
+		fd = open("/dev/crypto", O_RDWR, 0);
+		if (fd < 0)
+			err(1, "open %zu", i);
+		memset(&cs, 0, sizeof(cs));
+		cs.cipher = CRYPTO_AES_CTR;
+		cs.keylen = tests[i].key_len;
+		cs.key = __UNCONST(&tests[i].key);
+		res = ioctl(fd, CIOCGSESSION, &cs);
+		if (res < 0)
+			err(1, "CIOCGSESSION %zu", i);
+
+		memset(&co, 0, sizeof(co));
+		co.ses = cs.ses;
+		co.op = COP_ENCRYPT;
+		co.len = tests[i].len;
+		co.src = __UNCONST(&tests[i].plaintx);
+		co.dst = buf;
+		co.dst_len = sizeof(buf);
+		co.iv = __UNCONST(&tests[i].iv);
+		res = ioctl(fd, CIOCCRYPT, &co);
+		if (res < 0)
+			err(1, "CIOCCRYPT %zu", i);
+
+		if (memcmp(co.dst, tests[i].ciphertx, tests[i].len)) {
+			size_t j;
+			printf(" Loc  Actual  Golden\n");
+			for (j = 0; j < tests[i].len; j++)
+				printf("0x%2zu:  0x%2x    0x%2x\n", j,
+					buf[j], tests[i].ciphertx[j]);
+			warnx("verification failed %zu", i);
+		}
+		close(fd);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_aesctr2.c b/contrib/netbsd-tests/crypto/opencrypto/h_aesctr2.c
new file mode 100644
index 000000000000..4bbd30ea1ecd
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_aesctr2.c
@@ -0,0 +1,97 @@
+/* $NetBSD: h_aesctr2.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+unsigned char key[20] = {0xae, 0x68, 0x52, 0xf8, 0x12, 0x10, 0x67, 0xcc,
+			 0x4b, 0xf7, 0xa5, 0x76, 0x55, 0x77, 0xf3, 0x9e,
+	0x00, 0x00, 0x00, 0x30};
+unsigned char iv[8] = {0};
+char plaintx[16] = "Single block msg";
+const unsigned char ciphertx[16] = {
+	0xe4, 0x09, 0x5d, 0x4f, 0xb7, 0xa7, 0xb3, 0x79,
+	0x2d, 0x61, 0x75, 0xa3, 0x26, 0x13, 0x11, 0xb8
+};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char ibuf[24];
+	unsigned char obuf[24];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.cipher = CRYPTO_AES_CTR;
+	cs.keylen = 20;
+	cs.key = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memcpy(ibuf, iv, 8);
+	memcpy(ibuf + 8, plaintx, 16);
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(ibuf);
+	co.src = ibuf;
+	co.dst = obuf;
+	co.dst_len = sizeof(obuf);
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+	memset(ibuf, 0, sizeof(ibuf));
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_DECRYPT;
+	co.len = sizeof(obuf);
+	co.src = obuf;
+	co.dst = ibuf;
+	co.dst_len = sizeof(ibuf);
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp((char *)co.dst + 8, plaintx, sizeof(plaintx)))
+		warnx("verification failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_arc4.c b/contrib/netbsd-tests/crypto/opencrypto/h_arc4.c
new file mode 100644
index 000000000000..4bf8428549bf
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_arc4.c
@@ -0,0 +1,80 @@
+/* $NetBSD: h_arc4.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+unsigned char key[] = "abcdefgh";
+char plaintx[16] = "1234567890123456";
+const unsigned char ciphertx[16] = {
+	0x21, 0xc6, 0x0d, 0xa5, 0x34, 0x24, 0x8b, 0xce,
+	0x95, 0x86, 0x64, 0xb3, 0x66, 0x77, 0x9b, 0x4c
+};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.cipher = CRYPTO_ARC4;
+	cs.keylen = 8;
+	cs.key = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(plaintx);
+	co.src = plaintx;
+	co.dst = buf;
+	co.dst_len = sizeof(buf);
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
+		errx(1, "verification failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_camellia.c b/contrib/netbsd-tests/crypto/opencrypto/h_camellia.c
new file mode 100644
index 000000000000..bb489e77824d
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_camellia.c
@@ -0,0 +1,87 @@
+/* $NetBSD: h_camellia.c,v 1.3 2014/01/17 19:39:51 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+/* Test vector from RFC3713 */
+unsigned char key[32] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+			 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+			 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+			 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
+unsigned char iv[16] = {0};
+char plaintx[16] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+		    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10};
+const unsigned char ciphertx[16] = {
+	0x9a, 0xcc, 0x23, 0x7d, 0xff, 0x16, 0xd7, 0x6c,
+	0x20, 0xef, 0x7c, 0x91, 0x9e, 0x3a, 0x75, 0x09
+};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.cipher = CRYPTO_CAMELLIA_CBC;
+	cs.keylen = 32;
+	cs.key = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(plaintx);
+	co.src = plaintx;
+	co.dst = buf;
+	co.dst_len = sizeof(buf);
+	co.iv = iv;
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
+		warnx("verification failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_cbcdes.c b/contrib/netbsd-tests/crypto/opencrypto/h_cbcdes.c
new file mode 100644
index 000000000000..4861d783fe7d
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_cbcdes.c
@@ -0,0 +1,82 @@
+/* $NetBSD: h_cbcdes.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+unsigned char key[] = "abcdefgh";
+unsigned char iv[8] = {0};
+char plaintx[16] = "1234567890123456";
+const unsigned char ciphertx[16] = {
+	0x21, 0xc6, 0x0d, 0xa5, 0x34, 0x24, 0x8b, 0xce,
+	0x95, 0x86, 0x64, 0xb3, 0x66, 0x77, 0x9b, 0x4c
+};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.cipher = CRYPTO_DES_CBC;
+	cs.keylen = 8;
+	cs.key = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(plaintx);
+	co.src = plaintx;
+	co.dst = buf;
+	co.dst_len = sizeof(buf);
+	co.iv = iv;
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
+		errx(1, "verification failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_comp.c b/contrib/netbsd-tests/crypto/opencrypto/h_comp.c
new file mode 100644
index 000000000000..dd5f6470c5d6
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_comp.c
@@ -0,0 +1,90 @@
+/* $NetBSD: h_comp.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+char text[100000] = {0};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co1, co2;
+	unsigned char buf1[10000], buf2[100000];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.comp_alg = CRYPTO_GZIP_COMP;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co1, 0, sizeof(co1));
+	co1.ses = cs.ses;
+	co1.op = COP_COMP;
+	co1.len = sizeof(text);
+	co1.src = text;
+	co1.dst = buf1;
+	co1.dst_len = sizeof(buf1);
+	res = ioctl(fd, CIOCCRYPT, &co1);
+	if (res < 0)
+		err(1, "CIOCCRYPT1");
+	fprintf(stderr, "len %d/%d\n", co1.len, co1.dst_len);
+#if 0
+	buf1[co1.dst_len - 8]++; /* modify CRC */
+#endif
+	write(1, buf1, co1.dst_len);
+	memset(&co2, 0, sizeof(co2));
+	co2.ses = cs.ses;
+	co2.op = COP_DECOMP;
+	co2.len = co1.dst_len;
+	co2.src = buf1;
+	co2.dst = buf2;
+	co2.dst_len = sizeof(buf2);
+	buf2[10] = 0x33;
+	res = ioctl(fd, CIOCCRYPT, &co2);
+	fprintf(stderr, "canary: %x\n", buf2[10]);
+	if (res < 0)
+		err(1, "CIOCCRYPT2");
+	fprintf(stderr, "len %d/%d\n", co2.len, co2.dst_len);
+	if (memcmp(text, buf2, co2.dst_len))
+		errx(1, "memcmp");
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib.c b/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib.c
new file mode 100644
index 000000000000..7a57ceb31839
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib.c
@@ -0,0 +1,92 @@
+/* $NetBSD: h_comp_zlib.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <string.h>
+#include <zlib.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+char text[10000] = {0};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co1;
+	unsigned char buf1[10000], buf2[10000];
+	z_stream z;
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.comp_alg = CRYPTO_DEFLATE_COMP;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co1, 0, sizeof(co1));
+	co1.ses = cs.ses;
+	co1.op = COP_COMP;
+	co1.len = sizeof(text);
+	co1.src = text;
+	co1.dst = buf1;
+	co1.dst_len = sizeof(buf1);
+	co1.flags = COP_F_BATCH;
+	res = ioctl(fd, CIOCCRYPT, &co1);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	memset(&z, 0, sizeof(z));
+	z.next_in = buf1;
+	z.avail_in = co1.dst_len;
+	z.zalloc = Z_NULL;
+	z.zfree = Z_NULL;
+	z.opaque = 0;
+	z.next_out = buf2;
+	z.avail_out = sizeof(buf2);
+	res = inflateInit2(&z, -15);
+	if (res != Z_OK)
+		errx(1, "inflateInit: %d", res);
+	do {
+		res = inflate(&z, Z_SYNC_FLUSH);
+	} while (res == Z_OK);
+	if (res != Z_STREAM_END)
+		errx(1, "inflate: %d", res);
+	if (z.total_out != sizeof(text))
+		errx(1, "decomp len %lu", z.total_out);
+	if (memcmp(buf2, text, sizeof(text)))
+		errx(1, "decomp data mismatch");
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib_rnd.c b/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib_rnd.c
new file mode 100644
index 000000000000..86ed55afaaf3
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_comp_zlib_rnd.c
@@ -0,0 +1,96 @@
+/* $NetBSD: h_comp_zlib_rnd.c,v 1.1 2014/01/14 17:51:39 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <zlib.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+char text[1000];
+
+int
+main(void)
+{
+	unsigned int i;
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co1;
+	unsigned char buf1[10000], buf2[10000];
+	z_stream z;
+
+	for (i = 0; i < sizeof(text)/sizeof(long); i++)
+		*(long *)(text + i * sizeof(long)) = random();
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.comp_alg = CRYPTO_DEFLATE_COMP;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co1, 0, sizeof(co1));
+	co1.ses = cs.ses;
+	co1.op = COP_COMP;
+	co1.len = sizeof(text);
+	co1.src = text;
+	co1.dst = buf1;
+	co1.dst_len = sizeof(buf1);
+	res = ioctl(fd, CIOCCRYPT, &co1);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	memset(&z, 0, sizeof(z));
+	z.next_in = buf1;
+	z.avail_in = co1.dst_len;
+	z.zalloc = Z_NULL;
+	z.zfree = Z_NULL;
+	z.opaque = 0;
+	z.next_out = buf2;
+	z.avail_out = sizeof(buf2);
+	res = inflateInit2(&z, -15);
+	if (res != Z_OK)
+		errx(1, "inflateInit: %d", res);
+	do {
+		res = inflate(&z, Z_SYNC_FLUSH);
+	} while (res == Z_OK);
+	if (res != Z_STREAM_END)
+		errx(1, "inflate: %d", res);
+	if (z.total_out != sizeof(text))
+		errx(1, "decomp len %lu", z.total_out);
+	if (memcmp(buf2, text, sizeof(text)))
+		errx(1, "decomp data mismatch");
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_gcm.c b/contrib/netbsd-tests/crypto/opencrypto/h_gcm.c
new file mode 100644
index 000000000000..33f41f0eb271
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_gcm.c
@@ -0,0 +1,126 @@
+/* $NetBSD: h_gcm.c,v 1.2 2014/01/17 14:16:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+unsigned char key[20] = { 0 };
+char plaintx[16] = { 0 };
+unsigned char iv[16] = { 0 };
+const unsigned char ciphertx[16] = {
+	0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92,
+	0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78
+};
+const unsigned char hash[16] = {
+	0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd,
+	0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf
+};
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char databuf[16];
+	unsigned char macbuf[16];
+	unsigned char databuf2[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.mac = CRYPTO_AES_128_GMAC;
+	cs.mackeylen = sizeof(key);
+	cs.mackey = key;
+	cs.cipher = CRYPTO_AES_GCM_16;
+	cs.key = key;
+	cs.keylen = sizeof(key);
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co, 0, sizeof(co));
+	memset(databuf, 0, sizeof(databuf));
+	memset(macbuf, 0, sizeof(macbuf));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(plaintx);
+	co.src = plaintx;
+	co.dst = databuf;
+	co.mac = macbuf;
+	co.iv = iv;
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+#if 1
+	if (memcmp(co.dst, ciphertx, sizeof(ciphertx)))
+		errx(1, "verification failed");
+	if (memcmp(macbuf, hash, sizeof(hash)))
+		errx(1, "hash failed");
+#else
+	{
+		int i;
+		for (i = 0; i < sizeof(databuf); i++)
+			printf("%02x ", databuf[i]);
+		printf("\n");
+	}
+	{
+		int i;
+		for (i = 0; i < sizeof(macbuf); i++)
+			printf("%02x ", macbuf[i]);
+		printf("\n");
+	}
+#endif
+	memset(databuf2, 0, sizeof(databuf2));
+	memset(macbuf, 0, sizeof(macbuf));
+	co.ses = cs.ses;
+	co.op = COP_DECRYPT;
+	co.len = sizeof(databuf);
+	co.src = databuf;
+	co.dst = databuf2;
+	co.mac = macbuf;
+	co.iv = iv;
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp(co.dst, plaintx, sizeof(plaintx)))
+		errx(1, "verification failed");
+	if (memcmp(macbuf, hash, sizeof(hash)))
+		errx(1, "hash failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_md5.c b/contrib/netbsd-tests/crypto/opencrypto/h_md5.c
new file mode 100644
index 000000000000..98379c79d2ed
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_md5.c
@@ -0,0 +1,109 @@
+/* $NetBSD: h_md5.c,v 1.5 2014/01/18 20:10:34 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+/* Test vectors from RFC1321 */
+
+const struct {
+	size_t len;
+	unsigned char plaintx[80];
+	unsigned char digest[16];
+} tests[] = {
+	{ 0, "",
+	  { 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04,
+	    0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e } },
+	{ 1, "a",
+	  { 0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8,
+	    0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61 } },
+	{ 3, "abc",
+	  { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0,
+	    0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72 } },
+	{ 14, "message digest",
+	  { 0xf9, 0x6b, 0x69, 0x7d, 0x7c, 0xb7, 0x93, 0x8d,
+	    0x52, 0x5a, 0x2f, 0x31, 0xaa, 0xf1, 0x61, 0xd0 } },
+	{ 26, "abcdefghijklmnopqrstuvwxyz",
+	  { 0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00,
+	    0x7d, 0xfb, 0x49, 0x6c, 0xca, 0x67, 0xe1, 0x3b } },
+	{ 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+	  { 0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5,
+	    0xa5, 0x61, 0x1c, 0x2c, 0x9f, 0x41, 0x9d, 0x9f } },
+	{ 80, "123456789012345678901234567890123456789012345678901234567890"
+		"12345678901234567890",
+	  { 0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55,
+	    0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a } },
+};
+
+int
+main(void)
+{
+	int fd, res;
+	size_t i;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.mac = CRYPTO_MD5;
+
+	for (i = 0; i < __arraycount(tests); i++) {
+		res = ioctl(fd, CIOCGSESSION, &cs);
+		if (res < 0)
+			err(1, "CIOCGSESSION test %zu", i);
+
+		memset(&co, 0, sizeof(co));
+		memset(&buf, 0, sizeof(buf));
+		co.ses = cs.ses;
+		co.op = COP_ENCRYPT;
+		co.len = tests[i].len;
+		co.src = __UNCONST(&tests[i].plaintx);
+		co.mac = buf;
+		res = ioctl(fd, CIOCCRYPT, &co);
+		if (res < 0)
+			err(1, "CIOCCRYPT test %zu", i);
+
+		if (memcmp(co.mac, tests[i].digest, sizeof(tests[i].digest)))
+			errx(1, "verification failed test %zu", i);
+
+		res = ioctl(fd, CIOCFSESSION, &cs.ses);
+		if (res < 0)
+			err(1, "CIOCFSESSION test %zu", i);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_md5hmac.c b/contrib/netbsd-tests/crypto/opencrypto/h_md5hmac.c
new file mode 100644
index 000000000000..6753094c51e1
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_md5hmac.c
@@ -0,0 +1,181 @@
+/* $NetBSD: h_md5hmac.c,v 1.4 2014/01/18 02:31:14 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+#define	MD5_HMAC_KEYLEN		16	/* Fixed key length supported */
+
+/* Test data from RFC2202 */
+const struct {
+	int num;
+        size_t key_len;
+        size_t len;
+	unsigned char key[80];
+	unsigned char data[80];
+        unsigned char mac[16];
+} tests[] = {
+	/* Test #1 */
+	{ 1, 16, 8,
+	  { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+	    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b },
+	  "Hi There",
+	  { 0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c,
+	    0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d }
+	},
+	/* Test #2 */
+	{ 2, 4, 28,
+	  "Jefe",
+	  "what do ya want for nothing?",
+	  { 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
+	    0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }
+	},
+	/* Test #3 */
+	{ 3, 16, 50,
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa },
+	  { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd },
+	  { 0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88,
+	    0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6 }
+	},
+	/* Test #4 */
+	{ 4, 25, 50,
+	  { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+	    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+	    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+	    0x19 },
+	  { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd },
+	  { 0x69, 0x7e, 0xaf, 0x0a, 0xca, 0x3a, 0x3a, 0xea,
+	    0x3a, 0x75, 0x16, 0x47, 0x46, 0xff, 0xaa, 0x79 }
+	},
+	/* Test #5 */
+	{ 5, 16, 20,
+	  { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+	    0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c },
+	  "Test With Truncation",
+	  { 0x56, 0x46, 0x1e, 0xf2, 0x34, 0x2e, 0xdc, 0x00,
+	    0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c }
+	},
+	/* Test #6 */
+	{ 6, 80, 54, 
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa },
+	  "Test Using Larger Than Block-Size Key - Hash Key First",
+	  { 0x6b, 0x1a, 0xb7, 0xfe, 0x4b, 0xd7, 0xbf, 0x8f,
+	    0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd }
+	},
+	/* Test #7 */
+	{ 7, 80, 73, 
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa },
+	  "Test Using Larger Than Block-Size Key and Larger "
+		"Than One Block-Size Data",
+	{ 0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
+	  0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e }
+	},
+};
+
+int
+main(void)
+{
+	size_t i;
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	for (i = 0; i < __arraycount(tests); i++) {
+		if (tests[i].key_len != MD5_HMAC_KEYLEN)
+			continue;
+
+		memset(&cs, 0, sizeof(cs));
+		cs.mac = CRYPTO_MD5_HMAC;
+		cs.mackeylen = tests[i].key_len;
+		cs.mackey = __UNCONST(&tests[i].key);
+		res = ioctl(fd, CIOCGSESSION, &cs);
+		if (res < 0)
+			err(1, "CIOCGSESSION test %d", tests[i].num);
+
+		memset(&co, 0, sizeof(co));
+		memset(buf, 0, sizeof(buf));
+		co.ses = cs.ses;
+		co.op = COP_ENCRYPT;
+		co.len = tests[i].len;
+		co.src = __UNCONST(&tests[i].data);
+		co.mac = buf;
+		res = ioctl(fd, CIOCCRYPT, &co);
+		if (res < 0)
+			err(1, "CIOCCRYPT test %d", tests[i].num);
+
+		if (memcmp(co.mac, tests[i].mac, sizeof(tests[i].mac)))
+			errx(1, "verification failed test %d", tests[i].num);
+
+		res = ioctl(fd, CIOCFSESSION, &cs.ses);
+		if (res < 0)
+			err(1, "CIOCFSESSION test %d", tests[i].num);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_null.c b/contrib/netbsd-tests/crypto/opencrypto/h_null.c
new file mode 100644
index 000000000000..85e480592583
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_null.c
@@ -0,0 +1,76 @@
+/* $NetBSD: h_null.c,v 1.3 2014/01/17 19:35:33 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+unsigned char key[] = "abcdefgh";
+char plaintx[16] = "1234567890123456";
+
+int
+main(void)
+{
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.cipher = CRYPTO_NULL_CBC;
+	cs.keylen = 8;
+	cs.key = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	memset(&co, 0, sizeof(co));
+	co.ses = cs.ses;
+	co.op = COP_ENCRYPT;
+	co.len = sizeof(plaintx);
+	co.src = plaintx;
+	co.dst = buf;
+	co.dst_len = sizeof(buf);
+	res = ioctl(fd, CIOCCRYPT, &co);
+	if (res < 0)
+		err(1, "CIOCCRYPT");
+
+	if (memcmp(co.dst, plaintx, sizeof(plaintx)))
+		errx(1, "verification failed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_sha1hmac.c b/contrib/netbsd-tests/crypto/opencrypto/h_sha1hmac.c
new file mode 100644
index 000000000000..c153f761f2b8
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_sha1hmac.c
@@ -0,0 +1,191 @@
+/* $NetBSD: h_sha1hmac.c,v 1.2 2014/01/18 02:31:14 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+#define SHA1_HMAC_KEYLEN	20	/* Only key-length we support */
+
+/* Test data from RFC2202 */
+const struct {
+	int num;
+        size_t key_len;
+        size_t len;
+        unsigned char key[80];
+        unsigned char data[80]; 
+        unsigned char mac[20];
+} tests[] = {
+        /* Test #1 */
+	{ 1, 20, 8,
+	  { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+	    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+	    0x0b, 0x0b, 0x0b, 0x0b },
+	  "Hi There",
+	  { 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+	    0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e,
+	    0xf1, 0x46, 0xbe, 0x00 }
+	},
+        /* Test #2 */
+	{ 2, 4, 28,
+	  "Jefe",
+	  "what do ya want for nothing?",
+	  { 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2,
+	    0xd2, 0x74, 0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c,
+	    0x25, 0x9a, 0x7c, 0x79 }
+	},
+        /* Test #3 */
+	{ 3, 20, 50,
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa },
+	  { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+	    0xdd, 0xdd },
+	  { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd,
+	    0x91, 0xa3, 0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f,
+	    0x63, 0xf1, 0x75, 0xd3 }
+	},
+        /* Test #4 */
+	{ 4, 25, 50,
+	  { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+	    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+	    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+	    0x19 },
+	  { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+	    0xcd, 0xcd },
+	  { 0x4c, 0x90, 0x07, 0xf4, 0x02, 0x62, 0x50, 0xc6,
+	    0xbc, 0x84, 0x14, 0xf9, 0xbf, 0x50, 0xc8, 0x6c,
+	    0x2d, 0x72, 0x35, 0xda }
+	},
+        /* Test #5 */
+	{ 5, 20, 20,
+	  { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+	    0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+	    0x0c, 0x0c, 0x0c, 0x0c },
+	  "Test With Truncation",
+	  { 0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f,
+	    0xe7, 0xf2, 0x7b, 0xe1, 0xd5, 0x8b, 0xb9, 0x32,
+	    0x4a, 0x9a, 0x5a, 0x04 }
+	},
+        /* Test #6 */
+	{ 6, 80, 54,
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa },
+	  "Test Using Larger Than Block-Size Key - Hash Key First",
+	  { 0xaa, 0x4a, 0xe5, 0xe1, 0x52, 0x72, 0xd0, 0x0e,
+	    0x95, 0x70, 0x56, 0x37, 0xce, 0x8a, 0x3b, 0x55,
+	    0xed, 0x40, 0x21, 0x12 }
+	},
+        /* Test #7 */
+	{ 7, 80, 73,
+	  { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+	    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa },
+	  "Test Using Larger Than Block-Size Key and Larger Than "
+		"One Block-Size Data",
+	  { 0xe8, 0xe9, 0x9d, 0x0f, 0x45, 0x23, 0x7d, 0x78,
+	    0x6d, 0x6b, 0xba, 0xa7, 0x96, 0x5c, 0x78, 0x08,
+	    0xbb, 0xff, 0x1a, 0x91 }
+	},
+};
+
+int
+main(void)
+{
+	size_t i;
+	int fd, res;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[20];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	for (i = 0; i < __arraycount(tests); i++) {
+		if (tests[i].key_len != SHA1_HMAC_KEYLEN)
+			continue;
+
+		memset(&cs, 0, sizeof(cs));
+		cs.mac = CRYPTO_SHA1_HMAC;
+		cs.mackeylen = tests[i].key_len;
+		cs.mackey = __UNCONST(&tests[i].key);
+		res = ioctl(fd, CIOCGSESSION, &cs);
+		if (res < 0)
+			err(1, "CIOCGSESSION test %d", tests[i].num);
+
+		memset(&co, 0, sizeof(co));
+		memset(buf, 0, sizeof(buf));
+		co.ses = cs.ses;
+		co.op = COP_ENCRYPT;
+		co.len = tests[i].len;
+		co.src = __UNCONST(&tests[i].data);
+		co.mac = buf;
+		res = ioctl(fd, CIOCCRYPT, &co);
+		if (res < 0)
+			err(1, "CIOCCRYPT test %d", tests[i].num);
+	
+		if (memcmp(co.mac, &tests[i].mac, sizeof(tests[i].mac)))
+			errx(1, "verification failed test %d", tests[i].num);
+
+		res = ioctl(fd, CIOCFSESSION, &cs.ses);
+		if (res < 0)
+			err(1, "CIOCFSESSION test %d", tests[i].num);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/h_xcbcmac.c b/contrib/netbsd-tests/crypto/opencrypto/h_xcbcmac.c
new file mode 100644
index 000000000000..3f89c6e3e5e1
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/h_xcbcmac.c
@@ -0,0 +1,109 @@
+/* $NetBSD: h_xcbcmac.c,v 1.4 2014/01/16 23:56:04 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/ioctl.h>
+#include <sys/time.h>
+
+#include <crypto/cryptodev.h>
+
+
+/* test vectors from RFC3566 */
+unsigned char key[16] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+};
+char plaintx[1000] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	0x20, 0x21
+};
+const struct {
+	size_t len;
+	unsigned char mac[12];
+} tests[] = {
+	{    0, { 0x75, 0xf0, 0x25, 0x1d, 0x52, 0x8a,
+		  0xc0, 0x1c, 0x45, 0x73, 0xdf, 0xd5 } },
+	{    3, { 0x5b, 0x37, 0x65, 0x80, 0xae, 0x2f,
+		  0x19, 0xaf, 0xe7, 0x21, 0x9c, 0xee } },
+	{   16, { 0xd2, 0xa2, 0x46, 0xfa, 0x34, 0x9b,
+		  0x68, 0xa7, 0x99, 0x98, 0xa4, 0x39 } },
+	{   20, { 0x47, 0xf5, 0x1b, 0x45, 0x64, 0x96,
+		  0x62, 0x15, 0xb8, 0x98, 0x5c, 0x63 } },
+	{   32, { 0xf5, 0x4f, 0x0e, 0xc8, 0xd2, 0xb9,
+		  0xf3, 0xd3, 0x68, 0x07, 0x73, 0x4b } },
+	{   34,	{ 0xbe, 0xcb, 0xb3, 0xbc, 0xcd, 0xb5,
+		  0x18, 0xa3, 0x06, 0x77, 0xd5, 0x48 } },
+	{ 1000,	{ 0xf0, 0xda, 0xfe, 0xe8, 0x95, 0xdb,
+		  0x30, 0x25, 0x37, 0x61, 0x10, 0x3b } },
+};
+
+int
+main(void)
+{
+	int fd, res;
+	size_t i;
+	struct session_op cs;
+	struct crypt_op co;
+	unsigned char buf[16];
+
+	fd = open("/dev/crypto", O_RDWR, 0);
+	if (fd < 0)
+		err(1, "open");
+	memset(&cs, 0, sizeof(cs));
+	cs.mac = CRYPTO_AES_XCBC_MAC_96;
+	cs.mackeylen = sizeof(key);
+	cs.mackey = key;
+	res = ioctl(fd, CIOCGSESSION, &cs);
+	if (res < 0)
+		err(1, "CIOCGSESSION");
+
+	for (i = 0; i < __arraycount(tests); i++) {
+		memset(&co, 0, sizeof(co));
+		memset(buf, 0, sizeof(buf));
+		if (tests[i].len == sizeof(plaintx))
+			memset(&plaintx, 0, sizeof(plaintx));
+		co.ses = cs.ses;
+		co.op = COP_ENCRYPT;
+		co.len = tests[i].len;
+		co.src = plaintx;
+		co.mac = buf;
+		res = ioctl(fd, CIOCCRYPT, &co);
+		if (res < 0)
+			err(1, "CIOCCRYPT test %zu", i);
+		if (memcmp(buf, &tests[i].mac, sizeof(tests[i].mac)))
+			errx(1, "verification failed test %zu", i);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/crypto/opencrypto/t_opencrypto.sh b/contrib/netbsd-tests/crypto/opencrypto/t_opencrypto.sh
new file mode 100755
index 000000000000..f7faa3af9aca
--- /dev/null
+++ b/contrib/netbsd-tests/crypto/opencrypto/t_opencrypto.sh
@@ -0,0 +1,272 @@
+#	$NetBSD: t_opencrypto.sh,v 1.4 2014/01/18 15:15:16 pgoyette Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# Start a rumpserver, load required modules, and set requires sysctl vars
+
+start_rump() {
+	rump_libs="-l rumpvfs -l rumpdev -l rumpdev_opencrypto"
+	rump_libs="${rump_libs} -l rumpkern_z -l rumpkern_crypto"
+
+	rump_server ${rump_libs} ${RUMP_SERVER} || \
+	    return 1
+
+	rump.sysctl -w kern.cryptodevallowsoft=-1 && \
+	    return 0
+
+	rump.halt
+
+	return 1
+}
+
+common_head() {
+	atf_set	descr		"$1"
+	atf_set	timeout		10
+	atf_set	require.progs	rump_server	rump.sysctl	rump.halt
+}
+
+common_body() {
+	local status
+
+	start_rump || atf_skip "Cannot set-up rump environment"
+	LD_PRELOAD="/usr/lib/librumphijack.so" ; export LD_PRELOAD
+	RUMPHIJACK="blanket=/dev/crypto" ; export RUMPHIJACK
+	$(atf_get_srcdir)/$1
+	status=$?
+	unset RUMPHIJACK
+	unset LD_PRELOAD
+	if [ $status -ne 0 ] ; then
+		atf_fail "$1 returned non-zero status, check output/error"
+	fi
+}
+
+common_cleanup() {
+	unset RUMPHIJACK
+	unset LD_PRELOAD
+	rump.halt
+}
+
+atf_test_case arc4 cleanup
+arc4_head() {
+	common_head "Test ARC4 crypto"
+}
+
+arc4_body() {
+	atf_skip "ARC4 not implemented by swcrypto"
+	common_body h_arc4
+}
+
+arc4_cleanup() {
+	common_cleanup
+}
+
+atf_test_case camellia cleanup
+camellia_head() {
+	common_head "Test CAMELLIA_CBC crypto"
+}
+
+camellia_body() {
+	common_body h_camellia
+}
+
+camellia_cleanup() {
+	common_cleanup
+}
+
+atf_test_case cbcdes cleanup
+cbcdes_head() {
+	common_head "Test ARC4 crypto"
+}
+
+cbcdes_body() {
+	common_body h_cbcdes
+}
+
+cbcdes_cleanup() {
+	common_cleanup
+}
+
+atf_test_case comp cleanup
+comp_head() {
+	common_head "Test GZIP_COMP Compression"
+}
+
+comp_body() {
+	common_body h_comp
+}
+
+comp_cleanup() {
+	common_cleanup
+}
+
+atf_test_case comp_deflate cleanup
+comp_deflate_head() {
+	common_head "Test DEFLATE_COMP Compression"
+}
+
+comp_deflate_body() {
+	common_body h_comp_zlib
+}
+
+comp_deflate_cleanup() {
+	common_cleanup
+}
+
+atf_test_case comp_zlib_rnd cleanup
+comp_zlib_rnd_head() {
+	common_head "Test DEFLATE_COMP Compression with random data"
+}
+
+comp_zlib_rnd_body() {
+	common_body h_comp_zlib_rnd
+}
+
+comp_zlib_rnd_cleanup() {
+	common_cleanup
+}
+
+atf_test_case aesctr1 cleanup
+aesctr1_head() {
+	common_head "Test AES_CTR crypto"
+}
+
+aesctr1_body() {
+	common_body h_aesctr1
+}
+
+aesctr1_cleanup() {
+	common_cleanup
+}
+
+atf_test_case aesctr2 cleanup
+aesctr2_head() {
+	common_head "Test AES_CTR crypto"
+}
+
+aesctr2_body() {
+	common_body h_aesctr2
+}
+
+aesctr2_cleanup() {
+	common_cleanup
+}
+
+atf_test_case gcm cleanup
+gcm_head() {
+	common_head "Test AES_GCM_16 crypto"
+}
+
+gcm_body() {
+	common_body h_gcm
+}
+
+gcm_cleanup() {
+	common_cleanup
+}
+
+atf_test_case md5 cleanup
+md5_head() {
+	common_head "Test MD5 crypto"
+}
+
+md5_body() {
+	common_body h_md5
+}
+
+md5_cleanup() {
+	common_cleanup
+}
+
+atf_test_case md5_hmac cleanup
+md5_hmac_head() {
+	common_head "Test MD5_HMAC crypto"
+}
+
+md5_hmac_body() {
+	common_body h_md5hmac
+}
+
+md5_hmac_cleanup() {
+	common_cleanup
+}
+
+atf_test_case null cleanup
+null_head() {
+	common_head "Test NULL_CBC crypto"
+}
+
+null_body() {
+	common_body h_null
+}
+
+null_cleanup() {
+	common_cleanup
+}
+
+atf_test_case sha1_hmac cleanup
+sha1_hmac_head() {
+	common_head "Test SHA1_HMAC crypto"
+}
+
+sha1_hmac_body() {
+	common_body h_sha1hmac
+}
+
+sha1_hmac_cleanup() {
+	common_cleanup
+}
+
+atf_test_case xcbcmac cleanup
+xcbcmac_head() {
+	common_head "Test XCBC_MAC_96 crypto"
+}
+
+xcbcmac_body() {
+	common_body h_xcbcmac
+}
+
+xcbcmac_cleanup() {
+	common_cleanup
+}
+
+atf_init_test_cases() {
+	RUMP_SERVER="unix://t_opencrypto_socket" ; export RUMP_SERVER
+
+	atf_add_test_case arc4
+	atf_add_test_case camellia
+	atf_add_test_case cbcdes
+	atf_add_test_case comp
+	atf_add_test_case comp_deflate
+	atf_add_test_case comp_zlib_rnd
+	atf_add_test_case aesctr1
+	atf_add_test_case aesctr2
+	atf_add_test_case gcm
+	atf_add_test_case md5
+	atf_add_test_case md5_hmac
+	atf_add_test_case null
+	atf_add_test_case sha1_hmac
+	atf_add_test_case xcbcmac
+}
diff --git a/contrib/netbsd-tests/dev/audio/h_pad.c b/contrib/netbsd-tests/dev/audio/h_pad.c
new file mode 100644
index 000000000000..dd481ac1a85c
--- /dev/null
+++ b/contrib/netbsd-tests/dev/audio/h_pad.c
@@ -0,0 +1,76 @@
+/*	$NetBSD: h_pad.c,v 1.1 2010/08/04 13:15:15 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "h_pad_musa.c"
+
+/*
+ * Stuff some audio into /dev/audio, read it from /dev/pad.  Use in
+ * conjunction with t_pad, which tests that we got sensible output
+ * by comparing against a previous audibly good result.
+ */
+
+#define BUFSIZE 1024
+
+int
+main(int argc, char *argv[])
+{
+	char buf[BUFSIZE];
+	char zeros[BUFSIZE];
+	int padfd, audiofd;
+	ssize_t n;
+
+	rump_init();
+	audiofd = rump_sys_open("/dev/audio0", O_RDWR);
+	if (audiofd == -1)
+		err(1, "open audio");
+
+	padfd = rump_sys_open("/dev/pad0", O_RDONLY);
+	if (padfd == -1)
+		err(1, "open pad");
+
+	if ((n = rump_sys_write(audiofd, musa, sizeof(musa))) != sizeof(musa))
+		err(1, "write");
+
+	memset(zeros, 0, sizeof(zeros));
+	while ((n = rump_sys_read(padfd, buf, sizeof(buf))) > 0) {
+		if (memcmp(buf, zeros, sizeof(buf)) == 0)
+			break;
+		write(STDOUT_FILENO, buf, n);
+	}
+}
diff --git a/contrib/netbsd-tests/dev/audio/h_pad_musa.c b/contrib/netbsd-tests/dev/audio/h_pad_musa.c
new file mode 100644
index 000000000000..322305ea4921
--- /dev/null
+++ b/contrib/netbsd-tests/dev/audio/h_pad_musa.c
@@ -0,0 +1,344 @@
+unsigned char musa[] = {
+0x46, 0xdb, 0x76, 0x67, 0x61, 0xff, 0xfc, 0x67, 0xff, 0xe9, 0xdb, 0x79,
+0x5d, 0x53, 0x5b, 0x79, 0xef, 0x65, 0x67, 0x5b, 0x67, 0x67, 0x72, 0x66,
+0x4f, 0x5b, 0xe7, 0xf5, 0x5e, 0x53, 0x61, 0xe7, 0x5c, 0x53, 0x67, 0x67,
+0x67, 0x5b, 0x54, 0x60, 0x4e, 0xec, 0xef, 0x5b, 0x5b, 0x6f, 0x69, 0xff,
+0x71, 0x53, 0x77, 0x67, 0x67, 0x5b, 0x5b, 0x5b, 0x75, 0x6c, 0x67, 0x6d,
+0x67, 0x7e, 0xff, 0x63, 0x66, 0x61, 0x67, 0x5b, 0x5b, 0x67, 0x67, 0x5f,
+0x5b, 0x64, 0x5b, 0x5b, 0x55, 0x53, 0x5c, 0x5d, 0x67, 0x53, 0x63, 0x5e,
+0xe7, 0xf5, 0x51, 0x5b, 0x5e, 0x5e, 0x67, 0x5b, 0x67, 0xff, 0x67, 0x67,
+0xe9, 0x6e, 0x67, 0x5c, 0x60, 0x67, 0x7a, 0xff, 0xe7, 0xff, 0x58, 0x5b,
+0x64, 0x6e, 0x67, 0x55, 0x5f, 0xff, 0xff, 0xff, 0xff, 0x56, 0x5b, 0x53,
+0x5b, 0x67, 0x54, 0x58, 0x67, 0x67, 0x6e, 0x67, 0x5c, 0x58, 0x67, 0x67,
+0x5b, 0x65, 0x64, 0x70, 0x5b, 0x5b, 0x67, 0xfc, 0xf7, 0xf2, 0xff, 0xec,
+0x73, 0x67, 0x67, 0xff, 0x67, 0x74, 0xff, 0x67, 0x5e, 0x5e, 0x67, 0x72,
+0x77, 0x7c, 0x67, 0x5d, 0x5b, 0x67, 0x5b, 0x55, 0x67, 0x5c, 0x67, 0x60,
+0x5b, 0x5b, 0x61, 0x54, 0x67, 0x5b, 0xe8, 0x75, 0xe2, 0x67, 0xff, 0x62,
+0x5b, 0x5b, 0xff, 0xe8, 0xff, 0xe7, 0x6a, 0xee, 0x78, 0x67, 0xff, 0x67,
+0x7a, 0xff, 0x6a, 0xff, 0xff, 0x67, 0xff, 0x71, 0xfd, 0x6c, 0x5e, 0xfe,
+0xff, 0x6d, 0xe7, 0xff, 0xec, 0x68, 0x5b, 0xff, 0x5c, 0x6a, 0xeb, 0x69,
+0x60, 0xff, 0x67, 0x67, 0x67, 0x7a, 0xdf, 0xec, 0x55, 0x5b, 0x5b, 0x5b,
+0x71, 0x5c, 0x77, 0x72, 0x68, 0xe7, 0x6d, 0xff, 0xff, 0xff, 0xdb, 0xe7,
+0xde, 0xdb, 0xff, 0xff, 0x69, 0xee, 0x78, 0x67, 0xef, 0xea, 0x5b, 0x5b,
+0x67, 0x5d, 0x6f, 0xff, 0xff, 0x67, 0x67, 0x67, 0x61, 0x54, 0x5b, 0xff,
+0x67, 0x67, 0x5b, 0x67, 0xf4, 0x67, 0x67, 0x67, 0x5b, 0x65, 0xf2, 0x67,
+0xff, 0xe7, 0xe7, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdb, 0xfc,
+0xf7, 0xf2, 0x7d, 0x5b, 0x56, 0x67, 0x5e, 0xe2, 0x7f, 0x67, 0x75, 0x67,
+0x6d, 0x63, 0x66, 0x67, 0x5b, 0x5b, 0x5b, 0x5b, 0x65, 0xf0, 0x6a, 0xe7,
+0x5f, 0x67, 0xff, 0x6f, 0x7b, 0x67, 0x5b, 0xff, 0xff, 0x72, 0x67, 0xff,
+0xff, 0xff, 0xff, 0x67, 0x7e, 0x6d, 0xff, 0xff, 0xff, 0x67, 0xff, 0xee,
+0xe7, 0xff, 0xff, 0x6a, 0xe7, 0xe7, 0x7a, 0x67, 0xff, 0xff, 0xff, 0x67,
+0x67, 0xff, 0xff, 0x67, 0x67, 0x67, 0x5c, 0x5b, 0x67, 0x7f, 0x67, 0xdb,
+0xfe, 0xde, 0xec, 0x5c, 0x61, 0x5b, 0x67, 0x6e, 0x67, 0x67, 0xfe, 0xff,
+0xe7, 0xff, 0xe7, 0xff, 0xff, 0xe6, 0xd9, 0xe7, 0xff, 0xff, 0x73, 0x68,
+0x6c, 0x55, 0xe7, 0xe7, 0xec, 0x67, 0x5b, 0x71, 0xfd, 0xff, 0xff, 0xff,
+0x71, 0x67, 0x5b, 0x53, 0x5e, 0x5e, 0x5b, 0x5d, 0x79, 0x70, 0x67, 0x67,
+0x60, 0x5c, 0x67, 0xff, 0x7d, 0x75, 0xff, 0xff, 0xe7, 0xec, 0xff, 0xff,
+0xe7, 0xfd, 0x67, 0xf7, 0xdc, 0xf1, 0x6b, 0xe9, 0xff, 0x79, 0x7a, 0x6f,
+0xfa, 0xf9, 0xff, 0x5b, 0x53, 0x5b, 0x67, 0x77, 0x67, 0x66, 0x67, 0x5b,
+0x67, 0x5b, 0x67, 0x67, 0x74, 0x75, 0x7e, 0xf3, 0x67, 0x5c, 0x67, 0x67,
+0x5c, 0x67, 0x6a, 0xea, 0xff, 0xff, 0x67, 0xff, 0x7b, 0x78, 0xdf, 0xff,
+0xdd, 0xee, 0xfd, 0xf6, 0x67, 0xe7, 0xff, 0x74, 0x67, 0x67, 0xe7, 0xfe,
+0xff, 0xec, 0x5c, 0x61, 0xe7, 0x6a, 0x5b, 0xf8, 0xfb, 0xef, 0x79, 0x65,
+0x5f, 0x5b, 0x67, 0x60, 0x67, 0x55, 0xf2, 0xff, 0xe7, 0x61, 0x5b, 0x67,
+0x67, 0x5b, 0x5e, 0x5e, 0xe8, 0xf3, 0x67, 0xe8, 0xe7, 0xdd, 0xff, 0xe7,
+0xdb, 0xf7, 0x70, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xe7, 0x67, 0xff, 0x60,
+0x5c, 0x5d, 0x6e, 0xff, 0xec, 0xff, 0x67, 0x67, 0x67, 0x5b, 0x5b, 0x67,
+0x5c, 0xff, 0xff, 0x67, 0x6e, 0x67, 0x67, 0x60, 0x67, 0x67, 0x67, 0x67,
+0x67, 0x70, 0xff, 0xff, 0x67, 0xff, 0xff, 0xff, 0xfd, 0xf6, 0xff, 0xff,
+0xf5, 0xff, 0xff, 0xe2, 0x6c, 0x67, 0x67, 0xff, 0x67, 0xff, 0x63, 0x5b,
+0x67, 0x5b, 0x7b, 0x67, 0x67, 0x5d, 0x49, 0x5b, 0x67, 0xe7, 0xff, 0xdf,
+0xe5, 0x4d, 0x3b, 0x55, 0xbe, 0xbf, 0x66, 0x41, 0x5b, 0xc3, 0xd3, 0x47,
+0x43, 0x79, 0xcf, 0x67, 0x3e, 0x51, 0xc4, 0xbc, 0x6d, 0x3e, 0x50, 0xdf,
+0xe7, 0xf9, 0xd4, 0xca, 0x46, 0x37, 0xee, 0xaf, 0xba, 0x40, 0x34, 0x4b,
+0xc9, 0xc7, 0x56, 0x39, 0x46, 0xc5, 0xbc, 0x4f, 0x33, 0x4f, 0xbc, 0xc8,
+0x4b, 0x39, 0x7e, 0xb6, 0xbc, 0x4b, 0x39, 0x45, 0xcc, 0xc1, 0xec, 0x41,
+0x4a, 0xc5, 0xce, 0x48, 0x4c, 0xc9, 0xc4, 0x59, 0x41, 0x53, 0xd9, 0xdb,
+0x56, 0x56, 0xdd, 0xcd, 0xdf, 0x4e, 0x5c, 0xda, 0xc6, 0xf0, 0x5b, 0x5b,
+0x53, 0x4f, 0x67, 0x71, 0x53, 0x49, 0x4f, 0xfa, 0xd9, 0xff, 0x5b, 0x4d,
+0x5b, 0x45, 0x5e, 0xcb, 0xcd, 0x63, 0x49, 0x49, 0xdf, 0xc9, 0xd3, 0x45,
+0x4b, 0xdf, 0xbf, 0xcc, 0x3e, 0x39, 0xc6, 0xb4, 0xc9, 0x44, 0x3c, 0x69,
+0xbe, 0xcd, 0x45, 0x37, 0x46, 0xc4, 0xbd, 0x62, 0x3c, 0x4d, 0xbe, 0xce,
+0x3d, 0x32, 0x47, 0xc7, 0xc2, 0x69, 0x3f, 0x42, 0xce, 0xbd, 0xcb, 0x4b,
+0x38, 0x47, 0xcc, 0xc1, 0xd7, 0xdb, 0xef, 0x42, 0x3f, 0x5f, 0xd8, 0xce,
+0xe7, 0xdb, 0xff, 0x51, 0xff, 0xff, 0x73, 0xe7, 0xe7, 0x7a, 0x6b, 0xd4,
+0x66, 0x5d, 0x7a, 0x6f, 0x55, 0xed, 0xd3, 0xdc, 0x6b, 0x50, 0x5b, 0x53,
+0x6e, 0x68, 0x4c, 0x50, 0x54, 0xd0, 0xc5, 0xe7, 0x48, 0x49, 0xdc, 0xdd,
+0xff, 0x5c, 0x3a, 0x4e, 0xce, 0xc1, 0xda, 0x4a, 0x5c, 0x67, 0x67, 0x67,
+0x52, 0x5a, 0xf0, 0xd3, 0xd3, 0xd7, 0xcd, 0xdb, 0xed, 0x5b, 0x57, 0xcf,
+0xd4, 0x51, 0x47, 0x4d, 0x48, 0x5d, 0xe6, 0xff, 0x59, 0x79, 0xcf, 0xf4,
+0x46, 0x4c, 0xd0, 0xc1, 0xcf, 0x4c, 0x3c, 0x41, 0xe0, 0xbd, 0xd5, 0x3e,
+0x3e, 0x4e, 0xc5, 0xd4, 0x61, 0x53, 0x56, 0x74, 0xcd, 0xc7, 0xe6, 0x4e,
+0x6b, 0xd9, 0xce, 0xe0, 0x52, 0x4a, 0x54, 0xd2, 0xd2, 0xe8, 0x4d, 0x46,
+0x4d, 0x69, 0xeb, 0xee, 0x5d, 0xff, 0xff, 0x7d, 0x67, 0x55, 0x4a, 0x67,
+0xff, 0xff, 0xdb, 0xf5, 0x68, 0x53, 0x71, 0xdc, 0xe7, 0xeb, 0x54, 0x4d,
+0x6b, 0xdc, 0xdb, 0xed, 0x4b, 0x4f, 0xfb, 0xce, 0xdb, 0x53, 0x4a, 0x4b,
+0xe4, 0xc3, 0xc5, 0x65, 0x40, 0x4c, 0x67, 0xdb, 0xe7, 0xfe, 0x5b, 0xe7,
+0x5c, 0x61, 0x6f, 0xfc, 0x60, 0xff, 0x67, 0x5b, 0x4b, 0x65, 0xe7, 0x65,
+0x5a, 0x6f, 0x5a, 0x52, 0x7a, 0xcd, 0xd1, 0x55, 0x5c, 0xdb, 0x4c, 0x54,
+0xd1, 0xd6, 0x54, 0x4c, 0x72, 0xdb, 0x4f, 0xef, 0xdb, 0x65, 0x4e, 0xed,
+0xc9, 0xd0, 0x4f, 0x6f, 0xff, 0x56, 0x5b, 0xe7, 0x5f, 0x65, 0xe6, 0xf7,
+0x4c, 0x46, 0x4c, 0xdd, 0xdc, 0x5e, 0x51, 0x45, 0x56, 0xdf, 0xc6, 0xfa,
+0x4c, 0x49, 0x55, 0xd9, 0xe6, 0x5f, 0x53, 0x4d, 0x4f, 0xe7, 0xe7, 0x70,
+0x5b, 0x78, 0x71, 0x69, 0xdb, 0xcd, 0xe9, 0x5b, 0x4d, 0x68, 0xe7, 0xd9,
+0xd3, 0x75, 0x51, 0x53, 0x6b, 0xd3, 0xe6, 0x67, 0x59, 0x53, 0x49, 0x4e,
+0x65, 0x67, 0x6a, 0x5e, 0x4b, 0x53, 0x49, 0xf0, 0xe7, 0xdb, 0x63, 0x4e,
+0x77, 0xff, 0xfc, 0xcd, 0xe3, 0x53, 0x49, 0x4f, 0x5b, 0x4b, 0x61, 0xd4,
+0xd0, 0xeb, 0xe7, 0xe0, 0xeb, 0xff, 0xe7, 0x61, 0x49, 0xef, 0xd3, 0x6d,
+0x53, 0xfb, 0xe7, 0xff, 0xfc, 0xce, 0x79, 0x41, 0x43, 0x48, 0x42, 0x4f,
+0xcf, 0xc1, 0xcc, 0xcc, 0xc9, 0x64, 0x40, 0x45, 0x61, 0x78, 0xeb, 0xd7,
+0xdd, 0x4f, 0x3d, 0x46, 0x4d, 0x4b, 0x6c, 0xdb, 0xc8, 0xca, 0xd1, 0xe4,
+0x52, 0x45, 0x51, 0x68, 0xd8, 0xd3, 0xcd, 0xec, 0x59, 0x4e, 0x53, 0x56,
+0x7d, 0x6e, 0x55, 0x7c, 0x67, 0xf8, 0xd4, 0xd3, 0xde, 0x55, 0x53, 0x5a,
+0x42, 0x56, 0xcd, 0xd1, 0xd3, 0xcd, 0xc9, 0x57, 0x3c, 0x35, 0x35, 0x3b,
+0xe2, 0xbc, 0xb7, 0xbd, 0xcb, 0x6a, 0x47, 0x41, 0x52, 0x71, 0x5a, 0x77,
+0xcd, 0xce, 0xe7, 0xdb, 0x59, 0x46, 0x3c, 0x3f, 0x58, 0xe3, 0xc1, 0xc0,
+0xc1, 0xe9, 0x58, 0x45, 0x4e, 0x67, 0xe2, 0xe7, 0xd3, 0xd3, 0x69, 0x47,
+0x44, 0x45, 0x4a, 0x67, 0xdd, 0x7c, 0x6e, 0xd5, 0xdf, 0xff, 0xdd, 0xdf,
+0x4d, 0x64, 0xd8, 0xd3, 0xca, 0xbc, 0xbd, 0x5c, 0x35, 0x2d, 0x2c, 0x34,
+0xe8, 0xb7, 0xab, 0xae, 0xb1, 0xc6, 0x43, 0x39, 0x38, 0x34, 0x4a, 0x67,
+0x5b, 0x67, 0xd2, 0xcd, 0xd3, 0xce, 0x52, 0x3e, 0x39, 0x47, 0x65, 0xc9,
+0xb4, 0xb3, 0xbf, 0x73, 0x4b, 0x3a, 0x43, 0x66, 0xce, 0xcc, 0xc8, 0xcd,
+0xea, 0x48, 0x3f, 0x3c, 0x3f, 0x49, 0x72, 0xc9, 0xc1, 0xcb, 0xca, 0x67,
+0x38, 0x3d, 0xe6, 0xb5, 0xab, 0xa8, 0xb1, 0x4c, 0x28, 0x1f, 0x23, 0x32,
+0xc4, 0xaa, 0xa2, 0xa5, 0xb6, 0x53, 0x2f, 0x29, 0x2b, 0x2f, 0x4b, 0xe7,
+0xc9, 0xc9, 0xdb, 0x4d, 0x50, 0xff, 0xd2, 0xcd, 0xe5, 0x48, 0x37, 0x3c,
+0x55, 0xc9, 0xb4, 0xad, 0xb3, 0xc9, 0x4a, 0x39, 0x3d, 0x49, 0xde, 0xcc,
+0xc1, 0xd9, 0x4b, 0x3c, 0x38, 0x3f, 0x52, 0xff, 0xda, 0xca, 0xc5, 0xcf,
+0x4b, 0x3c, 0x37, 0x54, 0xc1, 0xa8, 0xa7, 0xad, 0x50, 0x23, 0x1e, 0x1f,
+0x31, 0xc2, 0xa2, 0x9f, 0xa4, 0xbb, 0x36, 0x25, 0x27, 0x34, 0xea, 0xbb,
+0xb6, 0xbc, 0x4c, 0x3b, 0x37, 0x43, 0xe1, 0xc2, 0xda, 0x55, 0x49, 0x49,
+0x5e, 0xc1, 0xb8, 0xba, 0xbd, 0xdb, 0x62, 0x4a, 0x66, 0xe3, 0xfd, 0x5b,
+0x49, 0x45, 0x49, 0x45, 0x51, 0x53, 0x5b, 0x53, 0x67, 0xe7, 0x6d, 0x5f,
+0x67, 0x5b, 0xd4, 0xc5, 0x5e, 0x35, 0x3f, 0x6e, 0xbe, 0xaa, 0xa4, 0xb4,
+0x3d, 0x28, 0x1d, 0x23, 0x44, 0xaf, 0xa6, 0xa3, 0xb2, 0x51, 0x2a, 0x29,
+0x3a, 0x69, 0xaf, 0xb0, 0xc3, 0x47, 0x2d, 0x28, 0x31, 0x4d, 0xc2, 0xb8,
+0xbc, 0x52, 0x3a, 0x3b, 0xde, 0xb0, 0xa6, 0xa9, 0xc1, 0x40, 0x2b, 0x28,
+0x2f, 0x66, 0xb7, 0xb6, 0xb6, 0xd6, 0x3d, 0x38, 0x30, 0x3d, 0x57, 0xe7,
+0xc2, 0xcf, 0xdd, 0xf5, 0x46, 0x4d, 0x78, 0xcd, 0xcb, 0x3c, 0x39, 0x49,
+0xbf, 0xa7, 0x9f, 0xa0, 0xbd, 0x39, 0x1e, 0x17, 0x1e, 0x3a, 0xbd, 0xa2,
+0xa4, 0xac, 0x60, 0x2c, 0x29, 0x32, 0xdc, 0xb2, 0xbc, 0xc7, 0x38, 0x2a,
+0x28, 0x2e, 0x53, 0xb2, 0xad, 0xaf, 0xc5, 0x42, 0x3f, 0x79, 0xba, 0xaa,
+0xa7, 0xbf, 0x3e, 0x29, 0x26, 0x2d, 0x52, 0xb5, 0xad, 0xaf, 0xbf, 0x3c,
+0x2f, 0x2d, 0x37, 0x4d, 0xbd, 0xbe, 0xc3, 0xd3, 0x66, 0x49, 0x48, 0x45,
+0x7d, 0xc3, 0x5d, 0x37, 0x3f, 0x78, 0xba, 0xa3, 0x9d, 0xa9, 0x66, 0x24,
+0x19, 0x1c, 0x2b, 0xd9, 0xab, 0x9f, 0xa6, 0xc5, 0x43, 0x33, 0x33, 0xf3,
+0xbc, 0xbf, 0x4e, 0x37, 0x28, 0x27, 0x33, 0x65, 0xb5, 0xaa, 0xad, 0xbf,
+0x5f, 0x42, 0x41, 0xdb, 0xb5, 0xac, 0xac, 0xcc, 0x35, 0x25, 0x20, 0x29,
+0x4e, 0xb1, 0xab, 0xab, 0xbb, 0x42, 0x2a, 0x28, 0x2d, 0x4a, 0xc7, 0xb4,
+0xb4, 0xc8, 0x46, 0x3b, 0x37, 0x3f, 0xbe, 0xb1, 0x4d, 0x48, 0x49, 0x41,
+0xb6, 0x9c, 0x9d, 0xab, 0x5d, 0x1c, 0x14, 0x1c, 0x2d, 0xca, 0xa3, 0x9d,
+0xa9, 0xb7, 0x5a, 0x38, 0x36, 0x5b, 0x44, 0x3e, 0x39, 0x2e, 0x2d, 0x38,
+0x42, 0xc9, 0xb3, 0xad, 0xaf, 0xbc, 0xdc, 0x5a, 0x4a, 0x4d, 0x60, 0xc7,
+0xb5, 0xb7, 0xca, 0x3f, 0x2e, 0x28, 0x30, 0x4a, 0xb5, 0xa8, 0xaa, 0xb6,
+0x47, 0x2e, 0x27, 0x2d, 0x51, 0xbd, 0xad, 0xb2, 0xed, 0x3a, 0x39, 0x38,
+0x3c, 0xc9, 0xb0, 0x4e, 0x36, 0x3f, 0xee, 0xad, 0x9b, 0x9e, 0xb2, 0x32,
+0x17, 0x12, 0x1b, 0x2d, 0xc4, 0x9d, 0x98, 0x9e, 0xae, 0x5f, 0x2d, 0x2b,
+0x2c, 0x32, 0x3d, 0x3f, 0x38, 0x3d, 0x4c, 0x5f, 0xc2, 0xaf, 0xae, 0xac,
+0xb9, 0xd9, 0x41, 0x3c, 0x3c, 0x3d, 0x5c, 0xc0, 0xae, 0xaf, 0xbc, 0x3b,
+0x28, 0x24, 0x2a, 0x4b, 0xb5, 0xa8, 0xab, 0xbe, 0x40, 0x2a, 0x29, 0x33,
+0x54, 0xbb, 0xb4, 0xc9, 0x63, 0x4a, 0x3d, 0x3d, 0x4a, 0xb9, 0xbb, 0x48,
+0x37, 0x5d, 0xbd, 0xa5, 0x9a, 0xa1, 0xc6, 0x23, 0x13, 0x11, 0x20, 0x39,
+0xaa, 0x99, 0x97, 0xa2, 0xb9, 0x45, 0x2c, 0x28, 0x2a, 0x2e, 0x34, 0x38,
+0x35, 0x43, 0x6b, 0xc5, 0xba, 0xad, 0xad, 0xb5, 0xcc, 0x41, 0x32, 0x34,
+0x41, 0xe3, 0xd3, 0xc6, 0xbc, 0xbb, 0xbe, 0xe2, 0x38, 0x2a, 0x2b, 0x32,
+0x5c, 0xb8, 0xad, 0xae, 0xbb, 0x59, 0x36, 0x2c, 0x31, 0x57, 0xc2, 0xb6,
+0xbb, 0xd1, 0x45, 0x3b, 0x36, 0x53, 0xaa, 0xaf, 0x33, 0x3b, 0x4a, 0x4c,
+0xa8, 0x9c, 0xad, 0x48, 0x1e, 0x13, 0x19, 0x2e, 0xc5, 0x9d, 0x94, 0x9c,
+0xb0, 0x70, 0x2d, 0x24, 0x28, 0x2d, 0x36, 0x46, 0x4b, 0x4e, 0xd3, 0xc0,
+0xb6, 0xaf, 0xae, 0xbc, 0xe4, 0x3f, 0x30, 0x34, 0x5d, 0xc8, 0xbb, 0xba,
+0xc4, 0xe4, 0xf0, 0xc9, 0x79, 0x38, 0x30, 0x2e, 0x36, 0x56, 0xb9, 0xaf,
+0xb1, 0xc3, 0x4d, 0x36, 0x38, 0x3a, 0x3c, 0x6b, 0xd9, 0xca, 0xd0, 0xd3,
+0xf9, 0x5b, 0x5f, 0xc3, 0xba, 0x46, 0x34, 0x3d, 0x51, 0xb5, 0xa3, 0xab,
+0xd0, 0x32, 0x1f, 0x21, 0x2f, 0xf4, 0xad, 0xa5, 0xa8, 0xb9, 0xfe, 0x3d,
+0x38, 0x3d, 0x45, 0x48, 0x48, 0x49, 0x4d, 0x6b, 0xcb, 0xbe, 0xbe, 0xbe,
+0xcd, 0x5a, 0x4a, 0x45, 0x4e, 0x71, 0xce, 0xc1, 0xc4, 0xdf, 0x7d, 0x67,
+0xf3, 0xe7, 0x6c, 0x4c, 0x41, 0x40, 0x4c, 0xe9, 0xc3, 0xc1, 0xc5, 0xd0,
+0x58, 0x46, 0x43, 0x42, 0x49, 0x4f, 0xfa, 0xd5, 0xc9, 0xc5, 0xd0, 0x71,
+0x49, 0x4f, 0xd9, 0xd7, 0x33, 0x31, 0x46, 0xcd, 0xa9, 0xa0, 0xae, 0x3c,
+0x1e, 0x19, 0x1e, 0x35, 0xb5, 0x9f, 0x9e, 0xa9, 0xca, 0x47, 0x36, 0x30,
+0x34, 0x3b, 0x34, 0x32, 0x3b, 0x4e, 0xd1, 0xb9, 0xb0, 0xb7, 0xc9, 0x66,
+0x44, 0x3b, 0x41, 0x4b, 0xd1, 0xbb, 0xbc, 0xcd, 0x5c, 0x53, 0xef, 0xe6,
+0x57, 0x35, 0x2c, 0x2f, 0x44, 0x49, 0xbc, 0xb7, 0xc4, 0xe7, 0x77, 0x3b,
+0x2f, 0x3f, 0x42, 0x49, 0x3e, 0x59, 0xb1, 0xb7, 0x62, 0xed, 0xc2, 0xd2,
+0x36, 0x36, 0xc3, 0xaf, 0x2d, 0x21, 0x3a, 0xa6, 0x9c, 0xa4, 0xc0, 0x2b,
+0x21, 0x1a, 0x18, 0x37, 0xa3, 0xa0, 0xa9, 0xa7, 0xb1, 0x4b, 0x26, 0x2b,
+0x37, 0x4f, 0x43, 0x2c, 0x2f, 0xc8, 0xb9, 0xb5, 0xcf, 0xe6, 0x6e, 0x59,
+0x3f, 0x2f, 0x52, 0xba, 0xd8, 0xc3, 0xb8, 0xc3, 0xc4, 0xb5, 0x6d, 0x2f,
+0x27, 0x2b, 0x33, 0xed, 0xbb, 0xad, 0xb3, 0x70, 0x35, 0x40, 0x4d, 0x42,
+0x3e, 0x48, 0xea, 0xc8, 0xdb, 0xc6, 0xbe, 0xce, 0x6d, 0x3c, 0x34, 0x3f,
+0xc9, 0xd5, 0xdd, 0xf0, 0xde, 0x4d, 0x6e, 0x6a, 0xca, 0xb4, 0xbf, 0x48,
+0x2d, 0x29, 0x31, 0x3f, 0x53, 0xbf, 0xab, 0xb0, 0xc2, 0xf0, 0x5b, 0x52,
+0x3e, 0x39, 0x36, 0x3e, 0x5b, 0xcf, 0xbc, 0xb9, 0xbd, 0x63, 0x4d, 0x4f,
+0x5b, 0x67, 0x4c, 0x4d, 0x5f, 0xc8, 0xba, 0xb6, 0xbe, 0xe7, 0x37, 0x2c,
+0x32, 0x3e, 0xd5, 0xbf, 0xbc, 0xc2, 0xda, 0x4f, 0x3c, 0x39, 0x36, 0x37,
+0x4f, 0xbe, 0xb8, 0xb8, 0xc5, 0xd6, 0x55, 0x53, 0x4d, 0x59, 0xff, 0xe7,
+0xd6, 0xde, 0xdb, 0xc8, 0xdb, 0x68, 0x67, 0x56, 0x54, 0x50, 0xe3, 0xfc,
+0x52, 0x46, 0x45, 0x54, 0xd7, 0xc9, 0xcd, 0xec, 0x5d, 0x50, 0x4e, 0x5b,
+0x5b, 0xe7, 0x60, 0x57, 0x5c, 0xde, 0xc8, 0xce, 0xff, 0x67, 0x67, 0x5e,
+0x4f, 0x45, 0x4d, 0xef, 0xc6, 0xc4, 0xcf, 0xff, 0x57, 0x52, 0x49, 0x5f,
+0xd1, 0xc9, 0xd7, 0xd2, 0xc9, 0xd2, 0x63, 0x3f, 0x3c, 0x42, 0x4f, 0x67,
+0xdb, 0xe2, 0xe2, 0xff, 0x5b, 0x67, 0x7e, 0xe7, 0xec, 0x5b, 0x67, 0xd9,
+0xd3, 0xe7, 0x79, 0x4e, 0x5b, 0x55, 0x79, 0x60, 0x54, 0x78, 0xdb, 0xff,
+0x57, 0x5a, 0xdc, 0x6c, 0xff, 0x7e, 0x62, 0xff, 0x5b, 0x5e, 0xde, 0xdc,
+0xe7, 0x67, 0xe9, 0xe7, 0xdd, 0xe7, 0xe0, 0xe7, 0xce, 0xf0, 0x5a, 0x5a,
+0x6f, 0x6a, 0xe7, 0x67, 0xe5, 0xf0, 0x4e, 0x49, 0x45, 0x5d, 0xdc, 0xe7,
+0xd3, 0xe7, 0xe7, 0xf4, 0x5c, 0x4f, 0x59, 0x53, 0xff, 0xff, 0xff, 0x57,
+0x57, 0xe9, 0x6f, 0xe4, 0xd3, 0xef, 0xde, 0x67, 0xe7, 0xff, 0xdd, 0xd8,
+0xe7, 0xe7, 0x58, 0x5c, 0x67, 0x5b, 0x5b, 0x4f, 0x5b, 0x67, 0xf6, 0xd6,
+0xdb, 0x67, 0x77, 0x67, 0x57, 0x55, 0x5b, 0x70, 0x67, 0x67, 0x5b, 0x5e,
+0xff, 0x5f, 0xe7, 0xff, 0x5b, 0xff, 0xeb, 0xe7, 0xff, 0xff, 0xdb, 0xe7,
+0xe7, 0xff, 0xff, 0x5e, 0x67, 0xff, 0x6d, 0x6c, 0xe7, 0x72, 0xff, 0x69,
+0x60, 0x67, 0x67, 0xdb, 0xed, 0x7a, 0x6f, 0x5b, 0x78, 0x67, 0xff, 0x67,
+0xff, 0x7d, 0x67, 0x67, 0x5b, 0x5b, 0x6d, 0x5b, 0x74, 0x5e, 0xdc, 0x67,
+0xdb, 0xce, 0x79, 0x5f, 0xe7, 0x67, 0x6f, 0x55, 0x60, 0xf9, 0xe5, 0xdf,
+0xff, 0xdd, 0xfd, 0x69, 0xff, 0x5b, 0x67, 0x67, 0x78, 0xdc, 0x76, 0x73,
+0x68, 0xf5, 0x62, 0x5b, 0x73, 0xff, 0xe8, 0xe7, 0xe3, 0xfc, 0x71, 0xe7,
+0x6b, 0x58, 0x53, 0x65, 0x6f, 0x7a, 0x67, 0xff, 0x7b, 0x67, 0x5b, 0x5b,
+0x53, 0x6e, 0x66, 0x76, 0xed, 0xfe, 0xd6, 0x67, 0x7f, 0xf4, 0xe7, 0xfe,
+0xff, 0xff, 0xff, 0x72, 0xeb, 0x67, 0x71, 0xff, 0x67, 0x6f, 0x6a, 0xdb,
+0x70, 0xe7, 0x6b, 0x6e, 0x7c, 0x67, 0x5b, 0x53, 0x4d, 0x4d, 0x5c, 0x67,
+0xf4, 0xe7, 0xe2, 0xe7, 0xfe, 0x5e, 0x67, 0x67, 0xe7, 0xeb, 0xff, 0x5f,
+0x67, 0x67, 0xef, 0x67, 0x5b, 0xff, 0xff, 0xe7, 0xdb, 0xe7, 0xe7, 0x71,
+0x67, 0xeb, 0xff, 0x7d, 0x62, 0xed, 0xe7, 0xed, 0x75, 0xff, 0xe7, 0x63,
+0x66, 0x5f, 0x5b, 0x66, 0xe7, 0xff, 0xff, 0x67, 0x6a, 0xe7, 0x5f, 0x5d,
+0x67, 0x5b, 0xff, 0x6b, 0x5f, 0xe7, 0xff, 0xe7, 0xe8, 0x56, 0x6d, 0x67,
+0x59, 0xff, 0x53, 0x66, 0xd0, 0x67, 0x67, 0xf6, 0x68, 0xff, 0xff, 0x67,
+0xdf, 0xea, 0xdd, 0xdc, 0x5d, 0xde, 0x5c, 0x50, 0xdb, 0x71, 0xe7, 0xff,
+0x72, 0xff, 0x6c, 0x67, 0x67, 0x5b, 0x5b, 0xff, 0xff, 0x5b, 0xe8, 0xff,
+0x5b, 0x53, 0x5b, 0x67, 0x67, 0x74, 0xdb, 0xfb, 0x70, 0xed, 0x7a, 0xe7,
+0xec, 0x5b, 0x67, 0x64, 0x52, 0xe1, 0xe8, 0xe7, 0x73, 0x68, 0xde, 0x74,
+0x68, 0xdb, 0xdb, 0x68, 0x5b, 0xff, 0xff, 0x6e, 0x67, 0x5c, 0x60, 0x53,
+0x5a, 0x70, 0x61, 0x52, 0x5b, 0xff, 0x5b, 0xe7, 0xfb, 0xf8, 0x6e, 0x7c,
+0x5d, 0x78, 0x7d, 0x5b, 0xff, 0x7e, 0x5b, 0x5b, 0x67, 0x6d, 0xff, 0x5c,
+0x72, 0xf7, 0xe7, 0xe7, 0x67, 0xff, 0x5f, 0x6a, 0xff, 0x67, 0xe7, 0xf9,
+0x67, 0xff, 0x67, 0x60, 0x5c, 0xff, 0x67, 0x66, 0x63, 0xff, 0xe7, 0xe7,
+0x6d, 0xe7, 0x5e, 0xf5, 0xfe, 0x67, 0x56, 0x67, 0xe7, 0xff, 0x67, 0x67,
+0x78, 0x4b, 0x5c, 0xd6, 0x5d, 0xdf, 0xe7, 0xff, 0xff, 0x5b, 0x77, 0xff,
+0xff, 0xff, 0x53, 0x7e, 0x5b, 0x6d, 0xe7, 0x56, 0x73, 0xfd, 0xe7, 0xf6,
+0xfd, 0xff, 0x6f, 0x5b, 0xfb, 0xee, 0x7b, 0xff, 0x79, 0x5b, 0x53, 0x55,
+0x53, 0x58, 0x49, 0x5a, 0x6e, 0xdc, 0xff, 0xff, 0xe8, 0x67, 0x67, 0xdb,
+0x67, 0x56, 0x54, 0x5b, 0x51, 0x4d, 0x58, 0x5b, 0xea, 0xf1, 0x5d, 0xff,
+0xe7, 0xda, 0xe5, 0xd7, 0xde, 0xea, 0xef, 0x67, 0xff, 0x60, 0x5b, 0x67,
+0x53, 0x67, 0x50, 0xeb, 0x5b, 0x67, 0x5b, 0x67, 0xed, 0x4a, 0x65, 0xff,
+0x5b, 0xd5, 0x57, 0xdd, 0xff, 0x5c, 0xbe, 0x3c, 0xd3, 0x47, 0x5c, 0x68,
+0x63, 0x4d, 0xd3, 0x4d, 0xf6, 0x5b, 0x5f, 0xbe, 0x50, 0xdb, 0xe2, 0x74,
+0xe7, 0xd8, 0x4f, 0xce, 0x5f, 0x44, 0x41, 0x5f, 0x4e, 0x3d, 0x5d, 0xeb,
+0x5c, 0xd3, 0xdd, 0xff, 0xd7, 0xbd, 0x53, 0xca, 0x5e, 0x43, 0xd1, 0xf4,
+0x38, 0x67, 0x5b, 0x47, 0x56, 0x5b, 0x67, 0x59, 0x46, 0x57, 0xc5, 0xc5,
+0xbc, 0xe4, 0x3f, 0x4b, 0x37, 0xec, 0xc8, 0xcd, 0x49, 0xd7, 0x48, 0x40,
+0xe8, 0xd9, 0xbd, 0xca, 0x55, 0xcc, 0xdd, 0x52, 0x3a, 0x4c, 0xe6, 0xc1,
+0x74, 0x4d, 0xe7, 0x61, 0x4e, 0x3d, 0xcb, 0xfa, 0x5b, 0x5b, 0xeb, 0x7c,
+0x5d, 0xff, 0x5f, 0xfa, 0x45, 0x3c, 0x5e, 0x67, 0xd0, 0xe9, 0xdd, 0x78,
+0x3f, 0xed, 0xc7, 0x5b, 0x53, 0x75, 0xff, 0xcf, 0xce, 0x67, 0x6d, 0xf6,
+0x68, 0xf9, 0xe7, 0xfc, 0xfb, 0xe1, 0x4b, 0x45, 0x4e, 0x53, 0xdf, 0xea,
+0xdf, 0x69, 0xe5, 0xe4, 0x72, 0x67, 0x56, 0x3c, 0x4a, 0xe7, 0x59, 0x53,
+0x49, 0x67, 0x46, 0x4d, 0xd7, 0xc6, 0xc1, 0xeb, 0xe7, 0x60, 0xdd, 0xff,
+0xe7, 0x67, 0xea, 0xe7, 0x4d, 0xd5, 0xcd, 0x49, 0x46, 0x49, 0xcd, 0xca,
+0xda, 0xdb, 0x72, 0x4c, 0x68, 0xde, 0xec, 0x5b, 0xd9, 0x4d, 0x5b, 0x3c,
+0x5a, 0xfc, 0x48, 0xdd, 0x4a, 0xfc, 0x57, 0x4d, 0x5f, 0x7a, 0x67, 0xdc,
+0xc2, 0xd0, 0xcd, 0xe9, 0xd7, 0x4d, 0x45, 0x43, 0xd8, 0xe7, 0x5b, 0x40,
+0x5b, 0xd9, 0xf5, 0xce, 0xe3, 0xd8, 0xdd, 0xca, 0x6b, 0xff, 0xcf, 0xee,
+0x5b, 0x4b, 0x5d, 0x67, 0x4c, 0xf6, 0x5f, 0xe0, 0xff, 0x77, 0xd7, 0xe7,
+0xe7, 0x53, 0x5c, 0x5e, 0x59, 0xe7, 0x5b, 0x61, 0x68, 0x3b, 0x4a, 0x5c,
+0x58, 0x40, 0xef, 0xc9, 0xf4, 0x53, 0xe6, 0xce, 0xf5, 0x5b, 0xe5, 0xce,
+0xd0, 0xc6, 0x53, 0x52, 0xe7, 0xf7, 0x4a, 0x5c, 0xff, 0x61, 0x68, 0xf5,
+0x4b, 0x7e, 0xff, 0xcb, 0xda, 0x58, 0xff, 0x5c, 0x6a, 0x4d, 0x5a, 0x4f,
+0x5e, 0x5d, 0x5f, 0x5e, 0xe7, 0x53, 0xd6, 0x4d, 0xe0, 0xe6, 0xeb, 0x61,
+0xeb, 0x4f, 0x65, 0x5c, 0x5e, 0x4d, 0x53, 0x5e, 0x5b, 0x67, 0xff, 0x59,
+0xeb, 0xea, 0x55, 0xeb, 0xc5, 0xbf, 0x6e, 0x68, 0xce, 0xd5, 0x60, 0x57,
+0xdb, 0x6b, 0x46, 0x59, 0xda, 0x4d, 0x3f, 0x6a, 0xdc, 0x48, 0x54, 0xe7,
+0xcc, 0x68, 0x4a, 0x52, 0xd7, 0xc2, 0xe4, 0x5b, 0x53, 0x57, 0x43, 0x77,
+0xdf, 0xed, 0x4f, 0x53, 0xfa, 0x6a, 0x7c, 0xd5, 0x55, 0x6e, 0x69, 0xdd,
+0xcb, 0xff, 0xd6, 0xff, 0x4d, 0x43, 0xed, 0xc2, 0xcd, 0x4d, 0x4d, 0x79,
+0xd1, 0xda, 0x5f, 0x53, 0x4a, 0x53, 0xda, 0xe2, 0x4f, 0x5d, 0x67, 0x5b,
+0x54, 0xdd, 0x60, 0x55, 0xe7, 0xf2, 0xd4, 0x5e, 0xe7, 0x53, 0x62, 0x4f,
+0x5b, 0xd3, 0x57, 0x4d, 0x73, 0xec, 0x5b, 0x5b, 0x5f, 0xfb, 0x53, 0xf9,
+0xfa, 0x5f, 0xcd, 0xda, 0x68, 0x6e, 0xcd, 0x67, 0xf9, 0xd9, 0xee, 0x5b,
+0x59, 0x4c, 0x4a, 0x75, 0x4c, 0xff, 0x59, 0x54, 0x45, 0xed, 0xec, 0x54,
+0x77, 0xc9, 0x6c, 0xd3, 0x5e, 0x72, 0x66, 0x4c, 0xd5, 0x4e, 0x55, 0x53,
+0xff, 0x52, 0x49, 0x7a, 0xe8, 0x67, 0xd8, 0xe7, 0xd1, 0x67, 0x7f, 0xed,
+0xe2, 0xfe, 0x67, 0x5e, 0xdc, 0x53, 0x59, 0x5b, 0x67, 0xff, 0x5d, 0x58,
+0x53, 0x5a, 0xef, 0x67, 0x79, 0xee, 0x6b, 0xd3, 0xf1, 0xd5, 0xeb, 0x5d,
+0x54, 0x56, 0x63, 0xdb, 0xe2, 0x59, 0xdc, 0x76, 0x53, 0x53, 0x53, 0x5d,
+0x54, 0x57, 0x5f, 0xe7, 0xf0, 0xcf, 0xd0, 0x57, 0xd7, 0xde, 0x5b, 0x77,
+0x60, 0xd7, 0x5b, 0x59, 0xd7, 0x53, 0x76, 0x6d, 0x5c, 0xec, 0x4d, 0x7f,
+0x5e, 0xff, 0x5c, 0xe3, 0xf1, 0x5b, 0x5f, 0xf7, 0x5d, 0x60, 0x64, 0x7b,
+0x6f, 0x55, 0xea, 0x53, 0x5b, 0x5b, 0x71, 0x5b, 0x5d, 0x67, 0x66, 0x63,
+0xe7, 0xe8, 0xff, 0xd9, 0xd3, 0xf4, 0xe7, 0x68, 0xed, 0xd6, 0x5c, 0x6a,
+0x77, 0x7c, 0x65, 0x53, 0x65, 0x4d, 0x4f, 0x67, 0x5b, 0x65, 0x53, 0x70,
+0x5d, 0xdd, 0x5b, 0xff, 0xeb, 0xda, 0xfc, 0xe9, 0x4c, 0xff, 0x67, 0x6d,
+0x53, 0x67, 0x5b, 0x5b, 0x5b, 0x5f, 0x4d, 0xdb, 0x5b, 0xff, 0xe6, 0xea,
+0xea, 0xef, 0xe5, 0xe7, 0xe7, 0xda, 0xe0, 0xff, 0x67, 0xe7, 0x4e, 0x68,
+0x50, 0x59, 0x5c, 0xec, 0xff, 0xe7, 0x5b, 0xf5, 0xfe, 0x73, 0xf6, 0xe7,
+0xff, 0x63, 0xeb, 0x6e, 0x67, 0x5d, 0x68, 0x65, 0x5b, 0x57, 0xff, 0xff,
+0xe0, 0xff, 0x5d, 0x5f, 0x68, 0xff, 0xff, 0x68, 0xde, 0x5e, 0x67, 0x74,
+0xff, 0x68, 0x73, 0xf6, 0xfd, 0xe7, 0xff, 0xfc, 0xdf, 0xff, 0xe7, 0x67,
+0x67, 0xea, 0xdf, 0x7a, 0x5b, 0x67, 0xff, 0x5b, 0x60, 0x5b, 0x53, 0x56,
+0xfe, 0xf5, 0x74, 0x67, 0x62, 0xff, 0x67, 0x6d, 0x5b, 0x7d, 0x72, 0xe7,
+0x5c, 0xe7, 0x5b, 0x65, 0xf0, 0xff, 0x6a, 0xef, 0xfa, 0xe4, 0x67, 0x69,
+0xff, 0x5b, 0xdb, 0xe3, 0xdf, 0x67, 0x76, 0xe7, 0x7e, 0x5b, 0xff, 0x67,
+0x67, 0xe7, 0x5c, 0x61, 0x53, 0xea, 0x5b, 0x64, 0x65, 0x7c, 0x5d, 0x67,
+0x6f, 0x67, 0x5d, 0x5b, 0xfb, 0xff, 0xd7, 0xff, 0xdd, 0x6a, 0x67, 0x6c,
+0x56, 0xe8, 0xec, 0xe2, 0x5b, 0x67, 0x6c, 0xfe, 0x5e, 0x60, 0xe6, 0x53,
+0x67, 0x7c, 0x5f, 0xf8, 0xfb, 0x67, 0xe7, 0xff, 0xe7, 0xe7, 0xdb, 0xdf,
+0x67, 0x55, 0x61, 0x5c, 0x6c, 0x53, 0x69, 0xe7, 0x5b, 0x67, 0x62, 0x56,
+0x67, 0x61, 0x67, 0xe8, 0xdb, 0x77, 0xdd, 0xdb, 0xeb, 0x67, 0x5b, 0xff,
+0x5d, 0x6f, 0x67, 0x67, 0xe7, 0xff, 0x67, 0xe0, 0xe9, 0xeb, 0xe4, 0x67,
+0xff, 0x67, 0x67, 0x75, 0x5b, 0x7f, 0xf4, 0xff, 0xff, 0x72, 0x77, 0x5b,
+0x67, 0x5b, 0x67, 0xe7, 0x5b, 0x7a, 0x6f, 0x5d, 0xea, 0x61, 0x4d, 0x60,
+0xe7, 0x79, 0x59, 0xff, 0x7d, 0x56, 0x5e, 0x67, 0x59, 0x5b, 0xe7, 0xde,
+0x75, 0x7e, 0xf7, 0x6f, 0x66, 0x67, 0xf0, 0xfc, 0xe7, 0x67, 0xff, 0x7e,
+0x6a, 0x6a, 0x67, 0x67, 0xff, 0xee, 0x67, 0x77, 0xee, 0x67, 0x67, 0x61,
+0x67, 0x67, 0x67, 0x67, 0x51, 0xe7, 0x5c, 0x5b, 0xff, 0x5c, 0x72, 0x67,
+0x67, 0xff, 0x5d, 0xff, 0x53, 0x6a, 0x5e, 0x57, 0x5d, 0xea, 0xe7, 0xfb,
+0xe7, 0xe7, 0xfc, 0xe7, 0xdb, 0xff, 0xff, 0xf3, 0xe7, 0x67, 0xff, 0xff,
+0xe7, 0x76, 0x66, 0x5b, 0xff, 0x69, 0xff, 0x64, 0x4e, 0x60, 0xea, 0x5b,
+0x67, 0x67, 0x67, 0x5b, 0x67, 0x5b, 0x57, 0x67, 0x77, 0xee, 0xe7, 0xe7,
+0xed, 0xff, 0xff, 0x62, 0x5b, 0x67, 0x6c, 0xff, 0x5b, 0x6c, 0xdc, 0x5a,
+0x5d, 0x67, 0x71, 0x79, 0x67, 0xd3, 0xe7, 0xff, 0xe7, 0xfb, 0xff, 0xe0,
+0x66, 0x67, 0xe7, 0x67, 0x76, 0xe7, 0x67, 0x67, 0x5e, 0xff, 0x6d, 0x5e,
+0x68, 0x61, 0x6c, 0xff, 0x53, 0x5d, 0xe9, 0x5f, 0x55, 0xe9, 0x5b, 0x67,
+0x67, 0x5f, 0xfa, 0x57, 0x66, 0xe7, 0x6b, 0x67, 0xff, 0xff, 0xe7, 0xff,
+0xd8, 0xed, 0xff, 0x74, 0xec, 0x68, 0x67, 0xe7, 0x68, 0xee, 0xff, 0x7c,
+0xf1, 0x64, 0x5a, 0x67, 0x53, 0x65, 0x67, 0x5b, 0x79, 0x70, 0x67, 0x5d,
+0x4f, 0x54, 0xff, 0xf2, 0x7d, 0x76, 0xe7, 0xe8, 0x75, 0xde, 0xff, 0x5b,
+0x75, 0x5b, 0xed, 0x76, 0x66, 0x6e, 0x67, 0x7b, 0x5f, 0x67, 0x67, 0x5b,
+0x5d, 0xdd, 0xef, 0xf7, 0xda, 0x60, 0xe6, 0xe3, 0x61, 0xfd, 0xf6, 0xff,
+0x67, 0x62, 0x59, 0x53, 0x74, 0x6d, 0x5b, 0xff, 0x5b, 0x67, 0x72, 0x6f,
+0x5b, 0xff, 0x6b, 0xe7, 0xe7, 0x67, 0x67, 0xef, 0xdd, 0x6a, 0x60, 0x67,
+0xe7, 0xe7, 0x65, 0x63, 0xf3, 0xe9, 0x62, 0x74, 0x67, 0xff, 0xf5, 0xe7,
+0xff, 0xff, 0x68, 0x53, 0x6b, 0x69, 0xff, 0xe7, 0xe7, 0xf0, 0x79, 0x55,
+0x53, 0x5d, 0xff, 0x67, 0xdb, 0xf8, 0x6e, 0x7a, 0x53, 0xff, 0x5b, 0x51,
+0x5e, 0x67, 0x5e, 0x5e, 0x67, 0x67, 0x5b, 0x5b, 0x5b, 0x5b, 0x67, 0xe7,
+0x78, 0x7b, 0xf0, 0xea, 0x67, 0xff, 0x67, 0x79, 0xff, 0xe7, 0xf8, 0x6e,
+0xe9, 0xff, 0x61, 0xff, 0x58, 0x67, 0x5b, 0x75, 0x67, 0xff, 0x5b, 0x67,
+0x67, 0x6d, 0x5b, 0x5b, 0x5f, 0x5d, 0x67, 0x5b, 0x53, 0x5b, 0x67, 0x79,
+0xff, 0xf0, 0xe9, 0x67, 0x60, 0x5b, 0x67, 0x6e, 0x67, 0xff, 0xe7, 0xe8,
+0x6c, 0xf4, 0x67, 0x67, 0xf5, 0xdc, 0x6d, 0xff, 0xff, 0x6e, 0x67, 0xff,
+0x65, 0xf8, 0xf7, 0x5c, 0xea, 0xff, 0xd7, 0xff, 0xff, 0x70, 0x5b, 0x5d,
+0xff, 0x66, 0x53, 0x6e, 0x66, 0x76, 0xff, 0x67, 0x67, 0x53, 0x5b, 0x73,
+0x76, 0x67, 0xe7, 0xdd, 0x67, 0xff, 0x5b, 0x65, 0x67, 0x67, 0xff, 0x6f,
+0x7a, 0x79, 0x67, 0x69, 0xe7, 0xee, 0xe7, 0xe7, 0xe7, 0xff, 0x4d, 0xe7,
+0xe8, 0xff, 0x67, 0x7f, 0xff, 0x67, 0x67, 0x6d, 0x58, 0xe7, 0x67, 0x6b,
+0xff, 0x5b, 0x67, 0x5d, 0x5b, 0x52, 0x59, 0xfe, 0x53, 0x78, 0xff, 0x53,
+0x63, 0x72, 0x5b, 0x51, 0x5b, 0x5c, 0xec, 0xf4, 0xe7, 0xd9, 0xd6, 0xfe,
+0xed, 0x63, 0x5b, 0xff, 0x67, 0x7c, 0xff, 0x67, 0xe9, 0x6f, 0x67, 0x67,
+0xff, 0xdb, 0xe4, 0x67, 0x5c, 0x67, 0x5f, 0x5b, 0x5b, 0x5b, 0x5b, 0x75,
+0x67, 0x67, 0x67, 0xe7, 0x67, 0x5b, 0x67, 0x67, 0x5f, 0x67, 0xe9, 0xff,
+0x5b, 0x65, 0xe7, 0xea, 0x7a, 0xff, 0x7a, 0x67, 0x5f, 0x67, 0x6b, 0x5b,
+0x67, 0x67, 0x61, 0x67, 0x67, 0xff, 0xe8, 0x5b, 0xff, 0xe7, 0xe7, 0xe7,
+0xe7, 0xe7, 0x67, 0x5c, 0x5b, 0x5b, 0x67, 0xff, 0x67, 0xea, 0x6f, 0x67,
+0x67, 0x67, 0x4e, 0x53, 0xe9, 0x79, 0x59, 0xdd, 0xd4, 0xe3, 0xdd, 0xe8,
+0x5b, 0x62, 0x7f, 0xd1, 0x6d, 0x53, 0xed, 0x6e, 0x66, 0x67, 0x67, 0x67,
+0x67, 0xff, 0x69, 0x67, 0xea, 0x5d, 0x6f, 0xdb, 0x5f, 0x5b, 0xe7, 0xf7,
+0xd0, 0xe8, 0xec, 0x73, 0x5b, 0x67, 0xf4, 0x67, 0x74, 0x67, 0x5b, 0x5b,
+0x5b, 0x66, 0x53, 0x55, 0x5b, 0x71, 0x5b, 0x5c, 0x70, 0xed, 0x4e, 0x4d,
+0x6a, 0xe7, 0x6f, 0xfb, 0xd5, 0xdf, 0x67, 0x77, 0x72, 0xfd, 0xe7, 0xed,
+0x68, 0xff, 0x74, 0x67, 0x61, 0xff, 0x68, 0x6e, 0x53, 0x5b, 0x67, 0x5a,
+0x5a, 0xff, 0xdd, 0x5e, 0x57, 0xea, 0xff, 0x4d, 0x6b, 0xf8, 0x53, 0x67,
+0x67, 0xf2, 0x7b, 0x53, 0x58, 0x5b, 0x56, 0x67, 0xe7, 0xf4, 0x6c, 0xff,
+0xe7, 0xff, 0x68, 0xee, 0x77, 0x7c, 0xf1, 0x67, 0xe7, 0x5f, 0x6a, 0xff,
+0xff, 0xff, 0xff, 0x60, 0xfc, 0xe7, 0x72, 0x54, 0x76, 0x67, 0x67, 0x67,
+0xd9, 0xdb, 0x4f, 0x67, 0x5b, 0x5b, 0x56, 0x67, 0xe7, 0x4e, 0xea, 0x7b,
+};
diff --git a/contrib/netbsd-tests/dev/audio/t_pad.sh b/contrib/netbsd-tests/dev/audio/t_pad.sh
new file mode 100755
index 000000000000..8caf23a7de90
--- /dev/null
+++ b/contrib/netbsd-tests/dev/audio/t_pad.sh
@@ -0,0 +1,47 @@
+#	$NetBSD: t_pad.sh,v 1.3 2010/11/07 17:51:17 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case pad_output
+pad_output_head()
+{
+
+	atf_set "descr" "Check pad driver output against known-good output"
+}
+
+pad_output_body()
+{
+
+	atf_check -s exit:0 uudecode $(atf_get_srcdir)/t_pad_output.bz2.uue
+	atf_check -s exit:0 bunzip2 t_pad_output.bz2
+	atf_check -s exit:0 -o file:t_pad_output $(atf_get_srcdir)/h_pad
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case pad_output
+}
diff --git a/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue b/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue
new file mode 100644
index 000000000000..0aadfa7dae51
--- /dev/null
+++ b/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue
@@ -0,0 +1,998 @@
+begin 644 t_pad_output.bz2
+M0EIH.3%!629368,\S/H`A(]_____________________________________
+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
+&A(09YF?0
+`
+end
diff --git a/contrib/netbsd-tests/dev/cgd/paramsfile b/contrib/netbsd-tests/dev/cgd/paramsfile
new file mode 100644
index 000000000000..066eab6fc434
--- /dev/null
+++ b/contrib/netbsd-tests/dev/cgd/paramsfile
@@ -0,0 +1,8 @@
+algorithm aes-cbc;
+iv-method encblkno1;
+keylength 128;
+verify_method none;
+keygen pkcs5_pbkdf2/sha1 {
+        iterations 42;
+        salt AAAAgKajcCnHR7sR1k1RKQ9Q0uY=;
+};
diff --git a/contrib/netbsd-tests/dev/cgd/t_cgd.sh b/contrib/netbsd-tests/dev/cgd/t_cgd.sh
new file mode 100755
index 000000000000..9cd50a5fd86d
--- /dev/null
+++ b/contrib/netbsd-tests/dev/cgd/t_cgd.sh
@@ -0,0 +1,159 @@
+#	$NetBSD: t_cgd.sh,v 1.11 2013/02/19 21:08:24 joerg Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawcgd=/dev/rcgd0${rawpart}
+cgdserver=\
+"rump_server -lrumpvfs -lrumpkern_crypto -lrumpdev -lrumpdev_disk -lrumpdev_cgd"
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+	atf_set "descr" "Tests that encrypt/decrypt works"
+	atf_set "require.progs" "rump_server"
+}
+
+basic_body()
+{
+
+	d=$(atf_get_srcdir)
+	atf_check -s exit:0 \
+	    ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+	export RUMP_SERVER=unix://csock
+	atf_check -s exit:0 -x "echo 12345 | \
+	    rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=${d}/t_cgd count=2 | rump.dd of=${rawcgd}"
+	atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+	atf_check -s exit:0 -e ignore -o file:testfile \
+	    rump.dd if=${rawcgd} count=2
+}
+
+basic_cleanup()
+{
+
+	env RUMP_SERVER=unix://csock rump.halt || true
+}
+
+atf_test_case wrongpass cleanup
+wrongpass_head()
+{
+
+	atf_set "descr" "Tests that wrong password does not give original " \
+	    "plaintext"
+	atf_set "require.progs" "rump_server"
+}
+
+wrongpass_body()
+{
+
+	d=$(atf_get_srcdir)
+	atf_check -s exit:0 \
+	    ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+	export RUMP_SERVER=unix://csock
+	atf_check -s exit:0 -x "echo 12345 | \
+	    rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=${d}/t_cgd | rump.dd of=${rawcgd} count=2"
+
+	# unconfig and reconfig cgd
+	atf_check -s exit:0 rump.cgdconfig -u cgd0
+	atf_check -s exit:0 -x "echo 54321 | \
+	    rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+
+	atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+	atf_check -s exit:0 -e ignore -o not-file:testfile \
+	    rump.dd if=${rawcgd} count=2
+}
+
+wrongpass_cleanup()
+{
+
+	env RUMP_SERVER=unix://csock rump.halt || true
+}
+
+
+atf_test_case unaligned_write cleanup
+unaligned_write_head()
+{
+
+	atf_set "descr" "Attempt unaligned writes to a raw cgd device"
+	atf_set "require.progs" "rump_server"
+}
+
+unaligned_write_body()
+{
+	d=$(atf_get_srcdir)
+	atf_check -s exit:0 \
+	    ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+	export RUMP_SERVER=unix://csock
+	atf_check -s exit:0 -x "echo 12345 | \
+	    rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+
+	# Check that cgd rejects writes of totally bogus lengths.
+	atf_check -s not-exit:0 -e ignore -x \
+	    "echo die hard | rump.dd of=${rawcgd} bs=123 conv=sync"
+
+	# Check that cgd rejects non-sector-length writes even if they
+	# are integral multiples of the block size.
+	atf_check -s not-exit:0 -e ignore -x \
+	    "echo die hard | rump.dd of=${rawcgd} bs=64 conv=sync"
+	atf_check -s not-exit:0 -e ignore -x \
+	    "echo die hard | rump.dd of=${rawcgd} bs=256 conv=sync"
+
+	# Check that cgd rejects misaligned buffers, produced by
+	# packetizing the input on bogus boundaries and using the
+	# bizarre behaviour of `bs=N' in dd.
+	atf_check -s not-exit:0 -e ignore -x \
+	    "(echo -n x && sleep 1 && head -c 511 </dev/zero) \
+		| rump.dd of=${rawcgd} bs=512"
+
+	# Check that cgd rejects sector-length writes if they are not
+	# on sector boundaries.  Doesn't work because dd can't be
+	# persuaded to seek a non-integral multiple of the output
+	# buffer size and I can't be arsed to find the another way to
+	# do that.
+	#atf_check -s not-exit:0 -e ignore -x \
+	#    "echo die hard | rump.dd of=${rawcgd} seek=1 bs=512 conv=sync"
+}
+
+unaligned_write_cleanup()
+{
+	env RUMP_SERVER=unix://csock rump.halt || true
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+	atf_add_test_case wrongpass
+	atf_add_test_case unaligned_write
+}
diff --git a/contrib/netbsd-tests/dev/dm/dm_targets_cmd.plist b/contrib/netbsd-tests/dev/dm/dm_targets_cmd.plist
new file mode 100644
index 000000000000..f029dfb469b4
--- /dev/null
+++ b/contrib/netbsd-tests/dev/dm/dm_targets_cmd.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>cmd_data</key>
+        <array/>
+        <key>command</key>
+        <string>targets</string>
+        <key>event_nr</key>
+        <integer>0x0</integer>
+        <key>flags</key>
+        <integer>0x4</integer>
+        <key>version</key>
+        <array>
+                <integer>0x4</integer>
+                <integer>0x1</integer>
+                <integer>0x0</integer>
+        </array>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/contrib/netbsd-tests/dev/dm/dm_version_cmd.plist b/contrib/netbsd-tests/dev/dm/dm_version_cmd.plist
new file mode 100644
index 000000000000..e40e53ebdd51
--- /dev/null
+++ b/contrib/netbsd-tests/dev/dm/dm_version_cmd.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>cmd_data</key>
+        <array/>
+        <key>command</key>
+        <string>version</string>
+        <key>event_nr</key>
+        <integer>0x0</integer>
+        <key>flags</key>
+        <integer>0x4</integer>
+        <key>version</key>
+        <array>
+                <integer>0x4</integer>
+                <integer>0x0</integer>
+                <integer>0x0</integer>
+        </array>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/contrib/netbsd-tests/dev/dm/h_dm.c b/contrib/netbsd-tests/dev/dm/h_dm.c
new file mode 100644
index 000000000000..3380ad3fb5b2
--- /dev/null
+++ b/contrib/netbsd-tests/dev/dm/h_dm.c
@@ -0,0 +1,146 @@
+/*	$NetBSD: h_dm.c,v 1.1 2010/10/06 11:24:55 haad Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/disklabel.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include <dev/dm/netbsd-dm.h>
+
+int dm_test_targets(void);
+int dm_test_versions(void);
+
+/*
+ * Test simple dm versions command on device-mapper device.
+ */
+int
+dm_test_versions(void) {
+	int fd;
+	int error;
+	prop_dictionary_t dict_in, dict_out;
+	struct plistref prefp;
+	char *xml;
+
+	error = 0;
+	
+	error = rump_init();
+	if (error != 0)
+		err(1, "Rump init failed");
+	
+	fd = rump_sys_open("/dev/mapper/control", O_RDWR, 0);
+	if (fd == -1)
+		err(1, "Open dm device failed");
+
+	dict_in  = prop_dictionary_internalize_from_file("dm_version_cmd.plist");
+	dict_out = prop_dictionary_create();
+	
+	prop_dictionary_externalize_to_pref(dict_in, &prefp);
+	
+	error = rump_sys_ioctl(fd, NETBSD_DM_IOCTL, &prefp);
+	if (error < 0)
+		err(1, "Dm control ioctl failed");
+
+	dict_out = prop_dictionary_internalize(prefp.pref_plist);
+	
+	xml = prop_dictionary_externalize(dict_out);
+
+	rump_sys_close(fd);
+
+	return error;
+}
+
+/*
+ * Test simple dm targets command on device-mapper device.
+ */
+int
+dm_test_targets(void) {
+	int fd;
+	int error;
+	prop_dictionary_t dict_in, dict_out;
+	struct plistref prefp;
+	char *xml;
+
+	error = 0;
+	
+	error = rump_init();
+	if (error != 0)
+		err(1, "Rump init failed");
+	
+	fd = rump_sys_open("/dev/mapper/control", O_RDWR, 0);
+	if (fd == -1)
+		err(1, "Open dm device failed");
+
+	dict_in  = prop_dictionary_internalize_from_file("dm_targets_cmd.plist");
+	dict_out = prop_dictionary_create();
+	
+	prop_dictionary_externalize_to_pref(dict_in, &prefp);
+
+	error = rump_sys_ioctl(fd, NETBSD_DM_IOCTL, &prefp);
+	if (error < 0)
+		err(1, "Dm control ioctl failed");
+
+	dict_out = prop_dictionary_internalize(prefp.pref_plist);
+	
+	xml = prop_dictionary_externalize(dict_out);
+
+	rump_sys_close(fd);
+
+	return error;
+}
+
+int
+main(int argc, char **argv) {
+	int error;
+
+	error = 0;
+
+	error = dm_test_versions();
+	if (error != 0)
+		err(1, "dm_test_versions failed");
+
+	error = dm_test_targets();
+	if (error != 0)
+		err(1, "dm_test_targets failed");
+
+	return error;
+}
diff --git a/contrib/netbsd-tests/dev/dm/t_dm.sh b/contrib/netbsd-tests/dev/dm/t_dm.sh
new file mode 100755
index 000000000000..02d1ee34cd15
--- /dev/null
+++ b/contrib/netbsd-tests/dev/dm/t_dm.sh
@@ -0,0 +1,47 @@
+#	$NetBSD: t_dm.sh,v 1.2 2010/11/07 17:51:17 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case dm_test
+dm_test_head()
+{
+    	atf_set "descr" "Check dm driver routines and create lineary, stripe mapped disks"
+}
+
+dm_test_body()
+{
+    # XXX Actually we need disks than 1 for stripe check let it leave for later now.
+	#atf_check -s exit:0 uudecode $(atf_get_srcdir)/t_dm_disk_1.bz2.uue
+	#atf_check -s exit:0 bunzip2 t_dm_disk_1.bz2
+	#atf_check -s exit:0 -o file:t_dm_disk_1 $(atf_get_srcdir)/h_dm
+	atf_check -s exit:0 $(atf_get_srcdir)/h_dm
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case dm_test
+}
diff --git a/contrib/netbsd-tests/dev/md/h_mdserv.c b/contrib/netbsd-tests/dev/md/h_mdserv.c
new file mode 100644
index 000000000000..f5ac6a9e66ee
--- /dev/null
+++ b/contrib/netbsd-tests/dev/md/h_mdserv.c
@@ -0,0 +1,109 @@
+/*	$NetBSD: h_mdserv.c,v 1.4 2011/02/10 13:29:02 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+
+#include <dev/md.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#define MDSIZE (1024*1024)
+
+#define REQUIRE(a, msg) if ((a) != 0) err(1, msg);
+
+static void *
+prober(void *arg)
+{
+	int fd, error;
+	char buf[4];
+	ssize_t n;
+
+	fd = rump_sys_open(arg, O_RDONLY);
+	for (;;) {
+		n = rump_sys_read(fd, buf, sizeof(buf));
+
+		switch (n) {
+		case 4:
+			error = 0;
+			goto out;
+
+		case -1:
+			if (errno == ENXIO) {
+				usleep(1000);
+				continue;
+			}
+
+			/* FALLTHROUGH */
+		default:
+			error = EPIPE;
+			goto out;
+		}
+	}
+ out:
+
+	error = rump_daemonize_done(error);
+	REQUIRE(error, "rump_daemonize_done");
+
+	if (error)
+		exit(1);
+
+	return NULL;
+}
+
+int
+main(int argc, char *argv[])
+{
+	pthread_t pt;
+	struct md_conf md;
+	int fd, error;
+
+	if (argc != 2)
+		exit(1);
+
+	md.md_addr = calloc(1, MDSIZE);
+	md.md_size = MDSIZE;
+	md.md_type = MD_UMEM_SERVER;
+
+	error = rump_daemonize_begin();
+	REQUIRE(error, "rump_daemonize_begin");
+
+	error = rump_init();
+	REQUIRE(error, "rump_init");
+
+	error = rump_init_server("unix://commsock");
+	REQUIRE(error, "init server");
+
+	if ((fd = rump_sys_open(argv[1], O_RDWR)) == -1)
+		err(1, "open");
+
+	/*
+	 * Now, configuring the md driver also causes our process
+	 * to start acting as the worker for the md.  Splitting it
+	 * into two steps in the driver is not easy, since md is
+	 * supposed to be unconfigured when the process dies
+	 * (process may exit between calling ioctl1 and ioctl2).
+	 * So, start a probe thread which attempts to read the md
+	 * and declares the md as configured when the read is
+	 * succesful.
+	 */
+	error = pthread_create(&pt, NULL, prober, argv[1]);
+	REQUIRE(error, "pthread_create");
+	pthread_detach(pt);
+
+	if (rump_sys_ioctl(fd, MD_SETCONF, &md) == -1) {
+		rump_daemonize_done(errno);
+		exit(1);
+	}
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/dev/md/t_md.sh b/contrib/netbsd-tests/dev/md/t_md.sh
new file mode 100755
index 000000000000..85de73e80b23
--- /dev/null
+++ b/contrib/netbsd-tests/dev/md/t_md.sh
@@ -0,0 +1,65 @@
+#	$NetBSD: t_md.sh,v 1.7 2011/05/14 17:42:28 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawmd=/dev/rmd0${rawpart}
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+	atf_set "descr" "Check that md can be created, read and written"
+}
+
+basic_body()
+{
+
+	# Scope out raw part.  This is actually the *host* raw partition,
+	# but just let it slide for now, since they *should* be the same.
+	rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+
+	atf_check -s exit:0 $(atf_get_srcdir)/h_mdserv ${rawmd}
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=/bin/ls count=10 | rump.dd of=${rawmd} seek=100"
+	atf_check -s exit:0 -e ignore -x \
+	    "rump.dd if=${rawmd} skip=100 count=10 | dd of=testfile"
+	atf_check -s exit:0 -e ignore -o file:testfile dd if=/bin/ls count=10
+}
+
+basic_cleanup()
+{
+
+	env RUMP_SERVER=unix://commsock rump.halt
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/dev/raidframe/t_raid.sh b/contrib/netbsd-tests/dev/raidframe/t_raid.sh
new file mode 100755
index 000000000000..ae21eedf5e34
--- /dev/null
+++ b/contrib/netbsd-tests/dev/raidframe/t_raid.sh
@@ -0,0 +1,323 @@
+#! /usr/bin/atf-sh
+#	$NetBSD: t_raid.sh,v 1.12 2013/02/19 21:08:24 joerg Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
+rawraid=/dev/rraid0${rawpart}
+raidserver="rump_server -lrumpvfs -lrumpdev -lrumpdev_disk -lrumpdev_raidframe"
+
+makecfg()
+{
+	level=${1}
+	ncol=${2}
+
+	printf "START array\n1 ${ncol} 0\nSTART disks\n" > raid.conf
+	diskn=0
+	while [ ${ncol} -gt ${diskn} ] ; do
+		echo "/disk${diskn}" >> raid.conf
+		diskn=$((diskn+1))
+	done
+
+	printf "START layout\n32 1 1 ${level}\nSTART queue\nfifo 100\n" \
+	    >> raid.conf
+}
+
+atf_test_case smalldisk cleanup
+smalldisk_head()
+{
+	atf_set "descr" "Checks the raidframe works on small disks " \
+	    "(PR kern/44239)"
+	atf_set "require.progs" "rump_server"
+}
+
+smalldisk_body()
+{
+	makecfg 1 2
+	export RUMP_SERVER=unix://sock
+	atf_check -s exit:0 ${raidserver}			\
+	    -d key=/disk0,hostpath=disk0.img,size=1m		\
+	    -d key=/disk1,hostpath=disk1.img,size=1m		\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+}
+
+smalldisk_cleanup()
+{
+	export RUMP_SERVER=unix://sock
+	rump.halt
+}
+
+
+# make this smaller once 44239 is fixed
+export RAID_MEDIASIZE=32m
+
+atf_test_case raid1_compfail cleanup
+raid1_compfail_head()
+{
+	atf_set "descr" "Checks that RAID1 works after component failure"
+	atf_set "require.progs" "rump_server"
+}
+
+raid1_compfail_body()
+{
+	makecfg 1 2
+	export RUMP_SERVER=unix://sock
+	atf_check -s exit:0 ${raidserver}				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+	atf_check -s exit:0 rump.raidctl -I 12345 raid0
+	atf_check -s exit:0 -o ignore rump.raidctl -iv raid0
+
+	# put some data there
+	atf_check -s exit:0 -e ignore \
+	    dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=testfile | rump.dd of=${rawraid} conv=sync"
+
+	# restart server with failed component
+	rump.halt
+	rm disk1.img # FAIL
+	atf_check -s exit:0 ${raidserver}				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -c raid.conf raid0
+
+	# check if we we get what we wrote
+	atf_check -s exit:0 -o file:testfile -e ignore \
+	    rump.dd if=${rawraid} count=4
+}
+
+raid1_compfail_cleanup()
+{
+	export RUMP_SERVER=unix://sock
+	rump.halt
+}
+
+
+
+atf_test_case raid1_comp0fail cleanup
+raid1_comp0fail_head()
+{
+	atf_set "descr" "Checks configuring RAID1 after component 0 fails" \
+		"(PR kern/44251)"
+	atf_set "require.progs" "rump_server"
+}
+
+raid1_comp0fail_body()
+{
+	makecfg 1 2
+	export RUMP_SERVER=unix://sock
+	atf_check -s exit:0 ${raidserver}				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+	atf_check -s exit:0 rump.raidctl -I 12345 raid0
+	atf_check -s exit:0 -o ignore rump.raidctl -iv raid0
+
+	# restart server with failed component
+	rump.halt
+	rm disk0.img # FAIL
+	atf_check -s exit:0 ${raidserver} 				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -c raid.conf raid0
+}
+
+raid1_comp0fail_cleanup()
+{
+	export RUMP_SERVER=unix://sock
+	rump.halt
+}
+
+atf_test_case raid1_normal cleanup
+raid1_normal_head()
+{
+	atf_set "descr" "Checks that RAID1 -c configurations work " \
+		"in the normal case"
+	atf_set "require.progs" "rump_server"
+}
+
+raid1_normal_body()
+{
+	makecfg 1 2
+	export RUMP_SERVER=unix://sock
+        atf_check -s exit:0 ${raidserver}                               \
+            -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}     \
+            ${RUMP_SERVER}
+
+        atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+        atf_check -s exit:0 rump.raidctl -I 12345 raid0
+        atf_check -s exit:0 -o ignore rump.raidctl -iv raid0
+
+        # put some data there
+        atf_check -s exit:0 -e ignore \
+            dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
+        atf_check -s exit:0 -e ignore -x \
+            "dd if=testfile | rump.dd of=${rawraid} conv=sync"
+
+        # restart server, disks remain normal 
+        rump.halt
+
+        atf_check -s exit:0 ${raidserver}                               \
+            -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}     \
+            ${RUMP_SERVER}
+
+        atf_check -s exit:0 rump.raidctl -c raid.conf raid0
+
+        # check if we we get what we wrote
+        atf_check -s exit:0 -o file:testfile -e ignore \
+            rump.dd if=${rawraid} count=4
+
+}
+
+raid1_normal_cleanup()
+{       
+        export RUMP_SERVER=unix://sock
+        rump.halt
+}
+
+
+atf_test_case raid5_compfail cleanup
+raid5_compfail_head()
+{
+	atf_set "descr" "Checks that RAID5 works after component failure"
+	atf_set "require.progs" "rump_server"
+}
+
+raid5_compfail_body()
+{
+	makecfg 5 3
+	export RUMP_SERVER=unix://sock
+	atf_check -s exit:0 ${raidserver}				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+	atf_check -s exit:0 rump.raidctl -I 12345 raid0
+	atf_check -s exit:0 -o ignore rump.raidctl -iv raid0
+
+	# put some data there
+	atf_check -s exit:0 -e ignore \
+	    dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=testfile | rump.dd of=${rawraid} conv=sync"
+
+	# restart server with failed component
+	rump.halt
+	rm disk2.img # FAIL
+	atf_check -s exit:0 ${raidserver}				\
+	    -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}	\
+	    -d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE}	\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.raidctl -c raid.conf raid0
+
+	# check if we we get what we wrote
+	atf_check -s exit:0 -o file:testfile -e ignore \
+	    rump.dd if=${rawraid} count=4
+}
+
+raid5_compfail_cleanup()
+{
+	export RUMP_SERVER=unix://sock
+	rump.halt
+}
+
+atf_test_case raid5_normal cleanup
+raid5_normal_head()
+{
+        atf_set "descr" "Checks that RAID5 works after normal shutdown " \
+		"and 'raidctl -c' startup"
+	atf_set "require.progs" "rump_server"
+}
+
+raid5_normal_body()
+{
+        makecfg 5 3
+        export RUMP_SERVER=unix://sock
+        atf_check -s exit:0 ${raidserver}                               \
+            -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE}     \
+            ${RUMP_SERVER}
+
+        atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+        atf_check -s exit:0 rump.raidctl -I 12345 raid0
+        atf_check -s exit:0 -o ignore rump.raidctl -iv raid0
+
+        # put some data there
+        atf_check -s exit:0 -e ignore \
+            dd if=$(atf_get_srcdir)/t_raid of=testfile count=4
+        atf_check -s exit:0 -e ignore -x \
+            "dd if=testfile | rump.dd of=${rawraid} conv=sync"
+
+        # restart server after normal shutdown
+        rump.halt
+
+        atf_check -s exit:0 ${raidserver}                               \
+            -d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE}     \
+            -d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE}     \
+            ${RUMP_SERVER}
+
+        atf_check -s exit:0 rump.raidctl -c raid.conf raid0
+
+        # check if we we get what we wrote
+        atf_check -s exit:0 -o file:testfile -e ignore \
+            rump.dd if=${rawraid} count=4
+}
+
+raid5_normal_cleanup()
+{
+        export RUMP_SERVER=unix://sock
+        rump.halt
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case smalldisk
+	atf_add_test_case raid1_normal
+	atf_add_test_case raid1_comp0fail
+	atf_add_test_case raid1_compfail
+	atf_add_test_case raid5_normal
+	atf_add_test_case raid5_compfail
+}
diff --git a/contrib/netbsd-tests/dev/scsipi/libscsitest/SCSITEST.ioconf b/contrib/netbsd-tests/dev/scsipi/libscsitest/SCSITEST.ioconf
new file mode 100644
index 000000000000..afee6c80bd58
--- /dev/null
+++ b/contrib/netbsd-tests/dev/scsipi/libscsitest/SCSITEST.ioconf
@@ -0,0 +1,12 @@
+#	$NetBSD: SCSITEST.ioconf,v 1.1 2014/04/24 21:46:44 pooka Exp $
+#
+
+ioconf scsitest
+
+include "conf/files"
+include "dev/scsipi/files.scsipi"
+include "rump/dev/files.rump"
+
+pseudo-root mainbus*
+
+scsitest0 at mainbus?
diff --git a/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.c b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.c
new file mode 100644
index 000000000000..8f214f783d8c
--- /dev/null
+++ b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.c
@@ -0,0 +1,259 @@
+/*	$NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * A SCSI target which is useful for debugging our scsipi driver stack.
+ * Currently it pretends to be a single CD.
+ *
+ * Freely add the necessary features for your tests.  Just remember to
+ * run the atf test suite to make sure you didn't cause regressions to
+ * other tests.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: scsitest.c,v 1.2 2014/04/25 00:24:39 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/atomic.h>
+#include <sys/buf.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/fcntl.h>
+
+#include <dev/scsipi/scsiconf.h>
+#include <dev/scsipi/scsipiconf.h>
+#include <dev/scsipi/scsi_disk.h>
+#include <dev/scsipi/scsipi_cd.h>
+#include <dev/scsipi/scsipi_all.h>
+
+#include <rump/rumpuser.h>
+
+#include "scsitest.h"
+
+int	scsitest_match(device_t, cfdata_t, void *);
+void	scsitest_attach(device_t, device_t, void *);
+
+struct scsitest {
+	struct scsipi_channel sc_channel;
+	struct scsipi_adapter sc_adapter;
+};
+
+CFATTACH_DECL_NEW(scsitest, sizeof(struct scsitest), scsitest_match,
+	scsitest_attach, NULL, NULL);
+
+/*
+ * tosi.iso can be used to deliver CD requests to a host file with the
+ * name in USE_TOSI_ISO (yes, it's extrasimplistic).
+ */
+//#define USE_TOSI_ISO
+
+#define CDBLOCKSIZE 2048
+static uint32_t mycdsize = 2048;
+static int isofd;
+
+#define MYCDISO "tosi.iso"
+
+unsigned rump_scsitest_err[RUMP_SCSITEST_MAXERROR];
+
+static void
+sense_notready(struct scsipi_xfer *xs)
+{
+	struct scsi_sense_data *sense = &xs->sense.scsi_sense;
+
+	xs->error = XS_SENSE;
+
+	sense->response_code = 0x70;
+	sense->flags = SKEY_NOT_READY;
+	sense->asc = 0x3A;
+	sense->ascq = 0x00;
+	sense->extra_len = 6;
+}
+
+/*
+ * This is pretty much a CD target for now
+ */
+static void
+scsitest_request(struct scsipi_channel *chan,
+	scsipi_adapter_req_t req, void *arg)
+{
+	struct scsipi_xfer *xs = arg;
+	struct scsipi_generic *cmd = xs->cmd;
+#ifdef USE_TOSI_ISO
+	int error;
+#endif
+
+	if (req != ADAPTER_REQ_RUN_XFER)
+		return;
+
+	//show_scsipi_xs(xs);
+
+	switch (cmd->opcode) {
+	case SCSI_TEST_UNIT_READY:
+		if (isofd == -1)
+			sense_notready(xs);
+
+		break;
+	case INQUIRY: {
+		struct scsipi_inquiry_data *inqbuf = (void *)xs->data;
+
+		memset(inqbuf, 0, sizeof(*inqbuf));
+		inqbuf->device = T_CDROM;
+		inqbuf->dev_qual2 = SID_REMOVABLE;
+		strcpy(inqbuf->vendor, "RUMPHOBO");
+		strcpy(inqbuf->product, "It's a LIE");
+		strcpy(inqbuf->revision, "0.00");
+		break;
+	}
+	case READ_CD_CAPACITY: {
+		struct scsipi_read_cd_cap_data *ret = (void *)xs->data;
+
+		_lto4b(CDBLOCKSIZE, ret->length);
+		_lto4b(mycdsize, ret->addr);
+
+		break;
+	}
+	case READ_DISCINFO: {
+		struct scsipi_read_discinfo_data *ret = (void *)xs->data;
+
+		memset(ret, 0, sizeof(*ret));
+		break;
+	}
+	case READ_TRACKINFO: {
+		struct scsipi_read_trackinfo_data *ret = (void *)xs->data;
+
+		_lto4b(mycdsize, ret->track_size);
+		break;
+	}
+	case READ_TOC: {
+		struct scsipi_toc_header *ret = (void *)xs->data;
+
+		memset(ret, 0, sizeof(*ret));
+		break;
+	}
+	case START_STOP: {
+		struct scsipi_start_stop *param = (void *)cmd;
+
+		if (param->how & SSS_LOEJ) {
+#ifdef USE_TOSI_ISO
+			rumpuser_close(isofd, &error);
+#endif
+			isofd = -1;
+		}
+		break;
+	}
+	case SCSI_SYNCHRONIZE_CACHE_10: {
+		if (isofd == -1) {
+			if ((xs->xs_control & XS_CTL_SILENT) == 0)
+				atomic_inc_uint(&rump_scsitest_err
+				    [RUMP_SCSITEST_NOISYSYNC]);
+			
+			sense_notready(xs);
+		}
+
+		break;
+	}
+	case GET_CONFIGURATION: {
+		memset(xs->data, 0, sizeof(struct scsipi_get_conf_data));
+		break;
+	}
+	case SCSI_READ_6_COMMAND: {
+#ifdef USE_TOSI_ISO
+		struct scsi_rw_6 *param = (void *)cmd;
+
+		printf("reading %d bytes from %d\n",
+		    param->length * CDBLOCKSIZE,
+		    _3btol(param->addr) * CDBLOCKSIZE);
+		rumpuser_pread(isofd, xs->data,
+		     param->length * CDBLOCKSIZE,
+		     _3btol(param->addr) * CDBLOCKSIZE,
+		     &error);
+#endif
+
+		break;
+	}
+	case SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL:
+		/* hardcoded for now */
+		break;
+	default:
+		printf("unhandled opcode 0x%x\n", cmd->opcode);
+		break;
+	}
+
+	scsipi_done(xs);
+}
+
+int
+scsitest_match(device_t parent, cfdata_t match, void *aux)
+{
+#ifdef USE_TOSI_ISO
+	uint64_t fsize;
+	int error, ft;
+
+	if (rumpuser_getfileinfo(MYCDISO, &fsize, &ft, &error))
+		return 0;
+	if (ft != RUMPUSER_FT_REG)
+		return 0;
+	mycdsize = fsize / CDBLOCKSIZE;
+
+	if ((isofd = rumpuser_open(MYCDISO, RUMPUSER_OPEN_RDWR, &error)) == -1)
+		return 0;
+#else
+	/*
+	 * We pretend to have a medium present initially, so != -1.
+	 */
+	isofd = -2;
+#endif
+
+	return 1;
+}
+
+void
+scsitest_attach(device_t parent, device_t self, void *aux)
+{
+	struct scsitest *sc = device_private(self);
+	
+	aprint_naive("\n");
+	aprint_normal("\n");
+
+	memset(&sc->sc_adapter, 0, sizeof(sc->sc_adapter));
+	sc->sc_adapter.adapt_nchannels = 1;
+	sc->sc_adapter.adapt_request = scsitest_request;
+	sc->sc_adapter.adapt_minphys = minphys;
+	sc->sc_adapter.adapt_dev = self;
+	sc->sc_adapter.adapt_max_periph = 1;
+	sc->sc_adapter.adapt_openings = 1;
+
+	memset(&sc->sc_channel, 0, sizeof(sc->sc_channel));
+	sc->sc_channel.chan_bustype = &scsi_bustype;
+	sc->sc_channel.chan_ntargets = 2;
+	sc->sc_channel.chan_nluns = 1;
+	sc->sc_channel.chan_id = 0;
+	sc->sc_channel.chan_flags = SCSIPI_CHAN_NOSETTLE;
+	sc->sc_channel.chan_adapter = &sc->sc_adapter;
+
+	config_found_ia(self, "scsi", &sc->sc_channel, scsiprint);
+}
diff --git a/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.h b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.h
new file mode 100644
index 000000000000..ba9b84a3f598
--- /dev/null
+++ b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest.h
@@ -0,0 +1,38 @@
+/*	$NetBSD: scsitest.h,v 1.1 2014/04/25 00:24:39 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 _RUMP_SCSITEST_H_
+#define _RUMP_SCSITEST_H_
+
+enum {
+	RUMP_SCSITEST_NOISYSYNC,
+	RUMP_SCSITEST_MAXERROR
+};
+
+extern unsigned rump_scsitest_err[RUMP_SCSITEST_MAXERROR];
+
+#endif /* _RUMP_SCSITEST_H_ */
diff --git a/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest_component.c b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest_component.c
new file mode 100644
index 000000000000..db0e209ad322
--- /dev/null
+++ b/contrib/netbsd-tests/dev/scsipi/libscsitest/scsitest_component.c
@@ -0,0 +1,46 @@
+/*	$NetBSD: scsitest_component.c,v 1.1 2014/04/24 21:46:44 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: scsitest_component.c,v 1.1 2014/04/24 21:46:44 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+	config_init_component(cfdriver_ioconf_scsitest,
+	    cfattach_ioconf_scsitest, cfdata_ioconf_scsitest);
+}
diff --git a/contrib/netbsd-tests/dev/scsipi/t_cd.c b/contrib/netbsd-tests/dev/scsipi/t_cd.c
new file mode 100644
index 000000000000..58e61a564ea0
--- /dev/null
+++ b/contrib/netbsd-tests/dev/scsipi/t_cd.c
@@ -0,0 +1,81 @@
+/*	$NetBSD: t_cd.c,v 1.7 2014/04/25 00:24:39 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <util.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "scsitest.h"
+
+#include "../../h_macros.h"
+
+ATF_TC(noisyeject);
+ATF_TC_HEAD(noisyeject, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test for CD eject noisyness "
+	    "(PR kern/43785)");
+}
+
+ATF_TC_BODY(noisyeject, tc)
+{
+	static char fname[] = "/dev/rcd0_";
+	int part, fd, arg = 0;
+
+	RL(part = getrawpartition());
+	fname[strlen(fname)-1] = 'a' + part;
+	rump_init();
+	/*
+	 * Rump CD emulation has been fixed, so no longer a problem.
+	 *
+	atf_tc_expect_signal(SIGSEGV, "PR kern/47646: Broken test or "
+	    "a real problem in rump or the driver");
+	 */
+	RL(fd = rump_sys_open(fname, O_RDWR));
+	RL(rump_sys_ioctl(fd, DIOCEJECT, &arg));
+
+	ATF_REQUIRE_EQ(rump_scsitest_err[RUMP_SCSITEST_NOISYSYNC], 0);
+	RL(rump_sys_close(fd));
+	// atf_tc_expect_fail("PR kern/43785");
+	ATF_REQUIRE_EQ(rump_scsitest_err[RUMP_SCSITEST_NOISYSYNC], 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, noisyeject);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh b/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh
new file mode 100755
index 000000000000..5b54431fad85
--- /dev/null
+++ b/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh
@@ -0,0 +1,398 @@
+# $NetBSD: t_swsensor.sh,v 1.7 2013/04/14 16:07:46 martin Exp $
+
+get_sensor_info() {
+	rump.envstat -x | \
+	sed -e "\;swsensor;,\;/array;p" -e "d"
+}
+
+get_sensor_key() {
+	get_sensor_info | grep -A1 $1 | grep integer | sed -e 's;<[/a-z]*>;;g'
+}
+
+get_powerd_event_count() {
+	grep "not running" powerd.log | wc -l
+}
+
+get_rnd_bits_count() {
+	env RUMPHIJACK=blanket=/dev/random:/dev/urandom	\
+	    RUMP_SERVER=unix://t_swsensor_socket	\
+	    LD_PRELOAD=/usr/lib/librumphijack.so	  rndctl -l | \
+	grep "swsensor-sensor" | \
+	awk '{print $2}'
+}
+
+check_powerd_event() {
+	event=$(grep "not running" powerd.log | \
+		sed -e "$1p" -e "d" )
+	event=${event##*//}
+	script=${event%% *}
+	event=${event#* }
+	device=${event%% *}
+	event=${event#* }
+	state=${event%% *}
+	sensor=${event#* }
+	sensor=${sensor% *}
+
+	if [ "${script}" != "sensor_indicator" ] ; then
+		echo "Event uses wrong script: ${script}"
+	elif [ "${device}" != "swsensor" ] ; then
+		echo "Event uses wrong device: ${device}"
+	elif [ "${sensor}" != "sensor" ] ; then
+		echo "Event uses wrong sensor: ${sensor}"
+	elif [ "${state}" != "$2" ] ; then
+		echo "Event uses wrong state: ${state}"
+	fi
+}
+
+# Start the rump server, then load the swsensor module with the
+# requested properties
+
+start_rump() {
+	rump_allserver -l rumpvfs -l rumpdev -l rumpdev_sysmon ${RUMP_SERVER}
+	if [ $( get_sensor_info | wc -l ) -ne 0 ] ; then
+		rump.modunload swsensor
+		rump.modload -f $1 swsensor
+	else
+		rump.modload $1 swsensor
+	fi
+	return $?
+}
+
+common_head() {
+	atf_set	descr		"$1"
+	atf_set	timeout		60
+	atf_set	require.progs	rump.powerd rump.envstat rump.modload	\
+				rump.halt   rump.sysctl  rump_server	\
+				sed         grep         awk		\
+				rndctl      expr
+}
+
+common_cleanup() {
+	rump.modunload swsensor
+	rump.halt
+}
+
+create_envsys_conf_files() {
+	cat << ENV0 > env0.conf
+	swsensor {
+		refresh-timeout = 2s;
+	}
+ENV0
+	cat << ENV1 > env1.conf
+	swsensor {
+		sensor0 { critical-min = $(( $1 - $2 )); }
+	}
+ENV1
+	cat << ENV2 > env2.conf
+	swsensor {
+		sensor0 { critical-min = $1; }
+	}
+ENV2
+}
+
+# Test body common to all sensors
+#	$1	sensor mode
+#	$2	initial sensor value
+#	$3	initial limit
+#	$4	amount to lower limit
+#	$5	difference from limit to trigger event
+#	$6	sensor flags, for FHAS_ENTROPY and FMONNOTSUPP
+
+common_body() {
+	# Start the rump-server process and load the module
+	modload_args="-i mode=$1 -i value=$2 -i limit=$3 ${6:+-i flags=$6}"
+	start_rump "$modload_args"
+
+	# create configuration files for updates
+	create_envsys_conf_files $3 $4
+
+	if [ $? -ne 0 ] ; then
+		atf_skip "Cannot set-up rump environment"
+	fi
+
+	# start powerd so we can detect sensor events
+	rump.powerd -n -d > powerd.log 2>&1 &
+	if [ -z "$(jobs)" ] ; then
+		skip_events=1
+		echo "Skipping event sub-tests - powerd did not start"
+	else
+		skip_events=0
+		expected_event=1
+	fi
+
+	# Step 0 - verify that sensor is registered
+	get_sensor_info | grep -q swsensor ||
+		atf_fail "0: Device swsensor not registered"
+
+	# Step 1 - update the refresh-timeout and verify
+	# (use $(( ... )) since the timeout is displayed in hex!)
+	rump.envstat -c env0.conf
+	if [ $(( $( get_sensor_key refresh-timeout ) )) -ne 2 ] ; then
+		atf_fail "1: Could not set refresh-timout to 2s"
+	fi
+
+	# Step 2 - verify that we can read sensor's value
+	if [ $1 -ne 0 -a $( get_sensor_key cur-value ) -ne $2 ] ; then
+		atf_fail "2: Value not available"
+	fi
+
+	# Step 3 - verify that changes in sensor value are seen
+	rump.sysctl -w hw.swsensor.cur_value=$(( $2 + 1 ))
+	if [ $( get_sensor_key cur-value ) -ne $(( $2 + 1 )) ] ; then
+		atf_fail "3: Value not updated"
+	fi
+
+	# Step 4 - if sensor provides hw limit, make sure we can read it
+	if [ $1 -ne 0 ] ; then
+		if [ $( get_sensor_key critical-min ) -ne $3 ] ; then
+			atf_fail "4: Limit not set by device"
+		fi
+	fi
+
+	# Step 5 - if sensor provides hw limit, make sure it works
+	if [ $1 -ne 0 -a ${skip_events} -eq 0 ] ; then
+		rump.sysctl -w hw.swsensor.cur_value=$(( $3 - $5 ))
+		sleep 5
+		cnt=$(get_powerd_event_count)
+		if [ ${cnt} -lt ${expected_event} ] ; then
+			atf_fail "5: No event triggered"
+		elif [ ${cnt} -gt ${expected_event} ] ; then
+			atf_fail "5: Multiple events triggered"
+		fi
+		evt=$( check_powerd_event ${cnt} "critical-under")
+		if [ -n "${evt}" ] ; then
+			atf_fail "5: ${evt}"
+		fi
+		expected_event=$(( 1 + ${expected_event} ))
+	fi
+
+	# Step 6 - verify that we return to normal state
+	if [ $1 -ne 0 -a ${skip_events} -eq 0 ] ; then
+		rump.sysctl -w hw.swsensor.cur_value=$(( $3 + $5 ))
+		sleep 5
+		cnt=$(get_powerd_event_count)
+		if [ ${cnt} -lt ${expected_event} ] ; then
+			atf_fail "6: No event triggered"
+		elif [ ${cnt} -gt ${expected_event} ] ; then
+			atf_fail "6: Multiple events triggered"
+		fi
+		evt=$( check_powerd_event ${cnt} "normal")
+		if [ -n "${evt}" ] ; then
+			atf_fail "6: ${evt}"
+		fi
+		expected_event=$(( 1 + ${expected_event} ))
+	fi
+
+	# Step 7 - verify that we can set our own limit
+
+	# Steps 7 thru 12 are skipped if the sensor cannot be monitored
+	if [ $( expr \( 0$6 / 2048 \) % 2 ) -ne 1 ] ; then
+		rump.envstat -c env1.conf
+		if [ $( get_sensor_key critical-min ) -ne $(( $3 - $4 )) ] ; then
+			atf_fail "7: Limit not set by envstat -c"
+		fi
+
+	# Step 8 - make sure user-set limit works
+		if [ ${skip_events} -eq 0 ] ; then
+			rump.sysctl -w hw.swsensor.cur_value=$(( $3 - $4 - $5 ))
+			sleep 5
+			cnt=$(get_powerd_event_count)
+			if [ ${cnt} -lt ${expected_event} ] ; then
+				atf_fail "8: No event triggered"
+			elif [ ${cnt} -gt ${expected_event} ] ; then
+				atf_fail "8: Multiple events triggered"
+			fi
+			evt=$( check_powerd_event ${cnt} "critical-under")
+			if [ -n "${evt}" ] ; then
+				atf_fail "8: ${evt}"
+			fi
+			expected_event=$(( 1 + ${expected_event} ))
+		fi
+
+	# Step 9 - verify that we return to normal state
+		if [ ${skip_events} -eq 0 ] ; then
+			rump.sysctl -w hw.swsensor.cur_value=$(( $3 - $4 + $5 ))
+			sleep 5
+			cnt=$(get_powerd_event_count)
+			if [ ${cnt} -lt ${expected_event} ] ; then
+				atf_fail "9: No event triggered"
+			elif [ ${cnt} -gt ${expected_event} ] ; then
+				atf_fail "9: Multiple events triggered"
+			fi
+			evt=$( check_powerd_event ${cnt} "normal")
+			if [ -n "${evt}" ] ; then
+				atf_fail "9: ${evt}"
+			fi
+			expected_event=$(( 1 + ${expected_event} ))
+		fi
+
+	# Step 10 - reset to defaults
+		rump.envstat -S
+		if [ $1 -eq 0 ] ; then
+			get_sensor_info | grep -q critical-min &&
+				atf_fail "10: Failed to clear a limit with envstat -S"
+		else
+			if [ $( get_sensor_key critical-min ) -ne $3 ] ; then
+				atf_fail "10: Limit not reset to initial value"
+			fi
+		fi
+
+	# Step 11 - see if more events occur
+		if [ ${skip_events} -eq 0 ] ; then
+			rump.envstat -c env0.conf
+			rump.sysctl -w hw.swsensor.cur_value=$(( $3 - $4 - $5 ))
+			sleep 5
+			cnt=$(get_powerd_event_count)
+			if [ ${cnt} -ge ${expected_event} ] ; then
+				if [ $1 -ne 2 ] ; then
+					atf_fail "11b Event triggered after reset"
+				fi
+				evt=$( check_powerd_event ${cnt} "critical-under")
+				if [ -n "${evt}" ] ; then
+					atf_fail "11a: ${evt}"
+				fi
+			fi
+		fi
+
+	# Step 12 - make sure we can set new limits once more
+		rump.envstat -c env2.conf
+		if [ $( get_sensor_key critical-min ) -ne $3 ] ; then
+			atf_fail "12a: Limit not reset to same value"
+		fi
+		rump.envstat -c env1.conf
+		if [ $( get_sensor_key critical-min ) -ne $(( $3 - $4 )) ] ; then
+			atf_fail "12b: Limit not reset to new value"
+		fi
+	fi
+
+	# Step 13 - confirm registration (or lack thereof) with rndctl
+	rnd_bits=$( get_rnd_bits_count )
+	if [ $( expr \( 0$6 / 8192 \) % 2 ) -eq 1 ] ; then
+		if [ -z "$rnd_bits" ] ; then
+			atf_fail "13a: Not registered with rndctl"
+		fi
+	else
+		if [ -n "$rnd_bits" ] ; then
+			atf_fail "13b: Wrongly registered with rndctl"
+		fi
+	fi
+
+	# Steps 14 and 15 are only if sensor is providing entropy
+	if [ $( expr \( 0$6 / 8192 \) % 2 ) -ne 1 ] ; then
+		return
+	fi
+
+	# Step 14 - make sure entropy collected when device is being polled
+	rump.envstat -c env0.conf
+	rump.sysctl -w hw.swsensor.cur_value=$3
+	sleep 5
+	rump.sysctl -w hw.swsensor.cur_value=$(( $3 + $4 ))
+	sleep 5
+	new_rnd_bits=$( get_rnd_bits_count )
+	if [ $new_rnd_bits -le $rnd_bits ] ; then
+		atf_expect_fail "PR kern/47661"
+		atf_fail "14a: entropy bits did not increase after polling"
+	fi
+	rnd_bits=$new_rnd_bits
+	sleep 5
+	new_rnd_bits=$( get_rnd_bits_count )
+	if [ $new_rnd_bits -gt $rnd_bits ] ; then
+		atf_expect_fail "PR kern/47661"
+		atf_fail "14b: entropy bits increased after poll with no value change"
+	fi
+
+	# Step 15 - make sure entropy collected when device is interrogated
+	# 
+	rump.envstat -c env0.conf
+	rump.sysctl -w hw.swsensor.cur_value=$3
+	get_sensor_key cur-value
+	rnd_bits=$( get_rnd_bits_count )
+	rump.sysctl -w hw.swsensor.cur_value=$(( $3 + $4 ))
+	get_sensor_key cur-value
+	new_rnd_bits=$( get_rnd_bits_count )
+	if [ $new_rnd_bits -le $rnd_bits ] ; then
+		atf_expect_fail "PR kern/47661"
+		atf_fail "15a: entropy bits did not increase after interrogation"
+	fi
+	rnd_bits=$new_rnd_bits
+	get_sensor_key cur-value
+	new_rnd_bits=$( get_rnd_bits_count )
+	if [ $new_rnd_bits -gt $rnd_bits ] ; then
+		atf_expect_fail "PR kern/47661"
+		atf_fail "15b: entropy bits increased after interrogation with no value change"
+	fi
+}
+
+atf_test_case simple_sensor cleanup
+simple_sensor_head() {
+	common_head "Test a simple sensor"
+}
+
+simple_sensor_body() {
+	common_body 0 50 30 10 1
+}
+
+simple_sensor_cleanup() {
+	common_cleanup
+}
+
+atf_test_case limit_sensor cleanup
+limit_sensor_head() {
+	common_head "Test a sensor with internal limit"
+}
+
+limit_sensor_body() {
+	common_body 1 45 25 8 2
+}
+
+limit_sensor_cleanup() {
+	common_cleanup
+}
+
+atf_test_case alarm_sensor cleanup
+alarm_sensor_head() {
+	common_head "Test a sensor with internal checking"
+}
+
+alarm_sensor_body() {
+	common_body 2 40 20 6 3
+}
+
+alarm_sensor_cleanup() {
+	common_cleanup
+}
+
+atf_test_case entropy_polled_sensor cleanup
+entropy_polled_sensor_head() {
+	common_head "Test a simple sensor that provides entropy"
+}
+
+entropy_polled_sensor_body() {
+	common_body 0 50 30 10 1 8192
+}
+
+entropy_polled_sensor_cleanup() {
+	common_cleanup
+}
+
+atf_test_case entropy_interrupt_sensor cleanup
+entropy_interrupt_sensor_head() {
+	common_head "Test a sensor that provides entropy without polling"
+}
+
+entropy_interrupt_sensor_body() {
+	common_body 0 50 30 10 1 10240
+}
+
+entropy_interrupt_sensor_cleanup() {
+	common_cleanup
+}
+
+atf_init_test_cases() {
+	RUMP_SERVER="unix://t_swsensor_socket" ; export RUMP_SERVER
+	atf_add_test_case simple_sensor
+	atf_add_test_case limit_sensor
+	atf_add_test_case alarm_sensor
+	atf_add_test_case entropy_polled_sensor
+	atf_add_test_case entropy_interrupt_sensor
+}
diff --git a/contrib/netbsd-tests/dev/sysmon/t_swwdog.c b/contrib/netbsd-tests/dev/sysmon/t_swwdog.c
new file mode 100644
index 000000000000..19e3795f0b59
--- /dev/null
+++ b/contrib/netbsd-tests/dev/sysmon/t_swwdog.c
@@ -0,0 +1,192 @@
+/*	$NetBSD: t_swwdog.c,v 1.5 2011/06/26 12:14:59 christos Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/wdog.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+static volatile sig_atomic_t tcount;
+
+static void
+sigcount(int sig)
+{
+
+	assert(sig == SIGUSR1);
+	tcount++;
+}
+
+/*
+ * Since we are testing for swwdog's ability to reboot/panic, we need
+ * to fork and monitor the exit status from the parent and report
+ * something sensible back to atf.
+ */
+static int
+testbody(int max)
+{
+	char wname[WDOG_NAMESIZE];
+	struct wdog_conf wc;
+	struct wdog_mode wm;
+	pid_t p1, p2;
+	int status;
+	int fd;
+
+	signal(SIGUSR1, sigcount);
+
+	switch ((p1 = fork())) {
+	case 0:
+		break;
+	case -1:
+		atf_tc_fail_errno("fork");
+		break;
+	default:
+		p2 = wait(&status);
+		ATF_REQUIRE_EQ(p1, p2);
+		ATF_REQUIRE_EQ(tcount, max);
+		return status;
+	}
+
+	rump_init();
+
+	fd = rump_sys_open("/dev/watchdog", O_RDWR);
+	if (fd == -1)
+		err(1, "open watchdog");
+
+	wc.wc_count = 1;
+	wc.wc_names = wname;
+
+	if (rump_sys_ioctl(fd, WDOGIOC_GWDOGS, &wc) == -1)
+		err(1, "can't fetch watchdog names");
+
+	if (wc.wc_count) {
+		assert(wc.wc_count == 1);
+
+		strlcpy(wm.wm_name, wc.wc_names, sizeof(wm.wm_name));
+		wm.wm_mode = WDOG_MODE_ETICKLE;
+		wm.wm_period = 1;
+		if (rump_sys_ioctl(fd, WDOGIOC_SMODE, &wm) == -1)
+			atf_tc_fail_errno("failed to set tickle");
+
+		usleep(400000);
+		if (max == 1)
+			rump_sys_ioctl(fd, WDOGIOC_TICKLE);
+		else {
+			wm.wm_mode = WDOG_MODE_DISARMED;
+			rump_sys_ioctl(fd, WDOGIOC_SMODE, &wm);
+		}
+		kill(getppid(), SIGUSR1);
+
+		sleep(2);
+		printf("staying alive\n");
+		kill(getppid(), SIGUSR1);
+		_exit(2);
+	}
+	/* fail */
+	_exit(1);
+}
+
+ATF_TC(reboot);
+ATF_TC_HEAD(reboot, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check swwdog reboot capability");
+}
+
+ATF_TC_BODY(reboot, tc)
+{
+	extern bool rumpns_swwdog_reboot;
+	int status;
+
+	/* XXX: should use sysctl */
+	rumpns_swwdog_reboot = true;
+	status = testbody(1);
+
+	ATF_REQUIRE(WIFEXITED(status));
+	ATF_REQUIRE_EQ(WEXITSTATUS(status), 0);
+}
+
+ATF_TC(panic);
+ATF_TC_HEAD(panic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check swwdog panic capability");
+}
+
+ATF_TC_BODY(panic, tc)
+{
+	extern bool rumpns_swwdog_reboot;
+	int status;
+
+	/* XXX: should use sysctl */
+	rumpns_swwdog_reboot = false;
+	status = testbody(1);
+
+	ATF_REQUIRE(WIFSIGNALED(status));
+	ATF_REQUIRE_EQ(WTERMSIG(status), SIGABRT);
+}
+
+ATF_TC(disarm);
+ATF_TC_HEAD(disarm, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check swwdog disarm capability");
+}
+
+ATF_TC_BODY(disarm, tc)
+{
+	int status;
+
+	status = testbody(2);
+
+	ATF_REQUIRE(WIFEXITED(status));
+	ATF_REQUIRE_EQ(WEXITSTATUS(status), 2);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, panic);
+	ATF_TP_ADD_TC(tp, reboot);
+	ATF_TP_ADD_TC(tp, disarm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/cd9660/pr_48787.image.bz2.uue b/contrib/netbsd-tests/fs/cd9660/pr_48787.image.bz2.uue
new file mode 100644
index 000000000000..d8f7488f36d2
--- /dev/null
+++ b/contrib/netbsd-tests/fs/cd9660/pr_48787.image.bz2.uue
@@ -0,0 +1,103 @@
+begin 644 pr_48787.image.bz2
+M0EIH.3%!62936>D^3`0``+M_V?_7U17T!W_H/^_?8..V$"1DB`0``B$`0I-H
+MP`+N-!HLI8)131H4](]3TC(VH`S4;4````T&@R&C0R:!*$1D(8B:C!,(Q-&3
+M-`!,``"&:`FC'&AH&C3(TT:9`8F"``&@-`:9`8$R`J1(A&A$R&391FA#TC0V
+MHQ'J8@&T@VHT`QII&Z!"B5;S7YT+1"ZB8Y+5"M,5_J`!]Y:[$2%,%W`ZAA2@
+MVE)'DK^*?'3QU`DFQ4@22)(B[N3GZN?E<)`DDB.C)7\X71*B1K*2))(DD1HI
+MU5$TUVF[4JP89^FHY$B*FEBC(RN$5"8O'XO]1++(._=;ZKXR%:QK3^W7/>RT
+M8EODZ#MX53U8C0F]6O.G4J/9YNQA$B2))$<[<CT.C.)G[#NK)A3#\KM]#AP,
+M*V*=Z35CIY9O/Q-6T7&8=_%R-%>H5(]"2=])+_3RW)O*AI[)<ZVSDZ"I-3B2
+M3;T^%)3LM2^.3I+<>9@D^JV5RK3?43-;"G;69#AH8,(5;:7UN,<5%98$9;9;
+M\G*RT*37_9[;D'P/`1(R-$D.!36\S6N:_M>!][4*&3?'S858VCD+-3PINFR8
+M,C9?J+9ME:9.,_OR\C;3K'27W:K<<&>MMC;<YN*;!H83)Y-+"BCM6:&H"OT2
+M-]XWT/ZSW69R8]UG%S8IV5)$%2X)\%PF)G>HS".>68$Y&.B608>JM?)+3$:Z
+MY539A<7-E*'_YY..1'ECZBIG5%1%U93-9*1-5T_C!\)&2@?*CQB>(Q\0G(J<
+M6%PDB4L,2$>Q4IM%6A+%4K/0-!7*348,9!&#<9@JNP&+LBI>+9&*JC6ZE293
+MY%-8H^HI12#5$9J;"0@$DA.](1+1.SH#B10&H6C48:PMPI7=#M2A@I%'\J2P
+M.Y(+0C:B.&>F(^[(>)1+M\+QH%@O#4OE(\RE*14IZ7+9R*G8IYV^O=Y<=4HY
+M1C@SCIZ=$<UY5X+M6FT2)(DD1O#AYE/_]9B@K),IK(<$\6^`K\<@`&````00
+M`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8
+MH*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@
+M`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0
+M$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$
+M\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``
+M&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@
+MK),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``
+M8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2
+MU(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q
+M;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``8
+M0":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"L
+MDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@
+M```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4
+MA4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O
+M@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`
+M)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3
+M*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&``
+M``00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%
+M0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`
+MK\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`F
+MHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),I
+MK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```
+M!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`
+M2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"O
+MQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C
+M(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFL
+MAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$
+M$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+
+MF*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'
+M(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A
+M4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'
+M!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00
+M`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8
+MH*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@
+M`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0
+M$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$
+M\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``
+M&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@
+MK),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``
+M8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2
+MU(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q
+M;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``8
+M0":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"L
+MDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@
+M```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4
+MA4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O
+M@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`
+M)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3
+M*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&``
+M``00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%
+M0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`
+MK\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`F
+MHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),I
+MK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```
+M!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`
+M2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"O
+MQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$$``80":C
+M(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+F*"LDRFL
+MAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'(`!@```$
+M$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A4!+4A4!+
+MF*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'!/%O@*_'
+M(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00`!A`)J,A
+M4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8H*R3*:R'
+M!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(<$\6^`K\<@`&````00
+M`!A`)J,A4!+4A4!+F*"LDRFLAP3Q;X"OQR``8```!!``&$`FHR%0$M2%0$N8
+MH*R3*:R'!/%O@*_'(`!@```$$``80":C(5`2U(5`2YB@K),IK(KI-J(`.S;_
+M[O_KZIKZ`[_T'_?OL''[3!(R1`(```"`(``A3^1@`6=-9:!3`DD(:)ZC%)Z9
+M33:@>DT]"`>IH&@`#1Z)M3"-#(T#$4:I[4U`/4T-````````````!PT-&31H
+MT::&1D,(`R`&0::``!D#(`D4IZIZ0-`T````````````]&II7`12+EV$9U/B
+MB!*_@T]?CB(F_;A17-%[AD,R8`JV@70VUC,Y6`FQ"$@1<L2$)(`2[M+DHCF`
+M0)`D)8!-P/',(82"IS(@R>@M3"$@0)"3F`Y&Q/<D<N339,\$GB`#`Q1SK=@R
+M<HD1R!2\A(3.H3EOJB05)8.6&%6&J\9CF>$XJBC2?^*)EA9:/'NE+<&E/_K^
+M-Z0($"0E11*I%KQK=*`$'<N+G-F@9[YHI1'6M:8%.$2785901!%"0`U7%A/<
+MPA@I4`8&N@"3L[Y!8V2Y*M8>NO&"YPP%*V4`5T>42;8B[:=M@:9#;@')!UFD
+M8$)CB(&5G68PD`TD`[D"*AV+N\79)G^Q/SOS[CLC2P3T;\WCMH#X(5\++`-#
+ML-+?DXEFS9H@P06,,HP2-X<1W%B*AY`JW`=,R?NG%O?)8;N6134$BXK2#F&&
+M*"8&QUDIX$R\2.;XAFVSP/=K'6.!M8;%=UGWD84CA7$<.IJ0]NS'LEV@J(Q[
+MA='$&9W%-><1MMG8-JCG-DG+D,4"H>!`EJIEKV61?:5TW2M97U?>B%$S@N0G
+M4!Q5$=A,ES!<J\):&C=5);/*T,$9.=>Z%;4P):4`FG@`X=YHB%#"PIU084Y4
+M<J@33)%J*]&*'15=HQ"PK3%#K"--<BB@FF*H%$2]4Y]`\FT7`^32RN'76OEC
+M>@/JFD\8E9G8Y\8:0TJYP'=17J(:!3R>)1/FE%'Z2XBYRI259/935.OC-50:
+M#[&,:!IG0R$A"P8>:89+I+'"&$B")A'5G8B+ZJ14JXH:'.:@IH0&T(0($A+"
+/#6J,VO\7<D4X4)!E$I5"
+`
+end
diff --git a/contrib/netbsd-tests/fs/cd9660/t_high_ino_big_file.sh b/contrib/netbsd-tests/fs/cd9660/t_high_ino_big_file.sh
new file mode 100755
index 000000000000..c38f10300bb9
--- /dev/null
+++ b/contrib/netbsd-tests/fs/cd9660/t_high_ino_big_file.sh
@@ -0,0 +1,118 @@
+# $NetBSD: t_high_ino_big_file.sh,v 1.4 2014/07/07 22:06:02 pgoyette Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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 image used in these tests has been provided by Thomas Schmitt under
+# the following license (see PR kern/48787 for details how to recreate it):
+#
+# Copyright (c) 1999 - 2008, Thomas Schmitt (scdbackup@gmx.net)
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 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.
+#
+# Neither the name of Thomas Schmitt nor the names of his contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission. 
+#
+#       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 REGENTS 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. 
+#
+# ------------------------------------------------------------------------
+# This is the BSD license as stated July 22 1999 with
+#  <OWNER>="Thomas Schmitt (scdbackup@gmx.net)",
+#  <ORGANIZATION>="Thomas Schmitt" and <YEAR>="1999"
+# an Open Source license approved by opensource.org
+#
+
+mntpnt=""
+
+atf_test_case pr_kern_48787 cleanup
+pr_kern_48787_head() {
+	atf_set "descr" "Verifies 32bit overflow isssues from PR kern/48787 are fixed"
+	atf_set "require.user" "root"
+	atf_set "require.progs" "rump_cd9660 bunzip2 stat"
+	atf_set "timeout" 6000
+}
+
+pr_kern_48787_body() {
+	avail=$( df -Pk . | awk '{if (NR==2) print $4}' )
+	if [ $avail -lt 4500000 ]; then
+		atf_skip "not enough free disk space, have ${avail} Kbytes, need ~ 4500000 Kbytes"
+	fi
+	bunzip2 < $(atf_get_srcdir)/pr_48787.image.bz2 > pr_48787.image
+	mntpnt=$(pwd)/mnt
+	mkdir ${mntpnt}
+	rump_cd9660 -o norrip ./pr_48787.image ${mntpnt}
+	if [ ! -r ${mntpnt}/small_file ]; then
+		atf_fail "${mntpnt}/small_file does not exist"
+	fi
+	if [ ! -r ${mntpnt}/my/large_file ]; then
+		atf_fail "${mntpnt}/my/large_file does not exist"
+	fi
+	umount ${mntpnt}
+	rump_cd9660 ./pr_48787.image ${mntpnt}
+	if [ ! -r ${mntpnt}/small_file ]; then
+		atf_fail "${mntpnt}/small_file does not exist"
+	fi
+	if [ ! -r ${mntpnt}/my/large_file ]; then
+		atf_fail "${mntpnt}/my/large_file does not exist"
+	fi
+	echo "this assumes current cd9660 inode encoding - adapt on changes"
+	atf_check -o match:"^4329541966$" stat -f "%i" ${mntpnt}/small_file
+	atf_check -o match:"^4329545920$" stat -f "%i" ${mntpnt}/my/large_file
+	umount ${mntpnt}
+	touch "done"
+}
+
+pr_kern_48787_cleanup() {
+	if [ ! -f done ]; then
+		if [ "x${mntpnt}" != "x" ]; then
+			umount -f ${mntpnt} || true
+		fi
+	fi
+}
+
+atf_init_test_cases() {
+	atf_add_test_case pr_kern_48787
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_ext2fs.c b/contrib/netbsd-tests/fs/common/fstest_ext2fs.c
new file mode 100644
index 000000000000..85bb79f7ebd0
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_ext2fs.c
@@ -0,0 +1,139 @@
+/*	$NetBSD: fstest_ext2fs.c,v 1.2 2010/07/30 16:15:05 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct ext2fstestargs {
+        struct ufs_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+ext2fs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct ext2fstestargs *args;
+
+	size /= 512;
+	snprintf(cmd, 1024, "newfs_ext2fs -F -s %"PRId64" %s >/dev/null",
+	    size, image);
+	res = system(cmd);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.ext2fs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return res;
+}
+
+int
+ext2fs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct ext2fstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0)
+		return res;
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+
+int
+ext2fs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct ext2fstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_EXT2FS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+ext2fs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_ffs.c b/contrib/netbsd-tests/fs/common/fstest_ffs.c
new file mode 100644
index 000000000000..7ae4e8f5970c
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_ffs.c
@@ -0,0 +1,156 @@
+/*	$NetBSD: fstest_ffs.c,v 1.6 2012/08/05 02:03:05 riastradh Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct ffstestargs {
+        struct ufs_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+ffs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size,
+	void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct ffstestargs *args;
+	struct sigaction act, oact;
+
+	size /= 512;
+	snprintf(cmd, 1024, "newfs -F -s %"PRId64" %s >/dev/null", size, image);
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = SIG_DFL;
+	sigaction(SIGCHLD, &act, &oact);
+	res = system(cmd);
+	sigaction(SIGCHLD, &oact, NULL);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.ffs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+__strong_alias(ffslog_fstest_newfs,ffs_fstest_newfs);
+
+int
+ffs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct ffstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0) {
+		errno = res;
+		return -1;
+	}
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+__strong_alias(ffslog_fstest_delfs,ffs_fstest_delfs);
+
+int
+ffs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct ffstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_FFS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+ffslog_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+
+	return ffs_fstest_mount(tc, buf, path, flags | MNT_LOG);
+}
+
+int
+ffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
+__strong_alias(ffslog_fstest_unmount,ffs_fstest_unmount);
diff --git a/contrib/netbsd-tests/fs/common/fstest_lfs.c b/contrib/netbsd-tests/fs/common/fstest_lfs.c
new file mode 100644
index 000000000000..fd131cffe6b8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_lfs.c
@@ -0,0 +1,192 @@
+/*	$NetBSD: fstest_lfs.c,v 1.4 2010/07/30 16:15:05 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+#include "mount_lfs.h"
+
+sem_t lfs_clearnerloop;
+
+struct lfstestargs {
+	struct ufs_args ta_uargs;
+	pthread_t ta_cleanerthread;
+	sem_t ta_cleanerloop;
+	char ta_devpath[MAXPATHLEN];
+	char ta_imgpath[MAXPATHLEN];
+	char ta_mntpath[MAXPATHLEN];
+	char ta_hostpath[MAXPATHLEN];
+};
+
+int
+lfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size,
+	void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct lfstestargs *args;
+
+	size /= 512;
+	snprintf(cmd, 1024, "newfs_lfs -D -F -s %"PRId64" ./%s >/dev/null",
+	    size, image);
+	res = system(cmd);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	strcpy(args->ta_hostpath, image);
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.lfs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+	sem_init(&args->ta_cleanerloop, 0, 0);
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+
+int
+lfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct lfstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0)
+		return res;
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	pthread_join(args->ta_cleanerthread, NULL);
+	free(args);
+
+	return 0;
+}
+
+static void *
+cleaner(void *arg)
+{
+	char thepath[MAXPATHLEN];
+	struct lfstestargs *args = arg;
+	const char *the_argv[7];
+	char buf[64];
+
+	/* this inspired by the cleaner code.  fixme */
+	sprintf(thepath, "/dev/r%s", args->ta_devpath+5);
+	rump_pub_etfs_register(thepath, args->ta_hostpath, RUMP_ETFS_CHR);
+	sprintf(buf, "%p", &args->ta_cleanerloop);
+
+	the_argv[0] = "megamaid";
+	the_argv[1] = "-D"; /* don't fork() & detach */
+	the_argv[2] = "-S";
+	the_argv[3] = buf;
+	the_argv[4] = args->ta_mntpath;
+	the_argv[5] = NULL;
+
+	/* xxxatf */
+	optind = 1;
+	opterr = 1;
+
+	lfs_cleaner_main(5, __UNCONST(the_argv));
+
+	return NULL;
+}
+
+int
+lfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	struct lfstestargs *args = buf;
+	int res;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_LFS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	if (res == -1)
+		return res;
+
+	strcpy(args->ta_mntpath, path);
+	res = pthread_create(&args->ta_cleanerthread, NULL, cleaner, args);
+	if (res)
+		return res;
+
+	/* wait for cleaner to initialize */
+	sem_wait(&args->ta_cleanerloop);
+
+	return 0;
+}
+
+int
+lfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1) {
+		return res;
+	}
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_msdosfs.c b/contrib/netbsd-tests/fs/common/fstest_msdosfs.c
new file mode 100644
index 000000000000..2c94e3f92fa8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_msdosfs.c
@@ -0,0 +1,140 @@
+/*	$NetBSD: fstest_msdosfs.c,v 1.3 2012/03/26 15:10:26 njoly Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <msdosfs/msdosfsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct msdosfstestargs {
+        struct msdosfs_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+msdosfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct msdosfstestargs *args;
+
+	size /= 512; size -= (size % 63);
+	snprintf(cmd, 1024, "newfs_msdos -C %"PRId64"s %s >/dev/null",
+	    size, image);
+	res = system(cmd);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.msdosfs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+	args->ta_uargs.mask = 0755;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+
+int
+msdosfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct msdosfstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0)
+		return res;
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+
+int
+msdosfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct msdosfstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_MSDOS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+msdosfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_nfs.c b/contrib/netbsd-tests/fs/common/fstest_nfs.c
new file mode 100644
index 000000000000..5ef256f1be41
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_nfs.c
@@ -0,0 +1,326 @@
+/*	$NetBSD: fstest_nfs.c,v 1.9 2011/02/28 21:08:46 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/statvfs.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <pthread.h>
+#include <puffs.h>
+#include <puffsdump.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+#include "mount_nfs.h"
+#include "../../net/config/netconfig.c"
+
+#define SERVERADDR "10.3.2.1"
+#define SERVERROADDR "10.4.2.1"
+#define CLIENTADDR "10.3.2.2"
+#define CLIENTROADDR "10.4.2.2"
+#define NETNETMASK "255.255.255.0"
+#define EXPORTPATH "/myexport"
+
+static void
+childfail(int status)
+{
+
+	atf_tc_fail("child died");
+}
+
+/* fork rump nfsd, configure interface */
+static int
+donewfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv)
+{
+	const char *srcdir;
+	char *nfsdargv[16];
+	char nfsdpath[MAXPATHLEN];
+	char imagepath[MAXPATHLEN];
+	char ethername[MAXPATHLEN], ethername_ro[MAXPATHLEN];
+	char ifname[IFNAMSIZ], ifname_ro[IFNAMSIZ];
+	char cwd[MAXPATHLEN];
+	struct nfstestargs *args;
+	pid_t childpid;
+	int pipes[2];
+	int devnull;
+
+	/*
+	 * First, we start the nfs service.
+	 */
+	srcdir = atf_tc_get_config_var(tc, "srcdir");
+	sprintf(nfsdpath, "%s/../nfs/nfsservice/rumpnfsd", srcdir);
+	sprintf(ethername, "/%s/%s.etherbus", getcwd(cwd, sizeof(cwd)), image);
+	sprintf(ethername_ro, "%s_ro", ethername);
+	sprintf(imagepath, "/%s/%s", cwd, image);
+
+	nfsdargv[0] = nfsdpath;
+	nfsdargv[1] = ethername;
+	nfsdargv[2] = ethername_ro;
+	nfsdargv[3] = __UNCONST(SERVERADDR);
+	nfsdargv[4] = __UNCONST(SERVERROADDR);
+	nfsdargv[5] = __UNCONST(NETNETMASK);
+	nfsdargv[6] = __UNCONST(EXPORTPATH);
+	nfsdargv[7] = imagepath;
+	nfsdargv[8] = NULL;
+
+	signal(SIGCHLD, childfail);
+	if (pipe(pipes) == -1)
+		return errno;
+
+	switch ((childpid = fork())) {
+	case 0:
+		if (chdir(dirname(nfsdpath)) == -1)
+			err(1, "chdir");
+		close(pipes[0]);
+		if (dup2(pipes[1], 3) == -1)
+			err(1, "dup2");
+		if (execvp(nfsdargv[0], nfsdargv) == -1)
+			err(1, "execvp");
+	case -1:
+		return errno;
+	default:
+		close(pipes[1]);
+		break;	
+	}
+
+	/*
+	 * Ok, nfsd has been run.  The following sleep helps with the
+	 * theoretical problem that nfsd can't start fast enough to
+	 * process our mount request and we end up doing a timeout
+	 * before the mount.  This would take several seconds.  So
+	 * try to make sure nfsd is up&running already at this stage.
+	 */
+	if (read(pipes[0], &devnull, 4) == -1)
+		return errno;
+
+	/*
+	 * Configure our networking interface.
+	 */
+	rump_init();
+	netcfg_rump_makeshmif(ethername, ifname);
+	netcfg_rump_if(ifname, CLIENTADDR, NETNETMASK);
+	netcfg_rump_makeshmif(ethername_ro, ifname_ro);
+	netcfg_rump_if(ifname_ro, CLIENTROADDR, NETNETMASK);
+
+	/*
+	 * That's it.  The rest is done in mount, since we don't have
+	 * the mountpath available here.
+	 */
+	args = malloc(sizeof(*args));
+	if (args == NULL)
+		return errno;
+	memset(args, 0, sizeof(*args));
+	args->ta_childpid = childpid;
+	strcpy(args->ta_ethername, ethername);
+
+	*argp = args;
+
+	return 0;
+}
+
+int
+nfs_fstest_newfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv)
+{
+
+	return donewfs(tc, argp, image, size, fspriv);
+}
+
+int
+nfsro_fstest_newfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv)
+{
+
+	return donewfs(tc, argp, image, size, fspriv);
+}
+
+/* mount the file system */
+static int
+domount(const atf_tc_t *tc, void *arg, const char *serverpath,
+	const char *path, int flags)
+{
+	char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN];
+	const char *nfscliargs[] = {
+		"nfsclient",
+		serverpath,
+		path,
+		NULL,
+	};
+	struct nfs_args args;
+	int mntflags;
+
+	if (rump_sys_mkdir(path, 0777) == -1)
+		return errno;
+
+	/* XXX: atf does not reset values */
+	optind = 1;
+	opterr = 1;
+
+	/*
+	 * We use nfs parseargs here, since as a side effect it
+	 * takes care of the RPC hulabaloo.
+	 */
+	mount_nfs_parseargs(__arraycount(nfscliargs)-1, __UNCONST(nfscliargs),
+	    &args, &mntflags, canon_dev, canon_dir);
+
+	if (rump_sys_mount(MOUNT_NFS, path, flags, &args, sizeof(args)) == -1) {
+		return errno;
+	}
+
+	return 0;
+}
+
+int
+nfs_fstest_mount(const atf_tc_t *tc, void *arg, const char *path, int flags)
+{
+
+	return domount(tc, arg, SERVERADDR ":" EXPORTPATH, path, flags);
+}
+
+/*
+ * This is where the magic happens!
+ *
+ * If we are mounting r/w, do the normal thing.  However, if we are
+ * doing a r/o mount, switch use the r/o server export address
+ * and do a r/w mount.  This way we end up testing the r/o export policy
+ * of the server! (yes, slightly questionable semantics, but at least
+ * we notice very quickly if our assumption is broken in the future ;)
+ */
+int
+nfsro_fstest_mount(const atf_tc_t *tc, void *arg, const char *path, int flags)
+{
+
+	if (flags & MNT_RDONLY) {
+		flags &= ~MNT_RDONLY;
+		return domount(tc, arg, SERVERROADDR":"EXPORTPATH, path, flags);
+	} else {
+		return domount(tc, arg, SERVERADDR":"EXPORTPATH, path, flags);
+	}
+}
+
+static int
+dodelfs(const atf_tc_t *tc, void *arg)
+{
+
+	/*
+	 * XXX: no access to "args" since we're called from "cleanup".
+	 * Trust atf to kill nfsd process and remove etherfile.
+	 */
+#if 0
+	/*
+	 * It's highly expected that the child will die next, so we
+	 * don't need that information anymore thank you very many.
+	 */
+	signal(SIGCHLD, SIG_IGN);
+
+	/*
+	 * Just KILL it.  Sending it SIGTERM first causes it to try
+	 * to send some unmount RPCs, leading to sticky situations.
+	 */
+	kill(args->ta_childpid, SIGKILL);
+	wait(&status);
+
+	/* remove ethernet bus */
+	if (unlink(args->ta_ethername) == -1)
+		atf_tc_fail_errno("unlink ethername");
+#endif
+
+	return 0;
+}
+
+int
+nfs_fstest_delfs(const atf_tc_t *tc, void *arg)
+{
+
+	return dodelfs(tc, arg);
+}
+
+int
+nfsro_fstest_delfs(const atf_tc_t *tc, void *arg)
+{
+
+	return dodelfs(tc, arg);
+}
+
+static int
+dounmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int status, i, sverrno;
+
+	/*
+	 * NFS handles sillyrenames in an workqueue.  Some of them might
+	 * be still in the queue even if all user activity has ceased.
+	 * We try to unmount for 2 seconds to give them a chance
+	 * to flush out.
+	 *
+	 * PR kern/43799
+	 */
+	for (i = 0; i < 20; i++) {
+		if ((status = rump_sys_unmount(path, flags)) == 0)
+			break;
+		sverrno = errno;
+		if (sverrno != EBUSY)
+			break;
+		usleep(100000);
+	}
+	if (status == -1)
+		return sverrno;
+
+	if (rump_sys_rmdir(path) == -1)
+		return errno;
+
+	return 0;
+}
+
+int
+nfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+
+	return dounmount(tc, path, flags);
+}
+
+int
+nfsro_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+
+	return dounmount(tc, path, flags);
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_puffs.c b/contrib/netbsd-tests/fs/common/fstest_puffs.c
new file mode 100644
index 000000000000..14e4bfba43ba
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_puffs.c
@@ -0,0 +1,452 @@
+/*	$NetBSD: fstest_puffs.c,v 1.11 2013/09/09 19:47:38 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/statvfs.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <puffs.h>
+#include <puffsdump.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+#define BUFSIZE (128*1024)
+#define DTFS_DUMP "-o","dump"
+
+static bool mayquit = false;
+
+static ssize_t
+xread(int fd, void *vp, size_t n)
+{
+	size_t left;
+
+	left = n;
+	do {
+		ssize_t ssz;
+
+		ssz = read(fd, vp, left);
+		if (ssz == -1) {
+			return ssz;
+		}
+		left -= ssz;
+		vp = (char *)vp + ssz;
+	} while (left > 0);
+	return n;
+}
+
+static ssize_t
+xwrite(int fd, const void *vp, size_t n)
+{
+	size_t left;
+
+	left = n;
+	do {
+		ssize_t ssz;
+
+		ssz = write(fd, vp, left);
+		if (ssz == -1) {
+			return ssz;
+		}
+		left -= ssz;
+		vp = (const char *)vp + ssz;
+	} while (left > 0);
+	return n;
+}
+
+/*
+ * Threads which shovel data between comfd and /dev/puffs.
+ * (cannot use polling since fd's are in different namespaces)
+ */
+static void *
+readshovel(void *arg)
+{
+	struct putter_hdr *phdr;
+	struct puffs_req *preq;
+	struct puffstestargs *args = arg;
+	char buf[BUFSIZE];
+	ssize_t n;
+	int comfd, puffsfd;
+
+	comfd = args->pta_servfd;
+	puffsfd = args->pta_rumpfd;
+
+	phdr = (void *)buf;
+	preq = (void *)buf;
+
+	rump_pub_lwproc_newlwp(1);
+
+	for (;;) {
+		n = rump_sys_read(puffsfd, buf, sizeof(*phdr));
+		if (n <= 0) {
+			fprintf(stderr, "readshovel r1 %zd / %d\n", n, errno);
+			break;
+		}
+
+		assert(phdr->pth_framelen < BUFSIZE);
+		n = rump_sys_read(puffsfd, buf+sizeof(*phdr), 
+		    phdr->pth_framelen - sizeof(*phdr));
+		if (n <= 0) {
+			fprintf(stderr, "readshovel r2 %zd / %d\n", n, errno);
+			break;
+		}
+
+		/* Analyze request */
+		if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VFS) {
+			assert(preq->preq_optype < PUFFS_VFS_MAX);
+			args->pta_vfs_toserv_ops[preq->preq_optype]++;
+		} else if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VN) {
+			assert(preq->preq_optype < PUFFS_VN_MAX);
+			args->pta_vn_toserv_ops[preq->preq_optype]++;
+		}
+
+		n = phdr->pth_framelen;
+		if (xwrite(comfd, buf, n) != n) {
+			fprintf(stderr, "readshovel write %zd / %d\n", n, errno);
+			break;
+		}
+	}
+
+	if (n != 0 && mayquit == false)
+		abort();
+	return NULL;
+}
+
+static void *
+writeshovel(void *arg)
+{
+	struct puffstestargs *args = arg;
+	struct putter_hdr *phdr;
+	struct puffs_req *preq;
+	char buf[BUFSIZE];
+	size_t toread;
+	ssize_t n;
+	int comfd, puffsfd;
+
+	rump_pub_lwproc_newlwp(1);
+
+	comfd = args->pta_servfd;
+	puffsfd = args->pta_rumpfd;
+
+	phdr = (struct putter_hdr *)buf;
+	preq = (void *)buf;
+
+	for (;;) {
+		uint64_t off;
+
+		/*
+		 * Need to write everything to the "kernel" in one chunk,
+		 * so make sure we have it here.
+		 */
+		off = 0;
+		toread = sizeof(struct putter_hdr);
+		assert(toread < BUFSIZE);
+		do {
+			n = xread(comfd, buf+off, toread);
+			if (n <= 0) {
+				fprintf(stderr, "writeshovel read %zd / %d\n",
+				    n, errno);
+				goto out;
+			}
+			off += n;
+			if (off >= sizeof(struct putter_hdr))
+				toread = phdr->pth_framelen - off;
+			else
+				toread = off - sizeof(struct putter_hdr);
+		} while (toread);
+
+		if (__predict_false(
+		    PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VFS
+		    && preq->preq_optype == PUFFS_VFS_UNMOUNT)) {
+			if (preq->preq_rv == 0)
+				mayquit = true;
+		}
+
+		n = rump_sys_write(puffsfd, buf, phdr->pth_framelen);
+		if ((size_t)n != phdr->pth_framelen) {
+			fprintf(stderr, "writeshovel wr %zd / %d\n", n, errno);
+			break;
+		}
+	}
+
+ out:
+	if (n != 0)
+		abort();
+	return NULL;
+}
+
+static void
+rumpshovels(struct puffstestargs *args)
+{
+	pthread_t pt;
+	int rv;
+
+	if ((rv = rump_init()) == -1)
+		err(1, "rump_init");
+
+	if (pthread_create(&pt, NULL, readshovel, args) == -1)
+		err(1, "read shovel");
+	pthread_detach(pt);
+
+	if (pthread_create(&pt, NULL, writeshovel, args) == -1)
+		err(1, "write shovel");
+	pthread_detach(pt);
+}
+
+static void
+childfail(int sign)
+{
+
+	atf_tc_fail("child died"); /* almost signal-safe */
+}
+
+struct puffstestargs *theargs; /* XXX */
+
+/* XXX: we don't support size */
+static int
+donewfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv, char **theargv)
+{
+	struct puffstestargs *args;
+	pid_t childpid;
+	int *pflags;
+	char comfd[16];
+	int sv[2];
+	int mntflags;
+	size_t len;
+	ssize_t n;
+
+	*argp = NULL;
+
+	args = malloc(sizeof(*args));
+	if (args == NULL)
+		return errno;
+	memset(args, 0, sizeof(*args));
+
+	pflags = &args->pta_pflags;
+
+	/* Create sucketpair for communication with the real file server */
+	if (socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) == -1)
+		return errno;
+
+	signal(SIGCHLD, childfail);
+
+	switch ((childpid = fork())) {
+	case 0:
+		close(sv[1]);
+		snprintf(comfd, sizeof(sv[0]), "%d", sv[0]);
+		if (setenv("PUFFS_COMFD", comfd, 1) == -1)
+			return errno;
+
+		if (execvp(theargv[0], theargv) == -1)
+			return errno;
+	case -1:
+		return errno;
+	default:
+		close(sv[0]);
+		break;
+	}
+
+	/* read args */
+	if ((n = xread(sv[1], &len, sizeof(len))) != sizeof(len))
+		err(1, "mp 1 %zd", n);
+	if (len > MAXPATHLEN)
+		err(1, "mntpath > MAXPATHLEN");
+	if ((size_t)xread(sv[1], args->pta_dir, len) != len)
+		err(1, "mp 2");
+	if (xread(sv[1], &len, sizeof(len)) != sizeof(len))
+		err(1, "fn 1");
+	if (len > MAXPATHLEN)
+		err(1, "devpath > MAXPATHLEN");
+	if ((size_t)xread(sv[1], args->pta_dev, len) != len)
+		err(1, "fn 2");
+	if (xread(sv[1], &mntflags, sizeof(mntflags)) != sizeof(mntflags))
+		err(1, "mntflags");
+	if (xread(sv[1], &args->pta_pargslen, sizeof(args->pta_pargslen))
+	    != sizeof(args->pta_pargslen))
+		err(1, "puffstest_args len");
+	args->pta_pargs = malloc(args->pta_pargslen);
+	if (args->pta_pargs == NULL)
+		err(1, "malloc");
+	if (xread(sv[1], args->pta_pargs, args->pta_pargslen)
+	    != (ssize_t)args->pta_pargslen)
+		err(1, "puffstest_args");
+	if (xread(sv[1], pflags, sizeof(*pflags)) != sizeof(*pflags))
+		err(1, "pflags");
+
+	args->pta_childpid = childpid;
+	args->pta_servfd = sv[1];
+	strlcpy(args->pta_dev, image, sizeof(args->pta_dev));
+
+	*argp = theargs = args;
+
+	return 0;
+}
+
+int
+puffs_fstest_newfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv)
+{
+	char dtfs_path[MAXPATHLEN];
+	char *dtfsargv[6];
+	char **theargv;
+
+	/* build dtfs exec path from atf test dir */
+	sprintf(dtfs_path, "%s/../puffs/h_dtfs/h_dtfs",
+	    atf_tc_get_config_var(tc, "srcdir"));
+
+	if (fspriv) {
+		theargv = fspriv;
+		theargv[0] = dtfs_path;
+	} else {
+		dtfsargv[0] = dtfs_path;
+		dtfsargv[1] = __UNCONST("-i");
+		dtfsargv[2] = __UNCONST("-s");
+		dtfsargv[3] = __UNCONST("dtfs");
+		dtfsargv[4] = __UNCONST("fictional");
+		dtfsargv[5] = NULL;
+
+		theargv = dtfsargv;
+	}
+
+	return donewfs(tc, argp, image, size, fspriv, theargv);
+}
+
+int
+p2k_ffs_fstest_newfs(const atf_tc_t *tc, void **argp,
+	const char *image, off_t size, void *fspriv)
+{
+	char *rumpffs_argv[5];
+	int rv;
+
+	rump_init();
+	if ((rv = ffs_fstest_newfs(tc, argp, image, size, fspriv)) != 0)
+		return rv;
+	if (mkdir("p2kffsfake", 0777) == -1 && errno != EEXIST)
+		return errno;
+
+	setenv("P2K_NODETACH", "1", 1);
+	rumpffs_argv[0] = __UNCONST("rump_ffs");
+	rumpffs_argv[1] = __UNCONST(image);
+	rumpffs_argv[2] = __UNCONST("p2kffsfake"); /* NOTUSED */
+	rumpffs_argv[3] = NULL;
+
+	if ((rv = donewfs(tc, argp, image, size, fspriv, rumpffs_argv)) != 0)
+		ffs_fstest_delfs(tc, argp);
+	return rv;
+}
+
+int
+puffs_fstest_mount(const atf_tc_t *tc, void *arg, const char *path, int flags)
+{
+	struct puffstestargs *pargs = arg;
+	int fd;
+
+	rump_init();
+	fd = rump_sys_open("/dev/puffs", O_RDWR);
+	if (fd == -1)
+		return fd;
+
+	if (rump_sys_mkdir(path, 0777) == -1)
+		return -1;
+
+	if (rump_sys_mount(MOUNT_PUFFS, path, flags,
+	    pargs->pta_pargs, pargs->pta_pargslen) == -1) {
+		/* apply "to kill a child" to avoid atf hang (kludge) */
+		kill(pargs->pta_childpid, SIGKILL);
+		return -1;
+	}
+
+	pargs->pta_rumpfd = fd;
+	rumpshovels(pargs);
+
+	return 0;
+}
+__strong_alias(p2k_ffs_fstest_mount,puffs_fstest_mount);
+
+int
+puffs_fstest_delfs(const atf_tc_t *tc, void *arg)
+{
+
+	/* useless ... */
+	return 0;
+}
+
+int
+p2k_ffs_fstest_delfs(const atf_tc_t *tc, void *arg)
+{
+
+	return ffs_fstest_delfs(tc, arg);
+}
+
+int
+puffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	struct puffstestargs *pargs = theargs;
+	int status;
+	int rv;
+
+	/* ok, child might exit here */
+	signal(SIGCHLD, SIG_IGN);
+
+	rv = rump_sys_unmount(path, flags);
+	if (rv)	
+		return rv;
+
+	if ((rv = rump_sys_rmdir(path)) != 0)
+		return rv;
+
+	if (waitpid(pargs->pta_childpid, &status, WNOHANG) > 0)
+		return 0;
+	kill(pargs->pta_childpid, SIGTERM);
+	usleep(10);
+	if (waitpid(pargs->pta_childpid, &status, WNOHANG) > 0)
+		return 0;
+	kill(pargs->pta_childpid, SIGKILL);
+	usleep(500);
+	wait(&status);
+
+	rmdir("p2kffsfake");
+
+	return 0;
+}
+__strong_alias(p2k_ffs_fstest_unmount,puffs_fstest_unmount);
diff --git a/contrib/netbsd-tests/fs/common/fstest_rumpfs.c b/contrib/netbsd-tests/fs/common/fstest_rumpfs.c
new file mode 100644
index 000000000000..e4003db3d026
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_rumpfs.c
@@ -0,0 +1,90 @@
+/*	$NetBSD: fstest_rumpfs.c,v 1.2 2014/03/16 10:28:03 njoly Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+int
+rumpfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	char tmp[64];
+	int res;
+
+	snprintf(tmp, sizeof(tmp), "%"PRId64, size);
+	res = setenv("RUMP_MEMLIMIT", tmp, 0);
+	if (res == -1)
+		return res;
+
+	return rump_init();
+}
+
+int
+rumpfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+
+	return 0;
+}
+
+int
+rumpfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	return rump_sys_mount(MOUNT_RUMPFS, path, flags, NULL, 0);
+}
+
+int
+rumpfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	return rump_sys_rmdir(path);
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_sysvbfs.c b/contrib/netbsd-tests/fs/common/fstest_sysvbfs.c
new file mode 100644
index 000000000000..a7cf7f4cd8e1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_sysvbfs.c
@@ -0,0 +1,139 @@
+/*	$NetBSD: fstest_sysvbfs.c,v 1.2 2010/07/30 16:15:05 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct sysvbfstestargs {
+        struct ufs_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+sysvbfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct sysvbfstestargs *args;
+
+	size /= 512;
+	snprintf(cmd, 1024, "newfs_sysvbfs -F -s %"PRId64" %s >/dev/null",
+	    size, image);
+	res = system(cmd);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+        args = calloc(1, sizeof(*args));
+        if (args == NULL)
+                return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.sysvbfs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+
+int
+sysvbfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct sysvbfstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0)
+		return res;
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+
+int
+sysvbfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct sysvbfstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_SYSVBFS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+sysvbfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_tmpfs.c b/contrib/netbsd-tests/fs/common/fstest_tmpfs.c
new file mode 100644
index 000000000000..83848432e21f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_tmpfs.c
@@ -0,0 +1,112 @@
+/*	$NetBSD: fstest_tmpfs.c,v 1.2 2010/07/30 16:15:05 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct tmpfstestargs {
+        struct tmpfs_args ta_uargs;
+};
+
+int
+tmpfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	int res;
+	struct tmpfstestargs *args;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	args->ta_uargs.ta_version = TMPFS_ARGS_VERSION;
+	args->ta_uargs.ta_root_mode = 0777;
+	args->ta_uargs.ta_size_max = size;
+
+	*buf = args;
+
+	return 0;
+}
+
+int
+tmpfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	struct tmpfstestargs *args = buf;
+
+	free(args);
+
+	return 0;
+}
+
+int
+tmpfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct tmpfstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_TMPFS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+tmpfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_udf.c b/contrib/netbsd-tests/fs/common/fstest_udf.c
new file mode 100644
index 000000000000..3c9e017f388f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_udf.c
@@ -0,0 +1,153 @@
+/*	$NetBSD: fstest_udf.c,v 1.4 2013/07/02 15:00:55 reinoud Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <fs/udf/udf_mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct udftestargs {
+        struct udf_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+udf_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size,
+	void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct udftestargs *args;
+	struct sigaction act, oact;
+
+	/*
+	 * Sectorsize can be specified with -S, as a multiple of 512.
+	 * newfs_udf takes humanized number as size in bytes as -s parameter!
+	 */
+	snprintf(cmd, 1024, "newfs_udf -F -s %"PRId64" %s >/dev/null", size, image);
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = SIG_DFL;
+	sigaction(SIGCHLD, &act, &oact);
+	res = system(cmd);
+	sigaction(SIGCHLD, &oact, NULL);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+	args = calloc(1, sizeof(*args));
+	if (args == NULL)
+		return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.udf", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+	args->ta_uargs.version = UDFMNT_VERSION;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+__strong_alias(udflog_fstest_newfs,udf_fstest_newfs);
+
+int
+udf_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct udftestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0) {
+		errno = res;
+		return -1;
+	}
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+__strong_alias(udflog_fstest_delfs,udf_fstest_delfs);
+
+int
+udf_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct udftestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_UDF, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+udf_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
+__strong_alias(udflog_fstest_unmount,udf_fstest_unmount);
diff --git a/contrib/netbsd-tests/fs/common/fstest_v7fs.c b/contrib/netbsd-tests/fs/common/fstest_v7fs.c
new file mode 100644
index 000000000000..92110e430e83
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_v7fs.c
@@ -0,0 +1,140 @@
+/*	$NetBSD: fstest_v7fs.c,v 1.1 2011/08/11 10:52:12 uch Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <fs/v7fs/v7fs_args.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct v7fstestargs {
+        struct v7fs_args ta_uargs;
+        char ta_devpath[MAXPATHLEN];
+        char ta_imgpath[MAXPATHLEN];
+};
+
+int
+v7fs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+    off_t size, void *fspriv)
+{
+	char cmd[1024];
+	int res;
+	static unsigned int num = 0;
+	struct v7fstestargs *args;
+
+	size /= 512;
+	snprintf(cmd, 1024, "newfs_v7fs -F -s %"PRId64" %s >/dev/null",
+	    size, image);
+	res = system(cmd);
+	if (res != 0)
+		return res;
+
+	res = rump_init();
+	if (res != 0)
+		return res;
+
+        args = calloc(1, sizeof(*args));
+        if (args == NULL)
+                return -1;
+
+	snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.v7fs", num);
+	snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+	args->ta_uargs.fspec = args->ta_devpath;
+	args->ta_uargs.endian = _BYTE_ORDER;
+
+	res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		free(args);
+		return res;
+	}
+
+	*buf = args;
+	num++;
+
+	return 0;
+}
+
+int
+v7fs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+	int res;
+	struct v7fstestargs *args = buf;
+
+	res = rump_pub_etfs_remove(args->ta_devpath);
+	if (res != 0)
+		return res;
+
+	res = unlink(args->ta_imgpath);
+	if (res != 0)
+		return res;
+
+	free(args);
+
+	return 0;
+}
+
+int
+v7fs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	int res;
+	struct v7fstestargs *args = buf;
+
+	res = rump_sys_mkdir(path, 0777);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_mount(MOUNT_V7FS, path, flags, &args->ta_uargs,
+	    sizeof(args->ta_uargs));
+	return res;
+}
+
+int
+v7fs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+	int res;
+
+	res = rump_sys_unmount(path, flags);
+	if (res == -1)
+		return res;
+
+	res = rump_sys_rmdir(path);
+	return res;
+}
diff --git a/contrib/netbsd-tests/fs/common/fstest_zfs.c b/contrib/netbsd-tests/fs/common/fstest_zfs.c
new file mode 100644
index 000000000000..88aa05f28ff7
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/fstest_zfs.c
@@ -0,0 +1,134 @@
+/*	$NetBSD: fstest_zfs.c,v 1.1 2012/08/20 16:37:35 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010, 2011  The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+#define SRVPATH "zfssurvo"
+#define SRVURL "unix://" SRVPATH
+#define ZFSDEV "/zfsdev"
+
+int
+zfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+	off_t size, void *fspriv)
+{
+	int res;
+	int fd;
+
+	/* XXX: hardcoded zfs minimum size */
+	size = MAX(64*1024*1024, size);
+
+	res = rump_init();
+	if (res != 0) {
+		errno = res;
+		return -1;
+	}
+
+	/* create backing image, sparse file is enough */
+	if ((fd = open(image, O_RDWR | O_CREAT, 0777)) == -1)
+		return -1;
+	if (ftruncate(fd, size) == -1) {
+		close(fd);
+		return -1;
+	}
+	close(fd);
+
+	res = rump_pub_etfs_register(ZFSDEV, image, RUMP_ETFS_BLK);
+	if (res != 0) {
+		errno = res;
+		return -1;
+	}
+
+	res = rump_init_server(SRVURL);
+	if (res != 0) {
+		errno = res;
+		return -1;
+	}
+	*buf = NULL;
+
+	return 0;
+}
+
+int
+zfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+
+	unlink(SRVPATH);
+	return 0;
+}
+
+int
+zfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+	char tmpbuf[128];
+	int error;
+
+	/* set up the hijack env for running zpool */
+	setenv("RUMP_SERVER", SRVURL, 1);
+	snprintf(tmpbuf, sizeof(tmpbuf)-1, "blanket=/dev/zfs:%s:%s",
+	    ZFSDEV, path);
+	setenv("RUMPHIJACK", tmpbuf, 1);
+	setenv("LD_PRELOAD", "/usr/lib/librumphijack.so", 1);
+
+	while (*path == '/')
+		path++;
+
+	/* run zpool create */
+	snprintf(tmpbuf, sizeof(tmpbuf)-1, "zpool create %s %s",
+	    path, ZFSDEV);
+	if ((error = system(tmpbuf)) != 0) {
+		errno = error;
+		return -1;
+	}
+
+	return 0;
+}
+
+int
+zfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+
+	unmount(path, flags);
+	unlink(SRVPATH);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/common/h_fsmacros.h b/contrib/netbsd-tests/fs/common/h_fsmacros.h
new file mode 100644
index 000000000000..b47a70802bba
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/h_fsmacros.h
@@ -0,0 +1,337 @@
+/*	$NetBSD: h_fsmacros.h,v 1.38 2013/06/26 19:29:24 reinoud Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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 __H_FSMACROS_H_
+#define __H_FSMACROS_H_
+
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <puffsdump.h>
+#include <string.h>
+
+#include <rump/rump.h>
+
+#include "../../h_macros.h"
+
+#define FSPROTOS(_fs_)							\
+int _fs_##_fstest_newfs(const atf_tc_t *, void **, const char *,	\
+			off_t, void *);					\
+int _fs_##_fstest_delfs(const atf_tc_t *, void *);			\
+int _fs_##_fstest_mount(const atf_tc_t *, void *, const char *, int);	\
+int _fs_##_fstest_unmount(const atf_tc_t *, const char *, int);
+
+FSPROTOS(ext2fs);
+FSPROTOS(ffs);
+FSPROTOS(ffslog);
+FSPROTOS(lfs);
+FSPROTOS(msdosfs);
+FSPROTOS(nfs);
+FSPROTOS(nfsro);
+FSPROTOS(p2k_ffs);
+FSPROTOS(puffs);
+FSPROTOS(rumpfs);
+FSPROTOS(sysvbfs);
+FSPROTOS(tmpfs);
+FSPROTOS(udf);
+FSPROTOS(v7fs);
+FSPROTOS(zfs);
+
+#ifndef FSTEST_IMGNAME
+#define FSTEST_IMGNAME "image.fs"
+#endif
+#ifndef FSTEST_IMGSIZE
+#define FSTEST_IMGSIZE (10000 * 512)
+#endif
+#ifndef FSTEST_MNTNAME
+#define FSTEST_MNTNAME "/mnt"
+#endif
+
+#define FSTEST_CONSTRUCTOR(_tc_, _fs_, _args_)				\
+do {									\
+	if (_fs_##_fstest_newfs(_tc_, &_args_,				\
+	    FSTEST_IMGNAME, FSTEST_IMGSIZE, NULL) != 0)			\
+		atf_tc_fail_errno("newfs failed");			\
+	if (_fs_##_fstest_mount(_tc_, _args_, FSTEST_MNTNAME, 0) != 0)	\
+		atf_tc_fail_errno("mount failed");			\
+} while (/*CONSTCOND*/0);
+
+#define FSTEST_CONSTRUCTOR_FSPRIV(_tc_, _fs_, _args_, _privargs_)	\
+do {									\
+	if (_fs_##_fstest_newfs(_tc_, &_args_,				\
+	    FSTEST_IMGNAME, FSTEST_IMGSIZE, _privargs_) != 0)		\
+		atf_tc_fail_errno("newfs failed");			\
+	if (_fs_##_fstest_mount(_tc_, _args_, FSTEST_MNTNAME, 0) != 0)	\
+		atf_tc_fail_errno("mount failed");			\
+} while (/*CONSTCOND*/0);
+
+#define FSTEST_DESTRUCTOR(_tc_, _fs_, _args_)				\
+do {									\
+	if (_fs_##_fstest_unmount(_tc_, FSTEST_MNTNAME, 0) != 0) {	\
+		rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);		\
+		atf_tc_fail_errno("unmount failed");			\
+	}								\
+	if (_fs_##_fstest_delfs(_tc_, _args_) != 0)			\
+		atf_tc_fail_errno("delfs failed");			\
+} while (/*CONSTCOND*/0);
+
+#define ATF_TC_FSADD(fs,type,func,desc)					\
+	ATF_TC(fs##_##func);						\
+	ATF_TC_HEAD(fs##_##func,tc)					\
+	{								\
+		atf_tc_set_md_var(tc, "descr", type " test for " desc);	\
+		atf_tc_set_md_var(tc, "X-fs.type", #fs);		\
+		atf_tc_set_md_var(tc, "X-fs.mntname", type);		\
+		if (strcmp(#fs, "zfs") == 0) {				\
+			/* This should not be necessary. */		\
+			atf_tc_set_md_var(tc, "require.user", "root");	\
+		}							\
+	}								\
+	void *fs##func##tmp;						\
+									\
+	ATF_TC_BODY(fs##_##func,tc)					\
+	{								\
+		if (!atf_check_fstype(tc, #fs))				\
+			atf_tc_skip("filesystem not selected");		\
+		FSTEST_CONSTRUCTOR(tc,fs,fs##func##tmp);		\
+		func(tc,FSTEST_MNTNAME);				\
+		if (fs##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0) {	\
+			rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);	\
+			atf_tc_fail_errno("unmount failed");		\
+		}							\
+	}
+
+#define ATF_TC_FSADD_RO(_fs_,_type_,_func_,_desc_,_gen_)		\
+	ATF_TC(_fs_##_##_func_);					\
+	ATF_TC_HEAD(_fs_##_##_func_,tc)					\
+	{								\
+		atf_tc_set_md_var(tc, "descr",_type_" test for "_desc_);\
+		atf_tc_set_md_var(tc, "X-fs.type", #_fs_);		\
+		atf_tc_set_md_var(tc, "X-fs.mntname", _type_);		\
+		if (strcmp(#_fs_, "zfs") == 0) {			\
+			/* This should not be necessary. */		\
+			atf_tc_set_md_var(tc, "require.user", "root");	\
+		}							\
+	}								\
+	void *_fs_##_func_##tmp;					\
+									\
+	ATF_TC_BODY(_fs_##_##_func_,tc)					\
+	{								\
+		if (!atf_check_fstype(tc, #_fs_))			\
+			atf_tc_skip("filesystem not selected");		\
+		FSTEST_CONSTRUCTOR(tc,_fs_,_fs_##_func_##tmp);		\
+		_gen_(tc,FSTEST_MNTNAME);				\
+		if (_fs_##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0)	\
+			atf_tc_fail_errno("unmount r/w failed");	\
+		if (_fs_##_fstest_mount(tc, _fs_##_func_##tmp,		\
+		    FSTEST_MNTNAME, MNT_RDONLY) != 0)			\
+		atf_tc_fail_errno("mount ro failed");			\
+		_func_(tc,FSTEST_MNTNAME);				\
+		if (_fs_##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0) {\
+			rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);	\
+			atf_tc_fail_errno("unmount failed");		\
+		}							\
+	}
+
+#define ATF_TP_FSADD(fs,func)						\
+  ATF_TP_ADD_TC(tp,fs##_##func)
+
+#define ATF_TC_FSAPPLY_NOZFS(func,desc)					\
+  ATF_TC_FSADD(ext2fs,MOUNT_EXT2FS,func,desc)				\
+  ATF_TC_FSADD(ffs,MOUNT_FFS,func,desc)					\
+  ATF_TC_FSADD(ffslog,MOUNT_FFS,func,desc)				\
+  ATF_TC_FSADD(lfs,MOUNT_LFS,func,desc)					\
+  ATF_TC_FSADD(msdosfs,MOUNT_MSDOS,func,desc)				\
+  ATF_TC_FSADD(nfs,MOUNT_NFS,func,desc)					\
+  ATF_TC_FSADD(puffs,MOUNT_PUFFS,func,desc)				\
+  ATF_TC_FSADD(p2k_ffs,MOUNT_PUFFS,func,desc)				\
+  ATF_TC_FSADD(rumpfs,MOUNT_RUMPFS,func,desc)				\
+  ATF_TC_FSADD(sysvbfs,MOUNT_SYSVBFS,func,desc)				\
+  ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc)				\
+  ATF_TC_FSADD(udf,MOUNT_UDF,func,desc)				\
+  ATF_TC_FSADD(v7fs,MOUNT_V7FS,func,desc)
+
+#define ATF_TP_FSAPPLY_NOZFS(func)					\
+  ATF_TP_FSADD(ext2fs,func);						\
+  ATF_TP_FSADD(ffs,func);						\
+  ATF_TP_FSADD(ffslog,func);						\
+  ATF_TP_FSADD(lfs,func);						\
+  ATF_TP_FSADD(msdosfs,func);						\
+  ATF_TP_FSADD(nfs,func);						\
+  ATF_TP_FSADD(puffs,func);						\
+  ATF_TP_FSADD(p2k_ffs,func);						\
+  ATF_TP_FSADD(rumpfs,func);						\
+  ATF_TP_FSADD(sysvbfs,func);						\
+  ATF_TP_FSADD(tmpfs,func);						\
+  ATF_TP_FSADD(udf,func);						\
+  ATF_TP_FSADD(v7fs,func);
+
+/* XXX: this will not scale */
+#ifdef WANT_ZFS_TESTS
+#define ATF_TC_FSAPPLY(func,desc)					\
+  ATF_TC_FSAPPLY_NOZFS(func,desc)					\
+  ATF_TC_FSADD(zfs,MOUNT_ZFS,func,desc)
+#define ATF_TP_FSAPPLY(func)						\
+  ATF_TP_FSAPPLY_NOZFS(func)						\
+  ATF_TP_FSADD(zfs,func);
+
+#else /* !WANT_ZFS_TESTS */
+
+#define ATF_TC_FSAPPLY(func,desc)					\
+  ATF_TC_FSAPPLY_NOZFS(func,desc)
+#define ATF_TP_FSAPPLY(func)						\
+  ATF_TP_FSAPPLY_NOZFS(func)
+
+#endif /* WANT_ZFS_TESTS */
+
+/*
+ * Same as above, but generate a file system image first and perform
+ * tests for a r/o mount.
+ *
+ * Missing the following file systems:
+ *   + lfs (fstest_lfs routines cannot handle remount.  FIXME!)
+ *   + tmpfs (memory backend)
+ *   + rumpfs (memory backend)
+ *   + puffs (memory backend, but could be run in theory)
+ */
+
+#define ATF_TC_FSAPPLY_RO(func,desc,gen)				\
+  ATF_TC_FSADD_RO(ext2fs,MOUNT_EXT2FS,func,desc,gen)			\
+  ATF_TC_FSADD_RO(ffs,MOUNT_FFS,func,desc,gen)				\
+  ATF_TC_FSADD_RO(ffslog,MOUNT_FFS,func,desc,gen)			\
+  ATF_TC_FSADD_RO(msdosfs,MOUNT_MSDOS,func,desc,gen)			\
+  ATF_TC_FSADD_RO(nfs,MOUNT_NFS,func,desc,gen)				\
+  ATF_TC_FSADD_RO(nfsro,MOUNT_NFS,func,desc,gen)			\
+  ATF_TC_FSADD_RO(sysvbfs,MOUNT_SYSVBFS,func,desc,gen)			\
+  ATF_TC_FSADD_RO(udf,MOUNT_UDF,func,desc,gen)			\
+  ATF_TC_FSADD_RO(v7fs,MOUNT_V7FS,func,desc,gen)
+
+#define ATF_TP_FSAPPLY_RO(func)						\
+  ATF_TP_FSADD(ext2fs,func);						\
+  ATF_TP_FSADD(ffs,func);						\
+  ATF_TP_FSADD(ffslog,func);						\
+  ATF_TP_FSADD(msdosfs,func);						\
+  ATF_TP_FSADD(nfs,func);						\
+  ATF_TP_FSADD(nfsro,func);						\
+  ATF_TP_FSADD(sysvbfs,func);						\
+  ATF_TP_FSADD(udf,func);						\
+  ATF_TP_FSADD(v7fs,func);
+
+#define ATF_FSAPPLY(func,desc)						\
+	ATF_TC_FSAPPLY(func,desc);					\
+	ATF_TP_ADD_TCS(tp)						\
+	{								\
+		ATF_TP_FSAPPLY(func);					\
+		return atf_no_error();					\
+	}
+
+static __inline bool
+atf_check_fstype(const atf_tc_t *tc, const char *fs)
+{
+	const char *fstype;
+
+	if (!atf_tc_has_config_var(tc, "fstype"))
+		return true;
+
+	fstype = atf_tc_get_config_var(tc, "fstype");
+	if (strcmp(fstype, fs) == 0)
+		return true;
+	return false;
+}
+
+#define FSTYPE_EXT2FS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ext2fs") == 0)
+#define FSTYPE_FFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
+#define FSTYPE_FFSLOG(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffslog") == 0)
+#define FSTYPE_LFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "lfs") == 0)
+#define FSTYPE_MSDOS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "msdosfs") == 0)
+#define FSTYPE_NFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfs") == 0)
+#define FSTYPE_NFSRO(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfsro") == 0)
+#define FSTYPE_P2K_FFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "p2k_ffs") == 0)
+#define FSTYPE_PUFFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "puffs") == 0)
+#define FSTYPE_RUMPFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "rumpfs") == 0)
+#define FSTYPE_SYSVBFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "sysvbfs") == 0)
+#define FSTYPE_TMPFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "tmpfs") == 0)
+#define FSTYPE_UDF(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "udf") == 0)
+#define FSTYPE_V7FS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "v7fs") == 0)
+#define FSTYPE_ZFS(tc)\
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "zfs") == 0)
+
+#define FSTEST_ENTER()							\
+	if (rump_sys_chdir(FSTEST_MNTNAME) == -1)			\
+		atf_tc_fail_errno("failed to cd into test mount")
+
+#define FSTEST_EXIT()							\
+	if (rump_sys_chdir("/") == -1)					\
+		atf_tc_fail_errno("failed to cd out of test mount")
+
+/*
+ * file system args structures
+ */
+
+struct nfstestargs {
+	pid_t ta_childpid;
+	char ta_ethername[MAXPATHLEN];
+};
+
+struct puffstestargs {
+	uint8_t			*pta_pargs;
+	size_t			pta_pargslen;
+
+	int			pta_pflags;
+	pid_t			pta_childpid;
+
+	int			pta_rumpfd;
+	int			pta_servfd;
+
+	char			pta_dev[MAXPATHLEN];
+	char			pta_dir[MAXPATHLEN];
+
+	int			pta_mntflags;
+
+	int			pta_vfs_toserv_ops[PUFFS_VFS_MAX];
+	int			pta_vn_toserv_ops[PUFFS_VN_MAX];
+};
+
+#endif /* __H_FSMACROS_H_ */
diff --git a/contrib/netbsd-tests/fs/common/snapshot.c b/contrib/netbsd-tests/fs/common/snapshot.c
new file mode 100644
index 000000000000..7baf611b6ed6
--- /dev/null
+++ b/contrib/netbsd-tests/fs/common/snapshot.c
@@ -0,0 +1,228 @@
+/*	$NetBSD: snapshot.c,v 1.7 2013/02/06 09:05:01 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/mount.h>
+
+#include <dev/fssvar.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC_WITH_CLEANUP(snapshot);
+ATF_TC_HEAD(snapshot, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "basic snapshot features");
+}
+
+static void
+makefile(const char *path)
+{
+	int fd;
+
+	fd = rump_sys_open(path, O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create %s", path);
+	rump_sys_close(fd);
+}
+
+ATF_TC_BODY(snapshot, tc)
+{
+	char buf[1024];
+	struct fss_set fss;
+	int fssfd;
+	int fd, fd2, i;
+
+	if (system(NEWFS) == -1)
+		atf_tc_fail_errno("cannot create file system");
+
+	rump_init();
+	begin();
+
+	if (rump_sys_mkdir("/mnt", 0777) == -1)
+		atf_tc_fail_errno("mount point create");
+	if (rump_sys_mkdir("/snap", 0777) == -1)
+		atf_tc_fail_errno("mount point 2 create");
+
+	rump_pub_etfs_register("/diskdev", IMGNAME, RUMP_ETFS_BLK);
+
+	mount_diskfs("/diskdev", "/mnt");
+
+#define TESTSTR1 "huihai\n"
+#define TESTSZ1 (sizeof(TESTSTR1)-1)
+#define TESTSTR2 "baana liten\n"
+#define TESTSZ2 (sizeof(TESTSTR2)-1)
+
+	fd = rump_sys_open("/mnt/myfile", O_RDWR | O_CREAT, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create file");
+	if (rump_sys_write(fd, TESTSTR1, TESTSZ1) != TESTSZ1)
+		atf_tc_fail_errno("write fail");
+
+	fssfd = rump_sys_open("/dev/rfss0", O_RDWR);
+	if (fssfd == -1)
+		atf_tc_fail_errno("cannot open fss");
+	makefile(BAKNAME);
+	memset(&fss, 0, sizeof(fss));
+	fss.fss_mount = __UNCONST("/mnt");
+	fss.fss_bstore = __UNCONST(BAKNAME);
+	fss.fss_csize = 0;
+	if (rump_sys_ioctl(fssfd, FSSIOCSET, &fss) == -1)
+		atf_tc_fail_errno("create snapshot");
+
+	for (i = 0; i < 10000; i++) {
+		if (rump_sys_write(fd, TESTSTR2, TESTSZ2) != TESTSZ2)
+			atf_tc_fail_errno("write fail");
+	}
+	rump_sys_sync();
+
+	/* technically we should fsck it first? */
+	mount_diskfs("/dev/fss0", "/snap");
+
+	/* check for old contents */
+	fd2 = rump_sys_open("/snap/myfile", O_RDONLY);
+	if (fd2 == -1)
+		atf_tc_fail_errno("fail");
+	memset(buf, 0, sizeof(buf));
+	if (rump_sys_read(fd2, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read snap");
+	ATF_CHECK(strcmp(buf, TESTSTR1) == 0);
+
+	/* check that new files are invisible in the snapshot */
+	makefile("/mnt/newfile");
+	if (rump_sys_open("/snap/newfile", O_RDONLY) != -1)
+		atf_tc_fail("newfile exists in snapshot");
+	if (errno != ENOENT)
+		atf_tc_fail_errno("newfile open should fail with ENOENT");
+
+	/* check that removed files are still visible in the snapshot */
+	rump_sys_unlink("/mnt/myfile");
+	if (rump_sys_open("/snap/myfile", O_RDONLY) == -1)
+		atf_tc_fail_errno("unlinked file no longer in snapshot");
+
+	/* done for now */
+}
+
+ATF_TC_CLEANUP(snapshot, tc)
+{
+
+	unlink(IMGNAME);
+}
+
+ATF_TC_WITH_CLEANUP(snapshotstress);
+ATF_TC_HEAD(snapshotstress, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "snapshot on active file system");
+}
+
+#define NACTIVITY 4
+
+static bool activity_stop = false;
+static pid_t wrkpid;
+
+static void *
+fs_activity(void *arg)
+{
+	int di, fi;
+	char *prefix = arg, path[128];
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	RL(rump_sys_mkdir(prefix, 0777));
+	while (! activity_stop) {
+		for (di = 0; di < 5; di++) {
+			snprintf(path, sizeof(path), "%s/d%d", prefix, di);
+			RL(rump_sys_mkdir(path, 0777));
+			for (fi = 0; fi < 5; fi++) {
+				snprintf(path, sizeof(path), "%s/d%d/f%d",
+				    prefix, di, fi);
+				makefile(path);
+			}
+		}
+		for (di = 0; di < 5; di++) {
+			for (fi = 0; fi < 5; fi++) {
+				snprintf(path, sizeof(path), "%s/d%d/f%d",
+				    prefix, di, fi);
+				RL(rump_sys_unlink(path));
+			}
+			snprintf(path, sizeof(path), "%s/d%d", prefix, di);
+			RL(rump_sys_rmdir(path));
+		}
+	}
+	RL(rump_sys_rmdir(prefix));
+
+	rump_pub_lwproc_releaselwp();
+
+	return NULL;
+}
+
+ATF_TC_BODY(snapshotstress, tc)
+{
+	pthread_t at[NACTIVITY];
+	struct fss_set fss;
+	char prefix[NACTIVITY][128];
+	int i, fssfd;
+
+	if (system(NEWFS) == -1)
+		atf_tc_fail_errno("cannot create file system");
+	/* Force SMP so the stress makes sense. */
+	RL(setenv("RUMP_NCPU", "4", 1));
+	RZ(rump_init());
+	/* Prepare for fsck to use the RUMP /dev/fss0. */
+	RL(rump_init_server("unix://commsock"));
+	RL(setenv("LD_PRELOAD", "/usr/lib/librumphijack.so", 1));
+	RL(setenv("RUMP_SERVER", "unix://commsock", 1));
+	RL(setenv("RUMPHIJACK", "blanket=/dev/rfss0", 1));
+	begin();
+
+	RL(rump_sys_mkdir("/mnt", 0777));
+
+	rump_pub_etfs_register("/diskdev", IMGNAME, RUMP_ETFS_BLK);
+
+	mount_diskfs("/diskdev", "/mnt");
+
+	/* Start file system activity. */
+	RL(wrkpid = rump_sys_getpid());
+	for (i = 0; i < NACTIVITY; i++) {
+		snprintf(prefix[i], sizeof(prefix[i]),  "/mnt/a%d", i);
+		RL(pthread_create(&at[i], NULL, fs_activity, prefix[i]));
+		sleep(1);
+	}
+
+	fssfd = rump_sys_open("/dev/rfss0", O_RDWR);
+	if (fssfd == -1)
+		atf_tc_fail_errno("cannot open fss");
+	makefile(BAKNAME);
+	memset(&fss, 0, sizeof(fss));
+	fss.fss_mount = __UNCONST("/mnt");
+	fss.fss_bstore = __UNCONST(BAKNAME);
+	fss.fss_csize = 0;
+	if (rump_sys_ioctl(fssfd, FSSIOCSET, &fss) == -1)
+		atf_tc_fail_errno("create snapshot");
+
+	activity_stop = true;
+	for (i = 0; i < NACTIVITY; i++)
+		RL(pthread_join(at[i], NULL));
+
+	RL(system(FSCK " /dev/rfss0"));
+}
+
+ATF_TC_CLEANUP(snapshotstress, tc)
+{
+
+	unlink(IMGNAME);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, snapshot);
+	ATF_TP_ADD_TC(tp, snapshotstress);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/ffs/ffs_common.sh b/contrib/netbsd-tests/fs/ffs/ffs_common.sh
new file mode 100755
index 000000000000..eaf7142808a1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/ffs_common.sh
@@ -0,0 +1,99 @@
+# $NetBSD: ffs_common.sh,v 1.2 2013/07/29 13:15:24 skrll Exp $ 
+
+create_ffs()
+{
+	local endian=$1; shift
+	local vers=$1; shift
+	local type=$1; shift
+	local op;
+	if [ ${type} = "both" ]; then
+		op="-q user -q group"
+	else
+		op="-q ${type}"
+	fi
+	atf_check -o ignore -e ignore newfs ${op} \
+		-B ${endian} -O ${vers} -s 4000 -F ${IMG}
+}
+
+create_ffs_server()
+{	
+	local sarg=$1; shift
+	create_ffs $*
+	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_ffs_server \
+		${sarg} ${IMG} ${RUMP_SERVER}
+}
+
+rump_shutdown()
+{
+	for s in ${RUMP_SOCKETS_LIST}; do
+		atf_check -s exit:0 env RUMP_SERVER=unix://${s} rump.halt;
+	done
+# check that the quota inode creation didn't corrupt the filesystem
+	atf_check -s exit:0 -o "match:already clean" \
+		-o "match:Phase 6 - Check Quotas" \
+		fsck_ffs -nf -F ${IMG}
+}
+
+# from tests/ipf/h_common.sh via tests/sbin/resize_ffs
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local descr="${1}"; shift
+	
+	atf_test_case "${name}" cleanup
+
+	eval "${name}_head() { \
+		atf_set "descr" "${descr}"
+		atf_set "timeout" "60"
+	}"
+	eval "${name}_body() { \
+		RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
+		export RUMP_SERVER=unix://\${RUMP_SOCKET}; \
+		${check_function} " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		for s in \${RUMP_SOCKETS_LIST}; do \
+			export RUMP_SERVER=unix://\${s}; \
+			atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+		done; \
+	}"
+	tests="${tests} ${name}"
+}
+
+test_case_root()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local descr="${1}"; shift
+	
+	atf_test_case "${name}" cleanup
+
+	eval "${name}_head() { \
+		atf_set "descr" "${descr}"
+		atf_set "require.user" "root"
+		atf_set "timeout" "360"
+	}"
+	eval "${name}_body() { \
+		RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
+		export RUMP_SERVER=unix://\${RUMP_SOCKET}; \
+		${check_function} " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		for s in \${RUMP_SOCKETS_LIST}; do \
+			export RUMP_SERVER=unix://\${s}; \
+			atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+		done; \
+	}"
+	tests="${tests} ${name}"
+}
+
+atf_init_test_cases()
+{
+	IMG=fsimage
+	DIR=target
+	RUMP_SOCKET=test;
+	for i in ${tests}; do
+		atf_add_test_case $i
+	done
+}
diff --git a/contrib/netbsd-tests/fs/ffs/h_ffs_server.c b/contrib/netbsd-tests/fs/ffs/h_ffs_server.c
new file mode 100644
index 000000000000..dd22d9faf1d8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/h_ffs_server.c
@@ -0,0 +1,113 @@
+/*	$NetBSD: h_ffs_server.c,v 1.2 2012/08/24 20:25:50 jmmv Exp $	*/
+
+/*
+ * rump server for advanced quota tests
+ */
+
+#include "../common/h_fsmacros.h"
+
+#include <err.h>
+#include <semaphore.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+int background = 0;
+
+static void
+usage(void)
+{
+	fprintf(stderr, "usage: %s [-b] [-l] diskimage bindurl\n",
+	    getprogname());
+	exit(1);
+}
+
+static void
+die(const char *reason, int error)
+{
+
+	warnx("%s: %s", reason, strerror(error));
+	if (background)
+		rump_daemonize_done(error);
+	exit(1);
+}
+
+static sem_t sigsem;
+static void
+sigreboot(int sig)
+{
+
+	sem_post(&sigsem);
+}
+
+int 
+main(int argc, char **argv)
+{
+	int error;
+	struct ufs_args uargs;
+	const char *filename;
+	const char *serverurl;
+	int log = 0;
+	int ch;
+
+	while ((ch = getopt(argc, argv, "bl")) != -1) {
+		switch(ch) {
+		case 'b':
+			background = 1;
+			break;
+		case 'l':
+			log = 1;
+			break;
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2)
+		usage();
+
+	filename = argv[0];
+	serverurl = argv[1];
+
+	if (background) {
+		error = rump_daemonize_begin();
+		if (error)
+			errx(1, "rump daemonize: %s", strerror(error));
+	}
+
+	error = rump_init();
+	if (error)
+		die("rump init failed", error);
+
+	if (rump_sys_mkdir(FSTEST_MNTNAME, 0777) == -1)
+		die("mount point create", errno);
+	rump_pub_etfs_register("/diskdev", filename, RUMP_ETFS_BLK);
+	uargs.fspec = __UNCONST("/diskdev");
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME, (log) ? MNT_LOG : 0,
+	    &uargs, sizeof(uargs)) == -1)
+		die("mount ffs", errno);
+
+	error = rump_init_server(serverurl);
+	if (error)
+		die("rump server init failed", error);
+	if (background)
+		rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS);
+
+	sem_init(&sigsem, 0, 0);
+	signal(SIGTERM, sigreboot);
+	signal(SIGINT, sigreboot);
+	sem_wait(&sigsem);
+
+	rump_sys_reboot(0, NULL);
+	/*NOTREACHED*/
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/ffs/h_quota2_tests.c b/contrib/netbsd-tests/fs/ffs/h_quota2_tests.c
new file mode 100644
index 000000000000..59f3ea3b0917
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/h_quota2_tests.c
@@ -0,0 +1,468 @@
+/*	$NetBSD: h_quota2_tests.c,v 1.4 2012/09/30 21:26:57 bouyer Exp $	*/
+
+/*
+ * rump server for advanced quota tests
+ * this one includes functions to run against the filesystem before
+ * starting to handle rump requests from clients.
+ */
+
+#include "../common/h_fsmacros.h"
+
+#include <err.h>
+#include <semaphore.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+#include <dev/fssvar.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+int background = 0;
+
+#define TEST_NONROOT_ID 1
+
+static int
+quota_test0(const char *testopts)
+{
+	static char buf[512];
+	int fd;
+	int error;
+	unsigned int i;
+	int chowner = 1;
+	for (i =0; testopts && i < strlen(testopts); i++) {
+		switch(testopts[i]) {
+		case 'C':
+			chowner = 0;
+			break;
+		default:
+			errx(1, "test4: unknown option %c", testopts[i]);
+		}
+	}
+	if (chowner)
+		rump_sys_chown(".", TEST_NONROOT_ID, TEST_NONROOT_ID);
+	rump_sys_chmod(".", 0777);
+	if (rump_sys_setegid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_setegid");
+		return error;
+	}
+	if (rump_sys_seteuid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_seteuid");
+		return error;
+	}
+	fd = rump_sys_open("test_fillup", O_CREAT | O_RDWR, 0644);
+	if (fd < 0) {
+		error = errno;
+		warn("rump_sys_open");
+	} else {
+		while (rump_sys_write(fd, buf, sizeof(buf)) == sizeof(buf))
+			error = 0;
+		error = errno;
+	}
+	rump_sys_close(fd);
+	rump_sys_seteuid(0);
+	rump_sys_setegid(0);
+	return error;
+}
+
+static int
+quota_test1(const char *testopts)
+{
+	static char buf[512];
+	int fd;
+	int error;
+	rump_sys_chown(".", TEST_NONROOT_ID, TEST_NONROOT_ID);
+	rump_sys_chmod(".", 0777);
+	if (rump_sys_setegid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_setegid");
+		return error;
+	}
+	if (rump_sys_seteuid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_seteuid");
+		return error;
+	}
+	fd = rump_sys_open("test_fillup", O_CREAT | O_RDWR, 0644);
+	if (fd < 0) {
+		error = errno;
+		warn("rump_sys_open");
+	} else {
+		/*
+		 * write up to the soft limit, wait a bit, an try to
+		 * keep on writing
+		 */
+		int i;
+
+		/* write 2k: with the directory this makes 2.5K */
+		for (i = 0; i < 4; i++) {
+			error = rump_sys_write(fd, buf, sizeof(buf));
+			if (error != sizeof(buf))
+				err(1, "write failed early");
+		}
+		sleep(2);
+		/* now try to write an extra .5k */
+		if (rump_sys_write(fd, buf, sizeof(buf)) != sizeof(buf))
+			error = errno;
+		else
+			error = 0;
+	}
+	rump_sys_close(fd);
+	rump_sys_seteuid(0);
+	rump_sys_setegid(0);
+	return error;
+}
+
+static int
+quota_test2(const char *testopts)
+{
+	static char buf[512];
+	int fd;
+	int error;
+	int i;
+	rump_sys_chown(".", TEST_NONROOT_ID, TEST_NONROOT_ID);
+	rump_sys_chmod(".", 0777);
+	if (rump_sys_setegid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_setegid");
+		return error;
+	}
+	if (rump_sys_seteuid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_seteuid");
+		return error;
+	}
+
+	for (i = 0; ; i++) {
+		sprintf(buf, "file%d", i);
+		fd = rump_sys_open(buf, O_CREAT | O_RDWR, 0644);
+		if (fd < 0)
+			break;
+		sprintf(buf, "test file no %d", i);
+		rump_sys_write(fd, buf, strlen(buf));
+		rump_sys_close(fd);
+	}
+	error = errno;
+	
+	rump_sys_close(fd);
+	rump_sys_seteuid(0);
+	rump_sys_setegid(0);
+	return error;
+}
+
+static int
+quota_test3(const char *testopts)
+{
+	static char buf[512];
+	int fd;
+	int error;
+	int i;
+	rump_sys_chown(".", TEST_NONROOT_ID, TEST_NONROOT_ID);
+	rump_sys_chmod(".", 0777);
+	if (rump_sys_setegid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_setegid");
+		return error;
+	}
+	if (rump_sys_seteuid(TEST_NONROOT_ID) != 0) {
+		error = errno;
+		warn("rump_sys_seteuid");
+		return error;
+	}
+
+	/*
+	 * create files one past the soft limit: one less as we already own the
+	 * root directory
+	 */
+	for (i = 0; i < 4; i++) {
+		sprintf(buf, "file%d", i);
+		fd = rump_sys_open(buf, O_EXCL| O_CREAT | O_RDWR, 0644);
+		if (fd < 0)
+			err(1, "file create failed early");
+		sprintf(buf, "test file no %d", i);
+		rump_sys_write(fd, buf, strlen(buf));
+		rump_sys_close(fd);
+	}
+	/* now create an extra file after grace time: this should fail */
+	sleep(2);
+	sprintf(buf, "file%d", i);
+	fd = rump_sys_open(buf, O_EXCL| O_CREAT | O_RDWR, 0644);
+	if (fd < 0)
+		error = errno;
+	else
+		error = 0;
+	
+	rump_sys_close(fd);
+	rump_sys_seteuid(0);
+	rump_sys_setegid(0);
+	return error;
+}
+
+static int
+quota_test4(const char *testopts)
+{
+	static char buf[512];
+	int fd, fssfd;
+	struct fss_set fss;
+	unsigned int i;
+	int unl=0;
+	int unconf=0;
+
+	/*
+	 * take an internal snapshot of the filesystem, and create a new
+	 * file with some data
+	 */
+	rump_sys_chown(".", 0, 0);
+	rump_sys_chmod(".", 0777);
+
+	for (i =0; testopts && i < strlen(testopts); i++) {
+		switch(testopts[i]) {
+		case 'L':
+			unl++;
+			break;
+		case 'C':
+			unconf++;
+			break;
+		default:
+			errx(1, "test4: unknown option %c", testopts[i]);
+		}
+	}
+
+	/* first create the snapshot */
+
+	 fd = rump_sys_open(FSTEST_MNTNAME "/le_snap", O_CREAT | O_RDWR, 0777);
+	 if (fd == -1)
+		err(1, "create " FSTEST_MNTNAME "/le_snap");
+	 rump_sys_close(fd);
+	 fssfd = rump_sys_open("/dev/rfss0", O_RDWR);
+	 if (fssfd == -1)
+		err(1, "cannot open fss");
+	memset(&fss, 0, sizeof(fss));
+	fss.fss_mount = __UNCONST("/mnt");
+	fss.fss_bstore = __UNCONST(FSTEST_MNTNAME "/le_snap");
+	fss.fss_csize = 0;
+	if (rump_sys_ioctl(fssfd, FSSIOCSET, &fss) == -1)
+		err(1, "create snapshot");
+	if (unl) {
+		if (rump_sys_unlink(FSTEST_MNTNAME "/le_snap") == -1)
+			err(1, "unlink snapshot");
+	}
+
+	/* now create some extra files */
+
+	for (i = 0; i < 4; i++) {
+		sprintf(buf, "file%d", i);
+		fd = rump_sys_open(buf, O_EXCL| O_CREAT | O_RDWR, 0644);
+		if (fd < 0)
+			err(1, "create %s", buf);
+		sprintf(buf, "test file no %d", i);
+		rump_sys_write(fd, buf, strlen(buf));
+		rump_sys_close(fd);
+	}
+	if (unconf)
+		if (rump_sys_ioctl(fssfd, FSSIOCCLR, NULL) == -1)
+			err(1, "unconfigure snapshot");
+	return 0;
+}
+
+static int
+quota_test5(const char *testopts)
+{
+	static char buf[512];
+	int fd;
+	int remount = 0;
+	int unlnk = 0;
+	int log = 0;
+	unsigned int i;
+
+	for (i =0; testopts && i < strlen(testopts); i++) {
+		switch(testopts[i]) {
+		case 'L':
+			log++;
+			break;
+		case 'R':
+			remount++;
+			break;
+		case 'U':
+			unlnk++;
+			break;
+		default:
+			errx(1, "test4: unknown option %c", testopts[i]);
+		}
+	}
+	if (remount) {
+		struct ufs_args uargs;
+		uargs.fspec = __UNCONST("/diskdev");
+		/* remount the fs read/write */
+		if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME,
+		    MNT_UPDATE | (log ? MNT_LOG : 0),
+		    &uargs, sizeof(uargs)) == -1)
+			err(1, "mount ffs rw %s", FSTEST_MNTNAME);
+	}
+
+	if (unlnk) {
+		/*
+		 * open and unlink a file
+		 */
+
+		fd = rump_sys_open("unlinked_file",
+		    O_EXCL| O_CREAT | O_RDWR, 0644);
+		if (fd < 0)
+			err(1, "create %s", "unlinked_file");
+		sprintf(buf, "test unlinked_file");
+		rump_sys_write(fd, buf, strlen(buf));
+		if (rump_sys_unlink("unlinked_file") == -1)
+			err(1, "unlink unlinked_file");
+		if (rump_sys_fsync(fd) == -1) 
+			err(1, "fsync unlinked_file");
+		rump_sys_reboot(RUMP_RB_NOSYNC, NULL);
+		errx(1, "reboot failed");
+		return 1;
+	}
+	return 0;
+}
+
+struct quota_test {
+	int (*func)(const char *);
+	const char *desc;
+};
+
+struct quota_test quota_tests[] = {
+	{ quota_test0, "write up to hard limit"},
+	{ quota_test1, "write beyond the soft limit after grace time"},
+	{ quota_test2, "create file up to hard limit"},
+	{ quota_test3, "create file beyond the soft limit after grace time"},
+	{ quota_test4, "take a snapshot and add some data"},
+	{ quota_test5, "open and unlink a file"},
+};
+
+static void
+usage(void)
+{
+	unsigned int test;
+	fprintf(stderr, "usage: %s [-b] [-l] test# diskimage bindurl\n",
+	    getprogname());
+	fprintf(stderr, "available tests:\n");
+	for (test = 0; test < sizeof(quota_tests) / sizeof(quota_tests[0]);
+	    test++)
+		fprintf(stderr, "\t%d: %s\n", test, quota_tests[test].desc);
+	exit(1);
+}
+
+static void
+die(const char *reason, int error)
+{
+
+	warnx("%s: %s", reason, strerror(error));
+	if (background)
+		rump_daemonize_done(error);
+	exit(1);
+}
+
+static sem_t sigsem;
+static void
+sigreboot(int sig)
+{
+
+	sem_post(&sigsem);
+}
+
+int 
+main(int argc, char **argv)
+{
+	int error;
+	u_long test;
+	char *end;
+	struct ufs_args uargs;
+	const char *filename;
+	const char *serverurl;
+	const char *topts = NULL;
+	int mntopts = 0;
+	int ch;
+
+	while ((ch = getopt(argc, argv, "blo:r")) != -1) {
+		switch(ch) {
+		case 'b':
+			background = 1;
+			break;
+		case 'l':
+			mntopts |= MNT_LOG;
+			break;
+		case 'r':
+			mntopts |= MNT_RDONLY;
+			break;
+		case 'o':
+			topts = optarg;
+			break;
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 3)
+		usage();
+
+	filename = argv[1];
+	serverurl = argv[2];
+
+	test = strtoul(argv[0], &end, 10);
+	if (*end != '\0') {
+		usage();
+	}
+	if (test > sizeof(quota_tests) / sizeof(quota_tests[0])) {
+		usage();
+	}
+
+	if (background) {
+		error = rump_daemonize_begin();
+		if (error)
+			errx(1, "rump daemonize: %s", strerror(error));
+	}
+
+	error = rump_init();
+	if (error)
+		die("rump init failed", error);
+
+	if (rump_sys_mkdir(FSTEST_MNTNAME, 0777) == -1)
+		err(1, "mount point create");
+	rump_pub_etfs_register("/diskdev", filename, RUMP_ETFS_BLK);
+	uargs.fspec = __UNCONST("/diskdev");
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME, mntopts,
+	    &uargs, sizeof(uargs)) == -1)
+		die("mount ffs", errno);
+
+	if (rump_sys_chdir(FSTEST_MNTNAME) == -1)
+		err(1, "cd %s", FSTEST_MNTNAME);
+	error = quota_tests[test].func(topts);
+	if (error) {
+		fprintf(stderr, " test %lu: %s returned %d: %s\n",
+		    test, quota_tests[test].desc, error, strerror(error));
+	}
+	if (rump_sys_chdir("/") == -1)
+		err(1, "cd /");
+
+	error = rump_init_server(serverurl);
+	if (error)
+		die("rump server init failed", error);
+	if (background)
+		rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS);
+
+	sem_init(&sigsem, 0, 0);
+	signal(SIGTERM, sigreboot);
+	signal(SIGINT, sigreboot);
+	sem_wait(&sigsem);
+
+	rump_sys_reboot(0, NULL);
+	/*NOTREACHED*/
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/ffs/quotas_common.sh b/contrib/netbsd-tests/fs/ffs/quotas_common.sh
new file mode 100755
index 000000000000..0ad002f54ad5
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/quotas_common.sh
@@ -0,0 +1,12 @@
+# $NetBSD: quotas_common.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ 
+
+rump_quota_shutdown()
+{
+	for s in ${RUMP_SOCKETS_LIST}; do
+		atf_check -s exit:0 env RUMP_SERVER=unix://${s} rump.halt;
+	done
+# check that the quota inode creation didn't corrupt the filesystem
+	atf_check -s exit:0 -o "match:already clean" \
+		-o "match:Phase 6 - Check Quotas" \
+		fsck_ffs -nf -F ${IMG}
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_clearquota.sh b/contrib/netbsd-tests/fs/ffs/t_clearquota.sh
new file mode 100755
index 000000000000..f62a494730cd
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_clearquota.sh
@@ -0,0 +1,91 @@
+# $NetBSD: t_clearquota.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    for q in "user" "group"; do
+      test_case_root clear_${e}_${v}_${q} clear_quota \
+	 "clear quota with ${q} enabled" -b ${e} ${v} ${q}
+    done
+    test_case_root clear_${e}_${v}_"both" clear_quota \
+	 "clear quota with both enabled" -b ${e} ${v} "both"
+    test_case_root clear_${e}_${v}_"both_log" clear_quota \
+	 "clear quota for new id with both enabled, WAPBL" -bl ${e} ${v} "both"
+  done
+done
+
+clear_quota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local fail
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#set and check the expected quota
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
+		   -t 2W/3D ${id}
+		atf_check -s exit:0 \
+-o "match:/mnt        0       10    40960  2weeks       0      20   51200   3days" \
+-o "match:Disk quotas for .*: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+#now clear the quotas
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -c ${id}
+	done;
+
+#check that we do not get positive reply for any quota type
+	for q in u g ; do
+		atf_check -s exit:0 -o "not-match:/mnt" \
+		    -o "not-match:Disk quotas for .*: $" \
+		    -o "match:Disk quotas for .*: none$" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+	rump_quota_shutdown
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_fifos.c b/contrib/netbsd-tests/fs/ffs/t_fifos.c
new file mode 100644
index 000000000000..fe1d4254a352
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_fifos.c
@@ -0,0 +1,158 @@
+/*	$NetBSD: t_fifos.c,v 1.5 2010/11/07 17:51:17 jmmv Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include "../../h_macros.h"
+
+ATF_TC_WITH_CLEANUP(fifos);
+ATF_TC_HEAD(fifos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test fifo support in ffs");
+	atf_tc_set_md_var(tc, "timeout", "5");
+}
+
+#define teststr1 "raving & drooling"
+#define teststr2 "haha, charade"
+
+static void *
+w1(void *arg)
+{
+	int fd;
+
+	fd = rump_sys_open("sheep", O_WRONLY);
+	if (fd == -1)
+		atf_tc_fail_errno("w1 open");
+	if (rump_sys_write(fd, teststr1, sizeof(teststr1)) != sizeof(teststr1))
+		atf_tc_fail_errno("w1 write");
+	rump_sys_close(fd);
+
+	return NULL;
+}
+
+static void *
+w2(void *arg)
+{
+	int fd;
+
+	fd = rump_sys_open("pigs", O_WRONLY);
+	if (fd == -1)
+		atf_tc_fail_errno("w2 open");
+	if (rump_sys_write(fd, teststr2, sizeof(teststr2)) != sizeof(teststr2))
+		atf_tc_fail_errno("w2 write");
+	rump_sys_close(fd);
+
+	return NULL;
+}
+
+static void *
+r1(void *arg)
+{
+	char buf[32];
+	int fd;
+
+	fd = rump_sys_open("sheep", O_RDONLY);
+	if (fd == -1)
+		atf_tc_fail_errno("r1 open");
+	if (rump_sys_read(fd, buf, sizeof(buf)) != sizeof(teststr1))
+		atf_tc_fail_errno("r1 read");
+	rump_sys_close(fd);
+
+	if (strcmp(teststr1, buf) != 0)
+		atf_tc_fail("got invalid str, %s vs. %s", buf, teststr1);
+
+	return NULL;
+}
+
+static void *
+r2(void *arg)
+{
+	char buf[32];
+	int fd;
+
+	fd = rump_sys_open("pigs", O_RDONLY);
+	if (fd == -1)
+		atf_tc_fail_errno("r2 open");
+	if (rump_sys_read(fd, buf, sizeof(buf)) != sizeof(teststr2))
+		atf_tc_fail_errno("r2 read");
+	rump_sys_close(fd);
+
+	if (strcmp(teststr2, buf) != 0)
+		atf_tc_fail("got invalid str, %s vs. %s", buf, teststr2);
+
+	return NULL;
+}
+
+#define IMGNAME "atf.img"
+
+const char *newfs = "newfs -F -s 10000 " IMGNAME;
+#define FAKEBLK "/dev/sp00ka"
+
+ATF_TC_BODY(fifos, tc)
+{
+	struct ufs_args args;
+	pthread_t ptw1, ptw2, ptr1, ptr2;
+
+	if (system(newfs) == -1)
+		atf_tc_fail_errno("newfs failed");
+
+	memset(&args, 0, sizeof(args));
+	args.fspec = __UNCONST(FAKEBLK);
+
+	rump_init();
+	if (rump_sys_mkdir("/animals", 0777) == -1)
+		atf_tc_fail_errno("cannot create mountpoint");
+	rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK);
+	if (rump_sys_mount(MOUNT_FFS, "/animals", 0, &args, sizeof(args))==-1)
+		atf_tc_fail_errno("rump_sys_mount failed");
+
+	/* create fifos */
+	if (rump_sys_chdir("/animals") == 1)
+		atf_tc_fail_errno("chdir");
+	if (rump_sys_mkfifo("pigs", S_IFIFO | 0777) == -1)
+		atf_tc_fail_errno("mknod1");
+	if (rump_sys_mkfifo("sheep", S_IFIFO | 0777) == -1)
+		atf_tc_fail_errno("mknod2");
+		
+	pthread_create(&ptw1, NULL, w1, NULL);
+	pthread_create(&ptw2, NULL, w2, NULL);
+	pthread_create(&ptr1, NULL, r1, NULL);
+	pthread_create(&ptr2, NULL, r2, NULL);
+
+	pthread_join(ptw1, NULL);
+	pthread_join(ptw2, NULL);
+	pthread_join(ptr1, NULL);
+	pthread_join(ptr2, NULL);
+
+	if (rump_sys_chdir("/") == 1)
+		atf_tc_fail_errno("chdir");
+
+	if (rump_sys_unmount("/animals", 0) == -1)
+		atf_tc_fail_errno("unmount failed");
+}
+
+ATF_TC_CLEANUP(fifos, tc)
+{
+
+	unlink(IMGNAME);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, fifos);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_getquota.sh b/contrib/netbsd-tests/fs/ffs/t_getquota.sh
new file mode 100755
index 000000000000..80f3cc7a6e76
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_getquota.sh
@@ -0,0 +1,112 @@
+# $NetBSD: t_getquota.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    for q in "user" "group"; do
+      test_case get_${e}_${v}_${q} get_quota \
+	 "get quota with ${q} enabled" -b ${e} ${v} ${q}
+    done
+    test_case get_${e}_${v}_"both" get_quota \
+	 "get quota with both enabled" -b ${e} ${v} "both"
+  done
+done
+
+get_quota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local fail
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#check that we can get the expected quota
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+-o "match:/mnt        0        -        -   7days       1       -       -   7days" \
+-o "match:Disk quotas for .*: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
+		atf_check -s exit:0 \
+-o "match:--        0        -        -                1       -       -" \
+-o "not-match:\+\+"							  \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
+	done
+
+#check that we do not get positive reply for non-expected quota
+	for q in ${fail} ; do
+		atf_check -s exit:0 -o "not-match:/mnt" \
+		    -o "not-match:Disk quotas for .*: $" \
+		    -o "match:Disk quotas for .*: none$" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
+		atf_check -s exit:0 \
+-o "not-match:--        0        -        -                1       -       -" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
+	done
+	rump_quota_shutdown
+}
+
+quota_walk_list()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_miscquota.sh b/contrib/netbsd-tests/fs/ffs/t_miscquota.sh
new file mode 100755
index 000000000000..904ea37f8f6c
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_miscquota.sh
@@ -0,0 +1,213 @@
+# $NetBSD: t_miscquota.sh,v 1.8 2013/01/22 06:24:11 dholland Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+test_case_root walk_list_user quota_walk_list \
+    "walk user quota list over several disk blocks" -b le 1 user
+
+test_case_root psnapshot_user quota_snap \
+    "create a persistent shapshot of quota-enabled fs, and do some writes" \
+    -b le 1 user
+
+test_case_root npsnapshot_user quota_snap \
+    "create a non-persistent shapshot of quota-enabled fs, and do some writes" \
+    -boL le 1 user
+
+test_case_root psnapshot_unconf_user quota_snap \
+    "create a persistent shapshot of quota-enabled fs, and do some writes and unconf" \
+    -boC le 1 user
+
+test_case_root npsnapshot_unconf_user quota_snap \
+    "create a non-persistent shapshot of quota-enabled fs, and do some writes and unconf" \
+    -boLC le 1 user
+
+test_case log_unlink quota_log \
+    "an unlinked file cleaned by the log replay should update quota" \
+    -l le 1 user
+
+test_case log_unlink_remount quota_log \
+    "an unlinked file cleaned by the log replay after remount" \
+    -oRL le 1 user
+
+
+test_case_root default_deny_user quota_default_deny \
+    "new quota entry denied by default entry" 5 -b le 1 user
+
+test_case_root default_deny_user_big quota_default_deny \
+    "new quota entry denied by default entry, with list on more than one block" 5000 -b le 1 user
+
+
+quota_walk_list()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	# create 100 users, all in the same hash list
+	local i=1;
+	while [ $i -lt 101 ]; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -${expect} \
+		   -s10k/20 -h40M/50k -t 2W/3D $((i * 4096))
+		i=$((i + 1))
+	done
+	# do a repquota
+	atf_check -s exit:0 -o 'match:user 409600 block  *81920 20 0' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -x -${expect} /mnt
+	rump_quota_shutdown
+}
+
+quota_snap()
+{
+	local flag=$1; shift
+	create_ffs $*
+	local q=$3
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	#start our server which takes a snapshot
+	atf_check -s exit:0 -o ignore \
+	    $(atf_get_srcdir)/h_quota2_tests ${flag} 4 ${IMG} ${RUMP_SERVER}
+	# create a few users
+	local i=1;
+	while [ $i -lt 11 ]; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -${expect} \
+		   -s10k/20 -h40M/50k -t 2W/3D $i
+		i=$((i + 1))
+	done
+	# we should have 5 files (root + 4 regular files)
+	atf_check -s exit:0 \
+	    -o 'match:-        -  7days         5       -       -  7days' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -av
+	#shutdown and check filesystem
+	rump_quota_shutdown
+}
+
+quota_log()
+{
+	local srv2args=$1; shift
+	create_ffs $*
+	local q=$3
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	#start our server which create a file and unlink while keeping
+	# it open. The server halts itself without flush
+	atf_check -s exit:0 -o ignore \
+	    $(atf_get_srcdir)/h_quota2_tests -loU 5 ${IMG} ${RUMP_SERVER}
+	# we should have one unlinked file, but the log covers it.
+	atf_check -s exit:0 -o match:'3 files' -e ignore \
+	    fsck_ffs -nf -F ${IMG}
+	# have a kernel mount the fs again; it should cleanup the
+	# unlinked file
+	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_quota2_tests \
+	    ${srv2args} -b 5 ${IMG} ${RUMP_SERVER}
+	#shutdown and check filesystem
+	rump_quota_shutdown
+}
+
+quota_default_deny()
+{
+	local nusers=$1; shift
+	create_ffs_server $*
+	local q=$4
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	# create $nusers users, so we are sure the free list has entries
+	# from block 1. Start from 10, as non-root id is 1.
+	# set default to deny all
+	( echo "@format netbsd-quota-dump v1"
+	  echo "# idtype id objtype   hard soft usage expire grace"
+	  echo "$q default block   0 0 0 0 0"
+	  echo "$q default file   0 0 0 0 0"
+	  local i=10;
+	  while [ $i -lt $(($nusers + 10)) ]; do
+		echo "$q $i block   0 0 0 0 0"
+		echo "$q $i file   0 0 0 0 0"
+		i=$((i + 1))
+	  done
+	) | atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quotarestore -d /mnt
+	atf_check -s exit:0 rump.halt
+	#now start the server which does the limits tests
+	$(atf_get_srcdir)/h_quota2_tests -oC -b 0 ${IMG} ${RUMP_SERVER}
+	rump_quota_shutdown
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_mount.c b/contrib/netbsd-tests/fs/ffs/t_mount.c
new file mode 100644
index 000000000000..6a8f74f455f8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_mount.c
@@ -0,0 +1,138 @@
+/*	$NetBSD: t_mount.c,v 1.13 2012/11/27 16:01:49 jakllsch Exp $	*/
+
+/*
+ * Basic tests for mounting
+ */
+
+/*
+ * 48Kimage:
+ * Adapted for rump and atf from a testcase supplied
+ * by Hubert Feyrer on netbsd-users@
+ */
+
+#include <atf-c.h>
+
+#define FSTEST_IMGSIZE (96 * 512)
+#include "../common/h_fsmacros.h"
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <stdlib.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(48Kimage);
+ATF_TC_HEAD(48Kimage, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "mount small 48K ffs image");
+}
+
+ATF_TC_BODY(48Kimage, tc)
+{
+	void *tmp;
+
+	atf_tc_expect_fail("PR kern/43573");
+	FSTEST_CONSTRUCTOR(tc, ffs, tmp);
+	atf_tc_expect_pass();
+
+	FSTEST_DESTRUCTOR(tc, ffs, tmp);
+}
+
+ATF_TC(fsbsizeovermaxphys);
+ATF_TC_HEAD(fsbsizeovermaxphys, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "mounts file system with "
+	    "blocksize > MAXPHYS");
+	/* PR kern/43727 */
+}
+
+ATF_TC_BODY(fsbsizeovermaxphys, tc)
+{
+	char cmd[1024];
+	struct ufs_args args;
+	struct statvfs svb;
+
+	/*
+	 * We cannot pass newfs parameters via the fstest interface,
+	 * so do things the oldfashioned manual way.
+	 */
+	snprintf(cmd, sizeof(cmd), "newfs -G -b %d -F -s 10000 "
+	    "ffs.img > /dev/null", MAXPHYS * 2);
+	if (system(cmd))
+		atf_tc_fail("cannot create file system");
+
+	rump_init();
+	if (rump_pub_etfs_register("/devdisk", "ffs.img", RUMP_ETFS_BLK))
+		atf_tc_fail("cannot register rump fake device");
+
+	args.fspec = __UNCONST("/devdisk");
+
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("create mountpoint");
+
+	/* mount succeeded?  bad omen.  confirm we're in trouble.  */
+	if (rump_sys_mount(MOUNT_FFS, "/mp", 0, &args, sizeof(args)) != -1) {
+		rump_sys_statvfs1("/mp", &svb, ST_WAIT);
+		atf_tc_fail("not expecting to be alive");
+	}
+
+	/* otherwise we're do-ne */
+}
+
+ATF_TC(fsbsizeovermaxbsize);
+ATF_TC_HEAD(fsbsizeovermaxbsize, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "mounts file system with "
+	    "blocksize > MAXBSIZE");
+}
+
+ATF_TC_BODY(fsbsizeovermaxbsize, tc)
+{
+	char cmd[1024];
+	struct ufs_args args;
+	struct statvfs svb;
+
+	/*
+	 * We cannot pass newfs parameters via the fstest interface,
+	 * so do things the oldfashioned manual way.
+	 */
+	snprintf(cmd, sizeof(cmd), "newfs -G -b %d -F -s 10000 "
+	    "ffs.img > /dev/null", MAXBSIZE * 2);
+	if (system(cmd))
+		atf_tc_fail("cannot create file system");
+
+	rump_init();
+	if (rump_pub_etfs_register("/devdisk", "ffs.img", RUMP_ETFS_BLK))
+		atf_tc_fail("cannot register rump fake device");
+
+	args.fspec = __UNCONST("/devdisk");
+
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("create mountpoint");
+
+	/* mount succeeded?  bad omen.  confirm we're in trouble.  */
+	if (rump_sys_mount(MOUNT_FFS, "/mp", 0, &args, sizeof(args)) != -1) {
+		rump_sys_statvfs1("/mp", &svb, ST_WAIT);
+		atf_tc_fail("not expecting to be alive");
+	}
+
+	/* otherwise we're do-ne */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, 48Kimage);
+	ATF_TP_ADD_TC(tp, fsbsizeovermaxphys);
+	ATF_TP_ADD_TC(tp, fsbsizeovermaxbsize);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_quota2_1.c b/contrib/netbsd-tests/fs/ffs/t_quota2_1.c
new file mode 100644
index 000000000000..333f3c712708
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_quota2_1.c
@@ -0,0 +1,114 @@
+/*	$NetBSD: t_quota2_1.c,v 1.4 2012/03/15 02:02:22 joerg Exp $	*/
+
+/*
+ * Basic tests for quota2
+ */
+
+#include <atf-c.h>
+
+#include "../common/h_fsmacros.h"
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <stdlib.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+static void
+do_quota(const atf_tc_t *tc, int n, const char *newfs_opts, int log)
+{
+	int i;
+	char buf[1024];
+	int res;
+	int fd;
+	struct ufs_args uargs;
+	
+	snprintf(buf, sizeof(buf), "newfs -q user -q group -F -s 4000 -n %d "
+	    "%s %s", (n + 3),  newfs_opts, FSTEST_IMGNAME);
+        if (system(buf) == -1)
+                atf_tc_fail_errno("cannot create file system");
+
+	rump_init();
+	if (rump_sys_mkdir(FSTEST_MNTNAME, 0777) == -1)
+		atf_tc_fail_errno("mount point create");
+
+	rump_pub_etfs_register("/diskdev", FSTEST_IMGNAME, RUMP_ETFS_BLK);
+
+	uargs.fspec = __UNCONST("/diskdev");
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME, (log) ? MNT_LOG : 0,
+	    &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs %s", FSTEST_MNTNAME);
+
+	atf_tc_expect_pass();
+	FSTEST_ENTER();
+	RL(rump_sys_chown(".", 0, 0));
+	for (i = 0 ; i < n; i++) {
+		sprintf(buf, "file%d", i);
+		RL(fd = rump_sys_open(buf, O_CREAT | O_RDWR, 0755));
+		sprintf(buf, "test file no %d", i);
+		RL(rump_sys_write(fd, buf, strlen(buf)));
+		RL(rump_sys_fchown(fd, i, i+80000));
+		rump_sys_close(fd);
+	}
+	FSTEST_EXIT();
+	if (rump_sys_unmount(FSTEST_MNTNAME, 0) != 0) {
+		rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);
+		atf_tc_fail_errno("unmount failed");
+	}
+	snprintf(buf, 1024, "fsck_ffs -fn -F %s",  FSTEST_IMGNAME);
+	res = system(buf);
+	if (res != 0)
+		atf_tc_fail("fsck returned %d", res);
+}
+
+#define DECL_TEST(nent, newops, name, descr, log) \
+ATF_TC(quota_##name);							\
+									\
+ATF_TC_HEAD(quota_##name, tc)						\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "test quotas with %d users and groups, %s",			\
+	    nent, descr);						\
+}									\
+									\
+ATF_TC_BODY(quota_##name, tc)						\
+{									\
+	do_quota(tc, nent, newops, log);				\
+}
+
+DECL_TEST(40, "-O1 -B le", 40_O1_le, "UFS1 little-endian", 0)
+DECL_TEST(40, "-O1 -B be", 40_O1_be, "UFS1 big-endian", 0)
+
+DECL_TEST(40, "-O2 -B le", 40_O2_le, "UFS2 little-endian", 0)
+DECL_TEST(40, "-O2 -B be", 40_O2_be, "UFS2 big-endian", 0)
+
+DECL_TEST(40, "-O1", 40_O1_log, "UFS1 log", 1)
+DECL_TEST(40, "-O2", 40_O2_log, "UFS2 log", 1)
+
+DECL_TEST(1000, "-O1 -B le", 1000_O1_le, "UFS1 little-endian", 0)
+DECL_TEST(1000, "-O1 -B be", 1000_O1_be, "UFS1 big-endian", 0)
+
+DECL_TEST(1000, "-O2 -B le", 1000_O2_le, "UFS2 little-endian", 0)
+DECL_TEST(1000, "-O2 -B be", 1000_O2_be, "UFS2 big-endian", 0)
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, quota_40_O1_le);
+	ATF_TP_ADD_TC(tp, quota_40_O1_be);
+	ATF_TP_ADD_TC(tp, quota_40_O2_le);
+	ATF_TP_ADD_TC(tp, quota_40_O2_be);
+	ATF_TP_ADD_TC(tp, quota_40_O1_log);
+	ATF_TP_ADD_TC(tp, quota_40_O2_log);
+	ATF_TP_ADD_TC(tp, quota_1000_O1_le);
+	ATF_TP_ADD_TC(tp, quota_1000_O1_be);
+	ATF_TP_ADD_TC(tp, quota_1000_O2_le);
+	ATF_TP_ADD_TC(tp, quota_1000_O2_be);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_quota2_remount.c b/contrib/netbsd-tests/fs/ffs/t_quota2_remount.c
new file mode 100644
index 000000000000..f648856bbf70
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_quota2_remount.c
@@ -0,0 +1,139 @@
+/*	$NetBSD: t_quota2_remount.c,v 1.4 2012/03/15 02:02:22 joerg Exp $	*/
+
+/*
+ * Basic tests for quota2
+ */
+
+#include <atf-c.h>
+
+#include "../common/h_fsmacros.h"
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/statvfs.h>
+
+#include <stdlib.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+static void
+do_quota(const atf_tc_t *tc, int n, const char *newfs_opts, int log)
+{
+	int i;
+	char buf[1024];
+	int res;
+	int fd;
+	struct ufs_args uargs;
+	struct statvfs fst;
+	
+	snprintf(buf, sizeof(buf), "newfs -q user -q group -F -s 4000 -n %d "
+	    "%s %s", (n + 3),  newfs_opts, FSTEST_IMGNAME);
+        if (system(buf) == -1)
+                atf_tc_fail_errno("cannot create file system");
+
+	rump_init();
+	if (rump_sys_mkdir(FSTEST_MNTNAME, 0777) == -1)
+		atf_tc_fail_errno("mount point create");
+
+	rump_pub_etfs_register("/diskdev", FSTEST_IMGNAME, RUMP_ETFS_BLK);
+
+	uargs.fspec = __UNCONST("/diskdev");
+
+	/* read-only doens't have quota enabled */
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME, MNT_RDONLY,
+	    &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs ro %s", FSTEST_MNTNAME);
+
+	if (rump_sys_statvfs1(FSTEST_MNTNAME, &fst, 0) != 0)
+		atf_tc_fail_errno("statbfs %s (1)", FSTEST_MNTNAME);
+
+	if ((fst.f_flag & ST_QUOTA) != 0)
+		atf_tc_fail("R/O filesystem has quota");
+
+	/* updating to read-write enables quota */
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME,
+	    MNT_UPDATE | (log ? MNT_LOG : 0), &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs rw %s", FSTEST_MNTNAME);
+	
+	if (rump_sys_statvfs1(FSTEST_MNTNAME, &fst, 0) != 0)
+		atf_tc_fail_errno("statbfs %s (2)", FSTEST_MNTNAME);
+
+	if ((fst.f_flag & ST_QUOTA) == 0)
+		atf_tc_fail("R/W filesystem has no quota");
+
+	/* we can update a second time  */
+	if (rump_sys_mount(MOUNT_FFS, FSTEST_MNTNAME,
+	    MNT_UPDATE | (log ? MNT_LOG : 0), &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs rw(2) %s", FSTEST_MNTNAME);
+	
+	if (rump_sys_statvfs1(FSTEST_MNTNAME, &fst, 0) != 0)
+		atf_tc_fail_errno("statbfs %s (3)", FSTEST_MNTNAME);
+
+	if ((fst.f_flag & ST_QUOTA) == 0)
+		atf_tc_fail("R/W filesystem has no quota");
+
+	/* create some files so fsck has something to check */
+	FSTEST_ENTER();
+	RL(rump_sys_chown(".", 0, 0));
+	for (i = 0 ; i < n; i++) {
+		sprintf(buf, "file%d", i);
+		RL(fd = rump_sys_open(buf, O_CREAT | O_RDWR, 0755));
+		sprintf(buf, "test file no %d", i);
+		RL(rump_sys_write(fd, buf, strlen(buf)));
+		RL(rump_sys_fchown(fd, i, i+80000));
+		rump_sys_close(fd);
+	}
+	FSTEST_EXIT();
+	if (rump_sys_unmount(FSTEST_MNTNAME, 0) != 0) {
+		rump_pub_vfs_mount_print(FSTEST_MNTNAME, 1);
+		atf_tc_fail_errno("unmount failed");
+	}
+	snprintf(buf, 1024, "fsck_ffs -fn -F %s",  FSTEST_IMGNAME);
+	res = system(buf);
+	if (res != 0)
+		atf_tc_fail("fsck returned %d", res);
+}
+
+#define DECL_TEST(nent, newops, name, descr, log) \
+ATF_TC(quota_##name);							\
+									\
+ATF_TC_HEAD(quota_##name, tc)						\
+{									\
+	atf_tc_set_md_var(tc, "descr", 					\
+	    "test filesystem remount with quotas, %s", descr);		\
+}									\
+									\
+ATF_TC_BODY(quota_##name, tc)						\
+{									\
+	do_quota(tc, nent, newops, log);				\
+}
+
+DECL_TEST(10, "-O1 -B le", 10_O1_le, "UFS1 little-endian", 0)
+DECL_TEST(10, "-O1 -B be", 10_O1_be, "UFS1 big-endian", 0)
+
+#if 0
+/*
+ * this cause fsck to complain about summaries at the end.
+ * This sems to be related to -o log (reproductible on a fs with no
+ * quota enabled). not reproductible with a real kernel ...
+ */
+DECL_TEST(10, "-O1", 10_O1_log, "UFS1 log", 1)
+DECL_TEST(10, "-O2", 10_O2_log, "UFS2 log", 1)
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, quota_10_O1_le);
+	ATF_TP_ADD_TC(tp, quota_10_O1_be);
+#if 0
+	ATF_TP_ADD_TC(tp, quota_10_O1_log);
+	ATF_TP_ADD_TC(tp, quota_10_O2_log);
+#endif
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_quotalimit.sh b/contrib/netbsd-tests/fs/ffs/t_quotalimit.sh
new file mode 100755
index 000000000000..16e47b7a8fb8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_quotalimit.sh
@@ -0,0 +1,345 @@
+# $NetBSD: t_quotalimit.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le; do
+  for v in 1; do
+    for q in "user" "group"; do
+      test_case_root limit_${e}_${v}_${q} limit_quota \
+	 "hit hard limit quota with ${q} enabled" -b ${e} ${v} ${q}
+      test_case_root limit_${e}_${v}_${q}_log limit_quota \
+	 "hit hard limit quota with ${q} enabled, WAPBL" -bl ${e} ${v} ${q}
+      test_case_root slimit_${e}_${v}_${q} limit_softquota \
+	 "hit soft limit quota with ${q} enabled after grace time" \
+	 -b ${e} ${v} ${q}
+      test_case_root inolimit_${e}_${v}_${q} limit_iquota \
+	 "hit hard limit ino quota with ${q} enabled" -b ${e} ${v} ${q}
+      test_case_root inolimit_${e}_${v}_${q}_log limit_iquota \
+	 "hit hard limit ino quota with ${q} enabled, WAPBL" -bl ${e} ${v} ${q}
+      test_case_root sinolimit_${e}_${v}_${q} limit_softiquota \
+	 "hit soft limit ino quota with ${q} enabled after grace time" \
+	 -b ${e} ${v} ${q}
+      test_case_root herit_defq_${e}_${v}_${q} inherit_defaultquota \
+	 "new id herit from default for ${q} quota" -b ${e} ${v} ${q}
+      test_case_root herit_defq_${e}_${v}_${q}_log inherit_defaultquota \
+	 "new id herit from default for ${q} quota, WAPBL" -bl ${e} ${v} ${q}
+      test_case_root herit_idefq_${e}_${v}_${q}_log inherit_defaultiquota \
+	 "new id herit from default for ${q} ino quota, WAPBL" -bl ${e} ${v} ${q}
+    done
+  done
+done
+
+limit_quota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
+		   -t 2h/2h ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 0: write up to hard limit returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 0 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   3072 B\*  2048 B   3072 B     2:0      2       4       6         ' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    \+-        3        2        3    2:0         2       4       6' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
+
+limit_softquota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
+		   -t 1s/1d ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 1: write beyond the soft limit after grace time returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 1 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   2560 B\*  2048 B   3072 B    none      2       4       6         ' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    \+-        2        2        3   none         2       4       6' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
+
+limit_iquota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
+		   -t 2h/2h ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 2: create file up to hard limit returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 2 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   3072 B   2048 K   3072 K              6 \*     4       6      2:0' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    -\+        3     2048     3072                6       4       6    2:0' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
+
+limit_softiquota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
+		   -t 1d/1s ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 3: create file beyond the soft limit after grace time returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 3 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   2560 B   2048 K   3072 K              5 \*     4       6     none' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    -\+        2     2048     3072                5       4       6   none' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
+
+inherit_defaultquota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
+		   -t 2h/2h -d
+	done
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'Disk quotas for .*id 1\): none' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -v ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 0: write up to hard limit returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 0 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   3072 B\*  2048 B   3072 B     2:0      2       4       6         ' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    \+-        3        2        3    2:0         2       4       6' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
+
+inherit_defaultiquota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local id=1
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
+		   -t 2h/2h -d
+	done
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'Disk quotas for .*id 1\): none' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -v ${id}
+	done
+	atf_check -s exit:0 rump.halt
+
+	#now start the server which does the limits tests
+	atf_check -s exit:0 -o ignore \
+-e match:'test 2: create file up to hard limit returned 69: Disc quota exceeded' \
+	    $(atf_get_srcdir)/h_quota2_tests -b 2 ${IMG} ${RUMP_SERVER}
+	for q in ${expect} ; do
+		atf_check -s exit:0 \
+		    -o match:'/mnt   3072 B   2048 K   3072 K              6 \*     4       6      2:0' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
+		atf_check -s exit:0 \
+		    -o match:'daemon    -\+        3     2048     3072                6       4       6    2:0' \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
+	done
+	rump_quota_shutdown
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_setquota.sh b/contrib/netbsd-tests/fs/ffs/t_setquota.sh
new file mode 100755
index 000000000000..5795fe4d46b6
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_setquota.sh
@@ -0,0 +1,203 @@
+# $NetBSD: t_setquota.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    for q in "user" "group"; do
+      test_case_root set_${e}_${v}_${q} set_quota \
+	 "set quota with ${q} enabled" -b ${e} ${v} ${q}
+      test_case_root set_new_${e}_${v}_${q} set_quota_new \
+	 "set quota for new id with ${q} enabled" -b ${e} ${v} ${q}
+      test_case_root set_default_${e}_${v}_${q} set_quota_default \
+	 "set default quota with ${q} enabled" -b ${e} ${v} ${q}
+    done
+    test_case_root set_${e}_${v}_"both" set_quota \
+	 "set quota with both enabled" -b ${e} ${v} "both"
+    test_case_root set_new_${e}_${v}_"both" set_quota_new \
+	 "set quota for new id with both enabled" -b ${e} ${v} "both"
+    test_case_root set_new_${e}_${v}_"both_log" set_quota_new \
+	 "set quota for new id with both enabled, WAPBL" -bl ${e} ${v} "both"
+    test_case_root set_default_${e}_${v}_"both" set_quota_default \
+	 "set default quota with both enabled" -b ${e} ${v} "both"
+  done
+done
+
+set_quota()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local fail
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#check that we can set the expected quota
+	for q in ${expect} ; do
+		local id=$(id -${q})
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
+		   -t 2W/3D ${id}
+		atf_check -s exit:0 \
+-o "match:/mnt        0       10    40960  2weeks       1      20   51200   3days" \
+-o "match:Disk quotas for .*: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
+		atf_check -s exit:0 \
+-o "match:--        0       10    40960                1      20   51200" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
+	done
+
+#check that we do not get positive reply for non-expected quota
+	for q in ${fail} ; do
+		local id=$(id -${q})
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
+		atf_check -s exit:0 -o "not-match:/mnt" \
+		    -o "not-match:Disk quotas for .*: $" \
+		    -o "match:Disk quotas for .*: none$" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
+		atf_check -s exit:0 \
+-o "not-match:--        0        -        -" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
+	done
+	rump_quota_shutdown
+}
+
+set_quota_new()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local fail
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#check that we can set the expected quota
+	for q in ${expect} ; do
+		local id=1
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
+		   -t 120W/255D ${id}
+		atf_check -s exit:0 \
+-o "match:/mnt        0       10    40960  2years       0      20   51200 9months" \
+-o "match:Disk quotas for .*: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+
+#check that we do not get positive reply for non-expected quota
+	for q in ${fail} ; do
+		local id=$(id -${q})
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
+		atf_check -s exit:0 -o "not-match:/mnt" \
+		    -o "not-match:Disk quotas for .*: $" \
+		    -o "match:Disk quotas for .*: none$" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+	rump_quota_shutdown
+}
+
+set_quota_default()
+{
+	create_ffs_server $*
+	local q=$4
+	local expect
+	local fail
+
+	case ${q} in
+	user)
+		expect=u
+		fail=g
+		;;
+	group)
+		expect=g
+		fail=u
+		;;
+	both)
+		expect="u g"
+		fail=""
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#check that we can set the expected quota
+	for q in ${expect} ; do
+		local id="-d"
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
+		   -t 2H2M/3540 ${id}
+		atf_check -s exit:0 \
+-o "match:/mnt        0       10    40960     2:2       0      20   51200      59" \
+-o "match:Default (user|group) disk quotas: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+
+#check that we do not get positive reply for non-expected quota
+	for q in ${fail} ; do
+		local id="-d"
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
+		atf_check -s exit:0 -o "not-match:/mnt" \
+		    -o "not-match:Default (user|group) disk quotas: $" \
+		    -o "match:Default (user|group) disk quotas: none$" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
+	done
+	rump_quota_shutdown
+}
diff --git a/contrib/netbsd-tests/fs/ffs/t_snapshot.c b/contrib/netbsd-tests/fs/ffs/t_snapshot.c
new file mode 100644
index 000000000000..180a8ccd92b0
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_snapshot.c
@@ -0,0 +1,43 @@
+/*	$NetBSD: t_snapshot.c,v 1.6 2013/02/06 09:05:01 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+#define IMGNAME "ffs.img"
+#define NEWFS "newfs -F -s 10000 " IMGNAME
+#define FSCK "fsck_ffs -fn -F"
+#define BAKNAME "/mnt/le_snapp"
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+	struct ufs_args uargs;
+
+	uargs.fspec = __UNCONST(fspec);
+
+	if (rump_sys_mount(MOUNT_FFS, path, 0, &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs %s", path);
+}
+
+static void
+begin(void)
+{
+
+	/* empty */
+}
+
+#include "../common/snapshot.c"
diff --git a/contrib/netbsd-tests/fs/ffs/t_snapshot_log.c b/contrib/netbsd-tests/fs/ffs/t_snapshot_log.c
new file mode 100644
index 000000000000..e1ce17e1006a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_snapshot_log.c
@@ -0,0 +1,46 @@
+/*	$NetBSD: t_snapshot_log.c,v 1.2 2013/02/06 09:05:01 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+#define IMGNAME "ffs.img"
+#define NEWFS "newfs -F -s 10000 " IMGNAME
+#define FSCK "fsck_ffs -fn -F"
+#define BAKNAME "/mnt/le_snapp"
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+	struct ufs_args uargs;
+	static int flags = MNT_LOG;
+
+	uargs.fspec = __UNCONST(fspec);
+
+	if (rump_sys_mount(MOUNT_FFS,
+	    path, flags, &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs %s", path);
+	flags = 0;
+}
+
+static void
+begin(void)
+{
+
+	/* empty */
+}
+
+#include "../common/snapshot.c"
diff --git a/contrib/netbsd-tests/fs/ffs/t_snapshot_v2.c b/contrib/netbsd-tests/fs/ffs/t_snapshot_v2.c
new file mode 100644
index 000000000000..393f3d41a6c3
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ffs/t_snapshot_v2.c
@@ -0,0 +1,43 @@
+/*	$NetBSD: t_snapshot_v2.c,v 1.2 2013/02/06 09:05:01 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+#define IMGNAME "ffs.img"
+#define NEWFS "newfs -F -s 10000 -O 2 " IMGNAME
+#define FSCK "fsck_ffs -fn -F"
+#define BAKNAME "/mnt/le_snapp"
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+	struct ufs_args uargs;
+
+	uargs.fspec = __UNCONST(fspec);
+
+	if (rump_sys_mount(MOUNT_FFS, path, 0, &uargs, sizeof(uargs)) == -1)
+		atf_tc_fail_errno("mount ffs %s", path);
+}
+
+static void
+begin(void)
+{
+
+	/* empty */
+}
+
+#include "../common/snapshot.c"
diff --git a/contrib/netbsd-tests/fs/fifofs/t_fifo.c b/contrib/netbsd-tests/fs/fifofs/t_fifo.c
new file mode 100644
index 000000000000..c4a2060a6ebc
--- /dev/null
+++ b/contrib/netbsd-tests/fs/fifofs/t_fifo.c
@@ -0,0 +1,237 @@
+/* Test case written by Bharat Joshi */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fifo.c,v 1.1 2011/12/21 00:17:07 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <err.h>
+#include <signal.h>
+
+#ifndef STANDALONE
+#include <atf-c.h>
+#endif
+
+#define FIFO_FILE_PATH       "./fifo_file"
+#define NUM_MESSAGES         20
+#define MSG_SIZE             240
+#define MESSAGE              "I am fine"
+
+static int verbose = 0;
+
+/*
+ * child_writer
+ *
+ * Function that runs in child context and opens and write to the FIFO.
+ */
+static void
+child_writer(void)
+{
+	ssize_t rv;
+	int fd;
+	size_t count;
+	char message[MSG_SIZE] = MESSAGE;
+	static const struct timespec ts = { 0, 10000 };
+
+	/* Open the fifo in write-mode */
+	for (;;) {
+		fd = open(FIFO_FILE_PATH, O_WRONLY, 0);
+		if (fd == -1) {
+			if (errno == EINTR)
+				continue;
+			err(1, "Child: can't open fifo in write mode");
+		}
+		break;
+	}
+
+	for (count = 0; count < NUM_MESSAGES; count++) {
+		rv = write(fd, message, MSG_SIZE);
+		if (rv == -1) {
+			warn("Child: Failed to write");
+			break;
+		}
+		if (rv != MSG_SIZE)
+			warnx("Child: wrote only %zd", rv);
+		nanosleep(&ts, NULL);
+	}
+
+	close(fd);
+	if (verbose) {
+		printf("Child: Closed the fifo file\n");
+		fflush(stdout);
+	}
+}
+
+/*
+ * _sigchild_handler
+ *
+ * Called when a sigchild is delivered
+ */
+static void
+sigchild_handler(int signo)
+{
+	if (verbose) {
+		if (signo == SIGCHLD) {
+			printf("Got sigchild\n");
+		} else {
+			printf("Got %d signal\n", signo);
+		}
+		fflush(stdout);
+	}
+
+}
+
+static int
+run(void)
+{
+	pid_t pid;
+	ssize_t rv;
+	int fd, status;
+	size_t buf_size = MSG_SIZE;
+	char buf[MSG_SIZE];
+	struct sigaction action;
+	static const struct timespec ts = { 0, 500000000 };
+
+	/* Catch sigchild Signal */
+	memset(&action, 0, sizeof(action));
+	action.sa_handler = sigchild_handler;
+	sigemptyset(&action.sa_mask);
+
+	if (sigaction(SIGCHLD, &action, NULL) == -1)
+		err(1, "sigaction");
+
+	(void)unlink(FIFO_FILE_PATH);
+	/* First create a fifo */
+	if (mkfifo(FIFO_FILE_PATH, S_IRUSR | S_IWUSR) == -1)
+		err(1, "mkfifo");
+
+	switch ((pid = fork())) {
+	case -1:
+		err(1, "fork");
+	case 0:
+		/* Open the file in write mode so that subsequent read 
+		 * from parent side does not block the parent..
+		 */
+		if ((fd = open(FIFO_FILE_PATH, O_WRONLY, 0)) == -1)
+			err(1, "failed to open fifo");
+
+		/* In child */
+		child_writer();
+		return 0;
+
+	default:
+		break;
+	}
+
+	if (verbose) {
+		printf("Child pid is %d\n", pid );
+		fflush(stdout);
+	}
+
+	/* In parent */
+	for (;;) {
+		if ((fd = open(FIFO_FILE_PATH, O_RDONLY, 0)) == -1) {
+			if (errno == EINTR)
+				continue;
+			else
+				err(1, "Failed to open the fifo in read mode");
+		}
+		/* Read mode is opened */
+		break;
+
+	}
+
+	nanosleep(&ts, NULL);
+	if (verbose) {
+		printf("Was sleeping...\n");
+		fflush(stdout);
+	}
+
+	for (;;) {
+		rv = read(fd, buf, buf_size);
+
+		if (rv == -1) {
+			warn("Failed to read");
+			if (errno == EINTR) {
+				if (verbose) {
+					printf("Parent interrupted, "
+					    "continuing...\n");
+					fflush(stdout);
+				}
+				continue;
+			}
+
+			break;
+		}
+
+		if (rv == 0) {
+			if (verbose) {
+				printf("Writers have closed, looks like we "
+				    "are done\n");
+				fflush(stdout);
+			}
+			break;
+		}
+
+		if (verbose) {
+			printf("Received %zd bytes message '%s'\n", rv, buf);
+			fflush(stdout);
+		}
+	}
+
+	close(fd);
+
+	if (verbose) {
+		printf("We are done.. now reap the child");
+		fflush(stdout);
+	}
+
+	// Read the child...
+	while (waitpid(pid, &status, 0) == -1)
+		if (errno != EINTR) {
+			warn("Failed to reap the child");
+			return 1;
+		}
+
+	if (verbose) {
+		printf("We are done completely\n");
+		fflush(stdout);
+	}
+	return 0;
+}
+
+#ifndef STANDALONE
+ATF_TC(parent_child);      
+
+ATF_TC_HEAD(parent_child, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Checks that when a fifo is shared "
+	    "between a reader parent and a writer child, that read will "
+	    "return EOF, and not get stuck after the child exits");
+}
+ 
+ATF_TC_BODY(parent_child, tc)
+{       
+        ATF_REQUIRE(run() == 0);
+}       
+
+ATF_TP_ADD_TCS(tp)
+{       
+        ATF_TP_ADD_TC(tp, parent_child);
+        
+        return atf_no_error();
+}       
+#else
+int
+main(void)
+{
+	verbose = 1;
+	return run();
+}
+#endif
diff --git a/contrib/netbsd-tests/fs/h_funcs.subr b/contrib/netbsd-tests/fs/h_funcs.subr
new file mode 100644
index 000000000000..1216aaf2124a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/h_funcs.subr
@@ -0,0 +1,63 @@
+#!/bin/sh
+#
+# $NetBSD: h_funcs.subr,v 1.3 2010/06/23 11:19:17 pooka Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# require_fs name
+#
+#	Checks that the given file system is built into the kernel and
+#	that its corresponding mount(8) utility is available.  Otherwise
+#	skips the test.
+#
+require_fs() {
+	local name
+	local autoload
+	name="${1}"
+
+	atf_require_prog mount
+	atf_require_prog mount_${name}
+	atf_require_prog umount
+
+	# if we have autoloadable modules, just assume the file system
+	atf_require_prog sysctl
+	autoload=$(sysctl -n kern.module.autoload)
+	[ "${autoload}" = "1" ] && return 0
+
+	set -- $(sysctl -n vfs.generic.fstypes)
+	found=no
+	while [ ${#} -gt 1 ];  do
+		if [ ${1} = ${name} ]; then
+			found=yes
+			break
+		fi
+		shift
+	done
+	[ ${found} = yes ] || \
+		atf_skip "The kernel does not include support the " \
+		         "\`${name}' file system"
+}
diff --git a/contrib/netbsd-tests/fs/hfs/colon.hfs.bz2.uue b/contrib/netbsd-tests/fs/hfs/colon.hfs.bz2.uue
new file mode 100644
index 000000000000..9240e7befa80
--- /dev/null
+++ b/contrib/netbsd-tests/fs/hfs/colon.hfs.bz2.uue
@@ -0,0 +1,35 @@
+begin 644 colon.hfs.bz2
+M0EIH.3%!629363%?)5P``$+____[_UOQ>_]__^_O\+____1K30045,CBA$'P
+M'DA:2!KIT`3V\VRA*<ZPAUVK`E%-)E,IME3T33U--DFRCU,T33T@]-1HQ&1M
+M(/2&@&TGI&@9#1B#0&F@TT:``R9/4$I$4PTF$Q,B8T)IY(VD:9&`3(80T>B&
+M`$,"8C$P$T9!HR:81B,":`D20A3T:GI`9``#(>H-`:-```:`````````````
+M08!#1B:`R:83)ID`&$:-,`F`)A!H9`Q,@#``"8F3`3`30%241HC(4_4GJ>U-
+M1Y31IM)ID`]3(T>H`#0#0T`:!H!A&@!H`````*9A\>L.>@+P;@Y:4C2%YM29
+M)Z`H>8SU&'"0U30JHOQ^.'A/7!GQK%#<GT'!B0OU+G:^>A5RVH"2$4VDL&T@
+M65#T*A/GU+(_VI$+*$`TJ"4J1(B1S&-YV+\J^"\Z6EK+@TU[0OQJ+;*HW.MN
+M=HTL,CQHCE$C3#EW'>#8!IGYY[*)]U$!0W6L;#U:*4X6IT<@^*5!16E)%(:*
+MA["$B&JX1022R8T4#20D@+ZHA_2_9$72HDSJ-FJ"7Z15%U2`@<>BJGD5'+*A
+M@M6>?K^MS^LOC8I)EI6[`O3`#CCKU:M6F6A00-$/:LH+!E7(G33<)<I*5Q&T
+M4[$M.$5OJZQKO59^7&LNANB-1PEMLB*TT\<[=;@7C@EYFG#:K@GL&R8^48"Y
+MU*QN%C56,Q?,.BW;"R9.7;9Z;2,+07U,QGK13C,!FYO^3/?)>)OZ27I4`@;=
+M4C<-$,N=UX98G_0DK)BTS-^)R+8NZ,B3JU:@85&-MM@</$$"."U>FCNQW/?=
+M'ZL4BR[\&3S\>.K"S#1Z&>2I>^+16EM54PV3%K7M$"E`.N2"E*,8-@V.E<3$
+M,K\RU$&5E//5.'K6A+44]9=\"WF$J@Q1!43!WLA!?"XLR2GOU6G-,W]92)1`
+MC@M4A4'FVAA`Q&&_%1B@L_`Z;T`0>[W6SCI%W&=H%Y>2"#E>IN[R<S>3+(:S
+MLMC<>N$1&APB(&6_#U<"!5*#IDA;MLNX`J(:/B8I,UNWB3CDPU2.@"(ORCKK
+MK(1*"RZ+9V>$I2"PLER`U4BFIY'VTJ#\NYN2-9DRCIP1([QBLNKT:%1K"-P5
+MY)2NL9KM8=ACP>MLBS&J(00HA*QYRUL:'A%8F5]&22@@@D,;3[C,4.9$P)DK
+M>\N+DK'4TLDI*LD&>8DE<M`B3!)=Z,E/#BSM)O*_$9Z"ZPSI%3*/=47CG8DJ
+MD]U*[RTUH7SC41(FD1>V@DT9B\,_CR;`,Y-E8*MM?Z*?BPU`I[I5^G-B$$A.
+M\7&8DC*:*',@VKX0HL8O)DL<-9GG!8>NK.2XS2I.;Z3%Q9OIL8?(6-*DEGHW
+MX^&A?%APXI:C@,A/&<6=)7#$UI;1Y6A'C<#/EW-*T(8WC9=`B`%\)M5HIS[\
+MV1%+H,,()X19<,:)U:Y?V\-T!^]'A\%%%+Z6.PQ"QI$]3#11IRB<#.9-L)^!
+MB-WJYVQVMP^;7V<DK?-[M;DQF]<[:M3)$-F@*(CXT128KESC.#OPP+`$D`G-
+MA6$DKT2V\;3+*:U+2]66T]'1$A`=33.FMDA1G\MA$1V_"/+2]%!GTQI'8E03
+M=?AO,S0#0V,9IS,&;8KGKL_$RKJFE62392;]B2933`4\$VJ""-0$;")-/A]R
+M[D"*/0:F1=%1R!B9&8=^RD4B^;4O-6'*J4J)EVNWN[+!_$)1\;@+#>*W5MG'
+MKUWYE^[,*T:U)Y]NUI,00H%8>74G/?LJ0K)51^BXZ+AI*2O[PI`V*%Q@X\YV
+M!V?D08"^;*TYO4R)T6G5:M;_M5M*;H4V)1IKCL$01$`#1R%N5,'_B[DBG"A(
+%&*^2K@"^
+`
+end
diff --git a/contrib/netbsd-tests/fs/hfs/t_pathconvert.c b/contrib/netbsd-tests/fs/hfs/t_pathconvert.c
new file mode 100644
index 000000000000..307de709be8b
--- /dev/null
+++ b/contrib/netbsd-tests/fs/hfs/t_pathconvert.c
@@ -0,0 +1,83 @@
+/*	$NetBSD: t_pathconvert.c,v 1.5 2011/02/25 20:54:18 martin Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/hfs/hfs.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(colonslash);
+ATF_TC_HEAD(colonslash, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "HFS+ colons/slashes (PR kern/44523)");
+	atf_tc_set_md_var(tc, "timeout", "20");
+}
+
+#define IMGNAME "colon.hfs"
+#define FAKEBLK "/dev/blk"
+#define FUNNY_FILENAME "foo:bar"
+ATF_TC_BODY(colonslash, tc)
+{
+	struct hfs_args args;
+	int dirfd, fd;
+	char thecmd[1024];
+	char buf[DIRBLKSIZ];
+	struct dirent *dirent;
+	int offset, nbytes;
+	bool ok = false;
+
+	snprintf(thecmd, sizeof(thecmd), "uudecode %s/colon.hfs.bz2.uue",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	RZ(system(thecmd));
+
+	snprintf(thecmd, sizeof(thecmd), "bunzip2 " IMGNAME ".bz2");
+	RZ(system(thecmd));
+
+	memset(&args, 0, sizeof args);
+	args.fspec = __UNCONST(FAKEBLK);
+	RZ(rump_init());
+
+	RL(rump_sys_mkdir("/mp", 0777));
+	RZ(rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK));
+	RL(rump_sys_mount(MOUNT_HFS, "/mp", 0, &args, sizeof args));
+
+	RL(dirfd = rump_sys_open("/mp", O_RDONLY));
+
+	RL(nbytes = rump_sys_getdents(dirfd, buf, sizeof buf));
+
+	for (offset = 0; offset < nbytes; offset += dirent->d_reclen) {
+		dirent = (struct dirent *)(buf + offset);
+		if (strchr(dirent->d_name, '/'))
+			atf_tc_fail("dirent with slash: %s", dirent->d_name);
+		if (0 == strcmp(FUNNY_FILENAME, dirent->d_name))
+			ok = true;
+	}
+
+	if (!ok)
+		atf_tc_fail("no dirent for file: %s", FUNNY_FILENAME);
+
+	RL(rump_sys_close(dirfd));
+	RL(fd = rump_sys_open("/mp/" FUNNY_FILENAME, O_RDONLY));
+	RL(rump_sys_close(fd));
+	RL(rump_sys_unmount("/mp", 0));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, colonslash);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/kernfs/t_basic.c b/contrib/netbsd-tests/fs/kernfs/t_basic.c
new file mode 100644
index 000000000000..e5ba4a77e1b7
--- /dev/null
+++ b/contrib/netbsd-tests/fs/kernfs/t_basic.c
@@ -0,0 +1,133 @@
+/*	$NetBSD: t_basic.c,v 1.3 2010/05/31 23:44:54 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/module.h>
+#include <sys/dirent.h>
+#include <sys/sysctl.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/kernfs/kernfs.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(getdents);
+ATF_TC_HEAD(getdents, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "kernfs directory contains files");
+}
+
+static void
+mountkernfs(void)
+{
+
+	rump_init();
+
+	if (rump_sys_mkdir("/kern", 0777) == -1)
+		atf_tc_fail_errno("mkdir /kern");
+	if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1)
+		atf_tc_fail_errno("could not mount kernfs");
+}
+
+ATF_TC_BODY(getdents, tc)
+{
+	struct dirent *dent;
+	char buf[8192];
+	int dfd;
+
+	mountkernfs();
+
+	if ((dfd = rump_sys_open("/kern", O_RDONLY)) == -1)
+		atf_tc_fail_errno("can't open directory");
+	if (rump_sys_getdents(dfd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("getdents");
+
+	/*
+	 * Check that we get the first three values (., .., boottime).
+	 * Make more complete by autogenerating list from kernfs_vnops.c?
+	 */
+	dent = (void *)buf;
+	ATF_REQUIRE_STREQ(dent->d_name, ".");
+	dent = _DIRENT_NEXT(dent);
+	ATF_REQUIRE_STREQ(dent->d_name, "..");
+	dent = _DIRENT_NEXT(dent);
+	ATF_REQUIRE_STREQ(dent->d_name, "boottime");
+
+	/* done */
+}
+
+ATF_TC(hostname);
+ATF_TC_HEAD(hostname, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "/kern/hostname changes hostname");
+}
+
+static char *
+getthehost(void)
+{
+	static char buf[8192];
+	int mib[2];
+	size_t blen;
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_HOSTNAME;
+	blen = sizeof(buf);
+	if (rump_sys___sysctl(mib, 2, buf, &blen, NULL, 0) == -1)
+		atf_tc_fail_errno("sysctl gethostname");
+
+	return buf;
+}
+
+#define NEWHOSTNAME "turboton roos-berg"
+ATF_TC_BODY(hostname, tc)
+{
+	char buf[8192];
+	char *shost, *p;
+	int fd;
+
+	mountkernfs();
+	if ((fd = rump_sys_open("/kern/hostname", O_RDWR)) == -1)
+		atf_tc_fail_errno("open hostname");
+
+	/* check initial match */
+	shost = getthehost();
+	buf[0] = '\0';
+	if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read hostname");
+	p = strchr(buf, '\n');
+	if (p)
+		 *p = '\0';
+	ATF_REQUIRE_STREQ_MSG(buf, shost, "initial hostname mismatch");
+
+	/* check changing hostname works */
+	if (rump_sys_pwrite(fd, NEWHOSTNAME, strlen(NEWHOSTNAME), 0)
+	    != strlen(NEWHOSTNAME)) {
+		atf_tc_fail_errno("write new hostname");
+	}
+
+	shost = getthehost();
+	ATF_REQUIRE_STREQ_MSG(NEWHOSTNAME, shost, "modified hostname mismatch");
+
+	/* done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, hostname);
+	ATF_TP_ADD_TC(tp, getdents);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/lfs/t_pr.c b/contrib/netbsd-tests/fs/lfs/t_pr.c
new file mode 100644
index 000000000000..97cb1dbbbf77
--- /dev/null
+++ b/contrib/netbsd-tests/fs/lfs/t_pr.c
@@ -0,0 +1,60 @@
+/*	$NetBSD: t_pr.c,v 1.6 2011/02/22 18:41:05 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(mknod);
+ATF_TC_HEAD(mknod, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "mknod(2) hangs on LFS (PR kern/43503)");
+	atf_tc_set_md_var(tc, "timeout", "20");
+}
+
+#define IMGNAME "disk.img"
+#define FAKEBLK "/dev/blk"
+ATF_TC_BODY(mknod, tc)
+{
+	struct ufs_args args;
+
+	/* hmm, maybe i should fix newfs_lfs instead? */
+	if (system("newfs_lfs -D -F -s 10000 ./" IMGNAME) == -1)
+		atf_tc_fail_errno("newfs failed");
+
+	memset(&args, 0, sizeof(args));
+	args.fspec = __UNCONST(FAKEBLK);
+
+	rump_init();
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("cannot create mountpoint");
+	rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK);
+	if (rump_sys_mount(MOUNT_LFS, "/mp", 0, &args, sizeof(args)) == -1)
+		atf_tc_fail_errno("rump_sys_mount failed");
+
+	//atf_tc_expect_timeout("PR kern/43503");
+	if (rump_sys_mknod("/mp/node", S_IFCHR | 0777, 0) == -1)
+		atf_tc_fail_errno("mknod failed");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mknod);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/msdosfs/t_snapshot.c b/contrib/netbsd-tests/fs/msdosfs/t_snapshot.c
new file mode 100644
index 000000000000..8b5708f843a3
--- /dev/null
+++ b/contrib/netbsd-tests/fs/msdosfs/t_snapshot.c
@@ -0,0 +1,51 @@
+/*	$NetBSD: t_snapshot.c,v 1.3 2014/06/10 13:15:18 martin Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+#include <msdosfs/msdosfsmount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+#define IMGNAME "msdosfs.img"
+#define NEWFS "newfs_msdos -C 5M " IMGNAME
+#define FSCK "fsck_msdos -fn"
+#define BAKNAME "/stor/snap"
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+	struct msdosfs_args margs;
+
+	memset(&margs, 0, sizeof(margs));
+	margs.fspec = __UNCONST(fspec);
+	margs.version = MSDOSFSMNT_VERSION;
+
+	if (rump_sys_mount(MOUNT_MSDOS, path, 0, &margs, sizeof(margs)) == -1)
+		err(1, "mount msdosfs %s", path);
+}
+
+static void
+begin(void)
+{
+	struct tmpfs_args targs = { .ta_version = TMPFS_ARGS_VERSION, };
+
+	if (rump_sys_mkdir("/stor", 0777) == -1)
+		atf_tc_fail_errno("mkdir /stor");
+	if (rump_sys_mount(MOUNT_TMPFS, "/stor", 0, &targs,sizeof(targs)) == -1)
+		atf_tc_fail_errno("mount storage");
+}
+
+#include "../common/snapshot.c"
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/README b/contrib/netbsd-tests/fs/nfs/nfsservice/README
new file mode 100644
index 000000000000..8cfa8af62949
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/README
@@ -0,0 +1,16 @@
+	$NetBSD: README,v 1.1 2010/07/26 15:53:00 pooka Exp $
+
+This directory contains the necessary bits to get an NFS server
+running in a rump kernel.  In essence, it's:
+
+  * rpcbind
+  * mountd
+  * nfsd
+
+Additionally, you need the libc rpc code which is in
+tests/fs/common/nfsrpc.
+
+TODO: make the standard nfs userspace services usable (the challenge
+comes from rpc being in libc).
+
+questions? ==> pooka@netbsd.org
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/exports b/contrib/netbsd-tests/fs/nfs/nfsservice/exports
new file mode 100644
index 000000000000..6cc8c5fb80e9
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/exports
@@ -0,0 +1,12 @@
+#	$NetBSD: exports,v 1.2 2010/12/31 18:11:27 pooka Exp $
+#
+
+#
+# The export dir is currently hardcoded and is exposed to the
+# world, where "world" in this case means inside the rump shmif
+# IP network, i.e. not a very big world.  Probably needs some
+# adjustments if we want to test NFS features more carefully,
+# but this is enough for the current VFS level tests.
+#
+/myexport -noresvport -noresvmnt -maproot=0:0 10.3.2.2
+/myexport -ro -noresvport -noresvmnt -maproot=0:0 10.4.2.2
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/getmntinfo.c b/contrib/netbsd-tests/fs/nfs/nfsservice/getmntinfo.c
new file mode 100644
index 000000000000..0c0587a7aba5
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/getmntinfo.c
@@ -0,0 +1,85 @@
+/*	$NetBSD: getmntinfo.c,v 1.1 2010/07/26 15:53:00 pooka Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: getmntinfo.c,v 1.1 2010/07/26 15:53:00 pooka Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#define getvfsstat(a,b,c) rump_sys_getvfsstat(a,b,c)
+
+/*
+ * Return information about mounted filesystems.
+ */
+int
+getmntinfo(mntbufp, flags)
+	struct statvfs **mntbufp;
+	int flags;
+{
+	static struct statvfs *mntbuf;
+	static int mntsize;
+	static size_t bufsize;
+
+	_DIAGASSERT(mntbufp != NULL);
+
+	if (mntsize <= 0 &&
+	    (mntsize = getvfsstat(NULL, (size_t)0, MNT_NOWAIT)) == -1)
+		return (0);
+	if (bufsize > 0 &&
+	    (mntsize = getvfsstat(mntbuf, bufsize, flags)) == -1)
+		return (0);
+	while (bufsize <= mntsize * sizeof(struct statvfs)) {
+		if (mntbuf)
+			free(mntbuf);
+		bufsize = (mntsize + 1) * sizeof(struct statvfs);
+		if ((mntbuf = malloc(bufsize)) == NULL)
+			return (0);
+		if ((mntsize = getvfsstat(mntbuf, bufsize, flags)) == -1)
+			return (0);
+	}
+	*mntbufp = mntbuf;
+	return (mntsize);
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/mountd.c b/contrib/netbsd-tests/fs/nfs/nfsservice/mountd.c
new file mode 100644
index 000000000000..b3625f684d15
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/mountd.c
@@ -0,0 +1,2575 @@
+/* 	$NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $	 */
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Herb Hasler and Rick Macklem at The University of Guelph.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
+ The Regents of the University of California.  All rights reserved.");
+#endif				/* not lint */
+
+#ifndef lint
+#if 0
+static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
+#else
+__RCSID("$NetBSD: mountd.c,v 1.8 2013/10/19 17:45:00 christos Exp $");
+#endif
+#endif				/* not lint */
+
+#include <sys/param.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <syslog.h>
+#include <sys/ucred.h>
+
+#include <rpc/rpc.h>
+#include <rpc/pmap_clnt.h>
+#include <rpc/pmap_prot.h>
+#include <rpcsvc/mount.h>
+#include <nfs/rpcv2.h>
+#include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
+#include <nfs/nfsmount.h>
+
+#include <arpa/inet.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <grp.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <netgroup.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <err.h>
+#include <util.h>
+#include "pathnames.h"
+
+#ifdef IPSEC
+#include <netinet6/ipsec.h>
+#ifndef IPSEC_POLICY_IPSEC	/* no ipsec support on old ipsec */
+#undef IPSEC
+#endif
+#include "ipsec.h"
+#endif
+
+#include "svc_fdset.h"
+
+#include <stdarg.h>
+
+/*
+ * Structures for keeping the mount list and export list
+ */
+struct mountlist {
+	struct mountlist *ml_next;
+	char ml_host[RPCMNT_NAMELEN + 1];
+	char ml_dirp[RPCMNT_PATHLEN + 1];
+	int ml_flag;/* XXX more flags (same as dp_flag) */
+};
+
+struct dirlist {
+	struct dirlist *dp_left;
+	struct dirlist *dp_right;
+	int dp_flag;
+	struct hostlist *dp_hosts;	/* List of hosts this dir exported to */
+	char dp_dirp[1];		/* Actually malloc'd to size of dir */
+};
+/* dp_flag bits */
+#define	DP_DEFSET	0x1
+#define DP_HOSTSET	0x2
+#define DP_KERB		0x4
+#define DP_NORESMNT	0x8
+
+struct exportlist {
+	struct exportlist *ex_next;
+	struct dirlist *ex_dirl;
+	struct dirlist *ex_defdir;
+	int             ex_flag;
+	fsid_t          ex_fs;
+	char           *ex_fsdir;
+	char           *ex_indexfile;
+};
+/* ex_flag bits */
+#define	EX_LINKED	0x1
+
+struct netmsk {
+	struct sockaddr_storage nt_net;
+	int		nt_len;
+	char           *nt_name;
+};
+
+union grouptypes {
+	struct addrinfo *gt_addrinfo;
+	struct netmsk   gt_net;
+};
+
+struct grouplist {
+	int             gr_type;
+	union grouptypes gr_ptr;
+	struct grouplist *gr_next;
+};
+/* Group types */
+#define	GT_NULL		0x0
+#define	GT_HOST		0x1
+#define	GT_NET		0x2
+
+struct hostlist {
+	int             ht_flag;/* Uses DP_xx bits */
+	struct grouplist *ht_grp;
+	struct hostlist *ht_next;
+};
+
+struct fhreturn {
+	int             fhr_flag;
+	int             fhr_vers;
+	size_t		fhr_fhsize;
+	union {
+		uint8_t v2[NFSX_V2FH];
+		uint8_t v3[NFSX_V3FHMAX];
+	} fhr_fh;
+};
+
+/* Global defs */
+static char    *add_expdir __P((struct dirlist **, char *, int));
+static void add_dlist __P((struct dirlist **, struct dirlist *,
+    struct grouplist *, int));
+static void add_mlist __P((char *, char *, int));
+static int check_dirpath __P((const char *, size_t, char *));
+static int check_options __P((const char *, size_t, struct dirlist *));
+static int chk_host __P((struct dirlist *, struct sockaddr *, int *, int *));
+static int del_mlist __P((char *, char *, struct sockaddr *));
+static struct dirlist *dirp_search __P((struct dirlist *, char *));
+static int do_nfssvc __P((const char *, size_t, struct exportlist *,
+    struct grouplist *, int, struct uucred *, char *, int, struct statvfs *));
+static int do_opt __P((const char *, size_t, char **, char **,
+    struct exportlist *, struct grouplist *, int *, int *, struct uucred *));
+static struct exportlist *ex_search __P((fsid_t *));
+static int parse_directory __P((const char *, size_t, struct grouplist *,
+    int, char *, struct exportlist **, struct statvfs *));
+static int parse_host_netgroup __P((const char *, size_t, struct exportlist *,
+    struct grouplist *, char *, int *, struct grouplist **));
+static struct exportlist *get_exp __P((void));
+static void free_dir __P((struct dirlist *));
+static void free_exp __P((struct exportlist *));
+static void free_grp __P((struct grouplist *));
+static void free_host __P((struct hostlist *));
+void get_exportlist __P((int));
+static int get_host __P((const char *, size_t, const char *,
+    struct grouplist *));
+static struct hostlist *get_ht __P((void));
+static void get_mountlist __P((void));
+static int get_net __P((char *, struct netmsk *, int));
+static void free_exp_grp __P((struct exportlist *, struct grouplist *));
+static struct grouplist *get_grp __P((void));
+static void hang_dirp __P((struct dirlist *, struct grouplist *,
+    struct exportlist *, int));
+static void mntsrv __P((struct svc_req *, SVCXPRT *));
+static void nextfield __P((char **, char **));
+static void parsecred __P((char *, struct uucred *));
+static int put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *));
+static int scan_tree __P((struct dirlist *, struct sockaddr *));
+static void send_umntall __P((int));
+#if 0
+static int umntall_each __P((caddr_t, struct sockaddr_in *));
+#endif
+static int xdr_dir __P((XDR *, char *));
+static int xdr_explist __P((XDR *, caddr_t));
+static int xdr_fhs __P((XDR *, caddr_t));
+static int xdr_mlist __P((XDR *, caddr_t));
+static int bitcmp __P((void *, void *, int));
+static int netpartcmp __P((struct sockaddr *, struct sockaddr *, int));
+static int sacmp __P((struct sockaddr *, struct sockaddr *));
+static int allones __P((struct sockaddr_storage *, int));
+static int countones __P((struct sockaddr *));
+static void bind_resv_port __P((int, sa_family_t, in_port_t));
+static void no_nfs(int);
+static struct exportlist *exphead;
+static struct mountlist *mlhead;
+static struct grouplist *grphead;
+static char    *exname;
+static struct uucred def_anon = {
+	1,
+	(uid_t) -2,
+	(gid_t) -2,
+	0,
+	{ 0 }
+};
+
+static int      opt_flags;
+static int	have_v6 = 1;
+static const int ninumeric = NI_NUMERICHOST;
+
+/* Bits for above */
+#define	OP_MAPROOT	0x001
+#define	OP_MAPALL	0x002
+#define	OP_KERB		0x004
+#define	OP_MASK		0x008
+#define	OP_NET		0x010
+#define	OP_ALLDIRS	0x040
+#define OP_NORESPORT	0x080
+#define OP_NORESMNT	0x100
+#define OP_MASKLEN	0x200
+
+static int      debug = 1;
+#if 0
+static void SYSLOG __P((int, const char *,...));
+#endif
+int main __P((int, char *[]));
+
+/*
+ * If this is non-zero, -noresvport and -noresvmnt are implied for
+ * each export.
+ */
+static int noprivports;
+
+#define C2FD(_c_) ((int)(uintptr_t)(_c_))
+static int
+rumpread(void *cookie, char *buf, int count)
+{
+
+	return rump_sys_read(C2FD(cookie), buf, count);
+}
+
+static int
+rumpwrite(void *cookie, const char *buf, int count)
+{
+
+	return rump_sys_write(C2FD(cookie), buf, count);
+}
+
+static off_t
+rumpseek(void *cookie, off_t off, int whence)
+{
+
+	return rump_sys_lseek(C2FD(cookie), off, whence);
+}
+
+static int
+rumpclose(void *cookie)
+{
+
+	return rump_sys_close(C2FD(cookie));
+}
+
+int __sflags(const char *, int *); /* XXX */
+static FILE *
+rumpfopen(const char *path, const char *opts)
+{
+	int fd, oflags;
+
+	__sflags(opts, &oflags);
+	fd = rump_sys_open(path, oflags, 0777);
+	if (fd == -1)
+		return NULL;
+
+	return funopen((void *)(uintptr_t)fd,
+	    rumpread, rumpwrite, rumpseek, rumpclose);
+}
+
+/*
+ * Make sure mountd signal handler is executed from a thread context
+ * instead of the signal handler.  This avoids the signal handler
+ * ruining our kernel context.
+ */
+static sem_t exportsem;
+static void
+signal_get_exportlist(int sig)
+{
+
+	sem_post(&exportsem);
+}
+
+static void *
+exportlist_thread(void *arg)
+{
+
+	for (;;) {
+		sem_wait(&exportsem);
+		get_exportlist(0);
+	}
+
+	return NULL;
+}
+
+/*
+ * Mountd server for NFS mount protocol as described in:
+ * NFS: Network File System Protocol Specification, RFC1094, Appendix A
+ * The optional arguments are the exports file name
+ * default: _PATH_EXPORTS
+ * "-d" to enable debugging
+ * and "-n" to allow nonroot mount.
+ */
+void *mountd_main(void *);
+void *
+mountd_main(void *arg)
+{
+	SVCXPRT *udptransp, *tcptransp;
+	struct netconfig *udpconf, *tcpconf;
+	int udpsock, tcpsock;
+	int xcreated = 0;
+	int maxrec = RPC_MAXDATASIZE;
+	in_port_t forcedport = 0;
+	extern sem_t gensem;
+	pthread_t ptdummy;
+
+	alloc_fdset();
+
+#if 0
+	while ((c = getopt(argc, argv, "dNnrp:" ADDOPTS)) != -1)
+		switch (c) {
+#ifdef IPSEC
+		case 'P':
+			if (ipsecsetup_test(policy = optarg))
+				errx(1, "Invalid ipsec policy `%s'", policy);
+			break;
+#endif
+		case 'p':
+			/* A forced port "0" will dynamically allocate a port */
+			forcedport = atoi(optarg);
+			break;
+		case 'd':
+			debug = 1;
+			break;
+		case 'N':
+			noprivports = 1;
+			break;
+			/* Compatibility */
+		case 'n':
+		case 'r':
+			break;
+		default:
+			fprintf(stderr, "usage: %s [-dNn]"
+#ifdef IPSEC
+			    " [-P policy]"
+#endif
+			    " [-p port] [exportsfile]\n", getprogname());
+			exit(1);
+		};
+	argc -= optind;
+	argv += optind;
+#endif
+
+	sem_init(&exportsem, 0, 0);
+	pthread_create(&ptdummy, NULL, exportlist_thread, NULL);
+
+	grphead = NULL;
+	exphead = NULL;
+	mlhead = NULL;
+	exname = _PATH_EXPORTS;
+	openlog("mountd", LOG_PID | (debug ? LOG_PERROR : 0), LOG_DAEMON);
+	(void)signal(SIGSYS, no_nfs);
+
+	if (debug)
+		(void)fprintf(stderr, "Getting export list.\n");
+	get_exportlist(0);
+	if (debug)
+		(void)fprintf(stderr, "Getting mount list.\n");
+	get_mountlist();
+	if (debug)
+		(void)fprintf(stderr, "Here we go.\n");
+	if (debug == 0) {
+		daemon(0, 0);
+		(void)signal(SIGINT, SIG_IGN);
+		(void)signal(SIGQUIT, SIG_IGN);
+	}
+	(void)signal(SIGHUP, signal_get_exportlist);
+	(void)signal(SIGTERM, send_umntall);
+	pidfile(NULL);
+
+	rpcb_unset(RPCPROG_MNT, RPCMNT_VER1, NULL);
+	rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL);
+
+	udpsock  = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	tcpsock  = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+
+	udpconf  = getnetconfigent("udp");
+	tcpconf  = getnetconfigent("tcp");
+
+	rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrec);
+
+	if (udpsock != -1 && udpconf != NULL) {
+		bind_resv_port(udpsock, AF_INET, forcedport);
+#ifdef IPSEC
+		if (policy)
+			ipsecsetup(AF_INET, udpsock, policy);
+#endif
+		udptransp = svc_dg_create(udpsock, 0, 0);
+		if (udptransp != NULL) {
+			if (!svc_reg(udptransp, RPCPROG_MNT, RPCMNT_VER1,
+				mntsrv, udpconf) ||
+			    !svc_reg(udptransp, RPCPROG_MNT, RPCMNT_VER3,
+				mntsrv, udpconf)) {
+				syslog(LOG_WARNING, "can't register UDP service");
+			}
+			else {
+				xcreated++;
+			}
+		} else {
+			syslog(LOG_WARNING, "can't create UDP service");
+		}
+			
+	}
+
+	if (tcpsock != -1 && tcpconf != NULL) {
+		bind_resv_port(tcpsock, AF_INET, forcedport);
+#ifdef IPSEC
+		if (policy)
+			ipsecsetup(AF_INET, tcpsock, policy);
+#endif
+		listen(tcpsock, SOMAXCONN);
+		tcptransp = svc_vc_create(tcpsock, RPC_MAXDATASIZE,
+		    RPC_MAXDATASIZE);
+		if (tcptransp != NULL) {
+			if (!svc_reg(tcptransp, RPCPROG_MNT, RPCMNT_VER1,
+				mntsrv, tcpconf) ||
+			    !svc_reg(tcptransp, RPCPROG_MNT, RPCMNT_VER3,
+				mntsrv, tcpconf))
+				syslog(LOG_WARNING, "can't register TCP service");
+			else
+				xcreated++;
+		} else
+			syslog(LOG_WARNING, "can't create TCP service");
+
+	}
+
+	if (xcreated == 0) {
+		syslog(LOG_ERR, "could not create any services");
+		exit(1);
+	}
+
+	sem_post(&gensem);
+	svc_run();
+	syslog(LOG_ERR, "Mountd died");
+	exit(1);
+}
+
+/*
+ * The mount rpc service
+ */
+void
+mntsrv(rqstp, transp)
+	struct svc_req *rqstp;
+	SVCXPRT *transp;
+{
+	struct exportlist *ep;
+	struct dirlist *dp;
+	struct fhreturn fhr;
+	struct stat     stb;
+	struct statvfs   fsb;
+	char host[NI_MAXHOST], numerichost[NI_MAXHOST];
+	int lookup_failed = 1;
+	struct sockaddr *saddr;
+	u_short         sport;
+	char            rpcpath[RPCMNT_PATHLEN + 1], dpath[MAXPATHLEN];
+	long            bad = EACCES;
+	int             defset, hostset, ret;
+	sigset_t        sighup_mask;
+	struct sockaddr_in6 *sin6;
+	struct sockaddr_in *sin;
+	size_t fh_size;
+	int error = 0;
+
+	(void)sigemptyset(&sighup_mask);
+	(void)sigaddset(&sighup_mask, SIGHUP);
+	saddr = svc_getrpccaller(transp)->buf;
+	switch (saddr->sa_family) {
+	case AF_INET6:
+		sin6 = (struct sockaddr_in6 *)saddr;
+		sport = ntohs(sin6->sin6_port);
+		break;
+	case AF_INET:
+		sin = (struct sockaddr_in *)saddr;
+		sport = ntohs(sin->sin_port);
+		break;
+	default:
+		syslog(LOG_ERR, "request from unknown address family");
+		return;
+	}
+	lookup_failed = getnameinfo(saddr, saddr->sa_len, host, sizeof host, 
+	    NULL, 0, 0);
+	if (getnameinfo(saddr, saddr->sa_len, numerichost,
+	    sizeof numerichost, NULL, 0, ninumeric) != 0)
+		strlcpy(numerichost, "?", sizeof(numerichost));
+	ret = 0;
+	switch (rqstp->rq_proc) {
+	case NULLPROC:
+		if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
+			syslog(LOG_ERR, "Can't send reply");
+		return;
+	case MOUNTPROC_MNT:
+		if (debug)
+			fprintf(stderr,
+			    "got mount request from %s\n", numerichost);
+		if (!svc_getargs(transp, xdr_dir, rpcpath)) {
+			if (debug)
+				fprintf(stderr, "-> garbage args\n");
+			svcerr_decode(transp);
+			return;
+		}
+		if (debug)
+			fprintf(stderr,
+			    "-> rpcpath: %s\n", rpcpath);
+		/*
+		 * Get the real pathname and make sure it is a file or
+		 * directory that exists.
+		 */
+#if 0
+		if (realpath(rpcpath, dpath) == 0 ||
+#endif
+		strcpy(dpath, rpcpath);
+		if (rump_sys_stat(dpath, &stb) < 0 ||
+		    (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) ||
+		    rump_sys_statvfs1(dpath, &fsb, ST_WAIT) < 0) {
+			(void)chdir("/"); /* Just in case realpath doesn't */
+			if (debug)
+				(void)fprintf(stderr, "-> stat failed on %s\n",
+				    dpath);
+			if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
+				syslog(LOG_ERR, "Can't send reply");
+			return;
+		}
+		if (debug)
+			fprintf(stderr,
+			    "-> dpath: %s\n", dpath);
+		/* Check in the exports list */
+		(void)sigprocmask(SIG_BLOCK, &sighup_mask, NULL);
+		ep = ex_search(&fsb.f_fsidx);
+		hostset = defset = 0;
+		if (ep && (chk_host(ep->ex_defdir, saddr, &defset,
+		   &hostset) || ((dp = dirp_search(ep->ex_dirl, dpath)) &&
+		   chk_host(dp, saddr, &defset, &hostset)) ||
+		   (defset && scan_tree(ep->ex_defdir, saddr) == 0 &&
+		   scan_tree(ep->ex_dirl, saddr) == 0))) {
+			if ((hostset & DP_HOSTSET) == 0) {
+				hostset = defset;
+			}
+			if (sport >= IPPORT_RESERVED &&
+			    !(hostset & DP_NORESMNT)) {
+				syslog(LOG_NOTICE,
+				    "Refused mount RPC from host %s port %d",
+				    numerichost, sport);
+				svcerr_weakauth(transp);
+				goto out;
+			}
+			fhr.fhr_flag = hostset;
+			fhr.fhr_vers = rqstp->rq_vers;
+			/* Get the file handle */
+			memset(&fhr.fhr_fh, 0, sizeof(fhr.fhr_fh)); /* for v2 */
+			fh_size = sizeof(fhr.fhr_fh);
+			error = 0;
+			if (rump_sys_getfh(dpath, &fhr.fhr_fh, &fh_size) < 0) {
+				bad = error;
+				//syslog(LOG_ERR, "Can't get fh for %s %d %d", dpath, error, fh_size);
+				if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
+				    (char *)&bad))
+					syslog(LOG_ERR, "Can't send reply");
+				goto out;
+			}
+			if ((fhr.fhr_vers == 1 && fh_size > NFSX_V2FH) ||
+			    fh_size > NFSX_V3FHMAX) {
+				bad = EINVAL; /* XXX */
+				if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
+				    (char *)&bad))
+					syslog(LOG_ERR, "Can't send reply");
+				goto out;
+			}
+			fhr.fhr_fhsize = fh_size;
+			if (!svc_sendreply(transp, (xdrproc_t)xdr_fhs, (char *) &fhr))
+				syslog(LOG_ERR, "Can't send reply");
+			if (!lookup_failed)
+				add_mlist(host, dpath, hostset);
+			else
+				add_mlist(numerichost, dpath, hostset);
+			if (debug)
+				(void)fprintf(stderr, "Mount successful.\n");
+		} else {
+			if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
+				syslog(LOG_ERR, "Can't send reply");
+		}
+out:
+		(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
+		return;
+	case MOUNTPROC_DUMP:
+		if (!svc_sendreply(transp, (xdrproc_t)xdr_mlist, NULL))
+			syslog(LOG_ERR, "Can't send reply");
+		return;
+	case MOUNTPROC_UMNT:
+		if (!svc_getargs(transp, xdr_dir, dpath)) {
+			svcerr_decode(transp);
+			return;
+		}
+		if (!lookup_failed)
+			ret = del_mlist(host, dpath, saddr);
+		ret |= del_mlist(numerichost, dpath, saddr);
+		if (ret) {
+			svcerr_weakauth(transp);
+			return;
+		}
+		if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
+			syslog(LOG_ERR, "Can't send reply");
+		return;
+	case MOUNTPROC_UMNTALL:
+		if (!lookup_failed)
+			ret = del_mlist(host, NULL, saddr);
+		ret |= del_mlist(numerichost, NULL, saddr);
+		if (ret) {
+			svcerr_weakauth(transp);
+			return;
+		}
+		if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
+			syslog(LOG_ERR, "Can't send reply");
+		return;
+	case MOUNTPROC_EXPORT:
+	case MOUNTPROC_EXPORTALL:
+		if (!svc_sendreply(transp, (xdrproc_t)xdr_explist, NULL))
+			syslog(LOG_ERR, "Can't send reply");
+		return;
+
+
+	default:
+		svcerr_noproc(transp);
+		return;
+	}
+}
+
+/*
+ * Xdr conversion for a dpath string
+ */
+static int
+xdr_dir(xdrsp, dirp)
+	XDR *xdrsp;
+	char *dirp;
+{
+
+	return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN));
+}
+
+/*
+ * Xdr routine to generate file handle reply
+ */
+static int
+xdr_fhs(xdrsp, cp)
+	XDR *xdrsp;
+	caddr_t cp;
+{
+	struct fhreturn *fhrp = (struct fhreturn *) cp;
+	long ok = 0, len, auth;
+
+	if (!xdr_long(xdrsp, &ok))
+		return (0);
+	switch (fhrp->fhr_vers) {
+	case 1:
+		return (xdr_opaque(xdrsp, (caddr_t)&fhrp->fhr_fh, NFSX_V2FH));
+	case 3:
+		len = fhrp->fhr_fhsize;
+		if (!xdr_long(xdrsp, &len))
+			return (0);
+		if (!xdr_opaque(xdrsp, (caddr_t)&fhrp->fhr_fh, len))
+			return (0);
+		if (fhrp->fhr_flag & DP_KERB)
+			auth = RPCAUTH_KERB4;
+		else
+			auth = RPCAUTH_UNIX;
+		len = 1;
+		if (!xdr_long(xdrsp, &len))
+			return (0);
+		return (xdr_long(xdrsp, &auth));
+	};
+	return (0);
+}
+
+int
+xdr_mlist(xdrsp, cp)
+	XDR *xdrsp;
+	caddr_t cp;
+{
+	struct mountlist *mlp;
+	int trueval = 1;
+	int falseval = 0;
+	char *strp;
+
+	mlp = mlhead;
+	while (mlp) {
+		if (!xdr_bool(xdrsp, &trueval))
+			return (0);
+		strp = &mlp->ml_host[0];
+		if (!xdr_string(xdrsp, &strp, RPCMNT_NAMELEN))
+			return (0);
+		strp = &mlp->ml_dirp[0];
+		if (!xdr_string(xdrsp, &strp, RPCMNT_PATHLEN))
+			return (0);
+		mlp = mlp->ml_next;
+	}
+	if (!xdr_bool(xdrsp, &falseval))
+		return (0);
+	return (1);
+}
+
+/*
+ * Xdr conversion for export list
+ */
+int
+xdr_explist(xdrsp, cp)
+	XDR *xdrsp;
+	caddr_t cp;
+{
+	struct exportlist *ep;
+	int falseval = 0;
+	int putdef;
+	sigset_t sighup_mask;
+
+	(void)sigemptyset(&sighup_mask);
+	(void)sigaddset(&sighup_mask, SIGHUP);
+	(void)sigprocmask(SIG_BLOCK, &sighup_mask, NULL);
+	ep = exphead;
+	while (ep) {
+		putdef = 0;
+		if (put_exlist(ep->ex_dirl, xdrsp, ep->ex_defdir, &putdef))
+			goto errout;
+		if (ep->ex_defdir && putdef == 0 &&
+		    put_exlist(ep->ex_defdir, xdrsp, NULL, &putdef))
+			goto errout;
+		ep = ep->ex_next;
+	}
+	(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
+	if (!xdr_bool(xdrsp, &falseval))
+		return (0);
+	return (1);
+errout:
+	(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
+	return (0);
+}
+
+/*
+ * Called from xdr_explist() to traverse the tree and export the
+ * directory paths.  Assumes SIGHUP has already been masked.
+ */
+int
+put_exlist(dp, xdrsp, adp, putdefp)
+	struct dirlist *dp;
+	XDR *xdrsp;
+	struct dirlist *adp;
+	int *putdefp;
+{
+	struct grouplist *grp;
+	struct hostlist *hp;
+	int trueval = 1;
+	int falseval = 0;
+	int gotalldir = 0;
+	char *strp;
+
+	if (dp) {
+		if (put_exlist(dp->dp_left, xdrsp, adp, putdefp))
+			return (1);
+		if (!xdr_bool(xdrsp, &trueval))
+			return (1);
+		strp = dp->dp_dirp;
+		if (!xdr_string(xdrsp, &strp, RPCMNT_PATHLEN))
+			return (1);
+		if (adp && !strcmp(dp->dp_dirp, adp->dp_dirp)) {
+			gotalldir = 1;
+			*putdefp = 1;
+		}
+		if ((dp->dp_flag & DP_DEFSET) == 0 &&
+		    (gotalldir == 0 || (adp->dp_flag & DP_DEFSET) == 0)) {
+			hp = dp->dp_hosts;
+			while (hp) {
+				grp = hp->ht_grp;
+				if (grp->gr_type == GT_HOST) {
+					if (!xdr_bool(xdrsp, &trueval))
+						return (1);
+					strp =
+					  grp->gr_ptr.gt_addrinfo->ai_canonname;
+					if (!xdr_string(xdrsp, &strp,
+							RPCMNT_NAMELEN))
+						return (1);
+				} else if (grp->gr_type == GT_NET) {
+					if (!xdr_bool(xdrsp, &trueval))
+						return (1);
+					strp = grp->gr_ptr.gt_net.nt_name;
+					if (!xdr_string(xdrsp, &strp,
+							RPCMNT_NAMELEN))
+						return (1);
+				}
+				hp = hp->ht_next;
+				if (gotalldir && hp == NULL) {
+					hp = adp->dp_hosts;
+					gotalldir = 0;
+				}
+			}
+		}
+		if (!xdr_bool(xdrsp, &falseval))
+			return (1);
+		if (put_exlist(dp->dp_right, xdrsp, adp, putdefp))
+			return (1);
+	}
+	return (0);
+}
+
+static int
+parse_host_netgroup(line, lineno, ep, tgrp, cp, has_host, grp)
+	const char *line;
+	size_t lineno;
+	struct exportlist *ep;
+	struct grouplist *tgrp;
+	char *cp;
+	int *has_host;
+	struct grouplist **grp;
+{
+	const char *hst, *usr, *dom;
+	int netgrp;
+
+	if (ep == NULL) {
+		syslog(LOG_ERR, "\"%s\", line %ld: No current export",
+		    line, (unsigned long)lineno);
+		return 0;
+	}
+	setnetgrent(cp);
+	netgrp = getnetgrent(&hst, &usr, &dom);
+	do {
+		if (*has_host) {
+			(*grp)->gr_next = get_grp();
+			*grp = (*grp)->gr_next;
+		}
+		if (netgrp) {
+			if (hst == NULL) {
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: No host in netgroup %s",
+				    line, (unsigned long)lineno, cp);
+				goto bad;
+			}
+			if (get_host(line, lineno, hst, *grp))
+				goto bad;
+		} else if (get_host(line, lineno, cp, *grp))
+			goto bad;
+		*has_host = TRUE;
+	} while (netgrp && getnetgrent(&hst, &usr, &dom));
+
+	endnetgrent();
+	return 1;
+bad:
+	endnetgrent();
+	return 0;
+	
+}
+
+static int
+parse_directory(line, lineno, tgrp, got_nondir, cp, ep, fsp)
+	const char *line;
+	size_t lineno;
+	struct grouplist *tgrp;
+	int got_nondir;
+	char *cp;
+	struct exportlist **ep;
+	struct statvfs *fsp;
+{
+	int error = 0;
+
+	if (!check_dirpath(line, lineno, cp))
+		return 0;
+
+	if (rump_sys_statvfs1(cp, fsp, ST_WAIT) == -1) {
+		syslog(LOG_ERR, "\"%s\", line %ld: statvfs for `%s' failed: %m %d",
+		    line, (unsigned long)lineno, cp, error);
+		return 0;
+	}
+
+	if (got_nondir) {
+		syslog(LOG_ERR,
+		    "\"%s\", line %ld: Directories must precede files",
+		    line, (unsigned long)lineno);
+		return 0;
+	}
+	if (*ep) {
+		if ((*ep)->ex_fs.__fsid_val[0] != fsp->f_fsidx.__fsid_val[0] ||
+		    (*ep)->ex_fs.__fsid_val[1] != fsp->f_fsidx.__fsid_val[1]) {
+			syslog(LOG_ERR,
+			    "\"%s\", line %ld: filesystem ids disagree",
+			    line, (unsigned long)lineno);
+			return 0;
+		}
+	} else {
+		/*
+		 * See if this directory is already
+		 * in the list.
+		 */
+		*ep = ex_search(&fsp->f_fsidx);
+		if (*ep == NULL) {
+			*ep = get_exp();
+			(*ep)->ex_fs = fsp->f_fsidx;
+			(*ep)->ex_fsdir = estrdup(fsp->f_mntonname);
+			if (debug)
+				(void)fprintf(stderr,
+				    "Making new ep fs=0x%x,0x%x\n",
+				    fsp->f_fsidx.__fsid_val[0], fsp->f_fsidx.__fsid_val[1]);
+		} else {
+			if (debug)
+				(void)fprintf(stderr,
+				    "Found ep fs=0x%x,0x%x\n",
+				    fsp->f_fsidx.__fsid_val[0], fsp->f_fsidx.__fsid_val[1]);
+		}
+	}
+
+	return 1;
+}
+
+
+/*
+ * Get the export list
+ */
+/* ARGSUSED */
+void
+get_exportlist(n)
+	int n;
+{
+	struct exportlist *ep, *ep2;
+	struct grouplist *grp, *tgrp;
+	struct exportlist **epp;
+	struct dirlist *dirhead;
+	struct statvfs fsb, *fsp;
+	struct addrinfo *ai;
+	struct uucred anon;
+	char *cp, *endcp, *dirp, savedc;
+	int has_host, exflags, got_nondir, dirplen, num, i;
+	FILE *exp_file;
+	char *line;
+	size_t lineno = 0, len;
+
+
+	/*
+	 * First, get rid of the old list
+	 */
+	ep = exphead;
+	while (ep) {
+		ep2 = ep;
+		ep = ep->ex_next;
+		free_exp(ep2);
+	}
+	exphead = NULL;
+
+	dirp = NULL;
+	dirplen = 0;
+	grp = grphead;
+	while (grp) {
+		tgrp = grp;
+		grp = grp->gr_next;
+		free_grp(tgrp);
+	}
+	grphead = NULL;
+
+	/*
+	 * And delete exports that are in the kernel for all local
+	 * file systems.
+	 */
+	num = getmntinfo(&fsp, MNT_NOWAIT);
+	for (i = 0; i < num; i++) {
+		struct mountd_exports_list mel;
+
+		/* Delete all entries from the export list. */
+		mel.mel_path = fsp->f_mntonname;
+		mel.mel_nexports = 0;
+		if (rump_sys_nfssvc(NFSSVC_SETEXPORTSLIST, &mel) == -1 &&
+		    errno != EOPNOTSUPP)
+			syslog(LOG_ERR, "Can't delete exports for %s (%m)",
+			    fsp->f_mntonname);
+
+		fsp++;
+	}
+
+	/*
+	 * Read in the exports file and build the list, calling
+	 * mount() as we go along to push the export rules into the kernel.
+	 */
+	exname = _PATH_EXPORTS;
+	if ((exp_file = rumpfopen(exname, "r")) == NULL) {
+		/*
+		 * Don't exit here; we can still reload the config
+		 * after a SIGHUP.
+		 */
+		if (debug)
+			(void)fprintf(stderr, "Can't open %s: %s\n", exname,
+			    strerror(errno));
+		return;
+	}
+	dirhead = NULL;
+	while ((line = fparseln(exp_file, &len, &lineno, NULL, 0)) != NULL) {
+		if (debug)
+			(void)fprintf(stderr, "Got line %s\n", line);
+		cp = line;
+		nextfield(&cp, &endcp);
+		if (cp == endcp)
+			goto nextline;	/* skip empty line */
+		/*
+		 * Set defaults.
+		 */
+		has_host = FALSE;
+		anon = def_anon;
+		exflags = MNT_EXPORTED;
+		got_nondir = 0;
+		opt_flags = 0;
+		ep = NULL;
+
+		if (noprivports) {
+			opt_flags |= OP_NORESMNT | OP_NORESPORT;
+			exflags |= MNT_EXNORESPORT;
+		}
+
+		/*
+		 * Create new exports list entry
+		 */
+		len = endcp - cp;
+		tgrp = grp = get_grp();
+		while (len > 0) {
+			if (len > RPCMNT_NAMELEN) {
+				*endcp = '\0';
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: name `%s' is too long",
+				    line, (unsigned long)lineno, cp);
+				goto badline;
+			}
+			switch (*cp) {
+			case '-':
+				/*
+				 * Option
+				 */
+				if (ep == NULL) {
+					syslog(LOG_ERR,
+				"\"%s\", line %ld: No current export list",
+					    line, (unsigned long)lineno);
+					goto badline;
+				}
+				if (debug)
+					(void)fprintf(stderr, "doing opt %s\n",
+					    cp);
+				got_nondir = 1;
+				if (do_opt(line, lineno, &cp, &endcp, ep, grp,
+				    &has_host, &exflags, &anon))
+					goto badline;
+				break;
+
+			case '/':
+				/*
+				 * Directory
+				 */
+				savedc = *endcp;
+				*endcp = '\0';
+
+				if (!parse_directory(line, lineno, tgrp,
+				    got_nondir, cp, &ep, &fsb))
+					goto badline;
+				/*
+				 * Add dirpath to export mount point.
+				 */
+				dirp = add_expdir(&dirhead, cp, len);
+				dirplen = len;
+
+				*endcp = savedc;
+				break;
+
+			default:
+				/*
+				 * Host or netgroup.
+				 */
+				savedc = *endcp;
+				*endcp = '\0';
+
+				if (!parse_host_netgroup(line, lineno, ep,
+				    tgrp, cp, &has_host, &grp))
+					goto badline;
+
+				got_nondir = 1;
+
+				*endcp = savedc;
+				break;
+			}
+
+			cp = endcp;
+			nextfield(&cp, &endcp);
+			len = endcp - cp;
+		}
+		if (check_options(line, lineno, dirhead))
+			goto badline;
+
+		if (!has_host) {
+			grp->gr_type = GT_HOST;
+			if (debug)
+				(void)fprintf(stderr,
+				    "Adding a default entry\n");
+			/* add a default group and make the grp list NULL */
+			ai = emalloc(sizeof(struct addrinfo));
+			ai->ai_flags = 0;
+			ai->ai_family = AF_INET;	/* XXXX */
+			ai->ai_socktype = SOCK_DGRAM;
+			/* setting the length to 0 will match anything */
+			ai->ai_addrlen = 0;
+			ai->ai_flags = AI_CANONNAME;
+			ai->ai_canonname = estrdup("Default");
+			ai->ai_addr = NULL;
+			ai->ai_next = NULL;
+			grp->gr_ptr.gt_addrinfo = ai;
+
+		} else if ((opt_flags & OP_NET) && tgrp->gr_next) {
+			/*
+			 * Don't allow a network export coincide with a list of
+			 * host(s) on the same line.
+			 */
+			syslog(LOG_ERR,
+			    "\"%s\", line %ld: Mixed exporting of networks and hosts is disallowed",
+			    line, (unsigned long)lineno);
+			goto badline;
+		}
+		/*
+		 * Loop through hosts, pushing the exports into the kernel.
+		 * After loop, tgrp points to the start of the list and
+		 * grp points to the last entry in the list.
+		 */
+		grp = tgrp;
+		do {
+			if (do_nfssvc(line, lineno, ep, grp, exflags, &anon,
+			    dirp, dirplen, &fsb))
+				goto badline;
+		} while (grp->gr_next && (grp = grp->gr_next));
+
+		/*
+		 * Success. Update the data structures.
+		 */
+		if (has_host) {
+			hang_dirp(dirhead, tgrp, ep, opt_flags);
+			grp->gr_next = grphead;
+			grphead = tgrp;
+		} else {
+			hang_dirp(dirhead, NULL, ep, opt_flags);
+			free_grp(tgrp);
+		}
+		tgrp = NULL;
+		dirhead = NULL;
+		if ((ep->ex_flag & EX_LINKED) == 0) {
+			ep2 = exphead;
+			epp = &exphead;
+
+			/*
+			 * Insert in the list in alphabetical order.
+			 */
+			while (ep2 && strcmp(ep2->ex_fsdir, ep->ex_fsdir) < 0) {
+				epp = &ep2->ex_next;
+				ep2 = ep2->ex_next;
+			}
+			if (ep2)
+				ep->ex_next = ep2;
+			*epp = ep;
+			ep->ex_flag |= EX_LINKED;
+		}
+		goto nextline;
+badline:
+		free_exp_grp(ep, grp);
+nextline:
+		if (dirhead) {
+			free_dir(dirhead);
+			dirhead = NULL;
+		}
+		free(line);
+	}
+	(void)fclose(exp_file);
+}
+
+/*
+ * Allocate an export list element
+ */
+static struct exportlist *
+get_exp()
+{
+	struct exportlist *ep;
+
+	ep = emalloc(sizeof(struct exportlist));
+	(void)memset(ep, 0, sizeof(struct exportlist));
+	return (ep);
+}
+
+/*
+ * Allocate a group list element
+ */
+static struct grouplist *
+get_grp()
+{
+	struct grouplist *gp;
+
+	gp = emalloc(sizeof(struct grouplist));
+	(void)memset(gp, 0, sizeof(struct grouplist));
+	return (gp);
+}
+
+/*
+ * Clean up upon an error in get_exportlist().
+ */
+static void
+free_exp_grp(ep, grp)
+	struct exportlist *ep;
+	struct grouplist *grp;
+{
+	struct grouplist *tgrp;
+
+	if (ep && (ep->ex_flag & EX_LINKED) == 0)
+		free_exp(ep);
+	while (grp) {
+		tgrp = grp;
+		grp = grp->gr_next;
+		free_grp(tgrp);
+	}
+}
+
+/*
+ * Search the export list for a matching fs.
+ */
+static struct exportlist *
+ex_search(fsid)
+	fsid_t *fsid;
+{
+	struct exportlist *ep;
+
+	ep = exphead;
+	return ep;
+	while (ep) {
+		if (ep->ex_fs.__fsid_val[0] == fsid->__fsid_val[0] &&
+		    ep->ex_fs.__fsid_val[1] == fsid->__fsid_val[1])
+			return (ep);
+		ep = ep->ex_next;
+	}
+	return (ep);
+}
+
+/*
+ * Add a directory path to the list.
+ */
+static char *
+add_expdir(dpp, cp, len)
+	struct dirlist **dpp;
+	char *cp;
+	int len;
+{
+	struct dirlist *dp;
+
+	dp = emalloc(sizeof(struct dirlist) + len);
+	dp->dp_left = *dpp;
+	dp->dp_right = NULL;
+	dp->dp_flag = 0;
+	dp->dp_hosts = NULL;
+	(void)strcpy(dp->dp_dirp, cp);
+	*dpp = dp;
+	return (dp->dp_dirp);
+}
+
+/*
+ * Hang the dir list element off the dirpath binary tree as required
+ * and update the entry for host.
+ */
+void
+hang_dirp(dp, grp, ep, flags)
+	struct dirlist *dp;
+	struct grouplist *grp;
+	struct exportlist *ep;
+	int flags;
+{
+	struct hostlist *hp;
+	struct dirlist *dp2;
+
+	if (flags & OP_ALLDIRS) {
+		if (ep->ex_defdir)
+			free(dp);
+		else
+			ep->ex_defdir = dp;
+		if (grp == NULL) {
+			ep->ex_defdir->dp_flag |= DP_DEFSET;
+			if (flags & OP_KERB)
+				ep->ex_defdir->dp_flag |= DP_KERB;
+			if (flags & OP_NORESMNT)
+				ep->ex_defdir->dp_flag |= DP_NORESMNT;
+		} else
+			while (grp) {
+				hp = get_ht();
+				if (flags & OP_KERB)
+					hp->ht_flag |= DP_KERB;
+				if (flags & OP_NORESMNT)
+					hp->ht_flag |= DP_NORESMNT;
+				hp->ht_grp = grp;
+				hp->ht_next = ep->ex_defdir->dp_hosts;
+				ep->ex_defdir->dp_hosts = hp;
+				grp = grp->gr_next;
+			}
+	} else {
+
+		/*
+		 * Loop through the directories adding them to the tree.
+		 */
+		while (dp) {
+			dp2 = dp->dp_left;
+			add_dlist(&ep->ex_dirl, dp, grp, flags);
+			dp = dp2;
+		}
+	}
+}
+
+/*
+ * Traverse the binary tree either updating a node that is already there
+ * for the new directory or adding the new node.
+ */
+static void
+add_dlist(dpp, newdp, grp, flags)
+	struct dirlist **dpp;
+	struct dirlist *newdp;
+	struct grouplist *grp;
+	int flags;
+{
+	struct dirlist *dp;
+	struct hostlist *hp;
+	int cmp;
+
+	dp = *dpp;
+	if (dp) {
+		cmp = strcmp(dp->dp_dirp, newdp->dp_dirp);
+		if (cmp > 0) {
+			add_dlist(&dp->dp_left, newdp, grp, flags);
+			return;
+		} else if (cmp < 0) {
+			add_dlist(&dp->dp_right, newdp, grp, flags);
+			return;
+		} else
+			free(newdp);
+	} else {
+		dp = newdp;
+		dp->dp_left = NULL;
+		*dpp = dp;
+	}
+	if (grp) {
+
+		/*
+		 * Hang all of the host(s) off of the directory point.
+		 */
+		do {
+			hp = get_ht();
+			if (flags & OP_KERB)
+				hp->ht_flag |= DP_KERB;
+			if (flags & OP_NORESMNT)
+				hp->ht_flag |= DP_NORESMNT;
+			hp->ht_grp = grp;
+			hp->ht_next = dp->dp_hosts;
+			dp->dp_hosts = hp;
+			grp = grp->gr_next;
+		} while (grp);
+	} else {
+		dp->dp_flag |= DP_DEFSET;
+		if (flags & OP_KERB)
+			dp->dp_flag |= DP_KERB;
+		if (flags & OP_NORESMNT)
+			dp->dp_flag |= DP_NORESMNT;
+	}
+}
+
+/*
+ * Search for a dirpath on the export point.
+ */
+static struct dirlist *
+dirp_search(dp, dirp)
+	struct dirlist *dp;
+	char *dirp;
+{
+	int cmp;
+
+	if (dp) {
+		cmp = strcmp(dp->dp_dirp, dirp);
+		if (cmp > 0)
+			return (dirp_search(dp->dp_left, dirp));
+		else if (cmp < 0)
+			return (dirp_search(dp->dp_right, dirp));
+		else
+			return (dp);
+	}
+	return (dp);
+}
+
+/*
+ * Some helper functions for netmasks. They all assume masks in network
+ * order (big endian).
+ */
+static int
+bitcmp(void *dst, void *src, int bitlen)
+{
+	int i;
+	u_int8_t *p1 = dst, *p2 = src;
+	u_int8_t bitmask;
+	int bytelen, bitsleft;
+
+	bytelen = bitlen / 8;
+	bitsleft = bitlen % 8;
+
+	if (debug) {
+		printf("comparing:\n");
+		for (i = 0; i < (bitsleft ? bytelen + 1 : bytelen); i++)
+			printf("%02x", p1[i]);
+		printf("\n");
+		for (i = 0; i < (bitsleft ? bytelen + 1 : bytelen); i++)
+			printf("%02x", p2[i]);
+		printf("\n");
+	}
+
+	for (i = 0; i < bytelen; i++) {
+		if (*p1 != *p2)
+			return 1;
+		p1++;
+		p2++;
+	}
+
+	for (i = 0; i < bitsleft; i++) {
+		bitmask = 1 << (7 - i);
+		if ((*p1 & bitmask) != (*p2 & bitmask))
+			return 1;
+	}
+
+	return 0;
+}
+
+static int
+netpartcmp(struct sockaddr *s1, struct sockaddr *s2, int bitlen)
+{
+	void *src, *dst;
+
+	if (s1->sa_family != s2->sa_family)
+		return 1;
+
+	switch (s1->sa_family) {
+	case AF_INET:
+		src = &((struct sockaddr_in *)s1)->sin_addr;
+		dst = &((struct sockaddr_in *)s2)->sin_addr;
+		if (bitlen > sizeof(((struct sockaddr_in *)s1)->sin_addr) * 8)
+			return 1;
+		break;
+	case AF_INET6:
+		src = &((struct sockaddr_in6 *)s1)->sin6_addr;
+		dst = &((struct sockaddr_in6 *)s2)->sin6_addr;
+		if (((struct sockaddr_in6 *)s1)->sin6_scope_id !=
+		    ((struct sockaddr_in6 *)s2)->sin6_scope_id)
+			return 1;
+		if (bitlen > sizeof(((struct sockaddr_in6 *)s1)->sin6_addr) * 8)
+			return 1;
+		break;
+	default:
+		return 1;
+	}
+
+	return bitcmp(src, dst, bitlen);
+}
+
+static int
+allones(struct sockaddr_storage *ssp, int bitlen)
+{
+	u_int8_t *p;
+	int bytelen, bitsleft, i;
+	int zerolen;
+
+	switch (ssp->ss_family) {
+	case AF_INET:
+		p = (u_int8_t *)&((struct sockaddr_in *)ssp)->sin_addr;
+		zerolen = sizeof (((struct sockaddr_in *)ssp)->sin_addr);
+		break;
+	case AF_INET6:
+		p = (u_int8_t *)&((struct sockaddr_in6 *)ssp)->sin6_addr;
+		zerolen = sizeof (((struct sockaddr_in6 *)ssp)->sin6_addr);
+		break;
+	default:
+		return -1;
+	}
+
+	memset(p, 0, zerolen);
+
+	bytelen = bitlen / 8;
+	bitsleft = bitlen % 8;
+
+	if (bytelen > zerolen)
+		return -1;
+
+	for (i = 0; i < bytelen; i++)
+		*p++ = 0xff;
+
+	for (i = 0; i < bitsleft; i++)
+		*p |= 1 << (7 - i);
+	
+	return 0;
+}
+
+static int
+countones(struct sockaddr *sa)
+{
+	void *mask;
+	int i, bits = 0, bytelen;
+	u_int8_t *p;
+
+	switch (sa->sa_family) {
+	case AF_INET:
+		mask = (u_int8_t *)&((struct sockaddr_in *)sa)->sin_addr;
+		bytelen = 4;
+		break;
+	case AF_INET6:
+		mask = (u_int8_t *)&((struct sockaddr_in6 *)sa)->sin6_addr;
+		bytelen = 16;
+		break;
+	default:
+		return 0;
+	}
+
+	p = mask;
+
+	for (i = 0; i < bytelen; i++, p++) {
+		if (*p != 0xff) {
+			for (bits = 0; bits < 8; bits++) {
+				if (!(*p & (1 << (7 - bits))))
+					break;
+			}
+			break;
+		}
+	}
+
+	return (i * 8 + bits);
+}
+
+static int
+sacmp(struct sockaddr *sa1, struct sockaddr *sa2)
+{
+	void *p1, *p2;
+	int len;
+
+	if (sa1->sa_family != sa2->sa_family)
+		return 1;
+
+	switch (sa1->sa_family) {
+	case AF_INET:
+		p1 = &((struct sockaddr_in *)sa1)->sin_addr;
+		p2 = &((struct sockaddr_in *)sa2)->sin_addr;
+		len = 4;
+		break;
+	case AF_INET6:
+		p1 = &((struct sockaddr_in6 *)sa1)->sin6_addr;
+		p2 = &((struct sockaddr_in6 *)sa2)->sin6_addr;
+		len = 16;
+		if (((struct sockaddr_in6 *)sa1)->sin6_scope_id !=
+		    ((struct sockaddr_in6 *)sa2)->sin6_scope_id)
+			return 1;
+		break;
+	default:
+		return 1;
+	}
+
+	return memcmp(p1, p2, len);
+}
+
+/*
+ * Scan for a host match in a directory tree.
+ */
+static int
+chk_host(dp, saddr, defsetp, hostsetp)
+	struct dirlist *dp;
+	struct sockaddr *saddr;
+	int *defsetp;
+	int *hostsetp;
+{
+	struct hostlist *hp;
+	struct grouplist *grp;
+	struct addrinfo *ai;
+
+	if (dp) {
+		if (dp->dp_flag & DP_DEFSET)
+			*defsetp = dp->dp_flag;
+		hp = dp->dp_hosts;
+		while (hp) {
+			grp = hp->ht_grp;
+			switch (grp->gr_type) {
+			case GT_HOST:
+				ai = grp->gr_ptr.gt_addrinfo;
+				for (; ai; ai = ai->ai_next) {
+					if (!sacmp(ai->ai_addr, saddr)) {
+						*hostsetp =
+						    (hp->ht_flag | DP_HOSTSET);
+						return (1);
+					}
+				}
+				break;
+			case GT_NET:
+				if (!netpartcmp(saddr,
+				    (struct sockaddr *)
+					&grp->gr_ptr.gt_net.nt_net,
+				    grp->gr_ptr.gt_net.nt_len)) {
+					*hostsetp = (hp->ht_flag | DP_HOSTSET);
+					return (1);
+				}
+				break;
+			};
+			hp = hp->ht_next;
+		}
+	}
+	return (0);
+}
+
+/*
+ * Scan tree for a host that matches the address.
+ */
+static int
+scan_tree(dp, saddr)
+	struct dirlist *dp;
+	struct sockaddr *saddr;
+{
+	int defset, hostset;
+
+	if (dp) {
+		if (scan_tree(dp->dp_left, saddr))
+			return (1);
+		if (chk_host(dp, saddr, &defset, &hostset))
+			return (1);
+		if (scan_tree(dp->dp_right, saddr))
+			return (1);
+	}
+	return (0);
+}
+
+/*
+ * Traverse the dirlist tree and free it up.
+ */
+static void
+free_dir(dp)
+	struct dirlist *dp;
+{
+
+	if (dp) {
+		free_dir(dp->dp_left);
+		free_dir(dp->dp_right);
+		free_host(dp->dp_hosts);
+		free(dp);
+	}
+}
+
+/*
+ * Parse the option string and update fields.
+ * Option arguments may either be -<option>=<value> or
+ * -<option> <value>
+ */
+static int
+do_opt(line, lineno, cpp, endcpp, ep, grp, has_hostp, exflagsp, cr)
+	const char *line;
+	size_t lineno;
+	char **cpp, **endcpp;
+	struct exportlist *ep;
+	struct grouplist *grp;
+	int *has_hostp;
+	int *exflagsp;
+	struct uucred *cr;
+{
+	char *cpoptarg, *cpoptend;
+	char *cp, *cpopt, savedc, savedc2;
+	char *endcp = NULL;	/* XXX: GCC */
+	int allflag, usedarg;
+
+	cpopt = *cpp;
+	cpopt++;
+	cp = *endcpp;
+	savedc = *cp;
+	*cp = '\0';
+	while (cpopt && *cpopt) {
+		allflag = 1;
+		usedarg = -2;
+		savedc2 = '\0';
+		if ((cpoptend = strchr(cpopt, ',')) != NULL) {
+			*cpoptend++ = '\0';
+			if ((cpoptarg = strchr(cpopt, '=')) != NULL)
+				*cpoptarg++ = '\0';
+		} else {
+			if ((cpoptarg = strchr(cpopt, '=')) != NULL)
+				*cpoptarg++ = '\0';
+			else {
+				*cp = savedc;
+				nextfield(&cp, &endcp);
+				**endcpp = '\0';
+				if (endcp > cp && *cp != '-') {
+					cpoptarg = cp;
+					savedc2 = *endcp;
+					*endcp = '\0';
+					usedarg = 0;
+				}
+			}
+		}
+		if (!strcmp(cpopt, "ro") || !strcmp(cpopt, "o")) {
+			*exflagsp |= MNT_EXRDONLY;
+		} else if (cpoptarg && (!strcmp(cpopt, "maproot") ||
+		    !(allflag = strcmp(cpopt, "mapall")) ||
+		    !strcmp(cpopt, "root") || !strcmp(cpopt, "r"))) {
+			usedarg++;
+			parsecred(cpoptarg, cr);
+			if (allflag == 0) {
+				*exflagsp |= MNT_EXPORTANON;
+				opt_flags |= OP_MAPALL;
+			} else
+				opt_flags |= OP_MAPROOT;
+		} else if (!strcmp(cpopt, "kerb") || !strcmp(cpopt, "k")) {
+			*exflagsp |= MNT_EXKERB;
+			opt_flags |= OP_KERB;
+		} else if (cpoptarg && (!strcmp(cpopt, "mask") ||
+		    !strcmp(cpopt, "m"))) {
+			if (get_net(cpoptarg, &grp->gr_ptr.gt_net, 1)) {
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: Bad mask: %s",
+				    line, (unsigned long)lineno, cpoptarg);
+				return (1);
+			}
+			usedarg++;
+			opt_flags |= OP_MASK;
+		} else if (cpoptarg && (!strcmp(cpopt, "network") ||
+		    !strcmp(cpopt, "n"))) {
+			if (strchr(cpoptarg, '/') != NULL) {
+				if (debug)
+					fprintf(stderr, "setting OP_MASKLEN\n");
+				opt_flags |= OP_MASKLEN;
+			}
+			if (grp->gr_type != GT_NULL) {
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: Network/host conflict",
+				    line, (unsigned long)lineno);
+				return (1);
+			} else if (get_net(cpoptarg, &grp->gr_ptr.gt_net, 0)) {
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: Bad net: %s",
+				    line, (unsigned long)lineno, cpoptarg);
+				return (1);
+			}
+			grp->gr_type = GT_NET;
+			*has_hostp = 1;
+			usedarg++;
+			opt_flags |= OP_NET;
+		} else if (!strcmp(cpopt, "alldirs")) {
+			opt_flags |= OP_ALLDIRS;
+		} else if (!strcmp(cpopt, "noresvmnt")) {
+			opt_flags |= OP_NORESMNT;
+		} else if (!strcmp(cpopt, "noresvport")) {
+			opt_flags |= OP_NORESPORT;
+			*exflagsp |= MNT_EXNORESPORT;
+		} else if (!strcmp(cpopt, "public")) {
+			*exflagsp |= (MNT_EXNORESPORT | MNT_EXPUBLIC);
+			opt_flags |= OP_NORESPORT;
+		} else if (!strcmp(cpopt, "webnfs")) {
+			*exflagsp |= (MNT_EXNORESPORT | MNT_EXPUBLIC |
+			    MNT_EXRDONLY | MNT_EXPORTANON);
+			opt_flags |= (OP_MAPALL | OP_NORESPORT);
+		} else if (cpoptarg && !strcmp(cpopt, "index")) {
+			ep->ex_indexfile = strdup(cpoptarg);
+		} else {
+			syslog(LOG_ERR, 
+			    "\"%s\", line %ld: Bad opt %s",
+			    line, (unsigned long)lineno, cpopt);
+			return (1);
+		}
+		if (usedarg >= 0) {
+			*endcp = savedc2;
+			**endcpp = savedc;
+			if (usedarg > 0) {
+				*cpp = cp;
+				*endcpp = endcp;
+			}
+			return (0);
+		}
+		cpopt = cpoptend;
+	}
+	**endcpp = savedc;
+	return (0);
+}
+
+/*
+ * Translate a character string to the corresponding list of network
+ * addresses for a hostname.
+ */
+static int
+get_host(line, lineno, cp, grp)
+	const char *line;
+	size_t lineno;
+	const char *cp;
+	struct grouplist *grp;
+{
+	struct addrinfo *ai, hints;
+	int ecode;
+	char host[NI_MAXHOST];
+
+	if (grp->gr_type != GT_NULL) {
+		syslog(LOG_ERR,
+		    "\"%s\", line %ld: Bad netgroup type for ip host %s",
+		    line, (unsigned long)lineno, cp);
+		return (1);
+	}
+	memset(&hints, 0, sizeof hints);
+	hints.ai_flags = AI_CANONNAME;
+	hints.ai_protocol = IPPROTO_UDP;
+	ecode = getaddrinfo(cp, NULL, &hints, &ai);
+	if (ecode != 0) {
+		syslog(LOG_ERR, "\"%s\", line %ld: can't get address info for "
+				"host %s",
+		    line, (long)lineno, cp);
+		return 1;
+	}
+	grp->gr_type = GT_HOST;
+	grp->gr_ptr.gt_addrinfo = ai;
+	while (ai != NULL) {
+		if (ai->ai_canonname == NULL) {
+			if (getnameinfo(ai->ai_addr, ai->ai_addrlen, host,
+			    sizeof host, NULL, 0, ninumeric) != 0)
+				strlcpy(host, "?", sizeof(host));
+			ai->ai_canonname = estrdup(host);
+			ai->ai_flags |= AI_CANONNAME;
+		} else
+			ai->ai_flags &= ~AI_CANONNAME;
+		if (debug)
+			(void)fprintf(stderr, "got host %s\n", ai->ai_canonname);
+		ai = ai->ai_next;
+	}
+	return (0);
+}
+
+/*
+ * Free up an exports list component
+ */
+static void
+free_exp(ep)
+	struct exportlist *ep;
+{
+
+	if (ep->ex_defdir) {
+		free_host(ep->ex_defdir->dp_hosts);
+		free(ep->ex_defdir);
+	}
+	if (ep->ex_fsdir)
+		free(ep->ex_fsdir);
+	if (ep->ex_indexfile)
+		free(ep->ex_indexfile);
+	free_dir(ep->ex_dirl);
+	free(ep);
+}
+
+/*
+ * Free hosts.
+ */
+static void
+free_host(hp)
+	struct hostlist *hp;
+{
+	struct hostlist *hp2;
+
+	while (hp) {
+		hp2 = hp;
+		hp = hp->ht_next;
+		free(hp2);
+	}
+}
+
+static struct hostlist *
+get_ht()
+{
+	struct hostlist *hp;
+
+	hp = emalloc(sizeof(struct hostlist));
+	hp->ht_next = NULL;
+	hp->ht_flag = 0;
+	return (hp);
+}
+
+/*
+ * Do the nfssvc syscall to push the export info into the kernel.
+ */
+static int
+do_nfssvc(line, lineno, ep, grp, exflags, anoncrp, dirp, dirplen, fsb)
+	const char *line;
+	size_t lineno;
+	struct exportlist *ep;
+	struct grouplist *grp;
+	int exflags;
+	struct uucred *anoncrp;
+	char *dirp;
+	int dirplen;
+	struct statvfs *fsb;
+{
+	struct sockaddr *addrp;
+	struct sockaddr_storage ss;
+	struct addrinfo *ai;
+	int addrlen;
+	int done;
+	struct export_args export;
+
+	export.ex_flags = exflags;
+	export.ex_anon = *anoncrp;
+	export.ex_indexfile = ep->ex_indexfile;
+	if (grp->gr_type == GT_HOST) {
+		ai = grp->gr_ptr.gt_addrinfo;
+		addrp = ai->ai_addr;
+		addrlen = ai->ai_addrlen;
+	} else {
+		addrp = NULL;
+		ai = NULL;	/* XXXGCC -Wuninitialized */
+		addrlen = 0;	/* XXXGCC -Wuninitialized */
+	}
+	done = FALSE;
+	while (!done) {
+		struct mountd_exports_list mel;
+
+		switch (grp->gr_type) {
+		case GT_HOST:
+			if (addrp != NULL && addrp->sa_family == AF_INET6 &&
+			    have_v6 == 0)
+				goto skip;
+			export.ex_addr = addrp;
+			export.ex_addrlen = addrlen;
+			export.ex_masklen = 0;
+			break;
+		case GT_NET:
+			export.ex_addr = (struct sockaddr *)
+			    &grp->gr_ptr.gt_net.nt_net;
+			if (export.ex_addr->sa_family == AF_INET6 &&
+			    have_v6 == 0)
+				goto skip;
+			export.ex_addrlen = export.ex_addr->sa_len;
+			memset(&ss, 0, sizeof ss);
+			ss.ss_family = export.ex_addr->sa_family;
+			ss.ss_len = export.ex_addr->sa_len;
+			if (allones(&ss, grp->gr_ptr.gt_net.nt_len) != 0) {
+				syslog(LOG_ERR,
+				    "\"%s\", line %ld: Bad network flag",
+				    line, (unsigned long)lineno);
+				return (1);
+			}
+			export.ex_mask = (struct sockaddr *)&ss;
+			export.ex_masklen = ss.ss_len;
+			break;
+		default:
+			syslog(LOG_ERR, "\"%s\", line %ld: Bad netgroup type",
+			    line, (unsigned long)lineno);
+			return (1);
+		};
+
+		/*
+		 * XXX:
+		 * Maybe I should just use the fsb->f_mntonname path?
+		 */
+
+		mel.mel_path = dirp;
+		mel.mel_nexports = 1;
+		mel.mel_exports = &export;
+
+		if (rump_sys_nfssvc(NFSSVC_SETEXPORTSLIST, &mel) != 0) {
+			syslog(LOG_ERR,
+	    "\"%s\", line %ld: Can't change attributes for %s to %s: %m %d",
+			    line, (unsigned long)lineno,
+			    dirp, (grp->gr_type == GT_HOST) ?
+			    grp->gr_ptr.gt_addrinfo->ai_canonname :
+			    (grp->gr_type == GT_NET) ?
+			    grp->gr_ptr.gt_net.nt_name :
+			    "Unknown", errno);
+			return (1);
+		}
+skip:
+		if (addrp) {
+			ai = ai->ai_next;
+			if (ai == NULL)
+				done = TRUE;
+			else {
+				addrp = ai->ai_addr;
+				addrlen = ai->ai_addrlen;
+			}
+		} else
+			done = TRUE;
+	}
+	return (0);
+}
+
+/*
+ * Translate a net address.
+ */
+static int
+get_net(cp, net, maskflg)
+	char *cp;
+	struct netmsk *net;
+	int maskflg;
+{
+	struct netent *np;
+	char *thename, *p, *prefp;
+	struct sockaddr_in sin, *sinp;
+	struct sockaddr *sa;
+	struct addrinfo hints, *ai = NULL;
+	char netname[NI_MAXHOST];
+	long preflen;
+	int ecode;
+
+	(void)memset(&sin, 0, sizeof(sin));
+	if ((opt_flags & OP_MASKLEN) && !maskflg) {
+		p = strchr(cp, '/');
+		*p = '\0';
+		prefp = p + 1;
+	} else {
+		p = NULL;	/* XXXGCC -Wuninitialized */
+		prefp = NULL;	/* XXXGCC -Wuninitialized */
+	}
+
+	if ((np = getnetbyname(cp)) != NULL) {
+		sin.sin_family = AF_INET;
+		sin.sin_len = sizeof sin;
+		sin.sin_addr = inet_makeaddr(np->n_net, 0);
+		sa = (struct sockaddr *)&sin;
+	} else if (isdigit((unsigned char)*cp)) {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_family = AF_UNSPEC;
+		hints.ai_flags = AI_NUMERICHOST;
+		if (getaddrinfo(cp, NULL, &hints, &ai) != 0) {
+			/*
+			 * If getaddrinfo() failed, try the inet4 network
+			 * notation with less than 3 dots.
+			 */
+			sin.sin_family = AF_INET;
+			sin.sin_len = sizeof sin;
+			sin.sin_addr = inet_makeaddr(inet_network(cp),0);
+			if (debug)
+				fprintf(stderr, "get_net: v4 addr %x\n",
+				    sin.sin_addr.s_addr);
+			sa = (struct sockaddr *)&sin;
+		} else
+			sa = ai->ai_addr;
+	} else if (isxdigit((unsigned char)*cp) || *cp == ':') {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_family = AF_UNSPEC;
+		hints.ai_flags = AI_NUMERICHOST;
+		if (getaddrinfo(cp, NULL, &hints, &ai) == 0)
+			sa = ai->ai_addr;
+		else
+			goto fail;
+	} else
+		goto fail;
+
+	/*
+	 * Only allow /pref notation for v6 addresses.
+	 */
+	if (sa->sa_family == AF_INET6 && (!(opt_flags & OP_MASKLEN) || maskflg))
+		return 1;
+
+	ecode = getnameinfo(sa, sa->sa_len, netname, sizeof netname,
+	    NULL, 0, ninumeric);
+	if (ecode != 0)
+		goto fail;
+
+	if (maskflg)
+		net->nt_len = countones(sa);
+	else {
+		if (opt_flags & OP_MASKLEN) {
+			errno = 0;
+			preflen = strtol(prefp, NULL, 10);
+			if (preflen == LONG_MIN && errno == ERANGE)
+				goto fail;
+			net->nt_len = (int)preflen;
+			*p = '/';
+		}
+
+		if (np)
+			thename = np->n_name;
+		else {
+			if (getnameinfo(sa, sa->sa_len, netname, sizeof netname,
+			    NULL, 0, ninumeric) != 0)
+				strlcpy(netname, "?", sizeof(netname));
+			thename = netname;
+		}
+		net->nt_name = estrdup(thename);
+		memcpy(&net->nt_net, sa, sa->sa_len);
+	}
+
+	if (!maskflg && sa->sa_family == AF_INET &&
+	    !(opt_flags & (OP_MASK|OP_MASKLEN))) {
+		sinp = (struct sockaddr_in *)sa;
+		if (IN_CLASSA(sinp->sin_addr.s_addr))
+			net->nt_len = 8;
+		else if (IN_CLASSB(sinp->sin_addr.s_addr))
+			net->nt_len = 16;
+		else if (IN_CLASSC(sinp->sin_addr.s_addr))
+			net->nt_len = 24;
+		else if (IN_CLASSD(sinp->sin_addr.s_addr))
+			net->nt_len = 28;
+		else
+			net->nt_len = 32;	/* XXX */
+	}
+
+	if (ai)
+		freeaddrinfo(ai);
+	return 0;
+
+fail:
+	if (ai)
+		freeaddrinfo(ai);
+	return 1;
+}
+
+/*
+ * Parse out the next white space separated field
+ */
+static void
+nextfield(cp, endcp)
+	char **cp;
+	char **endcp;
+{
+	char *p;
+
+	p = *cp;
+	while (*p == ' ' || *p == '\t')
+		p++;
+	if (*p == '\n' || *p == '\0')
+		*cp = *endcp = p;
+	else {
+		*cp = p++;
+		while (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\0')
+			p++;
+		*endcp = p;
+	}
+}
+
+/*
+ * Parse a description of a credential.
+ */
+static void
+parsecred(namelist, cr)
+	char *namelist;
+	struct uucred *cr;
+{
+	char *thename;
+	int cnt;
+	char *names;
+	struct passwd *pw;
+	struct group *gr;
+	int ngroups;
+	gid_t grps[NGROUPS + 1];
+
+	/*
+	 * Set up the unprivileged user.
+	 */
+	*cr = def_anon;
+	/*
+	 * Get the user's password table entry.
+	 */
+	names = strsep(&namelist, " \t\n");
+	thename = strsep(&names, ":");
+	if (isdigit((unsigned char)*thename) || *thename == '-')
+		pw = getpwuid(atoi(thename));
+	else
+		pw = getpwnam(thename);
+	/*
+	 * Credentials specified as those of a user.
+	 */
+	if (names == NULL) {
+		if (pw == NULL) {
+			syslog(LOG_ERR, "Unknown user: %s", thename);
+			return;
+		}
+		cr->cr_uid = pw->pw_uid;
+		ngroups = NGROUPS + 1;
+		if (getgrouplist(pw->pw_name, pw->pw_gid, grps, &ngroups))
+			syslog(LOG_ERR, "Too many groups for user %s", thename);
+		/*
+		 * Convert from int's to gid_t's and compress out duplicate
+		 */
+		cr->cr_ngroups = ngroups - 1;
+		cr->cr_gid = grps[0];
+		for (cnt = 1; cnt < ngroups; cnt++)
+			cr->cr_groups[cnt - 1] = grps[cnt];
+		return;
+	}
+	/*
+	 * Explicit credential specified as a colon separated list:
+	 *	uid:gid:gid:...
+	 */
+	if (pw != NULL)
+		cr->cr_uid = pw->pw_uid;
+	else if (isdigit((unsigned char)*thename) || *thename == '-')
+		cr->cr_uid = atoi(thename);
+	else {
+		syslog(LOG_ERR, "Unknown user: %s", thename);
+		return;
+	}
+	cr->cr_ngroups = 0;
+	while (names != NULL && *names != '\0' && cr->cr_ngroups < NGROUPS) {
+		thename = strsep(&names, ":");
+		if (isdigit((unsigned char)*thename) || *thename == '-') {
+			cr->cr_groups[cr->cr_ngroups++] = atoi(thename);
+		} else {
+			if ((gr = getgrnam(thename)) == NULL) {
+				syslog(LOG_ERR, "Unknown group: %s", thename);
+				continue;
+			}
+			cr->cr_groups[cr->cr_ngroups++] = gr->gr_gid;
+		}
+	}
+	if (names != NULL && *names != '\0' && cr->cr_ngroups == NGROUPS)
+		syslog(LOG_ERR, "Too many groups");
+}
+
+#define	STRSIZ	(RPCMNT_NAMELEN+RPCMNT_PATHLEN+50)
+/*
+ * Routines that maintain the remote mounttab
+ */
+static void
+get_mountlist()
+{
+	struct mountlist *mlp, **mlpp;
+	char *host, *dirp, *cp;
+	char str[STRSIZ];
+	FILE *mlfile;
+
+	if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "r")) == NULL) {
+		syslog(LOG_ERR, "Can't open %s: %m", _PATH_RMOUNTLIST);
+		return;
+	}
+	mlpp = &mlhead;
+	while (fgets(str, STRSIZ, mlfile) != NULL) {
+		cp = str;
+		host = strsep(&cp, " \t\n");
+		dirp = strsep(&cp, " \t\n");
+		if (host == NULL || dirp == NULL)
+			continue;
+		mlp = emalloc(sizeof(*mlp));
+		(void)strncpy(mlp->ml_host, host, RPCMNT_NAMELEN);
+		mlp->ml_host[RPCMNT_NAMELEN] = '\0';
+		(void)strncpy(mlp->ml_dirp, dirp, RPCMNT_PATHLEN);
+		mlp->ml_dirp[RPCMNT_PATHLEN] = '\0';
+		mlp->ml_next = NULL;
+		*mlpp = mlp;
+		mlpp = &mlp->ml_next;
+	}
+	(void)fclose(mlfile);
+}
+
+static int
+del_mlist(hostp, dirp, saddr)
+	char *hostp, *dirp;
+	struct sockaddr *saddr;
+{
+	struct mountlist *mlp, **mlpp;
+	struct mountlist *mlp2;
+	u_short sport;
+	FILE *mlfile;
+	int fnd = 0, ret = 0;
+	char host[NI_MAXHOST];
+
+	switch (saddr->sa_family) {
+	case AF_INET6:
+		sport = ntohs(((struct sockaddr_in6 *)saddr)->sin6_port);
+		break;
+	case AF_INET:
+		sport = ntohs(((struct sockaddr_in *)saddr)->sin_port);
+		break;
+	default:
+		return -1;
+	}
+	mlpp = &mlhead;
+	mlp = mlhead;
+	while (mlp) {
+		if (!strcmp(mlp->ml_host, hostp) &&
+		    (!dirp || !strcmp(mlp->ml_dirp, dirp))) {
+			if (!(mlp->ml_flag & DP_NORESMNT) &&
+			    sport >= IPPORT_RESERVED) {
+				if (getnameinfo(saddr, saddr->sa_len, host,
+				    sizeof host, NULL, 0, ninumeric) != 0)
+					strlcpy(host, "?", sizeof(host));
+				syslog(LOG_NOTICE,
+				"Umount request for %s:%s from %s refused\n",
+				    mlp->ml_host, mlp->ml_dirp, host);
+				ret = -1;
+				goto cont;
+			}
+			fnd = 1;
+			mlp2 = mlp;
+			*mlpp = mlp = mlp->ml_next;
+			free(mlp2);
+		} else {
+cont:
+			mlpp = &mlp->ml_next;
+			mlp = mlp->ml_next;
+		}
+	}
+	if (fnd) {
+		if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "w")) == NULL) {
+			syslog(LOG_ERR, "Can't update %s: %m",
+			    _PATH_RMOUNTLIST);
+			return ret;
+		}
+		mlp = mlhead;
+		while (mlp) {
+			(void)fprintf(mlfile, "%s %s\n", mlp->ml_host,
+		            mlp->ml_dirp);
+			mlp = mlp->ml_next;
+		}
+		(void)fclose(mlfile);
+	}
+	return ret;
+}
+
+static void
+add_mlist(hostp, dirp, flags)
+	char *hostp, *dirp;
+	int flags;
+{
+	struct mountlist *mlp, **mlpp;
+	FILE *mlfile;
+
+	mlpp = &mlhead;
+	mlp = mlhead;
+	while (mlp) {
+		if (!strcmp(mlp->ml_host, hostp) && !strcmp(mlp->ml_dirp, dirp))
+			return;
+		mlpp = &mlp->ml_next;
+		mlp = mlp->ml_next;
+	}
+	mlp = emalloc(sizeof(*mlp));
+	strncpy(mlp->ml_host, hostp, RPCMNT_NAMELEN);
+	mlp->ml_host[RPCMNT_NAMELEN] = '\0';
+	strncpy(mlp->ml_dirp, dirp, RPCMNT_PATHLEN);
+	mlp->ml_dirp[RPCMNT_PATHLEN] = '\0';
+	mlp->ml_flag = flags;
+	mlp->ml_next = NULL;
+	*mlpp = mlp;
+	if ((mlfile = rumpfopen(_PATH_RMOUNTLIST, "a")) == NULL) {
+		syslog(LOG_ERR, "Can't update %s: %m", _PATH_RMOUNTLIST);
+		return;
+	}
+	(void)fprintf(mlfile, "%s %s\n", mlp->ml_host, mlp->ml_dirp);
+	(void)fclose(mlfile);
+}
+
+/*
+ * This function is called via. SIGTERM when the system is going down.
+ * It sends a broadcast RPCMNT_UMNTALL.
+ */
+/* ARGSUSED */
+static void
+send_umntall(n)
+	int n;
+{
+#if 0
+	(void)clnt_broadcast(RPCPROG_MNT, RPCMNT_VER1, RPCMNT_UMNTALL,
+	    xdr_void, NULL, xdr_void, NULL, (resultproc_t)umntall_each);
+#endif
+	exit(0);
+}
+
+#if 0
+static int
+umntall_each(resultsp, raddr)
+	caddr_t resultsp;
+	struct sockaddr_in *raddr;
+{
+	return (1);
+}
+#endif
+
+/*
+ * Free up a group list.
+ */
+static void
+free_grp(grp)
+	struct grouplist *grp;
+{
+
+	if (grp->gr_type == GT_HOST) {
+		if (grp->gr_ptr.gt_addrinfo != NULL)
+			freeaddrinfo(grp->gr_ptr.gt_addrinfo);
+	} else if (grp->gr_type == GT_NET) {
+		if (grp->gr_ptr.gt_net.nt_name)
+			free(grp->gr_ptr.gt_net.nt_name);
+	}
+	free(grp);
+}
+
+#if 0
+static void
+SYSLOG(int pri, const char *fmt,...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+
+	if (debug)
+		vfprintf(stderr, fmt, ap);
+	else
+		vsyslog(pri, fmt, ap);
+
+	va_end(ap);
+}
+#endif
+
+/*
+ * Check options for consistency.
+ */
+static int
+check_options(line, lineno, dp)
+	const char *line;
+	size_t lineno;
+	struct dirlist *dp;
+{
+
+	if (dp == NULL) {
+		syslog(LOG_ERR,
+		    "\"%s\", line %ld: missing directory list",
+		    line, (unsigned long)lineno);
+		return (1);
+	}
+	if ((opt_flags & (OP_MAPROOT|OP_MAPALL)) == (OP_MAPROOT|OP_MAPALL) ||
+	    (opt_flags & (OP_MAPROOT|OP_KERB)) == (OP_MAPROOT|OP_KERB) ||
+	    (opt_flags & (OP_MAPALL|OP_KERB)) == (OP_MAPALL|OP_KERB)) {
+		syslog(LOG_ERR,
+		    "\"%s\", line %ld: -mapall, -maproot and -kerb mutually exclusive",
+		    line, (unsigned long)lineno);
+		return (1);
+	}
+	if ((opt_flags & OP_MASK) && (opt_flags & OP_NET) == 0) {
+		syslog(LOG_ERR, "\"%s\", line %ld: -mask requires -net",
+		    line, (unsigned long)lineno);
+		return (1);
+	}
+	if ((opt_flags & OP_MASK) && (opt_flags & OP_MASKLEN) != 0) {
+		syslog(LOG_ERR, "\"%s\", line %ld: /pref and -mask mutually"
+		    " exclusive",
+		    line, (unsigned long)lineno);
+		return (1);
+	}
+	if ((opt_flags & OP_ALLDIRS) && dp->dp_left) {
+		syslog(LOG_ERR,
+		    "\"%s\", line %ld: -alldirs has multiple directories",
+		    line, (unsigned long)lineno);
+		return (1);
+	}
+	return (0);
+}
+
+/*
+ * Check an absolute directory path for any symbolic links. Return true
+ * if no symbolic links are found.
+ */
+static int
+check_dirpath(line, lineno, dirp)
+	const char *line;
+	size_t lineno;
+	char *dirp;
+{
+	char *cp;
+	struct stat sb;
+	char *file = "";
+
+	for (cp = dirp + 1; *cp; cp++) {
+		if (*cp == '/') {
+			*cp = '\0';
+			if (rump_sys_lstat(dirp, &sb) == -1)
+				goto bad;
+			if (!S_ISDIR(sb.st_mode))
+				goto bad1;
+			*cp = '/';
+		}
+	}
+
+	cp = NULL;
+	if (rump_sys_lstat(dirp, &sb) == -1)
+		goto bad;
+
+	if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) {
+		file = " file or a";
+		goto bad1;
+	}
+
+	return 1;
+
+bad:
+	syslog(LOG_ERR,
+	    "\"%s\", line %ld: lstat for `%s' failed: %m",
+	    line, (unsigned long)lineno, dirp);
+	if (cp)
+		*cp = '/';
+	return 0;
+
+bad1:
+	syslog(LOG_ERR,
+	    "\"%s\", line %ld: `%s' is not a%s directory",
+	    line, (unsigned long)lineno, dirp, file);
+	abort();
+	if (cp)
+		*cp = '/';
+	return 0;
+}
+
+static void
+bind_resv_port(int sock, sa_family_t family, in_port_t port)
+{
+	struct sockaddr *sa;
+	struct sockaddr_in sasin;
+	struct sockaddr_in6 sasin6;
+
+	switch (family) {
+	case AF_INET:
+		(void)memset(&sasin, 0, sizeof(sasin));
+		sasin.sin_len = sizeof(sasin);
+		sasin.sin_family = family;
+		sasin.sin_port = htons(port);
+		sa = (struct sockaddr *)(void *)&sasin;
+		break;
+	case AF_INET6:
+		(void)memset(&sasin6, 0, sizeof(sasin6));
+		sasin6.sin6_len = sizeof(sasin6);
+		sasin6.sin6_family = family;
+		sasin6.sin6_port = htons(port);
+		sa = (struct sockaddr *)(void *)&sasin6;
+		break;
+	default:
+		syslog(LOG_ERR, "Unsupported address family %d", family);
+		return;
+	}
+	if (bindresvport_sa(sock, sa) == -1)
+		syslog(LOG_ERR, "Cannot bind to reserved port %d (%m)", port);
+}
+
+/* ARGSUSED */
+static void
+no_nfs(int sig)
+{
+	syslog(LOG_ERR, "kernel NFS support not present; exiting");
+	exit(1);
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/nfsd.c b/contrib/netbsd-tests/fs/nfs/nfsservice/nfsd.c
new file mode 100644
index 000000000000..b062501a97d5
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/nfsd.c
@@ -0,0 +1,571 @@
+/*	$NetBSD: nfsd.c,v 1.4 2013/10/19 17:45:00 christos Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Rick Macklem at The University of Guelph.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\
+ The Regents of the University of California.  All rights reserved.");
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
+#else
+__RCSID("$NetBSD: nfsd.c,v 1.4 2013/10/19 17:45:00 christos Exp $");
+#endif
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/uio.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <poll.h>
+
+#include <rpc/rpc.h>
+#include <rpc/pmap_clnt.h>
+#include <rpc/pmap_prot.h>
+
+#include <nfs/rpcv2.h>
+#include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <netdb.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+/* Global defs */
+#ifdef DEBUG
+#define	syslog(e, s, args...)						\
+do {									\
+    fprintf(stderr,(s), ## args); 					\
+    fprintf(stderr, "\n");						\
+} while (/*CONSTCOND*/0)
+int	debug = 1;
+#else
+int	debug = 0;
+#endif
+
+int	main __P((int, char **));
+void	nonfs __P((int));
+void	usage __P((void));
+
+static void *
+child(void *arg)
+{
+	struct	nfsd_srvargs nsd;
+	int nfssvc_flag;
+
+	nfssvc_flag = NFSSVC_NFSD;
+	memset(&nsd, 0, sizeof(nsd));
+	while (rump_sys_nfssvc(nfssvc_flag, &nsd) < 0) {
+		if (errno != ENEEDAUTH) {
+			syslog(LOG_ERR, "nfssvc: %m %d", errno);
+			exit(1);
+		}
+		nfssvc_flag = NFSSVC_NFSD | NFSSVC_AUTHINFAIL;
+	}
+
+	return NULL;
+}
+
+/*
+ * Nfs server daemon mostly just a user context for nfssvc()
+ *
+ * 1 - do file descriptor and signal cleanup
+ * 2 - create the nfsd thread(s)
+ * 3 - create server socket(s)
+ * 4 - register socket with portmap
+ *
+ * For connectionless protocols, just pass the socket into the kernel via
+ * nfssvc().
+ * For connection based sockets, loop doing accepts. When you get a new
+ * socket from accept, pass the msgsock into the kernel via nfssvc().
+ * The arguments are:
+ *	-c - support iso cltp clients
+ *	-r - reregister with portmapper
+ *	-t - support tcp nfs clients
+ *	-u - support udp nfs clients
+ * followed by "n" which is the number of nfsd threads to create
+ */
+int nfsd_main(int, char**);
+int
+nfsd_main(argc, argv)
+	int argc;
+	char *argv[];
+{
+	struct nfsd_args nfsdargs;
+	struct addrinfo *ai_udp, *ai_tcp, *ai_udp6, *ai_tcp6, hints;
+	struct netconfig *nconf_udp, *nconf_tcp, *nconf_udp6, *nconf_tcp6;
+	struct netbuf nb_udp, nb_tcp, nb_udp6, nb_tcp6;
+	struct sockaddr_in inetpeer;
+	struct pollfd set[4];
+	socklen_t len;
+	int ch, connect_type_cnt, i, msgsock;
+	int nfsdcnt, on = 1, reregister, sock, tcpflag, tcpsock;
+	int tcp6sock, ip6flag;
+	int tp4cnt, tp4flag, tpipcnt, udpflag, ecode, s;
+	int error = 0;
+
+#define	DEFNFSDCNT	 4
+	nfsdcnt = DEFNFSDCNT;
+	reregister = tcpflag = tp4cnt = tp4flag = tpipcnt = 0;
+	udpflag = ip6flag = 0;
+	nconf_udp = nconf_tcp = nconf_udp6 = nconf_tcp6 = NULL;
+	tcpsock = tcp6sock = -1;
+#define	GETOPT	"6n:rtu"
+#define	USAGE	"[-rtu] [-n num_servers]"
+	while ((ch = getopt(argc, argv, GETOPT)) != -1) {
+		switch (ch) {
+		case '6':
+			ip6flag = 1;
+			s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+			if (s < 0 && (errno == EPROTONOSUPPORT ||
+			    errno == EPFNOSUPPORT || errno == EAFNOSUPPORT))
+				ip6flag = 0;
+			else
+				close(s);
+			break;
+		case 'n':
+			nfsdcnt = atoi(optarg);
+			if (nfsdcnt < 1) {
+				warnx("nfsd count %d; reset to %d", nfsdcnt, DEFNFSDCNT);
+				nfsdcnt = DEFNFSDCNT;
+			}
+			break;
+		case 'r':
+			reregister = 1;
+			break;
+		case 't':
+			tcpflag = 1;
+			break;
+		case 'u':
+			udpflag = 1;
+			break;
+		default:
+		case '?':
+			usage();
+		};
+	}
+	argv += optind;
+	argc -= optind;
+
+	/*
+	 * XXX
+	 * Backward compatibility, trailing number is the count of daemons.
+	 */
+	if (argc > 1)
+		usage();
+	if (argc == 1) {
+		nfsdcnt = atoi(argv[0]);
+		if (nfsdcnt < 1) {
+			warnx("nfsd count %d; reset to %d", nfsdcnt, DEFNFSDCNT);
+			nfsdcnt = DEFNFSDCNT;
+		}
+	}
+
+	/*
+	 * If none of TCP or UDP are specified, default to UDP only.
+	 */
+	if (tcpflag == 0 && udpflag == 0)
+		udpflag = 1;
+
+	if (debug == 0) {
+		fprintf(stderr, "non-debug not supported here\n");
+		exit(1);
+
+#ifdef not_the_debug_man
+		daemon(0, 0);
+		(void)signal(SIGHUP, SIG_IGN);
+		(void)signal(SIGINT, SIG_IGN);
+		(void)signal(SIGQUIT, SIG_IGN);
+		(void)signal(SIGSYS, nonfs);
+#endif
+	}
+
+	if (udpflag) {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_flags = AI_PASSIVE;
+		hints.ai_family = PF_INET;
+		hints.ai_socktype = SOCK_DGRAM;
+		hints.ai_protocol = IPPROTO_UDP;
+
+		ecode = getaddrinfo(NULL, "nfs", &hints, &ai_udp);
+		if (ecode != 0) {
+			syslog(LOG_ERR, "getaddrinfo udp: %s",
+			    gai_strerror(ecode));
+			exit(1);
+		}
+
+		nconf_udp = getnetconfigent("udp");
+
+		if (nconf_udp == NULL)
+			err(1, "getnetconfigent udp failed");
+
+		nb_udp.buf = ai_udp->ai_addr;
+		nb_udp.len = nb_udp.maxlen = ai_udp->ai_addrlen;
+		if (reregister)
+			if (!rpcb_set(RPCPROG_NFS, 2, nconf_udp, &nb_udp))
+				err(1, "rpcb_set udp failed");
+	}
+
+	if (tcpflag) {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_flags = AI_PASSIVE;
+		hints.ai_family = PF_INET;
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_protocol = IPPROTO_TCP;
+
+		ecode = getaddrinfo(NULL, "nfs", &hints, &ai_tcp);
+		if (ecode != 0) {
+			syslog(LOG_ERR, "getaddrinfo tcp: %s",
+			    gai_strerror(ecode));
+			exit(1);
+		}
+
+		nconf_tcp = getnetconfigent("tcp");
+
+		if (nconf_tcp == NULL)
+			err(1, "getnetconfigent tcp failed");
+
+		nb_tcp.buf = ai_tcp->ai_addr;
+		nb_tcp.len = nb_tcp.maxlen = ai_tcp->ai_addrlen;
+		if (reregister)
+			if (!rpcb_set(RPCPROG_NFS, 2, nconf_tcp, &nb_tcp))
+				err(1, "rpcb_set tcp failed");
+	}
+
+	if (udpflag && ip6flag) {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_flags = AI_PASSIVE;
+		hints.ai_family = PF_INET6;
+		hints.ai_socktype = SOCK_DGRAM;
+		hints.ai_protocol = IPPROTO_UDP;
+
+		ecode = getaddrinfo(NULL, "nfs", &hints, &ai_udp6);
+		if (ecode != 0) {
+			syslog(LOG_ERR, "getaddrinfo udp: %s",
+			    gai_strerror(ecode));
+			exit(1);
+		}
+
+		nconf_udp6 = getnetconfigent("udp6");
+
+		if (nconf_udp6 == NULL)
+			err(1, "getnetconfigent udp6 failed");
+
+		nb_udp6.buf = ai_udp6->ai_addr;
+		nb_udp6.len = nb_udp6.maxlen = ai_udp6->ai_addrlen;
+		if (reregister)
+			if (!rpcb_set(RPCPROG_NFS, 2, nconf_udp6, &nb_udp6))
+				err(1, "rpcb_set udp6 failed");
+	}
+
+	if (tcpflag && ip6flag) {
+		memset(&hints, 0, sizeof hints);
+		hints.ai_flags = AI_PASSIVE;
+		hints.ai_family = PF_INET6;
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_protocol = IPPROTO_TCP;
+
+		ecode = getaddrinfo(NULL, "nfs", &hints, &ai_tcp6);
+		if (ecode != 0) {
+			syslog(LOG_ERR, "getaddrinfo tcp: %s",
+			    gai_strerror(ecode));
+			exit(1);
+		}
+
+		nconf_tcp6 = getnetconfigent("tcp6");
+
+		if (nconf_tcp6 == NULL)
+			err(1, "getnetconfigent tcp6 failed");
+
+		nb_tcp6.buf = ai_tcp6->ai_addr;
+		nb_tcp6.len = nb_tcp6.maxlen = ai_tcp6->ai_addrlen;
+		if (reregister)
+			if (!rpcb_set(RPCPROG_NFS, 2, nconf_tcp6, &nb_tcp6))
+				err(1, "rpcb_set tcp6 failed");
+	}
+
+	openlog("nfsd", LOG_PID, LOG_DAEMON);
+
+	for (i = 0; i < nfsdcnt; i++) {
+		pthread_t t;
+		pthread_create(&t, NULL, child, NULL);
+	}
+
+	/* If we are serving udp, set up the socket. */
+	if (udpflag) {
+		if ((sock = rump_sys_socket(ai_udp->ai_family, ai_udp->ai_socktype,
+		    ai_udp->ai_protocol)) < 0) {
+			syslog(LOG_ERR, "can't create udp socket");
+			exit(1);
+		}
+		if (bind(sock, ai_udp->ai_addr, ai_udp->ai_addrlen) < 0) {
+			syslog(LOG_ERR, "can't bind udp addr");
+			exit(1);
+		}
+		if (!rpcb_set(RPCPROG_NFS, 2, nconf_udp, &nb_udp) ||
+		    !rpcb_set(RPCPROG_NFS, 3, nconf_udp, &nb_udp)) {
+			syslog(LOG_ERR, "can't register with udp portmap");
+			exit(1);
+		}
+		nfsdargs.sock = sock;
+		nfsdargs.name = NULL;
+		nfsdargs.namelen = 0;
+		if (rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs) < 0) {
+			syslog(LOG_ERR, "can't add UDP socket");
+			exit(1);
+		}
+		(void)rump_sys_close(sock);
+	}
+
+	if (udpflag &&ip6flag) {
+		if ((sock = rump_sys_socket(ai_udp6->ai_family, ai_udp6->ai_socktype,
+		    ai_udp6->ai_protocol)) < 0) {
+			syslog(LOG_ERR, "can't create udp socket");
+			exit(1);
+		}
+		if (rump_sys_setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+		    &on, sizeof on) < 0) {
+			syslog(LOG_ERR, "can't set v6-only binding for udp6 "
+					"socket: %m");
+			exit(1);
+		}
+		if (rump_sys_bind(sock, ai_udp6->ai_addr, ai_udp6->ai_addrlen) < 0) {
+			syslog(LOG_ERR, "can't bind udp addr");
+			exit(1);
+		}
+		if (!rpcb_set(RPCPROG_NFS, 2, nconf_udp6, &nb_udp6) ||
+		    !rpcb_set(RPCPROG_NFS, 3, nconf_udp6, &nb_udp6)) {
+			syslog(LOG_ERR, "can't register with udp portmap");
+			exit(1);
+		}
+		nfsdargs.sock = sock;
+		nfsdargs.name = NULL;
+		nfsdargs.namelen = 0;
+		if (rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs) < 0) {
+			syslog(LOG_ERR, "can't add UDP6 socket");
+			exit(1);
+		}
+		(void)rump_sys_close(sock);
+	}
+
+	/* Now set up the master server socket waiting for tcp connections. */
+	on = 1;
+	connect_type_cnt = 0;
+	if (tcpflag) {
+		if ((tcpsock = rump_sys_socket(ai_tcp->ai_family, ai_tcp->ai_socktype,
+		    ai_tcp->ai_protocol)) < 0) {
+			syslog(LOG_ERR, "can't create tcp socket");
+			exit(1);
+		}
+		if (setsockopt(tcpsock,
+		    SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+			syslog(LOG_ERR, "setsockopt SO_REUSEADDR: %m");
+		if (bind(tcpsock, ai_tcp->ai_addr, ai_tcp->ai_addrlen) < 0) {
+			syslog(LOG_ERR, "can't bind tcp addr");
+			exit(1);
+		}
+		if (rump_sys_listen(tcpsock, 5) < 0) {
+			syslog(LOG_ERR, "listen failed");
+			exit(1);
+		}
+		if (!rpcb_set(RPCPROG_NFS, 2, nconf_tcp, &nb_tcp) ||
+		    !rpcb_set(RPCPROG_NFS, 3, nconf_tcp, &nb_tcp)) {
+			syslog(LOG_ERR, "can't register tcp with rpcbind");
+			exit(1);
+		}
+		set[0].fd = tcpsock;
+		set[0].events = POLLIN;
+		connect_type_cnt++;
+	} else
+		set[0].fd = -1;
+
+	if (tcpflag && ip6flag) {
+		if ((tcp6sock = socket(ai_tcp6->ai_family, ai_tcp6->ai_socktype,
+		    ai_tcp6->ai_protocol)) < 0) {
+			syslog(LOG_ERR, "can't create tcp socket");
+			exit(1);
+		}
+		if (setsockopt(tcp6sock,
+		    SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0)
+			syslog(LOG_ERR, "setsockopt SO_REUSEADDR: %m");
+		if (setsockopt(tcp6sock, IPPROTO_IPV6, IPV6_V6ONLY,
+		    &on, sizeof on) < 0) {
+			syslog(LOG_ERR, "can't set v6-only binding for tcp6 "
+					"socket: %m");
+			exit(1);
+		}
+		if (bind(tcp6sock, ai_tcp6->ai_addr, ai_tcp6->ai_addrlen) < 0) {
+			syslog(LOG_ERR, "can't bind tcp6 addr");
+			exit(1);
+		}
+		if (listen(tcp6sock, 5) < 0) {
+			syslog(LOG_ERR, "listen failed");
+			exit(1);
+		}
+		if (!rpcb_set(RPCPROG_NFS, 2, nconf_tcp6, &nb_tcp6) ||
+		    !rpcb_set(RPCPROG_NFS, 3, nconf_tcp6, &nb_tcp6)) {
+			syslog(LOG_ERR, "can't register tcp6 with rpcbind");
+			exit(1);
+		}
+		set[1].fd = tcp6sock;
+		set[1].events = POLLIN;
+		connect_type_cnt++;
+	} else
+		set[1].fd = -1;
+
+	set[2].fd = -1;
+	set[3].fd = -1;
+
+	if (connect_type_cnt == 0) {
+		pause();
+		exit(0);
+	}
+
+	/*
+	 * Loop forever accepting connections and passing the sockets
+	 * into the kernel for the mounts.
+	 */
+	for (;;) {
+		if (rump_sys_poll(set, 4, INFTIM) < 1) {
+			syslog(LOG_ERR, "poll failed: %m");
+			exit(1);
+		}
+
+			len = sizeof(inetpeer);
+			if ((msgsock = accept(tcpsock,
+			    (struct sockaddr *)&inetpeer, &len)) < 0) {
+				syslog(LOG_ERR, "accept failed: %d", error);
+				exit(1);
+			}
+			memset(inetpeer.sin_zero, 0, sizeof(inetpeer.sin_zero));
+			if (setsockopt(msgsock, SOL_SOCKET,
+			    SO_KEEPALIVE, (char *)&on, sizeof(on)) < 0)
+				syslog(LOG_ERR,
+				    "setsockopt SO_KEEPALIVE: %m");
+			nfsdargs.sock = msgsock;
+			nfsdargs.name = (caddr_t)&inetpeer;
+			nfsdargs.namelen = sizeof(inetpeer);
+			rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs);
+			(void)rump_sys_close(msgsock);
+
+#ifdef notyet
+		if (set[1].revents & POLLIN) {
+			len = sizeof(inet6peer);
+			if ((msgsock = rump_sys_accept(tcp6sock,
+			    (struct sockaddr *)&inet6peer, &len, &error)) < 0) {
+				syslog(LOG_ERR, "accept failed: %m");
+				exit(1);
+			}
+			if (rump_sys_setsockopt(msgsock, SOL_SOCKET,
+			    SO_KEEPALIVE, (char *)&on, sizeof(on), &error) < 0)
+				syslog(LOG_ERR,
+				    "setsockopt SO_KEEPALIVE: %m");
+			nfsdargs.sock = msgsock;
+			nfsdargs.name = (caddr_t)&inet6peer;
+			nfsdargs.namelen = sizeof(inet6peer);
+			rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs, &error);
+			(void)rump_sys_close(msgsock, &error);
+		}
+
+		if (set[2].revents & POLLIN) {
+			len = sizeof(isopeer);
+			if ((msgsock = rump_sys_accept(tp4sock,
+			    (struct sockaddr *)&isopeer, &len, &error)) < 0) {
+				syslog(LOG_ERR, "accept failed: %m");
+				exit(1);
+			}
+			if (rump_sys_setsockopt(msgsock, SOL_SOCKET,
+			    SO_KEEPALIVE, (char *)&on, sizeof(on), &error) < 0)
+				syslog(LOG_ERR,
+				    "setsockopt SO_KEEPALIVE: %m");
+			nfsdargs.sock = msgsock;
+			nfsdargs.name = (caddr_t)&isopeer;
+			nfsdargs.namelen = len;
+			rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs, &error);
+			(void)rump_sys_close(msgsock, &error);
+		}
+
+		if (set[3].revents & POLLIN) {
+			len = sizeof(inetpeer);
+			if ((msgsock = rump_sys_accept(tpipsock,
+			    (struct sockaddr *)&inetpeer, &len)) < 0) {
+				syslog(LOG_ERR, "accept failed: %m");
+				exit(1);
+			}
+			if (setsockopt(msgsock, SOL_SOCKET,
+			    SO_KEEPALIVE, (char *)&on, sizeof(on)) < 0)
+				syslog(LOG_ERR, "setsockopt SO_KEEPALIVE: %m");
+			nfsdargs.sock = msgsock;
+			nfsdargs.name = (caddr_t)&inetpeer;
+			nfsdargs.namelen = len;
+			rump_sys_nfssvc(NFSSVC_ADDSOCK, &nfsdargs);
+			(void)rump_sys_close(msgsock);
+		}
+#endif /* notyet */
+	}
+}
+
+void
+usage()
+{
+	(void)fprintf(stderr, "usage: nfsd %s\n", USAGE);
+	exit(1);
+}
+
+void
+nonfs(signo)
+	int signo;
+{
+	syslog(LOG_ERR, "missing system call: NFS not available.");
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/pathnames.h b/contrib/netbsd-tests/fs/nfs/nfsservice/pathnames.h
new file mode 100644
index 000000000000..3985af93850b
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/pathnames.h
@@ -0,0 +1,37 @@
+/*	$NetBSD: pathnames.h,v 1.1 2010/07/26 15:53:00 pooka Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
+ */
+
+#include <paths.h>
+
+#define	_PATH_EXPORTS		"/etc/exports"
+#define	_PATH_RMOUNTLIST	"/var/db/mountdtab"
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/check_bound.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/check_bound.c
new file mode 100644
index 000000000000..2ea7c31d16ca
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/check_bound.c
@@ -0,0 +1,231 @@
+/*	$NetBSD: check_bound.c,v 1.1 2010/07/26 15:53:00 pooka Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)check_bound.c	1.15	93/07/05 SMI" */
+
+#if 0
+#ifndef lint
+static	char sccsid[] = "@(#)check_bound.c 1.11 89/04/21 Copyr 1989 Sun Micro";
+#endif
+#endif
+
+/*
+ * check_bound.c
+ * Checks to see whether the program is still bound to the
+ * claimed address and returns the univeral merged address
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <rpc/rpc.h>
+#include <stdio.h>
+#include <netconfig.h>
+#include <syslog.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "rpcbind.h"
+
+struct fdlist {
+	int fd;
+	struct netconfig *nconf;
+	struct fdlist *next;
+	int check_binding;
+};
+
+static struct fdlist *fdhead;	/* Link list of the check fd's */
+static struct fdlist *fdtail;
+static const char emptystring[] = "";
+
+static bool_t check_bound(struct fdlist *, const char *uaddr);
+
+/*
+ * Returns 1 if the given address is bound for the given addr & transport
+ * For all error cases, we assume that the address is bound
+ * Returns 0 for success.
+ */
+static bool_t
+check_bound(struct fdlist *fdl, const char *uaddr)
+{
+	int fd;
+	struct netbuf *na;
+	int ans;
+
+	if (fdl->check_binding == FALSE)
+		return (TRUE);
+
+	na = uaddr2taddr(fdl->nconf, uaddr);
+	if (!na)
+		return (TRUE); /* punt, should never happen */
+
+	fd = __rpc_nconf2fd(fdl->nconf);
+	if (fd < 0) {
+		free(na);
+		return (TRUE);
+	}
+
+	ans = bind(fd, (struct sockaddr *)na->buf, na->len);
+
+	rump_sys_close(fd);
+	free(na);
+
+	return (ans == 0 ? FALSE : TRUE);
+}
+
+int
+add_bndlist(struct netconfig *nconf, struct netbuf *baddr)
+{
+	struct fdlist *fdl;
+	struct netconfig *newnconf;
+
+	newnconf = getnetconfigent(nconf->nc_netid);
+	if (newnconf == NULL)
+		return (-1);
+	fdl = (struct fdlist *)malloc((u_int)sizeof (struct fdlist));
+	if (fdl == NULL) {
+		freenetconfigent(newnconf);
+		syslog(LOG_ERR, "no memory!");
+		return (-1);
+	}
+	fdl->nconf = newnconf;
+	fdl->next = NULL;
+	if (fdhead == NULL) {
+		fdhead = fdl;
+		fdtail = fdl;
+	} else {
+		fdtail->next = fdl;
+		fdtail = fdl;
+	}
+	/* XXX no bound checking for now */
+	fdl->check_binding = FALSE;
+
+	return 0;
+}
+
+bool_t
+is_bound(const char *netid, const char *uaddr)
+{
+	struct fdlist *fdl;
+
+	for (fdl = fdhead; fdl; fdl = fdl->next)
+		if (strcmp(fdl->nconf->nc_netid, netid) == 0)
+			break;
+	if (fdl == NULL)
+		return (TRUE);
+	return (check_bound(fdl, uaddr));
+}
+
+/*
+ * Returns NULL if there was some system error.
+ * Returns "" if the address was not bound, i.e the server crashed.
+ * Returns the merged address otherwise.
+ */
+char *
+mergeaddr(SVCXPRT *xprt, char *netid, char *uaddr, char *saddr)
+{
+	struct fdlist *fdl;
+	char *c_uaddr, *s_uaddr, *m_uaddr, *allocated_uaddr = NULL;
+
+	for (fdl = fdhead; fdl; fdl = fdl->next)
+		if (strcmp(fdl->nconf->nc_netid, netid) == 0)
+			break;
+	if (fdl == NULL)
+		return (NULL);
+	if (check_bound(fdl, uaddr) == FALSE)
+		/* that server died */
+		return strdup(emptystring);
+	/*
+	 * If saddr is not NULL, the remote client may have included the
+	 * address by which it contacted us.  Use that for the "client" uaddr,
+	 * otherwise use the info from the SVCXPRT.
+	 */
+	if (saddr != NULL) {
+		c_uaddr = saddr;
+	} else {
+		c_uaddr = taddr2uaddr(fdl->nconf, svc_getrpccaller(xprt));
+		if (c_uaddr == NULL) {
+			syslog(LOG_ERR, "taddr2uaddr failed for %s",
+				fdl->nconf->nc_netid);
+			return (NULL);
+		}
+		allocated_uaddr = c_uaddr;
+	}
+
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		if (saddr == NULL) {
+			fprintf(stderr, "mergeaddr: client uaddr = %s\n",
+			    c_uaddr);
+		} else {
+			fprintf(stderr, "mergeaddr: contact uaddr = %s\n",
+			    c_uaddr);
+		}
+	}
+#endif
+	s_uaddr = uaddr;
+	/*
+	 * This is all we should need for IP 4 and 6
+	 */
+	m_uaddr = addrmerge(svc_getrpccaller(xprt), s_uaddr, c_uaddr, netid);
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "mergeaddr: uaddr = %s, merged uaddr = %s\n",
+				uaddr, m_uaddr);
+#endif
+	if (allocated_uaddr != NULL)
+		free(allocated_uaddr);
+	return (m_uaddr);
+}
+
+/*
+ * Returns a netconf structure from its internal list.  This
+ * structure should not be freed.
+ */
+struct netconfig *
+rpcbind_get_conf(const char *netid)
+{
+	struct fdlist *fdl;
+
+	for (fdl = fdhead; fdl; fdl = fdl->next)
+		if (strcmp(fdl->nconf->nc_netid, netid) == 0)
+			break;
+	if (fdl == NULL)
+		return (NULL);
+	return (fdl->nconf);
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c
new file mode 100644
index 000000000000..3f9eb4731ce1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/pmap_svc.c
@@ -0,0 +1,366 @@
+/*	$NetBSD: pmap_svc.c,v 1.2 2013/10/19 17:45:00 christos Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)pmap_svc.c	1.14	93/07/05 SMI" */
+
+#if 0
+#ifndef lint
+static	char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
+#endif
+#endif
+
+/*
+ * pmap_svc.c
+ * The server procedure for the version 2 portmapper.
+ * All the portmapper related interface from the portmap side.
+ */
+
+#ifdef PORTMAP
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
+#include <rpc/rpcb_prot.h>
+#ifdef RPCBIND_DEBUG
+#include <stdlib.h>
+#endif
+#include "rpcbind.h"
+
+static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t, rpcprot_t);
+static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long);
+static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *);
+static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *);
+
+/*
+ * Called for all the version 2 inquiries.
+ */
+void
+pmap_service(struct svc_req *rqstp, SVCXPRT *xprt)
+{
+	rpcbs_procinfo(RPCBVERS_2_STAT, rqstp->rq_proc);
+	switch (rqstp->rq_proc) {
+	case PMAPPROC_NULL:
+		/*
+		 * Null proc call
+		 */
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "PMAPPROC_NULL\n");
+#endif
+		check_access(xprt, rqstp->rq_proc, NULL, PMAPVERS);
+		if ((!svc_sendreply(xprt, (xdrproc_t) xdr_void, NULL)) &&
+			debugging) {
+			if (doabort) {
+				rpcbind_abort();
+			}
+		}
+		break;
+
+	case PMAPPROC_SET:
+		/*
+		 * Set a program, version to port mapping
+		 */
+		pmapproc_change(rqstp, xprt, rqstp->rq_proc);
+		break;
+
+	case PMAPPROC_UNSET:
+		/*
+		 * Remove a program, version to port mapping.
+		 */
+		pmapproc_change(rqstp, xprt, rqstp->rq_proc);
+		break;
+
+	case PMAPPROC_GETPORT:
+		/*
+		 * Lookup the mapping for a program, version and return its
+		 * port number.
+		 */
+		pmapproc_getport(rqstp, xprt);
+		break;
+
+	case PMAPPROC_DUMP:
+		/*
+		 * Return the current set of mapped program, version
+		 */
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "PMAPPROC_DUMP\n");
+#endif
+		pmapproc_dump(rqstp, xprt);
+		break;
+
+	case PMAPPROC_CALLIT:
+		/*
+		 * Calls a procedure on the local machine. If the requested
+		 * procedure is not registered this procedure does not return
+		 * error information!!
+		 * This procedure is only supported on rpc/udp and calls via
+		 * rpc/udp. It passes null authentication parameters.
+		 */
+		rpcbproc_callit_com(rqstp, xprt, PMAPPROC_CALLIT, PMAPVERS);
+		break;
+
+	default:
+		svcerr_noproc(xprt);
+		break;
+	}
+}
+
+/*
+ * returns the item with the given program, version number. If that version
+ * number is not found, it returns the item with that program number, so that
+ * the port number is now returned to the caller. The caller when makes a
+ * call to this program, version number, the call will fail and it will
+ * return with PROGVERS_MISMATCH. The user can then determine the highest
+ * and the lowest version number for this program using clnt_geterr() and
+ * use those program version numbers.
+ */
+static struct pmaplist *
+find_service_pmap(rpcprog_t prog, rpcvers_t vers, rpcprot_t prot)
+{
+	register struct pmaplist *hit = NULL;
+	register struct pmaplist *pml;
+
+	for (pml = list_pml; pml != NULL; pml = pml->pml_next) {
+		if ((pml->pml_map.pm_prog != prog) ||
+			(pml->pml_map.pm_prot != prot))
+			continue;
+		hit = pml;
+		if (pml->pml_map.pm_vers == vers)
+			break;
+	}
+	return (hit);
+}
+
+static bool_t
+pmapproc_change(struct svc_req *rqstp, SVCXPRT *xprt, unsigned long op)
+{
+	struct pmap reg;
+	RPCB rpcbreg;
+	long ans;
+	struct sockcred *sc;
+	char uidbuf[32];
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "%s request for (%lu, %lu) : ",
+		    op == PMAPPROC_SET ? "PMAP_SET" : "PMAP_UNSET",
+		    reg.pm_prog, reg.pm_vers);
+#endif
+
+	if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
+		svcerr_decode(xprt);
+		return (FALSE);
+	}
+
+	if (!check_access(xprt, op, &reg, PMAPVERS)) {
+		svcerr_weakauth(xprt);
+		return FALSE;
+	}
+
+	(void)svc_getcaller(xprt);
+	sc = __svc_getcallercreds(xprt);
+
+	/*
+	 * Can't use getpwnam here. We might end up calling ourselves
+	 * and looping.
+	 */
+	if (sc == NULL)
+		rpcbreg.r_owner = __UNCONST(rpcbind_unknown);
+	else if (sc->sc_uid == 0)
+		rpcbreg.r_owner = __UNCONST(rpcbind_superuser);
+	else {
+		/* r_owner will be strdup-ed later */
+		snprintf(uidbuf, sizeof uidbuf, "%d", sc->sc_uid);
+		rpcbreg.r_owner = uidbuf;
+	}
+
+	rpcbreg.r_prog = reg.pm_prog;
+	rpcbreg.r_vers = reg.pm_vers;
+
+	if (op == PMAPPROC_SET) {
+		char buf[32];
+
+		snprintf(buf, sizeof(buf), "0.0.0.0.%d.%d",
+		    (int)((reg.pm_port >> 8) & 0xff),
+		    (int)(reg.pm_port & 0xff));
+		rpcbreg.r_addr = buf;
+		if (reg.pm_prot == IPPROTO_UDP) {
+			rpcbreg.r_netid = __UNCONST(udptrans);
+		} else if (reg.pm_prot == IPPROTO_TCP) {
+			rpcbreg.r_netid = __UNCONST(tcptrans);
+		} else {
+			ans = FALSE;
+			goto done_change;
+		}
+		ans = map_set(&rpcbreg, rpcbreg.r_owner);
+	} else if (op == PMAPPROC_UNSET) {
+		bool_t ans1, ans2;
+
+		rpcbreg.r_addr = NULL;
+		rpcbreg.r_netid = __UNCONST(tcptrans);
+		ans1 = map_unset(&rpcbreg, rpcbreg.r_owner);
+		rpcbreg.r_netid = __UNCONST(udptrans);
+		ans2 = map_unset(&rpcbreg, rpcbreg.r_owner);
+		ans = ans1 || ans2;
+	} else {
+		ans = FALSE;
+	}
+done_change:
+	if ((!svc_sendreply(xprt, (xdrproc_t) xdr_long, (caddr_t) &ans)) &&
+	    debugging) {
+		fprintf(stderr, "portmap: svc_sendreply\n");
+		if (doabort) {
+			rpcbind_abort();
+		}
+	}
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "%s\n", ans == TRUE ? "succeeded" : "failed");
+#endif
+	if (op == PMAPPROC_SET)
+		rpcbs_set(RPCBVERS_2_STAT, ans);
+	else
+		rpcbs_unset(RPCBVERS_2_STAT, ans);
+	return (TRUE);
+}
+
+/* ARGSUSED */
+static bool_t
+pmapproc_getport(struct svc_req *rqstp, SVCXPRT *xprt)
+{
+	struct pmap reg;
+	long lport;
+	int port = 0;
+	struct pmaplist *fnd;
+#ifdef RPCBIND_DEBUG
+	char *uaddr;
+#endif
+
+	if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)&reg)) {
+		svcerr_decode(xprt);
+		return (FALSE);
+	}
+
+	if (!check_access(xprt, PMAPPROC_GETPORT, &reg, PMAPVERS)) {
+		svcerr_weakauth(xprt);
+		return FALSE;
+	}
+
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		uaddr =  taddr2uaddr(rpcbind_get_conf(xprt->xp_netid),
+			    svc_getrpccaller(xprt));
+		fprintf(stderr, "PMAP_GETPORT req for (%lu, %lu, %s) from %s :",
+			reg.pm_prog, reg.pm_vers,
+			reg.pm_prot == IPPROTO_UDP ? "udp" : "tcp", uaddr);
+		free(uaddr);
+	}
+#endif
+	fnd = find_service_pmap(reg.pm_prog, reg.pm_vers, reg.pm_prot);
+	if (fnd) {
+		char serveuaddr[32];
+		int h1, h2, h3, h4, p1, p2;
+		const char *netid, *ua;
+
+		if (reg.pm_prot == IPPROTO_UDP) {
+			ua = udp_uaddr;
+			netid = udptrans;
+		} else {
+			ua = tcp_uaddr; /* To get the len */
+			netid = tcptrans;
+		}
+		if (ua == NULL) {
+			goto sendreply;
+		}
+		if (sscanf(ua, "%d.%d.%d.%d.%d.%d", &h1, &h2, &h3,
+				&h4, &p1, &p2) == 6) {
+			p1 = (fnd->pml_map.pm_port >> 8) & 0xff;
+			p2 = (fnd->pml_map.pm_port) & 0xff;
+			snprintf(serveuaddr, sizeof(serveuaddr),
+			    "%d.%d.%d.%d.%d.%d", h1, h2, h3, h4, p1, p2);
+			if (is_bound(netid, serveuaddr)) {
+				port = fnd->pml_map.pm_port;
+			} else { /* this service is dead; delete it */
+				delete_prog(reg.pm_prog);
+			}
+		}
+	}
+sendreply:
+	lport = port;
+	if ((!svc_sendreply(xprt, (xdrproc_t) xdr_long, (caddr_t)&lport)) &&
+			debugging) {
+		(void) fprintf(stderr, "portmap: svc_sendreply\n");
+		if (doabort) {
+			rpcbind_abort();
+		}
+	}
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "port = %d\n", port);
+#endif
+	rpcbs_getaddr(RPCBVERS_2_STAT, reg.pm_prog, reg.pm_vers,
+		reg.pm_prot == IPPROTO_UDP ? udptrans : tcptrans,
+		port ? udptrans : "");
+
+	return (TRUE);
+}
+
+/* ARGSUSED */
+static bool_t
+pmapproc_dump(struct svc_req *rqstp, SVCXPRT *xprt)
+{
+	if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) {
+		svcerr_decode(xprt);
+		return (FALSE);
+	}
+
+	if (!check_access(xprt, PMAPPROC_DUMP, NULL, PMAPVERS)) {
+		svcerr_weakauth(xprt);
+		return FALSE;
+	}
+
+	if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr,
+			(caddr_t)&list_pml)) && debugging) {
+		if (debugging)
+			(void) fprintf(stderr, "portmap: svc_sendreply\n");
+		if (doabort) {
+			rpcbind_abort();
+		}
+	}
+	return (TRUE);
+}
+
+#endif /* PORTMAP */
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_stat.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_stat.c
new file mode 100644
index 000000000000..5bc5a0fde55a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_stat.c
@@ -0,0 +1,206 @@
+/*	$NetBSD: rpcb_stat.c,v 1.1 2010/07/26 15:53:00 pooka Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/* #pragma ident   "@(#)rpcb_stat.c 1.7     94/04/25 SMI" */
+
+/*
+ * rpcb_stat.c
+ * Allows for gathering of statistics
+ *
+ * Copyright (c) 1990 by Sun Microsystems, Inc.
+ */
+
+#include <stdio.h>
+#include <netconfig.h>
+#include <rpc/rpc.h>
+#include <rpc/rpcb_prot.h>
+#include <sys/stat.h>
+#ifdef PORTMAP
+#include <rpc/pmap_prot.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "rpcbind.h"
+
+static rpcb_stat_byvers inf;
+
+void
+rpcbs_init(void)
+{
+
+}
+
+void
+rpcbs_procinfo(rpcvers_t rtype, rpcproc_t proc)
+{
+	switch (rtype + 2) {
+#ifdef PORTMAP
+	case PMAPVERS:		/* version 2 */
+		if (proc > rpcb_highproc_2)
+			return;
+		break;
+#endif
+	case RPCBVERS:		/* version 3 */
+		if (proc > rpcb_highproc_3)
+			return;
+		break;
+	case RPCBVERS4:		/* version 4 */
+		if (proc > rpcb_highproc_4)
+			return;
+		break;
+	default: return;
+	}
+	inf[rtype].info[proc]++;
+	return;
+}
+
+void
+rpcbs_set(rpcvers_t rtype, bool_t success)
+{
+	if ((rtype >= RPCBVERS_STAT) || (success == FALSE))
+		return;
+	inf[rtype].setinfo++;
+	return;
+}
+
+void
+rpcbs_unset(rpcvers_t rtype, bool_t success)
+{
+	if ((rtype >= RPCBVERS_STAT) || (success == FALSE))
+		return;
+	inf[rtype].unsetinfo++;
+	return;
+}
+
+void
+rpcbs_getaddr(rpcvers_t rtype, rpcprog_t prog, rpcvers_t vers,
+    const char *netid, const char *uaddr)
+{
+	rpcbs_addrlist *al;
+	struct netconfig *nconf;
+
+	if (rtype >= RPCBVERS_STAT)
+		return;
+	for (al = inf[rtype].addrinfo; al; al = al->next) {
+
+		if(al->netid == NULL)
+			return;
+		if ((al->prog == prog) && (al->vers == vers) &&
+		    (strcmp(al->netid, netid) == 0)) {
+			if ((uaddr == NULL) || (uaddr[0] == 0))
+				al->failure++;
+			else
+				al->success++;
+			return;
+		}
+	}
+	nconf = rpcbind_get_conf(netid);
+	if (nconf == NULL) {
+		return;
+	}
+	al = (rpcbs_addrlist *) malloc(sizeof (rpcbs_addrlist));
+	if (al == NULL) {
+		return;
+	}
+	al->prog = prog;
+	al->vers = vers;
+	al->netid = nconf->nc_netid;
+	if ((uaddr == NULL) || (uaddr[0] == 0)) {
+		al->failure = 1;
+		al->success = 0;
+	} else {
+		al->failure = 0;
+		al->success = 1;
+	}
+	al->next = inf[rtype].addrinfo;
+	inf[rtype].addrinfo = al;
+}
+
+void
+rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t rpcbproc, rpcprog_t prog,
+	      rpcvers_t vers, rpcproc_t proc, char *netid, rpcblist_ptr rbl)
+{
+	rpcbs_rmtcalllist *rl;
+	struct netconfig *nconf;
+
+	if (rtype >= RPCBVERS_STAT)
+		return;
+	for (rl = inf[rtype].rmtinfo; rl; rl = rl->next) {
+
+		if(rl->netid == NULL)
+			return;
+
+		if ((rl->prog == prog) && (rl->vers == vers) &&
+		    (rl->proc == proc) &&
+		    (strcmp(rl->netid, netid) == 0)) {
+			if ((rbl == NULL) ||
+			    (rbl->rpcb_map.r_vers != vers))
+				rl->failure++;
+			else
+				rl->success++;
+			if (rpcbproc == RPCBPROC_INDIRECT)
+				rl->indirect++;
+			return;
+		}
+	}
+	nconf = rpcbind_get_conf(netid);
+	if (nconf == NULL) {
+		return;
+	}
+	rl = (rpcbs_rmtcalllist *) malloc(sizeof (rpcbs_rmtcalllist));
+	if (rl == NULL) {
+		return;
+	}
+	rl->prog = prog;
+	rl->vers = vers;
+	rl->proc = proc;
+	rl->netid = nconf->nc_netid;
+	if ((rbl == NULL) ||
+		    (rbl->rpcb_map.r_vers != vers)) {
+		rl->failure = 1;
+		rl->success = 0;
+	} else {
+		rl->failure = 0;
+		rl->success = 1;
+	}
+	rl->indirect = 1;
+	rl->next = inf[rtype].rmtinfo;
+	inf[rtype].rmtinfo = rl;
+	return;
+}
+
+/*
+ */
+void *
+rpcbproc_getstat(void *arg, struct svc_req *req, SVCXPRT *xprt,
+		 rpcvers_t versnum)
+{
+	return (void *)&inf;
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c
new file mode 100644
index 000000000000..16c86f67a375
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c
@@ -0,0 +1,232 @@
+/*	$NetBSD: rpcb_svc.c,v 1.2 2011/09/16 16:13:18 plunky Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)rpcb_svc.c	1.16	93/07/05 SMI" */
+
+/*
+ * rpcb_svc.c
+ * The server procedure for the version 3 rpcbind (TLI).
+ *
+ * It maintains a separate list of all the registered services with the
+ * version 3 of rpcbind.
+ */
+#include <sys/types.h>
+#include <rpc/rpc.h>
+#include <rpc/rpcb_prot.h>
+#include <netconfig.h>
+#include <syslog.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "rpcbind.h"
+
+static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+
+/*
+ * Called by svc_getreqset. There is a separate server handle for
+ * every transport that it waits on.
+ */
+void
+rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
+{
+	union {
+		RPCB rpcbproc_set_3_arg;
+		RPCB rpcbproc_unset_3_arg;
+		RPCB rpcbproc_getaddr_3_local_arg;
+		struct rpcb_rmtcallargs rpcbproc_callit_3_arg;
+		char *rpcbproc_uaddr2taddr_3_arg;
+		struct netbuf rpcbproc_taddr2uaddr_3_arg;
+	} argument;
+	char *result;
+	xdrproc_t xdr_argument, xdr_result;
+	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+
+	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
+
+	switch (rqstp->rq_proc) {
+	case NULLPROC:
+		/*
+		 * Null proc call
+		 */
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_NULL\n");
+#endif
+		/* This call just logs, no actual checks */
+		check_access(transp, rqstp->rq_proc, NULL, RPCBVERS);
+		(void) svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
+		return;
+
+	case RPCBPROC_SET:
+		xdr_argument = (xdrproc_t )xdr_rpcb;
+		xdr_result = (xdrproc_t )xdr_bool;
+		local = rpcbproc_set_com;
+		break;
+
+	case RPCBPROC_UNSET:
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_bool;
+		local = rpcbproc_unset_com;
+		break;
+
+	case RPCBPROC_GETADDR:
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_wrapstring;
+		local = rpcbproc_getaddr_3_local;
+		break;
+
+	case RPCBPROC_DUMP:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_DUMP\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_rpcblist_ptr;
+		local = rpcbproc_dump_3_local;
+		break;
+
+	case RPCBPROC_CALLIT:
+		rpcbproc_callit_com(rqstp, transp, rqstp->rq_proc, RPCBVERS);
+		return;
+
+	case RPCBPROC_GETTIME:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_GETTIME\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_u_long;
+		local = rpcbproc_gettime_com;
+		break;
+
+	case RPCBPROC_UADDR2TADDR:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_UADDR2TADDR\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_wrapstring;
+		xdr_result = (xdrproc_t)xdr_netbuf;
+		local = rpcbproc_uaddr2taddr_com;
+		break;
+
+	case RPCBPROC_TADDR2UADDR:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_TADDR2UADDR\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_netbuf;
+		xdr_result = (xdrproc_t)xdr_wrapstring;
+		local = rpcbproc_taddr2uaddr_com;
+		break;
+
+	default:
+		svcerr_noproc(transp);
+		return;
+	}
+	(void) memset((char *)&argument, 0, sizeof (argument));
+	if (!svc_getargs(transp, (xdrproc_t) xdr_argument,
+				(char *) &argument)) {
+		svcerr_decode(transp);
+		if (debugging)
+			(void) fprintf(stderr, "rpcbind: could not decode\n");
+		return;
+	}
+	if (!check_access(transp, rqstp->rq_proc, &argument, RPCBVERS)) {
+		svcerr_weakauth(transp);
+		goto done;
+	}
+	result = (*local)(&argument, rqstp, transp, RPCBVERS);
+	if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result,
+						result)) {
+		svcerr_systemerr(transp);
+		if (debugging) {
+			(void) fprintf(stderr, "rpcbind: svc_sendreply\n");
+			if (doabort) {
+				rpcbind_abort();
+			}
+		}
+	}
+done:
+	if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (char *)
+				&argument)) {
+		if (debugging) {
+			(void) fprintf(stderr, "unable to free arguments\n");
+			if (doabort) {
+				rpcbind_abort();
+			}
+		}
+	}
+}
+
+/*
+ * Lookup the mapping for a program, version and return its
+ * address. Assuming that the caller wants the address of the
+ * server running on the transport on which the request came.
+ *
+ * We also try to resolve the universal address in terms of
+ * address of the caller.
+ */
+/* ARGSUSED */
+static void *
+rpcbproc_getaddr_3_local(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			 rpcvers_t versnum)
+{
+	RPCB *regp = (RPCB *)arg;
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		char *uaddr;
+
+		uaddr = taddr2uaddr(rpcbind_get_conf(transp->xp_netid),
+			    svc_getrpccaller(transp));
+		fprintf(stderr, "RPCB_GETADDR req for (%lu, %lu, %s) from %s: ",
+		    (unsigned long)regp->r_prog, (unsigned long)regp->r_vers,
+		    regp->r_netid, uaddr);
+		free(uaddr);
+	}
+#endif
+	return (rpcbproc_getaddr_com(regp, rqstp, transp, RPCBVERS,
+	    RPCB_ALLVERS));
+}
+
+/* ARGSUSED */
+static void *
+rpcbproc_dump_3_local(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+		      rpcvers_t versnum)
+{
+	return ((void *)&list_rbl);
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c
new file mode 100644
index 000000000000..c4e8edb0994f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c
@@ -0,0 +1,455 @@
+/*	$NetBSD: rpcb_svc_4.c,v 1.2 2011/09/16 16:13:18 plunky Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)rpcb_svc_4.c	1.8	93/07/05 SMI" */
+
+/*
+ * rpcb_svc_4.c
+ * The server procedure for the version 4 rpcbind.
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <rpc/rpc.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <netconfig.h>
+#include <syslog.h>
+#include <string.h>
+#include <stdlib.h>
+#include "rpcbind.h"
+
+static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
+static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *,
+    rpcvers_t);
+
+/*
+ * Called by svc_getreqset. There is a separate server handle for
+ * every transport that it waits on.
+ */
+void
+rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
+{
+	union {
+		rpcb rpcbproc_set_4_arg;
+		rpcb rpcbproc_unset_4_arg;
+		rpcb rpcbproc_getaddr_4_local_arg;
+		char *rpcbproc_uaddr2taddr_4_arg;
+		struct netbuf rpcbproc_taddr2uaddr_4_arg;
+	} argument;
+	char *result;
+	xdrproc_t xdr_argument, xdr_result;
+	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+
+	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
+
+	switch (rqstp->rq_proc) {
+	case NULLPROC:
+		/*
+		 * Null proc call
+		 */
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_NULL\n");
+#endif
+		check_access(transp, rqstp->rq_proc, NULL, RPCBVERS4);
+		(void) svc_sendreply(transp, (xdrproc_t) xdr_void, NULL);
+		return;
+
+	case RPCBPROC_SET:
+		/*
+		 * Check to see whether the message came from
+		 * loopback transports (for security reasons)
+		 */
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_bool;
+		local = rpcbproc_set_com;
+		break;
+
+	case RPCBPROC_UNSET:
+		/*
+		 * Check to see whether the message came from
+		 * loopback transports (for security reasons)
+		 */
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_bool;
+		local = rpcbproc_unset_com;
+		break;
+
+	case RPCBPROC_GETADDR:
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_wrapstring;
+		local = rpcbproc_getaddr_4_local;
+		break;
+
+	case RPCBPROC_GETVERSADDR:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_GETVERSADDR\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_wrapstring;
+		local = rpcbproc_getversaddr_4_local;
+		break;
+
+	case RPCBPROC_DUMP:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_DUMP\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_rpcblist_ptr;
+		local = rpcbproc_dump_4_local;
+		break;
+
+	case RPCBPROC_INDIRECT:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_INDIRECT\n");
+#endif
+		rpcbproc_callit_com(rqstp, transp, rqstp->rq_proc, RPCBVERS4);
+		return;
+
+/*	case RPCBPROC_CALLIT: */
+	case RPCBPROC_BCAST:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_BCAST\n");
+#endif
+		rpcbproc_callit_com(rqstp, transp, rqstp->rq_proc, RPCBVERS4);
+		return;
+
+	case RPCBPROC_GETTIME:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_GETTIME\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_u_long;
+		local = rpcbproc_gettime_com;
+		break;
+
+	case RPCBPROC_UADDR2TADDR:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_UADDR2TADDR\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_wrapstring;
+		xdr_result = (xdrproc_t)xdr_netbuf;
+		local = rpcbproc_uaddr2taddr_com;
+		break;
+
+	case RPCBPROC_TADDR2UADDR:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_TADDR2UADDR\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_netbuf;
+		xdr_result = (xdrproc_t)xdr_wrapstring;
+		local = rpcbproc_taddr2uaddr_com;
+		break;
+
+	case RPCBPROC_GETADDRLIST:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_GETADDRLIST\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_rpcb;
+		xdr_result = (xdrproc_t)xdr_rpcb_entry_list_ptr;
+		local = rpcbproc_getaddrlist_4_local;
+		break;
+
+	case RPCBPROC_GETSTAT:
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "RPCBPROC_GETSTAT\n");
+#endif
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_rpcb_stat_byvers;
+		local = rpcbproc_getstat;
+		break;
+
+	default:
+		svcerr_noproc(transp);
+		return;
+	}
+	memset((char *)&argument, 0, sizeof (argument));
+	if (!svc_getargs(transp, (xdrproc_t) xdr_argument,
+		(char *)&argument)) {
+		svcerr_decode(transp);
+		if (debugging)
+			(void) fprintf(stderr, "rpcbind: could not decode\n");
+		return;
+	}
+	if (!check_access(transp, rqstp->rq_proc, &argument, RPCBVERS4)) {
+		svcerr_weakauth(transp);
+		goto done;
+	}
+	result = (*local)(&argument, rqstp, transp, RPCBVERS4);
+	if (result != NULL && !svc_sendreply(transp, (xdrproc_t) xdr_result,
+						result)) {
+		svcerr_systemerr(transp);
+		if (debugging) {
+			(void) fprintf(stderr, "rpcbind: svc_sendreply\n");
+			if (doabort) {
+				rpcbind_abort();
+			}
+		}
+	}
+done:
+	if (!svc_freeargs(transp, (xdrproc_t) xdr_argument,
+				(char *)&argument)) {
+		if (debugging) {
+			(void) fprintf(stderr, "unable to free arguments\n");
+			if (doabort) {
+				rpcbind_abort();
+			}
+		}
+	}
+	return;
+}
+
+/*
+ * Lookup the mapping for a program, version and return its
+ * address. Assuming that the caller wants the address of the
+ * server running on the transport on which the request came.
+ * Even if a service with a different version number is available,
+ * it will return that address.  The client should check with an
+ * clnt_call to verify whether the service is the one that is desired.
+ * We also try to resolve the universal address in terms of
+ * address of the caller.
+ */
+/* ARGSUSED */
+static void *
+rpcbproc_getaddr_4_local(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			 rpcvers_t rpcbversnum)
+{
+	RPCB *regp = (RPCB *)arg;
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		char *uaddr;
+
+		uaddr =	taddr2uaddr(rpcbind_get_conf(transp->xp_netid),
+			    svc_getrpccaller(transp));
+		fprintf(stderr, "RPCB_GETADDR req for (%lu, %lu, %s) from %s: ",
+		    (unsigned long)regp->r_prog, (unsigned long)regp->r_vers,
+		    regp->r_netid, uaddr);
+		free(uaddr);
+	}
+#endif
+	return (rpcbproc_getaddr_com(regp, rqstp, transp, RPCBVERS4,
+					RPCB_ALLVERS));
+}
+
+/*
+ * Lookup the mapping for a program, version and return its
+ * address. Assuming that the caller wants the address of the
+ * server running on the transport on which the request came.
+ *
+ * We also try to resolve the universal address in terms of
+ * address of the caller.
+ */
+/* ARGSUSED */
+static void *
+rpcbproc_getversaddr_4_local(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			     rpcvers_t versnum)
+{
+	RPCB *regp = (RPCB *)arg;
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		char *uaddr;
+
+		uaddr = taddr2uaddr(rpcbind_get_conf(transp->xp_netid),
+			    svc_getrpccaller(transp));
+		fprintf(stderr, "RPCB_GETVERSADDR rqst for (%lu, %lu, %s)"
+				" from %s : ",
+		    (unsigned long)regp->r_prog, (unsigned long)regp->r_vers,
+		    regp->r_netid, uaddr);
+		free(uaddr);
+	}
+#endif
+	return (rpcbproc_getaddr_com(regp, rqstp, transp, RPCBVERS4,
+					RPCB_ONEVERS));
+}
+
+/*
+ * Lookup the mapping for a program, version and return the
+ * addresses for all transports in the current transport family.
+ * We return a merged address.
+ */
+/* ARGSUSED */
+static void *
+rpcbproc_getaddrlist_4_local(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			     rpcvers_t versnum)
+{
+	RPCB *regp = (RPCB *)arg;
+	static rpcb_entry_list_ptr rlist;
+	register rpcblist_ptr rbl;
+	rpcb_entry_list_ptr rp, tail = NULL;
+	rpcprog_t prog;
+	rpcvers_t vers;
+	rpcb_entry *a;
+	struct netconfig *nconf;
+	struct netconfig *reg_nconf;
+	char *saddr, *maddr = NULL;
+
+	free_rpcb_entry_list(&rlist);
+	prog = regp->r_prog;
+	vers = regp->r_vers;
+	reg_nconf = rpcbind_get_conf(transp->xp_netid);
+	if (reg_nconf == NULL)
+		return (NULL);
+	if (*(regp->r_addr) != '\0') {
+		saddr = regp->r_addr;
+	} else {
+		saddr = NULL;
+	}
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		fprintf(stderr, "r_addr: %s r_netid: %s nc_protofmly: %s\n",
+		    regp->r_addr, regp->r_netid, reg_nconf->nc_protofmly);
+	}
+#endif
+	for (rbl = list_rbl; rbl != NULL; rbl = rbl->rpcb_next) {
+	    if ((rbl->rpcb_map.r_prog == prog) &&
+		(rbl->rpcb_map.r_vers == vers)) {
+		nconf = rpcbind_get_conf(rbl->rpcb_map.r_netid);
+		if (nconf == NULL)
+			goto fail;
+		if (strcmp(nconf->nc_protofmly, reg_nconf->nc_protofmly)
+				!= 0) {
+			continue;	/* not same proto family */
+		}
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "\tmerge with: %s\n", rbl->rpcb_map.r_addr);
+#endif
+		if ((maddr = mergeaddr(transp, rbl->rpcb_map.r_netid,
+				rbl->rpcb_map.r_addr, saddr)) == NULL) {
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, " FAILED\n");
+#endif
+			continue;
+		} else if (!maddr[0]) {
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, " SUCCEEDED, but port died -  maddr: nullstring\n");
+#endif
+			/* The server died. Unset this combination */
+			delete_prog(regp->r_prog);
+			free(maddr);
+			continue;
+		}
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, " SUCCEEDED maddr: %s\n", maddr);
+#endif
+		/*
+		 * Add it to rlist.
+		 */
+		rp = (rpcb_entry_list_ptr)
+			malloc((u_int)sizeof (rpcb_entry_list));
+		if (rp == NULL) {
+			free(maddr);
+			goto fail;
+		}
+		a = &rp->rpcb_entry_map;
+		a->r_maddr = maddr;
+		a->r_nc_netid = nconf->nc_netid;
+		a->r_nc_semantics = nconf->nc_semantics;
+		a->r_nc_protofmly = nconf->nc_protofmly;
+		a->r_nc_proto = nconf->nc_proto;
+		rp->rpcb_entry_next = NULL;
+		if (rlist == NULL) {
+			rlist = rp;
+			tail = rp;
+		} else if (tail) {
+			tail->rpcb_entry_next = rp;
+			tail = rp;
+		}
+		rp = NULL;
+	    }
+	}
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		for (rp = rlist; rp; rp = rp->rpcb_entry_next) {
+			fprintf(stderr, "\t%s %s\n", rp->rpcb_entry_map.r_maddr,
+				rp->rpcb_entry_map.r_nc_proto);
+		}
+	}
+#endif
+	/*
+	 * XXX: getaddrlist info is also being stuffed into getaddr.
+	 * Perhaps wrong, but better than it not getting counted at all.
+	 */
+	rpcbs_getaddr(RPCBVERS4 - 2, prog, vers, transp->xp_netid, maddr);
+	return (void *)&rlist;
+
+fail:	free_rpcb_entry_list(&rlist);
+	return (NULL);
+}
+
+/*
+ * Free only the allocated structure, rest is all a pointer to some
+ * other data somewhere else.
+ */
+static void
+free_rpcb_entry_list(rpcb_entry_list_ptr *rlistp)
+{
+	register rpcb_entry_list_ptr rbl, tmp;
+
+	for (rbl = *rlistp; rbl != NULL; ) {
+		tmp = rbl;
+		rbl = rbl->rpcb_entry_next;
+		free((char *)tmp->rpcb_entry_map.r_maddr);
+		free((char *)tmp);
+	}
+	*rlistp = NULL;
+}
+
+/* ARGSUSED */
+static void *
+rpcbproc_dump_4_local(void *arg, struct svc_req *req, SVCXPRT *xprt,
+		      rpcvers_t versnum)
+{
+	return ((void *)&list_rbl);
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c
new file mode 100644
index 000000000000..d7ac0db55d3a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c
@@ -0,0 +1,1460 @@
+/*	$NetBSD: rpcb_svc_com.c,v 1.2 2011/09/16 16:13:18 plunky Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)rpcb_svc_com.c	1.18	94/05/02 SMI" */
+
+/*
+ * rpcb_svc_com.c
+ * The commom server procedure for the rpcbind.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <rpc/rpc.h>
+#include <rpc/rpcb_prot.h>
+#include <netconfig.h>
+#include <errno.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <poll.h>
+#ifdef PORTMAP
+#include <netinet/in.h>
+#include <rpc/pmap_prot.h>
+#endif /* PORTMAP */
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "rpcbind.h"
+#include "svc_dg.h"
+#include "svc_fdset.h"
+
+#define RPC_BUF_MAX	65536	/* can be raised if required */
+
+static char emptystring[] = "";
+static int rpcb_rmtcalls;
+
+struct rmtcallfd_list {
+	int fd;
+	SVCXPRT *xprt;
+	char *netid;
+	struct rmtcallfd_list *next;
+};
+
+#define NFORWARD        64
+#define MAXTIME_OFF     300     /* 5 minutes */
+
+struct finfo {
+	int             flag;
+#define FINFO_ACTIVE    0x1
+	u_int32_t       caller_xid;
+        struct netbuf   *caller_addr;
+	u_int32_t       forward_xid;
+	int             forward_fd;
+	char            *uaddr;
+	rpcproc_t       reply_type;
+	rpcvers_t       versnum;
+	time_t          time;
+};
+static struct finfo     FINFO[NFORWARD];
+
+
+static bool_t xdr_encap_parms(XDR *, struct encap_parms *);
+static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *);
+static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *);
+static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *);
+static int find_rmtcallfd_by_netid(char *);
+static SVCXPRT *find_rmtcallxprt_by_fd(int);
+static u_int32_t forward_register(u_int32_t, struct netbuf *, int, char *,
+				    rpcproc_t, rpcvers_t);
+static struct finfo *forward_find(u_int32_t);
+static int free_slot_by_xid(u_int32_t);
+static int free_slot_by_index(int);
+static int netbufcmp(struct netbuf *, struct netbuf *);
+static struct netbuf *netbufdup(struct netbuf *);
+static void netbuffree(struct netbuf *);
+static int check_rmtcalls(struct pollfd *, int);
+static void xprt_set_caller(SVCXPRT *, struct finfo *);
+static void send_svcsyserr(SVCXPRT *, struct finfo *);
+static void handle_reply(int, SVCXPRT *);
+static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
+static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
+static char *getowner(SVCXPRT *, char *, size_t);
+static int add_pmaplist(RPCB *);
+static int del_pmaplist(RPCB *);
+
+/*
+ * Set a mapping of program, version, netid
+ */
+/* ARGSUSED */
+void *
+rpcbproc_set_com(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+		 rpcvers_t rpcbversnum)
+{
+	RPCB *regp = (RPCB *)arg;
+	static bool_t ans;
+	char owner[64];
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "RPCB_SET request for (%lu, %lu, %s, %s) : ",
+		    (unsigned long)regp->r_prog, (unsigned long)regp->r_vers,
+		    regp->r_netid, regp->r_addr);
+#endif
+	ans = map_set(regp, getowner(transp, owner, sizeof owner));
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "%s\n", ans == TRUE ? "succeeded" : "failed");
+#endif
+	/* XXX: should have used some defined constant here */
+	rpcbs_set(rpcbversnum - 2, ans);
+	return (void *)&ans;
+}
+
+bool_t
+map_set(RPCB *regp, char *owner)
+{
+	RPCB reg, *a;
+	rpcblist_ptr rbl, fnd;
+
+	reg = *regp;
+	/*
+	 * check to see if already used
+	 * find_service returns a hit even if
+	 * the versions don't match, so check for it
+	 */
+	fnd = find_service(reg.r_prog, reg.r_vers, reg.r_netid);
+	if (fnd && (fnd->rpcb_map.r_vers == reg.r_vers)) {
+		if (!strcmp(fnd->rpcb_map.r_addr, reg.r_addr))
+			/*
+			 * if these match then it is already
+			 * registered so just say "OK".
+			 */
+			return (TRUE);
+		else
+			return (FALSE);
+	}
+	/*
+	 * add to the end of the list
+	 */
+	rbl = (rpcblist_ptr) malloc((u_int)sizeof (RPCBLIST));
+	if (rbl == NULL) {
+		return (FALSE);
+	}
+	a = &(rbl->rpcb_map);
+	a->r_prog = reg.r_prog;
+	a->r_vers = reg.r_vers;
+	a->r_netid = strdup(reg.r_netid);
+	a->r_addr = strdup(reg.r_addr);
+	a->r_owner = strdup(owner);
+	if (!a->r_addr || !a->r_netid || !a->r_owner) {
+		if (a->r_netid)
+			free((void *) a->r_netid);
+		if (a->r_addr)
+			free((void *) a->r_addr);
+		if (a->r_owner)
+			free((void *) a->r_owner);
+		free((void *)rbl);
+		return (FALSE);
+	}
+	rbl->rpcb_next = NULL;
+	if (list_rbl == NULL) {
+		list_rbl = rbl;
+	} else {
+		for (fnd = list_rbl; fnd->rpcb_next;
+			fnd = fnd->rpcb_next)
+			;
+		fnd->rpcb_next = rbl;
+	}
+#ifdef PORTMAP
+	(void) add_pmaplist(regp);
+#endif
+	return (TRUE);
+}
+
+/*
+ * Unset a mapping of program, version, netid
+ */
+/* ARGSUSED */
+void *
+rpcbproc_unset_com(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+		   rpcvers_t rpcbversnum)
+{
+	RPCB *regp = (RPCB *)arg;
+	static bool_t ans;
+	char owner[64];
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "RPCB_UNSET request for (%lu, %lu, %s) : ",
+		    (unsigned long)regp->r_prog, (unsigned long)regp->r_vers,
+		    regp->r_netid);
+#endif
+	ans = map_unset(regp, getowner(transp, owner, sizeof owner));
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "%s\n", ans == TRUE ? "succeeded" : "failed");
+#endif
+	/* XXX: should have used some defined constant here */
+	rpcbs_unset(rpcbversnum - 2, ans);
+	return (void *)&ans;
+}
+
+bool_t
+map_unset(RPCB *regp, const char *owner)
+{
+	int ans = 0;
+	rpcblist_ptr rbl, prev, tmp;
+
+	if (owner == NULL)
+		return (0);
+
+	for (prev = NULL, rbl = list_rbl; rbl; /* cstyle */) {
+		if ((rbl->rpcb_map.r_prog != regp->r_prog) ||
+			(rbl->rpcb_map.r_vers != regp->r_vers) ||
+			(regp->r_netid[0] && strcasecmp(regp->r_netid,
+				rbl->rpcb_map.r_netid))) {
+			/* both rbl & prev move forwards */
+			prev = rbl;
+			rbl = rbl->rpcb_next;
+			continue;
+		}
+		/*
+		 * Check whether appropriate uid. Unset only
+		 * if superuser or the owner itself.
+		 */
+		if (strcmp(owner, rpcbind_superuser) &&
+			strcmp(rbl->rpcb_map.r_owner, owner))
+			return (0);
+		/* found it; rbl moves forward, prev stays */
+		ans = 1;
+		tmp = rbl;
+		rbl = rbl->rpcb_next;
+		if (prev == NULL)
+			list_rbl = rbl;
+		else
+			prev->rpcb_next = rbl;
+		free((void *) tmp->rpcb_map.r_addr);
+		free((void *) tmp->rpcb_map.r_netid);
+		free((void *) tmp->rpcb_map.r_owner);
+		free((void *) tmp);
+	}
+#ifdef PORTMAP
+	if (ans)
+		(void) del_pmaplist(regp);
+#endif
+	/*
+	 * We return 1 either when the entry was not there or it
+	 * was able to unset it.  It can come to this point only if
+	 * atleast one of the conditions is true.
+	 */
+	return (1);
+}
+
+void
+delete_prog(int prog)
+{
+	RPCB reg;
+	register rpcblist_ptr rbl;
+
+	for (rbl = list_rbl; rbl != NULL; rbl = rbl->rpcb_next) {
+		if ((rbl->rpcb_map.r_prog != prog))
+			continue;
+		if (is_bound(rbl->rpcb_map.r_netid, rbl->rpcb_map.r_addr))
+			continue;
+		reg.r_prog = rbl->rpcb_map.r_prog;
+		reg.r_vers = rbl->rpcb_map.r_vers;
+		reg.r_netid = strdup(rbl->rpcb_map.r_netid);
+		(void)map_unset(&reg, rpcbind_superuser);
+		free(reg.r_netid);
+	}
+}
+
+void *
+rpcbproc_getaddr_com(RPCB *regp, struct svc_req *rqstp, SVCXPRT *transp,
+		     rpcvers_t rpcbversnum, rpcvers_t verstype)
+{
+	static char *uaddr;
+	char *saddr = NULL;
+	rpcblist_ptr fnd;
+
+	if (uaddr && uaddr[0])
+		free((void *) uaddr);
+	fnd = find_service(regp->r_prog, regp->r_vers, transp->xp_netid);
+	if (fnd && ((verstype == RPCB_ALLVERS) ||
+		    (regp->r_vers == fnd->rpcb_map.r_vers))) {
+		if (*(regp->r_addr) != '\0') {  /* may contain a hint about */
+			saddr = regp->r_addr;   /* the interface that we    */
+		}				/* should use */
+		if (!(uaddr = mergeaddr(transp, transp->xp_netid,
+				fnd->rpcb_map.r_addr, saddr))) {
+			/* Try whatever we have */
+			uaddr = strdup(fnd->rpcb_map.r_addr);
+		} else if (!uaddr[0]) {
+			/*
+			 * The server died.  Unset all versions of this prog.
+			 */
+			delete_prog(regp->r_prog);
+			uaddr = emptystring;
+		}
+	} else {
+		uaddr = emptystring;
+	}
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "getaddr: %s\n", uaddr);
+#endif
+	/* XXX: should have used some defined constant here */
+	rpcbs_getaddr(rpcbversnum - 2, regp->r_prog, regp->r_vers,
+		transp->xp_netid, uaddr);
+	return (void *)&uaddr;
+}
+
+/* ARGSUSED */
+void *
+rpcbproc_gettime_com(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+		     rpcvers_t rpcbversnum)
+{
+	static time_t curtime;
+
+	(void) time(&curtime);
+	return (void *)&curtime;
+}
+
+/*
+ * Convert uaddr to taddr. Should be used only by
+ * local servers/clients. (kernel level stuff only)
+ */
+/* ARGSUSED */
+void *
+rpcbproc_uaddr2taddr_com(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			 rpcvers_t rpcbversnum)
+{
+	char **uaddrp = (char **)arg;
+	struct netconfig *nconf;
+	static struct netbuf nbuf;
+	static struct netbuf *taddr;
+
+	if (taddr) {
+		free((void *) taddr->buf);
+		free((void *) taddr);
+	}
+	if (((nconf = rpcbind_get_conf(transp->xp_netid)) == NULL) ||
+	    ((taddr = uaddr2taddr(nconf, *uaddrp)) == NULL)) {
+		(void) memset((char *)&nbuf, 0, sizeof (struct netbuf));
+		return (void *)&nbuf;
+	}
+	return (void *)taddr;
+}
+
+/*
+ * Convert taddr to uaddr. Should be used only by
+ * local servers/clients. (kernel level stuff only)
+ */
+/* ARGSUSED */
+void *
+rpcbproc_taddr2uaddr_com(void *arg, struct svc_req *rqstp, SVCXPRT *transp,
+			 rpcvers_t rpcbversnum)
+{
+	struct netbuf *taddr = (struct netbuf *)arg;
+	static char *uaddr;
+	struct netconfig *nconf;
+
+	if (uaddr && !uaddr[0])
+		free((void *) uaddr);
+	if (((nconf = rpcbind_get_conf(transp->xp_netid)) == NULL) ||
+		((uaddr = taddr2uaddr(nconf, taddr)) == NULL)) {
+		uaddr = emptystring;
+	}
+	return (void *)&uaddr;
+}
+
+
+static bool_t
+xdr_encap_parms(XDR *xdrs, struct encap_parms *epp)
+{
+	return (xdr_bytes(xdrs, &(epp->args), (u_int *) &(epp->arglen), ~0));
+}
+
+/*
+ * XDR remote call arguments.  It ignores the address part.
+ * written for XDR_DECODE direction only
+ */
+static bool_t
+xdr_rmtcall_args(XDR *xdrs, struct r_rmtcall_args *cap)
+{
+	/* does not get the address or the arguments */
+	if (xdr_u_int32_t(xdrs, &(cap->rmt_prog)) &&
+	    xdr_u_int32_t(xdrs, &(cap->rmt_vers)) &&
+	    xdr_u_int32_t(xdrs, &(cap->rmt_proc))) {
+		return (xdr_encap_parms(xdrs, &(cap->rmt_args)));
+	}
+	return (FALSE);
+}
+
+/*
+ * XDR remote call results along with the address.  Ignore
+ * program number, version  number and proc number.
+ * Written for XDR_ENCODE direction only.
+ */
+static bool_t
+xdr_rmtcall_result(XDR *xdrs, struct r_rmtcall_args *cap)
+{
+	bool_t result;
+
+#ifdef PORTMAP
+	if (cap->rmt_localvers == PMAPVERS) {
+		int h1, h2, h3, h4, p1, p2;
+		u_long port;
+
+		/* interpret the universal address for TCP/IP */
+		if (sscanf(cap->rmt_uaddr, "%d.%d.%d.%d.%d.%d",
+			&h1, &h2, &h3, &h4, &p1, &p2) != 6)
+			return (FALSE);
+		port = ((p1 & 0xff) << 8) + (p2 & 0xff);
+		result = xdr_u_long(xdrs, &port);
+	} else
+#endif
+		if ((cap->rmt_localvers == RPCBVERS) ||
+		    (cap->rmt_localvers == RPCBVERS4)) {
+		result = xdr_wrapstring(xdrs, &(cap->rmt_uaddr));
+	} else {
+		return (FALSE);
+	}
+	if (result == TRUE)
+		return (xdr_encap_parms(xdrs, &(cap->rmt_args)));
+	return (FALSE);
+}
+
+/*
+ * only worries about the struct encap_parms part of struct r_rmtcall_args.
+ * The arglen must already be set!!
+ */
+static bool_t
+xdr_opaque_parms(XDR *xdrs, struct r_rmtcall_args *cap)
+{
+	return (xdr_opaque(xdrs, cap->rmt_args.args, cap->rmt_args.arglen));
+}
+
+static struct rmtcallfd_list *rmthead;
+static struct rmtcallfd_list *rmttail;
+
+int
+create_rmtcall_fd(struct netconfig *nconf)
+{
+	int fd;
+	struct rmtcallfd_list *rmt;
+	SVCXPRT *xprt;
+
+	if ((fd = __rpc_nconf2fd(nconf)) == -1) {
+		if (debugging)
+			fprintf(stderr,
+	"create_rmtcall_fd: couldn't open \"%s\" (errno %d)\n",
+			nconf->nc_device, errno);
+		return (-1);
+	}
+	xprt = svc_tli_create(fd, 0, (struct t_bind *) 0, 0, 0);
+	if (xprt == NULL) {
+		if (debugging)
+			fprintf(stderr,
+				"create_rmtcall_fd: svc_tli_create failed\n");
+		return (-1);
+	}
+	rmt = (struct rmtcallfd_list *)malloc((u_int)
+		sizeof (struct rmtcallfd_list));
+	if (rmt == NULL) {
+		syslog(LOG_ERR, "create_rmtcall_fd: no memory!");
+		return (-1);
+	}
+	rmt->xprt = xprt;
+	rmt->netid = strdup(nconf->nc_netid);
+	xprt->xp_netid = rmt->netid;
+	rmt->fd = fd;
+	rmt->next = NULL;
+	if (rmthead == NULL) {
+		rmthead = rmt;
+		rmttail = rmt;
+	} else {
+		rmttail->next = rmt;
+		rmttail = rmt;
+	}
+	/* XXX not threadsafe */
+	if (fd > *get_fdsetmax())
+		*get_fdsetmax() = fd;
+	FD_SET(fd, get_fdset());
+	return (fd);
+}
+
+static int
+find_rmtcallfd_by_netid(char *netid)
+{
+	struct rmtcallfd_list *rmt;
+
+	for (rmt = rmthead; rmt != NULL; rmt = rmt->next) {
+		if (strcmp(netid, rmt->netid) == 0) {
+			return (rmt->fd);
+		}
+	}
+	return (-1);
+}
+
+static SVCXPRT *
+find_rmtcallxprt_by_fd(int fd)
+{
+	struct rmtcallfd_list *rmt;
+
+	for (rmt = rmthead; rmt != NULL; rmt = rmt->next) {
+		if (fd == rmt->fd) {
+			return (rmt->xprt);
+		}
+	}
+	return (NULL);
+}
+
+
+/*
+ * Call a remote procedure service.  This procedure is very quiet when things
+ * go wrong.  The proc is written to support broadcast rpc.  In the broadcast
+ * case, a machine should shut-up instead of complain, lest the requestor be
+ * overrun with complaints at the expense of not hearing a valid reply.
+ * When receiving a request and verifying that the service exists, we
+ *
+ *	receive the request
+ *
+ *	open a new TLI endpoint on the same transport on which we received
+ *	the original request
+ *
+ *	remember the original request's XID (which requires knowing the format
+ *	of the svc_dg_data structure)
+ *
+ *	forward the request, with a new XID, to the requested service,
+ *	remembering the XID used to send this request (for later use in
+ *	reassociating the answer with the original request), the requestor's
+ *	address, the file descriptor on which the forwarded request is
+ *	made and the service's address.
+ *
+ *	mark the file descriptor on which we anticipate receiving a reply from
+ *	the service and one to select for in our private svc_run procedure
+ *
+ * At some time in the future, a reply will be received from the service to
+ * which we forwarded the request.  At that time, we detect that the socket
+ * used was for forwarding (by looking through the finfo structures to see
+ * whether the fd corresponds to one of those) and call handle_reply() to
+ *
+ *	receive the reply
+ *
+ *	bundle the reply, along with the service's universal address
+ *
+ *	create a SVCXPRT structure and use a version of svc_sendreply
+ *	that allows us to specify the reply XID and destination, send the reply
+ *	to the original requestor.
+ */
+
+void
+rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
+		    rpcproc_t reply_type, rpcvers_t versnum)
+{
+	register rpcblist_ptr rbl;
+	struct netconfig *nconf;
+	struct netbuf *caller;
+	struct r_rmtcall_args a;
+	char *buf_alloc = NULL, *outbufp;
+	char *outbuf_alloc = NULL;
+	char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
+	struct netbuf *na = NULL;
+	struct rpc_msg call_msg;
+	int outlen;
+	u_int sendsz;
+	XDR outxdr;
+	AUTH *auth;
+	int fd = -1;
+	char *uaddr, *m_uaddr, *local_uaddr = NULL;
+	u_int32_t *xidp;
+	struct __rpc_sockinfo si;
+	struct sockaddr *localsa;
+	struct netbuf tbuf;
+
+	if (!__rpc_fd2sockinfo(transp->xp_fd, &si)) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		return;
+	}
+	if (si.si_socktype != SOCK_DGRAM)
+		return;	/* Only datagram type accepted */
+	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
+	if (sendsz == 0) {	/* data transfer not supported */
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		return;
+	}
+	/*
+	 * Should be multiple of 4 for XDR.
+	 */
+	sendsz = ((sendsz + 3) / 4) * 4;
+	if (sendsz > RPC_BUF_MAX) {
+#ifdef	notyet
+		buf_alloc = alloca(sendsz);		/* not in IDR2? */
+#else
+		buf_alloc = malloc(sendsz);
+#endif	/* notyet */
+		if (buf_alloc == NULL) {
+			if (debugging)
+				fprintf(stderr,
+					"rpcbproc_callit_com:  No Memory!\n");
+			if (reply_type == RPCBPROC_INDIRECT)
+				svcerr_systemerr(transp);
+			return;
+		}
+		a.rmt_args.args = buf_alloc;
+	} else {
+		a.rmt_args.args = buf;
+	}
+
+	call_msg.rm_xid = 0;	/* For error checking purposes */
+	if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_decode(transp);
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  svc_getargs failed\n");
+		goto error;
+	}
+
+	if (!check_callit(transp, &a, versnum)) {
+		svcerr_weakauth(transp);
+		goto error;
+	}
+		
+	caller = svc_getrpccaller(transp);
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		uaddr = taddr2uaddr(rpcbind_get_conf(transp->xp_netid), caller);
+		fprintf(stderr, "%s %s req for (%lu, %lu, %lu, %s) from %s : ",
+			versnum == PMAPVERS ? "pmap_rmtcall" :
+			versnum == RPCBVERS ? "rpcb_rmtcall" :
+			versnum == RPCBVERS4 ? "rpcb_indirect" :
+			rpcbind_unknown,
+			reply_type == RPCBPROC_INDIRECT ? "indirect" : "callit",
+			(unsigned long)a.rmt_prog, (unsigned long)a.rmt_vers,
+			(unsigned long)a.rmt_proc, transp->xp_netid,
+			uaddr ? uaddr : rpcbind_unknown);
+		if (uaddr)
+			free((void *) uaddr);
+	}
+#endif
+
+	rbl = find_service(a.rmt_prog, a.rmt_vers, transp->xp_netid);
+
+	rpcbs_rmtcall(versnum - 2, reply_type, a.rmt_prog, a.rmt_vers,
+			a.rmt_proc, transp->xp_netid, rbl);
+
+	if (rbl == NULL) {
+#ifdef RPCBIND_DEBUG
+		if (debugging)
+			fprintf(stderr, "not found\n");
+#endif
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_noprog(transp);
+		goto error;
+	}
+	if (rbl->rpcb_map.r_vers != a.rmt_vers) {
+		if (reply_type == RPCBPROC_INDIRECT) {
+			rpcvers_t vers_low, vers_high;
+
+			find_versions(a.rmt_prog, transp->xp_netid,
+				&vers_low, &vers_high);
+			svcerr_progvers(transp, vers_low, vers_high);
+		}
+		goto error;
+	}
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "found at uaddr %s\n", rbl->rpcb_map.r_addr);
+#endif
+	/*
+	 *	Check whether this entry is valid and a server is present
+	 *	Mergeaddr() returns NULL if no such entry is present, and
+	 *	returns "" if the entry was present but the server is not
+	 *	present (i.e., it crashed).
+	 */
+	if (reply_type == RPCBPROC_INDIRECT) {
+		uaddr = mergeaddr(transp, transp->xp_netid,
+			rbl->rpcb_map.r_addr, NULL);
+		if (uaddr == NULL || uaddr[0] == '\0') {
+			svcerr_noprog(transp);
+			if (uaddr != NULL) {
+				free((void *) uaddr);
+			}
+			goto error;
+		}
+		if (uaddr != NULL) {
+			free((void *) uaddr);
+		}
+	}
+	nconf = rpcbind_get_conf(transp->xp_netid);
+	if (nconf == NULL) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  rpcbind_get_conf failed\n");
+		goto error;
+	}
+	localsa = local_sa(((struct sockaddr *)caller->buf)->sa_family);
+	if (localsa == NULL) {
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com: no local address\n");
+		goto error;
+	}
+	tbuf.len = tbuf.maxlen = localsa->sa_len;
+	tbuf.buf = localsa;
+	local_uaddr =
+	    addrmerge(&tbuf, rbl->rpcb_map.r_addr, NULL, nconf->nc_netid);
+	m_uaddr = addrmerge(caller, rbl->rpcb_map.r_addr, NULL,
+			nconf->nc_netid);
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "merged uaddr %s\n", m_uaddr);
+#endif
+	if ((fd = find_rmtcallfd_by_netid(nconf->nc_netid)) == -1) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		free((void *) m_uaddr);
+		goto error;
+	}
+	xidp = __rpcb_get_dg_xidp(transp);
+	call_msg.rm_xid = forward_register(*xidp,
+			caller, fd, m_uaddr, reply_type, versnum);
+	if (call_msg.rm_xid == 0) {
+		/*
+		 * A duplicate request for the slow server.  Let's not
+		 * beat on it any more.
+		 */
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  duplicate request\n");
+		free((void *) m_uaddr);
+		goto error;
+	} else 	if (call_msg.rm_xid == -1) {
+		/*  forward_register failed.  Perhaps no memory. */
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  forward_register failed\n");
+		free((void *) m_uaddr);
+		goto error;
+	}
+
+#ifdef DEBUG_RMTCALL
+	if (debugging)
+		fprintf(stderr,
+			"rpcbproc_callit_com:  original XID %x, new XID %x\n",
+				*xidp, call_msg.rm_xid);
+#endif
+	call_msg.rm_direction = CALL;
+	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
+	call_msg.rm_call.cb_prog = a.rmt_prog;
+	call_msg.rm_call.cb_vers = a.rmt_vers;
+	if (sendsz > RPC_BUF_MAX) {
+#ifdef	notyet
+		outbuf_alloc = alloca(sendsz);	/* not in IDR2? */
+#else
+		outbuf_alloc = malloc(sendsz);
+#endif	/* notyet */
+		if (outbuf_alloc == NULL) {
+			if (reply_type == RPCBPROC_INDIRECT)
+				svcerr_systemerr(transp);
+			if (debugging)
+				fprintf(stderr,
+				"rpcbproc_callit_com:  No memory!\n");
+			goto error;
+		}
+		xdrmem_create(&outxdr, outbuf_alloc, sendsz, XDR_ENCODE);
+	} else {
+		xdrmem_create(&outxdr, outbuf, sendsz, XDR_ENCODE);
+	}
+	if (!xdr_callhdr(&outxdr, &call_msg)) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  xdr_callhdr failed\n");
+		goto error;
+	}
+	if (!xdr_u_int32_t(&outxdr, &(a.rmt_proc))) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		if (debugging)
+			fprintf(stderr,
+			"rpcbproc_callit_com:  xdr_u_long failed\n");
+		goto error;
+	}
+
+	if (rqstp->rq_cred.oa_flavor == AUTH_NULL) {
+		auth = authnone_create();
+	} else if (rqstp->rq_cred.oa_flavor == AUTH_SYS) {
+		struct authunix_parms *au;
+
+		au = (struct authunix_parms *)rqstp->rq_clntcred;
+		auth = authunix_create(au->aup_machname,
+				au->aup_uid, au->aup_gid,
+				au->aup_len, au->aup_gids);
+		if (auth == NULL) /* fall back */
+			auth = authnone_create();
+	} else {
+		/* we do not support any other authentication scheme */
+		if (debugging)
+			fprintf(stderr,
+"rpcbproc_callit_com:  oa_flavor != AUTH_NONE and oa_flavor != AUTH_SYS\n");
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_weakauth(transp); /* XXX too strong.. */
+		goto error;
+	}
+	if (auth == NULL) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		if (debugging)
+			fprintf(stderr,
+		"rpcbproc_callit_com:  authwhatever_create returned NULL\n");
+		goto error;
+	}
+	if (!AUTH_MARSHALL(auth, &outxdr)) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		AUTH_DESTROY(auth);
+		if (debugging)
+			fprintf(stderr,
+		"rpcbproc_callit_com:  AUTH_MARSHALL failed\n");
+		goto error;
+	}
+	AUTH_DESTROY(auth);
+	if (!xdr_opaque_parms(&outxdr, &a)) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		if (debugging)
+			fprintf(stderr,
+		"rpcbproc_callit_com:  xdr_opaque_parms failed\n");
+		goto error;
+	}
+	outlen = (int) XDR_GETPOS(&outxdr);
+	if (outbuf_alloc)
+		outbufp = outbuf_alloc;
+	else
+		outbufp = outbuf;
+
+	na = uaddr2taddr(nconf, local_uaddr);
+	if (!na) {
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		goto error;
+	}
+
+	if (sendto(fd, outbufp, outlen, 0, (struct sockaddr *)na->buf, na->len)
+	    != outlen) {
+		if (debugging)
+			fprintf(stderr,
+	"rpcbproc_callit_com:  sendto failed:  errno %d\n", errno);
+		if (reply_type == RPCBPROC_INDIRECT)
+			svcerr_systemerr(transp);
+		goto error;
+	}
+	goto out;
+
+error:
+	if (call_msg.rm_xid != 0)
+		(void) free_slot_by_xid(call_msg.rm_xid);
+out:
+	if (local_uaddr)
+		free(local_uaddr);
+	if (buf_alloc)
+		free((void *) buf_alloc);
+	if (outbuf_alloc)
+		free((void *) outbuf_alloc);
+	if (na) {
+		free(na->buf);
+		free(na);
+	}
+}
+
+/*
+ * Makes an entry into the FIFO for the given request.
+ * If duplicate request, returns a 0, else returns the xid of its call.
+ */
+static u_int32_t
+forward_register(u_int32_t caller_xid, struct netbuf *caller_addr,
+		 int forward_fd, char *uaddr, rpcproc_t reply_type,
+		 rpcvers_t versnum)
+{
+	int		i;
+	int		j = 0;
+	time_t		min_time, time_now;
+	static u_int32_t	lastxid;
+	int		entry = -1;
+
+	min_time = FINFO[0].time;
+	time_now = time((time_t *)0);
+	/* initialization */
+	if (lastxid == 0)
+		lastxid = time_now * NFORWARD;
+
+	/*
+	 * Check if it is an duplicate entry. Then,
+	 * try to find an empty slot.  If not available, then
+	 * use the slot with the earliest time.
+	 */
+	for (i = 0; i < NFORWARD; i++) {
+		if (FINFO[i].flag & FINFO_ACTIVE) {
+			if ((FINFO[i].caller_xid == caller_xid) &&
+			    (FINFO[i].reply_type == reply_type) &&
+			    (FINFO[i].versnum == versnum) &&
+			    (!netbufcmp(FINFO[i].caller_addr,
+					    caller_addr))) {
+				FINFO[i].time = time((time_t *)0);
+				return (0);	/* Duplicate entry */
+			} else {
+				/* Should we wait any longer */
+				if ((time_now - FINFO[i].time) > MAXTIME_OFF)
+					(void) free_slot_by_index(i);
+			}
+		}
+		if (entry == -1) {
+			if ((FINFO[i].flag & FINFO_ACTIVE) == 0) {
+				entry = i;
+			} else if (FINFO[i].time < min_time) {
+				j = i;
+				min_time = FINFO[i].time;
+			}
+		}
+	}
+	if (entry != -1) {
+		/* use this empty slot */
+		j = entry;
+	} else {
+		(void) free_slot_by_index(j);
+	}
+	if ((FINFO[j].caller_addr = netbufdup(caller_addr)) == NULL) {
+		return (-1);
+	}
+	rpcb_rmtcalls++;	/* no of pending calls */
+	FINFO[j].flag = FINFO_ACTIVE;
+	FINFO[j].reply_type = reply_type;
+	FINFO[j].versnum = versnum;
+	FINFO[j].time = time_now;
+	FINFO[j].caller_xid = caller_xid;
+	FINFO[j].forward_fd = forward_fd;
+	/*
+	 * Though uaddr is not allocated here, it will still be freed
+	 * from free_slot_*().
+	 */
+	FINFO[j].uaddr = uaddr;
+	lastxid = lastxid + NFORWARD;
+	FINFO[j].forward_xid = lastxid + j;	/* encode slot */
+	return (FINFO[j].forward_xid);		/* forward on this xid */
+}
+
+static struct finfo *
+forward_find(u_int32_t reply_xid)
+{
+	int		i;
+
+	i = reply_xid % NFORWARD;
+	if (i < 0)
+		i += NFORWARD;
+	if ((FINFO[i].flag & FINFO_ACTIVE) &&
+	    (FINFO[i].forward_xid == reply_xid)) {
+		return (&FINFO[i]);
+	}
+	return (NULL);
+}
+
+static int
+free_slot_by_xid(u_int32_t xid)
+{
+	int entry;
+
+	entry = xid % NFORWARD;
+	if (entry < 0)
+		entry += NFORWARD;
+	return (free_slot_by_index(entry));
+}
+
+static int
+free_slot_by_index(int idx)
+{
+	struct finfo	*fi;
+
+	fi = &FINFO[idx];
+	if (fi->flag & FINFO_ACTIVE) {
+		netbuffree(fi->caller_addr);
+		/* XXX may be too big, but can't access xprt array here */
+		if (fi->forward_fd >= *get_fdsetmax())
+			(*get_fdsetmax())--;
+		free((void *) fi->uaddr);
+		fi->flag &= ~FINFO_ACTIVE;
+		rpcb_rmtcalls--;
+		return (1);
+	}
+	return (0);
+}
+
+static int
+netbufcmp(struct netbuf *n1, struct netbuf *n2)
+{
+	return ((n1->len != n2->len) || memcmp(n1->buf, n2->buf, n1->len));
+}
+
+static struct netbuf *
+netbufdup(struct netbuf *ap)
+{
+	struct netbuf  *np;
+
+	np = (struct netbuf *) malloc(sizeof (struct netbuf) + ap->len);
+	if (np) {
+		np->maxlen = np->len = ap->len;
+		np->buf = ((char *) np) + sizeof (struct netbuf);
+		(void) memcpy(np->buf, ap->buf, ap->len);
+	}
+	return (np);
+}
+
+static void
+netbuffree(struct netbuf *ap)
+{
+	free((void *) ap);
+}
+
+
+#define	MASKVAL	(POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)
+extern bool_t __svc_clean_idle(fd_set *, int, bool_t);
+
+void
+my_svc_run()
+{
+	size_t nfds;
+	struct pollfd pollfds[FD_SETSIZE];
+	int poll_ret, check_ret;
+	int n;
+#ifdef SVC_RUN_DEBUG
+	int i;
+#endif
+	register struct pollfd	*p;
+	fd_set cleanfds;
+
+	for (;;) {
+		p = pollfds;
+		for (n = 0; n <= *get_fdsetmax(); n++) {
+			if (FD_ISSET(n, get_fdset())) {
+				p->fd = n;
+				p->events = MASKVAL;
+				p++;
+			}
+		}
+		nfds = p - pollfds;
+		poll_ret = 0;
+#ifdef SVC_RUN_DEBUG
+		if (debugging) {
+			fprintf(stderr, "polling for read on fd < ");
+			for (i = 0, p = pollfds; i < nfds; i++, p++)
+				if (p->events)
+					fprintf(stderr, "%d ", p->fd);
+			fprintf(stderr, ">\n");
+		}
+#endif
+		poll_ret = rump_sys_poll(pollfds, nfds, 30 * 1000);
+		//printf("rpcbind poll got %d\n", poll_ret);
+		switch (poll_ret) {
+		case -1:
+			/*
+			 * We ignore all errors, continuing with the assumption
+			 * that it was set by the signal handlers (or any
+			 * other outside event) and not caused by poll().
+			 */
+		case 0:
+			cleanfds = *get_fdset();
+			__svc_clean_idle(&cleanfds, 30, FALSE);
+			continue;
+		default:
+#ifdef SVC_RUN_DEBUG
+			if (debugging) {
+				fprintf(stderr, "poll returned read fds < ");
+				for (i = 0, p = pollfds; i < nfds; i++, p++)
+					if (p->revents)
+						fprintf(stderr, "%d (0x%x) ", p->fd, p->revents);
+				fprintf(stderr, ">\n");
+			}
+#endif
+			/*
+			 * If we found as many replies on callback fds
+			 * as the number of descriptors selectable which
+			 * poll() returned, there can be no more so we
+			 * don't call svc_getreq_poll.  Otherwise, there
+			 * must be another so we must call svc_getreq_poll.
+			 */
+			if ((check_ret = check_rmtcalls(pollfds, nfds)) ==
+			    poll_ret)
+				continue;
+			svc_getreq_poll(pollfds, poll_ret-check_ret);
+		}
+#ifdef SVC_RUN_DEBUG
+		if (debugging) {
+			fprintf(stderr, "svc_maxfd now %u\n", *get_fdsetmax());
+		}
+#endif
+	}
+}
+
+static int
+check_rmtcalls(struct pollfd *pfds, int nfds)
+{
+	int j, ncallbacks_found = 0, rmtcalls_pending;
+	SVCXPRT *xprt;
+
+	if (rpcb_rmtcalls == 0)
+		return (0);
+
+	rmtcalls_pending = rpcb_rmtcalls;
+	for (j = 0; j < nfds; j++) {
+		if ((xprt = find_rmtcallxprt_by_fd(pfds[j].fd)) != NULL) {
+			if (pfds[j].revents) {
+				ncallbacks_found++;
+#ifdef DEBUG_RMTCALL
+			if (debugging)
+				fprintf(stderr,
+"my_svc_run:  polled on forwarding fd %d, netid %s - calling handle_reply\n",
+		pfds[j].fd, xprt->xp_netid);
+#endif
+				handle_reply(pfds[j].fd, xprt);
+				pfds[j].revents = 0;
+				if (ncallbacks_found >= rmtcalls_pending) {
+					break;
+				}
+			}
+		}
+	}
+	return (ncallbacks_found);
+}
+
+static void
+xprt_set_caller(SVCXPRT *xprt, struct finfo *fi)
+{
+	u_int32_t *xidp;
+
+	*(svc_getrpccaller(xprt)) = *(fi->caller_addr);
+	xidp = __rpcb_get_dg_xidp(xprt);
+	*xidp = fi->caller_xid;
+}
+
+/*
+ * Call svcerr_systemerr() only if RPCBVERS4
+ */
+static void
+send_svcsyserr(SVCXPRT *xprt, struct finfo *fi)
+{
+	if (fi->reply_type == RPCBPROC_INDIRECT) {
+		xprt_set_caller(xprt, fi);
+		svcerr_systemerr(xprt);
+	}
+	return;
+}
+
+static void
+handle_reply(int fd, SVCXPRT *xprt)
+{
+	XDR		reply_xdrs;
+	struct rpc_msg	reply_msg;
+	struct rpc_err	reply_error;
+	char		*buffer;
+	struct finfo	*fi;
+	int		inlen, pos, len;
+	struct r_rmtcall_args a;
+	struct sockaddr_storage ss;
+	socklen_t fromlen;
+#ifdef SVC_RUN_DEBUG
+	char *uaddr;
+#endif
+
+	buffer = malloc(RPC_BUF_MAX);
+	if (buffer == NULL)
+		goto done;
+
+	do {
+		fromlen = sizeof ss;
+		inlen = recvfrom(fd, buffer, RPC_BUF_MAX, 0,
+			    (struct sockaddr *)&ss, &fromlen);
+	} while (inlen < 0 && errno == EINTR);
+	if (inlen < 0) {
+		if (debugging)
+			fprintf(stderr,
+	"handle_reply:  recvfrom returned %d, errno %d\n", inlen, errno);
+		goto done;
+	}
+
+	reply_msg.acpted_rply.ar_verf = _null_auth;
+	reply_msg.acpted_rply.ar_results.where = 0;
+	reply_msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
+
+	xdrmem_create(&reply_xdrs, buffer, (u_int)inlen, XDR_DECODE);
+	if (!xdr_replymsg(&reply_xdrs, &reply_msg)) {
+		if (debugging)
+			(void) fprintf(stderr,
+				"handle_reply:  xdr_replymsg failed\n");
+		goto done;
+	}
+	fi = forward_find(reply_msg.rm_xid);
+#ifdef	SVC_RUN_DEBUG
+	if (debugging) {
+		fprintf(stderr, "handle_reply:  reply xid: %d fi addr: %p\n",
+			reply_msg.rm_xid, fi);
+	}
+#endif
+	if (fi == NULL) {
+		goto done;
+	}
+	_seterr_reply(&reply_msg, &reply_error);
+	if (reply_error.re_status != RPC_SUCCESS) {
+		if (debugging)
+			(void) fprintf(stderr, "handle_reply:  %s\n",
+				clnt_sperrno(reply_error.re_status));
+		send_svcsyserr(xprt, fi);
+		goto done;
+	}
+	pos = XDR_GETPOS(&reply_xdrs);
+	len = inlen - pos;
+	a.rmt_args.args = &buffer[pos];
+	a.rmt_args.arglen = len;
+	a.rmt_uaddr = fi->uaddr;
+	a.rmt_localvers = fi->versnum;
+
+	xprt_set_caller(xprt, fi);
+#ifdef	SVC_RUN_DEBUG
+	uaddr =	taddr2uaddr(rpcbind_get_conf("udp"),
+				    svc_getrpccaller(xprt));
+	if (debugging) {
+		fprintf(stderr, "handle_reply:  forwarding address %s to %s\n",
+			a.rmt_uaddr, uaddr ? uaddr : rpcbind_unknown);
+	}
+	if (uaddr)
+		free((void *) uaddr);
+#endif
+	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
+done:
+	if (buffer)
+		free(buffer);
+
+	if (reply_msg.rm_xid == 0) {
+#ifdef	SVC_RUN_DEBUG
+	if (debugging) {
+		fprintf(stderr, "handle_reply:  NULL xid on exit!\n");
+	}
+#endif
+	} else
+		(void) free_slot_by_xid(reply_msg.rm_xid);
+	return;
+}
+
+static void
+find_versions(rpcprog_t prog, char *netid, rpcvers_t *lowvp, rpcvers_t *highvp)
+{
+	register rpcblist_ptr rbl;
+	int lowv = 0;
+	int highv = 0;
+
+	for (rbl = list_rbl; rbl != NULL; rbl = rbl->rpcb_next) {
+		if ((rbl->rpcb_map.r_prog != prog) ||
+		    ((rbl->rpcb_map.r_netid != NULL) &&
+			(strcasecmp(rbl->rpcb_map.r_netid, netid) != 0)))
+			continue;
+		if (lowv == 0) {
+			highv = rbl->rpcb_map.r_vers;
+			lowv = highv;
+		} else if (rbl->rpcb_map.r_vers < lowv) {
+			lowv = rbl->rpcb_map.r_vers;
+		} else if (rbl->rpcb_map.r_vers > highv) {
+			highv = rbl->rpcb_map.r_vers;
+		}
+	}
+	*lowvp = lowv;
+	*highvp = highv;
+	return;
+}
+
+/*
+ * returns the item with the given program, version number and netid.
+ * If that version number is not found, it returns the item with that
+ * program number, so that address is now returned to the caller. The
+ * caller when makes a call to this program, version number, the call
+ * will fail and it will return with PROGVERS_MISMATCH. The user can
+ * then determine the highest and the lowest version number for this
+ * program using clnt_geterr() and use those program version numbers.
+ *
+ * Returns the RPCBLIST for the given prog, vers and netid
+ */
+static rpcblist_ptr
+find_service(rpcprog_t prog, rpcvers_t vers, char *netid)
+{
+	register rpcblist_ptr hit = NULL;
+	register rpcblist_ptr rbl;
+
+	for (rbl = list_rbl; rbl != NULL; rbl = rbl->rpcb_next) {
+		if ((rbl->rpcb_map.r_prog != prog) ||
+		    ((rbl->rpcb_map.r_netid != NULL) &&
+			(strcasecmp(rbl->rpcb_map.r_netid, netid) != 0)))
+			continue;
+		hit = rbl;
+		if (rbl->rpcb_map.r_vers == vers)
+			break;
+	}
+	return (hit);
+}
+
+/*
+ * Copies the name associated with the uid of the caller and returns
+ * a pointer to it.  Similar to getwd().
+ */
+static char *
+getowner(SVCXPRT *transp, char *owner, size_t ownersize)
+{
+	struct sockcred *sc;
+
+	sc = __svc_getcallercreds(transp);
+	if (sc == NULL)
+		strlcpy(owner, rpcbind_unknown, ownersize);
+	else if (sc->sc_uid == 0)
+		strlcpy(owner, rpcbind_superuser, ownersize);
+	else
+		snprintf(owner, ownersize, "%d", sc->sc_uid);
+
+	return owner;
+}
+
+#ifdef PORTMAP
+/*
+ * Add this to the pmap list only if it is UDP or TCP.
+ */
+static int
+add_pmaplist(RPCB *arg)
+{
+	struct pmap pmap;
+	struct pmaplist *pml;
+	int h1, h2, h3, h4, p1, p2;
+
+	if (strcmp(arg->r_netid, udptrans) == 0) {
+		/* It is UDP! */
+		pmap.pm_prot = IPPROTO_UDP;
+	} else if (strcmp(arg->r_netid, tcptrans) == 0) {
+		/* It is TCP */
+		pmap.pm_prot = IPPROTO_TCP;
+	} else
+		/* Not a IP protocol */
+		return (0);
+
+	/* interpret the universal address for TCP/IP */
+	if (sscanf(arg->r_addr, "%d.%d.%d.%d.%d.%d",
+		&h1, &h2, &h3, &h4, &p1, &p2) != 6)
+		return (0);
+	pmap.pm_port = ((p1 & 0xff) << 8) + (p2 & 0xff);
+	pmap.pm_prog = arg->r_prog;
+	pmap.pm_vers = arg->r_vers;
+	/*
+	 * add to END of list
+	 */
+	pml = (struct pmaplist *) malloc((u_int)sizeof (struct pmaplist));
+	if (pml == NULL) {
+		(void) syslog(LOG_ERR, "rpcbind: no memory!\n");
+		return (1);
+	}
+	pml->pml_map = pmap;
+	pml->pml_next = NULL;
+	if (list_pml == NULL) {
+		list_pml = pml;
+	} else {
+		struct pmaplist *fnd;
+
+		/* Attach to the end of the list */
+		for (fnd = list_pml; fnd->pml_next; fnd = fnd->pml_next)
+			;
+		fnd->pml_next = pml;
+	}
+	return (0);
+}
+
+/*
+ * Delete this from the pmap list only if it is UDP or TCP.
+ */
+static int
+del_pmaplist(RPCB *arg)
+{
+	struct pmaplist *pml;
+	struct pmaplist *prevpml, *fnd;
+	long prot;
+
+	if (strcmp(arg->r_netid, udptrans) == 0) {
+		/* It is UDP! */
+		prot = IPPROTO_UDP;
+	} else if (strcmp(arg->r_netid, tcptrans) == 0) {
+		/* It is TCP */
+		prot = IPPROTO_TCP;
+	} else if (arg->r_netid[0] == 0) {
+		prot = 0;	/* Remove all occurrences */
+	} else {
+		/* Not a IP protocol */
+		return (0);
+	}
+	for (prevpml = NULL, pml = list_pml; pml; /* cstyle */) {
+		if ((pml->pml_map.pm_prog != arg->r_prog) ||
+			(pml->pml_map.pm_vers != arg->r_vers) ||
+			(prot && (pml->pml_map.pm_prot != prot))) {
+			/* both pml & prevpml move forwards */
+			prevpml = pml;
+			pml = pml->pml_next;
+			continue;
+		}
+		/* found it; pml moves forward, prevpml stays */
+		fnd = pml;
+		pml = pml->pml_next;
+		if (prevpml == NULL)
+			list_pml = pml;
+		else
+			prevpml->pml_next = pml;
+		free((void *) fnd);
+	}
+	return (0);
+}
+#endif /* PORTMAP */
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.8 b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.8
new file mode 100644
index 000000000000..c77f1d5e8631
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.8
@@ -0,0 +1,127 @@
+.\" $NetBSD: rpcbind.8,v 1.1 2010/07/26 15:53:00 pooka Exp $
+.\" @(#)rpcbind.1m 1.19 92/09/14 SMI; from SVr4
+.\" Copyright 1989 AT&T
+.\" Copyright 1991 Sun Microsystems, Inc.
+.Dd October 19, 2008
+.Dt RPCBIND 8
+.Sh NAME
+.Nm rpcbind
+.Nd universal addresses to RPC program number mapper
+.Sh SYNOPSIS
+.Nm
+.Op Fl dilLs
+.Sh DESCRIPTION
+.Nm
+is a server that converts
+.Tn RPC
+program numbers into
+universal addresses.
+It must be running on the host to be able to make
+.Tn RPC
+calls
+on a server on that machine.
+.Pp
+When an
+.Tn RPC
+service is started,
+it tells
+.Nm
+the address at which it is listening,
+and the
+.Tn RPC
+program numbers it is prepared to serve.
+When a client wishes to make an
+.Tn RPC
+call to a given program number,
+it first contacts
+.Nm
+on the server machine to determine
+the address where
+.Tn RPC
+requests should be sent.
+.Pp
+.Nm
+should be started before any other RPC service.
+Normally, standard
+.Tn RPC
+servers are started by port monitors, so
+.Nm
+must be started before port monitors are invoked.
+.Pp
+When
+.Nm
+is started, it checks that certain name-to-address
+translation-calls function correctly.
+If they fail, the network configuration databases may be corrupt.
+Since
+.Tn RPC
+services cannot function correctly in this situation,
+.Nm
+reports the condition and terminates.
+.Pp
+.Nm
+can only be started by the super-user.
+.Pp
+Access control is provided by
+.Pa /etc/hosts.allow
+and
+.Pa /etc/hosts.deny ,
+as described in
+.Xr hosts_access 5
+with daemon name
+.Nm .
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl d
+Run in debug mode.
+In this mode,
+.Nm
+will not fork when it starts, will print additional information
+during operation, and will abort on certain errors.
+With this option, the name-to-address translation consistency
+checks are shown in detail.
+.It Fl i
+.Dq insecure
+mode.
+Allows calls to SET and UNSET from any host.
+Normally
+.Nm
+accepts these requests only from the loopback interface for security reasons.
+This change is necessary for programs that were compiled with earlier
+versions of the rpc library and do not make those requests using the
+loopback interface.
+.It Fl l
+Turns on libwrap connection logging.
+.It Fl s
+Causes
+.Nm
+to change to the user daemon as soon as possible.
+This causes
+.Nm
+to use non-privileged ports for outgoing connections, preventing non-privileged
+clients from using
+.Nm
+to connect to services from a privileged port.
+.It Fl L
+Allow old-style local connections over the loopback interface.
+Without this flag, local connections are only allowed over a local socket,
+.Pa /var/run/rpcbind.sock
+.El
+.Sh NOTES
+All RPC servers must be restarted if
+.Nm
+is restarted.
+.Sh FILES
+.Bl -tag -width "/var/run/rpcbind.sock" -compact
+.It Pa /var/run/rpcbind.sock
+.It Pa /etc/hosts.allow
+explicit remote host access list.
+.It Pa /etc/hosts.deny
+explicit remote host denial of service list.
+.El
+.Sh SEE ALSO
+.Xr rpcbind 3 ,
+.Xr hosts_access 5 ,
+.Xr hosts_options 5 ,
+.Xr netconfig 5 ,
+.Xr rpcinfo 8
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
new file mode 100644
index 000000000000..492b0b676a85
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
@@ -0,0 +1,613 @@
+/*	$NetBSD: rpcbind.c,v 1.4 2013/10/19 17:45:00 christos Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)rpcbind.c	1.19	94/04/25 SMI" */
+
+#if 0
+#ifndef lint
+static	char sccsid[] = "@(#)rpcbind.c 1.35 89/04/21 Copyr 1984 Sun Micro";
+#endif
+#endif
+
+/*
+ * rpcbind.c
+ * Implements the program, version to address mapping for rpc.
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <rpc/rpc.h>
+#ifdef PORTMAP
+#include <netinet/in.h>
+#endif
+#include <netdb.h>
+#include <stdio.h>
+#include <netconfig.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <err.h>
+#include <util.h>
+#include <pwd.h>
+#include <semaphore.h>
+#include <string.h>
+#include <errno.h>
+#include "rpcbind.h"
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+/* Global variables */
+int debugging = 1;	/* Tell me what's going on */
+int doabort = 0;	/* When debugging, do an abort on errors */
+rpcblist_ptr list_rbl;	/* A list of version 3/4 rpcbind services */
+
+#include "svc_fdset.h"
+
+/* who to suid to if -s is given */
+#define RUN_AS  "daemon"
+
+int runasdaemon = 0;
+int insecure = 0;
+int oldstyle_local = 0;
+int verboselog = 0;
+
+#ifdef WARMSTART
+/* Local Variable */
+static int warmstart = 0;	/* Grab a old copy of registrations */
+#endif
+
+#ifdef PORTMAP
+struct pmaplist *list_pml;	/* A list of version 2 rpcbind services */
+const char *udptrans;		/* Name of UDP transport */
+const char *tcptrans;		/* Name of TCP transport */
+const char *udp_uaddr;		/* Universal UDP address */
+const char *tcp_uaddr;		/* Universal TCP address */
+#endif
+static const char servname[] = "sunrpc";
+
+const char rpcbind_superuser[] = "superuser";
+const char rpcbind_unknown[] = "unknown";
+
+static int init_transport(struct netconfig *);
+static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
+    struct netbuf *);
+static void terminate(int);
+#if 0
+static void parseargs(int, char *[]);
+#endif
+
+int rpcbind_main(void *);
+int
+rpcbind_main(void *arg)
+{
+	struct netconfig *nconf;
+	void *nc_handle;	/* Net config handle */
+	struct rlimit rl;
+	int maxrec = RPC_MAXDATASIZE;
+	extern sem_t gensem;
+
+#if 0
+	parseargs(argc, argv);
+#endif
+
+	alloc_fdset();
+
+	getrlimit(RLIMIT_NOFILE, &rl);
+	if (rl.rlim_cur < 128) {
+		if (rl.rlim_max <= 128)
+			rl.rlim_cur = rl.rlim_max;
+		else
+			rl.rlim_cur = 128;
+		setrlimit(RLIMIT_NOFILE, &rl);
+	}
+#if 0
+	if (geteuid()) /* This command allowed only to root */
+		errx(1, "Sorry. You are not superuser");
+#endif
+	nc_handle = setnetconfig(); 	/* open netconfig file */
+	if (nc_handle == NULL)
+		errx(1, "could not read /etc/netconfig");
+#ifdef PORTMAP
+	udptrans = "";
+	tcptrans = "";
+#endif
+
+	nconf = getnetconfigent("local");
+	if (nconf == NULL)
+		errx(1, "can't find local transport");
+
+	rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrec);
+
+	init_transport(nconf);
+
+	while ((nconf = getnetconfig(nc_handle))) {
+		if (nconf->nc_flag & NC_VISIBLE)
+			init_transport(nconf);
+	}
+	endnetconfig(nc_handle);
+
+	/* catch the usual termination signals for graceful exit */
+	(void) signal(SIGCHLD, reap);
+	(void) signal(SIGINT, terminate);
+	(void) signal(SIGTERM, terminate);
+	(void) signal(SIGQUIT, terminate);
+	/* ignore others that could get sent */
+	(void) signal(SIGPIPE, SIG_IGN);
+	//(void) signal(SIGHUP, SIG_IGN); used by mountd
+	(void) signal(SIGUSR1, SIG_IGN);
+	(void) signal(SIGUSR2, SIG_IGN);
+#ifdef WARMSTART
+	if (warmstart) {
+		read_warmstart();
+	}
+#endif
+	if (debugging) {
+		printf("rpcbind debugging enabled.");
+		if (doabort) {
+			printf("  Will abort on errors!\n");
+		} else {
+			printf("\n");
+		}
+	} else {
+		if (daemon(0, 0))
+			err(1, "fork failed");
+	}
+
+	openlog("rpcbind", 0, LOG_DAEMON);
+	pidfile(NULL);
+
+	if (runasdaemon) {
+		struct passwd *p;
+
+		if((p = getpwnam(RUN_AS)) == NULL) {
+			syslog(LOG_ERR, "cannot get uid of daemon: %m");
+			exit(1);
+		}
+		if (setuid(p->pw_uid) == -1) {
+			syslog(LOG_ERR, "setuid to daemon failed: %m");
+			exit(1);
+		}
+	}
+
+	network_init();
+
+	sem_post(&gensem);
+	my_svc_run();
+	syslog(LOG_ERR, "svc_run returned unexpectedly");
+	rpcbind_abort();
+	/* NOTREACHED */
+
+	return 0;
+}
+
+/*
+ * Adds the entry into the rpcbind database.
+ * If PORTMAP, then for UDP and TCP, it adds the entries for version 2 also
+ * Returns 0 if succeeds, else fails
+ */
+static int
+init_transport(struct netconfig *nconf)
+{
+	int fd;
+	struct t_bind taddr;
+	struct addrinfo hints, *res = NULL;
+	struct __rpc_sockinfo si;
+	SVCXPRT	*my_xprt;
+	int aicode, status, addrlen;
+	struct sockaddr *sa;
+	struct sockaddr_un sun;
+	const int one = 1;
+
+	if ((nconf->nc_semantics != NC_TPI_CLTS) &&
+		(nconf->nc_semantics != NC_TPI_COTS) &&
+		(nconf->nc_semantics != NC_TPI_COTS_ORD))
+		return 1;	/* not my type */
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		int i;
+		char **s;
+
+		(void)fprintf(stderr, "%s: %ld lookup routines :\n",
+		    nconf->nc_netid, nconf->nc_nlookups);
+		for (i = 0, s = nconf->nc_lookups; i < nconf->nc_nlookups;
+		     i++, s++)
+			(void)fprintf(stderr, "[%d] - %s\n", i, *s);
+	}
+#endif
+
+	/*
+	 * XXX - using RPC library internal functions.
+	 */
+	if ((fd = __rpc_nconf2fd(nconf)) < 0) {
+		if (errno == EAFNOSUPPORT)
+			return 1;
+		warn("Cannot create socket for `%s'", nconf->nc_netid);
+		return 1;
+	}
+
+	if (!__rpc_nconf2sockinfo(nconf, &si)) {
+		warnx("Cannot get information for `%s'", nconf->nc_netid);
+		return 1;
+	}
+
+	if (si.si_af == AF_INET6) {
+		/*
+		 * We're doing host-based access checks here, so don't allow
+		 * v4-in-v6 to confuse things.
+		 */
+		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
+		    sizeof one) < 0) {
+			warn("Can't make socket ipv6 only");
+			return 1;
+		}
+	}
+
+
+	if (!strcmp(nconf->nc_netid, "local")) {
+		(void)memset(&sun, 0, sizeof sun);
+		sun.sun_family = AF_LOCAL;
+		(void)rump_sys_unlink(_PATH_RPCBINDSOCK);
+		(void)strlcpy(sun.sun_path, _PATH_RPCBINDSOCK,
+		    sizeof(sun.sun_path));
+		sun.sun_len = SUN_LEN(&sun);
+		addrlen = sizeof(struct sockaddr_un);
+		sa = (struct sockaddr *)&sun;
+	} else {
+		/* Get rpcbind's address on this transport */
+
+		(void)memset(&hints, 0, sizeof hints);
+		hints.ai_flags = AI_PASSIVE;
+		hints.ai_family = si.si_af;
+		hints.ai_socktype = si.si_socktype;
+		hints.ai_protocol = si.si_proto;
+		if ((aicode = getaddrinfo(NULL, servname, &hints, &res)) != 0) {
+			warnx("Cannot get local address for `%s' (%s)",
+			    nconf->nc_netid, gai_strerror(aicode));
+			return 1;
+		}
+		addrlen = res->ai_addrlen;
+		sa = (struct sockaddr *)res->ai_addr;
+	}
+
+	if (bind(fd, sa, addrlen) < 0) {
+		warn("Cannot bind `%s'", nconf->nc_netid);
+		if (res != NULL)
+			freeaddrinfo(res);
+		return 1;
+	}
+#if 0
+	if (sa->sa_family == AF_LOCAL)
+		if (rump_sys_chmod(sun.sun_path, S_IRWXU|S_IRWXG|S_IRWXO) == -1)
+			warn("Cannot chmod `%s'", sun.sun_path);
+#endif
+
+	/* Copy the address */
+	taddr.addr.len = taddr.addr.maxlen = addrlen;
+	taddr.addr.buf = malloc(addrlen);
+	if (taddr.addr.buf == NULL) {
+		warn("Cannot allocate memory for `%s' address",
+		    nconf->nc_netid);
+		if (res != NULL)
+			freeaddrinfo(res);
+		return 1;
+	}
+	(void)memcpy(taddr.addr.buf, sa, addrlen);
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		/* for debugging print out our universal address */
+		char *uaddr;
+		struct netbuf nb;
+
+		nb.buf = sa;
+		nb.len = nb.maxlen = sa->sa_len;
+		uaddr = taddr2uaddr(nconf, &nb);
+		(void)fprintf(stderr, "rpcbind: my address is %s\n", uaddr);
+		(void)free(uaddr);
+	}
+#endif
+
+	if (res != NULL)
+		freeaddrinfo(res);
+
+	if (nconf->nc_semantics != NC_TPI_CLTS)
+		listen(fd, SOMAXCONN);
+		
+	my_xprt = (SVCXPRT *)svc_tli_create(fd, nconf, &taddr, RPC_MAXDATASIZE,
+	    RPC_MAXDATASIZE);
+	if (my_xprt == NULL) {
+		warnx("Could not create service for `%s'", nconf->nc_netid);
+		goto error;
+	}
+
+#ifdef PORTMAP
+	/*
+	 * Register both the versions for tcp/ip, udp/ip and local.
+	 */
+	if ((strcmp(nconf->nc_protofmly, NC_INET) == 0 &&
+		(strcmp(nconf->nc_proto, NC_TCP) == 0 ||
+		strcmp(nconf->nc_proto, NC_UDP) == 0)) ||
+		strcmp(nconf->nc_netid, "local") == 0) {
+		struct pmaplist *pml;
+
+		if (!svc_register(my_xprt, PMAPPROG, PMAPVERS,
+			pmap_service, 0)) {
+			warn("Could not register on `%s'", nconf->nc_netid);
+			goto error;
+		}
+		pml = malloc(sizeof (struct pmaplist));
+		if (pml == NULL) {
+			warn("Cannot allocate memory");
+			goto error;
+		}
+		pml->pml_map.pm_prog = PMAPPROG;
+		pml->pml_map.pm_vers = PMAPVERS;
+		pml->pml_map.pm_port = PMAPPORT;
+		if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
+			if (tcptrans[0]) {
+				warnx(
+				    "Cannot have more than one TCP transport");
+				free(pml);
+				goto error;
+			}
+			tcptrans = strdup(nconf->nc_netid);
+			if (tcptrans == NULL) {
+				free(pml);
+				warn("Cannot allocate memory");
+				goto error;
+			}
+			pml->pml_map.pm_prot = IPPROTO_TCP;
+
+			/* Let's snarf the universal address */
+			/* "h1.h2.h3.h4.p1.p2" */
+			tcp_uaddr = taddr2uaddr(nconf, &taddr.addr);
+		} else if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
+			if (udptrans[0]) {
+				free(pml);
+				warnx(
+				"Cannot have more than one UDP transport");
+				goto error;
+			}
+			udptrans = strdup(nconf->nc_netid);
+			if (udptrans == NULL) {
+				free(pml);
+				warn("Cannot allocate memory");
+				goto error;
+			}
+			pml->pml_map.pm_prot = IPPROTO_UDP;
+
+			/* Let's snarf the universal address */
+			/* "h1.h2.h3.h4.p1.p2" */
+			udp_uaddr = taddr2uaddr(nconf, &taddr.addr);
+		}
+		pml->pml_next = list_pml;
+		list_pml = pml;
+
+		/* Add version 3 information */
+		pml = malloc(sizeof (struct pmaplist));
+		if (pml == NULL) {
+			warn("Cannot allocate memory");
+			goto error;
+		}
+		pml->pml_map = list_pml->pml_map;
+		pml->pml_map.pm_vers = RPCBVERS;
+		pml->pml_next = list_pml;
+		list_pml = pml;
+
+		/* Add version 4 information */
+		pml = malloc(sizeof (struct pmaplist));
+		if (pml == NULL) {
+			warn("Cannot allocate memory");
+			goto error;
+		}
+		pml->pml_map = list_pml->pml_map;
+		pml->pml_map.pm_vers = RPCBVERS4;
+		pml->pml_next = list_pml;
+		list_pml = pml;
+
+		/* Also add version 2 stuff to rpcbind list */
+		rbllist_add(PMAPPROG, PMAPVERS, nconf, &taddr.addr);
+	}
+#endif
+
+	/* version 3 registration */
+	if (!svc_reg(my_xprt, RPCBPROG, RPCBVERS, rpcb_service_3, NULL)) {
+		warn("Could not register %s version 3", nconf->nc_netid);
+		goto error;
+	}
+	rbllist_add(RPCBPROG, RPCBVERS, nconf, &taddr.addr);
+
+	/* version 4 registration */
+	if (!svc_reg(my_xprt, RPCBPROG, RPCBVERS4, rpcb_service_4, NULL)) {
+		warn("Could not register %s version 4", nconf->nc_netid);
+		goto error;
+	}
+	rbllist_add(RPCBPROG, RPCBVERS4, nconf, &taddr.addr);
+
+	/* decide if bound checking works for this transport */
+	status = add_bndlist(nconf, &taddr.addr);
+#ifdef RPCBIND_DEBUG
+	if (debugging) {
+		if (status < 0) {
+			fprintf(stderr, "Error in finding bind status for %s\n",
+				nconf->nc_netid);
+		} else if (status == 0) {
+			fprintf(stderr, "check binding for %s\n",
+				nconf->nc_netid);
+		} else if (status > 0) {
+			fprintf(stderr, "No check binding for %s\n",
+				nconf->nc_netid);
+		}
+	}
+#else
+	__USE(status);
+#endif
+	/*
+	 * rmtcall only supported on CLTS transports for now.
+	 */
+	if (nconf->nc_semantics == NC_TPI_CLTS) {
+		status = create_rmtcall_fd(nconf);
+
+#ifdef RPCBIND_DEBUG
+		if (debugging) {
+			if (status < 0) {
+				fprintf(stderr,
+				    "Could not create rmtcall fd for %s\n",
+					nconf->nc_netid);
+			} else {
+				fprintf(stderr, "rmtcall fd for %s is %d\n",
+					nconf->nc_netid, status);
+			}
+		}
+#endif
+	}
+	return (0);
+error:
+	(void)rump_sys_close(fd);
+	return (1);
+}
+
+static void
+rbllist_add(rpcprog_t prog, rpcvers_t vers, struct netconfig *nconf,
+	    struct netbuf *addr)
+{
+	rpcblist_ptr rbl;
+
+	rbl = malloc(sizeof(rpcblist));
+	if (rbl == NULL) {
+		warn("Out of memory");
+		return;
+	}
+
+	rbl->rpcb_map.r_prog = prog;
+	rbl->rpcb_map.r_vers = vers;
+	rbl->rpcb_map.r_netid = strdup(nconf->nc_netid);
+	rbl->rpcb_map.r_addr = taddr2uaddr(nconf, addr);
+	rbl->rpcb_map.r_owner = strdup(rpcbind_superuser);
+	rbl->rpcb_next = list_rbl;	/* Attach to global list */
+	list_rbl = rbl;
+}
+
+/*
+ * Catch the signal and die
+ */
+static void
+terminate(int dummy)
+{
+#ifdef WARMSTART
+	syslog(LOG_ERR,
+		"rpcbind terminating on signal. Restart with \"rpcbind -w\"");
+	write_warmstart();	/* Dump yourself */
+#endif
+	exit(2);
+}
+
+void
+rpcbind_abort()
+{
+#ifdef WARMSTART
+	write_warmstart();	/* Dump yourself */
+#endif
+	abort();
+}
+
+#if 0
+/* get command line options */
+static void
+parseargs(int argc, char *argv[])
+{
+	int c;
+
+	while ((c = getopt(argc, argv, "dwailLs")) != -1) {
+		switch (c) {
+		case 'a':
+			doabort = 1;	/* when debugging, do an abort on */
+			break;		/* errors; for rpcbind developers */
+					/* only! */
+		case 'd':
+			debugging = 1;
+			break;
+		case 'i':
+			insecure = 1;
+			break;
+		case 'L':
+			oldstyle_local = 1;
+			break;
+		case 'l':
+			verboselog = 1;
+			break;
+		case 's':
+			runasdaemon = 1;
+			break;
+#ifdef WARMSTART
+		case 'w':
+			warmstart = 1;
+			break;
+#endif
+		default:	/* error */
+			fprintf(stderr,	"usage: rpcbind [-Idwils]\n");
+			exit (1);
+		}
+	}
+	if (doabort && !debugging) {
+	    fprintf(stderr,
+		"-a (abort) specified without -d (debugging) -- ignored.\n");
+	    doabort = 0;
+	}
+}
+#endif
+
+void
+reap(int dummy)
+{
+	int save_errno = errno;
+ 
+	while (wait3(NULL, WNOHANG, NULL) > 0)
+		;       
+	errno = save_errno;
+}
+
+void
+toggle_verboselog(int dummy)
+{
+	verboselog = !verboselog;
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.h b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.h
new file mode 100644
index 000000000000..1717e31643b1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/rpcbind.h
@@ -0,0 +1,146 @@
+/*	$NetBSD: rpcbind.h,v 1.1 2010/07/26 15:53:00 pooka Exp $	*/
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ * 
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ * 
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ * 
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ * 
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+/*
+ * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
+ */
+
+/* #ident	"@(#)rpcbind.h 1.4 90/04/12 SMI" */
+
+/*
+ * rpcbind.h
+ * The common header declarations
+ */
+
+#ifndef rpcbind_h
+#define	rpcbind_h
+
+#ifdef PORTMAP
+#include <rpc/pmap_prot.h>
+#endif
+#include <rpc/rpcb_prot.h>
+
+/*
+ * Stuff for the rmtcall service
+ */
+struct encap_parms {
+	u_int32_t arglen;
+	char *args;
+};
+
+struct r_rmtcall_args {
+	u_int32_t  rmt_prog;
+	u_int32_t  rmt_vers;
+	u_int32_t  rmt_proc;
+	int     rmt_localvers;  /* whether to send port # or uaddr */
+	char    *rmt_uaddr;
+	struct encap_parms rmt_args;
+};
+
+extern int debugging;
+extern int doabort;
+extern int verboselog;
+extern int insecure;
+extern int oldstyle_local;
+extern rpcblist_ptr list_rbl;	/* A list of version 3 & 4 rpcbind services */
+
+#ifdef PORTMAP
+extern struct pmaplist *list_pml; /* A list of version 2 rpcbind services */
+extern const char *udptrans;	/* Name of UDP transport */
+extern const char *tcptrans;	/* Name of TCP transport */
+extern const char *udp_uaddr;	/* Universal UDP address */
+extern const char *tcp_uaddr;	/* Universal TCP address */
+#endif
+
+extern const char rpcbind_superuser[];
+extern const char rpcbind_unknown[];
+
+int add_bndlist(struct netconfig *, struct netbuf *);
+bool_t is_bound(const char *, const char *);
+char *mergeaddr(SVCXPRT *, char *, char *, char *);
+struct netconfig *rpcbind_get_conf(const char *);
+
+void rpcbs_init(void); 
+void rpcbs_procinfo(rpcvers_t, rpcproc_t);
+void rpcbs_set(rpcvers_t, bool_t);
+void rpcbs_unset(rpcvers_t, bool_t);
+void rpcbs_getaddr(rpcvers_t, rpcprog_t, rpcvers_t, const char *, const char *);
+void rpcbs_rmtcall(rpcvers_t, rpcproc_t, rpcprog_t, rpcvers_t, rpcproc_t,
+			char *, rpcblist_ptr);
+void *rpcbproc_getstat(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+
+void rpcb_service_3(struct svc_req *, SVCXPRT *);
+void rpcb_service_4(struct svc_req *, SVCXPRT *);
+
+/* Common functions shared between versions */
+void *rpcbproc_set_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+void *rpcbproc_unset_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+bool_t map_set(RPCB *, char *);
+bool_t map_unset(RPCB *, const char *);
+void delete_prog(int);
+void *rpcbproc_getaddr_com(RPCB *, struct svc_req *, SVCXPRT *, rpcvers_t,
+				 rpcvers_t);
+void *rpcbproc_gettime_com(void *, struct svc_req *, SVCXPRT *,
+				rpcvers_t);
+void *rpcbproc_uaddr2taddr_com(void *, struct svc_req *,
+					     SVCXPRT *, rpcvers_t);
+void *rpcbproc_taddr2uaddr_com(void *, struct svc_req *, SVCXPRT *,
+				    rpcvers_t);
+int create_rmtcall_fd(struct netconfig *);
+void rpcbproc_callit_com(struct svc_req *, SVCXPRT *, rpcvers_t,
+			      rpcvers_t);
+void my_svc_run(void);
+
+void rpcbind_abort(void);
+void reap(int);
+void toggle_verboselog(int);
+
+int check_access(SVCXPRT *, rpcproc_t, void *, int);
+int check_callit(SVCXPRT *, struct r_rmtcall_args *, int);
+void logit(int, struct sockaddr *, rpcproc_t, rpcprog_t, const char *);
+int is_loopback(struct netbuf *);
+
+#ifdef PORTMAP
+extern void pmap_service(struct svc_req *, SVCXPRT *);
+#endif
+
+void write_warmstart(void);
+void read_warmstart(void);
+
+char *addrmerge(struct netbuf *caller, char *serv_uaddr, char *clnt_uaddr,
+		     char *netid);
+void network_init(void);
+struct sockaddr *local_sa(int);
+
+/* For different getaddr semantics */
+#define	RPCB_ALLVERS 0
+#define	RPCB_ONEVERS 1
+
+#endif /* rpcbind_h */
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/security.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/security.c
new file mode 100644
index 000000000000..755c0d3ffe30
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/security.c
@@ -0,0 +1,282 @@
+/*	$NetBSD: security.c,v 1.1 2010/07/26 15:53:01 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <rpc/rpc.h>
+#include <rpc/rpcb_prot.h>
+#include <rpc/pmap_prot.h>
+#include <err.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+#include <syslog.h>
+#include <netdb.h>
+
+/*
+ * XXX for special case checks in check_callit.
+ */
+#include <rpcsvc/mount.h>
+#include <rpcsvc/rquota.h>
+#include <rpcsvc/nfs_prot.h>
+#include <rpcsvc/yp.h>
+#include <rpcsvc/ypclnt.h>
+#include <rpcsvc/yppasswd.h>
+
+#include "rpcbind.h"
+
+#ifdef LIBWRAP
+# include <tcpd.h>
+#ifndef LIBWRAP_ALLOW_FACILITY
+# define LIBWRAP_ALLOW_FACILITY LOG_AUTH
+#endif
+#ifndef LIBWRAP_ALLOW_SEVERITY
+# define LIBWRAP_ALLOW_SEVERITY LOG_INFO
+#endif
+#ifndef LIBWRAP_DENY_FACILITY
+# define LIBWRAP_DENY_FACILITY LOG_AUTH
+#endif
+#ifndef LIBWRAP_DENY_SEVERITY
+# define LIBWRAP_DENY_SEVERITY LOG_WARNING
+#endif
+int allow_severity = LIBWRAP_ALLOW_FACILITY|LIBWRAP_ALLOW_SEVERITY;
+int deny_severity = LIBWRAP_DENY_FACILITY|LIBWRAP_DENY_SEVERITY;
+#endif
+
+#ifndef PORTMAP_LOG_FACILITY
+# define PORTMAP_LOG_FACILITY LOG_AUTH
+#endif
+#ifndef PORTMAP_LOG_SEVERITY
+# define PORTMAP_LOG_SEVERITY LOG_INFO
+#endif
+int log_severity = PORTMAP_LOG_FACILITY|PORTMAP_LOG_SEVERITY;
+
+extern int verboselog;
+
+int 
+check_access(SVCXPRT *xprt, rpcproc_t proc, void *args, int rpcbvers)
+{
+	struct netbuf *caller = svc_getrpccaller(xprt);
+	struct sockaddr *addr = (struct sockaddr *)caller->buf;
+#ifdef LIBWRAP
+	struct request_info req;
+#endif
+	rpcprog_t prog = 0;
+	rpcb *rpcbp;
+	struct pmap *pmap;
+
+	/*
+	 * The older PMAP_* equivalents have the same numbers, so
+	 * they are accounted for here as well.
+	 */
+	switch (proc) {
+	case RPCBPROC_GETADDR:
+	case RPCBPROC_SET:
+	case RPCBPROC_UNSET:
+		if (rpcbvers > PMAPVERS) {
+			rpcbp = (rpcb *)args;
+			prog = rpcbp->r_prog;
+		} else {
+			pmap = (struct pmap *)args;
+			prog = pmap->pm_prog;
+		}
+		if (proc == RPCBPROC_GETADDR)
+			break;
+		if (!insecure && !is_loopback(caller)) {
+			if (verboselog)
+				logit(log_severity, addr, proc, prog,
+				    " declined (non-loopback sender)");
+			return 0;
+		}
+		break;
+	case RPCBPROC_CALLIT:
+	case RPCBPROC_INDIRECT:
+	case RPCBPROC_DUMP:
+	case RPCBPROC_GETTIME:
+	case RPCBPROC_UADDR2TADDR:
+	case RPCBPROC_TADDR2UADDR:
+	case RPCBPROC_GETVERSADDR:
+	case RPCBPROC_GETADDRLIST:
+	case RPCBPROC_GETSTAT:
+	default:
+		break;
+	}
+
+#ifdef LIBWRAP
+	if (addr->sa_family == AF_LOCAL)
+		return 1;
+	request_init(&req, RQ_DAEMON, "rpcbind", RQ_CLIENT_SIN, addr, 0);
+	sock_methods(&req);
+	if(!hosts_access(&req)) {
+		logit(deny_severity, addr, proc, prog, ": request from unauthorized host");
+		return 0;
+	}
+#endif
+	if (verboselog)
+		logit(log_severity, addr, proc, prog, "");
+    	return 1;
+}
+
+int
+is_loopback(struct netbuf *nbuf)
+{
+	struct sockaddr *addr = (struct sockaddr *)nbuf->buf;
+	struct sockaddr_in *sin;
+#ifdef INET6
+	struct sockaddr_in6 *sin6;
+#endif
+
+	switch (addr->sa_family) {
+	case AF_INET:
+		if (!oldstyle_local)
+			return 0;
+		sin = (struct sockaddr_in *)addr;
+        	return ((sin->sin_addr.s_addr == htonl(INADDR_LOOPBACK)) &&
+		    (ntohs(sin->sin_port) < IPPORT_RESERVED));
+#ifdef INET6
+	case AF_INET6:
+		if (!oldstyle_local)
+			return 0;
+		sin6 = (struct sockaddr_in6 *)addr;
+		return (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr) &&
+		    (ntohs(sin6->sin6_port) < IPV6PORT_RESERVED));
+#endif
+	case AF_LOCAL:
+		return 1;
+	default:
+		break;
+	}
+	
+	return 0;
+}
+
+
+/* logit - report events of interest via the syslog daemon */
+void
+logit(int severity, struct sockaddr *addr, rpcproc_t procnum, rpcprog_t prognum,
+      const char *text)
+{
+	const char *procname;
+	char	procbuf[32];
+	char   *progname;
+	char	progbuf[32];
+	char fromname[NI_MAXHOST];
+	struct rpcent *rpc;
+	static const char *procmap[] = {
+	/* RPCBPROC_NULL */		"null",
+	/* RPCBPROC_SET */		"set",
+	/* RPCBPROC_UNSET */		"unset",
+	/* RPCBPROC_GETADDR */		"getport/addr",
+	/* RPCBPROC_DUMP */		"dump",
+	/* RPCBPROC_CALLIT */		"callit",
+	/* RPCBPROC_GETTIME */		"gettime",
+	/* RPCBPROC_UADDR2TADDR */	"uaddr2taddr",
+	/* RPCBPROC_TADDR2UADDR */	"taddr2uaddr",
+	/* RPCBPROC_GETVERSADDR */	"getversaddr",
+	/* RPCBPROC_INDIRECT */		"indirect",
+	/* RPCBPROC_GETADDRLIST */	"getaddrlist",
+	/* RPCBPROC_GETSTAT */		"getstat"
+	};
+   
+	/*
+	 * Fork off a process or the portmap daemon might hang while
+	 * getrpcbynumber() or syslog() does its thing.
+	 */
+
+	if (fork() == 0) {
+		setproctitle("logit");
+
+		/* Try to map program number to name. */
+
+		if (prognum == 0) {
+			progname = __UNCONST("");
+		} else if ((rpc = getrpcbynumber((int) prognum))) {
+			progname = rpc->r_name;
+		} else {
+			snprintf(progname = progbuf, sizeof(progbuf), "%u",
+			    (unsigned)prognum);
+		}
+
+		/* Try to map procedure number to name. */
+
+		if (procnum >= (sizeof procmap / sizeof (char *))) {
+			snprintf(procbuf, sizeof procbuf, "%u",
+			    (unsigned)procnum);
+			procname = procbuf;
+		} else
+			procname = procmap[procnum];
+
+		/* Write syslog record. */
+
+		if (addr->sa_family == AF_LOCAL)
+			strlcpy(fromname, "local", sizeof(fromname));
+		else
+			getnameinfo(addr, addr->sa_len, fromname,
+			    sizeof fromname, NULL, 0, NI_NUMERICHOST);
+
+		syslog(severity, "connect from %s to %s(%s)%s",
+			fromname, procname, progname, text);
+		_exit(0);
+	}
+}
+
+int
+check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum)
+{
+	struct sockaddr *sa = (struct sockaddr *)svc_getrpccaller(xprt)->buf;
+
+	/*
+	 * Always allow calling NULLPROC
+	 */
+	if (args->rmt_proc == 0)
+		return 1;
+
+	/*
+	 * XXX - this special casing sucks.
+	 */
+	switch (args->rmt_prog) {
+	case RPCBPROG:
+		/*
+		 * Allow indirect calls to ourselves in insecure mode.
+		 * The is_loopback checks aren't useful then anyway.
+		 */
+		if (!insecure)
+			goto deny;
+		break;
+	case MOUNTPROG:
+		if (args->rmt_proc != MOUNTPROC_MNT &&
+		    args->rmt_proc != MOUNTPROC_UMNT)
+			break;
+		goto deny;
+	case YPBINDPROG:
+		if (args->rmt_proc != YPBINDPROC_SETDOM)
+			break;
+		/* FALLTHROUGH */
+	case YPPASSWDPROG:
+	case NFS_PROGRAM:
+	case RQUOTAPROG:
+		goto deny;
+	case YPPROG:
+		switch (args->rmt_proc) {
+		case YPPROC_ALL:
+		case YPPROC_MATCH:
+		case YPPROC_FIRST:
+		case YPPROC_NEXT:
+			goto deny;
+		default:
+			break;
+		}
+	default:
+		break;
+	}
+
+	return 1;
+deny:
+	logit(deny_severity, sa, args->rmt_proc, args->rmt_prog,
+	    ": indirect call not allowed");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/util.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/util.c
new file mode 100644
index 000000000000..f67e98d4d250
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rpcbind/util.c
@@ -0,0 +1,401 @@
+/*	$NetBSD: util.c,v 1.2 2011/06/11 18:03:17 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Frank van der Linden.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/queue.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <assert.h>
+#include <ifaddrs.h>
+#include <poll.h>
+#include <rpc/rpc.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <netconfig.h>
+#include <stdio.h>
+#include <arpa/inet.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "rpcbind.h"
+
+static struct sockaddr_in *local_in4;
+#ifdef INET6
+static struct sockaddr_in6 *local_in6;
+#endif
+
+static int bitmaskcmp(void *, void *, void *, int);
+#ifdef INET6
+static void in6_fillscopeid(struct sockaddr_in6 *);
+#endif
+
+/*
+ * For all bits set in "mask", compare the corresponding bits in
+ * "dst" and "src", and see if they match.
+ */
+static int
+bitmaskcmp(void *dst, void *src, void *mask, int bytelen)
+{
+	int i, j;
+	u_int8_t *p1 = dst, *p2 = src, *netmask = mask;
+	u_int8_t bitmask;
+
+	for (i = 0; i < bytelen; i++) {
+		for (j = 0; j < 8; j++) {
+			bitmask = 1 << j;
+			if (!(netmask[i] & bitmask))
+				continue;
+			if ((p1[i] & bitmask) != (p2[i] & bitmask))
+				return 1;
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * Taken from ifconfig.c
+ */
+#ifdef INET6
+static void
+in6_fillscopeid(struct sockaddr_in6 *sin6)
+{
+        if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
+                sin6->sin6_scope_id =
+                        ntohs(*(u_int16_t *)&sin6->sin6_addr.s6_addr[2]);
+                sin6->sin6_addr.s6_addr[2] = sin6->sin6_addr.s6_addr[3] = 0;
+        }
+}
+#endif
+
+char *
+addrmerge(struct netbuf *caller, char *serv_uaddr, char *clnt_uaddr,
+	  char *netid)
+{
+	struct ifaddrs *ifap, *ifp, *bestif;
+#ifdef INET6
+	struct sockaddr_in6 *servsin6, *sin6mask, *clntsin6, *ifsin6, *realsin6;
+	struct sockaddr_in6 *newsin6;
+#endif
+	struct sockaddr_in *servsin, *sinmask, *clntsin, *newsin, *ifsin;
+	struct netbuf *serv_nbp, *clnt_nbp = NULL, tbuf;
+	struct sockaddr *serv_sa;
+	struct sockaddr *clnt_sa;
+	struct sockaddr_storage ss;
+	struct netconfig *nconf;
+	struct sockaddr *clnt = caller->buf;
+	char *ret = NULL;
+
+#ifdef INET6
+	servsin6 = ifsin6 = newsin6 = NULL;	/* XXXGCC -Wuninitialized */
+#endif
+	servsin = newsin = NULL;		/* XXXGCC -Wuninitialized */
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "addrmerge(caller, %s, %s, %s\n", serv_uaddr,
+		    clnt_uaddr, netid);
+#endif
+	nconf = getnetconfigent(netid);
+	if (nconf == NULL)
+		return NULL;
+
+	/*
+	 * Local merge, just return a duplicate.
+	 */
+	if (clnt_uaddr != NULL && strncmp(clnt_uaddr, "0.0.0.0.", 8) == 0)
+		return strdup(clnt_uaddr);
+
+	serv_nbp = uaddr2taddr(nconf, serv_uaddr);
+	if (serv_nbp == NULL)
+		return NULL;
+
+	serv_sa = (struct sockaddr *)serv_nbp->buf;
+	if (clnt_uaddr != NULL) {
+		clnt_nbp = uaddr2taddr(nconf, clnt_uaddr);
+		if (clnt_nbp == NULL) {
+			free(serv_nbp);
+			return NULL;
+		}
+		clnt_sa = (struct sockaddr *)clnt_nbp->buf;
+		if (clnt_sa->sa_family == AF_LOCAL) {
+			free(serv_nbp);
+			free(clnt_nbp);
+			free(clnt_sa);
+			return strdup(serv_uaddr);
+		}
+	} else {
+		clnt_sa = (struct sockaddr *)
+		    malloc(sizeof (struct sockaddr_storage));
+		memcpy(clnt_sa, clnt, clnt->sa_len);
+	}
+
+	if (getifaddrs(&ifp) < 0) {
+		free(serv_nbp);
+		free(clnt_sa);
+		if (clnt_nbp != NULL)
+			free(clnt_nbp);
+		return 0;
+	}
+
+	/*
+	 * Loop through all interfaces. For each interface, see if the
+	 * network portion of its address is equal to that of the client.
+	 * If so, we have found the interface that we want to use.
+	 */
+	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
+		if (ifap->ifa_addr->sa_family != clnt->sa_family ||
+		    !(ifap->ifa_flags & IFF_UP))
+			continue;
+
+		switch (clnt->sa_family) {
+		case AF_INET:
+			/*
+			 * realsin: address that recvfrom gave us.
+			 * ifsin: address of interface being examined.
+			 * clntsin: address that client want us to contact
+			 *           it on
+			 * servsin: local address of RPC service.
+			 * sinmask: netmask of this interface
+			 * newsin: initially a copy of clntsin, eventually
+			 *         the merged address
+			 */
+			servsin = (struct sockaddr_in *)serv_sa;
+			clntsin = (struct sockaddr_in *)clnt_sa;
+			sinmask = (struct sockaddr_in *)ifap->ifa_netmask;
+			newsin = (struct sockaddr_in *)&ss;
+			ifsin = (struct sockaddr_in *)ifap->ifa_addr;
+			if (!bitmaskcmp(&ifsin->sin_addr, &clntsin->sin_addr,
+			    &sinmask->sin_addr, sizeof (struct in_addr))) {
+				goto found;
+			}
+			break;
+#ifdef INET6
+		case AF_INET6:
+			/*
+			 * realsin6: address that recvfrom gave us.
+			 * ifsin6: address of interface being examined.
+			 * clntsin6: address that client want us to contact
+			 *           it on
+			 * servsin6: local address of RPC service.
+			 * sin6mask: netmask of this interface
+			 * newsin6: initially a copy of clntsin, eventually
+			 *          the merged address
+			 *
+			 * For v6 link local addresses, if the client contacted
+			 * us via a link-local address, and wants us to reply
+			 * to one, use the scope id to see which one.
+			 */
+			realsin6 = (struct sockaddr_in6 *)clnt;
+			ifsin6 = (struct sockaddr_in6 *)ifap->ifa_addr;
+			in6_fillscopeid(ifsin6);
+			clntsin6 = (struct sockaddr_in6 *)clnt_sa;
+			servsin6 = (struct sockaddr_in6 *)serv_sa;
+			sin6mask = (struct sockaddr_in6 *)ifap->ifa_netmask;
+			newsin6 = (struct sockaddr_in6 *)&ss;
+			if (IN6_IS_ADDR_LINKLOCAL(&ifsin6->sin6_addr) &&
+			    IN6_IS_ADDR_LINKLOCAL(&realsin6->sin6_addr) &&
+			    IN6_IS_ADDR_LINKLOCAL(&clntsin6->sin6_addr)) {
+				if (ifsin6->sin6_scope_id !=
+				    realsin6->sin6_scope_id)
+					continue;
+				goto found;
+			}
+			if (!bitmaskcmp(&ifsin6->sin6_addr,
+			    &clntsin6->sin6_addr, &sin6mask->sin6_addr,
+			    sizeof (struct in6_addr)))
+				goto found;
+			break;
+#endif
+		default:
+			goto freeit;
+		}
+	}
+	/*
+	 * Didn't find anything. Get the first possibly useful interface,
+	 * preferring "normal" interfaces to point-to-point and loopback
+	 * ones.
+	 */
+	bestif = NULL;
+	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
+		if (ifap->ifa_addr->sa_family != clnt->sa_family ||
+		    !(ifap->ifa_flags & IFF_UP))
+			continue;
+		if (!(ifap->ifa_flags & IFF_LOOPBACK) &&
+		    !(ifap->ifa_flags & IFF_POINTOPOINT)) {
+			bestif = ifap;
+			break;
+		}
+		if (bestif == NULL)
+			bestif = ifap;
+		else if ((bestif->ifa_flags & IFF_LOOPBACK) &&
+		    !(ifap->ifa_flags & IFF_LOOPBACK))
+			bestif = ifap;
+	}
+	ifap = bestif;
+found:
+	switch (clnt->sa_family) {
+	case AF_INET:
+		memcpy(newsin, ifap->ifa_addr, clnt_sa->sa_len);
+		newsin->sin_port = servsin->sin_port;
+		tbuf.len = clnt_sa->sa_len;
+		tbuf.maxlen = sizeof (struct sockaddr_storage);
+		tbuf.buf = newsin;
+		break;				
+#ifdef INET6
+	case AF_INET6:
+		assert(newsin6);
+		memcpy(newsin6, ifsin6, clnt_sa->sa_len);
+		newsin6->sin6_port = servsin6->sin6_port;
+		tbuf.maxlen = sizeof (struct sockaddr_storage);
+		tbuf.len = clnt_sa->sa_len;
+		tbuf.buf = newsin6;
+		break;
+#endif
+	default:
+		goto freeit;
+	}
+	if (ifap != NULL)
+		ret = taddr2uaddr(nconf, &tbuf);
+freeit:
+	freenetconfigent(nconf);
+	free(serv_sa);
+	free(serv_nbp);
+	if (clnt_sa != NULL)
+		free(clnt_sa);
+	if (clnt_nbp != NULL)
+		free(clnt_nbp);
+	freeifaddrs(ifp);
+
+#ifdef RPCBIND_DEBUG
+	if (debugging)
+		fprintf(stderr, "addrmerge: returning %s\n", ret);
+#endif
+	return ret;
+}
+
+void
+network_init()
+{
+#ifdef INET6
+	struct ifaddrs *ifap, *ifp;
+	struct ipv6_mreq mreq6;
+	int ifindex, s;
+#endif
+	int ecode;
+	struct addrinfo hints, *res;
+
+	memset(&hints, 0, sizeof hints);
+	hints.ai_family = AF_INET;
+	if ((ecode = getaddrinfo(NULL, "sunrpc", &hints, &res))) {
+		if (debugging)
+			fprintf(stderr, "can't get local ip4 address: %s\n",
+			    gai_strerror(ecode));
+	} else {
+		local_in4 = (struct sockaddr_in *)malloc(sizeof *local_in4);
+		if (local_in4 == NULL) {
+			if (debugging)
+				fprintf(stderr, "can't alloc local ip4 addr\n");
+		}
+		memcpy(local_in4, res->ai_addr, sizeof *local_in4);
+	}
+
+#ifdef INET6
+	hints.ai_family = AF_INET6;
+	if ((ecode = getaddrinfo(NULL, "sunrpc", &hints, &res))) {
+		if (debugging)
+			fprintf(stderr, "can't get local ip6 address: %s\n",
+			    gai_strerror(ecode));
+	} else {
+		local_in6 = (struct sockaddr_in6 *)malloc(sizeof *local_in6);
+		if (local_in6 == NULL) {
+			if (debugging)
+				fprintf(stderr, "can't alloc local ip6 addr\n");
+		}
+		memcpy(local_in6, res->ai_addr, sizeof *local_in6);
+	}
+
+	/*
+	 * Now join the RPC ipv6 multicast group on all interfaces.
+	 */
+	if (getifaddrs(&ifp) < 0)
+		return;
+
+	mreq6.ipv6mr_interface = 0;
+	inet_pton(AF_INET6, RPCB_MULTICAST_ADDR, &mreq6.ipv6mr_multiaddr);
+
+	s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+
+	/*
+	 * Loop through all interfaces. For each interface, see if the
+	 * network portion of its address is equal to that of the client.
+	 * If so, we have found the interface that we want to use.
+	 */
+	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
+		if (ifap->ifa_addr->sa_family != AF_INET6 ||
+		    !(ifap->ifa_flags & IFF_MULTICAST))
+			continue;
+		ifindex = if_nametoindex(ifap->ifa_name);
+		if (ifindex == mreq6.ipv6mr_interface)
+			/*
+			 * Already did this one.
+			 */
+			continue;
+		mreq6.ipv6mr_interface = ifindex;
+		if (setsockopt(s, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,
+		    sizeof mreq6) < 0)
+			if (debugging)
+				warn("setsockopt v6 multicast");
+	}
+#endif
+
+	/* close(s); */
+}
+
+struct sockaddr *
+local_sa(int af)
+{
+	switch (af) {
+	case AF_INET:
+		return (struct sockaddr *)local_in4;
+#ifdef INET6
+	case AF_INET6:
+		return (struct sockaddr *)local_in6;
+#endif
+	default:
+		return NULL;
+	}
+}
diff --git a/contrib/netbsd-tests/fs/nfs/nfsservice/rumpnfsd.c b/contrib/netbsd-tests/fs/nfs/nfsservice/rumpnfsd.c
new file mode 100644
index 000000000000..337a06e9dd39
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/nfsservice/rumpnfsd.c
@@ -0,0 +1,165 @@
+/*	$NetBSD: rumpnfsd.c,v 1.8 2014/05/12 15:31:07 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+void *mountd_main(void *);
+void *rpcbind_main(void *);
+int nfsd_main(int, char **);
+
+sem_t gensem;
+
+#include "../../../net/config/netconfig.c"
+#include "../../common/h_fsmacros.h"
+#include "svc_fdset.h"
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+int
+main(int argc, char *argv[])
+{
+	const char *ethername, *ethername_ro;
+	const char *serveraddr, *serveraddr_ro;
+	const char *netmask;
+	const char *exportpath;
+	const char *imagename;
+	char ifname[IFNAMSIZ], ifname_ro[IFNAMSIZ];
+	void *fsarg;
+	pthread_t t;
+	int rv;
+
+	/* for netcfg */
+	noatf = 1;
+
+	/* use defaults? */
+	if (argc == 1) {
+		ethername = "etherbus";
+		ethername_ro = "etherbus_ro";
+		serveraddr = "10.3.2.1";
+		serveraddr_ro = "10.4.2.1";
+		netmask = "255.255.255.0";
+		exportpath = "/myexport";
+		imagename = "ffs.img";
+	} else {
+		ethername = argv[1];
+		ethername_ro = argv[2];
+		serveraddr = argv[3];
+		serveraddr_ro = argv[4];
+		netmask = argv[5];
+		exportpath = argv[6];
+		imagename = argv[7];
+	}
+
+	rump_init();
+	init_fdsets();
+
+	rv = rump_pub_etfs_register("/etc/exports", "./exports", RUMP_ETFS_REG);
+	if (rv) {
+		errx(1, "register /etc/exports: %s", strerror(rv));
+	}
+
+	/* mini-mtree for mountd */
+	static const char *const dirs[] = { "/var", "/var/run", "/var/db" };
+	for (size_t i = 0; i < __arraycount(dirs); i++)
+		if (rump_sys_mkdir(dirs[i], 0777) == -1)
+			err(1, "can't mkdir `%s'", dirs[i]);
+
+	if (ffs_fstest_newfs(NULL, &fsarg,
+	    imagename, FSTEST_IMGSIZE, NULL) != 0)
+		err(1, "newfs failed");
+	if (ffs_fstest_mount(NULL, fsarg, exportpath, 0) != 0)
+		err(1, "mount failed");
+
+#if 0
+	/*
+	 * Serve from host instead of dedicated mount?
+	 * THIS IS MORE EVIL THAN MURRAY THE DEMONIC TALKING SKULL!
+	 */
+
+	if (ukfs_modload("/usr/lib/librumpfs_syspuffs.so") < 1)
+		errx(1, "modload");
+
+	mount_syspuffs_parseargs(__arraycount(pnullarg), pnullarg,
+	    &args, &mntflags, canon_dev, canon_dir);
+	if ((ukfs = ukfs_mount(MOUNT_PUFFS, "/", UKFS_DEFAULTMP, MNT_RDONLY,
+	    &args, sizeof(args))) == NULL)
+		err(1, "mount");
+
+	if (ukfs_modload("/usr/lib/librumpfs_nfsserver.so") < 1)
+		errx(1, "modload");
+#endif
+
+	if (sem_init(&gensem, 1, 0) == -1)
+		err(1, "gensem init");
+
+	/* create interface */
+	netcfg_rump_makeshmif(ethername, ifname);
+	netcfg_rump_if(ifname, serveraddr, netmask);
+
+	netcfg_rump_makeshmif(ethername_ro, ifname_ro);
+	netcfg_rump_if(ifname_ro, serveraddr_ro, netmask);
+
+	/*
+	 * No syslogging, thanks.
+	 * XXX: "0" does not modify the mask, so pick something
+	 * which is unlikely to cause any logging
+	 */
+	setlogmask(0x10000000);
+
+	if (pthread_create(&t, NULL, rpcbind_main, NULL) == -1)
+		err(1, "rpcbind");
+	sem_wait(&gensem);
+
+	if (pthread_create(&t, NULL, mountd_main, NULL) == -1)
+		err(1, "mountd");
+	sem_wait(&gensem);
+
+	rv = 0;
+	/* signal the other process we're almost done */
+	if (write(3, &rv, 4) != 4)
+		errx(1, "magic write failed");
+
+	{
+	char *nfsargv[] = { __UNCONST("nfsd"), NULL };
+	nfsd_main(1, nfsargv);
+	}
+	/*NOTREACHED*/
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/nfs/t_mountd.c b/contrib/netbsd-tests/fs/nfs/t_mountd.c
new file mode 100644
index 000000000000..b6c15287791c
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/t_mountd.c
@@ -0,0 +1,121 @@
+/*	$NetBSD: t_mountd.c,v 1.5 2012/02/24 13:53:46 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+#include "../common/h_fsmacros.h"
+
+ATF_TC(mountdhup);
+ATF_TC_HEAD(mountdhup, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test for service interrupt while "
+	    "mountd handles SIGHUP");
+}
+
+static volatile int quit;
+
+static void *
+wrkwrkwrk(void *unused)
+{
+	int fd, fail;
+
+	fail = 0;
+
+	rump_sys_chdir(FSTEST_MNTNAME);
+	while (!quit) {
+		fd = rump_sys_open("file", O_RDWR | O_CREAT);
+		if (fd == -1) {
+			if (errno == EACCES) {
+				fail++;
+				break;
+			}
+		}
+		rump_sys_close(fd);
+		if (rump_sys_unlink("file") == -1) {
+			if (errno == EACCES) {
+				fail++;
+				break;
+			}
+		}
+	}
+	rump_sys_chdir("/");
+	quit = 1;
+
+	return fail ? wrkwrkwrk : NULL;
+}
+
+ATF_TC_BODY(mountdhup, tc)
+{
+	pthread_t pt;
+	struct nfstestargs *nfsargs;
+	void *voidargs;
+	int attempts;
+	void *fail;
+
+	FSTEST_CONSTRUCTOR(tc, nfs, voidargs);
+	nfsargs = voidargs;
+
+	pthread_create(&pt, NULL, wrkwrkwrk, NULL);
+	for (attempts = 100; attempts && !quit; attempts--) {
+		usleep(100000);
+		kill(nfsargs->ta_childpid, SIGHUP);
+	}
+	quit = 1;
+	pthread_join(pt, &fail);
+
+	FSTEST_DESTRUCTOR(tc, nfs, voidargs);
+
+	atf_tc_expect_fail("PR kern/5844");
+	if (fail)
+		atf_tc_fail("op failed with EACCES");
+	else
+		atf_tc_fail("race did not trigger this time");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mountdhup);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/nfs/t_rquotad.sh b/contrib/netbsd-tests/fs/nfs/t_rquotad.sh
new file mode 100755
index 000000000000..05d34fb94da4
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nfs/t_rquotad.sh
@@ -0,0 +1,142 @@
+# $NetBSD: t_rquotad.sh,v 1.4 2014/03/13 12:45:14 gson Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+for e in le be; do
+  for v in 1; do
+    for q in "user" "group" "both"; do
+	test_case_root get_nfs_${e}_${v}_${q} get_nfs_quota \
+		"get NFS quota with ${q} enabled" ${e} ${v} ${q}
+    done
+  done
+done
+
+get_nfs_quota()
+{
+	create_ffs $*
+	local q=$3
+	local expect
+
+	case ${q} in
+	user)
+		expect=u
+		;;
+	group)
+		expect=g
+		;;
+	both)
+		expect="u g"
+		;;
+	*)
+		atf_fail "wrong quota type"
+		;;
+	esac
+
+#start a a nfs server
+
+	atf_check -s exit:0 rump_server -lrumpvfs -lrumpdev -lrumpnet   \
+	    -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6          \
+	    -lrumpnet_local -lrumpnet_shmif -lrumpdev_disk -lrumpfs_ffs \
+	    -lrumpfs_nfs -lrumpfs_nfsserver                             \
+	    -d key=/dk,hostpath=${IMG},size=host ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+	atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.1
+
+	export RUMPHIJACK_RETRYCONNECT=die
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+
+	atf_check -s exit:0 mkdir /rump/etc
+	atf_check -s exit:0 mkdir /rump/export
+	atf_check -s exit:0 mkdir -p /rump/var/run
+	atf_check -s exit:0 mkdir -p /rump/var/db
+	atf_check -s exit:0 touch /rump/var/db/mountdtab
+
+	/bin/echo "/export -noresvport -noresvmnt 10.1.1.100" | \
+		dd of=/rump/etc/exports 2> /dev/null
+
+	atf_check -s exit:0 -e ignore mount_ffs /dk /rump/export
+
+#set a quota limit (and check that we can read it back)
+	for q in ${expect} ; do
+		local id=$(id -${q})
+		atf_check -s exit:0 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/export edquota -$q -s10k/20 -h40M/50k \
+		   -t 2W/3D ${id}
+		atf_check -s exit:0 \
+-o "match:0       10    40960  2weeks       1      20   51200   3days" \
+-o "match:Disk quotas for .*: $" \
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/export quota -${q} -v
+	done
+
+	# start rpcbind.  we want /var/run/rpcbind.sock
+	export RUMPHIJACK='blanket=/var/run,socket=all'
+	atf_check -s exit:0 rpcbind
+
+	# ok, then we want mountd in the similar fashion
+	export RUMPHIJACK='blanket=/var/run:/var/db:/export,socket=all,path=/rump,vfs=all'
+	atf_check -s exit:0 mountd /rump/etc/exports
+
+	# and nfs
+	export RUMPHIJACK='blanket=/var/run,socket=all,vfs=all'
+	atf_check -s exit:0 nfsd
+
+	#finally, rpc.rquotad
+	export RUMPHIJACK='blanket=/var/run:/export,vfs=getvfsstat,socket=all'
+	atf_check -s exit:0 /usr/libexec/rpc.rquotad
+
+	# now start a client server
+	export RUMP_SERVER=unix://clientsock
+	RUMP_SOCKETS_LIST="${RUMP_SOCKETS_LIST} clientsock"
+	unset RUMPHIJACK
+	unset LD_PRELOAD
+
+	atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet             \
+            -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
+            ${RUMP_SERVER}
+
+        atf_check -s exit:0 rump.ifconfig shmif0 create
+        atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+        atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.100
+
+        export LD_PRELOAD=/usr/lib/librumphijack.so
+
+        atf_check -s exit:0 mkdir /rump/mnt
+        atf_check -s exit:0 mount_nfs 10.1.1.1:/export /rump/mnt
+
+	#now try a quota(8) call
+	export RUMPHIJACK='blanket=/mnt,socket=all,path=/rump,vfs=getvfsstat'
+	for q in ${expect} ; do
+		local id=$(id -${q})
+		atf_check -s exit:0 \
+-o "match:/mnt        0       10    40960               1      20   51200        " \
+-o "match:Disk quotas for .*: $" \
+		    quota -${q} -v
+	done
+
+	unset LD_PRELOAD
+	rump_quota_shutdown
+}
diff --git a/contrib/netbsd-tests/fs/nullfs/t_basic.c b/contrib/netbsd-tests/fs/nullfs/t_basic.c
new file mode 100644
index 000000000000..21dfccdb80f1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/nullfs/t_basic.c
@@ -0,0 +1,174 @@
+/*	$NetBSD: t_basic.c,v 1.3 2010/06/09 08:37:16 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/nullfs/null.h>
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "basic nullfs functionality");
+}
+
+#define MSTR "magic bus"
+
+static void
+xput_tfile(const char *path, const char *mstr)
+{
+	int fd;
+
+	fd = rump_sys_open(path, O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create %s", path);
+	if (rump_sys_write(fd, MSTR, sizeof(MSTR)) != sizeof(MSTR))
+		atf_tc_fail_errno("write to testfile");
+	rump_sys_close(fd);
+}
+
+static int
+xread_tfile(const char *path, const char *mstr)
+{
+	char buf[128];
+	int fd;
+
+	fd = rump_sys_open(path, O_RDONLY);
+	if (fd == -1)
+		return errno;
+	if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read tfile");
+	rump_sys_close(fd);
+	if (strcmp(buf, MSTR) == 0)
+		return 0;
+	return EPROGMISMATCH;
+}
+
+static void
+mountnull(const char *what, const char *mp, int flags)
+{
+	struct null_args nargs;
+
+	memset(&nargs, 0, sizeof(nargs));
+	nargs.nulla_target = __UNCONST(what);
+	if (rump_sys_mount(MOUNT_NULL, mp, flags, &nargs, sizeof(nargs)) == -1)
+		atf_tc_fail_errno("could not mount nullfs");
+
+}
+
+ATF_TC_BODY(basic, tc)
+{
+	struct tmpfs_args targs;
+	struct stat sb;
+	int error;
+
+	rump_init();
+	if (rump_sys_mkdir("/td1", 0777) == -1)
+		atf_tc_fail_errno("mp1");
+	if (rump_sys_mkdir("/td2", 0777) == -1)
+		atf_tc_fail_errno("mp1");
+
+	/* use tmpfs because rumpfs doesn't support regular files */
+	memset(&targs, 0, sizeof(targs));
+	targs.ta_version = TMPFS_ARGS_VERSION;
+	targs.ta_root_mode = 0777;
+	if (rump_sys_mount(MOUNT_TMPFS, "/td1", 0, &targs, sizeof(targs)) == -1)
+		atf_tc_fail_errno("could not mount tmpfs td1");
+
+	mountnull("/td1", "/td2", 0);
+
+	/* test unnull -> null */
+	xput_tfile("/td1/tensti", "jeppe");
+	error = xread_tfile("/td2/tensti", "jeppe");
+	if (error != 0)
+		atf_tc_fail("null compare failed: %d (%s)",
+		    error, strerror(error));
+
+	/* test null -> unnull */
+	xput_tfile("/td2/kiekko", "keppi");
+	error = xread_tfile("/td1/kiekko", "keppi");
+	if (error != 0)
+		atf_tc_fail("unnull compare failed: %d (%s)",
+		    error, strerror(error));
+
+	/* test unnull -> null overwrite */
+	xput_tfile("/td1/tensti", "se oolannin sota");
+	error = xread_tfile("/td2/tensti", "se oolannin sota");
+	if (error != 0)
+		atf_tc_fail("unnull compare failed: %d (%s)",
+		    error, strerror(error));
+
+	/* test that /td2 is unaffected in "real life" */
+	if (rump_sys_unmount("/td2", 0) == -1)
+		atf_tc_fail_errno("cannot unmount nullfs");
+	if ((error = rump_sys_stat("/td2/tensti", &sb)) != -1
+	    || errno != ENOENT) {
+		atf_tc_fail("stat tensti should return ENOENT, got %d", error);
+	}
+	if ((error = rump_sys_stat("/td2/kiekko", &sb)) != -1
+	    || errno != ENOENT) {
+		atf_tc_fail("stat kiekko should return ENOENT, got %d", error);
+	}
+
+	/* done */
+}
+
+ATF_TC(twistymount);
+ATF_TC_HEAD(twistymount, tc)
+{
+
+	/* this is expected to fail until the PR is fixed */
+	atf_tc_set_md_var(tc, "descr", "\"recursive\" mounts deadlock"
+	    " (kern/43439)");
+}
+
+/*
+ * Mapping to identifiers in kern/43439:
+ *  /td		= /home/current/pkgsrc
+ *  /td/dist	= /home/current/pkgsrc/distiles
+ *  /mp		= /usr/pkgsrc
+ *  /mp/dist	= /usr/pkgsrc/distfiles -- "created" by first null mount
+ */
+
+ATF_TC_BODY(twistymount, tc)
+{
+	int mkd = 0;
+
+	rump_init();
+
+	if (rump_sys_mkdir("/td", 0777) == -1)
+		atf_tc_fail_errno("mkdir %d", mkd++);
+	if (rump_sys_mkdir("/td/dist", 0777) == -1)
+		atf_tc_fail_errno("mkdir %d", mkd++);
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("mkdir %d", mkd++);
+
+	/* MNT_RDONLY doesn't matter, but just for compat with the PR */
+	mountnull("/td", "/mp", MNT_RDONLY);
+	mountnull("/td/dist", "/mp/dist", 0);
+
+	/* if we didn't get a locking-against-meself panic, we passed */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, basic);
+	ATF_TP_ADD_TC(tp, twistymount);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/psshfs/h_have_puffs.c b/contrib/netbsd-tests/fs/psshfs/h_have_puffs.c
new file mode 100644
index 000000000000..9d349508ca97
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/h_have_puffs.c
@@ -0,0 +1,58 @@
+/* $NetBSD: h_have_puffs.c,v 1.1 2010/07/06 14:06:22 pooka Exp $ */
+/*
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	int exitcode, fd;
+
+	fd = open("/dev/puffs", O_RDWR);
+	if (fd != -1) {
+		printf("yes\n");
+		close(fd);
+		exitcode = EXIT_SUCCESS;
+	} else {
+		if (errno == ENXIO) {
+			printf("enxio\n");
+			exitcode = EXIT_SUCCESS;
+		} else if (errno == EACCES) {
+			printf("eacces\n");
+			exitcode = EXIT_SUCCESS;
+		} else {
+			printf("failed\n");
+			exitcode = EXIT_FAILURE;
+		}
+	}
+
+	return exitcode;
+}
diff --git a/contrib/netbsd-tests/fs/psshfs/ssh_config.in b/contrib/netbsd-tests/fs/psshfs/ssh_config.in
new file mode 100644
index 000000000000..3ebd68b3fdac
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/ssh_config.in
@@ -0,0 +1,14 @@
+# $NetBSD: ssh_config.in,v 1.1 2010/07/06 14:06:22 pooka Exp $
+
+# Basic settings.
+Port 10000
+Protocol 2
+
+# The temporary key used for login.
+IdentityFile @WORKDIR@/ssh_user_key
+
+# Prevent the client from complaining about unknown host keys.
+GlobalKnownHostsFile @WORKDIR@/known_hosts
+
+# Do not attempt password authentication in case keys fail.
+IdentitiesOnly yes
diff --git a/contrib/netbsd-tests/fs/psshfs/ssh_host_key b/contrib/netbsd-tests/fs/psshfs/ssh_host_key
new file mode 100644
index 000000000000..ebdbc8b44171
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/ssh_host_key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDJnMpSG1lGmApk8F7ZH7TGtjjP/WUs+vqHyFsyS2lilJzereen
+a/ME6S0d0HTOeCdKldjbtDpfNXbh+XnJMlJMEgEs4Mg1jluuEV0GOJoMt7cGzku2
+gAYGx++2+wqYw6Y+M8Tb1M4AO+PcxD/3BkdUyIKO63v6STl2VQn1BzsTQwIBIwKB
+gAuFTWPHDGpvFols0jhK9GMgWwSSIwnidLdNRwowMehgQ3pwVmFWoCwqlN0h2sn4
+PMJu9nL0WxtiJAzprzARgQuPI25t9LiKTF7scC/cNUiHPplUjvoDXA9ccY1eIf4R
+e6wwZz1jfCWen0eRsvMyoYvFmEH8hILAk1bY9heymOGLAkEA/WhC49n+gtloVMow
+iKQOO6+u3ouxTOTQ3sV2wCaLaO2pEbHP2//5SlUJLp6QrjC7bg9Kr+f56+zT2he9
+f6GCwwJBAMus3XizmZdJyJLnkCJRiT0/3Kf57fhWKRdnFkuRLyjET9MEWavRdJmr
+bx/lxmILi1iKwXiFEDM6MqYfmNImJYECQQCtw9YYlXtSaTGZOi/oqwJyEhGCqO6b
+II85q/moVPHhjQY4BOZNttbT4on0FPV+wlSjPa+OkHDcSp/mAaaDZ2+bAkEAujel
+6rLVkaKLfv+ZuPoXE22WivMityo0Mqdk12ArHfVQS+a4YpOdzlOYzLTSosi56o19
+sAShGOTAl+Jf1hQ/iwJAKpPviX5w292H/m5T0m4l0NRdQ3pRujOLMSVmY+/HFZTW
+GJMYLr1eBKNfLsKzJgB88GzuF2O/O8hNi3XSiOP+9w==
+-----END RSA PRIVATE KEY-----
diff --git a/contrib/netbsd-tests/fs/psshfs/ssh_host_key.pub b/contrib/netbsd-tests/fs/psshfs/ssh_host_key.pub
new file mode 100644
index 000000000000..8d087959c4ab
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/ssh_host_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyZzKUhtZRpgKZPBe2R+0xrY4z/1lLPr6h8hbMktpYpSc3q3np2vzBOktHdB0zngnSpXY27Q6XzV24fl5yTJSTBIBLODINY5brhFdBjiaDLe3Bs5LtoAGBsfvtvsKmMOmPjPE29TOADvj3MQ/9wZHVMiCjut7+kk5dlUJ9Qc7E0M= test@test.example.net
diff --git a/contrib/netbsd-tests/fs/psshfs/sshd_config.in b/contrib/netbsd-tests/fs/psshfs/sshd_config.in
new file mode 100644
index 000000000000..a7f86b1d3388
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/sshd_config.in
@@ -0,0 +1,40 @@
+# $NetBSD: sshd_config.in,v 1.2 2011/02/11 13:19:46 pooka Exp $
+
+# Basic settings.
+Port 10000
+Protocol 2
+
+# Provide information to the user in case something goes wrong.
+LogLevel DEBUG1
+
+# The host key.  It lives in the work directory because we need to set
+# very strict permissions on it and cannot modify the copy on the source
+# directory.
+HostKey @WORKDIR@/ssh_host_key
+
+# The authorized keys file we set up during the test to allow the client
+# to safely log in.  We need to disable strict modes because ATF_WORKDIR
+# usually lives in /tmp, which has 1777 permissions and are not liked by
+# sshd.
+AuthorizedKeysFile @WORKDIR@/authorized_keys
+StrictModes no
+
+# Some settings to allow user runs of sshd.
+PidFile @WORKDIR@/sshd.pid
+Subsystem sftp @WORKDIR@/sftp-server
+UsePam no
+UsePrivilegeSeparation no
+
+# The root user should also be able to run the tests.
+PermitRootLogin yes
+
+# Be restrictive about access to the temporary server.  Only allow key-based
+# authentication.
+ChallengeResponseAuthentication no
+GSSAPIAuthentication no
+HostbasedAuthentication no
+KerberosAuthentication no
+MaxAuthTries 1
+MaxStartups 1
+PasswordAuthentication no
+PubkeyAuthentication yes
diff --git a/contrib/netbsd-tests/fs/psshfs/t_psshfs.sh b/contrib/netbsd-tests/fs/psshfs/t_psshfs.sh
new file mode 100755
index 000000000000..241d46d5d040
--- /dev/null
+++ b/contrib/netbsd-tests/fs/psshfs/t_psshfs.sh
@@ -0,0 +1,274 @@
+# $NetBSD: t_psshfs.sh,v 1.7 2013/03/16 07:54:04 jmmv Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# -------------------------------------------------------------------------
+# Auxiliary functions.
+# -------------------------------------------------------------------------
+
+#
+# Skips the calling test case if puffs is not supported in the kernel
+# or if the calling user does not have the necessary permissions to mount
+# file systems.
+#
+require_puffs() {
+	case "$($(atf_get_srcdir)/h_have_puffs)" in
+		eacces)
+			atf_skip "Cannot open /dev/puffs for read/write access"
+			;;
+		enxio)
+			atf_skip "puffs support not built into the kernel"
+			;;
+		failed)
+			atf_skip "Unknown error trying to access /dev/puffs"
+			;;
+		yes)
+			;;
+		*)
+			atf_fail "Unknown value returned by h_have_puffs"
+			;;
+	esac
+
+	if [ $(id -u) -ne 0 -a $(sysctl -n vfs.generic.usermount) -eq 0 ]
+	then
+		atf_skip "Regular users cannot mount file systems" \
+		    "(vfs.generic.usermount is set to 0)"
+	fi
+}
+
+#
+# Starts a SSH server and sets up the client to access it.
+# Authentication is allowed and done using an RSA key exclusively, which
+# is generated on the fly as part of the test case.
+# XXX: Ideally, all the tests in this test program should be able to share
+# the generated key, because creating it can be a very slow process on some
+# machines.
+#
+start_ssh() {
+	echo "Setting up SSH server configuration"
+	sed -e "s,@SRCDIR@,$(atf_get_srcdir),g" -e "s,@WORKDIR@,$(pwd),g" \
+	    $(atf_get_srcdir)/sshd_config.in >sshd_config || \
+	    atf_fail "Failed to create sshd_config"
+	atf_check -s eq:0 -o empty -e empty cp /usr/libexec/sftp-server .
+	atf_check -s eq:0 -o empty -e empty \
+	    cp $(atf_get_srcdir)/ssh_host_key .
+	atf_check -s eq:0 -o empty -e empty \
+	    cp $(atf_get_srcdir)/ssh_host_key.pub .
+	atf_check -s eq:0 -o empty -e empty chmod 400 ssh_host_key
+	atf_check -s eq:0 -o empty -e empty chmod 444 ssh_host_key.pub
+
+	/usr/sbin/sshd -e -f ./sshd_config >sshd.log 2>&1 &
+	while [ ! -f sshd.pid ]; do
+		sleep 0.01
+	done
+	echo "SSH server started (pid $(cat sshd.pid))"
+
+	echo "Setting up SSH client configuration"
+	atf_check -s eq:0 -o empty -e empty \
+	    ssh-keygen -f ssh_user_key -t rsa -b 1024 -N "" -q
+	atf_check -s eq:0 -o empty -e empty \
+	    cp ssh_user_key.pub authorized_keys
+	echo "[localhost]:10000,[127.0.0.1]:10000,[::1]:10000" \
+	    "$(cat $(atf_get_srcdir)/ssh_host_key.pub)" >known_hosts || \
+	    atf_fail "Failed to create known_hosts"
+	atf_check -s eq:0 -o empty -e empty chmod 600 authorized_keys
+	sed -e "s,@SRCDIR@,$(atf_get_srcdir),g" -e "s,@WORKDIR@,$(pwd),g" \
+	    $(atf_get_srcdir)/ssh_config.in >ssh_config || \
+	    atf_fail "Failed to create ssh_config"
+}
+
+#
+# Stops the SSH server spawned by start_ssh and prints diagnosis data.
+#
+stop_ssh() {
+	if [ -f sshd.pid ]; then
+		echo "Stopping SSH server (pid $(cat sshd.pid))"
+		kill $(cat sshd.pid)
+	fi
+	if [ -f sshd.log ]; then
+		echo "Server output was:"
+		sed -e 's,^,    ,' sshd.log
+	fi
+}
+
+#
+# Mounts the given source directory on the target directory using psshfs.
+# Both directories are supposed to live on the current directory.
+#
+mount_psshfs() {
+	atf_check -s eq:0 -o empty -e empty \
+	    mount -t psshfs -o -F=$(pwd)/ssh_config localhost:$(pwd)/${1} ${2}
+}
+
+# -------------------------------------------------------------------------
+# The test cases.
+# -------------------------------------------------------------------------
+
+atf_test_case inode_nos cleanup
+inode_nos_head() {
+	atf_set "descr" "Checks that different files get different inode" \
+	    "numbers"
+}
+inode_nos_body() {
+	require_puffs
+
+	start_ssh
+
+	mkdir root
+	mkdir root/dir
+	touch root/dir/file1
+	touch root/dir/file2
+	touch root/file3
+	touch root/file4
+
+	cat >ne_inodes.sh <<EOF
+#! /bin/sh
+#
+# Compares the inodes of the two given files and returns true if they are
+# different; false otherwise.
+#
+set -e
+ino1=\$(stat -f %i \${1})
+ino2=\$(stat -f %i \${2})
+test \${ino1} -ne \${ino2}
+EOF
+	chmod +x ne_inodes.sh
+
+	mkdir mnt
+	mount_psshfs root mnt
+	atf_check -s eq:0 -o empty -e empty \
+	    ./ne_inodes.sh root/dir root/dir/file1
+	atf_check -s eq:0 -o empty -e empty \
+	    ./ne_inodes.sh root/dir root/dir/file2
+	atf_check -s eq:0 -o empty -e empty \
+	    ./ne_inodes.sh root/dir/file1 root/dir/file2
+	atf_check -s eq:0 -o empty -e empty \
+	    ./ne_inodes.sh root/file3 root/file4
+}
+inode_nos_cleanup() {
+	umount mnt
+	stop_ssh
+}
+
+atf_test_case pwd cleanup
+pwd_head() {
+	atf_set "descr" "Checks that pwd works correctly"
+}
+pwd_body() {
+	require_puffs
+
+	start_ssh
+
+	mkdir root
+	mkdir root/dir
+
+	mkdir mnt
+	atf_check -s eq:0 -o save:stdout -e empty \
+	    -x 'echo $(cd mnt && /bin/pwd)/dir'
+	mv stdout expout
+	mount_psshfs root mnt
+	atf_check -s eq:0 -o file:expout -e empty \
+	    -x 'cd mnt/dir && ls .. >/dev/null && /bin/pwd'
+}
+pwd_cleanup() {
+	umount mnt
+	stop_ssh
+}
+
+atf_test_case ls cleanup
+ls_head() {
+	atf_set "descr" "Uses ls, attempts to exercise puffs_cc"
+}
+ls_body() {
+	require_puffs
+
+	start_ssh
+
+	mkdir mnt
+	mkdir root
+	mkdir root/dir
+	touch root/dir/file1
+	touch root/dir/file2
+	touch root/file3
+	touch root/file4
+
+	mount_psshfs root mnt
+
+	ls -l mnt &
+
+	IFS=' '
+lsout='dir
+file3
+file4
+
+mnt/dir:
+file1
+file2
+'
+	atf_check -s exit:0 -o inline:"$lsout" ls -R mnt
+}
+ls_cleanup() {
+	umount mnt
+	stop_ssh
+}
+
+atf_test_case setattr_cache cleanup
+setattr_cache_head() {
+	atf_set "descr" "Checks that setattr caches"
+	# Don't wait for the eternity that atf usually waits.  Twenty
+	# seconds should be good enough, except maybe on a VAX...
+	atf_set "timeout" 20
+}
+setattr_cache_body() {
+	require_puffs
+	start_ssh
+	atf_check -s exit:0 mkdir root
+	atf_check -s exit:0 mkdir mnt
+	mount_psshfs root mnt
+	atf_check -s exit:0 -x ': > mnt/loser'
+	atf_check -s exit:0 -o save:stat stat mnt/loser
+	# Oops -- this doesn't work.  We need to stop the child of the
+	# sshd that is handling the sftp session.
+	atf_check -s exit:0 kill -STOP $(cat sshd.pid)
+	atf_check -s exit:0 -x ': > mnt/loser'
+	atf_check -s exit:0 -o file:stat stat mnt/loser
+}
+setattr_cache_cleanup() {
+	umount mnt
+	kill -CONT $(cat sshd.pid)
+	stop_ssh
+}
+
+# -------------------------------------------------------------------------
+# Initialization.
+# -------------------------------------------------------------------------
+
+atf_init_test_cases() {
+	atf_add_test_case inode_nos
+	atf_add_test_case pwd
+	atf_add_test_case ls
+	#atf_add_test_case setattr_cache
+}
diff --git a/contrib/netbsd-tests/fs/ptyfs/t_nullpts.c b/contrib/netbsd-tests/fs/ptyfs/t_nullpts.c
new file mode 100644
index 000000000000..9265f32ffa0a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ptyfs/t_nullpts.c
@@ -0,0 +1,128 @@
+/*	$NetBSD: t_nullpts.c,v 1.5 2011/01/10 11:11:04 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/ioctl.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/ptyfs/ptyfs.h>
+#include <miscfs/nullfs/null.h>
+
+#include "../../h_macros.h"
+
+static void
+mountptyfs(const char *mp, int flags)
+{
+	struct ptyfs_args args;
+
+	if (rump_sys_mkdir(mp, 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("null create %s", mp);
+	}
+	memset(&args, 0, sizeof(args));
+	args.version = PTYFS_ARGSVERSION;
+	args.mode = 0777;
+	if (rump_sys_mount(MOUNT_PTYFS, mp, flags, &args, sizeof(args)) == -1)
+		atf_tc_fail_errno("could not mount ptyfs");
+}
+
+static void
+mountnull(const char *what, const char *mp, int flags)
+{
+	struct null_args nargs;
+
+	if (rump_sys_mkdir(what, 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("null create %s", what);
+	}
+	if (rump_sys_mkdir(mp, 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("null create %s", mp);
+	}
+	memset(&nargs, 0, sizeof(nargs));
+	nargs.nulla_target = __UNCONST(what);
+	if (rump_sys_mount(MOUNT_NULL, mp, flags, &nargs, sizeof(nargs)) == -1)
+		atf_tc_fail_errno("could not mount nullfs");
+}
+
+ATF_TC(nullrevoke);
+ATF_TC_HEAD(nullrevoke, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "null mount ptyfs and revoke");
+}
+
+ATF_TC_BODY(nullrevoke, tc)
+{
+	char path[MAXPATHLEN];
+	struct ptmget ptg;
+	int ptm;
+
+	rump_init();
+
+	/*
+	 * mount /dev/pts
+	 */
+	mountptyfs("/dev/pts", 0);
+
+	/*
+	 * null mount /dev/pts to /null/dev/pts
+	 */
+	if (rump_sys_mkdir("/null", 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("null create /null");
+	}
+	if (rump_sys_mkdir("/null/dev", 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("null create /null/dev");
+	}
+
+	mountnull("/dev/pts", "/null/dev/pts", 0);
+
+	/*
+	 * get slave/master pair.
+	 */
+	ptm = rump_sys_open("/dev/ptm", O_RDWR);
+	if (rump_sys_ioctl(ptm, TIOCPTMGET, &ptg) == -1)
+		atf_tc_fail_errno("get pty");
+
+	/*
+	 * Build nullfs path to slave.
+	 */
+	strcpy(path, "/null");
+	strcat(path, ptg.sn);
+
+	/*
+	 * Open slave tty via nullfs.
+	 */
+	if (rump_sys_open(path, O_RDWR) == -1)
+		atf_tc_fail_errno("slave null open");
+
+	/*
+	 * Close slave opened with /dev/ptm.  Need purely non-null refs to it.
+	 */
+	rump_sys_close(ptg.sfd);
+
+	/* revoke slave tty. */
+	rump_sys_revoke(path);
+
+	/* done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nullrevoke);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/ptyfs/t_ptyfs.c b/contrib/netbsd-tests/fs/ptyfs/t_ptyfs.c
new file mode 100644
index 000000000000..90001b92ee94
--- /dev/null
+++ b/contrib/netbsd-tests/fs/ptyfs/t_ptyfs.c
@@ -0,0 +1,62 @@
+/*	$NetBSD: t_ptyfs.c,v 1.1 2010/06/11 23:52:38 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/ptyfs/ptyfs.h>
+
+#include "../../h_macros.h"
+
+static void
+mountptyfs(const char *mp, int flags)
+{
+	struct ptyfs_args args;
+
+	if (rump_sys_mkdir("/mp", 0777) == -1) {
+		if (errno != EEXIST)
+			atf_tc_fail_errno("mp1");
+	}
+	memset(&args, 0, sizeof(args));
+	args.version = PTYFS_ARGSVERSION;
+	args.mode = 0777;
+	if (rump_sys_mount(MOUNT_PTYFS, mp, flags, &args, sizeof(args)) == -1)
+		atf_tc_fail_errno("could not mount ptyfs");
+}
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "mount ptyfs");
+}
+
+ATF_TC_BODY(basic, tc)
+{
+
+	rump_init();
+
+	mountptyfs("/mp", 0);
+	if (rump_sys_unmount("/mp", 0) == -1)
+		atf_tc_fail_errno("unmount failed");
+
+	/* done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.c b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.c
new file mode 100644
index 000000000000..c625f90ab24b
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.c
@@ -0,0 +1,255 @@
+/*	$NetBSD: dtfs.c,v 1.2 2010/07/21 06:58:25 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * Delectable Test File System: a simple in-memory file system which
+ * demonstrates the use of puffs.
+ * (a.k.a. Detrempe FS ...)
+ */
+
+#include <sys/types.h>
+
+#include <err.h>
+#include <mntopts.h>
+#include <paths.h>
+#include <puffs.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "dtfs.h"
+
+#ifdef DEEP_ROOTED_CLUE
+#define FSNAME "detrempe"
+#else
+#define FSNAME "dt"
+#endif
+#define MAXREQMAGIC -37
+
+static struct puffs_usermount *gpu;
+static struct dtfs_mount gdtm;
+int dynamicfh;
+int straightflush;
+
+static void usage(void);
+
+static void
+usage()
+{
+
+	fprintf(stderr, "usage: %s [-bsdftl] [-c hashbuckets] [-m maxreqsize] "
+	    "[-n typename]\n       [-o mntopt] [-o puffsopt] [-p prot] "
+	    "[-r rootnodetype]\n       detrempe /mountpoint\n", getprogname());
+	exit(1);
+}
+
+static void
+wipe_the_sleep_out_of_my_eyes(int v)
+{
+
+	gdtm.dtm_needwakeup++;
+}
+
+static void
+loopfun(struct puffs_usermount *pu)
+{
+	struct dtfs_mount *dtm = puffs_getspecific(pu);
+	struct dtfs_poll *dp;
+
+	while (dtm->dtm_needwakeup) {
+		dtm->dtm_needwakeup--;
+		dp = LIST_FIRST(&dtm->dtm_pollent);
+		if (dp == NULL)
+			return;
+
+		LIST_REMOVE(dp, dp_entries);
+		puffs_cc_continue(dp->dp_pcc);
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	extern char *optarg;
+	extern int optind;
+	struct puffs_usermount *pu;
+	struct puffs_pathobj *po_root;
+	struct puffs_ops *pops;
+	struct timespec ts;
+	const char *typename;
+	char *rtstr;
+	mntoptparse_t mp;
+	int pflags, detach, mntflags;
+	int ch;
+	int khashbuckets;
+	int maxreqsize;
+
+	setprogname(argv[0]);
+
+	rtstr = NULL;
+	detach = 1;
+	mntflags = 0;
+	khashbuckets = 256;
+	pflags = PUFFS_KFLAG_IAONDEMAND;
+	typename = FSNAME;
+	maxreqsize = MAXREQMAGIC;
+	gdtm.dtm_allowprot = VM_PROT_ALL;
+	while ((ch = getopt(argc, argv, "bc:dfilm:n:o:p:r:st")) != -1) {
+		switch (ch) {
+		case 'b': /* build paths, for debugging the feature */
+			pflags |= PUFFS_FLAG_BUILDPATH;
+			break;
+		case 'c':
+			khashbuckets = atoi(optarg);
+			break;
+		case 'd':
+			dynamicfh = 1;
+			break;
+		case 'f':
+			pflags |= PUFFS_KFLAG_LOOKUP_FULLPNBUF;
+			break;
+		case 'i':
+			pflags &= ~PUFFS_KFLAG_IAONDEMAND;
+			break;
+		case 'l':
+			straightflush = 1;
+			break;
+		case 'm':
+			maxreqsize = atoi(optarg);
+			break;
+		case 'n':
+			typename = optarg;
+			break;
+		case 'o':
+			mp = getmntopts(optarg, puffsmopts, &mntflags, &pflags);
+			if (mp == NULL)
+				err(1, "getmntopts");
+			freemntopts(mp);
+			break;
+		case 'p':
+			gdtm.dtm_allowprot = atoi(optarg);
+			if ((gdtm.dtm_allowprot | VM_PROT_ALL) != VM_PROT_ALL)
+				usage();
+			break;
+		case 'r':
+			rtstr = optarg;
+			break;
+		case 's': /* stay on top */
+			detach = 0;
+			break;
+		case 't':
+			pflags |= PUFFS_KFLAG_WTCACHE;
+			break;
+		default:
+			usage();
+			/*NOTREACHED*/
+		}
+	}
+	if (pflags & PUFFS_FLAG_OPDUMP)
+		detach = 0;
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2)
+		usage();
+
+	PUFFSOP_INIT(pops);
+
+	PUFFSOP_SET(pops, dtfs, fs, statvfs);
+	PUFFSOP_SET(pops, dtfs, fs, unmount);
+	PUFFSOP_SETFSNOP(pops, sync);
+	PUFFSOP_SET(pops, dtfs, fs, fhtonode);
+	PUFFSOP_SET(pops, dtfs, fs, nodetofh);
+
+	PUFFSOP_SET(pops, dtfs, node, lookup);
+	PUFFSOP_SET(pops, dtfs, node, access);
+	PUFFSOP_SET(pops, puffs_genfs, node, getattr);
+	PUFFSOP_SET(pops, dtfs, node, setattr);
+	PUFFSOP_SET(pops, dtfs, node, create);
+	PUFFSOP_SET(pops, dtfs, node, remove);
+	PUFFSOP_SET(pops, dtfs, node, readdir);
+	PUFFSOP_SET(pops, dtfs, node, poll);
+	PUFFSOP_SET(pops, dtfs, node, mmap);
+	PUFFSOP_SET(pops, dtfs, node, mkdir);
+	PUFFSOP_SET(pops, dtfs, node, rmdir);
+	PUFFSOP_SET(pops, dtfs, node, rename);
+	PUFFSOP_SET(pops, dtfs, node, read);
+	PUFFSOP_SET(pops, dtfs, node, write);
+	PUFFSOP_SET(pops, dtfs, node, link);
+	PUFFSOP_SET(pops, dtfs, node, symlink);
+	PUFFSOP_SET(pops, dtfs, node, readlink);
+	PUFFSOP_SET(pops, dtfs, node, mknod);
+	PUFFSOP_SET(pops, dtfs, node, inactive);
+	PUFFSOP_SET(pops, dtfs, node, pathconf);
+	PUFFSOP_SET(pops, dtfs, node, reclaim);
+
+	srandom(time(NULL)); /* for random generation numbers */
+
+	pu = puffs_init(pops, _PATH_PUFFS, typename, &gdtm, pflags);
+	if (pu == NULL)
+		err(1, "init");
+	gpu = pu;
+
+	puffs_setfhsize(pu, sizeof(struct dtfs_fid),
+	    PUFFS_FHFLAG_NFSV2 | PUFFS_FHFLAG_NFSV3
+	    | (dynamicfh ? PUFFS_FHFLAG_DYNAMIC : 0));
+	puffs_setncookiehash(pu, khashbuckets);
+
+	if (signal(SIGALRM, wipe_the_sleep_out_of_my_eyes) == SIG_ERR)
+		warn("cannot set alarm sighandler");
+
+	/* init */
+	if (dtfs_domount(pu, rtstr) != 0)
+		errx(1, "dtfs_domount failed");
+
+	po_root = puffs_getrootpathobj(pu);
+	po_root->po_path = argv[0];
+	po_root->po_len = strlen(argv[0]);
+
+	/* often enough for testing poll */
+	ts.tv_sec = 1;
+	ts.tv_nsec = 0;
+	puffs_ml_setloopfn(pu, loopfun);
+	puffs_ml_settimeout(pu, &ts);
+
+	if (maxreqsize != MAXREQMAGIC)
+		puffs_setmaxreqlen(pu, maxreqsize);
+
+	puffs_set_errnotify(pu, puffs_kernerr_abort);
+	if (detach)
+		if (puffs_daemon(pu, 1, 1) == -1)
+			err(1, "puffs_daemon");
+
+	if (puffs_mount(pu,  argv[1], mntflags, puffs_getroot(pu)) == -1)
+		err(1, "mount");
+	if (puffs_mainloop(pu) == -1)
+		err(1, "mainloop");
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.h b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.h
new file mode 100644
index 000000000000..de4d9589e5e1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs.h
@@ -0,0 +1,127 @@
+/*	$NetBSD: dtfs.h,v 1.2 2010/07/14 13:09:52 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 DTFS_H_
+#define DTFS_H_
+
+#include <sys/types.h>
+
+#include <puffs.h>
+
+PUFFSOP_PROTOS(dtfs);
+int	dtfs_domount(struct puffs_usermount *, const char *);
+
+#define DTFS_BLOCKSHIFT	(12)
+#define DTFS_BLOCKSIZE	(1<<DTFS_BLOCKSHIFT)
+
+#define ROUNDUP(a,b) ((a) & ((b)-1))
+#define BLOCKNUM(a,b) (((a) & ~((1<<(b))-1)) >> (b))
+
+struct dtfs_fid;
+struct dtfs_mount {
+	ino_t		dtm_nextfileid;	/* running number for file id	*/
+
+	size_t		dtm_fsizes;	/* sum of file sizes in bytes	*/
+	fsfilcnt_t	dtm_nfiles;	/* number of files		*/
+
+	LIST_HEAD(, dtfs_poll) dtm_pollent;
+	int		dtm_needwakeup;
+	vm_prot_t	dtm_allowprot;
+};
+
+struct dtfs_file {
+	union {
+		struct {
+			uint8_t **blocks;
+			size_t numblocks;
+			size_t datalen;
+		} reg;
+		struct {
+			struct puffs_node *dotdot;
+			LIST_HEAD(, dtfs_dirent) dirents;
+		} dir; 
+		struct {
+			char *target;
+		} link;
+	} u;
+#define df_blocks u.reg.blocks
+#define df_numblocks u.reg.numblocks
+#define df_datalen u.reg.datalen
+#define df_dotdot u.dir.dotdot
+#define df_dirents u.dir.dirents
+#define df_linktarget u.link.target
+};
+
+struct dtfs_dirent {
+	struct puffs_node *dfd_node;
+	struct puffs_node *dfd_parent;
+	char *dfd_name;
+	size_t dfd_namelen;
+
+	LIST_ENTRY(dtfs_dirent) dfd_entries;
+};
+
+struct dtfs_fid {
+	struct puffs_node	*dfid_addr;
+
+	/* best^Wsome-effort extra sanity check */
+	ino_t			dfid_fileid;
+	u_long			dfid_gen;
+};
+#define DTFS_FIDSIZE (sizeof(struct dtfs_fid))
+
+struct dtfs_poll {
+	struct puffs_cc *dp_pcc;
+	LIST_ENTRY(dtfs_poll) dp_entries;
+};
+
+struct puffs_node *	dtfs_genfile(struct puffs_node *,
+				     const struct puffs_cn *, enum vtype);
+struct dtfs_file *	dtfs_newdir(void);
+struct dtfs_file *	dtfs_newfile(void);
+struct dtfs_dirent *	dtfs_dirgetnth(struct dtfs_file *, int);
+struct dtfs_dirent *	dtfs_dirgetbyname(struct dtfs_file *,
+					  const char *, size_t);
+
+void			dtfs_nukenode(struct puffs_node *, struct puffs_node *,
+				      const char *, size_t);
+void			dtfs_freenode(struct puffs_node *);
+void			dtfs_setsize(struct puffs_node *, off_t);
+
+void	dtfs_adddent(struct puffs_node *, struct dtfs_dirent *);
+void	dtfs_removedent(struct puffs_node *, struct dtfs_dirent *);
+
+void	dtfs_baseattrs(struct vattr *, enum vtype, ino_t);
+void	dtfs_updatetimes(struct puffs_node *, int, int, int);
+
+bool	dtfs_isunder(struct puffs_node *, struct puffs_node *);
+
+
+#define DTFS_CTOF(a) ((struct dtfs_file *)(((struct puffs_node *)a)->pn_data))
+#define DTFS_PTOF(a) ((struct dtfs_file *)(a->pn_data))
+
+#endif /* DTFS_H_ */
diff --git a/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_subr.c b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_subr.c
new file mode 100644
index 000000000000..fcb817680b91
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_subr.c
@@ -0,0 +1,358 @@
+/*	$NetBSD: dtfs_subr.c,v 1.4 2013/10/19 17:45:00 christos Exp $	*/
+
+/*
+ * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <puffs.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "dtfs.h"
+
+void
+dtfs_baseattrs(struct vattr *vap, enum vtype type, ino_t id)
+{
+	struct timeval tv;
+	struct timespec ts;
+
+	gettimeofday(&tv, NULL);
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	vap->va_type = type;
+	if (type == VDIR) {
+		vap->va_mode = 0777;
+		vap->va_nlink = 1;	/* n + 1 after adding dent */
+	} else {
+		vap->va_mode = 0666;
+		vap->va_nlink = 0;	/* n + 1 */
+	}
+	vap->va_uid = 0;
+	vap->va_gid = 0;
+	vap->va_fileid = id;
+	vap->va_size = 0;
+	vap->va_blocksize = getpagesize();
+	vap->va_gen = random();
+	vap->va_flags = 0;
+	vap->va_rdev = PUFFS_VNOVAL;
+	vap->va_bytes = 0;
+	vap->va_filerev = 1;
+	vap->va_vaflags = 0;
+
+	vap->va_atime = vap->va_mtime = vap->va_ctime = vap->va_birthtime = ts;
+}
+
+/*
+ * Well, as you can probably see, this interface has the slight problem
+ * of assuming file creation will always be succesful, or at least not
+ * giving a reason for the failure.  Be sure to do better when you
+ * implement your own fs.
+ */
+struct puffs_node *
+dtfs_genfile(struct puffs_node *dir, const struct puffs_cn *pcn,
+	enum vtype type)
+{
+	struct dtfs_file *dff;
+	struct dtfs_dirent *dfd;
+	struct dtfs_mount *dtm;
+	struct puffs_node *newpn;
+	uid_t uid;
+	int rv;
+
+	assert(dir->pn_va.va_type == VDIR);
+	assert(dir->pn_mnt != NULL);
+
+	uid = 0;
+	rv = puffs_cred_getuid(pcn->pcn_cred, &uid);
+	assert(rv == 0);
+
+	if (type == VDIR) {
+		dff = dtfs_newdir();
+		dff->df_dotdot = dir;
+	} else
+		dff = dtfs_newfile();
+
+	dtm = puffs_pn_getmntspecific(dir);
+	newpn = puffs_pn_new(dir->pn_mnt, dff);
+	if (newpn == NULL)
+		errx(1, "getnewpnode");
+	dtfs_baseattrs(&newpn->pn_va, type, dtm->dtm_nextfileid++);
+
+	dfd = emalloc(sizeof(struct dtfs_dirent));
+	dfd->dfd_node = newpn;
+	dfd->dfd_name = estrndup(pcn->pcn_name, pcn->pcn_namelen);
+	dfd->dfd_namelen = strlen(dfd->dfd_name);
+	dfd->dfd_parent = dir;
+	dtfs_adddent(dir, dfd);
+
+	newpn->pn_va.va_uid = uid;
+	newpn->pn_va.va_gid = dir->pn_va.va_gid;
+
+	return newpn;
+}
+
+struct dtfs_file *
+dtfs_newdir()
+{
+	struct dtfs_file *dff;
+
+	dff = emalloc(sizeof(struct dtfs_file));
+	memset(dff, 0, sizeof(struct dtfs_file));
+	LIST_INIT(&dff->df_dirents);
+
+	return dff;
+}
+
+struct dtfs_file *
+dtfs_newfile()
+{
+	struct dtfs_file *dff;
+
+	dff = emalloc(sizeof(struct dtfs_file));
+	memset(dff, 0, sizeof(struct dtfs_file));
+
+	return dff;
+}
+
+struct dtfs_dirent *
+dtfs_dirgetnth(struct dtfs_file *searchdir, int n)
+{
+	struct dtfs_dirent *dirent;
+	int i;
+
+	i = 0;
+	LIST_FOREACH(dirent, &searchdir->df_dirents, dfd_entries) {
+		if (i == n)
+			return dirent;
+		i++;
+	}
+
+	return NULL;
+}
+
+struct dtfs_dirent *
+dtfs_dirgetbyname(struct dtfs_file *searchdir, const char *fname, size_t fnlen)
+{
+	struct dtfs_dirent *dirent;
+
+	LIST_FOREACH(dirent, &searchdir->df_dirents, dfd_entries)
+		if (dirent->dfd_namelen == fnlen
+		    && strncmp(dirent->dfd_name, fname, fnlen) == 0)
+			return dirent;
+
+	return NULL;
+}
+
+/*
+ * common nuke, kill dirent from parent node
+ */
+void
+dtfs_nukenode(struct puffs_node *nukeme, struct puffs_node *pn_parent,
+	const char *fname, size_t fnlen)
+{
+	struct dtfs_dirent *dfd;
+	struct dtfs_mount *dtm;
+
+	assert(pn_parent->pn_va.va_type == VDIR);
+
+	dfd = dtfs_dirgetbyname(DTFS_PTOF(pn_parent), fname, fnlen);
+	assert(dfd);
+
+	dtm = puffs_pn_getmntspecific(nukeme);
+	dtm->dtm_nfiles--;
+	assert(dtm->dtm_nfiles >= 1);
+
+	dtfs_removedent(pn_parent, dfd);
+	free(dfd);
+}
+
+/* free lingering information */
+void
+dtfs_freenode(struct puffs_node *pn)
+{
+	struct dtfs_file *df = DTFS_PTOF(pn);
+	struct dtfs_mount *dtm;
+	int i;
+
+	assert(pn->pn_va.va_nlink == 0);
+	dtm = puffs_pn_getmntspecific(pn);
+
+	switch (pn->pn_va.va_type) {
+	case VREG:
+		assert(dtm->dtm_fsizes >= pn->pn_va.va_size);
+		dtm->dtm_fsizes -= pn->pn_va.va_size;
+		for (i = 0; i < BLOCKNUM(df->df_datalen, DTFS_BLOCKSHIFT); i++)
+			free(df->df_blocks[i]);
+		if (df->df_datalen > i << DTFS_BLOCKSHIFT)
+			free(df->df_blocks[i]);
+		break;
+	case VLNK:
+		free(df->df_linktarget);
+		break;
+	case VCHR:
+	case VBLK:
+	case VDIR:
+	case VSOCK:
+	case VFIFO:
+		break;
+	default:
+		assert(0);
+		break;
+	}
+
+	free(df);
+	puffs_pn_put(pn);
+}
+
+void
+dtfs_setsize(struct puffs_node *pn, off_t newsize)
+{
+	struct dtfs_file *df = DTFS_PTOF(pn);
+	struct dtfs_mount *dtm;
+	size_t newblocks;
+	int needalloc, shrinks;
+	int i;
+
+	needalloc = newsize > ROUNDUP(df->df_datalen, DTFS_BLOCKSIZE);
+	shrinks = newsize < pn->pn_va.va_size;
+
+	if (needalloc || shrinks) {
+		newblocks = BLOCKNUM(newsize, DTFS_BLOCKSHIFT) + 1;
+
+		if (shrinks)
+			for (i = newblocks; i < df->df_numblocks; i++)
+				free(df->df_blocks[i]);
+
+		df->df_blocks = erealloc(df->df_blocks,
+		    newblocks * sizeof(uint8_t *));
+		/*
+		 * if extended, set storage to zero
+		 * to match correct behaviour
+		 */ 
+		if (!shrinks) {
+			for (i = df->df_numblocks; i < newblocks; i++) {
+				df->df_blocks[i] = emalloc(DTFS_BLOCKSIZE);
+				memset(df->df_blocks[i], 0, DTFS_BLOCKSIZE);
+			}
+		}
+
+		df->df_datalen = newsize;
+		df->df_numblocks = newblocks;
+	}
+
+	dtm = puffs_pn_getmntspecific(pn);
+	if (!shrinks) {
+		dtm->dtm_fsizes += newsize - pn->pn_va.va_size;
+	} else {
+		dtm->dtm_fsizes -= pn->pn_va.va_size - newsize;
+	}
+
+	pn->pn_va.va_size = newsize;
+	pn->pn_va.va_bytes = BLOCKNUM(newsize,DTFS_BLOCKSHIFT)>>DTFS_BLOCKSHIFT;
+}
+
+/* add & bump link count */
+void
+dtfs_adddent(struct puffs_node *pn_dir, struct dtfs_dirent *dent)
+{
+	struct dtfs_file *dir = DTFS_PTOF(pn_dir);
+	struct puffs_node *pn_file = dent->dfd_node;
+	struct dtfs_file *file = DTFS_PTOF(pn_file);
+	struct dtfs_mount *dtm;
+
+	assert(pn_dir->pn_va.va_type == VDIR);
+	LIST_INSERT_HEAD(&dir->df_dirents, dent, dfd_entries);
+	pn_file->pn_va.va_nlink++;
+
+	dtm = puffs_pn_getmntspecific(pn_file);
+	dtm->dtm_nfiles++;
+
+	dent->dfd_parent = pn_dir;
+	if (dent->dfd_node->pn_va.va_type == VDIR) {
+		file->df_dotdot = pn_dir;
+		pn_dir->pn_va.va_nlink++;
+	}
+
+	dtfs_updatetimes(pn_dir, 0, 1, 1);
+}
+
+/* remove & lower link count */
+void
+dtfs_removedent(struct puffs_node *pn_dir, struct dtfs_dirent *dent)
+{
+	struct puffs_node *pn_file = dent->dfd_node;
+
+	assert(pn_dir->pn_va.va_type == VDIR);
+	LIST_REMOVE(dent, dfd_entries);
+	if (pn_file->pn_va.va_type == VDIR) {
+		struct dtfs_file *df = DTFS_PTOF(pn_file);
+
+		pn_dir->pn_va.va_nlink--;
+		df->df_dotdot = NULL;
+	}
+	pn_file->pn_va.va_nlink--;
+	assert(pn_dir->pn_va.va_nlink >= 2);
+
+	dtfs_updatetimes(pn_dir, 0, 1, 1);
+}
+
+void
+dtfs_updatetimes(struct puffs_node *pn, int doatime, int doctime, int domtime)
+{
+	struct timeval tv;
+	struct timespec ts;
+
+	gettimeofday(&tv, NULL);
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	if (doatime)
+		pn->pn_va.va_atime = ts;
+	if (doctime)
+		pn->pn_va.va_ctime = ts;
+	if (domtime)
+		pn->pn_va.va_mtime = ts;
+}
+
+bool
+dtfs_isunder(struct puffs_node *pn, struct puffs_node *pn_parent)
+{
+	struct dtfs_file *df;
+
+	while (pn) {
+		if (pn == pn_parent)
+			return true;
+		df = DTFS_CTOF(pn);
+		pn = df->df_dotdot;
+	}
+
+	return false;
+}
diff --git a/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vfsops.c b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vfsops.c
new file mode 100644
index 000000000000..6f0c72ee3510
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vfsops.c
@@ -0,0 +1,298 @@
+/*	$NetBSD: dtfs_vfsops.c,v 1.3 2012/11/04 23:37:02 christos Exp $	*/
+
+/*
+ * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/resource.h>
+
+#include <stdio.h>
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <puffs.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "dtfs.h"
+
+static int
+rtstr(struct puffs_usermount *pu, const char *str, enum vtype vt)
+{
+	struct puffs_node *pn = puffs_getroot(pu);
+	struct vattr *va = &pn->pn_va;
+	struct dtfs_file *df = DTFS_PTOF(pn);
+	char ltarg[256+1];
+
+	if (sscanf(str, "%*s %256s", ltarg) != 1)
+		return 1;
+
+	dtfs_baseattrs(va, vt, 2);
+	df->df_linktarget = estrdup(ltarg);
+
+	va->va_nlink = 1;
+	va->va_size = strlen(df->df_linktarget);
+
+	puffs_setrootinfo(pu, vt, 0, 0);
+
+	return 0;
+}
+
+static int
+rtdev(struct puffs_usermount *pu, const char *str, enum vtype vt)
+{
+	struct puffs_node *pn = puffs_getroot(pu);
+	struct vattr *va = &pn->pn_va;
+	int major, minor;
+
+	if (sscanf(str, "%*s %d %d", &major, &minor) != 2)
+		return 1;
+
+	dtfs_baseattrs(va, vt, 2);
+	va->va_nlink = 1;
+	va->va_rdev = makedev(major, minor);
+
+	if (vt == VBLK)
+		va->va_mode |= S_IFBLK;
+	else
+		va->va_mode |= S_IFCHR;
+
+	puffs_setrootinfo(pu, vt, 0, va->va_rdev);
+
+	return 0;
+}
+
+static int
+rtnorm(struct puffs_usermount *pu, const char *str, enum vtype vt)
+{
+	struct puffs_node *pn = puffs_getroot(pu);
+	struct vattr *va = &pn->pn_va;
+
+	dtfs_baseattrs(va, vt, 2);
+	if (vt == VDIR)
+		va->va_nlink = 2;
+	else
+		va->va_nlink = 1;
+
+	puffs_setrootinfo(pu, vt, 0, 0);
+
+	return 0;
+}
+
+struct rtype {
+	char *tstr;
+	enum vtype vt;
+	int (*pfunc)(struct puffs_usermount *, const char *, enum vtype);
+} rtypes[] = {
+	{ "reg", VREG, rtnorm },
+	{ "dir", VDIR, rtnorm },
+	{ "blk", VBLK, rtdev },
+	{ "chr", VCHR, rtdev },
+	{ "lnk", VLNK, rtstr },
+	{ "sock", VSOCK, rtnorm },
+	{ "fifo", VFIFO, rtnorm }
+};
+#define NTYPES (sizeof(rtypes) / sizeof(rtypes[0]))
+
+int
+dtfs_domount(struct puffs_usermount *pu, const char *typestr)
+{
+	struct dtfs_mount *dtm;
+	struct dtfs_file *dff;
+	struct puffs_node *pn;
+	int i;
+
+	/* create mount-local thingie */
+	dtm = puffs_getspecific(pu);
+	dtm->dtm_nextfileid = 3;
+	dtm->dtm_nfiles = 1;
+	dtm->dtm_fsizes = 0;
+	LIST_INIT(&dtm->dtm_pollent);
+
+	/*
+	 * create root directory, do it "by hand" to avoid special-casing
+	 * dtfs_genfile()
+	 */
+	dff = dtfs_newdir();
+	dff->df_dotdot = NULL;
+	pn = puffs_pn_new(pu, dff);
+	if (!pn)
+		errx(1, "puffs_newpnode");
+	puffs_setroot(pu, pn);
+
+	if (!typestr) {
+		rtnorm(pu, NULL, VDIR);
+	} else {
+		for (i = 0; i < NTYPES; i++) {
+			if (strncmp(rtypes[i].tstr, typestr,
+			    strlen(rtypes[i].tstr)) == 0) {
+				if (rtypes[i].pfunc(pu, typestr,
+				    rtypes[i].vt) != 0) {
+					fprintf(stderr, "failed to parse "
+					    "\"%s\"\n", typestr);
+					return 1;
+				}
+				break;
+			}
+		}
+		if (i == NTYPES) {
+			fprintf(stderr, "no maching type for %s\n", typestr);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * statvfs() should fill in the following members of struct statvfs:
+ * 
+ * unsigned long   f_bsize;         file system block size
+ * unsigned long   f_frsize;        fundamental file system block size
+ * unsigned long   f_iosize;        optimal file system block size
+ * fsblkcnt_t      f_blocks;        number of blocks in file system,
+ *                                            (in units of f_frsize)
+ *
+ * fsblkcnt_t      f_bfree;         free blocks avail in file system
+ * fsblkcnt_t      f_bavail;        free blocks avail to non-root
+ * fsblkcnt_t      f_bresvd;        blocks reserved for root
+ *
+ * fsfilcnt_t      f_files;         total file nodes in file system
+ * fsfilcnt_t      f_ffree;         free file nodes in file system
+ * fsfilcnt_t      f_favail;        free file nodes avail to non-root
+ * fsfilcnt_t      f_fresvd;        file nodes reserved for root
+ *
+ *
+ * The rest are filled in by the kernel.
+ */
+#define ROUND(a,b) (((a) + ((b)-1)) & ~((b)-1))
+#define NFILES 1024*1024
+int
+dtfs_fs_statvfs(struct puffs_usermount *pu, struct statvfs *sbp)
+{
+	struct rlimit rlim;
+	struct dtfs_mount *dtm;
+	off_t btot, bfree;
+	int pgsize;
+
+	dtm = puffs_getspecific(pu);
+	pgsize = getpagesize();
+	memset(sbp, 0, sizeof(struct statvfs));
+
+	/*
+	 * Use datasize rlimit as an _approximation_ for free size.
+	 * This, of course, is not accurate due to overhead and not
+	 * accounting for metadata.
+	 */
+	if (getrlimit(RLIMIT_DATA, &rlim) == 0)
+		btot = rlim.rlim_cur;
+	else
+		btot = 16*1024*1024;
+	bfree = btot - dtm->dtm_fsizes;
+
+	sbp->f_blocks = ROUND(btot, pgsize) / pgsize;
+	sbp->f_files = NFILES;
+
+	sbp->f_bsize = sbp->f_frsize = sbp->f_iosize = pgsize;
+	sbp->f_bfree = sbp->f_bavail = ROUND(bfree, pgsize) / pgsize;
+	sbp->f_ffree = sbp->f_favail = NFILES - dtm->dtm_nfiles;
+
+	sbp->f_bresvd = sbp->f_fresvd = 0;
+
+	return 0;
+}
+#undef ROUND 
+
+static void *
+addrcmp(struct puffs_usermount *pu, struct puffs_node *pn, void *arg)
+{
+
+	if (pn == arg)
+		return pn;
+
+	return NULL;
+}
+
+int
+dtfs_fs_fhtonode(struct puffs_usermount *pu, void *fid, size_t fidsize,
+	struct puffs_newinfo *pni)
+{
+	struct dtfs_fid *dfid;
+	struct puffs_node *pn;
+
+	assert(fidsize == sizeof(struct dtfs_fid));
+	dfid = fid;
+
+	pn = puffs_pn_nodewalk(pu, addrcmp, dfid->dfid_addr);
+	if (pn == NULL)
+		return ESTALE;
+
+	if (pn->pn_va.va_fileid != dfid->dfid_fileid
+	    || pn->pn_va.va_gen != dfid->dfid_gen)
+		return ESTALE;
+	
+	puffs_newinfo_setcookie(pni, pn);
+	puffs_newinfo_setvtype(pni, pn->pn_va.va_type);
+	puffs_newinfo_setsize(pni, pn->pn_va.va_size);
+	puffs_newinfo_setrdev(pni, pn->pn_va.va_rdev);
+
+	return 0;
+}
+
+int
+dtfs_fs_nodetofh(struct puffs_usermount *pu, void *cookie,
+	void *fid, size_t *fidsize)
+{
+	struct puffs_node *pn = cookie;
+	struct dtfs_fid *dfid;
+	extern int dynamicfh;
+
+	if (dynamicfh == 0) {
+		assert(*fidsize >= sizeof(struct dtfs_fid));
+	} else {
+		if (*fidsize < sizeof(struct dtfs_fid)) {
+			*fidsize = sizeof(struct dtfs_fid);
+			return E2BIG;
+		}
+		*fidsize = sizeof(struct dtfs_fid);
+	}
+
+	dfid = fid;
+
+	dfid->dfid_addr = pn;
+	dfid->dfid_fileid = pn->pn_va.va_fileid;
+	dfid->dfid_gen = pn->pn_va.va_gen;
+
+	return 0;
+}
+
+int
+dtfs_fs_unmount(struct puffs_usermount *pu, int flags)
+{
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vnops.c b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vnops.c
new file mode 100644
index 000000000000..875109cb35b6
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/h_dtfs/dtfs_vnops.c
@@ -0,0 +1,586 @@
+/*	$NetBSD: dtfs_vnops.c,v 1.10 2013/10/19 17:45:00 christos Exp $	*/
+
+/*
+ * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/types.h>
+#include <sys/poll.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <puffs.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "dtfs.h"
+
+int
+dtfs_node_lookup(struct puffs_usermount *pu, void *opc,
+	struct puffs_newinfo *pni, const struct puffs_cn *pcn)
+{
+	struct puffs_node *pn_dir = opc;
+	struct dtfs_file *df = DTFS_CTOF(opc);
+	struct dtfs_dirent *dfd;
+	extern int straightflush;
+	int rv;
+
+	/* parent dir? */
+	if (PCNISDOTDOT(pcn)) {
+		if (df->df_dotdot == NULL)
+			return ENOENT;
+
+		assert(df->df_dotdot->pn_va.va_type == VDIR);
+		puffs_newinfo_setcookie(pni, df->df_dotdot);
+		puffs_newinfo_setvtype(pni, df->df_dotdot->pn_va.va_type);
+
+		return 0;
+	}
+
+	dfd = dtfs_dirgetbyname(df, pcn->pcn_name, pcn->pcn_namelen);
+	if (dfd) {
+		if ((pcn->pcn_flags & NAMEI_ISLASTCN) &&
+		    (pcn->pcn_nameiop == NAMEI_DELETE)) {
+			rv = puffs_access(VDIR, pn_dir->pn_va.va_mode,
+			    pn_dir->pn_va.va_uid, pn_dir->pn_va.va_gid,
+			    PUFFS_VWRITE, pcn->pcn_cred);
+			if (rv)
+				return rv;
+		}
+		puffs_newinfo_setcookie(pni, dfd->dfd_node);
+		puffs_newinfo_setvtype(pni, dfd->dfd_node->pn_va.va_type);
+		puffs_newinfo_setsize(pni, dfd->dfd_node->pn_va.va_size);
+		puffs_newinfo_setrdev(pni, dfd->dfd_node->pn_va.va_rdev);
+
+		if (straightflush)
+			puffs_flush_pagecache_node(pu, dfd->dfd_node);
+
+		return 0;
+	}
+
+	if ((pcn->pcn_flags & NAMEI_ISLASTCN)
+	    && (pcn->pcn_nameiop == NAMEI_CREATE ||
+	        pcn->pcn_nameiop == NAMEI_RENAME)) {
+		rv = puffs_access(VDIR, pn_dir->pn_va.va_mode,
+		    pn_dir->pn_va.va_uid, pn_dir->pn_va.va_gid,
+		    PUFFS_VWRITE, pcn->pcn_cred);
+		if (rv)
+			return rv;
+	}
+
+	return ENOENT;
+}
+
+int
+dtfs_node_access(struct puffs_usermount *pu, void *opc, int acc_mode,
+	const struct puffs_cred *pcr)
+{
+	struct puffs_node *pn = opc;
+
+	return puffs_access(pn->pn_va.va_type, pn->pn_va.va_mode,
+	    pn->pn_va.va_uid, pn->pn_va.va_gid, acc_mode, pcr);
+}
+
+int
+dtfs_node_setattr(struct puffs_usermount *pu, void *opc,
+	const struct vattr *va, const struct puffs_cred *pcr)
+{
+	struct puffs_node *pn = opc;
+	int rv;
+
+	/* check permissions */
+	if (va->va_flags != PUFFS_VNOVAL)
+		return EOPNOTSUPP;
+
+	if (va->va_uid != PUFFS_VNOVAL || va->va_gid != PUFFS_VNOVAL) {
+		rv = puffs_access_chown(pn->pn_va.va_uid, pn->pn_va.va_gid,
+		    va->va_uid, va->va_gid, pcr);
+		if (rv)
+			return rv;
+	}
+
+	if (va->va_mode != PUFFS_VNOVAL) {
+		rv = puffs_access_chmod(pn->pn_va.va_uid, pn->pn_va.va_gid,
+		    pn->pn_va.va_type, va->va_mode, pcr);
+		if (rv)
+			return rv;
+	}
+
+	if ((va->va_atime.tv_sec != PUFFS_VNOVAL
+	      && va->va_atime.tv_nsec != PUFFS_VNOVAL)
+	    || (va->va_mtime.tv_sec != PUFFS_VNOVAL
+	      && va->va_mtime.tv_nsec != PUFFS_VNOVAL)) {
+		rv = puffs_access_times(pn->pn_va.va_uid, pn->pn_va.va_gid,
+		    pn->pn_va.va_mode, va->va_vaflags & VA_UTIMES_NULL, pcr);
+		if (rv)
+			return rv;
+	}
+
+	if (va->va_size != PUFFS_VNOVAL) {
+		switch (pn->pn_va.va_type) {
+		case VREG:
+			dtfs_setsize(pn, va->va_size);
+			pn->pn_va.va_bytes = va->va_size;
+			break;
+		case VBLK:
+		case VCHR:
+		case VFIFO:
+			break;
+		case VDIR:
+			return EISDIR;
+		default:
+			return EOPNOTSUPP;
+		}
+	}
+
+	puffs_setvattr(&pn->pn_va, va);
+
+	return 0;
+}
+
+/* create a new node in the parent directory specified by opc */
+int
+dtfs_node_create(struct puffs_usermount *pu, void *opc,
+	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
+	const struct vattr *va)
+{
+	struct puffs_node *pn_parent = opc;
+	struct puffs_node *pn_new;
+
+	if (!(va->va_type == VREG || va->va_type == VSOCK))
+		return ENODEV;
+
+	pn_new = dtfs_genfile(pn_parent, pcn, va->va_type);
+	puffs_setvattr(&pn_new->pn_va, va);
+
+	puffs_newinfo_setcookie(pni, pn_new);
+
+	return 0;
+}
+
+int
+dtfs_node_remove(struct puffs_usermount *pu, void *opc, void *targ,
+	const struct puffs_cn *pcn)
+{
+	struct puffs_node *pn_parent = opc;
+	struct puffs_node *pn = targ;
+
+	if (pn->pn_va.va_type == VDIR)
+		return EPERM;
+
+	dtfs_nukenode(targ, pn_parent, pcn->pcn_name, pcn->pcn_namelen);
+
+	if (pn->pn_va.va_nlink == 0)
+		puffs_setback(puffs_cc_getcc(pu), PUFFS_SETBACK_NOREF_N2);
+
+	return 0;
+}
+
+int
+dtfs_node_mkdir(struct puffs_usermount *pu, void *opc,
+	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
+	const struct vattr *va)
+{
+	struct puffs_node *pn_parent = opc;
+	struct puffs_node *pn_new;
+
+	pn_new = dtfs_genfile(pn_parent, pcn, VDIR);
+	puffs_setvattr(&pn_new->pn_va, va);
+
+	puffs_newinfo_setcookie(pni, pn_new);
+
+	return 0;
+}
+
+int
+dtfs_node_rmdir(struct puffs_usermount *pu, void *opc, void *targ,
+	const struct puffs_cn *pcn)
+{
+	struct puffs_node *pn_parent = opc;
+	struct dtfs_file *df = DTFS_CTOF(targ);
+
+	if (!LIST_EMPTY(&df->df_dirents))
+		return ENOTEMPTY;
+
+	dtfs_nukenode(targ, pn_parent, pcn->pcn_name, pcn->pcn_namelen);
+	puffs_setback(puffs_cc_getcc(pu), PUFFS_SETBACK_NOREF_N2);
+
+	return 0;
+}
+
+int
+dtfs_node_readdir(struct puffs_usermount *pu, void *opc,
+	struct dirent *dent, off_t *readoff, size_t *reslen,
+	const struct puffs_cred *pcr,
+	int *eofflag, off_t *cookies, size_t *ncookies)
+{
+	struct puffs_node *pn = opc;
+	struct puffs_node *pn_nth;
+	struct dtfs_dirent *dfd_nth;
+
+	if (pn->pn_va.va_type != VDIR)
+		return ENOTDIR;
+	
+	dtfs_updatetimes(pn, 1, 0, 0);
+
+	*ncookies = 0;
+ again:
+	if (*readoff == DENT_DOT || *readoff == DENT_DOTDOT) {
+		puffs_gendotdent(&dent, pn->pn_va.va_fileid, *readoff, reslen);
+		(*readoff)++;
+		PUFFS_STORE_DCOOKIE(cookies, ncookies, *readoff);
+		goto again;
+	}
+
+	for (;;) {
+		dfd_nth = dtfs_dirgetnth(pn->pn_data, DENT_ADJ(*readoff));
+		if (!dfd_nth) {
+			*eofflag = 1;
+			break;
+		}
+		pn_nth = dfd_nth->dfd_node;
+
+		if (!puffs_nextdent(&dent, dfd_nth->dfd_name,
+		    pn_nth->pn_va.va_fileid,
+		    puffs_vtype2dt(pn_nth->pn_va.va_type),
+		    reslen))
+			break;
+
+		(*readoff)++;
+		PUFFS_STORE_DCOOKIE(cookies, ncookies, *readoff);
+	}
+
+	return 0;
+}
+
+int
+dtfs_node_poll(struct puffs_usermount *pu, void *opc, int *events)
+{
+	struct dtfs_mount *dtm = puffs_getspecific(pu);
+	struct dtfs_poll dp;
+	struct itimerval it;
+
+	memset(&it, 0, sizeof(struct itimerval));
+	it.it_value.tv_sec = 4;
+	if (setitimer(ITIMER_REAL, &it, NULL) == -1)
+		return errno;
+
+	dp.dp_pcc = puffs_cc_getcc(pu);
+	LIST_INSERT_HEAD(&dtm->dtm_pollent, &dp, dp_entries);
+	puffs_cc_yield(dp.dp_pcc);
+
+	*events = *events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM);
+	return 0;
+}
+
+int
+dtfs_node_mmap(struct puffs_usermount *pu, void *opc, vm_prot_t prot,
+	const struct puffs_cred *pcr)
+{
+	struct dtfs_mount *dtm = puffs_getspecific(pu);
+
+	if ((dtm->dtm_allowprot & prot) != prot)
+		return EACCES;
+
+	return 0;
+}
+
+int
+dtfs_node_rename(struct puffs_usermount *pu, void *opc, void *src,
+	const struct puffs_cn *pcn_src, void *targ_dir, void *targ,
+	const struct puffs_cn *pcn_targ)
+{
+	struct dtfs_dirent *dfd_src;
+	struct dtfs_file *df_targ;
+	struct puffs_node *pn_sdir = opc;
+	struct puffs_node *pn_sfile = src;
+	struct puffs_node *pn_tdir = targ_dir;
+	struct puffs_node *pn_tfile = targ;
+
+	/* check that we don't do the old amigados trick */
+	if (pn_sfile->pn_va.va_type == VDIR) {
+		if (dtfs_isunder(pn_tdir, pn_sfile))
+			return EINVAL;
+
+		if ((pcn_src->pcn_namelen == 1 && pcn_src->pcn_name[0]=='.') ||
+		    opc == src ||
+		    PCNISDOTDOT(pcn_src) ||
+		    PCNISDOTDOT(pcn_targ)) {
+			return EINVAL;
+		}
+	}
+
+	dfd_src = dtfs_dirgetbyname(DTFS_PTOF(pn_sdir),
+	    pcn_src->pcn_name, pcn_src->pcn_namelen);
+
+	/* does it still exist, or did someone race us here? */
+	if (dfd_src == NULL) {
+		return ENOENT;
+	}
+
+	/* if there's a target file, nuke it for atomic replacement */
+	if (pn_tfile) {
+		if (pn_tfile->pn_va.va_type == VDIR) {
+			df_targ = DTFS_CTOF(pn_tfile);
+			if (!LIST_EMPTY(&df_targ->df_dirents))
+				return ENOTEMPTY;
+		}
+		dtfs_nukenode(pn_tfile, pn_tdir,
+		    pcn_targ->pcn_name, pcn_targ->pcn_namelen);
+	}
+
+	/* out with the old */
+	dtfs_removedent(pn_sdir, dfd_src);
+	/* and in with the new */
+	dtfs_adddent(pn_tdir, dfd_src);
+
+	/* update name */
+	free(dfd_src->dfd_name);
+	dfd_src->dfd_name = estrndup(pcn_targ->pcn_name,pcn_targ->pcn_namelen);
+	dfd_src->dfd_namelen = strlen(dfd_src->dfd_name);
+
+	dtfs_updatetimes(src, 0, 1, 0);
+
+	return 0;
+}
+
+int
+dtfs_node_link(struct puffs_usermount *pu, void *opc, void *targ,
+	const struct puffs_cn *pcn)
+{
+	struct puffs_node *pn_dir = opc;
+	struct dtfs_dirent *dfd;
+
+	dfd = emalloc(sizeof(struct dtfs_dirent));
+	dfd->dfd_node = targ;
+	dfd->dfd_name = estrndup(pcn->pcn_name, pcn->pcn_namelen);
+	dfd->dfd_namelen = strlen(dfd->dfd_name);
+	dtfs_adddent(pn_dir, dfd);
+
+	dtfs_updatetimes(targ, 0, 1, 0);
+
+	return 0;
+}
+
+int
+dtfs_node_symlink(struct puffs_usermount *pu, void *opc,
+	struct puffs_newinfo *pni, const struct puffs_cn *pcn_src,
+	const struct vattr *va, const char *link_target)
+{
+	struct puffs_node *pn_parent = opc;
+	struct puffs_node *pn_new;
+	struct dtfs_file *df_new;
+
+	if (va->va_type != VLNK)
+		return ENODEV;
+
+	pn_new = dtfs_genfile(pn_parent, pcn_src, VLNK);
+	puffs_setvattr(&pn_new->pn_va, va);
+	df_new = DTFS_PTOF(pn_new);
+	df_new->df_linktarget = estrdup(link_target);
+	pn_new->pn_va.va_size = strlen(df_new->df_linktarget);
+
+	puffs_newinfo_setcookie(pni, pn_new);
+
+	return 0;
+}
+
+int
+dtfs_node_readlink(struct puffs_usermount *pu, void *opc,
+	const struct puffs_cred *cred, char *linkname, size_t *linklen)
+{
+	struct dtfs_file *df = DTFS_CTOF(opc);
+	struct puffs_node *pn = opc;
+
+	assert(pn->pn_va.va_type == VLNK);
+	strlcpy(linkname, df->df_linktarget, *linklen);
+	*linklen = strlen(linkname);
+
+	return 0;
+}
+
+int
+dtfs_node_mknod(struct puffs_usermount *pu, void *opc,
+	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
+	const struct vattr *va)
+{
+	struct puffs_node *pn_parent = opc;
+	struct puffs_node *pn_new;
+
+	if (!(va->va_type == VBLK || va->va_type == VCHR
+	    || va->va_type == VFIFO))
+		return EINVAL;
+
+	pn_new = dtfs_genfile(pn_parent, pcn, va->va_type);
+	puffs_setvattr(&pn_new->pn_va, va);
+
+	puffs_newinfo_setcookie(pni, pn_new);
+
+	return 0;
+}
+
+#define BLOCKOFF(a,b) ((a) & ((b)-1))
+#define BLOCKLEFT(a,b) ((b) - BLOCKOFF(a,b))
+
+/*
+ * Read operation, used both for VOP_READ and VOP_GETPAGES
+ */
+int
+dtfs_node_read(struct puffs_usermount *pu, void *opc, uint8_t *buf,
+	off_t offset, size_t *resid, const struct puffs_cred *pcr, int ioflag)
+{
+	struct puffs_node *pn = opc;
+	struct dtfs_file *df = DTFS_CTOF(opc);
+	quad_t xfer, origxfer;
+	uint8_t *src, *dest;
+	size_t copylen;
+
+	if (pn->pn_va.va_type != VREG)
+		return EISDIR;
+
+	xfer = MIN(*resid, df->df_datalen - offset);
+	if (xfer < 0)
+		return EINVAL;
+
+	dest = buf;
+	origxfer = xfer;
+	while (xfer > 0) {
+		copylen = MIN(xfer, BLOCKLEFT(offset, DTFS_BLOCKSIZE));
+		src = df->df_blocks[BLOCKNUM(offset, DTFS_BLOCKSHIFT)]
+		    + BLOCKOFF(offset, DTFS_BLOCKSIZE);
+		memcpy(dest, src, copylen);
+		offset += copylen;
+		dest += copylen;
+		xfer -= copylen;
+	}
+	*resid -= origxfer;
+
+	dtfs_updatetimes(pn, 1, 0, 0);
+
+	return 0;
+}
+
+/*
+ * write operation on the wing
+ */
+int
+dtfs_node_write(struct puffs_usermount *pu, void *opc, uint8_t *buf,
+	off_t offset, size_t *resid, const struct puffs_cred *pcr, int ioflag)
+{
+	struct puffs_node *pn = opc;
+	struct dtfs_file *df = DTFS_CTOF(opc);
+	uint8_t *src, *dest;
+	size_t copylen;
+
+	if (pn->pn_va.va_type != VREG)
+		return EISDIR;
+
+	if (ioflag & PUFFS_IO_APPEND)
+		offset = pn->pn_va.va_size;
+
+	if (*resid + offset > pn->pn_va.va_size)
+		dtfs_setsize(pn, *resid + offset);
+
+	src = buf;
+	while (*resid > 0) {
+		int i;
+		copylen = MIN(*resid, BLOCKLEFT(offset, DTFS_BLOCKSIZE));
+		i = BLOCKNUM(offset, DTFS_BLOCKSHIFT);
+		dest = df->df_blocks[i]
+		    + BLOCKOFF(offset, DTFS_BLOCKSIZE);
+		memcpy(dest, src, copylen);
+		offset += copylen;
+		dest += copylen;
+		*resid -= copylen;
+	}
+
+	dtfs_updatetimes(pn, 0, 1, 1);
+
+	return 0;
+}
+
+int
+dtfs_node_pathconf(struct puffs_usermount *pu, puffs_cookie_t opc,
+	int name, register_t *retval)
+{
+
+	switch (name) {
+	case _PC_LINK_MAX:
+		*retval = LINK_MAX;
+		return 0;
+	case _PC_NAME_MAX:
+		*retval = NAME_MAX;
+		return 0;
+	case _PC_PATH_MAX:
+		*retval = PATH_MAX;
+		return 0;
+	case _PC_PIPE_BUF:
+		*retval = PIPE_BUF;
+		return 0;
+	case _PC_CHOWN_RESTRICTED:
+		*retval = 1;
+		return 0;
+	case _PC_NO_TRUNC:
+		*retval = 1;
+		return 0;
+	case _PC_SYNC_IO:
+		*retval = 1;
+		return 0;
+	case _PC_FILESIZEBITS:
+		*retval = 43; /* this one goes to 11 */
+		return 0;
+	case _PC_SYMLINK_MAX:
+		*retval = MAXPATHLEN;
+		return 0;
+	case _PC_2_SYMLINKS:
+		*retval = 1;
+		return 0;
+	default:
+		return EINVAL;
+	}
+}
+
+int
+dtfs_node_inactive(struct puffs_usermount *pu, puffs_cookie_t opc)
+{
+	struct puffs_node *pn = opc;
+
+	if (pn->pn_va.va_nlink == 0)
+		puffs_setback(puffs_cc_getcc(pu), PUFFS_SETBACK_NOREF_N1);
+	return 0;
+}
+
+int
+dtfs_node_reclaim(struct puffs_usermount *pu, void *opc)
+{
+	struct puffs_node *pn = opc;
+
+	if (pn->pn_va.va_nlink == 0)
+		dtfs_freenode(pn);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/fs/puffs/t_basic.c b/contrib/netbsd-tests/fs/puffs/t_basic.c
new file mode 100644
index 000000000000..ce5e4ea15f83
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/t_basic.c
@@ -0,0 +1,455 @@
+/*	$NetBSD: t_basic.c,v 1.12 2013/10/19 17:45:00 christos Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <puffs.h>
+#include <puffsdump.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+#include "../common/h_fsmacros.h"
+
+/*
+ * Do a synchronous operation.  When this returns, all FAF operations
+ * have at least been delivered to the file system.
+ *
+ * XXX: is this really good enough considering puffs(9)-issued
+ * callback operations?
+ */
+static void
+syncbar(const char *fs)
+{
+	struct statvfs svb;
+
+	if (rump_sys_statvfs1(fs, &svb, ST_WAIT) == -1)
+		atf_tc_fail_errno("statvfs");
+}
+
+#ifdef PUFFSDUMP
+static void __unused
+dumpopcount(struct puffstestargs *args)
+{
+	size_t i;
+
+	printf("VFS OPS:\n");
+	for (i = 0; i < MIN(puffsdump_vfsop_count, PUFFS_VFS_MAX); i++) {
+		printf("\t%s: %d\n",
+		    puffsdump_vfsop_revmap[i], args->pta_vfs_toserv_ops[i]);
+	}
+
+	printf("VN OPS:\n");
+	for (i = 0; i < MIN(puffsdump_vnop_count, PUFFS_VN_MAX); i++) {
+		printf("\t%s: %d\n",
+		    puffsdump_vnop_revmap[i], args->pta_vn_toserv_ops[i]);
+	}
+}
+#endif
+
+ATF_TC(mount);
+ATF_TC_HEAD(mount, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "puffs+dtfs un/mount test");
+}
+
+ATF_TC_BODY(mount, tc)
+{
+	void *args;
+
+	FSTEST_CONSTRUCTOR(tc, puffs, args);
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(root_reg);
+ATF_TC_HEAD(root_reg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "root is a regular file");
+}
+
+#define MAKEOPTS(...) \
+    char *theopts[] = {NULL, "-s", __VA_ARGS__, "dtfs", "n/a", NULL}
+
+ATF_TC_BODY(root_reg, tc)
+{
+	MAKEOPTS("-r", "reg");
+	void *args;
+	int fd, rv;
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+
+	fd = rump_sys_open(FSTEST_MNTNAME, O_RDWR);
+	if (fd == -1)
+		atf_tc_fail_errno("open root");
+	if (rump_sys_write(fd, &fd, sizeof(fd)) != sizeof(fd))
+		atf_tc_fail_errno("write to root");
+	rv = rump_sys_mkdir(FSTEST_MNTNAME "/test", 0777);
+	ATF_REQUIRE(errno == ENOTDIR);
+	ATF_REQUIRE(rv == -1);
+	rump_sys_close(fd);
+
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(root_lnk);
+ATF_TC_HEAD(root_lnk, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "root is a symbolic link");
+}
+
+#define LINKSTR "/path/to/nowhere"
+ATF_TC_BODY(root_lnk, tc)
+{
+	MAKEOPTS("-r", "lnk " LINKSTR);
+	void *args;
+	char buf[PATH_MAX];
+	ssize_t len;
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+
+	if ((len = rump_sys_readlink(FSTEST_MNTNAME, buf, sizeof(buf)-1)) == -1)
+		atf_tc_fail_errno("readlink");
+	buf[len] = '\0';
+
+	ATF_REQUIRE_STREQ(buf, LINKSTR);
+
+#if 0 /* XXX: unmount uses FOLLOW */
+	if (rump_sys_unmount("/mp", 0) == -1)
+		atf_tc_fail_errno("unmount");
+#endif
+}
+
+ATF_TC(root_fifo);
+ATF_TC_HEAD(root_fifo, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "root is a symbolic link");
+}
+
+#define MAGICSTR "nakit ja muusiperunat maustevoilla"
+static void *
+dofifow(void *arg)
+{
+	int fd = (int)(uintptr_t)arg;
+	char buf[512];
+
+	printf("writing\n");
+	strcpy(buf, MAGICSTR);
+	if (rump_sys_write(fd, buf, strlen(buf)+1) != strlen(buf)+1)
+		atf_tc_fail_errno("write to fifo");
+
+	return NULL;
+}
+
+ATF_TC_BODY(root_fifo, tc)
+{
+	MAKEOPTS("-r", "fifo");
+	void *args;
+	pthread_t pt;
+	char buf[512];
+	int fd;
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+
+	fd = rump_sys_open(FSTEST_MNTNAME, O_RDWR);
+	if (fd == -1)
+		atf_tc_fail_errno("open fifo");
+
+	pthread_create(&pt, NULL, dofifow, (void *)(uintptr_t)fd);
+
+	memset(buf, 0, sizeof(buf));
+	if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read fifo");
+
+	ATF_REQUIRE_STREQ(buf, MAGICSTR);
+	rump_sys_close(fd);
+
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(root_chrdev);
+ATF_TC_HEAD(root_chrdev, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "root is /dev/null");
+}
+
+ATF_TC_BODY(root_chrdev, tc)
+{
+	MAKEOPTS("-r", "chr 2 2");
+	void *args;
+	ssize_t rv;
+	char buf[512];
+	int fd;
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+
+	fd = rump_sys_open(FSTEST_MNTNAME, O_RDWR);
+	if (fd == -1)
+		atf_tc_fail_errno("open null");
+
+	rv = rump_sys_write(fd, buf, sizeof(buf));
+	ATF_REQUIRE(rv == sizeof(buf));
+
+	rv = rump_sys_read(fd, buf, sizeof(buf));
+	ATF_REQUIRE(rv == 0);
+
+	rump_sys_close(fd);
+
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+/*
+ * Inactive/reclaim tests
+ */
+
+ATF_TC(inactive_basic);
+ATF_TC_HEAD(inactive_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "inactive gets called");
+}
+
+ATF_TC_BODY(inactive_basic, tc)
+{
+	struct puffstestargs *pargs;
+	void *args;
+	int fd;
+
+	FSTEST_CONSTRUCTOR(tc, puffs, args);
+	FSTEST_ENTER();
+	pargs = args;
+
+	fd = rump_sys_open("file", O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create");
+
+	/* none yet */
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 0);
+
+	rump_sys_close(fd);
+
+	/* one for file */
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 1);
+
+	FSTEST_EXIT();
+
+	/* another for the mountpoint */
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 2);
+
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(inactive_reclaim);
+ATF_TC_HEAD(inactive_reclaim, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "inactive/reclaim gets called");
+}
+
+ATF_TC_BODY(inactive_reclaim, tc)
+{
+	struct puffstestargs *pargs;
+	void *args;
+	int fd;
+
+	FSTEST_CONSTRUCTOR(tc, puffs, args);
+	FSTEST_ENTER();
+	pargs = args;
+
+	fd = rump_sys_open("file", O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create");
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 0);
+
+	if (rump_sys_unlink("file") == -1)
+		atf_tc_fail_errno("remove");
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 0);
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 0);
+
+	rump_sys_close(fd);
+	syncbar(FSTEST_MNTNAME);
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], 1);
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 1);
+
+	FSTEST_EXIT();
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(reclaim_hardlink);
+ATF_TC_HEAD(reclaim_hardlink, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "reclaim gets called only after "
+	    "final link is gone");
+}
+
+ATF_TC_BODY(reclaim_hardlink, tc)
+{
+	struct puffstestargs *pargs;
+	void *args;
+	int fd;
+	int ianow;
+
+	FSTEST_CONSTRUCTOR(tc, puffs, args);
+	FSTEST_ENTER();
+	pargs = args;
+
+	fd = rump_sys_open("file", O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create");
+
+	if (rump_sys_link("file", "anotherfile") == -1)
+		atf_tc_fail_errno("create link");
+	rump_sys_close(fd);
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 0);
+
+	/* unlink first hardlink */
+	if (rump_sys_unlink("file") == -1)
+		atf_tc_fail_errno("unlink 1");
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 0);
+	ianow = pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE];
+
+	/* unlink second hardlink */
+	if (rump_sys_unlink("anotherfile") == -1)
+		atf_tc_fail_errno("unlink 2");
+
+	syncbar(FSTEST_MNTNAME);
+
+	ATF_REQUIRE(ianow < pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE]);
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 1);
+
+	FSTEST_EXIT();
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(unlink_accessible);
+ATF_TC_HEAD(unlink_accessible, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "open file is accessible after "
+	    "having been unlinked");
+}
+
+ATF_TC_BODY(unlink_accessible, tc)
+{
+	MAKEOPTS("-i", "-o", "nopagecache");
+	struct puffstestargs *pargs;
+	void *args;
+	char buf[512];
+	int fd, ianow;
+
+	assert(sizeof(buf) > sizeof(MAGICSTR));
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+	FSTEST_ENTER();
+	pargs = args;
+
+	fd = rump_sys_open("file", O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create");
+
+	if (rump_sys_write(fd, MAGICSTR, sizeof(MAGICSTR)) != sizeof(MAGICSTR))
+		atf_tc_fail_errno("write");
+	if (rump_sys_unlink("file") == -1)
+		atf_tc_fail_errno("unlink");
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 0);
+	ianow = pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE];
+
+	if (rump_sys_pread(fd, buf, sizeof(buf), 0) == -1)
+		atf_tc_fail_errno("read");
+	rump_sys_close(fd);
+
+	syncbar(FSTEST_MNTNAME);
+
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_RECLAIM], 1);
+	ATF_REQUIRE_EQ(pargs->pta_vn_toserv_ops[PUFFS_VN_INACTIVE], ianow+1);
+
+	ATF_REQUIRE_STREQ(buf, MAGICSTR);
+
+	FSTEST_EXIT();
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TC(signals);
+ATF_TC_HEAD(signals, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that sending a signal can "
+	    "cause an interrupt to puffs wait");
+}
+
+extern struct proc *rumpns_initproc;
+extern void rumpns_psignal(struct proc *, int);
+extern void rumpns_sigclearall(struct proc *, void *, void *);
+ATF_TC_BODY(signals, tc)
+{
+	struct stat sb;
+	void *args;
+
+	rump_boot_setsigmodel(RUMP_SIGMODEL_RECORD);
+
+	FSTEST_CONSTRUCTOR(tc, puffs, args);
+	FSTEST_ENTER();
+	RL(rump_sys_stat(".", &sb));
+
+	/* send SIGUSR1, should not affect puffs ops */
+	rump_schedule();
+	rumpns_psignal(rumpns_initproc, SIGUSR1);
+	rump_unschedule();
+	RL(rump_sys_stat(".", &sb));
+
+	/* send SIGTERM, should get EINTR */
+	rump_schedule();
+	rumpns_psignal(rumpns_initproc, SIGTERM);
+	rump_unschedule();
+	ATF_REQUIRE_ERRNO(EINTR, rump_sys_stat(".", &sb) == -1);
+
+	/* clear sigmask so that we can unmount */
+	rump_schedule();
+	rumpns_sigclearall(rumpns_initproc, NULL, NULL);
+	rump_unschedule();
+
+	FSTEST_EXIT();
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mount);
+
+	ATF_TP_ADD_TC(tp, root_fifo);
+	ATF_TP_ADD_TC(tp, root_lnk);
+	ATF_TP_ADD_TC(tp, root_reg);
+	ATF_TP_ADD_TC(tp, root_chrdev);
+
+	ATF_TP_ADD_TC(tp, inactive_basic);
+	ATF_TP_ADD_TC(tp, inactive_reclaim);
+	ATF_TP_ADD_TC(tp, reclaim_hardlink);
+	ATF_TP_ADD_TC(tp, unlink_accessible);
+
+	ATF_TP_ADD_TC(tp, signals);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/puffs/t_fuzz.c b/contrib/netbsd-tests/fs/puffs/t_fuzz.c
new file mode 100644
index 000000000000..1d249c0a8be1
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/t_fuzz.c
@@ -0,0 +1,283 @@
+/*	$NetBSD: t_fuzz.c,v 1.5 2012/04/21 01:03:46 manu Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Fuzztest puffs mount.  There are n different levels of testing:
+ * each one pours more and more sane garbage into the args to that
+ * the mount progresses further and further.  Level 8 (at least when
+ * writing this comment) should be the one where mounting actually
+ * succeeds.
+ *
+ * Our metric of success is crash / no crash.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/poll.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <fs/puffs/puffs_msgif.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+#define ITERATIONS 100
+
+static void
+fixversion(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_vers = PUFFSVERSION;
+}
+
+static void
+fixkflag(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_flags &= PUFFS_KFLAG_MASK;
+
+	/*
+	 * PUFFS_KFLAG_CACHE_FS_TTL require extended behavior
+	 * from the filesystem for which we have no test right now.
+	 */
+	kargs->pa_flags &= ~PUFFS_KFLAG_CACHE_FS_TTL;
+}
+
+static void
+fixfhflag(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_fhflags &= PUFFS_FHFLAG_MASK;
+}
+
+static void
+fixspare(struct puffs_kargs *kargs)
+{
+
+	memset(&kargs->pa_spare, 0, sizeof(kargs->pa_spare));
+}
+
+static void
+fixhandsize(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_fhsize %= PUFFS_FHSIZE_MAX+4;
+}
+
+static void
+fixhandsize2(struct puffs_kargs *kargs)
+{
+
+	/* XXX: values */
+	if (kargs->pa_fhflags & PUFFS_FHFLAG_NFSV3)
+		kargs->pa_fhsize %= 60;
+	if (kargs->pa_fhflags & PUFFS_FHFLAG_NFSV2)
+		kargs->pa_fhsize %= 28;
+}
+
+static void
+fixputter(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_fd = rump_sys_open("/dev/putter", O_RDWR);
+	if (kargs->pa_fd == -1)
+		atf_tc_fail_errno("open putter");
+}
+
+static void
+fixroot(struct puffs_kargs *kargs)
+{
+
+	kargs->pa_root_vtype %= VBAD;
+}
+
+static void
+unfixputter(struct puffs_kargs *kargs)
+{
+
+	rump_sys_close(kargs->pa_fd);
+}
+
+typedef void (*fixfn)(struct puffs_kargs *);
+static fixfn fixstack[] = {
+	fixversion,
+	fixkflag,
+	fixfhflag,
+	fixspare,
+	fixhandsize,
+	fixhandsize2,
+	fixputter,
+	fixroot,
+};
+
+static void
+fixup(int nfix, struct puffs_kargs *kargs)
+{
+	int i;
+
+	assert(nfix <= __arraycount(fixstack));
+	for (i = 0; i < nfix; i++)
+		fixstack[i](kargs);
+}
+
+static void
+unfixup(int nfix, struct puffs_kargs *kargs)
+{
+
+	if (nfix >= 7)
+		unfixputter(kargs);
+}
+
+static pthread_mutex_t damtx;
+static pthread_cond_t dacv;
+static int dafd = -1;
+
+static void *
+respondthread(void *arg)
+{
+	char buf[PUFFS_MSG_MAXSIZE];
+	struct puffs_req *preq = (void *)buf;
+	struct pollfd pfd;
+	ssize_t n;
+
+	pthread_mutex_lock(&damtx);
+	for (;;) {
+		while (dafd == -1)
+			pthread_cond_wait(&dacv, &damtx);
+
+		while (dafd != -1) {
+			pthread_mutex_unlock(&damtx);
+			pfd.fd = dafd;
+			pfd.events = POLLIN;
+			pfd.revents = 0;
+			if (rump_sys_poll(&pfd, 1, 10) == 0) {
+				pthread_mutex_lock(&damtx);
+				continue;
+			}
+			n = rump_sys_read(dafd, buf, sizeof(buf));
+			if (n <= 0) {
+				pthread_mutex_lock(&damtx);
+				break;
+			}
+
+			/* just say it was succesful */
+			preq->preq_rv = 0;
+			rump_sys_write(dafd, buf, n);
+			pthread_mutex_lock(&damtx);
+		}
+	}
+
+	return NULL;
+}
+
+static void
+testbody(int nfix)
+{
+	pthread_t pt;
+	struct puffs_kargs kargs;
+	unsigned long seed;
+	int i;
+
+	seed = time(NULL);
+	srandom(seed);
+	printf("test seeded RNG with %lu\n", seed);
+
+	rump_init();
+
+	pthread_mutex_init(&damtx, NULL);
+	pthread_cond_init(&dacv, NULL);
+	pthread_create(&pt, NULL, respondthread, NULL);
+
+	ATF_REQUIRE(rump_sys_mkdir("/mnt", 0777) == 0);
+
+	for (i = 0; i < ITERATIONS; i++) {
+		tests_makegarbage(&kargs, sizeof(kargs));
+		fixup(nfix, &kargs);
+		if (rump_sys_mount(MOUNT_PUFFS, "/mnt", 0,
+		    &kargs, sizeof(kargs)) == 0) {
+			struct stat sb;
+
+			pthread_mutex_lock(&damtx);
+			dafd = kargs.pa_fd;
+			pthread_cond_signal(&dacv);
+			pthread_mutex_unlock(&damtx);
+
+			rump_sys_stat("/mnt", &sb);
+			rump_sys_unmount("/mnt", MNT_FORCE);
+		}
+		unfixup(nfix, &kargs);
+
+		pthread_mutex_lock(&damtx);
+		dafd = -1;
+		pthread_mutex_unlock(&damtx);
+	}
+}
+
+#define MAKETEST(_n_)							\
+ATF_TC(mountfuzz##_n_);							\
+ATF_TC_HEAD(mountfuzz##_n_, tc)						\
+{atf_tc_set_md_var(tc, "descr", "garbage kargs, " # _n_ " fix(es)");}	\
+ATF_TC_BODY(mountfuzz##_n_, tc) {testbody(_n_);}
+
+MAKETEST(0);
+MAKETEST(1);
+MAKETEST(2);
+MAKETEST(3);
+MAKETEST(4);
+MAKETEST(5);
+MAKETEST(6);
+MAKETEST(7);
+MAKETEST(8);
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mountfuzz0);
+	ATF_TP_ADD_TC(tp, mountfuzz1);
+	ATF_TP_ADD_TC(tp, mountfuzz2);
+	ATF_TP_ADD_TC(tp, mountfuzz3);
+	ATF_TP_ADD_TC(tp, mountfuzz4);
+	ATF_TP_ADD_TC(tp, mountfuzz5);
+	ATF_TP_ADD_TC(tp, mountfuzz6);
+	ATF_TP_ADD_TC(tp, mountfuzz7);
+	ATF_TP_ADD_TC(tp, mountfuzz8);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/puffs/t_io.c b/contrib/netbsd-tests/fs/puffs/t_io.c
new file mode 100644
index 000000000000..37c386c83d5a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/puffs/t_io.c
@@ -0,0 +1,61 @@
+/*	$NetBSD: t_io.c,v 1.1 2010/11/12 17:33:28 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <puffs.h>
+#include <puffsdump.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+#include "../common/h_fsmacros.h"
+
+#define MAKEOPTS(...) \
+    char *theopts[] = {NULL, "-s", __VA_ARGS__, "dtfs", "n/a", NULL}
+
+ATF_TC(nocache);
+ATF_TC_HEAD(nocache, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests large i/o without page cache");
+}
+
+ATF_TC_BODY(nocache, tc)
+{
+	MAKEOPTS("-o", "nopagecache");
+	char data[1024*1024];
+	void *args;
+	int fd;
+
+	FSTEST_CONSTRUCTOR_FSPRIV(tc, puffs, args, theopts);
+	FSTEST_ENTER();
+
+	RL(fd = rump_sys_open("afile", O_CREAT | O_RDWR, 0755));
+	RL(rump_sys_write(fd, data, sizeof(data)));
+	rump_sys_close(fd);
+
+	FSTEST_EXIT();
+	FSTEST_DESTRUCTOR(tc, puffs, args);
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nocache);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/README b/contrib/netbsd-tests/fs/tmpfs/README
new file mode 100644
index 000000000000..cdc3f2d11ca7
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/README
@@ -0,0 +1,17 @@
+The tests in this directory where written at the same time tmpfs was
+developed.  This is why, if you follow the order of tests in the Atffile,
+you will notice that they start checking the most basic things and end
+checking the less common ones.  Furthermore, tests try not to use features
+tested by further tests in the lists.
+
+However, the above is not the most appropriate testing procedure when you
+have a working file system because some separation in test programs does
+not make sense afterwards.
+
+Many of the tests here are applicable to any file system.  They should be
+refactored to be reusable on any mounted file system, which could also
+remove the need to do the mount/unmount steps in each and every test case.
+
+Possibly take a look at the file system tests in FreeBSD.  They seem to be
+much more complete, even though they are written in Perl and therefore not
+directly usable.
diff --git a/contrib/netbsd-tests/fs/tmpfs/h_funcs.subr b/contrib/netbsd-tests/fs/tmpfs/h_funcs.subr
new file mode 100644
index 000000000000..07c1644da66f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/h_funcs.subr
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# $NetBSD: h_funcs.subr,v 1.5 2013/03/17 01:16:45 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+Mount_Point=
+
+#
+# test_mount [args]
+#
+#	Mounts tmpfs over ${Mount_Point} and changes the current directory
+#	to the mount point.  Optional arguments may be passed to the
+#	mount command.
+#
+test_mount() {
+	require_fs tmpfs
+
+	Mount_Point=$(pwd)/mntpt
+	atf_check -s eq:0 -o empty -e empty mkdir "${Mount_Point}"
+	echo "mount -t tmpfs ${*} tmpfs ${Mount_Point}"
+	mount -t tmpfs "${@}" tmpfs "${Mount_Point}" 2>mounterr
+	if [ "${?}" -ne 0 ]; then
+		cat mounterr 1>&2
+		if grep 'Operation not supported' mounterr > /dev/null; then
+			atf_skip "tmpfs not supported"
+		fi 
+		atf_fail "Failed to mount a tmpfs file system"
+	fi
+	cd "${Mount_Point}"
+}
+
+#
+# test_unmount
+#
+#	Unmounts the file system mounted by test_mount.
+#
+test_unmount() {
+	cd - >/dev/null
+	atf_check -s eq:0 -o empty -e empty umount ${Mount_Point}
+	atf_check -s eq:0 -o empty -e empty rmdir ${Mount_Point}
+	Mount_Point=
+}
+
+#
+# kqueue_monitor expected_nevents file1 [.. fileN]
+#
+#	Monitors the commands given through stdin (one per line) using
+#	kqueue and stores the events raised in a log that can be later
+#	verified with kqueue_check.
+#
+kqueue_monitor() {
+	nev=${1}; shift
+	echo "Running kqueue-monitored commands and expecting" \
+	    "${nev} events"
+	$(atf_get_srcdir)/h_tools kqueue ${*} >kqueue.log || \
+	    atf_fail "Could not launch kqueue monitor"
+	got=$(wc -l kqueue.log | awk '{ print $1 }')
+	test ${got} -eq ${nev} || \
+	    atf_fail "Got ${got} events but expected ${nev}"
+}
+
+#
+# kqueue_check file event
+#
+#	Checks if kqueue raised the given event when monitoring the
+#	given file.
+#
+kqueue_check() {
+	echo "Checking if ${1} received ${2}"
+	grep "^${1} - ${2}$" kqueue.log >/dev/null || \
+	    atf_fail "${1} did not receive ${2}"
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/h_tools.c b/contrib/netbsd-tests/fs/tmpfs/h_tools.c
new file mode 100644
index 000000000000..6a7b8fd38c46
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/h_tools.c
@@ -0,0 +1,299 @@
+/*	$NetBSD: h_tools.c,v 1.4 2011/06/11 18:03:17 christos Exp $	*/
+
+/*
+ * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Helper tools for several tests.  These are kept in a single file due
+ * to the limitations of bsd.prog.mk to build a single program in a
+ * given directory.
+ */
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/mount.h>
+#include <sys/statvfs.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/un.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* --------------------------------------------------------------------- */
+
+static int getfh_main(int, char **);
+static int kqueue_main(int, char **);
+static int rename_main(int, char **);
+static int sockets_main(int, char **);
+static int statvfs_main(int, char **);
+
+/* --------------------------------------------------------------------- */
+
+int
+getfh_main(int argc, char **argv)
+{
+	int error;
+	void *fh;
+	size_t fh_size;
+
+	if (argc < 2)
+		return EXIT_FAILURE;
+
+	fh_size = 0;
+	fh = NULL;
+	for (;;) {
+		if (fh_size) {
+			fh = malloc(fh_size);
+			if (fh == NULL) {
+				fprintf(stderr, "out of memory");
+				return EXIT_FAILURE;
+			}
+		}
+		/*
+		 * The kernel provides the necessary size in fh_size -
+		 * but it may change if someone moves things around,
+		 * so retry untill we have enough memory.
+		 */
+		error = getfh(argv[1], fh, &fh_size);
+		if (error == 0) {
+			break;
+		} else {
+			if (fh != NULL)
+				free(fh);
+			if (errno != E2BIG) {
+				warn("getfh");
+				return EXIT_FAILURE;
+			}
+		}
+	}
+
+	error = write(STDOUT_FILENO, fh, fh_size);
+	if (error == -1) {
+		warn("write");
+		return EXIT_FAILURE;
+	}
+	free(fh);
+
+	return 0;
+}
+
+/* --------------------------------------------------------------------- */
+
+int
+kqueue_main(int argc, char **argv)
+{
+	char *line;
+	int i, kq;
+	size_t len;
+	struct kevent *changes, event;
+
+	if (argc < 2)
+		return EXIT_FAILURE;
+
+	argc--;
+	argv++;
+
+	changes = malloc(sizeof(struct kevent) * argc);
+	if (changes == NULL)
+		errx(EXIT_FAILURE, "not enough memory");
+
+	for (i = 0; i < argc; i++) {
+		int fd;
+
+		fd = open(argv[i], O_RDONLY);
+		if (fd == -1)
+			err(EXIT_FAILURE, "cannot open %s", argv[i]);
+
+		EV_SET(&changes[i], fd, EVFILT_VNODE,
+		    EV_ADD | EV_ENABLE | EV_ONESHOT,
+		    NOTE_ATTRIB | NOTE_DELETE | NOTE_EXTEND | NOTE_LINK |
+		    NOTE_RENAME | NOTE_REVOKE | NOTE_WRITE,
+		    0, 0);
+	}
+
+	kq = kqueue();
+	if (kq == -1)
+		err(EXIT_FAILURE, "kqueue");
+
+	while ((line = fgetln(stdin, &len)) != NULL) {
+		int ec, nev;
+		struct timespec to;
+
+		to.tv_sec = 0;
+		to.tv_nsec = 100000;
+
+		(void)kevent(kq, changes, argc, &event, 1, &to);
+
+		assert(len > 0);
+		assert(line[len - 1] == '\n');
+		line[len - 1] = '\0';
+		ec = system(line);
+		if (ec != EXIT_SUCCESS)
+			errx(ec, "%s returned %d", line, ec);
+
+		do {
+			nev = kevent(kq, changes, argc, &event, 1, &to);
+			if (nev == -1)
+				err(EXIT_FAILURE, "kevent");
+			else if (nev > 0) {
+				for (i = 0; i < argc; i++)
+					if (event.ident == changes[i].ident)
+						break;
+
+				if (event.fflags & NOTE_ATTRIB)
+					printf("%s - NOTE_ATTRIB\n", argv[i]);
+				if (event.fflags & NOTE_DELETE)
+					printf("%s - NOTE_DELETE\n", argv[i]);
+				if (event.fflags & NOTE_EXTEND)
+					printf("%s - NOTE_EXTEND\n", argv[i]);
+				if (event.fflags & NOTE_LINK)
+					printf("%s - NOTE_LINK\n", argv[i]);
+				if (event.fflags & NOTE_RENAME)
+					printf("%s - NOTE_RENAME\n", argv[i]);
+				if (event.fflags & NOTE_REVOKE)
+					printf("%s - NOTE_REVOKE\n", argv[i]);
+				if (event.fflags & NOTE_WRITE)
+					printf("%s - NOTE_WRITE\n", argv[i]);
+			}
+		} while (nev > 0);
+	}
+
+	for (i = 0; i < argc; i++)
+		close(changes[i].ident);
+	free(changes);
+
+	return EXIT_SUCCESS;
+}
+
+/* --------------------------------------------------------------------- */
+
+int
+rename_main(int argc, char **argv)
+{
+
+	if (argc < 3)
+		return EXIT_FAILURE;
+
+	if (rename(argv[1], argv[2]) == -1) {
+		warn("rename");
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+/* --------------------------------------------------------------------- */
+
+int
+sockets_main(int argc, char **argv)
+{
+	int error, fd;
+	struct sockaddr_un addr;
+
+	if (argc < 2)
+		return EXIT_FAILURE;
+
+	fd = socket(PF_LOCAL, SOCK_STREAM, 0);
+	if (fd == -1) {
+		warn("socket");
+		return EXIT_FAILURE;
+	}
+
+	(void)strlcpy(addr.sun_path, argv[1], sizeof(addr.sun_path));
+	addr.sun_family = PF_UNIX;
+
+	error = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
+	if (error == -1) {
+		warn("connect");
+		return EXIT_FAILURE;
+	}
+
+	close(fd);
+
+	return EXIT_SUCCESS;
+}
+
+/* --------------------------------------------------------------------- */
+
+int
+statvfs_main(int argc, char **argv)
+{
+	int error;
+	struct statvfs buf;
+
+	if (argc < 2)
+		return EXIT_FAILURE;
+
+	error = statvfs(argv[1], &buf);
+	if (error != 0) {
+		warn("statvfs");
+		return EXIT_FAILURE;
+	}
+
+	(void)printf("f_bsize=%lu\n", buf.f_bsize);
+	(void)printf("f_blocks=%" PRId64 "\n", buf.f_blocks);
+	(void)printf("f_bfree=%" PRId64 "\n", buf.f_bfree);
+	(void)printf("f_files=%" PRId64 "\n", buf.f_files);
+
+	return EXIT_SUCCESS;
+}
+
+/* --------------------------------------------------------------------- */
+
+int
+main(int argc, char **argv)
+{
+	int error;
+
+	if (argc < 2)
+		return EXIT_FAILURE;
+
+	argc -= 1;
+	argv += 1;
+
+	if (strcmp(argv[0], "getfh") == 0)
+		error = getfh_main(argc, argv);
+	else if (strcmp(argv[0], "kqueue") == 0)
+		error = kqueue_main(argc, argv);
+	else if (strcmp(argv[0], "rename") == 0)
+		error = rename_main(argc, argv);
+	else if (strcmp(argv[0], "sockets") == 0)
+		error = sockets_main(argc, argv);
+	else if (strcmp(argv[0], "statvfs") == 0)
+		error = statvfs_main(argc, argv);
+	else
+		error = EXIT_FAILURE;
+
+	return error;
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_create.sh b/contrib/netbsd-tests/fs/tmpfs/t_create.sh
new file mode 100755
index 000000000000..f1f894dfd65f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_create.sh
@@ -0,0 +1,122 @@
+# $NetBSD: t_create.sh,v 1.8 2011/03/05 07:41:11 pooka Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the create operation works.
+#
+
+atf_test_case create
+create_head() {
+	atf_set "descr" "Verifies that files can be created"
+	atf_set "require.user" "root"
+}
+create_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e empty test -f a
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty test -f a
+
+	test_unmount
+}
+
+atf_test_case attrs
+attrs_head() {
+	atf_set "descr" "Verifies that a new file gets the correct" \
+	                "attributes"
+	atf_set "require.config" "unprivileged-user"
+	atf_set "require.user" "root"
+}
+attrs_body() {
+	user=$(atf_config_get unprivileged-user)
+	# Allow the unprivileged user to access the work directory.
+	chown ${user} .
+
+	test_mount
+
+	umask 022
+	atf_check -s eq:1 -o empty -e empty test -f a
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty test -f a
+
+	eval $(stat -s . | sed -e 's|st_|dst_|g')
+	eval $(stat -s a)
+	test ${st_flags} -eq 0 || atf_fail "Incorrect flags"
+	test ${st_size} -eq 0 || atf_fail "Incorrect size"
+	test ${st_uid} -eq $(id -u) || atf_fail "Incorrect uid"
+	test ${st_gid} -eq ${dst_gid} || atf_fail "Incorrect gid"
+	test ${st_mode} = 0100644 || atf_fail "Incorrect mode"
+
+	atf_check -s eq:0 -o empty -e empty mkdir b c
+
+	atf_check -s eq:0 -o empty -e empty chown ${user}:0 b
+	eval $(stat -s b)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty chown ${user}:100 c
+	eval $(stat -s c)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'touch b/a'
+	eval $(stat -s b/a)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'touch c/a'
+	eval $(stat -s c/a)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Verifies that creating a file raises the correct" \
+	                "kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'touch dir/a' | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case create
+	atf_add_test_case attrs
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_devices.sh b/contrib/netbsd-tests/fs/tmpfs/t_devices.sh
new file mode 100755
index 000000000000..472d37860dd8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_devices.sh
@@ -0,0 +1,60 @@
+# $NetBSD: t_devices.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Tests that special devices work"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	umask 022
+
+	atf_check -s eq:0 -o ignore -e ignore /dev/MAKEDEV std
+	atf_check -s eq:0 -o empty -e empty test -e zero
+	atf_check -s eq:0 -o empty -e empty test -e null
+
+	echo "Reading from the 'zero' character device"
+	atf_check -s eq:0 -o ignore -e ignore dd if=zero of=a bs=10k count=1
+	[ $(md5 a | cut -d ' ' -f 4) = 1276481102f218c981e0324180bafd9f ] || \
+	    atf_fail "Data read is invalid"
+
+	echo "Writing to the 'null' device"
+	echo foo >null
+	eval $(stat -s null)
+	[ ${st_size} -eq 0 ] || atf_fail "Invalid size for device"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_dots.sh b/contrib/netbsd-tests/fs/tmpfs/t_dots.sh
new file mode 100755
index 000000000000..e480de7658ac
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_dots.sh
@@ -0,0 +1,67 @@
+# $NetBSD: t_dots.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case topdir
+topdir_head() {
+	atf_set "descr" "Verifies that looking up '.' and '..' in" \
+	                "top-level directories works"
+	atf_set "require.user" "root"
+}
+topdir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty test -d ./a
+	atf_check -s eq:0 -o empty -e empty test -d a/../a
+
+	test_unmount
+}
+
+atf_test_case nesteddir
+nesteddir_head() {
+	atf_set "descr" "Verifies that looking up '.' and '..' in" \
+	                "top-level directories works"
+	atf_set "require.user" "root"
+}
+nesteddir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir a/b
+	atf_check -s eq:0 -o empty -e empty test -d a/b/../b
+	atf_check -s eq:0 -o empty -e empty test -d a/b/../../a
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case topdir
+	atf_add_test_case nesteddir
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_exec.sh b/contrib/netbsd-tests/fs/tmpfs/t_exec.sh
new file mode 100755
index 000000000000..9ffc6008a139
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_exec.sh
@@ -0,0 +1,52 @@
+# $NetBSD: t_exec.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Verifies that binary files can be executed from" \
+	                "within the file system (i.e., whether getpages" \
+			"works)"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty cp /bin/cp .
+	echo "Verifying copied file"
+	[ $(md5 cp | cut -d ' ' -f 4) = $(md5 /bin/cp | cut -d ' ' -f 4) ] || \
+	    atf_file "New binary file does not match original"
+	atf_check -s eq:0 -o empty -e empty ./cp cp foo
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_link.sh b/contrib/netbsd-tests/fs/tmpfs/t_link.sh
new file mode 100755
index 000000000000..660f3f2a2462
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_link.sh
@@ -0,0 +1,129 @@
+# $NetBSD: t_link.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the link operation works.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Verifies that the link operation works on files" \
+	                "at the top directory"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty touch z
+	eval $(stat -s a | sed -e 's|st_|sta_|g')
+	eval $(stat -s z | sed -e 's|st_|stz_|g')
+	test ${sta_ino} != ${stz_ino} || \
+	    atf_fail "Node numbers are not different"
+	test ${sta_nlink} -eq 1 || atf_fail "Number of links is incorrect"
+	atf_check -s eq:0 -o empty -e empty ln a b
+
+	echo "Checking if link count is correct after links are created"
+	eval $(stat -s a | sed -e 's|st_|sta_|g')
+	eval $(stat -s b | sed -e 's|st_|stb_|g')
+	test ${sta_ino} = ${stb_ino} || atf_fail "Node number changed"
+	test ${sta_nlink} -eq 2 || atf_fail "Link count is incorrect"
+	test ${stb_nlink} -eq 2 || atf_fail "Link count is incorrect"
+
+	echo "Checking if link count is correct after links are deleted"
+	atf_check -s eq:0 -o empty -e empty rm a
+	eval $(stat -s b | sed -e 's|st_|stb_|g')
+	test ${stb_nlink} -eq 1 || atf_fail "Link count is incorrect"
+	atf_check -s eq:0 -o empty -e empty rm b
+
+	test_unmount
+}
+
+atf_test_case subdirs
+subdirs_head() {
+	atf_set "descr" "Verifies that the link operation works if used" \
+	                "in subdirectories"
+	atf_set "require.user" "root"
+}
+subdirs_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty mkdir c
+	atf_check -s eq:0 -o empty -e empty ln a c/b
+
+	echo "Checking if link count is correct after links are created"
+	eval $(stat -s a | sed -e 's|st_|sta_|g')
+	eval $(stat -s c/b | sed -e 's|st_|stb_|g')
+	test ${sta_ino} = ${stb_ino} || atf_fail "Node number changed"
+	test ${sta_nlink} -eq 2 || atf_fail "Link count is incorrect"
+	test ${stb_nlink} -eq 2 || atf_fail "Link count is incorrect"
+
+	echo "Checking if link count is correct after links are deleted"
+	atf_check -s eq:0 -o empty -e empty rm a
+	eval $(stat -s c/b | sed -e 's|st_|stb_|g')
+	test ${stb_nlink} -eq 1 || atf_fail "Link count is incorrect"
+	atf_check -s eq:0 -o empty -e empty rm c/b
+	atf_check -s eq:0 -o empty -e empty rmdir c
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Verifies that creating a link raises the correct" \
+	                "kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty touch dir/a
+	echo 'ln dir/a dir/b' | kqueue_monitor 2 dir dir/a
+	kqueue_check dir/a NOTE_LINK
+	kqueue_check dir NOTE_WRITE
+
+	echo 'rm dir/a' | kqueue_monitor 2 dir dir/b
+	# XXX According to the (short) kqueue(2) documentation, the following
+	# should raise a NOTE_LINK but FFS raises a NOTE_DELETE...
+	kqueue_check dir/b NOTE_LINK
+	kqueue_check dir NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rm dir/b
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+	atf_add_test_case subdirs
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_mkdir.sh b/contrib/netbsd-tests/fs/tmpfs/t_mkdir.sh
new file mode 100755
index 000000000000..db0d1e3c5c8f
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_mkdir.sh
@@ -0,0 +1,159 @@
+# $NetBSD: t_mkdir.sh,v 1.8 2011/03/05 07:41:11 pooka Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that mkdir works by creating some nested directories.  It also
+# checks, in part, the lookup operation.
+#
+
+atf_test_case single
+single_head() {
+	atf_set "descr" "Creates a single directory and checks the" \
+	                "mount point's hard link count"
+	atf_set "require.user" "root"
+}
+single_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e empty test -d a
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty test -d a
+	test -d a
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 3 ] || atf_fail "Link count is not 3"
+
+	test_unmount
+}
+
+atf_test_case many
+many_head() {
+	atf_set "descr" "Creates multiple directories and checks the" \
+	                "mount point's hard link count"
+	atf_set "require.user" "root"
+}
+many_body() {
+	test_mount
+
+	for d in $(jot 100); do
+		atf_check -s eq:1 -o empty -e empty test -d ${d}
+		atf_check -s eq:0 -o empty -e empty mkdir ${d}
+		atf_check -s eq:0 -o empty -e empty test -d ${d}
+	done
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 102 ] || atf_fail "Link count is not 102"
+
+	test_unmount
+}
+
+atf_test_case nested
+nested_head() {
+	atf_set "descr" "Checks if nested directories can be created"
+	atf_set "require.user" "root"
+}
+nested_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e empty test -d a/b/c/d/e
+	atf_check -s eq:0 -o empty -e empty mkdir -p a/b/c/d/e
+	atf_check -s eq:0 -o empty -e empty test -d a/b/c/d/e
+
+	test_unmount
+}
+
+atf_test_case attrs
+attrs_head() {
+	atf_set "descr" "Checks that new directories get the proper" \
+	                "attributes (owner and group)"
+	atf_set "require.config" "unprivileged-user"
+	atf_set "require.user" "root"
+}
+attrs_body() {
+	user=$(atf_config_get unprivileged-user)
+	# Allow the unprivileged user to access the work directory.
+	chown ${user} .
+
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir b c
+
+	atf_check -s eq:0 -o empty -e empty chown ${user}:0 b
+	eval $(stat -s b)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty chown ${user}:100 c
+	eval $(stat -s c)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'mkdir b/a'
+	eval $(stat -s b/a)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 0 ] || atf_fail "Incorrect group"
+
+	atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'mkdir c/a'
+	eval $(stat -s c/a)
+	[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail "Incorrect owner"
+	[ ${st_gid} -eq 100 ] || atf_fail "Incorrect group"
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Creates a directory and checks the kqueue events" \
+	                "raised"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'mkdir dir/a' | kqueue_monitor 2 dir
+
+	# Creating a directory raises NOTE_LINK on the parent directory
+	kqueue_check dir NOTE_LINK
+
+	# Creating a directory raises NOTE_WRITE on the parent directory
+	kqueue_check dir NOTE_WRITE
+
+	atf_check -s eq:0 -o empty -e empty rmdir dir/a
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case single
+	atf_add_test_case many
+	atf_add_test_case nested
+	atf_add_test_case attrs
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh b/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh
new file mode 100755
index 000000000000..62c7cce22834
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh
@@ -0,0 +1,143 @@
+# $NetBSD: t_mknod.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the mknod operation works.
+#
+
+atf_test_case block
+block_head() {
+	atf_set "descr" "Tests that block devices can be created"
+	atf_set "require.user" "root"
+}
+block_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mknod fd0a b 2 0
+	eval $(stat -s fd0a)
+	[ ${st_mode} = 060644 ] || atf_fail "Invalid mode"
+	[ ${st_rdev} -eq 512 ] || atf_fail "Invalid device"
+
+	test_unmount
+}
+
+atf_test_case block_kqueue
+block_kqueue_head() {
+	atf_set "descr" "Tests that creating a block device raises the" \
+	                "appropriate kqueue events"
+	atf_set "require.user" "root"
+}
+block_kqueue_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'mknod dir/fd0a b 2 0' | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+
+	test_unmount
+}
+
+atf_test_case char
+char_head() {
+	atf_set "descr" "Tests that character devices can be created"
+	atf_set "require.user" "root"
+}
+char_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mknod null c 2 2
+	eval $(stat -s null)
+	[ ${st_mode} = 020644 ] || atf_fail "Invalid mode"
+	[ ${st_rdev} -eq 514 ] || atf_fail "Invalid device"
+
+	test_unmount
+}
+
+atf_test_case char_kqueue
+char_kqueue_head() {
+	atf_set "descr" "Tests that creating a character device raises the" \
+	                "appropriate kqueue events"
+	atf_set "require.user" "root"
+}
+char_kqueue_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'mknod dir/null c 2 2' | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+
+	test_unmount
+}
+
+atf_test_case pipe
+pipe_head() {
+	atf_set "descr" "Tests that named pipes can be created"
+	atf_set "require.user" "root"
+}
+pipe_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mknod pipe p
+	eval $(stat -s pipe)
+	[ ${st_mode} = 010644 ] || atf_fail "Invalid mode"
+
+	test_unmount
+}
+
+atf_test_case pipe_kqueue
+pipe_kqueue_head() {
+	atf_set "descr" "Tests that creating a named pipe raises the" \
+	                "appropriate kqueue events"
+	atf_set "require.user" "root"
+}
+pipe_kqueue_body() {
+	test_mount
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'mknod dir/pipe p' | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case block
+	atf_add_test_case block_kqueue
+	atf_add_test_case char
+	atf_add_test_case char_kqueue
+	atf_add_test_case pipe
+	atf_add_test_case pipe_kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_mount.sh b/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
new file mode 100755
index 000000000000..11a77d49c24a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
@@ -0,0 +1,140 @@
+# $NetBSD: t_mount.sh,v 1.6 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that an execution of mount and umount works correctly without
+# causing errors and that the root node gets correct attributes.
+# Also verifies command line parsing from mount_tmpfs.
+#
+
+atf_test_case plain
+plain_head() {
+	atf_set "descr" "Tests a mount and unmount without any options"
+	atf_set "require.user" "root"
+}
+plain_body() {
+	test_mount
+	test_unmount
+}
+
+atf_test_case links
+links_head() {
+	atf_set "descr" "Tests that the mount point has two hard links"
+	atf_set "require.user" "root"
+}
+links_body() {
+	test_mount
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 2 ] || \
+	    atf_fail "Root directory does not have two hard links"
+	test_unmount
+}
+
+atf_test_case options
+options_head() {
+	atf_set "descr" "Tests the read-only mount option"
+	atf_set "require.user" "root"
+}
+options_body() {
+	test_mount -o ro
+	mount | grep ${Mount_Point} | grep -q read-only || \
+	    atf_fail "read-only option (ro) does not work"
+	test_unmount
+}
+
+atf_test_case attrs
+attrs_head() {
+	atf_set "descr" "Tests that root directory attributes are set" \
+	                "correctly"
+	atf_set "require.user" "root"
+}
+attrs_body() {
+	test_mount -o -u1000 -o -g100 -o -m755
+	eval $(stat -s ${Mount_Point})
+	[ ${st_uid} = 1000 ] || atf_fail "uid is incorrect"
+	[ ${st_gid} = 100 ] || atf_fail "gid is incorrect"
+	[ ${st_mode} = 040755 ] || atf_fail "mode is incorrect"
+	test_unmount
+}
+
+atf_test_case negative
+negative_head() {
+	atf_set "descr" "Tests that negative values passed to to -s are" \
+	                "handled correctly"
+	atf_set "require.user" "root"
+}
+negative_body() {
+	mkdir tmp
+	test_mount -o -s-10
+	test_unmount
+}
+
+atf_test_case large
+large_head() {
+	atf_set "descr" "Tests that extremely long values passed to -s" \
+	                "are handled correctly"
+	atf_set "require.user" "root"
+}
+large_body() {
+	test_mount -o -s9223372036854775807
+	test_unmount
+
+	mkdir tmp
+	atf_check -s eq:1 -o empty -e ignore \
+	    mount -t tmpfs -o -s9223372036854775808 tmpfs tmp
+	atf_check -s eq:1 -o empty -e ignore \
+	    mount -t tmpfs -o -s9223372036854775808g tmpfs tmp
+	rmdir tmp
+}
+
+atf_test_case mntpt
+mntpt_head() {
+	atf_set "descr" "Tests that the error messages printed when the" \
+	                "mount point is invalid do not show the source" \
+	                "unused parameter"
+}
+mntpt_body() {
+	mount_tmpfs unused $(pwd)/mnt >out 2>&1
+	atf_check -s eq:1 -o empty -e empty grep unused out
+	atf_check -s eq:0 -o ignore -e empty grep "$(pwd)/mnt" out
+
+	mount_tmpfs unused mnt >out 2>&1
+	atf_check -s eq:1 -o empty -e empty grep unused out
+	atf_check -s eq:0 -o ignore -e empty grep mnt out
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case plain
+	atf_add_test_case options
+	atf_add_test_case attrs
+	atf_add_test_case negative
+	atf_add_test_case large
+	atf_add_test_case mntpt
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_pipes.sh b/contrib/netbsd-tests/fs/tmpfs/t_pipes.sh
new file mode 100755
index 000000000000..7c0065a9cb1d
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_pipes.sh
@@ -0,0 +1,52 @@
+# $NetBSD: t_pipes.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Verifies that pipes work"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	umask 022
+
+	atf_check -s eq:0 -o empty -e empty mknod pipe p
+
+	echo "Writing to pipe and waiting for response"
+	echo -n foo >pipe &
+	[ "$(cat pipe)" = foo ] || atf_fail "Received data is incorrect"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_read_write.sh b/contrib/netbsd-tests/fs/tmpfs/t_read_write.sh
new file mode 100755
index 000000000000..13cc2560ad44
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_read_write.sh
@@ -0,0 +1,87 @@
+# $NetBSD: t_read_write.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the read and write operations work.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Checks that file removal works"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	echo "Testing write to a small file"
+	echo foo >a || atf_fail "Failed to write to file"
+	[ $(md5 a | cut -d ' ' -f 4) = d3b07384d113edec49eaa6238ad5ff00 ] || \
+	    atf_fail "Invalid file contents"
+
+	echo "Testing appending to a small file"
+	echo bar >>a || atf_fail "Failed to append data to file"
+	[ $(md5 a | cut -d ' ' -f 4) = f47c75614087a8dd938ba4acff252494 ] || \
+	    atf_fail "Invalid file contents"
+
+	echo "Testing write to a big file (bigger than a page)"
+	jot 10000 >b || atf_fail "Failed to create a big file"
+	[ $(md5 b | cut -d ' ' -f 4) = 72d4ff27a28afbc066d5804999d5a504 ] || \
+	    atf_fail "Invalid file contents"
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Checks that writing to a file raises the" \
+	                "appropriate kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o ignore -e ignore \
+	    dd if=/dev/zero of=c bs=1k count=10
+	echo 'dd if=/dev/zero of=c seek=2 bs=1k count=1 conv=notrunc' \
+	    '>/dev/null 2>&1' | kqueue_monitor 1 c
+	kqueue_check c NOTE_WRITE
+
+	echo foo >d
+	echo 'echo bar >>d' | kqueue_monitor 2 d
+	kqueue_check d NOTE_EXTEND
+	kqueue_check d NOTE_WRITE
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh b/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
new file mode 100755
index 000000000000..6f5dc3ef2bde
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
@@ -0,0 +1,116 @@
+# $NetBSD: t_readdir.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the readdir operation works.
+#
+
+atf_test_case dots
+dots_head() {
+	atf_set "descr" "Verifies that readdir returns the '.' and '..'" \
+	                "entries"
+	atf_set "require.user" "root"
+}
+dots_body() {
+	test_mount
+
+	atf_check -s eq:0 -o save:stdout -e empty /bin/ls -a
+	atf_check -s eq:0 -o ignore -e empty grep '^\.$' stdout
+	atf_check -s eq:0 -o ignore -e empty grep '^\..$' stdout
+
+	test_unmount
+}
+
+atf_test_case types
+types_head() {
+	atf_set "descr" "Verifies that readdir works for all different" \
+	                "file types"
+	atf_set "require.user" "root"
+}
+types_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty touch reg
+	atf_check -s eq:0 -o empty -e empty ln -s reg lnk
+	atf_check -s eq:0 -o empty -e empty mknod blk b 0 0
+	atf_check -s eq:0 -o empty -e empty mknod chr c 0 0
+	atf_check -s eq:0 -o empty -e empty mknod fifo p
+	atf_check -s eq:0 -o empty -e empty \
+	    $(atf_get_srcdir)/h_tools sockets sock
+
+	atf_check -s eq:0 -o ignore -e empty ls
+	atf_check -s eq:0 -o empty -e empty rm -rf *
+
+	test_unmount
+}
+
+atf_test_case caching
+caching_head() {
+	atf_set "descr" "Catch a bug caused by incorrect invalidation of" \
+	                "readdir caching variables"
+	atf_set "require.user" "root"
+}
+caching_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch $(jot 10)
+	atf_check -s eq:0 -o empty -e empty rm *
+	atf_check -s eq:0 -o empty -e empty touch $(jot 20)
+	atf_check -s eq:0 -o empty -e empty -x "ls >/dev/null"
+
+	test_unmount
+}
+
+atf_test_case many
+many_head() {
+	atf_set "descr" "Verifies that readdir works with many files"
+	atf_set "require.user" "root"
+}
+many_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	echo "Creating 500 files"
+	for f in $(jot 500); do
+		touch a/$f
+	done
+	atf_check -s eq:0 -o empty -e empty rm a/*
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case dots
+	atf_add_test_case types
+	atf_add_test_case caching
+	atf_add_test_case many
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_remove.sh b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
new file mode 100755
index 000000000000..df868f9ccf52
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
@@ -0,0 +1,110 @@
+# $NetBSD: t_remove.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the remove operation works.
+#
+
+atf_test_case single
+single_head() {
+	atf_set "descr" "Checks that file removal works"
+	atf_set "require.user" "root"
+}
+single_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e empty test -f a
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty test -f a
+	atf_check -s eq:0 -o empty -e empty rm a
+	atf_check -s eq:1 -o empty -e empty test -f a
+
+	test_unmount
+}
+
+atf_test_case uchg
+uchg_head() {
+	atf_set "descr" "Checks that files with the uchg flag set cannot" \
+	                "be removed"
+	atf_set "require.user" "root"
+}
+uchg_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty chflags uchg a
+	atf_check -s eq:1 -o empty -e ignore rm -f a
+	atf_check -s eq:0 -o empty -e empty chflags nouchg a
+	atf_check -s eq:0 -o empty -e empty rm a
+	atf_check -s eq:1 -o empty -e empty test -f a
+
+	test_unmount
+}
+
+atf_test_case dot
+dot_head() {
+	atf_set "descr" "Checks that '.' cannot be removed"
+	atf_set "require.user" "root"
+}
+dot_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:1 -o empty -e ignore unlink a/.
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Removes a file and checks the kqueue events" \
+	                "raised"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty touch dir/a
+	echo 'rm dir/a' | kqueue_monitor 2 dir dir/a
+	kqueue_check dir/a NOTE_DELETE
+	kqueue_check dir NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case single
+	atf_add_test_case uchg
+	atf_add_test_case dot
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_rename.sh b/contrib/netbsd-tests/fs/tmpfs/t_rename.sh
new file mode 100755
index 000000000000..7613f1f493a8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_rename.sh
@@ -0,0 +1,278 @@
+# $NetBSD: t_rename.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the rename operation works (either by renaming entries or
+# by moving them).
+#
+
+atf_test_case dots
+dots_head() {
+	atf_set "descr" "Tests that '.' and '..' cannot be renamed"
+	atf_set "require.user" "root"
+}
+dots_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:1 -o empty -e ignore mv a/. c
+	atf_check -s eq:1 -o empty -e ignore mv a/.. c
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case crossdev
+crossdev_head() {
+	atf_set "descr" "Tests that cross-device renames do not work"
+	atf_set "require.user" "root"
+}
+crossdev_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    $(atf_get_srcdir)/h_tools rename a /var/tmp/a
+	atf_check -s eq:0 -o ignore -e empty grep "Cross-device link" stderr
+	atf_check -s eq:0 -o empty -e empty test -d a
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Tests that basic renames work"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mv a c
+	atf_check -s eq:1 -o empty -e empty test -d a
+	atf_check -s eq:0 -o empty -e empty test -d c
+	atf_check -s eq:0 -o empty -e empty rmdir c
+
+	test_unmount
+}
+
+atf_test_case dotdot
+dotdot_head() {
+	atf_set "descr" "Tests that the '..' entry is properly updated" \
+	                "during moves"
+	atf_set "require.user" "root"
+}
+dotdot_body() {
+	test_mount
+
+	echo "Checking if the '..' entry is updated after moves"
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:0 -o empty -e empty mv b a
+	atf_check -s eq:0 -o empty -e empty test -d a/b/../b
+	atf_check -s eq:0 -o empty -e empty test -d a/b/../../a
+	eval $(stat -s a/b)
+	[ ${st_nlink} = 2 ] || atf_fail "Incorrect number of links"
+	eval $(stat -s a)
+	[ ${st_nlink} = 3 ] || atf_fail "Incorrect number of links"
+	atf_check -s eq:0 -o empty -e empty rmdir a/b
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	echo "Checking if the '..' entry is correct after renames"
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:0 -o empty -e empty mv b a
+	atf_check -s eq:0 -o empty -e empty mv a c
+	atf_check -s eq:0 -o empty -e empty test -d c/b/../b
+	atf_check -s eq:0 -o empty -e empty test -d c/b/../../c
+	atf_check -s eq:0 -o empty -e empty rmdir c/b
+	atf_check -s eq:0 -o empty -e empty rmdir c
+
+	echo "Checking if the '..' entry is correct after multiple moves"
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:0 -o empty -e empty mv b a
+	atf_check -s eq:0 -o empty -e empty mv a c
+	atf_check -s eq:0 -o empty -e empty mv c/b d
+	atf_check -s eq:0 -o empty -e empty test -d d/../c
+	atf_check -s eq:0 -o empty -e empty rmdir d
+	atf_check -s eq:0 -o empty -e empty rmdir c
+
+	test_unmount
+}
+
+atf_test_case dir_to_emptydir
+dir_to_emptydir_head() {
+	atf_set "descr" "Tests that renaming a directory to override an" \
+	                "empty directory works"
+	atf_set "require.user" "root"
+}
+dir_to_emptydir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty touch a/c
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:0 -o empty -e empty \
+	    $(atf_get_srcdir)/h_tools rename a b
+	atf_check -s eq:1 -o empty -e empty test -e a
+	atf_check -s eq:0 -o empty -e empty test -d b
+	atf_check -s eq:0 -o empty -e empty test -f b/c
+	rm b/c
+	rmdir b
+
+	test_unmount
+}
+
+atf_test_case dir_to_fulldir
+dir_to_fulldir_head() {
+	atf_set "descr" "Tests that renaming a directory to override a" \
+	                "non-empty directory fails"
+	atf_set "require.user" "root"
+}
+dir_to_fulldir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty touch a/c
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:0 -o empty -e empty touch b/d
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    $(atf_get_srcdir)/h_tools rename a b
+	atf_check -s eq:0 -o ignore -e empty grep "Directory not empty" stderr
+	atf_check -s eq:0 -o empty -e empty test -d a
+	atf_check -s eq:0 -o empty -e empty test -f a/c
+	atf_check -s eq:0 -o empty -e empty test -d b
+	atf_check -s eq:0 -o empty -e empty test -f b/d
+	rm a/c
+	rm b/d
+	rmdir a
+	rmdir b
+
+	test_unmount
+}
+
+atf_test_case dir_to_file
+dir_to_file_head() {
+	atf_set "descr" "Tests that renaming a directory to override a" \
+	                "file fails"
+	atf_set "require.user" "root"
+}
+dir_to_file_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty touch b
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    $(atf_get_srcdir)/h_tools rename a b
+	atf_check -s eq:0 -o ignore -e empty grep "Not a directory" stderr
+	atf_check -s eq:0 -o empty -e empty test -d a
+	atf_check -s eq:0 -o empty -e empty test -f b
+	rmdir a
+	rm b
+
+	test_unmount
+}
+
+atf_test_case file_to_dir
+file_to_dir_head() {
+	atf_set "descr" "Tests that renaming a file to override a" \
+	                "directory fails"
+	atf_set "require.user" "root"
+}
+file_to_dir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty mkdir b
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    $(atf_get_srcdir)/h_tools rename a b
+	atf_check -s eq:0 -o ignore -e empty grep "Is a directory" stderr
+	atf_check -s eq:0 -o empty -e empty test -f a
+	atf_check -s eq:0 -o empty -e empty test -d b
+	rm a
+	rmdir b
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Tests that moving and renaming files raise the" \
+	                "correct kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty touch dir/a
+	echo 'mv dir/a dir/b' | kqueue_monitor 2 dir dir/a
+	kqueue_check dir/a NOTE_RENAME
+	kqueue_check dir NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rm dir/b
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty touch dir/a
+	atf_check -s eq:0 -o empty -e empty touch dir/b
+	echo 'mv dir/a dir/b' | kqueue_monitor 3 dir dir/a dir/b
+	kqueue_check dir/a NOTE_RENAME
+	kqueue_check dir NOTE_WRITE
+	kqueue_check dir/b NOTE_DELETE
+	atf_check -s eq:0 -o empty -e empty rm dir/b
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir1
+	atf_check -s eq:0 -o empty -e empty mkdir dir2
+	atf_check -s eq:0 -o empty -e empty touch dir1/a
+	echo 'mv dir1/a dir2/a' | kqueue_monitor 3 dir1 dir1/a dir2
+	kqueue_check dir1/a NOTE_RENAME
+	kqueue_check dir1 NOTE_WRITE
+	kqueue_check dir2 NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rm dir2/a
+	atf_check -s eq:0 -o empty -e empty rmdir dir1
+	atf_check -s eq:0 -o empty -e empty rmdir dir2
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case dots
+	atf_add_test_case crossdev
+	atf_add_test_case basic
+	atf_add_test_case dotdot
+	atf_add_test_case dir_to_emptydir
+	atf_add_test_case dir_to_fulldir
+	atf_add_test_case dir_to_file
+	atf_add_test_case file_to_dir
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c b/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c
new file mode 100644
index 000000000000..044937a930c8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c
@@ -0,0 +1,115 @@
+/*	$NetBSD: t_renamerace.c,v 1.13 2011/08/18 21:44:55 riastradh Exp $	*/
+
+/*
+ * Modified for rump and atf from a program supplied
+ * by Nicolas Joly in kern/40948
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/utsname.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(renamerace2);
+ATF_TC_HEAD(renamerace2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "rename(2) lock order inversion");
+	atf_tc_set_md_var(tc, "timeout", "6");
+}
+
+static volatile int quittingtime = 0;
+static pid_t wrkpid;
+
+static void *
+r2w1(void *arg)
+{
+	int fd;
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	fd = rump_sys_open("/file", O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("creat");
+	rump_sys_close(fd);
+
+	while (!quittingtime) {
+		if (rump_sys_rename("/file", "/dir/file") == -1)
+			atf_tc_fail_errno("rename 1");
+		if (rump_sys_rename("/dir/file", "/file") == -1)
+			atf_tc_fail_errno("rename 2");
+	}
+
+	return NULL;
+}
+
+static void *
+r2w2(void *arg)
+{
+	int fd;
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	while (!quittingtime) {
+		fd = rump_sys_open("/dir/file1", O_RDWR);
+		if (fd != -1)
+			rump_sys_close(fd);
+	}
+
+	return NULL;
+}
+
+ATF_TC_BODY(renamerace2, tc)
+{
+	struct tmpfs_args args;
+	pthread_t pt[2];
+
+	/*
+	 * Force SMP regardless of how many host CPUs there are.
+	 * Deadlock is highly unlikely to trigger otherwise.
+	 */
+	setenv("RUMP_NCPU", "2", 1);
+
+	rump_init();
+	memset(&args, 0, sizeof(args));
+	args.ta_version = TMPFS_ARGS_VERSION;
+	args.ta_root_mode = 0777;
+	if (rump_sys_mount(MOUNT_TMPFS, "/", 0, &args, sizeof(args)) == -1)
+		atf_tc_fail_errno("could not mount tmpfs");
+
+	if (rump_sys_mkdir("/dir", 0777) == -1)
+		atf_tc_fail_errno("cannot create directory");
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	RL(wrkpid = rump_sys_getpid());
+	pthread_create(&pt[0], NULL, r2w1, NULL);
+	pthread_create(&pt[1], NULL, r2w2, NULL);
+
+	/* usually triggers in <<1s for me */
+	sleep(4);
+	quittingtime = 1;
+
+	pthread_join(pt[0], NULL);
+	pthread_join(pt[1], NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, renamerace2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_rmdir.sh b/contrib/netbsd-tests/fs/tmpfs/t_rmdir.sh
new file mode 100755
index 000000000000..9e5d761edf6c
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_rmdir.sh
@@ -0,0 +1,204 @@
+# $NetBSD: t_rmdir.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that rmdir works by creating and removing directories.  Also
+# checks multiple error conditions.
+#
+
+atf_test_case mntpt
+mntpt_head() {
+	atf_set "descr" "Checks that the mount point cannot be removed"
+	atf_set "require.user" "root"
+}
+mntpt_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e ignore rmdir ${Mount_Point}
+
+	test_unmount
+}
+
+atf_test_case non_existent
+non_existent_head() {
+	atf_set "descr" "Checks that non-existent directories cannot" \
+	                "be removed"
+	atf_set "require.user" "root"
+}
+non_existent_body() {
+	test_mount
+
+	atf_check -s eq:1 -o empty -e ignore rmdir non-existent
+
+	test_unmount
+}
+
+atf_test_case single
+single_head() {
+	atf_set "descr" "Checks that removing a single directory works"
+	atf_set "require.user" "root"
+}
+single_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 3 ] || \
+	    atf_fail "Incorrect number of links after creation"
+	atf_check -s eq:0 -o empty -e empty rmdir a
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 2 ] || \
+	    atf_fail "Incorrect number of links after removal"
+
+	test_unmount
+}
+
+atf_test_case nested
+nested_head() {
+	atf_set "descr" "Checks that removing nested directories works"
+	atf_set "require.user" "root"
+}
+nested_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir -p a/b/c
+	atf_check -s eq:0 -o empty -e empty rmdir a/b/c
+	atf_check -s eq:0 -o empty -e empty rmdir a/b
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case dots
+dots_head() {
+	atf_set "descr" "Checks that '.' and '..' cannot be removed"
+	atf_set "require.user" "root"
+}
+dots_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:1 -o empty -e ignore rmdir a/.
+	atf_check -s eq:1 -o empty -e ignore rmdir a/..
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case non_empty
+non_empty_head() {
+	atf_set "descr" "Checks that non-empty directories cannot be removed"
+	atf_set "require.user" "root"
+}
+non_empty_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir a/b
+	atf_check -s eq:0 -o empty -e empty mkdir a/c
+	atf_check -s eq:1 -o empty -e ignore rmdir a
+	atf_check -s eq:0 -o empty -e empty rmdir a/b
+	atf_check -s eq:0 -o empty -e empty rmdir a/c
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	test_unmount
+}
+
+atf_test_case links
+links_head() {
+	atf_set "descr" "Checks the root directory's links after removals"
+	atf_set "require.user" "root"
+}
+links_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	atf_check -s eq:0 -o empty -e empty mkdir a/b
+	atf_check -s eq:0 -o empty -e empty mkdir c
+
+	atf_check -s eq:0 -o empty -e empty rmdir c
+	atf_check -s eq:0 -o empty -e empty rmdir a/b
+	atf_check -s eq:0 -o empty -e empty rmdir a
+
+	eval $(stat -s ${Mount_Point})
+	[ ${st_nlink} = 2 ] || atf_fail "Incorrect number of links"
+
+	test_unmount
+}
+
+atf_test_case curdir
+curdir_head() {
+	atf_set "descr" "Checks that the current directory cannot be removed"
+	atf_set "require.user" "root"
+}
+curdir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a
+	# Catch a bug that would panic the system when accessing the
+	# current directory after being deleted: vop_open cannot assume
+	# that open files are still linked to a directory.
+	atf_check -s eq:1 -o empty -e ignore -x '( cd a && rmdir ../a && ls )'
+	atf_check -s eq:1 -o empty -e empty test -e a
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Checks that removing a directory raises the" \
+	                "correct kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	atf_check -s eq:0 -o empty -e empty mkdir dir/a
+	echo 'rmdir dir/a' | kqueue_monitor 3 dir dir/a
+	kqueue_check dir/a NOTE_DELETE
+	kqueue_check dir NOTE_LINK
+	kqueue_check dir NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case mntpt
+	atf_add_test_case non_existent
+	atf_add_test_case single
+	atf_add_test_case nested
+	atf_add_test_case dots
+	atf_add_test_case non_empty
+	atf_add_test_case links
+	atf_add_test_case curdir
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_setattr.sh b/contrib/netbsd-tests/fs/tmpfs/t_setattr.sh
new file mode 100755
index 000000000000..f64344646e48
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_setattr.sh
@@ -0,0 +1,216 @@
+# $NetBSD: t_setattr.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the setattr vnode operation works, using several commands
+# that require this function.
+#
+
+atf_test_case chown
+chown_head() {
+	atf_set "descr" "Tests that the file owner can be changed"
+	atf_set "require.user" "root"
+}
+chown_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir own
+	eval $(stat -s own | sed -e 's|st_|ost_|g')
+	atf_check -s eq:0 -o empty -e empty chown 1234 own
+	eval $(stat -s own)
+	[ ${st_uid} -eq 1234 ] || atf_fail "uid was not set"
+	[ ${st_gid} -eq ${ost_gid} ] || atf_fail "gid was modified"
+
+	test_unmount
+}
+
+atf_test_case chown_kqueue
+chown_kqueue_head() {
+	atf_set "descr" "Tests that changing the file owner raises" \
+	                "NOTE_ATTRIB on it"
+	atf_set "require.user" "root"
+}
+chown_kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir ownq
+	echo 'chown 1234 ownq' | kqueue_monitor 1 ownq
+	kqueue_check ownq NOTE_ATTRIB
+
+	test_unmount
+}
+
+atf_test_case chgrp
+chgrp_head() {
+	atf_set "descr" "Tests that the file group can be changed"
+	atf_set "require.user" "root"
+}
+chgrp_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir grp
+	eval $(stat -s grp | sed -e 's|st_|ost_|g')
+	atf_check -s eq:0 -o empty -e empty chgrp 5678 grp
+	eval $(stat -s grp)
+	[ ${st_uid} -eq ${ost_uid} ] || atf_fail "uid was modified"
+	[ ${st_gid} -eq 5678 ] || atf_fail "gid was not set"
+
+	test_unmount
+}
+
+atf_test_case chgrp_kqueue
+chgrp_kqueue_head() {
+	atf_set "descr" "Tests that changing the file group raises" \
+	                "NOTE_ATTRIB on it"
+	atf_set "require.user" "root"
+}
+chgrp_kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir grpq
+	echo 'chgrp 1234 grpq' | kqueue_monitor 1 grpq
+	kqueue_check grpq NOTE_ATTRIB
+
+	test_unmount
+}
+
+atf_test_case chowngrp
+chowngrp_head() {
+	atf_set "descr" "Tests that the file owner and group can be" \
+	                "changed at once"
+	atf_set "require.user" "root"
+}
+chowngrp_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir owngrp
+	atf_check -s eq:0 -o empty -e empty chown 1234:5678 owngrp
+	eval $(stat -s owngrp)
+	[ ${st_uid} -eq 1234 ] || atf_fail "uid was not modified"
+	[ ${st_gid} -eq 5678 ] || atf_fail "gid was not modified"
+
+	test_unmount
+}
+
+atf_test_case chowngrp_kqueue
+chowngrp_kqueue_head() {
+	atf_set "descr" "Tests that changing the file owner and group" \
+	                "raises NOTE_ATTRIB on it"
+	atf_set "require.user" "root"
+}
+chowngrp_kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir owngrpp
+	echo 'chown 1234:5678 owngrpp' | kqueue_monitor 1 owngrpp
+	kqueue_check owngrpp NOTE_ATTRIB
+
+	test_unmount
+}
+
+atf_test_case chmod
+chmod_head() {
+	atf_set "descr" "Tests that the file mode can be changed"
+	atf_set "require.user" "root"
+}
+chmod_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir mode
+	atf_check -s eq:0 -o empty -e empty chmod 0000 mode
+	eval $(stat -s mode)
+	[ ${st_mode} -eq 40000 ] || af_fail "mode was not set"
+
+	test_unmount
+}
+
+atf_test_case chmod_kqueue
+chmod_kqueue_head() {
+	atf_set "descr" "Tests that changing the file mode raises" \
+	                "NOTE_ATTRIB on it"
+	atf_set "require.user" "root"
+}
+chmod_kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir modeq
+	echo 'chmod 0000 modeq' | kqueue_monitor 1 modeq
+	kqueue_check modeq NOTE_ATTRIB
+
+	test_unmount
+}
+
+atf_test_case chtimes
+chtimes_head() {
+	atf_set "descr" "Tests that file times can be changed"
+	atf_set "require.user" "root"
+}
+chtimes_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir times
+	atf_check -s eq:0 -o empty -e empty \
+	    -x 'TZ=GMT touch -t 200501010101 times'
+	eval $(stat -s times)
+	[ ${st_atime} = ${st_mtime} ] || \
+	    atf_fail "atime does not match mtime"
+	[ ${st_atime} = 1104541260 ] || atf_fail "atime does not match"
+
+	test_unmount
+}
+
+atf_test_case chtimes_kqueue
+chtimes_kqueue_head() {
+	atf_set "descr" "Tests that changing the file times raises" \
+	                "NOTE_ATTRIB on it"
+	atf_set "require.user" "root"
+}
+chtimes_kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir timesq
+	echo 'touch timesq' | kqueue_monitor 1 timesq
+	kqueue_check timesq NOTE_ATTRIB
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case chown
+	atf_add_test_case chown_kqueue
+	atf_add_test_case chgrp
+	atf_add_test_case chgrp_kqueue
+	atf_add_test_case chowngrp
+	atf_add_test_case chowngrp_kqueue
+	atf_add_test_case chmod
+	atf_add_test_case chmod_kqueue
+	atf_add_test_case chtimes
+	atf_add_test_case chtimes_kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh b/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh
new file mode 100755
index 000000000000..9673b91ea135
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh
@@ -0,0 +1,131 @@
+# $NetBSD: t_sizes.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the file system controls memory usage correctly.
+#
+
+atf_test_case small
+small_head() {
+	atf_set "descr" "Checks the status after creating a small file"
+	atf_set "require.user" "root"
+}
+small_body() {
+	test_mount -o -s10M
+
+	echo a >a || atf_fail "Could not create file"
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	f_bused=$((${f_blocks} - ${f_bfree}))
+	[ ${f_bused} -gt 1 ] || atf_fail "Incorrect bused count"
+	atf_check -s eq:0 -o empty -e empty rm a
+
+	test_unmount
+}
+
+atf_test_case big
+big_head() {
+	atf_set "descr" "Checks the status after creating a big file"
+	atf_set "require.user" "root"
+}
+big_body() {
+	test_mount -o -s10M
+
+	pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3)
+	eval $($(atf_get_srcdir)/h_tools statvfs . | sed -e 's|^f_|cf_|')
+	cf_bused=$((${cf_blocks} - ${cf_bfree}))
+
+	atf_check -s eq:0 -o ignore -e ignore \
+	    dd if=/dev/zero of=a bs=1m count=5
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	f_bused=$((${f_blocks} - ${f_bfree}))
+	[ ${f_bused} -ne ${cf_bused} ] || atf_fail "bused did not change"
+	[ ${f_bused} -gt $((5 * 1024 * 1024 / ${pagesize})) ] || \
+	    atf_fail "bused too big"
+	of_bused=${f_bused}
+	atf_check -s eq:0 -o empty -e empty rm a
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	f_bused=$((${f_blocks} - ${f_bfree}))
+	[ ${f_bused} -lt ${of_bused} ] || \
+	    atf_fail "bused was not correctly restored"
+
+	test_unmount
+}
+
+atf_test_case overflow
+overflow_head() {
+	atf_set "descr" "Checks the status after creating a big file that" \
+	                "overflows the file system limits"
+	atf_set "require.user" "root"
+}
+overflow_body() {
+	test_mount -o -s10M
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty rm a
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	of_bused=$((${f_blocks} - ${f_bfree}))
+	atf_check -s eq:1 -o ignore -e ignore \
+	    dd if=/dev/zero of=a bs=1m count=15
+	atf_check -s eq:0 -o empty -e empty rm a
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	f_bused=$((${f_blocks} - ${f_bfree}))
+	[ ${f_bused} -ge ${of_bused} -a ${f_bused} -le $((${of_bused} + 1)) ] \
+	    || atf_fail "Incorrect bused"
+
+	test_unmount
+}
+
+atf_test_case overwrite
+overwrite_head() {
+	atf_set "descr" "Checks that writing to the middle of a file" \
+	                "does not change its size"
+	atf_set "require.user" "root"
+}
+overwrite_body() {
+	test_mount -o -s10M
+
+	atf_check -s eq:0 -o ignore -e ignore \
+	    dd if=/dev/zero of=a bs=1024 count=10
+	sync
+	atf_check -s eq:0 -o ignore -e ignore \
+	    dd if=/dev/zero of=a bs=1024 conv=notrunc seek=1 count=1
+	sync
+	eval $(stat -s a)
+	[ ${st_size} -eq 10240 ] || atf_fail "Incorrect file size"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case small
+	atf_add_test_case big
+	atf_add_test_case overflow
+	atf_add_test_case overwrite
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_sockets.sh b/contrib/netbsd-tests/fs/tmpfs/t_sockets.sh
new file mode 100755
index 000000000000..6b972483513c
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_sockets.sh
@@ -0,0 +1,52 @@
+# $NetBSD: t_sockets.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Verifies that sockets can be created using" \
+	                "socket/bind"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty $(atf_get_srcdir)/h_tools sockets a
+	atf_check -s eq:0 -o empty -e empty rm a
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo "$(atf_get_srcdir)/h_tools sockets dir/a" | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh b/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh
new file mode 100755
index 000000000000..21290b6239f9
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh
@@ -0,0 +1,59 @@
+# $NetBSD: t_statvfs.sh,v 1.4 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the statvfs system call works properly (returning the
+# correct values) over a tmpfs mount point.
+#
+
+atf_test_case values
+values_head() {
+	atf_set "descr" "Tests that statvfs(2) returns correct values"
+	atf_set "require.user" "root"
+}
+values_body() {
+	test_mount -o -s10M
+
+	pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3)
+	eval $($(atf_get_srcdir)/h_tools statvfs .)
+	[ ${pagesize} -eq ${f_bsize} ] || \
+	    atf_fail "Invalid bsize"
+	[ $((${f_bsize} * ${f_blocks})) -ge $((10 * 1024 * 1024)) ] || \
+	    atf_file "bsize * blocks too small"
+	[ $((${f_bsize} * ${f_blocks})) -le \
+	    $((10 * 1024 * 1024 + ${pagesize})) ] || \
+	    atf_fail "bsize * blocks too big"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case values
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_symlink.sh b/contrib/netbsd-tests/fs/tmpfs/t_symlink.sh
new file mode 100755
index 000000000000..2cc66c06b4a6
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_symlink.sh
@@ -0,0 +1,114 @@
+# $NetBSD: t_symlink.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that the symlink and readlink operations work.
+#
+
+atf_test_case file
+file_head() {
+	atf_set "descr" "Tests that symlinks to files work"
+	atf_set "require.user" "root"
+}
+file_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	atf_check -s eq:0 -o empty -e empty ln -s a b
+	[ $(md5 b | cut -d ' ' -f 4) = d41d8cd98f00b204e9800998ecf8427e ] || \
+	    atf_fail "Symlink points to an incorrect file"
+
+	atf_check -s eq:0 -o empty -e empty -x 'echo foo >a'
+	[ $(md5 b | cut -d ' ' -f 4) = d3b07384d113edec49eaa6238ad5ff00 ] || \
+	    atf_fail "Symlink points to an incorrect file"
+
+	test_unmount
+}
+
+atf_test_case exec
+exec_head() {
+	atf_set "descr" "Tests symlinking to a known system binary and" \
+	                "executing it through the symlink"
+	atf_set "require.user" "root"
+}
+exec_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch b
+	atf_check -s eq:0 -o empty -e empty ln -s /bin/cp cp
+	atf_check -s eq:0 -o empty -e empty ./cp b c
+	atf_check -s eq:0 -o empty -e empty test -f c
+
+	test_unmount
+}
+
+atf_test_case dir
+dir_head() {
+	atf_set "descr" "Tests that symlinks to directories work"
+	atf_set "require.user" "root"
+}
+dir_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir d
+	atf_check -s eq:1 -o empty -e empty test -f d/foo
+	atf_check -s eq:1 -o empty -e empty test -f e/foo
+	atf_check -s eq:0 -o empty -e empty ln -s d e
+	atf_check -s eq:0 -o empty -e empty touch d/foo
+	atf_check -s eq:0 -o empty -e empty test -f d/foo
+	atf_check -s eq:0 -o empty -e empty test -f e/foo
+
+	test_unmount
+}
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Tests that creating a symlink raises the" \
+	                "appropriate kqueue events"
+	atf_set "require.user" "root"
+}
+kqueue_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir dir
+	echo 'ln -s non-existent dir/a' | kqueue_monitor 1 dir
+	kqueue_check dir NOTE_WRITE
+	atf_check -s eq:0 -o empty -e empty rm dir/a
+	atf_check -s eq:0 -o empty -e empty rmdir dir
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case file
+	atf_add_test_case exec
+	atf_add_test_case dir
+	atf_add_test_case kqueue
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_times.sh b/contrib/netbsd-tests/fs/tmpfs/t_times.sh
new file mode 100755
index 000000000000..f83dfe8f5929
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_times.sh
@@ -0,0 +1,141 @@
+# $NetBSD: t_times.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Verifies that node times are properly handled.
+#
+
+atf_test_case empty
+empty_head() {
+	atf_set "descr" "Tests that creating an empty file and later" \
+	                "manipulating it updates times correctly"
+	atf_set "require.user" "root"
+}
+empty_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty touch a
+	eval $(stat -s a | sed -e 's|st_|ost_|g') || atf_fail "stat failed"
+	[ ${ost_birthtime} -eq ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${ost_birthtime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${ost_birthtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime"
+
+	sleep 1
+	atf_check -s eq:0 -o ignore -e empty cat a
+	eval $(stat -s a) || atf_fail "stat failed"
+	[ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${st_ctime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime"
+
+	sleep 1
+	echo foo >a || atf_fail "Write failed"
+	eval $(stat -s a) || atf_fail "stat failed"
+	[ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${st_ctime} -gt ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${st_mtime} -gt ${ost_mtime} ] || atf_fail "Incorrect mtime"
+
+	test_unmount
+}
+
+atf_test_case non_empty
+non_empty_head() {
+	atf_set "descr" "Tests that creating a non-empty file and later" \
+	                "manipulating it updates times correctly"
+	atf_set "require.user" "root"
+}
+non_empty_body() {
+	test_mount
+
+	echo foo >b || atf_fail "Non-empty creation failed"
+	eval $(stat -s b | sed -e 's|st_|ost_|g') || atf_fail "stat failed"
+
+	sleep 1
+	atf_check -s eq:0 -o ignore -e empty cat b
+	eval $(stat -s b) || atf_fail "stat failed"
+	[ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${st_ctime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime"
+
+	test_unmount
+}
+
+atf_test_case link
+link_head() {
+	atf_set "descr" "Tests that linking to an existing file updates" \
+	                "times correctly"
+	atf_set "require.user" "root"
+}
+link_body() {
+	test_mount
+
+	echo foo >c || atf_fail "Non-empty creation failed"
+	eval $(stat -s c | sed -e 's|st_|ost_|g') || atf_fail "stat failed"
+
+	sleep 1
+	atf_check -s eq:0 -o empty -e empty ln c d
+	eval $(stat -s c) || atf_fail "stat failed"
+	[ ${st_atime} -eq ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${st_ctime} -gt ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime"
+
+	test_unmount
+}
+
+atf_test_case rename
+rename_head() {
+	atf_set "descr" "Tests that renaming an existing file updates" \
+	                "times correctly"
+	atf_set "require.user" "root"
+}
+rename_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir e
+	echo foo >e/a || atf_fail "Creation failed"
+	eval $(stat -s e | sed -e 's|st_|dost_|g') || atf_fail "stat failed"
+	eval $(stat -s e/a | sed -e 's|st_|ost_|g') || atf_fail "stat failed"
+	sleep 1
+	atf_check -s eq:0 -o empty -e empty mv e/a e/b
+	eval $(stat -s e | sed -e 's|st_|dst_|g') || atf_fail "stat failed"
+	eval $(stat -s e/b) || atf_fail "stat failed"
+	[ ${st_atime} -eq ${ost_atime} ] || atf_fail "Incorrect atime"
+	[ ${st_ctime} -gt ${ost_ctime} ] || atf_fail "Incorrect ctime"
+	[ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime"
+	[ ${dst_mtime} -gt ${dost_mtime} ] || atf_fail "Incorrect mtime"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case empty
+	atf_add_test_case non_empty
+	atf_add_test_case link
+	atf_add_test_case rename
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_trail_slash.sh b/contrib/netbsd-tests/fs/tmpfs/t_trail_slash.sh
new file mode 100755
index 000000000000..df5b023711bb
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_trail_slash.sh
@@ -0,0 +1,52 @@
+# $NetBSD: t_trail_slash.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case main
+main_head() {
+	atf_set "descr" "Verifies that trailing slashes are not stored" \
+	                "in directory names and that they do not cause" \
+	                "crashes"
+	atf_set "require.user" "root"
+}
+main_body() {
+	test_mount
+
+	atf_check -s eq:0 -o empty -e empty mkdir a/
+	atf_check -s eq:0 -o empty -e empty touch a/b
+	atf_check -s eq:0 -o empty -e empty test -f a/b
+	atf_check -s eq:0 -o empty -e empty rm a/b
+	atf_check -s eq:0 -o empty -e empty rmdir a/
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case main
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_truncate.sh b/contrib/netbsd-tests/fs/tmpfs/t_truncate.sh
new file mode 100755
index 000000000000..2bc1902795cb
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_truncate.sh
@@ -0,0 +1,56 @@
+# $NetBSD: t_truncate.sh,v 1.4 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Verifies that the truncate operation works"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	echo "Creating big file"
+	jot 10000 >a || atf_fail "Failed to create big file"
+	echo "Trunctaing the file to a smaller size"
+	echo foo >a || atf_fail "Failed to truncate file to a smaller size"
+	[ $(md5 a | cut -d ' ' -f 4) = d3b07384d113edec49eaa6238ad5ff00 ] || \
+	    echo "Truncated file is incorrect"
+
+	echo "Truncating to zero bytes"
+	>a || atf_fail "Failed to truncate to 0"
+	echo "Truncating to zero bytes, second try"
+	>a || atf_fail "Failed to re-truncate to 0"
+
+	test_unmount
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh b/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh
new file mode 100755
index 000000000000..2c97fa99d613
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh
@@ -0,0 +1,78 @@
+# $NetBSD: t_vnd.sh,v 1.8 2011/04/21 22:26:46 haad Exp $
+#
+# Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+# 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.
+#
+
+#
+# Verifies that vnd works with files stored in tmpfs.
+#
+
+atf_test_case basic cleanup
+basic_head() {
+	atf_set "descr" "Verifies that vnd works with files stored in tmpfs"
+	atf_set "require.user" "root"
+}
+basic_body() {
+	test_mount
+
+	atf_check -s eq:0 -o ignore -e ignore \
+	    dd if=/dev/zero of=disk.img bs=1m count=10
+	atf_check -s eq:0 -o empty -e empty vnconfig /dev/vnd3 disk.img
+
+	atf_check -s eq:0 -o ignore -e ignore newfs /dev/rvnd3a
+
+	atf_check -s eq:0 -o empty -e empty mkdir mnt
+	atf_check -s eq:0 -o empty -e empty mount /dev/vnd3a mnt
+
+	echo "Creating test files"
+	for f in $(jot -w %u 100 | uniq); do
+		jot 1000 >mnt/${f} || atf_fail "Failed to create file ${f}"
+	done
+
+	echo "Verifying created files"
+	for f in $(jot -w %u 100 | uniq); do
+		[ $(md5 mnt/${f} | cut -d ' ' -f 4) = \
+		    53d025127ae99ab79e8502aae2d9bea6 ] || \
+		    atf_fail "Invalid checksum for file ${f}"
+	done
+
+	atf_check -s eq:0 -o empty -e empty umount mnt
+	atf_check -s eq:0 -o empty -e empty vnconfig -u /dev/vnd3
+
+	test_unmount
+	touch done
+}
+basic_cleanup() {
+	if [ ! -f done ]; then
+		umount mnt 2>/dev/null 1>&2
+		vnconfig -u /dev/vnd3 2>/dev/null 1>&2
+	fi
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh b/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh
new file mode 100755
index 000000000000..c505ffdbaf9d
--- /dev/null
+++ b/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh
@@ -0,0 +1,60 @@
+# $NetBSD: t_vnode_leak.sh,v 1.6 2010/11/07 17:51:18 jmmv Exp $
+#
+# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case main cleanup
+main_head() {
+	atf_set "descr" "Verifies that vnodes are not leaked and that" \
+	                "their reclaim operation works as expected: i.e.," \
+	                "when all free vnodes are exhausted, unused ones" \
+	                "have to be recycled, which is what the reclaim" \
+	                "operation does."
+	atf_set "require.user" "root"
+}
+main_body() {
+	echo "Lowering kern.maxvnodes to 2000"
+	sysctl kern.maxvnodes | awk '{ print $3; }' >oldvnodes
+	atf_check -s eq:0 -o ignore -e empty sysctl -w kern.maxvnodes=2000
+
+	test_mount -o -s$(((4000 + 2) * 4096))
+	echo "Creating 4000 directories"
+	for f in $(jot 4000); do
+		mkdir ${f}
+	done
+	test_unmount
+}
+main_cleanup() {
+	oldvnodes=$(cat oldvnodes)
+	echo "Restoring kern.maxvnodes to ${oldvnodes}"
+	sysctl -w kern.maxvnodes=${oldvnodes}
+}
+
+atf_init_test_cases() {
+	. $(atf_get_srcdir)/../h_funcs.subr
+	. $(atf_get_srcdir)/h_funcs.subr
+
+	atf_add_test_case main
+}
diff --git a/contrib/netbsd-tests/fs/umapfs/t_basic.c b/contrib/netbsd-tests/fs/umapfs/t_basic.c
new file mode 100644
index 000000000000..259f6fe8c11b
--- /dev/null
+++ b/contrib/netbsd-tests/fs/umapfs/t_basic.c
@@ -0,0 +1,145 @@
+/*	$NetBSD: t_basic.c,v 1.4 2010/07/19 15:35:39 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+#include <rump/rumpvfs_if_pub.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+#include <miscfs/umapfs/umap.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "basic umapfs mapping");
+}
+
+static void
+xtouch(const char *path)
+{
+	int fd;
+
+	fd = rump_sys_open(path, O_CREAT | O_RDWR, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create %s", path);
+	rump_sys_close(fd);
+}
+
+static void
+xchown(const char *path, uid_t uid, gid_t gid)
+{
+
+	if (rump_sys_chown(path, uid, gid) == -1)
+		atf_tc_fail_errno("chown %s failed", path);
+}
+
+static void
+testuidgid(const char *path, uid_t uid, gid_t gid)
+{
+	struct stat sb;
+
+	if (rump_sys_stat(path, &sb) == -1)
+		atf_tc_fail_errno("stat %s", path);
+	if (uid != (uid_t)-1) {
+		if (sb.st_uid != uid)
+			atf_tc_fail("%s: expected uid %d, got %d",
+			    path, uid, sb.st_uid);
+	}
+	if (gid != (gid_t)-1) {
+		if (sb.st_gid != gid)
+			atf_tc_fail("%s: expected gid %d, got %d",
+			    path, gid, sb.st_gid);
+	}
+}
+
+ATF_TC_BODY(basic, tc)
+{
+	struct umap_args umargs;
+	struct tmpfs_args targs;
+	u_long umaps[2][2];
+	u_long gmaps[2][2];
+
+	rump_init();
+	if (rump_sys_mkdir("/td1", 0777) == -1)
+		atf_tc_fail_errno("mp1");
+	if (rump_sys_mkdir("/td2", 0777) == -1)
+		atf_tc_fail_errno("mp1");
+
+	/* use tmpfs because rumpfs doesn't support ownership */
+	memset(&targs, 0, sizeof(targs));
+	targs.ta_version = TMPFS_ARGS_VERSION;
+	targs.ta_root_mode = 0777;
+	if (rump_sys_mount(MOUNT_TMPFS, "/td1", 0, &targs, sizeof(targs)) == -1)
+		atf_tc_fail_errno("could not mount tmpfs td1");
+
+	memset(&umargs, 0, sizeof(umargs));
+
+	/*
+	 * Map td1 uid 555 to td2 uid 777 (yes, IMHO the umapfs
+	 * mapping format is counter-intuitive).
+	 */
+	umaps[0][0] = 777;
+	umaps[0][1] = 555;
+	umaps[1][0] = 0;
+	umaps[1][1] = 0;
+	gmaps[0][0] = 4321;
+	gmaps[0][1] = 1234;
+	gmaps[1][0] = 0;
+	gmaps[1][1] = 0;
+
+	umargs.umap_target = __UNCONST("/td1");
+	umargs.nentries = 2;
+	umargs.gnentries = 2;
+	umargs.mapdata = umaps;
+	umargs.gmapdata = gmaps;
+
+	if (rump_sys_mount(MOUNT_UMAP, "/td2", 0, &umargs,sizeof(umargs)) == -1)
+		atf_tc_fail_errno("could not mount umapfs");
+
+	xtouch("/td1/noch");
+	testuidgid("/td1/noch", 0, 0);
+	testuidgid("/td2/noch", 0, 0);
+
+	xtouch("/td1/nomap");
+	xchown("/td1/nomap", 1, 2);
+	testuidgid("/td1/nomap", 1, 2);
+	testuidgid("/td2/nomap", -1, -1);
+
+	xtouch("/td1/forwmap");
+	xchown("/td1/forwmap", 555, 1234);
+	testuidgid("/td1/forwmap", 555, 1234);
+	testuidgid("/td2/forwmap", 777, 4321);
+
+	/*
+	 * this *CANNOT* be correct???
+	 */
+	xtouch("/td1/revmap");
+	/*
+	 * should be 777 / 4321 (?), but makes first test fail since
+	 * it gets 777 / 4321, i.e. unmapped results.
+	 */
+	xchown("/td2/revmap", 555, 1234);
+	testuidgid("/td1/revmap", 555, 1234);
+	testuidgid("/td2/revmap", 777, 4321);
+	
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, basic);
+	return 0; /*XXX?*/
+}
diff --git a/contrib/netbsd-tests/fs/union/t_pr.c b/contrib/netbsd-tests/fs/union/t_pr.c
new file mode 100644
index 000000000000..2d0c0c84db49
--- /dev/null
+++ b/contrib/netbsd-tests/fs/union/t_pr.c
@@ -0,0 +1,130 @@
+/*	$NetBSD: t_pr.c,v 1.8 2011/08/10 06:27:02 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/union/union.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(multilayer);
+ATF_TC_HEAD(multilayer, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "mount_union -b twice");
+}
+
+ATF_TC_BODY(multilayer, tc)
+{
+	struct union_args unionargs;
+
+	rump_init();
+
+	if (rump_sys_mkdir("/Tunion", 0777) == -1)
+		atf_tc_fail_errno("mkdir mp1");
+	if (rump_sys_mkdir("/Tunion2", 0777) == -1)
+		atf_tc_fail_errno("mkdir mp2");
+	if (rump_sys_mkdir("/Tunion2/A", 0777) == -1)
+		atf_tc_fail_errno("mkdir A");
+	if (rump_sys_mkdir("/Tunion2/B", 0777) == -1)
+		atf_tc_fail_errno("mkdir B");
+
+	unionargs.target = __UNCONST("/Tunion2/A");
+	unionargs.mntflags = UNMNT_BELOW;
+
+	if (rump_sys_mount(MOUNT_UNION, "/Tunion", 0,
+	    &unionargs, sizeof(unionargs)) == -1)
+		atf_tc_fail_errno("union mount");
+
+	unionargs.target = __UNCONST("/Tunion2/B");
+	unionargs.mntflags = UNMNT_BELOW;
+
+	rump_sys_mount(MOUNT_UNION, "/Tunion", 0,&unionargs,sizeof(unionargs));
+}
+
+ATF_TC(devnull1);
+ATF_TC_HEAD(devnull1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "mount_union -b and "
+	    "'echo x > /un/null'");
+}
+
+ATF_TC_BODY(devnull1, tc)
+{
+	struct union_args unionargs;
+	int fd, res;
+
+	rump_init();
+
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("mkdir mp");
+
+	unionargs.target = __UNCONST("/dev");
+	unionargs.mntflags = UNMNT_BELOW;
+
+	if (rump_sys_mount(MOUNT_UNION, "/mp", 0,
+	    &unionargs, sizeof(unionargs)) == -1)
+		atf_tc_fail_errno("union mount");
+
+	fd = rump_sys_open("/mp/null", O_WRONLY | O_CREAT | O_TRUNC);
+
+	if (fd == -1)
+		atf_tc_fail_errno("open");
+
+	res = rump_sys_write(fd, &fd, sizeof(fd));
+	if (res != sizeof(fd))
+		atf_tc_fail("write");
+}
+
+ATF_TC(devnull2);
+ATF_TC_HEAD(devnull2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "mount_union -b and "
+	    "'echo x >> /un/null'");
+}
+
+ATF_TC_BODY(devnull2, tc)
+{
+	struct union_args unionargs;
+	int fd, res;
+
+	rump_init();
+
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("mkdir mp");
+
+	unionargs.target = __UNCONST("/dev");
+	unionargs.mntflags = UNMNT_BELOW;
+
+	if (rump_sys_mount(MOUNT_UNION, "/mp", 0,
+	    &unionargs, sizeof(unionargs)) == -1)
+		atf_tc_fail_errno("union mount");
+
+	fd = rump_sys_open("/mp/null", O_WRONLY | O_CREAT | O_APPEND);
+	if (fd == -1)
+		atf_tc_fail_errno("open");
+
+	res = rump_sys_write(fd, &fd, sizeof(fd));
+	if (res != sizeof(fd))
+		atf_tc_fail("write");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, multilayer);
+	ATF_TP_ADD_TC(tp, devnull1);
+	ATF_TP_ADD_TC(tp, devnull2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_full.c b/contrib/netbsd-tests/fs/vfs/t_full.c
new file mode 100644
index 000000000000..f338a0221f0a
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_full.c
@@ -0,0 +1,101 @@
+/*	$NetBSD: t_full.c,v 1.8 2013/03/16 05:45:37 jmmv Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+/*
+ * Write this much over the image size.  This is to force an NFS commit,
+ * since we might just stuff data into the cache and miss the problem.
+ */
+#define NFSBONUS (1<<16)
+
+static void
+fillfs(const atf_tc_t *tc, const char *mp)
+{
+	char buf[8192];
+	size_t written;
+	ssize_t n = 0; /* xxxgcc */
+	size_t bonus;
+	int fd, i = 0;
+
+	if (FSTYPE_P2K_FFS(tc) || FSTYPE_PUFFS(tc) || FSTYPE_RUMPFS(tc)) {
+		atf_tc_skip("fs does not support explicit block allocation "
+		    "(GOP_ALLOC)");
+	}
+
+	bonus = 0;
+	if (FSTYPE_NFS(tc))
+		bonus = NFSBONUS;
+
+	if (rump_sys_chdir(mp) == -1)
+		atf_tc_fail_errno("chdir mountpoint");
+	fd = rump_sys_open("afile", O_CREAT | O_RDWR);
+	if (fd == -1)
+		atf_tc_fail_errno("create file");
+
+	for (written = 0; written < FSTEST_IMGSIZE + bonus; written +=n) {
+		memset(buf, i++, sizeof(buf)); /* known garbage */
+		n = rump_sys_write(fd, buf, sizeof(buf));
+		if (n == -1)
+			break;
+	}
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (n == -1) {
+		if (errno != ENOSPC)
+			atf_tc_fail_errno("write");
+	} else {
+		atf_tc_fail("filled file system over size limit");
+	}
+
+	rump_sys_close(fd);
+	rump_sys_chdir("/");
+}
+
+ATF_TC_FSAPPLY(fillfs, "fills file system, expects ENOSPC");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(fillfs);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_io.c b/contrib/netbsd-tests/fs/vfs/t_io.c
new file mode 100644
index 000000000000..67d865706ee8
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_io.c
@@ -0,0 +1,250 @@
+/*	$NetBSD: t_io.c,v 1.12 2013/08/04 11:02:02 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+#define TESTSTR "this is a string.  collect enough and you'll have Em"
+#define TESTSZ sizeof(TESTSTR)
+
+static void
+holywrite(const atf_tc_t *tc, const char *mp)
+{
+	char buf[1024];
+	char *b2, *b3;
+	size_t therange = getpagesize()+1;
+	int fd;
+
+	FSTEST_ENTER();
+
+	RL(fd = rump_sys_open("file", O_RDWR|O_CREAT|O_TRUNC, 0666));
+
+	memset(buf, 'A', sizeof(buf));
+	RL(rump_sys_pwrite(fd, buf, 1, getpagesize()));
+
+	memset(buf, 'B', sizeof(buf));
+	RL(rump_sys_pwrite(fd, buf, 2, getpagesize()-1));
+
+	REQUIRE_LIBC(b2 = malloc(2 * getpagesize()), NULL);
+	REQUIRE_LIBC(b3 = malloc(2 * getpagesize()), NULL);
+
+	RL(rump_sys_pread(fd, b2, therange, 0));
+
+	memset(b3, 0, therange);
+	memset(b3 + getpagesize() - 1, 'B', 2);
+
+	ATF_REQUIRE_EQ(memcmp(b2, b3, therange), 0);
+
+	rump_sys_close(fd);
+	FSTEST_EXIT();
+}
+
+static void
+extendbody(const atf_tc_t *tc, off_t seekcnt)
+{
+	char buf[TESTSZ+1];
+	struct stat sb;
+	int fd;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open("testfile",
+	    O_CREAT | O_RDWR | (seekcnt ? O_APPEND : 0)));
+	RL(rump_sys_ftruncate(fd, seekcnt));
+	RL(rump_sys_fstat(fd, &sb));
+	ATF_REQUIRE_EQ(sb.st_size, seekcnt);
+
+	ATF_REQUIRE_EQ(rump_sys_write(fd, TESTSTR, TESTSZ), TESTSZ);
+	ATF_REQUIRE_EQ(rump_sys_pread(fd, buf, TESTSZ, seekcnt), TESTSZ);
+	ATF_REQUIRE_STREQ(buf, TESTSTR);
+
+	RL(rump_sys_fstat(fd, &sb));
+	ATF_REQUIRE_EQ(sb.st_size, (off_t)TESTSZ + seekcnt);
+	RL(rump_sys_close(fd));
+	FSTEST_EXIT();
+}
+
+static void
+extendfile(const atf_tc_t *tc, const char *mp)
+{
+
+	extendbody(tc, 0);
+}
+
+static void
+extendfile_append(const atf_tc_t *tc, const char *mp)
+{
+
+	extendbody(tc, 37);
+}
+
+static void
+overwritebody(const atf_tc_t *tc, off_t count, bool dotrunc)
+{
+	char *buf;
+	int fd;
+
+	REQUIRE_LIBC(buf = malloc(count), NULL);
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open("testi", O_CREAT | O_RDWR, 0666));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, buf, count), count);
+	RL(rump_sys_close(fd));
+
+	RL(fd = rump_sys_open("testi", O_RDWR));
+	if (dotrunc)
+		RL(rump_sys_ftruncate(fd, 0));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, buf, count), count);
+	RL(rump_sys_close(fd));
+	FSTEST_EXIT();
+}
+
+static void
+overwrite512(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 512, false);
+}
+
+static void
+overwrite64k(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 1<<16, false);
+}
+
+static void
+overwrite_trunc(const atf_tc_t *tc, const char *mp)
+{
+
+	overwritebody(tc, 1<<16, true);
+}
+
+static void
+shrinkfile(const atf_tc_t *tc, const char *mp)
+{
+	int fd;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open("file", O_RDWR|O_CREAT|O_TRUNC, 0666));
+	RL(rump_sys_ftruncate(fd, 2));
+	RL(rump_sys_ftruncate(fd, 1));
+	rump_sys_close(fd);
+	FSTEST_EXIT();
+}
+
+#define TBSIZE 9000
+static void
+read_after_unlink(const atf_tc_t *tc, const char *mp)
+{
+	char buf[TBSIZE], buf2[TBSIZE];
+	int fd;
+
+	FSTEST_ENTER();
+
+	/* create file and put some content into it */
+	RL(fd = rump_sys_open("file", O_RDWR|O_CREAT, 0666));
+	memset(buf, 'D', TBSIZE);
+	ATF_REQUIRE_EQ(rump_sys_write(fd, buf, TBSIZE), TBSIZE);
+	rump_sys_close(fd);
+
+	/* flush buffers from UBC to file system */
+	ATF_REQUIRE_ERRNO(EBUSY, rump_sys_unmount(mp, 0) == -1);
+
+	RL(fd = rump_sys_open("file", O_RDWR));
+	RL(rump_sys_unlink("file"));
+
+	ATF_REQUIRE_EQ(rump_sys_read(fd, buf2, TBSIZE), TBSIZE);
+	ATF_REQUIRE_EQ(memcmp(buf, buf2, TBSIZE), 0);
+	rump_sys_close(fd);
+
+	FSTEST_EXIT();
+}
+
+static void
+wrrd_after_unlink(const atf_tc_t *tc, const char *mp)
+{
+	int value = 0x11;
+	int v2;
+	int fd;
+
+	FSTEST_ENTER();
+
+	RL(fd = rump_sys_open("file", O_RDWR|O_CREAT, 0666));
+	RL(rump_sys_unlink("file"));
+
+	RL(rump_sys_pwrite(fd, &value, sizeof(value), 654321));
+
+	/*
+	 * We can't easily invalidate the buffer since we hold a
+	 * reference, but try to get them to flush anyway.
+	 */
+	RL(rump_sys_fsync(fd));
+	RL(rump_sys_pread(fd, &v2, sizeof(v2), 654321));
+	rump_sys_close(fd);
+
+	ATF_REQUIRE_EQ(value, v2);
+	FSTEST_EXIT();
+}
+
+ATF_TC_FSAPPLY(holywrite, "create a sparse file and fill hole");
+ATF_TC_FSAPPLY(extendfile, "check that extending a file works");
+ATF_TC_FSAPPLY(extendfile_append, "check that extending a file works "
+				  "with a append-only fd (PR kern/44307)");
+ATF_TC_FSAPPLY(overwrite512, "write a 512 byte file twice");
+ATF_TC_FSAPPLY(overwrite64k, "write a 64k byte file twice");
+ATF_TC_FSAPPLY(overwrite_trunc, "write 64k + truncate + rewrite");
+ATF_TC_FSAPPLY(shrinkfile, "shrink file");
+ATF_TC_FSAPPLY(read_after_unlink, "contents can be read off disk after unlink");
+ATF_TC_FSAPPLY(wrrd_after_unlink, "file can be written and read after unlink");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(holywrite);
+	ATF_TP_FSAPPLY(extendfile);
+	ATF_TP_FSAPPLY(extendfile_append);
+	ATF_TP_FSAPPLY(overwrite512);
+	ATF_TP_FSAPPLY(overwrite64k);
+	ATF_TP_FSAPPLY(overwrite_trunc);
+	ATF_TP_FSAPPLY(shrinkfile);
+	ATF_TP_FSAPPLY(read_after_unlink);
+	ATF_TP_FSAPPLY(wrrd_after_unlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_renamerace.c b/contrib/netbsd-tests/fs/vfs/t_renamerace.c
new file mode 100644
index 000000000000..70e02f3ce107
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_renamerace.c
@@ -0,0 +1,190 @@
+/*	$NetBSD: t_renamerace.c,v 1.32 2014/07/29 09:15:48 gson Exp $	*/
+
+/*
+ * Modified for rump and atf from a program supplied
+ * by Nicolas Joly in kern/40948
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/utsname.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+/* Bump the size of the test file system image to a larger value.
+ *
+ * These tests cause a lot of churn in the file system by creating and
+ * deleting files/directories in quick succession.  A faster CPU will cause
+ * more churn because the tests are capped by a run time period in seconds,
+ * not number of operations.
+ *
+ * This is all fine except for LFS, because the lfs_cleanerd cannot keep up
+ * with the churn and thus causes the test to fail on fast machines.  Hence
+ * the reason for this hack. */
+#define FSTEST_IMGSIZE (50000 * 512)
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+static volatile int quittingtime;
+pid_t wrkpid;
+
+static void *
+w1(void *arg)
+{
+	int fd;
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	while (!quittingtime) {
+		fd = rump_sys_open("rename.test1",
+		    O_WRONLY|O_CREAT|O_TRUNC, 0666);
+		if (fd == -1 && errno != EEXIST)
+			atf_tc_fail_errno("create");
+		rump_sys_unlink("rename.test1");
+		rump_sys_close(fd);
+	}
+
+	return NULL;
+}
+
+static void *
+w1_dirs(void *arg)
+{
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	while (!quittingtime) {
+		if (rump_sys_mkdir("rename.test1", 0777) == -1)
+			atf_tc_fail_errno("mkdir");
+		rump_sys_rmdir("rename.test1");
+	}
+
+	return NULL;
+}
+
+static void *
+w2(void *arg)
+{
+
+	rump_pub_lwproc_newlwp(wrkpid);
+
+	while (!quittingtime) {
+		rump_sys_rename("rename.test1", "rename.test2");
+	}
+
+	return NULL;
+}
+
+#define NWRK 8
+static void
+renamerace(const atf_tc_t *tc, const char *mp)
+{
+	pthread_t pt1[NWRK], pt2[NWRK];
+	int i;
+
+	/*
+	 * Sysvbfs supports only 8 inodes so this test would exhaust
+	 * the inode table and creating files would fail with ENOSPC.
+	 */
+	if (FSTYPE_SYSVBFS(tc))
+		atf_tc_skip("filesystem has not enough inodes");
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+	if (FSTYPE_UDF(tc))
+		atf_tc_expect_fail("PR kern/49046");
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	RL(wrkpid = rump_sys_getpid());
+
+	RL(rump_sys_chdir(mp));
+	for (i = 0; i < NWRK; i++)
+		pthread_create(&pt1[i], NULL, w1, NULL);
+
+	for (i = 0; i < NWRK; i++)
+		pthread_create(&pt2[i], NULL, w2, NULL);
+
+	sleep(5);
+	quittingtime = 1;
+
+	for (i = 0; i < NWRK; i++)
+		pthread_join(pt1[i], NULL);
+	for (i = 0; i < NWRK; i++)
+		pthread_join(pt2[i], NULL);
+	RL(rump_sys_chdir("/"));
+
+	if (FSTYPE_UDF(tc))
+		atf_tc_fail("race did not trigger this time");
+
+	if (FSTYPE_MSDOS(tc)) {
+		atf_tc_expect_fail("PR kern/44661");
+		/*
+		 * XXX: race does not trigger every time at least
+		 * on amd64/qemu.
+		 */
+		if (msdosfs_fstest_unmount(tc, mp, 0) != 0) {
+			rump_pub_vfs_mount_print(mp, 1);
+			atf_tc_fail_errno("unmount failed");
+		}
+		atf_tc_fail("race did not trigger this time");
+	}
+}
+
+static void
+renamerace_dirs(const atf_tc_t *tc, const char *mp)
+{
+	pthread_t pt1, pt2;
+
+	if (FSTYPE_SYSVBFS(tc))
+		atf_tc_skip("directories not supported by file system");
+
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+
+	/* XXX: msdosfs also sometimes hangs */
+	if (FSTYPE_MSDOS(tc))
+		atf_tc_expect_signal(-1, "PR kern/43626");
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	RL(wrkpid = rump_sys_getpid());
+
+	RL(rump_sys_chdir(mp));
+	pthread_create(&pt1, NULL, w1_dirs, NULL);
+	pthread_create(&pt2, NULL, w2, NULL);
+
+	sleep(5);
+	quittingtime = 1;
+
+	pthread_join(pt1, NULL);
+	pthread_join(pt2, NULL);
+	RL(rump_sys_chdir("/"));
+
+	/*
+	 * Doesn't always trigger when run on a slow backend
+	 * (i.e. not on tmpfs/mfs).  So do the usual kludge.
+	 */
+	if (FSTYPE_MSDOS(tc))
+		abort();
+}
+
+ATF_TC_FSAPPLY(renamerace, "rename(2) race with file unlinked mid-operation");
+ATF_TC_FSAPPLY(renamerace_dirs, "rename(2) race with directories");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(renamerace); /* PR kern/41128 */
+	ATF_TP_FSAPPLY(renamerace_dirs);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_rmdirrace.c b/contrib/netbsd-tests/fs/vfs/t_rmdirrace.c
new file mode 100644
index 000000000000..839dbad73352
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_rmdirrace.c
@@ -0,0 +1,106 @@
+/*	$NetBSD: t_rmdirrace.c,v 1.9 2012/02/16 02:47:56 perseant Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+
+#define DIRNAME "rmdir.test"
+
+static void *func1(void *arg)
+{
+
+	while (*(int *)arg != 1)
+		rump_sys_mkdir(DIRNAME, 0755);
+
+	return NULL;
+}
+
+static void *func2(void *arg)
+{
+
+	while (*(int *)arg != 1)
+		rump_sys_rmdir(DIRNAME);
+
+	return NULL;
+}
+
+static void
+race(const atf_tc_t *tc, const char *path)
+{
+	int res, fd, quit;
+	pthread_t th1, th2;
+
+	if (FSTYPE_SYSVBFS(tc))
+		atf_tc_skip("directories not supported by file system");
+
+	fd = rump_sys_open(".", O_RDONLY, 0666);
+	if (fd == -1)
+		atf_tc_fail("open failed");
+	res = rump_sys_chdir(path);
+	if (res == -1)
+		atf_tc_fail("chdir failed");
+
+	quit = 0;
+
+	res = pthread_create(&th1, NULL, func1, &quit);
+	if (res != 0)
+		atf_tc_fail("pthread_create1 failed");
+	res = pthread_create(&th2, NULL, func2, &quit);
+	if (res != 0)
+		atf_tc_fail("pthread_create2 failed");
+
+	sleep(10);
+
+	quit = 1;
+
+	res = pthread_join(th2, NULL);
+	if (res != 0)
+		atf_tc_fail("pthread_join2 failed");
+	res = pthread_join(th1, NULL);
+	if (res != 0)
+		atf_tc_fail("pthread_join1 failed");
+
+	res = rump_sys_fchdir(fd);
+	if (res == -1)
+		atf_tc_fail("fchdir failed");
+}
+
+ATF_FSAPPLY(race, "rmdir(2) race");
diff --git a/contrib/netbsd-tests/fs/vfs/t_ro.c b/contrib/netbsd-tests/fs/vfs/t_ro.c
new file mode 100644
index 000000000000..b1e1179956b0
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_ro.c
@@ -0,0 +1,203 @@
+/*	$NetBSD: t_ro.c,v 1.5 2011/02/22 21:23:19 yamt Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+#define AFILE "testfile"
+#define ADIR "testdir"
+#define AFIFO "testfifo"
+#define ASYMLINK "testsymlink"
+#define ALINK "testlink"
+#define FUNTEXT "this is some non-humppa text"
+#define FUNSIZE (sizeof(FUNTEXT)-1)
+
+static void
+nullgen(const atf_tc_t *tc, const char *mp)
+{
+
+	return;
+}
+
+static void
+filegen(const atf_tc_t *tc, const char *mp)
+{
+	int fd;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open(AFILE, O_CREAT | O_RDWR, 0777));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, FUNTEXT, FUNSIZE), FUNSIZE);
+	RL(rump_sys_close(fd));
+	FSTEST_EXIT();
+}
+
+/*
+ *
+ * BEGIN tests
+ *
+ */
+
+static void
+create(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_open(AFILE, O_CREAT|O_RDONLY) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+rmfile(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_unlink(AFILE) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+fileio(const atf_tc_t *tc, const char *mp)
+{
+	int fd;
+	char buf[FUNSIZE+1];
+	int expected;
+
+	if (FSTYPE_NFSRO(tc))
+		expected = EACCES;
+	else
+		expected = EROFS;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open(AFILE, O_RDONLY));
+	ATF_REQUIRE_EQ(rump_sys_read(fd, buf, FUNSIZE), FUNSIZE);
+	buf[FUNSIZE] = '\0';
+	ATF_REQUIRE_STREQ(buf, FUNTEXT);
+	RL(rump_sys_close(fd));
+
+	ATF_REQUIRE_ERRNO(expected, rump_sys_open(AFILE, O_WRONLY) == -1);
+	ATF_REQUIRE_ERRNO(expected, rump_sys_open(AFILE, O_RDWR) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+attrs(const atf_tc_t *tc, const char *mp)
+{
+	struct timeval sometvs[2];
+	struct stat sb;
+	int fd;
+
+	FSTEST_ENTER();
+
+	RL(rump_sys_stat(AFILE, &sb));
+
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_chmod(AFILE, 0775) == -1);
+	if (!FSTYPE_MSDOS(tc))
+		ATF_REQUIRE_ERRNO(EROFS, rump_sys_chown(AFILE, 1, 1) == -1);
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_utimes(AFILE, sometvs) == -1);
+
+	RL(fd = rump_sys_open(AFILE, O_RDONLY));
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_fchmod(fd, 0775) == -1);
+	if (!FSTYPE_MSDOS(tc))
+		ATF_REQUIRE_ERRNO(EROFS, rump_sys_fchown(fd, 1, 1) == -1);
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_futimes(fd, sometvs) == -1);
+	RL(rump_sys_close(fd));
+
+	FSTEST_EXIT();
+}
+
+static void
+createdir(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_mkdir(ADIR, 0775) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+createfifo(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_mkfifo(AFIFO, 0775) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+createsymlink(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_symlink("hoge", ASYMLINK) == -1);
+	FSTEST_EXIT();
+}
+
+static void
+createlink(const atf_tc_t *tc, const char *mp)
+{
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(EROFS, rump_sys_link(AFILE, ALINK) == -1);
+	FSTEST_EXIT();
+}
+
+ATF_TC_FSAPPLY_RO(create, "create file on r/o mount", nullgen);
+ATF_TC_FSAPPLY_RO(rmfile, "remove file from r/o mount", filegen);
+ATF_TC_FSAPPLY_RO(fileio, "can read a file but not write it", filegen);
+ATF_TC_FSAPPLY_RO(attrs, "can query but not change attributes", filegen);
+ATF_TC_FSAPPLY_RO(createdir, "create directory on r/o mount", nullgen);
+ATF_TC_FSAPPLY_RO(createfifo, "create fifo on r/o mount", nullgen);
+ATF_TC_FSAPPLY_RO(createsymlink, "create symlink on r/o mount", nullgen);
+ATF_TC_FSAPPLY_RO(createlink, "create hardlink on r/o mount", filegen);
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY_RO(create);
+	ATF_TP_FSAPPLY_RO(rmfile);
+	ATF_TP_FSAPPLY_RO(fileio);
+	ATF_TP_FSAPPLY_RO(attrs);
+	ATF_TP_FSAPPLY_RO(createdir);
+	ATF_TP_FSAPPLY_RO(createfifo);
+	ATF_TP_FSAPPLY_RO(createsymlink);
+	ATF_TP_FSAPPLY_RO(createlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_union.c b/contrib/netbsd-tests/fs/vfs/t_union.c
new file mode 100644
index 000000000000..bdcef939354e
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_union.c
@@ -0,0 +1,204 @@
+/*	$NetBSD: t_union.c,v 1.8 2011/08/07 06:01:51 hannken Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/union/union.h>
+
+#include "../../h_macros.h"
+#include "../common/h_fsmacros.h"
+
+#define MSTR "magic bus"
+
+static void
+xput_tfile(const char *mp, const char *path)
+{
+	char pathb[MAXPATHLEN];
+	int fd;
+
+	strcpy(pathb, mp);
+	strcat(pathb, "/");
+	strcat(pathb, path);
+
+	RL(fd = rump_sys_open(pathb, O_CREAT | O_RDWR, 0777));
+	if (rump_sys_write(fd, MSTR, sizeof(MSTR)) != sizeof(MSTR))
+		atf_tc_fail_errno("write to testfile");
+	RL(rump_sys_close(fd));
+}
+
+static int
+xread_tfile(const char *mp, const char *path)
+{
+	char pathb[MAXPATHLEN];
+	char buf[128];
+	int fd;
+
+	strcpy(pathb, mp);
+	strcat(pathb, "/");
+	strcat(pathb, path);
+
+	fd = rump_sys_open(pathb, O_RDONLY);
+	if (fd == -1)
+		return errno;
+	if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read tfile");
+	RL(rump_sys_close(fd));
+	if (strcmp(buf, MSTR) == 0)
+		return 0;
+	return EPROGMISMATCH;
+}
+
+/*
+ * Mount a unionfs for testing.  Before calling, "mp" contains
+ * the upper layer.  Lowerpath is constructed so that the directory
+ * contains rumpfs.
+ */
+static void
+mountunion(const char *mp, char *lowerpath)
+{
+	struct union_args unionargs;
+
+	sprintf(lowerpath, "/lower");
+	rump_sys_mkdir(lowerpath, 0777);
+
+	/* mount the union with our testfs as the upper layer */
+	memset(&unionargs, 0, sizeof(unionargs));
+	unionargs.target = lowerpath;
+	unionargs.mntflags = UNMNT_BELOW;
+
+	if (rump_sys_mount(MOUNT_UNION, mp, 0,
+	    &unionargs, sizeof(unionargs)) == -1) {
+		if (errno == EOPNOTSUPP) {
+			atf_tc_skip("fs does not support VOP_WHITEOUT");
+		} else {
+			atf_tc_fail_errno("union mount");
+		}
+	}
+}
+
+#if 0
+static void
+toggleroot(void)
+{
+	static int status;
+
+	status ^= MNT_RDONLY;
+
+	printf("0x%x\n", status);
+	RL(rump_sys_mount(MOUNT_RUMPFS, "/", status | MNT_UPDATE, NULL, 0));
+}
+#endif
+
+#define TFILE "tensti"
+#define TDIR "testdir"
+#define TDFILE TDIR "/indir"
+
+static void
+basic(const atf_tc_t *tc, const char *mp)
+{
+	char lowerpath[MAXPATHLEN];
+	char dbuf[8192];
+	struct stat sb;
+	struct dirent *dp;
+	int error, fd, dsize;
+
+	mountunion(mp, lowerpath);
+
+	/* create a file in the lower layer */
+	xput_tfile(lowerpath, TFILE);
+
+	/* first, test we can read the old file from the new namespace */
+	error = xread_tfile(mp, TFILE);
+	if (error != 0)
+		atf_tc_fail("union compare failed: %d (%s)",
+		    error, strerror(error));
+
+	/* then, test upper layer writes don't affect the lower layer */
+	xput_tfile(mp, "kiekko");
+	if ((error = xread_tfile(lowerpath, "kiekko")) != ENOENT)
+		atf_tc_fail("invisibility failed: %d (%s)",
+		    error, strerror(error));
+	
+	/* check that we can whiteout stuff in the upper layer */
+	FSTEST_ENTER();
+	RL(rump_sys_unlink(TFILE));
+	ATF_REQUIRE_ERRNO(ENOENT, rump_sys_stat(TFILE, &sb) == -1);
+	FSTEST_EXIT();
+
+	/* check that the removed node is not in the directory listing */
+	RL(fd = rump_sys_open(mp, O_RDONLY));
+	RL(dsize = rump_sys_getdents(fd, dbuf, sizeof(dbuf)));
+	for (dp = (struct dirent *)dbuf;
+	    (char *)dp < dbuf + dsize;
+	    dp = _DIRENT_NEXT(dp)) {
+		if (strcmp(dp->d_name, TFILE) == 0 && dp->d_type != DT_WHT)
+			atf_tc_fail("removed file non-white-outed");
+	}
+	RL(rump_sys_close(fd));
+
+	RL(rump_sys_unmount(mp, 0));
+}
+
+static void
+whiteout(const atf_tc_t *tc, const char *mp)
+{
+	char lower[MAXPATHLEN];
+	struct stat sb;
+	void *fsarg;
+
+	/*
+	 * XXX: use ffs here to make sure any screwups in rumpfs don't
+	 * affect the test
+	 */
+	RL(ffs_fstest_newfs(tc, &fsarg, "daimage", 1024*1024*5, NULL));
+	RL(ffs_fstest_mount(tc, fsarg, "/lower", 0));
+
+	/* create a file in the lower layer */
+	RL(rump_sys_chdir("/lower"));
+	RL(rump_sys_mkdir(TDIR, 0777));
+	RL(rump_sys_mkdir(TDFILE, 0777));
+	RL(rump_sys_chdir("/"));
+
+	RL(ffs_fstest_unmount(tc, "/lower", 0));
+	RL(ffs_fstest_mount(tc, fsarg, "/lower", MNT_RDONLY));
+
+	mountunion(mp, lower);
+
+	FSTEST_ENTER();
+	ATF_REQUIRE_ERRNO(ENOTEMPTY, rump_sys_rmdir(TDIR) == -1);
+	RL(rump_sys_rmdir(TDFILE));
+	RL(rump_sys_rmdir(TDIR));
+	ATF_REQUIRE_ERRNO(ENOENT, rump_sys_stat(TDFILE, &sb) == -1);
+	ATF_REQUIRE_ERRNO(ENOENT, rump_sys_stat(TDIR, &sb) == -1);
+
+	RL(rump_sys_mkdir(TDIR, 0777));
+	RL(rump_sys_stat(TDIR, &sb));
+	ATF_REQUIRE_ERRNO(ENOENT, rump_sys_stat(TDFILE, &sb) == -1);
+	FSTEST_EXIT();
+
+	RL(rump_sys_unmount(mp, 0));
+}
+
+ATF_TC_FSAPPLY(basic, "check basic union functionality");
+ATF_TC_FSAPPLY(whiteout, "create whiteout in upper layer");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(basic);
+	ATF_TP_FSAPPLY(whiteout);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_unpriv.c b/contrib/netbsd-tests/fs/vfs/t_unpriv.c
new file mode 100644
index 000000000000..fffffe412de9
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_unpriv.c
@@ -0,0 +1,241 @@
+/*	$NetBSD: t_unpriv.c,v 1.11 2014/08/29 17:39:18 gson Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <atf-c.h>
+#include <libgen.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+#define USES_OWNER							 \
+	if (FSTYPE_MSDOS(tc))						 \
+	    atf_tc_skip("owner not supported by file system")
+
+static void
+owner(const atf_tc_t *tc, const char *mp)
+{
+
+	USES_OWNER;
+
+	FSTEST_ENTER();
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+        if (rump_sys_chown(".", 1, -1) != -1 || errno != EPERM)
+		atf_tc_fail_errno("chown");
+        if (rump_sys_chmod(".", 0000) != -1 || errno != EPERM) 
+                atf_tc_fail_errno("chmod");
+	rump_pub_lwproc_releaselwp();
+
+	if (rump_sys_chown(".", 1, -1) == -1)
+		atf_tc_fail_errno("chown");
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+        if (rump_sys_chown(".", 1, -1) == -1)
+		atf_tc_fail_errno("chown");
+        if (rump_sys_chmod(".", 0000) == -1) 
+                atf_tc_fail_errno("chmod");
+	rump_pub_lwproc_releaselwp();
+
+	FSTEST_EXIT();
+}
+
+static void
+dirperms(const atf_tc_t *tc, const char *mp)
+{
+	char name[] = "dir.test/file.test";
+	char *dir = dirname(name);
+	int fd;
+
+	if (FSTYPE_SYSVBFS(tc))
+		atf_tc_skip("directories not supported by file system");
+
+	FSTEST_ENTER();
+
+	if (rump_sys_mkdir(dir, 0777) == -1)
+		atf_tc_fail_errno("mkdir");
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+        if (rump_sys_open(name, O_RDWR|O_CREAT, 0666) != -1 || errno != EACCES)
+		atf_tc_fail_errno("open");
+	rump_pub_lwproc_releaselwp();
+
+	if ((fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666)) == -1)
+		atf_tc_fail_errno("open");
+	if (rump_sys_close(fd) == -1)
+		atf_tc_fail_errno("close");
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+        if (rump_sys_unlink(name) != -1 || errno != EACCES)
+		atf_tc_fail_errno("unlink");
+	rump_pub_lwproc_releaselwp();
+
+        if (rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno("unlink");
+
+	if (rump_sys_rmdir(dir) == -1)
+		atf_tc_fail_errno("rmdir");
+
+	FSTEST_EXIT();
+}
+
+static void
+times(const atf_tc_t *tc, const char *mp)
+{
+	const char *name = "file.test";
+	int fd;
+	unsigned int i, j;
+	struct timeval tmv[2];
+	static struct timeval tmvs[] = {
+		{ QUAD_MIN, 0 },
+		{ 0, 0 },
+		{ QUAD_MAX, 999999 }
+	};
+
+	FSTEST_ENTER();
+
+	if ((fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666)) == -1)
+		atf_tc_fail_errno("open");
+	if (rump_sys_close(fd) == -1)
+		atf_tc_fail_errno("close");
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (rump_sys_utimes(name, NULL) != -1 || errno != EACCES)
+		atf_tc_fail_errno("utimes");
+	rump_pub_lwproc_releaselwp();
+
+	if (rump_sys_utimes(name, NULL) == -1)
+		atf_tc_fail_errno("utimes");
+
+	for (i = 0; i < sizeof(tmvs) / sizeof(tmvs[0]); i++) {
+		for (j = 0; j < sizeof(tmvs) / sizeof(tmvs[0]); j++) {
+			tmv[0] = tmvs[i];
+			tmv[1] = tmvs[j];
+			rump_pub_lwproc_rfork(RUMP_RFCFDG);
+			if (rump_sys_setuid(1) == -1)
+				atf_tc_fail_errno("setuid");
+			if (rump_sys_utimes(name, tmv) != -1 || errno != EPERM)
+				atf_tc_fail_errno("utimes");
+			rump_pub_lwproc_releaselwp();
+
+			if (rump_sys_utimes(name, tmv) == -1)
+				atf_tc_fail_errno("utimes");
+		}
+	}
+
+	if (rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno("unlink");
+
+	FSTEST_EXIT();
+}
+
+static void
+flags(const atf_tc_t *tc, const char *mp)
+{
+	const char *name = "file.test";
+	int fd, fflags;
+	struct stat st;
+
+	FSTEST_ENTER();
+
+	if ((fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666)) == -1)
+		atf_tc_fail_errno("open");
+	if (rump_sys_close(fd) == -1)
+		atf_tc_fail_errno("close");
+
+	if (rump_sys_stat(name, &st) == -1)
+		atf_tc_fail_errno("stat");
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (rump_sys_chflags(name, st.st_flags) == -1) {
+		if (errno == EOPNOTSUPP)
+			atf_tc_skip("file flags not supported by file system");
+		atf_tc_fail_errno("chflags");
+	}
+
+	fflags = st.st_flags | UF_IMMUTABLE;
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno("setuid");
+	fflags |= UF_IMMUTABLE;
+	if (rump_sys_chflags(name, fflags) != -1 || errno != EPERM)
+		atf_tc_fail_errno("chflags");
+	rump_pub_lwproc_releaselwp();
+
+	if (rump_sys_chflags(name, fflags) == -1)
+		atf_tc_fail_errno("chflags");
+
+	fflags &= ~UF_IMMUTABLE;
+	if (rump_sys_chflags(name, fflags) == -1)
+		atf_tc_fail_errno("chflags");
+
+	if (rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno("unlink");
+
+	FSTEST_EXIT();
+}
+
+ATF_TC_FSAPPLY(owner, "owner unprivileged checks");
+ATF_TC_FSAPPLY(dirperms, "directory permission checks");
+ATF_TC_FSAPPLY(times, "time set checks");
+ATF_TC_FSAPPLY(flags, "file flags checks");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(owner);
+	ATF_TP_FSAPPLY(dirperms);
+	ATF_TP_FSAPPLY(times);
+	ATF_TP_FSAPPLY(flags);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_vfsops.c b/contrib/netbsd-tests/fs/vfs/t_vfsops.c
new file mode 100644
index 000000000000..1bcee89e573d
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_vfsops.c
@@ -0,0 +1,211 @@
+/*	$NetBSD: t_vfsops.c,v 1.11 2011/04/04 19:16:58 hannken Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include <atf-c.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+static void
+tmount(const atf_tc_t *tc, const char *path)
+{
+
+	return;
+}
+
+static void
+tstatvfs(const atf_tc_t *tc, const char *path)
+{
+	const char *fstype = atf_tc_get_md_var(tc, "X-fs.mntname");
+	struct statvfs svb;
+
+	if (rump_sys_statvfs1(path, &svb, ST_WAIT) == -1)
+		atf_tc_fail_errno("statvfs");
+
+	ATF_REQUIRE(svb.f_namemax > 0 && svb.f_namemax <= MAXNAMLEN);
+	if (!(FSTYPE_PUFFS(tc) || FSTYPE_P2K_FFS(tc)))
+		ATF_REQUIRE_STREQ(svb.f_fstypename, fstype);
+	ATF_REQUIRE_STREQ(svb.f_mntonname, path);
+}
+
+static void
+tsync(const atf_tc_t *tc, const char *path)
+{
+
+	rump_sys_sync();
+}
+
+#define MAGICSTR "just a string, I like A"
+static void
+tfilehandle(const atf_tc_t *tc, const char *path)
+{
+	char fpath[MAXPATHLEN];
+	char buf[sizeof(MAGICSTR)];
+	size_t fhsize;
+	void *fhp;
+	int fd;
+
+	sprintf(fpath, "%s/file", path);
+	fd = rump_sys_open(fpath, O_RDWR | O_CREAT, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("open");
+
+	if (rump_sys_write(fd, MAGICSTR, sizeof(MAGICSTR)) != sizeof(MAGICSTR))
+		atf_tc_fail("write to file");
+	rump_sys_close(fd);
+
+	/*
+	 * Get file handle size.
+	 * This also weeds out unsupported file systems.
+	 */
+	fhsize = 0;
+	if (rump_sys_getfh(fpath, NULL, &fhsize) == -1) {
+		if (errno == EOPNOTSUPP) {
+			atf_tc_skip("file handles not supported");
+		} else if (errno != E2BIG) {
+			atf_tc_fail_errno("getfh size");
+		}
+	}
+
+	fhp = malloc(fhsize);
+	if (rump_sys_getfh(fpath, fhp, &fhsize) == -1)
+		atf_tc_fail_errno("getfh");
+
+	/* open file based on file handle */
+	fd = rump_sys_fhopen(fhp, fhsize, O_RDONLY);
+	if (fd == -1) {
+		atf_tc_fail_errno("fhopen");
+	}
+
+	/* check that we got the same file */
+	if (rump_sys_read(fd, buf, sizeof(buf)) != sizeof(MAGICSTR))
+		atf_tc_fail("read fhopened file");
+
+	ATF_REQUIRE_STREQ(buf, MAGICSTR);
+
+	rump_sys_close(fd);
+}
+
+#define FNAME "a_file"
+static void
+tfhremove(const atf_tc_t *tc, const char *path)
+{
+	size_t fhsize;
+	void *fhp;
+	int fd;
+
+	RL(rump_sys_chdir(path));
+	RL(fd = rump_sys_open(FNAME, O_RDWR | O_CREAT, 0777));
+	RL(rump_sys_close(fd));
+
+	fhsize = 0;
+	if (rump_sys_getfh(FNAME, NULL, &fhsize) == -1) {
+		if (errno == EOPNOTSUPP) {
+			atf_tc_skip("file handles not supported");
+		} else if (errno != E2BIG) {
+			atf_tc_fail_errno("getfh size");
+		}
+	}
+
+	fhp = malloc(fhsize);
+	RL(rump_sys_getfh(FNAME, fhp, &fhsize));
+	RL(rump_sys_unlink(FNAME));
+
+	if (FSTYPE_LFS(tc))
+		atf_tc_expect_fail("fhopen() for removed file succeeds "
+		    "(PR kern/43745)");
+	ATF_REQUIRE_ERRNO(ESTALE, rump_sys_fhopen(fhp, fhsize, O_RDONLY) == -1);
+	atf_tc_expect_pass();
+
+	RL(rump_sys_chdir("/"));
+}
+#undef FNAME
+
+/*
+ * This test only checks the file system doesn't crash.  We *might*
+ * try a valid file handle.
+ */
+static void
+tfhinval(const atf_tc_t *tc, const char *path)
+{
+	size_t fhsize;
+	void *fhp;
+	unsigned long seed;
+	int fd;
+
+	srandom(seed = time(NULL));
+	printf("RNG seed %lu\n", seed);
+
+	RL(rump_sys_chdir(path));
+	fhsize = 0;
+	if (rump_sys_getfh(".", NULL, &fhsize) == -1) {
+		if (errno == EOPNOTSUPP) {
+			atf_tc_skip("file handles not supported");
+		} else if (errno != E2BIG) {
+			atf_tc_fail_errno("getfh size");
+		}
+	}
+
+	fhp = malloc(fhsize);
+	tests_makegarbage(fhp, fhsize);
+	fd = rump_sys_fhopen(fhp, fhsize, O_RDWR);
+	if (fd != -1)
+		rump_sys_close(fd);
+
+	RL(rump_sys_chdir("/"));
+}
+
+ATF_TC_FSAPPLY(tmount, "mount/unmount");
+ATF_TC_FSAPPLY(tstatvfs, "statvfs");
+ATF_TC_FSAPPLY(tsync, "sync");
+ATF_TC_FSAPPLY(tfilehandle, "file handles");
+ATF_TC_FSAPPLY(tfhremove, "fhtovp for removed file");
+ATF_TC_FSAPPLY(tfhinval, "fhopen invalid filehandle");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(tmount);
+	ATF_TP_FSAPPLY(tstatvfs);
+	ATF_TP_FSAPPLY(tsync);
+	ATF_TP_FSAPPLY(tfilehandle);
+	ATF_TP_FSAPPLY(tfhremove);
+	ATF_TP_FSAPPLY(tfhinval);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/vfs/t_vnops.c b/contrib/netbsd-tests/fs/vfs/t_vnops.c
new file mode 100644
index 000000000000..66b550538bdd
--- /dev/null
+++ b/contrib/netbsd-tests/fs/vfs/t_vnops.c
@@ -0,0 +1,1001 @@
+/*	$NetBSD: t_vnops.c,v 1.43 2014/09/09 06:51:00 gson Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rump.h>
+
+#include "../common/h_fsmacros.h"
+#include "../../h_macros.h"
+
+#define TESTFILE "afile"
+
+#define USES_DIRS					\
+    if (FSTYPE_SYSVBFS(tc))				\
+	atf_tc_skip("directories not supported by file system")
+
+#define USES_SYMLINKS					\
+    if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc))		\
+	atf_tc_skip("symlinks not supported by file system")
+
+static char *
+md(char *buf, const char *base, const char *tail)
+{
+
+	sprintf(buf, "%s/%s", base, tail);
+	return buf;
+}
+
+static void
+lookup_simple(const atf_tc_t *tc, const char *mountpath)
+{
+	char pb[MAXPATHLEN], final[MAXPATHLEN];
+	struct stat sb1, sb2;
+
+	strcpy(final, mountpath);
+	sprintf(pb, "%s/../%s", mountpath, basename(final));
+	if (rump_sys_stat(pb, &sb1) == -1)
+		atf_tc_fail_errno("stat 1");
+
+	sprintf(pb, "%s/./../%s", mountpath, basename(final));
+	if (rump_sys_stat(pb, &sb2) == -1)
+		atf_tc_fail_errno("stat 2");
+
+	ATF_REQUIRE(memcmp(&sb1, &sb2, sizeof(sb1)) == 0);
+}
+
+static void
+lookup_complex(const atf_tc_t *tc, const char *mountpath)
+{
+	char pb[MAXPATHLEN];
+	struct stat sb1, sb2;
+
+	USES_DIRS;
+
+	if (FSTYPE_UDF(tc))
+		atf_tc_expect_fail("PR kern/49033");
+
+	sprintf(pb, "%s/dir", mountpath);
+	if (rump_sys_mkdir(pb, 0777) == -1)
+		atf_tc_fail_errno("mkdir");
+	if (rump_sys_stat(pb, &sb1) == -1)
+		atf_tc_fail_errno("stat 1");
+
+	sprintf(pb, "%s/./dir/../././dir/.", mountpath);
+	if (rump_sys_stat(pb, &sb2) == -1)
+		atf_tc_fail_errno("stat 2");
+
+	if (memcmp(&sb1, &sb2, sizeof(sb1)) != 0) {
+		printf("what\tsb1\t\tsb2\n");
+
+#define FIELD(FN)	\
+		printf(#FN "\t%lld\t%lld\n", \
+		(long long)sb1.FN, (long long)sb2.FN)
+#define TIME(FN)	\
+		printf(#FN "\t%lld.%ld\t%lld.%ld\n", \
+		(long long)sb1.FN.tv_sec, sb1.FN.tv_nsec, \
+		(long long)sb2.FN.tv_sec, sb2.FN.tv_nsec)
+
+		FIELD(st_dev);
+		FIELD(st_mode);
+		FIELD(st_ino);
+		FIELD(st_nlink);
+		FIELD(st_uid);
+		FIELD(st_gid);
+		FIELD(st_rdev);
+		TIME(st_atim);
+		TIME(st_mtim);
+		TIME(st_ctim);
+		TIME(st_birthtim);
+		FIELD(st_size);
+		FIELD(st_blocks);
+		FIELD(st_flags);
+		FIELD(st_gen);
+
+#undef FIELD
+#undef TIME
+
+		atf_tc_fail("stat results differ, see ouput for more details");
+	}
+	if (FSTYPE_UDF(tc))
+		atf_tc_fail("random failure of PR kern/49033 "
+			    "did not happen this time");
+}
+
+static void
+dir_simple(const atf_tc_t *tc, const char *mountpath)
+{
+	char pb[MAXPATHLEN];
+	struct stat sb;
+
+	USES_DIRS;
+
+	/* check we can create directories */
+	sprintf(pb, "%s/dir", mountpath);
+	if (rump_sys_mkdir(pb, 0777) == -1)
+		atf_tc_fail_errno("mkdir");
+	if (rump_sys_stat(pb, &sb) == -1)
+		atf_tc_fail_errno("stat new directory");
+
+	/* check we can remove then and that it makes them unreachable */
+	if (rump_sys_rmdir(pb) == -1)
+		atf_tc_fail_errno("rmdir");
+	if (rump_sys_stat(pb, &sb) != -1 || errno != ENOENT)
+		atf_tc_fail("ENOENT expected from stat");
+}
+
+static void
+dir_notempty(const atf_tc_t *tc, const char *mountpath)
+{
+	char pb[MAXPATHLEN], pb2[MAXPATHLEN];
+	int fd, rv;
+
+	USES_DIRS;
+
+	/* check we can create directories */
+	sprintf(pb, "%s/dir", mountpath);
+	if (rump_sys_mkdir(pb, 0777) == -1)
+		atf_tc_fail_errno("mkdir");
+
+	sprintf(pb2, "%s/dir/file", mountpath);
+	fd = rump_sys_open(pb2, O_RDWR | O_CREAT, 0777);
+	if (fd == -1)
+		atf_tc_fail_errno("create file");
+	rump_sys_close(fd);
+
+	rv = rump_sys_rmdir(pb);
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (rv != -1 || errno != ENOTEMPTY)
+		atf_tc_fail("non-empty directory removed succesfully");
+
+	if (rump_sys_unlink(pb2) == -1)
+		atf_tc_fail_errno("cannot remove dir/file");
+
+	if (rump_sys_rmdir(pb) == -1)
+		atf_tc_fail_errno("remove directory");
+}
+
+static void
+dir_rmdirdotdot(const atf_tc_t *tc, const char *mp)
+{
+	char pb[MAXPATHLEN];
+	int xerrno;
+
+	USES_DIRS;
+
+	FSTEST_ENTER();
+	RL(rump_sys_mkdir("test", 0777));
+	RL(rump_sys_chdir("test"));
+
+	RL(rump_sys_mkdir("subtest", 0777));
+	RL(rump_sys_chdir("subtest"));
+
+	md(pb, mp, "test/subtest");
+	RL(rump_sys_rmdir(pb));
+	md(pb, mp, "test");
+	RL(rump_sys_rmdir(pb));
+
+	if (FSTYPE_NFS(tc))
+		xerrno = ESTALE;
+	else
+		xerrno = ENOENT;
+	ATF_REQUIRE_ERRNO(xerrno, rump_sys_chdir("..") == -1);
+	FSTEST_EXIT();
+}
+
+static void
+checkfile(const char *path, struct stat *refp)
+{
+	char buf[MAXPATHLEN];
+	struct stat sb;
+	static int n = 1;
+
+	md(buf, path, "file");
+	if (rump_sys_stat(buf, &sb) == -1)
+		atf_tc_fail_errno("cannot stat file %d (%s)", n, buf);
+	if (memcmp(&sb, refp, sizeof(sb)) != 0)
+		atf_tc_fail("stat mismatch %d", n);
+	n++;
+}
+
+static void
+rename_dir(const atf_tc_t *tc, const char *mp)
+{
+	char pb1[MAXPATHLEN], pb2[MAXPATHLEN], pb3[MAXPATHLEN];
+	struct stat ref, sb;
+
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+
+	USES_DIRS;
+
+	md(pb1, mp, "dir1");
+	if (rump_sys_mkdir(pb1, 0777) == -1)
+		atf_tc_fail_errno("mkdir 1");
+
+	md(pb2, mp, "dir2");
+	if (rump_sys_mkdir(pb2, 0777) == -1)
+		atf_tc_fail_errno("mkdir 2");
+	md(pb2, mp, "dir2/subdir");
+	if (rump_sys_mkdir(pb2, 0777) == -1)
+		atf_tc_fail_errno("mkdir 3");
+
+	md(pb3, mp, "dir1/file");
+	if (rump_sys_mknod(pb3, S_IFREG | 0777, -1) == -1)
+		atf_tc_fail_errno("create file");
+	if (rump_sys_stat(pb3, &ref) == -1)
+		atf_tc_fail_errno("stat of file");
+
+	/*
+	 * First try ops which should succeed.
+	 */
+
+	/* rename within directory */
+	md(pb3, mp, "dir3");
+	if (rump_sys_rename(pb1, pb3) == -1)
+		atf_tc_fail_errno("rename 1");
+	checkfile(pb3, &ref);
+
+	/* rename directory onto itself (two ways, should fail) */
+	md(pb1, mp, "dir3/.");
+	if (rump_sys_rename(pb1, pb3) != -1 || errno != EINVAL)
+		atf_tc_fail_errno("rename 2");
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (rump_sys_rename(pb3, pb1) != -1 || errno != EISDIR)
+		atf_tc_fail_errno("rename 3");
+
+	checkfile(pb3, &ref);
+
+	/* rename father of directory into directory */
+	md(pb1, mp, "dir2/dir");
+	md(pb2, mp, "dir2");
+	if (rump_sys_rename(pb2, pb1) != -1 || errno != EINVAL)
+		atf_tc_fail_errno("rename 4");
+
+	/* same for grandfather */
+	md(pb1, mp, "dir2/subdir/dir2");
+	if (rump_sys_rename(pb2, pb1) != -1 || errno != EINVAL)
+		atf_tc_fail("rename 5");
+
+	checkfile(pb3, &ref);
+
+	/* rename directory over a non-empty directory */
+	if (rump_sys_rename(pb2, pb3) != -1 || errno != ENOTEMPTY)
+		atf_tc_fail("rename 6");
+
+	/* cross-directory rename */
+	md(pb1, mp, "dir3");
+	md(pb2, mp, "dir2/somedir");
+	if (rump_sys_rename(pb1, pb2) == -1)
+		atf_tc_fail_errno("rename 7");
+	checkfile(pb2, &ref);
+
+	/* move to parent directory */
+	md(pb1, mp, "dir2/somedir/../../dir3");
+	if (rump_sys_rename(pb2, pb1) == -1)
+		atf_tc_fail_errno("rename 8");
+	md(pb1, mp, "dir2/../dir3");
+	checkfile(pb1, &ref);
+
+	/* atomic cross-directory rename */
+	md(pb3, mp, "dir2/subdir");
+	if (rump_sys_rename(pb1, pb3) == -1)
+		atf_tc_fail_errno("rename 9");
+	checkfile(pb3, &ref);
+
+	/* rename directory over an empty directory */
+	md(pb1, mp, "parent");
+	md(pb2, mp, "parent/dir1");
+	md(pb3, mp, "parent/dir2");
+	RL(rump_sys_mkdir(pb1, 0777));
+	RL(rump_sys_mkdir(pb2, 0777));
+	RL(rump_sys_mkdir(pb3, 0777));
+	RL(rump_sys_rename(pb2, pb3));
+
+	RL(rump_sys_stat(pb1, &sb));
+	if (! FSTYPE_MSDOS(tc))
+		ATF_CHECK_EQ(sb.st_nlink, 3);
+	RL(rump_sys_rmdir(pb3));
+	RL(rump_sys_rmdir(pb1));
+}
+
+static void
+rename_dotdot(const atf_tc_t *tc, const char *mp)
+{
+
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+
+	USES_DIRS;
+
+	if (rump_sys_chdir(mp) == -1)
+		atf_tc_fail_errno("chdir mountpoint");
+
+	if (rump_sys_mkdir("dir1", 0777) == -1)
+		atf_tc_fail_errno("mkdir 1");
+	if (rump_sys_mkdir("dir2", 0777) == -1)
+		atf_tc_fail_errno("mkdir 2");
+
+	if (rump_sys_rename("dir1", "dir1/..") != -1 || errno != EINVAL)
+		atf_tc_fail_errno("self-dotdot to");
+
+	if (rump_sys_rename("dir1/..", "sometarget") != -1 || errno != EINVAL)
+		atf_tc_fail_errno("self-dotdot from");
+
+	if (rump_sys_rename("dir1", "dir2/..") != -1 || errno != EINVAL)
+		atf_tc_fail("other-dotdot");
+
+	rump_sys_chdir("/");
+}
+
+static void
+rename_reg_nodir(const atf_tc_t *tc, const char *mp)
+{
+	bool haslinks;
+	struct stat sb;
+	ino_t f1ino;
+
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+
+	if (rump_sys_chdir(mp) == -1)
+		atf_tc_fail_errno("chdir mountpoint");
+
+	if (FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))
+		haslinks = false;
+	else
+		haslinks = true;
+
+	if (rump_sys_mknod("file1", S_IFREG | 0777, -1) == -1)
+		atf_tc_fail_errno("create file");
+	if (rump_sys_mknod("file2", S_IFREG | 0777, -1) == -1)
+		atf_tc_fail_errno("create file");
+
+	if (rump_sys_stat("file1", &sb) == -1)
+		atf_tc_fail_errno("stat");
+	f1ino = sb.st_ino;
+
+	if (haslinks) {
+		if (rump_sys_link("file1", "file_link") == -1)
+			atf_tc_fail_errno("link");
+		if (rump_sys_stat("file_link", &sb) == -1)
+			atf_tc_fail_errno("stat");
+		ATF_REQUIRE_EQ(sb.st_ino, f1ino);
+		ATF_REQUIRE_EQ(sb.st_nlink, 2);
+	}
+
+	if (rump_sys_stat("file2", &sb) == -1)
+		atf_tc_fail_errno("stat");
+
+	if (rump_sys_rename("file1", "file3") == -1)
+		atf_tc_fail_errno("rename 1");
+	if (rump_sys_stat("file3", &sb) == -1)
+		atf_tc_fail_errno("stat 1");
+	if (haslinks) {
+		ATF_REQUIRE_EQ(sb.st_ino, f1ino);
+	}
+	if (rump_sys_stat("file1", &sb) != -1 || errno != ENOENT)
+		atf_tc_fail_errno("source 1");
+
+	if (rump_sys_rename("file3", "file2") == -1)
+		atf_tc_fail_errno("rename 2");
+	if (rump_sys_stat("file2", &sb) == -1)
+		atf_tc_fail_errno("stat 2");
+	if (haslinks) {
+		ATF_REQUIRE_EQ(sb.st_ino, f1ino);
+	}
+
+	if (rump_sys_stat("file3", &sb) != -1 || errno != ENOENT)
+		atf_tc_fail_errno("source 2");
+
+	if (haslinks) {
+		if (rump_sys_rename("file2", "file_link") == -1)
+			atf_tc_fail_errno("rename hardlink");
+		if (rump_sys_stat("file2", &sb) != -1 || errno != ENOENT)
+			atf_tc_fail_errno("source 3");
+		if (rump_sys_stat("file_link", &sb) == -1)
+			atf_tc_fail_errno("stat 2");
+		ATF_REQUIRE_EQ(sb.st_ino, f1ino);
+		ATF_REQUIRE_EQ(sb.st_nlink, 1);
+	}
+
+	ATF_CHECK_ERRNO(EFAULT, rump_sys_rename("file2", NULL) == -1);
+	ATF_CHECK_ERRNO(EFAULT, rump_sys_rename(NULL, "file2") == -1);
+
+	rump_sys_chdir("/");
+}
+
+static void
+create_nametoolong(const atf_tc_t *tc, const char *mp)
+{
+	char *name;
+	int fd;
+	long val;
+	size_t len;
+
+	if (rump_sys_chdir(mp) == -1)
+		atf_tc_fail_errno("chdir mountpoint");
+
+	val = rump_sys_pathconf(".", _PC_NAME_MAX);
+	if (val == -1)
+		atf_tc_fail_errno("pathconf");
+
+	len = val + 1;
+	name = malloc(len+1);
+	if (name == NULL)
+		atf_tc_fail_errno("malloc");
+
+	memset(name, 'a', len);
+	*(name+len) = '\0';
+
+	val = rump_sys_pathconf(".", _PC_NO_TRUNC);
+	if (val == -1)
+		atf_tc_fail_errno("pathconf");
+
+	fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666);
+	if (val != 0 && (fd != -1 || errno != ENAMETOOLONG))
+		atf_tc_fail_errno("open");
+
+	if (val == 0 && rump_sys_close(fd) == -1)
+		atf_tc_fail_errno("close");
+	if (val == 0 && rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno("unlink");
+
+	free(name);
+
+	rump_sys_chdir("/");
+}
+
+static void
+create_exist(const atf_tc_t *tc, const char *mp)
+{
+	const char *name = "hoge";
+	int fd;
+
+	RL(rump_sys_chdir(mp));
+	RL(fd = rump_sys_open(name, O_RDWR|O_CREAT|O_EXCL, 0666));
+	RL(rump_sys_close(fd));
+	RL(rump_sys_unlink(name));
+	RL(fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666));
+	RL(rump_sys_close(fd));
+	RL(fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666));
+	RL(rump_sys_close(fd));
+	ATF_REQUIRE_ERRNO(EEXIST,
+	    (fd = rump_sys_open(name, O_RDWR|O_CREAT|O_EXCL, 0666)));
+	RL(rump_sys_unlink(name));
+	RL(rump_sys_chdir("/"));
+}
+
+static void
+rename_nametoolong(const atf_tc_t *tc, const char *mp)
+{
+	char *name;
+	int res, fd;
+	long val;
+	size_t len;
+
+	if (FSTYPE_RUMPFS(tc))
+		atf_tc_skip("rename not supported by file system");
+
+	if (rump_sys_chdir(mp) == -1)
+		atf_tc_fail_errno("chdir mountpoint");
+
+	val = rump_sys_pathconf(".", _PC_NAME_MAX);
+	if (val == -1)
+		atf_tc_fail_errno("pathconf");
+
+	len = val + 1;
+	name = malloc(len+1);
+	if (name == NULL)
+		atf_tc_fail_errno("malloc");
+
+	memset(name, 'a', len);
+	*(name+len) = '\0';
+
+	fd = rump_sys_open("dummy", O_RDWR|O_CREAT, 0666);
+	if (fd == -1)
+		atf_tc_fail_errno("open");
+	if (rump_sys_close(fd) == -1)
+		atf_tc_fail_errno("close");
+
+	val = rump_sys_pathconf(".", _PC_NO_TRUNC);
+	if (val == -1)
+		atf_tc_fail_errno("pathconf");
+
+	res = rump_sys_rename("dummy", name);
+	if (val != 0 && (res != -1 || errno != ENAMETOOLONG))
+		atf_tc_fail_errno("rename");
+
+	if (val == 0 && rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno("unlink");
+
+	free(name);
+
+	rump_sys_chdir("/");
+}
+
+/*
+ * Test creating a symlink whose length is "len" bytes, not including
+ * the terminating NUL.
+ */
+static void
+symlink_len(const atf_tc_t *tc, const char *mp, size_t len)
+{
+	char *buf;
+	int r;
+
+	USES_SYMLINKS;
+
+	RL(rump_sys_chdir(mp));
+
+	buf = malloc(len + 1);
+	ATF_REQUIRE(buf);
+	memset(buf, 'a', len);
+	buf[len] = '\0';
+	r = rump_sys_symlink(buf, "afile");
+	if (r == -1) {
+		ATF_REQUIRE_ERRNO(ENAMETOOLONG, r);
+	} else {
+		RL(rump_sys_unlink("afile"));
+	}
+	free(buf);
+
+	RL(rump_sys_chdir("/"));
+}
+
+static void
+symlink_zerolen(const atf_tc_t *tc, const char *mp)
+{
+	symlink_len(tc, mp, 0);
+}
+
+static void
+symlink_long(const atf_tc_t *tc, const char *mp)
+{
+	/*
+	 * Test lengths close to powers of two, as those are likely
+	 * to be edge cases.
+	 */
+	size_t len;
+	int fuzz;
+	for (len = 2; len <= 65536; len *= 2) {
+		for (fuzz = -1; fuzz <= 1; fuzz++) {
+			symlink_len(tc, mp, len + fuzz);
+		}
+	}
+}
+
+static void
+symlink_root(const atf_tc_t *tc, const char *mp)
+{
+
+	USES_SYMLINKS;
+
+	RL(rump_sys_chdir(mp));
+	RL(rump_sys_symlink("/", "foo"));
+	RL(rump_sys_chdir("foo"));
+}
+
+static void
+attrs(const atf_tc_t *tc, const char *mp)
+{
+	struct stat sb, sb2;
+	struct timeval tv[2];
+	int fd;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open(TESTFILE, O_RDWR | O_CREAT, 0755));
+	RL(rump_sys_close(fd));
+	RL(rump_sys_stat(TESTFILE, &sb));
+	if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
+		RL(rump_sys_chown(TESTFILE, 1, 2));
+		sb.st_uid = 1;
+		sb.st_gid = 2;
+		RL(rump_sys_chmod(TESTFILE, 0123));
+		sb.st_mode = (sb.st_mode & ~ACCESSPERMS) | 0123;
+	}
+
+	tv[0].tv_sec = 1000000000; /* need something >1980 for msdosfs */
+	tv[0].tv_usec = 1;
+	tv[1].tv_sec = 1000000002; /* need even seconds for msdosfs */
+	tv[1].tv_usec = 3;
+	RL(rump_sys_utimes(TESTFILE, tv));
+	RL(rump_sys_utimes(TESTFILE, tv)); /* XXX: utimes & birthtime */
+	sb.st_atimespec.tv_sec = 1000000000;
+	sb.st_atimespec.tv_nsec = 1000;
+	sb.st_mtimespec.tv_sec = 1000000002;
+	sb.st_mtimespec.tv_nsec = 3000;
+
+	RL(rump_sys_stat(TESTFILE, &sb2));
+#define CHECK(a) ATF_REQUIRE_EQ(sb.a, sb2.a)
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
+		CHECK(st_uid);
+		CHECK(st_gid);
+		CHECK(st_mode);
+	}
+	if (!FSTYPE_MSDOS(tc)) {
+		/* msdosfs has only access date, not time */
+		CHECK(st_atimespec.tv_sec);
+	}
+	CHECK(st_mtimespec.tv_sec);
+	if (!(FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc) ||
+	      FSTYPE_SYSVBFS(tc) || FSTYPE_V7FS(tc))) {
+		CHECK(st_atimespec.tv_nsec);
+		CHECK(st_mtimespec.tv_nsec);
+	}
+#undef  CHECK
+
+	FSTEST_EXIT();
+}
+
+static void
+fcntl_lock(const atf_tc_t *tc, const char *mp)
+{
+	int fd, fd2;
+	struct flock l;
+	struct lwp *lwp1, *lwp2;
+
+	FSTEST_ENTER();
+	l.l_pid = 0;
+	l.l_start = l.l_len = 1024;
+	l.l_type = F_RDLCK | F_WRLCK;
+	l.l_whence = SEEK_END;
+
+	lwp1 = rump_pub_lwproc_curlwp();
+	RL(fd = rump_sys_open(TESTFILE, O_RDWR | O_CREAT, 0755));
+	RL(rump_sys_ftruncate(fd, 8192));
+
+	/* PR kern/43321 */
+	if (FSTYPE_ZFS(tc))
+		atf_tc_expect_fail("PR kern/47656: Test known to be broken");
+	RL(rump_sys_fcntl(fd, F_SETLK, &l));
+
+	/* Next, we fork and try to lock the same area */
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	lwp2 = rump_pub_lwproc_curlwp();
+	RL(fd2 = rump_sys_open(TESTFILE, O_RDWR, 0));
+	ATF_REQUIRE_ERRNO(EAGAIN, rump_sys_fcntl(fd2, F_SETLK, &l));
+
+	/* Switch back and unlock... */
+	rump_pub_lwproc_switch(lwp1);
+	l.l_type = F_UNLCK;
+	RL(rump_sys_fcntl(fd, F_SETLK, &l));
+
+	/* ... and try to lock again */
+	rump_pub_lwproc_switch(lwp2);
+	l.l_type = F_RDLCK | F_WRLCK;
+	RL(rump_sys_fcntl(fd2, F_SETLK, &l));
+
+	RL(rump_sys_close(fd2));
+	rump_pub_lwproc_releaselwp();
+
+	RL(rump_sys_close(fd));
+
+	FSTEST_EXIT();
+}
+
+static int
+flock_compare(const void *p, const void *q)
+{
+	int a = ((const struct flock *)p)->l_start;
+	int b = ((const struct flock *)q)->l_start;
+	return a < b ? -1 : (a > b ? 1 : 0);
+}
+
+/*
+ * Find all locks set by fcntl_getlock_pids test
+ * using GETLK for a range [start, start+end], and,
+ * if there is a blocking lock, recursively find
+ * all locks to the left (toward the beginning of
+ * a file) and to the right of the lock.
+ * The function also understands "until end of file"
+ * convention when len==0.
+ */
+static unsigned int
+fcntl_getlocks(int fildes, off_t start, off_t len,
+    struct flock *lock, struct flock *end)
+{
+	unsigned int rv = 0;
+	const struct flock l = { start, len, 0, F_RDLCK, SEEK_SET };
+
+	if (lock == end)
+		return rv;
+
+	RL(rump_sys_fcntl(fildes, F_GETLK, &l));
+
+	if (l.l_type == F_UNLCK)
+		return rv;
+
+	*lock++ = l;
+	rv += 1;
+
+	ATF_REQUIRE(l.l_whence == SEEK_SET);
+
+	if (l.l_start > start) {
+		unsigned int n =
+		    fcntl_getlocks(fildes, start, l.l_start - start, lock, end);
+		rv += n;
+		lock += n;
+		if (lock == end)
+			return rv;
+	}
+
+	if (l.l_len == 0) /* does l spans until the end? */
+		return rv;
+
+	if (len == 0) /* are we looking for locks until the end? */ {
+		rv += fcntl_getlocks(fildes, l.l_start + l.l_len, len, lock, end);
+	} else if (l.l_start + l.l_len < start + len) {
+		len -= l.l_start + l.l_len - start;
+		rv += fcntl_getlocks(fildes, l.l_start + l.l_len, len, lock, end);
+	}
+
+	return rv;
+}
+
+static void
+fcntl_getlock_pids(const atf_tc_t *tc, const char *mp)
+{
+	/* test non-overlaping ranges */
+	struct flock expect[4];
+	const struct flock lock[4] = {
+		{ 0, 2, 0, F_WRLCK, SEEK_SET },
+		{ 2, 1, 0, F_WRLCK, SEEK_SET },
+		{ 7, 5, 0, F_WRLCK, SEEK_SET },
+		{ 4, 3, 0, F_WRLCK, SEEK_SET },
+	};
+
+    /* Add extra element to make sure recursion does't stop at array end */
+	struct flock result[5];
+
+	/* Add 5th process */
+	int fd[5];
+	pid_t pid[5];
+	struct lwp *lwp[5];
+
+	unsigned int i, j;
+	const off_t sz = 8192;
+	int omode  = 0755;
+	int oflags = O_RDWR | O_CREAT;
+
+	memcpy(expect, lock, sizeof(lock));
+
+	FSTEST_ENTER();
+
+	/*
+	 * First, we create 4 processes and let each lock a range of the
+	 * file.  Note that the third and fourth processes lock in
+	 * "reverse" order, i.e. the greater pid locks a range before
+	 * the lesser pid.
+	 * Then, we create 5th process which doesn't lock anything.
+	 */
+	for (i = 0; i < __arraycount(lwp); i++) {
+		RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+
+		lwp[i] = rump_pub_lwproc_curlwp();
+		pid[i] = rump_sys_getpid();
+
+		RL(fd[i] = rump_sys_open(TESTFILE, oflags, omode));
+		oflags = O_RDWR;
+		omode  = 0;
+
+		RL(rump_sys_ftruncate(fd[i], sz));
+
+		if (FSTYPE_ZFS(tc))
+			atf_tc_expect_fail("PR kern/47656: Test known to be "
+			    "broken");
+		if (i < __arraycount(lock)) {
+			RL(rump_sys_fcntl(fd[i], F_SETLK, &lock[i]));
+			expect[i].l_pid = pid[i];
+		}
+	}
+
+	qsort(expect, __arraycount(expect), sizeof(expect[0]), &flock_compare);
+
+	/*
+	 * In the context of each process, recursively find all locks
+	 * that would block the current process. Processes 1-4 don't
+	 * see their own lock, we insert it to simplify checks.
+	 * Process 5 sees all 4 locks.
+	 */
+	for (i = 0; i < __arraycount(lwp); i++) {
+		unsigned int nlocks;
+
+		rump_pub_lwproc_switch(lwp[i]);
+
+		memset(result, 0, sizeof(result));
+		nlocks = fcntl_getlocks(fd[i], 0, sz,
+		    result, result + __arraycount(result));
+
+		if (i < __arraycount(lock)) {
+			ATF_REQUIRE(nlocks < __arraycount(result));
+			result[nlocks] = lock[i];
+			result[nlocks].l_pid = pid[i];
+			nlocks++;
+		}
+
+		ATF_CHECK_EQ(nlocks, __arraycount(expect));
+
+		qsort(result, nlocks, sizeof(result[0]), &flock_compare);
+
+		for (j = 0; j < nlocks; j++) {
+			ATF_CHECK_EQ(result[j].l_start,  expect[j].l_start );
+			ATF_CHECK_EQ(result[j].l_len,    expect[j].l_len   );
+			ATF_CHECK_EQ(result[j].l_pid,    expect[j].l_pid   );
+			ATF_CHECK_EQ(result[j].l_type,   expect[j].l_type  );
+			ATF_CHECK_EQ(result[j].l_whence, expect[j].l_whence);
+		}
+	}
+
+	/*
+	 * Release processes.  This also releases the fds and locks
+	 * making fs unmount possible
+	 */
+	for (i = 0; i < __arraycount(lwp); i++) {
+		rump_pub_lwproc_switch(lwp[i]);
+		rump_pub_lwproc_releaselwp();
+	}
+
+	FSTEST_EXIT();
+}
+
+static void
+access_simple(const atf_tc_t *tc, const char *mp)
+{
+	int fd;
+	int tmode;
+
+	FSTEST_ENTER();
+	RL(fd = rump_sys_open("tfile", O_CREAT | O_RDWR, 0777));
+	RL(rump_sys_close(fd));
+
+#define ALLACC (F_OK | X_OK | W_OK | R_OK)
+	if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc))
+		tmode = F_OK;
+	else
+		tmode = ALLACC;
+
+	RL(rump_sys_access("tfile", tmode));
+
+	/* PR kern/44648 */
+	ATF_REQUIRE_ERRNO(EINVAL, rump_sys_access("tfile", ALLACC+1) == -1);
+#undef ALLACC
+	FSTEST_EXIT();
+}
+
+static void
+read_directory(const atf_tc_t *tc, const char *mp)
+{
+	char buf[1024];
+	int fd, res;
+	ssize_t size;
+
+	FSTEST_ENTER();
+	fd = rump_sys_open(".", O_DIRECTORY | O_RDONLY, 0777);
+	ATF_REQUIRE(fd != -1);
+
+	size = rump_sys_pread(fd, buf, sizeof(buf), 0);
+	ATF_CHECK(size != -1 || errno == EISDIR);
+	size = rump_sys_read(fd, buf, sizeof(buf));
+	ATF_CHECK(size != -1 || errno == EISDIR);
+
+	res = rump_sys_close(fd);
+	ATF_REQUIRE(res != -1);
+	FSTEST_EXIT();
+}
+
+static void
+lstat_symlink(const atf_tc_t *tc, const char *mp)
+{
+	const char *src, *dst;
+	int res;
+	struct stat st;
+
+	USES_SYMLINKS;
+
+	if (FSTYPE_V7FS(tc))
+		atf_tc_expect_fail("PR kern/48864");
+
+	FSTEST_ENTER();
+
+	src = "source";
+	dst = "destination";
+
+	res = rump_sys_symlink(src, dst);
+	ATF_REQUIRE(res != -1);
+	res = rump_sys_lstat(dst, &st);
+	ATF_REQUIRE(res != -1);
+
+	ATF_CHECK(S_ISLNK(st.st_mode) != 0);
+	ATF_CHECK(st.st_size == (off_t)strlen(src));
+
+	FSTEST_EXIT();
+}
+
+ATF_TC_FSAPPLY(lookup_simple, "simple lookup (./.. on root)");
+ATF_TC_FSAPPLY(lookup_complex, "lookup of non-dot entries");
+ATF_TC_FSAPPLY(dir_simple, "mkdir/rmdir");
+ATF_TC_FSAPPLY(dir_notempty, "non-empty directories cannot be removed");
+ATF_TC_FSAPPLY(dir_rmdirdotdot, "remove .. and try to cd out (PR kern/44657)");
+ATF_TC_FSAPPLY(rename_dir, "exercise various directory renaming ops "
+"(PR kern/44288)");
+ATF_TC_FSAPPLY(rename_dotdot, "rename dir .. (PR kern/43617)");
+ATF_TC_FSAPPLY(rename_reg_nodir, "rename regular files, no subdirectories");
+ATF_TC_FSAPPLY(create_nametoolong, "create file with name too long");
+ATF_TC_FSAPPLY(create_exist, "create with O_EXCL");
+ATF_TC_FSAPPLY(rename_nametoolong, "rename to file with name too long");
+ATF_TC_FSAPPLY(symlink_zerolen, "symlink with target of length 0");
+ATF_TC_FSAPPLY(symlink_long, "symlink with target of length > 0");
+ATF_TC_FSAPPLY(symlink_root, "symlink to root directory");
+ATF_TC_FSAPPLY(attrs, "check setting attributes works");
+ATF_TC_FSAPPLY(fcntl_lock, "check fcntl F_SETLK");
+ATF_TC_FSAPPLY(fcntl_getlock_pids,"fcntl F_GETLK w/ many procs, PR kern/44494");
+ATF_TC_FSAPPLY(access_simple, "access(2)");
+ATF_TC_FSAPPLY(read_directory, "read(2) on directories");
+ATF_TC_FSAPPLY(lstat_symlink, "lstat(2) values for symbolic links");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_FSAPPLY(lookup_simple);
+	ATF_TP_FSAPPLY(lookup_complex);
+	ATF_TP_FSAPPLY(dir_simple);
+	ATF_TP_FSAPPLY(dir_notempty);
+	ATF_TP_FSAPPLY(dir_rmdirdotdot);
+	ATF_TP_FSAPPLY(rename_dir);
+	ATF_TP_FSAPPLY(rename_dotdot);
+	ATF_TP_FSAPPLY(rename_reg_nodir);
+	ATF_TP_FSAPPLY(create_nametoolong);
+	ATF_TP_FSAPPLY(create_exist);
+	ATF_TP_FSAPPLY(rename_nametoolong);
+	ATF_TP_FSAPPLY(symlink_zerolen);
+	ATF_TP_FSAPPLY(symlink_long);
+	ATF_TP_FSAPPLY(symlink_root);
+	ATF_TP_FSAPPLY(attrs);
+	ATF_TP_FSAPPLY(fcntl_lock);
+	ATF_TP_FSAPPLY(fcntl_getlock_pids);
+	ATF_TP_FSAPPLY(access_simple);
+	ATF_TP_FSAPPLY(read_directory);
+	ATF_TP_FSAPPLY(lstat_symlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/fs/zfs/t_zpool.sh b/contrib/netbsd-tests/fs/zfs/t_zpool.sh
new file mode 100755
index 000000000000..e3c2380da343
--- /dev/null
+++ b/contrib/netbsd-tests/fs/zfs/t_zpool.sh
@@ -0,0 +1,66 @@
+#	$NetBSD: t_zpool.sh,v 1.3 2011/12/06 18:18:59 njoly Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m'
+
+export RUMP_SERVER=unix://zsuck
+
+atf_test_case create cleanup
+create_head()
+{
+	atf_set "descr" "basic zpool create"
+}
+
+IFS=' '
+exmount='rumpfs on / type rumpfs (local)
+jippo on /jippo type zfs (local)
+'
+
+create_body()
+{
+
+	atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo
+	atf_check -s exit:0 zpool create jippo /dk
+
+	export RUMPHIJACK=vfs=all
+	atf_check -s exit:0 -o inline:"${exmount}" mount
+}
+
+create_cleanup()
+{
+
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case create
+}
diff --git a/contrib/netbsd-tests/games/t_factor.sh b/contrib/netbsd-tests/games/t_factor.sh
new file mode 100755
index 000000000000..e2320a21e05e
--- /dev/null
+++ b/contrib/netbsd-tests/games/t_factor.sh
@@ -0,0 +1,58 @@
+# $NetBSD: t_factor.sh,v 1.7 2010/11/19 12:31:36 pgoyette Exp $
+#
+# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+expect() {
+	echo "${2}" >expout
+	atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+}
+
+atf_test_case overflow
+overflow_head() {
+	atf_set "descr" "Tests for overflow conditions"
+	atf_set "require.progs" "/usr/games/factor"
+}
+overflow_body() {
+	expect '8675309' '8675309: 8675309'
+	expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
+}
+
+atf_test_case loop
+loop_head() {
+	atf_set "descr" "Tests some cases that once locked the program" \
+	                "in an infinite loop"
+	atf_set "require.progs" "/usr/games/factor"
+}
+loop_body() {
+	expect '99999999999991' '99999999999991: 7 13 769231 1428571'
+	expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case overflow
+	atf_add_test_case loop
+}
diff --git a/contrib/netbsd-tests/h_macros.h b/contrib/netbsd-tests/h_macros.h
new file mode 100644
index 000000000000..5dd56de78f7d
--- /dev/null
+++ b/contrib/netbsd-tests/h_macros.h
@@ -0,0 +1,85 @@
+/* $NetBSD: h_macros.h,v 1.9 2013/05/17 15:42:09 christos Exp $ */
+
+/*-
+ * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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 SRC_TESTS_H_MACROS_H_
+#define SRC_TESTS_H_MACROS_H_
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_LIBC(x, v) \
+	ATF_REQUIRE_MSG((x) != (v), "%s: %s", #x, strerror(errno))
+
+#define CHECK_LIBC(x, v) \
+	ATF_CHECK_MSG((x) != (v), "%s: %s", #x, strerror(errno))
+
+#define RL(x) REQUIRE_LIBC(x, -1)
+#define RZ(x)								\
+do {									\
+	int RZ_rv = x;							\
+	ATF_REQUIRE_MSG(RZ_rv == 0, "%s: %s", #x, strerror(RZ_rv));	\
+} while (/*CONSTCOND*/0)
+
+static __inline __printflike(1, 2) void
+atf_tc_fail_errno(const char *fmt, ...)
+{
+	va_list ap;
+	char buf[1024];
+	int sverrno = errno;
+
+	va_start(ap, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
+
+	strlcat(buf, ": ", sizeof(buf));
+	strlcat(buf, strerror(sverrno), sizeof(buf));
+
+	atf_tc_fail("%s", buf);
+}
+
+static __inline void
+tests_makegarbage(void *space, size_t len)
+{
+	uint16_t *sb = space;
+	uint16_t randval;
+
+	while (len >= sizeof(randval)) {
+		*sb++ = (random() & 0xffff);
+		len -= sizeof(*sb);
+	}
+	randval = (uint16_t)random();
+	memcpy(sb, &randval, len);
+}
+
+#endif
diff --git a/contrib/netbsd-tests/include/d_bitstring_27.out b/contrib/netbsd-tests/include/d_bitstring_27.out
new file mode 100644
index 000000000000..55ba39e774d9
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_27.out
@@ -0,0 +1,263 @@
+Testing with TEST_LENGTH = 27
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+  8              1              1              1
+  9              1              2              2
+ 10              1              4              2
+ 11              1              8              2
+ 12              1             16              2
+ 13              1             32              2
+ 14              1             64              2
+ 15              1            128              2
+ 16              2              1              2
+ 17              2              2              3
+ 18              2              4              3
+ 19              2              8              3
+ 20              2             16              3
+ 21              2             32              3
+ 22              2             64              3
+ 23              2            128              3
+ 24              3              1              3
+ 25              3              2              4
+ 26              3              4              4
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 000000000000000000000000000
+is:   0  -1 000000000000000000000000000
+
+test bit_set
+be:   1   0 100100100100100100100100100
+is:   1   0 100100100100100100100100100
+
+test bit_clear
+be:   0   3 000100000100000100000100000
+is:   0   3 000100000100000100000100000
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+  8              0
+  9              2
+ 10              0
+ 11              0
+ 12              0
+ 13              0
+ 14              0
+ 15            128
+ 16              0
+ 17              0
+ 18              0
+ 19              0
+ 20              0
+ 21             32
+ 22              0
+ 23              0
+ 24              0
+ 25              0
+ 26              0
+
+test clearbits
+be:   0  -1 000000000000000000000000000
+is:   0  -1 000000000000000000000000000
+
+test bit_nset and bit_nclear
+be:   0   1 011111111111111111111111110
+is:   0   1 011111111111111111111111110
+be:   0   1 010000000000000000000000010
+is:   0   1 010000000000000000000000010
+be:   0  -1 000000000000000000000000000
+is:   0  -1 000000000000000000000000000
+be:  26   0 111111111111111111111111110
+is:  26   0 111111111111111111111111110
+be:   0  -1 000000000000000000000000000
+is:   0  -1 000000000000000000000000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 111111111111111111111111111
+  1   0   1 011111111111111111111111111
+  2   0   2 001111111111111111111111111
+  3   0   3 000111111111111111111111111
+  4   0   4 000011111111111111111111111
+  5   0   5 000001111111111111111111111
+  6   0   6 000000111111111111111111111
+  7   0   7 000000011111111111111111111
+  8   0   8 000000001111111111111111111
+  9   0   9 000000000111111111111111111
+ 10   0  10 000000000011111111111111111
+ 11   0  11 000000000001111111111111111
+ 12   0  12 000000000000111111111111111
+ 13   0  13 000000000000011111111111111
+ 14   0  14 000000000000001111111111111
+ 15   0  15 000000000000000111111111111
+ 16   0  16 000000000000000011111111111
+ 17   0  17 000000000000000001111111111
+ 18   0  18 000000000000000000111111111
+ 19   0  19 000000000000000000011111111
+ 20   0  20 000000000000000000001111111
+ 21   0  21 000000000000000000000111111
+ 22   0  22 000000000000000000000011111
+ 23   0  23 000000000000000000000001111
+ 24   0  24 000000000000000000000000111
+ 25   0  25 000000000000000000000000011
+ 26   0  26 000000000000000000000000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 000000000000000000000000000
+  1   1   0 100000000000000000000000000
+  2   2   0 110000000000000000000000000
+  3   3   0 111000000000000000000000000
+  4   4   0 111100000000000000000000000
+  5   5   0 111110000000000000000000000
+  6   6   0 111111000000000000000000000
+  7   7   0 111111100000000000000000000
+  8   8   0 111111110000000000000000000
+  9   9   0 111111111000000000000000000
+ 10  10   0 111111111100000000000000000
+ 11  11   0 111111111110000000000000000
+ 12  12   0 111111111111000000000000000
+ 13  13   0 111111111111100000000000000
+ 14  14   0 111111111111110000000000000
+ 15  15   0 111111111111111000000000000
+ 16  16   0 111111111111111100000000000
+ 17  17   0 111111111111111110000000000
+ 18  18   0 111111111111111111000000000
+ 19  19   0 111111111111111111100000000
+ 20  20   0 111111111111111111110000000
+ 21  21   0 111111111111111111111000000
+ 22  22   0 111111111111111111111100000
+ 23  23   0 111111111111111111111110000
+ 24  24   0 111111111111111111111111000
+ 25  25   0 111111111111111111111111100
+ 26  26   0 111111111111111111111111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 111111111111111111111111111
+  1  26   0 111111111111111111111111110
+  2  25   0 111111111111111111111111100
+  3  24   0 111111111111111111111111000
+  4  23   0 111111111111111111111110000
+  5  22   0 111111111111111111111100000
+  6  21   0 111111111111111111111000000
+  7  20   0 111111111111111111110000000
+  8  19   0 111111111111111111100000000
+  9  18   0 111111111111111111000000000
+ 10  17   0 111111111111111110000000000
+ 11  16   0 111111111111111100000000000
+ 12  15   0 111111111111111000000000000
+ 13  14   0 111111111111110000000000000
+ 14  13   0 111111111111100000000000000
+ 15  12   0 111111111111000000000000000
+ 16  11   0 111111111110000000000000000
+ 17  10   0 111111111100000000000000000
+ 18   9   0 111111111000000000000000000
+ 19   8   0 111111110000000000000000000
+ 20   7   0 111111100000000000000000000
+ 21   6   0 111111000000000000000000000
+ 22   5   0 111110000000000000000000000
+ 23   4   0 111100000000000000000000000
+ 24   3   0 111000000000000000000000000
+ 25   2   0 110000000000000000000000000
+ 26   1   0 100000000000000000000000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 000000000000000000000000000
+  1   0  26 000000000000000000000000001
+  2   0  25 000000000000000000000000011
+  3   0  24 000000000000000000000000111
+  4   0  23 000000000000000000000001111
+  5   0  22 000000000000000000000011111
+  6   0  21 000000000000000000000111111
+  7   0  20 000000000000000000001111111
+  8   0  19 000000000000000000011111111
+  9   0  18 000000000000000000111111111
+ 10   0  17 000000000000000001111111111
+ 11   0  16 000000000000000011111111111
+ 12   0  15 000000000000000111111111111
+ 13   0  14 000000000000001111111111111
+ 14   0  13 000000000000011111111111111
+ 15   0  12 000000000000111111111111111
+ 16   0  11 000000000001111111111111111
+ 17   0  10 000000000011111111111111111
+ 18   0   9 000000000111111111111111111
+ 19   0   8 000000001111111111111111111
+ 20   0   7 000000011111111111111111111
+ 21   0   6 000000111111111111111111111
+ 22   0   5 000001111111111111111111111
+ 23   0   4 000011111111111111111111111
+ 24   0   3 000111111111111111111111111
+ 25   0   2 001111111111111111111111111
+ 26   0   1 011111111111111111111111111
+
+0 bit should move right 1 position each line
+  0   0   1 011111111111111111111111111
+  1   1   0 101111111111111111111111111
+  2   2   0 110111111111111111111111111
+  3   3   0 111011111111111111111111111
+  4   4   0 111101111111111111111111111
+  5   5   0 111110111111111111111111111
+  6   6   0 111111011111111111111111111
+  7   7   0 111111101111111111111111111
+  8   8   0 111111110111111111111111111
+  9   9   0 111111111011111111111111111
+ 10  10   0 111111111101111111111111111
+ 11  11   0 111111111110111111111111111
+ 12  12   0 111111111111011111111111111
+ 13  13   0 111111111111101111111111111
+ 14  14   0 111111111111110111111111111
+ 15  15   0 111111111111111011111111111
+ 16  16   0 111111111111111101111111111
+ 17  17   0 111111111111111110111111111
+ 18  18   0 111111111111111111011111111
+ 19  19   0 111111111111111111101111111
+ 20  20   0 111111111111111111110111111
+ 21  21   0 111111111111111111111011111
+ 22  22   0 111111111111111111111101111
+ 23  23   0 111111111111111111111110111
+ 24  24   0 111111111111111111111111011
+ 25  25   0 111111111111111111111111101
+ 26  26   0 111111111111111111111111110
+
+1 bit should move right 1 position each line
+  0   1   0 100000000000000000000000000
+  1   0   1 010000000000000000000000000
+  2   0   2 001000000000000000000000000
+  3   0   3 000100000000000000000000000
+  4   0   4 000010000000000000000000000
+  5   0   5 000001000000000000000000000
+  6   0   6 000000100000000000000000000
+  7   0   7 000000010000000000000000000
+  8   0   8 000000001000000000000000000
+  9   0   9 000000000100000000000000000
+ 10   0  10 000000000010000000000000000
+ 11   0  11 000000000001000000000000000
+ 12   0  12 000000000000100000000000000
+ 13   0  13 000000000000010000000000000
+ 14   0  14 000000000000001000000000000
+ 15   0  15 000000000000000100000000000
+ 16   0  16 000000000000000010000000000
+ 17   0  17 000000000000000001000000000
+ 18   0  18 000000000000000000100000000
+ 19   0  19 000000000000000000010000000
+ 20   0  20 000000000000000000001000000
+ 21   0  21 000000000000000000000100000
+ 22   0  22 000000000000000000000010000
+ 23   0  23 000000000000000000000001000
+ 24   0  24 000000000000000000000000100
+ 25   0  25 000000000000000000000000010
+ 26   0  26 000000000000000000000000001
diff --git a/contrib/netbsd-tests/include/d_bitstring_32.out b/contrib/netbsd-tests/include/d_bitstring_32.out
new file mode 100644
index 000000000000..2e1ca55d6e32
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_32.out
@@ -0,0 +1,303 @@
+Testing with TEST_LENGTH = 32
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+  8              1              1              1
+  9              1              2              2
+ 10              1              4              2
+ 11              1              8              2
+ 12              1             16              2
+ 13              1             32              2
+ 14              1             64              2
+ 15              1            128              2
+ 16              2              1              2
+ 17              2              2              3
+ 18              2              4              3
+ 19              2              8              3
+ 20              2             16              3
+ 21              2             32              3
+ 22              2             64              3
+ 23              2            128              3
+ 24              3              1              3
+ 25              3              2              4
+ 26              3              4              4
+ 27              3              8              4
+ 28              3             16              4
+ 29              3             32              4
+ 30              3             64              4
+ 31              3            128              4
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 00000000000000000000000000000000
+is:   0  -1 00000000000000000000000000000000
+
+test bit_set
+be:   1   0 10010010010010010010010010010010
+is:   1   0 10010010010010010010010010010010
+
+test bit_clear
+be:   0   3 00010000010000010000010000010000
+is:   0   3 00010000010000010000010000010000
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+  8              0
+  9              2
+ 10              0
+ 11              0
+ 12              0
+ 13              0
+ 14              0
+ 15            128
+ 16              0
+ 17              0
+ 18              0
+ 19              0
+ 20              0
+ 21             32
+ 22              0
+ 23              0
+ 24              0
+ 25              0
+ 26              0
+ 27              8
+ 28              0
+ 29              0
+ 30              0
+ 31              0
+
+test clearbits
+be:   0  -1 00000000000000000000000000000000
+is:   0  -1 00000000000000000000000000000000
+
+test bit_nset and bit_nclear
+be:   0   1 01111111111111111111111111111110
+is:   0   1 01111111111111111111111111111110
+be:   0   1 01000000000000000000000000000010
+is:   0   1 01000000000000000000000000000010
+be:   0  -1 00000000000000000000000000000000
+is:   0  -1 00000000000000000000000000000000
+be:  31   0 11111111111111111111111111111110
+is:  31   0 11111111111111111111111111111110
+be:   0  -1 00000000000000000000000000000000
+is:   0  -1 00000000000000000000000000000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 11111111111111111111111111111111
+  1   0   1 01111111111111111111111111111111
+  2   0   2 00111111111111111111111111111111
+  3   0   3 00011111111111111111111111111111
+  4   0   4 00001111111111111111111111111111
+  5   0   5 00000111111111111111111111111111
+  6   0   6 00000011111111111111111111111111
+  7   0   7 00000001111111111111111111111111
+  8   0   8 00000000111111111111111111111111
+  9   0   9 00000000011111111111111111111111
+ 10   0  10 00000000001111111111111111111111
+ 11   0  11 00000000000111111111111111111111
+ 12   0  12 00000000000011111111111111111111
+ 13   0  13 00000000000001111111111111111111
+ 14   0  14 00000000000000111111111111111111
+ 15   0  15 00000000000000011111111111111111
+ 16   0  16 00000000000000001111111111111111
+ 17   0  17 00000000000000000111111111111111
+ 18   0  18 00000000000000000011111111111111
+ 19   0  19 00000000000000000001111111111111
+ 20   0  20 00000000000000000000111111111111
+ 21   0  21 00000000000000000000011111111111
+ 22   0  22 00000000000000000000001111111111
+ 23   0  23 00000000000000000000000111111111
+ 24   0  24 00000000000000000000000011111111
+ 25   0  25 00000000000000000000000001111111
+ 26   0  26 00000000000000000000000000111111
+ 27   0  27 00000000000000000000000000011111
+ 28   0  28 00000000000000000000000000001111
+ 29   0  29 00000000000000000000000000000111
+ 30   0  30 00000000000000000000000000000011
+ 31   0  31 00000000000000000000000000000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 00000000000000000000000000000000
+  1   1   0 10000000000000000000000000000000
+  2   2   0 11000000000000000000000000000000
+  3   3   0 11100000000000000000000000000000
+  4   4   0 11110000000000000000000000000000
+  5   5   0 11111000000000000000000000000000
+  6   6   0 11111100000000000000000000000000
+  7   7   0 11111110000000000000000000000000
+  8   8   0 11111111000000000000000000000000
+  9   9   0 11111111100000000000000000000000
+ 10  10   0 11111111110000000000000000000000
+ 11  11   0 11111111111000000000000000000000
+ 12  12   0 11111111111100000000000000000000
+ 13  13   0 11111111111110000000000000000000
+ 14  14   0 11111111111111000000000000000000
+ 15  15   0 11111111111111100000000000000000
+ 16  16   0 11111111111111110000000000000000
+ 17  17   0 11111111111111111000000000000000
+ 18  18   0 11111111111111111100000000000000
+ 19  19   0 11111111111111111110000000000000
+ 20  20   0 11111111111111111111000000000000
+ 21  21   0 11111111111111111111100000000000
+ 22  22   0 11111111111111111111110000000000
+ 23  23   0 11111111111111111111111000000000
+ 24  24   0 11111111111111111111111100000000
+ 25  25   0 11111111111111111111111110000000
+ 26  26   0 11111111111111111111111111000000
+ 27  27   0 11111111111111111111111111100000
+ 28  28   0 11111111111111111111111111110000
+ 29  29   0 11111111111111111111111111111000
+ 30  30   0 11111111111111111111111111111100
+ 31  31   0 11111111111111111111111111111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 11111111111111111111111111111111
+  1  31   0 11111111111111111111111111111110
+  2  30   0 11111111111111111111111111111100
+  3  29   0 11111111111111111111111111111000
+  4  28   0 11111111111111111111111111110000
+  5  27   0 11111111111111111111111111100000
+  6  26   0 11111111111111111111111111000000
+  7  25   0 11111111111111111111111110000000
+  8  24   0 11111111111111111111111100000000
+  9  23   0 11111111111111111111111000000000
+ 10  22   0 11111111111111111111110000000000
+ 11  21   0 11111111111111111111100000000000
+ 12  20   0 11111111111111111111000000000000
+ 13  19   0 11111111111111111110000000000000
+ 14  18   0 11111111111111111100000000000000
+ 15  17   0 11111111111111111000000000000000
+ 16  16   0 11111111111111110000000000000000
+ 17  15   0 11111111111111100000000000000000
+ 18  14   0 11111111111111000000000000000000
+ 19  13   0 11111111111110000000000000000000
+ 20  12   0 11111111111100000000000000000000
+ 21  11   0 11111111111000000000000000000000
+ 22  10   0 11111111110000000000000000000000
+ 23   9   0 11111111100000000000000000000000
+ 24   8   0 11111111000000000000000000000000
+ 25   7   0 11111110000000000000000000000000
+ 26   6   0 11111100000000000000000000000000
+ 27   5   0 11111000000000000000000000000000
+ 28   4   0 11110000000000000000000000000000
+ 29   3   0 11100000000000000000000000000000
+ 30   2   0 11000000000000000000000000000000
+ 31   1   0 10000000000000000000000000000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 00000000000000000000000000000000
+  1   0  31 00000000000000000000000000000001
+  2   0  30 00000000000000000000000000000011
+  3   0  29 00000000000000000000000000000111
+  4   0  28 00000000000000000000000000001111
+  5   0  27 00000000000000000000000000011111
+  6   0  26 00000000000000000000000000111111
+  7   0  25 00000000000000000000000001111111
+  8   0  24 00000000000000000000000011111111
+  9   0  23 00000000000000000000000111111111
+ 10   0  22 00000000000000000000001111111111
+ 11   0  21 00000000000000000000011111111111
+ 12   0  20 00000000000000000000111111111111
+ 13   0  19 00000000000000000001111111111111
+ 14   0  18 00000000000000000011111111111111
+ 15   0  17 00000000000000000111111111111111
+ 16   0  16 00000000000000001111111111111111
+ 17   0  15 00000000000000011111111111111111
+ 18   0  14 00000000000000111111111111111111
+ 19   0  13 00000000000001111111111111111111
+ 20   0  12 00000000000011111111111111111111
+ 21   0  11 00000000000111111111111111111111
+ 22   0  10 00000000001111111111111111111111
+ 23   0   9 00000000011111111111111111111111
+ 24   0   8 00000000111111111111111111111111
+ 25   0   7 00000001111111111111111111111111
+ 26   0   6 00000011111111111111111111111111
+ 27   0   5 00000111111111111111111111111111
+ 28   0   4 00001111111111111111111111111111
+ 29   0   3 00011111111111111111111111111111
+ 30   0   2 00111111111111111111111111111111
+ 31   0   1 01111111111111111111111111111111
+
+0 bit should move right 1 position each line
+  0   0   1 01111111111111111111111111111111
+  1   1   0 10111111111111111111111111111111
+  2   2   0 11011111111111111111111111111111
+  3   3   0 11101111111111111111111111111111
+  4   4   0 11110111111111111111111111111111
+  5   5   0 11111011111111111111111111111111
+  6   6   0 11111101111111111111111111111111
+  7   7   0 11111110111111111111111111111111
+  8   8   0 11111111011111111111111111111111
+  9   9   0 11111111101111111111111111111111
+ 10  10   0 11111111110111111111111111111111
+ 11  11   0 11111111111011111111111111111111
+ 12  12   0 11111111111101111111111111111111
+ 13  13   0 11111111111110111111111111111111
+ 14  14   0 11111111111111011111111111111111
+ 15  15   0 11111111111111101111111111111111
+ 16  16   0 11111111111111110111111111111111
+ 17  17   0 11111111111111111011111111111111
+ 18  18   0 11111111111111111101111111111111
+ 19  19   0 11111111111111111110111111111111
+ 20  20   0 11111111111111111111011111111111
+ 21  21   0 11111111111111111111101111111111
+ 22  22   0 11111111111111111111110111111111
+ 23  23   0 11111111111111111111111011111111
+ 24  24   0 11111111111111111111111101111111
+ 25  25   0 11111111111111111111111110111111
+ 26  26   0 11111111111111111111111111011111
+ 27  27   0 11111111111111111111111111101111
+ 28  28   0 11111111111111111111111111110111
+ 29  29   0 11111111111111111111111111111011
+ 30  30   0 11111111111111111111111111111101
+ 31  31   0 11111111111111111111111111111110
+
+1 bit should move right 1 position each line
+  0   1   0 10000000000000000000000000000000
+  1   0   1 01000000000000000000000000000000
+  2   0   2 00100000000000000000000000000000
+  3   0   3 00010000000000000000000000000000
+  4   0   4 00001000000000000000000000000000
+  5   0   5 00000100000000000000000000000000
+  6   0   6 00000010000000000000000000000000
+  7   0   7 00000001000000000000000000000000
+  8   0   8 00000000100000000000000000000000
+  9   0   9 00000000010000000000000000000000
+ 10   0  10 00000000001000000000000000000000
+ 11   0  11 00000000000100000000000000000000
+ 12   0  12 00000000000010000000000000000000
+ 13   0  13 00000000000001000000000000000000
+ 14   0  14 00000000000000100000000000000000
+ 15   0  15 00000000000000010000000000000000
+ 16   0  16 00000000000000001000000000000000
+ 17   0  17 00000000000000000100000000000000
+ 18   0  18 00000000000000000010000000000000
+ 19   0  19 00000000000000000001000000000000
+ 20   0  20 00000000000000000000100000000000
+ 21   0  21 00000000000000000000010000000000
+ 22   0  22 00000000000000000000001000000000
+ 23   0  23 00000000000000000000000100000000
+ 24   0  24 00000000000000000000000010000000
+ 25   0  25 00000000000000000000000001000000
+ 26   0  26 00000000000000000000000000100000
+ 27   0  27 00000000000000000000000000010000
+ 28   0  28 00000000000000000000000000001000
+ 29   0  29 00000000000000000000000000000100
+ 30   0  30 00000000000000000000000000000010
+ 31   0  31 00000000000000000000000000000001
diff --git a/contrib/netbsd-tests/include/d_bitstring_49.out b/contrib/netbsd-tests/include/d_bitstring_49.out
new file mode 100644
index 000000000000..d63c0692deed
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_49.out
@@ -0,0 +1,439 @@
+Testing with TEST_LENGTH = 49
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+  8              1              1              1
+  9              1              2              2
+ 10              1              4              2
+ 11              1              8              2
+ 12              1             16              2
+ 13              1             32              2
+ 14              1             64              2
+ 15              1            128              2
+ 16              2              1              2
+ 17              2              2              3
+ 18              2              4              3
+ 19              2              8              3
+ 20              2             16              3
+ 21              2             32              3
+ 22              2             64              3
+ 23              2            128              3
+ 24              3              1              3
+ 25              3              2              4
+ 26              3              4              4
+ 27              3              8              4
+ 28              3             16              4
+ 29              3             32              4
+ 30              3             64              4
+ 31              3            128              4
+ 32              4              1              4
+ 33              4              2              5
+ 34              4              4              5
+ 35              4              8              5
+ 36              4             16              5
+ 37              4             32              5
+ 38              4             64              5
+ 39              4            128              5
+ 40              5              1              5
+ 41              5              2              6
+ 42              5              4              6
+ 43              5              8              6
+ 44              5             16              6
+ 45              5             32              6
+ 46              5             64              6
+ 47              5            128              6
+ 48              6              1              6
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 0000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000
+
+test bit_set
+be:   1   0 1001001001001001001001001001001001001001001001001
+is:   1   0 1001001001001001001001001001001001001001001001001
+
+test bit_clear
+be:   0   3 0001000001000001000001000001000001000001000001000
+is:   0   3 0001000001000001000001000001000001000001000001000
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+  8              0
+  9              2
+ 10              0
+ 11              0
+ 12              0
+ 13              0
+ 14              0
+ 15            128
+ 16              0
+ 17              0
+ 18              0
+ 19              0
+ 20              0
+ 21             32
+ 22              0
+ 23              0
+ 24              0
+ 25              0
+ 26              0
+ 27              8
+ 28              0
+ 29              0
+ 30              0
+ 31              0
+ 32              0
+ 33              2
+ 34              0
+ 35              0
+ 36              0
+ 37              0
+ 38              0
+ 39            128
+ 40              0
+ 41              0
+ 42              0
+ 43              0
+ 44              0
+ 45             32
+ 46              0
+ 47              0
+ 48              0
+
+test clearbits
+be:   0  -1 0000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000
+
+test bit_nset and bit_nclear
+be:   0   1 0111111111111111111111111111111111111111111111110
+is:   0   1 0111111111111111111111111111111111111111111111110
+be:   0   1 0100000000000000000000000000000000000000000000010
+is:   0   1 0100000000000000000000000000000000000000000000010
+be:   0  -1 0000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000
+be:  48   0 1111111111111111111111111111111111111111111111110
+is:  48   0 1111111111111111111111111111111111111111111111110
+be:   0  -1 0000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111
+  1   0   1 0111111111111111111111111111111111111111111111111
+  2   0   2 0011111111111111111111111111111111111111111111111
+  3   0   3 0001111111111111111111111111111111111111111111111
+  4   0   4 0000111111111111111111111111111111111111111111111
+  5   0   5 0000011111111111111111111111111111111111111111111
+  6   0   6 0000001111111111111111111111111111111111111111111
+  7   0   7 0000000111111111111111111111111111111111111111111
+  8   0   8 0000000011111111111111111111111111111111111111111
+  9   0   9 0000000001111111111111111111111111111111111111111
+ 10   0  10 0000000000111111111111111111111111111111111111111
+ 11   0  11 0000000000011111111111111111111111111111111111111
+ 12   0  12 0000000000001111111111111111111111111111111111111
+ 13   0  13 0000000000000111111111111111111111111111111111111
+ 14   0  14 0000000000000011111111111111111111111111111111111
+ 15   0  15 0000000000000001111111111111111111111111111111111
+ 16   0  16 0000000000000000111111111111111111111111111111111
+ 17   0  17 0000000000000000011111111111111111111111111111111
+ 18   0  18 0000000000000000001111111111111111111111111111111
+ 19   0  19 0000000000000000000111111111111111111111111111111
+ 20   0  20 0000000000000000000011111111111111111111111111111
+ 21   0  21 0000000000000000000001111111111111111111111111111
+ 22   0  22 0000000000000000000000111111111111111111111111111
+ 23   0  23 0000000000000000000000011111111111111111111111111
+ 24   0  24 0000000000000000000000001111111111111111111111111
+ 25   0  25 0000000000000000000000000111111111111111111111111
+ 26   0  26 0000000000000000000000000011111111111111111111111
+ 27   0  27 0000000000000000000000000001111111111111111111111
+ 28   0  28 0000000000000000000000000000111111111111111111111
+ 29   0  29 0000000000000000000000000000011111111111111111111
+ 30   0  30 0000000000000000000000000000001111111111111111111
+ 31   0  31 0000000000000000000000000000000111111111111111111
+ 32   0  32 0000000000000000000000000000000011111111111111111
+ 33   0  33 0000000000000000000000000000000001111111111111111
+ 34   0  34 0000000000000000000000000000000000111111111111111
+ 35   0  35 0000000000000000000000000000000000011111111111111
+ 36   0  36 0000000000000000000000000000000000001111111111111
+ 37   0  37 0000000000000000000000000000000000000111111111111
+ 38   0  38 0000000000000000000000000000000000000011111111111
+ 39   0  39 0000000000000000000000000000000000000001111111111
+ 40   0  40 0000000000000000000000000000000000000000111111111
+ 41   0  41 0000000000000000000000000000000000000000011111111
+ 42   0  42 0000000000000000000000000000000000000000001111111
+ 43   0  43 0000000000000000000000000000000000000000000111111
+ 44   0  44 0000000000000000000000000000000000000000000011111
+ 45   0  45 0000000000000000000000000000000000000000000001111
+ 46   0  46 0000000000000000000000000000000000000000000000111
+ 47   0  47 0000000000000000000000000000000000000000000000011
+ 48   0  48 0000000000000000000000000000000000000000000000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000
+  1   1   0 1000000000000000000000000000000000000000000000000
+  2   2   0 1100000000000000000000000000000000000000000000000
+  3   3   0 1110000000000000000000000000000000000000000000000
+  4   4   0 1111000000000000000000000000000000000000000000000
+  5   5   0 1111100000000000000000000000000000000000000000000
+  6   6   0 1111110000000000000000000000000000000000000000000
+  7   7   0 1111111000000000000000000000000000000000000000000
+  8   8   0 1111111100000000000000000000000000000000000000000
+  9   9   0 1111111110000000000000000000000000000000000000000
+ 10  10   0 1111111111000000000000000000000000000000000000000
+ 11  11   0 1111111111100000000000000000000000000000000000000
+ 12  12   0 1111111111110000000000000000000000000000000000000
+ 13  13   0 1111111111111000000000000000000000000000000000000
+ 14  14   0 1111111111111100000000000000000000000000000000000
+ 15  15   0 1111111111111110000000000000000000000000000000000
+ 16  16   0 1111111111111111000000000000000000000000000000000
+ 17  17   0 1111111111111111100000000000000000000000000000000
+ 18  18   0 1111111111111111110000000000000000000000000000000
+ 19  19   0 1111111111111111111000000000000000000000000000000
+ 20  20   0 1111111111111111111100000000000000000000000000000
+ 21  21   0 1111111111111111111110000000000000000000000000000
+ 22  22   0 1111111111111111111111000000000000000000000000000
+ 23  23   0 1111111111111111111111100000000000000000000000000
+ 24  24   0 1111111111111111111111110000000000000000000000000
+ 25  25   0 1111111111111111111111111000000000000000000000000
+ 26  26   0 1111111111111111111111111100000000000000000000000
+ 27  27   0 1111111111111111111111111110000000000000000000000
+ 28  28   0 1111111111111111111111111111000000000000000000000
+ 29  29   0 1111111111111111111111111111100000000000000000000
+ 30  30   0 1111111111111111111111111111110000000000000000000
+ 31  31   0 1111111111111111111111111111111000000000000000000
+ 32  32   0 1111111111111111111111111111111100000000000000000
+ 33  33   0 1111111111111111111111111111111110000000000000000
+ 34  34   0 1111111111111111111111111111111111000000000000000
+ 35  35   0 1111111111111111111111111111111111100000000000000
+ 36  36   0 1111111111111111111111111111111111110000000000000
+ 37  37   0 1111111111111111111111111111111111111000000000000
+ 38  38   0 1111111111111111111111111111111111111100000000000
+ 39  39   0 1111111111111111111111111111111111111110000000000
+ 40  40   0 1111111111111111111111111111111111111111000000000
+ 41  41   0 1111111111111111111111111111111111111111100000000
+ 42  42   0 1111111111111111111111111111111111111111110000000
+ 43  43   0 1111111111111111111111111111111111111111111000000
+ 44  44   0 1111111111111111111111111111111111111111111100000
+ 45  45   0 1111111111111111111111111111111111111111111110000
+ 46  46   0 1111111111111111111111111111111111111111111111000
+ 47  47   0 1111111111111111111111111111111111111111111111100
+ 48  48   0 1111111111111111111111111111111111111111111111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111
+  1  48   0 1111111111111111111111111111111111111111111111110
+  2  47   0 1111111111111111111111111111111111111111111111100
+  3  46   0 1111111111111111111111111111111111111111111111000
+  4  45   0 1111111111111111111111111111111111111111111110000
+  5  44   0 1111111111111111111111111111111111111111111100000
+  6  43   0 1111111111111111111111111111111111111111111000000
+  7  42   0 1111111111111111111111111111111111111111110000000
+  8  41   0 1111111111111111111111111111111111111111100000000
+  9  40   0 1111111111111111111111111111111111111111000000000
+ 10  39   0 1111111111111111111111111111111111111110000000000
+ 11  38   0 1111111111111111111111111111111111111100000000000
+ 12  37   0 1111111111111111111111111111111111111000000000000
+ 13  36   0 1111111111111111111111111111111111110000000000000
+ 14  35   0 1111111111111111111111111111111111100000000000000
+ 15  34   0 1111111111111111111111111111111111000000000000000
+ 16  33   0 1111111111111111111111111111111110000000000000000
+ 17  32   0 1111111111111111111111111111111100000000000000000
+ 18  31   0 1111111111111111111111111111111000000000000000000
+ 19  30   0 1111111111111111111111111111110000000000000000000
+ 20  29   0 1111111111111111111111111111100000000000000000000
+ 21  28   0 1111111111111111111111111111000000000000000000000
+ 22  27   0 1111111111111111111111111110000000000000000000000
+ 23  26   0 1111111111111111111111111100000000000000000000000
+ 24  25   0 1111111111111111111111111000000000000000000000000
+ 25  24   0 1111111111111111111111110000000000000000000000000
+ 26  23   0 1111111111111111111111100000000000000000000000000
+ 27  22   0 1111111111111111111111000000000000000000000000000
+ 28  21   0 1111111111111111111110000000000000000000000000000
+ 29  20   0 1111111111111111111100000000000000000000000000000
+ 30  19   0 1111111111111111111000000000000000000000000000000
+ 31  18   0 1111111111111111110000000000000000000000000000000
+ 32  17   0 1111111111111111100000000000000000000000000000000
+ 33  16   0 1111111111111111000000000000000000000000000000000
+ 34  15   0 1111111111111110000000000000000000000000000000000
+ 35  14   0 1111111111111100000000000000000000000000000000000
+ 36  13   0 1111111111111000000000000000000000000000000000000
+ 37  12   0 1111111111110000000000000000000000000000000000000
+ 38  11   0 1111111111100000000000000000000000000000000000000
+ 39  10   0 1111111111000000000000000000000000000000000000000
+ 40   9   0 1111111110000000000000000000000000000000000000000
+ 41   8   0 1111111100000000000000000000000000000000000000000
+ 42   7   0 1111111000000000000000000000000000000000000000000
+ 43   6   0 1111110000000000000000000000000000000000000000000
+ 44   5   0 1111100000000000000000000000000000000000000000000
+ 45   4   0 1111000000000000000000000000000000000000000000000
+ 46   3   0 1110000000000000000000000000000000000000000000000
+ 47   2   0 1100000000000000000000000000000000000000000000000
+ 48   1   0 1000000000000000000000000000000000000000000000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000
+  1   0  48 0000000000000000000000000000000000000000000000001
+  2   0  47 0000000000000000000000000000000000000000000000011
+  3   0  46 0000000000000000000000000000000000000000000000111
+  4   0  45 0000000000000000000000000000000000000000000001111
+  5   0  44 0000000000000000000000000000000000000000000011111
+  6   0  43 0000000000000000000000000000000000000000000111111
+  7   0  42 0000000000000000000000000000000000000000001111111
+  8   0  41 0000000000000000000000000000000000000000011111111
+  9   0  40 0000000000000000000000000000000000000000111111111
+ 10   0  39 0000000000000000000000000000000000000001111111111
+ 11   0  38 0000000000000000000000000000000000000011111111111
+ 12   0  37 0000000000000000000000000000000000000111111111111
+ 13   0  36 0000000000000000000000000000000000001111111111111
+ 14   0  35 0000000000000000000000000000000000011111111111111
+ 15   0  34 0000000000000000000000000000000000111111111111111
+ 16   0  33 0000000000000000000000000000000001111111111111111
+ 17   0  32 0000000000000000000000000000000011111111111111111
+ 18   0  31 0000000000000000000000000000000111111111111111111
+ 19   0  30 0000000000000000000000000000001111111111111111111
+ 20   0  29 0000000000000000000000000000011111111111111111111
+ 21   0  28 0000000000000000000000000000111111111111111111111
+ 22   0  27 0000000000000000000000000001111111111111111111111
+ 23   0  26 0000000000000000000000000011111111111111111111111
+ 24   0  25 0000000000000000000000000111111111111111111111111
+ 25   0  24 0000000000000000000000001111111111111111111111111
+ 26   0  23 0000000000000000000000011111111111111111111111111
+ 27   0  22 0000000000000000000000111111111111111111111111111
+ 28   0  21 0000000000000000000001111111111111111111111111111
+ 29   0  20 0000000000000000000011111111111111111111111111111
+ 30   0  19 0000000000000000000111111111111111111111111111111
+ 31   0  18 0000000000000000001111111111111111111111111111111
+ 32   0  17 0000000000000000011111111111111111111111111111111
+ 33   0  16 0000000000000000111111111111111111111111111111111
+ 34   0  15 0000000000000001111111111111111111111111111111111
+ 35   0  14 0000000000000011111111111111111111111111111111111
+ 36   0  13 0000000000000111111111111111111111111111111111111
+ 37   0  12 0000000000001111111111111111111111111111111111111
+ 38   0  11 0000000000011111111111111111111111111111111111111
+ 39   0  10 0000000000111111111111111111111111111111111111111
+ 40   0   9 0000000001111111111111111111111111111111111111111
+ 41   0   8 0000000011111111111111111111111111111111111111111
+ 42   0   7 0000000111111111111111111111111111111111111111111
+ 43   0   6 0000001111111111111111111111111111111111111111111
+ 44   0   5 0000011111111111111111111111111111111111111111111
+ 45   0   4 0000111111111111111111111111111111111111111111111
+ 46   0   3 0001111111111111111111111111111111111111111111111
+ 47   0   2 0011111111111111111111111111111111111111111111111
+ 48   0   1 0111111111111111111111111111111111111111111111111
+
+0 bit should move right 1 position each line
+  0   0   1 0111111111111111111111111111111111111111111111111
+  1   1   0 1011111111111111111111111111111111111111111111111
+  2   2   0 1101111111111111111111111111111111111111111111111
+  3   3   0 1110111111111111111111111111111111111111111111111
+  4   4   0 1111011111111111111111111111111111111111111111111
+  5   5   0 1111101111111111111111111111111111111111111111111
+  6   6   0 1111110111111111111111111111111111111111111111111
+  7   7   0 1111111011111111111111111111111111111111111111111
+  8   8   0 1111111101111111111111111111111111111111111111111
+  9   9   0 1111111110111111111111111111111111111111111111111
+ 10  10   0 1111111111011111111111111111111111111111111111111
+ 11  11   0 1111111111101111111111111111111111111111111111111
+ 12  12   0 1111111111110111111111111111111111111111111111111
+ 13  13   0 1111111111111011111111111111111111111111111111111
+ 14  14   0 1111111111111101111111111111111111111111111111111
+ 15  15   0 1111111111111110111111111111111111111111111111111
+ 16  16   0 1111111111111111011111111111111111111111111111111
+ 17  17   0 1111111111111111101111111111111111111111111111111
+ 18  18   0 1111111111111111110111111111111111111111111111111
+ 19  19   0 1111111111111111111011111111111111111111111111111
+ 20  20   0 1111111111111111111101111111111111111111111111111
+ 21  21   0 1111111111111111111110111111111111111111111111111
+ 22  22   0 1111111111111111111111011111111111111111111111111
+ 23  23   0 1111111111111111111111101111111111111111111111111
+ 24  24   0 1111111111111111111111110111111111111111111111111
+ 25  25   0 1111111111111111111111111011111111111111111111111
+ 26  26   0 1111111111111111111111111101111111111111111111111
+ 27  27   0 1111111111111111111111111110111111111111111111111
+ 28  28   0 1111111111111111111111111111011111111111111111111
+ 29  29   0 1111111111111111111111111111101111111111111111111
+ 30  30   0 1111111111111111111111111111110111111111111111111
+ 31  31   0 1111111111111111111111111111111011111111111111111
+ 32  32   0 1111111111111111111111111111111101111111111111111
+ 33  33   0 1111111111111111111111111111111110111111111111111
+ 34  34   0 1111111111111111111111111111111111011111111111111
+ 35  35   0 1111111111111111111111111111111111101111111111111
+ 36  36   0 1111111111111111111111111111111111110111111111111
+ 37  37   0 1111111111111111111111111111111111111011111111111
+ 38  38   0 1111111111111111111111111111111111111101111111111
+ 39  39   0 1111111111111111111111111111111111111110111111111
+ 40  40   0 1111111111111111111111111111111111111111011111111
+ 41  41   0 1111111111111111111111111111111111111111101111111
+ 42  42   0 1111111111111111111111111111111111111111110111111
+ 43  43   0 1111111111111111111111111111111111111111111011111
+ 44  44   0 1111111111111111111111111111111111111111111101111
+ 45  45   0 1111111111111111111111111111111111111111111110111
+ 46  46   0 1111111111111111111111111111111111111111111111011
+ 47  47   0 1111111111111111111111111111111111111111111111101
+ 48  48   0 1111111111111111111111111111111111111111111111110
+
+1 bit should move right 1 position each line
+  0   1   0 1000000000000000000000000000000000000000000000000
+  1   0   1 0100000000000000000000000000000000000000000000000
+  2   0   2 0010000000000000000000000000000000000000000000000
+  3   0   3 0001000000000000000000000000000000000000000000000
+  4   0   4 0000100000000000000000000000000000000000000000000
+  5   0   5 0000010000000000000000000000000000000000000000000
+  6   0   6 0000001000000000000000000000000000000000000000000
+  7   0   7 0000000100000000000000000000000000000000000000000
+  8   0   8 0000000010000000000000000000000000000000000000000
+  9   0   9 0000000001000000000000000000000000000000000000000
+ 10   0  10 0000000000100000000000000000000000000000000000000
+ 11   0  11 0000000000010000000000000000000000000000000000000
+ 12   0  12 0000000000001000000000000000000000000000000000000
+ 13   0  13 0000000000000100000000000000000000000000000000000
+ 14   0  14 0000000000000010000000000000000000000000000000000
+ 15   0  15 0000000000000001000000000000000000000000000000000
+ 16   0  16 0000000000000000100000000000000000000000000000000
+ 17   0  17 0000000000000000010000000000000000000000000000000
+ 18   0  18 0000000000000000001000000000000000000000000000000
+ 19   0  19 0000000000000000000100000000000000000000000000000
+ 20   0  20 0000000000000000000010000000000000000000000000000
+ 21   0  21 0000000000000000000001000000000000000000000000000
+ 22   0  22 0000000000000000000000100000000000000000000000000
+ 23   0  23 0000000000000000000000010000000000000000000000000
+ 24   0  24 0000000000000000000000001000000000000000000000000
+ 25   0  25 0000000000000000000000000100000000000000000000000
+ 26   0  26 0000000000000000000000000010000000000000000000000
+ 27   0  27 0000000000000000000000000001000000000000000000000
+ 28   0  28 0000000000000000000000000000100000000000000000000
+ 29   0  29 0000000000000000000000000000010000000000000000000
+ 30   0  30 0000000000000000000000000000001000000000000000000
+ 31   0  31 0000000000000000000000000000000100000000000000000
+ 32   0  32 0000000000000000000000000000000010000000000000000
+ 33   0  33 0000000000000000000000000000000001000000000000000
+ 34   0  34 0000000000000000000000000000000000100000000000000
+ 35   0  35 0000000000000000000000000000000000010000000000000
+ 36   0  36 0000000000000000000000000000000000001000000000000
+ 37   0  37 0000000000000000000000000000000000000100000000000
+ 38   0  38 0000000000000000000000000000000000000010000000000
+ 39   0  39 0000000000000000000000000000000000000001000000000
+ 40   0  40 0000000000000000000000000000000000000000100000000
+ 41   0  41 0000000000000000000000000000000000000000010000000
+ 42   0  42 0000000000000000000000000000000000000000001000000
+ 43   0  43 0000000000000000000000000000000000000000000100000
+ 44   0  44 0000000000000000000000000000000000000000000010000
+ 45   0  45 0000000000000000000000000000000000000000000001000
+ 46   0  46 0000000000000000000000000000000000000000000000100
+ 47   0  47 0000000000000000000000000000000000000000000000010
+ 48   0  48 0000000000000000000000000000000000000000000000001
diff --git a/contrib/netbsd-tests/include/d_bitstring_64.out b/contrib/netbsd-tests/include/d_bitstring_64.out
new file mode 100644
index 000000000000..7e9308eabc73
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_64.out
@@ -0,0 +1,559 @@
+Testing with TEST_LENGTH = 64
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+  8              1              1              1
+  9              1              2              2
+ 10              1              4              2
+ 11              1              8              2
+ 12              1             16              2
+ 13              1             32              2
+ 14              1             64              2
+ 15              1            128              2
+ 16              2              1              2
+ 17              2              2              3
+ 18              2              4              3
+ 19              2              8              3
+ 20              2             16              3
+ 21              2             32              3
+ 22              2             64              3
+ 23              2            128              3
+ 24              3              1              3
+ 25              3              2              4
+ 26              3              4              4
+ 27              3              8              4
+ 28              3             16              4
+ 29              3             32              4
+ 30              3             64              4
+ 31              3            128              4
+ 32              4              1              4
+ 33              4              2              5
+ 34              4              4              5
+ 35              4              8              5
+ 36              4             16              5
+ 37              4             32              5
+ 38              4             64              5
+ 39              4            128              5
+ 40              5              1              5
+ 41              5              2              6
+ 42              5              4              6
+ 43              5              8              6
+ 44              5             16              6
+ 45              5             32              6
+ 46              5             64              6
+ 47              5            128              6
+ 48              6              1              6
+ 49              6              2              7
+ 50              6              4              7
+ 51              6              8              7
+ 52              6             16              7
+ 53              6             32              7
+ 54              6             64              7
+ 55              6            128              7
+ 56              7              1              7
+ 57              7              2              8
+ 58              7              4              8
+ 59              7              8              8
+ 60              7             16              8
+ 61              7             32              8
+ 62              7             64              8
+ 63              7            128              8
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+
+test bit_set
+be:   1   0 1001001001001001001001001001001001001001001001001001001001001001
+is:   1   0 1001001001001001001001001001001001001001001001001001001001001001
+
+test bit_clear
+be:   0   3 0001000001000001000001000001000001000001000001000001000001000001
+is:   0   3 0001000001000001000001000001000001000001000001000001000001000001
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+  8              0
+  9              2
+ 10              0
+ 11              0
+ 12              0
+ 13              0
+ 14              0
+ 15            128
+ 16              0
+ 17              0
+ 18              0
+ 19              0
+ 20              0
+ 21             32
+ 22              0
+ 23              0
+ 24              0
+ 25              0
+ 26              0
+ 27              8
+ 28              0
+ 29              0
+ 30              0
+ 31              0
+ 32              0
+ 33              2
+ 34              0
+ 35              0
+ 36              0
+ 37              0
+ 38              0
+ 39            128
+ 40              0
+ 41              0
+ 42              0
+ 43              0
+ 44              0
+ 45             32
+ 46              0
+ 47              0
+ 48              0
+ 49              0
+ 50              0
+ 51              8
+ 52              0
+ 53              0
+ 54              0
+ 55              0
+ 56              0
+ 57              2
+ 58              0
+ 59              0
+ 60              0
+ 61              0
+ 62              0
+ 63            128
+
+test clearbits
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+
+test bit_nset and bit_nclear
+be:   0   1 0111111111111111111111111111111111111111111111111111111111111110
+is:   0   1 0111111111111111111111111111111111111111111111111111111111111110
+be:   0   1 0100000000000000000000000000000000000000000000000000000000000010
+is:   0   1 0100000000000000000000000000000000000000000000000000000000000010
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+be:  63   0 1111111111111111111111111111111111111111111111111111111111111110
+is:  63   0 1111111111111111111111111111111111111111111111111111111111111110
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111111111111111111
+  1   0   1 0111111111111111111111111111111111111111111111111111111111111111
+  2   0   2 0011111111111111111111111111111111111111111111111111111111111111
+  3   0   3 0001111111111111111111111111111111111111111111111111111111111111
+  4   0   4 0000111111111111111111111111111111111111111111111111111111111111
+  5   0   5 0000011111111111111111111111111111111111111111111111111111111111
+  6   0   6 0000001111111111111111111111111111111111111111111111111111111111
+  7   0   7 0000000111111111111111111111111111111111111111111111111111111111
+  8   0   8 0000000011111111111111111111111111111111111111111111111111111111
+  9   0   9 0000000001111111111111111111111111111111111111111111111111111111
+ 10   0  10 0000000000111111111111111111111111111111111111111111111111111111
+ 11   0  11 0000000000011111111111111111111111111111111111111111111111111111
+ 12   0  12 0000000000001111111111111111111111111111111111111111111111111111
+ 13   0  13 0000000000000111111111111111111111111111111111111111111111111111
+ 14   0  14 0000000000000011111111111111111111111111111111111111111111111111
+ 15   0  15 0000000000000001111111111111111111111111111111111111111111111111
+ 16   0  16 0000000000000000111111111111111111111111111111111111111111111111
+ 17   0  17 0000000000000000011111111111111111111111111111111111111111111111
+ 18   0  18 0000000000000000001111111111111111111111111111111111111111111111
+ 19   0  19 0000000000000000000111111111111111111111111111111111111111111111
+ 20   0  20 0000000000000000000011111111111111111111111111111111111111111111
+ 21   0  21 0000000000000000000001111111111111111111111111111111111111111111
+ 22   0  22 0000000000000000000000111111111111111111111111111111111111111111
+ 23   0  23 0000000000000000000000011111111111111111111111111111111111111111
+ 24   0  24 0000000000000000000000001111111111111111111111111111111111111111
+ 25   0  25 0000000000000000000000000111111111111111111111111111111111111111
+ 26   0  26 0000000000000000000000000011111111111111111111111111111111111111
+ 27   0  27 0000000000000000000000000001111111111111111111111111111111111111
+ 28   0  28 0000000000000000000000000000111111111111111111111111111111111111
+ 29   0  29 0000000000000000000000000000011111111111111111111111111111111111
+ 30   0  30 0000000000000000000000000000001111111111111111111111111111111111
+ 31   0  31 0000000000000000000000000000000111111111111111111111111111111111
+ 32   0  32 0000000000000000000000000000000011111111111111111111111111111111
+ 33   0  33 0000000000000000000000000000000001111111111111111111111111111111
+ 34   0  34 0000000000000000000000000000000000111111111111111111111111111111
+ 35   0  35 0000000000000000000000000000000000011111111111111111111111111111
+ 36   0  36 0000000000000000000000000000000000001111111111111111111111111111
+ 37   0  37 0000000000000000000000000000000000000111111111111111111111111111
+ 38   0  38 0000000000000000000000000000000000000011111111111111111111111111
+ 39   0  39 0000000000000000000000000000000000000001111111111111111111111111
+ 40   0  40 0000000000000000000000000000000000000000111111111111111111111111
+ 41   0  41 0000000000000000000000000000000000000000011111111111111111111111
+ 42   0  42 0000000000000000000000000000000000000000001111111111111111111111
+ 43   0  43 0000000000000000000000000000000000000000000111111111111111111111
+ 44   0  44 0000000000000000000000000000000000000000000011111111111111111111
+ 45   0  45 0000000000000000000000000000000000000000000001111111111111111111
+ 46   0  46 0000000000000000000000000000000000000000000000111111111111111111
+ 47   0  47 0000000000000000000000000000000000000000000000011111111111111111
+ 48   0  48 0000000000000000000000000000000000000000000000001111111111111111
+ 49   0  49 0000000000000000000000000000000000000000000000000111111111111111
+ 50   0  50 0000000000000000000000000000000000000000000000000011111111111111
+ 51   0  51 0000000000000000000000000000000000000000000000000001111111111111
+ 52   0  52 0000000000000000000000000000000000000000000000000000111111111111
+ 53   0  53 0000000000000000000000000000000000000000000000000000011111111111
+ 54   0  54 0000000000000000000000000000000000000000000000000000001111111111
+ 55   0  55 0000000000000000000000000000000000000000000000000000000111111111
+ 56   0  56 0000000000000000000000000000000000000000000000000000000011111111
+ 57   0  57 0000000000000000000000000000000000000000000000000000000001111111
+ 58   0  58 0000000000000000000000000000000000000000000000000000000000111111
+ 59   0  59 0000000000000000000000000000000000000000000000000000000000011111
+ 60   0  60 0000000000000000000000000000000000000000000000000000000000001111
+ 61   0  61 0000000000000000000000000000000000000000000000000000000000000111
+ 62   0  62 0000000000000000000000000000000000000000000000000000000000000011
+ 63   0  63 0000000000000000000000000000000000000000000000000000000000000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+  1   1   0 1000000000000000000000000000000000000000000000000000000000000000
+  2   2   0 1100000000000000000000000000000000000000000000000000000000000000
+  3   3   0 1110000000000000000000000000000000000000000000000000000000000000
+  4   4   0 1111000000000000000000000000000000000000000000000000000000000000
+  5   5   0 1111100000000000000000000000000000000000000000000000000000000000
+  6   6   0 1111110000000000000000000000000000000000000000000000000000000000
+  7   7   0 1111111000000000000000000000000000000000000000000000000000000000
+  8   8   0 1111111100000000000000000000000000000000000000000000000000000000
+  9   9   0 1111111110000000000000000000000000000000000000000000000000000000
+ 10  10   0 1111111111000000000000000000000000000000000000000000000000000000
+ 11  11   0 1111111111100000000000000000000000000000000000000000000000000000
+ 12  12   0 1111111111110000000000000000000000000000000000000000000000000000
+ 13  13   0 1111111111111000000000000000000000000000000000000000000000000000
+ 14  14   0 1111111111111100000000000000000000000000000000000000000000000000
+ 15  15   0 1111111111111110000000000000000000000000000000000000000000000000
+ 16  16   0 1111111111111111000000000000000000000000000000000000000000000000
+ 17  17   0 1111111111111111100000000000000000000000000000000000000000000000
+ 18  18   0 1111111111111111110000000000000000000000000000000000000000000000
+ 19  19   0 1111111111111111111000000000000000000000000000000000000000000000
+ 20  20   0 1111111111111111111100000000000000000000000000000000000000000000
+ 21  21   0 1111111111111111111110000000000000000000000000000000000000000000
+ 22  22   0 1111111111111111111111000000000000000000000000000000000000000000
+ 23  23   0 1111111111111111111111100000000000000000000000000000000000000000
+ 24  24   0 1111111111111111111111110000000000000000000000000000000000000000
+ 25  25   0 1111111111111111111111111000000000000000000000000000000000000000
+ 26  26   0 1111111111111111111111111100000000000000000000000000000000000000
+ 27  27   0 1111111111111111111111111110000000000000000000000000000000000000
+ 28  28   0 1111111111111111111111111111000000000000000000000000000000000000
+ 29  29   0 1111111111111111111111111111100000000000000000000000000000000000
+ 30  30   0 1111111111111111111111111111110000000000000000000000000000000000
+ 31  31   0 1111111111111111111111111111111000000000000000000000000000000000
+ 32  32   0 1111111111111111111111111111111100000000000000000000000000000000
+ 33  33   0 1111111111111111111111111111111110000000000000000000000000000000
+ 34  34   0 1111111111111111111111111111111111000000000000000000000000000000
+ 35  35   0 1111111111111111111111111111111111100000000000000000000000000000
+ 36  36   0 1111111111111111111111111111111111110000000000000000000000000000
+ 37  37   0 1111111111111111111111111111111111111000000000000000000000000000
+ 38  38   0 1111111111111111111111111111111111111100000000000000000000000000
+ 39  39   0 1111111111111111111111111111111111111110000000000000000000000000
+ 40  40   0 1111111111111111111111111111111111111111000000000000000000000000
+ 41  41   0 1111111111111111111111111111111111111111100000000000000000000000
+ 42  42   0 1111111111111111111111111111111111111111110000000000000000000000
+ 43  43   0 1111111111111111111111111111111111111111111000000000000000000000
+ 44  44   0 1111111111111111111111111111111111111111111100000000000000000000
+ 45  45   0 1111111111111111111111111111111111111111111110000000000000000000
+ 46  46   0 1111111111111111111111111111111111111111111111000000000000000000
+ 47  47   0 1111111111111111111111111111111111111111111111100000000000000000
+ 48  48   0 1111111111111111111111111111111111111111111111110000000000000000
+ 49  49   0 1111111111111111111111111111111111111111111111111000000000000000
+ 50  50   0 1111111111111111111111111111111111111111111111111100000000000000
+ 51  51   0 1111111111111111111111111111111111111111111111111110000000000000
+ 52  52   0 1111111111111111111111111111111111111111111111111111000000000000
+ 53  53   0 1111111111111111111111111111111111111111111111111111100000000000
+ 54  54   0 1111111111111111111111111111111111111111111111111111110000000000
+ 55  55   0 1111111111111111111111111111111111111111111111111111111000000000
+ 56  56   0 1111111111111111111111111111111111111111111111111111111100000000
+ 57  57   0 1111111111111111111111111111111111111111111111111111111110000000
+ 58  58   0 1111111111111111111111111111111111111111111111111111111111000000
+ 59  59   0 1111111111111111111111111111111111111111111111111111111111100000
+ 60  60   0 1111111111111111111111111111111111111111111111111111111111110000
+ 61  61   0 1111111111111111111111111111111111111111111111111111111111111000
+ 62  62   0 1111111111111111111111111111111111111111111111111111111111111100
+ 63  63   0 1111111111111111111111111111111111111111111111111111111111111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111111111111111111
+  1  63   0 1111111111111111111111111111111111111111111111111111111111111110
+  2  62   0 1111111111111111111111111111111111111111111111111111111111111100
+  3  61   0 1111111111111111111111111111111111111111111111111111111111111000
+  4  60   0 1111111111111111111111111111111111111111111111111111111111110000
+  5  59   0 1111111111111111111111111111111111111111111111111111111111100000
+  6  58   0 1111111111111111111111111111111111111111111111111111111111000000
+  7  57   0 1111111111111111111111111111111111111111111111111111111110000000
+  8  56   0 1111111111111111111111111111111111111111111111111111111100000000
+  9  55   0 1111111111111111111111111111111111111111111111111111111000000000
+ 10  54   0 1111111111111111111111111111111111111111111111111111110000000000
+ 11  53   0 1111111111111111111111111111111111111111111111111111100000000000
+ 12  52   0 1111111111111111111111111111111111111111111111111111000000000000
+ 13  51   0 1111111111111111111111111111111111111111111111111110000000000000
+ 14  50   0 1111111111111111111111111111111111111111111111111100000000000000
+ 15  49   0 1111111111111111111111111111111111111111111111111000000000000000
+ 16  48   0 1111111111111111111111111111111111111111111111110000000000000000
+ 17  47   0 1111111111111111111111111111111111111111111111100000000000000000
+ 18  46   0 1111111111111111111111111111111111111111111111000000000000000000
+ 19  45   0 1111111111111111111111111111111111111111111110000000000000000000
+ 20  44   0 1111111111111111111111111111111111111111111100000000000000000000
+ 21  43   0 1111111111111111111111111111111111111111111000000000000000000000
+ 22  42   0 1111111111111111111111111111111111111111110000000000000000000000
+ 23  41   0 1111111111111111111111111111111111111111100000000000000000000000
+ 24  40   0 1111111111111111111111111111111111111111000000000000000000000000
+ 25  39   0 1111111111111111111111111111111111111110000000000000000000000000
+ 26  38   0 1111111111111111111111111111111111111100000000000000000000000000
+ 27  37   0 1111111111111111111111111111111111111000000000000000000000000000
+ 28  36   0 1111111111111111111111111111111111110000000000000000000000000000
+ 29  35   0 1111111111111111111111111111111111100000000000000000000000000000
+ 30  34   0 1111111111111111111111111111111111000000000000000000000000000000
+ 31  33   0 1111111111111111111111111111111110000000000000000000000000000000
+ 32  32   0 1111111111111111111111111111111100000000000000000000000000000000
+ 33  31   0 1111111111111111111111111111111000000000000000000000000000000000
+ 34  30   0 1111111111111111111111111111110000000000000000000000000000000000
+ 35  29   0 1111111111111111111111111111100000000000000000000000000000000000
+ 36  28   0 1111111111111111111111111111000000000000000000000000000000000000
+ 37  27   0 1111111111111111111111111110000000000000000000000000000000000000
+ 38  26   0 1111111111111111111111111100000000000000000000000000000000000000
+ 39  25   0 1111111111111111111111111000000000000000000000000000000000000000
+ 40  24   0 1111111111111111111111110000000000000000000000000000000000000000
+ 41  23   0 1111111111111111111111100000000000000000000000000000000000000000
+ 42  22   0 1111111111111111111111000000000000000000000000000000000000000000
+ 43  21   0 1111111111111111111110000000000000000000000000000000000000000000
+ 44  20   0 1111111111111111111100000000000000000000000000000000000000000000
+ 45  19   0 1111111111111111111000000000000000000000000000000000000000000000
+ 46  18   0 1111111111111111110000000000000000000000000000000000000000000000
+ 47  17   0 1111111111111111100000000000000000000000000000000000000000000000
+ 48  16   0 1111111111111111000000000000000000000000000000000000000000000000
+ 49  15   0 1111111111111110000000000000000000000000000000000000000000000000
+ 50  14   0 1111111111111100000000000000000000000000000000000000000000000000
+ 51  13   0 1111111111111000000000000000000000000000000000000000000000000000
+ 52  12   0 1111111111110000000000000000000000000000000000000000000000000000
+ 53  11   0 1111111111100000000000000000000000000000000000000000000000000000
+ 54  10   0 1111111111000000000000000000000000000000000000000000000000000000
+ 55   9   0 1111111110000000000000000000000000000000000000000000000000000000
+ 56   8   0 1111111100000000000000000000000000000000000000000000000000000000
+ 57   7   0 1111111000000000000000000000000000000000000000000000000000000000
+ 58   6   0 1111110000000000000000000000000000000000000000000000000000000000
+ 59   5   0 1111100000000000000000000000000000000000000000000000000000000000
+ 60   4   0 1111000000000000000000000000000000000000000000000000000000000000
+ 61   3   0 1110000000000000000000000000000000000000000000000000000000000000
+ 62   2   0 1100000000000000000000000000000000000000000000000000000000000000
+ 63   1   0 1000000000000000000000000000000000000000000000000000000000000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000000000000000000
+  1   0  63 0000000000000000000000000000000000000000000000000000000000000001
+  2   0  62 0000000000000000000000000000000000000000000000000000000000000011
+  3   0  61 0000000000000000000000000000000000000000000000000000000000000111
+  4   0  60 0000000000000000000000000000000000000000000000000000000000001111
+  5   0  59 0000000000000000000000000000000000000000000000000000000000011111
+  6   0  58 0000000000000000000000000000000000000000000000000000000000111111
+  7   0  57 0000000000000000000000000000000000000000000000000000000001111111
+  8   0  56 0000000000000000000000000000000000000000000000000000000011111111
+  9   0  55 0000000000000000000000000000000000000000000000000000000111111111
+ 10   0  54 0000000000000000000000000000000000000000000000000000001111111111
+ 11   0  53 0000000000000000000000000000000000000000000000000000011111111111
+ 12   0  52 0000000000000000000000000000000000000000000000000000111111111111
+ 13   0  51 0000000000000000000000000000000000000000000000000001111111111111
+ 14   0  50 0000000000000000000000000000000000000000000000000011111111111111
+ 15   0  49 0000000000000000000000000000000000000000000000000111111111111111
+ 16   0  48 0000000000000000000000000000000000000000000000001111111111111111
+ 17   0  47 0000000000000000000000000000000000000000000000011111111111111111
+ 18   0  46 0000000000000000000000000000000000000000000000111111111111111111
+ 19   0  45 0000000000000000000000000000000000000000000001111111111111111111
+ 20   0  44 0000000000000000000000000000000000000000000011111111111111111111
+ 21   0  43 0000000000000000000000000000000000000000000111111111111111111111
+ 22   0  42 0000000000000000000000000000000000000000001111111111111111111111
+ 23   0  41 0000000000000000000000000000000000000000011111111111111111111111
+ 24   0  40 0000000000000000000000000000000000000000111111111111111111111111
+ 25   0  39 0000000000000000000000000000000000000001111111111111111111111111
+ 26   0  38 0000000000000000000000000000000000000011111111111111111111111111
+ 27   0  37 0000000000000000000000000000000000000111111111111111111111111111
+ 28   0  36 0000000000000000000000000000000000001111111111111111111111111111
+ 29   0  35 0000000000000000000000000000000000011111111111111111111111111111
+ 30   0  34 0000000000000000000000000000000000111111111111111111111111111111
+ 31   0  33 0000000000000000000000000000000001111111111111111111111111111111
+ 32   0  32 0000000000000000000000000000000011111111111111111111111111111111
+ 33   0  31 0000000000000000000000000000000111111111111111111111111111111111
+ 34   0  30 0000000000000000000000000000001111111111111111111111111111111111
+ 35   0  29 0000000000000000000000000000011111111111111111111111111111111111
+ 36   0  28 0000000000000000000000000000111111111111111111111111111111111111
+ 37   0  27 0000000000000000000000000001111111111111111111111111111111111111
+ 38   0  26 0000000000000000000000000011111111111111111111111111111111111111
+ 39   0  25 0000000000000000000000000111111111111111111111111111111111111111
+ 40   0  24 0000000000000000000000001111111111111111111111111111111111111111
+ 41   0  23 0000000000000000000000011111111111111111111111111111111111111111
+ 42   0  22 0000000000000000000000111111111111111111111111111111111111111111
+ 43   0  21 0000000000000000000001111111111111111111111111111111111111111111
+ 44   0  20 0000000000000000000011111111111111111111111111111111111111111111
+ 45   0  19 0000000000000000000111111111111111111111111111111111111111111111
+ 46   0  18 0000000000000000001111111111111111111111111111111111111111111111
+ 47   0  17 0000000000000000011111111111111111111111111111111111111111111111
+ 48   0  16 0000000000000000111111111111111111111111111111111111111111111111
+ 49   0  15 0000000000000001111111111111111111111111111111111111111111111111
+ 50   0  14 0000000000000011111111111111111111111111111111111111111111111111
+ 51   0  13 0000000000000111111111111111111111111111111111111111111111111111
+ 52   0  12 0000000000001111111111111111111111111111111111111111111111111111
+ 53   0  11 0000000000011111111111111111111111111111111111111111111111111111
+ 54   0  10 0000000000111111111111111111111111111111111111111111111111111111
+ 55   0   9 0000000001111111111111111111111111111111111111111111111111111111
+ 56   0   8 0000000011111111111111111111111111111111111111111111111111111111
+ 57   0   7 0000000111111111111111111111111111111111111111111111111111111111
+ 58   0   6 0000001111111111111111111111111111111111111111111111111111111111
+ 59   0   5 0000011111111111111111111111111111111111111111111111111111111111
+ 60   0   4 0000111111111111111111111111111111111111111111111111111111111111
+ 61   0   3 0001111111111111111111111111111111111111111111111111111111111111
+ 62   0   2 0011111111111111111111111111111111111111111111111111111111111111
+ 63   0   1 0111111111111111111111111111111111111111111111111111111111111111
+
+0 bit should move right 1 position each line
+  0   0   1 0111111111111111111111111111111111111111111111111111111111111111
+  1   1   0 1011111111111111111111111111111111111111111111111111111111111111
+  2   2   0 1101111111111111111111111111111111111111111111111111111111111111
+  3   3   0 1110111111111111111111111111111111111111111111111111111111111111
+  4   4   0 1111011111111111111111111111111111111111111111111111111111111111
+  5   5   0 1111101111111111111111111111111111111111111111111111111111111111
+  6   6   0 1111110111111111111111111111111111111111111111111111111111111111
+  7   7   0 1111111011111111111111111111111111111111111111111111111111111111
+  8   8   0 1111111101111111111111111111111111111111111111111111111111111111
+  9   9   0 1111111110111111111111111111111111111111111111111111111111111111
+ 10  10   0 1111111111011111111111111111111111111111111111111111111111111111
+ 11  11   0 1111111111101111111111111111111111111111111111111111111111111111
+ 12  12   0 1111111111110111111111111111111111111111111111111111111111111111
+ 13  13   0 1111111111111011111111111111111111111111111111111111111111111111
+ 14  14   0 1111111111111101111111111111111111111111111111111111111111111111
+ 15  15   0 1111111111111110111111111111111111111111111111111111111111111111
+ 16  16   0 1111111111111111011111111111111111111111111111111111111111111111
+ 17  17   0 1111111111111111101111111111111111111111111111111111111111111111
+ 18  18   0 1111111111111111110111111111111111111111111111111111111111111111
+ 19  19   0 1111111111111111111011111111111111111111111111111111111111111111
+ 20  20   0 1111111111111111111101111111111111111111111111111111111111111111
+ 21  21   0 1111111111111111111110111111111111111111111111111111111111111111
+ 22  22   0 1111111111111111111111011111111111111111111111111111111111111111
+ 23  23   0 1111111111111111111111101111111111111111111111111111111111111111
+ 24  24   0 1111111111111111111111110111111111111111111111111111111111111111
+ 25  25   0 1111111111111111111111111011111111111111111111111111111111111111
+ 26  26   0 1111111111111111111111111101111111111111111111111111111111111111
+ 27  27   0 1111111111111111111111111110111111111111111111111111111111111111
+ 28  28   0 1111111111111111111111111111011111111111111111111111111111111111
+ 29  29   0 1111111111111111111111111111101111111111111111111111111111111111
+ 30  30   0 1111111111111111111111111111110111111111111111111111111111111111
+ 31  31   0 1111111111111111111111111111111011111111111111111111111111111111
+ 32  32   0 1111111111111111111111111111111101111111111111111111111111111111
+ 33  33   0 1111111111111111111111111111111110111111111111111111111111111111
+ 34  34   0 1111111111111111111111111111111111011111111111111111111111111111
+ 35  35   0 1111111111111111111111111111111111101111111111111111111111111111
+ 36  36   0 1111111111111111111111111111111111110111111111111111111111111111
+ 37  37   0 1111111111111111111111111111111111111011111111111111111111111111
+ 38  38   0 1111111111111111111111111111111111111101111111111111111111111111
+ 39  39   0 1111111111111111111111111111111111111110111111111111111111111111
+ 40  40   0 1111111111111111111111111111111111111111011111111111111111111111
+ 41  41   0 1111111111111111111111111111111111111111101111111111111111111111
+ 42  42   0 1111111111111111111111111111111111111111110111111111111111111111
+ 43  43   0 1111111111111111111111111111111111111111111011111111111111111111
+ 44  44   0 1111111111111111111111111111111111111111111101111111111111111111
+ 45  45   0 1111111111111111111111111111111111111111111110111111111111111111
+ 46  46   0 1111111111111111111111111111111111111111111111011111111111111111
+ 47  47   0 1111111111111111111111111111111111111111111111101111111111111111
+ 48  48   0 1111111111111111111111111111111111111111111111110111111111111111
+ 49  49   0 1111111111111111111111111111111111111111111111111011111111111111
+ 50  50   0 1111111111111111111111111111111111111111111111111101111111111111
+ 51  51   0 1111111111111111111111111111111111111111111111111110111111111111
+ 52  52   0 1111111111111111111111111111111111111111111111111111011111111111
+ 53  53   0 1111111111111111111111111111111111111111111111111111101111111111
+ 54  54   0 1111111111111111111111111111111111111111111111111111110111111111
+ 55  55   0 1111111111111111111111111111111111111111111111111111111011111111
+ 56  56   0 1111111111111111111111111111111111111111111111111111111101111111
+ 57  57   0 1111111111111111111111111111111111111111111111111111111110111111
+ 58  58   0 1111111111111111111111111111111111111111111111111111111111011111
+ 59  59   0 1111111111111111111111111111111111111111111111111111111111101111
+ 60  60   0 1111111111111111111111111111111111111111111111111111111111110111
+ 61  61   0 1111111111111111111111111111111111111111111111111111111111111011
+ 62  62   0 1111111111111111111111111111111111111111111111111111111111111101
+ 63  63   0 1111111111111111111111111111111111111111111111111111111111111110
+
+1 bit should move right 1 position each line
+  0   1   0 1000000000000000000000000000000000000000000000000000000000000000
+  1   0   1 0100000000000000000000000000000000000000000000000000000000000000
+  2   0   2 0010000000000000000000000000000000000000000000000000000000000000
+  3   0   3 0001000000000000000000000000000000000000000000000000000000000000
+  4   0   4 0000100000000000000000000000000000000000000000000000000000000000
+  5   0   5 0000010000000000000000000000000000000000000000000000000000000000
+  6   0   6 0000001000000000000000000000000000000000000000000000000000000000
+  7   0   7 0000000100000000000000000000000000000000000000000000000000000000
+  8   0   8 0000000010000000000000000000000000000000000000000000000000000000
+  9   0   9 0000000001000000000000000000000000000000000000000000000000000000
+ 10   0  10 0000000000100000000000000000000000000000000000000000000000000000
+ 11   0  11 0000000000010000000000000000000000000000000000000000000000000000
+ 12   0  12 0000000000001000000000000000000000000000000000000000000000000000
+ 13   0  13 0000000000000100000000000000000000000000000000000000000000000000
+ 14   0  14 0000000000000010000000000000000000000000000000000000000000000000
+ 15   0  15 0000000000000001000000000000000000000000000000000000000000000000
+ 16   0  16 0000000000000000100000000000000000000000000000000000000000000000
+ 17   0  17 0000000000000000010000000000000000000000000000000000000000000000
+ 18   0  18 0000000000000000001000000000000000000000000000000000000000000000
+ 19   0  19 0000000000000000000100000000000000000000000000000000000000000000
+ 20   0  20 0000000000000000000010000000000000000000000000000000000000000000
+ 21   0  21 0000000000000000000001000000000000000000000000000000000000000000
+ 22   0  22 0000000000000000000000100000000000000000000000000000000000000000
+ 23   0  23 0000000000000000000000010000000000000000000000000000000000000000
+ 24   0  24 0000000000000000000000001000000000000000000000000000000000000000
+ 25   0  25 0000000000000000000000000100000000000000000000000000000000000000
+ 26   0  26 0000000000000000000000000010000000000000000000000000000000000000
+ 27   0  27 0000000000000000000000000001000000000000000000000000000000000000
+ 28   0  28 0000000000000000000000000000100000000000000000000000000000000000
+ 29   0  29 0000000000000000000000000000010000000000000000000000000000000000
+ 30   0  30 0000000000000000000000000000001000000000000000000000000000000000
+ 31   0  31 0000000000000000000000000000000100000000000000000000000000000000
+ 32   0  32 0000000000000000000000000000000010000000000000000000000000000000
+ 33   0  33 0000000000000000000000000000000001000000000000000000000000000000
+ 34   0  34 0000000000000000000000000000000000100000000000000000000000000000
+ 35   0  35 0000000000000000000000000000000000010000000000000000000000000000
+ 36   0  36 0000000000000000000000000000000000001000000000000000000000000000
+ 37   0  37 0000000000000000000000000000000000000100000000000000000000000000
+ 38   0  38 0000000000000000000000000000000000000010000000000000000000000000
+ 39   0  39 0000000000000000000000000000000000000001000000000000000000000000
+ 40   0  40 0000000000000000000000000000000000000000100000000000000000000000
+ 41   0  41 0000000000000000000000000000000000000000010000000000000000000000
+ 42   0  42 0000000000000000000000000000000000000000001000000000000000000000
+ 43   0  43 0000000000000000000000000000000000000000000100000000000000000000
+ 44   0  44 0000000000000000000000000000000000000000000010000000000000000000
+ 45   0  45 0000000000000000000000000000000000000000000001000000000000000000
+ 46   0  46 0000000000000000000000000000000000000000000000100000000000000000
+ 47   0  47 0000000000000000000000000000000000000000000000010000000000000000
+ 48   0  48 0000000000000000000000000000000000000000000000001000000000000000
+ 49   0  49 0000000000000000000000000000000000000000000000000100000000000000
+ 50   0  50 0000000000000000000000000000000000000000000000000010000000000000
+ 51   0  51 0000000000000000000000000000000000000000000000000001000000000000
+ 52   0  52 0000000000000000000000000000000000000000000000000000100000000000
+ 53   0  53 0000000000000000000000000000000000000000000000000000010000000000
+ 54   0  54 0000000000000000000000000000000000000000000000000000001000000000
+ 55   0  55 0000000000000000000000000000000000000000000000000000000100000000
+ 56   0  56 0000000000000000000000000000000000000000000000000000000010000000
+ 57   0  57 0000000000000000000000000000000000000000000000000000000001000000
+ 58   0  58 0000000000000000000000000000000000000000000000000000000000100000
+ 59   0  59 0000000000000000000000000000000000000000000000000000000000010000
+ 60   0  60 0000000000000000000000000000000000000000000000000000000000001000
+ 61   0  61 0000000000000000000000000000000000000000000000000000000000000100
+ 62   0  62 0000000000000000000000000000000000000000000000000000000000000010
+ 63   0  63 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/contrib/netbsd-tests/include/d_bitstring_67.out b/contrib/netbsd-tests/include/d_bitstring_67.out
new file mode 100644
index 000000000000..e5decc3b4bdf
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_67.out
@@ -0,0 +1,583 @@
+Testing with TEST_LENGTH = 67
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+  8              1              1              1
+  9              1              2              2
+ 10              1              4              2
+ 11              1              8              2
+ 12              1             16              2
+ 13              1             32              2
+ 14              1             64              2
+ 15              1            128              2
+ 16              2              1              2
+ 17              2              2              3
+ 18              2              4              3
+ 19              2              8              3
+ 20              2             16              3
+ 21              2             32              3
+ 22              2             64              3
+ 23              2            128              3
+ 24              3              1              3
+ 25              3              2              4
+ 26              3              4              4
+ 27              3              8              4
+ 28              3             16              4
+ 29              3             32              4
+ 30              3             64              4
+ 31              3            128              4
+ 32              4              1              4
+ 33              4              2              5
+ 34              4              4              5
+ 35              4              8              5
+ 36              4             16              5
+ 37              4             32              5
+ 38              4             64              5
+ 39              4            128              5
+ 40              5              1              5
+ 41              5              2              6
+ 42              5              4              6
+ 43              5              8              6
+ 44              5             16              6
+ 45              5             32              6
+ 46              5             64              6
+ 47              5            128              6
+ 48              6              1              6
+ 49              6              2              7
+ 50              6              4              7
+ 51              6              8              7
+ 52              6             16              7
+ 53              6             32              7
+ 54              6             64              7
+ 55              6            128              7
+ 56              7              1              7
+ 57              7              2              8
+ 58              7              4              8
+ 59              7              8              8
+ 60              7             16              8
+ 61              7             32              8
+ 62              7             64              8
+ 63              7            128              8
+ 64              8              1              8
+ 65              8              2              9
+ 66              8              4              9
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+
+test bit_set
+be:   1   0 1001001001001001001001001001001001001001001001001001001001001001001
+is:   1   0 1001001001001001001001001001001001001001001001001001001001001001001
+
+test bit_clear
+be:   0   3 0001000001000001000001000001000001000001000001000001000001000001000
+is:   0   3 0001000001000001000001000001000001000001000001000001000001000001000
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+  8              0
+  9              2
+ 10              0
+ 11              0
+ 12              0
+ 13              0
+ 14              0
+ 15            128
+ 16              0
+ 17              0
+ 18              0
+ 19              0
+ 20              0
+ 21             32
+ 22              0
+ 23              0
+ 24              0
+ 25              0
+ 26              0
+ 27              8
+ 28              0
+ 29              0
+ 30              0
+ 31              0
+ 32              0
+ 33              2
+ 34              0
+ 35              0
+ 36              0
+ 37              0
+ 38              0
+ 39            128
+ 40              0
+ 41              0
+ 42              0
+ 43              0
+ 44              0
+ 45             32
+ 46              0
+ 47              0
+ 48              0
+ 49              0
+ 50              0
+ 51              8
+ 52              0
+ 53              0
+ 54              0
+ 55              0
+ 56              0
+ 57              2
+ 58              0
+ 59              0
+ 60              0
+ 61              0
+ 62              0
+ 63            128
+ 64              0
+ 65              0
+ 66              0
+
+test clearbits
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+
+test bit_nset and bit_nclear
+be:   0   1 0111111111111111111111111111111111111111111111111111111111111111110
+is:   0   1 0111111111111111111111111111111111111111111111111111111111111111110
+be:   0   1 0100000000000000000000000000000000000000000000000000000000000000010
+is:   0   1 0100000000000000000000000000000000000000000000000000000000000000010
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+be:  66   0 1111111111111111111111111111111111111111111111111111111111111111110
+is:  66   0 1111111111111111111111111111111111111111111111111111111111111111110
+be:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+is:   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111111111111111111111
+  1   0   1 0111111111111111111111111111111111111111111111111111111111111111111
+  2   0   2 0011111111111111111111111111111111111111111111111111111111111111111
+  3   0   3 0001111111111111111111111111111111111111111111111111111111111111111
+  4   0   4 0000111111111111111111111111111111111111111111111111111111111111111
+  5   0   5 0000011111111111111111111111111111111111111111111111111111111111111
+  6   0   6 0000001111111111111111111111111111111111111111111111111111111111111
+  7   0   7 0000000111111111111111111111111111111111111111111111111111111111111
+  8   0   8 0000000011111111111111111111111111111111111111111111111111111111111
+  9   0   9 0000000001111111111111111111111111111111111111111111111111111111111
+ 10   0  10 0000000000111111111111111111111111111111111111111111111111111111111
+ 11   0  11 0000000000011111111111111111111111111111111111111111111111111111111
+ 12   0  12 0000000000001111111111111111111111111111111111111111111111111111111
+ 13   0  13 0000000000000111111111111111111111111111111111111111111111111111111
+ 14   0  14 0000000000000011111111111111111111111111111111111111111111111111111
+ 15   0  15 0000000000000001111111111111111111111111111111111111111111111111111
+ 16   0  16 0000000000000000111111111111111111111111111111111111111111111111111
+ 17   0  17 0000000000000000011111111111111111111111111111111111111111111111111
+ 18   0  18 0000000000000000001111111111111111111111111111111111111111111111111
+ 19   0  19 0000000000000000000111111111111111111111111111111111111111111111111
+ 20   0  20 0000000000000000000011111111111111111111111111111111111111111111111
+ 21   0  21 0000000000000000000001111111111111111111111111111111111111111111111
+ 22   0  22 0000000000000000000000111111111111111111111111111111111111111111111
+ 23   0  23 0000000000000000000000011111111111111111111111111111111111111111111
+ 24   0  24 0000000000000000000000001111111111111111111111111111111111111111111
+ 25   0  25 0000000000000000000000000111111111111111111111111111111111111111111
+ 26   0  26 0000000000000000000000000011111111111111111111111111111111111111111
+ 27   0  27 0000000000000000000000000001111111111111111111111111111111111111111
+ 28   0  28 0000000000000000000000000000111111111111111111111111111111111111111
+ 29   0  29 0000000000000000000000000000011111111111111111111111111111111111111
+ 30   0  30 0000000000000000000000000000001111111111111111111111111111111111111
+ 31   0  31 0000000000000000000000000000000111111111111111111111111111111111111
+ 32   0  32 0000000000000000000000000000000011111111111111111111111111111111111
+ 33   0  33 0000000000000000000000000000000001111111111111111111111111111111111
+ 34   0  34 0000000000000000000000000000000000111111111111111111111111111111111
+ 35   0  35 0000000000000000000000000000000000011111111111111111111111111111111
+ 36   0  36 0000000000000000000000000000000000001111111111111111111111111111111
+ 37   0  37 0000000000000000000000000000000000000111111111111111111111111111111
+ 38   0  38 0000000000000000000000000000000000000011111111111111111111111111111
+ 39   0  39 0000000000000000000000000000000000000001111111111111111111111111111
+ 40   0  40 0000000000000000000000000000000000000000111111111111111111111111111
+ 41   0  41 0000000000000000000000000000000000000000011111111111111111111111111
+ 42   0  42 0000000000000000000000000000000000000000001111111111111111111111111
+ 43   0  43 0000000000000000000000000000000000000000000111111111111111111111111
+ 44   0  44 0000000000000000000000000000000000000000000011111111111111111111111
+ 45   0  45 0000000000000000000000000000000000000000000001111111111111111111111
+ 46   0  46 0000000000000000000000000000000000000000000000111111111111111111111
+ 47   0  47 0000000000000000000000000000000000000000000000011111111111111111111
+ 48   0  48 0000000000000000000000000000000000000000000000001111111111111111111
+ 49   0  49 0000000000000000000000000000000000000000000000000111111111111111111
+ 50   0  50 0000000000000000000000000000000000000000000000000011111111111111111
+ 51   0  51 0000000000000000000000000000000000000000000000000001111111111111111
+ 52   0  52 0000000000000000000000000000000000000000000000000000111111111111111
+ 53   0  53 0000000000000000000000000000000000000000000000000000011111111111111
+ 54   0  54 0000000000000000000000000000000000000000000000000000001111111111111
+ 55   0  55 0000000000000000000000000000000000000000000000000000000111111111111
+ 56   0  56 0000000000000000000000000000000000000000000000000000000011111111111
+ 57   0  57 0000000000000000000000000000000000000000000000000000000001111111111
+ 58   0  58 0000000000000000000000000000000000000000000000000000000000111111111
+ 59   0  59 0000000000000000000000000000000000000000000000000000000000011111111
+ 60   0  60 0000000000000000000000000000000000000000000000000000000000001111111
+ 61   0  61 0000000000000000000000000000000000000000000000000000000000000111111
+ 62   0  62 0000000000000000000000000000000000000000000000000000000000000011111
+ 63   0  63 0000000000000000000000000000000000000000000000000000000000000001111
+ 64   0  64 0000000000000000000000000000000000000000000000000000000000000000111
+ 65   0  65 0000000000000000000000000000000000000000000000000000000000000000011
+ 66   0  66 0000000000000000000000000000000000000000000000000000000000000000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+  1   1   0 1000000000000000000000000000000000000000000000000000000000000000000
+  2   2   0 1100000000000000000000000000000000000000000000000000000000000000000
+  3   3   0 1110000000000000000000000000000000000000000000000000000000000000000
+  4   4   0 1111000000000000000000000000000000000000000000000000000000000000000
+  5   5   0 1111100000000000000000000000000000000000000000000000000000000000000
+  6   6   0 1111110000000000000000000000000000000000000000000000000000000000000
+  7   7   0 1111111000000000000000000000000000000000000000000000000000000000000
+  8   8   0 1111111100000000000000000000000000000000000000000000000000000000000
+  9   9   0 1111111110000000000000000000000000000000000000000000000000000000000
+ 10  10   0 1111111111000000000000000000000000000000000000000000000000000000000
+ 11  11   0 1111111111100000000000000000000000000000000000000000000000000000000
+ 12  12   0 1111111111110000000000000000000000000000000000000000000000000000000
+ 13  13   0 1111111111111000000000000000000000000000000000000000000000000000000
+ 14  14   0 1111111111111100000000000000000000000000000000000000000000000000000
+ 15  15   0 1111111111111110000000000000000000000000000000000000000000000000000
+ 16  16   0 1111111111111111000000000000000000000000000000000000000000000000000
+ 17  17   0 1111111111111111100000000000000000000000000000000000000000000000000
+ 18  18   0 1111111111111111110000000000000000000000000000000000000000000000000
+ 19  19   0 1111111111111111111000000000000000000000000000000000000000000000000
+ 20  20   0 1111111111111111111100000000000000000000000000000000000000000000000
+ 21  21   0 1111111111111111111110000000000000000000000000000000000000000000000
+ 22  22   0 1111111111111111111111000000000000000000000000000000000000000000000
+ 23  23   0 1111111111111111111111100000000000000000000000000000000000000000000
+ 24  24   0 1111111111111111111111110000000000000000000000000000000000000000000
+ 25  25   0 1111111111111111111111111000000000000000000000000000000000000000000
+ 26  26   0 1111111111111111111111111100000000000000000000000000000000000000000
+ 27  27   0 1111111111111111111111111110000000000000000000000000000000000000000
+ 28  28   0 1111111111111111111111111111000000000000000000000000000000000000000
+ 29  29   0 1111111111111111111111111111100000000000000000000000000000000000000
+ 30  30   0 1111111111111111111111111111110000000000000000000000000000000000000
+ 31  31   0 1111111111111111111111111111111000000000000000000000000000000000000
+ 32  32   0 1111111111111111111111111111111100000000000000000000000000000000000
+ 33  33   0 1111111111111111111111111111111110000000000000000000000000000000000
+ 34  34   0 1111111111111111111111111111111111000000000000000000000000000000000
+ 35  35   0 1111111111111111111111111111111111100000000000000000000000000000000
+ 36  36   0 1111111111111111111111111111111111110000000000000000000000000000000
+ 37  37   0 1111111111111111111111111111111111111000000000000000000000000000000
+ 38  38   0 1111111111111111111111111111111111111100000000000000000000000000000
+ 39  39   0 1111111111111111111111111111111111111110000000000000000000000000000
+ 40  40   0 1111111111111111111111111111111111111111000000000000000000000000000
+ 41  41   0 1111111111111111111111111111111111111111100000000000000000000000000
+ 42  42   0 1111111111111111111111111111111111111111110000000000000000000000000
+ 43  43   0 1111111111111111111111111111111111111111111000000000000000000000000
+ 44  44   0 1111111111111111111111111111111111111111111100000000000000000000000
+ 45  45   0 1111111111111111111111111111111111111111111110000000000000000000000
+ 46  46   0 1111111111111111111111111111111111111111111111000000000000000000000
+ 47  47   0 1111111111111111111111111111111111111111111111100000000000000000000
+ 48  48   0 1111111111111111111111111111111111111111111111110000000000000000000
+ 49  49   0 1111111111111111111111111111111111111111111111111000000000000000000
+ 50  50   0 1111111111111111111111111111111111111111111111111100000000000000000
+ 51  51   0 1111111111111111111111111111111111111111111111111110000000000000000
+ 52  52   0 1111111111111111111111111111111111111111111111111111000000000000000
+ 53  53   0 1111111111111111111111111111111111111111111111111111100000000000000
+ 54  54   0 1111111111111111111111111111111111111111111111111111110000000000000
+ 55  55   0 1111111111111111111111111111111111111111111111111111111000000000000
+ 56  56   0 1111111111111111111111111111111111111111111111111111111100000000000
+ 57  57   0 1111111111111111111111111111111111111111111111111111111110000000000
+ 58  58   0 1111111111111111111111111111111111111111111111111111111111000000000
+ 59  59   0 1111111111111111111111111111111111111111111111111111111111100000000
+ 60  60   0 1111111111111111111111111111111111111111111111111111111111110000000
+ 61  61   0 1111111111111111111111111111111111111111111111111111111111111000000
+ 62  62   0 1111111111111111111111111111111111111111111111111111111111111100000
+ 63  63   0 1111111111111111111111111111111111111111111111111111111111111110000
+ 64  64   0 1111111111111111111111111111111111111111111111111111111111111111000
+ 65  65   0 1111111111111111111111111111111111111111111111111111111111111111100
+ 66  66   0 1111111111111111111111111111111111111111111111111111111111111111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 1111111111111111111111111111111111111111111111111111111111111111111
+  1  66   0 1111111111111111111111111111111111111111111111111111111111111111110
+  2  65   0 1111111111111111111111111111111111111111111111111111111111111111100
+  3  64   0 1111111111111111111111111111111111111111111111111111111111111111000
+  4  63   0 1111111111111111111111111111111111111111111111111111111111111110000
+  5  62   0 1111111111111111111111111111111111111111111111111111111111111100000
+  6  61   0 1111111111111111111111111111111111111111111111111111111111111000000
+  7  60   0 1111111111111111111111111111111111111111111111111111111111110000000
+  8  59   0 1111111111111111111111111111111111111111111111111111111111100000000
+  9  58   0 1111111111111111111111111111111111111111111111111111111111000000000
+ 10  57   0 1111111111111111111111111111111111111111111111111111111110000000000
+ 11  56   0 1111111111111111111111111111111111111111111111111111111100000000000
+ 12  55   0 1111111111111111111111111111111111111111111111111111111000000000000
+ 13  54   0 1111111111111111111111111111111111111111111111111111110000000000000
+ 14  53   0 1111111111111111111111111111111111111111111111111111100000000000000
+ 15  52   0 1111111111111111111111111111111111111111111111111111000000000000000
+ 16  51   0 1111111111111111111111111111111111111111111111111110000000000000000
+ 17  50   0 1111111111111111111111111111111111111111111111111100000000000000000
+ 18  49   0 1111111111111111111111111111111111111111111111111000000000000000000
+ 19  48   0 1111111111111111111111111111111111111111111111110000000000000000000
+ 20  47   0 1111111111111111111111111111111111111111111111100000000000000000000
+ 21  46   0 1111111111111111111111111111111111111111111111000000000000000000000
+ 22  45   0 1111111111111111111111111111111111111111111110000000000000000000000
+ 23  44   0 1111111111111111111111111111111111111111111100000000000000000000000
+ 24  43   0 1111111111111111111111111111111111111111111000000000000000000000000
+ 25  42   0 1111111111111111111111111111111111111111110000000000000000000000000
+ 26  41   0 1111111111111111111111111111111111111111100000000000000000000000000
+ 27  40   0 1111111111111111111111111111111111111111000000000000000000000000000
+ 28  39   0 1111111111111111111111111111111111111110000000000000000000000000000
+ 29  38   0 1111111111111111111111111111111111111100000000000000000000000000000
+ 30  37   0 1111111111111111111111111111111111111000000000000000000000000000000
+ 31  36   0 1111111111111111111111111111111111110000000000000000000000000000000
+ 32  35   0 1111111111111111111111111111111111100000000000000000000000000000000
+ 33  34   0 1111111111111111111111111111111111000000000000000000000000000000000
+ 34  33   0 1111111111111111111111111111111110000000000000000000000000000000000
+ 35  32   0 1111111111111111111111111111111100000000000000000000000000000000000
+ 36  31   0 1111111111111111111111111111111000000000000000000000000000000000000
+ 37  30   0 1111111111111111111111111111110000000000000000000000000000000000000
+ 38  29   0 1111111111111111111111111111100000000000000000000000000000000000000
+ 39  28   0 1111111111111111111111111111000000000000000000000000000000000000000
+ 40  27   0 1111111111111111111111111110000000000000000000000000000000000000000
+ 41  26   0 1111111111111111111111111100000000000000000000000000000000000000000
+ 42  25   0 1111111111111111111111111000000000000000000000000000000000000000000
+ 43  24   0 1111111111111111111111110000000000000000000000000000000000000000000
+ 44  23   0 1111111111111111111111100000000000000000000000000000000000000000000
+ 45  22   0 1111111111111111111111000000000000000000000000000000000000000000000
+ 46  21   0 1111111111111111111110000000000000000000000000000000000000000000000
+ 47  20   0 1111111111111111111100000000000000000000000000000000000000000000000
+ 48  19   0 1111111111111111111000000000000000000000000000000000000000000000000
+ 49  18   0 1111111111111111110000000000000000000000000000000000000000000000000
+ 50  17   0 1111111111111111100000000000000000000000000000000000000000000000000
+ 51  16   0 1111111111111111000000000000000000000000000000000000000000000000000
+ 52  15   0 1111111111111110000000000000000000000000000000000000000000000000000
+ 53  14   0 1111111111111100000000000000000000000000000000000000000000000000000
+ 54  13   0 1111111111111000000000000000000000000000000000000000000000000000000
+ 55  12   0 1111111111110000000000000000000000000000000000000000000000000000000
+ 56  11   0 1111111111100000000000000000000000000000000000000000000000000000000
+ 57  10   0 1111111111000000000000000000000000000000000000000000000000000000000
+ 58   9   0 1111111110000000000000000000000000000000000000000000000000000000000
+ 59   8   0 1111111100000000000000000000000000000000000000000000000000000000000
+ 60   7   0 1111111000000000000000000000000000000000000000000000000000000000000
+ 61   6   0 1111110000000000000000000000000000000000000000000000000000000000000
+ 62   5   0 1111100000000000000000000000000000000000000000000000000000000000000
+ 63   4   0 1111000000000000000000000000000000000000000000000000000000000000000
+ 64   3   0 1110000000000000000000000000000000000000000000000000000000000000000
+ 65   2   0 1100000000000000000000000000000000000000000000000000000000000000000
+ 66   1   0 1000000000000000000000000000000000000000000000000000000000000000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 0000000000000000000000000000000000000000000000000000000000000000000
+  1   0  66 0000000000000000000000000000000000000000000000000000000000000000001
+  2   0  65 0000000000000000000000000000000000000000000000000000000000000000011
+  3   0  64 0000000000000000000000000000000000000000000000000000000000000000111
+  4   0  63 0000000000000000000000000000000000000000000000000000000000000001111
+  5   0  62 0000000000000000000000000000000000000000000000000000000000000011111
+  6   0  61 0000000000000000000000000000000000000000000000000000000000000111111
+  7   0  60 0000000000000000000000000000000000000000000000000000000000001111111
+  8   0  59 0000000000000000000000000000000000000000000000000000000000011111111
+  9   0  58 0000000000000000000000000000000000000000000000000000000000111111111
+ 10   0  57 0000000000000000000000000000000000000000000000000000000001111111111
+ 11   0  56 0000000000000000000000000000000000000000000000000000000011111111111
+ 12   0  55 0000000000000000000000000000000000000000000000000000000111111111111
+ 13   0  54 0000000000000000000000000000000000000000000000000000001111111111111
+ 14   0  53 0000000000000000000000000000000000000000000000000000011111111111111
+ 15   0  52 0000000000000000000000000000000000000000000000000000111111111111111
+ 16   0  51 0000000000000000000000000000000000000000000000000001111111111111111
+ 17   0  50 0000000000000000000000000000000000000000000000000011111111111111111
+ 18   0  49 0000000000000000000000000000000000000000000000000111111111111111111
+ 19   0  48 0000000000000000000000000000000000000000000000001111111111111111111
+ 20   0  47 0000000000000000000000000000000000000000000000011111111111111111111
+ 21   0  46 0000000000000000000000000000000000000000000000111111111111111111111
+ 22   0  45 0000000000000000000000000000000000000000000001111111111111111111111
+ 23   0  44 0000000000000000000000000000000000000000000011111111111111111111111
+ 24   0  43 0000000000000000000000000000000000000000000111111111111111111111111
+ 25   0  42 0000000000000000000000000000000000000000001111111111111111111111111
+ 26   0  41 0000000000000000000000000000000000000000011111111111111111111111111
+ 27   0  40 0000000000000000000000000000000000000000111111111111111111111111111
+ 28   0  39 0000000000000000000000000000000000000001111111111111111111111111111
+ 29   0  38 0000000000000000000000000000000000000011111111111111111111111111111
+ 30   0  37 0000000000000000000000000000000000000111111111111111111111111111111
+ 31   0  36 0000000000000000000000000000000000001111111111111111111111111111111
+ 32   0  35 0000000000000000000000000000000000011111111111111111111111111111111
+ 33   0  34 0000000000000000000000000000000000111111111111111111111111111111111
+ 34   0  33 0000000000000000000000000000000001111111111111111111111111111111111
+ 35   0  32 0000000000000000000000000000000011111111111111111111111111111111111
+ 36   0  31 0000000000000000000000000000000111111111111111111111111111111111111
+ 37   0  30 0000000000000000000000000000001111111111111111111111111111111111111
+ 38   0  29 0000000000000000000000000000011111111111111111111111111111111111111
+ 39   0  28 0000000000000000000000000000111111111111111111111111111111111111111
+ 40   0  27 0000000000000000000000000001111111111111111111111111111111111111111
+ 41   0  26 0000000000000000000000000011111111111111111111111111111111111111111
+ 42   0  25 0000000000000000000000000111111111111111111111111111111111111111111
+ 43   0  24 0000000000000000000000001111111111111111111111111111111111111111111
+ 44   0  23 0000000000000000000000011111111111111111111111111111111111111111111
+ 45   0  22 0000000000000000000000111111111111111111111111111111111111111111111
+ 46   0  21 0000000000000000000001111111111111111111111111111111111111111111111
+ 47   0  20 0000000000000000000011111111111111111111111111111111111111111111111
+ 48   0  19 0000000000000000000111111111111111111111111111111111111111111111111
+ 49   0  18 0000000000000000001111111111111111111111111111111111111111111111111
+ 50   0  17 0000000000000000011111111111111111111111111111111111111111111111111
+ 51   0  16 0000000000000000111111111111111111111111111111111111111111111111111
+ 52   0  15 0000000000000001111111111111111111111111111111111111111111111111111
+ 53   0  14 0000000000000011111111111111111111111111111111111111111111111111111
+ 54   0  13 0000000000000111111111111111111111111111111111111111111111111111111
+ 55   0  12 0000000000001111111111111111111111111111111111111111111111111111111
+ 56   0  11 0000000000011111111111111111111111111111111111111111111111111111111
+ 57   0  10 0000000000111111111111111111111111111111111111111111111111111111111
+ 58   0   9 0000000001111111111111111111111111111111111111111111111111111111111
+ 59   0   8 0000000011111111111111111111111111111111111111111111111111111111111
+ 60   0   7 0000000111111111111111111111111111111111111111111111111111111111111
+ 61   0   6 0000001111111111111111111111111111111111111111111111111111111111111
+ 62   0   5 0000011111111111111111111111111111111111111111111111111111111111111
+ 63   0   4 0000111111111111111111111111111111111111111111111111111111111111111
+ 64   0   3 0001111111111111111111111111111111111111111111111111111111111111111
+ 65   0   2 0011111111111111111111111111111111111111111111111111111111111111111
+ 66   0   1 0111111111111111111111111111111111111111111111111111111111111111111
+
+0 bit should move right 1 position each line
+  0   0   1 0111111111111111111111111111111111111111111111111111111111111111111
+  1   1   0 1011111111111111111111111111111111111111111111111111111111111111111
+  2   2   0 1101111111111111111111111111111111111111111111111111111111111111111
+  3   3   0 1110111111111111111111111111111111111111111111111111111111111111111
+  4   4   0 1111011111111111111111111111111111111111111111111111111111111111111
+  5   5   0 1111101111111111111111111111111111111111111111111111111111111111111
+  6   6   0 1111110111111111111111111111111111111111111111111111111111111111111
+  7   7   0 1111111011111111111111111111111111111111111111111111111111111111111
+  8   8   0 1111111101111111111111111111111111111111111111111111111111111111111
+  9   9   0 1111111110111111111111111111111111111111111111111111111111111111111
+ 10  10   0 1111111111011111111111111111111111111111111111111111111111111111111
+ 11  11   0 1111111111101111111111111111111111111111111111111111111111111111111
+ 12  12   0 1111111111110111111111111111111111111111111111111111111111111111111
+ 13  13   0 1111111111111011111111111111111111111111111111111111111111111111111
+ 14  14   0 1111111111111101111111111111111111111111111111111111111111111111111
+ 15  15   0 1111111111111110111111111111111111111111111111111111111111111111111
+ 16  16   0 1111111111111111011111111111111111111111111111111111111111111111111
+ 17  17   0 1111111111111111101111111111111111111111111111111111111111111111111
+ 18  18   0 1111111111111111110111111111111111111111111111111111111111111111111
+ 19  19   0 1111111111111111111011111111111111111111111111111111111111111111111
+ 20  20   0 1111111111111111111101111111111111111111111111111111111111111111111
+ 21  21   0 1111111111111111111110111111111111111111111111111111111111111111111
+ 22  22   0 1111111111111111111111011111111111111111111111111111111111111111111
+ 23  23   0 1111111111111111111111101111111111111111111111111111111111111111111
+ 24  24   0 1111111111111111111111110111111111111111111111111111111111111111111
+ 25  25   0 1111111111111111111111111011111111111111111111111111111111111111111
+ 26  26   0 1111111111111111111111111101111111111111111111111111111111111111111
+ 27  27   0 1111111111111111111111111110111111111111111111111111111111111111111
+ 28  28   0 1111111111111111111111111111011111111111111111111111111111111111111
+ 29  29   0 1111111111111111111111111111101111111111111111111111111111111111111
+ 30  30   0 1111111111111111111111111111110111111111111111111111111111111111111
+ 31  31   0 1111111111111111111111111111111011111111111111111111111111111111111
+ 32  32   0 1111111111111111111111111111111101111111111111111111111111111111111
+ 33  33   0 1111111111111111111111111111111110111111111111111111111111111111111
+ 34  34   0 1111111111111111111111111111111111011111111111111111111111111111111
+ 35  35   0 1111111111111111111111111111111111101111111111111111111111111111111
+ 36  36   0 1111111111111111111111111111111111110111111111111111111111111111111
+ 37  37   0 1111111111111111111111111111111111111011111111111111111111111111111
+ 38  38   0 1111111111111111111111111111111111111101111111111111111111111111111
+ 39  39   0 1111111111111111111111111111111111111110111111111111111111111111111
+ 40  40   0 1111111111111111111111111111111111111111011111111111111111111111111
+ 41  41   0 1111111111111111111111111111111111111111101111111111111111111111111
+ 42  42   0 1111111111111111111111111111111111111111110111111111111111111111111
+ 43  43   0 1111111111111111111111111111111111111111111011111111111111111111111
+ 44  44   0 1111111111111111111111111111111111111111111101111111111111111111111
+ 45  45   0 1111111111111111111111111111111111111111111110111111111111111111111
+ 46  46   0 1111111111111111111111111111111111111111111111011111111111111111111
+ 47  47   0 1111111111111111111111111111111111111111111111101111111111111111111
+ 48  48   0 1111111111111111111111111111111111111111111111110111111111111111111
+ 49  49   0 1111111111111111111111111111111111111111111111111011111111111111111
+ 50  50   0 1111111111111111111111111111111111111111111111111101111111111111111
+ 51  51   0 1111111111111111111111111111111111111111111111111110111111111111111
+ 52  52   0 1111111111111111111111111111111111111111111111111111011111111111111
+ 53  53   0 1111111111111111111111111111111111111111111111111111101111111111111
+ 54  54   0 1111111111111111111111111111111111111111111111111111110111111111111
+ 55  55   0 1111111111111111111111111111111111111111111111111111111011111111111
+ 56  56   0 1111111111111111111111111111111111111111111111111111111101111111111
+ 57  57   0 1111111111111111111111111111111111111111111111111111111110111111111
+ 58  58   0 1111111111111111111111111111111111111111111111111111111111011111111
+ 59  59   0 1111111111111111111111111111111111111111111111111111111111101111111
+ 60  60   0 1111111111111111111111111111111111111111111111111111111111110111111
+ 61  61   0 1111111111111111111111111111111111111111111111111111111111111011111
+ 62  62   0 1111111111111111111111111111111111111111111111111111111111111101111
+ 63  63   0 1111111111111111111111111111111111111111111111111111111111111110111
+ 64  64   0 1111111111111111111111111111111111111111111111111111111111111111011
+ 65  65   0 1111111111111111111111111111111111111111111111111111111111111111101
+ 66  66   0 1111111111111111111111111111111111111111111111111111111111111111110
+
+1 bit should move right 1 position each line
+  0   1   0 1000000000000000000000000000000000000000000000000000000000000000000
+  1   0   1 0100000000000000000000000000000000000000000000000000000000000000000
+  2   0   2 0010000000000000000000000000000000000000000000000000000000000000000
+  3   0   3 0001000000000000000000000000000000000000000000000000000000000000000
+  4   0   4 0000100000000000000000000000000000000000000000000000000000000000000
+  5   0   5 0000010000000000000000000000000000000000000000000000000000000000000
+  6   0   6 0000001000000000000000000000000000000000000000000000000000000000000
+  7   0   7 0000000100000000000000000000000000000000000000000000000000000000000
+  8   0   8 0000000010000000000000000000000000000000000000000000000000000000000
+  9   0   9 0000000001000000000000000000000000000000000000000000000000000000000
+ 10   0  10 0000000000100000000000000000000000000000000000000000000000000000000
+ 11   0  11 0000000000010000000000000000000000000000000000000000000000000000000
+ 12   0  12 0000000000001000000000000000000000000000000000000000000000000000000
+ 13   0  13 0000000000000100000000000000000000000000000000000000000000000000000
+ 14   0  14 0000000000000010000000000000000000000000000000000000000000000000000
+ 15   0  15 0000000000000001000000000000000000000000000000000000000000000000000
+ 16   0  16 0000000000000000100000000000000000000000000000000000000000000000000
+ 17   0  17 0000000000000000010000000000000000000000000000000000000000000000000
+ 18   0  18 0000000000000000001000000000000000000000000000000000000000000000000
+ 19   0  19 0000000000000000000100000000000000000000000000000000000000000000000
+ 20   0  20 0000000000000000000010000000000000000000000000000000000000000000000
+ 21   0  21 0000000000000000000001000000000000000000000000000000000000000000000
+ 22   0  22 0000000000000000000000100000000000000000000000000000000000000000000
+ 23   0  23 0000000000000000000000010000000000000000000000000000000000000000000
+ 24   0  24 0000000000000000000000001000000000000000000000000000000000000000000
+ 25   0  25 0000000000000000000000000100000000000000000000000000000000000000000
+ 26   0  26 0000000000000000000000000010000000000000000000000000000000000000000
+ 27   0  27 0000000000000000000000000001000000000000000000000000000000000000000
+ 28   0  28 0000000000000000000000000000100000000000000000000000000000000000000
+ 29   0  29 0000000000000000000000000000010000000000000000000000000000000000000
+ 30   0  30 0000000000000000000000000000001000000000000000000000000000000000000
+ 31   0  31 0000000000000000000000000000000100000000000000000000000000000000000
+ 32   0  32 0000000000000000000000000000000010000000000000000000000000000000000
+ 33   0  33 0000000000000000000000000000000001000000000000000000000000000000000
+ 34   0  34 0000000000000000000000000000000000100000000000000000000000000000000
+ 35   0  35 0000000000000000000000000000000000010000000000000000000000000000000
+ 36   0  36 0000000000000000000000000000000000001000000000000000000000000000000
+ 37   0  37 0000000000000000000000000000000000000100000000000000000000000000000
+ 38   0  38 0000000000000000000000000000000000000010000000000000000000000000000
+ 39   0  39 0000000000000000000000000000000000000001000000000000000000000000000
+ 40   0  40 0000000000000000000000000000000000000000100000000000000000000000000
+ 41   0  41 0000000000000000000000000000000000000000010000000000000000000000000
+ 42   0  42 0000000000000000000000000000000000000000001000000000000000000000000
+ 43   0  43 0000000000000000000000000000000000000000000100000000000000000000000
+ 44   0  44 0000000000000000000000000000000000000000000010000000000000000000000
+ 45   0  45 0000000000000000000000000000000000000000000001000000000000000000000
+ 46   0  46 0000000000000000000000000000000000000000000000100000000000000000000
+ 47   0  47 0000000000000000000000000000000000000000000000010000000000000000000
+ 48   0  48 0000000000000000000000000000000000000000000000001000000000000000000
+ 49   0  49 0000000000000000000000000000000000000000000000000100000000000000000
+ 50   0  50 0000000000000000000000000000000000000000000000000010000000000000000
+ 51   0  51 0000000000000000000000000000000000000000000000000001000000000000000
+ 52   0  52 0000000000000000000000000000000000000000000000000000100000000000000
+ 53   0  53 0000000000000000000000000000000000000000000000000000010000000000000
+ 54   0  54 0000000000000000000000000000000000000000000000000000001000000000000
+ 55   0  55 0000000000000000000000000000000000000000000000000000000100000000000
+ 56   0  56 0000000000000000000000000000000000000000000000000000000010000000000
+ 57   0  57 0000000000000000000000000000000000000000000000000000000001000000000
+ 58   0  58 0000000000000000000000000000000000000000000000000000000000100000000
+ 59   0  59 0000000000000000000000000000000000000000000000000000000000010000000
+ 60   0  60 0000000000000000000000000000000000000000000000000000000000001000000
+ 61   0  61 0000000000000000000000000000000000000000000000000000000000000100000
+ 62   0  62 0000000000000000000000000000000000000000000000000000000000000010000
+ 63   0  63 0000000000000000000000000000000000000000000000000000000000000001000
+ 64   0  64 0000000000000000000000000000000000000000000000000000000000000000100
+ 65   0  65 0000000000000000000000000000000000000000000000000000000000000000010
+ 66   0  66 0000000000000000000000000000000000000000000000000000000000000000001
diff --git a/contrib/netbsd-tests/include/d_bitstring_8.out b/contrib/netbsd-tests/include/d_bitstring_8.out
new file mode 100644
index 000000000000..aba64404b457
--- /dev/null
+++ b/contrib/netbsd-tests/include/d_bitstring_8.out
@@ -0,0 +1,111 @@
+Testing with TEST_LENGTH = 8
+
+test _bit_byte, _bit_mask, and bitstr_size
+  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)
+  0              0              1              0
+  1              0              2              1
+  2              0              4              1
+  3              0              8              1
+  4              0             16              1
+  5              0             32              1
+  6              0             64              1
+  7              0            128              1
+
+test bit_alloc, clearbits, bit_ffc, bit_ffs
+be:   0  -1 00000000
+is:   0  -1 00000000
+
+test bit_set
+be:   1   0 10010010
+is:   1   0 10010010
+
+test bit_clear
+be:   0   3 00010000
+is:   0   3 00010000
+
+test bit_test using previous bitstring
+  i    bit_test(i)
+  0              0
+  1              0
+  2              0
+  3              8
+  4              0
+  5              0
+  6              0
+  7              0
+
+test clearbits
+be:   0  -1 00000000
+is:   0  -1 00000000
+
+test bit_nset and bit_nclear
+be:   0   1 01111110
+is:   0   1 01111110
+be:   0   1 01000010
+is:   0   1 01000010
+be:   0  -1 00000000
+is:   0  -1 00000000
+be:   7   0 11111110
+is:   7   0 11111110
+be:   0  -1 00000000
+is:   0  -1 00000000
+
+first 1 bit should move right 1 position each line
+  0  -1   0 11111111
+  1   0   1 01111111
+  2   0   2 00111111
+  3   0   3 00011111
+  4   0   4 00001111
+  5   0   5 00000111
+  6   0   6 00000011
+  7   0   7 00000001
+
+first 0 bit should move right 1 position each line
+  0   0  -1 00000000
+  1   1   0 10000000
+  2   2   0 11000000
+  3   3   0 11100000
+  4   4   0 11110000
+  5   5   0 11111000
+  6   6   0 11111100
+  7   7   0 11111110
+
+first 0 bit should move left 1 position each line
+  0  -1   0 11111111
+  1   7   0 11111110
+  2   6   0 11111100
+  3   5   0 11111000
+  4   4   0 11110000
+  5   3   0 11100000
+  6   2   0 11000000
+  7   1   0 10000000
+
+first 1 bit should move left 1 position each line
+  0   0  -1 00000000
+  1   0   7 00000001
+  2   0   6 00000011
+  3   0   5 00000111
+  4   0   4 00001111
+  5   0   3 00011111
+  6   0   2 00111111
+  7   0   1 01111111
+
+0 bit should move right 1 position each line
+  0   0   1 01111111
+  1   1   0 10111111
+  2   2   0 11011111
+  3   3   0 11101111
+  4   4   0 11110111
+  5   5   0 11111011
+  6   6   0 11111101
+  7   7   0 11111110
+
+1 bit should move right 1 position each line
+  0   1   0 10000000
+  1   0   1 01000000
+  2   0   2 00100000
+  3   0   3 00010000
+  4   0   4 00001000
+  5   0   5 00000100
+  6   0   6 00000010
+  7   0   7 00000001
diff --git a/contrib/netbsd-tests/include/machine/t_bswap.c b/contrib/netbsd-tests/include/machine/t_bswap.c
new file mode 100644
index 000000000000..a7bb42a85ffc
--- /dev/null
+++ b/contrib/netbsd-tests/include/machine/t_bswap.c
@@ -0,0 +1,178 @@
+/* $NetBSD: t_bswap.c,v 1.1 2011/05/05 05:39:11 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bswap.c,v 1.1 2011/05/05 05:39:11 jruoho Exp $");
+
+#include <sys/types.h>
+#include <machine/bswap.h>
+
+#include <atf-c.h>
+
+static uint16_t x16;
+static uint32_t x32;
+static uint64_t x64;
+
+static uint16_t	unconst16(uint16_t);
+static uint32_t	unconst32(uint32_t);
+static uint64_t	unconst64(uint64_t);
+
+/*
+ * Given the use of __builtin_constant_p(3),
+ * these functions try to avoid gcc(1) from
+ * treating the arguments as constants.
+ */
+static uint16_t
+unconst16(uint16_t val)
+{
+	return val + x16;
+}
+
+static uint32_t
+unconst32(uint32_t val)
+{
+	return val + x32;
+}
+
+static uint64_t
+unconst64(uint64_t val)
+{
+	return val + x64;
+}
+
+ATF_TC(bswap16_basic);
+ATF_TC_HEAD(bswap16_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap16(3), #1");
+}
+
+ATF_TC_BODY(bswap16_basic, tc)
+{
+	ATF_REQUIRE_EQ(bswap16(0x0000), 0x0000);
+	ATF_REQUIRE_EQ(bswap16(0xff00), 0x00ff);
+	ATF_REQUIRE_EQ(bswap16(0xffff), 0xffff);
+	ATF_REQUIRE_EQ(bswap16(0x1234), 0x3412);
+}
+
+ATF_TC(bswap16_unconst);
+ATF_TC_HEAD(bswap16_unconst, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap16(3), #2");
+}
+
+ATF_TC_BODY(bswap16_unconst, tc)
+{
+	x16 = 0;
+
+	ATF_REQUIRE_EQ(bswap16(unconst16(0x0000)), 0x0000);
+	ATF_REQUIRE_EQ(bswap16(unconst16(0xff00)), 0x00ff);
+	ATF_REQUIRE_EQ(bswap16(unconst16(0xffff)), 0xffff);
+	ATF_REQUIRE_EQ(bswap16(unconst16(0x1234)), 0x3412);
+}
+
+ATF_TC(bswap32_basic);
+ATF_TC_HEAD(bswap32_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap32(3), #1");
+}
+
+ATF_TC_BODY(bswap32_basic, tc)
+{
+	ATF_REQUIRE_EQ(bswap32(0x00000000), 0x00000000);
+	ATF_REQUIRE_EQ(bswap32(0xffff0000), 0x0000ffff);
+	ATF_REQUIRE_EQ(bswap32(0xffffffff), 0xffffffff);
+	ATF_REQUIRE_EQ(bswap32(0x12345678), 0x78563412);
+}
+
+ATF_TC(bswap32_unconst);
+ATF_TC_HEAD(bswap32_unconst, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap32(3), #2");
+}
+
+ATF_TC_BODY(bswap32_unconst, tc)
+{
+	x32 = 0;
+
+	ATF_REQUIRE_EQ(bswap32(unconst32(0x00000000)), 0x00000000);
+	ATF_REQUIRE_EQ(bswap32(unconst32(0xffff0000)), 0x0000ffff);
+	ATF_REQUIRE_EQ(bswap32(unconst32(0xffffffff)), 0xffffffff);
+	ATF_REQUIRE_EQ(bswap32(unconst32(0x12345678)), 0x78563412);
+}
+
+ATF_TC(bswap64_basic);
+ATF_TC_HEAD(bswap64_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap64(3), #1");
+}
+
+ATF_TC_BODY(bswap64_basic, tc)
+{
+	ATF_REQUIRE_EQ(bswap64(0x0000000000000000), 0x0000000000000000);
+	ATF_REQUIRE_EQ(bswap64(0xffffffff00000000), 0x00000000ffffffff);
+	ATF_REQUIRE_EQ(bswap64(0xffffffffffffffff), 0xffffffffffffffff);
+	ATF_REQUIRE_EQ(bswap64(0x123456789abcdeff), 0xffdebc9a78563412);
+}
+
+ATF_TC(bswap64_unconst);
+ATF_TC_HEAD(bswap64_unconst, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of bswap64(3), #2");
+}
+
+ATF_TC_BODY(bswap64_unconst, tc)
+{
+	x64 = 0;
+
+	ATF_REQUIRE_EQ(bswap64(unconst64(0x0000000000000000)),
+	    0x0000000000000000);
+
+	ATF_REQUIRE_EQ(bswap64(unconst64(0xffffffff00000000)),
+	    0x00000000ffffffff);
+
+	ATF_REQUIRE_EQ(bswap64(unconst64(0xffffffffffffffff)),
+	    0xffffffffffffffff);
+
+	ATF_REQUIRE_EQ(bswap64(unconst64(0x123456789abcdeff)),
+	    0xffdebc9a78563412);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, bswap16_basic);
+	ATF_TP_ADD_TC(tp, bswap16_unconst);
+	ATF_TP_ADD_TC(tp, bswap32_basic);
+	ATF_TP_ADD_TC(tp, bswap32_unconst);
+	ATF_TP_ADD_TC(tp, bswap64_basic);
+	ATF_TP_ADD_TC(tp, bswap64_unconst);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_bitops.c b/contrib/netbsd-tests/include/sys/t_bitops.c
new file mode 100644
index 000000000000..7c90da0d4c0d
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_bitops.c
@@ -0,0 +1,238 @@
+/*	$NetBSD: t_bitops.c,v 1.16 2012/12/07 02:28:19 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas and Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bitops.c,v 1.16 2012/12/07 02:28:19 christos Exp $");
+
+#include <atf-c.h>
+
+#include <sys/cdefs.h>
+#include <sys/bitops.h>
+
+#include <math.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const struct {
+	uint32_t	val;
+	int		ffs;
+	int		fls;
+} bits[] = {
+
+	{ 0x00, 0, 0 }, { 0x01, 1, 1 },	{ 0x02, 2, 2 },	{ 0x03, 1, 2 },
+	{ 0x04, 3, 3 }, { 0x05, 1, 3 },	{ 0x06, 2, 3 },	{ 0x07, 1, 3 },
+	{ 0x08, 4, 4 }, { 0x09, 1, 4 },	{ 0x0A, 2, 4 },	{ 0x0B, 1, 4 },
+	{ 0x0C, 3, 4 }, { 0x0D, 1, 4 },	{ 0x0E, 2, 4 },	{ 0x0F, 1, 4 },
+
+	{ 0x10, 5, 5 },	{ 0x11, 1, 5 },	{ 0x12, 2, 5 },	{ 0x13, 1, 5 },
+	{ 0x14, 3, 5 },	{ 0x15, 1, 5 },	{ 0x16, 2, 5 },	{ 0x17, 1, 5 },
+	{ 0x18, 4, 5 },	{ 0x19, 1, 5 },	{ 0x1A, 2, 5 },	{ 0x1B, 1, 5 },
+	{ 0x1C, 3, 5 },	{ 0x1D, 1, 5 },	{ 0x1E, 2, 5 },	{ 0x1F, 1, 5 },
+
+	{ 0xF0, 5, 8 },	{ 0xF1, 1, 8 },	{ 0xF2, 2, 8 },	{ 0xF3, 1, 8 },
+	{ 0xF4, 3, 8 },	{ 0xF5, 1, 8 },	{ 0xF6, 2, 8 },	{ 0xF7, 1, 8 },
+	{ 0xF8, 4, 8 },	{ 0xF9, 1, 8 },	{ 0xFA, 2, 8 },	{ 0xFB, 1, 8 },
+	{ 0xFC, 3, 8 },	{ 0xFD, 1, 8 },	{ 0xFE, 2, 8 },	{ 0xFF, 1, 8 },
+
+};
+
+ATF_TC(bitmap_basic);
+ATF_TC_HEAD(bitmap_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "A basic test of __BITMAP_*");
+}
+
+ATF_TC_BODY(bitmap_basic, tc)
+{
+	__BITMAP_TYPE(, uint32_t, 65536) bm;
+	__BITMAP_ZERO(&bm);
+
+	ATF_REQUIRE(__BITMAP_SIZE(uint32_t, 65536) == 2048);
+
+	ATF_REQUIRE(__BITMAP_SHIFT(uint32_t) == 5);
+
+	ATF_REQUIRE(__BITMAP_MASK(uint32_t) == 31);
+
+	for (size_t i = 0; i < 65536; i += 2)
+		__BITMAP_SET(i, &bm);
+
+	for (size_t i = 0; i < 2048; i++)
+		ATF_REQUIRE(bm._b[i] == 0x55555555);
+
+	for (size_t i = 0; i < 65536; i++)
+		if (i & 1)
+			ATF_REQUIRE(!__BITMAP_ISSET(i, &bm));
+		else {
+			ATF_REQUIRE(__BITMAP_ISSET(i, &bm));
+			__BITMAP_CLR(i, &bm);
+		}
+
+	for (size_t i = 0; i < 65536; i += 2)
+		ATF_REQUIRE(!__BITMAP_ISSET(i, &bm));
+}
+
+ATF_TC(fast_divide32);
+ATF_TC_HEAD(fast_divide32, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fast_divide32(3)");
+}
+
+ATF_TC_BODY(fast_divide32, tc)
+{
+	uint32_t a, b, q, r, m;
+	uint8_t i, s1, s2;
+
+	a = 0xFFFF;
+	b = 0x000F;
+
+	fast_divide32_prepare(b, &m, &s1, &s2);
+
+	q = fast_divide32(a, b, m, s1, s2);
+	r = fast_remainder32(a, b, m, s1, s2);
+
+	ATF_REQUIRE(q == 0x1111 && r == 0);
+
+	for (i = 1; i < __arraycount(bits); i++) {
+
+		a = bits[i].val;
+		b = bits[i].ffs;
+
+		fast_divide32_prepare(b, &m, &s1, &s2);
+
+		q = fast_divide32(a, b, m, s1, s2);
+		r = fast_remainder32(a, b, m, s1, s2);
+
+		ATF_REQUIRE(q == a / b);
+		ATF_REQUIRE(r == a % b);
+	}
+}
+
+ATF_TC(ffsfls);
+ATF_TC_HEAD(ffsfls, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ffs32(3)-family for correctness");
+}
+
+ATF_TC_BODY(ffsfls, tc)
+{
+	uint8_t i;
+
+	ATF_REQUIRE(ffs32(0) == 0x00);
+	ATF_REQUIRE(fls32(0) == 0x00);
+	ATF_REQUIRE(ffs64(0) == 0x00);
+	ATF_REQUIRE(fls64(0) == 0x00);
+
+	ATF_REQUIRE(ffs32(UINT32_MAX) == 0x01);
+	ATF_REQUIRE(fls32(UINT32_MAX) == 0x20);
+	ATF_REQUIRE(ffs64(UINT64_MAX) == 0x01);
+	ATF_REQUIRE(fls64(UINT64_MAX) == 0x40);
+
+	for (i = 1; i < __arraycount(bits); i++) {
+
+		ATF_REQUIRE(ffs32(bits[i].val) == bits[i].ffs);
+		ATF_REQUIRE(fls32(bits[i].val) == bits[i].fls);
+		ATF_REQUIRE(ffs64(bits[i].val) == bits[i].ffs);
+		ATF_REQUIRE(fls64(bits[i].val) == bits[i].fls);
+
+		ATF_REQUIRE(ffs32(bits[i].val << 1) == bits[i].ffs + 1);
+		ATF_REQUIRE(fls32(bits[i].val << 1) == bits[i].fls + 1);
+		ATF_REQUIRE(ffs64(bits[i].val << 1) == bits[i].ffs + 1);
+		ATF_REQUIRE(fls64(bits[i].val << 1) == bits[i].fls + 1);
+
+		ATF_REQUIRE(ffs32(bits[i].val << 9) == bits[i].ffs + 9);
+		ATF_REQUIRE(fls32(bits[i].val << 9) == bits[i].fls + 9);
+		ATF_REQUIRE(ffs64(bits[i].val << 9) == bits[i].ffs + 9);
+		ATF_REQUIRE(fls64(bits[i].val << 9) == bits[i].fls + 9);
+	}
+}
+
+ATF_TC(ilog2_basic);
+ATF_TC_HEAD(ilog2_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ilog2(3) for correctness");
+}
+
+ATF_TC_BODY(ilog2_basic, tc)
+{
+	uint64_t i, x;
+
+	for (i = x = 0; i < 64; i++) {
+
+		x = (uint64_t)1 << i;
+
+		ATF_REQUIRE(i == (uint64_t)ilog2(x));
+	}
+}
+
+ATF_TC(ilog2_log2);
+ATF_TC_HEAD(ilog2_log2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(3) vs. ilog2(3)");
+}
+
+ATF_TC_BODY(ilog2_log2, tc)
+{
+#ifdef __vax__
+	atf_tc_skip("Test is unavailable on vax because of lack of log2()");
+#else
+	double  x, y;
+	uint64_t i;
+
+	/*
+	 * This may fail under QEMU; see PR misc/44767.
+	 */
+	for (i = 1; i < UINT32_MAX; i += UINT16_MAX) {
+
+		x = log2(i);
+		y = (double)(ilog2(i));
+
+		ATF_REQUIRE(ceil(x) >= y);
+
+		if (fabs(floor(x) - y) > 1.0e-40) {
+			atf_tc_expect_fail("PR misc/44767");
+			atf_tc_fail("log2(%"PRIu64") != "
+			    "ilog2(%"PRIu64")", i, i);
+		}
+	}
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+        ATF_TP_ADD_TC(tp, bitmap_basic);
+	ATF_TP_ADD_TC(tp, fast_divide32);
+	ATF_TP_ADD_TC(tp, ffsfls);
+	ATF_TP_ADD_TC(tp, ilog2_basic);
+	ATF_TP_ADD_TC(tp, ilog2_log2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_bootblock.c b/contrib/netbsd-tests/include/sys/t_bootblock.c
new file mode 100644
index 000000000000..13af2dd05829
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_bootblock.c
@@ -0,0 +1,73 @@
+/* $NetBSD: t_bootblock.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2004, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_bootblock.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $");
+
+#include <sys/types.h>
+#include <sys/bootblock.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+ATF_TC_WITHOUT_HEAD(mbr_sector);
+ATF_TC_BODY(mbr_sector, tc)
+{
+	ATF_CHECK_EQ(512, sizeof(struct mbr_sector));
+
+	ATF_CHECK_EQ(MBR_BPB_OFFSET, offsetof(struct mbr_sector, mbr_bpb));
+	ATF_CHECK_EQ(MBR_BS_OFFSET,  offsetof(struct mbr_sector, mbr_bootsel));
+
+	ATF_CHECK_EQ(440, offsetof(struct mbr_sector, mbr_dsn));
+
+	ATF_CHECK_EQ(446, MBR_PART_OFFSET);
+	ATF_CHECK_EQ(MBR_PART_OFFSET, offsetof(struct mbr_sector, mbr_parts));
+
+	ATF_CHECK_EQ(510, MBR_MAGIC_OFFSET);
+	ATF_CHECK_EQ(MBR_MAGIC_OFFSET, offsetof(struct mbr_sector, mbr_magic));
+}
+
+ATF_TC_WITHOUT_HEAD(mbr_partition);
+ATF_TC_BODY(mbr_partition, tc)
+{
+	ATF_CHECK_EQ(16, sizeof(struct mbr_partition));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mbr_sector);
+	ATF_TP_ADD_TC(tp, mbr_partition);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_cdefs.c b/contrib/netbsd-tests/include/sys/t_cdefs.c
new file mode 100644
index 000000000000..a47300969fc9
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_cdefs.c
@@ -0,0 +1,267 @@
+/* $NetBSD: t_cdefs.c,v 1.3 2013/09/05 09:01:27 gsutre Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_cdefs.c,v 1.3 2013/09/05 09:01:27 gsutre Exp $");
+
+#include <atf-c.h>
+#include <sys/types.h>
+#include <limits.h>
+#include <stdint.h>
+
+static const struct {
+	const char *name;
+	intmax_t min;
+	intmax_t max;
+} s[] = {
+	{ "signed char", SCHAR_MIN, SCHAR_MAX },
+	{ "signed short", SHRT_MIN, SHRT_MAX },
+	{ "signed int", INT_MIN, INT_MAX },
+	{ "signed long", LONG_MIN, LONG_MAX },
+	{ "signed long long", LLONG_MIN, LLONG_MAX },
+};
+
+static const struct {
+	const char *name;
+	uintmax_t min;
+	uintmax_t max;
+} u[] = {
+	{ "unsigned char", 0, UCHAR_MAX },
+	{ "unsigned short", 0, USHRT_MAX },
+	{ "unsigned int", 0, UINT_MAX },
+	{ "unsigned long", 0, ULONG_MAX },
+	{ "unsigned long long", 0, ULLONG_MAX },
+};
+
+ATF_TC(stypeminmax);
+ATF_TC_HEAD(stypeminmax, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks signed type min/max macros");
+}
+
+
+ATF_TC_BODY(stypeminmax, tc)
+{
+#define CHECK(a, b) ATF_REQUIRE(__type_min(a) == s[b].min); \
+    ATF_REQUIRE(__type_max(a) == s[b].max)
+
+	CHECK(signed char, 0);
+	CHECK(signed short, 1);
+	CHECK(signed int, 2);
+	CHECK(signed long, 3);
+	CHECK(signed long long, 4);
+#undef CHECK
+}
+
+ATF_TC(utypeminmax);
+ATF_TC_HEAD(utypeminmax, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks unsigned type min/max macros");
+}
+
+ATF_TC_BODY(utypeminmax, tc)
+{
+#define CHECK(a, b) ATF_REQUIRE(__type_min(a) == u[b].min); \
+    ATF_REQUIRE(__type_max(a) == u[b].max)
+
+	CHECK(unsigned char, 0);
+	CHECK(unsigned short, 1);
+	CHECK(unsigned int, 2);
+	CHECK(unsigned long, 3);
+	CHECK(unsigned long long, 4);
+#undef CHECK
+}
+
+ATF_TC(sissigned);
+ATF_TC_HEAD(sissigned, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks issigned macro for signed");
+}
+
+ATF_TC_BODY(sissigned, tc)
+{
+#define CHECK(a) ATF_REQUIRE(__type_is_signed(a) == 1)
+
+	CHECK(signed char);
+	CHECK(signed short);
+	CHECK(signed int);
+	CHECK(signed long);
+	CHECK(signed long long);
+#undef CHECK
+}
+
+ATF_TC(uissigned);
+ATF_TC_HEAD(uissigned, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks issigned macro for unsigned");
+}
+
+ATF_TC_BODY(uissigned, tc)
+{
+#define CHECK(a) ATF_REQUIRE(__type_is_signed(a) == 0)
+
+	CHECK(unsigned char);
+	CHECK(unsigned short);
+	CHECK(unsigned int);
+	CHECK(unsigned long);
+	CHECK(unsigned long long);
+#undef CHECK
+}
+
+ATF_TC(utypemask);
+ATF_TC_HEAD(utypemask, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks type mask macro for unsigned");
+}
+
+ATF_TC_BODY(utypemask, tc)
+{
+#define CHECK(a, b) ATF_REQUIRE(__type_mask(a) == b)
+
+	CHECK(unsigned char,      0xffffffffffffff00ULL);
+	CHECK(unsigned short,     0xffffffffffff0000ULL);
+	CHECK(unsigned int,       0xffffffff00000000ULL);
+	CHECK(unsigned long long, 0x0000000000000000ULL);
+#undef CHECK
+}
+
+ATF_TC(stypemask);
+ATF_TC_HEAD(stypemask, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks type mask macro for signed");
+}
+
+ATF_TC_BODY(stypemask, tc)
+{
+#define CHECK(a, b) ATF_REQUIRE(__type_mask(a) == b)
+
+	CHECK(signed char,      0xffffffffffffff00LL);
+	CHECK(signed short,     0xffffffffffff0000LL);
+	CHECK(signed int,       0xffffffff00000000LL);
+	CHECK(signed long long, 0x0000000000000000LL);
+#undef CHECK
+}
+
+ATF_TC(stypefit);
+ATF_TC_HEAD(stypefit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks typefit macro for signed");
+}
+
+ATF_TC_BODY(stypefit, tc)
+{
+#define CHECK(a, b, c) ATF_REQUIRE(!__type_fit(a, b) == c)
+
+	CHECK(signed char, -1, 0);
+	CHECK(signed char, 1, 0);
+	CHECK(signed char, 0x7f, 0);
+	CHECK(signed char, 0x80, 1);
+	CHECK(signed char, 0xff, 1);
+	CHECK(signed char, 0x1ff, 1);
+
+	CHECK(signed short, -1, 0);
+	CHECK(signed short, 1, 0);
+	CHECK(signed short, 0x7fff, 0);
+	CHECK(signed short, 0x8000, 1);
+	CHECK(signed short, 0xffff, 1);
+	CHECK(signed short, 0x1ffff, 1);
+
+	CHECK(signed int, -1, 0);
+	CHECK(signed int, 1, 0);
+	CHECK(signed int, 0x7fffffff, 0);
+	CHECK(signed int, 0x80000000, 1);
+	CHECK(signed int, 0xffffffff, 1);
+	CHECK(signed int, 0x1ffffffffLL, 1);
+
+	CHECK(signed long long, -1, 0);
+	CHECK(signed long long, 1, 0);
+	CHECK(signed long long, 0x7fffffffffffffffLL, 0);
+	CHECK(signed long long, 0x8000000000000000LL, 1);
+	CHECK(signed long long, 0xffffffffffffffffLL, 1);
+
+#undef CHECK
+}
+
+ATF_TC(utypefit);
+ATF_TC_HEAD(utypefit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks typefit macro for unsigned");
+}
+
+ATF_TC_BODY(utypefit, tc)
+{
+#define CHECK(a, b, c) ATF_REQUIRE(!__type_fit(a, b) == c)
+
+	CHECK(unsigned char, -1, 1);
+	CHECK(unsigned char, 1, 0);
+	CHECK(unsigned char, 0x7f, 0);
+	CHECK(unsigned char, 0x80, 0);
+	CHECK(unsigned char, 0xff, 0);
+	CHECK(unsigned char, 0x1ff, 1);
+
+	CHECK(unsigned short, -1, 1);
+	CHECK(unsigned short, 1, 0);
+	CHECK(unsigned short, 0x7fff, 0);
+	CHECK(unsigned short, 0x8000, 0);
+	CHECK(unsigned short, 0xffff, 0);
+	CHECK(unsigned short, 0x1ffff, 1);
+
+	CHECK(unsigned int, -1, 1);
+	CHECK(unsigned int, 1, 0);
+	CHECK(unsigned int, 0x7fffffff, 0);
+	CHECK(unsigned int, 0x80000000, 0);
+	CHECK(unsigned int, 0xffffffff, 0);
+	CHECK(unsigned int, 0x1ffffffffLL, 1);
+
+	CHECK(unsigned long long, -1, 1);
+	CHECK(unsigned long long, 1, 0);
+	CHECK(unsigned long long, 0x7fffffffffffffffULL, 0);
+	CHECK(unsigned long long, 0x8000000000000000ULL, 0);
+	CHECK(unsigned long long, 0xffffffffffffffffULL, 0);
+
+#undef CHECK
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, stypeminmax);
+	ATF_TP_ADD_TC(tp, utypeminmax);
+	ATF_TP_ADD_TC(tp, sissigned);
+	ATF_TP_ADD_TC(tp, uissigned);
+	ATF_TP_ADD_TC(tp, stypemask);
+	ATF_TP_ADD_TC(tp, utypemask);
+	ATF_TP_ADD_TC(tp, stypefit);
+	ATF_TP_ADD_TC(tp, utypefit);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_socket.c b/contrib/netbsd-tests/include/sys/t_socket.c
new file mode 100644
index 000000000000..ad4d2e6c29d3
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_socket.c
@@ -0,0 +1,205 @@
+/*	$NetBSD: t_socket.c,v 1.3 2013/10/19 17:45:00 christos Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(cmsg_sendfd_bounds);
+ATF_TC_HEAD(cmsg_sendfd_bounds, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that attempting to pass an "
+	    "invalid fd returns an error");
+}
+
+ATF_TC_BODY(cmsg_sendfd_bounds, tc)
+{
+	struct cmsghdr *cmp;
+	struct msghdr msg;
+	struct iovec iov;
+	int s[2];
+	int fd;
+
+	rump_init();
+
+	if (rump_sys_socketpair(AF_LOCAL, SOCK_STREAM, 0, s) == -1)
+		atf_tc_fail("rump_sys_socket");
+
+	cmp = malloc(CMSG_SPACE(sizeof(int)));
+
+	iov.iov_base = &fd;
+	iov.iov_len = sizeof(int);
+
+	cmp->cmsg_level = SOL_SOCKET;
+	cmp->cmsg_type = SCM_RIGHTS;
+	cmp->cmsg_len = CMSG_LEN(sizeof(int));
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+	msg.msg_name = NULL;
+	msg.msg_namelen = 0;
+	msg.msg_control = cmp;
+	msg.msg_controllen = CMSG_SPACE(sizeof(int));
+
+	/*
+	 * ERROR HERE: trying to pass invalid fd
+	 * (This value was previously directly used to index the fd
+	 *  array and therefore we are passing a hyperspace index)
+	 */
+	*(int *)CMSG_DATA(cmp) = 0x12345678;
+
+	rump_sys_sendmsg(s[0], &msg, 0);
+	if (errno != EBADF)
+		atf_tc_fail("descriptor passing failed: expected EBADF (9), "
+		    "got %d\n(%s)", errno, strerror(errno));
+}
+
+
+ATF_TC(cmsg_sendfd);
+ATF_TC_HEAD(cmsg_sendfd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that fd passing works");
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(cmsg_sendfd, tc)
+{
+	char buf[128];
+	struct cmsghdr *cmp;
+	struct msghdr msg;
+	struct sockaddr_un sun;
+	struct lwp *l1;
+	struct iovec iov;
+	socklen_t sl;
+	int s1, s2, sgot;
+	int rfd, fd[2], storage;
+
+	rump_init();
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	l1 = rump_pub_lwproc_curlwp();
+
+	/* create unix socket and bind it to a path */
+	memset(&sun, 0, sizeof(sun));
+	sun.sun_family = AF_LOCAL;
+#define SOCKPATH "/com"
+	strncpy(sun.sun_path, SOCKPATH, sizeof(SOCKPATH));
+	s1 = rump_sys_socket(AF_LOCAL, SOCK_STREAM, 0);
+	if (s1 == -1)
+		atf_tc_fail_errno("socket 1");
+	if (rump_sys_bind(s1, (struct sockaddr *)&sun, SUN_LEN(&sun)) == -1)
+		atf_tc_fail_errno("socket 1 bind");
+	if (rump_sys_listen(s1, 1) == -1)
+		atf_tc_fail_errno("socket 1 listen");
+
+	/* create second process for test */
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	(void)rump_pub_lwproc_curlwp();
+
+	/* connect to unix domain socket */
+	memset(&sun, 0, sizeof(sun));
+	sun.sun_family = AF_LOCAL;
+	strncpy(sun.sun_path, SOCKPATH, sizeof(SOCKPATH));
+	s2 = rump_sys_socket(AF_LOCAL, SOCK_STREAM, 0);
+	if (s2 == -1)
+		atf_tc_fail_errno("socket 2");
+	if (rump_sys_connect(s2, (struct sockaddr *)&sun, SUN_LEN(&sun)) == -1)
+		atf_tc_fail_errno("socket 2 connect");
+
+	/* open a pipe and write stuff to it */
+	if (rump_sys_pipe(fd) == -1)
+		atf_tc_fail_errno("can't open pipe");
+#define MAGICSTRING "duam xnaht"
+	if (rump_sys_write(fd[1], MAGICSTRING, sizeof(MAGICSTRING)) !=
+	    sizeof(MAGICSTRING))
+		atf_tc_fail_errno("pipe write"); /* XXX: errno */
+
+	cmp = malloc(CMSG_SPACE(sizeof(int)));
+
+	iov.iov_base = &storage;
+	iov.iov_len = sizeof(int);
+
+	cmp->cmsg_level = SOL_SOCKET;
+	cmp->cmsg_type = SCM_RIGHTS;
+	cmp->cmsg_len = CMSG_LEN(sizeof(int));
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+	msg.msg_name = NULL;
+	msg.msg_namelen = 0;
+	msg.msg_control = cmp;
+	msg.msg_controllen = CMSG_SPACE(sizeof(int));
+	*(int *)CMSG_DATA(cmp) = fd[0];
+
+	/* pass the fd */
+	if (rump_sys_sendmsg(s2, &msg, 0) == -1)
+		atf_tc_fail_errno("sendmsg failed");
+
+	/*
+	 * We will read to the same cmsg space.  Overwrite the space
+	 * with an invalid fd to make sure we get an explicit error
+	 * if we don't manage to read the fd.
+	 */
+	*(int *)CMSG_DATA(cmp) = -1;
+
+	/* switch back to original proc */
+	rump_pub_lwproc_switch(l1);
+
+	/* accept connection and read fd */
+	sl = sizeof(sun);
+	sgot = rump_sys_accept(s1, (struct sockaddr *)&sun, &sl);
+	if (sgot == -1)
+		atf_tc_fail_errno("accept");
+	if (rump_sys_recvmsg(sgot, &msg, 0) == -1)
+		atf_tc_fail_errno("recvmsg failed");
+	rfd = *(int *)CMSG_DATA(cmp);
+
+	/* read from the fd */
+	memset(buf, 0, sizeof(buf));
+	if (rump_sys_read(rfd, buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("read rfd");
+
+	/* check that we got the right stuff */
+	if (strcmp(buf, MAGICSTRING) != 0)
+		atf_tc_fail("expected \"%s\", got \"%s\"", MAGICSTRING, buf);
+}
+
+ATF_TC(sock_cloexec);
+ATF_TC_HEAD(sock_cloexec, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "SOCK_CLOEXEC kernel invariant failure");
+}
+
+ATF_TC_BODY(sock_cloexec, tc)
+{
+
+	rump_init();
+	rump_pub_lwproc_rfork(RUMP_RFFDG);
+	if (rump_sys_socket(-1, SOCK_CLOEXEC, 0) != -1)
+		atf_tc_fail("invalid socket parameters unexpectedly worked");
+	rump_pub_lwproc_releaselwp();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, cmsg_sendfd);
+	ATF_TP_ADD_TC(tp, cmsg_sendfd_bounds);
+	ATF_TP_ADD_TC(tp, sock_cloexec);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_tree.c b/contrib/netbsd-tests/include/sys/t_tree.c
new file mode 100644
index 000000000000..498f7ee4c64f
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_tree.c
@@ -0,0 +1,124 @@
+/* $NetBSD: t_tree.c,v 1.1 2011/05/05 13:36:05 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/tree.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+struct mist {
+	RB_ENTRY(mist) rbentry;
+	int key;
+};
+RB_HEAD(head, mist) tt;
+
+static int
+mistcmp(struct mist *a, struct mist *b)
+{
+#if 0
+	return (b->key - a->key); /* wrong, can overflow */
+#else
+	if (b->key > a->key)
+		return 1;
+	else if (b->key < a->key)
+		return (-1);
+	else
+		return 0;
+#endif
+}
+
+RB_PROTOTYPE(head, mist, rbentry, mistcmp)
+RB_GENERATE(head, mist, rbentry, mistcmp)
+
+static struct mist *
+addmist(int key)
+{
+	struct mist *m;
+
+	m = malloc(sizeof(struct mist));
+	m->key = key;
+	RB_INSERT(head, &tt, m);
+	return m;
+}
+
+static int
+findmist(struct mist *m)
+{
+
+	return (!!RB_FIND(head, &tt, m));
+}
+
+#define N 1000
+static int
+test(void)
+{
+	struct mist *m[N];
+	int fail, i, j;
+
+	RB_INIT(&tt);
+	fail = 0;
+	for (i = 0; i < N; i++) {
+		m[i] = addmist(random() << 1); /* use all 32 bits */
+		for (j = 0; j <= i; j++)
+			if (!findmist(m[j]))
+				fail++;
+	}
+	return fail;
+}
+
+ATF_TC(tree_rbstress);
+ATF_TC_HEAD(tree_rbstress, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "rb-tree stress test");
+}
+
+ATF_TC_BODY(tree_rbstress, tc)
+{
+	int i, fail, f;
+
+	srandom(4711);
+	fail = 0;
+	for (i = 0; i < 10; i++) {
+		f = test();
+		if (f) {
+			atf_tc_fail_nonfatal("loop %d: %d errors\n", i, f);
+			fail += f;
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, tree_rbstress);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/sys/t_types.c b/contrib/netbsd-tests/include/sys/t_types.c
new file mode 100644
index 000000000000..45b715fc8c63
--- /dev/null
+++ b/contrib/netbsd-tests/include/sys/t_types.c
@@ -0,0 +1,144 @@
+/*	$NetBSD: t_types.c,v 1.4 2012/03/18 07:14:08 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_types.c,v 1.4 2012/03/18 07:14:08 jruoho Exp $");
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdint.h>
+
+#include <stdio.h>
+
+ATF_TC(types_limits);
+ATF_TC_HEAD(types_limits, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Known limits for types(3)");
+}
+
+ATF_TC_BODY(types_limits, tc)
+{
+	useconds_t usec;
+	ssize_t size;
+
+	/*
+	 * IEEE Std 1003.1-2008:
+	 *
+	 * "The type ssize_t shall be capable of storing
+	 *  values at least in the range [-1, {SSIZE_MAX}]."
+	 *
+	 */
+	size = SSIZE_MAX;
+	ATF_REQUIRE(size > 0);
+
+	size = size + 1;
+	ATF_REQUIRE(size < 0);
+
+	/*
+	 * IEEE Std 1003.1-2008:
+	 *
+	 * "The type suseconds_t shall be a signed integer type capable
+	 *  of storing values at least in the range [-1, 1000000]."
+	 */
+	usec = 1000000;
+	ATF_REQUIRE(usec > 0);
+}
+
+ATF_TC(types_signed);
+ATF_TC_HEAD(types_signed, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Signed types(3)"
+	    " (PR standards/44847)");
+}
+
+ATF_TC_BODY(types_signed, tc)
+{
+	blkcnt_t bc;
+	blksize_t bs;
+	ssize_t size;
+	off_t off;
+	pid_t pid;
+
+	/*
+	 * As noted in types(3), the following
+	 * types should be signed integers.
+	 */
+	bc = 0;
+	bs = 0;
+	off = 0;
+	pid = 0;
+	size = 0;
+
+	ATF_CHECK((bc - 1) <= 0);
+	ATF_CHECK((bs - 1) <= 0);
+	ATF_CHECK((off - 1) <= 0);
+	ATF_CHECK((pid - 1) <= 0);
+	ATF_CHECK((size - 1) <= 0);
+}
+
+ATF_TC(types_unsigned);
+ATF_TC_HEAD(types_unsigned, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Unsigned types(3)"
+		" (PR standards/18067)");
+}
+
+ATF_TC_BODY(types_unsigned, tc)
+{
+	fsblkcnt_t fb;
+	fsfilcnt_t ff;
+	size_t size;
+	rlim_t lim;
+	ino_t ino;
+
+	fb = 0;
+	ff = 0;
+	ino = 0;
+	lim = 0;
+	size = 0;
+
+	ATF_CHECK((fb - 1) > 0);
+	ATF_CHECK((ff - 1) > 0);
+	ATF_CHECK((ino - 1) > 0);
+	ATF_CHECK((lim - 1) > 0);
+	ATF_CHECK((size - 1) > 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, types_limits);
+	ATF_TP_ADD_TC(tp, types_signed);
+	ATF_TP_ADD_TC(tp, types_unsigned);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_bitstring.c b/contrib/netbsd-tests/include/t_bitstring.c
new file mode 100644
index 000000000000..1dda3c25d556
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_bitstring.c
@@ -0,0 +1,298 @@
+/* $NetBSD: t_bitstring.c,v 1.4 2012/03/25 06:54:04 joerg Exp $ */
+
+/*-
+ * Copyright (c) 1993, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <assert.h>
+#include <bitstring.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+static void
+clearbits(bitstr_t *b, int n)
+{
+	int i = bitstr_size(n);
+
+	while(i--)
+		*(b + i) = 0;
+}
+
+static void
+printbits(FILE *file, bitstr_t *b, int n)
+{
+	int i;
+	int jc, js;
+
+	bit_ffc(b, n, &jc);
+	bit_ffs(b, n, &js);
+
+	(void) fprintf(file, "%3d %3d ", jc, js);
+
+	for (i=0; i < n; i++) {
+		(void) fprintf(file, "%c", (bit_test(b, i) ? '1' : '0'));
+	}
+
+	(void) fprintf(file, "%c", '\n');
+}
+
+static void
+calculate_data(FILE *file, const int test_length)
+{
+	int i;
+	bitstr_t *bs;
+
+	assert(test_length >= 4);
+
+	(void) fprintf(file, "Testing with TEST_LENGTH = %d\n\n", test_length);
+
+	(void) fprintf(file, "test _bit_byte, _bit_mask, and bitstr_size\n");
+	(void) fprintf(file, "  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)\n");
+
+	for (i=0; i < test_length; i++) {
+		(void) fprintf(file, "%3d%15u%15u%15zu\n",
+			i, _bit_byte(i), _bit_mask(i), bitstr_size(i));
+	}
+
+	bs = bit_alloc(test_length);
+	clearbits(bs, test_length);
+	(void) fprintf(file, "\ntest bit_alloc, clearbits, bit_ffc, bit_ffs\n");
+	(void) fprintf(file, "be:   0  -1 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", '0');
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+
+	(void) fprintf(file, "\ntest bit_set\n");
+	for (i=0; i < test_length; i+=3)
+		bit_set(bs, i);
+	(void) fprintf(file, "be:   1   0 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", "100"[i % 3]);
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+
+	(void) fprintf(file, "\ntest bit_clear\n");
+	for (i=0; i < test_length; i+=6)
+		bit_clear(bs, i);
+	(void) fprintf(file, "be:   0   3 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", "000100"[i % 6]);
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+
+	(void) fprintf(file, "\ntest bit_test using previous bitstring\n");
+	(void) fprintf(file, "  i    bit_test(i)\n");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%3d%15d\n", i, bit_test(bs, i));
+
+	clearbits(bs, test_length);
+	(void) fprintf(file, "\ntest clearbits\n");
+	(void) fprintf(file, "be:   0  -1 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", '0');
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+
+	(void) fprintf(file, "\ntest bit_nset and bit_nclear\n");
+	bit_nset(bs, 1, test_length - 2);
+	(void) fprintf(file, "be:   0   1 0");
+	for (i=0; i < test_length - 2; i++)
+		(void) fprintf(file, "%c", '1');
+	(void) fprintf(file, "0\nis: ");
+	printbits(file, bs, test_length);
+
+	bit_nclear(bs, 2, test_length - 3);
+	(void) fprintf(file, "be:   0   1 01");
+	for (i=0; i < test_length - 4; i++)
+		(void) fprintf(file, "%c", '0');
+	(void) fprintf(file, "10\nis: ");
+	printbits(file, bs, test_length);
+
+	bit_nclear(bs, 0, test_length - 1);
+	(void) fprintf(file, "be:   0  -1 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", '0');
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+	bit_nset(bs, 0, test_length - 2);
+	(void) fprintf(file, "be: %3d   0 ",test_length - 1);
+	for (i=0; i < test_length - 1; i++)
+		(void) fprintf(file, "%c", '1');
+	fprintf(file, "%c", '0');
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+	bit_nclear(bs, 0, test_length - 1);
+	(void) fprintf(file, "be:   0  -1 ");
+	for (i=0; i < test_length; i++)
+		(void) fprintf(file, "%c", '0');
+	(void) fprintf(file, "\nis: ");
+	printbits(file, bs, test_length);
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "first 1 bit should move right 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nclear(bs, 0, test_length - 1);
+		bit_nset(bs, i, test_length - 1);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "first 0 bit should move right 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nset(bs, 0, test_length - 1);
+		bit_nclear(bs, i, test_length - 1);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "first 0 bit should move left 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nclear(bs, 0, test_length - 1);
+		bit_nset(bs, 0, test_length - 1 - i);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "first 1 bit should move left 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nset(bs, 0, test_length - 1);
+		bit_nclear(bs, 0, test_length - 1 - i);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "0 bit should move right 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nset(bs, 0, test_length - 1);
+		bit_nclear(bs, i, i);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) fprintf(file, "\n");
+	(void) fprintf(file, "1 bit should move right 1 position each line\n");
+	for (i=0; i < test_length; i++) {
+		bit_nclear(bs, 0, test_length - 1);
+		bit_nset(bs, i, i);
+		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
+
+	(void) free(bs);
+}
+
+static void
+one_check(const atf_tc_t *tc, const int test_length)
+{
+	FILE *out;
+	char command[1024];
+
+	ATF_REQUIRE((out = fopen("out", "w")) != NULL);
+	calculate_data(out, test_length);
+	fclose(out);
+
+	/* XXX The following is a huge hack that was added to simplify the
+	 * conversion of these tests from src/regress/ to src/tests/.  The
+	 * tests in this file should be checking their own results, without
+	 * having to resort to external data files. */
+	snprintf(command, sizeof(command), "diff -u %s/d_bitstring_%d.out out",
+	    atf_tc_get_config_var(tc, "srcdir"), test_length);
+	if (system(command) != EXIT_SUCCESS)
+		atf_tc_fail("Test failed; see output for details");
+}
+
+ATF_TC(bits_8);
+ATF_TC_HEAD(bits_8, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 8-bit long bitstrings");
+}
+ATF_TC_BODY(bits_8, tc)
+{
+	one_check(tc, 8);
+}
+
+ATF_TC(bits_27);
+ATF_TC_HEAD(bits_27, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 27-bit long bitstrings");
+}
+ATF_TC_BODY(bits_27, tc)
+{
+	one_check(tc, 27);
+}
+
+ATF_TC(bits_32);
+ATF_TC_HEAD(bits_32, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 32-bit long bitstrings");
+}
+ATF_TC_BODY(bits_32, tc)
+{
+	one_check(tc, 32);
+}
+
+ATF_TC(bits_49);
+ATF_TC_HEAD(bits_49, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 49-bit long bitstrings");
+}
+ATF_TC_BODY(bits_49, tc)
+{
+	one_check(tc, 49);
+}
+
+ATF_TC(bits_64);
+ATF_TC_HEAD(bits_64, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 64-bit long bitstrings");
+}
+ATF_TC_BODY(bits_64, tc)
+{
+	one_check(tc, 64);
+}
+
+ATF_TC(bits_67);
+ATF_TC_HEAD(bits_67, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks 67-bit long bitstrings");
+}
+ATF_TC_BODY(bits_67, tc)
+{
+	one_check(tc, 67);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, bits_8);
+	ATF_TP_ADD_TC(tp, bits_27);
+	ATF_TP_ADD_TC(tp, bits_32);
+	ATF_TP_ADD_TC(tp, bits_49);
+	ATF_TP_ADD_TC(tp, bits_64);
+	ATF_TP_ADD_TC(tp, bits_67);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_errno.c b/contrib/netbsd-tests/include/t_errno.c
new file mode 100644
index 000000000000..763e5697aadf
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_errno.c
@@ -0,0 +1,765 @@
+/*	$NetBSD: t_errno.c,v 1.1 2011/05/01 17:07:05 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_errno.c,v 1.1 2011/05/01 17:07:05 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+
+ATF_TC(errno_constants);
+ATF_TC_HEAD(errno_constants, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test POSIX constants in <errno.h>");
+}
+
+ATF_TC_BODY(errno_constants, tc)
+{
+	bool fail;
+
+	/*
+	 * The following definitions should be available
+	 * according to IEEE Std 1003.1-2008, issue 7.
+	 */
+	atf_tc_expect_fail("PR standards/44921");
+
+	fail = true;
+
+#ifdef E2BIG
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("E2BIG not defined");
+
+	fail = true;
+
+#ifdef EACCES
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EACCES not defined");
+
+	fail = true;
+
+#ifdef EADDRINUSE
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EADDRINUSE not defined");
+
+	fail = true;
+
+#ifdef EADDRNOTAVAIL
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EADDRNOTAVAIL not defined");
+
+	fail = true;
+
+#ifdef EAFNOSUPPORT
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAFNOSUPPORT not defined");
+
+	fail = true;
+
+#ifdef EAGAIN
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAGAIN not defined");
+
+	fail = true;
+
+#ifdef EALREADY
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EALREADY not defined");
+
+	fail = true;
+
+#ifdef EBADF
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EBADF not defined");
+
+	fail = true;
+
+#ifdef EBADMSG
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EBADMSG not defined");
+
+	fail = true;
+
+#ifdef EBUSY
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EBUSY not defined");
+
+	fail = true;
+
+#ifdef ECANCELED
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("ECANCELED not defined");
+
+	fail = true;
+
+#ifdef ECHILD
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("ECHILD not defined");
+
+	fail = true;
+
+#ifdef ECONNABORTED
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("ECONNABORTED not defined");
+
+	fail = true;
+
+#ifdef ECONNREFUSED
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("ECONNREFUSED not defined");
+
+	fail = true;
+
+#ifdef ECONNRESET
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("ECONNRESET not defined");
+
+	fail = true;
+
+#ifdef EDEADLK
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EDEADLK not defined");
+
+	fail = true;
+
+#ifdef EDESTADDRREQ
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EDESTADDRREQ not defined");
+
+	fail = true;
+
+#ifdef EDOM
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EDOM not defined");
+
+	fail = true;
+
+#ifdef EDQUOT
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EDQUOT not defined");
+
+	fail = true;
+
+#ifdef EEXIST
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EEXIST not defined");
+
+	fail = true;
+
+#ifdef EFAULT
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EFAULT not defined");
+
+	fail = true;
+
+#ifdef EFBIG
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EFBIG not defined");
+
+	fail = true;
+
+#ifdef EHOSTUNREACH
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EHOSTUNREACH not defined");
+
+	fail = true;
+
+#ifdef EIDRM
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EIDRM not defined");
+
+	fail = true;
+
+#ifdef EILSEQ
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EILSEQ not defined");
+
+	fail = true;
+
+#ifdef EINPROGRESS
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EINPROGRESS not defined");
+
+	fail = true;
+
+#ifdef EINTR
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EINTR not defined");
+
+	fail = true;
+
+#ifdef EINVAL
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EINVAL not defined");
+
+	fail = true;
+
+#ifdef EIO
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EIO not defined");
+
+	fail = true;
+
+#ifdef EISCONN
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EISCONN not defined");
+
+	fail = true;
+
+#ifdef EISDIR
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EISDIR not defined");
+
+	fail = true;
+
+#ifdef ELOOP
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ELOOP not defined");
+
+	fail = true;
+
+#ifdef EMFILE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EMFILE not defined");
+
+	fail = true;
+
+#ifdef EMLINK
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EMLINK not defined");
+
+	fail = true;
+
+#ifdef EMSGSIZE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EMSGSIZE not defined");
+
+	fail = true;
+
+#ifdef EMULTIHOP
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EMULTIHOP not defined");
+
+	fail = true;
+
+#ifdef ENAMETOOLONG
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENAMETOOLONG not defined");
+
+	fail = true;
+
+#ifdef ENETDOWN
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENETDOWN not defined");
+
+	fail = true;
+
+#ifdef ENETRESET
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENETRESET not defined");
+
+	fail = true;
+
+#ifdef ENETUNREACH
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENETUNREACH not defined");
+
+	fail = true;
+
+#ifdef ENFILE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENFILE not defined");
+
+	fail = true;
+
+#ifdef ENOBUFS
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOBUFS not defined");
+
+	fail = true;
+
+#ifdef ENODATA
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENODATA not defined");
+
+	fail = true;
+
+#ifdef ENODEV
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENODEV not defined");
+
+	fail = true;
+
+#ifdef ENOENT
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOENT not defined");
+
+	fail = true;
+
+#ifdef ENOEXEC
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOEXEC not defined");
+
+	fail = true;
+
+#ifdef ENOLCK
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOLCK not defined");
+
+	fail = true;
+
+#ifdef ENOLINK
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOLINK not defined");
+
+	fail = true;
+
+#ifdef ENOMEM
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOMEM not defined");
+
+	fail = true;
+
+#ifdef ENOMSG
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOMSG not defined");
+
+	fail = true;
+
+#ifdef ENOPROTOOPT
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOPROTOOPT not defined");
+
+	fail = true;
+
+#ifdef ENOSPC
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOSPC not defined");
+
+	fail = true;
+
+#ifdef ENOSR
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOSR not defined");
+
+	fail = true;
+
+#ifdef ENOSTR
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOSTR not defined");
+
+	fail = true;
+
+#ifdef ENOSYS
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOSYS not defined");
+
+	fail = true;
+
+#ifdef ENOTCONN
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTCONN not defined");
+
+	fail = true;
+
+#ifdef ENOTDIR
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTDIR not defined");
+
+	fail = true;
+
+#ifdef ENOTEMPTY
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTEMPTY not defined");
+
+	fail = true;
+
+#ifdef ENOTRECOVERABLE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTRECOVERABLE not defined");
+
+	fail = true;
+
+#ifdef ENOTSOCK
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTSOCK not defined");
+
+	fail = true;
+
+#ifdef ENOTSUP
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTSUP not defined");
+
+	fail = true;
+
+#ifdef ENOTTY
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENOTTY not defined");
+
+	fail = true;
+
+#ifdef ENXIO
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ENXIO not defined");
+
+	fail = true;
+
+#ifdef EOPNOTSUPP
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EOPNOTSUPP not defined");
+
+	fail = true;
+
+#ifdef EOVERFLOW
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EOVERFLOW not defined");
+
+	fail = true;
+
+#ifdef EOWNERDEAD
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EOWNERDEAD not defined");
+
+	fail = true;
+
+#ifdef EPERM
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EPERM not defined");
+
+	fail = true;
+
+#ifdef EPIPE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EPIPE not defined");
+
+	fail = true;
+
+#ifdef EPROTO
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EPROTO not defined");
+
+	fail = true;
+
+#ifdef EPROTONOSUPPORT
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EPROTONOSUPPORT not defined");
+
+	fail = true;
+
+#ifdef EPROTOTYPE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EPROTOTYPE not defined");
+
+	fail = true;
+
+#ifdef ERANGE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ERANGE not defined");
+
+	fail = true;
+
+#ifdef EROFS
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EROFS not defined");
+
+	fail = true;
+
+#ifdef ESPIPE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ESPIPE not defined");
+
+	fail = true;
+
+#ifdef ESRCH
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ESRCH not defined");
+
+	fail = true;
+
+#ifdef ESTALE
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ESTALE not defined");
+
+	fail = true;
+
+#ifdef ETIME
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ETIME not defined");
+
+	fail = true;
+
+#ifdef ETIMEDOUT
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ETIMEDOUT not defined");
+
+	fail = true;
+
+#ifdef ETXTBSY
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("ETXTBSY not defined");
+
+	fail = true;
+
+#ifdef EWOULDBLOCK
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EWOULDBLOCK not defined");
+
+	fail = true;
+
+#ifdef EXDEV
+	fail = false;
+#endif
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("EXDEV not defined");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, errno_constants);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_glob.c b/contrib/netbsd-tests/include/t_glob.c
new file mode 100644
index 000000000000..da6a4ad5747e
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_glob.c
@@ -0,0 +1,75 @@
+/*	$NetBSD: t_glob.c,v 1.1 2011/04/10 08:35:48 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_glob.c,v 1.1 2011/04/10 08:35:48 jruoho Exp $");
+
+#include <atf-c.h>
+#include <glob.h>
+#include <string.h>
+
+ATF_TC(glob_types);
+ATF_TC_HEAD(glob_types, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test glob(3) types");
+}
+
+ATF_TC_BODY(glob_types, tc)
+{
+	glob_t g;
+
+	/*
+	 * IEEE Std 1003.1-2008:
+	 *
+	 * "The <glob.h> header shall define the glob_t structure type,
+	 *  which shall include at least the following members:
+	 *
+	 *    size_t   gl_pathc Count of paths matched by pattern.
+	 *    char   **gl_pathv Pointer to a list of matched pathnames.
+	 *    size_t   gl_offs  Slots to reserve at the beginning of gl_pathv."
+	 *
+	 * Verify that gl_pathc and gl_offs are unsigned; PR standards/21401.
+	 */
+	(void)memset(&g, 0, sizeof(glob_t));
+
+	g.gl_offs = g.gl_offs - 1;
+	g.gl_pathc = g.gl_pathc - 1;
+
+	ATF_REQUIRE(g.gl_pathc > 0);
+	ATF_REQUIRE(g.gl_offs > 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, glob_types);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_inttypes.c b/contrib/netbsd-tests/include/t_inttypes.c
new file mode 100644
index 000000000000..d713615ea0db
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_inttypes.c
@@ -0,0 +1,250 @@
+/*	$NetBSD: t_inttypes.c,v 1.3 2013/10/19 17:44:37 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+ATF_TC_WITHOUT_HEAD(int_fmtio);
+ATF_TC_BODY(int_fmtio, tc)
+{
+	char buf[64];
+
+	int8_t i8 = 0;
+	int16_t i16 = 0;
+	int32_t i32 = 0;
+	int64_t i64 = 0;
+	int_least8_t il8 = 0;
+	int_least16_t il16 = 0;
+	int_least32_t il32 = 0;
+	int_least64_t il64 = 0;
+	int_fast8_t if8 = 0;
+	int_fast16_t if16 = 0;
+	int_fast32_t if32 = 0;
+	int_fast64_t if64 = 0;
+	intmax_t im = 0;
+	intptr_t ip = 0;
+	uint8_t ui8 = 0;
+	uint16_t ui16 = 0;
+	uint32_t ui32 = 0;
+	uint64_t ui64 = 0;
+	uint_least8_t uil8 = 0;
+	uint_least16_t uil16 = 0;
+	uint_least32_t uil32 = 0;
+	uint_least64_t uil64 = 0;
+	uint_fast8_t uif8 = 0;
+	uint_fast16_t uif16 = 0;
+	uint_fast32_t uif32 = 0;
+	uint_fast64_t uif64 = 0;
+	uintmax_t uim = 0;
+	uintptr_t uip = 0;
+
+#define	PRINT(fmt, var) \
+	snprintf(buf, sizeof(buf), "%" fmt, var)
+#define	SCAN(fmt, var) \
+	sscanf(buf, "%" fmt, &var)
+
+	PRINT(PRId8, i8);
+	PRINT(PRId16, i16);
+	PRINT(PRId32, i32);
+	PRINT(PRId64, i64);
+	PRINT(PRIdLEAST8, il8);
+	PRINT(PRIdLEAST16, il16);
+	PRINT(PRIdLEAST32, il32);
+	PRINT(PRIdLEAST64, il64);
+	PRINT(PRIdFAST8, if8);
+	PRINT(PRIdFAST16, if16);
+	PRINT(PRIdFAST32, if32);
+	PRINT(PRIdFAST64, if64);
+	PRINT(PRIdMAX, im);
+	PRINT(PRIdPTR, ip);
+
+	PRINT(PRIi8, i8);
+	PRINT(PRIi16, i16);
+	PRINT(PRIi32, i32);
+	PRINT(PRIi64, i64);
+	PRINT(PRIiLEAST8, il8);
+	PRINT(PRIiLEAST16, il16);
+	PRINT(PRIiLEAST32, il32);
+	PRINT(PRIiLEAST64, il64);
+	PRINT(PRIiFAST8, if8);
+	PRINT(PRIiFAST16, if16);
+	PRINT(PRIiFAST32, if32);
+	PRINT(PRIiFAST64, if64);
+	PRINT(PRIiMAX, im);
+	PRINT(PRIiPTR, ip);
+
+	PRINT(PRIo8, ui8);
+	PRINT(PRIo16, ui16);
+	PRINT(PRIo32, ui32);
+	PRINT(PRIo64, ui64);
+	PRINT(PRIoLEAST8, uil8);
+	PRINT(PRIoLEAST16, uil16);
+	PRINT(PRIoLEAST32, uil32);
+	PRINT(PRIoLEAST64, uil64);
+	PRINT(PRIoFAST8, uif8);
+	PRINT(PRIoFAST16, uif16);
+	PRINT(PRIoFAST32, uif32);
+	PRINT(PRIoFAST64, uif64);
+	PRINT(PRIoMAX, uim);
+	PRINT(PRIoPTR, uip);
+
+	PRINT(PRIu8, ui8);
+	PRINT(PRIu16, ui16);
+	PRINT(PRIu32, ui32);
+	PRINT(PRIu64, ui64);
+	PRINT(PRIuLEAST8, uil8);
+	PRINT(PRIuLEAST16, uil16);
+	PRINT(PRIuLEAST32, uil32);
+	PRINT(PRIuLEAST64, uil64);
+	PRINT(PRIuFAST8, uif8);
+	PRINT(PRIuFAST16, uif16);
+	PRINT(PRIuFAST32, uif32);
+	PRINT(PRIuFAST64, uif64);
+	PRINT(PRIuMAX, uim);
+	PRINT(PRIuPTR, uip);
+
+	PRINT(PRIx8, ui8);
+	PRINT(PRIx16, ui16);
+	PRINT(PRIx32, ui32);
+	PRINT(PRIx64, ui64);
+	PRINT(PRIxLEAST8, uil8);
+	PRINT(PRIxLEAST16, uil16);
+	PRINT(PRIxLEAST32, uil32);
+	PRINT(PRIxLEAST64, uil64);
+	PRINT(PRIxFAST8, uif8);
+	PRINT(PRIxFAST16, uif16);
+	PRINT(PRIxFAST32, uif32);
+	PRINT(PRIxFAST64, uif64);
+	PRINT(PRIxMAX, uim);
+	PRINT(PRIxPTR, uip);
+
+	PRINT(PRIX8, ui8);
+	PRINT(PRIX16, ui16);
+	PRINT(PRIX32, ui32);
+	PRINT(PRIX64, ui64);
+	PRINT(PRIXLEAST8, uil8);
+	PRINT(PRIXLEAST16, uil16);
+	PRINT(PRIXLEAST32, uil32);
+	PRINT(PRIXLEAST64, uil64);
+	PRINT(PRIXFAST8, uif8);
+	PRINT(PRIXFAST16, uif16);
+	PRINT(PRIXFAST32, uif32);
+	PRINT(PRIXFAST64, uif64);
+	PRINT(PRIXMAX, uim);
+	PRINT(PRIXPTR, uip);
+
+
+	SCAN(SCNd8, i8);
+	SCAN(SCNd16, i16);
+	SCAN(SCNd32, i32);
+	SCAN(SCNd64, i64);
+	SCAN(SCNdLEAST8, il8);
+	SCAN(SCNdLEAST16, il16);
+	SCAN(SCNdLEAST32, il32);
+	SCAN(SCNdLEAST64, il64);
+	SCAN(SCNdFAST8, if8);
+	SCAN(SCNdFAST16, if16);
+	SCAN(SCNdFAST32, if32);
+	SCAN(SCNdFAST64, if64);
+	SCAN(SCNdMAX, im);
+	SCAN(SCNdPTR, ip);
+
+	SCAN(SCNi8, i8);
+	SCAN(SCNi16, i16);
+	SCAN(SCNi32, i32);
+	SCAN(SCNi64, i64);
+	SCAN(SCNiLEAST8, il8);
+	SCAN(SCNiLEAST16, il16);
+	SCAN(SCNiLEAST32, il32);
+	SCAN(SCNiLEAST64, il64);
+	SCAN(SCNiFAST8, if8);
+	SCAN(SCNiFAST16, if16);
+	SCAN(SCNiFAST32, if32);
+	SCAN(SCNiFAST64, if64);
+	SCAN(SCNiMAX, im);
+	SCAN(SCNiPTR, ip);
+
+	SCAN(SCNo8, ui8);
+	SCAN(SCNo16, ui16);
+	SCAN(SCNo32, ui32);
+	SCAN(SCNo64, ui64);
+	SCAN(SCNoLEAST8, uil8);
+	SCAN(SCNoLEAST16, uil16);
+	SCAN(SCNoLEAST32, uil32);
+	SCAN(SCNoLEAST64, uil64);
+	SCAN(SCNoFAST8, uif8);
+	SCAN(SCNoFAST16, uif16);
+	SCAN(SCNoFAST32, uif32);
+	SCAN(SCNoFAST64, uif64);
+	SCAN(SCNoMAX, uim);
+	SCAN(SCNoPTR, uip);
+
+	SCAN(SCNu8, ui8);
+	SCAN(SCNu16, ui16);
+	SCAN(SCNu32, ui32);
+	SCAN(SCNu64, ui64);
+	SCAN(SCNuLEAST8, uil8);
+	SCAN(SCNuLEAST16, uil16);
+	SCAN(SCNuLEAST32, uil32);
+	SCAN(SCNuLEAST64, uil64);
+	SCAN(SCNuFAST8, uif8);
+	SCAN(SCNuFAST16, uif16);
+	SCAN(SCNuFAST32, uif32);
+	SCAN(SCNuFAST64, uif64);
+	SCAN(SCNuMAX, uim);
+	SCAN(SCNuPTR, uip);
+
+	SCAN(SCNx8, ui8);
+	SCAN(SCNx16, ui16);
+	SCAN(SCNx32, ui32);
+	SCAN(SCNx64, ui64);
+	SCAN(SCNxLEAST8, uil8);
+	SCAN(SCNxLEAST16, uil16);
+	SCAN(SCNxLEAST32, uil32);
+	SCAN(SCNxLEAST64, uil64);
+	SCAN(SCNxFAST8, uif8);
+	SCAN(SCNxFAST16, uif16);
+	SCAN(SCNxFAST32, uif32);
+	SCAN(SCNxFAST64, uif64);
+	SCAN(SCNxMAX, uim);
+	SCAN(SCNxPTR, uip);
+
+#undef SCAN
+#undef PRINT
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, int_fmtio);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_limits.c b/contrib/netbsd-tests/include/t_limits.c
new file mode 100644
index 000000000000..625750a133de
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_limits.c
@@ -0,0 +1,287 @@
+/* $NetBSD: t_limits.c,v 1.2 2011/04/04 18:02:01 jruoho Exp $ */
+
+/*
+ * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (c) 2009, Stathis Kamperis
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_limits.c,v 1.2 2011/04/04 18:02:01 jruoho Exp $");
+
+#include <limits.h>
+
+#include <atf-c.h>
+
+struct psxentry {
+	const char	*psx_desc;
+	int		 psx_constant;
+	int		 psx_minval;
+} psxtable[] = {
+
+	/*
+	 * POSIX symbolic constants.
+	 */
+#ifdef	_POSIX_AIO_LISTIO_MAX
+	{ "_POSIX_AIO_LISTIO_MAX",	_POSIX_AIO_LISTIO_MAX,		2    },
+#endif
+#ifdef	_POSIX_AIO_MAX
+	{ "_POSIX_AIO_MAX",		_POSIX_AIO_MAX,			1    },
+#endif
+#ifdef	_POSIX_ARG_MAX
+	{ "_POSIX_ARG_MAX",		_POSIX_ARG_MAX,			4096 },
+#endif
+#ifdef	_POSIX_CHILD_MAX
+	{ "_POSIX_CHILD_MAX" ,		_POSIX_CHILD_MAX,		25   },
+#endif
+#ifdef	_POSIX_DELAYTIMER_MAX
+	{ "_POSIX_DELAYTIMER_MAX",	_POSIX_DELAYTIMER_MAX,		32   },
+#endif
+#ifdef	_POSIX_HOST_NAME_MAX
+	{ "_POSIX_HOST_NAME_MAX",	_POSIX_HOST_NAME_MAX,		255  },
+#endif
+#ifdef	_POSIX_LINK_MAX
+	{ "_POSIX_LINK_MAX",		_POSIX_LINK_MAX,		8    },
+#endif
+#ifdef	_POSIX_LOGIN_NAME_MAX
+	{ "_POSIX_LOGIN_NAME_MAX",	_POSIX_LOGIN_NAME_MAX,		9    },
+#endif
+#ifdef	_POSIX_MAX_CANON
+	{ "_POSIX_MAX_CANON",		_POSIX_MAX_CANON,		255  },
+#endif
+#ifdef	_POSIX_MAX_INPUT
+	{ "_POSIX_MAX_INPUT",		_POSIX_MAX_INPUT,		255  },
+#endif
+#ifdef	_POSIX_MQ_OPEN_MAX
+	{ "_POSIX_MQ_OPEN_MAX",		_POSIX_MQ_OPEN_MAX,		8    },
+#endif
+#ifdef	_POSIX_MQ_PRIO_MAX
+	{ "_POSIX_MQ_PRIO_MAX",		_POSIX_MQ_PRIO_MAX,		32   },
+#endif
+#ifdef	_POSIX_NAME_MAX
+	{ "_POSIX_NAME_MAX",		_POSIX_NAME_MAX,		9    },
+#endif
+#ifdef	_POSIX_NGROUPS_MAX
+	{ "_POSIX_NGROUPS_MAX",		_POSIX_NGROUPS_MAX,		8    },
+#endif
+#ifdef	_POSIX_OPEN_MAX
+	{ "_POSIX_OPEN_MAX",		_POSIX_OPEN_MAX,		20   },
+#endif
+#ifdef	_POSIX_PATH_MAX
+	{ "_POSIX_PATH_MAX",		_POSIX_PATH_MAX,		256  },
+#endif
+#ifdef	_POSIX_PIPE_BUF
+	{ "_POSIX_PIPE_BUF",		_POSIX_PIPE_BUF,		512  },
+#endif
+#ifdef	_POSIX_RE_DUP_MAX
+	{ "_POSIX_RE_DUP_MAX",		_POSIX_RE_DUP_MAX,		255  },
+#endif
+#ifdef	_POSIX_RTSIG_MAX
+	{ "_POSIX_RTSIG_MAX",		_POSIX_RTSIG_MAX,		8    },
+#endif
+#ifdef	_POSIX_SEM_NSEMS_MAX
+	{ "_POSIX_SEM_NSEMS_MAX",	_POSIX_SEM_NSEMS_MAX,		256  },
+#endif
+#ifdef	_POSIX_SEM_VALUE_MAX
+	{ "_POSIX_SEM_VALUE_MAX",	_POSIX_SEM_VALUE_MAX,		32767},
+#endif
+#ifdef	_POSIX_SIGQUEUE_MAX
+	{ "_POSIX_SIGQUEUE_MAX",	_POSIX_SIGQUEUE_MAX,		32   },
+#endif
+#ifdef	_POSIX_SSIZE_MAX
+	{ "_POSIX_SSIZE_MAX",		_POSIX_SSIZE_MAX,		32767},
+#endif
+#ifdef	_POSIX_STREAM_MAX
+	{ "_POSIX_STREAM_MAX",		_POSIX_STREAM_MAX,		8    },
+#endif
+#ifdef	_POSIX_SS_REPL_MAX
+	{ "_POSIX_SS_REPL_MAX",		_POSIX_SS_REPL_MAX,		4    },
+#endif
+#ifdef	_POSIX_SYMLINK_MAX
+	{ "_POSIX_SYMLINK_MAX",		_POSIX_SYMLINK_MAX,		255  },
+#endif
+#ifdef	_POSIX_SYMLOOP_MAX
+	{ "_POSIX_SYMLOOP_MAX",		_POSIX_SYMLOOP_MAX,		8    },
+#endif
+#ifdef	_POSIX_THREAD_DESTRUCTOR_ITERATIONS
+	{ "_POSIX_THREAD_DESTRUCTOR_ITERATIONS",
+	  _POSIX_THREAD_DESTRUCTOR_ITERATIONS,				4    },
+#endif
+#ifdef	_POSIX_THREAD_KEYS_MAX
+	{ "_POSIX_THREAD_KEYS_MAX",	_POSIX_THREAD_KEYS_MAX,		128  },
+#endif
+#ifdef	_POSIX_THREAD_THREADS_MAX
+	{ "_POSIX_THREAD_THREADS_MAX",	_POSIX_THREAD_THREADS_MAX,	64   },
+#endif
+#ifdef	_POSIX_TIMER_MAX
+	{ "_POSIX_TIMER_MAX",		_POSIX_TIMER_MAX,		32   },
+#endif
+#ifdef	_POSIX_TRACE_EVENT_NAME_MAX
+	{ "_POSIX_TRACE_EVENT_NAME_MAX",_POSIX_TRACE_EVENT_NAME_MAX,	30   },
+#endif
+#ifdef	_POSIX_TRACE_NAME_MAX
+	{ "_POSIX_TRACE_NAME_MAX",	_POSIX_TRACE_NAME_MAX,		8    },
+#endif
+#ifdef	_POSIX_TRACE_SYS_MAX
+	{ "_POSIX_TRACE_SYS_MAX",	_POSIX_TRACE_SYS_MAX,		8    },
+#endif
+#ifdef	_POSIX_TRACE_USER_EVENT_MAX
+	{ "_POSIX_TRACE_USER_EVENT_MAX",_POSIX_TRACE_USER_EVENT_MAX,	32   },
+#endif
+#ifdef	_POSIX_TTY_NAME_MAX
+	{ "_POSIX_TTY_NAME_MAX",	_POSIX_TTY_NAME_MAX,		9    },
+#endif
+#ifdef	_POSIX_TZNAME_MAX
+	{ "_POSIX_TZNAME_MAX",		_POSIX_TZNAME_MAX,		6    },
+#endif
+#ifdef	_POSIX2_BC_BASE_MAX
+	{ "_POSIX2_BC_BASE_MAX",	_POSIX2_BC_BASE_MAX,		99   },
+#endif
+#ifdef	_POSIX2_BC_DIM_MAX
+	{ "_POSIX2_BC_DIM_MAX",		_POSIX2_BC_DIM_MAX,		2048 },
+#endif
+#ifdef	_POSIX2_BC_SCALE_MAX
+	{ "_POSIX2_BC_SCALE_MAX",	_POSIX2_BC_SCALE_MAX,		99   },
+#endif
+#ifdef	_POSIX2_BC_STRING_MAX
+	{ "_POSIX2_BC_STRING_MAX",	_POSIX2_BC_STRING_MAX,		1000 },
+#endif
+#ifdef	_POSIX2_CHARCLASS_NAME_MAX
+	{ "_POSIX2_CHARCLASS_NAME_MAX",	_POSIX2_CHARCLASS_NAME_MAX,	14   },
+#endif
+#ifdef	_POSIX2_COLL_WEIGHTS_MAX
+	{ "_POSIX2_COLL_WEIGHTS_MAX",	_POSIX2_COLL_WEIGHTS_MAX,	2    },
+#endif
+#ifdef	_POSIX2_EXPR_NEST_MAX
+	{ "_POSIX2_EXPR_NEST_MAX",	_POSIX2_EXPR_NEST_MAX,		32   },
+#endif
+#ifdef	_POSIX2_LINE_MAX
+	{ "_POSIX2_LINE_MAX",		_POSIX2_LINE_MAX,		2048 },
+#endif
+#ifdef	_POSIX2_RE_DUP_MAX
+	{ "_POSIX2_RE_DUP_MAX",		_POSIX2_RE_DUP_MAX,		255  },
+#endif
+#ifdef	_XOPEN_IOV_MAX
+	{ "_XOPEN_IOV_MAX",		_XOPEN_IOV_MAX,			16   },
+#endif
+#ifdef	_XOPEN_NAME_MAX
+	{ "_XOPEN_NAME_MAX",		_XOPEN_NAME_MAX,		255  },
+#endif
+#ifdef	_XOPEN_PATH_MAX
+	{ "_XOPEN_PATH_MAX",		_XOPEN_PATH_MAX,		1024 },
+#endif
+
+	/*
+	 * Other invariant values.
+	 */
+#ifdef	NL_ARGMAX
+	{ "NL_ARGMAX",			NL_ARGMAX,			9    },
+#endif
+#ifdef	NL_LANGMAX
+	{ "NL_LANGMAX",			NL_LANGMAX,			14   },
+#endif
+#ifdef	NL_MSGMAX
+	{ "NL_MSGMAX",			NL_MSGMAX,			32767},
+#endif
+#ifdef	NL_SETMAX
+	{ "NL_SETMAX",			NL_SETMAX,			255  },
+#endif
+#ifdef	NL_TEXTMAX
+#ifdef	_POSIX2_LINE_MAX
+	{ "NL_TEXTMAX",			NL_TEXTMAX,	     _POSIX2_LINE_MAX},
+#endif
+#endif
+#ifdef	NZERO
+	{ "NZERO",			NZERO,				20   },
+#endif
+};
+
+ATF_TC_WITHOUT_HEAD(char);
+ATF_TC_BODY(char, tc)
+{
+	ATF_CHECK(CHAR_MIN < UCHAR_MAX);
+}
+
+ATF_TC(posix);
+ATF_TC_HEAD(posix, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test POSIX limits");
+}
+
+ATF_TC_BODY(posix, tc)
+{
+	size_t i;
+
+	for (i = 0; i < __arraycount(psxtable); i++) {
+
+		if (psxtable[i].psx_constant < psxtable[i].psx_minval) {
+
+			atf_tc_fail("%s is less than the minimum",
+			    psxtable[i].psx_desc);
+		}
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(short);
+ATF_TC_BODY(short, tc)
+{
+	ATF_CHECK(SHRT_MIN < USHRT_MAX);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, char);
+	ATF_TP_ADD_TC(tp, posix);
+	ATF_TP_ADD_TC(tp, short);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_netdb.c b/contrib/netbsd-tests/include/t_netdb.c
new file mode 100644
index 000000000000..c7f946fb6c19
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_netdb.c
@@ -0,0 +1,244 @@
+/*	$NetBSD: t_netdb.c,v 1.2 2011/04/25 20:51:14 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_netdb.c,v 1.2 2011/04/25 20:51:14 njoly Exp $");
+
+#include <atf-c.h>
+#include <netdb.h>
+
+ATF_TC(netdb_constants);
+ATF_TC_HEAD(netdb_constants, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test constants in <netdb.h>");
+}
+
+ATF_TC_BODY(netdb_constants, tc)
+{
+	bool fail;
+
+	/*
+	 * The following definitions should be available
+	 * according to IEEE Std 1003.1-2008, issue 7.
+	 */
+	atf_tc_expect_fail("PR standards/44777");
+
+	fail = true;
+
+#ifdef AI_PASSIVE
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_PASSIVE not defined");
+
+	fail = true;
+
+#ifdef AI_CANONNAME
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_CANONNAME not defined");
+
+	fail = true;
+
+#ifdef AI_NUMERICHOST
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_NUMERICHOST not defined");
+
+	fail = true;
+
+#ifdef AI_NUMERICSERV
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_NUMERICSERV not defined");
+
+	fail = true;
+
+#ifdef AI_V4MAPPED
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_V4MAPPED not defined");
+
+	fail = true;
+
+#ifdef AI_ALL
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_ALL not defined");
+
+	fail = true;
+
+#ifdef AI_ADDRCONFIG
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("AI_ADDRCONFIG not defined");
+
+	fail = true;
+
+#ifdef NI_NOFQDN
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_NOFQDN not defined");
+
+	fail = true;
+
+#ifdef NI_NUMERICHOST
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_NUMERICHOST not defined");
+
+	fail = true;
+
+#ifdef NI_NAMEREQD
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_NAMEREQD not defined");
+
+	fail = true;
+
+#ifdef NI_NUMERICSERV
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_NUMERICSERV not defined");
+
+	fail = true;
+
+#ifdef NI_NUMERICSCOPE
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_NUMERICSCOPE not defined");
+
+	fail = true;
+
+#ifdef NI_DGRAM
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("NI_DGRAM not defined");
+
+	fail = true;
+
+#ifdef EAI_AGAIN
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_AGAIN not defined");
+
+	fail = true;
+
+#ifdef EAI_BADFLAGS
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_BADFLAGS not defined");
+
+	fail = true;
+
+#ifdef EAI_FAIL
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_FAIL not defined");
+
+	fail = true;
+
+#ifdef EAI_FAMILY
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_FAMILY not defined");
+
+	fail = true;
+
+#ifdef EAI_MEMORY
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_MEMORY not defined");
+
+	fail = true;
+
+#ifdef EAI_NONAME
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_NONAME not defined");
+
+	fail = true;
+
+#ifdef EAI_SERVICE
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_SERVICE not defined");
+
+	fail = true;
+
+#ifdef EAI_SOCKTYPE
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_SOCKTYPE not defined");
+
+	fail = true;
+
+#ifdef EAI_SYSTEM
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_SYSTEM not defined");
+
+	fail = true;
+
+#ifdef EAI_OVERFLOW
+	fail = false;
+#endif
+	if (fail != false)
+		atf_tc_fail_nonfatal("EAI_OVERFLOW not defined");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, netdb_constants);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_paths.c b/contrib/netbsd-tests/include/t_paths.c
new file mode 100644
index 000000000000..925bb3a8b740
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_paths.c
@@ -0,0 +1,205 @@
+/*	$NetBSD: t_paths.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_paths.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $");
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#define PATH_DEV	__BIT(0)	/* A device node	*/
+#define PATH_DIR	__BIT(1)	/* A directory		*/
+#define PATH_FILE	__BIT(2)	/* A file		*/
+#define PATH_ROOT	__BIT(3)	/* Access for root only */
+
+static const struct {
+	const char	*path;
+	int		 flags;
+} paths[] = {
+	{ _PATH_AUDIO,		PATH_DEV		},
+	{ _PATH_AUDIO0,		PATH_DEV		},
+	{ _PATH_AUDIOCTL,	PATH_DEV		},
+	{ _PATH_AUDIOCTL0,	PATH_DEV		},
+	{ _PATH_BPF,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_CLOCKCTL,	PATH_DEV | PATH_ROOT	},
+	{ _PATH_CONSOLE,	PATH_DEV | PATH_ROOT	},
+	{ _PATH_CONSTTY,	PATH_DEV | PATH_ROOT	},
+	{ _PATH_CPUCTL,		PATH_DEV		},
+	{ _PATH_CSMAPPER,	PATH_DIR		},
+	{ _PATH_DEFTAPE,	PATH_DEV | PATH_ROOT	},
+	{ _PATH_DEVCDB,		PATH_FILE		},
+	{ _PATH_DEVDB,		PATH_FILE		},
+	{ _PATH_DEVNULL,	PATH_DEV		},
+	{ _PATH_DRUM,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_ESDB,		PATH_DIR		},
+	{ _PATH_FTPUSERS,	PATH_FILE		},
+	{ _PATH_GETTYTAB,	PATH_FILE		},
+	{ _PATH_I18NMODULE,	PATH_DIR		},
+	{ _PATH_ICONV,		PATH_DIR		},
+	{ _PATH_KMEM,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_KSYMS,		PATH_DEV		},
+	{ _PATH_KVMDB,		PATH_FILE		},
+	{ _PATH_LOCALE,		PATH_DIR		},
+	{ _PATH_MAILDIR,	PATH_DIR		},
+	{ _PATH_MAN,		PATH_DIR		},
+	{ _PATH_MEM,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_MIXER,		PATH_DEV		},
+	{ _PATH_MIXER0,		PATH_DEV		},
+	{ _PATH_NOLOGIN,	PATH_FILE		},
+	{ _PATH_POWER,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_PRINTCAP,	PATH_FILE		},
+	{ _PATH_PUD,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_PUFFS,		PATH_DEV | PATH_ROOT	},
+	{ _PATH_RANDOM,		PATH_DEV		},
+	{ _PATH_SENDMAIL,	PATH_FILE		},
+	{ _PATH_SHELLS,		PATH_FILE		},
+	{ _PATH_SKEYKEYS,	PATH_FILE | PATH_ROOT	},
+	{ _PATH_SOUND,		PATH_DEV		},
+	{ _PATH_SOUND0,		PATH_DEV		},
+	{ _PATH_SYSMON,		PATH_DEV		},
+	{ _PATH_TTY,		PATH_DEV		},
+	{ _PATH_UNIX,		PATH_FILE | PATH_ROOT	},
+	{ _PATH_URANDOM,	PATH_DEV		},
+	{ _PATH_VIDEO,		PATH_DEV		},
+	{ _PATH_VIDEO0,		PATH_DEV		},
+
+	{ _PATH_DEV,		PATH_DIR		},
+	{ _PATH_DEV_PTS,	PATH_DIR		},
+	{ _PATH_EMUL_AOUT,	PATH_DIR		},
+	{ _PATH_TMP,		PATH_DIR		},
+	{ _PATH_VARDB,		PATH_DIR		},
+	{ _PATH_VARRUN,		PATH_DIR		},
+	{ _PATH_VARTMP,		PATH_DIR		},
+
+	{ _PATH_BSHELL,		PATH_FILE		},
+	{ _PATH_CSHELL,		PATH_FILE		},
+	{ _PATH_VI,		PATH_FILE		},
+};
+
+ATF_TC(paths);
+ATF_TC_HEAD(paths, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test for <paths.h>");
+}
+
+ATF_TC_BODY(paths, tc)
+{
+	struct stat st;
+	uid_t uid;
+	mode_t m;
+	size_t i;
+	int fd;
+
+#if defined(__sparc__)
+	atf_tc_skip("PR port-sparc/45580");
+#endif
+
+	uid = getuid();
+
+	for (i = 0; i < __arraycount(paths); i++) {
+
+		(void)fprintf(stderr, "testing '%s'\n", paths[i].path);
+
+		errno = 0;
+		fd = open(paths[i].path, O_RDONLY);
+
+		if (fd < 0) {
+
+			switch (errno) {
+
+			case EPERM:	/* FALLTHROUGH */
+			case EACCES:	/* FALLTHROUGH */
+
+				if ((paths[i].flags & PATH_ROOT) == 0) {
+
+					atf_tc_fail("UID %u failed to open %s",
+					    (uint32_t)uid, paths[i].path);
+				}
+
+			case EBUSY:	/* FALLTHROUGH */
+			case ENXIO:	/* FALLTHROUGH */
+			case ENOENT:	/* FALLTHROUGH */
+
+			default:
+				continue;
+			}
+		}
+
+		(void)memset(&st, 0, sizeof(struct stat));
+
+		ATF_REQUIRE(fstat(fd, &st) == 0);
+
+		m = st.st_mode;
+
+		if ((paths[i].flags & PATH_DEV) != 0) {
+
+			ATF_CHECK(S_ISBLK(m) != 0 || S_ISCHR(m) != 0);
+
+			ATF_CHECK((paths[i].flags & PATH_DIR) == 0);
+			ATF_CHECK((paths[i].flags & PATH_FILE) == 0);
+		}
+
+		if ((paths[i].flags & PATH_DIR) != 0) {
+
+			ATF_CHECK(S_ISDIR(m) != 0);
+
+			ATF_CHECK((paths[i].flags & PATH_DEV) == 0);
+			ATF_CHECK((paths[i].flags & PATH_FILE) == 0);
+		}
+
+		if ((paths[i].flags & PATH_FILE) != 0) {
+
+			ATF_CHECK(S_ISREG(m) != 0);
+
+			ATF_CHECK((paths[i].flags & PATH_DEV) == 0);
+			ATF_CHECK((paths[i].flags & PATH_DIR) == 0);
+		}
+
+		ATF_REQUIRE(close(fd) == 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, paths);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/include/t_stdint.c b/contrib/netbsd-tests/include/t_stdint.c
new file mode 100644
index 000000000000..6a57d9a8e3ff
--- /dev/null
+++ b/contrib/netbsd-tests/include/t_stdint.c
@@ -0,0 +1,57 @@
+/* $NetBSD: t_stdint.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_stdint.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $");
+
+#include <stdint.h>
+
+#include <atf-c.h>
+
+ATF_TC_WITHOUT_HEAD(int8);
+ATF_TC_BODY(int8, tc)
+{
+	ATF_CHECK(INT8_MIN < UINT8_MAX);
+}
+
+ATF_TC_WITHOUT_HEAD(int16);
+ATF_TC_BODY(int16, tc)
+{
+	ATF_CHECK(INT16_MIN < UINT16_MAX);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, int8);
+	ATF_TP_ADD_TC(tp, int16);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/ipf/expected/.cvsignore b/contrib/netbsd-tests/ipf/expected/.cvsignore
new file mode 100644
index 000000000000..47a4237755ac
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/.cvsignore
@@ -0,0 +1 @@
+i19
diff --git a/contrib/netbsd-tests/ipf/expected/bpf-f1 b/contrib/netbsd-tests/ipf/expected/bpf-f1
new file mode 100644
index 000000000000..85ce84c9f693
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/bpf-f1
@@ -0,0 +1,20 @@
+nomatch
+pass
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+pass
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/bpf1 b/contrib/netbsd-tests/ipf/expected/bpf1
new file mode 100644
index 000000000000..76381a748f60
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/bpf1
@@ -0,0 +1,4 @@
+pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "0 0 0 0 0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" }
+pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "0 0 0 0 0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" }
diff --git a/contrib/netbsd-tests/ipf/expected/f1 b/contrib/netbsd-tests/ipf/expected/f1
new file mode 100644
index 000000000000..86d9592073e2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f1
@@ -0,0 +1,20 @@
+block
+block
+nomatch
+nomatch
+--------
+pass
+pass
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+block
+--------
+nomatch
+nomatch
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f10 b/contrib/netbsd-tests/ipf/expected/f10
new file mode 100644
index 000000000000..da6c312f6ee3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f10
@@ -0,0 +1,126 @@
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+block
+block
+block
+nomatch
+nomatch
+block
+--------
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+block
+block
+nomatch
+nomatch
+nomatch
+block
+--------
+pass
+pass
+nomatch
+nomatch
+nomatch
+pass
+--------
+block
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+block
+block
+block
+nomatch
+block
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+pass
+--------
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+block
+block
+--------
+nomatch
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+nomatch
+block
+nomatch
+block
+--------
+pass
+pass
+nomatch
+pass
+nomatch
+pass
+--------
+block
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+nomatch
+nomatch
+block
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f11 b/contrib/netbsd-tests/ipf/expected/f11
new file mode 100644
index 000000000000..d7ab889dacdc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f11
@@ -0,0 +1,283 @@
+pass
+nomatch
+nomatch
+pass
+pass
+nomatch
+pass
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 pass in proto tcp from any to any port = 23 flags S/SA keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+block
+nomatch
+nomatch
+block
+block
+nomatch
+block
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 block in proto tcp from any to any port = 23 flags S/SA keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in proto udp from any to any port = 53 keep frags
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+nomatch
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 block in proto udp from any to any port = 53 keep frags
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240
+	FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[e1],X[] out X[],X[]
+	Sync status: not synchronized
+4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24
+	FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[e1],X[e0] out X[],X[]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in proto udp from any to any port = 53 keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240
+	FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008401 = block in keep state
+	interfaces: in X[e1],X[] out X[],X[]
+	Sync status: not synchronized
+4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24
+	FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008401 = block in keep state
+	interfaces: in X[e1],X[e0] out X[],X[]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 block in proto udp from any to any port = 53 keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+4:tcp src:1.1.1.1,1 dst:2.1.2.2,25 state:3/4 864000
+	2:66 4096<<0:16384<<0
+	FWD: IN pkts 1 bytes 40 OUT pkts 0 bytes 0
+	REV: IN pkts 1 bytes 40 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[e0],X[e1] out X[],X[]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 pass in on e0 proto tcp from any to any port = 25 keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f12 b/contrib/netbsd-tests/ipf/expected/f12
new file mode 100644
index 000000000000..094d8c01d486
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f12
@@ -0,0 +1,60 @@
+pass
+pass
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+bad-packet
+block
+nomatch
+bad-packet
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+bad-packet
+block
+nomatch
+bad-packet
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+pass
+--------
+nomatch
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+block
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f13 b/contrib/netbsd-tests/ipf/expected/f13
new file mode 100644
index 000000000000..ac7947bd2922
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f13
@@ -0,0 +1,180 @@
+pass
+bad-packet
+nomatch
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+bad-packet
+nomatch
+block
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+pass
+bad-packet
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+block
+bad-packet
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+bad-packet
+nomatch
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+pass
+pass
+--------
+block
+bad-packet
+nomatch
+block
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+block
+block
+--------
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+nomatch
+bad-packet
+pass
+bad-packet
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+bad-packet
+nomatch
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+block
+block
+pass
+--------
+block
+bad-packet
+nomatch
+pass
+bad-packet
+nomatch
+nomatch
+bad-packet
+nomatch
+bad-packet
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f14 b/contrib/netbsd-tests/ipf/expected/f14
new file mode 100644
index 000000000000..1c6ed5cb6613
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f14
@@ -0,0 +1,48 @@
+block
+nomatch
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+pass
+pass
+--------
+block
+nomatch
+nomatch
+nomatch
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f15 b/contrib/netbsd-tests/ipf/expected/f15
new file mode 100644
index 000000000000..9b31258e5717
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f15
@@ -0,0 +1,9 @@
+block return-rst
+pass
+block return-icmp
+pass
+block
+nomatch
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f16 b/contrib/netbsd-tests/ipf/expected/f16
new file mode 100644
index 000000000000..b6cb3fae0818
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f16
@@ -0,0 +1,9 @@
+block
+block
+pass
+block
+pass
+pass
+block
+block
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f17 b/contrib/netbsd-tests/ipf/expected/f17
new file mode 100644
index 000000000000..c586e5b59a2c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f17
@@ -0,0 +1,7 @@
+pass
+block return-rst
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f18 b/contrib/netbsd-tests/ipf/expected/f18
new file mode 100644
index 000000000000..1af5de53cd05
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f18
@@ -0,0 +1,27 @@
+pass
+pass
+pass
+pass
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in inet from 1.1.1.1/32 to any
+Rules configured (set 0, out)
+2 pass out inet from 2.2.2.2/32 to any
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+1 count in inet from 1.1.1.1/32 to 3.3.3.3/32
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+1 count out inet from 2.2.2.2/32 to 4.4.4.4/32
+Accounting rules configured (set 1, out)
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f19 b/contrib/netbsd-tests/ipf/expected/f19
new file mode 100644
index 000000000000..5ee2e9d692a1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f19
@@ -0,0 +1,10 @@
+pass
+pass
+pass
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f2 b/contrib/netbsd-tests/ipf/expected/f2
new file mode 100644
index 000000000000..7093a41026bc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f2
@@ -0,0 +1,42 @@
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+block
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f20 b/contrib/netbsd-tests/ipf/expected/f20
new file mode 100644
index 000000000000..86308a0f1a41
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f20
@@ -0,0 +1,3 @@
+pass
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f21 b/contrib/netbsd-tests/ipf/expected/f21
new file mode 100644
index 000000000000..525dacaae720
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f21
@@ -0,0 +1,5 @@
+pass
+pass
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f22 b/contrib/netbsd-tests/ipf/expected/f22
new file mode 100644
index 000000000000..525dacaae720
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f22
@@ -0,0 +1,5 @@
+pass
+pass
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f24 b/contrib/netbsd-tests/ipf/expected/f24
new file mode 100644
index 000000000000..801abd369426
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f24
@@ -0,0 +1,5 @@
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f25 b/contrib/netbsd-tests/ipf/expected/f25
new file mode 100644
index 000000000000..a87b084cdadd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f25
@@ -0,0 +1,35 @@
+pass
+pass
+pass
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+4:udp src:192.168.1.235,8008 dst:239.255.255.250,1900 240
+	FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[hme0],X[] out X[],X[]
+	Sync status: not synchronized
+4:udp src:192.168.1.235,8008 dst:192.168.1.254,1900 24
+	FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0
+	REV: IN pkts 0 bytes 0 OUT pkts 1 bytes 264
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[hme0],X[] out X[],X[hme0]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in on hme0 proto udp from any to any with mcast keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f26 b/contrib/netbsd-tests/ipf/expected/f26
new file mode 100644
index 000000000000..9e4d62b51730
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f26
@@ -0,0 +1,84 @@
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f27 b/contrib/netbsd-tests/ipf/expected/f27
new file mode 100644
index 000000000000..c62f588e8b93
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f27
@@ -0,0 +1,90 @@
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f28 b/contrib/netbsd-tests/ipf/expected/f28
new file mode 100644
index 000000000000..e5867e690103
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f28
@@ -0,0 +1,32 @@
+block
+block
+block
+> nic0 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2
+pass
+> nic1 ip #0 20(20) 0 4.4.1.1 > 4.2.1.2
+pass
+> nic2 ip #0 20(20) 0 4.4.2.1 > 4.2.2.2
+pass
+> nic3 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2
+pass
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+7 block in all
+4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/f29 b/contrib/netbsd-tests/ipf/expected/f29
new file mode 100644
index 000000000000..a650c1b45289
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f29
@@ -0,0 +1,64 @@
+block
+block
+block
+> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000
+pass
+> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000
+pass
+> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001
+pass
+> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001
+pass
+> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002
+pass
+> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002
+pass
+> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003
+pass
+> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003
+pass
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+4:udp src:4.4.3.1,1003 dst:4.2.3.2,2003 240
+	FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[nic0],X[] out X[nic3],X[]
+	Sync status: not synchronized
+4:udp src:4.4.2.1,1002 dst:4.2.2.2,2002 240
+	FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[nic0],X[] out X[nic2],X[]
+	Sync status: not synchronized
+4:udp src:4.4.1.1,1001 dst:4.2.1.2,2001 240
+	FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[nic0],X[] out X[nic1],X[]
+	Sync status: not synchronized
+4:udp src:4.4.3.1,1000 dst:4.2.3.2,2000 240
+	FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[nic0],X[] out X[nic0],X[]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+7 block in all
+4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/f3 b/contrib/netbsd-tests/ipf/expected/f3
new file mode 100644
index 000000000000..5df3ac4491e6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f3
@@ -0,0 +1,48 @@
+nomatch
+block
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+--------
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f30 b/contrib/netbsd-tests/ipf/expected/f30
new file mode 100644
index 000000000000..30b9d405d0ae
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f30
@@ -0,0 +1,68 @@
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f4 b/contrib/netbsd-tests/ipf/expected/f4
new file mode 100644
index 000000000000..5df3ac4491e6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f4
@@ -0,0 +1,48 @@
+nomatch
+block
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+--------
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f5 b/contrib/netbsd-tests/ipf/expected/f5
new file mode 100644
index 000000000000..36c7d404ef61
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f5
@@ -0,0 +1,1392 @@
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+--------
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f6 b/contrib/netbsd-tests/ipf/expected/f6
new file mode 100644
index 000000000000..36c7d404ef61
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f6
@@ -0,0 +1,1392 @@
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+--------
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+block
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+pass
+--------
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f7 b/contrib/netbsd-tests/ipf/expected/f7
new file mode 100644
index 000000000000..7a4daedd93e8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f7
@@ -0,0 +1,144 @@
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f8 b/contrib/netbsd-tests/ipf/expected/f8
new file mode 100644
index 000000000000..ad42ff2cc7c4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f8
@@ -0,0 +1,42 @@
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+block
+nomatch
+block
+nomatch
+nomatch
+nomatch
+--------
+pass
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/f9 b/contrib/netbsd-tests/ipf/expected/f9
new file mode 100644
index 000000000000..cc5be688cd2d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/f9
@@ -0,0 +1,180 @@
+block
+block
+block
+block
+block
+block
+block
+block
+block
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+--------
+block
+block
+block
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+block
+block
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/i1 b/contrib/netbsd-tests/ipf/expected/i1
new file mode 100644
index 000000000000..19ae393e58e0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i1
@@ -0,0 +1,17 @@
+pass in all
+block out all
+log in all
+log body in all
+count in from any to any
+pass in from !any to any pps 10
+block in from any to !any
+pass in on ed0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on ed0(!),vx0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
+block in log first on lo0(!) from any to any
+pass in log body or-block quick from any to any
+block return-rst in quick on le0(!) proto tcp from any to any
+block return-icmp in on qe0(!) from any to any
+block return-icmp(host-unr) in on qe0(!) from any to any
+block return-icmp-as-dest in on le0(!) from any to any
+block return-icmp-as-dest(port-unr) in on qe0(!) from any to any
+pass out on longNICname0(!) inet from 254.220.186.152/32 to 254.220.186.152/32
diff --git a/contrib/netbsd-tests/ipf/expected/i10 b/contrib/netbsd-tests/ipf/expected/i10
new file mode 100644
index 000000000000..24137c1e29c9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i10
@@ -0,0 +1,5 @@
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt sec
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt lsrr not opt sec
+block in inet from any to any with not opt sec-class topsecret
+block in inet from any to any with not opt sec-class topsecret,secret
+pass in inet from any to any with opt sec-class topsecret,confid not opt sec-class unclass
diff --git a/contrib/netbsd-tests/ipf/expected/i11 b/contrib/netbsd-tests/ipf/expected/i11
new file mode 100644
index 000000000000..d1d2cf6c5742
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i11
@@ -0,0 +1,12 @@
+pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 keep state # count 0
+block in log first on lo0(!) proto tcp/udp from any to any port = 7 keep state # count 0
+pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 20499 keep frags
+pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 2049 keep frags (strict)
+pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 53 keep state keep frags # count 0
+pass in on ed0(!) out-via vx0(!) proto udp from any to any keep state # count 0
+pass out on ppp0(!) in-via le0(!) proto tcp from any to any keep state # count 0
+pass in on ed0(!),vx0(!) out-via vx0(!),ed0(!) proto udp from any to any keep state # count 0
+pass in inet proto tcp from any port > 1024 to 127.0.0.1/32 port = 1024 keep state # count 0
+pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,strict,newisn,no-icmp-err,age 600/600) # count 0
+pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,loose,newisn,no-icmp-err,age 600/600) # count 0
+pass in proto udp from any to any keep state (sync,age 10/20) # count 0
diff --git a/contrib/netbsd-tests/ipf/expected/i12 b/contrib/netbsd-tests/ipf/expected/i12
new file mode 100644
index 000000000000..6747d9338902
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i12
@@ -0,0 +1,39 @@
+pass in inet from 1.1.1.1/32 to 2.2.2.2/32
+pass in inet from 2.2.2.0/24 to 4.4.4.4/32
+pass in inet from 3.3.3.3/32 to 4.4.4.4/32
+pass in inet from 2.2.2.0/24 to 5.5.5.5/32
+pass in inet from 3.3.3.3/32 to 5.5.5.5/32
+pass in inet from 2.2.2.0/24 to 6.6.6.6/32
+pass in inet from 3.3.3.3/32 to 6.6.6.6/32
+pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 22
+pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 22
+pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 22
+pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 22
+pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 25
+pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 25
+pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 25
+pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 25
+pass in inet proto tcp from 2.2.2.0/24 port = 53 to 5.5.5.5/32
+pass in inet proto tcp from 3.3.3.3/32 port = 53 to 5.5.5.5/32
+pass in inet proto tcp from 2.2.2.0/24 port = 9 to 5.5.5.5/32
+pass in inet proto tcp from 3.3.3.3/32 port = 9 to 5.5.5.5/32
+pass in inet proto tcp from 2.2.2.0/24 port = 53 to 6.6.6.6/32
+pass in inet proto tcp from 3.3.3.3/32 port = 53 to 6.6.6.6/32
+pass in inet proto tcp from 2.2.2.0/24 port = 9 to 6.6.6.6/32
+pass in inet proto tcp from 3.3.3.3/32 port = 9 to 6.6.6.6/32
+pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 53
+pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 53
+pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 53
+pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 53
+pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 9
+pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 9
+pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 9
+pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9
+pass in inet from 10.10.10.10/32 to 11.11.11.11/32
+pass in from pool/101 to hash/202
+pass in from hash/303 to pool/404
+table role=ipf type=tree number=
+	{ ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; };
+table role=ipf type=tree number=
+	{ 1.1.0.0/16; };
+pass in from pool/0 to pool/0
diff --git a/contrib/netbsd-tests/ipf/expected/i13 b/contrib/netbsd-tests/ipf/expected/i13
new file mode 100644
index 000000000000..5c8d94532b9c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i13
@@ -0,0 +1,2 @@
+block in from any to any
+pass in from any to any
diff --git a/contrib/netbsd-tests/ipf/expected/i14 b/contrib/netbsd-tests/ipf/expected/i14
new file mode 100644
index 000000000000..0f2430f716b0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i14
@@ -0,0 +1,15 @@
+block in on eri0(!) all head 1
+pass in on eri0(!) proto icmp from any to any group 1
+pass out on ed0(!) all head 1000000
+block out on ed0(!) proto udp from any to any group 1000000
+block in on vm0(!) proto tcp/udp from any to any head 101
+pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group 101
+pass in inet proto tcp from 1.0.0.1/32 to 2.0.0.2/32 group 101
+pass in inet proto udp from 2.0.0.2/32 to 3.0.0.3/32 group 101
+block in on vm0(!) proto tcp/udp from any to any head vm0-group
+pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group
+block in on vm0(!) proto tcp/udp from any to any head vm0-group
+pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group
+pass in inet6 from 8f::/128 to f8::/128
+block in inet6 proto udp from any to any
+block in inet6 all
diff --git a/contrib/netbsd-tests/ipf/expected/i15 b/contrib/netbsd-tests/ipf/expected/i15
new file mode 100644
index 000000000000..49746598df02
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i15
@@ -0,0 +1,4 @@
+pass out on fxp0(!) all set-tag(log=100)
+pass out on fxp0(!) all set-tag(nat=foo)
+pass out on fxp0(!) all set-tag(log=100, nat=200)
+pass out on fxp0(!) all set-tag(log=2147483648, nat=overtherainbowis)
diff --git a/contrib/netbsd-tests/ipf/expected/i16 b/contrib/netbsd-tests/ipf/expected/i16
new file mode 100644
index 000000000000..c5b3cf3f6738
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i16
@@ -0,0 +1,3 @@
+block out all
+100 pass in all
+10101 pass out proto tcp from any to any
diff --git a/contrib/netbsd-tests/ipf/expected/i17 b/contrib/netbsd-tests/ipf/expected/i17
new file mode 100644
index 000000000000..9e71cb100322
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i17
@@ -0,0 +1,29 @@
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+0 pass in inet from 1.1.1.1/32 to any
+0 pass in all
+0 pass in inet from 3.3.3.3/32 to any
+0 pass in inet from any to 127.0.0.1/32
+0 pass in inet from 127.0.0.1/32 to any
+0 100 pass in inet from 127.0.0.1/32 to any
+0 100 pass in all
+0 110 pass in proto udp from any to any
+0 110 pass in inet from 2.2.2.2/32 to any
+0 110 pass in inet from 127.0.0.1/32 to any
+0 200 pass in proto tcp from any to any
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
diff --git a/contrib/netbsd-tests/ipf/expected/i18 b/contrib/netbsd-tests/ipf/expected/i18
new file mode 100644
index 000000000000..2c7e4935d524
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i18
@@ -0,0 +1,11 @@
+pass in tos 0x50 from any to any
+pass in tos 0x80 from any to any
+pass out tos 0x80 from any to any
+pass out tos 0x50 from any to any
+block in ttl 0 from any to any
+block in ttl 1 from any to any
+block in ttl 2 from any to any
+block in ttl 3 from any to any
+block in ttl 4 from any to any
+block in ttl 5 from any to any
+block in ttl 6 from any to any
diff --git a/contrib/netbsd-tests/ipf/expected/i19.dist b/contrib/netbsd-tests/ipf/expected/i19.dist
new file mode 100644
index 000000000000..5d9c26cfe15a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i19.dist
@@ -0,0 +1,22 @@
+block in log level user.debug quick proto icmp from any to any
+block in log level mail.info quick proto icmp from any to any
+block in log level daemon.notice quick proto icmp from any to any
+block in log level auth.warn quick proto icmp from any to any
+block in log level syslog.err quick proto icmp from any to any
+block in log level lpr.crit quick proto icmp from any to any
+block in log level news.alert quick proto icmp from any to any
+block in log level uucp.emerg quick proto icmp from any to any
+block in log level cron.debug quick proto icmp from any to any
+block in log level ftp.info quick proto icmp from any to any
+block in log level authpriv.notice quick proto icmp from any to any
+block in log level logalert.warn quick proto icmp from any to any
+block in log level local0.err quick proto icmp from any to any
+block in log level local1.crit quick proto icmp from any to any
+block in log level local2.alert quick proto icmp from any to any
+block in log level local3.emerg quick proto icmp from any to any
+block in log level local4.debug quick proto icmp from any to any
+block in log level local5.info quick proto icmp from any to any
+block in log level local6.notice quick proto icmp from any to any
+block in log level local7.warn quick proto icmp from any to any
+block in log level kern.err quick proto icmp from any to any
+block in log level security.emerg quick proto icmp from any to any
diff --git a/contrib/netbsd-tests/ipf/expected/i2 b/contrib/netbsd-tests/ipf/expected/i2
new file mode 100644
index 000000000000..17b9d07883f7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i2
@@ -0,0 +1,9 @@
+log in proto tcp from any to any
+pass in proto tcp from any to any
+pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32
+block in proto ipv6 from any to any
+block in proto udp from any to any
+block in proto 250 from any to any
+pass in proto tcp/udp from any to any
+block in proto tcp/udp from any to any
+block in proto tcp/udp from any to any
diff --git a/contrib/netbsd-tests/ipf/expected/i20 b/contrib/netbsd-tests/ipf/expected/i20
new file mode 100644
index 000000000000..25e35cd9f5c6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i20
@@ -0,0 +1,4 @@
+pass in on ppp0(!) inet from ppp0/peer to ppp0/32
+block in on hme0(!) inet from any to hme0/bcast
+pass in on bge0(!) inet from bge0/net to bge0/32
+block in on eri0(!) inet from any to eri0/netmasked
diff --git a/contrib/netbsd-tests/ipf/expected/i21 b/contrib/netbsd-tests/ipf/expected/i21
new file mode 100644
index 000000000000..d4d28daa4a58
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i21
@@ -0,0 +1,16 @@
+pass in from any port = 10101 to any
+pass out from any to any port != 22
+block in from any port 20:21 to any
+block out from any to any port 10 <> 100
+pass out from any to any port = 3
+pass out from any to any port = 5
+pass out from any to any port = 7
+pass out from any to any port = 9
+block in from any port = 20 to any
+block in from any port = 25 to any
+pass in from any port 11:12 to any port 1:2
+pass in from any port 21:22 to any port 1:2
+pass in from any port 11:12 to any port 4:5
+pass in from any port 21:22 to any port 4:5
+pass in from any port 11:12 to any port 8:9
+pass in from any port 21:22 to any port 8:9
diff --git a/contrib/netbsd-tests/ipf/expected/i22 b/contrib/netbsd-tests/ipf/expected/i22
new file mode 100644
index 000000000000..6e5a07d634b0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i22
@@ -0,0 +1,5 @@
+pass in exp { "ip.src != 1.1.1.0/24; tcp.dport = 80;" } 
+pass in exp { "ip.addr = 1.2.3.4/32,5.6.7.8/32;" } 
+block out exp { "ip.dst = 127.0.0.0/8;" } 
+block in exp { "udp.sport = 53; udp.dport = 53;" } 
+pass out exp { "tcp.sport = 22; tcp.port = 25;" } 
diff --git a/contrib/netbsd-tests/ipf/expected/i23 b/contrib/netbsd-tests/ipf/expected/i23
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/ipf/expected/i3 b/contrib/netbsd-tests/ipf/expected/i3
new file mode 100644
index 000000000000..691ad257f389
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i3
@@ -0,0 +1,11 @@
+log in all
+pass in inet from 128.16.0.0/16 to 129.10.10.0/24
+pass in inet from 128.0.0.0/24 to 128.0.0.0/16
+pass in inet from 128.0.0.0/24 to 128.0.0.0/16
+pass in inet from 128.0.0.0/24 to 128.0.0.0/16
+pass in inet from 128.0.0.0/24 to 128.0.0.0/16
+pass in inet from 128.0.0.0/24 to 128.0.0.0/16
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32
+block in log inet from any to any
+block in log level auth.info on hme0(!) all
+log level local5.warn out all
diff --git a/contrib/netbsd-tests/ipf/expected/i4 b/contrib/netbsd-tests/ipf/expected/i4
new file mode 100644
index 000000000000..1198714fb55d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i4
@@ -0,0 +1,9 @@
+log in proto tcp from any port > 0 to any
+log in proto tcp from any to any port > 0
+pass in proto tcp from any port != 0 to any port 0 >< 65535
+pass in inet proto udp from 127.0.0.1/32 port > 32000 to 127.0.0.1/32 port < 29000
+block in proto udp from any port != 123 to any port < 7
+block in proto tcp from any port = 25 to any port > 25
+pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3
+pass in proto tcp/udp from any port 2:2 to any port 10:20
+pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S/FSRPAU keep state # count 0
diff --git a/contrib/netbsd-tests/ipf/expected/i5 b/contrib/netbsd-tests/ipf/expected/i5
new file mode 100644
index 000000000000..0dbc859b9a4d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i5
@@ -0,0 +1,9 @@
+log in all
+count in tos 0x80 from any to any
+pass in on ed0(!) inet tos 0x40 from 127.0.0.1/32 to 127.0.0.1/32
+block in log on lo0(!) ttl 0 from any to any
+pass in quick ttl 1 from any to any
+skip 3 out inet from 127.0.0.1/32 to any
+auth out on foo0(!) proto tcp from any to any port = 80
+preauth out on foo0(!) proto tcp from any to any port = 22
+nomatch out on foo0(!) proto tcp from any port < 1024 to any
diff --git a/contrib/netbsd-tests/ipf/expected/i6 b/contrib/netbsd-tests/ipf/expected/i6
new file mode 100644
index 000000000000..29c33a265f37
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i6
@@ -0,0 +1,12 @@
+pass in on lo0(!) fastroute from any to any
+pass in on lo0(!) to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on lo0(!) dup-to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+pass in on le0(!) to hme0:10.1.1.1 dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32
+block in quick on qe0(!) to qe1(!) from any to any
+block in quick to qe1(!) from any to any
+pass out quick dup-to hme0(!) from any to any
+pass out quick on hme0(!) reply-to hme1(!) from any to any
+pass in on le0(!) dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 inet all
+pass in quick fastroute all
diff --git a/contrib/netbsd-tests/ipf/expected/i7 b/contrib/netbsd-tests/ipf/expected/i7
new file mode 100644
index 000000000000..552f7f811ef3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i7
@@ -0,0 +1,14 @@
+pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 flags S/SA
+block in on lo0(!) proto tcp from any to any flags A/FSRPAU
+pass in on lo0(!) proto tcp from any to any flags /SPA
+block in on lo0(!) proto tcp from any to any flags C/A
+pass in on lo0(!) proto tcp from any to any flags S/SA
+block in on lo0(!) proto tcp from any to any flags S/SA
+pass in on lo0(!) proto tcp from any to any flags S/FSRPAU
+block in on lo0(!) proto tcp from any to any flags /A
+pass in on lo0(!) proto tcp from any to any flags S/SA
+pass in on lo0(!) proto tcp from any to any flags S/SA
+block in on lo0(!) proto tcp from any to any flags S/SA
+pass in on lo0(!) proto tcp from any to any flags S/FSRPAU
+block in on lo0(!) proto tcp from any to any flags /A
+pass in on lo0(!) proto tcp from any to any flags S/SA
diff --git a/contrib/netbsd-tests/ipf/expected/i8 b/contrib/netbsd-tests/ipf/expected/i8
new file mode 100644
index 000000000000..a85f1deb270f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i8
@@ -0,0 +1,66 @@
+pass in inet proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest
+block in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 15
+pass in inet proto icmp from any to any icmp-type unreach code 13
+pass in inet proto icmp from any to any icmp-type unreach code 8
+pass in inet proto icmp from any to any icmp-type unreach code 4
+pass in inet proto icmp from any to any icmp-type unreach code 9
+pass in inet proto icmp from any to any icmp-type unreach code 11
+pass in inet proto icmp from any to any icmp-type unreach code 14
+pass in inet proto icmp from any to any icmp-type unreach code 10
+pass in inet proto icmp from any to any icmp-type unreach code 12
+pass in inet proto icmp from any to any icmp-type unreach code 7
+pass in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 6
+pass in inet proto icmp from any to any icmp-type unreach code 0
+pass in inet proto icmp from any to any icmp-type unreach code 3
+pass in inet proto icmp from any to any icmp-type unreach code 2
+pass in inet proto icmp from any to any icmp-type unreach code 5
+pass in inet proto icmp from any to any icmp-type echo
+pass in inet proto icmp from any to any icmp-type echorep
+pass in inet proto icmp from any to any icmp-type inforeq
+pass in inet proto icmp from any to any icmp-type inforep
+pass in inet proto icmp from any to any icmp-type maskrep
+pass in inet proto icmp from any to any icmp-type maskreq
+pass in inet proto icmp from any to any icmp-type paramprob
+pass in inet proto icmp from any to any icmp-type redir
+pass in inet proto icmp from any to any icmp-type unreach
+pass in inet proto icmp from any to any icmp-type routerad
+pass in inet proto icmp from any to any icmp-type routersol
+pass in inet proto icmp from any to any icmp-type squench
+pass in inet proto icmp from any to any icmp-type timest
+pass in inet proto icmp from any to any icmp-type timestrep
+pass in inet proto icmp from any to any icmp-type timex
+pass in inet proto icmp from any to any icmp-type 254
+pass in inet proto icmp from any to any icmp-type 253 code 254
+pass in inet proto icmp from any to any icmp-type unreach code 15
+pass in inet proto icmp from any to any icmp-type unreach code 13
+pass in inet proto icmp from any to any icmp-type unreach code 8
+pass in inet proto icmp from any to any icmp-type unreach code 4
+pass in inet proto icmp from any to any icmp-type unreach code 9
+pass in inet proto icmp from any to any icmp-type unreach code 11
+pass in inet proto icmp from any to any icmp-type unreach code 14
+pass in inet proto icmp from any to any icmp-type unreach code 10
+pass in inet proto icmp from any to any icmp-type unreach code 12
+pass in inet proto icmp from any to any icmp-type unreach code 7
+pass in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 6
+pass in inet proto icmp from any to any icmp-type unreach code 0
+pass in inet proto icmp from any to any icmp-type unreach code 3
+pass in inet proto icmp from any to any icmp-type unreach code 2
+pass in inet proto icmp from any to any icmp-type unreach code 5
+pass in inet proto icmp from any to any icmp-type echo
+pass in inet proto icmp from any to any icmp-type echorep
+pass in inet proto icmp from any to any icmp-type inforeq
+pass in inet proto icmp from any to any icmp-type inforep
+pass in inet proto icmp from any to any icmp-type maskrep
+pass in inet proto icmp from any to any icmp-type maskreq
+pass in inet proto icmp from any to any icmp-type paramprob
+pass in inet proto icmp from any to any icmp-type redir
+pass in inet proto icmp from any to any icmp-type unreach
+pass in inet proto icmp from any to any icmp-type routerad
+pass in inet proto icmp from any to any icmp-type routersol
+pass in inet proto icmp from any to any icmp-type squench
+pass in inet proto icmp from any to any icmp-type timest
+pass in inet proto icmp from any to any icmp-type timestrep
+pass in inet proto icmp from any to any icmp-type timex
diff --git a/contrib/netbsd-tests/ipf/expected/i9 b/contrib/netbsd-tests/ipf/expected/i9
new file mode 100644
index 000000000000..deecd17d3a1d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/i9
@@ -0,0 +1,17 @@
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with short,frag
+block in from any to any with ipopts
+pass in inet from any to any with opt nop,rr,zsu
+pass in inet from any to any with opt nop,rr,zsu not opt lsrr,ssrr
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with not frag
+pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with frag,frag-body
+pass in proto tcp from any to any flags S/FSRPAU with not oow keep state # count 0
+block in proto tcp from any to any with oow
+pass in proto tcp from any to any flags S/FSRPAU with not bad,bad-src,bad-nat
+block in proto tcp from any to any flags S/FSRPAU with bad,not bad-src,not bad-nat
+pass in quick from any to any with not short
+block in quick from any to any with not nat
+pass in quick from any to any with not frag-body
+block in quick from any to any with not lowttl
+pass in from any to any with not ipopts,mbcast,not bcast,mcast,not state
+block in from any to any with not mbcast,bcast,not mcast,state
+pass in inet from any to any with opt mtup,mtur,encode,ts,tr,sec,e-sec,cipso,satid,ssrr,addext,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump
diff --git a/contrib/netbsd-tests/ipf/expected/in1 b/contrib/netbsd-tests/ipf/expected/in1
new file mode 100644
index 000000000000..2f1cf31df00a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in1
@@ -0,0 +1,31 @@
+map le0 0/0 -> 0/32
+map le0 0.0.0.1/32 -> 0.0.0.1/32
+map le0 128.0.0.0/1 -> 0/0
+map le0 10.0.0.0/8 -> 1.2.3.0/24
+map le0 10.0.0.0/8 -> 1.2.3.0/24
+map le0 10.0.0.0/8 -> 1.2.3.0/24
+map le0 0.0.0.5/0.0.0.255 -> 1.2.3.0/24
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999
+map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto
+map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp auto
+map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp
+map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp
+map le0 0/0 -> 0/32 frag
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag
+map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp frag
+map le0 0/0 -> 0/32 age 10/10
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30/30
+map le0 0/0 -> 0/32 frag age 10/10
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30/30
+map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
+map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere
+map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000
+map ppp0,adsl0 0/0 -> 0/32
+map ppp0 from 192.168.0.0/16 to 0/0 port = 123 -> 0/32 age 30/1 udp
diff --git a/contrib/netbsd-tests/ipf/expected/in100 b/contrib/netbsd-tests/ipf/expected/in100
new file mode 100644
index 000000000000..dcf309754410
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in100
@@ -0,0 +1,3 @@
+rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32;
+rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32;
+rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.0/24;
diff --git a/contrib/netbsd-tests/ipf/expected/in100_6 b/contrib/netbsd-tests/ipf/expected/in100_6
new file mode 100644
index 000000000000..b81fa603ffc8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in100_6
@@ -0,0 +1,3 @@
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:0:0/96;
diff --git a/contrib/netbsd-tests/ipf/expected/in101 b/contrib/netbsd-tests/ipf/expected/in101
new file mode 100644
index 000000000000..04e234c2f164
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in101
@@ -0,0 +1,4 @@
+rewrite in on bge0 proto icmp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32;
+rewrite in on bge0 proto udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32;
+rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32;
+rewrite in on bge0 proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24,20202 dst 4.4.4.0/24,10101;
diff --git a/contrib/netbsd-tests/ipf/expected/in101_6 b/contrib/netbsd-tests/ipf/expected/in101_6
new file mode 100644
index 000000000000..baed80712679
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in101_6
@@ -0,0 +1,4 @@
+rewrite in on bge0 inet6 proto icmp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 proto udp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128;
+rewrite out on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3::/24 dst 4::4:4:4/128;
+rewrite in on bge0 inet6 proto tcp/udp from 1:1:1::1/128 to 2:2::/32 -> src 3::/24,20202 dst 4::/24,10101;
diff --git a/contrib/netbsd-tests/ipf/expected/in102 b/contrib/netbsd-tests/ipf/expected/in102
new file mode 100644
index 000000000000..0a1b612d2f73
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in102
@@ -0,0 +1,5 @@
+rewrite in on bge0 proto tcp from 0/0 to 0/0 -> src 0/0 dst dstlist/a;
+rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee;
+rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat;
+rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
diff --git a/contrib/netbsd-tests/ipf/expected/in102_6 b/contrib/netbsd-tests/ipf/expected/in102_6
new file mode 100644
index 000000000000..0e3fa8e904d6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in102_6
@@ -0,0 +1,5 @@
+rewrite in on bge0 inet6 proto tcp from any to any -> src any dst dstlist/a;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to any -> src any dst dstlist/bee;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src any dst dstlist/cat;
+rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2/128 -> src any dst dstlist/bat;
+rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src any dst dstlist/ant;
diff --git a/contrib/netbsd-tests/ipf/expected/in1_6 b/contrib/netbsd-tests/ipf/expected/in1_6
new file mode 100644
index 000000000000..76513370f340
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in1_6
@@ -0,0 +1,29 @@
+map le0 inet6 any -> ::/128
+map le0 inet6 any -> any
+map le0 inet6 ::/1 -> any
+map le0 inet6 10::/16 -> 1:2:3::/96
+map le0 inet6 10::/16 -> 1:2:3::/96
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap udp 20000:29999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp 30000:39999
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp auto
+map ppp0 inet6 192:168::/32 -> ::/128 portmap udp auto
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp auto
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 1010 ftp/tcp
+map le0 inet6 any -> ::/128 frag
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag
+map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp frag
+map le0 inet6 any -> ::/128 age 10/10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 age 30/30
+map le0 inet6 any -> ::/128 frag age 10/10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20
+map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 10000:19999 frag age 30/30
+map fxp0 inet6 from 192::/18 to any port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp
+map thisisalonginte inet6 any -> ::/128 mssclamp 1452 tag freddyliveshere
+map bar0 inet6 any -> ::/128 icmpidmap icmp 1000:2000
+map ppp0,adsl0 inet6 any -> ::/128
+map ppp0 inet6 from 192:168::/32 to any port = 123 -> ::/128 age 30/1 udp
diff --git a/contrib/netbsd-tests/ipf/expected/in2 b/contrib/netbsd-tests/ipf/expected/in2
new file mode 100644
index 000000000000..068db50be19f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in2
@@ -0,0 +1,71 @@
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip
+rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip
+rdr le0 9.8.0.0/16 -> 1.1.1.1/32 ip
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 udp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp/udp
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp/udp frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp
+rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp
+rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555 tcp
+rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port = 5555 tcp
+rdr le0 0/0 -> 254.220.186.152/32 ip
+rdr le0 0/0 -> 254.220.186.152,254.220.186.152 ip
+rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555-7777 tcp
diff --git a/contrib/netbsd-tests/ipf/expected/in2_6 b/contrib/netbsd-tests/ipf/expected/in2_6
new file mode 100644
index 000000000000..7e9ef016cb28
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in2_6
@@ -0,0 +1,71 @@
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::/64 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> any port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp/udp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp/udp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp
+rdr ge0 inet6 9:8:7::6/128 port 21 -> 1:1:1::1/128 port 21 tcp proxy ftp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555 tcp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port = 5555 tcp
+rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98/128 ip
+rdr le0 inet6 any -> fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98,fe80:aa55:1234:5678:5a5a:a5a5:fedc:ba98 ip
+rdr adsl0,ppp0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1/128 port 5555-7777 tcp
diff --git a/contrib/netbsd-tests/ipf/expected/in3 b/contrib/netbsd-tests/ipf/expected/in3
new file mode 100644
index 000000000000..dac97c7d9cc1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in3
@@ -0,0 +1,5 @@
+bimap le0 0/0 -> 0/32
+bimap le0 0.0.0.1/32 -> 0.0.0.1/32
+bimap le0 128.0.0.0/1 -> 0/0
+bimap le0 10.0.0.0/8 -> 1.2.3.0/24
+bimap le0 10.0.5.0/24 -> 1.2.3.0/24
diff --git a/contrib/netbsd-tests/ipf/expected/in3_6 b/contrib/netbsd-tests/ipf/expected/in3_6
new file mode 100644
index 000000000000..60f3091a26d4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in3_6
@@ -0,0 +1,5 @@
+bimap le0 inet6 any -> ::/128
+bimap le0 inet6 any -> any
+bimap le0 inet6 ::/1 -> any
+bimap le0 inet6 10::/16 -> 1:2:3::/96
+bimap le0 inet6 10:0:5::/96 -> 1:2:3::/96
diff --git a/contrib/netbsd-tests/ipf/expected/in4 b/contrib/netbsd-tests/ipf/expected/in4
new file mode 100644
index 000000000000..ac8dce1bac8e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in4
@@ -0,0 +1,5 @@
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto
+map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto
diff --git a/contrib/netbsd-tests/ipf/expected/in4_6 b/contrib/netbsd-tests/ipf/expected/in4_6
new file mode 100644
index 000000000000..0e9bfd2ca42d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in4_6
@@ -0,0 +1,5 @@
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto
+map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto
diff --git a/contrib/netbsd-tests/ipf/expected/in5 b/contrib/netbsd-tests/ipf/expected/in5
new file mode 100644
index 000000000000..b7c6ef5d4125
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in5
@@ -0,0 +1,24 @@
+map le0 from 9.8.7.6/32 port > 1024 to 0/0 -> 1.1.1.1/32 portmap tcp 10000:20000
+map le0 from 9.8.7.6/32 port > 1024 ! to 1.2.3.4/32 -> 1.1.1.1/32 portmap tcp 10000:20000
+rdr le0 from 0/0 to 9.8.7.6/32 port = 0 -> 1.1.1.1/32 port 0 tcp
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip
+rdr le0 ! from 1.2.3.4/32 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 udp
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp/udp
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20
+rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20/20
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag age 30/30
+rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40/40
diff --git a/contrib/netbsd-tests/ipf/expected/in5_6 b/contrib/netbsd-tests/ipf/expected/in5_6
new file mode 100644
index 000000000000..a1925a26137b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in5_6
@@ -0,0 +1,24 @@
+map le0 inet6 from 9:8:7::6/128 port > 1024 to any -> 1:1:1::1/128 portmap tcp 10000:20000
+map le0 inet6 from 9:8:7::6/128 port > 1024 ! to 1:2:3::4/128 -> 1:1:1::1/128 portmap tcp 10000:20000
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1/128 port 0 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 ! from 1:2:3::4/128 to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 udp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp/udp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/10
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 ip frag age 10/20
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1/128 icmp frag age 10/10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag age 20/20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1/128 port 888 tcp round-robin frag age 30/30
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag age 40/40
diff --git a/contrib/netbsd-tests/ipf/expected/in6 b/contrib/netbsd-tests/ipf/expected/in6
new file mode 100644
index 000000000000..fefc0522c7d8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in6
@@ -0,0 +1,8 @@
+map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp
+map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp
+map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp
+map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp
+map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp
+map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp
+map foo0 from 0/0 port 1 >< 20 to 0/0 port 20 <> 40 -> 0/32 tcp/udp
+map foo0 from 0/0 port 10:20 to 0/0 port 30:40 -> 0/32 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/expected/in6_6 b/contrib/netbsd-tests/ipf/expected/in6_6
new file mode 100644
index 000000000000..ee8a35c7a8d3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in6_6
@@ -0,0 +1,8 @@
+map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp
+map foo0 inet6 from any port = 1 to any port != 0 -> ::/32 udp
+map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp
+map foo0 inet6 from any port < 1 to any port > 0 -> ::/32 tcp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> ::/32 tcp/udp
+map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> ::/32 tcp/udp
+map foo0 inet6 from any port 10:20 to any port 30:40 -> ::/32 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/expected/in7 b/contrib/netbsd-tests/ipf/expected/in7
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/ipf/expected/in8_6 b/contrib/netbsd-tests/ipf/expected/in8_6
new file mode 100644
index 000000000000..ab23b84476d2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/in8_6
@@ -0,0 +1,6 @@
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
diff --git a/contrib/netbsd-tests/ipf/expected/ip1 b/contrib/netbsd-tests/ipf/expected/ip1
new file mode 100644
index 000000000000..cee783193867
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ip1
@@ -0,0 +1,68 @@
+table role=ipf type=tree number=1
+	{; };
+table role=ipf type=tree number=100
+	{ 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=nat type=tree number=110
+	{ 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=auth type=tree number=120
+	{ 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=count type=tree number=130
+	{ 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+table role=ipf type=hash number=2 size=1
+	{; };
+table role=ipf type=hash number=200 size=5
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role=nat type=hash number=210 size=5
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role=auth type=hash number=220 size=5
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role=count type=hash number=230 size=5
+	{ 0/0; 4/32; 1.2.3.4/32; };
+table role=ipf type=hash number=240 size=5 seed=101
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role=nat type=hash number=250 size=5 seed=101
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role=auth type=hash number=260 size=5 seed=101
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role=count type=hash number=270 size=5 seed=101
+	{ 0/0; 4/32; 1.2.3.4/32; };
+table role=ipf type=hash number=2000 size=1001
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role=nat type=hash number=2000 size=1001
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role=auth type=hash number=2000 size=1001
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role=count type=hash number=2000 size=1001
+	{ 0/0; 4/32; 1.2.3.4/32; };
+table role=ipf type=hash number=100 size=1001 seed=101
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role=nat type=hash number=100 size=1001 seed=101
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role=auth type=hash number=100 size=1001 seed=101
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role=count type=hash number=100 size=1001 seed=101
+	{ 0/0; 4/32; 1.2.3.4/32; };
+group-map in role=ipf number=300 size=5
+	{ 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=303; };
+group-map in role=nat number=300 size=5
+	{ 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=303; };
+group-map in role=auth number=300 size=5
+	{ 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=303; };
+group-map in role=count number=300 size=5
+	{ 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=303; };
+group-map out role=ipf number=400 size=5
+	{ 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=606; };
+group-map out role=nat number=400 size=5
+	{ 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=606; };
+group-map out role=auth number=400 size=5
+	{ 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=606; };
+group-map out role=count number=400 size=5
+	{ 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=606; };
+group-map in role=ipf number=500 size=5
+	{ 0/0, group=10; 5/32, group=800; 1.2.3.4/32, group=606; };
+group-map in role=nat number=500 size=5
+	{ 0/0, group=10; 6/32, group=800; 1.2.3.4/32, group=606; };
+group-map in role=auth number=500 size=5
+	{ 0/0, group=10; 7/32, group=800; 1.2.3.4/32, group=606; };
+group-map in role=count number=500 size=5
+	{ 0/0, group=10; 8/32, group=800; 1.2.3.4/32, group=606; };
diff --git a/contrib/netbsd-tests/ipf/expected/ip2 b/contrib/netbsd-tests/ipf/expected/ip2
new file mode 100644
index 000000000000..3de3c471fc92
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ip2
@@ -0,0 +1,2 @@
+table role=ipf type=tree name=letters
+	{ 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; };
diff --git a/contrib/netbsd-tests/ipf/expected/ip3 b/contrib/netbsd-tests/ipf/expected/ip3
new file mode 100644
index 000000000000..48dd074a4c04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ip3
@@ -0,0 +1,14 @@
+pool ipf/dstlist (name fred; policy round-robin;)
+	{ 3.3.3.3; };
+pool ipf/dstlist (name jack; policy weighting connection;)
+	{ 4.4.4.4; bge0:5.5.5.5; };
+pool ipf/dstlist (name jill; policy random;)
+	{ 1.1.1.1; bge0:2.2.2.2; };
+table role=nat type=hash name=noproxy size=3
+	{ 1.1.1.1/32; 2.2.2.2/32; };
+table role=nat type=tree name=raw
+	{ 1.1.1.1/32; 2.2.2.2/32; };
+pool all/dstlist (name jill; policy random;)
+	{ 1.1.1.1; bge0:2.2.2.2; };
+table role=all type=hash name=noproxy size=3
+	{ 1.1.1.1/32; 2.2.2.2/32; };
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.1 b/contrib/netbsd-tests/ipf/expected/ipv6.1
new file mode 100644
index 000000000000..9fd54371f14b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.1
@@ -0,0 +1,4 @@
+pass
+pass
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.2 b/contrib/netbsd-tests/ipf/expected/ipv6.2
new file mode 100644
index 000000000000..ba1581b489c6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.2
@@ -0,0 +1,15 @@
+nomatch
+block
+nomatch
+block
+--------
+block
+nomatch
+block
+nomatch
+--------
+pass
+pass
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.3 b/contrib/netbsd-tests/ipf/expected/ipv6.3
new file mode 100644
index 000000000000..58cddec82dd5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.3
@@ -0,0 +1,6 @@
+pass
+nomatch
+nomatch
+nomatch
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.4 b/contrib/netbsd-tests/ipf/expected/ipv6.4
new file mode 100644
index 000000000000..e3ae842a7474
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.4
@@ -0,0 +1,51 @@
+pass
+pass
+nomatch
+nomatch
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+--------
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+pass
+block
+nomatch
+nomatch
+nomatch
+pass
+pass
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.5 b/contrib/netbsd-tests/ipf/expected/ipv6.5
new file mode 100644
index 000000000000..3133a7f09e7f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.5
@@ -0,0 +1,6 @@
+pass
+nomatch
+--------
+block
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/ipv6.6 b/contrib/netbsd-tests/ipf/expected/ipv6.6
new file mode 100644
index 000000000000..efd04212578c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ipv6.6
@@ -0,0 +1,10 @@
+pass
+pass
+pass
+pass
+--------
+nomatch
+nomatch
+block
+nomatch
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/l1 b/contrib/netbsd-tests/ipf/expected/l1
new file mode 100644
index 000000000000..e4a081d8e825
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/l1
@@ -0,0 +1,56 @@
+log in all
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN
+01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN
+--------
+pass in on anon0 all head 100
+--------
+pass in log quick from 3.3.3.3 to any group 100
+--------
+pass in log body quick from 2.2.2.2 to any
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+--------
+pass in log quick proto tcp from 1.1.1.1 to any flags S keep state
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN
+01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN
+--------
+pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+--------
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN
+01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN
+01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/l1.b b/contrib/netbsd-tests/ipf/expected/l1.b
new file mode 100644
index 000000000000..e06e486fcf3a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/l1.b
@@ -0,0 +1,56 @@
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN
+01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN
+--------
+--------
+--------
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01 02 03 04 05 06 07 08 09 0a 0b 0d                    ............
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61        ..............@a
+42 63 44 65 46 67 48 69 4a 6b 4c 6d                    BcDeFgHiJkLm
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+--------
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN
+01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN
+--------
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+--------
+missed 1 ipf log entries: 0 1
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN
+01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN
+01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT
+01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN
+01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN
+01 02 03 04 05 06 07 08 09 0a 0b 0d                    ............
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN
+01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61        ..............@a
+42 63 44 65 46 67 48 69 4a 6b 4c 6d                    BcDeFgHiJkLm
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN
+01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN
+--------
diff --git a/contrib/netbsd-tests/ipf/expected/n1 b/contrib/netbsd-tests/ipf/expected/n1
new file mode 100644
index 000000000000..20eaedc8ea89
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n1
@@ -0,0 +1,197 @@
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+List of active MAP/Redirect filters:
+map zx0 10.1.1.1/32 -> 10.2.2.2/32
+
+List of active sessions:
+MAP 10.1.1.1        <- -> 10.2.2.2        [10.4.3.2]
+MAP 10.1.1.1        <- -> 10.2.2.2        [10.1.1.2]
+
+Hostmap table:
+10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2
+15
+> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 48(20) 1 10.3.4.5 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1
+> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.1.1.2
+15
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.3.4.5 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.5/32
+
+List of active sessions:
+MAP 10.1.1.3        <- -> 10.3.4.5        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.5        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.5        [10.4.3.2]
+MAP 10.1.1.1        <- -> 10.3.4.5        [10.4.3.2]
+MAP 10.1.1.2        1026  <- -> 10.3.4.5        1026  [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        1025  [10.1.1.1 1025]
+MAP 10.1.1.2        <- -> 10.3.4.5        [10.1.1.1]
+MAP 10.1.1.0        <- -> 10.3.4.5        [10.1.1.2]
+
+Hostmap table:
+10.1.1.3,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3)
+10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.3.4.3 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.3.4.3 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.3.4.4 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.3.4.4 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.0/24
+
+List of active sessions:
+MAP 10.1.1.3        <- -> 10.3.4.4        [10.4.3.4]
+MAP 10.1.1.3        <- -> 10.3.4.4        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.3        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.3        [10.4.3.2]
+MAP 10.1.1.1        <- -> 10.3.4.3        [10.4.3.2]
+MAP 10.1.1.2        1026  <- -> 10.3.4.3        1026  [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.3        1025  [10.1.1.1 1025]
+MAP 10.1.1.2        <- -> 10.3.4.3        [10.1.1.1]
+MAP 10.1.1.1        <- -> 10.3.4.2        [10.1.1.2]
+MAP 10.1.1.0        <- -> 10.3.4.1        [10.1.1.2]
+
+Hostmap table:
+10.1.1.3,10.4.3.4 -> 10.3.4.4,0.0.0.0 (use = 2)
+10.1.1.2,10.4.3.4 -> 10.3.4.3,0.0.0.0 (use = 1)
+10.1.1.2,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1)
+10.1.1.1,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.3,0.0.0.0 (use = 3)
+10.1.1.1,10.1.1.2 -> 10.3.4.2,0.0.0.0 (use = 1)
+10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n10 b/contrib/netbsd-tests/ipf/expected/n10
new file mode 100644
index 000000000000..0c03ff088b70
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n10
@@ -0,0 +1,72 @@
+4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 655d 0000 0204 0064 
+
+List of active MAP/Redirect filters:
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100
+
+List of active sessions:
+MAP 192.168.1.3     32818 <- -> 203.203.203.203 32818 [150.203.224.2 21]
+
+Hostmap table:
+192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 61d9 0000 0204 03e8 
+
+List of active MAP/Redirect filters:
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000
+
+List of active sessions:
+MAP 192.168.1.3     32818 <- -> 203.203.203.203 32818 [150.203.224.2 21]
+
+Hostmap table:
+192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 600d 0000 0204 05b4 
+
+List of active MAP/Redirect filters:
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000
+
+List of active sessions:
+MAP 192.168.1.3     32818 <- -> 203.203.203.203 32818 [150.203.224.2 21]
+
+Hostmap table:
+192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n100 b/contrib/netbsd-tests/ipf/expected/n100
new file mode 100644
index 000000000000..80f00a178f30
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n100
@@ -0,0 +1,33 @@
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3
+> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1
+> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.2
+> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.3
+> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.4
+> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1
+> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203
+> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.5,203
+List of active MAP/Redirect filters:
+rewrite out on zx0 from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16;
+
+List of active sessions:
+RWR-MAP 1.1.1.1         101   2.2.2.3         203  <- -> 4.4.4.4         101   6.6.0.5         203  
+RWR-MAP 1.1.1.1         2.2.2.4        <- -> 4.4.4.4         6.6.0.4        
+RWR-MAP 1.2.1.2         2.2.2.3        <- -> 4.4.4.4         6.6.0.3        
+RWR-MAP 1.1.1.2         2.2.2.3        <- -> 4.4.4.4         6.6.0.2        
+RWR-MAP 1.1.1.1         2.2.2.3        <- -> 4.4.4.4         6.6.0.1        
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n101 b/contrib/netbsd-tests/ipf/expected/n101
new file mode 100644
index 000000000000..ad0ad97bc3a6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n101
@@ -0,0 +1,29 @@
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3
+> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203
+> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.1,203
+List of active MAP/Redirect filters:
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16;
+
+List of active sessions:
+RWR-MAP 1.1.1.1         101   2.2.2.3         203  <- -> 4.4.4.4         101   6.6.0.1         203  
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n102 b/contrib/netbsd-tests/ipf/expected/n102
new file mode 100644
index 000000000000..a2f130ee8a52
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n102
@@ -0,0 +1,29 @@
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4
+> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3
+> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203
+> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,203
+List of active MAP/Redirect filters:
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-2000 dst 6.6.0.0/16;
+
+List of active sessions:
+RWR-MAP 1.1.1.1         101   2.2.2.3         203  <- -> 4.4.4.4         1000  6.6.0.1         203  
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n103 b/contrib/netbsd-tests/ipf/expected/n103
new file mode 100644
index 000000000000..31ed7404a063
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n103
@@ -0,0 +1,33 @@
+> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203
+> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000
+> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000
+> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.1,4000
+> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4000
+> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4001
+< zx0 ip #0 40(20) 6 2.2.2.3,4000 > 4.4.4.4,1000
+> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.2,4001
+List of active MAP/Redirect filters:
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,4000-4001;
+
+List of active sessions:
+RWR-MAP 7.7.7.7         101   2.2.2.3         203  <- -> 4.4.4.4         1000  6.6.0.2         4001 
+RWR-MAP 5.5.5.5         101   2.2.2.3         203  <- -> 4.4.4.4         1001  6.6.0.2         4001 
+RWR-MAP 10.10.10.10     101   2.2.2.3         203  <- -> 4.4.4.4         1001  6.6.0.2         4000 
+RWR-MAP 1.1.1.2         101   2.2.2.3         203  <- -> 4.4.4.4         1001  6.6.0.1         4000 
+RWR-MAP 1.1.1.1         101   2.2.2.3         203  <- -> 4.4.4.4         1000  6.6.0.1         4000 
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n104 b/contrib/netbsd-tests/ipf/expected/n104
new file mode 100644
index 000000000000..3b8a9de2e87b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n104
@@ -0,0 +1,50 @@
+4500 0028 0001 0000 ff06 b1c3 0404 0001 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623f 0000 
+
+4500 0028 0002 0000 ff06 b5c8 0202 0202 0101 0101 00cb 0065 0000 0001 1000 0001 5010 2000 789d 0000 
+
+4500 0028 0003 0000 ff06 b1c0 0404 0002 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623e 0000 
+
+4500 0028 0004 0000 ff06 b5c6 0202 0202 0101 0101 00cb 0066 0000 0001 1000 0001 5010 2000 789c 0000 
+
+4500 0028 0005 0000 ff06 b1be 0404 0002 0606 0001 03e9 0fa0 0000 0001 1000 0001 5010 2000 623d 0000 
+
+4500 0028 0006 0000 ff06 b5c4 0202 0202 0101 0101 00cb 0067 0000 0001 1000 0001 5010 2000 789b 0000 
+
+4500 0028 0007 0000 ff06 b1bb 0404 0002 0606 0002 03e9 0fa0 0000 0001 1000 0001 5010 2000 623c 0000 
+
+4500 0028 0008 0000 ff06 b5c2 0202 0202 0101 0101 00cb 0068 0000 0001 1000 0001 5010 2000 789a 0000 
+
+4500 0028 0009 0000 ff06 b1b9 0404 0002 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623b 0000 
+
+4500 0028 000a 0000 ff06 b5c0 0202 0202 0101 0101 00cb 0069 0000 0001 1000 0001 5010 2000 7899 0000 
+
+4500 0028 000b 0000 ff06 b1b6 0404 0003 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623a 0000 
+
+4500 0028 000c 0000 ff06 b5be 0202 0202 0101 0101 00cb 006a 0000 0001 1000 0001 5010 2000 7898 0000 
+
+List of active MAP/Redirect filters:
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.0.0/24,1000-1001 dst 6.6.0.0/16,4000-4001;
+
+List of active sessions:
+RWR-MAP 1.1.1.1         106   2.2.2.2         203  <- -> 4.4.0.3         1001  6.6.0.2         4001 
+RWR-MAP 1.1.1.1         105   2.2.2.2         203  <- -> 4.4.0.2         1001  6.6.0.2         4001 
+RWR-MAP 1.1.1.1         104   2.2.2.2         203  <- -> 4.4.0.2         1001  6.6.0.2         4000 
+RWR-MAP 1.1.1.1         103   2.2.2.2         203  <- -> 4.4.0.2         1001  6.6.0.1         4000 
+RWR-MAP 1.1.1.1         102   2.2.2.2         203  <- -> 4.4.0.2         1000  6.6.0.1         4000 
+RWR-MAP 1.1.1.1         101   2.2.2.2         203  <- -> 4.4.0.1         1000  6.6.0.1         4000 
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n105 b/contrib/netbsd-tests/ipf/expected/n105
new file mode 100644
index 000000000000..d45a4af9840e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n105
@@ -0,0 +1,25 @@
+4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 
+
+4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 
+
+List of active MAP/Redirect filters:
+rewrite in on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128;
+
+List of active sessions:
+RWR-RDR 1.1.1.1         101   2.2.2.2         80   <- -> 4.4.4.4         1000  6.6.0.1         3128 
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n106 b/contrib/netbsd-tests/ipf/expected/n106
new file mode 100644
index 000000000000..d466e6553353
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n106
@@ -0,0 +1,25 @@
+4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 
+
+4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 
+
+List of active MAP/Redirect filters:
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128;
+
+List of active sessions:
+RWR-MAP 1.1.1.1         101   2.2.2.2         80   <- -> 4.4.4.4         1000  6.6.0.1         3128 
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n11 b/contrib/netbsd-tests/ipf/expected/n11
new file mode 100644
index 000000000000..ea11b93e7caf
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n11
@@ -0,0 +1,124 @@
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 1.6.7.8 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+List of active MAP/Redirect filters:
+bimap zx0 10.1.1.1/32 -> 1.6.7.8/32
+
+List of active sessions:
+BIMAP 10.1.1.1        <- -> 1.6.7.8         [10.1.1.2]
+
+Hostmap table:
+10.1.1.1,10.1.1.2 -> 1.6.7.8,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2
+15
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.1
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.1.1.0
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+List of active MAP/Redirect filters:
+bimap zx0 10.1.1.0/24 -> 10.2.2.2/32
+
+List of active sessions:
+BIMAP 10.1.1.0        <- -> 10.2.2.2        [10.2.3.4]
+BIMAP 10.1.1.2        <- -> 10.2.2.2        [10.1.1.1]
+BIMAP 10.1.1.0        <- -> 10.2.2.2        [10.1.1.2]
+
+Hostmap table:
+10.1.1.2,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.0,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.3.4.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.1
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.5
+List of active MAP/Redirect filters:
+bimap zx0 10.1.1.0/24 -> 10.3.4.0/24
+
+List of active sessions:
+BIMAP 10.1.1.5        <- -> 10.3.4.5        [10.1.1.2]
+BIMAP 10.1.1.5        <- -> 10.3.4.5        [10.1.1.1]
+BIMAP 10.1.1.5        <- -> 10.3.4.5        [10.1.1.0]
+BIMAP 10.1.1.2        <- -> 10.3.4.2        [10.1.1.1]
+BIMAP 10.1.1.1        <- -> 10.3.4.1        [10.1.1.2]
+BIMAP 10.1.1.0        <- -> 10.3.4.0        [10.1.1.2]
+
+Hostmap table:
+10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n11_6 b/contrib/netbsd-tests/ipf/expected/n11_6
new file mode 100644
index 000000000000..f1c80de81ba9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n11_6
@@ -0,0 +1,124 @@
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 1:0:0:0:0:6:7:8 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+List of active MAP/Redirect filters:
+bimap zx0 inet6 10:1:1::1/128 -> 1::6:7:8/128
+
+List of active sessions:
+BIMAP 10:1:1::1 <- -> 1::6:7:8 [10:1:1::2]
+
+Hostmap table:
+10:1:1::1,10:1:1::2 -> 1::6:7:8,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
+16
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:1:1:0:0:0:0:0
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+List of active MAP/Redirect filters:
+bimap zx0 inet6 10:1:1::/112 -> 10::2:2:2/128
+
+List of active sessions:
+BIMAP 10:1:1:: <- -> 10::2:2:2 [10::2:3:4]
+BIMAP 10:1:1::2 <- -> 10::2:2:2 [10:1:1::1]
+BIMAP 10:1:1:: <- -> 10::2:2:2 [10:1:1::2]
+
+Hostmap table:
+10:1:1::2,10:1:1::1 -> 10::2:2:2,any (use = 1)
+10:1:1::,10:1:1::2 -> 10::2:2:2,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:5
+List of active MAP/Redirect filters:
+bimap zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
+
+List of active sessions:
+BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::2]
+BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::1]
+BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::]
+BIMAP 10:1:1::2 <- -> 10::3:4:2 [10:1:1::1]
+BIMAP 10:1:1::1 <- -> 10::3:4:1 [10:1:1::2]
+BIMAP 10:1:1:: <- -> 10::3:4:0 [10:1:1::2]
+
+Hostmap table:
+10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1)
+10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n12 b/contrib/netbsd-tests/ipf/expected/n12
new file mode 100644
index 000000000000..56b3a781c9fd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n12
@@ -0,0 +1,28 @@
+4510 0040 2020 4000 4006 9478 c0a8 01bc c0a8 0303 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 
+
+4500 003c 00b0 4000 fe06 7964 c0a8 0303 c0a8 7e53 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 
+
+4510 0034 493b 4000 4006 6b69 c0a8 01bc c0a8 0303 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797 
+
+List of active MAP/Redirect filters:
+map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential
+
+List of active sessions:
+MAP 192.168.126.83  4802  <- -> 192.168.1.188   10000 [192.168.3.3 23]
+
+Hostmap table:
+192.168.126.83,192.168.3.3 -> 0.0.0.0,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n12_6 b/contrib/netbsd-tests/ipf/expected/n12_6
new file mode 100644
index 000000000000..9ef040aaafd9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n12_6
@@ -0,0 +1,28 @@
+6000 0000 002c 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 
+
+6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 7e00 0000 0000 0000 0000 0000 0053 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 
+
+6000 0000 0020 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797 
+
+List of active MAP/Redirect filters:
+map le0 inet6 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000
+
+List of active sessions:
+MAP c0a8:7e00::53 4802  <- -> c0a8:100::bc 10000 [c0a8:300::3 23]
+
+Hostmap table:
+c0a8:7e00::53,c0a8:300::3 -> any,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n13 b/contrib/netbsd-tests/ipf/expected/n13
new file mode 100644
index 000000000000..e6d26b2a5480
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n13
@@ -0,0 +1,32 @@
+> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.1
+> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.2
+> le0 ip #0 20(20) 0 203.1.1.24 > 150.1.1.2
+> le0 ip #0 20(20) 0 203.1.1.25 > 150.1.1.1
+List of active MAP/Redirect filters:
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
+
+List of active sessions:
+MAP 192.168.1.3     <- -> 203.1.1.25      [150.1.1.1]
+MAP 192.168.1.2     <- -> 203.1.1.24      [150.1.1.2]
+MAP 192.168.1.1     <- -> 203.1.1.23      [150.1.1.2]
+MAP 192.168.1.1     <- -> 203.1.1.23      [150.1.1.1]
+
+Hostmap table:
+192.168.1.3,150.1.1.1 -> 203.1.1.25,0.0.0.0 (use = 1)
+192.168.1.2,150.1.1.2 -> 203.1.1.24,0.0.0.0 (use = 1)
+192.168.1.1,150.1.1.2 -> 203.1.1.23,0.0.0.0 (use = 1)
+192.168.1.1,150.1.1.1 -> 203.1.1.23,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n13_6 b/contrib/netbsd-tests/ipf/expected/n13_6
new file mode 100644
index 000000000000..d3b5fe7fb99d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n13_6
@@ -0,0 +1,32 @@
+> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.1
+> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.2
+> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:24 > 150.1.1.2
+> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:25 > 150.1.1.1
+List of active MAP/Redirect filters:
+map le0 inet6 192:168:0::0/48 -> range 203:0:1::1:23-203:0:1::3:45
+
+List of active sessions:
+MAP 192.168.1.3 <- -> 203:0:1::1:25 [150.1.1.1]
+MAP 192.168.1.2 <- -> 203:0:1::1:24 [150.1.1.2]
+MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.2]
+MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.1]
+
+Hostmap table:
+192.168.1.3,150.1.1.1 -> 203:0:1:0:0:0:1:25,any (use = 1)
+192.168.1.2,150.1.1.2 -> 203:0:1:0:0:0:1:24,any (use = 1)
+192.168.1.1,150.1.1.2 -> 203:0:1:0:0:0:1:23,any (use = 1)
+192.168.1.1,150.1.1.1 -> 203:0:1:0:0:0:1:23,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n14 b/contrib/netbsd-tests/ipf/expected/n14
new file mode 100644
index 000000000000..7b1a19ea931a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n14
@@ -0,0 +1,30 @@
+< gre0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.254,80
+< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80
+< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80
+15
+List of active MAP/Redirect filters:
+rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
+
+List of active sessions:
+RDR 10.1.1.254      80    <- -> 203.1.1.1       80    [10.2.2.7 2000]
+RDR 10.1.1.253      80    <- -> 203.1.1.1       80    [10.2.2.6 2000]
+RDR 10.1.1.254      80    <- -> 203.1.1.1       80    [10.2.2.5 2000]
+
+Hostmap table:
+10.2.2.7,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1)
+10.2.2.6,203.1.1.1 -> 253.1.1.10,0.0.0.0 (use = 1)
+10.2.2.5,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n14_6 b/contrib/netbsd-tests/ipf/expected/n14_6
new file mode 100644
index 000000000000..b999ee971d80
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n14_6
@@ -0,0 +1,30 @@
+< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2000 > 10:1:1:0:0:0:0:254,80
+< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:6,2000 > 10:1:1:0:0:0:0:253,80
+< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:7,2000 > 10:1:1:0:0:0:0:254,80
+< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2001 > 203:0:1:0:0:0:1:1,80
+List of active MAP/Redirect filters:
+rdr gre0 inet6 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
+
+List of active sessions:
+RDR 10:1:1::254 80    <- -> 203:0:1::1:1 80    [10::2:2:7 2000]
+RDR 10:1:1::253 80    <- -> 203:0:1::1:1 80    [10::2:2:6 2000]
+RDR 10:1:1::254 80    <- -> 203:0:1::1:1 80    [10::2:2:5 2000]
+
+Hostmap table:
+10::2:2:7,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 1)
+10::2:2:6,203:0:1:0:0:0:1:1 -> 253:0:1:0:0:0:1:10,any (use = 1)
+10::2:2:5,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 3)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n15 b/contrib/netbsd-tests/ipf/expected/n15
new file mode 100644
index 000000000000..3889f82081df
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n15
@@ -0,0 +1,47 @@
+< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
+15
+List of active MAP/Redirect filters:
+rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp
+
+List of active sessions:
+RDR 3.3.3.3         80    <- -> 5.5.5.5         80    [9.9.9.9 10011]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80
+< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,81
+List of active MAP/Redirect filters:
+rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80-88 tcp
+
+List of active sessions:
+RDR 3.3.3.3         81    <- -> 2.2.2.2         80    [9.9.9.9 10011]
+RDR 3.3.3.3         80    <- -> 5.5.5.5         80    [9.9.9.9 10011]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n15_6 b/contrib/netbsd-tests/ipf/expected/n15_6
new file mode 100644
index 000000000000..f01b72b68056
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n15_6
@@ -0,0 +1,47 @@
+< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
+16
+List of active MAP/Redirect filters:
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp
+
+List of active sessions:
+RDR 3:0:3::3:3 80    <- -> 5:5::5:5 80    [9:9:9::9 10011]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80
+< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,81
+List of active MAP/Redirect filters:
+rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp
+
+List of active sessions:
+RDR 3:0:3::3:3 81    <- -> 2::2:2:2 80    [9:9:9::9 10011]
+RDR 3:0:3::3:3 80    <- -> 5:5::5:5 80    [9:9:9::9 10011]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n16 b/contrib/netbsd-tests/ipf/expected/n16
new file mode 100644
index 000000000000..0eb3954e8572
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n16
@@ -0,0 +1,29 @@
+4520 0068 17e4 0000 6b11 cbba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 
+
+4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 
+
+4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33 0303 4ca1 0000 0000 4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 
+
+4500 0084 ee0f 0000 8001 4a21 45f8 4fc1 c05b ac33 0303 bf85 0000 0000 4520 0068 17e4 0000 6a11 3639 c05b ac33 45f8 4fc1 1194 94f8 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 
+
+List of active MAP/Redirect filters:
+rdr vlan0 from 0/0 to 69.248.79.193/32 port = 38136 -> 172.31.83.24/32 port 2013 udp
+
+List of active sessions:
+RDR 172.31.83.24    2013  <- -> 69.248.79.193   38136 [192.91.172.51 4500]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n17 b/contrib/netbsd-tests/ipf/expected/n17
new file mode 100644
index 000000000000..f336bb0fb8d7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n17
@@ -0,0 +1,24 @@
+4500 00a0 0000 0100 3f06 7555 0101 0101 0201 0101 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00a0 0000 0100 3f06 7553 0201 0101 0101 0103 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+List of active MAP/Redirect filters:
+bimap zx0 0/0 -> 1.1.1.3/32
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n18 b/contrib/netbsd-tests/ipf/expected/n18
new file mode 100644
index 000000000000..c51c11c9a52e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n18
@@ -0,0 +1,111 @@
+> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,30
+> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,31
+> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,32
+> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,33
+> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,34
+> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,35
+> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,36
+> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,37
+List of active MAP/Redirect filters:
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential
+
+List of active sessions:
+MAP 2.2.2.2         29    <- -> 1.1.1.1         4     [3.3.3.3 37]
+MAP 2.2.2.2         28    <- -> 1.1.1.1         3     [3.3.3.3 36]
+MAP 2.2.2.2         27    <- -> 1.1.1.1         2     [3.3.3.3 35]
+MAP 2.2.2.2         26    <- -> 1.1.1.1         1     [3.3.3.3 34]
+MAP 2.2.2.2         25    <- -> 1.1.1.1         4     [3.3.3.3 33]
+MAP 2.2.2.2         24    <- -> 1.1.1.1         3     [3.3.3.3 32]
+MAP 2.2.2.2         23    <- -> 1.1.1.1         2     [3.3.3.3 31]
+MAP 2.2.2.2         22    <- -> 1.1.1.1         1     [3.3.3.3 30]
+
+Hostmap table:
+2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30
+> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31
+> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32
+> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33
+> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34
+> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35
+> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
+> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
+List of active MAP/Redirect filters:
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential
+
+List of active sessions:
+MAP 2.2.2.2         29    <- -> 1.1.1.1         1007  [3.3.3.3 37]
+MAP 2.2.2.2         28    <- -> 1.1.1.1         1006  [3.3.3.3 36]
+MAP 2.2.2.2         27    <- -> 1.1.1.1         1005  [3.3.3.3 35]
+MAP 2.2.2.2         26    <- -> 1.1.1.1         1004  [3.3.3.3 34]
+MAP 2.2.2.2         25    <- -> 1.1.1.1         1003  [3.3.3.3 33]
+MAP 2.2.2.2         24    <- -> 1.1.1.1         1002  [3.3.3.3 32]
+MAP 2.2.2.2         23    <- -> 1.1.1.1         1001  [3.3.3.3 31]
+MAP 2.2.2.2         22    <- -> 1.1.1.1         1000  [3.3.3.3 30]
+
+Hostmap table:
+2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30
+> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31
+> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32
+> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33
+> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34
+> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35
+> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36
+> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37
+List of active MAP/Redirect filters:
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential
+
+List of active sessions:
+MAP 2.2.2.2         29    <- -> 1.1.1.1         1007  [3.3.3.3 37]
+MAP 2.2.2.2         28    <- -> 1.1.1.1         1006  [3.3.3.3 36]
+MAP 2.2.2.2         27    <- -> 1.1.1.1         1005  [3.3.3.3 35]
+MAP 2.2.2.2         26    <- -> 1.1.1.1         1004  [3.3.3.3 34]
+MAP 2.2.2.2         25    <- -> 1.1.1.1         1003  [3.3.3.3 33]
+MAP 2.2.2.2         24    <- -> 1.1.1.1         1002  [3.3.3.3 32]
+MAP 2.2.2.2         23    <- -> 1.1.1.1         1001  [3.3.3.3 31]
+MAP 2.2.2.2         22    <- -> 1.1.1.1         1000  [3.3.3.3 30]
+
+Hostmap table:
+2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n1_6 b/contrib/netbsd-tests/ipf/expected/n1_6
new file mode 100644
index 000000000000..347bf4aac4bc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n1_6
@@ -0,0 +1,197 @@
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128
+
+List of active sessions:
+MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2]
+MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2]
+
+Hostmap table:
+10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
+16
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2
+16
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128
+
+List of active sessions:
+MAP 10:1:1::3 <- -> 10::3:4:5 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::2]
+MAP 10:1:1::1 <- -> 10::3:4:5 [10:4:3::2]
+MAP 10:1:1::2 1026  <- -> 10::3:4:5 1026  [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 1025  [10:1:1::1 1025]
+MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1]
+MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2]
+
+Hostmap table:
+10:1:1::3,10:4:3::4 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:4:3::4 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:4:3::2 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10:4:3::2 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3)
+10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:2 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:3 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:0/112
+
+List of active sessions:
+MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4]
+MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::2]
+MAP 10:1:1::1 <- -> 10::3:4:3 [10:4:3::2]
+MAP 10:1:1::2 1026  <- -> 10::3:4:3 1026  [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:3 1025  [10:1:1::1 1025]
+MAP 10:1:1::2 <- -> 10::3:4:3 [10:1:1::1]
+MAP 10:1:1::1 <- -> 10::3:4:2 [10:1:1::2]
+MAP 10:1:1:: <- -> 10::3:4:1 [10:1:1::2]
+
+Hostmap table:
+10:1:1::3,10:4:3::4 -> 10::3:4:4,any (use = 2)
+10:1:1::2,10:4:3::4 -> 10::3:4:3,any (use = 1)
+10:1:1::2,10:4:3::2 -> 10::3:4:3,any (use = 1)
+10:1:1::1,10:4:3::2 -> 10::3:4:3,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:3,any (use = 3)
+10:1:1::1,10:1:1::2 -> 10::3:4:2,any (use = 1)
+10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n2 b/contrib/netbsd-tests/ipf/expected/n2
new file mode 100644
index 000000000000..836608a46ad7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n2
@@ -0,0 +1,191 @@
+> zx0 ip #0 40(20) 6 10.2.2.2,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.2.2.2,10001 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential
+
+List of active sessions:
+MAP 10.1.1.1        1025  <- -> 10.2.2.2        10001 [10.1.1.2 1025]
+MAP 10.1.1.1        1025  <- -> 10.2.2.2        10000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        10000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10.1.1.3        2003  <- -> 10.3.4.1        10008 [10.1.4.1 80]
+MAP 10.1.1.3        2002  <- -> 10.3.4.1        10007 [10.1.4.1 80]
+MAP 10.1.1.3        2001  <- -> 10.3.4.1        10006 [10.1.3.1 80]
+MAP 10.1.1.3        2000  <- -> 10.3.4.1        10005 [10.1.2.1 80]
+MAP 10.1.1.2        1025  <- -> 10.3.4.1        10004 [10.1.1.1 1025]
+MAP 10.1.1.2        1026  <- -> 10.3.4.1        10003 [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.1        10002 [10.1.1.1 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.1        10001 [10.1.1.2 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.1        10000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2)
+10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3)
+10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025
+15
+> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.1.1.3,2000
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
+
+List of active sessions:
+MAP 10.1.1.3        2003  <- -> 10.3.4.5        40000 [10.1.4.1 80]
+MAP 10.1.1.3        2002  <- -> 10.3.4.5        40001 [10.1.4.1 80]
+MAP 10.1.1.3        2001  <- -> 10.3.4.5        40000 [10.1.3.1 80]
+MAP 10.1.1.3        2000  <- -> 10.3.4.5        40001 [10.1.2.1 80]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        40000 [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        40001 [10.1.1.1 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.5        40001 [10.1.1.2 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.5        40000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2)
+10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 2)
+10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n200 b/contrib/netbsd-tests/ipf/expected/n200
new file mode 100644
index 000000000000..0f3c6a5adece
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n200
@@ -0,0 +1,25 @@
+4500 0044 0000 0000 ff11 bda6 7f00 0001 7f00 0001 2775 2775 0030 0000 4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 
+
+4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 
+
+List of active MAP/Redirect filters:
+divert in on bar0 proto tcp from 0/0 to 0/0 -> src 127.0.0.1/32,10101 dst 127.0.0.1/32,10101 udp;
+
+List of active sessions:
+DIV-RDR 127.0.0.1       10101 <- -> 88.88.88.88     80    [99.99.99.99 909]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n2_6 b/contrib/netbsd-tests/ipf/expected/n2_6
new file mode 100644
index 000000000000..08abc8f5b69c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n2_6
@@ -0,0 +1,191 @@
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10001 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential
+
+List of active sessions:
+MAP 10:1:1::1 1025  <- -> 10::2:2:2 10001 [10:1:1::2 1025]
+MAP 10:1:1::1 1025  <- -> 10::2:2:2 10000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1)
+10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 10000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10:1:1::3 2003  <- -> 10::3:4:1 10008 [10:1:4::1 80]
+MAP 10:1:1::3 2002  <- -> 10::3:4:1 10007 [10:1:4::1 80]
+MAP 10:1:1::3 2001  <- -> 10::3:4:1 10006 [10:1:3::1 80]
+MAP 10:1:1::3 2000  <- -> 10::3:4:1 10005 [10:1:2::1 80]
+MAP 10:1:1::2 1025  <- -> 10::3:4:1 10004 [10:1:1::1 1025]
+MAP 10:1:1::2 1026  <- -> 10::3:4:1 10003 [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:1 10002 [10:1:1::1 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:1 10001 [10:1:1::2 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:1 10000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2)
+10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1)
+10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3)
+10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
+16
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:1:1:0:0:0:0:3,2000
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
+
+List of active sessions:
+MAP 10:1:1::3 2003  <- -> 10::3:4:5 40000 [10:1:4::1 80]
+MAP 10:1:1::3 2002  <- -> 10::3:4:5 40001 [10:1:4::1 80]
+MAP 10:1:1::3 2001  <- -> 10::3:4:5 40000 [10:1:3::1 80]
+MAP 10:1:1::3 2000  <- -> 10::3:4:5 40001 [10:1:2::1 80]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 40000 [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 40001 [10:1:1::1 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:5 40001 [10:1:1::2 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:5 40000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2)
+10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1)
+10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 2)
+10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10:1:1::1 -> 10::3:4:5,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n3 b/contrib/netbsd-tests/ipf/expected/n3
new file mode 100644
index 000000000000..66ada76e930a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n3
@@ -0,0 +1,66 @@
+> zz0 ip #0 40(20) 6 192.168.2.1,1488 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.2.1,1276 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.2.1,1032 > 203.1.1.1,80
+> zz0 ip #0 28(20) 17 192.168.2.1,1032 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.2.1,65299 > 203.1.1.1,80
+List of active MAP/Redirect filters:
+map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto
+
+List of active sessions:
+MAP 10.1.255.255    65535 <- -> 192.168.2.1     65299 [203.1.1.1 80]
+MAP 10.1.0.0        32768 <- -> 192.168.2.1     1032  [203.1.1.1 80]
+MAP 10.1.0.0        32768 <- -> 192.168.2.1     1032  [203.1.1.1 80]
+MAP 10.1.1.1        252   <- -> 192.168.2.1     1276  [203.1.1.1 80]
+MAP 10.1.1.1        5000  <- -> 192.168.2.1     1488  [203.1.1.1 80]
+
+Hostmap table:
+10.1.255.255,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 1)
+10.1.0.0,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2)
+10.1.1.1,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zz0 ip #0 40(20) 6 192.168.1.1,1488 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.1.1,1276 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.1.0,1032 > 203.1.1.1,80
+> zz0 ip #0 28(20) 17 192.168.1.0,1032 > 203.1.1.1,80
+> zz0 ip #0 40(20) 6 192.168.1.255,65299 > 203.1.1.1,80
+List of active MAP/Redirect filters:
+map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252
+
+List of active sessions:
+MAP-BLOCK 10.1.255.255    65535 <- -> 192.168.1.255   65299 [203.1.1.1 80]
+MAP-BLOCK 10.1.0.0        32768 <- -> 192.168.1.0     1032  [203.1.1.1 80]
+MAP-BLOCK 10.1.0.0        32768 <- -> 192.168.1.0     1032  [203.1.1.1 80]
+MAP-BLOCK 10.1.1.1        252   <- -> 192.168.1.1     1276  [203.1.1.1 80]
+MAP-BLOCK 10.1.1.1        5000  <- -> 192.168.1.1     1488  [203.1.1.1 80]
+
+Hostmap table:
+10.1.255.255,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 1)
+10.1.0.0,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2)
+10.1.1.1,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n4 b/contrib/netbsd-tests/ipf/expected/n4
new file mode 100644
index 000000000000..746ef7e18583
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n4
@@ -0,0 +1,190 @@
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.2.2.1,10023
+> zx0 ip #0 40(20) 6 10.1.0.0,23 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 0/0 port 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.0.0        23    [10.3.3.3 12346]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053
+> zx0 ip #0 28(20) 17 10.1.1.0,53 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1/32 port 10053 udp
+
+List of active sessions:
+RDR 10.2.2.1        10053 <- -> 10.1.1.0        53    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
+15
+> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1/32 port 0 tcp
+
+List of active sessions:
+RDR 10.2.2.1        53    <- -> 10.1.1.1        53    [10.3.3.3 12345]
+RDR 10.2.2.1        23    <- -> 10.1.1.1        23    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53
+> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345
+< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23
+> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53
+> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345
+15
+> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.0/24 -> 10.2.2.1/32 ip
+
+List of active sessions:
+RDR 10.2.2.1        53    <- -> 10.1.1.0        53    [10.3.3.3 12345]
+RDR 10.2.2.1        53    <- -> 10.1.1.1        53    [10.3.3.3 12345]
+RDR 10.2.2.1        23    <- -> 10.1.1.1        23    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n4_6 b/contrib/netbsd-tests/ipf/expected/n4_6
new file mode 100644
index 000000000000..e9a5ce34507c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n4_6
@@ -0,0 +1,190 @@
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::/112 port 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:0:0:0:0:2:2:1,10023
+> zx0 ip6/0 20 0 6 10:1:0:0:0:0:0:0,23 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 any port 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:: 23    [10:3:3::3 12346]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:0,53 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::/112 port 53 -> 10::2:2:1/128 port 10053 udp
+
+List of active sessions:
+RDR 10::2:2:1 10053 <- -> 10:1:1:: 53    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+16
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::/112 port 0 -> 10::2:2:1/128 port 0 tcp
+
+List of active sessions:
+RDR 10::2:2:1 53    <- -> 10:1:1::1 53    [10:3:3::3 12345]
+RDR 10::2:2:1 23    <- -> 10:1:1::1 23    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53
+> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345
+16
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::/112 -> 10::2:2:1/128 ip
+
+List of active sessions:
+RDR 10::2:2:1 53    <- -> 10:1:1:: 53    [10:3:3::3 12345]
+RDR 10::2:2:1 53    <- -> 10:1:1::1 53    [10:3:3::3 12345]
+RDR 10::2:2:1 23    <- -> 10:1:1::1 23    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n5 b/contrib/netbsd-tests/ipf/expected/n5
new file mode 100644
index 000000000000..423bf485008c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n5
@@ -0,0 +1,533 @@
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.2.2.2 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.2.2.2,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.1.1/32 -> 10.2.2.2/32
+
+List of active sessions:
+MAP 10.1.1.1        1025  <- -> 10.2.2.2        1025  [10.3.4.5 40000]
+MAP 10.1.1.1        1026  <- -> 10.2.2.2        1026  [10.3.4.5 40000]
+MAP 10.1.1.1        <- -> 10.2.2.2        [10.1.2.1]
+MAP 10.1.1.1        1025  <- -> 10.2.2.2        1025  [10.1.1.2 1025]
+MAP 10.1.1.1        1025  <- -> 10.2.2.2        1025  [10.1.1.1 1025]
+MAP 10.1.1.1        <- -> 10.2.2.2        [10.4.3.2]
+MAP 10.1.1.1        <- -> 10.2.2.2        [10.1.1.2]
+
+Hostmap table:
+10.1.1.1,10.3.4.5 -> 10.2.2.2,0.0.0.0 (use = 2)
+10.1.1.1,10.1.2.1 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2
+15
+> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+15
+> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.5,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32
+
+List of active sessions:
+MAP 10.1.1.3        2003  <- -> 10.3.4.5        2003  [10.1.4.1 80]
+MAP 10.1.1.3        2002  <- -> 10.3.4.5        2002  [10.1.4.1 80]
+MAP 10.1.1.3        2001  <- -> 10.3.4.5        2001  [10.1.3.1 80]
+MAP 10.1.1.3        2000  <- -> 10.3.4.5        2000  [10.1.2.1 80]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        1025  [10.1.1.1 1025]
+MAP 10.1.1.1        <- -> 10.3.4.5        [10.1.2.1]
+MAP 10.1.1.0        <- -> 10.3.4.5        [10.1.1.2]
+MAP 10.1.1.1        1025  <- -> 10.3.4.5        1025  [10.1.1.2 1025]
+MAP 10.1.1.2        1026  <- -> 10.3.4.5        1026  [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        1025  [10.1.1.1 1025]
+MAP 10.1.1.2        <- -> 10.3.4.5        [10.1.1.1]
+MAP 10.1.1.0        <- -> 10.3.4.5        [10.1.1.2]
+
+Hostmap table:
+10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2)
+10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 4)
+10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.3.4.1 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.3.4.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.3.4.2 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+> zx0 ip #0 28(20) 17 10.3.4.3,1025 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24
+
+List of active sessions:
+MAP 10.1.1.2        1025  <- -> 10.3.4.3        1025  [10.3.4.5 40001]
+MAP 10.1.1.1        1025  <- -> 10.3.4.3        1025  [10.3.4.5 40000]
+MAP 10.1.1.1        1026  <- -> 10.3.4.3        1026  [10.3.4.5 40000]
+MAP 10.1.1.3        <- -> 10.3.4.2        [10.4.3.4]
+MAP 10.1.1.3        <- -> 10.3.4.2        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.1        [10.4.3.4]
+MAP 10.1.1.2        <- -> 10.3.4.1        [10.4.3.2]
+MAP 10.1.1.1        <- -> 10.3.4.1        [10.4.3.2]
+
+Hostmap table:
+10.1.1.2,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 1)
+10.1.1.1,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 2)
+10.1.1.3,10.4.3.4 -> 10.3.4.2,0.0.0.0 (use = 2)
+10.1.1.2,10.4.3.4 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.2,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+> zx0 ip #0 28(20) 17 10.3.4.5,10001 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        10001 [10.3.4.5 40001]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        10000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.1,10009 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.3.4.1,10010 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000
+> zx0 ip #0 28(20) 17 10.3.4.1,10011 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.3.4.1,10012 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10.1.2.1        80    <- -> 10.3.4.1        10012 [10.3.4.5 40001]
+MAP 10.1.1.2        1025  <- -> 10.3.4.1        10011 [10.3.4.5 40001]
+MAP 10.1.1.1        1025  <- -> 10.3.4.1        10010 [10.3.4.5 40000]
+MAP 10.1.1.1        1026  <- -> 10.3.4.1        10009 [10.3.4.5 40000]
+MAP 10.1.1.3        2003  <- -> 10.3.4.1        10008 [10.1.4.1 80]
+MAP 10.1.1.3        2002  <- -> 10.3.4.1        10007 [10.1.4.1 80]
+MAP 10.1.1.3        2001  <- -> 10.3.4.1        10006 [10.1.3.1 80]
+MAP 10.1.1.3        2000  <- -> 10.3.4.1        10005 [10.1.2.1 80]
+MAP 10.1.1.2        1025  <- -> 10.3.4.1        10004 [10.1.1.1 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.1        10003 [10.1.1.2 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.1        10002 [10.1.1.1 1025]
+MAP 10.1.1.2        1026  <- -> 10.3.4.1        10001 [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.1        10000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.2.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.2,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 2)
+10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2)
+10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025
+> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1
+> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1
+< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1
+< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2
+< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5
+< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025
+> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3
+< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2
+< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4
+> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5
+> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6
+> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4
+< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7
+15
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.2,1025
+> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2
+> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025
+> zx0 ip #0 28(20) 17 10.3.4.5,40001 > 10.1.1.1,1025
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.2.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.3.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80
+< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1
+> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000
+> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.3.4.5,40000
+< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025
+> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.3.4.5,40001
+< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001
+> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001
+List of active MAP/Redirect filters:
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
+
+List of active sessions:
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        40000 [10.3.4.5 40001]
+MAP 10.1.1.1        1025  <- -> 10.3.4.5        40001 [10.3.4.5 40000]
+MAP 10.1.1.1        1026  <- -> 10.3.4.5        40000 [10.3.4.5 40000]
+MAP 10.1.1.3        2003  <- -> 10.3.4.5        40001 [10.1.4.1 80]
+MAP 10.1.1.3        2002  <- -> 10.3.4.5        40000 [10.1.4.1 80]
+MAP 10.1.1.3        2001  <- -> 10.3.4.5        40001 [10.1.3.1 80]
+MAP 10.1.1.3        2000  <- -> 10.3.4.5        40000 [10.1.2.1 80]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        40001 [10.1.1.1 1025]
+MAP 10.1.1.1        1025  <- -> 10.3.4.5        40000 [10.1.1.2 1025]
+MAP 10.1.1.2        1026  <- -> 10.3.4.5        40001 [10.1.1.1 1025]
+MAP 10.1.1.2        1025  <- -> 10.3.4.5        40000 [10.1.1.1 1025]
+
+Hostmap table:
+10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 2)
+10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2)
+10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1)
+10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n5_6 b/contrib/netbsd-tests/ipf/expected/n5_6
new file mode 100644
index 000000000000..1e7bc8eff5ad
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n5_6
@@ -0,0 +1,533 @@
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128
+
+List of active sessions:
+MAP 10:1:1::1 1025  <- -> 10::2:2:2 1025  [10::3:4:5 40000]
+MAP 10:1:1::1 1026  <- -> 10::2:2:2 1026  [10::3:4:5 40000]
+MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:2::1]
+MAP 10:1:1::1 1025  <- -> 10::2:2:2 1025  [10:1:1::2 1025]
+MAP 10:1:1::1 1025  <- -> 10::2:2:2 1025  [10:1:1::1 1025]
+MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2]
+MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2]
+
+Hostmap table:
+10:1:1::1,10::3:4:5 -> 10::2:2:2,any (use = 2)
+10:1:1::1,10:1:2::1 -> 10::2:2:2,any (use = 1)
+10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1)
+10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
+16
+> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+16
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128
+
+List of active sessions:
+MAP 10:1:1::3 2003  <- -> 10::3:4:5 2003  [10:1:4::1 80]
+MAP 10:1:1::3 2002  <- -> 10::3:4:5 2002  [10:1:4::1 80]
+MAP 10:1:1::3 2001  <- -> 10::3:4:5 2001  [10:1:3::1 80]
+MAP 10:1:1::3 2000  <- -> 10::3:4:5 2000  [10:1:2::1 80]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 1025  [10:1:1::1 1025]
+MAP 10:1:1::1 <- -> 10::3:4:5 [10:1:2::1]
+MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2]
+MAP 10:1:1::1 1025  <- -> 10::3:4:5 1025  [10:1:1::2 1025]
+MAP 10:1:1::2 1026  <- -> 10::3:4:5 1026  [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 1025  [10:1:1::1 1025]
+MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1]
+MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2]
+
+Hostmap table:
+10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2)
+10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1)
+10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10:1:2::1 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 4)
+10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 2)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112
+
+List of active sessions:
+MAP 10:1:1::2 1025  <- -> 10::3:4:3 1025  [10::3:4:5 40001]
+MAP 10:1:1::1 1025  <- -> 10::3:4:3 1025  [10::3:4:5 40000]
+MAP 10:1:1::1 1026  <- -> 10::3:4:3 1026  [10::3:4:5 40000]
+MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4]
+MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::4]
+MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::2]
+MAP 10:1:1::1 <- -> 10::3:4:1 [10:4:3::2]
+
+Hostmap table:
+10:1:1::2,10::3:4:5 -> 10::3:4:3,any (use = 1)
+10:1:1::1,10::3:4:5 -> 10::3:4:3,any (use = 2)
+10:1:1::3,10:4:3::4 -> 10::3:4:2,any (use = 2)
+10:1:1::2,10:4:3::4 -> 10::3:4:1,any (use = 1)
+10:1:1::2,10:4:3::2 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10:4:3::2 -> 10::3:4:1,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10001 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 10001 [10::3:4:5 40001]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 10000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10009 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10010 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10011 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10012 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
+
+List of active sessions:
+MAP 10:1:2::1 80    <- -> 10::3:4:1 10012 [10::3:4:5 40001]
+MAP 10:1:1::2 1025  <- -> 10::3:4:1 10011 [10::3:4:5 40001]
+MAP 10:1:1::1 1025  <- -> 10::3:4:1 10010 [10::3:4:5 40000]
+MAP 10:1:1::1 1026  <- -> 10::3:4:1 10009 [10::3:4:5 40000]
+MAP 10:1:1::3 2003  <- -> 10::3:4:1 10008 [10:1:4::1 80]
+MAP 10:1:1::3 2002  <- -> 10::3:4:1 10007 [10:1:4::1 80]
+MAP 10:1:1::3 2001  <- -> 10::3:4:1 10006 [10:1:3::1 80]
+MAP 10:1:1::3 2000  <- -> 10::3:4:1 10005 [10:1:2::1 80]
+MAP 10:1:1::2 1025  <- -> 10::3:4:1 10004 [10:1:1::1 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:1 10003 [10:1:1::2 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:1 10002 [10:1:1::1 1025]
+MAP 10:1:1::2 1026  <- -> 10::3:4:1 10001 [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:1 10000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:2::1,10::3:4:5 -> 10::3:4:1,any (use = 1)
+10:1:1::2,10::3:4:5 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10::3:4:5 -> 10::3:4:1,any (use = 2)
+10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2)
+10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1)
+10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1)
+10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1
+< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025
+> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3
+< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5
+> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6
+> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4
+< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7
+16
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2
+> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:2:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:3:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000
+> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:0:0:0:0:3:4:5,40000
+< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025
+> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001
+> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001
+List of active MAP/Redirect filters:
+map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
+
+List of active sessions:
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 40000 [10::3:4:5 40001]
+MAP 10:1:1::1 1025  <- -> 10::3:4:5 40001 [10::3:4:5 40000]
+MAP 10:1:1::1 1026  <- -> 10::3:4:5 40000 [10::3:4:5 40000]
+MAP 10:1:1::3 2003  <- -> 10::3:4:5 40001 [10:1:4::1 80]
+MAP 10:1:1::3 2002  <- -> 10::3:4:5 40000 [10:1:4::1 80]
+MAP 10:1:1::3 2001  <- -> 10::3:4:5 40001 [10:1:3::1 80]
+MAP 10:1:1::3 2000  <- -> 10::3:4:5 40000 [10:1:2::1 80]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 40001 [10:1:1::1 1025]
+MAP 10:1:1::1 1025  <- -> 10::3:4:5 40000 [10:1:1::2 1025]
+MAP 10:1:1::2 1026  <- -> 10::3:4:5 40001 [10:1:1::1 1025]
+MAP 10:1:1::2 1025  <- -> 10::3:4:5 40000 [10:1:1::1 1025]
+
+Hostmap table:
+10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10::3:4:5 -> 10::3:4:5,any (use = 2)
+10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2)
+10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1)
+10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1)
+10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1)
+10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n6 b/contrib/netbsd-tests/ipf/expected/n6
new file mode 100644
index 000000000000..1afd94e54e46
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n6
@@ -0,0 +1,173 @@
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23
+< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.2.2.2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
+15
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23
+< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+List of active MAP/Redirect filters:
+rdr zx0 from 0/0 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.2.2.2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023
+15
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23
+< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+List of active MAP/Redirect filters:
+rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.2.2.2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
+15
+< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+List of active MAP/Redirect filters:
+rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.3.3.3 12345]
+RDR 10.2.2.1        10023 <- -> 10.1.2.2        23    [10.3.0.1 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23
+< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23
+< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053
+< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53
+< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53
+List of active MAP/Redirect filters:
+rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1/32 port 10053 udp
+
+List of active sessions:
+RDR 10.2.2.1        10053 <- -> 10.1.1.0        53    [10.3.3.3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n6_6 b/contrib/netbsd-tests/ipf/expected/n6_6
new file mode 100644
index 000000000000..e10f9bd8f435
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n6_6
@@ -0,0 +1,173 @@
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10::2:2:2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
+16
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+List of active MAP/Redirect filters:
+rdr zx0 inet6 from any to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10::2:2:2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023
+16
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+List of active MAP/Redirect filters:
+rdr zx0 inet6 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10::2:2:2 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
+16
+< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+List of active MAP/Redirect filters:
+rdr zx0 inet6 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10:3:3::3 12345]
+RDR 10::2:2:1 10023 <- -> 10:1:2::2 23    [10:3::1 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23
+< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23
+< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53
+< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53
+List of active MAP/Redirect filters:
+rdr zx0 inet6 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1/128 port 10053 udp
+
+List of active sessions:
+RDR 10::2:2:1 10053 <- -> 10:1:1:: 53    [10:3:3::3 12345]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n7 b/contrib/netbsd-tests/ipf/expected/n7
new file mode 100644
index 000000000000..11b811538ba9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n7
@@ -0,0 +1,98 @@
+< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22
+< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10050
+< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10079
+< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10079 <- -> 10.1.1.1        79    [10.2.3.1 1233]
+RDR 10.2.2.1        10050 <- -> 10.1.1.1        50    [10.2.3.1 1232]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.2.3.1 1231]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22
+< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10023
+< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80
+< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port = 10023 tcp
+
+List of active sessions:
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        79    [10.2.3.1 1233]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        50    [10.2.3.1 1232]
+RDR 10.2.2.1        10023 <- -> 10.1.1.1        23    [10.2.3.1 1231]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22
+< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.1.1.1,23
+< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.1.1.1,50
+< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.1.1.1,79
+< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.2.2.1,3128
+< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 1.2.2.129,3128
+< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.2.2.1,3128
+< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 1.2.2.129,3128
+< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.2.2.1,3128
+List of active MAP/Redirect filters:
+rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp
+
+List of active sessions:
+RDR 10.2.2.1        3128  <- -> 10.1.1.4        80    [10.2.3.1 1238]
+RDR 1.2.2.129       3128  <- -> 10.1.1.4        80    [10.2.3.1 1237]
+RDR 10.2.2.1        3128  <- -> 10.1.1.3        80    [10.2.3.1 1236]
+RDR 1.2.2.129       3128  <- -> 10.1.1.2        80    [10.2.3.1 1235]
+RDR 10.2.2.1        3128  <- -> 10.1.1.1        80    [10.2.3.1 1234]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n7_6 b/contrib/netbsd-tests/ipf/expected/n7_6
new file mode 100644
index 000000000000..25630334147f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n7_6
@@ -0,0 +1,98 @@
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10050
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10079
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10079 <- -> 10:1:1::1 79    [10::2:3:1 1233]
+RDR 10::2:2:1 10050 <- -> 10:1:1::1 50    [10::2:3:1 1232]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10::2:3:1 1231]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10023
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port = 10023 tcp
+
+List of active sessions:
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 79    [10::2:3:1 1233]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 50    [10::2:3:1 1232]
+RDR 10::2:2:1 10023 <- -> 10:1:1::1 23    [10::2:3:1 1231]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:1:1:0:0:0:0:1,23
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:1:1:0:0:0:0:1,50
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:1:1:0:0:0:0:1,79
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:0:0:0:0:2:2:1,3128
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 1:0:0:0:0:2:2:129,3128
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:0:0:0:0:2:2:1,3128
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 1:0:0:0:0:2:2:129,3128
+< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:0:0:0:0:2:2:1,3128
+List of active MAP/Redirect filters:
+rdr zx0 inet6 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp
+
+List of active sessions:
+RDR 10::2:2:1 3128  <- -> 10:1:1::4 80    [10::2:3:1 1238]
+RDR 1::2:2:129 3128  <- -> 10:1:1::4 80    [10::2:3:1 1237]
+RDR 10::2:2:1 3128  <- -> 10:1:1::3 80    [10::2:3:1 1236]
+RDR 1::2:2:129 3128  <- -> 10:1:1::2 80    [10::2:3:1 1235]
+RDR 10::2:2:1 3128  <- -> 10:1:1::1 80    [10::2:3:1 1234]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n8 b/contrib/netbsd-tests/ipf/expected/n8
new file mode 100644
index 000000000000..a5e938f16ef4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n8
@@ -0,0 +1,30 @@
+4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+List of active MAP/Redirect filters:
+map icmp0 2.2.2.0/24 -> 10.10.10.0/24
+
+List of active sessions:
+MAP 2.2.2.2         <- -> 10.10.10.1      [4.4.4.4]
+
+Hostmap table:
+2.2.2.2,4.4.4.4 -> 10.10.10.1,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n8_6 b/contrib/netbsd-tests/ipf/expected/n8_6
new file mode 100644
index 000000000000..4d08efe37e2b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n8_6
@@ -0,0 +1,30 @@
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7724 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7723 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+List of active MAP/Redirect filters:
+map icmp0 inet6 2::2:2:0/112 -> 10:10:10::/112
+
+List of active sessions:
+MAP 2::2:2:2 <- -> 10:10:10::1 [4:4:4::4]
+
+Hostmap table:
+2::2:2:2,4:4:4::4 -> 10:10:10::1,any (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n9 b/contrib/netbsd-tests/ipf/expected/n9
new file mode 100644
index 000000000000..2c762be6af6a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n9
@@ -0,0 +1,29 @@
+4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+List of active MAP/Redirect filters:
+rdr icmp0 4.4.4.0/24 -> 10.10.10.1/32 ip
+
+List of active sessions:
+RDR 10.10.10.1      <- -> 4.4.4.4         [2.2.2.2]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/n9_6 b/contrib/netbsd-tests/ipf/expected/n9_6
new file mode 100644
index 000000000000..134d74c9fa45
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/n9_6
@@ -0,0 +1,29 @@
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772c 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772b 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 
+
+List of active MAP/Redirect filters:
+rdr icmp0 inet6 4:4:4::/112 -> 10:10:10::1/128 ip
+
+List of active sessions:
+RDR 10:10:10::1 <- -> 4:4:4::4 [2::2:2:2]
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni1 b/contrib/netbsd-tests/ipf/expected/ni1
new file mode 100644
index 000000000000..d4e2de2db8a5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni1
@@ -0,0 +1,19 @@
+4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 
+
+4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 
+
+4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 0402 0000 3be5 468d 000a cfc3 
+
+4500 0028 0001 4000 0111 65b0 0606 0607 0404 0404 4e20 829e 0014 c4b0 0402 0000 3be5 468d 000a cfc3 
+
+4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da 
+
+4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da 0402 0000 3be5 468d 000a cfc3 
+
+4500 0028 0002 4000 0111 65ae 0606 0608 0404 0404 07d0 829e 0014 0b00 0402 0000 3be5 468d 000a cfc3 
+
+4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 ff6a 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 22e2 
+
+4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 cad9 0402 0000 3be5 468d 000a cfc3 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni10 b/contrib/netbsd-tests/ipf/expected/ni10
new file mode 100644
index 000000000000..050fb40725ea
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni10
@@ -0,0 +1,8 @@
+4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 
+
+4500 0058 0001 0000 ff01 af98 0202 0202 0404 0404 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni11 b/contrib/netbsd-tests/ipf/expected/ni11
new file mode 100644
index 000000000000..6ed8ecc80634
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni11
@@ -0,0 +1,8 @@
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 
+
+4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni12 b/contrib/netbsd-tests/ipf/expected/ni12
new file mode 100644
index 000000000000..590ec23087e8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni12
@@ -0,0 +1,8 @@
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 
+
+4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni13 b/contrib/netbsd-tests/ipf/expected/ni13
new file mode 100644
index 000000000000..897bef3e9b2c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni13
@@ -0,0 +1,63 @@
+4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 
+
+4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 
+
+4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 
+
+4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff 
+
+4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 
+
+4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff 
+
+4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 
+
+4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 
+
+4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 
+
+4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff 
+
+4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 
+
+4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 
+
+4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 
+
+4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 
+
+4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 
+
+4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 
+
+4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc 
+
+4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni14 b/contrib/netbsd-tests/ipf/expected/ni14
new file mode 100644
index 000000000000..5ad5a1b40409
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni14
@@ -0,0 +1,63 @@
+4500 0030 5e11 4000 8006 ec0b c0a8 7101 7f00 0001 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 d44b 0000 0204 05b4 0101 0402 
+
+4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 
+
+4500 00c4 5e12 4000 8006 eb76 c0a8 7101 7f00 0001 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 954b 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00d0 5e13 4000 8006 eb69 c0a8 7101 7f00 0001 05e7 06bb abf0 4b42 a564 6977 5018 fa54 5eb2 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 
+
+4500 0040 5e14 4000 8006 ebf8 c0a8 7101 7f00 0001 05e7 06bb abf0 4bea a564 6997 5018 fa34 9abb 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff 
+
+4500 0039 5e15 0000 802f 2bd6 c0a8 7101 7f00 0001 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 
+
+4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff 
+
+4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 
+
+4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 
+
+4500 003c 5e16 0000 802f 2bd2 c0a8 7101 7f00 0001 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 0036 5e17 0000 802f 2bd7 c0a8 7101 7f00 0001 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 
+
+4500 0040 5e18 4000 8006 ebf4 c0a8 7101 7f00 0001 05e7 06bb abf0 4c02 a564 6997 5018 fa34 9aa3 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff 
+
+4500 0038 5e19 0000 802f 2bd3 c0a8 7101 7f00 0001 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 5e1a 0000 802f 2bcc c0a8 7101 7f00 0001 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0030 5e1b 0000 802f 2bd9 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 
+
+4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 
+
+4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 
+
+4500 0048 5e1c 0000 802f 2bc0 c0a8 7101 7f00 0001 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0030 5e1d 0000 802f 2bd7 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 
+
+4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 
+
+4500 002a 5e1e 0000 802f 2bdc c0a8 7101 7f00 0001 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 
+
+4500 0032 5e1f 0000 802f 2bd3 c0a8 7101 7f00 0001 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc 
+
+4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni15 b/contrib/netbsd-tests/ipf/expected/ni15
new file mode 100644
index 000000000000..3820d560d1b7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni15
@@ -0,0 +1,63 @@
+4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 
+
+4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 
+
+4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00c4 69a7 4000 4006 6d37 c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 0048 69a8 4000 4006 6db2 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 
+
+4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff 
+
+4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 
+
+4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff 
+
+4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 
+
+4500 0038 69ab 0000 ff2f ee95 c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 
+
+4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 003a 69ad 0000 ff2f ee91 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 0032 69ae 0000 ff2f ee98 c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 
+
+4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff 
+
+4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 69af 0000 ff2f ee8b c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0044 69b0 0000 ff2f ee84 c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 
+
+4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 
+
+4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 
+
+4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0042 69b3 0000 ff2f ee83 c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 
+
+4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 
+
+4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 
+
+4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc 
+
+4500 002a 69b5 0000 ff2f ee99 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni16 b/contrib/netbsd-tests/ipf/expected/ni16
new file mode 100644
index 000000000000..2c34f5c7094d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni16
@@ -0,0 +1,63 @@
+4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 
+
+4500 002c 69a6 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 68da abf0 4aa6 6012 8000 c8ee 0000 0204 05b4 
+
+4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00c4 69a7 4000 4006 92dd c0a8 7103 0a02 0202 06bb 05e7 a564 68db abf0 4b42 5018 832c f475 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 0048 69a8 4000 4006 9358 c0a8 7103 0a02 0202 06bb 05e7 a564 6977 abf0 4bea 5018 832c 5ca0 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 
+
+4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff 
+
+4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 
+
+4500 0020 69a9 0000 ff2f 1456 c0a8 7103 0a02 0202 2081 880b 0000 4000 ffff ffff 
+
+4500 0028 69aa 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 6997 abf0 4c02 5010 832c db67 0000 
+
+4500 0038 69ab 0000 ff2f 143c c0a8 7103 0a02 0202 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 002f 69ac 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 
+
+4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 
+
+4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 003a 69ad 0000 ff2f 1438 c0a8 7103 0a02 0202 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 
+
+4500 0032 69ae 0000 ff2f 143f c0a8 7103 0a02 0202 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 
+
+4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff 
+
+4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 69af 0000 ff2f 1432 c0a8 7103 0a02 0202 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 
+
+4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0044 69b0 0000 ff2f 142b c0a8 7103 0a02 0202 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 
+
+4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 
+
+4500 002a 69b1 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 
+
+4500 002c 69b2 0000 ff2f 1441 c0a8 7103 0a02 0202 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 
+
+4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0042 69b3 0000 ff2f 142a c0a8 7103 0a02 0202 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 
+
+4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 
+
+4500 0030 69b4 0000 ff2f 143b c0a8 7103 0a02 0202 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 
+
+4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 
+
+4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc 
+
+4500 002a 69b5 0000 ff2f 1440 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni17 b/contrib/netbsd-tests/ipf/expected/ni17
new file mode 100644
index 000000000000..74eb4ddc5f9c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni17
@@ -0,0 +1,7 @@
+< le0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.252,3128
+< le0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.2.252,3128
+< le0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.3.252,3128
+< le0 ip #0 40(20) 6 10.2.2.7,2001 > 10.1.3.252,3128
+< le0 ip #0 40(20) 6 10.2.2.8,2000 > 10.1.1.253,3128
+< le0 ip #0 40(20) 6 10.2.2.9,2000 > 10.1.2.253,3128
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni18 b/contrib/netbsd-tests/ipf/expected/ni18
new file mode 100644
index 000000000000..defc59cca97b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni18
@@ -0,0 +1,5 @@
+< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 1.1.1.1,80
+< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 192.168.1.1,80
+> hme1 ip #0 40(20) 6 203.1.1.1,10000 > 4.5.6.7,80
+> hme1 ip #0 40(20) 6 10.1.1.2,5050 > 4.5.6.7,80
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni19 b/contrib/netbsd-tests/ipf/expected/ni19
new file mode 100644
index 000000000000..e55c75dc3837
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni19
@@ -0,0 +1,43 @@
+4500 0040 e3fc 4000 4006 40b5 0a01 0101 0a01 0104 03f1 0202 6523 90b2 0000 0000 b002 8000 a431 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 
+
+4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 
+
+4500 0028 e3fd 4000 4006 40cc 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5010 832c e3b7 0000 
+
+4500 002d e3fe 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5018 832c 8242 0000 3130 3038 00 
+
+4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 
+
+4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 
+
+4500 0040 e3ff 4000 4006 40b2 0a01 0101 0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 452f 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 
+
+4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 
+
+4500 0030 e400 4000 4006 40c1 0a01 0101 0a01 0104 03f1 0202 6523 90b8 915a a5c5 5018 832c 3560 0000 6461 7272 656e 7200 
+
+4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 
+
+4500 0053 e401 4000 4006 409d 0a01 0101 0a01 0104 03f1 0202 6523 90c0 915a a5c5 5018 832c cce7 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 
+
+4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 
+
+4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 
+
+4500 0028 e403 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90eb 915a a5c6 5010 832c e37e 0000 
+
+4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a 
+
+4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a 
+
+4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 
+
+4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 
+
+0
+0
+0
+0
+0
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni2 b/contrib/netbsd-tests/ipf/expected/ni2
new file mode 100644
index 000000000000..69a52724f0c1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni2
@@ -0,0 +1,19 @@
+4510 002c 0000 4000 3e06 78df 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 
+
+4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 
+
+4510 0028 0001 4000 3e06 78e2 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 
+
+4500 005b cf83 4000 7e06 5f3c c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a 
+
+4510 0028 0002 4000 3e06 78e1 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 
+
+4510 002e 0003 4000 3e06 78da 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a 
+
+4500 0048 e383 4000 7e06 4b4f c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 
+
+4500 0038 0004 4000 4001 76e4 0101 0101 c0a8 0133 0304 444f 0000 05a0 4500 05dc e483 4000 7e06 4ebb c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni20 b/contrib/netbsd-tests/ipf/expected/ni20
new file mode 100644
index 000000000000..913ef0b1e461
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni20
@@ -0,0 +1,69 @@
+4500 0040 e3fc 4000 4006 f362 c0a8 7103 c0a8 7104 03f1 0202 6523 90b2 0000 0000 b002 8000 56df 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 
+
+4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 
+
+4500 0028 e3fd 4000 4006 f379 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5010 832c 9665 0000 
+
+4500 002d e3fe 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5018 832c 34f0 0000 3130 3038 00 
+
+4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 
+
+4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 
+
+4500 0040 e3ff 4000 4006 f35f c0a8 7103 c0a8 7104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 f7dc 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 
+
+4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 
+
+4500 0030 e400 4000 4006 f36e c0a8 7103 c0a8 7104 03f1 0202 6523 90b8 915a a5c5 5018 832c e80d 0000 6461 7272 656e 7200 
+
+4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 
+
+4500 0053 e401 4000 4006 f34a c0a8 7103 c0a8 7104 03f1 0202 6523 90c0 915a a5c5 5018 832c 7f95 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 
+
+4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 
+
+4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 
+
+4500 0028 e403 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90eb 915a a5c6 5010 832c 962c 0000 
+
+4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a 
+
+4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a 
+
+4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 
+
+4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 
+
+0
+0
+0
+0
+0
+0
+List of active MAP/Redirect filters:
+rdr bge0 10.1.1.4/32 port 514 -> 192.168.113.4/32 port 514 tcp proxy rcmd
+
+List of active sessions:
+MAP 192.168.113.4   1023  <- -> 10.1.1.4        1023  [192.168.113.3 1008]
+RDR 192.168.113.4   514   <- -> 10.1.1.4        514   [192.168.113.3 1009]
+	proxy active
+
+Hostmap table:
+192.168.113.4,192.168.113.3 -> 10.1.1.4,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+5 block in all
+1 pass in quick on bge0 proto tcp from any to any port = 514 flags S/FSRPAU keep state
+Rules configured (set 0, out)
+2 block out all
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni21 b/contrib/netbsd-tests/ipf/expected/ni21
new file mode 100644
index 000000000000..53e64a5a1f97
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni21
@@ -0,0 +1,6 @@
+> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3
+0
+< lan0 ip #0 20(20) 0 3.3.3.3 > 2.2.2.2
+> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni23 b/contrib/netbsd-tests/ipf/expected/ni23
new file mode 100644
index 000000000000..586373c070ca
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni23
@@ -0,0 +1,37 @@
+> ppp0 ip #0 28(20) 17 4.4.4.4,6700 > 2.2.2.2,4500
+0
+< hme0 ip #0 28(20) 17 2.2.2.2,4500 > 3.3.3.1,6700
+> bge0 ip #0 28(20) 17 1.1.2.3,4500 > 3.3.3.1,6700
+List of active MAP/Redirect filters:
+rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2/32 ip
+map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32
+
+List of active sessions:
+MAP 3.3.3.1         6700  <- -> 4.4.4.4         6700  [2.2.2.2 4500]
+RDR 2.2.2.2         4500  <- -> 1.1.2.3         4500  [3.3.3.1 6700]
+
+Hostmap table:
+3.3.3.1,2.2.2.2 -> 4.4.4.4,0.0.0.0 (use = 1)
+List of active state sessions:
+4:udp src:3.3.3.1,6700 dst:2.2.2.2,4500 24
+	FWD: IN pkts 1 bytes 28 OUT pkts 1 bytes 28
+	REV: IN pkts 1 bytes 28 OUT pkts 1 bytes 28
+	tag 0 pass 0x2008402 = pass in keep state
+	interfaces: in X[le0],X[hme0] out X[ppp0],X[bge0]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 block in all
+1 pass in on le0,hme0 to ppp0:3.3.3.254 out-via ppp0,bge0 inet proto udp from any to any keep state
+Rules configured (set 0, out)
+0 block out all
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni3 b/contrib/netbsd-tests/ipf/expected/ni3
new file mode 100644
index 000000000000..107d5d939342
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni3
@@ -0,0 +1,7 @@
+4500 003c 0000 4000 ff06 67a8 0606 0606 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 
+
+4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni4 b/contrib/netbsd-tests/ipf/expected/ni4
new file mode 100644
index 000000000000..627aa1909da7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni4
@@ -0,0 +1,7 @@
+4500 003c 0000 4000 ff06 67a8 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acac 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 
+
+4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni5 b/contrib/netbsd-tests/ipf/expected/ni5
new file mode 100644
index 000000000000..14d983759f6c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni5
@@ -0,0 +1,96 @@
+4500 002c 0000 4000 ff06 02fc 0101 0101 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 f5a2 0000 0204 05b4 
+
+4500 002c ffdd 4000 ef06 5374 96cb e002 c0a8 0103 0015 8032 3786 76c4 bd6b c9c9 6012 269c 8369 0000 0204 0584 
+
+4500 0028 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 
+
+ipf_p_ftp_servert_valid:i(0) < 5
+4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a 
+
+4500 0028 0002 4000 ff06 02fe 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 
+
+4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a 
+
+4500 0028 0003 4000 ff06 02fd 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 
+
+4500 0038 0004 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a 
+
+4500 0028 ffe0 4000 ef06 5375 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5010 269c 9a00 0000 
+
+4500 006c ffe1 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5018 269c b00f 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 2079 6f75 7220 636f 6d70 6c65 7465 2065 2d6d 6169 6c20 6164 6472 6573 7320 6173 2070 6173 7377 6f72 642e 0d0a 
+
+4500 0028 0005 4000 ff06 02fb 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 
+
+4500 0036 0006 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a 
+
+ipf_p_ftp_servert_valid:i(0) < 5
+4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a 
+
+4500 0028 0007 4000 ff06 02f9 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7826 5010 269c 5921 0000 
+
+4500 0099 ffe3 4000 ef06 5301 96cb e002 c0a8 0103 0015 8032 3786 7826 bd6b c9e7 5018 269c d399 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 7265 2063 6c65 616e 696e 6720 7570 2e20 2041 6e79 2066 6565 6462 6163 6b20 6d6f 7374 2077 656c 636f 6d65 2e20 3130 2041 7567 2030 300d 0a32 3330 2d0d 0a32 3330 204c 6f67 6765 6420 696e 2061 6e6f 6e79 6d6f 7573 6c79 2e0d 0a 
+
+4500 0028 0008 4000 ff06 02f8 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 
+
+4500 0030 0009 4000 ff06 02ef 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5018 269c 86ae 0000 5459 5045 2049 0d0a 
+
+4500 0038 ffe4 4000 ef06 5361 96cb e002 c0a8 0103 0015 8032 3786 7897 bd6b c9ef 5018 269c 5fae 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a 
+
+4500 0028 000a 4000 ff06 02f6 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 
+
+4500 003d 000b 4000 ff06 02e0 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5018 269c 4b67 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 310d 0a 
+
+4500 0046 ffe5 4000 ef06 5352 96cb e002 c0a8 0103 0015 8032 3786 78a7 bd6b ca0c 5018 269c dbc3 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a 
+
+4500 0030 000c 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b ca04 3786 78c5 5018 269c 866b 0000 5459 5045 2041 0d0a 
+
+4500 0038 ffe6 4000 ef06 535f 96cb e002 c0a8 0103 0015 8032 3786 78c5 bd6b ca14 5018 269c 5f5b 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a 
+
+4500 002e 000d 4000 ff06 02ed 0101 0101 96cb e002 8032 0015 bd6b ca0c 3786 78d5 5018 269c a994 0000 4e4c 5354 0d0a 
+
+4500 002c ffe7 4000 ef06 536a 96cb e002 c0a8 0103 0014 8033 d9f8 11d4 0000 0000 6002 2238 d190 0000 0204 0584 
+
+4500 002c 000e 4000 ff06 02ee 0101 0101 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 96de 0000 0204 0584 
+
+4500 0028 ffe8 4000 ef06 536d 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5010 269c cb1d 0000 
+
+4500 005d ffe9 4000 ef06 5337 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca1a 5018 269c eed0 0000 3135 3020 4f70 656e 696e 6720 4153 4349 4920 6d6f 6465 2064 6174 6120 636f 6e6e 6563 7469 6f6e 2066 6f72 202f 6269 6e2f 6c73 2e0d 0a 
+
+4500 0028 000f 4000 ff06 02f1 0101 0101 96cb e002 8033 0014 bd78 5c13 d9f8 11d5 5010 6348 4e1b 0000 
+
+4500 003d 0010 4000 ff06 02db 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 78d5 5018 269c 4a16 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 320d 0a 
+
+4500 0046 ffea 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca37 5018 269c db6a 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a 
+
+4500 0030 0011 4000 ff06 02e7 0101 0101 96cb e002 8032 0015 bd6b ca27 3786 78f3 5018 269c 861a 0000 5459 5045 2041 0d0a 
+
+4500 0038 ffeb 4000 ef06 535a 96cb e002 c0a8 0103 0015 8032 3786 78f3 bd6b ca3f 5018 269c 5ef2 0000 3230 3020 5479 7065 206f 6b61 793e 0d0a 
+
+4500 002e 0012 4000 ff06 02e8 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 7903 5018 269c a943 0000 4e4c 5354 0d0a 
+
+4500 002c ffec 4000 ef06 5365 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 6002 2238 d18f 0000 0204 0584 
+
+4500 002c 0013 4000 ff06 02e9 0101 0101 96cb e002 8034 0014 bd78 5c12 d9f8 11d5 6012 02f8 96dd 0000 0204 0584 
+
+4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 5010 2238 e90d 0000 
+
+0
+0
+0
+0
+0
+0
+4500 0040 fff0 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 7903 bd6b ca3f 5018 269c 7c80 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a 
+
+4500 0028 0014 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5010 269c 57e4 0000 
+
+4500 002e 0015 4000 ff06 02e5 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5018 269c b022 0000 5155 4954 0d0a 
+
+4500 0036 fff2 4000 ef06 5355 96cb e002 c0a8 0103 0015 8032 3786 791b bd6b ca45 5018 269c a936 0000 3232 3120 476f 6f64 6279 652e 0d0a 
+
+4500 0028 0016 4000 ff06 02ea 0101 0101 96cb e002 8032 0015 bd6b ca35 3786 7929 5011 269c 57cf 0000 
+
+0
+0
+0
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni6 b/contrib/netbsd-tests/ipf/expected/ni6
new file mode 100644
index 000000000000..e70412b7f471
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni6
@@ -0,0 +1,63 @@
+< nf0 ip #52618 84(20) 17 192.168.6.1,32885 > 192.168.7.1,111
+> qfe0 ip #0 84(20) 17 192.168.7.2,32885 > 192.168.7.1,111
+< qfe0 ip #52611 56(20) 17 192.168.7.1,111 > 192.168.6.1,32885
+> nf0 ip #1 56(20) 17 192.168.6.2,111 > 192.168.6.1,32885
+< nf0 ip #54694 68(20) 17 192.168.6.1,32991 > 192.168.7.1,2049
+> qfe0 ip #2 68(20) 17 192.168.7.2,32991 > 192.168.7.1,2049
+< qfe0 ip #0 52(20) 17 192.168.7.1,2049 > 192.168.6.1,32991
+> nf0 ip #3 52(20) 17 192.168.6.2,2049 > 192.168.6.1,32991
+List of active MAP/Redirect filters:
+rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 udp proxy rpcbu
+rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 tcp proxy rpcbt
+map qfe0 192.168.6.0/24 -> 192.168.7.2/32
+
+List of active sessions:
+MAP 192.168.6.1     32991 <- -> 192.168.7.2     32991 [192.168.7.1 2049]
+RDR 192.168.7.1     2049  <- -> 192.168.6.2     2049  [192.168.6.1 32991]
+RDR CLONE 192.168.7.1     2049  <- -> 192.168.6.2     2049  [192.168.6.1 0]
+MAP 192.168.6.1     32885 <- -> 192.168.7.2     32885 [192.168.7.1 111]
+RDR 192.168.7.1     111   <- -> 192.168.6.2     111   [192.168.6.1 32885]
+	proxy active
+
+Hostmap table:
+192.168.6.1,192.168.7.1 -> 192.168.7.2,0.0.0.0 (use = 2)
+List of active state sessions:
+4:udp src:192.168.6.1,32991 dst:192.168.7.1,2049 24
+	FWD: IN pkts 2 bytes 96 OUT pkts 1 bytes 68
+	REV: IN pkts 1 bytes 52 OUT pkts 1 bytes 52
+	tag 0 pass 0x502 = pass in quick keep state
+	interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0]
+	Sync status: not synchronized
+4:udp src:192.168.6.1,* dst:192.168.7.1,2049 240 CLONE
+	FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0
+	REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0
+	tag 0 pass 0x502 = pass in quick keep state
+	interfaces: in X[nf0],X[] out X[],X[]
+	Sync status: not synchronized
+4:udp src:192.168.6.1,32885 dst:192.168.7.1,111 24
+	FWD: IN pkts 1 bytes 84 OUT pkts 1 bytes 84
+	REV: IN pkts 1 bytes 56 OUT pkts 1 bytes 56
+	tag 0 pass 0x2008502 = pass in quick keep state
+	interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0]
+	Sync status: not synchronized
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+0 pass in quick on nf0 proto tcp from any to any port = 111 flags S/FSRPAU keep state
+1 pass in quick on nf0 proto udp from any to any port = 111 keep state
+0 block return-rst in log quick on nf0 proto tcp from any to any
+0 block in log quick on nf0 inet from 192.168.7.0/24 to any
+0 block return-rst in log quick on qfe0 proto tcp from any to any
+0 block in log quick on qfe0 inet from 192.168.6.0/24 to any
+Rules configured (set 0, out)
+0 block out log quick on qfe0 inet from 192.168.7.0/24 to any
+0 block out log quick on nf0 inet from 192.168.6.0/24 to any
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni7 b/contrib/netbsd-tests/ipf/expected/ni7
new file mode 100644
index 000000000000..38c39ab71e23
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni7
@@ -0,0 +1,5 @@
+4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 
+
+4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0b00 f91c 0000 0000 4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202 afc9 829e 0014 c966 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni8 b/contrib/netbsd-tests/ipf/expected/ni8
new file mode 100644
index 000000000000..e0d518270a1f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni8
@@ -0,0 +1,9 @@
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 
+
+4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/ni9 b/contrib/netbsd-tests/ipf/expected/ni9
new file mode 100644
index 000000000000..1eb6fbcca8c2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/ni9
@@ -0,0 +1,9 @@
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0000 0000 ff01 adb7 0303 0303 0404 0404 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 
+
+4500 0058 0001 0000 ff01 ad96 0303 0303 0404 0404 0303 0735 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 
+
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p1 b/contrib/netbsd-tests/ipf/expected/p1
new file mode 100644
index 000000000000..58dc6813f329
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p1
@@ -0,0 +1,30 @@
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+table role=ipf type=tree number=100
+	{ 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; };
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in from pool/100 to any
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p10 b/contrib/netbsd-tests/ipf/expected/p10
new file mode 100644
index 000000000000..9f09502d2499
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p10
@@ -0,0 +1,40 @@
+< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.9,80
+List of active MAP/Redirect filters:
+rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers;
+
+List of active sessions:
+RWR-RDR 5.5.6.9         10000 9.9.9.9         80   <- -> 5.5.6.9         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.8         10000 9.9.9.9         80   <- -> 5.5.6.8         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.7         10000 9.9.9.9         80   <- -> 5.5.6.7         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.6         10000 9.9.9.9         80   <- -> 5.5.6.6         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.5         10000 9.9.9.9         80   <- -> 5.5.6.5         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.9         10000 9.9.9.9         80   <- -> 5.5.5.9         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.8         10000 9.9.9.9         80   <- -> 5.5.5.8         10000 1.1.1.9         80   
+RWR-RDR 5.5.5.7         10000 9.9.9.9         80   <- -> 5.5.5.7         10000 1.1.1.2         80   
+RWR-RDR 5.5.5.6         10000 9.9.9.9         80   <- -> 5.5.5.6         10000 1.1.1.9         80   
+RWR-RDR 5.5.5.5         10000 9.9.9.9         80   <- -> 5.5.5.5         10000 1.1.1.2         80   
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p11 b/contrib/netbsd-tests/ipf/expected/p11
new file mode 100644
index 000000000000..e907fbb16ab1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p11
@@ -0,0 +1,40 @@
+< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80
+List of active MAP/Redirect filters:
+rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers;
+
+List of active sessions:
+RWR-RDR 5.5.6.9         10000 9.9.9.9         80   <- -> 5.5.6.9         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.8         10000 9.9.9.9         80   <- -> 5.5.6.8         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.7         10000 9.9.9.9         80   <- -> 5.5.6.7         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.6         10000 9.9.9.9         80   <- -> 5.5.6.6         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.5         10000 9.9.9.9         80   <- -> 5.5.6.5         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.9         10000 9.9.9.9         80   <- -> 5.5.5.9         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.8         10000 9.9.9.9         80   <- -> 5.5.5.8         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.7         10000 9.9.9.9         80   <- -> 5.5.5.7         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.6         10000 9.9.9.9         80   <- -> 5.5.5.6         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.5         10000 9.9.9.9         80   <- -> 5.5.5.5         10000 1.1.1.5         80   
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p12 b/contrib/netbsd-tests/ipf/expected/p12
new file mode 100644
index 000000000000..d097d5117b65
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p12
@@ -0,0 +1,40 @@
+< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80
+List of active MAP/Redirect filters:
+rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers;
+
+List of active sessions:
+RWR-RDR 5.5.6.9         10000 9.9.9.9         80   <- -> 5.5.6.9         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.8         10000 9.9.9.9         80   <- -> 5.5.6.8         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.7         10000 9.9.9.9         80   <- -> 5.5.6.7         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.6         10000 9.9.9.9         80   <- -> 5.5.6.6         10000 1.1.1.4         80   
+RWR-RDR 5.5.6.5         10000 9.9.9.9         80   <- -> 5.5.6.5         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.9         10000 9.9.9.9         80   <- -> 5.5.5.9         10000 1.1.1.9         80   
+RWR-RDR 5.5.5.8         10000 9.9.9.9         80   <- -> 5.5.5.8         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.7         10000 9.9.9.9         80   <- -> 5.5.5.7         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.6         10000 9.9.9.9         80   <- -> 5.5.5.6         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.5         10000 9.9.9.9         80   <- -> 5.5.5.5         10000 1.1.1.2         80   
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p13 b/contrib/netbsd-tests/ipf/expected/p13
new file mode 100644
index 000000000000..aa529eada030
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p13
@@ -0,0 +1,30 @@
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+table role=all type=tree number=100
+	{ 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; };
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+2 pass in from pool/100 to any
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p2 b/contrib/netbsd-tests/ipf/expected/p2
new file mode 100644
index 000000000000..53887422b217
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p2
@@ -0,0 +1,35 @@
+block
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+# 'anonymous' table refs 2
+table role=ipf type=hash number=2147483650 size=3
+	{ 127.0.0.1/32; 4.4.0.0/16; };
+# 'anonymous' table refs 2
+table role=ipf type=hash number=2147483649 size=3
+	{ 127.0.0.1/32; 4.4.0.0/16; };
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 block in from hash/2147483650 to any
+Rules configured (set 0, out)
+2 pass out from hash/2147483649 to any
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p3 b/contrib/netbsd-tests/ipf/expected/p3
new file mode 100644
index 000000000000..c1e034325384
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p3
@@ -0,0 +1,45 @@
+pass
+nomatch
+nomatch
+nomatch
+nomatch
+pass
+block
+nomatch
+nomatch
+pass
+nomatch
+block
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+group-map out role=ipf number=2010 size=5
+	{ 2.2.2.2/32, group=2020; 4.4.0.0/16, group=2020; 5.0.0.0/8, group=2040; };
+group-map in role=ipf number=1010 size=3
+	{ 1.1.1.1/32, group=1020; 3.3.0.0/16, group=1030; };
+List of groups configured (set 0)
+Dev.0. Group 1020 Ref 2 Flags 0x8000
+2 pass in all group 1020
+Dev.0. Group 1030 Ref 2 Flags 0x8000
+2 block in all group 1030
+Dev.0. Group 2020 Ref 3 Flags 0x4000
+4 pass out all group 2020
+Dev.0. Group 2040 Ref 2 Flags 0x4000
+2 block out all group 2040
+List of groups configured (set 1)
+Rules configured (set 0, in)
+6 call now srcgrpmap/1010 in all
+Rules configured (set 0, out)
+6 call now dstgrpmap/2010 out all
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p4 b/contrib/netbsd-tests/ipf/expected/p4
new file mode 100644
index 000000000000..e7aa73fda3d6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p4
@@ -0,0 +1,38 @@
+< anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1
+< anon0 ip #0 20(20) 0 1.1.1.1 > 1.2.1.1
+> anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1
+> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.1
+< anon0 ip #0 20(20) 0 2.3.0.1 > 1.2.1.1
+< anon0 ip #0 20(20) 0 2.2.2.1 > 1.2.1.1
+< anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1
+15
+> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.2
+> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1
+> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.3
+> anon0 ip #0 20(20) 0 4.4.1.1 > 1.2.1.1
+List of active MAP/Redirect filters:
+map * from pool/100 to 0/0 -> 1.2.3.4/32
+
+List of active sessions:
+MAP 2.2.2.1         <- -> 1.2.3.4         [1.2.1.2]
+MAP 1.1.1.1         <- -> 1.2.3.4         [1.2.1.1]
+
+Hostmap table:
+2.2.2.1,1.2.1.2 -> 1.2.3.4,0.0.0.0 (use = 1)
+1.1.1.1,1.2.1.1 -> 1.2.3.4,0.0.0.0 (use = 1)
+List of active state sessions:
+List of configured pools
+table role=nat type=tree number=100
+	{ 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p5 b/contrib/netbsd-tests/ipf/expected/p5
new file mode 100644
index 000000000000..b56c3bcb4e9b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p5
@@ -0,0 +1,21 @@
+nomatch
+pass
+nomatch
+nomatch
+nomatch
+pass
+nomatch
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+table role=ipf type=tree name=letters
+	{ 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; };
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p6 b/contrib/netbsd-tests/ipf/expected/p6
new file mode 100644
index 000000000000..413f94ba74b9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p6
@@ -0,0 +1,24 @@
+block
+nomatch
+List of active MAP/Redirect filters:
+
+List of active sessions:
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+table role=ipf type=tree name=microsoft
+	{ 131.107.0.0/16; 192.92.90.0/24; 198.105.232.0/22; 204.231.58.0/24; 204.140.77.0/24; 204.140.80.0/22; 199.60.28.0/24; 199.103.90.0/23; 199.103.122.0/24; 204.79.101.0/24; 192.237.67.0/24; 198.137.97.0/24; 204.79.135.0/24; 204.79.179.0/24; 204.79.180.0/23; 204.79.188.0/24; 204.79.7.0/24; 204.79.27.0/24; 198.180.74.0/23; 204.231.236.0/24; 205.163.63.0/24; 205.163.62.0/24; 205.163.144.0/20; 205.248.50.0/23; 205.248.72.0/24; 205.248.212.0/22; 205.248.228.0/24; 205.248.235.0/24; 204.231.76.0/24; 204.231.192.0/24; 207.78.80.0/24; 207.78.81.0/24; 207.78.82.0/24; 207.117.3.0/24; 207.18.117.0/24; 208.139.27.0/24; 209.28.213.0/24; 207.209.68.0/24; 204.95.96.0/20; 207.158.93.192/27; 207.240.123.192/27; 208.26.205.0/24; 192.197.157.0/24; 204.133.231.0/24; 216.72.96.0/22; 207.229.166.152/29; 204.95.149.0/24; 209.192.213.72/29; 206.73.203.0/24; 206.73.118.0/24; 208.45.54.16/29; 208.45.54.8/29; 206.73.31.0/24; 63.161.50.128/25; 63.161.50.0/25; 207.240.8.224/28; 208.45.89.248/29; 206.182.69.0/24; 206.182.240.0/24; 206.182.241.0/24; 206.73.67.0/24; 206.182.251.0/24; 206.182.247.0/24; 206.182.236.0/24; 63.236.198.64/29; 63.236.198.152/29; 165.121.253.232/29; 63.236.170.64/29; 63.236.186.64/29; 63.236.187.104/29; 63.236.187.128/29; 63.236.187.160/29; 199.2.137.0/24; 216.222.104.224/28; 63.151.87.64/29; 64.77.82.96/29; 64.77.93.80/28; 65.52.0.0/14; 207.46.0.0/16; 204.182.144.0/20; 206.107.34.0/24; 205.240.158.0/23; 204.79.252.0/24; 64.200.211.16/28; 12.178.163.0/27; 69.44.126.80/28; 63.173.42.128/25; 12.28.108.0/25; 65.170.29.0/29; 67.132.133.96/29; 8.6.176.0/24; 63.148.123.240/29; 64.41.193.0/24; 64.85.70.32/28; 64.85.81.96/29; 64.85.81.104/29; 216.32.168.224/27; 206.79.74.32/28; 216.32.175.224/27; 216.32.180.0/22; 216.33.229.224/27; 216.33.236.0/22; 216.33.240.0/22; 216.32.240.0/22; 216.34.51.0/24; 209.1.112.0/24; 209.1.113.0/24; 209.1.15.0/24; 216.34.53.176/28; 216.35.8.224/28; 209.185.128.0/22; 65.114.175.128/27; 64.15.229.96/27; 64.15.177.0/24; 64.15.170.192/29; 209.143.238.0/24; 64.15.178.0/24; 66.35.209.120/29; 66.35.211.128/26; 66.35.208.48/28; 216.33.148.0/22; 216.35.66.88/29; 12.230.32.160/29; 12.53.124.0/27; 12.232.18.96/27; 12.190.158.0/24; 12.71.196.32/28; 209.240.192.0/19; 70.37.128.0/23; 70.37.135.0/24; 12.49.87.192/26; 74.93.205.144/29; 74.93.205.152/29; 74.93.206.64/29; 70.89.139.120/29; 206.71.119.0/24; 206.71.117.0/24; 206.71.118.0/24; 209.154.155.112/29; 65.68.62.152/29; 67.39.208.168/29; 65.242.67.0/24; 204.71.191.0/24; 63.194.155.144/29; 66.136.85.192/29; 64.124.184.72/29; 216.200.206.0/24; 63.80.93.0/25; 67.192.225.208/28; 69.74.162.0/24; 65.221.5.0/24; 65.248.85.0/24; 199.243.157.192/27; 199.243.157.112/29; 65.194.210.224/27; 208.194.139.0/24; 208.204.49.128/25; 208.205.26.0/24; 208.217.184.0/22; 208.222.172.0/24; 208.224.200.64/27; 208.229.100.0/23; 208.241.19.0/28; 208.241.19.16/28; 208.241.9.224/28; 208.244.108.0/28; 208.245.16.0/27; 208.249.17.160/28; 63.104.216.0/25; 63.69.245.0/24; 68.90.141.72/29; 63.198.123.160/29; 68.248.48.64/29; 68.248.48.72/29; 99.49.8.248/29; 65.38.172.72/29; 65.38.172.96/28; 75.149.174.16/29; 75.151.100.240/28; 64.81.8.96/27; 67.112.255.144/29; 63.240.201.176/28; 206.16.209.208/28; 63.240.195.208/28; 206.16.204.64/28; 206.16.223.0/24; 63.240.216.0/22; 63.240.220.0/22; 206.16.246.24/29; 63.240.195.192/28; 206.16.224.160/27; 67.192.39.48/28; 72.32.240.160/28; 72.32.201.152/29; 67.39.81.152/29; 69.20.127.32/29; 216.52.28.0/24; 70.42.230.0/23; 63.251.97.0/24; 67.120.132.128/29; 67.120.132.152/29; 67.120.132.192/28; };
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+1 block in from pool/microsoft to any
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p7 b/contrib/netbsd-tests/ipf/expected/p7
new file mode 100644
index 000000000000..89bfc11301c7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p7
@@ -0,0 +1,40 @@
+< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80
+List of active MAP/Redirect filters:
+rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers;
+
+List of active sessions:
+RWR-RDR 5.5.6.9         10000 9.9.9.9         80   <- -> 5.5.6.9         10000 1.1.1.4         80   
+RWR-RDR 5.5.6.8         10000 9.9.9.9         80   <- -> 5.5.6.8         10000 1.1.1.2         80   
+RWR-RDR 5.5.6.7         10000 9.9.9.9         80   <- -> 5.5.6.7         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.6         10000 9.9.9.9         80   <- -> 5.5.6.6         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.5         10000 9.9.9.9         80   <- -> 5.5.6.5         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.9         10000 9.9.9.9         80   <- -> 5.5.5.9         10000 1.1.1.2         80   
+RWR-RDR 5.5.5.8         10000 9.9.9.9         80   <- -> 5.5.5.8         10000 1.1.1.9         80   
+RWR-RDR 5.5.5.7         10000 9.9.9.9         80   <- -> 5.5.5.7         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.6         10000 9.9.9.9         80   <- -> 5.5.5.6         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.5         10000 9.9.9.9         80   <- -> 5.5.5.5         10000 1.1.1.2         80   
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/expected/p9 b/contrib/netbsd-tests/ipf/expected/p9
new file mode 100644
index 000000000000..89bfc11301c7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/expected/p9
@@ -0,0 +1,40 @@
+< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80
+< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80
+< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80
+< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80
+< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80
+List of active MAP/Redirect filters:
+rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers;
+
+List of active sessions:
+RWR-RDR 5.5.6.9         10000 9.9.9.9         80   <- -> 5.5.6.9         10000 1.1.1.4         80   
+RWR-RDR 5.5.6.8         10000 9.9.9.9         80   <- -> 5.5.6.8         10000 1.1.1.2         80   
+RWR-RDR 5.5.6.7         10000 9.9.9.9         80   <- -> 5.5.6.7         10000 1.1.1.9         80   
+RWR-RDR 5.5.6.6         10000 9.9.9.9         80   <- -> 5.5.6.6         10000 1.1.1.5         80   
+RWR-RDR 5.5.6.5         10000 9.9.9.9         80   <- -> 5.5.6.5         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.9         10000 9.9.9.9         80   <- -> 5.5.5.9         10000 1.1.1.2         80   
+RWR-RDR 5.5.5.8         10000 9.9.9.9         80   <- -> 5.5.5.8         10000 1.1.1.9         80   
+RWR-RDR 5.5.5.7         10000 9.9.9.9         80   <- -> 5.5.5.7         10000 1.1.1.5         80   
+RWR-RDR 5.5.5.6         10000 9.9.9.9         80   <- -> 5.5.5.6         10000 1.1.1.4         80   
+RWR-RDR 5.5.5.5         10000 9.9.9.9         80   <- -> 5.5.5.5         10000 1.1.1.2         80   
+
+Hostmap table:
+List of active state sessions:
+List of configured pools
+List of configured hash tables
+List of groups configured (set 0)
+List of groups configured (set 1)
+Rules configured (set 0, in)
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
+-------------------------------
diff --git a/contrib/netbsd-tests/ipf/h_common.sh b/contrib/netbsd-tests/ipf/h_common.sh
new file mode 100755
index 000000000000..8f11c2fde0a3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/h_common.sh
@@ -0,0 +1,100 @@
+# $NetBSD: h_common.sh,v 1.8 2013/05/16 07:20:29 martin Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+h_copydata()
+{
+	test -f $(atf_get_srcdir)/input/$1 && \
+	    cp $(atf_get_srcdir)/input/$1 in
+	test -f $(atf_get_srcdir)/regress/$1 && \
+	    cp $(atf_get_srcdir)/regress/$1 reg
+	test -f $(atf_get_srcdir)/expected/$1 && \
+	    cp $(atf_get_srcdir)/expected/$1 exp
+}
+
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+
+	atf_test_case "${name}"
+	eval "${name}_body() { \
+		${check_function} '${name}' " "${@}" "; \
+	}"
+}
+
+broken_test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+
+	atf_test_case "${name}"
+	eval "${name}_body() { \
+		atf_skip 'This test case is probably broken'; \
+		${check_function} '${name}' " "${@}" "; \
+	}"
+}
+
+failing_test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local reason="${1}"; shift
+
+	atf_test_case "${name}"
+	eval "${name}_body() { \
+		atf_expect_fail '${reason}'; \
+		${check_function} '${name}' " "${@}" "; \
+	}"
+}
+
+failing_test_case_be()
+{
+	# this test fails on some architectures - not fully analyzed, assume
+	# an endianess bug
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local reason="${1}"; shift
+
+	atf_test_case "${name}"
+
+	if [ `sysctl -n hw.byteorder` = 4321 ]; then
+		eval "${name}_body() { \
+			atf_expect_fail '${reason}'; \
+			${check_function} '${name}' " "${@}" "; \
+		}"
+	else
+		eval "${name}_body() { \
+			${check_function} '${name}' " "${@}" "; \
+		}"
+	fi
+}
+
diff --git a/contrib/netbsd-tests/ipf/input/f1 b/contrib/netbsd-tests/ipf/input/f1
new file mode 100644
index 000000000000..7c3ae8a3a3db
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f1
@@ -0,0 +1,4 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/f10 b/contrib/netbsd-tests/ipf/input/f10
new file mode 100644
index 000000000000..254cee7316ff
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f10
@@ -0,0 +1,6 @@
+in 1.1.1.1 2.1.1.1 opt lsrr
+in 1.1.1.1 2.1.1.1
+in 1.1.1.1 2.1.1.1 opt ts
+in 1.1.1.1 2.1.1.1 opt sec-class=topsecret
+in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret
+in 1.1.1.1 2.1.1.1 opt sec
diff --git a/contrib/netbsd-tests/ipf/input/f11 b/contrib/netbsd-tests/ipf/input/f11
new file mode 100644
index 000000000000..d558150045c2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f11
@@ -0,0 +1,16 @@
+in on e0 tcp 1.1.1.1,1 2.1.2.2,23 S seq=1 ack=0
+in on e0 tcp 1.1.1.1,1 2.1.2.2,24 SA seq=1 ack=1
+in on e1 tcp 2.1.2.2,23 1.1.1.1,2 SA seq=101 ack=2
+in on e1 tcp 2.1.2.2,23 1.1.1.1,1 SA seq=101 ack=2
+in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102
+in on e0 tcp 1.1.1.1,1 2.1.2.2,25 A seq=2 ack=102
+in on e1 tcp 2.1.2.2,23 1.1.1.1,1 A seq=102 ack=2
+in on e1 tcp 2.1.2.2,25 1.1.1.1,1 A seq=102 ack=2
+in on e0 tcp 1.1.1.1,1 2.1.2.2,23 FA seq=2 ack=102
+in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102
+in on e0 tcp 1.1.1.1,2 2.1.2.2,23 A seq=2 ack=102
+in on e1 udp 1.1.1.1,1 4.4.4.4,53
+in on e1 udp 2.2.2.2,2 4.4.4.4,53
+in on e0 udp 4.4.4.4,53 1.1.1.1,1
+in on e0 udp 4.4.4.4,1023 1.1.1.1,2049
+in on e0 udp 4.4.4.4,2049 1.1.1.1,1023
diff --git a/contrib/netbsd-tests/ipf/input/f12 b/contrib/netbsd-tests/ipf/input/f12
new file mode 100644
index 000000000000..52edde110442
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f12
@@ -0,0 +1,44 @@
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF  SYN
+[]
+4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 5002 2000 86c5 0000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF  ACK
+[]
+4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK
+[]
+4500 0028 0000 6000 3f06 16cd 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0
+[]
+4500 001c 0000 6000 3f06 16d9 0101 0101 0201 0101
+0401 0019 0000 0000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK
+[]
+4500 001c 0000 6001 3f06 16d8 0101 0101 0201 0101
+0000 0000 5010 2000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0
+[]
+4500 0014 0000 6000 3f11 16d6 0101 0101 0201 0101
+
+# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0
+[]
+4500 0018 0000 2000 3f11 56d2 0101 0101 0201 0101
+0035 0035
+
+# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0
+[]
+4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101
+0001 0001 0004 fadc
+
+# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0
+[]
+4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101
+0035 0035 0004 fa74
+
diff --git a/contrib/netbsd-tests/ipf/input/f13 b/contrib/netbsd-tests/ipf/input/f13
new file mode 100644
index 000000000000..ccd370a7230c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f13
@@ -0,0 +1,95 @@
+# This checksum is deliberately incorrect.
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,FO=0  SYN
+[in]
+4500 0028 0001 4000 3f06 36cc 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 50 02 2000 86bb 0000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF  ACK
+[in]
+4500 0024 0002 2000 3f06 56cf 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 5010 2000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2  ACK
+[in]
+4500 002c 0002 0002 3f06 76c5 0101 0101 0201 0101
+0000 0000 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f 1011 1213
+
+# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN
+[in]
+4500 0028 0003 6000 3f06 16ca 0101 0101 0201 0101
+0400 0019 7000 0000 0000 0000 5002 2000 16c6 0000
+
+# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0
+[in]
+4500 001c 0004 6000 3f06 16d5 0101 0101 0201 0101
+0401 0019 0000 0000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN
+[in]
+4500 001c 0005 6001 3f06 16d3 0101 0101 0201 0101
+0000 0000 5010 2000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0
+[in]
+4500 0014 0006 6000 3f11 16d0 0101 0101 0201 0101
+
+# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0
+[in]
+4500 0018 0007 2000 3f11 56cb 0101 0101 0201 0101
+0035 0035
+
+# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0
+[in]
+4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101
+0035 0035 0004 0000
+
+# 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short)
+[in]
+4500 0018 0008 2000 3f11 56ca 0101 0101 0201 0101
+0035 0036
+
+# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0
+[in]
+4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101
+0015 0036 0004 0000
+
+# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0
+[in]
+4500 001c 0008 2000 3f06 56d1 0101 0101 0201 0101
+0015 0036 0000 0000 0000 0000 50 02 2000 0000 0000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=3
+[in]
+4500 001c 0008 0003 3f11 76c3 0101 0101 0201 0101
+0000 0000 0000 0000
+
+# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1
+[in]
+4500 001c 0008 0001 3f11 76c5 0101 0101 0201 0101
+0000 0000 0000 0000
+
+# 2.1.1.1,53 -> 1.1.1.1,53 TTL=63 UDP
+[out]
+4500 001c 0008 0000 3f11 76c6 0201 0101 0101 0101
+0035 0035 0004 0000
+
+# 2.1.1.1,25 -> 1.1.1.1,1014 TTL=63 TCP DF SYN-ACK
+[out]
+4500 0028 0003 4000 3f06 36ca 0201 0101 0101 0101
+0019 0400 0000 0001 7000 0001 5012 2000 16b4 0000
+
+# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (OOW)
+[in]
+4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101
+0400 0019 0040 0000 0000 0000 5010 2000 8678 0000
+
+# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (out-of-order)
+[in]
+4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101
+0400 0019 7000 0004 0000 0002 5010 2000 16b2 0000
+
+# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK
+[in]
+4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101
+0400 0019 7000 0001 0000 0002 5010 2000 16b5 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/f14 b/contrib/netbsd-tests/ipf/input/f14
new file mode 100644
index 000000000000..16a806ffec7b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f14
@@ -0,0 +1,5 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+in 1.1.1.2 1.2.1.1
+in 1.1.2.2 1.2.1.1
+in 1.2.2.2 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/f15 b/contrib/netbsd-tests/ipf/input/f15
new file mode 100644
index 000000000000..db547cb4f326
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f15
@@ -0,0 +1,8 @@
+in on hme0 tcp 10.1.2.3,1200 195.134.65.10,100 S
+in on hme0 tcp 10.1.2.3,1200 195.134.65.10,22 S
+in on hme0 udp 10.1.2.3,1200 195.134.65.10,100
+in on hme0 udp 10.1.2.3,53 195.134.65.10,53
+in on hme0 10.1.2.3 195.134.65.10
+in on hme1 195.134.65.10 10.1.2.3
+in on hme1 udp 195.134.65.10,53 10.1.2.3,53
+in on hme1 tcp 195.134.65.10,22 10.1.2.3,1200 SA
diff --git a/contrib/netbsd-tests/ipf/input/f16 b/contrib/netbsd-tests/ipf/input/f16
new file mode 100644
index 000000000000..a17f41f756ec
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f16
@@ -0,0 +1,8 @@
+in 2.2.2.2 5.5.5.5
+in 2.2.2.2 1.1.1.1
+in udp 4.4.4.4,110 1.1.1.1,53
+in udp 4.4.4.9,101 1.1.1.3,35
+in udp 4.4.4.8,111 1.1.1.2,53
+in tcp 4.4.4.7,220 1.1.1.1,23
+in tcp 4.4.4.6,202 1.1.1.3,22
+in tcp 4.4.4.5,222 1.1.1.2,52
diff --git a/contrib/netbsd-tests/ipf/input/f17 b/contrib/netbsd-tests/ipf/input/f17
new file mode 100644
index 000000000000..a0d44d7db58d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f17
@@ -0,0 +1,39 @@
+# TCP 1.1.1.1,54076 -> 2.2.2.2,27 SYN
+[out,ppp0]
+4500 003c 8262 0000 4006 f254 0101 0101
+0202 0202 d33c 0019 bfd0 8989 0000 0000
+a002 4000 cfcd 0000 0204 05b4 0103 0300
+0101 080a 008e 17f7 0000 0000
+
+# TCP 2.2.2.2,27 -> 1.1.1.1,54076 ACK
+[in,ppp0]
+4500 003c 8262 0000 1106 2155 0202 0202
+0101 0101 0019 d33c 4020 3436 bfdf cbc9
+5010 4000 694a 0000 0204 0584 0103 0300
+0101 080a 008e 17f7 0000 0000
+
+# TCP 1.1.1.1,54076 -> 2.2.2.2,27 SYN
+[out,ppp0]
+4500 003c 8265 0000 4006 f251 0101 0101
+0202 0202 d33c 0019 bfd0 8989 0000 0000
+a002 4000 cfc2 0000 0204 05b4 0103 0300
+0101 080a 008e 1802 0000 0000
+
+# TCP 2.2.2.2,27 -> 1.1.1.1,54076 SYN-ACK
+[in,ppp0]
+4500 002c 7442 4000 2906 d784 0202 0202
+0101 0101 0019 d33c ed67 4d4e bfd0 898a
+6012 2118 19c2 0000 0204 0584
+
+# TCP 1.1.1.1,54076 -> 2.2.2.2,27 ACK
+[out,ppp0]
+4500 0028 8262 0000 4006 f268 0101 0101
+0202 0202 d33c 0019 bfd0 898a ed67 4d4e
+5010 4000 1268 0000
+
+# TCP 2.2.2.2,27 -> 1.1.1.1,54076 ACK+data
+[in,ppp0]
+4500 002a 7442 4000 2906 d786 0202 0202
+0101 0101 0019 d33c ed67 4d4e bfd0 8990
+5012 2118 2f43 0000 0203
+
diff --git a/contrib/netbsd-tests/ipf/input/f18 b/contrib/netbsd-tests/ipf/input/f18
new file mode 100644
index 000000000000..9ecbb7f59a23
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f18
@@ -0,0 +1,4 @@
+in on le1 1.1.1.1 3.3.3.3
+in on le1 1.1.1.1 5.5.5.5
+out on le1 2.2.2.2 4.4.4.4
+out on le1 2.2.2.2 6.6.6.6
diff --git a/contrib/netbsd-tests/ipf/input/f19 b/contrib/netbsd-tests/ipf/input/f19
new file mode 100644
index 000000000000..6cab988e400b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f19
@@ -0,0 +1,4 @@
+in tcp 127.0.0.1,1 127.0.0.1,21 S
+in tcp 127.0.0.1,2 127.0.0.1,21 S
+in tcp 127.0.0.1,3 127.0.0.1,21 S
+in tcp 127.0.0.1,4 127.0.0.1,21 S
diff --git a/contrib/netbsd-tests/ipf/input/f2 b/contrib/netbsd-tests/ipf/input/f2
new file mode 100644
index 000000000000..f4e9d23f1cf6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f2
@@ -0,0 +1,6 @@
+in tcp 127.0.0.1,1 127.0.0.1,ftp
+in tcp 1.1.1.1,1 1.2.1.1,ftp
+in udp 127.0.0.1,1 127.0.0.1,21
+in udp 1.1.1.1,1 1.2.1.1,21
+in icmp 127.0.0.1 127.0.0.1
+in icmp 1.1.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/f20 b/contrib/netbsd-tests/ipf/input/f20
new file mode 100644
index 000000000000..605ba7c236f0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f20
@@ -0,0 +1,2 @@
+out on de0 1.1.1.1 2.2.2.2
+out on ab0 1.1.1.1 2.2.2.2
diff --git a/contrib/netbsd-tests/ipf/input/f21 b/contrib/netbsd-tests/ipf/input/f21
new file mode 100644
index 000000000000..1135cbd01c48
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f21
@@ -0,0 +1,31 @@
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+# IP 4.4.4.4 2.2.2.2 TCP(20480,80)
+[out,df0]
+4500 003c 4706 4000 ff06 28aa 0404 0404
+0202 0202 5000 0050 0000 0001 0000 0000
+a002 16d0 d8e2 0000 0204 05b4 0402 080a
+0047 fbb0 0000 0000 0103 0300 
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH
+[in,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303
+0404 0404 0303 acab 0000 0000 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[in,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303
+0404 0404 0501 9a9d 0808 0808 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
+# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH
+[in,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303
+0505 0505 0303 acab 0000 0000 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/f22 b/contrib/netbsd-tests/ipf/input/f22
new file mode 100644
index 000000000000..a5221c1abdb2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f22
@@ -0,0 +1,31 @@
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+# IP 4.4.4.4 2.2.2.2 TCP(20480,80)
+[in,df0]
+4500 003c 4706 4000 ff06 28aa 0404 0404
+0202 0202 5000 0050 0000 0001 0000 0000
+a002 16d0 d8e2 0000 0204 05b4 0402 080a
+0047 fbb0 0000 0000 0103 0300 
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303
+0404 0404 0303 acab 0000 0000 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303
+0404 0404 0501 9a9d 0808 0808 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
+# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303
+0505 0505 0303 acab 0000 0000 4500 003c
+4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/f24 b/contrib/netbsd-tests/ipf/input/f24
new file mode 100644
index 000000000000..030772b427f7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f24
@@ -0,0 +1,27 @@
+[out,hme0]
+4500 003f 6e48 0000 4011 8816 c0a8 0101
+c0a8 01fe eb22 0035 002b d9e6 4a82 0100
+0001 0000 0000 0000 0663 6f6f 6d62 7303
+616e 7503 6564 7502 6175 0000 0100 01
+
+[in,hme0]
+4500 004c fc96 2000 4011 d9ba c0a8 01fe
+c0a8 0101 0035 eb22 00a9 d7b9 4a82 8180
+0001 0001 0003 0003 0663 6f6f 6d62 7303
+616e 7503 6564 7502 6175 0000 0100 01c0
+0c00 0100 0100 0000 3c00 0496
+
+[in,hme0]
+4500 004c fc96 2007 4011 d9b3 c0a8 01fe
+c0a8 0101 cbe7 50c0 1300 0200 0100 0078
+8c00 0603 6e73 31c0 13c0 1300 0200 0100
+0078 8c00 0e02 6e73 0861 6465 6c61 6964
+65c0 17c0 1300 0200 0100 0078
+
+[in,hme0]
+4500 004d fc96 000c 4011 f9ad c0a8 01fe
+c0a8 0101 8c00 0603 756e 61c0 13c0 6b00
+0100 0100 0027 5800 0496 cb16 1cc0 5100
+0100 0100 0018 4700 0481 7f28 03c0 3f00
+0100 0100 0027 5800 0496 cb01 0a
+
diff --git a/contrib/netbsd-tests/ipf/input/f25 b/contrib/netbsd-tests/ipf/input/f25
new file mode 100644
index 000000000000..a4e31398e012
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f25
@@ -0,0 +1,41 @@
+[in,hme0]+mcast
+4500 0081 b02d 0000 0411 53b1 c0a8 01eb
+efff fffa 1f48 076c 006d 1bd2 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0a
+
+[out,hme0]
+4500 0108 7aca 0000 4011 79e1 c0a8 01fe
+c0a8 01eb 076c 1f48 00f4 5218 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000
+
+[in,hme0]+mcast
+4500 0081 b02d 0000 0411 53b1 c0a8 01eb
+efff fffa 1f48 076c 006d 1bd2 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0a
+
diff --git a/contrib/netbsd-tests/ipf/input/f26 b/contrib/netbsd-tests/ipf/input/f26
new file mode 100644
index 000000000000..2151f72e7cb2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f26
@@ -0,0 +1,13 @@
+in tcp 1.1.1.1,1001 2.2.2.2,22 S
+in tcp 1.1.1.1,1002 2.2.2.2,22 S
+in tcp 1.1.1.1,1003 2.2.2.2,22 S
+in tcp 1.1.1.1,1004 2.2.2.2,22 S
+in tcp 1.1.1.2,1002 2.2.2.2,22 S
+in tcp 1.1.1.3,1003 2.2.2.2,22 S
+in tcp 1.1.1.4,1004 2.2.2.2,22 S
+in tcp 1.1.1.2,1005 2.2.2.2,22 S
+in tcp 1.1.1.3,1006 2.2.2.2,22 S
+in tcp 1.1.1.4,1007 2.2.2.2,22 S
+in tcp 1.1.1.2,1008 2.2.2.2,22 S
+in tcp 1.1.1.3,1009 2.2.2.2,22 S
+in tcp 1.1.1.4,1010 2.2.2.2,22 S
diff --git a/contrib/netbsd-tests/ipf/input/f27 b/contrib/netbsd-tests/ipf/input/f27
new file mode 100644
index 000000000000..f01bf7e6ee73
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f27
@@ -0,0 +1,84 @@
+[in,hme0]
+45000028 0000 0000 FF06 b5ca
+01010101 02020202
+03e9 0016 00000000 00000000 5002 0000
+a5de 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5ca
+01010101 02020202
+03ea 0016 00000000 00000000 5002 0000
+a5dd 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5ca
+01010101 02020202
+03eb 0016 00000000 00000000 5002 0000
+a5dc 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5ca
+01010101 02020202
+03ec 0016 00000000 00000000 5002 0000
+a5db 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c9
+01010102 02020202
+03ed 0016 00000000 00000000 5002 0000
+a5d9 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c8
+01010103 02020202
+03ee 0016 00000000 00000000 5002 0000
+a5d7 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c7
+01010104 02020202
+03ef 0016 00000000 00000000 5002 0000
+a5d5 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c9
+01010102 02020202
+03f0 0016 00000000 00000000 5002 0000
+a5d6 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c8
+01010103 02020202
+03f1 0016 00000000 00000000 5002 0000
+a5d4 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c7
+01010104 02020202
+03f2 0016 00000000 00000000 5002 0000
+a5d2 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c9
+01010102 02020202
+03f3 0016 00000000 00000000 5002 0000
+a5d3 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c8
+01010103 02020202
+03f4 0016 00000000 00000000 5002 0000
+a5d1 0000
+
+[in,hme0]
+45000028 0000 0000 FF06 b5c7
+01010104 02020202
+03f5 0016 00000000 00000000 5002 0000
+a5cf 0000
+
+[in,hme0]
+6000 0000 0014 06FF
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+03f6 0016 0000 0000 0000 0000 5002 0000 292a 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/f28 b/contrib/netbsd-tests/ipf/input/f28
new file mode 100644
index 000000000000..8849c140f1fa
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f28
@@ -0,0 +1,7 @@
+in on nic1 4.4.0.1 4.2.0.2
+in on nic2 4.4.1.1 4.2.1.2
+in on nic3 4.4.2.1 4.2.2.2
+in on nic0 4.4.3.1 4.2.3.2
+in on nic0 4.4.1.1 4.2.1.2
+in on nic0 4.4.2.1 4.2.2.2
+in on nic0 4.4.3.1 4.2.3.2
diff --git a/contrib/netbsd-tests/ipf/input/f29 b/contrib/netbsd-tests/ipf/input/f29
new file mode 100644
index 000000000000..2e717af635b8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f29
@@ -0,0 +1,11 @@
+in on nic1 4.4.0.1 4.2.0.2
+in on nic2 4.4.1.1 4.2.1.2
+in on nic3 4.4.2.1 4.2.2.2
+in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000
+in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000
+in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001
+in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001
+in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002
+in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002
+in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003
+in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003
diff --git a/contrib/netbsd-tests/ipf/input/f3 b/contrib/netbsd-tests/ipf/input/f3
new file mode 100644
index 000000000000..16a806ffec7b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f3
@@ -0,0 +1,5 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+in 1.1.1.2 1.2.1.1
+in 1.1.2.2 1.2.1.1
+in 1.2.2.2 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/f30 b/contrib/netbsd-tests/ipf/input/f30
new file mode 100644
index 000000000000..ebf7dc061809
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f30
@@ -0,0 +1,16 @@
+in on hme0 udp 1.1.1.1,53 2.1.1.1,53 opt lsrr
+in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt ts,lsrr
+in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt lsrr
+in on hme0 udp 1.1.1.1,53 2.1.1.1,53
+in on hme1 udp 2.1.1.1,53 1.1.1.1,53
+in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S opt rr
+in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr,ts
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA
+in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S opt sec-class=secret
+in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=topsecret
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt ts,sec-class=secret
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=secret
+in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA
diff --git a/contrib/netbsd-tests/ipf/input/f4 b/contrib/netbsd-tests/ipf/input/f4
new file mode 100644
index 000000000000..2956d1b15454
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f4
@@ -0,0 +1,5 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.1.1.1
+in 1.1.1.1 1.1.1.2
+in 1.1.1.1 1.1.2.2
+in 1.1.1.1 1.2.2.2
diff --git a/contrib/netbsd-tests/ipf/input/f5 b/contrib/netbsd-tests/ipf/input/f5
new file mode 100644
index 000000000000..41600c10763b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f5
@@ -0,0 +1,28 @@
+in tcp 1.1.1.1,0 2.2.2.2,2222
+in tcp 1.1.1.1,1 2.2.2.2,2222
+in tcp 1.1.1.1,23 2.2.2.2,2222
+in tcp 1.1.1.1,21 2.2.2.2,2222
+in tcp 1.1.1.1,1023 2.2.2.2,2222
+in tcp 1.1.1.1,1024 2.2.2.2,2222
+in tcp 1.1.1.1,1025 2.2.2.2,2222
+in tcp 1.1.1.1,32767 2.2.2.2,2222
+in tcp 1.1.1.1,32768 2.2.2.2,2222
+in tcp 1.1.1.1,65535 2.2.2.2,2222
+in tcp 1.1.1.1,5999 2.2.2.2,2222
+in tcp 1.1.1.1,6000 2.2.2.2,2222
+in tcp 1.1.1.1,6009 2.2.2.2,2222
+in tcp 1.1.1.1,6010 2.2.2.2,2222
+in udp 1.1.1.1,0 2.2.2.2,2222
+in udp 1.1.1.1,1 2.2.2.2,2222
+in udp 1.1.1.1,23 2.2.2.2,2222
+in udp 1.1.1.1,21 2.2.2.2,2222
+in udp 1.1.1.1,1023 2.2.2.2,2222
+in udp 1.1.1.1,1024 2.2.2.2,2222
+in udp 1.1.1.1,1025 2.2.2.2,2222
+in udp 1.1.1.1,32767 2.2.2.2,2222
+in udp 1.1.1.1,32768 2.2.2.2,2222
+in udp 1.1.1.1,65535 2.2.2.2,2222
+in udp 1.1.1.1,5999 2.2.2.2,2222
+in udp 1.1.1.1,6000 2.2.2.2,2222
+in udp 1.1.1.1,6009 2.2.2.2,2222
+in udp 1.1.1.1,6010 2.2.2.2,2222
diff --git a/contrib/netbsd-tests/ipf/input/f6 b/contrib/netbsd-tests/ipf/input/f6
new file mode 100644
index 000000000000..21f0be3336c5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f6
@@ -0,0 +1,28 @@
+in tcp 2.2.2.2,2222 1.1.1.1,0
+in tcp 2.2.2.2,2222 1.1.1.1,1
+in tcp 2.2.2.2,2222 1.1.1.1,23
+in tcp 2.2.2.2,2222 1.1.1.1,21
+in tcp 2.2.2.2,2222 1.1.1.1,1023
+in tcp 2.2.2.2,2222 1.1.1.1,1024
+in tcp 2.2.2.2,2222 1.1.1.1,1025
+in tcp 2.2.2.2,2222 1.1.1.1,32767
+in tcp 2.2.2.2,2222 1.1.1.1,32768
+in tcp 2.2.2.2,2222 1.1.1.1,65535
+in tcp 2.2.2.2,2222 1.1.1.1,5999
+in tcp 2.2.2.2,2222 1.1.1.1,6000
+in tcp 2.2.2.2,2222 1.1.1.1,6009
+in tcp 2.2.2.2,2222 1.1.1.1,6010
+in udp 2.2.2.2,2222 1.1.1.1,0
+in udp 2.2.2.2,2222 1.1.1.1,1
+in udp 2.2.2.2,2222 1.1.1.1,23
+in udp 2.2.2.2,2222 1.1.1.1,21
+in udp 2.2.2.2,2222 1.1.1.1,1023
+in udp 2.2.2.2,2222 1.1.1.1,1024
+in udp 2.2.2.2,2222 1.1.1.1,1025
+in udp 2.2.2.2,2222 1.1.1.1,32767
+in udp 2.2.2.2,2222 1.1.1.1,32768
+in udp 2.2.2.2,2222 1.1.1.1,65535
+in udp 2.2.2.2,2222 1.1.1.1,5999
+in udp 2.2.2.2,2222 1.1.1.1,6000
+in udp 2.2.2.2,2222 1.1.1.1,6009
+in udp 2.2.2.2,2222 1.1.1.1,6010
diff --git a/contrib/netbsd-tests/ipf/input/f7 b/contrib/netbsd-tests/ipf/input/f7
new file mode 100644
index 000000000000..dbc9e33e80ac
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f7
@@ -0,0 +1,15 @@
+in icmp 1.1.1.1 2.1.1.1 echo
+in icmp 1.1.1.1 2.1.1.1 echo,1
+in icmp 1.1.1.1 2.1.1.1 echo,3
+in icmp 1.1.1.1 2.1.1.1 unreach
+in icmp 1.1.1.1 2.1.1.1 unreach,1
+in icmp 1.1.1.1 2.1.1.1 unreach,3
+in icmp 1.1.1.1 2.1.1.1 echorep
+in icmp 1.1.1.1 2.1.1.1 echorep,1
+in icmp 1.1.1.1 2.1.1.1 echorep,3
+in icmp 2.2.2.2 3.3.3.3 maskreq
+out icmp 3.3.3.3 2.2.2.2 maskrep
+in icmp 4.4.4.4 5.5.5.5 timest
+out icmp 5.5.5.5 4.4.4.4 timestrep
+in icmp 6.6.6.6 7.7.7.7 inforeq
+out icmp 7.7.7.7 6.6.6.6 inforep
diff --git a/contrib/netbsd-tests/ipf/input/f8 b/contrib/netbsd-tests/ipf/input/f8
new file mode 100644
index 000000000000..cace511fbeb8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f8
@@ -0,0 +1,6 @@
+in tcp 1.1.1.1,1 2.1.2.2,1 S
+in tcp 1.1.1.1,1 2.1.2.2,1 SA
+in tcp 1.1.1.1,1 2.1.2.2,1 SF
+in tcp 1.1.1.1,1 2.1.2.2,1 SFPAUR
+in tcp 1.1.1.1,1 2.1.2.2,1 PAU
+in tcp 1.1.1.1,1 2.1.2.2,1 A
diff --git a/contrib/netbsd-tests/ipf/input/f9 b/contrib/netbsd-tests/ipf/input/f9
new file mode 100644
index 000000000000..e64e299fc0e5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/f9
@@ -0,0 +1,9 @@
+in 1.1.1.1 2.1.1.1 opt lsrr
+in 1.1.1.1 2.1.1.1 opt lsrr=1.1.1.1
+in 1.1.1.1 2.1.1.1 opt lsrr,ssrr
+in 1.1.1.1 2.1.1.1 opt ts
+in 1.1.1.1 2.1.1.1 opt satid
+in 1.1.1.1 2.1.1.1 opt satid=234
+in 1.1.1.1 2.1.1.1 opt sec-class=topsecret
+in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret
+in 1.1.1.1 2.1.1.1 opt sec
diff --git a/contrib/netbsd-tests/ipf/input/ip2.data b/contrib/netbsd-tests/ipf/input/ip2.data
new file mode 100644
index 000000000000..ef34eb5e1314
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ip2.data
@@ -0,0 +1,3 @@
+1.1.1.1/32
+!2.2.0.0/16
+2.2.2.0/24
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.1 b/contrib/netbsd-tests/ipf/input/ipv6.1
new file mode 100644
index 000000000000..6da8da0e4bbc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.1
@@ -0,0 +1,45 @@
+#
+# traceroute simulation
+#
+# UDP
+#
+[out,gif0] 6000 0000 0018 1101
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+8083 829a
+0018
+f4c1
+0000 0344 0000 0004 f8f1 9d3c ddba 0e00
+
+#
+# ICMPV6
+# - Time exceeded
+#
+[in,gif0] 6000 0000 0048 3a40
+ef00 1001 0880 6cbf 0000 0000 0000 0001
+ef00 1001 2002 0001 0000 0000 0000 0070
+0300 f86f 0000 0000
+6000 0000 0018 1101
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+8083 829a
+0018
+f427
+0000 0344 0000 0004 f8f1 9d3c ddba 0e00
+
+#
+# ICMPV6
+# - Time exceeded
+#
+[in,gif0] 6000 0000 0048 3a40
+ef00 1001 0880 6cbf 0000 0000 0000 0001
+ef00 1001 2002 0001 0000 0000 0000 0070
+0300 7266 0000 0000
+6000 0000 0018 1101
+ef00 1001 2002 1001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+8083 f8a3
+0018
+f427
+0000 0344 0000 0004 f8f1 9d3c ddba 0e00
+
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.2 b/contrib/netbsd-tests/ipf/input/ipv6.2
new file mode 100644
index 000000000000..8cc2d175dc24
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.2
@@ -0,0 +1,26 @@
+[out,de0]
+6000 0000 0020 3aff ef00 0000 0000 0000
+0000 0000 0001 0013 ff02 0000 0000 0000
+0000 0001 ff01 000b 8700 ea32 0000 0000
+ef00 0000 0000 0000 0000 0000 0001 000b
+0101 0048 5487 5c6f
+
+[in,de0]
+6000 0000 0020 3aff ef00 0000 0000 0000
+0000 0000 0001 000b ef00 0000 0000 0000
+0000 0000 0001 0013 8800 5322 6000 0000
+ef00 0000 0000 0000 0000 0000 0001 000b
+0201 0800 2071 cce1
+
+[out,de0]
+6000 0000 0010 3a40 ef00 0000 0000 0000
+0000 0000 0001 0013 ef00 0000 0000 0000
+0000 0000 0001 000b 8000 3210 06ff 0002
+9ec3 3c3c 8a82 0300
+
+[in,de0]
+6000 0000 0010 3aff ef00 0000 0000 0000
+0000 0000 0001 000b ef00 0000 0000 0000
+0000 0000 0001 0013 8100 3110 06ff 0002
+9ec3 3c3c 8a82 0300
+
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.3 b/contrib/netbsd-tests/ipf/input/ipv6.3
new file mode 100644
index 000000000000..3b2ef4d325b3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.3
@@ -0,0 +1,30 @@
+[out,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4395 3ffe 8280 0000 2001
+0000 0000 0000 4394 8000 3f77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4393 3ffe 8280 0000 2001
+0000 0000 0000 4395 8100 3e78 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8300 3c77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8000 3f77 085c 0038
+0c06 b73d 1b3d 0d00
+
+[in,gif0]
+6000 0000 0010 3a40 3ffe 8280 0000 2001
+0000 0000 0000 4394 3ffe 8280 0000 2001
+0000 0000 0000 4395 8100 3e77 085c 0038
+0c06 b73d 1b3d 0d00
+
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.4 b/contrib/netbsd-tests/ipf/input/ipv6.4
new file mode 100644
index 000000000000..eb986ae9e36c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.4
@@ -0,0 +1,522 @@
+# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request
+[in,eth0]
+6000 0000 05b0 2c40 fe80 0000 0000 0000
+020c 29ff fe13 6899 fe80 0000 0000 0000
+020c 29ff fe21 5742 3a00 0001 0000 0008
+8000 f400 2c0a 0001 fd38 4a42 9e59 0900
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f
+
+# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160)
+[in,eth0]
+6000 0000 00a8 2c40 fe80 0000 0000 0000
+020c 29ff fe13 6899 fe80 0000 0000 0000
+020c 29ff fe21 5742 3a00 05a8 0000 0008
+a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf
+b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf
+c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf
+d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf
+e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef
+f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff
+0001 0203 0405 0607 0809 0a0b 0c0d 0e0f
+1011 1213 1415 1617 1819 1a1b 1c1d 1e1f
+2021 2223 2425 2627 2829 2a2b 2c2d 2e2f
+3031 3233 3435 3637 3839 3a3b 3c3d 3e3f
+
+# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply
+[out,eth0]
+6000 0000 04d8 2c40 fe80 0000 0000 0000
+020c 29ff fe21 5742 fe80 0000 0000 0000
+020c 29ff fe13 6899 3a00 0001 9c56 86dd
+8100 f300 2c0a 0001 fd38 4a42 9e59 0900
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+
+# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376)
+[out,eth0]
+6000 0000 0180 2c40 fe80 0000 0000 0000
+020c 29ff fe21 5742 fe80 0000 0000 0000
+020c 29ff fe13 6899 3a00 04d0 9c56 86dd
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f
+
+# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request
+[in,eth0]
+6000 0000 05b0 2c40 fe80 0000 0000 0000
+020c 29ff fe13 6899 fe80 0000 0000 0000
+020c 29ff fe21 5742 3a00 0001 0000 0009
+8000 80fb 2c0a 0002 fe38 4a42 105e 0900
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f
+
+# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160)
+[in,eth0]
+6000 0000 00a8 2c40 fe80 0000 0000 0000
+020c 29ff fe13 6899 fe80 0000 0000 0000
+020c 29ff fe21 5742 3a00 05a8 0000 0009
+a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf
+b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf
+c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf
+d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf
+e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef
+f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff
+0001 0203 0405 0607 0809 0a0b 0c0d 0e0f
+1011 1213 1415 1617 1819 1a1b 1c1d 1e1f
+2021 2223 2425 2627 2829 2a2b 2c2d 2e2f
+3031 3233 3435 3637 3839 3a3b 3c3d 3e3f
+
+# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply
+[out,eth0]
+6000 0000 04d8 2c40 fe80 0000 0000 0000
+020c 29ff fe21 5742 fe80 0000 0000 0000
+020c 29ff fe13 6899 3a00 0001 9889 f4c1
+8100 7ffb 2c0a 0002 fe38 4a42 105e 0900
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+
+# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376)
+[out,eth0]
+6000 0000 0180 2c40 fe80 0000 0000 0000
+020c 29ff fe21 5742 fe80 0000 0000 0000
+020c 29ff fe13 6899 3a00 04d0 9889 f4c1
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f 4041 4243 4445 4647
+4849 4a4b 4c4d 4e4f 5051 5253 5455 5657
+5859 5a5b 5c5d 5e5f 6061 6263 6465 6667
+6869 6a6b 6c6d 6e6f 7071 7273 7475 7677
+7879 7a7b 7c7d 7e7f 8081 8283 8485 8687
+8889 8a8b 8c8d 8e8f 9091 9293 9495 9697
+9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7
+a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7
+b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7
+c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7
+d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7
+e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7
+f8f9 fafb fcfd feff 0001 0203 0405 0607
+0809 0a0b 0c0d 0e0f 1011 1213 1415 1617
+1819 1a1b 1c1d 1e1f 2021 2223 2425 2627
+2829 2a2b 2c2d 2e2f 3031 3233 3435 3637
+3839 3a3b 3c3d 3e3f
+
+# frag: [0-7:nh][8-15:res][16-31:off][32-64:id]
+# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp
+[in,eth0]
+600a af74 0038 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+0600 0001 0000 0010
+fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000
+0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000
+
+# Case 5: ipv6,fragment[id=10,off=5,m=1],data
+[in,eth0]
+600a af74 0010 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+0600 0030 0000 0010
+0000 0000 0000 0000
+
+# Case 3: ipv6,fragment[id=10,off=1,m=0],tcp
+[in,eth0]
+600a af74 0034 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+0600 0008 0000 0010
+0000 0000 b002 8000 d36b 0000
+0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000
+
+# Case 1: ipv6,fragment[id=11,off=0,m=1],hopopts,ah[next=dstopts]
+[in,eth0]
+600a af74 0020 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+0000 0001 0000 0011
+3300 0000 0000 0000
+3c01 0000 0000 0000 0000 0000 0000 0000
+
+# Case 2: ipv6,fragment[id=11,off=3,m=0],dstopts,hop,tcp
+[in,eth0]
+600a af74 002c 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+3c00 0008 0000 0011
+0000 0000 0000 0000
+0600 0000 0000 0000
+fff3 0017 52ac fbab 0000 0000 5002 8000 d36b 0000
+
+# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp
+[out,eth0]
+6000 0000 001c 2c40
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+fe80 0000 0000 0000 020c 29ff fe21 5742
+0600 0001 0000 0010
+0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000
+
+# Normal TCP Reset
+[out,eth0]
+6000 0000 0014 0640
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+fe80 0000 0000 0000 020c 29ff fe21 5742
+0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000
+
+# Case 4: ipv6,fragment[id=12,off=0,m=1],tcp
+[in,eth0]
+600a af74 0038 2c40
+fe80 0000 0000 0000 020c 29ff fe21 5742
+fe80 0000 0000 0000 020c 29ff fe6e eb5a
+0600 0001 0000 0012
+fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000
+0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.5 b/contrib/netbsd-tests/ipf/input/ipv6.5
new file mode 100644
index 000000000000..e46407ca110f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.5
@@ -0,0 +1,14 @@
+[out,de0]
+6000 0000 002c 2bff
+ef00 0000 0000 0000 0000 0000 0001 0013
+ff02 0000 0000 0000 0000 0001 ff01 000b
+0602 0000 0000 0000
+ff02 0000 0000 0000 0000 0001 ff01 000b
+0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000
+
+[out,de0]
+6000 0000 0014 06ff
+ef00 0000 0000 0000 0000 0000 0001 0013
+ff02 0000 0000 0000 0000 0001 ff01 000b
+0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/ipv6.6 b/contrib/netbsd-tests/ipf/input/ipv6.6
new file mode 100644
index 000000000000..fffbad28ccda
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ipv6.6
@@ -0,0 +1,31 @@
+[out,gif0]
+6000 0000 0020 2c01
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+1100 0001 0000 0001
+8083 829a
+0020
+f4c1
+0000 0000 0000 0000 0000 0000 0000 0000
+
+[out,gif0]
+6000 0000 0020 2c01
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+1100 0008 0000 0001
+0000 0000 0000 0000 0000 0000 0000 0000
+
+[out,gif0]
+6000 0000 001e 2c01
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+1100 0001 0000 0001
+0000 0000 0000 0000 0000 0000 0000
+
+[out,gif0]
+6000 0000 0020 2c01
+ef00 1001 2002 0001 0000 0000 0000 0070
+2001 1002 3333 0001 0000 0000 0000 0001
+1100 001c 0000 0001
+0000 0000 0000 0000 0000 0000 0000 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/l1 b/contrib/netbsd-tests/ipf/input/l1
new file mode 100644
index 000000000000..a59dbe3ce6b5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/l1
@@ -0,0 +1,64 @@
+# 1.1.1.1,1025 -> 2.2.2.2,25 TTL=63 TCP DF  SYN
+[]
+4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202
+0401 0019 0000 0001 0000 0000 5002 2000 85c2 0000
+
+#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A
+[]
+4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202
+0401 0019 0000 0001 0000 0000 5010 2000 85b4 0000
+
+#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 AS
+[]
+4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101
+0019 0401 0000 0011 0000 0002 5012 2000 85a0 0000
+
+#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 A
+[out,e1] 4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101
+0019 0401 0000 0012 0000 0002 5010 2000 85a1 0000
+
+#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 AF
+[]
+4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202
+0401 0019 0000 0002 0000 0012 5011 2000 85a0 0000
+
+#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A
+[]
+4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202
+0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000
+
+#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A
+[]
+4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202
+0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000
+
+#in on e1 udp 1.1.1.1,1 4.4.4.4,53
+[]
+4500 0028 0000 4000 3f11 31bc 0101 0101 0404 0404
+0001 0035 0000 d16f 0102 0304 0506 0708 090a 0b0d
+
+#in on e1 udp 2.2.2.2,2 4.4.4.4,53
+[]
+4500 0028 0000 4000 3f11 2fba 0202 0202 0404 0404
+0001 0035 0000 0000 0102 0304 0506 0708 090a 0b0d
+
+#in on e1 udp 2.2.2.2,2 4.4.4.4,53
+[]
+4500 0038 0000 4000 3f11 2faa 0202 0202 0404 0404
+0001 0035 0000 d47b 0102 0304 0506 0708 090a 0b0d
+0e0f 4061 4263 4465 4667 4869 4a6b 4c6d
+
+#in on e0 ip 4.4.4.4,53 1.1.1.1,1
+[]
+4500 0014 0000 4000 3f00 2fdf 0202 0202 0404 0404
+
+#in on e0 udp 3.3.3.3,1023 1.1.1.1,2049
+[]
+4500 001c 0000 4000 3f11 33ca 0303 0303 0101 0101
+03ff 0801 0000 ebde
+
+#in on e0 udp 1.1.1.1,2049 3.3.3.3,1023
+[]
+4500 001c 0000 4000 3f11 33ca 0101 0101 0303 0303
+0801 03ff 0000 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/n1 b/contrib/netbsd-tests/ipf/input/n1
new file mode 100644
index 000000000000..04b24ef01198
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n1
@@ -0,0 +1,34 @@
+out on zx0 255 10.1.1.0 10.1.1.2
+out on zx0 255 10.1.1.1 10.1.1.2
+out on zx0 255 10.1.1.2 10.1.1.1
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025
+out on zx0 255 10.2.2.1 10.1.2.1
+out on zx0 255 10.2.2.2 10.1.2.1
+in on zx0 255 10.1.1.1 10.1.1.2
+in on zx0 255 10.1.1.2 10.1.1.1
+in on zx0 255 10.2.2.1 10.2.1.1
+in on zx0 255 10.2.2.2 10.2.1.1
+in on zx0 255 10.2.2.3 10.1.1.1
+in on zx0 255 10.2.3.4 10.2.2.2
+in on zx0 255 10.1.1.1 10.2.2.2
+in on zx0 255 10.1.1.2 10.2.2.2
+in on zx0 255 10.1.1.0 10.3.4.5
+in on zx0 255 10.1.1.1 10.3.4.5
+in on zx0 255 10.1.1.2 10.3.4.5
+in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025
+out on zx0 icmp 10.1.1.1 10.4.3.2
+in on zx0 icmp 10.4.3.2 10.2.2.2
+in on zx0 icmp 10.4.3.2 10.3.4.1
+in on zx0 icmp 10.4.3.2 10.3.4.2
+in on zx0 icmp 10.4.3.2 10.3.4.3
+in on zx0 icmp 10.4.3.2 10.3.4.4
+in on zx0 icmp 10.4.3.2 10.3.4.5
+out on zx0 34 10.1.1.2 10.4.3.2
+in on zx0 34 10.4.3.2 10.3.4.4
+out on zx0 34 10.1.1.2 10.4.3.4
+in on zx0 34 10.4.3.4 10.3.4.5
+out on zx0 34 10.1.1.3 10.4.3.4
+in on zx0 34 10.4.3.4 10.3.4.6
+out on zx0 35 10.1.1.3 10.4.3.4
+in on zx0 35 10.4.3.4 10.3.4.7
diff --git a/contrib/netbsd-tests/ipf/input/n10 b/contrib/netbsd-tests/ipf/input/n10
new file mode 100644
index 000000000000..1e919cc4b34d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n10
@@ -0,0 +1,6 @@
+# TCP SYN packet with an MSS option
+[out,ppp0]
+4500 002c 10c9 4000 ff06 3289 c0a8 0103 96cb e002
+8032 0015 bd6b c9c8 0000 0000
+6002 2238 35f9 0000 0204 05b4
+
diff --git a/contrib/netbsd-tests/ipf/input/n100 b/contrib/netbsd-tests/ipf/input/n100
new file mode 100644
index 000000000000..94ff8c4be6e5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n100
@@ -0,0 +1,8 @@
+out on zx0 255 1.1.1.1 2.3.2.3
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 255 1.1.1.2 2.2.2.3
+out on zx0 255 1.2.1.2 2.2.2.3
+out on zx0 255 1.1.1.1 2.2.2.4
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 tcp 1.1.1.1,101 2.3.2.3,203
+out on zx0 tcp 1.1.1.1,101 2.2.2.3,203
diff --git a/contrib/netbsd-tests/ipf/input/n101 b/contrib/netbsd-tests/ipf/input/n101
new file mode 100644
index 000000000000..94ff8c4be6e5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n101
@@ -0,0 +1,8 @@
+out on zx0 255 1.1.1.1 2.3.2.3
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 255 1.1.1.2 2.2.2.3
+out on zx0 255 1.2.1.2 2.2.2.3
+out on zx0 255 1.1.1.1 2.2.2.4
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 tcp 1.1.1.1,101 2.3.2.3,203
+out on zx0 tcp 1.1.1.1,101 2.2.2.3,203
diff --git a/contrib/netbsd-tests/ipf/input/n102 b/contrib/netbsd-tests/ipf/input/n102
new file mode 100644
index 000000000000..94ff8c4be6e5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n102
@@ -0,0 +1,8 @@
+out on zx0 255 1.1.1.1 2.3.2.3
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 255 1.1.1.2 2.2.2.3
+out on zx0 255 1.2.1.2 2.2.2.3
+out on zx0 255 1.1.1.1 2.2.2.4
+out on zx0 255 1.1.1.1 2.2.2.3
+out on zx0 tcp 1.1.1.1,101 2.3.2.3,203
+out on zx0 tcp 1.1.1.1,101 2.2.2.3,203
diff --git a/contrib/netbsd-tests/ipf/input/n103 b/contrib/netbsd-tests/ipf/input/n103
new file mode 100644
index 000000000000..7957799d071f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n103
@@ -0,0 +1,8 @@
+out on zx0 tcp 1.1.1.1,101 2.3.2.3,203
+out on zx0 tcp 1.1.1.1,101 2.2.2.3,203
+out on zx0 tcp 1.1.1.1,101 2.2.2.3,203
+out on zx0 tcp 1.1.1.2,101 2.2.2.3,203
+out on zx0 tcp 10.10.10.10,101 2.2.2.3,203
+out on zx0 tcp 5.5.5.5,101 2.2.2.3,203
+in on zx0 tcp 2.2.2.3,4000 4.4.4.4,1000
+out on zx0 tcp 7.7.7.7,101 2.2.2.3,203
diff --git a/contrib/netbsd-tests/ipf/input/n104 b/contrib/netbsd-tests/ipf/input/n104
new file mode 100644
index 000000000000..bb46b285608f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n104
@@ -0,0 +1,48 @@
+[out,zx0]
+4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202
+0065 00cb 0000 0001 1000 0001 5010 2000 789d 0000
+
+[in,zx0]
+4500 0028 0002 0000 ff06 b1c2 0606 0001 0404 0001
+0fa0 03e8 0000 0001 1000 0001 5010 2000 623f 0000
+
+[out,zx0]
+4500 0028 0003 0000 ff06 b5c7 0101 0101 0202 0202
+0066 00cb 0000 0001 1000 0001 5010 2000 789c 0000
+
+[in,zx0]
+4500 0028 0004 0000 ff06 b1bf 0606 0001 0404 0002
+0fa0 03e8 0000 0001 1000 0001 5010 2000 623e 0000
+
+[out,zx0]
+4500 0028 0005 0000 ff06 b5c5 0101 0101 0202 0202
+0067 00cb 0000 0001 1000 0001 5010 2000 789b 0000
+
+[in,zx0]
+4500 0028 0006 0000 ff06 b1bd 0606 0001 0404 0002
+0fa0 03e9 0000 0001 1000 0001 5010 2000 623d 0000
+
+[out,zx0]
+4500 0028 0007 0000 ff06 b5c3 0101 0101 0202 0202
+0068 00cb 0000 0001 1000 0001 5010 2000 789a 0000
+
+[in,zx0]
+4500 0028 0008 0000 ff06 b1ba 0606 0002 0404 0002
+0fa0 03e9 0000 0001 1000 0001 5010 2000 623c 0000
+
+[out,zx0]
+4500 0028 0009 0000 ff06 b5c1 0101 0101 0202 0202
+0069 00cb 0000 0001 1000 0001 5010 2000 7899 0000
+
+[in,zx0]
+4500 0028 000a 0000 ff06 b1b8 0606 0002 0404 0002
+0fa1 03e9 0000 0001 1000 0001 5010 2000 623b 0000
+
+[out,zx0]
+4500 0028 000b 0000 ff06 b5bf 0101 0101 0202 0202
+006a 00cb 0000 0001 1000 0001 5010 2000 7898 0000
+
+[in,zx0]
+4500 0028 000c 0000 ff06 b1b5 0606 0002 0404 0003
+0fa1 03e9 0000 0001 1000 0001 5010 2000 623a 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/n105 b/contrib/netbsd-tests/ipf/input/n105
new file mode 100644
index 000000000000..63b68f0301cb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n105
@@ -0,0 +1,8 @@
+[in,zx0]
+4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202
+0065 0050 0000 0001 1000 0001 5010 2000 7918 0000
+
+[out,zx0]
+4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404
+0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/n106 b/contrib/netbsd-tests/ipf/input/n106
new file mode 100644
index 000000000000..4e933785606e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n106
@@ -0,0 +1,8 @@
+[out,zx0]
+4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202
+0065 0050 0000 0001 1000 0001 5010 2000 7918 0000
+
+[in,zx0]
+4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404
+0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/n10_6 b/contrib/netbsd-tests/ipf/input/n10_6
new file mode 100644
index 000000000000..5c1f5af85968
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n10_6
@@ -0,0 +1,6 @@
+# TCP SYN packet with an MSS option
+[out,ppp0]
+6000 0000 0018 06ff c0a8 0100 0000 0000 0000 0000 0000 0003 96cb e000 0000 0000 0000 0000 0000 0002
+8032 0015 bd6b c9c8 0000 0000
+6002 2238 35f9 0000 0204 05b4
+
diff --git a/contrib/netbsd-tests/ipf/input/n11 b/contrib/netbsd-tests/ipf/input/n11
new file mode 100644
index 000000000000..8712674489ea
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n11
@@ -0,0 +1,16 @@
+out on zx0 255 10.1.1.0 10.1.1.2
+out on zx0 255 10.1.1.1 10.1.1.2
+out on zx0 255 10.1.1.2 10.1.1.1
+out on zx0 255 10.2.2.1 10.1.2.1
+out on zx0 255 10.2.2.2 10.1.2.1
+in on zx0 255 10.1.1.1 10.1.1.2
+in on zx0 255 10.1.1.2 10.1.1.1
+in on zx0 255 10.2.2.1 10.2.1.1
+in on zx0 255 10.2.2.2 10.2.1.1
+in on zx0 255 10.2.2.3 10.1.1.1
+in on zx0 255 10.2.3.4 10.2.2.2
+in on zx0 255 10.1.1.1 10.2.2.2
+in on zx0 255 10.1.1.2 10.2.2.2
+in on zx0 255 10.1.1.0 10.3.4.5
+in on zx0 255 10.1.1.1 10.3.4.5
+in on zx0 255 10.1.1.2 10.3.4.5
diff --git a/contrib/netbsd-tests/ipf/input/n11_6 b/contrib/netbsd-tests/ipf/input/n11_6
new file mode 100644
index 000000000000..128e45ae5c5b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n11_6
@@ -0,0 +1,16 @@
+out6 on zx0 255 10:1:1::0 10:1:1::2
+out6 on zx0 255 10:1:1::1 10:1:1::2
+out6 on zx0 255 10:1:1::2 10:1:1::1
+out6 on zx0 255 10::2:2:1 10:1:2::1
+out6 on zx0 255 10::2:2:2 10:1:2::1
+in6 on zx0 255 10:1:1::1 10:1:1::2
+in6 on zx0 255 10:1:1::2 10:1:1::1
+in6 on zx0 255 10::2:2:1 10::2:1:1
+in6 on zx0 255 10::2:2:2 10::2:1:1
+in6 on zx0 255 10::2:2:3 10:1:1::1
+in6 on zx0 255 10::2:3:4 10::2:2:2
+in6 on zx0 255 10:1:1::1 10::2:2:2
+in6 on zx0 255 10:1:1::2 10::2:2:2
+in6 on zx0 255 10:1:1::0 10::3:4:5
+in6 on zx0 255 10:1:1::1 10::3:4:5
+in6 on zx0 255 10:1:1::2 10::3:4:5
diff --git a/contrib/netbsd-tests/ipf/input/n12 b/contrib/netbsd-tests/ipf/input/n12
new file mode 100644
index 000000000000..16e479ed1964
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n12
@@ -0,0 +1,18 @@
+[out,le0=192.168.1.188]
+4510 0040 2020 4000 4006 17e1 c0a8 7e53 c0a8 0303
+12c2 0017 4e33 298e 0000 0000
+b002 4000 07af 0000 0204 05b4 0101 0402
+0103 0300 0101 080a 0c72 549e 0000 0000
+
+[in,le0]
+4500 003c 00b0 4000 fe06 f5fb c0a8 0303 c0a8 01bc
+0017 2710 f674 e02c 4e33 298f
+a012 2798 e317 0000 0101 080a 2c05 b797
+0c72 549e 0103 0300 0204 05b4
+
+[out,le0]
+4510 0034 493b 4000 4006 eed1 c0a8 7e53 c0a8 0303
+12c2 0017 4e33 298f f674 e02d
+8010 4000 8e2a 0000 0101 080a 0c72 549e
+2c05 b797
+
diff --git a/contrib/netbsd-tests/ipf/input/n12_6 b/contrib/netbsd-tests/ipf/input/n12_6
new file mode 100644
index 000000000000..8583acbd7196
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n12_6
@@ -0,0 +1,18 @@
+[out,le0=c0a8:0100::bc]
+6000 0000 002c 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003
+12c2 0017 4e33 298e 0000 0000
+b002 4000 07af 0000 0204 05b4 0101 0402
+0103 0300 0101 080a 0c72 549e 0000 0000
+
+[in,le0]
+6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 0100 0000 0000 0000 0000 0000 00bc
+0017 2710 f674 e02c 4e33 298f
+a012 2798 e317 0000 0101 080a 2c05 b797
+0c72 549e 0103 0300 0204 05b4
+
+[out,le0]
+6000 0000 0020 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003
+12c2 0017 4e33 298f f674 e02d
+8010 4000 8e2a 0000 0101 080a 0c72 549e
+2c05 b797
+
diff --git a/contrib/netbsd-tests/ipf/input/n13 b/contrib/netbsd-tests/ipf/input/n13
new file mode 100644
index 000000000000..ac7bbbda24a8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n13
@@ -0,0 +1,4 @@
+out on le0 192.168.1.1 150.1.1.1
+out on le0 192.168.1.1 150.1.1.2
+out on le0 192.168.1.2 150.1.1.2
+out on le0 192.168.1.3 150.1.1.1
diff --git a/contrib/netbsd-tests/ipf/input/n13_6 b/contrib/netbsd-tests/ipf/input/n13_6
new file mode 100644
index 000000000000..54b262dc8ea1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n13_6
@@ -0,0 +1,4 @@
+out6 on le0 192:168:1::1 150:1:1::1
+out6 on le0 192:168:1::1 150:1:1::2
+out6 on le0 192:168:1::2 150:1:1::2
+out6 on le0 192:168:1::3 150:1:1::1
diff --git a/contrib/netbsd-tests/ipf/input/n14 b/contrib/netbsd-tests/ipf/input/n14
new file mode 100644
index 000000000000..969eb1c21466
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n14
@@ -0,0 +1,4 @@
+in on gre0 tcp 10.2.2.5,2000 203.1.1.1,80
+in on gre0 tcp 10.2.2.6,2000 203.1.1.1,80
+in on gre0 tcp 10.2.2.7,2000 203.1.1.1,80
+in on gre0 tcp 10.2.2.5,2001 203.1.1.1,80
diff --git a/contrib/netbsd-tests/ipf/input/n14_6 b/contrib/netbsd-tests/ipf/input/n14_6
new file mode 100644
index 000000000000..f5dd5d359f64
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n14_6
@@ -0,0 +1,4 @@
+in6 on gre0 tcp 10::2:2:5,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:6,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:7,2000 203:1:1::1,80
+in6 on gre0 tcp 10::2:2:5,2001 203:1:1::1,80
diff --git a/contrib/netbsd-tests/ipf/input/n15 b/contrib/netbsd-tests/ipf/input/n15
new file mode 100644
index 000000000000..715848e764d5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n15
@@ -0,0 +1,2 @@
+in on le0 tcp 9.9.9.9,10011 5.5.5.5,80
+in on le0 tcp 9.9.9.9,10011 2.2.2.2,80
diff --git a/contrib/netbsd-tests/ipf/input/n15_6 b/contrib/netbsd-tests/ipf/input/n15_6
new file mode 100644
index 000000000000..4a56138724b0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n15_6
@@ -0,0 +1,2 @@
+in6 on le0 tcp 9:9:9::9,10011 5:5::5:5,80
+in6 on le0 tcp 9:9:9::9,10011 2::2:2:2,80
diff --git a/contrib/netbsd-tests/ipf/input/n16 b/contrib/netbsd-tests/ipf/input/n16
new file mode 100644
index 000000000000..ad09a45f6735
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n16
@@ -0,0 +1,40 @@
+[in,vlan0]
+4520 0068 17e4 0000 6b11 3539 c05b ac33 45f8 4fc1
+1194 94f8 0054 0000
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+
+[out,vlan2]
+4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318
+1194 07dd 0054 0000
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+
+[in,vlan2]
+4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33
+0303 4ca1 0000 0000
+4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318
+1194 07dd 0054 0000
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+
+[out,vlan0]
+4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33
+0303 4ca1 0000 0000
+4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318
+1194 07dd 0054 0000
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+a5a5 a5a5 a5a5 a5a5 a5a5 a5a5
+
diff --git a/contrib/netbsd-tests/ipf/input/n17 b/contrib/netbsd-tests/ipf/input/n17
new file mode 100644
index 000000000000..29709de53f62
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n17
@@ -0,0 +1,24 @@
+[out,zx0]
+4500 00a0 0000 0100 3f06 7555 0101 0101 0201 0101
+0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000
+
+[in,zx0]
+4500 00a0 0000 0100 3f06 7553 0201 0101 0101 0103
+0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/n18 b/contrib/netbsd-tests/ipf/input/n18
new file mode 100644
index 000000000000..a7a610cf8fb8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n18
@@ -0,0 +1,8 @@
+out on z0 tcp 2.2.2.2,22 3.3.3.3,30
+out on z0 tcp 2.2.2.2,23 3.3.3.3,31
+out on z0 tcp 2.2.2.2,24 3.3.3.3,32
+out on z0 tcp 2.2.2.2,25 3.3.3.3,33
+out on z0 tcp 2.2.2.2,26 3.3.3.3,34
+out on z0 tcp 2.2.2.2,27 3.3.3.3,35
+out on z0 tcp 2.2.2.2,28 3.3.3.3,36
+out on z0 tcp 2.2.2.2,29 3.3.3.3,37
diff --git a/contrib/netbsd-tests/ipf/input/n1_6 b/contrib/netbsd-tests/ipf/input/n1_6
new file mode 100644
index 000000000000..c1badab9a9cb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n1_6
@@ -0,0 +1,34 @@
+out6 on zx0 255 10:1:1::0 10:1:1::2
+out6 on zx0 255 10:1:1::1 10:1:1::2
+out6 on zx0 255 10:1:1::2 10:1:1::1
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025
+out6 on zx0 255 10::2:2:1 10:1:2::1
+out6 on zx0 255 10::2:2:2 10:1:2::1
+in6 on zx0 255 10:1:1::1 10:1:1::2
+in6 on zx0 255 10:1:1::2 10:1:1::1
+in6 on zx0 255 10::2:2:1 10::2:1:1
+in6 on zx0 255 10::2:2:2 10::2:1:1
+in6 on zx0 255 10::2:2:3 10:1:1::1
+in6 on zx0 255 10::2:3:4 10::2:2:2
+in6 on zx0 255 10:1:1::1 10::2:2:2
+in6 on zx0 255 10:1:1::2 10::2:2:2
+in6 on zx0 255 10:1:1::0 10::3:4:5
+in6 on zx0 255 10:1:1::1 10::3:4:5
+in6 on zx0 255 10:1:1::2 10::3:4:5
+in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025
+out6 on zx0 58 10:1:1::1 10:4:3::2
+in6 on zx0 58 10:4:3::2 10::2:2:2
+in6 on zx0 58 10:4:3::2 10::3:4:1
+in6 on zx0 58 10:4:3::2 10::3:4:2
+in6 on zx0 58 10:4:3::2 10::3:4:3
+in6 on zx0 58 10:4:3::2 10::3:4:4
+in6 on zx0 58 10:4:3::2 10::3:4:5
+out6 on zx0 34 10:1:1::2 10:4:3::2
+in6 on zx0 34 10:4:3::2 10::3:4:4
+out6 on zx0 34 10:1:1::2 10:4:3::4
+in6 on zx0 34 10:4:3::4 10::3:4:5
+out6 on zx0 34 10:1:1::3 10:4:3::4
+in6 on zx0 34 10:4:3::4 10::3:4:6
+out6 on zx0 35 10:1:1::3 10:4:3::4
+in6 on zx0 35 10:4:3::4 10::3:4:7
diff --git a/contrib/netbsd-tests/ipf/input/n2 b/contrib/netbsd-tests/ipf/input/n2
new file mode 100644
index 000000000000..476f16ed1283
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n2
@@ -0,0 +1,19 @@
+out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025
+out on zx0 10.1.1.0 10.1.1.2
+out on zx0 10.1.1.1 10.1.2.1
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025
+out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80
+out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80
+out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80
+out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80
+in on zx0 10.1.1.1 10.1.1.2
+in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025
+in on zx0 10.1.1.2 10.1.1.1
+in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000
+in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000
+in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001
+in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001
diff --git a/contrib/netbsd-tests/ipf/input/n200 b/contrib/netbsd-tests/ipf/input/n200
new file mode 100644
index 000000000000..9b021581e131
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n200
@@ -0,0 +1,6 @@
+[in,bar0]
+4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 
+
+[out,bar0]
+4500 0044 0000 0000 ff11 bda6 7f00 0001 7f00 0001 2775 2775 0030 0000 4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 
+
diff --git a/contrib/netbsd-tests/ipf/input/n2_6 b/contrib/netbsd-tests/ipf/input/n2_6
new file mode 100644
index 000000000000..3ea74ff377ab
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n2_6
@@ -0,0 +1,19 @@
+out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025
+out6 on zx0 10:1:1::0 10:1:1::2
+out6 on zx0 10:1:1::1 10:1:2::1
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025
+out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80
+out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80
+out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80
+out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80
+in6 on zx0 10:1:1::1 10:1:1::2
+in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025
+in6 on zx0 10:1:1::2 10:1:1::1
+in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000
+in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000
+in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001
+in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001
diff --git a/contrib/netbsd-tests/ipf/input/n3 b/contrib/netbsd-tests/ipf/input/n3
new file mode 100644
index 000000000000..deca3178daee
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n3
@@ -0,0 +1,5 @@
+out on zz0 tcp 10.1.1.1,5000 203.1.1.1,80
+out on zz0 tcp 10.1.1.1,252 203.1.1.1,80
+out on zz0 tcp 10.1.0.0,32768 203.1.1.1,80
+out on zz0 udp 10.1.0.0,32768 203.1.1.1,80
+out on zz0 tcp 10.1.255.255,65535 203.1.1.1,80
diff --git a/contrib/netbsd-tests/ipf/input/n4 b/contrib/netbsd-tests/ipf/input/n4
new file mode 100644
index 000000000000..1218ef9e9103
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n4
@@ -0,0 +1,10 @@
+in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23
+out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12345
+in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53
+out on zx0 tcp 10.2.2.1,10053 10.3.3.3,12345
+in on zx0 tcp 10.3.3.3,12346 10.1.0.0,23
+out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12346
+in on zx0 udp 10.3.3.3,12345 10.1.1.0,53
+out on zx0 udp 10.2.2.1,10053 10.3.3.3,12345
+in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53
+out on zx0 tcp 10.2.2.1,53 10.3.3.3,12345
diff --git a/contrib/netbsd-tests/ipf/input/n4_6 b/contrib/netbsd-tests/ipf/input/n4_6
new file mode 100644
index 000000000000..8f0f423bc27b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n4_6
@@ -0,0 +1,10 @@
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23
+out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12345
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53
+out6 on zx0 tcp 10::2:2:1,10053 10:3:3::3,12345
+in6 on zx0 tcp 10:3:3::3,12346 10:1:0::0,23
+out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12346
+in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53
+out6 on zx0 udp 10::2:2:1,10053 10:3:3::3,12345
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53
+out6 on zx0 tcp 10::2:2:1,53 10:3:3::3,12345
diff --git a/contrib/netbsd-tests/ipf/input/n5 b/contrib/netbsd-tests/ipf/input/n5
new file mode 100644
index 000000000000..579210b3a369
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n5
@@ -0,0 +1,54 @@
+out on zx0 255 10.1.1.0 10.1.1.2
+out on zx0 255 10.1.1.1 10.1.1.2
+out on zx0 255 10.1.1.2 10.1.1.1
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025
+out on zx0 255 10.2.2.1 10.1.2.1
+out on zx0 255 10.2.2.2 10.1.2.1
+in on zx0 255 10.1.1.1 10.1.1.2
+in on zx0 255 10.1.1.2 10.1.1.1
+in on zx0 255 10.2.2.1 10.2.1.1
+in on zx0 255 10.2.2.2 10.2.1.1
+in on zx0 255 10.2.2.3 10.1.1.1
+in on zx0 255 10.2.3.4 10.2.2.2
+in on zx0 255 10.1.1.1 10.2.2.2
+in on zx0 255 10.1.1.2 10.2.2.2
+in on zx0 255 10.1.1.0 10.3.4.5
+in on zx0 255 10.1.1.1 10.3.4.5
+in on zx0 255 10.1.1.2 10.3.4.5
+in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025
+out on zx0 icmp 10.1.1.1 10.4.3.2
+in on zx0 icmp 10.4.3.2 10.2.2.2
+in on zx0 icmp 10.4.3.2 10.3.4.3
+in on zx0 icmp 10.4.3.2 10.3.4.5
+out on zx0 34 10.1.1.2 10.4.3.2
+in on zx0 34 10.4.3.2 10.3.4.4
+out on zx0 34 10.1.1.2 10.4.3.4
+in on zx0 34 10.4.3.4 10.3.4.5
+out on zx0 34 10.1.1.3 10.4.3.4
+in on zx0 34 10.4.3.4 10.3.4.6
+out on zx0 35 10.1.1.3 10.4.3.4
+in on zx0 35 10.4.3.4 10.3.4.7
+out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025
+out on zx0 10.1.1.0 10.1.1.2
+out on zx0 10.1.1.1 10.1.2.1
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025
+out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025
+out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80
+out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80
+out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80
+out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80
+in on zx0 10.1.1.1 10.1.1.2
+in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025
+in on zx0 10.1.1.2 10.1.1.1
+out on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000
+in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000
+out on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000
+in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000
+out on zx0 udp 10.1.1.2,1025 10.3.4.5,40001
+in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001
+out on zx0 tcp 10.1.2.1,80 10.3.4.5,40001
+in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001
diff --git a/contrib/netbsd-tests/ipf/input/n5_6 b/contrib/netbsd-tests/ipf/input/n5_6
new file mode 100644
index 000000000000..9ac0c29c4a39
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n5_6
@@ -0,0 +1,54 @@
+out6 on zx0 255 10:1:1::0 10:1:1::2
+out6 on zx0 255 10:1:1::1 10:1:1::2
+out6 on zx0 255 10:1:1::2 10:1:1::1
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025
+out6 on zx0 255 10::2:2:1 10:1:2::1
+out6 on zx0 255 10::2:2:2 10:1:2::1
+in6 on zx0 255 10:1:1::1 10:1:1::2
+in6 on zx0 255 10:1:1::2 10:1:1::1
+in6 on zx0 255 10::2:2:1 10::2:1:1
+in6 on zx0 255 10::2:2:2 10::2:1:1
+in6 on zx0 255 10::2:2:3 10:1:1::1
+in6 on zx0 255 10::2:3:4 10::2:2:2
+in6 on zx0 255 10:1:1::1 10::2:2:2
+in6 on zx0 255 10:1:1::2 10::2:2:2
+in6 on zx0 255 10:1:1::0 10::3:4:5
+in6 on zx0 255 10:1:1::1 10::3:4:5
+in6 on zx0 255 10:1:1::2 10::3:4:5
+in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025
+out6 on zx0 58 10:1:1::1 10:4:3::2
+in6 on zx0 58 10:4:3::2 10::2:2:2
+in6 on zx0 58 10:4:3::2 10::3:4:3
+in6 on zx0 58 10:4:3::2 10::3:4:5
+out6 on zx0 34 10:1:1::2 10:4:3::2
+in6 on zx0 34 10:4:3::2 10::3:4:4
+out6 on zx0 34 10:1:1::2 10:4:3::4
+in6 on zx0 34 10:4:3::4 10::3:4:5
+out6 on zx0 34 10:1:1::3 10:4:3::4
+in6 on zx0 34 10:4:3::4 10::3:4:6
+out6 on zx0 35 10:1:1::3 10:4:3::4
+in6 on zx0 35 10:4:3::4 10::3:4:7
+out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025
+out6 on zx0 10:1:1::0 10:1:1::2
+out6 on zx0 10:1:1::1 10:1:2::1
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025
+out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025
+out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80
+out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80
+out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80
+out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80
+in6 on zx0 10:1:1::1 10:1:1::2
+in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025
+in6 on zx0 10:1:1::2 10:1:1::1
+out6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000
+in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000
+out6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000
+in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000
+out6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001
+in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001
+out6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001
+in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001
diff --git a/contrib/netbsd-tests/ipf/input/n6 b/contrib/netbsd-tests/ipf/input/n6
new file mode 100644
index 000000000000..8a0c924b36a0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n6
@@ -0,0 +1,13 @@
+in on zx0 tcp 10.2.2.2,12345 10.1.1.1,23
+in on zx0 tcp 10.2.2.2,12345 10.1.1.2,23
+in on zx0 tcp 10.3.0.1,12345 10.1.2.2,23
+in on zx0 tcp 10.3.0.1,12345 10.2.2.2,23
+in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23
+in on zx0 tcp 10.2.2.2,12345 10.1.1.1,53
+in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53
+in on zx0 tcp 10.2.2.2,12345 10.1.0.0,23
+in on zx0 tcp 10.3.3.3,12345 10.1.0.0,23
+in on zx0 udp 10.2.2.2,12345 10.1.1.0,53
+in on zx0 udp 10.3.3.3,12345 10.1.1.0,53
+in on zx0 tcp 10.2.2.2,12345 10.1.1.0,53
+in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53
diff --git a/contrib/netbsd-tests/ipf/input/n6_6 b/contrib/netbsd-tests/ipf/input/n6_6
new file mode 100644
index 000000000000..18300cd14552
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n6_6
@@ -0,0 +1,13 @@
+in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,23
+in6 on zx0 tcp 10::2:2:2,12345 10:1:1::2,23
+in6 on zx0 tcp 10:3:0::1,12345 10:1:2::2,23
+in6 on zx0 tcp 10:3:0::1,12345 10::2:2:2,23
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23
+in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,53
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53
+in6 on zx0 tcp 10::2:2:2,12345 10:1:0::0,23
+in6 on zx0 tcp 10:3:3::3,12345 10:1:0::0,23
+in6 on zx0 udp 10::2:2:2,12345 10:1:1::0,53
+in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53
+in6 on zx0 tcp 10::2:2:2,12345 10:1:1::0,53
+in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53
diff --git a/contrib/netbsd-tests/ipf/input/n7 b/contrib/netbsd-tests/ipf/input/n7
new file mode 100644
index 000000000000..79af9010825d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n7
@@ -0,0 +1,9 @@
+in on zx0 tcp 10.2.3.1,1230 10.1.1.1,22
+in on zx0 tcp 10.2.3.1,1231 10.1.1.1,23
+in on zx0 tcp 10.2.3.1,1232 10.1.1.1,50
+in on zx0 tcp 10.2.3.1,1233 10.1.1.1,79
+in on zx0 tcp 10.2.3.1,1234 10.1.1.1,80
+in on zx0 tcp 10.2.3.1,1235 10.1.1.2,80
+in on zx0 tcp 10.2.3.1,1236 10.1.1.3,80
+in on zx0 tcp 10.2.3.1,1237 10.1.1.4,80
+in on zx0 tcp 10.2.3.1,1238 10.1.1.4,80
diff --git a/contrib/netbsd-tests/ipf/input/n7_6 b/contrib/netbsd-tests/ipf/input/n7_6
new file mode 100644
index 000000000000..b31a1def4f48
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n7_6
@@ -0,0 +1,9 @@
+in6 on zx0 tcp 10::2:3:1,1230 10:1:1::1,22
+in6 on zx0 tcp 10::2:3:1,1231 10:1:1::1,23
+in6 on zx0 tcp 10::2:3:1,1232 10:1:1::1,50
+in6 on zx0 tcp 10::2:3:1,1233 10:1:1::1,79
+in6 on zx0 tcp 10::2:3:1,1234 10:1:1::1,80
+in6 on zx0 tcp 10::2:3:1,1235 10:1:1::2,80
+in6 on zx0 tcp 10::2:3:1,1236 10:1:1::3,80
+in6 on zx0 tcp 10::2:3:1,1237 10:1:1::4,80
+in6 on zx0 tcp 10::2:3:1,1238 10:1:1::4,80
diff --git a/contrib/netbsd-tests/ipf/input/n8 b/contrib/netbsd-tests/ipf/input/n8
new file mode 100644
index 000000000000..c0a5b3fd7dd0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n8
@@ -0,0 +1,34 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP ECHO (ping) exchange
+[out,icmp0]
+4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404
+0800 efdf 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[in,icmp0]
+4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01
+0000 f7df 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[out,icmp0]
+4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404
+0800 efde 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[in,icmp0]
+4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01
+0000 f7de 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
diff --git a/contrib/netbsd-tests/ipf/input/n8_6 b/contrib/netbsd-tests/ipf/input/n8_6
new file mode 100644
index 000000000000..8039f78df638
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n8_6
@@ -0,0 +1,37 @@
+#v tos len id off ttl p sum src dst
+# ICMP ECHO (ping) exchange
+[out,icmp0]
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
+8000 774d 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+# ECHO reply
+[in,icmp0]
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001
+8100 7624 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+# ECHO request
+[out,icmp0]
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
+8000 774c 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+# ECHO reply
+[in,icmp0]
+6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001
+8100 7623 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
diff --git a/contrib/netbsd-tests/ipf/input/n9 b/contrib/netbsd-tests/ipf/input/n9
new file mode 100644
index 000000000000..5c2d3c7dfebd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n9
@@ -0,0 +1,34 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP ECHO (ping) exchange
+[in,icmp0]
+4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404
+0800 efdf 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[out,icmp0]
+4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 0202 0202
+0000 f7df 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[in,icmp0]
+4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404
+0800 efde 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[out,icmp0]
+4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 0202 0202
+0000 f7de 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
diff --git a/contrib/netbsd-tests/ipf/input/n9_6 b/contrib/netbsd-tests/ipf/input/n9_6
new file mode 100644
index 000000000000..42db09dd3653
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/n9_6
@@ -0,0 +1,34 @@
+#v tos len id off ttl p sum src dst
+# ICMP ECHO (ping) exchange
+[in,icmp0]
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
+8000 774d 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[out,icmp0]
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002
+8100 762c 6220 0000 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[in,icmp0]
+6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004
+8000 774c 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
+[out,icmp0]
+6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002
+8100 762b 6220 0001 3f6f 6e80 000b
+0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415
+1617 1819 1a1b 1c1d 1e1f 2021 2223 2425
+2627 2829 2a2b 2c2d 2e2f 3031 3233 3435
+3637
+
diff --git a/contrib/netbsd-tests/ipf/input/ni1 b/contrib/netbsd-tests/ipf/input/ni1
new file mode 100644
index 000000000000..519325fc56b4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni1
@@ -0,0 +1,59 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP timeout exceeded in reply to a ICMP packet going out.
+# 2.2.2.2,44489 -> 4.4.4.4,33438
+[out,df0]
+4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404
+afc9 829e 0014 6b10
+0402 0000 3be5 468d 000a cfc3
+
+[in,df0]
+4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606
+0b00 5f7b 0000 0000
+4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404
+afc9 829e 0014 6308 
+
+[in,df0]
+4500 0044 809a 0000 ff01 290d 0303 0303 0606 0606
+0b00 0939 0000 0000
+4500 0028 0000 4000 0111 65b2 0606 0606 0404 0404
+afc9 829e 0014 6308
+0402 0000 3be5 468d 000a cfc3
+
+# 2.2.2.2,2048 -> 4.4.4.4,33438
+[out,df0]
+4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404
+0800 829e 0014 12da
+0402 0000 3be5 468d 000a cfc3
+
+[in,df0]
+4500 0038 809a 0000 ff01 2918 0303 0303 0606 0607
+0b00 5f7c 0000 0000
+4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404
+4e20 829e 0014 c4b0
+
+[in,df0]
+4500 0044 809a 0000 ff01 290c 0303 0303 0606 0607
+0b00 093a 0000 0000
+4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404
+4e20 829e 0014 c4b0
+0402 0000 3be5 468d 000a cfc3
+
+# 2.2.2.2,20480 -> 4.4.4.4,33438
+[out,df0]
+4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404
+5000 829e 0014 cad9
+0402 0000 3be5 468d 000a cfc3
+
+[in,df0]
+4500 0038 809a 0000 ff01 2917 0303 0303 0606 0608
+0b00 0775 0000 0000
+4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404
+07d0 829e 0014 6308 
+
+[in,df0]
+4500 0044 809a 0000 ff01 290b 0303 0303 0606 0608
+0b00 093b 0000 0000
+4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404
+07d0 829e 0014 0b00
+0402 0000 3be5 468d 000a cfc3
+
diff --git a/contrib/netbsd-tests/ipf/input/ni10 b/contrib/netbsd-tests/ipf/input/ni10
new file mode 100644
index 000000000000..636c4f1b2d6a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni10
@@ -0,0 +1,29 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+# IP 4.4.4.4 2.2.2.2 TCP(20480,80)
+[in,df0]
+4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202
+5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80))
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0303 acab 0000 0000
+4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606
+5000 0050 0000 0001
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80))
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404
+0303 113f 0000 0000
+4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606
+5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
+# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80))
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505
+0303 acab 0000 0000
+4500 003c 4706 4000 ff06 28ab 0404 0404 0202 0201 5000 0050 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/ni11 b/contrib/netbsd-tests/ipf/input/ni11
new file mode 100644
index 000000000000..0650abb70342
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni11
@@ -0,0 +1,26 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+[in,df0]
+4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202
+5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404
+0303 0735 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000
+0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/ni12 b/contrib/netbsd-tests/ipf/input/ni12
new file mode 100644
index 000000000000..c44aacce6da5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni12
@@ -0,0 +1,26 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+[in,df0]
+4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202
+5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0303 10bb 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9c40 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404
+0303 0735 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000
+0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505
+0303 10bb 0000 0000
+4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9c40 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/ni13 b/contrib/netbsd-tests/ipf/input/ni13
new file mode 100644
index 000000000000..70c19526ba90
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni13
@@ -0,0 +1,231 @@
+# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF)
+[in,pcn1=192.168.113.3]
+4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103
+05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402
+
+# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF)
+[out,pcn1]
+4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101
+06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4
+
+# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF)
+[in,pcn1]
+4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103
+05e7 06bb abf0 4aa6 a564 68db
+5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d
+0001 0000 0100 0000 0000 0001 0000 0001
+0000 0a28 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 4d69 6372 6f73 6f66 7420 5769
+6e64 6f77 7320 4e54 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF)
+[out,pcn1]
+4500 00c4 69a7 4000 4006 6d37 c0a8 7103 c0a8 7101
+06bb 05e7 a564 68db abf0 4b42
+5018 832c cecf 0000 009c 0001 1a2b 3c4d
+0002 0000 0100 0100 0000 0000 0000 0000
+0001 0001 6c6f 6361 6c00 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 6c69 6e75 7800 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF)
+[in,pcn1]
+4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103
+05e7 06bb abf0 4b42 a564 6977
+5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d
+0007 0000 4000 1331 0000 012c 05f5 e100
+0000 0003 0000 0003 0040 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+
+# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF)
+[out,pcn1]
+4500 0048 69a8 4000 4006 6db2 c0a8 7103 c0a8 7101
+06bb 05e7 a564 6977 abf0 4bea
+5018 832c 36fa 0000 0020 0001 1a2b 3c4d
+0008 0000 0000 4000 0100 0000 05f5 e100
+0040 0000 0000 0000
+
+# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF)
+[in,pcn1]
+4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103
+05e7 06bb abf0 4bea a564 6997
+5018 fa34 e810 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 ffff ffff ffff ffff
+
+# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP
+[in,pcn1]
+4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103
+3001 880b 0019 0000 0000 0000
+ff03 c021 0100 0015 0104 0578 0506 577f
+7c5b 0702 0802 0d03 06
+
+# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre]
+[out,pcn1]
+4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101
+2081 880b 0000 4000 ffff ffff
+
+# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF)
+[out,pcn1]
+4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101
+06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000
+
+# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[out,pcn1]
+4500 0038 69ab 0000 ff2f ee95 c0a8 7103 c0a8 7101
+3001 880b 0018 4000 0000 0000
+ff03 c021 0101 0014 0206 0000 0000 0506
+22d9 0cfa 0702 0802
+
+# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP
+[out,pcn1]
+4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101
+3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06
+
+# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[in,pcn1]
+4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103
+3081 880b 0018 0000 0000 0001
+0000 0001 ff03 c021 0201 0014 0206 0000
+0000 0506 22d9 0cfa 0702 0802
+
+# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[in,pcn1]
+4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103
+3001 880b 0016 0000 0000 0002
+ff03 c021 0101 0012 0104 0578 0506 577f
+7c5b 0702 0802
+
+# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[out,pcn1]
+4500 003a 69ad 0000 ff2f ee91 c0a8 7103 c0a8 7101
+3081 880b 0016 4000 0000 0002
+0000 0002 ff03 c021 0201 0012 0104 0578
+0506 577f 7c5b 0702 0802
+
+# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp
+[out,pcn1]
+4500 0032 69ae 0000 ff2f ee98 c0a8 7103 c0a8 7101
+3001 880b 0012 4000 0000 0003
+8021 0101 0010 0306 c0a8 0001 0206 002d
+0f01
+
+# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF)
+[in,pcn1]
+4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103
+05e7 06bb abf0 4c02 a564 6997
+5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 0000 0000 ffff ffff
+
+# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b
+[in,pcn1]
+4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103
+3081 880b 0014 0000 0000 0003
+0000 0003 c021 0c02 0012 577f 7c5b 4d53
+5241 5356 352e 3130
+
+# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2)
+[out,pcn1]
+4500 003e 69af 0000 ff2f ee8b c0a8 7103 c0a8 7101
+3081 880b 001a 4000 0000 0004
+0000 0003 ff03 c021 0702 0016 0c02 0012
+577f 7c5b 4d53 5241 5356 352e 3130
+
+# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b
+[in,pcn1]
+4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103
+3081 880b 001a 0000 0000 0004
+0000 0004 c021 0c03 0018 577f 7c5b 4d53
+5241 532d 302d 434c 4159 4d4f 4f52
+
+# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3)
+[out,pcn1]
+4500 0044 69b0 0000 ff2f ee84 c0a8 7103 c0a8 7101
+3081 880b 0020 4000 0000 0005
+0000 0004 ff03 c021 0703 001c 0c03 0018
+577f 7c5b 4d53 5241 532d 302d 434c 4159
+4d4f 4f52
+
+# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC
+[in,pcn1]
+4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103
+3081 880b 000c 0000 0000 0005
+0000 0005 80fd 0104 000a 1206 0100 0001
+
+# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1)
+[out,pcn1]
+4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101
+3081 880b 0006 4000 0000 0006
+0000 0005 80fd 0101 0004
+
+# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC
+[out,pcn1]
+4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101
+3001 880b 000c 4000 0000 0007
+80fd 0404 000a 1206 0100 0001
+
+# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[in,pcn1]
+4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103
+3081 880b 0024 0000 0000 0006
+0000 0007 8021 0105 0022 0306 0000 0000
+8106 0000 0000 8206 0000 0000 8306 0000
+0000 8406 0000 0000
+
+# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[out,pcn1]
+4500 0042 69b3 0000 ff2f ee83 c0a8 7103 c0a8 7101
+3081 880b 001e 4000 0000 0008
+0000 0006 8021 0405 001c 8106 0000 0000
+8206 0000 0000 8306 0000 0000 8406 0000
+0000
+
+# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp
+[in,pcn1]
+4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103
+3081 880b 000c 0000 0000 0007
+0000 0008 8021 0401 000a 0206 002d 0f01
+
+# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1
+[out,pcn1]
+4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101
+3081 880b 000c 4000 0000 0009
+0000 0007 8021 0102 000a 0306 c0a8 0001
+
+# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1)
+[in,pcn1]
+4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103
+3081 880b 0006 0000 0000 0008
+0000 0009 80fd 0201 0004
+
+# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6)
+[in,pcn1]
+4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103
+3001 880b 0012 0000 0000 0009
+80fd 0506 0010 577f 7c5b 003c cd74 0000
+02dc
+
+# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6)
+[out,pcn1]
+4500 002a 69b5 0000 ff2f ee99 c0a8 7103 c0a8 7101
+3081 880b 0006 4000 0000 000a
+0000 0009 80fd 0606 0004
+
diff --git a/contrib/netbsd-tests/ipf/input/ni14 b/contrib/netbsd-tests/ipf/input/ni14
new file mode 100644
index 000000000000..6bc127610f2b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni14
@@ -0,0 +1,235 @@
+# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF)
+[in,pcn1=192.168.113.3]
+4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103
+05e7 06bb abf0 4aa5 0000 0000
+7002 faf0 21a1 0000 0204 05b4 0101 0402
+
+# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF)
+[out,pcn1]
+4500 002c 69a6 4000 4006 207b 7f00 0001 c0a8 7101
+06bb 05e7 a564 68da abf0 4aa6
+6012 8000 55f3 0000 0204 05b4
+
+# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF)
+[in,pcn1]
+4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103
+05e7 06bb abf0 4aa6 a564 68db
+5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d
+0001 0000 0100 0000 0000 0001 0000 0001
+0000 0a28 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 4d69 6372 6f73 6f66 7420 5769
+6e64 6f77 7320 4e54 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF)
+[out,pcn1]
+4500 00c4 69a7 4000 4006 1fe2 7f00 0001 c0a8 7101
+06bb 05e7 a564 68db abf0 4b42
+5018 832c 817a 0000 009c 0001 1a2b 3c4d
+0002 0000 0100 0100 0000 0000 0000 0000
+0001 0001 6c6f 6361 6c00 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 6c69 6e75 7800 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF)
+[in,pcn1]
+4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103
+05e7 06bb abf0 4b42 a564 6977
+5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d
+0007 0000 4000 1331 0000 012c 05f5 e100
+0000 0003 0000 0003 0040 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+
+# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF)
+[out,pcn1]
+4500 0048 69a8 4000 4006 205d 7f00 0001 c0a8 7101
+06bb 05e7 a564 6977 abf0 4bea
+5018 832c e9a4 0000 0020 0001 1a2b 3c4d
+0008 0000 0000 4000 0100 0000 05f5 e100
+0040 0000 0000 0000
+
+# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF)
+[in,pcn1]
+4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103
+05e7 06bb abf0 4bea a564 6997
+5018 fa34 e810 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 ffff ffff ffff ffff
+
+# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP
+[in,pcn1]
+4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103
+3001 880b 0019 0000 0000 0000
+ff03 c021 0100 0015 0104 0578 0506 577f
+7c5b 0702 0802 0d03 06
+
+# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre]
+[out,pcn1]
+4500 0020 69a9 0000 ff2f a15a 7f00 0001 c0a8 7101
+2081 880b 0000 4000 ffff ffff
+
+# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF)
+[out,pcn1]
+4500 0028 69aa 4000 4006 207b 7f00 0001 c0a8 7101
+06bb 05e7 a564 6997 abf0 4c02
+5010 832c 686c 0000
+
+# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[out,pcn1]
+4500 0038 69ab 0000 ff2f a140 7f00 0001 c0a8 7101
+3001 880b 0018 4000 0000 0000
+ff03 c021 0101 0014 0206 0000 0000 0506
+22d9 0cfa 0702 0802
+
+# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP
+[out,pcn1]
+4500 002f 69ac 0000 ff2f a148 7f00 0001 c0a8 7101
+3081 880b 000b 4000 0000 0001
+0000 0000 ff03 c021 0400 0007 0d03 06
+
+# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[in,pcn1]
+4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103
+3081 880b 0018 0000 0000 0001
+0000 0001 ff03 c021 0201 0014 0206 0000
+0000 0506 22d9 0cfa 0702 0802
+
+# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[in,pcn1]
+4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103
+3001 880b 0016 0000 0000 0002
+ff03 c021 0101 0012 0104 0578 0506 577f
+7c5b 0702 0802
+
+# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[out,pcn1]
+4500 003a 69ad 0000 ff2f a13c 7f00 0001 c0a8 7101
+3081 880b 0016 4000 0000 0002
+0000 0002 ff03 c021 0201 0012 0104 0578
+0506 577f 7c5b 0702 0802
+
+# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp
+[out,pcn1]
+4500 0032 69ae 0000 ff2f a143 7f00 0001 c0a8 7101
+3001 880b 0012 4000 0000 0003
+8021 0101 0010 0306 c0a8 0001 0206 002d
+0f01
+
+# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF)
+[in,pcn1]
+4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103
+05e7 06bb abf0 4c02 a564 6997
+5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 0000 0000 ffff ffff
+
+# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b
+[in,pcn1]
+4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103
+3081 880b 0014 0000 0000 0003
+0000 0003 c021 0c02 0012 577f 7c5b 4d53
+5241 5356 352e 3130
+
+# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2)
+[out,pcn1]
+4500 003e 69af 0000 ff2f a136 7f00 0001 c0a8 7101
+3081 880b 001a 4000 0000 0004
+0000 0003 ff03 c021 0702 0016 0c02 0012
+577f 7c5b 4d53 5241 5356 352e 3130
+
+# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b
+[in,pcn1]
+4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103
+3081 880b 001a 0000 0000 0004
+0000 0004 c021 0c03 0018 577f 7c5b 4d53
+5241 532d 302d 434c 4159 4d4f 4f52
+
+# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3)
+[out,pcn1]
+4500 0044 69b0 0000 ff2f a12f 7f00 0001 c0a8 7101
+3081 880b 0020 4000 0000 0005
+0000 0004 ff03 c021 0703 001c 0c03 0018
+577f 7c5b 4d53 5241 532d 302d 434c 4159
+4d4f 4f52
+
+# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC
+[in,pcn1]
+4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103
+3081 880b 000c 0000 0000 0005
+0000 0005 80fd 0104 000a 1206 0100 0001
+
+# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1)
+[out,pcn1]
+4500 002a 69b1 0000 ff2f a148 7f00 0001 c0a8 7101
+3081 880b 0006 4000 0000 0006
+0000 0005 80fd 0101 0004
+
+# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC
+[out,pcn1]
+4500 002c 69b2 0000 ff2f a145 7f00 0001 c0a8 7101
+3001 880b 000c 4000 0000 0007
+80fd 0404 000a 1206 0100 0001
+
+# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[in,pcn1]
+4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103
+3081 880b 0024 0000 0000 0006
+0000 0007 8021 0105 0022 0306 0000 0000
+8106 0000 0000 8206 0000 0000 8306 0000
+0000 8406 0000 0000
+
+# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[out,pcn1]
+4500 0042 69b3 0000 ff2f a12e 7f00 0001 c0a8 7101
+3081 880b 001e 4000 0000 0008
+0000 0006 8021 0405 001c 8106 0000 0000
+8206 0000 0000 8306 0000 0000 8406 0000
+0000
+
+# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp
+[in,pcn1]
+4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103
+3081 880b 000c 0000 0000 0007
+0000 0008 8021 0401 000a 0206 002d 0f01
+
+# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1
+[out,pcn1]
+4500 0030 69b4 0000 ff2f a13f 7f00 0001 c0a8 7101
+3081 880b 000c 4000 0000 0009
+0000 0007 8021 0102 000a 0306 c0a8 0001
+
+# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1)
+[in,pcn1]
+4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103
+3081 880b 0006 0000 0000 0008
+0000 0009 80fd 0201 0004
+
+# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6)
+[in,pcn1]
+4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103
+3001 880b 0012 0000 0000 0009
+80fd 0506 0010 577f 7c5b 003c cd74 0000
+02dc
+
+# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6)
+[out,pcn1]
+4500 002a 69b5 0000 ff2f a144 7f00 0001 c0a8 7101
+3081 880b 0006 4000 0000 000a
+0000 0009 80fd 0606 0004
+
diff --git a/contrib/netbsd-tests/ipf/input/ni15 b/contrib/netbsd-tests/ipf/input/ni15
new file mode 100644
index 000000000000..7e7aabde1580
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni15
@@ -0,0 +1,235 @@
+# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF)
+[out,pcn1=192.168.113.3]
+4500 0030 5e11 4000 8006 3961 c0a8 7101
+c0a8 7103 05e7 06bb abf0 4aa5 0000 0000
+7002 faf0 21a1 0000 0204 05b4 0101 0402
+
+# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF)
+[in,pcn1]
+4500 002c 69a6 4000 4006 6dd0 c0a8 7103
+c0a8 7101 06bb 05e7 a564 68da abf0 4aa6
+6012 8000 a348 0000 0204 05b4
+
+# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF)
+[out,pcn1]
+4500 00c4 5e12 4000 8006 38cc c0a8 7101
+c0a8 7103 05e7 06bb abf0 4aa6 a564 68db
+5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d
+0001 0000 0100 0000 0000 0001 0000 0001
+0000 0a28 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 4d69 6372 6f73 6f66 7420 5769
+6e64 6f77 7320 4e54 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF)
+[in,pcn1]
+4500 00c4 69a7 4000 4006 6d37 c0a8 7103
+c0a8 7101 06bb 05e7 a564 68db abf0 4b42
+5018 832c cecf 0000 009c 0001 1a2b 3c4d
+0002 0000 0100 0100 0000 0000 0000 0000
+0001 0001 6c6f 6361 6c00 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 6c69 6e75 7800 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF)
+[out,pcn1]
+4500 00d0 5e13 4000 8006 38bf c0a8 7101
+c0a8 7103 05e7 06bb abf0 4b42 a564 6977
+5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d
+0007 0000 4000 1331 0000 012c 05f5 e100
+0000 0003 0000 0003 0040 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+
+# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF)
+[in,pcn1]
+4500 0048 69a8 4000 4006 6db2 c0a8 7103
+c0a8 7101 06bb 05e7 a564 6977 abf0 4bea
+5018 832c 36fa 0000 0020 0001 1a2b 3c4d
+0008 0000 0000 4000 0100 0000 05f5 e100
+0040 0000 0000 0000
+
+# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF)
+[out,pcn1]
+4500 0040 5e14 4000 8006 394e c0a8 7101
+c0a8 7103 05e7 06bb abf0 4bea a564 6997
+5018 fa34 e810 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 ffff ffff ffff ffff
+
+# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP
+[out,pcn1]
+4500 0039 5e15 0000 802f 792b c0a8 7101
+c0a8 7103 3001 880b 0019 0000 0000 0000
+ff03 c021 0100 0015 0104 0578 0506 577f
+7c5b 0702 0802 0d03 06
+
+# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre]
+[in,pcn1]
+4500 0020 69a9 0000 ff2f eeaf c0a8 7103
+c0a8 7101 2081 880b 0000 4000 ffff ffff
+
+# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF)
+[in,pcn1]
+4500 0028 69aa 4000 4006 6dd0 c0a8 7103
+c0a8 7101 06bb 05e7 a564 6997 abf0 4c02
+5010 832c b5c1 0000
+
+# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[in,pcn1]
+4500 0038 69ab 0000 ff2f ee95 c0a8 7103
+c0a8 7101 3001 880b 0018 4000 0000 0000
+ff03 c021 0101 0014 0206 0000 0000 0506
+22d9 0cfa 0702 0802
+
+# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP
+[in,pcn1]
+4500 002f 69ac 0000 ff2f ee9d c0a8 7103
+c0a8 7101 3081 880b 000b 4000 0000 0001
+0000 0000 ff03 c021 0400 0007 0d03 06
+
+# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[out,pcn1]
+4500 003c 5e16 0000 802f 7927 c0a8 7101
+c0a8 7103 3081 880b 0018 0000 0000 0001
+0000 0001 ff03 c021 0201 0014 0206 0000
+0000 0506 22d9 0cfa 0702 0802
+
+# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[out,pcn1]
+4500 0036 5e17 0000 802f 792c c0a8 7101
+c0a8 7103 3001 880b 0016 0000 0000 0002
+ff03 c021 0101 0012 0104 0578 0506 577f
+7c5b 0702 0802
+
+# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[in,pcn1]
+4500 003a 69ad 0000 ff2f ee91 c0a8 7103
+c0a8 7101 3081 880b 0016 4000 0000 0002
+0000 0002 ff03 c021 0201 0012 0104 0578
+0506 577f 7c5b 0702 0802
+
+# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp
+[in,pcn1]
+4500 0032 69ae 0000 ff2f ee98 c0a8 7103
+c0a8 7101 3001 880b 0012 4000 0000 0003
+8021 0101 0010 0306 c0a8 0001 0206 002d
+0f01
+
+# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF)
+[out,pcn1]
+4500 0040 5e18 4000 8006 394a c0a8 7101
+c0a8 7103 05e7 06bb abf0 4c02 a564 6997
+5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 0000 0000 ffff ffff
+
+# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b
+[out,pcn1]
+4500 0038 5e19 0000 802f 7928 c0a8 7101
+c0a8 7103 3081 880b 0014 0000 0000 0003
+0000 0003 c021 0c02 0012 577f 7c5b 4d53
+5241 5356 352e 3130
+
+# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2)
+[in,pcn1]
+4500 003e 69af 0000 ff2f ee8b c0a8 7103
+c0a8 7101 3081 880b 001a 4000 0000 0004
+0000 0003 ff03 c021 0702 0016 0c02 0012
+577f 7c5b 4d53 5241 5356 352e 3130
+
+# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b
+[out,pcn1]
+4500 003e 5e1a 0000 802f 7921 c0a8 7101
+c0a8 7103 3081 880b 001a 0000 0000 0004
+0000 0004 c021 0c03 0018 577f 7c5b 4d53
+5241 532d 302d 434c 4159 4d4f 4f52
+
+# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3)
+[in,pcn1]
+4500 0044 69b0 0000 ff2f ee84 c0a8 7103
+c0a8 7101 3081 880b 0020 4000 0000 0005
+0000 0004 ff03 c021 0703 001c 0c03 0018
+577f 7c5b 4d53 5241 532d 302d 434c 4159
+4d4f 4f52
+
+# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC
+[out,pcn1]
+4500 0030 5e1b 0000 802f 792e c0a8 7101
+c0a8 7103 3081 880b 000c 0000 0000 0005
+0000 0005 80fd 0104 000a 1206 0100 0001
+
+# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1)
+[in,pcn1]
+4500 002a 69b1 0000 ff2f ee9d c0a8 7103
+c0a8 7101 3081 880b 0006 4000 0000 0006
+0000 0005 80fd 0101 0004
+
+# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC
+[in,pcn1]
+4500 002c 69b2 0000 ff2f ee9a c0a8 7103
+c0a8 7101 3001 880b 000c 4000 0000 0007
+80fd 0404 000a 1206 0100 0001
+
+# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[out,pcn1]
+4500 0048 5e1c 0000 802f 7915 c0a8 7101
+c0a8 7103 3081 880b 0024 0000 0000 0006
+0000 0007 8021 0105 0022 0306 0000 0000
+8106 0000 0000 8206 0000 0000 8306 0000
+0000 8406 0000 0000
+
+# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[in,pcn1]
+4500 0042 69b3 0000 ff2f ee83 c0a8 7103
+c0a8 7101 3081 880b 001e 4000 0000 0008
+0000 0006 8021 0405 001c 8106 0000 0000
+8206 0000 0000 8306 0000 0000 8406 0000
+0000
+
+# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp
+[out,pcn1]
+4500 0030 5e1d 0000 802f 792c c0a8 7101
+c0a8 7103 3081 880b 000c 0000 0000 0007
+0000 0008 8021 0401 000a 0206 002d 0f01
+
+# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1
+[in,pcn1]
+4500 0030 69b4 0000 ff2f ee94 c0a8 7103
+c0a8 7101 3081 880b 000c 4000 0000 0009
+0000 0007 8021 0102 000a 0306 c0a8 0001
+
+# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1)
+[out,pcn1]
+4500 002a 5e1e 0000 802f 7931 c0a8 7101
+c0a8 7103 3081 880b 0006 0000 0000 0008
+0000 0009 80fd 0201 0004
+
+# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6)
+[out,pcn1]
+4500 0032 5e1f 0000 802f 7928 c0a8 7101
+c0a8 7103 3001 880b 0012 0000 0000 0009
+80fd 0506 0010 577f 7c5b 003c cd74 0000
+02dc
+
+# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6)
+[in,pcn1]
+4500 002a 69b5 0000 ff2f ee99 c0a8 7103
+c0a8 7101 3081 880b 0006 4000 0000 000a
+0000 0009 80fd 0606 0004
+
diff --git a/contrib/netbsd-tests/ipf/input/ni16 b/contrib/netbsd-tests/ipf/input/ni16
new file mode 100644
index 000000000000..362b98d09c47
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni16
@@ -0,0 +1,235 @@
+# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF)
+[out,pcn1=192.168.113.1]
+4500 0030 5e11 4000 8006 5f07 0a02 0202
+c0a8 7103 05e7 06bb abf0 4aa5 0000 0000
+7002 faf0 4747 0000 0204 05b4 0101 0402
+
+# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF)
+[in,pcn1]
+4500 002c 69a6 4000 4006 6dd0 c0a8 7103
+c0a8 7101 06bb 05e7 a564 68da abf0 4aa6
+6012 8000 a348 0000 0204 05b4
+
+# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF)
+[out,pcn1]
+4500 00c4 5e12 4000 8006 5e72 0a02 0202
+c0a8 7103 05e7 06bb abf0 4aa6 a564 68db
+5018 faf0 0847 0000 009c 0001 1a2b 3c4d
+0001 0000 0100 0000 0000 0001 0000 0001
+0000 0a28 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 4d69 6372 6f73 6f66 7420 5769
+6e64 6f77 7320 4e54 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF)
+[in,pcn1]
+4500 00c4 69a7 4000 4006 6d37 c0a8 7103
+c0a8 7101 06bb 05e7 a564 68db abf0 4b42
+5018 832c cecf 0000 009c 0001 1a2b 3c4d
+0002 0000 0100 0100 0000 0000 0000 0000
+0001 0001 6c6f 6361 6c00 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 6c69 6e75 7800 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF)
+[out,pcn1]
+4500 00d0 5e13 4000 8006 5e65 0a02 0202
+c0a8 7103 05e7 06bb abf0 4b42 a564 6977
+5018 fa54 d1ad 0000 00a8 0001 1a2b 3c4d
+0007 0000 4000 1331 0000 012c 05f5 e100
+0000 0003 0000 0003 0040 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+
+# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF)
+[in,pcn1]
+4500 0048 69a8 4000 4006 6db2 c0a8 7103
+c0a8 7101 06bb 05e7 a564 6977 abf0 4bea
+5018 832c 36fa 0000 0020 0001 1a2b 3c4d
+0008 0000 0000 4000 0100 0000 05f5 e100
+0040 0000 0000 0000
+
+# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF)
+[out,pcn1]
+4500 0040 5e14 4000 8006 5ef4 0a02 0202
+c0a8 7103 05e7 06bb abf0 4bea a564 6997
+5018 fa34 0db7 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 ffff ffff ffff ffff
+
+# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP
+[out,pcn1]
+4500 0039 5e15 0000 802f 9ed1 0a02 0202
+c0a8 7103 3001 880b 0019 0000 0000 0000
+ff03 c021 0100 0015 0104 0578 0506 577f
+7c5b 0702 0802 0d03 06
+
+# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre]
+[in,pcn1]
+4500 0020 69a9 0000 ff2f eeaf c0a8 7103
+c0a8 7101 2081 880b 0000 4000 ffff ffff
+
+# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF)
+[in,pcn1]
+4500 0028 69aa 4000 4006 6dd0 c0a8 7103
+c0a8 7101 06bb 05e7 a564 6997 abf0 4c02
+5010 832c b5c1 0000
+
+# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[in,pcn1]
+4500 0038 69ab 0000 ff2f ee95 c0a8 7103
+c0a8 7101 3001 880b 0018 4000 0000 0000
+ff03 c021 0101 0014 0206 0000 0000 0506
+22d9 0cfa 0702 0802
+
+# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP
+[in,pcn1]
+4500 002f 69ac 0000 ff2f ee9d c0a8 7103
+c0a8 7101 3081 880b 000b 4000 0000 0001
+0000 0000 ff03 c021 0400 0007 0d03 06
+
+# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC
+[out,pcn1]
+4500 003c 5e16 0000 802f 9ecd 0a02 0202
+c0a8 7103 3081 880b 0018 0000 0000 0001
+0000 0001 ff03 c021 0201 0014 0206 0000
+0000 0506 22d9 0cfa 0702 0802
+
+# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[out,pcn1]
+4500 0036 5e17 0000 802f 9ed2 0a02 0202
+c0a8 7103 3001 880b 0016 0000 0000 0002
+ff03 c021 0101 0012 0104 0578 0506 577f
+7c5b 0702 0802
+
+# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC
+[in,pcn1]
+4500 003a 69ad 0000 ff2f ee91 c0a8 7103
+c0a8 7101 3081 880b 0016 4000 0000 0002
+0000 0002 ff03 c021 0201 0012 0104 0578
+0506 577f 7c5b 0702 0802
+
+# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp
+[in,pcn1]
+4500 0032 69ae 0000 ff2f ee98 c0a8 7103
+c0a8 7101 3001 880b 0012 4000 0000 0003
+8021 0101 0010 0306 c0a8 0001 0206 002d
+0f01
+
+# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF)
+[out,pcn1]
+4500 0040 5e18 4000 8006 5ef0 0a02 0202
+c0a8 7103 05e7 06bb abf0 4c02 a564 6997
+5018 fa34 0d9f 0000 0018 0001 1a2b 3c4d
+000f 0000 0000 0000 0000 0000 ffff ffff
+
+# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b
+[out,pcn1]
+4500 0038 5e19 0000 802f 9ece 0a02 0202
+c0a8 7103 3081 880b 0014 0000 0000 0003
+0000 0003 c021 0c02 0012 577f 7c5b 4d53
+5241 5356 352e 3130
+
+# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2)
+[in,pcn1]
+4500 003e 69af 0000 ff2f ee8b c0a8 7103
+c0a8 7101 3081 880b 001a 4000 0000 0004
+0000 0003 ff03 c021 0702 0016 0c02 0012
+577f 7c5b 4d53 5241 5356 352e 3130
+
+# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b
+[out,pcn1]
+4500 003e 5e1a 0000 802f 9ec7 0a02 0202
+c0a8 7103 3081 880b 001a 0000 0000 0004
+0000 0004 c021 0c03 0018 577f 7c5b 4d53
+5241 532d 302d 434c 4159 4d4f 4f52
+
+# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3)
+[in,pcn1]
+4500 0044 69b0 0000 ff2f ee84 c0a8 7103
+c0a8 7101 3081 880b 0020 4000 0000 0005
+0000 0004 ff03 c021 0703 001c 0c03 0018
+577f 7c5b 4d53 5241 532d 302d 434c 4159
+4d4f 4f52
+
+# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC
+[out,pcn1]
+4500 0030 5e1b 0000 802f 9ed4 0a02 0202
+c0a8 7103 3081 880b 000c 0000 0000 0005
+0000 0005 80fd 0104 000a 1206 0100 0001
+
+# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1)
+[in,pcn1]
+4500 002a 69b1 0000 ff2f ee9d c0a8 7103
+c0a8 7101 3081 880b 0006 4000 0000 0006
+0000 0005 80fd 0101 0004
+
+# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC
+[in,pcn1]
+4500 002c 69b2 0000 ff2f ee9a c0a8 7103
+c0a8 7101 3001 880b 000c 4000 0000 0007
+80fd 0404 000a 1206 0100 0001
+
+# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[out,pcn1]
+4500 0048 5e1c 0000 802f 9ebb 0a02 0202
+c0a8 7103 3081 880b 0024 0000 0000 0006
+0000 0007 8021 0105 0022 0306 0000 0000
+8106 0000 0000 8206 0000 0000 8306 0000
+0000 8406 0000 0000
+
+# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0
+[in,pcn1]
+4500 0042 69b3 0000 ff2f ee83 c0a8 7103
+c0a8 7101 3081 880b 001e 4000 0000 0008
+0000 0006 8021 0405 001c 8106 0000 0000
+8206 0000 0000 8306 0000 0000 8406 0000
+0000
+
+# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp
+[out,pcn1]
+4500 0030 5e1d 0000 802f 9ed2 0a02 0202
+c0a8 7103 3081 880b 000c 0000 0000 0007
+0000 0008 8021 0401 000a 0206 002d 0f01
+
+# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1
+[in,pcn1]
+4500 0030 69b4 0000 ff2f ee94 c0a8 7103
+c0a8 7101 3081 880b 000c 4000 0000 0009
+0000 0007 8021 0102 000a 0306 c0a8 0001
+
+# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1)
+[out,pcn1]
+4500 002a 5e1e 0000 802f 9ed7 0a02 0202
+c0a8 7103 3081 880b 0006 0000 0000 0008
+0000 0009 80fd 0201 0004
+
+# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6)
+[out,pcn1]
+4500 0032 5e1f 0000 802f 9ece 0a02 0202
+c0a8 7103 3001 880b 0012 0000 0000 0009
+80fd 0506 0010 577f 7c5b 003c cd74 0000
+02dc
+
+# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6)
+[in,pcn1]
+4500 002a 69b5 0000 ff2f ee99 c0a8 7103
+c0a8 7101 3081 880b 0006 4000 0000 000a
+0000 0009 80fd 0606 0004
+
diff --git a/contrib/netbsd-tests/ipf/input/ni17 b/contrib/netbsd-tests/ipf/input/ni17
new file mode 100644
index 000000000000..f9dec945524d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni17
@@ -0,0 +1,6 @@
+in on le0 tcp 10.2.2.5,2000 203.1.1.1,80
+in on le0 tcp 10.2.2.6,2000 203.1.1.1,80
+in on le0 tcp 10.2.2.7,2000 203.1.1.1,80
+in on le0 tcp 10.2.2.7,2001 203.1.1.1,80
+in on le0 tcp 10.2.2.8,2000 203.1.1.1,80
+in on le0 tcp 10.2.2.9,2000 203.1.1.1,80
diff --git a/contrib/netbsd-tests/ipf/input/ni18 b/contrib/netbsd-tests/ipf/input/ni18
new file mode 100644
index 000000000000..4e06f7908442
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni18
@@ -0,0 +1,4 @@
+in on hme0 tcp 2.2.2.2,3000 192.168.1.2,80
+in on hme0 tcp 2.2.2.2,3000 192.168.1.1,80
+out on hme1 tcp 10.1.2.2,5050 4.5.6.7,80;
+out on hme1 tcp 10.1.1.2,5050 4.5.6.7,80;
diff --git a/contrib/netbsd-tests/ipf/input/ni19 b/contrib/netbsd-tests/ipf/input/ni19
new file mode 100644
index 000000000000..3ea706fcbcd2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni19
@@ -0,0 +1,157 @@
+# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0>
+[out,bge0]
+4500 0040 e3fc 4000 4006 1a0b c0a8 7103
+0a01 0104 03f1 0202 6523 90b2 0000 0000
+b002 8000 7d87 0000 0204 05b4 0103 0300
+0402 0101 0101 080a 0000 0000 0000 0000
+
+# 10.1.1.4.shell > 10.1.1.1.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2>
+[in,bge0]
+4500 0034 0000 4000 4006 24be 0a01 0104
+0a01 0101 0202 03f1 915a a5c4 6523 90b3
+8012 16d0 0f47 0000 0204 05b4 0101 0402
+0103 0302                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0028 e3fd 4000 4006 1a22 c0a8 7103
+0a01 0104 03f1 0202 6523 90b3 915a a5c5
+5010 832c bd0d 0000                    
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 002d e3fe 4000 4006 1a1c c0a8 7103
+0a01 0104 03f1 0202 6523 90b3 915a a5c5
+5018 832c 5b98 0000 3130 3038 00       
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0028 7ce5 4000 4006 a7e4 0a01 0104
+0a01 0101 0202 03f1 915a a5c5 6523 90b8
+5010 05b4 612b 0000
+
+# 10.1.1.4.1023 > 10.1.1.1.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2>
+[in,bge0]
+4500 003c 1186 4000 4006 1330 0a01 0104
+0a01 0101 03ff 03f0 91d4 c8a2 0000 0000
+a002 16d0 df6a 0000 0204 05b4 0402 080a
+0039 d924 0000 0000 0103 0302          
+
+# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop>
+[out,bge0]
+4500 0040 e3ff 4000 4006 1a08 c0a8 7103
+0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3
+b012 8000 1e85 0000 0204 05b4 0103 0300
+0101 080a 0000 0000 0039 d924 0402 0101
+
+# 10.1.1.4.1023 > 10.1.1.1.1008
+[in,bge0]
+4500 0034 1188 4000 4006 1336 0a01 0104
+0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811
+8010 05b4 0046 0000 0101 080a 0039 d925
+0000 0000                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0030 e400 4000 4006 1a17 c0a8 7103
+0a01 0104 03f1 0202 6523 90b8 915a a5c5
+5018 832c 0eb6 0000 6461 7272 656e 7200
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0028 7ce7 4000 4006 a7e2 0a01 0104
+0a01 0101 0202 03f1 915a a5c5 6523 90c0
+5010 05b4 6123 0000
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0053 e401 4000 4006 19f3 c0a8 7103
+0a01 0104 03f1 0202 6523 90c0 915a a5c5
+5018 832c a63d 0000 6461 7272 656e 7200
+7368 202d 6320 2265 6368 6f20 666f 6f20
+3e26 313b 2065 6368 6f20 6261 7220 3e26
+3222 00                                
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0028 7ce9 4000 4006 a7e0 0a01 0104
+0a01 0101 0202 03f1 915a a5c5 6523 90eb
+5010 05b4 60f8 0000
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0029 7ceb 4000 4006 a7dd 0a01 0104
+0a01 0101 0202 03f1 915a a5c5 6523 90eb
+5018 05b4 60ef 0000 00
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0028 e403 4000 4006 1a1c c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5c6
+5010 832c bcd4 0000                    
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 002c 7ced 4000 4006 a7d8 0a01 0104
+0a01 0101 0202 03f1 915a a5c6 6523 90eb
+5018 05b4 8b71 0000 666f 6f0a
+
+# 10.1.1.4.1023 > 10.1.1.1.1008
+[in,bge0]
+4500 0038 118a 4000 4006 1330 0a01 0104
+0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811
+8018 05b4 2787 0000 0101 080a 0039 dd6c
+0000 0000 6261 720a                    
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0028 7cef 4000 4006 a7da 0a01 0104
+0a01 0101 0202 03f1 915a a5ca 6523 90eb
+5011 05b4 60f2 0000
+
+# 10.1.1.4.1023 > 10.1.1.1.1008
+[in,bge0]
+4500 0034 118c 4000 4006 1332 0a01 0104
+0a01 0101 03ff 03f0 91d4 c8a7 66e5 b811
+8011 05b4 fbf8 0000 0101 080a 0039 dd6d
+0000 0000                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0028 e404 4000 4006 1a1b c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5cb
+5010 8328 bcd3 0000                    
+
+# 192.168.113.3.1008 > 10.1.1.4.1023
+[out,bge0]
+4500 0034 e405 4000 4006 1a0e c0a8 7103
+0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8
+8010 8328 57d7 0000 0101 080a 0000 0004
+0039 dd6c                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[out,bge0]
+4500 0028 e40a 4000 4006 1a15 c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5cb
+5011 832c bcce 0000                    
+
+# 192.168.113.3.1008 > 10.1.1.4.1023
+[out,bge0]
+4500 0034 e40b 4000 4006 1a08 c0a8 7103
+0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8
+8011 832c 57d2 0000 0101 080a 0000 0004
+0039 dd6c                              
+
+# 10.1.1.4.shell > 10.1.1.1.1009
+[in,bge0]
+4500 0028 0004 4000 4006 24c6 0a01 0104
+0a01 0101 0202 03f1 915a a5cb 6523 90ec
+5010 05b4 60f1 0000
+
+# 10.1.1.4.1023 > 10.1.1.1.1008
+[in,bge0]
+4500 0034 118e 4000 4006 1330 0a01 0104
+0a01 0101 03ff 03f0 91d4 c8a8 66e5 b812
+8010 05b4 fbf2 0000 0101 080a 0039 dd6e
+0000 0004                              
+
diff --git a/contrib/netbsd-tests/ipf/input/ni2 b/contrib/netbsd-tests/ipf/input/ni2
new file mode 100644
index 000000000000..6dcedb7f0ffe
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni2
@@ -0,0 +1,143 @@
+# Test of fragmentation required coming from the inside.
+[out,xl0]
+4510 002c bd0d 4000 3e06 b1d1 0a01 0201 c0a8 0133
+05f6 0077 a664 2485 0000 0000
+6002 4000 b8f2 0000 0204 05b4
+
+[in,xl0]
+4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201
+0077 05f6 fbdf 1a21 a664 2486
+6012 2238 c0a8 0000 0204 05b4
+
+[out,xl0]
+4510 0028 bd0e 4000 3e06 b1d4 0a01 0201 c0a8 0133
+05f6 0077 a664 2486 fbdf 1a22
+5010 4470 b62d 0000
+
+[in,xl0]
+4500 005b cf83 4000 7e06 5f3c c0a8 0133 0a01 0201
+0077 05f6 fbdf 1a22 a664 2486
+5018 2238 ce2a 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0a
+
+[out,xl0]
+4510 0028 bd18 4000 3e06 b1ca 0a01 0201 c0a8 0133
+05f6 0077 a664 2486 fbdf 1a55
+5010 4470 b5fa 0000
+
+[out,xl0]
+4510 002e bd1e 4000 3e06 b1be 0a01 0201 c0a8 0133
+05f6 0077 a664 2486 fbdf 1a55
+5018 4470 a8e2 0000 0000 0000 0d0a
+
+[in,xl0]
+4500 0048 e383 4000 7e06 4b4f c0a8 0133 0a01 0201
+0077 05f6 fbdf 1a55 a664 248c
+5018 2232 d80a 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000
+
+[in,xl0]
+4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201
+0077 05f6 fbdf 1a75 a664 248c
+5010 2232 9f2d 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3331 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 1111 2222 3333
+0000 0000 0000 0000 0000 0000 1111 2222
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 1111 2222 3333 0000 0000 0000 0000
+0000 0000 1111 2222 3333 0000 0000 0000
+0000 0000 0000 1111 2222 3333 0000 0000
+0000 0000 0000 0000 1111 2222 3333 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0000 0000 0000
+
+[out,xl0]
+4500 0038 d71d 4000 4001 7d22 c0a8 6401 c0a8 0133
+0304 da99 0000 05a0
+4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201
+0077 05f6 fbdf 1a75
+
diff --git a/contrib/netbsd-tests/ipf/input/ni20 b/contrib/netbsd-tests/ipf/input/ni20
new file mode 100644
index 000000000000..065ed27ba79a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni20
@@ -0,0 +1,157 @@
+# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0>
+[in,bge0]
+4500 0040 e3fc 4000 4006 1a0b c0a8 7103
+0a01 0104 03f1 0202 6523 90b2 0000 0000
+b002 8000 7d87 0000 0204 05b4 0103 0300
+0402 0101 0101 080a 0000 0000 0000 0000
+
+# 192.168.113.4.shell > 192.168.113.3.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2>
+[out,bge0]
+4500 0034 0000 4000 4006 d76b c0a8 7104
+c0a8 7103 0202 03f1 915a a5c4 6523 90b3
+8012 16d0 c1f4 0000 0204 05b4 0101 0402
+0103 0302                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[in,bge0]
+4500 0028 e3fd 4000 4006 1a22 c0a8 7103
+0a01 0104 03f1 0202 6523 90b3 915a a5c5
+5010 832c bd0d 0000                    
+
+# 192.168.113.3.1009 > 10.1.1.4.shell
+[in,bge0]
+4500 002d e3fe 4000 4006 1a1c c0a8 7103
+0a01 0104 03f1 0202 6523 90b3 915a a5c5
+5018 832c 5b98 0000 3130 3038 00       
+
+# 192.168.113.4.shell > 192.168.113.3.1009
+[out,bge0]
+4500 0028 7ce5 4000 4006 5a92 c0a8 7104
+c0a8 7103 0202 03f1 915a a5c5 6523 90b8
+5010 05b4 13d9 0000
+
+# 192.168.113.4.1023 > 192.168.113.3.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2>
+[out,bge0]
+4500 003c 1186 4000 4006 c5dd c0a8 7104
+c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000
+a002 16d0 9218 0000 0204 05b4 0402 080a
+0039 d924 0000 0000 0103 0302          
+
+# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop>
+[in,bge0]
+4500 0040 e3ff 4000 4006 1a08 c0a8 7103
+0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3
+b012 8000 1e85 0000 0204 05b4 0103 0300
+0101 080a 0000 0000 0039 d924 0402 0101
+
+# 192.168.113.4.1023 > 192.168.113.3.1008 ACK
+[out,bge0]
+4500 0034 1188 4000 4006 c5e3 c0a8 7104
+c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811
+8010 05b4 b2f3 0000 0101 080a 0039 d925
+0000 0000                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK
+[in,bge0]
+4500 0030 e400 4000 4006 1a17 c0a8 7103
+0a01 0104 03f1 0202 6523 90b8 915a a5c5
+5018 832c 0eb6 0000 6461 7272 656e 7200
+
+# 192.168.113.4.shell > 192.168.113.3.1009 ACK
+[out,bge0]
+4500 0028 7ce7 4000 4006 5a90 c0a8 7104
+c0a8 7103 0202 03f1 915a a5c5 6523 90c0
+5010 05b4 13d1 0000
+
+# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK
+[in,bge0]
+4500 0053 e401 4000 4006 19f3 c0a8 7103
+0a01 0104 03f1 0202 6523 90c0 915a a5c5
+5018 832c a63d 0000 6461 7272 656e 7200
+7368 202d 6320 2265 6368 6f20 666f 6f20
+3e26 313b 2065 6368 6f20 6261 7220 3e26
+3222 00                                
+
+# 192.168.113.4.shell > 192.168.113.3.1009 ACK
+[out,bge0]
+4500 0028 7ce9 4000 4006 5a8e c0a8 7104
+c0a8 7103 0202 03f1 915a a5c5 6523 90eb
+5010 05b4 13a6 0000
+
+# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK
+[out,bge0]
+4500 0029 7ceb 4000 4006 5a8b c0a8 7104
+c0a8 7103 0202 03f1 915a a5c5 6523 90eb
+5018 05b4 139d 0000 00
+
+# 192.168.113.3.1009 > 10.1.1.4.shell ACK
+[in,bge0]
+4500 0028 e403 4000 4006 1a1c c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5c6
+5010 832c bcd4 0000                    
+
+# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK
+[out,bge0]
+4500 002c 7ced 4000 4006 5a86 c0a8 7104
+c0a8 7103 0202 03f1 915a a5c6 6523 90eb
+5018 05b4 3e1f 0000 666f 6f0a
+
+# 192.168.113.4.1023 > 192.168.113.3.1008 PUSH+ACK
+[out,bge0]
+4500 0038 118a 4000 4006 c5dd c0a8 7104
+c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811
+8018 05b4 da34 0000 0101 080a 0039 dd6c
+0000 0000 6261 720a                    
+
+# 192.168.113.4.shell > 192.168.113.3.1009 FIN+ACK
+[out,bge0]
+4500 0028 7cef 4000 4006 5a88 c0a8 7104
+c0a8 7103 0202 03f1 915a a5ca 6523 90eb
+5011 05b4 13a0 0000
+
+# 192.168.113.4.1023 > 192.168.113.3.1008 FIN+ACK
+[out,bge0]
+4500 0034 118c 4000 4006 c5df c0a8 7104
+c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811
+8011 05b4 aea6 0000 0101 080a 0039 dd6d
+0000 0000                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell ACK
+[in,bge0]
+4500 0028 e404 4000 4006 1a1b c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5cb
+5010 8328 bcd3 0000                    
+
+# 192.168.113.3.1008 > 10.1.1.4.1023 ACK
+[in,bge0]
+4500 0034 e405 4000 4006 1a0e c0a8 7103
+0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8
+8010 8328 57d7 0000 0101 080a 0000 0004
+0039 dd6c                              
+
+# 192.168.113.3.1009 > 10.1.1.4.shell FIN+ACK
+[in,bge0]
+4500 0028 e40a 4000 4006 1a15 c0a8 7103
+0a01 0104 03f1 0202 6523 90eb 915a a5cb
+5011 832c bcce 0000                    
+
+# 192.168.113.3.1008 > 10.1.1.4.1023 FIN+ACK
+[in,bge0]
+4500 0034 e40b 4000 4006 1a08 c0a8 7103
+0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8
+8011 832c 57d2 0000 0101 080a 0000 0004
+0039 dd6c                              
+
+# 192.168.113.4.shell > 192.168.113.3.1009 ACK
+[out,bge0]
+4500 0028 0004 4000 4006 d773 c0a8 7104
+c0a8 7103 0202 03f1 915a a5cb 6523 90ec
+5010 05b4 139f 0000
+
+# 192.168.113.4.1023 > 192.168.113.3.1008 ACK
+[out,bge0]
+4500 0034 118e 4000 4006 c5dd c0a8 7104
+c0a8 7103 03ff 03f0 91d4 c8a8 66e5 b812
+8010 05b4 aea0 0000 0101 080a 0039 dd6e
+0000 0004                              
+
diff --git a/contrib/netbsd-tests/ipf/input/ni21 b/contrib/netbsd-tests/ipf/input/ni21
new file mode 100644
index 000000000000..daf741e59439
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni21
@@ -0,0 +1,3 @@
+out on lan0 2.2.2.2 3.3.3.3
+in on lan0 3.3.3.3 4.4.4.4
+out on lan0 2.2.2.2 3.3.3.3
diff --git a/contrib/netbsd-tests/ipf/input/ni23 b/contrib/netbsd-tests/ipf/input/ni23
new file mode 100644
index 000000000000..938b7b86cf2d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni23
@@ -0,0 +1,3 @@
+in on le0 udp 3.3.3.1,6700 1.1.2.3,4500
+in on hme0 udp 2.2.2.2,4500 4.4.4.4,6700
+out on bge0 udp 2.2.2.2,4500 3.3.3.1,6700
diff --git a/contrib/netbsd-tests/ipf/input/ni3 b/contrib/netbsd-tests/ipf/input/ni3
new file mode 100644
index 000000000000..e4d12fe1dee5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni3
@@ -0,0 +1,20 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+[out,df0]
+4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404
+5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[in,df0]
+4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606
+0303 acab 0000 0000
+4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404
+5000 0050 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[in,df0]
+4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606
+0303 113f 0000 0000
+4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404
+5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
diff --git a/contrib/netbsd-tests/ipf/input/ni4 b/contrib/netbsd-tests/ipf/input/ni4
new file mode 100644
index 000000000000..dac9f53b8e6a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni4
@@ -0,0 +1,18 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+[out,df0]
+4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404
+5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[in,df0]
+4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606
+0303 606b 0000 0000 4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 9c40 0050 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[in,df0]
+4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606
+0303 113f 0000 0000
+4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404
+9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
diff --git a/contrib/netbsd-tests/ipf/input/ni5 b/contrib/netbsd-tests/ipf/input/ni5
new file mode 100644
index 000000000000..4b32e49d0913
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni5
@@ -0,0 +1,363 @@
+# 32818,21 SYN
+[out,ppp0]
+4500 002c 10c9 4000 ff06 3289 c0a8 0103
+96cb e002 8032 0015 bd6b c9c8 0000 0000
+6002 2238 35f9 0000 0204 05b4
+
+# 21,32818 SYN+ACK
+[in,ppp0]
+4500 002c ffdd 4000 ef06 131e 96cb e002
+0101 0101 0015 8032 3786 76c4 bd6b c9c9
+6012 269c 4313 0000 0204 0584
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10ca 4000 ff06 328c c0a8 0103
+96cb e002 8032 0015 bd6b c9c9 3786 76c5
+5010 269c 9af6 0000
+
+# ACK+PUSH "[220-coombs.anu.edu.au NcFTPd Server (free educational license) ready.\r\n"
+[in,ppp0]
+4500 006f ffde 4000 ef06 12da 96cb e002
+0101 0101 0015 8032 3786 76c5 bd6b c9c9
+5018 269c 5628 0000 3232 302d 636f 6f6d
+6273 2e61 6e75 2e65 6475 2e61 7520 4e63
+4654 5064 2053 6572 7665 7220 2866 7265
+6520 6564 7563 6174 696f 6e61 6c20 6c69
+6365 6e73 6529 2072 6561 6479 2e0d 0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10cb 4000 ff06 328b c0a8 0103
+96cb e002 8032 0015 bd6b c9c9 3786 770c
+5010 269c 9aaf 0000
+
+# 21,32818 ACK+PUSH
+# "220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Computing Unit)\r\n
+# "220-Any problems contact ftpmaster@coombs.anu.edu.au\r\n"
+# "220-\r\n220 \r\n"
+[in,ppp0]
+4500 00c7 ffdf 4000 ef06 1281 96cb e002
+0101 0101 0015 8032 3786 770c bd6b c9c9
+5018 269c d030 0000 3232 302d 0d0a 3232
+302d 4d61 696e 7461 696e 6564 2062 7920
+5253 5353 2061 6e64 2052 5350 4153 2049
+5420 5374 6166 6620 2870 7265 7669 6f75
+736c 7920 6b6e 6f77 6e20 6173 2043 6f6f
+6d62 7320 436f 6d70 7574 696e 6720 556e
+6974 290d 0a32 3230 2d41 6e79 2070 726f
+626c 656d 7320 636f 6e74 6163 7420 6674
+706d 6173 7465 7240 636f 6f6d 6273 2e61
+6e75 2e65 6475 2e61 750d 0a32 3230 2d0d
+0a32 3230 200d 0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10cc 4000 ff06 328a c0a8 0103
+96cb e002 8032 0015 bd6b c9c9 3786 77ab
+5010 269c 9a10 0000
+
+# 32818,21 ACK+PUSH "USER anonymous\r\n"
+[out,ppp0]
+4500 0038 10cd 4000 ff06 3279 c0a8 0103
+96cb e002 8032 0015 bd6b c9c9 3786 77ab
+5018 269c 121c 0000 5553 4552 2061 6e6f
+6e79 6d6f 7573 0d0a
+
+# 21,32818 ACK
+[in,ppp0]
+4500 0028 ffe0 4000 ef06 131f 96cb e002
+0101 0101 0015 8032 3786 77ab bd6b c9d9
+5010 269c 59aa 0000
+
+# 21,32818 ACK+PUSH "331 Guest login ok, send your complete e-mail address as password.\r\n"
+[in,ppp0]
+4500 006c ffe1 4000 ef06 12da 96cb e002
+0101 0101 0015 8032 3786 77ab bd6b c9d9
+5018 269c 6fb9 0000 3333 3120 4775 6573
+7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64
+2079 6f75 7220 636f 6d70 6c65 7465 2065
+2d6d 6169 6c20 6164 6472 6573 7320 6173
+2070 6173 7377 6f72 642e 0d0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10ce 4000 ff06 3288 c0a8 0103
+96cb e002 8032 0015 bd6b c9d9 3786 77ef
+5010 269c 99bc 0000
+
+# 32818,21 ACK+PUSH "PASS avalon@\r\n"
+[out,ppp0]
+4500 0036 10cf 4000 ff06 3279 c0a8 0103
+96cb e002 8032 0015 bd6b c9d9 3786 77ef
+5018 269c 7795 0000 5041 5353 2061 7661
+6c6f 6e40 0d0a
+
+# 21,32818 ACK+PUSH
+# "230-You are user #4 of 50 simultaneous users allowed.\r\n"
+[in,ppp0]
+4500 005f ffe2 4000 ef06 12e6 96cb e002
+0101 0101 0015 8032 3786 77ef bd6b c9e7
+5018 269c 4908 0000 3233 302d 596f 7520
+6172 6520 7573 6572 2023 3420 6f66 2035
+3020 7369 6d75 6c74 616e 656f 7573 2075
+7365 7273 2061 6c6c 6f77 6564 2e0d 0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10d0 4000 ff06 3286 c0a8 0103
+96cb e002 8032 0015 bd6b c9e7 3786 7826
+5010 269c 9977 0000
+
+# 21,32818 ACK+PUSH
+# "230-\r\n230-\r\n"
+# "230-Hi.  We're cleaning up.  Any feedback most welcome. 10 Aug 00\r\n"
+# "230-\r\n230 Logged in anonymously.\r\n"
+[in,ppp0]
+4500 0099 ffe3 4000 ef06 12ab 96cb e002
+0101 0101 0015 8032 3786 7826 bd6b c9e7
+5018 269c 9343 0000 3233 302d 0d0a 3233
+302d 0d0a 3233 302d 4869 2e20 2057 6527
+7265 2063 6c65 616e 696e 6720 7570 2e20
+2041 6e79 2066 6565 6462 6163 6b20 6d6f
+7374 2077 656c 636f 6d65 2e20 3130 2041
+7567 2030 300d 0a32 3330 2d0d 0a32 3330
+204c 6f67 6765 6420 696e 2061 6e6f 6e79
+6d6f 7573 6c79 2e0d 0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10d1 4000 ff06 3285 c0a8 0103
+96cb e002 8032 0015 bd6b c9e7 3786 7897
+5010 269c 9906 0000
+
+# 32818,21 ACK "TYPE I\r\n"
+[out,ppp0]
+4500 0030 10d2 4000 ff06 327c c0a8 0103
+96cb e002 8032 0015 bd6b c9e7 3786 7897
+5018 269c c704 0000 5459 5045 2049 0d0a
+
+# 21,32818 "200 Type okay.\r\n"
+[in,ppp0]
+4500 0038 ffe4 4000 ef06 130b 96cb e002
+0101 0101 0015 8032 3786 7897 bd6b c9ef
+5018 269c 1f58 0000 3230 3020 5479 7065
+206f 6b61 792e 0d0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10d3 4000 ff06 3283 c0a8 0103
+96cb e002 8032 0015 bd6b c9ef 3786 78a7
+5010 269c 98ee 0000
+
+# 32818,21 ACK "PORT 192,158,1,3,128,51\r\n"
+[out,ppp0]
+4500 0041 10d4 4000 ff06 3269 c0a8 0103
+96cb e002 8032 0015 bd6b c9ef 3786 78a7
+5018 269c 1c4d 0000 504f 5254 2031 3932
+2c31 3638 2c31 2c33 2c31 3238 2c35 310d
+0a
+
+# 32818,21 ACK "200 PORT command successful.\r\n"
+[in,ppp0]
+4500 0046 ffe5 4000 ef06 12fc 96cb e002
+0101 0101 0015 8032 3786 78a7 bd6b ca08
+5018 269c 9b71 0000 3230 3020 504f 5254
+2063 6f6d 6d61 6e64 2073 7563 6365 7373
+6675 6c2e 0d0a
+
+# 32818,21 "TYPE A\r\n"
+[out,ppp0]
+4500 0030 10d5 4000 ff06 3279 c0a8 0103
+96cb e002 8032 0015 bd6b ca08 3786 78c5
+5018 269c c6bd 0000 5459 5045 2041 0d0a
+
+# 21,32818 "200 Type okay.\r\n"
+[in,ppp0]
+4500 0038 ffe6 4000 ef06 1309 96cb e002
+0101 0101 0015 8032 3786 78c5 bd6b ca10
+5018 269c 1f09 0000 3230 3020 5479 7065
+206f 6b61 792e 0d0a
+
+# 32818,21 "NLST\r\n"
+[out,ppp0]
+4500 002e 10d6 4000 ff06 327a c0a8 0103
+96cb e002 8032 0015 bd6b ca10 3786 78d5
+5018 269c e9e6 0000 4e4c 5354 0d0a
+
+# 20,32819 SYN
+[in,ppp0]
+4500 002c ffe7 4000 ef06 1314 96cb e002
+0101 0101 0014 8033 d9f8 11d4 0000 0000
+6002 2238 913a 0000 0204 0584
+
+# 32819,20 SYN+ACK
+[out,ppp0]
+4500 002c 10d7 4000 ff06 327b c0a8 0103
+96cb e002 8033 0014 bd78 5c12 d9f8 11d5
+6012 02f8 d734 0000 0204 0584
+
+# 20,32819 ACK
+[in,ppp0]
+4500 0028 ffe8 4000 ef06 1317 96cb e002
+0101 0101 0014 8033 d9f8 11d5 bd78 5c13
+5010 269c 8ac7 0000
+
+# 21,32818 ACK "150 Opening ASCII mode data connection for /bin/ls.\r\n"
+[in,ppp0]
+4500 005d ffe9 4000 ef06 12e1 96cb e002
+0101 0101 0015 8032 3786 78d5 bd6b ca16
+5018 269c ae7e 0000 3135 3020 4f70 656e
+696e 6720 4153 4349 4920 6d6f 6465 2064
+6174 6120 636f 6e6e 6563 7469 6f6e 2066
+6f72 202f 6269 6e2f 6c73 2e0d 0a
+
+# 32819,20 ACK
+[out,ppp0]
+4500 0028 10d8 4000 ff06 327e c0a8 0103
+96cb e002 8033 0014 bd78 5c13 d9f8 11d5
+5010 6348 8e71 0000
+
+# 32818,21 ACK+PUSH "PORT 192,158,1,3,128,52\r\n"
+[out,ppp0]
+4500 0041 10d9 4000 ff06 3264 c0a8 0103
+96cb e002 8032 0015 bd6b ca16 3786 78d5
+5018 269c 1af8 0000 504f 5254 2031 3932
+2c31 3638 2c31 2c33 2c31 3238 2c35 320d
+0a
+
+# 21,32818 ACK+PUSH "200 PORT command successful\r\n"
+[in,ppp0]
+4500 0046 ffea 4000 ef06 12f7 96cb e002
+0101 0101 0015 8032 3786 78d5 bd6b ca2f
+5018 269c 9b1c 0000 3230 3020 504f 5254
+2063 6f6d 6d61 6e64 2073 7563 6365 7373
+6675 6c2e 0d0a
+
+# 32818,21 ACK+PUSH "TYPE A\r\n"
+[out,ppp0]
+4500 0030 10da 4000 ff06 3274 c0a8 0103
+96cb e002 8032 0015 bd6b ca2f 3786 78f3
+5018 269c c668 0000 5459 5045 2041 0d0a
+
+# 21,32818 "200 Type okay.\r\n"
+[in,ppp0]
+4500 0038 ffeb 4000 ef06 1304 96cb e002
+0101 0101 0015 8032 3786 78f3 bd6b ca37
+5018 269c 1ea4 0000 3230 3020 5479 7065
+206f 6b61 793e 0d0a
+
+# 32818,21 ACK+PUSH "NLST\r\n"
+[out,ppp0]
+4500 002e 10db 4000 ff06 3275 c0a8 0103
+96cb e002 8032 0015 bd6b ca37 3786 7903
+5018 269c e991 0000 4e4c 5354 0d0a
+
+# 20,32820 2nd connection SYN
+[in,ppp0]
+4500 002c ffec 4000 ef06 130f 96cb e002
+0101 0101 0014 8034 d9f8 11d4 0000 0000
+6002 2238 9139 0000 0204 0584
+
+# 32820,20 SYN+ACK
+[out,ppp0]
+4500 002c 10d7 4000 ff06 327b c0a8 0103
+96cb e002 8034 0014 bd78 5c12 d9f8 11d5
+6012 02f8 d733 0000 0204 0584
+
+# 20,32820 ACK
+[in,ppp0]
+4500 0028 ffec 4000 ef06 1313 96cb e002
+0101 0101 0014 8034 d9f8 11d4 0000 0000
+5010 2238 a8b7 0000
+
+# 20,32819 ACK+PUSH
+[in,ppp0]
+4500 0063 ffed 4000 ef06 12d7 96cb e002
+0101 0101 0014 8033 d9f8 11d5 bd78 5c13
+5018 269c 62bf 0000 636f 6f6d 6273 7061
+7065 7273 0d0a 6465 7074 730d 0a66 6f75
+6e64 2d66 696c 6573 0d0a 696e 636f 6d69
+6e67 0d0a 6e6c 632d 7465 7374 0d0a 7075
+620d 0a
+
+# 32819,20 ACK
+[out,ppp0]
+4500 0028 10dc 4000 ff06 327a c0a8 0103
+96cb e002 8033 0014 bd78 5c13 d9f8 1210
+5010 6348 8e36 0000
+
+# 20,32819 FIN+ACK
+[in,ppp0]
+4500 0028 ffee 4000 ef06 1311 96cb e002
+0101 0101 0014 8033 d9f8 1210 bd78 5c13
+5011 269c 8a8b 0000
+
+# 32819,20 ACK
+[out,ppp0]
+4500 0028 10dd 4000 ff06 3279 c0a8 0103
+96cb e002 8033 0014 bd78 5c13 d9f8 1211
+5010 6348 8e35 0000
+
+# 32819,20 FIN+ACK
+[out,ppp0]
+4500 0028 10dd 4000 ff06 3279 c0a8 0103
+96cb e002 8033 0014 bd78 5c13 d9f8 1211
+5011 6348 8e34 0000
+
+# 20,32819 ACK
+[in,ppp0]
+4500 0028 ffef 4000 ef06 1310 96cb e002
+0101 0101 0014 8033 d9f8 1211 bd78 5c14
+5010 269c 8a8a 0000
+
+# 21,32818 220 "226 Listing completed.\r\n"
+[in,ppp0]
+4500 0040 fff0 4000 ef06 12f7 96cb e002
+0101 0101 0015 8032 3786 7903 bd6b ca37
+5018 269c 3c32 0000 3232 3620 4c69 7374
+696e 6720 636f 6d70 6c65 7465 642e 0d0a
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10e0 4000 ff06 3276 c0a8 0103
+96cb e002 8032 0015 bd6b ca37 3786 791b
+5010 269c 9832 0000
+
+# 32818,21 "QUIT\r\n"
+[out,ppp0]
+4500 002e 10e1 4000 ff06 326f c0a8 0103
+96cb e002 8032 0015 bd6b ca37 3786 791b
+5018 269c f070 0000 5155 4954 0d0a
+
+# 21,32818 "221 Goodbye."
+[in,ppp0]
+4500 0036 fff2 4000 ef06 12ff 96cb e002
+0101 0101 0015 8032 3786 791b bd6b ca3d
+5018 269c 68e8 0000 3232 3120 476f 6f64
+6279 652e 0d0a
+
+# 32818,21 ACK+FIN
+[out,ppp0]
+4500 0028 10e2 4000 ff06 3274 c0a8 0103
+96cb e002 8032 0015 bd6b ca3d 3786 7929
+5011 269c 981d 0000
+
+# 21,32818 ACK+FIN
+[in,ppp0]
+4500 0028 fff3 4000 ef06 130c 96cb e002
+0101 0101 0015 8032 3786 7929 bd6b ca3d
+5011 269c 57c7 0000
+
+# 32818,21 ACK
+[out,ppp0]
+4500 0028 10e3 4000 ff06 3273 c0a8 0103
+96cb e002 8032 0015 bd6b ca3d 3786 792a
+5010 269c 981d 0000
+
+# 21,32818 ACK
+[in,ppp0]
+4500 0028 fff4 4000 ef06 130b 96cb e002
+0101 0101 0015 8032 3786 792a bd6b ca3e
+5010 269c 57c6 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/ni6 b/contrib/netbsd-tests/ipf/input/ni6
new file mode 100644
index 000000000000..70e80c0ce1d7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni6
@@ -0,0 +1,54 @@
+[in,nf0]
+4500 0054 cd8a 4000 ff11 20ba c0a8 0601
+c0a8 0602 8075 006f 0040 d36d 3e1d d249
+0000 0000 0000 0002 0001 86a0 0000 0002
+0000 0003 0000 0000 0000 0000 0000 0000
+0000 0000 0001 86a3 0000 0003 0000 0011
+0000 0000
+
+[out,qfe0]
+4500 0054 cd8a 4000 ff11 1fbb c0a8 0601
+c0a8 0701 8075 006f 0040 d26e 3e1d d249
+0000 0000 0000 0002 0001 86a0 0000 0002
+0000 0003 0000 0000 0000 0000 0000 0000
+0000 0000 0001 86a3 0000 0003 0000 0011
+0000 0000 
+
+[in,qfe0]
+4500 0038 cd83 4000 ff11 1edd c0a8 0701
+c0a8 0702 006f 8075 0024 d704 3e1d d249
+0000 0001 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0801
+
+[out,nf0]
+4500 0038 cd83 4000 ff11 1fde c0a8 0701
+c0a8 0601 006f 8075 0024 d805 3e1d d249
+0000 0001 0000 0000 0000 0000 0000 0000
+0000 0000 0000 0801 
+
+[in,nf0]
+4500 0044 d5a6 4000 ff11 18ae c0a8 0601
+c0a8 0602 80df 0801 0030 04f0 3e10 1fb1
+0000 0000 0000 0002 0001 86a3 0000 0002
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000
+
+[out,qfe0]
+4500 0044 d5a6 4000 ff11 17af c0a8 0601
+c0a8 0701 80df 0801 0030 03f1 3e10 1fb1
+0000 0000 0000 0002 0001 86a3 0000 0002
+0000 0000 0000 0000 0000 0000 0000 0000
+0000 0000 
+
+[in,qfe0]
+4500 0034 0000 4000 fe11 ed64 c0a8 0701
+c0a8 0702 0801 80df 0020 89b7 3e10 1fb1
+0000 0001 0000 0000 0000 0000 0000 0000
+0000 0000
+
+[out,nf0]
+4500 0034 0000 4000 fe11 ee65 c0a8 0701
+c0a8 0601 0801 80df 0020 0000 3e10 1fb1
+0000 0001 0000 0000 0000 0000 0000 0000
+0000 0000
+
diff --git a/contrib/netbsd-tests/ipf/input/ni7 b/contrib/netbsd-tests/ipf/input/ni7
new file mode 100644
index 000000000000..8d07937c1266
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni7
@@ -0,0 +1,13 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP timeout exceeded in reply to a ICMP packet coming in.
+[in,df0]
+4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202
+afc9 829e 0014 6b10 0402 0000
+3be5 468d 000a cfc3
+
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0b00 0125 0000 0000
+4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606
+afc9 829e 0014 c15e
+
diff --git a/contrib/netbsd-tests/ipf/input/ni8 b/contrib/netbsd-tests/ipf/input/ni8
new file mode 100644
index 000000000000..72205ee9a79e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni8
@@ -0,0 +1,27 @@
+#v tos len id   off  ttl p sum  src       dst
+[in,df0]
+4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202
+5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404
+0303 0735 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000
+0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going in)
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102
+5000 9d58 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/ni9 b/contrib/netbsd-tests/ipf/input/ni9
new file mode 100644
index 000000000000..b8f45991f08d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/ni9
@@ -0,0 +1,27 @@
+#v tos len id   off  ttl p sum  src       dst
+# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet
+# going out)
+[in,df0]
+4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202
+5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 
+
+[out,df0]
+4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001
+
+# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits)
+[out,df0]
+4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404
+0303 0735 0000 0000
+4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101
+5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000
+0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300
+
+[out,df0]
+4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505
+0303 0fa3 0000 0000
+4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102
+5000 9d58 0000 0001
+
diff --git a/contrib/netbsd-tests/ipf/input/p1 b/contrib/netbsd-tests/ipf/input/p1
new file mode 100644
index 000000000000..f6753fac4264
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p1
@@ -0,0 +1,8 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
+in 2.3.0.1 1.2.1.1
+in 2.2.2.1 1.2.1.1
+in 2.2.0.1 1.2.1.1
+out 4.4.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p10 b/contrib/netbsd-tests/ipf/input/p10
new file mode 100644
index 000000000000..f8162e807b04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p10
@@ -0,0 +1,10 @@
+in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80
diff --git a/contrib/netbsd-tests/ipf/input/p11 b/contrib/netbsd-tests/ipf/input/p11
new file mode 100644
index 000000000000..f8162e807b04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p11
@@ -0,0 +1,10 @@
+in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80
diff --git a/contrib/netbsd-tests/ipf/input/p12 b/contrib/netbsd-tests/ipf/input/p12
new file mode 100644
index 000000000000..f8162e807b04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p12
@@ -0,0 +1,10 @@
+in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80
diff --git a/contrib/netbsd-tests/ipf/input/p13 b/contrib/netbsd-tests/ipf/input/p13
new file mode 100644
index 000000000000..f6753fac4264
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p13
@@ -0,0 +1,8 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
+in 2.3.0.1 1.2.1.1
+in 2.2.2.1 1.2.1.1
+in 2.2.0.1 1.2.1.1
+out 4.4.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p2 b/contrib/netbsd-tests/ipf/input/p2
new file mode 100644
index 000000000000..f6753fac4264
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p2
@@ -0,0 +1,8 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
+in 2.3.0.1 1.2.1.1
+in 2.2.2.1 1.2.1.1
+in 2.2.0.1 1.2.1.1
+out 4.4.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p3 b/contrib/netbsd-tests/ipf/input/p3
new file mode 100644
index 000000000000..4a6666b7ec3a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p3
@@ -0,0 +1,12 @@
+in 1.1.1.1 1.2.1.1
+in 1.2.1.1 1.1.1.1
+out 1.1.1.1 1.2.1.1
+out 1.2.1.1 1.1.1.1
+in 2.2.2.2 2.1.2.1
+out 2.1.2.1 2.2.2.2
+in 3.3.1.1 3.1.3.1
+out 3.1.3.1 3.3.1.1
+in 4.4.1.1 4.1.4.1
+out 4.1.4.1 4.4.1.1
+in 5.5.1.1 5.1.5.1
+out 5.1.5.1 5.5.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p4 b/contrib/netbsd-tests/ipf/input/p4
new file mode 100644
index 000000000000..46c0998cb4ed
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p4
@@ -0,0 +1,12 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
+in 2.3.0.1 1.2.1.1
+in 2.2.2.1 1.2.1.1
+in 2.2.0.1 1.2.1.1
+out 2.2.2.1 1.2.1.1
+out 2.2.2.1 1.2.1.2
+out 2.2.0.1 1.2.1.1
+out 2.2.0.1 1.2.1.3
+out 4.4.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p5 b/contrib/netbsd-tests/ipf/input/p5
new file mode 100644
index 000000000000..f6753fac4264
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p5
@@ -0,0 +1,8 @@
+in 127.0.0.1 127.0.0.1
+in 1.1.1.1 1.2.1.1
+out 127.0.0.1 127.0.0.1
+out 1.1.1.1 1.2.1.1
+in 2.3.0.1 1.2.1.1
+in 2.2.2.1 1.2.1.1
+in 2.2.0.1 1.2.1.1
+out 4.4.1.1 1.2.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p6 b/contrib/netbsd-tests/ipf/input/p6
new file mode 100644
index 000000000000..37c26ce3442f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p6
@@ -0,0 +1,2 @@
+in  131.107.1.1 10.1.1.1
+out 10.1.1.1  131.107.1.1
diff --git a/contrib/netbsd-tests/ipf/input/p7 b/contrib/netbsd-tests/ipf/input/p7
new file mode 100644
index 000000000000..f8162e807b04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p7
@@ -0,0 +1,10 @@
+in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80
diff --git a/contrib/netbsd-tests/ipf/input/p9 b/contrib/netbsd-tests/ipf/input/p9
new file mode 100644
index 000000000000..f8162e807b04
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/input/p9
@@ -0,0 +1,10 @@
+in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80
+in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80
diff --git a/contrib/netbsd-tests/ipf/regress/bpf-f1 b/contrib/netbsd-tests/ipf/regress/bpf-f1
new file mode 100644
index 000000000000..2c8028311a7e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/bpf-f1
@@ -0,0 +1,4 @@
+pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
diff --git a/contrib/netbsd-tests/ipf/regress/bpf1 b/contrib/netbsd-tests/ipf/regress/bpf1
new file mode 100644
index 000000000000..5d83b77ed3ce
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/bpf1
@@ -0,0 +1,4 @@
+pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "src host 1.1.1.1" }
+pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" }
+pass out bpf-v4 { "dst host 1.1.1.1" }
diff --git a/contrib/netbsd-tests/ipf/regress/f1 b/contrib/netbsd-tests/ipf/regress/f1
new file mode 100644
index 000000000000..6a2ede9e31c0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f1
@@ -0,0 +1,4 @@
+block in all
+pass in all
+block out all
+pass out all
diff --git a/contrib/netbsd-tests/ipf/regress/f10 b/contrib/netbsd-tests/ipf/regress/f10
new file mode 100644
index 000000000000..355298308e72
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f10
@@ -0,0 +1,18 @@
+block in from any to any with not ipopts
+pass in from any to any with not opt sec-class topsecret
+block in from any to any with not opt ssrr,sec-class topsecret
+pass in from any to any with not opt ssrr,sec-class topsecret
+block in from any to any with not opt ts,sec-class topsecret
+pass in from any to any with not opt ts,sec-class topsecret
+block in from any to any with not opt sec-class secret
+pass in from any to any with not opt sec-class secret
+block in from any to any with not opt lsrr,ssrr
+pass in from any to any with not opt lsrr,ssrr
+pass in from any to any with not ipopts
+block in from any to any with not opt lsrr
+pass in from any to any with not opt lsrr
+block in from any to any with not opt ssrr,ts
+pass in from any to any with not opt ssrr,ts
+block in from any to any with not opt rr
+pass in from any to any with not opt rr
+block in from any to any with not opt sec-class topsecret
diff --git a/contrib/netbsd-tests/ipf/regress/f11 b/contrib/netbsd-tests/ipf/regress/f11
new file mode 100644
index 000000000000..a71e528c2215
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f11
@@ -0,0 +1,7 @@
+pass in proto tcp from any to any port = 23 flags S/SA keep state
+block in proto tcp from any to any port = 23 flags S/SA keep state
+pass in proto udp from any to any port = 53 keep frags
+block in proto udp from any to any port = 53 keep frags
+pass in proto udp from any to any port = 53 keep state
+block in proto udp from any to any port = 53 keep state
+pass in on e0 proto tcp from any to any port = 25 keep state
diff --git a/contrib/netbsd-tests/ipf/regress/f12 b/contrib/netbsd-tests/ipf/regress/f12
new file mode 100644
index 000000000000..c29f839aa502
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f12
@@ -0,0 +1,6 @@
+pass in proto tcp from any port > 1024 to any port = 25 with not short
+pass in proto tcp from any port > 1024 to any port = 25
+block in proto tcp from any to any with short
+block in proto tcp from any to any with frag
+pass in proto udp from any port = 53 to any port = 53
+block in proto udp from any port = 53 to any port = 53 with not short
diff --git a/contrib/netbsd-tests/ipf/regress/f13 b/contrib/netbsd-tests/ipf/regress/f13
new file mode 100644
index 000000000000..393a65e9eff0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f13
@@ -0,0 +1,9 @@
+pass in proto tcp from any to any port = 25 flags S/SA keep frags
+block in proto tcp from any to any port = 25 flags S/SA keep frags
+pass in proto udp from any to any port = 53 keep frags
+block in proto udp from any to any port = 53 keep frags
+pass in proto tcp from any to any port = 25 flags S/SA keep state keep frags
+block in proto tcp from any to any port = 25 flags S/SA keep state keep frags
+pass in proto udp from any to any port = 53 keep frags(strict)
+pass in proto tcp from any to any port = 25 keep state(strict)
+pass in proto tcp from any to any port = 25 keep state(loose)
diff --git a/contrib/netbsd-tests/ipf/regress/f14 b/contrib/netbsd-tests/ipf/regress/f14
new file mode 100644
index 000000000000..06ab51995ea2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f14
@@ -0,0 +1,8 @@
+block in from !1.1.1.1 to any
+pass in from 1.1.1.1 to !any
+block in from 1.1.1.0/24 to !any
+pass in from !1.1.1.0/24 to any
+block in from !1.1.0.0/16 to any
+pass in from 1.1.0.0/16 to !1.2.0.0/16
+block in from any to !127.0.0.0/8
+pass in from !any to any
diff --git a/contrib/netbsd-tests/ipf/regress/f15 b/contrib/netbsd-tests/ipf/regress/f15
new file mode 100644
index 000000000000..16185e1f3685
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f15
@@ -0,0 +1,8 @@
+block in log quick on hme0 from any to 195.134.65.0/25 head 10
+block return-rst in log quick proto tcp all flags S head 100 group 10
+pass in quick proto tcp from any to any port = 22 keep state group 100
+pass in quick proto tcp from any to any port = 23 keep state group 100
+pass in quick proto tcp from any to any port = 21 keep state group 100
+block return-icmp in quick proto udp all keep state head 110 group 10
+pass in quick proto udp from any to any port = 53 keep state group 110
+block in log quick on hme0 from any to any
diff --git a/contrib/netbsd-tests/ipf/regress/f16 b/contrib/netbsd-tests/ipf/regress/f16
new file mode 100644
index 000000000000..920ad8c958d2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f16
@@ -0,0 +1,10 @@
+pass in all
+skip 2 in proto tcp all
+block in quick proto tcp all
+skip 4 in proto udp all
+block in quick proto udp all
+pass in quick proto tcp from any to 1.1.1.1
+pass in quick proto tcp from any to 1.1.1.2 port = 22
+block in quick proto udp from any to any port = 53
+pass in quick proto udp from any to any port = 53
+block in all
diff --git a/contrib/netbsd-tests/ipf/regress/f17 b/contrib/netbsd-tests/ipf/regress/f17
new file mode 100644
index 000000000000..9a75ae3c1b54
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f17
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass out quick on ppp0 proto tcp all flags S keep state
+block return-rst in quick proto tcp all
diff --git a/contrib/netbsd-tests/ipf/regress/f18 b/contrib/netbsd-tests/ipf/regress/f18
new file mode 100644
index 000000000000..acba2b33a813
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f18
@@ -0,0 +1,4 @@
+pass in from 1.1.1.1 to any
+pass out from 2.2.2.2 to any
+count in from 1.1.1.1 to 3.3.3.3
+count out from 2.2.2.2 to 4.4.4.4
diff --git a/contrib/netbsd-tests/ipf/regress/f19 b/contrib/netbsd-tests/ipf/regress/f19
new file mode 100644
index 000000000000..d7770b8a43e8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f19
@@ -0,0 +1,2 @@
+pass in quick proto tcp all flags S keep state
+pass in quick proto tcp all flags S keep state(limit 1)
diff --git a/contrib/netbsd-tests/ipf/regress/f2 b/contrib/netbsd-tests/ipf/regress/f2
new file mode 100644
index 000000000000..e2f02a46e283
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f2
@@ -0,0 +1,6 @@
+block in proto tcp from any to any
+pass in proto tcp from any to any
+block in proto udp from any to any
+pass in proto udp from any to any
+block in proto icmp from any to any
+pass in proto icmp from any to any
diff --git a/contrib/netbsd-tests/ipf/regress/f20 b/contrib/netbsd-tests/ipf/regress/f20
new file mode 100644
index 000000000000..279523e4a9f5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f20
@@ -0,0 +1,4 @@
+block out quick on de0 head 100
+skip 1 out group 100
+block out quick group 100
+pass out quick group 100
diff --git a/contrib/netbsd-tests/ipf/regress/f21 b/contrib/netbsd-tests/ipf/regress/f21
new file mode 100644
index 000000000000..26ffa87f2386
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f21
@@ -0,0 +1,2 @@
+pass out proto tcp all flags S keep state(icmp-head icmpredir)
+block in proto icmp all icmp-type redir group icmpredir
diff --git a/contrib/netbsd-tests/ipf/regress/f22 b/contrib/netbsd-tests/ipf/regress/f22
new file mode 100644
index 000000000000..10765db18f06
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f22
@@ -0,0 +1,2 @@
+pass in proto tcp all flags S keep state(icmp-head icmpredir)
+block out proto icmp all icmp-type redir group icmpredir
diff --git a/contrib/netbsd-tests/ipf/regress/f24 b/contrib/netbsd-tests/ipf/regress/f24
new file mode 100644
index 000000000000..5cb3bab6b8a1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f24
@@ -0,0 +1 @@
+pass out quick proto udp all keep state keep frags
diff --git a/contrib/netbsd-tests/ipf/regress/f25 b/contrib/netbsd-tests/ipf/regress/f25
new file mode 100644
index 000000000000..c018b498dd3a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f25
@@ -0,0 +1 @@
+pass in on hme0 proto udp all with mcast keep state
diff --git a/contrib/netbsd-tests/ipf/regress/f26 b/contrib/netbsd-tests/ipf/regress/f26
new file mode 100644
index 000000000000..22357a475cae
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f26
@@ -0,0 +1,6 @@
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3)
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32)
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16)
+pass in quick proto tcp all flags S keep state(max-srcs 3)
+pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32)
+pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16)
diff --git a/contrib/netbsd-tests/ipf/regress/f27 b/contrib/netbsd-tests/ipf/regress/f27
new file mode 100644
index 000000000000..22357a475cae
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f27
@@ -0,0 +1,6 @@
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3)
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32)
+pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16)
+pass in quick proto tcp all flags S keep state(max-srcs 3)
+pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32)
+pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16)
diff --git a/contrib/netbsd-tests/ipf/regress/f28.ipf b/contrib/netbsd-tests/ipf/regress/f28.ipf
new file mode 100644
index 000000000000..ca427715ac10
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f28.ipf
@@ -0,0 +1,2 @@
+block in all
+pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any
diff --git a/contrib/netbsd-tests/ipf/regress/f28.pool b/contrib/netbsd-tests/ipf/regress/f28.pool
new file mode 100644
index 000000000000..499b60344662
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f28.pool
@@ -0,0 +1,2 @@
+pool ipf/dstlist (name spread; policy round-robin;)
+	{ nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; };
diff --git a/contrib/netbsd-tests/ipf/regress/f29.ipf b/contrib/netbsd-tests/ipf/regress/f29.ipf
new file mode 100644
index 000000000000..e4634cc1fa4d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f29.ipf
@@ -0,0 +1,2 @@
+block in all
+pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any keep state
diff --git a/contrib/netbsd-tests/ipf/regress/f29.pool b/contrib/netbsd-tests/ipf/regress/f29.pool
new file mode 100644
index 000000000000..499b60344662
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f29.pool
@@ -0,0 +1,2 @@
+pool ipf/dstlist (name spread; policy round-robin;)
+	{ nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; };
diff --git a/contrib/netbsd-tests/ipf/regress/f3 b/contrib/netbsd-tests/ipf/regress/f3
new file mode 100644
index 000000000000..ee80729cfc9b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f3
@@ -0,0 +1,8 @@
+block in from 1.1.1.1 to any
+pass in from 1.1.1.1 to any
+block in from 1.1.1.1/24 to any
+pass in from 1.1.1.1/24 to any
+block in from 1.1.1.1/16 to any
+pass in from 1.1.1.1/16 to any
+block in from 1.1.1.1/0 to any
+pass in from 1.1.1.1/0 to any
diff --git a/contrib/netbsd-tests/ipf/regress/f30 b/contrib/netbsd-tests/ipf/regress/f30
new file mode 100644
index 000000000000..84a8970eb860
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f30
@@ -0,0 +1,4 @@
+pass in on hme0 proto udp all with not ipopts keep state
+pass in on hme0 proto udp all with ipopts keep state
+pass in on hme0 proto tcp all flags S with opt rr keep state
+pass in on hme0 proto tcp all flags S with opt sec-class secret keep state
diff --git a/contrib/netbsd-tests/ipf/regress/f4 b/contrib/netbsd-tests/ipf/regress/f4
new file mode 100644
index 000000000000..bc8af2f0cae2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f4
@@ -0,0 +1,8 @@
+block in from any to 1.1.1.1
+pass in from any to 1.1.1.1
+block in from any to 1.1.1.1/24
+pass in from any to 1.1.1.1/24
+block in from any to 1.1.1.1/16
+pass in from any to 1.1.1.1/16
+block in from any to 1.1.1.1/0
+pass in from any to 1.1.1.1/0
diff --git a/contrib/netbsd-tests/ipf/regress/f5 b/contrib/netbsd-tests/ipf/regress/f5
new file mode 100644
index 000000000000..998eabd4b10b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f5
@@ -0,0 +1,48 @@
+block in proto tcp from any port = 23 to any
+block in proto udp from any port = 23 to any
+block in proto tcp/udp from any port = 23 to any
+pass in proto tcp from any port <= 1023 to any
+pass in proto udp from any port <= 1023 to any
+pass in proto tcp/udp from any port <= 1023 to any
+block in proto tcp from any port >= 1024 to any
+block in proto udp from any port >= 1024 to any
+block in proto tcp/udp from any port >= 1024 to any
+pass in proto tcp from any port >= 1024 to any
+pass in proto udp from any port >= 1024 to any
+pass in proto tcp/udp from any port >= 1024 to any
+block in proto tcp from any port 0 >< 512 to any
+block in proto udp from any port 0 >< 512 to any
+block in proto tcp/udp from any port 0 >< 512 to any
+pass in proto tcp from any port 0 >< 512 to any
+pass in proto udp from any port 0 >< 512 to any
+pass in proto tcp/udp from any port 0 >< 512 to any
+block in proto tcp from any port 6000 <> 6009 to any
+block in proto udp from any port 6000 <> 6009 to any
+block in proto tcp/udp from any port 6000 <> 6009 to any
+pass in proto tcp from any port 6000 <> 6009 to any
+pass in proto udp from any port 6000 <> 6009 to any
+pass in proto tcp/udp from any port 6000 <> 6009 to any
+pass in proto tcp from any port = 23 to any
+pass in proto udp from any port = 23 to any
+pass in proto tcp/udp from any port = 23 to any
+block in proto tcp from any port != 21 to any
+block in proto udp from any port != 21 to any
+block in proto tcp/udp from any port != 21 to any
+pass in proto tcp from any port != 21 to any
+pass in proto udp from any port != 21 to any
+pass in proto tcp/udp from any port != 21 to any
+block in proto tcp from any port < 1024 to any
+block in proto udp from any port < 1024 to any
+block in proto tcp/udp from any port < 1024 to any
+pass in proto tcp from any port < 1024 to any
+pass in proto udp from any port < 1024 to any
+pass in proto tcp/udp from any port < 1024 to any
+block in proto tcp from any port > 1023 to any
+block in proto udp from any port > 1023 to any
+block in proto tcp/udp from any port > 1023 to any
+pass in proto tcp from any port > 1023 to any
+pass in proto udp from any port > 1023 to any
+pass in proto tcp/udp from any port > 1023 to any
+block in proto tcp from any port <= 1023 to any
+block in proto udp from any port <= 1023 to any
+block in proto tcp/udp from any port <= 1023 to any
diff --git a/contrib/netbsd-tests/ipf/regress/f6 b/contrib/netbsd-tests/ipf/regress/f6
new file mode 100644
index 000000000000..291f09adcdbc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f6
@@ -0,0 +1,48 @@
+block in proto tcp from any to any port = 23
+block in proto udp from any to any port = 23
+block in proto tcp/udp from any to any port = 23
+pass in proto tcp from any to any port <= 1023
+pass in proto udp from any to any port <= 1023
+pass in proto tcp/udp from any to any port <= 1023
+block in proto tcp from any to any port >= 1024
+block in proto udp from any to any port >= 1024
+block in proto tcp/udp from any to any port >= 1024
+pass in proto tcp from any to any port >= 1024
+pass in proto udp from any to any port >= 1024
+pass in proto tcp/udp from any to any port >= 1024
+block in proto tcp from any to any port 0 >< 512
+block in proto udp from any to any port 0 >< 512
+block in proto tcp/udp from any to any port 0 >< 512
+pass in proto tcp from any to any port 0 >< 512
+pass in proto udp from any to any port 0 >< 512
+pass in proto tcp/udp from any to any port 0 >< 512
+block in proto tcp from any to any port 6000 <> 6009
+block in proto udp from any to any port 6000 <> 6009
+block in proto tcp/udp from any to any port 6000 <> 6009
+pass in proto tcp from any to any port 6000 <> 6009
+pass in proto udp from any to any port 6000 <> 6009
+pass in proto tcp/udp from any to any port 6000 <> 6009
+pass in proto tcp from any to any port = 23
+pass in proto udp from any to any port = 23
+pass in proto tcp/udp from any to any port = 23
+block in proto tcp from any to any port != 21
+block in proto udp from any to any port != 21
+block in proto tcp/udp from any to any port != 21
+pass in proto tcp from any to any port != 21
+pass in proto udp from any to any port != 21
+pass in proto tcp/udp from any to any port != 21
+block in proto tcp from any to any port < 1024
+block in proto udp from any to any port < 1024
+block in proto tcp/udp from any to any port < 1024
+pass in proto tcp from any to any port < 1024
+pass in proto udp from any to any port < 1024
+pass in proto tcp/udp from any to any port < 1024
+block in proto tcp from any to any port > 1023
+block in proto udp from any to any port > 1023
+block in proto tcp/udp from any to any port > 1023
+pass in proto tcp from any to any port > 1023
+pass in proto udp from any to any port > 1023
+pass in proto tcp/udp from any to any port > 1023
+block in proto tcp from any to any port <= 1023
+block in proto udp from any to any port <= 1023
+block in proto tcp/udp from any to any port <= 1023
diff --git a/contrib/netbsd-tests/ipf/regress/f7 b/contrib/netbsd-tests/ipf/regress/f7
new file mode 100644
index 000000000000..be1b969c8ec2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f7
@@ -0,0 +1,9 @@
+block in proto icmp from any to any icmp-type echo
+pass in proto icmp from any to any icmp-type echo
+block in proto icmp from any to any icmp-type unreach code 3
+pass in proto icmp from any to any icmp-type unreach code 3
+block in proto icmp from any to any icmp-type echorep
+pass in proto icmp from any to any icmp-type echorep
+pass in proto icmp all icmp-type maskreq keep state
+pass in proto icmp all icmp-type timest keep state
+pass in proto icmp all icmp-type inforeq keep state
diff --git a/contrib/netbsd-tests/ipf/regress/f8 b/contrib/netbsd-tests/ipf/regress/f8
new file mode 100644
index 000000000000..0f28fd261148
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f8
@@ -0,0 +1,6 @@
+block in proto tcp from any to any flags S
+pass in proto tcp from any to any flags S
+block in proto tcp from any to any flags S/SA
+pass in proto tcp from any to any flags S/SA
+block in proto tcp from any to any flags S/APU
+pass in proto tcp from any to any flags S/APU
diff --git a/contrib/netbsd-tests/ipf/regress/f9 b/contrib/netbsd-tests/ipf/regress/f9
new file mode 100644
index 000000000000..17bc96737877
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/f9
@@ -0,0 +1,18 @@
+block in from any to any with ipopts
+pass in from any to any with opt sec-class topsecret
+block in from any to any with opt ssrr,sec-class topsecret
+pass in from any to any with opt ssrr,sec-class topsecret
+block in from any to any with opt ts,sec-class topsecret
+pass in from any to any with opt ts,sec-class topsecret
+block in from any to any with opt sec-class secret
+pass in from any to any with opt sec-class secret
+block in from any to any with opt lsrr,ssrr
+pass in from any to any with opt lsrr,ssrr
+pass in from any to any with ipopts
+block in from any to any with opt lsrr
+pass in from any to any with opt lsrr
+block in from any to any with opt ssrr,ts
+pass in from any to any with opt ssrr,ts
+block in from any to any with opt rr
+pass in from any to any with opt rr
+block in from any to any with opt sec-class topsecret
diff --git a/contrib/netbsd-tests/ipf/regress/i1 b/contrib/netbsd-tests/ipf/regress/i1
new file mode 100644
index 000000000000..0fd2c6e0c39a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i1
@@ -0,0 +1,18 @@
+pass in all
+block out \
+all
+log in all
+log body in all
+count in from any to any
+pass in from !any to any pps 10
+block in from any to !any
+pass in on ed0 from localhost to localhost
+pass in on ed0,vx0 from localhost to localhost
+block in log first on lo0 from any to any
+pass in log body or-block quick from any to any
+block return-rst in quick on le0 proto tcp from any to any
+block return-icmp in on qe0 from any to any
+block return-icmp(1) in on qe0 from any to any
+block return-icmp-as-dest in on le0 from any to any
+block return-icmp-as-dest(port-unr) in on qe0 from any to any
+pass out on longNICname0 from test.host.dots to test\.host.dots
diff --git a/contrib/netbsd-tests/ipf/regress/i10 b/contrib/netbsd-tests/ipf/regress/i10
new file mode 100644
index 000000000000..640ac84ad2af
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i10
@@ -0,0 +1,5 @@
+pass in from localhost to localhost with opt sec
+pass in from localhost to localhost with opt lsrr not opt sec
+block in from any to any with not opt sec-class topsecret
+block in from any to any with not opt sec-class topsecret,secret
+pass in from any to any with opt sec-class topsecret,confid not opt sec-class unclass
diff --git a/contrib/netbsd-tests/ipf/regress/i11 b/contrib/netbsd-tests/ipf/regress/i11
new file mode 100644
index 000000000000..ca65da313b0b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i11
@@ -0,0 +1,12 @@
+pass in on ed0 proto tcp from localhost to localhost port = telnet keep state
+block in log first on lo0 proto tcp/udp from any to any port = echo keep state
+pass in proto udp from localhost to localhost port = 20499 keep frag
+pass in proto udp from localhost to localhost port = 2049 keep frag(strict)
+pass in proto udp from localhost to localhost port = 53 keep state keep frags
+pass in on ed0 out-via vx0 proto udp from any to any keep state
+pass out on ppp0 in-via le0 proto tcp from any to any keep state
+pass in on ed0,vx0 out-via vx0,ed0 proto udp from any to any keep state
+pass in proto tcp from any port gt 1024 to localhost port eq 1024 keep state
+pass in proto tcp all flags S keep state(strict,newisn,no-icmp-err,limit 101,age 600)
+pass in proto tcp all flags S keep state(loose,newisn,no-icmp-err,limit 101,age 600)
+pass in proto udp all keep state(age 10/20,sync)
diff --git a/contrib/netbsd-tests/ipf/regress/i12 b/contrib/netbsd-tests/ipf/regress/i12
new file mode 100644
index 000000000000..f42c2d522b5d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i12
@@ -0,0 +1,10 @@
+pass in from 1.1.1.1/32 to 2.2.2.2/32
+pass in from {2.2.2.2/24,3.3.3.3/32} to 4.4.4.4/32
+pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32}
+pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {22,25}
+pass in proto tcp from {2.2.2.2/24,3.3.3.3/32} port = {53,9} to {5.5.5.5/32,6.6.6.6/32}
+pass in proto udp from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {53,9}
+pass in from 10.10.10.10 to 11.11.11.11
+pass in from pool/101 to hash/202
+pass in from hash/303 to pool/404
+pass in from pool=(!1.1.1.1,2.2.2.2,!2.2.0.0/16) to pool = ( 1.1.0.0/16 )
diff --git a/contrib/netbsd-tests/ipf/regress/i13 b/contrib/netbsd-tests/ipf/regress/i13
new file mode 100644
index 000000000000..3ba343d1669b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i13
@@ -0,0 +1,8 @@
+a=any;
+b="from $a";
+c='to $a';
+d=block;
+e="pass in";
+$d in $b $c
+f=" $b $c";
+$e${f}
diff --git a/contrib/netbsd-tests/ipf/regress/i14 b/contrib/netbsd-tests/ipf/regress/i14
new file mode 100644
index 000000000000..6788af676089
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i14
@@ -0,0 +1,15 @@
+block in on eri0 all head 1
+pass in on eri0 proto icmp all group 1
+pass out on ed0 all head 1000000
+block out on ed0 proto udp all group 1000000
+block in on vm0 proto tcp/udp all head 101
+pass in from 1.1.1.1 to 2.2.2.2 group 101
+pass in proto tcp from 1.0.0.1 to 2.0.0.2 group 101
+pass in proto udp from 2.0.0.2 to 3.0.0.3 group 101
+block in on vm0 proto tcp/udp all head vm0-group
+pass in from 1.1.1.1 to 2.2.2.2 group vm0-group
+block in on vm0 proto tcp/udp all head vm0-group
+pass in from 1.1.1.1 to 2.2.2.2 group vm0-group
+pass in from 8f:: to f8::
+block in inet6 proto udp
+block in inet6
diff --git a/contrib/netbsd-tests/ipf/regress/i15 b/contrib/netbsd-tests/ipf/regress/i15
new file mode 100644
index 000000000000..0e6b0d12cd59
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i15
@@ -0,0 +1,4 @@
+pass out on fxp0 all set-tag(log=100)
+pass out on fxp0 all set-tag(nat=foo)
+pass out on fxp0 all set-tag(log=100, nat=200)
+pass out on fxp0 all set-tag(log=2147483648, nat=overtherainbowisapotof)
diff --git a/contrib/netbsd-tests/ipf/regress/i16 b/contrib/netbsd-tests/ipf/regress/i16
new file mode 100644
index 000000000000..5c9144a99257
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i16
@@ -0,0 +1,3 @@
+0 block out all
+100 pass in all
+10101 pass out proto tcp all
diff --git a/contrib/netbsd-tests/ipf/regress/i17 b/contrib/netbsd-tests/ipf/regress/i17
new file mode 100644
index 000000000000..139b86a8d84a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i17
@@ -0,0 +1,13 @@
+100 pass in all
+200 pass in proto tcp all
+110 pass in proto udp all
+110 pass in from localhost to any
+pass in all
+pass in from localhost to any
+@0 100 pass in from localhost to any
+@1 pass in from any to localhost
+@0 pass in from 1.1.1.1 to any
+@1 110 pass in from 2.2.2.2 to any
+@2 pass in from 3.3.3.3 to any
+call srcgrpmap/100 out from 10.1.0.0/16 to any
+call now dstgrpmap/200 in from 10.2.0.0/16 to any
diff --git a/contrib/netbsd-tests/ipf/regress/i18 b/contrib/netbsd-tests/ipf/regress/i18
new file mode 100644
index 000000000000..b55b11a01fe8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i18
@@ -0,0 +1,3 @@
+pass in tos {80,0x80} all
+pass out tos {0x80,80} all
+block in ttl {0,1,2,3,4,5,6} all
diff --git a/contrib/netbsd-tests/ipf/regress/i19 b/contrib/netbsd-tests/ipf/regress/i19
new file mode 100644
index 000000000000..a09fd56c5104
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i19
@@ -0,0 +1,22 @@
+block in quick log level user.debug proto icmp all
+block in quick log level mail.info proto icmp all
+block in quick log level daemon.notice proto icmp all
+block in quick log level auth.warn proto icmp all
+block in quick log level syslog.err proto icmp all
+block in quick log level lpr.crit proto icmp all
+block in quick log level news.alert proto icmp all
+block in quick log level uucp.emerg proto icmp all
+block in quick log level cron.debug proto icmp all
+block in quick log level ftp.info proto icmp all
+block in quick log level authpriv.notice proto icmp all
+block in quick log level logalert.warn proto icmp all
+block in quick log level local0.err proto icmp all
+block in quick log level local1.crit proto icmp all
+block in quick log level local2.alert proto icmp all
+block in quick log level local3.emerg proto icmp all
+block in quick log level local4.debug proto icmp all
+block in quick log level local5.info proto icmp all
+block in quick log level local6.notice proto icmp all
+block in quick log level local7.warn proto icmp all
+block in quick log level kern.err proto icmp all
+block in quick log level security.emerg proto icmp all
diff --git a/contrib/netbsd-tests/ipf/regress/i2 b/contrib/netbsd-tests/ipf/regress/i2
new file mode 100644
index 000000000000..f69e28edb13d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i2
@@ -0,0 +1,9 @@
+log in proto tcp all
+pass in proto 6 from any to any
+pass in proto udp from localhost to localhost
+block in proto ipv6 from any to any
+block in proto 17 from any to any
+block in proto 250 from any to any
+pass in proto tcp/udp from any to any
+block in proto tcp-udp from any to any
+block in proto tcp-udp from any to any
diff --git a/contrib/netbsd-tests/ipf/regress/i20 b/contrib/netbsd-tests/ipf/regress/i20
new file mode 100644
index 000000000000..99039eeaf04c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i20
@@ -0,0 +1,4 @@
+pass in on ppp0 from ppp0/peer to ppp0/32
+block in on hme0 from any to hme0/broadcast
+pass in on bge0 from bge0/network to bge0/32
+block in on eri0 from any to eri0/netmasked
diff --git a/contrib/netbsd-tests/ipf/regress/i21 b/contrib/netbsd-tests/ipf/regress/i21
new file mode 100644
index 000000000000..237f8fadb648
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i21
@@ -0,0 +1,7 @@
+pass in from port = 10101
+pass out from any to port != 22
+block in from port 20:21
+block out from any to port 10 <> 100
+pass out from any to port = {3,5,7,9}
+block in from port = {20,25}
+pass in from any port = {11:12, 21:22} to any port = {1:2, 4:5, 8:9}
diff --git a/contrib/netbsd-tests/ipf/regress/i22 b/contrib/netbsd-tests/ipf/regress/i22
new file mode 100644
index 000000000000..1ac8d12ba35f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i22
@@ -0,0 +1,5 @@
+pass in exp { "ip.src != 1.1.1.0/24; tcp.dport = 80;" }
+pass in exp { "ip.addr = 1.2.3.4,5.6.7.8;" }
+block out exp { "ip.dst= 127.0.0.0/8;" }
+block in exp { "udp.sport=53;udp.dport=53;" }
+pass out exp { "tcp.sport=22; tcp.port=25;" }
diff --git a/contrib/netbsd-tests/ipf/regress/i23 b/contrib/netbsd-tests/ipf/regress/i23
new file mode 100644
index 000000000000..792d6005489e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i23
@@ -0,0 +1 @@
+#
diff --git a/contrib/netbsd-tests/ipf/regress/i3 b/contrib/netbsd-tests/ipf/regress/i3
new file mode 100644
index 000000000000..390fc3c60e42
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i3
@@ -0,0 +1,14 @@
+log in all
+pass in from 128.16/16 to 129.10.10/24
+pass in from 128.0.0.1/24 to 1\
+28\
+.\
+0.0.1/16
+pass in from 128.0.0.1/0xffffff00 to 128.0.0.1/0xffff0000
+pass in from 128.0.0.1/255.255.255.0 to 128.0.0.1/255.255.0.0
+pass in from 128.0.0.1 mask 0xffffff00 to 128.0.0.1 mask 0xffff0000
+pass in from 128.0.0.1 mask 255.255.255.0 to 128.0.0.1 mask 255.255.0.0
+pass in from localhost to localhost
+block in log from 0/0 to 0/0
+block in log level auth.info on hme0 all
+log level local5.warn out all
diff --git a/contrib/netbsd-tests/ipf/regress/i4 b/contrib/netbsd-tests/ipf/regress/i4
new file mode 100644
index 000000000000..8551f7644915
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i4
@@ -0,0 +1,9 @@
+log in proto tcp from any port > 0 to any
+log in proto tcp from any to any port > 0
+pass in proto 6 from any port != 0 to any port 0 >< 65535
+pass in proto 17 from localhost port > 32000 to localhost port < 29000
+block in proto udp from any port != \ntp to any port < echo
+block in proto tcp from any port = smtp to any port > 25
+pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3
+pass in proto tcp/udp from any port 2:2 to any port 10:20
+pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/i5 b/contrib/netbsd-tests/ipf/regress/i5
new file mode 100644
index 000000000000..788f971ae18f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i5
@@ -0,0 +1,9 @@
+log in all
+count in tos 0x80 from any to any
+pass in on ed0 tos 64 from localhost to localhost
+block in log on lo0 ttl 0 from any to any
+pass in quick ttl 1 from any to any
+skip 3 out from 127.0.0.1 to any
+auth out on foo0 proto tcp from any to any port = 80
+preauth out on foo0 proto tcp from any to any port = 22
+nomatch out on foo0 proto tcp from any port < 1024 to any
diff --git a/contrib/netbsd-tests/ipf/regress/i6 b/contrib/netbsd-tests/ipf/regress/i6
new file mode 100644
index 000000000000..0b371bd3e761
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i6
@@ -0,0 +1,12 @@
+pass in on lo0 fastroute from any to any
+pass in on lo0 to qe0 from localhost to localhost
+pass in on le0 to qe0:127.0.0.1 from localhost to localhost
+pass in on lo0 dup-to qe0 from localhost to localhost
+pass in on le0 dup-to qe0:127.0.0.1 from localhost to localhost
+pass in on le0 to hme0:10.1.1.1 dup-to qe0:127.0.0.1 from localhost to localhost
+block in quick on qe0 to qe1 from any to any
+block in quick to qe1 from any to any
+pass out quick dup-to hme0 from any to any
+pass out quick on hme0 reply-to hme1 from any to any
+pass in on le0 dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 all
+pass in quick fastroute all
diff --git a/contrib/netbsd-tests/ipf/regress/i7 b/contrib/netbsd-tests/ipf/regress/i7
new file mode 100644
index 000000000000..15b88a56dc51
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i7
@@ -0,0 +1,14 @@
+pass in on ed0 proto tcp from localhost to localhost port = 23 flags S/SA
+block in on lo0 proto tcp from any to any flags A
+pass in on lo0 proto tcp from any to any flags /SAP
+block in on lo0 proto tcp from any to any flags 0x80/A
+pass in on lo0 proto tcp from any to any flags S/18
+block in on lo0 proto tcp from any to any flags 2/18
+pass in on lo0 proto tcp from any to any flags 2
+block in on lo0 proto tcp from any to any flags /16
+pass in on lo0 proto tcp from any to any flags 2/SA
+pass in on lo0 proto tcp from any to any flags S/18
+block in on lo0 proto tcp from any to any flags 2/18
+pass in on lo0 proto tcp from any to any flags 2
+block in on lo0 proto tcp from any to any flags /16
+pass in on lo0 proto tcp from any to any flags 2/SA
diff --git a/contrib/netbsd-tests/ipf/regress/i8 b/contrib/netbsd-tests/ipf/regress/i8
new file mode 100644
index 000000000000..abf69d9d30bd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i8
@@ -0,0 +1,62 @@
+pass in proto icmp from localhost to localhost icmp-type timest
+block in proto icmp from any to any icmp-type unreach code 1
+pass in proto icmp all icmp-type unreach code cutoff-preced
+pass in proto icmp all icmp-type unreach code filter-prohib
+pass in proto icmp all icmp-type unreach code isolate
+pass in proto icmp all icmp-type unreach code needfrag
+pass in proto icmp all icmp-type unreach code net-prohib
+pass in proto icmp all icmp-type unreach code net-tos
+pass in proto icmp all icmp-type unreach code host-preced
+pass in proto icmp all icmp-type unreach code host-prohib
+pass in proto icmp all icmp-type unreach code host-tos
+pass in proto icmp all icmp-type unreach code host-unk
+pass in proto icmp all icmp-type unreach code host-unr
+pass in proto icmp all icmp-type unreach code {net-unk,net-unr}
+pass in proto icmp all icmp-type unreach code port-unr
+pass in proto icmp all icmp-type unreach code proto-unr
+pass in proto icmp all icmp-type unreach code srcfail
+pass in proto icmp all icmp-type {echo,echorep}
+pass in proto icmp all icmp-type inforeq
+pass in proto icmp all icmp-type inforep
+pass in proto icmp all icmp-type maskrep
+pass in proto icmp all icmp-type maskreq
+pass in proto icmp all icmp-type paramprob
+pass in proto icmp all icmp-type redir
+pass in proto icmp all icmp-type unreach
+pass in proto icmp all icmp-type routerad
+pass in proto icmp all icmp-type routersol
+pass in proto icmp all icmp-type squench
+pass in proto icmp all icmp-type timest
+pass in proto icmp all icmp-type timestrep
+pass in proto icmp all icmp-type timex
+pass in proto icmp all icmp-type 254
+pass in proto icmp all icmp-type 253 code 254
+pass in proto icmp all icmp-type unreach code cutoff-preced
+pass in proto icmp all icmp-type unreach code filter-prohib
+pass in proto icmp all icmp-type unreach code isolate
+pass in proto icmp all icmp-type unreach code needfrag
+pass in proto icmp all icmp-type unreach code net-prohib
+pass in proto icmp all icmp-type unreach code net-tos
+pass in proto icmp all icmp-type unreach code host-preced
+pass in proto icmp all icmp-type unreach code host-prohib
+pass in proto icmp all icmp-type unreach code host-tos
+pass in proto icmp all icmp-type unreach code host-unk
+pass in proto icmp all icmp-type unreach code host-unr
+pass in proto icmp all icmp-type unreach code {net-unk,net-unr}
+pass in proto icmp all icmp-type unreach code port-unr
+pass in proto icmp all icmp-type unreach code proto-unr
+pass in proto icmp all icmp-type unreach code srcfail
+pass in proto icmp all icmp-type {echo,echorep}
+pass in proto icmp all icmp-type inforeq
+pass in proto icmp all icmp-type inforep
+pass in proto icmp all icmp-type maskrep
+pass in proto icmp all icmp-type maskreq
+pass in proto icmp all icmp-type paramprob
+pass in proto icmp all icmp-type redir
+pass in proto icmp all icmp-type unreach
+pass in proto icmp all icmp-type routerad
+pass in proto icmp all icmp-type routersol
+pass in proto icmp all icmp-type squench
+pass in proto icmp all icmp-type timest
+pass in proto icmp all icmp-type timestrep
+pass in proto icmp all icmp-type timex
diff --git a/contrib/netbsd-tests/ipf/regress/i9 b/contrib/netbsd-tests/ipf/regress/i9
new file mode 100644
index 000000000000..441cfa9a16b6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/i9
@@ -0,0 +1,17 @@
+pass in from localhost to localhost with short,frags
+block in from any to any with ipopts
+pass in from any to any with opt nop,rr,zsu
+pass in from any to any with opt nop,rr,zsu not opt ssrr,lsrr
+pass in from localhost to localhost and not frag
+pass in from localhost to localhost with frags,frag-body
+pass in proto tcp all flags S with not oow keep state
+block in proto tcp all with oow
+pass in proto tcp all flags S with not bad,bad-src,bad-nat
+block in proto tcp all flags S with bad,not bad-src,not bad-nat
+pass in quick all with not short
+block in quick all with not nat
+pass in quick all with not frag-body
+block in quick all with not lowttl
+pass in all with mbcast,not bcast,multicast,not state,not ipopts
+block in all with not mbcast,bcast,not multicast,state
+pass in from any to any with opt mtur,mtup,encode,ts,tr,sec,cipso,satid,ssrr,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump,addext,e-sec
diff --git a/contrib/netbsd-tests/ipf/regress/in1 b/contrib/netbsd-tests/ipf/regress/in1
new file mode 100644
index 000000000000..d5d0cf4c3d19
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in1
@@ -0,0 +1,31 @@
+map le0 0/0 -> 0/32
+map le0 1/32 -> 1/32
+map le0 128.0.0.0/1 -> 0/0
+map le0 10.0.0.0/8 -> 1.2.3.0/24
+map le0 10.0.0.5/8 -> 1.2.3.4/24
+map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24
+map le0 10.0.0.5/0xff -> 1.2.3.4/24
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999
+map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto
+map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto
+map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6
+map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp
+map le0 0/0 -> 0/32 frag
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag
+map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/tcp frag
+map le0 0/0 -> 0/32 age 10
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30
+map le0 0/0 -> 0/32 frag age 10
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20
+map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30
+map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp
+map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere
+map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000
+map ppp0,adsl0 0/0 -> 0/32
+map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp
diff --git a/contrib/netbsd-tests/ipf/regress/in100 b/contrib/netbsd-tests/ipf/regress/in100
new file mode 100644
index 000000000000..5e2ab6c91730
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in100
@@ -0,0 +1,3 @@
+rewrite in on bge0 from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4;
+rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4;
+rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.0/24;
diff --git a/contrib/netbsd-tests/ipf/regress/in100_6 b/contrib/netbsd-tests/ipf/regress/in100_6
new file mode 100644
index 000000000000..533e2dd63859
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in100_6
@@ -0,0 +1,3 @@
+rewrite in on bge0 inet6 from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/96 dst 4::4:4:4;
+rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::0/96 dst 4::4:4:4/96;
diff --git a/contrib/netbsd-tests/ipf/regress/in101 b/contrib/netbsd-tests/ipf/regress/in101
new file mode 100644
index 000000000000..afef53bc9ab4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in101
@@ -0,0 +1,4 @@
+rewrite in on bge0 proto icmp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4;
+rewrite in on bge0 proto udp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4;
+rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4;
+rewrite in on bge0 proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24,20202 dst 4.4.4.0/24,10101;
diff --git a/contrib/netbsd-tests/ipf/regress/in101_6 b/contrib/netbsd-tests/ipf/regress/in101_6
new file mode 100644
index 000000000000..bb4af3d008c2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in101_6
@@ -0,0 +1,4 @@
+rewrite in on bge0 proto icmp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite in on bge0 proto udp from 1:1:1::1 to 2:2::2:2 -> src 3:3:3::3 dst 4::4:4:4;
+rewrite out on bge0 proto tcp from 1:1:1::1/128 to 2:2::2:2 -> src 3:3:3::0/24 dst 4::4:4:4;
+rewrite in on bge0 proto tcp/udp from 1:1:1::1/128 to 2:2::2:2/32 -> src 3:3:3::0/24,20202 dst 4::4:4:4/24,10101;
diff --git a/contrib/netbsd-tests/ipf/regress/in102 b/contrib/netbsd-tests/ipf/regress/in102
new file mode 100644
index 000000000000..57f364566f08
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in102
@@ -0,0 +1,5 @@
+rewrite in on bge0 proto tcp from any to any -> src 0/0 dst dstlist/a;
+rewrite in on bge0 proto tcp from 1.1.1.1 to any -> src 0/0 dst dstlist/bee;
+rewrite in on bge0 proto tcp from 1.1.1.1 to 2.2.2.2 -> src 0/0 dst dstlist/cat;
+rewrite in on bge0 proto tcp from pool/a to 2.2.2.2 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
diff --git a/contrib/netbsd-tests/ipf/regress/in102_6 b/contrib/netbsd-tests/ipf/regress/in102_6
new file mode 100644
index 000000000000..e11906db77cd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in102_6
@@ -0,0 +1,5 @@
+rewrite in on bge0 inet6 proto tcp from any to any -> src 0/0 dst dstlist/a;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to any -> src 0/0 dst dstlist/bee;
+rewrite in on bge0 inet6 proto tcp from 1:1:1::1 to 2:2::2:2 -> src 0/0 dst dstlist/cat;
+rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2 -> src 0/0 dst dstlist/bat;
+rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant;
diff --git a/contrib/netbsd-tests/ipf/regress/in1_6 b/contrib/netbsd-tests/ipf/regress/in1_6
new file mode 100644
index 000000000000..e5050f867dc6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in1_6
@@ -0,0 +1,29 @@
+map le0 inet6 0/0 -> 0/128
+map le0 inet6 1/128 -> 1/128
+map le0 inet6 128::/1 -> 0/0
+map le0 inet6 10::0/16 -> 1:2:3::0/96
+map le0 inet6 10::5/16 -> 1:2:3::4/96
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap udp 20000:29999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp/udp 30000:39999
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp auto
+map ppp0 inet6 192:168::/32 -> 0/128 portmap udp auto
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcpudp auto
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/6
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port 1010 ftp/tcp
+map le0 inet6 0/0 -> 0/128 frag
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag
+map ppp0 inet6 192:168::/32 -> 0/128 proxy port ftp ftp/tcp frag
+map le0 inet6 0/0 -> 0/128 age 10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 age 30
+map le0 inet6 0/0 -> 0/128 frag age 10
+map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20
+map ppp0 inet6 192:168::/32 -> 0/128 portmap tcp 10000:19999 frag age 30
+map fxp0 inet6 from 192:168::/18 to 0/0 port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp
+map thisisalonginte inet6 0/0 -> 0/128 mssclamp 1452 tag freddyliveshere
+map bar0 inet6 0/0 -> 0/128 icmpidmap ipv6-icmp 1000:2000
+map ppp0,adsl0 inet6 0/0 -> 0/128
+map ppp0 inet6 from 192:168::/32 to any port = 123 -> 0/128 age 30/1 udp
diff --git a/contrib/netbsd-tests/ipf/regress/in2 b/contrib/netbsd-tests/ipf/regress/in2
new file mode 100644
index 000000000000..58556c048543
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in2
@@ -0,0 +1,71 @@
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 tcp
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 255
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp
+rdr le0 9.8.7.6/32 -> 1.1.1.1 ip
+rdr le0 9.8.7.6/0xff000000 -> 1.1.1.1 ip
+rdr le0 9.8.7.6/0xffff0000 -> 1.1.1.1 ip
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 udp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp/udp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcpudp frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag
+rdr le0 9.8.7.6/32 -> 1.1.1.1 ip frag age 10
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip tag nattagcacheline
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 9.8.7.6/32 -> 1.1.1.1 proxy port 21 ftp/tcp
+rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1 port 21 tcp proxy ftp
+rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555 tcp
+rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port = 5555 tcp
+rdr le0 0/0 -> test.host.dots
+rdr le0 any -> test.host.dots,test.host.dots
+rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555-7777 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/in2_6 b/contrib/netbsd-tests/ipf/regress/in2_6
new file mode 100644
index 000000000000..1ee1f067b0ca
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in2_6
@@ -0,0 +1,71 @@
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 tcp
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 255
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/32 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/64 -> 1:1:1::1 ip
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 0/0 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp/udp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcpudp frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1 ip frag age 10
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline
+rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1,1:1:1::2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline
+rdr ge0 9:8:7::6/128 -> 1:1:1::1 proxy port 21 ftp/tcp
+rdr ge0 9:8:7::6/128 port 21 -> 1:1:1::1 port 21 tcp proxy ftp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555 tcp
+rdr le0 inet6 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port = 5555 tcp
+rdr le0 inet6 0/0 -> test.host.dots
+rdr le0 inet6 any -> test.host.dots,test.host.dots
+rdr adsl0,ppp0 9:8:7::6/128 port 1000-2000 -> 1:1:1::1 port 5555-7777 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/in3 b/contrib/netbsd-tests/ipf/regress/in3
new file mode 100644
index 000000000000..d8016b69e916
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in3
@@ -0,0 +1,5 @@
+bimap le0 0/0 -> 0/32
+bimap le0 1/32 -> 1/32
+bimap le0 128.0.0.0/1 -> 0/0
+bimap le0 10.0.0.0/8 -> 1.2.3.0/24
+bimap le0 10.0.5.6/24 -> 1.2.3.4/24
diff --git a/contrib/netbsd-tests/ipf/regress/in3_6 b/contrib/netbsd-tests/ipf/regress/in3_6
new file mode 100644
index 000000000000..a82ff09b24da
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in3_6
@@ -0,0 +1,5 @@
+bimap le0 inet6 0/0 -> 0/128
+bimap le0 inet6 1/128 -> 1/128
+bimap le0 inet6 128::/1 -> 0/0
+bimap le0 inet6 10::/16 -> 1:2:3::0/96
+bimap le0 inet6 10:0:5::6/96 -> 1:2:3::4/96
diff --git a/contrib/netbsd-tests/ipf/regress/in4 b/contrib/netbsd-tests/ipf/regress/in4
new file mode 100644
index 000000000000..46bbd81012dc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in4
@@ -0,0 +1,5 @@
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256
+map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto
+map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto
diff --git a/contrib/netbsd-tests/ipf/regress/in4_6 b/contrib/netbsd-tests/ipf/regress/in4_6
new file mode 100644
index 000000000000..b6b78c085590
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in4_6
@@ -0,0 +1,5 @@
+map-block le0 inet6 10::/96 -> 203:1:1::/96
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 0
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports 256
+map-block le0 inet6 10::/96 -> 203:1:1::/96 ports auto
+map-block le0 inet6 10::/16 -> 203:1:1::/96 ports auto
diff --git a/contrib/netbsd-tests/ipf/regress/in5 b/contrib/netbsd-tests/ipf/regress/in5
new file mode 100644
index 000000000000..766c3e3df104
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in5
@@ -0,0 +1,24 @@
+map le0 from 9.8.7.6/32 port > 1024 to any -> 1.1.1.1 portmap 10000:20000 tcp
+map le0 from 9.8.7.6/32 port > 1024 to ! 1.2.3.4 -> 1.1.1.1 portmap 10000:20000 tcp
+rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 tcp
+rdr le0 from any to 9.8.7.6/0xffffffff port = 0 -> 1.1.1.1 port 0 ip
+rdr le0 ! from 1.2.3.4 to 9.8.7.6 port = 8888 -> 1.1.1.1 port 888 tcp
+rdr le0 from any to 9.8.7.6/255.255.255.255 port = 8888 -> 1.1.1.1 port 888 ip
+rdr le0 from any to 9.8.7.6 mask 0xffffffff port = 8888 -> 1.1.1.1 port 888 tcp
+rdr le0 from any to 9.8.7.6 mask 255.255.255.255 port = 8888 -> 1.1.1.1 port 888 udp
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp/udp
+rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 888 icmp
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin
+rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag
+rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag age 10
+rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 ip frag age 10/20
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag age 10
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag age 30
+rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40
diff --git a/contrib/netbsd-tests/ipf/regress/in5_6 b/contrib/netbsd-tests/ipf/regress/in5_6
new file mode 100644
index 000000000000..f39d819acc91
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in5_6
@@ -0,0 +1,24 @@
+map le0 inet6 from 9:8:7::6/128 port > 1024 to any -> 1:1:1::1 portmap 10000:20000 tcp
+map le0 inet6 from 9:8:7::6/128 port > 1024 to ! 1:2:3::4 -> 1:1:1::1 portmap 10000:20000 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 ip
+rdr le0 inet6 ! from 1:2:3::4 to 9:8:7::6 port = 8888 -> 1:1:1::1 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 ip
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 udp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp/udp
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 888 icmp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 0 ip frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 icmp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag
+rdr le0 inet6 from any to 9:8:7::6/128 -> 1:1:1::1 port 0 ip frag age 10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 0 -> 1:1:1::1 port 0 ip frag age 10/20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 icmp frag age 10
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp frag age 20
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1 port 888 tcp round-robin frag age 30
+rdr le0 inet6 from any to 9:8:7::6/128 port = 8888 -> 1:1:1::1,1:1:1::2 port 888 tcp round-robin frag age 40
diff --git a/contrib/netbsd-tests/ipf/regress/in6 b/contrib/netbsd-tests/ipf/regress/in6
new file mode 100644
index 000000000000..70e71ddeb16b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in6
@@ -0,0 +1,8 @@
+map foo0 from any port = 1 to any port != 0 -> 0/32 udp
+map foo0 from any port eq 1 to any port ne 0 -> 0/32 udp
+map foo0 from any port < 1 to any port > 0 -> 0/32 tcp
+map foo0 from any port lt 1 to any port gt 0 -> 0/32 tcp
+map foo0 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp
+map foo0 from any port le 1 to any port ge 0 -> 0/32 tcp/udp
+map foo0 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp
+map foo0 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/in6_6 b/contrib/netbsd-tests/ipf/regress/in6_6
new file mode 100644
index 000000000000..556015d10287
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in6_6
@@ -0,0 +1,8 @@
+map foo0 inet6 from any port = 1 to any port != 0 -> 0/32 udp
+map foo0 inet6 from any port eq 1 to any port ne 0 -> 0/32 udp
+map foo0 inet6 from any port < 1 to any port > 0 -> 0/32 tcp
+map foo0 inet6 from any port lt 1 to any port gt 0 -> 0/32 tcp
+map foo0 inet6 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp
+map foo0 inet6 from any port le 1 to any port ge 0 -> 0/32 tcp/udp
+map foo0 inet6 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp
+map foo0 inet6 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/in7 b/contrib/netbsd-tests/ipf/regress/in7
new file mode 100644
index 000000000000..792d6005489e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in7
@@ -0,0 +1 @@
+#
diff --git a/contrib/netbsd-tests/ipf/regress/in8_6 b/contrib/netbsd-tests/ipf/regress/in8_6
new file mode 100644
index 000000000000..ab23b84476d2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/in8_6
@@ -0,0 +1,6 @@
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 tcp purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 mssclamp 1000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
+map zx0 inet6 10:1::1:1/128 -> 10:2:2::2/128 portmap tcp/udp 10000:11000 sequential purge
diff --git a/contrib/netbsd-tests/ipf/regress/ip1 b/contrib/netbsd-tests/ipf/regress/ip1
new file mode 100644
index 000000000000..c31ba251bf2e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ip1
@@ -0,0 +1,78 @@
+#:%s/ \(number = [0-9]*\) \(type = [a-z]*\)/ \2 \1/g
+
+table role = ipf type = tree number = 1
+	{; };
+table role = ipf type = tree number = 100
+	{ 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
+table role = nat type = tree number = 110
+	{ 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
+table role = auth type = tree number = 120
+	{ 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; };
+table role = count type = tree number = 130
+	{ 1.2.3.4; !2.2.0.0/16; 2.2.2.0/24; };
+
+table role = ipf type = hash number = 2
+	{; };
+table role = ipf type = hash number = 200
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role = nat type = hash number = 210
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role = auth type = hash number = 220
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role = count type = hash number = 230
+	{ 0/0; 4/32; 1.2.3.4/32; };
+
+table role = ipf type = hash number = 240 seed = 101
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role = nat type = hash number = 250 seed = 101
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role = auth type = hash number = 260 seed = 101
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role = count type = hash number = 270 seed = 101
+	{ 0/0; 4/32; 1.2.3.4/32; };
+
+table role = ipf type = hash number = 2000 size = 1001
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role = nat type = hash number = 2000 size = 1001
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role = auth type = hash number = 2000 size = 1001
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role = count type = hash number = 2000 size = 1001
+	{ 0/0; 4/32; 1.2.3.4/32; };
+
+table role = ipf type = hash number = 100 size = 1001 seed = 101
+	{ 0/0; 1/32; 1.2.3.4/32; };
+table role = nat type = hash number = 100 size = 1001 seed = 101
+	{ 0/0; 2/32; 1.2.3.4/32; };
+table role = auth type = hash number = 100 size = 1001 seed = 101
+	{ 0/0; 3/32; 1.2.3.4/32; };
+table role = count type = hash number = 100 size = 1001 seed = 101
+	{ 0/0; 4/32; 1.2.3.4/32; };
+
+group-map in role = ipf number = 300 group = 303
+	{ 0/0; 5/32; 1.2.3.4/32; };
+group-map in role = nat number = 300 group = 303
+	{ 0/0; 6/32; 1.2.3.4/32; };
+group-map in role = auth number = 300 group = 303
+	{ 0/0; 7/32; 1.2.3.4/32; };
+group-map in role = count number = 300 group = 303
+	{ 0/0; 8/32; 1.2.3.4/32; };
+
+group-map out role = ipf number = 400 group = 303
+	{ 0/0; 5/32; 1.2.3.4/32, group = 606; };
+group-map out role = nat number = 400 group = 303
+	{ 0/0; 6/32; 1.2.3.4/32, group = 606; };
+group-map out role = auth number = 400 group = 303
+	{ 0/0; 7/32; 1.2.3.4/32, group = 606; };
+group-map out role = count number = 400 group = 303
+	{ 0/0; 8/32; 1.2.3.4/32, group = 606; };
+
+group-map in role = ipf number = 500
+	{ 0/0, group = 10; 5/32, group = 800; 1.2.3.4/32, group = 606; };
+group-map in role = nat number = 500
+	{ 0/0, group = 10; 6/32, group = 800; 1.2.3.4/32, group = 606; };
+group-map in role = auth number = 500
+	{ 0/0, group = 10; 7/32, group = 800; 1.2.3.4/32, group = 606; };
+group-map in role = count number = 500
+	{ 0/0, group = 10; 8/32, group = 800; 1.2.3.4/32, group = 606; };
+
diff --git a/contrib/netbsd-tests/ipf/regress/ip2 b/contrib/netbsd-tests/ipf/regress/ip2
new file mode 100644
index 000000000000..76f31b60f9d4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ip2
@@ -0,0 +1,2 @@
+table role = ipf type = tree name = letters
+	{ "file://input/ip2.data"; };
diff --git a/contrib/netbsd-tests/ipf/regress/ip3 b/contrib/netbsd-tests/ipf/regress/ip3
new file mode 100644
index 000000000000..98d2b0b94555
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ip3
@@ -0,0 +1,14 @@
+pool ipf/dstlist (name fred; policy round-robin;)
+	{ 3.3.3.3; };
+pool ipf/dstlist (name jack; policy weighted connection;)
+	{ 4.4.4.4; bge0:5.5.5.5;};
+pool ipf/dstlist (name jill; policy random;)
+	{ 1.1.1.1; bge0:2.2.2.2;};
+pool nat/hash (name noproxy; size 17;)
+	{ 1.1.1.1; 2.2.2.2;};
+pool nat/tree (name raw;)
+	{ 1.1.1.1; 2.2.2.2;};
+pool all/dstlist (name jill; policy random;)
+	{ 1.1.1.1; bge0:2.2.2.2;};
+pool all/hash (name noproxy; size 17;)
+	{ 1.1.1.1; 2.2.2.2;};
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.1 b/contrib/netbsd-tests/ipf/regress/ipv6.1
new file mode 100644
index 000000000000..fc532b677c7f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.1
@@ -0,0 +1 @@
+pass out log quick on gif0 proto udp from ef00:1001:2002::/48 to any port 33433 >< 34000 keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.2 b/contrib/netbsd-tests/ipf/regress/ipv6.2
new file mode 100644
index 000000000000..814dfd6cd664
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.2
@@ -0,0 +1,3 @@
+block in all
+block out all
+pass out proto 58 all keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.3 b/contrib/netbsd-tests/ipf/regress/ipv6.3
new file mode 100644
index 000000000000..6dc9e937a995
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.3
@@ -0,0 +1 @@
+pass out log quick on gif0 proto ipv6-icmp from any to any icmp-type 128 keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.4 b/contrib/netbsd-tests/ipf/regress/ipv6.4
new file mode 100644
index 000000000000..b2217446d39e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.4
@@ -0,0 +1,3 @@
+pass in proto ipv6-icmp all icmp-type echo keep frags
+pass in proto ipv6-icmp all icmp-type echo keep frags keep state
+pass in proto tcp all keep frags keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.5 b/contrib/netbsd-tests/ipf/regress/ipv6.5
new file mode 100644
index 000000000000..d9ae23b2fbd7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.5
@@ -0,0 +1,2 @@
+pass out family inet6 all with v6hdr routing
+block out family inet6 proto tcp all with v6hdr routing
diff --git a/contrib/netbsd-tests/ipf/regress/ipv6.6 b/contrib/netbsd-tests/ipf/regress/ipv6.6
new file mode 100644
index 000000000000..19a4df972334
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ipv6.6
@@ -0,0 +1,2 @@
+pass out on gif0 proto udp all keep frag
+block out all with bad
diff --git a/contrib/netbsd-tests/ipf/regress/l1 b/contrib/netbsd-tests/ipf/regress/l1
new file mode 100644
index 000000000000..88cca58039f9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/l1
@@ -0,0 +1,6 @@
+log in all
+pass in on anon0 all head 100
+pass in log quick from 3.3.3.3 to any group 100
+pass in log body quick from 2.2.2.2 to any
+pass in log quick proto tcp from 1.1.1.1 to any flags S keep state
+pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/n1 b/contrib/netbsd-tests/ipf/regress/n1
new file mode 100644
index 000000000000..9bcf29be7ccf
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n1
@@ -0,0 +1,3 @@
+map zx0 10.1.1.1/32 -> 10.2.2.2/32
+map zx0 10.1.1.0/24 -> 10.3.4.5/32
+map zx0 10.1.1.0/24 -> 10.3.4.0/24
diff --git a/contrib/netbsd-tests/ipf/regress/n10 b/contrib/netbsd-tests/ipf/regress/n10
new file mode 100644
index 000000000000..0f4819217f7a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n10
@@ -0,0 +1,3 @@
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000
+map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000
diff --git a/contrib/netbsd-tests/ipf/regress/n100 b/contrib/netbsd-tests/ipf/regress/n100
new file mode 100644
index 000000000000..a8b6deeb52e3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n100
@@ -0,0 +1 @@
+rewrite out on zx0 from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16;
diff --git a/contrib/netbsd-tests/ipf/regress/n101 b/contrib/netbsd-tests/ipf/regress/n101
new file mode 100644
index 000000000000..2f5fcd98c9ce
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n101
@@ -0,0 +1 @@
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16;
diff --git a/contrib/netbsd-tests/ipf/regress/n102 b/contrib/netbsd-tests/ipf/regress/n102
new file mode 100644
index 000000000000..f056633dd23b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n102
@@ -0,0 +1 @@
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000:2000 dst 6.6.0.0/16;
diff --git a/contrib/netbsd-tests/ipf/regress/n103 b/contrib/netbsd-tests/ipf/regress/n103
new file mode 100644
index 000000000000..c3c27d60dd8f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n103
@@ -0,0 +1 @@
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,4000:4001;
diff --git a/contrib/netbsd-tests/ipf/regress/n104 b/contrib/netbsd-tests/ipf/regress/n104
new file mode 100644
index 000000000000..785f0ada244b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n104
@@ -0,0 +1 @@
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.0.0/24,1000-1001 dst 6.6.0.0/16,4000:4001;
diff --git a/contrib/netbsd-tests/ipf/regress/n105 b/contrib/netbsd-tests/ipf/regress/n105
new file mode 100644
index 000000000000..afe89660a728
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n105
@@ -0,0 +1 @@
+rewrite in on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16 port = 3128;
diff --git a/contrib/netbsd-tests/ipf/regress/n106 b/contrib/netbsd-tests/ipf/regress/n106
new file mode 100644
index 000000000000..6074ab0b4cc4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n106
@@ -0,0 +1 @@
+rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16 port = 3128;
diff --git a/contrib/netbsd-tests/ipf/regress/n10_6 b/contrib/netbsd-tests/ipf/regress/n10_6
new file mode 100644
index 000000000000..738152df62ab
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n10_6
@@ -0,0 +1,3 @@
+map ppp0 any -> 203.203.203.203/128 mssclamp 100
+map ppp0 any -> 203.203.203.203/128 mssclamp 1000
+map ppp0 any -> 203.203.203.203/128 mssclamp 10000
diff --git a/contrib/netbsd-tests/ipf/regress/n11 b/contrib/netbsd-tests/ipf/regress/n11
new file mode 100644
index 000000000000..8cdf7fcf4627
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n11
@@ -0,0 +1,3 @@
+bimap zx0 10.1.1.1/32 -> 1.6.7.8/32
+bimap zx0 10.1.1.0/24 -> 10.2.2.2/32
+bimap zx0 10.1.1.0/24 -> 10.3.4.5/24
diff --git a/contrib/netbsd-tests/ipf/regress/n11_6 b/contrib/netbsd-tests/ipf/regress/n11_6
new file mode 100644
index 000000000000..7b428cc23925
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n11_6
@@ -0,0 +1,3 @@
+bimap zx0 10:1:1::1/128 -> 1::6:7:8/128
+bimap zx0 10:1:1::/112 -> 10::2:2:2/128
+bimap zx0 10:1:1::/112 -> 10::3:4:5/112
diff --git a/contrib/netbsd-tests/ipf/regress/n12 b/contrib/netbsd-tests/ipf/regress/n12
new file mode 100644
index 000000000000..933856bc710b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n12
@@ -0,0 +1 @@
+map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n12_6 b/contrib/netbsd-tests/ipf/regress/n12_6
new file mode 100644
index 000000000000..bf218489d051
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n12_6
@@ -0,0 +1 @@
+map le0 c0a8:7e00::/112 -> 0/128 portmap tcp/udp 10000:20000
diff --git a/contrib/netbsd-tests/ipf/regress/n13 b/contrib/netbsd-tests/ipf/regress/n13
new file mode 100644
index 000000000000..804793004050
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n13
@@ -0,0 +1 @@
+map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45
diff --git a/contrib/netbsd-tests/ipf/regress/n13_6 b/contrib/netbsd-tests/ipf/regress/n13_6
new file mode 100644
index 000000000000..c1d1646d2ddb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n13_6
@@ -0,0 +1 @@
+map le0 192:168:1::0/48 -> range 203:0:1::1:23-203:0:1::3:45
diff --git a/contrib/netbsd-tests/ipf/regress/n14 b/contrib/netbsd-tests/ipf/regress/n14
new file mode 100644
index 000000000000..6f5d571d606e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n14
@@ -0,0 +1 @@
+rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky
diff --git a/contrib/netbsd-tests/ipf/regress/n14_6 b/contrib/netbsd-tests/ipf/regress/n14_6
new file mode 100644
index 000000000000..64e88ee4c7fe
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n14_6
@@ -0,0 +1 @@
+rdr gre0 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky
diff --git a/contrib/netbsd-tests/ipf/regress/n15 b/contrib/netbsd-tests/ipf/regress/n15
new file mode 100644
index 000000000000..062b766c9aba
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n15
@@ -0,0 +1,2 @@
+rdr le0 0/0 port 80 -> 3.3.3.3 port 80 tcp
+rdr le0 0/0 port 80 -> 3.3.3.3 port 80-88 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/n15_6 b/contrib/netbsd-tests/ipf/regress/n15_6
new file mode 100644
index 000000000000..e82dd8232760
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n15_6
@@ -0,0 +1,2 @@
+rdr le0 any port 80 -> 3:0:3::3:3 port 80 tcp
+rdr le0 any port 80 -> 3:0:3::3:3 port 80-88 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/n16 b/contrib/netbsd-tests/ipf/regress/n16
new file mode 100644
index 000000000000..ff8958cad869
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n16
@@ -0,0 +1 @@
+rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp
diff --git a/contrib/netbsd-tests/ipf/regress/n16_6 b/contrib/netbsd-tests/ipf/regress/n16_6
new file mode 100644
index 000000000000..ff8958cad869
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n16_6
@@ -0,0 +1 @@
+rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp
diff --git a/contrib/netbsd-tests/ipf/regress/n17 b/contrib/netbsd-tests/ipf/regress/n17
new file mode 100644
index 000000000000..213f51f079b5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n17
@@ -0,0 +1 @@
+bimap zx0 0/0 -> 1.1.1.3
diff --git a/contrib/netbsd-tests/ipf/regress/n18 b/contrib/netbsd-tests/ipf/regress/n18
new file mode 100644
index 000000000000..792f136b76c1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n18
@@ -0,0 +1,3 @@
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential
+map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n1_6 b/contrib/netbsd-tests/ipf/regress/n1_6
new file mode 100644
index 000000000000..341f13651b98
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n1_6
@@ -0,0 +1,3 @@
+map zx0 10:1:1::1/128 -> 10::2:2:2/128
+map zx0 10:1:1::/112 -> 10::3:4:5/128
+map zx0 10:1:1::/112 -> 10::3:4:0/112
diff --git a/contrib/netbsd-tests/ipf/regress/n2 b/contrib/netbsd-tests/ipf/regress/n2
new file mode 100644
index 000000000000..39a4d724dedf
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n2
@@ -0,0 +1,4 @@
+map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n200 b/contrib/netbsd-tests/ipf/regress/n200
new file mode 100644
index 000000000000..c792e5406754
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n200
@@ -0,0 +1 @@
+divert in on bar0 from any to any -> src 127.0.0.1,10101 dst 127.0.0.1,10101 udp;
diff --git a/contrib/netbsd-tests/ipf/regress/n2_6 b/contrib/netbsd-tests/ipf/regress/n2_6
new file mode 100644
index 000000000000..3a04f33ae740
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n2_6
@@ -0,0 +1,4 @@
+map zx0 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential
+map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
+map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
+map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n3 b/contrib/netbsd-tests/ipf/regress/n3
new file mode 100644
index 000000000000..82c83dd6acc5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n3
@@ -0,0 +1,2 @@
+map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto
+map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252
diff --git a/contrib/netbsd-tests/ipf/regress/n4 b/contrib/netbsd-tests/ipf/regress/n4
new file mode 100644
index 000000000000..e7c03145e677
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n4
@@ -0,0 +1,6 @@
+rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 0/0 port 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1 port 10053 udp
+rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 tcp
+rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 ip
diff --git a/contrib/netbsd-tests/ipf/regress/n4_6 b/contrib/netbsd-tests/ipf/regress/n4_6
new file mode 100644
index 000000000000..72dad4c11217
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n4_6
@@ -0,0 +1,6 @@
+rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 10:1:1::/112 port 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 any port 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 10:1:1::/112 port 53 -> 10::2:2:1 port 10053 udp
+rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 tcp
+rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 ip
diff --git a/contrib/netbsd-tests/ipf/regress/n5 b/contrib/netbsd-tests/ipf/regress/n5
new file mode 100644
index 000000000000..d9f1a8885f8d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n5
@@ -0,0 +1,6 @@
+map zx0 10.1.1.1/32 -> 10.2.2.2/32
+map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32
+map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential
+map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential
+map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n5_6 b/contrib/netbsd-tests/ipf/regress/n5_6
new file mode 100644
index 000000000000..acefd7b18a73
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n5_6
@@ -0,0 +1,6 @@
+map zx0 10:1:1::1/128 -> 10::2:2:2/128
+map zx0 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128
+map zx0 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112
+map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential
+map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential
+map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/n6 b/contrib/netbsd-tests/ipf/regress/n6
new file mode 100644
index 000000000000..79f11a40d88a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n6
@@ -0,0 +1,5 @@
+rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 from any to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1 port 10023 tcp
+rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1 port 10053 udp
diff --git a/contrib/netbsd-tests/ipf/regress/n6_6 b/contrib/netbsd-tests/ipf/regress/n6_6
new file mode 100644
index 000000000000..3491c6b3e039
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n6_6
@@ -0,0 +1,5 @@
+rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 from any to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1 port 10023 tcp
+rdr zx0 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1 port 10053 udp
diff --git a/contrib/netbsd-tests/ipf/regress/n7 b/contrib/netbsd-tests/ipf/regress/n7
new file mode 100644
index 000000000000..be995c2fe030
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n7
@@ -0,0 +1,3 @@
+rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port 10023 tcp
+rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port = 10023 tcp
+rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/n7_6 b/contrib/netbsd-tests/ipf/regress/n7_6
new file mode 100644
index 000000000000..88055f69ab30
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n7_6
@@ -0,0 +1,3 @@
+rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port 10023 tcp
+rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port = 10023 tcp
+rdr zx0 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp
diff --git a/contrib/netbsd-tests/ipf/regress/n8 b/contrib/netbsd-tests/ipf/regress/n8
new file mode 100644
index 000000000000..bf0e94f73544
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n8
@@ -0,0 +1 @@
+map icmp0 2.2.2.0/24 -> 10.10.10.0/24
diff --git a/contrib/netbsd-tests/ipf/regress/n8_6 b/contrib/netbsd-tests/ipf/regress/n8_6
new file mode 100644
index 000000000000..2f96be05d003
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n8_6
@@ -0,0 +1 @@
+map icmp0 2::2:2:0/112 -> 10:10:10::/112
diff --git a/contrib/netbsd-tests/ipf/regress/n9 b/contrib/netbsd-tests/ipf/regress/n9
new file mode 100644
index 000000000000..81a7ccd8c815
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n9
@@ -0,0 +1 @@
+rdr icmp0 4.4.4.0/24 port 0 -> 10.10.10.1 port 0 ip
diff --git a/contrib/netbsd-tests/ipf/regress/n9_6 b/contrib/netbsd-tests/ipf/regress/n9_6
new file mode 100644
index 000000000000..31e4615f1327
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/n9_6
@@ -0,0 +1 @@
+rdr icmp0 4:4:4::/112 port 0 -> 10:10:10::1 port 0 ip
diff --git a/contrib/netbsd-tests/ipf/regress/ni1.ipf b/contrib/netbsd-tests/ipf/regress/ni1.ipf
new file mode 100644
index 000000000000..c7e5797185dc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni1.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass out proto udp from any to any keep state
+pass out proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni1.nat b/contrib/netbsd-tests/ipf/regress/ni1.nat
new file mode 100644
index 000000000000..077aab1a1f26
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni1.nat
@@ -0,0 +1,3 @@
+map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500 sequential
+map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000 sequential
+map df0 from 2.2.2.2/32 to any -> 6.6.6.6/32
diff --git a/contrib/netbsd-tests/ipf/regress/ni10.ipf b/contrib/netbsd-tests/ipf/regress/ni10.ipf
new file mode 100644
index 000000000000..4151b6e666eb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni10.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass in proto udp from any to any keep state
+pass in proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni10.nat b/contrib/netbsd-tests/ipf/regress/ni10.nat
new file mode 100644
index 000000000000..2a04ef7948d0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni10.nat
@@ -0,0 +1 @@
+rdr df0 2.2.2.2/32 -> 6.6.6.6
diff --git a/contrib/netbsd-tests/ipf/regress/ni11.ipf b/contrib/netbsd-tests/ipf/regress/ni11.ipf
new file mode 100644
index 000000000000..4151b6e666eb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni11.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass in proto udp from any to any keep state
+pass in proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni11.nat b/contrib/netbsd-tests/ipf/regress/ni11.nat
new file mode 100644
index 000000000000..1d0018cb34fa
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni11.nat
@@ -0,0 +1 @@
+rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/ni12.ipf b/contrib/netbsd-tests/ipf/regress/ni12.ipf
new file mode 100644
index 000000000000..4151b6e666eb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni12.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass in proto udp from any to any keep state
+pass in proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni12.nat b/contrib/netbsd-tests/ipf/regress/ni12.nat
new file mode 100644
index 000000000000..8c36bc8701a5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni12.nat
@@ -0,0 +1 @@
+rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/ni13.ipf b/contrib/netbsd-tests/ipf/regress/ni13.ipf
new file mode 100644
index 000000000000..04b6d137e504
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni13.ipf
@@ -0,0 +1,3 @@
+pass in quick on pcn1 proto tcp from any to any port = 1723 keep state
+block in all
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni13.nat b/contrib/netbsd-tests/ipf/regress/ni13.nat
new file mode 100644
index 000000000000..ac2be49d61f8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni13.nat
@@ -0,0 +1 @@
+rdr pcn1 192.168.113.3/32 port 1723 -> 0.0.0.0 port 1723 tcp proxy pptp
diff --git a/contrib/netbsd-tests/ipf/regress/ni14.ipf b/contrib/netbsd-tests/ipf/regress/ni14.ipf
new file mode 100644
index 000000000000..04b6d137e504
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni14.ipf
@@ -0,0 +1,3 @@
+pass in quick on pcn1 proto tcp from any to any port = 1723 keep state
+block in all
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni14.nat b/contrib/netbsd-tests/ipf/regress/ni14.nat
new file mode 100644
index 000000000000..72a8a4a2759e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni14.nat
@@ -0,0 +1 @@
+rdr pcn1 192.168.113.3/32 port 1723 -> 127.0.0.1 port 1723 tcp proxy pptp
diff --git a/contrib/netbsd-tests/ipf/regress/ni15.ipf b/contrib/netbsd-tests/ipf/regress/ni15.ipf
new file mode 100644
index 000000000000..1b9a013f5299
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni15.ipf
@@ -0,0 +1,3 @@
+pass out quick on pcn1 proto tcp from any to any port = 1723 keep state
+block in all
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni15.nat b/contrib/netbsd-tests/ipf/regress/ni15.nat
new file mode 100644
index 000000000000..420c7b722673
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni15.nat
@@ -0,0 +1 @@
+map pcn1 0/0 -> 0/0 proxy port 1723 pptp/tcp
diff --git a/contrib/netbsd-tests/ipf/regress/ni16.ipf b/contrib/netbsd-tests/ipf/regress/ni16.ipf
new file mode 100644
index 000000000000..1b9a013f5299
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni16.ipf
@@ -0,0 +1,3 @@
+pass out quick on pcn1 proto tcp from any to any port = 1723 keep state
+block in all
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni16.nat b/contrib/netbsd-tests/ipf/regress/ni16.nat
new file mode 100644
index 000000000000..5fad3cdb20b0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni16.nat
@@ -0,0 +1 @@
+map pcn1 10.2.2.2/32 -> 0/32 proxy port 1723 pptp/tcp
diff --git a/contrib/netbsd-tests/ipf/regress/ni17.ipf b/contrib/netbsd-tests/ipf/regress/ni17.ipf
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/ipf/regress/ni17.nat b/contrib/netbsd-tests/ipf/regress/ni17.nat
new file mode 100644
index 000000000000..3da63383a7b8
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni17.nat
@@ -0,0 +1,4 @@
+rdr le0 0/0 port 80 -> 10.1.1.252 port 3128 tcp round-robin
+rdr le0 0/0 port 80 -> 10.1.2.252 port 3128 tcp round-robin
+rdr le0 0/0 port 80 -> 10.1.3.252 port 3128 tcp round-robin sticky
+rdr le0 0/0 port 80 -> 10.1.1.253,10.1.2.253 port 3128 tcp round-robin sticky
diff --git a/contrib/netbsd-tests/ipf/regress/ni18.ipf b/contrib/netbsd-tests/ipf/regress/ni18.ipf
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/ipf/regress/ni18.nat b/contrib/netbsd-tests/ipf/regress/ni18.nat
new file mode 100644
index 000000000000..40113c1c32c2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni18.nat
@@ -0,0 +1,4 @@
+rdr hme0 192.168.1.0/24 port 80 -> 1.1.1.1 port 80 tcp;
+no rdr hme0 192.168.1.1 port 80 tcp;
+map hme1 10.1.0.0/16 -> 203.1.1.1/32 portmap tcp/udp 10000:20000
+no map hme1 10.1.1.0/24 tcp;
diff --git a/contrib/netbsd-tests/ipf/regress/ni19.ipf b/contrib/netbsd-tests/ipf/regress/ni19.ipf
new file mode 100644
index 000000000000..c6fcec1c32f3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni19.ipf
@@ -0,0 +1,3 @@
+block in all
+pass out quick on bge0 proto tcp from any to any port = shell flags S keep state
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni19.nat b/contrib/netbsd-tests/ipf/regress/ni19.nat
new file mode 100644
index 000000000000..56b81a9e0cb9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni19.nat
@@ -0,0 +1 @@
+map bge0 192.168.113.0/24 -> 10.1.1.1/32 proxy port shell rcmd/tcp
diff --git a/contrib/netbsd-tests/ipf/regress/ni2.ipf b/contrib/netbsd-tests/ipf/regress/ni2.ipf
new file mode 100644
index 000000000000..5956cf9f929c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni2.ipf
@@ -0,0 +1 @@
+pass out quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni2.nat b/contrib/netbsd-tests/ipf/regress/ni2.nat
new file mode 100644
index 000000000000..43d2c83b0c9b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni2.nat
@@ -0,0 +1 @@
+map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/ni20.ipf b/contrib/netbsd-tests/ipf/regress/ni20.ipf
new file mode 100644
index 000000000000..c6f6d8444c41
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni20.ipf
@@ -0,0 +1,3 @@
+block in all
+pass in quick on bge0 proto tcp from any to any port = shell flags S keep state
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni20.nat b/contrib/netbsd-tests/ipf/regress/ni20.nat
new file mode 100644
index 000000000000..f2dd0a7e729d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni20.nat
@@ -0,0 +1 @@
+rdr bge0 10.1.1.4/32 port shell -> 192.168.113.4 port shell tcp proxy rcmd
diff --git a/contrib/netbsd-tests/ipf/regress/ni21.ipf b/contrib/netbsd-tests/ipf/regress/ni21.ipf
new file mode 100644
index 000000000000..6d6ed081787f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni21.ipf
@@ -0,0 +1 @@
+pass out on lan0 to eri0:1.1.1.1 from 2.2.2.2 to any
diff --git a/contrib/netbsd-tests/ipf/regress/ni21.nat b/contrib/netbsd-tests/ipf/regress/ni21.nat
new file mode 100644
index 000000000000..6b2d46a9fb99
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni21.nat
@@ -0,0 +1 @@
+map lan0,eri0 2.2.2.2 -> 4.4.4.4
diff --git a/contrib/netbsd-tests/ipf/regress/ni23.ipf b/contrib/netbsd-tests/ipf/regress/ni23.ipf
new file mode 100644
index 000000000000..49ebcf708766
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni23.ipf
@@ -0,0 +1,3 @@
+block out all
+block in all
+pass in on le0,hme0 out-via ppp0,bge0 to ppp0:3.3.3.254 proto udp all keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni23.nat b/contrib/netbsd-tests/ipf/regress/ni23.nat
new file mode 100644
index 000000000000..094d377c00dc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni23.nat
@@ -0,0 +1,2 @@
+rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2
+map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32
diff --git a/contrib/netbsd-tests/ipf/regress/ni3.ipf b/contrib/netbsd-tests/ipf/regress/ni3.ipf
new file mode 100644
index 000000000000..c7e5797185dc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni3.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass out proto udp from any to any keep state
+pass out proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni3.nat b/contrib/netbsd-tests/ipf/regress/ni3.nat
new file mode 100644
index 000000000000..4306f4b45d3d
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni3.nat
@@ -0,0 +1 @@
+map df0 2.2.2.2/32 -> 6.6.6.6/32
diff --git a/contrib/netbsd-tests/ipf/regress/ni4.ipf b/contrib/netbsd-tests/ipf/regress/ni4.ipf
new file mode 100644
index 000000000000..c7e5797185dc
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni4.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass out proto udp from any to any keep state
+pass out proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni4.nat b/contrib/netbsd-tests/ipf/regress/ni4.nat
new file mode 100644
index 000000000000..e9d5cc1ce8d3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni4.nat
@@ -0,0 +1 @@
+map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000 sequential
diff --git a/contrib/netbsd-tests/ipf/regress/ni5.ipf b/contrib/netbsd-tests/ipf/regress/ni5.ipf
new file mode 100644
index 000000000000..8f11424f4c33
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni5.ipf
@@ -0,0 +1,3 @@
+block in all
+pass out quick on ppp0 proto tcp from any to any port = ftp flags S keep state
+block out all
diff --git a/contrib/netbsd-tests/ipf/regress/ni5.nat b/contrib/netbsd-tests/ipf/regress/ni5.nat
new file mode 100644
index 000000000000..8e80d2248f19
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni5.nat
@@ -0,0 +1 @@
+map ppp0 192.168.1.0/24 -> 1.1.1.1/32 proxy port ftp ftp/tcp
diff --git a/contrib/netbsd-tests/ipf/regress/ni6.ipf b/contrib/netbsd-tests/ipf/regress/ni6.ipf
new file mode 100644
index 000000000000..f5b83b29ff3a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni6.ipf
@@ -0,0 +1,9 @@
+block out log quick on qfe0 from 192.168.7.0/24 to any
+block out log quick on nf0 from 192.168.6.0/24 to any
+pass in quick on nf0 proto tcp from any to any port = 111 flags S keep state
+pass in quick on nf0 proto udp from any to any port = 111 keep state
+block return-rst in log quick on nf0 proto tcp from any to any
+block in log quick on nf0 from 192.168.7.0/24 to any
+block return-rst in log quick on qfe0 proto tcp from any to any
+block in log quick on qfe0 from 192.168.6.0/24 to any
+
diff --git a/contrib/netbsd-tests/ipf/regress/ni6.nat b/contrib/netbsd-tests/ipf/regress/ni6.nat
new file mode 100644
index 000000000000..00d57d07cb2c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni6.nat
@@ -0,0 +1,3 @@
+rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 udp proxy rpcbu
+rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 tcp proxy rpcbt
+map qfe0 192.168.6.0/24 -> 192.168.7.2/32
diff --git a/contrib/netbsd-tests/ipf/regress/ni7.ipf b/contrib/netbsd-tests/ipf/regress/ni7.ipf
new file mode 100644
index 000000000000..4151b6e666eb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni7.ipf
@@ -0,0 +1,4 @@
+block in all
+block out all
+pass in proto udp from any to any keep state
+pass in proto tcp from any to any flags S keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni7.nat b/contrib/netbsd-tests/ipf/regress/ni7.nat
new file mode 100644
index 000000000000..2a04ef7948d0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni7.nat
@@ -0,0 +1 @@
+rdr df0 2.2.2.2/32 -> 6.6.6.6
diff --git a/contrib/netbsd-tests/ipf/regress/ni8.ipf b/contrib/netbsd-tests/ipf/regress/ni8.ipf
new file mode 100644
index 000000000000..66662419934e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni8.ipf
@@ -0,0 +1 @@
+pass in quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni8.nat b/contrib/netbsd-tests/ipf/regress/ni8.nat
new file mode 100644
index 000000000000..1d0018cb34fa
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni8.nat
@@ -0,0 +1 @@
+rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/ni9.ipf b/contrib/netbsd-tests/ipf/regress/ni9.ipf
new file mode 100644
index 000000000000..66662419934e
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni9.ipf
@@ -0,0 +1 @@
+pass in quick proto tcp from any to any flags S/SAFR keep state
diff --git a/contrib/netbsd-tests/ipf/regress/ni9.nat b/contrib/netbsd-tests/ipf/regress/ni9.nat
new file mode 100644
index 000000000000..8c36bc8701a5
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/ni9.nat
@@ -0,0 +1 @@
+rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp
diff --git a/contrib/netbsd-tests/ipf/regress/p1.ipf b/contrib/netbsd-tests/ipf/regress/p1.ipf
new file mode 100644
index 000000000000..acaf639ac1fb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p1.ipf
@@ -0,0 +1 @@
+pass in from pool/100 to any
diff --git a/contrib/netbsd-tests/ipf/regress/p1.pool b/contrib/netbsd-tests/ipf/regress/p1.pool
new file mode 100644
index 000000000000..aa262a7704ce
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p1.pool
@@ -0,0 +1,2 @@
+table role = ipf type = tree number = 100
+	{ 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; ef00::5/128; };
diff --git a/contrib/netbsd-tests/ipf/regress/p10.nat b/contrib/netbsd-tests/ipf/regress/p10.nat
new file mode 100644
index 000000000000..3c3fa7c1874f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p10.nat
@@ -0,0 +1 @@
+rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers;
diff --git a/contrib/netbsd-tests/ipf/regress/p10.pool b/contrib/netbsd-tests/ipf/regress/p10.pool
new file mode 100644
index 000000000000..2be554aadc82
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p10.pool
@@ -0,0 +1,2 @@
+pool nat/dstlist (name servers; policy hash;)
+	{ 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; };
diff --git a/contrib/netbsd-tests/ipf/regress/p11.nat b/contrib/netbsd-tests/ipf/regress/p11.nat
new file mode 100644
index 000000000000..3c3fa7c1874f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p11.nat
@@ -0,0 +1 @@
+rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers;
diff --git a/contrib/netbsd-tests/ipf/regress/p11.pool b/contrib/netbsd-tests/ipf/regress/p11.pool
new file mode 100644
index 000000000000..a79d9ea58098
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p11.pool
@@ -0,0 +1,2 @@
+pool nat/dstlist (name servers; policy dst-hash;)
+	{ 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; };
diff --git a/contrib/netbsd-tests/ipf/regress/p12.nat b/contrib/netbsd-tests/ipf/regress/p12.nat
new file mode 100644
index 000000000000..3c3fa7c1874f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p12.nat
@@ -0,0 +1 @@
+rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers;
diff --git a/contrib/netbsd-tests/ipf/regress/p12.pool b/contrib/netbsd-tests/ipf/regress/p12.pool
new file mode 100644
index 000000000000..c9afcda840cd
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p12.pool
@@ -0,0 +1,2 @@
+pool nat/dstlist (name servers; policy src-hash;)
+	{ 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; };
diff --git a/contrib/netbsd-tests/ipf/regress/p13.ipf b/contrib/netbsd-tests/ipf/regress/p13.ipf
new file mode 100644
index 000000000000..acaf639ac1fb
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p13.ipf
@@ -0,0 +1 @@
+pass in from pool/100 to any
diff --git a/contrib/netbsd-tests/ipf/regress/p13.pool b/contrib/netbsd-tests/ipf/regress/p13.pool
new file mode 100644
index 000000000000..de80f72d5b8b
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p13.pool
@@ -0,0 +1,2 @@
+table role = all type = tree number = 100
+	{ 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; ef00::5/128; };
diff --git a/contrib/netbsd-tests/ipf/regress/p2.ipf b/contrib/netbsd-tests/ipf/regress/p2.ipf
new file mode 100644
index 000000000000..4cfb388e82d6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p2.ipf
@@ -0,0 +1,2 @@
+pass out from hash=(127.0.0.1,4.4.0.0/16) to any
+block in from hash=(127.0.0.1,4.4.0.0/16) to any
diff --git a/contrib/netbsd-tests/ipf/regress/p3.ipf b/contrib/netbsd-tests/ipf/regress/p3.ipf
new file mode 100644
index 000000000000..a598d88168c9
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p3.ipf
@@ -0,0 +1,6 @@
+call now srcgrpmap/1010 in all
+call now dstgrpmap/2010 out all
+pass in all group 1020
+block in all group 1030
+pass out all group 2020
+block out all group 2040
diff --git a/contrib/netbsd-tests/ipf/regress/p3.pool b/contrib/netbsd-tests/ipf/regress/p3.pool
new file mode 100644
index 000000000000..3fadd59d3e1c
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p3.pool
@@ -0,0 +1,4 @@
+group-map in role = ipf number = 1010
+	{ 1.1.1.1/32, group = 1020; 3.3.0.0/16, group = 1030; };
+group-map out role = ipf number = 2010 group = 2020
+	{ 2.2.2.2/32; 4.4.0.0/16; 5.0.0.0/8, group = 2040; };
diff --git a/contrib/netbsd-tests/ipf/regress/p4.nat b/contrib/netbsd-tests/ipf/regress/p4.nat
new file mode 100644
index 000000000000..d504ac90c467
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p4.nat
@@ -0,0 +1 @@
+map * from pool/100 to any -> 1.2.3.4/32
diff --git a/contrib/netbsd-tests/ipf/regress/p4.pool b/contrib/netbsd-tests/ipf/regress/p4.pool
new file mode 100644
index 000000000000..6ed0e499ac5a
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p4.pool
@@ -0,0 +1,2 @@
+table role = nat type = tree number = 100
+	{ 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; };
diff --git a/contrib/netbsd-tests/ipf/regress/p5.ipf b/contrib/netbsd-tests/ipf/regress/p5.ipf
new file mode 100644
index 000000000000..ada9f56f0f72
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p5.ipf
@@ -0,0 +1 @@
+pass in from pool/letters to any
diff --git a/contrib/netbsd-tests/ipf/regress/p5.pool b/contrib/netbsd-tests/ipf/regress/p5.pool
new file mode 100644
index 000000000000..9a8eaa3003d7
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p5.pool
@@ -0,0 +1,2 @@
+table role = ipf type = tree name = letters
+	{ 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; };
diff --git a/contrib/netbsd-tests/ipf/regress/p6.ipf b/contrib/netbsd-tests/ipf/regress/p6.ipf
new file mode 100644
index 000000000000..b9b89374eede
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p6.ipf
@@ -0,0 +1 @@
+block in from pool/microsoft to any
diff --git a/contrib/netbsd-tests/ipf/regress/p6.pool b/contrib/netbsd-tests/ipf/regress/p6.pool
new file mode 100644
index 000000000000..83e818ced5b0
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p6.pool
@@ -0,0 +1 @@
+pool ipf/tree (name microsoft;) { whois file "regress/p6.whois"; };
diff --git a/contrib/netbsd-tests/ipf/regress/p6.whois b/contrib/netbsd-tests/ipf/regress/p6.whois
new file mode 100644
index 000000000000..284244e11b8f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p6.whois
@@ -0,0 +1,241 @@
+# This query resulted in more than 256 records. Remaining results
+# have been truncated. For more specific results, go to
+# http://ws.arin.net/whois for help in refining your query.
+Microsoft Corp (MSFT) 
+Microsoft Corp., MSN Operations (MCMO) 
+MICROSOFT CORPORATION (MICRO-101) 
+MICROSOFT CORPORATION (MICRO-97) 
+MICROSOFT CORPORATION (MICRO-100) 
+Microsoft Corporation (MICRO-111) 
+MICROSOFT CORPORATION (MICRO-117) 
+Microsoft Corporation  (ZM23-ARIN)     noc@microsoft.com +1-425-882-8080
+Microsoft  (ZM39-ARIN)     noc@microsoft.com +1-425-882-8080
+Microsoft Corp (AS8068) MICROSOFT-CORP---MSN-AS-BLOCK    8068 - 8075
+Microsoft Corp (AS13811) MSLI    13811 
+Microsoft Corp (AS14719) MICROSOFT-CORP-BCENTRAL    14719 
+Microsoft Corp (AS3598) MICROSOFT-CORP-AS    3598 
+Microsoft Corp (AS5761) MICROSOFT-CORP---MSN-AS---SATURN    5761 
+Microsoft Corp (AS6182) MICROSOFT-CORP--MSN-AS-4    6182 
+Microsoft Corp (AS6194) MICROSOFT-CORP--MSN-AS-3    6194 
+Microsoft Corp (AS6291) MICROSOFT-CORP---MSN-AS    6291 
+Microsoft Corp (AS13399) MICROSOFT-CORP---MSN-AS-2    13399 
+Microsoft Corp (AS23468) MICROSOFT-CORP-XBOX-ONLINE    23468 
+Microsoft Corp MICROSOFT (NET-131-107-0-0-1) 131.107.0.0 - 131.107.255.255
+Microsoft Corp MICROSOFT-VEXCEL (NET-192-92-90-0-1) 192.92.90.0 - 192.92.90.255
+Microsoft Corp NETBLK-MSOFT-NET (NET-198-105-232-0-1) 198.105.232.0 - 198.105.235.255
+Microsoft Corp MICROSOFT19-NET58 (NET-204-231-58-0-1) 204.231.58.0 - 204.231.58.255
+Microsoft Corp MICROSOFT15 (NET-204-140-77-0-1) 204.140.77.0 - 204.140.77.255
+Microsoft Corp MICROSOFT16 (NET-204-140-80-0-1) 204.140.80.0 - 204.140.83.255
+Microsoft Corp MICROSOFT-CORP-MSN-1 (NET-199-60-28-0-1) 199.60.28.0 - 199.60.28.255
+Microsoft Corp MICROSOFT-1 (NET-199-103-90-0-1) 199.103.90.0 - 199.103.91.255
+Microsoft Corp MICROSOFT-CORP-MSN-3 (NET-199-103-122-0-1) 199.103.122.0 - 199.103.122.255
+Microsoft Corp MICROSOFT8 (NET-204-79-101-0-1) 204.79.101.0 - 204.79.101.255
+Microsoft Corp MICROSOFT18 (NET-192-237-67-0-1) 192.237.67.0 - 192.237.67.255
+Microsoft Corp MICROSOFT19 (NET-198-137-97-0-1) 198.137.97.0 - 198.137.97.255
+Microsoft Corp MICROSOFT-HK (NET-204-79-135-0-1) 204.79.135.0 - 204.79.135.255
+Microsoft Corp MICROSOFT-PLACEWARE-1 (NET-204-79-179-0-1) 204.79.179.0 - 204.79.179.255
+Microsoft Corp MICROSOFT11 (NET-204-79-180-0-1) 204.79.180.0 - 204.79.181.255
+Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-188-0-1) 204.79.188.0 - 204.79.188.255
+Microsoft Corp MICROSOFT13 (NET-204-79-195-0-1) 204.79.195.0 - 204.79.197.255
+Microsoft Corp MICROSOFT17 (NET-199-6-92-0-1) 199.6.92.0 - 199.6.94.255
+Microsoft Corp MICROSOFT-2 (NET-204-79-7-0-1) 204.79.7.0 - 204.79.7.255
+Microsoft Corp MICROSOFT-NET1 (NET-204-79-27-0-1) 204.79.27.0 - 204.79.27.255
+Microsoft Corp MICROSOFT2 (NET-198-180-74-0-1) 198.180.74.0 - 198.180.75.255
+Microsoft Corp MICROSOFT3 (NET-198-180-95-0-1) 198.180.95.0 - 198.180.97.255
+Microsoft Corp MICROSOFT28 (NET-204-231-236-0-1) 204.231.236.0 - 204.231.236.255
+Microsoft Corp MICROSOFT29 (NET-205-248-10-0-1) 205.248.10.0 - 205.248.15.255
+Microsoft Corp SPRINT-CDA33F (NET-205-163-63-0-1) 205.163.63.0 - 205.163.63.255
+Microsoft Corp SPRINT-CDA33E (NET-205-163-62-0-1) 205.163.62.0 - 205.163.62.255
+Microsoft Corp SPRINT-CDA39F (NET-205-163-144-0-1) 205.163.144.0 - 205.163.159.255
+Microsoft Corp MICROSOFT30 (NET-205-248-41-0-1) 205.248.41.0 - 205.248.43.255
+Microsoft Corp MICROSOFT31 (NET-205-248-50-0-1) 205.248.50.0 - 205.248.51.255
+Microsoft Corp MICROSOFT32 (NET-205-248-61-0-1) 205.248.61.0 - 205.248.63.255
+Microsoft Corp MICROSOFT34 (NET-205-248-72-0-1) 205.248.72.0 - 205.248.72.255
+Microsoft Corp MICROSOFT35 (NET-205-248-212-0-1) 205.248.212.0 - 205.248.215.255
+Microsoft Corp MICROSOFT36 (NET-205-248-228-0-1) 205.248.228.0 - 205.248.228.255
+Microsoft Corp MICROSOFT37 (NET-205-248-235-0-1) 205.248.235.0 - 205.248.235.255
+Microsoft Corp MICROSOFT20 (NET-204-231-76-0-1) 204.231.76.0 - 204.231.76.255
+Microsoft Corp MICROSOFT26 (NET-204-231-192-0-1) 204.231.192.0 - 204.231.192.255
+Microsoft Corp MICROSOFT27 (NET-204-231-194-0-1) 204.231.194.0 - 204.231.223.255
+Microsoft Corp SOCRATIC (NET-207-78-80-0-1) 207.78.80.0 - 207.78.80.255
+Microsoft Corp DAVELADD (NET-207-78-81-0-1) 207.78.81.0 - 207.78.81.255
+Microsoft Corp RSEGAL (NET-207-78-82-0-1) 207.78.82.0 - 207.78.82.255
+Microsoft Corp MICROSOFT44 (NET-205-248-243-0-1) 205.248.243.0 - 205.248.244.255
+Microsoft Corp MICROSOFT48 (NET-207-117-3-0-1) 207.117.3.0 - 207.117.3.255
+Microsoft Corp UU-207-18-117 (NET-207-18-117-0-1) 207.18.117.0 - 207.18.117.255
+Microsoft Corp CW-208-139-27-B (NET-208-139-27-0-1) 208.139.27.0 - 208.139.27.255
+Microsoft Corp MICROSOFT55 (NET-209-28-213-0-1) 209.28.213.0 - 209.28.213.255
+Microsoft Corp MICROSOFT50 (NET-207-209-68-0-1) 207.209.68.0 - 207.209.68.255
+Microsoft Corp SPRINT-CC5F6F (NET-204-95-96-0-1) 204.95.96.0 - 204.95.111.255
+Microsoft Corp CYBR-LCCLAB (NET-207-158-93-192-1) 207.158.93.192 - 207.158.93.223
+Microsoft Corp MSBPN-2 (NET-207-240-123-192-1) 207.240.123.192 - 207.240.123.223
+Microsoft Corp SPRINT-D01ACD (NET-208-26-205-0-1) 208.26.205.0 - 208.26.205.255
+Microsoft Corp MICROSOFT-CORP-MSN-2 (NET-192-197-157-0-1) 192.197.157.0 - 192.197.157.255
+Microsoft Corp MICROSOFTDENVER (NET-204-133-231-0-1) 204.133.231.0 - 204.133.231.255
+Microsoft Corp MICROSOFTG1-COM (NET-216-72-96-0-1) 216.72.96.0 - 216.72.99.255
+Microsoft Corp EACT-CUST-JLEZNEK (NET-207-229-166-152-1) 207.229.166.152 - 207.229.166.159
+Microsoft Corp SPRINT-CC5F95-8 (NET-204-95-149-0-1) 204.95.149.0 - 204.95.149.255
+Microsoft Corp NET-CSAMSI (NET-209-192-213-72-1) 209.192.213.72 - 209.192.213.79
+Microsoft Corp MICROSOFT57 (NET-206-73-203-0-1) 206.73.203.0 - 206.73.203.255
+Microsoft Corp MICROSOFT56 (NET-206-73-118-0-1) 206.73.118.0 - 206.73.118.255
+Microsoft Corp QWEST-208-45-54-16 (NET-208-45-54-16-1) 208.45.54.16 - 208.45.54.23
+Microsoft Corp QWEST-208-45-54-8 (NET-208-45-54-8-1) 208.45.54.8 - 208.45.54.15
+Microsoft Corp MICROSOFT58 (NET-206-73-31-0-1) 206.73.31.0 - 206.73.31.255
+Microsoft Corp SPRINT-3FA132 (NET-63-161-50-128-1) 63.161.50.128 - 63.161.50.255
+Microsoft Corp SPRINT-3FA132-6 (NET-63-161-50-0-1) 63.161.50.0 - 63.161.50.127
+Microsoft Corp MICROSOFT-8-18 (NET-207-240-8-224-1) 207.240.8.224 - 207.240.8.239
+Microsoft Corp MICROSOFT-BBLK (NET-157-54-0-0-1) 157.54.0.0 - 157.60.255.255
+Microsoft Corp QWEST-208-45-89-248A (NET-208-45-89-248-1) 208.45.89.248 - 208.45.89.255
+Microsoft Corp MICROSOFT61 (NET-206-182-69-0-1) 206.182.69.0 - 206.182.69.255
+Microsoft Corp MICROSOFT63 (NET-206-182-240-0-1) 206.182.240.0 - 206.182.240.255
+Microsoft Corp MICROSOFT64 (NET-206-182-241-0-1) 206.182.241.0 - 206.182.241.255
+Microsoft Corp MICROSOFT59 (NET-206-73-67-0-1) 206.73.67.0 - 206.73.67.255
+Microsoft Corp MICROSOFT66 (NET-206-182-251-0-1) 206.182.251.0 - 206.182.251.255
+Microsoft Corp MICROSOFT65 (NET-206-182-247-0-1) 206.182.247.0 - 206.182.247.255
+Microsoft Corp MICROSOFT62 (NET-206-182-236-0-1) 206.182.236.0 - 206.182.236.255
+Microsoft Corp QWEST-63-236-198-64 (NET-63-236-198-64-1) 63.236.198.64 - 63.236.198.71
+Microsoft Corp QWEST-63-236-198-152 (NET-63-236-198-152-1) 63.236.198.152 - 63.236.198.159
+Microsoft Corp ERMS-6799349 (NET-165-121-253-232-1) 165.121.253.232 - 165.121.253.239
+Microsoft Corp QWEST-63-236-170-64 (NET-63-236-170-64-1) 63.236.170.64 - 63.236.170.71
+Microsoft Corp QWEST-63-236-186-64 (NET-63-236-186-64-1) 63.236.186.64 - 63.236.186.71
+Microsoft Corp QWEST-63-236-187-104 (NET-63-236-187-104-1) 63.236.187.104 - 63.236.187.111
+Microsoft Corp QWEST-63-236-187-128 (NET-63-236-187-128-1) 63.236.187.128 - 63.236.187.135
+Microsoft Corp QWEST-63-236-187-160 (NET-63-236-187-160-1) 63.236.187.160 - 63.236.187.167
+Microsoft Corp FON-3338832128690 (NET-199-2-137-0-1) 199.2.137.0 - 199.2.137.255
+Microsoft Corp CUST-86-24614 (NET-216-222-104-224-1) 216.222.104.224 - 216.222.104.239
+Microsoft Corp QWEST-63-151-87-64 (NET-63-151-87-64-1) 63.151.87.64 - 63.151.87.71
+Microsoft Corp HP-64-77-82-96 (NET-64-77-82-96-1) 64.77.82.96 - 64.77.82.103
+Microsoft Corp HP-64-77-93-80 (NET-64-77-93-80-1) 64.77.93.80 - 64.77.93.95
+Microsoft Corp MICROSOFT-1BLK (NET-65-52-0-0-1) 65.52.0.0 - 65.55.255.255
+Microsoft Corp MICROSOFT-GLOBAL-NET (NET-207-46-0-0-1) 207.46.0.0 - 207.46.255.255
+Microsoft Corp MICROSOFT-CORP-MSN-BLK (NET-207-68-128-0-1) 207.68.128.0 - 207.68.207.255
+Microsoft Corp FON-343451648081865 (NET-204-182-144-0-1) 204.182.144.0 - 204.182.159.255
+Microsoft Corp FON-346312755281299 (NET-206-107-34-0-1) 206.107.34.0 - 206.107.34.255
+Microsoft Corp FON-34550983681918 (NET-205-240-158-0-1) 205.240.158.0 - 205.240.159.255
+Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-252-0-1) 204.79.252.0 - 204.79.252.255
+Microsoft Corp WLCO-TWC1057147-MICROSOFT (NET-64-200-211-16-1) 64.200.211.16 - 64.200.211.31
+Microsoft Corp MICROSOF81-163-0 (NET-12-178-163-0-1) 12.178.163.0 - 12.178.163.31
+Microsoft Corp WLCO-TWC1057147-MICROSOFT-1 (NET-69-44-126-80-1) 69.44.126.80 - 69.44.126.95
+Microsoft Corp SPRINTLINK (NET-63-173-42-128-1) 63.173.42.128 - 63.173.42.255
+Microsoft Corp MICROSOF33-108-0 (NET-12-28-108-0-1) 12.28.108.0 - 12.28.108.127
+Microsoft Corp SPRINTLINK (NET-65-170-29-0-1) 65.170.29.0 - 65.170.29.7
+Microsoft Corp Q0903-67-132-133-96 (NET-67-132-133-96-1) 67.132.133.96 - 67.132.133.103
+Microsoft Corp MICROSOFT-IPV6-BLK (NET6-2001-4898-1) 2001:4898:0000:0000:0000:0000:0000:0000 - 2001:4898:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
+Microsoft Corp LVLT-MSFT-8-6-176 (NET-8-6-176-0-1) 8.6.176.0 - 8.6.176.255
+Microsoft Corp MICROSOFT33 (NET-205-248-80-0-1) 205.248.80.0 - 205.248.129.255
+Microsoft Corp Q0523-63-148-123-240 (NET-63-148-123-240-1) 63.148.123.240 - 63.148.123.247
+Microsoft Corp SAVV-S233608-1 (NET-64-41-193-0-1) 64.41.193.0 - 64.41.193.255
+Microsoft Corp SAVV-S233053-1 (NET-64-85-70-32-1) 64.85.70.32 - 64.85.70.47
+Microsoft Corp SAVV-S233053-2 (NET-64-85-81-96-1) 64.85.81.96 - 64.85.81.103
+Microsoft Corp SAVV-S233053-3 (NET-64-85-81-104-1) 64.85.81.104 - 64.85.81.111
+Microsoft Corp SAVV-S233053-7 (NET-216-32-168-224-1) 216.32.168.224 - 216.32.168.255
+Microsoft Corp SAVV-S233053-6 (NET-206-79-74-32-1) 206.79.74.32 - 206.79.74.47
+Microsoft Corp SAVV-S233053-8 (NET-216-32-175-224-1) 216.32.175.224 - 216.32.175.255
+Microsoft Corp SAVV-S233053-9 (NET-216-32-180-0-1) 216.32.180.0 - 216.32.183.255
+Microsoft Corp SAVV-S233053-11 (NET-216-33-229-224-1) 216.33.229.224 - 216.33.229.255
+Microsoft Corp SAVV-S233053-12 (NET-216-33-236-0-1) 216.33.236.0 - 216.33.239.255
+Microsoft Corp SAVV-S233053-13 (NET-216-33-240-0-1) 216.33.240.0 - 216.33.243.255
+Microsoft Corp SAVV-S233053-10 (NET-216-32-240-0-1) 216.32.240.0 - 216.32.243.255
+Microsoft Corp SAVV-S233608-3 (NET-216-34-51-0-1) 216.34.51.0 - 216.34.51.255
+Microsoft Corp SAVV-S233053-4 (NET-209-1-112-0-1) 209.1.112.0 - 209.1.112.255
+Microsoft Corp SAVV-S233053-5 (NET-209-1-113-0-1) 209.1.113.0 - 209.1.113.255
+Microsoft Corp SAVV-S233608-2 (NET-209-1-15-0-1) 209.1.15.0 - 209.1.15.255
+Microsoft Corp SAVV-S233608-4 (NET-216-34-53-176-1) 216.34.53.176 - 216.34.53.191
+Microsoft Corp SAVV-S233608-5 (NET-216-35-8-224-1) 216.35.8.224 - 216.35.8.239
+Microsoft Corp SAVV-S233053-14 (NET-209-185-128-0-1) 209.185.128.0 - 209.185.131.255
+Microsoft Corp Q0112-65-114-175-128 (NET-65-114-175-128-1) 65.114.175.128 - 65.114.175.159
+Microsoft Corp SAVV-S233053-15 (NET-64-15-229-96-1) 64.15.229.96 - 64.15.229.127
+Microsoft Corp SAVV-S233050-5 (NET-64-15-177-0-1) 64.15.177.0 - 64.15.177.255
+Microsoft Corp SAVV-S233050-4 (NET-64-15-170-192-1) 64.15.170.192 - 64.15.170.199
+Microsoft Corp SAVV-S233050-2 (NET-209-143-238-0-1) 209.143.238.0 - 209.143.238.255
+Microsoft Corp SAVV-S233050-6 (NET-64-15-178-0-1) 64.15.178.0 - 64.15.178.255
+Microsoft Corp SAVV-S232995-2 (NET-66-35-209-120-1) 66.35.209.120 - 66.35.209.127
+Microsoft Corp SAVV-S232995-3 (NET-66-35-211-128-1) 66.35.211.128 - 66.35.211.191
+Microsoft Corp SAVV-S232995-1 (NET-66-35-208-48-1) 66.35.208.48 - 66.35.208.63
+Microsoft Corp SAVV-S233053-16 (NET-216-33-148-0-1) 216.33.148.0 - 216.33.151.255
+Microsoft Corp., MSN Operations SAVV-S233052-4 (NET-216-35-66-88-1) 216.35.66.88 - 216.35.66.95
+MICROSOFT CORPORATION MICROSOF32-32-160 (NET-12-230-32-160-1) 12.230.32.160 - 12.230.32.167
+MICROSOFT CORPORATION MICROSOF43-124-0 (NET-12-53-124-0-1) 12.53.124.0 - 12.53.124.31
+MICROSOFT CORPORATION MICROSOF82-18-96 (NET-12-232-18-96-1) 12.232.18.96 - 12.232.18.127
+MICROSOFT CORPORATION MICROSOF25-158 (NET-12-190-158-0-1) 12.190.158.0 - 12.190.158.255
+MICROSOFT CORPORATION MICROSOF61-196-32 (NET-12-71-196-32-1) 12.71.196.32 - 12.71.196.47
+Microsoft Corporation MICROSOFT-ONLINE-SERVICES (NET-209-240-192-0-1) 209.240.192.0 - 209.240.223.255
+Microsoft Corporation MICROSOFT-DYNAMIC-HOSTING (NET-70-37-0-0-1) 70.37.0.0 - 70.37.191.255
+Microsoft Corporation MS-ONLINE-SERVICES-NJ (NET-70-37-128-0-1) 70.37.128.0 - 70.37.129.255
+Microsoft Corporation MS-GLOBAL-ONLINE-SERVICES (NET-70-37-135-0-1) 70.37.135.0 - 70.37.135.255
+MICROSOFT CORPORATION MICROSOF82-87-192 (NET-12-49-87-192-1) 12.49.87.192 - 12.49.87.255
+Microsoft MICROSOFT (NET-74-93-205-144-1) 74.93.205.144 - 74.93.205.151
+Microsoft MICROSOFT (NET-74-93-205-152-1) 74.93.205.152 - 74.93.205.159
+Microsoft MICROSOFT (NET-74-93-206-64-1) 74.93.206.64 - 74.93.206.71
+Microsoft MICROSOFT (NET-70-89-139-120-1) 70.89.139.120 - 70.89.139.127
+Microsoft DIRECP-NET1-206-71-11 (NET-206-71-119-0-1) 206.71.119.0 - 206.71.119.255
+Microsoft DIRECP-NET1-117 (NET-206-71-117-0-1) 206.71.117.0 - 206.71.117.255
+Microsoft DIRECP-NET1-118 (NET-206-71-118-0-1) 206.71.118.0 - 206.71.118.255
+Microsoft UUHIL-BLK1-C155-112 (NET-209-154-155-112-1) 209.154.155.112 - 209.154.155.119
+Microsoft SBCIS-101411-164355 (NET-65-68-62-152-1) 65.68.62.152 - 65.68.62.159
+MICROSOFT SBC067039208168020503 (NET-67-39-208-168-1) 67.39.208.168 - 67.39.208.175
+Microsoft UU-65-242-67 (NET-65-242-67-0-1) 65.242.67.0 - 65.242.67.255
+Microsoft CW-204-71-191-0 (NET-204-71-191-0-1) 204.71.191.0 - 204.71.191.255
+Microsoft SBC063194155144021023 (NET-63-194-155-144-1) 63.194.155.144 - 63.194.155.151
+Microsoft SBC066136085192030113 (NET-66-136-85-192-1) 66.136.85.192 - 66.136.85.199
+MICROSOFT MFN-T280-64-124-184-72-29 (NET-64-124-184-72-1) 64.124.184.72 - 64.124.184.79
+MICROSOFT MFN-T133-216-200-206-0-24 (NET-216-200-206-0-1) 216.200.206.0 - 216.200.206.255
+Microsoft UU-63-80-93-D4 (NET-63-80-93-0-1) 63.80.93.0 - 63.80.93.127
+Microsoft RSPC-1218167167199384 (NET-67-192-225-208-1) 67.192.225.208 - 67.192.225.223
+Microsoft CVNET-454AA20 (NET-69-74-162-0-1) 69.74.162.0 - 69.74.162.255
+Microsoft UU-65-221-5 (NET-65-221-5-0-1) 65.221.5.0 - 65.221.5.255
+Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-192-1) 216.182.89.192 - 216.182.89.207
+Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-48-1) 216.182.89.48 - 216.182.89.63
+MICROSOFT AUSTIN-STO UU-65-248-85-D4 (NET-65-248-85-0-1) 65.248.85.0 - 65.248.85.255
+Microsoft Canada MIC0923-CA (NET-199-243-157-192-1) 199.243.157.192 - 199.243.157.223
+Microsoft Canada MIC0702-CA (NET-199-243-157-112-1) 199.243.157.112 - 199.243.157.119
+Microsoft Corp UU-65-194-210-224 (NET-65-194-210-224-1) 65.194.210.224 - 65.194.210.255
+Microsoft Corp UU-208-194-139 (NET-208-194-139-0-1) 208.194.139.0 - 208.194.139.255
+Microsoft Corp UU-208-204-49-128-B (NET-208-204-49-128-1) 208.204.49.128 - 208.204.49.255
+Microsoft Corp UU-208-205-26 (NET-208-205-26-0-1) 208.205.26.0 - 208.205.26.255
+Microsoft Corp UU-208-217-184-D1 (NET-208-217-184-0-1) 208.217.184.0 - 208.217.187.255
+Microsoft Corp UU-208-222-172 (NET-208-222-172-0-1) 208.222.172.0 - 208.222.172.255
+Microsoft Corp UU-208-224-200-64 (NET-208-224-200-64-1) 208.224.200.64 - 208.224.200.95
+Microsoft Corp UU-208-229-100-D1 (NET-208-229-100-0-1) 208.229.100.0 - 208.229.101.255
+Microsoft Corp UU-208-241-19 (NET-208-241-19-0-1) 208.241.19.0 - 208.241.19.15
+Microsoft Corp UU-208-241-19-16 (NET-208-241-19-16-1) 208.241.19.16 - 208.241.19.31
+Microsoft Corp UU-208-241-9-224 (NET-208-241-9-224-1) 208.241.9.224 - 208.241.9.239
+Microsoft Corp UU-208-244-108-D2 (NET-208-244-108-0-1) 208.244.108.0 - 208.244.108.15
+Microsoft Corp UU-208-245-16 (NET-208-245-16-0-1) 208.245.16.0 - 208.245.16.31
+Microsoft Corp UU-208-249-17-160 (NET-208-249-17-160-1) 208.249.17.160 - 208.249.17.175
+Microsoft Corp UU-63-104-216-D2 (NET-63-104-216-0-1) 63.104.216.0 - 63.104.216.127
+Microsoft Corp UU-63-69-245 (NET-63-69-245-0-1) 63.69.245.0 - 63.69.245.255
+Microsoft Corp SBC068090141072031030 (NET-68-90-141-72-1) 68.90.141.72 - 68.90.141.79
+Microsoft Corp 10825385 SBC06319812316029040317151513 (NET-63-198-123-160-1) 63.198.123.160 - 63.198.123.167
+MICROSOFT CORP-040821020257 SBC06824804806429040821020303 (NET-68-248-48-64-1) 68.248.48.64 - 68.248.48.71
+MICROSOFT CORP-040821020338 SBC06824804807229040821020347 (NET-68-248-48-72-1) 68.248.48.72 - 68.248.48.79
+MICROSOFT CORP-081024181821 SBC-99-49-8-248-29-0810241850 (NET-99-49-8-248-1) 99.49.8.248 - 99.49.8.255
+Microsoft Corp. HUGE-65-38-172-72-29 (NET-65-38-172-72-1) 65.38.172.72 - 65.38.172.79
+Microsoft Corp. HUGE-65-38-172-96-28 (NET-65-38-172-96-1) 65.38.172.96 - 65.38.172.111
+Microsoft Corporation MICROSOFT-CORPORATION (NET-75-149-174-16-1) 75.149.174.16 - 75.149.174.23
+Microsoft Corporation MICROSOFT-CORPORATION (NET-75-151-100-240-1) 75.151.100.240 - 75.151.100.255
+Microsoft Corporation SPEK-647057-0 (NET-64-81-8-96-1) 64.81.8.96 - 64.81.8.127
+Microsoft Corporation SBC067112255144030130 (NET-67-112-255-144-1) 67.112.255.144 - 67.112.255.151
+Microsoft Corporation ATTENS-010075-004522 (NET-63-240-201-176-1) 63.240.201.176 - 63.240.201.191
+Microsoft Corporation ATTENS-010075-004523 (NET-206-16-209-208-1) 206.16.209.208 - 206.16.209.223
+Microsoft Corporation ATTENS-010075-004525 (NET-63-240-195-208-1) 63.240.195.208 - 63.240.195.223
+Microsoft Corporation ATTENS-010075-004526 (NET-206-16-204-64-1) 206.16.204.64 - 206.16.204.79
+Microsoft Corporation ATTENS-010075-004450 (NET-206-16-223-0-1) 206.16.223.0 - 206.16.223.255
+Microsoft Corporation ATTENS-010075-005028 (NET-63-240-216-0-1) 63.240.216.0 - 63.240.219.255
+Microsoft Corporation ATTENS-010075-005057 (NET-63-240-220-0-1) 63.240.220.0 - 63.240.223.255
+Microsoft Corporation ATTENS-010075-005135 (NET-206-16-246-24-1) 206.16.246.24 - 206.16.246.31
+Microsoft Corporation ATTENS-010075-004524 (NET-63-240-195-192-1) 63.240.195.192 - 63.240.195.207
+Microsoft Corporation ATTENS-010075-005880 (NET-206-16-224-160-1) 206.16.224.160 - 206.16.224.191
+Microsoft Corporation (managed segment) RSPC-1229444888833780 (NET-98-129-187-144-1) 98.129.187.144 - 98.129.187.151
+Microsoft Corporation - Secure Dimensions ( RSPC-33955-12072007 (NET-67-192-39-48-1) 67.192.39.48 - 67.192.39.63
+Microsoft Corporation - Whale RSPC-108457-1170047010 (NET-72-32-240-160-1) 72.32.240.160 - 72.32.240.175
+Microsoft Corporation - Whale RSPC-108456-1173386392 (NET-72-32-201-152-1) 72.32.201.152 - 72.32.201.159
+MICROSOFT CROP SBC067039081152020503 (NET-67-39-81-152-1) 67.39.81.152 - 67.39.81.159
+Microsoft Education Programs RSPC-48725-1096578571 (NET-69-20-127-32-1) 69.20.127.32 - 69.20.127.39
+Microsoft License PNAP-SFJ-MSLI-RM-01 (NET-216-52-28-0-1) 216.52.28.0 - 216.52.28.255
+Microsoft License INAP-PHX003-MSLICENSE-25271 (NET-70-42-230-0-1) 70.42.230.0 - 70.42.231.255
+Microsoft License INAP-SFJ-MSLICENSE-13982 (NET-63-251-97-0-1) 63.251.97.0 - 63.251.97.255
+Microsoft Licensing SBC067120132128020815 (NET-67-120-132-128-1) 67.120.132.128 - 67.120.132.135
+Microsoft Licensing SBC067120132152020815 (NET-67-120-132-152-1) 67.120.132.152 - 67.120.132.159
+Microsoft Licensing SBC067120132192020816 (NET-67-120-132-192-1) 67.120.132.192 - 67.120.132.207
+Microsoft Licensing SBC0671201322080208
diff --git a/contrib/netbsd-tests/ipf/regress/p7.nat b/contrib/netbsd-tests/ipf/regress/p7.nat
new file mode 100644
index 000000000000..3c3fa7c1874f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p7.nat
@@ -0,0 +1 @@
+rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers;
diff --git a/contrib/netbsd-tests/ipf/regress/p7.pool b/contrib/netbsd-tests/ipf/regress/p7.pool
new file mode 100644
index 000000000000..451b374dfd1f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p7.pool
@@ -0,0 +1,2 @@
+pool nat/dstlist (name servers; policy weighted connection;)
+	{ 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; };
diff --git a/contrib/netbsd-tests/ipf/regress/p9.nat b/contrib/netbsd-tests/ipf/regress/p9.nat
new file mode 100644
index 000000000000..3c3fa7c1874f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p9.nat
@@ -0,0 +1 @@
+rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers;
diff --git a/contrib/netbsd-tests/ipf/regress/p9.pool b/contrib/netbsd-tests/ipf/regress/p9.pool
new file mode 100644
index 000000000000..c452ffc681b6
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/regress/p9.pool
@@ -0,0 +1,2 @@
+pool nat/dstlist (name servers; policy round-robin;)
+	{ 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; };
diff --git a/contrib/netbsd-tests/ipf/t_bpf.sh b/contrib/netbsd-tests/ipf/t_bpf.sh
new file mode 100755
index 000000000000..6d7d2e88025f
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_bpf.sh
@@ -0,0 +1,68 @@
+# $NetBSD: t_bpf.sh,v 1.3 2012/11/29 16:05:34 pgoyette Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+itest()
+{
+	h_copydata $1
+
+	case $3 in
+	ipf)
+		atf_check -o file:exp -e ignore ipf -Rnvf reg
+		;;
+	ipftest)
+		atf_check -o file:exp ipftest -D -r reg -i /dev/null
+		;;
+	esac
+}
+
+bpftest()
+{
+	h_copydata $(echo ${1} | tr _ -)
+	cp "$(atf_get_srcdir)/input/$(echo ${1} | sed s,bpf_,,)" in
+
+	{ while read rule; do
+		atf_check -o save:save -x "echo '$rule' | ipftest -Rbr - -i in"
+		cat save >>out
+		echo "--------" >>out
+	done; } <reg
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+broken_test_case bpf1 itest text ipf
+broken_test_case bpf_f1 bpftest text text
+
+atf_init_test_cases()
+{
+	atf_add_test_case bpf1
+	atf_add_test_case bpf_f1
+}
diff --git a/contrib/netbsd-tests/ipf/t_filter_exec.sh b/contrib/netbsd-tests/ipf/t_filter_exec.sh
new file mode 100755
index 000000000000..e79dc903eed1
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_filter_exec.sh
@@ -0,0 +1,175 @@
+# $NetBSD: t_filter_exec.sh,v 1.8 2013/03/17 03:00:05 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+dotest()
+{
+	h_copydata $1
+	infmt=$2
+	outfmt=$3
+	shift
+	shift
+	shift
+	args=$@
+
+	if [ $outfmt = hex ] ; then
+		output=-x
+	else
+		output=
+	fi
+
+	{ while read rule; do
+		atf_check -x "echo \"$rule\" | ipftest -F \
+$infmt $output -Rbr - -i in $args >>out"
+		echo "--------" >>out
+	done; } <reg
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+mtest()
+{
+	h_copydata $1
+	infmt=$2
+	outfmt=$3
+	shift
+	shift
+	shift
+	args=$@
+
+	if [ $outfmt = hex ] ; then
+		output=-x
+	else
+		output=
+	fi
+
+
+	atf_check -o save:out ipftest -F $infmt $output -Rbr reg -i in $args
+	echo "--------" >>out
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+dotest6()
+{
+	h_copydata $(echo ${1} | tr _ .)
+	infmt=$2
+	outfmt=$3
+	shift
+	shift
+	shift
+	args=$@
+
+	if [ $outfmt = hex ] ; then
+		output=-x
+	else
+		output=
+	fi
+
+
+	ipftest -6 -r /dev/null -i /dev/null >/dev/null 2>&1 \
+	    || atf_skip "skipping IPv6 tests"
+
+	{ while read rule; do
+		atf_check -o save:save -x "echo \"$rule\" | \
+ipftest -F $infmt $output -6br - -i in $args"
+		cat save >>out
+		echo "--------" >>out
+	done; } <reg
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+test_case f1 dotest text text
+test_case f2 dotest text text
+test_case f3 dotest text text
+test_case f4 dotest text text
+test_case f5 dotest text text
+test_case f6 dotest text text
+test_case f7 dotest text text
+test_case f8 dotest text text
+test_case f9 dotest text text
+test_case f10 dotest text text
+test_case f11 dotest text text -D
+test_case f12 dotest hex hex
+test_case f13 dotest hex hex
+test_case f14 dotest text text
+test_case f15 mtest text text
+test_case f16 mtest text text
+test_case f17 mtest hex hex
+test_case f18 mtest text text -D
+test_case f19 dotest text text -T state_max=3
+test_case f20 mtest text text
+test_case f24 mtest hex text
+test_case f25 mtest hex text -D
+failing_test_case f26 dotest "Known to be broken" text text
+failing_test_case f27 dotest "Known to be broken" hex text
+test_case f30 dotest text text
+test_case ipv6_1 dotest6 hex hex
+test_case ipv6_2 dotest6 hex hex
+test_case ipv6_3 dotest6 hex hex
+test_case ipv6_5 dotest6 hex hex
+test_case ipv6_6 dotest6 hex text
+
+atf_init_test_cases()
+{
+	atf_add_test_case f1
+	atf_add_test_case f2
+	atf_add_test_case f3
+	atf_add_test_case f4
+	atf_add_test_case f5
+	atf_add_test_case f6
+	atf_add_test_case f7
+	atf_add_test_case f8
+	atf_add_test_case f9
+	atf_add_test_case f10
+	atf_add_test_case f11
+	atf_add_test_case f12
+	atf_add_test_case f13
+	atf_add_test_case f14
+	atf_add_test_case f15
+	atf_add_test_case f16
+	atf_add_test_case f17
+	atf_add_test_case f18
+	atf_add_test_case f19
+	atf_add_test_case f20
+	atf_add_test_case f24
+	atf_add_test_case f25
+	atf_add_test_case f26
+	atf_add_test_case f27
+	atf_add_test_case f30
+	atf_add_test_case ipv6_1
+	atf_add_test_case ipv6_2
+	atf_add_test_case ipv6_3
+	atf_add_test_case ipv6_5
+	atf_add_test_case ipv6_6
+
+}
diff --git a/contrib/netbsd-tests/ipf/t_filter_parse.sh b/contrib/netbsd-tests/ipf/t_filter_parse.sh
new file mode 100755
index 000000000000..f44db7d6e8e4
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_filter_parse.sh
@@ -0,0 +1,135 @@
+# $NetBSD: t_filter_parse.sh,v 1.11 2014/06/29 09:27:58 darrenr Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+itest()
+{
+	h_copydata $1
+
+	case $3 in
+	ipf)
+		atf_check -o file:exp -e ignore ipf -Rnvf reg
+		;;
+	ipftest)
+		atf_check -o file:exp ipftest -D -r reg -i /dev/null
+		;;
+	esac
+}
+
+itest_i19()
+{
+	cp "$(atf_get_srcdir)/expected/i19.dist" .
+
+	if [ "`grep LOG_SECURITY /usr/include/sys/syslog.h 2>&1`" = "" ] ; then
+		if [ "`grep LOG_AUDIT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then
+				sed -e 's/security/!!!/g' i19.dist > i19.p1;
+		else
+				sed -e 's/security/audit/g' i19.dist > i19.p1;
+		fi
+	else
+		cp i19.dist i19.p1;
+	fi
+	if [ "`grep LOG_AUTHPRIV /usr/include/sys/syslog.h 2>&1`" = "" ] ; then
+		sed -e 's/authpriv/!!!/g' i19.p1 > i19.p2;
+	else
+		cp i19.p1 i19.p2;
+	fi
+	if [ "`grep LOG_LOGALERT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then
+		sed -e 's/logalert/!!!/g' i19.p2 > i19.p1;
+	else
+		cp i19.p2 i19.p1;
+	fi
+	if [ "`grep LOG_FTP /usr/include/sys/syslog.h 2>&1`" = "" ] ; then
+		sed -e 's/ftp/!!!/g' i19.p1 > i19.p2;
+	else
+		cp i19.p1 i19.p2;
+	fi
+	if [ "`egrep 'LOG_CRON.*15' /usr/include/sys/syslog.h 2>&1`" != "" ] ; then
+		sed -e 's/cron/cron2/g' i19.p2 > i19;
+	else
+		cp i19.p2 i19;
+	fi
+	/bin/rm i19.p?
+
+	mv i19 exp
+	itest "$@"
+}
+
+test_case i1 itest text ipf
+test_case i2 itest text ipf
+test_case i3 itest text ipf
+test_case i4 itest text ipf
+test_case i5 itest text ipf
+test_case i6 itest text ipf
+test_case i7 itest text ipf
+test_case i8 itest text ipf
+test_case i9 itest text ipf
+test_case i10 itest text ipf
+test_case i11 itest text ipf
+test_case i12 itest text ipf
+test_case i13 itest text ipf
+test_case i14 itest text ipf
+test_case i15 itest text ipf
+test_case i16 itest text ipf
+failing_test_case i17 itest "Known to be broken" text ipftest
+test_case i18 itest text ipf
+test_case i19 itest_i19 text ipf
+test_case i20 itest text ipf
+test_case i21 itest text ipf
+test_case i22 itest text ipf
+test_case i23 itest text ipf
+
+atf_init_test_cases()
+{
+	atf_add_test_case i1
+	atf_add_test_case i2
+	atf_add_test_case i3
+	atf_add_test_case i4
+	atf_add_test_case i5
+	atf_add_test_case i6
+	atf_add_test_case i7
+	atf_add_test_case i8
+	atf_add_test_case i9
+	atf_add_test_case i10
+	atf_add_test_case i11
+	atf_add_test_case i12
+	atf_add_test_case i13
+	atf_add_test_case i14
+	atf_add_test_case i15
+	atf_add_test_case i16
+	atf_add_test_case i17
+	atf_add_test_case i18
+	atf_add_test_case i19
+	atf_add_test_case i20
+	atf_add_test_case i21
+	atf_add_test_case i22
+	atf_add_test_case i23
+}
diff --git a/contrib/netbsd-tests/ipf/t_logging.sh b/contrib/netbsd-tests/ipf/t_logging.sh
new file mode 100755
index 000000000000..00317d99c208
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_logging.sh
@@ -0,0 +1,80 @@
+# $NetBSD: t_logging.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+logtest()
+{
+	h_copydata $1
+	cp $(atf_get_srcdir)/expected/$1.b exp.b
+
+	case `uname -s` in
+	OSF1)
+		GMT=:
+		;;
+	*)
+		GMT=GMT
+		;;
+	esac
+
+	{ while read rule; do
+		echo $rule >>out
+		atf_check -o ignore -x \
+		    "echo $rule | ipftest -br - -F $2 -i in -l logout"
+
+		atf_check -o save:save -x "TZ=$GMT ipmon -P /dev/null -f logout"
+		cat save >>out
+		echo "--------" >>out
+
+		atf_check -o save:save -x "TZ=$GMT ipmon -P /dev/null -bf logout"
+		cat save >>out.b
+		echo "--------" >>out.b
+	done; } <reg
+
+	atf_check -o ignore ipftest -br reg -F $2 -i in -l logout
+
+	atf_check -o save:save -x "TZ=$GMT ipmon -P /dev/null -f logout"
+	cat save >>out
+	echo "--------" >>out
+
+	atf_check -o save:save -x "TZ=$GMT ipmon -P /dev/null -bf logout"
+	cat save >>out.b
+	echo "--------" >>out.b
+
+	diff -u exp out || atf_fail "results differ"
+	diff -u exp.b out.b || atf_fail "results differ"
+}
+
+test_case l1 logtest hex hex
+
+atf_init_test_cases()
+{
+	atf_add_test_case l1
+}
diff --git a/contrib/netbsd-tests/ipf/t_nat_exec.sh b/contrib/netbsd-tests/ipf/t_nat_exec.sh
new file mode 100755
index 000000000000..78110dc81080
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_nat_exec.sh
@@ -0,0 +1,140 @@
+# $NetBSD: t_nat_exec.sh,v 1.20 2014/07/15 20:00:23 martin Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+nattest()
+{
+	h_copydata $1
+	infmt=$2
+	outfmt=$3
+	shift
+	shift
+	shift
+	args=$@
+
+	if [ $outfmt = hex ] ; then
+		format="-xF $infmt"
+	else
+		format="-F $infmt"
+	fi
+
+	format="$format"
+
+	test -f in  && test -f reg || atf_fail "Test input file missing"
+
+	{ while read rule; do
+		atf_check -o save:save -x \
+		    "echo \"$rule\" | ipftest $format -RDbN - -i in $args"
+		cat save >>out
+		echo "-------------------------------" >>out
+	done; } <reg
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+test_case n1 nattest text text
+test_case n2 nattest text text
+test_case n3 nattest text text
+test_case n4 nattest text text
+test_case n5 nattest text text
+test_case n6 nattest text text
+test_case n7 nattest text text
+test_case n8 nattest hex hex -T update_ipid=0
+test_case n9 nattest hex hex -T update_ipid=0
+test_case n10 nattest hex hex -T update_ipid=0
+test_case n11 nattest text text
+failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v
+test_case n13 nattest text text
+failing_test_case_be n14 nattest "See PR kern/47665" text text
+test_case n15 nattest text text -T update_ipid=0
+test_case n16 nattest hex hex -D
+test_case n17 nattest hex hex -D
+test_case n100 nattest text text
+test_case n101 nattest text text
+test_case n102 nattest text text
+test_case n103 nattest text text
+test_case n104 nattest hex hex -T update_ipid=0
+test_case n105 nattest hex hex -T update_ipid=0
+test_case n106 nattest hex hex -T update_ipid=0
+test_case n200 nattest hex hex -T update_ipid=0
+test_case n1_6 nattest text text -6
+test_case n2_6 nattest text text -6
+#test_case n3_6 nattest text text -6
+test_case n4_6 nattest text text -6
+test_case n5_6 nattest text text -6
+test_case n6_6 nattest text text -6
+test_case n7_6 nattest text text -6
+failing_test_case_be n8_6 nattest "See PR kern/47665" hex hex -6
+failing_test_case_be n9_6 nattest "See PR kern/47665" hex hex -6
+test_case n11_6 nattest text text -6
+test_case n12_6 nattest hex hex -6
+test_case n15_6 nattest text text -6
+
+atf_init_test_cases()
+{
+	atf_add_test_case n1
+	atf_add_test_case n2
+	atf_add_test_case n3
+	atf_add_test_case n4
+	atf_add_test_case n5
+	atf_add_test_case n6
+	atf_add_test_case n7
+	atf_add_test_case n8
+	atf_add_test_case n9
+	atf_add_test_case n10
+	atf_add_test_case n11
+	atf_add_test_case n12
+	atf_add_test_case n13
+	atf_add_test_case n14
+	atf_add_test_case n16
+	atf_add_test_case n17
+	atf_add_test_case n100
+	atf_add_test_case n101
+	atf_add_test_case n102
+	atf_add_test_case n103
+	atf_add_test_case n104
+	atf_add_test_case n105
+	atf_add_test_case n106
+	atf_add_test_case n200
+
+	atf_add_test_case n1_6
+	atf_add_test_case n2_6
+#	atf_add_test_case n3_6
+	atf_add_test_case n4_6
+	atf_add_test_case n5_6
+	atf_add_test_case n6_6
+	atf_add_test_case n7_6
+	atf_add_test_case n8_6
+	atf_add_test_case n9_6
+	atf_add_test_case n11_6
+	atf_add_test_case n12_6
+	atf_add_test_case n15_6
+}
diff --git a/contrib/netbsd-tests/ipf/t_nat_ipf_exec.sh b/contrib/netbsd-tests/ipf/t_nat_ipf_exec.sh
new file mode 100755
index 000000000000..663edb944985
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_nat_ipf_exec.sh
@@ -0,0 +1,120 @@
+# $NetBSD: t_nat_ipf_exec.sh,v 1.7 2012/07/07 23:29:44 pgoyette Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+natipftest()
+{
+	h_copydata $1
+	cp $(atf_get_srcdir)/regress/$1.nat nat
+	cp $(atf_get_srcdir)/regress/$1.ipf ipf
+	many=$2
+	infmt=$3
+	outfmt=$4
+	shift
+	shift
+	shift
+	shift
+	args=$@
+
+	if [ $outfmt = hex ] ; then
+		format="-xF $infmt"
+	else
+		format="-F $infmt"
+	fi
+
+	case $many in
+	single)
+		{ while read rule; do
+			atf_check -o save:save -x "echo \"$rule\" | \
+ipftest -R $format -b -r ipf -N - -i in $args"
+			cat save >>out
+			echo "-------------------------------" >>out
+		done; } <nat
+		;;
+	multi)
+		atf_check -o save:out ipftest -R $args \
+			$format -b -r ipf -N nat -i in
+		echo "-------------------------------" >>out
+		;;
+	esac
+
+	diff -u exp out || atf_fail "results differ"
+}
+
+test_case ni1 natipftest multi hex hex -T update_ipid=1
+test_case ni2 natipftest single hex hex -T update_ipid=1
+test_case ni3 natipftest single hex hex -T update_ipid=1
+test_case ni4 natipftest single hex hex -T update_ipid=1
+test_case ni5 natipftest single hex hex -T update_ipid=1
+test_case ni6 natipftest multi hex text -T update_ipid=1 -D
+test_case ni7 natipftest single hex hex -T update_ipid=1
+test_case ni8 natipftest single hex hex -T update_ipid=1
+test_case ni9 natipftest single hex hex -T update_ipid=1
+test_case ni10 natipftest single hex hex -T update_ipid=1
+test_case ni11 natipftest single hex hex -T update_ipid=1
+test_case ni12 natipftest single hex hex -T update_ipid=1
+test_case ni13 natipftest single hex hex -T update_ipid=1
+test_case ni14 natipftest single hex hex -T update_ipid=1
+test_case ni15 natipftest single hex hex -T update_ipid=1
+test_case ni16 natipftest single hex hex -T update_ipid=1
+test_case ni17 natipftest multi text text
+test_case ni18 natipftest multi text text
+test_case ni19 natipftest single hex hex -T update_ipid=0
+test_case ni20 natipftest single hex hex -T update_ipid=0 -D
+test_case ni21 natipftest multi text text
+test_case ni23 natipftest multi text text -D
+
+atf_init_test_cases()
+{
+	atf_add_test_case ni1
+	atf_add_test_case ni2
+	atf_add_test_case ni3
+	atf_add_test_case ni4
+	atf_add_test_case ni5
+	atf_add_test_case ni6
+	atf_add_test_case ni7
+	atf_add_test_case ni8
+	atf_add_test_case ni9
+	atf_add_test_case ni10
+	atf_add_test_case ni11
+	atf_add_test_case ni12
+	atf_add_test_case ni13
+	atf_add_test_case ni14
+	atf_add_test_case ni15
+	atf_add_test_case ni16
+	atf_add_test_case ni17
+	atf_add_test_case ni18
+	atf_add_test_case ni19
+	atf_add_test_case ni20
+	atf_add_test_case ni21
+	atf_add_test_case ni23
+
+}
diff --git a/contrib/netbsd-tests/ipf/t_nat_parse.sh b/contrib/netbsd-tests/ipf/t_nat_parse.sh
new file mode 100755
index 000000000000..ddc7a322eba3
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_nat_parse.sh
@@ -0,0 +1,83 @@
+# $NetBSD: t_nat_parse.sh,v 1.8 2014/06/29 09:26:32 darrenr Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+intest()
+{
+	h_copydata $1
+
+	atf_check -o file:exp -e ignore ipnat -Rnvf reg
+}
+
+test_case in1 intest text text
+test_case in2 intest text text
+test_case in3 intest text text
+test_case in4 intest text text
+test_case in5 intest text text
+test_case in6 intest text text
+test_case in7 intest text text
+test_case in100 intest text text
+test_case in101 intest text text
+test_case in102 intest text text
+test_case in1_6 intest text text
+test_case in2_6 intest text text
+test_case in3_6 intest text text
+test_case in4_6 intest text text
+test_case in5_6 intest text text
+test_case in6_6 intest text text
+test_case in8_6 intest text text
+test_case in100_6 intest text text
+test_case in101_6 intest text text
+test_case in102_6 intest text text
+
+atf_init_test_cases()
+{
+	atf_add_test_case in1
+	atf_add_test_case in2
+	atf_add_test_case in3
+	atf_add_test_case in4
+	atf_add_test_case in5
+	atf_add_test_case in6
+	atf_add_test_case in7
+	atf_add_test_case in100
+	atf_add_test_case in101
+	atf_add_test_case in102
+	atf_add_test_case in1_6
+	atf_add_test_case in2_6
+	atf_add_test_case in3_6
+	atf_add_test_case in4_6
+	atf_add_test_case in5_6
+	atf_add_test_case in6_6
+	atf_add_test_case in8_6
+	atf_add_test_case in100_6
+	atf_add_test_case in101_6
+	atf_add_test_case in102_6
+}
diff --git a/contrib/netbsd-tests/ipf/t_pools.sh b/contrib/netbsd-tests/ipf/t_pools.sh
new file mode 100755
index 000000000000..33b5cb2cb2a2
--- /dev/null
+++ b/contrib/netbsd-tests/ipf/t_pools.sh
@@ -0,0 +1,103 @@
+# $NetBSD: t_pools.sh,v 1.8 2012/12/03 23:39:30 pgoyette Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+iptest()
+{
+	h_copydata $1
+	mkdir input
+	cp $(atf_get_srcdir)/input/ip2.data input/
+
+	atf_check -o file:exp -e ignore ippool -f reg -nRv
+}
+
+ptest()
+{
+	h_copydata $1
+	cp $(atf_get_srcdir)/regress/$1.pool pool 2>/dev/null
+	if [ -f $(atf_get_srcdir)/regress/$1.nat ] ; then
+		cp $(atf_get_srcdir)/regress/$1.nat nat
+	else
+		cp $(atf_get_srcdir)/regress/$1.ipf ipf
+	fi
+
+	if [ -f pool ] ; then
+		if [ -f nat ] ; then
+			atf_check -o save:out ipftest -RD -b -P pool -N nat -i in
+		else
+			atf_check -o save:out ipftest -RD -b -P pool -r ipf -i in
+		fi
+	else
+		atf_check -o save:out ipftest -RD -b -r ipf -i in
+	fi
+
+	echo "-------------------------------" >>out
+
+}
+
+test_case f28 ptest text text
+test_case f29 ptest text text
+test_case p1 ptest text text
+test_case p2 ptest text text
+test_case p3 ptest text text
+test_case p4 ptest text text
+test_case p5 ptest text text
+test_case p6 ptest text text
+test_case p7 ptest text text
+test_case p9 ptest text text
+test_case p10 ptest text text
+test_case p11 ptest text text
+test_case p12 ptest text text
+test_case p13 ptest text text
+test_case ip1 iptest text text
+test_case ip2 iptest text text
+test_case ip3 iptest text text
+
+atf_init_test_cases()
+{
+	atf_add_test_case f28
+	atf_add_test_case f29
+	atf_add_test_case p1
+	atf_add_test_case p2
+	atf_add_test_case p3
+	atf_add_test_case p4
+	atf_add_test_case p5
+	atf_add_test_case p6
+	atf_add_test_case p7
+	atf_add_test_case p9
+	atf_add_test_case p10
+	atf_add_test_case p11
+	atf_add_test_case p12
+	atf_add_test_case p13
+	atf_add_test_case ip1
+	atf_add_test_case ip2
+	atf_add_test_case ip3
+}
diff --git a/contrib/netbsd-tests/kernel/gen_t_subr_prf b/contrib/netbsd-tests/kernel/gen_t_subr_prf
new file mode 100755
index 000000000000..b58a6ba425d5
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/gen_t_subr_prf
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+cat << _EOF > $2
+#include <sys/types.h>
+#include <sys/time.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <string.h>
+#include <sha2.h>
+
+#include <atf-c.h>
+
+/* Avoid SSP re-definitions */
+#undef snprintf
+#undef vsnprintf
+#undef sprintf
+#undef vsprintf
+
+#define KPRINTF_BUFSIZE 1024
+#undef putchar
+#define putchar xputchar
+
+static int putchar(char c, int foo, void *b)
+{
+	return fputc(c, stderr);
+}
+
+#define TOBUFONLY 1
+static const char HEXDIGITS[] = "0123456789ABCDEF";
+static const char hexdigits[] = "0123456789abcdef";
+
+typedef int device_t;
+
+#if 0
+static SHA512_CTX kprnd_sha;
+#endif
+
+#define timespec timeval
+#define nanotime(ts) gettimeofday(ts, NULL)
+
+#define device_xname(a) ""
+int kprintf(const char *, int, void *, char *, va_list) __printflike(1, 0);
+void device_printf(device_t, const char *, ...) __printflike(2, 3);
+
+static void
+empty(void)
+{
+}
+
+static void (*v_flush)(void) = empty;
+
+ATF_TC(snprintf_print);
+ATF_TC_HEAD(snprintf_print, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "checks snprintf print");
+}
+ 
+ATF_TC_BODY(snprintf_print, tc)
+{
+	char buf[10];
+	int i;
+
+	memset(buf, 'x', sizeof(buf));
+	i = snprintf(buf, sizeof(buf), "number %d", 10);
+	ATF_CHECK_EQ(i, 9);
+	ATF_CHECK_STREQ(buf, "number 10");
+}
+
+ATF_TC(snprintf_print_overflow);
+ATF_TC_HEAD(snprintf_print_overflow, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "checks snprintf print with overflow");
+}
+ 
+ATF_TC_BODY(snprintf_print_overflow, tc)
+{
+	char buf[10];
+	int i;
+
+	memset(buf, 'x', sizeof(buf));
+	i = snprintf(buf, sizeof(buf), "fjsdfsdjfsdf %d\n", 10);
+	ATF_CHECK_EQ(i, 16);
+	ATF_CHECK_STREQ(buf, "fjsdfsdjf");
+}
+
+ATF_TC(snprintf_count);
+ATF_TC_HEAD(snprintf_count, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "checks snprintf count");
+}
+ 
+ATF_TC_BODY(snprintf_count, tc)
+{
+	int i;
+	
+	i = snprintf(NULL, 20, "number %d", 10);
+	ATF_CHECK_EQ(i, 9);
+}
+
+ATF_TC(snprintf_count_overflow);
+ATF_TC_HEAD(snprintf_count_overflow, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "checks snprintf count with overflow");
+}
+ 
+ATF_TC_BODY(snprintf_count_overflow, tc)
+{
+	int i;
+
+	i = snprintf(NULL, 10, "fjsdfsdjfsdf %d\n", 10);
+	ATF_CHECK_EQ(i, 16);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+        ATF_TP_ADD_TC(tp, snprintf_print);
+        ATF_TP_ADD_TC(tp, snprintf_print_overflow);
+        ATF_TP_ADD_TC(tp, snprintf_count);
+        ATF_TP_ADD_TC(tp, snprintf_count_overflow);
+
+        return atf_no_error();
+}
+_EOF
+
+awk '
+/^snprintf\(/ {
+	print prevline
+	out = 1
+}
+{
+	if (out) print
+	else prevline = $0
+}' $1 >>$2
diff --git a/contrib/netbsd-tests/kernel/h_ps_strings1.c b/contrib/netbsd-tests/kernel/h_ps_strings1.c
new file mode 100644
index 000000000000..64d8c717d755
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/h_ps_strings1.c
@@ -0,0 +1,74 @@
+/*	$NetBSD: h_ps_strings1.c,v 1.1 2011/03/05 18:14:33 pgoyette Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/types.h>
+#include <sys/exec.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+extern struct ps_strings *__ps_strings;
+
+int
+main(int argc, char **argv, char **environ)
+{
+	int ret = 0;
+	int nenv;
+
+	if (__ps_strings->ps_nargvstr != argc) {
+		static const char nargv_err[] = "Wrong argc in ps_strings";
+		write(STDOUT_FILENO, nargv_err, sizeof(nargv_err));
+		ret = 1;
+	}
+
+	if (__ps_strings->ps_argvstr != argv) {
+		static const char argv_err[] = "Wrong argv in ps_strings";
+		write(STDOUT_FILENO, argv_err, sizeof(argv_err));
+		ret = 1;
+	}
+
+	if (__ps_strings->ps_envstr != environ) {
+		static const char env_err[] = "Wrong env in ps_strings";
+		write(STDOUT_FILENO, env_err, sizeof(env_err));
+		ret = 1;
+	}
+	nenv = 0;
+	while (environ[nenv])
+		++nenv;
+	if (__ps_strings->ps_nenvstr != nenv) {
+		static const char nenv_err[] = "Wrong nenv in ps_strings";
+		write(STDOUT_FILENO, nenv_err, sizeof(nenv_err));
+		ret = 1;
+	}
+
+	return ret;
+}
diff --git a/contrib/netbsd-tests/kernel/h_ps_strings2.c b/contrib/netbsd-tests/kernel/h_ps_strings2.c
new file mode 100644
index 000000000000..d9c1c24a6cc8
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/h_ps_strings2.c
@@ -0,0 +1,69 @@
+/*	$NetBSD: h_ps_strings2.c,v 1.1 2011/03/05 18:14:33 pgoyette Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/types.h>
+#include <sys/exec.h>
+#include <err.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define	LEN	16384
+
+extern struct ps_strings *__ps_strings;
+
+int
+main(void)
+{
+	size_t i;
+	char buf[16];
+	char **argv;
+
+	if ((argv = calloc(LEN, sizeof(*argv))) == NULL)
+		errx(1, "calloc failed");
+	for (i = 0; i < LEN; ++i) {
+		snprintf(buf, sizeof(buf), "arg%04zx", i);
+		if ((argv[i] = strdup(buf)) == NULL)
+			errx(1, "strdup failed");
+	}
+	__ps_strings->ps_argvstr = argv;
+	__ps_strings->ps_nargvstr = LEN;
+
+	printf("Sleeping forever...\n");
+	do {
+		sleep(UINT_MAX);
+	} while /* CONSTCOND */ (1);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c b/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
new file mode 100644
index 000000000000..5908547693c5
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
@@ -0,0 +1,98 @@
+/* $NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#define FIFONAME "fifo"
+
+ATF_TC(fifo);
+ATF_TC_HEAD(fifo, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_READ on fifo");
+}
+ATF_TC_BODY(fifo, tc)
+{
+	int kq, n, fd;
+	struct kevent event[1];
+	char buffer[128];
+
+	RL(mkfifo(FIFONAME, 0644));
+	RL(fd = open(FIFONAME, O_RDWR, 0644));
+
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fd, EVFILT_READ, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	/* make sure there is something in the fifo */
+	RL(write(fd, "foo", 3));
+	(void)printf("fifo: wrote 'foo'\n");
+
+	(void)memset(event, 0, sizeof(event));
+
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+
+	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+	    event[0].fflags, event[0].data);
+
+	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
+
+	RL(n = read(fd, buffer, event[0].data));
+	buffer[n] = '\0';
+	(void)printf("fifo: read '%s'\n", buffer);
+
+	RL(close(fd));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, fifo);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_file.c b/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
new file mode 100644
index 000000000000..233517297964
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
@@ -0,0 +1,139 @@
+/* $NetBSD: t_file.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_file.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+
+#include <sys/param.h>
+#include <sys/event.h>
+#include <sys/mount.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#define FILENAME "file"
+#define NLINES 5
+
+static void
+child(void)
+{
+	int i, n, fd;
+
+	(void)sleep(1);
+
+	for (i = 0; i < NLINES; ++i) {
+		fd = open(FILENAME, O_WRONLY|O_APPEND, 0644);
+		if (fd < 0)
+			err(EXIT_FAILURE, "open()");
+
+		n = write(fd, "foo\n", 4);
+		if (n < 0)
+			err(EXIT_FAILURE, "write()");
+
+		(void)close(fd);
+		(void)sleep(1);
+	}
+	_exit(0);
+}
+
+ATF_TC(file);
+ATF_TC_HEAD(file, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_READ on regular file");
+}
+ATF_TC_BODY(file, tc)
+{
+	char buffer[128];
+	struct kevent event[1];
+	pid_t pid;
+	int fd, kq, n, num, status;
+
+	RL(pid = fork());
+	if (pid == 0) {
+		child();
+		/* NOTREACHED */
+	}
+
+	RL(fd = open(FILENAME, O_RDONLY|O_CREAT, 0644));
+
+#if 1		/* XXX: why was this disabled? */
+	RL(lseek(fd, 0, SEEK_END));
+#endif
+
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fd, EVFILT_READ, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	for (num = 0; num < NLINES;) {
+		RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+		num += n;
+
+		(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+		    "%" PRId64 "\n", n, event[0].flags, event[0].fflags,
+		    event[0].data);
+
+		if (event[0].data < 0)
+#if 1	/* XXXLUKEM */
+			RL(lseek(fd, 0, SEEK_END));
+#else
+			RL(lseek(fd, event[0].data, SEEK_END));
+#endif
+
+		RL(n = read(fd, buffer, 128));
+		buffer[n] = '\0';
+		(void)printf("file(%d): %s", num, buffer);
+	}
+
+	(void)waitpid(pid, &status, 0);
+
+	(void)printf("read: successful end\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, file);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_file2.c b/contrib/netbsd-tests/kernel/kqueue/read/t_file2.c
new file mode 100644
index 000000000000..c77d2830e93d
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_file2.c
@@ -0,0 +1,79 @@
+/* $NetBSD: t_file2.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_file2.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+
+#include <sys/event.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+ATF_TC(file2);
+ATF_TC_HEAD(file2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_READ for regular files. This test used to "
+	    "trigger deadlock caused by problem fixed in revision 1.79.2.10 "
+	    "of sys/kern/kern_descrip.c");
+}
+ATF_TC_BODY(file2, tc)
+{
+	int fd1, fd2, kq;
+	struct kevent event[1];
+
+	RL(fd1 = open("afile", O_RDONLY|O_CREAT, 0644));
+	RL(fd2 = open("bfile", O_RDONLY|O_CREAT, 0644));
+
+#if 1		/* XXX: why was this disabled? */
+	RL(lseek(fd1, 0, SEEK_END));
+#endif
+
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fd1, EVFILT_READ, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	RL(dup2(fd2, fd1));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, file2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c b/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
new file mode 100644
index 000000000000..d8e05f262e38
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
@@ -0,0 +1,84 @@
+/* $NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/event.h>
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+ATF_TC(pipe);
+ATF_TC_HEAD(pipe, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_READ for pipes");
+}
+ATF_TC_BODY(pipe, tc)
+{
+	struct kevent event[1];
+	char buffer[128];
+	int fds[2];
+	int kq, n;
+
+	RL(pipe(fds));
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fds[0], EVFILT_READ, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	/* make sure there is something in the pipe */
+	RL(write(fds[1], "foo", 3));
+	(void)printf("pipe: wrote 'foo' to pipe\n");
+
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+	(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+	    "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data);
+
+	RL(n = read(fds[0], buffer, event[0].data));
+	buffer[n] = '\0';
+
+	(void)printf("pipe: read '%s'\n", buffer);
+	(void)printf("pipe: successful end\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, pipe);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c b/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
new file mode 100644
index 000000000000..3a42fd3927fb
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
@@ -0,0 +1,144 @@
+/* $NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/wait.h>
+
+#include <poll.h>
+#include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
+#include <util.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+static void
+h_check(bool check_master)
+{
+	char slavetty[1024];
+	char buffer[128];
+	struct kevent event[1];
+	pid_t child;
+	int amaster, aslave, acurrent;
+	int kq, n, status;
+#if 0
+	int fl;
+#endif
+	struct pollfd pfd;
+	struct termios tio;
+
+	RL(openpty(&amaster, &aslave, slavetty, NULL, NULL));
+
+	(void)printf("tty: openpty master %d slave %d tty '%s'\n",
+		amaster, aslave, slavetty);
+	acurrent = check_master ? amaster : aslave;
+
+	RL(child = fork());
+	if (child == 0) {
+		sleep(1);
+
+		(void)printf("tty: child writing 'f00\\n'\n");
+		(void)write(check_master ? aslave : amaster, "f00\n", 4);
+
+		_exit(0);
+	}
+
+	/* switch ONLCR off, to not get confused by newline translation */
+	RL(tcgetattr(acurrent, &tio));
+	tio.c_oflag &= ~ONLCR;
+	RL(tcsetattr(acurrent, TCSADRAIN, &tio));
+
+	pfd.fd = acurrent;
+	pfd.events = POLLIN;
+	(void)printf("tty: polling ...\n");
+	RL(poll(&pfd, 1, INFTIM));
+	(void)printf("tty: returned from poll - %d\n", pfd.revents);
+
+#if 0
+	fl = 1;
+	if (ioctl(acurrent, TIOCPKT, &fl) < 0)
+		err(1, "ioctl");
+#endif
+
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], acurrent, EVFILT_READ, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+
+	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+	    event[0].fflags, event[0].data);
+
+	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
+
+	RL(n = read(acurrent, buffer, 128));
+	(void)printf("tty: read '%.*s' (n=%d)\n", n, buffer, n);
+
+	(void)waitpid(child, &status, 0);
+	(void)printf("tty: successful end\n");
+}
+
+ATF_TC(master);
+ATF_TC_HEAD(master, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_READ for master tty");
+}
+ATF_TC_BODY(master, tc)
+{
+	h_check(true);
+}
+
+ATF_TC(slave);
+ATF_TC_HEAD(slave, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_READ for slave tty");
+}
+ATF_TC_BODY(slave, tc)
+{
+	h_check(false);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, master);
+	ATF_TP_ADD_TC(tp, slave);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_ioctl.c b/contrib/netbsd-tests/kernel/kqueue/t_ioctl.c
new file mode 100644
index 000000000000..8ed5a79c222d
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/t_ioctl.c
@@ -0,0 +1,115 @@
+/* $NetBSD: t_ioctl.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ioctl.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/ioctl.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(kfilter_byfilter);
+ATF_TC_HEAD(kfilter_byfilter, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks KFILTER_BYFILTER ioctl");
+}
+ATF_TC_BODY(kfilter_byfilter, tc)
+{
+	char buf[32];
+	struct kfilter_mapping km;
+	int i, kq;
+
+	RL(kq = kqueue());
+
+	km.name = buf;
+	km.len = sizeof(buf) - 1;
+
+	for (i = 0; i < 7; ++i) {
+		km.filter = i;
+		RL(ioctl(kq, KFILTER_BYFILTER, &km));
+		(void)printf("  map %d -> %s\n", km.filter, km.name);
+	}
+
+	km.filter = 7;
+	ATF_REQUIRE_EQ(ioctl(kq, KFILTER_BYFILTER, &km), -1);
+}
+
+ATF_TC(kfilter_byname);
+ATF_TC_HEAD(kfilter_byname, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks KFILTER_BYNAME ioctl");
+}
+ATF_TC_BODY(kfilter_byname, tc)
+{
+	const char *tests[] = {
+		"EVFILT_READ",
+		"EVFILT_WRITE",
+		"EVFILT_AIO",
+		"EVFILT_VNODE",
+		"EVFILT_PROC",
+		"EVFILT_SIGNAL",
+		"EVFILT_TIMER",
+		NULL
+	};
+	char buf[32];
+	struct kfilter_mapping km;
+	const char **test;
+	int kq;
+
+	RL(kq = kqueue());
+
+	km.name = buf;
+
+	for (test = &tests[0]; *test != NULL; ++test) {
+		(void)strlcpy(buf, *test, sizeof(buf));
+		RL(ioctl(kq, KFILTER_BYNAME, &km));
+		(void)printf("  map %s -> %d\n", km.name, km.filter);
+	}
+
+	(void)strlcpy(buf, "NOTREG_FILTER", sizeof(buf));
+	ATF_REQUIRE_EQ(ioctl(kq, KFILTER_BYNAME, &km), -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, kfilter_byfilter);
+	ATF_TP_ADD_TC(tp, kfilter_byname);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc1.c b/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
new file mode 100644
index 000000000000..e7553095faf5
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
@@ -0,0 +1,154 @@
+/* $NetBSD: t_proc1.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_proc1.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+/*
+ * this also used to trigger problem fixed in
+ * rev. 1.1.1.1.2.13 of sys/kern/kern_event.c
+ */
+
+#include <sys/param.h>
+#include <sys/event.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static int
+child(void)
+{
+	pid_t ch;
+	int status;
+	char *argv[] = { NULL, NULL };
+	char *envp[] = { NULL, NULL };
+
+	if ((argv[0] = strdup("true")) == NULL)
+		err(EXIT_FAILURE, "strdup(\"true\")");
+
+	if ((envp[0] = strdup("FOO=BAZ")) == NULL)
+		err(EXIT_FAILURE, "strdup(\"FOO=BAZ\")");
+
+	/* Ensure parent is ready */
+	(void)sleep(2);
+
+	/* Do fork */
+	switch (ch = fork()) {
+	case -1:
+		return EXIT_FAILURE;
+		/* NOTREACHED */
+	case 0:
+		return EXIT_SUCCESS;
+		/* NOTREACHED */
+	default:
+		wait(&status);
+		break;
+	}
+
+	/* Exec */
+	execve("/usr/bin/true", argv, envp);
+
+	/* NOTREACHED */
+	return EXIT_FAILURE;
+}
+
+ATF_TC(proc1);
+ATF_TC_HEAD(proc1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_PROC");
+}
+ATF_TC_BODY(proc1, tc)
+{
+	struct kevent event[1];
+	pid_t pid;
+	int kq, want, status;
+
+	RL(kq = kqueue());
+
+	/* fork a child for doing the events */
+	RL(pid = fork());
+	if (pid == 0) {
+		_exit(child());
+		/* NOTREACHED */
+	}
+
+	(void)sleep(1); /* give child some time to come up */
+
+	event[0].ident = pid;
+	event[0].filter = EVFILT_PROC;
+	event[0].flags = EV_ADD | EV_ENABLE;
+	event[0].fflags = NOTE_EXIT | NOTE_FORK | NOTE_EXEC; /* | NOTE_TRACK;*/
+	want = NOTE_EXIT | NOTE_FORK | NOTE_EXEC;
+
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	/* wait until we get all events we want */
+	while (want) {
+		RL(kevent(kq, NULL, 0, event, 1, NULL));
+		printf("%ld:", (long)event[0].ident);
+
+		if (event[0].fflags & NOTE_EXIT) {
+			want &= ~NOTE_EXIT;
+			printf(" NOTE_EXIT");
+		}
+		if (event[0].fflags & NOTE_EXEC) {
+			want &= ~NOTE_EXEC;
+			printf(" NOTE_EXEC");
+		}
+		if (event[0].fflags & NOTE_FORK) {
+			want &= ~NOTE_FORK;
+			printf(" NOTE_FORK");
+		}
+		if (event[0].fflags & NOTE_CHILD)
+			printf(" NOTE_CHILD, parent = %" PRId64, event[0].data);
+
+		printf("\n");
+	}
+
+	(void)waitpid(pid, &status, 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, proc1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc2.c b/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
new file mode 100644
index 000000000000..54769d6e8791
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
@@ -0,0 +1,138 @@
+/* $NetBSD: t_proc2.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Peter Werner <Peter.Werner@wgsn.com>.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_proc2.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static void
+child_two(void)
+{
+	_exit(EXIT_SUCCESS);
+}
+
+static void
+child_one(void)
+{
+	pid_t pid;
+	struct passwd *pwd;
+	const char *nam = "nobody";
+
+	pwd = getpwnam(nam);
+	if (pwd == NULL)
+		err(EXIT_FAILURE, "getpwnam(\"%s\")", nam);
+
+	if ((setuid(pwd->pw_uid)) == -1)
+		err(EXIT_FAILURE, "setuid(%d)", pwd->pw_uid);
+
+	pid = fork();
+	if (pid == -1)
+		err(EXIT_FAILURE, "fork()");
+
+	if (pid == 0)
+		child_two();
+
+	_exit(EXIT_SUCCESS);
+}
+
+ATF_TC(proc2);
+ATF_TC_HEAD(proc2, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_PROC for NOTE_FORK|NOTE_TRACK error path problem "
+	    "fixed in rev. 1.1.1.1.2.17 of sys/kern/kern_event.c");
+}
+ATF_TC_BODY(proc2, tc)
+{
+	pid_t pid = 0;
+	int kq, status;
+	struct kevent ke;
+	struct timespec timeout;
+
+	RL(kq = kqueue());
+
+	timeout.tv_sec = 0;
+	timeout.tv_nsec = 0;
+
+	RL(pid = fork());
+	if (pid == 0) {
+		(void)sleep(1); /* let parent set kevent */
+		child_one();
+		/* NOTREACHED */
+	}
+
+	EV_SET(&ke, pid, EVFILT_PROC, EV_ADD, NOTE_FORK|NOTE_TRACK, 0, 0);
+
+	RL(kevent(kq, &ke, 1, NULL, 0, &timeout));
+
+	(void)sleep(2);
+
+	ke.ident = 0;
+	ke.fflags = 0;
+	ke.flags = EV_ENABLE;
+
+	RL(kevent(kq, NULL, 0, &ke, 1, &timeout));
+	RL(close(kq));
+
+	RL(waitpid(pid, &status, 0));
+	ATF_REQUIRE(WIFEXITED(status));
+	ATF_REQUIRE_EQ(WEXITSTATUS(status), EXIT_SUCCESS);
+
+	/*
+	 * we are expecting an error here as we should not have
+	 * been able to add a knote to child 2.
+	 */
+	ATF_REQUIRE(ke.fflags & NOTE_TRACKERR);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, proc2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc3.c b/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
new file mode 100644
index 000000000000..3cb9ae565cbb
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
@@ -0,0 +1,99 @@
+/* $NetBSD: t_proc3.c,v 1.1 2012/11/17 21:55:24 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_proc3.c,v 1.1 2012/11/17 21:55:24 joerg Exp $");
+
+#include <sys/event.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(proc3);
+ATF_TC_HEAD(proc3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_PROC for NOTE_TRACK on self bug ");
+}
+
+ATF_TC_BODY(proc3, tc)
+{
+	pid_t pid = 0;
+	int kq, status;
+	struct kevent ke;
+	struct timespec timeout;
+
+	RL(kq = kqueue());
+
+	EV_SET(&ke, getpid(), EVFILT_PROC, EV_ADD, NOTE_TRACK, 0, 0);
+
+	RL(kevent(kq, &ke, 1, NULL, 0, NULL));
+
+	RL(pid = fork());
+	if (pid == 0) {
+		_exit(EXIT_SUCCESS);
+		/* NOTREACHED */
+	}
+
+	RL(waitpid(pid, &status, 0));
+	ATF_REQUIRE(WIFEXITED(status));
+	ATF_REQUIRE_EQ(WEXITSTATUS(status), EXIT_SUCCESS);
+
+	timeout.tv_sec = 0;
+	timeout.tv_nsec = 0;
+	ke.ident = 0;
+	ke.fflags = 0;
+	ke.flags = EV_ENABLE;
+
+	RL(kevent(kq, NULL, 0, &ke, 1, &timeout));
+	RL(close(kq));
+
+	ATF_REQUIRE(ke.fflags & NOTE_CHILD);
+	ATF_REQUIRE((ke.fflags & NOTE_TRACKERR) == 0);
+	ATF_REQUIRE_EQ((pid_t)ke.ident, pid);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, proc3);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_sig.c b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
new file mode 100644
index 000000000000..4fc075847c89
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
@@ -0,0 +1,133 @@
+/* $NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
+
+#include <sys/event.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <inttypes.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+#define NSIGNALS 5
+
+ATF_TC(sig);
+ATF_TC_HEAD(sig, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_SIGNAL");
+}
+ATF_TC_BODY(sig, tc)
+{
+	struct timespec	timeout;
+	struct kfilter_mapping km;
+	struct kevent event[1];
+	char namebuf[32];
+	pid_t pid, child;
+	int kq, n, num, status;
+
+	pid = getpid();
+	(void)printf("my pid: %d\n", pid);
+
+	/* fork a child to send signals */
+	RL(child = fork());
+	if (child == 0) {
+		int i;
+		(void)sleep(2);
+		for(i = 0; i < NSIGNALS; ++i) {
+			(void)kill(pid, SIGUSR1);
+			(void)sleep(2);
+		}
+		_exit(0);
+		/* NOTREACHED */
+	}
+
+	RL(kq = kqueue());
+
+	(void)strlcpy(namebuf, "EVFILT_SIGNAL", sizeof(namebuf));
+	km.name = namebuf;
+	RL(ioctl(kq, KFILTER_BYNAME, &km));
+	(void)printf("got %d as filter number for `%s'.\n", km.filter, km.name);
+
+	/* ignore the signal to avoid taking it for real */
+	REQUIRE_LIBC(signal(SIGUSR1, SIG_IGN), SIG_ERR);
+
+	event[0].ident = SIGUSR1;
+	event[0].filter = km.filter;
+	event[0].flags = EV_ADD | EV_ENABLE;
+
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	(void)sleep(1);
+
+	timeout.tv_sec = 1;
+	timeout.tv_nsec = 0;
+
+	for (num = 0; num < NSIGNALS; num += n) {
+		struct timeval then, now, diff;
+
+		RL(gettimeofday(&then, NULL));
+		RL(n = kevent(kq, NULL, 0, event, 1, &timeout));
+		RL(gettimeofday(&now, NULL));
+		timersub(&now, &then, &diff);
+
+		(void)printf("sig: kevent returned %d in %lld.%06ld\n",
+		    n, (long long)diff.tv_sec, (long)diff.tv_usec);
+
+		if (n == 0)
+			continue;
+
+		(void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# "
+		    "times signal posted)\n", event[0].flags, event[0].data);
+	}
+
+	(void)waitpid(child, &status, 0);
+	(void)printf("sig: finished successfully\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sig);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/write/t_fifo.c b/contrib/netbsd-tests/kernel/kqueue/write/t_fifo.c
new file mode 100644
index 000000000000..82b256cb625c
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/write/t_fifo.c
@@ -0,0 +1,102 @@
+/* $NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#define FIFONAME "fifo"
+
+ATF_TC(fifo);
+ATF_TC_HEAD(fifo, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_WRITE for fifo");
+}
+ATF_TC_BODY(fifo, tc)
+{
+	char buffer[128];
+	struct kevent event[1];
+	pid_t child;
+	int kq, n, fd, status;
+
+	RL(mkfifo(FIFONAME, 0644));
+	RL(fd = open(FIFONAME, O_RDWR, 0644));
+	RL(kq = kqueue());
+
+	/* spawn child reader */
+	RL(child = fork());
+	if (child == 0) {
+		int sz = read(fd, buffer, 128);
+		if (sz > 0)
+			(void)printf("fifo: child read '%.*s'\n", sz, buffer);
+		_exit(sz <= 0);
+	}
+
+	EV_SET(&event[0], fd, EVFILT_WRITE, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	(void)memset(event, 0, sizeof(event));
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+
+	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+	    event[0].fflags, event[0].data);
+
+	ATF_REQUIRE_EQ(event[0].filter, EVFILT_WRITE);
+
+	RL(write(fd, "foo", 3));
+	(void)printf("fifo: wrote 'foo'\n");
+	RL(close(fd));
+
+	(void)waitpid(child, &status, 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, fifo);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/write/t_pipe.c b/contrib/netbsd-tests/kernel/kqueue/write/t_pipe.c
new file mode 100644
index 000000000000..459a1f7ad0b2
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/write/t_pipe.c
@@ -0,0 +1,147 @@
+/* $NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/wait.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+ATF_TC(pipe1);
+ATF_TC_HEAD(pipe1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_WRITE for pipes. This test used to trigger "
+	    "problem fixed in rev. 1.5.2.7 of sys/kern/sys_pipe.c");
+}
+ATF_TC_BODY(pipe1, tc)
+{
+	struct kevent event[1];
+	int fds[2];
+	int kq, n;
+
+	RL(pipe(fds));
+	RL(kq = kqueue());
+	RL(close(fds[0]));
+
+	EV_SET(&event[0], fds[1], EVFILT_WRITE, EV_ADD|EV_ENABLE, 0, 0, 0);
+	ATF_REQUIRE_EQ_MSG((n = kevent(kq, event, 1, NULL, 0, NULL)),
+	    -1, "got: %d", n);
+	ATF_REQUIRE_EQ_MSG(errno, EBADF, "got: %s", strerror(errno));
+}
+
+ATF_TC(pipe2);
+ATF_TC_HEAD(pipe2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_WRITE for pipes. This test used to trigger problem "
+	    "fixed in rev. 1.5.2.9 of sys/kern/sys_pipe.c");
+}
+ATF_TC_BODY(pipe2, tc)
+{
+	struct kevent event[1];
+	char buffer[128];
+	int fds[2];
+	int kq, n;
+	int status;
+	pid_t child;
+
+	RL(pipe(fds));
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fds[1], EVFILT_WRITE, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	/* spawn child reader */
+	RL(child = fork());
+	if (child == 0) {
+		int sz = read(fds[0], buffer, 128);
+		if (sz > 0)
+			(void)printf("pipe: child read '%.*s'\n", sz, buffer);
+		exit(sz <= 0);
+	}
+
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+
+	(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+	    "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data);
+
+	RL(n = write(fds[1], "foo", 3));
+	RL(close(fds[1]));
+
+	(void)waitpid(child, &status, 0);
+}
+
+ATF_TC(pipe3);
+ATF_TC_HEAD(pipe3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks EVFILT_WRITE for pipes. This test used to trigger problem "
+	    "fixed in rev. 1.5.2.10 of sys/kern/sys_pipe.c");
+}
+ATF_TC_BODY(pipe3, tc)
+{
+	struct kevent event[1];
+	int fds[2];
+	int kq;
+
+	RL(pipe(fds));
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], fds[1], EVFILT_WRITE, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	/* close 'read' end first, then 'write' */
+
+	RL(close(fds[0]));
+	RL(close(fds[1]));
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, pipe1);
+	ATF_TP_ADD_TC(tp, pipe2);
+	ATF_TP_ADD_TC(tp, pipe3);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/kqueue/write/t_ttypty.c b/contrib/netbsd-tests/kernel/kqueue/write/t_ttypty.c
new file mode 100644
index 000000000000..6983910f9573
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/kqueue/write/t_ttypty.c
@@ -0,0 +1,130 @@
+/* $NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:58 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn and Jaromir Dolecek.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:58 jmmv Exp $");
+
+#include <sys/event.h>
+#include <sys/wait.h>
+
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <unistd.h>
+#include <util.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+static void
+h_check(bool check_master)
+{
+	char slavetty[1024];
+	char buffer[128];
+	struct kevent event[1];
+	struct pollfd pfd;
+	pid_t child;
+	int status, kq, n;
+	int amaster, aslave, acurrent;
+
+	RL(openpty(&amaster, &aslave, slavetty, NULL, NULL));
+	(void)printf("tty: openpty master %d slave %d tty '%s'\n",
+	    amaster, aslave, slavetty);
+	acurrent = check_master ? amaster : aslave;
+
+	RL(child = fork());
+	if (child == 0) {
+		(void)sleep(1);
+
+		n = read(check_master ? aslave : amaster, buffer, 128);
+		(void)printf("tty: child  read '%.*s'\n", n, buffer);
+
+		_exit(0);
+	}
+
+	pfd.fd = acurrent;
+	pfd.events = POLLOUT;
+	(void)printf("tty: polling ...\n");
+	RL(poll(&pfd, 1, INFTIM));
+	(void)printf("tty: returned from poll - %d\n", pfd.revents);
+
+	RL(kq = kqueue());
+
+	EV_SET(&event[0], acurrent, EVFILT_WRITE, EV_ADD|EV_ENABLE, 0, 0, 0);
+	RL(kevent(kq, event, 1, NULL, 0, NULL));
+
+	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
+
+	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, data: "
+	    "%" PRId64 "\n", n, event[0].filter, event[0].flags, event[0].fflags,
+	    event[0].data);
+
+	ATF_REQUIRE_EQ(event[0].filter, EVFILT_WRITE);
+
+	RL(n = write(acurrent, "f00\n", 4));
+	(void)printf("tty: wrote 'f00\\n' (wrote %d characters)\n", n);
+
+	(void)waitpid(child, &status, 0);
+	(void)printf("tty: successful end\n");
+}
+
+ATF_TC(master);
+ATF_TC_HEAD(master, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_WRITE for master tty");
+}
+ATF_TC_BODY(master, tc)
+{
+	h_check(true);
+}
+
+ATF_TC(slave);
+ATF_TC_HEAD(slave, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks EVFILT_WRITE for slave tty");
+}
+ATF_TC_BODY(slave, tc)
+{
+	h_check(false);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, master);
+	ATF_TP_ADD_TC(tp, slave);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_extattrctl.c b/contrib/netbsd-tests/kernel/t_extattrctl.c
new file mode 100644
index 000000000000..2f8932e3c87e
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_extattrctl.c
@@ -0,0 +1,28 @@
+#include <sys/types.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+
+ATF_TC(extattrctl_namei);
+ATF_TC_HEAD(extattrctl_namei, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "extattrctl namei safety (kern/43328)");
+}
+
+ATF_TC_BODY(extattrctl_namei, tc)
+{
+
+	rump_init();
+
+	rump_sys_extattrctl("/anyfile", 0, "/", 0, 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, extattrctl_namei);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_extent.c b/contrib/netbsd-tests/kernel/t_extent.c
new file mode 100644
index 000000000000..faefafae5f8d
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_extent.c
@@ -0,0 +1,385 @@
+/* $NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $");
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/extent.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+#include "../h_macros.h"
+
+static int ret;
+static struct extent *ex;
+
+#define h_create(name, start, end, flags) \
+	ATF_REQUIRE((ex = extent_create(name, \
+	    start, end, 0, 0, flags)) != NULL);
+
+#define h_alloc_region(start, size) \
+	ATF_REQUIRE_EQ_MSG(ret = extent_alloc_region(ex, \
+	    start, size, 0), 0, "%s", strerror(ret));
+
+#define h_free(start, size) \
+	ATF_REQUIRE_EQ_MSG(ret = extent_free(ex, \
+	    start, size, 0), 0, "%s", strerror(ret));
+
+static void
+h_alloc_subregion(u_long substart, u_long subend, u_long size,
+    u_long alignment, u_long boundary, int expret, u_long expres)
+{
+	u_long result;
+
+#define FAIL(fmt, ...) \
+	atf_tc_fail("extent_alloc_subregion1(ex, %#lx, %#lx, %#lx, %#lx, 0, " \
+	    "%#lx, 0, &result): " fmt, substart, subend, size, alignment, \
+	    boundary, ##__VA_ARGS__)
+
+	ret = extent_alloc_subregion1(ex, substart, subend, size,
+	    alignment, 0, boundary, 0, &result);
+
+	if (ret != expret)
+		FAIL("%s", strerror(errno));
+
+	if (expret == 0 && result != expres)
+		FAIL("result should be: %#lx, got: %#lx", expres, result);
+#undef FAIL
+}
+
+static void
+h_require(const char *name, u_long start,
+	u_long end, int flags, const char *exp)
+{
+	char buf[4096];
+	struct extent_region *rp;
+	int n = 0;
+
+	ATF_REQUIRE_STREQ_MSG(ex->ex_name, name,
+	    "expected: \"%s\", got: \"%s\"", name, ex->ex_name);
+	ATF_REQUIRE_EQ_MSG(ex->ex_start, start,
+	    "expected: %#lx, got: %#lx", start, ex->ex_start);
+	ATF_REQUIRE_EQ_MSG(ex->ex_end, end,
+	    "expected: %#lx, got: %#lx", end, ex->ex_end);
+	ATF_REQUIRE_EQ_MSG(ex->ex_flags, flags,
+	    "expected: %#x, got: %#x", flags, ex->ex_flags);
+
+	(void)memset(buf, 0, sizeof(buf));
+	LIST_FOREACH(rp, &ex->ex_regions, er_link)
+		n += snprintf(buf + n, sizeof(buf) - n,
+		    "0x%lx - 0x%lx\n", rp->er_start, rp->er_end);
+
+	if (strcmp(buf, exp) == 0)
+		return;
+
+	printf("Incorrect extent map\n");
+	printf("Expected:\n%s\n", exp);
+	printf("Got:\n%s\n", buf);
+	atf_tc_fail("incorrect extent map");
+}
+
+ATF_TC(coalesce);
+ATF_TC_HEAD(coalesce, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks coalescing of regions");
+}
+ATF_TC_BODY(coalesce, tc)
+{
+	h_create("test1", 0, 0x4f, 0);
+
+	h_alloc_region(0x00, 0x10);
+	h_alloc_region(0x20, 0x10);
+	h_alloc_region(0x40, 0x10);
+	h_alloc_region(0x10, 0x10);
+	h_alloc_subregion(0, 0x4f, 0x10, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x30);
+
+	h_require("test1", 0x00, 0x4f, 0x00,
+	    "0x0 - 0x4f\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(subregion1);
+ATF_TC_HEAD(subregion1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that subregions work (PR kern/7539)");
+}
+ATF_TC_BODY(subregion1, tc)
+{
+	h_create("test2", 0, 0x2f, EX_NOCOALESCE);
+
+	h_alloc_region(0x00, 0x10);
+	h_alloc_subregion(0x20, 0x30, 0x10, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x20);
+
+	h_require("test2", 0x00, 0x2f, 0x2,
+	    "0x0 - 0xf\n"
+	    "0x20 - 0x2f\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(subregion2);
+ATF_TC_HEAD(subregion2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that subregion allocations don't overlap with existing "
+	    "ones (fixed in 1.25)");
+}
+ATF_TC_BODY(subregion2, tc)
+{
+	h_create("test3", 0, 0x3f, EX_NOCOALESCE);
+
+	h_alloc_region(0x00, 0x20);
+	h_alloc_region(0x30, 0x10);
+	h_alloc_subregion(0x10, 0x3f, 0x10,
+	    EX_NOALIGN, EX_NOBOUNDARY, 0, 0x20);
+
+	h_require("test3", 0x00, 0x3f, 0x2,
+	    "0x0 - 0x1f\n"
+	    "0x20 - 0x2f\n"
+	    "0x30 - 0x3f\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(bound1);
+ATF_TC_HEAD(bound1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks for overflow in boundary check, before an allocated region "
+	    "(fixed in 1.32)");
+}
+ATF_TC_BODY(bound1, tc)
+{
+	h_create("test4", 0xf0000000, 0xffffffff, 0);
+
+	h_alloc_region(0xf1000000, 0x1);
+	h_alloc_subregion(0xf0000000, 0xffffffff, 0x1,
+	    EX_NOALIGN, 0x20000000, 0, 0xf0000000);
+
+	h_require("test4", 0xf0000000, 0xffffffff, 0x0,
+	    "0xf0000000 - 0xf0000000\n"
+	    "0xf1000000 - 0xf1000000\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(bound2);
+ATF_TC_HEAD(bound2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks for overflow in boundary checks, before the subregion end "
+	    "(fixed in 1.32)");
+}
+ATF_TC_BODY(bound2, tc)
+{
+	h_create("test5", 0xf0000000, 0xffffffff, 0);
+
+	h_alloc_subregion(0xf0000000, 0xffffffff, 0x1,
+	    EX_NOALIGN, 0x20000000, 0, 0xf0000000);
+
+	h_require("test5", 0xf0000000, 0xffffffff, 0x0,
+	    "0xf0000000 - 0xf0000000\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(bound3);
+ATF_TC_HEAD(bound3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks allocation beyond last boundary line: last two "
+	    "allocations should succeed without boundary \"fixups\"");
+}
+ATF_TC_BODY(bound3, tc)
+{
+	h_create("test6", 0, 11, 0);
+
+	h_alloc_subregion(0, 11, 8, EX_NOALIGN, 8, 0, 0);
+	h_alloc_subregion(0, 11, 2, EX_NOALIGN, 8, 0, 0x8);
+	h_alloc_subregion(0, 11, 2, EX_NOALIGN, 8, 0, 0xa);
+
+	h_require("test6", 0x0, 0xb, 0x0, "0x0 - 0xb\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(bound4);
+ATF_TC_HEAD(bound4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks allocation beyond last boundary line: last allocation "
+	    "should be bumped to the next boundary and exactly fit the "
+	    "remaining space");
+}
+ATF_TC_BODY(bound4, tc)
+{
+	h_create("test7", 0, 11, 0);
+
+	h_alloc_subregion(0, 11, 7, EX_NOALIGN, 8, 0, 0);
+	h_alloc_subregion(0, 11, 4, EX_NOALIGN, 8, 0, 8);
+
+	h_require("test7", 0x0, 0xb, 0x0,
+	    "0x0 - 0x6\n"
+	    "0x8 - 0xb\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(subregion3);
+ATF_TC_HEAD(subregion3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that we don't allocate a region pasts the end of "
+	    "subregion (i.e., the second alloc_subregion should fail). "
+	    "subr_extent.c prior to rev. 1.43 allocated region starting "
+	    "from 0x10");
+}
+ATF_TC_BODY(subregion3, tc)
+{
+	h_create("test8", 0, 0x4f, EX_NOCOALESCE);
+
+	h_alloc_region(0x30, 0x10);
+	h_alloc_subregion(0, 0xf, 0x10, EX_NOALIGN, EX_NOBOUNDARY, 0, 0);
+	h_alloc_subregion(0, 0xf, 0x10, EX_NOALIGN, EX_NOBOUNDARY, EAGAIN, 0);
+
+	h_require("test8", 0x0, 0x4f, 0x2,
+	    "0x0 - 0xf\n"
+	    "0x30 - 0x3f\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(bound5);
+ATF_TC_HEAD(bound5, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "When allocating a region with a boundary constraint, checks "
+	    "proper detection of overflaps once the candidate region has "
+	    "been aligned. subr_extent.c prior 1.45 could corrupt the extent "
+	    "map in this situation");
+}
+ATF_TC_BODY(bound5, tc)
+{
+	h_create("test9", 0, 0x4f, 0);
+
+	h_alloc_subregion(0, 0x10, 4, EX_NOALIGN, 0, 0, 0);
+	h_alloc_subregion(0xd, 0x20, 2, EX_NOALIGN, 0, 0, 0xd);
+	h_alloc_subregion(0, 0x4f, 8, EX_NOALIGN, 8, 0, 0x10);
+
+	h_require("test9", 0x0, 0x4f, 0x0,
+	    "0x0 - 0x3\n"
+	    "0xd - 0xe\n"
+	    "0x10 - 0x17\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(free);
+ATF_TC_HEAD(free, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks extent_free()");
+}
+ATF_TC_BODY(free, tc)
+{
+	h_create("test10", 0xc0002000, 0xffffe000, EX_BOUNDZERO);
+
+	h_alloc_subregion(0xc0002000, 0xffffe000, 0x2000,
+	    0x10000, 0x10000, 0, 0xc0010000);
+	h_alloc_subregion(0xc0002000, 0xffffe000, 0x2000,
+	    0x10000, 0x10000, 0, 0xc0020000);
+
+	h_require("test10", 0xc0002000, 0xffffe000, 0x0,
+	    "0xc0010000 - 0xc0011fff\n"
+	    "0xc0020000 - 0xc0021fff\n");
+
+	h_free(0xc0020000, 0x2000);
+	h_require("test10", 0xc0002000, 0xffffe000, 0x0,
+	    "0xc0010000 - 0xc0011fff\n");
+
+	h_alloc_subregion(0xc0002000, 0xffffe000, 0x10000,
+	    0x10000, 0x10000, 0, 0xc0022000);
+
+	h_require("test10", 0xc0002000, 0xffffe000, 0x0,
+	    "0xc0010000 - 0xc0011fff\n"
+	    "0xc0022000 - 0xc0031fff\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TC(subregion4);
+ATF_TC_HEAD(subregion4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks for off-by-one bug which would cause a region at the end "
+	    "of the extent to be allocated multiple times (fixed in 1.51)");
+}
+ATF_TC_BODY(subregion4, tc)
+{
+	h_create("test11", 0x10, 0x20, EX_NOCOALESCE);
+
+	h_alloc_subregion(0x10, 0x13, 0x4, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x10);
+	h_alloc_subregion(0x1e, 0x1f, 0x2, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x1e);
+	h_alloc_subregion(0x20, 0x20, 0x1, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x20);
+	h_alloc_subregion(0x20, 0x20, 0x1, EX_NOALIGN, EX_NOBOUNDARY, EAGAIN, 0);
+	h_alloc_subregion(0x10, 0x20, 0x1, EX_NOALIGN, EX_NOBOUNDARY, 0, 0x14);
+
+	h_require("test11", 0x10, 0x20, 0x2,
+	    "0x10 - 0x13\n"
+	    "0x14 - 0x14\n"
+	    "0x1e - 0x1f\n"
+	    "0x20 - 0x20\n");
+
+	extent_destroy(ex);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, coalesce);
+	ATF_TP_ADD_TC(tp, subregion1);
+	ATF_TP_ADD_TC(tp, subregion2);
+	ATF_TP_ADD_TC(tp, bound1);
+	ATF_TP_ADD_TC(tp, bound2);
+	ATF_TP_ADD_TC(tp, bound3);
+	ATF_TP_ADD_TC(tp, bound4);
+	ATF_TP_ADD_TC(tp, subregion3);
+	ATF_TP_ADD_TC(tp, bound5);
+	ATF_TP_ADD_TC(tp, free);
+	ATF_TP_ADD_TC(tp, subregion4);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_filedesc.c b/contrib/netbsd-tests/kernel/t_filedesc.c
new file mode 100644
index 000000000000..6b367ee701c7
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_filedesc.c
@@ -0,0 +1,108 @@
+/*	$NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $");
+
+#include <sys/types.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../h_macros.h"
+
+ATF_TC(getfilerace);
+ATF_TC_HEAD(getfilerace, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "race between multithreaded proc. "
+	    "fd_getfile() and fd_close() (PR kern/43694)");
+}
+
+static int fd;
+static volatile bool quit;
+
+static void *
+wrkwrk(void *arg)
+{
+
+	/* just something to cause fd_getfile() to be called */
+	while (!quit)
+		rump_sys_write(fd, &fd, sizeof(fd));
+
+	return NULL;
+}
+
+/* for me, 1000 triggers extremely seldom, 10k sometimes, 100k almost always */
+#define DEFAULT_ITERATIONS 10000
+
+ATF_TC_BODY(getfilerace, tc)
+{
+	pthread_t pt;
+	int fd_wrk;
+	int i, iters;
+
+	/*
+	 * Want a multiprocessor virtual kernel.  A multiprocessor host
+	 * probably helps too, but that's harder to do in software...
+	 */
+	setenv("RUMP_NCPU", "2", 1);
+	rump_init();
+
+	fd = fd_wrk = rump_sys_open("/dev/null", O_RDWR, 0);
+	if (fd == -1)
+		atf_tc_fail_errno("cannot open /dev/null");
+
+	if (atf_tc_has_config_var(tc, "iters"))
+		iters = atoi(atf_tc_get_config_var(tc, "iters"));
+	else
+		iters = DEFAULT_ITERATIONS;
+
+	pthread_create(&pt, NULL, wrkwrk, NULL);
+	for (i = 0; i < iters; i++) {
+		rump_sys_close(fd_wrk);
+		fd_wrk = rump_sys_open("/dev/null", O_RDWR, 0);
+		assert(fd == fd_wrk);
+	}
+
+	quit = true;
+	pthread_join(pt, NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, getfilerace);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_kauth_pr_47598.c b/contrib/netbsd-tests/kernel/t_kauth_pr_47598.c
new file mode 100644
index 000000000000..f54b289974de
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_kauth_pr_47598.c
@@ -0,0 +1,169 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2013\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_kauth_pr_47598.c,v 1.3 2014/04/28 08:34:16 martin Exp $");
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/sysctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <atf-c.h>
+
+/*
+ * helper function
+ */
+static const char curtain_name[] = "security.models.bsd44.curtain";
+static const char securelevel_name[] = "security.models.bsd44.securelevel";
+
+static bool may_lower_curtain(void);
+static int get_curtain(void);
+static void set_curtain(int newval);
+
+static bool
+may_lower_curtain(void)
+{
+	int seclevel;
+	size_t len = sizeof(seclevel);
+
+	if (sysctlbyname(securelevel_name, &seclevel, &len, NULL, 0) != 0)
+		atf_tc_fail("failed to read %s", securelevel_name);
+
+	return seclevel <= 0;
+}
+
+static int
+get_curtain(void)
+{
+	int curtain;
+	size_t len = sizeof(curtain);
+
+	if (sysctlbyname(curtain_name, &curtain, &len, NULL, 0) != 0)
+		atf_tc_fail("failed to read %s", curtain_name);
+
+	return curtain;
+}
+
+static void
+set_curtain(int newval)
+{
+
+	if (sysctlbyname(curtain_name, NULL, 0, &newval, sizeof(newval)) != 0)
+		atf_tc_fail("failed to set %s to %d", curtain_name, newval);
+}
+
+/*
+ * PR kern/47598: if security.models.extensions.curtain = 1 we crash when
+ * doing a netstat while an embryonic (not yet fully accepted) connection
+ * exists.
+ * This has been fixed with rev. 1.5 of
+ *   src/sys/secmodel/extensions/secmodel_extensions.c.
+ */
+
+
+ATF_TC(kauth_curtain);
+ATF_TC_HEAD(kauth_curtain, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "require.progs", "netstat");
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks for kernel crash with curtain active (PR kern/47598)");
+}
+
+ATF_TC_BODY(kauth_curtain, tc)
+{
+
+	int old_curtain, s, s2, err;
+	socklen_t slen;
+	struct sockaddr_in sa;
+
+	/*
+	 * save old value of "curtain" and enable it
+	 */
+	old_curtain = get_curtain();
+	if (old_curtain < 1 && !may_lower_curtain())
+		atf_tc_skip("curtain is not enabled and we would not be able"
+		    " to drop it later due to securelevel settings");
+
+	set_curtain(1);
+
+	/*
+	 * create a socket and bind it to some arbitray free port
+	 */
+	s = socket(PF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0);
+	ATF_REQUIRE(s != -1);
+	memset(&sa, 0, sizeof(sa));
+	sa.sin_family = AF_INET;
+	sa.sin_len = sizeof(sa);
+	sa.sin_addr.s_addr = inet_addr("127.0.0.1");
+	ATF_REQUIRE(bind(s, (struct sockaddr *)&sa, sizeof(sa))==0);
+	ATF_REQUIRE(listen(s, 16)==0);
+
+	/*
+	 * extract address and open a connection to the port
+	 */
+	slen = sizeof(sa);
+	ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sa, &slen)==0);
+	s2 = socket(PF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0);
+	ATF_REQUIRE(s2 != -1);
+	printf("port is %d\n", ntohs(sa.sin_port));
+	err = connect(s2, (struct sockaddr *)&sa, sizeof(sa));
+	ATF_REQUIRE_MSG(err == -1 && errno == EINPROGRESS,
+	    "conect returned %d with errno %d", err, errno);
+	fflush(stdout);
+	fflush(stderr);
+
+	/*
+	 * we now have a pending, not yet accepted connection - run netstat
+	 */
+	system("netstat -aA");
+
+	/*
+	 * cleanup
+	 */
+	close(s2);
+	close(s);
+
+	/*
+	 * restore old value of curtain
+	 */
+	set_curtain(old_curtain);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, kauth_curtain);
+
+	return atf_no_error();
+}
+
+
diff --git a/contrib/netbsd-tests/kernel/t_lock.c b/contrib/netbsd-tests/kernel/t_lock.c
new file mode 100644
index 000000000000..3704afb14bc0
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_lock.c
@@ -0,0 +1,87 @@
+/* $NetBSD: t_lock.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_lock.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+
+#include <sys/time.h>
+
+#include <machine/lock.h>
+#include <signal.h>
+
+#include <atf-c.h>
+
+#include "../h_macros.h"
+
+__cpu_simple_lock_t lk;
+volatile int handled = 0;
+
+static void
+handler(int sig)
+{
+	handled = 1;
+	__cpu_simple_unlock(&lk);
+}
+
+ATF_TC(lock);
+ATF_TC_HEAD(lock, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "3");
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks __cpu_simple_lock()/__cpu_simple_unlock()");
+}
+ATF_TC_BODY(lock, tc)
+{
+	struct itimerval itv;
+
+	__cpu_simple_lock_init(&lk);
+
+	REQUIRE_LIBC(signal(SIGVTALRM, handler), SIG_ERR);
+
+	itv.it_interval.tv_sec = 0;
+	itv.it_interval.tv_usec = 0;
+	itv.it_value.tv_sec = 1;
+	itv.it_value.tv_usec = 0;
+	RL(setitimer(ITIMER_VIRTUAL, &itv, NULL));
+
+	__cpu_simple_lock(&lk);
+	__cpu_simple_lock(&lk);
+
+	ATF_REQUIRE(handled);
+
+	__cpu_simple_unlock(&lk);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, lock);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_lockf.c b/contrib/netbsd-tests/kernel/t_lockf.c
new file mode 100644
index 000000000000..d937301f320c
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_lockf.c
@@ -0,0 +1,262 @@
+/*	$NetBSD: t_lockf.c,v 1.9 2013/10/19 17:45:00 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/ptrace.h> 
+
+/*
+ * lockf1 regression test:
+ *
+ * Tests:
+ * Fork N child processes, each of which gets M random byte range locks
+ * on a common file.  We ignore all lock errors (practically speaking,
+ * this means EDEADLK or ENOLOCK), but we make numerous passes over all
+ * the children to make sure that they are still awake.  (We do this by
+ * verifying that we can ptrace(ATTACH/DETACH) to the children and get
+ * their status via waitpid().)
+ * When finished, reap all the children.
+ */
+
+#define	nlocks		500	/* number of locks per thread */
+#define	nprocs		10	/* number of processes to spawn */
+#define	npasses		50	/* number of passes to make over the children */
+#define	sleeptime	150000	/* sleep time between locks, usec */
+#define	filesize 	8192	/* size of file to lock */
+
+const char *lockfile = "lockf_test";
+
+static u_int32_t
+random_uint32(void)
+{
+	return lrand48();
+}
+
+static void
+trylocks(int id)
+{
+	int i, fd;
+
+	srand48(getpid());
+
+	fd = open (lockfile, O_RDWR, 0);
+        
+	if (fd < 0)
+		err(1, "%s", lockfile);
+
+	printf("%d: start\n", id);
+
+	for (i = 0; i < nlocks; i++) {
+		struct flock fl;
+
+		fl.l_start = random_uint32() % filesize;
+		fl.l_len = random_uint32() % filesize;
+		switch (random_uint32() % 3) {
+		case 0:
+			fl.l_type = F_RDLCK;
+			break;
+		case 1:
+			fl.l_type = F_WRLCK;
+			break;
+		case 2:
+			fl.l_type = F_UNLCK;
+			break;
+		}
+		fl.l_whence = SEEK_SET;
+
+		(void)fcntl(fd, F_SETLKW, &fl);
+
+		if (usleep(sleeptime) < 0) 
+		  err(1, "usleep");
+	}
+	printf("%d: done\n", id);
+	close (fd);
+}
+
+ATF_TC(randlock);
+ATF_TC_HEAD(randlock, tc)
+{  
+
+	atf_tc_set_md_var(tc, "timeout", "300");
+	atf_tc_set_md_var(tc, "descr", "Checks fcntl(2) locking");
+}
+
+ATF_TC_BODY(randlock, tc)
+{
+	int i, j, fd;
+	int pipe_fd[2];
+	pid_t *pid;
+	int status;
+	char pipe_in, pipe_out;
+	const char pipe_errmsg[] = "child: pipe write failed\n";
+
+	(void)unlink(lockfile);
+
+	fd = open (lockfile, O_RDWR|O_CREAT|O_EXCL|O_TRUNC, 0666);
+	ATF_REQUIRE_MSG(fd >= 0, "open(%s): %s", lockfile, strerror(errno));
+
+	ATF_REQUIRE_MSG(ftruncate(fd, filesize) >= 0,
+	    "ftruncate(%s): %s", lockfile, strerror(errno));
+
+	ATF_REQUIRE_MSG(pipe(pipe_fd) == 0, "pipe: %s", strerror(errno));
+
+	fsync(fd);
+	close(fd);
+
+	pid = malloc(nprocs * sizeof(pid_t));
+	
+	for (i = 0; i < nprocs; i++) {
+		pipe_out = (char)('A' + i);
+		pid[i] = fork();
+		switch (pid[i]) {
+		case 0:
+			if (write(pipe_fd[1], &pipe_out, 1) != 1)
+				write(STDERR_FILENO, pipe_errmsg,
+				    __arraycount(pipe_errmsg) - 1);
+			else
+				trylocks(i);
+			_exit(0);
+			break;
+		case -1:
+			atf_tc_fail("fork %d failed", i);
+			break;
+		default:
+			ATF_REQUIRE_MSG(read(pipe_fd[0], &pipe_in, 1) == 1,
+			    "parent: read_pipe(%i): %s", i, strerror(errno));
+			ATF_REQUIRE_MSG(pipe_in == pipe_out,
+			    "parent: pipe does not match");
+			break;
+		}
+	}
+	for (j = 0; j < npasses; j++) {
+		printf("parent: run %i\n", j+1);
+		for (i = 0; i < nprocs; i++) {
+			ATF_REQUIRE_MSG(ptrace(PT_ATTACH, pid[i], 0, 0) >= 0,
+			    "ptrace attach %d", pid[i]);
+			ATF_REQUIRE_MSG(waitpid(pid[i], &status, WUNTRACED) >= 0,
+			    "waitpid(ptrace)");
+			usleep(sleeptime / 3);
+			ATF_REQUIRE_MSG(ptrace(PT_DETACH, pid[i], (caddr_t)1,
+					       0) >= 0,
+			    "ptrace detach %d", pid[i]);
+			usleep(sleeptime / 3);
+		}
+	}
+	for (i = 0; i < nprocs; i++) {
+		printf("reap %d: ", i);
+		fflush(stdout);
+		kill(pid[i], SIGINT);
+		waitpid(pid[i], &status, 0);
+		printf(" status %d\n", status);
+	}
+	atf_tc_pass();
+}
+
+static int
+dolock(int fd, int op, off_t lk_off, off_t lk_size)
+{
+	off_t result;
+	int ret;
+
+	result = lseek(fd, lk_off, SEEK_SET);
+	if (result == -1) {
+		return errno;
+	}
+	ATF_REQUIRE_MSG(result == lk_off, "lseek to wrong offset");
+	ret = lockf(fd, op, lk_size);
+	if (ret == -1) {
+		return errno;
+	}
+	return 0;
+}
+
+ATF_TC(deadlock);
+ATF_TC_HEAD(deadlock, tc)
+{  
+
+	atf_tc_set_md_var(tc, "timeout", "30");
+	atf_tc_set_md_var(tc, "descr", "Checks fcntl(2) deadlock detection");
+}
+
+ATF_TC_BODY(deadlock, tc)
+{
+	int fd;
+	int error;
+	int ret;
+	pid_t pid;
+
+	(void)unlink(lockfile);
+
+	fd = open (lockfile, O_RDWR|O_CREAT|O_EXCL|O_TRUNC, 0666);
+	ATF_REQUIRE_MSG(fd >= 0, "open(%s): %s", lockfile, strerror(errno));
+
+	ATF_REQUIRE_MSG(ftruncate(fd, filesize) >= 0,
+	    "ftruncate(%s): %s", lockfile, strerror(errno));
+
+	fsync(fd);
+
+	error = dolock(fd, F_LOCK, 0, 1);
+	ATF_REQUIRE_MSG(error == 0, "initial dolock: %s", strerror(errno));
+
+	pid = fork();
+	ATF_REQUIRE_MSG(pid != -1, "fork failed: %s", strerror(errno));
+	if (pid == 0) {
+		error = dolock(fd, F_LOCK, 1, 1);
+		ATF_REQUIRE_MSG(error == 0, "child dolock: %s",
+		    strerror(errno));
+		dolock(fd, F_LOCK, 0, 1);	/* will block */
+		atf_tc_fail("child did not block");
+	}
+	sleep(1);	/* give child time to grab its lock then block */
+
+	error = dolock(fd, F_LOCK, 1, 1);
+	ATF_REQUIRE_MSG(error == EDEADLK, "parent did not detect deadlock: %s",
+	    strerror(errno));
+	ret = kill(pid, SIGKILL);
+	ATF_REQUIRE_MSG(ret != -1, "failed to kill child: %s", strerror(errno));
+
+	atf_tc_pass();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, randlock); 
+	ATF_TP_ADD_TC(tp, deadlock); 
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_mqueue.c b/contrib/netbsd-tests/kernel/t_mqueue.c
new file mode 100644
index 000000000000..2a0310116207
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_mqueue.c
@@ -0,0 +1,137 @@
+/*	$NetBSD: t_mqueue.c,v 1.4 2014/03/02 19:56:48 jmmv Exp $ */
+
+/*
+ * Test for POSIX message queue priority handling.
+ *
+ * This file is in the Public Domain.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <mqueue.h>
+
+#define	MQ_PRIO_BASE	24
+
+static void
+send_msgs(mqd_t mqfd)
+{
+	char msg[2];
+
+	msg[1] = '\0';
+
+	msg[0] = 'a';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), MQ_PRIO_BASE) != -1,
+	    "mq_send 1 failed: %d", errno);
+
+	msg[0] = 'b';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), MQ_PRIO_BASE + 1) != -1,
+	    "mq_send 2 failed: %d", errno);
+
+	msg[0] = 'c';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), MQ_PRIO_BASE) != -1,
+	    "mq_send 3 failed: %d", errno);
+
+	msg[0] = 'd';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), MQ_PRIO_BASE - 1) != -1,
+	    "mq_send 4 failed: %d", errno);
+
+	msg[0] = 'e';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), 0) != -1,
+	    "mq_send 5 failed: %d", errno);
+
+	msg[0] = 'f';
+	ATF_REQUIRE_MSG(mq_send(mqfd, msg, sizeof(msg), MQ_PRIO_BASE + 1) != -1,
+	    "mq_send 6 failed: %d", errno);
+}
+
+static void
+receive_msgs(mqd_t mqfd)
+{
+	struct mq_attr mqa;
+	char *m;
+	unsigned p;
+	int len;
+
+	ATF_REQUIRE_MSG(mq_getattr(mqfd, &mqa) != -1, "mq_getattr failed %d",
+	    errno);
+
+	len = mqa.mq_msgsize;
+	m = calloc(1, len);
+	ATF_REQUIRE_MSG(m != NULL, "calloc failed");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 1 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == (MQ_PRIO_BASE + 1) && m[0] == 'b',
+	    "mq_receive 1 prio/data mismatch");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 2 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == (MQ_PRIO_BASE + 1) && m[0] == 'f',
+	    "mq_receive 2 prio/data mismatch");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 3 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == MQ_PRIO_BASE && m[0] == 'a',
+	    "mq_receive 3 prio/data mismatch");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 4 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == MQ_PRIO_BASE && m[0] == 'c',
+	    "mq_receive 4 prio/data mismatch");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 5 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == (MQ_PRIO_BASE - 1) && m[0] == 'd',
+	    "mq_receive 5 prio/data mismatch");
+
+	ATF_REQUIRE_MSG(mq_receive(mqfd, m, len, &p) != -1,
+	    "mq_receive 6 failed: %d", errno);
+	ATF_REQUIRE_MSG(p == 0 && m[0] == 'e',
+	    "mq_receive 6 prio/data mismatch");
+}
+
+ATF_TC(mqueue);
+ATF_TC_HEAD(mqueue, tc)
+{
+
+	atf_tc_set_md_var(tc, "timeout", "3");
+	atf_tc_set_md_var(tc, "descr", "Checks mqueue send/receive");
+}
+
+ATF_TC_BODY(mqueue, tc)
+{
+	int status;
+	char *tmpdir;
+	char template[32];
+	char mq_name[64];
+
+	strlcpy(template, "./t_mqueue.XXXXXX", sizeof(template));
+	tmpdir = mkdtemp(template);
+	ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed: %d", errno);
+	snprintf(mq_name, sizeof(mq_name), "%s/mq", tmpdir);
+
+	mqd_t mqfd;
+
+	mqfd = mq_open(mq_name, O_RDWR | O_CREAT,
+	    S_IRUSR | S_IRWXG | S_IROTH, NULL);
+	ATF_REQUIRE_MSG(mqfd != -1, "mq_open failed: %d", errno);
+
+	send_msgs(mqfd);
+	receive_msgs(mqfd);
+
+	status = mq_close(mqfd);
+	ATF_REQUIRE_MSG(status == 0, "mq_close failed: %d", errno);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mqueue); 
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_ps_strings.sh b/contrib/netbsd-tests/kernel/t_ps_strings.sh
new file mode 100755
index 000000000000..8adba54a7861
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_ps_strings.sh
@@ -0,0 +1,85 @@
+# $NetBSD: t_ps_strings.sh,v 1.1 2011/03/05 18:14:33 pgoyette Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case validate
+validate_head()
+{
+	atf_set "descr" "Validates ps_strings passed to program"
+}
+validate_body()
+{
+	atf_check -s exit:0 -o ignore -e ignore \
+		$(atf_get_srcdir)/h_ps_strings1
+}
+
+# Function to parse and validate the output from ps
+
+parse_ps() {
+	local pid seq arg
+
+	pid="$1" ; shift
+
+	while [ "$1" != "$pid" ] ; do
+		echo $1
+		shift
+	done
+	if [ $# -eq 0 ] ; then
+		echo "NO_PID"
+		return
+	fi
+	shift
+
+	seq=0
+	while [ $# -gt 1 ] ; do
+		arg=$(printf "arg%04x" $seq)
+		if [ "$arg" != "$1" ] ; then
+			echo BAD_$seq
+			return
+		fi
+		shift
+	done
+	echo "OK"
+}
+
+atf_test_case update
+update_head()
+{
+	atf_set "descr" "Check updating of ps_strings"
+}
+update_body()
+{
+	$(atf_get_srcdir)/h_ps_strings2 > /dev/null 2>&1 &
+	h_pid=$!
+	parse=$(parse_ps $h_pid $(ps -wwo pid,args -p $h_pid) )
+	kill $h_pid
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case validate
+	atf_add_test_case update
+}
diff --git a/contrib/netbsd-tests/kernel/t_pty.c b/contrib/netbsd-tests/kernel/t_pty.c
new file mode 100644
index 000000000000..fccfc17b6eda
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_pty.c
@@ -0,0 +1,351 @@
+/* $Id: t_pty.c,v 1.1 2011/09/24 15:53:01 christos Exp $ */
+
+/*
+ * Allocates a pty(4) device, and sends the specified number of packets of the
+ * specified length though it, while a child reader process reads and reports
+ * results.
+ *
+ * Written by Matthew Mondor
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_pty.c,v 1.1 2011/09/24 15:53:01 christos Exp $");
+
+#include <errno.h>
+#include <err.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <stdio.h>
+#ifdef __linux__
+#define _XOPEN_SOURCE
+#define __USE_XOPEN
+#endif
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#ifdef STANDALONE
+static __dead void	usage(const char *);
+static void		parse_args(int, char **);
+#else
+#include <atf-c.h>
+#include "../h_macros.h"
+#endif
+
+static int		pty_open(void);
+static int		tty_open(const char *);
+static void		fd_nonblock(int);
+static pid_t		child_spawn(const char *);
+static void		run(void);
+
+static size_t		buffer_size = 4096;
+static size_t		packets = 2;
+static uint8_t		*dbuf;
+static int		verbose;
+static int		qsize;
+
+
+static
+void run(void)
+{
+	size_t i;
+	int pty;
+	int status;
+	pid_t child;
+	if ((dbuf = calloc(1, buffer_size)) == NULL)
+		err(EXIT_FAILURE, "malloc(%zu)", buffer_size);
+
+	if (verbose)
+		(void)printf(
+		    "parent: started; opening PTY and spawning child\n");
+	pty = pty_open();
+	child = child_spawn(ptsname(pty));
+	if (verbose)
+		(void)printf("parent: sleeping to make sure child is ready\n");
+	(void)sleep(1);
+
+	for (i = 0; i < buffer_size; i++)
+		dbuf[i] = i & 0xff;
+
+	if (verbose)
+		(void)printf("parent: writing\n");
+
+	for (i = 0; i < packets; i++) {
+		ssize_t	size;
+
+		if (verbose)
+			(void)printf(
+			    "parent: attempting to write %zu bytes to PTY\n",
+			    buffer_size);
+		if ((size = write(pty, dbuf, buffer_size)) == -1) {
+			err(EXIT_FAILURE, "parent: write()");
+			break;
+		}
+		if (verbose)
+			(void)printf("parent: wrote %zd bytes to PTY\n", size);
+	}
+
+	if (verbose)
+		(void)printf("parent: waiting for child to exit\n");
+	if (waitpid(child, &status, 0) == -1)
+		err(EXIT_FAILURE, "waitpid");
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		errx(EXIT_FAILURE, "child failed");
+
+	if (verbose)
+		(void)printf("parent: closing PTY\n");
+	(void)close(pty);
+	if (verbose)
+		(void)printf("parent: exiting\n");
+}
+
+static void
+condition(int fd)
+{
+	struct termios	tios;
+
+	if (qsize) {
+		int opt = qsize;
+		if (ioctl(fd, TIOCSQSIZE, &opt) == -1)
+			err(EXIT_FAILURE, "Couldn't set tty(4) buffer size");
+		if (ioctl(fd, TIOCGQSIZE, &opt) == -1)
+			err(EXIT_FAILURE, "Couldn't get tty(4) buffer size");
+		if (opt != qsize)
+			errx(EXIT_FAILURE, "Wrong qsize %d != %d\n",
+			    qsize, opt);
+	}
+	if (tcgetattr(fd, &tios) == -1)
+		err(EXIT_FAILURE, "tcgetattr()");
+	cfmakeraw(&tios);
+	cfsetspeed(&tios, B921600);
+	if (tcsetattr(fd, TCSANOW, &tios) == -1)
+		err(EXIT_FAILURE, "tcsetattr()");
+}
+
+static int
+pty_open(void)
+{
+	int	fd;
+
+	if ((fd = posix_openpt(O_RDWR)) == -1)
+		err(EXIT_FAILURE, "Couldn't pty(4) device");
+	condition(fd);
+	if (grantpt(fd) == -1)
+		err(EXIT_FAILURE,
+		    "Couldn't grant permissions on tty(4) device");
+
+
+	condition(fd);
+
+	if (unlockpt(fd) == -1)
+		err(EXIT_FAILURE, "unlockpt()");
+
+	return fd;
+}
+
+static int
+tty_open(const char *ttydev)
+{
+	int		fd;
+
+	if ((fd = open(ttydev, O_RDWR, 0)) == -1)
+		err(EXIT_FAILURE, "Couldn't open tty(4) device");
+
+#ifdef USE_PPP_DISCIPLINE
+	{
+		int	opt = PPPDISC;
+		if (ioctl(fd, TIOCSETD, &opt) == -1)
+			err(EXIT_FAILURE,
+			    "Couldn't set tty(4) discipline to PPP");
+	}
+#endif
+
+	condition(fd);
+
+	return fd;
+}
+
+static void
+fd_nonblock(int fd)
+{
+	int	opt;
+
+	if ((opt = fcntl(fd, F_GETFL, NULL)) == -1)
+		err(EXIT_FAILURE, "fcntl()");
+	if (fcntl(fd, F_SETFL, opt | O_NONBLOCK) == -1)
+		err(EXIT_FAILURE, "fcntl()");
+}
+
+static pid_t
+child_spawn(const char *ttydev)
+{
+	pid_t		pid;
+	int		tty;
+	struct pollfd	pfd;
+	size_t		total = 0;
+
+	if ((pid = fork()) == -1)
+		err(EXIT_FAILURE, "fork()");
+	(void)setsid();
+	if (pid != 0)
+		return pid;
+
+	if (verbose)
+		(void)printf("child: started; open \"%s\"\n", ttydev);
+	tty = tty_open(ttydev);
+	fd_nonblock(tty);
+
+	if (verbose)
+		(void)printf("child: TTY open, starting read loop\n");
+	pfd.fd = tty;
+	pfd.events = POLLIN;
+	pfd.revents = 0;
+	for (;;) {
+		int	ret;
+		ssize_t	size;
+
+		if (verbose)
+			(void)printf("child: polling\n");
+		if ((ret = poll(&pfd, 1, 2000)) == -1)
+			err(EXIT_FAILURE, "child: poll()");
+		if (ret == 0)
+			break;
+		if ((pfd.revents & POLLERR) != 0)
+			break;
+		if ((pfd.revents & POLLIN) != 0) {
+			for (;;) {
+				if (verbose)
+					(void)printf(
+					    "child: attempting to read %zu"
+					    " bytes\n", buffer_size);
+				if ((size = read(tty, dbuf, buffer_size))
+				    == -1) {
+					if (errno == EAGAIN)
+						break;
+					err(EXIT_FAILURE, "child: read()");
+				}
+				if (qsize && size < qsize &&
+				    (size_t)size < buffer_size)
+					errx(EXIT_FAILURE, "read returned %zd "
+					    "less than the queue size %d",
+					    size, qsize);
+				if (verbose)
+					(void)printf(
+					    "child: read %zd bytes from TTY\n",
+					    size);
+				if (size == 0)
+					goto end;
+				total += size;
+			}
+		}
+	}
+end:
+	if (verbose)
+		(void)printf("child: closing TTY %zu\n", total);
+	(void)close(tty);
+	if (verbose)
+		(void)printf("child: exiting\n");
+	if (total != buffer_size * packets)
+		errx(EXIT_FAILURE,
+		    "Lost data %zu != %zu\n", total, buffer_size * packets);
+
+	exit(EXIT_SUCCESS);
+}
+
+#ifdef STANDALONE
+static void
+usage(const char *msg)
+{
+
+	if (msg != NULL)
+		(void) fprintf(stderr, "\n%s\n\n", msg);
+
+	(void)fprintf(stderr,
+	    "Usage: %s [-v] [-q <qsize>] [-s <packetsize>] [-n <packets>]\n",
+		getprogname());
+
+	exit(EXIT_FAILURE);
+}
+
+static void
+parse_args(int argc, char **argv)
+{
+	int	ch;
+
+	while ((ch = getopt(argc, argv, "n:q:s:v")) != -1) {
+		switch (ch) {
+		case 'n':
+			packets = (size_t)atoi(optarg);
+			break;
+		case 'q':
+			qsize = atoi(optarg);
+			break;
+		case 's':
+			buffer_size = (size_t)atoi(optarg);
+			break;
+		case 'v':
+			verbose++;
+			break;
+		default:
+			usage(NULL);
+			break;
+		}
+	}
+	if (buffer_size < 0 || buffer_size > 65536)
+		usage("-s must be between 0 and 65536");
+	if (packets < 1 || packets > 100)
+		usage("-p must be between 1 and 100");
+}
+
+int
+main(int argc, char **argv)
+{
+
+	parse_args(argc, argv);
+	run();
+	exit(EXIT_SUCCESS);
+}
+
+#else
+ATF_TC(pty_no_queue);
+
+ATF_TC_HEAD(pty_no_queue, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Checks that writing to pty "
+	    "does not lose data with the default queue size of 1024");
+}
+
+ATF_TC_BODY(pty_no_queue, tc)
+{
+	qsize = 0;
+	run();
+}
+
+ATF_TC(pty_queue);
+
+ATF_TC_HEAD(pty_queue, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Checks that writing to pty "
+	    "does not lose data with the a queue size of 4096");
+}
+
+ATF_TC_BODY(pty_queue, tc)
+{
+	qsize = 4096;
+	run();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+        ATF_TP_ADD_TC(tp, pty_no_queue);
+        ATF_TP_ADD_TC(tp, pty_queue);
+
+        return atf_no_error();
+}
+#endif
diff --git a/contrib/netbsd-tests/kernel/t_rnd.c b/contrib/netbsd-tests/kernel/t_rnd.c
new file mode 100644
index 000000000000..7f1f28844b7e
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_rnd.c
@@ -0,0 +1,95 @@
+/*	$NetBSD: t_rnd.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_rnd.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $");
+
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/rnd.h>
+
+#include <atf-c.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../h_macros.h"
+
+ATF_TC(RNDADDDATA);
+ATF_TC_HEAD(RNDADDDATA, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks ioctl(RNDADDDATA) (PR kern/42020)");
+}
+
+/* Adapted from example provided by Juho Salminen in the noted PR. */
+ATF_TC_BODY(RNDADDDATA, tc)
+{
+	rnddata_t rd;
+	int fd;
+
+	rump_init();
+	fd = rump_sys_open("/dev/random", O_RDWR, 0);
+	if (fd == -1)
+		atf_tc_fail_errno("cannot open /dev/random");
+
+	rd.entropy = 1;
+	rd.len = 1;
+	if (rump_sys_ioctl(fd, RNDADDDATA, &rd) == -1)
+		atf_tc_fail_errno("RNDADDDATA");
+}
+
+ATF_TC(RNDADDDATA2);
+ATF_TC_HEAD(RNDADDDATA2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "checks ioctl(RNDADDDATA) deals with "
+	    "garbage len field");
+}
+ATF_TC_BODY(RNDADDDATA2, tc)
+{
+	rnddata_t rd;
+	int fd;
+
+	rump_init();
+	fd = rump_sys_open("/dev/random", O_RDWR, 0);
+	if (fd == -1)
+		atf_tc_fail_errno("cannot open /dev/random");
+		
+	rd.entropy = 1;
+	rd.len = -1;
+	ATF_REQUIRE_ERRNO(EINVAL, rump_sys_ioctl(fd, RNDADDDATA, &rd) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, RNDADDDATA);
+	ATF_TP_ADD_TC(tp, RNDADDDATA2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_sysctl.c b/contrib/netbsd-tests/kernel/t_sysctl.c
new file mode 100644
index 000000000000..8b7c97eb3516
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_sysctl.c
@@ -0,0 +1,74 @@
+/* $NetBSD: t_sysctl.c,v 1.1 2014/08/09 07:04:03 gson Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2014\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sysctl.c,v 1.1 2014/08/09 07:04:03 gson Exp $");
+
+#include <sys/sysctl.h>
+#include <errno.h>
+#include <memory.h>
+
+#include <atf-c.h>
+
+ATF_TC(bufsize);
+ATF_TC_HEAD(bufsize, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	        "Test sysctl integer reads with different buffer sizes");
+}
+ATF_TC_BODY(bufsize, tc)
+{
+	union {
+		int int_val;
+		unsigned char space[256];
+	} buf;
+	size_t len;
+	for (len = 0; len < sizeof(buf); len++) {
+		size_t oldlen = len;
+		int r;
+		memset(&buf, 0xFF, sizeof(buf));
+		r = sysctlbyname("kern.job_control", &buf, &oldlen, 0, (size_t) 0);
+		if (len < sizeof(int)) {
+			ATF_REQUIRE_EQ(r, -1);
+			ATF_REQUIRE_EQ(errno, ENOMEM);
+		} else {
+			ATF_REQUIRE_EQ(r, 0);
+			ATF_REQUIRE_EQ(buf.int_val, 1);
+			ATF_REQUIRE_EQ(oldlen, sizeof(int));
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, bufsize);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/kernel/t_sysv.c b/contrib/netbsd-tests/kernel/t_sysv.c
new file mode 100644
index 000000000000..0860d4b35c68
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_sysv.c
@@ -0,0 +1,854 @@
+/*	$NetBSD: t_sysv.c,v 1.4 2014/03/02 20:13:12 jmmv Exp $	*/
+
+/*-
+ * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center, and by Andrew Doran.
+ *
+ * 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.
+ */
+
+/*
+ * Test the SVID-compatible Message Queue facility.
+ */
+
+#include <atf-c.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/param.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#include <sys/wait.h>
+
+volatile int did_sigsys, did_sigchild;
+volatile int child_status, child_count;
+
+void	sigsys_handler(int);
+void	sigchld_handler(int);
+
+key_t	get_ftok(int);
+
+void	print_msqid_ds(struct msqid_ds *, mode_t);
+void	receiver(void);
+
+void	print_semid_ds(struct semid_ds *, mode_t);
+void	waiter(void);
+
+void	print_shmid_ds(struct shmid_ds *, mode_t);
+void	sharer(void);
+
+#define	MESSAGE_TEXT_LEN	256
+
+struct mymsg {
+	long	mtype;
+	char	mtext[MESSAGE_TEXT_LEN];
+};
+
+const char *m1_str = "California is overrated.";
+const char *m2_str = "The quick brown fox jumped over the lazy dog.";
+
+size_t	pgsize;
+
+#define	MTYPE_1		1
+#define	MTYPE_1_ACK	2
+
+#define	MTYPE_2		3
+#define	MTYPE_2_ACK	4
+
+pid_t	child_pid;
+
+key_t	msgkey, semkey, shmkey;
+
+int	maxloop = 1;
+
+union semun {
+	int	val;		/* value for SETVAL */
+	struct	semid_ds *buf;	/* buffer for IPC_{STAT,SET} */
+	u_short	*array;		/* array for GETALL & SETALL */
+};
+
+
+/* Writes an integer to a file.  To be used from the body of the test
+ * cases below to pass any global identifiers to the cleanup routine. */
+static void
+write_int(const char *path, const int value)
+{
+	int output;
+
+	output = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	ATF_REQUIRE_MSG(output != -1, "Failed to create %s", path);
+	write(output, &value, sizeof(value));
+	close(output);
+}
+
+
+/* Reads an integer from a file.  To be used from the cleanup routines
+ * of the test cases below. */
+static int
+read_int(const char *path)
+{
+	int input;
+
+	input = open(path, O_RDONLY);
+	if (input == -1)
+		return -1;
+	else {
+		int value;
+		read(input, &value, sizeof(value));
+		return value;
+	}
+}
+
+
+void
+sigsys_handler(int signo)
+{
+
+	did_sigsys = 1;
+}
+
+void
+sigchld_handler(int signo)
+{
+	int c_status;
+
+	did_sigchild = 1;
+	/*
+	 * Reap the child and return its status
+	 */
+	if (wait(&c_status) == -1)
+		child_status = -errno;
+	else
+		child_status = c_status;
+
+	child_count--;
+}
+
+key_t get_ftok(int id)
+{
+	int fd;
+	char token_key[64], token_dir[64];
+	char *tmpdir;
+	key_t key;
+
+	strlcpy(token_key, "/tmp/t_sysv.XXXXXX", sizeof(token_key));
+	tmpdir = mkdtemp(token_key);
+	ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp() failed: %d", errno);
+
+	strlcpy(token_dir, tmpdir, sizeof(token_dir));
+	strlcpy(token_key, tmpdir, sizeof(token_key));
+	strlcat(token_key, "/token_key", sizeof(token_key));
+
+	/* Create the file, since ftok() requires it to exist! */
+
+	fd = open(token_key, O_RDWR | O_CREAT | O_EXCL);
+	if (fd == -1) {
+		rmdir(tmpdir);
+		atf_tc_fail("open() of temp file failed: %d", errno);
+		return (key_t)-1;
+	} else
+		close(fd);
+
+	key = ftok(token_key, id);
+
+	ATF_REQUIRE_MSG(unlink(token_key) != -1, "unlink() failed: %d", errno);
+	ATF_REQUIRE_MSG(rmdir(token_dir) != -1, "rmdir() failed: %d", errno);
+
+	return key;
+}
+
+ATF_TC_WITH_CLEANUP(msg);
+ATF_TC_HEAD(msg, tc)
+{  
+
+	atf_tc_set_md_var(tc, "timeout", "3");
+	atf_tc_set_md_var(tc, "descr", "Checks sysvmsg passing");
+}
+
+ATF_TC_BODY(msg, tc)
+{
+	struct sigaction sa;
+	struct msqid_ds m_ds;
+	struct mymsg m;
+	sigset_t sigmask;
+	int sender_msqid;
+	int loop;
+	int c_status;
+
+	/*
+	 * Install a SIGSYS handler so that we can exit gracefully if
+	 * System V Message Queue support isn't in the kernel.
+	 */
+	did_sigsys = 0;
+	sa.sa_handler = sigsys_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGSYS, &sa, NULL) != -1,
+	    "sigaction SIGSYS: %d", errno);
+
+	/*
+	 * Install a SIGCHLD handler to deal with all possible exit
+	 * conditions of the receiver.
+	 */
+	did_sigchild = 0;
+	child_count = 0;
+	sa.sa_handler = sigchld_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGCHLD, &sa, NULL) != -1,
+	    "sigaction SIGCHLD: %d", errno);
+
+	msgkey = get_ftok(4160);
+	ATF_REQUIRE_MSG(msgkey != (key_t)-1, "get_ftok failed");
+
+	sender_msqid = msgget(msgkey, IPC_CREAT | 0640);
+	ATF_REQUIRE_MSG(sender_msqid != -1, "msgget: %d", errno);
+	write_int("sender_msqid", sender_msqid);
+
+	if (did_sigsys) {
+		atf_tc_skip("SYSV Message Queue not supported");
+		return;
+	}
+
+	ATF_REQUIRE_MSG(msgctl(sender_msqid, IPC_STAT, &m_ds) != -1,
+	"msgctl IPC_STAT 1: %d", errno);
+
+	print_msqid_ds(&m_ds, 0640);
+
+	m_ds.msg_perm.mode = (m_ds.msg_perm.mode & ~0777) | 0600;
+
+	ATF_REQUIRE_MSG(msgctl(sender_msqid, IPC_SET, &m_ds) != -1,
+	    "msgctl IPC_SET: %d", errno);
+
+	memset(&m_ds, 0, sizeof(m_ds));
+
+	ATF_REQUIRE_MSG(msgctl(sender_msqid, IPC_STAT, &m_ds) != -1,
+	    "msgctl IPC_STAT 2: %d", errno);
+
+	ATF_REQUIRE_MSG((m_ds.msg_perm.mode & 0777) == 0600,
+	    "IPC_SET of mode didn't hold");
+
+	print_msqid_ds(&m_ds, 0600);
+
+	switch ((child_pid = fork())) {
+	case -1:
+		atf_tc_fail("fork: %d", errno);
+		return;
+
+	case 0:
+		child_count++;
+		receiver();
+		break;
+
+	default:
+		break;
+	}
+
+	for (loop = 0; loop < maxloop; loop++) {
+		/*
+		 * Send the first message to the receiver and wait for the ACK.
+		 */
+		m.mtype = MTYPE_1;
+		strcpy(m.mtext, m1_str);
+		ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, MESSAGE_TEXT_LEN,
+		    0) != -1, "sender: msgsnd 1: %d", errno);
+
+		ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, MESSAGE_TEXT_LEN,
+				       MTYPE_1_ACK, 0) == MESSAGE_TEXT_LEN,
+		    "sender: msgrcv 1 ack: %d", errno);
+
+		print_msqid_ds(&m_ds, 0600);
+
+		/*
+		 * Send the second message to the receiver and wait for the ACK.
+		 */
+		m.mtype = MTYPE_2;
+		strcpy(m.mtext, m2_str);
+		ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, MESSAGE_TEXT_LEN, 0) != -1,
+		    "sender: msgsnd 2: %d", errno);
+
+		ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, MESSAGE_TEXT_LEN,
+				       MTYPE_2_ACK, 0) == MESSAGE_TEXT_LEN,
+		    "sender: msgrcv 2 ack: %d", errno);
+	}
+
+	/*
+	 * Wait for child to finish
+	 */
+	sigemptyset(&sigmask);
+	(void) sigsuspend(&sigmask);
+
+	/*
+	 * ...and any other signal is an unexpected error.
+	 */
+	if (did_sigchild) {
+		c_status = child_status;
+		if (c_status < 0)
+			atf_tc_fail("waitpid: %d", -c_status);
+		else if (WIFEXITED(c_status) == 0)
+			atf_tc_fail("child abnormal exit: %d", c_status);
+		else if (WEXITSTATUS(c_status) != 0)
+			atf_tc_fail("c status: %d", WEXITSTATUS(c_status));
+		else {
+			ATF_REQUIRE_MSG(msgctl(sender_msqid, IPC_STAT, &m_ds)
+			    != -1, "msgctl IPC_STAT: %d", errno);
+
+			print_msqid_ds(&m_ds, 0600);
+			atf_tc_pass();
+		}
+	} else
+		atf_tc_fail("sender: received unexpected signal");
+}
+
+ATF_TC_CLEANUP(msg, tc)
+{
+	int sender_msqid;
+
+	/*
+	 * Remove the message queue if it exists.
+	 */
+	sender_msqid = read_int("sender_msqid");
+	if (sender_msqid != -1)
+		if (msgctl(sender_msqid, IPC_RMID, NULL) == -1)
+			err(1, "msgctl IPC_RMID");
+}
+
+void
+print_msqid_ds(mp, mode)
+	struct msqid_ds *mp;
+	mode_t mode;
+{
+	uid_t uid = geteuid();
+	gid_t gid = getegid();
+
+	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
+	    mp->msg_perm.uid, mp->msg_perm.gid,
+	    mp->msg_perm.cuid, mp->msg_perm.cgid,
+	    mp->msg_perm.mode & 0777);
+
+	printf("qnum %lu, qbytes %lu, lspid %d, lrpid %d\n",
+	    mp->msg_qnum, (u_long)mp->msg_qbytes, mp->msg_lspid,
+	    mp->msg_lrpid);
+
+	printf("stime: %s", ctime(&mp->msg_stime));
+	printf("rtime: %s", ctime(&mp->msg_rtime));
+	printf("ctime: %s", ctime(&mp->msg_ctime));
+
+	/*
+	 * Sanity check a few things.
+	 */
+
+	ATF_REQUIRE_MSG(mp->msg_perm.uid == uid && mp->msg_perm.cuid == uid,
+	    "uid mismatch");
+
+	ATF_REQUIRE_MSG(mp->msg_perm.gid == gid && mp->msg_perm.cgid == gid,
+	    "gid mismatch");
+
+	ATF_REQUIRE_MSG((mp->msg_perm.mode & 0777) == mode, "mode mismatch");
+}
+
+void
+receiver()
+{
+	struct mymsg m;
+	int msqid, loop;
+
+	if ((msqid = msgget(msgkey, 0)) == -1)
+		err(1, "receiver: msgget");
+
+	for (loop = 0; loop < maxloop; loop++) {
+		/*
+		 * Receive the first message, print it, and send an ACK.
+		 */
+		if (msgrcv(msqid, &m, MESSAGE_TEXT_LEN, MTYPE_1, 0) != MESSAGE_TEXT_LEN)
+			err(1, "receiver: msgrcv 1");
+
+		printf("%s\n", m.mtext);
+		if (strcmp(m.mtext, m1_str) != 0)
+			err(1, "receiver: message 1 data isn't correct");
+
+		m.mtype = MTYPE_1_ACK;
+
+		if (msgsnd(msqid, &m, MESSAGE_TEXT_LEN, 0) == -1)
+			err(1, "receiver: msgsnd ack 1");
+
+		/*
+		 * Receive the second message, print it, and send an ACK.
+		 */
+
+		if (msgrcv(msqid, &m, MESSAGE_TEXT_LEN, MTYPE_2, 0) != MESSAGE_TEXT_LEN)
+			err(1, "receiver: msgrcv 2");
+
+		printf("%s\n", m.mtext);
+		if (strcmp(m.mtext, m2_str) != 0)
+			err(1, "receiver: message 2 data isn't correct");
+
+		m.mtype = MTYPE_2_ACK;
+
+		if (msgsnd(msqid, &m, MESSAGE_TEXT_LEN, 0) == -1)
+			err(1, "receiver: msgsnd ack 2");
+	}
+
+	exit(0);
+}
+
+/*
+ * Test the SVID-compatible Semaphore facility.
+ */
+
+ATF_TC_WITH_CLEANUP(sem);
+ATF_TC_HEAD(sem, tc)
+{  
+
+	atf_tc_set_md_var(tc, "timeout", "3");
+	atf_tc_set_md_var(tc, "descr", "Checks sysvmsg passing");
+}
+
+ATF_TC_BODY(sem, tc)
+{
+	struct sigaction sa;
+	union semun sun;
+	struct semid_ds s_ds;
+	sigset_t sigmask;
+	int sender_semid;
+	int i;
+	int c_status;
+
+	/*
+	 * Install a SIGSYS handler so that we can exit gracefully if
+	 * System V Semaphore support isn't in the kernel.
+	 */
+	did_sigsys = 0;
+	sa.sa_handler = sigsys_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGSYS, &sa, NULL) != -1,
+	    "sigaction SIGSYS: %d", errno);
+
+	/*
+	 * Install a SIGCHLD handler to deal with all possible exit
+	 * conditions of the receiver.
+	 */
+	did_sigchild = 0;
+	child_count = 0;
+	sa.sa_handler = sigchld_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGCHLD, &sa, NULL) != -1,
+	    "sigaction SIGCHLD: %d", errno);
+
+	semkey = get_ftok(4160);
+	ATF_REQUIRE_MSG(semkey != (key_t)-1, "get_ftok failed");
+
+	sender_semid = semget(semkey, 1, IPC_CREAT | 0640);
+	ATF_REQUIRE_MSG(sender_semid != -1, "semget: %d", errno);
+	write_int("sender_semid", sender_semid);
+
+	if (did_sigsys) {
+		atf_tc_skip("SYSV Semaphore not supported");
+		return;
+	}
+	
+	sun.buf = &s_ds;
+	ATF_REQUIRE_MSG(semctl(sender_semid, 0, IPC_STAT, sun) != -1,
+	    "semctl IPC_STAT: %d", errno);
+
+	print_semid_ds(&s_ds, 0640);
+
+	s_ds.sem_perm.mode = (s_ds.sem_perm.mode & ~0777) | 0600;
+
+	sun.buf = &s_ds;
+	ATF_REQUIRE_MSG(semctl(sender_semid, 0, IPC_SET, sun) != -1,
+	    "semctl IPC_SET: %d", errno);
+
+	memset(&s_ds, 0, sizeof(s_ds));
+
+	sun.buf = &s_ds;
+	ATF_REQUIRE_MSG(semctl(sender_semid, 0, IPC_STAT, sun) != -1,
+	    "semctl IPC_STAT: %d", errno);
+
+	ATF_REQUIRE_MSG((s_ds.sem_perm.mode & 0777) == 0600,
+	    "IPC_SET of mode didn't hold");
+
+	print_semid_ds(&s_ds, 0600);
+
+	for (child_count = 0; child_count < 5; child_count++) {
+		switch ((child_pid = fork())) {
+		case -1:
+			atf_tc_fail("fork: %d", errno);
+			return;
+
+		case 0:
+			waiter();
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	/*
+	 * Wait for all of the waiters to be attempting to acquire the
+	 * semaphore.
+	 */
+	for (;;) {
+		i = semctl(sender_semid, 0, GETNCNT);
+		if (i == -1)
+			atf_tc_fail("semctl GETNCNT: %d", i);
+		if (i == 5)
+			break;
+	}
+
+	/*
+	 * Now set the thundering herd in motion by initializing the
+	 * semaphore to the value 1.
+	 */
+	sun.val = 1;
+	ATF_REQUIRE_MSG(semctl(sender_semid, 0, SETVAL, sun) != -1,
+	    "sender: semctl SETVAL to 1: %d", errno);
+
+	/*
+	 * Wait for all children to finish
+	 */
+	sigemptyset(&sigmask);
+	for (;;) {
+		(void) sigsuspend(&sigmask);
+		if (did_sigchild) {
+			c_status = child_status;
+			if (c_status < 0)
+				atf_tc_fail("waitpid: %d", -c_status);
+			else if (WIFEXITED(c_status) == 0)
+				atf_tc_fail("c abnormal exit: %d", c_status);
+			else if (WEXITSTATUS(c_status) != 0)
+				atf_tc_fail("c status: %d",
+				    WEXITSTATUS(c_status));
+			else {
+				sun.buf = &s_ds;
+				ATF_REQUIRE_MSG(semctl(sender_semid, 0,
+						    IPC_STAT, sun) != -1,
+				    "semctl IPC_STAT: %d", errno);
+
+				print_semid_ds(&s_ds, 0600);
+				atf_tc_pass();
+			}
+			if (child_count <= 0)
+				break;
+			did_sigchild = 0;
+		} else {
+			atf_tc_fail("sender: received unexpected signal");
+			break;
+		}
+	}
+}
+
+ATF_TC_CLEANUP(sem, tc)
+{
+	int sender_semid;
+
+	/*
+	 * Remove the semaphore if it exists
+	 */
+	sender_semid = read_int("sender_semid");
+	if (sender_semid != -1)
+		if (semctl(sender_semid, 0, IPC_RMID) == -1)
+			err(1, "semctl IPC_RMID");
+}
+
+void
+print_semid_ds(sp, mode)
+	struct semid_ds *sp;
+	mode_t mode;
+{
+	uid_t uid = geteuid();
+	gid_t gid = getegid();
+
+	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
+	    sp->sem_perm.uid, sp->sem_perm.gid,
+	    sp->sem_perm.cuid, sp->sem_perm.cgid,
+	    sp->sem_perm.mode & 0777);
+
+	printf("nsems %u\n", sp->sem_nsems);
+
+	printf("otime: %s", ctime(&sp->sem_otime));
+	printf("ctime: %s", ctime(&sp->sem_ctime));
+
+	/*
+	 * Sanity check a few things.
+	 */
+
+	ATF_REQUIRE_MSG(sp->sem_perm.uid == uid && sp->sem_perm.cuid == uid,
+	    "uid mismatch");
+
+	ATF_REQUIRE_MSG(sp->sem_perm.gid == gid && sp->sem_perm.cgid == gid,
+	    "gid mismatch");
+
+	ATF_REQUIRE_MSG((sp->sem_perm.mode & 0777) == mode,
+	    "mode mismatch %o != %o", (sp->sem_perm.mode & 0777), mode);
+}
+
+void
+waiter()
+{
+	struct sembuf s;
+	int semid;
+
+	if ((semid = semget(semkey, 1, 0)) == -1)
+		err(1, "waiter: semget");
+
+	/*
+	 * Attempt to acquire the semaphore.
+	 */
+	s.sem_num = 0;
+	s.sem_op = -1;
+	s.sem_flg = SEM_UNDO;
+
+	if (semop(semid, &s, 1) == -1)
+		err(1, "waiter: semop -1");
+
+	printf("WOO!  GOT THE SEMAPHORE!\n");
+	sleep(1);
+
+	/*
+	 * Release the semaphore and exit.
+	 */
+	s.sem_num = 0;
+	s.sem_op = 1;
+	s.sem_flg = SEM_UNDO;
+
+	if (semop(semid, &s, 1) == -1)
+		err(1, "waiter: semop +1");
+
+	exit(0);
+}
+
+/*
+ * Test the SVID-compatible Shared Memory facility.
+ */
+
+ATF_TC_WITH_CLEANUP(shm);
+ATF_TC_HEAD(shm, tc)
+{  
+
+	atf_tc_set_md_var(tc, "timeout", "3");
+	atf_tc_set_md_var(tc, "descr", "Checks sysv shared memory");
+}
+
+ATF_TC_BODY(shm, tc)
+{
+	struct sigaction sa;
+	struct shmid_ds s_ds;
+	sigset_t sigmask;
+	char *shm_buf;
+	int sender_shmid;
+	int c_status;
+
+	/*
+	 * Install a SIGSYS handler so that we can exit gracefully if
+	 * System V Shared Memory support isn't in the kernel.
+	 */
+	did_sigsys = 0;
+	sa.sa_handler = sigsys_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGSYS, &sa, NULL) != -1,
+	    "sigaction SIGSYS: %d", errno);
+
+	/*
+	 * Install a SIGCHLD handler to deal with all possible exit
+	 * conditions of the sharer.
+	 */
+	did_sigchild = 0;
+	child_count = 0;
+	sa.sa_handler = sigchld_handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	ATF_REQUIRE_MSG(sigaction(SIGCHLD, &sa, NULL) != -1,
+	    "sigaction SIGCHLD: %d", errno);
+
+	pgsize = sysconf(_SC_PAGESIZE);
+
+	shmkey = get_ftok(4160);
+	ATF_REQUIRE_MSG(shmkey != (key_t)-1, "get_ftok failed");
+
+	ATF_REQUIRE_MSG((sender_shmid = shmget(shmkey, pgsize,
+					       IPC_CREAT | 0640)) != -1,
+	    "shmget: %d", errno);
+	write_int("sender_shmid", sender_shmid);
+
+	ATF_REQUIRE_MSG(shmctl(sender_shmid, IPC_STAT, &s_ds) != -1,
+	    "shmctl IPC_STAT: %d", errno);
+
+	print_shmid_ds(&s_ds, 0640);
+
+	s_ds.shm_perm.mode = (s_ds.shm_perm.mode & ~0777) | 0600;
+
+	ATF_REQUIRE_MSG(shmctl(sender_shmid, IPC_SET, &s_ds) != -1,
+	    "shmctl IPC_SET: %d", errno);
+
+	memset(&s_ds, 0, sizeof(s_ds));
+
+	ATF_REQUIRE_MSG(shmctl(sender_shmid, IPC_STAT, &s_ds) != -1,
+	    "shmctl IPC_STAT: %d", errno);
+
+	ATF_REQUIRE_MSG((s_ds.shm_perm.mode & 0777) == 0600,
+	    "IPC_SET of mode didn't hold");
+
+	print_shmid_ds(&s_ds, 0600);
+
+	shm_buf = shmat(sender_shmid, NULL, 0);
+	ATF_REQUIRE_MSG(shm_buf != (void *) -1, "sender: shmat: %d", errno);
+
+	/*
+	 * Write the test pattern into the shared memory buffer.
+	 */
+	strcpy(shm_buf, m2_str);
+
+	switch ((child_pid = fork())) {
+	case -1:
+		atf_tc_fail("fork: %d", errno);
+		return;
+
+	case 0:
+		sharer();
+		break;
+
+	default:
+		break;
+	}
+
+	/*
+	 * Wait for child to finish
+	 */
+	sigemptyset(&sigmask);
+	(void) sigsuspend(&sigmask);
+
+	if (did_sigchild) {
+		c_status = child_status;
+		if (c_status < 0)
+			atf_tc_fail("waitpid: %d", -c_status);
+		else if (WIFEXITED(c_status) == 0)
+			atf_tc_fail("c abnormal exit: %d", c_status);
+		else if (WEXITSTATUS(c_status) != 0)
+			atf_tc_fail("c status: %d", WEXITSTATUS(c_status));
+		else {
+			ATF_REQUIRE_MSG(shmctl(sender_shmid, IPC_STAT,
+					       &s_ds) != -1,
+			    "shmctl IPC_STAT: %d", errno);
+
+			print_shmid_ds(&s_ds, 0600);
+			atf_tc_pass();
+		}
+	} else
+		atf_tc_fail("sender: received unexpected signal");
+}
+
+ATF_TC_CLEANUP(shm, tc)
+{
+	int sender_shmid;
+
+	/*
+	 * Remove the shared memory area if it exists.
+	 */
+	sender_shmid = read_int("sender_shmid");
+	if (sender_shmid != -1)
+		if (shmctl(sender_shmid, IPC_RMID, NULL) == -1)
+			err(1, "shmctl IPC_RMID");
+}
+
+void
+print_shmid_ds(sp, mode)
+	struct shmid_ds *sp;
+	mode_t mode;
+{
+	uid_t uid = geteuid();
+	gid_t gid = getegid();
+
+	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
+	    sp->shm_perm.uid, sp->shm_perm.gid,
+	    sp->shm_perm.cuid, sp->shm_perm.cgid,
+	    sp->shm_perm.mode & 0777);
+
+	printf("segsz %lu, lpid %d, cpid %d, nattch %u\n",
+	    (u_long)sp->shm_segsz, sp->shm_lpid, sp->shm_cpid,
+	    sp->shm_nattch);
+
+	printf("atime: %s", ctime(&sp->shm_atime));
+	printf("dtime: %s", ctime(&sp->shm_dtime));
+	printf("ctime: %s", ctime(&sp->shm_ctime));
+
+	/*
+	 * Sanity check a few things.
+	 */
+
+	ATF_REQUIRE_MSG(sp->shm_perm.uid == uid && sp->shm_perm.cuid == uid,
+	    "uid mismatch");
+
+	ATF_REQUIRE_MSG(sp->shm_perm.gid == gid && sp->shm_perm.cgid == gid,
+	    "gid mismatch");
+
+	ATF_REQUIRE_MSG((sp->shm_perm.mode & 0777) == mode, "mode mismatch");
+}
+
+void
+sharer()
+{
+	int shmid;
+	void *shm_buf;
+
+	shmid = shmget(shmkey, pgsize, 0);
+	ATF_REQUIRE_MSG(shmid != -1, "receiver: shmget:%d", errno);
+
+	shm_buf = shmat(shmid, NULL, 0);
+	ATF_REQUIRE_MSG(shm_buf != (void *) -1, "receiver: shmat: %d", errno);
+
+	printf("%s\n", (const char *)shm_buf);
+	
+	ATF_REQUIRE_MSG(strcmp((const char *)shm_buf, m2_str) == 0,
+	    "receiver: data isn't correct");
+
+	exit(0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, msg); 
+	ATF_TP_ADD_TC(tp, sem); 
+	ATF_TP_ADD_TC(tp, shm); 
+
+	return atf_no_error();
+}
+
diff --git a/contrib/netbsd-tests/kernel/t_umount.sh b/contrib/netbsd-tests/kernel/t_umount.sh
new file mode 100755
index 000000000000..b62ba10245fb
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_umount.sh
@@ -0,0 +1,95 @@
+# $NetBSD: t_umount.sh,v 1.5 2010/11/07 17:51:19 jmmv Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+TMPMP=umount-f_mount
+TMPIM=umount-f.im
+
+VND=vnd0
+BVND=/dev/${VND}
+CVND=/dev/r${VND}
+MPART=a
+
+atf_test_case umount cleanup
+umount_head()
+{
+	atf_set "descr" "Checks forced unmounting"
+	atf_set "require.user" "root"
+}
+umount_body()
+{
+	cat >disktab <<EOF
+floppy288|2.88MB 3.5in Extra High Density Floppy:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+	:pb#5760:ob#0:\
+	:pc#5760:oc#0:
+EOF
+
+	echo "*** Creating a dummy directory tree at" \
+	     "${TMPMP} mounted on ${TMPIM}"
+
+	atf_check -o ignore -e ignore mkdir ${TMPMP}
+	atf_check -o ignore -e ignore touch ${TMPMP}/under_the_mount
+	atf_check -o ignore -e ignore dd if=/dev/zero of=${TMPIM} count=5860
+	atf_check -o ignore -e ignore vnconfig -v ${VND} ${TMPIM}
+	atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} floppy288
+	atf_check -o ignore -e ignore newfs -i 500 -b 8192 -f 1024 ${CVND}${MPART}
+	atf_check -o ignore -e ignore mount -o async ${BVND}${MPART} ${TMPMP}
+	atf_check -o ignore -e ignore touch ${TMPMP}/in_mounted_directory
+
+	echo "*** Testing forced unmount"
+	test -e "${TMPMP}/in_mounted_directory" || \
+	    atf_fail "Test file not present in mounted directory!"
+
+	mydir="`pwd`"
+	cd "${TMPMP}"
+	atf_check -o ignore -e ignore umount -f "${BVND}${MPART}"
+
+	atf_check -s ne:0 -e inline:"ls: .: No such file or directory\n" ls .
+	atf_check -s ne:0 -e inline:"ls: ..: No such file or directory\n" ls ..
+
+	atf_check -s ne:0 -e ignore -o inline:"cd: can't cd to .\n" \
+	    -x "cd . 2>&1"
+	atf_check -s ne:0 -e ignore -o inline:"cd: can't cd to ..\n" \
+	    -x "cd .. 2>&1"
+
+	cd "${mydir}"
+
+	test -e "${TMPMP}/under_the_mount" || \
+	    atf_fail "Original mount point dissapeared!"
+}
+umount_cleanup()
+{
+	echo "*** Cleaning up ${TMPMP}, ${TMPIM}."
+	umount -f "${TMPMP}"
+	vnconfig -u "${VND}"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case umount
+}
diff --git a/contrib/netbsd-tests/kernel/t_umountstress.sh b/contrib/netbsd-tests/kernel/t_umountstress.sh
new file mode 100755
index 000000000000..fd50a1daca30
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/t_umountstress.sh
@@ -0,0 +1,209 @@
+# $NetBSD: t_umountstress.sh,v 1.5 2013/05/31 14:40:48 gson Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+TMPMP=umount-stress_mount
+TMPIM=umount-stress.im
+
+VND=vnd0
+BVND=/dev/${VND}
+CVND=/dev/r${VND}
+MPART=a
+
+atf_test_case fileop cleanup
+fileop_head()
+{
+	atf_set "descr" "Checks unmounting a filesystem doing file operations"
+	atf_set "require.user" "root"
+}
+fileop_body()
+{
+	cat >disktab <<EOF
+floppy288|2.88MB 3.5in Extra High Density Floppy:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+	:pb#5760:ob#0:\
+	:pc#5760:oc#0:
+EOF
+
+	echo "*** Creating a dummy directory tree at" \
+	     "${TMPMP} mounted on ${TMPIM}"
+
+	atf_check -o ignore -e ignore mkdir ${TMPMP}
+	atf_check -o ignore -e ignore dd if=/dev/zero of=${TMPIM} count=5860
+	atf_check -o ignore -e ignore vnconfig -v ${VND} ${TMPIM}
+	atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} floppy288
+	atf_check -o ignore -e ignore newfs -i 500 -b 8192 -f 1024 ${CVND}${MPART}
+	atf_check -o ignore -e ignore mount -o async ${BVND}${MPART} ${TMPMP}
+
+	echo "*** Testing fileops"
+
+	touch ${TMPMP}/hold
+	exec 9< ${TMPMP}/hold
+
+	(
+		for j in 0 1 2; do
+		for k in 0 1 2 3 4 5 6 7 8 9; do
+			if ! dd msgfmt=quiet if=/dev/zero \
+				count=1 of=${TMPMP}/test$i$j$k; then
+				echo 1 >result
+				exit
+			fi
+		done
+		done
+		echo 0 >result
+	) &
+	busypid=$!
+
+	while ! test -f result; do
+		if err=$(umount ${TMPMP} 2>&1); then
+			kill $busypid
+			exec 9<&-
+			wait
+			atf_fail "Unmount succeeded while busy"
+			return
+		fi
+
+		case $err in
+		*:\ Device\ busy)
+			;;
+		*)
+			kill $busypid
+			exec 9<&-
+			wait
+			atf_fail "Unmount failed: $err"
+			return
+			;;
+		esac
+	done
+
+	exec 9<&-
+	wait
+
+	rc=`cat result`
+	rm -f result
+
+	case $rc in
+	0) ;;
+	*) atf_fail "File operation failed"
+	esac
+}
+fileop_cleanup()
+{
+	echo "*** Cleaning up ${TMPMP}, ${TMPIM}."
+	umount -f "${TMPMP}"
+	vnconfig -u "${VND}"
+}
+
+atf_test_case mountlist cleanup
+mountlist_head()
+{
+	atf_set "descr" "Checks unmounting a filesystem using mountlist"
+	atf_set "require.user" "root"
+}
+mountlist_body()
+{
+	cat >disktab <<EOF
+floppy288|2.88MB 3.5in Extra High Density Floppy:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+	:pb#5760:ob#0:\
+	:pc#5760:oc#0:
+EOF
+
+	echo "*** Creating a dummy directory tree at" \
+	     "${TMPMP} mounted on ${TMPIM}"
+
+	atf_check -o ignore -e ignore mkdir ${TMPMP}
+	atf_check -o ignore -e ignore dd if=/dev/zero of=${TMPIM} count=5860
+	atf_check -o ignore -e ignore vnconfig -v ${VND} ${TMPIM}
+	atf_check -o ignore -e ignore disklabel -f disktab -rw ${VND} floppy288
+	atf_check -o ignore -e ignore newfs -i 500 -b 8192 -f 1024 ${CVND}${MPART}
+	atf_check -o ignore -e ignore mount -o async ${BVND}${MPART} ${TMPMP}
+
+	echo "*** Testing mountlist"
+
+	(
+		for j in 0 1 2 3 4 5 6 7 8 9; do
+		for k in 0 1 2 3 4 5 6 7 8 9; do
+			if ! out=$(mount); then
+				echo 1 >result
+				exit
+			fi
+		done
+		done
+		echo 0 >result
+	) &
+	busypid=$!
+
+	while ! test -f result; do
+		if err=$(umount ${TMPMP} 2>&1); then
+			if ! mount -o async ${BVND}${MPART} ${TMPMP}; then
+				kill $busypid
+				exec 9<&-
+				wait
+				atf_fail "Remount failed"
+				return
+			fi
+			continue
+		fi
+
+		case $err in
+		*:\ Device\ busy)
+			;;
+		*)
+			kill $busypid
+			exec 9<&-
+			wait
+			atf_fail "Unmount failed: $err"
+			return
+			;;
+		esac
+	done
+
+	exec 9<&-
+	wait
+
+	rc=`cat result`
+	rm -f result
+
+	case $rc in
+	0) ;;
+	*) atf_fail "Mountlist operation failed"
+	esac
+}
+mountlist_cleanup()
+{
+	echo "*** Cleaning up ${TMPMP}, ${TMPIM}."
+	umount -f "${TMPMP}"
+	vnconfig -u "${VND}"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case fileop
+	atf_add_test_case mountlist
+}
diff --git a/contrib/netbsd-tests/kernel/tty/t_pr.c b/contrib/netbsd-tests/kernel/tty/t_pr.c
new file mode 100644
index 000000000000..c590ea5ec608
--- /dev/null
+++ b/contrib/netbsd-tests/kernel/tty/t_pr.c
@@ -0,0 +1,186 @@
+/* $NetBSD: t_pr.c,v 1.7 2011/04/26 20:42:01 martin Exp $ */
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Antti Kantee <pooka@NetBSD.org> and Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+static int
+sendsome(int from, int to)
+{
+	size_t i;
+	ssize_t cnt;
+	static const char msg[] = "hello world\n";
+	char buf[sizeof(msg)+10];
+
+	memset(buf, 0, sizeof(buf));
+	rump_sys_write(from, msg, strlen(msg));
+	cnt = rump_sys_read(to, buf, sizeof(buf));
+	if (cnt < (ssize_t)strlen(msg)) {
+		printf("short message read: %zd chars: \"%s\"\n", cnt, buf);
+		return 1;
+	}
+	for (i = 0; i < sizeof(buf); i++) {
+		if (buf[i] == '\r' || buf[i] == '\n') {
+			buf[i] = '\n';
+			buf[i+1] = '\0';
+			break;
+		}
+	}
+
+	return strcmp(buf, msg) != 0;
+}
+
+static int
+exercise_ptytty(int master, int slave)
+{
+	int error, flags;
+
+	/*
+	 * send a few bytes from master to slave and read them back
+	 */
+	error = sendsome(master, slave);
+	if (error)
+		return error;
+
+	flags = FREAD|FWRITE;
+	rump_sys_ioctl(master, TIOCFLUSH, &flags);
+
+	/*
+	 * and the same in the other direction
+	 */
+	error = sendsome(slave, master);
+	if (error)
+		return error;
+
+	flags = FREAD|FWRITE;
+	rump_sys_ioctl(master, TIOCFLUSH, &flags);
+	return 0;
+}
+
+ATF_TC(client_first);
+ATF_TC_HEAD(client_first, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "test basic tty/pty operation when opening client side first");
+}
+
+ATF_TC_BODY(client_first, tc)
+{
+	int master, slave, error, v;
+
+	rump_init();
+	slave =  rump_sys_open("/dev/ttyp1", O_RDWR|O_NONBLOCK);
+	ATF_CHECK(slave != -1);
+
+	master = rump_sys_open("/dev/ptyp1", O_RDWR);
+	ATF_CHECK(master != -1);
+
+	v = 0;
+	rump_sys_ioctl(slave, FIOASYNC, &v);
+	error = exercise_ptytty(master, slave);
+	ATF_CHECK(error == 0);
+
+	rump_sys_close(master);
+	rump_sys_close(slave);
+}
+
+ATF_TC(master_first);
+ATF_TC_HEAD(master_first, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "test basic tty/pty operation when opening master side first");
+}
+
+ATF_TC_BODY(master_first, tc)
+{
+	int master, slave, error;
+
+	rump_init();
+	master = rump_sys_open("/dev/ptyp1", O_RDWR);
+	ATF_CHECK(master != -1);
+
+	slave =  rump_sys_open("/dev/ttyp1", O_RDWR);
+	ATF_CHECK(slave != -1);
+
+	error = exercise_ptytty(master, slave);
+	ATF_CHECK(error == 0);
+
+	rump_sys_close(master);
+	rump_sys_close(slave);
+}
+
+ATF_TC(ptyioctl);
+ATF_TC_HEAD(ptyioctl, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "ioctl on pty with client side not open");
+}
+
+ATF_TC_BODY(ptyioctl, tc)
+{
+	struct termios tio;
+	int fd;
+
+	rump_init();
+	fd = rump_sys_open("/dev/ptyp1", O_RDWR);
+	ATF_CHECK(fd != -1);
+
+	/*
+	 * This used to die with null deref under ptcwakeup()
+	 * atf_tc_expect_signal(-1, "PR kern/40688");
+	 */
+	rump_sys_ioctl(fd, TIOCGETA, &tio);
+
+	rump_sys_close(fd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ptyioctl);
+	ATF_TP_ADD_TC(tp, client_first);
+	ATF_TP_ADD_TC(tp, master_first);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/csu/arch/alpha/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/alpha/h_initfini_align.S
new file mode 100644
index 000000000000..b4382c1bed04
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/alpha/h_initfini_align.S
@@ -0,0 +1,16 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:55 matt Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:55 matt Exp $")
+
+/*
+ * LINTSTUB: bool check_stack_alignment(void);
+ */
+
+LEAF_NOPROFILE(check_stack_alignment, 0)
+	ldiq	v0, 0
+	and	sp, 7, t0
+	cmoveq	t0, 1, v0
+	ret
+END(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/arm/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/arm/h_initfini_align.S
new file mode 100644
index 000000000000..2abc56fb1ae8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/arm/h_initfini_align.S
@@ -0,0 +1,20 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $")
+
+/*
+ * LINTSTUB: bool check_stack_alignment(void);
+ */
+
+ARM_ENTRY(check_stack_alignment)
+#ifdef __ARM_EABI__
+	tst	sp, #7
+#else
+	tst	sp, #3
+#endif
+	movne	r0, #0
+	moveq	r0, #1
+	RET
+END(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/hppa/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/hppa/h_initfini_align.S
new file mode 100644
index 000000000000..c297e9087984
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/hppa/h_initfini_align.S
@@ -0,0 +1,12 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/11/15 11:48:30 skrll Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/11/15 11:48:30 skrll Exp $")
+
+LEAF_ENTRY(check_stack_alignment)
+	extru	%sp,31,6,%ret0
+	comiclr,<> 0, %ret0, %ret0
+	ldi	1,%ret0
+	bv,n	%r0(%r2)
+EXIT(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/i386/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/i386/h_initfini_align.S
new file mode 100644
index 000000000000..e212989a08ee
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/i386/h_initfini_align.S
@@ -0,0 +1,12 @@
+/*	$NetBSD: h_initfini_align.S,v 1.2 2010/12/12 18:21:21 joerg Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.2 2010/12/12 18:21:21 joerg Exp $")
+
+_ENTRY(check_stack_alignment)
+	movl	%esp, %eax
+	andl	$3, %eax
+	setz	%al
+	movzbl	%al, %eax
+	ret
diff --git a/contrib/netbsd-tests/lib/csu/arch/ia64/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/ia64/h_initfini_align.S
new file mode 100644
index 000000000000..f7612a8f86b4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/ia64/h_initfini_align.S
@@ -0,0 +1,37 @@
+/*	$NetBSD: h_initfini_align.S,v 1.2 2014/03/16 09:27:04 cherry Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.2 2014/03/16 09:27:04 cherry Exp $")
+
+ENTRY(check_stack_alignment, 0)
+	.prologue
+	.regstk 0, 2, 0, 0
+
+	alloc loc0 = ar.pfs, 0, 2, 0, 0
+
+	.body
+	mov ret0 = 1
+	;;
+	
+	/* ar.bsp has an 8-byte alignment requirement */
+ 	mov loc1 = ar.bsp
+	;;
+	
+	and loc1 = 7, loc1
+	;;
+	
+	cmp.eq	p1, p0 = 0, loc1
+	(p0)	mov ret0 = 0
+	;;
+	
+	/* sp has a 16-byte alignment requirement */
+	(p1)	mov loc1 = sp
+	;;
+	(p1)	and loc1 = 15, loc1
+	;;
+	
+	(p1)	cmp.eq p1, p0 = 0, loc1
+	(p0)	mov ret0 = 0
+
+	br.ret.sptk.few rp
diff --git a/contrib/netbsd-tests/lib/csu/arch/mips/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/mips/h_initfini_align.S
new file mode 100644
index 000000000000..d6782acfd543
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/mips/h_initfini_align.S
@@ -0,0 +1,19 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $")
+
+/*
+ * LINTSTUB: bool check_stack_alignment(void);
+ */
+
+LEAF_NOPROFILE(check_stack_alignment)
+#ifdef __mips_o32
+	andi	v1,sp,3
+#else
+	andi	v1,sp,7
+#endif
+	sltiu	v0,v1,1
+	jr	ra
+END(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/powerpc/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/powerpc/h_initfini_align.S
new file mode 100644
index 000000000000..7abd9ead3da3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/powerpc/h_initfini_align.S
@@ -0,0 +1,17 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $")
+
+/*
+ * LINTSTUB: bool check_stack_alignment(void);
+ */
+
+_ENTRY(check_stack_alignment)
+	li	%r3,0
+	andis.	%r0,%r1,15
+	bnelr	%cr0
+	li	%r3,1
+	blr
+END(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/sparc/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/sparc/h_initfini_align.S
new file mode 100644
index 000000000000..a770d39787ae
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/sparc/h_initfini_align.S
@@ -0,0 +1,10 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/12 11:22:26 martin Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/12 11:22:26 martin Exp $")
+
+_ENTRY(check_stack_alignment)
+	and	%sp, 7, %o1
+	retl
+	 not	%o1, %o0
diff --git a/contrib/netbsd-tests/lib/csu/arch/sparc64/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/sparc64/h_initfini_align.S
new file mode 100644
index 000000000000..402ceb306052
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/sparc64/h_initfini_align.S
@@ -0,0 +1,11 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/11/15 20:00:20 martin Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/11/15 20:00:20 martin Exp $")
+
+_ENTRY(check_stack_alignment)
+	add	%sp, BIAS, %o1
+	and	%o1, 15, %o2
+	retl
+	 not	%o2, %o0
diff --git a/contrib/netbsd-tests/lib/csu/arch/vax/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/vax/h_initfini_align.S
new file mode 100644
index 000000000000..a751e1f3dab0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/vax/h_initfini_align.S
@@ -0,0 +1,17 @@
+/*	$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $")
+
+/*
+ * LINTSTUB: bool check_stack_alignment(void);
+ */
+
+_ENTRY(check_stack_alignment, 0)
+	clrl	%r0
+	bitl	$3,%sp
+	bneq	1f
+	incl	%r0
+1:	ret
+END(check_stack_alignment)
diff --git a/contrib/netbsd-tests/lib/csu/arch/x86_64/h_initfini_align.S b/contrib/netbsd-tests/lib/csu/arch/x86_64/h_initfini_align.S
new file mode 100644
index 000000000000..fbc1e56a6354
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/arch/x86_64/h_initfini_align.S
@@ -0,0 +1,13 @@
+/*	$NetBSD: h_initfini_align.S,v 1.2 2010/12/12 18:21:21 joerg Exp $	*/
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: h_initfini_align.S,v 1.2 2010/12/12 18:21:21 joerg Exp $")
+
+_ENTRY(check_stack_alignment)
+	movl	%esp, %eax
+	andl	$15, %eax
+	subl	$8, %eax
+	sete	%al
+	movzbl	%al, %eax
+	ret
diff --git a/contrib/netbsd-tests/lib/csu/dso/h_initfini3_dso.cxx b/contrib/netbsd-tests/lib/csu/dso/h_initfini3_dso.cxx
new file mode 100644
index 000000000000..ff90ce66b94b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/dso/h_initfini3_dso.cxx
@@ -0,0 +1,37 @@
+#include <unistd.h>
+
+#ifdef CHECK_STACK_ALIGNMENT
+#include <stdlib.h>
+
+extern "C" int check_stack_alignment(void);
+#endif
+
+class Test2 {
+public:
+	Test2()
+	{
+		static const char msg[] = "constructor2 executed\n";
+		write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+#ifdef CHECK_STACK_ALIGNMENT
+		if (!check_stack_alignment()) {
+			static const char msg2[] = "stack unaligned \n";
+			write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
+			exit(1);
+		}
+#endif
+	}
+	~Test2()
+	{
+		static const char msg[] = "destructor2 executed\n";
+		write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+#ifdef CHECK_STACK_ALIGNMENT
+		if (!check_stack_alignment()) {
+			static const char msg2[] = "stack unaligned \n";
+			write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
+			exit(1);
+		}
+#endif
+	}
+};
+
+Test2 test2;
diff --git a/contrib/netbsd-tests/lib/csu/h_initfini1.cxx b/contrib/netbsd-tests/lib/csu/h_initfini1.cxx
new file mode 100644
index 000000000000..d410f70623a9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/h_initfini1.cxx
@@ -0,0 +1,9 @@
+#include <unistd.h>
+
+int
+main(void)
+{
+	static const char msg[] = "main executed\n";
+	write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/csu/h_initfini3.cxx b/contrib/netbsd-tests/lib/csu/h_initfini3.cxx
new file mode 100644
index 000000000000..13f54cebdb8e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/h_initfini3.cxx
@@ -0,0 +1,22 @@
+#include <dlfcn.h>
+#include <err.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	static const char msg1[] = "main started\n";
+	static const char msg2[] = "main after dlopen\n";
+	static const char msg3[] = "main terminated\n";
+
+	void *handle;
+
+	write(STDOUT_FILENO, msg1, sizeof(msg1) - 1);
+	handle = dlopen("h_initfini3_dso.so", RTLD_NOW | RTLD_LOCAL);
+	if (handle == NULL)
+		err(1, "dlopen");
+	write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
+	dlclose(handle);
+	write(STDOUT_FILENO, msg3, sizeof(msg3) - 1);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/csu/h_initfini_common.cxx b/contrib/netbsd-tests/lib/csu/h_initfini_common.cxx
new file mode 100644
index 000000000000..dd349833f00d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/h_initfini_common.cxx
@@ -0,0 +1,37 @@
+#include <unistd.h>
+
+#ifdef CHECK_STACK_ALIGNMENT
+#include <stdlib.h>
+
+extern "C" int check_stack_alignment(void);
+#endif
+
+class Test {
+public:
+	Test()
+	{
+		static const char msg[] = "constructor executed\n";
+		write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+#ifdef CHECK_STACK_ALIGNMENT
+		if (!check_stack_alignment()) {
+			static const char msg2[] = "stack unaligned \n";
+			write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
+			exit(1);
+		}
+#endif
+	}
+	~Test()
+	{
+		static const char msg[] = "destructor executed\n";
+		write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+#ifdef CHECK_STACK_ALIGNMENT
+		if (!check_stack_alignment()) {
+			static const char msg2[] = "stack unaligned \n";
+			write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
+			exit(1);
+		}
+#endif
+	}
+};
+
+Test test;
diff --git a/contrib/netbsd-tests/lib/csu/t_crt0.sh b/contrib/netbsd-tests/lib/csu/t_crt0.sh
new file mode 100755
index 000000000000..a36a9b70cd29
--- /dev/null
+++ b/contrib/netbsd-tests/lib/csu/t_crt0.sh
@@ -0,0 +1,104 @@
+# $NetBSD: t_crt0.sh,v 1.4 2011/12/11 14:57:07 joerg Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case initfini1
+initfini1_head()
+{
+	atf_set "descr" "Checks support for init/fini sections"
+}
+initfini1_body()
+{
+	cat >expout <<EOF
+constructor executed
+main executed
+destructor executed
+EOF
+
+	atf_check -o file:expout "$(atf_get_srcdir)/h_initfini1"
+}
+
+atf_test_case initfini2
+initfini2_head()
+{
+	atf_set "descr" "Checks support for init/fini sections in static binaries"
+}
+initfini2_body()
+{
+	cat >expout <<EOF
+constructor executed
+main executed
+destructor executed
+EOF
+
+	atf_check -o file:expout "$(atf_get_srcdir)/h_initfini2"
+}
+
+atf_test_case initfini3
+initfini3_head()
+{
+	atf_set "descr" "Checks support for init/fini sections in dlopen"
+}
+initfini3_body()
+{
+	cat >expout <<EOF
+constructor executed
+main started
+constructor2 executed
+main after dlopen
+destructor2 executed
+main terminated
+destructor executed
+EOF
+
+	atf_check -o file:expout "$(atf_get_srcdir)/h_initfini3"
+}
+
+atf_test_case initfini4
+initfini4_head()
+{
+	atf_set "descr" "Checks support for init/fini sections in LD_PRELOAD"
+}
+initfini4_body()
+{
+	cat >expout <<EOF
+constructor2 executed
+constructor executed
+main executed
+destructor executed
+destructor2 executed
+EOF
+
+	atf_check -o file:expout -x "env LD_PRELOAD=$(atf_get_srcdir)/h_initfini3_dso.so $(atf_get_srcdir)/h_initfini1"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case initfini1
+	atf_add_test_case initfini2
+	atf_add_test_case initfini3
+	atf_add_test_case initfini4
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_bluetooth.c b/contrib/netbsd-tests/lib/libbluetooth/t_bluetooth.c
new file mode 100644
index 000000000000..066f8d925425
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_bluetooth.c
@@ -0,0 +1,87 @@
+/*	$NetBSD: t_bluetooth.c,v 1.2 2011/04/07 08:29:50 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <bluetooth.h>
+#include <string.h>
+
+ATF_TC(check_bt_aton);
+
+ATF_TC_HEAD(check_bt_aton, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test bt_aton results");
+}
+
+ATF_TC_BODY(check_bt_aton, tc)
+{
+	bdaddr_t bdaddr;
+
+	ATF_CHECK_EQ(bt_aton("0a:0b:0c:0d:0e", &bdaddr), 0);
+	ATF_CHECK_EQ(bt_aton("0a:0b:0c:0d0:0e:0f", &bdaddr), 0);
+	ATF_CHECK_EQ(bt_aton("0a:0b:0c:0d:0e:0f:00", &bdaddr), 0);
+	ATF_CHECK_EQ(bt_aton("0a:0b:0c:0d:0e:0f\n", &bdaddr), 0);
+	ATF_CHECK_EQ(bt_aton(" 0a:0b:0c:0d:0e:0f", &bdaddr), 0);
+	ATF_CHECK_EQ(bt_aton("0a:0b:0x:0d:0e:0f", &bdaddr), 0);
+
+	ATF_REQUIRE(bt_aton("0a:0b:0c:0d:0e:0f", &bdaddr));
+	ATF_CHECK_EQ(bdaddr.b[0], 0x0f);
+	ATF_CHECK_EQ(bdaddr.b[1], 0x0e);
+	ATF_CHECK_EQ(bdaddr.b[2], 0x0d);
+	ATF_CHECK_EQ(bdaddr.b[3], 0x0c);
+	ATF_CHECK_EQ(bdaddr.b[4], 0x0b);
+	ATF_CHECK_EQ(bdaddr.b[5], 0x0a);
+}
+
+ATF_TC(check_bt_ntoa);
+
+ATF_TC_HEAD(check_bt_ntoa, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test bt_ntoa results");
+}
+
+ATF_TC_BODY(check_bt_ntoa, tc)
+{
+	bdaddr_t bdaddr = { { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 } };
+
+	ATF_CHECK_STREQ(bt_ntoa(&bdaddr, NULL), "55:44:33:22:11:00");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_bt_aton);
+	ATF_TP_ADD_TC(tp, check_bt_ntoa);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_sdp_data.c b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_data.c
new file mode 100644
index 000000000000..cff662768c24
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_data.c
@@ -0,0 +1,136 @@
+/*	$NetBSD: t_sdp_data.c,v 1.2 2011/04/07 08:29:50 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <sdp.h>
+
+ATF_TC(check_sdp_data_type);
+
+ATF_TC_HEAD(check_sdp_data_type, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_data_type results");
+}
+
+ATF_TC_BODY(check_sdp_data_type, tc)
+{
+	uint8_t data[] = {
+		0x00,			// nil
+		0x08, 0x00,		// uint8	0x00
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value;
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_UINT8);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_data_size);
+
+ATF_TC_HEAD(check_sdp_data_size, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_data_size results");
+}
+
+ATF_TC_BODY(check_sdp_data_size, tc)
+{
+	uint8_t data[] = {
+		0x00,			// nil
+		0x08, 0x00,		// uint8
+		0x11, 0x00, 0x00,	// int16
+		0x1a, 0x00, 0x00, 0x00,	// uuid32
+		0x00,
+		0x28, 0x00,		// bool
+		0x25, 0x00,		// str8(0)
+		0x25, 0x02, 0x00, 0x00,	// str8(2)
+		0x36, 0x00, 0x00,	// seq16(0)
+		0x3e, 0x00, 0x05, 0x00,	// alt16(5)
+		0x00, 0x00, 0x00, 0x00,
+		0x37, 0x00, 0x00, 0x00,	// seq32(0)
+		0x00,
+		0x47, 0x00, 0x00, 0x00,	// url32(7)
+		0x07, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value;
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 1);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 2);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 3);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 5);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 2);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 2);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 4);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 3);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 8);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 5);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_size(&value), 12);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_sdp_data_type);
+	ATF_TP_ADD_TC(tp, check_sdp_data_size);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_sdp_get.c b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_get.c
new file mode 100644
index 000000000000..3ad8070de728
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_get.c
@@ -0,0 +1,643 @@
+/*	$NetBSD: t_sdp_get.c,v 1.2 2011/04/07 08:29:50 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <limits.h>
+#include <sdp.h>
+#include <string.h>
+
+ATF_TC(check_sdp_get_data);
+
+ATF_TC_HEAD(check_sdp_get_data, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_data results");
+}
+
+ATF_TC_BODY(check_sdp_get_data, tc)
+{
+	uint8_t data[] = {
+		0x09, 0x00, 0x00,	// uint16	0x0000
+		0x35, 0x05,		// seq8(5)
+		0x19, 0x00, 0x00,	//   uuid16	0x0000
+		0x08, 0x00,		//   uint8	0x00
+		0x36, 0x00, 0x01,	// seq16(1)
+		0x19,			//   uint16	/* invalid */
+		0x25, 0x04, 0x54, 0x45,	// str8(4)	"TEST"
+		0x53, 0x54,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value, seq;
+
+	/*
+	 * sdp_get_data constructs a new sdp_data_t containing
+	 * the next data element, advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_UINT16);
+	ATF_CHECK_EQ(sdp_data_size(&value), 3);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_SEQ8);
+	ATF_CHECK_EQ(sdp_data_size(&value), 7);
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_SEQ16);
+	ATF_CHECK_EQ(sdp_data_size(&value), 4);
+	ATF_REQUIRE_EQ(sdp_get_seq(&value, &seq), true);
+	ATF_REQUIRE_EQ(sdp_get_data(&seq, &value), false);	/* invalid */
+
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_STR8);
+	ATF_CHECK_EQ(sdp_data_size(&value), 6);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_attr);
+
+ATF_TC_HEAD(check_sdp_get_attr, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_attr results");
+}
+
+ATF_TC_BODY(check_sdp_get_attr, tc)
+{
+	uint8_t data[] = {
+		0x09, 0x00, 0x00,	// uint16	0x0000
+		0x35, 0x05,		// seq8(5)
+		0x19, 0x00, 0x00,	//   uuid16	0x0000
+		0x08, 0x00,		//   uint8	0x00
+		0x08, 0x00,		// uint8	0x00
+		0x09, 0x00, 0x01,	// uint16	0x0001
+		0x19, 0x12, 0x34,	// uuid16	0x1234
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value;
+	uint16_t attr;
+
+	/*
+	 * sdp_get_attr expects a UINT16 followed by any data item
+	 * and advances test if successful
+	 */
+	ATF_REQUIRE(sdp_get_attr(&test, &attr, &value));
+	ATF_CHECK_EQ(attr, 0x0000);
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_SEQ8);
+	ATF_CHECK_EQ(sdp_data_size(&value), 7);
+
+	ATF_REQUIRE_EQ(sdp_get_attr(&test, &attr, &value), false);
+	ATF_REQUIRE(sdp_get_data(&test, &value));
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_UINT8);
+	ATF_CHECK_EQ(sdp_data_size(&value), 2);
+
+	ATF_REQUIRE(sdp_get_attr(&test, &attr, &value));
+	ATF_CHECK_EQ(attr, 0x0001);
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_UUID16);
+	ATF_CHECK_EQ(sdp_data_size(&value), 3);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_uuid);
+
+ATF_TC_HEAD(check_sdp_get_uuid, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_uuid results");
+}
+
+ATF_TC_BODY(check_sdp_get_uuid, tc)
+{
+	uint8_t data[] = {
+		0x19, 0x12, 0x34,	// uuid16	0x1234
+		0x1a, 0x11, 0x22, 0x33,	// uuid32	0x11223344
+		0x44,
+		0x00,			// nil
+		0x1c,			// uuid128	0x00112233-4444--5555-6666-778899aabbcc
+		0x00, 0x11, 0x22, 0x33,
+		0x44, 0x44, 0x55, 0x55,
+		0x66, 0x66, 0x77, 0x88,
+		0x99, 0xaa, 0xbb, 0xcc,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	uuid_t u16 = {
+		0x00001234,
+		0x0000,
+		0x1000,
+		0x80,
+		0x00,
+		{ 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb }
+	};
+	uuid_t u32 = {
+		0x11223344,
+		0x0000,
+		0x1000,
+		0x80,
+		0x00,
+		{ 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb }
+	};
+	uuid_t u128 = {
+		0x00112233,
+		0x4444,
+		0x5555,
+		0x66,
+		0x66,
+		{ 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc }
+	};
+	sdp_data_t nil;
+	uuid_t value;
+
+	/*
+	 * sdp_get_uuid expects any UUID type returns the full uuid
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_uuid(&test, &value));
+	ATF_CHECK(uuid_equal(&value, &u16, NULL));
+
+	ATF_REQUIRE(sdp_get_uuid(&test, &value));
+	ATF_CHECK(uuid_equal(&value, &u32, NULL));
+
+	ATF_REQUIRE_EQ(sdp_get_uuid(&test, &value), false);	/* not uuid */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_uuid(&test, &value));
+	ATF_CHECK(uuid_equal(&value, &u128, NULL));
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_bool);
+
+ATF_TC_HEAD(check_sdp_get_bool, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_bool results");
+}
+
+ATF_TC_BODY(check_sdp_get_bool, tc)
+{
+	uint8_t data[] = {
+		0x28, 0x00,	// bool		false
+		0x00,		// nil
+		0x28, 0x01,	// bool		true
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+	bool value;
+
+	/*
+	 * sdp_get_bool expects a BOOL type
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_bool(&test, &value));
+	ATF_CHECK_EQ(value, false);
+
+	ATF_REQUIRE_EQ(sdp_get_bool(&test, &value), false);	/* not bool */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_bool(&test, &value));
+	ATF_CHECK_EQ(value, true);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_uint);
+
+ATF_TC_HEAD(check_sdp_get_uint, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_uint results");
+}
+
+ATF_TC_BODY(check_sdp_get_uint, tc)
+{
+	uint8_t data[] = {
+		0x08, 0x00,		// uint8	0x00
+		0x08, 0xff,		// uint8	0xff
+		0x09, 0x01, 0x02,	// uint16	0x0102
+		0x09, 0xff, 0xff,	// uint16	0xffff
+		0x00,			// nil
+		0x0a, 0x01, 0x02, 0x03,	// uint32	0x01020304
+		0x04,
+		0x0a, 0xff, 0xff, 0xff,	// uint32	0xffffffff
+		0xff,
+		0x0b, 0x01, 0x02, 0x03,	// uint64	0x0102030405060708
+		0x04, 0x05, 0x06, 0x07,
+		0x08,
+		0x0b, 0xff, 0xff, 0xff,	// uint64	0xffffffffffffffff
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+		0x0c, 0x00, 0x00, 0x00,	// uint128	0x00000000000000000000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x0c, 0x00, 0x00, 0x00,	// uint128	0x00000000000000010000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x01, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x0c, 0x00, 0x00, 0x00,	// uint128	0x0000000000000000ffffffffffffffff
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0xff, 0xff, 0xff,
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+	uintmax_t value;
+
+	/*
+	 * sdp_get_uint expects any UINT type, advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, 0x00);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, UINT8_MAX);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, 0x0102);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, UINT16_MAX);
+
+	ATF_REQUIRE_EQ(sdp_get_uint(&test, &value), false);	/* not uint */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, 0x01020304);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, UINT32_MAX);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, 0x0102030405060708);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, UINT64_MAX);
+
+	/*
+	 * expected failure is that we cannot decode UINT128 values larger than UINT64
+	 */
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, 0x00000000000000000000000000000000);
+
+	ATF_REQUIRE_EQ(sdp_get_uint(&test, &value), false);	/* overflow */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_UINT128);
+
+	ATF_REQUIRE(sdp_get_uint(&test, &value));
+	ATF_CHECK_EQ(value, UINT64_MAX);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_int);
+
+ATF_TC_HEAD(check_sdp_get_int, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_int results");
+}
+
+ATF_TC_BODY(check_sdp_get_int, tc)
+{
+	uint8_t data[] = {
+		0x10, 0x00,		// int8		0x00
+		0x10, 0x7f,		// int8		0x7f
+		0x10, 0x80,		// int8		0x80
+		0x11, 0x01, 0x02,	// int16	0x0102
+		0x11, 0x7f, 0xff,	// int16	0x7fff
+		0x11, 0x80, 0x00,	// int16	0x8000
+		0x00,			// nil
+		0x12, 0x01, 0x02, 0x03,	// int32	0x01020304
+		0x04,
+		0x12, 0x7f, 0xff, 0xff,	// int32	0x7fffffff
+		0xff,
+		0x12, 0x80, 0x00, 0x00,	// int32	0x80000000
+		0x00,
+		0x13, 0x01, 0x02, 0x03,	// int64	0x0102030405060708
+		0x04, 0x05, 0x06, 0x07,
+		0x08,
+		0x13, 0x7f, 0xff, 0xff,	// int64	0x7fffffffffffffff
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+		0x13, 0x80, 0x00, 0x00,	// int64	0x8000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x14, 0x00, 0x00, 0x00,	// int128	0x00000000000000000000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x14, 0x00, 0x00, 0x00,	// int128	0x00000000000000007fffffffffffffff
+		0x00, 0x00, 0x00, 0x00,	//			(INT64_MAX)
+		0x00, 0x7f, 0xff, 0xff,
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+		0x14, 0x00, 0x00, 0x00,	// int128	0x00000000000000008000000000000000
+		0x00, 0x00, 0x00, 0x00,	//			(INT64_MAX + 1)
+		0x00, 0x80, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x14, 0xff, 0xff, 0xff,	// int128	0xffffffffffffffff8000000000000000
+		0xff, 0xff, 0xff, 0xff,	//			(INT64_MIN)
+		0xff, 0x80, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x14, 0xff, 0xff, 0xff,	// int128	0xffffffffffffffff7fffffffffffffff
+		0xff, 0xff, 0xff, 0xff,	//			(INT64_MIN - 1)
+		0xff, 0x7f, 0xff, 0xff,
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+	intmax_t value;
+
+	/*
+	 * sdp_get_int expects any INT type, advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, 0);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT8_MAX);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT8_MIN);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, 0x0102);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT16_MAX);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT16_MIN);
+
+	ATF_REQUIRE_EQ(sdp_get_int(&test, &value), false);	/* not int */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, 0x01020304);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT32_MAX);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT32_MIN);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, 0x0102030405060708);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT64_MAX);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT64_MIN);
+
+	/*
+	 * expected failure is that we cannot decode INT128 values larger than INT64
+	 */
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, 0);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT64_MAX);
+
+	ATF_REQUIRE_EQ(sdp_get_int(&test, &value), false);	/* overflow */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_INT128);
+
+	ATF_REQUIRE(sdp_get_int(&test, &value));
+	ATF_CHECK_EQ(value, INT64_MIN);
+
+	ATF_REQUIRE_EQ(sdp_get_int(&test, &value), false);	/* underflow */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_INT128);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_seq);
+
+ATF_TC_HEAD(check_sdp_get_seq, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_seq results");
+}
+
+ATF_TC_BODY(check_sdp_get_seq, tc)
+{
+	uint8_t data[] = {
+		0x35, 0x00,		// seq8(0)
+		0x00,			// nil
+		0x36, 0x00, 0x00,	// seq16(0)
+		0x37, 0x00, 0x00, 0x00,	// seq32(0)
+		0x00,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value;
+
+	/*
+	 * sdp_get_seq expects a SEQ type
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_seq(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_REQUIRE_EQ(sdp_get_seq(&test, &value), false);	/* not seq */
+	ATF_REQUIRE(sdp_get_data(&test, &value));		/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_seq(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_REQUIRE(sdp_get_seq(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_alt);
+
+ATF_TC_HEAD(check_sdp_get_alt, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_alt results");
+}
+
+ATF_TC_BODY(check_sdp_get_alt, tc)
+{
+	uint8_t data[] = {
+		0x3d, 0x00,		// alt8(0)
+		0x00,			// nil
+		0x3e, 0x00, 0x00,	// alt16(0)
+		0x3f, 0x00, 0x00, 0x00,	// alt32(0)
+		0x00,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t value;
+
+	/*
+	 * sdp_get_alt expects a ALT type
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_alt(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_REQUIRE_EQ(sdp_get_alt(&test, &value), false);	/* not alt */
+	ATF_REQUIRE(sdp_get_data(&test, &value));		/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&value), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_alt(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_REQUIRE(sdp_get_alt(&test, &value));
+	ATF_CHECK_EQ(value.next, value.end);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_str);
+
+ATF_TC_HEAD(check_sdp_get_str, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_str results");
+}
+
+ATF_TC_BODY(check_sdp_get_str, tc)
+{
+	uint8_t data[] = {
+		0x25, 0x04, 0x53, 0x54, // str8(4)	"STR8"
+		0x52, 0x38,
+		0x00,			// nil
+		0x26, 0x00, 0x05, 0x53,	// str16(5)	"STR16"
+		0x54, 0x52, 0x31, 0x36,
+		0x27, 0x00, 0x00, 0x00,	// str32(5)	"STR32"
+		0x05, 0x53, 0x54, 0x52,
+		0x33, 0x32,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+	char *str;
+	size_t len;
+
+	/*
+	 * sdp_get_str expects a STR type
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_str(&test, &str, &len));
+	ATF_CHECK(len == 4 && strncmp(str, "STR8", 4) == 0);
+
+	ATF_REQUIRE_EQ(sdp_get_str(&test, &str, &len), false);	/* not str */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_str(&test, &str, &len));
+	ATF_CHECK(len == 5 && strncmp(str, "STR16", 5) == 0);
+
+	ATF_REQUIRE(sdp_get_str(&test, &str, &len));
+	ATF_CHECK(len == 5 && strncmp(str, "STR32", 5) == 0);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TC(check_sdp_get_url);
+
+ATF_TC_HEAD(check_sdp_get_url, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_get_url results");
+}
+
+ATF_TC_BODY(check_sdp_get_url, tc)
+{
+	uint8_t data[] = {
+		0x45, 0x04, 0x55, 0x52, // url8(4)	"URL8"
+		0x4c, 0x38,
+		0x00,			// nil
+		0x46, 0x00, 0x05, 0x55,	// url16(5)	"URL16"
+		0x52, 0x4c, 0x31, 0x36,
+		0x47, 0x00, 0x00, 0x00,	// url32(5)	"URL32"
+		0x05, 0x55, 0x52, 0x4c,
+		0x33, 0x32,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+	char *url;
+	size_t len;
+
+	/*
+	 * sdp_get_url expects a URL type
+	 * advancing test if successful
+	 */
+	ATF_REQUIRE(sdp_get_url(&test, &url, &len));
+	ATF_CHECK(len == 4 && strncmp(url, "URL8", 4) == 0);
+
+	ATF_REQUIRE_EQ(sdp_get_url(&test, &url, &len), false);	/* not url */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+
+	ATF_REQUIRE(sdp_get_url(&test, &url, &len));
+	ATF_CHECK(len == 5 && strncmp(url, "URL16", 5) == 0);
+
+	ATF_REQUIRE(sdp_get_url(&test, &url, &len));
+	ATF_CHECK(len == 5 && strncmp(url, "URL32", 5) == 0);
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_sdp_get_data);
+	ATF_TP_ADD_TC(tp, check_sdp_get_attr);
+	ATF_TP_ADD_TC(tp, check_sdp_get_uuid);
+	ATF_TP_ADD_TC(tp, check_sdp_get_bool);
+	ATF_TP_ADD_TC(tp, check_sdp_get_uint);
+	ATF_TP_ADD_TC(tp, check_sdp_get_int);
+	ATF_TP_ADD_TC(tp, check_sdp_get_seq);
+	ATF_TP_ADD_TC(tp, check_sdp_get_alt);
+	ATF_TP_ADD_TC(tp, check_sdp_get_str);
+	ATF_TP_ADD_TC(tp, check_sdp_get_url);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_sdp_match.c b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_match.c
new file mode 100644
index 000000000000..54a5bd51f5ee
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_match.c
@@ -0,0 +1,87 @@
+/*	$NetBSD: t_sdp_match.c,v 1.2 2011/04/07 08:29:50 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <sdp.h>
+
+ATF_TC(check_sdp_match_uuid16);
+
+ATF_TC_HEAD(check_sdp_match_uuid16, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_match_uuid16 results");
+}
+
+ATF_TC_BODY(check_sdp_match_uuid16, tc)
+{
+	uint8_t data[] = {
+		0x19, 0x11, 0x11,	// uuid16	0x1111
+		0x00,			// nil
+		0x19, 0x12, 0x34,	// uuid16	0x1234
+		0x1a, 0x00, 0x00, 0x34,	// uuid32	0x00003456
+		0x56,
+		0x1c, 0x00, 0x00, 0x43,	// uuid128	00004321-0000-1000-8000-00805f9b34fb
+		0x21, 0x00, 0x00, 0x10,
+		0x00, 0x80, 0x00, 0x00,
+		0x80, 0x5f, 0x9b, 0x34,
+		0xfb,
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t nil;
+
+	/*
+	 * sdp_match_uuid16 advances if the UUID matches the 16-bit short alias given
+	 */
+
+	ATF_REQUIRE_EQ(sdp_match_uuid16(&test, 0x1100), false);	/* mismatch */
+	ATF_REQUIRE(sdp_match_uuid16(&test, 0x1111));
+
+	ATF_REQUIRE_EQ(sdp_match_uuid16(&test, 0x1234), false);	/* not uuid */
+	ATF_REQUIRE(sdp_get_data(&test, &nil));			/* (skip) */
+	ATF_CHECK_EQ(sdp_data_type(&nil), SDP_DATA_NIL);
+	ATF_REQUIRE(sdp_match_uuid16(&test, 0x1234));
+
+	ATF_REQUIRE(sdp_match_uuid16(&test, 0x3456));
+
+	ATF_REQUIRE_EQ(sdp_match_uuid16(&test, 0x1234), false);	/* mismatch */
+	ATF_REQUIRE(sdp_match_uuid16(&test, 0x4321));
+
+	ATF_CHECK_EQ(test.next, test.end);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_sdp_match_uuid16);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_sdp_put.c b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_put.c
new file mode 100644
index 000000000000..fff4119ecef2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_put.c
@@ -0,0 +1,875 @@
+/*	$NetBSD: t_sdp_put.c,v 1.3 2011/04/16 07:32:27 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <limits.h>
+#include <sdp.h>
+#include <string.h>
+
+ATF_TC(check_sdp_put_data);
+
+ATF_TC_HEAD(check_sdp_put_data, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_data results");
+}
+
+ATF_TC_BODY(check_sdp_put_data, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+	uint8_t data[] = {
+		0x35, 0x05,		// seq8(5)
+		0x08, 0x00,		//   uint8	0x00
+		0x09, 0x12, 0x34,	//   uint16	0x1234
+	};
+	sdp_data_t value = { data, data + sizeof(data) };
+
+	ATF_REQUIRE(sdp_put_data(&test, &value));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x35, 0x05,		// seq8(5)
+		0x08, 0x00,		//   uint8	0x00
+		0x09, 0x12, 0x34,	//   uint16	0x1234
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_attr);
+
+ATF_TC_HEAD(check_sdp_put_attr, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_attr results");
+}
+
+ATF_TC_BODY(check_sdp_put_attr, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+	uint8_t data[] = {
+		0x00,			// nil
+		0x19, 0x33, 0x44,	// uuid16	0x3344
+	};
+	sdp_data_t value = { data, data + sizeof(data) };
+
+	ATF_REQUIRE_EQ(sdp_put_attr(&test, 0xabcd, &value), false);
+	value.next += 1; // skip "nil"
+	ATF_REQUIRE(sdp_put_attr(&test, 0x1337, &value));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x09, 0x13, 0x37,	// uint16	0x1337
+		0x19, 0x33, 0x44,	// uuid16	0x3344
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uuid);
+
+ATF_TC_HEAD(check_sdp_put_uuid, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uuid results");
+}
+
+ATF_TC_BODY(check_sdp_put_uuid, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+	const uuid_t u16 = {
+		0x00001234,
+		0x0000,
+		0x1000,
+		0x80,
+		0x00,
+		{ 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb }
+	};
+	const uuid_t u32 = {
+		0x12345678,
+		0x0000,
+		0x1000,
+		0x80,
+		0x00,
+		{ 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb }
+	};
+	const uuid_t u128 = {
+		0x00112233,
+		0x4444,
+		0x5555,
+		0x66,
+		0x77,
+		{ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd }
+	};
+
+	ATF_REQUIRE(sdp_put_uuid(&test, &u16));
+	ATF_REQUIRE(sdp_put_uuid(&test, &u32));
+	ATF_REQUIRE(sdp_put_uuid(&test, &u128));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x19, 0x12, 0x34,	// uuid16	0x1234
+		0x1a, 0x12, 0x34, 0x56, // uuid32	0x12345678
+		0x78,
+		0x1c, 0x00, 0x11, 0x22,	// uuid128	00112233-4444-5555-6677-8899aabbccdd
+		0x33, 0x44, 0x44, 0x55,
+		0x55, 0x66, 0x77, 0x88,
+		0x99, 0xaa, 0xbb, 0xcc,
+		0xdd,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uuid16);
+
+ATF_TC_HEAD(check_sdp_put_uuid16, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uuid16 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uuid16, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uuid16(&test, 0x4567));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x19, 0x45, 0x67,	// uuid16	0x4567
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uuid32);
+
+ATF_TC_HEAD(check_sdp_put_uuid32, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uuid32 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uuid32, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uuid32(&test, 0xabcdef00));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x1a, 0xab, 0xcd, 0xef, // uuid32	0xabcdef00
+		0x00,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uuid128);
+
+ATF_TC_HEAD(check_sdp_put_uuid128, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uuid128 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uuid128, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+	uuid_t value = {
+		0x00000100,
+		0x0000,
+		0x1000,
+		0x80,
+		0x00,
+		{ 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb }
+	};
+
+	ATF_REQUIRE(sdp_put_uuid128(&test, &value));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x1c, 0x00, 0x00, 0x01,	// uuid128	0000100-0000-1000-8000-00805f9b34fb
+		0x00, 0x00, 0x00, 0x10,	//			(L2CAP protocol)
+		0x00, 0x80, 0x00, 0x00,
+		0x80, 0x5f, 0x9b, 0x34,
+		0xfb,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_bool);
+
+ATF_TC_HEAD(check_sdp_put_bool, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_bool results");
+}
+
+ATF_TC_BODY(check_sdp_put_bool, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_bool(&test, true));
+	ATF_REQUIRE(sdp_put_bool(&test, false));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x28, 0x01,		// bool	true
+		0x28, 0x00,		// bool	false
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uint);
+
+ATF_TC_HEAD(check_sdp_put_uint, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uint results");
+}
+
+ATF_TC_BODY(check_sdp_put_uint, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)0));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT8_MAX + 1));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT16_MAX));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT16_MAX + 1));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT32_MAX));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT32_MAX + 1));
+	ATF_REQUIRE(sdp_put_uint(&test, (uintmax_t)UINT64_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x08, 0x00,		// uint8	0x00
+		0x08, 0xff,		// uint8	0xff
+		0x09, 0x01, 0x00,	// uint16	0x0100
+		0x09, 0xff, 0xff,	// uint16	0xffff
+		0x0a, 0x00, 0x01, 0x00,	// uint32	0x00010000
+		0x00,
+		0x0a, 0xff, 0xff, 0xff,	// uint32	0xffffffff
+		0xff,
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x0000000100000000
+		0x01, 0x00, 0x00, 0x00,
+		0x00,
+		0x0b, 0xff, 0xff, 0xff,	// uint64	0xffffffffffffffff
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uint8);
+
+ATF_TC_HEAD(check_sdp_put_uint8, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uint8 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uint8, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uint8(&test, (uint8_t)0));
+	ATF_REQUIRE(sdp_put_uint8(&test, (uint8_t)UINT8_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x08, 0x00,		// uint8	0x00
+		0x08, 0xff,		// uint8	0xff
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uint16);
+
+ATF_TC_HEAD(check_sdp_put_uint16, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uint16 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uint16, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uint16(&test, (uint16_t)0));
+	ATF_REQUIRE(sdp_put_uint16(&test, (uint16_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_uint16(&test, (uint16_t)UINT16_MAX));
+	ATF_REQUIRE(sdp_put_uint16(&test, (uint16_t)0xabcd));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x09, 0x00, 0x00,	// uint16	0x0000
+		0x09, 0x00, 0xff,	// uint16	0x00ff
+		0x09, 0xff, 0xff,	// uint16	0xffff
+		0x09, 0xab, 0xcd,	// uint16	0xabcd
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uint32);
+
+ATF_TC_HEAD(check_sdp_put_uint32, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uint32 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uint32, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uint32(&test, (uint32_t)0));
+	ATF_REQUIRE(sdp_put_uint32(&test, (uint32_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_uint32(&test, (uint32_t)UINT16_MAX));
+	ATF_REQUIRE(sdp_put_uint32(&test, (uint32_t)UINT32_MAX));
+	ATF_REQUIRE(sdp_put_uint32(&test, (uint32_t)0xdeadbeef));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x0a, 0x00, 0x00, 0x00,	// uint32	0x00000000
+		0x00,
+		0x0a, 0x00, 0x00, 0x00,	// uint32	0x000000ff
+		0xff,
+		0x0a, 0x00, 0x00, 0xff,	// uint32	0x0000ffff
+		0xff,
+		0x0a, 0xff, 0xff, 0xff,	// uint32	0xffffffff
+		0xff,
+		0x0a, 0xde, 0xad, 0xbe,	// uint32	0xdeadbeef
+		0xef,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_uint64);
+
+ATF_TC_HEAD(check_sdp_put_uint64, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_uint64 results");
+}
+
+ATF_TC_BODY(check_sdp_put_uint64, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)0));
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)UINT16_MAX));
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)UINT32_MAX));
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)UINT64_MAX));
+	ATF_REQUIRE(sdp_put_uint64(&test, (uint64_t)0xc0ffeecafec0ffee));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x0000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x00000000000000ff
+		0x00, 0x00, 0x00, 0x00,
+		0xff,
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x000000000000ffff
+		0x00, 0x00, 0x00, 0xff,
+		0xff,
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x00000000ffffffff
+		0x00, 0xff, 0xff, 0xff,
+		0xff,
+		0x0b, 0xff, 0xff, 0xff,	// uint64	0xffffffffffffffff
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+		0x0b, 0xc0, 0xff, 0xee,	// uint64	0xc0ffeecafec0ffee
+		0xca, 0xfe, 0xc0, 0xff,
+		0xee,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_int);
+
+ATF_TC_HEAD(check_sdp_put_int, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_int results");
+}
+
+ATF_TC_BODY(check_sdp_put_int, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)0));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT8_MIN));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT8_MAX));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT8_MIN - 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT8_MAX + 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT16_MIN));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT16_MAX));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT16_MIN - 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT16_MAX + 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT32_MIN));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT32_MAX));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT32_MIN - 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT32_MAX + 1));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT64_MIN));
+	ATF_REQUIRE(sdp_put_int(&test, (intmax_t)INT64_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x10, 0x00,		// int8		0
+		0x10, 0x80,		// int8		-128
+		0x10, 0x7f,		// int8		127
+		0x11, 0xff, 0x7f,	// int16	-129
+		0x11, 0x00, 0x80,	// int16	128
+		0x11, 0x80, 0x00,	// int16	-32768
+		0x11, 0x7f, 0xff,	// int16	32767
+		0x12, 0xff, 0xff, 0x7f,	// int32	-32769
+		0xff,
+		0x12, 0x00, 0x00, 0x80,	// int32	32768
+		0x00,
+		0x12, 0x80, 0x00, 0x00,	// int32	-2147483648
+		0x00,
+		0x12, 0x7f, 0xff, 0xff,	// int32	2147483647
+		0xff,
+		0x13, 0xff, 0xff, 0xff,	// int64	-2147483649
+		0xff, 0x7f, 0xff, 0xff,
+		0xff,
+		0x13, 0x00, 0x00, 0x00,	// int64	2147483648
+		0x00, 0x80, 0x00, 0x00,
+		0x00,
+		0x13, 0x80, 0x00, 0x00,	// int64	-9223372036854775808
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x13, 0x7f, 0xff, 0xff,	// int64	9223372036854775807
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_int8);
+
+ATF_TC_HEAD(check_sdp_put_int8, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_int8 results");
+}
+
+ATF_TC_BODY(check_sdp_put_int8, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_int8(&test, (int8_t)0));
+	ATF_REQUIRE(sdp_put_int8(&test, (int8_t)INT8_MIN));
+	ATF_REQUIRE(sdp_put_int8(&test, (int8_t)INT8_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x10, 0x00,		// int8		0
+		0x10, 0x80,		// int8		-128
+		0x10, 0x7f,		// int8		127
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_int16);
+
+ATF_TC_HEAD(check_sdp_put_int16, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_int16 results");
+}
+
+ATF_TC_BODY(check_sdp_put_int16, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_int16(&test, (int16_t)0));
+	ATF_REQUIRE(sdp_put_int16(&test, (int16_t)INT8_MIN));
+	ATF_REQUIRE(sdp_put_int16(&test, (int16_t)INT8_MAX));
+	ATF_REQUIRE(sdp_put_int16(&test, (int16_t)INT16_MIN));
+	ATF_REQUIRE(sdp_put_int16(&test, (int16_t)INT16_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x11, 0x00, 0x00,	// int16	0
+		0x11, 0xff, 0x80,	// int16	-128
+		0x11, 0x00, 0x7f,	// int16	127
+		0x11, 0x80, 0x00,	// int16	-32768
+		0x11, 0x7f, 0xff,	// int16	32767
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_int32);
+
+ATF_TC_HEAD(check_sdp_put_int32, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_int32 results");
+}
+
+ATF_TC_BODY(check_sdp_put_int32, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)0));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT8_MIN));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT8_MAX));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT16_MIN));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT16_MAX));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT32_MIN));
+	ATF_REQUIRE(sdp_put_int32(&test, (int32_t)INT32_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x12, 0x00, 0x00, 0x00,	// int32	0
+		0x00,
+		0x12, 0xff, 0xff, 0xff,	// int32	-128
+		0x80,
+		0x12, 0x00, 0x00, 0x00,	// int32	127
+		0x7f,
+		0x12, 0xff, 0xff, 0x80,	// int32	-32768
+		0x00,
+		0x12, 0x00, 0x00, 0x7f,	// int32	32767
+		0xff,
+		0x12, 0x80, 0x00, 0x00,	// int32	-2147483648
+		0x00,
+		0x12, 0x7f, 0xff, 0xff,	// int32	2147483647
+		0xff,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_int64);
+
+ATF_TC_HEAD(check_sdp_put_int64, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_int64 results");
+}
+
+ATF_TC_BODY(check_sdp_put_int64, tc)
+{
+	uint8_t buf[256];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)0));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT8_MIN));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT8_MAX));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT16_MIN));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT16_MAX));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT32_MIN));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT32_MAX));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT64_MIN));
+	ATF_REQUIRE(sdp_put_int64(&test, (int64_t)INT64_MAX));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x13, 0x00, 0x00, 0x00,	// int64	0
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x13, 0xff, 0xff, 0xff,	// int64	-128
+		0xff, 0xff, 0xff, 0xff,
+		0x80,
+		0x13, 0x00, 0x00, 0x00,	// int64	127
+		0x00, 0x00, 0x00, 0x00,
+		0x7f,
+		0x13, 0xff, 0xff, 0xff,	// int64	-32768
+		0xff, 0xff, 0xff, 0x80,
+		0x00,
+		0x13, 0x00, 0x00, 0x00,	// int64	32767
+		0x00, 0x00, 0x00, 0x7f,
+		0xff,
+		0x13, 0xff, 0xff, 0xff,	// int64	-2147483648
+		0xff, 0x80, 0x00, 0x00,
+		0x00,
+		0x13, 0x00, 0x00, 0x00,	// int64	2147483647
+		0x00, 0x7f, 0xff, 0xff,
+		0xff,
+		0x13, 0x80, 0x00, 0x00,	// int64	-9223372036854775808
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x13, 0x7f, 0xff, 0xff,	// int64	9223372036854775807
+		0xff, 0xff, 0xff, 0xff,
+		0xff,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_seq);
+
+ATF_TC_HEAD(check_sdp_put_seq, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_seq results");
+}
+
+ATF_TC_BODY(check_sdp_put_seq, tc)
+{
+	uint8_t buf[512];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_seq(&test, (ssize_t)0));
+	ATF_REQUIRE(sdp_put_seq(&test, (ssize_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_seq(&test, (ssize_t)UINT8_MAX + 1));
+	ATF_REQUIRE(sdp_put_seq(&test, (ssize_t)-1));
+	ATF_CHECK_EQ(sdp_put_seq(&test, (ssize_t)UINT16_MAX), false);	/* no room */
+	ATF_CHECK_EQ(sdp_put_seq(&test, (ssize_t)SSIZE_MAX), false);	/* no room */
+	test.end = test.next;
+	test.next = buf;
+
+	/* (not a valid element list) */
+	const uint8_t expect[] = {
+		0x35, 0x00,		// seq8(0)
+		0x35, 0xff,		// seq8(255)
+		0x36, 0x01, 0x00,	// seq16(256)
+		0x36, 0x01, 0xf6,	// seq16(502)	<- sizeof(buf) - 7 - 3
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_alt);
+
+ATF_TC_HEAD(check_sdp_put_alt, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_alt results");
+}
+
+ATF_TC_BODY(check_sdp_put_alt, tc)
+{
+	uint8_t buf[512];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	ATF_REQUIRE(sdp_put_alt(&test, (ssize_t)0));
+	ATF_REQUIRE(sdp_put_alt(&test, (ssize_t)UINT8_MAX));
+	ATF_REQUIRE(sdp_put_alt(&test, (ssize_t)UINT8_MAX + 1));
+	ATF_REQUIRE(sdp_put_alt(&test, (ssize_t)-1));
+	ATF_CHECK_EQ(sdp_put_alt(&test, (ssize_t)UINT16_MAX), false);	/* no room */
+	ATF_CHECK_EQ(sdp_put_alt(&test, (ssize_t)SSIZE_MAX), false);	/* no room */
+	test.end = test.next;
+	test.next = buf;
+
+	/* (not a valid element list) */
+	const uint8_t expect[] = {
+		0x3d, 0x00,		// alt8(0)
+		0x3d, 0xff,		// alt8(255)
+		0x3e, 0x01, 0x00,	// alt16(256)
+		0x3e, 0x01, 0xf6,	// alt16(502)	<- sizeof(buf) - 7 - 3
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_str);
+
+ATF_TC_HEAD(check_sdp_put_str, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_str results");
+}
+
+ATF_TC_BODY(check_sdp_put_str, tc)
+{
+	uint8_t buf[512];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	/*
+	 * this does not test str16 or str32, but that is
+	 * handled by the same code as sdp_put_seq above..
+	 */
+
+	ATF_REQUIRE(sdp_put_str(&test, "Hello World!", 5));
+	ATF_REQUIRE(sdp_put_str(&test, "Hello\0World", 11));
+	ATF_REQUIRE(sdp_put_str(&test, "Hello World!", -1));
+	ATF_REQUIRE(sdp_put_str(&test, "Hello\0World", -1));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x25, 0x05, 0x48, 0x65,	// str8		"Hello"
+		0x6c, 0x6c, 0x6f,
+		0x25, 0x0b, 0x48, 0x65,	// str8		"Hello\0World"
+		0x6c, 0x6c, 0x6f, 0x00,
+		0x57, 0x6f, 0x72, 0x6c,
+		0x64,
+		0x25, 0x0c, 0x48, 0x65,	// str8		"Hello World!"
+		0x6c, 0x6c, 0x6f, 0x20,
+		0x57, 0x6f, 0x72, 0x6c,
+		0x64, 0x21,
+		0x25, 0x05, 0x48, 0x65,	// str8		"Hello"
+		0x6c, 0x6c, 0x6f,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_put_url);
+
+ATF_TC_HEAD(check_sdp_put_url, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_put_url results");
+}
+
+ATF_TC_BODY(check_sdp_put_url, tc)
+{
+	uint8_t buf[512];
+	sdp_data_t test = { buf, buf + sizeof(buf) };
+
+	/*
+	 * this does not test url16 or url32, but that is
+	 * handled by the same code as sdp_put_seq above..
+	 */
+
+	ATF_REQUIRE(sdp_put_url(&test, "http://www.netbsd.org/", 21));
+	ATF_REQUIRE(sdp_put_url(&test, "http://www.netbsd.org/", -1));
+	test.end = test.next;
+	test.next = buf;
+
+	const uint8_t expect[] = {
+		0x45, 0x15, 0x68, 0x74,	// url8	"http://www.netbsd.org"
+		0x74, 0x70, 0x3a, 0x2f,
+		0x2f, 0x77, 0x77, 0x77,
+		0x2e, 0x6e, 0x65, 0x74,
+		0x62, 0x73, 0x64, 0x2e,
+		0x6f, 0x72, 0x67,
+		0x45, 0x16, 0x68, 0x74,	// url8	"http://www.netbsd.org/"
+		0x74, 0x70, 0x3a, 0x2f,
+		0x2f, 0x77, 0x77, 0x77,
+		0x2e, 0x6e, 0x65, 0x74,
+		0x62, 0x73, 0x64, 0x2e,
+		0x6f, 0x72, 0x67, 0x2f,
+	};
+
+	ATF_REQUIRE_EQ(test.end - test.next, sizeof(expect));
+	ATF_CHECK(memcmp(expect, test.next, sizeof(expect)) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_sdp_put_data);
+	ATF_TP_ADD_TC(tp, check_sdp_put_attr);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uuid);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uuid16);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uuid32);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uuid128);
+	ATF_TP_ADD_TC(tp, check_sdp_put_bool);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uint);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uint8);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uint16);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uint32);
+	ATF_TP_ADD_TC(tp, check_sdp_put_uint64);
+	ATF_TP_ADD_TC(tp, check_sdp_put_int);
+	ATF_TP_ADD_TC(tp, check_sdp_put_int8);
+	ATF_TP_ADD_TC(tp, check_sdp_put_int16);
+	ATF_TP_ADD_TC(tp, check_sdp_put_int32);
+	ATF_TP_ADD_TC(tp, check_sdp_put_int64);
+	ATF_TP_ADD_TC(tp, check_sdp_put_seq);
+	ATF_TP_ADD_TC(tp, check_sdp_put_alt);
+	ATF_TP_ADD_TC(tp, check_sdp_put_str);
+	ATF_TP_ADD_TC(tp, check_sdp_put_url);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbluetooth/t_sdp_set.c b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_set.c
new file mode 100644
index 000000000000..be5d953f7f9c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbluetooth/t_sdp_set.c
@@ -0,0 +1,359 @@
+/*	$NetBSD: t_sdp_set.c,v 1.2 2011/04/07 08:29:50 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Iain Hibbert.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <limits.h>
+#include <sdp.h>
+#include <string.h>
+
+ATF_TC(check_sdp_set_bool);
+
+ATF_TC_HEAD(check_sdp_set_bool, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_set_bool results");
+}
+
+ATF_TC_BODY(check_sdp_set_bool, tc)
+{
+	uint8_t data[] = {
+		0x28, 0x00,	// bool	false
+		0x00,		// nil
+		0x28,		// bool <invalid>
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t discard;
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_BOOL);
+	ATF_REQUIRE(sdp_set_bool(&test, true));
+	ATF_CHECK_EQ(test.next[1], 0x01);
+	ATF_REQUIRE(sdp_set_bool(&test, false));
+	ATF_CHECK_EQ(test.next[1], 0x00);
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_NIL);
+	ATF_CHECK_EQ(sdp_set_bool(&test, true), false);		/* not bool */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_BOOL);
+	ATF_CHECK_EQ(sdp_set_bool(&test, true), false);		/* no value */
+}
+
+ATF_TC(check_sdp_set_uint);
+
+ATF_TC_HEAD(check_sdp_set_uint, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_set_uint results");
+}
+
+ATF_TC_BODY(check_sdp_set_uint, tc)
+{
+	uint8_t data[] = {
+		0x08, 0x00,		// uint8	0x00
+		0x00,			// nil
+		0x09, 0x00, 0x00,	// uint16	0x0000
+		0x0a, 0x00, 0x00, 0x00,	// uint32	0x00000000
+		0x00,
+		0x0b, 0x00, 0x00, 0x00,	// uint64	0x0000000000000000
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x0c, 0x00, 0x44, 0x00,	// uint128	0x00440044004400440044004400440044
+		0x44, 0x00, 0x44, 0x00,
+		0x44, 0x00, 0x44, 0x00,
+		0x44, 0x00, 0x44, 0x00,
+		0x00,
+		0x09, 0x00,		// uint16	<invalid>
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t discard;
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT8);
+	ATF_REQUIRE(sdp_set_uint(&test, 0x44));
+	ATF_CHECK_EQ(sdp_set_uint(&test, UINT8_MAX + 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_NIL);
+	ATF_CHECK_EQ(sdp_set_uint(&test, 0x00), false);			/* not uint */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT16);
+	ATF_REQUIRE(sdp_set_uint(&test, 0xabcd));
+	ATF_CHECK_EQ(sdp_set_uint(&test, UINT16_MAX + 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT32);
+	ATF_REQUIRE(sdp_set_uint(&test, 0xdeadbeef));
+	ATF_CHECK_EQ(sdp_set_uint(&test, (uintmax_t)UINT32_MAX + 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT64);
+	ATF_REQUIRE(sdp_set_uint(&test, 0xc0ffeecafec0ffee));
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT128);
+	ATF_REQUIRE(sdp_set_uint(&test, 0xabcdef0123456789));
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_UINT16);
+	ATF_CHECK_EQ(sdp_set_uint(&test, 0x3344), false);		/* no value */
+
+	const uint8_t expect[] = {
+		0x08, 0x44,		// uint8	0x44
+		0x00,			// nil
+		0x09, 0xab, 0xcd,	// uint16	0xabcd
+		0x0a, 0xde, 0xad, 0xbe,	// uint32	0xdeadbeef
+		0xef,
+		0x0b, 0xc0, 0xff, 0xee,	// uint64	0xc0ffeecafec0ffee
+		0xca, 0xfe, 0xc0, 0xff,
+		0xee,
+		0x0c, 0x00, 0x00, 0x00,	// uint128	0x0000000000000000abcdef0123456789
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0xab, 0xcd, 0xef,
+		0x01, 0x23, 0x45, 0x67,
+		0x89,
+		0x09, 0x00,		// uint16	<invalid>
+	};
+
+	ATF_REQUIRE_EQ(sizeof(data), sizeof(expect));
+	ATF_CHECK(memcmp(expect, data, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_set_int);
+
+ATF_TC_HEAD(check_sdp_set_int, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_set_int results");
+}
+
+ATF_TC_BODY(check_sdp_set_int, tc)
+{
+	uint8_t data[] = {
+		0x10, 0x00,		// int8		0
+		0x00,			// nil
+		0x11, 0x00, 0x00,	// int16	0
+		0x12, 0x00, 0x00, 0x00,	// int32	0
+		0x00,
+		0x13, 0x00, 0x00, 0x00,	// int64	0
+		0x00, 0x00, 0x00, 0x00,
+		0x00,
+		0x14, 0x00, 0x44, 0x00,	// int128	0x00440044004400440044004400440044
+		0x44, 0x00, 0x44, 0x00,
+		0x44, 0x00, 0x44, 0x00,
+		0x44, 0x00, 0x44, 0x00,
+		0x00,
+		0x11, 0x00,		// int16	<invalid>
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t discard;
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT8);
+	ATF_REQUIRE(sdp_set_int(&test, -1));
+	ATF_CHECK_EQ(sdp_set_int(&test, INT8_MAX + 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_NIL);
+	ATF_CHECK_EQ(sdp_set_int(&test, 33), false);		/* not int */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT16);
+	ATF_REQUIRE(sdp_set_int(&test, 789));
+	ATF_CHECK_EQ(sdp_set_int(&test, INT16_MIN - 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT32);
+	ATF_REQUIRE(sdp_set_int(&test, -4567));
+	ATF_CHECK_EQ(sdp_set_int(&test, (intmax_t)INT32_MAX + 1), false);	/* too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT64);
+	ATF_REQUIRE(sdp_set_int(&test, -3483738234));
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT128);
+	ATF_REQUIRE(sdp_set_int(&test, 3423489463464));
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT16);
+	ATF_CHECK_EQ(sdp_set_int(&test, 1234), false);		/* no value */
+
+	const uint8_t expect[] = {
+		0x10, 0xff,		// int8		-1
+		0x00,			// nil
+		0x11, 0x03, 0x15,	// int16	789
+		0x12, 0xff, 0xff, 0xee,	// int32	-4567
+		0x29,
+		0x13, 0xff, 0xff, 0xff,	// int64	-3483738234
+		0xff, 0x30, 0x5a, 0x5f,
+		0x86,
+		0x14, 0x00, 0x00, 0x00,	// int128	3423489463464
+		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x03,
+		0x1d, 0x17, 0xdf, 0x94,
+		0xa8,
+		0x11, 0x00,		// int16	<invalid>
+	};
+
+	ATF_REQUIRE_EQ(sizeof(data), sizeof(expect));
+	ATF_CHECK(memcmp(expect, data, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_set_seq);
+
+ATF_TC_HEAD(check_sdp_set_seq, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_set_seq results");
+}
+
+ATF_TC_BODY(check_sdp_set_seq, tc)
+{
+	uint8_t data[] = {
+		0x35, 0x03,		// seq8(3)
+		0x11, 0xff, 0xff,	//   int16	-1
+		0x36, 0x01, 0x00,	// seq16(256)
+		0x09, 0xff, 0xff,	// uint16	0xffff
+		0x37, 0x01, 0x02, 0x03,	// seq32(16909060)
+		0x04,
+		0x36, 0x00,		// seq16(<invalid>)
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t discard;
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_SEQ8);
+	ATF_REQUIRE(sdp_set_seq(&test, 0));
+	ATF_CHECK_EQ(sdp_set_seq(&test, UINT8_MAX), false);	/* data too big */
+	ATF_CHECK_EQ(sdp_set_seq(&test, UINT16_MAX), false);	/* size too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT16);
+	ATF_CHECK_EQ(sdp_set_seq(&test, 33), false);		/* not seq */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_SEQ16);
+	ATF_REQUIRE(sdp_set_seq(&test, 3));
+	ATF_CHECK_EQ(sdp_set_seq(&test, SSIZE_MAX), false);	/* size too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_SEQ32);
+	ATF_REQUIRE(sdp_set_seq(&test, 0));
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_SEQ16);
+	ATF_CHECK_EQ(sdp_set_seq(&test, 22), false);		/* no size */
+
+	const uint8_t expect[] = {
+		0x35, 0x00,		// seq8(0)
+		0x11, 0xff, 0xff,	// int16	-1
+		0x36, 0x00, 0x03,	// seq16(3)
+		0x09, 0xff, 0xff,	//   uint16	0xffff
+		0x37, 0x00, 0x00, 0x00,	// seq32(0)
+		0x00,
+		0x36, 0x00,		// seq16(<invalid>)
+	};
+
+	ATF_REQUIRE_EQ(sizeof(data), sizeof(expect));
+	ATF_CHECK(memcmp(expect, data, sizeof(expect)) == 0);
+}
+
+ATF_TC(check_sdp_set_alt);
+
+ATF_TC_HEAD(check_sdp_set_alt, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test sdp_set_alt results");
+}
+
+ATF_TC_BODY(check_sdp_set_alt, tc)
+{
+	uint8_t data[] = {
+		0x3d, 0x06,		// alt8(6)
+		0x11, 0xff, 0xff,	//   int16	-1
+		0x3e, 0xff, 0xff,	//   alt16(65535)
+		0x3f, 0x01, 0x02, 0x03,	// alt32(16909060)
+		0x04,
+		0x0a, 0x00, 0x00, 0x00,	// uint32	0x00000003
+		0x03,
+		0x3e, 0x00,		// alt16(<invalid>)
+	};
+	sdp_data_t test = { data, data + sizeof(data) };
+	sdp_data_t discard;
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_ALT8);
+	ATF_REQUIRE(sdp_set_alt(&test, 0));
+	ATF_CHECK_EQ(sdp_set_alt(&test, UINT8_MAX), false);	/* data too big */
+	ATF_CHECK_EQ(sdp_set_alt(&test, UINT16_MAX), false);	/* size too big */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_INT16);
+	ATF_CHECK_EQ(sdp_set_alt(&test, 27), false);		/* not alt */
+	ATF_REQUIRE(sdp_get_data(&test, &discard));
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_ALT16);
+	ATF_REQUIRE(sdp_set_alt(&test, 10));
+	ATF_CHECK_EQ(sdp_set_alt(&test, SSIZE_MAX), false);	/* size too big */
+	ATF_REQUIRE(sdp_get_alt(&test, &discard));
+	ATF_CHECK_EQ(sdp_data_type(&discard), SDP_DATA_ALT32);
+	ATF_CHECK(sdp_set_alt(&discard, -1));			/* end of alt16 */
+	ATF_CHECK_EQ(sdp_set_alt(&discard, 6), false);		/* data too big */
+
+	ATF_CHECK_EQ(sdp_data_type(&test), SDP_DATA_ALT16);
+	ATF_CHECK_EQ(sdp_set_alt(&test, 22), false);		/* no size */
+
+	const uint8_t expect[] = {
+		0x3d, 0x00,		// alt8(0)
+		0x11, 0xff, 0xff,	// int16	-1
+		0x3e, 0x00, 0x0a,	// alt16(10)
+		0x3f, 0x00, 0x00, 0x00,	//   alt32(5)
+		0x05,
+		0x0a, 0x00, 0x00, 0x00,	//     uint32	0x00000003
+		0x03,
+		0x3e, 0x00,		// alt16(<invalid>)
+	};
+
+	ATF_REQUIRE_EQ(sizeof(data), sizeof(expect));
+	ATF_CHECK(memcmp(expect, data, sizeof(expect)) == 0);
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, check_sdp_set_bool);
+	ATF_TP_ADD_TC(tp, check_sdp_set_uint);
+	ATF_TP_ADD_TC(tp, check_sdp_set_int);
+	ATF_TP_ADD_TC(tp, check_sdp_set_seq);
+	ATF_TP_ADD_TC(tp, check_sdp_set_alt);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbpfjit/t_bpfjit.c b/contrib/netbsd-tests/lib/libbpfjit/t_bpfjit.c
new file mode 100644
index 000000000000..da67c1b335ce
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbpfjit/t_bpfjit.c
@@ -0,0 +1,3975 @@
+/*	$NetBSD: t_bpfjit.c,v 1.6 2014/07/08 21:07:52 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2011-2012, 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bpfjit.c,v 1.6 2014/07/08 21:07:52 alnsn Exp $");
+
+#include <atf-c.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+static uint8_t deadbeef_at_5[16] = {
+	0, 0xf1, 2, 0xf3, 4, 0xde, 0xad, 0xbe, 0xef, 0xff
+};
+
+static inline
+unsigned int jitcall(bpfjit_func_t fn,
+    const uint8_t *pkt, unsigned int wirelen, unsigned int buflen)
+{
+	bpf_args_t args;
+
+	args.pkt = pkt;
+	args.wirelen = wirelen;
+	args.buflen = buflen;
+
+	return fn(NULL, &args);
+}
+
+ATF_TC(libbpfjit_empty);
+ATF_TC_HEAD(libbpfjit_empty, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that JIT compilation of an empty bpf program fails");
+}
+
+ATF_TC_BODY(libbpfjit_empty, tc)
+{
+	struct bpf_insn dummy;
+
+	ATF_CHECK(bpfjit_generate_code(NULL, &dummy, 0) == NULL);
+}
+
+ATF_TC(libbpfjit_alu_add_k);
+ATF_TC_HEAD(libbpfjit_alu_add_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_ADD+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_add_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 5);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_sub_k);
+ATF_TC_HEAD(libbpfjit_alu_sub_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_sub_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_mul_k);
+ATF_TC_HEAD(libbpfjit_alu_mul_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_mul_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0xfffffffd));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div0_k);
+ATF_TC_HEAD(libbpfjit_alu_div0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	//ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div1_k);
+ATF_TC_HEAD(libbpfjit_alu_div1_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=1");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div1_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div2_k);
+ATF_TC_HEAD(libbpfjit_alu_div2_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=2");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div2_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 3);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div4_k);
+ATF_TC_HEAD(libbpfjit_alu_div4_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=4");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div4_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x3fffffff));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div10_k);
+ATF_TC_HEAD(libbpfjit_alu_div10_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=10");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div10_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 10),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(429484384));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div10000_k);
+ATF_TC_HEAD(libbpfjit_alu_div10000_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=10000");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div10000_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 10000),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(429484));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div7609801_k);
+ATF_TC_HEAD(libbpfjit_alu_div7609801_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=7609801");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div7609801_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(7609801)),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 564);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div80000000_k);
+ATF_TC_HEAD(libbpfjit_alu_div80000000_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=0x80000000");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div80000000_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffde)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(0x80000000)),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_and_k);
+ATF_TC_HEAD(libbpfjit_alu_and_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_AND+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_and_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_K, 0xbeef),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == (0xdead&0xbeef));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_or_k);
+ATF_TC_HEAD(libbpfjit_alu_or_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_OR+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_or_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead0000),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_K, 0x0000beef),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_lsh_k);
+ATF_TC_HEAD(libbpfjit_alu_lsh_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_lsh_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 16),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xbeef0000);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_lsh0_k);
+ATF_TC_HEAD(libbpfjit_alu_lsh0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_K with k=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_lsh0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_rsh_k);
+ATF_TC_HEAD(libbpfjit_alu_rsh_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_alu_rsh_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 16),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0x0000dead);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_rsh0_k);
+ATF_TC_HEAD(libbpfjit_alu_rsh0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_K with k=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_rsh0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_modulo_k);
+ATF_TC_HEAD(libbpfjit_alu_modulo_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_ALU+BPF_K operations");
+}
+
+ATF_TC_BODY(libbpfjit_alu_modulo_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+
+		/* (7FFFFF77 * 0FFFFF77) = 07FFFFB2,F0004951 */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, UINT32_C(0x0fffff77)),
+
+		/* 07FFFFB2,F0004951 << 1 = 0FFFFF65,E00092A2 */
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 1),
+
+		/* 0FFFFF65,E00092A2 + DDDDDDDD = 0FFFFF66,BDDE707F */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xdddddddd)),
+
+		/* 0FFFFF66,BDDE707F - FFFFFFFF = 0FFFFF65,BDDE7080 */
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, UINT32_C(0xffffffff)),
+
+		/* 0FFFFF65,BDDE7080 | 0000030C = 0FFFFF65,BDDE738C */
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_K, UINT32_C(0x0000030c)),
+
+		/* -0FFFFF65,BDDE738C mod(2^64) = F000009A,42218C74 */
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+
+		/* F000009A,42218C74 & FFFFFF0F = F000009A,42218C04 */
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_K, UINT32_C(0xffffff0f)),
+
+		/* F000009A,42218C74 >> 3 = 1E000013,48443180 */
+		/* 00000000,42218C74 >> 3 = 00000000,08443180 */
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 3),
+
+		/* 00000000,08443180 * 7FFFFF77 = 042218BB,93818280 */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, UINT32_C(0x7fffff77)),
+
+		/* 042218BB,93818280 / DEAD = 000004C0,71CBBBC3 */
+		/* 00000000,93818280 / DEAD = 00000000,0000A994 */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(0xdead)),
+
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) != UINT32_C(0x71cbbbc3));
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x0000a994));
+
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_add_x);
+ATF_TC_HEAD(libbpfjit_alu_add_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_ADD+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_add_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 5);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_sub_x);
+ATF_TC_HEAD(libbpfjit_alu_sub_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_sub_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_mul_x);
+ATF_TC_HEAD(libbpfjit_alu_mul_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_mul_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0xfffffffd));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div0_x);
+ATF_TC_HEAD(libbpfjit_alu_div0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div1_x);
+ATF_TC_HEAD(libbpfjit_alu_div1_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=1");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div1_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div2_x);
+ATF_TC_HEAD(libbpfjit_alu_div2_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=2");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div2_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 3);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div4_x);
+ATF_TC_HEAD(libbpfjit_alu_div4_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=4");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div4_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x3fffffff));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div10_x);
+ATF_TC_HEAD(libbpfjit_alu_div10_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div10_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(429484384));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div10000_x);
+ATF_TC_HEAD(libbpfjit_alu_div10000_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10000");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div10000_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10000),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(429484));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div7609801_x);
+ATF_TC_HEAD(libbpfjit_alu_div7609801_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=7609801");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div7609801_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(7609801)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 564);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_div80000000_x);
+ATF_TC_HEAD(libbpfjit_alu_div80000000_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0x80000000");
+}
+
+ATF_TC_BODY(libbpfjit_alu_div80000000_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_MAX - 33),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0x80000000)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_and_x);
+ATF_TC_HEAD(libbpfjit_alu_and_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_AND+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_and_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0xbeef),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == (0xdead&0xbeef));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_or_x);
+ATF_TC_HEAD(libbpfjit_alu_or_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_OR+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_or_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead0000),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0x0000beef),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_lsh_x);
+ATF_TC_HEAD(libbpfjit_alu_lsh_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_lsh_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 16),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xbeef0000);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_lsh0_x);
+ATF_TC_HEAD(libbpfjit_alu_lsh0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_X with k=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_lsh0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_rsh_x);
+ATF_TC_HEAD(libbpfjit_alu_rsh_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_alu_rsh_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 16),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0x0000dead);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_rsh0_x);
+ATF_TC_HEAD(libbpfjit_alu_rsh0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_X with k=0");
+}
+
+ATF_TC_BODY(libbpfjit_alu_rsh0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_modulo_x);
+ATF_TC_HEAD(libbpfjit_alu_modulo_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_ALU+BPF_X operations");
+}
+
+ATF_TC_BODY(libbpfjit_alu_modulo_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+
+		/* (7FFFFF77 * 0FFFFF77) = 07FFFFB2,F0004951 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x0fffff77)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+
+		/* 07FFFFB2,F0004951 << 1 = 0FFFFF65,E00092A2 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, 1),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+
+		/* 0FFFFF65,E00092A2 + DDDDDDDD = 0FFFFF66,BDDE707F */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xdddddddd)),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+
+		/* 0FFFFF66,BDDE707F - FFFFFFFF = 0FFFFF65,BDDE7080 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0),
+
+		/* 0FFFFF65,BDDE7080 | 0000030C = 0FFFFF65,BDDE738C */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x0000030c)),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_X, 0),
+
+		/* -0FFFFF65,BDDE738C mod(2^64) = F000009A,42218C74 */
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+
+		/* F000009A,42218C74 & FFFFFF0F = F000009A,42218C04 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xffffff0f)),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_X, 0),
+
+		/* F000009A,42218C74 >> 3 = 1E000013,48443180 */
+		/* 00000000,42218C74 >> 3 = 00000000,08443180 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, 3),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+
+		/* 00000000,08443180 * 7FFFFF77 = 042218BB,93818280 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x7fffff77)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+
+		/* 042218BB,93818280 / DEAD = 000004C0,71CBBBC3 */
+		/* 00000000,93818280 / DEAD = 00000000,0000A994 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xdead)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) != UINT32_C(0x71cbbbc3));
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x0000a994));
+
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_alu_neg);
+ATF_TC_HEAD(libbpfjit_alu_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_NEG");
+}
+
+ATF_TC_BODY(libbpfjit_alu_neg, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 777),
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0u-777u);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_ja);
+ATF_TC_HEAD(libbpfjit_jmp_ja, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JA");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_ja, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jgt_k);
+ATF_TC_HEAD(libbpfjit_jmp_jgt_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGT+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jgt_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 7, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 2, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 9, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 4, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 6, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 5, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jge_k);
+ATF_TC_HEAD(libbpfjit_jmp_jge_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGE+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jge_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 3, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 9, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 5, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 7, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 6, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jeq_k);
+ATF_TC_HEAD(libbpfjit_jmp_jeq_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JEQ+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jeq_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 3, 1, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 9, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 5, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 7, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 6, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 7);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jset_k);
+ATF_TC_HEAD(libbpfjit_jmp_jset_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JSET+BPF_K");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jset_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 4, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 3, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 2, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 1, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 2, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 7, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 5);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_modulo_k);
+ATF_TC_HEAD(libbpfjit_jmp_modulo_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_JMP+BPF_K operations");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_modulo_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xfffff770), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xfffff770), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xfffff771), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xfffff770), 0, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xfffff770), 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xfffff771), 1, 0),
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+
+		/* FFFFF770+FFFFF770 = 00000001,FFFFEEE0 */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xfffff770)),
+
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xffffeee0), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xffffeee0), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xffffeee1), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xffffeee0), 0, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xffffeee0), 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xffffeee1), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jgt_x);
+ATF_TC_HEAD(libbpfjit_jmp_jgt_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGT+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jgt_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jge_x);
+ATF_TC_HEAD(libbpfjit_jmp_jge_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGE+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jge_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jeq_x);
+ATF_TC_HEAD(libbpfjit_jmp_jeq_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JEQ+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jeq_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 7);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_jset_x);
+ATF_TC_HEAD(libbpfjit_jmp_jset_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JSET+BPF_X");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_jset_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 3, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 5);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_jmp_modulo_x);
+ATF_TC_HEAD(libbpfjit_jmp_modulo_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_JMP+BPF_X operations");
+}
+
+ATF_TC_BODY(libbpfjit_jmp_modulo_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+		/* FFFFF770 << 4 = FFFFF770 */
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 4),
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff770)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff771)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff770)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff771)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+
+		/* FFFFF770+FFFFF770 = 00000001,FFFFEEE0 */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xfffff770)),
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee0)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee1)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee0)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee1)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ld_abs);
+ATF_TC_HEAD(libbpfjit_ld_abs, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(libbpfjit_ld_abs, tc)
+{
+	static struct bpf_insn insns[3][2] = {
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		}
+	};
+
+	static size_t lengths[3] = { 1, 2, 4 };
+	static unsigned int expected[3] = { 0xde, 0xdead, 0xdeadbeef };
+
+	size_t i, l;
+	uint8_t *pkt = deadbeef_at_5;
+	size_t pktsize = sizeof(deadbeef_at_5);
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(bpf_validate(insns[i], insn_count));
+
+		code = bpfjit_generate_code(NULL, insns[i], insn_count);
+		ATF_REQUIRE(code != NULL);
+
+		for (l = 1; l < 5 + lengths[i]; l++) {
+			ATF_CHECK(jitcall(code, pkt, l, l) == 0);
+			ATF_CHECK(jitcall(code, pkt, pktsize, l) == 0);
+		}
+
+		l = 5 + lengths[i];
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+		ATF_CHECK(jitcall(code, pkt, pktsize, l) == expected[i]);
+
+		l = pktsize;
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+
+		bpfjit_free_code(code);
+	}
+}
+
+ATF_TC(libbpfjit_ld_abs_k_overflow);
+ATF_TC_HEAD(libbpfjit_ld_abs_k_overflow, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_ABS with overflow in k+4");
+}
+
+ATF_TC_BODY(libbpfjit_ld_abs_k_overflow, tc)
+{
+	static struct bpf_insn insns[12][3] = {
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 2),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 3),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 2),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 3),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		}
+	};
+
+	int i;
+	uint8_t pkt[8] = { 0 };
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(bpf_validate(insns[i], insn_count));
+
+		code = bpfjit_generate_code(NULL, insns[i], insn_count);
+		ATF_REQUIRE(code != NULL);
+
+		ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+		bpfjit_free_code(code);
+	}
+}
+
+ATF_TC(libbpfjit_ld_ind);
+ATF_TC_HEAD(libbpfjit_ld_ind, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(libbpfjit_ld_ind, tc)
+{
+	static struct bpf_insn insns[6][3] = {
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		}
+	};
+
+	static size_t lengths[6] = { 1, 2, 4, 1, 2, 4 };
+
+	static unsigned int expected[6] = {
+		0xde, 0xdead, 0xdeadbeef,
+		0xde, 0xdead, 0xdeadbeef
+	};
+
+	size_t i, l;
+	uint8_t *pkt = deadbeef_at_5;
+	size_t pktsize = sizeof(deadbeef_at_5);
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(bpf_validate(insns[i], insn_count));
+
+		code = bpfjit_generate_code(NULL, insns[i], insn_count);
+		ATF_REQUIRE(code != NULL);
+
+		for (l = 1; l < 5 + lengths[i]; l++) {
+			ATF_CHECK(jitcall(code, pkt, l, l) == 0);
+			ATF_CHECK(jitcall(code, pkt, pktsize, l) == 0);
+		}
+
+		l = 5 + lengths[i];
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+		ATF_CHECK(jitcall(code, pkt, pktsize, l) == expected[i]);
+
+		l = pktsize;
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+
+		bpfjit_free_code(code);
+	}
+}
+
+ATF_TC(libbpfjit_ld_ind_k_overflow);
+ATF_TC_HEAD(libbpfjit_ld_ind_k_overflow, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in k+4");
+}
+
+ATF_TC_BODY(libbpfjit_ld_ind_k_overflow, tc)
+{
+	static struct bpf_insn insns[12][3] = {
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 2),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 3),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 2),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 3),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		}
+	};
+
+	int i;
+	uint8_t pkt[8] = { 0 };
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(bpf_validate(insns[i], insn_count));
+
+		code = bpfjit_generate_code(NULL, insns[i], insn_count);
+		ATF_REQUIRE(code != NULL);
+
+		ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+		bpfjit_free_code(code);
+	}
+}
+
+ATF_TC(libbpfjit_ld_ind_x_overflow1);
+ATF_TC_HEAD(libbpfjit_ld_ind_x_overflow1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in X+4");
+}
+
+ATF_TC_BODY(libbpfjit_ld_ind_x_overflow1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[8] = { 10, 20, 30, 40, 50, 60, 70, 80 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++) {
+		ATF_CHECK(bpf_filter(insns, pkt, i, i) == 10 * i);
+		ATF_CHECK(jitcall(code, pkt, i, i) == 10 * i);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ld_ind_x_overflow2);
+ATF_TC_HEAD(libbpfjit_ld_ind_x_overflow2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in X+4");
+}
+
+ATF_TC_BODY(libbpfjit_ld_ind_x_overflow2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ST, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 3),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[8] = { 10, 20, 30, 40, 50, 60, 70, 80 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++) {
+		ATF_CHECK(bpf_filter(insns, pkt, i, i) == 10 * i);
+		ATF_CHECK(jitcall(code, pkt, i, i) == 10 * i);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ld_len);
+ATF_TC_HEAD(libbpfjit_ld_len, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_W+BPF_LEN");
+}
+
+ATF_TC_BODY(libbpfjit_ld_len, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[32]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, 1) == i);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ld_imm);
+ATF_TC_HEAD(libbpfjit_ld_imm, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IMM");
+}
+
+ATF_TC_BODY(libbpfjit_ld_imm, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ldx_imm1);
+ATF_TC_HEAD(libbpfjit_ldx_imm1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_IMM");
+}
+
+ATF_TC_BODY(libbpfjit_ldx_imm1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX - 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX - 5);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ldx_imm2);
+ATF_TC_HEAD(libbpfjit_ldx_imm2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_IMM");
+}
+
+ATF_TC_BODY(libbpfjit_ldx_imm2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_STMT(BPF_LD+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ldx_len1);
+ATF_TC_HEAD(libbpfjit_ldx_len1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_LEN");
+}
+
+ATF_TC_BODY(libbpfjit_ldx_len1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[5]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i < sizeof(pkt); i++) {
+		ATF_CHECK(jitcall(code, pkt, i, 1) == i);
+		ATF_CHECK(jitcall(code, pkt, i + 1, i) == i + 1);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ldx_len2);
+ATF_TC_HEAD(libbpfjit_ldx_len2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_LEN");
+}
+
+ATF_TC_BODY(libbpfjit_ldx_len2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LD+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[5]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 5, 1) == UINT32_MAX);
+	ATF_CHECK(jitcall(code, pkt, 6, 5) == 7);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_ldx_msh);
+ATF_TC_HEAD(libbpfjit_ldx_msh, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_MSH");
+}
+
+ATF_TC_BODY(libbpfjit_ldx_msh, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[2] = { 0, 0x7a };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 40);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_misc_tax);
+ATF_TC_HEAD(libbpfjit_misc_tax, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_MISC+BPF_TAX");
+}
+
+ATF_TC_BODY(libbpfjit_misc_tax, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[] = { 0, 11, 22, 33, 44, 55 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, sizeof(pkt), sizeof(pkt)) == 55);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_misc_txa);
+ATF_TC_HEAD(libbpfjit_misc_txa, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_MISC+BPF_TXA");
+}
+
+ATF_TC_BODY(libbpfjit_misc_txa, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 391),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 391);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_st1);
+ATF_TC_HEAD(libbpfjit_st1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(libbpfjit_st1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == i);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_st2);
+ATF_TC_HEAD(libbpfjit_st2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(libbpfjit_st2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_st3);
+ATF_TC_HEAD(libbpfjit_st3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(libbpfjit_st3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 100),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 200),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 301, 2, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[2]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_REQUIRE(BPF_MEMWORDS > 1);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 102);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_st4);
+ATF_TC_HEAD(libbpfjit_st4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(libbpfjit_st4, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 100),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 200),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 301, 2, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, 5),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[2]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_REQUIRE(BPF_MEMWORDS > 6);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 102);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_st5);
+ATF_TC_HEAD(libbpfjit_st5, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(libbpfjit_st5, tc)
+{
+	struct bpf_insn insns[5*BPF_MEMWORDS+2];
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	size_t k;
+	bpfjit_func_t code;
+	uint8_t pkt[BPF_MEMWORDS]; /* the program doesn't read any data */
+
+	memset(insns, 0, sizeof(insns));
+
+	/* for each k do M[k] = k */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*k].code   = BPF_LD+BPF_IMM;
+		insns[2*k].k      = 3*k;
+		insns[2*k+1].code = BPF_ST;
+		insns[2*k+1].k    = k;
+	}
+
+	/* load wirelen into A */
+	insns[2*BPF_MEMWORDS].code = BPF_LD+BPF_W+BPF_LEN;
+
+	/* for each k, if (A == k + 1) return M[k] */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*BPF_MEMWORDS+3*k+1].code = BPF_JMP+BPF_JEQ+BPF_K;
+		insns[2*BPF_MEMWORDS+3*k+1].k    = k+1;
+		insns[2*BPF_MEMWORDS+3*k+1].jt   = 0;
+		insns[2*BPF_MEMWORDS+3*k+1].jf   = 2;
+		insns[2*BPF_MEMWORDS+3*k+2].code = BPF_LD+BPF_MEM;
+		insns[2*BPF_MEMWORDS+3*k+2].k    = k;
+		insns[2*BPF_MEMWORDS+3*k+3].code = BPF_RET+BPF_A;
+		insns[2*BPF_MEMWORDS+3*k+3].k    = 0;
+	}
+
+	insns[5*BPF_MEMWORDS+1].code = BPF_RET+BPF_K;
+	insns[5*BPF_MEMWORDS+1].k    = UINT32_MAX;
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (k = 1; k <= sizeof(pkt); k++)
+		ATF_CHECK(jitcall(code, pkt, k, k) == 3*(k-1));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_stx1);
+ATF_TC_HEAD(libbpfjit_stx1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(libbpfjit_stx1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == i);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_stx2);
+ATF_TC_HEAD(libbpfjit_stx2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(libbpfjit_stx2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_stx3);
+ATF_TC_HEAD(libbpfjit_stx3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(libbpfjit_stx3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, 5),
+		BPF_STMT(BPF_STX, 2),
+		BPF_STMT(BPF_STX, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 3),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 6),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == 3 * i);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_stx4);
+ATF_TC_HEAD(libbpfjit_stx4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(libbpfjit_stx4, tc)
+{
+	struct bpf_insn insns[5*BPF_MEMWORDS+2];
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	size_t k;
+	bpfjit_func_t code;
+	uint8_t pkt[BPF_MEMWORDS]; /* the program doesn't read any data */
+
+	memset(insns, 0, sizeof(insns));
+
+	/* for each k do M[k] = k */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*k].code   = BPF_LDX+BPF_W+BPF_IMM;
+		insns[2*k].k      = 3*k;
+		insns[2*k+1].code = BPF_STX;
+		insns[2*k+1].k    = k;
+	}
+
+	/* load wirelen into A */
+	insns[2*BPF_MEMWORDS].code = BPF_LD+BPF_W+BPF_LEN;
+
+	/* for each k, if (A == k + 1) return M[k] */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*BPF_MEMWORDS+3*k+1].code = BPF_JMP+BPF_JEQ+BPF_K;
+		insns[2*BPF_MEMWORDS+3*k+1].k    = k+1;
+		insns[2*BPF_MEMWORDS+3*k+1].jt   = 0;
+		insns[2*BPF_MEMWORDS+3*k+1].jf   = 2;
+		insns[2*BPF_MEMWORDS+3*k+2].code = BPF_LD+BPF_MEM;
+		insns[2*BPF_MEMWORDS+3*k+2].k    = k;
+		insns[2*BPF_MEMWORDS+3*k+3].code = BPF_RET+BPF_A;
+		insns[2*BPF_MEMWORDS+3*k+3].k    = 0;
+	}
+
+	insns[5*BPF_MEMWORDS+1].code = BPF_RET+BPF_K;
+	insns[5*BPF_MEMWORDS+1].k    = UINT32_MAX;
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (k = 1; k <= sizeof(pkt); k++)
+		ATF_CHECK(jitcall(code, pkt, k, k) == 3*(k-1));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_abs_1);
+ATF_TC_HEAD(libbpfjit_opt_ld_abs_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_abs_1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_abs_2);
+ATF_TC_HEAD(libbpfjit_opt_ld_abs_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_abs_2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_abs_3);
+ATF_TC_HEAD(libbpfjit_opt_ld_abs_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_abs_3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_ind_1);
+ATF_TC_HEAD(libbpfjit_opt_ld_ind_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_ind_1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 12),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 14),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 18),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 18),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_ind_2);
+ATF_TC_HEAD(libbpfjit_opt_ld_ind_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_ind_2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_ind_3);
+ATF_TC_HEAD(libbpfjit_opt_ld_ind_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_ind_3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 15),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 11),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 6),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 11),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 4),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_opt_ld_ind_4);
+ATF_TC_HEAD(libbpfjit_opt_ld_ind_4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(libbpfjit_opt_ld_ind_4, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 11),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 19),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 6),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 4),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_abc_ja);
+ATF_TC_HEAD(libbpfjit_abc_ja, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization with a single BPF_JMP+BPF_JA");
+}
+
+ATF_TC_BODY(libbpfjit_abc_ja, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3), /* min. length 4 */
+		BPF_STMT(BPF_JMP+BPF_JA, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, UINT32_MAX - 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 2), /* min. length 6 */
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 6),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[6] = {0, 0, /* UINT32_MAX: */ 255, 255, 255, 255};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_abc_ja_over);
+ATF_TC_HEAD(libbpfjit_abc_ja_over, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization when BPF_JMP+BPF_JA jumps over all loads");
+}
+
+ATF_TC_BODY(libbpfjit_abc_ja_over, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_JMP+BPF_JA, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 4),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 6),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_MAX);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_abc_ld_chain);
+ATF_TC_HEAD(libbpfjit_abc_ld_chain, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization of a chain of BPF_LD instructions "
+	    "with exits leading to a single BPF_RET");
+}
+
+ATF_TC_BODY(libbpfjit_abc_ld_chain, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3), /* min. length 4 */
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 8, 0, 4),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 4), /* min. length 6 */
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 7, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 6), /* min. length 10 */
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 6, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 123456789),
+		BPF_STMT(BPF_RET+BPF_K, 987654321),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[10] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+
+	/* !(pkt[3] == 8) => return 123456789 */
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 123456789);
+
+	/* !(pkt[4:2] >= 7) => too short or return 123456789 */
+	pkt[3] = 8;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 123456789);
+
+	/* !(pkt[6:4] > 6) => too short or return 987654321 */
+	pkt[4] = pkt[5] = 1;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 987654321);
+
+	/* (pkt[6:4] > 6) => too short or return 123456789 */
+	pkt[6] = pkt[7] = pkt[8] = pkt[9] = 1;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 123456789);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_examples_1);
+ATF_TC_HEAD(libbpfjit_examples_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the first example from bpf(4) - "
+	    "accept Reverse ARP requests");
+}
+
+ATF_TC_BODY(libbpfjit_examples_1, tc)
+{
+	/*
+	 * The following filter is taken from the Reverse ARP
+	 * Daemon. It accepts only Reverse ARP requests.
+	 */
+	struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8035, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 3, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 42),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[22] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 0x80; pkt[13] = 0x35;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	/* Set RARP message type. */
+	pkt[21] = 3;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 42);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+
+	/* Change RARP message type. */
+	pkt[20] = 3;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_examples_2);
+ATF_TC_HEAD(libbpfjit_examples_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the second example from bpf(4) - "
+	    "accept IP packets between two specified hosts");
+}
+
+ATF_TC_BODY(libbpfjit_examples_2, tc)
+{
+	/*
+	 * This filter accepts only IP packets between host 128.3.112.15
+	 * and 128.3.112.35.
+	 */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x0800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[34] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+	ATF_CHECK(jitcall(code, pkt, 31, 31) == 0);
+	ATF_CHECK(jitcall(code, pkt, 32, 32) == 0);
+	ATF_CHECK(jitcall(code, pkt, 33, 33) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 8;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[26] = 128; pkt[27] = 3; pkt[28] = 112; pkt[29] = 15;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[30] = 128; pkt[31] = 3; pkt[32] = 112; pkt[33] = 35;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == UINT32_MAX);
+
+	/* Swap the ip addresses. */
+	pkt[26] = 128; pkt[27] = 3; pkt[28] = 112; pkt[29] = 35;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[30] = 128; pkt[31] = 3; pkt[32] = 112; pkt[33] = 15;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == UINT32_MAX);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+	ATF_CHECK(jitcall(code, pkt, 31, 31) == 0);
+	ATF_CHECK(jitcall(code, pkt, 32, 32) == 0);
+	ATF_CHECK(jitcall(code, pkt, 33, 33) == 0);
+
+	/* Change the protocol field. */
+	pkt[13] = 8;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_examples_3);
+ATF_TC_HEAD(libbpfjit_examples_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the third example from bpf(4) - "
+	    "accept TCP finger packets");
+}
+
+ATF_TC_BODY(libbpfjit_examples_3, tc)
+{
+	/*
+	 * This filter returns only TCP finger packets.
+	 */
+	struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x0800, 0, 10),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 23),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 6, 0, 8),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x1fff, 6, 0),
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 14),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 14),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 79, 2, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 16),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 79, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[30] = {};
+
+	/* Set IP fragment offset to non-zero. */
+	pkt[20] = 1; pkt[21] = 1;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 8;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Get one step closer to the match. */
+	pkt[23] = 6;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Set IP fragment offset to zero. */
+	pkt[20] = 0x20; pkt[21] = 0;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Set IP header length to 12. */
+	pkt[14] = 0xd3;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Match one branch of the program. */
+	pkt[27] = 79;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == UINT32_MAX);
+
+	/* Match the other branch of the program. */
+	pkt[29] = 79; pkt[27] = 0;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == UINT32_MAX);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+
+	/* Set IP header length to 16. Packet is too short. */
+	pkt[14] = 4;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_no_ctx);
+ATF_TC_HEAD(libbpfjit_cop_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that BPF_MISC|BPF_COP "
+	    "instruction can't be accepted without a context");
+}
+
+ATF_TC_BODY(libbpfjit_cop_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(!bpf_validate(insns, insn_count));
+
+	ATF_CHECK(bpfjit_generate_code(NULL, insns, insn_count) == NULL);
+}
+
+ATF_TC(libbpfjit_copx_no_ctx);
+ATF_TC_HEAD(libbpfjit_copx_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that BPF_MISC|BPF_COPX "
+	    "instruction can't be accepted without a context");
+}
+
+ATF_TC_BODY(libbpfjit_copx_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(!bpf_validate(insns, insn_count));
+
+	ATF_CHECK(bpfjit_generate_code(NULL, insns, insn_count) == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../net/bpfjit/t_bpfjit.c
+	 */
+	ATF_TP_ADD_TC(tp, libbpfjit_empty);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_add_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_sub_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_mul_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div0_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div1_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div2_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div4_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div10_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div10000_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div7609801_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div80000000_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_and_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_or_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh0_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh0_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_modulo_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_add_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_sub_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_mul_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div0_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div1_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div2_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div4_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div10_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div10000_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div7609801_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_div80000000_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_and_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_or_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh0_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh0_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_modulo_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_alu_neg);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_ja);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jgt_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jge_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jeq_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jset_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_modulo_k);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jgt_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jge_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jeq_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_jset_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_jmp_modulo_x);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_abs);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_abs_k_overflow);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_ind);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_ind_k_overflow);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_ind_x_overflow1);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_ind_x_overflow2);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_len);
+	ATF_TP_ADD_TC(tp, libbpfjit_ld_imm);
+	ATF_TP_ADD_TC(tp, libbpfjit_ldx_imm1);
+	ATF_TP_ADD_TC(tp, libbpfjit_ldx_imm2);
+	ATF_TP_ADD_TC(tp, libbpfjit_ldx_len1);
+	ATF_TP_ADD_TC(tp, libbpfjit_ldx_len2);
+	ATF_TP_ADD_TC(tp, libbpfjit_ldx_msh);
+	ATF_TP_ADD_TC(tp, libbpfjit_misc_tax);
+	ATF_TP_ADD_TC(tp, libbpfjit_misc_txa);
+	ATF_TP_ADD_TC(tp, libbpfjit_st1);
+	ATF_TP_ADD_TC(tp, libbpfjit_st2);
+	ATF_TP_ADD_TC(tp, libbpfjit_st3);
+	ATF_TP_ADD_TC(tp, libbpfjit_st4);
+	ATF_TP_ADD_TC(tp, libbpfjit_st5);
+	ATF_TP_ADD_TC(tp, libbpfjit_stx1);
+	ATF_TP_ADD_TC(tp, libbpfjit_stx2);
+	ATF_TP_ADD_TC(tp, libbpfjit_stx3);
+	ATF_TP_ADD_TC(tp, libbpfjit_stx4);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_abs_1);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_abs_2);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_abs_3);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_ind_1);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_ind_2);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_ind_3);
+	ATF_TP_ADD_TC(tp, libbpfjit_opt_ld_ind_4);
+	ATF_TP_ADD_TC(tp, libbpfjit_abc_ja);
+	ATF_TP_ADD_TC(tp, libbpfjit_abc_ja_over);
+	ATF_TP_ADD_TC(tp, libbpfjit_abc_ld_chain);
+	ATF_TP_ADD_TC(tp, libbpfjit_examples_1);
+	ATF_TP_ADD_TC(tp, libbpfjit_examples_2);
+	ATF_TP_ADD_TC(tp, libbpfjit_examples_3);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_no_ctx);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_no_ctx);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbpfjit/t_cop.c b/contrib/netbsd-tests/lib/libbpfjit/t_cop.c
new file mode 100644
index 000000000000..7b3b08672ef5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbpfjit/t_cop.c
@@ -0,0 +1,657 @@
+/*	$NetBSD: t_cop.c,v 1.4 2014/07/13 21:35:33 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2013-2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cop.c,v 1.4 2014/07/13 21:35:33 alnsn Exp $");
+
+#include <atf-c.h>
+#include <stdint.h>
+#include <string.h>
+
+#define __BPF_PRIVATE
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+static uint32_t retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+
+static const bpf_copfunc_t copfuncs[] = {
+	&retA,
+	&retBL,
+	&retWL,
+	&retNF,
+	&setARG
+};
+
+static const bpf_ctx_t ctx = {
+	.copfuncs = copfuncs,
+	.nfuncs = sizeof(copfuncs) / sizeof(copfuncs[0]),
+	.extwords = 0
+};
+
+static uint32_t
+retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return A;
+}
+
+static uint32_t
+retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->buflen;
+}
+
+static uint32_t
+retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->wirelen;
+}
+
+static uint32_t
+retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return bc->nfuncs;
+}
+
+/*
+ * COP function with a side effect.
+ */
+static uint32_t
+setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+	bool *arg = (bool *)args->arg;
+	bool old = *arg;
+
+	*arg = true;
+	return old;
+}
+
+ATF_TC(libbpfjit_cop_no_ctx);
+ATF_TC_HEAD(libbpfjit_cop_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that bpf program with BPF_COP "
+	    "instruction isn't valid without a context");
+}
+
+ATF_TC_BODY(libbpfjit_cop_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(!bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(libbpfjit_cop_ret_A);
+ATF_TC_HEAD(libbpfjit_cop_ret_A, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of the A register");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_A, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retA
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_ret_buflen);
+ATF_TC_HEAD(libbpfjit_cop_ret_buflen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the buflen argument");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_buflen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 1), // retBL
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_ret_wirelen);
+ATF_TC_HEAD(libbpfjit_cop_ret_wirelen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the wirelen argument");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_wirelen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 2), // retWL
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_ret_nfuncs);
+ATF_TC_HEAD(libbpfjit_cop_ret_nfuncs, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns nfuncs member of the context argument");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_nfuncs, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 3), // retNF
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == ctx.nfuncs);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_side_effect);
+ATF_TC_HEAD(libbpfjit_cop_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that ABC optimization doesn't skip BPF_COP call");
+}
+
+ATF_TC_BODY(libbpfjit_cop_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),
+		BPF_STMT(BPF_MISC+BPF_COP, 4), // setARG
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99999),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	bool arg = false;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = NULL,
+		.arg = &arg
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+	ATF_CHECK(arg == true);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_copx);
+ATF_TC_HEAD(libbpfjit_cop_copx, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test BPF_COP call followed by BPF_COPX call");
+}
+
+ATF_TC_BODY(libbpfjit_cop_copx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),         /* A <- 1    */
+		BPF_STMT(BPF_MISC+BPF_COP, 0),       /* retA      */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),   /* A = P[0]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),      /* retNF     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 2 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3 + ctx.nfuncs);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_invalid_index);
+ATF_TC_HEAD(libbpfjit_cop_invalid_index, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that out-of-range coprocessor function fails validation");
+}
+
+ATF_TC_BODY(libbpfjit_cop_invalid_index, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 6), // invalid index
+		BPF_STMT(BPF_RET+BPF_K, 27)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpfjit_generate_code(&ctx, insns, insn_count) == NULL);
+}
+
+ATF_TC(libbpfjit_copx_no_ctx);
+ATF_TC_HEAD(libbpfjit_copx_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that bpf program with BPF_COPX "
+	    "instruction isn't valid without a context");
+}
+
+ATF_TC_BODY(libbpfjit_copx_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(!bpf_validate(insns, insn_count));
+
+	code = bpfjit_generate_code(NULL, insns, insn_count);
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(libbpfjit_copx_ret_A);
+ATF_TC_HEAD(libbpfjit_copx_ret_A, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of the A register");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_A, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retA
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_ret_buflen);
+ATF_TC_HEAD(libbpfjit_copx_ret_buflen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the buflen argument");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_buflen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 1), // retBL
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_ret_wirelen);
+ATF_TC_HEAD(libbpfjit_copx_ret_wirelen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the wirelen argument");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_wirelen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 2), // retWL
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_ret_nfuncs);
+ATF_TC_HEAD(libbpfjit_copx_ret_nfuncs, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns nfuncs member of the context argument");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_nfuncs, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 3), // retNF
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == ctx.nfuncs);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_side_effect);
+ATF_TC_HEAD(libbpfjit_copx_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that ABC optimization doesn't skip BPF_COPX call");
+}
+
+ATF_TC_BODY(libbpfjit_copx_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),
+		BPF_STMT(BPF_LDX+BPF_IMM, 4), // setARG
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99999),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	bool arg = false;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = NULL,
+		.arg = &arg
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+	ATF_CHECK(arg == true);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_cop);
+ATF_TC_HEAD(libbpfjit_copx_cop, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test BPF_COPX call followed by BPF_COP call");
+}
+
+ATF_TC_BODY(libbpfjit_copx_cop, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 2),        /* X <- 2    */
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),      /* retWL     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),   /* A = P[0]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_MISC+BPF_COP, 3),      /* retNF     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 2 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 5 + ctx.nfuncs);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_invalid_index);
+ATF_TC_HEAD(libbpfjit_copx_invalid_index, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that out-of-range BPF_COPX call fails at runtime");
+}
+
+ATF_TC_BODY(libbpfjit_copx_invalid_index, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 5), // invalid index
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_K, 27)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../net/bpfjit/t_cop.c
+	 */
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_no_ctx);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_A);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_buflen);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_wirelen);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_nfuncs);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_side_effect);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_copx);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_invalid_index);
+
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_no_ctx);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_A);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_buflen);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_wirelen);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_nfuncs);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_side_effect);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_cop);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_invalid_index);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libbpfjit/t_extmem.c b/contrib/netbsd-tests/lib/libbpfjit/t_extmem.c
new file mode 100644
index 000000000000..ab6ea88f3570
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libbpfjit/t_extmem.c
@@ -0,0 +1,483 @@
+/*	$NetBSD: t_extmem.c,v 1.3 2014/07/14 19:11:15 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_extmem.c,v 1.3 2014/07/14 19:11:15 alnsn Exp $");
+
+#include <atf-c.h>
+#include <stdint.h>
+#include <string.h>
+
+#define __BPF_PRIVATE
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+static uint32_t retM(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+
+static const bpf_copfunc_t copfuncs[] = {
+	&retM
+};
+
+static const bpf_ctx_t ctx = {
+	.copfuncs = copfuncs,
+	.nfuncs = sizeof(copfuncs) / sizeof(copfuncs[0]),
+	.extwords = 4,
+	.preinited = BPF_MEMWORD_INIT(0) | BPF_MEMWORD_INIT(3),
+};
+
+static uint32_t
+retM(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->mem[(uintptr_t)args->arg];
+}
+
+
+ATF_TC(libbpfjit_extmem_load_default);
+ATF_TC_HEAD(libbpfjit_extmem_load_default, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that external memory "
+	    "is zero initialized by default");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_load_default, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_MEM, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_extmem_load_preinited);
+ATF_TC_HEAD(libbpfjit_extmem_load_preinited, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test a load of external "
+	    "pre-initialized memory");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_load_preinited, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_MEM, 3),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_extmem_invalid_load);
+ATF_TC_HEAD(libbpfjit_extmem_invalid_load, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that out-of-range load "
+	    "fails validation");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_invalid_load, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_MEM, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpfjit_generate_code(&ctx, insns, insn_count) == NULL);
+}
+
+ATF_TC(libbpfjit_extmem_store);
+ATF_TC_HEAD(libbpfjit_extmem_store, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test stores to external memory");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_store, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),        /* A <- 1     */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), /* X <- 2     */
+		BPF_STMT(BPF_ST, 1),                /* M[1] <- A  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X */
+		BPF_STMT(BPF_STX, 2),               /* M[2] <- X  */
+		BPF_STMT(BPF_ST, 3),                /* M[3] <- A  */
+		BPF_STMT(BPF_RET+BPF_A, 0)          /* ret A      */
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 7;
+
+	mem[1] = mem[2] = 0xdeadbeef;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	bpfjit_free_code(code);
+
+	ATF_CHECK(mem[0] == 0);
+	ATF_CHECK(mem[1] == 1);
+	ATF_CHECK(mem[2] == 2);
+	ATF_CHECK(mem[3] == 3);
+}
+
+ATF_TC(libbpfjit_extmem_side_effect);
+ATF_TC_HEAD(libbpfjit_extmem_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that ABC optimization doesn\'t "
+	    "skip stores to external memory");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),  /* A <- P[0]  */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), /* X <- 2     */
+		BPF_STMT(BPF_ST, 1),                /* M[1] <- A  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X */
+		BPF_STMT(BPF_STX, 2),               /* M[2] <- X  */
+		BPF_STMT(BPF_ST, 3),                /* M[3] <- A  */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99), /* A <- P[99] */
+		BPF_STMT(BPF_RET+BPF_A, 0)          /* ret A      */
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 1 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 7;
+
+	mem[1] = mem[2] = 0xdeadbeef;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+
+	bpfjit_free_code(code);
+
+	ATF_CHECK(mem[0] == 0);
+	ATF_CHECK(mem[1] == 1);
+	ATF_CHECK(mem[2] == 2);
+	ATF_CHECK(mem[3] == 3);
+}
+
+ATF_TC(libbpfjit_extmem_invalid_store);
+ATF_TC_HEAD(libbpfjit_extmem_invalid_store, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that out-of-range store "
+	    "fails validation");
+}
+
+ATF_TC_BODY(libbpfjit_extmem_invalid_store, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ST, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_CHECK(bpfjit_generate_code(&ctx, insns, insn_count) == NULL);
+}
+
+ATF_TC(libbpfjit_cop_ret_mem);
+ATF_TC_HEAD(libbpfjit_cop_ret_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of external memory word");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retM
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)2;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_cop_ret_preinited_mem);
+ATF_TC_HEAD(libbpfjit_cop_ret_preinited_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function that "
+	    "returns a content of external pre-initialized memory word");
+}
+
+ATF_TC_BODY(libbpfjit_cop_ret_preinited_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retM
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)3;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_ret_mem);
+ATF_TC_HEAD(libbpfjit_copx_ret_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of external memory word");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retM
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)2;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TC(libbpfjit_copx_ret_preinited_mem);
+ATF_TC_HEAD(libbpfjit_copx_ret_preinited_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function that "
+	    "returns a content of external pre-initialized memory word");
+}
+
+ATF_TC_BODY(libbpfjit_copx_ret_preinited_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retM
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)3;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	code = bpfjit_generate_code(&ctx, insns, insn_count);
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	bpfjit_free_code(code);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../net/bpfjit/t_extmem.c
+	 */
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_load_default);
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_load_preinited);
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_invalid_load);
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_store);
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_side_effect);
+	ATF_TP_ADD_TC(tp, libbpfjit_extmem_invalid_store);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_mem);
+	ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_preinited_mem);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_mem);
+	ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_preinited_mem);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/aarch64/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/aarch64/exec_prot_support.c
new file mode 100644
index 000000000000..56a1be86c30b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/aarch64/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2014/08/10 05:47:38 matt Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2014/08/10 05:47:38 matt Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/aarch64/return_one.S b/contrib/netbsd-tests/lib/libc/arch/aarch64/return_one.S
new file mode 100644
index 000000000000..d2379828404f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/aarch64/return_one.S
@@ -0,0 +1,10 @@
+/* $NetBSD: return_one.S,v 1.1 2014/08/10 05:47:38 matt Exp $ */
+
+#include <machine/asm.h>
+
+ENTRY_NP(return_one)
+	mov	x0, #1
+	ret
+	.globl	return_one_end
+return_one_end:
+END(return_one)
diff --git a/contrib/netbsd-tests/lib/libc/arch/alpha/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/alpha/exec_prot_support.c
new file mode 100644
index 000000000000..ba1cd8b0625c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/alpha/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/alpha/return_one.S b/contrib/netbsd-tests/lib/libc/arch/alpha/return_one.S
new file mode 100644
index 000000000000..530887685f21
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/alpha/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/arm/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/arm/exec_prot_support.c
new file mode 100644
index 000000000000..ba1cd8b0625c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/arm/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/arm/return_one.S b/contrib/netbsd-tests/lib/libc/arch/arm/return_one.S
new file mode 100644
index 000000000000..18800e2953d8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/arm/return_one.S
@@ -0,0 +1,11 @@
+/*	$NetBSD: return_one.S,v 1.2 2014/01/26 20:42:06 matt Exp $ */
+
+#include <machine/asm.h>
+
+ENTRY_NP(return_one)
+	mov	r0, #1
+	RET
+	.align	0
+	.globl	return_one_end
+return_one_end:
+END(return_one)
diff --git a/contrib/netbsd-tests/lib/libc/arch/hppa/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/hppa/exec_prot_support.c
new file mode 100644
index 000000000000..ba1cd8b0625c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/hppa/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/hppa/return_one.S b/contrib/netbsd-tests/lib/libc/arch/hppa/return_one.S
new file mode 100644
index 000000000000..530887685f21
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/hppa/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/i386/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/i386/exec_prot_support.c
new file mode 100644
index 000000000000..11a20f55ca01
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/i386/exec_prot_support.c
@@ -0,0 +1,65 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include <stdlib.h>
+#include <sys/sysctl.h>
+
+#include "../../common/exec_prot.h"
+
+/*
+ * Support for executable space protection has always been erratic under i386.
+ * Originally IA-32 can't do per-page execute permission, so it is
+ * implemented using different executable segments for %cs (code segment).
+ * This only allows coarse grained protection, especially when memory starts
+ * being fragmented.
+ * Later, PAE was introduced together with a NX/XD bit in the page table
+ * entry to offer per-page permission.
+ */
+int
+exec_prot_support(void)
+{
+	int pae;
+	size_t pae_len = sizeof(pae);
+
+	if (sysctlbyname("machdep.pae", &pae, &pae_len, NULL, 0) == -1)
+		return PARTIAL_XP;
+
+	if (pae == 1) {
+		if (system("cpuctl identify 0 | grep -q NOX") == 0 ||
+		    system("cpuctl identify 0 | grep -q XD") == 0)
+			return PERPAGE_XP;
+	}
+	
+	return PARTIAL_XP;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/i386/return_one.S b/contrib/netbsd-tests/lib/libc/arch/i386/return_one.S
new file mode 100644
index 000000000000..f80fd7430881
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/i386/return_one.S
@@ -0,0 +1,10 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+_ENTRY(return_one)
+	movl	$0x1,%eax
+	ret
+LABEL(return_one_end)
diff --git a/contrib/netbsd-tests/lib/libc/arch/ia64/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/ia64/exec_prot_support.c
new file mode 100644
index 000000000000..ba1cd8b0625c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/ia64/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/ia64/return_one.S b/contrib/netbsd-tests/lib/libc/arch/ia64/return_one.S
new file mode 100644
index 000000000000..530887685f21
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/ia64/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/m68k/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/m68k/exec_prot_support.c
new file mode 100644
index 000000000000..ba1cd8b0625c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/m68k/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:09 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/m68k/return_one.S b/contrib/netbsd-tests/lib/libc/arch/m68k/return_one.S
new file mode 100644
index 000000000000..530887685f21
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/m68k/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:09 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/mips/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/mips/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/mips/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/mips/return_one.S b/contrib/netbsd-tests/lib/libc/arch/mips/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/mips/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/or1k/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/or1k/exec_prot_support.c
new file mode 100644
index 000000000000..623456b9a251
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/or1k/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2014/09/03 19:34:26 matt Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return PERPAGE_XP;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/or1k/return_one.S b/contrib/netbsd-tests/lib/libc/arch/or1k/return_one.S
new file mode 100644
index 000000000000..ba3d678974f9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/or1k/return_one.S
@@ -0,0 +1,12 @@
+/*	$NetBSD: return_one.S,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end
+
+ENTRY_NP(return_one)
+	l.addi	r11, r0, 1
+	l.jr	lr
+	l.nop
+return_one_end:
+END(return_one)
diff --git a/contrib/netbsd-tests/lib/libc/arch/powerpc/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/powerpc/exec_prot_support.c
new file mode 100644
index 000000000000..81c1d8677baa
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/powerpc/exec_prot_support.c
@@ -0,0 +1,52 @@
+/*      $NetBSD: exec_prot_support.c,v 1.2 2012/03/16 08:51:47 matt Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.2 2012/03/16 08:51:47 matt Exp $");
+
+#include "../../common/exec_prot.h"
+
+#include <sys/sysctl.h>
+
+int
+exec_prot_support(void)
+{
+	int execprot = 0;
+	size_t len = sizeof(execprot);
+
+	if (sysctlbyname("machdep.execprot", &execprot, &len, NULL, 0) < 0)
+		return NOTIMPL;
+
+	if (execprot)
+		return PERPAGE_XP;
+
+	return NO_XP;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/powerpc/return_one.S b/contrib/netbsd-tests/lib/libc/arch/powerpc/return_one.S
new file mode 100644
index 000000000000..d40298e11dcc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/powerpc/return_one.S
@@ -0,0 +1,11 @@
+/*	$NetBSD: return_one.S,v 1.2 2012/03/16 08:51:47 matt Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end
+
+_ENTRY(return_one)
+	li	%r3, 1
+	blr
+return_one_end:
+END(return_one)
diff --git a/contrib/netbsd-tests/lib/libc/arch/powerpc64/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/powerpc64/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/powerpc64/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/powerpc64/return_one.S b/contrib/netbsd-tests/lib/libc/arch/powerpc64/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/powerpc64/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/riscv/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/riscv/exec_prot_support.c
new file mode 100644
index 000000000000..91c5ff420088
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/riscv/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2014/09/19 17:36:26 matt Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return PERPAGE_XP;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/riscv/return_one.S b/contrib/netbsd-tests/lib/libc/arch/riscv/return_one.S
new file mode 100644
index 000000000000..43ddd2c51822
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/riscv/return_one.S
@@ -0,0 +1,11 @@
+/*	$NetBSD: return_one.S,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+
+#include <machine/asm.h>
+
+	.globl	return_one_end
+
+ENTRY_NP(return_one)
+	li	v0, 1
+	ret
+return_one_end:
+END(return_one)
diff --git a/contrib/netbsd-tests/lib/libc/arch/sh3/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/sh3/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sh3/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/sh3/return_one.S b/contrib/netbsd-tests/lib/libc/arch/sh3/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sh3/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/sparc/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/sparc/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sparc/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/sparc/return_one.S b/contrib/netbsd-tests/lib/libc/arch/sparc/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sparc/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/sparc64/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/sparc64/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sparc64/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/sparc64/return_one.S b/contrib/netbsd-tests/lib/libc/arch/sparc64/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/sparc64/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/vax/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/vax/exec_prot_support.c
new file mode 100644
index 000000000000..474cfc742f69
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/vax/exec_prot_support.c
@@ -0,0 +1,41 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $");
+
+#include "../../common/exec_prot.h"
+
+int
+exec_prot_support(void)
+{
+	return NOTIMPL;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/vax/return_one.S b/contrib/netbsd-tests/lib/libc/arch/vax/return_one.S
new file mode 100644
index 000000000000..3495260d6f68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/vax/return_one.S
@@ -0,0 +1,8 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+
+#include <machine/asm.h>
+
+.globl	return_one, return_one_end;
+
+return_one: return_one_end:
+	nop
diff --git a/contrib/netbsd-tests/lib/libc/arch/x86_64/exec_prot_support.c b/contrib/netbsd-tests/lib/libc/arch/x86_64/exec_prot_support.c
new file mode 100644
index 000000000000..2d8363d1aec0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/x86_64/exec_prot_support.c
@@ -0,0 +1,50 @@
+/*      $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:11 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:11 jym Exp $");
+
+#include <stdlib.h>
+
+#include "../../common/exec_prot.h"
+
+/*
+ * When the NX/XD flag is present, the protection should be enabled.
+ */
+int
+exec_prot_support(void)
+{
+	if (system("cpuctl identify 0 | grep -q NOX") == 0 ||
+	    system("cpuctl identify 0 | grep -q XD") == 0)
+		return PERPAGE_XP;
+	
+	return NO_XP;
+}
diff --git a/contrib/netbsd-tests/lib/libc/arch/x86_64/return_one.S b/contrib/netbsd-tests/lib/libc/arch/x86_64/return_one.S
new file mode 100644
index 000000000000..090300113daf
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/arch/x86_64/return_one.S
@@ -0,0 +1,10 @@
+/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:11 jym Exp $ */
+
+#include <machine/asm.h>
+
+RCSID("$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:11 jym Exp $");
+
+_ENTRY(return_one)
+	movq	$0x1, %rax
+	retq
+LABEL(return_one_end)
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c b/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
new file mode 100644
index 000000000000..c9e0cc803158
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
@@ -0,0 +1,185 @@
+/*	$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/faccessat"
+#define BASEFILE "faccessat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/faccessaterr"
+
+ATF_TC(faccessat_fd);
+ATF_TC_HEAD(faccessat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat works with fd");
+}
+ATF_TC_BODY(faccessat_fd, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, F_OK, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(faccessat_fdcwd);
+ATF_TC_HEAD(faccessat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that faccessat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(faccessat_fdcwd, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(faccessat(AT_FDCWD, BASEFILE, F_OK, 0) == 0);
+}
+
+ATF_TC(faccessat_fdcwderr);
+ATF_TC_HEAD(faccessat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that faccessat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(faccessat_fdcwderr, tc)
+{
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(faccessat(AT_FDCWD, FILEERR, F_OK, 0) == -1);
+}
+
+ATF_TC(faccessat_fderr1);
+ATF_TC_HEAD(faccessat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat fail with bad path");
+}
+ATF_TC_BODY(faccessat_fderr1, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(faccessat(dfd, FILEERR, F_OK, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(faccessat_fderr2);
+ATF_TC_HEAD(faccessat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat fails with bad fdat");
+}
+ATF_TC_BODY(faccessat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, F_OK, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(faccessat_fderr3);
+ATF_TC_HEAD(faccessat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat fails with fd as -1");
+}
+ATF_TC_BODY(faccessat_fderr3, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(faccessat(-1, FILE, F_OK, 0) == -1);
+}
+
+ATF_TC(faccessat_fdlink);
+ATF_TC_HEAD(faccessat_fdlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat works on symlink");
+}
+ATF_TC_BODY(faccessat_fdlink, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* NB: FILE does not exists */
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, 0) == -1);
+	ATF_REQUIRE(errno == ENOENT);
+
+	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, AT_SYMLINK_NOFOLLOW) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, faccessat_fd);
+	ATF_TP_ADD_TC(tp, faccessat_fdcwd);
+	ATF_TP_ADD_TC(tp, faccessat_fdcwderr);
+	ATF_TP_ADD_TC(tp, faccessat_fderr1);
+	ATF_TP_ADD_TC(tp, faccessat_fderr2);
+	ATF_TP_ADD_TC(tp, faccessat_fderr3);
+	ATF_TP_ADD_TC(tp, faccessat_fdlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c b/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
new file mode 100644
index 000000000000..462d53d9e961
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
@@ -0,0 +1,197 @@
+/*	$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/fchmodat"
+#define BASEFILE "fchmodat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/fchmodaterr"
+
+ATF_TC(fchmodat_fd);
+ATF_TC_HEAD(fchmodat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchmodat works with fd");
+}
+ATF_TC_BODY(fchmodat_fd, tc)
+{
+	int dfd;
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchmodat(dfd, BASEFILE, 0600, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &st) == 0);
+	ATF_REQUIRE(st.st_mode = 0600);
+}
+
+ATF_TC(fchmodat_fdcwd);
+ATF_TC_HEAD(fchmodat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that fchmodat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(fchmodat_fdcwd, tc)
+{
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(fchmodat(AT_FDCWD, BASEFILE, 0600, 0) == 0);
+
+	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
+	ATF_REQUIRE(st.st_mode = 0600);
+}
+
+ATF_TC(fchmodat_fdcwderr);
+ATF_TC_HEAD(fchmodat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that fchmodat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(fchmodat_fdcwderr, tc)
+{
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(fchmodat(AT_FDCWD, FILEERR, 0600, 0) == -1);
+}
+
+ATF_TC(fchmodat_fderr1);
+ATF_TC_HEAD(fchmodat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchmodat fail with bad path");
+}
+ATF_TC_BODY(fchmodat_fderr1, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchmodat(dfd, FILEERR, 0600, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fchmodat_fderr2);
+ATF_TC_HEAD(fchmodat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with bad fdat");
+}
+ATF_TC_BODY(fchmodat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchmodat(dfd, BASEFILE, 0600, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fchmodat_fderr3);
+ATF_TC_HEAD(fchmodat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with fd as -1");
+}
+ATF_TC_BODY(fchmodat_fderr3, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmodat(-1, FILE, 0600, 0) == -1);
+}
+
+ATF_TC(fchmodat_fdlink);
+ATF_TC_HEAD(fchmodat_fdlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchmodat works on symlink");
+}
+ATF_TC_BODY(fchmodat_fdlink, tc)
+{
+	int dfdlink;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0);
+
+	ATF_REQUIRE((dfdlink = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(fchmodat(dfdlink, BASELINK, 0600, 0) == -1);
+	ATF_REQUIRE(errno = ENOENT);
+
+	ATF_REQUIRE(fchmodat(dfdlink, BASELINK, 0600, AT_SYMLINK_NOFOLLOW) == 0);
+
+	ATF_REQUIRE(close(dfdlink) == 0);
+
+	ATF_REQUIRE(lstat(LINK, &st) == 0);
+	ATF_REQUIRE(st.st_mode = 0600);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fchmodat_fd);
+	ATF_TP_ADD_TC(tp, fchmodat_fdcwd);
+	ATF_TP_ADD_TC(tp, fchmodat_fdcwderr);
+	ATF_TP_ADD_TC(tp, fchmodat_fderr1);
+	ATF_TP_ADD_TC(tp, fchmodat_fderr2);
+	ATF_TP_ADD_TC(tp, fchmodat_fderr3);
+	ATF_TP_ADD_TC(tp, fchmodat_fdlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c b/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
new file mode 100644
index 000000000000..80c760683eb9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
@@ -0,0 +1,247 @@
+/*	$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/fchownat"
+#define BASEFILE "fchownat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/fchownaterr"
+#define USER "nobody"
+
+static int getuser(uid_t *, gid_t *);
+
+static int getuser(uid_t *uid, gid_t *gid)
+{
+	struct passwd *pw;
+
+	if ((pw = getpwnam(USER)) == NULL)
+		return -1;
+
+	*uid = pw->pw_uid;
+	*gid = pw->pw_gid;
+
+	return 0;
+}
+
+ATF_TC(fchownat_fd);
+ATF_TC_HEAD(fchownat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchownat works with fd");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fd, tc)
+{
+	int dfd;
+	int fd;
+	uid_t uid;
+	gid_t gid;
+	struct stat st;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchownat(dfd, BASEFILE, uid, gid, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &st) == 0);
+	ATF_REQUIRE(st.st_uid == uid);
+	ATF_REQUIRE(st.st_gid == gid);
+}
+
+ATF_TC(fchownat_fdcwd);
+ATF_TC_HEAD(fchownat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that fchownat works with fd as AT_FDCWD");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fdcwd, tc)
+{
+	int fd;
+	uid_t uid;
+	gid_t gid;
+	struct stat st;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(fchownat(AT_FDCWD, BASEFILE, uid, gid, 0) == 0);
+
+	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
+	ATF_REQUIRE(st.st_uid == uid);
+	ATF_REQUIRE(st.st_gid == gid);
+}
+
+ATF_TC(fchownat_fdcwderr);
+ATF_TC_HEAD(fchownat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that fchownat fails with fd as AT_FDCWD and bad path");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fdcwderr, tc)
+{
+	uid_t uid;
+	gid_t gid;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(fchownat(AT_FDCWD, FILEERR, uid, gid, 0) == -1);
+}
+
+ATF_TC(fchownat_fderr1);
+ATF_TC_HEAD(fchownat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchownat fail with bad path");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fderr1, tc)
+{
+	int dfd;
+	uid_t uid;
+	gid_t gid;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchownat(dfd, FILEERR, uid, gid, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fchownat_fderr2);
+ATF_TC_HEAD(fchownat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchownat fails with bad fdat");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+	uid_t uid;
+	gid_t gid;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fchownat(dfd, BASEFILE, uid, gid, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fchownat_fderr3);
+ATF_TC_HEAD(fchownat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchownat fails with fd as -1");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fderr3, tc)
+{
+	int fd;
+	uid_t uid;
+	gid_t gid;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchownat(-1, FILE, uid, gid, 0) == -1);
+}
+
+ATF_TC(fchownat_fdlink);
+ATF_TC_HEAD(fchownat_fdlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fchownat works on symlink");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(fchownat_fdlink, tc)
+{
+	int dfd;
+	uid_t uid;
+	gid_t gid;
+	struct stat st;
+
+	ATF_REQUIRE(getuser(&uid, &gid) == 0);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* Target does not exists */
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(fchownat(dfd, BASELINK, uid, gid, 0) == -1);
+	ATF_REQUIRE(errno == ENOENT);
+
+	ATF_REQUIRE(fchownat(dfd, BASELINK, uid, gid,
+	    AT_SYMLINK_NOFOLLOW) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(lstat(LINK, &st) == 0);
+	ATF_REQUIRE(st.st_uid == uid);
+	ATF_REQUIRE(st.st_gid == gid);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fchownat_fd);
+	ATF_TP_ADD_TC(tp, fchownat_fdcwd);
+	ATF_TP_ADD_TC(tp, fchownat_fdcwderr);
+	ATF_TP_ADD_TC(tp, fchownat_fderr1);
+	ATF_TP_ADD_TC(tp, fchownat_fderr2);
+	ATF_TP_ADD_TC(tp, fchownat_fderr3);
+	ATF_TP_ADD_TC(tp, fchownat_fdlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_fexecve.c b/contrib/netbsd-tests/lib/libc/c063/t_fexecve.c
new file mode 100644
index 000000000000..d557b00d92c2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_fexecve.c
@@ -0,0 +1,94 @@
+/*	$NetBSD: t_fexecve.c,v 1.2 2013/03/17 04:35:59 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fexecve.c,v 1.2 2013/03/17 04:35:59 jmmv Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+ATF_TC(fexecve);
+ATF_TC_HEAD(fexecve, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fexecve works");
+}
+ATF_TC_BODY(fexecve, tc)
+{
+	int status;
+	pid_t pid;
+	const char *const argv[] = { "touch", "test", NULL };
+	const char *const envp[] = { NULL };
+
+	ATF_REQUIRE((pid = fork()) != -1);
+	if (pid == 0) {
+		int fd;
+
+		if ((fd = open("/usr/bin/touch", O_RDONLY, 0)) == -1)
+			err(EXIT_FAILURE, "open /usr/bin/touch");
+
+		if (fexecve(fd, __UNCONST(argv), __UNCONST(envp)) == -1) {
+			int error;
+			if (errno == ENOSYS)
+				error = 76;
+			else
+				error = EXIT_FAILURE;
+			err(error, "fexecve");
+		}
+	}
+
+	ATF_REQUIRE(waitpid(pid, &status, 0) != -1);
+	if (!WIFEXITED(status))
+		atf_tc_fail("child process did not exit cleanly");
+	if (WEXITSTATUS(status) == 76)
+		atf_tc_expect_fail("fexecve not implemented");
+	else
+		ATF_REQUIRE(WEXITSTATUS(status) == EXIT_SUCCESS);
+
+	ATF_REQUIRE(access("test", F_OK) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fexecve);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c b/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
new file mode 100644
index 000000000000..a48cd5781384
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
@@ -0,0 +1,196 @@
+/*	$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/fstatat"
+#define BASEFILE "fstatat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/symlink"
+
+ATF_TC(fstatat_fd);
+ATF_TC_HEAD(fstatat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat works with fd");
+}
+ATF_TC_BODY(fstatat_fd, tc)
+{
+	int dfd;
+	int fd;
+	struct stat st1, st2;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fstatat(dfd, BASEFILE, &st1, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &st2) == 0);
+	ATF_REQUIRE(memcmp(&st1, &st2, sizeof(st1)) == 0);
+}
+
+ATF_TC(fstatat_fdcwd);
+ATF_TC_HEAD(fstatat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that fstatat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(fstatat_fdcwd, tc)
+{
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(fstatat(AT_FDCWD, BASEFILE, &st, 0) == 0);
+}
+
+ATF_TC(fstatat_fdcwderr);
+ATF_TC_HEAD(fstatat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that fstatat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(fstatat_fdcwderr, tc)
+{
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(fstatat(AT_FDCWD, FILEERR, &st, 0) == -1);
+}
+
+ATF_TC(fstatat_fderr1);
+ATF_TC_HEAD(fstatat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat fail with bad path");
+}
+ATF_TC_BODY(fstatat_fderr1, tc)
+{
+	int dfd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fstatat(dfd, FILEERR, &st, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fstatat_fderr2);
+ATF_TC_HEAD(fstatat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat fails with bad fdat");
+}
+ATF_TC_BODY(fstatat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(fstatat(dfd, BASEFILE, &st, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(fstatat_fderr3);
+ATF_TC_HEAD(fstatat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat fails with fd as -1");
+}
+ATF_TC_BODY(fstatat_fderr3, tc)
+{
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fstatat(-1, FILE, &st, 0) == -1);
+}
+
+ATF_TC(fstatat_fdlink);
+ATF_TC_HEAD(fstatat_fdlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat works on symlink");
+}
+ATF_TC_BODY(fstatat_fdlink, tc)
+{
+	int dfd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* target does not exists */
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(fstatat(dfd, BASELINK, &st, 0) == -1);
+	ATF_REQUIRE(errno == ENOENT);
+
+	ATF_REQUIRE(fstatat(dfd, BASELINK, &st, AT_SYMLINK_NOFOLLOW) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fstatat_fd);
+	ATF_TP_ADD_TC(tp, fstatat_fdcwd);
+	ATF_TP_ADD_TC(tp, fstatat_fdcwderr);
+	ATF_TP_ADD_TC(tp, fstatat_fderr1);
+	ATF_TP_ADD_TC(tp, fstatat_fderr2);
+	ATF_TP_ADD_TC(tp, fstatat_fderr3);
+	ATF_TP_ADD_TC(tp, fstatat_fdlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_linkat.c b/contrib/netbsd-tests/lib/libc/c063/t_linkat.c
new file mode 100644
index 000000000000..b49a3f0175a1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_linkat.c
@@ -0,0 +1,217 @@
+/*	$NetBSD: t_linkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_linkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define ODIR "olddir"
+#define NDIR "newdir"
+#define FILE "olddir/old"
+#define BASEFILE "old"
+#define RELFILE "../olddir/old"
+#define TARGET "newdir/new"
+#define BASETARGET "new"
+#define LINK "olddir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "olddir/olderr" 
+
+ATF_TC(linkat_fd);
+ATF_TC_HEAD(linkat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that linkat works with fd");
+}
+ATF_TC_BODY(linkat_fd, tc)
+{
+	int ofd, nfd, fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE((ofd = open(ODIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((nfd = open(NDIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(linkat(ofd, BASEFILE, nfd, BASETARGET, 0) == 0);
+	ATF_REQUIRE(close(ofd) == 0);
+	ATF_REQUIRE(close(nfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+	ATF_REQUIRE(stat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(linkat_fdcwd);
+ATF_TC_HEAD(linkat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that linkat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(linkat_fdcwd, tc)
+{
+	int fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(linkat(AT_FDCWD, FILE, AT_FDCWD, TARGET, 0) == 0);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+	ATF_REQUIRE(stat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(linkat_fdcwderr);
+ATF_TC_HEAD(linkat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that linkat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(linkat_fdcwderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(linkat(AT_FDCWD, FILEERR, AT_FDCWD, TARGET, 0) == -1);
+}
+
+ATF_TC(linkat_fderr);
+ATF_TC_HEAD(linkat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that linkat fails with fd as -1");
+}
+ATF_TC_BODY(linkat_fderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(linkat(-1, FILE, AT_FDCWD, TARGET, 0) == -1);
+	ATF_REQUIRE(linkat(AT_FDCWD, FILE, -1, TARGET, 0) == -1);
+	ATF_REQUIRE(linkat(-1, FILE, -1, TARGET, 0) == -1);
+}
+
+ATF_TC(linkat_fdlink1);
+ATF_TC_HEAD(linkat_fdlink1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that linkat works on symlink target");
+}
+ATF_TC_BODY(linkat_fdlink1, tc)
+{
+	int ofd, nfd, fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+	ATF_REQUIRE(symlink(RELFILE, LINK) == 0);
+
+	ATF_REQUIRE((ofd = open(ODIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((nfd = open(NDIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(linkat(ofd, BASELINK, nfd, BASETARGET, 
+	    AT_SYMLINK_FOLLOW) == 0);
+	ATF_REQUIRE(close(ofd) == 0);
+	ATF_REQUIRE(close(nfd) == 0);
+
+	ATF_REQUIRE(lstat(LINK, &ost) == 0);
+	ATF_REQUIRE(lstat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino != nst.st_ino);
+
+	ATF_REQUIRE(lstat(FILE, &ost) == 0);
+	ATF_REQUIRE(lstat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+
+ATF_TC(linkat_fdlink2);
+ATF_TC_HEAD(linkat_fdlink2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that linkat works on symlink source");
+}
+ATF_TC_BODY(linkat_fdlink2, tc)
+{
+	int ofd, nfd, fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+	ATF_REQUIRE(symlink(RELFILE, LINK) == 0);
+
+	ATF_REQUIRE((ofd = open(ODIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((nfd = open(NDIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(linkat(ofd, BASELINK, nfd, BASETARGET, 0) == 0);
+	ATF_REQUIRE(close(ofd) == 0);
+	ATF_REQUIRE(close(nfd) == 0);
+
+	ATF_REQUIRE(lstat(LINK, &ost) == 0);
+	ATF_REQUIRE(lstat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+
+	ATF_REQUIRE(lstat(FILE, &ost) == 0);
+	ATF_REQUIRE(lstat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino != nst.st_ino);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, linkat_fd);
+	ATF_TP_ADD_TC(tp, linkat_fdcwd);
+	ATF_TP_ADD_TC(tp, linkat_fdcwderr);
+	ATF_TP_ADD_TC(tp, linkat_fderr);
+	ATF_TP_ADD_TC(tp, linkat_fdlink1);
+	ATF_TP_ADD_TC(tp, linkat_fdlink2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_mkdirat.c b/contrib/netbsd-tests/lib/libc/c063/t_mkdirat.c
new file mode 100644
index 000000000000..23c53d79a46f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_mkdirat.c
@@ -0,0 +1,120 @@
+/*	$NetBSD: t_mkdirat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mkdirat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define DIR "dir"
+#define SDIR "dir/openat"
+#define BASESDIR "openat"
+#define SDIRERR "dir/openaterr" 
+
+ATF_TC(mkdirat_fd);
+ATF_TC_HEAD(mkdirat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mkdirat works with fd");
+}
+ATF_TC_BODY(mkdirat_fd, tc)
+{
+	int dfd;
+	mode_t mode = 0755;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(mkdirat(dfd, BASESDIR, mode) != -1);
+	ATF_REQUIRE(close(dfd) == 0);
+	ATF_REQUIRE(access(SDIR, F_OK) == 0);
+}
+
+ATF_TC(mkdirat_fdcwd);
+ATF_TC_HEAD(mkdirat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that mkdirat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(mkdirat_fdcwd, tc)
+{
+	mode_t mode = 0755;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(mkdirat(AT_FDCWD, SDIR, mode) != -1);
+	ATF_REQUIRE(access(SDIR, F_OK) == 0);
+}
+
+ATF_TC(mkdirat_fdcwderr);
+ATF_TC_HEAD(mkdirat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that mkdirat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(mkdirat_fdcwderr, tc)
+{
+	mode_t mode = 0755;
+
+	ATF_REQUIRE(mkdirat(AT_FDCWD, SDIRERR, mode) == -1);
+}
+
+ATF_TC(mkdirat_fderr);
+ATF_TC_HEAD(mkdirat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mkdirat fails with fd as -1");
+}
+ATF_TC_BODY(mkdirat_fderr, tc)
+{
+	int fd;
+	mode_t mode = 0755;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(SDIR, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(mkdirat(-1, SDIR, mode) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mkdirat_fd);
+	ATF_TP_ADD_TC(tp, mkdirat_fdcwd);
+	ATF_TP_ADD_TC(tp, mkdirat_fdcwderr);
+	ATF_TP_ADD_TC(tp, mkdirat_fderr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c b/contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c
new file mode 100644
index 000000000000..1ae023c3f4a6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c
@@ -0,0 +1,124 @@
+/*	$NetBSD: t_mkfifoat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mkfifoat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define DIR "dir"
+#define FIFO "dir/openat"
+#define BASEFIFO "openat"
+#define FIFOERR "dir/openaterr" 
+
+ATF_TC(mkfifoat_fd);
+ATF_TC_HEAD(mkfifoat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mkfifoat works with fd");
+}
+ATF_TC_BODY(mkfifoat_fd, tc)
+{
+	int dfd;
+	int fd;
+	mode_t mode = 0600;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((fd = mkfifoat(dfd, BASEFIFO, mode)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(access(FIFO, F_OK) == 0);
+}
+
+ATF_TC(mkfifoat_fdcwd);
+ATF_TC_HEAD(mkfifoat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that mkfifoat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(mkfifoat_fdcwd, tc)
+{
+	int fd;
+	mode_t mode = 0600;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = mkfifoat(AT_FDCWD, FIFO, mode)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(access(FIFO, F_OK) == 0);
+}
+
+ATF_TC(mkfifoat_fdcwderr);
+ATF_TC_HEAD(mkfifoat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that mkfifoat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(mkfifoat_fdcwderr, tc)
+{
+	int fd;
+	mode_t mode = 0600;
+
+	ATF_REQUIRE((fd = mkfifoat(AT_FDCWD, FIFOERR, mode)) == -1);
+}
+
+ATF_TC(mkfifoat_fderr);
+ATF_TC_HEAD(mkfifoat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mkfifoat fails with fd as -1");
+}
+ATF_TC_BODY(mkfifoat_fderr, tc)
+{
+	int fd;
+	mode_t mode = 0600;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FIFO, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE((fd = mkfifoat(-1, FIFO, mode)) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mkfifoat_fd);
+	ATF_TP_ADD_TC(tp, mkfifoat_fdcwd);
+	ATF_TP_ADD_TC(tp, mkfifoat_fdcwderr);
+	ATF_TP_ADD_TC(tp, mkfifoat_fderr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_mknodat.c b/contrib/netbsd-tests/lib/libc/c063/t_mknodat.c
new file mode 100644
index 000000000000..b04a1595d6e5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_mknodat.c
@@ -0,0 +1,150 @@
+/*	$NetBSD: t_mknodat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mknodat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define DIR "dir"
+#define FILE "dir/openat"
+#define BASEFILE "openat"
+#define FILEERR "dir/openaterr" 
+
+static dev_t get_devnull(void);
+
+static dev_t
+get_devnull(void)
+{
+	struct stat st;
+	
+	if (stat(_PATH_DEVNULL, &st) != 0)
+		return NODEV;
+
+	return st.st_rdev;
+}
+
+
+ATF_TC(mknodat_fd);
+ATF_TC_HEAD(mknodat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mknodat works with fd");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(mknodat_fd, tc)
+{
+	int dfd;
+	int fd;
+	dev_t dev;
+	mode_t mode = S_IFCHR|0600;
+
+	ATF_REQUIRE((dev = get_devnull()) != NODEV);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((fd = mknodat(dfd, BASEFILE, mode, dev)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(access(FILE, F_OK) == 0);
+}
+
+ATF_TC(mknodat_fdcwd);
+ATF_TC_HEAD(mknodat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that mknodat works with fd as AT_FDCWD");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(mknodat_fdcwd, tc)
+{
+	int fd;
+	dev_t dev;
+	mode_t mode = S_IFCHR|0600;
+
+	ATF_REQUIRE((dev = get_devnull()) != NODEV);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = mknodat(AT_FDCWD, FILE, mode, dev)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(access(FILE, F_OK) == 0);
+}
+
+ATF_TC(mknodat_fdcwderr);
+ATF_TC_HEAD(mknodat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that mknodat fails with fd as AT_FDCWD and bad path");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(mknodat_fdcwderr, tc)
+{
+	int fd;
+	dev_t dev;
+	mode_t mode = S_IFCHR|0600;
+
+	ATF_REQUIRE((dev = get_devnull()) != NODEV);
+	ATF_REQUIRE((fd = mknodat(AT_FDCWD, FILEERR, mode, dev)) == -1);
+}
+
+ATF_TC(mknodat_fderr);
+ATF_TC_HEAD(mknodat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that mknodat fails with fd as -1");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(mknodat_fderr, tc)
+{
+	int fd;
+	dev_t dev;
+	mode_t mode = S_IFCHR|0600;
+
+	ATF_REQUIRE((dev = get_devnull()) != NODEV);
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE((fd = mknodat(-1, FILE, mode, dev)) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mknodat_fd);
+	ATF_TP_ADD_TC(tp, mknodat_fdcwd);
+	ATF_TP_ADD_TC(tp, mknodat_fdcwderr);
+	ATF_TP_ADD_TC(tp, mknodat_fderr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_o_search.c b/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
new file mode 100644
index 000000000000..d9dbe19e899f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
@@ -0,0 +1,278 @@
+/*	$NetBSD: t_o_search.c,v 1.4 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_o_search.c,v 1.4 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/param.h>
+
+/*
+ * dholland 20130112: disable tests that require O_SEARCH semantics
+ * until a decision is reached about the semantics of O_SEARCH and a
+ * non-broken implementation is available.
+ */
+#if (O_MASK & O_SEARCH) != 0
+#define USE_O_SEARCH
+#endif
+
+#define DIR "dir"
+#define FILE "dir/o_search"
+#define BASEFILE "o_search"
+
+
+ATF_TC(o_search_perm1);
+ATF_TC_HEAD(o_search_perm1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat enforces search permission");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_perm1, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1);
+	ATF_REQUIRE(errno == EACCES);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+#ifdef USE_O_SEARCH
+
+ATF_TC(o_search_root_flag1);
+ATF_TC_HEAD(o_search_root_flag1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that root openat honours O_SEARCH");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(o_search_root_flag1, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 444) == 0);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_unpriv_flag1);
+ATF_TC_HEAD(o_search_unpriv_flag1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat honours O_SEARCH");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_unpriv_flag1, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 444) == 0);
+
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+#endif /* USE_O_SEARCH */
+
+ATF_TC(o_search_perm2);
+ATF_TC_HEAD(o_search_perm2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that faccessat enforces search permission");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_perm2, tc)
+{
+	int dfd;
+	int fd;
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == -1);
+	ATF_REQUIRE(errno == EACCES);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+#ifdef USE_O_SEARCH
+
+ATF_TC(o_search_root_flag2);
+ATF_TC_HEAD(o_search_root_flag2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that root fstatat honours O_SEARCH");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(o_search_root_flag2, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 444) == 0);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_unpriv_flag2);
+ATF_TC_HEAD(o_search_unpriv_flag2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that fstatat honours O_SEARCH");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_unpriv_flag2, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY|O_SEARCH, 0)) != -1);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 644) == 0);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(fchmod(dfd, 444) == 0);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+#endif /* USE_O_SEARCH */
+
+
+ATF_TC(o_search_notdir);
+ATF_TC_HEAD(o_search_notdir, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat fails with non dir fd");
+}
+ATF_TC_BODY(o_search_notdir, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_RDWR|O_SEARCH, 0644)) != -1);
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1);
+	ATF_REQUIRE(errno == ENOTDIR);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, o_search_perm1);
+#ifdef USE_O_SEARCH
+	ATF_TP_ADD_TC(tp, o_search_root_flag1);
+	ATF_TP_ADD_TC(tp, o_search_unpriv_flag1);
+#endif
+	ATF_TP_ADD_TC(tp, o_search_perm2);
+#ifdef USE_O_SEARCH
+	ATF_TP_ADD_TC(tp, o_search_root_flag2);
+	ATF_TP_ADD_TC(tp, o_search_unpriv_flag2);
+#endif
+	ATF_TP_ADD_TC(tp, o_search_notdir);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_openat.c b/contrib/netbsd-tests/lib/libc/c063/t_openat.c
new file mode 100644
index 000000000000..79b5f38d81fd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_openat.c
@@ -0,0 +1,165 @@
+/*	$NetBSD: t_openat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_openat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/openat"
+#define BASEFILE "openat"
+#define FILEERR "dir/openaterr"
+
+ATF_TC(openat_fd);
+ATF_TC_HEAD(openat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat works with fd");
+}
+ATF_TC_BODY(openat_fd, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(close(dfd) == 0);
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC(openat_fdcwd);
+ATF_TC_HEAD(openat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that openat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(openat_fdcwd, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE((fd = openat(AT_FDCWD, BASEFILE, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC(openat_fdcwderr);
+ATF_TC_HEAD(openat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that openat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(openat_fdcwderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = openat(AT_FDCWD, FILEERR, O_RDONLY, 0)) == -1);
+}
+
+ATF_TC(openat_fderr1);
+ATF_TC_HEAD(openat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat fail with bad path");
+}
+ATF_TC_BODY(openat_fderr1, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((fd = openat(dfd, FILEERR, O_RDONLY, 0)) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(openat_fderr2);
+ATF_TC_HEAD(openat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat fails with bad fdat");
+}
+ATF_TC_BODY(openat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDONLY, 0)) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(openat_fderr3);
+ATF_TC_HEAD(openat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat fails with fd as -1");
+}
+ATF_TC_BODY(openat_fderr3, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((fd = openat(-1, FILE, O_RDONLY, 0)) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, openat_fd);
+	ATF_TP_ADD_TC(tp, openat_fdcwd);
+	ATF_TP_ADD_TC(tp, openat_fdcwderr);
+	ATF_TP_ADD_TC(tp, openat_fderr1);
+	ATF_TP_ADD_TC(tp, openat_fderr2);
+	ATF_TP_ADD_TC(tp, openat_fderr3);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_readlinkat.c b/contrib/netbsd-tests/lib/libc/c063/t_readlinkat.c
new file mode 100644
index 000000000000..d354ff59b886
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_readlinkat.c
@@ -0,0 +1,157 @@
+/*	$NetBSD: t_readlinkat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_readlinkat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/readlinkat"
+#define BASEFILE "readlinkat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/readlinkaterr"
+
+ATF_TC(readlinkat_fd);
+ATF_TC_HEAD(readlinkat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that readlinkat works with fd");
+}
+ATF_TC_BODY(readlinkat_fd, tc)
+{
+	int dfd;
+	int fd;
+	ssize_t len;
+	char buf[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	len = readlinkat(dfd, BASELINK, buf, sizeof(buf)-1);
+	ATF_REQUIRE(len != -1);
+	buf[len] = 0;
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(strcmp(buf, FILE) == 0);
+}
+
+ATF_TC(readlinkat_fdcwd);
+ATF_TC_HEAD(readlinkat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that readlinkat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(readlinkat_fdcwd, tc)
+{
+	int fd;
+	ssize_t len;
+	char buf[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0);
+
+	len = readlinkat(AT_FDCWD, LINK, buf, sizeof(buf)-1);
+	ATF_REQUIRE(len != -1);
+	buf[len] = 0;
+
+	ATF_REQUIRE(strcmp(buf, FILE) == 0);
+}
+
+ATF_TC(readlinkat_fdcwderr);
+ATF_TC_HEAD(readlinkat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that readlinkat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(readlinkat_fdcwderr, tc)
+{
+	char buf[MAXPATHLEN];
+
+	ATF_REQUIRE(readlinkat(AT_FDCWD, LINK, buf, sizeof(buf)) == -1);
+}
+
+ATF_TC(readlinkat_fderr1);
+ATF_TC_HEAD(readlinkat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that readlinkat fail with bad path");
+}
+ATF_TC_BODY(readlinkat_fderr1, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(readlinkat(dfd, FILEERR, F_OK, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(readlinkat_fderr2);
+ATF_TC_HEAD(readlinkat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that readlinkat fails with fd as -1");
+}
+ATF_TC_BODY(readlinkat_fderr2, tc)
+{
+	int fd;
+	char buf[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0);
+
+	ATF_REQUIRE(readlinkat(-1, LINK, buf, sizeof(buf)) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, readlinkat_fd);
+	ATF_TP_ADD_TC(tp, readlinkat_fdcwd);
+	ATF_TP_ADD_TC(tp, readlinkat_fdcwderr);
+	ATF_TP_ADD_TC(tp, readlinkat_fderr1);
+	ATF_TP_ADD_TC(tp, readlinkat_fderr2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_renameat.c b/contrib/netbsd-tests/lib/libc/c063/t_renameat.c
new file mode 100644
index 000000000000..e297f2a629af
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_renameat.c
@@ -0,0 +1,152 @@
+/*	$NetBSD: t_renameat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_renameat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define ODIR "olddir"
+#define NDIR "newdir"
+#define FILE "olddir/old"
+#define BASEFILE "old"
+#define RELFILE "../olddir/old"
+#define TARGET "newdir/new"
+#define BASETARGET "new"
+#define FILEERR "olddir/olderr" 
+
+ATF_TC(renameat_fd);
+ATF_TC_HEAD(renameat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that renameat works with fd");
+}
+ATF_TC_BODY(renameat_fd, tc)
+{
+	int ofd, nfd, fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+
+	ATF_REQUIRE((ofd = open(ODIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE((nfd = open(NDIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(renameat(ofd, BASEFILE, nfd, BASETARGET) == 0);
+	ATF_REQUIRE(close(ofd) == 0);
+	ATF_REQUIRE(close(nfd) == 0);
+
+	ATF_REQUIRE(stat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(renameat_fdcwd);
+ATF_TC_HEAD(renameat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that renameat works with fd as AT_FDCWD");
+}
+
+ATF_TC_BODY(renameat_fdcwd, tc)
+{
+	int fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+
+	ATF_REQUIRE(renameat(AT_FDCWD, FILE, AT_FDCWD, TARGET) == 0);
+
+	ATF_REQUIRE(stat(TARGET, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(renameat_fdcwderr);
+ATF_TC_HEAD(renameat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that renameat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(renameat_fdcwderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(renameat(AT_FDCWD, FILEERR, AT_FDCWD, TARGET) == -1);
+}
+
+ATF_TC(renameat_fderr);
+ATF_TC_HEAD(renameat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that renameat fails with fd as -1");
+}
+ATF_TC_BODY(renameat_fderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(renameat(-1, FILE, AT_FDCWD, TARGET) == -1);
+	ATF_REQUIRE(renameat(AT_FDCWD, FILE, -1, TARGET) == -1);
+	ATF_REQUIRE(renameat(-1, FILE, -1, TARGET) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, renameat_fd);
+	ATF_TP_ADD_TC(tp, renameat_fdcwd);
+	ATF_TP_ADD_TC(tp, renameat_fdcwderr);
+	ATF_TP_ADD_TC(tp, renameat_fderr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_symlinkat.c b/contrib/netbsd-tests/lib/libc/c063/t_symlinkat.c
new file mode 100644
index 000000000000..d62f28912d5a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_symlinkat.c
@@ -0,0 +1,150 @@
+/*	$NetBSD: t_symlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_symlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#define ODIR "olddir"
+#define NDIR "newdir"
+#define FILE "olddir/old"
+#define BASEFILE "old"
+#define RELFILE "../olddir/old"
+#define LINK "newdir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "olddir/olderr" 
+
+ATF_TC(symlinkat_fd);
+ATF_TC_HEAD(symlinkat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that symlinkat works with fd");
+}
+ATF_TC_BODY(symlinkat_fd, tc)
+{
+	int dfd, fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE((dfd = open(NDIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(symlinkat(RELFILE, dfd, BASELINK) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+	ATF_REQUIRE(stat(LINK, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(symlinkat_fdcwd);
+ATF_TC_HEAD(symlinkat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that symlinkat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(symlinkat_fdcwd, tc)
+{
+	int fd;
+	struct stat ost, nst;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(symlinkat(RELFILE, AT_FDCWD, LINK) == 0);
+
+	ATF_REQUIRE(stat(FILE, &ost) == 0);
+	ATF_REQUIRE(stat(LINK, &nst) == 0);
+	ATF_REQUIRE(ost.st_ino == nst.st_ino);
+}
+
+ATF_TC(symlinkat_fdcwderr);
+ATF_TC_HEAD(symlinkat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that symlinkat works with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(symlinkat_fdcwderr, tc)
+{
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(symlinkat(FILEERR, AT_FDCWD, LINK) == 0);
+	ATF_REQUIRE(lstat(LINK, &st) == 0);
+	ATF_REQUIRE(stat(LINK, &st) == -1);
+	ATF_REQUIRE(errno == ENOENT);
+
+}
+
+ATF_TC(symlinkat_fderr);
+ATF_TC_HEAD(symlinkat_fderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that symlinkat fails with fd as -1");
+}
+ATF_TC_BODY(symlinkat_fderr, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(ODIR, 0755) == 0);
+	ATF_REQUIRE(mkdir(NDIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) != -1);
+
+	ATF_REQUIRE(symlinkat(RELFILE, -1, LINK) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, symlinkat_fd);
+	ATF_TP_ADD_TC(tp, symlinkat_fdcwd);
+	ATF_TP_ADD_TC(tp, symlinkat_fdcwderr);
+	ATF_TP_ADD_TC(tp, symlinkat_fderr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_unlinkat.c b/contrib/netbsd-tests/lib/libc/c063/t_unlinkat.c
new file mode 100644
index 000000000000..79aa7aa2bf70
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_unlinkat.c
@@ -0,0 +1,176 @@
+/*	$NetBSD: t_unlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_unlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+#define DIR "dir"
+#define FILE "dir/unlinkat"
+#define BASEFILE "unlinkat"
+#define FILEERR "dir/unlinkaterr"
+
+ATF_TC(unlinkat_fd);
+ATF_TC_HEAD(unlinkat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that unlinkat works with fd");
+}
+ATF_TC_BODY(unlinkat_fd, tc)
+{
+	int dfd;
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(unlinkat(dfd, BASEFILE, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(unlinkat_fdcwd);
+ATF_TC_HEAD(unlinkat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that unlinkat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(unlinkat_fdcwd, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(unlinkat(AT_FDCWD, BASEFILE, 0) == 0);
+}
+
+ATF_TC(unlinkat_fdcwderr);
+ATF_TC_HEAD(unlinkat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that unlinkat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(unlinkat_fdcwderr, tc)
+{
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(unlinkat(AT_FDCWD, FILEERR, 0) == -1);
+}
+
+ATF_TC(unlinkat_fderr1);
+ATF_TC_HEAD(unlinkat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that unlinkat fail with bad path");
+}
+ATF_TC_BODY(unlinkat_fderr1, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(unlinkat(dfd, FILEERR, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(unlinkat_fderr2);
+ATF_TC_HEAD(unlinkat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that unlinkat fails with bad fdat");
+}
+ATF_TC_BODY(unlinkat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(unlinkat(dfd, BASEFILE, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(unlinkat_fderr3);
+ATF_TC_HEAD(unlinkat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that unlinkat fails with fd as -1");
+}
+ATF_TC_BODY(unlinkat_fderr3, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(unlinkat(-1, FILE, 0) == -1);
+}
+
+ATF_TC(unlinkat_dir);
+ATF_TC_HEAD(unlinkat_dir, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that unlinkat can remove directories");
+}
+ATF_TC_BODY(unlinkat_dir, tc)
+{
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+
+	ATF_REQUIRE(unlinkat(AT_FDCWD, DIR, 0) == -1);
+	ATF_REQUIRE(errno == EPERM);
+	ATF_REQUIRE(unlinkat(AT_FDCWD, DIR, AT_REMOVEDIR) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, unlinkat_fd);
+	ATF_TP_ADD_TC(tp, unlinkat_fdcwd);
+	ATF_TP_ADD_TC(tp, unlinkat_fdcwderr);
+	ATF_TP_ADD_TC(tp, unlinkat_fderr1);
+	ATF_TP_ADD_TC(tp, unlinkat_fderr2);
+	ATF_TP_ADD_TC(tp, unlinkat_fderr3);
+	ATF_TP_ADD_TC(tp, unlinkat_dir);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c b/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
new file mode 100644
index 000000000000..9f21fd6f126a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
@@ -0,0 +1,212 @@
+/*	$NetBSD: t_utimensat.c,v 1.5 2013/03/17 04:46:06 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_utimensat.c,v 1.5 2013/03/17 04:46:06 jmmv Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/time.h>
+
+#define DIR "dir"
+#define FILE "dir/utimensat"
+#define BASEFILE "utimensat"
+#define LINK "dir/symlink"
+#define BASELINK "symlink"
+#define FILEERR "dir/symlink"
+
+const struct timespec tptr[] = { 
+	{ 0x12345678, 987654321 },
+	{ 0x15263748, 123456789 },
+};
+
+ATF_TC(utimensat_fd);
+ATF_TC_HEAD(utimensat_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that utimensat works with fd");
+}
+ATF_TC_BODY(utimensat_fd, tc)
+{
+	int dfd;
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(utimensat(dfd, BASEFILE, tptr, 0) == 0);
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(stat(FILE, &st) == 0);
+	ATF_REQUIRE(st.st_atimespec.tv_sec == tptr[0].tv_sec);
+	ATF_REQUIRE(st.st_atimespec.tv_nsec == tptr[0].tv_nsec);
+	ATF_REQUIRE(st.st_mtimespec.tv_sec == tptr[1].tv_sec);
+	ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
+}
+
+ATF_TC(utimensat_fdcwd);
+ATF_TC_HEAD(utimensat_fdcwd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+			  "See that utimensat works with fd as AT_FDCWD");
+}
+ATF_TC_BODY(utimensat_fdcwd, tc)
+{
+	int fd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chdir(DIR) == 0);
+	ATF_REQUIRE(utimensat(AT_FDCWD, BASEFILE, tptr, 0) == 0);
+
+	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
+	ATF_REQUIRE(st.st_atimespec.tv_sec == tptr[0].tv_sec);
+	ATF_REQUIRE(st.st_atimespec.tv_nsec == tptr[0].tv_nsec);
+	ATF_REQUIRE(st.st_mtimespec.tv_sec == tptr[1].tv_sec);
+	ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
+}
+
+ATF_TC(utimensat_fdcwderr);
+ATF_TC_HEAD(utimensat_fdcwderr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", 
+		  "See that utimensat fails with fd as AT_FDCWD and bad path");
+}
+ATF_TC_BODY(utimensat_fdcwderr, tc)
+{
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(utimensat(AT_FDCWD, FILEERR, tptr, 0) == -1);
+}
+
+ATF_TC(utimensat_fderr1);
+ATF_TC_HEAD(utimensat_fderr1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that utimensat fail with bad path");
+}
+ATF_TC_BODY(utimensat_fderr1, tc)
+{
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(utimensat(dfd, FILEERR, tptr, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(utimensat_fderr2);
+ATF_TC_HEAD(utimensat_fderr2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that utimensat fails with bad fdat");
+}
+ATF_TC_BODY(utimensat_fderr2, tc)
+{
+	int dfd;
+	int fd;
+	char cwd[MAXPATHLEN];
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
+	ATF_REQUIRE(utimensat(dfd, BASEFILE, tptr, 0) == -1);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(utimensat_fderr3);
+ATF_TC_HEAD(utimensat_fderr3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that utimensat fails with fd as -1");
+}
+ATF_TC_BODY(utimensat_fderr3, tc)
+{
+	int fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(utimensat(-1, FILE, tptr, 0) == -1);
+}
+
+ATF_TC(utimensat_fdlink);
+ATF_TC_HEAD(utimensat_fdlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that utimensat works on symlink");
+}
+ATF_TC_BODY(utimensat_fdlink, tc)
+{
+	int dfd;
+	struct stat st;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* NB: FILE does not exists */
+
+	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
+
+	ATF_REQUIRE(utimensat(dfd, BASELINK, tptr, 0) == -1);
+	ATF_REQUIRE(errno = ENOENT);
+
+	ATF_REQUIRE(utimensat(dfd, BASELINK, tptr, AT_SYMLINK_NOFOLLOW) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+
+	ATF_REQUIRE(lstat(LINK, &st) == 0);
+	ATF_REQUIRE(st.st_atimespec.tv_sec == tptr[0].tv_sec);
+	ATF_REQUIRE(st.st_atimespec.tv_nsec == tptr[0].tv_nsec);
+	ATF_REQUIRE(st.st_mtimespec.tv_sec == tptr[1].tv_sec);
+	ATF_REQUIRE(st.st_mtimespec.tv_nsec == tptr[1].tv_nsec);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, utimensat_fd);
+	ATF_TP_ADD_TC(tp, utimensat_fdcwd);
+	ATF_TP_ADD_TC(tp, utimensat_fdcwderr);
+	ATF_TP_ADD_TC(tp, utimensat_fderr1);
+	ATF_TP_ADD_TC(tp, utimensat_fderr2);
+	ATF_TP_ADD_TC(tp, utimensat_fderr3);
+	ATF_TP_ADD_TC(tp, utimensat_fdlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/common/exec_prot.h b/contrib/netbsd-tests/lib/libc/common/exec_prot.h
new file mode 100644
index 000000000000..6e17f97a2c12
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/common/exec_prot.h
@@ -0,0 +1,61 @@
+/* $NetBSD: exec_prot.h,v 1.1 2011/07/18 23:16:11 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jean-Yves Migeon.
+ *
+ * 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 _TESTS_EXEC_PROT_H_
+#define _TESTS_EXEC_PROT_H_
+
+/*
+ * Prototype definitions of external helper functions for executable
+ * mapping tests.
+ */
+
+/*
+ * Trivial MD shellcode that justs returns 1.
+ */
+int return_one(void);     /* begin marker -- shellcode entry */
+int return_one_end(void); /* end marker */
+
+/*
+ * MD callback to verify whether host offers executable space protection.
+ * Returns execute protection level.
+ */
+int exec_prot_support(void);
+
+/* execute protection level */
+enum {
+	NOTIMPL = -1, /* callback not implemented */
+	NO_XP,        /* no execute protection */
+	PERPAGE_XP,   /* per-page execute protection */
+	PARTIAL_XP    /* partial execute protection. Depending on where the
+			 page is located in virtual memory, executable space
+			 protection may be enforced or not. */
+};
+#endif
diff --git a/contrib/netbsd-tests/lib/libc/db/README b/contrib/netbsd-tests/lib/libc/db/README
new file mode 100644
index 000000000000..68f0ec7a1c1a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/db/README
@@ -0,0 +1,66 @@
+#	$NetBSD: README,v 1.1 2011/01/07 15:05:58 pgoyette Exp $
+#	@(#)README	8.8 (Berkeley) 7/31/94
+
+Fairly large files (the command files) are built in this directory during
+the test runs, and even larger files (the database files) are created in
+"/var/tmp".  If the latter directory doesn't exist, set the environmental
+variable TMPDIR to a directory where the files can be built.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+The script file consists of lines with an initial character which is
+the command for that line, or an initial character indicating a key
+or data entry for a previous command.
+
+Legal command characters are as follows:
+
+c: compare a record
+	+ must be followed by [kK][dD]; the data value in the database
+	  associated with the specified key is compared to the specified
+	  data value.
+e: echo a string
+	+ writes out the rest of the line into the output file; if the
+	  last character is not a carriage-return, a newline is appended.
+f: set the flags for the next command
+	+ no value zero's the flags
+g: do a get command
+	+ must be followed by [kK]
+	+ writes out the retrieved data DBT.
+o [r]: dump [reverse]
+	+ dump the database out, if 'r' is set, in reverse order.
+p: do a put command
+	+ must be followed by [kK][dD]
+r: do a del command
+	+ must be followed by [kK] unless R_CURSOR flag set.
+S: sync the database
+s: do a seq command
+	+ must be followed by [kK] if R_CURSOR flag set.
+	+ writes out the retrieved data DBT.
+
+Legal key/data characters are as follows:
+
+D [file]: data file
+	+ set the current data value to the contents of the file
+d [data]:
+	+ set the current key value to the contents of the line.
+K [file]: key file
+	+ set the current key value to the contents of the file
+k [data]:
+	+ set the current key value to the contents of the line.
+
+Blank lines, lines with leading white space, and lines with leading
+hash marks (#) are ignored.
+
+Options to dbtest are as follows:
+
+	-d: Set the DB_LOCK flag.
+	-f: Use the file argument as the database file.
+	-i: Use the rest of the argument to set elements in the info
+	    structure.  If the type is btree, then "-i cachesize=10240"
+	    will set BTREEINFO.cachesize to 10240.
+	-o: The rest of the argument is the output file instead of
+	    using stdout.
+	-s: Don't delete the database file before opening it, i.e.
+	    use the database file from a previous run.
+
+Dbtest requires two arguments, the type of access "hash", "recno"
+or "btree", and the script name or "-" to indicate stdin.
diff --git a/contrib/netbsd-tests/lib/libc/db/h_db.c b/contrib/netbsd-tests/lib/libc/db/h_db.c
new file mode 100644
index 000000000000..dfb13859d3f2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/db/h_db.c
@@ -0,0 +1,731 @@
+/*	$NetBSD: h_db.c,v 1.1 2011/01/07 15:05:58 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
+	The Regents of the University of California.  All rights reserved.");
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
+#else
+__RCSID("$NetBSD: h_db.c,v 1.1 2011/01/07 15:05:58 pgoyette Exp $");
+#endif
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <err.h>
+#include <db.h>
+
+enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
+
+static void	 compare(DBT *, DBT *);
+static DBTYPE	 dbtype(const char *);
+static void	 dump(DB *, int);
+static void	 get(DB *, DBT *);
+static void	 getdata(DB *, DBT *, DBT *);
+static void	 put(DB *, DBT *, DBT *);
+static void	 rem(DB *, DBT *);
+static const char *sflags(int);
+static void	 synk(DB *);
+static void	*rfile(char *, size_t *);
+static void	 seq(DB *, DBT *);
+static u_int	 setflags(char *);
+static void	*setinfo(DBTYPE, char *);
+static void	 usage(void) __attribute__((__noreturn__));
+static void	*xcopy(void *, size_t);
+static void	 chkcmd(enum S);
+static void	 chkdata(enum S);
+static void	 chkkey(enum S);
+
+#ifdef STATISTICS
+extern void __bt_stat(DB *);
+#endif
+
+static DBTYPE type;			/* Database type. */
+static void *infop;			/* Iflags. */
+static size_t lineno;			/* Current line in test script. */
+static u_int flags;				/* Current DB flags. */
+static int ofd = STDOUT_FILENO;		/* Standard output fd. */
+
+static DB *XXdbp;			/* Global for gdb. */
+static size_t XXlineno;			/* Fast breakpoint for gdb. */
+
+int
+main(int argc, char *argv[])
+{
+	extern int optind;
+	extern char *optarg;
+	enum S command = COMMAND, state;
+	DB *dbp;
+	DBT data, key, keydata;
+	size_t len;
+	int ch, oflags, sflag;
+	char *fname, *infoarg, *p, *t, buf[8 * 1024];
+	bool unlink_dbfile;
+
+	infoarg = NULL;
+	fname = NULL;
+	unlink_dbfile = false;
+	oflags = O_CREAT | O_RDWR;
+	sflag = 0;
+	while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1)
+		switch (ch) {
+		case 'f':
+			fname = optarg;
+			break;
+		case 'i':
+			infoarg = optarg;
+			break;
+		case 'l':
+			oflags |= DB_LOCK;
+			break;
+		case 'o':
+			if ((ofd = open(optarg,
+			    O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
+				err(1, "Cannot create `%s'", optarg);
+			break;
+		case 's':
+			sflag = 1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2)
+		usage();
+
+	/* Set the type. */
+	type = dbtype(*argv++);
+
+	/* Open the descriptor file. */
+        if (strcmp(*argv, "-") && freopen(*argv, "r", stdin) == NULL)
+	    err(1, "Cannot reopen `%s'", *argv);
+
+	/* Set up the db structure as necessary. */
+	if (infoarg == NULL)
+		infop = NULL;
+	else
+		for (p = strtok(infoarg, ",\t "); p != NULL;
+		    p = strtok(0, ",\t "))
+			if (*p != '\0')
+				infop = setinfo(type, p);
+
+	/*
+	 * Open the DB.  Delete any preexisting copy, you almost never
+	 * want it around, and it often screws up tests.
+	 */
+	if (fname == NULL) {
+		const char *q = getenv("TMPDIR");
+		if (q == NULL)
+			q = "/var/tmp";
+		(void)snprintf(buf, sizeof(buf), "%s/__dbtest", q);
+		fname = buf;
+		(void)unlink(buf);
+		unlink_dbfile = true;
+	} else  if (!sflag)
+		(void)unlink(fname);
+
+	if ((dbp = dbopen(fname,
+	    oflags, S_IRUSR | S_IWUSR, type, infop)) == NULL)
+		err(1, "Cannot dbopen `%s'", fname);
+	XXdbp = dbp;
+	if (unlink_dbfile)
+		(void)unlink(fname);
+
+	state = COMMAND;
+	for (lineno = 1;
+	    (p = fgets(buf, sizeof(buf), stdin)) != NULL; ++lineno) {
+		/* Delete the newline, displaying the key/data is easier. */
+		if (ofd == STDOUT_FILENO && (t = strchr(p, '\n')) != NULL)
+			*t = '\0';
+		if ((len = strlen(buf)) == 0 || isspace((unsigned char)*p) ||
+		    *p == '#')
+			continue;
+
+		/* Convenient gdb break point. */
+		if (XXlineno == lineno)
+			XXlineno = 1;
+		switch (*p) {
+		case 'c':			/* compare */
+			chkcmd(state);
+			state = KEY;
+			command = COMPARE;
+			break;
+		case 'e':			/* echo */
+			chkcmd(state);
+			/* Don't display the newline, if CR at EOL. */
+			if (p[len - 2] == '\r')
+				--len;
+			if (write(ofd, p + 1, len - 1) != (ssize_t)len - 1 ||
+			    write(ofd, "\n", 1) != 1)
+				err(1, "write failed");
+			break;
+		case 'g':			/* get */
+			chkcmd(state);
+			state = KEY;
+			command = GET;
+			break;
+		case 'p':			/* put */
+			chkcmd(state);
+			state = KEY;
+			command = PUT;
+			break;
+		case 'r':			/* remove */
+			chkcmd(state);
+                        if (flags == R_CURSOR) {
+				rem(dbp, &key);
+				state = COMMAND;
+                        } else {
+				state = KEY;
+				command = REMOVE;
+			}
+			break;
+		case 'S':			/* sync */
+			chkcmd(state);
+			synk(dbp);
+			state = COMMAND;
+			break;
+		case 's':			/* seq */
+			chkcmd(state);
+			if (flags == R_CURSOR) {
+				state = KEY;
+				command = SEQ;
+			} else
+				seq(dbp, &key);
+			break;
+		case 'f':
+			flags = setflags(p + 1);
+			break;
+		case 'D':			/* data file */
+			chkdata(state);
+			data.data = rfile(p + 1, &data.size);
+			goto ldata;
+		case 'd':			/* data */
+			chkdata(state);
+			data.data = xcopy(p + 1, len - 1);
+			data.size = len - 1;
+ldata:			switch (command) {
+			case COMPARE:
+				compare(&keydata, &data);
+				break;
+			case PUT:
+				put(dbp, &key, &data);
+				break;
+			default:
+				errx(1, "line %zu: command doesn't take data",
+				    lineno);
+			}
+			if (type != DB_RECNO)
+				free(key.data);
+			free(data.data);
+			state = COMMAND;
+			break;
+		case 'K':			/* key file */
+			chkkey(state);
+			if (type == DB_RECNO)
+				errx(1, "line %zu: 'K' not available for recno",
+				    lineno);
+			key.data = rfile(p + 1, &key.size);
+			goto lkey;
+		case 'k':			/* key */
+			chkkey(state);
+			if (type == DB_RECNO) {
+				static recno_t recno;
+				recno = atoi(p + 1);
+				key.data = &recno;
+				key.size = sizeof(recno);
+			} else {
+				key.data = xcopy(p + 1, len - 1);
+				key.size = len - 1;
+			}
+lkey:			switch (command) {
+			case COMPARE:
+				getdata(dbp, &key, &keydata);
+				state = DATA;
+				break;
+			case GET:
+				get(dbp, &key);
+				if (type != DB_RECNO)
+					free(key.data);
+				state = COMMAND;
+				break;
+			case PUT:
+				state = DATA;
+				break;
+			case REMOVE:
+				rem(dbp, &key);
+				if ((type != DB_RECNO) && (flags != R_CURSOR))
+					free(key.data);
+				state = COMMAND;
+				break;
+			case SEQ:
+				seq(dbp, &key);
+				if ((type != DB_RECNO) && (flags != R_CURSOR))
+					free(key.data);
+				state = COMMAND;
+				break;
+			default:
+				errx(1, "line %zu: command doesn't take a key",
+				    lineno);
+			}
+			break;
+		case 'o':
+			dump(dbp, p[1] == 'r');
+			break;
+		default:
+			errx(1, "line %zu: %s: unknown command character",
+			    lineno, p);
+		}
+	}
+#ifdef STATISTICS
+	/*
+	 * -l must be used (DB_LOCK must be set) for this to be
+	 * used, otherwise a page will be locked and it will fail.
+	 */
+	if (type == DB_BTREE && oflags & DB_LOCK)
+		__bt_stat(dbp);
+#endif
+	if ((*dbp->close)(dbp))
+		err(1, "db->close failed");
+	(void)close(ofd);
+	return 0;
+}
+
+#define	NOOVERWRITE	"put failed, would overwrite key\n"
+
+static void
+compare(DBT *db1, DBT *db2)
+{
+	size_t len;
+	u_char *p1, *p2;
+
+	if (db1->size != db2->size)
+		printf("compare failed: key->data len %zu != data len %zu\n",
+		    db1->size, db2->size);
+
+	len = MIN(db1->size, db2->size);
+	for (p1 = db1->data, p2 = db2->data; len--;)
+		if (*p1++ != *p2++) {
+			printf("compare failed at offset %lu\n",
+			    (unsigned long)(p1 - (u_char *)db1->data));
+			break;
+		}
+}
+
+static void
+get(DB *dbp, DBT *kp)
+{
+	DBT data;
+
+	switch ((*dbp->get)(dbp, kp, &data, flags)) {
+	case 0:
+		(void)write(ofd, data.data, data.size);
+		if (ofd == STDOUT_FILENO)
+			(void)write(ofd, "\n", 1);
+		break;
+	case -1:
+		err(1, "line %zu: get failed", lineno);
+		/* NOTREACHED */
+	case 1:
+#define	NOSUCHKEY	"get failed, no such key\n"
+		if (ofd != STDOUT_FILENO)
+			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+		else
+			(void)fprintf(stderr, "%zu: %.*s: %s",
+			    lineno, (int)MIN(kp->size, 20),
+			    (const char *)kp->data,
+			    NOSUCHKEY);
+#undef	NOSUCHKEY
+		break;
+	}
+}
+
+static void
+getdata(DB *dbp, DBT *kp, DBT *dp)
+{
+	switch ((*dbp->get)(dbp, kp, dp, flags)) {
+	case 0:
+		return;
+	case -1:
+		err(1, "line %zu: getdata failed", lineno);
+		/* NOTREACHED */
+	case 1:
+		errx(1, "line %zu: getdata failed, no such key", lineno);
+		/* NOTREACHED */
+	}
+}
+
+static void
+put(DB *dbp, DBT *kp, DBT *dp)
+{
+	switch ((*dbp->put)(dbp, kp, dp, flags)) {
+	case 0:
+		break;
+	case -1:
+		err(1, "line %zu: put failed", lineno);
+		/* NOTREACHED */
+	case 1:
+		(void)write(ofd, NOOVERWRITE, sizeof(NOOVERWRITE) - 1);
+		break;
+	}
+}
+
+static void
+rem(DB *dbp, DBT *kp)
+{
+	switch ((*dbp->del)(dbp, kp, flags)) {
+	case 0:
+		break;
+	case -1:
+		err(1, "line %zu: rem failed", lineno);
+		/* NOTREACHED */
+	case 1:
+#define	NOSUCHKEY	"rem failed, no such key\n"
+		if (ofd != STDOUT_FILENO)
+			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+		else if (flags != R_CURSOR)
+			(void)fprintf(stderr, "%zu: %.*s: %s", 
+			    lineno, (int)MIN(kp->size, 20),
+			    (const char *)kp->data, NOSUCHKEY);
+		else
+			(void)fprintf(stderr,
+			    "%zu: rem of cursor failed\n", lineno);
+#undef	NOSUCHKEY
+		break;
+	}
+}
+
+static void
+synk(DB *dbp)
+{
+	switch ((*dbp->sync)(dbp, flags)) {
+	case 0:
+		break;
+	case -1:
+		err(1, "line %zu: synk failed", lineno);
+		/* NOTREACHED */
+	}
+}
+
+static void
+seq(DB *dbp, DBT *kp)
+{
+	DBT data;
+
+	switch (dbp->seq(dbp, kp, &data, flags)) {
+	case 0:
+		(void)write(ofd, data.data, data.size);
+		if (ofd == STDOUT_FILENO)
+			(void)write(ofd, "\n", 1);
+		break;
+	case -1:
+		err(1, "line %zu: seq failed", lineno);
+		/* NOTREACHED */
+	case 1:
+#define	NOSUCHKEY	"seq failed, no such key\n"
+		if (ofd != STDOUT_FILENO)
+			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
+		else if (flags == R_CURSOR)
+			(void)fprintf(stderr, "%zu: %.*s: %s", 
+			    lineno, (int)MIN(kp->size, 20),
+			    (const char *)kp->data, NOSUCHKEY);
+		else
+			(void)fprintf(stderr,
+			    "%zu: seq (%s) failed\n", lineno, sflags(flags));
+#undef	NOSUCHKEY
+		break;
+	}
+}
+
+static void
+dump(DB *dbp, int rev)
+{
+	DBT key, data;
+	int xflags, nflags;
+
+	if (rev) {
+		xflags = R_LAST;
+		nflags = R_PREV;
+	} else {
+		xflags = R_FIRST;
+		nflags = R_NEXT;
+	}
+	for (;; xflags = nflags)
+		switch (dbp->seq(dbp, &key, &data, xflags)) {
+		case 0:
+			(void)write(ofd, data.data, data.size);
+			if (ofd == STDOUT_FILENO)
+				(void)write(ofd, "\n", 1);
+			break;
+		case 1:
+			goto done;
+		case -1:
+			err(1, "line %zu: (dump) seq failed", lineno);
+			/* NOTREACHED */
+		}
+done:	return;
+}
+	
+static u_int
+setflags(char *s)
+{
+	char *p;
+
+	for (; isspace((unsigned char)*s); ++s);
+	if (*s == '\n' || *s == '\0')
+		return 0;
+	if ((p = strchr(s, '\n')) != NULL)
+		*p = '\0';
+	if (!strcmp(s, "R_CURSOR"))		return R_CURSOR;
+	if (!strcmp(s, "R_FIRST"))		return R_FIRST;
+	if (!strcmp(s, "R_IAFTER")) 		return R_IAFTER;
+	if (!strcmp(s, "R_IBEFORE")) 		return R_IBEFORE;
+	if (!strcmp(s, "R_LAST")) 		return R_LAST;
+	if (!strcmp(s, "R_NEXT")) 		return R_NEXT;
+	if (!strcmp(s, "R_NOOVERWRITE"))	return R_NOOVERWRITE;
+	if (!strcmp(s, "R_PREV"))		return R_PREV;
+	if (!strcmp(s, "R_SETCURSOR"))		return R_SETCURSOR;
+
+	errx(1, "line %zu: %s: unknown flag", lineno, s);
+	/* NOTREACHED */
+}
+
+static const char *
+sflags(int xflags)
+{
+	switch (xflags) {
+	case R_CURSOR:		return "R_CURSOR";
+	case R_FIRST:		return "R_FIRST";
+	case R_IAFTER:		return "R_IAFTER";
+	case R_IBEFORE:		return "R_IBEFORE";
+	case R_LAST:		return "R_LAST";
+	case R_NEXT:		return "R_NEXT";
+	case R_NOOVERWRITE:	return "R_NOOVERWRITE";
+	case R_PREV:		return "R_PREV";
+	case R_SETCURSOR:	return "R_SETCURSOR";
+	}
+
+	return "UNKNOWN!";
+}
+	
+static DBTYPE
+dbtype(const char *s)
+{
+	if (!strcmp(s, "btree"))
+		return DB_BTREE;
+	if (!strcmp(s, "hash"))
+		return DB_HASH;
+	if (!strcmp(s, "recno"))
+		return DB_RECNO;
+	errx(1, "%s: unknown type (use btree, hash or recno)", s);
+	/* NOTREACHED */
+}
+
+static void *
+setinfo(DBTYPE dtype, char *s)
+{
+	static BTREEINFO ib;
+	static HASHINFO ih;
+	static RECNOINFO rh;
+	char *eq;
+
+	if ((eq = strchr(s, '=')) == NULL)
+		errx(1, "%s: illegal structure set statement", s);
+	*eq++ = '\0';
+	if (!isdigit((unsigned char)*eq))
+		errx(1, "%s: structure set statement must be a number", s);
+		
+	switch (dtype) {
+	case DB_BTREE:
+		if (!strcmp("flags", s)) {
+			ib.flags = atoi(eq);
+			return &ib;
+		}
+		if (!strcmp("cachesize", s)) {
+			ib.cachesize = atoi(eq);
+			return &ib;
+		}
+		if (!strcmp("maxkeypage", s)) {
+			ib.maxkeypage = atoi(eq);
+			return &ib;
+		}
+		if (!strcmp("minkeypage", s)) {
+			ib.minkeypage = atoi(eq);
+			return &ib;
+		}
+		if (!strcmp("lorder", s)) {
+			ib.lorder = atoi(eq);
+			return &ib;
+		}
+		if (!strcmp("psize", s)) {
+			ib.psize = atoi(eq);
+			return &ib;
+		}
+		break;
+	case DB_HASH:
+		if (!strcmp("bsize", s)) {
+			ih.bsize = atoi(eq);
+			return &ih;
+		}
+		if (!strcmp("ffactor", s)) {
+			ih.ffactor = atoi(eq);
+			return &ih;
+		}
+		if (!strcmp("nelem", s)) {
+			ih.nelem = atoi(eq);
+			return &ih;
+		}
+		if (!strcmp("cachesize", s)) {
+			ih.cachesize = atoi(eq);
+			return &ih;
+		}
+		if (!strcmp("lorder", s)) {
+			ih.lorder = atoi(eq);
+			return &ih;
+		}
+		break;
+	case DB_RECNO:
+		if (!strcmp("flags", s)) {
+			rh.flags = atoi(eq);
+			return &rh;
+		}
+		if (!strcmp("cachesize", s)) {
+			rh.cachesize = atoi(eq);
+			return &rh;
+		}
+		if (!strcmp("lorder", s)) {
+			rh.lorder = atoi(eq);
+			return &rh;
+		}
+		if (!strcmp("reclen", s)) {
+			rh.reclen = atoi(eq);
+			return &rh;
+		}
+		if (!strcmp("bval", s)) {
+			rh.bval = atoi(eq);
+			return &rh;
+		}
+		if (!strcmp("psize", s)) {
+			rh.psize = atoi(eq);
+			return &rh;
+		}
+		break;
+	}
+	errx(1, "%s: unknown structure value", s);
+	/* NOTREACHED */
+}
+
+static void *
+rfile(char *name, size_t *lenp)
+{
+	struct stat sb;
+	void *p;
+	int fd;
+	char *np;
+
+	for (; isspace((unsigned char)*name); ++name)
+		continue;
+	if ((np = strchr(name, '\n')) != NULL)
+		*np = '\0';
+	if ((fd = open(name, O_RDONLY, 0)) == -1 || fstat(fd, &sb) == -1)
+		err(1, "Cannot open `%s'", name);
+#ifdef NOT_PORTABLE
+	if (sb.st_size > (off_t)SIZE_T_MAX) {
+		errno = E2BIG;
+		err("Cannot process `%s'", name);
+	}
+#endif
+	if ((p = malloc((size_t)sb.st_size)) == NULL)
+		err(1, "Cannot allocate %zu bytes", (size_t)sb.st_size);
+	if (read(fd, p, (ssize_t)sb.st_size) != (ssize_t)sb.st_size)
+		err(1, "read failed");
+	*lenp = (size_t)sb.st_size;
+	(void)close(fd);
+	return p;
+}
+
+static void *
+xcopy(void *text, size_t len)
+{
+	void *p;
+
+	if ((p = malloc(len)) == NULL)
+		err(1, "Cannot allocate %zu bytes", len);
+	(void)memmove(p, text, len);
+	return p;
+}
+
+static void
+chkcmd(enum S state)
+{
+	if (state != COMMAND)
+		errx(1, "line %zu: not expecting command", lineno);
+}
+
+static void
+chkdata(enum S state)
+{
+	if (state != DATA)
+		errx(1, "line %zu: not expecting data", lineno);
+}
+
+static void
+chkkey(enum S state)
+{
+	if (state != KEY)
+		errx(1, "line %zu: not expecting a key", lineno);
+}
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr,
+	    "Usage: %s [-l] [-f file] [-i info] [-o file] type script\n",
+	    getprogname());
+	exit(1);
+}
diff --git a/contrib/netbsd-tests/lib/libc/db/t_db.sh b/contrib/netbsd-tests/lib/libc/db/t_db.sh
new file mode 100755
index 000000000000..52244e3ca5a6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/db/t_db.sh
@@ -0,0 +1,920 @@
+# $NetBSD: t_db.sh,v 1.4 2013/07/29 10:43:15 skrll Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+prog()
+{
+	echo $(atf_get_srcdir)/h_db
+}
+
+dict()
+{
+	if [ -f /usr/share/dict/words ]; then
+		echo /usr/share/dict/words
+	elif [ -f /usr/dict/words ]; then
+		echo /usr/dict/words
+	else
+		atf_fail "no dictionary found"
+	fi
+}
+
+SEVEN_SEVEN="abcdefg|abcdefg|abcdefg|abcdefg|abcdefg|abcdefg|abcdefg"
+
+atf_test_case small_btree
+small_btree_head()
+{
+	atf_set "descr" \
+		"Checks btree database using small keys and small data" \
+		"pairs: takes the first hundred entries in the dictionary," \
+		"and makes them be key/data pairs."
+}
+small_btree_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	sed 200q $(dict) >exp
+
+	for i in `sed 200q $(dict)`; do
+		echo p
+		echo k$i
+		echo d$i
+		echo g
+		echo k$i
+	done >in
+
+	atf_check -o file:exp "$(prog)" btree in
+}
+
+atf_test_case small_hash
+small_hash_head()
+{
+	atf_set "descr" \
+		"Checks hash database using small keys and small data" \
+		"pairs: takes the first hundred entries in the dictionary," \
+		"and makes them be key/data pairs."
+}
+small_hash_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	sed 200q $(dict) >exp
+
+	for i in `sed 200q $(dict)`; do
+		echo p
+		echo k$i
+		echo d$i
+		echo g
+		echo k$i
+	done >in
+
+	atf_check -o file:exp "$(prog)" hash in
+}
+
+atf_test_case small_recno
+small_recno_head()
+{
+	atf_set "descr" \
+		"Checks recno database using small keys and small data" \
+		"pairs: takes the first hundred entries in the dictionary," \
+		"and makes them be key/data pairs."
+}
+small_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	sed 200q $(dict) >exp
+
+	sed 200q $(dict) |
+	awk '{ 
+		++i;
+		printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
+	}' >in
+
+	atf_check -o file:exp "$(prog)" recno in
+}
+
+atf_test_case medium_btree
+medium_btree_head()
+{
+	atf_set "descr" \
+		"Checks btree database using small keys and medium" \
+		"data pairs: takes the first 200 entries in the" \
+		"dictionary, and gives them each a medium size data entry."
+}
+medium_btree_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+	echo $mdata |
+	awk '{ for (i = 1; i < 201; ++i) print $0 }' >exp
+
+	for i in $(sed 200q $(dict)); do
+		echo p
+		echo k$i
+		echo d$mdata
+		echo g
+		echo k$i
+	done >in
+
+	atf_check -o file:exp "$(prog)" btree in
+}
+
+atf_test_case medium_hash
+medium_hash_head()
+{
+	atf_set "descr" \
+		"Checks hash database using small keys and medium" \
+		"data pairs: takes the first 200 entries in the" \
+		"dictionary, and gives them each a medium size data entry."
+}
+medium_hash_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+	echo $mdata |
+	awk '{ for (i = 1; i < 201; ++i) print $0 }' >exp
+
+	for i in $(sed 200q $(dict)); do
+		echo p
+		echo k$i
+		echo d$mdata
+		echo g
+		echo k$i
+	done >in
+
+	atf_check -o file:exp "$(prog)" hash in
+}
+
+atf_test_case medium_recno
+medium_recno_head()
+{
+	atf_set "descr" \
+		"Checks recno database using small keys and medium" \
+		"data pairs: takes the first 200 entries in the" \
+		"dictionary, and gives them each a medium size data entry."
+}
+medium_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
+	echo $mdata |
+	awk '{ for (i = 1; i < 201; ++i) print $0 }' >exp
+
+	echo $mdata | 
+	awk '{  for (i = 1; i < 201; ++i)
+		printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
+	}' >in
+
+	atf_check -o file:exp "$(prog)" recno in
+}
+
+atf_test_case big_btree
+big_btree_head()
+{
+	atf_set "descr" \
+		"Checks btree database using small keys and big data" \
+		"pairs: inserts the programs in /bin with their paths" \
+		"as their keys."
+}
+big_btree_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	(find /bin -type f -print | xargs cat) >exp
+
+	for psize in 512 16384 65536; do
+		echo "checking page size: $psize"
+
+		for i in `find /bin -type f -print`; do
+			echo p
+			echo k$i
+			echo D$i
+			echo g
+			echo k$i
+		done >in
+
+		atf_check "$(prog)" -o out btree in
+		cmp -s exp out || atf_fail "test failed for page size: $psize"
+	done
+}
+
+atf_test_case big_hash
+big_hash_head()
+{
+	atf_set "descr" \
+		"Checks hash database using small keys and big data" \
+		"pairs: inserts the programs in /bin with their paths" \
+		"as their keys."
+}
+big_hash_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	(find /bin -type f -print | xargs cat) >exp
+
+	for i in `find /bin -type f -print`; do
+		echo p
+		echo k$i
+		echo D$i
+		echo g
+		echo k$i
+	done >in
+
+	atf_check "$(prog)" -o out hash in
+	cmp -s exp out || atf_fail "test failed"
+}
+
+atf_test_case big_recno
+big_recno_head()
+{
+	atf_set "descr" \
+		"Checks recno database using small keys and big data" \
+		"pairs: inserts the programs in /bin with their paths" \
+		"as their keys."
+}
+big_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	(find /bin -type f -print | xargs cat) >exp
+
+	find /bin -type f -print | 
+	awk '{
+		++i;
+		printf("p\nk%d\nD%s\ng\nk%d\n", i, $0, i);
+	}' >in
+
+	for psize in 512 16384 65536; do
+		echo "checking page size: $psize"
+
+		atf_check "$(prog)" -o out recno in
+		cmp -s exp out || atf_fail "test failed for page size: $psize"
+	done
+}
+
+atf_test_case random_recno
+random_recno_head()
+{
+	atf_set "descr" "Checks recno database using random entries"
+}
+random_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 37; i <= 37 + 88 * 17; i += 17) {
+			if (i % 41)
+				s = substr($0, 1, i % 41);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		for (i = 1; i <= 15; ++i) {
+			if (i % 41)
+				s = substr($0, 1, i % 41);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		for (i = 19234; i <= 19234 + 61 * 27; i += 27) {
+			if (i % 41)
+				s = substr($0, 1, i % 41);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		exit
+	}' >exp
+
+	cat exp |
+	awk 'BEGIN {
+			i = 37;
+			incr = 17;
+		}
+		{
+			printf("p\nk%d\nd%s\n", i, $0);
+			if (i == 19234 + 61 * 27)
+				exit;
+			if (i == 37 + 88 * 17) {
+				i = 1;
+				incr = 1;
+			} else if (i == 15) {
+				i = 19234;
+				incr = 27;
+			} else
+				i += incr;
+		}
+		END {
+			for (i = 37; i <= 37 + 88 * 17; i += 17)
+				printf("g\nk%d\n", i);
+			for (i = 1; i <= 15; ++i)
+				printf("g\nk%d\n", i);
+			for (i = 19234; i <= 19234 + 61 * 27; i += 27)
+				printf("g\nk%d\n", i);
+		}' >in
+
+	atf_check -o file:exp "$(prog)" recno in
+}
+
+atf_test_case reverse_recno
+reverse_recno_head()
+{
+	atf_set "descr" "Checks recno database using reverse order entries"
+}
+reverse_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk ' {
+		for (i = 1500; i; --i) {
+			if (i % 34)
+				s = substr($0, 1, i % 34);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		exit;
+	}' >exp
+
+	cat exp |
+	awk 'BEGIN {
+			i = 1500;
+		}
+		{
+			printf("p\nk%d\nd%s\n", i, $0);
+			--i;
+		}
+		END {
+			for (i = 1500; i; --i) 
+				printf("g\nk%d\n", i);
+		}' >in
+
+	atf_check -o file:exp "$(prog)" recno in
+}
+		
+atf_test_case alternate_recno
+alternate_recno_head()
+{
+	atf_set "descr" "Checks recno database using alternating order entries"
+}
+alternate_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk ' {
+		for (i = 1; i < 1200; i += 2) {
+			if (i % 34)
+				s = substr($0, 1, i % 34);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		for (i = 2; i < 1200; i += 2) {
+			if (i % 34)
+				s = substr($0, 1, i % 34);
+			else
+				s = substr($0, 1);
+			printf("input key %d: %s\n", i, s);
+		}
+		exit;
+	}' >exp
+
+	cat exp |
+	awk 'BEGIN {
+			i = 1;
+			even = 0;
+		}
+		{
+			printf("p\nk%d\nd%s\n", i, $0);
+			i += 2;
+			if (i >= 1200) {
+				if (even == 1)
+					exit;
+				even = 1;
+				i = 2;
+			}
+		}
+		END {
+			for (i = 1; i < 1200; ++i) 
+				printf("g\nk%d\n", i);
+		}' >in
+
+	atf_check "$(prog)" -o out recno in
+	
+	sort -o exp exp
+	sort -o out out
+
+	cmp -s exp out || atf_fail "test failed"
+}
+
+h_delete()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	type=$1
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 1; i <= 120; ++i)
+			printf("%05d: input key %d: %s\n", i, i, $0);
+	}' >exp
+
+	cat exp |
+	awk '{
+		printf("p\nk%d\nd%s\n", ++i, $0);
+	}
+	END {
+		printf("fR_NEXT\n");
+		for (i = 1; i <= 120; ++i)
+			printf("s\n");
+		printf("fR_CURSOR\ns\nkXX\n");
+		printf("r\n");
+		printf("fR_NEXT\ns\n");
+		printf("fR_CURSOR\ns\nk1\n");
+		printf("r\n");
+		printf("fR_FIRST\ns\n");
+	}' >in
+
+	# For btree, the records are ordered by the string representation
+	# of the key value.  So sort the expected output file accordingly,
+	# and set the seek_last key to the last expected key value.
+
+	if [ "$type" = "btree" ] ; then
+		sed -e 's/kXX/k99/' < in > tmp
+		mv tmp in
+		sort -d -k4 < exp > tmp
+		mv tmp exp
+		echo $SEVEN_SEVEN |
+		awk '{
+			printf("%05d: input key %d: %s\n", 99, 99, $0);
+			printf("seq failed, no such key\n");
+			printf("%05d: input key %d: %s\n", 1, 1, $0);
+			printf("%05d: input key %d: %s\n", 10, 10, $0);
+			exit;
+		}' >> exp
+	else
+	# For recno, records are ordered by numerical key value.  No sort
+	# is needed, but still need to set proper seek_last key value.
+		sed -e 's/kXX/k120/' < in > tmp
+		mv tmp in
+		echo $SEVEN_SEVEN |
+		awk '{
+			printf("%05d: input key %d: %s\n", 120, 120, $0);
+			printf("seq failed, no such key\n");
+			printf("%05d: input key %d: %s\n", 1, 1, $0);
+			printf("%05d: input key %d: %s\n", 2, 2, $0);
+			exit;
+		}' >> exp
+	fi
+
+	atf_check "$(prog)" -o out $type in
+	atf_check -o file:exp cat out
+}
+
+atf_test_case delete_btree
+delete_btree_head()
+{
+	atf_set "descr" "Checks removing records in btree database"
+}
+delete_btree_body()
+{
+	h_delete btree
+}
+
+atf_test_case delete_recno
+delete_recno_head()
+{
+	atf_set "descr" "Checks removing records in recno database"
+}
+delete_recno_body()
+{
+	h_delete recno
+}
+
+h_repeated()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo "" | 
+	awk 'BEGIN {
+		for (i = 1; i <= 10; ++i) {
+			printf("p\nkkey1\nD/bin/sh\n");
+			printf("p\nkkey2\nD/bin/csh\n");
+			if (i % 8 == 0) {
+				printf("c\nkkey2\nD/bin/csh\n");
+				printf("c\nkkey1\nD/bin/sh\n");
+				printf("e\t%d of 10 (comparison)\n", i);
+			} else
+				printf("e\t%d of 10             \n", i);
+			printf("r\nkkey1\nr\nkkey2\n");
+		}
+	}' >in
+
+	$(prog) btree in
+}
+
+atf_test_case repeated_btree
+repeated_btree_head()
+{
+	atf_set "descr" \
+		"Checks btree database with repeated small keys and" \
+		"big data pairs. Makes sure that overflow pages are reused"
+}
+repeated_btree_body()
+{
+	h_repeated btree
+}
+
+atf_test_case repeated_hash
+repeated_hash_head()
+{
+	atf_set "descr" \
+		"Checks hash database with repeated small keys and" \
+		"big data pairs. Makes sure that overflow pages are reused"
+}
+repeated_hash_body()
+{
+	h_repeated hash
+}
+
+atf_test_case duplicate_btree
+duplicate_btree_head()
+{
+	atf_set "descr" "Checks btree database with duplicate keys"
+}
+duplicate_btree_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 1; i <= 543; ++i)
+			printf("%05d: input key %d: %s\n", i, i, $0);
+		exit;
+	}' >exp
+
+	cat exp | 
+	awk '{
+		if (i++ % 2)
+			printf("p\nkduplicatekey\nd%s\n", $0);
+		else
+			printf("p\nkunique%dkey\nd%s\n", i, $0);
+	}
+	END {
+			printf("o\n");
+	}' >in
+
+	atf_check -o file:exp -x "$(prog) -iflags=1 btree in | sort"
+}
+
+h_cursor_flags()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	type=$1
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 1; i <= 20; ++i)
+			printf("%05d: input key %d: %s\n", i, i, $0);
+		exit;
+	}' >exp
+
+	# Test that R_CURSOR doesn't succeed before cursor initialized
+	cat exp |
+	awk '{
+		if (i == 10)
+			exit;
+		printf("p\nk%d\nd%s\n", ++i, $0);
+	}
+	END {
+		printf("fR_CURSOR\nr\n");
+		printf("eR_CURSOR SHOULD HAVE FAILED\n");
+	}' >in
+
+	atf_check -o ignore -e ignore -s ne:0 "$(prog)" -o out $type in
+	atf_check -s ne:0 test -s out
+
+	cat exp |
+	awk '{
+		if (i == 10)
+			exit;
+		printf("p\nk%d\nd%s\n", ++i, $0);
+	}
+	END {
+		printf("fR_CURSOR\np\nk1\ndsome data\n");
+		printf("eR_CURSOR SHOULD HAVE FAILED\n");
+	}' >in
+
+	atf_check -o ignore -e ignore -s ne:0 "$(prog)" -o out $type in
+	atf_check -s ne:0 test -s out
+}
+
+atf_test_case cursor_flags_btree
+cursor_flags_btree_head()
+{
+	atf_set "descr" \
+		"Checks use of cursor flags without initialization in btree database"
+}
+cursor_flags_btree_body()
+{
+	h_cursor_flags btree
+}
+
+atf_test_case cursor_flags_recno
+cursor_flags_recno_head()
+{
+	atf_set "descr" \
+		"Checks use of cursor flags without initialization in recno database"
+}
+cursor_flags_recno_body()
+{
+	h_cursor_flags recno
+}
+
+atf_test_case reverse_order_recno
+reverse_order_recno_head()
+{
+	atf_set "descr" "Checks reverse order inserts in recno database"
+}
+reverse_order_recno_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 1; i <= 779; ++i)
+			printf("%05d: input key %d: %s\n", i, i, $0);
+		exit;
+	}' >exp
+
+	cat exp |
+	awk '{
+		if (i == 0) {
+			i = 1;
+			printf("p\nk1\nd%s\n", $0);
+			printf("%s\n", "fR_IBEFORE");
+		} else
+			printf("p\nk1\nd%s\n", $0);
+	}
+	END {
+			printf("or\n");
+	}' >in
+
+	atf_check -o file:exp "$(prog)" recno in
+}
+
+atf_test_case small_page_btree
+small_page_btree_head()
+{
+	atf_set "descr" \
+		"Checks btree database with lots of keys and small page" \
+		"size: takes the first 20000 entries in the dictionary," \
+		"reverses them, and gives them each a small size data" \
+		"entry. Uses a small page size to make sure the btree" \
+		"split code gets hammered."
+}
+small_page_btree_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	mdata=abcdefghijklmnopqrstuvwxy
+	echo $mdata |
+	awk '{ for (i = 1; i < 20001; ++i) print $0 }' >exp
+
+	for i in `sed 20000q $(dict) | rev`; do
+		echo p
+		echo k$i
+		echo d$mdata
+		echo g
+		echo k$i
+	done >in
+
+	atf_check -o file:exp "$(prog)" -i psize=512 btree in
+}
+
+h_byte_orders()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	type=$1
+
+	sed 50q $(dict) >exp
+	for order in 1234 4321; do
+		for i in `sed 50q $(dict)`; do
+			echo p
+			echo k$i
+			echo d$i
+			echo g
+			echo k$i
+		done >in
+
+		atf_check -o file:exp "$(prog)" -ilorder=$order -f byte.file $type in
+
+		for i in `sed 50q $(dict)`; do
+			echo g
+			echo k$i
+		done >in
+
+		atf_check -o file:exp "$(prog)" -s -ilorder=$order -f byte.file $type in
+	done
+}
+
+atf_test_case byte_orders_btree
+byte_orders_btree_head()
+{
+	atf_set "descr" "Checks btree database using differing byte orders"
+}
+byte_orders_btree_body()
+{
+	h_byte_orders btree
+}
+
+atf_test_case byte_orders_hash
+byte_orders_hash_head()
+{
+	atf_set "descr" "Checks hash database using differing byte orders"
+}
+byte_orders_hash_body()
+{
+	h_byte_orders hash
+}
+
+h_bsize_ffactor()
+{
+	bsize=$1
+	ffactor=$2
+
+	echo "bucketsize $bsize, fill factor $ffactor"
+	atf_check -o file:exp "$(prog)" "-ibsize=$bsize,\
+ffactor=$ffactor,nelem=25000,cachesize=65536" hash in
+}
+
+atf_test_case bsize_ffactor
+bsize_ffactor_head()
+{
+	atf_set "timeout" "480"
+	atf_set "descr" "Checks hash database with various" \
+					"bucketsizes and fill factors"
+}
+bsize_ffactor_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	echo $SEVEN_SEVEN |
+	awk '{
+		for (i = 1; i <= 10000; ++i) {
+			if (i % 34)
+				s = substr($0, 1, i % 34);
+			else
+				s = substr($0, 1);
+			printf("%s\n", s);
+		}
+		exit;
+
+	}' >exp
+
+	sed 10000q $(dict) |
+	awk 'BEGIN {
+		ds="'$SEVEN_SEVEN'"
+	}
+	{
+		if (++i % 34)
+			s = substr(ds, 1, i % 34);
+		else
+			s = substr(ds, 1);
+		printf("p\nk%s\nd%s\n", $0, s);
+	}' >in
+
+	sed 10000q $(dict) |
+	awk '{
+		++i;
+		printf("g\nk%s\n", $0);
+	}' >>in
+
+	h_bsize_ffactor 256 11
+	h_bsize_ffactor 256 14
+	h_bsize_ffactor 256 21
+
+	h_bsize_ffactor 512 21
+	h_bsize_ffactor 512 28
+	h_bsize_ffactor 512 43
+
+	h_bsize_ffactor 1024 43
+	h_bsize_ffactor 1024 57
+	h_bsize_ffactor 1024 85
+
+	h_bsize_ffactor 2048 85
+	h_bsize_ffactor 2048 114
+	h_bsize_ffactor 2048 171
+
+	h_bsize_ffactor 4096 171
+	h_bsize_ffactor 4096 228
+	h_bsize_ffactor 4096 341
+
+	h_bsize_ffactor 8192 341
+	h_bsize_ffactor 8192 455
+	h_bsize_ffactor 8192 683
+}
+
+# FIXME: what does it test?
+atf_test_case four_char_hash
+four_char_hash_head()
+{
+	atf_set "descr" \
+		"Checks hash database with 4 char key and" \
+		"value insert on a 65536 bucket size"
+}
+four_char_hash_body()
+{
+	TMPDIR="$(pwd)/db_dir"; export TMPDIR
+	mkdir ${TMPDIR}
+
+	cat >in <<EOF
+p
+k1234
+d1234
+r
+k1234
+EOF
+
+	atf_check "$(prog)" -i bsize=65536 hash in
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case small_btree
+	atf_add_test_case small_hash
+	atf_add_test_case small_recno
+	atf_add_test_case medium_btree
+	atf_add_test_case medium_hash
+	atf_add_test_case medium_recno
+	atf_add_test_case big_btree
+	atf_add_test_case big_hash
+	atf_add_test_case big_recno
+	atf_add_test_case random_recno
+	atf_add_test_case reverse_recno
+	atf_add_test_case alternate_recno
+	atf_add_test_case delete_btree
+	atf_add_test_case delete_recno
+	atf_add_test_case repeated_btree
+	atf_add_test_case repeated_hash
+	atf_add_test_case duplicate_btree
+	atf_add_test_case cursor_flags_btree
+	atf_add_test_case cursor_flags_recno
+	atf_add_test_case reverse_order_recno
+	atf_add_test_case small_page_btree
+	atf_add_test_case byte_orders_btree
+	atf_add_test_case byte_orders_hash
+	atf_add_test_case bsize_ffactor
+	atf_add_test_case four_char_hash
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/execve/t_execve.c b/contrib/netbsd-tests/lib/libc/gen/execve/t_execve.c
new file mode 100644
index 000000000000..32de6e765780
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/execve/t_execve.c
@@ -0,0 +1,58 @@
+/*	$NetBSD: t_execve.c,v 1.1 2014/04/29 06:29:02 uebayasi Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <unistd.h>
+
+ATF_TC(t_execve_null);
+
+ATF_TC_HEAD(t_execve_null, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Tests an empty execve(2) executing");
+}
+
+ATF_TC_BODY(t_execve_null, tc)
+{
+	int err;
+
+	err = execve(NULL, NULL, NULL);
+	ATF_REQUIRE(err == -1);
+	ATF_REQUIRE(errno == EFAULT);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_execve_null);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/isqemu.h b/contrib/netbsd-tests/lib/libc/gen/isqemu.h
new file mode 100644
index 000000000000..7d73a227ce79
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/isqemu.h
@@ -0,0 +1,63 @@
+/*	$NetBSD: isqemu.h,v 1.3 2013/04/14 12:46:29 martin Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <stdbool.h>
+#include <string.h>
+#include <errno.h>
+#include <err.h>
+
+static __inline bool
+isQEMU(void) {
+#if defined(__i386__) || defined(__x86_64__)
+	char name[1024];
+	size_t len = sizeof(name);
+
+	if (sysctlbyname("machdep.cpu_brand", name, &len, NULL, 0) == -1) {
+		if (errno == ENOENT)
+			return false;
+		err(EXIT_FAILURE, "sysctl");
+	}
+	return strstr(name, "QEMU") != NULL;
+#else
+	return false;
+#endif
+}
+
+#ifdef TEST
+int
+main(void) {
+	return isQEMU();
+}
+#endif
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_fileactions.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_fileactions.c
new file mode 100644
index 000000000000..d92337074481
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_fileactions.c
@@ -0,0 +1,104 @@
+/* $NetBSD: h_fileactions.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#define BUFSIZE	16
+
+/*
+ * This checks (hardcoded) the assumptions that are setup from the
+ * main test program via posix spawn file actions.
+ * Program exits with EXIT_SUCCESS or EXIT_FAILURE accordingly
+ * (and does some stderr diagnostics in case of errors).
+ */
+int
+main(int argc, char **argv)
+{
+	int res = EXIT_SUCCESS;
+	char buf[BUFSIZE];
+	struct stat sb0, sb1;
+
+	strcpy(buf, "test...");
+	/* file desc 3 should be closed via addclose */
+	if (read(3, buf, BUFSIZE) != -1 || errno != EBADF) {
+		fprintf(stderr, "%s: filedesc 3 is not closed\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	/* file desc 4 should be closed via closeonexec */
+	if (read(4, buf, BUFSIZE) != -1 || errno != EBADF) {
+		fprintf(stderr, "%s: filedesc 4 is not closed\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	/* file desc 5 remains open */
+	if (write(5, buf, BUFSIZE) <= 0) {
+		fprintf(stderr, "%s: could not write to filedesc 5\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	/* file desc 6 should be open (via addopen) */
+	if (write(6, buf, BUFSIZE) <= 0) {
+		fprintf(stderr, "%s: could not write to filedesc 6\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	/* file desc 7 should refer to stdout */
+	fflush(stdout);
+	if (fstat(fileno(stdout), &sb0) != 0) {
+		fprintf(stderr, "%s: could not fstat stdout\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (fstat(7, &sb1) != 0) {
+		fprintf(stderr, "%s: could not fstat filedesc 7\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (write(7, buf, strlen(buf)) <= 0) {
+		fprintf(stderr, "%s: could not write to filedesc 7\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (memcmp(&sb0, &sb1, sizeof sb0) != 0) {
+		fprintf(stderr, "%s: stat results differ\n", getprogname());
+		res = EXIT_FAILURE;
+	}
+
+	return res;
+}
+
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_nonexec.sh b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_nonexec.sh
new file mode 100755
index 000000000000..deee6fe720f9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_nonexec.sh
@@ -0,0 +1,3 @@
+#! /nonexistent
+
+# this is just a dummy script, trying to be non-executable
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawn.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawn.c
new file mode 100644
index 000000000000..dbf5da5efa11
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawn.c
@@ -0,0 +1,50 @@
+/* $NetBSD: h_spawn.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(int argc, char **argv)
+{
+	unsigned long ret;
+	char *endp;
+
+	if (argc < 2) {
+		fprintf(stderr, "usage:\n\t%s (retcode)\n", getprogname());
+		exit(255);
+	}
+	ret = strtoul(argv[1], &endp, 10);
+
+	fprintf(stderr, "%s exiting with status %lu\n", getprogname(), ret);
+	return ret;
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawnattr.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawnattr.c
new file mode 100644
index 000000000000..1f13c54c9de0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/h_spawnattr.c
@@ -0,0 +1,90 @@
+/* $NetBSD: h_spawnattr.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+/*
+ * Helper to test the hardcoded assumptions from t_spawnattr.c
+ * Exit with apropriate exit status and print diagnostics to
+ * stderr explaining what is wrong.
+ */
+int
+main(int argc, char **argv)
+{
+	int parent_pipe, res = EXIT_SUCCESS;
+	sigset_t sig;
+	struct sigaction act;
+	ssize_t rd;
+	char tmp;
+
+	sigemptyset(&sig);
+	if (sigprocmask(0, NULL, &sig) < 0) {
+		fprintf(stderr, "%s: sigprocmask error\n", getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (!sigismember(&sig, SIGUSR1)) {
+		fprintf(stderr, "%s: SIGUSR not in procmask\n", getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (sigaction(SIGUSR1, NULL, &act) < 0) {
+		fprintf(stderr, "%s: sigaction error\n", getprogname());
+		res = EXIT_FAILURE;
+	}
+	if (act.sa_sigaction != (void *)SIG_DFL) {
+		fprintf(stderr, "%s: SIGUSR1 action != SIG_DFL\n",
+		    getprogname());
+		res = EXIT_FAILURE;
+	}
+
+	if (argc >= 2) {
+		parent_pipe = atoi(argv[1]);
+		if (parent_pipe > 2) {
+			printf("%s: waiting for command from parent on pipe "
+			    "%d\n", getprogname(), parent_pipe);
+			rd = read(parent_pipe, &tmp, 1);
+			if (rd == 1) {
+				printf("%s: got command %c from parent\n",
+				    getprogname(), tmp);
+			} else if (rd == -1) {
+				printf("%s: %d is no pipe, errno %d\n",
+				    getprogname(), parent_pipe, errno);
+				res = EXIT_FAILURE;
+			}
+		}
+	}
+
+	return res;
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c
new file mode 100644
index 000000000000..1cf643365c3f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c
@@ -0,0 +1,385 @@
+/* $NetBSD: t_fileactions.c,v 1.5 2012/04/09 19:42:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <spawn.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+
+ATF_TC(t_spawn_openmode);
+
+ATF_TC_HEAD(t_spawn_openmode, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the proper handling of 'mode' for 'open' fileactions");
+	atf_tc_set_md_var(tc, "require.progs", "/bin/cat");
+}
+
+static off_t
+filesize(const char * restrict fname)
+{
+	struct stat st;
+	int err;
+
+	err = stat(fname, &st);
+	ATF_REQUIRE(err == 0);
+	return st.st_size;
+}
+
+#define TESTFILE	"./the_input_data"
+#define CHECKFILE	"./the_output_data"
+#define TESTCONTENT	"marry has a little lamb"
+
+static void
+make_testfile(const char *restrict file)
+{
+	FILE *f;
+	size_t written;
+
+	f = fopen(file, "w");
+	ATF_REQUIRE(f != NULL);
+	written = fwrite(TESTCONTENT, 1, strlen(TESTCONTENT), f);
+	fclose(f);
+	ATF_REQUIRE(written == strlen(TESTCONTENT));
+}
+
+static void
+empty_outfile(const char *restrict filename)
+{
+	FILE *f;
+
+	f = fopen(filename, "w");
+	ATF_REQUIRE(f != NULL);
+	fclose(f);
+}
+
+ATF_TC_BODY(t_spawn_openmode, tc)
+{
+	int status, err;
+	pid_t pid;
+	size_t insize, outsize;
+	char * const args[2] = { __UNCONST("cat"), NULL };
+	posix_spawn_file_actions_t fa;
+
+	/*
+	 * try a "cat < testfile > checkfile"
+	 */
+	make_testfile(TESTFILE);
+	unlink(CHECKFILE);
+
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdin),
+	    TESTFILE, O_RDONLY, 0);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdout),
+	    CHECKFILE, O_WRONLY|O_CREAT, 0600);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	/* ok, wait for the child to finish */
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+
+	/* now check that input and output have the same size */
+	insize = filesize(TESTFILE);
+	outsize = filesize(CHECKFILE);
+	ATF_REQUIRE(insize == strlen(TESTCONTENT));
+	ATF_REQUIRE(insize == outsize);
+
+	/*
+	 * try a "cat < testfile >> checkfile"
+	 */
+	make_testfile(TESTFILE);
+	make_testfile(CHECKFILE);
+
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdin),
+	    TESTFILE, O_RDONLY, 0);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdout),
+	    CHECKFILE, O_WRONLY|O_APPEND, 0);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	/* ok, wait for the child to finish */
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+
+	/* now check that output is twice as long as input */
+	insize = filesize(TESTFILE);
+	outsize = filesize(CHECKFILE);
+	ATF_REQUIRE(insize == strlen(TESTCONTENT));
+	ATF_REQUIRE(insize*2 == outsize);
+
+	/*
+	 * try a "cat < testfile  > checkfile" with input and output swapped
+	 */
+	make_testfile(TESTFILE);
+	empty_outfile(CHECKFILE);
+
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdout),
+	    TESTFILE, O_RDONLY, 0);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdin),
+	    CHECKFILE, O_WRONLY, 0);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	/* ok, wait for the child to finish */
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_FAILURE);
+
+	/* now check that input and output are still the same size */
+	insize = filesize(TESTFILE);
+	outsize = filesize(CHECKFILE);
+	ATF_REQUIRE(insize == strlen(TESTCONTENT));
+	ATF_REQUIRE(outsize == 0);
+}
+
+ATF_TC(t_spawn_reopen);
+
+ATF_TC_HEAD(t_spawn_reopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "an open filehandle can be replaced by a 'open' fileaction");
+	atf_tc_set_md_var(tc, "require.progs", "/bin/cat");
+}
+
+ATF_TC_BODY(t_spawn_reopen, tc)
+{
+	int status, err;
+	pid_t pid;
+	char * const args[2] = { __UNCONST("cat"), NULL };
+	posix_spawn_file_actions_t fa;
+
+	/*
+	 * make sure stdin is open in the parent
+	 */
+	freopen("/dev/zero", "r", stdin);
+	/*
+	 * now request an open for this fd again in the child
+	 */
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, fileno(stdin),
+	    "/dev/null", O_RDONLY, 0);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+}
+
+ATF_TC(t_spawn_open_nonexistent);
+
+ATF_TC_HEAD(t_spawn_open_nonexistent, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn fails when a file to open does not exist");
+	atf_tc_set_md_var(tc, "require.progs", "/bin/cat");
+}
+
+ATF_TC_BODY(t_spawn_open_nonexistent, tc)
+{
+	int err, status;
+	pid_t pid;
+	char * const args[2] = { __UNCONST("cat"), NULL };
+	posix_spawn_file_actions_t fa;
+
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, STDIN_FILENO,
+	    "./non/ex/ist/ent", O_RDONLY, 0);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	if (err == 0) {
+		/*
+		 * The child has been created - it should fail and
+		 * return exit code 127
+		 */
+		waitpid(pid, &status, 0);
+		ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 127);
+	} else {
+		/*
+		 * The error has been noticed early enough, no child has
+		 * been run
+		 */
+		ATF_REQUIRE(err == ENOENT);
+	}
+	posix_spawn_file_actions_destroy(&fa);
+}
+
+ATF_TC(t_spawn_open_nonexistent_diag);
+
+ATF_TC_HEAD(t_spawn_open_nonexistent_diag, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn fails when a file to open does not exist "
+	    "and delivers proper diagnostic");
+	atf_tc_set_md_var(tc, "require.progs", "/bin/cat");
+}
+
+ATF_TC_BODY(t_spawn_open_nonexistent_diag, tc)
+{
+	int err;
+	pid_t pid;
+	char * const args[2] = { __UNCONST("cat"), NULL };
+	posix_spawnattr_t attr;
+	posix_spawn_file_actions_t fa;
+
+	posix_spawnattr_init(&attr);
+	/*
+	 * POSIX_SPAWN_RETURNERROR is a NetBSD specific flag that
+	 * will cause a "proper" return value from posix_spawn(2)
+	 * instead of a (potential) success there and a 127 exit
+	 * status from the child process (c.f. the non-diag variant
+	 * of this test).
+	 */
+	posix_spawnattr_setflags(&attr, POSIX_SPAWN_RETURNERROR);
+	posix_spawn_file_actions_init(&fa);
+	posix_spawn_file_actions_addopen(&fa, STDIN_FILENO,
+	    "./non/ex/ist/ent", O_RDONLY, 0);
+	err = posix_spawn(&pid, "/bin/cat", &fa, &attr, args, NULL);
+	ATF_REQUIRE(err == ENOENT);
+	posix_spawn_file_actions_destroy(&fa);
+	posix_spawnattr_destroy(&attr);
+}
+
+ATF_TC(t_spawn_fileactions);
+
+ATF_TC_HEAD(t_spawn_fileactions, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Tests various complex fileactions");
+}
+
+ATF_TC_BODY(t_spawn_fileactions, tc)
+{
+	int fd1, fd2, fd3, status, err;
+	pid_t pid;
+	char * const args[2] = { __UNCONST("h_fileactions"), NULL };
+	char helper[FILENAME_MAX];
+	posix_spawn_file_actions_t fa;
+
+	posix_spawn_file_actions_init(&fa);
+
+	closefrom(fileno(stderr)+1);
+
+	fd1 = open("/dev/null", O_RDONLY);
+	ATF_REQUIRE(fd1 == 3);
+
+	fd2 = open("/dev/null", O_WRONLY, O_CLOEXEC);
+	ATF_REQUIRE(fd2 == 4);
+
+	fd3 = open("/dev/null", O_WRONLY);
+	ATF_REQUIRE(fd3 == 5);
+
+	posix_spawn_file_actions_addclose(&fa, fd1);
+	posix_spawn_file_actions_addopen(&fa, 6, "/dev/null", O_RDWR, 0);
+	posix_spawn_file_actions_adddup2(&fa, 1, 7); 
+
+	snprintf(helper, sizeof helper, "%s/h_fileactions",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	err = posix_spawn(&pid, helper, &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+}
+
+ATF_TC(t_spawn_empty_fileactions);
+
+ATF_TC_HEAD(t_spawn_empty_fileactions, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn with empty fileactions (PR kern/46038)");
+	atf_tc_set_md_var(tc, "require.progs", "/bin/cat");
+}
+
+ATF_TC_BODY(t_spawn_empty_fileactions, tc)
+{
+	int status, err;
+	pid_t pid;
+	char * const args[2] = { __UNCONST("cat"), NULL };
+	posix_spawn_file_actions_t fa;
+	size_t insize, outsize;
+
+	/*
+	 * try a "cat < testfile > checkfile", but set up stdin/stdout
+	 * already in the parent and pass empty file actions to the child.
+	 */
+	make_testfile(TESTFILE);
+	unlink(CHECKFILE);
+
+	freopen(TESTFILE, "r", stdin);
+	freopen(CHECKFILE, "w", stdout);
+
+	posix_spawn_file_actions_init(&fa);
+	err = posix_spawn(&pid, "/bin/cat", &fa, NULL, args, NULL);
+	posix_spawn_file_actions_destroy(&fa);
+
+	ATF_REQUIRE(err == 0);
+
+	/* ok, wait for the child to finish */
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+
+	/* now check that input and output have the same size */
+	insize = filesize(TESTFILE);
+	outsize = filesize(CHECKFILE);
+	ATF_REQUIRE(insize == strlen(TESTCONTENT));
+	ATF_REQUIRE(insize == outsize);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_spawn_fileactions);
+	ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent);
+	ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent_diag);
+	ATF_TP_ADD_TC(tp, t_spawn_reopen);
+	ATF_TP_ADD_TC(tp, t_spawn_openmode);
+	ATF_TP_ADD_TC(tp, t_spawn_empty_fileactions);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c
new file mode 100644
index 000000000000..178374b863df
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c
@@ -0,0 +1,184 @@
+/* $NetBSD: t_spawn.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+
+#include <atf-c.h>
+#include <spawn.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/wait.h>
+
+ATF_TC(t_spawn_ls);
+
+ATF_TC_HEAD(t_spawn_ls, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Tests a simple posix_spawn executing /bin/ls");
+}
+
+ATF_TC_BODY(t_spawn_ls, tc)
+{
+	char * const args[] = { __UNCONST("ls"), __UNCONST("-la"), NULL };
+	int err;
+
+	err = posix_spawn(NULL, "/bin/ls", NULL, NULL, args, NULL);
+	ATF_REQUIRE(err == 0);
+}
+
+ATF_TC(t_spawnp_ls);
+
+ATF_TC_HEAD(t_spawnp_ls, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Tests a simple posix_spawnp executing ls via $PATH");
+}
+
+ATF_TC_BODY(t_spawnp_ls, tc)
+{
+	char * const args[] = { __UNCONST("ls"), __UNCONST("-la"), NULL };
+	int err;
+
+	err = posix_spawnp(NULL, "ls", NULL, NULL, args, NULL);
+	ATF_REQUIRE(err == 0);
+}
+
+ATF_TC(t_spawn_zero);
+
+ATF_TC_HEAD(t_spawn_zero, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn an invalid binary");
+}
+
+ATF_TC_BODY(t_spawn_zero, tc)
+{
+	char buf[FILENAME_MAX];
+	char * const args[] = { __UNCONST("h_zero"), NULL };
+	int err;
+
+	snprintf(buf, sizeof buf, "%s/h_zero", atf_tc_get_config_var(tc, "srcdir"));
+	err = posix_spawn(NULL, buf, NULL, NULL, args, NULL);
+	ATF_REQUIRE_MSG(err == ENOEXEC, "expected error %d, got %d when spawning %s", ENOEXEC, err, buf);
+}
+
+ATF_TC(t_spawn_missing);
+
+ATF_TC_HEAD(t_spawn_missing, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn a non existant binary");
+}
+
+ATF_TC_BODY(t_spawn_missing, tc)
+{
+	char buf[FILENAME_MAX];
+	char * const args[] = { __UNCONST("h_nonexist"), NULL };
+	int err;
+
+	snprintf(buf, sizeof buf, "%s/h_nonexist",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	err = posix_spawn(NULL, buf, NULL, NULL, args, NULL);
+	ATF_REQUIRE_MSG(err == ENOENT, "expected error %d, got %d when spawning %s", ENOENT, err, buf);
+}
+
+ATF_TC(t_spawn_nonexec);
+
+ATF_TC_HEAD(t_spawn_nonexec, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn a script with non existing interpreter");
+}
+
+ATF_TC_BODY(t_spawn_nonexec, tc)
+{
+	char buf[FILENAME_MAX];
+	char * const args[] = { __UNCONST("h_nonexec"), NULL };
+	int err;
+
+	snprintf(buf, sizeof buf, "%s/h_nonexec",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	err = posix_spawn(NULL, buf, NULL, NULL, args, NULL);
+	ATF_REQUIRE_MSG(err == ENOENT, "expected error %d, got %d when spawning %s", ENOENT, err, buf);
+}
+
+ATF_TC(t_spawn_child);
+
+ATF_TC_HEAD(t_spawn_child, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "posix_spawn a child and get it's return code");
+}
+
+ATF_TC_BODY(t_spawn_child, tc)
+{
+	char buf[FILENAME_MAX];
+	char * const args0[] = { __UNCONST("h_spawn"), __UNCONST("0"), NULL };
+	char * const args1[] = { __UNCONST("h_spawn"), __UNCONST("1"), NULL };
+	char * const args7[] = { __UNCONST("h_spawn"), __UNCONST("7"), NULL };
+	int err, status;
+	pid_t pid;
+
+	snprintf(buf, sizeof buf, "%s/h_spawn",
+	    atf_tc_get_config_var(tc, "srcdir"));
+
+	err = posix_spawn(&pid, buf, NULL, NULL, args0, NULL);
+	ATF_REQUIRE(err == 0);
+	ATF_REQUIRE(pid > 0);
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
+
+	err = posix_spawn(&pid, buf, NULL, NULL, args1, NULL);
+	ATF_REQUIRE(err == 0);
+	ATF_REQUIRE(pid > 0);
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 1);
+
+	err = posix_spawn(&pid, buf, NULL, NULL, args7, NULL);
+	ATF_REQUIRE(err == 0);
+	ATF_REQUIRE(pid > 0);
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 7);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_spawn_ls);
+	ATF_TP_ADD_TC(tp, t_spawnp_ls);
+	ATF_TP_ADD_TC(tp, t_spawn_zero);
+	ATF_TP_ADD_TC(tp, t_spawn_missing);
+	ATF_TP_ADD_TC(tp, t_spawn_nonexec);
+	ATF_TP_ADD_TC(tp, t_spawn_child);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
new file mode 100644
index 000000000000..eb99c41345c0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
@@ -0,0 +1,173 @@
+/* $NetBSD: t_spawnattr.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles Zhang <charles@NetBSD.org> and
+ * Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <signal.h>
+#include <spawn.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#define MAX(a, b)	(a) > (b) ? (a) : (b)
+#define MIN(a, b)	(a) > (b) ? (b) : (a)
+
+static int get_different_scheduler(void);
+static int get_different_priority(void);
+
+static int
+get_different_scheduler()
+{
+	int scheduler, max, min, new;
+
+	max = MAX(MAX(SCHED_FIFO, SCHED_OTHER), SCHED_RR);
+	min = MIN(MIN(SCHED_FIFO, SCHED_OTHER), SCHED_RR);
+
+	/* get current schedule policy */
+	scheduler = sched_getscheduler(0);
+					
+	/* new scheduler */
+	new = (scheduler + 1);
+	if (new > max)
+		new = min;
+								
+	return new;
+}
+
+static int
+get_different_priority()
+{
+	int scheduler, max, min, new, priority;
+	struct sched_param param;
+
+	/* get current schedule policy */
+	scheduler = sched_getscheduler(0);
+
+	max = sched_get_priority_max(scheduler);
+	min = sched_get_priority_min(scheduler);
+
+	sched_getparam(0, &param);
+	priority = param.sched_priority;
+	
+	/* new schedule policy */
+	new = (priority + 1);
+	if (new > max)
+		new = min;
+	
+	return new;
+}
+
+ATF_TC(t_spawnattr);
+
+ATF_TC_HEAD(t_spawnattr, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "descr",
+	    "Tests posix_spawn with scheduler attributes");
+}
+
+ATF_TC_BODY(t_spawnattr, tc)
+{
+	int pid, scheduler, child_scheduler, priority, status, err, pfd[2];
+	char helper_arg[128];
+	char * const args[] = { __UNCONST("h_spawnattr"), helper_arg, NULL };
+	struct sched_param sp, child_sp;
+	sigset_t sig;
+	posix_spawnattr_t attr;
+	char helper[FILENAME_MAX];
+
+	/*
+	 * create a pipe to controll the child
+	 */
+	err = pipe(pfd);
+	ATF_REQUIRE_MSG(err == 0, "could not create pipe, errno %d", errno);
+	sprintf(helper_arg, "%d", pfd[0]);
+
+	posix_spawnattr_init(&attr);
+
+	scheduler = get_different_scheduler();
+	priority = get_different_priority();
+	sp.sched_priority = priority;
+	
+	sigemptyset(&sig);
+	sigaddset(&sig, SIGUSR1);
+
+	posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSCHEDULER | 
+		POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETPGROUP |
+		POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF |
+		POSIX_SPAWN_SETSIGDEF); 
+	posix_spawnattr_setpgroup(&attr, 0);
+	posix_spawnattr_setschedparam(&attr, &sp);
+	posix_spawnattr_setschedpolicy(&attr, scheduler);
+	posix_spawnattr_setsigmask(&attr, &sig);
+	posix_spawnattr_setsigdefault(&attr, &sig);
+
+	sprintf(helper, "%s/h_spawnattr",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	err = posix_spawn(&pid, helper, NULL, &attr, args, NULL);
+	ATF_REQUIRE_MSG(err == 0, "error %d", err);
+
+	child_scheduler = sched_getscheduler(pid);
+	ATF_REQUIRE_MSG(scheduler == child_scheduler,
+	    "scheduler = %d, child_scheduler = %d, pid %d, errno %d",
+	    scheduler, child_scheduler, pid, errno);
+
+	sched_getparam(pid, &child_sp);
+	ATF_REQUIRE_MSG(child_sp.sched_priority == sp.sched_priority,
+	    "priority is: %d, but we requested: %d",
+	    child_sp.sched_priority, sp.sched_priority);
+
+	ATF_REQUIRE_MSG(pid == getpgid(pid), "child pid: %d, child pgid: %d",
+	    pid, getpgid(pid));
+
+	/* ready, let child go */
+	write(pfd[1], "q", 1);
+	close(pfd[0]);
+	close(pfd[1]);
+
+	/* wait and check result from child */
+	waitpid(pid, &status, 0);
+	ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
+
+	posix_spawnattr_destroy(&attr);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_spawnattr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_alarm.c b/contrib/netbsd-tests/lib/libc/gen/t_alarm.c
new file mode 100644
index 000000000000..d9e903d1e722
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_alarm.c
@@ -0,0 +1,150 @@
+/* $NetBSD: t_alarm.c,v 1.2 2011/05/10 06:58:17 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_alarm.c,v 1.2 2011/05/10 06:58:17 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+static bool	fail;
+static void	handler(int);
+
+static void
+handler(int signo)
+{
+
+	if (signo == SIGALRM)
+		fail = false;
+}
+
+ATF_TC(alarm_basic);
+ATF_TC_HEAD(alarm_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of alarm(3)");
+}
+
+ATF_TC_BODY(alarm_basic, tc)
+{
+
+	ATF_REQUIRE(signal(SIGALRM, handler) == 0);
+
+	fail = true;
+
+	(void)alarm(1);
+	(void)sleep(2);
+
+	if (fail != false)
+		atf_tc_fail("alarm(3) failed to deliver signal");
+}
+
+ATF_TC(alarm_fork);
+ATF_TC_HEAD(alarm_fork, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Does fork(2) clear a pending alarm?");
+}
+
+ATF_TC_BODY(alarm_fork, tc)
+{
+	unsigned int rv;
+	pid_t pid;
+	int sta;
+
+	/*
+	 * Any pending alarms should be
+	 * cleared in the child process.
+	 */
+	(void)alarm(60);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		rv = alarm(0);
+
+		if (rv != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)alarm(0);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("pending alarm was not cleared for child");
+}
+
+ATF_TC(alarm_previous);
+ATF_TC_HEAD(alarm_previous, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test return value from alarm(3)");
+}
+
+ATF_TC_BODY(alarm_previous, tc)
+{
+	unsigned int rv;
+
+	/*
+	 * See that alarm(3) returns the amount
+	 * left on the timer from the previous call.
+	*/
+	rv = alarm(60);
+
+	if (rv != 0)
+		goto fail;
+
+	rv = alarm(0);
+
+	if (rv < 50)
+		goto fail;
+
+	(void)alarm(0);
+
+	return;
+
+fail:
+	atf_tc_fail("invalid return value from alarm(3)");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, alarm_basic);
+	ATF_TP_ADD_TC(tp, alarm_fork);
+	ATF_TP_ADD_TC(tp, alarm_previous);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_assert.c b/contrib/netbsd-tests/lib/libc/gen/t_assert.c
new file mode 100644
index 000000000000..140417a38aa8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_assert.c
@@ -0,0 +1,132 @@
+/* $NetBSD: t_assert.c,v 1.2 2011/06/14 05:28:00 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_assert.c,v 1.2 2011/06/14 05:28:00 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <atf-c.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void		handler(int);
+
+static void
+handler(int signo)
+{
+	/* Nothing. */
+}
+
+ATF_TC(assert_false);
+ATF_TC_HEAD(assert_false, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that assert(3) works, #1");
+}
+
+ATF_TC_BODY(assert_false, tc)
+{
+	struct sigaction sa;
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)closefrom(0);
+		(void)memset(&sa, 0, sizeof(struct sigaction));
+
+		sa.sa_flags = 0;
+		sa.sa_handler = handler;
+
+		(void)sigemptyset(&sa.sa_mask);
+		(void)sigaction(SIGABRT, &sa, 0);
+
+		assert(1 == 1);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) != 0 || WIFEXITED(sta) == 0)
+		atf_tc_fail("assert(3) fired haphazardly");
+}
+
+ATF_TC(assert_true);
+ATF_TC_HEAD(assert_true, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that assert(3) works, #2");
+}
+
+ATF_TC_BODY(assert_true, tc)
+{
+	struct sigaction sa;
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)closefrom(0);
+		(void)memset(&sa, 0, sizeof(struct sigaction));
+
+		sa.sa_flags = 0;
+		sa.sa_handler = handler;
+
+		(void)sigemptyset(&sa.sa_mask);
+		(void)sigaction(SIGABRT, &sa, 0);
+
+		assert(1 == 2);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != SIGABRT)
+		atf_tc_fail("assert(3) did not fire");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, assert_false);
+	ATF_TP_ADD_TC(tp, assert_true);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_basedirname.c b/contrib/netbsd-tests/lib/libc/gen/t_basedirname.c
new file mode 100644
index 000000000000..6c82cb471c27
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_basedirname.c
@@ -0,0 +1,200 @@
+/*	$NetBSD: t_basedirname.c,v 1.2 2011/07/07 09:49:59 jruoho Exp $	*/
+
+/*
+ * Regression test for basename(3).
+ *
+ * Written by Jason R. Thorpe <thorpej@NetBSD.org>, Oct. 2002.
+ * Public domain.
+ */
+
+#include <atf-c.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgen.h>
+
+struct {
+	const char *input;
+	const char *output;
+} test_basename_table[] = {
+/*
+ * The following are taken from the "Sample Input and Output Strings
+ * for basename()" table in IEEE Std 1003.1-2001.
+ */
+	{ "/usr/lib",		"lib" },
+	{ "/usr/",		"usr" },
+	{ "/",			"/" },
+	{ "///",		"/" },
+	{ "//usr//lib//",	"lib" },
+/*
+ * IEEE Std 1003.1-2001:
+ *
+ *	If path is a null pointer or points to an empty string,
+ *	basename() shall return a pointer to the string "." .
+ */
+	{ "",			"." },
+	{ NULL,			"." },
+/*
+ * IEEE Std 1003.1-2001:
+ *
+ *	If the string is exactly "//", it is implementation-defined
+ *	whether "/" or "//" is returned.
+ *
+ * The NetBSD implementation returns "/".
+ */
+	{ "//",			"/" },
+
+	{ NULL,			NULL }
+};
+
+struct {
+	const char *input;
+	const char *output;
+} test_dirname_table[] = {
+/*
+ * The following are taken from the "Sample Input and Output Strings
+ * for dirname()" table in IEEE Std 1003.1-2001.
+ */
+	{ "/usr/lib",		"/usr" },
+	{ "/usr/",		"/" },
+	{ "usr",		"." },
+	{ "/",			"/" },
+	{ ".",			"." },
+	{ "..",			"." },
+/*
+ * IEEE Std 1003.1-2001:
+ *
+ *	If path is a null pointer or points to an empty string,
+ *	dirname() shall return a pointer to the string "." .
+ */
+	{ "",			"." },
+	{ NULL,			"." },
+/*
+ * IEEE Std 1003.1-2001:
+ *
+ *	Since the meaning of the leading "//" is implementation-defined,
+ *	dirname("//foo") may return either "//" or "/" (but nothing else).
+ *
+ * The NetBSD implementation returns "/".
+ */
+	{ "//foo",		"/" },
+/*
+ * Make sure the trailing slashes after the directory name component
+ * get trimmed.  The Std does not talk about this, but this is what
+ * Solaris 8's dirname(3) does.
+ */
+	{ "/usr///lib",		"/usr" },
+
+	{ NULL,			NULL }
+};
+
+ATF_TC(basename_posix);
+ATF_TC_HEAD(basename_posix, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test basename(3) with POSIX examples");
+}
+
+ATF_TC_BODY(basename_posix, tc)
+{
+	char testbuf[32], *base;
+	int i;
+
+	for (i = 0; test_basename_table[i].output != NULL; i++) {
+		if (test_basename_table[i].input != NULL) {
+			if (strlen(test_basename_table[i].input) >=
+			    sizeof(testbuf))
+				atf_tc_skip("Testbuf too small!");
+			strcpy(testbuf, test_basename_table[i].input);
+			base = basename(testbuf);
+		} else
+			base = basename(NULL);
+
+		/*
+		 * basename(3) is allowed to modify the input buffer.
+		 * However, that is considered hostile by some programs,
+		 * and so we elect to consider this an error.
+		 *
+		 * This is not a problem, as basename(3) is also allowed
+		 * to return a pointer to a statically-allocated buffer
+		 * (it is explicitly not required to be reentrant).
+		 */
+		if (test_basename_table[i].input != NULL &&
+		    strcmp(test_basename_table[i].input, testbuf) != 0) {
+			fprintf(stderr,
+			    "Input buffer for \"%s\" was modified\n",
+			    test_basename_table[i].input);
+			atf_tc_fail("Input buffer was modified.");
+		}
+
+		/* Make sure the result is correct. */
+		if (strcmp(test_basename_table[i].output, base) != 0) {
+			fprintf(stderr,
+			    "Input \"%s\", output \"%s\", expected \"%s\"\n",
+			    test_basename_table[i].input ==
+				NULL ? "(null)" : test_basename_table[i].input,
+			    base, test_basename_table[i].output);
+			atf_tc_fail("Output does not match expected value.");
+		}
+	}
+}
+
+
+ATF_TC(dirname_posix);
+ATF_TC_HEAD(dirname_posix, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test dirname(3) with POSIX examples");
+}
+
+ATF_TC_BODY(dirname_posix, tc)
+{
+	char testbuf[32], *base;
+	int i;
+
+	for (i = 0; test_dirname_table[i].output != NULL; i++) {
+		if (test_dirname_table[i].input != NULL) {
+			if (strlen(test_dirname_table[i].input) >=
+			    sizeof(testbuf))
+				atf_tc_skip("Testbuf too small!");
+			strcpy(testbuf, test_dirname_table[i].input);
+			base = dirname(testbuf);
+		} else
+			base = dirname(NULL);
+
+		/*
+		 * dirname(3) is allowed to modify the input buffer.
+		 * However, that is considered hostile by some programs,
+		 * and so we elect to consider this an error.
+		 *
+		 * This is not a problem, as dirname(3) is also allowed
+		 * to return a pointer to a statically-allocated buffer
+		 * (it is explicitly not required to be reentrant).
+		 */
+		if (test_dirname_table[i].input != NULL &&
+		    strcmp(test_dirname_table[i].input, testbuf) != 0) {
+			fprintf(stderr,
+			    "Input buffer for \"%s\" was modified\n",
+			    test_dirname_table[i].input);
+			atf_tc_fail("Input buffer was modified.");
+		}
+
+		/* Make sure the result is correct. */
+		if (strcmp(test_dirname_table[i].output, base) != 0) {
+			fprintf(stderr,
+			    "Input \"%s\", output \"%s\", expected \"%s\"\n",
+			    test_dirname_table[i].input ==
+				NULL ? "(null)" : test_dirname_table[i].input,
+			    base, test_dirname_table[i].output);
+			atf_tc_fail("Output does not match expected value.");
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, basename_posix);
+	ATF_TP_ADD_TC(tp, dirname_posix);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_closefrom.c b/contrib/netbsd-tests/lib/libc/gen/t_closefrom.c
new file mode 100644
index 000000000000..75ebabb75626
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_closefrom.c
@@ -0,0 +1,173 @@
+/* $NetBSD: t_closefrom.c,v 1.4 2011/05/11 08:11:36 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_closefrom.c,v 1.4 2011/05/11 08:11:36 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <unistd.h>
+
+static const char  path[] = "closefrom";
+
+ATF_TC_WITH_CLEANUP(closefrom_basic);
+ATF_TC_HEAD(closefrom_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of closefrom(3), #1");
+}
+
+ATF_TC_BODY(closefrom_basic, tc)
+{
+	int fd, cur1, cur2;
+
+	(void)closefrom(STDERR_FILENO + 1);
+
+	fd = open(path, O_RDONLY | O_CREAT, 0400);
+	ATF_REQUIRE(fd >= 0);
+
+	cur1 = fcntl(0, F_MAXFD);
+
+	ATF_REQUIRE(cur1 == STDERR_FILENO + 1);
+	ATF_REQUIRE(closefrom(cur1) == 0);
+
+	cur2 = fcntl(0, F_MAXFD);
+
+	ATF_REQUIRE(cur1 - 1 == cur2);
+	ATF_REQUIRE(close(fd) == -1);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(closefrom_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(closefrom_buffer);
+ATF_TC_HEAD(closefrom_buffer, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of closefrom(3), #2");
+}
+
+ATF_TC_BODY(closefrom_buffer, tc)
+{
+	int buf[16], cur, half;
+	size_t i;
+
+	/*
+	 * Open a buffer of descriptors, close the half of
+	 * these and verify that the result is consistent.
+	 */
+	ATF_REQUIRE(closefrom(STDERR_FILENO + 1) == 0);
+
+	cur = fcntl(0, F_MAXFD);
+	ATF_REQUIRE(cur == STDERR_FILENO);
+
+	for (i = 0; i < __arraycount(buf); i++) {
+		buf[i] = open(path, O_RDWR | O_CREAT, 0600);
+		ATF_REQUIRE(buf[i] >= 0);
+	}
+
+	cur = fcntl(0, F_MAXFD);
+	ATF_REQUIRE(cur == __arraycount(buf) + STDERR_FILENO);
+
+	half = STDERR_FILENO + __arraycount(buf) / 2;
+	ATF_REQUIRE(closefrom(half) == 0);
+
+	cur = fcntl(0, F_MAXFD);
+	ATF_REQUIRE(cur == half - 1);
+
+	for (i = 0; i < __arraycount(buf); i++)
+		(void)close(buf[i]);
+}
+
+ATF_TC_CLEANUP(closefrom_buffer, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(closefrom_err);
+ATF_TC_HEAD(closefrom_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from closefrom(3)");
+}
+
+ATF_TC_BODY(closefrom_err, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, closefrom(-INT_MAX) == -1);
+}
+
+ATF_TC(closefrom_one);
+ATF_TC_HEAD(closefrom_one, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test closefrom(1)");
+}
+
+ATF_TC_BODY(closefrom_one, tc)
+{
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (closefrom(1) != 0)
+			_exit(10);
+
+		_exit(fcntl(0, F_MAXFD));
+	}
+
+
+	(void)wait(&sta);
+
+	/*
+	 * STDIN_FILENO sould still be open; WEXITSTATUS(1) == 0.
+	 */
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != 0)
+		atf_tc_fail("not all descriptors were closed");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, closefrom_basic);
+	ATF_TP_ADD_TC(tp, closefrom_buffer);
+	ATF_TP_ADD_TC(tp, closefrom_err);
+	ATF_TP_ADD_TC(tp, closefrom_one);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c b/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c
new file mode 100644
index 000000000000..9eca03bae2b0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_cpuset.c
@@ -0,0 +1,114 @@
+/*	$NetBSD: t_cpuset.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cpuset.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $");
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdio.h>
+#include <sched.h>
+
+ATF_TC(cpuset_err);
+ATF_TC_HEAD(cpuset_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from cpuset(3)");
+}
+
+ATF_TC_BODY(cpuset_err, tc)
+{
+	cpuset_t *set;
+
+	set = cpuset_create();
+	ATF_REQUIRE(set != NULL);
+
+	ATF_CHECK(cpuset_set(-1, set) == -1);
+	ATF_CHECK(cpuset_clr(-1, set) == -1);
+	ATF_CHECK(cpuset_isset(-1, set) == -1);
+
+	ATF_CHECK(cpuset_set(INT_MAX, set) == -1);
+	ATF_CHECK(cpuset_clr(INT_MAX, set) == -1);
+	ATF_CHECK(cpuset_isset(INT_MAX, set) == -1);
+
+	cpuset_destroy(set);
+}
+
+ATF_TC(cpuset_set);
+ATF_TC_HEAD(cpuset_set, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cpuset_set(3)");
+}
+
+ATF_TC_BODY(cpuset_set, tc)
+{
+	cpuset_t *set;
+
+	set = cpuset_create();
+	ATF_REQUIRE(set != NULL);
+
+	ATF_REQUIRE(cpuset_set(0, set) == 0);
+	ATF_REQUIRE(cpuset_isset(0, set) > 0);
+	ATF_REQUIRE(cpuset_clr(0, set) == 0);
+	ATF_REQUIRE(cpuset_isset(0, set) == 0);
+
+	cpuset_destroy(set);
+}
+
+ATF_TC(cpuset_size);
+ATF_TC_HEAD(cpuset_size, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test puset_size(3)");
+}
+
+ATF_TC_BODY(cpuset_size, tc)
+{
+	cpuset_t *set;
+	size_t size;
+
+	set = cpuset_create();
+	ATF_REQUIRE(set != NULL);
+
+	size = cpuset_size(set);
+
+	ATF_CHECK(cpuset_set((size * 8) - 1, set) == 0);
+	ATF_CHECK(cpuset_set((size * 8) + 1, set) == -1);
+
+	cpuset_destroy(set);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cpuset_err);
+	ATF_TP_ADD_TC(tp, cpuset_set);
+	ATF_TP_ADD_TC(tp, cpuset_size);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_dir.c b/contrib/netbsd-tests/lib/libc/gen/t_dir.c
new file mode 100644
index 000000000000..81412c1ae898
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_dir.c
@@ -0,0 +1,165 @@
+/* $NetBSD: t_dir.c,v 1.6 2013/10/19 17:45:00 christos Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+
+ATF_TC(seekdir_basic);
+ATF_TC_HEAD(seekdir_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check telldir(3) and seekdir(3) "
+	    "for correct behavior (PR lib/24324)");
+}
+
+ATF_TC_BODY(seekdir_basic, tc)
+{
+	DIR *dp;
+	char *wasname;
+	struct dirent *entry;
+	long here;
+
+	mkdir("t", 0755);
+	creat("t/a", 0600);
+	creat("t/b", 0600);
+	creat("t/c", 0600);
+
+	dp = opendir("t");
+	if ( dp == NULL)
+		atf_tc_fail("Could not open temp directory.");
+
+	/* skip two for . and .. */
+	entry = readdir(dp);
+	entry = readdir(dp);
+
+	/* get first entry */
+	entry = readdir(dp);
+	here = telldir(dp);
+
+	/* get second entry */
+	entry = readdir(dp);
+	wasname = strdup(entry->d_name);
+	if (wasname == NULL)
+		atf_tc_fail("cannot allocate memory");
+
+	/* get third entry */
+	entry = readdir(dp);
+
+	/* try to return to the position after the first entry */
+	seekdir(dp, here);
+	entry = readdir(dp);
+
+	if (entry == NULL)
+		atf_tc_fail("entry 1 not found");
+	if (strcmp(entry->d_name, wasname) != 0)
+		atf_tc_fail("1st seekdir found wrong name");
+
+	/* try again, and throw in a telldir() for good measure */
+	seekdir(dp, here);
+	here = telldir(dp);
+	entry = readdir(dp);
+
+	if (entry == NULL)
+		atf_tc_fail("entry 2 not found");
+	if (strcmp(entry->d_name, wasname) != 0)
+		atf_tc_fail("2nd seekdir found wrong name");
+
+	/* One more time, to make sure that telldir() doesn't affect result */
+	seekdir(dp, here);
+	entry = readdir(dp);
+
+	if (entry == NULL)
+		atf_tc_fail("entry 3 not found");
+	if (strcmp(entry->d_name, wasname) != 0)
+		atf_tc_fail("3rd seekdir found wrong name");
+
+	closedir(dp);
+}
+
+ATF_TC(telldir_leak);
+ATF_TC_HEAD(telldir_leak, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Check telldir(3) for memory leakage (PR lib/24324)");
+}
+
+ATF_TC_BODY(telldir_leak, tc)
+{
+	DIR *dp;
+	char *memused;
+	int i;
+	int oktouse = 4096;
+
+	dp = opendir(".");
+	if (dp == NULL)
+		atf_tc_fail("Could not open current directory");
+
+	(void)telldir(dp);
+	memused = sbrk(0);
+	closedir(dp);
+
+	for (i = 0; i < 1000; i++) {
+		dp = opendir(".");
+		if (dp == NULL)
+			atf_tc_fail("Could not open current directory");
+
+		(void)telldir(dp);
+		closedir(dp);
+
+		if ((char *)sbrk(0) - memused > oktouse) {
+			(void)printf("Used %td extra bytes for %d telldir "
+			    "calls", ((char *)sbrk(0) - memused), i);
+			oktouse = (char *)sbrk(0) - memused;
+		}
+	}
+	if (oktouse > 4096) {
+		atf_tc_fail("Failure: leaked %d bytes", oktouse);
+	} else {
+		(void)printf("OK: used %td bytes\n", (char *)(sbrk(0))-memused);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, seekdir_basic);
+	ATF_TP_ADD_TC(tp, telldir_leak);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c b/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
new file mode 100644
index 000000000000..9561a3c22652
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
@@ -0,0 +1,136 @@
+/* $NetBSD: t_floatunditf.c,v 1.5 2014/02/02 08:16:22 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+#include <inttypes.h>
+#include <math.h>
+
+#ifdef __HAVE_LONG_DOUBLE
+static const struct {
+	uint64_t u64;
+	long double ld;
+} testcases[] = {
+	{ 0xffffffffffffffffULL, 0xf.fffffffffffffffp+60L },
+	{ 0xfffffffffffffffeULL, 0xf.ffffffffffffffep+60L },
+	{ 0xfffffffffffffffdULL, 0xf.ffffffffffffffdp+60L },
+	{ 0xfffffffffffffffcULL, 0xf.ffffffffffffffcp+60L },
+	{ 0x7fffffffffffffffULL, 0xf.ffffffffffffffep+59L },
+	{ 0x3fffffffffffffffULL, 0xf.ffffffffffffffcp+58L },
+	{ 0x1fffffffffffffffULL, 0xf.ffffffffffffff8p+57L },
+	{ 0xfffffffffffffffULL, 0xf.ffffffffffffffp+56L },
+	{ 0x7ffffffffffffffULL, 0xf.fffffffffffffep+55L },
+	{ 0x3ffffffffffffffULL, 0xf.fffffffffffffcp+54L },
+	{ 0x1ffffffffffffffULL, 0xf.fffffffffffff8p+53L },
+	{ 0xffffffffffffffULL, 0xf.fffffffffffffp+52L },
+	{ 0x7fffffffffffffULL, 0xf.ffffffffffffep+51L },
+	{ 0x3fffffffffffffULL, 0xf.ffffffffffffcp+50L },
+	{ 0x1fffffffffffffULL, 0xf.ffffffffffff8p+49L },
+	{ 0xfffffffffffffULL, 0xf.ffffffffffffp+48L },
+	{ 0x7ffffffffffffULL, 0xf.fffffffffffep+47L },
+	{ 0x3ffffffffffffULL, 0xf.fffffffffffcp+46L },
+	{ 0x1ffffffffffffULL, 0xf.fffffffffff8p+45L },
+	{ 0xffffffffffffULL, 0xf.fffffffffffp+44L },
+	{ 0x7fffffffffffULL, 0xf.ffffffffffep+43L },
+	{ 0x3fffffffffffULL, 0xf.ffffffffffcp+42L },
+	{ 0x1fffffffffffULL, 0xf.ffffffffff8p+41L },
+	{ 0xfffffffffffULL, 0xf.ffffffffffp+40L },
+	{ 0x7ffffffffffULL, 0xf.fffffffffep+39L },
+	{ 0x3ffffffffffULL, 0xf.fffffffffcp+38L },
+	{ 0x1ffffffffffULL, 0xf.fffffffff8p+37L },
+	{ 0xffffffffffULL, 0xf.fffffffffp+36L },
+	{ 0x7fffffffffULL, 0xf.ffffffffep+35L },
+	{ 0x3fffffffffULL, 0xf.ffffffffcp+34L },
+	{ 0x1fffffffffULL, 0xf.ffffffff8p+33L },
+	{ 0xfffffffffULL, 0xf.ffffffffp+32L },
+	{ 0x7ffffffffULL, 0xf.fffffffep+31L },
+	{ 0x3ffffffffULL, 0xf.fffffffcp+30L },
+	{ 0x1ffffffffULL, 0xf.fffffff8p+29L },
+	{ 0xffffffffULL, 0xf.fffffffp+28L },
+	{ 0x7fffffffULL, 0xf.ffffffep+27L },
+	{ 0x3fffffffULL, 0xf.ffffffcp+26L },
+	{ 0x1fffffffULL, 0xf.ffffff8p+25L },
+	{ 0xfffffffULL, 0xf.ffffffp+24L },
+	{ 0x7ffffffULL, 0xf.fffffep+23L },
+	{ 0x3ffffffULL, 0xf.fffffcp+22L },
+	{ 0x1ffffffULL, 0xf.fffff8p+21L },
+	{ 0xffffffULL, 0xf.fffffp+20L },
+	{ 0x7fffffULL, 0xf.ffffep+19L },
+	{ 0x3fffffULL, 0xf.ffffcp+18L },
+	{ 0x1fffffULL, 0xf.ffff8p+17L },
+	{ 0xfffffULL, 0xf.ffffp+16L },
+	{ 0x7ffffULL, 0xf.fffep+15L },
+	{ 0x3ffffULL, 0xf.fffcp+14L },
+	{ 0x1ffffULL, 0xf.fff8p+13L },
+	{ 0xffffULL, 0xf.fffp+12L },
+	{ 0x7fffULL, 0xf.ffep+11L },
+	{ 0x3fffULL, 0xf.ffcp+10L },
+	{ 0x1fffULL, 0xf.ff8p+9L },
+	{ 0xfffULL, 0xf.ffp+8L },
+	{ 0x7ffULL, 0xf.fep+7L },
+	{ 0x3ffULL, 0xf.fcp+6L },
+	{ 0x1ffULL, 0xf.f8p+5L },
+	{ 0xffULL, 0xf.fp+4L },
+	{ 0x7fULL, 0xf.ep+3L },
+	{ 0x3fULL, 0xf.cp+2L },
+	{ 0x1fULL, 0xf.8p+1L },
+	{ 0xfULL, 0xfp+0L },
+	{ 0x7ULL, 0xep-1L },
+	{ 0x3ULL, 0xcp-2L },
+	{ 0x1ULL, 0x8p-3L },
+};
+#endif
+
+ATF_TC(floatunditf);
+ATF_TC_HEAD(floatunditf, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Verify that uint64 -> long double conversion works");
+}
+
+ATF_TC_BODY(floatunditf, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	size_t i;
+
+	for (i = 0; i < __arraycount(testcases); ++i)
+		ATF_CHECK_MSG(
+		    testcases[i].ld == (long double)testcases[i].u64,
+		    "#%zu: expected %.20Lf, got %.20Lf\n", i,
+		    testcases[i].ld,
+		    (long double)testcases[i].u64);
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, floatunditf);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fmtcheck.c b/contrib/netbsd-tests/lib/libc/gen/t_fmtcheck.c
new file mode 100644
index 000000000000..ab954005d566
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fmtcheck.c
@@ -0,0 +1,117 @@
+/*	$NetBSD: t_fmtcheck.c,v 1.3 2014/06/14 08:19:02 apb Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Allen Briggs.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+const char *fmtcheck(const char *f1, const char *f2)
+                __attribute__((__format_arg__(2)));
+
+#include <err.h>
+
+struct test_fmt {
+	const char	*fmt1;
+	const char	*fmt2;
+	int		correct;
+} test_fmts[] = {
+	{ "%d", "%d", 1 },
+	{ "%2d", "%2.2d", 1 },
+	{ "%x", "%d", 1 },
+	{ "%u", "%d", 1 },
+	{ "%03d", "%d", 1 },
+	{ "%-2d", "%d", 1 },
+	{ "%d", "%-12.1d", 1 },
+	{ "%d", "%-01.3d", 1 },
+	{ "%X", "%-01.3d", 1 },
+	{ "%D", "%ld", 1 },
+	{ "%s", "%s", 1 },
+	{ "%s", "This is a %s test", 1 },
+	{ "Hi, there.  This is a %s test", "%s", 1 },
+	{ "%d", "%s", 2 },
+	{ "%e", "%s", 2 },
+	{ "%r", "%d", 2 },
+	{ "%*.2d", "%*d", 1 },
+	{ "%2.*d", "%*d", 2 },
+	{ "%*d", "%*d", 1 },
+	{ "%-3", "%d", 2 },
+	{ "%d %s", "%d", 2 },
+	{ "%*.*.*d", "%*.*.*d", 2 },
+	{ "%d", "%d %s", 1 },
+	{ "%40s", "%20s", 1 },
+	{ "%x %x %x", "%o %u %d", 1 },
+	{ "%o %u %d", "%x %x %X", 1 },
+	{ "%#o %u %#-d", "%x %#x %X", 1 },
+	{ "%qd", "%llx", 1 },
+	{ "%%", "%llx", 1 },
+	{ "%ld %30s %#llx %-10.*e", "This number %lu%% and string %s has %qd numbers and %.*g floats", 1 },
+	{ "%o", "%lx", 2 },
+	{ "%p", "%lu", 2 },
+};
+
+ATF_TC(fmtcheck_basic);
+ATF_TC_HEAD(fmtcheck_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test fmtcheck(3)");
+}
+
+ATF_TC_BODY(fmtcheck_basic, tc)
+{
+	unsigned int	i, r;
+	const char	*f, *cf, *f1, *f2;
+
+	r = 0;
+	for (i = 0 ; i < __arraycount(test_fmts); i++) {
+		f1 = test_fmts[i].fmt1;
+		f2 = test_fmts[i].fmt2;
+		f = fmtcheck(f1, f2);
+		if (test_fmts[i].correct == 1) {
+			cf = f1;
+		} else {
+			cf = f2;
+		}
+		if (f != cf) {
+			r++;
+			atf_tc_fail_nonfatal("Test %d: (%s) vs. (%s) failed "
+			    "(should have returned %s)", i, f1, f2,
+			    (test_fmts[i].correct == 1) ? "1st" : "2nd");
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fmtcheck_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c b/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c
new file mode 100644
index 000000000000..f90d8cfdd0d1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c
@@ -0,0 +1,167 @@
+/* $NetBSD: t_fnmatch.c,v 1.3 2012/04/08 09:58:59 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fnmatch.c,v 1.3 2012/04/08 09:58:59 jruoho Exp $");
+
+#include <atf-c.h>
+#include <fnmatch.h>
+#include <stdio.h>
+
+ATF_TC(fnmatch_backslashes);
+ATF_TC_HEAD(fnmatch_backslashes, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test translation of '\\' with fnmatch(3) (PR lib/41558)");
+}
+
+ATF_TC_BODY(fnmatch_backslashes, tc)
+{
+	const int rv = fnmatch(/* pattern */ "\\", "\\", 0);
+
+	if (rv != FNM_NOMATCH)
+		atf_tc_fail("fnmatch(3) did not translate '\\'");
+}
+
+ATF_TC(fnmatch_casefold);
+ATF_TC_HEAD(fnmatch_casefold, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test FNM_CASEFOLD");
+}
+
+ATF_TC_BODY(fnmatch_casefold, tc)
+{
+	ATF_CHECK(fnmatch("xxx", "XXX", 0) != 0);
+	ATF_CHECK(fnmatch("XXX", "xxx", 0) != 0);
+	ATF_CHECK(fnmatch("xxx", "XxX", 0) != 0);
+	ATF_CHECK(fnmatch("XxX", "xxx", 0) != 0);
+	ATF_CHECK(fnmatch("x*x", "XXX", 0) != 0);
+	ATF_CHECK(fnmatch("**x", "XXX", 0) != 0);
+	ATF_CHECK(fnmatch("*?x", "XXX", 0) != 0);
+
+	ATF_CHECK(fnmatch("xxx", "XXX", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("XXX", "xxx", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("xxx", "XxX", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("XxX", "xxx", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("x*x", "XXX", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("**x", "XXX", FNM_CASEFOLD) == 0);
+	ATF_CHECK(fnmatch("*?x", "XXX", FNM_CASEFOLD) == 0);
+}
+
+ATF_TC(fnmatch_leadingdir);
+ATF_TC_HEAD(fnmatch_leadingdir, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test FNM_LEADING_DIR");
+}
+
+ATF_TC_BODY(fnmatch_leadingdir, tc)
+{
+	ATF_CHECK(fnmatch("", "/*", 0) != 0);
+	ATF_CHECK(fnmatch(" ", " /*", 0) != 0);
+	ATF_CHECK(fnmatch("x", "x/*", 0) != 0);
+	ATF_CHECK(fnmatch("///", "////*", 0) != 0);
+
+	ATF_CHECK(fnmatch("", "/*", FNM_LEADING_DIR) == 0);
+	ATF_CHECK(fnmatch(" ", " /*", FNM_LEADING_DIR) == 0);
+	ATF_CHECK(fnmatch("x", "x/*", FNM_LEADING_DIR) == 0);
+	ATF_CHECK(fnmatch("///", "////*", FNM_LEADING_DIR) == 0);
+}
+
+ATF_TC(fnmatch_noescape);
+ATF_TC_HEAD(fnmatch_noescape, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test FNM_NOESCAPE");
+}
+
+ATF_TC_BODY(fnmatch_noescape, tc)
+{
+	ATF_CHECK(fnmatch("  \\x", "  \\x", 0) != 0);
+	ATF_CHECK(fnmatch("xx\\x", "xx\\x", 0) != 0);
+	ATF_CHECK(fnmatch("\\xxx", "\\xxx", 0) != 0);
+
+	ATF_CHECK(fnmatch("  \\x", "  \\x", FNM_NOESCAPE) == 0);
+	ATF_CHECK(fnmatch("xx\\x", "xx\\x", FNM_NOESCAPE) == 0);
+	ATF_CHECK(fnmatch("\\xxx", "\\xxx", FNM_NOESCAPE) == 0);
+}
+
+ATF_TC(fnmatch_pathname);
+ATF_TC_HEAD(fnmatch_pathname, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test FNM_PATHNAME");
+}
+
+ATF_TC_BODY(fnmatch_pathname, tc)
+{
+	ATF_CHECK(fnmatch("???x", "xxx/x", FNM_PATHNAME) != 0);
+	ATF_CHECK(fnmatch("***x", "xxx/x", FNM_PATHNAME) != 0);
+
+	ATF_CHECK(fnmatch("???x", "xxxx", FNM_PATHNAME) == 0);
+	ATF_CHECK(fnmatch("*/xxx", "/xxx", FNM_PATHNAME) == 0);
+	ATF_CHECK(fnmatch("x/*.y", "x/z.y", FNM_PATHNAME) == 0);
+}
+
+ATF_TC(fnmatch_period);
+ATF_TC_HEAD(fnmatch_period, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test FNM_PERIOD");
+}
+
+ATF_TC_BODY(fnmatch_period, tc)
+{
+	ATF_CHECK(fnmatch("*x*", "X", FNM_PERIOD) != 0);
+	ATF_CHECK(fnmatch("*x*", "X", FNM_PERIOD | FNM_CASEFOLD) == 0);
+
+	ATF_CHECK(fnmatch("x?y", "x.y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("x*y", "x.y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("*.c", "x.c", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("*/?", "x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("*/*", "x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch(".*/?", ".x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("*/.?", "x/.y", FNM_PATHNAME | FNM_PERIOD) == 0);
+	ATF_CHECK(fnmatch("x[.]y", "x.y", FNM_PATHNAME | FNM_PERIOD) == 0);
+
+	ATF_CHECK(fnmatch("?x/y", ".x/y", FNM_PATHNAME | FNM_PERIOD) != 0);
+	ATF_CHECK(fnmatch("*x/y", ".x/y", FNM_PATHNAME | FNM_PERIOD) != 0);
+	ATF_CHECK(fnmatch("x/?y", "x/.y", FNM_PATHNAME | FNM_PERIOD) != 0);
+	ATF_CHECK(fnmatch("x/*y", "x/.y", FNM_PATHNAME | FNM_PERIOD) != 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fnmatch_backslashes);
+	ATF_TP_ADD_TC(tp, fnmatch_casefold);
+	ATF_TP_ADD_TC(tp, fnmatch_leadingdir);
+	ATF_TP_ADD_TC(tp, fnmatch_noescape);
+	ATF_TP_ADD_TC(tp, fnmatch_pathname);
+	ATF_TP_ADD_TC(tp, fnmatch_period);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fpclassify.c b/contrib/netbsd-tests/lib/libc/gen/t_fpclassify.c
new file mode 100644
index 000000000000..21dea9e8fee7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fpclassify.c
@@ -0,0 +1,206 @@
+/* $NetBSD: t_fpclassify.c,v 1.3 2011/10/01 21:47:08 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifndef _FLOAT_IEEE754
+
+ATF_TC(no_test);
+ATF_TC_HEAD(no_test, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Dummy test");
+}
+
+ATF_TC_BODY(no_test,tc)
+{
+	atf_tc_skip("Test not available on this architecture");
+}
+
+#else /* defined(_FLOAT_IEEE754) */
+
+ATF_TC(fpclassify_float);
+ATF_TC_HEAD(fpclassify_float, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test float operations");
+}
+
+ATF_TC_BODY(fpclassify_float, tc)
+{
+	float d0, d1, d2, f, ip;
+	int e, i;
+
+	d0 = FLT_MIN;
+	ATF_REQUIRE_EQ(fpclassify(d0), FP_NORMAL);
+	f = frexpf(d0, &e);
+	ATF_REQUIRE_EQ(e, FLT_MIN_EXP);
+	ATF_REQUIRE_EQ(f, 0.5);
+	d1 = d0;
+
+	/* shift a "1" bit through the mantissa (skip the implicit bit) */
+	for (i = 1; i < FLT_MANT_DIG; i++) {
+		d1 /= 2;
+		ATF_REQUIRE_EQ(fpclassify(d1), FP_SUBNORMAL);
+		ATF_REQUIRE(d1 > 0 && d1 < d0);
+
+		d2 = ldexpf(d0, -i);
+		ATF_REQUIRE_EQ(d2, d1);
+
+		d2 = modff(d1, &ip);
+		ATF_REQUIRE_EQ(d2, d1);
+		ATF_REQUIRE_EQ(ip, 0);
+
+		f = frexpf(d1, &e);
+		ATF_REQUIRE_EQ(e, FLT_MIN_EXP - i);
+		ATF_REQUIRE_EQ(f, 0.5);
+	}
+
+	d1 /= 2;
+	ATF_REQUIRE_EQ(fpclassify(d1), FP_ZERO);
+	f = frexpf(d1, &e);
+	ATF_REQUIRE_EQ(e, 0);
+	ATF_REQUIRE_EQ(f, 0);
+}
+
+ATF_TC(fpclassify_double);
+ATF_TC_HEAD(fpclassify_double, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test double operations");
+}
+
+ATF_TC_BODY(fpclassify_double, tc)
+{
+	double d0, d1, d2, f, ip;
+	int e, i;
+
+	d0 = DBL_MIN;
+	ATF_REQUIRE_EQ(fpclassify(d0), FP_NORMAL);
+	f = frexp(d0, &e);
+	ATF_REQUIRE_EQ(e, DBL_MIN_EXP);
+	ATF_REQUIRE_EQ(f, 0.5);
+	d1 = d0;
+
+	/* shift a "1" bit through the mantissa (skip the implicit bit) */
+	for (i = 1; i < DBL_MANT_DIG; i++) {
+		d1 /= 2;
+		ATF_REQUIRE_EQ(fpclassify(d1), FP_SUBNORMAL);
+		ATF_REQUIRE(d1 > 0 && d1 < d0);
+
+		d2 = ldexp(d0, -i);
+		ATF_REQUIRE_EQ(d2, d1);
+
+		d2 = modf(d1, &ip);
+		ATF_REQUIRE_EQ(d2, d1);
+		ATF_REQUIRE_EQ(ip, 0);
+
+		f = frexp(d1, &e);
+		ATF_REQUIRE_EQ(e, DBL_MIN_EXP - i);
+		ATF_REQUIRE_EQ(f, 0.5);
+	}
+
+	d1 /= 2;
+	ATF_REQUIRE_EQ(fpclassify(d1), FP_ZERO);
+	f = frexp(d1, &e);
+	ATF_REQUIRE_EQ(e, 0);
+	ATF_REQUIRE_EQ(f, 0);
+}
+
+/*
+ * XXX NetBSD doesn't have long-double flavors of frexp, ldexp, and modf,
+ * XXX so this test is disabled.
+ */
+
+#ifdef TEST_LONG_DOUBLE
+
+ATF_TC(fpclassify_long_double);
+ATF_TC_HEAD(fpclassify_long_double, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test long double operations");
+}
+
+ATF_TC_BODY(fpclassify_long_double, tc)
+{
+	long double d0, d1, d2, f, ip;
+	int e, i;
+
+	d0 = LDBL_MIN;
+	ATF_REQUIRE_EQ(fpclassify(d0), FP_NORMAL);
+	f = frexpl(d0, &e);
+	ATF_REQUIRE_EQ(e, LDBL_MIN_EXP);
+	ATF_REQUIRE_EQ(f, 0.5);
+	d1 = d0;
+
+	/* shift a "1" bit through the mantissa (skip the implicit bit) */
+	for (i = 1; i < LDBL_MANT_DIG; i++) {
+		d1 /= 2;
+		ATF_REQUIRE_EQ(fpclassify(d1), FP_SUBNORMAL);
+		ATF_REQUIRE(d1 > 0 && d1 < d0);
+
+		d2 = ldexpl(d0, -i);
+		ATF_REQUIRE_EQ(d2, d1);
+
+		d2 = modfl(d1, &ip);
+		ATF_REQUIRE_EQ(d2, d1);
+		ATF_REQUIRE_EQ(ip, 0);
+
+		f = frexpl(d1, &e);
+		ATF_REQUIRE_EQ(e, LDBL_MIN_EXP - i);
+		ATF_REQUIRE_EQ(f, 0.5);
+	}
+
+	d1 /= 2;
+	ATF_REQUIRE_EQ(fpclassify(d1), FP_ZERO);
+	f = frexpl(d1, &e);
+	ATF_REQUIRE_EQ(e, 0);
+	ATF_REQUIRE_EQ(f, 0);
+}
+#endif /* TEST_LONG_DOUBLE */
+#endif /* _FLOAT_IEEE754 */
+
+ATF_TP_ADD_TCS(tp)
+{
+
+#ifndef _FLOAT_IEEE754
+	ATF_TP_ADD_TC(tp, no_test);
+#else
+	ATF_TP_ADD_TC(tp, fpclassify_float);
+	ATF_TP_ADD_TC(tp, fpclassify_double);
+#ifdef TEST_LONG_DOUBLE
+	ATF_TP_ADD_TC(tp, fpclassify_long_double);
+#endif /* TEST_LONG_DOUBLE */
+#endif /* _FLOAT_IEEE754 */
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c b/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
new file mode 100644
index 000000000000..998eb858db80
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
@@ -0,0 +1,355 @@
+/*	$NetBSD: t_fpsetmask.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 1995 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <stdio.h>
+#include <signal.h>
+#include <float.h>
+#include <setjmp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "isqemu.h"
+
+#ifndef _FLOAT_IEEE754
+
+ATF_TC(no_test);
+ATF_TC_HEAD(no_test, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Dummy test case");
+}
+
+ATF_TC_BODY(no_test, tc)
+{
+
+	atf_tc_skip("Test not available on this architecture.");
+}
+
+#else /* defined(_FLOAT_IEEE754) */
+
+#include <ieeefp.h>
+
+const char *skip_mesg;
+const char *skip_arch;
+
+void		sigfpe(int, siginfo_t *, void *);
+
+volatile sig_atomic_t signal_caught;
+volatile int sicode;
+
+static volatile const float	f_one   = 1.0;
+static volatile const float	f_zero  = 0.0;
+static volatile const double	d_one   = 1.0;
+static volatile const double	d_zero  = 0.0;
+static volatile const long double ld_one  = 1.0;
+static volatile const long double ld_zero = 0.0;
+
+static volatile const float	f_huge = FLT_MAX;
+static volatile const float	f_tiny = FLT_MIN;
+static volatile const double	d_huge = DBL_MAX;
+static volatile const double	d_tiny = DBL_MIN;
+static volatile const long double ld_huge = LDBL_MAX;
+static volatile const long double ld_tiny = LDBL_MIN;
+
+static volatile float f_x;
+static volatile double d_x;
+static volatile long double ld_x;
+
+/* trip divide by zero */
+static void
+f_dz(void)
+{
+
+	f_x = f_one / f_zero;
+}
+
+static void
+d_dz(void)
+{
+
+	d_x = d_one / d_zero;
+}
+
+static void
+ld_dz(void)
+{
+
+	ld_x = ld_one / ld_zero;
+}
+
+/* trip invalid operation */
+static void
+d_inv(void)
+{
+
+	d_x = d_zero / d_zero;
+}
+
+static void
+ld_inv(void)
+{
+
+	ld_x = ld_zero / ld_zero;
+}
+
+static void
+f_inv(void)
+{
+
+	f_x = f_zero / f_zero;
+}
+
+/* trip overflow */
+static void
+f_ofl(void)
+{
+
+	f_x = f_huge * f_huge;
+}
+
+static void
+d_ofl(void)
+{
+
+	d_x = d_huge * d_huge;
+}
+
+static void
+ld_ofl(void)
+{
+
+	ld_x = ld_huge * ld_huge;
+}
+
+/* trip underflow */
+static void
+f_ufl(void)
+{
+
+	f_x = f_tiny * f_tiny;
+}
+
+static void
+d_ufl(void)
+{
+
+	d_x = d_tiny * d_tiny;
+}
+
+static void
+ld_ufl(void)
+{
+
+	ld_x = ld_tiny * ld_tiny;
+}
+
+struct ops {
+	void (*op)(void);
+	fp_except mask;
+	int sicode;
+};
+
+static const struct ops float_ops[] = {
+	{ f_dz, FP_X_DZ, FPE_FLTDIV },
+	{ f_inv, FP_X_INV, FPE_FLTINV },
+	{ f_ofl, FP_X_OFL, FPE_FLTOVF },
+	{ f_ufl, FP_X_UFL, FPE_FLTUND },
+	{ NULL, 0, 0 }
+};
+
+static const struct ops double_ops[] = {
+	{ d_dz, FP_X_DZ, FPE_FLTDIV },
+	{ d_inv, FP_X_INV, FPE_FLTINV },
+	{ d_ofl, FP_X_OFL, FPE_FLTOVF },
+	{ d_ufl, FP_X_UFL, FPE_FLTUND },
+	{ NULL, 0, 0 }
+};
+
+static const struct ops long_double_ops[] = {
+	{ ld_dz, FP_X_DZ, FPE_FLTDIV },
+	{ ld_inv, FP_X_INV, FPE_FLTINV },
+	{ ld_ofl, FP_X_OFL, FPE_FLTOVF },
+	{ ld_ufl, FP_X_UFL, FPE_FLTUND },
+	{ NULL, 0, 0 }
+};
+
+static sigjmp_buf b;
+
+static void
+fpsetmask_masked(const struct ops *test_ops)
+{
+	struct sigaction sa;
+	fp_except ex1, ex2;
+	const struct ops *t;
+
+	/* mask all exceptions, clear history */
+	fpsetmask(0);
+	fpsetsticky(0);
+
+	/* set up signal handler */
+	sa.sa_sigaction = sigfpe;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = SA_SIGINFO;
+	sigaction(SIGFPE, &sa, 0);
+	signal_caught = 0;
+
+	/*
+	 * exceptions masked, check whether "sticky" bits are set correctly
+	 */
+	for (t = test_ops; t->op != NULL; t++) {
+		(*t->op)();
+		ex1 = fpgetsticky();
+		ATF_CHECK_EQ(ex1 & t->mask, t->mask);
+		ATF_CHECK_EQ(signal_caught, 0);
+
+		/* check correct fpsetsticky() behaviour */
+		ex2 = fpsetsticky(0);
+		ATF_CHECK_EQ(fpgetsticky(), 0);
+		ATF_CHECK_EQ(ex1, ex2);
+	}
+}
+
+/* force delayed exceptions to be delivered */
+#define BARRIER() fpsetmask(0); f_x = f_one * f_one
+
+static void
+fpsetmask_unmasked(const struct ops *test_ops)
+{
+	struct sigaction sa;
+	int r;
+	const struct ops *volatile t;
+
+	/* mask all exceptions, clear history */
+	fpsetmask(0);
+	fpsetsticky(0);
+
+	/* set up signal handler */
+	sa.sa_sigaction = sigfpe;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = SA_SIGINFO;
+	sigaction(SIGFPE, &sa, 0);
+	signal_caught = 0;
+
+	/*
+	 * exception unmasked, check SIGFPE delivery and correct siginfo
+	 */
+	for (t = test_ops; t->op != NULL; t++) {
+		fpsetmask(t->mask);
+		r = sigsetjmp(b, 1);
+		if (!r) {
+			(*t->op)();
+			BARRIER();
+		}
+		ATF_CHECK_EQ(signal_caught, 1);
+		ATF_CHECK_EQ(sicode, t->sicode);
+		signal_caught = 0;
+	}
+}
+
+void
+sigfpe(int s, siginfo_t *si, void *c)
+{
+	signal_caught = 1;
+	sicode = si->si_code;
+	siglongjmp(b, 1);
+}
+
+#define TEST(m, t)							\
+	ATF_TC(m##_##t);						\
+									\
+	ATF_TC_HEAD(m##_##t, tc)					\
+	{								\
+									\
+		atf_tc_set_md_var(tc, "descr",				\
+		    "Test " ___STRING(m) " exceptions for "		\
+		    ___STRING(t) "values");				\
+	}								\
+									\
+	ATF_TC_BODY(m##_##t, tc)					\
+	{								\
+		if (strcmp(MACHINE, "macppc") == 0)			\
+			atf_tc_expect_fail("PR port-macppc/46319");	\
+									\
+		if (isQEMU())						\
+			atf_tc_expect_fail("PR misc/44767");		\
+									\
+		m(t##_ops);						\
+	}
+
+TEST(fpsetmask_masked, float)
+TEST(fpsetmask_masked, double)
+TEST(fpsetmask_masked, long_double)
+TEST(fpsetmask_unmasked, float)
+TEST(fpsetmask_unmasked, double)
+TEST(fpsetmask_unmasked, long_double)
+
+ATF_TC(fpsetmask_basic);
+ATF_TC_HEAD(fpsetmask_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fpsetmask(3)");
+}
+
+ATF_TC_BODY(fpsetmask_basic, tc)
+{
+	size_t i;
+	fp_except_t msk, lst[] = { FP_X_INV, FP_X_DZ, FP_X_OFL, FP_X_UFL };
+
+	msk = fpgetmask();
+	for (i = 0; i < __arraycount(lst); i++) {
+		fpsetmask(msk | lst[i]);
+		ATF_CHECK((fpgetmask() & lst[i]) != 0);
+		fpsetmask(msk & lst[i]);
+		ATF_CHECK((fpgetmask() & lst[i]) == 0);
+	}
+
+}
+
+#endif /* defined(_FLOAT_IEEE754) */
+
+ATF_TP_ADD_TCS(tp)
+{
+
+#ifndef _FLOAT_IEEE754
+	ATF_TP_ADD_TC(tp, no_test);
+#else
+	ATF_TP_ADD_TC(tp, fpsetmask_basic);
+	ATF_TP_ADD_TC(tp, fpsetmask_masked_float);
+	ATF_TP_ADD_TC(tp, fpsetmask_masked_double);
+	ATF_TP_ADD_TC(tp, fpsetmask_masked_long_double);
+	ATF_TP_ADD_TC(tp, fpsetmask_unmasked_float);
+	ATF_TP_ADD_TC(tp, fpsetmask_unmasked_double);
+	ATF_TP_ADD_TC(tp, fpsetmask_unmasked_long_double);
+#endif
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fpsetround.c b/contrib/netbsd-tests/lib/libc/gen/t_fpsetround.c
new file mode 100644
index 000000000000..0f23e74e57c8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fpsetround.c
@@ -0,0 +1,163 @@
+/* $NetBSD: t_fpsetround.c,v 1.6 2011/10/01 17:46:10 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fpsetround.c,v 1.6 2011/10/01 17:46:10 christos Exp $");
+
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <atf-c.h>
+
+ATF_TC(fpsetround_basic);
+ATF_TC_HEAD(fpsetround_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Minimal testing of fpgetround(3) and fpsetround(3)");
+}
+
+#ifdef _FLOAT_IEEE754
+#include <ieeefp.h>
+
+static const struct {
+	const char *n;
+	int rm;
+	int rf;
+} rnd[] = {
+	{ "RN", FP_RN, 1 },
+	{ "RP", FP_RP, 2 },
+	{ "RM", FP_RM, 3 },
+	{ "RZ", FP_RZ, 0 },
+
+};
+
+static const struct {
+	const char *n;
+	int v[4];
+} tst[] = {	/*  RN  RP  RM  RZ */
+	{  "1.1", {  1,  1,  2,  1 } },
+	{  "1.5", {  1,  2,  2,  1 } },
+	{  "1.9", {  1,  2,  2,  1 } },
+	{  "2.1", {  2,  2,  3,  2 } },
+	{  "2.5", {  2,  2,  3,  2 } },
+	{  "2.9", {  2,  3,  3,  2 } },
+	{ "-1.1", { -1, -1, -1, -2 } },
+	{ "-1.5", { -1, -2, -1, -2 } },
+	{ "-1.9", { -1, -2, -1, -2 } },
+	{ "-2.1", { -2, -2, -2, -3 } },
+	{ "-2.5", { -2, -2, -2, -3 } },
+	{ "-2.9", { -2, -3, -2, -3 } },
+};
+
+static const char *
+getname(int r)
+{
+	for (size_t i = 0; i < __arraycount(rnd); i++)
+		if (rnd[i].rm == r)
+			return rnd[i].n;
+	return "*unknown*";
+}
+
+static void
+test(int r)
+{
+	int did = 0;
+	for (size_t i = 0; i < __arraycount(tst); i++) {
+		double d = strtod(tst[i].n, NULL);
+		int g = (int)rint(d);
+		int e = tst[i].v[r];
+		ATF_CHECK_EQ(g, e);
+		if (g != e) {
+			if (!did) {
+				fprintf(stderr, "Mode Value Result Expected\n");
+				did = 1;
+			}
+			fprintf(stderr, "%4.4s %-5.5s %6d %8d\n", rnd[r].n,
+			    tst[i].n, (int)rint(d), tst[i].v[r]);
+		}
+	}
+}
+#endif
+
+
+ATF_TC_BODY(fpsetround_basic, tc)
+{
+
+#ifndef _FLOAT_IEEE754
+	atf_tc_skip("Test not applicable on this architecture.");
+#else
+	int r;
+
+	ATF_CHECK_EQ(r = fpgetround(), FP_RN);
+	if (FP_RN != r)
+		fprintf(stderr, "default expected=%s got=%s\n", getname(FP_RN),
+		    getname(r));
+	ATF_CHECK_EQ(FLT_ROUNDS, 1);
+
+	for (size_t i = 0; i < __arraycount(rnd); i++) {
+		const size_t j = (i + 1) & 3;
+		const int o = rnd[i].rm;
+		const int n = rnd[j].rm;
+
+		ATF_CHECK_EQ(r = fpsetround(n), o);
+		if (o != r)
+			fprintf(stderr, "set %s expected=%s got=%s\n",
+			    getname(n), getname(o), getname(r));
+		ATF_CHECK_EQ(r = fpgetround(), n);
+		if (n != r)
+			fprintf(stderr, "get expected=%s got=%s\n", getname(n),
+			    getname(r));
+		ATF_CHECK_EQ(r = FLT_ROUNDS, rnd[j].rf);
+		if (r != rnd[j].rf)
+			fprintf(stderr, "rounds expected=%x got=%x\n",
+			    rnd[j].rf, r);
+		test(r);
+	}
+#endif /* _FLOAT_IEEE754 */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fpsetround_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_ftok.c b/contrib/netbsd-tests/lib/libc/gen/t_ftok.c
new file mode 100644
index 000000000000..100bd1bb982f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_ftok.c
@@ -0,0 +1,107 @@
+/*	$NetBSD: t_ftok.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ftok.c,v 1.1 2011/11/08 05:47:00 jruoho Exp $");
+
+#include <sys/types.h>
+#include <sys/ipc.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+static const char *path = "ftok";
+static const char *hlnk = "hlnk";
+static const char *slnk = "slnk";
+static const int key = 123456789;
+
+ATF_TC(ftok_err);
+ATF_TC_HEAD(ftok_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from ftok(3)");
+}
+
+ATF_TC_BODY(ftok_err, tc)
+{
+	ATF_REQUIRE(ftok("/a/b/c/d/e/f/g/h/i", key) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(ftok_link);
+ATF_TC_HEAD(ftok_link, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that links return the same key");
+}
+
+ATF_TC_BODY(ftok_link, tc)
+{
+	key_t k1, k2, k3;
+	int fd;
+
+	fd = open(path, O_RDONLY | O_CREAT);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(link(path, hlnk) == 0);
+	ATF_REQUIRE(symlink(path, slnk) == 0);
+
+	k1 = ftok(path, key);
+	k2 = ftok(hlnk, key);
+	k3 = ftok(slnk, key);
+
+	ATF_REQUIRE(k1 != -1);
+	ATF_REQUIRE(k2 != -1);
+	ATF_REQUIRE(k3 != -1);
+
+	if (k1 != k2)
+		atf_tc_fail("ftok(3) gave different key for a hard link");
+
+	if (k1 != k3)
+		atf_tc_fail("ftok(3) gave different key for a symbolic link");
+
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(hlnk) == 0);
+	ATF_REQUIRE(unlink(slnk) == 0);
+}
+
+ATF_TC_CLEANUP(ftok_link, tc)
+{
+	(void)unlink(path);
+	(void)unlink(hlnk);
+	(void)unlink(slnk);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ftok_err);
+	ATF_TP_ADD_TC(tp, ftok_link);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c b/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c
new file mode 100644
index 000000000000..76c287aca52c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c
@@ -0,0 +1,151 @@
+/*	$NetBSD: t_getcwd.c,v 1.3 2011/07/27 05:04:11 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getcwd.c,v 1.3 2011/07/27 05:04:11 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fts.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC(getcwd_err);
+ATF_TC_HEAD(getcwd_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions in getcwd(3)");
+}
+
+ATF_TC_BODY(getcwd_err, tc)
+{
+	char buf[MAXPATHLEN];
+
+	errno = 0;
+
+	ATF_REQUIRE(getcwd(buf, 0) == NULL);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+
+	ATF_REQUIRE(getcwd((void *)-1, sizeof(buf)) == NULL);
+	ATF_REQUIRE(errno == EFAULT);
+}
+
+ATF_TC(getcwd_fts);
+ATF_TC_HEAD(getcwd_fts, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of getcwd(3)");
+}
+
+ATF_TC_BODY(getcwd_fts, tc)
+{
+	const char *str = NULL;
+	char buf[MAXPATHLEN];
+	char *argv[2];
+	FTSENT *ftse;
+	FTS *fts;
+	int ops;
+	short depth;
+
+	/*
+	 * Do not traverse too deep; cf. PR bin/45180.
+	 */
+	depth = 2;
+
+	argv[1] = NULL;
+	argv[0] = __UNCONST("/");
+
+	/*
+	 * Test that getcwd(3) works with basic
+	 * system directories. Note that having
+	 * no FTS_NOCHDIR specified should ensure
+	 * that the current directory is visited.
+	 */
+	ops = FTS_PHYSICAL | FTS_NOSTAT;
+	fts = fts_open(argv, ops, NULL);
+
+	if (fts == NULL) {
+		str = "failed to initialize fts(3)";
+		goto out;
+	}
+
+	while ((ftse = fts_read(fts)) != NULL) {
+
+		if (ftse->fts_level < 1)
+			continue;
+
+		if (ftse->fts_level > depth) {
+			(void)fts_set(fts, ftse, FTS_SKIP);
+			continue;
+		}
+
+		switch(ftse->fts_info) {
+
+		case FTS_DP:
+
+			(void)memset(buf, 0, sizeof(buf));
+
+			if (getcwd(buf, sizeof(buf)) == NULL) {
+				str = "getcwd(3) failed";
+				goto out;
+			}
+
+			if (strstr(ftse->fts_path, buf) == NULL) {
+				str = "getcwd(3) returned incorrect path";
+				goto out;
+			}
+
+			break;
+
+		default:
+			break;
+		}
+	}
+
+out:
+	if (fts != NULL)
+		(void)fts_close(fts);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getcwd_err);
+	ATF_TP_ADD_TC(tp, getcwd_fts);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_getgrent.c b/contrib/netbsd-tests/lib/libc/gen/t_getgrent.c
new file mode 100644
index 000000000000..df9cdd1c0c17
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_getgrent.c
@@ -0,0 +1,181 @@
+/*	$NetBSD: t_getgrent.c,v 1.2 2011/05/11 19:06:45 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (c) 2009, Stathis Kamperis
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getgrent.c,v 1.2 2011/05/11 19:06:45 njoly Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <grp.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+ATF_TC(getgrent_loop);
+ATF_TC_HEAD(getgrent_loop, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sequential getgrent(2)");
+}
+
+ATF_TC_BODY(getgrent_loop, tc)
+{
+	struct group *gr;
+	size_t i, j;
+
+	/*
+	 * Loop over the group database. The first
+	 * call returns the first entry and subsequent
+	 * calls return the rest of the entries.
+	 */
+	i = j = 0;
+
+	while((gr = getgrent()) != NULL)
+		i++;
+
+	/*
+	 * Rewind the database to the beginning
+	 * and loop over again until the end.
+	 */
+	setgrent();
+
+        while((gr = getgrent()) != NULL)
+		j++;
+
+	if (i != j)
+		atf_tc_fail("sequential getgrent(3) failed");
+
+	/*
+	 * Close the database and reopen it.
+	 * The getgrent(3) call should always
+	 * automatically rewind the database.
+	 */
+	endgrent();
+
+        j = 0;
+
+        while((gr = getgrent()) != NULL)
+                j++;
+
+	if (i != j)
+		atf_tc_fail("getgrent(3) did not rewind");
+}
+
+ATF_TC(getgrent_setgid);
+ATF_TC_HEAD(getgrent_setgid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test consistency of the group db");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(getgrent_setgid, tc)
+{
+	struct group *gr, *gr1, *gr2;
+	int rv, sta;
+	pid_t pid;
+
+	/*
+	 * Verify that the database is consistent.
+	 *
+	 * Note that because of the static buffers
+	 * used by getgrent(3), fork(2) is required,
+	 * even without the setgid(2) check.
+	 */
+        while((gr = getgrent()) != NULL) {
+
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		if (pid == 0) {
+
+			gr1 = getgrgid(gr->gr_gid);
+
+			if (gr1 == NULL)
+				_exit(EXIT_FAILURE);
+
+			gr2 = getgrnam(gr->gr_name);
+
+			if (gr2 == NULL)
+				_exit(EXIT_FAILURE);
+
+			rv = setgid(gr->gr_gid);
+
+			if (rv != 0)
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+			goto fail;
+	}
+
+	return;
+
+fail:
+	atf_tc_fail("group database is inconsistent");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getgrent_loop);
+	ATF_TP_ADD_TC(tp, getgrent_setgid);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_glob.c b/contrib/netbsd-tests/lib/libc/gen/t_glob.c
new file mode 100644
index 000000000000..ff62b638e12c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_glob.c
@@ -0,0 +1,273 @@
+/*	$NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $	*/
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $");
+
+#include <atf-c.h>
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <dirent.h>
+#include <glob.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "../../../h_macros.h"
+
+
+#ifdef DEBUG
+#define DPRINTF(a) printf a
+#else
+#define DPRINTF(a)
+#endif
+
+struct gl_file {
+	const char *name;
+	int dir;
+};
+
+static struct gl_file a[] = {
+	{ "1", 0 },
+	{ "b", 1 },
+	{ "3", 0 },
+	{ "4", 0 },
+};
+
+static struct gl_file b[] = {
+	{ "x", 0 },
+	{ "y", 0 },
+	{ "z", 0 },
+	{ "w", 0 },
+};
+
+struct gl_dir {
+	const char *name;	/* directory name */
+	const struct gl_file *dir;
+	size_t len, pos;
+};
+
+static struct gl_dir d[] = {
+	{ "a", a, __arraycount(a), 0 },
+	{ "a/b", b, __arraycount(b), 0 },
+};
+
+static const char *glob_star[] = {
+    "a/1", "a/3", "a/4", "a/b", "a/b/w", "a/b/x", "a/b/y", "a/b/z",
+};
+
+static const char *glob_star_not[] = {
+	"a/1", "a/3", "a/4", "a/b",
+};
+
+static void
+trim(char *buf, size_t len, const char *name)
+{
+	char *path = buf, *epath = buf + len;
+	while (path < epath && (*path++ = *name++) != '\0')
+		continue;
+	path--;
+	while (path > buf && *--path == '/')
+		*path = '\0';
+}
+
+static void *
+gl_opendir(const char *dir)
+{
+	size_t i;
+	char buf[MAXPATHLEN];
+	trim(buf, sizeof(buf), dir);
+
+	for (i = 0; i < __arraycount(d); i++)
+		if (strcmp(buf, d[i].name) == 0) {
+			DPRINTF(("opendir %s %zu\n", buf, i));
+			return &d[i];
+		}
+	errno = ENOENT;
+	return NULL;
+}
+
+static struct dirent *
+gl_readdir(void *v)
+{
+	static struct dirent dir;
+	struct gl_dir *dd = v;
+	if (dd->pos < dd->len) {
+		const struct gl_file *f = &dd->dir[dd->pos++];
+		strcpy(dir.d_name, f->name);
+		dir.d_namlen = strlen(f->name);
+		dir.d_ino = dd->pos;
+		dir.d_type = f->dir ? DT_DIR : DT_REG;
+		DPRINTF(("readdir %s %d\n", dir.d_name, dir.d_type));
+		dir.d_reclen = _DIRENT_RECLEN(&dir, dir.d_namlen);
+		return &dir;
+	}
+	return NULL;
+}
+
+static int
+gl_stat(const char *name , __gl_stat_t *st)
+{
+	char buf[MAXPATHLEN];
+	trim(buf, sizeof(buf), name);
+	memset(st, 0, sizeof(*st));
+
+	if (strcmp(buf, "a") == 0 || strcmp(buf, "a/b") == 0) {
+		st->st_mode |= _S_IFDIR;
+		return 0;
+	}
+
+	if (buf[0] == 'a' && buf[1] == '/') {
+		struct gl_file *f;
+		size_t offs, count;
+
+		if (buf[2] == 'b' && buf[3] == '/') {
+			offs = 4;
+			count = __arraycount(b);
+			f = b;
+		} else {
+			offs = 2;
+			count = __arraycount(a);
+			f = a;
+		}
+		
+		for (size_t i = 0; i < count; i++)
+			if (strcmp(f[i].name, buf + offs) == 0)
+				return 0;
+	}
+	DPRINTF(("stat %s %d\n", buf, st->st_mode));
+	errno = ENOENT;
+	return -1;
+}
+
+static int
+gl_lstat(const char *name , __gl_stat_t *st)
+{
+	return gl_stat(name, st);
+}
+
+static void
+gl_closedir(void *v)
+{
+	struct gl_dir *dd = v;
+	dd->pos = 0;
+	DPRINTF(("closedir %p\n", dd));
+}
+
+static void
+run(const char *p, int flags, const char **res, size_t len)
+{
+	glob_t gl;
+	size_t i;
+
+	memset(&gl, 0, sizeof(gl));
+	gl.gl_opendir = gl_opendir;
+	gl.gl_readdir = gl_readdir;
+	gl.gl_closedir = gl_closedir;
+	gl.gl_stat = gl_stat;
+	gl.gl_lstat = gl_lstat;
+
+	RZ(glob(p, GLOB_ALTDIRFUNC | flags, NULL, &gl));
+
+	for (i = 0; i < gl.gl_pathc; i++)
+		DPRINTF(("%s\n", gl.gl_pathv[i]));
+
+	ATF_CHECK(len == gl.gl_pathc);
+	for (i = 0; i < gl.gl_pathc; i++)
+		ATF_CHECK_STREQ(gl.gl_pathv[i], res[i]);
+
+	globfree(&gl);
+}
+
+
+ATF_TC(glob_star);
+ATF_TC_HEAD(glob_star, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test glob(3) ** with GLOB_STAR");
+}
+
+ATF_TC_BODY(glob_star, tc)
+{
+	run("a/**", GLOB_STAR, glob_star, __arraycount(glob_star));
+}
+
+ATF_TC(glob_star_not);
+ATF_TC_HEAD(glob_star_not, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test glob(3) ** without GLOB_STAR");
+}
+
+
+ATF_TC_BODY(glob_star_not, tc)
+{
+	run("a/**", 0, glob_star_not, __arraycount(glob_star_not));
+}
+
+#if 0
+ATF_TC(glob_nocheck);
+ATF_TC_HEAD(glob_nocheck, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test glob(3) pattern with backslash and GLOB_NOCHECK");
+}
+
+
+ATF_TC_BODY(glob_nocheck, tc)
+{
+	static const char pattern[] = { 'f', 'o', 'o', '\\', ';', 'b', 'a',
+	    'r', '\0' };
+	static const char *glob_nocheck[] = {
+	    pattern
+	};
+	run(pattern, GLOB_NOCHECK, glob_nocheck, __arraycount(glob_nocheck));
+}
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, glob_star);
+	ATF_TP_ADD_TC(tp, glob_star_not);
+/*
+ * Remove this test for now - the GLOB_NOCHECK return value has been
+ * re-defined to return a modified pattern in revision 1.33 of glob.c
+ *
+ *	ATF_TP_ADD_TC(tp, glob_nocheck);
+ */
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c b/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c
new file mode 100644
index 000000000000..1af579e61c02
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c
@@ -0,0 +1,312 @@
+/*	$NetBSD: t_humanize_number.c,v 1.8 2012/03/18 07:14:08 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <err.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <util.h>
+
+const struct hnopts {
+	size_t ho_len;
+	int64_t ho_num;
+	const char *ho_suffix;
+	int ho_scale;
+	int ho_flags;
+	int ho_retval;			/* expected return value */
+	const char *ho_retstr;		/* expected string in buffer */
+} hnopts[] = {
+	/*
+	 * Rev. 1.6 produces "10.0".
+	 */
+	{ 5, 10737418236ULL * 1024, "",
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 3, "10T" },
+
+	{ 5, 10450000, "",
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 3, "10M" },
+	{ 5, 10500000, "",		/* just for reference */
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 3, "10M" },
+
+	/*
+	 * Trailing space.  Rev. 1.7 produces "1 ".
+	 */
+	{ 5, 1, "", 0, HN_NOSPACE, 1, "1" },
+
+	{ 5, 1, "", 0, 0, 2, "1 " }, /* just for reference */
+	{ 5, 1, "", 0, HN_B, 3, "1 B" }, /* and more ... */
+	{ 5, 1, "", 0, HN_DECIMAL, 2, "1 " },
+	{ 5, 1, "", 0, HN_NOSPACE | HN_B, 2, "1B" },
+	{ 5, 1, "", 0, HN_B | HN_DECIMAL, 3, "1 B" },
+	{ 5, 1, "", 0, HN_NOSPACE | HN_B | HN_DECIMAL, 2, "1B" },
+
+	/*
+	 * Space and HN_B.  Rev. 1.7 produces "1B".
+	 */
+	{ 5, 1, "", HN_AUTOSCALE, HN_B, 3, "1 B" },
+	{ 5, 1000, "",			/* just for reference */
+	  HN_AUTOSCALE, HN_B, 3, "1 K" },
+
+	/*
+	 * Truncated output.  Rev. 1.7 produces "1.0 K".
+	 */
+	{ 6, 1000, "A", HN_AUTOSCALE, HN_DECIMAL, -1, "" },
+
+	/*
+	 * Failure case reported by Greg Troxel <gdt@NetBSD.org>.
+	 * Rev. 1.11 incorrectly returns 5 with filling the buffer
+	 * with "1000".
+	 */
+	{ 5, 1048258238, "",
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 4, "1.0G" },
+	/* Similar case it prints 1000 where it shouldn't */
+	{ 5, 1023488, "",
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 4, "1.0M" },
+	{ 5, 1023999, "",
+	  HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL, 4, "1.0M" },
+};
+
+struct hnflags {
+	int hf_flags;
+	const char *hf_name;
+};
+
+const struct hnflags scale_flags[] = {
+	{ HN_GETSCALE, "HN_GETSCALE" },
+	{ HN_AUTOSCALE, "HN_AUTOSCALE" },
+};
+const struct hnflags normal_flags[] = {
+	{ HN_DECIMAL, "HN_DECIMAL" },
+	{ HN_NOSPACE, "HN_NOSPACE" },
+	{ HN_B, "HN_B" },
+	{ HN_DIVISOR_1000, "HN_DIVISOR_1000" },
+};
+
+const char *formatflags(char *, size_t, const struct hnflags *, size_t, int);
+void	    newline(void);
+void	    w_printf(const char *, ...) __printflike(1, 2);
+int	    main(int, char *[]);
+
+const char *
+formatflags(char *buf, size_t buflen, const struct hnflags *hfs,
+    size_t hfslen, int flags)
+{
+	const struct hnflags *hf;
+	char *p = buf;
+	ssize_t len = buflen;
+	unsigned int i, found;
+	int n;
+
+	if (flags == 0) {
+		snprintf(buf, buflen, "0");
+		return (buf);
+	}
+	for (i = found = 0; i < hfslen && flags & ~found; i++) {
+		hf = &hfs[i];
+		if (flags & hf->hf_flags) {
+			found |= hf->hf_flags;
+			n = snprintf(p, len, "|%s", hf->hf_name);
+			if (n >= len) {
+				p = buf;
+				len = buflen;
+				/* Print `flags' as number */
+				goto bad;
+			}
+			p += n;
+			len -= n;
+		}
+	}
+	flags &= ~found;
+	if (flags)
+bad:
+		snprintf(p, len, "|0x%x", flags);
+	return (*buf == '|' ? buf + 1 : buf);
+}
+
+static int col, bol = 1;
+void
+newline(void)
+{
+
+	fprintf(stderr, "\n");
+	col = 0;
+	bol = 1;
+}
+
+void
+w_printf(const char *fmt, ...)
+{
+	char buf[80];
+	va_list ap;
+	int n;
+
+	va_start(ap, fmt);
+	if (col >= 0) {
+		n = vsnprintf(buf, sizeof(buf), fmt, ap);
+		if (n >= (int)sizeof(buf)) {
+			col = -1;
+			goto overflow;
+		} else if (n == 0)
+			goto out;
+
+		if (!bol) {
+			if (col + n > 75)
+				fprintf(stderr, "\n    "), col = 4;
+			else
+				fprintf(stderr, " "), col++;
+		}
+		fprintf(stderr, "%s", buf);
+		col += n;
+		bol = 0;
+	} else {
+overflow:
+		vfprintf(stderr, fmt, ap);
+	}
+out:
+	va_end(ap);
+}
+
+ATF_TC(humanize_number_basic);
+ATF_TC_HEAD(humanize_number_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test humanize_number(3)");
+}
+
+ATF_TC_BODY(humanize_number_basic, tc)
+{
+	char fbuf[128];
+	const struct hnopts *ho;
+	char *buf = NULL;
+	size_t buflen = 0;
+	unsigned int i;
+	int rv = 0;
+
+	for (i = 0; i < __arraycount(hnopts); i++) {
+		ho = &hnopts[i];
+		if (buflen < ho->ho_len) {
+			buflen = ho->ho_len;
+			buf = realloc(buf, buflen);
+			if (buf == NULL)
+				atf_tc_fail("realloc(..., %zu) failed", buflen);
+		}
+
+		rv = humanize_number(buf, ho->ho_len, ho->ho_num,
+		    ho->ho_suffix, ho->ho_scale, ho->ho_flags);
+
+		if (rv == ho->ho_retval &&
+		    (rv == -1 || strcmp(buf, ho->ho_retstr) == 0))
+			continue;
+
+		w_printf("humanize_number(\"%s\", %zu, %" PRId64 ",",
+		    ho->ho_retstr, ho->ho_len, ho->ho_num);
+		w_printf("\"%s\",", ho->ho_suffix);
+		w_printf("%s,", formatflags(fbuf, sizeof(fbuf), scale_flags,
+		    sizeof(scale_flags) / sizeof(scale_flags[0]),
+		    ho->ho_scale));
+		w_printf("%s)", formatflags(fbuf, sizeof(fbuf), normal_flags,
+		    sizeof(normal_flags) / sizeof(normal_flags[0]),
+		    ho->ho_flags));
+		w_printf("= %d,", ho->ho_retval);
+		w_printf("but got");
+		w_printf("%d/[%s]", rv, rv == -1 ? "" : buf);
+		newline();
+		atf_tc_fail_nonfatal("Failed for table entry %d", i);
+	}
+}
+
+ATF_TC(humanize_number_big);
+ATF_TC_HEAD(humanize_number_big, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test humanize "
+	    "big numbers (PR lib/44097)");
+}
+
+ATF_TC_BODY(humanize_number_big, tc)
+{
+	char buf[1024];
+	int rv;
+
+	/*
+	 * Seems to work.
+	 */
+	(void)memset(buf, 0, sizeof(buf));
+
+	rv = humanize_number(buf, 10, 10000, "", HN_AUTOSCALE, HN_NOSPACE);
+
+	ATF_REQUIRE(rv != -1);
+	ATF_CHECK_STREQ(buf, "10000");
+
+	/*
+	 * A bogus value with large number.
+	 */
+	(void)memset(buf, 0, sizeof(buf));
+
+	rv = humanize_number(buf, 10, INT64_MAX, "", HN_AUTOSCALE, HN_NOSPACE);
+
+	ATF_REQUIRE(rv != -1);
+	ATF_REQUIRE(strcmp(buf, "0") != 0);
+
+	/*
+	 * Large buffer with HN_AUTOSCALE. Entirely bogus.
+	 */
+	(void)memset(buf, 0, sizeof(buf));
+
+	rv = humanize_number(buf, sizeof(buf), 10000, "",
+	    HN_AUTOSCALE, HN_NOSPACE);
+
+	ATF_REQUIRE(rv != -1);
+	ATF_REQUIRE(strcmp(buf, "0%d%s%d%s%s%s") != 0);
+
+	/*
+	 * Tight buffer.
+	 *
+	 * The man page says that len must be at least 4.
+	 * 3 works, but anything less that will not. This
+	 * is because baselen starts with 2 for positive
+	 * numbers.
+	 */
+	(void)memset(buf, 0, sizeof(buf));
+
+	rv = humanize_number(buf, 3, 1, "", HN_AUTOSCALE, HN_NOSPACE);
+
+	ATF_REQUIRE(rv != -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, humanize_number_basic);
+	ATF_TP_ADD_TC(tp, humanize_number_big);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_isnan.c b/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
new file mode 100644
index 000000000000..2a97b9a91c48
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
@@ -0,0 +1,67 @@
+/* $NetBSD: t_isnan.c,v 1.4 2014/02/09 21:26:07 jmmv Exp $ */
+
+/*
+ * This file is in the Public Domain.
+ *
+ * The nan test is blatently copied by Simon Burge from the infinity
+ * test by Ben Harris.
+ */
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <math.h>
+#include <string.h>
+
+ATF_TC(isnan_basic);
+ATF_TC_HEAD(isnan_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Verify that isnan(3) works");
+}
+
+ATF_TC_BODY(isnan_basic, tc)
+{
+#if defined(__m68k__)
+	atf_tc_skip("Test not applicable on " MACHINE_ARCH);
+#endif
+
+#ifdef NAN
+	/* NAN is meant to be a (float)NaN. */
+	ATF_CHECK(isnan(NAN) != 0);
+	ATF_CHECK(isnan((double)NAN) != 0);
+#else
+	atf_tc_skip("Test not applicable");
+#endif
+}
+
+ATF_TC(isinf_basic);
+ATF_TC_HEAD(isinf_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Verify that isinf(3) works");
+}
+
+ATF_TC_BODY(isinf_basic, tc)
+{
+#if defined(__m68k__)
+	atf_tc_skip("Test not applicable on " MACHINE_ARCH);
+#endif
+
+	/* HUGE_VAL is meant to be an infinity. */
+	ATF_CHECK(isinf(HUGE_VAL) != 0);
+
+	/* HUGE_VALF is the float analog of HUGE_VAL. */
+	ATF_CHECK(isinf(HUGE_VALF) != 0);
+
+	/* HUGE_VALL is the long double analog of HUGE_VAL. */
+	ATF_CHECK(isinf(HUGE_VALL) != 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, isnan_basic);
+	ATF_TP_ADD_TC(tp, isinf_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_nice.c b/contrib/netbsd-tests/lib/libc/gen/t_nice.c
new file mode 100644
index 000000000000..f4a62e9ac751
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_nice.c
@@ -0,0 +1,193 @@
+/*	$NetBSD: t_nice.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_nice.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $");
+
+#include <sys/resource.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static void	*threadfunc(void *);
+
+static void *
+threadfunc(void *arg)
+{
+	int pri, val;
+
+	val = *(int *)arg;
+
+	errno = 0;
+	pri = getpriority(PRIO_PROCESS, 0);
+	ATF_REQUIRE(errno == 0);
+
+	if (pri != val)
+		atf_tc_fail("nice(3) value was not propagated to threads");
+
+	return NULL;
+}
+
+ATF_TC(nice_err);
+ATF_TC_HEAD(nice_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test nice(3) for invalid parameters (PR lib/42587)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(nice_err, tc)
+{
+	int i;
+
+	/*
+	 * The call should fail with EPERM if the
+	 * supplied parameter is negative and the
+	 * caller does not have privileges.
+	 */
+	for (i = -20; i < 0; i++) {
+
+		errno = 0;
+
+		ATF_REQUIRE_ERRNO(EPERM, nice(i) == -1);
+	}
+}
+
+ATF_TC(nice_priority);
+ATF_TC_HEAD(nice_priority, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test nice(3) vs. getpriority(2)");
+}
+
+ATF_TC_BODY(nice_priority, tc)
+{
+	int i, pri, nic;
+	pid_t pid;
+	int sta;
+
+	for (i = 0; i <= 20; i++) {
+
+		nic = nice(i);
+		ATF_REQUIRE(nic != -1);
+
+		errno = 0;
+		pri = getpriority(PRIO_PROCESS, 0);
+		ATF_REQUIRE(errno == 0);
+
+		if (nic != pri)
+			atf_tc_fail("nice(3) and getpriority(2) conflict");
+
+		/*
+		 * Also verify that the nice(3) values
+		 * are inherited by child processes.
+		 */
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		if (pid == 0) {
+
+			errno = 0;
+			pri = getpriority(PRIO_PROCESS, 0);
+			ATF_REQUIRE(errno == 0);
+
+			if (nic != pri)
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+			atf_tc_fail("nice(3) value was not inherited");
+	}
+}
+
+ATF_TC(nice_root);
+ATF_TC_HEAD(nice_root, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that nice(3) works");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(nice_root, tc)
+{
+	int i;
+
+	for (i = -20; i <= 20; i++) {
+
+		ATF_REQUIRE(nice(i) != -1);
+	}
+}
+
+ATF_TC(nice_thread);
+ATF_TC_HEAD(nice_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test nice(3) with threads");
+}
+
+ATF_TC_BODY(nice_thread, tc)
+{
+	pthread_t tid[5];
+	int rv, val;
+	size_t i;
+
+	/*
+	 * Test that the scheduling priority is
+	 * propagated to all system scope threads.
+	 */
+	for (i = 0; i < __arraycount(tid); i++) {
+
+		val = nice(i);
+		ATF_REQUIRE(val != -1);
+
+		rv = pthread_create(&tid[i], NULL, threadfunc, &val);
+		ATF_REQUIRE(rv == 0);
+
+		rv = pthread_join(tid[i], NULL);
+		ATF_REQUIRE(rv == 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nice_err);
+	ATF_TP_ADD_TC(tp, nice_priority);
+	ATF_TP_ADD_TC(tp, nice_root);
+	ATF_TP_ADD_TC(tp, nice_thread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_pause.c b/contrib/netbsd-tests/lib/libc/gen/t_pause.c
new file mode 100644
index 000000000000..62a74c976ba9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_pause.c
@@ -0,0 +1,114 @@
+/* $NetBSD: t_pause.c,v 1.1 2011/05/10 13:03:06 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_pause.c,v 1.1 2011/05/10 13:03:06 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+static bool	fail;
+static void	handler(int);
+
+static void
+handler(int signo)
+{
+
+	if (signo == SIGALRM)
+		fail = false;
+}
+
+ATF_TC(pause_basic);
+ATF_TC_HEAD(pause_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of pause(3), #1");
+}
+
+ATF_TC_BODY(pause_basic, tc)
+{
+
+	fail = true;
+
+	ATF_REQUIRE(signal(SIGALRM, handler) == 0);
+
+	(void)alarm(1);
+
+	if (pause() != -1 || fail != false)
+		atf_tc_fail("pause(3) did not cancel out from a signal");
+}
+
+ATF_TC(pause_kill);
+ATF_TC_HEAD(pause_kill, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of pause(3), #2");
+}
+
+ATF_TC_BODY(pause_kill, tc)
+{
+	pid_t pid;
+	int sta;
+
+	fail = true;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)pause();
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+
+	if (fail != true)
+		atf_tc_fail("child terminated before signal");
+
+	(void)kill(pid, SIGKILL);
+	(void)sleep(1);
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != SIGKILL)
+		atf_tc_fail("pause(3) did not cancel from SIGKILL");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pause_basic);
+	ATF_TP_ADD_TC(tp, pause_kill);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_raise.c b/contrib/netbsd-tests/lib/libc/gen/t_raise.c
new file mode 100644
index 000000000000..adc032fdd98a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_raise.c
@@ -0,0 +1,190 @@
+/*	$NetBSD: t_raise.c,v 1.5 2011/05/10 12:43:42 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_raise.c,v 1.5 2011/05/10 12:43:42 jruoho Exp $");
+
+#include <atf-c.h>
+
+#include <signal.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+static bool	fail;
+static int	count;
+static void	handler_err(int);
+static void	handler_ret(int);
+static void	handler_stress(int);
+static int	sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2, SIGPWR };
+
+static void
+handler_stress(int signo)
+{
+	count++;
+}
+
+static void
+handler_err(int signo)
+{
+	size_t i;
+
+	for (i = 0; i < __arraycount(sig); i++) {
+
+		if (sig[i] == signo) {
+			fail = false;
+			break;
+		}
+	}
+}
+
+static void
+handler_ret(int signo)
+{
+
+	(void)sleep(1);
+
+	fail = false;
+}
+
+ATF_TC(raise_err);
+ATF_TC_HEAD(raise_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test raise(3) for invalid parameters");
+}
+
+ATF_TC_BODY(raise_err, tc)
+{
+	int i = 0;
+
+	while (i < 10) {
+
+		ATF_REQUIRE(raise(10240 + i) == -1);
+
+		i++;
+	}
+}
+
+ATF_TC(raise_ret);
+ATF_TC_HEAD(raise_ret, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test return order of raise(3)");
+}
+
+ATF_TC_BODY(raise_ret, tc)
+{
+	struct sigaction sa;
+
+	fail = true;
+
+	sa.sa_flags = 0;
+	sa.sa_handler = handler_ret;
+
+	/*
+	 * Verify that raise(3) does not return
+	 * before the signal handler returns.
+	 */
+	ATF_REQUIRE(sigemptyset(&sa.sa_mask) == 0);
+	ATF_REQUIRE(sigaction(SIGUSR1, &sa, 0) == 0);
+	ATF_REQUIRE(raise(SIGUSR1) == 0);
+
+	if (fail != false)
+		atf_tc_fail("raise(3) returned before signal handler");
+}
+
+ATF_TC(raise_sig);
+ATF_TC_HEAD(raise_sig, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of raise(3)");
+}
+
+ATF_TC_BODY(raise_sig, tc)
+{
+	struct timespec tv, tr;
+	struct sigaction sa;
+	size_t i;
+
+	for (i = 0; i < __arraycount(sig); i++) {
+
+		(void)memset(&sa, 0, sizeof(struct sigaction));
+
+		fail = true;
+
+		tv.tv_sec = 0;
+		tv.tv_nsec = 2;
+
+		sa.sa_flags = 0;
+		sa.sa_handler = handler_err;
+
+		ATF_REQUIRE(sigemptyset(&sa.sa_mask) == 0);
+		ATF_REQUIRE(sigaction(sig[i], &sa, 0) == 0);
+
+		ATF_REQUIRE(raise(sig[i]) == 0);
+		ATF_REQUIRE(nanosleep(&tv, &tr) == 0);
+
+		if (fail != false)
+			atf_tc_fail("raise(3) did not raise a signal");
+	}
+}
+
+ATF_TC(raise_stress);
+ATF_TC_HEAD(raise_stress, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic stress test with raise(3)");
+}
+
+ATF_TC_BODY(raise_stress, tc)
+{
+	static const int maxiter = 1000 * 10;
+	struct sigaction sa;
+	int i;
+
+	sa.sa_flags = 0;
+	sa.sa_handler = handler_stress;
+
+	ATF_REQUIRE(sigemptyset(&sa.sa_mask) == 0);
+	ATF_REQUIRE(sigaction(SIGUSR1, &sa, 0) == 0);
+
+	for (count = i = 0; i < maxiter; i++)
+		(void)raise(SIGUSR1);
+
+	if (count != maxiter)
+		atf_tc_fail("not all signals were catched");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, raise_err);
+	ATF_TP_ADD_TC(tp, raise_ret);
+	ATF_TP_ADD_TC(tp, raise_sig);
+	ATF_TP_ADD_TC(tp, raise_stress);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_randomid.c b/contrib/netbsd-tests/lib/libc/gen/t_randomid.c
new file mode 100644
index 000000000000..8377806252cd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_randomid.c
@@ -0,0 +1,93 @@
+/* $NetBSD: t_randomid.c,v 1.3 2011/07/07 09:49:59 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <sys/types.h>
+
+#include <assert.h>
+#include <inttypes.h>
+#include <randomid.h>
+#include <stdio.h>
+#include <string.h>
+
+#define	PERIOD		30000
+
+uint64_t last[65536];
+
+ATF_TC(randomid_basic);
+ATF_TC_HEAD(randomid_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check randomid(3)");
+}
+
+ATF_TC_BODY(randomid_basic, tc)
+{
+	static randomid_t ctx = NULL;
+	uint64_t lowest, n, diff;
+	uint16_t id;
+
+	memset(last, 0, sizeof(last));
+	ctx = randomid_new(16, (long)3600);
+
+	lowest = UINT64_MAX;
+
+	for (n = 0; n < 1000000; n++) {
+		id = randomid(ctx);
+
+		if (last[id] > 0) {
+			diff = n - last[id];
+
+			if (diff <= lowest) {
+				if (lowest != UINT64_MAX)
+					printf("id %5d: last call at %9"PRIu64
+					    ", current call %9"PRIu64
+					    " (diff %5"PRIu64"), "
+					    "lowest %"PRIu64"\n",
+					    id, last[id], n, diff, lowest);
+
+				ATF_REQUIRE_MSG(diff >= PERIOD,
+				    "diff (%"PRIu64") less than minimum "
+				    "period (%d)", diff, PERIOD);
+
+				lowest = diff;
+			}
+		}
+
+		last[id] = n;
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, randomid_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_realpath.c b/contrib/netbsd-tests/lib/libc/gen/t_realpath.c
new file mode 100644
index 000000000000..d4998c7ea265
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_realpath.c
@@ -0,0 +1,152 @@
+/* $NetBSD: t_realpath.c,v 1.2 2012/03/27 07:54:58 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_realpath.c,v 1.2 2012/03/27 07:54:58 njoly Exp $");
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static const struct {
+	const char *path;
+	const char *result;
+} paths[] = {
+
+	{ "/",			"/"		},
+	{ "///////",		"/"		},
+	{ "",			NULL		},
+	{ "       ",		NULL		},
+	{ "/      ",		NULL		},
+	{ "      /",		NULL		},
+	{ "/etc///",		"/etc"		},
+	{ "///////etc",		"/etc"		},
+	{ "/a/b/c/d/e",		NULL		},
+	{ "    /usr/bin	   ",	NULL		},
+	{ "\\//////usr//bin",	NULL		},
+	{ "//usr//bin//",	"/usr/bin"	},
+	{ "//////usr//bin//",	"/usr/bin"	},
+	{ "/usr/bin//////////", "/usr/bin"	},
+};
+
+ATF_TC(realpath_basic);
+ATF_TC_HEAD(realpath_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of realpath(3)");
+}
+
+ATF_TC_BODY(realpath_basic, tc)
+{
+	char buf[MAXPATHLEN];
+	char *ptr;
+	size_t i;
+
+	for (i = 0; i < __arraycount(paths); i++) {
+
+		(void)memset(buf, '\0', sizeof(buf));
+
+		ptr = realpath(paths[i].path, buf);
+
+		if (ptr == NULL && paths[i].result == NULL)
+			continue;
+
+		if (ptr == NULL && paths[i].result != NULL)
+			atf_tc_fail("realpath failed for '%s'", paths[i].path);
+
+		if (strcmp(paths[i].result, buf) != 0)
+			atf_tc_fail("expected '%s', got '%s'",
+			    paths[i].result, buf);
+	}
+}
+
+ATF_TC(realpath_huge);
+ATF_TC_HEAD(realpath_huge, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test huge path with realpath(3)");
+}
+
+ATF_TC_BODY(realpath_huge, tc)
+{
+	char result[MAXPATHLEN] = { 0 };
+	char buffer[MAXPATHLEN] = { 0 };
+
+	(void)memset(buffer, '/', sizeof(buffer) - 1);
+
+	ATF_CHECK(realpath(buffer, result) != NULL);
+	ATF_CHECK(strlen(result) == 1);
+	ATF_CHECK(result[0] == '/');
+}
+
+ATF_TC(realpath_symlink);
+ATF_TC_HEAD(realpath_symlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test symbolic link with realpath(3)");
+}
+
+ATF_TC_BODY(realpath_symlink, tc)
+{
+	char path[MAXPATHLEN] = { 0 };
+	char slnk[MAXPATHLEN] = { 0 };
+	char resb[MAXPATHLEN] = { 0 };
+	int fd;
+
+	(void)getcwd(path, sizeof(path));
+	(void)getcwd(slnk, sizeof(slnk));
+
+	(void)strlcat(path, "/realpath", sizeof(path));
+	(void)strlcat(slnk, "/symbolic", sizeof(slnk));
+
+	fd = open(path, O_RDONLY | O_CREAT, 0600);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(symlink(path, slnk) == 0);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(realpath(slnk, resb) != NULL);
+	ATF_REQUIRE(strcmp(resb, path) == 0);
+
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(slnk) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, realpath_basic);
+	ATF_TP_ADD_TC(tp, realpath_huge);
+	ATF_TP_ADD_TC(tp, realpath_symlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c b/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
new file mode 100644
index 000000000000..89818f083083
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
@@ -0,0 +1,132 @@
+/* $NetBSD: t_setdomainname.c,v 1.2 2012/03/25 08:17:54 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_setdomainname.c,v 1.2 2012/03/25 08:17:54 joerg Exp $");
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+static char domain[MAXHOSTNAMELEN];
+
+static const char domains[][MAXHOSTNAMELEN] = {
+	"1234567890",
+	"abcdefghijklmnopqrst",
+	"!#\xa4%&/(..xasS812=!=!(I(!;X;;X.as.dasa=?;,..<>|**^\xa8",
+	"--------------------------------------------------------------------"
+};
+
+ATF_TC_WITH_CLEANUP(setdomainname_basic);
+ATF_TC_HEAD(setdomainname_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of setdomainname(3)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(setdomainname_basic, tc)
+{
+	char name[MAXHOSTNAMELEN];
+	size_t i;
+
+	for (i = 0; i < __arraycount(domains); i++) {
+
+		(void)memset(name, 0, sizeof(name));
+
+		ATF_REQUIRE(setdomainname(domains[i],sizeof(domains[i])) == 0);
+		ATF_REQUIRE(getdomainname(name, sizeof(name)) == 0);
+		ATF_REQUIRE(strcmp(domains[i], name) == 0);
+	}
+
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TC_CLEANUP(setdomainname_basic, tc)
+{
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TC_WITH_CLEANUP(setdomainname_limit);
+ATF_TC_HEAD(setdomainname_limit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Too long domain name errors out?");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(setdomainname_limit, tc)
+{
+	char name[MAXHOSTNAMELEN + 1];
+
+	(void)memset(name, 0, sizeof(name));
+
+	ATF_REQUIRE(setdomainname(name, sizeof(name)) == -1);
+}
+
+ATF_TC_CLEANUP(setdomainname_limit, tc)
+{
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TC_WITH_CLEANUP(setdomainname_perm);
+ATF_TC_HEAD(setdomainname_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Can normal user set the domain name?");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setdomainname_perm, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EPERM, setdomainname(domain, sizeof(domain)) == -1);
+}
+
+ATF_TC_CLEANUP(setdomainname_perm, tc)
+{
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	(void)memset(domain, 0, sizeof(domain));
+
+	ATF_REQUIRE(getdomainname(domain, sizeof(domain)) == 0);
+
+	ATF_TP_ADD_TC(tp, setdomainname_basic);
+	ATF_TP_ADD_TC(tp, setdomainname_limit);
+	ATF_TP_ADD_TC(tp, setdomainname_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c b/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c
new file mode 100644
index 000000000000..a753ac7b0331
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c
@@ -0,0 +1,132 @@
+/* $NetBSD: t_sethostname.c,v 1.3 2012/03/25 08:17:54 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sethostname.c,v 1.3 2012/03/25 08:17:54 joerg Exp $");
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+static char host[MAXHOSTNAMELEN];
+
+static const char hosts[][MAXHOSTNAMELEN] = {
+	"1234567890",
+	"abcdefghijklmnopqrst",
+	"!#\xa4%&/(..xasS812=!=!(I(!;X;;X.as.dasa=?;,..<>|**^\xa8",
+	"--------------------------------------------------------------------"
+};
+
+ATF_TC_WITH_CLEANUP(sethostname_basic);
+ATF_TC_HEAD(sethostname_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of sethostname(3)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sethostname_basic, tc)
+{
+	char name[MAXHOSTNAMELEN];
+	size_t i;
+
+	for (i = 0; i < __arraycount(hosts); i++) {
+
+		(void)memset(name, 0, sizeof(name));
+
+		ATF_REQUIRE(sethostname(hosts[i], sizeof(hosts[i])) == 0);
+		ATF_REQUIRE(gethostname(name, sizeof(name)) == 0);
+		ATF_REQUIRE(strcmp(hosts[i], name) == 0);
+	}
+
+	(void)sethostname(host, sizeof(host));
+}
+
+ATF_TC_CLEANUP(sethostname_basic, tc)
+{
+	(void)sethostname(host, sizeof(host));
+}
+
+ATF_TC_WITH_CLEANUP(sethostname_limit);
+ATF_TC_HEAD(sethostname_limit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Too long host name errors out?");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sethostname_limit, tc)
+{
+	char name[MAXHOSTNAMELEN + 1];
+
+	(void)memset(name, 0, sizeof(name));
+
+	ATF_REQUIRE(sethostname(name, sizeof(name)) == -1);
+}
+
+ATF_TC_CLEANUP(sethostname_limit, tc)
+{
+	(void)sethostname(host, sizeof(host));
+}
+
+ATF_TC_WITH_CLEANUP(sethostname_perm);
+ATF_TC_HEAD(sethostname_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Can normal user set the host name?");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(sethostname_perm, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EPERM, sethostname(host, sizeof(host)) == -1);
+}
+
+ATF_TC_CLEANUP(sethostname_perm, tc)
+{
+	(void)sethostname(host, sizeof(host));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	(void)memset(host, 0, sizeof(host));
+
+	ATF_REQUIRE(gethostname(host, sizeof(host)) == 0);
+
+	ATF_TP_ADD_TC(tp, sethostname_basic);
+	ATF_TP_ADD_TC(tp, sethostname_limit);
+	ATF_TP_ADD_TC(tp, sethostname_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
new file mode 100644
index 000000000000..2fb53e48a1d9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
@@ -0,0 +1,500 @@
+/* $NetBSD: t_siginfo.c,v 1.23 2014/02/09 21:26:07 jmmv Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <sys/inttypes.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/ucontext.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <setjmp.h>
+#include <float.h>
+
+#ifdef HAVE_FENV
+#include <fenv.h>
+#elif defined(_FLOAT_IEEE754)
+#include <ieeefp.h>
+#endif
+
+#include "isqemu.h"
+
+/* for sigbus */
+volatile char *addr;
+
+/* for sigchild */
+pid_t child;
+int code;
+int status;
+
+/* for sigfpe */
+sig_atomic_t fltdiv_signalled = 0;
+sig_atomic_t intdiv_signalled = 0;
+
+static void
+sig_debug(int signo, siginfo_t *info, ucontext_t *ctx)
+{
+	unsigned int i;
+
+	printf("%d %p %p\n", signo, info, ctx);
+	if (info != NULL) {
+		printf("si_signo=%d\n", info->si_signo);
+		printf("si_errno=%d\n", info->si_errno);
+		printf("si_code=%d\n", info->si_code);
+		printf("si_value.sival_int=%d\n", info->si_value.sival_int);
+	}
+	if (ctx != NULL) {
+		printf("uc_flags 0x%x\n", ctx->uc_flags);
+		printf("uc_link %p\n", ctx->uc_link);
+		for (i = 0; i < __arraycount(ctx->uc_sigmask.__bits); i++)
+			printf("uc_sigmask[%d] 0x%x\n", i,
+			    ctx->uc_sigmask.__bits[i]);
+		printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp,
+		    (unsigned long)ctx->uc_stack.ss_size,
+		    ctx->uc_stack.ss_flags);
+		for (i = 0; i < __arraycount(ctx->uc_mcontext.__gregs); i++)
+			printf("uc_mcontext.greg[%d] 0x%lx\n", i,
+			    (long)ctx->uc_mcontext.__gregs[i]);
+	}
+}
+
+static void
+sigalrm_action(int signo, siginfo_t *info, void *ptr)
+{
+
+	sig_debug(signo, info, (ucontext_t *)ptr);
+
+	ATF_REQUIRE_EQ(info->si_signo, SIGALRM);
+	ATF_REQUIRE_EQ(info->si_code, SI_TIMER);
+	ATF_REQUIRE_EQ(info->si_value.sival_int, ITIMER_REAL);
+
+	atf_tc_pass();
+	/* NOTREACHED */
+}
+
+ATF_TC(sigalarm);
+
+ATF_TC_HEAD(sigalarm, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGALRM handler");
+}
+
+ATF_TC_BODY(sigalarm, tc)
+{
+	struct sigaction sa;
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = sigalrm_action;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGALRM, &sa, NULL);
+	for (;;) {
+		alarm(1);
+		sleep(1);
+	}
+	atf_tc_fail("SIGALRM handler wasn't called");
+}
+
+static void
+sigchild_action(int signo, siginfo_t *info, void *ptr)
+{
+	if (info != NULL) {
+		printf("info=%p\n", info);
+		printf("ptr=%p\n", ptr);
+		printf("si_signo=%d\n", info->si_signo);
+		printf("si_errno=%d\n", info->si_errno);
+		printf("si_code=%d\n", info->si_code);
+		printf("si_uid=%d\n", info->si_uid);
+		printf("si_pid=%d\n", info->si_pid);
+		printf("si_status=%d\n", info->si_status);
+		printf("si_utime=%lu\n", (unsigned long int)info->si_utime);
+		printf("si_stime=%lu\n", (unsigned long int)info->si_stime);
+	}
+	ATF_REQUIRE_EQ(info->si_code, code);
+	ATF_REQUIRE_EQ(info->si_signo, SIGCHLD);
+	ATF_REQUIRE_EQ(info->si_uid, getuid());
+	ATF_REQUIRE_EQ(info->si_pid, child);
+	if (WIFEXITED(info->si_status))
+		ATF_REQUIRE_EQ(WEXITSTATUS(info->si_status), status);
+	else if (WIFSTOPPED(info->si_status))
+		ATF_REQUIRE_EQ(WSTOPSIG(info->si_status), status);
+	else if (WIFSIGNALED(info->si_status))
+		ATF_REQUIRE_EQ(WTERMSIG(info->si_status), status);
+}
+
+static void
+setchildhandler(void (*action)(int, siginfo_t *, void *))
+{
+	struct sigaction sa;
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = action;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGCHLD, &sa, NULL);
+}
+
+static void
+sigchild_setup(void)
+{
+	sigset_t set;
+	struct rlimit rlim;
+
+	(void)getrlimit(RLIMIT_CORE, &rlim);
+	rlim.rlim_cur = rlim.rlim_max;
+	(void)setrlimit(RLIMIT_CORE, &rlim);
+
+	setchildhandler(sigchild_action);
+	sigemptyset(&set);
+	sigaddset(&set, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &set, NULL);
+}
+
+ATF_TC(sigchild_normal);
+ATF_TC_HEAD(sigchild_normal, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGCHLD handler "
+	    "when child exits normally");
+}
+
+ATF_TC_BODY(sigchild_normal, tc)
+{
+	sigset_t set;
+
+	sigchild_setup();
+
+	status = 25;
+	code = CLD_EXITED;
+
+	switch ((child = fork())) {
+	case 0:
+		sleep(1);
+		exit(status);
+	case -1:
+		atf_tc_fail("fork failed");
+	default:
+		sigemptyset(&set);
+		sigsuspend(&set);
+	}
+}
+
+ATF_TC(sigchild_dump);
+ATF_TC_HEAD(sigchild_dump, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGCHLD handler "
+	    "when child segfaults");
+}
+
+ATF_TC_BODY(sigchild_dump, tc)
+{
+	sigset_t set;
+
+	sigchild_setup();
+
+	status = SIGSEGV;
+	code = CLD_DUMPED;
+
+	switch ((child = fork())) {
+	case 0:
+		sleep(1);
+		*(volatile long *)0 = 0;
+		atf_tc_fail("Child did not segfault");
+		/* NOTREACHED */
+	case -1:
+		atf_tc_fail("fork failed");
+	default:
+		sigemptyset(&set);
+		sigsuspend(&set);
+	}
+}
+
+ATF_TC(sigchild_kill);
+ATF_TC_HEAD(sigchild_kill, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGCHLD handler "
+	    "when child is killed");
+}
+
+ATF_TC_BODY(sigchild_kill, tc)
+{
+	sigset_t set;
+
+	sigchild_setup();
+
+	status = SIGPIPE;
+	code = CLD_KILLED;
+
+	switch ((child = fork())) {
+	case 0:
+		sigemptyset(&set);
+		sigsuspend(&set);
+		break;
+	case -1:
+		atf_tc_fail("fork failed");
+	default:
+		kill(child, SIGPIPE);
+		sigemptyset(&set);
+		sigsuspend(&set);
+	}
+}
+
+static sigjmp_buf sigfpe_flt_env;
+static void
+sigfpe_flt_action(int signo, siginfo_t *info, void *ptr)
+{
+
+	sig_debug(signo, info, (ucontext_t *)ptr);
+
+	if (fltdiv_signalled++ != 0)
+		atf_tc_fail("FPE handler called more than once");
+
+	ATF_REQUIRE_EQ(info->si_signo, SIGFPE);
+	ATF_REQUIRE_EQ(info->si_code, FPE_FLTDIV);
+	ATF_REQUIRE_EQ(info->si_errno, 0);
+
+	siglongjmp(sigfpe_flt_env, 1);
+}
+
+ATF_TC(sigfpe_flt);
+ATF_TC_HEAD(sigfpe_flt, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGFPE handler "
+	    "for floating div-by-zero");
+}
+
+ATF_TC_BODY(sigfpe_flt, tc)
+{
+	struct sigaction sa;
+	double d = strtod("0", NULL);
+
+	if (isQEMU())
+		atf_tc_skip("Test does not run correctly under QEMU");
+#if defined(__powerpc__)
+	atf_tc_skip("Test not valid on powerpc");
+#endif
+	if (sigsetjmp(sigfpe_flt_env, 0) == 0) {
+		sa.sa_flags = SA_SIGINFO;
+		sa.sa_sigaction = sigfpe_flt_action;
+		sigemptyset(&sa.sa_mask);
+		sigaction(SIGFPE, &sa, NULL);
+#ifdef HAVE_FENV
+		feenableexcept(FE_ALL_EXCEPT);
+#elif defined(_FLOAT_IEEE754)
+		fpsetmask(FP_X_INV|FP_X_DZ|FP_X_OFL|FP_X_UFL|FP_X_IMP);
+#endif
+		printf("%g\n", 1 / d);
+	}
+	if (fltdiv_signalled == 0)
+		atf_tc_fail("FPE signal handler was not invoked");
+}
+
+static sigjmp_buf sigfpe_int_env;
+static void
+sigfpe_int_action(int signo, siginfo_t *info, void *ptr)
+{
+
+	sig_debug(signo, info, (ucontext_t *)ptr);
+
+	if (intdiv_signalled++ != 0)
+		atf_tc_fail("INTDIV handler called more than once");
+
+	ATF_REQUIRE_EQ(info->si_signo, SIGFPE);
+	ATF_REQUIRE_EQ(info->si_code, FPE_INTDIV);
+	atf_tc_expect_pass();
+	ATF_REQUIRE_EQ(info->si_errno, 0);
+
+	siglongjmp(sigfpe_int_env, 1);
+}
+
+ATF_TC(sigfpe_int);
+ATF_TC_HEAD(sigfpe_int, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGFPE handler "
+	    "for integer div-by-zero (PR port-i386/43655)");
+}
+
+ATF_TC_BODY(sigfpe_int, tc)
+{
+	struct sigaction sa;
+	long l = strtol("0", NULL, 10);
+
+#if defined(__powerpc__)
+	atf_tc_skip("Test not valid on powerpc");
+#endif
+	if (sigsetjmp(sigfpe_int_env, 0) == 0) {
+		sa.sa_flags = SA_SIGINFO;
+		sa.sa_sigaction = sigfpe_int_action;
+		sigemptyset(&sa.sa_mask);
+		sigaction(SIGFPE, &sa, NULL);
+#ifdef HAVE_FENV
+		feenableexcept(FE_ALL_EXCEPT);
+#elif defined(_FLOAT_IEEE754)
+		fpsetmask(FP_X_INV|FP_X_DZ|FP_X_OFL|FP_X_UFL|FP_X_IMP);
+#endif
+		printf("%ld\n", 1 / l);
+	}
+	if (intdiv_signalled == 0)
+		atf_tc_fail("FPE signal handler was not invoked");
+}
+
+static void
+sigsegv_action(int signo, siginfo_t *info, void *ptr)
+{
+
+	sig_debug(signo, info, (ucontext_t *)ptr);
+
+	ATF_REQUIRE_EQ(info->si_signo, SIGSEGV);
+	ATF_REQUIRE_EQ(info->si_errno, 0);
+	ATF_REQUIRE_EQ(info->si_code, SEGV_MAPERR);
+	ATF_REQUIRE_EQ(info->si_addr, (void *)0);
+
+	atf_tc_pass();
+	/* NOTREACHED */
+}
+
+ATF_TC(sigsegv);
+ATF_TC_HEAD(sigsegv, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGSEGV handler");
+}
+
+ATF_TC_BODY(sigsegv, tc)
+{
+	struct sigaction sa;
+
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = sigsegv_action;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGSEGV, &sa, NULL);
+
+	*(volatile long *)0 = 0;
+	atf_tc_fail("Test did not fault as expected");
+}
+
+static void
+sigbus_action(int signo, siginfo_t *info, void *ptr)
+{
+
+	printf("si_addr = %p\n", info->si_addr);
+	sig_debug(signo, info, (ucontext_t *)ptr);
+
+	ATF_REQUIRE_EQ(info->si_signo, SIGBUS);
+	ATF_REQUIRE_EQ(info->si_errno, 0);
+	ATF_REQUIRE_EQ(info->si_code, BUS_ADRALN);
+
+#if defined(__i386__) || defined(__x86_64__)
+	atf_tc_expect_fail("x86 architecture does not correctly "
+	    "report the address where the unaligned access occured");
+#endif
+	ATF_REQUIRE_EQ(info->si_addr, (volatile void *)addr);
+
+	atf_tc_pass();
+	/* NOTREACHED */
+}
+
+ATF_TC(sigbus_adraln);
+ATF_TC_HEAD(sigbus_adraln, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that signal trampoline correctly calls SIGBUS handler "
+	    "for invalid address alignment");
+}
+
+ATF_TC_BODY(sigbus_adraln, tc)
+{
+	struct sigaction sa;
+
+#if defined(__alpha__)
+	int rv, val;
+	size_t len = sizeof(val);
+	rv = sysctlbyname("machdep.unaligned_sigbus", &val, &len, NULL, 0);
+	ATF_REQUIRE(rv == 0);
+	if (val == 0)
+		atf_tc_skip("SIGBUS signal not enabled for unaligned accesses");
+#endif
+
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = sigbus_action;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGBUS, &sa, NULL);
+
+	/* Enable alignment checks for x86. 0x40000 is PSL_AC. */
+#if defined(__i386__)
+	__asm__("pushf; orl $0x40000, (%esp); popf");
+#elif defined(__amd64__)
+	__asm__("pushf; orl $0x40000, (%rsp); popf");
+#endif
+
+	addr = calloc(2, sizeof(int));
+	ATF_REQUIRE(addr != NULL);
+
+	if (isQEMU())
+		atf_tc_expect_fail("QEMU fails to trap unaligned accesses");
+
+	/* Force an unaligned access */
+	addr++;
+	printf("now trying to access unaligned address %p\n", addr);
+	ATF_REQUIRE_EQ(*(volatile int *)addr, 0);
+
+	atf_tc_fail("Test did not fault as expected");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sigalarm);
+	ATF_TP_ADD_TC(tp, sigchild_normal);
+	ATF_TP_ADD_TC(tp, sigchild_dump);
+	ATF_TP_ADD_TC(tp, sigchild_kill);
+	ATF_TP_ADD_TC(tp, sigfpe_flt);
+	ATF_TP_ADD_TC(tp, sigfpe_int);
+	ATF_TP_ADD_TC(tp, sigsegv);
+	ATF_TP_ADD_TC(tp, sigbus_adraln);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_sleep.c b/contrib/netbsd-tests/lib/libc/gen/t_sleep.c
new file mode 100644
index 000000000000..e4dc94e21b31
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_sleep.c
@@ -0,0 +1,337 @@
+/* $NetBSD: t_sleep.c,v 1.8 2014/07/15 14:56:34 gson Exp $ */
+
+/*-
+ * Copyright (c) 2006 Frank Kardel
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <errno.h>
+#include <poll.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <sys/cdefs.h>
+#include <sys/event.h>
+#include <sys/signal.h>
+
+#include "isqemu.h"
+
+#define BILLION		1000000000LL	/* nano-seconds per second */
+#define MILLION		1000000LL	/* nano-seconds per milli-second */
+
+#define ALARM		6		/* SIGALRM after this many seconds */
+#define MAXSLEEP	22		/* Maximum delay in seconds */
+#define KEVNT_TIMEOUT	10300		/* measured in milli-seconds */
+#define FUZZ		(40 * MILLION)	/* scheduling fuzz accepted - 40 ms */
+
+/*
+ * Timer notes
+ *
+ * Most tests use FUZZ as their initial delay value, but 'sleep'
+ * starts at 1sec (since it cannot handle sub-second intervals).
+ * Subsequent passes double the previous interval, up to MAXSLEEP.
+ *
+ * The current values result in 5 passes for the 'sleep' test (at 1,
+ * 2, 4, 8, and 16 seconds) and 10 passes for the other tests (at
+ * 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, and 20.48
+ * seconds).
+ *
+ * The ALARM is only set if the current pass's delay is longer, and
+ * only if the ALARM has not already been triggered.
+ *
+ * The 'kevent' test needs the ALARM to be set on a different pass
+ * from when the KEVNT_TIMEOUT fires.  So set ALARM to fire on the
+ * penultimate pass, and the KEVNT_TIMEOUT on the final pass.  We
+ * set KEVNT_TIMEOUT just barely long enough to put it into the
+ * last test pass, and set MAXSLEEP a couple seconds longer than
+ * necessary, in order to avoid a QEMU bug which nearly doubles
+ * some timers.
+ */
+
+static volatile int sig;
+
+int sleeptest(int (*)(struct timespec *, struct timespec *), bool, bool);
+int do_nanosleep(struct timespec *, struct timespec *);
+int do_select(struct timespec *, struct timespec *);
+int do_poll(struct timespec *, struct timespec *);
+int do_sleep(struct timespec *, struct timespec *);
+int do_kevent(struct timespec *, struct timespec *);
+void sigalrm(int);
+
+void
+sigalrm(int s)
+{
+
+	sig++;
+}
+
+int
+do_nanosleep(struct timespec *delay, struct timespec *remain)
+{
+	int ret;
+
+	if (nanosleep(delay, remain) == -1)
+		ret = (errno == EINTR ? 0 : errno);
+	else
+		ret = 0;
+	return ret;
+}
+
+int
+do_select(struct timespec *delay, struct timespec *remain)
+{
+	int ret;
+	struct timeval tv;
+
+	TIMESPEC_TO_TIMEVAL(&tv, delay);
+	if (select(0, NULL, NULL, NULL, &tv) == -1)
+		ret = (errno == EINTR ? 0 : errno);
+	else
+		ret = 0;
+	return ret;
+}
+
+int
+do_poll(struct timespec *delay, struct timespec *remain)
+{
+	int ret;
+	struct timeval tv;
+
+	TIMESPEC_TO_TIMEVAL(&tv, delay);
+	if (pollts(NULL, 0, delay, NULL) == -1)
+		ret = (errno == EINTR ? 0 : errno);
+	else
+		ret = 0;
+	return ret;
+}
+
+int
+do_sleep(struct timespec *delay, struct timespec *remain)
+{
+	struct timeval tv;
+
+	TIMESPEC_TO_TIMEVAL(&tv, delay);
+	remain->tv_sec = sleep(delay->tv_sec);
+	remain->tv_nsec = 0;
+
+	return 0;
+}
+
+int
+do_kevent(struct timespec *delay, struct timespec *remain)
+{
+	struct kevent ktimer;
+	struct kevent kresult;
+	int rtc, kq, kerrno;
+	int tmo;
+
+	ATF_REQUIRE_MSG((kq = kqueue()) != -1, "kqueue: %s", strerror(errno));
+
+	tmo = KEVNT_TIMEOUT;
+
+	/*
+	 * If we expect the KEVNT_TIMEOUT to fire, and we're running
+	 * under QEMU, make sure the delay is long enough to account
+	 * for the effects of PR kern/43997 !
+	 */
+	if (isQEMU() &&
+	    tmo/1000 < delay->tv_sec && tmo/500 > delay->tv_sec)
+		delay->tv_sec = MAXSLEEP;
+
+	EV_SET(&ktimer, 1, EVFILT_TIMER, EV_ADD, 0, tmo, 0);
+
+	rtc = kevent(kq, &ktimer, 1, &kresult, 1, delay);
+	kerrno = errno;
+
+	(void)close(kq);
+
+	if (rtc == -1) {
+		ATF_REQUIRE_MSG(kerrno == EINTR, "kevent: %s", strerror(errno));
+		return 0;
+	}
+
+	if (delay->tv_sec * BILLION + delay->tv_nsec > tmo * MILLION)
+		ATF_REQUIRE_MSG(rtc > 0,
+		    "kevent: KEVNT_TIMEOUT did not cause EVFILT_TIMER event");
+
+	return 0;
+}
+
+ATF_TC(nanosleep);
+ATF_TC_HEAD(nanosleep, tc) 
+{
+ 
+	atf_tc_set_md_var(tc, "descr", "Test nanosleep(2) timing");
+	atf_tc_set_md_var(tc, "timeout", "65");
+} 
+
+ATF_TC_BODY(nanosleep, tc)
+{
+
+	sleeptest(do_nanosleep, true, false);
+}
+
+ATF_TC(select);
+ATF_TC_HEAD(select, tc) 
+{
+ 
+	atf_tc_set_md_var(tc, "descr", "Test select(2) timing");
+	atf_tc_set_md_var(tc, "timeout", "65");
+} 
+
+ATF_TC_BODY(select, tc)
+{
+
+	sleeptest(do_select, true, true);
+}
+
+ATF_TC(poll);
+ATF_TC_HEAD(poll, tc) 
+{
+ 
+	atf_tc_set_md_var(tc, "descr", "Test poll(2) timing");
+	atf_tc_set_md_var(tc, "timeout", "65");
+} 
+
+ATF_TC_BODY(poll, tc)
+{
+
+	sleeptest(do_poll, true, true);
+}
+
+ATF_TC(sleep);
+ATF_TC_HEAD(sleep, tc) 
+{
+ 
+	atf_tc_set_md_var(tc, "descr", "Test sleep(3) timing");
+	atf_tc_set_md_var(tc, "timeout", "65");
+} 
+
+ATF_TC_BODY(sleep, tc)
+{
+
+	sleeptest(do_sleep, false, false);
+}
+
+ATF_TC(kevent);
+ATF_TC_HEAD(kevent, tc) 
+{
+ 
+	atf_tc_set_md_var(tc, "descr", "Test kevent(2) timing");
+	atf_tc_set_md_var(tc, "timeout", "65");
+} 
+
+ATF_TC_BODY(kevent, tc)
+{
+
+	sleeptest(do_kevent, true, true);
+}
+
+int
+sleeptest(int (*test)(struct timespec *, struct timespec *),
+	   bool subsec, bool sim_remain)
+{
+	struct timespec tsa, tsb, tslp, tremain;
+	int64_t delta1, delta2, delta3, round;
+
+	sig = 0;
+	signal(SIGALRM, sigalrm);
+
+	if (subsec) {
+		round = 1;
+		delta3 = FUZZ;
+	} else {
+		round = 1000000000;
+		delta3 = round;
+	}
+
+	tslp.tv_sec = delta3 / 1000000000;
+	tslp.tv_nsec = delta3 % 1000000000;
+
+	while (tslp.tv_sec <= MAXSLEEP) {
+		/*
+		 * disturb sleep by signal on purpose
+		 */ 
+		if (tslp.tv_sec > ALARM && sig == 0)
+			alarm(ALARM);
+
+		clock_gettime(CLOCK_REALTIME, &tsa);
+		(*test)(&tslp, &tremain);
+		clock_gettime(CLOCK_REALTIME, &tsb);
+
+		if (sim_remain) {
+			timespecsub(&tsb, &tsa, &tremain);
+			timespecsub(&tslp, &tremain, &tremain);
+		}
+
+		delta1 = (int64_t)tsb.tv_sec - (int64_t)tsa.tv_sec;
+		delta1 *= BILLION;
+		delta1 += (int64_t)tsb.tv_nsec - (int64_t)tsa.tv_nsec;
+
+		delta2 = (int64_t)tremain.tv_sec * BILLION;
+		delta2 += (int64_t)tremain.tv_nsec;
+
+		delta3 = (int64_t)tslp.tv_sec * BILLION;
+		delta3 += (int64_t)tslp.tv_nsec - delta1 - delta2;
+
+		delta3 /= round;
+		delta3 *= round;
+
+		if (delta3 > FUZZ || delta3 < -FUZZ) {
+			if (!sim_remain)
+				atf_tc_expect_fail("Long reschedule latency "
+				    "due to PR kern/43997");
+
+			atf_tc_fail("Reschedule latency %"PRId64" exceeds "
+			    "allowable fuzz %lld", delta3, FUZZ);
+		}
+		delta3 = (int64_t)tslp.tv_sec * 2 * BILLION;
+		delta3 += (int64_t)tslp.tv_nsec * 2;
+
+		delta3 /= round;
+		delta3 *= round;
+		if (delta3 < FUZZ)
+			break;
+		tslp.tv_sec = delta3 / BILLION;
+		tslp.tv_nsec = delta3 % BILLION;
+	}
+	ATF_REQUIRE_MSG(sig == 1, "Alarm did not fire!");
+
+	atf_tc_pass();
+}
+
+ATF_TP_ADD_TCS(tp) 
+{
+	ATF_TP_ADD_TC(tp, nanosleep);
+	ATF_TP_ADD_TC(tp, select);
+	ATF_TP_ADD_TC(tp, poll); 
+	ATF_TP_ADD_TC(tp, sleep);
+	ATF_TP_ADD_TC(tp, kevent);
+ 
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_syslog.c b/contrib/netbsd-tests/lib/libc/gen/t_syslog.c
new file mode 100644
index 000000000000..c9417c06f302
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_syslog.c
@@ -0,0 +1,56 @@
+/*	$NetBSD: t_syslog.c,v 1.2 2012/03/18 07:00:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <syslog.h>
+
+ATF_TC(syslog_pthread);
+ATF_TC_HEAD(syslog_pthread, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test that syslog(3) "
+	    "works when linked to pthread(3) (PR lib/44248)");
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(syslog_pthread, tc)
+{
+	syslog(LOG_DEBUG, "from tests/lib/libc/gen/t_syslog");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, syslog_pthread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_time.c b/contrib/netbsd-tests/lib/libc/gen/t_time.c
new file mode 100644
index 000000000000..bfbdc73d5db7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_time.c
@@ -0,0 +1,114 @@
+/*	$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+ATF_TC(time_copy);
+ATF_TC_HEAD(time_copy, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test the return values of time(3)");
+}
+
+ATF_TC_BODY(time_copy, tc)
+{
+	time_t t1, t2 = 0;
+
+	t1 = time(&t2);
+
+	if (t1 != t2)
+		atf_tc_fail("incorrect return values from time(3)");
+}
+
+ATF_TC(time_mono);
+ATF_TC_HEAD(time_mono, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test monotonicity of time(3)");
+}
+
+ATF_TC_BODY(time_mono, tc)
+{
+	const size_t maxiter = 10;
+	time_t t1, t2;
+	size_t i;
+
+	for (i = 0; i < maxiter; i++) {
+
+		t1 = time(NULL);
+		(void)sleep(1);
+		t2 = time(NULL);
+
+		(void)fprintf(stderr, "%"PRId64" vs. %"PRId64"\n",
+		    (int64_t)t1, (int64_t)t2);
+
+		if (t1 >= t2)
+			atf_tc_fail("time(3) is not monotonic");
+	}
+}
+
+ATF_TC(time_timeofday);
+ATF_TC_HEAD(time_timeofday, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test time(3) vs. gettimeofday(2)");
+}
+
+ATF_TC_BODY(time_timeofday, tc)
+{
+	struct timeval tv = { 0, 0 };
+	time_t t;
+
+	t = time(NULL);
+	ATF_REQUIRE(gettimeofday(&tv, NULL) == 0);
+
+	(void)fprintf(stderr, "%"PRId64" vs. %"PRId64"\n",
+	    (int64_t)t, (int64_t)tv.tv_sec);
+
+	if (t != tv.tv_sec)
+		atf_tc_fail("time(3) and gettimeofday(2) differ");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, time_copy);
+	ATF_TP_ADD_TC(tp, time_mono);
+	ATF_TP_ADD_TC(tp, time_timeofday);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
new file mode 100644
index 000000000000..0c10c2496443
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
@@ -0,0 +1,188 @@
+/*	$NetBSD: t_ttyname.c,v 1.3 2011/05/01 18:14:01 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ttyname.c,v 1.3 2011/05/01 18:14:01 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static long ttymax = 0;
+
+ATF_TC(ttyname_err);
+ATF_TC_HEAD(ttyname_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors in ttyname(3)");
+}
+
+ATF_TC_BODY(ttyname_err, tc)
+{
+	int fd;
+
+	fd = open("XXX", O_RDONLY);
+
+	if (fd < 0) {
+
+		errno = 0;
+
+		ATF_REQUIRE(isatty(fd) != -1);
+		ATF_REQUIRE(errno == EBADF);
+
+		errno = 0;
+
+		ATF_REQUIRE(ttyname(fd) == NULL);
+		ATF_REQUIRE(errno == EBADF);
+	}
+
+	fd = open("/etc/passwd", O_RDONLY);
+
+	if (fd >= 0) {
+
+		errno = 0;
+
+		ATF_REQUIRE(isatty(fd) != -1);
+		ATF_REQUIRE(errno == ENOTTY);
+
+		errno = 0;
+
+		ATF_REQUIRE(ttyname(fd) == NULL);
+		ATF_REQUIRE(errno == ENOTTY);
+	}
+}
+
+ATF_TC(ttyname_r_err);
+ATF_TC_HEAD(ttyname_r_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors in ttyname_r(3)");
+}
+
+ATF_TC_BODY(ttyname_r_err, tc)
+{
+	char sbuf[0];
+	char *buf;
+	int fd;
+	int rv;
+
+	buf = malloc(ttymax + 1);
+
+	if (buf == NULL)
+		return;
+
+	(void)memset(buf, '\0', ttymax + 1);
+
+	if (isatty(STDIN_FILENO) != 0) {
+
+		rv = ttyname_r(STDIN_FILENO, sbuf, sizeof(sbuf));
+		ATF_REQUIRE(rv == ERANGE);
+	}
+
+	rv = ttyname_r(-1, buf, ttymax);
+	ATF_REQUIRE(rv == EBADF);
+
+	fd = open("/etc/passwd", O_RDONLY);
+
+	if (fd >= 0) {
+		rv = ttyname_r(fd, buf, ttymax);
+		ATF_REQUIRE(rv == ENOTTY);
+		ATF_REQUIRE(close(fd) == 0);
+	}
+
+	free(buf);
+}
+
+ATF_TC(ttyname_r_stdin);
+ATF_TC_HEAD(ttyname_r_stdin, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ttyname_r(3) with stdin(3)");
+}
+
+ATF_TC_BODY(ttyname_r_stdin, tc)
+{
+	const char *str;
+	char *buf;
+	int rv;
+
+	if (isatty(STDIN_FILENO) == 0)
+		return;
+
+	buf = malloc(ttymax + 1);
+
+	if (buf == NULL)
+		return;
+
+	(void)memset(buf, '\0', ttymax + 1);
+
+	str = ttyname(STDIN_FILENO);
+	rv = ttyname_r(STDIN_FILENO, buf, ttymax);
+
+	ATF_REQUIRE(rv == 0);
+	ATF_REQUIRE(str != NULL);
+
+	if (strcmp(str, buf) != 0)
+		atf_tc_fail("ttyname(3) and ttyname_r(3) conflict");
+
+	free(buf);
+}
+
+ATF_TC(ttyname_stdin);
+ATF_TC_HEAD(ttyname_stdin, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ttyname(3) with stdin(3)");
+}
+
+ATF_TC_BODY(ttyname_stdin, tc)
+{
+
+	if (isatty(STDIN_FILENO) != 0)
+		ATF_REQUIRE(ttyname(STDIN_FILENO) != NULL);
+
+	(void)close(STDIN_FILENO);
+
+	ATF_REQUIRE(isatty(STDIN_FILENO) != 1);
+	ATF_REQUIRE(ttyname(STDIN_FILENO) == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ttymax = sysconf(_SC_TTY_NAME_MAX);
+	ATF_REQUIRE(ttymax >= 0);
+
+	ATF_TP_ADD_TC(tp, ttyname_err);
+	ATF_TP_ADD_TC(tp, ttyname_r_err);
+	ATF_TP_ADD_TC(tp, ttyname_r_stdin);
+	ATF_TP_ADD_TC(tp, ttyname_stdin);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_vis.c b/contrib/netbsd-tests/lib/libc/gen/t_vis.c
new file mode 100644
index 000000000000..525bafafb17e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/gen/t_vis.c
@@ -0,0 +1,155 @@
+/*	$NetBSD: t_vis.c,v 1.7 2014/09/08 19:01:03 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <string.h>
+#include <stdlib.h>
+#include <err.h>
+#include <vis.h>
+
+static int styles[] = {
+	VIS_OCTAL,
+	VIS_CSTYLE,
+	VIS_SP,
+	VIS_TAB,
+	VIS_NL,
+	VIS_WHITE,
+	VIS_SAFE,
+#if 0	/* Not reversible */
+	VIS_NOSLASH,
+#endif
+	VIS_HTTP1808,
+	VIS_MIMESTYLE,
+#if 0	/* Not supported by vis(3) */
+	VIS_HTTP1866,
+#endif
+};
+
+#define SIZE	256
+
+ATF_TC(strvis_basic);
+ATF_TC_HEAD(strvis_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test strvis(3)");
+}
+
+ATF_TC_BODY(strvis_basic, tc)
+{
+	char *srcbuf, *dstbuf, *visbuf;
+	unsigned int i, j;
+
+	ATF_REQUIRE((dstbuf = malloc(SIZE)) != NULL);
+	ATF_REQUIRE((srcbuf = malloc(SIZE)) != NULL);
+	ATF_REQUIRE((visbuf = malloc(SIZE * 4 + 1)) != NULL);
+
+	for (i = 0; i < SIZE; i++)
+		srcbuf[i] = (char)i;
+
+	for (i = 0; i < __arraycount(styles); i++) {
+		ATF_REQUIRE(strsvisx(visbuf, srcbuf, SIZE, styles[i], "") > 0);
+		memset(dstbuf, 0, SIZE);
+		ATF_REQUIRE(strunvisx(dstbuf, visbuf, 
+		    styles[i] & (VIS_HTTP1808|VIS_MIMESTYLE)) > 0);
+		for (j = 0; j < SIZE; j++)
+			if (dstbuf[j] != (char)j)
+				atf_tc_fail_nonfatal("Failed for style %x, "
+				    "char %d [%d]", styles[i], j, dstbuf[j]);
+	}
+	free(dstbuf);
+	free(srcbuf);
+	free(visbuf);
+}
+
+ATF_TC(strvis_null);
+ATF_TC_HEAD(strvis_null, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strvis(3) NULL");
+}
+
+ATF_TC_BODY(strvis_null, tc)
+{
+	char dst[] = "fail";
+	strvis(dst, NULL, VIS_SAFE);
+	ATF_REQUIRE(dst[0] == '\0' && dst[1] == 'a');
+}
+
+ATF_TC(strvis_empty);
+ATF_TC_HEAD(strvis_empty, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strvis(3) empty");
+}
+
+ATF_TC_BODY(strvis_empty, tc)
+{
+	char dst[] = "fail";
+	strvis(dst, "", VIS_SAFE);
+	ATF_REQUIRE(dst[0] == '\0' && dst[1] == 'a');
+}
+
+ATF_TC(strunvis_hex);
+ATF_TC_HEAD(strunvis_hex, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strunvis(3) \\xXX");
+}
+
+ATF_TC_BODY(strunvis_hex, tc)
+{
+	static const struct {
+		const char *e;
+		const char *d;
+		int error;
+	} ed[] = {
+		{ "\\xff", "\xff", 1 },
+		{ "\\x1", "\x1", 1 },
+		{ "\\x1\\x02", "\x1\x2", 2 },
+		{ "\\x1x", "\x1x", 2 },
+		{ "\\xx", "", -1 },
+	};
+	char uv[10];
+
+	for (size_t i = 0; i < __arraycount(ed); i++) {
+		ATF_REQUIRE(strunvis(uv, ed[i].e) == ed[i].error);
+		if (ed[i].error > 0)
+			ATF_REQUIRE(memcmp(ed[i].d, uv, ed[i].error) == 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strvis_basic);
+	ATF_TP_ADD_TC(tp, strvis_null);
+	ATF_TP_ADD_TC(tp, strvis_empty);
+	ATF_TP_ADD_TC(tp, strunvis_hex);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/hash/data/md5test-in b/contrib/netbsd-tests/lib/libc/hash/data/md5test-in
new file mode 100644
index 000000000000..763e4f91ccae
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/data/md5test-in
@@ -0,0 +1,7 @@
+
+a
+abc
+message digest
+abcdefghijklmnopqrstuvwxyz
+ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
+12345678901234567890123456789012345678901234567890123456789012345678901234567890
diff --git a/contrib/netbsd-tests/lib/libc/hash/data/md5test-out b/contrib/netbsd-tests/lib/libc/hash/data/md5test-out
new file mode 100644
index 000000000000..bb86bb6556dc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/data/md5test-out
@@ -0,0 +1,7 @@
+d41d8cd98f00b204e9800998ecf8427e
+0cc175b9c0f1b6a831c399e269772661
+900150983cd24fb0d6963f7d28e17f72
+f96b697d7cb7938d525a2f31aaf161d0
+c3fcd3d76192e4007dfb496cca67e13b
+d174ab98d277d9f5a5611c2c9f419d9f
+57edf4a22be3c955ac49da2e2107b67a
diff --git a/contrib/netbsd-tests/lib/libc/hash/data/sha1test-in b/contrib/netbsd-tests/lib/libc/hash/data/sha1test-in
new file mode 100644
index 000000000000..632d13358459
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/data/sha1test-in
@@ -0,0 +1,2 @@
+abc
+abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq
diff --git a/contrib/netbsd-tests/lib/libc/hash/data/sha1test-out b/contrib/netbsd-tests/lib/libc/hash/data/sha1test-out
new file mode 100644
index 000000000000..c23a05876c27
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/data/sha1test-out
@@ -0,0 +1,2 @@
+a9993e364706816aba3e25717850c26c9cd0d89d
+84983e441c3bd26ebaae4aa1f95129e5e54670f1
diff --git a/contrib/netbsd-tests/lib/libc/hash/data/sha1test2-out b/contrib/netbsd-tests/lib/libc/hash/data/sha1test2-out
new file mode 100644
index 000000000000..a483a0e3c378
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/data/sha1test2-out
@@ -0,0 +1 @@
+34aa973cd4c4daa4f61eeb2bdbad27316534016f
diff --git a/contrib/netbsd-tests/lib/libc/hash/h_hash.c b/contrib/netbsd-tests/lib/libc/hash/h_hash.c
new file mode 100644
index 000000000000..33b9f9a62497
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/h_hash.c
@@ -0,0 +1,167 @@
+/*	$NetBSD: h_hash.c,v 1.1 2011/01/02 22:03:25 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Combined MD5/SHA1 time and regression test.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <md5.h>
+#include <sha1.h>
+
+
+int mflag, rflag, sflag, tflag;
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr,
+	    "Usage:\t%s -r[ms] < test-file\n"
+	    "\t%s -t[ms]\n",
+	    getprogname(), getprogname());
+	exit(1);
+	/* NOTREACHED */
+}
+
+static void
+hexdump (unsigned char *buf, int len)
+{
+	int i;
+	for (i=0; i<len; i++) {
+		printf("%02x", buf[i]);
+	}
+	printf("\n");
+}
+
+
+static void
+timetest(void)
+{
+	printf("sorry, not yet\n");
+}
+
+#define CHOMP(buf, len, last) 				\
+	if ((len > 0) &&				\
+	    (buf[len-1] == '\n')) {			\
+		buf[len-1] = '\0';			\
+		len--;					\
+		last = 1;				\
+	}
+
+static void
+regress(void)
+{
+	unsigned char buf[1024];
+	unsigned char out[20];
+	int len, outlen, last;
+	
+	while (fgets((char *)buf, sizeof(buf), stdin) != NULL) {
+		last = 0;
+
+		len = strlen((char *)buf);
+		CHOMP(buf, len, last);
+		if (mflag) {
+			MD5_CTX ctx;
+
+			MD5Init(&ctx);
+			MD5Update(&ctx, buf, len);
+			while (!last &&
+			    fgets((char *)buf, sizeof(buf), stdin) != NULL) {
+				len = strlen((char *)buf);
+				CHOMP(buf, len, last);
+				MD5Update(&ctx, buf, len);
+			}
+			MD5Final(out, &ctx);
+			outlen = 16;
+		} else {
+			SHA1_CTX ctx;
+
+			SHA1Init(&ctx);
+			SHA1Update(&ctx, buf, len);
+			while (!last &&
+			    fgets((char *)buf, sizeof(buf), stdin) != NULL) {
+				len = strlen((char *)buf);
+				CHOMP(buf, len, last);				
+				SHA1Update(&ctx, buf, len);
+			}
+			SHA1Final(out, &ctx);
+			outlen = 20;
+		}
+		hexdump(out, outlen);
+	}
+}
+
+int
+main(int argc, char **argv)
+{
+	int ch;
+
+	while ((ch = getopt(argc, argv, "mrst")) != -1)
+		switch (ch) {
+		case 'm':
+			mflag = 1;
+			break;
+		case 'r':
+			rflag = 1;
+			break;
+		case 's':
+			sflag = 1;
+			break;
+		case 't':
+			tflag = 1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+	if (argc > 0)
+		usage();
+
+	if (!(mflag || sflag))
+		mflag = 1;
+
+	if ((mflag ^ sflag) != 1)
+		usage();
+
+	if ((tflag ^ rflag) != 1)
+		usage();
+
+	if (tflag)
+		timetest();
+
+	if (rflag)
+		regress();
+	
+	exit(0);
+	
+}
diff --git a/contrib/netbsd-tests/lib/libc/hash/t_hash.sh b/contrib/netbsd-tests/lib/libc/hash/t_hash.sh
new file mode 100755
index 000000000000..719f19d30e67
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/t_hash.sh
@@ -0,0 +1,67 @@
+# $NetBSD: t_hash.sh,v 1.1 2011/01/02 22:03:25 pgoyette Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+prog()
+{
+	echo "$(atf_get_srcdir)/h_hash"
+}
+
+datadir()
+{
+	echo "$(atf_get_srcdir)/data"
+}
+
+atf_test_case md5
+md5_head()
+{
+	atf_set "descr" "Checks MD5 functions"
+}
+md5_body()
+{
+	atf_check -o file:"$(datadir)/md5test-out" -x \
+	    "$(prog) -r < $(datadir)/md5test-in"
+}
+
+atf_test_case sha1
+sha1_head()
+{
+	atf_set "descr" "Checks SHA1 functions"
+}
+sha1_body()
+{
+	atf_check -o file:"$(datadir)/sha1test-out" -x \
+	    "$(prog) -rs < $(datadir)/sha1test-in"
+
+	atf_check -o file:"$(datadir)/sha1test2-out" -x \
+	    "jot -s '' -b 'a' -n 1000000 | $(prog) -rs"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case md5
+	atf_add_test_case sha1
+}
diff --git a/contrib/netbsd-tests/lib/libc/hash/t_sha2.c b/contrib/netbsd-tests/lib/libc/hash/t_sha2.c
new file mode 100644
index 000000000000..a45e82ac57d3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/hash/t_sha2.c
@@ -0,0 +1,243 @@
+/*	$NetBSD: t_sha2.c,v 1.3 2012/09/26 22:23:30 joerg Exp $	*/
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sha2.c,v 1.3 2012/09/26 22:23:30 joerg Exp $");
+
+#include <atf-c.h>
+#include <sys/types.h>
+#include <sha2.h>
+#include <string.h>
+
+ATF_TC(t_sha256);
+ATF_TC(t_sha384);
+ATF_TC(t_sha512);
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_sha256);
+	ATF_TP_ADD_TC(tp, t_sha384);
+	ATF_TP_ADD_TC(tp, t_sha512);
+
+	return atf_no_error();
+}
+
+struct testvector {
+	const char *vector;
+	const char *hash;
+};
+
+static const struct testvector test256[] = {
+	{ "hello, world", "09ca7e4eaa6e8ae9c7d261167129184883644d07dfba7cbfbc4c8a2e08360d5b" },
+	{ "", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" },
+	{ "a", "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" },
+	{ "ab", "fb8e20fc2e4c3f248c60c39bd652f3c1347298bb977b8b4d5903b85055620603" },
+	{ "abc", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" },
+	{ "abcd", "88d4266fd4e6338d13b845fcf289579d209c897823b9217da3e161936f031589" },
+	{ "abcde", "36bbe50ed96841d10443bcb670d6554f0a34b761be67ec9c4a8ad2c0c44ca42c" },
+	{ "abcdef", "bef57ec7f53a6d40beb640a780a639c83bc29ac8a9816f1fc6c5c6dcd93c4721" },
+	{ "abcdefg", "7d1a54127b222502f5b79b5fb0803061152a44f92b37e23c6527baf665d4da9a" },
+	{ "abcdefgh", "9c56cc51b374c3ba189210d5b6d4bf57790d351c96c47c02190ecf1e430635ab" },
+	{ "abcdefghi", "19cc02f26df43cc571bc9ed7b0c4d29224a3ec229529221725ef76d021c8326f" },
+	{ "abcdefghij", "72399361da6a7754fec986dca5b7cbaf1c810a28ded4abaf56b2106d06cb78b0" },
+	{ "abcdefghijk", "ca2f2069ea0c6e4658222e06f8dd639659cbb5e67cbbba6734bc334a3799bc68" },
+	{ "abcdefghijkl", "d682ed4ca4d989c134ec94f1551e1ec580dd6d5a6ecde9f3d35e6e4a717fbde4" },
+	{ "abcdefghijklm", "ff10304f1af23606ede1e2d8abcdc94c229047a61458d809d8bbd53ede1f6598" },
+	{ "abcdefghijklmn", "0653c7e992d7aad40cb2635738b870e4c154afb346340d02c797d490dd52d5f9" },
+	{ "abcdefghijklmno", "41c7760c50efde99bf574ed8fffc7a6dd3405d546d3da929b214c8945acf8a97" },
+	{ "abcdefghijklmnop", "f39dac6cbaba535e2c207cd0cd8f154974223c848f727f98b3564cea569b41cf" },
+	{ "abcdefghijklmnopq", "918a954ac4dfb54ac39f068d9868227f69ab39bc362e2c9b0083bf6a109d6ad7" },
+	{ "abcdefghijklmnopqr", "2d1222692afaf56e95a8ab00879ed023a00db3e26fa14236e542748579285efa" },
+	{ "abcdefghijklmnopqrs", "e250f886728b77ba63722c7e65fc73e203101a84281b32332fd67cc6a1ae3e22" },
+	{ "abcdefghijklmnopqrst", "dd65eea0329dcb94b17187af9dff28c31a1d78026737a16af75979a1fa4618e5" },
+	{ "abcdefghijklmnopqrstu", "25f62a5a3d414ec6e20907df7f367f2b72625aade552db64c07933f6044fc49a" },
+	{ "abcdefghijklmnopqrstuv", "f69f9b70d1c9a5442258ca76f8b0a7a45fcb4e31c36141b6357ec591328b0624" },
+	{ "abcdefghijklmnopqrstuvw", "7f07818e14d08944ce145629ca54332f5cfad148c590efbcb5c377f4d336e5f4" },
+	{ "abcdefghijklmnopqrstuvwq", "063132d7fbec0acb79b2f228777eec8885e7f09bc1896b3ce5aa1843e83de048" },
+};
+
+static const struct testvector test384[] = {
+	{ "hello, world", "1fcdb6059ce05172a26bbe2a3ccc88ed5a8cd5fc53edfd9053304d429296a6da23b1cd9e5c9ed3bb34f00418a70cdb7e" },
+	{ "", "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" },
+	{ "a", "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31" },
+	{ "ab", "c7be03ba5bcaa384727076db0018e99248e1a6e8bd1b9ef58a9ec9dd4eeebb3f48b836201221175befa74ddc3d35afdd" },
+	{ "abc", "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7" },
+	{ "abcd", "1165b3406ff0b52a3d24721f785462ca2276c9f454a116c2b2ba20171a7905ea5a026682eb659c4d5f115c363aa3c79b" },
+	{ "abcde", "4c525cbeac729eaf4b4665815bc5db0c84fe6300068a727cf74e2813521565abc0ec57a37ee4d8be89d097c0d2ad52f0" },
+	{ "abcdef", "c6a4c65b227e7387b9c3e839d44869c4cfca3ef583dea64117859b808c1e3d8ae689e1e314eeef52a6ffe22681aa11f5" },
+	{ "abcdefg", "9f11fc131123f844c1226f429b6a0a6af0525d9f40f056c7fc16cdf1b06bda08e302554417a59fa7dcf6247421959d22" },
+	{ "abcdefgh", "9000cd7cada59d1d2eb82912f7f24e5e69cc5517f68283b005fa27c285b61e05edf1ad1a8a9bded6fd29eb87d75ad806" },
+	{ "abcdefghi", "ef54915b60cf062b8dd0c29ae3cad69abe6310de63ac081f46ef019c5c90897caefd79b796cfa81139788a260ded52df" },
+	{ "abcdefghij", "a12070030a02d86b0ddacd0d3a5b598344513d0a051e7355053e556a0055489c1555399b03342845c4adde2dc44ff66c" },
+	{ "abcdefghijk", "2440d0e751fe5b8b1aba067e20be00b9deecc5e218b0b4b37202de824bcd04294d67c8d0b73e393afa844fa9ca25fa51" },
+	{ "abcdefghijkl", "103ca96c06a1ce798f08f8eff0dfb0ccdb567d48b285b23d0cd773454667a3c2fa5f1b58d9cdf2329bd9979730bfaaff" },
+	{ "abcdefghijklm", "89a7179df195462f047393c36e4843183eb38404bdfbacfd0b0f9c2556632a2799f19c3ecf48bdb7c9bdf95d3f6c3704" },
+	{ "abcdefghijklmn", "3bc463b0a5614d39fd207cbfd108534bce68d5438235c6c577b34b70fe219954adceaf8808d1fad4a44fc9c420ea8ff1" },
+	{ "abcdefghijklmno", "5149860ee76dd6666308189e60090d615e36ce0c0ef753a610cca0524a022900489d70167a47cc74c4dd9f9f340066af" },
+	{ "abcdefghijklmnop", "96d3c1b54b1938600abe5b57232e185df1c5856f74656b8f9837c5317cf5b22ac38226fafc8c946b9d20aca1b0c53a98" },
+	{ "abcdefghijklmnopq", "dae0d8c29d8f1137df3afb8f502dc474d3bbb56de0c10fc219547826f23f38f37ec29e4ed203908e6e7955c83a138129" },
+	{ "abcdefghijklmnopqr", "5cfa62716d985d3b1efab0ed3460e7b7f6af9439ae8ee5c58b20e68607eeec3e8c6df8481f5f36e726eaa56512acea6e" },
+	{ "abcdefghijklmnopqrs", "c5d404fc93b0e59ecb5f40446da201876faf18a0af46e577ae2f7a4fe56dc4c419afff7edec90ff3de160d0c5e7a5ec1" },
+	{ "abcdefghijklmnopqrst", "bc1511cd8b813544cb60b13d1ceb63e81f46aa3ca114a23fc5c3aba54f9965cdf9afa68e2dc2a680934e429dff5aa7f2" },
+	{ "abcdefghijklmnopqrstu", "8f18622d37e0aceabba191e3836b30e8970aca202ce6e811f586ec5f950edb7bf799cc88a18468a3effb063397242d95" },
+	{ "abcdefghijklmnopqrstuv", "c8a4f46e609626543ce6c1362721fcbe95c8e7405aaee61da4f2da1740f0351172c98a66530f8607bf8609e387ff8456" },
+	{ "abcdefghijklmnopqrstuvw", "2daff33b3bd67de61550070696b431d54b1397b40d053912b07a94260812185907726e3efbe9ae9fc078659cd2ce36db" },
+	{ "abcdefghijklmnopqrstuvwq", "87dc70a2eaa0dd0b687f91f26383866161026e41bb310a9e32b7a17c99284db85b9743476a30caeedf3fbb3c8072bc5e" },
+};
+
+static const struct testvector test512[] = {
+	{ "hello, world", "8710339dcb6814d0d9d2290ef422285c9322b7163951f9a0ca8f883d3305286f44139aa374848e4174f5aada663027e4548637b6d19894aec4fb6c46a139fbf9" },
+	{ "", "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" },
+	{ "a", "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75" },
+	{ "ab", "2d408a0717ec188158278a796c689044361dc6fdde28d6f04973b80896e1823975cdbf12eb63f9e0591328ee235d80e9b5bf1aa6a44f4617ff3caf6400eb172d" },
+	{ "abc", "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f" },
+	{ "abcd", "d8022f2060ad6efd297ab73dcc5355c9b214054b0d1776a136a669d26a7d3b14f73aa0d0ebff19ee333368f0164b6419a96da49e3e481753e7e96b716bdccb6f" },
+	{ "abcde", "878ae65a92e86cac011a570d4c30a7eaec442b85ce8eca0c2952b5e3cc0628c2e79d889ad4d5c7c626986d452dd86374b6ffaa7cd8b67665bef2289a5c70b0a1" },
+	{ "abcdef", "e32ef19623e8ed9d267f657a81944b3d07adbb768518068e88435745564e8d4150a0a703be2a7d88b61e3d390c2bb97e2d4c311fdc69d6b1267f05f59aa920e7" },
+	{ "abcdefg", "d716a4188569b68ab1b6dfac178e570114cdf0ea3a1cc0e31486c3e41241bc6a76424e8c37ab26f096fc85ef9886c8cb634187f4fddff645fb099f1ff54c6b8c" },
+	{ "abcdefgh", "a3a8c81bc97c2560010d7389bc88aac974a104e0e2381220c6e084c4dccd1d2d17d4f86db31c2a851dc80e6681d74733c55dcd03dd96f6062cdda12a291ae6ce" },
+	{ "abcdefghi", "f22d51d25292ca1d0f68f69aedc7897019308cc9db46efb75a03dd494fc7f126c010e8ade6a00a0c1a5f1b75d81e0ed5a93ce98dc9b833db7839247b1d9c24fe" },
+	{ "abcdefghij", "ef6b97321f34b1fea2169a7db9e1960b471aa13302a988087357c520be957ca119c3ba68e6b4982c019ec89de3865ccf6a3cda1fe11e59f98d99f1502c8b9745" },
+	{ "abcdefghijk", "2798fd001ee8800e3da09ee99ae9600de2d0ccf464ab782c92fcc06ce3847cef0743365f1d49c2c8b4426db1635433f937d508672a9d0cb673b84f368eca1b23" },
+	{ "abcdefghijkl", "17807c728ee3ba35e7cf7af823116d26e41e5d4d6c2ff1f3720d3d96aacb6f69de642e63d5b73fc396c12be38b2bd5d884257c32c8f6d0854ae6b540f86dda2e" },
+	{ "abcdefghijklm", "e11a66f7b9a2acda5663e9434377137d73ea560a32782230412642a463c8558123bfb7c0dbf17851e9aa58cc9587c3b4f5e3f7f38dcb6f890702e5bed4d5b54a" },
+	{ "abcdefghijklmn", "8334134081070bf7fcc8bf1c242d24bb3182a5119e5fb19d8bbf6b9d0cdb7fed5336e83415fce93094c0e55123cf69e14d7ae41b22289232699824e31125b6d9" },
+	{ "abcdefghijklmno", "db723f341a042d8de1aa813efd5e02fc1745ccbe259486257514804e2ec4bcebb2a46f1e4ad442154943f9e97e1bc47c3ae0eddab7de0c01a9c51f15342a5b19" },
+	{ "abcdefghijklmnop", "d0cadd6834fa0c157b36cca30ee8b0b1435d841aa5b5ac850c11ae80a1440f51743e98fb1f1e7376c70f2f65404f088c28bcb4a511df2e64111f8f7424364b60" },
+	{ "abcdefghijklmnopq", "6196942a8495b721f82bbc385c74c1f10eeadf35db8adc9cf1a05ddeed19351228279644cd5d686ee48a31631ebb64747a2b68b733dd6015e3d27750878fa875" },
+	{ "abcdefghijklmnopqr", "fb3bd1fc157ea6f7a6728986a59b271b766fb723f6b7cf2b4194437435f2c497f33b6a56ae7eb3830fa9e04d5ebb4cb5e3f4d4bd812c498bdf0167e125de3fba" },
+	{ "abcdefghijklmnopqrs", "836f9ecf2aa02f522a94f1370af45a9fd538ac3c70e3b709d614b2f8981881d6b0070fc6387b74ee371fc2549309f82926e78084b401deb61a106c399089bee8" },
+	{ "abcdefghijklmnopqrst", "8cd9c137651425fb32d193d99b281735ec68eb5fd296f16459d1b33eac7badcfce0dca22eadaa5f209fa4ac3bbecd41342bac8b8a5dc3626e7f22cdc96e17cb4" },
+	{ "abcdefghijklmnopqrstu", "7079853a3e36241a8d83639f168ef38e883d7f72851a84ef3ed4d91c6a3896cf542b8b4518c2816fb19d4692a4b9aae65cb857e3642ce0a3936e20363bcbd4ca" },
+	{ "abcdefghijklmnopqrstuv", "a4e8a90b7058fb078e6cdcfd0c6a33c366437eb9084eac657830356804c9f9b53f121496d8e972d8707a4cf02615e6f58ed1a770c28ac79ffd845401fe18a928" },
+	{ "abcdefghijklmnopqrstuvw", "d91b1fd7c7785975493826719f333d090b214ff42351c84d8f8b2538509a28d2d59a36d0ac798d99d3908083b072a4be606ae391def5daa74156350fec71dd24" },
+	{ "abcdefghijklmnopqrstuvwq", "404eb5652173323320cac6bf8d9714aef0747693a8ab4570700c6262268d367f30e31c44fa66860568ff058fe39c9aa8dac76bc78566c691a884cb9052c4aa0a" },
+};
+
+static void
+digest2string(const uint8_t *digest, char *string, size_t len)
+{
+	while (len--) {
+		if (*digest / 16 < 10)
+			*string++ = '0' + *digest / 16;
+		else
+			*string++ = 'a' + *digest / 16 - 10;
+		if (*digest % 16 < 10)
+			*string++ = '0' + *digest % 16;
+		else
+			*string++ = 'a' + *digest % 16 - 10;
+		++digest;
+	}
+	*string = '\0';
+}
+
+ATF_TC_HEAD(t_sha256, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test SHA256 functions for consistent results");
+}
+
+ATF_TC_BODY(t_sha256, tc)
+{
+	size_t i, j, len;
+	SHA256_CTX ctx;
+	unsigned char buf[256];
+	unsigned char digest[8 + SHA256_DIGEST_LENGTH];
+	char output[SHA256_DIGEST_STRING_LENGTH];
+
+	for (i = 0; i < sizeof(test256) / sizeof(test256[0]); ++i) {
+		len = strlen(test256[i].vector);
+		for (j = 0; j < 8; ++j) {
+			SHA256_Init(&ctx);
+			memcpy(buf + j, test256[i].vector, len);
+			SHA256_Update(&ctx, buf + j, len);
+			SHA256_Final(digest + j, &ctx);
+			digest2string(digest + j, output, SHA256_DIGEST_LENGTH);
+			ATF_CHECK_STREQ(test256[i].hash, output);
+		}
+	}
+}
+
+ATF_TC_HEAD(t_sha384, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test SHA384 functions for consistent results");
+}
+
+ATF_TC_BODY(t_sha384, tc)
+{
+	size_t i, j, len;
+	SHA384_CTX ctx;
+	unsigned char buf[384];
+	unsigned char digest[8 + SHA384_DIGEST_LENGTH];
+	char output[SHA384_DIGEST_STRING_LENGTH];
+
+	for (i = 0; i < sizeof(test384) / sizeof(test384[0]); ++i) {
+		len = strlen(test384[i].vector);
+		for (j = 0; j < 8; ++j) {
+			SHA384_Init(&ctx);
+			memcpy(buf + j, test384[i].vector, len);
+			SHA384_Update(&ctx, buf + j, len);
+			SHA384_Final(digest + j, &ctx);
+			digest2string(digest + j, output, SHA384_DIGEST_LENGTH);
+			ATF_CHECK_STREQ(test384[i].hash, output);
+		}
+	}
+}
+
+ATF_TC_HEAD(t_sha512, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test SHA512 functions for consistent results");
+}
+
+ATF_TC_BODY(t_sha512, tc)
+{
+	size_t i, j, len;
+	SHA512_CTX ctx;
+	unsigned char buf[512];
+	unsigned char digest[8 + SHA512_DIGEST_LENGTH];
+	char output[SHA512_DIGEST_STRING_LENGTH];
+
+	for (i = 0; i < sizeof(test512) / sizeof(test512[0]); ++i) {
+		len = strlen(test512[i].vector);
+		for (j = 0; j < 8; ++j) {
+			SHA512_Init(&ctx);
+			memcpy(buf + j, test512[i].vector, len);
+			SHA512_Update(&ctx, buf + j, len);
+			SHA512_Final(digest + j, &ctx);
+			digest2string(digest + j, output, SHA512_DIGEST_LENGTH);
+			ATF_CHECK_STREQ(test512[i].hash, output);
+		}
+	}
+}
diff --git a/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c b/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c
new file mode 100644
index 000000000000..99f75b3804b4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c
@@ -0,0 +1,170 @@
+/* $NetBSD: t_inet_network.c,v 1.3 2011/07/15 11:27:23 jruoho Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Brian Ginsbach.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_inet_network.c,v 1.3 2011/07/15 11:27:23 jruoho Exp $");
+
+#include <arpa/inet.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <string.h>
+
+#define H_REQUIRE(input, expected)					\
+	ATF_REQUIRE_EQ_MSG(inet_network(input), (in_addr_t) expected,	\
+	    "inet_network(%s) returned: 0x%08X, expected: %s", #input,	\
+	    inet_network(input), #expected)
+
+ATF_TC(inet_addr_basic);
+ATF_TC_HEAD(inet_addr_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks inet_addr(3)");
+}
+
+ATF_TC_BODY(inet_addr_basic, tc)
+{
+	static const char *addrs[] = {
+		"127.0.0.1", "99.99.99.99", "0.0.0.0", "255.255.255.255" };
+
+	struct in_addr ia;
+	const char *ian;
+	in_addr_t addr;
+	size_t i;
+
+	for (i = 0; i < __arraycount(addrs); i++) {
+
+		(void)fprintf(stderr, "checking %s\n", addrs[i]);;
+
+		addr = inet_addr(addrs[i]);
+		ia.s_addr = addr;
+		ian = inet_ntoa(ia);
+
+		ATF_REQUIRE(ian != NULL);
+		ATF_CHECK(strcmp(ian, addrs[i]) == 0);
+	}
+}
+
+ATF_TC(inet_addr_err);
+ATF_TC_HEAD(inet_addr_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Invalid addresses with inet_addr(3)");
+}
+
+ATF_TC_BODY(inet_addr_err, tc)
+{
+	static const char *addrs[] = {
+		". . . .", "1.2.3.", "0.0.0.256", "255.255.255.256",
+		"................................................",
+		"a.b.c.d", "0x0.0x1.0x2.0x3", "-1.-1.-1.-1", "", " "};
+
+	struct in_addr ia;
+	const char *ian;
+	in_addr_t addr;
+	size_t i;
+
+	for (i = 0; i < __arraycount(addrs); i++) {
+
+		(void)fprintf(stderr, "checking %s\n", addrs[i]);;
+
+		addr = inet_addr(addrs[i]);
+		ia.s_addr = addr;
+		ian = inet_ntoa(ia);
+
+		ATF_REQUIRE(ian != NULL);
+		ATF_CHECK(strcmp(ian, addrs[i]) != 0);
+	}
+}
+
+ATF_TC(inet_network_basic);
+ATF_TC_HEAD(inet_network_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks inet_network(3)");
+}
+
+ATF_TC_BODY(inet_network_basic, tc)
+{
+
+	H_REQUIRE("0x12", 0x00000012);
+	H_REQUIRE("127.1", 0x00007f01);
+	H_REQUIRE("127.1.2.3", 0x7f010203);
+	H_REQUIRE("0X12", 0x00000012);
+	H_REQUIRE("0", 0x0);
+	H_REQUIRE("01.02.07.077", 0x0102073f);
+	H_REQUIRE("0x1.23.045.0", 0x01172500);
+	H_REQUIRE("0x12.0x34", 0x00001234);
+
+	/* This is valid (because of the trailing space after the digit). */
+	H_REQUIRE("1 bar", 0x00000001);
+}
+
+ATF_TC(inet_network_err);
+ATF_TC_HEAD(inet_network_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Invalid addresses w/ inet_network(3)");
+}
+
+ATF_TC_BODY(inet_network_err, tc)
+{
+	/* Malformed requests. */
+	H_REQUIRE("4.2.3.1.", 0xffffffff);
+	H_REQUIRE("0x123456", 0xffffffff);
+	H_REQUIRE("0x12.0x345", 0xffffffff);
+	H_REQUIRE("1.2.3.4.5", 0xffffffff);
+	H_REQUIRE("1..3.4", 0xffffffff);
+	H_REQUIRE(".", 0xffffffff);
+	H_REQUIRE("1.", 0xffffffff);
+	H_REQUIRE(".1", 0xffffffff);
+	H_REQUIRE("0x", 0xffffffff);
+	H_REQUIRE("", 0xffffffff);
+	H_REQUIRE(" ", 0xffffffff);
+	H_REQUIRE("bar", 0xffffffff);
+	H_REQUIRE("1.2bar", 0xffffffff);
+	H_REQUIRE("1.", 0xffffffff);
+	H_REQUIRE("\xc3\x8a\xc3\x83\xc3\x95\xc3\x8b\xc3\x85\xc3\x8e",
+		0xffffffff);
+	H_REQUIRE("255.255.255.255", 0xffffffff);
+	H_REQUIRE("x", 0xffffffff);
+	H_REQUIRE("078", 0xffffffff);
+	H_REQUIRE("127.0xfff", 0xffffffff);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, inet_addr_basic);
+	ATF_TP_ADD_TC(tp, inet_addr_err);
+	ATF_TP_ADD_TC(tp, inet_network_basic);
+	ATF_TP_ADD_TC(tp, inet_network_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_io.c b/contrib/netbsd-tests/lib/libc/locale/t_io.c
new file mode 100644
index 000000000000..782bed8f9e8a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_io.c
@@ -0,0 +1,178 @@
+/* $NetBSD: t_io.c,v 1.4 2014/01/21 00:32:16 yamt Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_io.c,v 1.4 2014/01/21 00:32:16 yamt Exp $");
+
+#include <sys/param.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+
+ATF_TC(bad_big5_wprintf);
+ATF_TC_HEAD(bad_big5_wprintf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bad big5 wchar wprintf");
+}
+
+ATF_TC_BODY(bad_big5_wprintf, tc)
+{
+	/* XXX implementation detail knowledge (wchar_t encoding) */
+	wchar_t ibuf[] = { 0xcf10, 0 };
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	ATF_REQUIRE_ERRNO(EILSEQ, wprintf(L"%ls\n", ibuf) < 0);
+	ATF_REQUIRE(ferror(stdout));
+}
+
+ATF_TC(bad_big5_swprintf);
+ATF_TC_HEAD(bad_big5_swprintf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bad big5 wchar swprintf");
+}
+
+ATF_TC_BODY(bad_big5_swprintf, tc)
+{
+	/* XXX implementation detail knowledge (wchar_t encoding) */
+	wchar_t ibuf[] = { 0xcf10, 0 };
+	wchar_t obuf[20];
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	ATF_REQUIRE_ERRNO(EILSEQ,
+			  swprintf(obuf, sizeof(obuf), L"%ls\n", ibuf) < 0);
+}
+
+ATF_TC(good_big5_wprintf);
+ATF_TC_HEAD(good_big5_wprintf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test good big5 wchar wprintf");
+}
+
+ATF_TC_BODY(good_big5_wprintf, tc)
+{
+	/* XXX implementation detail knowledge (wchar_t encoding) */
+	wchar_t ibuf[] = { 0xcf40, 0 };
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	ATF_REQUIRE_EQ(wprintf(L"%ls\n", ibuf), 2);
+}
+
+ATF_TC(good_big5_swprintf);
+ATF_TC_HEAD(good_big5_swprintf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test good big5 wchar swprintf");
+}
+
+ATF_TC_BODY(good_big5_swprintf, tc)
+{
+	/* XXX implementation detail knowledge (wchar_t encoding) */
+	wchar_t ibuf[] = { 0xcf40, 0 };
+	wchar_t obuf[20];
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	ATF_REQUIRE_EQ(swprintf(obuf, sizeof(obuf), L"%ls\n", ibuf), 2);
+}
+
+struct ibuf {
+	off_t off;
+	size_t buflen;
+	const char *buf;
+};
+
+static int
+readfn(void *vp, char *buf, int len)
+{
+	struct ibuf *ib = vp;
+	size_t todo = MIN((size_t)len, ib->buflen - ib->off);
+
+	memcpy(buf, ib->buf + ib->off, todo);
+	ib->off += todo;
+	return todo;
+}
+
+ATF_TC(good_big5_getwc);
+ATF_TC_HEAD(good_big5_getwc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test good big5 wchar getwc");
+}
+
+ATF_TC_BODY(good_big5_getwc, tc)
+{
+	const char buf[] = { 0xcf, 0x40 };
+	struct ibuf ib = {
+		.buf = buf,
+		.buflen = sizeof(buf),
+	};
+	FILE *fp = funopen(&ib, readfn, NULL, NULL, NULL);
+
+	ATF_REQUIRE(fp != NULL);
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	/* XXX implementation detail knowledge (wchar_t encoding) */
+	ATF_REQUIRE_EQ(getwc(fp), 0xcf40);
+	fclose(fp);
+}
+
+ATF_TC(bad_big5_getwc);
+ATF_TC_HEAD(bad_big5_getwc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bad big5 wchar getwc");
+}
+
+ATF_TC_BODY(bad_big5_getwc, tc)
+{
+	const char buf[] = { 0xcf, 0x20 };
+	struct ibuf ib = {
+		.buf = buf,
+		.buflen = sizeof(buf),
+	};
+	FILE *fp = funopen(&ib, readfn, NULL, NULL, NULL);
+
+	ATF_REQUIRE(fp != NULL);
+	setlocale(LC_CTYPE, "zh_TW.Big5");
+	ATF_REQUIRE_EQ(getwc(fp), WEOF);
+	fclose(fp);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, bad_big5_wprintf);
+	ATF_TP_ADD_TC(tp, bad_big5_swprintf);
+	ATF_TP_ADD_TC(tp, good_big5_wprintf);
+	ATF_TP_ADD_TC(tp, good_big5_swprintf);
+	ATF_TP_ADD_TC(tp, good_big5_getwc);
+	ATF_TP_ADD_TC(tp, bad_big5_getwc);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c b/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
new file mode 100644
index 000000000000..b4ad8411aed7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
@@ -0,0 +1,267 @@
+/* $NetBSD: t_mbrtowc.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by YAMAMOTO Takashi
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2003 Citrus Project,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mbrtowc.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $");
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+#define SIZE 256
+
+static struct test {
+	const char *locale;
+	const char *data;
+	const wchar_t wchars[64];
+	const wchar_t widths[64];
+	size_t length;
+} tests[] = {
+{
+	"C",
+	"ABCD01234_\\",
+	{ 0x41, 0x42, 0x43, 0x44, 0x30, 0x31, 0x32, 0x33, 0x34, 0x5F, 0x5C },
+	{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+	11
+}, {
+	"en_US.UTF-8",
+	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
+	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
+	"\204\200\200\200\200\375\277\277\277\277\277]",
+	{ 0x5b, 0x01, 0x7f, 0x5d, 0x5b, 0x80, 0x7ff, 0x5d, 0x5b, 0x800, 0xffff,
+	  0x5d, 0x5b, 0x10000, 0x1fffff, 0x5d, 0x5b, 0x200000, 0x3ffffff, 0x5d,
+	  0x5b, 0x4000000, 0x7fffffff, 0x5d },
+	{ 1, 1, 1, 1, 1, 2, 2, 1, 1, 3, 3, 1, 1, 4, 4, 1, 1, 5, 5, 1, 1, 6, 6, 1 },
+	24
+}, {
+	"ja_JP.ISO2022-JP2",
+	"\033$BF|K\1348l\033(BA\033$B$\"\033(BB\033$B$$\033(B",
+	{ 0x4200467c, 0x42004b5c, 0x4200386c, 0x41, 0x42002422, 0x42, 0x42002424 },
+	{ 5, 2, 2, 4, 5, 4, 5 },
+	7
+}, {
+	"ja_JP.SJIS",
+	"\223\372\226{\214\352A\202\240B\202\242",
+	{ 0x93fa, 0x967b, 0x8cea, 0x41, 0x82a0, 0x42, 0x82a2 },
+	{ 2, 2, 2, 1, 2, 1, 2 },
+	7
+}, {
+	"ja_JP.eucJP",
+	"\306\374\313\334\270\354A\244\242B\244\244",
+	{ 0xc6fc, 0xcbdc, 0xb8ec, 0x41, 0xa4a2, 0x42, 0xa4a4 },
+	{ 2, 2, 2, 1, 2, 1, 2 },
+	7
+}, {
+	NULL,
+	NULL,
+	{ },
+	{ },
+	0
+}
+};
+
+static void
+h_ctype2(const struct test *t, bool use_mbstate)
+{
+	mbstate_t *stp;
+	mbstate_t st;
+	char buf[SIZE];
+	char *str;
+	size_t n;
+
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+	ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+
+	(void)strvis(buf, t->data, VIS_WHITE | VIS_OCTAL);
+	(void)printf("Checking string: \"%s\"\n", buf);
+
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
+
+	(void)printf("Using mbstate: %s\n", use_mbstate ? "yes" : "no");
+
+	(void)memset(&st, 0, sizeof(st));
+//	mbrtowc(0, 0, 0, &st); /* XXX for ISO2022-JP */
+	stp = use_mbstate ? &st : 0;
+
+	for (n = 9; n > 0; n--) {
+		const char *src = t->data;
+		wchar_t dst;
+		size_t nchar = 0;
+		int width = 0;
+
+		ATF_REQUIRE(mbsinit(stp) != 0);
+
+		for (;;) {
+			size_t rv = mbrtowc(&dst, src, n, stp);
+
+			if (rv == 0)
+				break;
+
+			if (rv == (size_t)-2) {
+				src += n;
+				width += n;
+
+				continue;
+			}
+			if (rv == (size_t)-1) {
+				ATF_REQUIRE_EQ(errno, EILSEQ);
+				atf_tc_fail("Invalid sequence");
+				/* NOTREACHED */
+			}
+
+			width += rv;
+			src += rv;
+
+			if (dst != t->wchars[nchar] ||
+			    width != t->widths[nchar]) {
+				(void)printf("At position %zd:\n", nchar);
+				(void)printf("  expected: 0x%04X (%u)\n",
+					t->wchars[nchar], t->widths[nchar]);
+				(void)printf("  got     : 0x%04X (%u)\n",
+					dst, width);
+				atf_tc_fail("Test failed");
+			}
+
+			nchar++;
+			width = 0;
+		}
+
+		ATF_REQUIRE_EQ_MSG(dst, 0, "Incorrect terminating character: "
+			"0x%04X (expected: 0x00)", dst);
+
+		ATF_REQUIRE_EQ_MSG(nchar, t->length, "Incorrect length: "
+			"%zd (expected: %zd)", nchar, t->length);
+	}
+
+	{
+		wchar_t wbuf[SIZE];
+		size_t rv;
+		char const *src = t->data;
+		int i;
+
+		(void)memset(wbuf, 0xFF, sizeof(wbuf));
+
+		rv = mbsrtowcs(wbuf, &src, SIZE, stp);
+
+		ATF_REQUIRE_EQ_MSG(rv, t->length, "Incorrect length: %zd "
+			"(expected: %zd)", rv, t->length);
+		ATF_REQUIRE_EQ(src, NULL);
+
+		for (i = 0; wbuf[i] != 0; ++i) {
+			if (wbuf[i] == t->wchars[i])
+				continue;
+
+			(void)printf("At position %d:\n", i);
+			(void)printf("  expected: 0x%04X\n", t->wchars[i]);
+			(void)printf("  got     : 0x%04X\n", wbuf[i]);
+			atf_tc_fail("Test failed");
+		}
+
+		ATF_REQUIRE_EQ_MSG((size_t)i, t->length, "Incorrect length: "
+			"%d (expected: %zd)", i, t->length);
+	}
+
+	(void)printf("Ok.\n");
+}
+
+ATF_TC(mbrtowc_internal);
+ATF_TC_HEAD(mbrtowc_internal, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks mbrtowc(3) and mbsrtowcs(3) (using internal "
+		"state) with different locales");
+}
+ATF_TC_BODY(mbrtowc_internal, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_ctype2(t, false);
+}
+
+ATF_TC(mbrtowc_object);
+ATF_TC_HEAD(mbrtowc_object, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks mbrtowc(3) and mbsrtowcs(3) (using state "
+		"object) with different locales");
+}
+ATF_TC_BODY(mbrtowc_object, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_ctype2(t, true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mbrtowc_internal);
+	ATF_TP_ADD_TC(tp, mbrtowc_object);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbsnrtowcs.c b/contrib/netbsd-tests/lib/libc/locale/t_mbsnrtowcs.c
new file mode 100644
index 000000000000..446d7ef499d3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_mbsnrtowcs.c
@@ -0,0 +1,98 @@
+/* $NetBSD: t_mbsnrtowcs.c,v 1.2 2014/05/06 00:41:26 yamt Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mbsnrtowcs.c,v 1.2 2014/05/06 00:41:26 yamt Exp $");
+
+#include <locale.h>
+#include <string.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+static const struct test {
+	const char *locale;
+	const char *data;
+	size_t limit;
+	const wchar_t output1[64];
+	size_t output1_len;
+	const wchar_t output2[64];
+	size_t output2_len;
+} tests[] = {
+	{ "C", "ABCD0123", 4, { 0x41, 0x42, 0x43, 0x44 }, 4,
+			    { 0x30, 0x31, 0x32, 0x33, 0x0 }, 5 },
+	{ "en_US.UTF-8", "ABCD0123", 4, { 0x41, 0x42, 0x43, 0x44 }, 4,
+			    { 0x30, 0x31, 0x32, 0x33, 0x0 }, 5 },
+	{ "en_US.UTF-8", "ABC\303\2440123", 4, { 0x41, 0x42, 0x43, }, 3,
+			    { 0xe4, 0x30, 0x31, 0x32, 0x33, 0x0 }, 6 },
+};
+
+ATF_TC(mbsnrtowcs);
+ATF_TC_HEAD(mbsnrtowcs, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks mbsnrtowc(3) with different locales");
+}
+ATF_TC_BODY(mbsnrtowcs, tc)
+{
+	size_t i;
+	const struct test *t;
+	mbstate_t state;
+	wchar_t buf[64];
+	const char *src;
+	size_t len;
+
+	for (i = 0; i < __arraycount(tests); ++i) {
+		t = &tests[i];
+		ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+		ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+		memset(&state, 0, sizeof(state));
+		src = t->data;
+		len = mbsnrtowcs(buf, &src, t->limit,
+		    __arraycount(buf), &state);
+		ATF_REQUIRE_EQ(src, t->data + t->limit);
+		ATF_REQUIRE_EQ(len, t->output1_len);
+		ATF_REQUIRE(wmemcmp(t->output1, buf, len) == 0);
+		len = mbsnrtowcs(buf, &src, strlen(src) + 1,
+		    __arraycount(buf), &state);
+		ATF_REQUIRE_EQ(len, strlen(t->data) - t->limit);
+		ATF_REQUIRE(wmemcmp(t->output2, buf, len + 1) == 0);
+		ATF_REQUIRE_EQ(src, NULL);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mbsnrtowcs);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c b/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
new file mode 100644
index 000000000000..ec0672907ab5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
@@ -0,0 +1,202 @@
+/* $NetBSD: t_mbstowcs.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2003 Citrus Project,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mbstowcs.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $");
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x, v) \
+	ATF_REQUIRE_MSG((x) != (v), "%s: %s", #x, strerror(errno))
+
+#define SIZE 256
+
+static struct test {
+	const char *locale;
+	const char *data;
+	wchar_t wchars[64];
+	int widths[64];
+	int width;
+} tests[] = {
+{
+	"en_US.UTF-8",
+	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
+	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
+	"\204\200\200\200\200\375\277\277\277\277\277]",
+	{
+		0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800,
+		0xFFFF, 0x5D, 0x5B, 0x10000, 0x1FFFFF, 0x5D, 0x5B, 0x200000,
+		0x3FFFFFF, 0x5D, 0x5B, 0x4000000, 0x7FFFFFFF, 0x5D, 0x0A
+	},
+	{	 1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,
+		 1,  1, -1, -1,  1,  1, -1, -1,  1, -1
+	}, 
+	-1
+}, {
+	"ja_JP.ISO2022-JP",
+	"\033$B#J#I#S$G$9!#\033(Baaaa\033$B$\"$$$&$($*\033(B",
+	{
+		0x4200234A, 0x42002349, 0x42002353, 0x42002447, 0x42002439,
+		0x42002123, 0x61, 0x61, 0x61, 0x61, 0x42002422, 0x42002424,
+		0x42002426, 0x42002428, 0x4200242A, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	26
+}, {
+	"ja_JP.SJIS",
+	"\202r\202i\202h\202r\202\305\202\267\201Baaaa\202\240\202\242"
+	"\202\244\202\246\202\250",
+	{
+		0x8272, 0x8269, 0x8268, 0x8272, 0x82C5, 0x82B7, 0x8142, 0x61,
+		0x61, 0x61, 0x61, 0x82A0, 0x82A2, 0x82A4, 0x82A6, 0x82A8, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	28
+}, {
+	"ja_JP.eucJP",
+	"\243\305\243\325\243\303\244\307\244\271\241\243aaaa\244\242\244"
+	"\244\244\246\244\250\244\252",
+	{
+		0xA3C5, 0xA3D5, 0xA3C3, 0xA4C7, 0xA4B9, 0xA1A3, 0x61, 0x61, 0x61,
+		0x61, 0xA4A2, 0xA4A4, 0xA4A6, 0xA4A8, 0xA4AA, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	26
+}, {
+	NULL,
+	NULL,
+	{},
+	{},
+	0
+}
+};
+
+ATF_TC(mbstowcs_basic);
+ATF_TC_HEAD(mbstowcs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks wide character functions with different locales");
+}
+ATF_TC_BODY(mbstowcs_basic, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t) {
+		wchar_t	wbuf[SIZE];
+		char buf[SIZE];
+		char visbuf[SIZE];
+		char *str;
+		int i;
+
+		ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+		ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+
+		(void)strvis(visbuf, t->data, VIS_WHITE | VIS_OCTAL);
+		(void)printf("Checking string: \"%s\"\n", visbuf);
+
+		ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+		(void)printf("Using locale: %s\n", str);
+
+		REQUIRE_ERRNO((ssize_t)mbstowcs(wbuf, t->data, SIZE-1), -1);
+		REQUIRE_ERRNO((ssize_t)wcstombs(buf, wbuf, SIZE-1), -1);
+
+		if (strcmp(buf, t->data) != 0) {
+			(void)strvis(visbuf, buf, VIS_WHITE | VIS_OCTAL);
+			(void)printf("Conversion to wcs and back failed: "
+				"\"%s\"\n", visbuf);
+			atf_tc_fail("Test failed");
+		}
+
+		/* The output here is implementation-dependent. */
+
+		for (i = 0; wbuf[i] != 0; ++i) {
+			if (wbuf[i] == t->wchars[i] &&
+			    wcwidth(wbuf[i]) == t->widths[i])
+				continue;
+
+			(void)printf("At position %d:\n", i);
+			(void)printf("  expected: 0x%04X (%d)\n",
+				t->wchars[i], t->widths[i]);
+			(void)printf("  got     : 0x%04X (%d)\n", wbuf[i],
+				wcwidth(wbuf[i]));
+			atf_tc_fail("Test failed");
+		}
+
+		if (wcswidth(wbuf, SIZE-1) != t->width) {
+			(void)printf("Incorrect wcswidth:\n");
+			(void)printf("  expected: %d\n", t->width);
+			(void)printf("  got     : %d\n", wcswidth(wbuf, SIZE-1));
+			atf_tc_fail("Test failed");
+		}
+
+		(void)printf("Ok.\n");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mbstowcs_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c b/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c
new file mode 100644
index 000000000000..62f62b10d50e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c
@@ -0,0 +1,143 @@
+/* $NetBSD: t_mbtowc.c,v 1.1 2011/04/09 17:45:25 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2007 Citrus Project,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mbtowc.c,v 1.1 2011/04/09 17:45:25 pgoyette Exp $");
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+static void
+h_mbtowc(const char *locale, const char *illegal, const char *legal)
+{
+	char buf[64];
+	size_t stateful, ret;
+	char *str;
+
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+	ATF_REQUIRE(setlocale(LC_CTYPE, locale) != NULL);
+
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
+
+	stateful = wctomb(NULL, L'\0');
+	(void)printf("Locale is state-%sdependent\n",
+		stateful ? "in" : "");
+
+	/* initialize internal state */
+	ret = mbtowc(NULL, NULL, 0);
+	ATF_REQUIRE(stateful ? ret : !ret);
+
+	(void)strvis(buf, illegal, VIS_WHITE | VIS_OCTAL);
+	(void)printf("Checking illegal sequence: \"%s\"\n", buf);
+
+	ret = mbtowc(NULL, illegal, strlen(illegal));
+	(void)printf("mbtowc() returned: %zd\n", ret);
+	ATF_REQUIRE_EQ(ret, (size_t)-1);
+	(void)printf("errno: %s\n", strerror(errno));
+	ATF_REQUIRE_EQ(errno, EILSEQ);
+
+	/* if this is stateless encoding, this re-initialization is not required. */
+	if (stateful) {
+		/* re-initialize internal state */
+		ret = mbtowc(NULL, NULL, 0);
+		ATF_REQUIRE(stateful ? ret : !ret);
+	}
+
+	/* valid multibyte sequence case */
+	(void)strvis(buf, legal, VIS_WHITE | VIS_OCTAL);
+	(void)printf("Checking legal sequence: \"%s\"\n", buf);
+
+	errno = 0;
+	ret = mbtowc(NULL, legal, strlen(legal));
+	(void)printf("mbtowc() returned: %zd\n", ret);
+	ATF_REQUIRE(ret != (size_t)-1);
+	(void)printf("errno: %s\n", strerror(errno));
+	ATF_REQUIRE_EQ(errno, 0);
+
+	(void)printf("Ok.\n");
+}
+
+ATF_TC(mbtowc);
+ATF_TC_HEAD(mbtowc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mbtowc(3)");
+}
+ATF_TC_BODY(mbtowc, tc)
+{
+	h_mbtowc("en_US.UTF-8", "\240", "\302\240");
+	h_mbtowc("ja_JP.ISO2022-JP", "\033$B", "\033$B$\"\033(B");
+	h_mbtowc("ja_JP.SJIS", "\202", "\202\240");
+	h_mbtowc("ja_JP.eucJP", "\244", "\244\242");
+	h_mbtowc("zh_CN.GB18030", "\241", "\241\241");
+	h_mbtowc("zh_TW.Big5", "\241", "\241@");
+	h_mbtowc("zh_TW.eucTW", "\241", "\241\241");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mbtowc);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_wcscspn.c b/contrib/netbsd-tests/lib/libc/locale/t_wcscspn.c
new file mode 100644
index 000000000000..10756b5cc4e2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_wcscspn.c
@@ -0,0 +1,58 @@
+/*	$NetBSD: t_wcscspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_wcscspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <wchar.h>
+
+ATF_TC(wcscspn);
+ATF_TC_HEAD(wcscspn, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test wcscspn(3)");
+}
+
+ATF_TC_BODY(wcscspn, tc)
+{
+	ATF_CHECK_EQ(wcscspn(L"abcdefghijklmnop", L""), 16);
+	ATF_CHECK_EQ(wcscspn(L"abcdefghijklmnop", L"a"), 0);
+	ATF_CHECK_EQ(wcscspn(L"abcdefghijklmnop", L"b"), 1);
+	ATF_CHECK_EQ(wcscspn(L"abcdefghijklmnop", L"cd"), 2);
+	ATF_CHECK_EQ(wcscspn(L"abcdefghijklmnop", L"qrstuvwxyz"), 16);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, wcscspn);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_wcspbrk.c b/contrib/netbsd-tests/lib/libc/locale/t_wcspbrk.c
new file mode 100644
index 000000000000..57c1ac54be3c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_wcspbrk.c
@@ -0,0 +1,62 @@
+/*	$NetBSD: t_wcspbrk.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_wcspbrk.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <wchar.h>
+
+ATF_TC(wcspbrk);
+ATF_TC_HEAD(wcspbrk, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test wcspbrk(3)");
+}
+
+ATF_TC_BODY(wcspbrk, tc)
+{
+	static const wchar_t s[] = L"abcdefghijklmnop";
+
+	ATF_CHECK_EQ(wcspbrk(s, L""), NULL);
+	ATF_CHECK_EQ(wcspbrk(s, L"qrst"), NULL);
+	ATF_CHECK_EQ(wcspbrk(s, L"a"), s);
+	ATF_CHECK_EQ(wcspbrk(s, L"b"), s + 1);
+	ATF_CHECK_EQ(wcspbrk(s, L"ab"), s);
+	ATF_CHECK_EQ(wcspbrk(s, L"cdef"), s + 2);
+	ATF_CHECK_EQ(wcspbrk(s, L"fedc"), s + 2);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, wcspbrk);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_wcsspn.c b/contrib/netbsd-tests/lib/libc/locale/t_wcsspn.c
new file mode 100644
index 000000000000..2083650b331a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_wcsspn.c
@@ -0,0 +1,60 @@
+/*	$NetBSD: t_wcsspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_wcsspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <wchar.h>
+
+ATF_TC(wcsspn);
+ATF_TC_HEAD(wcsspn, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test wcsspn(3)");
+}
+
+ATF_TC_BODY(wcsspn, tc)
+{
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L""), 0);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"a"), 1);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"b"), 0);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"ab"), 2);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"abc"), 3);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"abce"), 3);
+	ATF_CHECK_EQ(wcsspn(L"abcdefghijklmnop", L"abcdefghijklmnop"), 16);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, wcsspn);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c b/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c
new file mode 100644
index 000000000000..85b1ee16aaa9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c
@@ -0,0 +1,456 @@
+/* $NetBSD: t_wcstod.c,v 1.3 2011/10/01 17:56:11 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2005 Citrus Project,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_wcstod.c,v 1.3 2011/10/01 17:56:11 christos Exp $");
+
+#include <errno.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+#define	ALT_HUGE_VAL		-1
+#define	ALT_MINUS_HUGE_VAL	-2
+#define	ALT_NAN			-3
+
+#if !defined(__vax__)
+static struct test {
+	const wchar_t *wcs;
+	size_t len;
+	double val;
+	int err;
+} tests[] = {
+{ L"IN",		0,	0,			0 },
+{ L"+IN",		0,	0,			0 },
+{ L"-IN",		0,	0,			0 },
+{ L"INX",		0,	0,			0 },
+{ L"+INX",		0,	0,			0 },
+{ L"-INX",		0,	0,			0 },
+{ L"INF",		3,	ALT_HUGE_VAL,		0 },
+{ L"+INF",		4,	ALT_HUGE_VAL,		0 },
+{ L"-INF",		4,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"INFX",		3,	ALT_HUGE_VAL,		0 },
+{ L"+INFX",		4,	ALT_HUGE_VAL,		0 },
+{ L"-INFX",		4,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"     IN",		0,	0,			0 },
+{ L"     +IN",		0,	0,			0 },
+{ L"     -IN",		0,	0,			0 },
+{ L"     INX",		0,	0,			0 },
+{ L"     +INX",		0,	0,			0 },
+{ L"     -INX",		0,	0,			0 },
+{ L"+     INF",		0,	0,			0 },
+{ L"-     INF",		0,	0,			0 },
+{ L"     INF",		8,	ALT_HUGE_VAL,		0 },
+{ L"     +INF",		9,	ALT_HUGE_VAL,		0 },
+{ L"     -INF",		9,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"     INFX",		8,	ALT_HUGE_VAL,		0 },
+{ L"     +INFX",	9,	ALT_HUGE_VAL,		0 },
+{ L"     -INFX",	9,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"     INFINIT",	8,	ALT_HUGE_VAL,		0 },
+{ L"     +INFINIT",	9,	ALT_HUGE_VAL,		0 },
+{ L"     -INFINIT",	9,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"     INFINITY",	13,	ALT_HUGE_VAL,		0 },
+{ L"     +INFINITY",	14,	ALT_HUGE_VAL,		0 },
+{ L"     -INFINITY",	14,	ALT_MINUS_HUGE_VAL,	0 },
+{ L"     INFINITYX",	13,	ALT_HUGE_VAL,		0 },
+{ L"     +INFINITYX",	14,	ALT_HUGE_VAL,		0 },
+{ L"     -INFINITYX",	14,	ALT_MINUS_HUGE_VAL,	0 },
+
+/* NAN */
+{ L"NA",		0,	0,			0 },
+{ L"+NA",		0,	0,			0 },
+{ L"-NA",		0,	0,			0 },
+{ L"NAX",		0,	0,			0 },
+{ L"+NAX",		0,	0,			0 },
+{ L"-NAX",		0,	0,			0 },
+{ L"NAN",		3,	ALT_NAN,		0 },
+{ L"+NAN",		4,	ALT_NAN,		0 },
+{ L"-NAN",		4,	ALT_NAN,		0 },
+{ L"NANX",		3,	ALT_NAN,		0 },
+{ L"+NANX",		4,	ALT_NAN,		0 },
+{ L"-NANX",		4,	ALT_NAN,		0 },
+{ L"     NA",		0,	0,			0 },
+{ L"     +NA",		0,	0,			0 },
+{ L"     -NA",		0,	0,			0 },
+{ L"     NAX",		0,	0,			0 },
+{ L"     +NAX",		0,	0,			0 },
+{ L"     -NAX",		0,	0,			0 },
+{ L"+     NAN",		0,	0,			0 },
+{ L"-     NAN",		0,	0,			0 },
+{ L"     NAN",		8,	ALT_NAN,		0 },
+{ L"     +NAN",		9,	ALT_NAN,		0 },
+{ L"     -NAN",		9,	ALT_NAN,		0 },
+{ L"     NANX",		8,	ALT_NAN,		0 },
+{ L"     +NANX",	9,	ALT_NAN,		0 },
+{ L"     -NANX",	9,	ALT_NAN,		0 },
+
+{ L"0",			1,	0,			0 },
+{ L"+0",		2,	0,			0 },
+{ L"-0",		2,	0,			0 },
+{ L"          0",	11,	0,			0 },
+{ L"          +0",	12,	0,			0 },
+{ L"          -0",	12,	0,			0 },
+{ L"+          0",	0,	0,			0 },
+{ L"-          0",	0,	0,			0 },
+
+{ L".",			0,	0,			0 },
+{ L".0",		2,	0,			0 },
+{ L".00",		3,	0,			0 },
+{ L".000",		4,	0,			0 },
+
+{ L"0.",		2,	0,			0 },
+{ L"+0.",		3,	0,			0 },
+{ L"-0.",		3,	0,			0 },
+{ L"          0.",	12,	0,			0 },
+{ L"          +0.",	13,	0,			0 },
+{ L"          -0.",	13,	0,			0 },
+
+{ L"0.0",		3,	0,			0 },
+{ L"+0.0",		4,	0,			0 },
+{ L"-0.0",		4,	0,			0 },
+{ L"          0.0",	13,	0,			0 },
+{ L"          +0.0",	14,	0,			0 },
+{ L"          -0.0",	14,	0,			0 },
+
+{ L"000",		3,	0,			0 },
+{ L"+000",		4,	0,			0 },
+{ L"-000",		4,	0,			0 },
+{ L"          000",	13,	0,			0 },
+{ L"          +000",	14,	0,			0 },
+{ L"          -000",	14,	0,			0 },
+
+{ L"000.",		4,	0,			0 },
+{ L"+000.",		5,	0,			0 },
+{ L"-000.",		5,	0,			0 },
+{ L"          000.",	14,	0,			0 },
+{ L"          +000.",	15,	0,			0 },
+{ L"          -000.",	15,	0,			0 },
+
+{ L"000.0",		5,	0,			0 },
+{ L"+000.0",		6,	0,			0 },
+{ L"-000.0",		6,	0,			0 },
+{ L"          000.0",	15,	0,			0 },
+{ L"          +000.0",	16,	0,			0 },
+{ L"          -000.0",	16,	0,			0 },
+
+
+{ L"0.0.",		3,	0,			0 },
+{ L"+0.0.",		4,	0,			0 },
+{ L"-0.0.",		4,	0,			0 },
+{ L"          0.0.",	13,	0,			0 },
+{ L"          +0.0.",	14,	0,			0 },
+{ L"          -0.0.",	14,	0,			0 },
+
+{ L"0.0.0",		3,	0,			0 },
+{ L"+0.0.0",		4,	0,			0 },
+{ L"-0.0.0",		4,	0,			0 },
+{ L"          0.0.0",	13,	0,			0 },
+{ L"          +0.0.0",	14,	0,			0 },
+{ L"          -0.0.0",	14,	0,			0 },
+
+/* XXX: FIXME */
+#if defined(__linux__)
+{ L"0X",		2,	0,			0 },
+{ L"+0X",		3,	0,			0 },
+{ L"-0X",		3,	0,			0 },
+#else
+{ L"0X",		1,	0,			0 },
+{ L"+0X",		2,	0,			0 },
+{ L"-0X",		2,	0,			0 },
+#endif
+
+/* XXX: SunOS 5.8's wcstod(3) doesn't accept hex */
+#if !defined(__SunOS__)
+#if defined(__linux__)
+{ L"0X.",		3,	0,			0 },
+{ L"+0X.",		4,	0,			0 },
+{ L"-0X.",		4,	0,			0 },
+{ L"          0X.",	13,	0,			0 },
+{ L"          +0X.",	14,	0,			0 },
+{ L"          -0X.",	14,	0,			0 },
+#else
+{ L"0X.",		1,	0,			0 },
+{ L"+0X.",		2,	0,			0 },
+{ L"-0X.",		2,	0,			0 },
+{ L"          0X.",	11,	0,			0 },
+{ L"          +0X.",	12,	0,			0 },
+{ L"          -0X.",	12,	0,			0 },
+#endif
+/* XXX: FIXME */
+#if defined(__NetBSD__) || defined(__linux__)
+{ L"0X.0",		4,	0,			0 },
+{ L"+0X.0",		5,	0,			0 },
+{ L"-0X.0",		5,	0,			0 },
+{ L"          0X.0",	14,	0,			0 },
+{ L"          +0X.0",	15,	0,			0 },
+{ L"          -0X.0",	15,	0,			0 },
+
+{ L"0X.0P",		4,	0,			0 },
+{ L"+0X.0P",		5,	0,			0 },
+{ L"-0X.0P",		5,	0,			0 },
+{ L"          0X.0P",	14,	0,			0 },
+{ L"          +0X.0P",	15,	0,			0 },
+{ L"          -0X.0P",	15,	0,			0 },
+#else
+{ L"0X.0",		1,	0,			0 },
+{ L"+0X.0",		2,	0,			0 },
+{ L"-0X.0",		2,	0,			0 },
+{ L"          0X.0",	11,	0,			0 },
+{ L"          +0X.0",	12,	0,			0 },
+{ L"          -0X.0",	12,	0,			0 },
+
+{ L"0X.0P",		1,	0,			0 },
+{ L"+0X.0P",		2,	0,			0 },
+{ L"-0X.0P",		2,	0,			0 },
+{ L"          0X.0P",	11,	0,			0 },
+{ L"          +0X.0P",	12,	0,			0 },
+{ L"          -0X.0P",	12,	0,			0 },
+#endif
+
+{ L"0X0",		3,	0,			0 },
+{ L"+0X0",		4,	0,			0 },
+{ L"-0X0",		4,	0,			0 },
+{ L"          0X0",	13,	0,			0 },
+{ L"          +0X0",	14,	0,			0 },
+{ L"          -0X0",	14,	0,			0 },
+
+{ L"00X0.0",		2,	0,			0 },
+{ L"+00X0.0",		3,	0,			0 },
+{ L"-00X0.0",		3,	0,			0 },
+{ L"          00X0.0",	12,	0,			0 },
+{ L"          +00X0.0",	13,	0,			0 },
+{ L"          -00X0.0",	13,	0,			0 },
+
+{ L"0X0P",		3,	0,			0 },
+{ L"+0X0P",		4,	0,			0 },
+{ L"-0X0P",		4,	0,			0 },
+{ L"          0X0P",	13,	0,			0 },
+{ L"          +0X0P",	14,	0,			0 },
+{ L"          -0X0P",	14,	0,			0 },
+
+{ L"0X0.",		4,	0,			0 },
+{ L"+0X0.",		5,	0,			0 },
+{ L"-0X0.",		5,	0,			0 },
+{ L"          0X0.",	14,	0,			0 },
+{ L"          +0X0.",	15,	0,			0 },
+{ L"          -0X0.",	15,	0,			0 },
+
+{ L"0X0.0",		5,	0,			0 },
+{ L"+0X0.0",		6,	0,			0 },
+{ L"-0X0.0",		6,	0,			0 },
+{ L"          0X0.0",	15,	0,			0 },
+{ L"          +0X0.0",	16,	0,			0 },
+{ L"          -0X0.0",	16,	0,			0 },
+
+{ L"0X0.P",		4,	0,			0 },
+{ L"+0X0.P",		5,	0,			0 },
+{ L"-0X0.P",		5,	0,			0 },
+{ L"          0X0.P",	14,	0,			0 },
+{ L"          +0X0.P",	15,	0,			0 },
+{ L"          -0X0.P",	15,	0,			0 },
+
+{ L"0X0.P",		4,	0,			0 },
+{ L"+0X0.P",		5,	0,			0 },
+{ L"-0X0.P",		5,	0,			0 },
+{ L"          0X0.P",	14,	0,			0 },
+{ L"          +0X0.P",	15,	0,			0 },
+{ L"          -0X0.P",	15,	0,			0 },
+
+#endif
+{ L"0.12345678",	10,	0.12345678,		0 },
+{ L"+0.12345678",	11,	+0.12345678,		0 },
+{ L"-0.12345678",	11,	-0.12345678,		0 },
+{ L"     0.12345678",	15,	0.12345678,		0 },
+{ L"     +0.12345678",	16,	+0.12345678,		0 },
+{ L"     -0.12345678",	16,	-0.12345678,		0 },
+
+{ L"0.12345E67",	10,	0.12345E67,		0 },
+{ L"+0.12345E67",	11,	+0.12345E67,		0 },
+{ L"-0.12345E67",	11,	-0.12345E67,		0 },
+{ L"     0.12345E67",	15,	0.12345E67,		0 },
+{ L"     +0.12345E67",	16,	+0.12345E67,		0 },
+{ L"     -0.12345E67",	16,	-0.12345E67,		0 },
+
+{ L"0.12345E+6",	10,	0.12345E+6,		0 },
+{ L"+0.12345E+6",	11,	+0.12345E+6,		0 },
+{ L"-0.12345E+6",	11,	-0.12345E+6,		0 },
+{ L"     0.12345E+6",	15,	0.12345E+6,		0 },
+{ L"     +0.12345E+6",	16,	+0.12345E+6,		0 },
+{ L"     -0.12345E+6",	16,	-0.12345E+6,		0 },
+
+{ L"0.98765E-4",	10,	0.98765E-4,		0 },
+{ L"+0.98765E-4",	11,	+0.98765E-4,		0 },
+{ L"-0.98765E-4",	11,	-0.98765E-4,		0 },
+{ L"     0.98765E-4",	15,	0.98765E-4,		0 },
+{ L"     +0.98765E-4",	16,	+0.98765E-4,		0 },
+{ L"     -0.98765E-4",	16,	-0.98765E-4,		0 },
+
+{ L"12345678E9",	10,	12345678E9,		0 },
+{ L"+12345678E9",	11,	+12345678E9,		0 },
+{ L"-12345678E9",	11,	-12345678E9,		0 },
+{ L"     12345678E9",	15,	12345678E9,		0 },
+{ L"     +12345678E9",	16,	+12345678E9,		0 },
+{ L"     -12345678E9",	16,	-12345678E9,		0 },
+
+/* XXX: SunOS 5.8's wcstod(3) doesn't accept hex */
+#if !defined(__SunOS__)
+{ L"0x1P+2",		6,	4,			0 },
+{ L"+0x1P+2",		7,	+4,			0 },
+{ L"-0x1P+2",		7,	-4,			0 },
+{ L"     0x1P+2",	11,	4,			0 },
+{ L"     +0x1P+2",	12,	+4,			0 },
+{ L"     -0x1P+2",	12,	-4,			0 },
+
+{ L"0x1.0P+2",		8,	4,			0 },
+{ L"+0x1.0P+2",		9,	+4,			0 },
+{ L"-0x1.0P+2",		9,	-4,			0 },
+{ L"     0x1.0P+2",	13,	4,			0 },
+{ L"     +0x1.0P+2",	14,	+4,			0 },
+{ L"     -0x1.0P+2",	14,	-4,			0 },
+
+{ L"0x1P-2",		6,	0.25,			0 },
+{ L"+0x1P-2",		7,	+0.25,			0 },
+{ L"-0x1P-2",		7,	-0.25,			0 },
+{ L"     0x1P-2",	11,	0.25,			0 },
+{ L"     +0x1P-2",	12,	+0.25,			0 },
+{ L"     -0x1P-2",	12,	-0.25,			0 },
+
+{ L"0x1.0P-2",		8,	0.25,			0 },
+{ L"+0x1.0P-2",		9,	+0.25,			0 },
+{ L"-0x1.0P-2",		9,	-0.25,			0 },
+{ L"     0x1.0P-2",	13,	0.25,			0 },
+{ L"     +0x1.0P-2",	14,	+0.25,			0 },
+{ L"     -0x1.0P-2",	14,	-0.25,			0 },
+#endif
+
+{ NULL, 0, 0, 0 }
+};
+#endif /* !defined(__vax__) */
+
+ATF_TC(wcstod);
+ATF_TC_HEAD(wcstod, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks wcstod(3)");
+}
+ATF_TC_BODY(wcstod, tc)
+{
+#if defined(__vax__)
+#else
+	struct test *t;
+#endif
+
+#if !defined(__vax__)
+	for (t = &tests[0]; t->wcs != NULL; ++t) {
+		double d;
+		size_t n;
+		wchar_t *tail;
+		char *buf;
+
+		/* we do not supported %ls nor %S yet. */
+		n = wcstombs(NULL, t->wcs, 0);
+		ATF_REQUIRE((buf = (void *)malloc(n + 1)) != NULL);
+		(void)wcstombs(buf, t->wcs, n + 1);
+		(void)printf("Checking wcstod(\"%s\", &tail):\n", buf);
+		free(buf);
+
+		errno = 0;
+		d = wcstod(t->wcs, &tail);
+		(void)printf("[errno]\n");
+		(void)printf("  got     : %s\n", strerror(errno));
+		(void)printf("  expected: %s\n", strerror(t->err));
+		ATF_REQUIRE_EQ(errno, t->err);
+
+		n = (size_t)(tail - t->wcs);
+		(void)printf("[endptr - nptr]\n");
+		(void)printf("  got     : %zd\n", n);
+		(void)printf("  expected: %zd\n", t->len);
+		ATF_REQUIRE_EQ(n, t->len);
+
+		(void)printf("[result]\n");
+		(void)printf("  real:     %F\n", d);
+		if (t->val == ALT_HUGE_VAL) {
+			(void)printf("  expected: %F\n", HUGE_VAL);
+			ATF_REQUIRE(isinf(d));
+			ATF_REQUIRE_EQ(d, HUGE_VAL);
+		} else if (t->val == ALT_MINUS_HUGE_VAL) {
+			(void)printf("  expected: %F\n", -HUGE_VAL);
+			ATF_REQUIRE(isinf(d));
+			ATF_REQUIRE_EQ(d, -HUGE_VAL);
+		} else if (t->val == ALT_NAN) {
+			(void)printf("  expected: %F\n", NAN);
+			ATF_REQUIRE(isnan(d));
+		} else {
+			(void)printf("  expected: %F\n", t->val);
+			ATF_REQUIRE_EQ(d, t->val);
+		}
+
+		(void)printf("\n");
+	}
+#else /* !defined(__vax__) */
+	atf_tc_skip("Test is unavailable on vax.");
+#endif /* !defined(__vax__) */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, wcstod);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c b/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c
new file mode 100644
index 000000000000..f553c8c511f1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c
@@ -0,0 +1,205 @@
+/* $NetBSD: t_wctomb.c,v 1.3 2013/03/25 15:31:03 gson Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2004 Citrus Project,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_wctomb.c,v 1.3 2013/03/25 15:31:03 gson Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <vis.h>
+#include <wchar.h>
+#include <string.h>
+#include <limits.h>
+
+#include <atf-c.h>
+
+#define TC_WCTOMB	0
+#define TC_WCRTOMB	1
+#define TC_WCRTOMB_ST	2
+
+static struct test {
+	const char *locale;
+	const char *data;
+	size_t wclen;
+	size_t mblen[16];
+} tests[] = {
+{
+	"ja_JP.ISO2022-JP",
+	"\x1b$B"	/* JIS X 0208-1983 */
+	"\x46\x7c\x4b\x5c\x38\x6c" /* "nihongo" */
+	"\x1b(B"	/* ISO 646 */
+	"ABC"
+	"\x1b(I"	/* JIS X 0201 katakana */
+	"\xb1\xb2\xb3"	/* "aiu" */
+	"\x1b(B",	/* ISO 646 */
+	3 + 3 + 3,
+	{ 3+2, 2, 2, 3+1, 1, 1, 3+1, 1, 1, 3+1 }
+}, {
+	"C", 
+	"ABC",
+	3,
+	{ 1, 1, 1, 1 }
+}, { NULL, NULL, 0, { } }
+};
+
+static void
+h_wctomb(const struct test *t, char tc)
+{
+	wchar_t wcs[16 + 2];
+	char buf[128];
+	char cs[MB_LEN_MAX];
+	const char *pcs;
+	char *str;
+	mbstate_t st;
+	mbstate_t *stp = NULL;
+	size_t sz, ret, i;
+
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+	ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+
+	(void)strvis(buf, t->data, VIS_WHITE | VIS_OCTAL);
+	(void)printf("Checking sequence: \"%s\"\n", buf);
+
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
+
+	if (tc == TC_WCRTOMB_ST) {
+		(void)memset(&st, 0, sizeof(st));
+		stp = &st;
+	}
+
+	wcs[t->wclen] = L'X'; /* poison */
+	pcs = t->data;
+	sz = mbsrtowcs(wcs, &pcs, t->wclen + 2, NULL);
+	ATF_REQUIRE_EQ_MSG(sz, t->wclen, "mbsrtowcs() returned: "
+		"%zu, expected: %zu", sz, t->wclen);
+	ATF_REQUIRE_EQ(wcs[t->wclen], 0);
+
+	for (i = 0; i < t->wclen + 1; i++) {
+		if (tc == TC_WCTOMB)
+			ret = wctomb(cs, wcs[i]);
+		else
+			ret = wcrtomb(cs, wcs[i], stp);
+
+		if (ret == t->mblen[i])
+			continue;
+
+		(void)printf("At position %zd:\n", i);
+		(void)printf("  expected: %zd\n", t->mblen[i]);
+		(void)printf("  got     : %zd\n", ret);
+		atf_tc_fail("Test failed");
+		/* NOTREACHED */
+	}
+
+	(void)printf("Ok.\n");
+}
+
+ATF_TC(wctomb);
+ATF_TC_HEAD(wctomb, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks wctomb(3)");
+}
+ATF_TC_BODY(wctomb, tc)
+{
+	struct test *t;
+
+	(void)printf("Checking wctomb()\n");
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_wctomb(t, TC_WCTOMB);
+}
+
+ATF_TC(wcrtomb_state);
+ATF_TC_HEAD(wcrtomb_state, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks wcrtomb(3) (using state object)");
+}
+ATF_TC_BODY(wcrtomb_state, tc)
+{
+	struct test *t;
+
+	(void)printf("Checking wcrtomb() (with state object)\n");
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_wctomb(t, TC_WCRTOMB_ST);
+}
+
+ATF_TC(wcrtomb);
+ATF_TC_HEAD(wcrtomb, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks wcrtomb(3) (using internal state)");
+}
+ATF_TC_BODY(wcrtomb, tc)
+{
+	struct test *t;
+
+	(void)printf("Checking wcrtomb() (using internal state)\n");
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_wctomb(t, TC_WCRTOMB);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, wctomb);
+	ATF_TP_ADD_TC(tp, wcrtomb);
+	ATF_TP_ADD_TC(tp, wcrtomb_state);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/gen_ether_subr b/contrib/netbsd-tests/lib/libc/net/gen_ether_subr
new file mode 100755
index 000000000000..9f9b63c7d049
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/gen_ether_subr
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+awk '
+BEGIN {
+	print
+	print "#include <ctype.h>"
+	print "#include <sys/types.h>"
+	print "#include <errno.h>"
+	print
+	print "#define ETHER_ADDR_LEN 6"
+	print
+	print "int ether_aton_r(u_char *dest, size_t len, const char *str);"
+	print
+}
+/^ether_aton_r/ {
+	print prevline
+	out = 1
+}
+{
+	if (out) print
+	else prevline = $0
+}
+/^}$/ {
+	if (out) exit(0)
+}' $1 >$2
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/README b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/README
new file mode 100644
index 000000000000..e856fe7e9a5e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/README
@@ -0,0 +1,7 @@
+This test may fail if
+
+ - your /etc/services file is not in sync with what this test expects
+ - your /etc/hosts file or DNS have unusual entries for "localhost"
+   (a duplicate "localhost 127.0.0.1" line in /etc/hosts for example)
+
+On kernels without IPv6 support some of the tests are skipped.
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4.exp
new file mode 100644
index 000000000000..d2945f2bc270
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4.exp
@@ -0,0 +1,36 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4v6.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4v6.exp
new file mode 100644
index 000000000000..0238f83bbd5f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/basics_v4v6.exp
@@ -0,0 +1,42 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/h_gai.c b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/h_gai.c
new file mode 100644
index 000000000000..939fcdb355f8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/h_gai.c
@@ -0,0 +1,186 @@
+/*	$NetBSD: h_gai.c,v 1.1 2011/01/12 02:58:40 pgoyette Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
+ * All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
+ */
+
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <arpa/inet.h>
+
+struct addrinfo ai;
+
+char host[NI_MAXHOST];
+char serv[NI_MAXSERV];
+int vflag = 0;
+
+static void usage(void);
+static void print1(const char *, const struct addrinfo *, char *, char *);
+int main(int, char *[]);
+
+static void
+usage()
+{
+	fprintf(stderr, "usage: test [-f family] [-s socktype] [-p proto] [-DPRSv46] host serv\n");
+}
+
+static void
+print1(const char *title, const struct addrinfo *res, char *h, char *s)
+{
+	const char *start, *end;
+	int error;
+	const int niflag = NI_NUMERICHOST;
+
+	if (res->ai_addr) {
+		error = getnameinfo(res->ai_addr, res->ai_addr->sa_len,
+				    host, sizeof(host), serv, sizeof(serv),
+				    niflag);
+		h = host;
+		s = serv;
+	} else
+		error = 0;
+
+	if (vflag) {
+		start = "\t";
+		end = "\n";
+	} else {
+		start = " ";
+		end = "";
+	}
+	printf("%s%s", title, end);
+	printf("%sflags 0x%x%s", start, res->ai_flags, end);
+	printf("%sfamily %d%s", start, res->ai_family, end);
+	printf("%ssocktype %d%s", start, res->ai_socktype, end);
+	printf("%sprotocol %d%s", start, res->ai_protocol, end);
+	printf("%saddrlen %d%s", start, res->ai_addrlen, end);
+	if (error)
+		printf("%serror %d%s", start, error, end);
+	else {
+		printf("%shost %s%s", start, h, end);
+		printf("%sserv %s%s", start, s, end);
+	}
+#if 0
+	if (res->ai_canonname)
+		printf("%scname \"%s\"%s", start, res->ai_canonname, end);
+#endif
+	if (!vflag)
+		printf("\n");
+
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct addrinfo *res;
+	int error, i;
+	char *p, *q;
+	extern int optind;
+	extern char *optarg;
+	int c;
+	char nbuf[10];
+
+	memset(&ai, 0, sizeof(ai));
+	ai.ai_family = PF_UNSPEC;
+	ai.ai_flags |= AI_CANONNAME;
+	while ((c = getopt(argc, argv, "Df:p:PRs:Sv46")) != -1) {
+		switch (c) {
+		case 'D':
+			ai.ai_socktype = SOCK_DGRAM;
+			break;
+		case 'f':
+			ai.ai_family = atoi(optarg);
+			break;
+		case 'p':
+			ai.ai_protocol = atoi(optarg);
+			break;
+		case 'P':
+			ai.ai_flags |= AI_PASSIVE;
+			break;
+		case 'R':
+			ai.ai_socktype = SOCK_RAW;
+			break;
+		case 's':
+			ai.ai_socktype = atoi(optarg);
+			break;
+		case 'S':
+			ai.ai_socktype = SOCK_STREAM;
+			break;
+		case 'v':
+			vflag++;
+			break;
+		case '4':
+			ai.ai_family = PF_INET;
+			break;
+		case '6':
+			ai.ai_family = PF_INET6;
+			break;
+		default:
+			usage();
+			exit(1);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2){
+		usage();
+		exit(1);
+	}
+
+	p = *argv[0] ? argv[0] : NULL;
+	q = *argv[1] ? argv[1] : NULL;
+
+	strncpy(nbuf, "(empty)", sizeof(nbuf));
+	print1("arg:", &ai, p ? p : nbuf , q ? q : nbuf);
+
+	error = getaddrinfo(p, q, &ai, &res);
+	if (error) {
+		printf("%s\n", gai_strerror(error));
+		exit(1);
+	}
+
+	i = 1;
+	do {
+		snprintf(nbuf, sizeof(nbuf), "ai%d:", i);
+		print1(nbuf, res, NULL, NULL);
+
+		i++;
+	} while ((res = res->ai_next) != NULL);
+	printf("\n");
+
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4.exp
new file mode 100644
index 000000000000..21059c7aa063
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4.exp
@@ -0,0 +1,38 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv http
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv http
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv echo
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv echo
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv tftp
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv tftp
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv http
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv http
+
+arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4v6.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4v6.exp
new file mode 100644
index 000000000000..7d30fea6a81c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_host_v4v6.exp
@@ -0,0 +1,56 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv echo
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv echo
+ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv echo
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv echo
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv tftp
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv tftp
+ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv tftp
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv tftp
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
+ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv http
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv http
+ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv http
+ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv http
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
+ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv echo
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv echo
+ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv echo
+ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv echo
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
+ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv tftp
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv tftp
+ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv tftp
+ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv tftp
+
+arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv http
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv http
+ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv http
+ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv http
+
+arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4.exp
new file mode 100644
index 000000000000..9de5c56db6f2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4.exp
@@ -0,0 +1,14 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty)
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv (empty)
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv (empty)
+hostname nor servname provided, or not known
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4v6.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4v6.exp
new file mode 100644
index 000000000000..1df56636ec50
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/no_serv_v4v6.exp
@@ -0,0 +1,16 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty)
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv (empty)
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
+ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
+ai3: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
+ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv (empty)
+hostname nor servname provided, or not known
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/scoped.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/scoped.exp
new file mode 100644
index 000000000000..d06d163c24e4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/scoped.exp
@@ -0,0 +1,4 @@
+arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host fe80::1%lo0 serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host fe80::1%lo0 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host fe80::1%lo0 serv http
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4.exp
new file mode 100644
index 000000000000..bc850e02836f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4.exp
@@ -0,0 +1,13 @@
+arg: flags 0x2 family 0 socktype 3 protocol 0 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 2 socktype 3 protocol 0 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 2 socktype 3 protocol 59 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv 80
+servname not supported for ai_socktype
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv www
+servname not supported for ai_socktype
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host ::1 serv (empty)
+ai1: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4v6.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4v6.exp
new file mode 100644
index 000000000000..a4f2fb81fd1e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/sock_raw_v4v6.exp
@@ -0,0 +1,15 @@
+arg: flags 0x2 family 0 socktype 3 protocol 0 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 24 socktype 3 protocol 0 addrlen 28 host ::1 serv 0
+ai2: flags 0x2 family 2 socktype 3 protocol 0 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv (empty)
+ai1: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0
+ai2: flags 0x2 family 2 socktype 3 protocol 59 addrlen 16 host 127.0.0.1 serv 0
+
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv 80
+servname not supported for ai_socktype
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv www
+servname not supported for ai_socktype
+arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host ::1 serv (empty)
+ai1: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4.exp
new file mode 100644
index 000000000000..1c0ce43b2147
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4.exp
@@ -0,0 +1,6 @@
+arg: flags 0x2 family 2 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 24 socktype 0 protocol 0 addrlen 0 host localhost serv http
+No address associated with hostname
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4v6.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4v6.exp
new file mode 100644
index 000000000000..e24036e8a27a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/spec_fam_v4v6.exp
@@ -0,0 +1,8 @@
+arg: flags 0x2 family 2 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv http
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv http
+
+arg: flags 0x2 family 24 socktype 0 protocol 0 addrlen 0 host localhost serv http
+ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv http
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv http
+
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
new file mode 100755
index 000000000000..94a3c0b2e52c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
@@ -0,0 +1,198 @@
+#	$NetBSD: t_getaddrinfo.sh,v 1.2 2011/06/15 07:54:32 jmmv Exp $
+
+#
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
+# All rights reserved.
+#
+# 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.
+# 3. Neither the name of the project nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
+#
+
+check_output()
+{
+	if [ "$2" = "none" ] ; then
+		exp="${1}.exp"
+	elif [ "$2" = "hosts" ] ; then
+		# Determine if localhost has an IPv6 address or not
+		lcl=$( cat /etc/hosts					| \
+			 sed -e 's/#.*$//' -e 's/[ 	][ 	]*/ /g'	| \
+			 awk '/ localhost($| )/ {printf "%s ", $1}' )
+		if [ "${lcl%*::*}" = "${lcl}" ] ; then
+			exp="${1}_v4.exp"
+		else
+			exp="${1}_v4v6.exp"
+		fi
+	elif [ "$2" = "ifconfig" ] ; then
+		lcl=$( ifconfig lo0 | grep inet6 )
+		if [ -n "${lcl}" ] ; then
+			exp="${1}_v4v6.exp"
+		else
+			exp="${1}_v4.exp"
+		fi
+	else
+		atf_fail "Invalid family_match_type $2 requested."
+	fi
+
+	cmp  -s $(atf_get_srcdir)/data/${exp} out && return
+	diff -u $(atf_get_srcdir)/data/${exp} out && \
+	atf_fail "Actual output does not match expected output"
+}
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Testing basic ones"
+}
+basic_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST ::1 http
+	  $TEST 127.0.0.1 http
+	  $TEST localhost http
+	  $TEST ::1 tftp
+	  $TEST 127.0.0.1 tftp
+	  $TEST localhost tftp
+	  $TEST ::1 echo
+	  $TEST 127.0.0.1 echo
+	  $TEST localhost echo ) > out 2>&1
+
+	check_output basics hosts
+}
+
+atf_test_case specific
+specific_head()
+{
+	atf_set "descr" "Testing specific address family"
+}
+specific_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST -4 localhost http
+	  $TEST -6 localhost http ) > out 2>&1
+
+	check_output spec_fam hosts
+}
+
+atf_test_case empty_hostname
+empty_hostname_head()
+{
+	atf_set "descr" "Testing empty hostname"
+}
+empty_hostname_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST '' http
+	  $TEST '' echo
+	  $TEST '' tftp
+	  $TEST '' 80
+	  $TEST -P '' http
+	  $TEST -P '' echo
+	  $TEST -P '' tftp
+	  $TEST -P '' 80
+	  $TEST -S '' 80
+	  $TEST -D '' 80 ) > out 2>&1
+
+	check_output no_host ifconfig
+}
+
+atf_test_case empty_servname
+empty_servname_head()
+{
+	atf_set "descr" "Testing empty service name"
+}
+empty_servname_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST ::1 ''
+	  $TEST 127.0.0.1 ''
+	  $TEST localhost ''
+	  $TEST '' '' ) > out 2>&1
+
+	check_output no_serv hosts
+}
+
+atf_test_case sock_raw
+sock_raw_head()
+{
+	atf_set "descr" "Testing raw socket"
+}
+sock_raw_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST -R -p 0 localhost ''
+	  $TEST -R -p 59 localhost ''
+	  $TEST -R -p 59 localhost 80
+	  $TEST -R -p 59 localhost www
+	  $TEST -R -p 59 ::1 '' ) > out 2>&1
+
+	check_output sock_raw hosts
+}
+
+atf_test_case unsupported_family
+unsupported_family_head()
+{
+	atf_set "descr" "Testing unsupported family"
+}
+unsupported_family_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST -f 99 localhost '' ) > out 2>&1
+
+	check_output unsup_fam none
+}
+
+atf_test_case scopeaddr
+scopeaddr_head()
+{
+	atf_set "descr" "Testing scoped address format"
+}
+scopeaddr_body()
+{
+	TEST=$(atf_get_srcdir)/h_gai
+
+	( $TEST fe80::1%lo0 http
+#	  IF=`ifconfig -a | grep -v '^	' | \
+#		sed -e 's/:.*//' | head -1 | awk '{print $1}'`
+#	  $TEST fe80::1%$IF http
+	) > out 2>&1
+
+	check_output scoped none
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case specific
+	atf_add_test_case empty_hostname
+	atf_add_test_case empty_servname
+	atf_add_test_case sock_raw
+	atf_add_test_case unsupported_family
+	atf_add_test_case scopeaddr
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/unsup_fam.exp b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/unsup_fam.exp
new file mode 100644
index 000000000000..b6133c004e0e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/unsup_fam.exp
@@ -0,0 +1,2 @@
+arg: flags 0x2 family 99 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
+ai_family not supported
diff --git a/contrib/netbsd-tests/lib/libc/net/h_dns_server.c b/contrib/netbsd-tests/lib/libc/net/h_dns_server.c
new file mode 100644
index 000000000000..47472defda0d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/h_dns_server.c
@@ -0,0 +1,298 @@
+/*	$NetBSD: h_dns_server.c,v 1.4 2014/03/29 16:10:54 gson Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andreas Gustafsson.
+ *
+ * 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.
+ */
+
+/*
+ * A minimal DNS server capable of providing canned answers to the
+ * specific queries issued by t_hostent.sh and nothing more.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_dns_server.c,v 1.4 2014/03/29 16:10:54 gson Exp $");
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <netinet6/in6.h>
+
+union sockaddr_either {
+	struct sockaddr s;
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+};
+
+#ifdef DEBUG
+#define DPRINTF(...)	fprintf(stderr, __VA_ARGS__)
+#else
+#define DPRINTF(...)	
+#endif
+
+/* A DNS question and its corresponding answer */
+
+struct dns_data {
+	size_t qname_size;
+	const char *qname; /* Wire-encode question name */
+	int qtype;
+	size_t answer_size;
+	const char *answer; /* One wire-encoded answer RDATA */
+};
+
+/* Convert C string constant to length + data pair */
+#define STR_DATA(s) sizeof(s) - 1, s
+
+/* Canned DNS queestion-answer pairs */
+struct dns_data data[] = {
+	/* Forward mappings */
+	/* localhost IN A -> 127.0.0.1 */
+	{ STR_DATA("\011localhost\000"), 1,
+	  STR_DATA("\177\000\000\001") },
+	/* localhost IN AAAA -> ::1 */
+	{ STR_DATA("\011localhost\000"), 28,
+	  STR_DATA("\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001") },
+	/* sixthavenue.astron.com IN A -> 38.117.134.16 */
+	{ STR_DATA("\013sixthavenue\006astron\003com\000"), 1,
+	  STR_DATA("\046\165\206\020") },
+	/* sixthavenue.astron.com IN AAAA -> 2620:106:3003:1f00:3e4a:92ff:fef4:e180 */
+	{ STR_DATA("\013sixthavenue\006astron\003com\000"), 28,
+	  STR_DATA("\x26\x20\x01\x06\x30\x03\x1f\x00\x3e\x4a\x92\xff\xfe\xf4\xe1\x80") },
+	/* Reverse mappings */
+	{ STR_DATA("\0011\0010\0010\003127\007in-addr\004arpa\000"), 12,
+	  STR_DATA("\011localhost\000") },
+	{ STR_DATA("\0011\0010\0010\0010\0010\0010\0010\0010"
+		   "\0010\0010\0010\0010\0010\0010\0010\0010"
+		   "\0010\0010\0010\0010\0010\0010\0010\0010"
+		   "\0010\0010\0010\0010\0010\0010\0010\0010"
+		   "\003ip6\004arpa\000"), 12,
+	  STR_DATA("\011localhost\000") },
+	{ STR_DATA("\00216\003134\003117\00238"
+		   "\007in-addr\004arpa\000"), 12,
+	  STR_DATA("\013sixthavenue\006astron\003com\000") },
+	{ STR_DATA("\0010\0018\0011\001e\0014\001f\001e\001f"
+		   "\001f\001f\0012\0019\001a\0014\001e\0013"
+		   "\0010\0010\001f\0011\0013\0010\0010\0013"
+		   "\0016\0010\0011\0010\0010\0012\0016\0012"
+		   "\003ip6\004arpa\000"), 12,
+	  STR_DATA("\013sixthavenue\006astron\003com\000") },
+	/* End marker */
+	{ STR_DATA(""), 0, STR_DATA("") }
+};
+
+/*
+ * Compare two DNS names for equality.	If equal, return their
+ * length, and if not, return zero.  Does not handle compression.
+ */
+static int
+name_eq(const unsigned char *a, const unsigned char *b) {
+	const unsigned char *a_save = a;
+	for (;;) {
+		int i;
+		int lena = *a++;
+		int lenb = *b++;
+		if (lena != lenb)
+			return 0;
+		if (lena == 0)
+			return a - a_save;
+		for (i = 0; i < lena; i++)
+			if (tolower(a[i]) != tolower(b[i]))
+				return 0;
+		a += lena;
+		b += lena;
+	}
+}
+
+#ifdef DEBUG
+static char *
+name2str(const void *v, char *buf, size_t buflen) {
+	const unsigned char *a = v;
+	char *b = buf;
+	char *eb = buf + buflen;
+
+#define ADDC(c) do { \
+		if (b < eb) \
+			*b++ = c; \
+		else \
+			return NULL; \
+	} while (/*CONSTCOND*/0)
+	for (int did = 0;; did++) {
+		int lena = *a++;
+		if (lena == 0) {
+			ADDC('\0');
+			return buf;
+		}
+		if (did)
+			ADDC('.');
+		for (int i = 0; i < lena; i++)
+			ADDC(a[i]);
+		a += lena;
+	}
+}
+#endif
+
+int main(int argc, char **argv) {
+	int s, r, protocol;
+	union sockaddr_either saddr;
+	struct dns_data *dp;
+	unsigned char *p;
+	char pidfile_name[40];
+	FILE *f;
+	int one = 1;
+#ifdef DEBUG
+	char buf1[1024], buf2[1024];
+#endif
+
+	if (argc < 2 || ((protocol = argv[1][0]) != '4' && protocol != '6'))
+		errx(1, "usage: dns_server 4 | 6");
+	s = socket(protocol == '4' ? PF_INET : PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+	if (s < 0)
+		err(1, "socket");
+	if (protocol == '4') {
+		memset(&saddr.sin, 0, sizeof(saddr.sin));
+		saddr.sin.sin_family = AF_INET;
+		saddr.sin.sin_len = sizeof(saddr.sin);
+		saddr.sin.sin_port = htons(53);
+		saddr.sin.sin_addr.s_addr = INADDR_ANY;
+	} else {
+		static struct in6_addr loopback = IN6ADDR_LOOPBACK_INIT;
+		memset(&saddr.sin6, 0, sizeof(saddr.sin6));
+		saddr.sin6.sin6_family = AF_INET6;
+		saddr.sin6.sin6_len = sizeof(saddr.sin6);
+		saddr.sin6.sin6_port = htons(53);
+		saddr.sin6.sin6_addr = loopback;
+	}
+
+	r = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
+	if (r < 0)
+		err(1, "setsockopt");
+
+	r = bind(s,
+		 (struct sockaddr *) &saddr,
+		 protocol == '4' ? sizeof(struct sockaddr_in) :
+				   sizeof(struct sockaddr_in6));
+	if (r < 0)
+		err(1, "bind");
+
+	snprintf(pidfile_name, sizeof pidfile_name,
+		 "dns_server_%c.pid", protocol);
+	f = fopen(pidfile_name, "w");
+	fprintf(f, "%d", getpid());
+	fclose(f);
+#ifdef DEBUG
+	daemon(0, 1);
+#else
+	daemon(0, 0);
+#endif
+
+	for (;;) {
+		unsigned char buf[512];
+		union sockaddr_either from;
+		ssize_t nrecv, nsent;
+		socklen_t fromlen =
+			protocol == '4' ? sizeof(struct sockaddr_in) :
+					  sizeof(struct sockaddr_in6);
+		memset(buf, 0, sizeof buf);
+		nrecv = recvfrom(s, buf, sizeof buf, 0, &from.s, &fromlen);
+		if (nrecv < 0)
+			err(1, "recvfrom");
+		if (nrecv < 12) {
+			DPRINTF("Too short %zd\n", nrecv);
+			continue;
+		}
+		if ((buf[2] & 0x80) != 0) {
+			DPRINTF("Not a query 0x%x\n", buf[2]);
+			continue;
+		}
+		if (!(buf[4] == 0 && buf[5] == 1)) {
+			DPRINTF("QCOUNT is not 1 0x%x 0x%x\n", buf[4], buf[5]);
+			continue; /* QDCOUNT is not 1 */
+		}
+
+		for (dp = data; dp->qname_size != 0; dp++) {
+			int qtype, qclass;
+			p = buf + 12; /* Point to QNAME */
+			int n = name_eq(p, (const unsigned char *) dp->qname);
+			if (n == 0) {
+				DPRINTF("no match name %s != %s\n",
+				    name2str(p, buf1, sizeof(buf1)),
+				    name2str(dp->qname, buf2, sizeof(buf2)));
+				continue; /* Name does not match */
+			}
+			DPRINTF("match name %s\n",
+			    name2str(p, buf1, sizeof(buf1)));
+			p += n; /* Skip QNAME */
+			qtype = *p++ << 8;
+			qtype |= *p++;
+			if (qtype != dp->qtype) {
+				DPRINTF("no match name 0x%x != 0x%x\n",
+				    qtype, dp->qtype);
+				continue;
+			}
+			DPRINTF("match type 0x%x\n", qtype);
+			qclass = *p++ << 8;
+			qclass |= *p++;
+			if (qclass != 1) { /* IN */
+				DPRINTF("no match class %d != 1\n", qclass);
+				continue;
+			}
+			DPRINTF("match class %d\n", qclass);
+			goto found;
+		}
+		continue;
+	found:
+		buf[2] |= 0x80; /* QR */
+		buf[3] |= 0x80; /* RA */
+		memset(buf + 6, 0, 6); /* Clear ANCOUNT, NSCOUNT, ARCOUNT */
+		buf[7] = 1; /* ANCOUNT */
+		memcpy(p, dp->qname, dp->qname_size);
+		p += dp->qname_size;
+		*p++ = dp->qtype >> 8;
+		*p++ = dp->qtype & 0xFF;
+		*p++ = 0;
+		*p++ = 1; /* IN */
+		memset(p, 0, 4); /* TTL = 0 */
+		p += 4;
+		*p++ = 0;		/* RDLENGTH MSB */
+		*p++ = dp->answer_size;	/* RDLENGTH LSB */
+		memcpy(p, dp->answer, dp->answer_size);
+		p += dp->answer_size;
+		nsent = sendto(s, buf, p - buf, 0, &from.s, fromlen);
+		DPRINTF("sent %zd\n", nsent);
+		if (nsent != p - buf)
+			warn("sendto");
+	}
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/h_hostent.c b/contrib/netbsd-tests/lib/libc/net/h_hostent.c
new file mode 100644
index 000000000000..4a7292320f3d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/h_hostent.c
@@ -0,0 +1,195 @@
+/*	$NetBSD: h_hostent.c,v 1.2 2014/01/09 02:18:10 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_hostent.c,v 1.2 2014/01/09 02:18:10 christos Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <nsswitch.h>
+#include <netdb.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <err.h>
+
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <arpa/nameser.h>
+#include <arpa/inet.h>
+
+#include "hostent.h"
+
+extern const char *__res_conf_name;
+
+static void
+phostent(const struct hostent *h)
+{
+	size_t i;
+	char buf[1024];
+	const int af = h->h_length == NS_INADDRSZ ? AF_INET : AF_INET6;
+
+	printf("name=%s, length=%d, addrtype=%d, aliases=[",
+	    h->h_name, h->h_length, h->h_addrtype);
+
+	for (i = 0; h->h_aliases[i]; i++)
+		printf("%s%s", i == 0 ? "" : " ", h->h_aliases[i]);
+
+	printf("] addr_list=[");
+
+	for (i = 0; h->h_addr_list[i]; i++)
+		printf("%s%s", i == 0 ? "" : " ", inet_ntop(af,
+		    h->h_addr_list[i], buf, (socklen_t)sizeof(buf)));
+
+	printf("]\n");
+}
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr, "Usage: %s [-f <hostsfile>] "
+	    "[-t <any|dns|nis|files>] "
+	    "[-46a] <name|address>\n", getprogname());
+	exit(EXIT_FAILURE);
+}
+
+static void
+getby(int (*f)(void *, void *, va_list), struct getnamaddr *info, ...)
+{
+	va_list ap;
+	int e;
+
+	va_start(ap, info);
+	e = (*f)(info, NULL, ap);
+	va_end(ap);
+	switch (e) {
+	case NS_SUCCESS:
+		phostent(info->hp);
+		break;
+	default:
+		printf("error %d\n", e);
+		break;
+	}
+}
+
+static void
+geta(struct hostent *hp) {
+	if (hp == NULL)
+		printf("error %d\n", h_errno);
+	else
+		phostent(hp);
+}
+
+int
+main(int argc, char *argv[])
+{
+	int (*f)(void *, void *, va_list) = NULL;
+	const char *type = "any";
+	int c, af, e, byaddr, len;
+	struct hostent hent;
+	struct getnamaddr info;
+	char buf[4096];
+	
+	af = AF_INET;
+	byaddr = 0;
+	len = 0;
+	info.hp = &hent;
+	info.buf = buf;
+	info.buflen = sizeof(buf);
+	info.he = &e;
+
+	while ((c = getopt(argc, argv, "46af:r:t:")) != -1) {
+		switch (c) {
+		case '4':
+			af = AF_INET;
+			break;
+		case '6':
+			af = AF_INET6;
+			break;
+		case 'a':
+			byaddr++;
+			break;
+		case 'f':
+			_hf_sethostsfile(optarg);
+			break;
+		case 'r':
+			__res_conf_name = optarg;
+			break;
+		case 't':
+			type = optarg;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 1)
+		usage();
+
+	switch (*type) {
+	case 'a':
+		break;
+	case 'd':
+		f = byaddr ? _dns_gethtbyaddr : _dns_gethtbyname;
+		break;
+#ifdef YP
+	case 'n':
+		f = byaddr ? _yp_gethtbyaddr : _yp_gethtbyname;
+		break;
+#endif
+	case 'f':
+		f = byaddr ? _hf_gethtbyaddr : _hf_gethtbyname;
+		break;
+	default:
+		errx(EXIT_FAILURE, "Unknown db type `%s'", type);
+	}
+
+	if (byaddr) {
+		struct in6_addr addr;
+		af = strchr(*argv, ':') ? AF_INET6 : AF_INET;
+		len = af == AF_INET ? NS_INADDRSZ : NS_IN6ADDRSZ;
+		if (inet_pton(af, *argv, &addr) == -1)
+			err(EXIT_FAILURE, "Can't parse `%s'", *argv);
+		if (*type == 'a')
+			geta(gethostbyaddr((const char *)&addr, len, af));
+		else
+			getby(f, &info, &addr, len, af);
+	} else {
+		if (*type == 'a')
+			geta(gethostbyname2(*argv, af));
+		else
+			getby(f, &info, *argv, len, af);
+	}
+		
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/h_nsd_recurse.c b/contrib/netbsd-tests/lib/libc/net/h_nsd_recurse.c
new file mode 100644
index 000000000000..2f315d2b4194
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/h_nsd_recurse.c
@@ -0,0 +1,107 @@
+/*	$NetBSD: h_nsd_recurse.c,v 1.2 2011/01/13 02:24:51 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_nsd_recurse.c,v 1.2 2011/01/13 02:24:51 pgoyette Exp $");
+
+#define	_REENTRANT
+
+#include <assert.h>
+#include <nsswitch.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static const ns_src testsrc[] = {
+	{ "test",	NS_SUCCESS },
+	{ NULL, 0 }
+};
+
+static int
+func3(void *rv, void *cb_data, va_list ap)
+{
+	(void)printf("func3: enter\n");
+	(void)printf("func3: exit\n");
+
+	return NS_SUCCESS;
+}
+
+static int
+func2(void *rv, void *cb_data, va_list ap)
+{
+	static const ns_dtab dtab[] = {
+		{ "test",	func3,		NULL },
+		{ NULL, NULL, NULL }
+	};
+	int r;
+
+	(void)printf("func2: enter\n");
+	r = nsdispatch(NULL, dtab, "test", "test", testsrc);
+	(void)printf("func2: exit\n");
+
+	return r;
+}
+
+static int
+func1(void)
+{
+	static const ns_dtab dtab[] = {
+		{ "test",	func2,		NULL },
+		{ NULL, NULL, NULL }
+	};
+	int r;
+
+	(void)printf("func1: enter\n");
+	r = nsdispatch(NULL, dtab, "test", "test", testsrc);
+	(void)printf("func1: exit\n");
+
+	return r;
+}
+
+static void *
+thrfunc(void *arg)
+{
+	pthread_exit(NULL);
+}
+
+int
+main(int argc, char *argv[])
+{
+	pthread_t thr;
+	void *threval;
+
+	assert(pthread_create(&thr, NULL, thrfunc, NULL) == 0);
+	assert(func1() == NS_SUCCESS);
+	assert(pthread_join(thr, &threval) == 0);
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/h_protoent.c b/contrib/netbsd-tests/lib/libc/net/h_protoent.c
new file mode 100644
index 000000000000..f37a85c26e5e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/h_protoent.c
@@ -0,0 +1,97 @@
+/* $NetBSD: h_protoent.c,v 1.2 2011/04/07 18:14:09 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <netdb.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+static void
+pserv(const struct protoent *prp)
+{
+	char **pp;
+
+	printf("name=%s, proto=%d, aliases=",
+	    prp->p_name, prp->p_proto);
+	for (pp = prp->p_aliases; *pp; pp++)
+		printf("%s ", *pp);
+	printf("\n");
+}
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr, "Usage: %s\n"
+	    "\t%s -p <proto>\n"
+	    "\t%s -n <name>\n", getprogname(), getprogname(),
+	    getprogname());
+	exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct protoent *prp;
+	const char *proto = NULL, *name = NULL;
+	int c;
+
+	while ((c = getopt(argc, argv, "p:n:")) != -1) {
+		switch (c) {
+		case 'n':
+			name = optarg;
+			break;
+		case 'p':
+			proto = optarg;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	if (proto && name)
+		usage();
+	if (proto) {
+		if ((prp = getprotobynumber(atoi(proto))) != NULL)
+			pserv(prp);
+		return 0;
+	}
+	if (name) {
+		if ((prp = getprotobyname(name)) != NULL)
+			pserv(prp);
+		return 0;
+	}
+
+	setprotoent(0);
+	while ((prp = getprotoent()) != NULL)
+		pserv(prp);
+	endprotoent();
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/h_servent.c b/contrib/netbsd-tests/lib/libc/net/h_servent.c
new file mode 100644
index 000000000000..6d7efd80f5e1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/h_servent.c
@@ -0,0 +1,100 @@
+/* $NetBSD: h_servent.c,v 1.2 2011/04/07 18:14:09 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <netdb.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+static void
+pserv(const struct servent *svp)
+{
+	char **pp;
+
+	printf("name=%s, port=%d, proto=%s, aliases=",
+	    svp->s_name, ntohs((uint16_t)svp->s_port), svp->s_proto);
+	for (pp = svp->s_aliases; *pp; pp++)
+		printf("%s ", *pp);
+	printf("\n");
+}
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr, "Usage: %s\n"
+	    "\t%s -p <port> [-P <proto>]\n"
+	    "\t%s -n <name> [-P <proto>]\n", getprogname(), getprogname(),
+	    getprogname());
+	exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct servent *svp;
+	const char *port = NULL, *proto = NULL, *name = NULL;
+	int c;
+
+	while ((c = getopt(argc, argv, "p:n:P:")) != -1) {
+		switch (c) {
+		case 'n':
+			name = optarg;
+			break;
+		case 'p':
+			port = optarg;
+			break;
+		case 'P':
+			proto = optarg;
+			break;
+		default:
+			usage();
+		}
+	}
+
+	if (port && name)
+		usage();
+	if (port) {
+		if ((svp = getservbyport(htons(atoi(port)), proto)) != NULL)
+			pserv(svp);
+		return 0;
+	}
+	if (name) {
+		if ((svp = getservbyname(name, proto)) != NULL)
+			pserv(svp);
+		return 0;
+	}
+
+	setservent(0);
+	while ((svp = getservent()) != NULL)
+		pserv(svp);
+	endservent();
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/hosts b/contrib/netbsd-tests/lib/libc/net/hosts
new file mode 100644
index 000000000000..87ccbe8884a0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/hosts
@@ -0,0 +1,11 @@
+#	$NetBSD: hosts,v 1.1 2013/08/16 15:29:45 christos Exp $
+#
+# Host Database
+# This file should contain the addresses and aliases
+# for local hosts that share this file.
+# It is used only for "ifconfig" and other operations
+# before the nameserver is started.
+#
+#
+::1			localhost localhost. localhost.localdomain.
+127.0.0.1		localhost localhost. localhost.localdomain.
diff --git a/contrib/netbsd-tests/lib/libc/net/resolv.conf b/contrib/netbsd-tests/lib/libc/net/resolv.conf
new file mode 100644
index 000000000000..bbc8559cd54f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/resolv.conf
@@ -0,0 +1 @@
+nameserver 127.0.0.1
diff --git a/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c b/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c
new file mode 100644
index 000000000000..6ca3c5b74e5a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c
@@ -0,0 +1,104 @@
+/*	$NetBSD: t_ether_aton.c,v 1.1 2011/11/01 22:36:53 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ether_aton.c,v 1.1 2011/11/01 22:36:53 pgoyette Exp $");
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <err.h>
+#include <string.h>
+#include <errno.h>
+
+#define ETHER_ADDR_LEN 6
+
+int ether_aton_r(u_char *dest, size_t len, const char *str);
+
+static const struct {
+	u_char res[ETHER_ADDR_LEN];
+	const char *str;
+	int error;
+} tests[] = {
+	{ { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, "01:23:45:67:89:ab", 0 },
+	{ { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "0:1:22-3:14:05", 0 },
+	{ { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "000122031405", 0 },
+	{ { 0x0a, 0x0B, 0xcc, 0xdD, 0xEE, 0x0f }, "0a0BccdDEE0f", 0 },
+#define ZERO { 0, 0, 0, 0, 0, 0 }
+	{ ZERO,	"0:1:2-3:04:05:06", ENAMETOOLONG },
+	{ ZERO,	"0:1:2-3:04:", ENOBUFS },
+	{ ZERO,	"0:1:2-3:04:x7", EINVAL },
+	{ ZERO,	"1:x-3:04:05:7", EINVAL },
+	{ ZERO,	NULL, 0 },
+};
+
+ATF_TC(tc_ether_aton);
+ATF_TC_HEAD(tc_ether_aton, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that ether_aton(3) works");  
+}
+ 
+ATF_TC_BODY(tc_ether_aton, tc)
+{
+	u_char dest[ETHER_ADDR_LEN];
+	size_t t;
+	int e, r;
+	const char *s;
+
+	for (t = 0; tests[t].str; t++) {
+		s = tests[t].str;
+		if ((e = tests[t].error) == 0) {
+			if (ether_aton_r(dest, sizeof(dest), s) != e)
+				atf_tc_fail("failed on `%s'", s);
+			if (memcmp(dest, tests[t].res, sizeof(dest)) != 0)
+				atf_tc_fail("unexpected result on `%s'", s);
+		} else {
+			if ((r = ether_aton_r(dest, sizeof(dest), s)) != e)
+				atf_tc_fail("unexpectedly succeeded on `%s' "
+				    "(%d != %d)", s, r, e);
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{       
+ 
+	ATF_TP_ADD_TC(tp, tc_ether_aton);
+        
+        return atf_no_error();
+}       
diff --git a/contrib/netbsd-tests/lib/libc/net/t_getprotoent.c b/contrib/netbsd-tests/lib/libc/net/t_getprotoent.c
new file mode 100644
index 000000000000..1c1a0e060445
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_getprotoent.c
@@ -0,0 +1,233 @@
+/* $NetBSD: t_getprotoent.c,v 1.2 2012/04/04 10:03:53 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getprotoent.c,v 1.2 2012/04/04 10:03:53 joerg Exp $");
+
+#include <atf-c.h>
+#include <netdb.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+static const struct {
+	const char *name;
+	int	    number;
+} protos[] = {
+
+	{ "icmp", 1 },	{ "tcp", 6 },	{ "udp", 17 },	{ "gre", 47 },
+	{ "esp", 50 },	{ "ah", 51 },	{ "sctp", 132},	{ "ipv6-icmp", 58 }
+};
+
+ATF_TC(endprotoent_rewind);
+ATF_TC_HEAD(endprotoent_rewind, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that endprotoent(3) rewinds");
+}
+
+ATF_TC_BODY(endprotoent_rewind, tc)
+{
+	struct protoent *p;
+	int i = 0;
+
+	setprotoent(0);
+
+	while ((p = getprotoent()) != NULL && i <= 10) {
+		ATF_REQUIRE(p->p_proto == i);
+		i++;
+	}
+
+	i = 0;
+	endprotoent();
+
+	while ((p = getprotoent()) != NULL && i <= 10) {
+		ATF_REQUIRE(p->p_proto == i);
+		i++;
+	}
+
+	endprotoent();
+}
+
+ATF_TC(getprotobyname_basic);
+ATF_TC_HEAD(getprotobyname_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of getprotobyname(3)");
+}
+
+ATF_TC_BODY(getprotobyname_basic, tc)
+{
+	struct protoent *p;
+	size_t i;
+
+	for (i = 0; i < __arraycount(protos); i++) {
+
+		p = getprotobyname(protos[i].name);
+
+		ATF_REQUIRE(p != NULL);
+		ATF_REQUIRE(p->p_proto == protos[i].number);
+		ATF_REQUIRE(strcmp(p->p_name, protos[i].name) == 0);
+	}
+
+	endprotoent();
+}
+
+ATF_TC(getprotobyname_err);
+ATF_TC_HEAD(getprotobyname_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test EOF from getprotobyname(3)");
+}
+
+ATF_TC_BODY(getprotobyname_err, tc)
+{
+	static const char * name[] =
+	    { "xxx", "yyy", "xyz", ".as.d}9x.._?!!#\xa4,\xa8^//&%%,",
+	      "0", "", "tCp", "uDp", "t c p", "tcp ", " tcp" };
+
+	size_t i;
+
+	for (i = 0; i < __arraycount(name); i++)
+		ATF_REQUIRE(getprotobyname(name[i]) == NULL);
+
+	endprotoent();
+}
+
+ATF_TC(getprotobynumber_basic);
+ATF_TC_HEAD(getprotobynumber_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A naive test of getprotobynumber(3)");
+}
+
+ATF_TC_BODY(getprotobynumber_basic, tc)
+{
+	struct protoent *p;
+	size_t i;
+
+	/*
+	 * No ATF_CHECK() due static storage.
+	 */
+	for (i = 0; i < __arraycount(protos); i++) {
+
+		p = getprotobynumber(protos[i].number);
+
+		ATF_REQUIRE(p != NULL);
+		ATF_REQUIRE(p->p_proto == protos[i].number);
+		ATF_REQUIRE(strcmp(p->p_name, protos[i].name) == 0);
+	}
+
+	endprotoent();
+}
+
+ATF_TC(getprotobynumber_err);
+ATF_TC_HEAD(getprotobynumber_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test EOF from getprotobynumber(3)");
+}
+
+ATF_TC_BODY(getprotobynumber_err, tc)
+{
+	static const int number[] = { -1, -99999, INT_MAX, 1000000000 };
+	size_t i;
+
+	for (i = 0; i < __arraycount(number); i++)
+		ATF_REQUIRE(getprotobynumber(number[i]) == NULL);
+
+	endprotoent();
+}
+
+ATF_TC(getprotoent_next);
+ATF_TC_HEAD(getprotoent_next, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "getprotoent(3) returns next line?");
+}
+
+ATF_TC_BODY(getprotoent_next, tc)
+{
+	struct protoent *p;
+	int i = 0;
+
+	/*
+	 * The range [0, 60] is already reserved by IANA.
+	 */
+	while ((p = getprotoent()) != NULL && i <= 60) {
+		ATF_CHECK(p->p_proto == i);
+		i++;
+	}
+
+	endprotoent();
+}
+
+ATF_TC(setprotoent_rewind);
+ATF_TC_HEAD(setprotoent_rewind, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that setprotoent(3) rewinds");
+}
+
+ATF_TC_BODY(setprotoent_rewind, tc)
+{
+	struct protoent *p;
+
+	setprotoent(0);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 0);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 1);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 2);
+
+	setprotoent(0);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 0);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 1);
+
+	p = getprotoent();
+	ATF_REQUIRE(p->p_proto == 2);
+
+	endprotoent();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getprotobyname_basic);
+	ATF_TP_ADD_TC(tp, getprotobyname_err);
+	ATF_TP_ADD_TC(tp, getprotobynumber_basic);
+	ATF_TP_ADD_TC(tp, getprotobynumber_err);
+	ATF_TP_ADD_TC(tp, endprotoent_rewind);
+	ATF_TP_ADD_TC(tp, getprotoent_next);
+	ATF_TP_ADD_TC(tp, setprotoent_rewind);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/t_hostent.sh b/contrib/netbsd-tests/lib/libc/net/t_hostent.sh
new file mode 100755
index 000000000000..b597b6d57c76
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_hostent.sh
@@ -0,0 +1,240 @@
+# $NetBSD: t_hostent.sh,v 1.10 2014/01/13 11:08:14 gson Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+n6="sixthavenue.astron.com"
+a6="2620:106:3003:1f00:3e4a:92ff:fef4:e180"
+ans6="name=$n6, length=16, addrtype=24, aliases=[] addr_list=[$a6]\n"
+
+n4="sixthavenue.astron.com"
+a4="38.117.134.16"
+ans4="name=$n4, length=4, addrtype=2, aliases=[] addr_list=[$a4]\n"
+
+l6="localhost"
+al6="::1"
+loc6="name=$l6, length=16, addrtype=24, aliases=[localhost. localhost.localdomain.] addr_list=[$al6]\n"
+
+l4="localhost"
+al4="127.0.0.1"
+loc4="name=$l4, length=4, addrtype=2, aliases=[localhost. localhost.localdomain.] addr_list=[$al4]\n"
+
+dir="$(atf_get_srcdir)"
+res="-r ${dir}/resolv.conf"
+
+# Hijack DNS traffic using a single rump server instance and a DNS
+# server listening on its loopback address.
+
+start_dns_server() {
+	export RUMP_SERVER=unix:///tmp/rumpserver
+	rump_server -lrumpdev -lrumpnet -lrumpnet_net -lrumpnet_netinet \
+	    -lrumpnet_netinet6 -lrumpnet_local $RUMP_SERVER
+	HIJACK_DNS="LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK='socket=inet:inet6'"
+	eval $HIJACK_DNS ${dir}/h_dns_server $1
+}
+
+stop_dns_server() {
+	export RUMP_SERVER=unix:///tmp/rumpserver
+	kill $(cat dns_server_$1.pid)
+	rump.halt
+}
+
+atf_test_case gethostbyname4 cleanup
+gethostbyname4_head()
+{
+	atf_set "descr" "Checks gethostbyname2(3) for AF_INET (auto, as determined by nsswitch.conf(5)"
+}
+gethostbyname4_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -4 $n4"
+}
+gethostbyname4_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case gethostbyname6 cleanup cleanup
+gethostbyname6_head()
+{
+	atf_set "descr" "Checks gethostbyname2(3) for AF_INET6 (auto, as determined by nsswitch.conf(5)"
+}
+gethostbyname6_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -6 $n6"
+}
+gethostbyname6_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case gethostbyaddr4 cleanup
+gethostbyaddr4_head()
+{
+	atf_set "descr" "Checks gethostbyaddr(3) for AF_INET (auto, as determined by nsswitch.conf(5)"
+}
+gethostbyaddr4_body()
+{
+	start_dns_server 4
+        atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -a $a4"
+}
+gethostbyaddr4_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case gethostbyaddr6 cleanup
+gethostbyaddr6_head()
+{
+	atf_set "descr" "Checks gethostbyaddr(3) for AF_INET6 (auto, as determined by nsswitch.conf(5)"
+}
+gethostbyaddr6_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -a $a6"
+}
+gethostbyaddr6_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case hostsbynamelookup4
+hostsbynamelookup4_head()
+{
+	atf_set "descr" "Checks /etc/hosts name lookup for AF_INET"
+}
+hostsbynamelookup4_body()
+{
+	atf_check -o inline:"$loc4" -x "${dir}/h_hostent -f ${dir}/hosts -t file -4 $l4"
+}
+
+atf_test_case hostsbynamelookup6
+hostsbynamelookup6_head()
+{
+	atf_set "descr" "Checks /etc/hosts name lookup for AF_INET6"
+}
+hostsbynamelookup6_body()
+{
+	atf_check -o inline:"$loc6" -x "${dir}/h_hostent -f ${dir}/hosts -t file -6 $l6"
+}
+
+atf_test_case hostsbyaddrlookup4
+hostsbyaddrlookup4_head()
+{
+	atf_set "descr" "Checks /etc/hosts address lookup for AF_INET"
+}
+hostsbyaddrlookup4_body()
+{
+	atf_check -o inline:"$loc4" -x "${dir}/h_hostent -f ${dir}/hosts -t file -4 -a $al4"
+}
+
+atf_test_case hostsbyaddrlookup6
+hostsbyaddrlookup6_head()
+{
+	atf_set "descr" "Checks /etc/hosts address lookup for AF_INET6"
+}
+hostsbyaddrlookup6_body()
+{
+	atf_check -o inline:"$loc6" -x "${dir}/h_hostent -f ${dir}/hosts -t file -6 -a $al6"
+}
+
+atf_test_case dnsbynamelookup4 cleanup
+dnsbynamelookup4_head()
+{
+	atf_set "descr" "Checks DNS name lookup for AF_INET"
+}
+dnsbynamelookup4_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -4 $n4"
+}
+dnsbynamelookup4_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case dnsbynamelookup6 cleanup
+dnsbynamelookup6_head()
+{
+	atf_set "descr" "Checks DNS name lookup for AF_INET6"
+}
+dnsbynamelookup6_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -6 $n6"
+}
+dnsbynamelookup6_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case dnsbyaddrlookup4 cleanup
+dnsbyaddrlookup4_head()
+{
+	atf_set "descr" "Checks DNS address lookup for AF_INET"
+}
+dnsbyaddrlookup4_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -4 -a $a4"
+}
+dnsbyaddrlookup4_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_test_case dnsbyaddrlookup6 cleanup
+dnsbyaddrlookup6_head()
+{
+	atf_set "descr" "Checks dns address lookup for AF_INET6"
+}
+dnsbyaddrlookup6_body()
+{
+	start_dns_server 4
+	atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -6 -a $a6"
+}
+dnsbyaddrlookup6_cleanup()
+{
+	stop_dns_server 4
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case gethostbyname4
+	atf_add_test_case gethostbyname6
+	atf_add_test_case gethostbyaddr4
+	atf_add_test_case gethostbyaddr6
+
+	atf_add_test_case hostsbynamelookup4
+	atf_add_test_case hostsbynamelookup6
+	atf_add_test_case hostsbyaddrlookup4
+	atf_add_test_case hostsbyaddrlookup6
+
+	atf_add_test_case dnsbynamelookup4
+	atf_add_test_case dnsbynamelookup6
+	atf_add_test_case dnsbyaddrlookup4
+	atf_add_test_case dnsbyaddrlookup6
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/t_nsdispatch.sh b/contrib/netbsd-tests/lib/libc/net/t_nsdispatch.sh
new file mode 100755
index 000000000000..b58436958a9f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_nsdispatch.sh
@@ -0,0 +1,51 @@
+# $NetBSD: t_nsdispatch.sh,v 1.1 2011/01/13 01:56:44 pgoyette Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case recurse
+recurse_head()
+{
+	atf_set "descr" "Checks recursive calls to nsdispatch()" \
+			"within threaded program"
+}
+recurse_body()
+{
+	cat >exp <<EOF
+func1: enter
+func2: enter
+func3: enter
+func3: exit
+func2: exit
+func1: exit
+EOF
+
+	atf_check -o file:exp "$(atf_get_srcdir)/h_nsd_recurse"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case recurse
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/t_protoent.sh b/contrib/netbsd-tests/lib/libc/net/t_protoent.sh
new file mode 100755
index 000000000000..322d426a29bb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_protoent.sh
@@ -0,0 +1,91 @@
+# $NetBSD: t_protoent.sh,v 1.2 2012/09/03 15:32:18 christos Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case protoent
+protoent_head()
+{
+	atf_set "descr" "Checks {get,set,end}protoent(3)"
+}
+protoent_body()
+{
+	#
+	# Munge original to:
+	#  (1) match output format of the test program
+	#  (2) fold all names for the same port/proto together
+	#  (3) prune duplicates
+	#
+	tr '\t' ' ' </etc/protocols | awk '
+	function add(key, name, i, n, ar) {
+		n = split(names[key], ar);
+		for (i = 1; i <= n; i++) {
+			if (name == ar[i]) {
+				return;
+			}
+		}
+		delete ar;
+		names[key] = names[key] " " name;
+	}
+	{
+		sub("#.*", "", $0);
+		gsub("  *", " ", $0);
+		if (NF == 0) {
+			next;
+		}
+		add($2, $1, 0);
+		for (i = 3; i <= NF; i++) {
+			add($2, $i, 1);
+		}
+	}
+	END {
+		for (key in names) {
+			proto = key;
+
+			n = split(names[key], ar);
+			printf "name=%s, proto=%s, aliases=", ar[1], proto;
+			for (i=2; i<=n; i++) {
+			if (i>2) {
+				printf " ";
+			}
+			printf "%s", ar[i];
+			}
+			printf "\n";
+			delete ar;
+		}
+		}
+	' | sort >exp
+
+	# run test program
+	"$(atf_get_srcdir)/h_protoent" | sed 's/ *$//' | sort >out
+
+	diff -u exp out || \
+	    atf_fail "Observed output does not match reference output"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case protoent
+}
diff --git a/contrib/netbsd-tests/lib/libc/net/t_servent.sh b/contrib/netbsd-tests/lib/libc/net/t_servent.sh
new file mode 100755
index 000000000000..b9aa2b7888a4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/net/t_servent.sh
@@ -0,0 +1,93 @@
+# $NetBSD: t_servent.sh,v 1.1 2011/01/12 17:32:27 pgoyette Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case servent
+servent_head()
+{
+	atf_set "descr" "Checks {get,set,end}servent(3)"
+}
+servent_body()
+{
+	#
+	# Munge original to:
+	#  (1) match output format of the test program
+	#  (2) fold all names for the same port/proto together
+	#  (3) prune duplicates
+	#
+	tr '\t' ' ' </etc/services | awk '
+		function add(key, name,      i, n, ar) {
+		n = split(names[key], ar);
+		for (i=1; i<=n; i++) {
+			if (name == ar[i]) {
+			return;
+			}
+		}
+		delete ar;
+		names[key] = names[key] " " name;
+		}
+
+		{
+		sub("#.*", "", $0);
+		gsub("  *", " ", $0);
+		if (NF==0) {
+			next;
+		}
+		add($2, $1, 0);
+		for (i=3; i<=NF; i++) {
+			add($2, $i, 1);
+		}
+		}
+		END {
+		for (key in names) {
+			portproto = key;
+			sub("/", ", proto=", portproto);
+			portproto = "port=" portproto;
+
+			n = split(names[key], ar);
+			printf "name=%s, %s, aliases=", ar[1], portproto;
+			for (i=2; i<=n; i++) {
+			if (i>2) {
+				printf " ";
+			}
+			printf "%s", ar[i];
+			}
+			printf "\n";
+			delete ar;
+		}
+		}
+	' | sort >exp
+
+	# run test program
+	"$(atf_get_srcdir)/h_servent" | sed 's/ *$//' | sort >out
+
+	diff -u exp out || atf_fail "Observed output does not match reference output"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case servent
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/README b/contrib/netbsd-tests/lib/libc/regex/README
new file mode 100644
index 000000000000..6d9a28cf60ca
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/README
@@ -0,0 +1,33 @@
+regular expression test set
+Lines are at least three fields, separated by one or more tabs.  "" stands
+for an empty field.  First field is an RE.  Second field is flags.  If
+C flag given, regcomp() is expected to fail, and the third field is the
+error name (minus the leading REG_).
+
+Otherwise it is expected to succeed, and the third field is the string to
+try matching it against.  If there is no fourth field, the match is
+expected to fail.  If there is a fourth field, it is the substring that
+the RE is expected to match.  If there is a fifth field, it is a comma-
+separated list of what the subexpressions should match, with - indicating
+no match for that one.  In both the fourth and fifth fields, a (sub)field
+starting with @ indicates that the (sub)expression is expected to match
+a null string followed by the stuff after the @; this provides a way to
+test where null strings match.  The character `N' in REs and strings
+is newline, `S' is space, `T' is tab, `Z' is NUL.
+
+The full list of flags:
+  -	placeholder, does nothing
+  b	RE is a BRE, not an ERE
+  &	try it as both an ERE and a BRE
+  C	regcomp() error expected, third field is error name
+  i	REG_ICASE
+  m	("mundane") REG_NOSPEC
+  s	REG_NOSUB (not really testable)
+  n	REG_NEWLINE
+  ^	REG_NOTBOL
+  $	REG_NOTEOL
+  #	REG_STARTEND (see below)
+  p	REG_PEND
+
+For REG_STARTEND, the start/end offsets are those of the substring
+enclosed in ().
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/anchor.in b/contrib/netbsd-tests/lib/libc/regex/data/anchor.in
new file mode 100644
index 000000000000..d1454082475c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/anchor.in
@@ -0,0 +1,33 @@
+# anchoring and REG_NEWLINE
+^abc$		&	abc	abc
+a^b		-	a^b
+a^b		b	a^b	a^b
+a$b		-	a$b
+a$b		b	a$b	a$b
+^		&	abc	@abc
+$		&	abc	@
+^$		&	""	@
+$^		-	""	@
+\($\)\(^\)	b	""	@
+# stop retching, those are legitimate (although disgusting)
+^^		-	""	@
+$$		-	""	@
+b$		&	abNc
+b$		&n	abNc	b
+^b$		&	aNbNc
+^b$		&n	aNbNc	b
+^$		&n	aNNb	@Nb
+^$		n	abc
+^$		n	abcN	@
+$^		n	aNNb	@Nb
+\($\)\(^\)	bn	aNNb	@Nb
+^^		n^	aNNb	@Nb
+$$		n	aNNb	@NN
+^a		^	a
+a$		$	a
+^a		^n	aNb
+^b		^n	aNb	b
+a$		$n	bNa
+b$		$n	bNa	b
+a*(^b$)c*	-	b	b
+a*\(^b$\)c*	b	b	b
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/README b/contrib/netbsd-tests/lib/libc/regex/data/att/README
new file mode 100644
index 000000000000..e2ee6f6ef705
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/README
@@ -0,0 +1,8 @@
+AT&T test data from: http://www2.research.att.com/~gsf/testregex/
+
+Quoting from the page:
+    testregex.c 2004-05-31 is the latest source for the AT&T Research
+    regression test harness for the X/Open regex pattern match interface.
+    See testregex(1) for option and test input details. The source and
+    test data posted here are license free.
+
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/basic.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/basic.dat
new file mode 100644
index 000000000000..4399ca135448
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/basic.dat
@@ -0,0 +1,216 @@
+NOTE	all standard compliant implementations should pass these : 2002-05-31
+
+BE	abracadabra$	abracadabracadabra	(7,18)
+BE	a...b		abababbb		(2,7)
+BE	XXXXXX		..XXXXXX		(2,8)
+E	\)		()	(1,2)
+BE	a]		a]a	(0,2)
+B	}		}	(0,1)
+E	\}		}	(0,1)
+BE	\]		]	(0,1)
+B	]		]	(0,1)
+E	]		]	(0,1)
+B	{		{	(0,1)
+B	}		}	(0,1)
+BE	^a		ax	(0,1)
+BE	\^a		a^a	(1,3)
+BE	a\^		a^	(0,2)
+BE	a$		aa	(1,2)
+BE	a\$		a$	(0,2)
+BE	^$		NULL	(0,0)
+E	$^		NULL	(0,0)
+E	a($)		aa	(1,2)(2,2)
+E	a*(^a)		aa	(0,1)(0,1)
+E	(..)*(...)*		a	(0,0)
+E	(..)*(...)*		abcd	(0,4)(2,4)
+E	(ab|a)(bc|c)		abc	(0,3)(0,2)(2,3)
+E	(ab)c|abc		abc	(0,3)(0,2)
+E	a{0}b		ab			(1,2)
+E	(a*)(b?)(b+)b{3}	aaabbbbbbb	(0,10)(0,3)(3,4)(4,7)
+E	(a*)(b{0,1})(b{1,})b{3}	aaabbbbbbb	(0,10)(0,3)(3,4)(4,7)
+E	a{9876543210}	NULL	BADBR
+E	((a|a)|a)			a	(0,1)(0,1)(0,1)
+E	(a*)(a|aa)			aaaa	(0,4)(0,3)(3,4)
+E	a*(a.|aa)			aaaa	(0,4)(2,4)
+E	a(b)|c(d)|a(e)f			aef	(0,3)(?,?)(?,?)(1,2)
+E	(a|b)?.*			b	(0,1)(0,1)
+E	(a|b)c|a(b|c)			ac	(0,2)(0,1)
+E	(a|b)c|a(b|c)			ab	(0,2)(?,?)(1,2)
+E	(a|b)*c|(a|ab)*c		abc	(0,3)(1,2)
+E	(a|b)*c|(a|ab)*c		xc	(1,2)
+E	(.a|.b).*|.*(.a|.b)		xa	(0,2)(0,2)
+E	a?(ab|ba)ab			abab	(0,4)(0,2)
+E	a?(ac{0}b|ba)ab			abab	(0,4)(0,2)
+E	ab|abab				abbabab	(0,2)
+E	aba|bab|bba			baaabbbaba	(5,8)
+E	aba|bab				baaabbbaba	(6,9)
+E	(aa|aaa)*|(a|aaaaa)		aa	(0,2)(0,2)
+E	(a.|.a.)*|(a|.a...)		aa	(0,2)(0,2)
+E	ab|a				xabc	(1,3)
+E	ab|a				xxabc	(2,4)
+Ei	(Ab|cD)*			aBcD	(0,4)(2,4)
+BE	[^-]			--a		(2,3)
+BE	[a-]*			--a		(0,3)
+BE	[a-m-]*			--amoma--	(0,4)
+E	:::1:::0:|:::1:1:0:	:::0:::1:::1:::0:	(8,17)
+E	:::1:::0:|:::1:1:1:	:::0:::1:::1:::0:	(8,17)
+{E	[[:upper:]]		A		(0,1)	[[<element>]] not supported
+E	[[:lower:]]+		`az{		(1,3)
+E	[[:upper:]]+		@AZ[		(1,3)
+BE	[[-]]			[[-]]		(2,4)
+BE	[[.NIL.]]	NULL	ECOLLATE
+BE	[[=aleph=]]	NULL	ECOLLATE
+}
+BE$	\n		\n	(0,1)
+BEn$	\n		\n	(0,1)
+BE$	[^a]		\n	(0,1)
+BE$	\na		\na	(0,2)
+E	(a)(b)(c)	abc	(0,3)(0,1)(1,2)(2,3)
+BE	xxx		xxx	(0,3)
+E1	(^|[ (,;])((([Ff]eb[^ ]* *|0*2/|\* */?)0*[6-7]))([^0-9]|$)	feb 6,	(0,6)
+E1	(^|[ (,;])((([Ff]eb[^ ]* *|0*2/|\* */?)0*[6-7]))([^0-9]|$)	2/7	(0,3)
+E1	(^|[ (,;])((([Ff]eb[^ ]* *|0*2/|\* */?)0*[6-7]))([^0-9]|$)	feb 1,Feb 6	(5,11)
+E3	((((((((((((((((((((((((((((((x))))))))))))))))))))))))))))))	x	(0,1)(0,1)(0,1)
+E3	((((((((((((((((((((((((((((((x))))))))))))))))))))))))))))))*	xx	(0,2)(1,2)(1,2)
+E	a?(ab|ba)*	ababababababababababababababababababababababababababababababababababababababababa	(0,81)(79,81)
+E	abaa|abbaa|abbbaa|abbbbaa	ababbabbbabbbabbbbabbbbaa	(18,25)
+E	abaa|abbaa|abbbaa|abbbbaa	ababbabbbabbbabbbbabaa	(18,22)
+E	aaac|aabc|abac|abbc|baac|babc|bbac|bbbc	baaabbbabac	(7,11)
+BE$	.*			\x01\xff	(0,2)
+E	aaaa|bbbb|cccc|ddddd|eeeeee|fffffff|gggg|hhhh|iiiii|jjjjj|kkkkk|llll	XaaaXbbbXcccXdddXeeeXfffXgggXhhhXiiiXjjjXkkkXlllXcbaXaaaa	(53,57)
+L	aaaa\nbbbb\ncccc\nddddd\neeeeee\nfffffff\ngggg\nhhhh\niiiii\njjjjj\nkkkkk\nllll		XaaaXbbbXcccXdddXeeeXfffXgggXhhhXiiiXjjjXkkkXlllXcbaXaaaa	NOMATCH
+E	a*a*a*a*a*b		aaaaaaaaab	(0,10)
+BE	^			NULL		(0,0)
+BE	$			NULL		(0,0)
+BE	^$			NULL		(0,0)
+BE	^a$			a		(0,1)
+BE	abc			abc		(0,3)
+BE	abc			xabcy		(1,4)
+BE	abc			ababc		(2,5)
+BE	ab*c			abc		(0,3)
+BE	ab*bc			abc		(0,3)
+BE	ab*bc			abbc		(0,4)
+BE	ab*bc			abbbbc		(0,6)
+E	ab+bc			abbc		(0,4)
+E	ab+bc			abbbbc		(0,6)
+E	ab?bc			abbc		(0,4)
+E	ab?bc			abc		(0,3)
+E	ab?c			abc		(0,3)
+BE	^abc$			abc		(0,3)
+BE	^abc			abcc		(0,3)
+BE	abc$			aabc		(1,4)
+BE	^			abc		(0,0)
+BE	$			abc		(3,3)
+BE	a.c			abc		(0,3)
+BE	a.c			axc		(0,3)
+BE	a.*c			axyzc		(0,5)
+BE	a[bc]d			abd		(0,3)
+BE	a[b-d]e			ace		(0,3)
+BE	a[b-d]			aac		(1,3)
+BE	a[-b]			a-		(0,2)
+BE	a[b-]			a-		(0,2)
+BE	a]			a]		(0,2)
+BE	a[]]b			a]b		(0,3)
+BE	a[^bc]d			aed		(0,3)
+BE	a[^-b]c			adc		(0,3)
+BE	a[^]b]c			adc		(0,3)
+E	ab|cd			abc		(0,2)
+E	ab|cd			abcd		(0,2)
+E	a\(b			a(b		(0,3)
+E	a\(*b			ab		(0,2)
+E	a\(*b			a((b		(0,4)
+E	((a))			abc		(0,1)(0,1)(0,1)
+E	(a)b(c)			abc		(0,3)(0,1)(2,3)
+E	a+b+c			aabbabc		(4,7)
+E	a*			aaa		(0,3)
+E	(a*)*			-		(0,0)(0,0)
+E	(a*)+			-		(0,0)(0,0)
+E	(a*|b)*			-		(0,0)(0,0)
+E	(a+|b)*			ab		(0,2)(1,2)
+E	(a+|b)+			ab		(0,2)(1,2)
+E	(a+|b)?			ab		(0,1)(0,1)
+BE	[^ab]*			cde		(0,3)
+E	(^)*			-		(0,0)(0,0)
+BE	a*			NULL		(0,0)
+E	([abc])*d		abbbcd		(0,6)(4,5)
+E	([abc])*bcd		abcd		(0,4)(0,1)
+E	a|b|c|d|e		e		(0,1)
+E	(a|b|c|d|e)f		ef		(0,2)(0,1)
+E	((a*|b))*		-		(0,0)(0,0)(0,0)
+BE	abcd*efg		abcdefg		(0,7)
+BE	ab*			xabyabbbz	(1,3)
+BE	ab*			xayabbbz	(1,2)
+E	(ab|cd)e		abcde		(2,5)(2,4)
+BE	[abhgefdc]ij		hij		(0,3)
+E	(a|b)c*d		abcd		(1,4)(1,2)
+E	(ab|ab*)bc		abc		(0,3)(0,1)
+E	a([bc]*)c*		abc		(0,3)(1,3)
+E	a([bc]*)(c*d)		abcd		(0,4)(1,3)(3,4)
+E	a([bc]+)(c*d)		abcd		(0,4)(1,3)(3,4)
+E	a([bc]*)(c+d)		abcd		(0,4)(1,2)(2,4)
+E	a[bcd]*dcdcde		adcdcde		(0,7)
+E	(ab|a)b*c		abc		(0,3)(0,2)
+E	((a)(b)c)(d)		abcd		(0,4)(0,3)(0,1)(1,2)(3,4)
+BE	[A-Za-z_][A-Za-z0-9_]*	alpha		(0,5)
+E	^a(bc+|b[eh])g|.h$	abh		(1,3)
+E	(bc+d$|ef*g.|h?i(j|k))	effgz		(0,5)(0,5)
+E	(bc+d$|ef*g.|h?i(j|k))	ij		(0,2)(0,2)(1,2)
+E	(bc+d$|ef*g.|h?i(j|k))	reffgz		(1,6)(1,6)
+E	(((((((((a)))))))))	a		(0,1)(0,1)(0,1)(0,1)(0,1)(0,1)(0,1)(0,1)(0,1)(0,1)
+BE	multiple words		multiple words yeah	(0,14)
+E	(.*)c(.*)		abcde		(0,5)(0,2)(3,5)
+BE	abcd			abcd		(0,4)
+E	a(bc)d			abcd		(0,4)(1,3)
+E	a[-]?c		ac		(0,3)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Qaddafi	(0,15)(?,?)(10,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Mo'ammar Gadhafi	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Kaddafi	(0,15)(?,?)(10,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Qadhafi	(0,15)(?,?)(10,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Gadafi	(0,14)(?,?)(10,11)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Mu'ammar Qadafi	(0,15)(?,?)(11,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Moamar Gaddafi	(0,14)(?,?)(9,11)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Mu'ammar Qadhdhafi	(0,18)(?,?)(13,15)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Khaddafi	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Ghaddafy	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Ghadafi	(0,15)(?,?)(11,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Ghaddafi	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muamar Kaddafi	(0,14)(?,?)(9,11)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Quathafi	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Muammar Gheddafi	(0,16)(?,?)(11,13)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Moammar Khadafy	(0,15)(?,?)(11,12)
+E	M[ou]'?am+[ae]r .*([AEae]l[- ])?[GKQ]h?[aeu]+([dtz][dhz]?)+af[iy]	Moammar Qudhafi	(0,15)(?,?)(10,12)
+E	a+(b|c)*d+		aabcdd			(0,6)(3,4)
+E	^.+$			vivi			(0,4)
+E	^(.+)$			vivi			(0,4)(0,4)
+E	^([^!.]+).att.com!(.+)$	gryphon.att.com!eby	(0,19)(0,7)(16,19)
+E	^([^!]+!)?([^!]+)$	bas			(0,3)(?,?)(0,3)
+E	^([^!]+!)?([^!]+)$	bar!bas			(0,7)(0,4)(4,7)
+E	^([^!]+!)?([^!]+)$	foo!bas			(0,7)(0,4)(4,7)
+E	^.+!([^!]+!)([^!]+)$	foo!bar!bas		(0,11)(4,8)(8,11)
+E	((foo)|(bar))!bas	bar!bas			(0,7)(0,3)(?,?)(0,3)
+E	((foo)|(bar))!bas	foo!bar!bas		(4,11)(4,7)(?,?)(4,7)
+E	((foo)|(bar))!bas	foo!bas			(0,7)(0,3)(0,3)
+E	((foo)|bar)!bas		bar!bas			(0,7)(0,3)
+E	((foo)|bar)!bas		foo!bar!bas		(4,11)(4,7)
+E	((foo)|bar)!bas		foo!bas			(0,7)(0,3)(0,3)
+E	(foo|(bar))!bas		bar!bas			(0,7)(0,3)(0,3)
+E	(foo|(bar))!bas		foo!bar!bas		(4,11)(4,7)(4,7)
+E	(foo|(bar))!bas		foo!bas			(0,7)(0,3)
+E	(foo|bar)!bas		bar!bas			(0,7)(0,3)
+E	(foo|bar)!bas		foo!bar!bas		(4,11)(4,7)
+E	(foo|bar)!bas		foo!bas			(0,7)(0,3)
+E	^(([^!]+!)?([^!]+)|.+!([^!]+!)([^!]+))$	foo!bar!bas	(0,11)(0,11)(?,?)(?,?)(4,8)(8,11)
+E	^([^!]+!)?([^!]+)$|^.+!([^!]+!)([^!]+)$	bas		(0,3)(?,?)(0,3)
+E	^([^!]+!)?([^!]+)$|^.+!([^!]+!)([^!]+)$	bar!bas		(0,7)(0,4)(4,7)
+E	^([^!]+!)?([^!]+)$|^.+!([^!]+!)([^!]+)$	foo!bar!bas	(0,11)(?,?)(?,?)(4,8)(8,11)
+E	^([^!]+!)?([^!]+)$|^.+!([^!]+!)([^!]+)$	foo!bas		(0,7)(0,4)(4,7)
+E	^(([^!]+!)?([^!]+)|.+!([^!]+!)([^!]+))$	bas		(0,3)(0,3)(?,?)(0,3)
+E	^(([^!]+!)?([^!]+)|.+!([^!]+!)([^!]+))$	bar!bas		(0,7)(0,7)(0,4)(4,7)
+E	^(([^!]+!)?([^!]+)|.+!([^!]+!)([^!]+))$	foo!bar!bas	(0,11)(0,11)(?,?)(?,?)(4,8)(8,11)
+E	^(([^!]+!)?([^!]+)|.+!([^!]+!)([^!]+))$	foo!bas		(0,7)(0,7)(0,4)(4,7)
+E	.*(/XXX).*			/XXX			(0,4)(0,4)
+E	.*(\\XXX).*			\XXX			(0,4)(0,4)
+E	\\XXX				\XXX			(0,4)
+E	.*(/000).*			/000			(0,4)(0,4)
+E	.*(\\000).*			\000			(0,4)(0,4)
+E	\\000				\000			(0,4)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/categorization.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/categorization.dat
new file mode 100644
index 000000000000..d34851278f22
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/categorization.dat
@@ -0,0 +1,62 @@
+NOTE	regex implementation categorization 2004-05-31
+
+?E	aa*			xaxaax	(1,2)					POSITION=leftmost
+;										POSITION=bug
+
+?E	(a*)(ab)*(b*)		abc	(0,2)(0,1)(?,?)(1,2)			ASSOCIATIVITY=right
+|E	(a*)(ab)*(b*)		abc	(0,2)(0,0)(0,2)(2,2)			ASSOCIATIVITY=left
+;										ASSOCIATIVITY=bug
+
+?E	((a*)(ab)*)((b*)(a*))	aba	(0,3)(0,2)(0,0)(0,2)(2,3)(2,2)(2,3)	SUBEXPRESSION=precedence
+|E	((a*)(ab)*)((b*)(a*))	aba	(0,3)(0,1)(0,1)(?,?)(1,3)(1,2)(2,3)	SUBEXPRESSION=grouping
+;										SUBEXPRESSION=bug
+
+?E	(...?.?)*		xxxxxx	(0,6)(4,6)				REPEAT_LONGEST=first
+|E	(...?.?)*		xxxxxx	(0,6)(2,6)				REPEAT_LONGEST=last
+|E	(...?.?)*		xxxxxx	OK					REPEAT_LONGEST=unknown
+;										REPEAT_LONGEST=bug
+
+?E	(a|ab)(bc|c)		abcabc	(0,3)(0,2)(2,3)				EXPECTED
+|E	(a|ab)(bc|c)		abcabc	(0,3)(0,1)(1,3)				BUG=alternation-order
+;										BUG=alternation-order-UNKNOWN
+
+?E	(aba|a*b)(aba|a*b)	ababa	(0,5)(0,2)(2,5)				EXPECTED
+|E	(aba|a*b)(aba|a*b)	ababa	(0,4)(0,3)(3,4)				BUG=first-match
+;										BUG=unknown-match
+
+?B	a\(b\)*\1		a	NOMATCH					EXPECTED
+|B	a\(b\)*\1		a	(0,1)					BUG=nomatch-match
+|B	a\(b\)*\1		abab	(0,2)(1,2)				# BUG=repeat-any
+;										BUG=nomatch-match-UNKNOWN
+
+?E	(a*){2}			xxxxx	(0,0)(0,0)				EXPECTED
+|E	(a*){2}			xxxxx	(5,5)(5,5)				BUG=range-null
+;										BUG=range-null-UNKNOWN
+
+?B	a\(b\)*\1		abab	NOMATCH					EXPECTED
+|B	a\(b\)*\1		abab	(0,1)					# BUG=nomatch-match
+|B	a\(b\)*\1		abab	(0,2)(1,2)				BUG=repeat-any
+;										BUG=repeat-any-UNKNOWN
+
+?E	(a*)*			a	(0,1)(0,1)				EXPECTED
+|E	(a*)*			ax	(0,1)(0,1)				BUG=repeat-null-unknown
+|E	(a*)*			a	(0,1)(1,1)				BUG=repeat-null
+;										BUG=repeat-null-UNKNOWN
+
+?E	(aba|a*b)*		ababa	(0,5)(2,5)				EXPECTED
+|E	(aba|a*b)*		ababa	(0,5)(3,4)				BUG=repeat-short
+|E	(aba|a*b)*		ababa	(0,4)(3,4)				# LENGTH=first
+;										BUG=repeat-short-UNKNOWN
+
+?E	(a(b)?)+		aba	(0,3)(2,3)				EXPECTED
+|E	(a(b)?)+		aba	(0,3)(2,3)(1,2)				BUG=repeat-artifact
+;										BUG=repeat-artifact-UNKNOWN
+
+?B	\(a\(b\)*\)*\2		abab	NOMATCH					EXPECTED
+|B	\(a\(b\)*\)*\2		abab	(0,4)(2,3)(1,2)				BUG=repeat-artifact-nomatch
+;										BUG=repeat-artifact-nomatch-UNKNOWN
+
+?E	(a?)((ab)?)(b?)a?(ab)?b?	abab	(0,4)(0,1)(1,1)(?,?)(1,2)(2,4)	BUG=subexpression-first
+|E	.*(.*)				ab	(0,2)(2,2)			EXPECTED
+|E	.*(.*)				ab	(0,2)(0,2)			BUG=subexpression-first
+;										BUG=subexpression-first-UNKNOWN
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/forcedassoc.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/forcedassoc.dat
new file mode 100644
index 000000000000..39f3111dab20
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/forcedassoc.dat
@@ -0,0 +1,30 @@
+NOTE	left-assoc:pass-all right-assoc:pass-all : 2002-04-29
+
+E	(a|ab)(c|bcd)		abcd	(0,4)(0,1)(1,4)
+E	(a|ab)(bcd|c)		abcd	(0,4)(0,1)(1,4)
+E	(ab|a)(c|bcd)		abcd	(0,4)(0,1)(1,4)
+E	(ab|a)(bcd|c)		abcd	(0,4)(0,1)(1,4)
+E	((a|ab)(c|bcd))(d*)	abcd	(0,4)(0,4)(0,1)(1,4)(4,4)
+E	((a|ab)(bcd|c))(d*)	abcd	(0,4)(0,4)(0,1)(1,4)(4,4)
+E	((ab|a)(c|bcd))(d*)	abcd	(0,4)(0,4)(0,1)(1,4)(4,4)
+E	((ab|a)(bcd|c))(d*)	abcd	(0,4)(0,4)(0,1)(1,4)(4,4)
+E	(a|ab)((c|bcd)(d*))	abcd	(0,4)(0,2)(2,4)(2,3)(3,4)
+E	(a|ab)((bcd|c)(d*))	abcd	(0,4)(0,2)(2,4)(2,3)(3,4)
+E	(ab|a)((c|bcd)(d*))	abcd	(0,4)(0,2)(2,4)(2,3)(3,4)
+E	(ab|a)((bcd|c)(d*))	abcd	(0,4)(0,2)(2,4)(2,3)(3,4)
+E	(a*)(b|abc)		abc	(0,3)(0,0)(0,3)
+E	(a*)(abc|b)		abc	(0,3)(0,0)(0,3)
+E	((a*)(b|abc))(c*)	abc	(0,3)(0,3)(0,0)(0,3)(3,3)
+E	((a*)(abc|b))(c*)	abc	(0,3)(0,3)(0,0)(0,3)(3,3)
+E	(a*)((b|abc)(c*))	abc	(0,3)(0,1)(1,3)(1,2)(2,3)
+E	(a*)((abc|b)(c*))	abc	(0,3)(0,1)(1,3)(1,2)(2,3)
+E	(a*)(b|abc)		abc	(0,3)(0,0)(0,3)
+E	(a*)(abc|b)		abc	(0,3)(0,0)(0,3)
+E	((a*)(b|abc))(c*)	abc	(0,3)(0,3)(0,0)(0,3)(3,3)
+E	((a*)(abc|b))(c*)	abc	(0,3)(0,3)(0,0)(0,3)(3,3)
+E	(a*)((b|abc)(c*))	abc	(0,3)(0,1)(1,3)(1,2)(2,3)
+E	(a*)((abc|b)(c*))	abc	(0,3)(0,1)(1,3)(1,2)(2,3)
+E	(a|ab)			ab	(0,2)(0,2)
+E	(ab|a)			ab	(0,2)(0,2)
+E	(a|ab)(b*)		ab	(0,2)(0,2)(2,2)
+E	(ab|a)(b*)		ab	(0,2)(0,2)(2,2)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/leftassoc.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/leftassoc.dat
new file mode 100644
index 000000000000..9c068c61bfc8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/leftassoc.dat
@@ -0,0 +1,16 @@
+NOTE	left-assoc:pass-all right-assoc:pass-none : 2002-04-29
+
+E	(a|ab)(c|bcd)(d*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(a|ab)(bcd|c)(d*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(ab|a)(c|bcd)(d*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(ab|a)(bcd|c)(d*)	abcd	(0,4)(0,1)(1,4)(4,4)
+
+E	(a*)(b|abc)(c*)		abc	(0,3)(0,0)(0,3)(3,3)
+E	(a*)(abc|b)(c*)		abc	(0,3)(0,0)(0,3)(3,3)
+E	(a*)(b|abc)(c*)		abc	(0,3)(0,0)(0,3)(3,3)
+E	(a*)(abc|b)(c*)		abc	(0,3)(0,0)(0,3)(3,3)
+
+E	(a|ab)(c|bcd)(d|.*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(a|ab)(bcd|c)(d|.*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(ab|a)(c|bcd)(d|.*)	abcd	(0,4)(0,1)(1,4)(4,4)
+E	(ab|a)(bcd|c)(d|.*)	abcd	(0,4)(0,1)(1,4)(4,4)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/nullsubexpr.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/nullsubexpr.dat
new file mode 100644
index 000000000000..c73d8f09eed5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/nullsubexpr.dat
@@ -0,0 +1,73 @@
+NOTE	null subexpression matches : 2002-06-06
+
+E	(a*)*		a		(0,1)(0,1)
+E	SAME		x		(0,0)(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+E	(a*)+		a		(0,1)(0,1)
+E	SAME		x		(0,0)(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+E	(a+)*		a		(0,1)(0,1)
+E	SAME		x		(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+E	(a+)+		a		(0,1)(0,1)
+E	SAME		x		NOMATCH
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+
+E	([a]*)*		a		(0,1)(0,1)
+E	SAME		x		(0,0)(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+E	([a]*)+		a		(0,1)(0,1)
+E	SAME		x		(0,0)(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaax		(0,6)(0,6)
+E	([^b]*)*	a		(0,1)(0,1)
+E	SAME		b		(0,0)(0,0)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		aaaaaab		(0,6)(0,6)
+E	([ab]*)*	a		(0,1)(0,1)
+E	SAME		aaaaaa		(0,6)(0,6)
+E	SAME		ababab		(0,6)(0,6)
+E	SAME		bababa		(0,6)(0,6)
+E	SAME		b		(0,1)(0,1)
+E	SAME		bbbbbb		(0,6)(0,6)
+E	SAME		aaaabcde	(0,5)(0,5)
+E	([^a]*)*	b		(0,1)(0,1)
+E	SAME		bbbbbb		(0,6)(0,6)
+E	SAME		aaaaaa		(0,0)(0,0)
+E	([^ab]*)*	ccccxx		(0,6)(0,6)
+E	SAME		ababab		(0,0)(0,0)
+
+E	((z)+|a)*	zabcde		(0,2)(1,2)
+
+{E	a+?		aaaaaa		(0,1)	no *? +? mimimal match ops
+E	(a)		aaa		(0,1)(0,1)
+E	(a*?)		aaa		(0,0)(0,0)
+E	(a)*?		aaa		(0,0)
+E	(a*?)*?		aaa		(0,0)
+}
+
+B	\(a*\)*\(x\)		x	(0,1)(0,0)(0,1)
+B	\(a*\)*\(x\)		ax	(0,2)(0,1)(1,2)
+B	\(a*\)*\(x\)		axa	(0,2)(0,1)(1,2)
+B	\(a*\)*\(x\)\(\1\)	x	(0,1)(0,0)(0,1)(1,1)
+B	\(a*\)*\(x\)\(\1\)	ax	(0,2)(1,1)(1,2)(2,2)
+B	\(a*\)*\(x\)\(\1\)	axa	(0,3)(0,1)(1,2)(2,3)
+B	\(a*\)*\(x\)\(\1\)\(x\)	axax	(0,4)(0,1)(1,2)(2,3)(3,4)
+B	\(a*\)*\(x\)\(\1\)\(x\)	axxa	(0,3)(1,1)(1,2)(2,2)(2,3)
+
+E	(a*)*(x)		x	(0,1)(0,0)(0,1)
+E	(a*)*(x)		ax	(0,2)(0,1)(1,2)
+E	(a*)*(x)		axa	(0,2)(0,1)(1,2)
+
+E	(a*)+(x)		x	(0,1)(0,0)(0,1)
+E	(a*)+(x)		ax	(0,2)(0,1)(1,2)
+E	(a*)+(x)		axa	(0,2)(0,1)(1,2)
+
+E	(a*){2}(x)		x	(0,1)(0,0)(0,1)
+E	(a*){2}(x)		ax	(0,2)(1,1)(1,2)
+E	(a*){2}(x)		axa	(0,2)(1,1)(1,2)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/repetition.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/repetition.dat
new file mode 100644
index 000000000000..c24749c7cc18
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/repetition.dat
@@ -0,0 +1,140 @@
+NOTE	implicit vs. explicit repetitions : 2009-02-02
+
+# Glenn Fowler <gsf@research.att.com>
+# conforming matches (column 4) must match one of the following BREs
+#	NOMATCH
+#	(0,.)\((\(.\),\(.\))(?,?)(\2,\3)\)*
+#	(0,.)\((\(.\),\(.\))(\2,\3)(?,?)\)*
+# i.e., each 3-tuple has two identical elements and one (?,?)
+
+E	((..)|(.))				NULL		NOMATCH
+E	((..)|(.))((..)|(.))			NULL		NOMATCH
+E	((..)|(.))((..)|(.))((..)|(.))		NULL		NOMATCH
+
+E	((..)|(.)){1}				NULL		NOMATCH
+E	((..)|(.)){2}				NULL		NOMATCH
+E	((..)|(.)){3}				NULL		NOMATCH
+
+E	((..)|(.))*				NULL		(0,0)
+
+E	((..)|(.))				a		(0,1)(0,1)(?,?)(0,1)
+E	((..)|(.))((..)|(.))			a		NOMATCH
+E	((..)|(.))((..)|(.))((..)|(.))		a		NOMATCH
+
+E	((..)|(.)){1}				a		(0,1)(0,1)(?,?)(0,1)
+E	((..)|(.)){2}				a		NOMATCH
+E	((..)|(.)){3}				a		NOMATCH
+
+E	((..)|(.))*				a		(0,1)(0,1)(?,?)(0,1)
+
+E	((..)|(.))				aa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.))((..)|(.))			aa		(0,2)(0,1)(?,?)(0,1)(1,2)(?,?)(1,2)
+E	((..)|(.))((..)|(.))((..)|(.))		aa		NOMATCH
+
+E	((..)|(.)){1}				aa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.)){2}				aa		(0,2)(1,2)(?,?)(1,2)
+E	((..)|(.)){3}				aa		NOMATCH
+
+E	((..)|(.))*				aa		(0,2)(0,2)(0,2)(?,?)
+
+E	((..)|(.))				aaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.))((..)|(.))			aaa		(0,3)(0,2)(0,2)(?,?)(2,3)(?,?)(2,3)
+E	((..)|(.))((..)|(.))((..)|(.))		aaa		(0,3)(0,1)(?,?)(0,1)(1,2)(?,?)(1,2)(2,3)(?,?)(2,3)
+
+E	((..)|(.)){1}				aaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.)){2}				aaa		(0,3)(2,3)(?,?)(2,3)
+E	((..)|(.)){3}				aaa		(0,3)(2,3)(?,?)(2,3)
+
+E	((..)|(.))*				aaa		(0,3)(2,3)(?,?)(2,3)
+
+E	((..)|(.))				aaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.))((..)|(.))			aaaa		(0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)
+E	((..)|(.))((..)|(.))((..)|(.))		aaaa		(0,4)(0,2)(0,2)(?,?)(2,3)(?,?)(2,3)(3,4)(?,?)(3,4)
+
+E	((..)|(.)){1}				aaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.)){2}				aaaa		(0,4)(2,4)(2,4)(?,?)
+E	((..)|(.)){3}				aaaa		(0,4)(3,4)(?,?)(3,4)
+
+E	((..)|(.))*				aaaa		(0,4)(2,4)(2,4)(?,?)
+
+E	((..)|(.))				aaaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.))((..)|(.))			aaaaa		(0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)
+E	((..)|(.))((..)|(.))((..)|(.))		aaaaa		(0,5)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)(4,5)(?,?)(4,5)
+
+E	((..)|(.)){1}				aaaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.)){2}				aaaaa		(0,4)(2,4)(2,4)(?,?)
+E	((..)|(.)){3}				aaaaa		(0,5)(4,5)(?,?)(4,5)
+
+E	((..)|(.))*				aaaaa		(0,5)(4,5)(?,?)(4,5)
+
+E	((..)|(.))				aaaaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.))((..)|(.))			aaaaaa		(0,4)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)
+E	((..)|(.))((..)|(.))((..)|(.))		aaaaaa		(0,6)(0,2)(0,2)(?,?)(2,4)(2,4)(?,?)(4,6)(4,6)(?,?)
+
+E	((..)|(.)){1}				aaaaaa		(0,2)(0,2)(0,2)(?,?)
+E	((..)|(.)){2}				aaaaaa		(0,4)(2,4)(2,4)(?,?)
+E	((..)|(.)){3}				aaaaaa		(0,6)(4,6)(4,6)(?,?)
+
+E	((..)|(.))*				aaaaaa		(0,6)(4,6)(4,6)(?,?)
+
+NOTE	additional repetition tests graciously provided by Chris Kuklewicz www.haskell.org 2009-02-02
+
+# These test a bug in OS X / FreeBSD / NetBSD, and libtree. 
+# Linux/GLIBC gets the {8,} and {8,8} wrong.
+
+:HA#100:E	X(.?){0,}Y	X1234567Y	(0,9)(7,8)
+:HA#101:E	X(.?){1,}Y	X1234567Y	(0,9)(7,8)
+:HA#102:E	X(.?){2,}Y	X1234567Y	(0,9)(7,8)
+:HA#103:E	X(.?){3,}Y	X1234567Y	(0,9)(7,8)
+:HA#104:E	X(.?){4,}Y	X1234567Y	(0,9)(7,8)
+:HA#105:E	X(.?){5,}Y	X1234567Y	(0,9)(7,8)
+:HA#106:E	X(.?){6,}Y	X1234567Y	(0,9)(7,8)
+:HA#107:E	X(.?){7,}Y	X1234567Y	(0,9)(7,8)
+:HA#108:E	X(.?){8,}Y	X1234567Y	(0,9)(8,8)
+:HA#110:E	X(.?){0,8}Y	X1234567Y	(0,9)(7,8)
+:HA#111:E	X(.?){1,8}Y	X1234567Y	(0,9)(7,8)
+:HA#112:E	X(.?){2,8}Y	X1234567Y	(0,9)(7,8)
+:HA#113:E	X(.?){3,8}Y	X1234567Y	(0,9)(7,8)
+:HA#114:E	X(.?){4,8}Y	X1234567Y	(0,9)(7,8)
+:HA#115:E	X(.?){5,8}Y	X1234567Y	(0,9)(7,8)
+:HA#116:E	X(.?){6,8}Y	X1234567Y	(0,9)(7,8)
+:HA#117:E	X(.?){7,8}Y	X1234567Y	(0,9)(7,8)
+:HA#118:E	X(.?){8,8}Y	X1234567Y	(0,9)(8,8)
+
+# These test a fixed bug in my regex-tdfa that did not keep the expanded
+# form properly grouped, so right association did the wrong thing with
+# these ambiguous patterns (crafted just to test my code when I became
+# suspicious of my implementation).  The first subexpression should use
+# "ab" then "a" then "bcd".
+
+# OS X / FreeBSD / NetBSD badly fail many of these, with impossible
+# results like (0,6)(4,5)(6,6).
+
+:HA#260:E	(a|ab|c|bcd){0,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#261:E	(a|ab|c|bcd){1,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#262:E	(a|ab|c|bcd){2,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#263:E	(a|ab|c|bcd){3,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#264:E	(a|ab|c|bcd){4,}(d*)	ababcd	NOMATCH
+:HA#265:E	(a|ab|c|bcd){0,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#266:E	(a|ab|c|bcd){1,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#267:E	(a|ab|c|bcd){2,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#268:E	(a|ab|c|bcd){3,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#269:E	(a|ab|c|bcd){4,10}(d*)	ababcd	NOMATCH
+:HA#270:E	(a|ab|c|bcd)*(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#271:E	(a|ab|c|bcd)+(d*)	ababcd	(0,6)(3,6)(6,6)
+
+# The above worked on Linux/GLIBC but the following often fail.
+# They also trip up OS X / FreeBSD / NetBSD:
+
+:HA#280:E	(ab|a|c|bcd){0,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#281:E	(ab|a|c|bcd){1,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#282:E	(ab|a|c|bcd){2,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#283:E	(ab|a|c|bcd){3,}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#284:E	(ab|a|c|bcd){4,}(d*)	ababcd	NOMATCH
+:HA#285:E	(ab|a|c|bcd){0,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#286:E	(ab|a|c|bcd){1,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#287:E	(ab|a|c|bcd){2,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#288:E	(ab|a|c|bcd){3,10}(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#289:E	(ab|a|c|bcd){4,10}(d*)	ababcd	NOMATCH
+:HA#290:E	(ab|a|c|bcd)*(d*)	ababcd	(0,6)(3,6)(6,6)
+:HA#291:E	(ab|a|c|bcd)+(d*)	ababcd	(0,6)(3,6)(6,6)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/att/rightassoc.dat b/contrib/netbsd-tests/lib/libc/regex/data/att/rightassoc.dat
new file mode 100644
index 000000000000..ed7f28e6211d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/att/rightassoc.dat
@@ -0,0 +1,16 @@
+NOTE	left-assoc:pass-none right-assoc:pass-all : 2002-04-29
+
+E	(a|ab)(c|bcd)(d*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(a|ab)(bcd|c)(d*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(ab|a)(c|bcd)(d*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(ab|a)(bcd|c)(d*)	abcd	(0,4)(0,2)(2,3)(3,4)
+
+E	(a*)(b|abc)(c*)		abc	(0,3)(0,1)(1,2)(2,3)
+E	(a*)(abc|b)(c*)		abc	(0,3)(0,1)(1,2)(2,3)
+E	(a*)(b|abc)(c*)		abc	(0,3)(0,1)(1,2)(2,3)
+E	(a*)(abc|b)(c*)		abc	(0,3)(0,1)(1,2)(2,3)
+
+E	(a|ab)(c|bcd)(d|.*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(a|ab)(bcd|c)(d|.*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(ab|a)(c|bcd)(d|.*)	abcd	(0,4)(0,2)(2,3)(3,4)
+E	(ab|a)(bcd|c)(d|.*)	abcd	(0,4)(0,2)(2,3)(3,4)
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/backref.in b/contrib/netbsd-tests/lib/libc/regex/data/backref.in
new file mode 100644
index 000000000000..cc59b06e5f75
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/backref.in
@@ -0,0 +1,21 @@
+# back references, ugh
+a\(b\)\2c	bC	ESUBREG
+a\(b\1\)c	bC	ESUBREG
+a\(b*\)c\1d	b	abbcbbd	abbcbbd	bb
+a\(b*\)c\1d	b	abbcbd
+a\(b*\)c\1d	b	abbcbbbd
+^\(.\)\1	b	abc
+a\([bc]\)\1d	b	abcdabbd	abbd	b
+a\(\([bc]\)\2\)*d	b	abbccd	abbccd
+a\(\([bc]\)\2\)*d	b	abbcbd
+# actually, this next one probably ought to fail, but the spec is unclear
+a\(\(b\)*\2\)*d		b	abbbd	abbbd
+# here is a case that no NFA implementation does right
+\(ab*\)[ab]*\1	b	ababaaa	ababaaa	a
+# check out normal matching in the presence of back refs
+\(a\)\1bcd	b	aabcd	aabcd
+\(a\)\1bc*d	b	aabcd	aabcd
+\(a\)\1bc*d	b	aabd	aabd
+\(a\)\1bc*d	b	aabcccd	aabcccd
+\(a\)\1bc*[ce]d	b	aabcccd	aabcccd
+^\(a\)\1b\(c\)*cd$	b	aabcccd	aabcccd
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/basic.in b/contrib/netbsd-tests/lib/libc/regex/data/basic.in
new file mode 100644
index 000000000000..d1e3aa9dadb2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/basic.in
@@ -0,0 +1,5 @@
+# basics
+a		&	a	a
+abc		&	abc	abc
+abc|de		-	abc	abc
+a|b|c		-	abc	a
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/bracket.in b/contrib/netbsd-tests/lib/libc/regex/data/bracket.in
new file mode 100644
index 000000000000..53a0b20d3c84
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/bracket.in
@@ -0,0 +1,55 @@
+# brackets, and numerous perversions thereof
+a[b]c		&	abc	abc
+a[ab]c		&	abc	abc
+a[^ab]c		&	adc	adc
+a[]b]c		&	a]c	a]c
+a[[b]c		&	a[c	a[c
+a[-b]c		&	a-c	a-c
+a[^]b]c		&	adc	adc
+a[^-b]c		&	adc	adc
+a[b-]c		&	a-c	a-c
+a[b		&C	EBRACK
+a[]		&C	EBRACK
+a[1-3]c		&	a2c	a2c
+a[3-1]c		&C	ERANGE
+a[1-3-5]c	&C	ERANGE
+a[[.-.]--]c	&	a-c	a-c
+a[1-		&C	ERANGE
+a[[.		&C	EBRACK
+a[[.x		&C	EBRACK
+a[[.x.		&C	EBRACK
+a[[.x.]		&C	EBRACK
+a[[.x.]]	&	ax	ax
+a[[.x,.]]	&C	ECOLLATE
+a[[.one.]]b	&	a1b	a1b
+a[[.notdef.]]b	&C	ECOLLATE
+a[[.].]]b	&	a]b	a]b
+a[[:alpha:]]c	&	abc	abc
+a[[:notdef:]]c	&C	ECTYPE
+a[[:		&C	EBRACK
+a[[:alpha	&C	EBRACK
+a[[:alpha:]	&C	EBRACK
+a[[:alpha,:]	&C	ECTYPE
+a[[:]:]]b	&C	ECTYPE
+a[[:-:]]b	&C	ECTYPE
+a[[:alph:]]	&C	ECTYPE
+a[[:alphabet:]]	&C	ECTYPE
+[[:alnum:]]+	-	-%@a0X-	a0X
+[[:alpha:]]+	-	-%@aX0-	aX
+[[:blank:]]+	-	aSSTb	SST
+[[:cntrl:]]+	-	aNTb	NT
+[[:digit:]]+	-	a019b	019
+[[:graph:]]+	-	Sa%bS	a%b
+[[:lower:]]+	-	AabC	ab
+[[:print:]]+	-	NaSbN	aSb
+[[:punct:]]+	-	S%-&T	%-&
+[[:space:]]+	-	aSNTb	SNT
+[[:upper:]]+	-	aBCd	BC
+[[:xdigit:]]+	-	p0f3Cq	0f3C
+a[[=b=]]c	&	abc	abc
+a[[=		&C	EBRACK
+a[[=b		&C	EBRACK
+a[[=b=		&C	EBRACK
+a[[=b=]		&C	EBRACK
+a[[=b,=]]	&C	ECOLLATE
+a[[=one=]]b	&	a1b	a1b
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/c_comments.in b/contrib/netbsd-tests/lib/libc/regex/data/c_comments.in
new file mode 100644
index 000000000000..ea3faf9ddf62
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/c_comments.in
@@ -0,0 +1,17 @@
+# Let's have some fun -- try to match a C comment.
+# first the obvious, which looks okay at first glance...
+/\*.*\*/	-	/*x*/	/*x*/
+# but...
+/\*.*\*/	-	/*x*/y/*z*/	/*x*/y/*z*/
+# okay, we must not match */ inside; try to do that...
+/\*([^*]|\*[^/])*\*/	-	/*x*/	/*x*/
+/\*([^*]|\*[^/])*\*/	-	/*x*/y/*z*/	/*x*/
+# but...
+/\*([^*]|\*[^/])*\*/	-	/*x**/y/*z*/	/*x**/y/*z*/
+# and a still fancier version, which does it right (I think)...
+/\*([^*]|\*+[^*/])*\*+/	-	/*x*/	/*x*/
+/\*([^*]|\*+[^*/])*\*+/	-	/*x*/y/*z*/	/*x*/
+/\*([^*]|\*+[^*/])*\*+/	-	/*x**/y/*z*/	/*x**/
+/\*([^*]|\*+[^*/])*\*+/	-	/*x****/y/*z*/	/*x****/
+/\*([^*]|\*+[^*/])*\*+/	-	/*x**x*/y/*z*/	/*x**x*/
+/\*([^*]|\*+[^*/])*\*+/	-	/*x***x/y/*z*/	/*x***x/y/*z*/
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/complex.in b/contrib/netbsd-tests/lib/libc/regex/data/complex.in
new file mode 100644
index 000000000000..e1140588e71a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/complex.in
@@ -0,0 +1,23 @@
+# complexities
+a(((b)))c	-	abc	abc
+a(b|(c))d	-	abd	abd
+a(b*|c)d	-	abbd	abbd
+# just gotta have one DFA-buster, of course
+a[ab]{20}	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
+# and an inline expansion in case somebody gets tricky
+a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
+# and in case somebody just slips in an NFA...
+a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)	-	aaaaabaaaabaaaabaaaabweeknights	aaaaabaaaabaaaabaaaabweeknights
+# fish for anomalies as the number of states passes 32
+12345678901234567890123456789	-	a12345678901234567890123456789b	12345678901234567890123456789
+123456789012345678901234567890	-	a123456789012345678901234567890b	123456789012345678901234567890
+1234567890123456789012345678901	-	a1234567890123456789012345678901b	1234567890123456789012345678901
+12345678901234567890123456789012	-	a12345678901234567890123456789012b	12345678901234567890123456789012
+123456789012345678901234567890123	-	a123456789012345678901234567890123b	123456789012345678901234567890123
+# and one really big one, beyond any plausible word width
+1234567890123456789012345678901234567890123456789012345678901234567890	-	a1234567890123456789012345678901234567890123456789012345678901234567890b	1234567890123456789012345678901234567890123456789012345678901234567890
+# fish for problems as brackets go past 8
+[ab][cd][ef][gh][ij][kl][mn]	-	xacegikmoq	acegikm
+[ab][cd][ef][gh][ij][kl][mn][op]	-	xacegikmoq	acegikmo
+[ab][cd][ef][gh][ij][kl][mn][op][qr]	-	xacegikmoqy	acegikmoq
+[ab][cd][ef][gh][ij][kl][mn][op][q]	-	xacegikmoqy	acegikmoq
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/error.in b/contrib/netbsd-tests/lib/libc/regex/data/error.in
new file mode 100644
index 000000000000..61e0ea4e41c0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/error.in
@@ -0,0 +1,30 @@
+# certain syntax errors and non-errors
+|		C	EMPTY
+|		b	|	|
+*		C	BADRPT
+*		b	*	*
++		C	BADRPT
+?		C	BADRPT
+""		&C	EMPTY
+()		-	abc	@abc
+\(\)		b	abc	@abc
+a||b		C	EMPTY
+|ab		C	EMPTY
+ab|		C	EMPTY
+(|a)b		C	EMPTY
+(a|)b		C	EMPTY
+(*a)		C	BADRPT
+(+a)		C	BADRPT
+(?a)		C	BADRPT
+({1}a)		C	BADRPT
+\(\{1\}a\)	bC	BADRPT
+(a|*b)		C	BADRPT
+(a|+b)		C	BADRPT
+(a|?b)		C	BADRPT
+(a|{1}b)	C	BADRPT
+^*		C	BADRPT
+^*		b	*	*
+^+		C	BADRPT
+^?		C	BADRPT
+^{1}		C	BADRPT
+^\{1\}		bC	BADRPT
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/meta.in b/contrib/netbsd-tests/lib/libc/regex/data/meta.in
new file mode 100644
index 000000000000..4533d3591bc6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/meta.in
@@ -0,0 +1,21 @@
+# metacharacters, backslashes
+a.c		&	abc	abc
+a[bc]d		&	abd	abd
+a\*c		&	a*c	a*c
+a\\b		&	a\b	a\b
+a\\\*b		&	a\*b	a\*b
+a\bc		&	abc	abc
+a\		&C	EESCAPE
+a\\bc		&	a\bc	a\bc
+\{		bC	BADRPT
+a\[b		&	a[b	a[b
+a[b		&C	EBRACK
+# trailing $ is a peculiar special case for the BRE code
+a$		&	a	a
+a$		&	a$
+a\$		&	a
+a\$		&	a$	a$
+a\\$		&	a
+a\\$		&	a$
+a\\$		&	a\$
+a\\$		&	a\	a\
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/nospec.in b/contrib/netbsd-tests/lib/libc/regex/data/nospec.in
new file mode 100644
index 000000000000..baf8d0403dc7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/nospec.in
@@ -0,0 +1,7 @@
+# plain strings, with the NOSPEC flag
+abc		m	abc	abc
+abc		m	xabcy	abc
+abc		m	xyz
+a*b		m	aba*b	a*b
+a*b		m	ab
+""		mC	EMPTY
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/paren.in b/contrib/netbsd-tests/lib/libc/regex/data/paren.in
new file mode 100644
index 000000000000..9d206cea7acd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/paren.in
@@ -0,0 +1,19 @@
+# parentheses and perversions thereof
+a(b)c		-	abc	abc
+a\(b\)c		b	abc	abc
+a(		C	EPAREN
+a(		b	a(	a(
+a\(		-	a(	a(
+a\(		bC	EPAREN
+a\(b		bC	EPAREN
+a(b		C	EPAREN
+a(b		b	a(b	a(b
+# gag me with a right parenthesis -- 1003.2 goofed here (my fault, partly)
+a)		-	a)	a)
+)		-	)	)
+# end gagging (in a just world, those *should* give EPAREN)
+a)		b	a)	a)
+a\)		bC	EPAREN
+\)		bC	EPAREN
+a()b		-	ab	ab
+a\(\)b		b	ab	ab
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/regress.in b/contrib/netbsd-tests/lib/libc/regex/data/regress.in
new file mode 100644
index 000000000000..afd832a51cb4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/regress.in
@@ -0,0 +1,9 @@
+# past problems, and suspected problems
+(A[1])|(A[2])|(A[3])|(A[4])|(A[5])|(A[6])|(A[7])|(A[8])|(A[9])|(A[A])	-	A1	A1
+abcdefghijklmnop	i	abcdefghijklmnop	abcdefghijklmnop
+abcdefghijklmnopqrstuv	i	abcdefghijklmnopqrstuv	abcdefghijklmnopqrstuv
+(ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN])	-	CC11	CC11
+CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a	-	CC11	CC11
+Char \([a-z0-9_]*\)\[.*	b	Char xyz[k	Char xyz[k	xyz
+a?b	-	ab	ab
+-\{0,1\}[0-9]*$	b	-5	-5
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/repet_bounded.in b/contrib/netbsd-tests/lib/libc/regex/data/repet_bounded.in
new file mode 100644
index 000000000000..ee6ff4cd190c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/repet_bounded.in
@@ -0,0 +1,45 @@
+# the dreaded bounded repetitions
+{		&	{	{
+{abc		&	{abc	{abc
+{1		C	BADRPT
+{1}		C	BADRPT
+a{b		&	a{b	a{b
+a{1}b		-	ab	ab
+a\{1\}b		b	ab	ab
+a{1,}b		-	ab	ab
+a\{1,\}b	b	ab	ab
+a{1,2}b		-	aab	aab
+a\{1,2\}b	b	aab	aab
+a{1		C	EBRACE
+a\{1		bC	EBRACE
+a{1a		C	EBRACE
+a\{1a		bC	EBRACE
+a{1a}		C	BADBR
+a\{1a\}		bC	BADBR
+a{,2}		-	a{,2}	a{,2}
+a\{,2\}		bC	BADBR
+a{,}		-	a{,}	a{,}
+a\{,\}		bC	BADBR
+a{1,x}		C	BADBR
+a\{1,x\}	bC	BADBR
+a{1,x		C	EBRACE
+a\{1,x		bC	EBRACE
+a{300}		C	BADBR
+a\{300\}	bC	BADBR
+a{1,0}		C	BADBR
+a\{1,0\}	bC	BADBR
+ab{0,0}c	-	abcac	ac
+ab\{0,0\}c	b	abcac	ac
+ab{0,1}c	-	abcac	abc
+ab\{0,1\}c	b	abcac	abc
+ab{0,3}c	-	abbcac	abbc
+ab\{0,3\}c	b	abbcac	abbc
+ab{1,1}c	-	acabc	abc
+ab\{1,1\}c	b	acabc	abc
+ab{1,3}c	-	acabc	abc
+ab\{1,3\}c	b	acabc	abc
+ab{2,2}c	-	abcabbc	abbc
+ab\{2,2\}c	b	abcabbc	abbc
+ab{2,4}c	-	abcabbc	abbc
+ab\{2,4\}c	b	abcabbc	abbc
+((a{1,10}){1,10}){1,10}	-	a	a	a,a
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/repet_multi.in b/contrib/netbsd-tests/lib/libc/regex/data/repet_multi.in
new file mode 100644
index 000000000000..da97badde978
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/repet_multi.in
@@ -0,0 +1,21 @@
+# multiple repetitions
+a**		&C	BADRPT
+a++		C	BADRPT
+a??		C	BADRPT
+a*+		C	BADRPT
+a*?		C	BADRPT
+a+*		C	BADRPT
+a+?		C	BADRPT
+a?*		C	BADRPT
+a?+		C	BADRPT
+a{1}{1}		C	BADRPT
+a*{1}		C	BADRPT
+a+{1}		C	BADRPT
+a?{1}		C	BADRPT
+a{1}*		C	BADRPT
+a{1}+		C	BADRPT
+a{1}?		C	BADRPT
+a*{b}		-	a{b}	a{b}
+a\{1\}\{1\}	bC	BADRPT
+a*\{1\}		bC	BADRPT
+a\{1\}*		bC	BADRPT
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/repet_ordinary.in b/contrib/netbsd-tests/lib/libc/regex/data/repet_ordinary.in
new file mode 100644
index 000000000000..08bc286e5be2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/repet_ordinary.in
@@ -0,0 +1,10 @@
+# ordinary repetitions
+ab*c		&	abc	abc
+ab+c		-	abc	abc
+ab?c		-	abc	abc
+a\(*\)b		b	a*b	a*b
+a\(**\)b	b	ab	ab
+a\(***\)b	bC	BADRPT
+*a		b	*a	*a
+**a		b	a	a
+***a		bC	BADRPT
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/startend.in b/contrib/netbsd-tests/lib/libc/regex/data/startend.in
new file mode 100644
index 000000000000..c396e58ac4d4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/startend.in
@@ -0,0 +1,9 @@
+# check out the STARTEND option
+[abc]		&#	a(b)c	b
+[abc]		&#	a(d)c
+[abc]		&#	a(bc)d	b
+[abc]		&#	a(dc)d	c
+.		&#	a()c
+b.*c		&#	b(bc)c	bc
+b.*		&#	b(bc)c	bc
+.*c		&#	b(bc)c	bc
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/subexp.in b/contrib/netbsd-tests/lib/libc/regex/data/subexp.in
new file mode 100644
index 000000000000..c7bcc06175ea
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/subexp.in
@@ -0,0 +1,57 @@
+# subexpressions
+a(b)(c)d	-	abcd	abcd	b,c
+a(((b)))c	-	abc	abc	b,b,b
+a(b|(c))d	-	abd	abd	b,-
+a(b*|c|e)d	-	abbd	abbd	bb
+a(b*|c|e)d	-	acd	acd	c
+a(b*|c|e)d	-	ad	ad	@d
+a(b?)c		-	abc	abc	b
+a(b?)c		-	ac	ac	@c
+a(b+)c		-	abc	abc	b
+a(b+)c		-	abbbc	abbbc	bbb
+a(b*)c		-	ac	ac	@c
+(a|ab)(bc([de]+)f|cde)	-	abcdef	abcdef	a,bcdef,de
+# the regression tester only asks for 9 subexpressions
+a(b)(c)(d)(e)(f)(g)(h)(i)(j)k	-	abcdefghijk	abcdefghijk	b,c,d,e,f,g,h,i,j
+a(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)l	-	abcdefghijkl	abcdefghijkl	b,c,d,e,f,g,h,i,j,k
+a([bc]?)c	-	abc	abc	b
+a([bc]?)c	-	ac	ac	@c
+a([bc]+)c	-	abc	abc	b
+a([bc]+)c	-	abcc	abcc	bc
+a([bc]+)bc	-	abcbc	abcbc	bc
+a(bb+|b)b	-	abb	abb	b
+a(bbb+|bb+|b)b	-	abb	abb	b
+a(bbb+|bb+|b)b	-	abbb	abbb	bb
+a(bbb+|bb+|b)bb	-	abbb	abbb	b
+(.*).*		-	abcdef	abcdef	abcdef
+(a*)*		-	bc	@b	@b
+
+# do we get the right subexpression when it is used more than once?
+a(b|c)*d	-	ad	ad	-
+a(b|c)*d	-	abcd	abcd	c
+a(b|c)+d	-	abd	abd	b
+a(b|c)+d	-	abcd	abcd	c
+a(b|c?)+d	-	ad	ad	@d
+a(b|c?)+d	-	abcd	abcd	@d
+a(b|c){0,0}d	-	ad	ad	-
+a(b|c){0,1}d	-	ad	ad	-
+a(b|c){0,1}d	-	abd	abd	b
+a(b|c){0,2}d	-	ad	ad	-
+a(b|c){0,2}d	-	abcd	abcd	c
+a(b|c){0,}d	-	ad	ad	-
+a(b|c){0,}d	-	abcd	abcd	c
+a(b|c){1,1}d	-	abd	abd	b
+a(b|c){1,1}d	-	acd	acd	c
+a(b|c){1,2}d	-	abd	abd	b
+a(b|c){1,2}d	-	abcd	abcd	c
+a(b|c){1,}d	-	abd	abd	b
+a(b|c){1,}d	-	abcd	abcd	c
+a(b|c){2,2}d	-	acbd	acbd	b
+a(b|c){2,2}d	-	abcd	abcd	c
+a(b|c){2,4}d	-	abcd	abcd	c
+a(b|c){2,4}d	-	abcbd	abcbd	b
+a(b|c){2,4}d	-	abcbcd	abcbcd	c
+a(b|c){2,}d	-	abcd	abcd	c
+a(b|c){2,}d	-	abcbd	abcbd	b
+a(b+|((c)*))+d	-	abd	abd	@d,@d,-
+a(b+|((c)*))+d	-	abcd	abcd	@d,@d,-
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/subtle.in b/contrib/netbsd-tests/lib/libc/regex/data/subtle.in
new file mode 100644
index 000000000000..92d68bb9c29b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/subtle.in
@@ -0,0 +1,21 @@
+# subtleties of matching
+abc		&	xabcy	abc
+a\(b\)?c\1d	b	acd
+aBc		i	Abc	Abc
+a[Bc]*d		i	abBCcd	abBCcd
+0[[:upper:]]1	&i	0a1	0a1
+0[[:lower:]]1	&i	0A1	0A1
+a[^b]c		&i	abc
+a[^b]c		&i	aBc
+a[^b]c		&i	adc	adc
+[a]b[c]		-	abc	abc
+[a]b[a]		-	aba	aba
+[abc]b[abc]	-	abc	abc
+[abc]b[abd]	-	abd	abd
+a(b?c)+d	-	accd	accd
+(wee|week)(knights|night)	-	weeknights	weeknights
+(we|wee|week|frob)(knights|night|day)	-	weeknights	weeknights
+a[bc]d		-	xyzaaabcaababdacd	abd
+a[ab]c		-	aaabc	abc
+abc		s	abc	abc
+a*		&	b	@b
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/word_bound.in b/contrib/netbsd-tests/lib/libc/regex/data/word_bound.in
new file mode 100644
index 000000000000..e09a329afd1b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/word_bound.in
@@ -0,0 +1,13 @@
+# word boundaries (ick)
+[[:<:]]a	&	a	a
+[[:<:]]a	&	ba
+[[:<:]]a	&	-a	a
+a[[:>:]]	&	a	a
+a[[:>:]]	&	ab
+a[[:>:]]	&	a-	a
+[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc	abc
+[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc-q	abc
+[[:<:]]a.c[[:>:]]	&	axc-dayc-dazce-abc	axc
+[[:<:]]b.c[[:>:]]	&	a_bxc-byc_d-bzc-q	bzc
+[[:<:]].x..[[:>:]]	&	y_xa_-_xb_y-_xc_-axdc	_xc_
+[[:<:]]a_b[[:>:]]	&	x_a_b
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/zero.in b/contrib/netbsd-tests/lib/libc/regex/data/zero.in
new file mode 100644
index 000000000000..2786944eb227
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/data/zero.in
@@ -0,0 +1,7 @@
+# cases involving NULs
+aZb		&	a	a
+aZb		&p	a
+aZb		&p#	(aZb)	aZb
+aZ*b		&p#	(ab)	ab
+a.b		&#	(aZb)	aZb
+a.*		&#	(aZb)c	aZb
diff --git a/contrib/netbsd-tests/lib/libc/regex/debug.c b/contrib/netbsd-tests/lib/libc/regex/debug.c
new file mode 100644
index 000000000000..c1528b9e8c95
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/debug.c
@@ -0,0 +1,266 @@
+/*	$NetBSD: debug.c,v 1.2 2011/10/10 04:32:41 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1993 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <ctype.h>
+#include <limits.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+
+/* Don't sort these! */
+#include "utils.h"
+#include "regex2.h"
+
+#include "test_regex.h"
+
+static void s_print(struct re_guts *, FILE *);
+static char *regchar(int);
+
+/*
+ * regprint - print a regexp for debugging
+ */
+void
+regprint(regex_t *r, FILE *d)
+{
+	struct re_guts *g = r->re_g;
+	int c;
+	int last;
+	int nincat[NC];
+
+	fprintf(d, "%ld states, %zu categories", (long)g->nstates,
+							g->ncategories);
+	fprintf(d, ", first %ld last %ld", (long)g->firststate,
+						(long)g->laststate);
+	if (g->iflags&USEBOL)
+		fprintf(d, ", USEBOL");
+	if (g->iflags&USEEOL)
+		fprintf(d, ", USEEOL");
+	if (g->iflags&BAD)
+		fprintf(d, ", BAD");
+	if (g->nsub > 0)
+		fprintf(d, ", nsub=%ld", (long)g->nsub);
+	if (g->must != NULL)
+		fprintf(d, ", must(%ld) `%*s'", (long)g->mlen, (int)g->mlen,
+								g->must);
+	if (g->backrefs)
+		fprintf(d, ", backrefs");
+	if (g->nplus > 0)
+		fprintf(d, ", nplus %ld", (long)g->nplus);
+	fprintf(d, "\n");
+	s_print(g, d);
+	for (size_t i = 0; i < g->ncategories; i++) {
+		nincat[i] = 0;
+		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
+			if (g->categories[c] == i)
+				nincat[i]++;
+	}
+	fprintf(d, "cc0#%d", nincat[0]);
+	for (size_t i = 1; i < g->ncategories; i++)
+		if (nincat[i] == 1) {
+			for (c = CHAR_MIN; c <= CHAR_MAX; c++)
+				if (g->categories[c] == i)
+					break;
+			fprintf(d, ", %zu=%s", i, regchar(c));
+		}
+	fprintf(d, "\n");
+	for (size_t i = 1; i < g->ncategories; i++)
+		if (nincat[i] != 1) {
+			fprintf(d, "cc%zu\t", i);
+			last = -1;
+			for (c = CHAR_MIN; c <= CHAR_MAX+1; c++)	/* +1 does flush */
+				if (c <= CHAR_MAX && g->categories[c] == i) {
+					if (last < 0) {
+						fprintf(d, "%s", regchar(c));
+						last = c;
+					}
+				} else {
+					if (last >= 0) {
+						if (last != c-1)
+							fprintf(d, "-%s",
+								regchar(c-1));
+						last = -1;
+					}
+				}
+			fprintf(d, "\n");
+		}
+}
+
+/*
+ * s_print - print the strip for debugging
+ */
+static void
+s_print(struct re_guts *g, FILE *d)
+{
+	sop *s;
+	cset *cs;
+	int done = 0;
+	sop opnd;
+	int col = 0;
+	ssize_t last;
+	sopno offset = 2;
+#	define	GAP()	{	if (offset % 5 == 0) { \
+					if (col > 40) { \
+						fprintf(d, "\n\t"); \
+						col = 0; \
+					} else { \
+						fprintf(d, " "); \
+						col++; \
+					} \
+				} else \
+					col++; \
+				offset++; \
+			}
+
+	if (OP(g->strip[0]) != OEND)
+		fprintf(d, "missing initial OEND!\n");
+	for (s = &g->strip[1]; !done; s++) {
+		opnd = OPND(*s);
+		switch (OP(*s)) {
+		case OEND:
+			fprintf(d, "\n");
+			done = 1;
+			break;
+		case OCHAR:
+			if (strchr("\\|()^$.[+*?{}!<> ", (char)opnd) != NULL)
+				fprintf(d, "\\%c", (char)opnd);
+			else
+				fprintf(d, "%s", regchar((char)opnd));
+			break;
+		case OBOL:
+			fprintf(d, "^");
+			break;
+		case OEOL:
+			fprintf(d, "$");
+			break;
+		case OBOW:
+			fprintf(d, "\\{");
+			break;
+		case OEOW:
+			fprintf(d, "\\}");
+			break;
+		case OANY:
+			fprintf(d, ".");
+			break;
+		case OANYOF:
+			fprintf(d, "[(%ld)", (long)opnd);
+			cs = &g->sets[opnd];
+			last = -1;
+			for (size_t i = 0; i < g->csetsize+1; i++)	/* +1 flushes */
+				if (CHIN(cs, i) && i < g->csetsize) {
+					if (last < 0) {
+						fprintf(d, "%s", regchar(i));
+						last = i;
+					}
+				} else {
+					if (last >= 0) {
+						if (last != (ssize_t)i - 1)
+							fprintf(d, "-%s",
+							    regchar(i - 1));
+						last = -1;
+					}
+				}
+			fprintf(d, "]");
+			break;
+		case OBACK_:
+			fprintf(d, "(\\<%ld>", (long)opnd);
+			break;
+		case O_BACK:
+			fprintf(d, "<%ld>\\)", (long)opnd);
+			break;
+		case OPLUS_:
+			fprintf(d, "(+");
+			if (OP(*(s+opnd)) != O_PLUS)
+				fprintf(d, "<%ld>", (long)opnd);
+			break;
+		case O_PLUS:
+			if (OP(*(s-opnd)) != OPLUS_)
+				fprintf(d, "<%ld>", (long)opnd);
+			fprintf(d, "+)");
+			break;
+		case OQUEST_:
+			fprintf(d, "(?");
+			if (OP(*(s+opnd)) != O_QUEST)
+				fprintf(d, "<%ld>", (long)opnd);
+			break;
+		case O_QUEST:
+			if (OP(*(s-opnd)) != OQUEST_)
+				fprintf(d, "<%ld>", (long)opnd);
+			fprintf(d, "?)");
+			break;
+		case OLPAREN:
+			fprintf(d, "((<%ld>", (long)opnd);
+			break;
+		case ORPAREN:
+			fprintf(d, "<%ld>))", (long)opnd);
+			break;
+		case OCH_:
+			fprintf(d, "<");
+			if (OP(*(s+opnd)) != OOR2)
+				fprintf(d, "<%ld>", (long)opnd);
+			break;
+		case OOR1:
+			if (OP(*(s-opnd)) != OOR1 && OP(*(s-opnd)) != OCH_)
+				fprintf(d, "<%ld>", (long)opnd);
+			fprintf(d, "|");
+			break;
+		case OOR2:
+			fprintf(d, "|");
+			if (OP(*(s+opnd)) != OOR2 && OP(*(s+opnd)) != O_CH)
+				fprintf(d, "<%ld>", (long)opnd);
+			break;
+		case O_CH:
+			if (OP(*(s-opnd)) != OOR1)
+				fprintf(d, "<%ld>", (long)opnd);
+			fprintf(d, ">");
+			break;
+		default:
+			fprintf(d, "!%d(%d)!", OP(*s), opnd);
+			break;
+		}
+		if (!done)
+			GAP();
+	}
+}
+
+/*
+ * regchar - make a character printable
+ */
+static char *			/* -> representation */
+regchar(int ch)
+{
+	static char buf[10];
+
+	if (isprint(ch) || ch == ' ')
+		sprintf(buf, "%c", ch);
+	else
+		sprintf(buf, "\\%o", ch);
+	return(buf);
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/main.c b/contrib/netbsd-tests/lib/libc/regex/main.c
new file mode 100644
index 000000000000..eac4e2d9b51e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/main.c
@@ -0,0 +1,523 @@
+/*	$NetBSD: main.c,v 1.2 2011/09/16 16:13:18 plunky Exp $	*/
+
+/*-
+ * Copyright (c) 1993 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <assert.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+
+#include "test_regex.h"
+
+char *progname;
+int debug = 0;
+int line = 0;
+int status = 0;
+
+int copts = REG_EXTENDED;
+int eopts = 0;
+regoff_t startoff = 0;
+regoff_t endoff = 0;
+
+static char empty = '\0';
+
+static char *eprint(int);
+static int efind(char *);
+
+/*
+ * main - do the simple case, hand off to regress() for regression
+ */
+int
+main(int argc, char *argv[])
+{
+	regex_t re;
+#	define	NS	10
+	regmatch_t subs[NS];
+	char erbuf[100];
+	int err;
+	size_t len;
+	int c;
+	int errflg = 0;
+	int i;
+	extern int optind;
+	extern char *optarg;
+
+	progname = argv[0];
+
+	while ((c = getopt(argc, argv, "c:e:S:E:x")) != -1)
+		switch (c) {
+		case 'c':	/* compile options */
+			copts = options('c', optarg);
+			break;
+		case 'e':	/* execute options */
+			eopts = options('e', optarg);
+			break;
+		case 'S':	/* start offset */
+			startoff = (regoff_t)atoi(optarg);
+			break;
+		case 'E':	/* end offset */
+			endoff = (regoff_t)atoi(optarg);
+			break;
+		case 'x':	/* Debugging. */
+			debug++;
+			break;
+		case '?':
+		default:
+			errflg++;
+			break;
+		}
+	if (errflg) {
+		fprintf(stderr, "usage: %s ", progname);
+		fprintf(stderr, "[-c copt][-C][-d] [re]\n");
+		exit(2);
+	}
+
+	if (optind >= argc) {
+		regress(stdin);
+		exit(status);
+	}
+
+	err = regcomp(&re, argv[optind++], copts);
+	if (err) {
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
+		fprintf(stderr, "error %s, %zd/%zd `%s'\n",
+			eprint(err), len, (size_t)sizeof(erbuf), erbuf);
+		exit(status);
+	}
+	regprint(&re, stdout);	
+
+	if (optind >= argc) {
+		regfree(&re);
+		exit(status);
+	}
+
+	if (eopts&REG_STARTEND) {
+		subs[0].rm_so = startoff;
+		subs[0].rm_eo = strlen(argv[optind]) - endoff;
+	}
+	err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
+	if (err) {
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
+		fprintf(stderr, "error %s, %zd/%zd `%s'\n",
+			eprint(err), len, (size_t)sizeof(erbuf), erbuf);
+		exit(status);
+	}
+	if (!(copts&REG_NOSUB)) {
+		len = (int)(subs[0].rm_eo - subs[0].rm_so);
+		if (subs[0].rm_so != -1) {
+			if (len != 0)
+				printf("match `%.*s'\n", (int)len,
+					argv[optind] + subs[0].rm_so);
+			else
+				printf("match `'@%.1s\n",
+					argv[optind] + subs[0].rm_so);
+		}
+		for (i = 1; i < NS; i++)
+			if (subs[i].rm_so != -1)
+				printf("(%d) `%.*s'\n", i,
+					(int)(subs[i].rm_eo - subs[i].rm_so),
+					argv[optind] + subs[i].rm_so);
+	}
+	exit(status);
+}
+
+/*
+ * regress - main loop of regression test
+ */
+void
+regress(FILE *in)
+{
+	char inbuf[1000];
+#	define	MAXF	10
+	char *f[MAXF];
+	int nf;
+	int i;
+	char erbuf[100];
+	size_t ne;
+	const char *badpat = "invalid regular expression";
+#	define	SHORT	10
+	const char *bpname = "REG_BADPAT";
+	regex_t re;
+
+	while (fgets(inbuf, sizeof(inbuf), in) != NULL) {
+		line++;
+		if (inbuf[0] == '#' || inbuf[0] == '\n')
+			continue;			/* NOTE CONTINUE */
+		inbuf[strlen(inbuf)-1] = '\0';	/* get rid of stupid \n */
+		if (debug)
+			fprintf(stdout, "%d:\n", line);
+		nf = split(inbuf, f, MAXF, "\t\t");
+		if (nf < 3) {
+			fprintf(stderr, "bad input, line %d\n", line);
+			exit(1);
+		}
+		for (i = 0; i < nf; i++)
+			if (strcmp(f[i], "\"\"") == 0)
+				f[i] = &empty;
+		if (nf <= 3)
+			f[3] = NULL;
+		if (nf <= 4)
+			f[4] = NULL;
+		try(f[0], f[1], f[2], f[3], f[4], options('c', f[1]));
+		if (opt('&', f[1]))	/* try with either type of RE */
+			try(f[0], f[1], f[2], f[3], f[4],
+					options('c', f[1]) &~ REG_EXTENDED);
+	}
+
+	ne = regerror(REG_BADPAT, NULL, erbuf, sizeof(erbuf));
+	if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
+		fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
+							erbuf, badpat);
+		status = 1;
+	}
+	ne = regerror(REG_BADPAT, NULL, erbuf, (size_t)SHORT);
+	if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
+						ne != strlen(badpat)+1) {
+		fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
+						erbuf, SHORT-1, badpat);
+		status = 1;
+	}
+	ne = regerror(REG_ITOA|REG_BADPAT, NULL, erbuf, sizeof(erbuf));
+	if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
+		fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
+						erbuf, bpname);
+		status = 1;
+	}
+	re.re_endp = bpname;
+	ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
+	if (atoi(erbuf) != (int)REG_BADPAT) {
+		fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
+						erbuf, (long)REG_BADPAT);
+		status = 1;
+	} else if (ne != strlen(erbuf)+1) {
+		fprintf(stderr, "end: regerror() ATOI test len(`%s') = %ld\n",
+						erbuf, (long)REG_BADPAT);
+		status = 1;
+	}
+}
+
+/*
+ - try - try it, and report on problems
+ == void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
+ */
+void
+try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts)
+{
+	regex_t re;
+#	define	NSUBS	10
+	regmatch_t subs[NSUBS];
+#	define	NSHOULD	15
+	char *should[NSHOULD];
+	int nshould;
+	char erbuf[100];
+	int err;
+	int len;
+	const char *type = (opts & REG_EXTENDED) ? "ERE" : "BRE";
+	int i;
+	char *grump;
+	char f0copy[1000];
+	char f2copy[1000];
+
+	strcpy(f0copy, f0);
+	re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
+	fixstr(f0copy);
+	err = regcomp(&re, f0copy, opts);
+	if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
+		/* unexpected error or wrong error */
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
+		fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
+					line, type, eprint(err), len,
+					(int)sizeof(erbuf), erbuf);
+		status = 1;
+	} else if (err == 0 && opt('C', f1)) {
+		/* unexpected success */
+		fprintf(stderr, "%d: %s should have given REG_%s\n",
+						line, type, f2);
+		status = 1;
+		err = 1;	/* so we won't try regexec */
+	}
+
+	if (err != 0) {
+		regfree(&re);
+		return;
+	}
+
+	strcpy(f2copy, f2);
+	fixstr(f2copy);
+
+	if (options('e', f1)&REG_STARTEND) {
+		if (strchr(f2, '(') == NULL || strchr(f2, ')') == NULL)
+			fprintf(stderr, "%d: bad STARTEND syntax\n", line);
+		subs[0].rm_so = strchr(f2, '(') - f2 + 1;
+		subs[0].rm_eo = strchr(f2, ')') - f2;
+	}
+	err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
+
+	if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
+		/* unexpected error or wrong error */
+		len = regerror(err, &re, erbuf, sizeof(erbuf));
+		fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
+					line, type, eprint(err), len,
+					(int)sizeof(erbuf), erbuf);
+		status = 1;
+	} else if (err != 0) {
+		/* nothing more to check */
+	} else if (f3 == NULL) {
+		/* unexpected success */
+		fprintf(stderr, "%d: %s exec should have failed\n",
+						line, type);
+		status = 1;
+		err = 1;		/* just on principle */
+	} else if (opts&REG_NOSUB) {
+		/* nothing more to check */
+	} else if ((grump = check(f2, subs[0], f3)) != NULL) {
+		fprintf(stderr, "%d: %s %s\n", line, type, grump);
+		status = 1;
+		err = 1;
+	}
+
+	if (err != 0 || f4 == NULL) {
+		regfree(&re);
+		return;
+	}
+
+	for (i = 1; i < NSHOULD; i++)
+		should[i] = NULL;
+	nshould = split(f4, &should[1], NSHOULD-1, ",");
+	if (nshould == 0) {
+		nshould = 1;
+		should[1] = &empty;
+	}
+	for (i = 1; i < NSUBS; i++) {
+		grump = check(f2, subs[i], should[i]);
+		if (grump != NULL) {
+			fprintf(stderr, "%d: %s $%d %s\n", line,
+							type, i, grump);
+			status = 1;
+			err = 1;
+		}
+	}
+
+	regfree(&re);
+}
+
+/*
+ - options - pick options out of a regression-test string
+ == int options(int type, char *s);
+ */
+int
+options(int type, char *s)
+{
+	char *p;
+	int o = (type == 'c') ? copts : eopts;
+	const char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
+
+	for (p = s; *p != '\0'; p++)
+		if (strchr(legal, *p) != NULL)
+			switch (*p) {
+			case 'b':
+				o &= ~REG_EXTENDED;
+				break;
+			case 'i':
+				o |= REG_ICASE;
+				break;
+			case 's':
+				o |= REG_NOSUB;
+				break;
+			case 'n':
+				o |= REG_NEWLINE;
+				break;
+			case 'm':
+				o &= ~REG_EXTENDED;
+				o |= REG_NOSPEC;
+				break;
+			case 'p':
+				o |= REG_PEND;
+				break;
+			case '^':
+				o |= REG_NOTBOL;
+				break;
+			case '$':
+				o |= REG_NOTEOL;
+				break;
+			case '#':
+				o |= REG_STARTEND;
+				break;
+			case 't':	/* trace */
+				o |= REG_TRACE;
+				break;
+			case 'l':	/* force long representation */
+				o |= REG_LARGE;
+				break;
+			case 'r':	/* force backref use */
+				o |= REG_BACKR;
+				break;
+			}
+	return(o);
+}
+
+/*
+ - opt - is a particular option in a regression string?
+ == int opt(int c, char *s);
+ */
+int				/* predicate */
+opt(int c, char *s)
+{
+	return(strchr(s, c) != NULL);
+}
+
+/*
+ - fixstr - transform magic characters in strings
+ == void fixstr(char *p);
+ */
+void
+fixstr(char *p)
+{
+	if (p == NULL)
+		return;
+
+	for (; *p != '\0'; p++)
+		if (*p == 'N')
+			*p = '\n';
+		else if (*p == 'T')
+			*p = '\t';
+		else if (*p == 'S')
+			*p = ' ';
+		else if (*p == 'Z')
+			*p = '\0';
+}
+
+/*
+ * check - check a substring match
+ */
+char *				/* NULL or complaint */
+check(char *str, regmatch_t sub, char *should)
+{
+	int len;
+	int shlen;
+	char *p;
+	static char grump[500];
+	char *at = NULL;
+
+	if (should != NULL && strcmp(should, "-") == 0)
+		should = NULL;
+	if (should != NULL && should[0] == '@') {
+		at = should + 1;
+		should = &empty;
+	}
+
+	/* check rm_so and rm_eo for consistency */
+	if (sub.rm_so > sub.rm_eo || (sub.rm_so == -1 && sub.rm_eo != -1) ||
+				(sub.rm_so != -1 && sub.rm_eo == -1) ||
+				(sub.rm_so != -1 && sub.rm_so < 0) ||
+				(sub.rm_eo != -1 && sub.rm_eo < 0) ) {
+		sprintf(grump, "start %ld end %ld", (long)sub.rm_so,
+							(long)sub.rm_eo);
+		return(grump);
+	}
+
+	/* check for no match */
+	if (sub.rm_so == -1) {
+		if (should == NULL)
+			return(NULL);
+		else {
+			sprintf(grump, "did not match");
+			return(grump);
+		}
+	}
+
+	/* check for in range */
+	if (sub.rm_eo > (ssize_t)strlen(str)) {
+		sprintf(grump, "start %ld end %ld, past end of string",
+					(long)sub.rm_so, (long)sub.rm_eo);
+		return(grump);
+	}
+
+	len = (int)(sub.rm_eo - sub.rm_so);
+	p = str + sub.rm_so;
+
+	/* check for not supposed to match */
+	if (should == NULL) {
+		sprintf(grump, "matched `%.*s'", len, p);
+		return(grump);
+	}
+
+	/* check for wrong match */
+	shlen = (int)strlen(should);
+	if (len != shlen || strncmp(p, should, (size_t)shlen) != 0) {
+		sprintf(grump, "matched `%.*s' instead", len, p);
+		return(grump);
+	}
+	if (shlen > 0)
+		return(NULL);
+
+	/* check null match in right place */
+	if (at == NULL)
+		return(NULL);
+	shlen = strlen(at);
+	if (shlen == 0)
+		shlen = 1;	/* force check for end-of-string */
+	if (strncmp(p, at, shlen) != 0) {
+		sprintf(grump, "matched null at `%.20s'", p);
+		return(grump);
+	}
+	return(NULL);
+}
+
+/*
+ * eprint - convert error number to name
+ */
+static char *
+eprint(int err)
+{
+	static char epbuf[100];
+	size_t len;
+
+	len = regerror(REG_ITOA|err, NULL, epbuf, sizeof(epbuf));
+	assert(len <= sizeof(epbuf));
+	return(epbuf);
+}
+
+/*
+ * efind - convert error name to number
+ */
+static int
+efind(char *name)
+{
+	static char efbuf[100];
+	regex_t re;
+
+	sprintf(efbuf, "REG_%s", name);
+	assert(strlen(efbuf) < sizeof(efbuf));
+	re.re_endp = efbuf;
+	(void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
+	return(atoi(efbuf));
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/split.c b/contrib/netbsd-tests/lib/libc/regex/split.c
new file mode 100644
index 000000000000..2a26b50693bd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/split.c
@@ -0,0 +1,344 @@
+/*	$NetBSD: split.c,v 1.1 2011/01/08 18:10:31 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 1993 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <regex.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test_regex.h"
+
+/*
+ * split - divide a string into fields, like awk split()
+ *
+ * returns number of fields, including overflow
+ *
+ * fields[]	list is not NULL-terminated
+ * nfields	number of entries available in fields[]
+ * sep		"" white, "c" single char, "ab" [ab]+
+ */
+int
+split(char *string, char *fields[], int nfields, const char *sep)
+{
+	char *p = string;
+	char c;			/* latest character */
+	char sepc = *sep;
+	char sepc2;
+	int fn;
+	char **fp = fields;
+	const char *sepp;
+	int trimtrail;
+
+	/* white space */
+	if (sepc == '\0') {
+		while ((c = *p++) == ' ' || c == '\t')
+			continue;
+		p--;
+		trimtrail = 1;
+		sep = " \t";	/* note, code below knows this is 2 long */
+		sepc = ' ';
+	} else
+		trimtrail = 0;
+	sepc2 = sep[1];		/* now we can safely pick this up */
+
+	/* catch empties */
+	if (*p == '\0')
+		return(0);
+
+	/* single separator */
+	if (sepc2 == '\0') {
+		fn = nfields;
+		for (;;) {
+			*fp++ = p;
+			fn--;
+			if (fn == 0)
+				break;
+			while ((c = *p++) != sepc)
+				if (c == '\0')
+					return(nfields - fn);
+			*(p-1) = '\0';
+		}
+		/* we have overflowed the fields vector -- just count them */
+		fn = nfields;
+		for (;;) {
+			while ((c = *p++) != sepc)
+				if (c == '\0')
+					return(fn);
+			fn++;
+		}
+		/* not reached */
+	}
+
+	/* two separators */
+	if (sep[2] == '\0') {
+		fn = nfields;
+		for (;;) {
+			*fp++ = p;
+			fn--;
+			while ((c = *p++) != sepc && c != sepc2)
+				if (c == '\0') {
+					if (trimtrail && **(fp-1) == '\0')
+						fn++;
+					return(nfields - fn);
+				}
+			if (fn == 0)
+				break;
+			*(p-1) = '\0';
+			while ((c = *p++) == sepc || c == sepc2)
+				continue;
+			p--;
+		}
+		/* we have overflowed the fields vector -- just count them */
+		fn = nfields;
+		while (c != '\0') {
+			while ((c = *p++) == sepc || c == sepc2)
+				continue;
+			p--;
+			fn++;
+			while ((c = *p++) != '\0' && c != sepc && c != sepc2)
+				continue;
+		}
+		/* might have to trim trailing white space */
+		if (trimtrail) {
+			p--;
+			while ((c = *--p) == sepc || c == sepc2)
+				continue;
+			p++;
+			if (*p != '\0') {
+				if (fn == nfields+1)
+					*p = '\0';
+				fn--;
+			}
+		}
+		return(fn);
+	}
+
+	/* n separators */
+	fn = 0;
+	for (;;) {
+		if (fn < nfields)
+			*fp++ = p;
+		fn++;
+		for (;;) {
+			c = *p++;
+			if (c == '\0')
+				return(fn);
+			sepp = sep;
+			while ((sepc = *sepp++) != '\0' && sepc != c)
+				continue;
+			if (sepc != '\0')	/* it was a separator */
+				break;
+		}
+		if (fn < nfields)
+			*(p-1) = '\0';
+		for (;;) {
+			c = *p++;
+			sepp = sep;
+			while ((sepc = *sepp++) != '\0' && sepc != c)
+				continue;
+			if (sepc == '\0')	/* it wasn't a separator */
+				break;
+		}
+		p--;
+	}
+
+	/* not reached */
+}
+
+#ifdef TEST_SPLIT
+
+
+/*
+ * test program
+ * pgm		runs regression
+ * pgm sep	splits stdin lines by sep
+ * pgm str sep	splits str by sep
+ * pgm str sep n	splits str by sep n times
+ */
+int
+main(int argc, char *argv[])
+{
+	char buf[512];
+	int n;
+#	define	MNF	10
+	char *fields[MNF];
+
+	if (argc > 4)
+		for (n = atoi(argv[3]); n > 0; n--) {
+			(void) strcpy(buf, argv[1]);
+		}
+	else if (argc > 3)
+		for (n = atoi(argv[3]); n > 0; n--) {
+			(void) strcpy(buf, argv[1]);
+			(void) split(buf, fields, MNF, argv[2]);
+		}
+	else if (argc > 2)
+		dosplit(argv[1], argv[2]);
+	else if (argc > 1)
+		while (fgets(buf, sizeof(buf), stdin) != NULL) {
+			buf[strlen(buf)-1] = '\0';	/* stomp newline */
+			dosplit(buf, argv[1]);
+		}
+	else
+		regress();
+
+	exit(0);
+}
+
+void
+dosplit(char *string, char *seps)
+{
+#	define	NF	5
+	char *fields[NF];
+	int nf;
+
+	nf = split(string, fields, NF, seps);
+	print(nf, NF, fields);
+}
+
+void
+print(int nf, int nfp, char *fields)
+{
+	int fn;
+	int bound;
+
+	bound = (nf > nfp) ? nfp : nf;
+	printf("%d:\t", nf);
+	for (fn = 0; fn < bound; fn++)
+		printf("\"%s\"%s", fields[fn], (fn+1 < nf) ? ", " : "\n");
+}
+
+#define	RNF	5		/* some table entries know this */
+struct {
+	char *str;
+	char *seps;
+	int nf;
+	char *fi[RNF];
+} tests[] = {
+	"",		" ",	0,	{ "" },
+	" ",		" ",	2,	{ "", "" },
+	"x",		" ",	1,	{ "x" },
+	"xy",		" ",	1,	{ "xy" },
+	"x y",		" ",	2,	{ "x", "y" },
+	"abc def  g ",	" ",	5,	{ "abc", "def", "", "g", "" },
+	"  a bcd",	" ",	4,	{ "", "", "a", "bcd" },
+	"a b c d e f",	" ",	6,	{ "a", "b", "c", "d", "e f" },
+	" a b c d ",	" ",	6,	{ "", "a", "b", "c", "d " },
+
+	"",		" _",	0,	{ "" },
+	" ",		" _",	2,	{ "", "" },
+	"x",		" _",	1,	{ "x" },
+	"x y",		" _",	2,	{ "x", "y" },
+	"ab _ cd",	" _",	2,	{ "ab", "cd" },
+	" a_b  c ",	" _",	5,	{ "", "a", "b", "c", "" },
+	"a b c_d e f",	" _",	6,	{ "a", "b", "c", "d", "e f" },
+	" a b c d ",	" _",	6,	{ "", "a", "b", "c", "d " },
+
+	"",		" _~",	0,	{ "" },
+	" ",		" _~",	2,	{ "", "" },
+	"x",		" _~",	1,	{ "x" },
+	"x y",		" _~",	2,	{ "x", "y" },
+	"ab _~ cd",	" _~",	2,	{ "ab", "cd" },
+	" a_b  c~",	" _~",	5,	{ "", "a", "b", "c", "" },
+	"a b_c d~e f",	" _~",	6,	{ "a", "b", "c", "d", "e f" },
+	"~a b c d ",	" _~",	6,	{ "", "a", "b", "c", "d " },
+
+	"",		" _~-",	0,	{ "" },
+	" ",		" _~-",	2,	{ "", "" },
+	"x",		" _~-",	1,	{ "x" },
+	"x y",		" _~-",	2,	{ "x", "y" },
+	"ab _~- cd",	" _~-",	2,	{ "ab", "cd" },
+	" a_b  c~",	" _~-",	5,	{ "", "a", "b", "c", "" },
+	"a b_c-d~e f",	" _~-",	6,	{ "a", "b", "c", "d", "e f" },
+	"~a-b c d ",	" _~-",	6,	{ "", "a", "b", "c", "d " },
+
+	"",		"  ",	0,	{ "" },
+	" ",		"  ",	2,	{ "", "" },
+	"x",		"  ",	1,	{ "x" },
+	"xy",		"  ",	1,	{ "xy" },
+	"x y",		"  ",	2,	{ "x", "y" },
+	"abc def  g ",	"  ",	4,	{ "abc", "def", "g", "" },
+	"  a bcd",	"  ",	3,	{ "", "a", "bcd" },
+	"a b c d e f",	"  ",	6,	{ "a", "b", "c", "d", "e f" },
+	" a b c d ",	"  ",	6,	{ "", "a", "b", "c", "d " },
+
+	"",		"",	0,	{ "" },
+	" ",		"",	0,	{ "" },
+	"x",		"",	1,	{ "x" },
+	"xy",		"",	1,	{ "xy" },
+	"x y",		"",	2,	{ "x", "y" },
+	"abc def  g ",	"",	3,	{ "abc", "def", "g" },
+	"\t a bcd",	"",	2,	{ "a", "bcd" },
+	"  a \tb\t c ",	"",	3,	{ "a", "b", "c" },
+	"a b c d e ",	"",	5,	{ "a", "b", "c", "d", "e" },
+	"a b\tc d e f",	"",	6,	{ "a", "b", "c", "d", "e f" },
+	" a b c d e f ",	"",	6,	{ "a", "b", "c", "d", "e f " },
+
+	NULL,		NULL,	0,	{ NULL },
+};
+
+void
+regress(void)
+{
+	char buf[512];
+	int n;
+	char *fields[RNF+1];
+	int nf;
+	int i;
+	int printit;
+	char *f;
+
+	for (n = 0; tests[n].str != NULL; n++) {
+		(void) strcpy(buf, tests[n].str);
+		fields[RNF] = NULL;
+		nf = split(buf, fields, RNF, tests[n].seps);
+		printit = 0;
+		if (nf != tests[n].nf) {
+			printf("split `%s' by `%s' gave %d fields, not %d\n",
+				tests[n].str, tests[n].seps, nf, tests[n].nf);
+			printit = 1;
+		} else if (fields[RNF] != NULL) {
+			printf("split() went beyond array end\n");
+			printit = 1;
+		} else {
+			for (i = 0; i < nf && i < RNF; i++) {
+				f = fields[i];
+				if (f == NULL)
+					f = "(NULL)";
+				if (strcmp(f, tests[n].fi[i]) != 0) {
+					printf("split `%s' by `%s', field %d is `%s', not `%s'\n",
+						tests[n].str, tests[n].seps,
+						i, fields[i], tests[n].fi[i]);
+					printit = 1;
+				}
+			}
+		}
+		if (printit)
+			print(nf, RNF, fields);
+	}
+}
+#endif
diff --git a/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c
new file mode 100644
index 000000000000..468492c293aa
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c
@@ -0,0 +1,210 @@
+/*	$NetBSD: t_exhaust.c,v 1.7 2011/11/16 18:37:31 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_exhaust.c,v 1.7 2011/11/16 18:37:31 christos Exp $");
+
+#include <stdio.h>
+#include <regex.h>
+#include <string.h>
+#include <stdlib.h>
+#include <err.h>
+#include <atf-c.h>
+
+#ifndef REGEX_MAXSIZE
+#define REGEX_MAXSIZE	9999
+#endif
+
+static char *
+mkstr(const char *str, size_t len)
+{
+	size_t slen = strlen(str);
+	char *p = malloc(slen * len + 1);
+	ATF_REQUIRE(p != NULL);
+	for (size_t i = 0; i < len; i++)
+		strcpy(&p[i * slen], str);
+	return p;
+}
+
+static char *
+concat(const char *d, const char *s)
+{
+	size_t dlen = strlen(d);
+	size_t slen = strlen(s);
+	char *p = malloc(dlen + slen + 1);
+
+	ATF_REQUIRE(p != NULL);
+	strcpy(p, d);
+	strcpy(p + dlen, s);
+	return p;
+}
+
+static char *
+p0(size_t len)
+{
+	char *d, *s1, *s2;
+	s1 = mkstr("\\(", len);
+	s2 = concat(s1, ")");
+	free(s1);
+	d = concat("(", s2);
+	free(s2);
+	return d;
+}
+
+static char *
+p1(size_t len)
+{
+	char *d, *s1, *s2, *s3;
+	s1 = mkstr("\\(", 60);
+	s2 = mkstr("(.*)", len);
+	s3 = concat(s1, s2);
+	free(s2);
+	free(s1);
+	s1 = concat(s3, ")");
+	free(s3);
+	d = concat("(", s1);
+	free(s1);
+	return d;
+}
+
+static char *
+ps(const char *m, const char *s, size_t len)
+{
+	char *d, *s1, *s2, *s3;
+	s1 = mkstr(m, len);
+	s2 = mkstr(s, len);
+	s3 = concat(s1, s2);
+	free(s2);
+	free(s1);
+	d = concat("(.?)", s3);
+	free(s3);
+	return d;
+}
+
+static char *
+p2(size_t len)
+{
+	return ps("((.*){0,255}", ")", len);
+}
+
+static char *
+p3(size_t len)
+{
+	return ps("(.\\{0,}", ")", len);
+}
+
+static char *
+p4(size_t len)
+{
+	return ps("((.*){1,255}", ")", len);
+}
+
+static char *
+p5(size_t len)
+{
+	return ps("(", "){1,100}", len);
+}
+
+static char *
+p6(size_t len)
+{
+	char *d, *s1, *s2;
+	s1 = mkstr("(?:(.*)|", len);
+	s2 = concat(s1, "(.*)");
+	free(s1);
+	s1 = mkstr(")", len);
+	d = concat(s2, s1);
+	free(s1);
+	free(s2);
+	return d;
+}
+
+static const struct {
+	char *(*pattern)(size_t);
+	int type;
+} tests[] = {
+	{ p0, REG_EXTENDED },
+	{ p1, REG_EXTENDED },
+	{ p2, REG_EXTENDED },
+	{ p3, REG_EXTENDED },
+	{ p4, REG_EXTENDED },
+	{ p5, REG_EXTENDED },
+	{ p6, REG_BASIC },
+};
+
+ATF_TC(regcomp_too_big);
+
+ATF_TC_HEAD(regcomp_too_big, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that large patterns don't"
+	    " crash, but return a proper error code");
+	// libtre needs it.
+	atf_tc_set_md_var(tc, "timeout", "600");
+	atf_tc_set_md_var(tc, "require.memory", "120M");
+}
+
+ATF_TC_BODY(regcomp_too_big, tc)
+{
+	regex_t re;
+	int e;
+
+	for (size_t i = 0; i < __arraycount(tests); i++) {
+		char *d = (*tests[i].pattern)(REGEX_MAXSIZE);
+		e = regcomp(&re, d, tests[i].type);
+		if (e) {
+			char ebuf[1024];
+			(void)regerror(e, &re, ebuf, sizeof(ebuf));
+			ATF_REQUIRE_MSG(e == REG_ESPACE,
+			    "regcomp returned %d (%s) for pattern %zu [%s]", e, ebuf,
+			    i, d);
+			free(d);
+			continue;
+		}
+		free(d);
+		(void)regexec(&re, "aaaaaaaaaaa", 0, NULL, 0);
+		regfree(&re);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, regcomp_too_big);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/t_regex.sh b/contrib/netbsd-tests/lib/libc/regex/t_regex.sh
new file mode 100755
index 000000000000..bef3ac926959
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/t_regex.sh
@@ -0,0 +1,73 @@
+# $NetBSD: t_regex.sh,v 1.1 2012/08/24 20:24:40 jmmv Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+check()
+{
+	local dataname="${1}"; shift
+
+	prog="$(atf_get_srcdir)/h_regex"
+	data="$(atf_get_srcdir)/data/${dataname}.in"
+
+	atf_check -x "${prog} <${data}"
+	atf_check -x "${prog} -el <${data}"
+	atf_check -x "${prog} -er <${data}"
+}
+
+create_tc()
+{
+	local name="${1}"; shift
+	local descr="${1}"; shift
+
+	atf_test_case "${name}"
+	eval "${name}_head() { atf_set 'descr' '${descr}'; }"
+	eval "${name}_body() { check '${name}'; }"
+
+	atf_add_test_case "${name}"
+}
+
+atf_init_test_cases()
+{
+	create_tc basic "Checks basic functionality"
+	create_tc paren "Checks parentheses"
+	create_tc anchor "Checks anchors and REG_NEWLINE"
+	create_tc error "Checks syntax errors and non-errors"
+	create_tc meta "Checks metacharacters and backslashes"
+	create_tc backref "Checks back references"
+	create_tc repet_ordinary "Checks ordinary repetitions"
+	create_tc repet_bounded "Checks bounded repetitions"
+	create_tc repet_multi "Checks multiple repetitions"
+	create_tc bracket "Checks brackets"
+	create_tc complex "Checks various complex examples"
+	create_tc subtle "Checks various subtle examples"
+	create_tc c_comments "Checks matching C comments"
+	create_tc subexp "Checks subexpressions"
+	create_tc startend "Checks STARTEND option"
+	create_tc nospec "Checks NOSPEC option"
+	create_tc zero "Checks NULs"
+	create_tc word_bound "Checks word boundaries"
+	create_tc regress "Checks various past problems and suspected problems"
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c b/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c
new file mode 100644
index 000000000000..beaeb04043bf
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c
@@ -0,0 +1,629 @@
+/*	$NetBSD: t_regex_att.c,v 1.1 2012/08/24 20:24:40 jmmv Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_regex_att.c,v 1.1 2012/08/24 20:24:40 jmmv Exp $");
+
+#include <sys/param.h>
+
+#include <stdio.h>
+#include <regex.h>
+#include <string.h>
+#include <stdlib.h>
+#include <vis.h>
+#include <ctype.h>
+#include <atf-c.h>
+
+static const char sep[] = "\r\n\t";
+static const char delim[3] = "\\\\\0";
+
+
+static void
+fail(const char *pattern, const char *input, size_t lineno) {
+	fprintf(stderr,
+	    "skipping failed test at line %zu (pattern=%s, input=%s)\n",
+	    lineno, pattern, input);
+}
+
+static int
+bug(const char *pattern, const char *input, size_t lineno) {
+	static const struct {
+		const char *p;
+		const char *i;
+	} b[] = {
+#if defined(REGEX_SPENCER)
+		/*
+		 * The default libc implementation by Henry Spencer
+		 */
+		{ "a[-]?c", "ac" },			// basic.dat
+		{ "(a*)*", "a" },			// categorization.dat
+		{ "(aba|a*b)*", "ababa" },		// categorization.dat
+		{ "\\(a\\(b\\)*\\)*\\2", "abab" },	// categorization.dat
+		{ "(a*)*", "aaaaaa" },			// nullsubexpression.dat
+		{ "(a*)*", "aaaaaax" },			// nullsubexpression.dat
+		{ "(a*)+", "a" },			// nullsubexpression.dat
+		{ "(a*)+", "aaaaaa" },			// nullsubexpression.dat
+		{ "(a*)+", "aaaaaax" },			// nullsubexpression.dat
+		{ "([a]*)*", "a" },			// nullsubexpression.dat
+		{ "([a]*)*", "aaaaaa" },		// nullsubexpression.dat
+		{ "([a]*)*", "aaaaaax" },		// nullsubexpression.dat
+		{ "([a]*)+", "a" },			// nullsubexpression.dat
+		{ "([a]*)+", "aaaaaa" },		// nullsubexpression.dat
+		{ "([a]*)+", "aaaaaax" },		// nullsubexpression.dat
+		{ "([^b]*)*", "a" },			// nullsubexpression.dat
+		{ "([^b]*)*", "aaaaaa" },		// nullsubexpression.dat
+		{ "([^b]*)*", "aaaaaab" },		// nullsubexpression.dat
+		{ "([ab]*)*", "a" },			// nullsubexpression.dat
+		{ "([ab]*)*", "aaaaaa" },		// nullsubexpression.dat
+		{ "([ab]*)*", "ababab" },		// nullsubexpression.dat
+		{ "([ab]*)*", "bababa" },		// nullsubexpression.dat
+		{ "([ab]*)*", "b" },			// nullsubexpression.dat
+		{ "([ab]*)*", "bbbbbb" },		// nullsubexpression.dat
+		{ "([ab]*)*", "aaaabcde" },		// nullsubexpression.dat
+		{ "([^a]*)*", "b" },			// nullsubexpression.dat
+		{ "([^a]*)*", "bbbbbb" },		// nullsubexpression.dat
+		{ "([^ab]*)*", "ccccxx" },		// nullsubexpression.dat
+		{ "\\(a*\\)*\\(x\\)", "ax" },		// nullsubexpression.dat
+		{ "\\(a*\\)*\\(x\\)", "axa" },		// nullsubexpression.dat
+		{ "\\(a*\\)*\\(x\\)\\(\\1\\)", "x" },	// nullsubexpression.dat
+/* crash! */	{ "\\(a*\\)*\\(x\\)\\(\\1\\)", "ax" },	// nullsubexpression.dat
+/* crash! */	{ "\\(a*\\)*\\(x\\)\\(\\1\\)\\(x\\)", "axxa" },	// ""
+		{ "(a*)*(x)",  "ax" },			// nullsubexpression.dat
+		{ "(a*)*(x)",  "axa" },			// nullsubexpression.dat
+		{ "(a*)+(x)",  "ax" },			// nullsubexpression.dat
+		{ "(a*)+(x)",  "axa" },			// nullsubexpression.dat
+		{ "((a|ab)(c|bcd))(d*)", "abcd" },	// forcedassoc.dat
+		{ "((a|ab)(bcd|c))(d*)", "abcd" },	// forcedassoc.dat
+		{ "((ab|a)(c|bcd))(d*)", "abcd" },	// forcedassoc.dat
+		{ "((ab|a)(bcd|c))(d*)", "abcd" },	// forcedassoc.dat
+		{ "((a*)(b|abc))(c*)", "abc" },		// forcedassoc.dat
+		{ "((a*)(abc|b))(c*)", "abc" },		// forcedassoc.dat
+		{ "((..)|(.)){2}", "aaa" },		// repetition.dat
+		{ "((..)|(.)){3}", "aaa" },		// repetition.dat
+		{ "((..)|(.)){3}", "aaaa" },		// repetition.dat
+		{ "((..)|(.)){3}", "aaaaa" },		// repetition.dat
+		{ "X(.?){0,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){1,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){2,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){3,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){4,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){5,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){6,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){7,}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){0,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){1,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){2,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){3,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){4,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){5,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){6,8}Y", "X1234567Y" },		// repetition.dat
+		{ "X(.?){7,8}Y", "X1234567Y" },		// repetition.dat
+		{ "(a|ab|c|bcd){0,}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){1,}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){2,}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){3,}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){1,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){2,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd){3,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd)*(d*)", "ababcd" },	// repetition.dat
+		{ "(a|ab|c|bcd)+(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){0,}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){1,}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){2,}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){3,}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){1,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){2,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd){3,10}(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd)*(d*)", "ababcd" },	// repetition.dat
+		{ "(ab|a|c|bcd)+(d*)", "ababcd" },	// repetition.dat
+#elif defined(REGEX_TRE)
+		{ "a[-]?c", "ac" },			// basic.dat
+		{ "a\\(b\\)*\\1", "a" },		// categorization.dat
+		{ "a\\(b\\)*\\1", "abab" },		// categorization.dat
+		{ "\\(a\\(b\\)*\\)*\\2", "abab" },	// categorization.dat
+		{ "\\(a*\\)*\\(x\\)\\(\\1\\)", "ax" },	// categorization.dat
+		{ "\\(a*\\)*\\(x\\)\\(\\1\\)\\(x\\)", "axxa" },	// ""
+		{ "((..)|(.))*", "aa" },		// repetition.dat
+		{ "((..)|(.))*", "aaa" },		// repetition.dat
+		{ "((..)|(.))*", "aaaaa" },		// repetition.dat
+		{ "X(.?){7,}Y", "X1234567Y" },		// repetition.dat
+#else
+		{ "", "" }
+#endif
+	};
+
+	for (size_t i = 0; i < __arraycount(b); i++) {
+		if (strcmp(pattern, b[i].p) == 0 &&
+		    strcmp(input, b[i].i) == 0) {
+			fail(pattern, input, lineno);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+#ifdef REGEX_SPENCER
+#define HAVE_BRACES	1
+#define HAVE_MINIMAL	0
+#endif
+#ifndef HAVE_BRACES
+#define HAVE_BRACES	1
+#endif
+#ifndef HAVE_MINIMAL
+#define HAVE_MINIMAL	1
+#endif
+
+static int
+optional(const char *s)
+{
+	static const struct{
+		const char *n;
+		int v;
+	} nv[]= {
+		{ "[[<element>]] not supported", HAVE_BRACES },
+		{ "no *? +? mimimal match ops", HAVE_MINIMAL },
+	};
+
+	for (size_t i = 0; i < __arraycount(nv); i++)
+		if (strcmp(nv[i].n, s) == 0) {
+			if (nv[i].v)
+				return 0;
+			fprintf(stderr, "skipping unsupported [%s] tests\n", s);
+			return 1;
+		}
+
+	ATF_REQUIRE_MSG(0, "Unknown feature: %s", s);
+	return 0;
+}
+
+static int
+unsupported(const char *s)
+{
+	static const char *we[] = {
+#if defined(REGEX_SPENCER)
+		"ASSOCIATIVITY=left",		// have right associativity
+		"SUBEXPRESSION=precedence",	// have grouping subexpression
+		"REPEAT_LONGEST=last",		// have first repeat longest
+		"BUG=alternation-order",	// don't have it
+		"BUG=first-match",		// don't have it
+		"BUG=nomatch-match",		// don't have it
+		"BUG=repeat-any",		// don't have it
+		"BUG=range-null",		// don't have it
+		"BUG=repeat-null-unknown",	// don't have it
+		"BUG=repeat-null",		// don't have it
+		"BUG=repeat-artifact",		// don't have it
+		"BUG=subexpression-first",	// don't have it
+#elif defined(REGEX_TRE)
+		"ASSOCIATIVITY=right",		// have left associativity
+		"SUBEXPRESSION=grouping",	// have precedence subexpression
+		"REPEAT_LONGEST=first",		// have last repeat longest
+		"LENGTH=first",			// have last length
+		"BUG=alternation-order",	// don't have it
+		"BUG=first-match",		// don't have it
+		"BUG=range-null",		// don't have it
+		"BUG=repeat-null",		// don't have it
+		"BUG=repeat-artifact",		// don't have it
+		"BUG=subexpression-first",	// don't have it
+		"BUG=repeat-short",		// don't have it
+#endif
+	};
+
+	if (s == NULL)
+		return 0;
+
+	while (*s == '#' || isspace((unsigned char)*s))
+		s++;
+
+	for (size_t i = 0; i < __arraycount(we); i++)
+		if (strcmp(we[i], s) == 0)
+			return 1;
+	return 0;
+}
+
+static void
+geterror(const char *s, int *comp, int *exec)
+{
+	static const struct {
+		const char *n;
+		int v;
+		int ce;
+	} nv[] = {
+#define COMP 1
+#define EXEC 2
+		{ "OK", 0, COMP|EXEC },
+#define _DO(a, b)	{ # a, REG_ ## a, b },
+		_DO(NOMATCH, EXEC)
+		_DO(BADPAT, COMP)
+		_DO(ECOLLATE, COMP)
+		_DO(ECTYPE, COMP)
+		_DO(EESCAPE, COMP)
+		_DO(ESUBREG, COMP)
+		_DO(EBRACK, COMP)
+		_DO(EPAREN, COMP)
+		_DO(EBRACE, COMP)
+		_DO(BADBR, COMP)
+		_DO(ERANGE, COMP)
+		_DO(ESPACE, EXEC)
+		_DO(BADRPT, COMP)
+		_DO(EMPTY, COMP)
+		_DO(ASSERT, COMP)
+		_DO(INVARG, COMP)
+		_DO(ENOSYS, COMP)
+#undef _DO
+	};
+	*comp = 0;
+	*exec = 0;
+	for (size_t i = 0; i < __arraycount(nv); i++)
+		if (strcmp(s, nv[i].n) == 0) {
+			if (nv[i].ce & COMP)
+				*comp = nv[i].v;
+			if (nv[i].ce & EXEC)
+				*exec = nv[i].v;
+			return;
+		}
+	ATF_REQUIRE_MSG(0, "Unknown error %s", s);
+	return;
+}
+
+static int
+getflags(char *s)
+{
+	int flags = 0;
+
+	for (;; s++)
+		switch (*s) {
+		case '0': case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+			*s = '\0';
+			break;
+		case '\0':
+			return flags;
+		case 'B':
+		case 'E':
+		case 'F':
+		case 'L':
+			break;
+		case 'i':
+			flags |= REG_ICASE;
+			*s = '\0';
+			break;
+		case '$':
+			*s = '\0';
+			break;
+		case 'n':
+			*s = '\0';
+			break;
+		default:
+			ATF_REQUIRE_MSG(0, "Unknown char %c", *s);
+			break;
+		}
+}
+
+static size_t
+getmatches(const char *s)
+{
+	size_t i;
+	char *q;
+	for (i = 0; (q = strchr(s, '(')) != NULL; i++, s = q + 1)
+		continue;
+	ATF_REQUIRE_MSG(i != 0, "No parentheses found");
+	return i;
+}
+
+static void
+checkcomment(const char *s, size_t lineno)
+{
+	if (s && strstr(s, "BUG") != NULL)
+		fprintf(stderr, "Expected %s at line %zu\n", s, lineno);
+}
+
+static void
+checkmatches(const char *matches, size_t nm, const regmatch_t *pm,
+    size_t lineno)
+{
+	if (nm == 0)
+		return;
+
+	char *res;
+	size_t len = strlen(matches) + 1, off = 0;
+
+	ATF_REQUIRE((res = strdup(matches)) != NULL);
+	for (size_t i = 0; i < nm; i++) {
+		int l;
+		if (pm[i].rm_so == -1 && pm[i].rm_eo == -1)
+			l = snprintf(res + off, len - off, "(?,?)");
+		else
+			l = snprintf(res + off, len - off, "(%lld,%lld)",
+			    (long long)pm[i].rm_so, (long long)pm[i].rm_eo);
+		ATF_REQUIRE_MSG((size_t) l < len - off, "String too long %s"
+		    " cur=%d, max=%zu", res, l, len - off);
+		off += l;
+	}
+	ATF_REQUIRE_STREQ_MSG(res, matches, " at line %zu", lineno);
+	free(res);
+}
+
+static void
+att_test(const struct atf_tc *tc, const char *data_name)
+{
+	regex_t re;
+	char *line, *lastpattern = NULL, data_path[MAXPATHLEN];
+	size_t len, lineno = 0;
+	int skipping = 0;
+	FILE *input_file;
+
+	snprintf(data_path, sizeof(data_path), "%s/data/%s.dat",
+	    atf_tc_get_config_var(tc, "srcdir"), data_name);
+
+	input_file = fopen(data_path, "r");
+	if (input_file == NULL)
+		atf_tc_fail("Failed to open input file %s", data_path);
+
+	for (; (line = fparseln(input_file, &len, &lineno, delim, 0))
+	    != NULL; free(line)) {
+		char *name, *pattern, *input, *matches, *comment;
+		regmatch_t *pm;
+		size_t nm;
+#ifdef DEBUG
+		fprintf(stderr, "[%s]\n", line);
+#endif
+		if ((name = strtok(line, sep)) == NULL)
+			continue;
+
+		/*
+		 * We check these early so that we skip the lines quickly
+		 * in order to do more strict testing on the other arguments
+		 * The same characters are also tested in the switch below
+		 */
+		if (*name == '}') {
+			skipping = 0;
+			continue;
+		}
+		if (skipping)
+			continue;
+		if (*name == ';' || *name == '#' || strcmp(name, "NOTE") == 0)
+			continue;
+		if (*name == ':') {
+			/* Skip ":HA#???:" prefix */
+			while (*++name && *name != ':')
+				continue;
+			if (*name)
+				name++;
+		}
+
+		ATF_REQUIRE_MSG((pattern = strtok(NULL, sep)) != NULL,
+			"Missing pattern at line %zu", lineno);
+		ATF_REQUIRE_MSG((input = strtok(NULL, sep)) != NULL,
+			"Missing input at line %zu", lineno);
+
+		if (strchr(name, '$')) {
+			ATF_REQUIRE(strunvis(pattern, pattern) != -1);
+			ATF_REQUIRE(strunvis(input, input) != -1);
+		}
+
+
+		if (strcmp(input, "NULL") == 0)
+			*input = '\0';
+
+		if (strcmp(pattern, "SAME") == 0) {
+			ATF_REQUIRE(lastpattern != NULL);
+			pattern = lastpattern;
+		} else {
+			free(lastpattern);
+			ATF_REQUIRE((lastpattern = strdup(pattern)) != NULL);
+		}
+
+		ATF_REQUIRE_MSG((matches = strtok(NULL, sep)) != NULL,
+		    "Missing matches at line %zu", lineno);
+
+		comment = strtok(NULL, sep);
+		switch (*name) {
+		case '{':	/* Begin optional implementation */
+			if (optional(comment)) {
+				skipping++;
+				continue;
+			}
+			name++;	/* We have it, so ignore */
+			break;
+		case '}':	/* End optional implementation */
+			skipping = 0;
+			continue;
+		case '?':	/* Optional */
+		case '|':	/* Alternative */
+			if (unsupported(comment))
+				continue;
+			name++;	/* We have it, so ignore */
+			break;
+		case '#':	/* Comment */
+		case ';':	/* Skip */
+			continue;
+		default:
+			break;
+		}
+
+		/* XXX: Our bug */
+		if (bug(pattern, input, lineno))
+			continue;
+
+		int comp, exec;
+		if (*matches != '(') {
+			geterror(matches, &comp, &exec);
+			pm = NULL;
+			nm = 0;
+		} else {
+			comp = exec = 0;
+			nm = getmatches(matches);
+			ATF_REQUIRE((pm = calloc(nm, sizeof(*pm))) != NULL);
+		}
+
+
+
+		int iflags = getflags(name);
+		for (; *name; name++) {
+			int flags;
+			switch (*name) {
+			case 'B':
+				flags = REG_BASIC;
+				break;
+			case 'E':
+				flags = REG_EXTENDED;
+				break;
+			case 'L':
+				flags = REG_NOSPEC;
+				break;
+			default:
+				ATF_REQUIRE_MSG(0, "Bad name %c", *name);
+				continue;
+			}
+			int c = regcomp(&re, pattern, flags | iflags);
+			ATF_REQUIRE_MSG(c == comp,
+			    "regcomp returned %d for pattern %s at line %zu",
+			    c, pattern, lineno);
+			if (c)
+				continue;
+			int e = regexec(&re, input, nm, pm, 0);
+			ATF_REQUIRE_MSG(e == exec, "Expected error %d,"
+			    " got %d at line %zu", exec, e, lineno);
+			checkmatches(matches, nm, pm, lineno);
+			checkcomment(comment, lineno);
+			regfree(&re);
+		}
+		free(pm);
+	}
+
+	fclose(input_file);
+}
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests basic functionality");
+}
+ATF_TC_BODY(basic, tc)
+{
+	att_test(tc, "basic");
+}
+
+ATF_TC(categorization);
+ATF_TC_HEAD(categorization, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests implementation categorization");
+}
+ATF_TC_BODY(categorization, tc)
+{
+	att_test(tc, "categorization");
+}
+
+ATF_TC(nullsubexpr);
+ATF_TC_HEAD(nullsubexpr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests (...)*");
+}
+ATF_TC_BODY(nullsubexpr, tc)
+{
+	att_test(tc, "nullsubexpr");
+}
+
+ATF_TC(leftassoc);
+ATF_TC_HEAD(leftassoc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests left-associative "
+	    "implementations");
+}
+ATF_TC_BODY(leftassoc, tc)
+{
+#if SKIP_LEFTASSOC
+	/* jmmv: I converted the original shell-based tests to C and they
+	 * disabled this test in a very unconventional way without giving
+	 * any explation.  Mark as broken here, but I don't know why. */
+	atf_tc_expect_fail("Reason for breakage unknown");
+#endif
+	att_test(tc, "leftassoc");
+}
+
+ATF_TC(rightassoc);
+ATF_TC_HEAD(rightassoc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests right-associative "
+	    "implementations");
+}
+ATF_TC_BODY(rightassoc, tc)
+{
+#if SKIP_RIGHTASSOC
+	/* jmmv: I converted the original shell-based tests to C and they
+	 * disabled this test in a very unconventional way without giving
+	 * any explation.  Mark as broken here, but I don't know why. */
+	atf_tc_expect_fail("Reason for breakage unknown");
+#endif
+	att_test(tc, "rightassoc");
+}
+
+ATF_TC(forcedassoc);
+ATF_TC_HEAD(forcedassoc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests subexpression grouping to "
+	    "force association");
+}
+ATF_TC_BODY(forcedassoc, tc)
+{
+	att_test(tc, "forcedassoc");
+}
+
+ATF_TC(repetition);
+ATF_TC_HEAD(repetition, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests implicit vs. explicit "
+	    "repetition");
+}
+ATF_TC_BODY(repetition, tc)
+{
+	att_test(tc, "repetition");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, basic);
+	ATF_TP_ADD_TC(tp, categorization);
+	ATF_TP_ADD_TC(tp, nullsubexpr);
+	ATF_TP_ADD_TC(tp, leftassoc);
+	ATF_TP_ADD_TC(tp, rightassoc);
+	ATF_TP_ADD_TC(tp, forcedassoc);
+	ATF_TP_ADD_TC(tp, repetition);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/regex/test_regex.h b/contrib/netbsd-tests/lib/libc/regex/test_regex.h
new file mode 100644
index 000000000000..1d9f59da8ab7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/regex/test_regex.h
@@ -0,0 +1,44 @@
+/*	$NetBSD: test_regex.h,v 1.1 2011/01/08 18:10:31 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by 
+ *
+ * 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.
+ */
+
+/* from main.c */
+void regress(FILE *);
+void try(char *, char *, char *, char *, char *, int);
+int options(int, char *);
+int opt(int, char *);
+void fixstr(char *);
+char *check(char *, regmatch_t, char *);
+
+/* from split.c */
+int split(char *string, char *fields[], int nfields, const char *sep);
+
+/* from debug.c */
+void regprint(regex_t *r, FILE *d);
diff --git a/contrib/netbsd-tests/lib/libc/rpc/h_testbits.x b/contrib/netbsd-tests/lib/libc/rpc/h_testbits.x
new file mode 100644
index 000000000000..cbddfcc90ca5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/rpc/h_testbits.x
@@ -0,0 +1,21 @@
+/*	$NetBSD: h_testbits.x,v 1.1 2011/01/08 06:59:37 pgoyette Exp $ */
+
+enum smallenum {
+	SE_ONE = 1,
+	SE_TWO = 2
+};
+
+enum medenum {
+	ME_NEG = -1234,
+	ME_ONE = 1,
+	ME_TWO = 2,
+	ME_MANY = 1234
+};
+
+enum bigenum {
+	BE_ONE = 1,
+	BE_TWO = 2,
+	BE_MANY = 1234,
+	BE_LOTS = 1234567
+};
+
diff --git a/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c b/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
new file mode 100644
index 000000000000..cc1ec09fb216
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
@@ -0,0 +1,157 @@
+/*	$NetBSD: t_rpc.c,v 1.3 2013/02/28 15:56:53 christos Exp $	*/
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_rpc.c,v 1.3 2013/02/28 15:56:53 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <rpc/rpc.h>
+#include <stdlib.h>
+#include <err.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <unistd.h>
+
+
+#ifndef TEST
+#include <atf-c.h>
+
+#define ERRX(ev, msg, ...)	ATF_REQUIRE_MSG(0, msg, __VA_ARGS__)
+
+#define SKIPX(ev, msg, ...)	do {			\
+	atf_tc_skip(msg, __VA_ARGS__);			\
+	return;						\
+} while(/*CONSTCOND*/0)
+
+#else
+#define ERRX(ev, msg, ...)	errx(ev, msg, __VA_ARGS__)
+#define SKIPX(ev, msg, ...)	errx(ev, msg, __VA_ARGS__)
+#endif
+
+
+#define RPCBPROC_NULL 0
+
+static int
+reply(caddr_t replyp, struct netbuf * raddrp, struct netconfig * nconf)
+{
+	char host[NI_MAXHOST];
+	struct sockaddr *sock = raddrp->buf;
+	int error;
+
+
+	error = getnameinfo(sock, sock->sa_len, host, sizeof(host), NULL, 0, 0);
+	if (error)
+		warnx("Cannot resolve address (%s)", gai_strerror(error));
+	else
+		printf("response from: %s\n", host);
+	return 0;
+}
+
+extern bool __rpc_control(int, void *);
+
+static void
+onehost(const char *host, const char *transp)
+{
+	CLIENT         *clnt;
+	struct netbuf   addr;
+	struct timeval  tv;
+
+	/*
+	 * Magic!
+	 */
+	tv.tv_sec = 0;
+	tv.tv_usec = 500000;
+#define CLCR_SET_RPCB_TIMEOUT   2
+	__rpc_control(CLCR_SET_RPCB_TIMEOUT, &tv);
+
+	if ((clnt = clnt_create(host, RPCBPROG, RPCBVERS, transp)) == NULL)
+		SKIPX(EXIT_FAILURE, "clnt_create (%s)", clnt_spcreateerror(""));
+
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	if (clnt_call(clnt, RPCBPROC_NULL, xdr_void, NULL, xdr_void, NULL, tv)
+	    != RPC_SUCCESS)
+		ERRX(EXIT_FAILURE, "clnt_call (%s)", clnt_sperror(clnt, ""));
+	clnt_control(clnt, CLGET_SVC_ADDR, (char *) &addr);
+	reply(NULL, &addr, NULL);
+}
+
+#ifdef TEST
+static void
+allhosts(void)
+{
+	enum clnt_stat  clnt_stat;
+
+	clnt_stat = rpc_broadcast(RPCBPROG, RPCBVERS, RPCBPROC_NULL,
+	    (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_void,
+	    NULL, (resultproc_t)reply, transp);
+	if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT)
+		ERRX(EXIT_FAILURE, "%s", clnt_sperrno(clnt_stat));
+}
+
+int
+main(int argc, char *argv[])
+{
+	int             ch;
+	const char     *transp = "udp";
+
+
+	while ((ch = getopt(argc, argv, "ut")) != -1)
+		switch (ch) {
+		case 't':
+			transp = "tcp";
+			break;
+		case 'u':
+			transp = "udp";
+			break;
+		default:
+			fprintf(stderr, "Usage: %s -[t|u] [<hostname>...]\n",
+			    getprogname());
+			return EXIT_FAILURE;
+		}
+
+	if (argc == optind)
+		allhosts();
+	else
+		for (; optind < argc; optind++)
+			onehost(argv[optind], transp);
+
+	return EXIT_SUCCESS;
+}
+
+#else
+
+ATF_TC(get_svc_addr_tcp);
+ATF_TC_HEAD(get_svc_addr_tcp, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks CLGET_SVC_ADDR for tcp");
+
+}
+
+ATF_TC_BODY(get_svc_addr_tcp, tc)
+{
+	onehost("localhost", "tcp");
+
+}
+
+ATF_TC(get_svc_addr_udp);
+ATF_TC_HEAD(get_svc_addr_udp, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks CLGET_SVC_ADDR for udp");
+}
+
+ATF_TC_BODY(get_svc_addr_udp, tc)
+{
+	onehost("localhost", "udp");
+
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, get_svc_addr_udp);
+	ATF_TP_ADD_TC(tp, get_svc_addr_tcp);
+
+	return atf_no_error();
+}
+
+#endif
diff --git a/contrib/netbsd-tests/lib/libc/rpc/t_xdr.c b/contrib/netbsd-tests/lib/libc/rpc/t_xdr.c
new file mode 100644
index 000000000000..2a68eb44d74c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/rpc/t_xdr.c
@@ -0,0 +1,129 @@
+/* $NetBSD: t_xdr.c,v 1.1 2011/01/08 06:59:37 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Ben Harris.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c) 2001 Ben Harris
+ * All rights reserved.
+ *
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_xdr.c,v 1.1 2011/01/08 06:59:37 pgoyette Exp $");
+
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
+#include <string.h>
+
+#include <atf-c.h>
+
+#include "h_testbits.h"
+
+char xdrdata[] = {
+	0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* double 1.0 */
+	0x00, 0x00, 0x00, 0x01, /* enum smallenum SE_ONE */
+	0xff, 0xff, 0xfb, 0x2e, /* enum medenum ME_NEG */
+	0x00, 0x12, 0xd6, 0x87, /* enum bigenum BE_LOTS */
+};
+
+ATF_TC(xdr);
+ATF_TC_HEAD(xdr, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks encoding/decoding of doubles and enumerations");
+}
+ATF_TC_BODY(xdr, tc)
+{
+	XDR x;
+	double d;
+	smallenum s;
+	medenum m;
+	bigenum b;
+	char newdata[sizeof(xdrdata)];
+
+	xdrmem_create(&x, xdrdata, sizeof(xdrdata), XDR_DECODE);
+
+	ATF_REQUIRE_MSG(xdr_double(&x, &d), "xdr_double DECODE failed");
+	ATF_REQUIRE_EQ_MSG(d, 1.0, "double 1.0 decoded as %g", d);
+
+	ATF_REQUIRE_MSG(xdr_smallenum(&x, &s), "xdr_smallenum DECODE failed");
+	ATF_REQUIRE_EQ_MSG(s, SE_ONE, "SE_ONE decoded as %d", s);
+
+	ATF_REQUIRE_MSG(xdr_medenum(&x, &m), "xdr_medenum DECODE failed");
+	ATF_REQUIRE_EQ_MSG(m, ME_NEG, "ME_NEG decoded as %d", m);
+
+	ATF_REQUIRE_MSG(xdr_bigenum(&x, &b), "xdr_bigenum DECODE failed");
+	ATF_REQUIRE_EQ_MSG(b, BE_LOTS, "BE_LOTS decoded as %d", b);
+
+	xdr_destroy(&x);
+
+
+	xdrmem_create(&x, newdata, sizeof(newdata), XDR_ENCODE);
+
+	ATF_REQUIRE_MSG(xdr_double(&x, &d), "xdr_double ENCODE failed");
+	ATF_REQUIRE_MSG(xdr_smallenum(&x, &s), "xdr_smallenum ENCODE failed");
+	ATF_REQUIRE_MSG(xdr_medenum(&x, &m), "xdr_medenum ENCODE failed");
+	ATF_REQUIRE_MSG(xdr_bigenum(&x, &b), "xdr_bigenum ENCODE failed");
+	ATF_REQUIRE_MSG(memcmp(newdata, xdrdata, sizeof(xdrdata)) == 0,
+		"xdr ENCODE result differs");
+
+	xdr_destroy(&x);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, xdr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
new file mode 100644
index 000000000000..4d2a93bab004
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
@@ -0,0 +1,196 @@
+/* $NetBSD: t_setjmp.c,v 1.1 2010/12/27 19:35:31 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (c) 1994 Christopher G. Demetriou
+ * All rights reserved.
+ * 
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *          This product includes software developed for the
+ *          NetBSD Project.  See http://www.NetBSD.org/ for
+ *          information about NetBSD.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ * 
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_setjmp.c,v 1.1 2010/12/27 19:35:31 pgoyette Exp $");
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x) ATF_REQUIRE_MSG(x, "%s", strerror(errno))
+
+#define TEST_SETJMP 0
+#define TEST_U_SETJMP 1
+#define TEST_SIGSETJMP_SAVE 2
+#define TEST_SIGSETJMP_NOSAVE 3
+
+static int expectsignal;
+
+static void
+aborthandler(int signo)
+{
+	ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded");
+	atf_tc_pass();
+}
+
+static void
+h_check(int test)
+{
+	struct sigaction sa;
+	jmp_buf jb;
+	sigjmp_buf sjb;
+	sigset_t ss;
+	int i, x;
+
+	i = getpid();
+
+	if (test == TEST_SETJMP || test == TEST_SIGSETJMP_SAVE)
+		expectsignal = 0;
+	else if (test == TEST_U_SETJMP || test == TEST_SIGSETJMP_NOSAVE)
+		expectsignal = 1;
+	else
+		atf_tc_fail("unknown test");
+
+	sa.sa_handler = aborthandler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	REQUIRE_ERRNO(sigaction(SIGABRT, &sa, NULL) != -1);
+	REQUIRE_ERRNO(sigemptyset(&ss) != -1);
+	REQUIRE_ERRNO(sigaddset(&ss, SIGABRT) != -1);
+	REQUIRE_ERRNO(sigprocmask(SIG_BLOCK, &ss, NULL) != -1);
+
+	if (test == TEST_SETJMP)
+		x = setjmp(jb);
+	else if (test == TEST_U_SETJMP)
+		x = _setjmp(jb);
+	else 
+		x = sigsetjmp(sjb, !expectsignal);
+
+	if (x != 0) {
+		ATF_REQUIRE_MSG(x == i, "setjmp returned wrong value");
+		kill(i, SIGABRT);
+		ATF_REQUIRE_MSG(!expectsignal, "kill(SIGABRT) failed");
+		atf_tc_pass();
+	}
+
+	REQUIRE_ERRNO(sigprocmask(SIG_UNBLOCK, &ss, NULL) != -1);
+
+	if (test == TEST_SETJMP)
+		longjmp(jb, i);
+	else if (test == TEST_U_SETJMP)
+		_longjmp(jb, i);
+	else 
+		siglongjmp(sjb, i);
+
+	atf_tc_fail("jmp failed");
+}
+
+ATF_TC(setjmp);
+ATF_TC_HEAD(setjmp, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks setjmp(3)");
+}
+ATF_TC_BODY(setjmp, tc)
+{
+	h_check(TEST_SETJMP);
+}
+
+ATF_TC(_setjmp);
+ATF_TC_HEAD(_setjmp, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks _setjmp(3)");
+}
+ATF_TC_BODY(_setjmp, tc)
+{
+	h_check(TEST_U_SETJMP);
+}
+
+ATF_TC(sigsetjmp_save);
+ATF_TC_HEAD(sigsetjmp_save, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks sigsetjmp(3) with savemask enabled");
+}
+ATF_TC_BODY(sigsetjmp_save, tc)
+{
+	h_check(TEST_SIGSETJMP_SAVE);
+}
+
+ATF_TC(sigsetjmp_nosave);
+ATF_TC_HEAD(sigsetjmp_nosave, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks sigsetjmp(3) with savemask disabled");
+}
+ATF_TC_BODY(sigsetjmp_nosave, tc)
+{
+	h_check(TEST_SIGSETJMP_NOSAVE);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, setjmp);
+	ATF_TP_ADD_TC(tp, _setjmp);
+	ATF_TP_ADD_TC(tp, sigsetjmp_save);
+	ATF_TP_ADD_TC(tp, sigsetjmp_nosave);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c b/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c
new file mode 100644
index 000000000000..4437c927214e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c
@@ -0,0 +1,218 @@
+/* $NetBSD: t_threadjmp.c,v 1.1 2011/04/21 18:58:20 martin Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (c) 1994 Christopher G. Demetriou
+ * All rights reserved.
+ * 
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *          This product includes software developed for the
+ *          NetBSD Project.  See http://www.NetBSD.org/ for
+ *          information about NetBSD.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ * 
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_threadjmp.c,v 1.1 2011/04/21 18:58:20 martin Exp $");
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <pthread.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x) ATF_REQUIRE_MSG(x, "%s", strerror(errno))
+
+#define TEST_SETJMP 0
+#define TEST_U_SETJMP 1
+#define TEST_SIGSETJMP_SAVE 2
+#define TEST_SIGSETJMP_NOSAVE 3
+
+static pthread_t myself = NULL;
+
+static int expectsignal;
+
+static void
+aborthandler(int signo)
+{
+	ATF_REQUIRE(myself == pthread_self());
+	ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded");
+	atf_tc_pass();
+}
+
+static void
+h_check(int test)
+{
+	struct sigaction sa;
+	jmp_buf jb;
+	sigjmp_buf sjb;
+	sigset_t ss;
+	int i, x;
+
+	myself = pthread_self();
+	i = getpid();
+
+	if (test == TEST_SETJMP || test == TEST_SIGSETJMP_SAVE)
+		expectsignal = 0;
+	else if (test == TEST_U_SETJMP || test == TEST_SIGSETJMP_NOSAVE)
+		expectsignal = 1;
+	else
+		atf_tc_fail("unknown test");
+
+	sa.sa_handler = aborthandler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = 0;
+	REQUIRE_ERRNO(sigaction(SIGABRT, &sa, NULL) != -1);
+	REQUIRE_ERRNO(sigemptyset(&ss) != -1);
+	REQUIRE_ERRNO(sigaddset(&ss, SIGABRT) != -1);
+	REQUIRE_ERRNO(sigprocmask(SIG_BLOCK, &ss, NULL) != -1);
+	ATF_REQUIRE(myself == pthread_self());
+
+	if (test == TEST_SETJMP)
+		x = setjmp(jb);
+	else if (test == TEST_U_SETJMP)
+		x = _setjmp(jb);
+	else 
+		x = sigsetjmp(sjb, !expectsignal);
+
+	if (x != 0) {
+		ATF_REQUIRE(myself == pthread_self());
+		ATF_REQUIRE_MSG(x == i, "setjmp returned wrong value");
+		kill(i, SIGABRT);
+		ATF_REQUIRE_MSG(!expectsignal, "kill(SIGABRT) failed");
+		ATF_REQUIRE(myself == pthread_self());
+		atf_tc_pass();
+	}
+
+	ATF_REQUIRE(myself == pthread_self());
+	REQUIRE_ERRNO(sigprocmask(SIG_UNBLOCK, &ss, NULL) != -1);
+
+	if (test == TEST_SETJMP)
+		longjmp(jb, i);
+	else if (test == TEST_U_SETJMP)
+		_longjmp(jb, i);
+	else 
+		siglongjmp(sjb, i);
+
+	atf_tc_fail("jmp failed");
+}
+
+ATF_TC(setjmp);
+ATF_TC_HEAD(setjmp, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks pthread_self() and setjmp(3)");
+}
+ATF_TC_BODY(setjmp, tc)
+{
+	h_check(TEST_SETJMP);
+}
+
+ATF_TC(_setjmp);
+ATF_TC_HEAD(_setjmp, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks pthread_self() and _setjmp(3)");
+}
+ATF_TC_BODY(_setjmp, tc)
+{
+	h_check(TEST_U_SETJMP);
+}
+
+ATF_TC(sigsetjmp_save);
+ATF_TC_HEAD(sigsetjmp_save, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks pthread_self() and sigsetjmp(3) with savemask enabled");
+}
+ATF_TC_BODY(sigsetjmp_save, tc)
+{
+	h_check(TEST_SIGSETJMP_SAVE);
+}
+
+ATF_TC(sigsetjmp_nosave);
+ATF_TC_HEAD(sigsetjmp_nosave, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks pthread_self() and sigsetjmp(3) with savemask disabled");
+}
+ATF_TC_BODY(sigsetjmp_nosave, tc)
+{
+	h_check(TEST_SIGSETJMP_NOSAVE);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * These test cases try to verify setjmp and friends in a program
+	 * linked with pthreads, and verify that pthread_self() stays
+	 * consistent throughout the program. A setcontext() call invoked
+	 * by *setjmp() might clobber the TLS special register used to
+	 * implement pthread_self().
+	 */
+	ATF_TP_ADD_TC(tp, setjmp);
+	ATF_TP_ADD_TC(tp, _setjmp);
+	ATF_TP_ADD_TC(tp, sigsetjmp_save);
+	ATF_TP_ADD_TC(tp, sigsetjmp_nosave);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_fgets.c b/contrib/netbsd-tests/lib/libc/ssp/h_fgets.c
new file mode 100644
index 000000000000..ad9376a338c6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_fgets.c
@@ -0,0 +1,46 @@
+/* $NetBSD: h_fgets.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_fgets.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len = atoi(argv[1]);
+	(void)fgets(b, len, stdin);
+	(void)printf("%s\n", b);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_getcwd.c b/contrib/netbsd-tests/lib/libc/ssp/h_getcwd.c
new file mode 100644
index 000000000000..68e3a6f0b1e5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_getcwd.c
@@ -0,0 +1,47 @@
+/* $NetBSD: h_getcwd.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_getcwd.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[MAXPATHLEN];
+	size_t len = atoi(argv[1]);
+	(void)getcwd(b, len);
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_gets.c b/contrib/netbsd-tests/lib/libc/ssp/h_gets.c
new file mode 100644
index 000000000000..8c601b0a8c5c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_gets.c
@@ -0,0 +1,43 @@
+/* $NetBSD: h_gets.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_gets.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	(void)gets(b);
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_memcpy.c b/contrib/netbsd-tests/lib/libc/ssp/h_memcpy.c
new file mode 100644
index 000000000000..1950f738e711
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_memcpy.c
@@ -0,0 +1,48 @@
+/* $NetBSD: h_memcpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_memcpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len = atoi(argv[1]);
+
+	(void)memcpy(b, "1020202020202", len);
+	(void)printf("%*.*s\n", len, len, b);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_memmove.c b/contrib/netbsd-tests/lib/libc/ssp/h_memmove.c
new file mode 100644
index 000000000000..0ebfd2972815
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_memmove.c
@@ -0,0 +1,48 @@
+/* $NetBSD: h_memmove.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_memmove.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len =  atoi(argv[1]);
+
+	(void)memmove(b, "1020202020202", len);
+	(void)printf("%*.*s\n", len, len, b);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_memset.c b/contrib/netbsd-tests/lib/libc/ssp/h_memset.c
new file mode 100644
index 000000000000..65ed5f2ee7d2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_memset.c
@@ -0,0 +1,45 @@
+/* $NetBSD: h_memset.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_memset.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	size_t len =  atoi(argv[1]);
+	(void)memset(b, 0, len);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_raw.c b/contrib/netbsd-tests/lib/libc/ssp/h_raw.c
new file mode 100644
index 000000000000..a2324814716d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_raw.c
@@ -0,0 +1,57 @@
+/* $NetBSD: h_raw.c,v 1.6 2011/07/24 14:00:36 christos Exp $ */
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_raw.c,v 1.6 2011/07/24 14:00:36 christos Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void poke(int *, size_t);
+
+void
+poke(int *b, size_t index)
+{
+	size_t i;
+	volatile int sum = 0;
+
+	b[index] = 42;
+	for (i = 0; i < 10; i++) 
+		sum += b[i];
+}
+
+int
+main(int argc, char *argv[])
+{
+	int b[10];
+
+	poke(b, atoi(argv[1]));
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_read.c b/contrib/netbsd-tests/lib/libc/ssp/h_read.c
new file mode 100644
index 000000000000..5240af291eb7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_read.c
@@ -0,0 +1,47 @@
+/* $NetBSD: h_read.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_read.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[MAXPATHLEN];
+	size_t len = atoi(argv[1]);
+	(void)read(0, b, len);
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c b/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c
new file mode 100644
index 000000000000..c18faedc2f5b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c
@@ -0,0 +1,47 @@
+/* $NetBSD: h_readlink.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_readlink.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[MAXPATHLEN];
+	size_t len = atoi(argv[1]);
+	(void)readlink("/", b, len);
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c b/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c
new file mode 100644
index 000000000000..93575a81d6d9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c
@@ -0,0 +1,45 @@
+/* $NetBSD: h_snprintf.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_snprintf.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	size_t len = atoi(argv[1]);
+	(void)snprintf(b, len, "%s", "0123456789");
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_sprintf.c b/contrib/netbsd-tests/lib/libc/ssp/h_sprintf.c
new file mode 100644
index 000000000000..0f6d0cbc1b53
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_sprintf.c
@@ -0,0 +1,43 @@
+/* $NetBSD: h_sprintf.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_sprintf.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	(void)sprintf(b, "%s", argv[1]);
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_stpcpy.c b/contrib/netbsd-tests/lib/libc/ssp/h_stpcpy.c
new file mode 100644
index 000000000000..c8dfbb7a3c1b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_stpcpy.c
@@ -0,0 +1,49 @@
+/* $NetBSD: h_stpcpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $ */
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_stpcpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	char *q = stpcpy(b, argv[1]);
+
+	if ((size_t)(q - b) != strlen(argv[1]))
+		abort();
+
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_stpncpy.c b/contrib/netbsd-tests/lib/libc/ssp/h_stpncpy.c
new file mode 100644
index 000000000000..c03d2a8fb905
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_stpncpy.c
@@ -0,0 +1,56 @@
+/* $NetBSD: h_stpncpy.c,v 1.2 2014/04/07 15:09:20 christos Exp $ */
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_stpncpy.c,v 1.2 2014/04/07 15:09:20 christos Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len = atoi(argv[1]);
+#if __GNUC_PREREQ__(4, 8)
+	char *q = stpncpy(b, "1020202020202", len);
+
+	if (q - b != len)
+		abort();
+#else
+	// gcc-4.5 lacks __builtin___stpncpy_chk, lose.
+	(void)strncpy(b, "1020202020202", len);
+#endif
+
+	(void)printf("%*.*s\n", len, len, b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_strcat.c b/contrib/netbsd-tests/lib/libc/ssp/h_strcat.c
new file mode 100644
index 000000000000..687acf78909e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_strcat.c
@@ -0,0 +1,46 @@
+/* $NetBSD: h_strcat.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_strcat.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	(void)strcpy(b, "1");
+	(void)strcat(b, argv[1]);
+
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_strcpy.c b/contrib/netbsd-tests/lib/libc/ssp/h_strcpy.c
new file mode 100644
index 000000000000..2a7f1f51e469
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_strcpy.c
@@ -0,0 +1,45 @@
+/* $NetBSD: h_strcpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_strcpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	(void)strcpy(b, argv[1]);
+
+	(void)printf("%s\n", b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_strncat.c b/contrib/netbsd-tests/lib/libc/ssp/h_strncat.c
new file mode 100644
index 000000000000..0d66c7b9b2b8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_strncat.c
@@ -0,0 +1,48 @@
+/* $NetBSD: h_strncat.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_strncat.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len = atoi(argv[1]);
+	(void)strcpy(b, "1");
+	(void)strncat(b, "1020202020202", len);
+
+	(void)printf("%*.*s\n", len, len, b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_strncpy.c b/contrib/netbsd-tests/lib/libc/ssp/h_strncpy.c
new file mode 100644
index 000000000000..fddf67b602b5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_strncpy.c
@@ -0,0 +1,47 @@
+/* $NetBSD: h_strncpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_strncpy.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $");
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+	char b[10];
+	int len = atoi(argv[1]);
+	(void)strncpy(b, "1020202020202", len);
+
+	(void)printf("%*.*s\n", len, len, b);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_vsnprintf.c b/contrib/netbsd-tests/lib/libc/ssp/h_vsnprintf.c
new file mode 100644
index 000000000000..0f6af85911b2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_vsnprintf.c
@@ -0,0 +1,57 @@
+/* $NetBSD: h_vsnprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_vsnprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+static void wrap(size_t, const char *, ...) __printflike(2, 3);
+
+void
+wrap(size_t len, const char *fmt, ...)
+{
+	char b[10];
+	va_list ap;
+	va_start(ap, fmt);
+	(void)vsnprintf(b, len, fmt, ap);
+	(void)printf("%s\n", b);
+	va_end(ap);
+}
+
+int
+main(int argc, char *argv[])
+{
+	size_t len = atoi(argv[1]);
+	wrap(len, "%s", "012345678901234567890");
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/h_vsprintf.c b/contrib/netbsd-tests/lib/libc/ssp/h_vsprintf.c
new file mode 100644
index 000000000000..c7fc780a1c1a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/h_vsprintf.c
@@ -0,0 +1,55 @@
+/* $NetBSD: h_vsprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_vsprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $");
+
+#include <stdio.h>
+#include <stdarg.h>
+
+static void wrap(const char *, ...) __printflike(1, 2);
+
+static void
+wrap(const char *fmt, ...)
+{
+	char b[10];
+	va_list ap;
+	va_start(ap, fmt);
+	(void)vsprintf(b, fmt, ap);
+	(void)printf("%s\n", b);
+	va_end(ap);
+}
+
+int
+main(int argc, char *argv[])
+{
+	wrap("%s", argv[1]);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh b/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
new file mode 100755
index 000000000000..0514348fa5cf
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
@@ -0,0 +1,308 @@
+# $NetBSD: t_ssp.sh,v 1.7 2014/04/06 19:28:59 christos Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+h_pass()
+{
+	echo "Executing command [ $2$1 ]"
+	eval $2 atf_check -s exit:0 -o ignore -e ignore $1
+}
+
+h_fail()
+{
+	echo "Executing command [ $2$1 ]"
+	eval $2 atf_check -s signal:6 -o ignore -e ignore $1
+}
+
+atf_test_case sprintf
+sprintf_head()
+{
+	atf_set "descr" "Checks sprintf(3)"
+}
+sprintf_body()
+{
+	prog="$(atf_get_srcdir)/h_sprintf"
+
+	h_pass "$prog ok"
+	h_fail "$prog 0123456789"
+}
+
+atf_test_case vsprintf
+vsprintf_head()
+{
+	atf_set "descr" "Checks vsprintf(3)"
+}
+vsprintf_body()
+{
+	prog="$(atf_get_srcdir)/h_vsprintf"
+
+	h_pass "$prog ok"
+	h_fail "$prog 0123456789"
+}
+
+atf_test_case snprintf
+snprintf_head()
+{
+	atf_set "descr" "Checks snprintf(3)"
+}
+snprintf_body()
+{
+	prog="$(atf_get_srcdir)/h_snprintf"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case vsnprintf
+vsnprintf_head()
+{
+	atf_set "descr" "Checks vsnprintf(3)"
+}
+vsnprintf_body()
+{
+	prog="$(atf_get_srcdir)/h_vsnprintf"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case gets
+gets_head()
+{
+	atf_set "descr" "Checks gets(3)"
+}
+gets_body()
+{
+	prog="$(atf_get_srcdir)/h_gets"
+
+	h_pass "$prog" "echo ok |"
+	h_fail "$prog" "echo 0123456789 |"
+}
+
+atf_test_case fgets
+fgets_head()
+{
+	atf_set "descr" "Checks fgets(3)"
+}
+fgets_body()
+{
+	prog="$(atf_get_srcdir)/h_fgets"
+
+	h_pass "$prog 10" "echo ok |"
+	h_fail "$prog 11" "echo busted |"
+}
+
+atf_test_case memcpy
+memcpy_head()
+{
+	atf_set "descr" "Checks memcpy(3)"
+}
+memcpy_body()
+{
+	prog="$(atf_get_srcdir)/h_memcpy"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case memmove
+memmove_head()
+{
+	atf_set "descr" "Checks memmove(3)"
+}
+memmove_body()
+{
+	prog="$(atf_get_srcdir)/h_memmove"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case memset
+memset_head()
+{
+	atf_set "descr" "Checks memset(3)"
+}
+memset_body()
+{
+	prog="$(atf_get_srcdir)/h_memset"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case strcpy
+strcpy_head()
+{
+	atf_set "descr" "Checks strcpy(3)"
+}
+strcpy_body()
+{
+	prog="$(atf_get_srcdir)/h_strcpy"
+
+	h_pass "$prog 0123456"
+	h_fail "$prog 0123456789"
+}
+
+atf_test_case stpcpy
+stpcpy_head()
+{
+	atf_set "descr" "Checks stpcpy(3)"
+}
+stpcpy_body()
+{
+	prog="$(atf_get_srcdir)/h_stpcpy"
+
+	h_pass "$prog 0123456"
+	h_fail "$prog 0123456789"
+}
+
+atf_test_case strcat
+strcat_head()
+{
+	atf_set "descr" "Checks strcat(3)"
+}
+strcat_body()
+{
+	prog="$(atf_get_srcdir)/h_strcat"
+
+	h_pass "$prog 0123456"
+	h_fail "$prog 0123456789ABCDEF"
+}
+
+atf_test_case strncpy
+strncpy_head()
+{
+	atf_set "descr" "Checks strncpy(3)"
+}
+strncpy_body()
+{
+	prog="$(atf_get_srcdir)/h_strncpy"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case stpncpy
+stpncpy_head()
+{
+	atf_set "descr" "Checks stpncpy(3)"
+}
+stpncpy_body()
+{
+	prog="$(atf_get_srcdir)/h_stpncpy"
+
+	h_pass "$prog 10"
+	h_fail "$prog 11"
+}
+
+atf_test_case strncat
+strncat_head()
+{
+	atf_set "descr" "Checks strncat(3)"
+}
+strncat_body()
+{
+	prog="$(atf_get_srcdir)/h_strncat"
+
+	h_pass "$prog 8"
+	h_fail "$prog 9"
+}
+
+atf_test_case raw
+raw_head()
+{
+	atf_set "descr" "Checks raw array overflow"
+}
+raw_body()
+{
+	prog="$(atf_get_srcdir)/h_raw"
+
+	h_pass "$prog 9"
+	h_fail "$prog 10"
+}
+
+atf_test_case read
+read_head()
+{
+	atf_set "descr" "Checks read(2)"
+}
+read_body()
+{
+	prog="$(atf_get_srcdir)/h_read"
+
+	h_pass "$prog 1024" "echo foo |"
+	h_fail "$prog 1025" "echo bar |"
+}
+
+atf_test_case readlink
+readlink_head()
+{
+	atf_set "descr" "Checks readlink(2)"
+}
+readlink_body()
+{
+	prog="$(atf_get_srcdir)/h_readlink"
+
+	h_pass "$prog 1024"
+	h_fail "$prog 1025"
+}
+
+atf_test_case getcwd
+getcwd_head()
+{
+	atf_set "descr" "Checks getcwd(3)"
+}
+getcwd_body()
+{
+	prog="$(atf_get_srcdir)/h_getcwd"
+
+	h_pass "$prog 1024"
+	h_fail "$prog 1025"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case sprintf
+	atf_add_test_case vsprintf
+	atf_add_test_case snprintf
+	atf_add_test_case vsnprintf
+	atf_add_test_case gets
+	atf_add_test_case fgets
+	atf_add_test_case memcpy
+	atf_add_test_case memmove
+	atf_add_test_case memset
+	atf_add_test_case stpcpy
+	atf_add_test_case stpncpy
+	atf_add_test_case strcat
+	atf_add_test_case strcpy
+	atf_add_test_case strncat
+	atf_add_test_case strncpy
+	atf_add_test_case raw
+	atf_add_test_case read
+	atf_add_test_case readlink
+	atf_add_test_case getcwd
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_clearerr.c b/contrib/netbsd-tests/lib/libc/stdio/t_clearerr.c
new file mode 100644
index 000000000000..251804e31702
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_clearerr.c
@@ -0,0 +1,93 @@
+/* $NetBSD: t_clearerr.c,v 1.1 2011/05/01 16:36:37 jruoho Exp $ */
+
+/*
+ * Copyright (c) 2009, Stathis Kamperis
+ * All rights reserved.
+
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_clearerr.c,v 1.1 2011/05/01 16:36:37 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+
+static const char	path[] = "/etc/passwd";
+
+ATF_TC(clearerr_basic);
+ATF_TC_HEAD(clearerr_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of clearerr(3)");
+}
+
+ATF_TC_BODY(clearerr_basic, tc)
+{
+	char buf[2048];
+	FILE *fp;
+
+	fp = fopen(path, "r");
+	ATF_REQUIRE(fp != NULL);
+
+	while (feof(fp) == 0)
+		(void)fread(buf, sizeof(buf), 1, fp);
+
+	ATF_REQUIRE(feof(fp) != 0);
+
+	errno = 0;
+	clearerr(fp);
+
+	ATF_REQUIRE(errno == 0);
+	ATF_REQUIRE(feof(fp) == 0);
+	ATF_REQUIRE(fclose(fp) != EOF);
+}
+
+ATF_TC(clearerr_err);
+ATF_TC_HEAD(clearerr_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that clearerr(3) does not fail");
+}
+
+ATF_TC_BODY(clearerr_err, tc)
+{
+	FILE *fp;
+
+	fp = fopen(path, "r");
+
+	ATF_REQUIRE(fp != NULL);
+	ATF_REQUIRE(fclose(fp) == 0);
+
+	errno = 0;
+	clearerr(fp);
+
+	ATF_REQUIRE(errno == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, clearerr_basic);
+	ATF_TP_ADD_TC(tp, clearerr_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c b/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c
new file mode 100644
index 000000000000..766070c907fb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c
@@ -0,0 +1,171 @@
+/*	$NetBSD: t_fflush.c,v 1.1 2011/09/11 05:15:55 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fflush.c,v 1.1 2011/09/11 05:15:55 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+static const char *path = "fflush";
+
+ATF_TC_WITH_CLEANUP(fflush_err);
+ATF_TC_HEAD(fflush_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fflush(3)");
+}
+
+ATF_TC_BODY(fflush_err, tc)
+{
+	FILE *f;
+
+	f = fopen(path, "w");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fflush(NULL) == 0);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "r");
+	ATF_REQUIRE(f != NULL);
+
+	/*
+	 * In NetBSD the call should fail if the supplied
+	 * parameteris not an open stream or the stream is
+	 * not open for writing.
+	 */
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fflush(f) == EOF);
+
+	ATF_REQUIRE(fclose(f) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fflush(f) == EOF);
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(fflush_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fflush_seek);
+ATF_TC_HEAD(fflush_seek, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test file offsets with fflush(3)");
+}
+
+ATF_TC_BODY(fflush_seek, tc)
+{
+	char buf[12];
+	int fd = -1;
+	FILE *f;
+
+	/*
+	 * IEEE Std 1003.1-2008:
+	 *
+	 * "For a stream open for reading, if the file
+	 *  is not already at EOF, and the file is one
+	 *  capable of seeking, the file offset of the
+	 *  underlying open file description shall be
+	 *  adjusted so that the next operation on the
+	 *  open file description deals with the byte
+	 *  after the last one read from or written to
+	 *  the stream being flushed."
+	 */
+	f = fopen(path, "w");
+	ATF_REQUIRE(f != NULL);
+
+	ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "r+");
+	ATF_REQUIRE(f != NULL);
+
+	fd = fileno(f);
+	ATF_REQUIRE(fd != -1);
+
+	ATF_REQUIRE(fread(buf, 1, 3, f) == 3);
+	ATF_REQUIRE(fflush(f) == 0);
+	ATF_REQUIRE(fseek(f, 0, SEEK_CUR) == 0);
+
+	/*
+	 * Verify that the offsets are right and that
+	 * a read operation resumes at the correct location.
+	 */
+	ATF_REQUIRE(ftell(f) == 3);
+	ATF_REQUIRE(lseek(fd, 0, SEEK_CUR) == 3);
+	ATF_REQUIRE(fgetc(f) == 'b');
+
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fflush_seek, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fpurge_err);
+ATF_TC_HEAD(fpurge_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fpurge(3)");
+}
+
+ATF_TC_BODY(fpurge_err, tc)
+{
+	FILE *f;
+
+	f = fopen(path, "w");
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fpurge(f) == EOF);
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(fpurge_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fflush_err);
+	ATF_TP_ADD_TC(tp, fflush_seek);
+	ATF_TP_ADD_TC(tp, fpurge_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c b/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c
new file mode 100644
index 000000000000..212c7c86334e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c
@@ -0,0 +1,1166 @@
+/* $NetBSD: t_fmemopen.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */
+
+/*-
+ * Copyright (c)2010 Takehiko NOZAKI,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ */
+
+#if defined(__NetBSD__)
+#include <atf-c.h>
+#else
+#if defined(__linux__)
+#define _GNU_SOURCE
+#include <features.h>
+#endif
+#include <assert.h>
+#include <stdio.h>
+#define ATF_TC(arg0)		static void arg0##_head(void)
+#define ATF_TC_HEAD(arg0, arg1)	static void arg0##_head()
+#define atf_tc_set_md_var(arg0, arg1, ...) do {	\
+	printf(__VA_ARGS__);			\
+	puts("");				\
+} while (/*CONSTCOND*/0)
+#define ATF_TC_BODY(arg0, arg1)	static void arg0##_body()
+#define ATF_CHECK(arg0)		assert(arg0)
+#define ATF_TP_ADD_TCS(arg0)	int main(void)
+#define ATF_TP_ADD_TC(arg0, arg1) arg1##_head(); arg1##_body()
+#define atf_no_error()		0
+#endif
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+const char *mode_rwa[] = {
+    "r", "rb", "r+", "rb+", "r+b",
+    "w", "wb", "w+", "wb+", "w+b",
+    "a", "ab", "a+", "ab+", "a+b",
+    NULL
+};
+
+const char *mode_r[] = { "r", "rb", "r+", "rb+", "r+b", NULL };
+const char *mode_w[] = { "w", "wb", "w+", "wb+", "w+b", NULL };
+const char *mode_a[] = { "a", "ab", "a+", "ab+", "a+b", NULL }; 
+
+struct testcase {
+	const char *s;
+	off_t n;
+} testcases[] = {
+#define TESTSTR(s)	{ s, sizeof(s)-1 }
+	TESTSTR("\0he quick brown fox jumps over the lazy dog"),
+	TESTSTR("T\0e quick brown fox jumps over the lazy dog"),
+	TESTSTR("Th\0 quick brown fox jumps over the lazy dog"),
+	TESTSTR("The\0quick brown fox jumps over the lazy dog"),
+	TESTSTR("The \0uick brown fox jumps over the lazy dog"),
+	TESTSTR("The q\0ick brown fox jumps over the lazy dog"),
+	TESTSTR("The qu\0ck brown fox jumps over the lazy dog"),
+	TESTSTR("The qui\0k brown fox jumps over the lazy dog"),
+	TESTSTR("The quic\0 brown fox jumps over the lazy dog"),
+	TESTSTR("The quick\0brown fox jumps over the lazy dog"),
+	TESTSTR("The quick \0rown fox jumps over the lazy dog"),
+	TESTSTR("The quick b\0own fox jumps over the lazy dog"),
+	TESTSTR("The quick br\0wn fox jumps over the lazy dog"),
+	TESTSTR("The quick bro\0n fox jumps over the lazy dog"),
+	TESTSTR("The quick brow\0 fox jumps over the lazy dog"),
+	TESTSTR("The quick brown\0fox jumps over the lazy dog"),
+	TESTSTR("The quick brown \0ox jumps over the lazy dog"),
+	TESTSTR("The quick brown f\0x jumps over the lazy dog"),
+	TESTSTR("The quick brown fo\0 jumps over the lazy dog"),
+	TESTSTR("The quick brown fox\0jumps over the lazy dog"),
+	TESTSTR("The quick brown fox \0umps over the lazy dog"),
+	TESTSTR("The quick brown fox j\0mps over the lazy dog"),
+	TESTSTR("The quick brown fox ju\0ps over the lazy dog"),
+	TESTSTR("The quick brown fox jum\0s over the lazy dog"),
+	TESTSTR("The quick brown fox jump\0 over the lazy dog"),
+	TESTSTR("The quick brown fox jumps\0over the lazy dog"),
+	TESTSTR("The quick brown fox jumps \0ver the lazy dog"),
+	TESTSTR("The quick brown fox jumps o\0er the lazy dog"),
+	TESTSTR("The quick brown fox jumps ov\0r the lazy dog"),
+	TESTSTR("The quick brown fox jumps ove\0 the lazy dog"),
+	TESTSTR("The quick brown fox jumps over\0the lazy dog"),
+	TESTSTR("The quick brown fox jumps over \0he lazy dog"),
+	TESTSTR("The quick brown fox jumps over t\0e lazy dog"),
+	TESTSTR("The quick brown fox jumps over th\0 lazy dog"),
+	TESTSTR("The quick brown fox jumps over the\0lazy dog"),
+	TESTSTR("The quick brown fox jumps over the \0azy dog"),
+	TESTSTR("The quick brown fox jumps over the l\0zy dog"),
+	TESTSTR("The quick brown fox jumps over the la\0y dog"),
+	TESTSTR("The quick brown fox jumps over the laz\0 dog"),
+	TESTSTR("The quick brown fox jumps over the lazy\0dog"),
+	TESTSTR("The quick brown fox jumps over the lazy \0og"),
+	TESTSTR("The quick brown fox jumps over the lazy d\0g"),
+	TESTSTR("The quick brown fox jumps over the lazy do\0"),
+	TESTSTR("The quick brown fox jumps over the lazy dog"),
+	{ NULL, 0 },
+};
+
+ATF_TC(test00);
+ATF_TC_HEAD(test00, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test00");
+}
+ATF_TC_BODY(test00, tc)
+{
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (p = &mode_rwa[0]; *p != NULL; ++p) {
+		fp = fmemopen(&buf[0], sizeof(buf), *p);
+/*
+ * Upon successful completion, fmemopen() shall return a pointer to the
+ * object controlling the stream.
+ */
+		ATF_CHECK(fp != NULL);
+
+		ATF_CHECK(fclose(fp) == 0);
+	}
+}
+
+ATF_TC(test01);
+ATF_TC_HEAD(test01, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test01");
+}
+ATF_TC_BODY(test01, tc)
+{
+	const char **p;
+	const char *mode[] = {
+	    "r+", "rb+", "r+b",
+	    "w+", "wb+", "w+b",
+	    "a+", "ab+", "a+b",
+	    NULL
+	};
+	FILE *fp;
+
+	for (p = &mode[0]; *p != NULL; ++p) {
+/*
+ * If a null pointer is specified as the buf argument, fmemopen() shall
+ * allocate size bytes of memory as if by a call to malloc().
+ */
+		fp = fmemopen(NULL, BUFSIZ, *p);
+		ATF_CHECK(fp != NULL);
+
+/*
+ * If buf is a null pointer, the initial position shall always be set
+ * to the beginning of the buffer.
+ */
+		ATF_CHECK(ftello(fp) == (off_t)0);
+
+		ATF_CHECK(fclose(fp) == 0);
+	}
+}
+
+ATF_TC(test02);
+ATF_TC_HEAD(test02, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "test02");
+}
+ATF_TC_BODY(test02, tc)
+{
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (p = &mode_r[0]; *p != NULL; ++p) {
+
+		memset(&buf[0], 0x1, sizeof(buf));
+		fp = fmemopen(&buf[0], sizeof(buf), *p);
+		ATF_CHECK(fp != NULL);
+
+/*
+ * This position is initially set to either the beginning of the buffer
+ * (for r and w modes)
+ */
+		ATF_CHECK((unsigned char)buf[0] == 0x1);
+		ATF_CHECK(ftello(fp) == (off_t)0);
+
+/*
+ * The stream also maintains the size of the current buffer contents.
+ * For modes r and r+ the size is set to the value given by the size argument.
+ */
+#if !defined(__GLIBC__)
+		ATF_CHECK(fseeko(fp, (off_t)0, SEEK_END) == 0);
+		ATF_CHECK(ftello(fp) == (off_t)sizeof(buf));
+#endif
+		ATF_CHECK(fclose(fp) == 0);
+	}
+}
+
+ATF_TC(test03);
+ATF_TC_HEAD(test03, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "test03");
+}
+ATF_TC_BODY(test03, tc)
+{
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+ 
+	for (p = &mode_w[0]; *p != NULL; ++p) {
+
+		memset(&buf[0], 0x1, sizeof(buf));
+		fp = fmemopen(&buf[0], sizeof(buf), *p);
+		ATF_CHECK(fp != NULL);
+
+/*
+ * This position is initially set to either the beginning of the buffer
+ * (for r and w modes)
+ */
+		ATF_CHECK(buf[0] == '\0');
+		ATF_CHECK(ftello(fp) == (off_t)0);
+
+/*
+ * For modes w and w+ the initial size is zero
+ */
+		ATF_CHECK(fseeko(fp, (off_t)0, SEEK_END) == 0);
+		ATF_CHECK(ftello(fp) == (off_t)0);
+
+		ATF_CHECK(fclose(fp) == 0);
+	}
+}
+
+ATF_TC(test04);
+ATF_TC_HEAD(test04, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test04");
+}
+ATF_TC_BODY(test04, tc)
+{
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+/*
+ * or to the first null byte in the buffer (for a modes)
+ */
+	for (p = &mode_a[0]; *p != NULL; ++p) {
+
+		memset(&buf[0], 0x1, sizeof(buf));
+		fp = fmemopen(&buf[0], sizeof(buf), *p);
+		ATF_CHECK(fp != NULL);
+
+		ATF_CHECK((unsigned char)buf[0] == 0x1);
+
+/* If no null byte is found in append mode,
+ * the initial position is set to one byte after the end of the buffer.
+ */
+#if !defined(__GLIBC__)
+		ATF_CHECK(ftello(fp) == (off_t)sizeof(buf));
+#endif
+
+/*
+ * and for modes a and a+ the initial size is either the position of the
+ * first null byte in the buffer or the value of the size argument
+ * if no null byte is found.
+ */
+#if !defined(__GLIBC__)
+		ATF_CHECK(fseeko(fp, (off_t)0, SEEK_END) == 0);
+		ATF_CHECK(ftello(fp) == (off_t)sizeof(buf));
+#endif
+
+		ATF_CHECK(fclose(fp) == 0);
+	}
+}
+
+ATF_TC(test05);
+ATF_TC_HEAD(test05, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test05");
+}
+ATF_TC_BODY(test05, tc)
+{
+	const char **p;
+	FILE *fp;
+	char buf[BUFSIZ];
+
+	for (p = &mode_rwa[0]; *p != NULL; ++p) {
+/*
+ * Otherwise, a null pointer shall be returned, and errno shall be set
+ * to indicate the error.
+ */
+		errno = 0;
+		fp = fmemopen(NULL, (size_t)0, *p);
+		ATF_CHECK(fp == NULL);
+		ATF_CHECK(errno == EINVAL);
+
+		errno = 0;
+		fp = fmemopen((void *)&buf[0], 0, *p);
+		ATF_CHECK(fp == NULL);
+		ATF_CHECK(errno == EINVAL);
+	}
+}
+
+ATF_TC(test06);
+ATF_TC_HEAD(test06, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test06");
+}
+ATF_TC_BODY(test06, tc)
+{
+	const char **p;
+	const char *mode[] = { "", " ", "???", NULL };
+	FILE *fp;
+
+	for (p = &mode[0]; *p != NULL; ++p) {
+/*
+ * The value of the mode argument is not valid.
+ */
+		fp = fmemopen(NULL, 1, *p);
+		ATF_CHECK(fp == NULL);
+		ATF_CHECK(errno == EINVAL);
+	}
+}
+
+ATF_TC(test07);
+ATF_TC_HEAD(test07, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test07");
+}
+ATF_TC_BODY(test07, tc)
+{
+#if !defined(__GLIBC__)
+	const char **p;
+	const char *mode[] = {
+	    "r", "rb",
+	    "w", "wb",
+	    "a", "ab",
+	    NULL
+	};
+	FILE *fp;
+
+	for (p = &mode[0]; *p != NULL; ++p) {
+/*
+ * Because this feature is only useful when the stream is opened for updating
+ * (because there is no way to get a pointer to the buffer) the fmemopen()
+ * call may fail if the mode argument does not include a '+' . 
+ */
+		errno = 0;
+		fp = fmemopen(NULL, 1, *p);
+		ATF_CHECK(fp == NULL);
+		ATF_CHECK(errno == EINVAL);
+	}
+#endif
+}
+
+ATF_TC(test08);
+ATF_TC_HEAD(test08, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test08");
+}
+ATF_TC_BODY(test08, tc)
+{
+#if !defined(__GLIBC__)
+	const char **p;
+	const char *mode[] = {
+	    "r+", "rb+", "r+b",
+	    "w+", "wb+", "w+b",
+	    "a+", "ab+", "a+b",
+	    NULL
+	};
+	FILE *fp;
+
+	for (p = &mode[0]; *p != NULL; ++p) {
+/*
+ * The buf argument is a null pointer and the allocation of a buffer of
+ * length size has failed.
+ */
+		fp = fmemopen(NULL, SIZE_MAX, *p);
+		ATF_CHECK(fp == NULL);
+		ATF_CHECK(errno == ENOMEM);
+	}
+#endif
+}
+
+/*
+ * test09 - test14:
+ * An attempt to seek a memory buffer stream to a negative position or to a
+ * position larger than the buffer size given in the size argument shall fail.
+ */
+
+ATF_TC(test09);
+ATF_TC_HEAD(test09, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test09");
+}
+ATF_TC_BODY(test09, tc)
+{
+	struct testcase *t;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+	off_t i;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rwa[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+
+/*
+ * test fmemopen_seek(SEEK_SET)
+ */
+			/* zero */
+			ATF_CHECK(fseeko(fp, (off_t)0, SEEK_SET) == 0);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* positive */
+			for (i = (off_t)1; i <= (off_t)t->n; ++i) {
+				ATF_CHECK(fseeko(fp, i, SEEK_SET) == 0);
+				ATF_CHECK(ftello(fp) == i);
+			}
+			/* positive + OOB */
+			ATF_CHECK(fseeko(fp, t->n + 1, SEEK_SET) == -1);
+			ATF_CHECK(ftello(fp) == t->n);
+
+			/* negative + OOB */
+			ATF_CHECK(fseeko(fp, (off_t)-1, SEEK_SET) == -1);
+			ATF_CHECK(ftello(fp) == t->n);
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+const char *mode_rw[] = {
+    "r", "rb", "r+", "rb+", "r+b",
+    "w", "wb", "w+", "wb+", "w+b",
+    NULL
+};
+
+ATF_TC(test10);
+ATF_TC_HEAD(test10, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test10");
+}
+ATF_TC_BODY(test10, tc)
+{
+	struct testcase *t;
+	off_t i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rw[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+
+/*
+ * test fmemopen_seek(SEEK_CUR)
+ */
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* zero */
+			ATF_CHECK(fseeko(fp, (off_t)0, SEEK_CUR) == 0);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* negative & OOB */
+			ATF_CHECK(fseeko(fp, (off_t)-1, SEEK_CUR) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* positive */
+			for (i = 0; i < (off_t)t->n; ++i) {
+				ATF_CHECK(fseeko(fp, (off_t)1, SEEK_CUR) == 0);
+				ATF_CHECK(ftello(fp) == i + 1);
+			}
+
+			/* positive & OOB */
+			ATF_CHECK(fseeko(fp, (off_t)1, SEEK_CUR) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test11);
+ATF_TC_HEAD(test11, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test11");
+}
+ATF_TC_BODY(test11, tc)
+{
+	struct testcase *t;
+	off_t len, rest, i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	/* test fmemopen_seek(SEEK_CUR) */
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = (off_t)strnlen(t->s, t->n);
+		rest = (off_t)t->n - len;
+		for (p = &mode_a[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_seek(SEEK_CUR)
+ */
+#if defined(__GLIBC__)
+			if (i < (off_t)t->n) {
+#endif
+			/* zero */
+			ATF_CHECK(fseeko(fp, (off_t)0, SEEK_CUR) == 0);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* posive */
+			for (i = (off_t)1; i <= rest; ++i) {
+				ATF_CHECK(fseeko(fp, (off_t)1, SEEK_CUR) == 0);
+				ATF_CHECK(ftello(fp) == len + i);
+			}
+
+			/* positive + OOB */
+			ATF_CHECK(fseeko(fp, (off_t)1, SEEK_CUR) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+
+			/* negative */
+			for (i = (off_t)1; i <= (off_t)t->n; ++i) {
+				ATF_CHECK(fseeko(fp, (off_t)-1, SEEK_CUR) == 0);
+				ATF_CHECK(ftello(fp) == (off_t)t->n - i);
+			}
+
+			/* negative + OOB */
+			ATF_CHECK(fseeko(fp, (off_t)-1, SEEK_CUR) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+#if defined(__GLIBC__)
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test12);
+ATF_TC_HEAD(test12, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test12");
+}
+ATF_TC_BODY(test12, tc)
+{
+	struct testcase *t;
+	off_t len, rest, i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	/* test fmemopen_seek(SEEK_END) */
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = (off_t)strnlen(t->s, t->n);
+		rest = t->n - len;
+		for (p = &mode_r[0]; *p != NULL; ++p) {
+
+			memcpy(buf, t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+
+/*
+ * test fmemopen_seek(SEEK_END)
+ */
+#if !defined(__GLIBC__)
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* zero */
+			ATF_CHECK(fseeko(fp, (off_t)0, SEEK_END) == 0);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* positive + OOB */
+			ATF_CHECK(fseeko(fp, rest + 1, SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* negative + OOB */
+			ATF_CHECK(fseeko(fp, -(len + 1), SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* positive */
+			for (i = 1; i <= rest; ++i) {
+				ATF_CHECK(fseeko(fp, i, SEEK_END) == 0);
+				ATF_CHECK(ftello(fp) == len + i);
+			}
+
+			/* negative */
+			for (i = 1; i < len; ++i) {
+				ATF_CHECK(fseeko(fp, -i, SEEK_END) == 0);
+				ATF_CHECK(ftello(fp) == len - i);
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test13);
+ATF_TC_HEAD(test13, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test13");
+}
+ATF_TC_BODY(test13, tc)
+{
+	struct testcase *t;
+	off_t i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	/* test fmemopen_seek(SEEK_END) */
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_w[0]; *p != NULL; ++p) {
+
+			memcpy(buf, t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_seek(SEEK_END)
+ */
+#if !defined(__GLIBC__)
+			ATF_CHECK(ftello(fp) == (off_t)0);
+			ATF_CHECK(buf[0] == '\0');
+
+			/* zero */
+			ATF_CHECK(fseeko(fp, (off_t)0, SEEK_END) == 0);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* positive + OOB */
+			ATF_CHECK(fseeko(fp, (off_t)t->n + 1, SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* negative + OOB */
+			ATF_CHECK(fseeko(fp, -1, SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == (off_t)0);
+
+			/* positive */
+			for (i = 1; i <= t->n; ++i) {
+				ATF_CHECK(fseeko(fp, i, SEEK_END) == 0);
+				ATF_CHECK(ftello(fp) == i);
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test14);
+ATF_TC_HEAD(test14, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test14");
+}
+ATF_TC_BODY(test14, tc)
+{
+	struct testcase *t;
+	off_t len, rest, i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	/* test fmemopen_seek(SEEK_END) */
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = (off_t)strnlen(t->s, t->n);
+		rest = (off_t)t->n - len;
+		for (p = &mode_a[0]; *p != NULL; ++p) {
+
+			memcpy(buf, t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_seek(SEEK_END)
+ */
+#if !defined(__GLIBC__)
+			ATF_CHECK(ftello(fp) == len);
+
+			/* zero */
+			ATF_CHECK(fseeko(fp, 0, SEEK_END) == 0);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* positive + OOB */
+			ATF_CHECK(fseeko(fp, rest + 1, SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* negative + OOB */
+			ATF_CHECK(fseeko(fp, -(len + 1), SEEK_END) == -1);
+			ATF_CHECK(ftello(fp) == len);
+
+			/* positive */
+			for (i = 1; i <= rest; ++i) {
+				ATF_CHECK(fseeko(fp, i, SEEK_END) == 0);
+				ATF_CHECK(ftello(fp) == len + i);
+			}
+
+			/* negative */
+			for (i = 1; i < len; ++i) {
+				ATF_CHECK(fseeko(fp, -i, SEEK_END) == 0);
+				ATF_CHECK(ftello(fp) == len - i);
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+const char *mode_rw1[] = {
+    "r", "rb", "r+", "rb+", "r+b",
+    "w+", "wb+",
+    NULL
+};
+
+/* test15 - 18:
+ * When a stream open for writing is flushed or closed, a null byte is written
+ * at the current position or at the end of the buffer, depending on the size
+ * of the contents.
+ */
+
+ATF_TC(test15);
+ATF_TC_HEAD(test15, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test15");
+}
+ATF_TC_BODY(test15, tc)
+{
+	struct testcase *t;
+	const char **p;
+	char buf0[BUFSIZ];
+	FILE *fp;
+	int i;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rw1[0]; *p != NULL; ++p) {
+
+			memcpy(&buf0[0], t->s, t->n);
+			fp = fmemopen(&buf0[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_read + fgetc(3)
+ */
+			for (i = 0; i < t->n; ++i) {
+				ATF_CHECK(ftello(fp) == (off_t)i);
+				ATF_CHECK(fgetc(fp) == buf0[i]);
+				ATF_CHECK(feof(fp) == 0);
+				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
+			ATF_CHECK(fgetc(fp) == EOF);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test16);
+ATF_TC_HEAD(test16, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test16");
+}
+ATF_TC_BODY(test16, tc)
+{
+	struct testcase *t;
+	const char **p;
+	char buf0[BUFSIZ], buf1[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rw1[0]; *p != NULL; ++p) {
+
+			memcpy(&buf0[0], t->s, t->n);
+			buf1[t->n] = 0x1;
+			fp = fmemopen(&buf0[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_read + fread(4)
+ */
+			ATF_CHECK(ftello(fp) == (off_t)0);
+			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp) == (size_t)t->n);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(memcmp(&buf0[0], &buf1[0], t->n) == 0);
+			ATF_CHECK((unsigned char)buf1[t->n] == 0x1);
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+const char *mode_a1[] = { "a+", "ab+", NULL };
+
+ATF_TC(test17);
+ATF_TC_HEAD(test17, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test17");
+}
+ATF_TC_BODY(test17, tc)
+{
+	struct testcase *t;
+	size_t len;
+	int i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = strnlen(t->s, t->n);
+		for (p = &mode_a1[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_read + fgetc(3)
+ */
+#if defined(__GLIBC__)
+			if (i < t->n) {
+#endif
+			for (i = len; i < t->n; ++i) {
+				ATF_CHECK(ftello(fp) == (off_t)i);
+				ATF_CHECK(fgetc(fp) == buf[i]);
+				ATF_CHECK(feof(fp) == 0);
+				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
+			ATF_CHECK(fgetc(fp) == EOF);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+			rewind(fp);
+			for (i = 0; i < t->n; ++i) {
+				ATF_CHECK(ftello(fp) == (off_t)i);
+				ATF_CHECK(fgetc(fp) == buf[i]);
+				ATF_CHECK(feof(fp) == 0);
+				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
+			ATF_CHECK(fgetc(fp) == EOF);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+#if defined(__GLIBC__)
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test18);
+ATF_TC_HEAD(test18, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test18");
+}
+ATF_TC_BODY(test18, tc)
+{
+	struct testcase *t;
+	size_t len;
+	const char **p;
+	char buf0[BUFSIZ], buf1[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = strnlen(t->s, t->n);
+		for (p = &mode_a1[0]; *p != NULL; ++p) {
+
+			memcpy(&buf0[0], t->s, t->n);
+			buf1[t->n - len] = 0x1;
+			fp = fmemopen(&buf0[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+/*
+ * test fmemopen_read + fread(3)
+ */
+#if defined(__GLIBC__)
+			if (i < t->n) {
+#endif
+			ATF_CHECK(ftello(fp) == (off_t)len);
+			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp)
+			    == t->n - len);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(!memcmp(&buf0[len], &buf1[0], t->n - len));
+			ATF_CHECK((unsigned char)buf1[t->n - len] == 0x1);
+			rewind(fp);
+			buf1[t->n] = 0x1;
+			ATF_CHECK(ftello(fp) == (off_t)0);
+			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp)
+			    == (size_t)t->n);
+			ATF_CHECK(feof(fp) != 0);
+			ATF_CHECK(!memcmp(&buf0[0], &buf1[0], t->n));
+			ATF_CHECK((unsigned char)buf1[t->n] == 0x1);
+#if defined(__GLIBC__)
+			}
+#endif
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+/*
+ * test19 - test22:
+ * If a stream open for update is flushed or closed and the last write has
+ * advanced the current buffer size, a null byte is written at the end of the
+ * buffer if it fits.
+ */
+
+const char *mode_rw2[] = {
+    "r+", "rb+", "r+b",
+    "w", "wb", "w+", "wb+", "w+b",
+    NULL
+};
+
+ATF_TC(test19);
+ATF_TC_HEAD(test19, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test19");
+}
+ATF_TC_BODY(test19, tc)
+{
+	struct testcase *t;
+	int i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rw2[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			buf[t->n] = 0x1;
+			fp = fmemopen(&buf[0], t->n + 1, *p);
+			ATF_CHECK(fp != NULL);
+			setbuf(fp, NULL);
+/*
+ * test fmemopen_write + fputc(3)
+ */
+			for (i = 0; i < t->n; ++i) {
+				ATF_CHECK(ftello(fp) == (off_t)i);
+				ATF_CHECK(fputc(t->s[i], fp) == t->s[i]);
+				ATF_CHECK(buf[i] == t->s[i]);
+				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+				ATF_CHECK(buf[i] == t->s[i]);
+#if !defined(__GLIBC__)
+				ATF_CHECK(buf[i + 1] == '\0');
+#endif
+			}
+
+/* don't accept non nul character at end of buffer */
+			ATF_CHECK(fputc(0x1, fp) == EOF);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+			ATF_CHECK(feof(fp) == 0);
+
+/* accept nul character at end of buffer */
+			ATF_CHECK(fputc('\0', fp) == '\0');
+			ATF_CHECK(ftello(fp) == (off_t)t->n + 1);
+			ATF_CHECK(feof(fp) == 0);
+
+/* reach EOF */
+			ATF_CHECK(fputc('\0', fp) == EOF);
+			ATF_CHECK(ftello(fp) == (off_t)t->n + 1);
+
+			/* compare */
+			ATF_CHECK(memcmp(&buf[0], t->s, t->n) == 0);
+			ATF_CHECK(buf[t->n] == '\0');
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test20);
+ATF_TC_HEAD(test20, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test20");
+}
+ATF_TC_BODY(test20, tc)
+{
+	struct testcase *t;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		for (p = &mode_rw2[0]; *p != NULL; ++p) {
+
+			memcpy(&buf[0], t->s, t->n);
+			buf[t->n] = 0x1;
+			fp = fmemopen(&buf[0], t->n + 1, *p);
+			ATF_CHECK(fp != NULL);
+			setbuf(fp, NULL);
+			ATF_CHECK(fwrite(t->s, 1, t->n, fp) == (size_t)t->n);
+/*
+ * test fmemopen_write + fwrite(3)
+ */
+#if !defined(__GLIBC__)
+			ATF_CHECK(buf[t->n] == '\0');
+
+/* don't accept non nul character at end of buffer */
+			ATF_CHECK(fwrite("\x1", 1, 1, fp) == 0);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+			ATF_CHECK(feof(fp) == 0);
+#endif
+
+/* accept nul character at end of buffer */
+			ATF_CHECK(fwrite("\x0", 1, 1, fp) == 1);
+			ATF_CHECK(ftello(fp) == (off_t)t->n + 1);
+			ATF_CHECK(feof(fp) == 0);
+
+/* reach EOF */
+			ATF_CHECK(fputc('\0', fp) == EOF);
+			ATF_CHECK(ftello(fp) == (off_t)t->n + 1);
+
+/* compare */
+			ATF_CHECK(memcmp(&buf[0], t->s, t->n) == 0);
+			ATF_CHECK(buf[t->n] == '\0');
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test21);
+ATF_TC_HEAD(test21, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test21");
+}
+ATF_TC_BODY(test21, tc)
+{
+	struct testcase *t;
+	int len, i;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t = &testcases[0]; t->s != NULL; ++t) {
+		len = strnlen(t->s, t->n);
+		for (p = &mode_a[0]; *p != NULL; ++p) {
+			memcpy(&buf[0], t->s, t->n);
+			fp = fmemopen(&buf[0], t->n, *p);
+			ATF_CHECK(fp != NULL);
+			setbuf(fp, NULL);
+/*
+ * test fmemopen_write + fputc(3)
+ */
+			if (len < t->n) {
+				for (i = len; i < t->n - 1; ++i) {
+					ATF_CHECK(ftello(fp) == (off_t)i);
+					ATF_CHECK(fputc(t->s[i - len], fp)
+					    == t->s[i - len]);
+					ATF_CHECK(buf[i] == t->s[i - len]);
+					ATF_CHECK(ftello(fp) == (off_t)i + 1);
+#if !defined(__GLIBC__)
+					ATF_CHECK(buf[i + 1] == '\0');
+#endif
+				}
+
+/* don't accept non nul character at end of buffer */
+				ATF_CHECK(ftello(fp) == (off_t)t->n - 1);
+				ATF_CHECK(fputc(0x1, fp) == EOF);
+				ATF_CHECK(ftello(fp) == (off_t)t->n - 1);
+
+/* accept nul character at end of buffer */
+				ATF_CHECK(ftello(fp) == (off_t)t->n - 1);
+				ATF_CHECK(fputc('\0', fp) == '\0');
+				ATF_CHECK(ftello(fp) == (off_t)t->n);
+			}
+
+/* reach EOF */
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+			ATF_CHECK(fputc('\0', fp) == EOF);
+			ATF_CHECK(ftello(fp) == (off_t)t->n);
+
+			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
+
+ATF_TC(test22);
+ATF_TC_HEAD(test22, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "test22");
+}
+ATF_TC_BODY(test22, tc)
+{
+	struct testcase *t0, *t1;
+	size_t len0, len1, nleft;
+	const char **p;
+	char buf[BUFSIZ];
+	FILE *fp;
+
+	for (t0 = &testcases[0]; t0->s != NULL; ++t0) {
+		len0 = strnlen(t0->s, t0->n);
+		for (t1 = &testcases[0]; t1->s != NULL; ++t1) {
+			len1 = strnlen(t1->s, t1->n);
+			for (p = &mode_a[0]; *p != NULL; ++p) {
+
+				memcpy(&buf[0], t0->s, t0->n);
+				fp = fmemopen(&buf[0], t0->n, *p);
+				ATF_CHECK(fp != NULL);
+				setbuf(fp, NULL);
+/*
+ * test fmemopen_write + fwrite(3)
+ */
+				nleft = t0->n - len0;
+#if !defined(__GLIBC__)
+				if (nleft == 0 || len1 == nleft - 1) {
+					ATF_CHECK(fwrite(t1->s, 1, t1->n, fp)
+					    == nleft);
+					ATF_CHECK(ftell(fp) == t1->n);
+				} else {
+					ATF_CHECK(fwrite(t1->s, 1, t1->n, fp)
+					    == nleft - 1);
+					ATF_CHECK(ftell(fp) == t1->n - 1);
+				}
+#endif
+				ATF_CHECK(fclose(fp) == 0);
+			}
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, test00);
+	ATF_TP_ADD_TC(tp, test01);
+	ATF_TP_ADD_TC(tp, test02);
+	ATF_TP_ADD_TC(tp, test03);
+	ATF_TP_ADD_TC(tp, test04);
+	ATF_TP_ADD_TC(tp, test05);
+	ATF_TP_ADD_TC(tp, test06);
+	ATF_TP_ADD_TC(tp, test07);
+	ATF_TP_ADD_TC(tp, test08);
+	ATF_TP_ADD_TC(tp, test09);
+	ATF_TP_ADD_TC(tp, test10);
+	ATF_TP_ADD_TC(tp, test11);
+	ATF_TP_ADD_TC(tp, test12);
+	ATF_TP_ADD_TC(tp, test13);
+	ATF_TP_ADD_TC(tp, test14);
+	ATF_TP_ADD_TC(tp, test15);
+	ATF_TP_ADD_TC(tp, test16);
+	ATF_TP_ADD_TC(tp, test17);
+	ATF_TP_ADD_TC(tp, test18);
+	ATF_TP_ADD_TC(tp, test19);
+	ATF_TP_ADD_TC(tp, test20);
+	ATF_TP_ADD_TC(tp, test21);
+	ATF_TP_ADD_TC(tp, test22);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c b/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c
new file mode 100644
index 000000000000..c5b89215430f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c
@@ -0,0 +1,442 @@
+/*	$NetBSD: t_fopen.c,v 1.3 2011/09/14 14:34:37 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fopen.c,v 1.3 2011/09/14 14:34:37 martin Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char *path = "fopen";
+
+ATF_TC_WITH_CLEANUP(fdopen_close);
+ATF_TC_HEAD(fdopen_close, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that descriptors are closed");
+}
+
+ATF_TC_BODY(fdopen_close, tc)
+{
+	FILE *f;
+	int fd;
+
+	/*
+	 * Check that the file descriptor
+	 * used to fdopen(3) a stream is
+	 * closed once the stream is closed.
+	 */
+	fd = open(path, O_RDWR | O_CREAT);
+
+	ATF_REQUIRE(fd >= 0);
+
+	f = fdopen(fd, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(close(fd) == -1);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fdopen_close, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fdopen_err);
+ATF_TC_HEAD(fdopen_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fdopen(3)");
+}
+
+ATF_TC_BODY(fdopen_err, tc)
+{
+	int fd;
+
+	fd = open(path, O_RDONLY | O_CREAT);
+	ATF_REQUIRE(fd >= 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, fdopen(fd, "w") == NULL);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, fdopen(fd, "a") == NULL);
+
+	ATF_REQUIRE(close(fd) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fdopen(fd, "r") == NULL);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fdopen(-1, "w+") == NULL);
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(fdopen_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fdopen_seek);
+ATF_TC_HEAD(fdopen_seek, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test stream position with fdopen(3)");
+}
+
+ATF_TC_BODY(fdopen_seek, tc)
+{
+	FILE *f;
+	int fd;
+
+	/*
+	 * Verify that the file position associated
+	 * with the stream corresponds with the offset
+	 * set earlier for the file descriptor.
+	 */
+	fd = open(path, O_RDWR | O_CREAT);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(write(fd, "garbage", 7) == 7);
+	ATF_REQUIRE(lseek(fd, 3, SEEK_SET) == 3);
+
+	f = fdopen(fd, "r+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(ftell(f) == 3);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fdopen_seek, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fopen_err);
+ATF_TC_HEAD(fopen_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fopen(3)");
+}
+
+ATF_TC_BODY(fopen_err, tc)
+{
+	static const char *mode[] = {
+		"x", "xr", "xr", "+r+", "R", "W+", " aXX", "Xr", " r+", "" };
+
+	char buf[PATH_MAX + 1];
+	size_t i;
+	FILE *f;
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	/*
+	 * Note that also "invalid" characters
+	 * may follow the mode-string whenever
+	 * the first character is valid.
+	 */
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		errno = 0;
+		f = fopen(path, mode[i]);
+
+		if (f == NULL && errno == EINVAL)
+			continue;
+
+		if (f != NULL)
+			(void)fclose(f);
+
+		atf_tc_fail_nonfatal("opened file as '%s'",  mode[i]);
+	}
+
+	(void)unlink(path);
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EISDIR, fopen("/usr/bin", "w") == NULL);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, fopen("/a/b/c/d/e/f", "r") == NULL);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, fopen(buf, "r+") == NULL);
+}
+
+ATF_TC_CLEANUP(fopen_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fopen_append);
+ATF_TC_HEAD(fopen_append, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that append-mode works");
+}
+
+ATF_TC_BODY(fopen_append, tc)
+{
+	char buf[15];
+	FILE *f;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "a");
+
+	ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "r");
+
+	ATF_REQUIRE(fread(buf, 1, sizeof(buf), f) == 14);
+	ATF_REQUIRE(strncmp(buf, "garbagegarbage", 14) == 0);
+
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fopen_append, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fopen_mode);
+ATF_TC_HEAD(fopen_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test fopen(3) modes");
+}
+
+ATF_TC_BODY(fopen_mode, tc)
+{
+	size_t i;
+	FILE *f;
+
+	static const char *mode[] = {
+		"r", "r+", "w", "w+", "a", "a+",
+		"rb", "r+b", "wb", "w+b", "ab", "a+b"
+		"re", "r+e", "we", "w+e", "ae", "a+e"
+		"rf", "r+f", "wf", "w+f", "af", "a+f"
+	};
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	/*
+	 * Verify that various modes work.
+	 */
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		f = fopen(path, mode[i]);
+
+		if (f != NULL) {
+			ATF_REQUIRE(fclose(f) == 0);
+			continue;
+		}
+
+		atf_tc_fail_nonfatal("failed to open file as %s",  mode[i]);
+	}
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(fopen_mode, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(fopen_perm);
+ATF_TC_HEAD(fopen_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with fopen(3)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(fopen_perm, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, fopen("/bin/ls", "a+") == NULL);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, fopen("/bin/ls", "w+") == NULL);
+}
+
+ATF_TC(fopen_regular);
+ATF_TC_HEAD(fopen_regular, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test fopen(3) with 'f' mode");
+}
+
+ATF_TC_BODY(fopen_regular, tc)
+{
+	static const char *mode[] = { "rf", "r+f", "wf", "w+f", "af", "a+f" };
+	static const char *devs[] = { _PATH_DEVNULL };
+
+	size_t i, j;
+	FILE *f;
+
+	for (i = 0; i < __arraycount(devs); i++) {
+
+		for (j = 0; j < __arraycount(mode); j++) {
+
+			errno = 0;
+			f = fopen(devs[i], mode[j]);
+
+			if (f == NULL && errno == EFTYPE)
+				continue;
+
+			if (f != NULL)
+				(void)fclose(f);
+
+			atf_tc_fail_nonfatal("opened %s as %s",
+			    devs[i], mode[j]);
+		}
+	}
+}
+
+ATF_TC_WITH_CLEANUP(fopen_seek);
+ATF_TC_HEAD(fopen_seek, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test initial stream position");
+}
+
+ATF_TC_BODY(fopen_seek, tc)
+{
+	FILE *f;
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	/*
+	 * The position of the stream should be
+	 * at the start, except for append-mode.
+	 */
+	f = fopen(path, "r");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(ftello(f) == 0);
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "a");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(ftello(f) == 7);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fopen_seek, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(freopen_std);
+ATF_TC_HEAD(freopen_std, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of freopen(3)");
+}
+
+ATF_TC_BODY(freopen_std, tc)
+{
+	FILE *std[2] = { stdin, stdout };
+	char buf[15];
+	size_t i;
+	FILE *f;
+
+	/*
+	 * Associate a standard stream with a custom stream.
+	 * Then write to the standard stream and verify that
+	 * the result now appears in the custom stream.
+	 */
+	for (i = 0; i < __arraycount(std); i++) {
+
+		(void)memset(buf, 'x', sizeof(buf));
+
+		f = fopen(path, "w+");
+		ATF_REQUIRE(f != NULL);
+
+		f = freopen(path, "w+", std[i]);
+		ATF_REQUIRE(f != NULL);
+
+		ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
+		ATF_REQUIRE(fprintf(std[i], "garbage") == 7);
+		ATF_REQUIRE(fclose(f) == 0);
+
+		f = fopen(path, "r");
+
+		ATF_REQUIRE(f != NULL);
+		ATF_REQUIRE(fread(buf, 1, sizeof(buf), f) == 14);
+		ATF_REQUIRE(strncmp(buf, "garbagegarbage", 14) == 0);
+
+		ATF_REQUIRE(fclose(f) == 0);
+	}
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(freopen_std, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fdopen_close);
+	ATF_TP_ADD_TC(tp, fdopen_err);
+	ATF_TP_ADD_TC(tp, fdopen_seek);
+	ATF_TP_ADD_TC(tp, fopen_append);
+	ATF_TP_ADD_TC(tp, fopen_err);
+	ATF_TP_ADD_TC(tp, fopen_mode);
+	ATF_TP_ADD_TC(tp, fopen_perm);
+	ATF_TP_ADD_TC(tp, fopen_regular);
+	ATF_TP_ADD_TC(tp, fopen_seek);
+	ATF_TP_ADD_TC(tp, freopen_std);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_fputc.c b/contrib/netbsd-tests/lib/libc/stdio/t_fputc.c
new file mode 100644
index 000000000000..ed7c0dc355a0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_fputc.c
@@ -0,0 +1,194 @@
+/*	$NetBSD: t_fputc.c,v 1.1 2011/09/11 09:02:46 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fputc.c,v 1.1 2011/09/11 09:02:46 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char	*path = "fputc";
+static void		 puterr(int (*)(int, FILE *));
+static void		 putstr(int (*)(int, FILE *));
+
+static void
+puterr(int (*func)(int, FILE *))
+{
+	FILE *f;
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(func('x', f) == EOF);
+}
+
+static void
+putstr(int (*func)(int, FILE *))
+{
+	const char *str = "1234567890x";
+	unsigned short i = 0;
+	char buf[10];
+	FILE *f;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	f = fopen(path, "w+");
+	ATF_REQUIRE(f != NULL);
+
+	while (str[i] != 'x') {
+		ATF_REQUIRE(func(str[i], f) == str[i]);
+		i++;
+	}
+
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "r");
+	ATF_REQUIRE(f != NULL);
+
+	ATF_REQUIRE(fread(buf, 1, 10, f) == 10);
+	ATF_REQUIRE(strncmp(buf, str, 10) == 0);
+
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_WITH_CLEANUP(fputc_basic);
+ATF_TC_HEAD(fputc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fputc(3)");
+}
+
+ATF_TC_BODY(fputc_basic, tc)
+{
+	putstr(fputc);
+}
+
+ATF_TC_CLEANUP(fputc_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fputc_err);
+ATF_TC_HEAD(fputc_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fputc(3)");
+}
+
+ATF_TC_BODY(fputc_err, tc)
+{
+	puterr(fputc);
+}
+
+ATF_TC_CLEANUP(fputc_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_basic);
+ATF_TC_HEAD(putc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of putc(3)");
+}
+
+ATF_TC_BODY(putc_basic, tc)
+{
+	putstr(putc);
+}
+
+ATF_TC_CLEANUP(putc_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_err);
+ATF_TC_HEAD(putc_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from putc(3)");
+}
+
+ATF_TC_BODY(putc_err, tc)
+{
+	puterr(putc);
+}
+
+ATF_TC_CLEANUP(putc_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_unlocked_basic);
+ATF_TC_HEAD(putc_unlocked_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of putc_unlocked(3)");
+}
+
+ATF_TC_BODY(putc_unlocked_basic, tc)
+{
+	putstr(putc_unlocked);
+}
+
+ATF_TC_CLEANUP(putc_unlocked_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_unlocked_err);
+ATF_TC_HEAD(putc_unlocked_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from putc_unlocked(3)");
+}
+
+ATF_TC_BODY(putc_unlocked_err, tc)
+{
+	puterr(putc_unlocked);
+}
+
+ATF_TC_CLEANUP(putc_unlocked_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fputc_basic);
+	ATF_TP_ADD_TC(tp, fputc_err);
+	ATF_TP_ADD_TC(tp, putc_basic);
+	ATF_TP_ADD_TC(tp, putc_err);
+	ATF_TP_ADD_TC(tp, putc_unlocked_basic);
+	ATF_TP_ADD_TC(tp, putc_unlocked_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_mktemp.c b/contrib/netbsd-tests/lib/libc/stdio/t_mktemp.c
new file mode 100644
index 000000000000..e423060e065b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_mktemp.c
@@ -0,0 +1,54 @@
+/* $NetBSD: t_mktemp.c,v 1.1 2013/04/22 21:05:12 christos Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mktemp.c,v 1.1 2013/04/22 21:05:12 christos Exp $");
+
+#include <atf-c.h>
+#include <stdlib.h>
+
+ATF_TC(mktemp_not_exist);
+ATF_TC_HEAD(mktemp_not_exist, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that mktemp does not fail on"
+	    " a path that does not exist");
+}
+
+ATF_TC_BODY(mktemp_not_exist, tc)
+{
+	char template[] = "I will barf/XXXXXX";
+	ATF_REQUIRE(mktemp(template) != NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mktemp_not_exist);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_popen.c b/contrib/netbsd-tests/lib/libc/stdio/t_popen.c
new file mode 100644
index 000000000000..699498c09fcc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_popen.c
@@ -0,0 +1,135 @@
+/*	$NetBSD: t_popen.c,v 1.4 2013/02/15 23:27:19 christos Exp $ */
+
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1999\
+ The NetBSD Foundation, Inc.  All rights reserved.");
+#endif /* not lint */
+
+#ifndef lint
+__RCSID("$NetBSD: t_popen.c,v 1.4 2013/02/15 23:27:19 christos Exp $");
+#endif /* not lint */
+
+#include <atf-c.h>
+
+#include <sys/param.h>
+
+#include <errno.h>
+#include <err.h>
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+#define _PATH_CAT	"/bin/cat"
+#define BUFSIZE		(640*1024)
+			/* 640KB ought to be enough for everyone. */
+#define DATAFILE	"popen.data"
+
+#define TEST_ERROR(a)						\
+	do							\
+	{							\
+		warn(a);					\
+		atf_tc_fail("Check stderr for error details.");	\
+	} while ( /*CONSTCOND*/ 0 )
+
+ATF_TC_WITH_CLEANUP(popen_zeropad);
+ATF_TC_HEAD(popen_zeropad, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "output format zero padding");
+}
+
+ATF_TC_BODY(popen_zeropad, tc)
+{
+	char *buffer, command[MAXPATHLEN];
+	int idx, in;
+	FILE *my_pipe;
+
+	if ((buffer = malloc(BUFSIZE)) == NULL)
+		atf_tc_skip("Unable to allocate buffer.");
+
+	srand ((unsigned int)time(NULL));
+
+	for (idx = 0; idx < BUFSIZE; idx++)
+		buffer[idx]=(char)rand();
+
+	(void)snprintf(command, sizeof(command), "%s >%s",
+	    _PATH_CAT, DATAFILE);
+
+	if ((my_pipe = popen(command, "w")) == NULL)
+		TEST_ERROR("popen write");
+
+	if (fwrite(buffer, sizeof(char), BUFSIZE, my_pipe) != BUFSIZE)
+		TEST_ERROR("fwrite");
+
+	if (pclose(my_pipe) == -1)
+		TEST_ERROR("pclose");
+
+	(void)snprintf(command, sizeof(command), "%s %s", _PATH_CAT, DATAFILE);
+
+	if ((my_pipe = popen(command, "r")) == NULL)
+		TEST_ERROR("popen read");
+
+	idx = 0;
+	while ((in = fgetc(my_pipe)) != EOF)
+		if (idx == BUFSIZE) {
+			errno = EFBIG;
+			TEST_ERROR("read");
+		}
+		else if ((char)in != buffer[idx++]) {
+		    	errno = EINVAL;
+			TEST_ERROR("read");
+		}
+
+	if (idx < BUFSIZE) {
+		errno = EIO;
+		TEST_ERROR("read");
+	}
+
+	if (pclose(my_pipe) == -1)
+		TEST_ERROR("pclose");
+}
+
+ATF_TC_CLEANUP(popen_zeropad, tc)
+{
+	(void)unlink(DATAFILE);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, popen_zeropad);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_printf.c b/contrib/netbsd-tests/lib/libc/stdio/t_printf.c
new file mode 100644
index 000000000000..95b4b2c9dffe
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_printf.c
@@ -0,0 +1,194 @@
+/* $NetBSD: t_printf.c,v 1.8 2012/04/11 16:21:42 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <atf-c.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+
+ATF_TC(snprintf_c99);
+ATF_TC_HEAD(snprintf_c99, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Test printf(3) C99 conformance (PR lib/22019)");
+}
+
+ATF_TC_BODY(snprintf_c99, tc)
+{
+	char s[4];
+
+	(void)memset(s, '\0', sizeof(s));
+	(void)snprintf(s, sizeof(s), "%#.o", 0);
+	(void)printf("printf = %#.o\n", 0);
+	(void)fprintf(stderr, "snprintf = %s", s);
+
+	ATF_REQUIRE(strlen(s) == 1);
+	ATF_REQUIRE(s[0] == '0');
+}
+
+ATF_TC(snprintf_dotzero);
+ATF_TC_HEAD(snprintf_dotzero, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "PR lib/32951: %%.0f formats (0.0,0.5] to \"0.\"");
+}
+
+ATF_TC_BODY(snprintf_dotzero, tc)
+{
+	char s[4];
+
+	ATF_CHECK(snprintf(s, sizeof(s), "%.0f", 0.1) == 1);
+	ATF_REQUIRE_STREQ(s, "0");
+}
+
+ATF_TC(snprintf_posarg);
+ATF_TC_HEAD(snprintf_posarg, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test for positional arguments");
+}
+
+ATF_TC_BODY(snprintf_posarg, tc)
+{
+	char s[16];
+
+	ATF_CHECK(snprintf(s, sizeof(s), "%1$d", -23) == 3);
+	ATF_REQUIRE_STREQ(s, "-23");
+}
+
+ATF_TC(snprintf_posarg_width);
+ATF_TC_HEAD(snprintf_posarg_width, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test for positional arguments with "
+	    "field width");
+}
+
+ATF_TC_BODY(snprintf_posarg_width, tc)
+{
+	char s[16];
+
+	ATF_CHECK(snprintf(s, sizeof(s), "%1$*2$d", -23, 4) == 4);
+	ATF_REQUIRE_STREQ(s, " -23");
+}
+
+ATF_TC(snprintf_posarg_error);
+ATF_TC_HEAD(snprintf_posarg_error, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test for positional arguments out "
+	    "of bounds");
+}
+
+ATF_TC_BODY(snprintf_posarg_error, tc)
+{
+	char s[16], fmt[32];
+
+	snprintf(fmt, sizeof(fmt), "%%%zu$d", SIZE_MAX / sizeof(size_t));
+
+	ATF_CHECK(snprintf(s, sizeof(s), fmt, -23) == -1);
+}
+
+ATF_TC(snprintf_float);
+ATF_TC_HEAD(snprintf_float, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test that floating conversions don't"
+	    " leak memory");
+}
+
+ATF_TC_BODY(snprintf_float, tc)
+{
+	union {
+		double d;
+		uint64_t bits;
+	} u;
+	uint32_t ul, uh;
+	time_t now;
+	char buf[1000];
+	struct rlimit rl;
+
+	rl.rlim_cur = rl.rlim_max = 1 * 1024 * 1024;
+	ATF_CHECK(setrlimit(RLIMIT_AS, &rl) != -1);
+	rl.rlim_cur = rl.rlim_max = 1 * 1024 * 1024;
+	ATF_CHECK(setrlimit(RLIMIT_DATA, &rl) != -1);
+
+	time(&now);
+	srand(now);
+	for (size_t i = 0; i < 10000; i++) {
+		ul = rand();
+		uh = rand();
+		u.bits = (uint64_t)uh << 32 | ul;
+		ATF_CHECK(snprintf(buf, sizeof buf, " %.2f", u.d) != -1);
+	}
+}
+
+ATF_TC(sprintf_zeropad);
+ATF_TC_HEAD(sprintf_zeropad, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test output format zero padding (PR lib/44113)");
+}
+
+ATF_TC_BODY(sprintf_zeropad, tc)
+{
+	char str[1024];
+
+	ATF_CHECK(sprintf(str, "%010f", 0.0) == 10);
+	ATF_REQUIRE_STREQ(str, "000.000000");
+
+	/* ieeefp */
+#ifndef __vax__
+	/* printf(3) should ignore zero padding for nan/inf */
+	ATF_CHECK(sprintf(str, "%010f", NAN) == 10);
+	ATF_REQUIRE_STREQ(str, "       nan");
+	ATF_CHECK(sprintf(str, "%010f", INFINITY) == 10);
+	ATF_REQUIRE_STREQ(str, "       inf");
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, snprintf_c99);
+	ATF_TP_ADD_TC(tp, snprintf_dotzero);
+	ATF_TP_ADD_TC(tp, snprintf_posarg);
+	ATF_TP_ADD_TC(tp, snprintf_posarg_width);
+	ATF_TP_ADD_TC(tp, snprintf_posarg_error);
+	ATF_TP_ADD_TC(tp, snprintf_float);
+	ATF_TP_ADD_TC(tp, sprintf_zeropad);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c b/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c
new file mode 100644
index 000000000000..fea35a7056c1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c
@@ -0,0 +1,81 @@
+/* $NetBSD: t_scanf.c,v 1.3 2012/03/18 07:00:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#define NUM     -0x1234
+#define STRNUM  ___STRING(NUM)
+
+ATF_TC(sscanf_neghex);
+ATF_TC_HEAD(sscanf_neghex, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "PR lib/21691: %%i and %%x fail with negative hex numbers");
+}
+
+ATF_TC_BODY(sscanf_neghex, tc)
+{
+        int i;
+
+        sscanf(STRNUM, "%i", &i);
+	ATF_REQUIRE(i == NUM);
+
+        sscanf(STRNUM, "%x", &i);
+	ATF_REQUIRE(i == NUM);
+}
+
+ATF_TC(sscanf_whitespace);
+ATF_TC_HEAD(sscanf_whitespace, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "verify sscanf skips all whitespace");
+}
+
+ATF_TC_BODY(sscanf_whitespace, tc)
+{
+	const char str[] = "\f\n\r\t\v%z";
+	char c;
+
+        /* set of "white space" symbols from isspace(3) */
+        c = 0;
+        (void)sscanf(str, "%%%c", &c);
+	ATF_REQUIRE(c == 'z');
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sscanf_neghex);
+	ATF_TP_ADD_TC(tp, sscanf_whitespace);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c b/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c
new file mode 100644
index 000000000000..b2f91c4c5fe2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c
@@ -0,0 +1,178 @@
+/* $NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+extern int __cxa_atexit(void (*func)(void *), void *, void *);
+extern void __cxa_finalize(void *);
+
+static int dso_handle_1;
+static int dso_handle_2;
+static int dso_handle_3;
+
+static int arg_1;
+static int arg_2;
+static int arg_3;
+
+static int exiting_state;
+
+#define	ASSERT(expr)							\
+do {									\
+	if ((expr) == 0) {						\
+		write(STDERR_FILENO, __func__, strlen(__func__));	\
+		write(STDERR_FILENO, ": ", 2);				\
+		write(STDERR_FILENO, __STRING(expr),			\
+		      strlen(__STRING(expr)));				\
+		write(STDERR_FILENO, "\n", 1);				\
+		my_abort();						\
+	}								\
+} while (/*CONSTCOND*/0)
+
+#define	SUCCESS()							\
+do {									\
+	write(STDOUT_FILENO, __func__, strlen(__func__));		\
+	write(STDOUT_FILENO, "\n", 1);					\
+} while (/*CONSTCOND*/0)
+
+static void
+my_abort(void)
+{
+
+	kill(getpid(), SIGABRT);
+	/* NOTREACHED */
+}
+
+static void
+cxa_handler_5(void *arg)
+{
+	static int cxa_handler_5_called;
+
+	ASSERT(arg == (void *)&arg_1);
+	ASSERT(cxa_handler_5_called == 0);
+	ASSERT(exiting_state == 5);
+
+	exiting_state--;
+	cxa_handler_5_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_4(void *arg)
+{
+	static int cxa_handler_4_called;
+
+	ASSERT(arg == (void *)&arg_1);
+	ASSERT(cxa_handler_4_called == 0);
+	ASSERT(exiting_state == 4);
+
+	exiting_state--;
+	cxa_handler_4_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_3(void *arg)
+{
+	static int cxa_handler_3_called;
+
+	ASSERT(arg == (void *)&arg_2);
+	ASSERT(cxa_handler_3_called == 0);
+	ASSERT(exiting_state == 3);
+
+	exiting_state--;
+	cxa_handler_3_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_2(void *arg)
+{
+	static int cxa_handler_2_called;
+
+	ASSERT(arg == (void *)&arg_3);
+	ASSERT(cxa_handler_2_called == 0);
+	ASSERT(exiting_state == 2);
+
+	exiting_state--;
+	cxa_handler_2_called = 1;
+	SUCCESS();
+}
+
+static void
+normal_handler_1(void)
+{
+	static int normal_handler_1_called;
+
+	ASSERT(normal_handler_1_called == 0);
+	ASSERT(exiting_state == 1);
+
+	exiting_state--;
+	normal_handler_1_called = 1;
+	SUCCESS();
+}
+
+static void
+normal_handler_0(void)
+{
+	static int normal_handler_0_called;
+
+	ASSERT(normal_handler_0_called == 0);
+	ASSERT(exiting_state == 0);
+
+	normal_handler_0_called = 1;
+	SUCCESS();
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	exiting_state = 5;
+
+	ASSERT(0 == atexit(normal_handler_0));
+	ASSERT(0 == atexit(normal_handler_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, &dso_handle_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, &dso_handle_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, &dso_handle_2));
+	ASSERT(0 == __cxa_atexit(cxa_handler_2, &arg_3, &dso_handle_3));
+
+	__cxa_finalize(&dso_handle_1);
+	__cxa_finalize(&dso_handle_2);
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c b/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c
new file mode 100644
index 000000000000..074e4ddf3b2d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c
@@ -0,0 +1,127 @@
+/*	$NetBSD: h_getopt.c,v 1.1 2011/01/01 23:56:49 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <err.h>
+
+#define	WS	"\t\n "
+#define	debug	0
+
+int
+main(int argc, char *argv[])
+{
+	size_t len, lineno = 0;
+	char *line, *ptr, *optstring = NULL, *result = NULL;
+	char buf[1024];
+	char *args[100];
+	char arg[100];
+	int nargs = -1;
+	int c;
+
+	while ((line = fparseln(stdin, &len, &lineno, NULL, 0)) != NULL) {
+		if (strncmp(line, "load:", 5) == 0) {
+			if (optstring)
+				free(optstring);
+			optstring = strtok(&line[6], WS);
+			if (optstring == NULL)
+			    errx(1, "missing optstring at line %ld",
+				(unsigned long)lineno);
+			optstring = strdup(optstring);
+			if (debug)
+				fprintf(stderr, "optstring = %s\n", optstring);
+		} else if (strncmp(line, "args:", 5) == 0) {
+			for (; nargs >= 0; nargs--) {
+				if (args[nargs] != NULL)
+					free(args[nargs]);
+			}
+			args[nargs = 0] = strtok(&line[6], WS);
+			if (args[nargs] == NULL)
+				errx(1, "missing args at line %ld",
+				    (unsigned long)lineno);
+
+			args[nargs] = strdup(args[nargs]);
+			while ((args[++nargs] = strtok(NULL, WS)) != NULL)
+				args[nargs] = strdup(args[nargs]);
+			if (debug) {
+				int i = 0;
+				for (i = 0; i < nargs; i++)
+					fprintf(stderr, "argv[%d] = %s\n", i,
+					    args[i]);
+			}
+		} else if (strncmp(line, "result:", 7) == 0) {
+			buf[0] = '\0';
+			optind = optreset = 1;
+			if (result)
+				free(result);
+			result = strtok(&line[8], WS);
+			if (result == NULL)
+				errx(1, "missing result at line %ld",
+				    (unsigned long)lineno);
+			result = strdup(result);
+			if (nargs == -1)
+				errx(1, "result: without args:");
+			if (debug)
+				fprintf(stderr, "result = %s\n", result);
+			while ((c = getopt(nargs, args, optstring)) != -1)  {
+				if (c == ':')
+					err(1, "`:' found as argument char");
+				if ((ptr = strchr(optstring, c)) == NULL) {
+					snprintf(arg, sizeof(arg), "!%c,", c);
+					strcat(buf, arg);
+					continue;
+				}
+				if (ptr[1] != ':')
+					snprintf(arg, sizeof(arg), "%c,", c);
+				else
+					snprintf(arg, sizeof(arg), "%c=%s,",
+					    c, optarg);
+				strcat(buf, arg);
+			}
+			len = strlen(buf);
+			if (len > 0) {
+				buf[len - 1] = '|';
+				buf[len] = '\0';
+			} else {
+				buf[0] = '|';
+				buf[1] = '\0';
+			}
+			snprintf(arg, sizeof(arg), "%d", nargs - optind);
+			strcat(buf, arg);
+			if (strcmp(buf, result) != 0)
+				errx(1, "`%s' != `%s'", buf, result);
+		}
+		free(line);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c b/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c
new file mode 100644
index 000000000000..17258f5fef91
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c
@@ -0,0 +1,239 @@
+/*	$NetBSD: h_getopt_long.c,v 1.1 2011/01/01 23:56:49 pgoyette Exp $	*/
+
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <ctype.h>
+#include <err.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define SKIPWS(p)	while (isspace((int)(*p))) p++
+#define	WS	"\t\n "
+
+int
+main(int argc, char *argv[])
+{
+	size_t len, lineno = 0;
+	char *line, *eptr, *longopt, *ptr, *optstring = NULL, *result = NULL;
+	char buf[1024];
+	char *args[128];
+	char arg[256];
+	int nargs = -1;
+	int c;
+	int nlongopts = 0;
+	int maxnlongopts = 0;
+	int *longopt_flags = NULL;
+	struct option *longopts = NULL;
+
+	while ((line = fparseln(stdin, &len, &lineno, NULL, 0)) != NULL) {
+		if (strncmp(line, "optstring:", 10) == 0) {
+			if (optstring)
+				free(optstring);
+			optstring = strtok(&line[11], WS);
+			if (optstring == NULL)
+			    errx(1, "missing optstring at line %ld",
+				(unsigned long)lineno);
+			optstring = strdup(optstring);
+		} else if (strncmp(line, "longopts:", 9) == 0) {
+			if (longopts) {
+				int i;
+				for (i = 0; i < nlongopts; i++)
+					if (longopts[i].name != NULL)
+						free(__UNCONST(longopts[i].name));
+				free(longopts);
+			}
+			if (longopt_flags)
+				free(longopt_flags);
+			nlongopts = 0;
+			ptr = strtok(&line[10], WS);
+			if (ptr == NULL)
+				errx(1, "missing longopts at line %ld",
+				    (unsigned long)lineno);
+			maxnlongopts = strtoul(ptr, &eptr, 10);
+			if (*eptr != '\0')
+				warnx("garbage in longopts at line %ld",
+				    (unsigned long)lineno);
+			maxnlongopts++;		/* space for trailer */
+			longopts =
+			    (struct option *)calloc(sizeof(struct option),
+						    maxnlongopts);
+			if (longopts == NULL)
+				err(1, "calloc");
+			longopt_flags = (int *)calloc(sizeof(int), maxnlongopts);
+			if (longopt_flags == NULL)
+				err(1, "calloc");
+		} else if (strncmp(line, "longopt:", 8) == 0) {
+			if (longopts == NULL)
+				errx(1, "longopt: without longopts at line %ld",
+				    (unsigned long)lineno);
+			if (nlongopts >= maxnlongopts)
+				errx(1, "longopt: too many options at line %ld",
+				    (unsigned long)lineno);
+			/* name */
+			ptr = &line[9];
+			SKIPWS(ptr);
+			longopt = strsep(&ptr, ",");
+			if (longopt == NULL)
+				errx(1, "missing longopt at line %ld",
+				    (unsigned long)lineno);
+			longopts[nlongopts].name = strdup(longopt);
+			/* has_arg */
+			SKIPWS(ptr);
+			longopt = strsep(&ptr, ",");
+			if (*longopt != '\0') {
+				if (strncmp(longopt, "0", 1) == 0 ||
+				    strncmp(longopt, "no_argument", 2) == 0)
+					longopts[nlongopts].has_arg = no_argument;
+				else if (strncmp(longopt, "1", 1) == 0 ||
+					 strncmp(longopt, "required_argument", 8) == 0)
+					longopts[nlongopts].has_arg = required_argument;
+				else if (strncmp(longopt, "2", 1) == 0 ||
+					 strncmp(longopt, "optional_argument", 8) == 0)
+					longopts[nlongopts].has_arg = optional_argument;
+				else
+					errx(1, "unknown has_arg %s at line %ld",
+					    longopt, (unsigned long)lineno);
+			}
+			/* flag */
+			SKIPWS(ptr);
+			longopt = strsep(&ptr, ",");
+			if (*longopt != '\0' &&
+			    strncmp(longopt, "NULL", 4) != 0)
+				longopts[nlongopts].flag = &longopt_flags[nlongopts];
+			/* val */
+			SKIPWS(ptr);
+			longopt = strsep(&ptr, ",");
+			if (*longopt == '\0')
+				errx(1, "missing val at line %ld",
+				    (unsigned long)lineno);
+			if (*longopt != '\'') {
+				longopts[nlongopts].val =
+			            (int)strtoul(longopt, &eptr, 10);
+				if (*eptr != '\0')
+					errx(1, "invalid val at line %ld",
+					    (unsigned long)lineno);
+			} else
+				longopts[nlongopts].val = (int)longopt[1];
+			nlongopts++;
+		} else if (strncmp(line, "args:", 5) == 0) {
+			for (; nargs >= 0; nargs--) {
+				if (args[nargs] != NULL)
+					free(args[nargs]);
+			}
+			args[nargs = 0] = strtok(&line[6], WS);
+			if (args[nargs] == NULL)
+				errx(1, "Missing args");
+
+			args[nargs] = strdup(args[nargs]);
+			while ((args[++nargs] = strtok(NULL, WS)) != NULL)
+				args[nargs] = strdup(args[nargs]);
+		} else if (strncmp(line, "result:", 7) == 0) {
+			int li;
+			buf[0] = '\0';
+			optind = optreset = 1;
+			if (result)
+				free(result);
+			result = strtok(&line[8], WS);
+			if (result == NULL)
+				errx(1, "missing result at line %ld",
+				    (unsigned long)lineno);
+			if (optstring == NULL)
+				errx(1, "result: without optstring");
+			if (longopts == NULL || nlongopts == 0)
+				errx(1, "result: without longopts");
+			result = strdup(result);
+			if (nargs == -1)
+				errx(1, "result: without args");
+			li = -2;
+			while ((c = getopt_long(nargs, args, optstring,
+				       	longopts, &li)) != -1)  {
+				if (c == ':')
+					errx(1, "`:' found as argument char");
+				if (li == -2) {
+					ptr = strchr(optstring, c);
+					if (ptr == NULL) {
+						snprintf(arg, sizeof(arg),
+						    "!%c,", c);
+						strcat(buf, arg);
+						continue;
+					}
+					if (ptr[1] != ':')
+						snprintf(arg, sizeof(arg),
+						    "%c,", c);
+					else
+						snprintf(arg, sizeof(arg),
+						    "%c=%s,", c, optarg);
+				} else {
+					switch (longopts[li].has_arg) {
+					case no_argument:
+						snprintf(arg, sizeof(arg), "-%s,",
+						    longopts[li].name);
+						break;
+					case required_argument:
+						snprintf(arg, sizeof(arg),
+						    "-%s=%s,",
+						    longopts[li].name, optarg);
+						break;
+					case optional_argument:
+						snprintf(arg, sizeof(arg),
+						    "-%s%s%s,",
+						    longopts[li].name,
+						    (optarg)? "=" : "",
+						    (optarg)? optarg : "");
+						break;
+					default:
+						errx(1, "internal error");
+					}
+				}
+				strcat(buf, arg);
+				li = -2;
+			}
+			len = strlen(buf);
+			if (len > 0) {
+				buf[len - 1] = '|';
+				buf[len] = '\0';
+			} else {
+				buf[0] = '|';
+				buf[1] = '\0';
+			}
+			snprintf(arg, sizeof(arg), "%d", nargs - optind);
+			strcat(buf, arg);
+			if (strcmp(buf, result) != 0)
+				errx(1, "`%s' != `%s'", buf, result);
+		} else
+			errx(1, "unknown directive at line %ld",
+			    (unsigned long)lineno);
+		free(line);
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_abs.c b/contrib/netbsd-tests/lib/libc/stdlib/t_abs.c
new file mode 100644
index 000000000000..282a125cf644
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_abs.c
@@ -0,0 +1,154 @@
+/* $NetBSD: t_abs.c,v 1.3 2014/03/01 22:38:13 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_abs.c,v 1.3 2014/03/01 22:38:13 joerg Exp $");
+
+#include <atf-c.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+
+ATF_TC(abs_basic);
+ATF_TC_HEAD(abs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that abs(3) works");
+}
+
+ATF_TC_BODY(abs_basic, tc)
+{
+	static const struct {
+		int val;
+		int res;
+	} table[] = {
+		{ 0,		0		},
+		{ +0,		0		},
+		{ -0,		0		},
+		{ -0x1010,	0x1010		},
+		{ INT_MAX,	INT_MAX		},
+		{ -INT_MAX,	INT_MAX		},
+	};
+
+	for (size_t i = 0; i < __arraycount(table); i++)
+		ATF_CHECK(abs(table[i].val) == table[i].res);
+}
+
+ATF_TC(imaxabs_basic);
+ATF_TC_HEAD(imaxabs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that imaxabs(3) works");
+}
+
+ATF_TC_BODY(imaxabs_basic, tc)
+{
+	static const struct {
+		intmax_t val;
+		intmax_t res;
+	} table[] = {
+		{ 0,		0		},
+		{ INT_MAX,	INT_MAX		},
+		{ -INT_MAX,	INT_MAX		},
+		{ LONG_MAX,	LONG_MAX	},
+		{ -LONG_MAX,	LONG_MAX	},
+		{ LLONG_MAX,	LLONG_MAX	},
+		{ -LLONG_MAX,	LLONG_MAX	},
+		{ INT_MAX,	INT_MAX		},
+		{ -INT_MAX,	INT_MAX		},
+	};
+
+	for (size_t i = 0; i < __arraycount(table); i++)
+		ATF_CHECK(imaxabs(table[i].val) == table[i].res);
+}
+
+ATF_TC(labs_basic);
+ATF_TC_HEAD(labs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that labs(3) works");
+}
+
+ATF_TC_BODY(labs_basic, tc)
+{
+	static const struct {
+		long val;
+		long res;
+	} table[] = {
+		{ 0,		0		},
+		{ +0,		0		},
+		{ -0,		0		},
+		{ -1,		1		},
+		{ LONG_MAX,	LONG_MAX	},
+		{ -LONG_MAX,	LONG_MAX	},
+		{ INT_MAX,	INT_MAX		},
+		{ -INT_MAX,	INT_MAX		},
+	};
+
+	for (size_t i = 0; i < __arraycount(table); i++)
+		ATF_CHECK(labs(table[i].val) == table[i].res);
+}
+
+ATF_TC(llabs_basic);
+ATF_TC_HEAD(llabs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that llabs(3) works");
+}
+
+ATF_TC_BODY(llabs_basic, tc)
+{
+	static const struct {
+		long long val;
+		long long res;
+	} table[] = {
+		{ 0,		0		},
+		{ +0,		0		},
+		{ -0,		0		},
+		{ -1,		1		},
+		{ INT_MAX,	INT_MAX		},
+		{ -INT_MAX,	INT_MAX		},
+		{ LONG_MAX,	LONG_MAX	},
+		{ -LONG_MAX,	LONG_MAX	},
+		{ LLONG_MAX,	LLONG_MAX	},
+		{ -LLONG_MAX,	LLONG_MAX	},
+		{ -0x100000000LL,	0x100000000LL	},
+	};
+
+	for (size_t i = 0; i < __arraycount(table); i++)
+		ATF_CHECK(llabs(table[i].val) == table[i].res);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, abs_basic);
+	ATF_TP_ADD_TC(tp, imaxabs_basic);
+	ATF_TP_ADD_TC(tp, labs_basic);
+	ATF_TP_ADD_TC(tp, llabs_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_atexit.sh b/contrib/netbsd-tests/lib/libc/stdlib/t_atexit.sh
new file mode 100755
index 000000000000..d11268bed091
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_atexit.sh
@@ -0,0 +1,54 @@
+# $NetBSD: t_atexit.sh,v 1.1 2011/01/12 19:44:08 pgoyette Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case atexit
+atexit_head()
+{
+	atf_set "descr" "Checks atexit(3) and __cxa_atexit()/__cxa_finalize()"
+}
+atexit_body()
+{
+	$(atf_get_srcdir)/h_atexit >out \
+		|| atf_fail "h_exit failed, see output of the test for details"
+
+	cat >exp <<EOF
+cxa_handler_5
+cxa_handler_4
+cxa_handler_3
+cxa_handler_2
+normal_handler_1
+normal_handler_0
+EOF
+
+	diff -Nru exp out \
+		|| atf_fail "h_exit failed, see output of the test for details"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case atexit
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_atoi.c b/contrib/netbsd-tests/lib/libc/stdlib/t_atoi.c
new file mode 100644
index 000000000000..3e0c35f73cdb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_atoi.c
@@ -0,0 +1,121 @@
+/* $NetBSD: t_atoi.c,v 1.2 2012/03/29 05:56:36 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_atoi.c,v 1.2 2012/03/29 05:56:36 jruoho Exp $");
+
+#include <atf-c.h>
+#include <float.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(atof_strtod);
+ATF_TC_HEAD(atof_strtod, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that atof(3) matches the corresponding strtod(3) call");
+}
+
+ATF_TC_BODY(atof_strtod, tc)
+{
+	char buf[128];
+
+	(void)snprintf(buf, sizeof(buf), "%f\n", DBL_MAX);
+
+	ATF_REQUIRE(atof("0")  == strtod("0", NULL));
+	ATF_REQUIRE(atof("-1") == strtod("-1", NULL));
+	ATF_REQUIRE(atof(buf)  == strtod(buf, NULL));
+}
+
+ATF_TC(atoi_strtol);
+ATF_TC_HEAD(atoi_strtol, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that atoi(3) matches the corresponding strtol(3) call");
+}
+
+ATF_TC_BODY(atoi_strtol, tc)
+{
+	char buf[64];
+
+	(void)snprintf(buf, sizeof(buf), "%d\n", INT_MAX);
+
+	ATF_REQUIRE(atoi("0")  == strtol("0", NULL, 10));
+	ATF_REQUIRE(atoi("-1") == strtol("-1", NULL, 10));
+	ATF_REQUIRE(atoi(buf)  == strtol(buf, NULL, 10));
+}
+
+ATF_TC(atol_strtol);
+ATF_TC_HEAD(atol_strtol, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that atol(3) matches the corresponding strtol(3) call");
+}
+
+ATF_TC_BODY(atol_strtol, tc)
+{
+	char buf[64];
+
+	(void)snprintf(buf, sizeof(buf), "%ld\n", LONG_MAX);
+
+	ATF_REQUIRE(atol("0")  == strtol("0", NULL, 10));
+	ATF_REQUIRE(atol("-1") == strtol("-1", NULL, 10));
+	ATF_REQUIRE(atol(buf)  == strtol(buf, NULL, 10));
+}
+
+ATF_TC(atoll_strtoll);
+ATF_TC_HEAD(atoll_strtoll, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that atoll(3) matches the corresponding strtoll(3) call");
+}
+
+ATF_TC_BODY(atoll_strtoll, tc)
+{
+	char buf[128];
+
+	(void)snprintf(buf, sizeof(buf), "%lld\n", LLONG_MAX);
+
+	ATF_REQUIRE(atoll("0")  == strtoll("0", NULL, 10));
+	ATF_REQUIRE(atoll("-1") == strtoll("-1", NULL, 10));
+	ATF_REQUIRE(atoll(buf)  == strtoll(buf, NULL, 10));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, atof_strtod);
+	ATF_TP_ADD_TC(tp, atoi_strtol);
+	ATF_TP_ADD_TC(tp, atol_strtol);
+	ATF_TP_ADD_TC(tp, atoll_strtoll);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_div.c b/contrib/netbsd-tests/lib/libc/stdlib/t_div.c
new file mode 100644
index 000000000000..376f35732ac1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_div.c
@@ -0,0 +1,98 @@
+/*	$NetBSD: t_div.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define	NUM	1999236
+#define	DENOM	1000000
+#define	QUOT	1
+#define	REM	999236
+
+ATF_TC(div_basic);
+ATF_TC_HEAD(div_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test div(3) for correctness");
+}
+
+ATF_TC_BODY(div_basic, tc)
+{
+	div_t d;
+
+	d = div(NUM, DENOM);
+
+	ATF_CHECK(d.quot == QUOT);
+	ATF_CHECK(d.rem  == REM);
+}
+
+ATF_TC(ldiv_basic);
+ATF_TC_HEAD(ldiv_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test ldiv(3) for correctness");
+}
+
+ATF_TC_BODY(ldiv_basic, tc)
+{
+	ldiv_t ld;
+
+	ld = ldiv(NUM, DENOM);
+
+	ATF_CHECK(ld.quot == QUOT);
+	ATF_CHECK(ld.rem  == REM);
+}
+
+ATF_TC(lldiv_basic);
+ATF_TC_HEAD(lldiv_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test lllldiv(3) for correctness");
+}
+
+ATF_TC_BODY(lldiv_basic, tc)
+{
+	lldiv_t lld;
+
+	lld = lldiv(NUM, DENOM);
+
+	ATF_CHECK(lld.quot == QUOT);
+	ATF_CHECK(lld.rem  == REM);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, div_basic);
+	ATF_TP_ADD_TC(tp, ldiv_basic);
+	ATF_TP_ADD_TC(tp, lldiv_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_exit.c b/contrib/netbsd-tests/lib/libc/stdlib/t_exit.c
new file mode 100644
index 000000000000..067cb519f386
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_exit.c
@@ -0,0 +1,186 @@
+/* $NetBSD: t_exit.c,v 1.1 2011/05/09 07:31:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_exit.c,v 1.1 2011/05/09 07:31:51 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static bool	fail;
+static void	func(void);
+
+static void
+func(void)
+{
+	fail = false;
+}
+
+ATF_TC(exit_atexit);
+ATF_TC_HEAD(exit_atexit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of atexit(3)");
+}
+
+ATF_TC_BODY(exit_atexit, tc)
+{
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (atexit(func) != 0)
+			_exit(EXIT_FAILURE);
+
+		fail = true;
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("atexit(3) failed");
+
+	if (fail != false)
+		atf_tc_fail("atexit(3) was not called");
+}
+
+ATF_TC(exit_basic);
+ATF_TC_HEAD(exit_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of exit(3)");
+}
+
+ATF_TC_BODY(exit_basic, tc)
+{
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		exit(EXIT_SUCCESS);
+		exit(EXIT_FAILURE);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("exit(3) did not exit successfully");
+}
+
+ATF_TC(exit_status);
+ATF_TC_HEAD(exit_status, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exit(3) status");
+}
+
+ATF_TC_BODY(exit_status, tc)
+{
+	const int n = 10;
+	int i, sta;
+	pid_t pid;
+
+	for (i = 0; i < n; i++) {
+
+		pid = fork();
+
+		if (pid < 0)
+			exit(EXIT_FAILURE);
+
+		if (pid == 0)
+			exit(i);
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != i)
+			atf_tc_fail("invalid exit(3) status");
+	}
+}
+
+ATF_TC(exit_tmpfile);
+ATF_TC_HEAD(exit_tmpfile, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Temporary files are unlinked?");
+}
+
+ATF_TC_BODY(exit_tmpfile, tc)
+{
+	int sta, fd = -1;
+	char buf[12];
+	pid_t pid;
+	FILE *f;
+
+	(void)strlcpy(buf, "exit.XXXXXX", sizeof(buf));
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		fd = mkstemp(buf);
+
+		if (fd < 0)
+			exit(EXIT_FAILURE);
+
+		exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("failed to create temporary file");
+
+	f = fdopen(fd, "r");
+
+	if (f != NULL)
+		atf_tc_fail("exit(3) did not clear temporary file");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, exit_atexit);
+	ATF_TP_ADD_TC(tp, exit_basic);
+	ATF_TP_ADD_TC(tp, exit_status);
+	ATF_TP_ADD_TC(tp, exit_tmpfile);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c b/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c
new file mode 100644
index 000000000000..35d687445bb0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c
@@ -0,0 +1,199 @@
+/*	$NetBSD: t_getenv.c,v 1.2 2011/07/15 13:54:31 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getenv.c,v 1.2 2011/07/15 13:54:31 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+extern char	**environ;
+
+ATF_TC(clearenv_basic);
+ATF_TC_HEAD(clearenv_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test user clearing environment directly");
+}
+
+ATF_TC_BODY(clearenv_basic, tc)
+{
+	char name[1024], value[1024];
+
+	for (size_t i = 0; i < 1024; i++) {
+		snprintf(name, sizeof(name), "crap%zu", i);
+		snprintf(value, sizeof(value), "%zu", i);
+		ATF_CHECK(setenv(name, value, 1) != -1);
+	}
+
+	*environ = NULL;
+
+	for (size_t i = 0; i < 1; i++) {
+		snprintf(name, sizeof(name), "crap%zu", i);
+		snprintf(value, sizeof(value), "%zu", i);
+		ATF_CHECK(setenv(name, value, 1) != -1);
+	}
+
+	ATF_CHECK_STREQ(getenv("crap0"), "0");
+	ATF_CHECK(getenv("crap1") == NULL);
+	ATF_CHECK(getenv("crap2") == NULL);
+}
+
+ATF_TC(getenv_basic);
+ATF_TC_HEAD(getenv_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test setenv(3), getenv(3)");
+}
+
+ATF_TC_BODY(getenv_basic, tc)
+{
+	ATF_CHECK(setenv("EVIL", "very=bad", 1) != -1);
+	ATF_CHECK_STREQ(getenv("EVIL"), "very=bad");
+	ATF_CHECK(getenv("EVIL=very") == NULL);
+	ATF_CHECK(unsetenv("EVIL") != -1);
+}
+
+ATF_TC(putenv_basic);
+ATF_TC_HEAD(putenv_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test putenv(3), getenv(3), unsetenv(3)");
+}
+
+
+ATF_TC_BODY(putenv_basic, tc)
+{
+	char string[1024];
+
+	snprintf(string, sizeof(string), "crap=true");
+	ATF_CHECK(putenv(string) != -1);
+	ATF_CHECK_STREQ(getenv("crap"), "true");
+	string[1] = 'l';
+	ATF_CHECK_STREQ(getenv("clap"), "true");
+	ATF_CHECK(getenv("crap") == NULL);
+	string[1] = 'r';
+	ATF_CHECK(unsetenv("crap") != -1);
+	ATF_CHECK(getenv("crap") == NULL);
+
+	ATF_CHECK_ERRNO(EINVAL, putenv(NULL) == -1);
+	ATF_CHECK_ERRNO(EINVAL, putenv(__UNCONST("val")) == -1);
+	ATF_CHECK_ERRNO(EINVAL, putenv(__UNCONST("=val")) == -1);
+}
+
+ATF_TC(setenv_basic);
+ATF_TC_HEAD(setenv_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test setenv(3), getenv(3), unsetenv(3)");
+	atf_tc_set_md_var(tc, "timeout", "300");
+}
+
+ATF_TC_BODY(setenv_basic, tc)
+{
+	const size_t numvars = 8192;
+	size_t i, offset;
+	char name[1024];
+	char value[1024];
+
+	offset = lrand48();
+	for (i = 0; i < numvars; i++) {
+		(void)snprintf(name, sizeof(name), "var%zu",
+		    (i * 7 + offset) % numvars);
+		(void)snprintf(value, sizeof(value), "value%ld", lrand48());
+		ATF_CHECK(setenv(name, value, 1) != -1);
+		ATF_CHECK(setenv(name, "foo", 0) != -1);
+		ATF_CHECK_STREQ(getenv(name), value);
+	}
+
+	offset = lrand48();
+	for (i = 0; i < numvars; i++) {
+		(void)snprintf(name, sizeof(name), "var%zu",
+		    (i * 11 + offset) % numvars);
+		ATF_CHECK(unsetenv(name) != -1);
+		ATF_CHECK(getenv(name) == NULL);
+		ATF_CHECK(unsetenv(name) != -1);
+	}
+
+	ATF_CHECK_ERRNO(EINVAL, setenv(NULL, "val", 1) == -1);
+	ATF_CHECK_ERRNO(EINVAL, setenv("", "val", 1) == -1);
+	ATF_CHECK_ERRNO(EINVAL, setenv("v=r", "val", 1) == -1);
+	ATF_CHECK_ERRNO(EINVAL, setenv("var", NULL, 1) == -1);
+
+	ATF_CHECK(setenv("var", "=val", 1) == 0);
+	ATF_CHECK_STREQ(getenv("var"), "=val");
+}
+
+ATF_TC(setenv_mixed);
+ATF_TC_HEAD(setenv_mixed, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test mixing setenv(3), unsetenv(3) and putenv(3)");
+}
+
+ATF_TC_BODY(setenv_mixed, tc)
+{
+	char string[32];
+
+	(void)strcpy(string, "mixedcrap=putenv");
+
+	ATF_CHECK(setenv("mixedcrap", "setenv", 1) != -1);
+	ATF_CHECK_STREQ(getenv("mixedcrap"), "setenv");
+	ATF_CHECK(putenv(string) != -1);
+	ATF_CHECK_STREQ(getenv("mixedcrap"), "putenv");
+	ATF_CHECK(unsetenv("mixedcrap") != -1);
+	ATF_CHECK(getenv("mixedcrap") == NULL);
+
+	ATF_CHECK(putenv(string) != -1);
+	ATF_CHECK_STREQ(getenv("mixedcrap"), "putenv");
+	ATF_CHECK(setenv("mixedcrap", "setenv", 1) != -1);
+	ATF_CHECK_STREQ(getenv("mixedcrap"), "setenv");
+	ATF_CHECK(unsetenv("mixedcrap") != -1);
+	ATF_CHECK(getenv("mixedcrap") == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, clearenv_basic);
+	ATF_TP_ADD_TC(tp, getenv_basic);
+	ATF_TP_ADD_TC(tp, putenv_basic);
+	ATF_TP_ADD_TC(tp, setenv_basic);
+	ATF_TP_ADD_TC(tp, setenv_mixed);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_getenv_thread.c b/contrib/netbsd-tests/lib/libc/stdlib/t_getenv_thread.c
new file mode 100644
index 000000000000..d935629339e8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_getenv_thread.c
@@ -0,0 +1,250 @@
+/*	$NetBSD: t_getenv_thread.c,v 1.2 2012/03/15 02:02:23 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getenv_thread.c,v 1.2 2012/03/15 02:02:23 joerg Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#define	THREADED_NUM_THREADS	8
+#define	THREADED_NUM_VARS	16
+#define	THREADED_VAR_NAME	"THREADED%zu"
+#define	THREADED_RUN_TIME	10
+
+static void	 *thread_getenv_r(void *);
+static void	 *thread_putenv(void *);
+static void	 *thread_setenv(void *);
+static void	 *thread_unsetenv(void *);
+
+static void *
+thread_getenv_r(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32], value[128];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+
+		if (getenv_r(name, value, sizeof(value)) == -1) {
+			ATF_CHECK(errno == ENOENT);
+		}
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+
+static void *
+thread_putenv(void *arg)
+{
+	time_t endtime;
+	size_t i;
+	static char vars[THREADED_NUM_VARS][128];
+
+	for (i = 0; i < THREADED_NUM_VARS; i++) {
+		(void)snprintf(vars[i], sizeof(vars[i]),
+		    THREADED_VAR_NAME "=putenv %ld", i, lrand48());
+	}
+
+	endtime = *(time_t *)arg;
+	do {
+		char name[128];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)strlcpy(name, vars[i], sizeof(name));
+		*strchr(name, '=') = '\0';
+
+		ATF_CHECK(unsetenv(name) != -1);
+		ATF_CHECK(putenv(vars[i]) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+static void *
+thread_setenv(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32], value[64];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+		(void)snprintf(value, sizeof(value), "setenv %ld", lrand48());
+
+		ATF_CHECK(setenv(name, value, 1) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+static void *
+thread_unsetenv(void *arg)
+{
+	time_t endtime;
+
+	endtime = *(time_t *)arg;
+	do {
+		size_t i;
+		char name[32];
+
+		i = lrand48() % THREADED_NUM_VARS;
+		(void)snprintf(name, sizeof(name), THREADED_VAR_NAME, i);
+
+		ATF_CHECK(unsetenv(name) != -1);
+	} while (time(NULL) < endtime);
+
+	return NULL;
+}
+
+ATF_TC(getenv_r_thread);
+ATF_TC_HEAD(getenv_r_thread, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test getenv_r(3) with threads");
+	atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
+}
+
+ATF_TC_BODY(getenv_r_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_getenv_r,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(putenv_thread);
+ATF_TC_HEAD(putenv_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test concurrent access by putenv(3)");
+	atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
+}
+
+ATF_TC_BODY(putenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_putenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(setenv_thread);
+ATF_TC_HEAD(setenv_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test concurrent access by setenv(3)");
+	atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
+}
+
+ATF_TC_BODY(setenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_setenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TC(unsetenv_thread);
+ATF_TC_HEAD(unsetenv_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test unsetenv(3) with threads");
+	atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
+}
+
+ATF_TC_BODY(unsetenv_thread, tc)
+{
+	pthread_t threads[THREADED_NUM_THREADS];
+	time_t endtime;
+	size_t i, j;
+
+	endtime = time(NULL) + THREADED_RUN_TIME;
+
+	for (i = j = 0; j < 2; j++) {
+
+		ATF_CHECK(pthread_create(&threads[i++], NULL, thread_unsetenv,
+		    &endtime) == 0);
+	}
+
+	for (j = 0; j < i; j++)
+		ATF_CHECK(pthread_join(threads[j], NULL) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getenv_r_thread);
+	ATF_TP_ADD_TC(tp, putenv_thread);
+	ATF_TP_ADD_TC(tp, setenv_thread);
+	ATF_TP_ADD_TC(tp, unsetenv_thread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_getopt.sh b/contrib/netbsd-tests/lib/libc/stdlib/t_getopt.sh
new file mode 100755
index 000000000000..cc10f6525432
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_getopt.sh
@@ -0,0 +1,123 @@
+# $NetBSD: t_getopt.sh,v 1.1 2011/01/01 23:56:49 pgoyette Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+h_getopt()
+{
+	atf_check -e save:stderr -x "$(atf_get_srcdir)/h_getopt" <<EOF
+load:	$1
+args:	$2
+result:	$3
+EOF
+	cat stderr
+	rm -f stderr
+}
+
+h_getopt_long()
+{
+	atf_check -e save:stderr -x "$(atf_get_srcdir)/h_getopt_long" <<EOF
+$1
+args:	$2
+result:	$3
+EOF
+	cat stderr
+	rm -f stderr
+}
+
+atf_test_case getopt
+getopt_head()
+{
+	atf_set "descr" "Checks getopt(3)"
+}
+getopt_body()
+{
+	load="c:d"
+
+	h_getopt "${load}" "foo -c 1 -d foo" "c=1,d|1"
+	h_getopt "${load}" "foo -d foo bar" "d|2"
+	h_getopt "${load}" "foo -c 2 foo bar" "c=2|2"
+	h_getopt "${load}" "foo -e 1 foo bar" "!?|3"
+	h_getopt "${load}" "foo -d -- -c 1" "d|2"
+	h_getopt "${load}" "foo -c- 1" "c=-|1"
+	h_getopt "${load}" "foo -d - 1" "d|2"
+}
+
+atf_test_case getopt_long
+getopt_long_head()
+{
+	atf_set "descr" "Checks getopt_long(3)"
+}
+getopt_long_body()
+{
+	# GNU libc tests with these
+	load="optstring:	abc:
+longopts:	5
+longopt:	required, required_argument, , 'r'
+longopt:	optional, optional_argument, , 'o'
+longopt:	none, no_argument, , 'n'
+longopt:	color, no_argument, , 'C'
+longopt:	colour, no_argument, , 'C'"
+
+	h_getopt_long "${load}" "foo --req foobar" "-required=foobar|0"
+	h_getopt_long "${load}" "foo --opt=bazbug" "-optional=bazbug|0"
+	
+	# This is problematic
+	#
+	# GNU libc 2.1.3 this fails with ambiguous result
+	# h_getopt_long "${load}" "foo --col" "!?|0"
+	#
+	# GNU libc 2.2 >= this works
+	h_getopt_long "${load}" "foo --col" "-color|0"
+
+	h_getopt_long "${load}" "foo --colour" "-colour|0"
+
+	# This is the real GNU libc test!
+	args="foo -a -b -cfoobar --required foobar --optional=bazbug --none random --col --color --colour"
+	# GNU libc 2.1.3 this fails with ambiguous
+	#result="a,b,c=foobar,-required=foobar,-optional=bazbug,-none,!?,-color,-colour|1"
+	#
+	# GNU libc 2.2 >= this works
+	result="a,b,c=foobar,-required=foobar,-optional=bazbug,-none,-color,-color,-colour|1"
+	h_getopt_long "${load}" "${args}" "${result}"
+
+	#
+	# The order of long options in the long option array should not matter.
+	# An exact match should never be treated as ambiguous.
+	#
+	load="optstring:	fgl
+longopts:	3
+longopt:	list-foobar, no_argument, lopt, 'f'
+longopt:	list-goobar, no_argument, lopt, 'g'
+longopt:	list, no_argument, lopt, 'l'"
+	h_getopt_long "${load}" "foo --list" "-list|0"
+}
+
+
+atf_init_test_cases()
+{
+	atf_add_test_case getopt
+	atf_add_test_case getopt_long
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c b/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
new file mode 100644
index 000000000000..099b3e7948a5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
@@ -0,0 +1,399 @@
+/* $NetBSD: t_hsearch.c,v 1.4 2014/07/20 20:17:21 christos Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (c) 2001 Christopher G. Demetriou
+ * All rights reserved.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *          This product includes software developed for the
+ *          NetBSD Project.  See http://www.NetBSD.org/ for
+ *          information about NetBSD.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_hsearch.c,v 1.4 2014/07/20 20:17:21 christos Exp $");
+
+#include <errno.h>
+#include <search.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x) ATF_REQUIRE_MSG(x, "%s", strerror(errno))
+
+ATF_TC(hsearch_basic);
+ATF_TC_HEAD(hsearch_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks basic insertions and searching");
+}
+
+ATF_TC_BODY(hsearch_basic, tc)
+{
+	ENTRY e, *ep;
+	char ch[2];
+	int i;
+
+	REQUIRE_ERRNO(hcreate(16) != 0);
+
+	/* ch[1] should be constant from here on down. */
+	ch[1] = '\0';
+
+	/* Basic insertions.  Check enough that there'll be collisions. */
+	for (i = 0; i < 26; i++) {
+		ch[0] = 'a' + i;
+		e.key = strdup(ch);	/* ptr to provided key is kept! */
+		ATF_REQUIRE(e.key != NULL);
+		e.data = (void *)(intptr_t)i;
+
+		ep = hsearch(e, ENTER);
+
+		ATF_REQUIRE(ep != NULL);
+		ATF_REQUIRE_STREQ(ep->key, ch);
+		ATF_REQUIRE_EQ((intptr_t)ep->data, i);
+	}
+
+	/* e.key should be constant from here on down. */
+	e.key = ch;
+
+	/* Basic lookups. */
+	for (i = 0; i < 26; i++) {
+		ch[0] = 'a' + i;
+
+		ep = hsearch(e, FIND);
+
+		ATF_REQUIRE(ep != NULL);
+		ATF_REQUIRE_STREQ(ep->key, ch);
+		ATF_REQUIRE_EQ((intptr_t)ep->data, i);
+	}
+
+	hdestroy1(free, NULL);
+}
+
+ATF_TC(hsearch_duplicate);
+ATF_TC_HEAD(hsearch_duplicate, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that inserting duplicate "
+	    "doesn't overwrite existing data");
+}
+
+ATF_TC_BODY(hsearch_duplicate, tc)
+{
+	ENTRY e, *ep;
+
+	REQUIRE_ERRNO(hcreate(16));
+
+	e.key = __UNCONST("a");
+	e.data = (void *)(intptr_t) 0;
+
+	ep = hsearch(e, ENTER);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	e.data = (void *)(intptr_t)12345;
+
+	ep = hsearch(e, ENTER);
+	ep = hsearch(e, FIND);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	hdestroy();
+}
+
+ATF_TC(hsearch_nonexistent);
+ATF_TC_HEAD(hsearch_nonexistent, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks searching for non-existent entry");
+}
+
+ATF_TC_BODY(hsearch_nonexistent, tc)
+{
+	ENTRY e, *ep;
+
+	REQUIRE_ERRNO(hcreate(16));
+
+	e.key = __UNCONST("A");
+	ep = hsearch(e, FIND);
+	ATF_REQUIRE_EQ(ep, NULL);
+
+	hdestroy();
+}
+
+ATF_TC(hsearch_two);
+ATF_TC_HEAD(hsearch_two, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that searching doesn't overwrite previous search results");
+}
+
+ATF_TC_BODY(hsearch_two, tc)
+{
+	ENTRY e, *ep, *ep2;
+
+	REQUIRE_ERRNO(hcreate(16));
+
+	e.key = __UNCONST("a");
+	e.data = (void*)(intptr_t)0;
+
+	ep = hsearch(e, ENTER);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	e.key = __UNCONST("b");
+	e.data = (void*)(intptr_t)1;
+
+	ep = hsearch(e, ENTER);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "b");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 1);
+
+	e.key = __UNCONST("a");
+	ep = hsearch(e, FIND);
+
+	e.key = __UNCONST("b");
+	ep2 = hsearch(e, FIND);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	ATF_REQUIRE(ep2 != NULL);
+	ATF_REQUIRE_STREQ(ep2->key, "b");
+	ATF_REQUIRE_EQ((intptr_t)ep2->data, 1);
+
+	hdestroy();
+}
+
+ATF_TC(hsearch_r_basic);
+ATF_TC_HEAD(hsearch_r_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks basic insertions and searching");
+}
+
+ATF_TC_BODY(hsearch_r_basic, tc)
+{
+	ENTRY e, *ep;
+	char ch[2];
+	int i;
+	struct hsearch_data t;
+
+	REQUIRE_ERRNO(hcreate_r(16, &t) != 0);
+
+	/* ch[1] should be constant from here on down. */
+	ch[1] = '\0';
+
+	/* Basic insertions.  Check enough that there'll be collisions. */
+	for (i = 0; i < 26; i++) {
+		ch[0] = 'a' + i;
+		e.key = strdup(ch);	/* ptr to provided key is kept! */
+		ATF_REQUIRE(e.key != NULL);
+		e.data = (void *)(intptr_t)i;
+
+		ATF_REQUIRE(hsearch_r(e, ENTER, &ep, &t) == 1);
+		ATF_REQUIRE(ep != NULL);
+		ATF_REQUIRE_STREQ(ep->key, ch);
+		ATF_REQUIRE_EQ((intptr_t)ep->data, i);
+	}
+
+	/* e.key should be constant from here on down. */
+	e.key = ch;
+
+	/* Basic lookups. */
+	for (i = 0; i < 26; i++) {
+		ch[0] = 'a' + i;
+
+		ATF_REQUIRE(hsearch_r(e, FIND, &ep, &t) == 1);
+		ATF_REQUIRE(ep != NULL);
+		ATF_REQUIRE_STREQ(ep->key, ch);
+		ATF_REQUIRE_EQ((intptr_t)ep->data, i);
+	}
+
+	hdestroy1_r(&t, free, NULL);
+}
+
+ATF_TC(hsearch_r_duplicate);
+ATF_TC_HEAD(hsearch_r_duplicate, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that inserting duplicate "
+	    "doesn't overwrite existing data");
+}
+
+ATF_TC_BODY(hsearch_r_duplicate, tc)
+{
+	ENTRY e, *ep;
+	struct hsearch_data t;
+
+	REQUIRE_ERRNO(hcreate_r(16, &t));
+
+	e.key = __UNCONST("a");
+	e.data = (void *)(intptr_t) 0;
+
+	ATF_REQUIRE(hsearch_r(e, ENTER, &ep, &t) == 1);
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	e.data = (void *)(intptr_t)12345;
+
+	ATF_REQUIRE(hsearch_r(e, ENTER, &ep, &t) == 1);
+	ATF_REQUIRE(hsearch_r(e, FIND, &ep, &t) == 1);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	hdestroy_r(&t);
+}
+
+ATF_TC(hsearch_r_nonexistent);
+ATF_TC_HEAD(hsearch_r_nonexistent, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks searching for non-existent entry");
+}
+
+ATF_TC_BODY(hsearch_r_nonexistent, tc)
+{
+	ENTRY e, *ep;
+	struct hsearch_data t;
+
+	REQUIRE_ERRNO(hcreate_r(16, &t));
+
+	e.key = __UNCONST("A");
+	ATF_REQUIRE(hsearch_r(e, FIND, &ep, &t) == 1);
+	ATF_REQUIRE_EQ(ep, NULL);
+
+	hdestroy_r(&t);
+}
+
+ATF_TC(hsearch_r_two);
+ATF_TC_HEAD(hsearch_r_two, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that searching doesn't overwrite previous search results");
+}
+
+ATF_TC_BODY(hsearch_r_two, tc)
+{
+	ENTRY e, *ep, *ep2;
+	struct hsearch_data t;
+
+	REQUIRE_ERRNO(hcreate_r(16, &t));
+
+	e.key = __UNCONST("a");
+	e.data = (void*)(intptr_t)0;
+
+	ATF_REQUIRE(hsearch_r(e, ENTER, &ep, &t) == 1);
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	e.key = __UNCONST("b");
+	e.data = (void*)(intptr_t)1;
+
+	ATF_REQUIRE(hsearch_r(e, ENTER, &ep, &t) == 1);
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "b");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 1);
+
+	e.key = __UNCONST("a");
+	ATF_REQUIRE(hsearch_r(e, FIND, &ep, &t) == 1);
+
+	e.key = __UNCONST("b");
+	ATF_REQUIRE(hsearch_r(e, FIND, &ep2, &t) == 1);
+
+	ATF_REQUIRE(ep != NULL);
+	ATF_REQUIRE_STREQ(ep->key, "a");
+	ATF_REQUIRE_EQ((intptr_t)ep->data, 0);
+
+	ATF_REQUIRE(ep2 != NULL);
+	ATF_REQUIRE_STREQ(ep2->key, "b");
+	ATF_REQUIRE_EQ((intptr_t)ep2->data, 1);
+
+	hdestroy_r(&t);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, hsearch_basic);
+	ATF_TP_ADD_TC(tp, hsearch_duplicate);
+	ATF_TP_ADD_TC(tp, hsearch_nonexistent);
+	ATF_TP_ADD_TC(tp, hsearch_two);
+
+	ATF_TP_ADD_TC(tp, hsearch_r_basic);
+	ATF_TP_ADD_TC(tp, hsearch_r_duplicate);
+	ATF_TP_ADD_TC(tp, hsearch_r_nonexistent);
+	ATF_TP_ADD_TC(tp, hsearch_r_two);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_mi_vector_hash.c b/contrib/netbsd-tests/lib/libc/stdlib/t_mi_vector_hash.c
new file mode 100644
index 000000000000..77d64435235d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_mi_vector_hash.c
@@ -0,0 +1,95 @@
+/*	$NetBSD: t_mi_vector_hash.c,v 1.3 2011/07/07 11:12:18 jruoho Exp $	*/
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mi_vector_hash.c,v 1.3 2011/07/07 11:12:18 jruoho Exp $");
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <string.h>
+
+ATF_TC(mi_vector_hash_basic);
+ATF_TC_HEAD(mi_vector_hash_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test mi_vector_hash_vector_hash for consistent results");
+}
+
+static const struct testvector {
+	const char *vector;
+	uint32_t hashes[3];
+} testv[] = {
+	{ "hello, world", { 0xd38f7f21, 0xbf6be9ab, 0x37a0e989 } },
+	{ "", { 0x9b2ec03d, 0xdb2b69ae, 0xbd49d10d } },
+	{ "a", { 0x9454baa3, 0xb711c708, 0x29eec818 } },
+	{ "ab", { 0x9a5dca90, 0xdd212644, 0x9879ac41 } },
+	{ "abc", { 0x0b91c470, 0x4770cdf5, 0x251e4793 } },
+	{ "abcd", { 0x5f128df3, 0xf5a667a6, 0x5ae61fa5 } },
+	{ "abcde", { 0x4cbae281, 0x799c0ed5, 0x03a96866 } },
+	{ "abcdef", { 0x507a54c8, 0xb6bd06f4, 0xde922732 } },
+	{ "abcdefg", { 0xae2bca5d, 0x61e960ef, 0xb9e6762c } },
+	{ "abcdefgh", { 0xd1021264, 0x87f6988f, 0x053f775e } },
+	{ "abcdefghi", { 0xe380defc, 0xfc35a811, 0x3a7b0a5f } },
+	{ "abcdefghij", { 0x9a504408, 0x70d2e89d, 0xc9cac242 } },
+	{ "abcdefghijk", { 0x376117d0, 0x89f434d4, 0xe52b8e4c } },
+	{ "abcdefghijkl", { 0x92253599, 0x7b6ff99e, 0x0b1b3ea5 } },
+	{ "abcdefghijklm", { 0x92ee6a52, 0x55587d47, 0x3122b031 } },
+	{ "abcdefghijklmn", { 0x827baf08, 0x1d0ada73, 0xfec330e0 } },
+	{ "abcdefghijklmno", { 0x06ab787d, 0xc1ad17c2, 0x11dccf31 } },
+	{ "abcdefghijklmnop", { 0x2cf18103, 0x638c9268, 0xfa1ecf51 } },
+};
+
+ATF_TC_BODY(mi_vector_hash_basic, tc)
+{
+	size_t i, j, len;
+	uint32_t hashes[3];
+	char buf[256];
+
+	for (j = 0; j < 8; ++j) {
+		for (i = 0; i < sizeof(testv) / sizeof(testv[0]); ++i) {
+			len = strlen(testv[i].vector);
+			strcpy(buf + j, testv[i].vector);
+			mi_vector_hash(buf + j, len, 0, hashes);
+			ATF_CHECK_EQ(hashes[0], testv[i].hashes[0]);
+			ATF_CHECK_EQ(hashes[1], testv[i].hashes[1]);
+			ATF_CHECK_EQ(hashes[2], testv[i].hashes[2]);
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mi_vector_hash_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c b/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c
new file mode 100644
index 000000000000..47afb8493bed
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c
@@ -0,0 +1,88 @@
+/*	$NetBSD: t_posix_memalign.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_posix_memalign.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $");
+
+#include <atf-c.h>
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+ATF_TC(posix_memalign_basic);
+ATF_TC_HEAD(posix_memalign_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks posix_memalign(3)");
+}
+ATF_TC_BODY(posix_memalign_basic, tc)
+{
+	size_t size[] = {
+		1, 2, 3, 4, 10, 100, 16384, 32768, 65536
+	};
+	size_t align[] = {
+		512, 1024, 16, 32, 64, 4, 2048, 16, 2
+	};
+
+	size_t i;
+	void *p;
+
+	for (i = 0; i < __arraycount(size); i++) {
+		int ret;
+		p = (void*)0x1;
+
+		(void)printf("Checking posix_memalign(&p, %zd, %zd)...\n",
+			align[i], size[i]);
+		ret = posix_memalign(&p, align[i], size[i]);
+
+		if ( align[i] < sizeof(void *))
+			ATF_REQUIRE_EQ_MSG(ret, EINVAL,
+			    "posix_memalign: %s", strerror(ret));
+		else {
+			ATF_REQUIRE_EQ_MSG(ret, 0,
+			    "posix_memalign: %s", strerror(ret));
+			ATF_REQUIRE_EQ_MSG(((intptr_t)p) & (align[i] - 1), 0,
+			    "p = %p", p);
+			free(p);
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, posix_memalign_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_random.c b/contrib/netbsd-tests/lib/libc/stdlib/t_random.c
new file mode 100644
index 000000000000..9a6d21ebb647
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_random.c
@@ -0,0 +1,82 @@
+/* $NetBSD: t_random.c,v 1.3 2012/03/29 08:56:06 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_random.c,v 1.3 2012/03/29 08:56:06 jruoho Exp $");
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+ * TODO: Add some general RNG tests (cf. the famous "diehard" tests?).
+ */
+
+ATF_TC(random_same);
+ATF_TC_HEAD(random_same, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that random(3) does not always return the same "
+	    "value when the seed is initialized to zero");
+}
+
+#define MAX_ITER 10
+
+ATF_TC_BODY(random_same, tc)
+{
+	long buf[MAX_ITER];
+	size_t i, j;
+
+	/*
+	 * See CVE-2012-1577.
+	 */
+	srandom(0);
+
+	for (i = 0; i < __arraycount(buf); i++) {
+
+		buf[i] = random();
+
+		for (j = 0; j < i; j++) {
+
+			(void)fprintf(stderr, "i = %zu, j = %zu: "
+			    "%ld vs. %ld\n", i, j, buf[i], buf[j]);
+
+			ATF_CHECK(buf[i] != buf[j]);
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, random_same);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c b/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
new file mode 100644
index 000000000000..d7ebe1b628b3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
@@ -0,0 +1,335 @@
+/*	$NetBSD: t_strtod.c,v 1.31 2012/09/26 07:24:38 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+/* Public domain, Otto Moerbeek <otto@drijf.net>, 2006. */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strtod.c,v 1.31 2012/09/26 07:24:38 jruoho Exp $");
+
+#include <errno.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
+#include <fenv.h>
+#endif
+
+#if !defined(__vax__)
+static const char * const inf_strings[] =
+    { "Inf", "INF", "-Inf", "-INF", "Infinity", "+Infinity",
+      "INFINITY", "-INFINITY", "InFiNiTy", "+InFiNiTy" };
+const char *nan_string = "NaN(x)y";
+#endif
+
+ATF_TC(strtod_basic);
+ATF_TC_HEAD(strtod_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strtod(3)");
+}
+
+ATF_TC_BODY(strtod_basic, tc)
+{
+	static const size_t n = 1024 * 1000;
+
+	for (size_t i = 1; i < n; i = i + 1024) {
+		char buf[512];
+		(void)snprintf(buf, sizeof(buf), "%zu.%zu", i, i + 1);
+
+		errno = 0;
+		double d = strtod(buf, NULL);
+
+		ATF_REQUIRE(d > 0.0);
+		ATF_REQUIRE(errno == 0);
+	}
+}
+
+ATF_TC(strtod_hex);
+ATF_TC_HEAD(strtod_hex, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtod(3) with hexadecimals");
+}
+
+#ifdef __vax__
+#define SMALL_NUM       1.0e-38
+#else
+#define SMALL_NUM       1.0e-40
+#endif
+
+ATF_TC_BODY(strtod_hex, tc)
+{
+	const char *str;
+	char *end;
+	volatile double d;
+
+	str = "-0x0";
+	d = strtod(str, &end);	/* -0.0 */
+
+	ATF_REQUIRE(end == str + 4);
+	ATF_REQUIRE(signbit(d) != 0);
+	ATF_REQUIRE(fabs(d) < SMALL_NUM);
+
+	str = "-0x";
+	d = strtod(str, &end);	/* -0.0 */
+
+	ATF_REQUIRE(end == str + 2);
+	ATF_REQUIRE(signbit(d) != 0);
+	ATF_REQUIRE(fabs(d) < SMALL_NUM);
+}
+
+ATF_TC(strtod_inf);
+ATF_TC_HEAD(strtod_inf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtod(3) with INF (PR lib/33262)");
+}
+
+ATF_TC_BODY(strtod_inf, tc)
+{
+#ifndef __vax__
+	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
+		volatile double d = strtod(inf_strings[i], NULL);
+		ATF_REQUIRE(isinf(d) != 0);
+	}
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtof_inf);
+ATF_TC_HEAD(strtof_inf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtof(3) with INF (PR lib/33262)");
+}
+
+ATF_TC_BODY(strtof_inf, tc)
+{
+#ifndef __vax__
+	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
+		volatile float f = strtof(inf_strings[i], NULL);
+		ATF_REQUIRE(isinf(f) != 0);
+	}
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtold_inf);
+ATF_TC_HEAD(strtold_inf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtold(3) with INF (PR lib/33262)");
+}
+
+ATF_TC_BODY(strtold_inf, tc)
+{
+#ifndef __vax__
+#   ifdef __HAVE_LONG_DOUBLE
+
+	for (size_t i = 0; i < __arraycount(inf_strings); i++) {
+		volatile long double ld = strtold(inf_strings[i], NULL);
+		ATF_REQUIRE(isinf(ld) != 0);
+	}
+#   else
+	atf_tc_skip("Requires long double support");
+#   endif
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtod_nan);
+ATF_TC_HEAD(strtod_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtod(3) with NaN");
+}
+
+ATF_TC_BODY(strtod_nan, tc)
+{
+#ifndef __vax__
+	char *end;
+
+	volatile double d = strtod(nan_string, &end);
+	ATF_REQUIRE(isnan(d) != 0);
+	ATF_REQUIRE(strcmp(end, "y") == 0);
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtof_nan);
+ATF_TC_HEAD(strtof_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtof(3) with NaN");
+}
+
+ATF_TC_BODY(strtof_nan, tc)
+{
+#ifndef __vax__
+	char *end;
+
+	volatile float f = strtof(nan_string, &end);
+	ATF_REQUIRE(isnanf(f) != 0);
+	ATF_REQUIRE(strcmp(end, "y") == 0);
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtold_nan);
+ATF_TC_HEAD(strtold_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A strtold(3) with NaN (PR lib/45020)");
+}
+
+ATF_TC_BODY(strtold_nan, tc)
+{
+#ifndef __vax__
+#   ifdef __HAVE_LONG_DOUBLE
+
+	char *end;
+
+	volatile long double ld = strtold(nan_string, &end);
+	ATF_REQUIRE(isnan(ld) != 0);
+	ATF_REQUIRE(__isnanl(ld) != 0);
+	ATF_REQUIRE(strcmp(end, "y") == 0);
+#   else
+	atf_tc_skip("Requires long double support");
+#   endif
+#else
+	atf_tc_skip("vax not supported");
+#endif
+}
+
+ATF_TC(strtod_round);
+ATF_TC_HEAD(strtod_round, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test rouding in strtod(3)");
+}
+
+ATF_TC_BODY(strtod_round, tc)
+{
+#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
+
+	/*
+	 * Test that strtod(3) honors the current rounding mode.
+	 * The used value is somewhere near 1 + DBL_EPSILON + FLT_EPSILON.
+	 */
+	const char *val =
+	    "1.00000011920928977282585492503130808472633361816406";
+
+	(void)fesetround(FE_UPWARD);
+
+	volatile double d1 = strtod(val, NULL);
+
+	(void)fesetround(FE_DOWNWARD);
+
+	volatile double d2 = strtod(val, NULL);
+
+	if (fabs(d1 - d2) > 0.0)
+		return;
+	else {
+		atf_tc_expect_fail("PR misc/44767");
+		atf_tc_fail("strtod(3) did not honor fesetround(3)");
+	}
+#else
+	atf_tc_skip("Requires one of i386, amd64 or sparc");
+#endif
+}
+
+ATF_TC(strtod_underflow);
+ATF_TC_HEAD(strtod_underflow, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test underflow in strtod(3)");
+}
+
+ATF_TC_BODY(strtod_underflow, tc)
+{
+
+	const char *tmp =
+	    "0.0000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000000000000000000000000000000000000000000"
+	    "000000000000000002";
+
+	errno = 0;
+	volatile double d = strtod(tmp, NULL);
+
+	if (d != 0 || errno != ERANGE)
+		atf_tc_fail("strtod(3) did not detect underflow");
+}
+
+/*
+ * Bug found by Geza Herman.
+ * See
+ * http://www.exploringbinary.com/a-bug-in-the-bigcomp-function-of-david-gays-strtod/
+ */
+ATF_TC(strtod_gherman_bug);
+ATF_TC_HEAD(strtod_gherman_bug, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test a bug found by Geza Herman");
+}
+
+ATF_TC_BODY(strtod_gherman_bug, tc)
+{
+
+	const char *str =
+	    "1.8254370818746402660437411213933955878019332885742187";
+
+	errno = 0;
+	volatile double d = strtod(str, NULL);
+
+	ATF_CHECK(d == 0x1.d34fd8378ea83p+0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strtod_basic);
+	ATF_TP_ADD_TC(tp, strtod_hex);
+	ATF_TP_ADD_TC(tp, strtod_inf);
+	ATF_TP_ADD_TC(tp, strtof_inf);
+	ATF_TP_ADD_TC(tp, strtold_inf);
+	ATF_TP_ADD_TC(tp, strtod_nan);
+	ATF_TP_ADD_TC(tp, strtof_nan);
+	ATF_TP_ADD_TC(tp, strtold_nan);
+	ATF_TP_ADD_TC(tp, strtod_round);
+	ATF_TP_ADD_TC(tp, strtod_underflow);
+	ATF_TP_ADD_TC(tp, strtod_gherman_bug);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c
new file mode 100644
index 000000000000..5a0c6d0e51ea
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c
@@ -0,0 +1,234 @@
+/*	$NetBSD: t_strtol.c,v 1.5 2011/06/14 02:45:58 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strtol.c,v 1.5 2011/06/14 02:45:58 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+struct test {
+	const char	*str;
+	int64_t		 res;
+	int		 base;
+	const char	*end;
+};
+
+static void	check(struct test *, long int, long long int, char *);
+
+static void
+check(struct test *t, long int li, long long int lli, char *end)
+{
+
+	if (li != -1 && li != t->res)
+		atf_tc_fail_nonfatal("strtol(%s, &end, %d) failed "
+		    "(rv = %ld)", t->str, t->base, li);
+
+	if (lli != -1 && lli != t->res)
+		atf_tc_fail_nonfatal("strtoll(%s, NULL, %d) failed "
+		    "(rv = %lld)", t->str, t->base, lli);
+
+	if (t->end != NULL && strcmp(t->end, end) != 0)
+		atf_tc_fail_nonfatal("invalid end pointer ('%s') from "
+		    "strtol(%s, &end, %d)", end, t->str, t->base);
+}
+
+ATF_TC(strtol_base);
+ATF_TC_HEAD(strtol_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strtol(3) with different bases");
+}
+
+ATF_TC_BODY(strtol_base, tc)
+{
+	struct test t[] = {
+		{ "123456789",			 123456789,  0, NULL	},
+		{ "111010110111100110100010101", 123456789,  2, NULL	},
+		{ "22121022020212200",		 123456789,  3, NULL	},
+		{ "13112330310111",		 123456789,  4, NULL	},
+		{ "223101104124",		 123456789,  5, NULL	},
+		{ "20130035113",		 123456789,  6, NULL	},
+		{ "3026236221",			 123456789,  7, NULL	},
+		{ "726746425",			 123456789,  8, NULL	},
+		{ "277266780",			 123456789,  9, NULL	},
+		{ "123456789",			 123456789, 10, NULL	},
+		{ "63762A05",			 123456789, 11, NULL	},
+		{ "35418A99",			 123456789, 12, NULL	},
+		{ "1C767471",			 123456789, 13, NULL	},
+		{ "12579781",			 123456789, 14, NULL	},
+		{ "AC89BC9",			 123456789, 15, NULL	},
+		{ "75BCD15",			 123456789, 16, NULL	},
+		{ "123456789",			    342391,  8, NULL	},
+		{ "0123456789",			    342391,  0, NULL	},
+		{ "0123456789",			 123456789, 10, NULL	},
+		{ "0x75bcd15",		         123456789,  0, NULL	},
+	};
+
+	long long int lli;
+	long int li;
+	char *end;
+	size_t i;
+
+	for (i = 0; i < __arraycount(t); i++) {
+
+		li = strtol(t[i].str, &end, t[i].base);
+		lli = strtoll(t[i].str, NULL, t[i].base);
+
+		check(&t[i], li, lli, end);
+	}
+}
+
+ATF_TC(strtol_case);
+ATF_TC_HEAD(strtol_case, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Case insensitivity with strtol(3)");
+}
+
+ATF_TC_BODY(strtol_case, tc)
+{
+	struct test t[] = {
+		{ "abcd",	0xabcd, 16, NULL	},
+		{ "     dcba",	0xdcba, 16, NULL	},
+		{ "abcd dcba",	0xabcd, 16, " dcba"	},
+		{ "abc0x123",	0xabc0, 16, NULL	},
+		{ "abcd\0x123",	0xabcd, 16, "\0x123"	},
+		{ "ABCD",	0xabcd, 16, NULL	},
+		{ "aBcD",	0xabcd, 16, NULL	},
+		{ "0xABCD",	0xabcd, 16, NULL	},
+		{ "0xABCDX",	0xabcd, 16, "X"		},
+	};
+
+	long long int lli;
+	long int li;
+	char *end;
+	size_t i;
+
+	for (i = 0; i < __arraycount(t); i++) {
+
+		li = strtol(t[i].str, &end, t[i].base);
+		lli = strtoll(t[i].str, NULL, t[i].base);
+
+		check(&t[i], li, lli, end);
+	}
+}
+
+ATF_TC(strtol_range);
+ATF_TC_HEAD(strtol_range, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ERANGE from strtol(3)");
+}
+
+ATF_TC_BODY(strtol_range, tc)
+{
+
+#if LONG_MAX == 0x7fffffff	/* XXX: Is this portable? */
+
+	struct test t[] = {
+		{ "20000000000", 2147483647, 8, NULL },
+		{ "2147483648",  2147483647, 10, NULL },
+		{ "80000000",	 2147483647, 16, NULL },
+	};
+#else
+	struct test t[] = {
+		{ "1000000000000000000000", 9223372036854775807, 8, NULL },
+		{ "9223372036854775808",    9223372036854775807, 10, NULL },
+		{ "8000000000000000",       9223372036854775807, 16, NULL },
+	};
+#endif
+
+	long int li;
+	char *end;
+	size_t i;
+
+	for (i = 0; i < __arraycount(t); i++) {
+
+		errno = 0;
+		li = strtol(t[i].str, &end, t[i].base);
+
+		if (errno != ERANGE)
+			atf_tc_fail("strtol(3) did not catch ERANGE");
+
+		check(&t[i], li, -1, end);
+	}
+}
+
+ATF_TC(strtol_signed);
+ATF_TC_HEAD(strtol_signed, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strtol(3)");
+}
+
+ATF_TC_BODY(strtol_signed, tc)
+{
+	struct test t[] = {
+		{ "1",		 1, 0, NULL	},
+		{ " 2",		 2, 0, NULL	},
+		{ "  3",	 3, 0, NULL	},
+		{ " -3",	-3, 0, NULL	},
+		{ "--1",	 0, 0, "--1"	},
+		{ "+-2",	 0, 0, "+-2"	},
+		{ "++3",	 0, 0, "++3"	},
+		{ "+9",		 9, 0, NULL	},
+		{ "+123",      123, 0, NULL	},
+		{ "-1 3",       -1, 0, " 3"	},
+		{ "-1.3",       -1, 0, ".3"	},
+		{ "-  3",        0, 0, "-  3"	},
+		{ "+33.",       33, 0, "."	},
+		{ "30x0",       30, 0, "x0"	},
+	};
+
+	long long int lli;
+	long int li;
+	char *end;
+	size_t i;
+
+	for (i = 0; i < __arraycount(t); i++) {
+
+		li = strtol(t[i].str, &end, t[i].base);
+		lli = strtoll(t[i].str, NULL, t[i].base);
+
+		check(&t[i], li, lli, end);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strtol_base);
+	ATF_TP_ADD_TC(tp, strtol_case);
+	ATF_TP_ADD_TC(tp, strtol_range);
+	ATF_TP_ADD_TC(tp, strtol_signed);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_system.c b/contrib/netbsd-tests/lib/libc/stdlib/t_system.c
new file mode 100644
index 000000000000..235005bc809f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_system.c
@@ -0,0 +1,83 @@
+/* $NetBSD: t_system.c,v 1.1 2011/09/11 10:32:23 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_system.c,v 1.1 2011/09/11 10:32:23 jruoho Exp $");
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char *path = "system";
+
+ATF_TC_WITH_CLEANUP(system_basic);
+ATF_TC_HEAD(system_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of system(3)");
+}
+
+ATF_TC_BODY(system_basic, tc)
+{
+	char buf[23];
+	int fd, i = 2;
+
+	ATF_REQUIRE(system("/bin/echo -n > system") == 0);
+
+	while (i >= 0) {
+		ATF_REQUIRE(system("/bin/echo -n garbage >> system") == 0);
+		i--;
+	}
+
+	fd = open(path, O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	(void)memset(buf, '\0', sizeof(buf));
+
+	ATF_REQUIRE(read(fd, buf, 21) == 21);
+	ATF_REQUIRE(strcmp(buf, "garbagegarbagegarbage") == 0);
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(system_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, system_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_bm.c b/contrib/netbsd-tests/lib/libc/string/t_bm.c
new file mode 100644
index 000000000000..5ec402297538
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_bm.c
@@ -0,0 +1,102 @@
+/* $Id: t_bm.c,v 1.1 2014/06/23 10:53:20 shm Exp $ */
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Mateusz Kocielski.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$Id: t_bm.c,v 1.1 2014/06/23 10:53:20 shm Exp $");
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <bm.h>
+#include <string.h>
+#include <stdlib.h>
+
+ATF_TC(bm);
+ATF_TC_HEAD(bm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bm(3)");
+}
+
+typedef struct {
+	const char *pattern;
+	const char *text;
+	const char *freq;
+	ssize_t match;
+} t_testcase;
+
+const t_testcase testcases[] = {
+	{"test", "test", NULL, 0},
+	{"test", "ttest", NULL, 1},
+	{"test", "tes", NULL, -1},
+	{"test", "testtesttest", NULL, 0},
+	{"test", "testtesttesttesttesttest", NULL, 0},
+	{"test", "------------------------", NULL, -1},
+	{"a", "a", NULL, 0},
+	{"a", "ba", NULL, 1},
+	{"a", "bba", NULL, 2},
+	{"bla", "bl", NULL, -1},
+	{"a", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", NULL, -1},
+	{"test", "qfwiofjqeiwofjioqewfjeiqwjfiqewjfioqewfjioewqjfioewqjfioewqjoi",
+	  NULL, -1},
+	{"needle", "haystack", NULL, -1},
+	{"netbsd", "freebsd netbsd openbsd", NULL, 8},
+};
+
+ATF_TC_BODY(bm, tc)
+{
+	size_t ts;
+	u_char *off;
+	char *text;
+	bm_pat *pattern;
+	
+	for (ts = 0; ts < sizeof(testcases)/sizeof(t_testcase); ts++) {
+		ATF_CHECK(pattern = bm_comp((const u_char *)testcases[ts].pattern,
+		  strlen(testcases[ts].pattern), (const u_char *)testcases[ts].freq));
+
+		ATF_REQUIRE(text = strdup(testcases[ts].text));
+		off = bm_exec(pattern, (u_char *)text, strlen(text));
+
+		if (testcases[ts].match == -1)
+			ATF_CHECK_EQ(off, NULL);
+		else
+			ATF_CHECK_EQ(testcases[ts].match,
+			  (off-(u_char *)text));
+
+		bm_free(pattern);
+		free(text);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, bm);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memchr.c b/contrib/netbsd-tests/lib/libc/string/t_memchr.c
new file mode 100644
index 000000000000..296f1f81e219
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_memchr.c
@@ -0,0 +1,194 @@
+/* $NetBSD: t_memchr.c,v 1.3 2012/04/06 07:53:10 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(memchr_basic);
+ATF_TC_HEAD(memchr_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test memchr(3) results, #1");
+}
+
+ATF_TC_BODY(memchr_basic, tc)
+{
+	/* try to trick the compiler */
+	void * (*f)(const void *, int, size_t) = memchr;
+
+	unsigned int a, t;
+	void *off, *off2;
+	char buf[32];
+
+	struct tab {
+		const char	*val;
+		size_t  	 len;
+		char		 match;
+		ssize_t		 off;
+	};
+
+	const struct tab tab[] = {
+		{ "",			0, 0, 0 },
+
+		{ "/",			0, 0, 0 },
+		{ "/",			1, 1, 0 },
+		{ "/a",			2, 1, 0 },
+		{ "/ab",		3, 1, 0 },
+		{ "/abc",		4, 1, 0 },
+		{ "/abcd",		5, 1, 0 },
+		{ "/abcde",		6, 1, 0 },
+		{ "/abcdef",		7, 1, 0 },
+		{ "/abcdefg",		8, 1, 0 },
+
+		{ "a/",			1, 0, 0 },
+		{ "a/",			2, 1, 1 },
+		{ "a/b",		3, 1, 1 },
+		{ "a/bc",		4, 1, 1 },
+		{ "a/bcd",		5, 1, 1 },
+		{ "a/bcde",		6, 1, 1 },
+		{ "a/bcdef",		7, 1, 1 },
+		{ "a/bcdefg",		8, 1, 1 },
+
+		{ "ab/",		2, 0, 0 },
+		{ "ab/",		3, 1, 2 },
+		{ "ab/c",		4, 1, 2 },
+		{ "ab/cd",		5, 1, 2 },
+		{ "ab/cde",		6, 1, 2 },
+		{ "ab/cdef",		7, 1, 2 },
+		{ "ab/cdefg",		8, 1, 2 },
+
+		{ "abc/",		3, 0, 0 },
+		{ "abc/",		4, 1, 3 },
+		{ "abc/d",		5, 1, 3 },
+		{ "abc/de",		6, 1, 3 },
+		{ "abc/def",		7, 1, 3 },
+		{ "abc/defg",		8, 1, 3 },
+
+		{ "abcd/",		4, 0, 0 },
+		{ "abcd/",		5, 1, 4 },
+		{ "abcd/e",		6, 1, 4 },
+		{ "abcd/ef",		7, 1, 4 },
+		{ "abcd/efg",		8, 1, 4 },
+
+		{ "abcde/",		5, 0, 0 },
+		{ "abcde/",		6, 1, 5 },
+		{ "abcde/f",		7, 1, 5 },
+		{ "abcde/fg",		8, 1, 5 },
+
+		{ "abcdef/",		6, 0, 0 },
+		{ "abcdef/",		7, 1, 6 },
+		{ "abcdef/g",		8, 1, 6 },
+
+		{ "abcdefg/",		7, 0, 0 },
+		{ "abcdefg/",		8, 1, 7 },
+
+		{ "\xff\xff\xff\xff" "efg/",	8, 1, 7 },
+		{ "a" "\xff\xff\xff\xff" "fg/",	8, 1, 7 },
+		{ "ab" "\xff\xff\xff\xff" "g/",	8, 1, 7 },
+		{ "abc" "\xff\xff\xff\xff" "/",	8, 1, 7 },
+	};
+
+	for (a = 1; a < 1 + sizeof(long); ++a) {
+		for (t = 0; t < (sizeof(tab) / sizeof(tab[0])); ++t) {
+			buf[a-1] = '/';
+			strcpy(&buf[a], tab[t].val);
+
+			off = f(&buf[a], '/', tab[t].len);
+			if (tab[t].match == 0) {
+				if (off != 0) {
+					fprintf(stderr, "a = %d, t = %d\n",
+					    a, t);
+					atf_tc_fail("should not have found "
+					    " char past len");
+				}
+			} else if (tab[t].match == 1) {
+				if (tab[t].off != ((char*)off - &buf[a])) {
+					fprintf(stderr, "a = %d, t = %d\n",
+					    a, t);
+					atf_tc_fail("char not found at "
+					    "correct offset");
+				}
+	    		} else {
+				fprintf(stderr, "a = %d, t = %d\n", a, t);
+				atf_tc_fail("Corrupt test case data");
+			}
+
+			/* check zero extension of char arg */
+			off2 = f(&buf[a], 0xffffff00 | '/', tab[t].len);
+			if (off2 != off)
+				atf_tc_fail("zero extension of char arg "
+				    "failed");
+		}
+	}
+}
+
+ATF_TC(memchr_simple);
+ATF_TC_HEAD(memchr_simple, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test memchr(3) results, #2");
+}
+
+ATF_TC_BODY(memchr_simple, tc)
+{
+	char buf[] = "abcdefg";
+	short i = 7;
+
+	ATF_CHECK(memchr(buf, 'a', 0) == NULL);
+	ATF_CHECK(memchr(buf, 'g', 0) == NULL);
+	ATF_CHECK(memchr(buf, 'x', 7) == NULL);
+
+	ATF_CHECK(memchr("\0", 'x', 0) == NULL);
+	ATF_CHECK(memchr("\0", 'x', 1) == NULL);
+
+	while (i <= 14) {
+
+		ATF_CHECK(memchr(buf, 'a', i) == buf + 0);
+		ATF_CHECK(memchr(buf, 'b', i) == buf + 1);
+		ATF_CHECK(memchr(buf, 'c', i) == buf + 2);
+		ATF_CHECK(memchr(buf, 'd', i) == buf + 3);
+		ATF_CHECK(memchr(buf, 'e', i) == buf + 4);
+		ATF_CHECK(memchr(buf, 'f', i) == buf + 5);
+		ATF_CHECK(memchr(buf, 'g', i) == buf + 6);
+
+		i *= 2;
+	}
+}
+
+ATF_TC(memrchr_simple);
+ATF_TC_HEAD(memrchr_simple, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test memrchr(3) results");
+}
+
+ATF_TC_BODY(memrchr_simple, tc)
+{
+	char buf[] = "abcdabcd";
+
+	ATF_CHECK(memrchr(buf, 'a', 0) == NULL);
+	ATF_CHECK(memrchr(buf, 'g', 0) == NULL);
+	ATF_CHECK(memrchr(buf, 'x', 8) == NULL);
+
+	ATF_CHECK(memrchr("\0", 'x', 0) == NULL);
+	ATF_CHECK(memrchr("\0", 'x', 1) == NULL);
+
+	ATF_CHECK(memrchr(buf, 'a', 8) == buf + 4);
+	ATF_CHECK(memrchr(buf, 'b', 8) == buf + 5);
+	ATF_CHECK(memrchr(buf, 'c', 8) == buf + 6);
+	ATF_CHECK(memrchr(buf, 'd', 8) == buf + 7);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, memchr_basic);
+	ATF_TP_ADD_TC(tp, memchr_simple);
+	ATF_TP_ADD_TC(tp, memrchr_simple);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memcpy.c b/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
new file mode 100644
index 000000000000..6485a88ae141
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
@@ -0,0 +1,150 @@
+/* $NetBSD: t_memcpy.c,v 1.5 2013/03/17 02:23:31 christos Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <md5.h>
+
+#include <sys/types.h>
+
+#define	ALIGNMENTS 16
+#define	LENGTHS	    4
+#define BLOCKTYPES 4
+
+MD5_CTX mc[1];
+
+typedef	unsigned char testBlock_t[ALIGNMENTS * LENGTHS];
+
+testBlock_t bss1, bss2;
+
+unsigned char *start[BLOCKTYPES] = {
+		bss1, bss2
+};
+
+char result[100];
+const char goodResult[] = "7b405d24bc03195474c70ddae9e1f8fb";
+
+static void
+runTest(unsigned char *b1, unsigned char *b2)
+{
+	int	i, j, k, m;
+	size_t	n;
+
+	for (i = 0; i < ALIGNMENTS; ++i) {
+		for (j = 0; j < ALIGNMENTS; ++j) {
+			k = sizeof(testBlock_t) - (i > j ? i : j);
+			for (m = 0; m < k; ++m) {
+				for (n = 0; n < sizeof(testBlock_t); ++n) {
+					b1[n] = (unsigned char)random();
+					b2[n] = (unsigned char)random();
+				}
+				memcpy(b1 + i, b2 + j, m);
+				MD5Update(mc, b1, sizeof(testBlock_t));
+				MD5Update(mc, b2, sizeof(testBlock_t));
+			}
+		}
+	}
+}
+
+ATF_TC(memcpy_basic);
+ATF_TC_HEAD(memcpy_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memcpy results");
+}
+
+ATF_TC_BODY(memcpy_basic, tc)
+{
+	int i, j;
+	testBlock_t auto1, auto2;
+
+	start[2] = auto1;
+	start[3] = auto2;
+
+	srandom(0L);
+	MD5Init(mc);
+	for (i = 0; i < BLOCKTYPES; ++i)
+		for (j = 0; j < BLOCKTYPES; ++j)
+			if (i != j)
+				runTest(start[i], start[j]);
+	MD5End(mc, result);
+	ATF_REQUIRE_EQ(strcmp(result, goodResult), 0);
+}
+
+ATF_TC(memccpy_simple);
+ATF_TC_HEAD(memccpy_simple, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test memccpy(3) results");
+}
+
+ATF_TC_BODY(memccpy_simple, tc)
+{
+	char buf[100];
+	char c = ' ';
+
+	(void)memset(buf, c, sizeof(buf));
+
+	ATF_CHECK(memccpy(buf, "foo bar", c, sizeof(buf)) != NULL);
+	ATF_CHECK(buf[4] == c);
+
+	ATF_CHECK(memccpy(buf, "foo bar", '\0', sizeof(buf) - 1) != NULL);
+	ATF_CHECK(buf[8] == c);
+
+	ATF_CHECK(memccpy(buf, "foo bar", 'x', 7) == NULL);
+	ATF_CHECK(strncmp(buf, "foo bar", 7) == 0);
+
+	ATF_CHECK(memccpy(buf, "xxxxxxx", 'r', 7) == NULL);
+	ATF_CHECK(strncmp(buf, "xxxxxxx", 7) == 0);
+}
+
+ATF_TC(memcpy_return);
+ATF_TC_HEAD(memcpy_return, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memcpy(3) return value");
+}
+
+ATF_TC_BODY(memcpy_return, tc)
+{
+	char *b = (char *)0x1;
+	char c[2];
+	ATF_REQUIRE_EQ(memcpy(b, b, 0), b);
+	ATF_REQUIRE_EQ(memcpy(c, "ab", sizeof(c)), c);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, memcpy_basic);
+	ATF_TP_ADD_TC(tp, memcpy_return);
+	ATF_TP_ADD_TC(tp, memccpy_simple);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memmem.c b/contrib/netbsd-tests/lib/libc/string/t_memmem.c
new file mode 100644
index 000000000000..1e87af892bd5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_memmem.c
@@ -0,0 +1,100 @@
+/*	$NetBSD: t_memmem.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Perry E. Metzger of Metzger, Dowdeswell & Co. LLC.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char p0[] = "";
+int lp0 = 0;
+char p1[] = "0123";
+int lp1 = 4;
+char p2[] = "456";
+int lp2 = 3;
+char p3[] = "789";
+int lp3 = 3;
+char p4[] = "abc";
+int lp4 = 3;
+char p5[] = "0";
+int lp5 = 1;
+char p6[] = "9";
+int lp6 = 1;
+char p7[] = "654";
+int lp7 = 3;
+
+char b0[] = "";
+int lb0 = 0;
+char b1[] = "0";
+int lb1 = 1;
+char b2[] = "0123456789";
+int lb2 = 10;
+
+#define expect(b)							\
+	if (!(b)) {							\
+		fprintf(stderr, "failed on line %d\n", __LINE__);	\
+		atf_tc_fail("Check stderr for test id/line");		\
+	}
+
+ATF_TC(memmem_basic);
+ATF_TC_HEAD(memmem_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test memmem results");
+}
+
+ATF_TC_BODY(memmem_basic, tc)
+{
+
+	expect(memmem(b2, lb2, p0, lp0) == b2);
+	expect(memmem(b0, lb0, p0, lp0) == b0);
+	expect(memmem(b0, lb0, p1, lp1) == NULL);
+	expect(memmem(b1, lb1, p1, lp1) == NULL);
+
+	expect(memmem(b2, lb2, p1, lp1) == b2);
+	expect(memmem(b2, lb2, p2, lp2) == (b2 + 4));
+	expect(memmem(b2, lb2, p3, lp3) == (b2 + 7));
+
+	expect(memmem(b2, lb2, p5, lp5) == b2);
+	expect(memmem(b2, lb2, p6, lp6) == (b2 + 9));
+
+	expect(memmem(b2, lb2, p4, lp4) == NULL);
+	expect(memmem(b2, lb2, p7, lp7) == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, memmem_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memset.c b/contrib/netbsd-tests/lib/libc/string/t_memset.c
new file mode 100644
index 000000000000..c1fb3855e076
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_memset.c
@@ -0,0 +1,207 @@
+/* $NetBSD: t_memset.c,v 1.3 2013/03/17 02:23:31 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_memset.c,v 1.3 2013/03/17 02:23:31 christos Exp $");
+
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static long	page = 0;
+static void	fill(char *, size_t, char);
+static bool	check(char *, size_t, char);
+
+ATF_TC(memset_array);
+ATF_TC_HEAD(memset_array, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memset(3) with arrays");
+}
+
+ATF_TC_BODY(memset_array, tc)
+{
+	char buf[1024];
+
+	(void)memset(buf, 0, sizeof(buf));
+
+	if (check(buf, sizeof(buf), 0) != true)
+		atf_tc_fail("memset(3) did not fill a static buffer");
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	if (check(buf, sizeof(buf), 'x') != true)
+		atf_tc_fail("memset(3) did not fill a static buffer");
+}
+
+ATF_TC(memset_return);
+ATF_TC_HEAD(memset_return, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memset(3) return value");
+}
+
+ATF_TC_BODY(memset_return, tc)
+{
+	char *b = (char *)0x1;
+	char c[2];
+	ATF_REQUIRE_EQ(memset(b, 0, 0), b);
+	ATF_REQUIRE_EQ(memset(c, 2, sizeof(c)), c);
+}
+
+ATF_TC(memset_basic);
+ATF_TC_HEAD(memset_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of memset(3)");
+}
+
+ATF_TC_BODY(memset_basic, tc)
+{
+	char *buf, *ret;
+
+	buf = malloc(page);
+	ret = malloc(page);
+
+	ATF_REQUIRE(buf != NULL);
+	ATF_REQUIRE(ret != NULL);
+
+	fill(ret, page, 0);
+	memset(buf, 0, page);
+
+	ATF_REQUIRE(memcmp(ret, buf, page) == 0);
+
+	fill(ret, page, 'x');
+	memset(buf, 'x', page);
+
+	ATF_REQUIRE(memcmp(ret, buf, page) == 0);
+
+	free(buf);
+	free(ret);
+}
+
+ATF_TC(memset_nonzero);
+ATF_TC_HEAD(memset_nonzero, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memset(3) with non-zero params");
+}
+
+ATF_TC_BODY(memset_nonzero, tc)
+{
+	const size_t n = 0x7f;
+	char *buf;
+	size_t i;
+
+	buf = malloc(page);
+	ATF_REQUIRE(buf != NULL);
+
+	for (i = 0x21; i < n; i++) {
+
+		(void)memset(buf, i, page);
+
+		if (check(buf, page, i) != true)
+			atf_tc_fail("memset(3) did not fill properly");
+	}
+
+	free(buf);
+}
+
+ATF_TC(memset_struct);
+ATF_TC_HEAD(memset_struct, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memset(3) with a structure");
+}
+
+ATF_TC_BODY(memset_struct, tc)
+{
+	struct stat st;
+
+	st.st_dev = 0;
+	st.st_ino = 1;
+	st.st_mode = 2;
+	st.st_nlink = 3;
+	st.st_uid = 4;
+	st.st_gid = 5;
+	st.st_rdev = 6;
+	st.st_size = 7;
+	st.st_atime = 8;
+	st.st_mtime = 9;
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	ATF_CHECK(st.st_dev == 0);
+	ATF_CHECK(st.st_ino == 0);
+	ATF_CHECK(st.st_mode == 0);
+	ATF_CHECK(st.st_nlink == 0);
+	ATF_CHECK(st.st_uid == 0);
+	ATF_CHECK(st.st_gid == 0);
+	ATF_CHECK(st.st_rdev == 0);
+	ATF_CHECK(st.st_size == 0);
+	ATF_CHECK(st.st_atime == 0);
+	ATF_CHECK(st.st_mtime == 0);
+}
+
+static void
+fill(char *buf, size_t len, char x)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++)
+		buf[i] = x;
+}
+
+static bool
+check(char *buf, size_t len, char x)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++) {
+
+		if (buf[i] != x)
+			return false;
+	}
+
+	return true;
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, memset_array);
+	ATF_TP_ADD_TC(tp, memset_basic);
+	ATF_TP_ADD_TC(tp, memset_nonzero);
+	ATF_TP_ADD_TC(tp, memset_struct);
+	ATF_TP_ADD_TC(tp, memset_return);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_popcount.c b/contrib/netbsd-tests/lib/libc/string/t_popcount.c
new file mode 100644
index 000000000000..2bae52f6e89b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_popcount.c
@@ -0,0 +1,198 @@
+/*	$NetBSD: t_popcount.c,v 1.4 2011/07/07 08:27:36 jruoho Exp $	*/
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_popcount.c,v 1.4 2011/07/07 08:27:36 jruoho Exp $");
+
+#include <atf-c.h>
+#include <strings.h>
+
+static unsigned int byte_count[256];
+
+static void
+popcount_init(const char *cfg_var)
+{
+	unsigned int i, j;
+
+	if (strcasecmp(cfg_var, "YES")  == 0 ||
+	    strcasecmp(cfg_var, "Y")    == 0 ||
+	    strcasecmp(cfg_var, "1")    == 0 ||
+	    strcasecmp(cfg_var, "T")    == 0 ||
+	    strcasecmp(cfg_var, "TRUE") == 0) {
+		for (i = 0; i < 256; ++i) {
+			byte_count[i] = 0;
+			for (j = i; j != 0; j >>= 1) {
+				if (j & 1)
+					++byte_count[i];
+			}
+		}
+		return;
+	}
+
+	atf_tc_skip("config variable \"run_popcount\" not set to YES/TRUE");
+}
+
+unsigned int test_parts[256] = {
+	0x318e53e6U, 0x11710316U, 0x62608ffaU, 0x67e0f562U,
+	0xe432e82cU, 0x9862e8b2U, 0x7d96a627U, 0x3f74ad31U,
+	0x3cecf906U, 0xcdc0dcb4U, 0x241dab64U, 0x31e6133eU,
+	0x23086ad4U, 0x721d5a91U, 0xc483da53U, 0x6a62af52U,
+	0xf3f5c386U, 0xe0de3f77U, 0x65afe528U, 0xf4816485U,
+	0x40ccbf08U, 0x25df49c1U, 0xae5a6ee0U, 0xab36ccadU,
+	0x87e1ec29U, 0x60ca2407U, 0x49d62e47U, 0xa09f2df5U,
+	0xaf4c1c68U, 0x8ef08d50U, 0x624cfd2fU, 0xa6a36f20U,
+	0x68aaf879U, 0x0fe9deabU, 0x5c9a4060U, 0x215d8f08U,
+	0x55e84712U, 0xea1f1681U, 0x3a10b8a1U, 0x08e06632U,
+	0xcbc875e2U, 0x31e53258U, 0xcd3807a4U, 0xb9d17516U,
+	0x8fbfd9abU, 0x6651b555U, 0x550fb381U, 0x05061b9dU,
+	0x35aef3f2U, 0x9175078cU, 0xae0f14daU, 0x92a2d5f8U,
+	0x70d968feU, 0xe86f41c5U, 0x5cfaf39fU, 0x8499b18dU,
+	0xb33f879aU, 0x0a68ad3dU, 0x9323ecc1U, 0x060037ddU,
+	0xb91a5051U, 0xa0dbebf6U, 0x3e6aa6f1U, 0x7b422b5bU,
+	0x599e811eU, 0x199f7594U, 0xca453365U, 0x1cda6f48U,
+	0xe9c75d2cU, 0x6a873217U, 0x79c45d72U, 0x143b8e37U,
+	0xa11df26eU, 0xaf31f80aU, 0x311bf759U, 0x2378563cU,
+	0x9ab95fa5U, 0xfcf4d47cU, 0x1f7db268U, 0xd64b09e1U,
+	0xad7936daU, 0x7a59005cU, 0x45b173d3U, 0xc1a71b32U,
+	0x7d9f0de2U, 0xa9ac3792U, 0x9e7f9966U, 0x7f0b8080U,
+	0xece6c06fU, 0x78d92a3cU, 0x6d5f8f6cU, 0xc50ca544U,
+	0x5d8ded27U, 0xd27a8462U, 0x4bcd13ccU, 0xd49075f2U,
+	0xa8d52acfU, 0x41915d97U, 0x564f7062U, 0xefb046e2U,
+	0xe296277aU, 0x605b0ea3U, 0x10b2c3a1U, 0x4e8e5c66U,
+	0x4bd8ec04U, 0x29935be9U, 0x381839f3U, 0x555d8824U,
+	0xd6befddbU, 0x5d8d6d6eU, 0xb2fdb7b4U, 0xb471c8fcU,
+	0xc2fd325bU, 0x932d2487U, 0xbdbbadefU, 0x66c8895dU,
+	0x5d77857aU, 0x259f1cc0U, 0x302037faU, 0xda9aa7a8U,
+	0xb112c6aaU, 0x78f74192U, 0xfd4da741U, 0xfa5765c1U,
+	0x6ea1bc5cU, 0xd283f39cU, 0x268ae67dU, 0xdedcd134U,
+	0xbbf92410U, 0x6b45fb55U, 0x2f75ac71U, 0x64bf2ca5U,
+	0x8b99675aU, 0x3f4923b6U, 0x7e610550U, 0x04b1c06dU,
+	0x8f92e7c6U, 0x45cb608bU, 0x2d06d1f2U, 0x79cf387aU,
+	0xfd3ed225U, 0x243eee20U, 0x2cbefc6fU, 0x8286cbaaU,
+	0x70d4c182U, 0x054e3cc6U, 0xb66c5362U, 0x0c73fa5dU,
+	0x539948feU, 0xec638563U, 0x0cf04ab6U, 0xec7b52f4U,
+	0x58eeffceU, 0x6fe8049aU, 0xb3b33332U, 0x2e33bfdbU,
+	0xcc817567U, 0x71ac57c8U, 0x4bab3ac7U, 0x327c558bU,
+	0x82a6d279U, 0x5adf71daU, 0x1074a656U, 0x3c533c1fU,
+	0x82fdbe69U, 0x21b4f6afU, 0xd59580e8U, 0x0de824ebU,
+	0xa510941bU, 0x7cd91144U, 0xa8c10631U, 0x4c839267U,
+	0x5d503c2fU, 0xe1567d55U, 0x23910cc7U, 0xdb1bdc34U,
+	0x2a866704U, 0x33e21f0cU, 0x5c7681b4U, 0x818651caU,
+	0xb1d18162U, 0x225ad014U, 0xadf7d6baU, 0xac548d9bU,
+	0xe94736e5U, 0x2279c5f1U, 0x33215d2cU, 0xdc8ab90eU,
+	0xf5e3d7f2U, 0xedcb15cfU, 0xc9a43c4cU, 0xfc678fc6U,
+	0x43796b95U, 0x3f8b700cU, 0x867bbc72U, 0x81f71fecU,
+	0xd00cad7dU, 0x302c458fU, 0x8ae21accU, 0x05850ce8U,
+	0x7764d8e8U, 0x8a36cd68U, 0x40b44bd7U, 0x1cffaeb7U,
+	0x2b248f34U, 0x1eefdbafU, 0x574d7437U, 0xe86cd935U,
+	0xf53dd1c8U, 0x1b022513U, 0xef2d249bU, 0x94fb2b08U,
+	0x15d3eff8U, 0x14245e1bU, 0x82aa8425U, 0x53959028U,
+	0x9c5f9b80U, 0x325e0c82U, 0x3e236c24U, 0x74e1dd36U,
+	0x9890df3fU, 0xaf9701a2U, 0x023b3413U, 0x7634c67eU,
+	0x55cf5e45U, 0x56d2a95bU, 0xb6db869bU, 0xac19e260U,
+	0xdd310740U, 0x26d68f84U, 0x45bebf17U, 0xe4a7728fU,
+	0xf082e66eU, 0xb2fe3c10U, 0x2db1fa2cU, 0x4b3dfcfaU,
+	0xc7b3a672U, 0xaeadc67bU, 0x6cce6f2bU, 0x8263dbbfU,
+	0xd9724d5bU, 0xbcc767b5U, 0x8d563798U, 0x2db764b4U,
+	0x76e0cee7U, 0xd34f9a67U, 0x035c810aU, 0x3f56bdc1U,
+	0x5b3f2c84U, 0x0baca8c0U, 0xfe979a77U, 0x484ca775U,
+	0xbdc7f104U, 0xc06c3efbU, 0xdbc5f32cU, 0x44b017e7U,
+};
+
+ATF_TC(popcount_basic);
+ATF_TC_HEAD(popcount_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test popcount results");
+	atf_tc_set_md_var(tc, "timeout", "0");
+}
+
+ATF_TC_BODY(popcount_basic, tc)
+{
+	unsigned int i, r;
+
+	popcount_init(atf_tc_get_config_var_wd(tc, "run_popcount", "NO"));
+
+	for (i = 0; i < 0xffffffff; ++i) {
+		r = byte_count[i & 255] + byte_count[(i >> 8) & 255]
+		    + byte_count[(i >> 16) & 255]
+		    + byte_count[(i >> 24) & 255];
+
+		ATF_CHECK_EQ(r, popcount(i));
+	}
+	ATF_CHECK_EQ(popcount(0xffffffff), 32);
+}
+
+ATF_TC(popcountll_basic);
+ATF_TC_HEAD(popcountll_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test popcountll results");
+	atf_tc_set_md_var(tc, "timeout", "0");
+}
+
+ATF_TC_BODY(popcountll_basic, tc)
+{
+	unsigned int i, j, r, r2, p;
+	unsigned long long v;
+
+	popcount_init(atf_tc_get_config_var_wd(tc, "run_popcount", "NO"));
+
+	for (j = 0; j < 256; ++j) {
+		p = test_parts[j];
+		r2 = byte_count[p & 255] + byte_count[(p >> 8) & 255]
+		    + byte_count[(p >> 16) & 255]
+		    + byte_count[(p >> 24) & 255];
+
+		for (i = 0; i < 0xffffffff; ++i) {
+			r = byte_count[i & 255] + byte_count[(i >> 8) & 255]
+			    + byte_count[(i >> 16) & 255]
+			    + byte_count[(i >> 24) & 255] + r2;
+
+			v = (((unsigned long long)i) << 32) + p;
+			ATF_CHECK_EQ(r, popcountll(v));
+			v = (((unsigned long long)p) << 32) + i;
+			ATF_CHECK_EQ(r, popcountll(v));
+		}
+	}
+
+	ATF_CHECK_EQ(popcountll(0xffffffffffffffffULL), 64);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, popcount_basic);
+	ATF_TP_ADD_TC(tp, popcountll_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strcat.c b/contrib/netbsd-tests/lib/libc/string/t_strcat.c
new file mode 100644
index 000000000000..bd98691da6dc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strcat.c
@@ -0,0 +1,153 @@
+/* $NetBSD: t_strcat.c,v 1.2 2011/07/14 05:46:04 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(strcat_basic);
+ATF_TC_HEAD(strcat_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strcat(3) results");
+}
+
+ATF_TC_BODY(strcat_basic, tc)
+{
+	/* try to trick the compiler */
+	char * (*f)(char *, const char *s) = strcat;
+
+	unsigned int a0, a1, t0, t1;
+	char buf0[64];
+	char buf1[64];
+	char *ret;
+
+	struct tab {
+		const char*	val;
+		size_t		len;
+	};
+
+	const struct tab tab[] = {
+	/*
+	 * patterns that check for all combinations of leading and
+	 * trailing unaligned characters (on a 64 bit processor)
+	 */
+
+		{ "",				0 },
+		{ "a",				1 },
+		{ "ab",				2 },
+		{ "abc",			3 },
+		{ "abcd",			4 },
+		{ "abcde",			5 },
+		{ "abcdef",			6 },
+		{ "abcdefg",			7 },
+		{ "abcdefgh",			8 },
+		{ "abcdefghi",			9 },
+		{ "abcdefghij",			10 },
+		{ "abcdefghijk",		11 },
+		{ "abcdefghijkl",		12 },
+		{ "abcdefghijklm",		13 },
+		{ "abcdefghijklmn",		14 },
+		{ "abcdefghijklmno",		15 },
+		{ "abcdefghijklmnop",		16 },
+		{ "abcdefghijklmnopq",		17 },
+		{ "abcdefghijklmnopqr",		18 },
+		{ "abcdefghijklmnopqrs",	19 },
+		{ "abcdefghijklmnopqrst",	20 },
+		{ "abcdefghijklmnopqrstu",	21 },
+		{ "abcdefghijklmnopqrstuv",	22 },
+		{ "abcdefghijklmnopqrstuvw",	23 },
+
+		/*
+		 * patterns that check for the cases where the expression:
+		 *
+		 *	((word - 0x7f7f..7f) & 0x8080..80)
+		 *
+		 * returns non-zero even though there are no zero bytes in
+		 * the word.
+		 */
+
+		{ "" "\xff\xff\xff\xff\xff\xff\xff\xff" "abcdefgh",	16 },
+		{ "a" "\xff\xff\xff\xff\xff\xff\xff\xff" "bcdefgh",	16 },
+		{ "ab" "\xff\xff\xff\xff\xff\xff\xff\xff" "cdefgh",	16 },
+		{ "abc" "\xff\xff\xff\xff\xff\xff\xff\xff" "defgh",	16 },
+		{ "abcd" "\xff\xff\xff\xff\xff\xff\xff\xff" "efgh",	16 },
+		{ "abcde" "\xff\xff\xff\xff\xff\xff\xff\xff" "fgh",	16 },
+		{ "abcdef" "\xff\xff\xff\xff\xff\xff\xff\xff" "gh",	16 },
+		{ "abcdefg" "\xff\xff\xff\xff\xff\xff\xff\xff" "h",	16 },
+		{ "abcdefgh" "\xff\xff\xff\xff\xff\xff\xff\xff" "",	16 },
+	};
+
+	for (a0 = 0; a0 < sizeof(long); ++a0) {
+		for (a1 = 0; a1 < sizeof(long); ++a1) {
+			for (t0 = 0; t0 < __arraycount(tab); ++t0) {
+				for (t1 = 0; t1 < __arraycount(tab); ++t1) {
+
+					memcpy(&buf0[a0], tab[t0].val,
+					    tab[t0].len + 1);
+					memcpy(&buf1[a1], tab[t1].val,
+					    tab[t1].len + 1);
+
+					ret = f(&buf0[a0], &buf1[a1]);
+
+					/*
+					 * verify strcat returns address
+					 * of first parameter
+					 */
+					if (&buf0[a0] != ret) {
+						fprintf(stderr, "a0 %d, a1 %d, "
+						    "t0 %d, t1 %d\n",
+						    a0, a1, t0, t1);
+						atf_tc_fail("strcat did not "
+						    "return its first arg");
+					}
+
+					/* verify string copied correctly */
+					if (memcmp(&buf0[a0] + tab[t0].len,
+						   &buf1[a1],
+						   tab[t1].len + 1) != 0) {
+						fprintf(stderr, "a0 %d, a1 %d, "
+						    "t0 %d, t1 %d\n",
+						    a0, a1, t0, t1);
+						atf_tc_fail("string not copied "
+						    "correctly");
+					}
+				}
+			}
+		}
+	}
+}
+
+ATF_TC(strncat_simple);
+ATF_TC_HEAD(strncat_simple, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strncat(3) results");
+}
+
+ATF_TC_BODY(strncat_simple, tc)
+{
+	char buf[100] = "abcdefg";
+
+	ATF_CHECK(strncat(buf, "xxx", 0) == buf);
+	ATF_CHECK(strcmp(buf, "abcdefg") == 0);
+	ATF_CHECK(strncat(buf, "xxx", 1) == buf);
+	ATF_CHECK(strcmp(buf, "abcdefgx") == 0);
+	ATF_CHECK(strncat(buf, "xxx", 2) == buf);
+	ATF_CHECK(strcmp(buf, "abcdefgxxx") == 0);
+	ATF_CHECK(strncat(buf, "\0", 1) == buf);
+	ATF_CHECK(strcmp(buf, "abcdefgxxx") == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strcat_basic);
+	ATF_TP_ADD_TC(tp, strncat_simple);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strchr.c b/contrib/netbsd-tests/lib/libc/string/t_strchr.c
new file mode 100644
index 000000000000..958b186e9ceb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strchr.c
@@ -0,0 +1,292 @@
+/* $NetBSD: t_strchr.c,v 1.1 2011/07/07 08:59:33 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+
+static char	*slow_strchr(char *, int);
+static void	 verify_strchr(char *, int, unsigned int, unsigned int);
+
+char * (*volatile strchr_fn)(const char *, int);
+
+static char *
+slow_strchr(char *buf, int ch)
+{
+	unsigned char c = 1;
+
+	ch &= 0xff;
+
+	for (; c != 0; buf++) {
+		c = *buf;
+		if (c == ch)
+			return buf;
+	}
+	return 0;
+}
+
+static void
+verify_strchr(char *buf, int ch, unsigned int t, unsigned int a)
+{
+	const char *off, *ok_off;
+
+	off = strchr_fn(buf, ch);
+	ok_off = slow_strchr(buf, ch);
+	if (off == ok_off)
+		return;
+
+	fprintf(stderr, "test_strchr(\"%s\", %#x) gave %zd not %zd (test %d, "
+	    "alignment %d)\n",
+	    buf, ch, off ? off - buf : -1, ok_off ? ok_off - buf : -1, t, a);
+
+	atf_tc_fail("Check stderr for details");
+}
+
+ATF_TC(strchr_basic);
+ATF_TC_HEAD(strchr_basic, tc)
+{
+
+        atf_tc_set_md_var(tc, "descr", "Test strchr(3) results");
+}
+
+ATF_TC_BODY(strchr_basic, tc)
+{
+	unsigned int t, a;
+	char *off;
+	char buf[32];
+
+	const char *tab[] = {
+		"",
+		"a",
+		"aa",
+		"abc",
+		"abcd",
+		"abcde",
+		"abcdef",
+		"abcdefg",
+		"abcdefgh",
+
+		"/",
+		"//",
+		"/a",
+		"/a/",
+		"/ab",
+		"/ab/",
+		"/abc",
+		"/abc/",
+		"/abcd",
+		"/abcd/",
+		"/abcde",
+		"/abcde/",
+		"/abcdef",
+		"/abcdef/",
+		"/abcdefg",
+		"/abcdefg/",
+		"/abcdefgh",
+		"/abcdefgh/",
+
+		"a/",
+		"a//",
+		"a/a",
+		"a/a/",
+		"a/ab",
+		"a/ab/",
+		"a/abc",
+		"a/abc/",
+		"a/abcd",
+		"a/abcd/",
+		"a/abcde",
+		"a/abcde/",
+		"a/abcdef",
+		"a/abcdef/",
+		"a/abcdefg",
+		"a/abcdefg/",
+		"a/abcdefgh",
+		"a/abcdefgh/",
+
+		"ab/",
+		"ab//",
+		"ab/a",
+		"ab/a/",
+		"ab/ab",
+		"ab/ab/",
+		"ab/abc",
+		"ab/abc/",
+		"ab/abcd",
+		"ab/abcd/",
+		"ab/abcde",
+		"ab/abcde/",
+		"ab/abcdef",
+		"ab/abcdef/",
+		"ab/abcdefg",
+		"ab/abcdefg/",
+		"ab/abcdefgh",
+		"ab/abcdefgh/",
+
+		"abc/",
+		"abc//",
+		"abc/a",
+		"abc/a/",
+		"abc/ab",
+		"abc/ab/",
+		"abc/abc",
+		"abc/abc/",
+		"abc/abcd",
+		"abc/abcd/",
+		"abc/abcde",
+		"abc/abcde/",
+		"abc/abcdef",
+		"abc/abcdef/",
+		"abc/abcdefg",
+		"abc/abcdefg/",
+		"abc/abcdefgh",
+		"abc/abcdefgh/",
+
+		"abcd/",
+		"abcd//",
+		"abcd/a",
+		"abcd/a/",
+		"abcd/ab",
+		"abcd/ab/",
+		"abcd/abc",
+		"abcd/abc/",
+		"abcd/abcd",
+		"abcd/abcd/",
+		"abcd/abcde",
+		"abcd/abcde/",
+		"abcd/abcdef",
+		"abcd/abcdef/",
+		"abcd/abcdefg",
+		"abcd/abcdefg/",
+		"abcd/abcdefgh",
+		"abcd/abcdefgh/",
+
+		"abcde/",
+		"abcde//",
+		"abcde/a",
+		"abcde/a/",
+		"abcde/ab",
+		"abcde/ab/",
+		"abcde/abc",
+		"abcde/abc/",
+		"abcde/abcd",
+		"abcde/abcd/",
+		"abcde/abcde",
+		"abcde/abcde/",
+		"abcde/abcdef",
+		"abcde/abcdef/",
+		"abcde/abcdefg",
+		"abcde/abcdefg/",
+		"abcde/abcdefgh",
+		"abcde/abcdefgh/",
+
+		"abcdef/",
+		"abcdef//",
+		"abcdef/a",
+		"abcdef/a/",
+		"abcdef/ab",
+		"abcdef/ab/",
+		"abcdef/abc",
+		"abcdef/abc/",
+		"abcdef/abcd",
+		"abcdef/abcd/",
+		"abcdef/abcde",
+		"abcdef/abcde/",
+		"abcdef/abcdef",
+		"abcdef/abcdef/",
+		"abcdef/abcdefg",
+		"abcdef/abcdefg/",
+		"abcdef/abcdefgh",
+		"abcdef/abcdefgh/",
+
+		"abcdefg/",
+		"abcdefg//",
+		"abcdefg/a",
+		"abcdefg/a/",
+		"abcdefg/ab",
+		"abcdefg/ab/",
+		"abcdefg/abc",
+		"abcdefg/abc/",
+		"abcdefg/abcd",
+		"abcdefg/abcd/",
+		"abcdefg/abcde",
+		"abcdefg/abcde/",
+		"abcdefg/abcdef",
+		"abcdefg/abcdef/",
+		"abcdefg/abcdefg",
+		"abcdefg/abcdefg/",
+		"abcdefg/abcdefgh",
+		"abcdefg/abcdefgh/",
+
+		"abcdefgh/",
+		"abcdefgh//",
+		"abcdefgh/a",
+		"abcdefgh/a/",
+		"abcdefgh/ab",
+		"abcdefgh/ab/",
+		"abcdefgh/abc",
+		"abcdefgh/abc/",
+		"abcdefgh/abcd",
+		"abcdefgh/abcd/",
+		"abcdefgh/abcde",
+		"abcdefgh/abcde/",
+		"abcdefgh/abcdef",
+		"abcdefgh/abcdef/",
+		"abcdefgh/abcdefg",
+		"abcdefgh/abcdefg/",
+		"abcdefgh/abcdefgh",
+		"abcdefgh/abcdefgh/",
+	};
+
+
+	strchr_fn = dlsym(dlopen(0, RTLD_LAZY), "test_strchr");
+	if (!strchr_fn)
+		strchr_fn = strchr;
+
+	for (a = 3; a < 3 + sizeof(long); ++a) {
+		/* Put char and a \0 before the buffer */
+		buf[a-1] = '/';
+		buf[a-2] = '0';
+		buf[a-3] = 0xff;
+		for (t = 0; t < (sizeof(tab) / sizeof(tab[0])); ++t) {
+			int len = strlen(tab[t]) + 1;
+			memcpy(&buf[a], tab[t], len);
+
+			/* Put the char we are looking for after the \0 */
+			buf[a + len] = '/';
+
+			/* Check search for NUL at end of string */
+			verify_strchr(buf + a, 0, t, a);
+
+			/* Then for the '/' in the strings */
+			verify_strchr(buf + a, '/', t, a);
+
+		   	/* check zero extension of char arg */
+		   	verify_strchr(buf + a, 0xffffff00 | '/', t, a);
+
+		   	/* Replace all the '/' with 0xff */
+		   	while ((off = slow_strchr(buf + a, '/')) != NULL)
+				*off = 0xff;
+
+			buf[a + len] = 0xff;
+
+			/* Check we can search for 0xff as well as '/' */
+			verify_strchr(buf + a, 0xff, t, a);
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strchr_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strcmp.c b/contrib/netbsd-tests/lib/libc/string/t_strcmp.c
new file mode 100644
index 000000000000..14e2e9ce935d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strcmp.c
@@ -0,0 +1,136 @@
+/* $NetBSD: t_strcmp.c,v 1.4 2012/03/25 08:17:54 joerg Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(strcmp_basic);
+ATF_TC_HEAD(strcmp_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strcmp(3) results, #1");
+}
+
+ATF_TC_BODY(strcmp_basic, tc)
+{
+	/* try to trick the compiler */
+	int (*f)(const char *, const char *s) = strcmp;
+
+	unsigned int a0, a1, t;
+	char buf0[64];
+	char buf1[64];
+	int ret;
+
+	struct tab {
+		const char*	val0;
+		const char*	val1;
+		int		ret;
+	};
+
+	const struct tab tab[] = {
+		{ "",			"",			0 },
+
+		{ "a",			"a",			0 },
+		{ "a",			"b",			-1 },
+		{ "b",			"a",			+1 },
+		{ "",			"a",			-1 },
+		{ "a",			"",			+1 },
+
+		{ "aa",			"aa",			0 },
+		{ "aa",			"ab",			-1 },
+		{ "ab",			"aa",			+1 },
+		{ "a",			"aa",			-1 },
+		{ "aa",			"a",			+1 },
+
+		{ "aaa",		"aaa",			0 },
+		{ "aaa",		"aab",			-1 },
+		{ "aab",		"aaa",			+1 },
+		{ "aa",			"aaa",			-1 },
+		{ "aaa",		"aa",			+1 },
+
+		{ "aaaa",		"aaaa",			0 },
+		{ "aaaa",		"aaab",			-1 },
+		{ "aaab",		"aaaa",			+1 },
+		{ "aaa",		"aaaa",			-1 },
+		{ "aaaa",		"aaa",			+1 },
+
+		{ "aaaaa",		"aaaaa",		0 },
+		{ "aaaaa",		"aaaab",		-1 },
+		{ "aaaab",		"aaaaa",		+1 },
+		{ "aaaa",		"aaaaa",		-1 },
+		{ "aaaaa",		"aaaa",			+1 },
+
+		{ "aaaaaa",		"aaaaaa",		0 },
+		{ "aaaaaa",		"aaaaab",		-1 },
+		{ "aaaaab",		"aaaaaa",		+1 },
+		{ "aaaaa",		"aaaaaa",		-1 },
+		{ "aaaaaa",		"aaaaa",		+1 },
+	};
+
+	for (a0 = 0; a0 < sizeof(long); ++a0) {
+		for (a1 = 0; a1 < sizeof(long); ++a1) {
+			for (t = 0; t < __arraycount(tab); ++t) {
+				memcpy(&buf0[a0], tab[t].val0,
+				       strlen(tab[t].val0) + 1);
+				memcpy(&buf1[a1], tab[t].val1,
+				       strlen(tab[t].val1) + 1);
+
+				ret = f(&buf0[a0], &buf1[a1]);
+
+				if ((ret == 0 && tab[t].ret != 0) ||
+				    (ret <  0 && tab[t].ret >= 0) ||
+				    (ret >  0 && tab[t].ret <= 0)) {
+					fprintf(stderr, "a0 %d, a1 %d, t %d\n",
+					    a0, a1, t);
+					fprintf(stderr, "\"%s\" \"%s\" %d\n",
+					    &buf0[a0], &buf1[a1], ret);
+					atf_tc_fail("Check stderr for details");
+				}
+			}
+		}
+	}
+}
+
+ATF_TC(strcmp_simple);
+ATF_TC_HEAD(strcmp_simple, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strcmp(3) results, #2");
+}
+
+ATF_TC_BODY(strcmp_simple, tc)
+{
+	char buf1[10] = "xxx";
+	char buf2[10] = "xxy";
+
+	ATF_CHECK(strcmp(buf1, buf1) == 0);
+	ATF_CHECK(strcmp(buf2, buf2) == 0);
+
+	ATF_CHECK(strcmp("x\xf6x", "xox") > 0);
+	ATF_CHECK(strcmp("xxx", "xxxyyy") < 0);
+	ATF_CHECK(strcmp("xxxyyy", "xxx") > 0);
+
+	ATF_CHECK(strcmp(buf1 + 0, buf2 + 0) < 0);
+	ATF_CHECK(strcmp(buf1 + 1, buf2 + 1) < 0);
+	ATF_CHECK(strcmp(buf1 + 2, buf2 + 2) < 0);
+	ATF_CHECK(strcmp(buf1 + 3, buf2 + 3) == 0);
+
+	ATF_CHECK(strcmp(buf2 + 0, buf1 + 0) > 0);
+	ATF_CHECK(strcmp(buf2 + 1, buf1 + 1) > 0);
+	ATF_CHECK(strcmp(buf2 + 2, buf1 + 2) > 0);
+	ATF_CHECK(strcmp(buf2 + 3, buf1 + 3) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strcmp_basic);
+	ATF_TP_ADD_TC(tp, strcmp_simple);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strcpy.c b/contrib/netbsd-tests/lib/libc/string/t_strcpy.c
new file mode 100644
index 000000000000..285371ec072f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strcpy.c
@@ -0,0 +1,124 @@
+/* $NetBSD: t_strcpy.c,v 1.1 2011/07/07 08:59:33 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(strcpy_basic);
+ATF_TC_HEAD(strcpy_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strcpy(3) results");
+}
+
+ATF_TC_BODY(strcpy_basic, tc)
+{
+	/* try to trick the compiler */
+	char * (*f)(char *, const char *s) = strcpy;
+
+	unsigned int a0, a1, t;
+	char buf0[64];
+	char buf1[64];
+	char *ret;
+
+	struct tab {
+		const char*	val;
+		size_t		len;
+	};
+
+	const struct tab tab[] = {
+		/*
+		 * patterns that check for all combinations of leading and
+		 * trailing unaligned characters (on a 64 bit processor)
+		 */
+
+		{ "",				0 },
+		{ "a",				1 },
+		{ "ab",				2 },
+		{ "abc",			3 },
+		{ "abcd",			4 },
+		{ "abcde",			5 },
+		{ "abcdef",			6 },
+		{ "abcdefg",			7 },
+		{ "abcdefgh",			8 },
+		{ "abcdefghi",			9 },
+		{ "abcdefghij",			10 },
+		{ "abcdefghijk",		11 },
+		{ "abcdefghijkl",		12 },
+		{ "abcdefghijklm",		13 },
+		{ "abcdefghijklmn",		14 },
+		{ "abcdefghijklmno",		15 },
+		{ "abcdefghijklmnop",		16 },
+		{ "abcdefghijklmnopq",		17 },
+		{ "abcdefghijklmnopqr",		18 },
+		{ "abcdefghijklmnopqrs",	19 },
+		{ "abcdefghijklmnopqrst",	20 },
+		{ "abcdefghijklmnopqrstu",	21 },
+		{ "abcdefghijklmnopqrstuv",	22 },
+		{ "abcdefghijklmnopqrstuvw",	23 },
+
+		/*
+		 * patterns that check for the cases where the expression:
+		 *
+		 *	((word - 0x7f7f..7f) & 0x8080..80)
+		 *
+		 * returns non-zero even though there are no zero bytes in
+		 * the word.
+		 */
+
+		{ "" "\xff\xff\xff\xff\xff\xff\xff\xff" "abcdefgh",	16 },
+		{ "a" "\xff\xff\xff\xff\xff\xff\xff\xff" "bcdefgh",	16 },
+		{ "ab" "\xff\xff\xff\xff\xff\xff\xff\xff" "cdefgh",	16 },
+		{ "abc" "\xff\xff\xff\xff\xff\xff\xff\xff" "defgh",	16 },
+		{ "abcd" "\xff\xff\xff\xff\xff\xff\xff\xff" "efgh",	16 },
+		{ "abcde" "\xff\xff\xff\xff\xff\xff\xff\xff" "fgh",	16 },
+		{ "abcdef" "\xff\xff\xff\xff\xff\xff\xff\xff" "gh",	16 },
+		{ "abcdefg" "\xff\xff\xff\xff\xff\xff\xff\xff" "h",	16 },
+		{ "abcdefgh" "\xff\xff\xff\xff\xff\xff\xff\xff" "",	16 },
+	};
+
+	for (a0 = 0; a0 < sizeof(long); ++a0) {
+		for (a1 = 0; a1 < sizeof(long); ++a1) {
+			for (t = 0; t < (sizeof(tab) / sizeof(tab[0])); ++t) {
+
+				memcpy(&buf1[a1], tab[t].val, tab[t].len + 1);
+				ret = f(&buf0[a0], &buf1[a1]);
+
+				/*
+				 * verify strcpy returns address of
+				 * first parameter
+				 */
+			    	if (&buf0[a0] != ret) {
+					fprintf(stderr, "a0 %d, a1 %d, t %d\n",
+					    a0, a1, t);
+					atf_tc_fail("strcpy did not return "
+					    "its first arg");
+				}
+
+				/*
+				 * verify string was copied correctly
+				 */
+				if (memcmp(&buf0[a0], &buf1[a1],
+					   tab[t].len + 1) != 0) {
+					fprintf(stderr, "a0 %d, a1 %d, t %d\n",
+					    a0, a1, t);
+					atf_tc_fail("not correctly copied");
+				}
+			}
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strcpy_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strcspn.c b/contrib/netbsd-tests/lib/libc/string/t_strcspn.c
new file mode 100644
index 000000000000..d38cdb43939c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strcspn.c
@@ -0,0 +1,58 @@
+/*	$NetBSD: t_strcspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strcspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <string.h>
+
+ATF_TC(strcspn);
+ATF_TC_HEAD(strcspn, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strcspn(3)");
+}
+
+ATF_TC_BODY(strcspn, tc)
+{
+	ATF_CHECK_EQ(strcspn("abcdefghijklmnop", ""), 16);
+	ATF_CHECK_EQ(strcspn("abcdefghijklmnop", "a"), 0);
+	ATF_CHECK_EQ(strcspn("abcdefghijklmnop", "b"), 1);
+	ATF_CHECK_EQ(strcspn("abcdefghijklmnop", "cd"), 2);
+	ATF_CHECK_EQ(strcspn("abcdefghijklmnop", "qrstuvwxyz"), 16);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strcspn);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strerror.c b/contrib/netbsd-tests/lib/libc/string/t_strerror.c
new file mode 100644
index 000000000000..c0e9c06e9185
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strerror.c
@@ -0,0 +1,135 @@
+/* $NetBSD: t_strerror.c,v 1.3 2011/05/10 06:55:27 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strerror.c,v 1.3 2011/05/10 06:55:27 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <string.h>
+
+ATF_TC(strerror_basic);
+ATF_TC_HEAD(strerror_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strerror(3)");
+}
+
+ATF_TC_BODY(strerror_basic, tc)
+{
+	int i;
+
+	for (i = 1; i < sys_nerr; i++)
+		ATF_REQUIRE(strstr(strerror(i), "Unknown error:") == NULL);
+
+	for (; i < sys_nerr + 10; i++)
+		ATF_REQUIRE(strstr(strerror(i), "Unknown error:") != NULL);
+}
+
+ATF_TC(strerror_err);
+ATF_TC_HEAD(strerror_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from strerror(3)");
+}
+
+ATF_TC_BODY(strerror_err, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE(strstr(strerror(INT_MAX), "Unknown error:") != NULL);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+
+	ATF_REQUIRE(strstr(strerror(INT_MIN), "Unknown error:") != NULL);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC(strerror_r_basic);
+ATF_TC_HEAD(strerror_r_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strerror_r(3)");
+}
+
+ATF_TC_BODY(strerror_r_basic, tc)
+{
+	char buf[512];
+	int i;
+
+	for (i = 1; i < sys_nerr; i++) {
+		ATF_REQUIRE(strerror_r(i, buf, sizeof(buf)) == 0);
+		ATF_REQUIRE(strstr(buf, "Unknown error:") == NULL);
+	}
+
+	for (; i < sys_nerr + 10; i++) {
+		ATF_REQUIRE(strerror_r(i, buf, sizeof(buf)) == EINVAL);
+		ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+	}
+}
+
+ATF_TC(strerror_r_err);
+ATF_TC_HEAD(strerror_r_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from strerror_r(3)");
+}
+
+ATF_TC_BODY(strerror_r_err, tc)
+{
+	char buf[512];
+	int rv;
+
+	rv = strerror_r(EPERM, buf, 1);
+	ATF_REQUIRE(rv == ERANGE);
+
+	rv = strerror_r(INT_MAX, buf, sizeof(buf));
+
+	ATF_REQUIRE(rv == EINVAL);
+	ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+
+	rv = strerror_r(INT_MIN, buf, sizeof(buf));
+
+	ATF_REQUIRE(rv == EINVAL);
+	ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	(void)setlocale(LC_ALL, "C");
+
+	ATF_TP_ADD_TC(tp, strerror_basic);
+	ATF_TP_ADD_TC(tp, strerror_err);
+	ATF_TP_ADD_TC(tp, strerror_r_basic);
+	ATF_TP_ADD_TC(tp, strerror_r_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_stresep.c b/contrib/netbsd-tests/lib/libc/string/t_stresep.c
new file mode 100644
index 000000000000..4678e55c0eeb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_stresep.c
@@ -0,0 +1,72 @@
+/*	$NetBSD: t_stresep.c,v 1.3 2013/02/15 23:56:32 christos Exp $ */
+
+/*-
+ * Copyright (c) 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define expect(a)							\
+	if ((p = stresep(&q, " ", '\\')) == NULL || strcmp(p, a)) {	\
+		fprintf(stderr, "failed on line %d: %s != %s\n",	\
+		    __LINE__, p, a);					\
+		atf_tc_fail("Check stderr for test id/line");		\
+	}
+
+ATF_TC(stresep_basic);
+ATF_TC_HEAD(stresep_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test stresep results");
+}
+
+ATF_TC_BODY(stresep_basic, tc)
+{
+	char brkstr[] = "foo\\ \\ bar baz bar\\ foo\\  bar\\ \\ foo \\ \\ \\ "
+		     "baz bar\\ \\ ";
+	char *p, *q = brkstr;
+
+	expect("foo  bar");
+	expect("baz");
+	expect("bar foo ");
+	expect("bar  foo");
+	expect("   baz");
+	expect("bar  ");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, stresep_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strlen.c b/contrib/netbsd-tests/lib/libc/string/t_strlen.c
new file mode 100644
index 000000000000..66158fd7113f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strlen.c
@@ -0,0 +1,199 @@
+/* $NetBSD: t_strlen.c,v 1.5 2011/07/14 07:33:20 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <unistd.h>
+
+static void	write_num(int);
+
+static void
+write_num(int val)
+{
+	char buf[20];
+	int i;
+
+	for (i = sizeof buf; --i >= 0;) {
+		buf[i] = '0' + val % 10;
+		val /= 10;
+		if (val == 0) {
+			write(2, buf + i, sizeof buf - i);
+			return;
+		}
+	}
+	write(2, "overflow", 8);
+}
+
+ATF_TC(strlen_basic);
+ATF_TC_HEAD(strlen_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strlen(3) results");
+}
+
+ATF_TC_BODY(strlen_basic, tc)
+{
+	/* try to trick the compiler */
+	size_t (*strlen_fn)(const char *);
+
+	unsigned int a, t;
+	size_t len;
+	char buf[64];
+
+	struct tab {
+		const char*	val;
+		size_t		len;
+	};
+
+	const struct tab tab[] = {
+		/*
+		 * patterns that check for all combinations of leading and
+		 * trailing unaligned characters (on a 64 bit processor)
+		 */
+
+		{ "",				0 },
+		{ "a",				1 },
+		{ "ab",				2 },
+		{ "abc",			3 },
+		{ "abcd",			4 },
+		{ "abcde",			5 },
+		{ "abcdef",			6 },
+		{ "abcdefg",			7 },
+		{ "abcdefgh",			8 },
+		{ "abcdefghi",			9 },
+		{ "abcdefghij",			10 },
+		{ "abcdefghijk",		11 },
+		{ "abcdefghijkl",		12 },
+		{ "abcdefghijklm",		13 },
+		{ "abcdefghijklmn",		14 },
+		{ "abcdefghijklmno",		15 },
+		{ "abcdefghijklmnop",		16 },
+		{ "abcdefghijklmnopq",		17 },
+		{ "abcdefghijklmnopqr",		18 },
+		{ "abcdefghijklmnopqrs",	19 },
+		{ "abcdefghijklmnopqrst",	20 },
+		{ "abcdefghijklmnopqrstu",	21 },
+		{ "abcdefghijklmnopqrstuv",	22 },
+		{ "abcdefghijklmnopqrstuvw",	23 },
+
+		/*
+		 * patterns that check for the cases where the expression:
+		 *
+		 *	((word - 0x7f7f..7f) & 0x8080..80)
+		 *
+		 * returns non-zero even though there are no zero bytes in
+		 * the word.
+		 */
+
+		{ "" "\xff\xff\xff\xff\xff\xff\xff\xff" "abcdefgh",	16 },
+		{ "a" "\xff\xff\xff\xff\xff\xff\xff\xff" "bcdefgh",	16 },
+		{ "ab" "\xff\xff\xff\xff\xff\xff\xff\xff" "cdefgh",	16 },
+		{ "abc" "\xff\xff\xff\xff\xff\xff\xff\xff" "defgh",	16 },
+		{ "abcd" "\xff\xff\xff\xff\xff\xff\xff\xff" "efgh",	16 },
+		{ "abcde" "\xff\xff\xff\xff\xff\xff\xff\xff" "fgh",	16 },
+		{ "abcdef" "\xff\xff\xff\xff\xff\xff\xff\xff" "gh",	16 },
+		{ "abcdefg" "\xff\xff\xff\xff\xff\xff\xff\xff" "h",	16 },
+		{ "abcdefgh" "\xff\xff\xff\xff\xff\xff\xff\xff" "",	16 },
+	};
+
+	/*
+	 * During testing it is useful have the rest of the program
+	 * use a known good version!
+	 */
+	strlen_fn = dlsym(dlopen(NULL, RTLD_LAZY), "test_strlen");
+	if (!strlen_fn)
+		strlen_fn = strlen;
+
+	for (a = 0; a < sizeof(long); ++a) {
+		for (t = 0; t < (sizeof(tab) / sizeof(tab[0])); ++t) {
+
+			memcpy(&buf[a], tab[t].val, tab[t].len + 1);
+			len = strlen_fn(&buf[a]);
+
+			if (len != tab[t].len) {
+				/* Write error without using printf / strlen */
+				write(2, "alignment ", 10);
+				write_num(a);
+				write(2, ", test ", 7);
+				write_num(t);
+				write(2, ", got len ", 10);
+				write_num(len);
+				write(2, ", not ", 6);
+				write_num(tab[t].len);
+				write(2, ", for '", 7);
+				write(2, tab[t].val, tab[t].len);
+				write(2, "'\n", 2);
+				atf_tc_fail("See stderr for details");
+			}
+		}
+	}
+}
+
+ATF_TC(strlen_huge);
+ATF_TC_HEAD(strlen_huge, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strlen(3) with huge strings");
+}
+
+ATF_TC_BODY(strlen_huge, tc)
+{
+	long page;
+	char *str;
+	size_t i;
+
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	for (i = 1; i < 1000; i = i + 100) {
+
+		str = malloc(i * page + 1);
+
+		if (str == NULL)
+			continue;
+
+		(void)memset(str, 'x', i * page);
+		str[i * page] = '\0';
+
+		ATF_REQUIRE(strlen(str) == i * page);
+		free(str);
+	}
+}
+
+ATF_TC(strnlen_basic);
+ATF_TC_HEAD(strnlen_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "A naive test of strnlen(3)");
+}
+
+ATF_TC_BODY(strnlen_basic, tc)
+{
+	char buf[1];
+
+	buf[0] = '\0';
+
+	ATF_CHECK(strnlen(buf, 000) == 0);
+	ATF_CHECK(strnlen(buf, 111) == 0);
+
+	ATF_CHECK(strnlen("xxx", 0) == 0);
+	ATF_CHECK(strnlen("xxx", 1) == 1);
+	ATF_CHECK(strnlen("xxx", 2) == 2);
+	ATF_CHECK(strnlen("xxx", 3) == 3);
+	ATF_CHECK(strnlen("xxx", 9) == 3);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strlen_basic);
+	ATF_TP_ADD_TC(tp, strlen_huge);
+	ATF_TP_ADD_TC(tp, strnlen_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strpbrk.c b/contrib/netbsd-tests/lib/libc/string/t_strpbrk.c
new file mode 100644
index 000000000000..d0f2d9b5d0be
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strpbrk.c
@@ -0,0 +1,62 @@
+/*	$NetBSD: t_strpbrk.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strpbrk.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <string.h>
+
+ATF_TC(strpbrk);
+ATF_TC_HEAD(strpbrk, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strpbrk(3)");
+}
+
+ATF_TC_BODY(strpbrk, tc)
+{
+	static const char s[] = "abcdefghijklmnop";
+
+	ATF_CHECK_EQ(strpbrk(s, ""), NULL);
+	ATF_CHECK_EQ(strpbrk(s, "qrst"), NULL);
+	ATF_CHECK_EQ(strpbrk(s, "a"), s);
+	ATF_CHECK_EQ(strpbrk(s, "b"), s + 1);
+	ATF_CHECK_EQ(strpbrk(s, "ab"), s);
+	ATF_CHECK_EQ(strpbrk(s, "cdef"), s + 2);
+	ATF_CHECK_EQ(strpbrk(s, "fedc"), s + 2);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strpbrk);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strrchr.c b/contrib/netbsd-tests/lib/libc/string/t_strrchr.c
new file mode 100644
index 000000000000..038daff953ae
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strrchr.c
@@ -0,0 +1,257 @@
+/* $NetBSD: t_strrchr.c,v 1.1 2011/07/07 08:59:33 jruoho Exp $ */
+
+/*
+ * Written by J.T. Conklin <jtc@acorntoolworks.com>
+ * Public domain.
+ */
+
+#include <atf-c.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+ATF_TC(strrchr_basic);
+ATF_TC_HEAD(strrchr_basic, tc)
+{
+        atf_tc_set_md_var(tc, "descr", "Test strrchr(3) results");
+}
+
+ATF_TC_BODY(strrchr_basic, tc)
+{
+	/* try to trick the compiler */
+	char * (*f)(const char *, int) = strrchr;
+
+	unsigned int a, t;
+	char *off, *off2;
+	char buf[32];
+
+	struct tab {
+		const char*	val;
+		char		match;
+		ssize_t		f_off;	/* offset of first match */
+		ssize_t		l_off;	/* offset of last match */
+	};
+
+	const struct tab tab[] = {
+		{ "",			0, 0, 0 },
+		{ "a",			0, 0, 0 },
+		{ "aa",			0, 0, 0 },
+		{ "abc",		0, 0, 0 },
+		{ "abcd",		0, 0, 0 },
+		{ "abcde",		0, 0, 0 },
+		{ "abcdef",		0, 0, 0 },
+		{ "abcdefg",		0, 0, 0 },
+		{ "abcdefgh",		0, 0, 0 },
+
+		{ "/",			1, 0, 0 },
+		{ "//",                 1, 0, 1 },
+		{ "/a",                 1, 0, 0 },
+		{ "/a/",                1, 0, 2 },
+		{ "/ab",                1, 0, 0 },
+		{ "/ab/",               1, 0, 3 },
+		{ "/abc",               1, 0, 0 },
+		{ "/abc/",              1, 0, 4 },
+		{ "/abcd",              1, 0, 0 },
+		{ "/abcd/",             1, 0, 5 },
+		{ "/abcde",             1, 0, 0 },
+		{ "/abcde/",            1, 0, 6 },
+		{ "/abcdef",            1, 0, 0 },
+		{ "/abcdef/",           1, 0, 7 },
+		{ "/abcdefg",           1, 0, 0 },
+		{ "/abcdefg/",          1, 0, 8 },
+		{ "/abcdefgh",          1, 0, 0 },
+		{ "/abcdefgh/",         1, 0, 9 },
+
+		{ "a/",                 1, 1, 1 },
+		{ "a//",                1, 1, 2 },
+		{ "a/a",                1, 1, 1 },
+		{ "a/a/",               1, 1, 3 },
+		{ "a/ab",               1, 1, 1 },
+		{ "a/ab/",              1, 1, 4 },
+		{ "a/abc",              1, 1, 1 },
+		{ "a/abc/",             1, 1, 5 },
+		{ "a/abcd",             1, 1, 1 },
+		{ "a/abcd/",            1, 1, 6 },
+		{ "a/abcde",            1, 1, 1 },
+		{ "a/abcde/",           1, 1, 7 },
+		{ "a/abcdef",           1, 1, 1 },
+		{ "a/abcdef/",          1, 1, 8 },
+		{ "a/abcdefg",          1, 1, 1 },
+		{ "a/abcdefg/",         1, 1, 9 },
+		{ "a/abcdefgh",         1, 1, 1 },
+		{ "a/abcdefgh/",        1, 1, 10 },
+
+		{ "ab/",                1, 2, 2 },
+		{ "ab//",               1, 2, 3 },
+		{ "ab/a",               1, 2, 2 },
+		{ "ab/a/",              1, 2, 4 },
+		{ "ab/ab",              1, 2, 2 },
+		{ "ab/ab/",             1, 2, 5 },
+		{ "ab/abc",             1, 2, 2 },
+		{ "ab/abc/",            1, 2, 6 },
+		{ "ab/abcd",            1, 2, 2 },
+		{ "ab/abcd/",           1, 2, 7 },
+		{ "ab/abcde",           1, 2, 2 },
+		{ "ab/abcde/",          1, 2, 8 },
+		{ "ab/abcdef",          1, 2, 2 },
+		{ "ab/abcdef/",         1, 2, 9 },
+		{ "ab/abcdefg",         1, 2, 2 },
+		{ "ab/abcdefg/",        1, 2, 10 },
+		{ "ab/abcdefgh",        1, 2, 2 },
+		{ "ab/abcdefgh/",       1, 2, 11 },
+
+		{ "abc/",               1, 3, 3 },
+		{ "abc//",              1, 3, 4 },
+		{ "abc/a",              1, 3, 3 },
+		{ "abc/a/",             1, 3, 5 },
+		{ "abc/ab",             1, 3, 3 },
+		{ "abc/ab/",            1, 3, 6 },
+		{ "abc/abc",            1, 3, 3 },
+		{ "abc/abc/",           1, 3, 7 },
+		{ "abc/abcd",           1, 3, 3 },
+		{ "abc/abcd/",          1, 3, 8 },
+		{ "abc/abcde",          1, 3, 3 },
+		{ "abc/abcde/",         1, 3, 9 },
+		{ "abc/abcdef",         1, 3, 3 },
+		{ "abc/abcdef/",        1, 3, 10 },
+		{ "abc/abcdefg",        1, 3, 3 },
+		{ "abc/abcdefg/",       1, 3, 11 },
+		{ "abc/abcdefgh",       1, 3, 3 },
+		{ "abc/abcdefgh/",      1, 3, 12 },
+
+		{ "abcd/",              1, 4, 4 },
+		{ "abcd//",             1, 4, 5 },
+		{ "abcd/a",             1, 4, 4 },
+		{ "abcd/a/",            1, 4, 6 },
+		{ "abcd/ab",            1, 4, 4 },
+		{ "abcd/ab/",           1, 4, 7 },
+		{ "abcd/abc",           1, 4, 4 },
+		{ "abcd/abc/",          1, 4, 8 },
+		{ "abcd/abcd",          1, 4, 4 },
+		{ "abcd/abcd/",         1, 4, 9 },
+		{ "abcd/abcde",         1, 4, 4 },
+		{ "abcd/abcde/",        1, 4, 10 },
+		{ "abcd/abcdef",        1, 4, 4 },
+		{ "abcd/abcdef/",       1, 4, 11 },
+		{ "abcd/abcdefg",       1, 4, 4 },
+		{ "abcd/abcdefg/",      1, 4, 12 },
+		{ "abcd/abcdefgh",      1, 4, 4 },
+		{ "abcd/abcdefgh/",     1, 4, 13 },
+
+		{ "abcde/",             1, 5, 5 },
+		{ "abcde//",            1, 5, 6 },
+		{ "abcde/a",            1, 5, 5 },
+		{ "abcde/a/",           1, 5, 7 },
+		{ "abcde/ab",           1, 5, 5 },
+		{ "abcde/ab/",          1, 5, 8 },
+		{ "abcde/abc",          1, 5, 5 },
+		{ "abcde/abc/",         1, 5, 9 },
+		{ "abcde/abcd",         1, 5, 5 },
+		{ "abcde/abcd/",        1, 5, 10 },
+		{ "abcde/abcde",        1, 5, 5 },
+		{ "abcde/abcde/",       1, 5, 11 },
+		{ "abcde/abcdef",       1, 5, 5 },
+		{ "abcde/abcdef/",      1, 5, 12 },
+		{ "abcde/abcdefg",      1, 5, 5 },
+		{ "abcde/abcdefg/",     1, 5, 13 },
+		{ "abcde/abcdefgh",     1, 5, 5 },
+		{ "abcde/abcdefgh/",    1, 5, 14 },
+
+		{ "abcdef/",            1, 6, 6 },
+		{ "abcdef//",           1, 6, 7 },
+		{ "abcdef/a",           1, 6, 6 },
+		{ "abcdef/a/",          1, 6, 8 },
+		{ "abcdef/ab",          1, 6, 6 },
+		{ "abcdef/ab/",         1, 6, 9 },
+		{ "abcdef/abc",         1, 6, 6 },
+		{ "abcdef/abc/",        1, 6, 10 },
+		{ "abcdef/abcd",        1, 6, 6 },
+		{ "abcdef/abcd/",       1, 6, 11 },
+		{ "abcdef/abcde",       1, 6, 6 },
+		{ "abcdef/abcde/",      1, 6, 12 },
+		{ "abcdef/abcdef",      1, 6, 6 },
+		{ "abcdef/abcdef/",     1, 6, 13 },
+		{ "abcdef/abcdefg",     1, 6, 6 },
+		{ "abcdef/abcdefg/",    1, 6, 14 },
+		{ "abcdef/abcdefgh",    1, 6, 6 },
+		{ "abcdef/abcdefgh/",   1, 6, 15 },
+
+		{ "abcdefg/",           1, 7, 7 },
+		{ "abcdefg//",          1, 7, 8 },
+		{ "abcdefg/a",          1, 7, 7 },
+		{ "abcdefg/a/",         1, 7, 9 },
+		{ "abcdefg/ab",         1, 7, 7 },
+		{ "abcdefg/ab/",        1, 7, 10 },
+		{ "abcdefg/abc",        1, 7, 7 },
+		{ "abcdefg/abc/",       1, 7, 11 },
+		{ "abcdefg/abcd",       1, 7, 7 },
+		{ "abcdefg/abcd/",      1, 7, 12 },
+		{ "abcdefg/abcde",      1, 7, 7 },
+		{ "abcdefg/abcde/",     1, 7, 13 },
+		{ "abcdefg/abcdef",     1, 7, 7 },
+		{ "abcdefg/abcdef/",    1, 7, 14 },
+		{ "abcdefg/abcdefg",    1, 7, 7 },
+		{ "abcdefg/abcdefg/",   1, 7, 15 },
+		{ "abcdefg/abcdefgh",   1, 7, 7 },
+		{ "abcdefg/abcdefgh/",  1, 7, 16 },
+
+		{ "abcdefgh/",          1, 8, 8 },
+		{ "abcdefgh//",         1, 8, 9 },
+		{ "abcdefgh/a",         1, 8, 8 },
+		{ "abcdefgh/a/",        1, 8, 10 },
+		{ "abcdefgh/ab",        1, 8, 8 },
+		{ "abcdefgh/ab/",       1, 8, 11 },
+		{ "abcdefgh/abc",       1, 8, 8 },
+		{ "abcdefgh/abc/",      1, 8, 12 },
+		{ "abcdefgh/abcd",      1, 8, 8 },
+		{ "abcdefgh/abcd/",     1, 8, 13 },
+		{ "abcdefgh/abcde",     1, 8, 8 },
+		{ "abcdefgh/abcde/",    1, 8, 14 },
+		{ "abcdefgh/abcdef",    1, 8, 8 },
+		{ "abcdefgh/abcdef/",   1, 8, 15 },
+		{ "abcdefgh/abcdefg",   1, 8, 8 },
+		{ "abcdefgh/abcdefg/",  1, 8, 16 },
+		{ "abcdefgh/abcdefgh",  1, 8, 8 },
+		{ "abcdefgh/abcdefgh/", 1, 8, 17 },
+	};
+
+	for (a = 0; a < sizeof(long); ++a) {
+		for (t = 0; t < (sizeof(tab) / sizeof(tab[0])); ++t) {
+			strcpy(&buf[a], tab[t].val);
+
+			off = f(&buf[a], '/');
+			if (tab[t].match == 0) {
+				if (off != 0) {
+					fprintf(stderr, "a %d, t %d\n", a, t);
+					atf_tc_fail("strrchr should not have "
+					    "found the character");
+				}
+			} else if (tab[t].match == 1) {
+				 if (tab[t].l_off != (off - &buf[a])) {
+					fprintf(stderr, "a %d, t %d\n", a, t);
+					atf_tc_fail("strrchr returns wrong "
+					    "offset");
+				}
+			} else {
+				fprintf(stderr, "a %d, t %d\n", a, t);
+				atf_tc_fail("bad test case data");
+			}
+
+			/* check zero extension of char arg */
+			off2 = f(&buf[a], 0xffffff00 | '/');
+			if (off != off2) {
+				fprintf(stderr, "a %d, t %d\n", a, t);
+				atf_tc_fail("zero extension of char arg fails");
+			}
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strrchr_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strspn.c b/contrib/netbsd-tests/lib/libc/string/t_strspn.c
new file mode 100644
index 000000000000..6782181b079b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_strspn.c
@@ -0,0 +1,60 @@
+/*	$NetBSD: t_strspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_strspn.c,v 1.1 2011/11/21 23:50:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <string.h>
+
+ATF_TC(strspn);
+ATF_TC_HEAD(strspn, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test strspn(3)");
+}
+
+ATF_TC_BODY(strspn, tc)
+{
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", ""), 0);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "a"), 1);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "b"), 0);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "ab"), 2);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "abc"), 3);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "abce"), 3);
+	ATF_CHECK_EQ(strspn("abcdefghijklmnop", "abcdefghijklmnop"), 16);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strspn);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/string/t_swab.c b/contrib/netbsd-tests/lib/libc/string/t_swab.c
new file mode 100644
index 000000000000..797397a79a15
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/string/t_swab.c
@@ -0,0 +1,95 @@
+/*	$NetBSD: t_swab.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <err.h>
+
+#define MAXCHK	100
+
+static void
+build(char *a, char *b, size_t n) {
+	size_t i;
+
+	n >>= 1;
+	for (i = 0; i < n; i += 2) {
+		b[i+1] = a[i] = (char)i;
+		b[i] = a[i+1] = (char)(i+1);
+	}
+	for (n <<= 1; n < MAXCHK; n++)
+		a[n] = b[n] = (char)~0;
+}
+
+static void
+dump(const char *f, char *b, size_t l)
+{
+
+	printf("%s ", f);
+	while (l--)
+		printf("%.2x ", (unsigned char)*b++);
+	printf("\n");
+}
+
+ATF_TC(swab_basic);
+ATF_TC_HEAD(swab_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test swab results");
+}
+
+ATF_TC_BODY(swab_basic, tc)
+{
+	char a[MAXCHK], b[MAXCHK], r[MAXCHK];
+	size_t i;
+
+	for (i = 0; i < MAXCHK; i += 2) {
+		build(a, b, i);
+		(void)memset(r, ~0, MAXCHK);
+		swab(a, r, i);
+		if (memcmp(b, r, MAXCHK) != 0) {
+			fprintf(stderr, "pattern mismatch at %lu bytes",
+			    (unsigned long)i);
+			dump("expect:", b, MAXCHK);
+			dump("result:", r, MAXCHK);
+			atf_tc_fail("Check stderr for details");
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, swab_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sync/all_sync_ops_linkable.c b/contrib/netbsd-tests/lib/libc/sync/all_sync_ops_linkable.c
new file mode 100644
index 000000000000..0f2068a3d0cb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sync/all_sync_ops_linkable.c
@@ -0,0 +1,168 @@
+/* $NetBSD: all_sync_ops_linkable.c,v 1.4 2014/02/21 10:26:25 martin Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+
+/*
+ * This is a simple link-time test to verify all builtin atomic sync
+ * operations are available. Depending on the exact cpu/arch code generator
+ * options, some of these need support functions (which on NetBSD we
+ * typically provide in src/common/lib/libc/atomic).
+ *
+ * The list of operations has been extracted from sync-builtins.def file
+ * in the gcc distribution (as of gcc 4.8.2).
+ */
+
+#include <machine/types.h>
+#include <sys/inttypes.h>
+
+volatile uint8_t u8 = 0;
+volatile uint16_t u16 = 0;
+volatile uint32_t u32 = 0;
+
+#ifdef __HAVE_ATOMIC64_OPS
+volatile uint64_t u64 = 0;
+#endif
+
+int
+main(int argc, char **argv)
+{
+	__sync_synchronize();
+	__sync_add_and_fetch(&u8, 1);
+	__sync_add_and_fetch_1(&u8, 1);
+	__sync_add_and_fetch_2(&u16, 1);
+	__sync_add_and_fetch_4(&u32, 1);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_add_and_fetch_8(&u64, 1);
+#endif
+	__sync_bool_compare_and_swap(&u8, 1, 2);
+	__sync_bool_compare_and_swap_1(&u8, 1, 2);
+	__sync_bool_compare_and_swap_2(&u16, 1, 2);
+	__sync_bool_compare_and_swap_4(&u32, 1, 2);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_bool_compare_and_swap_8(&u64, 1, 2);
+#endif
+	__sync_fetch_and_add(&u8, 1);
+	__sync_fetch_and_add_1(&u8, 1);
+	__sync_fetch_and_add_2(&u16, 1);
+	__sync_fetch_and_add_4(&u32, 1);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_add_8(&u64, 1);
+#endif
+	__sync_fetch_and_and(&u8, 0x80);
+	__sync_fetch_and_and_1(&u8, 0x80);
+	__sync_fetch_and_and_2(&u16, 0x80);
+	__sync_fetch_and_and_4(&u32, 0x80);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_and_8(&u64, 0x80);
+#endif
+#ifndef __clang__
+	__sync_fetch_and_nand(&u8, 0x80);
+	__sync_fetch_and_nand_1(&u8, 0x80);
+	__sync_fetch_and_nand_2(&u16, 0x80);
+	__sync_fetch_and_nand_4(&u32, 0x80);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_nand_8(&u64, 0x80);
+#endif
+#endif
+	__sync_fetch_and_or(&u8, 0x80);
+	__sync_fetch_and_or_1(&u8, 0x80);
+	__sync_fetch_and_or_2(&u16, 0x80);
+	__sync_fetch_and_or_4(&u32, 0x80);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_or_8(&u64, 0x80);
+#endif
+	__sync_fetch_and_sub(&u8, 0x80);
+	__sync_fetch_and_sub_1(&u8, 0x80);
+	__sync_fetch_and_sub_2(&u16, 0x80);
+	__sync_fetch_and_sub_4(&u32, 0x80);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_sub_8(&u64, 0x80);
+#endif
+	__sync_fetch_and_xor(&u8, 0x80);
+	__sync_fetch_and_xor_1(&u8, 0x80);
+	__sync_fetch_and_xor_2(&u16, 0x80);
+	__sync_fetch_and_xor_4(&u32, 0x80);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_fetch_and_xor_8(&u64, 0x80);
+#endif
+	__sync_lock_release(&u8);
+	__sync_lock_release_1(&u8);
+	__sync_lock_release_2(&u16);
+	__sync_lock_release_4(&u32);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_lock_release_8(&u64);
+#endif
+	__sync_lock_test_and_set(&u8, 5);
+	__sync_lock_test_and_set_1(&u8, 5);
+	__sync_lock_test_and_set_2(&u16, 5);
+	__sync_lock_test_and_set_4(&u32, 5);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_lock_test_and_set_8(&u64, 5);
+#endif
+#ifndef __clang__
+	__sync_nand_and_fetch(&u8, 5);
+	__sync_nand_and_fetch_1(&u8, 5);
+	__sync_nand_and_fetch_2(&u16, 5);
+	__sync_nand_and_fetch_4(&u32, 5);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_nand_and_fetch_8(&u64, 5);
+#endif
+#endif
+	__sync_or_and_fetch(&u8, 5);
+	__sync_or_and_fetch_1(&u8, 5);
+	__sync_or_and_fetch_2(&u16, 5);
+	__sync_or_and_fetch_4(&u32, 5);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_or_and_fetch_8(&u64, 5);
+#endif
+	__sync_sub_and_fetch(&u8, 5);
+	__sync_sub_and_fetch_1(&u8, 5);
+	__sync_sub_and_fetch_2(&u16, 5);
+	__sync_sub_and_fetch_4(&u32, 5);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_sub_and_fetch_8(&u64, 5);
+#endif
+	__sync_val_compare_and_swap(&u8, 5, 9);
+	__sync_val_compare_and_swap_1(&u8, 5, 9);
+	__sync_val_compare_and_swap_2(&u16, 5, 9);
+	__sync_val_compare_and_swap_4(&u32, 5, 9);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_val_compare_and_swap_8(&u64, 5, 9);
+#endif
+	__sync_xor_and_fetch(&u8, 5);
+	__sync_xor_and_fetch_1(&u8, 5);
+	__sync_xor_and_fetch_2(&u16, 5);
+	__sync_xor_and_fetch_4(&u32, 5);
+#ifdef __HAVE_ATOMIC64_OPS
+	__sync_xor_and_fetch_8(&u64, 5);
+#endif
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_access.c b/contrib/netbsd-tests/lib/libc/sys/t_access.c
new file mode 100644
index 000000000000..f15afc25a6f2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_access.c
@@ -0,0 +1,210 @@
+/* $NetBSD: t_access.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_access.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static const char path[] = "access";
+static const int mode[4] = { R_OK, W_OK, X_OK, F_OK };
+
+ATF_TC_WITH_CLEANUP(access_access);
+ATF_TC_HEAD(access_access, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for EACCES");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(access_access, tc)
+{
+	const int perm[3] = { 0200, 0400, 0000 };
+	size_t i;
+	int fd;
+
+	fd = open(path, O_RDONLY | O_CREAT);
+
+	if (fd < 0)
+		return;
+
+	for (i = 0; i < __arraycount(mode) - 1; i++) {
+
+		ATF_REQUIRE(fchmod(fd, perm[i]) == 0);
+
+		errno = 0;
+
+		ATF_REQUIRE(access(path, mode[i]) != 0);
+		ATF_REQUIRE(errno == EACCES);
+	}
+
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC_CLEANUP(access_access, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(access_fault);
+ATF_TC_HEAD(access_fault, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for EFAULT");
+}
+
+ATF_TC_BODY(access_fault, tc)
+{
+	size_t i;
+
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		errno = 0;
+
+		ATF_REQUIRE(access(NULL, mode[i]) != 0);
+		ATF_REQUIRE(errno == EFAULT);
+
+		errno = 0;
+
+		ATF_REQUIRE(access((char *)-1, mode[i]) != 0);
+		ATF_REQUIRE(errno == EFAULT);
+	}
+}
+
+ATF_TC(access_inval);
+ATF_TC_HEAD(access_inval, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for EINVAL");
+}
+
+ATF_TC_BODY(access_inval, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE(access("/usr", -1) != 0);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC(access_notdir);
+ATF_TC_HEAD(access_notdir, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for ENOTDIR");
+}
+
+ATF_TC_BODY(access_notdir, tc)
+{
+	size_t i;
+
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		errno = 0;
+
+		/*
+		 *  IEEE Std 1003.1-2008 about ENOTDIR:
+		 *
+		 *  "A component of the path prefix is not a directory,
+		 *   or the path argument contains at least one non-<slash>
+		 *   character and ends with one or more trailing <slash>
+		 *   characters and the last pathname component names an
+		 *   existing file that is neither a directory nor a symbolic
+		 *   link to a directory."
+		 */
+		ATF_REQUIRE(access("/etc/passwd//", mode[i]) != 0);
+		ATF_REQUIRE(errno == ENOTDIR);
+	}
+}
+
+ATF_TC(access_notexist);
+ATF_TC_HEAD(access_notexist, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for ENOENT");
+}
+
+ATF_TC_BODY(access_notexist, tc)
+{
+	size_t i;
+
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		errno = 0;
+
+		ATF_REQUIRE(access("", mode[i]) != 0);
+		ATF_REQUIRE(errno == ENOENT);
+	}
+}
+
+ATF_TC(access_toolong);
+ATF_TC_HEAD(access_toolong, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test access(2) for ENAMETOOLONG");
+}
+
+ATF_TC_BODY(access_toolong, tc)
+{
+	char *buf;
+	size_t i;
+
+	buf = malloc(PATH_MAX);
+
+	if (buf == NULL)
+		return;
+
+	for (i = 0; i < PATH_MAX; i++)
+		buf[i] = 'x';
+
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		errno = 0;
+
+		ATF_REQUIRE(access(buf, mode[i]) != 0);
+		ATF_REQUIRE(errno == ENAMETOOLONG);
+	}
+
+	free(buf);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, access_access);
+	ATF_TP_ADD_TC(tp, access_fault);
+	ATF_TP_ADD_TC(tp, access_inval);
+	ATF_TP_ADD_TC(tp, access_notdir);
+	ATF_TP_ADD_TC(tp, access_notexist);
+	ATF_TP_ADD_TC(tp, access_toolong);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_chroot.c b/contrib/netbsd-tests/lib/libc/sys/t_chroot.c
new file mode 100644
index 000000000000..ce7170875f24
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_chroot.c
@@ -0,0 +1,313 @@
+/* $NetBSD: t_chroot.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_chroot.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC(chroot_basic);
+ATF_TC_HEAD(chroot_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of chroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(chroot_basic, tc)
+{
+	char buf[PATH_MAX];
+	int fd, sta;
+	pid_t pid;
+
+	(void)memset(buf, '\0', sizeof(buf));
+	(void)getcwd(buf, sizeof(buf));
+	(void)strlcat(buf, "/dir", sizeof(buf));
+
+	ATF_REQUIRE(mkdir(buf, 0500) == 0);
+	ATF_REQUIRE(chdir(buf) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (chroot(buf) != 0)
+			_exit(EXIT_FAILURE);
+
+		errno = 0;
+
+		if (chroot("/root") != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != ENOENT)
+			_exit(EXIT_FAILURE);
+
+		fd = open("file", O_RDONLY | O_CREAT, 0600);
+
+		if (fd < 0)
+			_exit(EXIT_FAILURE);
+
+		if (close(fd) != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("chroot(2) failed");
+
+	(void)chdir("/");
+	(void)strlcat(buf, "/file", sizeof(buf));
+
+	fd = open(buf, O_RDONLY);
+
+	if (fd < 0)
+		atf_tc_fail("chroot(2) did not change the root directory");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(buf) == 0);
+}
+
+ATF_TC(chroot_err);
+ATF_TC_HEAD(chroot_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of chroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(chroot_err, tc)
+{
+	char buf[PATH_MAX + 1];
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, chroot(buf) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, chroot((void *)-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, chroot("/a/b/c/d/e/f/g/h/i/j") == -1);
+}
+
+ATF_TC(chroot_perm);
+ATF_TC_HEAD(chroot_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with chroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(chroot_perm, tc)
+{
+	static char buf[LINE_MAX];
+	pid_t pid;
+	int sta;
+
+	(void)memset(buf, '\0', sizeof(buf));
+	ATF_REQUIRE(getcwd(buf, sizeof(buf)) != NULL);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		errno = 0;
+
+		if (chroot(buf) != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("chroot(2) succeeded as unprivileged user");
+}
+
+ATF_TC(fchroot_basic);
+ATF_TC_HEAD(fchroot_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fchroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(fchroot_basic, tc)
+{
+	char buf[PATH_MAX];
+	int fd, sta;
+	pid_t pid;
+
+	(void)memset(buf, '\0', sizeof(buf));
+	(void)getcwd(buf, sizeof(buf));
+	(void)strlcat(buf, "/dir", sizeof(buf));
+
+	ATF_REQUIRE(mkdir(buf, 0500) == 0);
+	ATF_REQUIRE(chdir(buf) == 0);
+
+	fd = open(buf, O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (fchroot(fd) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (close(fd) != 0)
+			_exit(EXIT_FAILURE);
+
+		fd = open("file", O_RDONLY | O_CREAT, 0600);
+
+		if (fd < 0)
+			_exit(EXIT_FAILURE);
+
+		if (close(fd) != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("fchroot(2) failed");
+
+	(void)chdir("/");
+	(void)strlcat(buf, "/file", sizeof(buf));
+
+	fd = open(buf, O_RDONLY);
+
+	if (fd < 0)
+		atf_tc_fail("fchroot(2) did not change the root directory");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(buf) == 0);
+}
+
+ATF_TC(fchroot_err);
+ATF_TC_HEAD(fchroot_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of fchroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(fchroot_err, tc)
+{
+	int fd;
+
+	fd = open("/etc/passwd", O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fchroot(-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOTDIR, fchroot(fd) == -1);
+
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC(fchroot_perm);
+ATF_TC_HEAD(fchroot_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with fchroot(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(fchroot_perm, tc)
+{
+	static char buf[LINE_MAX];
+	struct passwd *pw;
+	int fd, sta;
+	pid_t pid;
+
+	(void)memset(buf, '\0', sizeof(buf));
+	ATF_REQUIRE(getcwd(buf, sizeof(buf)) != NULL);
+
+	pw = getpwnam("nobody");
+	fd = open(buf, O_RDONLY);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(pw != NULL);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)setuid(pw->pw_uid);
+
+		errno = 0;
+
+		if (fchroot(fd) != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("fchroot(2) succeeded as unprivileged user");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, chroot_basic);
+	ATF_TP_ADD_TC(tp, chroot_err);
+	ATF_TP_ADD_TC(tp, chroot_perm);
+	ATF_TP_ADD_TC(tp, fchroot_basic);
+	ATF_TP_ADD_TC(tp, fchroot_err);
+	ATF_TP_ADD_TC(tp, fchroot_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c b/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c
new file mode 100644
index 000000000000..69890fdf0523
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c
@@ -0,0 +1,212 @@
+/* $NetBSD: t_clock_gettime.c,v 1.1 2011/10/15 06:42:16 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Frank Kardel.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c) 2006 Frank Kardel
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_clock_gettime.c,v 1.1 2011/10/15 06:42:16 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/sysctl.h>
+
+#include <machine/int_limits.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "../../../h_macros.h"
+
+#define MINPOSDIFF	15000000	/* 15 ms for now */
+#define TIMEOUT		5
+
+#define TC_HARDWARE	"kern.timecounter.hardware"
+#define TC_CHOICE	"kern.timecounter.choice"
+
+static void
+check_timecounter(void)
+{
+	struct timespec tsa, tsb, tsl, res;
+	long long mindiff = INTMAX_MAX;
+	time_t endlimit;
+
+#define CL(x) \
+	do { \
+		if ((x) != -1) \
+			break; \
+		atf_tc_fail_nonfatal("%s: %s", #x, strerror(errno)); \
+		return; \
+	} while (0)
+
+	CL(clock_gettime(CLOCK_REALTIME, &tsa));
+	tsl = tsa;
+
+	CL(time(&endlimit));
+	endlimit += TIMEOUT + 1;
+
+	while ((time_t)tsa.tv_sec < endlimit) {
+		long long diff;
+
+		CL(clock_gettime(CLOCK_REALTIME, &tsb));
+		diff = 1000000000LL * (tsb.tv_sec - tsa.tv_sec)
+		    + tsb.tv_nsec - tsa.tv_nsec;
+
+		if (diff > 0 && mindiff > diff)
+			mindiff = diff;
+
+		if (diff < 0 || diff > MINPOSDIFF) {
+			long long elapsed;
+			(void)printf("%stime TSA: 0x%jx.%08jx, TSB: 0x%jx.%08jx, "
+			    "diff = %lld nsec, ", (diff < 0) ? "BAD " : "",
+			    (uintmax_t)tsa.tv_sec, (uintmax_t)tsa.tv_nsec,
+			    (uintmax_t)tsb.tv_sec, (uintmax_t)tsb.tv_nsec, diff);
+
+			elapsed = 1000000000LL * (tsb.tv_sec - tsl.tv_sec)
+			    + tsb.tv_nsec - tsl.tv_nsec;
+
+
+			(void)printf("%lld nsec\n", elapsed);
+			tsl = tsb;
+
+			ATF_CHECK(diff >= 0);
+			if (diff < 0)
+				return;
+		}
+
+		tsa.tv_sec = tsb.tv_sec;
+		tsa.tv_nsec = tsb.tv_nsec;
+	}
+
+	if (clock_getres(CLOCK_REALTIME, &res) == 0) {
+		long long r = res.tv_sec * 1000000000 + res.tv_nsec;
+
+		(void)printf("Claimed resolution: %lld nsec (%f Hz) or "
+		    "better\n", r, 1.0 / r * 1e9);
+		(void)printf("Observed minimum non zero delta: %lld "
+		    "nsec\n", mindiff);
+	}
+
+#undef CL
+}
+
+ATF_TC(clock_gettime_real);
+ATF_TC_HEAD(clock_gettime_real, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks the monotonicity of the CLOCK_REALTIME implementation");
+	atf_tc_set_md_var(tc, "timeout", "300");
+}
+
+ATF_TC_BODY(clock_gettime_real, tc)
+{
+	char name[128], cbuf[512], ctrbuf[10240];
+	size_t cbufsiz = sizeof(cbuf);
+	size_t ctrbufsiz = sizeof(ctrbuf);
+	const char *p;
+	char *save;
+	int quality, n;
+
+	if (sysctlbyname(TC_HARDWARE, cbuf, &cbufsiz, NULL, 0) != 0) {
+		(void)printf("\nChecking legacy time implementation "
+		    "for %d seconds\n", TIMEOUT);
+		check_timecounter();
+		return;
+		/* NOTREACHED */
+	}
+	(void)printf("%s = %s\n", TC_HARDWARE, cbuf);
+	REQUIRE_LIBC(save = strdup(cbuf), NULL);
+
+	RL(sysctlbyname(TC_CHOICE, ctrbuf, &ctrbufsiz, NULL, 0));
+	(void)printf("%s = %s\n", TC_CHOICE, ctrbuf);
+
+	for (p = ctrbuf, n = 0; sscanf(p, "%127[^(](q=%d, f=%*u Hz)%*[ ]%n",
+	    name, &quality, &n) == 2; p += n) {
+		struct timespec ts;
+		int ret;
+
+		if (quality < 0)
+			continue;
+
+		(void)printf("\nChecking %s for %d seconds\n", name, TIMEOUT);
+		CHECK_LIBC(ret = sysctlbyname(TC_HARDWARE, NULL, 0,
+		    name, strlen(name)), -1);
+		if (ret == -1)
+			continue;
+
+		/* wait a bit to select new counter in clockinterrupt */
+		ts.tv_sec = 0;
+		ts.tv_nsec = 100000000;
+		(void)nanosleep(&ts, NULL);
+
+		check_timecounter();
+	}
+
+	RL(sysctlbyname(TC_HARDWARE, NULL, 0, save, strlen(save)));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, clock_gettime_real);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_clone.c b/contrib/netbsd-tests/lib/libc/sys/t_clone.c
new file mode 100644
index 000000000000..ea33f321ea0e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_clone.c
@@ -0,0 +1,252 @@
+/* $NetBSD: t_clone.c,v 1.3 2011/12/12 20:55:44 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_clone.c,v 1.3 2011/12/12 20:55:44 joerg Exp $");
+
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define	STACKSIZE	(8 * 1024)
+#define	FROBVAL		41973
+#define	CHILDEXIT	0xa5
+
+static int
+dummy(void *arg)
+{
+
+	return 0;
+}
+
+static int
+clone_func(void *arg)
+{
+	long *frobp = arg, diff;
+
+	printf("child: stack ~= %p, frobme = %p\n", &frobp, frobp);
+	fflush(stdout);
+
+	if (frobp[0] != getppid())
+		return 1;
+
+	if (frobp[0] == getpid())
+		return 2;
+
+	diff = labs(frobp[1] - (long) &frobp);
+
+	if (diff > 1024)
+		return 3;
+
+	frobp[1] = FROBVAL;
+
+	return (CHILDEXIT);
+}
+
+ATF_TC(clone_basic);
+ATF_TC_HEAD(clone_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks clone(2)");
+}
+
+ATF_TC_BODY(clone_basic, tc)
+{
+	sigset_t mask;
+	void *allocstack, *stack;
+	pid_t pid;
+	volatile long frobme[2];
+	int stat;
+
+	allocstack = mmap(NULL, STACKSIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
+	    MAP_PRIVATE|MAP_ANON, -1, (off_t) 0);
+
+	ATF_REQUIRE_ERRNO(errno, allocstack != MAP_FAILED);
+
+	stack = allocstack;
+#ifndef __MACHINE_STACK_GROWS_UP
+	stack = (char *)stack + STACKSIZE;
+#endif
+
+	printf("parent: stack = %p, frobme = %p\n", stack, frobme);
+	fflush(stdout);
+
+	frobme[0] = (long)getpid();
+	frobme[1] = (long)stack;
+
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGUSR1);
+
+	ATF_REQUIRE_ERRNO(errno, sigprocmask(SIG_BLOCK, &mask, NULL) != -1);
+
+	switch (pid = __clone(clone_func, stack,
+	    CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGUSR1,
+	    __UNVOLATILE(frobme))) {
+	case 0:
+		atf_tc_fail("clone() returned 0");
+		/*NOTREACHED*/
+	case -1:
+		atf_tc_fail("clone() failed: %s", strerror(errno));
+		/*NOTREACHED*/
+	default:
+		while (waitpid(pid, &stat, __WCLONE) != pid)
+			continue;
+	}
+
+	ATF_REQUIRE_MSG(WIFEXITED(stat) != 0, "child didn't exit");
+
+	printf("parent: childexit = 0x%x, frobme = %ld\n",
+	    WEXITSTATUS(stat), frobme[1]);
+
+	switch (WEXITSTATUS(stat)) {
+	case CHILDEXIT:
+		ATF_REQUIRE_EQ(frobme[1], FROBVAL);
+		break;
+	case 1:
+		atf_tc_fail("child: argument does not contain parent's pid");
+		/*NOTREACHED*/
+	case 2:
+		atf_tc_fail("child: called in parent's pid");
+		/*NOTREACHED*/
+	case 3:
+		atf_tc_fail("child: called with bad stack");
+		/*NOTREACHED*/
+	default:
+		atf_tc_fail("child returned unknown code: %d",
+		    WEXITSTATUS(stat));
+		/*NOTREACHED*/
+	}
+
+	ATF_REQUIRE_ERRNO(errno, munmap(allocstack, STACKSIZE) != -1);
+}
+
+ATF_TC(clone_null_stack);
+ATF_TC_HEAD(clone_null_stack, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that clone(2) fails when stack pointer is NULL");
+}
+
+ATF_TC_BODY(clone_null_stack, tc)
+{
+	int rv;
+
+	rv = __clone(dummy, NULL,
+	    CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD, NULL);
+
+	ATF_REQUIRE_EQ(rv, -1);
+	ATF_REQUIRE_EQ(errno, EINVAL);
+}
+
+ATF_TC(clone_null_func);
+ATF_TC_HEAD(clone_null_func, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that clone(2) fails when function pointer is NULL");
+}
+
+ATF_TC_BODY(clone_null_func, tc)
+{
+	void *allocstack, *stack;
+	int rv;
+
+	allocstack = mmap(NULL, STACKSIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
+	    MAP_PRIVATE|MAP_ANON, -1, (off_t) 0);
+	ATF_REQUIRE_ERRNO(errno, allocstack != MAP_FAILED);
+	stack = allocstack;
+#ifndef __MACHINE_STACK_GROWS_UP
+	stack = (char *)stack + STACKSIZE;
+#endif
+
+	errno = 0;
+	rv = __clone(0, stack,
+	    CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD, NULL);
+
+	ATF_REQUIRE_EQ(rv, -1);
+	ATF_REQUIRE_EQ(errno, EINVAL);
+
+	ATF_REQUIRE_ERRNO(errno, munmap(allocstack, STACKSIZE) != -1);
+}
+
+ATF_TC(clone_out_of_proc);
+ATF_TC_HEAD(clone_out_of_proc, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+		"Checks that clone(2) fails when running out of processes");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(clone_out_of_proc, tc)
+{
+	struct rlimit rl;
+	int rv;
+
+	ATF_REQUIRE_ERRNO(errno, getrlimit(RLIMIT_NPROC, &rl) != -1);
+
+	rl.rlim_cur = 0;
+	rl.rlim_max = 0;
+
+	ATF_REQUIRE_ERRNO(errno, setrlimit(RLIMIT_NPROC, &rl) != -1);
+
+	errno = 0;
+	rv = __clone(dummy, malloc(10240),
+	    CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD, (void *)&rl);
+
+	ATF_REQUIRE_EQ(rv, -1);
+	ATF_REQUIRE_EQ(errno, EAGAIN);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, clone_basic);
+	ATF_TP_ADD_TC(tp, clone_null_stack);
+	ATF_TP_ADD_TC(tp, clone_null_func);
+	ATF_TP_ADD_TC(tp, clone_out_of_proc);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_connect.c b/contrib/netbsd-tests/lib/libc/sys/t_connect.c
new file mode 100644
index 000000000000..d161ee341583
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_connect.c
@@ -0,0 +1,99 @@
+/*	$NetBSD: t_connect.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $	*/
+/*
+ * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include <atf-c.h>
+
+ATF_TC(connect_low_port);
+ATF_TC_HEAD(connect_low_port, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that low-port allocation "
+	    "works");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(connect_low_port, tc)
+{
+	struct sockaddr_in sin, sinlist;
+	int sd, val, slist;
+	socklen_t slen;
+
+	slist = socket(AF_INET, SOCK_STREAM, 0);
+	sd = socket(AF_INET, SOCK_STREAM, 0);
+
+	/* bind listening socket */
+	memset(&sinlist, 0, sizeof(sinlist));
+	sinlist.sin_family = AF_INET;
+	sinlist.sin_port = htons(31522);
+	sinlist.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	ATF_REQUIRE_EQ(bind(slist,
+	    (struct sockaddr *)&sinlist, sizeof(sinlist)), 0);
+	ATF_REQUIRE_EQ(listen(slist, 1), 0);
+
+	val = IP_PORTRANGE_LOW;
+	if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, &val,
+	    sizeof(val)) == -1)
+		atf_tc_fail("setsockopt failed: %s", strerror(errno));
+
+	memset(&sin, 0, sizeof(sin));
+
+	sin.sin_port = htons(31522);
+	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+	sin.sin_family = AF_INET;
+
+	if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
+		int serrno = errno;
+		atf_tc_fail("connect failed: %s%s",
+		    strerror(serrno),
+		    serrno != EACCES ? "" :
+		    " (see http://mail-index.netbsd.org/"
+		    "source-changes/2007/12/16/0011.html)");
+	}
+
+	slen = sizeof(sin);
+	ATF_REQUIRE_EQ(getsockname(sd, (struct sockaddr *)&sin, &slen), 0);
+	ATF_REQUIRE_EQ(slen, sizeof(sin));
+	ATF_REQUIRE(ntohs(sin.sin_port) <= IPPORT_RESERVEDMAX);
+
+	close(sd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, connect_low_port);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_dup.c b/contrib/netbsd-tests/lib/libc/sys/t_dup.c
new file mode 100644
index 000000000000..a2623c09e7ef
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_dup.c
@@ -0,0 +1,385 @@
+/* $NetBSD: t_dup.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_dup.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $");
+
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sysexits.h>
+
+static char	path[] = "dup";
+static void	check_mode(bool, bool, bool);
+
+static void
+check_mode(bool _dup, bool _dup2, bool _dup3)
+{
+	int mode[3] = { O_RDONLY, O_WRONLY, O_RDWR   };
+	int perm[5] = { 0700, 0400, 0600, 0444, 0666 };
+	struct stat st, st1;
+	int fd, fd1, fd2;
+	size_t i, j;
+
+	/*
+	 * Check that a duplicated descriptor
+	 * retains the mode of the original file.
+	 */
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		for (j = 0; j < __arraycount(perm); j++) {
+
+			fd1 = open(path, mode[i] | O_CREAT, perm[j]);
+			fd2 = open("/etc/passwd", O_RDONLY);
+
+			ATF_REQUIRE(fd1 >= 0);
+			ATF_REQUIRE(fd2 >= 0);
+
+			if (_dup != false)
+				fd = dup(fd1);
+			else if (_dup2 != false)
+				fd = dup2(fd1, fd2);
+			else if (_dup3 != false)
+				fd = dup3(fd1, fd2, O_CLOEXEC);
+			else {
+				fd = -1;
+			}
+
+			ATF_REQUIRE(fd >= 0);
+
+			(void)memset(&st, 0, sizeof(struct stat));
+			(void)memset(&st1, 0, sizeof(struct stat));
+
+			ATF_REQUIRE(fstat(fd, &st) == 0);
+			ATF_REQUIRE(fstat(fd1, &st1) == 0);
+
+			if (st.st_mode != st1.st_mode)
+				atf_tc_fail("invalid mode");
+
+			(void)close(fd);
+			(void)close(fd1);
+			(void)close(fd2);
+			(void)unlink(path);
+		}
+	}
+}
+
+ATF_TC(dup2_basic);
+ATF_TC_HEAD(dup2_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of dup2(2)");
+}
+
+ATF_TC_BODY(dup2_basic, tc)
+{
+	int fd, fd1, fd2;
+
+	fd1 = open("/etc/passwd", O_RDONLY);
+	fd2 = open("/etc/passwd", O_RDONLY);
+
+	ATF_REQUIRE(fd1 >= 0);
+	ATF_REQUIRE(fd2 >= 0);
+
+	fd = dup2(fd1, fd2);
+	ATF_REQUIRE(fd >= 0);
+
+	if (fd != fd2)
+		atf_tc_fail("invalid descriptor");
+
+	(void)close(fd);
+	(void)close(fd1);
+
+	ATF_REQUIRE(close(fd2) != 0);
+}
+
+ATF_TC(dup2_err);
+ATF_TC_HEAD(dup2_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of dup2(2)");
+}
+
+ATF_TC_BODY(dup2_err, tc)
+{
+	int fd;
+
+	fd = open("/etc/passwd", O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup2(-1, -1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup2(fd, -1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup2(-1, fd) == -1);
+
+	/*
+	 * Note that this should not fail with EINVAL.
+	 */
+	ATF_REQUIRE(dup2(fd, fd) != -1);
+
+	(void)close(fd);
+}
+
+ATF_TC(dup2_max);
+ATF_TC_HEAD(dup2_max, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test dup2(2) against limits");
+}
+
+ATF_TC_BODY(dup2_max, tc)
+{
+	struct rlimit res;
+
+	(void)memset(&res, 0, sizeof(struct rlimit));
+	(void)getrlimit(RLIMIT_NOFILE, &res);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup2(STDERR_FILENO, res.rlim_cur + 1) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(dup2_mode);
+ATF_TC_HEAD(dup2_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of dup2(2)");
+}
+
+ATF_TC_BODY(dup2_mode, tc)
+{
+	check_mode(false, true, false);
+}
+
+ATF_TC_CLEANUP(dup2_mode, tc)
+{
+	(void)unlink(path);
+}
+
+
+ATF_TC(dup3_err);
+ATF_TC_HEAD(dup3_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test error conditions of dup3(2) (PR lib/45148)");
+}
+
+ATF_TC_BODY(dup3_err, tc)
+{
+	int fd;
+
+	fd = open("/etc/passwd", O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	errno = 0;
+	ATF_REQUIRE(dup3(fd, fd, O_CLOEXEC) != -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup3(-1, -1, O_CLOEXEC) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup3(fd, -1, O_CLOEXEC) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup3(-1, fd, O_CLOEXEC) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, dup3(fd, 1, O_NOFOLLOW) == -1);
+
+	(void)close(fd);
+}
+
+ATF_TC(dup3_max);
+ATF_TC_HEAD(dup3_max, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test dup3(2) against limits");
+}
+
+ATF_TC_BODY(dup3_max, tc)
+{
+	struct rlimit res;
+
+	(void)memset(&res, 0, sizeof(struct rlimit));
+	(void)getrlimit(RLIMIT_NOFILE, &res);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup3(STDERR_FILENO,
+		res.rlim_cur + 1, O_CLOEXEC) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(dup3_mode);
+ATF_TC_HEAD(dup3_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of dup3(2)");
+}
+
+ATF_TC_BODY(dup3_mode, tc)
+{
+	check_mode(false, false, true);
+}
+
+ATF_TC_CLEANUP(dup3_mode, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(dup_err);
+ATF_TC_HEAD(dup_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of dup(2)");
+}
+
+ATF_TC_BODY(dup_err, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, dup(-1) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(dup_max);
+ATF_TC_HEAD(dup_max, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test dup(2) against limits");
+}
+
+ATF_TC_BODY(dup_max, tc)
+{
+	struct rlimit res;
+	int *buf, fd, sta;
+	size_t i, n;
+	pid_t pid;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * Open a temporary file until the
+		 * maximum number of open files is
+		 * reached. Ater that dup(2) family
+		 * should fail with EMFILE.
+		 */
+		(void)closefrom(0);
+		(void)memset(&res, 0, sizeof(struct rlimit));
+
+		n = 10;
+		res.rlim_cur = res.rlim_max = n;
+		if (setrlimit(RLIMIT_NOFILE, &res) != 0)
+			_exit(EX_OSERR);
+
+		buf = calloc(n, sizeof(int));
+
+		if (buf == NULL)
+			_exit(EX_OSERR);
+
+		buf[0] = mkstemp(path);
+
+		if (buf[0] < 0)
+			_exit(EX_OSERR);
+
+		for (i = 1; i < n; i++) {
+
+			buf[i] = open(path, O_RDONLY);
+
+			if (buf[i] < 0)
+				_exit(EX_OSERR);
+		}
+
+		errno = 0;
+		fd = dup(buf[0]);
+
+		if (fd != -1 || errno != EMFILE)
+			_exit(EX_DATAERR);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS) {
+
+		if (WEXITSTATUS(sta) == EX_OSERR)
+			atf_tc_fail("system call error");
+
+		if (WEXITSTATUS(sta) == EX_DATAERR)
+			atf_tc_fail("dup(2) dupped more than RLIMIT_NOFILE");
+
+		atf_tc_fail("unknown error");
+	}
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(dup_max, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(dup_mode);
+ATF_TC_HEAD(dup_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of dup(2)");
+}
+
+ATF_TC_BODY(dup_mode, tc)
+{
+	check_mode(true, false, false);
+}
+
+ATF_TC_CLEANUP(dup_mode, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, dup2_basic);
+	ATF_TP_ADD_TC(tp, dup2_err);
+	ATF_TP_ADD_TC(tp, dup2_max);
+	ATF_TP_ADD_TC(tp, dup2_mode);
+	ATF_TP_ADD_TC(tp, dup3_err);
+	ATF_TP_ADD_TC(tp, dup3_max);
+	ATF_TP_ADD_TC(tp, dup3_mode);
+	ATF_TP_ADD_TC(tp, dup_err);
+	ATF_TP_ADD_TC(tp, dup_max);
+	ATF_TP_ADD_TC(tp, dup_mode);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_fsync.c b/contrib/netbsd-tests/lib/libc/sys/t_fsync.c
new file mode 100644
index 000000000000..e61ea7ef3aa6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_fsync.c
@@ -0,0 +1,120 @@
+/* $NetBSD: t_fsync.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fsync.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $");
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+ATF_TC(fsync_err);
+ATF_TC_HEAD(fsync_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test error conditions of fsync(2) (PR kern/30)");
+}
+
+ATF_TC_BODY(fsync_err, tc)
+{
+	int i, fd[2];
+
+	/*
+	 * The fsync(2) call should fail with EBADF
+	 * when the 'fd' is not a valid descriptor.
+	 */
+	for (i = 1; i < 1024; i = i + 128) {
+
+		errno = 0;
+
+		ATF_REQUIRE(fsync(-i) == -1);
+		ATF_REQUIRE(errno == EBADF);
+	}
+
+	/*
+	 * On the other hand, EINVAL should follow
+	 * if the operation is not possible with
+	 * the file descriptor.
+	 */
+	ATF_REQUIRE(pipe(fd) == 0);
+
+	errno = 0;
+
+	ATF_REQUIRE(fsync(fd[0]) == -1);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+
+	ATF_REQUIRE(fsync(fd[1]) == -1);
+	ATF_REQUIRE(errno == EINVAL);
+
+	ATF_REQUIRE(close(fd[0]) == 0);
+	ATF_REQUIRE(close(fd[1]) == 0);
+}
+
+ATF_TC(fsync_sync);
+ATF_TC_HEAD(fsync_sync, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fsync(2)");
+}
+
+ATF_TC_BODY(fsync_sync, tc)
+{
+	char buf[128];
+	int fd, i;
+
+	for (i = 0; i < 10; i++) {
+
+		(void)snprintf(buf, sizeof(buf), "t_fsync-%d", i);
+
+		fd = mkstemp(buf);
+
+		ATF_REQUIRE(fd != -1);
+		ATF_REQUIRE(write(fd, "0", 1) == 1);
+		ATF_REQUIRE(fsync(fd) == 0);
+
+		ATF_REQUIRE(unlink(buf) == 0);
+		ATF_REQUIRE(close(fd) == 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fsync_err);
+	ATF_TP_ADD_TC(tp, fsync_sync);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c b/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
new file mode 100644
index 000000000000..3a2d9f73f5d1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
@@ -0,0 +1,129 @@
+/* $NetBSD: t_getcontext.c,v 1.3 2011/07/14 04:59:14 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_getcontext.c,v 1.3 2011/07/14 04:59:14 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+#define STACKSZ (10*1024)
+#define DEPTH 3
+
+static int calls;
+
+static void
+run(int n, ...)
+{
+	va_list va;
+	int i, ia;
+
+	ATF_REQUIRE_EQ(n, DEPTH - calls - 1);
+
+	va_start(va, n);
+	for (i = 0; i < 9; i++) {
+		ia = va_arg(va, int);
+		ATF_REQUIRE_EQ(i, ia);
+	}
+	va_end(va);
+
+	calls++;
+}
+
+ATF_TC(getcontext_err);
+ATF_TC_HEAD(getcontext_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from getcontext(2)");
+}
+
+ATF_TC_BODY(getcontext_err, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, getcontext((void *)-1) == -1);
+}
+
+ATF_TC(setcontext_err);
+ATF_TC_HEAD(setcontext_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from setcontext(2)");
+}
+
+ATF_TC_BODY(setcontext_err, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, setcontext((void *)-1) == -1);
+}
+
+ATF_TC(setcontext_link);
+ATF_TC_HEAD(setcontext_link, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	"Checks get/make/setcontext(), context linking via uc_link(), "
+	    "and argument passing to the new context");
+}
+
+ATF_TC_BODY(setcontext_link, tc)
+{
+	ucontext_t uc[DEPTH];
+	ucontext_t save;
+	volatile int i = 0; /* avoid longjmp clobbering */
+
+	for (i = 0; i < DEPTH; ++i) {
+		ATF_REQUIRE_EQ(getcontext(&uc[i]), 0);
+
+		uc[i].uc_stack.ss_sp = malloc(STACKSZ);
+		uc[i].uc_stack.ss_size = STACKSZ;
+		uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save;
+
+		makecontext(&uc[i], (void *)run, 10, i,
+			0, 1, 2, 3, 4, 5, 6, 7, 8);
+	}
+
+	ATF_REQUIRE_EQ(getcontext(&save), 0);
+
+	if (calls == 0)
+		ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getcontext_err);
+	ATF_TP_ADD_TC(tp, setcontext_err);
+	ATF_TP_ADD_TC(tp, setcontext_link);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c b/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c
new file mode 100644
index 000000000000..9a8ec8ede271
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c
@@ -0,0 +1,171 @@
+/* $NetBSD: t_getgroups.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getgroups.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC(getgroups_err);
+ATF_TC_HEAD(getgroups_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors in getgroups(2)");
+}
+
+ATF_TC_BODY(getgroups_err, tc)
+{
+	gid_t gidset[NGROUPS_MAX];
+
+	errno = 0;
+
+	ATF_REQUIRE(getgroups(10, (gid_t *)-1) == -1);
+	ATF_REQUIRE(errno == EFAULT);
+
+	errno = 0;
+
+	ATF_REQUIRE(getgroups(-1, gidset) == -1);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC(getgroups_getgid);
+ATF_TC_HEAD(getgroups_getgid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getgid(2) from getgroups(2)");
+}
+
+ATF_TC_BODY(getgroups_getgid, tc)
+{
+	gid_t gidset[NGROUPS_MAX];
+	gid_t gid = getgid();
+	int i, n;
+
+	/*
+	 * Check that getgid(2) is found from
+	 * the GIDs returned by getgroups(2).
+	 */
+	n = getgroups(NGROUPS_MAX, gidset);
+
+	for (i = 0; i < n; i++) {
+
+		if (gidset[i] == gid)
+			return;
+	}
+
+	atf_tc_fail("getgid(2) not found from getgroups(2)");
+}
+
+ATF_TC(getgroups_setgid);
+ATF_TC_HEAD(getgroups_setgid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setgid(2) from getgroups(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(getgroups_setgid, tc)
+{
+	gid_t gidset[NGROUPS_MAX];
+	int i, n, rv, sta;
+	pid_t pid;
+
+	/*
+	 * Check that we can setgid(2)
+	 * to the returned group IDs.
+	 */
+	n = getgroups(NGROUPS_MAX, gidset);
+	ATF_REQUIRE(n >= 0);
+
+	for (i = 0; i < n; i++) {
+
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		if (pid == 0) {
+
+			rv = setgid(gidset[i]);
+
+			if (rv != 0)
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+			atf_tc_fail("getgroups(2) is inconsistent");
+	}
+}
+
+ATF_TC(getgroups_zero);
+ATF_TC_HEAD(getgroups_zero, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getgroups(2) with zero param");
+}
+
+ATF_TC_BODY(getgroups_zero, tc)
+{
+	const gid_t val = 123456789;
+	gid_t gidset[NGROUPS_MAX];
+	size_t i;
+
+	/*
+	 * If the first parameter is zero, the number
+	 * of groups should be returned but the supplied
+	 * buffer should remain intact.
+	 */
+	for (i = 0; i < __arraycount(gidset); i++)
+		gidset[i] = val;
+
+	ATF_REQUIRE(getgroups(0, gidset) >= 0);
+
+	for (i = 0; i < __arraycount(gidset); i++) {
+
+		if (gidset[i] != val)
+			atf_tc_fail("getgroups(2) modified the buffer");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getgroups_err);
+	ATF_TP_ADD_TC(tp, getgroups_getgid);
+	ATF_TP_ADD_TC(tp, getgroups_setgid);
+	ATF_TP_ADD_TC(tp, getgroups_zero);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c b/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c
new file mode 100644
index 000000000000..b3845418cbe9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c
@@ -0,0 +1,211 @@
+/* $NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $");
+
+#include <sys/time.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+static bool	fail;
+static void	sighandler(int);
+
+static void
+sighandler(int signo)
+{
+
+	if (signo == SIGALRM || signo == SIGVTALRM)
+		fail = false;
+}
+
+ATF_TC(getitimer_empty);
+ATF_TC_HEAD(getitimer_empty, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "getitimer(2) before setitimer(2)");
+}
+
+ATF_TC_BODY(getitimer_empty, tc)
+{
+	struct itimerval it;
+
+	/*
+	 * Verify that the passed structure remains
+	 * empty after calling getitimer(2) but before
+	 * actually arming the timer with setitimer(2).
+	 */
+	(void)memset(&it, 0, sizeof(struct itimerval));
+
+	ATF_REQUIRE(getitimer(ITIMER_REAL, &it) == 0);
+
+	if (it.it_value.tv_sec != 0 || it.it_value.tv_usec != 0)
+		goto fail;
+
+	ATF_REQUIRE(getitimer(ITIMER_VIRTUAL, &it) == 0);
+
+	if (it.it_value.tv_sec != 0 || it.it_value.tv_usec != 0)
+		goto fail;
+
+	ATF_REQUIRE(getitimer(ITIMER_PROF, &it) == 0);
+
+	if (it.it_value.tv_sec != 0 || it.it_value.tv_usec != 0)
+		goto fail;
+
+	return;
+
+fail:
+	atf_tc_fail("getitimer(2) modfied the timer before it was armed");
+}
+
+ATF_TC(getitimer_err);
+ATF_TC_HEAD(getitimer_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from getitimer(2)");
+}
+
+ATF_TC_BODY(getitimer_err, tc)
+{
+	struct itimerval it;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, getitimer(-1, &it) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, getitimer(INT_MAX, &it) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, getitimer(ITIMER_REAL, (void *)-1) == -1);
+}
+
+ATF_TC(setitimer_basic);
+ATF_TC_HEAD(setitimer_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of setitimer(2)");
+}
+
+ATF_TC_BODY(setitimer_basic, tc)
+{
+	struct itimerval it;
+
+	it.it_value.tv_sec = 0;
+	it.it_value.tv_usec = 100;
+
+	it.it_interval.tv_sec = 0;
+	it.it_interval.tv_usec = 0;
+
+	fail = true;
+
+	ATF_REQUIRE(signal(SIGALRM, sighandler) != SIG_ERR);
+	ATF_REQUIRE(setitimer(ITIMER_REAL, &it, NULL) == 0);
+
+	/*
+	 * Although the interaction between
+	 * setitimer(2) and sleep(3) can be
+	 * unspecified, it is assumed that one
+	 * second suspension will be enough for
+	 * the timer to fire.
+	 */
+	(void)sleep(1);
+
+	if (fail != false)
+		atf_tc_fail("timer did not fire");
+}
+
+ATF_TC(setitimer_err);
+ATF_TC_HEAD(setitimer_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from setitimer(2)"
+	    " (PR standards/44927)");
+}
+
+ATF_TC_BODY(setitimer_err, tc)
+{
+	struct itimerval it, ot;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, setitimer(-1, &it, &ot) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, setitimer(INT_MAX, &it, &ot) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, setitimer(ITIMER_REAL,(void*)-1, &ot) == -1);
+}
+
+ATF_TC(setitimer_old);
+ATF_TC_HEAD(setitimer_old, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test old values from setitimer(2)");
+}
+
+ATF_TC_BODY(setitimer_old, tc)
+{
+	struct itimerval it, ot;
+
+	/*
+	 * Make two calls; the second one
+	 * should store the old values.
+	 */
+	it.it_value.tv_sec = 4;
+	it.it_value.tv_usec = 3;
+
+	it.it_interval.tv_sec = 0;
+	it.it_interval.tv_usec = 0;
+
+	ATF_REQUIRE(setitimer(ITIMER_REAL, &it, &ot) == 0);
+
+	it.it_value.tv_sec = 2;
+	it.it_value.tv_usec = 1;
+
+	it.it_interval.tv_sec = 0;
+	it.it_interval.tv_usec = 0;
+
+	ATF_REQUIRE(setitimer(ITIMER_REAL, &it, &ot) == 0);
+
+	if (ot.it_value.tv_sec != 4 || ot.it_value.tv_usec != 3)
+		atf_tc_fail("setitimer(2) did not store old values");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getitimer_empty);
+	ATF_TP_ADD_TC(tp, getitimer_err);
+	ATF_TP_ADD_TC(tp, setitimer_basic);
+	ATF_TP_ADD_TC(tp, setitimer_err);
+	ATF_TP_ADD_TC(tp, setitimer_old);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getlogin.c b/contrib/netbsd-tests/lib/libc/sys/t_getlogin.c
new file mode 100644
index 000000000000..8c2b1990d7eb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getlogin.c
@@ -0,0 +1,237 @@
+/* $NetBSD: t_getlogin.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getlogin.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC(getlogin_r_err);
+ATF_TC_HEAD(getlogin_r_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from getlogin_r(2)");
+}
+
+ATF_TC_BODY(getlogin_r_err, tc)
+{
+	char small[0];
+
+	ATF_REQUIRE(getlogin_r(small, sizeof(small)) == ERANGE);
+}
+
+ATF_TC(getlogin_same);
+ATF_TC_HEAD(getlogin_same, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "getlogin(2) vs. getlogin_r(2)");
+}
+
+ATF_TC_BODY(getlogin_same, tc)
+{
+	char buf[MAXLOGNAME];
+	char *str;
+
+	str = getlogin();
+
+	if (str == NULL)
+		return;
+
+	ATF_REQUIRE(getlogin_r(buf, sizeof(buf)) == 0);
+
+	if (strcmp(str, buf) != 0)
+		atf_tc_fail("getlogin(2) and getlogin_r(2) differ");
+}
+
+ATF_TC(setlogin_basic);
+ATF_TC_HEAD(setlogin_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that setlogin(2) works");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(setlogin_basic, tc)
+{
+	char *name;
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)setsid();
+
+		if (setlogin("foobar") != 0)
+			_exit(EXIT_FAILURE);
+
+		name = getlogin();
+
+		if (name == NULL)
+			_exit(EXIT_FAILURE);
+
+		if (strcmp(name, "foobar") != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("setlogin(2) failed to set login name");
+}
+
+ATF_TC(setlogin_err);
+ATF_TC_HEAD(setlogin_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from setlogin(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(setlogin_err, tc)
+{
+	char buf[MAXLOGNAME + 1];
+	char *name;
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	if (pid == 0) {
+
+		(void)setsid();
+
+		errno = 0;
+
+		if (setlogin(buf) != -1)
+			_exit(EINVAL);
+
+		if (errno != EINVAL)
+			_exit(EINVAL);
+
+		errno = 0;
+
+		if (setlogin((void *)-1) != -1)
+			_exit(EFAULT);
+
+		if (errno != EFAULT)
+			_exit(EFAULT);
+
+		name = getlogin();
+
+		if (name == NULL)
+			_exit(EXIT_FAILURE);
+
+		if (strcmp(name, "foobar") == 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS) {
+
+		if (WEXITSTATUS(sta) == EFAULT)
+			atf_tc_fail("expected EFAULT, but the call succeeded");
+
+		if (WEXITSTATUS(sta) == EINVAL)
+			atf_tc_fail("expected EINVAL, but the call succeeded");
+
+		atf_tc_fail("setlogin(2) failed, but login name was set");
+	}
+}
+
+ATF_TC(setlogin_perm);
+ATF_TC_HEAD(setlogin_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setlogin(2) as normal user");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setlogin_perm, tc)
+{
+	char *name;
+	pid_t pid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)setsid();
+
+		errno = 0;
+
+		if (setlogin("foobar") != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		name = getlogin();
+
+		if (name == NULL)
+			_exit(EXIT_FAILURE);
+
+		if (strcmp(name, "foobar") == 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("login name was set as an unprivileged user");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getlogin_r_err);
+	ATF_TP_ADD_TC(tp, getlogin_same);
+	ATF_TP_ADD_TC(tp, setlogin_basic);
+	ATF_TP_ADD_TC(tp, setlogin_err);
+	ATF_TP_ADD_TC(tp, setlogin_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getpid.c b/contrib/netbsd-tests/lib/libc/sys/t_getpid.c
new file mode 100644
index 000000000000..b3ed3931a41f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getpid.c
@@ -0,0 +1,134 @@
+/* $NetBSD: t_getpid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getpid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static int	 maxiter = 10;
+static void	*threadfunc(void *);
+
+static void *
+threadfunc(void *arg)
+{
+	*(pid_t *)arg = getpid();
+
+	return NULL;
+}
+
+ATF_TC(getpid_process);
+ATF_TC_HEAD(getpid_process, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getpid(2) with processes");
+}
+
+ATF_TC_BODY(getpid_process, tc)
+{
+	pid_t ppid, fpid, cpid, tpid, wpid;
+	int i, sta;
+
+	for (i = 0; i < maxiter; i++) {
+
+		tpid = getpid();
+		fpid = fork();
+
+		ATF_REQUIRE(fpid >= 0);
+
+		if (fpid == 0) {
+
+			cpid = getpid();
+			ppid = getppid();
+
+			if (tpid != ppid)
+				_exit(EXIT_FAILURE);
+
+			if (cpid == ppid)
+				_exit(EXIT_FAILURE);
+
+			if (tpid == fpid)
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		wpid = wait(&sta);
+
+		if (wpid != fpid)
+			atf_tc_fail("PID mismatch");
+
+		ATF_REQUIRE(WIFEXITED(sta) != 0);
+
+		if (WEXITSTATUS(sta) != EXIT_SUCCESS)
+			atf_tc_fail("PID mismatch");
+	}
+}
+
+ATF_TC(getpid_thread);
+ATF_TC_HEAD(getpid_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getpid(2) with threads");
+}
+
+ATF_TC_BODY(getpid_thread, tc)
+{
+	pid_t pid, tpid;
+	pthread_t tid;
+	int i, rv;
+
+	for (i = 0; i < maxiter; i++) {
+
+		pid = getpid();
+
+		rv = pthread_create(&tid, NULL, threadfunc, &tpid);
+		ATF_REQUIRE(rv == 0);
+
+		rv = pthread_join(tid, NULL);
+		ATF_REQUIRE(rv == 0);
+
+		if (pid != tpid)
+			atf_tc_fail("Unequal PIDs");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getpid_process);
+	ATF_TP_ADD_TC(tp, getpid_thread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c b/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c
new file mode 100644
index 000000000000..6c4218a6bdf1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c
@@ -0,0 +1,197 @@
+/* $NetBSD: t_getrusage.c,v 1.3 2014/09/03 19:24:12 matt Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getrusage.c,v 1.3 2014/09/03 19:24:12 matt Exp $");
+
+#include <sys/resource.h>
+#include <sys/time.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdint.h>
+#include <string.h>
+
+static void		work(void);
+static void		sighandler(int);
+
+static const size_t	maxiter = 2000;
+
+static void
+sighandler(int signo)
+{
+	/* Nothing. */
+}
+
+static void
+work(void)
+{
+	size_t n = UINT16_MAX * 10;
+
+	while (n > 0) {
+#ifdef __or1k__
+		 asm volatile("l.nop");	/* Do something. */
+#else
+		 asm volatile("nop");	/* Do something. */
+#endif
+		 n--;
+	}
+}
+
+ATF_TC(getrusage_err);
+ATF_TC_HEAD(getrusage_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions");
+}
+
+ATF_TC_BODY(getrusage_err, tc)
+{
+	struct rusage ru;
+
+	errno = 0;
+
+	ATF_REQUIRE(getrusage(INT_MAX, &ru) != 0);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+
+	ATF_REQUIRE(getrusage(RUSAGE_SELF, (void *)0) != 0);
+	ATF_REQUIRE(errno == EFAULT);
+}
+
+ATF_TC(getrusage_sig);
+ATF_TC_HEAD(getrusage_sig, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test signal count with getrusage(2)");
+}
+
+ATF_TC_BODY(getrusage_sig, tc)
+{
+	struct rusage ru;
+	const long n = 5;
+	int i;
+
+	/*
+	 * Test that signals are recorded.
+	 */
+	ATF_REQUIRE(signal(SIGUSR1, sighandler) != SIG_ERR);
+
+	for (i = 0; i < n; i++)
+		ATF_REQUIRE(raise(SIGUSR1) == 0);
+
+	(void)memset(&ru, 0, sizeof(struct rusage));
+	ATF_REQUIRE(getrusage(RUSAGE_SELF, &ru) == 0);
+
+	if (n != ru.ru_nsignals)
+		atf_tc_fail("getrusage(2) did not record signals");
+}
+
+ATF_TC(getrusage_utime_back);
+ATF_TC_HEAD(getrusage_utime_back, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bogus values from getrusage(2)");
+}
+
+ATF_TC_BODY(getrusage_utime_back, tc)
+{
+	struct rusage ru1, ru2;
+	size_t i;
+
+	/*
+	 * Test that two consecutive calls are sane.
+	 */
+	atf_tc_expect_fail("PR kern/30115");
+
+	for (i = 0; i < maxiter; i++) {
+
+		(void)memset(&ru1, 0, sizeof(struct rusage));
+		(void)memset(&ru2, 0, sizeof(struct rusage));
+
+		work();
+
+		ATF_REQUIRE(getrusage(RUSAGE_SELF, &ru1) == 0);
+
+		work();
+
+		ATF_REQUIRE(getrusage(RUSAGE_SELF, &ru2) == 0);
+
+		if (timercmp(&ru2.ru_utime, &ru1.ru_utime, <) != 0)
+			atf_tc_fail("user time went backwards");
+	}
+
+	atf_tc_fail("anticipated error did not occur");
+}
+
+ATF_TC(getrusage_utime_zero);
+ATF_TC_HEAD(getrusage_utime_zero, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test zero utime from getrusage(2)");
+}
+
+ATF_TC_BODY(getrusage_utime_zero, tc)
+{
+	struct rusage ru;
+	size_t i;
+
+	/*
+	 * Test that getrusage(2) does not return
+	 * zero user time for the calling process.
+	 *
+	 * See also (duplicate) PR port-amd64/41734.
+	 */
+	atf_tc_expect_fail("PR kern/30115");
+
+	for (i = 0; i < maxiter; i++) {
+
+		work();
+
+		(void)memset(&ru, 0, sizeof(struct rusage));
+
+		ATF_REQUIRE(getrusage(RUSAGE_SELF, &ru) == 0);
+
+		if (ru.ru_utime.tv_sec == 0 && ru.ru_utime.tv_usec == 0)
+			atf_tc_fail("zero user time from getrusage(2)");
+	}
+
+	atf_tc_fail("anticipated error did not occur");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getrusage_err);
+	ATF_TP_ADD_TC(tp, getrusage_sig);
+	ATF_TP_ADD_TC(tp, getrusage_utime_back);
+	ATF_TP_ADD_TC(tp, getrusage_utime_zero);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_getsid.c b/contrib/netbsd-tests/lib/libc/sys/t_getsid.c
new file mode 100644
index 000000000000..76b54ab4fffd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getsid.c
@@ -0,0 +1,119 @@
+/* $NetBSD: t_getsid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_getsid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+ATF_TC(getsid_current);
+ATF_TC_HEAD(getsid_current, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getsid(0)");
+}
+
+ATF_TC_BODY(getsid_current, tc)
+{
+	pid_t sid;
+
+	sid = getsid(0);
+	ATF_REQUIRE(sid != -1);
+
+	if (sid != getsid(getpid()))
+		atf_tc_fail("getsid(0) did not match the calling process");
+}
+
+ATF_TC(getsid_err);
+ATF_TC_HEAD(getsid_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions in getsid(2)");
+}
+
+ATF_TC_BODY(getsid_err, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE(getsid(-1) == -1);
+	ATF_REQUIRE(errno == ESRCH);
+}
+
+ATF_TC(getsid_process);
+ATF_TC_HEAD(getsid_process, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test getsid(2) with processes");
+}
+
+ATF_TC_BODY(getsid_process, tc)
+{
+	pid_t csid, pid, ppid, sid;
+	int sta;
+
+	sid = getsid(0);
+	pid = fork();
+
+	ATF_REQUIRE(pid >= 0);
+	ATF_REQUIRE(sid != -1);
+
+	if (pid == 0) {
+
+		csid = getsid(0);
+		ppid = getppid();
+
+		if (sid != csid)
+			_exit(EXIT_FAILURE);
+
+		if (getsid(ppid) != csid)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("invalid session ID");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, getsid_current);
+	ATF_TP_ADD_TC(tp, getsid_err);
+	ATF_TP_ADD_TC(tp, getsid_process);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c b/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c
new file mode 100644
index 000000000000..1cf303b08e37
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c
@@ -0,0 +1,86 @@
+/* $NetBSD: t_gettimeofday.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_gettimeofday.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/time.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+
+ATF_TC(gettimeofday_err);
+ATF_TC_HEAD(gettimeofday_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from gettimeofday(2)");
+}
+
+ATF_TC_BODY(gettimeofday_err, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EFAULT, gettimeofday((void *)-1, NULL) != 0);
+}
+
+ATF_TC(gettimeofday_mono);
+ATF_TC_HEAD(gettimeofday_mono, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test monotonicity of gettimeofday(2)");
+}
+
+ATF_TC_BODY(gettimeofday_mono, tc)
+{
+	static const size_t maxiter = 100;
+	struct timeval tv1, tv2;
+	size_t i;
+
+	for (i = 0; i < maxiter; i++) {
+
+		(void)memset(&tv1, 0, sizeof(struct timeval));
+		(void)memset(&tv2, 0, sizeof(struct timeval));
+
+		ATF_REQUIRE(gettimeofday(&tv1, NULL) == 0);
+		ATF_REQUIRE(gettimeofday(&tv2, NULL) == 0);
+
+		if (timercmp(&tv2, &tv1, <) != 0)
+			atf_tc_fail("time went backwards");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, gettimeofday_err);
+	ATF_TP_ADD_TC(tp, gettimeofday_mono);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_issetugid.c b/contrib/netbsd-tests/lib/libc/sys/t_issetugid.c
new file mode 100644
index 000000000000..b76ba390de78
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_issetugid.c
@@ -0,0 +1,148 @@
+/* $NetBSD: t_issetugid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_issetugid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static bool check(int (*fuid)(uid_t), int (*fgid)(gid_t));
+
+static bool
+check(int (*fuid)(uid_t), int (*fgid)(gid_t))
+{
+	struct passwd *pw;
+	pid_t pid;
+	int sta;
+
+	pw = getpwnam("nobody");
+
+	if (pw == NULL)
+		return false;
+
+	pid = fork();
+
+	if (pid < 0)
+		return false;
+
+	if (pid == 0) {
+
+		if (fuid != NULL && (*fuid)(pw->pw_uid) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (fgid != NULL && (*fgid)(pw->pw_gid) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (issetugid() != 1)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		return false;
+
+	return true;
+}
+
+ATF_TC(issetugid_egid);
+ATF_TC_HEAD(issetugid_egid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of issetugid(2), eff. GID");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(issetugid_egid, tc)
+{
+
+	if (check(NULL, setegid) != true)
+		atf_tc_fail("issetugid(2) failed with effective GID");
+}
+
+ATF_TC(issetugid_euid);
+ATF_TC_HEAD(issetugid_euid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of issetugid(2), eff. UID");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(issetugid_euid, tc)
+{
+
+	if (check(seteuid, NULL) != true)
+		atf_tc_fail("issetugid(2) failed with effective UID");
+}
+
+ATF_TC(issetugid_rgid);
+ATF_TC_HEAD(issetugid_rgid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of issetugid(2), real GID");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(issetugid_rgid, tc)
+{
+
+	if (check(NULL, setgid) != true)
+		atf_tc_fail("issetugid(2) failed with real GID");
+}
+
+ATF_TC(issetugid_ruid);
+ATF_TC_HEAD(issetugid_ruid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of issetugid(2), real UID");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(issetugid_ruid, tc)
+{
+
+	if (check(setuid, NULL) != true)
+		atf_tc_fail("issetugid(2) failed with real UID");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, issetugid_egid);
+	ATF_TP_ADD_TC(tp, issetugid_euid);
+	ATF_TP_ADD_TC(tp, issetugid_rgid);
+	ATF_TP_ADD_TC(tp, issetugid_ruid);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_kevent.c b/contrib/netbsd-tests/lib/libc/sys/t_kevent.c
new file mode 100644
index 000000000000..73ffbf895582
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_kevent.c
@@ -0,0 +1,180 @@
+/*	$NetBSD: t_kevent.c,v 1.6 2012/11/29 09:13:44 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundatiom
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_kevent.c,v 1.6 2012/11/29 09:13:44 martin Exp $");
+
+#include <sys/types.h>
+#include <sys/event.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <err.h>
+#include <sys/drvctlio.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+
+ATF_TC(kevent_zerotimer);
+ATF_TC_HEAD(kevent_zerotimer, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that kevent with a 0 timer "
+	    "does not crash the system (PR lib/45618)");
+}
+
+ATF_TC_BODY(kevent_zerotimer, tc)
+{
+	struct kevent ev;
+	int kq;
+
+	ATF_REQUIRE((kq = kqueue()) != -1);
+	EV_SET(&ev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1, 0);
+	ATF_REQUIRE(kevent(kq, &ev, 1, NULL, 0, NULL) != -1);
+	ATF_REQUIRE(kevent(kq, NULL, 0, &ev, 1, NULL) == 1);
+}
+
+ATF_TC(kqueue_desc_passing);
+ATF_TC_HEAD(kqueue_desc_passing, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that passing a kqueue to "
+		"another process does not crash the kernel (PR 46463)");
+}
+
+ATF_TC_BODY(kqueue_desc_passing, tc)
+{
+	pid_t child;
+	int s[2], storage, status, kq;
+	struct cmsghdr *msg;
+	struct iovec iov;
+	struct msghdr m;
+	struct kevent ev;
+
+	ATF_REQUIRE((kq = kqueue()) != -1);
+
+	// atf_tc_skip("crashes kernel (PR 46463)");
+
+	ATF_REQUIRE(socketpair(AF_LOCAL, SOCK_STREAM, 0, s) != -1);
+	msg = malloc(CMSG_SPACE(sizeof(int)));
+	m.msg_iov = &iov;
+	m.msg_iovlen = 1;
+	m.msg_name = NULL;
+	m.msg_namelen = 0;
+	m.msg_control = msg;
+	m.msg_controllen = CMSG_SPACE(sizeof(int));
+
+	child = fork();
+	if (child == 0) {
+		close(s[0]);
+
+		iov.iov_base = &storage;
+		iov.iov_len = sizeof(int);
+		m.msg_iov = &iov;
+		m.msg_iovlen = 1;
+
+		if (recvmsg(s[1], &m, 0) == -1)
+			err(1, "child: could not recvmsg");
+
+		kq = *(int *)CMSG_DATA(msg);
+		printf("child (pid %d): received kq fd %d\n", getpid(), kq);
+		exit(0);
+	}
+
+	close(s[1]);
+
+	iov.iov_base = &storage;
+	iov.iov_len = sizeof(int);
+
+	msg->cmsg_level = SOL_SOCKET;
+	msg->cmsg_type = SCM_RIGHTS;
+	msg->cmsg_len = CMSG_LEN(sizeof(int));
+
+	*(int *)CMSG_DATA(msg) = kq;
+
+	EV_SET(&ev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1, 0);
+	ATF_CHECK(kevent(kq, &ev, 1, NULL, 0, NULL) != -1);
+
+	printf("parent (pid %d): sending kq fd %d\n", getpid(), kq);
+	if (sendmsg(s[0], &m, 0) == -1) {
+		ATF_REQUIRE_EQ_MSG(errno, EBADF, "errno is %d", errno);
+		atf_tc_skip("PR kern/46523");
+	}
+
+	close(kq);
+
+	waitpid(child, &status, 0);
+	ATF_CHECK(WIFEXITED(status) && WEXITSTATUS(status)==0);
+}
+
+ATF_TC(kqueue_unsupported_fd);
+ATF_TC_HEAD(kqueue_unsupported_fd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that watching an fd whose"
+	    " type is not supported does not crash the kernel");
+}
+
+ATF_TC_BODY(kqueue_unsupported_fd, tc)
+{
+	/* mqueue and semaphore use fnullop_kqueue also */
+	int fd, kq;
+	struct kevent ev;
+
+	fd = open(DRVCTLDEV, O_RDONLY);
+	if (fd == -1 && errno == ENOENT)
+		atf_tc_skip("no " DRVCTLDEV " available for testing");
+	ATF_REQUIRE(fd != -1);
+	ATF_REQUIRE((kq = kqueue()) != -1);
+
+	EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+	   NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
+	   NOTE_RENAME|NOTE_REVOKE, 0, 0);
+
+	ATF_REQUIRE(kevent(kq, &ev, 1, NULL, 0, NULL) == -1);
+	ATF_REQUIRE_ERRNO(EOPNOTSUPP, true);
+
+	(void)close(fd);
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, kevent_zerotimer);
+	ATF_TP_ADD_TC(tp, kqueue_desc_passing);
+	ATF_TP_ADD_TC(tp, kqueue_unsupported_fd);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_kill.c b/contrib/netbsd-tests/lib/libc/sys/t_kill.c
new file mode 100644
index 000000000000..2f4286246ad2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_kill.c
@@ -0,0 +1,312 @@
+/* $NetBSD: t_kill.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_kill.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <limits.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+ATF_TC(kill_basic);
+ATF_TC_HEAD(kill_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that kill(2) works");
+}
+
+ATF_TC_BODY(kill_basic, tc)
+{
+	const int sig[] = { SIGHUP, SIGINT, SIGKILL, SIGTERM };
+	pid_t pid;
+	size_t i;
+	int sta;
+
+	for (i = 0; i < __arraycount(sig); i++) {
+
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		switch (pid) {
+
+		case 0:
+			pause();
+			break;
+
+		default:
+			ATF_REQUIRE(kill(pid, sig[i]) == 0);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != sig[i])
+			atf_tc_fail("kill(2) failed to kill child");
+	}
+}
+
+ATF_TC(kill_err);
+ATF_TC_HEAD(kill_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of kill(2)");
+}
+
+ATF_TC_BODY(kill_err, tc)
+{
+	int rv, sta;
+	pid_t pid;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		errno = 0;
+		rv = kill(getpid(), -1);
+
+		if (rv == 0 || errno != EINVAL)
+			_exit(EINVAL);
+
+		errno = 0;
+		rv = kill(INT_MAX, SIGUSR1);
+
+		if (rv == 0 || errno != ESRCH)
+			_exit(ESRCH);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS) {
+
+		if (WEXITSTATUS(sta) == EINVAL)
+			atf_tc_fail("expected EINVAL, but kill(2) succeeded");
+
+		if (WEXITSTATUS(sta) == ESRCH)
+			atf_tc_fail("expected ESRCH, but kill(2) succeeded");
+
+		atf_tc_fail("unknown error from kill(2)");
+	}
+}
+
+ATF_TC(kill_perm);
+ATF_TC_HEAD(kill_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test kill(2) permissions");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(kill_perm, tc)
+{
+	struct passwd *pw;
+	pid_t cpid, ppid;
+	uid_t cuid = 0;
+	uid_t puid = 0;
+	int sta;
+
+	/*
+	 * Test that kill(2) fails when called
+	 * for a PID owned by another user.
+	 */
+	pw = getpwnam("operator");
+
+	if (pw != NULL)
+		cuid = pw->pw_uid;
+
+	pw = getpwnam("nobody");
+
+	if (pw != NULL)
+		puid = pw->pw_uid;
+
+	if (cuid == 0 || puid == 0 || cuid == puid)
+		atf_tc_fail("getpwnam(3) failed");
+
+	ppid = fork();
+
+	if (ppid < 0)
+		_exit(EXIT_FAILURE);
+
+	if (ppid == 0) {
+
+		cpid = fork();
+
+		if (cpid < 0)
+			_exit(EXIT_FAILURE);
+
+		if (cpid == 0) {
+
+			if (setuid(cuid) < 0)
+				_exit(EXIT_FAILURE);
+			else {
+				(void)sleep(1);
+			}
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		/*
+		 * Try to kill the child after having
+		 * set the real and effective UID.
+		 */
+		if (setuid(puid) != 0)
+			_exit(EXIT_FAILURE);
+
+		errno = 0;
+
+		if (kill(cpid, SIGKILL) == 0)
+			_exit(EPERM);
+
+		if (errno != EPERM)
+			_exit(EPERM);
+
+		(void)waitpid(cpid, &sta, 0);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)waitpid(ppid, &sta, 0);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) == EPERM)
+		atf_tc_fail("killed a process of another user");
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("unknown error from kill(2)");
+}
+
+ATF_TC(kill_pgrp_neg);
+ATF_TC_HEAD(kill_pgrp_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test kill(2) with process group, #2");
+}
+
+ATF_TC_BODY(kill_pgrp_neg, tc)
+{
+	const int maxiter = 3;
+	pid_t cpid, ppid;
+	int i, sta;
+
+	ppid = fork();
+	ATF_REQUIRE(ppid >= 0);
+
+	if (ppid == 0) {
+
+		ATF_REQUIRE(setpgid(0, 0) == 0);
+
+		for (i = 0; i < maxiter; i++) {
+
+			cpid = fork();
+			ATF_REQUIRE(cpid >= 0);
+
+			if (cpid == 0)
+				pause();
+		}
+
+		/*
+		 * Test the variant of killpg(3); if the process number
+		 * is negative but not -1, the signal should be sent to
+		 * all processes whose process group ID is equal to the
+		 * absolute value of the process number.
+		 */
+		ATF_REQUIRE(kill(-getpgrp(), SIGKILL) == 0);
+
+		(void)sleep(1);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)waitpid(ppid, &sta, 0);
+
+	if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != SIGKILL)
+		atf_tc_fail("failed to kill(2) a process group");
+}
+
+ATF_TC(kill_pgrp_zero);
+ATF_TC_HEAD(kill_pgrp_zero, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test kill(2) with process group, #1");
+}
+
+ATF_TC_BODY(kill_pgrp_zero, tc)
+{
+	const int maxiter = 3;
+	pid_t cpid, ppid;
+	int i, sta;
+
+	ppid = fork();
+	ATF_REQUIRE(ppid >= 0);
+
+	if (ppid == 0) {
+
+		ATF_REQUIRE(setpgid(0, 0) == 0);
+
+		for (i = 0; i < maxiter; i++) {
+
+			cpid = fork();
+			ATF_REQUIRE(cpid >= 0);
+
+			if (cpid == 0)
+				pause();
+		}
+
+		/*
+		 * If the supplied process number is zero,
+		 * the signal should be sent to all processes
+		 * under the current process group.
+		 */
+		ATF_REQUIRE(kill(0, SIGKILL) == 0);
+
+		(void)sleep(1);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)waitpid(ppid, &sta, 0);
+
+	if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != SIGKILL)
+		atf_tc_fail("failed to kill(2) a process group");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, kill_basic);
+	ATF_TP_ADD_TC(tp, kill_err);
+	ATF_TP_ADD_TC(tp, kill_perm);
+	ATF_TP_ADD_TC(tp, kill_pgrp_neg);
+	ATF_TP_ADD_TC(tp, kill_pgrp_zero);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_link.c b/contrib/netbsd-tests/lib/libc/sys/t_link.c
new file mode 100644
index 000000000000..b58c4c9e6d8f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_link.c
@@ -0,0 +1,229 @@
+/* $NetBSD: t_link.c,v 1.2 2014/04/21 14:39:36 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_link.c,v 1.2 2014/04/21 14:39:36 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char	*getpath(void);
+static char		 path[] = "link";
+static const char	*pathl;
+
+static const char *
+getpath(void)
+{
+	static char buf[LINE_MAX];
+
+	(void)memset(buf, '\0', sizeof(buf));
+
+	if (getcwd(buf, sizeof(buf)) == NULL)
+		return NULL;
+
+	(void)strlcat(buf, path, sizeof(buf));
+	(void)strlcat(buf, ".link", sizeof(buf));
+
+	return buf;
+}
+
+ATF_TC_WITH_CLEANUP(link_count);
+ATF_TC_HEAD(link_count, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "link(2) counts are incremented?");
+}
+
+ATF_TC_BODY(link_count, tc)
+{
+	struct stat sa, sb;
+	int fd;
+
+	(void)memset(&sa, 0, sizeof(struct stat));
+	(void)memset(&sb, 0, sizeof(struct stat));
+
+	pathl = getpath();
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(pathl != NULL);
+
+	ATF_REQUIRE(stat(path, &sa) == 0);
+	ATF_REQUIRE(link(path, pathl) == 0);
+	ATF_REQUIRE(stat(path, &sb) == 0);
+
+	if (sa.st_nlink != sb.st_nlink - 1)
+		atf_tc_fail("incorrect link(2) count");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(pathl) == 0);
+}
+
+ATF_TC_CLEANUP(link_count, tc)
+{
+	(void)unlink(path);
+	(void)unlink(pathl);
+}
+
+ATF_TC_WITH_CLEANUP(link_err);
+ATF_TC_HEAD(link_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of link(2)");
+}
+
+ATF_TC_BODY(link_err, tc)
+{
+	char buf[MAXPATHLEN + 1];
+	int fd;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	pathl = getpath();
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(pathl != NULL);
+
+	errno = 0;
+	ATF_REQUIRE(link(path, pathl) == 0);
+	ATF_REQUIRE_ERRNO(EEXIST, link(path, pathl) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, link(buf, "xxx") == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, link(path, "/d/c/b/a") == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, link("/a/b/c/d", path) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, link("/a/b/c/d", "/d/c/b/a") == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, link(path, (const char *)-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, link((const char *)-1, "xxx") == -1);
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(pathl) == 0);
+}
+
+ATF_TC_CLEANUP(link_err, tc)
+{
+	(void)unlink(path);
+	(void)unlink(pathl);
+}
+
+ATF_TC(link_perm);
+ATF_TC_HEAD(link_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with link(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(link_perm, tc)
+{
+	int rv;
+
+	errno = 0;
+	rv = link("/root", "/root.link");
+	ATF_REQUIRE_MSG(rv == -1 && (errno == EACCES || errno == EPERM),
+	    "link to a directory did not fail with EPERM or EACCESS; link() "
+	    "returned %d, errno %d", rv, errno);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES,
+	    link("/root/.profile", "/root/.profile.link") == -1);
+}
+
+ATF_TC_WITH_CLEANUP(link_stat);
+ATF_TC_HEAD(link_stat, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check stat(2) of a linked file");
+}
+
+ATF_TC_BODY(link_stat, tc)
+{
+	struct stat sa, sb;
+	int fd;
+
+	(void)memset(&sa, 0, sizeof(struct stat));
+	(void)memset(&sb, 0, sizeof(struct stat));
+
+	pathl = getpath();
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(pathl != NULL);
+
+	ATF_REQUIRE(link(path, pathl) == 0);
+	ATF_REQUIRE(stat(path, &sa) == 0);
+	ATF_REQUIRE(lstat(pathl, &sb) == 0);
+
+	if (sa.st_uid != sb.st_uid)
+		atf_tc_fail("unequal UIDs");
+
+	if (sa.st_mode != sb.st_mode)
+		atf_tc_fail("unequal modes");
+
+	if (sa.st_ino != sb.st_ino)
+		atf_tc_fail("unequal inodes");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(pathl) == 0);
+}
+
+ATF_TC_CLEANUP(link_stat, tc)
+{
+	(void)unlink(path);
+	(void)unlink(pathl);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, link_count);
+	ATF_TP_ADD_TC(tp, link_err);
+	ATF_TP_ADD_TC(tp, link_perm);
+	ATF_TP_ADD_TC(tp, link_stat);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_listen.c b/contrib/netbsd-tests/lib/libc/sys/t_listen.c
new file mode 100644
index 000000000000..71201d30af91
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_listen.c
@@ -0,0 +1,134 @@
+/*	$NetBSD: t_listen.c,v 1.4 2012/03/18 07:00:52 jruoho Exp $	*/
+/*
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+static const char *path = "listen";
+
+ATF_TC_WITH_CLEANUP(listen_err);
+ATF_TC_HEAD(listen_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks errors from listen(2) (PR standards/46150)");
+}
+
+ATF_TC_BODY(listen_err, tc)
+{
+	static const size_t siz = sizeof(struct sockaddr_in);
+	struct sockaddr_in sina, sinb;
+	int fda, fdb, fdc;
+
+	(void)memset(&sina, 0, sizeof(struct sockaddr_in));
+	(void)memset(&sinb, 0, sizeof(struct sockaddr_in));
+
+	sina.sin_family = AF_INET;
+	sina.sin_port = htons(31522);
+	sina.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	sinb.sin_family = AF_INET;
+	sinb.sin_port = htons(31522);
+	sinb.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	fda = socket(AF_INET, SOCK_STREAM, 0);
+	fdb = socket(AF_INET, SOCK_STREAM, 0);
+	fdc = open("listen", O_RDWR | O_CREAT, 0600);
+
+	ATF_REQUIRE(fda >= 0 && fdb >= 0 && fdc >= 0);
+	ATF_REQUIRE_ERRNO(ENOTSOCK, listen(fdc, 1) == -1);
+
+	(void)close(fdc);
+	(void)unlink(path);
+
+	ATF_REQUIRE(bind(fda, (struct sockaddr *)&sina, siz) == 0);
+	ATF_REQUIRE(listen(fda, 1) == 0);
+
+	/*
+	 * According to IEEE Std 1003.1-2008: if the socket is
+	 * already connected, the call should fail with EINVAL.
+	 */
+	ATF_REQUIRE(connect(fdb, (struct sockaddr *)&sinb, siz) == 0);
+	ATF_REQUIRE_ERRNO(EINVAL, listen(fdb, 1) == -1);
+
+	(void)close(fda);
+	(void)close(fdb);
+
+	ATF_REQUIRE_ERRNO(EBADF, connect(fdb,
+		(struct sockaddr *)&sinb, siz) == -1);
+}
+
+ATF_TC_CLEANUP(listen_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(listen_low_port);
+ATF_TC_HEAD(listen_low_port, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Does low-port allocation work?");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(listen_low_port, tc)
+{
+	int sd, val;
+
+	sd = socket(AF_INET, SOCK_STREAM, 0);
+
+	val = IP_PORTRANGE_LOW;
+	if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, &val,
+	    sizeof(val)) == -1)
+		atf_tc_fail("setsockopt failed: %s", strerror(errno));
+
+	if (listen(sd, 5) == -1) {
+		int serrno = errno;
+		atf_tc_fail("listen failed: %s%s",
+		    strerror(serrno),
+		    serrno != EACCES ? "" :
+		    " (see http://mail-index.netbsd.org/"
+		    "source-changes/2007/12/16/0011.html)");
+	}
+
+	close(sd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, listen_err);
+	ATF_TP_ADD_TC(tp, listen_low_port);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_lwp_create.c b/contrib/netbsd-tests/lib/libc/sys/t_lwp_create.c
new file mode 100644
index 000000000000..02545fe14869
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_lwp_create.c
@@ -0,0 +1,247 @@
+/* $NetBSD: t_lwp_create.c,v 1.2 2012/05/22 09:23:39 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * This code is partly based on code by Joel Sing <joel at sing.id.au>
+ */
+
+#include <atf-c.h>
+#include <lwp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ucontext.h>
+#include <inttypes.h>
+#include <errno.h>
+
+#ifdef __alpha__
+#include <machine/alpha_cpu.h>
+#endif
+#ifdef __amd64__
+#include <machine/vmparam.h>
+#include <machine/psl.h>
+#endif
+#ifdef __hppa__
+#include <machine/psl.h>
+#endif
+#ifdef __i386__
+#include <machine/segments.h>
+#include <machine/psl.h>
+#endif
+#if defined(__m68k__) || defined(__sh3__) || defined __vax__
+#include <machine/psl.h>
+#endif
+
+volatile lwpid_t the_lwp_id = 0;
+
+static void lwp_main_func(void* arg)
+{
+	the_lwp_id = _lwp_self();
+	_lwp_exit();
+}
+
+/*
+ * Hard to document - see usage examples below.
+ */
+#define INVALID_UCONTEXT(ARCH,NAME,DESC)	\
+static void ARCH##_##NAME(ucontext_t *);	\
+ATF_TC(lwp_create_##ARCH##_fail_##NAME);	\
+ATF_TC_HEAD(lwp_create_##ARCH##_fail_##NAME, tc)	\
+{	\
+	atf_tc_set_md_var(tc, "descr", "verify rejection of invalid ucontext " \
+		"on " #ARCH " due to " DESC);	\
+}	\
+	\
+ATF_TC_BODY(lwp_create_##ARCH##_fail_##NAME, tc)	\
+{	\
+	ucontext_t uc;		\
+	lwpid_t lid;		\
+	int error;		\
+				\
+	getcontext(&uc);	\
+	uc.uc_flags = _UC_CPU;	\
+	ARCH##_##NAME(&uc);	\
+				\
+	error = _lwp_create(&uc, 0, &lid);	\
+	ATF_REQUIRE(error != 0 && errno == EINVAL);	\
+}	\
+static void ARCH##_##NAME(ucontext_t *uc)	\
+{
+
+
+ATF_TC(lwp_create_works);
+ATF_TC_HEAD(lwp_create_works, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Verify creation of a lwp and waiting"
+	    " for it to finish");
+}
+
+ATF_TC_BODY(lwp_create_works, tc)
+{
+	ucontext_t uc;
+	lwpid_t lid;
+	int error;
+	void *stack;
+	static const size_t ssize = 16*1024;
+
+	stack = malloc(ssize);
+	_lwp_makecontext(&uc, lwp_main_func, NULL, NULL, stack, ssize);
+
+	error = _lwp_create(&uc, 0, &lid);
+	ATF_REQUIRE(error == 0);
+
+	error = _lwp_wait(lid, NULL);
+	ATF_REQUIRE(error == 0);
+	ATF_REQUIRE(lid == the_lwp_id);
+}
+
+INVALID_UCONTEXT(generic, no_uc_cpu, "not setting cpu registers")
+	uc->uc_flags &= ~_UC_CPU;
+}
+
+#ifdef __alpha__
+INVALID_UCONTEXT(alpha, pslset, "trying to clear the USERMODE flag")
+	uc->uc_mcontext.__gregs[_REG_PS] &= ~ALPHA_PSL_USERMODE;
+}
+INVALID_UCONTEXT(alpha, pslclr, "trying to set a 'must be zero' flag")
+	uc->uc_mcontext.__gregs[_REG_PS] |= ALPHA_PSL_IPL_HIGH;
+}
+#endif
+#ifdef __amd64__
+INVALID_UCONTEXT(amd64, untouchable_rflags, "forbidden rflags changed")
+	uc->uc_mcontext.__gregs[_REG_RFLAGS] |= PSL_MBZ;
+}
+/*
+ * XXX: add invalid GS/DS selector tests
+ */
+INVALID_UCONTEXT(amd64, pc_too_high,
+     "instruction pointer outside userland address space")
+	uc->uc_mcontext.__gregs[_REG_RIP] = VM_MAXUSER_ADDRESS;
+}
+#endif
+#ifdef __arm__
+INVALID_UCONTEXT(arm, invalid_mode, "psr or r15 set to non-user-mode")
+	uc->uc_mcontext.__gregs[_REG_PC] |= 0x1f /*PSR_SYS32_MODE*/;
+	uc->uc_mcontext.__gregs[_REG_CPSR] |= 0x03 /*R15_MODE_SVC*/;
+}
+#endif
+#ifdef __hppa__
+INVALID_UCONTEXT(hppa, invalid_1, "set illegal bits in psw")
+	uc->uc_mcontext.__gregs[_REG_PSW] |= PSW_MBZ;
+}
+INVALID_UCONTEXT(hppa, invalid_0, "clear illegal bits in psw")
+	uc->uc_mcontext.__gregs[_REG_PSW] &= ~PSW_MBS;
+}
+#endif
+#ifdef __i386__
+INVALID_UCONTEXT(i386, untouchable_eflags, "changing forbidden eflags")
+	uc->uc_mcontext.__gregs[_REG_EFL] |= PSL_IOPL;
+}
+INVALID_UCONTEXT(i386, priv_escalation, "modifying priviledge level")
+	uc->uc_mcontext.__gregs[_REG_CS] &= ~SEL_RPL;
+}
+#endif
+#ifdef __m68k__
+INVALID_UCONTEXT(m68k, invalid_ps_bits,
+    "setting forbidden bits in the ps register")
+	uc->uc_mcontext.__gregs[_REG_PS] |= (PSL_MBZ|PSL_IPL|PSL_S);
+}
+#endif
+#ifdef __sh3__
+INVALID_UCONTEXT(sh3, modify_userstatic,
+    "modifying illegal bits in the status register")
+	uc->uc_mcontext.__gregs[_REG_SR] |= PSL_MD;
+}
+#endif
+#ifdef __sparc__
+INVALID_UCONTEXT(sparc, pc_odd, "mis-aligned instruction pointer")
+	uc->uc_mcontext.__gregs[_REG_PC] = 0x100002;
+}
+INVALID_UCONTEXT(sparc, npc_odd, "mis-aligned next instruction pointer")
+	uc->uc_mcontext.__gregs[_REG_nPC] = 0x100002;
+}
+INVALID_UCONTEXT(sparc, pc_null, "NULL instruction pointer")
+	uc->uc_mcontext.__gregs[_REG_PC] = 0;
+}
+INVALID_UCONTEXT(sparc, npc_null, "NULL next instruction pointer")
+	uc->uc_mcontext.__gregs[_REG_nPC] = 0;
+}
+#endif
+#ifdef __vax__
+INVALID_UCONTEXT(vax, psl_0, "clearing forbidden bits in psl")
+	uc->uc_mcontext.__gregs[_REG_PSL] &= ~(PSL_U | PSL_PREVU);
+}
+INVALID_UCONTEXT(vax, psl_1, "setting forbidden bits in psl")
+	uc->uc_mcontext.__gregs[_REG_PSL] |= PSL_IPL | PSL_IS;
+}
+INVALID_UCONTEXT(vax, psl_cm, "setting CM bit in psl")
+	uc->uc_mcontext.__gregs[_REG_PSL] |= PSL_CM;
+}
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, lwp_create_works);
+	ATF_TP_ADD_TC(tp, lwp_create_generic_fail_no_uc_cpu);
+#ifdef __alpha__
+	ATF_TP_ADD_TC(tp, lwp_create_alpha_fail_pslset);
+	ATF_TP_ADD_TC(tp, lwp_create_alpha_fail_pslclr);
+#endif
+#ifdef __amd64__
+	ATF_TP_ADD_TC(tp, lwp_create_amd64_fail_untouchable_rflags);
+	ATF_TP_ADD_TC(tp, lwp_create_amd64_fail_pc_too_high);
+#endif
+#ifdef __arm__
+	ATF_TP_ADD_TC(tp, lwp_create_arm_fail_invalid_mode);
+#endif
+#ifdef __hppa__
+	ATF_TP_ADD_TC(tp, lwp_create_hppa_fail_invalid_1);
+	ATF_TP_ADD_TC(tp, lwp_create_hppa_fail_invalid_0);
+#endif
+#ifdef __i386__
+	ATF_TP_ADD_TC(tp, lwp_create_i386_fail_untouchable_eflags);
+	ATF_TP_ADD_TC(tp, lwp_create_i386_fail_priv_escalation);
+#endif
+#ifdef __m68k__
+	ATF_TP_ADD_TC(tp, lwp_create_m68k_fail_invalid_ps_bits);
+#endif
+#ifdef __sh3__
+	ATF_TP_ADD_TC(tp, lwp_create_sh3_fail_modify_userstatic);
+#endif
+#ifdef __sparc__
+	ATF_TP_ADD_TC(tp, lwp_create_sparc_fail_pc_odd);
+	ATF_TP_ADD_TC(tp, lwp_create_sparc_fail_npc_odd);
+	ATF_TP_ADD_TC(tp, lwp_create_sparc_fail_pc_null);
+	ATF_TP_ADD_TC(tp, lwp_create_sparc_fail_npc_null);
+#endif
+#ifdef __vax__
+	ATF_TP_ADD_TC(tp, lwp_create_vax_fail_psl_0);
+	ATF_TP_ADD_TC(tp, lwp_create_vax_fail_psl_1);
+	ATF_TP_ADD_TC(tp, lwp_create_vax_fail_psl_cm);
+#endif
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_lwp_ctl.c b/contrib/netbsd-tests/lib/libc/sys/t_lwp_ctl.c
new file mode 100644
index 000000000000..1b28f75f49f9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_lwp_ctl.c
@@ -0,0 +1,74 @@
+/* $NetBSD: t_lwp_ctl.c,v 1.2 2012/03/18 06:20:51 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_lwp_ctl.c,v 1.2 2012/03/18 06:20:51 jruoho Exp $");
+
+#include <sys/lwpctl.h>
+
+#include <atf-c.h>
+#include <lwp.h>
+#include <stdio.h>
+#include <time.h>
+
+ATF_TC(lwpctl_counter);
+ATF_TC_HEAD(lwpctl_counter, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks lwpctl preemption counter");
+}
+
+ATF_TC_BODY(lwpctl_counter, tc)
+{
+	lwpctl_t *lc;
+	struct timespec ts;
+	int ctr1, ctr2;
+
+	ATF_REQUIRE(_lwp_ctl(LWPCTL_FEATURE_PCTR, &lc) == 0);
+
+	/* Ensure that preemption is reported. */
+	ctr1 = lc->lc_pctr;
+	(void)printf("pctr = %d\n", ctr1);
+	ts.tv_nsec = 10*1000000;
+	ts.tv_sec = 0;
+
+	ATF_REQUIRE(nanosleep(&ts, 0) != -1);
+
+	ctr2 = lc->lc_pctr;
+	(void)printf("pctr = %d\n", ctr2);
+
+	ATF_REQUIRE_MSG(ctr1 != ctr2, "counters match");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, lwpctl_counter);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mincore.c b/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
new file mode 100644
index 000000000000..553207a8af7f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mincore.c
@@ -0,0 +1,318 @@
+/* $NetBSD: t_mincore.c,v 1.8 2012/06/08 07:18:58 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mincore.c,v 1.8 2012/06/08 07:18:58 martin Exp $");
+
+#include <sys/mman.h>
+#include <sys/shm.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <kvm.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/resource.h>
+
+static long		page = 0;
+static const char	path[] = "mincore";
+static size_t		check_residency(void *, size_t);
+
+static size_t
+check_residency(void *addr, size_t npgs)
+{
+	size_t i, resident;
+	char *vec;
+
+	vec = malloc(npgs);
+
+	ATF_REQUIRE(vec != NULL);
+	ATF_REQUIRE(mincore(addr, npgs * page, vec) == 0);
+
+	for (i = resident = 0; i < npgs; i++) {
+
+		if (vec[i] != 0)
+			resident++;
+
+#if 0
+		(void)fprintf(stderr, "page 0x%p is %sresident\n",
+		    (char *)addr + (i * page), vec[i] ? "" : "not ");
+#endif
+	}
+
+	free(vec);
+
+	return resident;
+}
+
+ATF_TC(mincore_err);
+ATF_TC_HEAD(mincore_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from mincore(2)");
+}
+
+ATF_TC_BODY(mincore_err, tc)
+{
+	char *map, *vec;
+
+	map = mmap(NULL, page, PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+	vec = malloc(page);
+
+	ATF_REQUIRE(vec != NULL);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, mincore(map, 0, vec) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOMEM, mincore(0, page, vec) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, mincore(map, page, (void *)-1) == -1);
+
+	free(vec);
+	ATF_REQUIRE(munmap(map, page) == 0);
+}
+
+ATF_TC_WITH_CLEANUP(mincore_resid);
+ATF_TC_HEAD(mincore_resid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test page residency with mincore(2)");
+}
+
+ATF_TC_BODY(mincore_resid, tc)
+{
+	void *addr, *addr2, *addr3, *buf;
+	size_t npgs = 0, resident;
+	struct stat st;
+	int fd, rv;
+	struct rlimit rlim;
+
+	ATF_REQUIRE(getrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
+	rlim.rlim_cur = rlim.rlim_max;
+	ATF_REQUIRE(setrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	fd = open(path, O_RDWR | O_CREAT, 0700);
+	buf = malloc(page * 5);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(buf != NULL);
+
+	rv = write(fd, buf, page * 5);
+	ATF_REQUIRE(rv >= 0);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(fstat(fd, &st) == 0);
+
+	addr = mmap(NULL, (size_t)st.st_size, PROT_READ,
+	    MAP_FILE | MAP_SHARED, fd, (off_t) 0);
+
+	ATF_REQUIRE(addr != MAP_FAILED);
+
+	(void)close(fd);
+
+	npgs = st.st_size / page;
+
+	if (st.st_size % page != 0)
+		npgs++;
+
+	(void)check_residency(addr, npgs);
+
+	rv = mlock(addr, npgs * page);
+	if (rv == -1 && errno == EAGAIN)
+		atf_tc_skip("hit process resource limits");
+	ATF_REQUIRE(munmap(addr, st.st_size) == 0);
+
+	npgs = 128;
+
+	addr = mmap(NULL, npgs * page, PROT_READ | PROT_WRITE,
+	    MAP_ANON | MAP_PRIVATE | MAP_WIRED, -1, (off_t)0);
+
+	if (addr == MAP_FAILED)
+		atf_tc_skip("could not mmap wired anonymous test area, system "
+		    "might be low on memory");
+
+	ATF_REQUIRE(check_residency(addr, npgs) == npgs);
+	ATF_REQUIRE(munmap(addr, npgs * page) == 0);
+
+	npgs = 128;
+
+	addr = mmap(NULL, npgs * page, PROT_READ | PROT_WRITE,
+	    MAP_ANON | MAP_PRIVATE, -1, (off_t)0);
+
+	ATF_REQUIRE(addr != MAP_FAILED);
+
+	/*
+	 * Check that the in-core pages match the locked pages.
+	 */
+	ATF_REQUIRE(check_residency(addr, npgs) == 0);
+
+	errno = 0;
+	if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0 && errno != ENOMEM)
+		atf_tc_fail("mlockall(2) failed");
+	if (errno == ENOMEM)
+		atf_tc_skip("mlockall() exceeded process resource limits");
+
+	resident = check_residency(addr, npgs);
+	if (resident < npgs)
+		atf_tc_fail("mlockall(MCL_FUTURE) succeeded, still only "
+		    "%zu pages of the newly mapped %zu pages are resident",
+		    resident, npgs);
+
+	addr2 = mmap(NULL, npgs * page, PROT_READ, MAP_ANON, -1, (off_t)0);
+	addr3 = mmap(NULL, npgs * page, PROT_NONE, MAP_ANON, -1, (off_t)0);
+
+	if (addr2 == MAP_FAILED || addr3 == MAP_FAILED)
+		atf_tc_skip("could not mmap more anonymous test pages with "
+		    "mlockall(MCL_FUTURE) in effect, system "
+		    "might be low on memory");
+
+	ATF_REQUIRE(check_residency(addr2, npgs) == npgs);
+	ATF_REQUIRE(check_residency(addr3, npgs) == 0);
+	ATF_REQUIRE(mprotect(addr3, npgs * page, PROT_READ) == 0);
+	ATF_REQUIRE(check_residency(addr, npgs) == npgs);
+	ATF_REQUIRE(check_residency(addr2, npgs) == npgs);
+
+	(void)munlockall();
+
+	ATF_REQUIRE(madvise(addr2, npgs * page, MADV_FREE) == 0);
+	ATF_REQUIRE(check_residency(addr2, npgs) == 0);
+
+	(void)memset(addr, 0, npgs * page);
+
+	ATF_REQUIRE(madvise(addr, npgs * page, MADV_FREE) == 0);
+	ATF_REQUIRE(check_residency(addr, npgs) == 0);
+
+	(void)munmap(addr, npgs * page);
+	(void)munmap(addr2, npgs * page);
+	(void)munmap(addr3, npgs * page);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(mincore_resid, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(mincore_shmseg);
+ATF_TC_HEAD(mincore_shmseg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "residency of shared memory");
+}
+
+ATF_TC_BODY(mincore_shmseg, tc)
+{
+	size_t npgs = 128;
+	void *addr = NULL;
+	int shmid;
+
+	shmid = shmget(IPC_PRIVATE, npgs * page,
+	    IPC_CREAT | S_IRUSR | S_IWUSR);
+
+	ATF_REQUIRE(shmid != -1);
+
+	addr = shmat(shmid, NULL, 0);
+
+	ATF_REQUIRE(addr != NULL);
+	ATF_REQUIRE(check_residency(addr, npgs) == 0);
+
+	(void)memset(addr, 0xff, npgs * page);
+
+	ATF_REQUIRE(check_residency(addr, npgs) == npgs);
+	ATF_REQUIRE(madvise(addr, npgs * page, MADV_FREE) == 0);
+
+	/*
+	 * NOTE!  Even though we have MADV_FREE'd the range,
+	 * there is another reference (the kernel's) to the
+	 * object which owns the pages.  In this case, the
+	 * kernel does not simply free the pages, as haphazardly
+	 * freeing pages when there are still references to
+	 * an object can cause data corruption (say, the other
+	 * referencer doesn't expect the pages to be freed,
+	 * and is surprised by the subsequent ZFOD).
+	 *
+	 * Because of this, we simply report the number of
+	 * pages still resident, for information only.
+	 */
+	npgs = check_residency(addr, npgs);
+
+	(void)fprintf(stderr, "%zu pages still resident\n", npgs);
+
+	ATF_REQUIRE(shmdt(addr) == 0);
+	ATF_REQUIRE(shmctl(shmid, IPC_RMID, NULL) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, mincore_err);
+	ATF_TP_ADD_TC(tp, mincore_resid);
+	ATF_TP_ADD_TC(tp, mincore_shmseg);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_minherit.c b/contrib/netbsd-tests/lib/libc/sys/t_minherit.c
new file mode 100644
index 000000000000..0bdf6bc0a0d8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_minherit.c
@@ -0,0 +1,200 @@
+/* $NetBSD: t_minherit.c,v 1.1 2014/07/18 12:34:52 christos Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_minherit.c,v 1.1 2014/07/18 12:34:52 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static long page;
+
+static void *
+makemap(int v, int f) {
+	void *map = mmap(NULL, page, PROT_READ|PROT_WRITE,
+	    MAP_SHARED|MAP_ANON, -1, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+	memset(map, v, page);
+	if (f != 666)
+		ATF_REQUIRE(minherit(map, page, f) == 0);
+	else
+		ATF_REQUIRE(minherit(map, page, f) == -1);
+	return map;
+}
+
+ATF_TC(minherit_copy);
+ATF_TC_HEAD(minherit_copy, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test for MAP_INHERIT_COPY from minherit(2)");
+}
+
+ATF_TC_BODY(minherit_copy, tc)
+{
+	void *map1 = makemap(1, MAP_INHERIT_COPY);
+	void *map2 = makemap(1, MAP_INHERIT_COPY);
+	switch (fork()) {
+	default:
+		ATF_REQUIRE(wait(NULL) != -1);
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		break;
+	case -1:
+		ATF_REQUIRE(0);
+		break;
+	case 0:
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		memset(map1, 0, page);
+		exit(0);
+	}
+}
+
+ATF_TC(minherit_share);
+ATF_TC_HEAD(minherit_share, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test for MAP_INHERIT_SHARE from minherit(2)");
+}
+
+ATF_TC_BODY(minherit_share, tc)
+{
+	void *map1 = makemap(1, MAP_INHERIT_SHARE);
+	void *map2 = makemap(1, MAP_INHERIT_SHARE);
+
+	switch (fork()) {
+	default:
+		ATF_REQUIRE(wait(NULL) != -1);
+		memset(map2, 0, page);
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		break;
+	case -1:
+		ATF_REQUIRE(0);
+		break;
+	case 0:
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		memset(map1, 0, page);
+		exit(0);
+	}
+}
+
+static void
+segv(int n) {
+	_exit(n);
+}
+
+ATF_TC(minherit_none);
+ATF_TC_HEAD(minherit_none, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test for MAP_INHERIT_NONE from minherit(2)");
+}
+
+ATF_TC_BODY(minherit_none, tc)
+{
+	void *map1 = makemap(0, MAP_INHERIT_NONE);
+	int status;
+
+	switch (fork()) {
+	default:
+		ATF_REQUIRE(wait(&status) != -1);
+		ATF_REQUIRE(WEXITSTATUS(status) == SIGSEGV);
+		break;
+	case -1:
+		ATF_REQUIRE(0);
+		break;
+	case 0:
+		ATF_REQUIRE(signal(SIGSEGV, segv) != SIG_ERR);
+		memset(map1, 0, page);
+		exit(0);
+	}
+}
+
+ATF_TC(minherit_zero);
+ATF_TC_HEAD(minherit_zero, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test for MAP_INHERIT_ZERO from minherit(2)");
+}
+
+ATF_TC_BODY(minherit_zero, tc)
+{
+	void *map1 = makemap(1, MAP_INHERIT_ZERO);
+	void *map2 = makemap(0, MAP_INHERIT_SHARE);
+
+	switch (fork()) {
+	default:
+		ATF_REQUIRE(wait(NULL) != -1);
+		memset(map2, 1, page);
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		break;
+	case -1:
+		ATF_REQUIRE(0);
+		break;
+	case 0:
+		ATF_REQUIRE(memcmp(map1, map2, page) == 0);
+		memset(map1, 2, page);
+		exit(0);
+	}
+}
+
+ATF_TC(minherit_bad);
+ATF_TC_HEAD(minherit_bad, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test for bad minherit(2)");
+}
+
+ATF_TC_BODY(minherit_bad, tc)
+{
+	(void)makemap(0, 666);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, minherit_copy);
+	ATF_TP_ADD_TC(tp, minherit_share);
+	ATF_TP_ADD_TC(tp, minherit_none);
+	ATF_TP_ADD_TC(tp, minherit_zero);
+	ATF_TP_ADD_TC(tp, minherit_bad);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mkdir.c b/contrib/netbsd-tests/lib/libc/sys/t_mkdir.c
new file mode 100644
index 000000000000..d97a20b6c26c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mkdir.c
@@ -0,0 +1,210 @@
+/* $NetBSD: t_mkdir.c,v 1.2 2011/10/15 07:38:31 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe and Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mkdir.c,v 1.2 2011/10/15 07:38:31 jruoho Exp $");
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+ATF_TC(mkdir_err);
+ATF_TC_HEAD(mkdir_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks errors from mkdir(2)");
+}
+
+ATF_TC_BODY(mkdir_err, tc)
+{
+	char buf[PATH_MAX + 1];
+	int fd;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	fd = open("/etc", O_RDONLY);
+
+	if (fd >= 0) {
+
+		(void)close(fd);
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(EEXIST, mkdir("/etc", 0500) == -1);
+	}
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, mkdir((void *)-1, 0500) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, mkdir(buf, 0500) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, mkdir("/a/b/c/d/e/f/g/h/i/j/k", 0500) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(mkdir_perm);
+ATF_TC_HEAD(mkdir_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks permissions with mkdir(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(mkdir_perm, tc)
+{
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, mkdir("/usr/__nonexistent__", 0500) == -1);
+}
+
+ATF_TC_CLEANUP(mkdir_perm, tc)
+{
+	(void)rmdir("/usr/__nonexistent__");
+}
+
+ATF_TC_WITH_CLEANUP(mkdir_mode);
+ATF_TC_HEAD(mkdir_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that UIDs and GIDs are right "
+	    "for a directory created with mkdir(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mkdir_mode, tc)
+{
+	static const char *path = "/tmp/mkdir";
+	struct stat st_a, st_b;
+	struct passwd *pw;
+	pid_t pid;
+	int sta;
+
+	(void)memset(&st_a, 0, sizeof(struct stat));
+	(void)memset(&st_b, 0, sizeof(struct stat));
+
+	pw = getpwnam("nobody");
+
+	ATF_REQUIRE(pw != NULL);
+	ATF_REQUIRE(stat("/tmp", &st_a) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (setuid(pw->pw_uid) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (mkdir(path, 0500) != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("failed to create '%s'", path);
+
+	ATF_REQUIRE(stat(path, &st_b) == 0);
+	ATF_REQUIRE(rmdir(path) == 0);
+
+	/*
+	 * The directory's owner ID should be set to the
+	 * effective UID, whereas the group ID should be
+	 * set to that of the parent directory.
+	 */
+	if (st_b.st_uid != pw->pw_uid)
+		atf_tc_fail("invalid UID for '%s'", path);
+
+	if (st_b.st_gid != st_a.st_gid)
+		atf_tc_fail("GID did not follow the parent directory");
+}
+
+ATF_TC_CLEANUP(mkdir_mode, tc)
+{
+	(void)rmdir("/tmp/mkdir");
+}
+
+ATF_TC(mkdir_trail);
+ATF_TC_HEAD(mkdir_trail, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mkdir(2) for trailing slashes");
+}
+
+ATF_TC_BODY(mkdir_trail, tc)
+{
+	const char *tests[] = {
+		/*
+		 * IEEE 1003.1 second ed. 2.2.2.78:
+		 *
+		 * If the pathname refers to a directory, it may also have
+		 * one or more trailing slashes.  Multiple successive slashes
+		 * are considered to be the same as one slash.
+		 */
+		"dir1/",
+		"dir2//",
+
+		NULL,
+	};
+
+	const char **test;
+
+	for (test = &tests[0]; *test != NULL; ++test) {
+
+		(void)printf("Checking \"%s\"\n", *test);
+		(void)rmdir(*test);
+
+		ATF_REQUIRE(mkdir(*test, 0777) == 0);
+		ATF_REQUIRE(rename(*test, "foo") == 0);
+		ATF_REQUIRE(rename("foo/", *test) == 0);
+		ATF_REQUIRE(rmdir(*test) == 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mkdir_err);
+	ATF_TP_ADD_TC(tp, mkdir_perm);
+	ATF_TP_ADD_TC(tp, mkdir_mode);
+	ATF_TP_ADD_TC(tp, mkdir_trail);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mkfifo.c b/contrib/netbsd-tests/lib/libc/sys/t_mkfifo.c
new file mode 100644
index 000000000000..56bc4c831fcb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mkfifo.c
@@ -0,0 +1,276 @@
+/* $NetBSD: t_mkfifo.c,v 1.2 2011/11/02 06:04:48 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mkfifo.c,v 1.2 2011/11/02 06:04:48 jruoho Exp $");
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char	path[] = "fifo";
+static void		support(void);
+
+static void
+support(void)
+{
+
+	errno = 0;
+
+	if (mkfifo(path, 0600) == 0) {
+		ATF_REQUIRE(unlink(path) == 0);
+		return;
+	}
+
+	if (errno == EOPNOTSUPP)
+		atf_tc_skip("the kernel does not support FIFOs");
+	else {
+		atf_tc_fail("mkfifo(2) failed");
+	}
+}
+
+ATF_TC_WITH_CLEANUP(mkfifo_block);
+ATF_TC_HEAD(mkfifo_block, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that FIFOs block");
+}
+
+ATF_TC_BODY(mkfifo_block, tc)
+{
+	int sta, fd = -1;
+	pid_t pid;
+
+	support();
+
+	ATF_REQUIRE(mkfifo(path, 0600) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * If we open the FIFO as read-only (write-only),
+		 * the call should block until another process
+		 * opens the FIFO for writing (reading).
+		 */
+		fd = open(path, O_RDONLY);
+
+		_exit(EXIT_FAILURE); /* NOTREACHED */
+	}
+
+	(void)sleep(1);
+
+	ATF_REQUIRE(kill(pid, SIGKILL) == 0);
+
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) == 0 || WTERMSIG(sta) != SIGKILL)
+		atf_tc_fail("FIFO did not block");
+
+	(void)close(fd);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(mkfifo_block, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mkfifo_err);
+ATF_TC_HEAD(mkfifo_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erros from mkfifo(2)");
+}
+
+ATF_TC_BODY(mkfifo_err, tc)
+{
+	char buf[PATH_MAX + 1];
+
+	support();
+
+	(void)memset(buf, 'x', sizeof(buf));
+	ATF_REQUIRE(mkfifo(path, 0600) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, mkfifo((char *)-1, 0600) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EEXIST, mkfifo("/etc/passwd", 0600) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EEXIST, mkfifo(path, 0600) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, mkfifo(buf, 0600) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, mkfifo("/a/b/c/d/e/f/g", 0600) == -1);
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(mkfifo_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mkfifo_nonblock);
+ATF_TC_HEAD(mkfifo_nonblock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test O_NONBLOCK with FIFOs");
+}
+
+ATF_TC_BODY(mkfifo_nonblock, tc)
+{
+	int fd, sta;
+	pid_t pid;
+
+	support();
+
+	fd = -1;
+	ATF_REQUIRE(mkfifo(path, 0600) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * If we open the FIFO as O_NONBLOCK, the O_RDONLY
+		 * call should return immediately, whereas the call
+		 * for write-only should fail with ENXIO.
+		 */
+		fd = open(path, O_RDONLY | O_NONBLOCK);
+
+		if (fd >= 0)
+			_exit(EXIT_SUCCESS);
+
+		(void)pause();	/* NOTREACHED */
+	}
+
+	(void)sleep(1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENXIO, open(path, O_WRONLY | O_NONBLOCK) == -1);
+
+	(void)kill(pid, SIGKILL);
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) != 0 || WTERMSIG(sta) == SIGKILL)
+		atf_tc_fail("FIFO blocked for O_NONBLOCK open(2)");
+
+	(void)close(fd);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(mkfifo_nonblock, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mkfifo_perm);
+ATF_TC_HEAD(mkfifo_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with mkfifo(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(mkfifo_perm, tc)
+{
+
+	support();
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, mkfifo("/root/fifo", 0600) == -1);
+
+	ATF_REQUIRE(mkfifo(path, 0600) == 0);
+
+	/*
+	 * For some reason this fails with EFTYPE...
+	 */
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFTYPE, chmod(path, 1777) == -1);
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(mkfifo_perm, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mkfifo_stat);
+ATF_TC_HEAD(mkfifo_stat, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mkfifo(2) with stat");
+}
+
+ATF_TC_BODY(mkfifo_stat, tc)
+{
+	struct stat st;
+
+	support();
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	ATF_REQUIRE(mkfifo(path, 0600) == 0);
+	ATF_REQUIRE(stat(path, &st) == 0);
+
+	if (S_ISFIFO(st.st_mode) == 0)
+		atf_tc_fail("invalid mode from mkfifo(2)");
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(mkfifo_stat, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mkfifo_block);
+	ATF_TP_ADD_TC(tp, mkfifo_err);
+	ATF_TP_ADD_TC(tp, mkfifo_nonblock);
+	ATF_TP_ADD_TC(tp, mkfifo_perm);
+	ATF_TP_ADD_TC(tp, mkfifo_stat);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mknod.c b/contrib/netbsd-tests/lib/libc/sys/t_mknod.c
new file mode 100644
index 000000000000..b394b31c2182
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mknod.c
@@ -0,0 +1,192 @@
+/* $NetBSD: t_mknod.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mknod.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $");
+
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static char	 path[] = "node";
+
+ATF_TC_WITH_CLEANUP(mknod_err);
+ATF_TC_HEAD(mknod_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test error conditions of mknod(2) (PR kern/45111)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mknod_err, tc)
+{
+	char buf[PATH_MAX + 1];
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, mknod(path, S_IFCHR, -1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, mknod(buf, S_IFCHR, 0) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, mknod((char *)-1, S_IFCHR, 0) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, mknod("/a/b/c/d/e/f/g", S_IFCHR, 0) == -1);
+}
+
+ATF_TC_CLEANUP(mknod_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mknod_exist);
+ATF_TC_HEAD(mknod_exist, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test EEXIST from mknod(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mknod_exist, tc)
+{
+	int fd;
+
+	fd = open("/etc/passwd", O_RDONLY);
+
+	if (fd >= 0) {
+
+		(void)close(fd);
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(EEXIST,
+		    mknod("/etc/passwd", S_IFCHR, 0) == -1);
+	}
+
+	ATF_REQUIRE(mknod(path, S_IFCHR, 0) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EEXIST, mknod(path, S_IFCHR, 0) == -1);
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(mknod_exist, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mknod_perm);
+ATF_TC_HEAD(mknod_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions of mknod(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(mknod_perm, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EPERM, mknod(path, S_IFCHR, 0) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EPERM, mknod(path, S_IFBLK, 0) == -1);
+}
+
+ATF_TC_CLEANUP(mknod_perm, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mknod_stat);
+ATF_TC_HEAD(mknod_stat, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of mknod(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mknod_stat, tc)
+{
+	struct stat st;
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	ATF_REQUIRE(mknod(path, S_IFCHR, 0) == 0);
+	ATF_REQUIRE(stat(path, &st) == 0);
+
+	if (S_ISCHR(st.st_mode) == 0)
+		atf_tc_fail_nonfatal("invalid mode from mknod(2) (S_IFCHR)");
+
+	ATF_REQUIRE(unlink(path) == 0);
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	ATF_REQUIRE(mknod(path, S_IFBLK, 0) == 0);
+	ATF_REQUIRE(stat(path, &st) == 0);
+
+	if (S_ISBLK(st.st_mode) == 0)
+		atf_tc_fail_nonfatal("invalid mode from mknod(2) (S_IFBLK)");
+
+	ATF_REQUIRE(unlink(path) == 0);
+
+	(void)memset(&st, 0, sizeof(struct stat));
+
+	ATF_REQUIRE(mknod(path, S_IFREG, 0) == 0);
+	ATF_REQUIRE(stat(path, &st) == 0);
+
+	if (S_ISREG(st.st_mode) == 0)
+		atf_tc_fail_nonfatal("invalid mode from mknod(2) (S_IFREG)");
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(mknod_stat, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mknod_err);
+	ATF_TP_ADD_TC(tp, mknod_exist);
+	ATF_TP_ADD_TC(tp, mknod_perm);
+	ATF_TP_ADD_TC(tp, mknod_stat);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
new file mode 100644
index 000000000000..52576f77bc8f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
@@ -0,0 +1,244 @@
+/* $NetBSD: t_mlock.c,v 1.5 2014/02/26 20:49:26 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mlock.c,v 1.5 2014/02/26 20:49:26 martin Exp $");
+
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <atf-c.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static long page = 0;
+
+ATF_TC(mlock_clip);
+ATF_TC_HEAD(mlock_clip, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test with mlock(2) that UVM only "
+	    "clips if the clip address is within the entry (PR kern/44788)");
+}
+
+ATF_TC_BODY(mlock_clip, tc)
+{
+	void *buf;
+
+	buf = malloc(page);
+	ATF_REQUIRE(buf != NULL);
+
+	if (page < 1024)
+		atf_tc_skip("page size too small");
+
+	for (size_t i = page; i >= 1; i = i - 1024) {
+		(void)mlock(buf, page - i);
+		(void)munlock(buf, page - i);
+	}
+
+	free(buf);
+}
+
+ATF_TC(mlock_err);
+ATF_TC_HEAD(mlock_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test error conditions in mlock(2) and munlock(2)");
+}
+
+ATF_TC_BODY(mlock_err, tc)
+{
+	unsigned long vmin = 0;
+	size_t len = sizeof(vmin);
+	void *invalid_ptr;
+	int null_errno = ENOMEM;	/* error expected for NULL */
+
+	if (sysctlbyname("vm.minaddress", &vmin, &len, NULL, 0) != 0)
+		atf_tc_fail("failed to read vm.minaddress");
+
+	if (vmin > 0)
+		null_errno = EINVAL;	/* NULL is not inside user VM */
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(null_errno, mlock(NULL, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(null_errno, mlock((char *)0, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, mlock((char *)-1, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(null_errno, munlock(NULL, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(null_errno, munlock((char *)0, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, munlock((char *)-1, page) == -1);
+
+	/*
+	 * Try to create a pointer to an unmapped page - first after current
+	 * brk will likely do.
+	 */
+	invalid_ptr = (void*)(((uintptr_t)sbrk(0)+page) & ~(page-1));
+	printf("testing with (hopefully) invalid pointer %p\n", invalid_ptr);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOMEM, mlock(invalid_ptr, page) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOMEM, munlock(invalid_ptr, page) == -1);
+}
+
+ATF_TC(mlock_limits);
+ATF_TC_HEAD(mlock_limits, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test system limits with mlock(2)");
+}
+
+ATF_TC_BODY(mlock_limits, tc)
+{
+	struct rlimit res;
+	void *buf;
+	pid_t pid;
+	int sta;
+
+	buf = malloc(page);
+	ATF_REQUIRE(buf != NULL);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		for (ssize_t i = page; i >= 2; i -= 100) {
+
+			res.rlim_cur = i - 1;
+			res.rlim_max = i - 1;
+
+			(void)fprintf(stderr, "trying to lock %zd bytes "
+			    "with %zu byte limit\n", i, (size_t)res.rlim_cur);
+
+			if (setrlimit(RLIMIT_MEMLOCK, &res) != 0)
+				_exit(EXIT_FAILURE);
+
+			errno = 0;
+
+			if (mlock(buf, i) != -1 || errno != EAGAIN) {
+				(void)munlock(buf, i);
+				_exit(EXIT_FAILURE);
+			}
+		}
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("mlock(2) locked beyond system limits");
+
+	free(buf);
+}
+
+ATF_TC(mlock_mmap);
+ATF_TC_HEAD(mlock_mmap, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mlock(2)-mmap(2) interaction");
+}
+
+ATF_TC_BODY(mlock_mmap, tc)
+{
+	static const int flags = MAP_ANON | MAP_PRIVATE | MAP_WIRED;
+	void *buf;
+
+	/*
+	 * Make a wired RW mapping and check that mlock(2)
+	 * does not fail for the (already locked) mapping.
+	 */
+	buf = mmap(NULL, page, PROT_READ | PROT_WRITE, flags, -1, 0);
+
+	ATF_REQUIRE(buf != MAP_FAILED);
+	ATF_REQUIRE(mlock(buf, page) == 0);
+	ATF_REQUIRE(munlock(buf, page) == 0);
+	ATF_REQUIRE(munmap(buf, page) == 0);
+	ATF_REQUIRE(munlock(buf, page) != 0);
+
+	/*
+	 * But it should be impossible to mlock(2) a PROT_NONE mapping.
+	 */
+	buf = mmap(NULL, page, PROT_NONE, flags, -1, 0);
+
+	ATF_REQUIRE(buf != MAP_FAILED);
+	ATF_REQUIRE(mlock(buf, page) != 0);
+	ATF_REQUIRE(munmap(buf, page) == 0);
+}
+
+ATF_TC(mlock_nested);
+ATF_TC_HEAD(mlock_nested, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that consecutive mlock(2) calls succeed");
+}
+
+ATF_TC_BODY(mlock_nested, tc)
+{
+	const size_t maxiter = 100;
+	void *buf;
+
+	buf = malloc(page);
+	ATF_REQUIRE(buf != NULL);
+
+	for (size_t i = 0; i < maxiter; i++)
+		ATF_REQUIRE(mlock(buf, page) == 0);
+
+	ATF_REQUIRE(munlock(buf, page) == 0);
+	free(buf);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, mlock_clip);
+	ATF_TP_ADD_TC(tp, mlock_err);
+	ATF_TP_ADD_TC(tp, mlock_limits);
+	ATF_TP_ADD_TC(tp, mlock_mmap);
+	ATF_TP_ADD_TC(tp, mlock_nested);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mmap.c b/contrib/netbsd-tests/lib/libc/sys/t_mmap.c
new file mode 100644
index 000000000000..c6b97b192285
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mmap.c
@@ -0,0 +1,505 @@
+/* $NetBSD: t_mmap.c,v 1.7 2012/06/14 17:47:58 bouyer Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2004 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mmap.c,v 1.7 2012/06/14 17:47:58 bouyer Exp $");
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <paths.h>
+#include <machine/disklabel.h>
+
+static long	page = 0;
+static char	path[] = "mmap";
+static void	map_check(void *, int);
+static void	map_sighandler(int);
+static void	testloan(void *, void *, char, int);
+
+#define	BUFSIZE	(32 * 1024)	/* enough size to trigger sosend_loan */
+
+static void
+map_check(void *map, int flag)
+{
+
+	if (flag != 0) {
+		ATF_REQUIRE(map == MAP_FAILED);
+		return;
+	}
+
+	ATF_REQUIRE(map != MAP_FAILED);
+	ATF_REQUIRE(munmap(map, page) == 0);
+}
+
+void
+testloan(void *vp, void *vp2, char pat, int docheck)
+{
+	char buf[BUFSIZE];
+	char backup[BUFSIZE];
+	ssize_t nwritten;
+	ssize_t nread;
+	int fds[2];
+	int val;
+
+	val = BUFSIZE;
+
+	if (docheck != 0)
+		(void)memcpy(backup, vp, BUFSIZE);
+
+	if (socketpair(AF_LOCAL, SOCK_STREAM, PF_UNSPEC, fds) != 0)
+		atf_tc_fail("socketpair() failed");
+
+	val = BUFSIZE;
+
+	if (setsockopt(fds[1], SOL_SOCKET, SO_RCVBUF, &val, sizeof(val)) != 0)
+		atf_tc_fail("setsockopt() failed, SO_RCVBUF");
+
+	val = BUFSIZE;
+
+	if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUF, &val, sizeof(val)) != 0)
+		atf_tc_fail("setsockopt() failed, SO_SNDBUF");
+
+	if (fcntl(fds[0], F_SETFL, O_NONBLOCK) != 0)
+		atf_tc_fail("fcntl() failed");
+
+	nwritten = write(fds[0], (char *)vp + page, BUFSIZE - page);
+
+	if (nwritten == -1)
+		atf_tc_fail("write() failed");
+
+	/* Break loan. */
+	(void)memset(vp2, pat, BUFSIZE);
+
+	nread = read(fds[1], buf + page, BUFSIZE - page);
+
+	if (nread == -1)
+		atf_tc_fail("read() failed");
+
+	if (nread != nwritten)
+		atf_tc_fail("too short read");
+
+	if (docheck != 0 && memcmp(backup, buf + page, nread) != 0)
+		atf_tc_fail("data mismatch");
+
+	ATF_REQUIRE(close(fds[0]) == 0);
+	ATF_REQUIRE(close(fds[1]) == 0);
+}
+
+static void
+map_sighandler(int signo)
+{
+	_exit(signo);
+}
+
+ATF_TC(mmap_block);
+ATF_TC_HEAD(mmap_block, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) with a block device");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mmap_block, tc)
+{
+	static const int mib[] = { CTL_HW, HW_DISKNAMES };
+	static const unsigned int miblen = __arraycount(mib);
+	char *map, *dk, *drives, dev[PATH_MAX];
+	size_t len;
+	int fd = -1;
+
+	atf_tc_skip("The test case causes a panic (PR kern/38889, kern/46592)");
+
+	ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0);
+	drives = malloc(len);
+	ATF_REQUIRE(drives != NULL);
+	ATF_REQUIRE(sysctl(mib, miblen, drives, &len, NULL, 0) == 0);
+	for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) {
+		sprintf(dev, _PATH_DEV "%s%c", dk, 'a'+RAW_PART);
+		fprintf(stderr, "trying: %s\n", dev);
+
+		if ((fd = open(dev, O_RDONLY)) >= 0) {
+			(void)fprintf(stderr, "using %s\n", dev);
+			break;
+		}
+	}
+	free(drives);
+
+	if (fd < 0)
+		atf_tc_skip("failed to find suitable block device");
+
+	map = mmap(NULL, 4096, PROT_READ, MAP_FILE, fd, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	(void)fprintf(stderr, "first byte %x\n", *map);
+	ATF_REQUIRE(close(fd) == 0);
+	(void)fprintf(stderr, "first byte %x\n", *map);
+
+	ATF_REQUIRE(munmap(map, 4096) == 0);
+}
+
+ATF_TC(mmap_err);
+ATF_TC_HEAD(mmap_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of mmap(2)");
+}
+
+ATF_TC_BODY(mmap_err, tc)
+{
+	size_t addr = SIZE_MAX;
+	void *map;
+
+	errno = 0;
+	map = mmap(NULL, 3, PROT_READ, MAP_FILE|MAP_PRIVATE, -1, 0);
+
+	ATF_REQUIRE(map == MAP_FAILED);
+	ATF_REQUIRE(errno == EBADF);
+
+	errno = 0;
+	map = mmap(&addr, page, PROT_READ, MAP_FIXED|MAP_PRIVATE, -1, 0);
+
+	ATF_REQUIRE(map == MAP_FAILED);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+	map = mmap(NULL, page, PROT_READ, MAP_ANON|MAP_PRIVATE, INT_MAX, 0);
+
+	ATF_REQUIRE(map == MAP_FAILED);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC_WITH_CLEANUP(mmap_loan);
+ATF_TC_HEAD(mmap_loan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test uvm page loanout with mmap(2)");
+}
+
+ATF_TC_BODY(mmap_loan, tc)
+{
+	char buf[BUFSIZE];
+	char *vp, *vp2;
+	int fd;
+
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+	ATF_REQUIRE(fd >= 0);
+
+	(void)memset(buf, 'x', sizeof(buf));
+	(void)write(fd, buf, sizeof(buf));
+
+	vp = mmap(NULL, BUFSIZE, PROT_READ | PROT_WRITE,
+	    MAP_FILE | MAP_PRIVATE, fd, 0);
+
+	ATF_REQUIRE(vp != MAP_FAILED);
+
+	vp2 = vp;
+
+	testloan(vp, vp2, 'A', 0);
+	testloan(vp, vp2, 'B', 1);
+
+	ATF_REQUIRE(munmap(vp, BUFSIZE) == 0);
+
+	vp = mmap(NULL, BUFSIZE, PROT_READ | PROT_WRITE,
+	    MAP_FILE | MAP_SHARED, fd, 0);
+
+	vp2 = mmap(NULL, BUFSIZE, PROT_READ | PROT_WRITE,
+	    MAP_FILE | MAP_SHARED, fd, 0);
+
+	ATF_REQUIRE(vp != MAP_FAILED);
+	ATF_REQUIRE(vp2 != MAP_FAILED);
+
+	testloan(vp, vp2, 'E', 1);
+
+	ATF_REQUIRE(munmap(vp, BUFSIZE) == 0);
+	ATF_REQUIRE(munmap(vp2, BUFSIZE) == 0);
+}
+
+ATF_TC_CLEANUP(mmap_loan, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mmap_prot_1);
+ATF_TC_HEAD(mmap_prot_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) protections, #1");
+}
+
+ATF_TC_BODY(mmap_prot_1, tc)
+{
+	void *map;
+	int fd;
+
+	/*
+	 * Open a file write-only and try to
+	 * map it read-only. This should fail.
+	 */
+	fd = open(path, O_WRONLY | O_CREAT, 0700);
+
+	if (fd < 0)
+		return;
+
+	ATF_REQUIRE(write(fd, "XXX", 3) == 3);
+
+	map = mmap(NULL, 3, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
+	map_check(map, 1);
+
+	map = mmap(NULL, 3, PROT_WRITE, MAP_FILE|MAP_PRIVATE, fd, 0);
+	map_check(map, 0);
+
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC_CLEANUP(mmap_prot_1, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(mmap_prot_2);
+ATF_TC_HEAD(mmap_prot_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) protections, #2");
+}
+
+ATF_TC_BODY(mmap_prot_2, tc)
+{
+	char buf[2];
+	void *map;
+	pid_t pid;
+	int sta;
+
+	/*
+	 * Make a PROT_NONE mapping and try to access it.
+	 * If we catch a SIGSEGV, all works as expected.
+	 */
+	map = mmap(NULL, page, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		ATF_REQUIRE(signal(SIGSEGV, map_sighandler) != SIG_ERR);
+		ATF_REQUIRE(strlcpy(buf, map, sizeof(buf)) != 0);
+	}
+
+	(void)wait(&sta);
+
+	ATF_REQUIRE(WIFEXITED(sta) != 0);
+	ATF_REQUIRE(WEXITSTATUS(sta) == SIGSEGV);
+	ATF_REQUIRE(munmap(map, page) == 0);
+}
+
+ATF_TC_WITH_CLEANUP(mmap_prot_3);
+ATF_TC_HEAD(mmap_prot_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) protections, #3");
+}
+
+ATF_TC_BODY(mmap_prot_3, tc)
+{
+	char buf[2];
+	int fd, sta;
+	void *map;
+	pid_t pid;
+
+	/*
+	 * Open a file, change the permissions
+	 * to read-only, and try to map it as
+	 * PROT_NONE. This should succeed, but
+	 * the access should generate SIGSEGV.
+	 */
+	fd = open(path, O_RDWR | O_CREAT, 0700);
+
+	if (fd < 0)
+		return;
+
+	ATF_REQUIRE(write(fd, "XXX", 3) == 3);
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(chmod(path, 0444) == 0);
+
+	fd = open(path, O_RDONLY);
+	ATF_REQUIRE(fd != -1);
+
+	map = mmap(NULL, 3, PROT_NONE, MAP_FILE | MAP_SHARED, fd, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	pid = fork();
+
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		ATF_REQUIRE(signal(SIGSEGV, map_sighandler) != SIG_ERR);
+		ATF_REQUIRE(strlcpy(buf, map, sizeof(buf)) != 0);
+	}
+
+	(void)wait(&sta);
+
+	ATF_REQUIRE(WIFEXITED(sta) != 0);
+	ATF_REQUIRE(WEXITSTATUS(sta) == SIGSEGV);
+	ATF_REQUIRE(munmap(map, 3) == 0);
+}
+
+ATF_TC_CLEANUP(mmap_prot_3, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(mmap_truncate);
+ATF_TC_HEAD(mmap_truncate, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) and ftruncate(2)");
+}
+
+ATF_TC_BODY(mmap_truncate, tc)
+{
+	char *map;
+	long i;
+	int fd;
+
+	fd = open(path, O_RDWR | O_CREAT, 0700);
+
+	if (fd < 0)
+		return;
+
+	/*
+	 * See that ftruncate(2) works
+	 * while the file is mapped.
+	 */
+	ATF_REQUIRE(ftruncate(fd, page) == 0);
+
+	map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE,
+	     fd, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	for (i = 0; i < page; i++)
+		map[i] = 'x';
+
+	ATF_REQUIRE(ftruncate(fd, 0) == 0);
+	ATF_REQUIRE(ftruncate(fd, page / 8) == 0);
+	ATF_REQUIRE(ftruncate(fd, page / 4) == 0);
+	ATF_REQUIRE(ftruncate(fd, page / 2) == 0);
+	ATF_REQUIRE(ftruncate(fd, page / 12) == 0);
+	ATF_REQUIRE(ftruncate(fd, page / 64) == 0);
+
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC_CLEANUP(mmap_truncate, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(mmap_va0);
+ATF_TC_HEAD(mmap_va0, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mmap(2) and vm.user_va0_disable");
+}
+
+ATF_TC_BODY(mmap_va0, tc)
+{
+	int flags = MAP_ANON | MAP_FIXED | MAP_PRIVATE;
+	size_t len = sizeof(int);
+	void *map;
+	int val;
+
+	/*
+	 * Make an anonymous fixed mapping at zero address. If the address
+	 * is restricted as noted in security(7), the syscall should fail.
+	 */
+	if (sysctlbyname("vm.user_va0_disable", &val, &len, NULL, 0) != 0)
+		atf_tc_fail("failed to read vm.user_va0_disable");
+
+	map = mmap(NULL, page, PROT_EXEC, flags, -1, 0);
+	map_check(map, val);
+
+	map = mmap(NULL, page, PROT_READ, flags, -1, 0);
+	map_check(map, val);
+
+	map = mmap(NULL, page, PROT_WRITE, flags, -1, 0);
+	map_check(map, val);
+
+	map = mmap(NULL, page, PROT_READ|PROT_WRITE, flags, -1, 0);
+	map_check(map, val);
+
+	map = mmap(NULL, page, PROT_EXEC|PROT_READ|PROT_WRITE, flags, -1, 0);
+	map_check(map, val);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, mmap_block);
+	ATF_TP_ADD_TC(tp, mmap_err);
+	ATF_TP_ADD_TC(tp, mmap_loan);
+	ATF_TP_ADD_TC(tp, mmap_prot_1);
+	ATF_TP_ADD_TC(tp, mmap_prot_2);
+	ATF_TP_ADD_TC(tp, mmap_prot_3);
+	ATF_TP_ADD_TC(tp, mmap_truncate);
+	ATF_TP_ADD_TC(tp, mmap_va0);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c b/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c
new file mode 100644
index 000000000000..c534e111660a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c
@@ -0,0 +1,359 @@
+/* $NetBSD: t_mprotect.c,v 1.3 2011/07/20 22:53:44 jym Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mprotect.c,v 1.3 2011/07/20 22:53:44 jym Exp $");
+
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../common/exec_prot.h"
+
+static long	page = 0;
+static int	pax_global = -1;
+static int	pax_enabled = -1;
+static char	path[] = "mmap";
+
+static void	sighandler(int);
+static bool	paxinit(void);
+static bool	paxset(int, int);
+
+static void
+sighandler(int signo)
+{
+	_exit(signo);
+}
+
+static bool
+paxinit(void)
+{
+	size_t len = sizeof(int);
+	int rv;
+
+	rv = sysctlbyname("security.pax.mprotect.global",
+	    &pax_global, &len, NULL, 0);
+
+	if (rv != 0)
+		return false;
+
+	rv = sysctlbyname("security.pax.mprotect.enabled",
+	    &pax_enabled, &len, NULL, 0);
+
+	if (rv != 0)
+		return false;
+
+	return paxset(1, 1);
+}
+
+static bool
+paxset(int global, int enabled)
+{
+	size_t len = sizeof(int);
+	int rv;
+
+	rv = sysctlbyname("security.pax.mprotect.global",
+	    NULL, NULL, &global, len);
+
+	if (rv != 0)
+		return false;
+
+	rv = sysctlbyname("security.pax.mprotect.enabled",
+	    NULL, NULL, &enabled, len);
+
+	if (rv != 0)
+		return false;
+
+	return true;
+}
+
+
+ATF_TC_WITH_CLEANUP(mprotect_access);
+ATF_TC_HEAD(mprotect_access, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test for EACCES from mprotect(2)");
+}
+
+ATF_TC_BODY(mprotect_access, tc)
+{
+	int prot[2] = { PROT_NONE, PROT_READ };
+	void *map;
+	size_t i;
+	int fd;
+
+	fd = open(path, O_RDONLY | O_CREAT);
+	ATF_REQUIRE(fd >= 0);
+
+	/*
+	 * The call should fail with EACCES if we try to mark
+	 * a PROT_NONE or PROT_READ file/section as PROT_WRITE.
+	 */
+	for (i = 0; i < __arraycount(prot); i++) {
+
+		map = mmap(NULL, page, prot[i], MAP_SHARED, fd, 0);
+
+		if (map == MAP_FAILED)
+			continue;
+
+		errno = 0;
+
+		ATF_REQUIRE(mprotect(map, page, PROT_WRITE) != 0);
+		ATF_REQUIRE(errno == EACCES);
+		ATF_REQUIRE(munmap(map, page) == 0);
+	}
+
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+ATF_TC_CLEANUP(mprotect_access, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(mprotect_err);
+ATF_TC_HEAD(mprotect_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of mprotect(2)");
+}
+
+ATF_TC_BODY(mprotect_err, tc)
+{
+	errno = 0;
+
+	ATF_REQUIRE(mprotect((char *)-1, 1, PROT_READ) != 0);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC(mprotect_exec);
+ATF_TC_HEAD(mprotect_exec, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test mprotect(2) executable space protections");
+}
+
+/*
+ * Trivial function -- should fit into a page
+ */
+ATF_TC_BODY(mprotect_exec, tc)
+{
+	pid_t pid;
+	void *map;
+	int sta, xp_support;
+
+	xp_support = exec_prot_support();
+
+	switch (xp_support) {
+	case NOTIMPL:
+		atf_tc_skip(
+		    "Execute protection callback check not implemented");
+		break;
+	case NO_XP:
+		atf_tc_skip(
+		    "Host does not support executable space protection");
+		break;
+	case PARTIAL_XP: case PERPAGE_XP: default:
+		break;
+	}
+
+	/*
+	 * Map a page read/write and copy a trivial assembly function inside.
+	 * We will then change the mapping rights:
+	 * - first by setting the execution right, and check that we can
+	 *   call the code found in the allocated page.
+	 * - second by removing the execution right. This should generate
+	 *   a SIGSEGV on architectures that can enforce --x permissions.
+	 */
+
+	map = mmap(NULL, page, PROT_WRITE|PROT_READ, MAP_ANON, -1, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	memcpy(map, (void *)return_one,
+	    (uintptr_t)return_one_end - (uintptr_t)return_one);
+ 
+	/* give r-x rights then call code in page */
+	ATF_REQUIRE(mprotect(map, page, PROT_EXEC|PROT_READ) == 0);
+	ATF_REQUIRE(((int (*)(void))map)() == 1);
+
+	/* remove --x right */
+	ATF_REQUIRE(mprotect(map, page, PROT_READ) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		ATF_REQUIRE(signal(SIGSEGV, sighandler) != SIG_ERR);
+		ATF_CHECK(((int (*)(void))map)() == 1);
+		_exit(0);
+	}
+
+	(void)wait(&sta);
+
+	ATF_REQUIRE(munmap(map, page) == 0);
+
+	ATF_REQUIRE(WIFEXITED(sta) != 0);
+
+	switch (xp_support) {
+	case PARTIAL_XP:
+		/* Partial protection might fail; skip the test when it does */
+		if (WEXITSTATUS(sta) != SIGSEGV) {
+			atf_tc_skip("Host only supports "
+			    "partial executable space protection");
+		}
+		break;
+	case PERPAGE_XP: default:
+		/* Per-page --x protection should not fail */
+		ATF_REQUIRE(WEXITSTATUS(sta) == SIGSEGV);
+		break;
+	}
+}
+
+ATF_TC(mprotect_pax);
+ATF_TC_HEAD(mprotect_pax, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "PaX restrictions and mprotect(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mprotect_pax, tc)
+{
+	const int prot[4] = { PROT_NONE, PROT_READ, PROT_WRITE };
+	const char *str = NULL;
+	void *map;
+	size_t i;
+	int rv;
+
+	if (paxinit() != true)
+		return;
+
+	/*
+	 * As noted in the original PaX documentation [1],
+	 * the following restrictions should apply:
+	 *
+	 *   (1) creating executable anonymous mappings
+	 *
+	 *   (2) creating executable/writable file mappings
+	 *
+	 *   (3) making a non-executable mapping executable
+	 *
+	 *   (4) making an executable/read-only file mapping
+	 *       writable except for performing relocations
+	 *       on an ET_DYN ELF file (non-PIC shared library)
+	 *
+	 *  The following will test only the case (3).
+	 *
+	 * [1] http://pax.grsecurity.net/docs/mprotect.txt
+	 *
+	 *     (Sun Apr 3 11:06:53 EEST 2011.)
+	 */
+	for (i = 0; i < __arraycount(prot); i++) {
+
+		map = mmap(NULL, page, prot[i], MAP_ANON, -1, 0);
+
+		if (map == MAP_FAILED)
+			continue;
+
+		rv = mprotect(map, 1, prot[i] | PROT_EXEC);
+
+		(void)munmap(map, page);
+
+		if (rv == 0) {
+			str = "non-executable mapping made executable";
+			goto out;
+		}
+	}
+
+out:
+	if (pax_global != -1 && pax_enabled != -1)
+		(void)paxset(pax_global, pax_enabled);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TC(mprotect_write);
+ATF_TC_HEAD(mprotect_write, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mprotect(2) write protections");
+}
+
+ATF_TC_BODY(mprotect_write, tc)
+{
+	pid_t pid;
+	void *map;
+	int sta;
+
+	/*
+	 * Map a page read/write, change the protection
+	 * to read-only with mprotect(2), and try to write
+	 * to the page. This should generate a SIGSEGV.
+	 */
+	map = mmap(NULL, page, PROT_WRITE|PROT_READ, MAP_ANON, -1, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	ATF_REQUIRE(strlcpy(map, "XXX", 3) == 3);
+	ATF_REQUIRE(mprotect(map, page, PROT_READ) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		ATF_REQUIRE(signal(SIGSEGV, sighandler) != SIG_ERR);
+		ATF_REQUIRE(strlcpy(map, "XXX", 3) == 0);
+	}
+
+	(void)wait(&sta);
+
+	ATF_REQUIRE(WIFEXITED(sta) != 0);
+	ATF_REQUIRE(WEXITSTATUS(sta) == SIGSEGV);
+	ATF_REQUIRE(munmap(map, page) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	ATF_TP_ADD_TC(tp, mprotect_access);
+	ATF_TP_ADD_TC(tp, mprotect_err);
+	ATF_TP_ADD_TC(tp, mprotect_exec);
+	ATF_TP_ADD_TC(tp, mprotect_pax);
+	ATF_TP_ADD_TC(tp, mprotect_write);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c b/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c
new file mode 100644
index 000000000000..1e74d60703ed
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c
@@ -0,0 +1,358 @@
+/* $NetBSD: t_msgctl.c,v 1.4 2014/02/27 00:59:50 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_msgctl.c,v 1.4 2014/02/27 00:59:50 joerg Exp $");
+
+#include <sys/msg.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <time.h>
+#include <unistd.h>
+
+#define MSG_KEY		12345689
+#define MSG_MTYPE_1	0x41
+
+struct msg {
+	long		 mtype;
+	char		 buf[3];
+};
+
+static void		clean(void);
+
+static void
+clean(void)
+{
+	int id;
+
+	if ((id = msgget(MSG_KEY, 0)) != -1)
+		(void)msgctl(id, IPC_RMID, 0);
+}
+
+ATF_TC_WITH_CLEANUP(msgctl_err);
+ATF_TC_HEAD(msgctl_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from msgctl(2)");
+}
+
+ATF_TC_BODY(msgctl_err, tc)
+{
+	const int cmd[] = { IPC_STAT, IPC_SET, IPC_RMID };
+	struct msqid_ds msgds;
+	size_t i;
+	int id;
+
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, msgctl(id, INT_MAX, &msgds) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, msgctl(id, IPC_STAT, (void *)-1) == -1);
+
+	for (i = 0; i < __arraycount(cmd); i++) {
+		errno = 0;
+		ATF_REQUIRE_ERRNO(EINVAL, msgctl(-1, cmd[i], &msgds) == -1);
+	}
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgctl_err, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgctl_perm);
+ATF_TC_HEAD(msgctl_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with msgctl(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(msgctl_perm, tc)
+{
+	struct msqid_ds msgds;
+	struct passwd *pw;
+	pid_t pid;
+	int sta;
+	int id;
+
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+	pw = getpwnam("nobody");
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	ATF_REQUIRE(id != -1);
+	ATF_REQUIRE(pw != NULL);
+	ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (setuid(pw->pw_uid) != 0)
+			_exit(EX_OSERR);
+
+		msgds.msg_perm.uid = getuid();
+		msgds.msg_perm.gid = getgid();
+
+		errno = 0;
+
+		if (msgctl(id, IPC_SET, &msgds) == 0)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+		if (msgctl(id, IPC_STAT, &msgds) != 0)
+			_exit(EX_OSERR);
+
+		msgds.msg_qbytes = 1;
+
+		if (msgctl(id, IPC_SET, &msgds) == 0)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0) {
+
+		if (WEXITSTATUS(sta) == EX_OSERR)
+			atf_tc_fail("system call failed");
+
+		if (WEXITSTATUS(sta) == EXIT_FAILURE)
+			atf_tc_fail("UID %u manipulated root's "
+			    "message queue", pw->pw_uid);
+	}
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgctl_perm, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgctl_pid);
+ATF_TC_HEAD(msgctl_pid, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that PIDs are updated");
+}
+
+ATF_TC_BODY(msgctl_pid, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msqid_ds msgds;
+	int id, sta;
+	pid_t pid;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+	(void)wait(&sta);
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+	ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+
+	if (pid != msgds.msg_lspid)
+		atf_tc_fail("the PID of last msgsnd(2) was not updated");
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		(void)msgrcv(id, &msg,
+		    sizeof(struct msg), MSG_MTYPE_1, IPC_NOWAIT);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+	(void)wait(&sta);
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+	ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+
+	if (pid != msgds.msg_lrpid)
+		atf_tc_fail("the PID of last msgrcv(2) was not updated");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgctl_pid, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgctl_set);
+ATF_TC_HEAD(msgctl_set, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgctl(2) with IPC_SET");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(msgctl_set, tc)
+{
+	struct msqid_ds msgds;
+	struct passwd *pw;
+	int id;
+
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+	pw = getpwnam("nobody");
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	ATF_REQUIRE(id != -1);
+	ATF_REQUIRE(pw != NULL);
+	ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+
+	msgds.msg_perm.uid = pw->pw_uid;
+
+	if (msgctl(id, IPC_SET, &msgds) != 0)
+		atf_tc_fail("root failed to change the UID of message queue");
+
+	msgds.msg_perm.uid = getuid();
+	msgds.msg_perm.gid = pw->pw_gid;
+
+	if (msgctl(id, IPC_SET, &msgds) != 0)
+		atf_tc_fail("root failed to change the GID of message queue");
+
+	/*
+	 * Note: setting the qbytes to zero fails even as root.
+	 */
+	msgds.msg_qbytes = 1;
+	msgds.msg_perm.gid = getgid();
+
+	if (msgctl(id, IPC_SET, &msgds) != 0)
+		atf_tc_fail("root failed to change qbytes of message queue");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgctl_set, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgctl_time);
+ATF_TC_HEAD(msgctl_time, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that access times are updated");
+}
+
+ATF_TC_BODY(msgctl_time, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msqid_ds msgds;
+	time_t t;
+	int id;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	t = time(NULL);
+
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+	(void)msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
+	(void)msgctl(id, IPC_STAT, &msgds);
+
+	if (llabs(t - msgds.msg_stime) > 1)
+		atf_tc_fail("time of last msgsnd(2) was not updated");
+
+	if (msgds.msg_rtime != 0)
+		atf_tc_fail("time of last msgrcv(2) was updated incorrectly");
+
+	t = time(NULL);
+
+	(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+	(void)msgrcv(id, &msg, sizeof(struct msg), MSG_MTYPE_1, IPC_NOWAIT);
+	(void)msgctl(id, IPC_STAT, &msgds);
+
+	if (llabs(t - msgds.msg_rtime) > 1)
+		atf_tc_fail("time of last msgrcv(2) was not updated");
+
+	/*
+	 * Note: this is non-zero even after the memset(3).
+	 */
+	if (msgds.msg_stime == 0)
+		atf_tc_fail("time of last msgsnd(2) was updated incorrectly");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgctl_time, tc)
+{
+	clean();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, msgctl_err);
+	ATF_TP_ADD_TC(tp, msgctl_perm);
+	ATF_TP_ADD_TC(tp, msgctl_pid);
+	ATF_TP_ADD_TC(tp, msgctl_set);
+	ATF_TP_ADD_TC(tp, msgctl_time);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgget.c b/contrib/netbsd-tests/lib/libc/sys/t_msgget.c
new file mode 100644
index 000000000000..e26cde2ddfe6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msgget.c
@@ -0,0 +1,292 @@
+/* $NetBSD: t_msgget.c,v 1.2 2014/02/27 00:59:50 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_msgget.c,v 1.2 2014/02/27 00:59:50 joerg Exp $");
+
+#include <sys/msg.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <time.h>
+#include <unistd.h>
+
+#define MSG_KEY		12345689
+
+static void		clean(void);
+
+static void
+clean(void)
+{
+	int id;
+
+	if ((id = msgget(MSG_KEY, 0)) != -1)
+		(void)msgctl(id, IPC_RMID, 0);
+}
+
+ATF_TC_WITH_CLEANUP(msgget_excl);
+ATF_TC_HEAD(msgget_excl, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgget(2) with IPC_EXCL");
+}
+
+ATF_TC_BODY(msgget_excl, tc)
+{
+	int id;
+
+	/*
+	 * Create a message queue and re-open it with
+	 * O_CREAT and IPC_EXCL set. This should fail.
+	 */
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	if (id < 0)
+		atf_tc_fail("failed to create message queue");
+
+	errno = 0;
+
+	if (msgget(MSG_KEY, IPC_CREAT | IPC_EXCL | 0600) != -1)
+		atf_tc_fail("msgget(2) failed for IPC_EXCL");
+
+	ATF_REQUIRE(errno == EEXIST);
+
+	/*
+	 * However, the same call should succeed
+	 * when IPC_EXCL is not set in the flags.
+	 */
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	if (id < 0)
+		atf_tc_fail("msgget(2) failed to re-open");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgget_excl, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgget_exit);
+ATF_TC_HEAD(msgget_exit, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that XSI message queues are "
+	    "not removed when the process exits");
+}
+
+ATF_TC_BODY(msgget_exit, tc)
+{
+	int id, sta;
+	pid_t pid;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (msgget(MSG_KEY, IPC_CREAT | IPC_EXCL | 0600) == -1)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("failed to create message queue");
+
+	id = msgget(MSG_KEY, 0);
+
+	if (id == -1)
+		atf_tc_fail("message queue was removed on process exit");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgget_exit, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgget_init);
+ATF_TC_HEAD(msgget_init, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that msgget(2) initializes data structures properly");
+}
+
+ATF_TC_BODY(msgget_init, tc)
+{
+	const uid_t uid = geteuid();
+	const gid_t gid = getegid();
+	struct msqid_ds msgds;
+	time_t t;
+	int id;
+
+	(void)memset(&msgds, 0x9, sizeof(struct msqid_ds));
+
+	t = time(NULL);
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	ATF_REQUIRE(id !=-1);
+	ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+
+	ATF_CHECK(msgds.msg_qnum == 0);
+	ATF_CHECK(msgds.msg_lspid == 0);
+	ATF_CHECK(msgds.msg_lrpid == 0);
+	ATF_CHECK(msgds.msg_rtime == 0);
+	ATF_CHECK(msgds.msg_stime == 0);
+	ATF_CHECK(msgds.msg_perm.uid == uid);
+	ATF_CHECK(msgds.msg_perm.gid == gid);
+	ATF_CHECK(msgds.msg_perm.cuid == uid);
+	ATF_CHECK(msgds.msg_perm.cgid == gid);
+	ATF_CHECK(msgds.msg_perm.mode == 0600);
+
+	if (llabs(t - msgds.msg_ctime) > 5)
+		atf_tc_fail("msgget(2) initialized current time incorrectly");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgget_init, tc)
+{
+	clean();
+}
+
+ATF_TC(msgget_limit);
+ATF_TC_HEAD(msgget_limit, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgget(2) against system limits");
+}
+
+ATF_TC_BODY(msgget_limit, tc)
+{
+	size_t len = sizeof(int);
+	bool fail = false;
+	int i, lim = 0;
+	int *buf;
+
+	if (sysctlbyname("kern.ipc.msgmni", &lim, &len, NULL, 0) != 0)
+		atf_tc_skip("failed to read kern.ipc.msgmni sysctl");
+
+	buf = calloc(lim + 1, sizeof(*buf));
+	ATF_REQUIRE(buf != NULL);
+
+	for (i = 0; i < lim; i++) {
+
+		buf[i] = msgget(MSG_KEY + i, IPC_CREAT | IPC_EXCL | 0600);
+
+		(void)fprintf(stderr, "key[%d] = %d\n", i, buf[i]);
+
+		/*
+		 * This test only works when there are zero existing
+		 * message queues. Thus, bypass the unit test when
+		 * this precondition is not met, for reason or another.
+		 */
+		if (buf[i] == -1)
+			goto out;
+	}
+
+	i++;
+	errno = 0;
+
+	buf[i] = msgget(MSG_KEY + i, IPC_CREAT | IPC_EXCL | 0600);
+
+	if (buf[i] != -1 || errno != ENOSPC)
+		fail = true;
+
+out:	/* Remember to clean-up. */
+	for (i = 0; i < lim; i++)
+		(void)msgctl(buf[i], IPC_RMID, 0);
+
+	free(buf);
+
+	if (fail != false)
+		atf_tc_fail("msgget(2) opened more than %d queues", lim);
+}
+
+ATF_TC_WITH_CLEANUP(msgget_mode);
+ATF_TC_HEAD(msgget_mode, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test different modes with msgget(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(msgget_mode, tc)
+{
+	static const mode_t mode[] = {
+		S_IRWXU, S_IRUSR, S_IWUSR, S_IXUSR, S_IRWXG, S_IRGRP,
+		S_IWGRP, S_IXGRP, S_IRWXO, S_IROTH, S_IWOTH, S_IXOTH
+	};
+
+	struct msqid_ds msgds;
+	size_t i;
+	int id;
+
+	for (i = 0; i < __arraycount(mode); i++) {
+
+		(void)fprintf(stderr, "testing mode %d\n", mode[i]);
+		(void)memset(&msgds, 0, sizeof(struct msqid_ds));
+
+		id = msgget(MSG_KEY, IPC_CREAT | IPC_EXCL | (int)mode[i]);
+
+		ATF_REQUIRE(id != -1);
+		ATF_REQUIRE(msgctl(id, IPC_STAT, &msgds) == 0);
+		ATF_REQUIRE(msgds.msg_perm.mode == mode[i]);
+		ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+	}
+}
+
+ATF_TC_CLEANUP(msgget_mode, tc)
+{
+	clean();
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, msgget_excl);
+	ATF_TP_ADD_TC(tp, msgget_exit);
+	ATF_TP_ADD_TC(tp, msgget_init);
+	ATF_TP_ADD_TC(tp, msgget_limit);
+	ATF_TP_ADD_TC(tp, msgget_mode);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c b/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c
new file mode 100644
index 000000000000..e32be262aa15
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c
@@ -0,0 +1,342 @@
+/* $NetBSD: t_msgrcv.c,v 1.3 2013/07/24 11:44:10 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_msgrcv.c,v 1.3 2013/07/24 11:44:10 skrll Exp $");
+
+#include <sys/msg.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <time.h>
+#include <unistd.h>
+
+#define MSG_KEY		1234
+#define MSG_MTYPE_1	0x41
+#define	MSG_MTYPE_2	0x42
+#define MSG_MTYPE_3	0x43
+#define MSG_LEN		3
+
+struct msg {
+	long		 mtype;
+	char		 buf[MSG_LEN];
+};
+
+static void		clean(void);
+
+static void
+clean(void)
+{
+	int id;
+
+	if ((id = msgget(MSG_KEY, 0)) != -1)
+		(void)msgctl(id, IPC_RMID, 0);
+}
+
+ATF_TC_WITH_CLEANUP(msgrcv_basic);
+ATF_TC_HEAD(msgrcv_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of msgrcv(2)");
+}
+
+ATF_TC_BODY(msgrcv_basic, tc)
+{
+	struct msg msg1 = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msg msg2 = { MSG_MTYPE_1, { 'x', 'y', 'z' } };
+	int id;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	(void)msgsnd(id, &msg1, MSG_LEN, IPC_NOWAIT);
+	(void)msgrcv(id, &msg2, MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT);
+
+	ATF_CHECK(msg1.buf[0] == msg2.buf[0]);
+	ATF_CHECK(msg1.buf[1] == msg2.buf[1]);
+	ATF_CHECK(msg1.buf[2] == msg2.buf[2]);
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_basic, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgrcv_block);
+ATF_TC_HEAD(msgrcv_block, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that msgrcv(2) blocks");
+}
+
+ATF_TC_BODY(msgrcv_block, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	int id, sta;
+	pid_t pid;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (msgrcv(id, &msg, MSG_LEN, MSG_MTYPE_1, 0) < 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	/*
+	 * Below msgsnd(2) should unblock the child,
+	 * and hence kill(2) should fail with ESRCH.
+	 */
+	(void)sleep(1);
+	(void)msgsnd(id, &msg, MSG_LEN, IPC_NOWAIT);
+	(void)sleep(1);
+	(void)kill(pid, SIGKILL);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WIFSIGNALED(sta) != 0)
+		atf_tc_fail("msgrcv(2) did not block");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_block, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgrcv_err);
+ATF_TC_HEAD(msgrcv_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from msgrcv(2)");
+}
+
+ATF_TC_BODY(msgrcv_err, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	int id, r = 0;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(ENOMSG, msgrcv(id, &msg,
+		MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT) == -1);
+
+	ATF_REQUIRE(msgsnd(id, &msg, MSG_LEN, IPC_NOWAIT) == 0);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EFAULT, msgrcv(id, (void *)-1,
+		MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT) == -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EINVAL, msgrcv(-1, &msg,
+		MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT) == -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EINVAL, msgrcv(-1, &msg,
+		SSIZE_MAX, MSG_MTYPE_1, IPC_NOWAIT) == -1);
+
+	ATF_REQUIRE(msgsnd(id, &msg, MSG_LEN, IPC_NOWAIT) == 0);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(E2BIG, msgrcv(id, &r,
+		MSG_LEN - 1, MSG_MTYPE_1, IPC_NOWAIT) == -1);
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_err, tc)
+{
+	clean();
+}
+
+
+ATF_TC_WITH_CLEANUP(msgrcv_mtype);
+ATF_TC_HEAD(msgrcv_mtype, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test message types with msgrcv(2)");
+}
+
+ATF_TC_BODY(msgrcv_mtype, tc)
+{
+	struct msg msg1 = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msg msg2 = { MSG_MTYPE_3, { 'x', 'y', 'z' } };
+	int id;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	(void)msgsnd(id, &msg1, MSG_LEN, IPC_NOWAIT);
+	(void)msgrcv(id, &msg2, MSG_LEN, MSG_MTYPE_2, IPC_NOWAIT);
+
+	ATF_CHECK(msg1.buf[0] != msg2.buf[0]);	/* Different mtype. */
+	ATF_CHECK(msg1.buf[1] != msg2.buf[1]);
+	ATF_CHECK(msg1.buf[2] != msg2.buf[2]);
+
+	(void)msgrcv(id, &msg2, MSG_LEN, MSG_MTYPE_1, IPC_NOWAIT);
+
+	ATF_CHECK(msg1.buf[0] == msg2.buf[0]);	/* Same mtype. */
+	ATF_CHECK(msg1.buf[1] == msg2.buf[1]);
+	ATF_CHECK(msg1.buf[2] == msg2.buf[2]);
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_mtype, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgrcv_nonblock);
+ATF_TC_HEAD(msgrcv_nonblock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgrcv(2) with IPC_NOWAIT");
+	atf_tc_set_md_var(tc, "timeout", "10");
+}
+
+ATF_TC_BODY(msgrcv_nonblock, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	const ssize_t n = 10;
+	int id, sta;
+	ssize_t i;
+	pid_t pid;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	for (i = 0; i < n; i++) {
+
+		ATF_REQUIRE(msgsnd(id, &msg, MSG_LEN, IPC_NOWAIT) == 0);
+	}
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		while (i != 0) {
+
+			if (msgrcv(id, &msg, MSG_LEN, MSG_MTYPE_1,
+			    IPC_NOWAIT) == -1)
+				_exit(EXIT_FAILURE);
+
+			i--;
+		}
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(2);
+	(void)kill(pid, SIGKILL);
+	(void)wait(&sta);
+
+	if (WIFSIGNALED(sta) != 0 || WTERMSIG(sta) == SIGKILL)
+		atf_tc_fail("msgrcv(2) blocked with IPC_NOWAIT");
+
+	if (WIFEXITED(sta) == 0 && WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("msgrcv(2) failed");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_nonblock, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgrcv_truncate);
+ATF_TC_HEAD(msgrcv_truncate, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgrcv(2) with MSG_NOERROR");
+}
+
+ATF_TC_BODY(msgrcv_truncate, tc)
+{
+#define	MSG_SMALLLEN	2
+	struct msgsmall {
+		long		 mtype;
+		char		 buf[MSG_SMALLLEN];
+	};
+
+	struct msg msg1 = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msgsmall msg2 = { MSG_MTYPE_1, { 'x', 'y' } };
+	int id;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	(void)msgsnd(id, &msg1, MSG_LEN, IPC_NOWAIT);
+	(void)msgrcv(id, &msg2, MSG_SMALLLEN,
+	    MSG_MTYPE_1, IPC_NOWAIT | MSG_NOERROR);
+
+	ATF_CHECK(msg1.buf[0] == msg2.buf[0]);
+	ATF_CHECK(msg1.buf[1] == msg2.buf[1]);
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgrcv_truncate, tc)
+{
+	clean();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, msgrcv_basic);
+	ATF_TP_ADD_TC(tp, msgrcv_block);
+	ATF_TP_ADD_TC(tp, msgrcv_err);
+	ATF_TP_ADD_TC(tp, msgrcv_mtype);
+	ATF_TP_ADD_TC(tp, msgrcv_nonblock);
+	ATF_TP_ADD_TC(tp, msgrcv_truncate);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c b/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c
new file mode 100644
index 000000000000..54937897435f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c
@@ -0,0 +1,338 @@
+/* $NetBSD: t_msgsnd.c,v 1.2 2011/11/05 08:47:54 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_msgsnd.c,v 1.2 2011/11/05 08:47:54 jruoho Exp $");
+
+#include <sys/msg.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <time.h>
+#include <unistd.h>
+
+#define MSG_KEY		1234
+#define MSG_MTYPE_1	0x41
+#define	MSG_MTYPE_2	0x42
+#define MSG_MTYPE_3	0x43
+
+struct msg {
+	long		 mtype;
+	char		 buf[3];
+};
+
+static void		clean(void);
+
+static void
+clean(void)
+{
+	int id;
+
+	if ((id = msgget(MSG_KEY, 0)) != -1)
+		(void)msgctl(id, IPC_RMID, 0);
+}
+
+ATF_TC_WITH_CLEANUP(msgsnd_block);
+ATF_TC_HEAD(msgsnd_block, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that msgsnd(2) blocks");
+	atf_tc_set_md_var(tc, "timeout", "10");
+}
+
+ATF_TC_BODY(msgsnd_block, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	int id, sta;
+	pid_t pid;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * Enqueue messages until some limit (e.g. the maximum
+		 * number of messages in the queue or the maximum number
+		 * of bytes in the queue) is reached. After this the call
+		 * should block when the IPC_NOWAIT is not set.
+		 */
+		for (;;) {
+
+			if (msgsnd(id, &msg, sizeof(struct msg), 0) < 0)
+				_exit(EXIT_FAILURE);
+		}
+	}
+
+	(void)sleep(2);
+	(void)kill(pid, SIGKILL);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) != 0 || WIFSIGNALED(sta) == 0)
+		atf_tc_fail("msgsnd(2) did not block");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgsnd_block, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgsnd_count);
+ATF_TC_HEAD(msgsnd_count, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that msgsnd(2) increments the amount of "
+	    "message in the queue, as given by msgctl(2)");
+	atf_tc_set_md_var(tc, "timeout", "10");
+}
+
+ATF_TC_BODY(msgsnd_count, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct msqid_ds ds;
+	size_t i = 0;
+	int id, rv;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	for (;;) {
+
+		errno = 0;
+		rv = msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
+
+		if (rv == 0) {
+			i++;
+			continue;
+		}
+
+		if (rv == -1 && errno == EAGAIN)
+			break;
+
+		atf_tc_fail("failed to enqueue a message");
+	}
+
+	(void)memset(&ds, 0, sizeof(struct msqid_ds));
+	(void)msgctl(id, IPC_STAT, &ds);
+
+	if (ds.msg_qnum != i)
+		atf_tc_fail("incorrect message count");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgsnd_count, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgsnd_err);
+ATF_TC_HEAD(msgsnd_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from msgsnd(2)");
+}
+
+ATF_TC_BODY(msgsnd_err, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	int id;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EFAULT, msgsnd(id, (void *)-1,
+		sizeof(struct msg), IPC_NOWAIT) == -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EINVAL, msgsnd(-1, &msg,
+		sizeof(struct msg), IPC_NOWAIT) == -1);
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EINVAL, msgsnd(-1, &msg,
+		SSIZE_MAX, IPC_NOWAIT) == -1);
+
+	errno = 0;
+	msg.mtype = 0;
+
+	ATF_REQUIRE_ERRNO(EINVAL, msgsnd(id, &msg,
+		sizeof(struct msg), IPC_NOWAIT) == -1);
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgsnd_err, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgsnd_nonblock);
+ATF_TC_HEAD(msgsnd_nonblock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test msgsnd(2) with IPC_NOWAIT");
+	atf_tc_set_md_var(tc, "timeout", "10");
+}
+
+ATF_TC_BODY(msgsnd_nonblock, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	int id, rv, sta;
+	pid_t pid;
+
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+	ATF_REQUIRE(id != -1);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		for (;;) {
+
+			errno = 0;
+			rv = msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
+
+			if (rv == -1 && errno == EAGAIN)
+				_exit(EXIT_SUCCESS);
+		}
+	}
+
+	(void)sleep(2);
+	(void)kill(pid, SIGKILL);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WIFSIGNALED(sta) != 0)
+		atf_tc_fail("msgsnd(2) blocked with IPC_NOWAIT");
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgsnd_nonblock, tc)
+{
+	clean();
+}
+
+ATF_TC_WITH_CLEANUP(msgsnd_perm);
+ATF_TC_HEAD(msgsnd_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with msgsnd(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(msgsnd_perm, tc)
+{
+	struct msg msg = { MSG_MTYPE_1, { 'a', 'b', 'c' } };
+	struct passwd *pw;
+	int id, sta;
+	pid_t pid;
+	uid_t uid;
+
+	pw = getpwnam("nobody");
+	id = msgget(MSG_KEY, IPC_CREAT | 0600);
+
+	ATF_REQUIRE(id != -1);
+	ATF_REQUIRE(pw != NULL);
+
+	uid = pw->pw_uid;
+	ATF_REQUIRE(uid != 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * Try to enqueue a message to the queue
+		 * created by root as RW for owner only.
+		 */
+		if (setuid(uid) != 0)
+			_exit(EX_OSERR);
+
+		id = msgget(MSG_KEY, 0);
+
+		if (id == -1)
+			_exit(EX_OSERR);
+
+		errno = 0;
+
+		if (msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT) == 0)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EACCES)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS) {
+
+		if (errno == EX_OSERR)
+			atf_tc_fail("system call failed");
+
+		atf_tc_fail("UID %u enqueued message to root's queue", uid);
+	}
+
+	ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
+}
+
+ATF_TC_CLEANUP(msgsnd_perm, tc)
+{
+	clean();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, msgsnd_block);
+	ATF_TP_ADD_TC(tp, msgsnd_count);
+	ATF_TP_ADD_TC(tp, msgsnd_err);
+	ATF_TP_ADD_TC(tp, msgsnd_nonblock);
+	ATF_TP_ADD_TC(tp, msgsnd_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msync.c b/contrib/netbsd-tests/lib/libc/sys/t_msync.c
new file mode 100644
index 000000000000..974330080604
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msync.c
@@ -0,0 +1,237 @@
+/* $NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $");
+
+#include <sys/mman.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static long		page = 0;
+static const off_t	off = 512;
+static const char	path[] = "msync";
+
+static const char	*msync_sync(const char *, int);
+
+static const char *
+msync_sync(const char *garbage, int flags)
+{
+	char *buf, *map = MAP_FAILED;
+	const char *str = NULL;
+	size_t i, len;
+	ssize_t tot;
+	int fd, rv;
+
+	/*
+	 * Create a temporary file, write
+	 * one page to it, and map the file.
+	 */
+	buf = malloc(page);
+
+	if (buf == NULL)
+		return NULL;
+
+	for (i = 0; i < (size_t)page; i++)
+		buf[i] = 'x';
+
+	fd = open(path, O_RDWR | O_CREAT, 0700);
+
+	if (fd < 0) {
+		str = "failed to open";
+		goto out;
+	}
+
+	tot = 0;
+
+	while (tot < page) {
+
+		rv = write(fd, buf, sizeof(buf));
+
+		if (rv < 0) {
+			str = "failed to write";
+			goto out;
+		}
+
+		tot += rv;
+	}
+
+	map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE,
+	     fd, 0);
+
+	if (map == MAP_FAILED) {
+		str = "failed to map";
+		goto out;
+	}
+
+	/*
+	 * Seek to an arbitrary offset and
+	 * write garbage to this position.
+	 */
+	if (lseek(fd, off, SEEK_SET) != off) {
+		str = "failed to seek";
+		goto out;
+	}
+
+	len = strlen(garbage);
+	rv = write(fd, garbage, len);
+
+	if (rv != (ssize_t)len) {
+		str = "failed to write garbage";
+		goto out;
+	}
+
+	/*
+	 * Synchronize the mapping and verify
+	 * that garbage is at the given offset.
+	 */
+	if (msync(map, page, flags) != 0) {
+		str = "failed to msync";
+		goto out;
+	}
+
+	if (memcmp(map + off, garbage, len) != 0) {
+		str = "msync did not synchronize";
+		goto out;
+	}
+
+out:
+	free(buf);
+
+	(void)close(fd);
+	(void)unlink(path);
+
+	if (map != MAP_FAILED)
+		(void)munmap(map, page);
+
+	return str;
+}
+
+ATF_TC(msync_async);
+ATF_TC_HEAD(msync_async, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test of msync(2), MS_ASYNC");
+}
+
+ATF_TC_BODY(msync_async, tc)
+{
+	const char *str;
+
+	str = msync_sync("garbage", MS_ASYNC);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TC(msync_err);
+ATF_TC_HEAD(msync_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions in msync(2)");
+}
+
+ATF_TC_BODY(msync_err, tc)
+{
+
+	char *map = MAP_FAILED;
+
+	/*
+	 * Test that invalid flags error out.
+	 */
+	ATF_REQUIRE(msync_sync("error", -1) != NULL);
+	ATF_REQUIRE(msync_sync("error", INT_MAX) != NULL);
+
+	errno = 0;
+
+	/*
+	 * Map a page and then unmap to get an unmapped address.
+	 */
+	map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
+	    -1, 0);
+	ATF_REQUIRE(map != MAP_FAILED);
+
+	(void)munmap(map, page);
+
+	ATF_REQUIRE(msync(map, page, MS_SYNC) != 0);
+	ATF_REQUIRE(errno == EFAULT);
+}
+
+ATF_TC(msync_invalidate);
+ATF_TC_HEAD(msync_invalidate, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test of msync(2), MS_INVALIDATE");
+}
+
+ATF_TC_BODY(msync_invalidate, tc)
+{
+	const char *str;
+
+	str = msync_sync("garbage", MS_INVALIDATE);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TC(msync_sync);
+ATF_TC_HEAD(msync_sync, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test of msync(2), MS_SYNC");
+}
+
+ATF_TC_BODY(msync_sync, tc)
+{
+	const char *str;
+
+	str = msync_sync("garbage", MS_SYNC);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	page = sysconf(_SC_PAGESIZE);
+
+	ATF_REQUIRE(page >= 0);
+	ATF_REQUIRE(page > off);
+
+	ATF_TP_ADD_TC(tp, msync_async);
+	ATF_TP_ADD_TC(tp, msync_err);
+	ATF_TP_ADD_TC(tp, msync_invalidate);
+	ATF_TP_ADD_TC(tp, msync_sync);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c b/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c
new file mode 100644
index 000000000000..317d66766408
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c
@@ -0,0 +1,187 @@
+/* $NetBSD: t_nanosleep.c,v 1.3 2013/03/31 16:47:16 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_nanosleep.c,v 1.3 2013/03/31 16:47:16 christos Exp $");
+
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <time.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+static void
+handler(int signo)
+{
+	/* Nothing. */
+}
+
+ATF_TC(nanosleep_basic);
+ATF_TC_HEAD(nanosleep_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that nanosleep(2) works");
+}
+
+ATF_TC_BODY(nanosleep_basic, tc)
+{
+	static const size_t maxiter = 10;
+	struct timespec ts1, ts2, tsn;
+	size_t i;
+
+	for (i = 1; i < maxiter; i++) {
+
+		tsn.tv_sec = 0;
+		tsn.tv_nsec = i;
+
+		(void)memset(&ts1, 0, sizeof(struct timespec));
+		(void)memset(&ts2, 0, sizeof(struct timespec));
+
+		ATF_REQUIRE(clock_gettime(CLOCK_MONOTONIC, &ts1) == 0);
+		ATF_REQUIRE(nanosleep(&tsn, NULL) == 0);
+		ATF_REQUIRE(clock_gettime(CLOCK_MONOTONIC, &ts2) == 0);
+
+		/*
+		 * Verify that we slept at least one nanosecond.
+		 */
+		if (timespeccmp(&ts2, &ts1, <=) != 0) {
+
+			(void)fprintf(stderr,
+			    "sleep time:: sec %llu, nsec %lu\n\t\t"
+			    "ts1: sec %llu, nsec %lu\n\t\t"
+			    "ts2: sec %llu, nsec %lu\n",
+			    (unsigned long long)tsn.tv_sec, tsn.tv_nsec,
+			    (unsigned long long)ts1.tv_sec, ts1.tv_nsec,
+			    (unsigned long long)ts2.tv_sec, ts2.tv_nsec);
+
+			atf_tc_fail_nonfatal("inaccuracies in sleep time "
+			    "(resolution = %lu nsec)", tsn.tv_nsec);
+		}
+	}
+}
+
+ATF_TC(nanosleep_err);
+ATF_TC_HEAD(nanosleep_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test errors from nanosleep(2) (PR bin/14558)");
+}
+
+ATF_TC_BODY(nanosleep_err, tc)
+{
+	struct timespec ts;
+
+	ts.tv_sec = 1;
+	ts.tv_nsec = -1;
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, nanosleep(&ts, NULL) == -1);
+
+	ts.tv_sec = 1;
+	ts.tv_nsec = 1000000000;
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, nanosleep(&ts, NULL) == -1);
+
+	ts.tv_sec = -1;
+	ts.tv_nsec = 0;
+	errno = 0;
+	ATF_REQUIRE_ERRNO(0, nanosleep(&ts, NULL) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, nanosleep((void *)-1, NULL) == -1);
+}
+
+ATF_TC(nanosleep_sig);
+ATF_TC_HEAD(nanosleep_sig, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test signal for nanosleep(2)");
+}
+
+ATF_TC_BODY(nanosleep_sig, tc)
+{
+	struct timespec tsn, tsr;
+	pid_t pid;
+	int sta;
+
+	/*
+	 * Test that a signal interrupts nanosleep(2).
+	 *
+	 * (In which case the return value should be -1 and the
+	 * second parameter should contain the unslept time.)
+	 */
+	pid = fork();
+
+	ATF_REQUIRE(pid >= 0);
+	ATF_REQUIRE(signal(SIGINT, handler) == 0);
+
+	if (pid == 0) {
+
+		tsn.tv_sec = 10;
+		tsn.tv_nsec = 0;
+
+		tsr.tv_sec = 0;
+		tsr.tv_nsec = 0;
+
+		errno = 0;
+
+		if (nanosleep(&tsn, &tsr) != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EINTR)
+			_exit(EXIT_FAILURE);
+
+		if (tsr.tv_sec == 0 && tsr.tv_nsec == 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+	(void)kill(pid, SIGINT);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("signal did not interrupt nanosleep(2)");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nanosleep_basic);
+	ATF_TP_ADD_TC(tp, nanosleep_err);
+	ATF_TP_ADD_TC(tp, nanosleep_sig);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_pipe.c b/contrib/netbsd-tests/lib/libc/sys/t_pipe.c
new file mode 100644
index 000000000000..b30b94df702f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_pipe.c
@@ -0,0 +1,163 @@
+/* $NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $ */
+
+/*-
+ * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_pipe.c,v 1.3 2011/10/31 15:41:31 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+static pid_t pid;
+static int nsiginfo = 0;
+
+/*
+ * This is used for both parent and child. Handle parent's SIGALRM,
+ * the childs SIGINFO doesn't need anything.
+ */
+static void
+sighand(int sig)
+{
+	if (sig == SIGALRM) {
+		kill(pid, SIGINFO);
+	}
+	if (sig == SIGINFO) {
+		nsiginfo++;
+	}
+}
+
+ATF_TC(pipe_restart);
+ATF_TC_HEAD(pipe_restart, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that writing to pipe "
+	    "works correctly after being interrupted and restarted "
+	    "(kern/14087)");
+}
+
+ATF_TC_BODY(pipe_restart, tc)
+{
+	int pp[2], st;
+	ssize_t sz, todo, done;
+	char *f;
+	sigset_t asigset, osigset, emptysigset;
+
+	/* Initialise signal masks */
+	RL(sigemptyset(&emptysigset));
+	RL(sigemptyset(&asigset));
+	RL(sigaddset(&asigset, SIGINFO));
+
+	/* Register signal handlers for both read and writer */
+	REQUIRE_LIBC(signal(SIGINFO, sighand), SIG_ERR);
+	REQUIRE_LIBC(signal(SIGALRM, sighand), SIG_ERR);
+
+	todo = 2 * 1024 * 1024;
+	REQUIRE_LIBC(f = malloc(todo), NULL);
+
+	RL(pipe(pp));
+
+	RL(pid = fork());
+	if (pid == 0) {
+		/* child */
+		RL(close(pp[1]));
+
+		/* Do inital write. This should succeed, make
+		 * the other side do partial write and wait for us to pick
+		 * rest up.
+		 */
+		RL(done = read(pp[0], f, 128 * 1024));
+
+		/* Wait until parent is alarmed and awakens us */
+		RL(sigprocmask(SIG_BLOCK, &asigset, &osigset));
+		while (nsiginfo == 0) {
+			if (sigsuspend(&emptysigset) != -1 || errno != EINTR)
+				atf_tc_fail("sigsuspend(&emptysigset): %s",
+				    strerror(errno));
+		}
+		RL(sigprocmask(SIG_SETMASK, &osigset, NULL));
+
+		/* Read all what parent wants to give us */
+		while((sz = read(pp[0], f, 1024 * 1024)) > 0)
+			done += sz;
+
+		/*
+		 * Exit with 1 if number of bytes read doesn't match
+		 * number of expected bytes
+		 */
+		printf("Read:     %#zx\n", (size_t)done);
+		printf("Expected: %#zx\n", (size_t)todo);
+
+		exit(done != todo);
+
+		/* NOTREACHED */
+	} else {
+		RL(close(pp[0]));
+
+		/*
+		 * Arrange for alarm after two seconds. Since we have
+		 * handler setup for SIGARLM, the write(2) call should
+		 * be restarted internally by kernel.
+		 */
+		(void)alarm(2);
+
+		/* We write exactly 'todo' bytes. The very first write(2)
+		 * should partially succeed, block and eventually
+		 * be restarted by kernel
+		 */
+		while(todo > 0 && ((sz = write(pp[1], f, todo)) > 0))
+			todo -= sz;
+
+		/* Close the pipe, so that child would stop reading */
+		RL(close(pp[1]));
+
+		/* And pickup child's exit status */
+		RL(waitpid(pid, &st, 0));
+
+		ATF_REQUIRE_EQ(WEXITSTATUS(st), 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, pipe_restart);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c b/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c
new file mode 100644
index 000000000000..51f22406a01b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c
@@ -0,0 +1,188 @@
+/* $NetBSD: t_pipe2.c,v 1.8 2012/05/16 13:54:28 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_pipe2.c,v 1.8 2012/05/16 13:54:28 jruoho Exp $");
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/resource.h>
+
+static void
+run(int flags)
+{
+	int fd[2], i;
+
+	while ((i = open("/", O_RDONLY)) < 3)
+		ATF_REQUIRE(i != -1);
+
+	ATF_REQUIRE(fcntl(3, F_CLOSEM) != -1);
+
+	ATF_REQUIRE(pipe2(fd, flags) == 0);
+
+	ATF_REQUIRE(fd[0] == 3);
+	ATF_REQUIRE(fd[1] == 4);
+
+	if (flags & O_CLOEXEC) {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) != 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) != 0);
+	} else {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) == 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) == 0);
+	}
+
+	if (flags & O_NONBLOCK) {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) != 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) != 0);
+	} else {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) == 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) == 0);
+	}
+
+	if (flags & O_NOSIGPIPE) {
+		ATF_REQUIRE(fcntl(fd[0], F_GETNOSIGPIPE) != 0);
+		ATF_REQUIRE(fcntl(fd[1], F_GETNOSIGPIPE) != 0);
+	} else {
+		ATF_REQUIRE(fcntl(fd[0], F_GETNOSIGPIPE) == 0);
+		ATF_REQUIRE(fcntl(fd[1], F_GETNOSIGPIPE) == 0);
+	}
+
+	ATF_REQUIRE(close(fd[0]) != -1);
+	ATF_REQUIRE(close(fd[1]) != -1);
+}
+
+ATF_TC(pipe2_basic);
+ATF_TC_HEAD(pipe2_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_basic, tc)
+{
+	run(0);
+}
+
+ATF_TC(pipe2_consume);
+ATF_TC_HEAD(pipe2_consume, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that consuming file descriptors "
+	    "with pipe2(2) does not crash the system (PR kern/46457)");
+}
+
+ATF_TC_BODY(pipe2_consume, tc)
+{
+	struct rlimit rl;
+	int err, filedes[2];
+
+	err = fcntl(4, F_CLOSEM);
+	ATF_REQUIRE(err == 0);
+
+	err = getrlimit(RLIMIT_NOFILE, &rl);
+	ATF_REQUIRE(err == 0);
+	/*
+	 * The heart of this test is to run against the number of open
+	 * file descriptor limit in the middle of a pipe2() call - i.e.
+	 * before the call only a single descriptor may be openend.
+	 */
+	rl.rlim_cur = 4;
+	err = setrlimit(RLIMIT_NOFILE, &rl);
+	ATF_REQUIRE(err == 0);
+
+	err = pipe2(filedes, O_CLOEXEC);
+	ATF_REQUIRE(err == -1);
+}
+
+ATF_TC(pipe2_nonblock);
+ATF_TC_HEAD(pipe2_nonblock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A non-blocking test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_nonblock, tc)
+{
+	run(O_NONBLOCK);
+}
+
+ATF_TC(pipe2_cloexec);
+ATF_TC_HEAD(pipe2_cloexec, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A close-on-exec test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_cloexec, tc)
+{
+	run(O_CLOEXEC);
+}
+
+ATF_TC(pipe2_nosigpipe);
+ATF_TC_HEAD(pipe2_nosigpipe, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A no sigpipe test of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_nosigpipe, tc)
+{
+	run(O_NOSIGPIPE);
+}
+
+ATF_TC(pipe2_einval);
+ATF_TC_HEAD(pipe2_einval, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A error check of pipe2(2)");
+}
+
+ATF_TC_BODY(pipe2_einval, tc)
+{
+	int fd[2];
+	ATF_REQUIRE_ERRNO(EINVAL, pipe2(fd, O_ASYNC) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pipe2_basic);
+	ATF_TP_ADD_TC(tp, pipe2_consume);
+	ATF_TP_ADD_TC(tp, pipe2_nonblock);
+	ATF_TP_ADD_TC(tp, pipe2_cloexec);
+	ATF_TP_ADD_TC(tp, pipe2_nosigpipe);
+	ATF_TP_ADD_TC(tp, pipe2_einval);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_poll.c b/contrib/netbsd-tests/lib/libc/sys/t_poll.c
new file mode 100644
index 000000000000..7a786d2dd153
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_poll.c
@@ -0,0 +1,392 @@
+/*	$NetBSD: t_poll.c,v 1.3 2012/03/18 07:00:52 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * 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.
+ */
+
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <poll.h>
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+
+static int desc;
+
+static void
+child1(void)
+{
+	struct pollfd pfd;
+
+	pfd.fd = desc;
+	pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+	(void)poll(&pfd, 1, 2000);
+	(void)printf("child1 exit\n");
+}
+
+static void
+child2(void)
+{
+	struct pollfd pfd;
+
+	pfd.fd = desc;
+	pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+	(void)sleep(1);
+	(void)poll(&pfd, 1, INFTIM);
+	(void)printf("child2 exit\n");
+}
+
+static void
+child3(void)
+{
+	struct pollfd pfd;
+
+	(void)sleep(5);
+
+	pfd.fd = desc;
+	pfd.events = POLLIN | POLLHUP | POLLOUT;
+
+	(void)poll(&pfd, 1, INFTIM);
+	(void)printf("child3 exit\n");
+}
+
+ATF_TC(poll_3way);
+ATF_TC_HEAD(poll_3way, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "15");
+	atf_tc_set_md_var(tc, "descr",
+	    "Check for 3-way collision for descriptor. First child comes "
+	    "and polls on descriptor, second child comes and polls, first "
+	    "child times out and exits, third child comes and polls. When "
+	    "the wakeup event happens, the two remaining children should "
+	    "both be awaken. (kern/17517)");
+}
+
+ATF_TC_BODY(poll_3way, tc)
+{
+	int pf[2];
+	int status, i;
+	pid_t pid;
+
+	pipe(pf);
+	desc = pf[0];
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		(void)close(pf[1]);
+		child1();
+		_exit(0);
+		/* NOTREACHED */
+	}
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+		(void)close(pf[1]);
+		child2();
+		_exit(0);
+		/* NOTREACHED */
+	}
+
+	pid = fork();
+	ATF_REQUIRE( pid >= 0);
+
+	if (pid == 0) {
+		(void)close(pf[1]);
+		child3();
+		_exit(0);
+		/* NOTREACHED */
+	}
+
+	(void)sleep(10);
+
+	(void)printf("parent write\n");
+
+	ATF_REQUIRE(write(pf[1], "konec\n", 6) == 6);
+
+	for(i = 0; i < 3; ++i)
+		(void)wait(&status);
+
+	(void)printf("parent terminated\n");
+}
+
+ATF_TC(poll_basic);
+ATF_TC_HEAD(poll_basic, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr",
+	    "Basis functionality test for poll(2)");
+}
+
+ATF_TC_BODY(poll_basic, tc)
+{
+	int fds[2];
+	struct pollfd pfds[2];
+	int ret;
+
+	ATF_REQUIRE_EQ(pipe(fds), 0);
+
+	pfds[0].fd = fds[0];
+	pfds[0].events = POLLIN;
+	pfds[1].fd = fds[1];
+	pfds[1].events = POLLOUT;
+
+	/*
+	 * Check that we get a timeout waiting for data on the read end
+	 * of our pipe.
+	 */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[0], 1, 1), 0,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, -1, "got: %d", pfds[1].revents);
+
+	/* Check that the write end of the pipe as reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[1], 1, 1), 1,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, -1, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",\
+	    pfds[1].revents);
+
+	/* Check that only the write end of the pipe as reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 1,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+	    pfds[1].revents);
+
+	/* Write data to our pipe. */
+	ATF_REQUIRE_EQ(write(fds[1], "", 1), 1);
+
+	/* Check that both ends of our pipe are reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 2,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, POLLIN, "got: %d",
+	    pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+	    pfds[1].revents);
+
+	ATF_REQUIRE_EQ(close(fds[0]), 0);
+	ATF_REQUIRE_EQ(close(fds[1]), 0);
+}
+
+ATF_TC(poll_err);
+ATF_TC_HEAD(poll_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check errors from poll(2)");
+}
+
+ATF_TC_BODY(poll_err, tc)
+{
+	struct pollfd pfd;
+	int fd = 0;
+
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, poll((struct pollfd *)-1, 1, -1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, poll(&pfd, 1, -2) == -1);
+}
+
+ATF_TC(pollts_basic);
+ATF_TC_HEAD(pollts_basic, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr",
+	    "Basis functionality test for pollts(2)");
+}
+
+ATF_TC_BODY(pollts_basic, tc)
+{
+	int fds[2];
+	struct pollfd pfds[2];
+	struct timespec timeout;
+	int ret;
+
+	ATF_REQUIRE_EQ(pipe(fds), 0);
+
+	pfds[0].fd = fds[0];
+	pfds[0].events = POLLIN;
+	pfds[1].fd = fds[1];
+	pfds[1].events = POLLOUT;
+
+	/* Use a timeout of 1 second. */
+	timeout.tv_sec = 1;
+	timeout.tv_nsec = 0;
+
+	/*
+	 * Check that we get a timeout waiting for data on the read end
+	 * of our pipe.
+	 */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = pollts(&pfds[0], 1, &timeout, NULL), 0,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, -1, "got: %d", pfds[1].revents);
+
+	/* Check that the write end of the pipe as reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = pollts(&pfds[1], 1, &timeout, NULL), 1,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, -1, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",\
+	    pfds[1].revents);
+
+	/* Check that only the write end of the pipe as reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = pollts(pfds, 2, &timeout, NULL), 1,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+	    pfds[1].revents);
+
+	/* Write data to our pipe. */
+	ATF_REQUIRE_EQ(write(fds[1], "", 1), 1);
+
+	/* Check that both ends of our pipe are reported as ready. */
+	pfds[0].revents = -1;
+	pfds[1].revents = -1;
+	ATF_REQUIRE_EQ_MSG(ret = pollts(pfds, 2, &timeout, NULL), 2,
+	    "got: %d", ret);
+	ATF_REQUIRE_EQ_MSG(pfds[0].revents, POLLIN, "got: %d",
+	    pfds[0].revents);
+	ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+	    pfds[1].revents);
+
+	ATF_REQUIRE_EQ(close(fds[0]), 0);
+	ATF_REQUIRE_EQ(close(fds[1]), 0);
+}
+
+ATF_TC(pollts_err);
+ATF_TC_HEAD(pollts_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check errors from pollts(2)");
+}
+
+ATF_TC_BODY(pollts_err, tc)
+{
+	struct timespec timeout;
+	struct pollfd pfd;
+	int fd = 0;
+
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+
+	timeout.tv_sec = 1;
+	timeout.tv_nsec = 0;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, pollts((void *)-1, 1, &timeout, NULL) == -1);
+
+	timeout.tv_sec = -1;
+	timeout.tv_nsec = -1;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, pollts(&pfd, 1, &timeout, NULL) == -1);
+}
+
+ATF_TC(pollts_sigmask);
+ATF_TC_HEAD(pollts_sigmask, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr",
+	    "Check that pollts(2) restores the signal mask (PR kern/44986)");
+}
+
+ATF_TC_BODY(pollts_sigmask, tc)
+{
+	int fd;
+	struct pollfd pfd;
+	struct timespec timeout;
+	sigset_t mask;
+	int ret;
+
+	fd = open(_PATH_DEVNULL, O_RDONLY);
+	ATF_REQUIRE(fd >= 0);
+
+	pfd.fd = fd;
+	pfd.events = POLLIN;
+
+	/* Use a timeout of 1 second. */
+	timeout.tv_sec = 1;
+	timeout.tv_nsec = 0;
+
+	/* Unblock all signals. */
+	ATF_REQUIRE_EQ(sigfillset(&mask), 0);
+	ATF_REQUIRE_EQ(sigprocmask(SIG_UNBLOCK, &mask, NULL), 0);
+
+	/*
+	 * Check that pollts(2) immediately returns. We block *all*
+	 * signals during pollts(2).
+	 */
+	ATF_REQUIRE_EQ_MSG(ret = pollts(&pfd, 1, &timeout, &mask), 1,
+	    "got: %d", ret);
+
+	/* Check that signals are now longer blocked. */
+	ATF_REQUIRE_EQ(sigprocmask(SIG_SETMASK, NULL, &mask), 0);
+	ATF_REQUIRE_EQ_MSG(sigismember(&mask, SIGUSR1), 0,
+	    "signal mask was changed.");
+
+	ATF_REQUIRE_EQ(close(fd), 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, poll_3way);
+	ATF_TP_ADD_TC(tp, poll_basic);
+	ATF_TP_ADD_TC(tp, poll_err);
+	ATF_TP_ADD_TC(tp, pollts_basic);
+	ATF_TP_ADD_TC(tp, pollts_err);
+	ATF_TP_ADD_TC(tp, pollts_sigmask);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_posix_fadvise.c b/contrib/netbsd-tests/lib/libc/sys/t_posix_fadvise.c
new file mode 100644
index 000000000000..da4e7461c8af
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_posix_fadvise.c
@@ -0,0 +1,165 @@
+/* $NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by YAMAMOTO Takashi.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2005 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $");
+
+#include <sys/fcntl.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+ATF_TC(posix_fadvise);
+ATF_TC_HEAD(posix_fadvise, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks posix_fadvise(2)");
+}
+
+ATF_TC(posix_fadvise_reg);
+ATF_TC_HEAD(posix_fadvise_reg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks posix_fadvise(2) "
+	    "for regular files");
+}
+
+ATF_TC_BODY(posix_fadvise, tc)
+{
+	int fd;
+	int pipe_fds[2];
+	int badfd = 10;
+	int ret;
+
+	RL(fd = open("/dev/null", O_RDWR));
+
+	(void)close(badfd);
+	RL(pipe(pipe_fds));
+
+	/*
+	 * it's hard to check if posix_fadvise is working properly.
+	 * only check return values here.
+	 */
+
+	/* posix_fadvise shouldn't affect errno. */
+
+#define CE(x, exp) \
+	do { \
+		int save = errno; \
+		errno = 999; \
+		ATF_CHECK_EQ_MSG(ret = (x), exp, "got: %d", ret); \
+		ATF_CHECK_EQ_MSG(errno, 999, "got: %s", strerror(errno)); \
+		errno = save; \
+	} while (0);
+
+	CE(posix_fadvise(fd, 0, 0, -1), EINVAL);
+	CE(posix_fadvise(pipe_fds[0], 0, 0, POSIX_FADV_NORMAL), ESPIPE);
+	CE(posix_fadvise(badfd, 0, 0, POSIX_FADV_NORMAL), EBADF);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_NORMAL), 0);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL), 0);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM), 0);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED), 0);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED), 0);
+	CE(posix_fadvise(fd, 0, 0, POSIX_FADV_NOREUSE), 0);
+}
+
+ATF_TC_BODY(posix_fadvise_reg, tc)
+{
+	int rfd, ret;
+
+	rump_init();
+	RL(rfd = rump_sys_open("/a_file", O_CREAT, 0666));
+
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_NORMAL), 0);
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_SEQUENTIAL), 0);
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_RANDOM), 0);
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_WILLNEED), 0);
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_NOREUSE), 0);
+
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_NORMAL), 0);
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_SEQUENTIAL), 0);
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_RANDOM), 0);
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_WILLNEED), 0);
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_NOREUSE), 0);
+
+	//atf_tc_expect_signal(-1, "http://mail-index.netbsd.org/source-changes-d/2010/11/11/msg002508.html");
+	CE(rump_sys_posix_fadvise(rfd,
+	    INT64_MAX-getpagesize(), getpagesize(), POSIX_FADV_DONTNEED), 0);
+	CE(rump_sys_posix_fadvise(rfd, 0, 0, POSIX_FADV_DONTNEED), 0);
+#undef CE
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, posix_fadvise);
+	ATF_TP_ADD_TC(tp, posix_fadvise_reg);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_recvmmsg.c b/contrib/netbsd-tests/lib/libc/sys/t_recvmmsg.c
new file mode 100644
index 000000000000..76bc7dde8e19
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_recvmmsg.c
@@ -0,0 +1,161 @@
+/*	$NetBSD: t_recvmmsg.c,v 1.1 2012/06/22 18:45:23 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill and Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_recvmmsg.c,v 1.1 2012/06/22 18:45:23 christos Exp $");
+
+#include <atf-c.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+
+#include <string.h>
+#include <time.h>
+#include <stdint.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sched.h>
+
+#define BUFSIZE	65536
+#define NPKTS	50
+
+#define min(a, b) ((a) < (b) ? (a) : (b))
+static int debug;
+
+
+ATF_TC(recvmmsg_basic);
+ATF_TC_HEAD(recvmmsg_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of recvmmsg(2)");
+}
+
+ATF_TC_BODY(recvmmsg_basic, tc)
+{
+	int fd[2], error, i, cnt;
+	uint8_t *buf;
+	struct mmsghdr *mmsghdr;
+	struct iovec *iov;
+	unsigned int mmsgcnt, n;
+	int status;
+	off_t off;
+	uint8_t DGRAM[1316] = { 0, 2, 3, 4, 5, 6, 7, 8, 9, };
+	
+	error = socketpair(AF_UNIX, SOCK_DGRAM, 0, fd);
+	ATF_REQUIRE_MSG(error != -1, "socketpair failed (%s)", strerror(errno));
+
+	buf = malloc(BUFSIZE);
+	ATF_REQUIRE_MSG(buf != NULL, "malloc failed (%s)", strerror(errno));
+
+	mmsgcnt = BUFSIZE / sizeof(DGRAM);
+	mmsghdr = malloc(sizeof(*mmsghdr) * mmsgcnt);
+	ATF_REQUIRE_MSG(mmsghdr != NULL, "malloc failed (%s)", strerror(errno));
+	iov = malloc(sizeof(*iov) * mmsgcnt);
+	ATF_REQUIRE_MSG(iov != NULL, "malloc failed (%s)", strerror(errno));
+
+	for (off = 0, n = 0; n < mmsgcnt; n++) {
+		iov[n].iov_base = buf + off;
+		iov[n].iov_len = sizeof(DGRAM);
+		off += iov[n].iov_len;
+		mmsghdr[n].msg_hdr.msg_iov = &iov[n];
+		mmsghdr[n].msg_hdr.msg_iovlen = 1;
+		mmsghdr[n].msg_hdr.msg_name = NULL;
+		mmsghdr[n].msg_hdr.msg_namelen = 0;
+	}
+
+	switch (fork()) {
+	case -1:
+		ATF_REQUIRE_MSG(0, "fork failed (%s)", strerror(errno));
+		break;
+
+	case 0:
+		n = NPKTS;
+		if (debug)
+		    printf("waiting for %u messages (max %u per syscall)\n", n,
+			mmsgcnt);
+		while (n > 0) {
+			struct timespec ts = { 1, 0 };
+			cnt = recvmmsg(fd[1], mmsghdr, min(mmsgcnt, n),
+			    MSG_WAITALL, &ts);
+			ATF_REQUIRE_MSG(cnt != -1, "recvmmsg failed (%s)",
+			    strerror(errno));
+			ATF_REQUIRE_MSG(cnt != 0, "recvmmsg timeout");
+			if (debug)
+				printf("recvmmsg: got %u messages\n", cnt);
+			for (i = 0; i < cnt; i++) {
+				ATF_CHECK_EQ_MSG(mmsghdr[i].msg_len,
+				    sizeof(DGRAM), "packet length");
+				ATF_CHECK_EQ_MSG(
+				    ((uint8_t *)iov[i].iov_base)[0],
+				    NPKTS - n + i, "packet contents");
+			}
+			n -= cnt;
+		}
+		if (debug)
+			printf("done!\n");
+		exit(0);
+		/*NOTREACHED*/
+	default:
+		sched_yield();
+
+		for (n = 0; n < NPKTS; n++) {
+			if (debug)
+				printf("sending packet %u/%u...\n", (n+1),
+				    NPKTS);
+			do {
+				DGRAM[0] = n;
+				error = send(fd[0], DGRAM, sizeof(DGRAM), 0);
+			} while (error == -1 && errno == ENOBUFS);
+			if (error == -1)
+				ATF_REQUIRE_MSG(error != -1, "send failed (%s)",
+				    strerror(errno));
+		}
+		error = wait(&status);
+		ATF_REQUIRE_MSG(error != -1, "wait failed (%s)",
+		    strerror(errno));
+		break;
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, recvmmsg_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_revoke.c b/contrib/netbsd-tests/lib/libc/sys/t_revoke.c
new file mode 100644
index 000000000000..10fd6d64a00b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_revoke.c
@@ -0,0 +1,186 @@
+/* $NetBSD: t_revoke.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_revoke.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
+
+#include <sys/resource.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char path[] = "revoke";
+
+ATF_TC_WITH_CLEANUP(revoke_basic);
+ATF_TC_HEAD(revoke_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of revoke(2)");
+}
+
+ATF_TC_BODY(revoke_basic, tc)
+{
+	struct rlimit res;
+	char tmp[10];
+	size_t i, n;
+	int *buf;
+
+	(void)memset(&res, 0, sizeof(struct rlimit));
+	(void)getrlimit(RLIMIT_NOFILE, &res);
+
+	if ((n = res.rlim_cur / 10) == 0)
+		n = 10;
+
+	buf = calloc(n, sizeof(int));
+	ATF_REQUIRE(buf != NULL);
+
+	buf[0] = open(path, O_RDWR | O_CREAT, 0600);
+	ATF_REQUIRE(buf[0] >= 0);
+
+	for (i = 1; i < n; i++) {
+		buf[i] = open(path, O_RDWR);
+		ATF_REQUIRE(buf[i] >= 0);
+	}
+
+	ATF_REQUIRE(revoke(path) == 0);
+
+	for (i = 0; i < n; i++) {
+
+		ATF_REQUIRE(read(buf[i], tmp, sizeof(tmp)) == -1);
+
+		(void)close(buf[i]);
+	}
+
+	free(buf);
+
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(revoke_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(revoke_err);
+ATF_TC_HEAD(revoke_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from revoke(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(revoke_err, tc)
+{
+	char buf[1024 + 1];	/* XXX: From the manual page... */
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, revoke((char *)-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, revoke(buf) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EPERM, revoke("/etc/passwd") == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, revoke("/etc/xxx/yyy") == -1);
+}
+
+ATF_TC_WITH_CLEANUP(revoke_perm);
+ATF_TC_HEAD(revoke_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions revoke(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(revoke_perm, tc)
+{
+	struct passwd *pw;
+	int fd, sta;
+	pid_t pid;
+
+	pw = getpwnam("nobody");
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(pw != NULL);
+	ATF_REQUIRE(revoke(path) == 0);
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		if (setuid(pw->pw_uid) != 0)
+			_exit(EXIT_FAILURE);
+
+		errno = 0;
+
+		if (revoke(path) == 0)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EACCES)
+			_exit(EXIT_FAILURE);
+
+		if (close(fd) != 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("revoke(2) did not obey permissions");
+
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(revoke_perm, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, revoke_basic);
+	ATF_TP_ADD_TC(tp, revoke_err);
+	ATF_TP_ADD_TC(tp, revoke_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_select.c b/contrib/netbsd-tests/lib/libc/sys/t_select.c
new file mode 100644
index 000000000000..4316acf133d9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_select.c
@@ -0,0 +1,215 @@
+/*	$NetBSD: t_select.c,v 1.3 2012/03/18 07:00:52 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundatiom
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <assert.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+#include <err.h>
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <atf-c.h>
+
+static sig_atomic_t keep_going = 1;
+
+static void
+sig_handler(int signum)
+{
+	keep_going = 0;
+}
+
+static void
+sigchld(int signum)
+{
+}
+
+static char
+xtoa(uint8_t n)
+{
+	static const char xarray[] = "0123456789abcdef";
+	assert(n < sizeof(xarray));
+	return xarray[n];
+}
+
+static const char *
+prmask(const sigset_t *m, char *buf, size_t len)
+{
+	size_t j = 2;
+	assert(len >= 3 + sizeof(*m));
+	buf[0] = '0';
+	buf[1] = 'x';
+#define N(p, a)	(((p) >> ((a) * 4)) & 0xf)
+	for (size_t i = __arraycount(m->__bits); i > 0; i--) {
+		uint32_t p = m->__bits[i - 1];
+		for (size_t k = sizeof(p); k > 0; k--)
+			buf[j++] = xtoa(N(p, k - 1));
+	}
+	buf[j] = '\0';
+	return buf;
+}
+
+static void
+child(const struct timespec *ts)
+{
+	struct sigaction sa;
+	sigset_t set, oset, nset;
+	char obuf[sizeof(oset) + 3], nbuf[sizeof(nset) + 3];
+	int fd;
+
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = sig_handler;
+	if ((fd = open("/dev/null", O_RDONLY)) == -1)
+		err(1, "open");
+
+	if (sigaction(SIGTERM, &sa, NULL) == -1)
+		err(1, "sigaction");
+
+	sigfillset(&set);
+	if (sigprocmask(SIG_BLOCK, &set, NULL) == -1)
+		err(1, "sigprocmask");
+
+	if (sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
+		err(1, "sigprocmask");
+
+	sigemptyset(&set);
+
+	for (;;) {
+		fd_set rset;
+		FD_ZERO(&rset);
+		FD_SET(fd, &rset);
+		if (pselect(1, &rset, NULL, NULL, ts, &set) == -1) {
+			if(errno == EINTR) {
+				if (!keep_going)
+					break;
+			}
+		}
+		if (ts)
+			break;
+	}
+	if (sigprocmask(SIG_BLOCK, NULL, &nset) == -1)
+		err(1, "sigprocmask");
+	if (memcmp(&oset, &nset, sizeof(oset)) != 0)
+		atf_tc_fail("pselect() masks don't match "
+		    "after timeout %s != %s",
+		    prmask(&nset, nbuf, sizeof(nbuf)),
+		    prmask(&oset, obuf, sizeof(obuf)));
+}
+
+ATF_TC(pselect_sigmask);
+ATF_TC_HEAD(pselect_sigmask, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pselect's temporary mask "
+	    "setting when a signal is received (PR lib/43625)");
+}
+
+ATF_TC_BODY(pselect_sigmask, tc)
+{
+	pid_t pid;
+	int status;
+
+	signal(SIGCHLD, sigchld);
+
+	switch (pid = fork()) {
+	case 0:
+		child(NULL);
+	case -1:
+		err(1, "fork");
+	default:
+		sleep(1);
+		if (kill(pid, SIGTERM) == -1)
+			err(1, "kill");
+		sleep(1);
+		switch (waitpid(pid, &status, WNOHANG)) {
+		case -1:
+			err(1, "wait");
+		case 0:
+			if (kill(pid, SIGKILL) == -1)
+				err(1, "kill");
+			atf_tc_fail("pselect() did not receive signal");
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+ATF_TC(pselect_timeout);
+ATF_TC_HEAD(pselect_timeout, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks pselect's temporary mask "
+	    "setting when a timeout occurs");
+}
+
+ATF_TC_BODY(pselect_timeout, tc)
+{
+	pid_t pid;
+	int status;
+	static const struct timespec zero = { 0, 0 };
+
+	signal(SIGCHLD, sigchld);
+
+	switch (pid = fork()) {
+	case 0:
+		child(&zero);
+		break;
+	case -1:
+		err(1, "fork");
+	default:
+		sleep(1);
+		switch (waitpid(pid, &status, WNOHANG)) {
+		case -1:
+			err(1, "wait");
+		case 0:
+			if (kill(pid, SIGKILL) == -1)
+				err(1, "kill");
+			atf_tc_fail("pselect() did not receive signal");
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pselect_sigmask);
+	ATF_TP_ADD_TC(tp, pselect_timeout);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
new file mode 100644
index 000000000000..c760cfbf59ea
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
@@ -0,0 +1,522 @@
+/* $NetBSD: t_setrlimit.c,v 1.4 2012/06/12 23:56:19 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_setrlimit.c,v 1.4 2012/06/12 23:56:19 christos Exp $");
+
+#include <sys/resource.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <lwp.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ucontext.h>
+#include <unistd.h>
+
+static void		 sighandler(int);
+static const char	 path[] = "setrlimit";
+
+static const int rlimit[] = {
+	RLIMIT_AS,
+	RLIMIT_CORE,
+	RLIMIT_CPU,
+	RLIMIT_DATA,
+	RLIMIT_FSIZE,
+	RLIMIT_MEMLOCK,
+	RLIMIT_NOFILE,
+	RLIMIT_NPROC,
+	RLIMIT_RSS,
+	RLIMIT_SBSIZE,
+	RLIMIT_STACK
+};
+
+ATF_TC(setrlimit_basic);
+ATF_TC_HEAD(setrlimit_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic soft limit test");
+}
+
+ATF_TC_BODY(setrlimit_basic, tc)
+{
+	struct rlimit res;
+	int *buf, lim;
+	size_t i;
+
+	buf = calloc(__arraycount(rlimit), sizeof(int));
+
+	if (buf == NULL)
+		atf_tc_fail("initialization failed");
+
+	for (i = lim = 0; i < __arraycount(rlimit); i++) {
+
+		(void)memset(&res, 0, sizeof(struct rlimit));
+
+		if (getrlimit(rlimit[i], &res) != 0)
+			continue;
+
+		if (res.rlim_cur == RLIM_INFINITY || res.rlim_cur == 0)
+			continue;
+
+		if (res.rlim_cur == res.rlim_max) /* An unprivileged run. */
+			continue;
+
+		buf[i] = res.rlim_cur;
+		res.rlim_cur = res.rlim_cur - 1;
+
+		if (setrlimit(rlimit[i], &res) != 0) {
+			lim = rlimit[i];
+			goto out;
+		}
+	}
+
+out:
+	for (i = 0; i < __arraycount(rlimit); i++) {
+
+		(void)memset(&res, 0, sizeof(struct rlimit));
+
+		if (buf[i] == 0)
+			continue;
+
+		if (getrlimit(rlimit[i], &res) != 0)
+			continue;
+
+		res.rlim_cur = buf[i];
+
+		(void)setrlimit(rlimit[i], &res);
+	}
+
+	if (lim != 0)
+		atf_tc_fail("failed to set limit (%d)", lim);
+}
+
+ATF_TC(setrlimit_current);
+ATF_TC_HEAD(setrlimit_current, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "setrlimit(3) with current limits");
+}
+
+ATF_TC_BODY(setrlimit_current, tc)
+{
+	struct rlimit res;
+	size_t i;
+
+	for (i = 0; i < __arraycount(rlimit); i++) {
+
+		(void)memset(&res, 0, sizeof(struct rlimit));
+
+		ATF_REQUIRE(getrlimit(rlimit[i], &res) == 0);
+		ATF_REQUIRE(setrlimit(rlimit[i], &res) == 0);
+	}
+}
+
+ATF_TC(setrlimit_err);
+ATF_TC_HEAD(setrlimit_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions");
+}
+
+ATF_TC_BODY(setrlimit_err, tc)
+{
+	struct rlimit res;
+	size_t i;
+
+	for (i = 0; i < __arraycount(rlimit); i++) {
+
+		errno = 0;
+
+		ATF_REQUIRE(getrlimit(rlimit[i], (void *)0) != 0);
+		ATF_REQUIRE(errno == EFAULT);
+	}
+
+	errno = 0;
+
+	ATF_REQUIRE(getrlimit(INT_MAX, &res) != 0);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC_WITH_CLEANUP(setrlimit_fsize);
+ATF_TC_HEAD(setrlimit_fsize, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_FSIZE");
+}
+
+ATF_TC_BODY(setrlimit_fsize, tc)
+{
+	struct rlimit res;
+	int fd, sta;
+	pid_t pid;
+
+	fd = open(path, O_RDWR | O_CREAT, 0700);
+
+	if (fd < 0)
+		atf_tc_fail("initialization failed");
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		res.rlim_cur = 2;
+		res.rlim_max = 2;
+
+		if (setrlimit(RLIMIT_FSIZE, &res) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (signal(SIGXFSZ, sighandler) == SIG_ERR)
+			_exit(EXIT_FAILURE);
+
+		/*
+		 * The third call should generate a SIGXFSZ.
+		 */
+		(void)write(fd, "X", 1);
+		(void)write(fd, "X", 1);
+		(void)write(fd, "X", 1);
+
+		_exit(EXIT_FAILURE);
+	}
+
+	(void)close(fd);
+	(void)wait(&sta);
+	(void)unlink(path);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("RLIMIT_FSIZE not enforced");
+}
+
+ATF_TC_CLEANUP(setrlimit_fsize, tc)
+{
+	(void)unlink(path);
+}
+
+static void
+sighandler(int signo)
+{
+
+	if (signo != SIGXFSZ)
+		_exit(EXIT_FAILURE);
+
+	_exit(EXIT_SUCCESS);
+}
+
+ATF_TC(setrlimit_memlock);
+ATF_TC_HEAD(setrlimit_memlock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_MEMLOCK");
+}
+
+ATF_TC_BODY(setrlimit_memlock, tc)
+{
+	struct rlimit res;
+	void *buf;
+	long page;
+	pid_t pid;
+	int sta;
+
+	page = sysconf(_SC_PAGESIZE);
+	ATF_REQUIRE(page >= 0);
+
+	buf = malloc(page);
+	pid = fork();
+
+	if (buf == NULL || pid < 0)
+		atf_tc_fail("initialization failed");
+
+	if (pid == 0) {
+
+		/*
+		 * Try to lock a page while
+		 * RLIMIT_MEMLOCK is zero.
+		 */
+		if (mlock(buf, page) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (munlock(buf, page) != 0)
+			_exit(EXIT_FAILURE);
+
+		res.rlim_cur = 0;
+		res.rlim_max = 0;
+
+		if (setrlimit(RLIMIT_MEMLOCK, &res) != 0)
+			_exit(EXIT_FAILURE);
+
+		if (mlock(buf, page) != 0)
+			_exit(EXIT_SUCCESS);
+
+		(void)munlock(buf, page);
+
+		_exit(EXIT_FAILURE);
+	}
+
+	free(buf);
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("RLIMIT_MEMLOCK not enforced");
+}
+
+ATF_TC(setrlimit_nofile_1);
+ATF_TC_HEAD(setrlimit_nofile_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_NOFILE, #1");
+}
+
+ATF_TC_BODY(setrlimit_nofile_1, tc)
+{
+	struct rlimit res;
+	int fd, i, rv, sta;
+	pid_t pid;
+
+	res.rlim_cur = 0;
+	res.rlim_max = 0;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * Close all descriptors, set RLIMIT_NOFILE
+		 * to zero, and try to open a random file.
+		 * This should fail with EMFILE.
+		 */
+		for (i = 0; i < 1024; i++)
+			(void)close(i);
+
+		rv = setrlimit(RLIMIT_NOFILE, &res);
+
+		if (rv != 0)
+			_exit(EXIT_FAILURE);
+
+		errno = 0;
+		fd = open("/etc/passwd", O_RDONLY);
+
+		if (fd >= 0 || errno != EMFILE)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("RLIMIT_NOFILE not enforced");
+}
+
+ATF_TC(setrlimit_nofile_2);
+ATF_TC_HEAD(setrlimit_nofile_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_NOFILE, #2");
+}
+
+ATF_TC_BODY(setrlimit_nofile_2, tc)
+{
+	static const rlim_t lim = 12;
+	struct rlimit res;
+	int fd, i, rv, sta;
+	pid_t pid;
+
+	/*
+	 * See that an arbitrary limit on
+	 * open files is being enforced.
+	 */
+	res.rlim_cur = lim;
+	res.rlim_max = lim;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		for (i = 0; i < 1024; i++)
+			(void)close(i);
+
+		rv = setrlimit(RLIMIT_NOFILE, &res);
+
+		if (rv != 0)
+			_exit(EXIT_FAILURE);
+
+		for (i = 0; i < (int)lim; i++) {
+
+			fd = open("/etc/passwd", O_RDONLY);
+
+			if (fd < 0)
+				_exit(EXIT_FAILURE);
+		}
+
+		/*
+		 * After the limit has been reached,
+		 * EMFILE should again follow.
+		 */
+		fd = open("/etc/passwd", O_RDONLY);
+
+		if (fd >= 0 || errno != EMFILE)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("RLIMIT_NOFILE not enforced");
+}
+
+ATF_TC(setrlimit_nproc);
+ATF_TC_HEAD(setrlimit_nproc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_NPROC");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setrlimit_nproc, tc)
+{
+	struct rlimit res;
+	pid_t pid, cpid;
+	int sta;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * Set RLIMIT_NPROC to zero and try to fork.
+		 */
+		res.rlim_cur = 0;
+		res.rlim_max = 0;
+
+		if (setrlimit(RLIMIT_NPROC, &res) != 0)
+			_exit(EXIT_FAILURE);
+
+		cpid = fork();
+
+		if (cpid < 0)
+			_exit(EXIT_SUCCESS);
+
+		_exit(EXIT_FAILURE);
+	}
+
+	(void)waitpid(pid, &sta, 0);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("RLIMIT_NPROC not enforced");
+}
+
+ATF_TC(setrlimit_nthr);
+ATF_TC_HEAD(setrlimit_nthr, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2), RLIMIT_NTHR");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+static void
+func(lwpid_t *id)
+{
+	printf("thread %d\n", *id);
+	fflush(stdout);
+	_lwp_exit();
+}
+
+ATF_TC_BODY(setrlimit_nthr, tc)
+{
+	struct rlimit res;
+	lwpid_t lwpid;
+	ucontext_t c;
+
+	/*
+	 * Set RLIMIT_NTHR to zero and try to create a thread.
+	 */
+	res.rlim_cur = 0;
+	res.rlim_max = 0;
+	ATF_REQUIRE(setrlimit(RLIMIT_NTHR, &res) == 0);
+	ATF_REQUIRE(getcontext(&c) == 0);
+	c.uc_link = NULL;
+	sigemptyset(&c.uc_sigmask);
+	c.uc_stack.ss_flags = 0;
+	c.uc_stack.ss_size = 4096;
+	ATF_REQUIRE((c.uc_stack.ss_sp = malloc(c.uc_stack.ss_size)) != NULL);
+	makecontext(&c, func, 1, &lwpid);
+	ATF_CHECK_ERRNO(EAGAIN, _lwp_create(&c, 0, &lwpid) == -1);
+}
+
+ATF_TC(setrlimit_perm);
+ATF_TC_HEAD(setrlimit_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setrlimit(2) for EPERM");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setrlimit_perm, tc)
+{
+	struct rlimit res;
+	size_t i;
+
+	/*
+	 * Try to raise the maximum limits as an user.
+	 */
+	for (i = 0; i < __arraycount(rlimit); i++) {
+
+		ATF_REQUIRE(getrlimit(rlimit[i], &res) == 0);
+
+		if (res.rlim_max == UINT64_MAX) /* Overflow. */
+			continue;
+
+		errno = 0;
+		res.rlim_max = res.rlim_max + 1;
+
+		ATF_CHECK_ERRNO(EPERM, setrlimit(rlimit[i], &res) != 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, setrlimit_basic);
+	ATF_TP_ADD_TC(tp, setrlimit_current);
+	ATF_TP_ADD_TC(tp, setrlimit_err);
+	ATF_TP_ADD_TC(tp, setrlimit_fsize);
+	ATF_TP_ADD_TC(tp, setrlimit_memlock);
+	ATF_TP_ADD_TC(tp, setrlimit_nofile_1);
+	ATF_TP_ADD_TC(tp, setrlimit_nofile_2);
+	ATF_TP_ADD_TC(tp, setrlimit_nproc);
+	ATF_TP_ADD_TC(tp, setrlimit_perm);
+	ATF_TP_ADD_TC(tp, setrlimit_nthr);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_setuid.c b/contrib/netbsd-tests/lib/libc/sys/t_setuid.c
new file mode 100644
index 000000000000..d2bf523f4cf4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_setuid.c
@@ -0,0 +1,122 @@
+/* $NetBSD: t_setuid.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_setuid.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+ATF_TC(setuid_perm);
+ATF_TC_HEAD(setuid_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setuid(0) as normal user");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setuid_perm, tc)
+{
+	errno = 0;
+
+	ATF_REQUIRE(setuid(0) == -1);
+	ATF_REQUIRE(errno == EPERM);
+}
+
+ATF_TC(setuid_real);
+ATF_TC_HEAD(setuid_real, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test setuid(2) with real UID");
+}
+
+ATF_TC_BODY(setuid_real, tc)
+{
+	uid_t uid = getuid();
+
+	ATF_REQUIRE(setuid(uid) == 0);
+
+	ATF_REQUIRE(getuid() == uid);
+	ATF_REQUIRE(geteuid() == uid);
+}
+
+ATF_TC(setuid_root);
+ATF_TC_HEAD(setuid_root, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of setuid(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(setuid_root, tc)
+{
+	struct passwd *pw;
+	int rv, sta;
+	pid_t pid;
+	uid_t uid;
+
+	while ((pw = getpwent()) != NULL) {
+
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		if (pid == 0) {
+
+			rv = setuid(pw->pw_uid);
+
+			if (rv != 0)
+				_exit(EXIT_FAILURE);
+
+			uid = getuid();
+
+			if (uid != pw->pw_uid)
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+			atf_tc_fail("failed to change UID to %u", pw->pw_uid);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, setuid_perm);
+	ATF_TP_ADD_TC(tp, setuid_real);
+	ATF_TP_ADD_TC(tp, setuid_root);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c b/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
new file mode 100644
index 000000000000..8022353367e6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
@@ -0,0 +1,154 @@
+/* $NetBSD: t_sigaction.c,v 1.2 2012/11/07 16:51:16 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sigaction.c,v 1.2 2012/11/07 16:51:16 pgoyette Exp $");
+
+#include <sys/wait.h>
+
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include "../../../h_macros.h"
+
+static bool handler_called = false;
+
+static void
+handler(int signo)
+{
+    handler_called = true;
+}
+
+static void
+sa_resethand_child(const int flags)
+{
+    struct sigaction sa;
+
+    sa.sa_flags = flags;
+    sa.sa_handler = &handler;
+    sigemptyset(&sa.sa_mask);
+
+    sigaction(SIGUSR1, &sa, NULL);
+    kill(getpid(), SIGUSR1);
+    exit(handler_called ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+
+static void
+wait_and_check_child(const pid_t pid, const char *fail_message)
+{
+	int status;
+
+	(void)waitpid(pid, &status, 0);
+
+	if (WIFEXITED(status))
+		ATF_CHECK_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+	else
+		atf_tc_fail("%s; raw exit status was %d", fail_message, status);
+}
+
+static void
+catch(int sig)
+{
+	return;
+}
+
+ATF_TC(sigaction_basic);
+ATF_TC_HEAD(sigaction_basic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks for correct I&D cache"
+	    "synchronization after copying out the trampoline code.");
+}
+
+ATF_TC_BODY(sigaction_basic, tc)
+{
+	static struct sigaction sa;
+
+	sa.sa_handler = catch;
+
+	sigaction(SIGUSR1, &sa, 0);
+	kill(getpid(), SIGUSR1);
+	atf_tc_pass();
+}
+
+ATF_TC(sigaction_noflags);
+ATF_TC_HEAD(sigaction_noflags, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks programming a signal with "
+	    "sigaction(2) but without any flags");
+}
+
+ATF_TC_BODY(sigaction_noflags, tc)
+{
+	const pid_t pid = fork();
+	if (pid == -1)
+		atf_tc_fail_errno("fork(2) failed");
+	else if (pid == 0)
+		sa_resethand_child(0);
+	else
+		wait_and_check_child(pid, "Child process did not exit cleanly;"
+		    " it failed to process the signal");
+}
+
+ATF_TC(sigaction_resethand);
+ATF_TC_HEAD(sigaction_resethand, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that SA_RESETHAND works");
+}
+
+ATF_TC_BODY(sigaction_resethand, tc)
+{
+	const pid_t pid = fork();
+	if (pid == -1)
+		atf_tc_fail_errno("fork(2) failed");
+	else if (pid == 0)
+		sa_resethand_child(SA_RESETHAND);
+	else {
+		wait_and_check_child(pid, "Child process did not exit cleanly;"
+		    " it either failed to process the signal or SA_RESETHAND"
+		    " is broken");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sigaction_basic);
+	ATF_TP_ADD_TC(tp, sigaction_noflags);
+	ATF_TP_ADD_TC(tp, sigaction_resethand);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c b/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c
new file mode 100644
index 000000000000..f9e0c6368df7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c
@@ -0,0 +1,103 @@
+/* $NetBSD: t_sigqueue.c,v 1.4 2011/07/07 16:31:11 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sigqueue.c,v 1.4 2011/07/07 16:31:11 jruoho Exp $");
+
+
+#include <atf-c.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <sched.h>
+#include <unistd.h>
+
+static void	handler(int, siginfo_t *, void *);
+
+#define VALUE (int)0xc001dad1
+static int value;
+
+static void
+handler(int signo, siginfo_t *info, void *data)
+{
+	value = info->si_value.sival_int;
+	kill(0, SIGINFO);
+}
+
+ATF_TC(sigqueue_basic);
+ATF_TC_HEAD(sigqueue_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks sigqueue(3) sigval delivery");
+}
+
+ATF_TC_BODY(sigqueue_basic, tc)
+{
+	struct sigaction sa;
+	union sigval sv;
+
+	sa.sa_sigaction = handler;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_flags = SA_SIGINFO;
+
+	if (sigaction(SIGUSR1, &sa, NULL) != 0)
+		atf_tc_fail("sigaction failed");
+
+	sv.sival_int = VALUE;
+
+	if (sigqueue(0, SIGUSR1, sv) != 0)
+		atf_tc_fail("sigqueue failed");
+
+	sched_yield();
+	ATF_REQUIRE_EQ(sv.sival_int, value);
+}
+
+ATF_TC(sigqueue_err);
+ATF_TC_HEAD(sigqueue_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from sigqueue(3)");
+}
+
+ATF_TC_BODY(sigqueue_err, tc)
+{
+	union sigval sv;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, sigqueue(getpid(), -1, sv) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sigqueue_basic);
+	ATF_TP_ADD_TC(tp, sigqueue_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_sigtimedwait.c b/contrib/netbsd-tests/lib/libc/sys/t_sigtimedwait.c
new file mode 100644
index 000000000000..64b68d9a0607
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_sigtimedwait.c
@@ -0,0 +1,126 @@
+/* $NetBSD: t_sigtimedwait.c,v 1.2 2013/03/08 23:18:00 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sigtimedwait.c,v 1.2 2013/03/08 23:18:00 martin Exp $");
+
+#include <sys/time.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <atf-c.h>
+
+
+ATF_TC(sigtimedwait_all0timeout);
+
+ATF_TC_HEAD(sigtimedwait_all0timeout, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr", "Test for PR kern/47625: sigtimedwait"
+	    " with a timeout value of all zero should return imediately");
+}
+
+ATF_TC_BODY(sigtimedwait_all0timeout, tc)
+{
+	sigset_t block;
+	struct timespec ts, before, after, len;
+	siginfo_t info;
+	int r;
+
+	sigemptyset(&block);
+	ts.tv_sec = 0;
+	ts.tv_nsec = 0;
+	clock_gettime(CLOCK_MONOTONIC, &before);
+	r = sigtimedwait(&block, &info, &ts);
+	clock_gettime(CLOCK_MONOTONIC, &after);
+	ATF_REQUIRE(r == -1);
+	ATF_REQUIRE_ERRNO(EAGAIN, errno);
+	timespecsub(&after, &before, &len);
+	ATF_REQUIRE(len.tv_sec < 1);
+}
+
+ATF_TC(sigtimedwait_NULL_timeout);
+
+ATF_TC_HEAD(sigtimedwait_NULL_timeout, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr", "Test sigtimedwait() without timeout");
+}
+
+ATF_TC_BODY(sigtimedwait_NULL_timeout, tc)
+{
+	sigset_t sig;
+	siginfo_t info;
+	struct itimerval it;
+	int r;
+
+	/* arrange for a SIGALRM signal in a few seconds */
+	memset(&it, 0, sizeof it);
+	it.it_value.tv_sec = 5;
+	ATF_REQUIRE(setitimer(ITIMER_REAL, &it, NULL) == 0);
+
+	/* wait without timeout */
+	sigemptyset(&sig);
+	sigaddset(&sig, SIGALRM);
+	r = sigtimedwait(&sig, &info, NULL);
+	ATF_REQUIRE(r == SIGALRM);
+}
+
+ATF_TC(sigtimedwait_small_timeout);
+
+ATF_TC_HEAD(sigtimedwait_small_timeout, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "15");
+	atf_tc_set_md_var(tc, "descr", "Test sigtimedwait with a small "
+	    "timeout");
+}
+
+ATF_TC_BODY(sigtimedwait_small_timeout, tc)
+{
+	sigset_t block;
+	struct timespec ts;
+	siginfo_t info;
+	int r;
+
+	sigemptyset(&block);
+	ts.tv_sec = 5;
+	ts.tv_nsec = 0;
+	r = sigtimedwait(&block, &info, &ts);
+	ATF_REQUIRE(r == -1);
+	ATF_REQUIRE_ERRNO(EAGAIN, errno);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sigtimedwait_all0timeout);
+	ATF_TP_ADD_TC(tp, sigtimedwait_NULL_timeout);
+	ATF_TP_ADD_TC(tp, sigtimedwait_small_timeout);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c b/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c
new file mode 100644
index 000000000000..532629c3998d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c
@@ -0,0 +1,137 @@
+/* $NetBSD: t_socketpair.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_socketpair.c,v 1.1 2011/11/05 18:19:02 jruoho Exp $");
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+
+static void
+connected(int fd)
+{
+	struct sockaddr_un addr;
+	socklen_t len = (socklen_t)sizeof(addr);
+	ATF_REQUIRE(getpeername(fd, (struct sockaddr*)(void *)&addr,
+	    &len) == 0);
+}
+
+static void
+run(int flags)
+{
+	int fd[2], i;
+
+	while ((i = open("/", O_RDONLY)) < 3)
+		ATF_REQUIRE(i != -1);
+
+	ATF_REQUIRE(fcntl(3, F_CLOSEM) != -1);
+
+	ATF_REQUIRE(socketpair(AF_UNIX, SOCK_DGRAM | flags, 0, fd) == 0);
+
+	ATF_REQUIRE(fd[0] == 3);
+	ATF_REQUIRE(fd[1] == 4);
+
+	connected(fd[0]);
+	connected(fd[1]);
+
+	if (flags & SOCK_CLOEXEC) {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) != 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) != 0);
+	} else {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) == 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) == 0);
+	}
+
+	if (flags & SOCK_NONBLOCK) {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) != 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) != 0);
+	} else {
+		ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) == 0);
+		ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) == 0);
+	}
+
+	ATF_REQUIRE(close(fd[0]) != -1);
+	ATF_REQUIRE(close(fd[1]) != -1);
+}
+
+ATF_TC(socketpair_basic);
+ATF_TC_HEAD(socketpair_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of socketpair(2)");
+}
+
+ATF_TC_BODY(socketpair_basic, tc)
+{
+	run(0);
+}
+
+ATF_TC(socketpair_nonblock);
+ATF_TC_HEAD(socketpair_nonblock, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A non-blocking test of socketpair(2)");
+}
+
+ATF_TC_BODY(socketpair_nonblock, tc)
+{
+	run(SOCK_NONBLOCK);
+}
+
+ATF_TC(socketpair_cloexec);
+ATF_TC_HEAD(socketpair_cloexec, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A close-on-exec of socketpair(2)");
+}
+
+ATF_TC_BODY(socketpair_cloexec, tc)
+{
+	run(SOCK_CLOEXEC);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, socketpair_basic);
+	ATF_TP_ADD_TC(tp, socketpair_nonblock);
+	ATF_TP_ADD_TC(tp, socketpair_cloexec);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_stat.c b/contrib/netbsd-tests/lib/libc/sys/t_stat.c
new file mode 100644
index 000000000000..0312e2f2f6db
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_stat.c
@@ -0,0 +1,417 @@
+/* $NetBSD: t_stat.c,v 1.4 2012/03/17 08:37:08 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_stat.c,v 1.4 2012/03/17 08:37:08 jruoho Exp $");
+
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <arpa/inet.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <fts.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <stdio.h>
+
+static const char *path = "stat";
+
+ATF_TC_WITH_CLEANUP(stat_chflags);
+ATF_TC_HEAD(stat_chflags, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test chflags(2) with stat(2)");
+}
+
+ATF_TC_BODY(stat_chflags, tc)
+{
+	struct stat sa, sb;
+	int fd;
+
+	(void)memset(&sa, 0, sizeof(struct stat));
+	(void)memset(&sb, 0, sizeof(struct stat));
+
+	fd = open(path, O_RDONLY | O_CREAT);
+
+	ATF_REQUIRE(fd != -1);
+	ATF_REQUIRE(stat(path, &sa) == 0);
+	ATF_REQUIRE(chflags(path, UF_NODUMP) == 0);
+	ATF_REQUIRE(stat(path, &sb) == 0);
+
+	if (sa.st_flags == sb.st_flags)
+		atf_tc_fail("stat(2) did not detect chflags(2)");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(stat_chflags, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(stat_dir);
+ATF_TC_HEAD(stat_dir, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test stat(2) with directories");
+}
+
+ATF_TC_BODY(stat_dir, tc)
+{
+	const short depth = 2;
+	struct stat sa, sb;
+	char *argv[2];
+	FTSENT *ftse;
+	FTS *fts;
+	int ops;
+
+	argv[1] = NULL;
+	argv[0] = __UNCONST("/");
+
+	ops = FTS_NOCHDIR;
+	ops |= FTS_PHYSICAL;
+
+	fts = fts_open(argv, ops, NULL);
+	ATF_REQUIRE(fts != NULL);
+
+	while ((ftse = fts_read(fts)) != NULL) {
+
+		if (ftse->fts_level < 1)
+			continue;
+
+		if (ftse->fts_level > depth) {
+			(void)fts_set(fts, ftse, FTS_SKIP);
+			continue;
+		}
+
+		switch(ftse->fts_info) {
+
+		case FTS_DP:
+
+			(void)memset(&sa, 0, sizeof(struct stat));
+			(void)memset(&sb, 0, sizeof(struct stat));
+
+			ATF_REQUIRE(stat(ftse->fts_parent->fts_path,&sa) == 0);
+			ATF_REQUIRE(chdir(ftse->fts_path) == 0);
+			ATF_REQUIRE(stat(".", &sb) == 0);
+
+			/*
+			 * The previous two stat(2) calls
+			 * should be for the same directory.
+			 */
+			if (sa.st_dev != sb.st_dev || sa.st_ino != sb.st_ino)
+				atf_tc_fail("inconsistent stat(2)");
+
+			/*
+			 * Check that fts(3)'s stat(2)
+			 * call equals the manual one.
+			 */
+			if (sb.st_ino != ftse->fts_statp->st_ino)
+				atf_tc_fail("stat(2) and fts(3) differ");
+
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	(void)fts_close(fts);
+}
+
+ATF_TC(stat_err);
+ATF_TC_HEAD(stat_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from the stat(2) family");
+}
+
+ATF_TC_BODY(stat_err, tc)
+{
+	char buf[NAME_MAX + 1];
+	struct stat st;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, fstat(-1, &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, stat(buf, &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, lstat(buf, &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, stat((void *)-1, &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, lstat((void *)-1, &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, stat("/etc/passwd", (void *)-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, lstat("/etc/passwd", (void *)-1) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, stat("/a/b/c/d/e/f/g/h/i/j/k", &st) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, lstat("/a/b/c/d/e/f/g/h/i/j/k", &st) == -1);
+}
+
+ATF_TC_WITH_CLEANUP(stat_mtime);
+ATF_TC_HEAD(stat_mtime, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test modification times with stat(2)");
+}
+
+ATF_TC_BODY(stat_mtime, tc)
+{
+	struct stat sa, sb;
+	int fd[3];
+	size_t i;
+
+	for (i = 0; i < __arraycount(fd); i++) {
+
+		(void)memset(&sa, 0, sizeof(struct stat));
+		(void)memset(&sb, 0, sizeof(struct stat));
+
+		fd[i] = open(path, O_WRONLY | O_CREAT);
+
+		ATF_REQUIRE(fd[i] != -1);
+		ATF_REQUIRE(write(fd[i], "X", 1) == 1);
+		ATF_REQUIRE(stat(path, &sa) == 0);
+
+		(void)sleep(1);
+
+		ATF_REQUIRE(write(fd[i], "X", 1) == 1);
+		ATF_REQUIRE(stat(path, &sb) == 0);
+
+		ATF_REQUIRE(close(fd[i]) == 0);
+		ATF_REQUIRE(unlink(path) == 0);
+
+		if (sa.st_mtime == sb.st_mtime)
+			atf_tc_fail("mtimes did not change");
+	}
+}
+
+ATF_TC_CLEANUP(stat_mtime, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(stat_perm);
+ATF_TC_HEAD(stat_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with stat(2)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(stat_perm, tc)
+{
+	struct stat sa, sb;
+	gid_t gid;
+	uid_t uid;
+	int fd;
+
+	(void)memset(&sa, 0, sizeof(struct stat));
+	(void)memset(&sb, 0, sizeof(struct stat));
+
+	uid = getuid();
+	gid = getgid();
+
+	fd = open(path, O_RDONLY | O_CREAT);
+
+	ATF_REQUIRE(fd != -1);
+	ATF_REQUIRE(fstat(fd, &sa) == 0);
+	ATF_REQUIRE(stat(path, &sb) == 0);
+
+	if (gid != sa.st_gid || sa.st_gid != sb.st_gid)
+		atf_tc_fail("invalid GID");
+
+	if (uid != sa.st_uid || sa.st_uid != sb.st_uid)
+		atf_tc_fail("invalid UID");
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(stat_perm, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(stat_size);
+ATF_TC_HEAD(stat_size, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test file sizes with stat(2)");
+}
+
+ATF_TC_BODY(stat_size, tc)
+{
+	struct stat sa, sb, sc;
+	const size_t n = 10;
+	size_t i;
+	int fd;
+
+	fd = open(path, O_WRONLY | O_CREAT);
+	ATF_REQUIRE(fd >= 0);
+
+	for (i = 0; i < n; i++) {
+
+		(void)memset(&sa, 0, sizeof(struct stat));
+		(void)memset(&sb, 0, sizeof(struct stat));
+		(void)memset(&sc, 0, sizeof(struct stat));
+
+		ATF_REQUIRE(fstat(fd, &sa) == 0);
+		ATF_REQUIRE(write(fd, "X", 1) == 1);
+		ATF_REQUIRE(fstat(fd, &sb) == 0);
+		ATF_REQUIRE(stat(path, &sc) == 0);
+
+		if (sa.st_size + 1 != sb.st_size)
+			atf_tc_fail("invalid file size");
+
+		if (sb.st_size != sc.st_size)
+			atf_tc_fail("stat(2) and fstat(2) mismatch");
+	}
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(stat_size, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(stat_socket);
+ATF_TC_HEAD(stat_socket, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test fstat(2) with "
+	    "a socket (PR kern/46077)");
+}
+
+ATF_TC_BODY(stat_socket, tc)
+{
+	struct sockaddr_in addr;
+	struct stat st;
+	uint32_t iaddr;
+	int fd, flags;
+
+	(void)memset(&st, 0, sizeof(struct stat));
+	(void)memset(&addr, 0, sizeof(struct sockaddr_in));
+
+	fd = socket(AF_INET, SOCK_STREAM, 0);
+	ATF_REQUIRE(fd >= 0);
+
+	flags = fcntl(fd, F_GETFL);
+
+	ATF_REQUIRE(flags != -1);
+	ATF_REQUIRE(fcntl(fd, F_SETFL, flags | O_NONBLOCK) != -1);
+	ATF_REQUIRE(inet_pton(AF_INET, "127.0.0.1", &iaddr) == 1);
+
+	addr.sin_port = htons(42);
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = iaddr;
+
+	errno = 0;
+
+	ATF_REQUIRE_ERRNO(EINPROGRESS,
+	    connect(fd, (struct sockaddr *)&addr,
+		sizeof(struct sockaddr_in)) == -1);
+
+	errno = 0;
+
+	if (fstat(fd, &st) != 0 || errno != 0)
+		atf_tc_fail("fstat(2) failed for a EINPROGRESS socket");
+
+	(void)close(fd);
+}
+
+ATF_TC_WITH_CLEANUP(stat_symlink);
+ATF_TC_HEAD(stat_symlink, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test symbolic links with stat(2)");
+}
+
+ATF_TC_BODY(stat_symlink, tc)
+{
+	const char *pathlink = "pathlink";
+	struct stat sa, sb;
+	int fd;
+
+	(void)memset(&sa, 0, sizeof(struct stat));
+	(void)memset(&sb, 0, sizeof(struct stat));
+
+	fd = open(path, O_WRONLY | O_CREAT);
+
+	ATF_REQUIRE(fd >= 0);
+	ATF_REQUIRE(symlink(path, pathlink) == 0);
+	ATF_REQUIRE(stat(pathlink, &sa) == 0);
+	ATF_REQUIRE(lstat(pathlink, &sb) == 0);
+
+	if (S_ISLNK(sa.st_mode) != 0)
+		atf_tc_fail("stat(2) detected symbolic link");
+
+	if (S_ISLNK(sb.st_mode) == 0)
+		atf_tc_fail("lstat(2) did not detect symbolic link");
+
+	if (sa.st_mode == sb.st_mode)
+		atf_tc_fail("inconsistencies between stat(2) and lstat(2)");
+
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(unlink(pathlink) == 0);
+}
+
+ATF_TC_CLEANUP(stat_symlink, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, stat_chflags);
+	ATF_TP_ADD_TC(tp, stat_dir);
+	ATF_TP_ADD_TC(tp, stat_err);
+	ATF_TP_ADD_TC(tp, stat_mtime);
+	ATF_TP_ADD_TC(tp, stat_perm);
+	ATF_TP_ADD_TC(tp, stat_size);
+	ATF_TP_ADD_TC(tp, stat_socket);
+	ATF_TP_ADD_TC(tp, stat_symlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_swapcontext.c b/contrib/netbsd-tests/lib/libc/sys/t_swapcontext.c
new file mode 100644
index 000000000000..de36c8807dce
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_swapcontext.c
@@ -0,0 +1,133 @@
+/* $NetBSD: t_swapcontext.c,v 1.3 2013/05/05 10:28:11 skrll Exp $ */
+
+/*
+ * Copyright (c) 2012 Emmanuel Dreyfus. All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD");
+
+#include <ucontext.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <lwp.h>
+
+#include <atf-c.h>
+
+#define STACKSIZE 65536
+
+char stack[STACKSIZE];
+ucontext_t nctx;
+ucontext_t octx;
+void *otls;
+void *ntls;
+int val1, val2;
+int alter_tlsbase;
+
+/* ARGSUSED0 */
+static void
+swapfunc(void *arg)
+{
+	ntls = _lwp_getprivate();
+	printf("after swapcontext TLS pointer = %p\n", ntls);
+
+	if (alter_tlsbase) {
+		ATF_REQUIRE_EQ(ntls, &val1);
+		printf("TLS pointer modified by swapcontext()\n");
+	} else {
+		ATF_REQUIRE_EQ(ntls, &val2);
+		printf("TLS pointer left untouched by swapcontext()\n");
+	}
+
+	/* Go back in main */
+	ATF_REQUIRE(swapcontext(&nctx, &octx));
+
+	/* NOTREACHED */
+	return;
+}
+
+static void
+mainfunc(void)
+{
+	printf("Testing if swapcontext() alters TLS pointer if _UC_TLSBASE "
+	       "is %s\n", (alter_tlsbase) ? "left set" : "cleared");
+
+	_lwp_setprivate(&val1);
+	printf("before swapcontext TLS pointer = %p\n", &val1);
+
+	ATF_REQUIRE(getcontext(&nctx) == 0);
+
+	nctx.uc_stack.ss_sp = stack;
+	nctx.uc_stack.ss_size = sizeof(stack);
+
+#ifndef _UC_TLSBASE
+	ATF_REQUIRE_MSG(0, "_UC_TLSBASE is not defined");
+#else /* _UC_TLSBASE */
+	ATF_REQUIRE(nctx.uc_flags & _UC_TLSBASE);
+	if (!alter_tlsbase)
+		nctx.uc_flags &= ~_UC_TLSBASE;
+#endif /* _UC_TLSBASE */
+
+	makecontext(&nctx, swapfunc, 0);
+
+	_lwp_setprivate(&val2);
+	otls = _lwp_getprivate();
+	printf("before swapcontext TLS pointer = %p\n", otls);
+	ATF_REQUIRE(swapcontext(&octx, &nctx) == 0);
+
+	printf("Test completed\n");
+}
+
+
+ATF_TC(swapcontext1);
+ATF_TC_HEAD(swapcontext1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Testing if swapcontext() can let "
+	    "TLS pointer untouched");
+}
+ATF_TC_BODY(swapcontext1, tc)
+{
+	alter_tlsbase = 0;
+	mainfunc();
+}
+
+ATF_TC(swapcontext2);
+ATF_TC_HEAD(swapcontext2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Testing if swapcontext() can "
+	    "modify TLS pointer");
+}
+ATF_TC_BODY(swapcontext2, tc)
+{
+	alter_tlsbase = 1;
+	mainfunc();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, swapcontext1);
+	ATF_TP_ADD_TC(tp, swapcontext2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c b/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c
new file mode 100644
index 000000000000..ce1fb99eb1ad
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c
@@ -0,0 +1,207 @@
+/*	$NetBSD: t_timer_create.c,v 1.4 2012/03/18 07:00:52 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+static timer_t t;
+static bool fail = true;
+
+static void
+timer_signal_handler(int signo, siginfo_t *si, void *osi)
+{
+	timer_t *tp;
+
+	tp = si->si_value.sival_ptr;
+
+	if (*tp == t && signo == SIGALRM)
+		fail = false;
+
+	(void)fprintf(stderr, "%s: %s\n", __func__, strsignal(signo));
+}
+
+static void
+timer_signal_create(clockid_t cid, bool expire)
+{
+	struct itimerspec tim;
+	struct sigaction act;
+	struct sigevent evt;
+	sigset_t set;
+
+	t = 0;
+	fail = true;
+
+	(void)memset(&evt, 0, sizeof(struct sigevent));
+	(void)memset(&act, 0, sizeof(struct sigaction));
+	(void)memset(&tim, 0, sizeof(struct itimerspec));
+
+	/*
+	 * Set handler.
+	 */
+	act.sa_flags = SA_SIGINFO;
+	act.sa_sigaction = timer_signal_handler;
+
+	ATF_REQUIRE(sigemptyset(&set) == 0);
+	ATF_REQUIRE(sigemptyset(&act.sa_mask) == 0);
+
+	/*
+	 * Block SIGALRM while configuring the timer.
+	 */
+	ATF_REQUIRE(sigaction(SIGALRM, &act, NULL) == 0);
+	ATF_REQUIRE(sigaddset(&set, SIGALRM) == 0);
+	ATF_REQUIRE(sigprocmask(SIG_SETMASK, &set, NULL) == 0);
+
+	/*
+	 * Create the timer (SIGEV_SIGNAL).
+	 */
+	evt.sigev_signo = SIGALRM;
+	evt.sigev_value.sival_ptr = &t;
+	evt.sigev_notify = SIGEV_SIGNAL;
+
+	ATF_REQUIRE(timer_create(cid, &evt, &t) == 0);
+
+	/*
+	 * Start the timer. After this, unblock the signal.
+	 */
+	tim.it_value.tv_sec = expire ? 5 : 1;
+	tim.it_value.tv_nsec = 0;
+
+	ATF_REQUIRE(timer_settime(t, 0, &tim, NULL) == 0);
+
+	(void)sigprocmask(SIG_UNBLOCK, &set, NULL);
+	(void)sleep(2);
+
+	if (expire) {
+		if (!fail)
+			atf_tc_fail("timer fired too soon");
+	} else {
+		if (fail)
+			atf_tc_fail("timer failed to fire");
+	}
+
+	ATF_REQUIRE(timer_delete(t) == 0);
+}
+
+ATF_TC(timer_create_err);
+ATF_TC_HEAD(timer_create_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Check errors from timer_create(2) (PR lib/42434");
+}
+
+ATF_TC_BODY(timer_create_err, tc)
+{
+	struct sigevent ev;
+
+	(void)memset(&ev, 0, sizeof(struct sigevent));
+
+	errno = 0;
+	ev.sigev_signo = -1;
+	ev.sigev_notify = SIGEV_SIGNAL;
+
+	ATF_REQUIRE_ERRNO(EINVAL, timer_create(CLOCK_REALTIME, &ev, &t) == -1);
+
+	errno = 0;
+	ev.sigev_signo = SIGUSR1;
+	ev.sigev_notify = SIGEV_THREAD + 100;
+
+	ATF_REQUIRE_ERRNO(EINVAL, timer_create(CLOCK_REALTIME, &ev, &t) == -1);
+}
+
+ATF_TC(timer_create_real);
+ATF_TC_HEAD(timer_create_real, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks timer_create(2) with CLOCK_REALTIME and sigevent(3), "
+	    "SIGEV_SIGNAL");
+}
+
+ATF_TC_BODY(timer_create_real, tc)
+{
+	timer_signal_create(CLOCK_REALTIME, false);
+}
+
+ATF_TC(timer_create_mono);
+ATF_TC_HEAD(timer_create_mono, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks timer_create(2) with CLOCK_MONOTONIC and sigevent(3), "
+	    "SIGEV_SIGNAL");
+}
+
+ATF_TC_BODY(timer_create_mono, tc)
+{
+	timer_signal_create(CLOCK_MONOTONIC, false);
+}
+
+ATF_TC(timer_create_real_expire);
+ATF_TC_HEAD(timer_create_real_expire, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks timer_create(2) with CLOCK_REALTIME and sigevent(3), "
+	    "SIGEV_SIGNAL, with expiration");
+}
+
+ATF_TC_BODY(timer_create_real_expire, tc)
+{
+	timer_signal_create(CLOCK_REALTIME, true);
+}
+
+ATF_TC(timer_create_mono_expire);
+ATF_TC_HEAD(timer_create_mono_expire, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks timer_create(2) with CLOCK_MONOTONIC and sigevent(3), "
+	    "SIGEV_SIGNAL, with expiration");
+}
+
+ATF_TC_BODY(timer_create_mono_expire, tc)
+{
+	timer_signal_create(CLOCK_MONOTONIC, true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, timer_create_err);
+	ATF_TP_ADD_TC(tp, timer_create_real);
+	ATF_TP_ADD_TC(tp, timer_create_mono);
+	ATF_TP_ADD_TC(tp, timer_create_real_expire);
+	ATF_TP_ADD_TC(tp, timer_create_mono_expire);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_truncate.c b/contrib/netbsd-tests/lib/libc/sys/t_truncate.c
new file mode 100644
index 000000000000..50a9cbaad4ec
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_truncate.c
@@ -0,0 +1,175 @@
+/* $NetBSD: t_truncate.c,v 1.2 2011/08/18 19:48:03 dholland Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_truncate.c,v 1.2 2011/08/18 19:48:03 dholland Exp $");
+
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char path[] = "truncate";
+static const size_t sizes[] = { 8, 16, 512, 1024, 2048, 4094, 3000, 30 };
+
+ATF_TC_WITH_CLEANUP(ftruncate_basic);
+ATF_TC_HEAD(ftruncate_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ftruncate(2)");
+}
+
+ATF_TC_BODY(ftruncate_basic, tc)
+{
+	struct stat st;
+	size_t i;
+	int fd;
+
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+	ATF_REQUIRE(fd >= 0);
+
+	for (i = 0; i < __arraycount(sizes); i++) {
+
+		(void)memset(&st, 0, sizeof(struct stat));
+
+		ATF_REQUIRE(ftruncate(fd, sizes[i]) == 0);
+		ATF_REQUIRE(fstat(fd, &st) == 0);
+
+		(void)fprintf(stderr, "truncating to %zu bytes\n", sizes[i]);
+
+		if (sizes[i] != (size_t)st.st_size)
+			atf_tc_fail("ftruncate(2) did not truncate");
+	}
+
+	(void)close(fd);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(ftruncate_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(ftruncate_err);
+ATF_TC_HEAD(ftruncate_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from ftruncate(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(ftruncate_err, tc)
+{
+	int fd;
+
+	fd = open("/etc/passwd", O_RDONLY, 0400);
+	ATF_REQUIRE(fd >= 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, ftruncate(-1, 999) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, ftruncate(fd, 999) == -1);
+
+	(void)close(fd);
+}
+
+ATF_TC_WITH_CLEANUP(truncate_basic);
+ATF_TC_HEAD(truncate_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of truncate(2)");
+}
+
+ATF_TC_BODY(truncate_basic, tc)
+{
+	struct stat st;
+	size_t i;
+	int fd;
+
+	fd = open(path, O_RDWR | O_CREAT, 0600);
+	ATF_REQUIRE(fd >= 0);
+
+	for (i = 0; i < __arraycount(sizes); i++) {
+
+		(void)memset(&st, 0, sizeof(struct stat));
+
+		ATF_REQUIRE(truncate(path, sizes[i]) == 0);
+		ATF_REQUIRE(fstat(fd, &st) == 0);
+
+		(void)fprintf(stderr, "truncating to %zu bytes\n", sizes[i]);
+
+		if (sizes[i] != (size_t)st.st_size)
+			atf_tc_fail("truncate(2) did not truncate");
+	}
+
+	(void)close(fd);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(truncate_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(truncate_err);
+ATF_TC_HEAD(truncate_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from truncate(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(truncate_err, tc)
+{
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, truncate((void *)-1, 999) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EISDIR, truncate("/etc", 999) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, truncate("/a/b/c/d/e/f/g", 999) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, truncate("/usr/bin/fpr", 999) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ftruncate_basic);
+	ATF_TP_ADD_TC(tp, ftruncate_err);
+	ATF_TP_ADD_TC(tp, truncate_basic);
+	ATF_TP_ADD_TC(tp, truncate_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_ucontext.c b/contrib/netbsd-tests/lib/libc/sys/t_ucontext.c
new file mode 100644
index 000000000000..27d6740ba50e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_ucontext.c
@@ -0,0 +1,76 @@
+/* $NetBSD: t_ucontext.c,v 1.1 2011/10/15 06:54:52 jruoho Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ucontext.c,v 1.1 2011/10/15 06:54:52 jruoho Exp $");
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <ucontext.h>
+
+ATF_TC(ucontext_basic);
+ATF_TC_HEAD(ucontext_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks {get,set}context(2)");
+}
+
+ATF_TC_BODY(ucontext_basic, tc)
+{
+	ucontext_t u, v, w;
+	volatile int x, y;
+
+	x = 0;
+	y = 0;
+
+	printf("Start\n");
+
+	getcontext(&u);
+	y++;
+
+	printf("x == %d\n", x);
+
+	getcontext(&v);
+
+	if ( x < 20 ) {
+		x++;
+		getcontext(&w);
+		setcontext(&u);
+	}
+
+	printf("End, y = %d\n", y);
+	ATF_REQUIRE_EQ(y, 21);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, ucontext_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_umask.c b/contrib/netbsd-tests/lib/libc/sys/t_umask.c
new file mode 100644
index 000000000000..748cbdcf1ada
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_umask.c
@@ -0,0 +1,205 @@
+/* $NetBSD: t_umask.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_umask.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char path[] = "umask";
+static const mode_t mask[] = {
+	S_IRWXU,
+	S_IRUSR,
+	S_IWUSR,
+	S_IXUSR,
+	S_IRWXG,
+	S_IRGRP,
+	S_IWGRP,
+	S_IXGRP,
+	S_IRWXO,
+	S_IROTH,
+	S_IWOTH,
+	S_IXOTH
+};
+
+ATF_TC_WITH_CLEANUP(umask_fork);
+ATF_TC_HEAD(umask_fork, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that umask(2) is inherited");
+}
+
+ATF_TC_BODY(umask_fork, tc)
+{
+	mode_t mode;
+	pid_t pid;
+	size_t i;
+	int sta;
+
+	for (i = 0; i < __arraycount(mask) - 1; i++) {
+
+		(void)umask(mask[i] | mask[i + 1]);
+
+		pid = fork();
+
+		if (pid < 0)
+			continue;
+
+		if (pid == 0) {
+
+			mode = umask(mask[i]);
+
+			if (mode != (mask[i] | mask[i + 1]))
+				_exit(EXIT_FAILURE);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+			goto fail;
+	}
+
+	return;
+
+fail:
+	(void)umask(S_IWGRP | S_IWOTH);
+
+	atf_tc_fail("umask(2) was not inherited");
+}
+
+ATF_TC_CLEANUP(umask_fork, tc)
+{
+	(void)umask(S_IWGRP | S_IWOTH);
+}
+
+ATF_TC_WITH_CLEANUP(umask_open);
+ATF_TC_HEAD(umask_open, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of open(2) and umask(2)");
+}
+
+ATF_TC_BODY(umask_open, tc)
+{
+	const char *str = NULL;
+	struct stat st;
+	size_t i;
+	int fd;
+
+	for (i = 0; i < __arraycount(mask); i++) {
+
+		(void)umask(mask[i]);
+
+		fd = open(path, O_RDWR | O_CREAT, 0777);
+
+		if (fd < 0)
+			continue;
+
+		(void)memset(&st, 0, sizeof(struct stat));
+
+		if (stat(path, &st) != 0) {
+			str = "failed to stat(2)";
+			goto out;
+		}
+
+		if ((st.st_mode & mask[i]) != 0) {
+			str = "invalid umask(2)";
+			goto out;
+		}
+
+		if (unlink(path) != 0) {
+			str = "failed to unlink(2)";
+			goto out;
+		}
+
+	}
+
+out:
+	(void)umask(S_IWGRP | S_IWOTH);
+
+	if (str != NULL)
+		atf_tc_fail("%s", str);
+}
+
+ATF_TC_CLEANUP(umask_open, tc)
+{
+	(void)umask(S_IWGRP | S_IWOTH);
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(umask_previous);
+ATF_TC_HEAD(umask_previous, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test the return value from umask(2)");
+}
+
+ATF_TC_BODY(umask_previous, tc)
+{
+	mode_t mode;
+	size_t i;
+
+	for (i = 0; i < __arraycount(mask); i++) {
+
+		mode = umask(mask[i]);
+		mode = umask(mask[i]);
+
+		if (mode != mask[i])
+			goto fail;
+	}
+
+	return;
+
+fail:
+	(void)umask(S_IWGRP | S_IWOTH);
+
+	atf_tc_fail("umask(2) did not return the previous mask");
+}
+
+ATF_TC_CLEANUP(umask_previous, tc)
+{
+	(void)umask(S_IWGRP | S_IWOTH);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, umask_fork);
+	ATF_TP_ADD_TC(tp, umask_open);
+	ATF_TP_ADD_TC(tp, umask_previous);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_unlink.c b/contrib/netbsd-tests/lib/libc/sys/t_unlink.c
new file mode 100644
index 000000000000..38bff4cf9a5c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_unlink.c
@@ -0,0 +1,158 @@
+/* $NetBSD: t_unlink.c,v 1.2 2014/04/21 18:05:17 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_unlink.c,v 1.2 2014/04/21 18:05:17 martin Exp $");
+
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+static char	 path[] = "unlink";
+
+ATF_TC_WITH_CLEANUP(unlink_basic);
+ATF_TC_HEAD(unlink_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of unlink(2)");
+}
+
+ATF_TC_BODY(unlink_basic, tc)
+{
+	const size_t n = 512;
+	size_t i;
+	int fd;
+
+	for (i = 0; i < n; i++) {
+
+		fd = open(path, O_RDWR | O_CREAT, 0666);
+
+		ATF_REQUIRE(fd != -1);
+		ATF_REQUIRE(close(fd) == 0);
+		ATF_REQUIRE(unlink(path) == 0);
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(ENOENT, open(path, O_RDONLY) == -1);
+	}
+}
+
+ATF_TC_CLEANUP(unlink_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(unlink_err);
+ATF_TC_HEAD(unlink_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test error conditions of unlink(2)");
+}
+
+ATF_TC_BODY(unlink_err, tc)
+{
+	char buf[PATH_MAX + 1];
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBUSY, unlink("/") == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENAMETOOLONG, unlink(buf) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, unlink("/a/b/c/d/e/f/g/h/i/j/k/l/m") == -1);
+}
+
+ATF_TC_CLEANUP(unlink_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(unlink_fifo);
+ATF_TC_HEAD(unlink_fifo, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test unlink(2) for a FIFO");
+}
+
+ATF_TC_BODY(unlink_fifo, tc)
+{
+
+	ATF_REQUIRE(mkfifo(path, 0666) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(ENOENT, open(path, O_RDONLY) == -1);
+}
+
+ATF_TC_CLEANUP(unlink_fifo, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(unlink_perm);
+ATF_TC_HEAD(unlink_perm, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test permissions with unlink(2)");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(unlink_perm, tc)
+{
+	int rv;
+
+	errno = 0;
+	rv = unlink("/etc");
+	ATF_REQUIRE_MSG(rv == -1 && (errno == EACCES || errno == EPERM),
+	    "unlinking a directory did not fail with EPERM or EACCESS; "
+	    "unlink() returned %d, errno %d", rv, errno);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EACCES, unlink("/root/.profile") == -1);
+}
+
+ATF_TC_CLEANUP(unlink_perm, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, unlink_basic);
+	ATF_TP_ADD_TC(tp, unlink_err);
+	ATF_TP_ADD_TC(tp, unlink_fifo);
+	ATF_TP_ADD_TC(tp, unlink_perm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_write.c b/contrib/netbsd-tests/lib/libc/sys/t_write.c
new file mode 100644
index 000000000000..2b1324a0f900
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/sys/t_write.c
@@ -0,0 +1,226 @@
+/* $NetBSD: t_write.c,v 1.2 2011/10/19 16:19:30 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_write.c,v 1.2 2011/10/19 16:19:30 jruoho Exp $");
+
+#include <sys/uio.h>
+#include <sys/syslimits.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+
+static void		 sighandler(int);
+
+static bool		 fail = false;
+static const char	*path = "write";
+
+static void
+sighandler(int signo)
+{
+	fail = false;
+}
+
+ATF_TC_WITH_CLEANUP(write_err);
+ATF_TC_HEAD(write_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks errors from write(2)");
+}
+
+ATF_TC_BODY(write_err, tc)
+{
+	char rbuf[3] = { 'a', 'b', 'c' };
+	char wbuf[3] = { 'x', 'y', 'z' };
+	int fd;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EBADF, write(-1, wbuf, sizeof(wbuf)) == -1);
+
+	fd = open(path, O_RDWR | O_CREAT);
+
+	if (fd >= 0) {
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(0, write(fd, wbuf, 3) == 3);
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(EINVAL, write(fd, wbuf, SIZE_MAX) == -1);
+
+		errno = 0;
+		ATF_REQUIRE_ERRNO(EFAULT, write(fd, (void *)-1, 1) == -1);
+
+		/*
+		 * Check that the above bogus write(2)
+		 * calls did not corrupt the file.
+		 */
+		ATF_REQUIRE(lseek(fd, 0, SEEK_SET) == 0);
+		ATF_REQUIRE(read(fd, rbuf, 3) == 3);
+		ATF_REQUIRE(memcmp(rbuf, wbuf, 3) == 0);
+
+		(void)close(fd);
+		(void)unlink(path);
+	}
+}
+
+ATF_TC_CLEANUP(write_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(write_pipe);
+ATF_TC_HEAD(write_pipe, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks for EPIPE from write(2)");
+}
+
+ATF_TC_BODY(write_pipe, tc)
+{
+	int fds[2];
+
+	ATF_REQUIRE(pipe(fds) == 0);
+	ATF_REQUIRE(signal(SIGPIPE, sighandler) == 0);
+
+	ATF_REQUIRE(write(fds[1], "x", 1) != -1);
+	ATF_REQUIRE(close(fds[0]) == 0);
+
+	errno = 0;
+	fail = true;
+
+	if (write(fds[1], "x", 1) != -1 || errno != EPIPE)
+		atf_tc_fail_nonfatal("expected EPIPE but write(2) succeeded");
+
+	ATF_REQUIRE(close(fds[1]) == 0);
+
+	if (fail != false)
+		atf_tc_fail_nonfatal("SIGPIPE was not raised");
+}
+
+ATF_TC_WITH_CLEANUP(write_pos);
+ATF_TC_HEAD(write_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that write(2) "
+	    "updates the file position");
+}
+
+ATF_TC_BODY(write_pos, tc)
+{
+	const size_t n = 123;
+	size_t i;
+	int fd;
+
+	fd = open(path, O_RDWR | O_CREAT);
+	ATF_REQUIRE(fd >= 0);
+
+	for (i = 0; i < n; i++) {
+		ATF_REQUIRE(write(fd, "x", 1) == 1);
+		ATF_REQUIRE(lseek(fd, 0, SEEK_CUR) == (off_t)(i + 1));
+	}
+
+	ATF_REQUIRE(close(fd) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(write_pos, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(write_ret);
+ATF_TC_HEAD(write_ret, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks return values from write(2)");
+}
+
+ATF_TC_BODY(write_ret, tc)
+{
+	const size_t n = 99;
+	char buf[123];
+	size_t i, j;
+	int fd;
+
+	fd = open(path, O_WRONLY | O_CREAT);
+	ATF_REQUIRE(fd >= 0);
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	for (i = j = 0; i < n; i++)
+		j += write(fd, buf, sizeof(buf));
+
+	if (j != n * 123)
+		atf_tc_fail("inconsistent return values from write(2)");
+
+	(void)close(fd);
+	(void)unlink(path);
+}
+
+ATF_TC_CLEANUP(write_ret, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC(writev_iovmax);
+ATF_TC_HEAD(writev_iovmax, tc)
+{
+	atf_tc_set_md_var(tc, "timeout", "10");
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks that file descriptor is properly FILE_UNUSE()d "
+	    "when iovcnt is greater than IOV_MAX");
+}
+
+ATF_TC_BODY(writev_iovmax, tc)
+{
+	ssize_t retval;
+
+	(void)printf("Calling writev(2, NULL, IOV_MAX + 1)...\n");
+
+	errno = 0;
+	retval = writev(2, NULL, IOV_MAX + 1);
+
+	ATF_REQUIRE_EQ_MSG(retval, -1, "got: %zd", retval);
+	ATF_REQUIRE_EQ_MSG(errno, EINVAL, "got: %s", strerror(errno));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, write_err);
+	ATF_TP_ADD_TC(tp, write_pipe);
+	ATF_TP_ADD_TC(tp, write_pos);
+	ATF_TP_ADD_TC(tp, write_ret);
+	ATF_TP_ADD_TC(tp, writev_iovmax);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/t_cdb.c b/contrib/netbsd-tests/lib/libc/t_cdb.c
new file mode 100644
index 000000000000..5e88e6523a26
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/t_cdb.c
@@ -0,0 +1,158 @@
+/*	$NetBSD: t_cdb.c,v 1.1 2012/09/27 00:38:57 joerg Exp $	*/
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cdb.c,v 1.1 2012/09/27 00:38:57 joerg Exp $");
+
+#include <atf-c.h>
+#include <assert.h>
+#include <cdbr.h>
+#include <cdbw.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define	MAXKEYS	16384
+
+static const char database_name[] = "test.cdb";
+
+uint32_t keys[MAXKEYS];
+
+static int
+cmp_keys(const void *a_, const void *b_)
+{
+	uint32_t a = *(const uint32_t *)a_;
+	uint32_t b = *(const uint32_t *)b_;
+
+	return a > b ? 1 : (a < b ? 1 : 0);
+}
+
+static void
+init_keys(size_t len)
+{
+	uint32_t sorted_keys[MAXKEYS];
+	size_t i;
+
+	assert(len <= MAXKEYS);
+
+	if (len == 0)
+		return;
+
+	do {
+		for (i = 0; i < len; ++i)
+			sorted_keys[i] = keys[i] = arc4random();
+
+		qsort(sorted_keys, len, sizeof(*sorted_keys), cmp_keys);
+		for (i = 1; i < len; ++i) {
+			if (sorted_keys[i - 1] == sorted_keys[i])
+				break;
+		}
+	} while (i != len);
+}
+
+static void
+write_database(size_t len)
+{
+	struct cdbw *db;
+	int fd;
+	size_t i;
+	uint32_t buf[2];
+
+	ATF_REQUIRE((db = cdbw_open()) != NULL);
+	ATF_REQUIRE((fd = creat(database_name, S_IRUSR|S_IWUSR)) != -1);
+	for (i = 0; i < len; ++i) {
+		buf[0] = i;
+		buf[1] = keys[i];
+		ATF_REQUIRE(cdbw_put(db, &keys[i], sizeof(keys[i]),
+		    buf, sizeof(buf)) == 0);
+	}
+	ATF_REQUIRE(cdbw_output(db, fd, "test database", arc4random) == 0);
+	cdbw_close(db);
+	ATF_REQUIRE(close(fd) == 0);
+}
+
+static void
+check_database(size_t len)
+{
+	struct cdbr *db;
+	size_t i, data_len;
+	const void *data;
+	uint32_t buf[2];
+
+	ATF_REQUIRE((db = cdbr_open(database_name, CDBR_DEFAULT)) != NULL);
+	ATF_REQUIRE_EQ(cdbr_entries(db), len);
+	for (i = 0; i < len; ++i) {
+		ATF_REQUIRE(cdbr_find(db, &keys[i], sizeof(keys[i]),
+		    &data, &data_len) != -1);
+		ATF_REQUIRE_EQ(data_len, sizeof(buf));
+		memcpy(buf, data, sizeof(buf));
+		ATF_REQUIRE_EQ(buf[0], i);
+		ATF_REQUIRE_EQ(buf[1], keys[i]);
+	}
+	cdbr_close(db);
+}
+
+ATF_TC_WITH_CLEANUP(cdb);
+
+ATF_TC_HEAD(cdb, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test cdb(5) reading and writing");
+}
+
+ATF_TC_BODY(cdb, tc)
+{
+	size_t i, sizes[] = { 0, 16, 64, 1024, 2048 };
+	for (i = 0; i < __arraycount(sizes); ++i) {
+		init_keys(sizes[i]);
+		write_database(sizes[i]);
+		check_database(sizes[i]);
+		unlink(database_name);
+	}
+}
+
+ATF_TC_CLEANUP(cdb, tc)
+{
+
+	unlink(database_name);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cdb);
+
+	return atf_no_error();
+}
+
diff --git a/contrib/netbsd-tests/lib/libc/t_convfp.c b/contrib/netbsd-tests/lib/libc/t_convfp.c
new file mode 100644
index 000000000000..de68690a2432
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/t_convfp.c
@@ -0,0 +1,155 @@
+/*	$NetBSD: t_convfp.c,v 1.7 2011/06/14 11:58:22 njoly Exp $	*/
+
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+ * This value is representable as an unsigned int, but not as an int.
+ * According to ISO C it must survive the convsion back from a double
+ * to an unsigned int (everything > -1 and < UINT_MAX+1 has to)
+ */ 
+#define	UINT_TESTVALUE	(INT_MAX+42U)
+
+/* The same for unsigned long */
+#define ULONG_TESTVALUE	(LONG_MAX+42UL)
+
+
+ATF_TC(conv_uint);
+ATF_TC_HEAD(conv_uint, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test conversions to unsigned int");
+}
+
+ATF_TC_BODY(conv_uint, tc)
+{
+	unsigned int ui;
+	double d;
+
+	/* unsigned int test */
+	d = UINT_TESTVALUE;
+	ui = (unsigned int)d;
+
+	if (ui != UINT_TESTVALUE)
+		atf_tc_fail("FAILED: unsigned int %u (0x%x) != %u (0x%x)",
+		    ui, ui, UINT_TESTVALUE, UINT_TESTVALUE);
+}
+
+ATF_TC(conv_ulong);
+
+ATF_TC_HEAD(conv_ulong, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test conversions to unsigned long");
+}
+
+ATF_TC_BODY(conv_ulong, tc)
+{
+	unsigned long ul;
+	long double dt;
+	double d;
+
+	/* unsigned long vs. {long} double test */
+	if (sizeof(d) > sizeof(ul)) {
+		d = ULONG_TESTVALUE;
+		ul = (unsigned long)d;
+		printf("testing double vs. long\n");
+	} else if (sizeof(dt) > sizeof(ul)) {
+		dt = ULONG_TESTVALUE;
+		ul = (unsigned long)dt;
+		printf("testing long double vs. long\n");
+	} else {
+		printf("sizeof(long) = %zu, sizeof(double) = %zu, "
+		    "sizeof(long double) = %zu\n", 
+		    sizeof(ul), sizeof(d), sizeof(dt));
+		atf_tc_skip("no suitable {long} double type found");
+	}
+
+	if (ul != ULONG_TESTVALUE)
+		atf_tc_fail("unsigned long %lu (0x%lx) != %lu (0x%lx)",
+		    ul, ul, ULONG_TESTVALUE, ULONG_TESTVALUE);
+}
+
+ATF_TC(cast_ulong);
+
+ATF_TC_HEAD(cast_ulong, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "test double to unsigned long cast");
+}
+
+ATF_TC_BODY(cast_ulong, tc)
+{
+	double nv;
+	unsigned long uv;
+
+	nv = 5.6;
+	uv = (unsigned long)nv;
+
+	ATF_CHECK_EQ_MSG(uv, 5,
+	    "%.3f casted to unsigned long is %lu", nv, uv);
+}
+
+ATF_TC(cast_ulong2);
+
+ATF_TC_HEAD(cast_ulong2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "test double/long double casts to unsigned long");
+}
+
+ATF_TC_BODY(cast_ulong2, tc)
+{
+	double dv = 1.9;
+	long double ldv = dv;
+	unsigned long l1 = dv;
+	unsigned long l2 = ldv;
+
+	ATF_CHECK_EQ_MSG(l1, 1,
+	    "double 1.9 casted to unsigned long should be 1, but is %lu", l1);
+
+	ATF_CHECK_EQ_MSG(l2, 1,
+	    "long double 1.9 casted to unsigned long should be 1, but is %lu",
+	    l2);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, conv_uint);
+	ATF_TP_ADD_TC(tp, conv_ulong);
+	ATF_TP_ADD_TC(tp, cast_ulong);
+	ATF_TP_ADD_TC(tp, cast_ulong2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/t_gdtoa.c b/contrib/netbsd-tests/lib/libc/t_gdtoa.c
new file mode 100644
index 000000000000..e04060367143
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/t_gdtoa.c
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_gdtoa.c,v 1.4 2012/09/27 08:19:18 martin Exp $");
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* reported by Maksymilian Arciemowicz */
+
+ATF_TC(long_format);
+
+ATF_TC_HEAD(long_format, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test printf with %%1.262159f format");
+}
+
+ATF_TC_BODY(long_format, tc)
+{
+	char *buf;
+	ATF_REQUIRE_EQ(262161, asprintf(&buf, "%1.262159f", 1.1));
+	free(buf);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, long_format);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/termios/t_tcsetpgrp.c b/contrib/netbsd-tests/lib/libc/termios/t_tcsetpgrp.c
new file mode 100644
index 000000000000..66b1735131ed
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/termios/t_tcsetpgrp.c
@@ -0,0 +1,87 @@
+/*	$NetBSD: t_tcsetpgrp.c,v 1.3 2012/03/18 07:14:08 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tcsetpgrp.c,v 1.3 2012/03/18 07:14:08 jruoho Exp $");
+
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+ATF_TC(tcsetpgrp_err);
+ATF_TC_HEAD(tcsetpgrp_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from tcsetpgrp(3)"
+	    " (PR lib/41673)");
+}
+
+ATF_TC_BODY(tcsetpgrp_err, tc)
+{
+	int rv, sta;
+	pid_t pid;
+
+	if (isatty(STDIN_FILENO) == 0)
+		return;
+
+	pid = fork();
+	ATF_REQUIRE(pid >= 0);
+
+	if (pid == 0) {
+
+		/*
+		 * The child process ID doesn't match any active
+		 * process group ID, so the following call should
+		 * fail with EPERM (and not EINVAL).
+		 */
+		errno = 0;
+		rv = tcsetpgrp(STDIN_FILENO, getpid());
+
+		if (rv == 0 || errno != EPERM)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("wrong errno");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, tcsetpgrp_err);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/time/t_mktime.c b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
new file mode 100644
index 000000000000..8092361dbc36
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
@@ -0,0 +1,155 @@
+/* $NetBSD: t_mktime.c,v 1.5 2012/03/18 07:33:58 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+
+ATF_TC(localtime_r_gmt);
+ATF_TC_HEAD(localtime_r_gmt, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that localtime_r(3) "
+	    "returns localtime, not GMT (PR lib/28324)");
+}
+
+ATF_TC_BODY(localtime_r_gmt, tc)
+{
+	struct tm *t;
+	struct tm tt;
+	time_t x;
+
+	x = time(NULL);
+	localtime_r(&x, &tt);
+	t = localtime(&x);
+
+	if (t->tm_sec != tt.tm_sec || t->tm_min != tt.tm_min ||
+	    t->tm_hour != tt.tm_hour || t->tm_mday != tt.tm_mday)
+		atf_tc_fail("inconsistencies between "
+		    "localtime(3) and localtime_r(3)");
+}
+
+ATF_TC(mktime_negyear);
+ATF_TC_HEAD(mktime_negyear, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test mktime(3) with negative year");
+}
+
+ATF_TC_BODY(mktime_negyear, tc)
+{
+	struct tm tms;
+	time_t t;
+
+	(void)memset(&tms, 0, sizeof(tms));
+	tms.tm_year = ~0;
+
+	errno = 0;
+	t = mktime(&tms);
+	ATF_REQUIRE_ERRNO(0, t != (time_t)-1);
+}
+
+ATF_TC(timegm_epoch);
+ATF_TC_HEAD(timegm_epoch, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test timegm(3) close to the epoch");
+}
+
+ATF_TC_BODY(timegm_epoch, tc)
+{
+	struct tm tms;
+	time_t t;
+
+	/* midnight on 1 Jan 1970 */
+	(void)memset(&tms, 0, sizeof(tms));
+	errno = 0;
+	tms.tm_year = 1970 - 1900;
+	tms.tm_mday = 1;
+	t = timegm(&tms);
+	ATF_REQUIRE_ERRNO(0, t == (time_t)0);
+
+	/* one second after midnight on 1 Jan 1970 */
+	(void)memset(&tms, 0, sizeof(tms));
+	errno = 0;
+	tms.tm_year = 1970 - 1900;
+	tms.tm_mday = 1;
+	tms.tm_sec = 1;
+	t = timegm(&tms);
+	ATF_REQUIRE_ERRNO(0, t == (time_t)1);
+
+	/*
+	 * 1969-12-31 23:59:59 = one second before the epoch.
+	 * Result should be -1 with errno = 0.
+	 */
+	(void)memset(&tms, 0, sizeof(tms));
+	errno = 0;
+	tms.tm_year = 1969 - 1900;
+	tms.tm_mon = 12 - 1;
+	tms.tm_mday = 31;
+	tms.tm_hour = 23;
+	tms.tm_min = 59;
+	tms.tm_sec = 59;
+	t = timegm(&tms);
+	ATF_REQUIRE_ERRNO(0, t == (time_t)-1);
+
+	/*
+	 * Another way of getting one second before the epoch:
+	 * Set date to 1 Jan 1970, and time to -1 second.
+	 */
+	(void)memset(&tms, 0, sizeof(tms));
+	errno = 0;
+	tms.tm_year = 1970 - 1900;
+	tms.tm_mday = 1;
+	tms.tm_sec = -1;
+	t = timegm(&tms);
+	ATF_REQUIRE_ERRNO(0, t == (time_t)-1);
+
+	/*
+	 * Two seconds before the epoch.
+	 */
+	(void)memset(&tms, 0, sizeof(tms));
+	errno = 0;
+	tms.tm_year = 1970 - 1900;
+	tms.tm_mday = 1;
+	tms.tm_sec = -2;
+	t = timegm(&tms);
+	ATF_REQUIRE_ERRNO(0, t == (time_t)-2);
+
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, localtime_r_gmt);
+	ATF_TP_ADD_TC(tp, mktime_negyear);
+	ATF_TP_ADD_TC(tp, timegm_epoch);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/time/t_strptime.c b/contrib/netbsd-tests/lib/libc/time/t_strptime.c
new file mode 100644
index 000000000000..c0f9cdf79585
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/time/t_strptime.c
@@ -0,0 +1,252 @@
+/* $NetBSD: t_strptime.c,v 1.1 2011/01/13 00:14:10 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by David Laight.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_strptime.c,v 1.1 2011/01/13 00:14:10 pgoyette Exp $");
+
+#include <time.h>
+
+#include <atf-c.h>
+
+static void
+h_pass(const char *buf, const char *fmt, int len,
+    int tm_sec, int tm_min, int tm_hour, int tm_mday,
+    int tm_mon, int tm_year, int tm_wday, int tm_yday)
+{
+	struct tm tm = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, NULL };
+	const char *ret, *exp;
+
+	exp = buf + len;
+	ret = strptime(buf, fmt, &tm);
+
+	ATF_REQUIRE_MSG(ret == exp,
+	    "strptime(\"%s\", \"%s\", tm): incorrect return code: "
+	    "expected: %p, got: %p", buf, fmt, exp, ret);
+
+#define H_REQUIRE_FIELD(field)						\
+		ATF_REQUIRE_MSG(tm.field == field,			\
+		    "strptime(\"%s\", \"%s\", tm): incorrect %s: "	\
+		    "expected: %d, but got: %d", buf, fmt,		\
+		    ___STRING(field), field, tm.field)
+
+	H_REQUIRE_FIELD(tm_sec);
+	H_REQUIRE_FIELD(tm_min);
+	H_REQUIRE_FIELD(tm_hour);
+	H_REQUIRE_FIELD(tm_mday);
+	H_REQUIRE_FIELD(tm_mon);
+	H_REQUIRE_FIELD(tm_year);
+	H_REQUIRE_FIELD(tm_wday);
+	H_REQUIRE_FIELD(tm_yday);
+
+#undef H_REQUIRE_FIELD
+}
+
+static void
+h_fail(const char *buf, const char *fmt)
+{
+	struct tm tm = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, NULL };
+
+	ATF_REQUIRE_MSG(strptime(buf, fmt, &tm) == NULL, "strptime(\"%s\", "
+	    "\"%s\", &tm) should fail, but it didn't", buf, fmt);
+}
+
+ATF_TC(common);
+
+ATF_TC_HEAD(common, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks strptime(3): various checks");
+}
+
+ATF_TC_BODY(common, tc)
+{
+
+	h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %T %Y",
+		24, 46, 27, 23, 20, 0, 98, 2, -1);
+	h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %H:%M:%S %Y",
+		24, 46, 27, 23, 20, 0, 98, 2, -1);
+	h_pass("Tue Jan 20 23:27:46 1998", "%c",
+		24, 46, 27, 23, 20, 0, 98, 2, -1);
+	h_pass("Fri Mar  4 20:05:34 2005", "%a %b %e %H:%M:%S %Y",
+		24, 34, 5, 20, 4, 2, 105, 5, -1);
+	h_pass("5\t3  4 8pm:05:34 2005", "%w%n%m%t%d%n%k%p:%M:%S %Y",
+		21, 34, 5, 20, 4, 2, 105, 5, -1);
+	h_pass("Fri Mar  4 20:05:34 2005", "%c",
+		24, 34, 5, 20, 4, 2, 105, 5, -1);
+
+	h_pass("x20y", "x%Cy", 4, -1, -1, -1, -1, -1, 100, -1, -1);
+	h_pass("x84y", "x%yy", 4, -1, -1, -1, -1, -1, 84, -1, -1);
+	h_pass("x2084y", "x%C%yy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
+	h_pass("x8420y", "x%y%Cy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
+	h_pass("%20845", "%%%C%y5", 6, -1, -1, -1, -1, -1, 184, -1, -1);
+	h_fail("%", "%E%");
+
+	h_pass("1980", "%Y", 4, -1, -1, -1, -1, -1, 80, -1, -1);
+	h_pass("1980", "%EY", 4, -1, -1, -1, -1, -1, 80, -1, -1);
+
+	h_pass("0", "%S", 1, 0, -1, -1, -1, -1, -1, -1, -1);
+	h_pass("59", "%S", 2, 59, -1, -1, -1, -1, -1, -1, -1);
+	h_pass("60", "%S", 2, 60, -1, -1, -1, -1, -1, -1, -1);
+	h_pass("61", "%S", 2, 61, -1, -1, -1, -1, -1, -1, -1);
+	h_fail("62", "%S");
+}
+
+ATF_TC(day);
+
+ATF_TC_HEAD(day, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks strptime(3): day names");
+}
+
+ATF_TC_BODY(day, tc)
+{
+
+	h_pass("Sun", "%a", 3, -1, -1, -1, -1, -1, -1, 0, -1);
+	h_pass("Sunday", "%a", 6, -1, -1, -1, -1, -1, -1, 0, -1);
+	h_pass("Mon", "%a", 3, -1, -1, -1, -1, -1, -1, 1, -1);
+	h_pass("Monday", "%a", 6, -1, -1, -1, -1, -1, -1, 1, -1);
+	h_pass("Tue", "%a", 3, -1, -1, -1, -1, -1, -1, 2, -1);
+	h_pass("Tuesday", "%a", 7, -1, -1, -1, -1, -1, -1, 2, -1);
+	h_pass("Wed", "%a", 3, -1, -1, -1, -1, -1, -1, 3, -1);
+	h_pass("Wednesday", "%a", 9, -1, -1, -1, -1, -1, -1, 3, -1);
+	h_pass("Thu", "%a", 3, -1, -1, -1, -1, -1, -1, 4, -1);
+	h_pass("Thursday", "%a", 8, -1, -1, -1, -1, -1, -1, 4, -1);
+	h_pass("Fri", "%a", 3, -1, -1, -1, -1, -1, -1, 5, -1);
+	h_pass("Friday", "%a", 6, -1, -1, -1, -1, -1, -1, 5, -1);
+	h_pass("Sat", "%a", 3, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_pass("Saturday", "%a", 8, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_pass("Saturn", "%a", 3, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_fail("Moon", "%a");
+	h_pass("Sun", "%A", 3, -1, -1, -1, -1, -1, -1, 0, -1);
+	h_pass("Sunday", "%A", 6, -1, -1, -1, -1, -1, -1, 0, -1);
+	h_pass("Mon", "%A", 3, -1, -1, -1, -1, -1, -1, 1, -1);
+	h_pass("Monday", "%A", 6, -1, -1, -1, -1, -1, -1, 1, -1);
+	h_pass("Tue", "%A", 3, -1, -1, -1, -1, -1, -1, 2, -1);
+	h_pass("Tuesday", "%A", 7, -1, -1, -1, -1, -1, -1, 2, -1);
+	h_pass("Wed", "%A", 3, -1, -1, -1, -1, -1, -1, 3, -1);
+	h_pass("Wednesday", "%A", 9, -1, -1, -1, -1, -1, -1, 3, -1);
+	h_pass("Thu", "%A", 3, -1, -1, -1, -1, -1, -1, 4, -1);
+	h_pass("Thursday", "%A", 8, -1, -1, -1, -1, -1, -1, 4, -1);
+	h_pass("Fri", "%A", 3, -1, -1, -1, -1, -1, -1, 5, -1);
+	h_pass("Friday", "%A", 6, -1, -1, -1, -1, -1, -1, 5, -1);
+	h_pass("Sat", "%A", 3, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_pass("Saturday", "%A", 8, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_pass("Saturn", "%A", 3, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_fail("Moon", "%A");
+
+	h_pass("mon", "%a", 3, -1, -1, -1, -1, -1, -1, 1, -1);
+	h_pass("tueSDay", "%A", 7, -1, -1, -1, -1, -1, -1, 2, -1);
+	h_pass("sunday", "%A", 6, -1, -1, -1, -1, -1, -1, 0, -1);
+	h_fail("sunday", "%EA");
+	h_pass("SaturDay", "%A", 8, -1, -1, -1, -1, -1, -1, 6, -1);
+	h_fail("SaturDay", "%OA");
+}
+
+ATF_TC(month);
+
+ATF_TC_HEAD(month, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks strptime(3): month names");
+}
+
+ATF_TC_BODY(month, tc)
+{
+
+	h_pass("Jan", "%b", 3, -1, -1, -1, -1, 0, -1, -1, -1);
+	h_pass("January", "%b", 7, -1, -1, -1, -1, 0, -1, -1, -1);
+	h_pass("Feb", "%b", 3, -1, -1, -1, -1, 1, -1, -1, -1);
+	h_pass("February", "%b", 8, -1, -1, -1, -1, 1, -1, -1, -1);
+	h_pass("Mar", "%b", 3, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_pass("March", "%b", 5, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_pass("Apr", "%b", 3, -1, -1, -1, -1, 3, -1, -1, -1);
+	h_pass("April", "%b", 5, -1, -1, -1, -1, 3, -1, -1, -1);
+	h_pass("May", "%b", 3, -1, -1, -1, -1, 4, -1, -1, -1);
+	h_pass("Jun", "%b", 3, -1, -1, -1, -1, 5, -1, -1, -1);
+	h_pass("June", "%b", 4, -1, -1, -1, -1, 5, -1, -1, -1);
+	h_pass("Jul", "%b", 3, -1, -1, -1, -1, 6, -1, -1, -1);
+	h_pass("July", "%b", 4, -1, -1, -1, -1, 6, -1, -1, -1);
+	h_pass("Aug", "%b", 3, -1, -1, -1, -1, 7, -1, -1, -1);
+	h_pass("August", "%b", 6, -1, -1, -1, -1, 7, -1, -1, -1);
+	h_pass("Sep", "%b", 3, -1, -1, -1, -1, 8, -1, -1, -1);
+	h_pass("September", "%b", 9, -1, -1, -1, -1, 8, -1, -1, -1);
+	h_pass("Oct", "%b", 3, -1, -1, -1, -1, 9, -1, -1, -1);
+	h_pass("October", "%b", 7, -1, -1, -1, -1, 9, -1, -1, -1);
+	h_pass("Nov", "%b", 3, -1, -1, -1, -1, 10, -1, -1, -1);
+	h_pass("November", "%b", 8, -1, -1, -1, -1, 10, -1, -1, -1);
+	h_pass("Dec", "%b", 3, -1, -1, -1, -1, 11, -1, -1, -1);
+	h_pass("December", "%b", 8, -1, -1, -1, -1, 11, -1, -1, -1);
+	h_pass("Mayor", "%b", 3, -1, -1, -1, -1, 4, -1, -1, -1);
+	h_pass("Mars", "%b", 3, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_fail("Rover", "%b");
+	h_pass("Jan", "%B", 3, -1, -1, -1, -1, 0, -1, -1, -1);
+	h_pass("January", "%B", 7, -1, -1, -1, -1, 0, -1, -1, -1);
+	h_pass("Feb", "%B", 3, -1, -1, -1, -1, 1, -1, -1, -1);
+	h_pass("February", "%B", 8, -1, -1, -1, -1, 1, -1, -1, -1);
+	h_pass("Mar", "%B", 3, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_pass("March", "%B", 5, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_pass("Apr", "%B", 3, -1, -1, -1, -1, 3, -1, -1, -1);
+	h_pass("April", "%B", 5, -1, -1, -1, -1, 3, -1, -1, -1);
+	h_pass("May", "%B", 3, -1, -1, -1, -1, 4, -1, -1, -1);
+	h_pass("Jun", "%B", 3, -1, -1, -1, -1, 5, -1, -1, -1);
+	h_pass("June", "%B", 4, -1, -1, -1, -1, 5, -1, -1, -1);
+	h_pass("Jul", "%B", 3, -1, -1, -1, -1, 6, -1, -1, -1);
+	h_pass("July", "%B", 4, -1, -1, -1, -1, 6, -1, -1, -1);
+	h_pass("Aug", "%B", 3, -1, -1, -1, -1, 7, -1, -1, -1);
+	h_pass("August", "%B", 6, -1, -1, -1, -1, 7, -1, -1, -1);
+	h_pass("Sep", "%B", 3, -1, -1, -1, -1, 8, -1, -1, -1);
+	h_pass("September", "%B", 9, -1, -1, -1, -1, 8, -1, -1, -1);
+	h_pass("Oct", "%B", 3, -1, -1, -1, -1, 9, -1, -1, -1);
+	h_pass("October", "%B", 7, -1, -1, -1, -1, 9, -1, -1, -1);
+	h_pass("Nov", "%B", 3, -1, -1, -1, -1, 10, -1, -1, -1);
+	h_pass("November", "%B", 8, -1, -1, -1, -1, 10, -1, -1, -1);
+	h_pass("Dec", "%B", 3, -1, -1, -1, -1, 11, -1, -1, -1);
+	h_pass("December", "%B", 8, -1, -1, -1, -1, 11, -1, -1, -1);
+	h_pass("Mayor", "%B", 3, -1, -1, -1, -1, 4, -1, -1, -1);
+	h_pass("Mars", "%B", 3, -1, -1, -1, -1, 2, -1, -1, -1);
+	h_fail("Rover", "%B");
+
+	h_pass("september", "%b", 9, -1, -1, -1, -1, 8, -1, -1, -1);
+	h_pass("septembe", "%B", 3, -1, -1, -1, -1, 8, -1, -1, -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, common);
+	ATF_TP_ADD_TC(tp, day);
+	ATF_TP_ADD_TC(tp, month);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c b/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c
new file mode 100644
index 000000000000..c455d33cec29
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c
@@ -0,0 +1,60 @@
+/*	$NetBSD: h_tls_dlopen.c,v 1.5 2013/10/21 19:14:16 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_tls_dlopen.c,v 1.5 2013/10/21 19:14:16 joerg Exp $");
+
+#include <atf-c.h>
+#include <unistd.h>
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+extern __thread int var1;
+extern __thread int var2;
+extern __thread int *var3;
+__thread int var5 = 1;
+static __thread pid_t (*local_var)(void) = getpid;
+
+void testf_dso_helper(int x, int y);
+
+void
+testf_dso_helper(int x, int y)
+{
+	var1 = x;
+	var2 = y;
+	var3 = &optind;
+	ATF_CHECK_EQ(local_var, getpid);
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c b/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c
new file mode 100644
index 000000000000..591823ea2b0a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c
@@ -0,0 +1,113 @@
+/*	$NetBSD: t_tls_dlopen.c,v 1.3 2012/01/17 20:34:57 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tls_dlopen.c,v 1.3 2012/01/17 20:34:57 joerg Exp $");
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+ATF_TC(t_tls_dlopen);
+
+ATF_TC_HEAD(t_tls_dlopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test (un)initialized TLS variables and dlopen");
+}
+
+void (*testf_helper)(int, int);
+
+__thread int var1 = 1;
+__thread int var2;
+__thread int *var3 = &optind;
+int var4_helper;
+__thread int *var4 = &var4_helper;
+
+static void *
+testf(void *dummy)
+{
+	ATF_CHECK_EQ(var1, 1);
+	ATF_CHECK_EQ(var2, 0);
+	ATF_CHECK_EQ(var3, &optind);
+	ATF_CHECK_EQ(var4, &var4_helper);
+	testf_helper(2, 2);
+	ATF_CHECK_EQ(var1, 2);
+	ATF_CHECK_EQ(var2, 2);
+	testf_helper(3, 3);
+	ATF_CHECK_EQ(var1, 3);
+	ATF_CHECK_EQ(var2, 3);
+	ATF_CHECK_EQ(var3, &optind);
+
+	return NULL;
+}
+
+ATF_TC_BODY(t_tls_dlopen, tc)
+{
+	void *handle;
+	pthread_t t;
+
+#ifdef __HAVE_NO___THREAD
+	atf_tc_skip("no TLS support on this platform");
+#endif
+
+	handle = dlopen("h_tls_dlopen.so", RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE(handle != NULL);
+
+	testf_helper = dlsym(handle, "testf_dso_helper");
+	ATF_REQUIRE(testf_helper != NULL);
+
+	testf(NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+
+	dlclose(handle);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_tls_dlopen);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c b/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c
new file mode 100644
index 000000000000..9d242aeddc8e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c
@@ -0,0 +1,105 @@
+/*	$NetBSD: t_tls_dynamic.c,v 1.3 2012/01/17 20:34:57 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tls_dynamic.c,v 1.3 2012/01/17 20:34:57 joerg Exp $");
+
+#include <atf-c.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+ATF_TC(t_tls_dynamic);
+
+ATF_TC_HEAD(t_tls_dynamic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test (un)initialized TLS variables in dynamic binaries");
+}
+
+void testf_dso_helper(int, int);
+
+extern __thread int var1;
+extern __thread int var2;
+extern __thread pid_t (*dso_var1)(void);
+
+__thread int *var3 = &optind;
+int var4_helper;
+__thread int *var4 = &var4_helper;
+
+static void *
+testf(void *dummy)
+{
+	ATF_CHECK_EQ(var1, 1);
+	ATF_CHECK_EQ(var2, 0);
+	testf_dso_helper(2, 2);
+	ATF_CHECK_EQ(var1, 2);
+	ATF_CHECK_EQ(var2, 2);
+	testf_dso_helper(3, 3);
+	ATF_CHECK_EQ(var1, 3);
+	ATF_CHECK_EQ(var2, 3);
+	ATF_CHECK_EQ(var3, &optind);
+	ATF_CHECK_EQ(var4, &var4_helper);
+	ATF_CHECK_EQ(dso_var1, getpid);
+
+	return NULL;
+}
+
+ATF_TC_BODY(t_tls_dynamic, tc)
+{
+	pthread_t t;
+
+#ifdef __HAVE_NO___THREAD
+	atf_tc_skip("no TLS support on this platform");
+#endif
+
+	testf(NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_tls_dynamic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c b/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c
new file mode 100644
index 000000000000..7751a163fd0e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c
@@ -0,0 +1,93 @@
+/*	$NetBSD: t_tls_static.c,v 1.2 2012/01/17 20:34:57 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tls_static.c,v 1.2 2012/01/17 20:34:57 joerg Exp $");
+
+#include <atf-c.h>
+#include <pthread.h>
+
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+ATF_TC(t_tls_static);
+
+ATF_TC_HEAD(t_tls_static, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test (un)initialized TLS variables in static binaries");
+}
+
+void testf_helper(void);
+
+__thread int var1 = 1;
+__thread int var2;
+
+static void *
+testf(void *dummy)
+{
+	ATF_CHECK_EQ(var1, 1);
+	ATF_CHECK_EQ(var2, 0);
+	testf_helper();
+	ATF_CHECK_EQ(var1, -1);
+	ATF_CHECK_EQ(var2, -1);
+
+	return NULL;
+}
+
+ATF_TC_BODY(t_tls_static, tc)
+{
+	pthread_t t;
+
+#ifdef __HAVE_NO___THREAD
+	atf_tc_skip("no TLS support on this platform");
+#endif
+
+	testf(NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+
+	pthread_create(&t, 0, testf, 0);
+	pthread_join(t, NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_tls_static);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c b/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c
new file mode 100644
index 000000000000..da3b6f06e6b3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c
@@ -0,0 +1,53 @@
+/*	$NetBSD: t_tls_static_helper.c,v 1.2 2012/01/17 20:34:57 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tls_static_helper.c,v 1.2 2012/01/17 20:34:57 joerg Exp $");
+
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+extern __thread int var1;
+extern __thread int var2;
+
+void testf_helper(void);
+
+void
+testf_helper(void)
+{
+	var1 = -1;
+	var2 = -1;
+}
diff --git a/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c b/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c
new file mode 100644
index 000000000000..a12e07a78dad
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c
@@ -0,0 +1,56 @@
+/*	$NetBSD: h_tls_dynamic.c,v 1.5 2013/10/21 19:11:17 joerg Exp $	*/
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_tls_dynamic.c,v 1.5 2013/10/21 19:11:17 joerg Exp $");
+
+#include <unistd.h>
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+__thread int var1 = 1;
+__thread int var2;
+
+__thread pid_t (*dso_var1)(void) = getpid;
+
+void testf_dso_helper(int x, int y);
+
+void
+testf_dso_helper(int x, int y)
+{
+	var1 = x;
+	var2 = y;
+}
diff --git a/contrib/netbsd-tests/lib/libc/ttyio/t_ptm.c b/contrib/netbsd-tests/lib/libc/ttyio/t_ptm.c
new file mode 100644
index 000000000000..5346898bdfc4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ttyio/t_ptm.c
@@ -0,0 +1,174 @@
+/* $NetBSD: t_ptm.c,v 1.1 2011/01/13 03:19:57 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ptm.c,v 1.1 2011/01/13 03:19:57 pgoyette Exp $");
+
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x, v) \
+		ATF_REQUIRE_MSG(x != v, "%s: %s", #x, strerror(errno))
+
+ATF_TC(ptm);
+
+ATF_TC_HEAD(ptm, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks /dev/ptm device");
+}
+
+ATF_TC_BODY(ptm, tc)
+{
+	struct stat stm, sts;
+	struct ptmget ptm;
+	int fdm;
+	struct group *gp;
+
+	if ((fdm = open("/dev/ptm", O_RDWR)) == -1) {
+		if (errno == ENOENT || errno == ENODEV)
+			atf_tc_skip("/dev/ptm: %s", strerror(errno));
+		atf_tc_fail("/dev/ptm: %s", strerror(errno));
+	}
+
+	REQUIRE_ERRNO(fstat(fdm, &stm), -1);
+	ATF_REQUIRE_EQ(major(stm.st_rdev), 165);
+	REQUIRE_ERRNO(ioctl(fdm, TIOCPTMGET, &ptm), -1);
+
+	ATF_REQUIRE_MSG(strncmp(ptm.cn, "/dev/pty", 8) == 0
+		|| strncmp(ptm.cn, "/dev/null", 9) == 0,
+		"bad master name: %s", ptm.cn);
+
+	ATF_REQUIRE_MSG(strncmp(ptm.sn, "/dev/tty", 8) == 0
+		|| strncmp(ptm.sn, "/dev/pts/", 9) == 0,
+		"bad slave name: %s", ptm.sn);
+
+	if (strncmp(ptm.cn, "/dev/null", 9) != 0) {
+		REQUIRE_ERRNO(fstat(ptm.cfd, &stm), -1);
+		REQUIRE_ERRNO(stat(ptm.cn, &sts), -1);
+		ATF_REQUIRE_EQ(stm.st_rdev, sts.st_rdev);
+	}
+
+	REQUIRE_ERRNO(fstat(ptm.sfd, &stm), -1);
+	REQUIRE_ERRNO(stat(ptm.sn, &sts), -1);
+	ATF_REQUIRE_EQ(stm.st_rdev, sts.st_rdev);
+
+	ATF_REQUIRE_EQ_MSG(sts.st_uid, getuid(), "bad slave uid");
+
+	ATF_REQUIRE_MSG((gp = getgrnam("tty")) != NULL,
+	    "cannot find `tty' group");
+	ATF_REQUIRE_EQ_MSG(sts.st_gid, gp->gr_gid, "bad slave grid");
+
+	(void)close(ptm.sfd);
+	(void)close(ptm.cfd);
+	(void)close(fdm);
+}
+
+/*
+ * On NetBSD /dev/ptyp0 == /dev/pts/0 so we can check for major
+ * and minor device numbers. This check is non-portable. This
+ * check is now disabled because we might not have /dev/ptyp0
+ * at all.
+ */
+
+/*
+ * #define PTY_DEVNO_CHECK
+ */
+
+ATF_TC(ptmx);
+
+ATF_TC_HEAD(ptmx, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks /dev/ptmx device");
+}
+
+ATF_TC_BODY(ptmx, tc)
+{
+	struct stat stm, sts;
+	char *pty;
+	int fdm, fds;
+	struct group *gp;
+
+	if ((fdm = posix_openpt(O_RDWR|O_NOCTTY)) == -1) {
+		if (errno == ENOENT || errno == ENODEV)
+			atf_tc_skip("/dev/ptmx: %s", strerror(errno));
+
+		atf_tc_fail("/dev/ptmx: %s", strerror(errno));
+	}
+
+	REQUIRE_ERRNO(fstat(fdm, &stm), -1);
+
+#ifdef PTY_DEVNO_CHECK
+	REQUIRE_ERRNO(stat("/dev/ptyp0", &sts), -1);
+
+	ATF_REQUIRE_EQ_MSG(major(stm.st_rdev), major(sts.st_rdev),
+		"bad master major number");
+#endif
+
+	REQUIRE_ERRNO(grantpt(fdm), -1);
+	REQUIRE_ERRNO(unlockpt(fdm), -1);
+	REQUIRE_ERRNO((pty = ptsname(fdm)), NULL);
+
+	REQUIRE_ERRNO((fds = open(pty, O_RDWR|O_NOCTTY)), -1);
+	REQUIRE_ERRNO(fstat(fds, &sts), -1);
+
+#ifdef PTY_DEVNO_CHECK
+	ATF_REQUIRE_EQ_MSG(minor(stm.st_rdev), minor(sts.st_rdev),
+		"bad slave minor number");
+#endif
+
+	ATF_REQUIRE_EQ_MSG(sts.st_uid, getuid(), "bad slave uid");
+	ATF_REQUIRE_MSG((gp = getgrnam("tty")) != NULL,
+	    "cannot find `tty' group");
+
+	ATF_REQUIRE_EQ_MSG(sts.st_gid, gp->gr_gid, "bad slave gid");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ptm);
+	ATF_TP_ADD_TC(tp, ptmx);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c b/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
new file mode 100644
index 000000000000..5a5ec0f988ba
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
@@ -0,0 +1,163 @@
+/*	$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $ */
+
+/*
+ * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Brown.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+
+#if defined(__NetBSD__)
+#include <util.h>
+#elif defined(__bsdi__)
+int openpty(int *, int *, char *, struct termios *, struct winsize *);
+#elif defined(__FreeBSD__)
+#include <libutil.h>
+#else
+#error where openpty?
+#endif
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x, v) ATF_REQUIRE_MSG(x != v, "%s: %s", #x, strerror(errno))
+
+ATF_TC(ioctl);
+ATF_TC_HEAD(ioctl, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks that ioctl calls are restarted "
+		"properly after being interrupted");
+}
+
+/* ARGSUSED */
+static void
+sigchld(int nsig)
+{
+	REQUIRE_ERRNO(wait(NULL), -1);
+}
+
+ATF_TC_BODY(ioctl, tc)
+{
+	int m, s, rc;
+	char name[128], buf[128];
+	struct termios term;
+	struct sigaction sa;
+
+	/* unbuffer stdout */
+	setbuf(stdout, NULL);
+
+	/*
+	 * Create default termios settings for later use
+	 */
+	memset(&term, 0, sizeof(term));
+	term.c_iflag = TTYDEF_IFLAG;
+	term.c_oflag = TTYDEF_OFLAG;
+	term.c_cflag = TTYDEF_CFLAG;
+	term.c_lflag = TTYDEF_LFLAG;
+	cfsetspeed(&term, TTYDEF_SPEED);
+
+	/* get a tty */
+	REQUIRE_ERRNO(openpty(&m, &s, name, &term, NULL), -1);
+
+	switch (fork()) {
+	case -1:
+		atf_tc_fail("fork(): %s", strerror(errno));
+		/* NOTREACHED */
+	case 0:
+		/* wait for parent to get set up */
+		(void)sleep(1);
+		(void)printf("child1: exiting\n");
+		exit(0);
+		/* NOTREACHED */
+	default:
+		(void)printf("parent: spawned child1\n");
+		break;
+	}
+
+	switch (fork()) {
+	case -1:
+		atf_tc_fail("fork(): %s", strerror(errno));
+		/* NOTREACHED */
+	case 0:
+		/* wait for parent to get upset */
+		(void)sleep(2);
+		/* drain the tty q */
+		if (read(m, buf, sizeof(buf)) == -1)
+			err(1, "read");
+		(void)printf("child2: exiting\n");
+		exit(0);
+		/* NOTREACHED */
+	default:
+		(void)printf("parent: spawned child2\n");
+		break;
+	}
+
+	/* set up a restarting signal handler */
+	(void)sigemptyset(&sa.sa_mask);
+	sa.sa_handler = sigchld;
+	sa.sa_flags = SA_RESTART;
+	REQUIRE_ERRNO(sigaction(SIGCHLD, &sa, NULL), -1);
+	
+	/* put something in the output q */
+	REQUIRE_ERRNO(write(s, "Hello world\n", 12), -1);
+
+	/* ask for output to drain but don't drain it */
+	rc = 0;
+	if (tcsetattr(s, TCSADRAIN, &term) == -1) {
+		(void)printf("parent: tcsetattr: %s\n", strerror(errno));
+		rc = 1;
+	}
+
+	/* wait for last child */
+	sa.sa_handler = SIG_DFL;
+	REQUIRE_ERRNO(sigaction(SIGCHLD, &sa, NULL), -1);
+	(void) wait(NULL);
+
+	ATF_REQUIRE_EQ(rc, 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, ioctl);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libcrypt/t_crypt.c b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
new file mode 100644
index 000000000000..1a192cbcc13b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
@@ -0,0 +1,145 @@
+/* $NetBSD: t_crypt.c,v 1.3 2011/12/28 22:07:40 christos Exp $ */
+
+/*
+ * This version is derived from the original implementation of FreeSec
+ * (release 1.1) by David Burren.  I've reviewed the changes made in
+ * OpenBSD (as of 2.7) and modified the original code in a similar way
+ * where applicable.  I've also made it reentrant and made a number of
+ * other changes.
+ * - Solar Designer <solar at openwall.com>
+ */
+
+/*
+ * FreeSec: libcrypt for NetBSD
+ *
+ * Copyright (c) 1994 David Burren
+ * All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the author nor the names of other contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ *	$Owl: Owl/packages/glibc/crypt_freesec.c,v 1.6 2010/02/20 14:45:06 solar Exp $
+ *	Id: crypt.c,v 1.15 1994/09/13 04:58:49 davidb Exp
+ *
+ * This is an original implementation of the DES and the crypt(3) interfaces
+ * by David Burren <davidb at werj.com.au>.
+ *
+ * An excellent reference on the underlying algorithm (and related
+ * algorithms) is:
+ *
+ *	B. Schneier, Applied Cryptography: protocols, algorithms,
+ *	and source code in C, John Wiley & Sons, 1994.
+ *
+ * Note that in that book's description of DES the lookups for the initial,
+ * pbox, and final permutations are inverted (this has been brought to the
+ * attention of the author).  A list of errata for this book has been
+ * posted to the sci.crypt newsgroup by the author and is available for FTP.
+ *
+ * ARCHITECTURE ASSUMPTIONS:
+ *	This code used to have some nasty ones, but these have been removed
+ *	by now.	 The code requires a 32-bit integer type, though.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_crypt.c,v 1.3 2011/12/28 22:07:40 christos Exp $");
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static const struct {
+	const char *hash;
+	const char *pw;
+} tests[] = {
+/* "new"-style */
+/*  0 */	{ "_J9..CCCCXBrJUJV154M", "U*U*U*U*" },
+/*  1 */	{ "_J9..CCCCXUhOBTXzaiE", "U*U***U" },
+/*  2 */	{ "_J9..CCCC4gQ.mB/PffM", "U*U***U*" },
+/*  3 */	{ "_J9..XXXXvlzQGqpPPdk", "*U*U*U*U" },
+/*  4 */	{ "_J9..XXXXsqM/YSSP..Y", "*U*U*U*U*" },
+/*  5 */	{ "_J9..XXXXVL7qJCnku0I", "*U*U*U*U*U*U*U*U" },
+/*  6 */	{ "_J9..XXXXAj8cFbP5scI", "*U*U*U*U*U*U*U*U*" },
+/*  7 */	{ "_J9..SDizh.vll5VED9g", "ab1234567" },
+/*  8 */	{ "_J9..SDizRjWQ/zePPHc", "cr1234567" },
+/*  9 */	{ "_J9..SDizxmRI1GjnQuE", "zxyDPWgydbQjgq" },
+/* 10 */	{ "_K9..SaltNrQgIYUAeoY", "726 even" },
+/* 11 */	{ "_J9..SDSD5YGyRCr4W4c", "" },
+/* "old"-style, valid salts */
+/* 12 */	{ "CCNf8Sbh3HDfQ", "U*U*U*U*" },
+/* 13 */	{ "CCX.K.MFy4Ois", "U*U***U" },
+/* 14 */	{ "CC4rMpbg9AMZ.", "U*U***U*" },
+/* 15 */	{ "XXxzOu6maQKqQ", "*U*U*U*U" },
+/* 16 */	{ "SDbsugeBiC58A", "" },
+/* 17 */	{ "./xZjzHv5vzVE", "password" },
+/* 18 */	{ "0A2hXM1rXbYgo", "password" },
+/* 19 */	{ "A9RXdR23Y.cY6", "password" },
+/* 20 */	{ "ZziFATVXHo2.6", "password" },
+/* 21 */	{ "zZDDIZ0NOlPzw", "password" },
+/* "old"-style, "reasonable" invalid salts, UFC-crypt behavior expected */
+/* 22 */	{ "\001\002wyd0KZo65Jo", "password" },
+/* 23 */	{ "a_C10Dk/ExaG.", "password" },
+/* 24 */	{ "~\377.5OTsRVjwLo", "password" },
+/* The below are erroneous inputs, so NULL return is expected/required */
+/* 25 */	{ "", "" }, /* no salt */
+/* 26 */	{ " ", "" }, /* setting string is too short */
+/* 27 */	{ "a:", "" }, /* unsafe character */
+/* 28 */	{ "\na", "" }, /* unsafe character */
+/* 29 */	{ "_/......", "" }, /* setting string is too short for its type */
+/* 30 */	{ "_........", "" }, /* zero iteration count */
+/* 31 */	{ "_/!......", "" }, /* invalid character in count */
+/* 32 */	{ "_/......!", "" }, /* invalid character in salt */
+/* 33 */	{ NULL, NULL }
+};
+
+ATF_TC(crypt_salts);
+
+ATF_TC_HEAD(crypt_salts, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "crypt(3) salt consistency checks");
+}
+
+ATF_TC_BODY(crypt_salts, tc)
+{
+	for (size_t i = 0; tests[i].hash; i++) {
+		char *hash = crypt(tests[i].pw, tests[i].hash);
+		if (!hash) {
+			ATF_CHECK_MSG(0, "Test %zu NULL\n", i);
+			continue;
+		}
+		if (strcmp(hash, "*0") == 0 && strlen(tests[i].hash) < 13)
+			continue; /* expected failure */
+		if (strcmp(hash, tests[i].hash))
+			ATF_CHECK_MSG(0, "Test %zu %s != %s\n",
+			    i, hash, tests[i].hash);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, crypt_salts);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/atf.terminfo b/contrib/netbsd-tests/lib/libcurses/atf.terminfo
new file mode 100644
index 000000000000..fcd34b6d8210
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/atf.terminfo
@@ -0,0 +1,44 @@
+# Based on xterm capabilities
+atf|atf automatic test frame pseudo terminal,
+	am, bce, ccc, km, mc5i, mir, msgr, npc, xenl,
+	colors#8, cols#80, it#8, lines#24, pairs#64,
+	acsc=++\,\,--..00``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	bel=bel, blink=blink, bold=bold, cbt=cbt, civis=civis, clear=clear,
+	cnorm=cnorm, cr=^M, csr=csr%i%p1%d;%p2%dX, cub=cub%p1%dX,
+	cub1=^H, cud=cud%p1%dX, cud1=^J, cuf=cuf%p1%dX, cuf1=,
+	cup=cup%i%p1%d;%p2%dX, cuu=cuu%p1%dX, cuu1=, cvvis=cvvis,
+	dch=dch%p1%dX, dch1=, dl=dl%p1%dX, dl1=, dim=dim, ech=ech%p1%dX,
+	ed=ed, el=el, el1=el1, enacs=enacs, flash=flash, home=home,
+	hpa=hpa%i%p1%dX, ht=^I, hts=hts, ich=ich%p1%dX, il=il%p1%dX,
+	il1=il1, ind=^M, indn=indn%p1%dX, invis=invis,
+	is2=is2, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
+	kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
+	kRIT=\E[1;2C, kb2=\EOE, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kent=\EOM,
+	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
+	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
+	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
+	kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
+	kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
+	kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, kf4=\EOS,
+	kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~, kf43=\E[18;6~,
+	kf44=\E[19;6~, kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
+	kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q,
+	kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~,
+	kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\E[1;4P,
+	kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+	kpp=\E[5~, kri=\E[1;2A, mc0=mc0, mc4=mc4, mc5=mc5,
+	op=op, rc=rc, rev=rev, ri=ri, rin=rin%p1%dX, rmacs=rmacs,
+	rmam=rmam, rmcup=rmcup, rmir=rmir, rmkx=rmkx,
+	rmm=rmm, rmso=rmso, rmul=rmul, rs1=rs1,
+	rs2=rs2, sc=sc, setab=setab%p1%dX,
+	setaf=setaf%p1%dX, setb=setb%p1%dX, setf=setf%p1%dX,
+	sgr=sgr%p1%d;%p2%d;%p3%d;%p4%d;%p5%d;%p6%d;%p7%d;%p8;%d;%p9%dX,
+	sgr0=sgr0, smacs=smacs, smam=smam, smcup=smcup,
+	smir=smir, smkx=smkx, smm=smm, smso=smso, smul=smul,
+	tbc=tbc, u6=u6%d;%dX, u7=u7, u8=u8, u9=u9,
+	vpa=vpa%p1%dX
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/addch.chk b/contrib/netbsd-tests/lib/libcurses/check_files/addch.chk
new file mode 100644
index 000000000000..3e2c6bb13969
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/addch.chk
@@ -0,0 +1 @@
+smsotrmso
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/addchstr.chk b/contrib/netbsd-tests/lib/libcurses/check_files/addchstr.chk
new file mode 100644
index 000000000000..42286d02fd06
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/addchstr.chk
@@ -0,0 +1 @@
+revabcdehomesgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/addstr.chk b/contrib/netbsd-tests/lib/libcurses/check_files/addstr.chk
new file mode 100644
index 000000000000..6a8165460570
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/addstr.chk
@@ -0,0 +1 @@
+abcde
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/attributes.chk b/contrib/netbsd-tests/lib/libcurses/check_files/attributes.chk
new file mode 100644
index 000000000000..be35b56ad34d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/attributes.chk
@@ -0,0 +1 @@
+smsoblinkhellormsosgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/background1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/background1.chk
new file mode 100644
index 000000000000..e52e4391479b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/background1.chk
@@ -0,0 +1 @@
+smulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup2;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup3;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup4;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup5;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup6;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup7;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup8;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup9;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup10;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup11;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup12;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup13;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup14;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup15;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup16;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup17;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup18;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup19;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup20;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup21;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup22;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup23;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup24;1XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcup1;1Xrmul
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/background2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/background2.chk
new file mode 100644
index 000000000000..55a216387b4f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/background2.chk
@@ -0,0 +1 @@
+smula test stringrmul
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/background3.chk b/contrib/netbsd-tests/lib/libcurses/check_files/background3.chk
new file mode 100644
index 000000000000..732f4cc3caea
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/background3.chk
@@ -0,0 +1 @@
+cup3;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/background4.chk b/contrib/netbsd-tests/lib/libcurses/check_files/background4.chk
new file mode 100644
index 000000000000..05698e27c667
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/background4.chk
@@ -0,0 +1,6 @@
+cup1;14Xcup3;6Xrevwindow
+B1BBBB
+BBBBBB
+BBBBBB
+BBBBBB
+BBBBBBcup4;8Xsgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/background5.chk b/contrib/netbsd-tests/lib/libcurses/check_files/background5.chk
new file mode 100644
index 000000000000..6c3797511f85
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/background5.chk
@@ -0,0 +1,3 @@
+cup1;14Xcup4;8Xrevhell
+o worl
+dsgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/bell.chk b/contrib/netbsd-tests/lib/libcurses/check_files/bell.chk
new file mode 100644
index 000000000000..f4d3c21947ff
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/bell.chk
@@ -0,0 +1 @@
+bel
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/box_standout.chk b/contrib/netbsd-tests/lib/libcurses/check_files/box_standout.chk
new file mode 100644
index 000000000000..5bd91e123f05
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/box_standout.chk
@@ -0,0 +1,5 @@
+revsmacsqqqqrmacs
+sgr0smsosmacsxrmacssmacsxrmacs
+smacsxrmacssmacsxrmacs
+smacsxrmacssmacsxrmacs
+smacsxrmacssmacsxrmacscup8;7Xrmsorevsmacsqqqqrmacscup3;6Xsgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/chgat1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/chgat1.chk
new file mode 100644
index 000000000000..e9b8b589fc8e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/chgat1.chk
@@ -0,0 +1 @@
+setaf7Xsetab0Xdsetaf3Xsetab6Xrev     homesgr0
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/chgat2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/chgat2.chk
new file mode 100644
index 000000000000..cadfb37ee7e7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/chgat2.chk
@@ -0,0 +1 @@
+setaf7Xsetab0Xeop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/chgat3.chk b/contrib/netbsd-tests/lib/libcurses/check_files/chgat3.chk
new file mode 100644
index 000000000000..7d57a9012f23
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/chgat3.chk
@@ -0,0 +1 @@
+homesetaf3Xsetab6Xsmulde                                                                              cup1;1Xrmulop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear1.chk
new file mode 100644
index 000000000000..9c7d34f7fe67
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear1.chk
@@ -0,0 +1 @@
+clear
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear10.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear10.chk
new file mode 100644
index 000000000000..1baa2a5b24e5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear10.chk
@@ -0,0 +1 @@
+cup7;7X   
EEEEE
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear2.chk
new file mode 100644
index 000000000000..f25000b3fef5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear2.chk
@@ -0,0 +1 @@
+cup6;6Xabcdecup21;6Xfghijcup11;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear3.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear3.chk
new file mode 100644
index 000000000000..dfdd90d37611
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear3.chk
@@ -0,0 +1 @@
+cup21;6Xelcup11;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear4.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear4.chk
new file mode 100644
index 000000000000..abe5be89f044
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear4.chk
@@ -0,0 +1 @@
+elhome
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear5.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear5.chk
new file mode 100644
index 000000000000..d9df62dc835e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear5.chk
@@ -0,0 +1,23 @@
+homeel
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+elhome
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear6.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear6.chk
new file mode 100644
index 000000000000..ff815d32d0c4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear6.chk
@@ -0,0 +1 @@
+abccup7;7Xefgcup4;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear7.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear7.chk
new file mode 100644
index 000000000000..8b392c3a7cc7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear7.chk
@@ -0,0 +1 @@
+cup7;7Xelcup4;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear8.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear8.chk
new file mode 100644
index 000000000000..9c9354e3dccc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear8.chk
@@ -0,0 +1,6 @@
+cup4;6X      
+EEEEE      
+EEEEE      
+EEEEE      
+EEEEE      
+EEEEE      cup3;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/clear9.chk b/contrib/netbsd-tests/lib/libcurses/check_files/clear9.chk
new file mode 100644
index 000000000000..c5834a1aea45
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/clear9.chk
@@ -0,0 +1,6 @@
+cup3;6X      
+EEEEE      
+EEEEE      
+EEEEE      
+EEEEE      
+EEEEE      cup3;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_blank_draw.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_blank_draw.chk
new file mode 100644
index 000000000000..42ad0e2b1c27
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_blank_draw.chk
@@ -0,0 +1,24 @@
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xel
+opsetaf7Xsetab0Xelhomeop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_blue_back.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_blue_back.chk
new file mode 100644
index 000000000000..5c02e4d3e59c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_blue_back.chk
@@ -0,0 +1,24 @@
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xel
+opopsetab4Xelhome
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_default.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_default.chk
new file mode 100644
index 000000000000..d23ddaf9e404
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_default.chk
@@ -0,0 +1,24 @@
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopel
+opopelhomeop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_red_fore.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_red_fore.chk
new file mode 100644
index 000000000000..3ad45136f95f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_red_fore.chk
@@ -0,0 +1,24 @@
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xel
+opopsetaf1Xelhomeop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_set.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_set.chk
new file mode 100644
index 000000000000..d8363b712699
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_set.chk
@@ -0,0 +1 @@
+setaf1Xsetab2Xtestingop
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/color_start.chk b/contrib/netbsd-tests/lib/libcurses/check_files/color_start.chk
new file mode 100644
index 000000000000..d314d076e59d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/color_start.chk
@@ -0,0 +1 @@
+op
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin1.chk
new file mode 100644
index 000000000000..826062a85686
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin1.chk
@@ -0,0 +1 @@
+cup11;15X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin10.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin10.chk
new file mode 100644
index 000000000000..d5c8ea52793d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin10.chk
@@ -0,0 +1 @@
+cup11;15Xt s i cup12;15Xg e t cup13;15Xn t s cup14;15X n t scup15;15Xt n t cup16;15X t n t
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin11.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin11.chk
new file mode 100644
index 000000000000..9315b7674ece
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin11.chk
@@ -0,0 +1,4 @@
+cup3;6Xel
+     el
+     elcup6;7Xel
+     elcup8;7Xelcup3;6Xcup11;15Xelcup12;15Xelcup13;15Xelcup14;16Xelcup15;15Xelcup16;16Xelcup11;15X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin12.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin12.chk
new file mode 100644
index 000000000000..bc1a52638acb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin12.chk
@@ -0,0 +1,4 @@
+cup3;6Xt s i
+     g e t
+     n t scup6;7Xn t s
+     t n tcup8;7Xt n tcup8;11X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin13.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin13.chk
new file mode 100644
index 000000000000..f2a8913c47ba
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin13.chk
@@ -0,0 +1 @@
+cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup16;15Xs i g 
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin14.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin14.chk
new file mode 100644
index 000000000000..e7fd505f079f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin14.chk
@@ -0,0 +1 @@
+cup11;15Xtesticup12;15Xgtestcup13;15Xngtescup14;16Xngtescup15;15Xtingtcup16;16Xtingt
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin2.chk
new file mode 100644
index 000000000000..aac067104527
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin2.chk
@@ -0,0 +1,6 @@
+cup3;6Xtestin
+     gtesti
+     ngtest
+     ingtes
+     tingte
+     stingtcup8;11X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin3.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin3.chk
new file mode 100644
index 000000000000..317cd93d7848
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin3.chk
@@ -0,0 +1 @@
+cup12;16Xtestincup13;16Xgtesticup14;16Xngtestcup15;16Xingtescup16;16Xtingtecup17;16Xstingt
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin4.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin4.chk
new file mode 100644
index 000000000000..4fa78a9f8386
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin4.chk
@@ -0,0 +1,6 @@
+cup3;6Xel
+     el
+     el
+     el
+     el
+     elcup12;16Xelcup13;16Xelcup14;16Xelcup15;16Xelcup16;16Xelcup17;16Xelcup11;15X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin5.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin5.chk
new file mode 100644
index 000000000000..4f0d7da448b4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin5.chk
@@ -0,0 +1 @@
+testingtecup12;15Xstingtestcup13;15Xingtestincup14;15Xgtestingtcup15;15Xestingtescup16;15Xtingtesticup16;23X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin6.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin6.chk
new file mode 100644
index 000000000000..314dac81d905
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin6.chk
@@ -0,0 +1,6 @@
+cup3;6Xtestin
+     stingt
+     ingtes
+     gtesti
+     esting
+     tingtecup8;11X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin7.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin7.chk
new file mode 100644
index 000000000000..d10a7c26bee8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin7.chk
@@ -0,0 +1,6 @@
+cup3;6Xel
+     el
+     el
+     el
+     el
+     elcup11;15Xelcup12;15Xelcup13;15Xelcup14;15Xelcup15;15Xelcup16;15Xel
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin8.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin8.chk
new file mode 100644
index 000000000000..bc1a52638acb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin8.chk
@@ -0,0 +1,4 @@
+cup3;6Xt s i
+     g e t
+     n t scup6;7Xn t s
+     t n tcup8;7Xt n tcup8;11X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/copywin9.chk b/contrib/netbsd-tests/lib/libcurses/check_files/copywin9.chk
new file mode 100644
index 000000000000..f2a8913c47ba
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/copywin9.chk
@@ -0,0 +1 @@
+cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup16;15Xs i g 
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/curs_set1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set1.chk
new file mode 100644
index 000000000000..81a818c495ba
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set1.chk
@@ -0,0 +1 @@
+civis
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/curs_set2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set2.chk
new file mode 100644
index 000000000000..76824632eb49
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set2.chk
@@ -0,0 +1 @@
+cnorm
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/curs_set3.chk b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set3.chk
new file mode 100644
index 000000000000..0f3e744bdfef
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/curs_set3.chk
@@ -0,0 +1 @@
+cvvis
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/curses_start.chk b/contrib/netbsd-tests/lib/libcurses/check_files/curses_start.chk
new file mode 100644
index 000000000000..7c4f92c1ef39
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/curses_start.chk
@@ -0,0 +1 @@
+enacsenacssmcupcnormclearclear
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/fill.chk b/contrib/netbsd-tests/lib/libcurses/check_files/fill.chk
new file mode 100644
index 000000000000..2d8937414337
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/fill.chk
@@ -0,0 +1,23 @@
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEhome
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/home.chk b/contrib/netbsd-tests/lib/libcurses/check_files/home.chk
new file mode 100644
index 000000000000..0247178b6e38
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/home.chk
@@ -0,0 +1 @@
+home
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/timeout.chk b/contrib/netbsd-tests/lib/libcurses/check_files/timeout.chk
new file mode 100644
index 000000000000..6463b1e7cafc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/timeout.chk
@@ -0,0 +1 @@
+asmkx
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wborder.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wborder.chk
new file mode 100644
index 000000000000..50857fa25747
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wborder.chk
@@ -0,0 +1,6 @@
+smacslqqqqkrmacs
+     smacsxrmacs    smacsxrmacs
+     smacsxrmacs    smacsxrmacs
+     smacsxrmacs    smacsxrmacs
+     smacsxrmacs    smacsxrmacs
+     smacsmqqqqjrmacscup3;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wborder_refresh.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wborder_refresh.chk
new file mode 100644
index 000000000000..0247178b6e38
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wborder_refresh.chk
@@ -0,0 +1 @@
+home
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr.chk
new file mode 100644
index 000000000000..770eab4480ba
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr.chk
@@ -0,0 +1 @@
+input
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr_refresh.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr_refresh.chk
new file mode 100644
index 000000000000..e8bbed52ce2e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wgetstr_refresh.chk
@@ -0,0 +1,2 @@
+
+     
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/window.chk b/contrib/netbsd-tests/lib/libcurses/check_files/window.chk
new file mode 100644
index 000000000000..732f4cc3caea
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/window.chk
@@ -0,0 +1 @@
+cup3;6X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wprintw_refresh.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wprintw_refresh.chk
new file mode 100644
index 000000000000..53794adf5b54
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wprintw_refresh.chk
@@ -0,0 +1 @@
+cup3;6Xhellocup3;10X
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wscrl1.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wscrl1.chk
new file mode 100644
index 000000000000..627141d244e9
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wscrl1.chk
@@ -0,0 +1 @@
+cup4;7Xxxxxhome
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/check_files/wscrl2.chk b/contrib/netbsd-tests/lib/libcurses/check_files/wscrl2.chk
new file mode 100644
index 000000000000..ee36e556743f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/check_files/wscrl2.chk
@@ -0,0 +1 @@
+cup4;7Xelcup6;7Xxxxxhome
\ No newline at end of file
diff --git a/contrib/netbsd-tests/lib/libcurses/director/director.c b/contrib/netbsd-tests/lib/libcurses/director/director.c
new file mode 100644
index 000000000000..c73ddae27112
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/director/director.c
@@ -0,0 +1,279 @@
+/*	$NetBSD: director.c,v 1.10 2012/06/03 23:19:11 joerg Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <termios.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <util.h>
+#include <err.h>
+#include "returns.h"
+
+void yyparse(void);
+#define DEF_TERMPATH "."
+#define DEF_TERM "atf"
+#define DEF_SLAVE "./slave"
+
+const char *def_check_path = "./"; /* default check path */
+const char *def_include_path = "./"; /* default include path */
+
+extern size_t nvars;	/* In testlang_conf.y */
+saved_data_t  saved_output;	/* In testlang_conf.y */
+int cmdpipe[2];		/* command pipe between director and slave */
+int slvpipe[2];		/* reply pipe back from slave */
+int master;		/* pty to the slave */
+int verbose;		/* control verbosity of tests */
+const char *check_path;	/* path to prepend to check files for output
+			   validation */
+const char *include_path;	/* path to prepend to include files */
+char *cur_file;		/* name of file currently being read */
+
+void init_parse_variables(int); /* in testlang_parse.y */
+
+/*
+ * Handle the slave exiting unexpectedly, try to recover the exit message
+ * and print it out.
+ */
+static void
+slave_died(int param)
+{
+	char last_words[256];
+	size_t count;
+
+	fprintf(stderr, "ERROR: Slave has exited\n");
+	if (saved_output.count > 0) {
+		fprintf(stderr, "output from slave: ");
+		for (count = 0; count < saved_output.count; count ++) {
+			if (isprint((unsigned char)saved_output.data[count]))
+			    fprintf(stderr, "%c", saved_output.data[count]);
+		}
+		fprintf(stderr, "\n");
+	}
+
+	if ((count = read(master, &last_words, 255)) > 0) {
+		last_words[count] = '\0';
+		fprintf(stderr, "slave exited with message \"%s\"\n",
+			last_words);
+	}
+
+	exit(2);
+}
+
+
+static void
+usage(void)
+{
+	fprintf(stderr, "Usage: %s [-v] [-I include-path] [-C check-path] "
+	    "[-T terminfo-file] [-s pathtoslave] [-t term] "
+	    "commandfile\n", getprogname());
+	fprintf(stderr, " where:\n");
+	fprintf(stderr, "    -v enables verbose test output\n");
+	fprintf(stderr, "    -T is a directory containing the terminfo.cdb "
+	    "file, or a file holding the terminfo description n");
+	fprintf(stderr, "    -s is the path to the slave executable\n");
+	fprintf(stderr, "    -t is value to set TERM to for the test\n");
+	fprintf(stderr, "    -I is the directory to include files\n");
+	fprintf(stderr, "    -C is the directory for config files\n");
+	fprintf(stderr, "    commandfile is a file of test directives\n");
+	exit(1);
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	extern char *optarg;
+	extern int optind;
+	const char *termpath, *term, *slave;
+	int ch;
+	pid_t slave_pid;
+	extern FILE *yyin;
+	char *arg1, *arg2, *arg3, *arg4;
+	struct termios term_attr;
+	struct stat st;
+
+	termpath = term = slave = NULL;
+	verbose = 0;
+
+	while ((ch = getopt(argc, argv, "vC:I:p:s:t:T:")) != -1) {
+		switch(ch) {
+		case 'I':
+			include_path = optarg;
+			break;
+		case 'C':
+			check_path = optarg;
+			break;
+		case 'T':
+			termpath = optarg;
+			break;
+		case 'p':
+			termpath = optarg;
+			break;
+		case 's':
+			slave = optarg;
+			break;
+		case 't':
+			term = optarg;
+			break;
+		case 'v':
+			verbose = 1;
+			break;
+		case '?':
+		default:
+			usage();
+			break;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+	if (argc < 1)
+		usage();
+
+	if (termpath == NULL)
+		termpath = DEF_TERMPATH;
+
+	if (slave == NULL)
+		slave = DEF_SLAVE;
+
+	if (term == NULL)
+		term = DEF_TERM;
+
+	if (check_path == NULL)
+		check_path = getenv("CHECK_PATH");
+	if ((check_path == NULL) || (check_path[0] == '\0')) {
+		warn("$CHECK_PATH not set, defaulting to %s", def_check_path);
+		check_path = def_check_path;
+	}
+
+	if (include_path == NULL)
+		include_path = getenv("INCLUDE_PATH");
+	if ((include_path == NULL) || (include_path[0] == '\0')) {
+		warn("$INCLUDE_PATH not set, defaulting to %s",
+			def_include_path);
+		include_path = def_include_path;
+	}
+
+	signal(SIGCHLD, slave_died);
+
+	if (setenv("TERM", term, 1) != 0)
+		err(2, "Failed to set TERM variable");
+
+	if (stat(termpath, &st) == -1)
+		err(1, "Cannot stat %s", termpath);
+
+	if (S_ISDIR(st.st_mode)) {
+		char tinfo[MAXPATHLEN];
+		int l = snprintf(tinfo, sizeof(tinfo), "%s/%s", termpath,
+		    "terminfo.cdb");
+		if (stat(tinfo, &st) == -1)
+			err(1, "Cannot stat `%s'", tinfo);
+		if (l >= 4)
+			tinfo[l - 4] = '\0';
+		if (setenv("TERMINFO", tinfo, 1) != 0)
+			err(1, "Failed to set TERMINFO variable");
+	} else {
+		int fd;
+		char *tinfo;
+		if ((fd = open(termpath, O_RDONLY)) == -1)
+			err(1, "Cannot open `%s'", termpath);
+		if ((tinfo = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_FILE,
+			fd, 0)) == MAP_FAILED)
+			err(1, "Cannot map `%s'", termpath);
+		if (setenv("TERMINFO", tinfo, 1) != 0)
+			err(1, "Failed to set TERMINFO variable");
+		close(fd);
+		munmap(tinfo, (size_t)st.st_size);
+	}
+
+	if (pipe(cmdpipe) < 0)
+		err(1, "Command pipe creation failed");
+
+	if (pipe(slvpipe) < 0)
+		err(1, "Slave pipe creation failed");
+
+	/*
+	 * Create default termios settings for later use
+	 */
+	memset(&term_attr, 0, sizeof(term_attr));
+	term_attr.c_iflag = TTYDEF_IFLAG;
+	term_attr.c_oflag = TTYDEF_OFLAG;
+	term_attr.c_cflag = TTYDEF_CFLAG;
+	term_attr.c_lflag = TTYDEF_LFLAG;
+	cfsetspeed(&term_attr, TTYDEF_SPEED);
+	term_attr.c_cc[VERASE] = '\b';
+	term_attr.c_cc[VKILL] = '\025'; /* ^U */
+
+	if ((slave_pid = forkpty(&master, NULL, &term_attr, NULL)) < 0)
+		err(1, "Fork of pty for slave failed\n");
+
+	if (slave_pid == 0) {
+		/* slave side, just exec the slave process */
+		if (asprintf(&arg1, "%d", cmdpipe[0]) < 0)
+			err(1, "arg1 conversion failed");
+
+		if (asprintf(&arg2, "%d", cmdpipe[1]) < 0)
+			err(1, "arg2 conversion failed");
+
+		if (asprintf(&arg3, "%d", slvpipe[0]) < 0)
+			err(1, "arg3 conversion failed");
+
+		if (asprintf(&arg4, "%d", slvpipe[1]) < 0)
+			err(1, "arg4 conversion failed");
+
+		if (execl(slave, slave, arg1, arg2, arg3, arg4, NULL) < 0)
+			err(1, "Exec of slave %s failed", slave);
+
+		/* NOT REACHED */
+	}
+
+	fcntl(master, F_SETFL, O_NONBLOCK);
+
+	if ((yyin = fopen(argv[0], "r")) == NULL)
+		err(1, "Cannot open command file %s", argv[0]);
+
+	if ((cur_file = strdup(argv[0])) == NULL)
+		err(2, "Failed to alloc memory for test file name");
+
+	init_parse_variables(1);
+
+	yyparse();
+	fclose(yyin);
+
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/director/returns.h b/contrib/netbsd-tests/lib/libcurses/director/returns.h
new file mode 100644
index 000000000000..150e35833576
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/director/returns.h
@@ -0,0 +1,66 @@
+/*	$NetBSD: returns.h,v 1.1 2011/04/10 09:55:09 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 CTF_RETURNS_H
+#define CTF_RETURNS_H 1
+
+
+typedef enum {
+	ret_number = 1,
+	ret_string,
+	ret_byte,
+	ret_err,
+	ret_ok,
+	ret_null,
+	ret_nonnull,
+	ret_var,
+	ret_ref,
+	ret_count,
+	ret_slave_error
+} returns_enum_t;
+
+typedef struct {
+	returns_enum_t	return_type;
+	void		*return_value;	/* used if return_type is ret_num or
+					   or ret_byte or ret_string */
+	size_t		return_len;	/* number of bytes in return_value iff
+					   return_type is ret_byte */
+	int		return_index;	/* index into var array for return
+					   if return_type is ret_var */
+} returns_t;
+
+typedef struct {
+	size_t	count;
+	size_t	allocated;
+	size_t	readp;
+	char	*data;
+} saved_data_t;
+
+#endif /* CTF_RETURNS_H */
diff --git a/contrib/netbsd-tests/lib/libcurses/director/testlang_conf.l b/contrib/netbsd-tests/lib/libcurses/director/testlang_conf.l
new file mode 100644
index 000000000000..a732afce3a89
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/director/testlang_conf.l
@@ -0,0 +1,437 @@
+%{
+/*	$NetBSD: testlang_conf.l,v 1.7 2013/11/21 11:06:04 blymn Exp $ 	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+
+#include <curses.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <err.h>
+#include "returns.h"
+#include "testlang_parse.h"
+
+#define MAX_INCLUDES 32 /* limit for the number of nested includes */
+
+int yylex(void);
+
+extern size_t line;
+extern char *include_path; 	/* from director.c */
+extern char *cur_file;		/* from director.c */
+
+static int include_stack[MAX_INCLUDES];
+static char *include_files[MAX_INCLUDES];
+static int include_ptr = 0;
+
+static char *
+dequote(const char *s, size_t *len)
+{
+	const unsigned char *p;
+	char *buf, *q;
+
+	*len = 0;
+	p = (const unsigned char *)s;
+	while (*p) {
+		if (*p == '\\' && *(p+1)) {
+			if (isdigit(*(p+1)) && *(p+2) && isdigit(*(p+2)) &&
+			    *(p+3) && isdigit(*(p+3)))
+				p += 3;
+			else
+				++p;
+		}
+		++(*len);
+		++p;
+	}
+
+	buf = malloc(*len + 1);
+	if (buf == NULL)
+		return NULL;
+
+	p = (const unsigned char *)s;
+	q = buf;
+	while (*p) {
+		if (*p == '\\' && *(p+1)) {
+			++p;
+			if (isdigit(*p)) {
+				if (*(p+1) && isdigit(*(p+1)) && *(p+2) &&
+				    isdigit(*(p+2))) {
+					*q++ = ((*p - '0') * 8 + (*(p+1) - '0')) * 8 + (*(p+2) - '0');
+					p += 3;
+				} else {
+					*q++ = *p++;
+				}
+			} else {
+				switch (*p) {
+				case 'e':
+					/* escape */
+					*q++ = '\e';
+					p++;
+					break;
+
+				case 'n':
+					/* newline */
+					*q++ = '\n';
+					p++;
+					break;
+
+				case 'r':
+					/* carriage return */
+					*q++ = '\r';
+					p++;
+					break;
+
+				case 't':
+					/* tab */
+					*q++ = '\t';
+					p++;
+					break;
+
+				case '\\':
+					/* backslash */
+					*q++ = '\\';
+					p++;
+					break;
+
+				default:
+					*q++ = *p++;
+				}
+			}
+		} else
+			*q++ = *p++;
+	}
+	*q++ = '\0';
+
+	return buf;
+}
+%}
+
+HEX		0[xX][0-9a-zA-Z]+
+STRING		[0-9a-z!#-&(-^ \t%._\\]+
+numeric		[-0-9]+
+PCHAR           (\\.|[^ \t\n])
+ASSIGN		[aA][sS][sS][iI][gG][nN]
+CALL2		[cC][aA][lL][lL]2
+CALL3		[cC][aA][lL][lL]3
+CALL4		[cC][aA][lL][lL]4
+CALL		[cC][aA][lL][lL]
+CHECK		[cC][hH][eE][cC][kK]
+DELAY		[dD][eE][lL][aA][yY]
+INPUT		[iI][nN][pP][uU][tT]
+NOINPUT		[nN][oO][iI][nN][pP][uU][tT]
+OK_RET		[oO][kK]
+ERR_RET		[eE][rR][rR]
+COMPARE		[cC][oO][mM][pP][aA][rR][eE]
+COMPAREND	[cC][oO][mM][pP][aA][rR][eE][Nn][Dd]
+FILENAME	[A-Za-z0-9.][A-Za-z0-9./_-]+
+VARNAME		[A-Za-z][A-Za-z0-9_-]+
+NULL_RET	NULL
+NON_NULL	NON_NULL
+BYTE		BYTE
+OR		\|
+LHB		\(
+RHB		\)
+
+%x incl
+%option noinput nounput
+
+%%
+
+include		BEGIN(incl);
+
+<incl>[ \t]*      /* eat the whitespace */
+<incl>[^ \t\n]+   { /* got the include file name */
+		char inc_file[MAXPATHLEN];
+
+		if (include_ptr > MAX_INCLUDES) {
+			fprintf(stderr,
+				"Maximum number of nested includes exceeded "
+				"at line %zu of file %s\n", line, cur_file);
+				exit(2);
+		}
+
+		if (yytext[0] != '/') {
+			if (strlcpy(inc_file, include_path, sizeof(inc_file))
+			    >= sizeof(inc_file))
+				err(2, "CHECK_PATH too long");
+			if ((include_path[strlen(include_path) - 1] != '/') &&
+			    ((strlcat(inc_file, "/", sizeof(inc_file))
+			    >= sizeof(inc_file))))
+				err(2, "Could not append / to include file path");
+		} else {
+			inc_file[0] = '\0';
+		}
+
+		if (strlcat(inc_file, yytext, sizeof(inc_file))
+		    >= sizeof(inc_file))
+			err(2, "Path to include file path overflowed");
+
+		yyin = fopen(inc_file, "r" );
+
+		if (!yyin)
+			err(1, "Error opening %s", inc_file);
+
+		yypush_buffer_state(yy_create_buffer(yyin, YY_BUF_SIZE));
+
+		include_stack[include_ptr] = line;
+		include_files[include_ptr++] = cur_file;
+		cur_file = strdup(inc_file);
+		if (cur_file == NULL)
+			err(2, "Cannot allocate new include file string");
+		line = 0;
+		BEGIN(INITIAL);
+	}
+
+<<EOF>>	{
+		yypop_buffer_state();
+
+		if ( !YY_CURRENT_BUFFER )
+		{
+			yyterminate();
+		}
+
+		if (--include_ptr < 0)
+			err(2, "Include stack underflow");
+
+		free(cur_file);
+		cur_file = include_files[include_ptr];
+		line = include_stack[include_ptr];
+	}
+
+{ASSIGN}	{
+			return ASSIGN;
+		}
+
+{CALL2}		{
+			return CALL2;
+		}
+
+{CALL3}		{
+			return CALL3;
+		}
+
+{CALL4}		{
+			return CALL4;
+		}
+
+{CALL}		{
+			return CALL;
+		}
+
+{CHECK}		{
+			return CHECK;
+		}
+
+{DELAY}		{
+			return DELAY;
+		}
+
+{INPUT}		{
+			return INPUT;
+		}
+
+{NOINPUT}		{
+			return NOINPUT;
+		}
+
+{COMPARE}	{
+			return COMPARE;
+		}
+
+{COMPAREND}	{
+			return COMPAREND;
+		}
+
+{NON_NULL}	{
+			return NON_NULL;
+		}
+
+{NULL_RET}		{
+			return NULL_RET;
+		}
+
+{OK_RET}		{
+			return OK_RET;
+		}
+
+{ERR_RET}		{
+			return ERR_RET;
+		}
+
+{OR}		{
+			return OR;
+		}
+
+{LHB}		{
+			return LHB;
+		}
+
+{RHB}		{
+			return RHB;
+		}
+
+{HEX}		{
+			/* Hex value, convert to decimal and return numeric */
+			unsigned long val;
+
+			if (sscanf(yytext, "%lx", &val) != 1)
+				err(1, "Bad hex conversion");
+
+			asprintf(&yylval.string, "%ld", val);
+			return numeric;
+		}
+
+
+{numeric}		{
+			if ((yylval.string = strdup(yytext)) == NULL)
+				err(1, "Cannot allocate numeric string");
+			return numeric;
+}
+
+{VARNAME}	{
+			if ((yylval.string = strdup(yytext)) == NULL)
+				err(1, "Cannot allocate string for varname");
+			return VARNAME;
+		}
+
+{FILENAME}	{
+			size_t len;
+
+			if ((yylval.string = dequote(yytext, &len)) == NULL)
+				err(1, "Cannot allocate filename string");
+			return FILENAME;
+		}
+
+	/* path */
+\/{PCHAR}+	{
+			size_t len;
+			if ((yylval.string = dequote(yytext, &len)) == NULL)
+				err(1, "Cannot allocate string");
+			return PATH;
+		}
+
+\'{STRING}\' 	{
+			char *p;
+			size_t len;
+
+			if ((yylval.retval = malloc(sizeof(returns_t))) == NULL)
+				err(1, "Cannot allocate return struct");
+			p = yytext;
+			p++; /* skip the leading ' */
+			if ((yylval.retval->return_value = dequote(p, &len))
+			     == NULL)
+				err(1, "Cannot allocate string");
+
+			yylval.retval->return_type = ret_byte;
+			/* trim trailing ' */
+			yylval.retval->return_len = len - 1;
+			return BYTE;
+		}
+
+\`{STRING}\` 	{
+			char *p, *str;
+			size_t len, chlen;
+			size_t i;
+			chtype *rv;
+
+			if ((yylval.retval = malloc(sizeof(returns_t))) == NULL)
+				err(1, "Cannot allocate return struct");
+			p = yytext;
+			p++; /* skip the leading ' */
+			if ((str = dequote(p, &len)) == NULL)
+				err(1, "Cannot allocate string");
+			len--; /* trim trailing ` */
+			if ((len % 2) != 0)
+				len--;
+
+			chlen = ((len / 2) + 1) * sizeof(chtype);
+			if ((yylval.retval->return_value = malloc(chlen))
+			    == NULL)
+				err(1, "Cannot allocate chtype array");
+
+			rv = yylval.retval->return_value;
+			for (i = 0; i < len; i += 2)
+				*rv++ = (str[i] << 8) | str[i+1];
+			*rv = __NORMAL | '\0'; /* terminates chtype array */	
+			yylval.retval->return_type = ret_byte;
+			yylval.retval->return_len = chlen;
+			return BYTE;
+		}
+
+\"{STRING}\" 	{
+			char *p;
+			size_t len;
+
+			p = yytext;
+			p++; /* skip the leading " */
+			if ((yylval.string = dequote(p, &len)) == NULL)
+				err(1, "Cannot allocate string");
+
+			/* remove trailing " */
+			yylval.string[len - 1] = '\0';
+			return STRING;
+		}
+
+\${VARNAME}	{
+			char *p;
+
+			p = yytext;
+			p++; /* skip $ before var name */
+			if ((yylval.string = strdup(p)) == NULL)
+				err(1, "Cannot allocate string for varname");
+			return VARIABLE;
+		}
+	
+	/* comments, white-outs */
+[ \t\r]		|
+#.*		;
+^#.*\n		|
+#.*\n		|
+\\\n		|
+^\n		{ 
+line++; }
+
+	/* eol on a line with data. need to process, return eol */
+\n		{
+			line++;
+			return EOL;
+		}
+
+.		{
+		}
+
+%%
+
+int
+yywrap(void)
+{
+	return 1;
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/director/testlang_parse.y b/contrib/netbsd-tests/lib/libcurses/director/testlang_parse.y
new file mode 100644
index 000000000000..37c813fa6c27
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/director/testlang_parse.y
@@ -0,0 +1,1617 @@
+%{
+/*	$NetBSD: testlang_parse.y,v 1.13 2012/09/19 11:51:56 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+#include <assert.h>
+#include <curses.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <err.h>
+#include <unistd.h>
+#include <poll.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/syslimits.h>
+#include <time.h>
+#include <vis.h>
+#include <stdint.h>
+#include "returns.h"
+
+#define YYDEBUG 1
+
+extern int verbose;
+extern int cmdpipe[2];
+extern int slvpipe[2];
+extern int master;
+extern struct pollfd readfd;
+extern char *check_path;
+extern char *cur_file;		/* from director.c */
+
+int yylex(void);
+
+size_t line;
+
+static int input_delay;
+
+/* time delay between inputs chars - default to 0.1ms minimum to prevent
+ * problems with input tests
+ */
+#define DELAY_MIN 0.1
+
+/* time delay after a function call - allows the slave time to
+ * run the function and output data before we do other actions.
+ * Set this to 50ms.
+ */
+#define POST_CALL_DELAY 50
+
+static struct timespec delay_spec = {0, 1000 * DELAY_MIN};
+static struct timespec delay_post_call = {0, 1000 * POST_CALL_DELAY};
+
+static char *input_str;	/* string to feed in as input */
+static bool no_input;	/* don't need more input */
+
+#define READ_PIPE  0
+#define WRITE_PIPE 1
+
+const char *returns_enum_names[] = {
+	"unused", "numeric", "string", "byte", "ERR", "OK", "NULL", "not NULL",
+	"variable", "reference", "returns count", "slave error"
+};
+
+typedef enum {
+	arg_static,
+	arg_byte,
+	arg_var,
+	arg_null
+} args_state_t;
+
+static const char *args_enum_names[] = {
+	"static", "byte", "var", "NULL"
+};
+
+typedef struct {
+	args_state_t	arg_type;
+	size_t		arg_len;
+	char		*arg_string;
+	int		var_index;
+} args_t;
+
+typedef struct {
+	char		*function;
+	int		nrets;		/* number of returns */
+	returns_t	*returns;	/* array of expected returns */
+	int		nargs;		/* number of arguments */
+	args_t		*args;		/* arguments for the call */
+} cmd_line_t;
+
+static cmd_line_t	command;
+
+typedef struct {
+	char *name;
+	size_t len;
+	returns_enum_t type;
+	void *value;
+} var_t;
+
+static size_t nvars; 		/* Number of declared variables */
+static var_t *vars; 		/* Variables defined during the test. */
+
+static int	check_function_table(char *, const char *[], int);
+static int	find_var_index(const char *);
+static void 	assign_arg(args_state_t, void *);
+static int	assign_var(char *);
+void		init_parse_variables(int);
+static void	validate(int, void *);
+static void	validate_return(const char *, const char *, int);
+static void	validate_variable(int, returns_enum_t, const void *, int, int);
+static void	validate_byte(returns_t *, returns_t *, int);
+static void	write_cmd_pipe(char *);
+static void	write_cmd_pipe_args(args_state_t, void *);
+static void	read_cmd_pipe(returns_t *);
+static void	write_func_and_args(void);
+static void	compare_streams(char *, bool);
+static void	do_function_call(size_t);
+static void	save_slave_output(bool);
+static void	validate_type(returns_enum_t, returns_t *, int);
+static void	set_var(returns_enum_t, char *, void *);
+static void	validate_reference(int, void *);
+static char	*numeric_or(char *, char *);
+static char	*get_numeric_var(const char *);
+static void	perform_delay(struct timespec *);
+
+static const char *input_functions[] = {
+	"getch", "getnstr", "getstr", "mvgetnstr", "mvgetstr", "mvgetnstr",
+	"mvgetstr", "mvscanw", "mvwscanw", "scanw", "wgetch", "wgetnstr",
+	"wgetstr"
+};
+
+static const unsigned ninput_functions =
+	sizeof(input_functions) / sizeof(char *);
+
+saved_data_t saved_output;
+
+%}
+
+%union {
+	char *string;
+	returns_t *retval;
+}
+
+%token <string> PATH
+%token <string> STRING
+%token <retval> BYTE
+%token <string> VARNAME
+%token <string> FILENAME
+%token <string> VARIABLE
+%token <string> REFERENCE
+%token <string> NULL_RET
+%token <string> NON_NULL
+%token <string> ERR_RET
+%token <string> OK_RET
+%token <string> numeric
+%token <string> DELAY
+%token <string> INPUT
+%token <string> COMPARE
+%token <string> COMPAREND
+%token <string> ASSIGN
+%token EOL CALL CHECK NOINPUT OR LHB RHB
+%token CALL2 CALL3 CALL4 DRAIN
+
+%nonassoc OR
+
+%%
+
+statement	:	/* empty */
+		| assign statement
+		| call statement
+		| call2 statement
+		| call3 statement
+		| call4 statement
+		| check statement
+		| delay statement
+		| input statement
+		| noinput statement
+		| compare statement
+		| comparend statement
+		| eol statement
+		;
+
+assign		: ASSIGN VARNAME numeric {set_var(ret_number, $2, $3);} eol
+		| ASSIGN VARNAME LHB expr RHB {set_var(ret_number, $2, $<string>4);} eol
+		| ASSIGN VARNAME STRING {set_var(ret_string, $2, $3);} eol
+		| ASSIGN VARNAME BYTE {set_var(ret_byte, $2, $3);} eol
+		;
+
+call		: CALL result fn_name args eol {
+	do_function_call(1);
+}
+		;
+
+call2		: CALL2 result result fn_name args eol {
+	do_function_call(2);
+}
+		;
+
+call3		: CALL3 result result result fn_name args eol {
+	do_function_call(3);
+}
+		;
+
+call4		: CALL4 result result result result fn_name args eol {
+	do_function_call(4);
+ }
+		;
+
+check		: CHECK var returns eol {
+	returns_t retvar;
+	var_t *vptr;
+	if (command.returns[0].return_index == -1)
+		err(1, "Undefined variable in check statement, line %zu"
+		    " of file %s", line, cur_file);
+
+	if (verbose) {
+		fprintf(stderr, "Checking contents of variable %s for %s\n",
+		    vars[command.returns[0].return_index].name,
+		    returns_enum_names[command.returns[1].return_type]);
+	}
+
+	if (((command.returns[1].return_type == ret_byte) &&
+	     (vars[command.returns[0].return_index].type != ret_byte)) ||
+	    vars[command.returns[0].return_index].type != ret_string)
+		err(1, "Var type %s (%d) does not match return type %s (%d)",
+		    returns_enum_names[
+		    vars[command.returns[0].return_index].type],
+		    vars[command.returns[0].return_index].type,
+		    returns_enum_names[command.returns[1].return_type],
+		    command.returns[1].return_type);
+
+	switch (command.returns[1].return_type) {
+	case ret_err:
+		validate_variable(0, ret_string, "ERR",
+				  command.returns[0].return_index, 0);
+		break;
+
+	case ret_ok:
+		validate_variable(0, ret_string, "OK",
+				  command.returns[0].return_index, 0);
+		break;
+
+	case ret_null:
+		validate_variable(0, ret_string, "NULL",
+				  command.returns[0].return_index, 0);
+		break;
+
+	case ret_nonnull:
+		validate_variable(0, ret_string, "NULL",
+				  command.returns[0].return_index, 1);
+		break;
+
+	case ret_string:
+	case ret_number:
+		if (verbose) {
+			fprintf(stderr, " %s == returned %s\n",
+			    (const char *)command.returns[1].return_value,
+			    (const char *)
+			    vars[command.returns[0].return_index].value);
+		}
+		validate_variable(0, ret_string,
+		    command.returns[1].return_value,
+		    command.returns[0].return_index, 0);
+		break;
+
+	case ret_byte:
+		vptr = &vars[command.returns[0].return_index];
+		retvar.return_len = vptr->len;
+		retvar.return_type = vptr->type;
+		retvar.return_value = vptr->value;
+		validate_byte(&retvar, &command.returns[1], 0);
+		break;
+
+	default:
+		err(1, "Malformed check statement at line %zu "
+		    "of file %s", line, cur_file);
+		break;
+	}
+
+	init_parse_variables(0);
+ }
+		;
+
+delay		: DELAY numeric eol {
+	/* set the inter-character delay */
+	if (sscanf($2, "%d", &input_delay) == 0)
+		err(1, "delay specification %s could not be converted to "
+		    "numeric at line %zu of file %s", $2, line, cur_file);
+	if (verbose) {
+		fprintf(stderr, "Set input delay to %d ms\n", input_delay);
+	}
+
+	if (input_delay < DELAY_MIN)
+		input_delay = DELAY_MIN;
+	/*
+	 * Fill in the timespec structure now ready for use later.
+	 * The delay is specified in milliseconds so convert to timespec
+	 * values
+	 */
+	delay_spec.tv_sec = input_delay / 1000;
+	delay_spec.tv_nsec = (input_delay - 1000 * delay_spec.tv_sec) * 1000;
+	if (verbose) {
+		fprintf(stderr, "set delay to %jd.%jd\n",
+		    (intmax_t)delay_spec.tv_sec,
+		    (intmax_t)delay_spec.tv_nsec);
+	}
+
+	init_parse_variables(0);
+ }
+	;
+
+input		: INPUT STRING eol {
+	if (input_str != NULL) {
+		warnx("%s, %zu: Discarding unused input string",
+		    cur_file, line);
+		free(input_str);
+	}
+
+	if ((input_str = malloc(strlen($2) + 1)) == NULL)
+		err(2, "Cannot allocate memory for input string");
+
+	strlcpy(input_str, $2, strlen($2) + 1);
+}
+	;
+
+
+noinput		: NOINPUT eol {
+	if (input_str != NULL) {
+		warnx("%s, %zu: Discarding unused input string",
+		    cur_file, line);
+		free(input_str);
+	}
+
+	no_input = true;
+ }
+
+compare		: COMPARE PATH eol
+		| COMPARE FILENAME eol
+{
+	compare_streams($2, true);
+}
+	;
+
+
+comparend	: COMPAREND PATH eol
+		| COMPAREND FILENAME eol
+{
+	compare_streams($2, false);
+}
+	;
+
+
+result		: returns
+		| var
+		| reference
+		;
+
+returns		: numeric { assign_rets(ret_number, $1); }
+		| LHB expr RHB { assign_rets(ret_number, $<string>2); }
+		| STRING { assign_rets(ret_string, $1); }
+		| BYTE { assign_rets(ret_byte, (void *) $1); }
+		| ERR_RET { assign_rets(ret_err, NULL); }
+		| OK_RET { assign_rets(ret_ok, NULL); }
+		| NULL_RET { assign_rets(ret_null, NULL); }
+		| NON_NULL { assign_rets(ret_nonnull, NULL); }
+		;
+
+var		: VARNAME {
+	assign_rets(ret_var, $1);
+ }
+		;
+
+reference	: VARIABLE {
+	assign_rets(ret_ref, $1);
+ }
+
+fn_name		: VARNAME {
+	if (command.function != NULL)
+		free(command.function);
+
+	command.function = malloc(strlen($1) + 1);
+	if (command.function == NULL)
+		err(1, "Could not allocate memory for function name");
+	strcpy(command.function, $1);
+ }
+		;
+
+expr		: numeric
+		| VARIABLE
+			{ $<string>$ = get_numeric_var($1); }
+		| expr OR expr
+			{ $<string>$ = numeric_or($<string>1, $<string>3); }
+		;
+
+args		: /* empty */
+		| LHB expr RHB { assign_arg(arg_static, $<string>2); } args
+		| numeric { assign_arg(arg_static, $1); } args
+		| STRING { assign_arg(arg_static, $1); } args
+		| BYTE { assign_arg(arg_byte, $1); } args
+		| PATH { assign_arg(arg_static, $1); } args
+		| FILENAME { assign_arg(arg_static, $1); } args
+		| VARNAME { assign_arg(arg_static, $1); } args
+		| VARIABLE  { assign_arg(arg_var, $1); } args
+		| NULL_RET { assign_arg(arg_null, $1); } args
+		;
+
+eol		: EOL
+		;
+
+%%
+
+static void
+excess(const char *fname, size_t lineno, const char *func, const char *comment,
+    const void *data, size_t datalen)
+{
+	size_t dstlen = datalen * 4 + 1;
+	char *dst = malloc(dstlen);
+
+	if (dst == NULL)
+		err(1, "malloc");
+
+	if (strnvisx(dst, dstlen, data, datalen, VIS_WHITE | VIS_OCTAL) == -1)
+		err(1, "strnvisx");
+
+	warnx("%s, %zu: [%s] Excess %zu bytes%s [%s]",
+	    fname, lineno, func, datalen, comment, dst);
+	free(dst);
+}
+
+/*
+ * Get the value of a variable, error if the variable has not been set or
+ * is not a numeric type.
+ */
+static char *
+get_numeric_var(const char *var)
+{
+	int i;
+
+	if ((i = find_var_index(var)) < 0)
+		err(1, "Variable %s is undefined", var);
+
+	if (vars[i].type != ret_number)
+		err(1, "Variable %s is not a numeric type", var);
+
+	return vars[i].value;
+}
+
+/*
+ * Perform a bitwise OR on two numbers and return the result.
+ */
+static char *
+numeric_or(char *n1, char *n2)
+{
+	unsigned long i1, i2, result;
+	char *ret;
+
+	i1 = strtoul(n1, NULL, 10);
+	i2 = strtoul(n2, NULL, 10);
+
+	result = i1 | i2;
+	asprintf(&ret, "%lu", result);
+
+	if (verbose) {
+		fprintf(stderr, "numeric or of 0x%lx (%s) and 0x%lx (%s)"
+		    " results in 0x%lx (%s)\n",
+		    i1, n1, i2, n2, result, ret);
+	}
+
+	return ret;
+}
+
+/*
+ * Sleep for the specified time, handle the sleep getting interrupted
+ * by a signal.
+ */
+static void
+perform_delay(struct timespec *ts)
+{
+	struct timespec delay_copy, delay_remainder;
+
+	delay_copy = *ts;
+	while (nanosleep(&delay_copy, &delay_remainder) < 0) {
+		if (errno != EINTR)
+			err(2, "nanosleep returned error");
+		delay_copy = delay_remainder;
+	}
+}
+
+/*
+ * Assign the value given to the named variable.
+ */
+static void
+set_var(returns_enum_t type, char *name, void *value)
+{
+	int i;
+	char *number;
+	returns_t *ret;
+
+	i = find_var_index(name);
+	if (i < 0)
+		i = assign_var(name);
+
+	vars[i].type = type;
+	if ((type == ret_number) || (type == ret_string)) {
+		number = value;
+		vars[i].len = strlen(number) + 1;
+		vars[i].value = malloc(vars[i].len + 1);
+		if (vars[i].value == NULL)
+			err(1, "Could not malloc memory for assign string");
+		strcpy(vars[i].value, number);
+	} else {
+		/* can only be a byte value */
+		ret = value;
+		vars[i].len = ret->return_len;
+		vars[i].value = malloc(vars[i].len);
+		if (vars[i].value == NULL)
+			err(1, "Could not malloc memory to assign byte string");
+		memcpy(vars[i].value, ret->return_value, vars[i].len);
+	}
+}
+
+/*
+ * Add a new variable to the vars array, the value will be assigned later,
+ * when a test function call returns.
+ */
+static int
+assign_var(char *varname)
+{
+	var_t *temp;
+	char *name;
+
+	if ((name = malloc(strlen(varname) + 1)) == NULL)
+		err(1, "Alloc of varname failed");
+
+	if ((temp = realloc(vars, sizeof(*temp) * (nvars + 1))) == NULL) {
+		free(name);
+		err(1, "Realloc of vars array failed");
+	}
+
+	strcpy(name, varname);
+	vars = temp;
+	vars[nvars].name = name;
+	vars[nvars].len = 0;
+	vars[nvars].value = NULL;
+	nvars++;
+
+	return (nvars - 1);
+}
+
+/*
+ * Allocate and assign a new argument of the given type.
+ */
+static void
+assign_arg(args_state_t arg_type, void *arg)
+{
+	args_t *temp, cur;
+	char *str = arg;
+	returns_t *ret;
+
+	if (verbose) {
+		fprintf(stderr, "function is >%s<, adding arg >%s< type %s\n",
+		       command.function, str, args_enum_names[arg_type]);
+	}
+
+	cur.arg_type = arg_type;
+	switch (arg_type) {
+	case arg_var:
+		cur.var_index = find_var_index(arg);
+		if (cur.var_index < 0)
+			err(1, "Invalid variable %s at line %zu of file %s",
+			    str, line, cur_file);
+		cur.arg_type = ret_string;
+		break;
+
+	case arg_byte:
+		ret = arg;
+		cur.arg_len = ret->return_len;
+		cur.arg_string = malloc(cur.arg_len);
+		if (cur.arg_string == NULL)
+			err(1, "Could not malloc memory for arg bytes");
+		memcpy(cur.arg_string, ret->return_value, cur.arg_len);
+		break;
+
+	case arg_null:
+		cur.arg_len = 0;
+		cur.arg_string = NULL;
+		break;
+
+	default:
+		cur.arg_len = strlen(str);
+		cur.arg_string = malloc(cur.arg_len + 1);
+		if (cur.arg_string == NULL)
+			err(1, "Could not malloc memory for arg string");
+		strcpy(cur.arg_string, arg);
+	}
+
+	temp = realloc(command.args, sizeof(*temp) * (command.nargs + 1));
+	if (temp == NULL)
+		err(1, "Failed to reallocate args");
+	command.args = temp;
+	memcpy(&command.args[command.nargs], &cur, sizeof(args_t));
+	command.nargs++;
+}
+
+/*
+ * Allocate and assign a new return.
+ */
+static void
+assign_rets(returns_enum_t ret_type, void *ret)
+{
+	returns_t *temp, cur;
+	char *ret_str;
+	returns_t *ret_ret;
+
+	cur.return_type = ret_type;
+	if (ret_type != ret_var) {
+		if ((ret_type == ret_number) || (ret_type == ret_string)) {
+			ret_str = ret;
+			cur.return_len = strlen(ret_str) + 1;
+			cur.return_value = malloc(cur.return_len + 1);
+			if (cur.return_value == NULL)
+				err(1,
+				    "Could not malloc memory for arg string");
+			strcpy(cur.return_value, ret_str);
+		} else if (ret_type == ret_byte) {
+			ret_ret = ret;
+			cur.return_len = ret_ret->return_len;
+			cur.return_value = malloc(cur.return_len);
+			if (cur.return_value == NULL)
+				err(1,
+				    "Could not malloc memory for byte string");
+			memcpy(cur.return_value, ret_ret->return_value,
+			       cur.return_len);
+		} else if (ret_type == ret_ref) {
+			if ((cur.return_index = find_var_index(ret)) < 0)
+				err(1, "Undefined variable reference");
+		}
+	} else {
+		cur.return_index = find_var_index(ret);
+		if (cur.return_index < 0)
+			cur.return_index = assign_var(ret);
+	}
+
+	temp = realloc(command.returns, sizeof(*temp) * (command.nrets + 1));
+	if (temp == NULL)
+		err(1, "Failed to reallocate returns");
+	command.returns = temp;
+	memcpy(&command.returns[command.nrets], &cur, sizeof(returns_t));
+	command.nrets++;
+}
+
+/*
+ * Find the given variable name in the var array and return the i
+ * return -1 if var is not found.
+ */
+static int
+find_var_index(const char *var_name)
+{
+	int result;
+	size_t i;
+
+	result = -1;
+
+	for (i = 0; i < nvars; i++) {
+		if (strcmp(var_name, vars[i].name) == 0) {
+			result = i;
+			break;
+		}
+	}
+
+	return result;
+}
+
+/*
+ * Check the given function name in the given table of names, return 1 if
+ * there is a match.
+ */
+static int check_function_table(char *function, const char *table[],
+				int nfunctions)
+{
+	int i;
+
+	for (i = 0; i < nfunctions; i++) {
+		if ((strlen(function) == strlen(table[i])) &&
+		    (strcmp(function, table[i]) == 0))
+			return 1;
+	}
+
+	return 0;
+}
+
+/*
+ * Compare the output from the slave against the given file and report
+ * any differences.
+ */
+static void
+compare_streams(char *filename, bool discard)
+{
+	char check_file[PATH_MAX], drain[100], ref, data;
+	struct pollfd fds[2];
+	int nfd, check_fd;
+	ssize_t result;
+	size_t offs;
+
+	/*
+	 * Don't prepend check path iff check file has an absolute
+	 * path.
+	 */
+	if (filename[0] != '/') {
+		if (strlcpy(check_file, check_path, sizeof(check_file))
+		    >= sizeof(check_file))
+			err(2, "CHECK_PATH too long");
+
+		if (strlcat(check_file, "/", sizeof(check_file))
+		    >= sizeof(check_file))
+			err(2, "Could not append / to check file path");
+	} else {
+		check_file[0] = '\0';
+	}
+
+	if (strlcat(check_file, filename, sizeof(check_file))
+	    >= sizeof(check_file))
+		err(2, "Path to check file path overflowed");
+
+	if ((check_fd = open(check_file, O_RDONLY, 0)) < 0)
+		err(2, "failed to open file %s line %zu of file %s",
+		    check_file, line, cur_file);
+
+	fds[0].fd = check_fd;
+	fds[0].events = POLLIN;
+	fds[1].fd = master;
+	fds[1].events = POLLIN;
+
+	nfd = 2;
+	/*
+	 * if we have saved output then only check for data in the
+	 * reference file since the slave data may already be drained.
+	 */
+	if (saved_output.count > 0)
+		nfd = 1;
+
+	offs = 0;
+	while (poll(fds, nfd, 500) == nfd) {
+		if (fds[0].revents & POLLIN) {
+			if ((result = read(check_fd, &ref, 1)) < 1) {
+				if (result != 0) {
+					err(2,
+					    "Bad read on file %s", check_file);
+				} else {
+					break;
+				}
+			}
+		}
+
+		if (saved_output.count > 0) {
+			data = saved_output.data[saved_output.readp];
+			saved_output.count--;
+			saved_output.readp++;
+			/* run out of saved data, switch to file */
+			if (saved_output.count == 0)
+				nfd = 2;
+		} else {
+			if (fds[0].revents & POLLIN) {
+				if (read(master, &data, 1) < 1)
+					err(2, "Bad read on slave pty");
+			} else
+				continue;
+		}
+
+		if (verbose) {
+			fprintf(stderr, "Comparing reference byte 0x%x (%c)"
+				" against slave byte 0x%x (%c)\n",
+				ref, (ref >= ' ') ? ref : '-',
+				data, (data >= ' ' )? data : '-');
+		}
+
+		if (ref != data) {
+			errx(2, "%s, %zu: refresh data from slave does "
+			    "not match expected from file %s offs %zu "
+			    "[reference 0x%x (%c) != slave 0x%x (%c)]",
+			    cur_file, line, check_file, offs,
+			    ref, (ref >= ' ') ? ref : '-',
+			    data, (data >= ' ') ? data : '-');
+		}
+
+		offs++;
+	}
+
+
+	if (saved_output.count > 0)
+		excess(cur_file, line, __func__, " from slave",
+		    &saved_output.data[saved_output.readp], saved_output.count);
+
+	/* discard any excess saved output if required */
+	if (discard) {
+		saved_output.count = 0;
+		saved_output.readp = 0;
+	}
+
+	if ((result = poll(&fds[0], 2, 0)) != 0) {
+		if (result == -1)
+			err(2, "poll of file descriptors failed");
+
+		if ((fds[1].revents & POLLIN) == POLLIN) {
+			save_slave_output(true);
+		} else if ((fds[0].revents & POLLIN) == POLLIN) {
+			/*
+			 * handle excess in file if it exists.  Poll
+			 * says there is data until EOF is read.
+			 * Check next read is EOF, if it is not then
+			 * the file really has more data than the
+			 * slave produced so flag this as a warning.
+			 */
+			result = read(check_fd, drain, sizeof(drain));
+			if (result == -1)
+				err(1, "read of data file failed");
+
+			if (result > 0) {
+				excess(check_file, 0, __func__, "", drain,
+				    result);
+			}
+		}
+	}
+
+	close(check_fd);
+}
+
+/*
+ * Pass a function call and arguments to the slave and wait for the
+ * results.  The variable nresults determines how many returns we expect
+ * back from the slave.  These results will be validated against the
+ * expected returns or assigned to variables.
+ */
+static void
+do_function_call(size_t nresults)
+{
+#define MAX_RESULTS 4
+	char *p;
+	int do_input;
+	size_t i;
+	struct pollfd fds[3];
+	returns_t response[MAX_RESULTS], returns_count;
+	assert(nresults <= MAX_RESULTS);
+
+	do_input = check_function_table(command.function, input_functions,
+	    ninput_functions);
+
+	write_func_and_args();
+
+	/*
+	 * We should get the number of returns back here, grab it before
+	 * doing input otherwise it will confuse the input poll
+	 */
+	read_cmd_pipe(&returns_count);
+	if (returns_count.return_type != ret_count)
+		err(2, "expected return type of ret_count but received %s",
+		    returns_enum_names[returns_count.return_type]);
+
+	perform_delay(&delay_post_call); /* let slave catch up */
+
+	if (verbose) {
+		fprintf(stderr, "Expect %zu results from slave, slave "
+		    "reported %zu\n", nresults, returns_count.return_len);
+	}
+
+	if ((no_input == false) && (do_input == 1)) {
+		if (verbose) {
+			fprintf(stderr, "doing input with inputstr >%s<\n",
+			    input_str);
+		}
+
+		if (input_str == NULL)
+			errx(2, "%s, %zu: Call to input function "
+			    "but no input defined", cur_file, line);
+
+		fds[0].fd = slvpipe[READ_PIPE];
+		fds[0].events = POLLIN;
+		fds[1].fd = master;
+		fds[1].events = POLLOUT;
+ 		p = input_str;
+		save_slave_output(false);
+		while(*p != '\0') {
+			perform_delay(&delay_spec);
+
+			if (poll(fds, 2, 0) < 0)
+				err(2, "poll failed");
+			if (fds[0].revents & POLLIN) {
+				warnx("%s, %zu: Slave function "
+				    "returned before end of input string",
+				    cur_file, line);
+				break;
+			}
+			if ((fds[1].revents & POLLOUT) == 0)
+				continue;
+			if (verbose) {
+				fprintf(stderr, "Writing char >%c< to slave\n",
+				    *p);
+			}
+			if (write(master, p, 1) != 1) {
+				warn("%s, %zu: Slave function write error",
+				    cur_file, line);
+				break;
+			}
+			p++;
+
+		}
+		save_slave_output(false);
+
+		if (verbose) {
+			fprintf(stderr, "Input done.\n");
+		}
+
+		/* done with the input string, free the resources */
+		free(input_str);
+		input_str = NULL;
+	}
+
+	if (verbose) {
+		fds[0].fd = slvpipe[READ_PIPE];
+		fds[0].events = POLLIN;
+
+		fds[1].fd = slvpipe[WRITE_PIPE];
+		fds[1].events = POLLOUT;
+
+		fds[2].fd = master;
+		fds[2].events = POLLIN | POLLOUT;
+
+		i = poll(&fds[0], 3, 1000);
+		fprintf(stderr, "Poll returned %zu\n", i);
+		for (i = 0; i < 3; i++) {
+			fprintf(stderr, "revents for fd[%zu] = 0x%x\n",
+				i, fds[i].revents);
+		}
+	}
+
+	/* drain any trailing output */
+	save_slave_output(false);
+
+	for (i = 0; i < returns_count.return_len; i++) {
+		read_cmd_pipe(&response[i]);
+	}
+
+	/*
+	 * Check for a slave error in the first return slot, if the
+	 * slave errored then we may not have the number of returns we
+	 * expect but in this case we should report the slave error
+	 * instead of a return count mismatch.
+	 */
+	if ((returns_count.return_len > 0) &&
+	    (response[0].return_type == ret_slave_error))
+		err(2, "Slave returned error: %s",
+		    (const char *)response[0].return_value);
+
+	if (returns_count.return_len != nresults)
+		err(2, "Incorrect number of returns from slave, expected %zu "
+		    "but received %zu", nresults, returns_count.return_len);
+
+	if (verbose) {
+		for (i = 0; i < nresults; i++) {
+			if ((response[i].return_type != ret_byte) &&
+			    (response[i].return_type != ret_err) &&
+			    (response[i].return_type != ret_ok))
+				fprintf(stderr,
+					"received response >%s< "
+					"expected",
+					(const char *)response[i].return_value);
+			else
+				fprintf(stderr, "received");
+
+			fprintf(stderr, " return_type %s\n",
+			    returns_enum_names[command.returns[i].return_type]);
+		}
+	}
+
+	for (i = 0; i < nresults; i++) {
+		if (command.returns[i].return_type != ret_var) {
+			validate(i, &response[i]);
+		} else {
+			vars[command.returns[i].return_index].len =
+				response[i].return_len;
+			vars[command.returns[i].return_index].value =
+				response[i].return_value;
+			vars[command.returns[i].return_index].type =
+				response[i].return_type;
+		}
+	}
+
+	if (verbose && (saved_output.count > 0))
+		excess(cur_file, line, __func__, " from slave",
+		    &saved_output.data[saved_output.readp], saved_output.count);
+
+	init_parse_variables(0);
+}
+
+/*
+ * Write the function and command arguments to the command pipe.
+ */
+static void
+write_func_and_args(void)
+{
+	int i;
+
+	if (verbose) {
+		fprintf(stderr, "calling function >%s<\n", command.function);
+	}
+
+	write_cmd_pipe(command.function);
+	for (i = 0; i < command.nargs; i++) {
+		if (command.args[i].arg_type == arg_var)
+			write_cmd_pipe_args(command.args[i].arg_type,
+					    &vars[command.args[i].var_index]);
+		else
+			write_cmd_pipe_args(command.args[i].arg_type,
+					    &command.args[i]);
+	}
+
+	write_cmd_pipe(NULL); /* signal end of arguments */
+}
+
+/*
+ * Initialise the command structure - if initial is non-zero then just set
+ * everything to sane values otherwise free any memory that was allocated
+ * when building the structure.
+ */
+void
+init_parse_variables(int initial)
+{
+	int i, result;
+	struct pollfd slave_pty;
+
+	if (initial == 0) {
+		free(command.function);
+		for (i = 0; i < command.nrets; i++) {
+			if (command.returns[i].return_type == ret_number)
+				free(command.returns[i].return_value);
+		}
+		free(command.returns);
+
+		for (i = 0; i < command.nargs; i++) {
+			if (command.args[i].arg_type != arg_var)
+				free(command.args[i].arg_string);
+		}
+		free(command.args);
+	} else {
+		line = 0;
+		input_delay = 0;
+		vars = NULL;
+		nvars = 0;
+		input_str = NULL;
+		saved_output.allocated = 0;
+		saved_output.count = 0;
+		saved_output.readp = 0;
+		saved_output.data = NULL;
+	}
+
+	no_input = false;
+	command.function = NULL;
+	command.nargs = 0;
+	command.args = NULL;
+	command.nrets = 0;
+	command.returns = NULL;
+
+	/*
+	 * Check the slave pty for stray output from the slave, at this
+	 * point we should not see any data as it should have been
+	 * consumed by the test functions.  If we see data then we have
+	 * either a bug or are not handling an output generating function
+	 * correctly.
+	 */
+	slave_pty.fd = master;
+	slave_pty.events = POLLIN;
+	result = poll(&slave_pty, 1, 0);
+
+	if (result < 0)
+		err(2, "Poll of slave pty failed");
+	else if (result > 0)
+		warnx("%s, %zu: Unexpected data from slave", cur_file, line);
+}
+
+/*
+ * Validate the response against the expected return.  The variable
+ * i is the i into the rets array in command.
+ */
+static void
+validate(int i, void *data)
+{
+	char *response;
+	returns_t *byte_response;
+
+	byte_response = data;
+	if ((command.returns[i].return_type != ret_byte) &&
+	    (command.returns[i].return_type != ret_err) &&
+	    (command.returns[i].return_type != ret_ok)) {
+		if ((byte_response->return_type == ret_byte) ||
+		    (byte_response->return_type == ret_err) ||
+		    (byte_response->return_type == ret_ok))
+			err(1, "%s: expecting type %s, received type %s"
+			    " at line %zu of file %s", __func__,
+			    returns_enum_names[command.returns[i].return_type],
+			    returns_enum_names[byte_response->return_type],
+			    line, cur_file);
+
+		response = byte_response->return_value;
+	}
+
+	switch (command.returns[i].return_type) {
+	case ret_err:
+		validate_type(ret_err, byte_response, 0);
+		break;
+
+	case ret_ok:
+		validate_type(ret_ok, byte_response, 0);
+		break;
+
+	case ret_null:
+		validate_return("NULL", response, 0);
+		break;
+
+	case ret_nonnull:
+		validate_return("NULL", response, 1);
+		break;
+
+	case ret_string:
+	case ret_number:
+		validate_return(command.returns[i].return_value,
+				response, 0);
+		break;
+
+	case ret_ref:
+		validate_reference(i, response);
+		break;
+
+	case ret_byte:
+		validate_byte(&command.returns[i], byte_response, 0);
+		break;
+
+	default:
+		err(1, "Malformed statement at line %zu of file %s",
+		    line, cur_file);
+		break;
+	}
+}
+
+/*
+ * Validate the return against the contents of a variable.
+ */
+static void
+validate_reference(int i, void *data)
+{
+	char *response;
+	returns_t *byte_response;
+	var_t *varp;
+
+	varp = &vars[command.returns[i].return_index];
+
+	byte_response = data;
+	if (command.returns[i].return_type != ret_byte)
+		response = data;
+
+	if (verbose) {
+		fprintf(stderr,
+		    "%s: return type of %s, value %s \n", __func__,
+		    returns_enum_names[varp->type],
+		    (const char *)varp->value);
+	}
+
+	switch (varp->type) {
+	case ret_string:
+	case ret_number:
+		validate_return(varp->value, response, 0);
+		break;
+
+	case ret_byte:
+		validate_byte(varp->value, byte_response, 0);
+		break;
+
+	default:
+		err(1,
+		    "Invalid return type for reference at line %zu of file %s",
+		    line, cur_file);
+		break;
+	}
+}
+
+/*
+ * Validate the return type against the expected type, throw an error
+ * if they don't match.
+ */
+static void
+validate_type(returns_enum_t expected, returns_t *value, int check)
+{
+	if (((check == 0) && (expected != value->return_type)) ||
+	    ((check == 1) && (expected == value->return_type)))
+		err(1, "Validate expected type %s %s %s line %zu of file %s",
+		    returns_enum_names[expected],
+		    (check == 0)? "matching" : "not matching",
+		    returns_enum_names[value->return_type], line, cur_file);
+
+	if (verbose) {
+		fprintf(stderr, "Validate expected type %s %s %s line %zu"
+		    " of file %s\n",
+		    returns_enum_names[expected],
+		    (check == 0)? "matching" : "not matching",
+		    returns_enum_names[value->return_type], line, cur_file);
+	}
+}
+
+/*
+ * Validate the return value against the expected value, throw an error
+ * if they don't match.
+ */
+static void
+validate_return(const char *expected, const char *value, int check)
+{
+	if (((check == 0) && strcmp(expected, value) != 0) ||
+	    ((check == 1) && strcmp(expected, value) == 0))
+		errx(1, "Validate expected %s %s %s line %zu of file %s",
+		    expected,
+		    (check == 0)? "matching" : "not matching", value,
+		    line, cur_file);
+	if (verbose) {
+		fprintf(stderr, "Validated expected value %s %s %s "
+		    "at line %zu of file %s\n", expected,
+		    (check == 0)? "matches" : "does not match",
+		    value, line, cur_file);
+	}
+}
+
+/*
+ * Validate the return value against the expected value, throw an error
+ * if they don't match expectations.
+ */
+static void
+validate_byte(returns_t *expected, returns_t *value, int check)
+{
+	char *ch;
+	size_t i;
+
+	if (verbose) {
+		ch = value->return_value;
+		fprintf(stderr, "checking returned byte stream: ");
+		for (i = 0; i < value->return_len; i++)
+			fprintf(stderr, "%s0x%x", (i != 0)? ", " : "", ch[i]);
+		fprintf(stderr, "\n");
+
+		fprintf(stderr, "%s byte stream: ",
+			(check == 0)? "matches" : "does not match");
+		ch = (char *) expected->return_value;
+		for (i = 0; i < expected->return_len; i++)
+			fprintf(stderr, "%s0x%x", (i != 0)? ", " : "", ch[i]);
+		fprintf(stderr, "\n");
+	}
+
+	/*
+	 * No chance of a match if lengths differ...
+	 */
+	if ((check == 0) && (expected->return_len != value->return_len))
+	    errx(1, "Byte validation failed, length mismatch, expected %zu,"
+		"received %zu", expected->return_len, value->return_len);
+
+	/*
+	 * If check is 0 then we want to throw an error IFF the byte streams
+	 * do not match, if check is 1 then throw an error if the byte
+	 * streams match.
+	 */
+	if (((check == 0) && memcmp(expected->return_value, value->return_value,
+				    value->return_len) != 0) ||
+	    ((check == 1) && (expected->return_len == value->return_len) &&
+	     memcmp(expected->return_value, value->return_value,
+		    value->return_len) == 0))
+		errx(1, "Validate expected %s byte stream at line %zu"
+		    "of file %s",
+		    (check == 0)? "matching" : "not matching", line, cur_file);
+	if (verbose) {
+		fprintf(stderr, "Validated expected %s byte stream "
+		    "at line %zu of file %s\n",
+		    (check == 0)? "matching" : "not matching",
+		    line, cur_file);
+	}
+}
+
+/*
+ * Validate the variable at i against the expected value, throw an
+ * error if they don't match, if check is non-zero then the match is
+ * negated.
+ */
+static void
+validate_variable(int ret, returns_enum_t type, const void *value, int i,
+    int check)
+{
+	returns_t *retval;
+	var_t *varptr;
+
+	retval = &command.returns[ret];
+	varptr = &vars[command.returns[ret].return_index];
+
+	if (varptr->value == NULL)
+		err(1, "Variable %s has no value assigned to it", varptr->name);
+
+
+	if (varptr->type != type)
+		err(1, "Variable %s is not the expected type", varptr->name);
+
+	if (type != ret_byte) {
+		if ((((check == 0) && strcmp(value, varptr->value) != 0))
+		    || ((check == 1) && strcmp(value, varptr->value) == 0))
+			err(1, "Variable %s contains %s instead of %s"
+			    " value %s at line %zu of file %s",
+			    varptr->name, (const char *)varptr->value,
+			    (check == 0)? "expected" : "not matching",
+			    (const char *)value,
+			    line, cur_file);
+		if (verbose) {
+			fprintf(stderr, "Variable %s contains %s value "
+			    "%s at line %zu of file %s\n",
+			    varptr->name,
+			    (check == 0)? "expected" : "not matching",
+			    (const char *)varptr->value, line, cur_file);
+		}
+	} else {
+		if ((check == 0) && (retval->return_len != varptr->len))
+			err(1, "Byte validation failed, length mismatch");
+
+		/*
+		 * If check is 0 then we want to throw an error IFF
+		 * the byte streams do not match, if check is 1 then
+		 * throw an error if the byte streams match.
+		 */
+		if (((check == 0) && memcmp(retval->return_value, varptr->value,
+					    varptr->len) != 0) ||
+		    ((check == 1) && (retval->return_len == varptr->len) &&
+		     memcmp(retval->return_value, varptr->value,
+			    varptr->len) == 0))
+			err(1, "Validate expected %s byte stream at line %zu"
+			    " of file %s",
+			    (check == 0)? "matching" : "not matching",
+			    line, cur_file);
+		if (verbose) {
+			fprintf(stderr, "Validated expected %s byte stream "
+			    "at line %zu of file %s\n",
+			    (check == 0)? "matching" : "not matching",
+			    line, cur_file);
+		}
+	}
+}
+
+/*
+ * Write a string to the command pipe - we feed the number of bytes coming
+ * down first to allow storage allocation and then follow up with the data.
+ * If cmd is NULL then feed a -1 down the pipe to say the end of the args.
+ */
+static void
+write_cmd_pipe(char *cmd)
+{
+	args_t arg;
+	size_t len;
+
+	if (cmd == NULL)
+		len = 0;
+	else
+		len = strlen(cmd);
+
+	arg.arg_type = arg_static;
+	arg.arg_len = len;
+	arg.arg_string = cmd;
+	write_cmd_pipe_args(arg.arg_type, &arg);
+
+}
+
+static void
+write_cmd_pipe_args(args_state_t type, void *data)
+{
+	var_t *var_data;
+	args_t *arg_data;
+	int len, send_type;
+	void *cmd;
+
+	arg_data = data;
+	switch (type) {
+	case arg_var:
+		var_data = data;
+		len = var_data->len;
+		cmd = var_data->value;
+		if (type == arg_byte)
+			send_type = ret_byte;
+		else
+			send_type = ret_string;
+		break;
+
+	case arg_null:
+		send_type = ret_null;
+		len = 0;
+		break;
+
+	default:
+		if ((arg_data->arg_len == 0) && (arg_data->arg_string == NULL))
+			len = -1;
+		else
+			len = arg_data->arg_len;
+		cmd = arg_data->arg_string;
+		if (type == arg_byte)
+			send_type = ret_byte;
+		else
+			send_type = ret_string;
+	}
+
+	if (verbose) {
+		fprintf(stderr, "Writing type %s to command pipe\n",
+		    returns_enum_names[send_type]);
+	}
+
+	if (write(cmdpipe[WRITE_PIPE], &send_type, sizeof(int)) < 0)
+		err(1, "command pipe write for type failed");
+
+	if (verbose) {
+		fprintf(stderr, "Writing length %d to command pipe\n", len);
+	}
+
+	if (write(cmdpipe[WRITE_PIPE], &len, sizeof(int)) < 0)
+		err(1, "command pipe write for length failed");
+
+	if (len > 0) {
+		if (verbose) {
+			fprintf(stderr, "Writing data >%s< to command pipe\n",
+			    (const char *)cmd);
+		}
+		if (write(cmdpipe[WRITE_PIPE], cmd, len) < 0)
+			err(1, "command pipe write of data failed");
+	}
+}
+
+/*
+ * Read a response from the command pipe, first we will receive the
+ * length of the response then the actual data.
+ */
+static void
+read_cmd_pipe(returns_t *response)
+{
+	int len, type;
+	struct pollfd rfd[2];
+	char *str;
+
+	/*
+	 * Check if there is data to read - just in case slave has died, we
+	 * don't want to block on the read and just hang.  We also check
+	 * output from the slave because the slave may be blocked waiting
+	 * for a flush on its stdout.
+	 */
+	rfd[0].fd = slvpipe[READ_PIPE];
+	rfd[0].events = POLLIN;
+	rfd[1].fd = master;
+	rfd[1].events = POLLIN;
+
+	do {
+		if (poll(rfd, 2, 4000) == 0)
+			errx(2, "%s, %zu: Command pipe read timeout",
+			    cur_file, line);
+
+		if ((rfd[1].revents & POLLIN) == POLLIN) {
+			if (verbose) {
+				fprintf(stderr,
+				    "draining output from slave\n");
+			}
+			save_slave_output(false);
+		}
+	}
+	while((rfd[1].revents & POLLIN) == POLLIN);
+
+	if (read(slvpipe[READ_PIPE], &type, sizeof(int)) < 0)
+		err(1, "command pipe read for type failed");
+	response->return_type = type;
+
+	if ((type != ret_ok) && (type != ret_err) && (type != ret_count)) {
+		if (read(slvpipe[READ_PIPE], &len, sizeof(int)) < 0)
+			err(1, "command pipe read for length failed");
+		response->return_len = len;
+
+		if (verbose) {
+			fprintf(stderr,
+			    "Reading %d bytes from command pipe\n", len);
+		}
+
+		if ((response->return_value = malloc(len + 1)) == NULL)
+			err(1, "Failed to alloc memory for cmd pipe read");
+
+		if (read(slvpipe[READ_PIPE], response->return_value, len) < 0)
+			err(1, "command pipe read of data failed");
+
+		if (response->return_type != ret_byte) {
+			str = response->return_value;
+			str[len] = '\0';
+
+			if (verbose) {
+				fprintf(stderr, "Read data >%s< from pipe\n",
+				    (const char *)response->return_value);
+			}
+		}
+	} else {
+		response->return_value = NULL;
+		if (type == ret_count) {
+			if (read(slvpipe[READ_PIPE], &len, sizeof(int)) < 0)
+				err(1, "command pipe read for number of "
+				       "returns failed");
+			response->return_len = len;
+		}
+
+		if (verbose) {
+			fprintf(stderr, "Read type %s from pipe\n",
+			    returns_enum_names[type]);
+		}
+	}
+}
+
+/*
+ * Check for writes from the slave on the pty, save the output into a
+ * buffer for later checking if discard is false.
+ */
+#define MAX_DRAIN 256
+
+static void
+save_slave_output(bool discard)
+{
+	char *new_data, drain[MAX_DRAIN];
+	size_t to_allocate;
+	ssize_t result;
+	size_t i;
+
+	result = 0;
+	for (;;) {
+		if (result == -1)
+			err(2, "poll of slave pty failed");
+		result = MAX_DRAIN;
+		if ((result = read(master, drain, result)) < 0) {
+			if (errno == EAGAIN)
+				break;
+			else
+				err(2, "draining slave pty failed");
+		}
+		if (result == 0)
+			abort();
+
+		if (!discard) {
+			if ((size_t)result >
+			    (saved_output.allocated - saved_output.count)) {
+				to_allocate = 1024 * ((result / 1024) + 1);
+
+				if ((new_data = realloc(saved_output.data,
+					saved_output.allocated + to_allocate))
+				    == NULL)
+					err(2, "Realloc of saved_output failed");
+				saved_output.data = new_data;
+				saved_output.allocated += to_allocate;
+			}
+
+			if (verbose) {
+				fprintf(stderr, "count = %zu, "
+				    "allocated = %zu\n", saved_output.count,
+				    saved_output.allocated);
+				for (i = 0; i < (size_t)result; i++) {
+					fprintf(stderr, "Saving slave output "
+					    "at %zu: 0x%x (%c)\n",
+					    saved_output.count + i, drain[i],
+					    (drain[i] >= ' ')? drain[i] : '-');
+				}
+			}
+
+			memcpy(&saved_output.data[saved_output.count], drain,
+			       result);
+			saved_output.count += result;
+
+			if (verbose) {
+				fprintf(stderr, "count = %zu, "
+				    "allocated = %zu\n", saved_output.count,
+				    saved_output.allocated);
+			}
+		} else {
+			if (verbose) {
+				for (i = 0; i < (size_t)result; i++) {
+					fprintf(stderr, "Discarding slave "
+					    "output 0x%x (%c)\n",
+					    drain[i],
+					    (drain[i] >= ' ')? drain[i] : '-');
+				}
+			}
+		}
+	}
+}
+
+static void
+yyerror(const char *msg)
+{
+	warnx("%s in line %zu of file %s", msg, line, cur_file);
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/command_table.h b/contrib/netbsd-tests/lib/libcurses/slave/command_table.h
new file mode 100644
index 000000000000..ef57a00d7bd7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/command_table.h
@@ -0,0 +1,397 @@
+/*	$NetBSD: command_table.h,v 1.3 2011/09/15 11:46:19 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 _COMMAND_TABLE_H_
+#define	_COMMAND_TABLE_H_
+
+#include "curses_commands.h"
+
+/*
+ * Curses commands
+ */
+struct command_def commands[] = {
+	{"DRAIN", cmd_DRAIN},
+	{"addbytes", cmd_addbytes},
+	{"addch", cmd_addch},
+	{"addchnstr", cmd_addchnstr},
+	{"addchstr", cmd_addchstr},
+	{"addnstr", cmd_addnstr},
+	{"addstr", cmd_addstr},
+	{"attr_get", cmd_attr_get},
+	{"attr_off", cmd_attr_off},
+	{"attr_on", cmd_attr_on},
+	{"attr_set", cmd_attr_set},
+	{"attroff", cmd_attroff},
+	{"attron", cmd_attron},
+	{"attrset", cmd_attrset},
+	{"bkgd", cmd_bkgd},
+	{"bkgdset", cmd_bkgdset},
+	{"border", cmd_border},
+	{"clear", cmd_clear},
+	{"clrtobot", cmd_clrtobot},
+	{"clrtoeol", cmd_clrtoeol},
+	{"color_set", cmd_color_set},
+	{"delch", cmd_delch},
+	{"deleteln", cmd_deleteln},
+	{"echochar", cmd_echochar},
+	{"erase", cmd_erase},
+	{"getch", cmd_getch},
+	{"getnstr", cmd_getnstr},
+	{"getstr", cmd_getstr},
+	{"inch", cmd_inch},
+	{"inchnstr", cmd_inchnstr},
+	{"inchstr", cmd_inchstr},
+	{"innstr", cmd_innstr},
+	{"insch", cmd_insch},
+	{"insdelln", cmd_insdelln},
+	{"insertln", cmd_insertln},
+	{"instr", cmd_instr},
+	{"move", cmd_move},
+	{"refresh", cmd_refresh},
+	{"scrl", cmd_scrl},
+	{"setscrreg", cmd_setscrreg},
+	{"standend", cmd_standend},
+	{"standout", cmd_standout},
+	{"timeout", cmd_timeout},
+	{"underscore", cmd_underscore},
+	{"underend", cmd_underend},
+	{"waddbytes", cmd_waddbytes},
+	{"waddstr", cmd_waddstr},
+	{"mvaddbytes", cmd_mvaddbytes},
+	{"mvaddch", cmd_mvaddch},
+	{"mvaddchnstr", cmd_mvaddchnstr},
+	{"mvaddchstr", cmd_mvaddchstr},
+	{"mvaddnstr", cmd_mvaddnstr},
+	{"mvaddstr", cmd_mvaddstr},
+	{"mvdelch", cmd_mvdelch},
+	{"mvgetch", cmd_mvgetch},
+	{"mvgetnstr", cmd_mvgetnstr},
+	{"mvgetstr", cmd_mvgetstr},
+	{"mvinch", cmd_mvinch},
+	{"mvinchnstr", cmd_mvinchnstr},
+	{"mvinchstr", cmd_mvinchstr},
+	{"mvinnstr", cmd_mvinnstr},
+	{"mvinsch", cmd_mvinsch},
+	{"mvinstr", cmd_mvinstr},
+	{"mvwaddbytes", cmd_mvwaddbytes},
+	{"mvwaddch", cmd_mvwaddch},
+	{"mvwaddchnstr", cmd_mvwaddchnstr},
+	{"mvwaddchstr", cmd_mvwaddchstr},
+	{"mvwaddnstr", cmd_mvwaddnstr},
+	{"mvwaddstr", cmd_mvwaddstr},
+	{"mvwdelch", cmd_mvwdelch},
+	{"mvwgetch", cmd_mvwgetch},
+	{"mvwgetnstr", cmd_mvwgetnstr},
+	{"mvwgetstr", cmd_mvwgetstr},
+	{"mvwinch", cmd_mvwinch},
+	{"mvwinsch", cmd_mvwinsch},
+	{"assume_default_colors", cmd_assume_default_colors},
+	{"baudrate", cmd_baudrate},
+	{"beep", cmd_beep},
+	{"box", cmd_box},
+	{"can_change_color", cmd_can_change_color},
+	{"cbreak", cmd_cbreak},
+	{"clearok", cmd_clearok},
+	{"color_content", cmd_color_content},
+	{"copywin", cmd_copywin},
+	{"curs_set", cmd_curs_set},
+	{"def_prog_mode", cmd_def_prog_mode},
+	{"def_shell_mode", cmd_def_shell_mode},
+	{"define_key", cmd_define_key},
+	{"delay_output", cmd_delay_output},
+	{"delscreen", cmd_delscreen},
+	{"delwin", cmd_delwin},
+	{"derwin", cmd_derwin},
+	{"dupwin", cmd_dupwin},
+	{"doupdate", cmd_doupdate},
+	{"echo", cmd_echo},
+	{"endwin", cmd_endwin},
+	{"erasechar", cmd_erasechar},
+	{"flash", cmd_flash},
+	{"flushinp", cmd_flushinp},
+	{"flushok", cmd_flushok},
+	{"fullname", cmd_fullname},
+	{"getattrs", cmd_getattrs},
+	{"getbkgd", cmd_getbkgd},
+	{"getcury", cmd_getcury},
+	{"getcurx", cmd_getcurx},
+	{"getyx", cmd_getyx},
+	{"getbegy", cmd_getbegy},
+	{"getbegx", cmd_getbegx},
+	{"getmaxy", cmd_getmaxy},
+	{"getmaxx", cmd_getmaxx},
+	{"getpary", cmd_getpary},
+	{"getparx", cmd_getparx},
+	{"getparyx", cmd_getparyx},
+	{"gettmode", cmd_gettmode},
+	{"getwin", cmd_getwin},
+	{"halfdelay", cmd_halfdelay},
+	{"has_colors", cmd_has_colors},
+	{"has_ic", cmd_has_ic},
+	{"has_il", cmd_has_il},
+	{"hline", cmd_hline},
+	{"idcok", cmd_idcok},
+	{"idlok", cmd_idlok},
+	{"init_color", cmd_init_color},
+	{"init_pair", cmd_init_pair},
+	{"initscr", cmd_initscr},
+	{"intrflush", cmd_intrflush},
+	{"isendwin", cmd_isendwin},
+	{"is_linetouched", cmd_is_linetouched},
+	{"is_wintouched", cmd_is_wintouched},
+	{"keyok", cmd_keyok},
+	{"keypad", cmd_keypad},
+	{"keyname", cmd_keyname},
+	{"killchar", cmd_killchar},
+	{"leaveok", cmd_leaveok},
+	{"meta", cmd_meta},
+	{"mvcur", cmd_mvcur},
+	{"mvderwin", cmd_mvderwin},
+	{"mvhline", cmd_mvhline},
+	{"mvprintw", cmd_mvprintw},
+	{"mvscanw", cmd_mvscanw},
+	{"mvvline", cmd_mvvline},
+	{"mvwhline", cmd_mvwhline},
+	{"mvwvline", cmd_mvwvline},
+	{"mvwin", cmd_mvwin},
+	{"mvwinchnstr", cmd_mvwinchnstr},
+	{"mvwinchstr", cmd_mvwinchstr},
+	{"mvwinnstr", cmd_mvwinnstr},
+	{"mvwinstr", cmd_mvwinstr},
+	{"mvwprintw", cmd_mvwprintw},
+	{"mvwscanw", cmd_mvwscanw},
+	{"napms", cmd_napms},
+	{"newpad", cmd_newpad},
+	{"newterm", cmd_newterm},
+	{"newwin", cmd_newwin},
+	{"nl", cmd_nl},
+	{"no_color_attributes", cmd_no_color_attributes},
+	{"nocbreak", cmd_nocbreak},
+	{"nodelay", cmd_nodelay},
+	{"noecho", cmd_noecho},
+	{"nonl", cmd_nonl},
+	{"noqiflush", cmd_noqiflush},
+	{"noraw", cmd_noraw},
+	{"notimeout", cmd_notimeout},
+	{"overlay", cmd_overlay},
+	{"overwrite", cmd_overwrite},
+	{"pair_content", cmd_pair_content},
+	{"pechochar", cmd_pechochar},
+	{"pnoutrefresh", cmd_pnoutrefresh},
+	{"prefresh", cmd_prefresh},
+	{"printw", cmd_printw},
+	{"putwin", cmd_putwin},
+	{"qiflush", cmd_qiflush},
+	{"raw", cmd_raw},
+	{"redrawwin", cmd_redrawwin},
+	{"reset_prog_mode", cmd_reset_prog_mode},
+	{"reset_shell_mode", cmd_reset_shell_mode},
+	{"resetty", cmd_resetty},
+	{"resizeterm", cmd_resizeterm},
+	{"savetty", cmd_savetty},
+	{"scanw", cmd_scanw},
+	{"scroll", cmd_scroll},
+	{"scrollok", cmd_scrollok},
+	{"setterm", cmd_setterm},
+	{"set_term", cmd_set_term},
+	{"start_color", cmd_start_color},
+	{"subpad", cmd_subpad},
+	{"subwin", cmd_subwin},
+	{"termattrs", cmd_termattrs},
+	{"term_attrs", cmd_term_attrs},
+	{"touchline", cmd_touchline},
+	{"touchoverlap", cmd_touchoverlap},
+	{"touchwin", cmd_touchwin},
+	{"ungetch", cmd_ungetch},
+	{"untouchwin", cmd_untouchwin},
+	{"use_default_colors", cmd_use_default_colors},
+	{"vline", cmd_vline},
+	{"vw_printw", cmd_vw_printw},
+	{"vw_scanw", cmd_vw_scanw},
+	{"vwprintw", cmd_vwprintw},
+	{"vwscanw", cmd_vwscanw},
+	{"waddch", cmd_waddch},
+	{"waddchnstr", cmd_waddchnstr},
+	{"waddchstr", cmd_waddchstr},
+	{"waddnstr", cmd_waddnstr},
+	{"wattr_get", cmd_wattr_get},
+	{"wattr_off", cmd_wattr_off},
+	{"wattr_on", cmd_wattr_on},
+	{"wattr_set", cmd_wattr_set},
+	{"wattroff", cmd_wattroff},
+	{"wattron", cmd_wattron},
+	{"wattrset", cmd_wattrset},
+	{"wbkgd", cmd_wbkgd},
+	{"wbkgdset", cmd_wbkgdset},
+	{"wborder", cmd_wborder},
+	{"wclear", cmd_wclear},
+	{"wclrtobot", cmd_wclrtobot},
+	{"wclrtoeol", cmd_wclrtoeol},
+	{"wcolor_set", cmd_wcolor_set},
+	{"wdelch", cmd_wdelch},
+	{"wdeleteln", cmd_wdeleteln},
+	{"wechochar", cmd_wechochar},
+	{"werase", cmd_werase},
+	{"wgetch", cmd_wgetch},
+	{"wgetnstr", cmd_wgetnstr},
+	{"wgetstr", cmd_wgetstr},
+	{"whline", cmd_whline},
+	{"winch", cmd_winch},
+	{"winchnstr", cmd_winchnstr},
+	{"winchstr", cmd_winchstr},
+	{"winnstr", cmd_winnstr},
+	{"winsch", cmd_winsch},
+	{"winsdelln", cmd_winsdelln},
+	{"winsertln", cmd_winsertln},
+	{"winstr", cmd_winstr},
+	{"wmove", cmd_wmove},
+	{"wnoutrefresh", cmd_wnoutrefresh},
+	{"wprintw", cmd_wprintw},
+	{"wredrawln", cmd_wredrawln},
+	{"wrefresh", cmd_wrefresh},
+	{"wresize", cmd_wresize},
+	{"wscanw", cmd_wscanw},
+	{"wscrl", cmd_wscrl},
+	{"wsetscrreg", cmd_wsetscrreg},
+	{"wstandend", cmd_wstandend},
+	{"wstandout", cmd_wstandout},
+	{"wtimeout", cmd_wtimeout},
+	{"wtouchln", cmd_wtouchln},
+	{"wunderend", cmd_wunderend},
+	{"wunderscore", cmd_wunderscore},
+	{"wvline", cmd_wvline},
+	{"insnstr", cmd_insnstr},
+	{"insstr", cmd_insstr},
+	{"mvinsnstr", cmd_mvinsnstr},
+	{"mvinsstr", cmd_mvinsstr},
+	{"mvwinsnstr", cmd_mvwinsnstr},
+	{"mvwinsstr", cmd_mvwinsstr},
+	{"winsnstr", cmd_winsnstr},
+	{"winsstr", cmd_winsstr},
+	{"chgat", cmd_chgat},
+	{"wchgat", cmd_wchgat},
+	{"mvchgat", cmd_mvchgat},
+	{"mvwchgat", cmd_mvwchgat},
+	{"add_wch", cmd_add_wch},
+	{"wadd_wch", cmd_wadd_wch},
+	{"mvadd_wch", cmd_mvadd_wch},
+	{"mvwadd_wch", cmd_mvwadd_wch},
+	{"add_wchnstr", cmd_add_wchnstr},
+	{"add_wchstr", cmd_add_wchstr},
+	{"wadd_wchnstr", cmd_wadd_wchnstr},
+	{"wadd_wchstr", cmd_wadd_wchstr},
+	{"mvadd_wchnstr", cmd_mvadd_wchnstr},
+	{"mvadd_wchstr", cmd_mvadd_wchstr},
+	{"mvwadd_wchnstr", cmd_mvwadd_wchnstr},
+	{"mvwadd_wchstr", cmd_mvwadd_wchstr},
+	{"addnwstr", cmd_addnwstr},
+	{"addwstr", cmd_addwstr},
+	{"mvaddnwstr", cmd_mvaddnwstr},
+	{"mvaddwstr", cmd_mvaddwstr},
+	{"mvwaddnwstr", cmd_mvwaddnwstr},
+	{"mvwaddwstr", cmd_mvwaddwstr},
+	{"waddnwstr", cmd_waddnwstr},
+	{"waddwstr", cmd_waddwstr},
+	{"echo_wchar", cmd_echo_wchar},
+	{"wecho_wchar", cmd_wecho_wchar},
+	{"pecho_wchar", cmd_pecho_wchar},
+	{"ins_wch", cmd_ins_wch},
+	{"wins_wch", cmd_wins_wch},
+	{"mvins_wch", cmd_mvins_wch},
+	{"mvwins_wch", cmd_mvwins_wch},
+	{"ins_nwstr", cmd_ins_nwstr},
+	{"ins_wstr", cmd_ins_wstr},
+	{"mvins_nwstr", cmd_mvins_nwstr},
+	{"mvins_wstr", cmd_mvins_wstr},
+	{"mvwins_nwstr", cmd_mvwins_nwstr},
+	{"mvwins_wstr", cmd_mvwins_wstr},
+	{"wins_nwstr", cmd_wins_nwstr},
+	{"wins_wstr", cmd_wins_wstr},
+	{"get_wch", cmd_get_wch},
+	{"unget_wch", cmd_unget_wch},
+	{"mvget_wch", cmd_mvget_wch},
+	{"mvwget_wch", cmd_mvwget_wch},
+	{"wget_wch", cmd_wget_wch},
+	{"getn_wstr", cmd_getn_wstr},
+	{"get_wstr", cmd_get_wstr},
+	{"mvgetn_wstr", cmd_mvgetn_wstr},
+	{"mvget_wstr", cmd_mvget_wstr},
+	{"mvwgetn_wstr", cmd_mvwgetn_wstr},
+	{"mvwget_wstr", cmd_mvwget_wstr},
+	{"wgetn_wstr", cmd_wgetn_wstr},
+	{"wget_wstr", cmd_wget_wstr},
+	{"in_wch", cmd_in_wch},
+	{"mvin_wch", cmd_mvin_wch},
+	{"mvwin_wch", cmd_mvwin_wch},
+	{"win_wch", cmd_win_wch},
+	{"in_wchnstr", cmd_in_wchnstr},
+	{"in_wchstr", cmd_in_wchstr},
+	{"mvin_wchnstr", cmd_mvin_wchnstr},
+	{"mvin_wchstr", cmd_mvin_wchstr},
+	{"mvwin_wchnstr", cmd_mvwin_wchnstr},
+	{"mvwin_wchstr", cmd_mvwin_wchstr},
+	{"win_wchnstr", cmd_win_wchnstr},
+	{"win_wchstr", cmd_win_wchstr},
+	{"innwstr", cmd_innwstr},
+	{"inwstr", cmd_inwstr},
+	{"mvinnwstr", cmd_mvinnwstr},
+	{"mvinwstr", cmd_mvinwstr},
+	{"mvwinnwstr", cmd_mvwinnwstr},
+	{"mvwinwstr", cmd_mvwinwstr},
+	{"winnwstr", cmd_winnwstr},
+	{"winwstr", cmd_winwstr},
+	{"setcchar", cmd_setcchar},
+	{"getcchar", cmd_getcchar},
+	{"key_name", cmd_key_name},
+	{"border_set", cmd_border_set},
+	{"wborder_set", cmd_wborder_set},
+	{"box_set", cmd_box_set},
+	{"erasewchar", cmd_erasewchar},
+	{"killwchar", cmd_killwchar},
+	{"hline_set", cmd_hline_set},
+	{"mvhline_set", cmd_mvhline_set},
+	{"mvvline_set", cmd_mvvline_set},
+	{"mvwhline_set", cmd_mvwhline_set},
+	{"mvwvline_set", cmd_mvwvline_set},
+	{"vline_set", cmd_vline_set},
+	{"whline_set", cmd_whline_set},
+	{"wvline_set", cmd_wvline_set},
+	{"bkgrnd", cmd_bkgrnd},
+	{"bkgrndset", cmd_bkgrndset},
+	{"getbkgrnd", cmd_getbkgrnd},
+	{"wbkgrnd", cmd_wbkgrnd},
+	{"wbkgrndset", cmd_wbkgrndset},
+	{"wgetbkgrnd", cmd_wgetbkgrnd},
+};
+
+size_t ncmds = sizeof(commands) / sizeof(struct command_def);
+
+#endif /* _COMMAND_TABLE_H */
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/commands.c b/contrib/netbsd-tests/lib/libcurses/slave/commands.c
new file mode 100644
index 000000000000..2f26024579d1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/commands.c
@@ -0,0 +1,243 @@
+/*	$NetBSD: commands.c,v 1.4 2011/09/15 11:46:19 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+
+#include <curses.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <err.h>
+#include <sys/types.h>
+#include "returns.h"
+#include "slave.h"
+#include "command_table.h"
+
+extern int cmdpipe[2];
+extern int slvpipe[2];
+
+static void report_type(returns_enum_t);
+static void report_message(int, const char *);
+
+/*
+ * Match the passed command string and execute the associated test
+ * function.
+ */
+void
+command_execute(char *func, int nargs, char **args)
+{
+	size_t i;
+
+	i = 0;
+	while (i < ncmds) {
+		if (strcasecmp(func, commands[i].name) == 0) {
+			/* matched function */
+			commands[i].func(nargs, args);
+			return;
+		}
+		i++;
+	}
+
+	report_status("UNKNOWN_FUNCTION");
+}
+
+/*
+ * Report an pointer value back to the director
+ */
+void
+report_ptr(void *ptr)
+{
+	char *string;
+
+	if (ptr == NULL)
+		asprintf(&string, "NULL");
+	else
+		asprintf(&string, "%p", ptr);
+	report_status(string);
+	free(string);
+}
+
+/*
+ * Report an integer value back to the director
+ */
+void
+report_int(int value)
+{
+	char *string;
+
+	asprintf(&string, "%d", value);
+	report_status(string);
+	free(string);
+}
+
+/*
+ * Report either an ERR or OK back to the director
+ */
+void
+report_return(int status)
+{
+	if (status == ERR)
+		report_type(ret_err);
+	else if (status == OK)
+		report_type(ret_ok);
+	else
+		report_status("INVALID_RETURN");
+}
+
+/*
+ * Report the type back to the director via the command pipe
+ */
+static void
+report_type(returns_enum_t return_type)
+{
+	int type;
+
+	type = return_type;
+	if (write(slvpipe[WRITE_PIPE], &type, sizeof(int)) < 0)
+		err(1, "command pipe write for status type failed");
+
+}
+
+/*
+ * Report the number of returns back to the director via the command pipe
+ */
+void
+report_count(int count)
+{
+	int type;
+
+	type = ret_count;
+	if (write(slvpipe[WRITE_PIPE], &type, sizeof(int)) < 0)
+		err(1, "command pipe write for count type failed");
+
+	if (write(slvpipe[WRITE_PIPE], &count, sizeof(int)) < 0)
+		err(1, "command pipe write for count");
+}
+
+/*
+ * Report the status back to the director via the command pipe
+ */
+void
+report_status(const char *status)
+{
+	report_message(ret_string, status);
+}
+
+/*
+ * Report an error message back to the director via the command pipe.
+ */
+void
+report_error(const char *status)
+{
+	report_message(ret_slave_error, status);
+}
+
+/*
+ * Report the message with the given type back to the director via the
+ * command pipe.
+ */
+static void
+report_message(int type, const char *status)
+{
+	int len;
+
+	len = strlen(status);
+
+	if (write(slvpipe[WRITE_PIPE], &type, sizeof(int)) < 0)
+		err(1, "command pipe write for message type failed");
+
+	if (write(slvpipe[WRITE_PIPE], &len, sizeof(int)) < 0)
+		err(1, "command pipe write for message length failed");
+
+	if (write(slvpipe[WRITE_PIPE], status, len) < 0)
+		err(1, "command pipe write of message data failed");
+}
+
+/*
+ * Report a string of chtype back to the director via the command pipe.
+ */
+void
+report_byte(chtype c)
+{
+	chtype string[2];
+
+	string[0] = c;
+	string[1] = A_NORMAL | '\0';
+	report_nstr(string);
+}
+
+/*
+ * Report a string of chtype back to the director via the command pipe.
+ */
+void
+report_nstr(chtype *string)
+{
+	int len, type;
+	chtype *p;
+
+	len = 0;
+	p = string;
+
+	while ((*p++ & __CHARTEXT) != 0) {
+		len++;
+	}
+
+	len++; /* add in the termination chtype */
+	len *= sizeof(chtype);
+
+	type = ret_byte;
+	if (write(slvpipe[WRITE_PIPE], &type, sizeof(int)) < 0)
+		err(1, "%s: command pipe write for status type failed",
+		    __func__);
+
+	if (write(slvpipe[WRITE_PIPE], &len, sizeof(int)) < 0)
+		err(1, "%s: command pipe write for status length failed",
+		    __func__);
+
+	if (write(slvpipe[WRITE_PIPE], string, len) < 0)
+		err(1, "%s: command pipe write of status data failed",
+		    __func__);
+}
+
+/*
+ * Check the number of args we received are what we expect.  Return an
+ * error if they do not match.
+ */
+int
+check_arg_count(int nargs, int expected)
+{
+	if (nargs != expected) {
+		report_count(1);
+		report_error("INCORRECT_ARGUMENT_NUMBER");
+		return(1);
+	}
+
+	return(0);
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.c b/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.c
new file mode 100644
index 000000000000..9a6679aa1114
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.c
@@ -0,0 +1,7165 @@
+/*	$NetBSD: curses_commands.c,v 1.7 2012/09/19 11:51:08 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+
+#include <curses.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <stdarg.h>
+
+#include "slave.h"
+#include "curses_commands.h"
+
+void
+cmd_DRAIN(int nargs, char **args)
+{
+	while (getch() != ERR);
+	report_count(1);
+	report_return(OK);
+}
+
+void
+cmd_addbytes(int nargs, char **args)
+{
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(addbytes(args[0], count));
+}
+
+
+void
+cmd_addch(int nargs, char **args)
+{
+	chtype *ch;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	ch = (chtype *) args[0];
+	report_count(1);
+	report_return(addch(ch[0]));
+}
+
+
+void
+cmd_addchnstr(int nargs, char **args)
+{
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(addchnstr((chtype *) args[0], count));
+}
+
+
+void
+cmd_addchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_return(addchstr((chtype *) args[0]));
+}
+
+
+void
+cmd_addnstr(int nargs, char **args)
+{
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(addnstr(args[0], count));
+}
+
+
+void
+cmd_addstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_return(addstr(args[0]));
+}
+
+
+void
+cmd_attr_get(int nargs, char **args)
+{
+	attr_t attrs;
+	short colours;
+	int retval;
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	retval = attr_get(&attrs, &colours, NULL);
+
+	/* XXXX - call3 */
+	report_count(3);
+	report_return(retval);
+	report_int(attrs);
+	report_int(colours);
+}
+
+
+void
+cmd_attr_off(int nargs, char **args)
+{
+	int attrib;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attr_off(attrib, NULL));
+}
+
+
+void
+cmd_attr_on(int nargs, char **args)
+{
+	int attrib;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attr_on(attrib, NULL));
+}
+
+
+void
+cmd_attr_set(int nargs, char **args)
+{
+	int attrib;
+	short pair;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%hd", &pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attr_set(attrib, pair, NULL));
+}
+
+
+void
+cmd_attroff(int nargs, char **args)
+{
+	int attrib;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attroff(attrib));
+}
+
+
+void
+cmd_attron(int nargs, char **args)
+{
+	int attrib;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attron(attrib));
+}
+
+
+void
+cmd_attrset(int nargs, char **args)
+{
+	int attrib;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &attrib) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(attrset(attrib));
+}
+
+
+void
+cmd_bkgd(int nargs, char **args)
+{
+	chtype *ch;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	ch = (chtype *) args[0];
+	report_count(1);
+	report_return(bkgd(ch[0]));
+}
+
+
+void
+cmd_bkgdset(int nargs, char **args)
+{
+	chtype *ch;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	ch = (chtype *) args[0];
+	bkgdset(ch[0]); /* returns void */
+	report_count(1);
+	report_return(OK);
+}
+
+
+void
+cmd_border(int nargs, char **args)
+{
+	int ls, rs, ts, bs, tl, tr, bl, br;
+
+	if (check_arg_count(nargs, 8) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &ls) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[1], "%d", &rs) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[2], "%d", &ts) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[3], "%d", &bs) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[4], "%d", &tl) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[5], "%d", &tr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[6], "%d", &bl) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+	if (sscanf(args[7], "%d", &br) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(border(ls, rs, ts, bs, tl, tr, bl, br));
+}
+
+
+void
+cmd_clear(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(clear());
+}
+
+
+void
+cmd_clrtobot(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(clrtobot());
+}
+
+
+void
+cmd_clrtoeol(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(clrtoeol());
+}
+
+
+void
+cmd_color_set(int nargs, char **args)
+{
+	short colour_pair;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &colour_pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(color_set(colour_pair, NULL));
+}
+
+
+void
+cmd_delch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(delch());
+}
+
+
+void
+cmd_deleteln(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(deleteln());
+}
+
+
+void
+cmd_echochar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	/* XXX causes refresh */
+	report_count(1);
+	report_return(echochar(args[0][0]));
+}
+
+
+void
+cmd_erase(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(erase());
+}
+
+
+void
+cmd_getch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX causes refresh */
+	report_count(1);
+	report_int(getch());
+}
+
+
+void
+cmd_getnstr(int nargs, char **args)
+{
+	int limit;
+	char *string;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &limit) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(limit + 1)) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(getnstr(string, limit));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_getstr(int nargs, char **args)
+{
+	char string[256];
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(getstr(string));
+	report_status(string);
+}
+
+
+void
+cmd_inch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+
+	report_count(1);
+	report_byte(inch());
+}
+
+
+void
+cmd_inchnstr(int nargs, char **args)
+{
+	int limit;
+	chtype *string;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &limit) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc((limit + 1) * sizeof(chtype))) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(inchnstr(string, limit));
+	report_nstr(string);
+	free(string);
+}
+
+
+void
+cmd_inchstr(int nargs, char **args)
+{
+	chtype string[256];
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(inchstr(string));
+	report_nstr(string);
+}
+
+
+void
+cmd_innstr(int nargs, char **args)
+{
+	int limit;
+	char *string;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &limit) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(limit + 1)) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_int(innstr(string, limit));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_insch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_return(insch(args[0][0]));
+}
+
+
+void
+cmd_insdelln(int nargs, char **args)
+{
+	int nlines;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &nlines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(insdelln(nlines));
+}
+
+
+void
+cmd_insertln(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(insertln());
+}
+
+
+void
+cmd_instr(int nargs, char **args)
+{
+	char string[256];
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(instr(string));
+	report_status(string);
+}
+
+
+void
+cmd_move(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(move(y, x));
+}
+
+
+void
+cmd_refresh(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(refresh());
+}
+
+
+void
+cmd_scrl(int nargs, char **args)
+{
+	int nlines;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &nlines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(scrl(nlines));
+}
+
+
+void
+cmd_setscrreg(int nargs, char **args)
+{
+	int top, bottom;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &top) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &bottom) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(setscrreg(top, bottom));
+}
+
+
+void
+cmd_standend(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(standend());
+}
+
+
+void
+cmd_standout(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(standout());
+}
+
+
+void
+cmd_timeout(int nargs, char **args)
+{
+	int tval;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &tval) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	timeout(tval); /* void return */
+	report_count(1);
+	report_return(OK);
+}
+
+
+void
+cmd_underscore(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(underscore());
+}
+
+
+void
+cmd_underend(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(underend());
+}
+
+
+void
+cmd_waddbytes(int nargs, char **args)
+{
+	WINDOW *win;
+	int count;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(waddbytes(win, args[1], count));
+}
+
+
+void
+cmd_waddstr(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(waddstr(win, args[1]));
+}
+
+
+void
+cmd_mvaddbytes(int nargs, char **args)
+{
+	int y, x, count;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvaddbytes(y, x, args[2], count));
+}
+
+
+void
+cmd_mvaddch(int nargs, char **args)
+{
+	int y, x;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[2];
+	report_count(1);
+	report_return(mvaddch(y, x, ch[0]));
+}
+
+
+void
+cmd_mvaddchnstr(int nargs, char **args)
+{
+	int y, x, count;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvaddchnstr(y, x, (chtype *) args[2], count));
+}
+
+
+void
+cmd_mvaddchstr(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvaddchstr(y, x, (chtype *) args[2]));
+}
+
+
+void
+cmd_mvaddnstr(int nargs, char **args)
+{
+	int y, x, count;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvaddnstr(y, x, args[2], count));
+}
+
+
+void
+cmd_mvaddstr(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvaddstr(y, x, args[2]));
+}
+
+
+void
+cmd_mvdelch(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvdelch(y, x));
+}
+
+
+void
+cmd_mvgetch(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(mvgetch(y, x));
+}
+
+
+void
+cmd_mvgetnstr(int nargs, char **args)
+{
+	int y, x, count;
+	char *string;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(count + 1)) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvgetnstr(y, x, string, count));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_mvgetstr(int nargs, char **args)
+{
+	int y, x;
+	char string[256];
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvgetstr(y, x, string));
+	report_status(string);
+}
+
+
+void
+cmd_mvinch(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(mvinch(y, x));
+}
+
+
+void
+cmd_mvinchnstr(int nargs, char **args)
+{
+	int y, x, count;
+	chtype *string;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc((count + 1) * sizeof(chtype))) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvinchnstr(y, x, string, count));
+	report_nstr(string);
+	free(string);
+}
+
+
+void
+cmd_mvinchstr(int nargs, char **args)
+{
+	int y, x;
+	chtype string[256];
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvinchstr(y, x, string));
+	report_nstr(string);
+}
+
+
+void
+cmd_mvinnstr(int nargs, char **args)
+{
+	int y, x, count;
+	char *string;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(count + 1)) == NULL) {
+		report_count(1);
+	report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvinnstr(y, x, string, count));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_mvinsch(int nargs, char **args)
+{
+	int y, x, ch;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvinsch(y, x, ch));
+}
+
+
+void
+cmd_mvinstr(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvinstr(y, x, args[2]));
+}
+
+
+
+void
+cmd_mvwaddbytes(int nargs, char **args)
+{
+	int y, x, count;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddbytes(win, y, x, args[3], count));
+}
+
+
+void
+cmd_mvwaddch(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddch(win, y, x, args[3][0]));
+}
+
+
+void
+cmd_mvwaddchnstr(int nargs, char **args)
+{
+	int y, x, count;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddchnstr(win, y, x, (chtype *) args[3], count));
+}
+
+
+void
+cmd_mvwaddchstr(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddchstr(win, y, x, (chtype *) args[3]));
+}
+
+
+void
+cmd_mvwaddnstr(int nargs, char **args)
+{
+	int y, x, count;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddnstr(win, y, x, args[3], count));
+}
+
+
+void
+cmd_mvwaddstr(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwaddstr(win, y, x, args[3]));
+}
+
+
+void
+cmd_mvwdelch(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwdelch(win, y, x));
+}
+
+
+void
+cmd_mvwgetch(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - implicit refresh */
+	report_count(1);
+	report_int(mvwgetch(win, y, x));
+}
+
+
+void
+cmd_mvwgetnstr(int nargs, char **args)
+{
+	int y, x, count;
+	char *string;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(count + 1)) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvwgetnstr(win, y, x, string, count));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_mvwgetstr(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+	char string[256];
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(mvwgetstr(win, y, x, string));
+	report_status(string);
+}
+
+
+void
+cmd_mvwinch(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(mvwinch(win, y, x));
+}
+
+
+void
+cmd_mvwinsch(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(mvwinsch(win, y, x, args[3][0]));
+}
+
+
+void
+cmd_assume_default_colors(int nargs, char **args)
+{
+	short fore, back;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &fore) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%hd", &back) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(assume_default_colors(fore, back));
+}
+
+
+void
+cmd_baudrate(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(baudrate());
+}
+
+
+void
+cmd_beep(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(beep());
+}
+
+
+void
+cmd_box(int nargs, char **args)
+{
+	WINDOW *win;
+	chtype *vertical, *horizontal;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	vertical = (chtype *) args[1];
+	horizontal = (chtype *) args[2];
+	report_count(1);
+	report_return(box(win, vertical[0], horizontal[0]));
+}
+
+
+void
+cmd_can_change_color(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(can_change_color());
+}
+
+
+void
+cmd_cbreak(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(cbreak());
+}
+
+
+void
+cmd_clearok(int nargs, char **args)
+{
+	WINDOW *win;
+	int flag;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(clearok(win, flag));
+}
+
+
+void
+cmd_color_content(int nargs, char **args)
+{
+	short colour, red, green, blue;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call4 */
+	report_count(4);
+	report_return(color_content(colour, &red, &green, &blue));
+	report_int(red);
+	report_int(green);
+	report_int(blue);
+}
+
+
+void
+cmd_copywin(int nargs, char **args)
+{
+	int sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, ovlay;
+	WINDOW *source, *destination;
+
+	if (check_arg_count(nargs, 9) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &source) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%p", &destination) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &sminrow) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &smincol) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &dminrow) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[5], "%d", &dmincol) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[6], "%d", &dmaxrow) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[7], "%d", &dmaxcol) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[8], "%d", &ovlay) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(copywin(source, destination, sminrow, smincol, dminrow,
+			      dmincol, dmaxrow, dmaxcol, ovlay));
+}
+
+
+void
+cmd_curs_set(int nargs, char **args)
+{
+	int vis;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &vis) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(curs_set(vis));
+}
+
+
+void
+cmd_def_prog_mode(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(def_prog_mode());
+}
+
+
+void
+cmd_def_shell_mode(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(def_shell_mode());
+}
+
+
+void
+cmd_define_key(int nargs, char **args)
+{
+	int symbol;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[1], "%d", &symbol) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(define_key(args[0], symbol));
+}
+
+
+void
+cmd_delay_output(int nargs, char **args)
+{
+	int dtime;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &dtime) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(delay_output(dtime));
+}
+
+
+void
+cmd_delscreen(int nargs, char **args)
+{
+	SCREEN *scrn;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &scrn) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	delscreen(scrn); /* void return */
+	report_count(1);
+	report_return(OK);
+}
+
+
+void
+cmd_delwin(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(delwin(win));
+}
+
+
+void
+cmd_derwin(int nargs, char **args)
+{
+	int lines, cols, y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(derwin(win, lines, cols, y, x));
+}
+
+
+void
+cmd_dupwin(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(dupwin(win));
+}
+
+
+void
+cmd_doupdate(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX - implicit refresh */
+	report_count(1);
+	report_return(doupdate());
+}
+
+
+void
+cmd_echo(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(echo());
+}
+
+
+void
+cmd_endwin(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(endwin());
+}
+
+
+void
+cmd_erasechar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(erasechar());
+}
+
+
+void
+cmd_flash(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(flash());
+}
+
+
+void
+cmd_flushinp(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(flushinp());
+}
+
+
+void
+cmd_flushok(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(flushok(win, flag));
+}
+
+
+void
+cmd_fullname(int nargs, char **args)
+{
+	char string[256];
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	/* XXX - call2 */
+	report_count(2);
+	report_status(fullname(args[0], string));
+	report_status(string);
+}
+
+
+void
+cmd_getattrs(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getattrs(win));
+}
+
+
+void
+cmd_getbkgd(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_byte(getbkgd(win));
+}
+
+
+void
+cmd_getcury(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getcury(win));
+}
+
+
+void
+cmd_getcurx(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getcurx(win));
+}
+
+
+void
+cmd_getyx(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	getyx(win, y, x);
+	report_count(2);
+	report_int(y);
+	report_int(x);
+}
+
+
+void
+cmd_getbegy(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getbegy(win));
+}
+
+
+void
+cmd_getbegx(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getbegx(win));
+}
+
+
+void
+cmd_getmaxy(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getmaxy(win));
+}
+
+
+void
+cmd_getmaxx(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getmaxx(win));
+}
+
+
+void
+cmd_getpary(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getpary(win));
+}
+
+
+void
+cmd_getparx(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(getparx(win));
+}
+
+
+void
+cmd_getparyx(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(2);
+	getparyx(win, y, x);
+	report_int(y);
+	report_int(x);
+}
+
+
+void
+cmd_gettmode(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(gettmode());
+}
+
+
+void
+cmd_getwin(int nargs, char **args)
+{
+	FILE *fp;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if ((fp = fopen(args[0], "r")) == NULL) {
+		report_count(1);
+		report_error("BAD FILE_ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(getwin(fp));
+	fclose(fp);
+}
+
+
+void
+cmd_halfdelay(int nargs, char **args)
+{
+	int ms;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &ms) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(halfdelay(ms));
+}
+
+
+void
+cmd_has_colors(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(has_colors());
+}
+
+
+void
+cmd_has_ic(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(has_ic());
+}
+
+
+void
+cmd_has_il(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(has_il());
+}
+
+
+void
+cmd_hline(int nargs, char **args)
+{
+	int count;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	ch = (chtype *) args[0];
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(hline(ch[0], count));
+}
+
+
+void
+cmd_idcok(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+	report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(idcok(win, flag));
+}
+
+
+void
+cmd_idlok(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(idlok(win, flag));
+}
+
+
+void
+cmd_init_color(int nargs, char **args)
+{
+	short colour, red, green, blue;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%hd", &red) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%hd", &green) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%hd", &blue) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(init_color(colour, red, green, blue));
+}
+
+
+void
+cmd_init_pair(int nargs, char **args)
+{
+	short pair, fore, back;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%hd", &fore) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%hd", &back) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(init_pair(pair, fore, back));
+}
+
+
+void
+cmd_initscr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_ptr(initscr());
+}
+
+
+void
+cmd_intrflush(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(intrflush(win, flag));
+}
+
+
+void
+cmd_isendwin(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(isendwin());
+}
+
+
+void
+cmd_is_linetouched(int nargs, char **args)
+{
+	int line;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &line) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(is_linetouched(win, line));
+}
+
+
+void
+cmd_is_wintouched(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(is_wintouched(win));
+}
+
+
+void
+cmd_keyok(int nargs, char **args)
+{
+	int keysym, flag;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &keysym) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(keyok(keysym, flag));
+}
+
+
+void
+cmd_keypad(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(keypad(win, flag));
+}
+
+
+void
+cmd_keyname(int nargs, char **args)
+{
+	unsigned int key;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &key) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_status(keyname(key));
+}
+
+
+void
+cmd_killchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(killchar());
+}
+
+
+void
+cmd_leaveok(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(leaveok(win, flag));
+}
+
+
+void
+cmd_meta(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(meta(win, flag));
+}
+
+
+void
+cmd_mvcur(int nargs, char **args)
+{
+	int oldy, oldx, y, x;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &oldy) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &oldx) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvcur(oldy, oldx, y, x));
+}
+
+
+void
+cmd_mvderwin(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvderwin(win, y, x));
+}
+
+
+void
+cmd_mvhline(int nargs, char **args)
+{
+	int y, x, n;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[2];
+
+	if (sscanf(args[3], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvhline(y, x, ch[0], n));
+}
+
+
+void
+cmd_mvprintw(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvprintw(y, x, args[2], args[3]));
+}
+
+
+void
+cmd_mvscanw(int nargs, char **args)
+{
+	int y, x;
+	char string[256];
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(mvscanw(y, x, args[2], &string));
+	report_status(string);
+}
+
+
+void
+cmd_mvvline(int nargs, char **args)
+{
+	int y, x, n;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[2];
+
+	if (sscanf(args[3], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvvline(y, x, ch[0], n));
+}
+
+
+void
+cmd_mvwhline(int nargs, char **args)
+{
+	int y, x, ch, n;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwhline(win, y, x, ch, n));
+}
+
+
+void
+cmd_mvwvline(int nargs, char **args)
+{
+	int y, x, n;
+	WINDOW *win;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[3];
+
+	if (sscanf(args[4], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwvline(win, y, x, ch[0], n));
+}
+
+
+void
+cmd_mvwin(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwin(win, y, x));
+}
+
+
+void
+cmd_mvwinchnstr(int nargs, char **args)
+{
+	int y, x, count;
+	chtype *string;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc((count + 1) * sizeof(chtype))) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvwinchnstr(win, y, x, string, count));
+	report_nstr(string);
+	free(string);
+}
+
+
+void
+cmd_mvwinchstr(int nargs, char **args)
+{
+	int y, x;
+	chtype string[256];
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvwinchstr(win, y, x, string));
+	report_nstr(string);
+}
+
+
+void
+cmd_mvwinnstr(int nargs, char **args)
+{
+	int y, x, count;
+	char *string;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((string = malloc(count + 1)) == NULL) {
+		report_count(1);
+		report_error("MALLOC_FAILED");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvwinnstr(win, y, x, string, count));
+	report_status(string);
+	free(string);
+}
+
+
+void
+cmd_mvwinstr(int nargs, char **args)
+{
+	int y, x;
+	char string[256];
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(mvwinstr(win, y, x, string));
+	report_status(string);
+}
+
+
+void
+cmd_mvwprintw(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwprintw(win, y, x, args[3], args[4]));
+}
+
+
+void
+cmd_mvwscanw(int nargs, char **args)
+{
+	int y, x;
+	WINDOW *win;
+	char string[256];
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_int(mvwscanw(win, y, x, args[3], &string));
+	report_status(string);
+}
+
+
+void
+cmd_napms(int nargs, char **args)
+{
+	int naptime;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &naptime) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(napms(naptime));
+}
+
+
+void
+cmd_newpad(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(newpad(y, x));
+}
+
+
+void
+cmd_newterm(int nargs, char **args)
+{
+	FILE *in, *out;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if ((in = fopen(args[1], "rw")) == NULL) {
+		report_count(1);
+		report_error("BAD FILE_ARGUMENT");
+		return;
+	}
+
+
+	if ((out = fopen(args[2], "rw")) == NULL) {
+		report_count(1);
+		report_error("BAD FILE_ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(newterm(args[0], out, in));
+}
+
+
+void
+cmd_newwin(int nargs, char **args)
+{
+	int lines, cols, begin_y, begin_x;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &begin_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &begin_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(newwin(lines, cols, begin_y, begin_x));
+}
+
+
+void
+cmd_nl(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(nl());
+}
+
+
+void
+cmd_no_color_attributes(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(no_color_attributes());
+}
+
+
+void
+cmd_nocbreak(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(nocbreak());
+}
+
+
+void
+cmd_nodelay(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(nodelay(win, flag));
+}
+
+
+void
+cmd_noecho(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(noecho());
+}
+
+
+void
+cmd_nonl(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(nonl());
+}
+
+
+void
+cmd_noqiflush(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	noqiflush();
+	report_count(1);
+	report_return(OK); /* fake a return, the call returns void */
+}
+
+
+void
+cmd_noraw(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(noraw());
+}
+
+
+void
+cmd_notimeout(int nargs, char **args)
+{
+	int flag;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(notimeout(win, flag));
+}
+
+
+void
+cmd_overlay(int nargs, char **args)
+{
+	WINDOW *source, *dest;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &source) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%p", &dest) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(overlay(source, dest));
+}
+
+
+void
+cmd_overwrite(int nargs, char **args)
+{
+	WINDOW *source, *dest;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &source) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%p", &dest) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(overwrite(source, dest));
+}
+
+
+void
+cmd_pair_content(int nargs, char **args)
+{
+	short pair, fore, back;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%hd", &pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call3 */
+	report_count(3);
+	report_return(pair_content(pair, &fore, &back));
+	report_int(fore);
+	report_int(back);
+}
+
+
+void
+cmd_pechochar(int nargs, char **args)
+{
+	int ch;
+	WINDOW *pad;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &pad) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(pechochar(pad, ch));
+}
+
+
+void
+cmd_pnoutrefresh(int nargs, char **args)
+{
+	int pbeg_y, pbeg_x, sbeg_y, sbeg_x, smax_y, smax_x;
+	WINDOW *pad;
+
+	if (check_arg_count(nargs, 7) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &pad) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &pbeg_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &pbeg_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &sbeg_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &sbeg_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[5], "%d", &smax_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[6], "%d", &smax_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(pnoutrefresh(pad, pbeg_y, pbeg_x, sbeg_y, sbeg_x, smax_y,
+				   smax_x));
+}
+
+
+void
+cmd_prefresh(int nargs, char **args)
+{
+	int pbeg_y, pbeg_x, sbeg_y, sbeg_x, smax_y, smax_x;
+	WINDOW *pad;
+
+	if (check_arg_count(nargs, 7) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &pad) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &pbeg_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &pbeg_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &sbeg_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &sbeg_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[5], "%d", &smax_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[6], "%d", &smax_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX causes refresh */
+	report_count(1);
+	report_return(prefresh(pad, pbeg_y, pbeg_x, sbeg_y, sbeg_x, smax_y,
+			       smax_x));
+
+}
+
+
+void
+cmd_printw(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+
+	report_count(1);
+	report_return(printw(args[0], args[1]));
+}
+
+
+void
+cmd_putwin(int nargs, char **args)
+{
+	FILE *fp;
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if ((fp = fopen(args[1], "rw")) == NULL) {
+		report_count(1);
+		report_error("BAD FILE_ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(putwin(win, fp));
+}
+
+
+void
+cmd_qiflush(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	qiflush();
+	report_count(1);
+	report_return(OK); /* fake a return because call returns void */
+}
+
+
+void
+cmd_raw(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(raw());
+}
+
+
+void
+cmd_redrawwin(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(redrawwin(win));
+}
+
+
+void
+cmd_reset_prog_mode(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(reset_prog_mode());
+}
+
+
+void
+cmd_reset_shell_mode(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(reset_shell_mode());
+}
+
+
+void
+cmd_resetty(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(resetty());
+}
+
+
+void
+cmd_resizeterm(int nargs, char **args)
+{
+	int rows, cols;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &rows) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(resizeterm(rows, cols));
+}
+
+
+void
+cmd_savetty(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(savetty());
+}
+
+
+void
+cmd_scanw(int nargs, char **args)
+{
+	char string[256];
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX call2 */
+	report_count(2);
+	report_return(scanw("%s", string));
+	report_status(string);
+}
+
+
+void
+cmd_scroll(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(scroll(win));
+}
+
+
+void
+cmd_scrollok(int nargs, char **args)
+{
+	WINDOW *win;
+	int flag;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &flag) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(scrollok(win, flag));
+}
+
+
+void
+cmd_setterm(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_return(setterm(args[0]));
+}
+
+
+void
+cmd_set_term(int nargs, char **args)
+{
+	SCREEN *scrn;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &scrn) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(set_term(scrn));
+}
+
+
+void
+cmd_start_color(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(start_color());
+}
+
+
+void
+cmd_subpad(int nargs, char **args)
+{
+	WINDOW *pad;
+	int lines, cols, begin_y, begin_x;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &pad) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &begin_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &begin_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(subpad(pad, lines, cols, begin_y, begin_x));
+}
+
+
+void
+cmd_subwin(int nargs, char **args)
+{
+	WINDOW *win;
+	int lines, cols, begin_y, begin_x;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &begin_y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &begin_x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_ptr(subwin(win, lines, cols, begin_y, begin_x));
+}
+
+
+void
+cmd_termattrs(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(termattrs());
+}
+
+
+void
+cmd_term_attrs(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_int(term_attrs());
+}
+
+
+void
+cmd_touchline(int nargs, char **args)
+{
+	WINDOW *win;
+	int start, count;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &start) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(touchline(win, start, count));
+}
+
+
+void
+cmd_touchoverlap(int nargs, char **args)
+{
+	WINDOW *win1, *win2;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win1) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%p", &win2) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(touchoverlap(win1, win2));
+}
+
+
+void
+cmd_touchwin(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(touchwin(win));
+}
+
+
+void
+cmd_ungetch(int nargs, char **args)
+{
+	int ch;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(ungetch(ch));
+}
+
+
+void
+cmd_untouchwin(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(untouchwin(win));
+}
+
+
+void
+cmd_use_default_colors(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	report_count(1);
+	report_return(use_default_colors());
+}
+
+
+void
+cmd_vline(int nargs, char **args)
+{
+	int count;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	ch = (chtype *) args[0];
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(vline(ch[0], count));
+}
+
+
+static int
+internal_vw_printw(WINDOW *win, char *arg1, ...)
+{
+	va_list va;
+	int rv;
+
+	va_start(va, arg1);
+	rv = vw_printw(win, arg1, va);
+	va_end(va);
+
+	return rv;
+}
+
+void
+cmd_vw_printw(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(internal_vw_printw(win, args[1], args[2]));
+}
+
+
+static int
+internal_vw_scanw(WINDOW *win, char *arg1, ...)
+{
+	va_list va;
+	int rv;
+
+	va_start(va, arg1);
+	rv = vw_scanw(win, arg1, va);
+	va_end(va);
+
+	return rv;
+}
+
+void
+cmd_vw_scanw(int nargs, char **args)
+{
+	WINDOW *win;
+	char string[256];
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_int(internal_vw_scanw(win, args[1], string));
+	report_status(string);
+}
+
+
+void
+cmd_vwprintw(int nargs, char **args)
+{
+	cmd_vw_printw(nargs, args);
+}
+
+
+void
+cmd_vwscanw(int nargs, char **args)
+{
+	cmd_vw_scanw(nargs, args);
+}
+
+
+void
+cmd_waddch(int nargs, char **args)
+{
+	WINDOW *win;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[1];
+
+	report_count(1);
+	report_return(waddch(win, ch[0]));
+}
+
+
+void
+cmd_waddchnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int count;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(waddchnstr(win, (chtype *) args[1], count));
+}
+
+
+void
+cmd_waddchstr(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(waddchstr(win, (chtype *) args[1]));
+}
+
+
+void
+cmd_waddnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int count;
+
+	if (check_arg_count(nargs, 1) == 3)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(waddnstr(win, args[1], count));
+
+}
+
+
+void
+cmd_wattr_get(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+	short pair;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call3 */
+	report_count(3);
+	report_return(wattr_get(win, &attr, &pair, NULL));
+	report_int(attr);
+	report_int(pair);
+}
+
+
+void
+cmd_wattr_off(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattr_off(win, attr, NULL));
+}
+
+
+void
+cmd_wattr_on(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattr_on(win, attr, NULL));
+}
+
+
+void
+cmd_wattr_set(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+	short pair;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%hd", &pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattr_set(win, attr, pair, NULL));
+}
+
+
+void
+cmd_wattroff(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattroff(win, attr));
+}
+
+
+void
+cmd_wattron(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattron(win, attr));
+}
+
+
+void
+cmd_wattrset(int nargs, char **args)
+{
+	WINDOW *win;
+	int attr;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wattrset(win, attr));
+}
+
+
+void
+cmd_wbkgd(int nargs, char **args)
+{
+	WINDOW *win;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[1];
+	report_count(1);
+	report_return(wbkgd(win, ch[0]));
+}
+
+
+void
+cmd_wbkgdset(int nargs, char **args)
+{
+	WINDOW *win;
+	int ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	wbkgdset(win, ch); /* void return */
+	report_count(1);
+	report_return(OK);
+}
+
+
+void
+cmd_wborder(int nargs, char **args)
+{
+	WINDOW *win;
+	int ls, rs, ts, bs, tl, tr, bl, br;
+
+	if (check_arg_count(nargs, 9) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ls) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &rs) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &ts) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &bs) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[5], "%d", &tl) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[6], "%d", &tr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[7], "%d", &bl) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[8], "%d", &br) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wborder(win, ls, rs, ts, bs, tl, tr, bl, br));
+}
+
+
+void
+cmd_wclear(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wclear(win));
+}
+
+
+void
+cmd_wclrtobot(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wclrtobot(win));
+}
+
+
+void
+cmd_wclrtoeol(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wclrtoeol(win));
+
+}
+
+
+void
+cmd_wcolor_set(int nargs, char **args)
+{
+	WINDOW *win;
+	short pair;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%hd", &pair) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wcolor_set(win, pair, NULL));
+}
+
+
+void
+cmd_wdelch(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wdelch(win));
+}
+
+
+void
+cmd_wdeleteln(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wdeleteln(win));
+
+}
+
+
+void
+cmd_wechochar(int nargs, char **args)
+{
+	WINDOW *win;
+	int ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wechochar(win, ch));
+}
+
+
+void
+cmd_werase(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(werase(win));
+}
+
+
+void
+cmd_wgetch(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(wgetch(win));
+}
+
+
+void
+cmd_wgetnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int count;
+	char string[256];
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(wgetnstr(win, string, count));
+	report_status(string);
+}
+
+
+void
+cmd_wgetstr(int nargs, char **args)
+{
+	WINDOW *win;
+	char string[256];
+
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	string[0] = '\0';
+
+	report_count(2);
+	report_return(wgetstr(win, string));
+	report_status(string);
+}
+
+
+void
+cmd_whline(int nargs, char **args)
+{
+	WINDOW *win;
+	int ch, count;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(whline(win, ch, count));
+}
+
+
+void
+cmd_winch(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_int(winch(win));
+}
+
+
+void
+cmd_winchnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	chtype string[256];
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(winchnstr(win, string, count));
+	report_nstr(string);
+}
+
+
+void
+cmd_winchstr(int nargs, char **args)
+{
+	WINDOW *win;
+	chtype string[256];
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(winchstr(win, string));
+	report_nstr(string);
+}
+
+
+void
+cmd_winnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	char string[256];
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(winnstr(win, string, count));
+	report_status(string);
+}
+
+
+void
+cmd_winsch(int nargs, char **args)
+{
+	WINDOW *win;
+	int ch;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &ch) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(winsch(win, ch));
+}
+
+
+void
+cmd_winsdelln(int nargs, char **args)
+{
+	WINDOW *win;
+	int count;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &count) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(winsdelln(win, count));
+}
+
+
+void
+cmd_winsertln(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(winsertln(win));
+}
+
+
+void
+cmd_winstr(int nargs, char **args)
+{
+	WINDOW *win;
+	char string[256];
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(winstr(win, string));
+	report_status(string);
+}
+
+
+void
+cmd_wmove(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wmove(win, y, x));
+}
+
+
+void
+cmd_wnoutrefresh(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wnoutrefresh(win));
+}
+
+
+void
+cmd_wprintw(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wprintw(win, args[1], args[2]));
+}
+
+
+void
+cmd_wredrawln(int nargs, char **args)
+{
+	WINDOW *win;
+	int beg_line, num_lines;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &beg_line) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &num_lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wredrawln(win, beg_line, num_lines));
+}
+
+
+void
+cmd_wrefresh(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* XXX - generates output */
+	report_count(1);
+	report_return(wrefresh(win));
+}
+
+
+void
+cmd_wresize(int nargs, char **args)
+{
+	WINDOW *win;
+	int lines, cols;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &lines) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &cols) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wresize(win, lines, cols));
+}
+
+
+void
+cmd_wscanw(int nargs, char **args)
+{
+	WINDOW *win;
+	char string[256];
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wscanw(win, args[1], &string));
+}
+
+
+void
+cmd_wscrl(int nargs, char **args)
+{
+	WINDOW *win;
+	int n;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wscrl(win, n));
+}
+
+
+void
+cmd_wsetscrreg(int nargs, char **args)
+{
+	WINDOW *win;
+	int top, bottom;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &top) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &bottom) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wsetscrreg(win, top, bottom));
+}
+
+
+void
+cmd_wstandend(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wstandend(win));
+}
+
+
+void
+cmd_wstandout(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wstandout(win));
+}
+
+
+void
+cmd_wtimeout(int nargs, char **args)
+{
+	WINDOW *win;
+	int tval;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &tval) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	wtimeout(win, tval); /* void return */
+	report_count(1);
+	report_return(OK);
+}
+
+
+void
+cmd_wtouchln(int nargs, char **args)
+{
+	WINDOW *win;
+	int line, n, changed;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &line) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &changed) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wtouchln(win, line, n, changed));
+}
+
+
+void
+cmd_wunderend(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wunderend(win));
+}
+
+
+void
+cmd_wunderscore(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wunderscore(win));
+}
+
+
+void
+cmd_wvline(int nargs, char **args)
+{
+	WINDOW *win;
+	int n;
+	chtype *ch;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	ch = (chtype *) args[1];
+
+	if (sscanf(args[2], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wvline(win, ch[0], n));
+}
+
+
+void
+cmd_insnstr(int nargs, char **args)
+{
+	int n;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[1], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(insnstr(args[0], n));
+}
+
+
+void
+cmd_insstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_return(insstr(args[0]));
+}
+
+
+void
+cmd_mvinsnstr(int nargs, char **args)
+{
+	int y, x, n;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvinsnstr(y, x, args[2], n));
+}
+
+
+void
+cmd_mvinsstr(int nargs, char **args)
+{
+	int y, x;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvinsstr(y, x, args[2]));
+}
+
+
+void
+cmd_mvwinsnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x, n;
+
+	if (check_arg_count(nargs, 5) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwinsnstr(win, y, x, args[3], n));
+
+}
+
+
+void
+cmd_mvwinsstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwinsstr(win, y, x, args[3]));
+}
+
+
+void
+cmd_winsnstr(int nargs, char **args)
+{
+	WINDOW *win;
+	int n;
+
+	if (check_arg_count(nargs, 3) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(winsnstr(win, args[1], n));
+}
+
+
+void
+cmd_winsstr(int nargs, char **args)
+{
+	WINDOW *win;
+
+	if (check_arg_count(nargs, 2) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(winsstr(win, args[1]));
+}
+
+
+
+void
+cmd_chgat(int nargs, char **args)
+{
+	int n, attr, colour;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	/* Note: 4th argument unused in current curses implementation */
+	report_count(1);
+	report_return(chgat(n, attr, colour, NULL));
+}
+
+
+void
+cmd_wchgat(int nargs, char **args)
+{
+	WINDOW *win;
+	int n, attr;
+	short colour;
+
+	if (check_arg_count(nargs, 4) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%hd", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(wchgat(win, n, attr, colour, NULL));
+}
+
+
+void
+cmd_mvchgat(int nargs, char **args)
+{
+	int y, x, n, attr;
+	short colour;
+
+	if (check_arg_count(nargs, 6) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%hd", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvchgat(y, x, n, attr, colour, NULL));
+}
+
+
+void
+cmd_mvwchgat(int nargs, char **args)
+{
+	WINDOW *win;
+	int y, x, n, attr, colour;
+
+	if (check_arg_count(nargs, 6) == 1)
+		return;
+
+	if (sscanf(args[0], "%p", &win) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[1], "%d", &y) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[2], "%d", &x) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[3], "%d", &n) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[4], "%d", &attr) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	if (sscanf(args[5], "%d", &colour) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_return(mvwchgat(win, y, x, n, attr, colour, NULL));
+}
+
+
+void
+cmd_add_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wadd_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvadd_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwadd_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_add_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_add_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wadd_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wadd_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvadd_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvadd_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwadd_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwadd_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_addnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_addwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvaddnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvaddwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwaddnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwaddwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_waddnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_waddwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_echo_wchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wecho_wchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_pecho_wchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+/* insert */
+void
+cmd_ins_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wins_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvins_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwins_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_ins_nwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_ins_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvins_nwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvins_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwins_nwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwins_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wins_nwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wins_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+/* input */
+void
+cmd_get_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_unget_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvget_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwget_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wget_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_getn_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_get_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvgetn_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvget_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwgetn_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwget_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wgetn_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wget_wstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_in_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvin_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwin_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_win_wch(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_in_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_in_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvin_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvin_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwin_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwin_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_win_wchnstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_win_wchstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+void
+cmd_innwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_inwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvinnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvinwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwinnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwinwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_winnwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_winwstr(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+/* cchar handlgin */
+void
+cmd_setcchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_getcchar(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+
+/* misc */
+void
+cmd_key_name(int nargs, char **args)
+{
+	int w;
+
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	if (sscanf(args[0], "%d", &w) == 0) {
+		report_count(1);
+		report_error("BAD ARGUMENT");
+		return;
+	}
+
+	report_count(1);
+	report_status(key_name(w));
+}
+
+
+void
+cmd_border_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wborder_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_box_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_erasewchar(int nargs, char **args)
+{
+	wchar_t ch;
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(erasewchar(&ch));
+	report_int(ch);
+}
+
+
+void
+cmd_killwchar(int nargs, char **args)
+{
+	wchar_t ch;
+
+	if (check_arg_count(nargs, 0) == 1)
+		return;
+
+	/* XXX - call2 */
+	report_count(2);
+	report_return(erasewchar(&ch));
+	report_int(ch);
+}
+
+
+void
+cmd_hline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvhline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvvline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwhline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_mvwvline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_vline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_whline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wvline_set(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_bkgrnd(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_bkgrndset(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_getbkgrnd(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wbkgrnd(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wbkgrndset(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
+
+
+void
+cmd_wgetbkgrnd(int nargs, char **args)
+{
+	if (check_arg_count(nargs, 1) == 1)
+		return;
+
+	report_count(1);
+	report_error("UNSUPPORTED");
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.h b/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.h
new file mode 100644
index 000000000000..d7f2ad7ef05a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/curses_commands.h
@@ -0,0 +1,422 @@
+/*	$NetBSD: curses_commands.h,v 1.3 2011/09/15 11:46:19 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 _CURSES_COMMANDS_H_
+#define	_CURSES_COMMANDS_H_
+
+struct command_def {
+	const char *name;
+	void (*func)(int, char **);
+};
+
+/*
+ * prototypes for test commands
+ */
+void cmd_DRAIN(int, char **); /* not a curses function */
+
+void cmd_addbytes(int, char **);
+void cmd_addch(int, char **);
+void cmd_addchnstr(int, char **);
+void cmd_addchstr(int, char **);
+void cmd_addnstr(int, char **);
+void cmd_addstr(int, char **);
+void cmd_attr_get(int, char **);
+void cmd_attr_off(int, char **);
+void cmd_attr_on(int, char **);
+void cmd_attr_set(int, char **);
+void cmd_attroff(int, char **);
+void cmd_attron(int, char **);
+void cmd_attrset(int, char **);
+void cmd_bkgd(int, char **);
+void cmd_bkgdset(int, char **);
+void cmd_border(int, char **);
+void cmd_clear(int, char **);
+void cmd_clrtobot(int, char **);
+void cmd_clrtoeol(int, char **);
+void cmd_color_set(int, char **);
+void cmd_delch(int, char **);
+void cmd_deleteln(int, char **);
+void cmd_echochar(int, char **);
+void cmd_erase(int, char **);
+void cmd_getch(int, char **);
+void cmd_getnstr(int, char **);
+void cmd_getstr(int, char **);
+void cmd_inch(int, char **);
+void cmd_inchnstr(int, char **);
+void cmd_inchstr(int, char **);
+void cmd_innstr(int, char **);
+void cmd_insch(int, char **);
+void cmd_insdelln(int, char **);
+void cmd_insertln(int, char **);
+void cmd_instr(int, char **);
+void cmd_move(int, char **);
+void cmd_refresh(int, char **);
+void cmd_scrl(int, char **);
+void cmd_setscrreg(int, char **);
+void cmd_standend(int, char **);
+void cmd_standout(int, char **);
+void cmd_timeout(int, char **);
+void cmd_underscore(int, char **);
+void cmd_underend(int, char **);
+void cmd_waddbytes(int, char **);
+void cmd_waddstr(int, char **);
+void cmd_mvaddbytes(int, char **);
+void cmd_mvaddch(int, char **);
+void cmd_mvaddchnstr(int, char **);
+void cmd_mvaddchstr(int, char **);
+void cmd_mvaddnstr(int, char **);
+void cmd_mvaddstr(int, char **);
+void cmd_mvdelch(int, char **);
+void cmd_mvgetch(int, char **);
+void cmd_mvgetnstr(int, char **);
+void cmd_mvgetstr(int, char **);
+void cmd_mvinch(int, char **);
+void cmd_mvinchnstr(int, char **);
+void cmd_mvinchstr(int, char **);
+void cmd_mvinnstr(int, char **);
+void cmd_mvinsch(int, char **);
+void cmd_mvinstr(int, char **);
+
+void cmd_mvwaddbytes(int, char **);
+void cmd_mvwaddch(int, char **);
+void cmd_mvwaddchnstr(int, char **);
+void cmd_mvwaddchstr(int, char **);
+void cmd_mvwaddnstr(int, char **);
+void cmd_mvwaddstr(int, char **);
+void cmd_mvwdelch(int, char **);
+void cmd_mvwgetch(int, char **);
+void cmd_mvwgetnstr(int, char **);
+void cmd_mvwgetstr(int, char **);
+void cmd_mvwinch(int, char **);
+void cmd_mvwinsch(int, char **);
+void cmd_assume_default_colors(int, char **);
+void cmd_baudrate(int, char **);
+void cmd_beep(int, char **);
+void cmd_box(int, char **);
+void cmd_can_change_color(int, char **);
+void cmd_cbreak(int, char **);
+void cmd_chgat(int, char **);
+void cmd_clearok(int, char **);
+void cmd_color_content(int, char **);
+void cmd_copywin(int, char **);
+void cmd_curs_set(int, char **);
+void cmd_def_prog_mode(int, char **);
+void cmd_def_shell_mode(int, char **);
+void cmd_define_key(int, char **);
+void cmd_delay_output(int, char **);
+void cmd_delscreen(int, char **);
+void cmd_delwin(int, char **);
+void cmd_derwin(int, char **);
+void cmd_dupwin(int, char **);
+void cmd_doupdate(int, char **);
+void cmd_echo(int, char **);
+void cmd_endwin(int, char **);
+void cmd_erasechar(int, char **);
+void cmd_flash(int, char **);
+void cmd_flushinp(int, char **);
+void cmd_flushok(int, char **);
+void cmd_fullname(int, char **);
+void cmd_getattrs(int, char **);
+void cmd_getbkgd(int, char **);
+void cmd_getcury(int, char **);
+void cmd_getcurx(int, char **);
+void cmd_getyx(int, char **);
+void cmd_getbegy(int, char **);
+void cmd_getbegx(int, char **);
+void cmd_getmaxy(int, char **);
+void cmd_getmaxx(int, char **);
+void cmd_getpary(int, char **);
+void cmd_getparx(int, char **);
+void cmd_getparyx(int, char **);
+void cmd_gettmode(int, char **);
+void cmd_getwin(int, char **);
+void cmd_halfdelay(int, char **);
+void cmd_has_colors(int, char **);
+void cmd_has_ic(int, char **);
+void cmd_has_il(int, char **);
+void cmd_hline(int, char **);
+void cmd_idcok(int, char **);
+void cmd_idlok(int, char **);
+void cmd_init_color(int, char **);
+void cmd_init_pair(int, char **);
+void cmd_initscr(int, char **);
+void cmd_intrflush(int, char **);
+void cmd_isendwin(int, char **);
+void cmd_is_linetouched(int, char **);
+void cmd_is_wintouched(int, char **);
+void cmd_keyok(int, char **);
+void cmd_keypad(int, char **);
+void cmd_keyname(int, char **);
+void cmd_killchar(int, char **);
+void cmd_leaveok(int, char **);
+void cmd_meta(int, char **);
+void cmd_mvchgat(int, char **);
+void cmd_mvcur(int, char **);
+void cmd_mvderwin(int, char **);
+void cmd_mvhline(int, char **);
+void cmd_mvprintw(int, char **);
+void cmd_mvscanw(int, char **);
+void cmd_mvvline(int, char **);
+void cmd_mvwchgat(int, char **);
+void cmd_mvwhline(int, char **);
+void cmd_mvwvline(int, char **);
+void cmd_mvwin(int, char **);
+void cmd_mvwinchnstr(int, char **);
+void cmd_mvwinchstr(int, char **);
+void cmd_mvwinnstr(int, char **);
+void cmd_mvwinstr(int, char **);
+void cmd_mvwprintw(int, char **);
+void cmd_mvwscanw(int, char **);
+void cmd_napms(int, char **);
+void cmd_newpad(int, char **);
+void cmd_newterm(int, char **);
+void cmd_newwin(int, char **);
+void cmd_nl(int, char **);
+void cmd_no_color_attributes(int, char **);
+void cmd_nocbreak(int, char **);
+void cmd_nodelay(int, char **);
+void cmd_noecho(int, char **);
+void cmd_nonl(int, char **);
+void cmd_noqiflush(int, char **);
+void cmd_noraw(int, char **);
+void cmd_notimeout(int, char **);
+void cmd_overlay(int, char **);
+void cmd_overwrite(int, char **);
+void cmd_pair_content(int, char **);
+void cmd_pechochar(int, char **);
+void cmd_pnoutrefresh(int, char **);
+void cmd_prefresh(int, char **);
+void cmd_printw(int, char **);
+void cmd_putwin(int, char **);
+void cmd_qiflush(int, char **);
+void cmd_raw(int, char **);
+void cmd_redrawwin(int, char **);
+void cmd_reset_prog_mode(int, char **);
+void cmd_reset_shell_mode(int, char **);
+void cmd_resetty(int, char **);
+void cmd_resizeterm(int, char **);
+void cmd_savetty(int, char **);
+void cmd_scanw(int, char **);
+void cmd_scroll(int, char **);
+void cmd_scrollok(int, char **);
+void cmd_setterm(int, char **);
+void cmd_set_term(int, char **);
+void cmd_start_color(int, char **);
+void cmd_subpad(int, char **);
+void cmd_subwin(int, char **);
+void cmd_termattrs(int, char **);
+void cmd_term_attrs(int, char **);
+void cmd_touchline(int, char **);
+void cmd_touchoverlap(int, char **);
+void cmd_touchwin(int, char **);
+void cmd_ungetch(int, char **);
+void cmd_untouchwin(int, char **);
+void cmd_use_default_colors(int, char **);
+void cmd_vline(int, char **);
+void cmd_vw_printw(int, char **);
+void cmd_vw_scanw(int, char **);
+void cmd_vwprintw(int, char **);
+void cmd_vwscanw(int, char **);
+void cmd_waddch(int, char **);
+void cmd_waddchnstr(int, char **);
+void cmd_waddchstr(int, char **);
+void cmd_waddnstr(int, char **);
+void cmd_wattr_get(int, char **);
+void cmd_wattr_off(int, char **);
+void cmd_wattr_on(int, char **);
+void cmd_wattr_set(int, char **);
+void cmd_wattroff(int, char **);
+void cmd_wattron(int, char **);
+void cmd_wattrset(int, char **);
+void cmd_wbkgd(int, char **);
+void cmd_wbkgdset(int, char **);
+void cmd_wborder(int, char **);
+void cmd_wchgat(int, char **);
+void cmd_wclear(int, char **);
+void cmd_wclrtobot(int, char **);
+void cmd_wclrtoeol(int, char **);
+void cmd_wcolor_set(int, char **);
+void cmd_wdelch(int, char **);
+void cmd_wdeleteln(int, char **);
+void cmd_wechochar(int, char **);
+void cmd_werase(int, char **);
+void cmd_wgetch(int, char **);
+void cmd_wgetnstr(int, char **);
+void cmd_wgetstr(int, char **);
+void cmd_whline(int, char **);
+void cmd_winch(int, char **);
+void cmd_winchnstr(int, char **);
+void cmd_winchstr(int, char **);
+void cmd_winnstr(int, char **);
+void cmd_winsch(int, char **);
+void cmd_winsdelln(int, char **);
+void cmd_winsertln(int, char **);
+void cmd_winstr(int, char **);
+void cmd_wmove(int, char **);
+void cmd_wnoutrefresh(int, char **);
+void cmd_wprintw(int, char **);
+void cmd_wredrawln(int, char **);
+void cmd_wrefresh(int, char **);
+void cmd_wresize(int, char **);
+void cmd_wscanw(int, char **);
+void cmd_wscrl(int, char **);
+void cmd_wsetscrreg(int, char **);
+void cmd_wstandend(int, char **);
+void cmd_wstandout(int, char **);
+void cmd_wtimeout(int, char **);
+void cmd_wtouchln(int, char **);
+void cmd_wunderend(int, char **);
+void cmd_wunderscore(int, char **);
+void cmd_wvline(int, char **);
+void cmd_insnstr(int, char **);
+void cmd_insstr(int, char **);
+void cmd_mvinsnstr(int, char **);
+void cmd_mvinsstr(int, char **);
+void cmd_mvwinsnstr(int, char **);
+void cmd_mvwinsstr(int, char **);
+void cmd_winsnstr(int, char **);
+void cmd_winsstr(int, char **);
+
+void cmd_chgat(int, char **);
+void cmd_wchgat(int, char **);
+void cmd_mvchgat(int, char **);
+void cmd_mvwchgat(int, char **);
+void cmd_add_wch(int, char **);
+void cmd_wadd_wch(int, char **);
+void cmd_mvadd_wch(int, char **);
+void cmd_mvwadd_wch(int, char **);
+
+void cmd_add_wchnstr(int, char **);
+void cmd_add_wchstr(int, char **);
+void cmd_wadd_wchnstr(int, char **);
+void cmd_wadd_wchstr(int, char **);
+void cmd_mvadd_wchnstr(int, char **);
+void cmd_mvadd_wchstr(int, char **);
+void cmd_mvwadd_wchnstr(int, char **);
+void cmd_mvwadd_wchstr(int, char **);
+
+void cmd_addnwstr(int, char **);
+void cmd_addwstr(int, char **);
+void cmd_mvaddnwstr(int, char **);
+void cmd_mvaddwstr(int, char **);
+void cmd_mvwaddnwstr(int, char **);
+void cmd_mvwaddwstr(int, char **);
+void cmd_waddnwstr(int, char **);
+void cmd_waddwstr(int, char **);
+
+void cmd_echo_wchar(int, char **);
+void cmd_wecho_wchar(int, char **);
+void cmd_pecho_wchar(int, char **);
+
+/* insert */
+void cmd_ins_wch(int, char **);
+void cmd_wins_wch(int, char **);
+void cmd_mvins_wch(int, char **);
+void cmd_mvwins_wch(int, char **);
+
+void cmd_ins_nwstr(int, char **);
+void cmd_ins_wstr(int, char **);
+void cmd_mvins_nwstr(int, char **);
+void cmd_mvins_wstr(int, char **);
+void cmd_mvwins_nwstr(int, char **);
+void cmd_mvwins_wstr(int, char **);
+void cmd_wins_nwstr(int, char **);
+void cmd_wins_wstr(int, char **);
+
+/* input */
+void cmd_get_wch(int, char **);
+void cmd_unget_wch(int, char **);
+void cmd_mvget_wch(int, char **);
+void cmd_mvwget_wch(int, char **);
+void cmd_wget_wch(int, char **);
+
+void cmd_getn_wstr(int, char **);
+void cmd_get_wstr(int, char **);
+void cmd_mvgetn_wstr(int, char **);
+void cmd_mvget_wstr(int, char **);
+void cmd_mvwgetn_wstr(int, char **);
+void cmd_mvwget_wstr(int, char **);
+void cmd_wgetn_wstr(int, char **);
+void cmd_wget_wstr(int, char **);
+
+void cmd_in_wch(int, char **);
+void cmd_mvin_wch(int, char **);
+void cmd_mvwin_wch(int, char **);
+void cmd_win_wch(int, char **);
+
+void cmd_in_wchnstr(int, char **);
+void cmd_in_wchstr(int, char **);
+void cmd_mvin_wchnstr(int, char **);
+void cmd_mvin_wchstr(int, char **);
+void cmd_mvwin_wchnstr(int, char **);
+void cmd_mvwin_wchstr(int, char **);
+void cmd_win_wchnstr(int, char **);
+void cmd_win_wchstr(int, char **);
+
+void cmd_innwstr(int, char **);
+void cmd_inwstr(int, char **);
+void cmd_mvinnwstr(int, char **);
+void cmd_mvinwstr(int, char **);
+void cmd_mvwinnwstr(int, char **);
+void cmd_mvwinwstr(int, char **);
+void cmd_winnwstr(int, char **);
+void cmd_winwstr(int, char **);
+
+/* cchar handlgin */
+void cmd_setcchar(int, char **);
+void cmd_getcchar(int, char **);
+
+/* misc */
+void cmd_key_name(int, char **);
+void cmd_border_set(int, char **);
+void cmd_wborder_set(int, char **);
+void cmd_box_set(int, char **);
+void cmd_erasewchar(int, char **);
+void cmd_killwchar(int, char **);
+void cmd_hline_set(int, char **);
+void cmd_mvhline_set(int, char **);
+void cmd_mvvline_set(int, char **);
+void cmd_mvwhline_set(int, char **);
+void cmd_mvwvline_set(int, char **);
+void cmd_vline_set(int, char **);
+void cmd_whline_set(int, char **);
+void cmd_wvline_set(int, char **);
+void cmd_bkgrnd(int, char **);
+void cmd_bkgrndset(int, char **);
+void cmd_getbkgrnd(int, char **);
+void cmd_wbkgrnd(int, char **);
+void cmd_wbkgrndset(int, char **);
+void cmd_wgetbkgrnd(int, char **);
+
+
+
+
+#endif /* !_CURSES_COMMAND_H_ */
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/slave.c b/contrib/netbsd-tests/lib/libcurses/slave/slave.c
new file mode 100644
index 000000000000..b05a1daa062e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/slave.c
@@ -0,0 +1,177 @@
+/*	$NetBSD: slave.c,v 1.6 2011/09/15 11:46:19 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *
+ */
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <curses.h>
+#include "returns.h"
+#include "slave.h"
+
+int cmdpipe[2];
+int slvpipe[2];
+
+#if 0
+static const char *returns_enum_names[] = {
+	"unused", "numeric", "string", "byte", "ERR", "OK", "NULL", "not NULL",
+	"variable"
+};
+#endif
+
+/*
+ * Read the command pipe for the function to execute, gather the args
+ * and then process the command.
+ */
+static void
+process_commands(WINDOW *mainscr)
+{
+	int len, maxlen, argslen, i, ret, type;
+	char *cmdbuf, *tmpbuf, **args, **tmpargs;
+
+	len = maxlen = 30;
+	if ((cmdbuf = malloc(maxlen)) == NULL)
+		err(1, "slave cmdbuf malloc failed");
+
+	while(1) {
+		if (read(cmdpipe[READ_PIPE], &type, sizeof(int)) < 0)
+			err(1, "slave command type read failed");
+
+		if (type != ret_string)
+			errx(1, "Unexpected type for command, got %d", type);
+
+		if (read(cmdpipe[READ_PIPE], &len, sizeof(int)) < 0)
+			err(1, "slave command len read failed");
+
+		if ((len + 1) > maxlen) {
+			maxlen = len + 1;
+			if ((tmpbuf = realloc(cmdbuf, maxlen)) == NULL)
+				err(1, "slave cmdbuf realloc to %d "
+				    "bytes failed", maxlen);
+			cmdbuf = tmpbuf;
+		}
+
+		if (read(cmdpipe[READ_PIPE], cmdbuf, len) < 0)
+			err(1, "slave command read failed");
+		cmdbuf[len] = '\0';
+		argslen = 0;
+		args = NULL;
+
+		do {
+			if (read(cmdpipe[READ_PIPE], &type, sizeof(int)) < 0)
+				err(1, "slave arg type read failed");
+
+			if (read(cmdpipe[READ_PIPE], &len, sizeof(int)) < 0)
+				err(1, "slave arg len read failed");
+
+			if (len >= 0) {
+				tmpargs = realloc(args,
+				    (argslen + 1) * sizeof(char *));
+				if (tmpargs == NULL)
+					err(1, "slave realloc of args array "
+					    "failed");
+
+				args = tmpargs;
+				if (type != ret_null) {
+					args[argslen] = malloc(len + 1);
+
+					if (args[argslen] == NULL)
+						err(1, "slave alloc of %d bytes"
+						    " for args failed", len);
+				}
+
+				if (len == 0) {
+					if (type == ret_null)
+						args[argslen] = NULL;
+					else
+						args[argslen][0] = '\0';
+				} else {
+					read(cmdpipe[READ_PIPE], args[argslen],
+					     len);
+					if (type != ret_byte)
+						args[argslen][len] = '\0';
+
+					if (len == 6) {
+						if (strcmp(args[argslen],
+							   "STDSCR") == 0) {
+							ret = asprintf(&tmpbuf,
+								 "%p",
+								 stdscr);
+							if (ret < 0)
+								err(2,
+								    "asprintf of stdscr failed");
+							free(args[argslen]);
+							args[argslen] = tmpbuf;
+						}
+					}
+				}
+
+				argslen++;
+			}
+		}
+		while(len >= 0);
+
+		command_execute(cmdbuf, argslen, args);
+
+		if (args != NULL) {
+			for (i = 0; i < argslen; i++)
+				free(args[i]);
+
+			free(args);
+		}
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	WINDOW *mainscr;
+
+	if (argc != 5) {
+		fprintf(stderr, "Usage: %s <cmdin> <cmdout> <slvin> slvout>\n",
+			getprogname());
+		return 0;
+	}
+	sscanf(argv[1], "%d", &cmdpipe[0]);
+	sscanf(argv[2], "%d", &cmdpipe[1]);
+	sscanf(argv[3], "%d", &slvpipe[0]);
+	sscanf(argv[4], "%d", &slvpipe[1]);
+
+	mainscr = initscr();
+	if (mainscr == NULL)
+		err(1, "initscr failed");
+
+	process_commands(mainscr);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libcurses/slave/slave.h b/contrib/netbsd-tests/lib/libcurses/slave/slave.h
new file mode 100644
index 000000000000..98e9971348e6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/slave/slave.h
@@ -0,0 +1,50 @@
+/*	$NetBSD: slave.h,v 1.3 2011/09/15 11:46:19 blymn Exp $	*/
+
+/*-
+ * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
+ *
+ * All rights reserved.
+ *
+ * This code has been donated to The NetBSD Foundation by the Author.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 CURTEST_SLAVE_H
+#define CURTEST_SLAVE_H
+
+#include <curses.h>
+
+#define READ_PIPE  0
+#define WRITE_PIPE 1
+
+void command_execute(char *, int, char **);
+void report_count(int);
+void report_error(const char *);
+void report_int(int);
+void report_byte(chtype);
+void report_return(int);
+void report_nstr(chtype *);
+void report_status(const char *);
+void report_ptr(void *);
+int  check_arg_count(int, int);
+
+#endif
diff --git a/contrib/netbsd-tests/lib/libcurses/t_curses.sh b/contrib/netbsd-tests/lib/libcurses/t_curses.sh
new file mode 100755
index 000000000000..5ff9474f8802
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/t_curses.sh
@@ -0,0 +1,294 @@
+
+h_run()
+{
+	file="$(atf_get_srcdir)/tests/${1}"
+
+	export COLUMNS=80
+	export LINES=24
+	$(atf_get_srcdir)/director \
+	    -T $(atf_get_srcdir) \
+	    -t atf \
+	    -I $(atf_get_srcdir)/tests \
+	    -C $(atf_get_srcdir)/check_files \
+	    -s $(atf_get_srcdir)/slave $file || atf_fail "test ${file} failed"
+}
+
+atf_test_case startup
+startup_head()
+{
+	atf_set "descr" "Checks curses initialisation sequence"
+}
+startup_body()
+{
+	h_run start
+}
+
+atf_test_case addch
+addch_head()
+{
+	atf_set "descr" "Tests adding a chtype to stdscr"
+}
+addch_body()
+{
+	h_run addch
+}
+
+atf_test_case addchstr
+addchstr_head()
+{
+	atf_set "descr" "Tests adding a chtype string to stdscr"
+}
+addchstr_body()
+{
+	h_run addchstr
+}
+
+atf_test_case addchnstr
+addchnstr_head()
+{
+	atf_set "descr" "Tests adding bytes from a chtype string to stdscr"
+}
+addchnstr_body()
+{
+	h_run addchnstr
+}
+
+atf_test_case addstr
+addstr_head()
+{
+	atf_set "descr" "Tests adding bytes from a string to stdscr"
+}
+addstr_body()
+{
+	h_run addstr
+}
+
+atf_test_case addnstr
+addnstr_head()
+{
+	atf_set "descr" "Tests adding bytes from a string to stdscr"
+}
+addnstr_body()
+{
+	h_run addnstr
+}
+
+atf_test_case getch
+getch_head()
+{
+	atf_set "descr" "Checks reading a character input"
+}
+getch_body()
+{
+	h_run getch
+}
+
+atf_test_case timeout
+timeout_head()
+{
+	atf_set "descr" "Checks timeout when reading a character"
+}
+timeout_body()
+{
+	h_run timeout
+}
+
+atf_test_case window
+window_head()
+{
+	atf_set "descr" "Checks window creation"
+}
+window_body()
+{
+	h_run window
+}
+
+atf_test_case wborder
+wborder_head()
+{
+	atf_set "descr" "Checks drawing a border around a window"
+}
+wborder_body()
+{
+	h_run wborder
+}
+
+atf_test_case box
+box_head()
+{
+	atf_set "descr" "Checks drawing a box around a window"
+}
+box_body()
+{
+	h_run box
+}
+
+atf_test_case wprintw
+wprintw_head()
+{
+	atf_set "descr" "Checks printing to a window"
+}
+wprintw_body()
+{
+	h_run wprintw
+}
+
+atf_test_case wscrl
+wscrl_head()
+{
+	atf_set "descr" "Check window scrolling"
+}
+wscrl_body()
+{
+	h_run wscrl
+}
+
+atf_test_case mvwin
+mvwin_head()
+{
+	atf_set "descr" "Check moving a window"
+}
+mvwin_body()
+{
+	h_run mvwin
+}
+
+atf_test_case getstr
+getstr_head()
+{
+	atf_set "descr" "Check getting a string from input"
+}
+getstr_body()
+{
+	h_run getstr
+}
+
+atf_test_case termattrs
+termattrs_head()
+{
+	atf_set "descr" "Check the terminal attributes"
+}
+termattrs_body()
+{
+	h_run termattrs
+}
+
+atf_test_case assume_default_colors
+assume_default_colors_head()
+{
+	atf_set "descr" "Check setting the default color pair"
+}
+assume_default_colors_body()
+{
+	h_run assume_default_colors
+}
+
+atf_test_case attributes
+attributes_head()
+{
+	atf_set "descr" "Check setting, clearing and getting of attributes"
+}
+attributes_body()
+{
+	h_run attributes
+}
+
+atf_test_case beep
+beep_head()
+{
+	atf_set "descr" "Check sending a beep"
+}
+beep_body()
+{
+	h_run beep
+}
+
+atf_test_case background
+background_head()
+{
+	atf_set "descr" "Check setting background character and attributes for both stdscr and a window."
+}
+background_body()
+{
+	h_run background
+}
+
+atf_test_case can_change_color
+can_change_color_head()
+{
+	atf_set "descr" "Check if the terminal can change colours"
+}
+can_change_color_body()
+{
+	h_run can_change_color
+}
+
+atf_test_case cbreak
+cbreak_head()
+{
+	atf_set "descr" "Check cbreak mode works"
+}
+cbreak_body()
+{
+	h_run cbreak
+}
+
+atf_test_case clear
+clear_head()
+{
+	atf_set "descr" "Check clear and erase work"
+}
+clear_body()
+{
+	h_run clear
+}
+
+atf_test_case copywin
+copywin_head()
+{
+	atf_set "descr" "Check all the modes of copying a window work"
+}
+copywin_body()
+{
+	h_run copywin
+}
+
+atf_test_case curs_set
+curs_set_head()
+{
+	atf_set "descr" "Check setting the cursor visibility works"
+}
+curs_set_body()
+{
+	h_run curs_set
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case startup
+	atf_add_test_case addch
+	atf_add_test_case addchstr
+	atf_add_test_case addchnstr
+	atf_add_test_case addstr
+	atf_add_test_case addnstr
+	atf_add_test_case getch
+	atf_add_test_case timeout
+	atf_add_test_case window
+	atf_add_test_case wborder
+	atf_add_test_case box
+	atf_add_test_case wprintw
+	atf_add_test_case wscrl
+	atf_add_test_case mvwin
+	atf_add_test_case getstr
+	atf_add_test_case termattrs
+	atf_add_test_case can_change_color
+	atf_add_test_case assume_default_colors
+	atf_add_test_case attributes
+#	atf_add_test_case beep  # comment out for now - return is wrong
+	atf_add_test_case background
+	atf_add_test_case cbreak
+	atf_add_test_case clear
+	atf_add_test_case copywin
+	atf_add_test_case curs_set
+}
+
diff --git a/contrib/netbsd-tests/lib/libcurses/testframe.txt b/contrib/netbsd-tests/lib/libcurses/testframe.txt
new file mode 100644
index 000000000000..19884d765436
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/testframe.txt
@@ -0,0 +1,241 @@
+
+CURSES TESTFRAME
+----------------
+
+1. Introduction
+
+The curses library is a complex piece of software and, often, changes
+made to the library may introduce subtle bugs that are hidden by other
+actions so a visual check of the curses output may look correct in
+some circumstances and the bug only show itself after a certain
+sequence of actions.  To assist with validating that changes made to
+the curses library have no undesired effects an automated test is
+needed to detect and highlight any changes in the curses application
+output stream.  The programmer can then analyse the output changes and
+either correct a bug or update the automated test to accept the new
+output as valid.
+
+2. Architecture
+
+The curses testframe consists of two separate programs connected by a
+number of pipes and a pseudo-tty (pty).  The programs are called the
+director and the slave.  The director reads a configuration file of
+tests to perform, passes these commands to the slave over a pipe and
+reads the pty for any output from the slave.  Data from the slave is
+compared against expected output held in a file and any differences
+are highlighted to the tester.  The slave is a curses application that
+is forked by the director on start up.  It reads commands from the
+director over a pipe, these commands are calls to curses routines
+along with the parameters required for the call.  The slave takes the
+parameters and uses them as arguments for the requested curses routine
+call.  The return value from the curses routine is passed back to the
+director over another pipe, if the curses routine updates any passed
+by reference arguments then these are also passed back to the director
+for analysis.
+
+3. Director
+
+The director has the following optional command line options:
+
+    -v	     	     enables verbose output to assist debugging
+    -s slave_path    the director will execute slave_path as the slave
+       		     process.  The default is ./slave
+    -t term	     Sets the TERM environment variable to term when
+       		     executing the slave.  The default is atf
+
+There is one mandatory command line parameter, that is a file name
+that contains the test command file.  The test command file holds the
+calls required to exercise a particular curses routine and validate
+both the return codes from the routines and the output from the
+slave.  The test language has a small number of commands, they are:
+
+assign:
+      Assign a value to a variable.  The syntax is:
+
+      	     assign var_name value
+
+      Where var_name is the name of the variable.  Variable names are
+      an arbitrary sequence of alphanumeric characters, the variable
+      name must start with an alphabetic character. Value is the value
+      to be assigned.  The value can either be a numeric or a string
+      type.  Variables are created on first use and will be
+      overwritten on each subsequent use.
+
+call, call2, call3, call4:
+      All these are used to call curses routines, the only difference
+      between then is the number of expected return values.  Call
+      expects one return value, call2 expects 2, call3 expects 3 and
+      call4 expects four.  Any parameters that are passed by reference
+      and updated by the call are treated like returns.  So, for
+      example, calling the function getyx() which has three
+      parameters, the window, a pointer to storage for y and a pointer
+      to storage for x would be called like this:
+
+      	 	 call3 OK 4 5 getyx $win1
+
+      Which calls getyx, the first (and possibly only) return is the
+      return status of the function call, in this case we expect "OK"
+      indicating that the call succeeded.  The next two returns are
+      the values of y and x respectively, the parameter $win1 is a
+      variable that was assigned by a previous call.  Any return can
+      be assigned to a variable by including the variable name in a
+      call return list.  Variables are referenced in a call parameter
+      list by prefixing the name with a $ character.  All returns are
+      validated against the expected values and an error raised if
+      there is a mismatch.  The only exception to this is when the
+      return is assigned to a variable.  Valid values for the returns
+      list are:
+
+      	  	  variable - assign the return to the given variable
+		             name.
+      	  	  numeric  - the value of the return must match the
+      	  	  	     number given.
+		  string   - an arbitrary sequence of characters
+      	  	  	     enclosed in double quotes.
+		  ERR      - expect an ERR return
+		  OK	   - expect an OK return
+		  NULL	   - expect a NULL pointer return
+		  NON_NULL - expect a pointer that is not NULL valued
+
+      There is one special parameter that can be passed to a call,
+      that is the label STDSCR.  This parameter will be substituted by
+      the value of stdscr when the function call is made.
+
+check:
+      Validate the value of a variable.  This allows a variable to be
+      checked for an expected return after it has been assigned in a
+      previous call.  The syntax is:
+
+      	       check var_name expected_result
+
+      Where var_name is a variable previously assigned and
+      expected_result is one of the valid return values listed in the
+      above call section.
+
+compare:
+      Compares the output stream from the slave against the contents
+      of a file that contains the expected
+      output.  The syntax is:
+
+      	       compare filename
+
+      Where filename is the name of the file containing the expected
+      output.  The file can either be an absolute path or relative
+      path.  In the latter case the value of the environment variable
+      CHECK_PATH will be prepended to the argument to provide the path
+      to the file.  The contents of this file will be compared byte by
+      byte against the output from the slave, any differences in the
+      output will be flagged.  If the director is not in verbose mode
+      then the first mismatch in the byte stream will cause the
+      director to exit.
+
+comparend:
+      Performs the same function as the above compare except that
+      excess output from the slave is not discarded if there is more
+      data from the slave than there is in the check file.  This
+      allows chaining of multiple check files.
+
+delay:
+      Defines an inter-character delay to be inserted between
+      characters being fed into the input of the slave.  The syntax
+      is:
+
+		delay time
+
+      Where time is the amount of time to delay in milliseconds.
+
+include:
+      Include the contents of another test file, the parser will
+      suspend reading the current file and read commands from the
+      include file until the end of file of the include file is
+      reached at which point it will continue reading the original
+      file.  Include files may be nested.  The syntax is:
+
+      	     	include filename
+
+      Where filename is the name of the file to include.  If the
+      filename is not an absolute path then the contents of the
+      environment variable INCLUDE_PATH are prepended to the file
+      name.
+
+input:
+      Defines a string of characters that will be fed to the slave
+      when a call requires input.  Any unused input will be discarded
+      after the call that required the input is called.  The syntax
+      is:
+
+		input "string to pass"
+
+noinput:
+      Normally the director will error if an input function is called
+      without input being previously defined, this is to prevent input
+      functions causing the test to hang waiting for input that never
+      comes.  If it is known that there is pending input for the slave
+      then the noinput keyword can be used to flag that the input
+      function has data available for it to read.  The noinput command
+      only applies to the next function call then behaviour reverts to
+      the default.
+
+The testframe can define different types of strings, the type of string
+depends on the type of enclosing quotes.  A null terminated string is
+indicated by enclosing double (") quotes.  A byte string, one that is
+not null terminated and may contain the nul character within it is
+indicated by enclosing single (') quotes.  A string of chtype
+character which are a combined attribute and character value is
+indicated by enclosing backticks (`), for this type of string pairs of
+bytes between the backticks are converted to an array of chtype, the
+first byte is the attribute and the second is the character.
+
+All strings defined will have a simple set of character substitutions
+performed on them when they are parsed.  This allows the tester to
+embed some control characters into the string.  Valid substitutions
+are:
+
+	\e	escape
+	\n	new line
+	\r	carriage return
+	\t	tab
+	\\	\ character
+	\nnn	Where nnn is three octal digits, the character
+		represented by the octal number will be inserted into
+		the string.
+
+Any other invalid conversions will have the \ stripped and the
+subsequent characters inserted into the string.
+
+Integers may be specified by either a plain numeric (e.g. 12345) or by
+hexadecimal notation by prefixing the number with 0x (e.g. 0x3039).
+Internally, no distinction is made between the two formats and they
+can be freely intermixed.
+
+Integers and variables containing integers can have operations
+performed on them.  Currently only bitwise ORing numbers together is
+supported.  This can be done by separating a list of integers and
+variables with the pipe (|) symbol and enclosing the entire list in
+round brackets "()" like this:
+
+      ( $var1 | 0x0100 | $var2 | 512 )
+
+Variables and integer constants may be freely intermixed.  The result
+of the operation can either be used as an argument for a call or can
+be used as an expected result for a call.
+
+In addition to all the curses calls being supported by the slave,
+there is one more special call called "drain".  This call repeatedly
+called getch() until there are no more characters in stdin.  The call
+assumes that the curses input is either in no delay or timed input
+mode otherwise the test will time out and fail.  This call can be used
+to clear any pending input when testing testing a timed read to
+prevent the input being used in a later test.
+
+4. Slave
+
+The user has no direct interaction with the slave process.  The slave
+is forked off by the director communicates to the director over a set
+of pipes and a pseudo-tty connected to its standard i/o file
+descriptors.  The slave executes the passed curses calls and passes
+back return values to the director.  The slave automatically calls
+initscr() on start up.
+
+
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/addch b/contrib/netbsd-tests/lib/libcurses/tests/addch
new file mode 100644
index 000000000000..a67e385a18c2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/addch
@@ -0,0 +1,4 @@
+include start
+call OK addch `\001t`
+call OK refresh
+compare addch.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/addchnstr b/contrib/netbsd-tests/lib/libcurses/tests/addchnstr
new file mode 100644
index 000000000000..661bf7480b63
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/addchnstr
@@ -0,0 +1,5 @@
+include start
+# note that there are more characters in the array, check we only get 5 out
+call OK addchnstr `\004a\004b\004c\004d\004e\004f\004g` 5
+call OK refresh
+compare addchstr.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/addchstr b/contrib/netbsd-tests/lib/libcurses/tests/addchstr
new file mode 100644
index 000000000000..4ccf7b828deb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/addchstr
@@ -0,0 +1,4 @@
+include start
+call OK addchstr `\004a\004b\004c\004d\004e`
+call OK refresh
+compare addchstr.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/addnstr b/contrib/netbsd-tests/lib/libcurses/tests/addnstr
new file mode 100644
index 000000000000..9c40801b3e7c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/addnstr
@@ -0,0 +1,5 @@
+include start
+call OK addnstr "abcdefg" 5
+call OK refresh
+# should be the same as addstr
+compare addstr.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/addstr b/contrib/netbsd-tests/lib/libcurses/tests/addstr
new file mode 100644
index 000000000000..8c1d24f5f6aa
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/addstr
@@ -0,0 +1,4 @@
+include start
+call OK addstr "abcde"
+call OK refresh
+compare addstr.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/assume_default_colors b/contrib/netbsd-tests/lib/libcurses/tests/assume_default_colors
new file mode 100644
index 000000000000..b6ccb099ec47
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/assume_default_colors
@@ -0,0 +1,19 @@
+include start
+call OK start_color
+call OK assume_default_colors -1 -1
+call OK refresh
+compare color_start.chk
+# This should be the same as the default
+compare color_default.chk
+# default foreground, blue background
+call OK assume_default_colors -1 $COLOR_BLUE
+call OK refresh
+compare color_blue_back.chk
+# red foreground, default background
+call OK assume_default_colors $COLOR_RED -1
+call OK refresh
+compare color_red_fore.chk
+# back to default
+call OK assume_default_colors -1 -1
+call OK refresh
+compare color_default.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/attributes b/contrib/netbsd-tests/lib/libcurses/tests/attributes
new file mode 100644
index 000000000000..b75d7d1d4aa6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/attributes
@@ -0,0 +1,23 @@
+include start
+# no attributes, no color
+call3 OK 0 0 attr_get
+# set reverse and bold
+call OK attr_set ($BOLD | $REVERSE) 2
+# returned attributes includes color information
+call3 OK ($ACS_IS_WACS | $BOLD | $REVERSE) 2 attr_get
+# turn off reverse
+call OK attr_off $REVERSE
+call3 OK ($ACS_IS_WACS | $BOLD) 2 attr_get
+# turn on standout
+call OK attr_on $STANDOUT
+call3 OK ($ACS_IS_WACS | $BOLD | $STANDOUT) 2 attr_get
+# turn on blink
+call OK attron $BLINK
+call3 OK ($ACS_IS_WACS | $BOLD | $STANDOUT | $BLINK) 2 attr_get
+# turn off bold
+call OK attroff $BOLD
+call3 OK ($ACS_IS_WACS | $STANDOUT | $BLINK) 2 attr_get
+# print out something to check our attributes are there, standout and blink
+call OK printw "%s" "hello"
+call OK refresh
+compare attributes.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/background b/contrib/netbsd-tests/lib/libcurses/tests/background
new file mode 100644
index 000000000000..2c4a575fa529
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/background
@@ -0,0 +1,23 @@
+include start
+call OK bkgd `\002A`
+call OK refresh
+# looks like a bug - bottom right char not filled
+compare background1.chk
+call OK printw "%s" "a test string"
+call OK refresh
+compare background2.chk
+call win1 newwin 6 6 2 5
+check win1 NON_NULL
+call OK wprintw $win1 "%s" "window 1"
+# call OK refresh
+call OK wrefresh $win1
+compare background3.chk
+call OK wbkgd $win1 `\004B`
+call OK refresh
+call OK wrefresh $win1
+compare background4.chk
+call OK wprintw $win1 "%s" "hello world"
+call OK refresh
+call OK wrefresh $win1
+compare background5.chk
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/beep b/contrib/netbsd-tests/lib/libcurses/tests/beep
new file mode 100644
index 000000000000..832e87fa3b6e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/beep
@@ -0,0 +1,5 @@
+include start
+# SUSv2 says this should return OK but we return 1
+call 1 beep
+call OK refresh
+compare bell.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/box b/contrib/netbsd-tests/lib/libcurses/tests/box
new file mode 100644
index 000000000000..bfd2e128415a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/box
@@ -0,0 +1,8 @@
+include window
+call OK box $win1 `\000` `\000`
+call OK wrefresh $win1
+# default settings of box will output same as wborder 
+compare wborder.chk
+call OK box $win1 `\001\000` `\004\000`
+call OK wrefresh $win1
+compare box_standout.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/can_change_color b/contrib/netbsd-tests/lib/libcurses/tests/can_change_color
new file mode 100644
index 000000000000..aed622a3642b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/can_change_color
@@ -0,0 +1,3 @@
+include start
+# our test terminal can change colors so expect true.
+call 1 can_change_color
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/cbreak b/contrib/netbsd-tests/lib/libcurses/tests/cbreak
new file mode 100644
index 000000000000..b8bf60e0c4b5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/cbreak
@@ -0,0 +1,18 @@
+include start
+# setting noecho stops getch setting cbreak itself so we should need
+# a newline before getch returns, check this works first.
+call OK noecho
+input "abcd\n"
+call 0x61 getch
+noinput
+call 0x62 getch
+noinput
+call 0x63 getch
+noinput
+call 0x64 getch
+noinput
+call 0x0a getch
+# set cbreak, getch should return without needing a newline
+input "ef"
+call OK cbreak
+call 0x65 getch
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/chgat b/contrib/netbsd-tests/lib/libcurses/tests/chgat
new file mode 100644
index 000000000000..863ab11d2019
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/chgat
@@ -0,0 +1,15 @@
+include start_color
+call OK init_pair 3 $COLOR_YELLOW $COLOR_CYAN
+call OK addch `\000d`
+call OK chgat 5 $REVERSE 3 0
+call OK refresh
+compare chgat1.chk
+call OK addch `\000e`
+call OK refresh
+compare chgat2.chk
+call OK move 0 0
+# The following should apply the attribute and colour to the whole line
+call OK chgat -1 $UNDERSCORE 3 0
+call OK refresh
+compare chgat3.chk
+ 
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/clear b/contrib/netbsd-tests/lib/libcurses/tests/clear
new file mode 100644
index 000000000000..5aad93487bf0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/clear
@@ -0,0 +1,57 @@
+include addstr
+call OK clear
+call OK refresh
+compare clear1.chk
+call OK move 5 5
+call OK addstr "abcde"
+call OK move 20 5
+call OK addstr "fghij"
+call OK move 10 5
+call OK refresh
+compare clear2.chk
+call OK clrtobot
+call OK refresh
+compare clear3.chk
+call OK erase
+call OK refresh
+compare clear4.chk
+include fill_screen
+compare fill.chk
+call OK erase
+call OK refresh
+compare clear5.chk
+# create a window to play with, defines win1 var
+include window_create
+call OK waddstr $win1 "abc"
+call OK mvwaddstr $win1 4 1 "efg"
+call OK wmove $win1 1 0
+call OK wrefresh $win1
+compare clear6.chk
+call OK wclrtobot $win1
+call OK wrefresh $win1
+compare clear7.chk
+include fill_screen
+comparend home.chk
+compare fill.chk
+call OK wrefresh $win1
+call OK wclear $win1
+call OK wrefresh $win1
+compare clear8.chk
+call OK clear
+call OK refresh
+compare clear1.chk
+include fill_screen
+compare fill.chk
+call OK werase $win1
+call OK wrefresh $win1
+compare clear9.chk
+call OK waddstr $win1 "abc"
+call OK mvwaddstr $win1 4 1 "efg"
+call OK wmove $win1 1 0
+call OK wrefresh $win1
+compare clear6.chk
+call OK wmove $win1 4 0
+call OK wclrtoeol $win1
+call OK wrefresh $win1
+compare clear10.chk
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/color_content b/contrib/netbsd-tests/lib/libcurses/tests/color_content
new file mode 100644
index 000000000000..0db66e5c192f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/color_content
@@ -0,0 +1,12 @@
+include start
+call OK start_color
+call4 OK 0 0 0 color_content $COLOR_BLACK
+call4 OK 1000 0 0 color_content $COLOR_RED
+call4 OK 0 1000 0 color_content $COLOR_GREEN
+call4 OK 1000 1000 0 color_content $COLOR_YELLOW
+call4 OK 0 0 1000 color_content $COLOR_BLUE
+call4 OK 1000 0 1000 color_content $COLOR_MAGENTA
+call4 OK 0 1000 1000 color_content $COLOR_CYAN
+call4 OK 1000 1000 1000 color_content $COLOR_WHITE
+
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/color_set b/contrib/netbsd-tests/lib/libcurses/tests/color_set
new file mode 100644
index 000000000000..07cd1c597bc3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/color_set
@@ -0,0 +1,11 @@
+include start
+call OK start_color
+call OK refresh
+comparend color_start.chk
+compare color_blank_draw.chk
+call OK init_pair 4 $COLOR_RED $COLOR_GREEN
+call OK color_set 4 0
+call OK printw "%s" "testing"
+call OK refresh
+compare color_set.chk
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/copywin b/contrib/netbsd-tests/lib/libcurses/tests/copywin
new file mode 100644
index 000000000000..2dbec400b5af
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/copywin
@@ -0,0 +1,81 @@
+include start
+include window_create
+call win2 newwin 7 9 10 14
+check win2 NON_NULL
+call OK wrefresh $win2
+compare copywin1.chk
+call OK mvwprintw $win1 0 0 "%s" "testin"
+call OK mvwprintw $win1 1 0 "%s" "gtesti"
+call OK mvwprintw $win1 2 0 "%s" "ngtest"
+call OK mvwprintw $win1 3 0 "%s" "ingtes"
+call OK mvwprintw $win1 4 0 "%s" "tingte"
+call OK mvwprintw $win1 5 0 "%s" "stingt"
+call OK wrefresh $win1
+compare copywin2.chk
+call OK copywin $win1 $win2 0 0 1 1 7 7 0
+call OK wrefresh $win2
+compare copywin3.chk
+call OK wclear $win1
+call OK wclear $win2
+call OK wrefresh $win1
+call OK wrefresh $win2
+compare copywin4.chk
+call OK mvwprintw $win2 0 0 "%s" "testingte"
+call OK mvwprintw $win2 1 0 "%s" "stingtest"
+call OK mvwprintw $win2 2 0 "%s" "ingtestin"
+call OK mvwprintw $win2 3 0 "%s" "gtestingt"
+call OK mvwprintw $win2 4 0 "%s" "estingtes"
+call OK mvwprintw $win2 5 0 "%s" "tingtesti"
+call OK wrefresh $win2
+compare copywin5.chk
+call OK copywin $win2 $win1 0 0 0 0 7 9 0
+call OK wrefresh $win1
+compare copywin6.chk
+call OK wclear $win1
+call OK wclear $win2
+call OK wrefresh $win1
+call OK wrefresh $win2
+compare copywin7.chk
+call OK mvwprintw $win1 0 0 "%s" "t s i "
+call OK mvwprintw $win1 1 0 "%s" "g e t "
+call OK mvwprintw $win1 2 0 "%s" "n t s "
+call OK mvwprintw $win1 3 0 "%s" " n t s"
+call OK mvwprintw $win1 4 0 "%s" "t n t "
+call OK mvwprintw $win1 5 0 "%s" " t n t"
+call OK wrefresh $win1
+compare copywin8.chk
+call OK mvwprintw $win2 0 0 "%s" " e t n"
+call OK mvwprintw $win2 1 0 "%s" " t s i"
+call OK mvwprintw $win2 2 0 "%s" " g e t"
+call OK mvwprintw $win2 3 0 "%s" "i g e "
+call OK mvwprintw $win2 4 0 "%s" " i g e"
+call OK mvwprintw $win2 5 0 "%s" "s i g "
+call OK wrefresh $win2
+compare copywin9.chk
+call OK copywin $win1 $win2 0 0 0 0 6 6 0
+call OK wrefresh $win2
+compare copywin10.chk
+call OK wclear $win1
+call OK wclear $win2
+call OK wrefresh $win1
+call OK wrefresh $win2
+compare copywin11.chk
+call OK mvwprintw $win1 0 0 "%s" "t s i "
+call OK mvwprintw $win1 1 0 "%s" "g e t "
+call OK mvwprintw $win1 2 0 "%s" "n t s "
+call OK mvwprintw $win1 3 0 "%s" " n t s"
+call OK mvwprintw $win1 4 0 "%s" "t n t "
+call OK mvwprintw $win1 5 0 "%s" " t n t"
+call OK wrefresh $win1
+compare copywin12.chk
+call OK mvwprintw $win2 0 0 "%s" " e t n"
+call OK mvwprintw $win2 1 0 "%s" " t s i"
+call OK mvwprintw $win2 2 0 "%s" " g e t"
+call OK mvwprintw $win2 3 0 "%s" "i g e "
+call OK mvwprintw $win2 4 0 "%s" " i g e"
+call OK mvwprintw $win2 5 0 "%s" "s i g "
+call OK wrefresh $win2
+compare copywin13.chk
+call OK copywin $win1 $win2 0 0 0 0 6 6 1
+call OK wrefresh $win2
+compare copywin14.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/curs_set b/contrib/netbsd-tests/lib/libcurses/tests/curs_set
new file mode 100644
index 000000000000..5d7cb548dc09
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/curs_set
@@ -0,0 +1,7 @@
+include start
+call 2 curs_set 0
+compare curs_set1.chk
+call 0 curs_set 1
+compare curs_set2.chk
+call 1 curs_set 2
+compare curs_set3.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/fill_screen b/contrib/netbsd-tests/lib/libcurses/tests/fill_screen
new file mode 100644
index 000000000000..b9e2942b31ca
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/fill_screen
@@ -0,0 +1,29 @@
+#
+# Fill the screen with characters.  We don't do a compare in here because
+# this is meant to be included from other tests which could result in random
+# cursor motions before the fill is done.
+#
+call OK mvaddstr 0 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 1 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 2 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 3 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 4 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 5 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 6 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 7 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 8 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 9 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 10 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 11 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 12 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 13 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 14 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 15 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 16 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 17 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 18 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 19 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 20 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 21 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK mvaddstr 22 0 "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+call OK refresh
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/getch b/contrib/netbsd-tests/lib/libcurses/tests/getch
new file mode 100644
index 000000000000..9f437f593c7c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/getch
@@ -0,0 +1,3 @@
+include start
+input "i"
+call 105 getch
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/getstr b/contrib/netbsd-tests/lib/libcurses/tests/getstr
new file mode 100644
index 000000000000..320325f4f64c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/getstr
@@ -0,0 +1,6 @@
+include window
+input "input\n"
+call2 OK "input" wgetstr $win1
+compare wgetstr.chk
+call OK wrefresh $win1
+compare wgetstr_refresh.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/mvwin b/contrib/netbsd-tests/lib/libcurses/tests/mvwin
new file mode 100644
index 000000000000..86d9bd648119
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/mvwin
@@ -0,0 +1,12 @@
+include window
+call OK wmove $win1 1 1
+call OK wprintw $win1 "%s" "xxxx"
+call OK wrefresh $win1
+compare /dev/zero
+call OK refresh
+compare /dev/zero
+call OK mvwin $win1 4 7
+call OK wrefresh $win1
+compare /dev/zero
+call OK refresh
+compare /dev/zero
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/start b/contrib/netbsd-tests/lib/libcurses/tests/start
new file mode 100644
index 000000000000..963f2f488d0e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/start
@@ -0,0 +1,3 @@
+include std_defines
+call OK refresh
+compare curses_start.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/start_color b/contrib/netbsd-tests/lib/libcurses/tests/start_color
new file mode 100644
index 000000000000..6d3f1336d3d1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/start_color
@@ -0,0 +1,5 @@
+include start
+call OK start_color
+call OK refresh
+comparend color_start.chk
+compare color_blank_draw.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/std_defines b/contrib/netbsd-tests/lib/libcurses/tests/std_defines
new file mode 100644
index 000000000000..9c986df33583
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/std_defines
@@ -0,0 +1,138 @@
+#
+# Define some standard symbols for curses so tests can reference things
+# symbolically instead of using magic numbers.
+#
+#
+# boolean
+#
+assign TRUE	0x01
+assign FALSE	0x00
+#
+# colours
+#
+assign COLOR_BLACK     0x00
+assign COLOR_RED       0x01
+assign COLOR_GREEN     0x02
+assign COLOR_YELLOW    0x03
+assign COLOR_BLUE      0x04
+assign COLOR_MAGENTA   0x05
+assign COLOR_CYAN      0x06
+assign COLOR_WHITE     0x07
+#
+# Attributes
+#
+assign NORMAL        0x00000000
+assign STANDOUT      0x00000100
+assign UNDERSCORE    0x00000200
+assign REVERSE       0x00000400
+assign BLINK         0x00000800
+assign DIM           0x00001000
+assign BOLD          0x00002000
+assign BLANK         0x00004000
+assign PROTECT       0x00008000
+assign ALTCHARSET    0x00010000
+assign ACS_IS_WACS   0x00040000
+#
+# Keys
+#
+assign    KEY_BREAK      0x101
+assign    KEY_DOWN       0x102
+assign    KEY_UP         0x103
+assign    KEY_LEFT       0x104
+assign    KEY_RIGHT      0x105
+assign    KEY_HOME       0x106
+assign    KEY_BACKSPACE  0x107
+assign    KEY_F0         0x108
+assign    KEY_F1         0x109
+assign    KEY_F2         0x10a
+assign    KEY_F3         0x10b
+assign    KEY_F4         0x10c
+assign    KEY_F5         0x10d
+assign    KEY_F6         0x10e
+assign    KEY_F7         0x10f
+assign    KEY_F8         0x110
+assign    KEY_F9         0x111
+assign    KEY_DL         0x148
+assign    KEY_IL         0x149
+assign    KEY_DC         0x14A
+assign    KEY_IC         0x14B
+assign    KEY_EIC        0x14C
+assign    KEY_CLEAR      0x14D
+assign    KEY_EOS        0x14E
+assign    KEY_EOL        0x14F
+assign    KEY_SF         0x150
+assign    KEY_SR         0x151
+assign    KEY_NPAGE      0x152
+assign    KEY_PPAGE      0x153
+assign    KEY_STAB       0x154
+assign    KEY_CTAB       0x155
+assign    KEY_CATAB      0x156
+assign    KEY_ENTER      0x157
+assign    KEY_SRESET     0x158
+assign    KEY_RESET      0x159
+assign    KEY_PRINT      0x15A
+assign    KEY_LL         0x15B
+assign    KEY_A1         0x15C
+assign    KEY_A3         0x15D
+assign    KEY_B2         0x15E
+assign    KEY_C1         0x15F
+assign    KEY_C3         0x160
+assign    KEY_BTAB       0x161
+assign    KEY_BEG        0x162
+assign    KEY_CANCEL     0x163
+assign    KEY_CLOSE      0x164
+assign    KEY_COMMAND    0x165
+assign    KEY_COPY       0x166
+assign    KEY_CREATE     0x167
+assign    KEY_END        0x168
+assign    KEY_EXIT       0x169
+assign    KEY_FIND       0x16A
+assign    KEY_HELP       0x16B
+assign    KEY_MARK       0x16C
+assign    KEY_MESSAGE    0x16D
+assign    KEY_MOVE       0x16E
+assign    KEY_NEXT       0x16F
+assign    KEY_OPEN       0x170
+assign    KEY_OPTIONS    0x171
+assign    KEY_PREVIOUS   0x172
+assign    KEY_REDO       0x173
+assign    KEY_REFERENCE  0x174
+assign    KEY_REFRESH    0x175
+assign    KEY_REPLACE    0x176
+assign    KEY_RESTART    0x177
+assign    KEY_RESUME     0x178
+assign    KEY_SAVE       0x179
+assign    KEY_SBEG       0x17A
+assign    KEY_SCANCEL    0x17B
+assign    KEY_SCOMMAND   0x17C
+assign    KEY_SCOPY      0x17D
+assign    KEY_SCREATE    0x17E
+assign    KEY_SDC        0x17F
+assign    KEY_SDL        0x180
+assign    KEY_SELECT     0x181
+assign    KEY_SEND       0x182
+assign    KEY_SEOL       0x183
+assign    KEY_SEXIT      0x184
+assign    KEY_SFIND      0x185
+assign    KEY_SHELP      0x186
+assign    KEY_SHOME      0x187
+assign    KEY_SIC        0x188
+assign    KEY_SLEFT      0x189
+assign    KEY_SMESSAGE   0x18A
+assign    KEY_SMOVE      0x18B
+assign    KEY_SNEXT      0x18C
+assign    KEY_SOPTIONS   0x18D
+assign    KEY_SPREVIOUS  0x18E
+assign    KEY_SPRINT     0x18F
+assign    KEY_SREDO      0x190
+assign    KEY_SREPLACE   0x191
+assign    KEY_SRIGHT     0x192
+assign    KEY_SRSUME     0x193
+assign    KEY_SSAVE      0x194
+assign    KEY_SSUSPEND   0x195
+assign    KEY_SUNDO      0x196
+assign    KEY_SUSPEND    0x197
+assign    KEY_UNDO       0x198
+assign    KEY_MOUSE      0x199
+assign    KEY_RESIZE     0x200
+
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/termattrs b/contrib/netbsd-tests/lib/libcurses/tests/termattrs
new file mode 100644
index 000000000000..102530115299
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/termattrs
@@ -0,0 +1,3 @@
+include start
+# the atf terminal can do all attributes except PROTECT
+call 0x17f00 termattrs
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/timeout b/contrib/netbsd-tests/lib/libcurses/tests/timeout
new file mode 100644
index 000000000000..1adf057321da
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/timeout
@@ -0,0 +1,21 @@
+#
+# Validate the timeout works.
+#
+include start
+delay 2000
+input "a"
+call 97 getch
+call OK timeout 100
+input "b"
+# since delay is in effect and we set timeout the following getch should
+# return ERR not the character b.
+call -1 getch
+# drain input....
+call OK drain
+call OK timeout -1
+call OK keypad STDSCR 1
+delay 0
+input "\eOA"
+call $KEY_UP getch
+call OK refresh
+compare timeout.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/wborder b/contrib/netbsd-tests/lib/libcurses/tests/wborder
new file mode 100644
index 000000000000..7a8e78f7e96d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/wborder
@@ -0,0 +1,6 @@
+include window
+call OK wborder $win1 0 0 0 0 0 0 0 0
+call OK wrefresh $win1
+compare wborder.chk
+call OK refresh
+compare wborder_refresh.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/window b/contrib/netbsd-tests/lib/libcurses/tests/window
new file mode 100644
index 000000000000..52b2d0a4cf89
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/window
@@ -0,0 +1,2 @@
+include start
+include window_create
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/window_create b/contrib/netbsd-tests/lib/libcurses/tests/window_create
new file mode 100644
index 000000000000..8c9613417e5a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/window_create
@@ -0,0 +1,4 @@
+call win1 newwin 6 6 2 5
+check win1 NON_NULL
+call OK wrefresh $win1
+compare window.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/wprintw b/contrib/netbsd-tests/lib/libcurses/tests/wprintw
new file mode 100644
index 000000000000..a30fcc0abc86
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/wprintw
@@ -0,0 +1,6 @@
+include start
+call win1 newwin 2 5 2 5
+check win1 NON_NULL
+call OK wprintw $win1 "%s" "hello"
+call OK wrefresh $win1
+compare wprintw_refresh.chk
diff --git a/contrib/netbsd-tests/lib/libcurses/tests/wscrl b/contrib/netbsd-tests/lib/libcurses/tests/wscrl
new file mode 100644
index 000000000000..51be53183e47
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libcurses/tests/wscrl
@@ -0,0 +1,11 @@
+include window
+call OK wmove $win1 1 1
+call OK wprintw $win1 "%s" "xxxx"
+call OK wrefresh $win1
+call OK refresh
+compare wscrl1.chk
+call OK scrollok $win1 1
+call OK wscrl $win1 -2
+call OK wrefresh $win1
+call OK refresh
+compare wscrl2.chk
diff --git a/contrib/netbsd-tests/lib/libdes/t_des.c b/contrib/netbsd-tests/lib/libdes/t_des.c
new file mode 100644
index 000000000000..abf2e54617ac
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libdes/t_des.c
@@ -0,0 +1,989 @@
+/* $NetBSD: t_des.c,v 1.1 2010/08/25 16:46:36 jmmv Exp $ */
+
+/*
+ * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights
+ * reserved.
+ * 
+ * This package is an SSL implementation written by Eric Young
+ * (eay@cryptsoft.com). The implementation was written so as to conform with
+ * Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as the
+ * following conditions are aheared to.  The following conditions apply to
+ * all code found in this distribution, be it the RC4, RSA, lhash, DES, etc.,
+ * code; not just the SSL code.  The SSL documentation included with this
+ * distribution is covered by the same copyright terms except that the holder
+ * is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in the code
+ * are not to be removed. If this package is used in a product, Eric Young
+ * should be given attribution as the author of the parts of the library
+ * used. This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 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. 3. All advertising materials
+ * mentioning features or use of this software must display the following
+ * acknowledgement: "This product includes cryptographic software written by
+ * Eric Young (eay@cryptsoft.com)" The word 'cryptographic' can be left out
+ * if the rouines from the library being used are not cryptographic related
+ * :-). 4. If you include any Windows specific code (or a derivative thereof)
+ * from the apps directory (application code) you must include an
+ * acknowledgement: "This product includes software written by Tim Hudson
+ * (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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 licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply
+ * be copied and put under another distribution licence [including the GNU
+ * Public Licence.]
+ */
+
+#include <atf-c.h>
+#include <des.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define crypt(c,s) (des_crypt((c),(s)))
+
+/* tisk tisk - the test keys don't all have odd parity :-( */
+/* test data */
+#define NUM_TESTS 34
+static unsigned char key_data[NUM_TESTS][8] = {
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+	{0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+	{0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
+	{0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
+	{0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
+	{0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
+	{0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
+	{0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
+	{0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
+	{0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
+	{0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
+	{0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
+	{0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
+	{0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
+	{0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
+	{0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
+	{0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
+	{0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
+	{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
+	{0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
+	{0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
+	{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
+	{0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
+	{0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10}
+};
+
+static unsigned char plain_data[NUM_TESTS][8] = {
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+	{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+	{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+	{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
+	{0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
+	{0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
+	{0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
+	{0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
+	{0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
+	{0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
+	{0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
+	{0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
+	{0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
+	{0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
+	{0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
+	{0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
+	{0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
+	{0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
+	{0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
+	{0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
+	{0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
+	{0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+	{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+	{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
+};
+
+static unsigned char cipher_data[NUM_TESTS][8] = {
+	{0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7},
+	{0x73, 0x59, 0xB2, 0x16, 0x3E, 0x4E, 0xDC, 0x58},
+	{0x95, 0x8E, 0x6E, 0x62, 0x7A, 0x05, 0x55, 0x7B},
+	{0xF4, 0x03, 0x79, 0xAB, 0x9E, 0x0E, 0xC5, 0x33},
+	{0x17, 0x66, 0x8D, 0xFC, 0x72, 0x92, 0x53, 0x2D},
+	{0x8A, 0x5A, 0xE1, 0xF8, 0x1A, 0xB8, 0xF2, 0xDD},
+	{0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7},
+	{0xED, 0x39, 0xD9, 0x50, 0xFA, 0x74, 0xBC, 0xC4},
+	{0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B},
+	{0x7A, 0x38, 0x9D, 0x10, 0x35, 0x4B, 0xD2, 0x71},
+	{0x86, 0x8E, 0xBB, 0x51, 0xCA, 0xB4, 0x59, 0x9A},
+	{0x71, 0x78, 0x87, 0x6E, 0x01, 0xF1, 0x9B, 0x2A},
+	{0xAF, 0x37, 0xFB, 0x42, 0x1F, 0x8C, 0x40, 0x95},
+	{0x86, 0xA5, 0x60, 0xF1, 0x0E, 0xC6, 0xD8, 0x5B},
+	{0x0C, 0xD3, 0xDA, 0x02, 0x00, 0x21, 0xDC, 0x09},
+	{0xEA, 0x67, 0x6B, 0x2C, 0xB7, 0xDB, 0x2B, 0x7A},
+	{0xDF, 0xD6, 0x4A, 0x81, 0x5C, 0xAF, 0x1A, 0x0F},
+	{0x5C, 0x51, 0x3C, 0x9C, 0x48, 0x86, 0xC0, 0x88},
+	{0x0A, 0x2A, 0xEE, 0xAE, 0x3F, 0xF4, 0xAB, 0x77},
+	{0xEF, 0x1B, 0xF0, 0x3E, 0x5D, 0xFA, 0x57, 0x5A},
+	{0x88, 0xBF, 0x0D, 0xB6, 0xD7, 0x0D, 0xEE, 0x56},
+	{0xA1, 0xF9, 0x91, 0x55, 0x41, 0x02, 0x0B, 0x56},
+	{0x6F, 0xBF, 0x1C, 0xAF, 0xCF, 0xFD, 0x05, 0x56},
+	{0x2F, 0x22, 0xE4, 0x9B, 0xAB, 0x7C, 0xA1, 0xAC},
+	{0x5A, 0x6B, 0x61, 0x2C, 0xC2, 0x6C, 0xCE, 0x4A},
+	{0x5F, 0x4C, 0x03, 0x8E, 0xD1, 0x2B, 0x2E, 0x41},
+	{0x63, 0xFA, 0xC0, 0xD0, 0x34, 0xD9, 0xF7, 0x93},
+	{0x61, 0x7B, 0x3A, 0x0C, 0xE8, 0xF0, 0x71, 0x00},
+	{0xDB, 0x95, 0x86, 0x05, 0xF8, 0xC8, 0xC6, 0x06},
+	{0xED, 0xBF, 0xD1, 0xC6, 0x6C, 0x29, 0xCC, 0xC7},
+	{0x35, 0x55, 0x50, 0xB2, 0x15, 0x0E, 0x24, 0x51},
+	{0xCA, 0xAA, 0xAF, 0x4D, 0xEA, 0xF1, 0xDB, 0xAE},
+	{0xD5, 0xD4, 0x4F, 0xF7, 0x20, 0x68, 0x3D, 0x0D},
+	{0x2A, 0x2B, 0xB0, 0x08, 0xDF, 0x97, 0xC2, 0xF2}
+};
+
+static unsigned char cipher_ecb2[NUM_TESTS - 1][8] = {
+	{0x92, 0x95, 0xB5, 0x9B, 0xB3, 0x84, 0x73, 0x6E},
+	{0x19, 0x9E, 0x9D, 0x6D, 0xF3, 0x9A, 0xA8, 0x16},
+	{0x2A, 0x4B, 0x4D, 0x24, 0x52, 0x43, 0x84, 0x27},
+	{0x35, 0x84, 0x3C, 0x01, 0x9D, 0x18, 0xC5, 0xB6},
+	{0x4A, 0x5B, 0x2F, 0x42, 0xAA, 0x77, 0x19, 0x25},
+	{0xA0, 0x6B, 0xA9, 0xB8, 0xCA, 0x5B, 0x17, 0x8A},
+	{0xAB, 0x9D, 0xB7, 0xFB, 0xED, 0x95, 0xF2, 0x74},
+	{0x3D, 0x25, 0x6C, 0x23, 0xA7, 0x25, 0x2F, 0xD6},
+	{0xB7, 0x6F, 0xAB, 0x4F, 0xBD, 0xBD, 0xB7, 0x67},
+	{0x8F, 0x68, 0x27, 0xD6, 0x9C, 0xF4, 0x1A, 0x10},
+	{0x82, 0x57, 0xA1, 0xD6, 0x50, 0x5E, 0x81, 0x85},
+	{0xA2, 0x0F, 0x0A, 0xCD, 0x80, 0x89, 0x7D, 0xFA},
+	{0xCD, 0x2A, 0x53, 0x3A, 0xDB, 0x0D, 0x7E, 0xF3},
+	{0xD2, 0xC2, 0xBE, 0x27, 0xE8, 0x1B, 0x68, 0xE3},
+	{0xE9, 0x24, 0xCF, 0x4F, 0x89, 0x3C, 0x5B, 0x0A},
+	{0xA7, 0x18, 0xC3, 0x9F, 0xFA, 0x9F, 0xD7, 0x69},
+	{0x77, 0x2C, 0x79, 0xB1, 0xD2, 0x31, 0x7E, 0xB1},
+	{0x49, 0xAB, 0x92, 0x7F, 0xD0, 0x22, 0x00, 0xB7},
+	{0xCE, 0x1C, 0x6C, 0x7D, 0x85, 0xE3, 0x4A, 0x6F},
+	{0xBE, 0x91, 0xD6, 0xE1, 0x27, 0xB2, 0xE9, 0x87},
+	{0x70, 0x28, 0xAE, 0x8F, 0xD1, 0xF5, 0x74, 0x1A},
+	{0xAA, 0x37, 0x80, 0xBB, 0xF3, 0x22, 0x1D, 0xDE},
+	{0xA6, 0xC4, 0xD2, 0x5E, 0x28, 0x93, 0xAC, 0xB3},
+	{0x22, 0x07, 0x81, 0x5A, 0xE4, 0xB7, 0x1A, 0xAD},
+	{0xDC, 0xCE, 0x05, 0xE7, 0x07, 0xBD, 0xF5, 0x84},
+	{0x26, 0x1D, 0x39, 0x2C, 0xB3, 0xBA, 0xA5, 0x85},
+	{0xB4, 0xF7, 0x0F, 0x72, 0xFB, 0x04, 0xF0, 0xDC},
+	{0x95, 0xBA, 0xA9, 0x4E, 0x87, 0x36, 0xF2, 0x89},
+	{0xD4, 0x07, 0x3A, 0xF1, 0x5A, 0x17, 0x82, 0x0E},
+	{0xEF, 0x6F, 0xAF, 0xA7, 0x66, 0x1A, 0x7E, 0x89},
+	{0xC1, 0x97, 0xF5, 0x58, 0x74, 0x8A, 0x20, 0xE7},
+	{0x43, 0x34, 0xCF, 0xDA, 0x22, 0xC4, 0x86, 0xC8},
+	{0x08, 0xD7, 0xB4, 0xFB, 0x62, 0x9D, 0x08, 0x85}
+};
+
+static unsigned char cbc_key[8] = {
+	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+};
+static unsigned char cbc2_key[8] = {
+	0xf1, 0xe0, 0xd3, 0xc2, 0xb5, 0xa4, 0x97, 0x86,
+};
+static unsigned char cbc3_key[8] = {
+	0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+};
+static unsigned char cbc_iv[8] = {
+	0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
+};
+/*
+ * Changed the following text constant to binary so it will work on ebcdic
+ * machines :-)
+ */
+/* static char cbc_data[40]="7654321 Now is the time for \0001"; */
+static unsigned char cbc_data[40] = {
+	0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
+	0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
+	0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20,
+	0x66, 0x6F, 0x72, 0x20, 0x00, 0x31, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static unsigned char cbc_ok[32] = {
+	0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4,
+	0xac, 0xd8, 0xae, 0xfd, 0xdf, 0xd8, 0xa1, 0xeb,
+	0x46, 0x8e, 0x91, 0x15, 0x78, 0x88, 0xba, 0x68,
+	0x1d, 0x26, 0x93, 0x97, 0xf7, 0xfe, 0x62, 0xb4,
+};
+
+#ifdef SCREW_THE_PARITY
+#error "SCREW_THE_PARITY is not ment to be defined."
+#error "Original vectors are preserved for reference only."
+static unsigned char cbc2_key[8] = {
+	0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
+};
+static unsigned char xcbc_ok[32] = {
+	0x86, 0x74, 0x81, 0x0D, 0x61, 0xA4, 0xA5, 0x48,
+	0xB9, 0x93, 0x03, 0xE1, 0xB8, 0xBB, 0xBD, 0xBD,
+	0x64, 0x30, 0x0B, 0xB9, 0x06, 0x65, 0x81, 0x76,
+	0x04, 0x1D, 0x77, 0x62, 0x17, 0xCA, 0x2B, 0xD2,
+};
+#else
+static unsigned char xcbc_ok[32] = {
+	0x84, 0x6B, 0x29, 0x14, 0x85, 0x1E, 0x9A, 0x29,
+	0x54, 0x73, 0x2F, 0x8A, 0xA0, 0xA6, 0x11, 0xC1,
+	0x15, 0xCD, 0xC2, 0xD7, 0x95, 0x1B, 0x10, 0x53,
+	0xA6, 0x3C, 0x5E, 0x03, 0xB2, 0x1A, 0xA3, 0xC4,
+};
+#endif
+
+static unsigned char cbc3_ok[32] = {
+	0x3F, 0xE3, 0x01, 0xC9, 0x62, 0xAC, 0x01, 0xD0,
+	0x22, 0x13, 0x76, 0x3C, 0x1C, 0xBD, 0x4C, 0xDC,
+	0x79, 0x96, 0x57, 0xC0, 0x64, 0xEC, 0xF5, 0xD4,
+	0x1C, 0x67, 0x38, 0x12, 0xCF, 0xDE, 0x96, 0x75
+};
+
+static unsigned char pcbc_ok[32] = {
+	0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4,
+	0x6d, 0xec, 0xb4, 0x70, 0xa0, 0xe5, 0x6b, 0x15,
+	0xae, 0xa6, 0xbf, 0x61, 0xed, 0x7d, 0x9c, 0x9f,
+	0xf7, 0x17, 0x46, 0x3b, 0x8a, 0xb3, 0xcc, 0x88
+};
+
+static unsigned char cfb_key[8] = {
+	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+};
+static unsigned char cfb_iv[8] = {
+	0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef,
+};
+static unsigned char cfb_buf1[40], cfb_buf2[40], cfb_tmp[8];
+static unsigned char plain[24] =
+{
+	0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73,
+	0x20, 0x74, 0x68, 0x65, 0x20, 0x74,
+	0x69, 0x6d, 0x65, 0x20, 0x66, 0x6f,
+	0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20,
+};
+static unsigned char cfb_cipher8[24] = {
+	0xf3, 0x1f, 0xda, 0x07, 0x01, 0x14,
+	0x62, 0xee, 0x18, 0x7f, 0x43, 0xd8,
+	0x0a, 0x7c, 0xd9, 0xb5, 0xb0, 0xd2,
+	0x90, 0xda, 0x6e, 0x5b, 0x9a, 0x87,
+};
+static unsigned char cfb_cipher16[24] = {
+	0xF3, 0x09, 0x87, 0x87, 0x7F, 0x57,
+	0xF7, 0x3C, 0x36, 0xB6, 0xDB, 0x70,
+	0xD8, 0xD5, 0x34, 0x19, 0xD3, 0x86,
+	0xB2, 0x23, 0xB7, 0xB2, 0xAD, 0x1B,
+};
+static unsigned char cfb_cipher32[24] = {
+	0xF3, 0x09, 0x62, 0x49, 0xA4, 0xDF,
+	0xA4, 0x9F, 0x33, 0xDC, 0x7B, 0xAD,
+	0x4C, 0xC8, 0x9F, 0x64, 0xE4, 0x53,
+	0xE5, 0xEC, 0x67, 0x20, 0xDA, 0xB6,
+};
+static unsigned char cfb_cipher48[24] = {
+	0xF3, 0x09, 0x62, 0x49, 0xC7, 0xF4,
+	0x30, 0xB5, 0x15, 0xEC, 0xBB, 0x85,
+	0x97, 0x5A, 0x13, 0x8C, 0x68, 0x60,
+	0xE2, 0x38, 0x34, 0x3C, 0xDC, 0x1F,
+};
+static unsigned char cfb_cipher64[24] = {
+	0xF3, 0x09, 0x62, 0x49, 0xC7, 0xF4,
+	0x6E, 0x51, 0xA6, 0x9E, 0x83, 0x9B,
+	0x1A, 0x92, 0xF7, 0x84, 0x03, 0x46,
+	0x71, 0x33, 0x89, 0x8E, 0xA6, 0x22,
+};
+
+static unsigned char ofb_key[8] = {
+	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+};
+static unsigned char ofb_iv[8] = {
+	0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef,
+};
+static unsigned char ofb_buf1[24], ofb_buf2[24], ofb_tmp[8];
+static unsigned char ofb_cipher[24] =
+{
+	0xf3, 0x09, 0x62, 0x49, 0xc7, 0xf4, 0x6e, 0x51,
+	0x35, 0xf2, 0x4a, 0x24, 0x2e, 0xeb, 0x3d, 0x3f,
+	0x3d, 0x6d, 0x5b, 0xe3, 0x25, 0x5a, 0xf8, 0xc3
+};
+
+static DES_LONG cbc_cksum_ret = 0xB462FEF7L;
+static unsigned char cbc_cksum_data[8] = {
+	0x1D, 0x26, 0x93, 0x97, 0xf7, 0xfe, 0x62, 0xb4,
+};
+
+static char *
+pt(unsigned char *p)
+{
+	static char bufs[10][20];
+	static int bnum = 0;
+	char *ret;
+	int i;
+	static const char *f = "0123456789ABCDEF";
+
+	ret = &(bufs[bnum++][0]);
+	bnum %= 10;
+	for (i = 0; i < 8; i++) {
+		ret[i * 2] = f[(p[i] >> 4) & 0xf];
+		ret[i * 2 + 1] = f[p[i] & 0xf];
+	}
+	ret[16] = '\0';
+	return (ret);
+}
+
+static void
+fail_cfb_buf(const char *msg, unsigned char *ptr)
+{
+	char buf[1024];
+	int i;
+
+	*buf = '\0';
+	for (i = 0; i < 24; i += 8) {
+		char buf2[128];
+		snprintf(buf2, sizeof(buf2), "%s /", pt(&(cfb_buf1[i])));
+		strlcat(buf, buf2, sizeof(buf));
+	}
+
+	atf_tc_fail_nonfatal("%s: %s", msg, buf);
+}
+
+#if !defined(LIBDES_LIT)
+static void
+cfb_test(int bits, unsigned char *cfb_cipher)
+{
+	des_key_schedule ks;
+
+	des_set_key_checked(&cfb_key, ks);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	des_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), ks, &cfb_tmp,
+			DES_ENCRYPT);
+	if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0)
+		fail_cfb_buf("cfb_encrypt encrypt error", cfb_buf1);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	des_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), ks, &cfb_tmp,
+			DES_DECRYPT);
+	if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0)
+		fail_cfb_buf("cfb_encrypt decrypt error", cfb_buf2);
+}
+#endif /* !defined(LIBDES_LIT) */
+
+#if !defined(LIBDES_LIT)
+static void
+cfb64_test(unsigned char *cfb_cipher)
+{
+	int n;
+	des_key_schedule ks;
+
+	des_set_key_checked(&cfb_key, ks);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	n = 0;
+	des_cfb64_encrypt(plain, cfb_buf1, 12, ks, &cfb_tmp, &n, DES_ENCRYPT);
+	des_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]), sizeof(plain) - 12, ks,
+			  &cfb_tmp, &n, DES_ENCRYPT);
+	if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0)
+		fail_cfb_buf("cfb_encrypt encrypt error", cfb_buf1);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	n = 0;
+	des_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, ks, &cfb_tmp, &n, DES_DECRYPT);
+	des_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
+			  sizeof(plain) - 17, ks, &cfb_tmp, &n, DES_DECRYPT);
+	if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0)
+		fail_cfb_buf("cfb_encrypt decrypt error", cfb_buf2);
+}
+#endif /* !defined(LIBDES_LIT) */
+
+#if !defined(LIBDES_LIT)
+static void
+ede_cfb64_test(unsigned char *cfb_cipher)
+{
+	int n;
+	des_key_schedule ks;
+
+	des_set_key_checked(&cfb_key, ks);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	n = 0;
+	des_ede3_cfb64_encrypt(plain, cfb_buf1, 12, ks, ks, ks, &cfb_tmp, &n,
+			       DES_ENCRYPT);
+	des_ede3_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]),
+			       sizeof(plain) - 12, ks, ks, ks,
+			       &cfb_tmp, &n, DES_ENCRYPT);
+	if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0)
+		fail_cfb_buf("ede_cfb_encrypt encrypt error", cfb_buf1);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	n = 0;
+	des_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long) 17, ks, ks, ks,
+			       &cfb_tmp, &n, DES_DECRYPT);
+	des_ede3_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
+			       sizeof(plain) - 17, ks, ks, ks,
+			       &cfb_tmp, &n, DES_DECRYPT);
+	if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0)
+		fail_cfb_buf("ede_cfb_encrypt decrypt error", cfb_buf2);
+}
+#endif /* !defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(cbcm);
+#if defined(NO_DESCBCM)
+ATF_TC_BODY(cbcm, tc)
+{
+	atf_tc_skip("Test program built with NO_DESCBCM");
+}
+#else /* defined(NO_DESCBM) */
+ATF_TC_BODY(cbcm, tc)
+{
+	int i, j;
+	des_cblock iv3, iv2;
+	unsigned char cbc_in[40], cbc_out[40];
+	des_key_schedule ks, ks2, ks3;
+
+	if ((j = des_set_key_checked(&cbc_key, ks)) != 0) {
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	}
+	if ((j = des_set_key_checked(&cbc2_key, ks2)) != 0) {
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	}
+	if ((j = des_set_key_checked(&cbc3_key, ks3)) != 0) {
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	}
+	memset(cbc_out, 0, 40);
+	memset(cbc_in, 0, 40);
+	i = strlen((char *) cbc_data) + 1;
+	/* i=((i+7)/8)*8; */
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	memset(iv2, '\0', sizeof iv2);
+
+	des_ede3_cbcm_encrypt(cbc_data, cbc_out, 16L, ks, ks2, ks3, &iv3, &iv2,
+			      DES_ENCRYPT);
+	des_ede3_cbcm_encrypt(&cbc_data[16], &cbc_out[16], i - 16, ks, ks2, ks3,
+			      &iv3, &iv2, DES_ENCRYPT);
+	/*
+	 * if (memcmp(cbc_out,cbc3_ok, (unsigned int)(strlen((char
+	 * *)cbc_data)+1+7)/8*8) != 0) { printf("des_ede3_cbc_encrypt encrypt
+	 * error\n"); err=1; }
+	 */
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	memset(iv2, '\0', sizeof iv2);
+	des_ede3_cbcm_encrypt(cbc_out, cbc_in, i, ks, ks2, ks3, &iv3, &iv2,
+			      DES_DECRYPT);
+	if (memcmp(cbc_in, cbc_data, strlen((char *) cbc_data) + 1) != 0) {
+		char buf[1024];
+		int n;
+
+		*buf = '\0';
+		for (n = 0; n < i; ++n) {
+			char buf2[16];
+			snprintf(buf2, sizeof(buf2), " %02x", cbc_data[n]);
+			strlcat(buf, buf2, sizeof(buf));
+		}
+		strlcat(buf, ", ", sizeof(buf));
+		for (n = 0; n < i; ++n) {
+			char buf2[16];
+			snprintf(buf2, sizeof(buf2), " %02x", cbc_in[n]);
+			strlcat(buf, buf2, sizeof(buf));
+		}
+
+		atf_tc_fail_nonfatal("des_ede3_cbcm_encrypt decrypt error: %s",
+				     buf);
+	}
+}
+#endif /* defined(NO_DESCBM) */
+
+ATF_TC_WITHOUT_HEAD(ecb);
+ATF_TC_BODY(ecb, tc)
+{
+	int i;
+	des_cblock in, out, outin;
+	des_key_schedule ks;
+
+	for (i = 0; i < NUM_TESTS; i++) {
+		des_set_key_unchecked(&key_data[i], ks);
+		memcpy(in, plain_data[i], 8);
+		memset(out, 0, 8);
+		memset(outin, 0, 8);
+		des_ecb_encrypt(&in, &out, ks, DES_ENCRYPT);
+		des_ecb_encrypt(&out, &outin, ks, DES_DECRYPT);
+
+		if (memcmp(out, cipher_data[i], 8) != 0) {
+			atf_tc_fail_nonfatal("Encryption error %2d\nk=%s p=%s "
+					     "o=%s act=%s\n", i + 1,
+					     pt(key_data[i]), pt(in),
+					     pt(cipher_data[i]), pt(out));
+		}
+		if (memcmp(in, outin, 8) != 0) {
+			atf_tc_fail_nonfatal("Decryption error %2d\nk=%s p=%s "
+					     "o=%s act=%s\n", i + 1,
+					     pt(key_data[i]), pt(out), pt(in),
+					     pt(outin));
+		}
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(ede_ecb);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(ede_ecb, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(ede_ecb, tc)
+{
+	int i;
+	des_cblock in, out, outin;
+	des_key_schedule ks, ks2, ks3;
+
+	for (i = 0; i < (NUM_TESTS - 1); i++) {
+		des_set_key_unchecked(&key_data[i], ks);
+		des_set_key_unchecked(&key_data[i + 1], ks2);
+		des_set_key_unchecked(&key_data[i + 2], ks3);
+		memcpy(in, plain_data[i], 8);
+		memset(out, 0, 8);
+		memset(outin, 0, 8);
+		des_ecb2_encrypt(&in, &out, ks, ks2, DES_ENCRYPT);
+		des_ecb2_encrypt(&out, &outin, ks, ks2, DES_DECRYPT);
+
+		if (memcmp(out, cipher_ecb2[i], 8) != 0) {
+			atf_tc_fail_nonfatal("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
+			 i + 1, pt(key_data[i]), pt(in), pt(cipher_ecb2[i]),
+			       pt(out));
+		}
+		if (memcmp(in, outin, 8) != 0) {
+			atf_tc_fail_nonfatal("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
+			i + 1, pt(key_data[i]), pt(out), pt(in), pt(outin));
+		}
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(cbc);
+ATF_TC_BODY(cbc, tc)
+{
+	int j;
+	des_cblock iv3;
+	des_key_schedule ks;
+	unsigned char cbc_in[40], cbc_out[40];
+
+	if ((j = des_set_key_checked(&cbc_key, ks)) != 0)
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	memset(cbc_out, 0, 40);
+	memset(cbc_in, 0, 40);
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	des_ncbc_encrypt(cbc_data, cbc_out, strlen((char *) cbc_data) + 1, ks,
+			 &iv3, DES_ENCRYPT);
+	if (memcmp(cbc_out, cbc_ok, 32) != 0)
+		atf_tc_fail_nonfatal("cbc_encrypt encrypt error\n");
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	des_ncbc_encrypt(cbc_out, cbc_in, strlen((char *) cbc_data) + 1, ks,
+			 &iv3, DES_DECRYPT);
+	if (memcmp(cbc_in, cbc_data, strlen((char *) cbc_data)) != 0)
+		atf_tc_fail_nonfatal("cbc_encrypt decrypt error\n");
+}
+
+ATF_TC_WITHOUT_HEAD(desx_cbc);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(desx_cbc, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(desx_cbc, tc)
+{
+	int j;
+	des_cblock iv3;
+	des_key_schedule ks;
+	unsigned char cbc_in[40], cbc_out[40];
+
+	if ((j = des_set_key_checked(&cbc_key, ks)) != 0) {
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	}
+	memset(cbc_out, 0, 40);
+	memset(cbc_in, 0, 40);
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	des_xcbc_encrypt(cbc_data, cbc_out, strlen((char *) cbc_data) + 1, ks,
+			 &iv3, &cbc2_key, &cbc3_key, DES_ENCRYPT);
+	if (memcmp(cbc_out, xcbc_ok, 32) != 0) {
+		atf_tc_fail_nonfatal("des_xcbc_encrypt encrypt error\n");
+	}
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	des_xcbc_encrypt(cbc_out, cbc_in, strlen((char *) cbc_data) + 1, ks,
+			 &iv3, &cbc2_key, &cbc3_key, DES_DECRYPT);
+	if (memcmp(cbc_in, cbc_data, strlen((char *) cbc_data) + 1) != 0) {
+		atf_tc_fail_nonfatal("des_xcbc_encrypt decrypt error\n");
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(ede_cbc);
+ATF_TC_BODY(ede_cbc, tc)
+{
+	int i, j;
+	des_cblock iv3;
+	des_key_schedule ks, ks2, ks3;
+	unsigned char cbc_in[40], cbc_out[40];
+
+	if ((j = des_set_key_checked(&cbc_key, ks)) != 0)
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	if ((j = des_set_key_checked(&cbc2_key, ks2)) != 0)
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	if ((j = des_set_key_checked(&cbc3_key, ks3)) != 0)
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	memset(cbc_out, 0, 40);
+	memset(cbc_in, 0, 40);
+	i = strlen((char *) cbc_data) + 1;
+	/* i=((i+7)/8)*8; */
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+
+	des_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, ks, ks2, ks3, &iv3,
+			     DES_ENCRYPT);
+	des_ede3_cbc_encrypt(&(cbc_data[16]), &(cbc_out[16]), i - 16, ks, ks2,
+			     ks3, &iv3, DES_ENCRYPT);
+	if (memcmp(cbc_out, cbc3_ok, (unsigned int)
+		   (strlen((char *) cbc_data) + 1 + 7) / 8 * 8) != 0)
+		atf_tc_fail_nonfatal("des_ede3_cbc_encrypt encrypt error\n");
+	memcpy(iv3, cbc_iv, sizeof(cbc_iv));
+	des_ede3_cbc_encrypt(cbc_out, cbc_in, i, ks, ks2, ks3, &iv3,
+			     DES_DECRYPT);
+	if (memcmp(cbc_in, cbc_data, strlen((char *) cbc_data) + 1) != 0)
+		atf_tc_fail_nonfatal("des_ede3_cbc_encrypt decrypt error\n");
+}
+
+ATF_TC_WITHOUT_HEAD(pcbc);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(pcbc, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(pcbc, tc)
+{
+	int j;
+	unsigned char cbc_in[40], cbc_out[40];
+	des_key_schedule ks;
+
+	if ((j = des_set_key_checked(&cbc_key, ks)) != 0) {
+		atf_tc_fail_nonfatal("Key error %d\n", j);
+	}
+	memset(cbc_out, 0, 40);
+	memset(cbc_in, 0, 40);
+	des_pcbc_encrypt(cbc_data, cbc_out, strlen((char *) cbc_data) + 1, ks,
+			 &cbc_iv, DES_ENCRYPT);
+	if (memcmp(cbc_out, pcbc_ok, 32) != 0) {
+		atf_tc_fail_nonfatal("pcbc_encrypt encrypt error\n");
+	}
+	des_pcbc_encrypt(cbc_out, cbc_in, strlen((char *) cbc_data) + 1, ks, &cbc_iv,
+			 DES_DECRYPT);
+	if (memcmp(cbc_in, cbc_data, strlen((char *) cbc_data) + 1) != 0) {
+		atf_tc_fail_nonfatal("pcbc_encrypt decrypt error\n");
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(cfb);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(cfb, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(cfb, tc)
+{
+	size_t i;
+	des_key_schedule ks;
+
+	printf("cfb8\n");
+	cfb_test(8, cfb_cipher8);
+	printf("cfb16\n");
+	cfb_test(16, cfb_cipher16);
+	printf("cfb32\n");
+	cfb_test(32, cfb_cipher32);
+	printf("cfb48\n");
+	cfb_test(48, cfb_cipher48);
+	printf("cfb64\n");
+	cfb_test(64, cfb_cipher64);
+
+	printf("cfb64()\n");
+	cfb64_test(cfb_cipher64);
+
+	des_set_key_checked(&cfb_key, ks);
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	for (i = 0; i < sizeof(plain); i++)
+		des_cfb_encrypt(&(plain[i]), &(cfb_buf1[i]),
+				8, 1, ks, &cfb_tmp, DES_ENCRYPT);
+	if (memcmp(cfb_cipher8, cfb_buf1, sizeof(plain)) != 0)
+		atf_tc_fail_nonfatal("cfb_encrypt small encrypt error\n");
+	memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
+	for (i = 0; i < sizeof(plain); i++)
+		des_cfb_encrypt(&(cfb_buf1[i]), &(cfb_buf2[i]),
+				8, 1, ks, &cfb_tmp, DES_DECRYPT);
+	if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0)
+		atf_tc_fail_nonfatal("cfb_encrypt small decrypt error\n");
+	printf("ede_cfb64()\n");
+	ede_cfb64_test(cfb_cipher64);
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(ofb);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(ofb, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(ofb, tc)
+{
+	des_key_schedule ks;
+
+	des_set_key_checked(&ofb_key, ks);
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	des_ofb_encrypt(plain, ofb_buf1, 64, sizeof(plain) / 8, ks, &ofb_tmp);
+	if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
+		atf_tc_fail_nonfatal("ofb_encrypt encrypt error: "
+				     "%02X %02X %02X %02X %02X %02X %02X %02X, "
+				     "%02X %02X %02X %02X %02X %02X %02X %02X",
+				     ofb_buf1[8 + 0], ofb_buf1[8 + 1],
+				     ofb_buf1[8 + 2], ofb_buf1[8 + 3],
+				     ofb_buf1[8 + 4], ofb_buf1[8 + 5],
+				     ofb_buf1[8 + 6], ofb_buf1[8 + 7],
+				     ofb_buf1[8 + 0], ofb_cipher[8 + 1],
+				     ofb_cipher[8 + 2], ofb_cipher[8 + 3],
+				     ofb_buf1[8 + 4], ofb_cipher[8 + 5],
+				     ofb_cipher[8 + 6], ofb_cipher[8 + 7]);
+	}
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	des_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, ks,
+			&ofb_tmp);
+	if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
+		atf_tc_fail_nonfatal("ofb_encrypt decrypt error: "
+				     "%02X %02X %02X %02X %02X %02X %02X %02X, "
+				     "%02X %02X %02X %02X %02X %02X %02X %02X",
+				     ofb_buf2[8 + 0], ofb_buf2[8 + 1],
+				     ofb_buf2[8 + 2], ofb_buf2[8 + 3],
+				     ofb_buf2[8 + 4], ofb_buf2[8 + 5],
+				     ofb_buf2[8 + 6], ofb_buf2[8 + 7],
+				     plain[8 + 0], plain[8 + 1],
+				     plain[8 + 2], plain[8 + 3],
+				     plain[8 + 4], plain[8 + 5],
+				     plain[8 + 6], plain[8 + 7]);
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(ofb64);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(ofb64, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(ofb64, tc)
+{
+	int num;
+	size_t i;
+	des_key_schedule ks;
+
+	des_set_key_checked(&ofb_key, ks);
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	memset(ofb_buf1, 0, sizeof(ofb_buf1));
+	memset(ofb_buf2, 0, sizeof(ofb_buf1));
+	num = 0;
+	for (i = 0; i < sizeof(plain); i++) {
+		des_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, &ofb_tmp,
+				  &num);
+	}
+	if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
+		atf_tc_fail_nonfatal("ofb64_encrypt encrypt error\n");
+	}
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	num = 0;
+	des_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks, &ofb_tmp, &num);
+	if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
+		atf_tc_fail_nonfatal("ofb64_encrypt decrypt error\n");
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(ede_ofb64);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(ede_ofb64, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(ede_ofb64, tc)
+{
+	int num;
+	size_t i;
+	des_key_schedule ks;
+
+	des_set_key_checked(&ofb_key, ks);
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	memset(ofb_buf1, 0, sizeof(ofb_buf1));
+	memset(ofb_buf2, 0, sizeof(ofb_buf1));
+	num = 0;
+	for (i = 0; i < sizeof(plain); i++) {
+		des_ede3_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, ks, ks,
+				       &ofb_tmp, &num);
+	}
+	if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
+		atf_tc_fail_nonfatal("ede_ofb64_encrypt encrypt error\n");
+	}
+	memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
+	num = 0;
+	des_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks,
+			       ks, ks, &ofb_tmp, &num);
+	if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
+		atf_tc_fail_nonfatal("ede_ofb64_encrypt decrypt error\n");
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(cbc_cksum);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(cbc_cksum, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(cbc_cksum, tc)
+{
+	unsigned char cret[8];
+	des_key_schedule ks;
+	DES_LONG cs;
+
+	des_set_key_checked(&cbc_key, ks);
+	cs = des_cbc_cksum(cbc_data, &cret, strlen((char *) cbc_data), ks, &cbc_iv);
+	if (cs != cbc_cksum_ret) {
+		atf_tc_fail_nonfatal("bad return value (%08lX), should be %08lX\n",
+		       (unsigned long) cs, (unsigned long) cbc_cksum_ret);
+	}
+	if (memcmp(cret, cbc_cksum_data, 8) != 0) {
+		atf_tc_fail_nonfatal("bad cbc_cksum block returned\n");
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(quad_cksum);
+#if defined(LIBDES_LIT)
+ATF_TC_BODY(quad_cksum, tc)
+{
+	atf_tc_skip("Test program built with LIBDES_LIT");
+}
+#else /* defined(LIBDES_LIT) */
+ATF_TC_BODY(quad_cksum, tc)
+{
+	DES_LONG cs, lqret[4];
+
+	cs = quad_cksum(cbc_data, (des_cblock *) lqret,
+		(long) strlen((char *) cbc_data), 2, (des_cblock *) cbc_iv);
+	if (cs != 0x70d7a63aL) {
+		atf_tc_fail_nonfatal("quad_cksum error, ret %08lx should be 70d7a63a\n",
+		       (unsigned long) cs);
+	}
+	if (lqret[0] != 0x327eba8dL) {
+		atf_tc_fail_nonfatal("quad_cksum error, out[0] %08lx is not %08lx\n",
+		       (unsigned long) lqret[0], 0x327eba8dUL);
+	}
+	if (lqret[1] != 0x201a49ccL) {
+		atf_tc_fail_nonfatal("quad_cksum error, out[1] %08lx is not %08lx\n",
+		       (unsigned long) lqret[1], 0x201a49ccUL);
+	}
+	if (lqret[2] != 0x70d7a63aL) {
+		atf_tc_fail_nonfatal("quad_cksum error, out[2] %08lx is not %08lx\n",
+		       (unsigned long) lqret[2], 0x70d7a63aUL);
+	}
+	if (lqret[3] != 0x501c2c26L) {
+		atf_tc_fail_nonfatal("quad_cksum error, out[3] %08lx is not %08lx\n",
+		       (unsigned long) lqret[3], 0x501c2c26UL);
+	}
+}
+#endif /* defined(LIBDES_LIT) */
+
+ATF_TC_WITHOUT_HEAD(align);
+ATF_TC_BODY(align, tc)
+{
+	int i;
+	unsigned char cbc_in[40], cbc_out[40];
+	des_key_schedule ks;
+
+	printf("input word alignment test");
+	for (i = 0; i < 4; i++) {
+		printf(" %d", i);
+		des_ncbc_encrypt(&(cbc_out[i]), cbc_in,
+				 strlen((char *) cbc_data) + 1, ks,
+				 &cbc_iv, DES_ENCRYPT);
+	}
+
+	printf("\noutput word alignment test");
+	for (i = 0; i < 4; i++) {
+		printf(" %d", i);
+		des_ncbc_encrypt(cbc_out, &(cbc_in[i]),
+				 strlen((char *) cbc_data) + 1, ks,
+				 &cbc_iv, DES_ENCRYPT);
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(fast_crypt);
+ATF_TC_BODY(fast_crypt, tc)
+{
+	char *str;
+
+	str = crypt("testing", "ef");
+	if (strcmp("efGnQx2725bI2", str) != 0)
+		atf_tc_fail_nonfatal("fast crypt error, %s should be efGnQx2725bI2\n", str);
+	str = crypt("bca76;23", "yA");
+	if (strcmp("yA1Rp/1hZXIJk", str) != 0)
+		atf_tc_fail_nonfatal("fast crypt error, %s should be yA1Rp/1hZXIJk\n", str);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cbcm);
+	ATF_TP_ADD_TC(tp, ecb);
+	ATF_TP_ADD_TC(tp, ede_ecb);
+	ATF_TP_ADD_TC(tp, cbc);
+	ATF_TP_ADD_TC(tp, desx_cbc);
+	ATF_TP_ADD_TC(tp, ede_cbc);
+	ATF_TP_ADD_TC(tp, pcbc);
+	ATF_TP_ADD_TC(tp, cfb);
+	ATF_TP_ADD_TC(tp, ofb);
+	ATF_TP_ADD_TC(tp, ofb64);
+	ATF_TP_ADD_TC(tp, ede_ofb64);
+	ATF_TP_ADD_TC(tp, cbc_cksum);
+	ATF_TP_ADD_TC(tp, quad_cksum);
+	ATF_TP_ADD_TC(tp, align);
+	ATF_TP_ADD_TC(tp, fast_crypt);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libevent/t_event.sh b/contrib/netbsd-tests/lib/libevent/t_event.sh
new file mode 100755
index 000000000000..1e4c9bc02bc5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libevent/t_event.sh
@@ -0,0 +1,67 @@
+# $NetBSD: t_event.sh,v 1.3 2010/11/29 18:21:15 pgoyette Exp $
+#
+# Copyright (c) 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# This is not great but rather than reimplementing the libevent
+# provided regression tests, we use an ATF wrapper around the test
+# program which carries out all the tests and prints an extensive
+# report.
+#
+
+atf_test_case kqueue
+kqueue_head() {
+	atf_set "descr" "Test libevent with kqueue backend"
+}
+kqueue_body() {
+	EVENT_NOPOLL=1 EVENT_NOSELECT=1 \
+	    $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report"
+}
+
+atf_test_case poll
+poll_head() {
+	atf_set "descr" "Test libevent with poll backend"
+}
+poll_body() {
+	EVENT_NOKQUEUE=1 EVENT_NOSELECT=1 \
+	    $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report"
+}
+
+atf_test_case select
+select_head() {
+	atf_set "descr" "Test libevent with select backend"
+}
+select_body() {
+	EVENT_NOKQUEUE=1 EVENT_NOPOLL=1 \
+	    $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case kqueue
+	atf_add_test_case poll
+	atf_add_test_case select
+}
diff --git a/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
new file mode 100644
index 000000000000..b5b573901222
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
@@ -0,0 +1,168 @@
+/*	$NetBSD: t_backtrace.c,v 1.15 2014/05/01 03:46:11 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_backtrace.c,v 1.15 2014/05/01 03:46:11 joerg Exp $");
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <execinfo.h>
+#include <unistd.h>
+
+#ifndef __arraycount
+#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
+#endif
+
+void myfunc3(size_t ncalls);
+void myfunc2(size_t ncalls);
+void myfunc1(size_t origcalls, volatile size_t ncalls);
+void myfunc(size_t ncalls);
+
+volatile int prevent_inline;
+
+void
+myfunc3(size_t ncalls)
+{
+	static const struct {
+		const char *name;
+		bool is_optional;
+	} frames[] = {
+	    { "myfunc", false },
+	    { "atfu_backtrace_fmt_basic_body", false },
+	    { "atf_tc_run", false }, 
+	    { "atf_tp_run", true },
+	    { "run_tc", true },
+	    { "controlled_main", true },
+	    { "atf_tp_main", false },
+	    { "main", true },
+	    { "___start", true },
+	};
+	size_t j, nptrs, min_frames, max_frames;
+	void *buffer[ncalls + 10];
+	char **strings;
+
+	min_frames = 0;
+	max_frames = 0;
+	for (j = 0; j < __arraycount(frames); ++j) {
+		if (!frames[j].is_optional)
+			++min_frames;
+		++max_frames;
+	}
+	nptrs = backtrace(buffer, __arraycount(buffer));
+	ATF_REQUIRE(nptrs != (size_t)-1);
+	strings = backtrace_symbols_fmt(buffer, nptrs, "%n");
+
+	ATF_CHECK(strings != NULL);
+
+	printf("got nptrs=%zu ncalls=%zu (min_frames: %zu, max_frames: %zu)\n",
+	    nptrs, ncalls, min_frames, max_frames);
+	printf("backtrace is:\n");
+	for (j = 0; j < nptrs; j++) {
+		printf("#%zu: %s\n", j, strings[j]);
+	}
+
+	ATF_REQUIRE(nptrs >= ncalls + 2 + min_frames);
+	ATF_REQUIRE(nptrs <= ncalls + 2 + max_frames);
+	ATF_CHECK_STREQ(strings[0], "myfunc3");
+	ATF_CHECK_STREQ(strings[1], "myfunc2");
+
+	for (j = 2; j < ncalls + 2; j++)
+		ATF_CHECK_STREQ(strings[j], "myfunc1");
+
+	for (size_t i = 0; j < nptrs; i++, j++) {
+		if (frames[i].is_optional &&
+		    strcmp(strings[j], frames[i].name)) {
+			--i;
+			continue;
+		}
+		ATF_CHECK_STREQ(strings[j], frames[i].name);
+	}
+
+	free(strings);
+
+	if (prevent_inline)
+		vfork();
+}
+
+void
+myfunc2(size_t ncalls)
+{
+	myfunc3(ncalls);
+
+	if (prevent_inline)
+		vfork();
+}
+
+void
+myfunc1(size_t origcalls, volatile size_t ncalls)
+{
+	if (ncalls > 1)
+		myfunc1(origcalls, ncalls - 1);
+	else
+		myfunc2(origcalls);
+
+	if (prevent_inline)
+		vfork();
+}
+
+void
+myfunc(size_t ncalls)
+{
+	myfunc1(ncalls, ncalls);
+
+	if (prevent_inline)
+		vfork();
+}
+
+ATF_TC(backtrace_fmt_basic);
+ATF_TC_HEAD(backtrace_fmt_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test backtrace_fmt(3)");
+	atf_tc_set_md_var(tc, "require.files", "/proc/self");
+}
+
+ATF_TC_BODY(backtrace_fmt_basic, tc)
+{
+	myfunc(12);
+
+	if (prevent_inline)
+		vfork();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, backtrace_fmt_basic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_acos.c b/contrib/netbsd-tests/lib/libm/t_acos.c
new file mode 100644
index 000000000000..f051fb64df42
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_acos.c
@@ -0,0 +1,105 @@
+/* $NetBSD: t_acos.c,v 1.10 2014/03/05 20:14:46 dsl Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+#include "t_libm.h"
+
+/*
+ * acos(3) and acosf(3)
+ */
+
+ATF_LIBM_TEST(acos_is_nan, "Test acos/acosf(x) == NaN, x = NaN, +/-Inf, ![-1..1]")
+{
+	static const double x[] = {
+	    -1.000000001, 1.000000001,
+	    -1.0000001, 1.0000001,
+	    -1.1, 1.1,
+#ifndef __vax__
+	    T_LIBM_NAN,
+	    T_LIBM_MINUS_INF, T_LIBM_PLUS_INF,
+#endif
+	};
+	unsigned int i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+		T_LIBM_CHECK_NAN(i, acos, x[i]);
+		if (i < 2)
+			/* Values are too small for float */
+			continue;
+		T_LIBM_CHECK_NAN(i, acosf, x[i]);
+	}
+}
+
+ATF_LIBM_TEST(acos_inrange, "Test acos/acosf(x) for some valid values")
+{
+	static const struct {
+		double x;
+		double y;
+	} values[] = {
+		{ -1,    M_PI,              },
+		{ -0.99, 3.000053180265366, },
+		{ -0.5,  2.094395102393195, },
+		{ -0.1,  1.670963747956456, },
+		{  0,    M_PI / 2,          },
+		{  0.1,  1.470628905633337, },
+		{  0.5,  1.047197551196598, },
+		{  0.99, 0.141539473324427, },
+	};
+	unsigned int i;
+
+	/*
+	 * Note that acos(x) might be calculated as atan2(sqrt(1-x*x),x).
+	 * This means that acos(-1) is atan2(+0,-1), if the sign is wrong
+	 * the value will be -M_PI (atan2(-0,-1)) not M_PI.
+	 */
+
+	for (i = 0; i < __arraycount(values); i++) {
+		T_LIBM_CHECK(i, acos, values[i].x, values[i].y, 1.0e-15);
+		T_LIBM_CHECK(i, acosf, values[i].x, values[i].y, 1.0e-5);
+	}
+}
+
+ATF_LIBM_TEST(acos_is_plus_zero, "Test acosf(1.0) == +0.0")
+{
+	T_LIBM_CHECK_PLUS_ZERO(0, acos, 1.0);
+	T_LIBM_CHECK_PLUS_ZERO(0, acosf, 1.0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, acos_inrange);
+	ATF_TP_ADD_TC(tp, acos_is_nan);
+	ATF_TP_ADD_TC(tp, acos_is_plus_zero);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_asin.c b/contrib/netbsd-tests/lib/libm/t_asin.c
new file mode 100644
index 000000000000..06de85216429
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_asin.c
@@ -0,0 +1,296 @@
+/* $NetBSD: t_asin.c,v 1.3 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+
+static const struct {
+	double x;
+	double y;
+} values[] = {
+	{ -1.0, -M_PI / 2, },
+	{ -0.9, -1.119769514998634, },
+	{ -0.5, -M_PI / 6, },
+	{ -0.1, -0.1001674211615598, },
+	{  0.1,  0.1001674211615598, },
+	{  0.5,  M_PI / 6, },
+	{  0.9,  1.119769514998634, },
+	{  1.0,  M_PI / 2, },
+};
+
+/*
+ * asin(3)
+ */
+ATF_TC(asin_nan);
+ATF_TC_HEAD(asin_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(NaN) == NaN");
+}
+
+ATF_TC_BODY(asin_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	if (isnan(asin(x)) == 0)
+		atf_tc_fail_nonfatal("asin(NaN) != NaN");
+}
+
+ATF_TC(asin_inf_neg);
+ATF_TC_HEAD(asin_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(-Inf) == NaN");
+}
+
+ATF_TC_BODY(asin_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	if (isnan(asin(x)) == 0)
+		atf_tc_fail_nonfatal("asin(-Inf) != NaN");
+}
+
+ATF_TC(asin_inf_pos);
+ATF_TC_HEAD(asin_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(+Inf) == NaN");
+}
+
+ATF_TC_BODY(asin_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	if (isnan(asin(x)) == 0)
+		atf_tc_fail_nonfatal("asin(+Inf) != NaN");
+}
+
+ATF_TC(asin_range);
+ATF_TC_HEAD(asin_range, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(x) == NaN, x < -1, x > 1");
+}
+
+ATF_TC_BODY(asin_range, tc)
+{
+	const double x[] = { -1.1, -1.000000001, 1.1, 1.000000001 };
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		if (isnan(asin(x[i])) == 0)
+			atf_tc_fail_nonfatal("asin(%f) != NaN", x[i]);
+	}
+}
+
+ATF_TC(asin_inrange);
+ATF_TC_HEAD(asin_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(x) for some values");
+}
+
+ATF_TC_BODY(asin_inrange, tc)
+{
+	const double eps = 1.0e-15;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		y = asin(values[i].x);
+		if (fabs(y - values[i].y) > eps)
+			atf_tc_fail_nonfatal("asin(%g) != %g",
+				values[i].x, values[i].y);
+	}
+}
+
+ATF_TC(asin_zero_neg);
+ATF_TC_HEAD(asin_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(asin_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = asin(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("asin(-0.0) != -0.0");
+}
+
+ATF_TC(asin_zero_pos);
+ATF_TC_HEAD(asin_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asin(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(asin_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = asin(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("asin(+0.0) != +0.0");
+}
+
+/*
+ * asinf(3)
+ */
+ATF_TC(asinf_nan);
+ATF_TC_HEAD(asinf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(NaN) == NaN");
+}
+
+ATF_TC_BODY(asinf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	if (isnan(asinf(x)) == 0)
+		atf_tc_fail_nonfatal("asinf(NaN) != NaN");
+}
+
+ATF_TC(asinf_inf_neg);
+ATF_TC_HEAD(asinf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(asinf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (isnan(asinf(x)) == 0)
+		atf_tc_fail_nonfatal("asinf(-Inf) != NaN");
+}
+
+ATF_TC(asinf_inf_pos);
+ATF_TC_HEAD(asinf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(+Inf) == NaN");
+}
+
+ATF_TC_BODY(asinf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	if (isnan(asinf(x)) == 0)
+		atf_tc_fail_nonfatal("asinf(+Inf) != NaN");
+}
+
+ATF_TC(asinf_range);
+ATF_TC_HEAD(asinf_range, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(x) == NaN, x < -1, x > 1");
+}
+
+ATF_TC_BODY(asinf_range, tc)
+{
+	const float x[] = { -1.1, -1.0000001, 1.1, 1.0000001 };
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		if (isnan(asinf(x[i])) == 0)
+			atf_tc_fail_nonfatal("asinf(%f) != NaN", x[i]);
+	}
+}
+
+ATF_TC(asinf_inrange);
+ATF_TC_HEAD(asinf_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(x) for some values");
+}
+
+ATF_TC_BODY(asinf_inrange, tc)
+{
+	const float eps = 1.0e-6;
+	float x;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		x = values[i].x;
+		y = values[i].y;
+		if (fabs(asinf(x) - y) > eps)
+			atf_tc_fail_nonfatal("asinf(%g) != %g", x, y);
+	}
+}
+
+ATF_TC(asinf_zero_neg);
+ATF_TC_HEAD(asinf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(asinf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = asinf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("asinf(-0.0) != -0.0");
+}
+
+ATF_TC(asinf_zero_pos);
+ATF_TC_HEAD(asinf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test asinf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(asinf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = asinf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("asinf(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, asin_nan);
+	ATF_TP_ADD_TC(tp, asin_inf_neg);
+	ATF_TP_ADD_TC(tp, asin_inf_pos);
+	ATF_TP_ADD_TC(tp, asin_range);
+	ATF_TP_ADD_TC(tp, asin_inrange);
+	ATF_TP_ADD_TC(tp, asin_zero_neg);
+	ATF_TP_ADD_TC(tp, asin_zero_pos);
+
+	ATF_TP_ADD_TC(tp, asinf_nan);
+	ATF_TP_ADD_TC(tp, asinf_inf_neg);
+	ATF_TP_ADD_TC(tp, asinf_inf_pos);
+	ATF_TP_ADD_TC(tp, asinf_range);
+	ATF_TP_ADD_TC(tp, asinf_inrange);
+	ATF_TP_ADD_TC(tp, asinf_zero_neg);
+	ATF_TP_ADD_TC(tp, asinf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_atan.c b/contrib/netbsd-tests/lib/libm/t_atan.c
new file mode 100644
index 000000000000..c3aa15f773c1
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_atan.c
@@ -0,0 +1,101 @@
+/* $NetBSD: t_atan.c,v 1.15 2014/03/17 11:08:11 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+#include "t_libm.h"
+
+static const struct {
+	double x;
+	double y;
+} values[] = {
+#ifndef __vax__
+	/* vax has no +/- INF */
+	{ T_LIBM_MINUS_INF, -M_PI / 2 },
+	{ T_LIBM_PLUS_INF,   M_PI / 2 },
+#endif
+	{ -100, -1.560796660108231, },
+	{  -10, -1.471127674303735, },
+	{   -1, -M_PI / 4, },
+	{ -0.1, -0.09966865249116204, },
+	{  0.1,  0.09966865249116204, },
+	{    1,  M_PI / 4, },
+	{   10,  1.471127674303735, },
+	{  100,  1.560796660108231, },
+};
+
+/*
+ * atan(3)
+ */
+ATF_LIBM_TEST(atan_nan, "Test atan/atanf(NaN) == NaN")
+{
+#ifdef T_LIBM_NAN
+	T_LIBM_CHECK_NAN(0, atan, T_LIBM_NAN);
+	T_LIBM_CHECK_NAN(0, atanf, T_LIBM_NAN);
+#else
+	atf_tc_skip("no NaN on this machine");
+#endif
+}
+
+ATF_LIBM_TEST(atan_inrange, "Test atan/atanf(x) for some values")
+{
+	unsigned int i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		T_LIBM_CHECK(i, atan, values[i].x, values[i].y, 1.0e-15);
+		T_LIBM_CHECK(i, atanf, values[i].x, values[i].y, 1.0e-7);
+	}
+}
+
+ATF_LIBM_TEST(atan_zero_neg, "Test atan/atanf(-0.0) == -0.0")
+{
+
+	T_LIBM_CHECK_MINUS_ZERO(0, atan, -0.0);
+	T_LIBM_CHECK_MINUS_ZERO(0, atanf, -0.0);
+}
+
+ATF_LIBM_TEST(atan_zero_pos, "Test atan/atanf(+0.0) == +0.0")
+{
+
+	T_LIBM_CHECK_PLUS_ZERO(0, atan, +0.0);
+	T_LIBM_CHECK_PLUS_ZERO(0, atanf, +0.0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, atan_nan);
+	ATF_TP_ADD_TC(tp, atan_inrange);
+	ATF_TP_ADD_TC(tp, atan_zero_neg);
+	ATF_TP_ADD_TC(tp, atan_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_cbrt.c b/contrib/netbsd-tests/lib/libm/t_cbrt.c
new file mode 100644
index 000000000000..a7de9f629815
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_cbrt.c
@@ -0,0 +1,366 @@
+/* $NetBSD: t_cbrt.c,v 1.3 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cbrt.c,v 1.3 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <stdio.h>
+
+/*
+ * cbrt(3)
+ */
+ATF_TC(cbrt_nan);
+ATF_TC_HEAD(cbrt_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(NaN) == NaN");
+}
+
+ATF_TC_BODY(cbrt_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cbrt(x)) != 0);
+}
+
+ATF_TC(cbrt_pow);
+ATF_TC_HEAD(cbrt_pow, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(3) vs. pow(3)");
+}
+
+ATF_TC_BODY(cbrt_pow, tc)
+{
+	const double x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.0 };
+	const double eps = 1.0e-14;
+	double y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = cbrt(x[i]);
+		z = pow(x[i], 1.0 / 3.0);
+
+		if (fabs(y - z) > eps)
+			atf_tc_fail_nonfatal("cbrt(%0.03f) != "
+			    "pow(%0.03f, 1/3)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(cbrt_inf_neg);
+ATF_TC_HEAD(cbrt_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(cbrt_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = cbrt(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) != 0);
+}
+
+ATF_TC(cbrt_inf_pos);
+ATF_TC_HEAD(cbrt_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(cbrt_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = cbrt(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(cbrt_zero_neg);
+ATF_TC_HEAD(cbrt_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(cbrt_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = cbrt(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("cbrt(-0.0) != -0.0");
+}
+
+ATF_TC(cbrt_zero_pos);
+ATF_TC_HEAD(cbrt_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrt(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(cbrt_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = cbrt(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("cbrt(+0.0) != +0.0");
+}
+
+/*
+ * cbrtf(3)
+ */
+ATF_TC(cbrtf_nan);
+ATF_TC_HEAD(cbrtf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(NaN) == NaN");
+}
+
+ATF_TC_BODY(cbrtf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cbrtf(x)) != 0);
+}
+
+ATF_TC(cbrtf_powf);
+ATF_TC_HEAD(cbrtf_powf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(3) vs. powf(3)");
+}
+
+ATF_TC_BODY(cbrtf_powf, tc)
+{
+	const float x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.0 };
+	const float eps = 1.0e-5;
+	float y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = cbrtf(x[i]);
+		z = powf(x[i], 1.0 / 3.0);
+
+		if (fabsf(y - z) > eps)
+			atf_tc_fail_nonfatal("cbrtf(%0.03f) != "
+			    "powf(%0.03f, 1/3)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(cbrtf_inf_neg);
+ATF_TC_HEAD(cbrtf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(cbrtf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = cbrtf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) != 0);
+}
+
+ATF_TC(cbrtf_inf_pos);
+ATF_TC_HEAD(cbrtf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(cbrtf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = cbrtf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(cbrtf_zero_neg);
+ATF_TC_HEAD(cbrtf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(cbrtf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = cbrtf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("cbrtf(-0.0) != -0.0");
+}
+
+ATF_TC(cbrtf_zero_pos);
+ATF_TC_HEAD(cbrtf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(cbrtf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = cbrtf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("cbrtf(+0.0) != +0.0");
+}
+
+/*
+ * cbrtl(3)
+ */
+ATF_TC(cbrtl_nan);
+ATF_TC_HEAD(cbrtl_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(NaN) == NaN");
+}
+
+ATF_TC_BODY(cbrtl_nan, tc)
+{
+	const long double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cbrtl(x)) != 0);
+}
+
+ATF_TC(cbrtl_powl);
+ATF_TC_HEAD(cbrtl_powl, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(3) vs. powl(3)");
+}
+
+ATF_TC_BODY(cbrtl_powl, tc)
+{
+	const long double x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.0 };
+	const long double eps = 1.0e-15;
+	long double y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = cbrtl(x[i]);
+		z = powl(x[i], 1.0 / 3.0);
+
+		if (fabsl(y - z) > eps * fabsl(1 + x[i]))
+			atf_tc_fail_nonfatal("cbrtl(%0.03Lf) != "
+			    "powl(%0.03Lf, 1/3)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(cbrtl_inf_neg);
+ATF_TC_HEAD(cbrtl_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(cbrtl_inf_neg, tc)
+{
+	const long double x = -1.0L / 0.0L;
+	long double y = cbrtl(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) != 0);
+}
+
+ATF_TC(cbrtl_inf_pos);
+ATF_TC_HEAD(cbrtl_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(cbrtl_inf_pos, tc)
+{
+	const long double x = 1.0L / 0.0L;
+	long double y = cbrtl(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(cbrtl_zero_neg);
+ATF_TC_HEAD(cbrtl_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(cbrtl_zero_neg, tc)
+{
+	const long double x = -0.0L;
+	long double y = cbrtl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("cbrtl(-0.0) != -0.0");
+}
+
+ATF_TC(cbrtl_zero_pos);
+ATF_TC_HEAD(cbrtl_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cbrtl(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(cbrtl_zero_pos, tc)
+{
+	const long double x = 0.0L;
+	long double y = cbrtl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("cbrtl(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cbrt_nan);
+	ATF_TP_ADD_TC(tp, cbrt_pow);
+	ATF_TP_ADD_TC(tp, cbrt_inf_neg);
+	ATF_TP_ADD_TC(tp, cbrt_inf_pos);
+	ATF_TP_ADD_TC(tp, cbrt_zero_neg);
+	ATF_TP_ADD_TC(tp, cbrt_zero_pos);
+
+	ATF_TP_ADD_TC(tp, cbrtf_nan);
+	ATF_TP_ADD_TC(tp, cbrtf_powf);
+	ATF_TP_ADD_TC(tp, cbrtf_inf_neg);
+	ATF_TP_ADD_TC(tp, cbrtf_inf_pos);
+	ATF_TP_ADD_TC(tp, cbrtf_zero_neg);
+	ATF_TP_ADD_TC(tp, cbrtf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, cbrtl_nan);
+	ATF_TP_ADD_TC(tp, cbrtl_powl);
+	ATF_TP_ADD_TC(tp, cbrtl_inf_neg);
+	ATF_TP_ADD_TC(tp, cbrtl_inf_pos);
+	ATF_TP_ADD_TC(tp, cbrtl_zero_neg);
+	ATF_TP_ADD_TC(tp, cbrtl_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_ceil.c b/contrib/netbsd-tests/lib/libm/t_ceil.c
new file mode 100644
index 000000000000..b57f30ebf8b2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_ceil.c
@@ -0,0 +1,931 @@
+/* $NetBSD: t_ceil.c,v 1.10 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ceil.c,v 1.10 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <limits.h>
+#include <stdio.h>
+
+#ifdef __vax__
+#define SMALL_NUM	1.0e-38
+#else
+#define SMALL_NUM	1.0e-40
+#endif
+
+/*
+ * ceil(3)
+ */
+ATF_TC(ceil_basic);
+ATF_TC_HEAD(ceil_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ceil(3)");
+}
+
+ATF_TC_BODY(ceil_basic, tc)
+{
+	const double x = 0.999999999999999;
+	const double y = 0.000000000000001;
+
+	ATF_CHECK(fabs(ceil(x) - 1) < SMALL_NUM);
+	ATF_CHECK(fabs(ceil(y) - 1) < SMALL_NUM);
+}
+
+ATF_TC(ceil_nan);
+ATF_TC_HEAD(ceil_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceil(NaN) == NaN");
+}
+
+ATF_TC_BODY(ceil_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(ceil(x)) != 0);
+}
+
+ATF_TC(ceil_inf_neg);
+ATF_TC_HEAD(ceil_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceil(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(ceil_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = ceil(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceil(-Inf) != -Inf");
+}
+
+ATF_TC(ceil_inf_pos);
+ATF_TC_HEAD(ceil_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceil(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(ceil_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = ceil(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceil(+Inf) != +Inf");
+}
+
+ATF_TC(ceil_zero_neg);
+ATF_TC_HEAD(ceil_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceil(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(ceil_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = ceil(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceil(-0.0) != -0.0");
+}
+
+ATF_TC(ceil_zero_pos);
+ATF_TC_HEAD(ceil_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceil(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(ceil_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = ceil(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceil(+0.0) != +0.0");
+}
+
+/*
+ * ceilf(3)
+ */
+ATF_TC(ceilf_basic);
+ATF_TC_HEAD(ceilf_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ceilf(3)");
+}
+
+ATF_TC_BODY(ceilf_basic, tc)
+{
+	const float x = 0.9999999;
+	const float y = 0.0000001;
+
+	ATF_CHECK(fabsf(ceilf(x) - 1) < SMALL_NUM);
+	ATF_CHECK(fabsf(ceilf(y) - 1) < SMALL_NUM);
+}
+
+ATF_TC(ceilf_nan);
+ATF_TC_HEAD(ceilf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceilf(NaN) == NaN");
+}
+
+ATF_TC_BODY(ceilf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(ceilf(x)) != 0);
+}
+
+ATF_TC(ceilf_inf_neg);
+ATF_TC_HEAD(ceilf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceilf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(ceilf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = ceilf(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceilf(-Inf) != -Inf");
+}
+
+ATF_TC(ceilf_inf_pos);
+ATF_TC_HEAD(ceilf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceilf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(ceilf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = ceilf(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceilf(+Inf) != +Inf");
+}
+
+ATF_TC(ceilf_zero_neg);
+ATF_TC_HEAD(ceilf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceilf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(ceilf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = ceilf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceilf(-0.0) != -0.0");
+}
+
+ATF_TC(ceilf_zero_pos);
+ATF_TC_HEAD(ceilf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceilf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(ceilf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = ceilf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceilf(+0.0) != +0.0");
+}
+
+/*
+ * ceill(3)
+ */
+ATF_TC(ceill_basic);
+ATF_TC_HEAD(ceill_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ceill(3)");
+}
+
+ATF_TC_BODY(ceill_basic, tc)
+{
+	const long double x = 0.9999999;
+	const long double y = 0.0000001;
+
+	ATF_CHECK(fabsl(ceill(x) - 1) < SMALL_NUM);
+	ATF_CHECK(fabsl(ceill(y) - 1) < SMALL_NUM);
+}
+
+ATF_TC(ceill_nan);
+ATF_TC_HEAD(ceill_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceill(NaN) == NaN");
+}
+
+ATF_TC_BODY(ceill_nan, tc)
+{
+	const long double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(ceill(x)) != 0);
+}
+
+ATF_TC(ceill_inf_neg);
+ATF_TC_HEAD(ceill_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceill(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(ceill_inf_neg, tc)
+{
+	const long double x = -1.0L / 0.0L;
+	long double y = ceill(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceill(-Inf) != -Inf");
+}
+
+ATF_TC(ceill_inf_pos);
+ATF_TC_HEAD(ceill_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceill(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(ceill_inf_pos, tc)
+{
+	const long double x = 1.0L / 0.0L;
+	long double y = ceill(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceill(+Inf) != +Inf");
+}
+
+ATF_TC(ceill_zero_neg);
+ATF_TC_HEAD(ceill_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceill(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(ceill_zero_neg, tc)
+{
+	const long double x = -0.0L;
+	long double y = ceill(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("ceill(-0.0) != -0.0");
+}
+
+ATF_TC(ceill_zero_pos);
+ATF_TC_HEAD(ceill_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ceill(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(ceill_zero_pos, tc)
+{
+	const long double x = 0.0L;
+	long double y = ceill(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("ceill(+0.0) != +0.0");
+}
+
+/*
+ * floor(3)
+ */
+ATF_TC(floor_basic);
+ATF_TC_HEAD(floor_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of floor(3)");
+}
+
+ATF_TC_BODY(floor_basic, tc)
+{
+	const double x = 0.999999999999999;
+	const double y = 0.000000000000001;
+
+	ATF_CHECK(floor(x) < SMALL_NUM);
+	ATF_CHECK(floor(y) < SMALL_NUM);
+}
+
+ATF_TC(floor_nan);
+ATF_TC_HEAD(floor_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floor(NaN) == NaN");
+}
+
+ATF_TC_BODY(floor_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(floor(x)) != 0);
+}
+
+ATF_TC(floor_inf_neg);
+ATF_TC_HEAD(floor_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floor(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(floor_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = floor(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floor(-Inf) != -Inf");
+}
+
+ATF_TC(floor_inf_pos);
+ATF_TC_HEAD(floor_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floor(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(floor_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = floor(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floor(+Inf) != +Inf");
+}
+
+ATF_TC(floor_zero_neg);
+ATF_TC_HEAD(floor_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floor(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(floor_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = floor(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floor(-0.0) != -0.0");
+}
+
+ATF_TC(floor_zero_pos);
+ATF_TC_HEAD(floor_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floor(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(floor_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = floor(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floor(+0.0) != +0.0");
+}
+
+/*
+ * floorf(3)
+ */
+ATF_TC(floorf_basic);
+ATF_TC_HEAD(floorf_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of floorf(3)");
+}
+
+ATF_TC_BODY(floorf_basic, tc)
+{
+	const float x = 0.9999999;
+	const float y = 0.0000001;
+
+	ATF_CHECK(floorf(x) < SMALL_NUM);
+	ATF_CHECK(floorf(y) < SMALL_NUM);
+}
+
+ATF_TC(floorf_nan);
+ATF_TC_HEAD(floorf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorf(NaN) == NaN");
+}
+
+ATF_TC_BODY(floorf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(floorf(x)) != 0);
+}
+
+ATF_TC(floorf_inf_neg);
+ATF_TC_HEAD(floorf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(floorf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = floorf(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floorf(-Inf) != -Inf");
+}
+
+ATF_TC(floorf_inf_pos);
+ATF_TC_HEAD(floorf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(floorf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = floorf(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floorf(+Inf) != +Inf");
+}
+
+ATF_TC(floorf_zero_neg);
+ATF_TC_HEAD(floorf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(floorf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = floorf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floorf(-0.0) != -0.0");
+}
+
+ATF_TC(floorf_zero_pos);
+ATF_TC_HEAD(floorf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(floorf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = floorf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floorf(+0.0) != +0.0");
+}
+
+/*
+ * floorl(3)
+ */
+ATF_TC(floorl_basic);
+ATF_TC_HEAD(floorl_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of floorl(3)");
+}
+
+ATF_TC_BODY(floorl_basic, tc)
+{
+	const long double x = 0.9999999;
+	const long double y = 0.0000001;
+
+	ATF_CHECK(floorl(x) < SMALL_NUM);
+	ATF_CHECK(floorl(y) < SMALL_NUM);
+}
+
+ATF_TC(floorl_nan);
+ATF_TC_HEAD(floorl_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorl(NaN) == NaN");
+}
+
+ATF_TC_BODY(floorl_nan, tc)
+{
+	const long double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(floorl(x)) != 0);
+}
+
+ATF_TC(floorl_inf_neg);
+ATF_TC_HEAD(floorl_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorl(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(floorl_inf_neg, tc)
+{
+	const long double x = -1.0L / 0.0L;
+	long double y = floorl(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floorl(-Inf) != -Inf");
+}
+
+ATF_TC(floorl_inf_pos);
+ATF_TC_HEAD(floorl_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorl(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(floorl_inf_pos, tc)
+{
+	const long double x = 1.0L / 0.0L;
+	long double y = floorl(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floorl(+Inf) != +Inf");
+}
+
+ATF_TC(floorl_zero_neg);
+ATF_TC_HEAD(floorl_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorl(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(floorl_zero_neg, tc)
+{
+	const long double x = -0.0L;
+	long double y = floorl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("floorl(-0.0) != -0.0");
+}
+
+ATF_TC(floorl_zero_pos);
+ATF_TC_HEAD(floorl_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test floorl(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(floorl_zero_pos, tc)
+{
+	const long double x = 0.0L;
+	long double y = floorl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("floorl(+0.0) != +0.0");
+}
+
+/*
+ * trunc(3)
+ */
+ATF_TC(trunc_basic);
+ATF_TC_HEAD(trunc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of trunc(3)");
+}
+
+ATF_TC_BODY(trunc_basic, tc)
+{
+	const double x = 0.999999999999999;
+	const double y = 0.000000000000001;
+
+	ATF_CHECK(trunc(x) < SMALL_NUM);
+	ATF_CHECK(trunc(y) < SMALL_NUM);
+}
+
+ATF_TC(trunc_nan);
+ATF_TC_HEAD(trunc_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test trunc(NaN) == NaN");
+}
+
+ATF_TC_BODY(trunc_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(trunc(x)) != 0);
+}
+
+ATF_TC(trunc_inf_neg);
+ATF_TC_HEAD(trunc_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test trunc(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(trunc_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = trunc(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("trunc(-Inf) != -Inf");
+}
+
+ATF_TC(trunc_inf_pos);
+ATF_TC_HEAD(trunc_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test trunc(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(trunc_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = trunc(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("trunc(+Inf) != +Inf");
+}
+
+ATF_TC(trunc_zero_neg);
+ATF_TC_HEAD(trunc_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test trunc(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(trunc_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = trunc(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("trunc(-0.0) != -0.0");
+}
+
+ATF_TC(trunc_zero_pos);
+ATF_TC_HEAD(trunc_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test trunc(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(trunc_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = trunc(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("trunc(+0.0) != +0.0");
+}
+
+/*
+ * truncf(3)
+ */
+ATF_TC(truncf_basic);
+ATF_TC_HEAD(truncf_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of truncf(3)");
+}
+
+ATF_TC_BODY(truncf_basic, tc)
+{
+	const float x = 0.9999999;
+	const float y = 0.0000001;
+
+	ATF_CHECK(truncf(x) < SMALL_NUM);
+	ATF_CHECK(truncf(y) < SMALL_NUM);
+}
+
+ATF_TC(truncf_nan);
+ATF_TC_HEAD(truncf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncf(NaN) == NaN");
+}
+
+ATF_TC_BODY(truncf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(truncf(x)) != 0);
+}
+
+ATF_TC(truncf_inf_neg);
+ATF_TC_HEAD(truncf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(truncf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = truncf(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("truncf(-Inf) != -Inf");
+}
+
+ATF_TC(truncf_inf_pos);
+ATF_TC_HEAD(truncf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(truncf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = truncf(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("truncf(+Inf) != +Inf");
+}
+
+ATF_TC(truncf_zero_neg);
+ATF_TC_HEAD(truncf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(truncf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = truncf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("truncf(-0.0) != -0.0");
+}
+
+ATF_TC(truncf_zero_pos);
+ATF_TC_HEAD(truncf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(truncf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = truncf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("truncf(+0.0) != +0.0");
+}
+
+/*
+ * truncl(3)
+ */
+ATF_TC(truncl_basic);
+ATF_TC_HEAD(truncl_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of truncl(3)");
+}
+
+ATF_TC_BODY(truncl_basic, tc)
+{
+	const long double x = 0.9999999;
+	const long double y = 0.0000001;
+
+	ATF_CHECK(truncl(x) < SMALL_NUM);
+	ATF_CHECK(truncl(y) < SMALL_NUM);
+}
+
+ATF_TC(truncl_nan);
+ATF_TC_HEAD(truncl_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncl(NaN) == NaN");
+}
+
+ATF_TC_BODY(truncl_nan, tc)
+{
+	const long double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(truncl(x)) != 0);
+}
+
+ATF_TC(truncl_inf_neg);
+ATF_TC_HEAD(truncl_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncl(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(truncl_inf_neg, tc)
+{
+	const long double x = -1.0L / 0.0L;
+	long double y = truncl(x);
+
+	if (isinf(y) == 0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("truncl(-Inf) != -Inf");
+}
+
+ATF_TC(truncl_inf_pos);
+ATF_TC_HEAD(truncl_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncl(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(truncl_inf_pos, tc)
+{
+	const long double x = 1.0L / 0.0L;
+	long double y = truncl(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("truncl(+Inf) != +Inf");
+}
+
+ATF_TC(truncl_zero_neg);
+ATF_TC_HEAD(truncl_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncl(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(truncl_zero_neg, tc)
+{
+	const long double x = -0.0L;
+	long double y = truncl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("truncl(-0.0) != -0.0");
+}
+
+ATF_TC(truncl_zero_pos);
+ATF_TC_HEAD(truncl_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test truncl(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(truncl_zero_pos, tc)
+{
+	const long double x = 0.0L;
+	long double y = truncl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("truncl(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ceil_basic);
+	ATF_TP_ADD_TC(tp, ceil_nan);
+	ATF_TP_ADD_TC(tp, ceil_inf_neg);
+	ATF_TP_ADD_TC(tp, ceil_inf_pos);
+	ATF_TP_ADD_TC(tp, ceil_zero_neg);
+	ATF_TP_ADD_TC(tp, ceil_zero_pos);
+
+	ATF_TP_ADD_TC(tp, ceilf_basic);
+	ATF_TP_ADD_TC(tp, ceilf_nan);
+	ATF_TP_ADD_TC(tp, ceilf_inf_neg);
+	ATF_TP_ADD_TC(tp, ceilf_inf_pos);
+	ATF_TP_ADD_TC(tp, ceilf_zero_neg);
+	ATF_TP_ADD_TC(tp, ceilf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, ceill_basic);
+	ATF_TP_ADD_TC(tp, ceill_nan);
+	ATF_TP_ADD_TC(tp, ceill_inf_neg);
+	ATF_TP_ADD_TC(tp, ceill_inf_pos);
+	ATF_TP_ADD_TC(tp, ceill_zero_neg);
+	ATF_TP_ADD_TC(tp, ceill_zero_pos);
+
+	ATF_TP_ADD_TC(tp, floor_basic);
+	ATF_TP_ADD_TC(tp, floor_nan);
+	ATF_TP_ADD_TC(tp, floor_inf_neg);
+	ATF_TP_ADD_TC(tp, floor_inf_pos);
+	ATF_TP_ADD_TC(tp, floor_zero_neg);
+	ATF_TP_ADD_TC(tp, floor_zero_pos);
+
+	ATF_TP_ADD_TC(tp, floorf_basic);
+	ATF_TP_ADD_TC(tp, floorf_nan);
+	ATF_TP_ADD_TC(tp, floorf_inf_neg);
+	ATF_TP_ADD_TC(tp, floorf_inf_pos);
+	ATF_TP_ADD_TC(tp, floorf_zero_neg);
+	ATF_TP_ADD_TC(tp, floorf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, floorl_basic);
+	ATF_TP_ADD_TC(tp, floorl_nan);
+	ATF_TP_ADD_TC(tp, floorl_inf_neg);
+	ATF_TP_ADD_TC(tp, floorl_inf_pos);
+	ATF_TP_ADD_TC(tp, floorl_zero_neg);
+	ATF_TP_ADD_TC(tp, floorl_zero_pos);
+
+	ATF_TP_ADD_TC(tp, trunc_basic);
+	ATF_TP_ADD_TC(tp, trunc_nan);
+	ATF_TP_ADD_TC(tp, trunc_inf_neg);
+	ATF_TP_ADD_TC(tp, trunc_inf_pos);
+	ATF_TP_ADD_TC(tp, trunc_zero_neg);
+	ATF_TP_ADD_TC(tp, trunc_zero_pos);
+
+	ATF_TP_ADD_TC(tp, truncf_basic);
+	ATF_TP_ADD_TC(tp, truncf_nan);
+	ATF_TP_ADD_TC(tp, truncf_inf_neg);
+	ATF_TP_ADD_TC(tp, truncf_inf_pos);
+	ATF_TP_ADD_TC(tp, truncf_zero_neg);
+	ATF_TP_ADD_TC(tp, truncf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, truncl_basic);
+	ATF_TP_ADD_TC(tp, truncl_nan);
+	ATF_TP_ADD_TC(tp, truncl_inf_neg);
+	ATF_TP_ADD_TC(tp, truncl_inf_pos);
+	ATF_TP_ADD_TC(tp, truncl_zero_neg);
+	ATF_TP_ADD_TC(tp, truncl_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_cos.c b/contrib/netbsd-tests/lib/libm/t_cos.c
new file mode 100644
index 000000000000..d99d60810eeb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_cos.c
@@ -0,0 +1,263 @@
+/* $NetBSD: t_cos.c,v 1.4 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+
+static const struct {
+	int		angle;
+	double		x;
+	double		y;
+} angles[] = {
+	{ -180, -3.141592653589793, -1.0000000000000000 },
+	{ -135, -2.356194490192345, -0.7071067811865476 },
+	{  -90, -1.570796326794897,  0.0000000000000000 },
+	{  -45, -0.785398163397448,  0.7071067811865476 },
+	{    0,  0.000000000000000,  1.0000000000000000 },
+	{   30,  0.523598775598299,  0.8660254037844386 },
+	{   45,  0.785398163397448,  0.7071067811865476 },
+	{   60,  1.047197551196598,  0.5000000000000000 },
+	{   90,  1.570796326794897,  0.0000000000000000 },
+	{  120,  2.094395102393195, -0.5000000000000000 },
+	{  135,  2.356194490192345, -0.7071067811865476 },
+	{  150,  2.617993877991494, -0.8660254037844386 },
+	{  180,  3.141592653589793, -1.0000000000000000 },
+	{  270,  4.712388980384690,  0.0000000000000000 },
+	{  360,  6.283185307179586,  1.0000000000000000 }
+};
+
+/*
+ * cos(3)
+ */
+ATF_TC(cos_angles);
+ATF_TC_HEAD(cos_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(cos_angles, tc)
+{
+	const double eps = 1.0e-15;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		if (fabs(cos(angles[i].x) - angles[i].y) > eps)
+			atf_tc_fail_nonfatal("cos(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(cos_nan);
+ATF_TC_HEAD(cos_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cos(NaN) == NaN");
+}
+
+ATF_TC_BODY(cos_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cos(x)) != 0);
+}
+
+ATF_TC(cos_inf_neg);
+ATF_TC_HEAD(cos_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cos(-Inf) == NaN");
+}
+
+ATF_TC_BODY(cos_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	ATF_CHECK(isnan(cos(x)) != 0);
+}
+
+ATF_TC(cos_inf_pos);
+ATF_TC_HEAD(cos_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cos(+Inf) == NaN");
+}
+
+ATF_TC_BODY(cos_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(isnan(cos(x)) != 0);
+}
+
+
+ATF_TC(cos_zero_neg);
+ATF_TC_HEAD(cos_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cos(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(cos_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(cos(x) == 1.0);
+}
+
+ATF_TC(cos_zero_pos);
+ATF_TC_HEAD(cos_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cos(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(cos_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(cos(x) == 1.0);
+}
+
+/*
+ * cosf(3)
+ */
+ATF_TC(cosf_angles);
+ATF_TC_HEAD(cosf_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(cosf_angles, tc)
+{
+	const float eps = 1.0e-7;
+	float x, y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		x = angles[i].x;
+		y = angles[i].y;
+
+		if (fabsf(cosf(x) - y) > eps)
+			atf_tc_fail_nonfatal("cosf(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(cosf_nan);
+ATF_TC_HEAD(cosf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosf(NaN) == NaN");
+}
+
+ATF_TC_BODY(cosf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cosf(x)) != 0);
+}
+
+ATF_TC(cosf_inf_neg);
+ATF_TC_HEAD(cosf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(cosf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (isnan(cosf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("cosf(-Inf) != NaN");
+	}
+}
+
+ATF_TC(cosf_inf_pos);
+ATF_TC_HEAD(cosf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosf(+Inf) == NaN");
+}
+
+ATF_TC_BODY(cosf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	if (isnan(cosf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("cosf(+Inf) != NaN");
+	}
+}
+
+
+ATF_TC(cosf_zero_neg);
+ATF_TC_HEAD(cosf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosf(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(cosf(x) == 1.0);
+}
+
+ATF_TC(cosf_zero_pos);
+ATF_TC_HEAD(cosf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosf(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(cosf(x) == 1.0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cos_angles);
+	ATF_TP_ADD_TC(tp, cos_nan);
+	ATF_TP_ADD_TC(tp, cos_inf_neg);
+	ATF_TP_ADD_TC(tp, cos_inf_pos);
+	ATF_TP_ADD_TC(tp, cos_zero_neg);
+	ATF_TP_ADD_TC(tp, cos_zero_pos);
+
+	ATF_TP_ADD_TC(tp, cosf_angles);
+	ATF_TP_ADD_TC(tp, cosf_nan);
+	ATF_TP_ADD_TC(tp, cosf_inf_neg);
+	ATF_TP_ADD_TC(tp, cosf_inf_pos);
+	ATF_TP_ADD_TC(tp, cosf_zero_neg);
+	ATF_TP_ADD_TC(tp, cosf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_cosh.c b/contrib/netbsd-tests/lib/libm/t_cosh.c
new file mode 100644
index 000000000000..3f998de761bb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_cosh.c
@@ -0,0 +1,270 @@
+/* $NetBSD: t_cosh.c,v 1.6 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cosh.c,v 1.6 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <stdio.h>
+
+static const struct {
+	double x;
+	double y;
+	double e;
+} values[] = {
+	{ -10,    11013.23292010332, 1e4, },
+	{ -2,     3.762195691083631, 1,   },
+	{ -1,     1.543080634815244, 1,   },
+	{ -0.05,  1.001250260438369, 1,   },
+	{ -0.001, 1.000000500000042, 1,   },
+	{  0,     1,                 1,   },
+	{  0.001, 1.000000500000042, 1,   },
+	{  0.05,  1.001250260438369, 1,   },
+	{  1,     1.543080634815244, 1,   },
+	{  2,     3.762195691083631, 1,   },
+	{  10,    11013.23292010332, 1e4, },
+};
+
+/*
+ * cosh(3)
+ */
+ATF_TC(cosh_inrange);
+ATF_TC_HEAD(cosh_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "cosh(x) for some values");
+}
+
+ATF_TC_BODY(cosh_inrange, tc)
+{
+	double eps;
+	double x;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		x = values[i].x;
+		y = values[i].y;
+		eps = 1e-15 * values[i].e;
+
+		if (fabs(cosh(x) - y) > eps)
+			atf_tc_fail_nonfatal("cosh(%g) != %g\n", x, y);
+	}
+}
+
+ATF_TC(cosh_nan);
+ATF_TC_HEAD(cosh_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosh(NaN) == NaN");
+}
+
+ATF_TC_BODY(cosh_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(cosh(x)) != 0);
+}
+
+ATF_TC(cosh_inf_neg);
+ATF_TC_HEAD(cosh_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosh(-Inf) == +Inf");
+}
+
+ATF_TC_BODY(cosh_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = cosh(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(cosh_inf_pos);
+ATF_TC_HEAD(cosh_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosh(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(cosh_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = cosh(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(cosh_zero_neg);
+ATF_TC_HEAD(cosh_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosh(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosh_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	if (cosh(x) != 1.0)
+		atf_tc_fail_nonfatal("cosh(-0.0) != 1.0");
+}
+
+ATF_TC(cosh_zero_pos);
+ATF_TC_HEAD(cosh_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test cosh(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(cosh_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	if (cosh(x) != 1.0)
+		atf_tc_fail_nonfatal("cosh(+0.0) != 1.0");
+}
+
+/*
+ * coshf(3)
+ */
+ATF_TC(coshf_inrange);
+ATF_TC_HEAD(coshf_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "coshf(x) for some values");
+}
+
+ATF_TC_BODY(coshf_inrange, tc)
+{
+	float eps;
+	float x;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		x = values[i].x;
+		y = values[i].y;
+		eps = 1e-6 * values[i].e;
+
+		if (fabsf(coshf(x) - y) > eps)
+			atf_tc_fail_nonfatal("coshf(%g) != %g\n", x, y);
+	}
+}
+
+ATF_TC(coshf_nan);
+ATF_TC_HEAD(coshf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coshf(NaN) == NaN");
+}
+
+ATF_TC_BODY(coshf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(coshf(x)) != 0);
+}
+
+ATF_TC(coshf_inf_neg);
+ATF_TC_HEAD(coshf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coshf(-Inf) == +Inf");
+}
+
+ATF_TC_BODY(coshf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = coshf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(coshf_inf_pos);
+ATF_TC_HEAD(coshf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coshf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(coshf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = coshf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(coshf_zero_neg);
+ATF_TC_HEAD(coshf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coshf(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(coshf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	if (coshf(x) != 1.0)
+		atf_tc_fail_nonfatal("coshf(-0.0) != 1.0");
+}
+
+ATF_TC(coshf_zero_pos);
+ATF_TC_HEAD(coshf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coshf(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(coshf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	if (coshf(x) != 1.0)
+		atf_tc_fail_nonfatal("coshf(+0.0) != 1.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cosh_inrange);
+	ATF_TP_ADD_TC(tp, cosh_nan);
+	ATF_TP_ADD_TC(tp, cosh_inf_neg);
+	ATF_TP_ADD_TC(tp, cosh_inf_pos);
+	ATF_TP_ADD_TC(tp, cosh_zero_neg);
+	ATF_TP_ADD_TC(tp, cosh_zero_pos);
+
+	ATF_TP_ADD_TC(tp, coshf_inrange);
+	ATF_TP_ADD_TC(tp, coshf_nan);
+	ATF_TP_ADD_TC(tp, coshf_inf_neg);
+	ATF_TP_ADD_TC(tp, coshf_inf_pos);
+	ATF_TP_ADD_TC(tp, coshf_zero_neg);
+	ATF_TP_ADD_TC(tp, coshf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_erf.c b/contrib/netbsd-tests/lib/libm/t_erf.c
new file mode 100644
index 000000000000..25bbae7834a8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_erf.c
@@ -0,0 +1,299 @@
+/* $NetBSD: t_erf.c,v 1.2 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_erf.c,v 1.2 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+
+/*
+ * erf(3)
+ */
+ATF_TC(erf_nan);
+ATF_TC_HEAD(erf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erf(NaN) == NaN");
+}
+
+ATF_TC_BODY(erf_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(erf(x)) != 0);
+}
+
+ATF_TC(erf_inf_neg);
+ATF_TC_HEAD(erf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erf(-Inf) == -1.0");
+}
+
+ATF_TC_BODY(erf_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	if (erf(x) != -1.0)
+		atf_tc_fail_nonfatal("erf(-Inf) != -1.0");
+}
+
+ATF_TC(erf_inf_pos);
+ATF_TC_HEAD(erf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erf(+Inf) == 1.0");
+}
+
+ATF_TC_BODY(erf_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	if (erf(x) != 1.0)
+		atf_tc_fail_nonfatal("erf(+Inf) != 1.0");
+}
+
+ATF_TC(erf_zero_neg);
+ATF_TC_HEAD(erf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(erf_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = erf(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("erf(-0.0) != -0.0");
+}
+
+ATF_TC(erf_zero_pos);
+ATF_TC_HEAD(erf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(erf_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = erf(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("erf(+0.0) != +0.0");
+}
+
+/*
+ * erff(3)
+ */
+ATF_TC(erff_nan);
+ATF_TC_HEAD(erff_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erff(NaN) == NaN");
+}
+
+ATF_TC_BODY(erff_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(erff(x)) != 0);
+}
+
+ATF_TC(erff_inf_neg);
+ATF_TC_HEAD(erff_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erff(-Inf) == -1.0");
+}
+
+ATF_TC_BODY(erff_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (erff(x) != -1.0)
+		atf_tc_fail_nonfatal("erff(-Inf) != -1.0");
+}
+
+ATF_TC(erff_inf_pos);
+ATF_TC_HEAD(erff_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erff(+Inf) == 1.0");
+}
+
+ATF_TC_BODY(erff_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	if (erff(x) != 1.0)
+		atf_tc_fail_nonfatal("erff(+Inf) != 1.0");
+}
+
+ATF_TC(erff_zero_neg);
+ATF_TC_HEAD(erff_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erff(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(erff_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = erff(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("erff(-0.0) != -0.0");
+}
+
+ATF_TC(erff_zero_pos);
+ATF_TC_HEAD(erff_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erff(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(erff_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = erff(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("erff(+0.0) != +0.0");
+}
+
+/*
+ * erfc(3)
+ */
+ATF_TC(erfc_nan);
+ATF_TC_HEAD(erfc_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfc(NaN) == NaN");
+}
+
+ATF_TC_BODY(erfc_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(erfc(x)) != 0);
+}
+
+ATF_TC(erfc_inf_neg);
+ATF_TC_HEAD(erfc_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfc(-Inf) == 2.0");
+}
+
+ATF_TC_BODY(erfc_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	if (erfc(x) != 2.0)
+		atf_tc_fail_nonfatal("erfc(-Inf) != 2.0");
+}
+
+ATF_TC(erfc_inf_pos);
+ATF_TC_HEAD(erfc_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfc(+Inf) == +0.0");
+}
+
+ATF_TC_BODY(erfc_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = erfc(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("erfc(+Inf) != +0.0");
+}
+
+/*
+ * erfcf(3)
+ */
+ATF_TC(erfcf_nan);
+ATF_TC_HEAD(erfcf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfcf(NaN) == NaN");
+}
+
+ATF_TC_BODY(erfcf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(erfcf(x)) != 0);
+}
+
+ATF_TC(erfcf_inf_neg);
+ATF_TC_HEAD(erfcf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfcf(-Inf) == 2.0");
+}
+
+ATF_TC_BODY(erfcf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (erfcf(x) != 2.0)
+		atf_tc_fail_nonfatal("erfcf(-Inf) != 2.0");
+}
+
+ATF_TC(erfcf_inf_pos);
+ATF_TC_HEAD(erfcf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test erfcf(+Inf) == +0.0");
+}
+
+ATF_TC_BODY(erfcf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = erfcf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("erfcf(+Inf) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, erf_nan);
+	ATF_TP_ADD_TC(tp, erf_inf_neg);
+	ATF_TP_ADD_TC(tp, erf_inf_pos);
+	ATF_TP_ADD_TC(tp, erf_zero_neg);
+	ATF_TP_ADD_TC(tp, erf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, erff_nan);
+	ATF_TP_ADD_TC(tp, erff_inf_neg);
+	ATF_TP_ADD_TC(tp, erff_inf_pos);
+	ATF_TP_ADD_TC(tp, erff_zero_neg);
+	ATF_TP_ADD_TC(tp, erff_zero_pos);
+
+	ATF_TP_ADD_TC(tp, erfc_nan);
+	ATF_TP_ADD_TC(tp, erfc_inf_neg);
+	ATF_TP_ADD_TC(tp, erfc_inf_pos);
+
+	ATF_TP_ADD_TC(tp, erfcf_nan);
+	ATF_TP_ADD_TC(tp, erfcf_inf_neg);
+	ATF_TP_ADD_TC(tp, erfcf_inf_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_exp.c b/contrib/netbsd-tests/lib/libm/t_exp.c
new file mode 100644
index 000000000000..6d410972d77c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_exp.c
@@ -0,0 +1,567 @@
+/* $NetBSD: t_exp.c,v 1.7 2014/03/17 11:08:11 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+#include "t_libm.h"
+
+/* y = exp(x) */
+static const struct {
+	double x;
+	double y;
+	double e;
+} exp_values[] = {
+	{  -10, 0.4539992976248485e-4, 1e-4, },
+	{   -5, 0.6737946999085467e-2, 1e-2, },
+	{   -1, 0.3678794411714423,    1e-1, },
+	{ -0.1, 0.9048374180359595,    1e-1, },
+	{    0, 1.0000000000000000,    1,    },
+	{  0.1, 1.1051709180756477,    1,    },
+	{    1, 2.7182818284590452,    1,    },
+	{    5, 148.41315910257660,    1e2, },
+	{   10, 22026.465794806718,    1e4, },
+};
+
+/*
+ * exp2/exp2f(3)
+ */
+ATF_LIBM_TEST(exp2_is_nan, "Test exp2(x) == NaN")
+{
+#ifdef T_LIBM_NAN
+	T_LIBM_CHECK_NAN(0, exp2, T_LIBM_NAN);
+	T_LIBM_CHECK_NAN(0, exp2f, T_LIBM_NAN);
+#else
+	atf_tc_skip("no NaN on this machine");
+#endif
+}
+
+ATF_LIBM_TEST(exp2_is_plus_zero, "Test exp2(x) == +0.0")
+{
+#ifdef T_LIBM_MINUS_INF
+	T_LIBM_CHECK_PLUS_ZERO(0, exp2, T_LIBM_MINUS_INF);
+	T_LIBM_CHECK_PLUS_ZERO(0, exp2f, T_LIBM_MINUS_INF);
+#else
+	atf_tc_skip("no +/-Inf on this machine");
+#endif
+}
+
+ATF_LIBM_TEST(exp2_powers, "Test exp2(x) is correct for some integer x")
+{
+	static const struct {
+		double	x;
+		double	d_y;
+		double	f_y;
+	} v[] = {
+	    { +0.0,	1.0,	1.0 },
+	    { -0.0,	1.0,	1.0 },
+	    {    1,	0x1p1,	0x1p1 },
+	    {    2,	0x1p2,	0x1p2 },
+	    {  100,	0x1p100,	0x1p100 },
+	    {  125,	0x1p125,	0x1p125 },
+	    {  126,	0x1p126,	0x1p126 },
+#if __DBL_MAX_EXP__ > 129
+	    {  127,	0x1p127,	0x1p127 },
+#endif
+#ifdef T_LIBM_PLUS_INF
+	    {  128,	0x1p128,	T_LIBM_PLUS_INF },
+	    {  129,	0x1p129,	T_LIBM_PLUS_INF },
+	    { 1000,	0x1p1000,	T_LIBM_PLUS_INF },
+	    { 1020,	0x1p1020,	T_LIBM_PLUS_INF },
+	    { 1023,	0x1p1023,	T_LIBM_PLUS_INF },
+	    { 1024,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 1030,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 1050,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 2000,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 16383,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 16384,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+	    { 16385,	T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF },
+#endif
+	    {   -1,	0x1p-1,	0x1p-1 },
+	    {   -2,	0x1p-2,	0x1p-2 },
+	    { -100,	0x1p-100,	0x1p-100 },
+	    { -127,	0x1p-127,	0x1p-127 },
+	    { -128,	0x1p-128,	0x1p-128 },
+#if __LDBL_MIN_EXP__ < -129
+	    { -300,	0x1p-300,	0.0},
+	    { -400,	0x1p-400,	0.0},
+	    {-1000,	0x1p-1000,	0.0},
+	    {-1022,	0x1p-1022,	0.0},
+	    /* These should be denormal numbers */
+	    {-1023,	0x1p-1023,	0.0},
+	    {-1024,	0x1p-1024,	0.0},
+	    {-1040,	0x1p-1040,	0.0},
+	    {-1060,	0x1p-1060,	0.0},
+	    /* This is the smallest result gcc will allow */
+	    {-1074,	0x1p-1074,	0.0},
+#endif
+	    {-1075,	0x0,	0.0},
+	    {-1080,	0x0,	0.0},
+	    {-2000,	0x0,	0.0},
+	    {-16382,	0x0,	0.0},
+	    {-16383,	0x0,	0.0},
+	    {-16384,	0x0,	0.0},
+	};
+	unsigned int i;
+
+	for (i = 0; i < __arraycount(v); i++) {
+		T_LIBM_CHECK(i, exp2, v[i].x, v[i].d_y, 0.0);
+		T_LIBM_CHECK(i, exp2f, v[i].x, v[i].f_y, 0.0);
+	}
+}
+
+ATF_LIBM_TEST(exp2_values, "Test exp2(x) is correct for some x")
+{
+	static const struct {
+		double	x;
+		double	y;
+		double	d_eps;
+		double	f_eps;
+	} v[] = {
+#if __DBL_MAX_EXP__ > 128
+	    /* The largest double constant */
+	    { 0x1.fffffffffffffp9,	0x1.ffffffffffd3ap1023,
+		0x1p969,	0.0 },
+	    /* The largest float constant */
+	    { 0x1.fffffep6,	0x1.ffff4ep+127,	6e30,	0.0 },
+#endif
+#ifdef T_LIBM_PLUS_INF
+	    { T_LIBM_PLUS_INF,	T_LIBM_PLUS_INF,	0.0,	0.0 },
+#endif
+
+	    /* The few values from the old tests */
+	    /* Results from i386/amd64, d_eps needed on i386 */
+	    {  1.1,	0x1.125fbee250664p+1,	0x1p-52,	0x1.8p-22 },
+	    {  2.2,	0x1.2611186bae675p+2,	0x1p-51,	0x1.8p-21 },
+	    {  3.3,	0x1.3b2c47bff8328p+3,	0x1p-50,	0x1.8p-20 },
+	    {  4.4,	0x1.51cb453b9536ep+4,	0x1p-49,	0x1.8p-19 },
+	    {  5.5,	0x1.6a09e667f3bcdp+5,	0x1p-48,	0x1.8p-18 },
+	    {  6.6,	0x1.8406003b2ae5bp+6,	0x1p-47,	0x1.8p-17 },
+	    /*
+	     * These two currently fail for 'float'.
+	     * 8.8 is definitely out by more than it should be.
+	     */
+	    {  7.7,	0x1.9fdf8bcce533ep+7,	0x1p-46,	0x1.8p-16 },
+	    {  8.8,	0x1.bdb8cdadbe124p+8,	0x1p-45,	0x1.8p-15 },
+	};
+	unsigned int i;
+
+	for (i = 0; i < __arraycount(v); i++) {
+		T_LIBM_CHECK(i, exp2, v[i].x, v[i].y, v[i].d_eps);
+		if (i > 1)
+			T_LIBM_CHECK(i, exp2f, v[i].x, v[i].y, v[i].f_eps);
+	}
+}
+
+
+/*
+ * exp(3)
+ */
+ATF_TC(exp_nan);
+ATF_TC_HEAD(exp_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exp(NaN) == NaN");
+}
+
+ATF_TC_BODY(exp_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	if (isnan(exp(x)) == 0)
+		atf_tc_fail_nonfatal("exp(NaN) != NaN");
+}
+
+ATF_TC(exp_inf_neg);
+ATF_TC_HEAD(exp_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exp(-Inf) == +0.0");
+}
+
+ATF_TC_BODY(exp_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = exp(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("exp(-Inf) != +0.0");
+}
+
+ATF_TC(exp_inf_pos);
+ATF_TC_HEAD(exp_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exp(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(exp_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = exp(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("exp(+Inf) != +Inf");
+}
+
+ATF_TC(exp_product);
+ATF_TC_HEAD(exp_product, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected exp(x)");
+}
+
+ATF_TC_BODY(exp_product, tc)
+{
+	double eps;
+	double x;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exp_values); i++) {
+		x = exp_values[i].x;
+		y = exp_values[i].y;
+		eps = 1e-15 * exp_values[i].e;
+
+		if (fabs(exp(x) - y) > eps)
+			atf_tc_fail_nonfatal("exp(%0.01f) != %18.18e", x, y);
+	}
+}
+
+ATF_TC(exp_zero_neg);
+ATF_TC_HEAD(exp_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exp(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(exp_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	if (fabs(exp(x) - 1.0) > 0.0)
+		atf_tc_fail_nonfatal("exp(-0.0) != 1.0");
+}
+
+ATF_TC(exp_zero_pos);
+ATF_TC_HEAD(exp_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test exp(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(exp_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	if (fabs(exp(x) - 1.0) > 0.0)
+		atf_tc_fail_nonfatal("exp(+0.0) != 1.0");
+}
+
+/*
+ * expf(3)
+ */
+ATF_TC(expf_nan);
+ATF_TC_HEAD(expf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expf(NaN) == NaN");
+}
+
+ATF_TC_BODY(expf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	if (isnan(expf(x)) == 0)
+		atf_tc_fail_nonfatal("expf(NaN) != NaN");
+}
+
+ATF_TC(expf_inf_neg);
+ATF_TC_HEAD(expf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expf(-Inf) == +0.0");
+}
+
+ATF_TC_BODY(expf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = expf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expf(-Inf) != +0.0");
+}
+
+ATF_TC(expf_inf_pos);
+ATF_TC_HEAD(expf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(expf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = expf(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expf(+Inf) != +Inf");
+}
+
+ATF_TC(expf_product);
+ATF_TC_HEAD(expf_product, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected expf(x)");
+}
+
+ATF_TC_BODY(expf_product, tc)
+{
+	float eps;
+	float x;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exp_values); i++) {
+		x = exp_values[i].x;
+		y = exp_values[i].y;
+		eps = 1e-6 * exp_values[i].e;
+
+		if (fabsf(expf(x) - y) > eps)
+			atf_tc_fail_nonfatal("expf(%0.01f) != %18.18e", x, y);
+	}
+}
+
+ATF_TC(expf_zero_neg);
+ATF_TC_HEAD(expf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expf(-0.0) == 1.0");
+}
+
+ATF_TC_BODY(expf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	if (fabsf(expf(x) - 1.0f) > 0.0)
+		atf_tc_fail_nonfatal("expf(-0.0) != 1.0");
+}
+
+ATF_TC(expf_zero_pos);
+ATF_TC_HEAD(expf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expf(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(expf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	if (fabsf(expf(x) - 1.0f) > 0.0)
+		atf_tc_fail_nonfatal("expf(+0.0) != 1.0");
+}
+
+/*
+ * expm1(3)
+ */
+ATF_TC(expm1_nan);
+ATF_TC_HEAD(expm1_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1(NaN) == NaN");
+}
+
+ATF_TC_BODY(expm1_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	if (isnan(expm1(x)) == 0)
+		atf_tc_fail_nonfatal("expm1(NaN) != NaN");
+}
+
+ATF_TC(expm1_inf_neg);
+ATF_TC_HEAD(expm1_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1(-Inf) == -1");
+}
+
+ATF_TC_BODY(expm1_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	if (expm1(x) != -1.0)
+		atf_tc_fail_nonfatal("expm1(-Inf) != -1.0");
+}
+
+ATF_TC(expm1_inf_pos);
+ATF_TC_HEAD(expm1_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(expm1_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = expm1(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expm1(+Inf) != +Inf");
+}
+
+ATF_TC(expm1_zero_neg);
+ATF_TC_HEAD(expm1_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(expm1_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = expm1(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("expm1(-0.0) != -0.0");
+}
+
+ATF_TC(expm1_zero_pos);
+ATF_TC_HEAD(expm1_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(expm1_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = expm1(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expm1(+0.0) != +0.0");
+}
+
+/*
+ * expm1f(3)
+ */
+ATF_TC(expm1f_nan);
+ATF_TC_HEAD(expm1f_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1f(NaN) == NaN");
+}
+
+ATF_TC_BODY(expm1f_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	if (isnan(expm1f(x)) == 0)
+		atf_tc_fail_nonfatal("expm1f(NaN) != NaN");
+}
+
+ATF_TC(expm1f_inf_neg);
+ATF_TC_HEAD(expm1f_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1f(-Inf) == -1");
+}
+
+ATF_TC_BODY(expm1f_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (expm1f(x) != -1.0)
+		atf_tc_fail_nonfatal("expm1f(-Inf) != -1.0");
+}
+
+ATF_TC(expm1f_inf_pos);
+ATF_TC_HEAD(expm1f_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1f(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(expm1f_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = expm1f(x);
+
+	if (isinf(y) == 0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expm1f(+Inf) != +Inf");
+}
+
+ATF_TC(expm1f_zero_neg);
+ATF_TC_HEAD(expm1f_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1f(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(expm1f_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = expm1f(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("expm1f(-0.0) != -0.0");
+}
+
+ATF_TC(expm1f_zero_pos);
+ATF_TC_HEAD(expm1f_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test expm1f(+0.0) == 1.0");
+}
+
+ATF_TC_BODY(expm1f_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = expm1f(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("expm1f(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, exp2_is_nan);
+	ATF_TP_ADD_TC(tp, exp2_is_plus_zero);
+	ATF_TP_ADD_TC(tp, exp2_values);
+	ATF_TP_ADD_TC(tp, exp2_powers);
+
+	ATF_TP_ADD_TC(tp, exp_nan);
+	ATF_TP_ADD_TC(tp, exp_inf_neg);
+	ATF_TP_ADD_TC(tp, exp_inf_pos);
+	ATF_TP_ADD_TC(tp, exp_product);
+	ATF_TP_ADD_TC(tp, exp_zero_neg);
+	ATF_TP_ADD_TC(tp, exp_zero_pos);
+
+	ATF_TP_ADD_TC(tp, expf_nan);
+	ATF_TP_ADD_TC(tp, expf_inf_neg);
+	ATF_TP_ADD_TC(tp, expf_inf_pos);
+	ATF_TP_ADD_TC(tp, expf_product);
+	ATF_TP_ADD_TC(tp, expf_zero_neg);
+	ATF_TP_ADD_TC(tp, expf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, expm1_nan);
+	ATF_TP_ADD_TC(tp, expm1_inf_neg);
+	ATF_TP_ADD_TC(tp, expm1_inf_pos);
+	ATF_TP_ADD_TC(tp, expm1_zero_neg);
+	ATF_TP_ADD_TC(tp, expm1_zero_pos);
+
+	ATF_TP_ADD_TC(tp, expm1f_nan);
+	ATF_TP_ADD_TC(tp, expm1f_inf_neg);
+	ATF_TP_ADD_TC(tp, expm1f_inf_pos);
+	ATF_TP_ADD_TC(tp, expm1f_zero_neg);
+	ATF_TP_ADD_TC(tp, expm1f_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_fmod.c b/contrib/netbsd-tests/lib/libm/t_fmod.c
new file mode 100644
index 000000000000..7dac93deae52
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_fmod.c
@@ -0,0 +1,63 @@
+/* $NetBSD: t_fmod.c,v 1.2 2014/02/27 17:26:02 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <float.h>
+#include <math.h>
+
+ATF_TC(fmod);
+ATF_TC_HEAD(fmod, tc)
+{
+	atf_tc_set_md_var(tc, "descr","Check fmod family");
+}
+
+ATF_TC_BODY(fmod, tc)
+{
+	ATF_CHECK(fmodf(2.0, 1.0) == 0);
+	ATF_CHECK(fmod(2.0, 1.0) == 0);
+	ATF_CHECK(fmodl(2.0, 1.0) == 0);
+
+	ATF_CHECK(fmodf(2.0, 0.5) == 0);
+	ATF_CHECK(fmod(2.0, 0.5) == 0);
+	ATF_CHECK(fmodl(2.0, 0.5) == 0);
+
+	ATF_CHECK(fabsf(fmodf(1.0, 0.1) - 0.1f) <= 55 * FLT_EPSILON);
+	ATF_CHECK(fabs(fmod(1.0, 0.1) - 0.1) <= 55 * DBL_EPSILON);
+	ATF_CHECK(fabsl(fmodl(1.0, 0.1L) - 0.1L) <= 55 * LDBL_EPSILON);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fmod);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_infinity.c b/contrib/netbsd-tests/lib/libm/t_infinity.c
new file mode 100644
index 000000000000..7ac17370799c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_infinity.c
@@ -0,0 +1,119 @@
+/* $NetBSD: t_infinity.c,v 1.6 2012/09/26 07:24:38 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann <martin@NetBSD.org>.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_infinity.c,v 1.6 2012/09/26 07:24:38 jruoho Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <float.h>
+#include <stdlib.h>
+
+ATF_TC(infinity_float);
+ATF_TC_HEAD(infinity_float, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	     "check FPU generated infinite float values");
+}
+
+ATF_TC_BODY(infinity_float, tc)
+{
+	float v;
+
+	v = FLT_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+	v = -FLT_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+}
+
+ATF_TC(infinity_double);
+ATF_TC_HEAD(infinity_double, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	     "check FPU generated infinite double values");
+}
+
+ATF_TC_BODY(infinity_double, tc)
+{
+	double v;
+
+	v = DBL_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+	v = -DBL_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+}
+
+ATF_TC(infinity_long_double);
+ATF_TC_HEAD(infinity_long_double, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	     "check FPU generated infinite long double values");
+}
+
+ATF_TC_BODY(infinity_long_double, tc)
+{
+
+#ifndef LDBL_MAX
+	atf_tc_skip("no long double support on this architecture");
+	return;
+#else
+	long double v;
+
+	v = LDBL_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+
+	v = -LDBL_MAX;
+	v *= v;
+	ATF_REQUIRE(isinf(v));
+	ATF_REQUIRE(fpclassify(v) == FP_INFINITE);
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, infinity_float);
+	ATF_TP_ADD_TC(tp, infinity_double);
+	ATF_TP_ADD_TC(tp, infinity_long_double);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_ldexp.c b/contrib/netbsd-tests/lib/libm/t_ldexp.c
new file mode 100644
index 000000000000..9dd001d413fe
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_ldexp.c
@@ -0,0 +1,481 @@
+/* $NetBSD: t_ldexp.c,v 1.13 2014/03/12 21:40:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ldexp.c,v 1.13 2014/03/12 21:40:07 martin Exp $");
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <math.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+#define SKIP	9999
+#define FORMAT  "%23.23lg"
+
+static const int exps[] = { 0, 1, -1, 100, -100 };
+
+struct ldexp_test {
+	double	    x;
+	int	    exp1;
+	int	    exp2;
+	const char *result;
+};
+
+struct ldexp_test ldexp_basic[] = {
+	{ 1.0,	5,	SKIP,	"                     32" },
+	{ 1.0,	1022,	SKIP,	"4.4942328371557897693233e+307" },
+	{ 1.0,	1023,	-1,	"4.4942328371557897693233e+307" },
+	{ 1.0,	1023,	SKIP,	"8.9884656743115795386465e+307" },
+	{ 1.0,	1022,	1,	"8.9884656743115795386465e+307" },
+	{ 1.0,	-1022,	2045,	"8.9884656743115795386465e+307" },
+	{ 1.0,	-5,	SKIP,	"                0.03125" },
+	{ 1.0,	-1021,	SKIP,	"4.4501477170144027661805e-308" },
+	{ 1.0,	-1022,	1,	"4.4501477170144027661805e-308" },
+	{ 1.0,	-1022,	SKIP,	"2.2250738585072013830902e-308" },
+	{ 1.0,	-1021,	-1,	"2.2250738585072013830902e-308" },
+	{ 1.0,	1023,	-2045,	"2.2250738585072013830902e-308" },
+	{ 1.0,	1023,	-1023,	"                      1" },
+	{ 1.0,	-1022,	1022,	"                      1" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_zero[] = {
+	{ 0.0,	-1,	SKIP,	"                      0" },
+	{ 0.0,	0,	SKIP,	"                      0" },
+	{ 0.0,	1,	SKIP,	"                      0" },
+	{ 0.0,	1024,	SKIP,	"                      0" },
+	{ 0.0,	1025,	SKIP,	"                      0" },
+	{ 0.0,	-1023,	SKIP,	"                      0" },
+	{ 0.0,	-1024,	SKIP,	"                      0" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_infinity[] = {
+	{ 1.0,	1024,	-1,	"                    inf" },
+	{ 1.0,	1024,	0,	"                    inf" },
+	{ 1.0,	1024,	1,	"                    inf" },
+	{ -1.0,	1024,	-1,	"                   -inf" },
+	{ -1.0,	1024,	0,	"                   -inf" },
+	{ -1.0,	1024,	1,	"                   -inf" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_overflow[] = {
+	{ 1.0,	1024,	SKIP,	"                    inf" },
+	{ 1.0,	1023,	1,	"                    inf" },
+	{ 1.0,	-1022,	2046,	"                    inf" },
+	{ 1.0,	1025,	SKIP,	"                    inf" },
+	{ -1.0,	1024,	SKIP,	"                   -inf" },
+	{ -1.0,	1023,	1,	"                   -inf" },
+	{ -1.0,	-1022,	2046,	"                   -inf" },
+	{ -1.0,	1025,	SKIP,	"                   -inf" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_denormal[] = {
+	{ 1.0,	-1023,	SKIP,	"1.1125369292536006915451e-308" },
+	{ 1.0,	-1022,	-1,	"1.1125369292536006915451e-308" },
+	{ 1.0,	1023,	-2046,	"1.1125369292536006915451e-308" },
+	{ 1.0,	-1024,	SKIP,	"5.5626846462680034577256e-309" },
+	{ 1.0,	-1074,	SKIP,	"4.9406564584124654417657e-324" },
+	{ -1.0,	-1023,	SKIP,	"-1.1125369292536006915451e-308" },
+	{ -1.0,	-1022,	-1,	"-1.1125369292536006915451e-308" },
+	{ -1.0,	1023,	-2046,	"-1.1125369292536006915451e-308" },
+	{ -1.0,	-1024,	SKIP,	"-5.5626846462680034577256e-309" },
+	{ -1.0,	-1074,	SKIP,	"-4.9406564584124654417657e-324" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_underflow[] = {
+	{ 1.0,	-1075,	SKIP,	"                      0" },
+	{ 1.0,	-1074,	-1,	"                      0" },
+	{ 1.0,	1023,	-2098,	"                      0" },
+	{ 1.0,	-1076,	SKIP,	"                      0" },
+	{ -1.0,	-1075,	SKIP,	"                     -0" },
+	{ -1.0,	-1074,	-1,	"                     -0" },
+	{ -1.0,	1023,	-2098,	"                     -0" },
+	{ -1.0,	-1076,	SKIP,	"                     -0" },
+	{ 0,	0,	0,	NULL }
+};
+
+struct ldexp_test ldexp_denormal_large[] = {
+	{ 1.0,	-1028,	1024,	"                 0.0625" },
+	{ 1.0,	-1028,	1025,	"                  0.125" },
+	{ 1.0,	-1028,	1026,	"                   0.25" },
+	{ 1.0,	-1028,	1027,	"                    0.5" },
+	{ 1.0,	-1028,	1028,	"                      1" },
+	{ 1.0,	-1028,	1029,	"                      2" },
+	{ 1.0,	-1028,	1030,	"                      4" },
+	{ 1.0,	-1028,	1040,	"                   4096" },
+	{ 1.0,	-1028,	1050,	"                4194304" },
+	{ 1.0,	-1028,	1060,	"             4294967296" },
+	{ 1.0,	-1028,	1100,	" 4722366482869645213696" },
+	{ 1.0,	-1028,	1200,	"5.9863107065073783529623e+51" },
+	{ 1.0,	-1028,	1300,	"7.5885503602567541832791e+81" },
+	{ 1.0,	-1028,	1400,	"9.6196304190416209014353e+111" },
+	{ 1.0,	-1028,	1500,	"1.2194330274671844653834e+142" },
+	{ 1.0,	-1028,	1600,	"1.5458150092069033378781e+172" },
+	{ 1.0,	-1028,	1700,	"1.9595533242629369747791e+202" },
+	{ 1.0,	-1028,	1800,	"2.4840289476811342962384e+232" },
+	{ 1.0,	-1028,	1900,	"3.1488807865122869393369e+262" },
+	{ 1.0,	-1028,	2000,	"3.9916806190694396233127e+292" },
+	{ 1.0,	-1028,	2046,	"2.808895523222368605827e+306" },
+	{ 1.0,	-1028,	2047,	"5.6177910464447372116541e+306" },
+	{ 1.0,	-1028,	2048,	"1.1235582092889474423308e+307" },
+	{ 1.0,	-1028,	2049,	"2.2471164185778948846616e+307" },
+	{ 1.0,	-1028,	2050,	"4.4942328371557897693233e+307" },
+	{ 1.0,	-1028,	2051,	"8.9884656743115795386465e+307" },
+	{ 0,	0,	0,	NULL }
+};
+
+static void
+run_test(struct ldexp_test *table)
+{
+	char outbuf[64];
+	size_t i;
+	double v;
+
+	for (i = 0; table->result != NULL; table++, i++) {
+
+		v = ldexp(table->x, table->exp1);
+
+		if (table->exp2 == SKIP)
+			continue;
+
+		v = ldexp(v, table->exp2);
+
+		(void)snprintf(outbuf, sizeof(outbuf), FORMAT, v);
+
+		ATF_CHECK_STREQ_MSG(table->result, outbuf,
+			    "Entry %zu:\n\tExp: \"%s\"\n\tAct: \"%s\"",
+			    i, table->result, outbuf);
+	}
+}
+
+/*
+ * ldexp(3)
+ */
+ATF_TC(ldexp_exp2);
+ATF_TC_HEAD(ldexp_exp2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(x, n) == x * exp2(n)");
+}
+
+ATF_TC_BODY(ldexp_exp2, tc)
+{
+	const double n[] = { 1, 2, 3, 10, 50, 100 };
+#if __DBL_MIN_10_EXP__ <= -40
+	const double eps = 1.0e-40;
+#else
+	const double eps = __DBL_MIN__*4.0;
+#endif
+	const double x = 12.0;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(n); i++) {
+
+		y = ldexp(x, n[i]);
+
+		if (fabs(y - (x * exp2(n[i]))) > eps) {
+			atf_tc_fail_nonfatal("ldexp(%0.01f, %0.01f) "
+			    "!= %0.01f * exp2(%0.01f)", x, n[i], x, n[i]);
+		}
+	}
+}
+
+ATF_TC(ldexp_nan);
+ATF_TC_HEAD(ldexp_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(NaN) == NaN");
+}
+
+ATF_TC_BODY(ldexp_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(isnan(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexp(x, exps[i]);
+		ATF_CHECK(isnan(y) != 0);
+	}
+}
+
+ATF_TC(ldexp_inf_neg);
+ATF_TC_HEAD(ldexp_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(ldexp_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(ldexp(x, exps[i]) == x);
+}
+
+ATF_TC(ldexp_inf_pos);
+ATF_TC_HEAD(ldexp_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(ldexp_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(ldexp(x, exps[i]) == x);
+}
+
+ATF_TC(ldexp_zero_neg);
+ATF_TC_HEAD(ldexp_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(ldexp_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexp(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) != 0);
+	}
+}
+
+ATF_TC(ldexp_zero_pos);
+ATF_TC_HEAD(ldexp_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexp(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(ldexp_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) == 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexp(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) == 0);
+	}
+}
+
+/*
+ * ldexpf(3)
+ */
+
+ATF_TC(ldexpf_exp2f);
+ATF_TC_HEAD(ldexpf_exp2f, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(x, n) == x * exp2f(n)");
+}
+
+ATF_TC_BODY(ldexpf_exp2f, tc)
+{
+	const float n[] = { 1, 2, 3, 10, 50, 100 };
+	const float eps = 1.0e-9;
+	const float x = 12.0;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(n); i++) {
+
+		y = ldexpf(x, n[i]);
+
+		if (fabsf(y - (x * exp2f(n[i]))) > eps) {
+			atf_tc_fail_nonfatal("ldexpf(%0.01f, %0.01f) "
+			    "!= %0.01f * exp2f(%0.01f)", x, n[i], x, n[i]);
+		}
+	}
+}
+
+ATF_TC(ldexpf_nan);
+ATF_TC_HEAD(ldexpf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(NaN) == NaN");
+}
+
+ATF_TC_BODY(ldexpf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(isnan(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexpf(x, exps[i]);
+		ATF_CHECK(isnan(y) != 0);
+	}
+}
+
+ATF_TC(ldexpf_inf_neg);
+ATF_TC_HEAD(ldexpf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(ldexpf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(ldexpf(x, exps[i]) == x);
+}
+
+ATF_TC(ldexpf_inf_pos);
+ATF_TC_HEAD(ldexpf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(ldexpf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(ldexpf(x, exps[i]) == x);
+}
+
+ATF_TC(ldexpf_zero_neg);
+ATF_TC_HEAD(ldexpf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(ldexpf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexpf(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) != 0);
+	}
+}
+
+ATF_TC(ldexpf_zero_pos);
+ATF_TC_HEAD(ldexpf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test ldexpf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(ldexpf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) == 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = ldexpf(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) == 0);
+	}
+}
+
+#define TEST(name, desc)						\
+	ATF_TC(name);							\
+	ATF_TC_HEAD(name, tc)						\
+	{								\
+									\
+		atf_tc_set_md_var(tc, "descr",				\
+		    "Test ldexp(3) for " ___STRING(desc));		\
+	}								\
+	ATF_TC_BODY(name, tc)						\
+	{								\
+		if (strcmp("vax", MACHINE_ARCH) == 0)			\
+			atf_tc_skip("Test not valid for " MACHINE_ARCH); \
+		run_test(name);						\
+	}
+
+TEST(ldexp_basic, basics)
+TEST(ldexp_zero, zero)
+TEST(ldexp_infinity, infinity)
+TEST(ldexp_overflow, overflow)
+TEST(ldexp_denormal, denormal)
+TEST(ldexp_denormal_large, large)
+TEST(ldexp_underflow, underflow)
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, ldexp_basic);
+	ATF_TP_ADD_TC(tp, ldexp_zero);
+	ATF_TP_ADD_TC(tp, ldexp_infinity);
+	ATF_TP_ADD_TC(tp, ldexp_overflow);
+	ATF_TP_ADD_TC(tp, ldexp_denormal);
+	ATF_TP_ADD_TC(tp, ldexp_underflow);
+	ATF_TP_ADD_TC(tp, ldexp_denormal_large);
+
+	ATF_TP_ADD_TC(tp, ldexp_exp2);
+	ATF_TP_ADD_TC(tp, ldexp_nan);
+	ATF_TP_ADD_TC(tp, ldexp_inf_neg);
+	ATF_TP_ADD_TC(tp, ldexp_inf_pos);
+	ATF_TP_ADD_TC(tp, ldexp_zero_neg);
+	ATF_TP_ADD_TC(tp, ldexp_zero_pos);
+
+	ATF_TP_ADD_TC(tp, ldexpf_exp2f);
+	ATF_TP_ADD_TC(tp, ldexpf_nan);
+	ATF_TP_ADD_TC(tp, ldexpf_inf_neg);
+	ATF_TP_ADD_TC(tp, ldexpf_inf_pos);
+	ATF_TP_ADD_TC(tp, ldexpf_zero_neg);
+	ATF_TP_ADD_TC(tp, ldexpf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_libm.h b/contrib/netbsd-tests/lib/libm/t_libm.h
new file mode 100644
index 000000000000..34e3cb28abf5
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_libm.h
@@ -0,0 +1,62 @@
+/* $NetBSD: t_libm.h,v 1.6 2014/03/25 17:30:14 joerg Exp $ */
+
+/*
+ * Check result of fn(arg) is correct within the bounds.
+ * Should be ok to do the checks using 'double' for 'float' functions.
+ * On i386 float and double values are returned on the x87 stack and might
+ * be out of range for the function - so save and print as 'long double'.
+ * (otherwise you can get 'inf != inf' reported!)
+ */
+#define T_LIBM_CHECK(subtest, fn, arg, expect_, epsilon_) do { \
+	long double epsilon = epsilon_; \
+	long double expect = expect_; \
+	long double r = fn(arg); \
+	long double e = fabsl(r - expect); \
+	if (r != expect && e > epsilon) \
+		atf_tc_fail_nonfatal( \
+		    "subtest %u: " #fn "(%g) is %Lg (%.14La) " \
+		    "not %Lg (%.13La), error %Lg (%.6La) > %Lg", \
+		    subtest, arg, r, r, expect, expect, e, e, epsilon); \
+    } while (0)
+
+/* Check that the result of fn(arg) is NaN */
+#ifndef __vax__
+#define T_LIBM_CHECK_NAN(subtest, fn, arg) do { \
+	double r = fn(arg); \
+	if (!isnan(r)) \
+		atf_tc_fail_nonfatal("subtest %u: " #fn "(%g) is %g not NaN", \
+		    subtest, arg, r); \
+    } while (0)
+#else
+/* vax doesn't support NaN */
+#define T_LIBM_CHECK_NAN(subtest, fn, arg) (void)(arg)
+#endif
+
+/* Check that the result of fn(arg) is +0.0 */
+#define T_LIBM_CHECK_PLUS_ZERO(subtest, fn, arg) do { \
+	double r = fn(arg); \
+	if (fabs(r) > 0.0 || signbit(r) != 0) \
+		atf_tc_fail_nonfatal("subtest %u: " #fn "(%g) is %g not +0.0", \
+		    subtest, arg, r); \
+    } while (0)
+
+/* Check that the result of fn(arg) is -0.0 */
+#define T_LIBM_CHECK_MINUS_ZERO(subtest, fn, arg) do { \
+	double r = fn(arg); \
+	if (fabs(r) > 0.0 || signbit(r) == 0) \
+		atf_tc_fail_nonfatal("subtest %u: " #fn "(%g) is %g not -0.0", \
+		    subtest, arg, r); \
+    } while (0)
+
+/* Some useful constants (for test vectors) */
+#ifndef __vax__	/* no NAN nor +/- INF on vax */
+#define T_LIBM_NAN	(0.0 / 0.0)
+#define T_LIBM_PLUS_INF	(+1.0 / 0.0)
+#define T_LIBM_MINUS_INF (-1.0 / 0.0)
+#endif
+
+/* One line definition of a simple test */
+#define ATF_LIBM_TEST(name, description) \
+ATF_TC(name); \
+ATF_TC_HEAD(name, tc) { atf_tc_set_md_var(tc, "descr", description); } \
+ATF_TC_BODY(name, tc)
diff --git a/contrib/netbsd-tests/lib/libm/t_log.c b/contrib/netbsd-tests/lib/libm/t_log.c
new file mode 100644
index 000000000000..de5a1c649451
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_log.c
@@ -0,0 +1,885 @@
+/* $NetBSD: t_log.c,v 1.11 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_log.c,v 1.11 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * log10(3)
+ */
+ATF_TC(log10_base);
+ATF_TC_HEAD(log10_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(10) == 1");
+}
+
+ATF_TC_BODY(log10_base, tc)
+{
+	ATF_CHECK(log10(10.0) == 1.0);
+}
+
+ATF_TC(log10_nan);
+ATF_TC_HEAD(log10_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(NaN) == NaN");
+}
+
+ATF_TC_BODY(log10_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log10(x)) != 0);
+}
+
+ATF_TC(log10_inf_neg);
+ATF_TC_HEAD(log10_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log10_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	const double y = log10(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(log10_inf_pos);
+ATF_TC_HEAD(log10_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log10_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(log10(x) == x);
+}
+
+ATF_TC(log10_one_pos);
+ATF_TC_HEAD(log10_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(1.0) == +0.0");
+}
+
+ATF_TC_BODY(log10_one_pos, tc)
+{
+	const double x = log10(1.0);
+	const double y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(log10_zero_neg);
+ATF_TC_HEAD(log10_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(-0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log10_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(log10(x) == -HUGE_VAL);
+}
+
+ATF_TC(log10_zero_pos);
+ATF_TC_HEAD(log10_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10(+0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log10_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(log10(x) == -HUGE_VAL);
+}
+
+/*
+ * log10f(3)
+ */
+ATF_TC(log10f_base);
+ATF_TC_HEAD(log10f_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(10) == 1");
+}
+
+ATF_TC_BODY(log10f_base, tc)
+{
+	ATF_CHECK(log10f(10.0) == 1.0);
+}
+
+ATF_TC(log10f_nan);
+ATF_TC_HEAD(log10f_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(NaN) == NaN");
+}
+
+ATF_TC_BODY(log10f_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log10f(x)) != 0);
+}
+
+ATF_TC(log10f_inf_neg);
+ATF_TC_HEAD(log10f_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log10f_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	const float y = log10f(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(log10f_inf_pos);
+ATF_TC_HEAD(log10f_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log10f_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+#if defined(__alpha__)
+	atf_tc_expect_fail("PR port-alpha/46301");
+#endif
+
+	ATF_CHECK(log10f(x) == x);
+}
+
+ATF_TC(log10f_one_pos);
+ATF_TC_HEAD(log10f_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(1.0) == +0.0");
+}
+
+ATF_TC_BODY(log10f_one_pos, tc)
+{
+	const float x = log10f(1.0);
+	const float y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(log10f_zero_neg);
+ATF_TC_HEAD(log10f_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(-0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(log10f_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(log10f(x) == -HUGE_VALF);
+}
+
+ATF_TC(log10f_zero_pos);
+ATF_TC_HEAD(log10f_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log10f(+0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(log10f_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(log10f(x) == -HUGE_VALF);
+}
+
+/*
+ * log1p(3)
+ */
+ATF_TC(log1p_nan);
+ATF_TC_HEAD(log1p_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(NaN) == NaN");
+}
+
+ATF_TC_BODY(log1p_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log1p(x)) != 0);
+}
+
+ATF_TC(log1p_inf_neg);
+ATF_TC_HEAD(log1p_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log1p_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	const double y = log1p(x);
+
+	if (isnan(y) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("log1p(-Inf) != NaN");
+	}
+}
+
+ATF_TC(log1p_inf_pos);
+ATF_TC_HEAD(log1p_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log1p_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(log1p(x) == x);
+}
+
+ATF_TC(log1p_one_neg);
+ATF_TC_HEAD(log1p_one_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(-1.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log1p_one_neg, tc)
+{
+	const double x = log1p(-1.0);
+
+	if (x != -HUGE_VAL) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("log1p(-1.0) != -HUGE_VAL");
+	}
+}
+
+ATF_TC(log1p_zero_neg);
+ATF_TC_HEAD(log1p_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(log1p_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(log1p(x) == x);
+}
+
+ATF_TC(log1p_zero_pos);
+ATF_TC_HEAD(log1p_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1p(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(log1p_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(log1p(x) == x);
+}
+
+/*
+ * log1pf(3)
+ */
+ATF_TC(log1pf_nan);
+ATF_TC_HEAD(log1pf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(NaN) == NaN");
+}
+
+ATF_TC_BODY(log1pf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log1pf(x)) != 0);
+}
+
+ATF_TC(log1pf_inf_neg);
+ATF_TC_HEAD(log1pf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log1pf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	const float y = log1pf(x);
+
+	if (isnan(y) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("log1pf(-Inf) != NaN");
+	}
+}
+
+ATF_TC(log1pf_inf_pos);
+ATF_TC_HEAD(log1pf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log1pf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	ATF_CHECK(log1pf(x) == x);
+}
+
+ATF_TC(log1pf_one_neg);
+ATF_TC_HEAD(log1pf_one_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(-1.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(log1pf_one_neg, tc)
+{
+	const float x = log1pf(-1.0);
+
+	if (x != -HUGE_VALF) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("log1pf(-1.0) != -HUGE_VALF");
+	}
+}
+
+ATF_TC(log1pf_zero_neg);
+ATF_TC_HEAD(log1pf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(log1pf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(log1pf(x) == x);
+}
+
+ATF_TC(log1pf_zero_pos);
+ATF_TC_HEAD(log1pf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log1pf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(log1pf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(log1pf(x) == x);
+}
+
+/*
+ * log2(3)
+ */
+ATF_TC(log2_base);
+ATF_TC_HEAD(log2_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(2) == 1");
+}
+
+ATF_TC_BODY(log2_base, tc)
+{
+	ATF_CHECK(log2(2.0) == 1.0);
+}
+
+ATF_TC(log2_nan);
+ATF_TC_HEAD(log2_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(NaN) == NaN");
+}
+
+ATF_TC_BODY(log2_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log2(x)) != 0);
+}
+
+ATF_TC(log2_inf_neg);
+ATF_TC_HEAD(log2_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log2_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	const double y = log2(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(log2_inf_pos);
+ATF_TC_HEAD(log2_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log2_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(log2(x) == x);
+}
+
+ATF_TC(log2_one_pos);
+ATF_TC_HEAD(log2_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(1.0) == +0.0");
+}
+
+ATF_TC_BODY(log2_one_pos, tc)
+{
+	const double x = log2(1.0);
+	const double y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(log2_zero_neg);
+ATF_TC_HEAD(log2_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(-0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log2_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(log2(x) == -HUGE_VAL);
+}
+
+ATF_TC(log2_zero_pos);
+ATF_TC_HEAD(log2_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2(+0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log2_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(log2(x) == -HUGE_VAL);
+}
+
+/*
+ * log2f(3)
+ */
+ATF_TC(log2f_base);
+ATF_TC_HEAD(log2f_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(2) == 1");
+}
+
+ATF_TC_BODY(log2f_base, tc)
+{
+	ATF_CHECK(log2f(2.0) == 1.0);
+}
+
+ATF_TC(log2f_nan);
+ATF_TC_HEAD(log2f_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(NaN) == NaN");
+}
+
+ATF_TC_BODY(log2f_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log2f(x)) != 0);
+}
+
+ATF_TC(log2f_inf_neg);
+ATF_TC_HEAD(log2f_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log2f_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	const float y = log2f(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(log2f_inf_pos);
+ATF_TC_HEAD(log2f_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log2f_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+#if defined(__alpha__)
+	atf_tc_expect_fail("PR port-alpha/46301");
+#endif
+
+	ATF_CHECK(log2f(x) == x);
+}
+
+ATF_TC(log2f_one_pos);
+ATF_TC_HEAD(log2f_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(1.0) == +0.0");
+}
+
+ATF_TC_BODY(log2f_one_pos, tc)
+{
+	const float x = log2f(1.0);
+	const float y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(log2f_zero_neg);
+ATF_TC_HEAD(log2f_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(-0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(log2f_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(log2f(x) == -HUGE_VALF);
+}
+
+ATF_TC(log2f_zero_pos);
+ATF_TC_HEAD(log2f_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log2f(+0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(log2f_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(log2f(x) == -HUGE_VALF);
+}
+
+/*
+ * log(3)
+ */
+ATF_TC(log_base);
+ATF_TC_HEAD(log_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(e) == 1");
+}
+
+ATF_TC_BODY(log_base, tc)
+{
+	const double eps = 1.0e-38;
+
+	if (fabs(log(M_E) - 1.0) > eps)
+		atf_tc_fail_nonfatal("log(e) != 1");
+}
+
+ATF_TC(log_nan);
+ATF_TC_HEAD(log_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(NaN) == NaN");
+}
+
+ATF_TC_BODY(log_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(log(x)) != 0);
+}
+
+ATF_TC(log_inf_neg);
+ATF_TC_HEAD(log_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(-Inf) == NaN");
+}
+
+ATF_TC_BODY(log_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	const double y = log(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(log_inf_pos);
+ATF_TC_HEAD(log_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(log_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(log(x) == x);
+}
+
+ATF_TC(log_one_pos);
+ATF_TC_HEAD(log_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(1.0) == +0.0");
+}
+
+ATF_TC_BODY(log_one_pos, tc)
+{
+	const double x = log(1.0);
+	const double y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(log_zero_neg);
+ATF_TC_HEAD(log_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(-0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(log(x) == -HUGE_VAL);
+}
+
+ATF_TC(log_zero_pos);
+ATF_TC_HEAD(log_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test log(+0.0) == -HUGE_VAL");
+}
+
+ATF_TC_BODY(log_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(log(x) == -HUGE_VAL);
+}
+
+/*
+ * logf(3)
+ */
+ATF_TC(logf_base);
+ATF_TC_HEAD(logf_base, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(e) == 1");
+}
+
+ATF_TC_BODY(logf_base, tc)
+{
+	const float eps = 1.0e-7;
+
+	if (fabsf(logf(M_E) - 1.0f) > eps)
+		atf_tc_fail_nonfatal("logf(e) != 1");
+}
+
+ATF_TC(logf_nan);
+ATF_TC_HEAD(logf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(NaN) == NaN");
+}
+
+ATF_TC_BODY(logf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(logf(x)) != 0);
+}
+
+ATF_TC(logf_inf_neg);
+ATF_TC_HEAD(logf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(logf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	const float y = logf(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(logf_inf_pos);
+ATF_TC_HEAD(logf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(logf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+#if defined(__alpha__)
+	atf_tc_expect_fail("PR port-alpha/46301");
+#endif
+
+	ATF_CHECK(logf(x) == x);
+}
+
+ATF_TC(logf_one_pos);
+ATF_TC_HEAD(logf_one_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(1.0) == +0.0");
+}
+
+ATF_TC_BODY(logf_one_pos, tc)
+{
+	const float x = logf(1.0);
+	const float y = 0.0L;
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(logf_zero_neg);
+ATF_TC_HEAD(logf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(-0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(logf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(logf(x) == -HUGE_VALF);
+}
+
+ATF_TC(logf_zero_pos);
+ATF_TC_HEAD(logf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test logf(+0.0) == -HUGE_VALF");
+}
+
+ATF_TC_BODY(logf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(logf(x) == -HUGE_VALF);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, log10_base);
+	ATF_TP_ADD_TC(tp, log10_nan);
+	ATF_TP_ADD_TC(tp, log10_inf_neg);
+	ATF_TP_ADD_TC(tp, log10_inf_pos);
+	ATF_TP_ADD_TC(tp, log10_one_pos);
+	ATF_TP_ADD_TC(tp, log10_zero_neg);
+	ATF_TP_ADD_TC(tp, log10_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log10f_base);
+	ATF_TP_ADD_TC(tp, log10f_nan);
+	ATF_TP_ADD_TC(tp, log10f_inf_neg);
+	ATF_TP_ADD_TC(tp, log10f_inf_pos);
+	ATF_TP_ADD_TC(tp, log10f_one_pos);
+	ATF_TP_ADD_TC(tp, log10f_zero_neg);
+	ATF_TP_ADD_TC(tp, log10f_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log1p_nan);
+	ATF_TP_ADD_TC(tp, log1p_inf_neg);
+	ATF_TP_ADD_TC(tp, log1p_inf_pos);
+	ATF_TP_ADD_TC(tp, log1p_one_neg);
+	ATF_TP_ADD_TC(tp, log1p_zero_neg);
+	ATF_TP_ADD_TC(tp, log1p_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log1pf_nan);
+	ATF_TP_ADD_TC(tp, log1pf_inf_neg);
+	ATF_TP_ADD_TC(tp, log1pf_inf_pos);
+	ATF_TP_ADD_TC(tp, log1pf_one_neg);
+	ATF_TP_ADD_TC(tp, log1pf_zero_neg);
+	ATF_TP_ADD_TC(tp, log1pf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log2_base);
+	ATF_TP_ADD_TC(tp, log2_nan);
+	ATF_TP_ADD_TC(tp, log2_inf_neg);
+	ATF_TP_ADD_TC(tp, log2_inf_pos);
+	ATF_TP_ADD_TC(tp, log2_one_pos);
+	ATF_TP_ADD_TC(tp, log2_zero_neg);
+	ATF_TP_ADD_TC(tp, log2_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log2f_base);
+	ATF_TP_ADD_TC(tp, log2f_nan);
+	ATF_TP_ADD_TC(tp, log2f_inf_neg);
+	ATF_TP_ADD_TC(tp, log2f_inf_pos);
+	ATF_TP_ADD_TC(tp, log2f_one_pos);
+	ATF_TP_ADD_TC(tp, log2f_zero_neg);
+	ATF_TP_ADD_TC(tp, log2f_zero_pos);
+
+	ATF_TP_ADD_TC(tp, log_base);
+	ATF_TP_ADD_TC(tp, log_nan);
+	ATF_TP_ADD_TC(tp, log_inf_neg);
+	ATF_TP_ADD_TC(tp, log_inf_pos);
+	ATF_TP_ADD_TC(tp, log_one_pos);
+	ATF_TP_ADD_TC(tp, log_zero_neg);
+	ATF_TP_ADD_TC(tp, log_zero_pos);
+
+	ATF_TP_ADD_TC(tp, logf_base);
+	ATF_TP_ADD_TC(tp, logf_nan);
+	ATF_TP_ADD_TC(tp, logf_inf_neg);
+	ATF_TP_ADD_TC(tp, logf_inf_pos);
+	ATF_TP_ADD_TC(tp, logf_one_pos);
+	ATF_TP_ADD_TC(tp, logf_zero_neg);
+	ATF_TP_ADD_TC(tp, logf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_modf.c b/contrib/netbsd-tests/lib/libm/t_modf.c
new file mode 100644
index 000000000000..a856b15d1aab
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_modf.c
@@ -0,0 +1,68 @@
+/* $NetBSD: t_modf.c,v 1.1 2014/06/16 12:54:43 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <float.h>
+#include <math.h>
+
+ATF_TC(modf);
+ATF_TC_HEAD(modf, tc)
+{
+	atf_tc_set_md_var(tc, "descr","Check modf family");
+}
+
+ATF_TC_BODY(modf, tc)
+{
+	float basef;
+	double base;
+	long double basel;
+	ATF_CHECK(modff(1.0, &basef) == 0.0);
+	ATF_CHECK(basef == 1.0);
+	ATF_CHECK(modf(1.0, &base) == 0.0);
+	ATF_CHECK(base == 1.0);
+	ATF_CHECK(modfl(1.0, &basel) == 0.0);
+	ATF_CHECK(basel == 1.0);
+
+	ATF_CHECK(modff(-1 - FLT_EPSILON, &basef) == -FLT_EPSILON);
+	ATF_CHECK(basef == -1.0);
+	ATF_CHECK(modf(-1 - DBL_EPSILON, &base) == -DBL_EPSILON);
+	ATF_CHECK(base == -1.0);
+	ATF_CHECK(modfl(-1 - LDBL_EPSILON, &basel) == -LDBL_EPSILON);
+	ATF_CHECK(basel == -1.0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, modf);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_pow.c b/contrib/netbsd-tests/lib/libm/t_pow.c
new file mode 100644
index 000000000000..62b7235e7640
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_pow.c
@@ -0,0 +1,669 @@
+/* $NetBSD: t_pow.c,v 1.3 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_pow.c,v 1.3 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+
+/*
+ * pow(3)
+ */
+ATF_TC(pow_nan_x);
+ATF_TC_HEAD(pow_nan_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(NaN, y) == NaN");
+}
+
+ATF_TC_BODY(pow_nan_x, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(pow(x, 2.0)) != 0);
+}
+
+ATF_TC(pow_nan_y);
+ATF_TC_HEAD(pow_nan_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(x, NaN) == NaN");
+}
+
+ATF_TC_BODY(pow_nan_y, tc)
+{
+	const double y = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(pow(2.0, y)) != 0);
+}
+
+ATF_TC(pow_inf_neg_x);
+ATF_TC_HEAD(pow_inf_neg_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(-Inf, y) == +-Inf || +-0.0");
+}
+
+ATF_TC_BODY(pow_inf_neg_x, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double z;
+
+	/*
+	 * If y is odd, y > 0, and x is -Inf, -Inf is returned.
+	 * If y is even, y > 0, and x is -Inf, +Inf is returned.
+	 */
+	z = pow(x, 3.0);
+
+	if (isinf(z) == 0 || signbit(z) == 0)
+		atf_tc_fail_nonfatal("pow(-Inf, 3.0) != -Inf");
+
+	z = pow(x, 4.0);
+
+	if (isinf(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(-Inf, 4.0) != +Inf");
+
+	/*
+	 * If y is odd, y < 0, and x is -Inf, -0.0 is returned.
+	 * If y is even, y < 0, and x is -Inf, +0.0 is returned.
+	 */
+	z = pow(x, -3.0);
+
+	if (fabs(z) > 0.0 || signbit(z) == 0)
+		atf_tc_fail_nonfatal("pow(-Inf, -3.0) != -0.0");
+
+	z = pow(x, -4.0);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(-Inf -4.0) != +0.0");
+}
+
+ATF_TC(pow_inf_neg_y);
+ATF_TC_HEAD(pow_inf_neg_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(x, -Inf) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(pow_inf_neg_y, tc)
+{
+	const double y = -1.0L / 0.0L;
+	double z;
+
+	/*
+	 * If |x| < 1 and y is -Inf, +Inf is returned.
+	 * If |x| > 1 and y is -Inf, +0.0 is returned.
+	 */
+	z = pow(0.1, y);
+
+	if (isinf(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(0.1, -Inf) != +Inf");
+
+	z = pow(1.1, y);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(1.1, -Inf) != +0.0");
+}
+
+ATF_TC(pow_inf_pos_x);
+ATF_TC_HEAD(pow_inf_pos_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(+Inf, y) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(pow_inf_pos_x, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double z;
+
+	/*
+	 * For y < 0, if x is +Inf, +0.0 is returned.
+	 * For y > 0, if x is +Inf, +Inf is returned.
+	 */
+	z = pow(x, -2.0);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(+Inf, -2.0) != +0.0");
+
+	z = pow(x, 2.0);
+
+	if (isinf(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(+Inf, 2.0) != +Inf");
+}
+
+ATF_TC(pow_inf_pos_y);
+ATF_TC_HEAD(pow_inf_pos_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(x, +Inf) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(pow_inf_pos_y, tc)
+{
+	const double y = 1.0L / 0.0L;
+	double z;
+
+	/*
+	 * If |x| < 1 and y is +Inf, +0.0 is returned.
+	 * If |x| > 1 and y is +Inf, +Inf is returned.
+	 */
+	z = pow(0.1, y);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(0.1, +Inf) != +0.0");
+
+	z = pow(1.1, y);
+
+	if (isinf(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(1.1, +Inf) != +Inf");
+}
+
+ATF_TC(pow_one_neg_x);
+ATF_TC_HEAD(pow_one_neg_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(-1.0, +-Inf) == 1.0");
+}
+
+ATF_TC_BODY(pow_one_neg_x, tc)
+{
+	const double infp = 1.0L / 0.0L;
+	const double infn = -1.0L / 0.0L;
+
+	/*
+	 * If x is -1.0, and y is +-Inf, 1.0 shall be returned.
+	 */
+	ATF_REQUIRE(isinf(infp) != 0);
+	ATF_REQUIRE(isinf(infn) != 0);
+
+	if (pow(-1.0, infp) != 1.0) {
+		atf_tc_expect_fail("PR lib/45372");
+		atf_tc_fail_nonfatal("pow(-1.0, +Inf) != 1.0");
+	}
+
+	if (pow(-1.0, infn) != 1.0) {
+		atf_tc_expect_fail("PR lib/45372");
+		atf_tc_fail_nonfatal("pow(-1.0, -Inf) != 1.0");
+	}
+}
+
+ATF_TC(pow_one_pos_x);
+ATF_TC_HEAD(pow_one_pos_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(1.0, y) == 1.0");
+}
+
+ATF_TC_BODY(pow_one_pos_x, tc)
+{
+	const double y[] = { 0.0, 0.1, 2.0, -3.0, 99.0, 99.99, 9999999.9 };
+	const double z = 0.0L / 0.0L;
+	size_t i;
+
+	/*
+	 * For any value of y (including NaN),
+	 * if x is 1.0, 1.0 shall be returned.
+	 */
+	if (pow(1.0, z) != 1.0)
+		atf_tc_fail_nonfatal("pow(1.0, NaN) != 1.0");
+
+	for (i = 0; i < __arraycount(y); i++) {
+
+		if (pow(1.0, y[i]) != 1.0)
+			atf_tc_fail_nonfatal("pow(1.0, %0.01f) != 1.0", y[i]);
+	}
+}
+
+ATF_TC(pow_zero_x);
+ATF_TC_HEAD(pow_zero_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(+-0.0, y) == +-0.0 || HUGE");
+}
+
+ATF_TC_BODY(pow_zero_x, tc)
+{
+	double z;
+
+	/*
+	 * If x is +0.0 or -0.0, y > 0, and y
+	 * is an odd integer, x is returned.
+	 */
+	z = pow(+0.0, 3.0);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(+0.0, 3.0) != +0.0");
+
+	z = pow(-0.0, 3.0);
+
+	if (fabs(z) > 0.0 || signbit(z) == 0)
+		atf_tc_fail_nonfatal("pow(-0.0, 3.0) != -0.0");
+
+	/*
+	 * If y > 0 and not an odd integer,
+	 * if x is +0.0 or -0.0, +0.0 is returned.
+	 */
+	z = pow(+0.0, 4.0);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(+0.0, 4.0) != +0.0");
+
+	z = pow(-0.0, 4.0);
+
+	if (fabs(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("pow(-0.0, 4.0) != +0.0");
+
+	/*
+	 * If y < 0 and x is +0.0 or -0.0, either +-HUGE_VAL,
+	 * +-HUGE_VALF, or +-HUGE_VALL shall be returned.
+	 */
+	z = pow(+0.0, -4.0);
+
+	if (z != HUGE_VAL) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("pow(+0.0, -4.0) != HUGE_VAL");
+	}
+
+	z = pow(-0.0, -4.0);
+
+	if (z != HUGE_VAL) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("pow(-0.0, -4.0) != HUGE_VAL");
+	}
+
+	z = pow(+0.0, -5.0);
+
+	if (z != HUGE_VAL) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("pow(+0.0, -5.0) != HUGE_VAL");
+	}
+
+	z = pow(-0.0, -5.0);
+
+	if (z != -HUGE_VAL)
+		atf_tc_fail_nonfatal("pow(-0.0, -5.0) != -HUGE_VAL");
+}
+
+ATF_TC(pow_zero_y);
+ATF_TC_HEAD(pow_zero_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pow(x, +-0.0) == 1.0");
+}
+
+ATF_TC_BODY(pow_zero_y, tc)
+{
+	const double x[] =  { 0.1, -3.0, 77.0, 99.99, 101.0000001 };
+	const double z = 0.0L / 0.0L;
+	size_t i;
+
+	/*
+	 * For any value of x (including NaN),
+	 * if y is +0.0 or -0.0, 1.0 is returned.
+	 */
+	if (pow(z, +0.0) != 1.0)
+		atf_tc_fail_nonfatal("pow(NaN, +0.0) != 1.0");
+
+	if (pow(z, -0.0) != 1.0)
+		atf_tc_fail_nonfatal("pow(NaN, -0.0) != 1.0");
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		if (pow(x[i], +0.0) != 1.0)
+			atf_tc_fail_nonfatal("pow(%0.01f, +0.0) != 1.0", x[i]);
+
+		if (pow(x[i], -0.0) != 1.0)
+			atf_tc_fail_nonfatal("pow(%0.01f, -0.0) != 1.0", x[i]);
+	}
+}
+
+/*
+ * powf(3)
+ */
+ATF_TC(powf_nan_x);
+ATF_TC_HEAD(powf_nan_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(NaN, y) == NaN");
+}
+
+ATF_TC_BODY(powf_nan_x, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnanf(powf(x, 2.0)) != 0);
+}
+
+ATF_TC(powf_nan_y);
+ATF_TC_HEAD(powf_nan_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(x, NaN) == NaN");
+}
+
+ATF_TC_BODY(powf_nan_y, tc)
+{
+	const float y = 0.0L / 0.0L;
+
+	ATF_CHECK(isnanf(powf(2.0, y)) != 0);
+}
+
+ATF_TC(powf_inf_neg_x);
+ATF_TC_HEAD(powf_inf_neg_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(-Inf, y) == +-Inf || +-0.0");
+}
+
+ATF_TC_BODY(powf_inf_neg_x, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float z;
+
+	/*
+	 * If y is odd, y > 0, and x is -Inf, -Inf is returned.
+	 * If y is even, y > 0, and x is -Inf, +Inf is returned.
+	 */
+	z = powf(x, 3.0);
+
+	if (isinff(z) == 0 || signbit(z) == 0)
+		atf_tc_fail_nonfatal("powf(-Inf, 3.0) != -Inf");
+
+	z = powf(x, 4.0);
+
+	if (isinff(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(-Inf, 4.0) != +Inf");
+
+	/*
+	 * If y is odd, y < 0, and x is -Inf, -0.0 is returned.
+	 * If y is even, y < 0, and x is -Inf, +0.0 is returned.
+	 */
+	z = powf(x, -3.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) == 0) {
+		atf_tc_expect_fail("PR lib/45372");
+		atf_tc_fail_nonfatal("powf(-Inf, -3.0) != -0.0");
+	}
+
+	z = powf(x, -4.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(-Inf -4.0) != +0.0");
+}
+
+ATF_TC(powf_inf_neg_y);
+ATF_TC_HEAD(powf_inf_neg_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(x, -Inf) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(powf_inf_neg_y, tc)
+{
+	const float y = -1.0L / 0.0L;
+	float z;
+
+	/*
+	 * If |x| < 1 and y is -Inf, +Inf is returned.
+	 * If |x| > 1 and y is -Inf, +0.0 is returned.
+	 */
+	z = powf(0.1, y);
+
+	if (isinff(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(0.1, -Inf) != +Inf");
+
+	z = powf(1.1, y);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(1.1, -Inf) != +0.0");
+}
+
+ATF_TC(powf_inf_pos_x);
+ATF_TC_HEAD(powf_inf_pos_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(+Inf, y) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(powf_inf_pos_x, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float z;
+
+	/*
+	 * For y < 0, if x is +Inf, +0.0 is returned.
+	 * For y > 0, if x is +Inf, +Inf is returned.
+	 */
+	z = powf(x, -2.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(+Inf, -2.0) != +0.0");
+
+	z = powf(x, 2.0);
+
+	if (isinff(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(+Inf, 2.0) != +Inf");
+}
+
+ATF_TC(powf_inf_pos_y);
+ATF_TC_HEAD(powf_inf_pos_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(x, +Inf) == +Inf || +0.0");
+}
+
+ATF_TC_BODY(powf_inf_pos_y, tc)
+{
+	const float y = 1.0L / 0.0L;
+	float z;
+
+	/*
+	 * If |x| < 1 and y is +Inf, +0.0 is returned.
+	 * If |x| > 1 and y is +Inf, +Inf is returned.
+	 */
+	z = powf(0.1, y);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(0.1, +Inf) != +0.0");
+
+	z = powf(1.1, y);
+
+	if (isinff(z) == 0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(1.1, +Inf) != +Inf");
+}
+
+ATF_TC(powf_one_neg_x);
+ATF_TC_HEAD(powf_one_neg_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(-1.0, +-Inf) == 1.0");
+}
+
+ATF_TC_BODY(powf_one_neg_x, tc)
+{
+	const float infp = 1.0L / 0.0L;
+	const float infn = -1.0L / 0.0L;
+
+	/*
+	 * If x is -1.0, and y is +-Inf, 1.0 shall be returned.
+	 */
+	ATF_REQUIRE(isinff(infp) != 0);
+	ATF_REQUIRE(isinff(infn) != 0);
+
+	if (powf(-1.0, infp) != 1.0) {
+		atf_tc_expect_fail("PR lib/45372");
+		atf_tc_fail_nonfatal("powf(-1.0, +Inf) != 1.0");
+	}
+
+	if (powf(-1.0, infn) != 1.0) {
+		atf_tc_expect_fail("PR lib/45372");
+		atf_tc_fail_nonfatal("powf(-1.0, -Inf) != 1.0");
+	}
+}
+
+ATF_TC(powf_one_pos_x);
+ATF_TC_HEAD(powf_one_pos_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(1.0, y) == 1.0");
+}
+
+ATF_TC_BODY(powf_one_pos_x, tc)
+{
+	const float y[] = { 0.0, 0.1, 2.0, -3.0, 99.0, 99.99, 9999999.9 };
+	const float z = 0.0L / 0.0L;
+	size_t i;
+
+	/*
+	 * For any value of y (including NaN),
+	 * if x is 1.0, 1.0 shall be returned.
+	 */
+	if (powf(1.0, z) != 1.0)
+		atf_tc_fail_nonfatal("powf(1.0, NaN) != 1.0");
+
+	for (i = 0; i < __arraycount(y); i++) {
+
+		if (powf(1.0, y[i]) != 1.0)
+			atf_tc_fail_nonfatal("powf(1.0, %0.01f) != 1.0", y[i]);
+	}
+}
+
+ATF_TC(powf_zero_x);
+ATF_TC_HEAD(powf_zero_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(+-0.0, y) == +-0.0 || HUGE");
+}
+
+ATF_TC_BODY(powf_zero_x, tc)
+{
+	float z;
+
+	/*
+	 * If x is +0.0 or -0.0, y > 0, and y
+	 * is an odd integer, x is returned.
+	 */
+	z = powf(+0.0, 3.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(+0.0, 3.0) != +0.0");
+
+	z = powf(-0.0, 3.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) == 0)
+		atf_tc_fail_nonfatal("powf(-0.0, 3.0) != -0.0");
+
+	/*
+	 * If y > 0 and not an odd integer,
+	 * if x is +0.0 or -0.0, +0.0 is returned.
+	 */
+	z = powf(+0.0, 4.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(+0.0, 4.0) != +0.0");
+
+	z = powf(-0.0, 4.0);
+
+	if (fabsf(z) > 0.0 || signbit(z) != 0)
+		atf_tc_fail_nonfatal("powf(-0.0, 4.0) != +0.0");
+
+	/*
+	 * If y < 0 and x is +0.0 or -0.0, either +-HUGE_VAL,
+	 * +-HUGE_VALF, or +-HUGE_VALL shall be returned.
+	 */
+	z = powf(+0.0, -4.0);
+
+	if (z != HUGE_VALF) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("powf(+0.0, -4.0) != HUGE_VALF");
+	}
+
+	z = powf(-0.0, -4.0);
+
+	if (z != HUGE_VALF) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("powf(-0.0, -4.0) != HUGE_VALF");
+	}
+
+	z = powf(+0.0, -5.0);
+
+	if (z != HUGE_VALF) {
+		atf_tc_expect_fail("PR port-amd64/45391");
+		atf_tc_fail_nonfatal("powf(+0.0, -5.0) != HUGE_VALF");
+	}
+
+	z = powf(-0.0, -5.0);
+
+	if (z != -HUGE_VALF)
+		atf_tc_fail_nonfatal("powf(-0.0, -5.0) != -HUGE_VALF");
+}
+
+ATF_TC(powf_zero_y);
+ATF_TC_HEAD(powf_zero_y, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test powf(x, +-0.0) == 1.0");
+}
+
+ATF_TC_BODY(powf_zero_y, tc)
+{
+	const float x[] =  { 0.1, -3.0, 77.0, 99.99, 101.0000001 };
+	const float z = 0.0L / 0.0L;
+	size_t i;
+
+	/*
+	 * For any value of x (including NaN),
+	 * if y is +0.0 or -0.0, 1.0 is returned.
+	 */
+	if (powf(z, +0.0) != 1.0)
+		atf_tc_fail_nonfatal("powf(NaN, +0.0) != 1.0");
+
+	if (powf(z, -0.0) != 1.0)
+		atf_tc_fail_nonfatal("powf(NaN, -0.0) != 1.0");
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		if (powf(x[i], +0.0) != 1.0)
+			atf_tc_fail_nonfatal("powf(%0.01f, +0.0) != 1.0",x[i]);
+
+		if (powf(x[i], -0.0) != 1.0)
+			atf_tc_fail_nonfatal("powf(%0.01f, -0.0) != 1.0",x[i]);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pow_nan_x);
+	ATF_TP_ADD_TC(tp, pow_nan_y);
+	ATF_TP_ADD_TC(tp, pow_inf_neg_x);
+	ATF_TP_ADD_TC(tp, pow_inf_neg_y);
+	ATF_TP_ADD_TC(tp, pow_inf_pos_x);
+	ATF_TP_ADD_TC(tp, pow_inf_pos_y);
+	ATF_TP_ADD_TC(tp, pow_one_neg_x);
+	ATF_TP_ADD_TC(tp, pow_one_pos_x);
+	ATF_TP_ADD_TC(tp, pow_zero_x);
+	ATF_TP_ADD_TC(tp, pow_zero_y);
+
+	ATF_TP_ADD_TC(tp, powf_nan_x);
+	ATF_TP_ADD_TC(tp, powf_nan_y);
+	ATF_TP_ADD_TC(tp, powf_inf_neg_x);
+	ATF_TP_ADD_TC(tp, powf_inf_neg_y);
+	ATF_TP_ADD_TC(tp, powf_inf_pos_x);
+	ATF_TP_ADD_TC(tp, powf_inf_pos_y);
+	ATF_TP_ADD_TC(tp, powf_one_neg_x);
+	ATF_TP_ADD_TC(tp, powf_one_pos_x);
+	ATF_TP_ADD_TC(tp, powf_zero_x);
+	ATF_TP_ADD_TC(tp, powf_zero_y);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_precision.c b/contrib/netbsd-tests/lib/libm/t_precision.c
new file mode 100644
index 000000000000..390be9dd18aa
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_precision.c
@@ -0,0 +1,76 @@
+/* $NetBSD: t_precision.c,v 1.1 2013/11/11 11:10:45 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_precision.c,v 1.1 2013/11/11 11:10:45 joerg Exp $");
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include <float.h>
+#include <stdlib.h>
+
+ATF_TC(t_precision);
+
+ATF_TC_HEAD(t_precision, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Basic precision test for double and long double");
+}
+
+volatile double x = 1;
+volatile long double y = 1;
+
+ATF_TC_BODY(t_precision, tc)
+{
+	x += DBL_EPSILON;
+	ATF_CHECK(x != 1.0);
+	x -= 1;
+	ATF_CHECK(x == DBL_EPSILON);
+
+	x = 2;
+	x += DBL_EPSILON;
+	ATF_CHECK(x == 2.0);
+
+	y += LDBL_EPSILON;
+	ATF_CHECK(y != 1.0L);
+	y -= 1;
+	ATF_CHECK(y == LDBL_EPSILON);
+	y = 2;
+	y += LDBL_EPSILON;
+	ATF_CHECK(y == 2.0L);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, t_precision);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_round.c b/contrib/netbsd-tests/lib/libm/t_round.c
new file mode 100644
index 000000000000..f47e1a0f8a13
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_round.c
@@ -0,0 +1,85 @@
+/* $NetBSD: t_round.c,v 1.4 2013/11/11 23:57:34 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <float.h>
+#include <math.h>
+
+/*
+ * This tests for a bug in the initial implementation where
+ * precision was lost in an internal substraction, leading to
+ * rounding into the wrong direction.
+ */
+
+/* 0.5 - EPSILON */
+#define VAL	0x0.7ffffffffffffcp0
+#define VALF	0x0.7fffff8p0
+#define VALL	(0.5 - LDBL_EPSILON)
+
+#ifdef __vax__
+#define SMALL_NUM	1.0e-38
+#else
+#define SMALL_NUM	1.0e-40
+#endif
+
+ATF_TC(round_dir);
+ATF_TC_HEAD(round_dir, tc)
+{
+	atf_tc_set_md_var(tc, "descr","Check for rounding in wrong direction");
+}
+
+ATF_TC_BODY(round_dir, tc)
+{
+	double a = VAL, b, c;
+	float af = VALF, bf, cf;
+	long double al = VALL, bl, cl;
+
+	b = round(a);
+	bf = roundf(af);
+	bl = roundl(al);
+
+	ATF_CHECK(fabs(b) < SMALL_NUM);
+	ATF_CHECK(fabsf(bf) < SMALL_NUM);
+	ATF_CHECK(fabsl(bl) < SMALL_NUM);
+
+	c = round(-a);
+	cf = roundf(-af);
+	cl = roundl(-al);
+
+	ATF_CHECK(fabs(c) < SMALL_NUM);
+	ATF_CHECK(fabsf(cf) < SMALL_NUM);
+	ATF_CHECK(fabsl(cl) < SMALL_NUM);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, round_dir);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_scalbn.c b/contrib/netbsd-tests/lib/libm/t_scalbn.c
new file mode 100644
index 000000000000..586c2c3bc621
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_scalbn.c
@@ -0,0 +1,523 @@
+/* $NetBSD: t_scalbn.c,v 1.11 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_scalbn.c,v 1.11 2014/03/03 10:39:08 martin Exp $");
+
+#include <math.h>
+#include <limits.h>
+#include <float.h>
+#include <errno.h>
+
+#include <atf-c.h>
+
+static const int exps[] = { 0, 1, -1, 100, -100 };
+
+/* tests here do not require specific precision, so we just use double */
+struct testcase {
+	int exp;
+	double inval;
+	double result;
+	int error;
+};
+struct testcase test_vals[] = {
+	{ 0,		1.00085,	1.00085,	0 },
+	{ 0,		0.99755,	0.99755,	0 },
+	{ 0,		-1.00085,	-1.00085,	0 },
+	{ 0,		-0.99755,	-0.99755,	0 },
+	{ 1,		1.00085,	2.0* 1.00085,	0 },
+	{ 1,		0.99755,	2.0* 0.99755,	0 },
+	{ 1,		-1.00085,	2.0* -1.00085,	0 },
+	{ 1,		-0.99755,	2.0* -0.99755,	0 },
+
+	/*
+	 * We could add more corner test cases here, but we would have to
+	 * add some ifdefs for the exact format and use a reliable
+	 * generator program - bail for now and only do trivial stuff above.
+	 */
+};
+
+/*
+ * scalbn(3)
+ */
+ATF_TC(scalbn_val);
+ATF_TC_HEAD(scalbn_val, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn() for a few values");
+}
+
+ATF_TC_BODY(scalbn_val, tc)
+{
+	const struct testcase *tests = test_vals;
+	const size_t tcnt = __arraycount(test_vals);
+	size_t i;
+	double rv;
+
+	for (i = 0; i < tcnt; i++) {
+		rv = scalbn(tests[i].inval, tests[i].exp);
+		ATF_CHECK_EQ_MSG(errno, tests[i].error,
+		    "test %zu: errno %d instead of %d", i, errno,
+		    tests[i].error);
+		ATF_CHECK_MSG(fabs(rv-tests[i].result)<2.0*DBL_EPSILON,
+		    "test %zu: return value %g instead of %g (difference %g)",
+		    i, rv, tests[i].result, tests[i].result-rv);
+	}
+}
+
+ATF_TC(scalbn_nan);
+ATF_TC_HEAD(scalbn_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(NaN, n) == NaN");
+}
+
+ATF_TC_BODY(scalbn_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(isnan(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbn(x, exps[i]);
+		ATF_CHECK(isnan(y) != 0);
+	}
+}
+
+ATF_TC(scalbn_inf_neg);
+ATF_TC_HEAD(scalbn_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(-Inf, n) == -Inf");
+}
+
+ATF_TC_BODY(scalbn_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbn(x, exps[i]) == x);
+}
+
+ATF_TC(scalbn_inf_pos);
+ATF_TC_HEAD(scalbn_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(+Inf, n) == +Inf");
+}
+
+ATF_TC_BODY(scalbn_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbn(x, exps[i]) == x);
+}
+
+ATF_TC(scalbn_ldexp);
+ATF_TC_HEAD(scalbn_ldexp, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(x, n) == ldexp(x, n)");
+}
+
+ATF_TC_BODY(scalbn_ldexp, tc)
+{
+#if FLT_RADIX == 2
+	const double x = 2.91288191221812821;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbn(x, exps[i]);
+		ATF_CHECK_MSG(y == ldexp(x, exps[i]), "test %zu: exponent=%d, "
+		    "y=%g, expected %g (diff: %g)", i, exps[i], y, 
+		    ldexp(x, exps[i]), y - ldexp(x, exps[i]));
+	}
+#endif
+}
+
+ATF_TC(scalbn_zero_neg);
+ATF_TC_HEAD(scalbn_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(-0.0, n) == -0.0");
+}
+
+ATF_TC_BODY(scalbn_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbn(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) != 0);
+	}
+}
+
+ATF_TC(scalbn_zero_pos);
+ATF_TC_HEAD(scalbn_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbn(+0.0, n) == +0.0");
+}
+
+ATF_TC_BODY(scalbn_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) == 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbn(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) == 0);
+	}
+}
+
+/*
+ * scalbnf(3)
+ */
+ATF_TC(scalbnf_val);
+ATF_TC_HEAD(scalbnf_val, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf() for a few values");
+}
+
+ATF_TC_BODY(scalbnf_val, tc)
+{
+	const struct testcase *tests = test_vals;
+	const size_t tcnt = __arraycount(test_vals);
+	size_t i;
+	double rv;
+
+	for (i = 0; i < tcnt; i++) {
+		rv = scalbnf(tests[i].inval, tests[i].exp);
+		ATF_CHECK_EQ_MSG(errno, tests[i].error,
+		    "test %zu: errno %d instead of %d", i, errno,
+		    tests[i].error);
+		ATF_CHECK_MSG(fabs(rv-tests[i].result)<2.0*FLT_EPSILON,
+		    "test %zu: return value %g instead of %g (difference %g)",
+		    i, rv, tests[i].result, tests[i].result-rv);
+	}
+}
+
+ATF_TC(scalbnf_nan);
+ATF_TC_HEAD(scalbnf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(NaN, n) == NaN");
+}
+
+ATF_TC_BODY(scalbnf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(isnan(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnf(x, exps[i]);
+		ATF_CHECK(isnan(y) != 0);
+	}
+}
+
+ATF_TC(scalbnf_inf_neg);
+ATF_TC_HEAD(scalbnf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(-Inf, n) == -Inf");
+}
+
+ATF_TC_BODY(scalbnf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbnf(x, exps[i]) == x);
+}
+
+ATF_TC(scalbnf_inf_pos);
+ATF_TC_HEAD(scalbnf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(+Inf, n) == +Inf");
+}
+
+ATF_TC_BODY(scalbnf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbnf(x, exps[i]) == x);
+}
+
+ATF_TC(scalbnf_ldexpf);
+ATF_TC_HEAD(scalbnf_ldexpf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(x, n) == ldexpf(x, n)");
+}
+
+ATF_TC_BODY(scalbnf_ldexpf, tc)
+{
+#if FLT_RADIX == 2
+	const float x = 2.91288191221812821;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnf(x, exps[i]);
+		ATF_CHECK_MSG(y == ldexpf(x, exps[i]),
+		    "test %zu: exponent=%d, y=%g ldexpf returns %g (diff: %g)",
+		    i, exps[i], y, ldexpf(x, exps[i]), y-ldexpf(x, exps[i]));
+	}
+#endif
+}
+
+ATF_TC(scalbnf_zero_neg);
+ATF_TC_HEAD(scalbnf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(-0.0, n) == -0.0");
+}
+
+ATF_TC_BODY(scalbnf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnf(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) != 0);
+	}
+}
+
+ATF_TC(scalbnf_zero_pos);
+ATF_TC_HEAD(scalbnf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnf(+0.0, n) == +0.0");
+}
+
+ATF_TC_BODY(scalbnf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) == 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnf(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) == 0);
+	}
+}
+
+/*
+ * scalbnl(3)
+ */
+ATF_TC(scalbnl_val);
+ATF_TC_HEAD(scalbnl_val, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl() for a few values");
+}
+
+ATF_TC_BODY(scalbnl_val, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const struct testcase *tests = test_vals;
+	const size_t tcnt = __arraycount(test_vals);
+	size_t i;
+	long double rv;
+
+	for (i = 0; i < tcnt; i++) {
+		rv = scalbnl(tests[i].inval, tests[i].exp);
+		ATF_CHECK_EQ_MSG(errno, tests[i].error,
+		    "test %zu: errno %d instead of %d", i, errno,
+		    tests[i].error);
+		ATF_CHECK_MSG(fabsl(rv-(long double)tests[i].result)<2.0*LDBL_EPSILON,
+		    "test %zu: return value %Lg instead of %Lg (difference %Lg)",
+		    i, rv, (long double)tests[i].result, (long double)tests[i].result-rv);
+	}
+#endif
+}
+
+ATF_TC(scalbnl_nan);
+ATF_TC_HEAD(scalbnl_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl(NaN, n) == NaN");
+}
+
+ATF_TC_BODY(scalbnl_nan, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const long double x = 0.0L / 0.0L;
+	long double y;
+	size_t i;
+
+	if (isnan(x) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("(0.0L / 0.0L) != NaN");
+	}
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnl(x, exps[i]);
+		ATF_CHECK(isnan(y) != 0);
+	}
+#endif
+}
+
+ATF_TC(scalbnl_inf_neg);
+ATF_TC_HEAD(scalbnl_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl(-Inf, n) == -Inf");
+}
+
+ATF_TC_BODY(scalbnl_inf_neg, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const long double x = -1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbnl(x, exps[i]) == x);
+#endif
+}
+
+ATF_TC(scalbnl_inf_pos);
+ATF_TC_HEAD(scalbnl_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl(+Inf, n) == +Inf");
+}
+
+ATF_TC_BODY(scalbnl_inf_pos, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const long double x = 1.0L / 0.0L;
+	size_t i;
+
+	for (i = 0; i < __arraycount(exps); i++)
+		ATF_CHECK(scalbnl(x, exps[i]) == x);
+#endif
+}
+
+ATF_TC(scalbnl_zero_neg);
+ATF_TC_HEAD(scalbnl_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl(-0.0, n) == -0.0");
+}
+
+ATF_TC_BODY(scalbnl_zero_neg, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const long double x = -0.0L;
+	long double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) != 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnl(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) != 0);
+	}
+#endif
+}
+
+ATF_TC(scalbnl_zero_pos);
+ATF_TC_HEAD(scalbnl_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test scalbnl(+0.0, n) == +0.0");
+}
+
+ATF_TC_BODY(scalbnl_zero_pos, tc)
+{
+#ifndef __HAVE_LONG_DOUBLE
+	atf_tc_skip("Requires long double support");
+#else
+	const long double x = 0.0L;
+	long double y;
+	size_t i;
+
+	ATF_REQUIRE(signbit(x) == 0);
+
+	for (i = 0; i < __arraycount(exps); i++) {
+		y = scalbnl(x, exps[i]);
+		ATF_CHECK(x == y);
+		ATF_CHECK(signbit(y) == 0);
+	}
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, scalbn_val);
+	ATF_TP_ADD_TC(tp, scalbn_nan);
+	ATF_TP_ADD_TC(tp, scalbn_inf_neg);
+	ATF_TP_ADD_TC(tp, scalbn_inf_pos);
+	ATF_TP_ADD_TC(tp, scalbn_ldexp);
+	ATF_TP_ADD_TC(tp, scalbn_zero_neg);
+	ATF_TP_ADD_TC(tp, scalbn_zero_pos);
+
+	ATF_TP_ADD_TC(tp, scalbnf_val);
+	ATF_TP_ADD_TC(tp, scalbnf_nan);
+	ATF_TP_ADD_TC(tp, scalbnf_inf_neg);
+	ATF_TP_ADD_TC(tp, scalbnf_inf_pos);
+	ATF_TP_ADD_TC(tp, scalbnf_ldexpf);
+	ATF_TP_ADD_TC(tp, scalbnf_zero_neg);
+	ATF_TP_ADD_TC(tp, scalbnf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, scalbnl_val);
+	ATF_TP_ADD_TC(tp, scalbnl_nan);
+	ATF_TP_ADD_TC(tp, scalbnl_inf_neg);
+	ATF_TP_ADD_TC(tp, scalbnl_inf_pos);
+/*	ATF_TP_ADD_TC(tp, scalbnl_ldexp);	*/
+	ATF_TP_ADD_TC(tp, scalbnl_zero_neg);
+	ATF_TP_ADD_TC(tp, scalbnl_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_sin.c b/contrib/netbsd-tests/lib/libm/t_sin.c
new file mode 100644
index 000000000000..a82f49dc65d6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_sin.c
@@ -0,0 +1,263 @@
+/* $NetBSD: t_sin.c,v 1.4 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+
+static const struct {
+	int		angle;
+	double		x;
+	double		y;
+} angles[] = {
+	{ -180, -3.141592653589793,  0.0000000000000000 },
+	{ -135, -2.356194490192345, -0.7071067811865476 },
+	{  -90, -1.570796326794897, -1.0000000000000000 },
+	{  -45, -0.785398163397448, -0.7071067811865476 },
+	{    0,  0.000000000000000,  0.0000000000000000 },
+	{   30,  0.523598775598299,  0.5000000000000000 },
+	{   45,  0.785398163397448,  0.7071067811865476 },
+	{   60,  1.047197551196598,  0.8660254037844386 },
+	{   90,  1.570796326794897,  1.0000000000000000 },
+	{  120,  2.094395102393195,  0.8660254037844386 },
+	{  135,  2.356194490192345,  0.7071067811865476 },
+	{  150,  2.617993877991494,  0.5000000000000000 },
+	{  180,  3.141592653589793,  0.0000000000000000 },
+	{  270,  4.712388980384690, -1.0000000000000000 },
+	{  360,  6.283185307179586,  0.0000000000000000 }
+};
+
+/*
+ * sin(3)
+ */
+ATF_TC(sin_angles);
+ATF_TC_HEAD(sin_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(sin_angles, tc)
+{
+	const double eps = 1.0e-15;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		if (fabs(sin(angles[i].x) - angles[i].y) > eps)
+			atf_tc_fail_nonfatal("sin(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(sin_nan);
+ATF_TC_HEAD(sin_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sin(NaN) == NaN");
+}
+
+ATF_TC_BODY(sin_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sin(x)) != 0);
+}
+
+ATF_TC(sin_inf_neg);
+ATF_TC_HEAD(sin_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sin(-Inf) == NaN");
+}
+
+ATF_TC_BODY(sin_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	ATF_CHECK(isnan(sin(x)) != 0);
+}
+
+ATF_TC(sin_inf_pos);
+ATF_TC_HEAD(sin_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sin(+Inf) == NaN");
+}
+
+ATF_TC_BODY(sin_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(isnan(sin(x)) != 0);
+}
+
+
+ATF_TC(sin_zero_neg);
+ATF_TC_HEAD(sin_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sin(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sin_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(sin(x) == x);
+}
+
+ATF_TC(sin_zero_pos);
+ATF_TC_HEAD(sin_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sin(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sin_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(sin(x) == x);
+}
+
+/*
+ * sinf(3)
+ */
+ATF_TC(sinf_angles);
+ATF_TC_HEAD(sinf_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(sinf_angles, tc)
+{
+	const float eps = 1.0e-6;
+	float x, y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		x = angles[i].x;
+		y = angles[i].y;
+
+		if (fabsf(sinf(x) - y) > eps)
+			atf_tc_fail_nonfatal("sinf(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(sinf_nan);
+ATF_TC_HEAD(sinf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinf(NaN) == NaN");
+}
+
+ATF_TC_BODY(sinf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sinf(x)) != 0);
+}
+
+ATF_TC(sinf_inf_neg);
+ATF_TC_HEAD(sinf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(sinf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (isnan(sinf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("sinf(-Inf) != NaN");
+	}
+}
+
+ATF_TC(sinf_inf_pos);
+ATF_TC_HEAD(sinf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinf(+Inf) == NaN");
+}
+
+ATF_TC_BODY(sinf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	if (isnan(sinf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("sinf(+Inf) != NaN");
+	}
+}
+
+
+ATF_TC(sinf_zero_neg);
+ATF_TC_HEAD(sinf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sinf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(sinf(x) == x);
+}
+
+ATF_TC(sinf_zero_pos);
+ATF_TC_HEAD(sinf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sinf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(sinf(x) == x);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sin_angles);
+	ATF_TP_ADD_TC(tp, sin_nan);
+	ATF_TP_ADD_TC(tp, sin_inf_neg);
+	ATF_TP_ADD_TC(tp, sin_inf_pos);
+	ATF_TP_ADD_TC(tp, sin_zero_neg);
+	ATF_TP_ADD_TC(tp, sin_zero_pos);
+
+	ATF_TP_ADD_TC(tp, sinf_angles);
+	ATF_TP_ADD_TC(tp, sinf_nan);
+	ATF_TP_ADD_TC(tp, sinf_inf_neg);
+	ATF_TP_ADD_TC(tp, sinf_inf_pos);
+	ATF_TP_ADD_TC(tp, sinf_zero_neg);
+	ATF_TP_ADD_TC(tp, sinf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_sinh.c b/contrib/netbsd-tests/lib/libm/t_sinh.c
new file mode 100644
index 000000000000..d935f0ea7ffb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_sinh.c
@@ -0,0 +1,273 @@
+/* $NetBSD: t_sinh.c,v 1.6 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sinh.c,v 1.6 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <stdio.h>
+
+static const struct {
+	double x;
+	double y;
+	double e;
+} values[] = {
+	{ -10,   -11013.23287470339, 1e4, },
+	{ -2,    -3.626860407847019, 1,   },
+	{ -1,    -1.175201193643801, 1,   },
+	{ -0.05, -0.050020835937655, 1,   },
+	{ -0.001,-0.001000000166667, 1,   },
+	{  0.001, 0.001000000166667, 1,   },
+	{  0.05,  0.050020835937655, 1,   },
+	{  1,     1.175201193643801, 1,   },
+	{  2,     3.626860407847019, 1,   },
+	{  10,    11013.23287470339, 1e4, },
+};
+
+/*
+ * sinh(3)
+ */
+ATF_TC(sinh_inrange);
+ATF_TC_HEAD(sinh_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sinh(x) for some values");
+}
+
+ATF_TC_BODY(sinh_inrange, tc)
+{
+	double eps;
+	double x;
+	double y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		x = values[i].x;
+		y = values[i].y;
+		eps = 1e-15 * values[i].e;
+
+		if (fabs(sinh(x) - y) > eps)
+			atf_tc_fail_nonfatal("sinh(%g) != %g\n", x, y);
+	}
+}
+
+ATF_TC(sinh_nan);
+ATF_TC_HEAD(sinh_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinh(NaN) == NaN");
+}
+
+ATF_TC_BODY(sinh_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sinh(x)) != 0);
+}
+
+ATF_TC(sinh_inf_neg);
+ATF_TC_HEAD(sinh_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinh(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(sinh_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = sinh(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) != 0);
+}
+
+ATF_TC(sinh_inf_pos);
+ATF_TC_HEAD(sinh_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinh(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(sinh_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = sinh(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(sinh_zero_neg);
+ATF_TC_HEAD(sinh_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinh(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sinh_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = sinh(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("sinh(-0.0) != -0.0");
+}
+
+ATF_TC(sinh_zero_pos);
+ATF_TC_HEAD(sinh_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinh(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sinh_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = sinh(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("sinh(+0.0) != +0.0");
+}
+
+/*
+ * sinhf(3)
+ */
+ATF_TC(sinhf_inrange);
+ATF_TC_HEAD(sinhf_inrange, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sinhf(x) for some values");
+}
+
+ATF_TC_BODY(sinhf_inrange, tc)
+{
+	float eps;
+	float x;
+	float y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(values); i++) {
+		x = values[i].x;
+		y = values[i].y;
+		eps = 1e-6 * values[i].e;
+
+		if (fabsf(sinhf(x) - y) > eps)
+			atf_tc_fail_nonfatal("sinhf(%g) != %g\n", x, y);
+	}
+}
+
+ATF_TC(sinhf_nan);
+ATF_TC_HEAD(sinhf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinhf(NaN) == NaN");
+}
+
+ATF_TC_BODY(sinhf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sinhf(x)) != 0);
+}
+
+ATF_TC(sinhf_inf_neg);
+ATF_TC_HEAD(sinhf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinhf(-Inf) == -Inf");
+}
+
+ATF_TC_BODY(sinhf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = sinhf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) != 0);
+}
+
+ATF_TC(sinhf_inf_pos);
+ATF_TC_HEAD(sinhf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinhf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(sinhf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = sinhf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(sinhf_zero_neg);
+ATF_TC_HEAD(sinhf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinhf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sinhf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = sinhf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("sinhf(-0.0) != -0.0");
+}
+
+ATF_TC(sinhf_zero_pos);
+ATF_TC_HEAD(sinhf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sinhf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sinhf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = sinhf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("sinhf(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sinh_inrange);
+	ATF_TP_ADD_TC(tp, sinh_nan);
+	ATF_TP_ADD_TC(tp, sinh_inf_neg);
+	ATF_TP_ADD_TC(tp, sinh_inf_pos);
+	ATF_TP_ADD_TC(tp, sinh_zero_neg);
+	ATF_TP_ADD_TC(tp, sinh_zero_pos);
+
+	ATF_TP_ADD_TC(tp, sinhf_inrange);
+	ATF_TP_ADD_TC(tp, sinhf_nan);
+	ATF_TP_ADD_TC(tp, sinhf_inf_neg);
+	ATF_TP_ADD_TC(tp, sinhf_inf_pos);
+	ATF_TP_ADD_TC(tp, sinhf_zero_neg);
+	ATF_TP_ADD_TC(tp, sinhf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_sqrt.c b/contrib/netbsd-tests/lib/libm/t_sqrt.c
new file mode 100644
index 000000000000..1d551ec3101d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_sqrt.c
@@ -0,0 +1,368 @@
+/* $NetBSD: t_sqrt.c,v 1.7 2014/03/12 21:40:07 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sqrt.c,v 1.7 2014/03/12 21:40:07 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+#include <float.h>
+#include <stdio.h>
+
+/*
+ * sqrt(3)
+ */
+ATF_TC(sqrt_nan);
+ATF_TC_HEAD(sqrt_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(NaN) == NaN");
+}
+
+ATF_TC_BODY(sqrt_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sqrt(x)) != 0);
+}
+
+ATF_TC(sqrt_pow);
+ATF_TC_HEAD(sqrt_pow, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(3) vs. pow(3)");
+}
+
+ATF_TC_BODY(sqrt_pow, tc)
+{
+	const double x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.9999 };
+#if __DBL_MIN_10_EXP__ <= -40
+	const double eps = 1.0e-40;
+#else
+	const double eps = __DBL_MIN__*4.0;
+#endif
+	double y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = sqrt(x[i]);
+		z = pow(x[i], 1.0 / 2.0);
+
+		if (fabs(y - z) > eps)
+			atf_tc_fail_nonfatal("sqrt(%0.03f) != "
+			    "pow(%0.03f, 1/2)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(sqrt_inf_neg);
+ATF_TC_HEAD(sqrt_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(-Inf) == NaN");
+}
+
+ATF_TC_BODY(sqrt_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+	double y = sqrt(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(sqrt_inf_pos);
+ATF_TC_HEAD(sqrt_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(sqrt_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+	double y = sqrt(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(sqrt_zero_neg);
+ATF_TC_HEAD(sqrt_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sqrt_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = sqrt(x);
+
+	if (fabs(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("sqrt(-0.0) != -0.0");
+}
+
+ATF_TC(sqrt_zero_pos);
+ATF_TC_HEAD(sqrt_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrt(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sqrt_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = sqrt(x);
+
+	if (fabs(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("sqrt(+0.0) != +0.0");
+}
+
+/*
+ * sqrtf(3)
+ */
+ATF_TC(sqrtf_nan);
+ATF_TC_HEAD(sqrtf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(NaN) == NaN");
+}
+
+ATF_TC_BODY(sqrtf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sqrtf(x)) != 0);
+}
+
+ATF_TC(sqrtf_powf);
+ATF_TC_HEAD(sqrtf_powf, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(3) vs. powf(3)");
+}
+
+ATF_TC_BODY(sqrtf_powf, tc)
+{
+	const float x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.9999 };
+	const float eps = 1.0e-30;
+	volatile float y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = sqrtf(x[i]);
+		z = powf(x[i], 1.0 / 2.0);
+
+		if (fabsf(y - z) > eps)
+			atf_tc_fail_nonfatal("sqrtf(%0.03f) != "
+			    "powf(%0.03f, 1/2)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(sqrtf_inf_neg);
+ATF_TC_HEAD(sqrtf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(sqrtf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+	float y = sqrtf(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(sqrtf_inf_pos);
+ATF_TC_HEAD(sqrtf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(sqrtf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+	float y = sqrtf(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(sqrtf_zero_neg);
+ATF_TC_HEAD(sqrtf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sqrtf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = sqrtf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("sqrtf(-0.0) != -0.0");
+}
+
+ATF_TC(sqrtf_zero_pos);
+ATF_TC_HEAD(sqrtf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sqrtf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = sqrtf(x);
+
+	if (fabsf(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("sqrtf(+0.0) != +0.0");
+}
+
+/*
+ * sqrtl(3)
+ */
+ATF_TC(sqrtl_nan);
+ATF_TC_HEAD(sqrtl_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(NaN) == NaN");
+}
+
+ATF_TC_BODY(sqrtl_nan, tc)
+{
+	const long double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(sqrtl(x)) != 0);
+}
+
+ATF_TC(sqrtl_powl);
+ATF_TC_HEAD(sqrtl_powl, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(3) vs. powl(3)");
+}
+
+ATF_TC_BODY(sqrtl_powl, tc)
+{
+	const long double x[] = { 0.0, 0.005, 1.0, 99.0, 123.123, 9999.9999 };
+	const long double eps = 5.0*DBL_EPSILON; /* XXX powl == pow for now */
+	volatile long double y, z;
+	size_t i;
+
+	for (i = 0; i < __arraycount(x); i++) {
+
+		y = sqrtl(x[i]);
+		z = powl(x[i], 1.0 / 2.0);
+
+		if (fabsl(y - z) > eps)
+			atf_tc_fail_nonfatal("sqrtl(%0.03Lf) != "
+			    "powl(%0.03Lf, 1/2)\n", x[i], x[i]);
+	}
+}
+
+ATF_TC(sqrtl_inf_neg);
+ATF_TC_HEAD(sqrtl_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(-Inf) == NaN");
+}
+
+ATF_TC_BODY(sqrtl_inf_neg, tc)
+{
+	const long double x = -1.0L / 0.0L;
+	long double y = sqrtl(x);
+
+	ATF_CHECK(isnan(y) != 0);
+}
+
+ATF_TC(sqrtl_inf_pos);
+ATF_TC_HEAD(sqrtl_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(+Inf) == +Inf");
+}
+
+ATF_TC_BODY(sqrtl_inf_pos, tc)
+{
+	const long double x = 1.0L / 0.0L;
+	long double y = sqrtl(x);
+
+	ATF_CHECK(isinf(y) != 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TC(sqrtl_zero_neg);
+ATF_TC_HEAD(sqrtl_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(sqrtl_zero_neg, tc)
+{
+	const long double x = -0.0L;
+	long double y = sqrtl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) == 0)
+		atf_tc_fail_nonfatal("sqrtl(-0.0) != -0.0");
+}
+
+ATF_TC(sqrtl_zero_pos);
+ATF_TC_HEAD(sqrtl_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sqrtl(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(sqrtl_zero_pos, tc)
+{
+	const long double x = 0.0L;
+	long double y = sqrtl(x);
+
+	if (fabsl(y) > 0.0 || signbit(y) != 0)
+		atf_tc_fail_nonfatal("sqrtl(+0.0) != +0.0");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sqrt_nan);
+	ATF_TP_ADD_TC(tp, sqrt_pow);
+	ATF_TP_ADD_TC(tp, sqrt_inf_neg);
+	ATF_TP_ADD_TC(tp, sqrt_inf_pos);
+	ATF_TP_ADD_TC(tp, sqrt_zero_neg);
+	ATF_TP_ADD_TC(tp, sqrt_zero_pos);
+
+	ATF_TP_ADD_TC(tp, sqrtf_nan);
+	ATF_TP_ADD_TC(tp, sqrtf_powf);
+	ATF_TP_ADD_TC(tp, sqrtf_inf_neg);
+	ATF_TP_ADD_TC(tp, sqrtf_inf_pos);
+	ATF_TP_ADD_TC(tp, sqrtf_zero_neg);
+	ATF_TP_ADD_TC(tp, sqrtf_zero_pos);
+
+	ATF_TP_ADD_TC(tp, sqrtl_nan);
+	ATF_TP_ADD_TC(tp, sqrtl_powl);
+	ATF_TP_ADD_TC(tp, sqrtl_inf_neg);
+	ATF_TP_ADD_TC(tp, sqrtl_inf_pos);
+	ATF_TP_ADD_TC(tp, sqrtl_zero_neg);
+	ATF_TP_ADD_TC(tp, sqrtl_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_tan.c b/contrib/netbsd-tests/lib/libm/t_tan.c
new file mode 100644
index 000000000000..807e3d1f3364
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_tan.c
@@ -0,0 +1,260 @@
+/* $NetBSD: t_tan.c,v 1.5 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+
+#include <atf-c.h>
+#include <math.h>
+
+static const struct {
+	int		angle;
+	double		x;
+	double		y;
+} angles[] = {
+	{ -180, -3.141592653589793,  0.0000000000000000 },
+	{ -135, -2.356194490192345,  1.0000000000000000 },
+	{  -45, -0.785398163397448, -1.0000000000000000 },
+	{    0,  0.000000000000000,  0.0000000000000000 },
+	{   30,  0.523598775598299,  0.5773502691896258 },
+	{   45,  0.785398163397448,  1.0000000000000000 },
+	{   60,  1.047197551196598,  1.7320508075688773 },
+	{  120,  2.094395102393195, -1.7320508075688773 },
+	{  135,  2.356194490192345, -1.0000000000000000 },
+	{  150,  2.617993877991494, -0.5773502691896258 },
+	{  180,  3.141592653589793,  0.0000000000000000 },
+	{  360,  6.283185307179586,  0.0000000000000000 }
+};
+
+/*
+ * tan(3)
+ */
+ATF_TC(tan_angles);
+ATF_TC_HEAD(tan_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(tan_angles, tc)
+{
+	const double eps = 1.0e-14;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		if (fabs(tan(angles[i].x) - angles[i].y) > eps)
+			atf_tc_fail_nonfatal("tan(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(tan_nan);
+ATF_TC_HEAD(tan_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tan(NaN) == NaN");
+}
+
+ATF_TC_BODY(tan_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(tan(x)) != 0);
+}
+
+ATF_TC(tan_inf_neg);
+ATF_TC_HEAD(tan_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tan(-Inf) == NaN");
+}
+
+ATF_TC_BODY(tan_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	ATF_CHECK(isnan(tan(x)) != 0);
+}
+
+ATF_TC(tan_inf_pos);
+ATF_TC_HEAD(tan_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tan(+Inf) == NaN");
+}
+
+ATF_TC_BODY(tan_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(isnan(tan(x)) != 0);
+}
+
+
+ATF_TC(tan_zero_neg);
+ATF_TC_HEAD(tan_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tan(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(tan_zero_neg, tc)
+{
+	const double x = -0.0L;
+
+	ATF_CHECK(tan(x) == x);
+}
+
+ATF_TC(tan_zero_pos);
+ATF_TC_HEAD(tan_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tan(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(tan_zero_pos, tc)
+{
+	const double x = 0.0L;
+
+	ATF_CHECK(tan(x) == x);
+}
+
+/*
+ * tanf(3)
+ */
+ATF_TC(tanf_angles);
+ATF_TC_HEAD(tanf_angles, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test some selected angles");
+}
+
+ATF_TC_BODY(tanf_angles, tc)
+{
+	const float eps = 1.0e-6;
+	float x, y;
+	size_t i;
+
+	for (i = 0; i < __arraycount(angles); i++) {
+
+		x = angles[i].x;
+		y = angles[i].y;
+
+		if (fabsf(tanf(x) - y) > eps)
+			atf_tc_fail_nonfatal("tanf(%d deg) != %0.01f",
+			    angles[i].angle, angles[i].y);
+	}
+}
+
+ATF_TC(tanf_nan);
+ATF_TC_HEAD(tanf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanf(NaN) == NaN");
+}
+
+ATF_TC_BODY(tanf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(tanf(x)) != 0);
+}
+
+ATF_TC(tanf_inf_neg);
+ATF_TC_HEAD(tanf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanf(-Inf) == NaN");
+}
+
+ATF_TC_BODY(tanf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	if (isnan(tanf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("tanf(-Inf) != NaN");
+	}
+}
+
+ATF_TC(tanf_inf_pos);
+ATF_TC_HEAD(tanf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanf(+Inf) == NaN");
+}
+
+ATF_TC_BODY(tanf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	if (isnan(tanf(x)) == 0) {
+		atf_tc_expect_fail("PR lib/45362");
+		atf_tc_fail("tanf(+Inf) != NaN");
+	}
+}
+
+
+ATF_TC(tanf_zero_neg);
+ATF_TC_HEAD(tanf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(tanf_zero_neg, tc)
+{
+	const float x = -0.0L;
+
+	ATF_CHECK(tanf(x) == x);
+}
+
+ATF_TC(tanf_zero_pos);
+ATF_TC_HEAD(tanf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(tanf_zero_pos, tc)
+{
+	const float x = 0.0L;
+
+	ATF_CHECK(tanf(x) == x);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, tan_angles);
+	ATF_TP_ADD_TC(tp, tan_nan);
+	ATF_TP_ADD_TC(tp, tan_inf_neg);
+	ATF_TP_ADD_TC(tp, tan_inf_pos);
+	ATF_TP_ADD_TC(tp, tan_zero_neg);
+	ATF_TP_ADD_TC(tp, tan_zero_pos);
+
+	ATF_TP_ADD_TC(tp, tanf_angles);
+	ATF_TP_ADD_TC(tp, tanf_nan);
+	ATF_TP_ADD_TC(tp, tanf_inf_neg);
+	ATF_TP_ADD_TC(tp, tanf_inf_pos);
+	ATF_TP_ADD_TC(tp, tanf_zero_neg);
+	ATF_TP_ADD_TC(tp, tanf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libm/t_tanh.c b/contrib/netbsd-tests/lib/libm/t_tanh.c
new file mode 100644
index 000000000000..4cc4551b842c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libm/t_tanh.c
@@ -0,0 +1,207 @@
+/* $NetBSD: t_tanh.c,v 1.7 2014/03/03 10:39:08 martin Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_tanh.c,v 1.7 2014/03/03 10:39:08 martin Exp $");
+
+#include <atf-c.h>
+#include <math.h>
+
+/*
+ * tanh(3)
+ */
+ATF_TC(tanh_nan);
+ATF_TC_HEAD(tanh_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanh(NaN) == NaN");
+}
+
+ATF_TC_BODY(tanh_nan, tc)
+{
+	const double x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(tanh(x)) != 0);
+}
+
+ATF_TC(tanh_inf_neg);
+ATF_TC_HEAD(tanh_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanh(-Inf) == -1.0");
+}
+
+ATF_TC_BODY(tanh_inf_neg, tc)
+{
+	const double x = -1.0L / 0.0L;
+
+	ATF_CHECK(tanh(x) == -1.0);
+}
+
+ATF_TC(tanh_inf_pos);
+ATF_TC_HEAD(tanh_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanh(+Inf) == +1.0");
+}
+
+ATF_TC_BODY(tanh_inf_pos, tc)
+{
+	const double x = 1.0L / 0.0L;
+
+	ATF_CHECK(tanh(x) == 1.0);
+}
+
+ATF_TC(tanh_zero_neg);
+ATF_TC_HEAD(tanh_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanh(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(tanh_zero_neg, tc)
+{
+	const double x = -0.0L;
+	double y = tanh(x);
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) != 0);
+
+	ATF_REQUIRE_MSG(signbit(y) != 0,
+	    "compiler bug, waiting for newer gcc import, see PR lib/44057");
+}
+
+ATF_TC(tanh_zero_pos);
+ATF_TC_HEAD(tanh_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanh(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(tanh_zero_pos, tc)
+{
+	const double x = 0.0L;
+	double y = tanh(x);
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+/*
+ * tanhf(3)
+ */
+ATF_TC(tanhf_nan);
+ATF_TC_HEAD(tanhf_nan, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanhf(NaN) == NaN");
+}
+
+ATF_TC_BODY(tanhf_nan, tc)
+{
+	const float x = 0.0L / 0.0L;
+
+	ATF_CHECK(isnan(x) != 0);
+	ATF_CHECK(isnan(tanhf(x)) != 0);
+}
+
+ATF_TC(tanhf_inf_neg);
+ATF_TC_HEAD(tanhf_inf_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanhf(-Inf) == -1.0");
+}
+
+ATF_TC_BODY(tanhf_inf_neg, tc)
+{
+	const float x = -1.0L / 0.0L;
+
+	ATF_CHECK(tanhf(x) == -1.0);
+}
+
+ATF_TC(tanhf_inf_pos);
+ATF_TC_HEAD(tanhf_inf_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanhf(+Inf) == +1.0");
+}
+
+ATF_TC_BODY(tanhf_inf_pos, tc)
+{
+	const float x = 1.0L / 0.0L;
+
+	ATF_CHECK(tanhf(x) == 1.0);
+}
+
+ATF_TC(tanhf_zero_neg);
+ATF_TC_HEAD(tanhf_zero_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanhf(-0.0) == -0.0");
+}
+
+ATF_TC_BODY(tanhf_zero_neg, tc)
+{
+	const float x = -0.0L;
+	float y = tanh(x);
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) != 0);
+
+	ATF_REQUIRE_MSG(signbit(y) != 0,
+	    "compiler bug, waiting for newer gcc import, see PR lib/44057");
+}
+
+ATF_TC(tanhf_zero_pos);
+ATF_TC_HEAD(tanhf_zero_pos, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test tanhf(+0.0) == +0.0");
+}
+
+ATF_TC_BODY(tanhf_zero_pos, tc)
+{
+	const float x = 0.0L;
+	float y = tanhf(x);
+
+	ATF_CHECK(x == y);
+	ATF_CHECK(signbit(x) == 0);
+	ATF_CHECK(signbit(y) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, tanh_nan);
+	ATF_TP_ADD_TC(tp, tanh_inf_neg);
+	ATF_TP_ADD_TC(tp, tanh_inf_pos);
+	ATF_TP_ADD_TC(tp, tanh_zero_neg);
+	ATF_TP_ADD_TC(tp, tanh_zero_pos);
+
+	ATF_TP_ADD_TC(tp, tanhf_nan);
+	ATF_TP_ADD_TC(tp, tanhf_inf_neg);
+	ATF_TP_ADD_TC(tp, tanhf_inf_pos);
+	ATF_TP_ADD_TC(tp, tanhf_zero_neg);
+	ATF_TP_ADD_TC(tp, tanhf_zero_pos);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libobjc/t_threads.m b/contrib/netbsd-tests/lib/libobjc/t_threads.m
new file mode 100644
index 000000000000..a6bd72027f7b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libobjc/t_threads.m
@@ -0,0 +1,136 @@
+/* $NetBSD: t_threads.m,v 1.2 2013/10/31 21:02:11 christos Exp $ */
+
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/* Originally written by David Wetzel */
+
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include <objc/objc.h>
+#include <objc/thr.h>
+#include <objc/Object.h>
+#if __GNUC_PREREQ__(4,8)
+#include <objc/runtime.h>
+#endif
+
+static int IsMultithreaded = 0;
+static objc_mutex_t Mutex;
+static objc_condition_t Condition;
+
+@interface MyClass : Object
+{
+}
+-(void)start;
+#if __GNUC_PREREQ__(4,8)
+-init;
++new;
++alloc;
+-free;
+#endif
+@end
+
+@implementation MyClass
+-(void)start
+{
+	printf("detached thread started!\n");
+
+	objc_condition_signal(Condition);
+}
+#if __GNUC_PREREQ__(4,8)
+-init
+{
+	return self;
+}
+
++new
+{
+	return [[self alloc] init];
+}
+
++alloc
+{
+	return class_createInstance(self, 0);
+}
+
+-free
+{
+	return object_dispose(self);
+}
+#endif
+@end
+
+static void
+becomeMultiThreaded(void)
+{
+	printf("becoming multithreaded!\n");
+	IsMultithreaded++;
+}
+
+ATF_TC(thread_callback);
+ATF_TC_HEAD(thread_callback, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that the thread callback is only"
+	    "called once");
+}
+ATF_TC_BODY(thread_callback, tc)
+{
+	id o = [MyClass new];
+	objc_thread_callback cb;
+	objc_thread_t rv;
+
+	cb = objc_set_thread_callback(becomeMultiThreaded);
+	printf("Old Callback: %p\n", cb);
+	ATF_CHECK(cb == 0);
+
+	Mutex = objc_mutex_allocate();
+	Condition = objc_condition_allocate();
+
+	ATF_CHECK_EQ(0, IsMultithreaded);
+
+	rv = objc_thread_detach(@selector(start), o, nil);
+	printf("detach value: %p\n", rv);
+	assert(rv != NULL);
+
+	objc_mutex_lock(Mutex);
+	objc_condition_wait(Condition, Mutex);
+	objc_mutex_unlock(Mutex);
+
+	ATF_CHECK_EQ(1, IsMultithreaded);
+	printf("Shutting down\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, thread_callback);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libposix/t_rename.c b/contrib/netbsd-tests/lib/libposix/t_rename.c
new file mode 100644
index 000000000000..85b2b95b3a68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libposix/t_rename.c
@@ -0,0 +1,89 @@
+/* $NetBSD: t_rename.c,v 1.2 2011/05/16 00:03:36 christos Exp $ */
+
+/*
+ * Copyright (c) 2001, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#define _NETBSD_SOURCE	/* strlcat/random */
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_rename.c,v 1.2 2011/05/16 00:03:36 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(rename);
+ATF_TC_HEAD(rename, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks rename(2)");
+}
+ATF_TC_BODY(rename, tc)
+{
+	struct stat sb;
+
+	REQUIRE_LIBC(open("t1", O_CREAT | O_TRUNC | O_WRONLY, 0600), -1);
+	REQUIRE_LIBC(link("t1", "t2"), -1);
+
+	/* Check if rename to same name works as expected */
+	REQUIRE_LIBC(rename("t1", "t1"), -1);
+
+	/* Rename removed file? */
+	REQUIRE_LIBC(stat("t1", &sb), -1);
+
+	REQUIRE_LIBC(rename("t1", "t2"), -1);
+
+#if BSD_RENAME
+	/* check if rename of hardlinked file works the BSD way */
+	ATF_REQUIRE_MSG(stat("t1", &sb) != 0, "BSD rename should remove file t1");
+	ATF_REQUIRE_EQ(errno, ENOENT);
+#else
+	/* check if rename of hardlinked file works as the standard says */
+	REQUIRE_LIBC(stat("t1", &sb), -1);
+#endif
+	/* check if we get the expected error */
+	/* this also exercises icky shared libraries goo */
+	ATF_REQUIRE_MSG(rename("no/such/file/or/dir", "no/such/file/or/dir") != 0,
+		"No error renaming nonexistent file");
+	ATF_REQUIRE_EQ(errno, ENOENT);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, rename);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libppath/personnel.plist b/contrib/netbsd-tests/lib/libppath/personnel.plist
new file mode 100644
index 000000000000..daec88c36201
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libppath/personnel.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>John Doe</key>
+	<dict>
+		<key>children</key>
+		<array>
+			<string>Jane Doe</string>
+			<string>John Doe, Jr.</string>
+		</array>
+
+		<key>pets</key>
+		<array>
+			<string>Fido</string>
+			<string>Spot</string>
+		</array>
+
+		<key>job title</key>
+		<string>computer programmer</string>
+
+		<key>u.s. citizen</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/contrib/netbsd-tests/lib/libppath/plist_to_c b/contrib/netbsd-tests/lib/libppath/plist_to_c
new file mode 100755
index 000000000000..f471b4e708fb
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libppath/plist_to_c
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+prog=$(basename $0)
+usage()
+{
+	echo "usage: ${prog} symbol" 1>&2
+	exit 1
+}
+
+if [ $# -ne 1 ]; then
+	usage
+fi
+
+sed 's/\(["\]\)/\\\1/g' | \
+${AWK:-awk} -v sym=$1 '
+BEGIN	{ printf "const char " sym "[] = \""; }
+	{ printf $0 "\\n"; }
+END	{ print "\";"; }'
+
+exit 0
diff --git a/contrib/netbsd-tests/lib/libppath/t_ppath.c b/contrib/netbsd-tests/lib/libppath/t_ppath.c
new file mode 100644
index 000000000000..73307639de78
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libppath/t_ppath.c
@@ -0,0 +1,1548 @@
+/* $Id: t_ppath.c,v 1.1 2011/08/25 19:09:46 dyoung Exp $ */
+
+/* Copyright (c) 2010 David Young.  All rights reserved. */
+
+#include <sys/cdefs.h>
+__RCSID("$Id: t_ppath.c,v 1.1 2011/08/25 19:09:46 dyoung Exp $");
+
+#include <assert.h>
+#include <atf-c.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <ppath/ppath.h>
+#include "personnel.h"
+
+void test_ppath_extant_inc(void);
+void test_ppath_extant_dec(void);
+void test_ppath_component_extant_inc(void);
+void test_ppath_component_extant_dec(void);
+
+__strong_alias(ppath_extant_inc, test_ppath_extant_inc);
+__strong_alias(ppath_extant_dec, test_ppath_extant_dec);
+__strong_alias(ppath_component_extant_inc, test_ppath_component_extant_inc);
+__strong_alias(ppath_component_extant_dec, test_ppath_component_extant_dec);
+
+static uint64_t nppath = 0, nppath_component = 0;
+
+static bool
+dictionary_equals(prop_dictionary_t ld, prop_dictionary_t rd)
+{
+	bool eq;
+	char *lt, *rt;
+
+	lt = prop_dictionary_externalize(ld);
+	rt = prop_dictionary_externalize(rd);
+
+	assert(lt != NULL && rt != NULL);
+
+	eq = (strcmp(lt, rt) == 0);
+
+	free(lt);
+	free(rt);
+
+	return eq;
+}
+
+static void
+assert_no_ppath_extant(void)
+{
+	ATF_CHECK_EQ(nppath, 0);
+}
+
+static void
+assert_no_ppath_component_extant(void)
+{
+	ATF_CHECK_EQ(nppath_component, 0);
+}
+
+void
+test_ppath_extant_inc(void)
+{
+	if (++nppath == 0)
+		atf_tc_fail("count of extant paths overflowed");
+}
+
+void
+test_ppath_extant_dec(void)
+{
+	if (nppath-- == 0)
+		atf_tc_fail("count of extant path underflowed");
+}
+
+void
+test_ppath_component_extant_inc(void)
+{
+	if (++nppath_component == 0)
+		atf_tc_fail("count of extant path components overflowed");
+}
+
+void
+test_ppath_component_extant_dec(void)
+{
+	if (nppath_component-- == 0)
+		atf_tc_fail("count of extant path components underflowed");
+}
+
+ATF_TC(push_until_full);
+
+ATF_TC_HEAD(push_until_full, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_push() returns error "
+	    "after ppath_t reaches maximum length");
+}
+
+ATF_TC_BODY(push_until_full, tc)
+{
+	ppath_t *p, *rp;
+	ppath_component_t *pc;
+	int i;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if ((pc = ppath_idx(0)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		rp = ppath_push(p, pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	rp = ppath_push(p, pc);
+	ATF_CHECK_EQ(rp, NULL);
+
+	rp = ppath_push(p, pc);
+	ATF_CHECK_EQ(rp, NULL);
+
+	ppath_component_release(pc);
+	ppath_release(p);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(pop_until_empty);
+ATF_TC_HEAD(pop_until_empty, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_pop() returns error "
+	    "after ppath_t is empty");
+}
+
+ATF_TC_BODY(pop_until_empty, tc)
+{
+	ppath_t *p, *rp;
+	ppath_component_t *pc, *rpc;
+	int i;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if ((pc = ppath_idx(0)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		rp = ppath_push(p, pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		rp = ppath_pop(p, &rpc);
+		ATF_CHECK_EQ(rp, p);
+		ATF_CHECK_EQ(rpc, pc);
+		ppath_component_release(rpc);
+	}
+
+	rp = ppath_pop(p, &rpc);
+	ATF_CHECK_EQ(rp, NULL);
+	rp = ppath_pop(p, &rpc);
+	ATF_CHECK_EQ(rp, NULL);
+
+	ppath_component_release(pc);
+	ppath_release(p);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(length);
+
+ATF_TC_HEAD(length, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check that ppath_push() "
+	    "and ppath_pop() affect ppath_length() correctly");
+}
+
+ATF_TC_BODY(length, tc)
+{
+	ppath_t *p, *rp;
+	ppath_component_t *pc;
+	unsigned int i, len;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if ((pc = ppath_idx(0)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		len = ppath_length(p);
+		ATF_CHECK_EQ(len, i);
+		rp = ppath_push(p, pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		len = ppath_length(p);
+		ATF_CHECK_EQ(len, PPATH_MAX_COMPONENTS - i);
+		rp = ppath_pop(p, NULL);
+		ATF_CHECK_EQ(rp, p);
+	}
+	ppath_component_release(pc);
+	ppath_release(p);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(component_at);
+
+ATF_TC_HEAD(component_at, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check that ppath_component_at() "
+	    "returns the expected component");
+}
+
+ATF_TC_BODY(component_at, tc)
+{
+	ppath_t *p, *rp;
+	ppath_component_t *pc;
+	unsigned int i;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		if ((pc = ppath_idx(i)) == NULL)
+			atf_tc_fail("ppath_idx failed");
+		rp = ppath_push(p, pc);
+		ppath_component_release(pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		pc = ppath_component_at(p, i);
+		ATF_CHECK_EQ(ppath_component_idx(pc), (int)i);
+		ppath_component_release(pc);
+	}
+	ppath_release(p);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_idx_key);
+
+ATF_TC_HEAD(get_idx_key, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check that ppath_component_idx() "
+	    "and ppath_component_key() return -1 and NULL, respectively, if "
+	    "the component is a key or an index, respectively.");
+}
+
+ATF_TC_BODY(get_idx_key, tc)
+{
+	ppath_component_t *idx, *key;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((idx = ppath_idx(0)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+	if ((key = ppath_key("key")) == NULL)
+		atf_tc_fail("ppath_idx failed");
+
+	ATF_CHECK_EQ(ppath_component_key(idx), NULL);
+	ATF_CHECK_EQ(ppath_component_idx(key), -1);
+
+	ppath_component_release(idx);
+	ppath_component_release(key);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(ppath_copy);
+
+ATF_TC_HEAD(ppath_copy, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check that ppath_copy() "
+	    "creates an exact replica of a path, and that no "
+	    "resources are leaked.");
+}
+
+ATF_TC_BODY(ppath_copy, tc)
+{
+	ppath_component_t *pc, *cpc;
+	ppath_t *p, *cp, *rp;
+	unsigned int i;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		if ((pc = ppath_idx(i)) == NULL)
+			atf_tc_fail("ppath_idx failed");
+		rp = ppath_push(p, pc);
+		ppath_component_release(pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	if ((cp = ppath_copy(p)) == NULL)
+		atf_tc_fail("ppath_copy failed");
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		pc = ppath_component_at(p, i);
+		cpc = ppath_component_at(cp, i);
+		ATF_CHECK_EQ(pc, cpc);
+		ppath_component_release(pc);
+		ppath_component_release(cpc);
+	}
+
+	ppath_release(cp);
+	ppath_release(p);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(replace);
+
+ATF_TC_HEAD(replace, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check that ppath_replace_idx() "
+	    "and ppath_replace_key() produce the paths we expect without "
+	    "leaking resources.");
+}
+
+ATF_TC_BODY(replace, tc)
+{
+	ppath_component_t *pc;
+	ppath_t *p, *cp, *rp;
+	unsigned int i;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	/* index replacement fails on an empty path */
+	rp = ppath_replace_idx(p, 0);
+	ATF_CHECK_EQ(rp, NULL);
+
+	/* key replacement fails on an empty path */
+	rp = ppath_replace_key(p, "key");
+	ATF_CHECK_EQ(rp, NULL);
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS; i++) {
+		if ((pc = ppath_idx(i)) == NULL)
+			atf_tc_fail("ppath_idx failed");
+		rp = ppath_push(p, pc);
+		ppath_component_release(pc);
+		ATF_CHECK_EQ(rp, p);
+	}
+
+	if ((cp = ppath_copy(p)) == NULL)
+		atf_tc_fail("ppath_copy failed");
+
+	rp = ppath_pop(cp, NULL);
+	ATF_CHECK_EQ(rp, cp);
+	rp = ppath_push_key(cp, "key");
+	ATF_CHECK_EQ(rp, cp);
+
+	ppath_replace_idx(p, 0);
+
+	if ((pc = ppath_component_at(p, PPATH_MAX_COMPONENTS - 1)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+	ATF_CHECK_EQ(ppath_component_idx(pc), 0);
+	ppath_component_release(pc);
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS - 1; i++) {
+		if ((pc = ppath_component_at(p, i)) == NULL)
+			atf_tc_fail("ppath_idx failed");
+		ATF_CHECK_EQ(ppath_component_idx(pc), (int)i);
+		ppath_component_release(pc);
+	}
+
+	for (i = 0; i < PPATH_MAX_COMPONENTS - 1; i++) {
+		if ((pc = ppath_component_at(cp, i)) == NULL)
+			atf_tc_fail("ppath_idx failed");
+		ATF_CHECK_EQ(ppath_component_idx(pc), (int)i);
+		ppath_component_release(pc);
+	}
+
+	if ((pc = ppath_component_at(cp, PPATH_MAX_COMPONENTS - 1)) == NULL)
+		atf_tc_fail("ppath_idx failed");
+	if (ppath_component_key(pc) == NULL ||
+	    strcmp(ppath_component_key(pc), "key") != 0)
+		atf_tc_fail("last path component expected to be \"key\"");
+	ppath_component_release(pc);
+	ppath_release(p);
+	ppath_release(cp);
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(copyset_object_twice_success);
+
+ATF_TC_HEAD(copyset_object_twice_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "check that after back-to-back ppath_copyset_object() calls, "
+	    "changing the \"u.s. citizen\" property and the first property "
+	    "in \"children\" in the \"John Doe\" record in the "
+	    "\"personnel\" property list, the properties are changed "
+	    "in the new dictionary and unchanged in the old dictionary");
+}
+
+ATF_TC_BODY(copyset_object_twice_success, tc)
+{
+	const char *s;
+	char *oext, *next;
+	int rc;
+	bool v = false;
+	prop_dictionary_t d, od;
+	prop_object_t nd = NULL, ond;
+	prop_object_t r, or;
+	ppath_t *p, *p2, *p3;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+	od = prop_dictionary_copy(d);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("dictionaries are unequal from the outset, argh! "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if ((p = ppath_create()) == NULL || (p2 = ppath_create()) == NULL ||
+	    (p3 = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	if (ppath_push_key(p2, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p2, "children") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_idx(p2, 0) == NULL)
+		atf_tc_fail("ppath_push_idx failed");
+
+	if (ppath_push_key(p3, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	s = "";
+	rc = ppath_get_string(d, p2, &s);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_STREQ(s, "Jane Doe");
+
+	rc = ppath_copyset_bool(d, &nd, p, false);
+	ATF_CHECK_EQ(rc, 0);
+
+	rc = ppath_get_object(nd, p3, &r);
+	ATF_CHECK_EQ(rc, 0);
+
+	ond = nd;
+
+	rc = ppath_copyset_string(d, &nd, p2, "Martha Doe");
+	ATF_CHECK_EQ(rc, 0);
+
+	ATF_CHECK_EQ(nd, ond);
+
+	rc = ppath_get_object(nd, p3, &or);
+	ATF_CHECK_EQ(rc, 0);
+
+	ATF_CHECK_EQ(r, or);
+
+	v = true;
+	rc = ppath_get_bool(nd, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, false);
+
+	s = "";
+	rc = ppath_get_string(nd, p2, &s);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_STREQ(s, "Martha Doe");
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("copydel modified original dictionary, "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if (dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made no change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	rc = ppath_set_bool(od, p, false);
+	ATF_CHECK_EQ(rc, 0);
+
+	rc = ppath_set_string(od, p2, "Martha Doe");
+	ATF_CHECK_EQ(rc, 0);
+
+	if (!dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made an out-of-bounds change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	ppath_release(p);
+	ppath_release(p2);
+	ppath_release(p3);
+	prop_object_release(d);
+	prop_object_release(od);
+	prop_object_release(nd);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(copydel_object_twice_success);
+
+ATF_TC_HEAD(copydel_object_twice_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "check that after back-to-back ppath_copydel_object() calls, "
+	    "removing the \"u.s. citizen\" property and the first property "
+	    "in \"children\" from the \"John Doe\" record in the "
+	    "\"personnel\" property list, the properties are missing "
+	    "from the new dictionary and unchanged in the old dictionary");
+}
+
+ATF_TC_BODY(copydel_object_twice_success, tc)
+{
+	const char *s;
+	char *oext, *next;
+	int rc;
+	bool v = false;
+	prop_dictionary_t d, od;
+	prop_object_t nd = NULL, ond;
+	prop_object_t r, or;
+	ppath_t *p, *p2, *p3;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+	od = prop_dictionary_copy(d);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("dictionaries are unequal from the outset, argh! "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if ((p = ppath_create()) == NULL || (p2 = ppath_create()) == NULL ||
+	    (p3 = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	if (ppath_push_key(p2, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p2, "children") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_idx(p2, 0) == NULL)
+		atf_tc_fail("ppath_push_idx failed");
+
+	if (ppath_push_key(p3, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	s = "";
+	rc = ppath_get_string(d, p2, &s);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_STREQ(s, "Jane Doe");
+
+	rc = ppath_copydel_bool(d, &nd, p);
+	ATF_CHECK_EQ(rc, 0);
+
+	ond = nd;
+
+	rc = ppath_get_object(nd, p3, &r);
+	ATF_CHECK_EQ(rc, 0);
+
+	rc = ppath_copydel_string(d, &nd, p2);
+	ATF_CHECK_EQ(rc, 0);
+
+	ATF_CHECK_EQ(nd, ond);
+
+	rc = ppath_get_object(nd, p3, &or);
+	ATF_CHECK_EQ(rc, 0);
+
+	ATF_CHECK_EQ(r, or);
+
+	v = true;
+	rc = ppath_get_bool(nd, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, true);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("copydel modified original dictionary, "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if (dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made no change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	rc = ppath_delete_bool(od, p);
+	ATF_CHECK_EQ(rc, 0);
+
+	rc = ppath_delete_string(od, p2);
+	ATF_CHECK_EQ(rc, 0);
+
+	if (!dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made an out-of-bounds change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	ppath_release(p);
+	ppath_release(p2);
+	ppath_release(p3);
+	prop_object_release(d);
+	prop_object_release(od);
+	prop_object_release(nd);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(copydel_bool_success);
+
+ATF_TC_HEAD(copydel_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_copydel_bool() deletes "
+	    "the \"u.s. citizen\" property in the \"John Doe\" record in the "
+	    "\"personnel\" property list and verifies the value is missing "
+	    "from the new dictionary and unchanged in the old dictionary");
+}
+
+ATF_TC_BODY(copydel_bool_success, tc)
+{
+	char *oext, *next;
+	int rc;
+	bool v = false;
+	prop_dictionary_t d, od;
+	prop_object_t nd = NULL;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+	od = prop_dictionary_copy(d);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("dictionaries are unequal from the outset, argh! "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	rc = ppath_copydel_bool(d, &nd, p);
+	ATF_CHECK_EQ(rc, 0);
+
+	v = true;
+	rc = ppath_get_bool(nd, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, true);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("copydel modified original dictionary, "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if (dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made no change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	rc = ppath_delete_bool(od, p);
+	ATF_CHECK_EQ(rc, 0);
+
+	if (!dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copydel made an out-of-bounds change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	ppath_release(p);
+	prop_object_release(d);
+	prop_object_release(od);
+	prop_object_release(nd);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(copyset_bool_success);
+
+ATF_TC_HEAD(copyset_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_copyset_bool() sets "
+	    "the \"u.s. citizen\" property in the \"John Doe\" record in the "
+	    "\"personnel\" property list to false and verifies the new value "
+	    "in the new dictionary and that the old dictionary is unchanged");
+}
+
+ATF_TC_BODY(copyset_bool_success, tc)
+{
+	char *oext, *next;
+	int rc;
+	bool v = false;
+	prop_dictionary_t d, od;
+	prop_object_t nd = NULL;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+	od = prop_dictionary_copy(d);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("dictionaries are unequal from the outset, argh! "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	rc = ppath_copyset_bool(d, &nd, p, false);
+	ATF_CHECK_EQ(rc, 0);
+
+	v = true;
+	rc = ppath_get_bool(nd, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, false);
+
+	if (!dictionary_equals(od, d)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(d);
+		atf_tc_fail("copyset modified original dictionary, "
+		    "original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	if (dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copyset made no change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	rc = ppath_set_bool(nd, p, true);
+	ATF_CHECK_EQ(rc, 0);
+
+	if (!dictionary_equals(od, nd)) {
+		oext = prop_dictionary_externalize(od);
+		next = prop_dictionary_externalize(nd);
+		atf_tc_fail("copyset made an out-of-bounds change to the new "
+		    "dictionary, original\n%s\nnew\n%s", oext, next);
+		free(oext);
+		free(next);
+	}
+
+	ppath_release(p);
+	prop_object_release(d);
+	prop_object_release(od);
+	prop_object_release(nd);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(set_bool_eftype);
+
+ATF_TC_HEAD(set_bool_eftype, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_set_bool() does not "
+	    "overwrite with a bool "
+	    "the \"job title\" property in the \"John Doe\" record in "
+	    "the "
+	    "\"personnel\" property list");
+}
+
+ATF_TC_BODY(set_bool_eftype, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "job title") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_EQ(v, false);
+
+	rc = ppath_set_bool(d, p, false);
+	ATF_CHECK_EQ(rc, EFTYPE);
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_EQ(v, true);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(set_bool_enoent);
+
+ATF_TC_HEAD(set_bool_enoent, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_set_bool() does not create "
+	    "the \"russian citizen\" property in the \"John Doe\" record in "
+	    "the "
+	    "\"personnel\" property list");
+}
+
+ATF_TC_BODY(set_bool_enoent, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "russian citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, false);
+
+	rc = ppath_set_bool(d, p, false);
+	ATF_CHECK_EQ(rc, ENOENT);
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, true);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(create_bool_eexist);
+
+ATF_TC_HEAD(create_bool_eexist, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_create_bool() returns "
+	    "EEXIST because the \"u.s. citizen\" property in the "
+	    "\"John Doe\" record in the \"personnel\" property list "
+	    "already exists");
+}
+
+ATF_TC_BODY(create_bool_eexist, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	rc = ppath_create_bool(d, p, false);
+	ATF_CHECK_EQ(rc, EEXIST);
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(create_bool_success);
+
+ATF_TC_HEAD(create_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_create_bool() creates "
+	    "the \"russian citizen\" property in the \"John Doe\" record in "
+	    "the \"personnel\" property list and sets it to false");
+}
+
+ATF_TC_BODY(create_bool_success, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "russian citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, false);
+
+	rc = ppath_create_bool(d, p, false);
+	ATF_CHECK_EQ(rc, 0);
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, false);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(set_bool_success);
+
+ATF_TC_HEAD(set_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_set_bool() sets "
+	    "the \"u.s. citizen\" property in the \"John Doe\" record in the "
+	    "\"personnel\" property list to false and verifies the new value");
+}
+
+ATF_TC_BODY(set_bool_success, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	rc = ppath_set_bool(d, p, v);
+	ATF_CHECK_EQ(rc, 0);
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_bool_success);
+
+ATF_TC_HEAD(get_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_bool() fetches "
+	    "the \"u.s. citizen\" property from the \"John Doe\" record in the "
+	    "\"personnel\" property list, and compares it with the expected "
+	    "value, true");
+}
+
+ATF_TC_BODY(get_bool_success, tc)
+{
+	int rc;
+	bool v = false;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_EQ(v, true);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(delete_bool_success);
+
+ATF_TC_HEAD(delete_bool_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_delete_bool() succeeds "
+	    "for the path (\"John Doe\", \"u.s. citizen\") in the "
+	    "\"personnel\" property list");
+}
+
+ATF_TC_BODY(delete_bool_success, tc)
+{
+	int rc;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	rc = ppath_delete_bool(d, p);
+	ATF_CHECK_EQ(rc, 0);
+
+	rc = ppath_get_bool(d, p, NULL);
+	ATF_CHECK_EQ(rc, ENOENT);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(delete_bool_eftype);
+
+ATF_TC_HEAD(delete_bool_eftype, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_delete_bool() returns "
+	    "EFTYPE for the path (\"John Doe\", \"job title\") in the "
+	    "\"personnel\" property list and does not delete the path");
+}
+
+ATF_TC_BODY(delete_bool_eftype, tc)
+{
+	int rc;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "job title") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	rc = ppath_delete_bool(d, p);
+	ATF_CHECK_EQ(rc, EFTYPE);
+
+	rc = ppath_get_object(d, p, NULL);
+	ATF_CHECK_EQ(rc, 0);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(delete_bool_enoent);
+
+ATF_TC_HEAD(delete_bool_enoent, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_delete_bool() returns "
+	    "ENOENT for the path (\"John Doe\", \"citizen\") in the "
+	    "\"personnel\" property list");
+}
+
+ATF_TC_BODY(delete_bool_enoent, tc)
+{
+	int rc;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	rc = ppath_delete_bool(d, p);
+	ATF_CHECK_EQ(rc, ENOENT);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_bool_enoent);
+
+ATF_TC_HEAD(get_bool_enoent, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_bool() returns "
+	    "ENOENT for the path (\"John Doe\", \"citizen\") in the "
+	    "\"personnel\" property list, and the bool * argument is "
+	    "unchanged");
+}
+
+ATF_TC_BODY(get_bool_enoent, tc)
+{
+	int rc;
+	bool v;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, true);
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, false);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_bool_eftype);
+
+ATF_TC_HEAD(get_bool_eftype, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_bool() returns "
+	    "EFTYPE for the path (\"John Doe\", \"job title\") in the "
+	    "\"personnel\" property list, and the bool * argument is "
+	    "unchanged");
+}
+
+ATF_TC_BODY(get_bool_eftype, tc)
+{
+	int rc;
+	bool v;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "job title") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = true;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_EQ(v, true);
+
+	v = false;
+	rc = ppath_get_bool(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_EQ(v, false);
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_string_eftype);
+
+ATF_TC_HEAD(get_string_eftype, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_string() returns "
+	    "EFTYPE for the path (\"John Doe\", \"u.s. citizen\") in the "
+	    "\"personnel\" property list, and the const char ** argument is "
+	    "unchanged");
+}
+
+ATF_TC_BODY(get_string_eftype, tc)
+{
+	int rc;
+	const char *v;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "u.s. citizen") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = NULL;
+	rc = ppath_get_string(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_EQ(v, NULL);
+
+	v = "xyz";
+	rc = ppath_get_string(d, p, &v);
+	ATF_CHECK_EQ(rc, EFTYPE);
+	ATF_CHECK_STREQ(v, "xyz");
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_string_enoent);
+
+ATF_TC_HEAD(get_string_enoent, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_string() returns "
+	    "ENOENT for the path (\"John Doe\", \"title\") in the "
+	    "\"personnel\" property list, and the const char ** argument is "
+	    "unchanged");
+}
+
+ATF_TC_BODY(get_string_enoent, tc)
+{
+	int rc;
+	const char *v;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "title") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	v = NULL;
+	rc = ppath_get_string(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_EQ(v, NULL);
+
+	v = "xyz";
+	rc = ppath_get_string(d, p, &v);
+	ATF_CHECK_EQ(rc, ENOENT);
+	ATF_CHECK_STREQ(v, "xyz");
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TC(get_string_success);
+
+ATF_TC_HEAD(get_string_success, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "check ppath_get_string() fetches "
+	    "the \"job title\" property from the \"John Doe\" record in the "
+	    "\"personnel\" property list and compares it with the expected "
+	    "value, \"computer programmer\"");
+}
+
+ATF_TC_BODY(get_string_success, tc)
+{
+	int rc;
+	const char *v = NULL;;
+	prop_dictionary_t d;
+	ppath_t *p;
+
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+
+	if ((d = prop_dictionary_internalize(personnel)) == NULL)
+		atf_tc_fail("prop_dictionary_internalize failed");
+
+	if ((p = ppath_create()) == NULL)
+		atf_tc_fail("ppath_create failed");
+
+	if (ppath_push_key(p, "John Doe") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+	if (ppath_push_key(p, "job title") == NULL)
+		atf_tc_fail("ppath_push_key failed");
+
+	rc = ppath_get_string(d, p, &v);
+	ATF_CHECK_EQ(rc, 0);
+	ATF_CHECK_STREQ(v, "computer programmer");
+
+	ppath_release(p);
+	prop_object_release(d);
+	assert_no_ppath_extant();
+	assert_no_ppath_component_extant();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, push_until_full);
+	ATF_TP_ADD_TC(tp, pop_until_empty);
+	ATF_TP_ADD_TC(tp, length);
+	ATF_TP_ADD_TC(tp, component_at);
+	ATF_TP_ADD_TC(tp, get_idx_key);
+	ATF_TP_ADD_TC(tp, ppath_copy);
+	ATF_TP_ADD_TC(tp, replace);
+
+	ATF_TP_ADD_TC(tp, delete_bool_eftype);
+	ATF_TP_ADD_TC(tp, delete_bool_enoent);
+	ATF_TP_ADD_TC(tp, delete_bool_success);
+
+	ATF_TP_ADD_TC(tp, get_bool_eftype);
+	ATF_TP_ADD_TC(tp, get_bool_enoent);
+	ATF_TP_ADD_TC(tp, get_bool_success);
+
+	ATF_TP_ADD_TC(tp, copydel_bool_success);
+	ATF_TP_ADD_TC(tp, copydel_object_twice_success);
+	ATF_TP_ADD_TC(tp, copyset_object_twice_success);
+	ATF_TP_ADD_TC(tp, copyset_bool_success);
+	ATF_TP_ADD_TC(tp, create_bool_eexist);
+	ATF_TP_ADD_TC(tp, create_bool_success);
+	ATF_TP_ADD_TC(tp, set_bool_enoent);
+	ATF_TP_ADD_TC(tp, set_bool_eftype);
+	ATF_TP_ADD_TC(tp, set_bool_success);
+
+	ATF_TP_ADD_TC(tp, get_string_eftype);
+	ATF_TP_ADD_TC(tp, get_string_enoent);
+	ATF_TP_ADD_TC(tp, get_string_success);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libprop/t_basic.c b/contrib/netbsd-tests/lib/libprop/t_basic.c
new file mode 100644
index 000000000000..febf29db9009
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libprop/t_basic.c
@@ -0,0 +1,203 @@
+/* $NetBSD: t_basic.c,v 1.4 2011/04/20 20:02:58 martin Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Written by Jason Thorpe 5/26/2006.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_basic.c,v 1.4 2011/04/20 20:02:58 martin Exp $");
+
+#include <stdlib.h>
+#include <string.h>
+#include <prop/proplib.h>
+
+#include <atf-c.h>
+
+static const char compare1[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+"<plist version=\"1.0\">\n"
+"<dict>\n"
+"	<key>false-val</key>\n"
+"	<false/>\n"
+"	<key>one</key>\n"
+"	<integer>1</integer>\n"
+"	<key>three</key>\n"
+"	<array>\n"
+"		<dict>\n"
+"			<key>one</key>\n"
+"			<integer>1</integer>\n"
+"			<key>two</key>\n"
+"			<string>number-two</string>\n"
+"		</dict>\n"
+"		<dict>\n"
+"			<key>one</key>\n"
+"			<integer>1</integer>\n"
+"			<key>two</key>\n"
+"			<string>number-two</string>\n"
+"		</dict>\n"
+"		<dict>\n"
+"			<key>one</key>\n"
+"			<integer>1</integer>\n"
+"			<key>two</key>\n"
+"			<string>number-two</string>\n"
+"		</dict>\n"
+"	</array>\n"
+"	<key>true-val</key>\n"
+"	<true/>\n"
+"	<key>two</key>\n"
+"	<string>number-two</string>\n"
+"</dict>\n"
+"</plist>\n";
+
+ATF_TC(prop_basic);
+ATF_TC_HEAD(prop_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of proplib(3)");
+}
+
+ATF_TC_BODY(prop_basic, tc)
+{
+	prop_dictionary_t dict;
+	char *ext1;
+
+	dict = prop_dictionary_create();
+	ATF_REQUIRE(dict != NULL);
+
+	{
+		prop_number_t num = prop_number_create_integer(1);
+		ATF_REQUIRE(num != NULL);
+
+		ATF_REQUIRE_EQ(prop_dictionary_set(dict, "one", num), true);
+		prop_object_release(num);
+	}
+
+	{
+		prop_string_t str = prop_string_create_cstring("number-two");
+		ATF_REQUIRE(str != NULL);
+
+		ATF_REQUIRE_EQ(prop_dictionary_set(dict, "two", str), true);
+		prop_object_release(str);
+	}
+
+	{
+		prop_array_t arr;
+		prop_dictionary_t dict_copy;
+		int i;
+
+		arr = prop_array_create();
+		ATF_REQUIRE(arr != NULL);
+
+		for (i = 0; i < 3; ++i) {
+			dict_copy = prop_dictionary_copy(dict);
+			ATF_REQUIRE(dict_copy != NULL);
+			ATF_REQUIRE_EQ(prop_array_add(arr, dict_copy), true);
+			prop_object_release(dict_copy);
+		}
+
+		ATF_REQUIRE_EQ(prop_dictionary_set(dict, "three", arr), true);
+		prop_object_release(arr);
+	}
+
+	{
+		prop_bool_t val = prop_bool_create(true);
+		ATF_REQUIRE(val != NULL);
+		ATF_REQUIRE_EQ(prop_dictionary_set(dict, "true-val", val), true);
+		prop_object_release(val);
+
+		val = prop_bool_create(false);
+		ATF_REQUIRE(val != NULL);
+		ATF_REQUIRE_EQ(prop_dictionary_set(dict, "false-val", val), true);
+		prop_object_release(val);
+	}
+
+	ext1 = prop_dictionary_externalize(dict);
+	ATF_REQUIRE(ext1 != NULL);
+	ATF_REQUIRE_STREQ(compare1, ext1);
+
+	{
+		prop_dictionary_t dict2;
+		char *ext2;
+
+		dict2 = prop_dictionary_internalize(ext1);
+		ATF_REQUIRE(dict2 != NULL);
+		ext2 = prop_dictionary_externalize(dict2);
+		ATF_REQUIRE(ext2 != NULL);
+		ATF_REQUIRE_STREQ(ext1, ext2);
+		prop_object_release(dict2);
+		free(ext2);
+	}
+
+	prop_object_release(dict);
+	free(ext1);
+}
+
+ATF_TC(prop_dictionary_equals);
+ATF_TC_HEAD(prop_dictionary_equals, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test prop_dictionary_equals(3)");
+}
+
+ATF_TC_BODY(prop_dictionary_equals, tc)
+{
+	prop_dictionary_t c, d;
+
+	/*
+	 * Fixed, should not fail any more...
+	 *
+	atf_tc_expect_death("PR lib/43964");
+	 *
+	 */
+
+	d = prop_dictionary_internalize(compare1);
+
+	ATF_REQUIRE(d != NULL);
+
+	c = prop_dictionary_copy(d);
+
+	ATF_REQUIRE(c != NULL);
+
+	if (prop_dictionary_equals(c, d) != true)
+		atf_tc_fail("dictionaries are not equal");
+
+	prop_object_release(c);
+	prop_object_release(d);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, prop_basic);
+	ATF_TP_ADD_TC(tp, prop_dictionary_equals);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/d_mach b/contrib/netbsd-tests/lib/libpthread/d_mach
new file mode 100644
index 000000000000..f3c3981a0573
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/d_mach
@@ -0,0 +1,92 @@
+above.warped.net
+anoncvs.cirr.com
+anoncvs.isc.netbsd.org
+anoncvs.leo.org
+anoncvs.netbsd.lt
+anoncvs.netbsd.ro
+anoncvs.netbsd.se
+antioche.antioche.eu.org
+boulder.tele.dk
+centaurus.4web.cz
+chur.math.ntnu.no
+cnftp.bjpu.edu.cn
+console.netbsd.org
+cvs.fi.netbsd.org
+cvs.mikrolahti.fi
+cvs.netbsd.org
+cvsup-netbsd.leo.org
+cvsup.netbsd.se
+cvsup.pasta.cs.uit.no
+ftp.bitcon.no
+ftp.chg.ru
+ftp.duth.gr
+ftp.estpak.ee
+ftp.fsn.hu
+ftp.funet.fi
+ftp.grondar.za
+ftp.leo.org
+ftp.netbsd.lt
+ftp.netbsd.org
+ftp.nluug.nl
+ftp.plig.org
+ftp.uni-erlangen.de
+ftp.xgate.co.kr
+gd.tuwien.ac.at
+gort.ludd.luth.se
+grappa.unix-ag.uni-kl.de
+info.wins.uva.nl
+irc.warped.net
+knug.youn.co.kr
+lala.iri.co.jp
+mail.jp.netbsd.org
+mail.kr.netbsd.org
+mail.netbsd.org
+melanoma.cs.rmit.edu.au
+mirror.aarnet.edu.au
+mirror.netbsd.com.br
+mirror03.inet.tele.dk
+moon.vub.ac.be
+nbwww.sergei.cc
+net.bsd.cz
+netbsd.3miasto.net
+netbsd.4ka.mipt.ru
+netbsd.apk.od.ua
+netbsd.csie.nctu.edu.tw
+netbsd.enderunix.org
+netbsd.ftp.fu-berlin.de
+netbsd.netlead.com.au
+netbsd.nsysu.edu.tw
+netbsd.pair.com
+netbsd.stevens-tech.edu
+netbsd.triada.bg
+netbsd.unix.net.nz
+netbsd.unixtech.be
+netbsd.vejas.lt
+netbsd.wagener-consulting.lu
+netbsd.zarco.org
+netbsdiso.interoute.net.uk
+netbsdwww.bitcon.no
+netbsdwww.cordef.com.pl
+netbsdwww.cs.rmit.edu.au
+netbsdwww.interoute.net.uk
+news.gw.com
+ns.netbsd.org
+pigu.iri.co.jp
+pluto.cdpa.nsysu.edu.tw
+projects.slowass.net
+server6.pasta.cs.uit.no
+skeleton.phys.spbu.ru
+snoopy.allbsd.org
+spike.allbsd.org
+sundry.netbsd.org
+tanya.sergei.cc
+web-a.fi.gw.com
+web-a.us.gw.com
+web.netbsd.mirror.arhea.net
+www.en.netbsd.de
+www.netbsd.cl
+www.netbsd.nl
+www.netbsd.org
+www.netbsd.ro
+zathras.netbsd.org
+zeppo.rediris.es
diff --git a/contrib/netbsd-tests/lib/libpthread/dlopen/dso/h_pthread_dlopen.c b/contrib/netbsd-tests/lib/libpthread/dlopen/dso/h_pthread_dlopen.c
new file mode 100644
index 000000000000..63bf6a3b1cda
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/dlopen/dso/h_pthread_dlopen.c
@@ -0,0 +1,86 @@
+/*	$NetBSD: h_pthread_dlopen.c,v 1.1 2013/03/21 16:50:22 christos Exp $ */
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_pthread_dlopen.c,v 1.1 2013/03/21 16:50:22 christos Exp $");
+
+#if 0
+#include <atf-c.h>
+#else
+#include <assert.h>
+#define ATF_REQUIRE(a)	assert(a)
+#endif
+#include <unistd.h>
+#include <pthread.h>
+
+int testf_dso_null(void);
+int testf_dso_mutex_lock(pthread_mutex_t *);
+int testf_dso_mutex_unlock(pthread_mutex_t *);
+int testf_dso_pthread_create(pthread_t *, const pthread_attr_t *, 
+    void *(*)(void *), void *);
+
+int
+testf_dso_null(void)
+{
+	return 0xcafe;
+}
+
+int
+testf_dso_mutex_lock(pthread_mutex_t *mtx)
+{
+	ATF_REQUIRE(mtx != NULL);
+	ATF_REQUIRE(pthread_mutex_lock(mtx) == 0);
+
+	return 0xcafe;
+}
+
+int
+testf_dso_mutex_unlock(pthread_mutex_t *mtx)
+{
+	ATF_REQUIRE(mtx != NULL);
+	ATF_REQUIRE(pthread_mutex_unlock(mtx) == 0);
+
+	return 0xcafe;
+}
+
+int
+testf_dso_pthread_create(pthread_t *thread, const pthread_attr_t *attr, 
+    void *(*routine)(void *), void *arg)
+{
+	int ret;
+
+	ret = pthread_create(thread, attr, routine, arg);
+	ATF_REQUIRE(ret == 0);
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/dlopen/t_dlopen.c b/contrib/netbsd-tests/lib/libpthread/dlopen/t_dlopen.c
new file mode 100644
index 000000000000..68e983585431
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/dlopen/t_dlopen.c
@@ -0,0 +1,171 @@
+/*	$NetBSD: t_dlopen.c,v 1.1 2013/03/21 16:50:21 christos Exp $ */
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_dlopen.c,v 1.1 2013/03/21 16:50:21 christos Exp $");
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <unistd.h>
+
+ATF_TC(dlopen);
+
+ATF_TC_HEAD(dlopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if dlopen can load -lpthread DSO");
+}
+
+#define DSO TESTDIR "/h_pthread_dlopen.so"
+
+ATF_TC_BODY(dlopen, tc)
+{
+	void *handle;
+	int (*testf_dso_null)(void);
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_null = dlsym(handle, "testf_dso_null");
+	ATF_REQUIRE_MSG(testf_dso_null != NULL, "dlsym fails: %s", dlerror());
+
+	ATF_REQUIRE(testf_dso_null() == 0xcafe);
+
+	ATF_REQUIRE(dlclose(handle) == 0);
+}
+
+ATF_TC(dlopen_mutex);
+
+ATF_TC_HEAD(dlopen_mutex, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if dlopen can load -lpthread DSO without breaking mutex");
+}
+
+ATF_TC_BODY(dlopen_mutex, tc)
+{
+	pthread_mutex_t mtx;
+	void *handle;
+	int (*testf_dso_null)(void);
+
+	ATF_REQUIRE(pthread_mutex_init(&mtx, NULL) == 0);
+	ATF_REQUIRE(pthread_mutex_lock(&mtx) == 0);
+
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_null = dlsym(handle, "testf_dso_null");
+	ATF_REQUIRE_MSG(testf_dso_null != NULL, "dlsym fails: %s", dlerror());
+
+	ATF_REQUIRE(testf_dso_null() == 0xcafe);
+
+	ATF_REQUIRE(pthread_mutex_unlock(&mtx) == 0);
+
+	ATF_REQUIRE(dlclose(handle) == 0);
+
+	pthread_mutex_destroy(&mtx);
+}
+
+ATF_TC(dlopen_mutex_libc);
+
+ATF_TC_HEAD(dlopen_mutex_libc, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if dlopen can load -lpthread DSO and use libc locked mutex");
+}
+
+ATF_TC_BODY(dlopen_mutex_libc, tc)
+{
+	pthread_mutex_t mtx;
+	void *handle;
+	int (*testf_dso_mutex_unlock)(pthread_mutex_t *);
+
+	ATF_REQUIRE(pthread_mutex_init(&mtx, NULL) == 0);
+	ATF_REQUIRE(pthread_mutex_lock(&mtx) == 0);
+
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_mutex_unlock = dlsym(handle, "testf_dso_mutex_unlock");
+	ATF_REQUIRE_MSG(testf_dso_mutex_unlock != NULL,
+			"dlsym fails: %s", dlerror());
+
+	ATF_REQUIRE(testf_dso_mutex_unlock(&mtx) == 0xcafe);
+
+	dlclose(handle);
+
+	pthread_mutex_destroy(&mtx);
+}
+
+ATF_TC(dlopen_mutex_libpthread);
+
+ATF_TC_HEAD(dlopen_mutex_libpthread, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if dlopen can load -lpthread DSO and use "
+	    "libpthread locked mutex");
+}
+
+ATF_TC_BODY(dlopen_mutex_libpthread, tc)
+{
+	pthread_mutex_t mtx;
+	void *handle;
+	int (*testf_dso_mutex_lock)(pthread_mutex_t *);
+
+	ATF_REQUIRE(pthread_mutex_init(&mtx, NULL) == 0);
+
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_mutex_lock = dlsym(handle, "testf_dso_mutex_lock");
+	ATF_REQUIRE_MSG(testf_dso_mutex_lock != NULL,
+			"dlsym fails: %s", dlerror());
+
+	ATF_REQUIRE(testf_dso_mutex_lock(&mtx) == 0xcafe);
+
+	ATF_REQUIRE(pthread_mutex_unlock(&mtx) == 0);
+
+	dlclose(handle);
+
+	pthread_mutex_destroy(&mtx);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, dlopen);
+	ATF_TP_ADD_TC(tp, dlopen_mutex);
+	ATF_TP_ADD_TC(tp, dlopen_mutex_libc);
+	ATF_TP_ADD_TC(tp, dlopen_mutex_libpthread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/dlopen/t_dso_pthread_create.c b/contrib/netbsd-tests/lib/libpthread/dlopen/t_dso_pthread_create.c
new file mode 100644
index 000000000000..ab8bec32a8ab
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/dlopen/t_dso_pthread_create.c
@@ -0,0 +1,96 @@
+/*	$NetBSD: t_dso_pthread_create.c,v 1.1 2013/03/21 16:50:21 christos Exp $ */
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_dso_pthread_create.c,v 1.1 2013/03/21 16:50:21 christos Exp $");
+
+#include <sys/resource.h>
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#define DSO TESTDIR "/h_pthread_dlopen.so"
+
+void *
+routine(void *arg)
+{
+	ATF_REQUIRE((intptr_t)arg == 0xcafe);
+	return NULL;
+}
+
+ATF_TC(dso_pthread_create_dso);
+
+ATF_TC_HEAD(dso_pthread_create_dso, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if non -lpthread main can call pthread_create() "
+	    "in -lpthread DSO");
+}
+
+ATF_TC_BODY(dso_pthread_create_dso, tc)
+{
+	int ret;
+	pthread_t thread;
+	void *arg = (void *)0xcafe;
+	void *handle;
+	int (*testf_dso_pthread_create)(pthread_t *, pthread_attr_t *, 
+	    void *(*)(void *), void *);
+	struct rlimit rl;
+
+	atf_tc_expect_signal(6,
+	    "calling pthread_create() requires -lpthread main");
+	
+	rl.rlim_max = rl.rlim_cur = 0;
+	ATF_REQUIRE_EQ(setrlimit(RLIMIT_CORE, &rl), 0);
+
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_pthread_create = dlsym(handle, "testf_dso_pthread_create");
+	ATF_REQUIRE_MSG(testf_dso_pthread_create != NULL, 
+	    "dlsym fails: %s", dlerror());
+
+	ret = testf_dso_pthread_create(&thread, NULL, routine, arg);
+	ATF_REQUIRE(ret == 0);
+
+	ATF_REQUIRE(dlclose(handle) == 0);
+
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, dso_pthread_create_dso);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/dlopen/t_main_pthread_create.c b/contrib/netbsd-tests/lib/libpthread/dlopen/t_main_pthread_create.c
new file mode 100644
index 000000000000..7ba89b35ee23
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/dlopen/t_main_pthread_create.c
@@ -0,0 +1,106 @@
+/*	$NetBSD: t_main_pthread_create.c,v 1.1 2013/03/21 16:50:21 christos Exp $ */
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_main_pthread_create.c,v 1.1 2013/03/21 16:50:21 christos Exp $");
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#define DSO TESTDIR "/h_pthread_dlopen.so"
+
+void *
+routine(void *arg)
+{
+	ATF_REQUIRE((intptr_t)arg == 0xcafe);
+	return NULL;
+}
+
+ATF_TC(main_pthread_create_main);
+
+ATF_TC_HEAD(main_pthread_create_main, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if -lpthread main can call pthread_create() in main()");
+}
+
+ATF_TC_BODY(main_pthread_create_main, tc)
+{
+	int ret;
+	pthread_t thread;
+	void *arg = (void *)0xcafe;
+
+	ret = pthread_create(&thread, NULL, routine, arg);
+	ATF_REQUIRE(ret == 0);
+}
+
+ATF_TC(main_pthread_create_dso);
+
+ATF_TC_HEAD(main_pthread_create_dso, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test if -lpthread main can call pthread_create() in DSO");
+}
+
+ATF_TC_BODY(main_pthread_create_dso, tc)
+{
+	int ret;
+	pthread_t thread;
+	void *arg = (void *)0xcafe;
+	void *handle;
+	int (*testf_dso_pthread_create)(pthread_t *, pthread_attr_t *, 
+	    void *(*)(void *), void *);
+
+	handle = dlopen(DSO, RTLD_NOW | RTLD_LOCAL);
+	ATF_REQUIRE_MSG(handle != NULL, "dlopen fails: %s", dlerror());
+
+	testf_dso_pthread_create = dlsym(handle, "testf_dso_pthread_create");
+	ATF_REQUIRE_MSG(testf_dso_pthread_create != NULL, 
+	    "dlsym fails: %s", dlerror());
+
+	ret = testf_dso_pthread_create(&thread, NULL, routine, arg);
+	ATF_REQUIRE(ret == 0);
+
+	ATF_REQUIRE(dlclose(handle) == 0);
+
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, main_pthread_create_main);
+	ATF_TP_ADD_TC(tp, main_pthread_create_dso);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/h_atexit.c b/contrib/netbsd-tests/lib/libpthread/h_atexit.c
new file mode 100644
index 000000000000..2d4c91c60bd3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/h_atexit.c
@@ -0,0 +1,183 @@
+/* $NetBSD: h_atexit.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Program to test atexit(3) and __cxa_atexit()/__cxa_finalize().
+ *
+ * Written by Jason R. Thorpe, February 2003.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_atexit.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+extern int __cxa_atexit(void (*func)(void *), void *, void *);
+extern void __cxa_finalize(void *);
+
+static int dso_handle_1;
+static int dso_handle_2;
+static int dso_handle_3;
+
+static int arg_1;
+static int arg_2;
+static int arg_3;
+
+static int exiting_state;
+
+#define    ASSERT(expr)                                     \
+do {                                                        \
+	if ((expr) == 0) {                                      \
+		write(STDERR_FILENO, __func__, strlen(__func__));   \
+		write(STDERR_FILENO, ": ", 2);                      \
+		write(STDERR_FILENO, __STRING(expr),                \
+			  strlen(__STRING(expr)));                      \
+		write(STDERR_FILENO, "\n", 1);                      \
+		my_abort();                                         \
+	}                                                       \
+} while (/*CONSTCOND*/0)
+
+#define    SUCCESS()                                        \
+do {                                                        \
+	write(STDOUT_FILENO, __func__, strlen(__func__));       \
+	write(STDOUT_FILENO, "\n", 1);                          \
+} while (/*CONSTCOND*/0)
+
+static void
+my_abort(void)
+{
+
+	kill(getpid(), SIGABRT);
+	/* NOTREACHED */
+}
+
+static void
+cxa_handler_5(void *arg)
+{
+	static int cxa_handler_5_called;
+
+	ASSERT(arg == (void *)&arg_1);
+	ASSERT(cxa_handler_5_called == 0);
+	ASSERT(exiting_state == 5);
+
+	exiting_state--;
+	cxa_handler_5_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_4(void *arg)
+{
+	static int cxa_handler_4_called;
+
+	ASSERT(arg == (void *)&arg_1);
+	ASSERT(cxa_handler_4_called == 0);
+	ASSERT(exiting_state == 4);
+
+	exiting_state--;
+	cxa_handler_4_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_3(void *arg)
+{
+	static int cxa_handler_3_called;
+
+	ASSERT(arg == (void *)&arg_2);
+	ASSERT(cxa_handler_3_called == 0);
+	ASSERT(exiting_state == 3);
+
+	exiting_state--;
+	cxa_handler_3_called = 1;
+	SUCCESS();
+}
+
+static void
+cxa_handler_2(void *arg)
+{
+	static int cxa_handler_2_called;
+
+	ASSERT(arg == (void *)&arg_3);
+	ASSERT(cxa_handler_2_called == 0);
+	ASSERT(exiting_state == 2);
+
+	exiting_state--;
+	cxa_handler_2_called = 1;
+	SUCCESS();
+}
+
+static void
+normal_handler_1(void)
+{
+	static int normal_handler_1_called;
+
+	ASSERT(normal_handler_1_called == 0);
+	ASSERT(exiting_state == 1);
+
+	exiting_state--;
+	normal_handler_1_called = 1;
+	SUCCESS();
+}
+
+static void
+normal_handler_0(void)
+{
+	static int normal_handler_0_called;
+
+	ASSERT(normal_handler_0_called == 0);
+	ASSERT(exiting_state == 0);
+
+	normal_handler_0_called = 1;
+	SUCCESS();
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	exiting_state = 5;
+
+	ASSERT(0 == atexit(normal_handler_0));
+	ASSERT(0 == atexit(normal_handler_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, &dso_handle_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, &dso_handle_1));
+	ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, &dso_handle_2));
+	ASSERT(0 == __cxa_atexit(cxa_handler_2, &arg_3, &dso_handle_3));
+
+	__cxa_finalize(&dso_handle_1);
+	__cxa_finalize(&dso_handle_2);
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/h_cancel.c b/contrib/netbsd-tests/lib/libpthread/h_cancel.c
new file mode 100644
index 000000000000..1077806c77f8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/h_cancel.c
@@ -0,0 +1,58 @@
+/* $NetBSD: h_cancel.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_cancel.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	char str1[] = "You should see this.\n";
+	char str2[] = "You should not see this.\n";
+
+	printf("Cancellation test: Self-cancellation and disabling.\n");
+
+	pthread_cancel(pthread_self());
+
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+
+	write(STDOUT_FILENO, str1, sizeof(str1)-1);
+
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+
+	write(STDOUT_FILENO, str2, sizeof(str2)-1);
+
+	exit(1);
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/h_common.h b/contrib/netbsd-tests/lib/libpthread/h_common.h
new file mode 100644
index 000000000000..f4d03bcdec9e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/h_common.h
@@ -0,0 +1,12 @@
+#ifndef H_COMMON_H
+#define H_COMMON_H
+
+#include <string.h>
+
+#define PTHREAD_REQUIRE(x) \
+    do { \
+        int ret = (x); \
+        ATF_REQUIRE_MSG(ret == 0, "%s: %s", #x, strerror(ret)); \
+    } while (0)
+
+#endif // H_COMMON_H
diff --git a/contrib/netbsd-tests/lib/libpthread/h_exit.c b/contrib/netbsd-tests/lib/libpthread/h_exit.c
new file mode 100644
index 000000000000..a37f88f949a4
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/h_exit.c
@@ -0,0 +1,47 @@
+/* $NetBSD: h_exit.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_exit.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+int
+main(void)
+{
+	printf("Test of pthread_exit() in main thread only.\n");
+
+	pthread_exit(NULL);
+
+	printf("You shouldn't see this.");
+	exit(1);
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/h_resolv.c b/contrib/netbsd-tests/lib/libpthread/h_resolv.c
new file mode 100644
index 000000000000..9c5fedcc2e7f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/h_resolv.c
@@ -0,0 +1,208 @@
+/* $NetBSD: h_resolv.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
+
+/*-
+ * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: h_resolv.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
+
+#include <pthread.h>
+#include <stdio.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <err.h>
+#include <string.h>
+#include <stringlist.h>
+
+#define NTHREADS    10
+#define NHOSTS        100
+#define WS        " \t\n\r"
+
+static StringList *hosts = NULL;
+static int debug = 0;
+static int *ask = NULL;
+static int *got = NULL;
+
+static void usage(void)  __attribute__((__noreturn__));
+static void load(const char *);
+static void resolvone(int);
+static void *resolvloop(void *);
+static void run(int *);
+
+static pthread_mutex_t stats = PTHREAD_MUTEX_INITIALIZER;
+
+static void
+usage(void)
+{
+	(void)fprintf(stderr,
+		"Usage: %s [-d] [-h <nhosts>] [-n <nthreads>] <file> ...\n",
+		getprogname());
+	exit(1);
+}
+
+static void
+load(const char *fname)
+{
+	FILE *fp;
+	size_t len;
+	char *line;
+
+	if ((fp = fopen(fname, "r")) == NULL)
+		err(1, "Cannot open `%s'", fname);
+	while ((line = fgetln(fp, &len)) != NULL) {
+		char c = line[len];
+		char *ptr;
+		line[len] = '\0';
+		for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS))
+			sl_add(hosts, strdup(ptr));
+		line[len] = c;
+	}
+
+	(void)fclose(fp);
+}
+
+static void
+resolvone(int n)
+{
+	char buf[1024];
+	pthread_t self = pthread_self();
+	size_t i = (random() & 0x0fffffff) % hosts->sl_cur;
+	char *host = hosts->sl_str[i];
+	struct addrinfo *res;
+	int error, len;
+	if (debug) {
+		len = snprintf(buf, sizeof(buf), "%p: %d resolving %s %d\n",
+			self, n, host, (int)i);
+		(void)write(STDOUT_FILENO, buf, len);
+	}
+	error = getaddrinfo(host, NULL, NULL, &res);
+	if (debug) {
+		len = snprintf(buf, sizeof(buf), "%p: host %s %s\n",
+			self, host, error ? "not found" : "ok");
+		(void)write(STDOUT_FILENO, buf, len);
+	}
+	pthread_mutex_lock(&stats);
+	ask[i]++;
+	got[i] += error == 0;
+	pthread_mutex_unlock(&stats);
+	if (error == 0)
+		freeaddrinfo(res);
+}
+
+static void *
+resolvloop(void *p)
+{
+	int *nhosts = (int *)p;
+	if (*nhosts == 0)
+		return NULL;
+	do
+		resolvone(*nhosts);
+	while (--(*nhosts));
+	return NULL;
+}
+
+static void
+run(int *nhosts)
+{
+	pthread_t self = pthread_self();
+	if (pthread_create(&self, NULL, resolvloop, nhosts) != 0)
+		err(1, "pthread_create");
+}
+
+int
+main(int argc, char *argv[])
+{
+	int nthreads = NTHREADS;
+	int nhosts = NHOSTS;
+	int i, c, done, *nleft;
+	hosts = sl_init();
+
+	srandom(1234);
+
+	while ((c = getopt(argc, argv, "dh:n:")) != -1)
+		switch (c) {
+		case 'd':
+			debug++;
+			break;
+		case 'h':
+			nhosts = atoi(optarg);
+			break;
+		case 'n':
+			nthreads = atoi(optarg);
+			break;
+		default:
+			usage();
+		}
+
+	for (i = optind; i < argc; i++)
+		load(argv[i]);
+
+	if (hosts->sl_cur == 0)
+		usage();
+
+	if ((nleft = malloc(nthreads * sizeof(int))) == NULL)
+		err(1, "malloc");
+	if ((ask = calloc(hosts->sl_cur, sizeof(int))) == NULL)
+		err(1, "calloc");
+	if ((got = calloc(hosts->sl_cur, sizeof(int))) == NULL)
+		err(1, "calloc");
+
+
+	for (i = 0; i < nthreads; i++) {
+		nleft[i] = nhosts;
+		run(&nleft[i]);
+	}
+
+	for (done = 0; !done;) {
+		done = 1;
+		for (i = 0; i < nthreads; i++) {
+			if (nleft[i] != 0) {
+				done = 0;
+				break;
+			}
+		}
+		sleep(1);
+	}
+	c = 0;
+	for (i = 0; i < (int)hosts->sl_cur; i++) {
+		if (ask[i] != got[i] && got[i] != 0) {
+			warnx("Error: host %s ask %d got %d\n",
+				hosts->sl_str[i], ask[i], got[i]);
+			c++;
+		}
+	}
+	free(nleft);
+	free(ask);
+	free(got);
+	sl_free(hosts, 1);
+	return c;
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_atexit.sh b/contrib/netbsd-tests/lib/libpthread/t_atexit.sh
new file mode 100755
index 000000000000..7b99618e5bf3
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_atexit.sh
@@ -0,0 +1,49 @@
+# $NetBSD: t_atexit.sh,v 1.2 2010/11/07 17:51:20 jmmv Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case atexit
+atexit_head()
+{
+	atf_set "descr" "Checks atexit functionality"
+}
+atexit_body()
+{
+	cat >expout <<EOF
+cxa_handler_5
+cxa_handler_4
+cxa_handler_3
+cxa_handler_2
+normal_handler_1
+normal_handler_0
+EOF
+	atf_check -o file:expout "$(atf_get_srcdir)/h_atexit"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case atexit
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_barrier.c b/contrib/netbsd-tests/lib/libpthread/t_barrier.c
new file mode 100644
index 000000000000..a06cfd9100ad
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_barrier.c
@@ -0,0 +1,110 @@
+/* $NetBSD: t_barrier.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_barrier.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
+
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define COUNT 5
+
+pthread_barrier_t barrier;
+pthread_mutex_t mutex;
+int serial_count;
+int after_barrier_count;
+
+static void *
+threadfunc(void *arg)
+{
+	int which = (int)(long)arg;
+	int rv;
+
+	printf("thread %d entering barrier\n", which);
+	rv = pthread_barrier_wait(&barrier);
+	printf("thread %d leaving barrier -> %d\n", which, rv);
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	after_barrier_count++;
+	if (rv == PTHREAD_BARRIER_SERIAL_THREAD)
+		serial_count++;
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	return NULL;
+}
+
+ATF_TC(barrier);
+ATF_TC_HEAD(barrier, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks barriers");
+}
+ATF_TC_BODY(barrier, tc)
+{
+	int i;
+	pthread_t new[COUNT];
+	void *joinval;
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	PTHREAD_REQUIRE(pthread_barrier_init(&barrier, NULL, COUNT));
+
+	for (i = 0; i < COUNT; i++) {
+		PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+		ATF_REQUIRE_EQ(after_barrier_count, 0);
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+		PTHREAD_REQUIRE(pthread_create(&new[i], NULL, threadfunc,
+						(void *)(long)i));
+		sleep(2);
+	}
+
+	for (i = 0; i < COUNT; i++) {
+		PTHREAD_REQUIRE(pthread_join(new[i], &joinval));
+		PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+		ATF_REQUIRE(after_barrier_count > i);
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+		printf("main joined with thread %d\n", i);
+	}
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	ATF_REQUIRE_EQ(after_barrier_count, COUNT);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	ATF_REQUIRE_EQ(serial_count, 1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, barrier);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_cancel.sh b/contrib/netbsd-tests/lib/libpthread/t_cancel.sh
new file mode 100755
index 000000000000..4a0701ef3c76
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_cancel.sh
@@ -0,0 +1,44 @@
+# $NetBSD: t_cancel.sh,v 1.1 2010/07/16 15:42:53 jmmv Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case register_while_disabled
+register_while_disabled_head()
+{
+	atf_set "descr" "Checks that a cancellation registered while" \
+	    "cancellation is enabled is not honored while cancellation is" \
+	    "disabled"
+}
+register_while_disabled_body()
+{
+	atf_check -o inline:"You should see this.\n" \
+	    "$(atf_get_srcdir)/h_cancel"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case register_while_disabled
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_cond.c b/contrib/netbsd-tests/lib/libpthread/t_cond.c
new file mode 100644
index 000000000000..9f33c9e05091
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_cond.c
@@ -0,0 +1,563 @@
+/* $NetBSD: t_cond.c,v 1.6 2014/09/03 16:23:24 gson Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_cond.c,v 1.6 2014/09/03 16:23:24 gson Exp $");
+
+#include <sys/time.h>
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static pthread_mutex_t mutex;
+static pthread_cond_t cond;
+static pthread_mutex_t static_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t static_cond = PTHREAD_COND_INITIALIZER;
+static int count, share, toggle, total;
+
+static void *
+signal_delay_wait_threadfunc(void *arg)
+{
+	int *shared = (int *) arg;
+
+	printf("2: Second thread.\n");
+
+	printf("2: Locking mutex\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("2: Got mutex.\n");
+	printf("Shared value: %d. Changing to 0.\n", *shared);
+	*shared = 0;
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	PTHREAD_REQUIRE(pthread_cond_signal(&cond));
+
+	return NULL;
+}
+
+ATF_TC(signal_delay_wait);
+ATF_TC_HEAD(signal_delay_wait, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks condition variables");
+}
+ATF_TC_BODY(signal_delay_wait, tc)
+{
+	pthread_t new;
+	void *joinval;
+	int sharedval;
+
+	printf("1: condition variable test 1\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+
+	sharedval = 1;
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_delay_wait_threadfunc,
+	    &sharedval));
+
+	printf("1: Before waiting.\n");
+	do {
+		sleep(2);
+		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+		printf("1: After waiting, in loop.\n");
+	} while (sharedval != 0);
+
+	printf("1: After the loop.\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined.\n");
+}
+
+static void *
+signal_before_unlock_threadfunc(void *arg)
+{
+	int *shared = (int *) arg;
+
+	printf("2: Second thread.\n");
+
+	printf("2: Locking mutex\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("2: Got mutex.\n");
+	printf("Shared value: %d. Changing to 0.\n", *shared);
+	*shared = 0;
+
+	/* Signal first, then unlock, for a different test than #1. */
+	PTHREAD_REQUIRE(pthread_cond_signal(&cond));
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	return NULL;
+}
+
+ATF_TC(signal_before_unlock);
+ATF_TC_HEAD(signal_before_unlock, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks condition variables: signal before unlocking mutex");
+}
+ATF_TC_BODY(signal_before_unlock, tc)
+{
+	pthread_t new;
+	void *joinval;
+	int sharedval;
+
+	printf("1: condition variable test 2\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+
+	sharedval = 1;
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL,
+	    signal_before_unlock_threadfunc, &sharedval));
+
+	printf("1: Before waiting.\n");
+	do {
+		sleep(2);
+		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+		printf("1: After waiting, in loop.\n");
+	} while (sharedval != 0);
+
+	printf("1: After the loop.\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined.\n");
+}
+
+static void *
+signal_before_unlock_static_init_threadfunc(void *arg)
+{
+	int *shared = (int *) arg;
+
+	printf("2: Second thread.\n");
+
+	printf("2: Locking mutex\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+	printf("2: Got mutex.\n");
+	printf("Shared value: %d. Changing to 0.\n", *shared);
+	*shared = 0;
+
+	/* Signal first, then unlock, for a different test than #1. */
+	PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+
+	return NULL;
+}
+
+ATF_TC(signal_before_unlock_static_init);
+ATF_TC_HEAD(signal_before_unlock_static_init, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks condition variables: signal before unlocking "
+		"mutex, use static initializers");
+}
+ATF_TC_BODY(signal_before_unlock_static_init, tc)
+{
+	pthread_t new;
+	void *joinval;
+	int sharedval;
+
+	printf("1: condition variable test 3\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+
+	sharedval = 1;
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL,
+	    signal_before_unlock_static_init_threadfunc, &sharedval));
+
+	printf("1: Before waiting.\n");
+	do {
+		sleep(2);
+		PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex));
+		printf("1: After waiting, in loop.\n");
+	} while (sharedval != 0);
+
+	printf("1: After the loop.\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined.\n");
+}
+
+static void *
+signal_wait_race_threadfunc(void *arg)
+{
+	printf("2: Second thread.\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+	printf("2: Before the loop.\n");
+	while (count>0) {
+		count--;
+		total++;
+		toggle = 0;
+		/* printf("2: Before signal %d.\n", count); */
+		PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+		do {
+			PTHREAD_REQUIRE(pthread_cond_wait(&static_cond,
+			    &static_mutex));
+		} while (toggle != 1);
+	}
+	printf("2: After the loop.\n");
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+
+	return NULL;
+}
+
+ATF_TC(signal_wait_race);
+ATF_TC_HEAD(signal_wait_race, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks condition variables");
+}
+ATF_TC_BODY(signal_wait_race, tc)
+{
+	pthread_t new;
+	void *joinval;
+	int sharedval;
+
+	printf("1: condition variable test 4\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+
+	count = 50000;
+	toggle = 0;
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_wait_race_threadfunc,
+	    &sharedval));
+
+	printf("1: Before waiting.\n");
+	while (count>0) {
+		count--;
+		total++;
+		toggle = 1;
+		/* printf("1: Before signal %d.\n", count); */
+		PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+		do {
+			PTHREAD_REQUIRE(pthread_cond_wait(&static_cond,
+			    &static_mutex));
+		} while (toggle != 0);
+	}
+	printf("1: After the loop.\n");
+
+	toggle = 1;
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+	PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined. Final count = %d, total = %d\n",
+		count, total);
+
+	ATF_REQUIRE_EQ(count, 0);
+	ATF_REQUIRE_EQ(total, 50000);
+}
+
+static void *
+pthread_cond_timedwait_func(void *arg)
+{
+	struct timespec ts;
+	size_t i = 0;
+	int rv;
+
+	for (;;) {
+
+		if (i++ >= 10000)
+			pthread_exit(NULL);
+
+		(void)memset(&ts, 0, sizeof(struct timespec));
+
+		ATF_REQUIRE(clock_gettime(CLOCK_REALTIME, &ts) == 0);
+
+		/*
+		 * Set to one second in the past:
+		 * pthread_cond_timedwait(3) should
+		 * return ETIMEDOUT immediately.
+		 */
+		ts.tv_sec = ts.tv_sec - 1;
+
+		PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+		rv = pthread_cond_timedwait(&static_cond, &static_mutex, &ts);
+
+		/*
+		 * Sometimes we catch ESRCH.
+		 * This should never happen.
+		 */
+		ATF_REQUIRE(rv == ETIMEDOUT);
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+	}
+}
+
+ATF_TC(cond_timedwait_race);
+ATF_TC_HEAD(cond_timedwait_race, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test pthread_cond_timedwait(3)");
+
+}
+ATF_TC_BODY(cond_timedwait_race, tc)
+{
+	pthread_t tid[64];
+	size_t i;
+
+	for (i = 0; i < __arraycount(tid); i++) {
+
+		PTHREAD_REQUIRE(pthread_create(&tid[i], NULL,
+		    pthread_cond_timedwait_func, NULL));
+	}
+
+	for (i = 0; i < __arraycount(tid); i++) {
+
+		PTHREAD_REQUIRE(pthread_join(tid[i], NULL));
+	}
+}
+
+static void *
+broadcast_threadfunc(void *arg)
+{
+	printf("2: Second thread.\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+	while (count>0) {
+		count--;
+		total++;
+		toggle = 0;
+		PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+		do {
+			PTHREAD_REQUIRE(pthread_cond_wait(&static_cond,
+			    &static_mutex));
+		} while (toggle != 1);
+	}
+	printf("2: After the loop.\n");
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+
+	return NULL;
+}
+
+
+ATF_TC(broadcast);
+ATF_TC_HEAD(broadcast, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks condition variables: use pthread_cond_broadcast()");
+}
+ATF_TC_BODY(broadcast, tc)
+{
+	pthread_t new;
+	void *joinval;
+	int sharedval;
+
+	printf("1: condition variable test 5\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+
+	count = 50000;
+	toggle = 0;
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, broadcast_threadfunc,
+	    &sharedval));
+
+	printf("1: Before waiting.\n");
+	while (count>0) {
+		count--;
+		total++;
+		toggle = 1;
+		PTHREAD_REQUIRE(pthread_cond_broadcast(&static_cond));
+		do {
+			PTHREAD_REQUIRE(pthread_cond_wait(&static_cond,
+			    &static_mutex));
+		} while (toggle != 0);
+	}
+	printf("1: After the loop.\n");
+
+	toggle = 1;
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+	PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
+
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined. Final count = %d, total = %d\n", count,
+	    total);
+
+	ATF_REQUIRE_EQ(count, 0);
+	ATF_REQUIRE_EQ(total, 50000);
+}
+
+static void *
+bogus_timedwaits_threadfunc(void *arg)
+{
+	return NULL;
+}
+
+ATF_TC(bogus_timedwaits);
+ATF_TC_HEAD(bogus_timedwaits, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks condition variables: bogus timedwaits");
+}
+ATF_TC_BODY(bogus_timedwaits, tc)
+{
+	pthread_t new;
+	struct timespec ts;
+	struct timeval tv;
+
+	printf("condition variable test 6: bogus timedwaits\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+
+	printf("unthreaded test (past)\n");
+	gettimeofday(&tv, NULL);
+	tv.tv_sec -= 2; /* Place the time in the past */
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex,
+	    &ts), ETIMEDOUT, "pthread_cond_timedwait() (unthreaded) in the "
+	    "past");
+
+	printf("unthreaded test (zero time)\n");
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex,
+	    &ts), ETIMEDOUT, "pthread_cond_timedwait() (unthreaded) with zero "
+	    "time");
+
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, bogus_timedwaits_threadfunc,
+	    NULL));
+	PTHREAD_REQUIRE(pthread_join(new, NULL));
+
+	printf("threaded test\n");
+	gettimeofday(&tv, NULL);
+	tv.tv_sec -= 2; /* Place the time in the past */
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex,
+	    &ts), ETIMEDOUT, "pthread_cond_timedwait() (threaded) in the past");
+
+	printf("threaded test (zero time)\n");
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	TIMEVAL_TO_TIMESPEC(&tv, &ts);
+
+	ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex,
+	    &ts), ETIMEDOUT, "pthread_cond_timedwait() (threaded) with zero "
+	    "time");
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+}
+
+static void
+unlock(void *arg)
+{
+	pthread_mutex_unlock((pthread_mutex_t *)arg);
+}
+
+static void *
+destroy_after_cancel_threadfunc(void *arg)
+{
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+
+	pthread_cleanup_push(unlock, &mutex);
+
+	while (1) {
+		share = 1;
+		PTHREAD_REQUIRE(pthread_cond_broadcast(&cond));
+		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+	}
+
+	pthread_cleanup_pop(0);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	return NULL;
+}
+
+ATF_TC(destroy_after_cancel);
+ATF_TC_HEAD(destroy_after_cancel, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks destroying a condition variable "
+	    "after cancelling a wait");
+}
+ATF_TC_BODY(destroy_after_cancel, tc)
+{
+	pthread_t thread;
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL,
+	    destroy_after_cancel_threadfunc, NULL));
+
+	while (share == 0) {
+		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+	}
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	PTHREAD_REQUIRE(pthread_cancel(thread));
+
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+	PTHREAD_REQUIRE(pthread_cond_destroy(&cond));
+
+	PTHREAD_REQUIRE(pthread_mutex_destroy(&mutex));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, signal_delay_wait);
+	ATF_TP_ADD_TC(tp, signal_before_unlock);
+	ATF_TP_ADD_TC(tp, signal_before_unlock_static_init);
+	ATF_TP_ADD_TC(tp, signal_wait_race);
+	ATF_TP_ADD_TC(tp, cond_timedwait_race);
+	ATF_TP_ADD_TC(tp, broadcast);
+	ATF_TP_ADD_TC(tp, bogus_timedwaits);
+	ATF_TP_ADD_TC(tp, destroy_after_cancel);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_condwait.c b/contrib/netbsd-tests/lib/libpthread/t_condwait.c
new file mode 100644
index 000000000000..9b79587104cf
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_condwait.c
@@ -0,0 +1,142 @@
+/* $NetBSD: t_condwait.c,v 1.4 2013/04/12 17:18:11 christos Exp $ */
+
+/*
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_condwait.c,v 1.4 2013/04/12 17:18:11 christos Exp $");
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "isqemu.h"
+
+#define WAITTIME 2	/* Timeout wait secound */
+
+static const int debug = 1;
+
+static void *
+run(void *param)
+{
+	struct timespec ts, to, te;
+	clockid_t clck;
+	pthread_condattr_t attr;
+	pthread_cond_t cond;
+	pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
+	int ret = 0;
+
+
+	clck = *(clockid_t *)param;
+	pthread_condattr_init(&attr);
+	pthread_condattr_setclock(&attr, clck); /* MONOTONIC or MONOTONIC */
+	pthread_cond_init(&cond, &attr);
+
+	ATF_REQUIRE_EQ((ret = pthread_mutex_lock(&m)), 0);
+
+	ATF_REQUIRE_EQ(clock_gettime(clck, &ts), 0);
+	to = ts;
+
+	if (debug)
+		printf("started: %lld.%09ld sec\n", (long long)to.tv_sec,
+		    to.tv_nsec);
+
+	ts.tv_sec += WAITTIME;	/* Timeout wait */
+
+	switch (ret = pthread_cond_timedwait(&cond, &m, &ts)) {
+	case ETIMEDOUT:
+		/* Timeout */
+		ATF_REQUIRE_EQ(clock_gettime(clck, &te), 0);
+		timespecsub(&te, &to, &to);
+		if (debug) {
+			printf("timeout: %lld.%09ld sec\n",
+			    (long long)te.tv_sec, te.tv_nsec);
+			printf("elapsed: %lld.%09ld sec\n",
+			    (long long)to.tv_sec, to.tv_nsec);
+		}
+		if (isQEMU()) {
+			double to_seconds = to.tv_sec + 1e-9 * to.tv_nsec;
+			ATF_REQUIRE(to_seconds >= WAITTIME * 0.9);
+			/* Loose upper limit because of qemu timing bugs */
+			ATF_REQUIRE(to_seconds < WAITTIME * 2.5);
+		} else {
+			ATF_REQUIRE_EQ(to.tv_sec, WAITTIME);
+		}
+		break;
+	default:
+		ATF_REQUIRE_MSG(0, "pthread_cond_timedwait: %s", strerror(ret));
+	}
+
+	ATF_REQUIRE_MSG(!(ret = pthread_mutex_unlock(&m)),
+	    "pthread_mutex_unlock: %s", strerror(ret));
+	pthread_exit(&ret);
+}
+
+static void
+cond_wait(clockid_t clck, const char *msg) {
+	pthread_t child;
+
+	if (debug)
+		printf( "**** %s clock wait starting\n", msg);
+	ATF_REQUIRE_EQ(pthread_create(&child, NULL, run, &clck), 0);
+	ATF_REQUIRE_EQ(pthread_join(child, NULL), 0); /* wait for terminate */
+	if (debug)
+		printf( "**** %s clock wait ended\n", msg);
+}
+
+ATF_TC(cond_wait_real);
+ATF_TC_HEAD(cond_wait_real, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_cond_timedwait "
+	    "with CLOCK_REALTIME");
+}
+
+ATF_TC_BODY(cond_wait_real, tc) {
+	cond_wait(CLOCK_REALTIME, "CLOCK_REALTIME");
+}
+
+ATF_TC(cond_wait_mono);
+ATF_TC_HEAD(cond_wait_mono, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_cond_timedwait "
+	    "with CLOCK_MONOTONIC");
+}
+
+ATF_TC_BODY(cond_wait_mono, tc) {
+	cond_wait(CLOCK_MONOTONIC, "CLOCK_MONOTONIC");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, cond_wait_real);
+	ATF_TP_ADD_TC(tp, cond_wait_mono);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_detach.c b/contrib/netbsd-tests/lib/libpthread/t_detach.c
new file mode 100644
index 000000000000..21db871a70da
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_detach.c
@@ -0,0 +1,91 @@
+/* $NetBSD: t_detach.c,v 1.1 2011/03/24 13:52:04 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_detach.c,v 1.1 2011/03/24 13:52:04 jruoho Exp $");
+
+#include <pthread.h>
+#include <errno.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static void	*func(void *);
+
+static void *
+func(void *arg)
+{
+	return NULL;
+}
+
+ATF_TC(pthread_detach);
+ATF_TC_HEAD(pthread_detach, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of pthread_detach(3)");
+}
+
+ATF_TC_BODY(pthread_detach, tc)
+{
+	const int state = PTHREAD_CREATE_JOINABLE;
+	pthread_attr_t attr;
+	pthread_t t;
+	int rv;
+
+	/*
+	 * Create a joinable thread.
+	 */
+	PTHREAD_REQUIRE(pthread_attr_init(&attr));
+	PTHREAD_REQUIRE(pthread_attr_setdetachstate(&attr, state));
+	PTHREAD_REQUIRE(pthread_create(&t, &attr, func, NULL));
+
+	/*
+	 * Detach the thread and try to
+	 * join it; EINVAL should follow.
+	 */
+	PTHREAD_REQUIRE(pthread_detach(t));
+
+	rv = pthread_join(t, NULL);
+	ATF_REQUIRE(rv == EINVAL);
+
+	/*
+	 * As usual, ESRCH should follow if
+	 * we try to detach an invalid thread.
+	 */
+	rv = pthread_cancel(NULL);
+	ATF_REQUIRE(rv == ESRCH);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, pthread_detach);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_equal.c b/contrib/netbsd-tests/lib/libpthread/t_equal.c
new file mode 100644
index 000000000000..bcda996e77df
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_equal.c
@@ -0,0 +1,74 @@
+/* $NetBSD: t_equal.c,v 1.1 2011/03/24 12:40:59 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_equal.c,v 1.1 2011/03/24 12:40:59 jruoho Exp $");
+
+#include <pthread.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static void	*func(void *);
+
+static void *
+func(void *arg)
+{
+	return NULL;
+}
+
+ATF_TC(pthread_equal);
+ATF_TC_HEAD(pthread_equal, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A test of pthread_equal(3)");
+}
+
+ATF_TC_BODY(pthread_equal, tc)
+{
+	pthread_t t1, t2;
+
+	ATF_REQUIRE(pthread_create(&t1, NULL, func, NULL) == 0);
+	ATF_REQUIRE(pthread_create(&t2, NULL, func, NULL) == 0);
+
+	ATF_REQUIRE(pthread_equal(t1, t1) != 0);
+	ATF_REQUIRE(pthread_equal(t2, t2) != 0);
+	ATF_REQUIRE(pthread_equal(t1, t2) == 0);
+
+	ATF_REQUIRE(pthread_join(t1, NULL) == 0);
+	ATF_REQUIRE(pthread_join(t2, NULL) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, pthread_equal);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_exit.sh b/contrib/netbsd-tests/lib/libpthread/t_exit.sh
new file mode 100755
index 000000000000..7fbd689f5a68
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_exit.sh
@@ -0,0 +1,41 @@
+# $NetBSD: t_exit.sh,v 1.1 2010/07/16 15:42:53 jmmv Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case main_thread
+main_thread_head()
+{
+	atf_set "descr" "Checks calling pthread_exit() in the main thread"
+}
+main_thread_body()
+{
+	atf_check -o ignore "$(atf_get_srcdir)/h_exit"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case main_thread
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_fork.c b/contrib/netbsd-tests/lib/libpthread/t_fork.c
new file mode 100644
index 000000000000..ab8806d25641
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_fork.c
@@ -0,0 +1,107 @@
+/* $NetBSD: t_fork.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_fork.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+/*
+ * Written by Love Hörnquist Åstrand <lha@NetBSD.org>, March 2003.
+ * Public domain.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static pid_t parent;
+static int thread_survived = 0;
+
+static void *
+print_pid(void *arg)
+{
+	sleep(3);
+
+	thread_survived = 1;
+	if (parent != getpid()) {
+		exit(1);
+	}
+	return NULL;
+}
+
+ATF_TC(fork);
+ATF_TC_HEAD(fork, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks that child process doesn't get threads");
+}
+ATF_TC_BODY(fork, tc)
+{
+	pthread_t p;
+	pid_t fork_pid;
+
+	parent = getpid();
+
+	PTHREAD_REQUIRE(pthread_create(&p, NULL, print_pid, NULL));
+
+	fork_pid = fork();
+	ATF_REQUIRE(fork_pid != -1);
+
+	if (fork_pid) {
+		int status;
+
+		PTHREAD_REQUIRE(pthread_join(p, NULL));
+		ATF_REQUIRE_MSG(thread_survived, "thread did not survive in parent");
+
+		waitpid(fork_pid, &status, 0);
+		ATF_REQUIRE_MSG(WIFEXITED(status), "child died wrongly");
+		ATF_REQUIRE_EQ_MSG(WEXITSTATUS(status), 0, "thread survived in child");
+	} else {
+		sleep(5);
+		exit(thread_survived ? 1 : 0);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, fork);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_fpu.c b/contrib/netbsd-tests/lib/libpthread/t_fpu.c
new file mode 100644
index 000000000000..4047b1fa6195
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_fpu.c
@@ -0,0 +1,148 @@
+/* $NetBSD: t_fpu.c,v 1.2 2013/01/27 14:47:37 mbalmer Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_fpu.c,v 1.2 2013/01/27 14:47:37 mbalmer Exp $");
+
+/*
+ * This is adapted from part of csw/cstest of the MPD implementation by
+ * the University of Arizona CS department (http://www.cs.arizona.edu/sr/)
+ * which is in the public domain:
+ *
+ * "The MPD system is in the public domain and you may use and distribute it
+ *  as you wish.  We ask that you retain credits referencing the University
+ *  of Arizona and that you identify any changes you make.
+ *
+ *  We can't provide a warranty with MPD; it's up to you to determine its
+ *  suitability and reliability for your needs.  We would like to hear of
+ *  any problems you encounter but we cannot promise a timely correction."
+ *
+ * It was changed to use pthread_create() and sched_yield() instead of
+ * the internal MPD context switching primitives by Ignatios Souvatzis
+ * <is@netbsd.org>.
+ */
+
+#include <math.h>
+#include <pthread.h>
+#include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define N_RECURSE 10
+
+static void recurse(void);
+
+int recursion_depth = 0;
+pthread_mutex_t recursion_depth_lock;
+
+static void *
+stir(void *p)
+{
+	double *q = (double *)p;
+	double x = *q++;
+	double y = *q++;
+	double z = *q++;
+
+	for (;;) {
+		x = sin ((y = cos (x + y + .4)) - (z = cos (x + z + .6)));
+		PTHREAD_REQUIRE(sched_yield());
+	}
+}
+
+static double
+mul3(double x, double y, double z)
+{
+	PTHREAD_REQUIRE(sched_yield());
+
+	return x * y * z;
+}
+
+static void *
+bar(void *p)
+{
+	double d;
+	int rc;
+
+	d = mul3(mul3(2., 3., 5.), mul3(7., 11., 13.), mul3(17., 19., 23.));
+	ATF_REQUIRE_EQ(d, 223092870.);
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&recursion_depth_lock));
+	rc = recursion_depth++;
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&recursion_depth_lock));
+
+	if (rc < N_RECURSE)
+		recurse();
+	else
+		atf_tc_pass();
+
+	/* NOTREACHED */
+	return NULL;
+}
+
+static void
+recurse(void) {
+	pthread_t s2;
+	pthread_create(&s2, 0, bar, 0);
+	sleep(20); /* XXX must be long enough for our slowest machine */
+}
+
+ATF_TC(fpu);
+ATF_TC_HEAD(fpu, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks that thread context switches will leave the "
+		"floating point computations unharmed");
+}
+ATF_TC_BODY(fpu, tc)
+{
+	double stirseed[] = { 1.7, 3.2, 2.4 };
+	pthread_t s5;
+
+	printf("Testing threaded floating point computations...\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&recursion_depth_lock, 0));
+
+	pthread_create(&s5, 0, stir, stirseed);
+	recurse();
+
+	atf_tc_fail("exiting from main");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, fpu);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_join.c b/contrib/netbsd-tests/lib/libpthread/t_join.c
new file mode 100644
index 000000000000..7f6f8348acfa
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_join.c
@@ -0,0 +1,174 @@
+/* $NetBSD: t_join.c,v 1.8 2012/03/12 20:17:16 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_join.c,v 1.8 2012/03/12 20:17:16 joerg Exp $");
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdint.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#ifdef CHECK_STACK_ALIGNMENT
+extern int check_stack_alignment(void);
+#endif
+
+#define STACKSIZE	65536
+
+static bool error;
+
+static void *threadfunc1(void *);
+static void *threadfunc2(void *);
+
+ATF_TC(pthread_join);
+ATF_TC_HEAD(pthread_join, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "Checks basic error conditions in pthread_join(3)");
+}
+
+ATF_TC_BODY(pthread_join, tc)
+{
+	pthread_t thread;
+
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL, threadfunc1, NULL));
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+}
+
+static void *
+threadfunc1(void *arg)
+{
+	pthread_t thread[25];
+	pthread_t caller;
+	void *val = NULL;
+	uintptr_t i;
+	int rv;
+	pthread_attr_t attr;
+
+	caller = pthread_self();
+
+#ifdef CHECK_STACK_ALIGNMENT
+	/*
+	 * Check alignment of thread stack, if supported.
+	 */
+	ATF_REQUIRE(check_stack_alignment());
+#endif
+
+	/*
+	 * The behavior is undefined, but should error
+	 * out, if we try to join the calling thread.
+	 */
+	rv = pthread_join(caller, NULL);
+
+	/*
+	 * The specification recommends EDEADLK.
+	 */
+	ATF_REQUIRE(rv != 0);
+	ATF_REQUIRE_EQ(rv, EDEADLK);
+
+	ATF_REQUIRE(pthread_attr_init(&attr) == 0);
+
+	for (i = 0; i < __arraycount(thread); i++) {
+
+		error = true;
+
+		ATF_REQUIRE(pthread_attr_setstacksize(&attr, STACKSIZE * (i + 1)) == 0);
+
+		rv = pthread_create(&thread[i], &attr, threadfunc2, (void *)i);
+
+		ATF_REQUIRE_EQ(rv, 0);
+
+		/*
+		 * Check join and exit condition.
+		 */
+		PTHREAD_REQUIRE(pthread_join(thread[i], &val));
+
+		ATF_REQUIRE_EQ(error, false);
+
+		ATF_REQUIRE(val != NULL);
+		ATF_REQUIRE(val == (void *)(i + 1));
+
+		/*
+		 * Once the thread has returned, ESRCH should
+		 * again follow if we try to join it again.
+		 */
+		rv = pthread_join(thread[i], NULL);
+
+		ATF_REQUIRE_EQ(rv, ESRCH);
+
+		/*
+		 * Try to detach the exited thread.
+		 */
+		rv = pthread_detach(thread[i]);
+
+		ATF_REQUIRE(rv != 0);
+	}
+
+	ATF_REQUIRE(pthread_attr_destroy(&attr) == 0);
+
+	pthread_exit(NULL);
+
+	return NULL;
+}
+
+static void *
+threadfunc2(void *arg)
+{
+	static uintptr_t i = 0;
+	uintptr_t j;
+	pthread_attr_t attr;
+	size_t stacksize;
+
+	j = (uintptr_t)arg;
+
+	ATF_REQUIRE(pthread_attr_get_np(pthread_self(), &attr) == 0);
+	ATF_REQUIRE(pthread_attr_getstacksize(&attr, &stacksize) == 0);
+	ATF_REQUIRE(stacksize == STACKSIZE * (j + 1));
+	ATF_REQUIRE(pthread_attr_destroy(&attr) == 0);
+
+	if (i++ == j)
+		error = false;
+
+	pthread_exit((void *)i);
+
+	return NULL;
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pthread_join);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_kill.c b/contrib/netbsd-tests/lib/libpthread/t_kill.c
new file mode 100644
index 000000000000..2fcdd99e4eb8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_kill.c
@@ -0,0 +1,147 @@
+/* $NetBSD: t_kill.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2004 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_kill.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <pthread.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define    NTHREAD    2
+
+struct threadinfo {
+	pthread_t id;
+	sig_atomic_t gotsignal;
+} th[NTHREAD];
+
+pthread_t mainthread;
+
+static void
+sighandler(int signo)
+{
+	pthread_t self;
+	int i;
+
+	self = pthread_self();
+	ATF_REQUIRE_MSG((self != mainthread) && (signo == SIGUSR1),
+				  "unexpected signal");
+
+	for (i = 0; i < NTHREAD; i++)
+		if (self == th[i].id)
+			break;
+
+	ATF_REQUIRE_MSG(i != NTHREAD, "unknown thread");
+
+	th[i].gotsignal++;
+}
+
+static void *
+f(void *arg)
+{
+	struct threadinfo volatile *t = arg;
+
+	while (t->gotsignal < 1) {
+		/* busy loop */
+	}
+
+	return NULL;
+}
+
+ATF_TC(simple);
+ATF_TC_HEAD(simple, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_kill()");
+}
+ATF_TC_BODY(simple, tc)
+{
+	int i;
+	pthread_t self;
+
+	mainthread = pthread_self();
+
+	ATF_REQUIRE(signal(SIGUSR1, sighandler) != SIG_ERR);
+
+	for (i = 0; i < NTHREAD; i++) {
+		PTHREAD_REQUIRE(pthread_create(&th[i].id, NULL, f, &th[i]));
+	}
+
+	sched_yield();
+
+	self = pthread_self();
+	ATF_REQUIRE_EQ_MSG(self, mainthread, "thread id changed");
+
+	for (i = 0; i < NTHREAD; i++) {
+		PTHREAD_REQUIRE(pthread_kill(th[i].id, SIGUSR1));
+	}
+
+	for (i = 0; i < NTHREAD; i++) {
+		PTHREAD_REQUIRE(pthread_join(th[i].id, NULL));
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, simple);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_mutex.c b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
new file mode 100644
index 000000000000..1b435c2f43bd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
@@ -0,0 +1,316 @@
+/* $NetBSD: t_mutex.c,v 1.6 2014/02/09 21:26:07 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mutex.c,v 1.6 2014/02/09 21:26:07 jmmv Exp $");
+
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include "h_common.h"
+
+static pthread_mutex_t mutex;
+static pthread_mutex_t static_mutex = PTHREAD_MUTEX_INITIALIZER;
+static int global_x;
+
+static void *
+mutex1_threadfunc(void *arg)
+{
+	int *param;
+
+	printf("2: Second thread.\n");
+
+	param = arg;
+	printf("2: Locking mutex\n");
+	pthread_mutex_lock(&mutex);
+	printf("2: Got mutex. *param = %d\n", *param);
+	ATF_REQUIRE_EQ(*param, 20);
+	(*param)++;
+
+	pthread_mutex_unlock(&mutex);
+
+	return param;
+}
+
+ATF_TC(mutex1);
+ATF_TC_HEAD(mutex1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mutexes");
+}
+ATF_TC_BODY(mutex1, tc)
+{
+	int x;
+	pthread_t new;
+	void *joinval;
+
+	printf("1: Mutex-test 1\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	x = 1;
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, mutex1_threadfunc, &x));
+	printf("1: Before changing the value.\n");
+	sleep(2);
+	x = 20;
+	printf("1: Before releasing the mutex.\n");
+	sleep(2);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	printf("1: After releasing the mutex.\n");
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("1: Thread joined. X was %d. Return value (int) was %d\n",
+		x, *(int *)joinval);
+	ATF_REQUIRE_EQ(x, 21);
+	ATF_REQUIRE_EQ(*(int *)joinval, 21);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+}
+
+static void *
+mutex2_threadfunc(void *arg)
+{
+	long count = *(int *)arg;
+
+	printf("2: Second thread (%p). Count is %ld\n", pthread_self(), count);
+
+	while (count--) {
+		PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+		global_x++;
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	}
+
+	return (void *)count;
+}
+
+ATF_TC(mutex2);
+ATF_TC_HEAD(mutex2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mutexes");
+#if defined(__powerpc__)
+	atf_tc_set_md_var(tc, "timeout", "40");
+#endif
+}
+ATF_TC_BODY(mutex2, tc)
+{
+	int count, count2;
+	pthread_t new;
+	void *joinval;
+
+	printf("1: Mutex-test 2\n");
+
+#if defined(__powerpc__)
+	atf_tc_expect_timeout("PR port-powerpc/44387");
+#endif
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+	
+	global_x = 0;
+	count = count2 = 10000000;
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, mutex2_threadfunc, &count2));
+
+	printf("1: Thread %p\n", pthread_self());
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	while (count--) {
+		PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+		global_x++;
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	}
+
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("1: Thread joined. X was %d. Return value (long) was %ld\n",
+		global_x, (long)joinval);
+	ATF_REQUIRE_EQ(global_x, 20000000);
+
+#if defined(__powerpc__)
+	/* XXX force a timeout in ppc case since an un-triggered race
+	   otherwise looks like a "failure" */
+	/* We sleep for longer than the timeout to make ATF not
+	   complain about unexpected success */
+	sleep(41);
+#endif
+}
+
+static void *
+mutex3_threadfunc(void *arg)
+{
+	long count = *(int *)arg;
+
+	printf("2: Second thread (%p). Count is %ld\n", pthread_self(), count);
+
+	while (count--) {
+		PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+		global_x++;
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+	}
+
+	return (void *)count;
+}
+
+ATF_TC(mutex3);
+ATF_TC_HEAD(mutex3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mutexes using a static "
+	    "initializer");
+#if defined(__powerpc__)
+	atf_tc_set_md_var(tc, "timeout", "40");
+#endif
+}
+ATF_TC_BODY(mutex3, tc)
+{
+	int count, count2;
+	pthread_t new;
+	void *joinval;
+
+	printf("1: Mutex-test 3\n");
+
+#if defined(__powerpc__)
+	atf_tc_expect_timeout("PR port-powerpc/44387");
+#endif
+
+	global_x = 0;
+	count = count2 = 10000000;
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, mutex3_threadfunc, &count2));
+
+	printf("1: Thread %p\n", pthread_self());
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+
+	while (count--) {
+		PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+		global_x++;
+		PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
+	}
+
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
+	printf("1: Thread joined. X was %d. Return value (long) was %ld\n",
+		global_x, (long)joinval);
+	ATF_REQUIRE_EQ(global_x, 20000000);
+
+#if defined(__powerpc__)
+	/* XXX force a timeout in ppc case since an un-triggered race
+	   otherwise looks like a "failure" */
+	/* We sleep for longer than the timeout to make ATF not
+	   complain about unexpected success */
+	sleep(41);
+#endif
+}
+
+static void *
+mutex4_threadfunc(void *arg)
+{
+	int *param;
+
+	printf("2: Second thread.\n");
+
+	param = arg;
+	printf("2: Locking mutex\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("2: Got mutex. *param = %d\n", *param);
+	(*param)++;
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+
+	return param;
+}
+
+ATF_TC(mutex4);
+ATF_TC_HEAD(mutex4, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks mutexes");
+}
+ATF_TC_BODY(mutex4, tc)
+{
+	int x;
+	pthread_t new;
+	pthread_mutexattr_t mattr;
+	void *joinval;
+
+	printf("1: Mutex-test 4\n");
+
+	PTHREAD_REQUIRE(pthread_mutexattr_init(&mattr));
+	PTHREAD_REQUIRE(pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE));
+
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, &mattr));
+
+	PTHREAD_REQUIRE(pthread_mutexattr_destroy(&mattr));
+
+	x = 1;
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	PTHREAD_REQUIRE(pthread_create(&new, NULL, mutex4_threadfunc, &x));
+
+	printf("1: Before recursively acquiring the mutex.\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+
+	printf("1: Before releasing the mutex once.\n");
+	sleep(2);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	printf("1: After releasing the mutex once.\n");
+
+	x = 20;
+
+	printf("1: Before releasing the mutex twice.\n");
+	sleep(2);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	printf("1: After releasing the mutex twice.\n");
+
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("1: Thread joined. X was %d. Return value (int) was %d\n",
+		x, *(int *)joinval);
+	ATF_REQUIRE_EQ(x, 21);
+	ATF_REQUIRE_EQ(*(int *)joinval, 21);
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mutex1);
+	ATF_TP_ADD_TC(tp, mutex2);
+	ATF_TP_ADD_TC(tp, mutex3);
+	ATF_TP_ADD_TC(tp, mutex4);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_name.c b/contrib/netbsd-tests/lib/libpthread/t_name.c
new file mode 100644
index 000000000000..d17895efe70e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_name.c
@@ -0,0 +1,103 @@
+/* $NetBSD: t_name.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_name.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define NAME_TOO_LONG   "12345678901234567890123456789012"  /* 32 chars */
+#define NAME_JUST_RIGHT "1234567890123456789012345678901"   /* 31 chars */
+
+#define CONST_NAME "xyzzy"
+char non_const_name[] = CONST_NAME;
+
+static void *
+threadfunc(void *arg)
+{
+	pthread_t self = pthread_self();
+	char retname[32];
+
+	PTHREAD_REQUIRE(pthread_getname_np(self, retname, sizeof(retname)));
+	ATF_REQUIRE_STREQ(retname, NAME_JUST_RIGHT);
+
+	PTHREAD_REQUIRE(pthread_setname_np(self, non_const_name, NULL));
+	(void) memset(non_const_name, 0, sizeof(non_const_name));
+	PTHREAD_REQUIRE(pthread_getname_np(self, retname, sizeof(retname)));
+	ATF_REQUIRE_STREQ(retname, CONST_NAME);
+
+	return NULL;
+}
+
+ATF_TC(name);
+ATF_TC_HEAD(name, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks pthread_{,attr}_{get,set}name_np() API");
+}
+ATF_TC_BODY(name, tc)
+{
+	pthread_t thr, self = pthread_self();
+	pthread_attr_t attr;
+	char retname[32];
+
+	PTHREAD_REQUIRE(pthread_attr_init(&attr));
+	PTHREAD_REQUIRE(pthread_attr_getname_np(&attr, retname,
+		sizeof(retname), NULL));
+	ATF_REQUIRE_EQ(retname[0], '\0');
+	ATF_REQUIRE_EQ(pthread_attr_setname_np(&attr, NAME_TOO_LONG, NULL), EINVAL);
+	PTHREAD_REQUIRE(pthread_attr_setname_np(&attr, "%s",
+	    __UNCONST(NAME_JUST_RIGHT)));
+
+	(void) strcpy(retname, "foo");
+	PTHREAD_REQUIRE(pthread_getname_np(self, retname, sizeof(retname)));
+	ATF_REQUIRE_EQ(retname[0], '\0');
+
+	PTHREAD_REQUIRE(pthread_create(&thr, &attr, threadfunc, NULL));
+	PTHREAD_REQUIRE(pthread_join(thr, NULL));
+
+	ATF_REQUIRE_EQ(pthread_getname_np(thr, retname, sizeof(retname)), ESRCH);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, name);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_once.c b/contrib/netbsd-tests/lib/libpthread/t_once.c
new file mode 100644
index 000000000000..575d5d7ef890
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_once.c
@@ -0,0 +1,196 @@
+/* $NetBSD: t_once.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_once.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static pthread_once_t once = PTHREAD_ONCE_INIT;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static int x;
+
+#define NTHREADS 25
+
+static void
+ofunc(void)
+{
+	printf("Variable x has value %d\n", x);
+	x++;
+}
+
+ATF_TC(once1);
+ATF_TC_HEAD(once1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_once()");
+}
+ATF_TC_BODY(once1, tc)
+{
+
+	printf("1: Test 1 of pthread_once()\n");
+
+	PTHREAD_REQUIRE(pthread_once(&once, ofunc));
+	PTHREAD_REQUIRE(pthread_once(&once, ofunc));
+
+	printf("1: X has value %d\n",x );
+	ATF_REQUIRE_EQ(x, 1);
+}
+
+static void
+once2_ofunc(void)
+{
+	x++;
+	printf("ofunc: Variable x has value %d\n", x);
+	x++;
+}
+
+static void *
+once2_threadfunc(void *arg)
+{
+	int num;
+
+	PTHREAD_REQUIRE(pthread_once(&once, once2_ofunc));
+
+	num = *(int *)arg;
+	printf("Thread %d sees x with value %d\n", num, x);
+	ATF_REQUIRE_EQ(x, 2);
+
+	return NULL;
+}
+
+ATF_TC(once2);
+ATF_TC_HEAD(once2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_once()");
+}
+ATF_TC_BODY(once2, tc)
+{
+	pthread_t  threads[NTHREADS];
+	int id[NTHREADS];
+	int i;
+
+	printf("1: Test 2 of pthread_once()\n");
+
+	for (i=0; i < NTHREADS; i++) {
+		id[i] = i;
+		PTHREAD_REQUIRE(pthread_create(&threads[i], NULL, once2_threadfunc, &id[i]));
+	}
+
+	for (i=0; i < NTHREADS; i++)
+		PTHREAD_REQUIRE(pthread_join(threads[i], NULL));
+
+	printf("1: X has value %d\n",x );
+	ATF_REQUIRE_EQ(x, 2);
+}
+
+static void
+once3_cleanup(void *m)
+{
+	pthread_mutex_t *mu = m;
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(mu));
+}
+
+static void
+once3_ofunc(void)
+{
+	pthread_testcancel();
+}
+
+static void *
+once3_threadfunc(void *arg)
+{
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	pthread_cleanup_push(once3_cleanup, &mutex);
+	PTHREAD_REQUIRE(pthread_once(&once, once3_ofunc));
+	pthread_cleanup_pop(1);
+
+	return NULL;
+}
+
+static void
+handler(int sig, siginfo_t *info, void *ctx)
+{
+	atf_tc_fail("Signal handler was called; "
+		"main thread deadlocked in pthread_once()");
+}
+
+ATF_TC(once3);
+ATF_TC_HEAD(once3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_once()");
+}
+ATF_TC_BODY(once3, tc)
+{
+	pthread_t thread;
+	struct sigaction act;
+	struct itimerval it;
+	printf("Test 3 of pthread_once() (test versus cancellation)\n");
+
+	act.sa_sigaction = handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_SIGINFO;
+	sigaction(SIGALRM, &act, NULL);
+
+	timerclear(&it.it_value);
+	it.it_value.tv_usec = 500000;
+	timerclear(&it.it_interval);
+	setitimer(ITIMER_REAL, &it, NULL);
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL, once3_threadfunc, NULL));
+	PTHREAD_REQUIRE(pthread_cancel(thread));
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+
+	PTHREAD_REQUIRE(pthread_once(&once, ofunc));
+
+	/* Cancel timer */
+	timerclear(&it.it_value);
+	setitimer(ITIMER_REAL, &it, NULL);
+
+	printf("Test succeeded\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, once1);
+	ATF_TP_ADD_TC(tp, once2);
+	ATF_TP_ADD_TC(tp, once3);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_preempt.c b/contrib/netbsd-tests/lib/libpthread/t_preempt.c
new file mode 100644
index 000000000000..7ec43b6b681d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_preempt.c
@@ -0,0 +1,128 @@
+/* $NetBSD: t_preempt.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_preempt.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
+
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+pthread_mutex_t mutex;
+pthread_cond_t cond;
+int started;
+
+#define HUGE_BUFFER    1<<20
+#define NTHREADS    1
+
+static void *
+threadfunc(void *arg)
+{
+	printf("2: Second thread.\n");
+
+	printf("2: Locking mutex\n");
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+	printf("2: Got mutex.\n");
+	started++;
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	PTHREAD_REQUIRE(pthread_cond_signal(&cond));
+	sleep(1);
+
+	return NULL;
+}
+
+ATF_TC(preempt1);
+ATF_TC_HEAD(preempt1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks kernel preemption during a large uiomove");
+}
+ATF_TC_BODY(preempt1, tc)
+{
+	int i;
+	ssize_t rv;
+	pthread_t new;
+	void *joinval;
+
+	char *mem;
+	int fd;
+
+	mem = malloc(HUGE_BUFFER);
+	ATF_REQUIRE_MSG(mem != NULL, "%s", strerror(errno));
+
+	fd = open("/dev/urandom", O_RDONLY, 0);
+	ATF_REQUIRE_MSG(fd != -1, "%s", strerror(errno));
+
+	printf("1: preempt test\n");
+
+	PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL));
+	PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL));
+
+	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
+
+	started = 0;
+
+	for (i = 0; i < NTHREADS; i++) {
+		PTHREAD_REQUIRE(pthread_create(&new, NULL, threadfunc, NULL));
+	}
+
+	while (started < NTHREADS) {
+		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+	}
+
+	printf("1: Thread has started.\n");
+
+	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
+	printf("1: After releasing the mutex.\n");
+
+	rv = read(fd, mem, HUGE_BUFFER);
+	close(fd);
+	ATF_REQUIRE_EQ(rv, HUGE_BUFFER);
+
+	PTHREAD_REQUIRE(pthread_join(new, &joinval));
+
+	printf("1: Thread joined.\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, preempt1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_resolv.sh b/contrib/netbsd-tests/lib/libpthread/t_resolv.sh
new file mode 100755
index 000000000000..847eadcaec24
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_resolv.sh
@@ -0,0 +1,42 @@
+# $NetBSD: t_resolv.sh,v 1.1 2010/07/16 15:42:53 jmmv Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case resolv
+resolv_head()
+{
+	atf_set "descr" "Checks parallel name resolution"
+}
+resolv_body()
+{
+	"$(atf_get_srcdir)"/h_resolv -d -n 5 -h 5 \
+		"$(atf_get_srcdir)"/d_mach || atf_fail "test failed"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case resolv
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_rwlock.c b/contrib/netbsd-tests/lib/libpthread/t_rwlock.c
new file mode 100644
index 000000000000..b2a3d6f0aec8
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_rwlock.c
@@ -0,0 +1,125 @@
+/* $NetBSD: t_rwlock.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2004 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_rwlock.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+pthread_rwlock_t lk;
+
+struct timespec to;
+
+/* ARGSUSED */
+static void *
+do_nothing(void *dummy)
+{
+	return NULL;
+}
+
+ATF_TC(rwlock1);
+ATF_TC_HEAD(rwlock1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks read/write locks");
+}
+ATF_TC_BODY(rwlock1, tc)
+{
+	int error;
+	pthread_t t;
+
+	PTHREAD_REQUIRE(pthread_create(&t, NULL, do_nothing, NULL));
+	PTHREAD_REQUIRE(pthread_rwlock_init(&lk, NULL));
+	PTHREAD_REQUIRE(pthread_rwlock_rdlock(&lk));
+	PTHREAD_REQUIRE(pthread_rwlock_rdlock(&lk));
+	PTHREAD_REQUIRE(pthread_rwlock_unlock(&lk));
+
+	ATF_REQUIRE_EQ(pthread_rwlock_trywrlock(&lk), EBUSY);
+
+	ATF_REQUIRE_EQ_MSG(clock_gettime(CLOCK_REALTIME, &to), 0,
+		"%s", strerror(errno));
+	to.tv_sec++;
+	error = pthread_rwlock_timedwrlock(&lk, &to);
+	ATF_REQUIRE_MSG(error == ETIMEDOUT || error == EDEADLK,
+		"%s", strerror(error));
+
+	PTHREAD_REQUIRE(pthread_rwlock_unlock(&lk));
+
+	ATF_REQUIRE_EQ_MSG(clock_gettime(CLOCK_REALTIME, &to), 0,
+						"%s", strerror(errno));
+	to.tv_sec++;
+	PTHREAD_REQUIRE(pthread_rwlock_timedwrlock(&lk, &to));
+
+	ATF_REQUIRE_EQ_MSG(clock_gettime(CLOCK_REALTIME, &to), 0,
+						"%s", strerror(errno));
+	to.tv_sec++;
+	error = pthread_rwlock_timedwrlock(&lk, &to);
+	ATF_REQUIRE_MSG(error == ETIMEDOUT || error == EDEADLK,
+		"%s", strerror(error));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rwlock1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sem.c b/contrib/netbsd-tests/lib/libpthread/t_sem.c
new file mode 100644
index 000000000000..467d182c5fff
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_sem.c
@@ -0,0 +1,307 @@
+/* $NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $ */
+
+/*
+ * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*-
+ * Copyright (c)2004 YAMAMOTO Takashi,
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+/****************************************************************************
+ *
+ * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+ * All rights reserved.
+ *
+ * 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(s), this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified other than the possible
+ *    addition of one or more copyright notices.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
+ *
+ ****************************************************************************/
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $");
+
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+#include <atf-c/config.h>
+
+#include "h_common.h"
+
+#define NTHREADS 10
+
+#define _LIBC_R_
+
+#define SEM_REQUIRE(x) \
+	ATF_REQUIRE_EQ_MSG(x, 0, "%s", strerror(errno))
+
+static sem_t sem;
+
+ATF_TC(named);
+ATF_TC_HEAD(named, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks named semaphores");
+}
+ATF_TC_BODY(named, tc)
+{
+	sem_t *semp;
+
+	ATF_REQUIRE_MSG(-1 != sysconf(_SC_SEMAPHORES), "%s", strerror(errno));
+
+	printf("Test begin\n");
+
+	(void) sem_unlink("/foo");
+	semp = sem_open("/foo", O_CREAT | O_EXCL, 0644, 0);
+	ATF_REQUIRE_MSG(semp != SEM_FAILED, "%s", strerror(errno));
+	SEM_REQUIRE(sem_close(semp));
+	SEM_REQUIRE(sem_unlink("/foo"));
+
+	printf("Test end\n");
+}
+
+ATF_TC(unnamed);
+ATF_TC_HEAD(unnamed, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks unnamed semaphores");
+}
+
+static void *
+entry(void * a_arg)
+{
+	pthread_t self = pthread_self();
+	sem_t *semp = (sem_t *) a_arg;
+
+	printf("Thread %p waiting for semaphore...\n", self);
+	sem_wait(semp);
+	printf("Thread %p got semaphore\n", self);
+
+	return NULL;
+}
+
+ATF_TC_BODY(unnamed, tc)
+{
+	sem_t sem_a, sem_b;
+	pthread_t threads[NTHREADS];
+	unsigned i, j;
+	int val;
+
+	ATF_REQUIRE_MSG(-1 != sysconf(_SC_SEMAPHORES), "%s", strerror(errno));
+
+	printf("Test begin\n");
+
+	SEM_REQUIRE(sem_init(&sem_b, 0, 0));
+	SEM_REQUIRE(sem_getvalue(&sem_b, &val));
+	ATF_REQUIRE_EQ(0, val);
+
+	SEM_REQUIRE(sem_post(&sem_b));
+	SEM_REQUIRE(sem_getvalue(&sem_b, &val));
+	ATF_REQUIRE_EQ(1, val);
+
+	SEM_REQUIRE(sem_wait(&sem_b));
+	ATF_REQUIRE_EQ(sem_trywait(&sem_b), -1);
+	ATF_REQUIRE_EQ(errno, EAGAIN);
+	SEM_REQUIRE(sem_post(&sem_b));
+	SEM_REQUIRE(sem_trywait(&sem_b));
+	SEM_REQUIRE(sem_post(&sem_b));
+	SEM_REQUIRE(sem_wait(&sem_b));
+	SEM_REQUIRE(sem_post(&sem_b));
+
+	SEM_REQUIRE(sem_destroy(&sem_b));
+
+	SEM_REQUIRE(sem_init(&sem_a, 0, 0));
+
+	for (j = 0; j < 2; j++) {
+		for (i = 0; i < NTHREADS; i++) {
+			PTHREAD_REQUIRE(pthread_create(&threads[i], NULL,
+				entry, (void *) &sem_a));
+		}
+
+		for (i = 0; i < NTHREADS; i++) {
+			usleep(10000);
+			printf("main loop %u: posting...\n", j+1);
+			SEM_REQUIRE(sem_post(&sem_a));
+		}
+
+		for (i = 0; i < NTHREADS; i++) {
+			PTHREAD_REQUIRE(pthread_join(threads[i], NULL));
+		}
+	}
+
+	SEM_REQUIRE(sem_destroy(&sem_a));
+
+	printf("Test end\n");
+}
+
+static void
+sighandler(int signo)
+{
+	/* printf("signal %d\n", signo); */
+
+	ATF_REQUIRE_EQ_MSG(signo, SIGALRM, "unexpected signal");
+	SEM_REQUIRE(sem_post(&sem));
+}
+
+static void
+alarm_ms(const int ms)
+{
+	struct itimerval timer;
+	timer.it_interval.tv_sec = 0;
+	timer.it_interval.tv_usec = 0;
+	timer.it_value.tv_sec = 0;
+	timer.it_value.tv_usec = ms * 1000;
+	ATF_REQUIRE(setitimer(ITIMER_REAL, &timer, NULL) == 0);
+}
+
+static void *
+threadfunc(void *arg)
+{
+	int i, ret;
+
+	printf("Entering loop\n");
+	for (i = 0; i < 500; ) {
+		if ((i & 1) != 0) {
+			do {
+				ret = sem_wait(&sem);
+			} while (ret == -1 && errno == EINTR);
+			ATF_REQUIRE(ret == 0);
+		} else {
+			ret = sem_trywait(&sem);
+			if (ret == -1) {
+				ATF_REQUIRE(errno == EAGAIN);
+				continue;
+			}
+		}
+		printf("%s: %d\n", __func__, i);
+		alarm_ms(5);
+		i++;
+	}
+
+	return NULL;
+}
+
+static void
+before_start_test(const bool use_pthread)
+{
+	pthread_t t;
+
+	SEM_REQUIRE(sem_init(&sem, 0, 0));
+	ATF_REQUIRE(SIG_ERR != signal(SIGALRM, sighandler));
+
+	alarm_ms(5);
+
+	if (use_pthread) {
+		PTHREAD_REQUIRE(pthread_create(&t, NULL, threadfunc, NULL));
+		PTHREAD_REQUIRE(pthread_join(t, NULL));
+	} else {
+		threadfunc(NULL);
+	}
+}
+
+ATF_TC(before_start_no_threads);
+ATF_TC_HEAD(before_start_no_threads, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks using semaphores without any "
+	    "thread running");
+	atf_tc_set_md_var(tc, "timeout", "40");
+}
+ATF_TC_BODY(before_start_no_threads, tc)
+{
+	before_start_test(false);
+}
+
+ATF_TC(before_start_one_thread);
+ATF_TC_HEAD(before_start_one_thread, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks using semaphores before "
+	    "starting one thread");
+	atf_tc_set_md_var(tc, "timeout", "40");
+}
+ATF_TC_BODY(before_start_one_thread, tc)
+{
+	before_start_test(true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, named);
+	ATF_TP_ADD_TC(tp, unnamed);
+	ATF_TP_ADD_TC(tp, before_start_no_threads);
+	ATF_TP_ADD_TC(tp, before_start_one_thread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sigalarm.c b/contrib/netbsd-tests/lib/libpthread/t_sigalarm.c
new file mode 100644
index 000000000000..0a58c4e8c0fd
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_sigalarm.c
@@ -0,0 +1,107 @@
+/* $NetBSD: t_sigalarm.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sigalarm.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include <pthread.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+int alarm_set;
+
+#ifdef SA_SIGINFO
+static void
+alarm_handler(int signo, siginfo_t *si, void *ctx)
+{
+	ATF_REQUIRE_EQ_MSG(si->si_signo, signo, "Received unexpected signal");
+	alarm_set = 1;
+}
+#else
+static void
+alarm_handler(int signo)
+{
+	ATF_REQUIRE_EQ_MSG(SIGALRM, signo, "Received unexpected signal");
+	alarm_set = 1;
+}
+#endif
+
+static void *
+setup(void *dummy)
+{
+	struct sigaction sa;
+	sigset_t ss;
+#ifdef SA_SIGINFO
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = alarm_handler;
+#else
+	sa.sa_flags = 0;
+	sa.sa_handler = alarm_handler;
+#endif
+	sigfillset(&ss);
+	sigprocmask(SIG_SETMASK, &ss, NULL);
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGALRM, &sa, NULL);
+	alarm(1);
+
+	return NULL;
+}
+
+ATF_TC(sigalarm);
+ATF_TC_HEAD(sigalarm, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sigsuspend in libpthread when pthread lib is initialized");
+}
+ATF_TC_BODY(sigalarm, tc)
+{
+	sigset_t set;
+	pthread_t self = pthread_self();
+
+	PTHREAD_REQUIRE(pthread_create(&self, NULL, setup, NULL));
+
+	sigemptyset(&set);
+	sigsuspend(&set);
+	alarm(0);
+
+	ATF_REQUIRE(alarm_set);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sigalarm);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_siglongjmp.c b/contrib/netbsd-tests/lib/libpthread/t_siglongjmp.c
new file mode 100644
index 000000000000..298879c3e03e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_siglongjmp.c
@@ -0,0 +1,109 @@
+/* $NetBSD: t_siglongjmp.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_siglongjmp.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+/*
+ * Regression test for siglongjmp out of a signal handler back into
+ * its thread.
+ *
+ * Written by Christian Limpach <cl@NetBSD.org>, December 2003.
+ * Public domain.
+ */
+
+#include <sys/resource.h>
+
+#include <pthread.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static sigjmp_buf env;
+
+static void *
+thread(void *arg)
+{
+	return NULL;
+}
+
+static void
+handler(int sig, siginfo_t *info, void *ctx)
+{
+	siglongjmp(env, 1);
+}
+
+ATF_TC(siglongjmp1);
+ATF_TC_HEAD(siglongjmp1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks siglongjmp() out of a signal handler back into its thread");
+}
+ATF_TC_BODY(siglongjmp1, tc)
+{
+	pthread_t t;
+	sigset_t nset;
+	struct rlimit rlim;
+	struct sigaction act;
+
+	rlim.rlim_cur = rlim.rlim_max = 0;
+	(void)setrlimit(RLIMIT_CORE, &rlim);
+
+	PTHREAD_REQUIRE(pthread_create(&t, NULL, thread, NULL));
+
+	sigemptyset(&nset);
+	sigaddset(&nset, SIGUSR1);
+	PTHREAD_REQUIRE(pthread_sigmask(SIG_SETMASK, &nset, NULL));
+
+	act.sa_sigaction = handler;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGUSR2);
+	act.sa_flags = 0;
+	sigaction(SIGSEGV, &act, NULL);
+
+	ATF_REQUIRE_EQ(sigsetjmp(env, 1), 0);
+
+	PTHREAD_REQUIRE(pthread_sigmask(0, NULL, &nset));
+
+	ATF_REQUIRE_EQ_MSG(sigismember(&nset, SIGSEGV), 0, "SIGSEGV set");
+	ATF_REQUIRE_EQ_MSG(sigismember(&nset, SIGUSR2), 0, "SIGUSR2 set");
+	ATF_REQUIRE_MSG(sigismember(&nset, SIGUSR1), "SIGUSR1 not set");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, siglongjmp1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sigmask.c b/contrib/netbsd-tests/lib/libpthread/t_sigmask.c
new file mode 100644
index 000000000000..69e057752b7c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_sigmask.c
@@ -0,0 +1,261 @@
+/* $NetBSD: t_sigmask.c,v 1.3 2013/10/19 17:45:01 christos Exp $ */
+
+/*
+ * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sigmask.c,v 1.3 2013/10/19 17:45:01 christos Exp $");
+
+/*
+ * Regression test for pthread_sigmask when SA upcalls aren't started yet.
+ *
+ * Written by Christian Limpach <cl@NetBSD.org>, December 2003.
+ * Public domain.
+ */
+
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <sys/resource.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+static volatile sig_atomic_t flag;
+static volatile sig_atomic_t flag2;
+
+static volatile pthread_t thr_usr1;
+static volatile pthread_t thr_usr2;
+
+static sig_atomic_t count = 0;
+
+ATF_TC(upcalls_not_started);
+ATF_TC_HEAD(upcalls_not_started, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks pthread_sigmask when SA upcalls "
+	    "aren't started yet");
+}
+ATF_TC_BODY(upcalls_not_started, tc)
+{
+	sigset_t nset;
+	struct rlimit rlim;
+
+	rlim.rlim_cur = rlim.rlim_max = 0;
+	(void) setrlimit(RLIMIT_CORE, &rlim);
+
+	sigemptyset(&nset);
+	sigaddset(&nset, SIGFPE);
+	pthread_sigmask(SIG_BLOCK, &nset, NULL);
+
+	kill(getpid(), SIGFPE);
+}
+
+static void
+upcalls_not_started_handler1(int sig, siginfo_t *info, void *ctx)
+{
+
+	kill(getpid(), SIGUSR2);
+	/*
+	 * If the mask is properly set, SIGUSR2 will not be handled
+	 * until this handler returns.
+	 */
+	flag = 1;
+}
+
+static void
+upcalls_not_started_handler2(int sig, siginfo_t *info, void *ctx)
+{
+	if (flag == 1)
+		flag = 2;
+}
+
+ATF_TC(before_threads);
+ATF_TC_HEAD(before_threads, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that signal masks are respected "
+	    "before threads are started");
+}
+ATF_TC_BODY(before_threads, tc)
+{
+	struct sigaction act;
+
+	act.sa_sigaction = upcalls_not_started_handler1;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGUSR2);
+	act.sa_flags = SA_SIGINFO;
+
+	ATF_REQUIRE_EQ(sigaction(SIGUSR1, &act, NULL), 0);
+
+	act.sa_sigaction = upcalls_not_started_handler2;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_SIGINFO;
+	(void)sigaction(SIGUSR2, &act, NULL);
+
+	kill(getpid(), SIGUSR1);
+
+	ATF_REQUIRE_EQ(flag, 2);
+	printf("Success: Both handlers ran in order\n");
+}
+
+static void
+respected_while_running_handler1(int sig, siginfo_t *info, void *ctx)
+{
+
+	kill(getpid(), SIGUSR2);
+	/*
+	 * If the mask is properly set, SIGUSR2 will not be handled
+	 * by the current thread until this handler returns.
+	 */
+	flag = 1;
+	thr_usr1 = pthread_self();
+}
+
+static void
+respected_while_running_handler2(int sig, siginfo_t *info, void *ctx)
+{
+	if (flag == 1)
+		flag = 2;
+	flag2 = 1;
+	thr_usr2 = pthread_self();
+}
+
+static void *
+respected_while_running_threadroutine(void *arg)
+{
+
+	kill(getpid(), SIGUSR1);
+	sleep(1);
+
+	if (flag == 2)
+		printf("Success: Both handlers ran in order\n");
+	else if (flag == 1 && flag2 == 1 && thr_usr1 != thr_usr2)
+		printf("Success: Handlers were invoked by different threads\n");
+	else {
+		printf("Failure: flag=%d, flag2=%d, thr1=%p, thr2=%p\n",
+			(int)flag, (int)flag2, (void *)thr_usr1, (void *)thr_usr2);
+		atf_tc_fail("failure");
+	}
+
+	return NULL;
+}
+
+ATF_TC(respected_while_running);
+ATF_TC_HEAD(respected_while_running, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that signal masks are respected "
+	    "while threads are running");
+}
+ATF_TC_BODY(respected_while_running, tc)
+{
+	struct sigaction act;
+	pthread_t thread;
+
+	act.sa_sigaction = respected_while_running_handler1;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGUSR2);
+	act.sa_flags = SA_SIGINFO;
+
+	ATF_REQUIRE_EQ(sigaction(SIGUSR1, &act, NULL), 0);
+
+	act.sa_sigaction = respected_while_running_handler2;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_SIGINFO;
+	(void)sigaction(SIGUSR2, &act, NULL);
+
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL,
+	    respected_while_running_threadroutine, NULL));
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+}
+
+static void
+incorrect_mask_bug_handler(int sig)
+{
+	count++;
+}
+
+static void *
+incorrect_mask_bug_sleeper(void* arg)
+{
+	int i;
+	for (i = 0; i < 10; i++)
+		sleep(1);
+
+	atf_tc_fail("sleeper");
+}
+
+ATF_TC(incorrect_mask_bug);
+ATF_TC_HEAD(incorrect_mask_bug, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks for bug in libpthread where "
+	    "incorrect signal mask was used");
+}
+ATF_TC_BODY(incorrect_mask_bug, tc)
+{
+	pthread_t id;
+	struct sigaction act;
+
+	act.sa_sigaction = NULL;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	act.sa_handler = incorrect_mask_bug_handler;
+
+	ATF_REQUIRE_EQ_MSG(sigaction(SIGALRM, &act, NULL), 0, "%s",
+	    strerror(errno));
+
+	sigaddset(&act.sa_mask, SIGALRM);
+	PTHREAD_REQUIRE(pthread_sigmask(SIG_SETMASK, &act.sa_mask, NULL));
+
+	PTHREAD_REQUIRE(pthread_create(&id, NULL, incorrect_mask_bug_sleeper,
+	    NULL));
+	sleep(1);
+
+	sigemptyset(&act.sa_mask);
+	PTHREAD_REQUIRE(pthread_sigmask(SIG_SETMASK, &act.sa_mask, NULL));
+
+	for (;;) {
+		alarm(1);
+		if (select(1, NULL, NULL, NULL, NULL) == -1 && errno == EINTR)
+			if (count == 2)
+				return;
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, upcalls_not_started);
+	ATF_TP_ADD_TC(tp, before_threads);
+	ATF_TP_ADD_TC(tp, respected_while_running);
+	ATF_TP_ADD_TC(tp, incorrect_mask_bug);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sigsuspend.c b/contrib/netbsd-tests/lib/libpthread/t_sigsuspend.c
new file mode 100644
index 000000000000..11796570437e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_sigsuspend.c
@@ -0,0 +1,90 @@
+/* $NetBSD: t_sigsuspend.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sigsuspend.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+/*
+ * Regression test for sigsuspend in libpthread when pthread lib isn't
+ * initialized.
+ *
+ * Written by Love  FIXME strand <lha@NetBSD.org>, March 2003.
+ * Public domain.
+ */
+
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+int alarm_set;
+
+static void
+alarm_handler(int signo)
+{
+	alarm_set = 1;
+}
+
+ATF_TC(sigsuspend);
+ATF_TC_HEAD(sigsuspend, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sigsuspend in libpthread when pthread lib isn't initialized");
+}
+ATF_TC_BODY(sigsuspend, tc)
+{
+	struct sigaction sa;
+	sigset_t set;
+
+	sa.sa_flags = 0;
+	sa.sa_handler = alarm_handler;
+	sigemptyset(&sa.sa_mask);
+
+	sigaction(SIGALRM, &sa, NULL);
+
+	alarm(1);
+
+	sigemptyset(&set);
+	sigaddset(&set, SIGUSR1);
+
+	sigsuspend(&set);
+
+	alarm(0);
+
+	ATF_REQUIRE(alarm_set);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sigsuspend);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sleep.c b/contrib/netbsd-tests/lib/libpthread/t_sleep.c
new file mode 100644
index 000000000000..93a30e3d17a7
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_sleep.c
@@ -0,0 +1,104 @@
+/* $NetBSD: t_sleep.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sleep.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+
+#include <sys/time.h>
+
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define LONGTIME 2000000000
+
+static void *
+threadfunc(void *arg)
+{
+	sleep(LONGTIME);
+
+	return NULL;
+}
+
+static void
+handler(int sig)
+{
+	/*
+	 * Nothing to do; invoking the handler is enough to interrupt
+	 * the sleep.
+	 */
+}
+
+ATF_TC(sleep1);
+ATF_TC_HEAD(sleep1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks sleeping past the time when "
+	    "time_t wraps");
+}
+ATF_TC_BODY(sleep1, tc)
+{
+	pthread_t thread;
+	struct itimerval it;
+	struct sigaction act;
+	sigset_t mtsm;
+
+	printf("Testing sleeps unreasonably far into the future.\n");
+
+	act.sa_handler = handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	sigaction(SIGALRM, &act, NULL);
+
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL, threadfunc, NULL));
+
+	/* make sure the signal is delivered to the child thread */
+	sigemptyset(&mtsm);
+	sigaddset(&mtsm, SIGALRM);
+	PTHREAD_REQUIRE(pthread_sigmask(SIG_BLOCK, &mtsm, 0));
+
+	timerclear(&it.it_interval);
+	timerclear(&it.it_value);
+	it.it_value.tv_sec = 1;
+	setitimer(ITIMER_REAL, &it, NULL);
+
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, sleep1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c b/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
new file mode 100644
index 000000000000..8fd231404542
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
@@ -0,0 +1,112 @@
+/* $NetBSD: t_swapcontext.c,v 1.2 2014/08/25 16:31:15 bouyer Exp $ */
+
+/*
+ * Copyright (c) 2012 Emmanuel Dreyfus. All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD");
+
+#include <pthread.h>
+#include <ucontext.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+#include "h_common.h"
+
+#define STACKSIZE 65536
+
+char stack[STACKSIZE];
+ucontext_t nctx;
+ucontext_t octx;
+void *oself;
+void *nself;
+int val1, val2;
+
+/* ARGSUSED0 */
+static void
+swapfunc(void *arg)
+{
+	/*
+	 * If the test fails, we are very likely to crash 
+	 * without the opportunity to report
+	 */ 
+	nself = (void *)pthread_self();
+	printf("after swapcontext self = %p\n", nself);
+
+	ATF_REQUIRE_EQ(oself, nself);
+	printf("Test succeeded\n");
+	/* Go back in main */
+	ATF_REQUIRE(swapcontext(&nctx, &octx));
+
+	/* NOTREACHED */
+	return;
+}
+
+/* ARGSUSED0 */
+static void *
+threadfunc(void *arg)
+{
+	nctx.uc_stack.ss_sp = stack;
+	nctx.uc_stack.ss_size = sizeof(stack);
+       
+	makecontext(&nctx, (void *)*swapfunc, 0);
+       
+	oself = (void *)pthread_self();
+	printf("before swapcontext self = %p\n", oself);
+	PTHREAD_REQUIRE(swapcontext(&octx, &nctx));
+
+	/* NOTREACHED */
+	return NULL;
+}
+
+
+ATF_TC(swapcontext1);
+ATF_TC_HEAD(swapcontext1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Testing if swapcontext() "
+	    "alters pthread_self()");
+}
+ATF_TC_BODY(swapcontext1, tc)
+{
+	pthread_t thread;
+
+	oself = (void *)&val1;
+	nself = (void *)&val2;
+
+	printf("Testing if swapcontext() alters pthread_self()\n");
+
+	PTHREAD_REQUIRE(getcontext(&nctx));
+	PTHREAD_REQUIRE(pthread_create(&thread, NULL, threadfunc, NULL));
+	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, swapcontext1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/librt/t_sched.c b/contrib/netbsd-tests/lib/librt/t_sched.c
new file mode 100644
index 000000000000..879604305e4f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librt/t_sched.c
@@ -0,0 +1,256 @@
+/* $NetBSD: t_sched.c,v 1.5 2012/03/25 04:11:42 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_sched.c,v 1.5 2012/03/25 04:11:42 christos Exp $");
+
+#include <sched.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static void	 sched_priority_set(int, int);
+
+ATF_TC(sched_getparam);
+ATF_TC_HEAD(sched_getparam, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of sched_getparam(3)");
+}
+
+ATF_TC_BODY(sched_getparam, tc)
+{
+	struct sched_param s1, s2;
+	pid_t p = getpid();
+
+	/*
+	 * IEEE Std 1003.1-2008: if the supplied pid is zero,
+	 * the parameters for the calling process are returned.
+	 */
+	ATF_REQUIRE(sched_getparam(0, &s1) == 0);
+	ATF_REQUIRE(sched_getparam(p, &s2) == 0);
+
+	ATF_CHECK_EQ(s1.sched_priority, s2.sched_priority);
+
+	/*
+	 * The behavior is undefined but should error
+	 * out in case the supplied PID is negative.
+	 */
+	ATF_REQUIRE(sched_getparam(-1, &s1) != 0);
+}
+
+ATF_TC(sched_priority);
+ATF_TC_HEAD(sched_priority, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sched(3) priority ranges");
+}
+
+ATF_TC_BODY(sched_priority, tc)
+{
+	static const int pol[3] = { SCHED_OTHER, SCHED_FIFO, SCHED_RR };
+	int pmax, pmin;
+	size_t i;
+
+	/*
+	 * Test that bogus values error out.
+	 */
+	if (INT_MAX > SCHED_RR)
+		ATF_REQUIRE(sched_get_priority_max(INT_MAX) != 0);
+
+	if (-INT_MAX < SCHED_OTHER)
+		ATF_REQUIRE(sched_get_priority_max(-INT_MAX) != 0);
+
+	/*
+	 * Test that we have a valid range.
+	 */
+	for (i = 0; i < __arraycount(pol); i++) {
+
+		pmax = sched_get_priority_max(pol[i]);
+		pmin = sched_get_priority_min(pol[i]);
+
+		ATF_REQUIRE(pmax != -1);
+		ATF_REQUIRE(pmin != -1);
+		ATF_REQUIRE(pmax > pmin);
+	}
+}
+
+static void
+sched_priority_set(int pri, int pol)
+{
+	struct sched_param sched;
+
+	sched.sched_priority = pri;
+
+	ATF_REQUIRE(pri >= 0);
+	ATF_REQUIRE(sched_setscheduler(0, pol, &sched) == 0);
+
+	/*
+	 * Test that the policy was changed.
+	 */
+	ATF_CHECK_EQ(sched_getscheduler(0), pol);
+
+	/*
+	 * And that sched_getparam(3) returns the new priority.
+	 */
+	sched.sched_priority = -1;
+
+	ATF_REQUIRE(sched_getparam(0, &sched) == 0);
+	ATF_CHECK_EQ(sched.sched_priority, pri);
+}
+
+ATF_TC(sched_setscheduler_1);
+ATF_TC_HEAD(sched_setscheduler_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sched_setscheduler(3), max, RR");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_setscheduler_1, tc)
+{
+	int pri;
+
+	pri = sched_get_priority_max(SCHED_RR);
+	sched_priority_set(pri, SCHED_RR);
+}
+
+ATF_TC(sched_setscheduler_2);
+ATF_TC_HEAD(sched_setscheduler_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sched_setscheduler(3), min, RR");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_setscheduler_2, tc)
+{
+	int pri;
+
+	pri = sched_get_priority_min(SCHED_RR);
+	sched_priority_set(pri, SCHED_RR);
+}
+
+ATF_TC(sched_setscheduler_3);
+ATF_TC_HEAD(sched_setscheduler_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sched_setscheduler(3), max, FIFO");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_setscheduler_3, tc)
+{
+	int pri;
+
+	pri = sched_get_priority_max(SCHED_FIFO);
+	sched_priority_set(pri, SCHED_FIFO);
+}
+
+ATF_TC(sched_setscheduler_4);
+ATF_TC_HEAD(sched_setscheduler_4, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "sched_setscheduler(3), min, FIFO");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_setscheduler_4, tc)
+{
+	int pri;
+
+	pri = sched_get_priority_min(SCHED_FIFO);
+	sched_priority_set(pri, SCHED_FIFO);
+}
+
+ATF_TC(sched_rr_get_interval_1);
+ATF_TC_HEAD(sched_rr_get_interval_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sched_rr_get_interval(3), #1"
+	    " (PR lib/44768)");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_rr_get_interval_1, tc)
+{
+	struct timespec tv;
+	int pri;
+
+	pri = sched_get_priority_min(SCHED_RR);
+	sched_priority_set(pri, SCHED_RR);
+
+	/*
+	 * This should fail with ESRCH for invalid PID.
+	 */
+	ATF_REQUIRE(sched_rr_get_interval(-INT_MAX, &tv) != 0);
+}
+
+ATF_TC(sched_rr_get_interval_2);
+ATF_TC_HEAD(sched_rr_get_interval_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test sched_rr_get_interval(3), #2");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(sched_rr_get_interval_2, tc)
+{
+	struct timespec tv1, tv2;
+	int pri;
+
+	pri = sched_get_priority_min(SCHED_RR);
+	sched_priority_set(pri, SCHED_RR);
+
+	tv1.tv_sec = tv2.tv_sec = -1;
+	tv1.tv_nsec = tv2.tv_nsec = -1;
+
+	ATF_REQUIRE(sched_rr_get_interval(0, &tv1) == 0);
+	ATF_REQUIRE(sched_rr_get_interval(getpid(), &tv2) == 0);
+
+	ATF_REQUIRE(tv1.tv_sec != -1);
+	ATF_REQUIRE(tv2.tv_sec != -1);
+
+	ATF_REQUIRE(tv1.tv_nsec != -1);
+	ATF_REQUIRE(tv2.tv_nsec != -1);
+
+	ATF_REQUIRE(tv1.tv_sec == tv2.tv_sec);
+	ATF_REQUIRE(tv1.tv_nsec == tv2.tv_nsec);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sched_getparam);
+	ATF_TP_ADD_TC(tp, sched_priority);
+
+	ATF_TP_ADD_TC(tp, sched_setscheduler_1);
+	ATF_TP_ADD_TC(tp, sched_setscheduler_2);
+	ATF_TP_ADD_TC(tp, sched_setscheduler_3);
+	ATF_TP_ADD_TC(tp, sched_setscheduler_4);
+
+	ATF_TP_ADD_TC(tp, sched_rr_get_interval_1);
+	ATF_TP_ADD_TC(tp, sched_rr_get_interval_2);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/librt/t_sem.c b/contrib/netbsd-tests/lib/librt/t_sem.c
new file mode 100644
index 000000000000..b6fc4dbf197b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librt/t_sem.c
@@ -0,0 +1,175 @@
+/* $NetBSD: t_sem.c,v 1.2 2010/11/08 13:05:49 njoly Exp $ */
+
+/*
+ * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
+ * All rights reserved.
+ *
+ * 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(s), this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified other than the possible
+ *    addition of one or more copyright notices.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sem.c,v 1.2 2010/11/08 13:05:49 njoly Exp $");
+
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define NCHILDREN 10
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks basic functionality of POSIX "
+	    "semaphores");
+}
+ATF_TC_BODY(basic, tc)
+{
+	int val;
+	sem_t *sem_b;
+
+	if (sysconf(_SC_SEMAPHORES) == -1)
+		atf_tc_skip("POSIX semaphores not supported");
+
+	sem_b = sem_open("/sem_b", O_CREAT | O_EXCL, 0644, 0);
+	ATF_REQUIRE(sem_b != SEM_FAILED);
+
+	ATF_REQUIRE_EQ(sem_getvalue(sem_b, &val), 0);
+	ATF_REQUIRE_EQ(val, 0);
+
+	ATF_REQUIRE_EQ(sem_post(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_getvalue(sem_b, &val), 0);
+	ATF_REQUIRE_EQ(val, 1);
+
+	ATF_REQUIRE_EQ(sem_wait(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem_b), -1);
+	ATF_REQUIRE_EQ(errno, EAGAIN);
+	ATF_REQUIRE_EQ(sem_post(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_post(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_wait(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_post(sem_b), 0);
+
+	ATF_REQUIRE_EQ(sem_close(sem_b), 0);
+	ATF_REQUIRE_EQ(sem_unlink("/sem_b"), 0);
+}
+
+ATF_TC(child);
+ATF_TC_HEAD(child, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks using semaphores to synchronize "
+	    "parent with multiple child processes");
+}
+ATF_TC_BODY(child, tc)
+{
+	pid_t children[NCHILDREN];
+	unsigned i, j;
+	sem_t *sem_a;
+	int status;
+
+	pid_t pid;
+
+	if (sysconf(_SC_SEMAPHORES) == -1)         
+		atf_tc_skip("POSIX semaphores not supported");
+
+	sem_a = sem_open("/sem_a", O_CREAT | O_EXCL, 0644, 0);
+	ATF_REQUIRE(sem_a != SEM_FAILED);
+
+	for (j = 1; j <= 2; j++) {
+		for (i = 0; i < NCHILDREN; i++) {
+			switch ((pid = fork())) {
+			case -1:
+				atf_tc_fail("fork() returned -1");
+			case 0:
+				printf("PID %d waiting for semaphore...\n",
+				    getpid());
+				ATF_REQUIRE_MSG(sem_wait(sem_a) == 0,
+				    "sem_wait failed; iteration %d", j);
+				printf("PID %d got semaphore\n", getpid());
+				_exit(0);
+			default:
+				children[i] = pid;
+				break;
+			}
+		}
+
+		for (i = 0; i < NCHILDREN; i++) {
+			sleep(1);
+			printf("main loop %d: posting...\n", j);
+			ATF_REQUIRE_EQ(sem_post(sem_a), 0);
+		}
+
+		for (i = 0; i < NCHILDREN; i++) {
+			ATF_REQUIRE_EQ(waitpid(children[i], &status, 0), children[i]);
+			ATF_REQUIRE(WIFEXITED(status));
+			ATF_REQUIRE_EQ(WEXITSTATUS(status), 0);
+		}
+	}
+
+	ATF_REQUIRE_EQ(sem_close(sem_a), 0);
+	ATF_REQUIRE_EQ(sem_unlink("/sem_a"), 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, basic);
+	ATF_TP_ADD_TC(tp, child);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/librumpclient/h_exec.c b/contrib/netbsd-tests/lib/librumpclient/h_exec.c
new file mode 100644
index 000000000000..cf2526ced636
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumpclient/h_exec.c
@@ -0,0 +1,132 @@
+/*	$NetBSD: h_exec.c,v 1.6 2011/02/16 17:57:44 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rumpclient.h>
+#include <rump/rump_syscalls.h>
+
+int
+main(int argc, char *argv[])
+{
+	struct sockaddr_in sin;
+	socklen_t slen;
+	int s1, s2;
+	char buf[12];
+	char *eargv[4];
+	char *ename;
+	extern char **environ;
+
+	if (rumpclient_init() == -1)
+		err(1, "init");
+
+	if (argc > 1) {
+		if (strcmp(argv[1], "_didexec") == 0) {
+			rumpclient_daemon(0, 0); /* detach-me-notnot */
+			s2 = atoi(argv[2]);
+			slen = sizeof(sin);
+			/* see below */
+			rump_sys_accept(s2, (struct sockaddr *)&sin, &slen);
+		}
+	}
+
+	/* open and listenize two TCP4 suckets */
+	if ((s1 = rump_sys_socket(PF_INET, SOCK_STREAM, 0)) == -1)
+		err(1, "socket 1");
+	if ((s2 = rump_sys_socket(PF_INET, SOCK_STREAM, 0)) == -1)
+		err(1, "socket 2");
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(1234);
+
+	if (rump_sys_bind(s1, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		err(1, "bind1");
+	sin.sin_port = htons(2345);
+	if (rump_sys_bind(s2, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		err(1, "bind2");
+
+	if (rump_sys_listen(s1, 1) == -1)
+		err(1, "listen1");
+	if (rump_sys_listen(s2, 1) == -1)
+		err(1, "listen2");
+
+	if (argc == 1) {
+		rumpclient_daemon(0, 0);
+		slen = sizeof(sin);
+		/*
+		 * "pause()", but conveniently gets rid of this helper
+		 * since we were called with RUMPCLIENT_RETRYCONN_DIE set
+		 */
+		rump_sys_accept(s2, (struct sockaddr *)&sin, &slen);
+	}
+
+	if (argc == 3 && strcmp(argv[2], "cloexec1") == 0) {
+		if (rump_sys_fcntl(s1, F_SETFD, FD_CLOEXEC) == -1) {
+			err(1, "cloexec failed");
+		}
+	}
+
+	sprintf(buf, "%d", s2);
+
+	if (argc == 3 && strcmp(argv[2], "vfork_please") == 0) {
+		switch (rumpclient_vfork()) {
+		case 0:
+			ename = __UNCONST("fourchette");
+			break;
+		case -1:
+			err(1, "vfork");
+		default:
+			ename = __UNCONST("h_ution");
+			break;
+		}
+	} else {
+		ename = __UNCONST("h_ution");
+	}
+
+	/* omstart! */
+	eargv[0] = ename;
+	eargv[1] = __UNCONST("_didexec");
+	eargv[2] = buf;
+	eargv[3] = NULL;
+	if (rumpclient_exec(argv[1], __UNCONST(eargv), environ) == -1)
+		err(1, "exec");
+}
diff --git a/contrib/netbsd-tests/lib/librumpclient/h_execthr.c b/contrib/netbsd-tests/lib/librumpclient/h_execthr.c
new file mode 100644
index 000000000000..f653fe6afe0a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumpclient/h_execthr.c
@@ -0,0 +1,187 @@
+/*	$NetBSD: h_execthr.c,v 1.3 2014/08/13 00:03:00 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rumpclient.h>
+#include <rump/rump_syscalls.h>
+
+static int canreturn = 0;
+
+/*
+ * Use a fairly large number of threads so that we have
+ * a better chance catching races.  XXX: this is rumpuser's
+ * MAXWORKER-1.
+ */
+#define NTHR 63
+
+#define P1_0 3
+#define P1_1 4
+#define P2_0 5
+#define P2_1 6
+
+static void *
+wrk(void *arg)
+{
+	int fd = (uintptr_t)arg;
+
+	rump_sys_read(fd, &fd, sizeof(fd));
+	if (!canreturn)
+		errx(1, "should not have returned");
+	if (fd != 37)
+		errx(1, "got invalid magic");
+
+	return NULL;
+}
+
+static int
+getproc(pid_t mypid, struct kinfo_proc2 *p)
+{
+	int name[6];
+	size_t len = sizeof(*p);
+
+	name[0] = CTL_KERN;
+	name[1] = KERN_PROC2;
+	name[2] = KERN_PROC_PID;
+	name[3] = mypid;
+	name[4] = len;
+	name[5] = 1;
+
+	return rump_sys___sysctl(name, __arraycount(name), p, &len, NULL, 0);
+} 
+
+int
+main(int argc, char *argv[], char *envp[])
+{
+	struct kinfo_proc2 p;
+	char *execarg[3];
+	int p1[2], p2[2];
+	pid_t mypid;
+	pthread_t pt;
+	ssize_t n;
+	int i, execd;
+	char nexec[16];
+
+	if (argc > 1)
+		execd = atoi(argv[1]);
+	else
+		execd = 0;
+	sprintf(nexec, "%d", execd+1);
+
+	if (rumpclient_init() == -1) {
+		if (execd)
+			err(1, "init execd");
+		else
+			err(1, "init");
+	}
+	mypid = rump_sys_getpid();
+
+	if (execd) {
+		canreturn = 1;
+		if (pthread_create(&pt, NULL,
+		    wrk, (void *)(uintptr_t)P2_0) != 0)
+			errx(1, "exec pthread_create");
+
+		i = 37;
+		rump_sys_write(P2_1, &i, sizeof(i));
+		pthread_join(pt, NULL);
+
+		n = rump_sys_read(P1_0, &i, sizeof(i));
+		if (n != -1 || errno != EBADF)
+			errx(1, "post-exec cloexec works");
+
+		getproc(mypid, &p);
+		if (p.p_nlwps != 2)
+			errx(1, "invalid nlwps: %lld", (long long)p.p_nlwps);
+
+		/* we passed? */
+		if (execd > 10)
+			exit(0);
+
+		rump_sys_close(P2_0);
+		rump_sys_close(P2_1);
+	}
+
+	if (rump_sys_pipe(p1) == -1)
+		err(1, "pipe1");
+	if (p1[0] != P1_0 || p1[1] != P1_1)
+		errx(1, "p1 assumptions failed %d %d", p1[0], p1[1]);
+	if (rump_sys_pipe(p2) == -1)
+		err(1, "pipe1");
+	if (p2[0] != P2_0 || p2[1] != P2_1)
+		errx(1, "p2 assumptions failed");
+	if (rump_sys_fcntl(p1[0], F_SETFD, FD_CLOEXEC) == -1)
+		err(1, "cloexec");
+	if (rump_sys_fcntl(p1[1], F_SETFD, FD_CLOEXEC) == -1)
+		err(1, "cloexec");
+
+	for (i = 0; i < NTHR; i++)
+		if (pthread_create(&pt, NULL,
+		    wrk, (void *)(uintptr_t)p1[0]) != 0)
+			errx(1, "pthread_create 1 %d", i);
+
+	for (i = 0; i < NTHR; i++)
+		if (pthread_create(&pt, NULL,
+		    wrk, (void *)(uintptr_t)p2[0]) != 0)
+			errx(1, "pthread_create 2 %d", i);
+
+	/* wait for all the threads to be enjoying themselves */
+	for (;;) {
+		getproc(mypid, &p);
+		if (p.p_nlwps == 2*NTHR + 2)
+			break;
+		usleep(10000);
+	}
+
+	/*
+	 * load up one more (big) set.  these won't start executing, though,
+	 * but we're interested in if they create blockage
+	 */
+	for (i = 0; i < 3*NTHR; i++)
+		if (pthread_create(&pt, NULL,
+		    wrk, (void *)(uintptr_t)p1[0]) != 0)
+			errx(1, "pthread_create 1 %d", i);
+
+	/* then, we exec! */
+	execarg[0] = argv[0];
+	execarg[1] = nexec;
+	execarg[2] = NULL;
+	if (rumpclient_exec(argv[0], execarg, envp) == -1)
+		err(1, "exec");
+}
diff --git a/contrib/netbsd-tests/lib/librumpclient/t_exec.sh b/contrib/netbsd-tests/lib/librumpclient/t_exec.sh
new file mode 100755
index 000000000000..661a3b92779b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumpclient/t_exec.sh
@@ -0,0 +1,154 @@
+#       $NetBSD: t_exec.sh,v 1.8 2011/03/08 12:40:25 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rumpsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet'
+export RUMP_SERVER=unix://csock
+export RUMPHIJACK_RETRYCONNECT='die'
+
+atf_test_case noexec cleanup
+noexec_head()
+{
+        atf_set "descr" "check that we see what we expect without exec"
+}
+
+noexec_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0 env $(atf_get_srcdir)/h_exec
+	atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
+	atf_check -s exit:0 -o match:'^root.*h_exec.*tcp.*\*\.1234' \
+	    sed -n 2p sstat.out
+	atf_check -s exit:0 -o match:'^root.*h_exec.*tcp.*\*\.2345' \
+	    sed -n 3p sstat.out
+}
+
+noexec_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case exec cleanup
+exec_head()
+{
+        atf_set "descr" "check that client names changes after exec"
+}
+
+exec_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0 $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec
+	atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
+	atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.1234' \
+	    sed -n 2p sstat.out
+	atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
+	    sed -n 3p sstat.out
+}
+
+exec_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case cloexec cleanup
+cloexec_head()
+{
+        atf_set "descr" "check that FD_CLOEXEC works"
+}
+
+cloexec_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0  \
+	    $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec cloexec1
+	atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
+	atf_check -s exit:0 -o inline:'2\n' sed -n '$=' sstat.out
+	atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
+	    sed -n 2p sstat.out
+}
+
+cloexec_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case vfork cleanup
+vfork_head()
+{
+        atf_set "descr" "test rumpclient_vfork()"
+}
+
+vfork_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0  \
+	    $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec vfork_please
+	atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
+	atf_check -s exit:0 -o inline:'5\n' sed -n '$=' sstat.out
+	atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.1234' \
+	    cat sstat.out
+	atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
+	    cat sstat.out
+	atf_check -s exit:0 -o match:'^root.*fourchette.*tcp.*\*\.1234' \
+	    cat sstat.out
+	atf_check -s exit:0 -o match:'^root.*fourchette.*tcp.*\*\.2345' \
+	    cat sstat.out
+}
+
+vfork_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case threxec cleanup
+threxec_head()
+{
+	atf_set "descr" "check that threads are killed before exec continues"
+}
+
+threxec_body()
+{
+	atf_check -s exit:0 rump_server ${RUMP_SERVER}
+	atf_check -s exit:0 $(atf_get_srcdir)/h_execthr
+}
+
+threxec_cleanup()
+{
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case noexec
+	atf_add_test_case exec
+	atf_add_test_case cloexec
+	atf_add_test_case vfork
+	atf_add_test_case threxec
+}
diff --git a/contrib/netbsd-tests/lib/librumpclient/t_fd.c b/contrib/netbsd-tests/lib/librumpclient/t_fd.c
new file mode 100644
index 000000000000..aa0d1ccc6945
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumpclient/t_fd.c
@@ -0,0 +1,146 @@
+/*	$NetBSD: t_fd.c,v 1.4 2011/08/25 18:46:01 hannken Exp $	*/
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <rump/rumpclient.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+ATF_TC_WITH_CLEANUP(bigenough);
+ATF_TC_HEAD(bigenough, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that rumpclient uses "
+	    "fd > 2");
+}
+ATF_TC_WITH_CLEANUP(sigio);
+ATF_TC_HEAD(sigio, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that rump client receives "
+	    "SIGIO");
+}
+
+#define RUMPSERV "unix://sucket"
+
+ATF_TC_CLEANUP(bigenough, tc){system("env RUMP_SERVER=" RUMPSERV " rump.halt");}
+ATF_TC_CLEANUP(sigio, tc) { system("env RUMP_SERVER=" RUMPSERV " rump.halt"); }
+
+ATF_TC_BODY(bigenough, tc)
+{
+	struct stat sb;
+
+	RZ(system("rump_server " RUMPSERV));
+	RL(setenv("RUMP_SERVER", RUMPSERV, 1));
+
+	RL(dup2(0, 10));
+	RL(dup2(1, 11));
+	RL(dup2(2, 12));
+
+	RL(close(0));
+	RL(close(1));
+	RL(close(2));
+
+	RL(rumpclient_init());
+	RL(rump_sys_getpid());
+
+	ATF_REQUIRE_ERRNO(EBADF, fstat(0, &sb) == -1);
+	ATF_REQUIRE_ERRNO(EBADF, fstat(1, &sb) == -1);
+	ATF_REQUIRE_ERRNO(EBADF, fstat(2, &sb) == -1);
+
+	RL(rump_sys_getpid());
+
+	/* restore these.  does it help? */
+	dup2(10, 0);
+	dup2(11, 1);
+	dup2(12, 2);
+}
+
+static volatile sig_atomic_t sigcnt;
+static void
+gotsig(int sig)
+{
+
+	sigcnt++;
+}
+
+ATF_TC_BODY(sigio, tc)
+{
+	struct sockaddr_in sin;
+	int ls;
+	int cs;
+	int fl;
+	int sc;
+
+	signal(SIGIO, gotsig);
+	RZ(system("rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet "
+	    RUMPSERV));
+	RL(setenv("RUMP_SERVER", RUMPSERV, 1));
+
+	RL(rumpclient_init());
+	RL(ls = rump_sys_socket(PF_INET, SOCK_STREAM, 0));
+
+	RL(rump_sys_fcntl(ls, F_SETOWN, rump_sys_getpid()));
+	RL(fl = rump_sys_fcntl(ls, F_GETFL));
+	RL(rump_sys_fcntl(ls, F_SETFL, fl | O_ASYNC));
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(12345);
+	RL(rump_sys_bind(ls, (struct sockaddr *)&sin, sizeof(sin)));
+	RL(rump_sys_listen(ls, 5));
+
+	RL(cs = rump_sys_socket(PF_INET, SOCK_STREAM, 0));
+	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	ATF_REQUIRE_EQ(sigcnt, 0);
+	RL(rump_sys_connect(cs, (struct sockaddr *)&sin, sizeof(sin)));
+	sc = sigcnt;
+	printf("sigcnt after connect: %d\n", sc);
+	ATF_REQUIRE(sc >= 1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, bigenough);
+	ATF_TP_ADD_TC(tp, sigio);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/h_client.c b/contrib/netbsd-tests/lib/librumphijack/h_client.c
new file mode 100644
index 000000000000..20add7394d8d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/h_client.c
@@ -0,0 +1,138 @@
+/*	$NetBSD: h_client.c,v 1.8 2012/04/20 05:15:11 jruoho Exp $	*/
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/poll.h>
+#include <sys/select.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+int
+main(int argc, char *argv[])
+{
+
+	if (argc != 2) {
+		errx(1, "need testname as param");
+	}
+
+	if (strcmp(argv[1], "select_timeout") == 0) {
+		fd_set rfds;
+		struct timeval tv;
+		int pipefd[2];
+		int rv;
+
+		tv.tv_sec = 0;
+		tv.tv_usec = 1;
+
+		if (pipe(pipefd) == -1)
+			err(EXIT_FAILURE, "pipe");
+		FD_ZERO(&rfds);
+		FD_SET(pipefd[0], &rfds);
+
+		rv = select(pipefd[0]+1, &rfds, NULL, NULL, &tv);
+		if (rv == -1)
+			err(EXIT_FAILURE, "select");
+		if (rv != 0)
+			errx(EXIT_FAILURE, "select succesful");
+
+		if (FD_ISSET(pipefd[0], &rfds))
+			errx(EXIT_FAILURE, "stdin fileno is still set");
+		return EXIT_SUCCESS;
+	} else if (strcmp(argv[1], "select_allunset") == 0) {
+		fd_set fds;
+		struct timeval tv;
+		int rv;
+
+		tv.tv_sec = 0;
+		tv.tv_usec = 1;
+
+		FD_ZERO(&fds);
+
+		rv = select(100, &fds, &fds, &fds, &tv);
+		if (rv == -1)
+			err(EXIT_FAILURE, "select");
+		if (rv != 0)
+			errx(EXIT_FAILURE, "select succesful");
+
+		rv = select(0, NULL, NULL, NULL, &tv);
+		if (rv == -1)
+			err(EXIT_FAILURE, "select2");
+		if (rv != 0)
+			errx(EXIT_FAILURE, "select2 succesful");
+
+		return EXIT_SUCCESS;
+	} else if (strcmp(argv[1], "invafd") == 0) {
+		struct pollfd pfd[2];
+		int fd, rv;
+
+		fd = open("/rump/dev/null", O_RDWR);
+		if (fd == -1)
+			err(EXIT_FAILURE, "open");
+		close(fd);
+
+		pfd[0].fd = STDIN_FILENO;
+		pfd[0].events = POLLIN;
+		pfd[1].fd = fd;
+		pfd[1].events = POLLIN;
+
+		if ((rv = poll(pfd, 2, INFTIM)) != 1)
+			errx(EXIT_FAILURE, "poll unexpected rv %d (%d)",
+			    rv, errno);
+		if (pfd[1].revents != POLLNVAL || pfd[0].revents != 0)
+			errx(EXIT_FAILURE, "poll unexpected revents");
+
+		return EXIT_SUCCESS;
+	} else if (strcmp(argv[1], "fdoff8") == 0) {
+
+		(void)closefrom(0);
+
+		int fd;
+
+		do {
+			if ((fd = open("/dev/null", O_RDWR)) == -1)
+				err(EXIT_FAILURE, "open1");
+		} while (fd < 7);
+		fd = open("/dev/null", O_RDWR);
+		if (fd != -1 || errno != ENFILE)
+			errx(EXIT_FAILURE, "unexpected fd8 %d %d", fd, errno);
+		if (fcntl(0, F_MAXFD) != 7)
+			errx(EXIT_FAILURE, "fd leak?");
+		if ((fd = open("/rump/dev/null", O_RDWR)) != 8)
+			errx(EXIT_FAILURE, "rump open %d %d", fd, errno);
+		return EXIT_SUCCESS;
+	} else {
+		return ENOTSUP;
+	}
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/h_cwd.c b/contrib/netbsd-tests/lib/librumphijack/h_cwd.c
new file mode 100644
index 000000000000..dfc509d3db73
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/h_cwd.c
@@ -0,0 +1,168 @@
+/*      $NetBSD: h_cwd.c,v 1.3 2012/04/17 09:23:21 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char *prefix;
+static size_t prefixlen;
+static char buf[1024];
+static char pwd[1024];
+
+static const char *
+makepath(const char *tail)
+{
+
+	strcpy(buf, prefix);
+	if (prefix[prefixlen-1] != '/')
+		strcat(buf, "/");
+	strcat(buf, tail);
+
+	return buf;
+}
+
+static void
+dochdir(const char *path, const char *errmsg)
+{
+
+	if (chdir(path) == -1)
+		err(EXIT_FAILURE, "%s", errmsg);
+}
+
+static void
+dofchdir(const char *path, const char *errmsg)
+{
+	int fd;
+
+	fd = open(path, O_RDONLY);
+	if (fd == -1)
+		err(EXIT_FAILURE, "open %s", errmsg);
+	if (fchdir(fd) == -1)
+		err(EXIT_FAILURE, "fchdir %s", errmsg);
+	close(fd);
+}
+static void (*thechdir)(const char *, const char *);
+
+static void
+simple(void)
+{
+
+	thechdir(prefix, "chdir1");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd1");
+	if (strcmp(pwd, prefix) != 0)
+		errx(EXIT_FAILURE, "strcmp1");
+
+	if (mkdir("dir", 0777) == -1)
+		err(EXIT_FAILURE, "mkdir2");
+	thechdir("dir", "chdir2");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd2");
+	if (strcmp(pwd, makepath("dir")) != 0)
+		errx(EXIT_FAILURE, "strcmp2");
+
+	if (mkdir("dir", 0777) == -1)
+		err(EXIT_FAILURE, "mkdir3");
+	thechdir("dir", "chdir3");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd3");
+	if (strcmp(pwd, makepath("dir/dir")) != 0)
+		errx(EXIT_FAILURE, "strcmp3");
+
+	thechdir("..", "chdir4");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd4");
+	if (strcmp(pwd, makepath("dir")) != 0)
+		errx(EXIT_FAILURE, "strcmp4");
+
+
+	thechdir("../../../../../../..", "chdir5");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd5");
+	if (strcmp(pwd, prefix) != 0)
+		errx(EXIT_FAILURE, "strcmp5");
+
+	thechdir("/", "chdir6");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd6");
+	if (strcmp(pwd, "/") != 0)
+		errx(EXIT_FAILURE, "strcmp6");
+}
+
+static void
+symlinktest(void)
+{
+
+	thechdir(prefix, "chdir1");
+	if (mkdir("adir", 0777) == -1)
+		err(EXIT_FAILURE, "mkdir1");
+	if (mkdir("anotherdir", 0777) == -1)
+		err(EXIT_FAILURE, "mkdir2");
+
+	if (symlink("/adir", "anotherdir/lincthesink") == -1)
+		err(EXIT_FAILURE, "symlink");
+
+	thechdir("anotherdir/lincthesink", "chdir2");
+	if (getcwd(pwd, sizeof(pwd)) == NULL)
+		err(EXIT_FAILURE, "getcwd");
+	if (strcmp(pwd, makepath("adir")) != 0)
+		errx(EXIT_FAILURE, "strcmp");
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	if (argc != 4)
+		errx(1, "usage");
+
+	prefix = argv[1];
+	prefixlen = strlen(argv[1]);
+
+	if (strcmp(argv[3], "chdir") == 0)
+		thechdir = dochdir;
+	else if (strcmp(argv[3], "fchdir") == 0)
+		thechdir = dofchdir;
+	else
+		errx(EXIT_FAILURE, "invalid chdir type");
+
+	if (strcmp(argv[2], "simple") == 0)
+		simple();
+	if (strcmp(argv[2], "symlink") == 0)
+		symlinktest();
+
+	return EXIT_SUCCESS;
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/h_netget.c b/contrib/netbsd-tests/lib/librumphijack/h_netget.c
new file mode 100644
index 000000000000..4d8b408d7219
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/h_netget.c
@@ -0,0 +1,101 @@
+/*      $NetBSD: h_netget.c,v 1.2 2012/04/17 09:23:21 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * simple utility to fetch a webpage.  we wouldn't need this
+ * if we had something like netcat in base
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: h_netget.c,v 1.2 2012/04/17 09:23:21 jruoho Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <arpa/inet.h>
+
+#include <netinet/in.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define GETSTR "GET / HTTP/1.0\n\n"
+
+int
+main(int argc, char *argv[])
+{
+	char buf[8192];
+	struct sockaddr_in sin;
+	ssize_t n;
+	int s, fd;
+
+	setprogname(argv[0]);
+	if (argc != 4) {
+		fprintf(stderr, "usage: %s address port savefile\n",
+		    getprogname());
+		return EXIT_FAILURE;
+	}
+
+	s = socket(PF_INET, SOCK_STREAM, 0);
+	if (s == -1)
+		err(EXIT_FAILURE, "socket");
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(atoi(argv[2]));
+	sin.sin_addr.s_addr = inet_addr(argv[1]);
+
+	fd = open(argv[3], O_CREAT | O_RDWR, 0644);
+	if (fd == -1)
+		err(EXIT_FAILURE, "open");
+	if (ftruncate(fd, 0) == -1)
+		err(EXIT_FAILURE, "ftruncate savefile");
+
+	if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		err(EXIT_FAILURE, "connect");
+
+	if (write(s, GETSTR, strlen(GETSTR)) != strlen(GETSTR))
+		err(EXIT_FAILURE, "socket write");
+
+	for (;;) {
+		n = read(s, buf, sizeof(buf));
+		if (n == 0)
+			break;
+		if (n == -1)
+			err(EXIT_FAILURE, "socket read");
+
+		if (write(fd, buf, n) != n)
+			err(EXIT_FAILURE, "write file");
+	}
+
+	return EXIT_SUCCESS;
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/index.html b/contrib/netbsd-tests/lib/librumphijack/index.html
new file mode 100644
index 000000000000..1d8679ceb39e
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/index.html
@@ -0,0 +1,5 @@
+<html><head>
+<title>test page</title>
+</head><body>
+i am a test, how do you do?
+</body></html>
diff --git a/contrib/netbsd-tests/lib/librumphijack/netstat.expout b/contrib/netbsd-tests/lib/librumphijack/netstat.expout
new file mode 100644
index 000000000000..1a9a2a18dc90
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/netstat.expout
@@ -0,0 +1,6 @@
+Active Internet connections (including servers)
+Proto Recv-Q Send-Q  Local Address          Foreign Address        State
+tcp        0      0  *.http                 *.*                    LISTEN
+Active Internet6 connections (including servers)
+Proto Recv-Q Send-Q  Local Address          Foreign Address        (state)
+tcp6       0      0  *.http                 *.*                    LISTEN
diff --git a/contrib/netbsd-tests/lib/librumphijack/ssh_config.in b/contrib/netbsd-tests/lib/librumphijack/ssh_config.in
new file mode 100644
index 000000000000..73b83c84322d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/ssh_config.in
@@ -0,0 +1,14 @@
+# $NetBSD: ssh_config.in,v 1.1 2011/02/14 15:14:00 pooka Exp $
+
+# Basic settings.
+Port 22
+Protocol 2
+
+# The temporary key used for login.
+IdentityFile @WORKDIR@/ssh_user_key
+
+# Prevent the client from complaining about unknown host keys.
+GlobalKnownHostsFile @WORKDIR@/known_hosts
+
+# Do not attempt password authentication in case keys fail.
+IdentitiesOnly yes
diff --git a/contrib/netbsd-tests/lib/librumphijack/ssh_host_key b/contrib/netbsd-tests/lib/librumphijack/ssh_host_key
new file mode 100644
index 000000000000..ebdbc8b44171
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/ssh_host_key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDJnMpSG1lGmApk8F7ZH7TGtjjP/WUs+vqHyFsyS2lilJzereen
+a/ME6S0d0HTOeCdKldjbtDpfNXbh+XnJMlJMEgEs4Mg1jluuEV0GOJoMt7cGzku2
+gAYGx++2+wqYw6Y+M8Tb1M4AO+PcxD/3BkdUyIKO63v6STl2VQn1BzsTQwIBIwKB
+gAuFTWPHDGpvFols0jhK9GMgWwSSIwnidLdNRwowMehgQ3pwVmFWoCwqlN0h2sn4
+PMJu9nL0WxtiJAzprzARgQuPI25t9LiKTF7scC/cNUiHPplUjvoDXA9ccY1eIf4R
+e6wwZz1jfCWen0eRsvMyoYvFmEH8hILAk1bY9heymOGLAkEA/WhC49n+gtloVMow
+iKQOO6+u3ouxTOTQ3sV2wCaLaO2pEbHP2//5SlUJLp6QrjC7bg9Kr+f56+zT2he9
+f6GCwwJBAMus3XizmZdJyJLnkCJRiT0/3Kf57fhWKRdnFkuRLyjET9MEWavRdJmr
+bx/lxmILi1iKwXiFEDM6MqYfmNImJYECQQCtw9YYlXtSaTGZOi/oqwJyEhGCqO6b
+II85q/moVPHhjQY4BOZNttbT4on0FPV+wlSjPa+OkHDcSp/mAaaDZ2+bAkEAujel
+6rLVkaKLfv+ZuPoXE22WivMityo0Mqdk12ArHfVQS+a4YpOdzlOYzLTSosi56o19
+sAShGOTAl+Jf1hQ/iwJAKpPviX5w292H/m5T0m4l0NRdQ3pRujOLMSVmY+/HFZTW
+GJMYLr1eBKNfLsKzJgB88GzuF2O/O8hNi3XSiOP+9w==
+-----END RSA PRIVATE KEY-----
diff --git a/contrib/netbsd-tests/lib/librumphijack/ssh_host_key.pub b/contrib/netbsd-tests/lib/librumphijack/ssh_host_key.pub
new file mode 100644
index 000000000000..8d087959c4ab
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/ssh_host_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyZzKUhtZRpgKZPBe2R+0xrY4z/1lLPr6h8hbMktpYpSc3q3np2vzBOktHdB0zngnSpXY27Q6XzV24fl5yTJSTBIBLODINY5brhFdBjiaDLe3Bs5LtoAGBsfvtvsKmMOmPjPE29TOADvj3MQ/9wZHVMiCjut7+kk5dlUJ9Qc7E0M= test@test.example.net
diff --git a/contrib/netbsd-tests/lib/librumphijack/sshd_config.in b/contrib/netbsd-tests/lib/librumphijack/sshd_config.in
new file mode 100644
index 000000000000..9ffc47f2b0bc
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/sshd_config.in
@@ -0,0 +1,39 @@
+# $NetBSD: sshd_config.in,v 1.1 2011/02/14 15:14:00 pooka Exp $
+
+# Basic settings.
+Port 22
+Protocol 2
+
+# Provide information to the user in case something goes wrong.
+LogLevel DEBUG1
+
+# The host key.  It lives in the work directory because we need to set
+# very strict permissions on it and cannot modify the copy on the source
+# directory.
+HostKey @WORKDIR@/ssh_host_key
+
+# The authorized keys file we set up during the test to allow the client
+# to safely log in.  We need to disable strict modes because ATF_WORKDIR
+# usually lives in /tmp, which has 1777 permissions and are not liked by
+# sshd.
+AuthorizedKeysFile @WORKDIR@/authorized_keys
+StrictModes no
+
+# Some settings to allow user runs of sshd.
+PidFile @WORKDIR@/sshd.pid
+UsePam no
+UsePrivilegeSeparation no
+
+# The root user should also be able to run the tests.
+PermitRootLogin yes
+
+# Be restrictive about access to the temporary server.  Only allow key-based
+# authentication.
+ChallengeResponseAuthentication no
+GSSAPIAuthentication no
+HostbasedAuthentication no
+KerberosAuthentication no
+MaxAuthTries 1
+MaxStartups 1
+PasswordAuthentication no
+PubkeyAuthentication yes
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_asyncio.sh b/contrib/netbsd-tests/lib/librumphijack/t_asyncio.sh
new file mode 100755
index 000000000000..d5d703ca1fa2
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_asyncio.sh
@@ -0,0 +1,94 @@
+#       $NetBSD: t_asyncio.sh,v 1.4 2014/08/27 13:32:16 gson Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rumpsrv='rump_server'
+export RUMP_SERVER=unix://csock
+
+atf_test_case select_timeout cleanup
+select_timeout_head()
+{
+        atf_set "descr" "select() with timeout returns no fds set"
+}
+
+select_timeout_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    $(atf_get_srcdir)/h_client select_timeout
+}
+
+select_timeout_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case select_allunset cleanup
+select_allunset_head()
+{
+        atf_set "descr" "select() with no set fds in fd_set should not crash"
+}
+
+select_allunset_body()
+{
+
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    $(atf_get_srcdir)/h_client select_allunset
+}
+
+select_allunset_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case invafd cleanup
+invafd_head()
+{
+        atf_set "descr" "poll on invalid rump fd"
+	atf_set "timeout" "10"
+}
+
+invafd_body()
+{
+
+	atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    $(atf_get_srcdir)/h_client invafd
+}
+
+invafd_cleanup()
+{
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case select_timeout
+	atf_add_test_case select_allunset
+	atf_add_test_case invafd
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_config.sh b/contrib/netbsd-tests/lib/librumphijack/t_config.sh
new file mode 100755
index 000000000000..014bb0fcb62a
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_config.sh
@@ -0,0 +1,54 @@
+#       $NetBSD: t_config.sh,v 1.1 2011/03/14 15:56:40 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rumpsrv='rump_server -lrumpvfs'
+export RUMP_SERVER=unix://csock
+
+atf_test_case fdoff cleanup
+fdoff_head()
+{
+        atf_set "descr" "RUMPHIJACK fdoff=8"
+}
+
+fdoff_body()
+{
+
+	atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
+	export RUMPHIJACK=path=/rump,fdoff=8
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    $(atf_get_srcdir)/h_client fdoff8
+}
+
+fdoff_cleanup()
+{
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case fdoff
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_cwd.sh b/contrib/netbsd-tests/lib/librumphijack/t_cwd.sh
new file mode 100755
index 000000000000..3f2a50b8b55d
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_cwd.sh
@@ -0,0 +1,72 @@
+#       $NetBSD: t_cwd.sh,v 1.2 2011/02/19 19:57:28 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rumpsrv='rump_server -lrumpvfs'
+export RUMP_SERVER=unix://csock
+
+test_case()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		export RUMPHIJACK="path=${1}" ; \
+		atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} ; \
+		testbody " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		rump.halt
+	}"
+}
+
+test_case basic_chdir /rump simple chdir
+test_case basic_fchdir /rump simple fchdir
+test_case slash_chdir // simple chdir
+test_case slash_fchdir // simple fchdir
+test_case symlink_chdir /rump symlink chdir
+test_case symlink_fchdir /rump symlink fchdir
+test_case symlink_slash_chdir // symlink chdir
+test_case symlink_slash_fchdir // symlink fchdir
+
+testbody()
+{
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    $(atf_get_srcdir)/h_cwd $*
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic_chdir
+	atf_add_test_case basic_fchdir
+	atf_add_test_case slash_chdir
+	atf_add_test_case slash_fchdir
+	atf_add_test_case symlink_chdir
+	atf_add_test_case symlink_fchdir
+	atf_add_test_case symlink_slash_chdir
+	atf_add_test_case symlink_slash_fchdir
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_sh.sh b/contrib/netbsd-tests/lib/librumphijack/t_sh.sh
new file mode 100755
index 000000000000..c01c729943f6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_sh.sh
@@ -0,0 +1,91 @@
+#       $NetBSD: t_sh.sh,v 1.1 2011/03/03 11:54:12 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+#
+# Test various /bin/sh descriptor games.
+#
+# Note that there is an extra level of trickery here, since
+# we need to run an extra level of shell to "catch" LD_PRELOAD.
+#
+
+rumpsrv='rump_server -lrumpvfs'
+export RUMP_SERVER=unix://csock
+exout="this is the output you are looking for"
+
+atf_test_case runscript cleanup
+runscript_head()
+{
+        atf_set "descr" "can run /bin/sh scripts from rumpfs"
+}
+
+runscript_body()
+{
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	echo "echo $exout" > thescript
+	atf_check -s exit:0 mv thescript /rump
+	atf_check -s exit:0 -o inline:"${exout}\n" -x sh /rump/thescript
+}
+
+runscript_cleanup()
+{
+	rump.halt
+}
+
+atf_test_case redirect cleanup
+redirect_head()
+{
+        atf_set "descr" "input/output redirection works with rumphijack"
+}
+
+redirect_body()
+{
+	atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+
+	echo "echo $exout > /rump/thefile" > thescript
+	atf_check -s exit:0 -x sh thescript
+
+	# read it without input redirection
+	atf_check -s exit:0 -o inline:"${exout}\n" cat /rump/thefile
+
+	# read it with input redirection (note, need an exec'd shell again)
+	echo "cat < /rump/thefile" > thescript
+	atf_check -s exit:0 -o inline:"${exout}\n" -x sh thescript
+}
+
+redirect_cleanup()
+{
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case runscript
+	atf_add_test_case redirect
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh b/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh
new file mode 100755
index 000000000000..d6a16fad6a2c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh
@@ -0,0 +1,268 @@
+#       $NetBSD: t_tcpip.sh,v 1.13 2014/01/03 13:18:00 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+rumpnetsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet'
+export RUMP_SERVER=unix://csock
+
+atf_test_case http cleanup
+http_head()
+{
+        atf_set "descr" "Start hijacked httpd and get webpage from it"
+}
+
+http_body()
+{
+
+	atf_check -s exit:0 ${rumpnetsrv} -lrumpnet_netinet6 ${RUMP_SERVER}
+
+	# start bozo in daemon mode
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    /usr/libexec/httpd -P ./httpd.pid -b -s $(atf_get_srcdir)
+
+	atf_check -s exit:0 -o file:"$(atf_get_srcdir)/netstat.expout" \
+	    rump.netstat -a
+
+	# get the webpage
+	atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so 	\
+	    $(atf_get_srcdir)/h_netget 127.0.0.1 80 webfile
+
+	# check that we got what we wanted
+	atf_check -o match:'HTTP/1.0 200 OK' cat webfile
+	atf_check -o match:'Content-Length: 95' cat webfile
+	atf_check -o file:"$(atf_get_srcdir)/index.html" \
+	    sed -n '1,/^$/!p' webfile
+}
+
+http_cleanup()
+{
+	if [ -f httpd.pid ]; then
+		kill -9 "$(cat httpd.pid)"
+		rm -f httpd.pid
+	fi
+
+	rump.halt
+}
+
+#
+# Starts a SSH server and sets up the client to access it.
+# Authentication is allowed and done using an RSA key exclusively, which
+# is generated on the fly as part of the test case.
+# XXX: Ideally, all the tests in this test program should be able to share
+# the generated key, because creating it can be a very slow process on some
+# machines.
+#
+# XXX2: copypasted from jmmv's sshd thingamob in the psshfs test.
+# ideally code (and keys, like jmmv notes above) could be shared
+#
+start_sshd() {
+	echo "Setting up SSH server configuration"
+	sed -e "s,@SRCDIR@,$(atf_get_srcdir),g" -e "s,@WORKDIR@,$(pwd),g" \
+	    $(atf_get_srcdir)/sshd_config.in >sshd_config || \
+	    atf_fail "Failed to create sshd_config"
+	atf_check -s ignore -o empty -e ignore \
+	    cp $(atf_get_srcdir)/ssh_host_key .
+	atf_check -s ignore -o empty -e ignore \
+	    cp $(atf_get_srcdir)/ssh_host_key.pub .
+	atf_check -s eq:0 -o empty -e empty chmod 400 ssh_host_key
+	atf_check -s eq:0 -o empty -e empty chmod 444 ssh_host_key.pub
+
+        env LD_PRELOAD=/usr/lib/librumphijack.so \
+	    /usr/sbin/sshd -e -f ./sshd_config
+	while [ ! -f sshd.pid ]; do
+		sleep 0.01
+	done
+	echo "SSH server started (pid $(cat sshd.pid))"
+
+	echo "Setting up SSH client configuration"
+	atf_check -s eq:0 -o empty -e empty \
+	    ssh-keygen -f ssh_user_key -t rsa -b 1024 -N "" -q
+	atf_check -s eq:0 -o empty -e empty \
+	    cp ssh_user_key.pub authorized_keys
+	echo "127.0.0.1,localhost,::1 " \
+	    "$(cat $(atf_get_srcdir)/ssh_host_key.pub)" >known_hosts || \
+	    atf_fail "Failed to create known_hosts"
+	atf_check -s eq:0 -o empty -e empty chmod 600 authorized_keys
+	sed -e "s,@SRCDIR@,$(atf_get_srcdir),g" -e "s,@WORKDIR@,$(pwd),g" \
+	    $(atf_get_srcdir)/ssh_config.in >ssh_config || \
+	    atf_fail "Failed to create ssh_config"
+	
+	echo "sshd running"
+}
+
+atf_test_case ssh cleanup
+ssh_head()
+{
+        atf_set "descr" "Test that hijacked ssh/sshd works"
+}
+
+ssh_body()
+{
+
+	atf_check -s exit:0 ${rumpnetsrv} ${RUMP_SERVER}
+	# make sure clients die after we nuke the server
+	export RUMPHIJACK_RETRYCONNECT='die'
+
+	start_sshd
+
+	# create some sort of directory for us to "ls"
+	mkdir testdir
+	cd testdir
+	jot 11 | xargs touch
+	jot 11 12 | xargs mkdir
+	cd ..
+
+	atf_check -s exit:0 -o save:ssh.out				\
+	    env LD_PRELOAD=/usr/lib/librumphijack.so			\
+	    ssh -T -F ssh_config 127.0.0.1 env BLOCKSIZE=512		\
+	    ls -li $(pwd)/testdir
+	atf_check -s exit:0 -o file:ssh.out env BLOCKSIZE=512 		\
+	    ls -li $(pwd)/testdir
+}
+
+ssh_cleanup()
+{
+	rump.halt
+	# sshd dies due to RUMPHIJACK_RETRYCONNECT=1d6
+}
+
+test_nfs()
+{
+
+	magicstr='wind in my hair'
+	# create ffs file system we'll be serving from
+	atf_check -s exit:0 -o ignore newfs -F -s 10000 ffs.img
+
+	# start nfs kernel server.  this is a mouthful
+	export RUMP_SERVER=unix://serversock
+	atf_check -s exit:0 rump_server $* ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+	atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.1
+
+	export RUMPHIJACK_RETRYCONNECT=die
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+
+	atf_check -s exit:0 mkdir -p /rump/var/run
+	atf_check -s exit:0 mkdir -p /rump/var/db
+	atf_check -s exit:0 touch /rump/var/db/mountdtab
+	atf_check -s exit:0 mkdir /rump/etc
+	atf_check -s exit:0 mkdir /rump/export
+
+	atf_check -s exit:0 -x \
+	    'echo "/export -noresvport -noresvmnt 10.1.1.100" | \
+		dd of=/rump/etc/exports 2> /dev/null'
+
+	atf_check -s exit:0 -e ignore mount_ffs /dk /rump/export
+	atf_check -s exit:0 -x "echo ${magicstr} > /rump/export/im_alive"
+
+	# start rpcbind.  we want /var/run/rpcbind.sock
+	export RUMPHIJACK='blanket=/var/run,socket=all' 
+	atf_check -s exit:0 rpcbind
+
+	# ok, then we want mountd in the similar fashion
+	export RUMPHIJACK='blanket=/var/run:/var/db:/export,socket=all,path=/rump,vfs=all'
+	atf_check -s exit:0 mountd /rump/etc/exports
+
+	# finally, le nfschuck
+	export RUMPHIJACK='blanket=/var/run,socket=all,vfs=all'
+	atf_check -s exit:0 nfsd
+
+	#
+	# now, time for the client server and associated madness.
+	#
+
+	export RUMP_SERVER=unix://clientsock
+	unset RUMPHIJACK
+	unset LD_PRELOAD
+
+	# at least the kernel server is easier
+	atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet		\
+	    -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
+	    ${RUMP_SERVER}
+
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+	atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.100
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+
+	atf_check -s exit:0 mkdir /rump/mnt
+	atf_check -s exit:0 mount_nfs 10.1.1.1:/export /rump/mnt
+
+	atf_check -s exit:0 -o inline:"${magicstr}\n" cat /rump/mnt/im_alive
+	atf_check -s exit:0 -o match:'.*im_alive$' ls -l /rump/mnt/im_alive
+}
+
+
+atf_test_case nfs cleanup
+nfs_head()
+{
+        atf_set "descr" "Test hijacked nfsd and mount_nfs"
+}
+
+nfs_body()
+{
+	test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net		\
+	    -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif		\
+	    -lrumpdev_disk -lrumpfs_ffs -lrumpfs_nfs -lrumpfs_nfsserver	\
+	    -d key=/dk,hostpath=ffs.img,size=host
+}
+
+nfs_cleanup()
+{
+	RUMP_SERVER=unix://serversock rump.halt 2> /dev/null
+	RUMP_SERVER=unix://clientsock rump.halt 2> /dev/null
+	:
+}
+
+atf_test_case nfs_autoload cleanup
+nfs_autoload_head()
+{
+        atf_set "descr" "Test hijacked nfsd with autoload from /stand"
+}
+
+nfs_autoload_body()
+{
+	[ `uname -m` = "i386" ] || atf_skip "test currently valid only on i386"
+	test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net		\
+	    -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif		\
+	    -lrumpdev_disk -d key=/dk,hostpath=ffs.img,size=host
+}
+
+nfs_autoload_cleanup()
+{
+	nfs_cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case http
+	atf_add_test_case ssh
+	atf_add_test_case nfs
+	atf_add_test_case nfs_autoload
+}
diff --git a/contrib/netbsd-tests/lib/librumphijack/t_vfs.sh b/contrib/netbsd-tests/lib/librumphijack/t_vfs.sh
new file mode 100755
index 000000000000..c803e2a1974c
--- /dev/null
+++ b/contrib/netbsd-tests/lib/librumphijack/t_vfs.sh
@@ -0,0 +1,223 @@
+#       $NetBSD: t_vfs.sh,v 1.6 2012/08/04 03:56:47 riastradh Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+img=ffs.img
+rumpsrv_ffs=\
+"rump_server -lrumpvfs -lrumpfs_ffs -lrumpdev_disk -d key=/img,hostpath=${img},size=host"
+export RUMP_SERVER=unix://csock
+
+domount()
+{
+
+	mntdir=$1
+	[ $# -eq 0 ] && mntdir=/rump/mnt
+	atf_check -s exit:0 -e ignore mount_ffs /img ${mntdir}
+}
+
+dounmount()
+{
+
+	atf_check -s exit:0 umount -R ${mntdir}
+}
+
+remount()
+{
+
+	dounmount
+	domount /rump/mnt2
+}
+
+simpletest()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER} ; \
+		export LD_PRELOAD=/usr/lib/librumphijack.so ; \
+		${name} " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		rump.halt
+	}"
+}
+
+test_case()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		atf_check -s exit:0 -o ignore newfs -F -s 20000 ${img} ; \
+		atf_check -s exit:0 ${rumpsrv_ffs} ${RUMP_SERVER} ; \
+		export LD_PRELOAD=/usr/lib/librumphijack.so ; \
+		mkdir /rump/mnt /rump/mnt2 ; \
+		domount ; \
+		${name} " "${@}" "; \
+		dounmount ${mntdir}
+	}"
+	eval "${name}_cleanup() { \
+		rump.halt
+	}"
+}
+
+test_case paxcopy
+test_case cpcopy
+test_case mv_nox
+test_case ln_nox
+
+#
+# use rumphijack to cp/pax stuff onto an image, unmount it, remount it
+# at a different location, and check that we have an identical copy
+# (we make a local copy to avoid the minor possibility that someone
+# modifies the source dir data while the test is running)
+#
+paxcopy()
+{
+	parent=$(dirname $(atf_get_srcdir))
+	thedir=$(basename $(atf_get_srcdir))
+	atf_check -s exit:0 pax -rw -s,${parent},, $(atf_get_srcdir) .
+	atf_check -s exit:0 pax -rw ${thedir} /rump/mnt
+	remount
+	atf_check -s exit:0 diff -ru ${thedir} /rump/mnt2/${thedir}
+}
+
+cpcopy()
+{
+	thedir=$(basename $(atf_get_srcdir))
+	atf_check -s exit:0 cp -Rp $(atf_get_srcdir) .
+	atf_check -s exit:0 cp -Rp ${thedir} /rump/mnt
+	remount
+	atf_check -s exit:0 diff -ru ${thedir} /rump/mnt2/${thedir}
+}
+
+#
+# non-crosskernel mv (non-simple test since this uses rename(2)
+# which is not supported by rumpfs)
+#
+
+mv_nox()
+{
+	# stat default format sans changetime and filename
+	statstr='%d %i %Sp %l %Su %Sg %r %z \"%Sa\" \"%Sm\" \"%SB\" %k %b %#Xf'
+
+	atf_check -s exit:0 touch /rump/mnt/filename
+	atf_check -s exit:0 -o save:stat.out \
+	    stat -f "${statstr}" /rump/mnt/filename
+	atf_check -s exit:0 mkdir /rump/mnt/dir
+	atf_check -s exit:0 mv /rump/mnt/filename /rump/mnt/dir/same
+	atf_check -s exit:0 -o file:stat.out \
+	    stat -f "${statstr}" /rump/mnt/dir/same
+}
+
+ln_nox()
+{
+	# Omit st_nlink too, since it will increase.
+	statstr='%d %i %Sp %Su %Sg %r %z \"%Sa\" \"%Sm\" \"%SB\" %k %b %#Xf'
+
+	atf_check -s exit:0 touch /rump/mnt/filename
+	atf_check -s exit:0 -o save:stat.out \
+	    stat -f "${statstr}" /rump/mnt/filename
+	atf_check -s exit:0 mkdir /rump/mnt/dir
+	atf_check -s exit:0 ln /rump/mnt/filename /rump/mnt/dir/same
+	atf_check -s exit:0 -o file:stat.out \
+	    stat -f "${statstr}" /rump/mnt/filename
+	atf_check -s exit:0 -o file:stat.out \
+	    stat -f "${statstr}" /rump/mnt/dir/same
+}
+
+simpletest mv_x
+simpletest ln_x
+simpletest runonprefix
+simpletest blanket
+simpletest doubleblanket
+
+#
+# do a cross-kernel mv
+#
+mv_x()
+{
+	thedir=$(basename $(atf_get_srcdir))
+	atf_check -s exit:0 cp -Rp $(atf_get_srcdir) .
+	atf_check -s exit:0 cp -Rp ${thedir} ${thedir}.2
+	atf_check -s exit:0 mv ${thedir} /rump
+	atf_check -s exit:0 diff -ru ${thedir}.2 /rump/${thedir}
+}
+
+#
+# Fail to make a cross-kernel hard link.
+#
+ln_x()
+{
+	atf_check -s exit:0 touch ./loser
+	atf_check -s not-exit:0 -e ignore ln ./loser /rump/.
+}
+
+runonprefix()
+{
+	atf_check -s exit:0 -o ignore stat /rump/dev
+	atf_check -s exit:1 -e ignore stat /rumpdev
+}
+
+blanket()
+{
+	export RUMPHIJACK='blanket=/dev,path=/rump'
+	atf_check -s exit:0 -o save:stat.out \
+	    stat -f "${statstr}" /rump/dev/null
+	atf_check -s exit:0 -o file:stat.out \
+	    stat -f "${statstr}" /dev/null
+}
+
+doubleblanket()
+{
+	atf_check -s exit:0 mkdir /rump/dir
+	atf_check -s exit:0 ln -s dir /rump/dirtoo
+
+	export RUMPHIJACK='blanket=/dirtoo:/dir'
+	atf_check -s exit:0 touch /dir/file
+
+	atf_check -s exit:0 -o save:stat.out \
+	    stat -f "${statstr}" /dir/file
+	atf_check -s exit:0 -o file:stat.out \
+	    stat -f "${statstr}" /dirtoo/file
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case paxcopy
+	atf_add_test_case cpcopy
+	atf_add_test_case mv_x
+	atf_add_test_case ln_x
+	atf_add_test_case mv_nox
+	atf_add_test_case ln_nox
+	atf_add_test_case runonprefix
+	atf_add_test_case blanket
+	atf_add_test_case doubleblanket
+}
diff --git a/contrib/netbsd-tests/lib/libskey/t_algorithms.c b/contrib/netbsd-tests/lib/libskey/t_algorithms.c
new file mode 100644
index 000000000000..2eec278e9544
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libskey/t_algorithms.c
@@ -0,0 +1,121 @@
+/* $NetBSD: t_algorithms.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2000, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_algorithms.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $");
+
+#include <stdio.h>
+#include <strings.h>
+#include <skey.h>
+
+#include <atf-c.h>
+
+#define H_REQUIRE(x, y) \
+	ATF_REQUIRE_MSG(strcasecmp((x), (y)) == 0, "\"%s\" != \"%s\"", (x), (y))
+
+static void
+h_check(const char *pass, const char *seed,
+        const char *algo, const char *zero,
+        const char *one,  const char *nine)
+{
+	char prn[64];
+	char data[16];
+	int i;
+
+	skey_set_algorithm(algo);
+
+	keycrunch(data, seed, pass);
+	btoa8(prn, data);
+	H_REQUIRE(prn, zero);
+
+	f(data);
+	btoa8(prn, data);
+	H_REQUIRE(prn, one);
+
+	for(i = 1; i < 99; ++i)
+		f(data);
+	btoa8(prn, data);
+	H_REQUIRE(prn, nine);
+}
+
+ATF_TC(md4);
+ATF_TC_HEAD(md4, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks MD4 algorithm");
+}
+ATF_TC_BODY(md4, tc)
+{
+	h_check("This is a test.", "TeSt", "md4", "D1854218EBBB0B51",
+		"63473EF01CD0B444", "C5E612776E6C237A");
+	h_check("AbCdEfGhIjK", "alpha1", "md4", "50076F47EB1ADE4E",
+		"65D20D1949B5F7AB", "D150C82CCE6F62D1");
+	h_check("OTP's are good", "correct", "md4", "849C79D4F6F55388",
+		"8C0992FB250847B1", "3F3BF4B4145FD74B");
+}
+
+ATF_TC(md5);
+ATF_TC_HEAD(md5, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks MD5 algorithm");
+}
+ATF_TC_BODY(md5, tc)
+{
+	h_check("This is a test.", "TeSt", "md5", "9E876134D90499DD",
+		"7965E05436F5029F", "50FE1962C4965880");
+	h_check("AbCdEfGhIjK", "alpha1", "md5", "87066DD9644BF206",
+		"7CD34C1040ADD14B", "5AA37A81F212146C");
+	h_check("OTP's are good", "correct", "md5", "F205753943DE4CF9",
+		"DDCDAC956F234937", "B203E28FA525BE47");
+}
+
+ATF_TC(sha1);
+ATF_TC_HEAD(sha1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks SHA1 algorithm");
+}
+ATF_TC_BODY(sha1, tc)
+{
+	h_check("This is a test.", "TeSt", "sha1","BB9E6AE1979D8FF4",
+		"63D936639734385B", "87FEC7768B73CCF9");
+	h_check("AbCdEfGhIjK", "alpha1", "sha1","AD85F658EBE383C9",
+		"D07CE229B5CF119B", "27BC71035AAF3DC6");
+	h_check("OTP's are good", "correct", "sha1","D51F3E99BF8E6F0B",
+		"82AEB52D943774E4", "4F296A74FE1567EC");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, md4);
+	ATF_TP_ADD_TC(tp, md5);
+	ATF_TP_ADD_TC(tp, sha1);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libsljit/t_sljit.sh b/contrib/netbsd-tests/lib/libsljit/t_sljit.sh
new file mode 100755
index 000000000000..50fb860bc76f
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libsljit/t_sljit.sh
@@ -0,0 +1,45 @@
+# $NetBSD: t_sljit.sh,v 1.1 2012/11/05 00:34:28 alnsn Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Alexander Nasonov.
+#
+# 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.
+#
+
+atf_test_case sljit
+sljit_head() {
+
+	atf_set "descr" "Run sljit unit tests."
+}
+
+sljit_body() {
+
+	$(atf_get_srcdir)/h_sljit 2>&1 || atf_fail "check report"
+}
+
+atf_init_test_cases() {
+
+	atf_add_test_case sljit
+}
diff --git a/contrib/netbsd-tests/lib/libutil/t_efun.c b/contrib/netbsd-tests/lib/libutil/t_efun.c
new file mode 100644
index 000000000000..f5187f25ab56
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libutil/t_efun.c
@@ -0,0 +1,135 @@
+/*	$NetBSD: t_efun.c,v 1.3 2012/11/04 23:37:02 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_efun.c,v 1.3 2012/11/04 23:37:02 christos Exp $");
+
+#include <atf-c.h>
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <util.h>
+
+static bool	fail;
+static void	handler(int, const char *, ...);
+
+static void
+handler(int ef, const char *fmt, ...)
+{
+	fail = false;
+}
+
+ATF_TC(ecalloc);
+ATF_TC_HEAD(ecalloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ecalloc(3)");
+}
+
+ATF_TC_BODY(ecalloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = ecalloc(-1, 1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+
+	fail = true;
+	x = ecalloc(SIZE_MAX, 2);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(efopen);
+ATF_TC_HEAD(efopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of efopen(3)");
+}
+
+ATF_TC_BODY(efopen, tc)
+{
+	FILE *f;
+
+	fail = true;
+	f = efopen("XXX", "XXX");
+
+	ATF_REQUIRE(f == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(emalloc);
+ATF_TC_HEAD(emalloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of emalloc(3)");
+}
+
+ATF_TC_BODY(emalloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = emalloc(-1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(erealloc);
+ATF_TC_HEAD(erealloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of erealloc(3)");
+}
+
+ATF_TC_BODY(erealloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = erealloc(NULL, -1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_REQUIRE(esetfunc(handler) != NULL);
+
+	ATF_TP_ADD_TC(tp, ecalloc);
+	ATF_TP_ADD_TC(tp, efopen);
+	ATF_TP_ADD_TC(tp, emalloc);
+	ATF_TP_ADD_TC(tp, erealloc);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libutil/t_parsedate.c b/contrib/netbsd-tests/lib/libutil/t_parsedate.c
new file mode 100644
index 000000000000..ec035a6dfaf6
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libutil/t_parsedate.c
@@ -0,0 +1,142 @@
+/* $NetBSD: t_parsedate.c,v 1.7 2013/01/19 15:21:43 apb Exp $ */
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_parsedate.c,v 1.7 2013/01/19 15:21:43 apb Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <time.h>
+#include <util.h>
+
+ATF_TC(dates);
+
+ATF_TC_HEAD(dates, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test unambiguous dates"
+	    " (PR lib/44255)");
+}
+
+ATF_TC_BODY(dates, tc)
+{
+
+	ATF_CHECK(parsedate("69-09-10", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("2006-11-17", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("10/1/2000", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("20 Jun 1994", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("23jun2001", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("1-sep-06", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("1/11", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("1500-01-02", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("9999-12-21", NULL, NULL) != -1);
+}
+
+ATF_TC(times);
+
+ATF_TC_HEAD(times, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test times"
+	    " (PR lib/44255)");
+}
+
+ATF_TC_BODY(times, tc)
+{
+
+	ATF_CHECK(parsedate("10:01", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("10:12pm", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("12:11:01.000012", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("12:21-0500", NULL, NULL) != -1);
+}
+
+ATF_TC(relative);
+
+ATF_TC_HEAD(relative, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test relative items"
+	    " (PR lib/44255)");
+}
+
+ATF_TC_BODY(relative, tc)
+{
+
+	ATF_CHECK(parsedate("-1 month", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("last friday", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("one week ago", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("this thursday", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("next sunday", NULL, NULL) != -1);
+	ATF_CHECK(parsedate("+2 years", NULL, NULL) != -1);
+}
+
+ATF_TC(atsecs);
+
+ATF_TC_HEAD(atsecs, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test seconds past the epoch");
+}
+
+ATF_TC_BODY(atsecs, tc)
+{
+	int tzoff;
+
+	/* "@0" -> (time_t)0, regardless of timezone */
+	ATF_CHECK(parsedate("@0", NULL, NULL) == (time_t)0);
+	putenv(__UNCONST("TZ=Europe/Berlin"));
+	tzset();
+	ATF_CHECK(parsedate("@0", NULL, NULL) == (time_t)0);
+	putenv(__UNCONST("TZ=America/New_York"));
+	tzset();
+	ATF_CHECK(parsedate("@0", NULL, NULL) == (time_t)0);
+	tzoff = 0;
+	ATF_CHECK(parsedate("@0", NULL, &tzoff) == (time_t)0);
+	tzoff = 3600;
+	ATF_CHECK(parsedate("@0", NULL, &tzoff) == (time_t)0);
+	tzoff = -3600;
+	ATF_CHECK(parsedate("@0", NULL, &tzoff) == (time_t)0);
+
+	/* -1 or other negative numbers are not errors */
+	errno = 0;
+	ATF_CHECK(parsedate("@-1", NULL, &tzoff) == (time_t)-1 && errno == 0);
+	ATF_CHECK(parsedate("@-2", NULL, &tzoff) == (time_t)-2 && errno == 0);
+
+	/* junk is an error */
+	errno = 0;
+	ATF_CHECK(parsedate("@junk", NULL, NULL) == (time_t)-1 && errno != 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, dates);
+	ATF_TP_ADD_TC(tp, times);
+	ATF_TP_ADD_TC(tp, relative);
+	ATF_TP_ADD_TC(tp, atsecs);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libutil/t_pidfile.c b/contrib/netbsd-tests/lib/libutil/t_pidfile.c
new file mode 100644
index 000000000000..a2aff833df38
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libutil/t_pidfile.c
@@ -0,0 +1,363 @@
+/* $NetBSD: t_pidfile.c,v 1.3 2011/03/29 13:55:37 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * This file implements tests for the pidfile(3) functions.
+ *
+ * The tests here are tricky because we need to validate that the atexit(3)
+ * handler registered by pidfile(3) correctly deletes the generated pidfile.
+ * To do so:
+ * 1) We spawn a subprocess in every test case,
+ * 2) Run our test code in such subprocesses.  We cannot call any of the ATF
+ *    primitives from inside these.
+ * 3) Wait for the subprocess to terminate and ensure it exited successfully.
+ * 4) Check that the pidfile(s) created in the subprocess are gone.
+ *
+ * Additionally, pidfile(3) hardcodes a path to a directory writable only by
+ * root (/var/run).  This makes us require root privileges to execute these
+ * tests.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_pidfile.c,v 1.3 2011/03/29 13:55:37 jmmv Exp $");
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <err.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <paths.h>
+#include <unistd.h>
+#include <util.h>
+
+#include <atf-c.h>
+
+/* Used by routines that can be called both from the parent and the child
+ * code to implement proper error reporting. */
+static bool in_child = false;
+
+/* Callable from the test case child code. */
+static void
+check_pidfile(const char *path)
+{
+	FILE *file;
+	int pid;
+
+	printf("Validating contents of pidfile '%s'\n", path);
+
+	if ((file = fopen(path, "r")) == NULL)
+		errx(EXIT_FAILURE, "Cannot open expected pidfile '%s'", path);
+
+	if (fscanf(file, "%d", &pid) == -1)
+		errx(EXIT_FAILURE, "Failed to read pid from pidfile '%s'",
+		    path);
+
+	printf("Read pid %d, current pid %d\n", pid, getpid());
+	if (pid != getpid())
+		errx(EXIT_FAILURE, "Pid in pidfile (%d) does not match "
+		    "current pid (%d)", pid, getpid());
+}
+
+/* Callable from the test case parent/child code. */
+static void
+ensure_deleted(const char *path)
+{
+	printf("Ensuring pidfile %s does not exist any more\n", path);
+	if (access(path, R_OK) != -1) {
+		unlink(path);
+		if (in_child)
+			errx(EXIT_FAILURE, "The pidfile %s was not deleted",
+			    path);
+		else
+			atf_tc_fail("The pidfile %s was not deleted", path);
+	}
+}
+
+/* Callable from the test case parent code. */
+static void
+run_child(void (*child)(const char *), const char *cookie)
+{
+	pid_t pid;
+
+	pid = fork();
+	ATF_REQUIRE(pid != -1);
+	if (pid == 0) {
+		in_child = true;
+		child(cookie);
+		assert(false);
+		/* UNREACHABLE */
+	} else {
+		int status;
+
+		ATF_REQUIRE(waitpid(pid, &status, 0) != -1);
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
+			atf_tc_fail("See stderr for details");
+	}
+}
+
+/* Callable from the test case parent/child code. */
+static char *
+generate_varrun_pidfile(const char *basename)
+{
+	char *path;
+
+	if (asprintf(&path, "%s%s.pid", _PATH_VARRUN,
+	    basename == NULL ? getprogname() : basename) == -1) {
+		if (in_child)
+			errx(EXIT_FAILURE, "Cannot allocate memory for path");
+		else
+			atf_tc_fail("Cannot allocate memory for path");
+	}
+
+	return path;
+}
+
+static void
+helper_default_path(const char *path)
+{
+
+	if (pidfile(NULL) == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile with default "
+		    "basename");
+
+	check_pidfile(path);
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC(default_path);
+ATF_TC_HEAD(default_path, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(default_path, tc)
+{
+	char *path;
+
+	path = generate_varrun_pidfile(NULL);
+	run_child(helper_default_path, path);
+	ensure_deleted(path);
+	free(path);
+}
+
+static void
+helper_custom_basename(const char *path)
+{
+
+	if (pidfile("custom-basename") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile with custom "
+		    "basename");
+
+	check_pidfile(path);
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC(custom_basename);
+ATF_TC_HEAD(custom_basename, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(custom_basename, tc)
+{
+	char *path;
+
+	path = generate_varrun_pidfile("custom-basename");
+	run_child(helper_custom_basename, path);
+	ensure_deleted(path);
+	free(path);
+}
+
+static void
+helper_custom_path(const char *path)
+{
+
+	if (pidfile(path) == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile '%s'", path);
+	check_pidfile(path);
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC_WITHOUT_HEAD(custom_path);
+ATF_TC_BODY(custom_path, tc)
+{
+
+	ATF_REQUIRE(mkdir("var", 0777) != -1);
+	ATF_REQUIRE(mkdir("var/run", 0777) != -1);
+
+	run_child(helper_custom_path, "./var/run/my-pidfile.pid");
+
+	ensure_deleted("./var/run/my-pidfile.pid");
+}
+
+static void
+helper_change_basenames(const char *unused_cookie)
+{
+	char *default_path;
+	char *custom_path;
+
+	default_path = generate_varrun_pidfile(NULL);
+	if (pidfile(NULL) == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile with default "
+		    "basename");
+	check_pidfile(default_path);
+	if (pidfile(NULL) == -1)
+		errx(EXIT_FAILURE, "Failed to recreate pidfile with default "
+		    "basename");
+	check_pidfile(default_path);
+
+	custom_path = generate_varrun_pidfile("custom-basename");
+	if (pidfile("custom-basename") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile with custom "
+		    "basename");
+	ensure_deleted(default_path);
+	check_pidfile(custom_path);
+	if (pidfile("custom-basename") == -1)
+		errx(EXIT_FAILURE, "Failed to recreate pidfile with custom "
+		    "basename");
+	check_pidfile(custom_path);
+
+	free(custom_path);
+	free(default_path);
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC(change_basenames);
+ATF_TC_HEAD(change_basenames, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(change_basenames, tc)
+{
+	char *default_path;
+	char *custom_path;
+
+	run_child(helper_change_basenames, NULL);
+
+	default_path = generate_varrun_pidfile(NULL);
+	custom_path = generate_varrun_pidfile("custom-basename");
+
+	ensure_deleted(default_path);
+	ensure_deleted(custom_path);
+
+	free(custom_path);
+	free(default_path);
+}
+
+static void
+helper_change_paths(const char *unused_cookie)
+{
+
+	if (pidfile("./var/run/first.pid") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile "
+		    "'./var/run/first.pid'");
+	check_pidfile("./var/run/first.pid");
+
+	if (pidfile("./second.pid") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile 'second.pid'");
+	ensure_deleted("./var/run/first.pid");
+	check_pidfile("./second.pid");
+
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC_WITHOUT_HEAD(change_paths);
+ATF_TC_BODY(change_paths, tc)
+{
+
+	ATF_REQUIRE(mkdir("var", 0777) != -1);
+	ATF_REQUIRE(mkdir("var/run", 0777) != -1);
+
+	run_child(helper_change_paths, NULL);
+
+	ensure_deleted("./var/run/my-pidfile.pid");
+	ensure_deleted("second.pid");
+}
+
+static void
+helper_mix(const char *unused_cookie)
+{
+	char *default_path;
+	char *custom_path;
+
+	default_path = generate_varrun_pidfile(NULL);
+	custom_path = generate_varrun_pidfile("custom-basename");
+
+	if (pidfile(NULL) == -1)
+		errx(EXIT_FAILURE, "Failed to create default pidfile");
+	check_pidfile(default_path);
+
+	if (pidfile("./second.pid") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile 'second.pid'");
+	ensure_deleted(default_path);
+	check_pidfile("./second.pid");
+
+	if (pidfile("custom-basename") == -1)
+		errx(EXIT_FAILURE, "Failed to create pidfile 'second.pid'");
+	ensure_deleted(default_path);
+	ensure_deleted("./second.pid");
+	ensure_deleted("./custom-basename");
+	check_pidfile(custom_path);
+
+	free(custom_path);
+	free(default_path);
+	exit(EXIT_SUCCESS);
+}
+
+ATF_TC(change_mix);
+ATF_TC_HEAD(change_mix, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(change_mix, tc)
+{
+	char *default_path;
+
+	run_child(helper_mix, NULL);
+
+	default_path = generate_varrun_pidfile(NULL);
+	ensure_deleted(default_path);
+	ensure_deleted("second.pid");
+	free(default_path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, default_path);
+	ATF_TP_ADD_TC(tp, custom_basename);
+	ATF_TP_ADD_TC(tp, custom_path);
+	ATF_TP_ADD_TC(tp, change_basenames);
+	ATF_TP_ADD_TC(tp, change_paths);
+	ATF_TP_ADD_TC(tp, change_mix);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libutil/t_snprintb.c b/contrib/netbsd-tests/lib/libutil/t_snprintb.c
new file mode 100644
index 000000000000..8863e8b13657
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libutil/t_snprintb.c
@@ -0,0 +1,117 @@
+/* $NetBSD: t_snprintb.c,v 1.4 2014/06/06 06:59:21 shm Exp $ */
+
+/*
+ * Copyright (c) 2002, 2004, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_snprintb.c,v 1.4 2014/06/06 06:59:21 shm Exp $");
+
+#include <string.h>
+#include <util.h>
+
+#include <atf-c.h>
+
+static void
+h_snprintb(const char *fmt, uint64_t val, const char *res)
+{
+	char buf[1024];
+	int len, slen;
+
+	len = snprintb(buf, sizeof(buf), fmt, val);
+	slen = (int) strlen(res);
+
+	ATF_REQUIRE_STREQ(res, buf);
+	ATF_REQUIRE_EQ(len, slen);
+}
+
+ATF_TC(snprintb);
+ATF_TC_HEAD(snprintb, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks snprintb(3)");
+}
+ATF_TC_BODY(snprintb, tc)
+{
+	h_snprintb("\10\2BITTWO\1BITONE", 3, "03<BITTWO,BITONE>");
+	h_snprintb("\177\20b\0A\0\0", 0, "0x0");
+   
+	h_snprintb("\177\20b\05NOTBOOT\0b\06FPP\0b\013SDVMA\0b\015VIDEO\0"
+		"b\020LORES\0b\021FPA\0b\022DIAG\0b\016CACHE\0"
+		"b\017IOCACHE\0b\022LOOPBACK\0b\04DBGCACHE\0",
+		0xe860, "0xe860<NOTBOOT,FPP,SDVMA,VIDEO,CACHE,IOCACHE>");
+}
+
+static void
+h_snprintb_m(const char *fmt, uint64_t val, int line_max, const char *res,
+	     int res_len)
+{
+	char buf[1024];
+	int len;
+
+	len = snprintb_m(buf, sizeof(buf), fmt, val, line_max);
+
+	ATF_REQUIRE_EQ(len, res_len);
+	ATF_REQUIRE_EQ(0, memcmp(res, buf, res_len + 1));
+}
+
+ATF_TC(snprintb_m);
+ATF_TC_HEAD(snprintb_m, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks snprintb_m(3)");
+}
+ATF_TC_BODY(snprintb_m, tc)
+{
+	h_snprintb_m("\177\020b\0LSB\0b\1_BITONE\0f\4\4NIBBLE2\0"
+			"f\x10\4BURST\0=\4FOUR\0=\xfSIXTEEN\0"
+			"b\x1fMSB\0\0",
+                     0x800f0701,
+		     33,
+		     "0x800f0701<LSB,NIBBLE2=0x0>\0"
+			"0x800f0701<BURST=0xf=SIXTEEN,MSB>\0\0",
+		     62);
+
+	h_snprintb_m("\177\020b\0LSB\0b\1_BITONE\0f\4\4NIBBLE2\0"
+			"f\x10\4BURST\0=\4FOUR\0=\xfSIXTEEN\0"
+			"b\x1fMSB\0\0",
+                     0x800f0701,
+		     32,
+		     "0x800f0701<LSB,NIBBLE2=0x0>\0"
+			"0x800f0701<BURST=0xf=SIXTEEN>\0"
+			"0x800f0701<MSB>\0\0",
+		     74);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, snprintb);
+	ATF_TP_ADD_TC(tp, snprintb_m);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/libutil/t_sockaddr_snprintf.c b/contrib/netbsd-tests/lib/libutil/t_sockaddr_snprintf.c
new file mode 100644
index 000000000000..b4e8cb37011b
--- /dev/null
+++ b/contrib/netbsd-tests/lib/libutil/t_sockaddr_snprintf.c
@@ -0,0 +1,185 @@
+/* $NetBSD: t_sockaddr_snprintf.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2002, 2004, 2008, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Christos Zoulas.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_sockaddr_snprintf.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $");
+
+#include <sys/socket.h>		/* AF_ */
+#include <sys/un.h>			/* sun */
+
+#include <net/if_dl.h>		/* sdl */
+#include <netatalk/at.h>	/* sat */
+#include <netinet/in.h>		/* sin/sin6 */
+
+#include <string.h>
+#include <util.h>
+
+#include <atf-c.h>
+
+ATF_TC(sockaddr_snprintf_in);
+ATF_TC_HEAD(sockaddr_snprintf_in, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sockaddr_snprintf(3) with sockaddr_in");
+}
+ATF_TC_BODY(sockaddr_snprintf_in, tc)
+{
+	char buf[1024];
+	struct sockaddr_in sin4;
+	int i;
+
+	memset(&sin4, 0, sizeof(sin4));
+	sin4.sin_len = sizeof(sin4);
+	sin4.sin_family = AF_INET;
+	sin4.sin_port = ntohs(80);
+	sin4.sin_addr.s_addr = ntohl(INADDR_LOOPBACK);
+	i = sockaddr_snprintf(buf, sizeof(buf), "%f %l %p %a",
+		(struct sockaddr *)&sin4);
+
+	ATF_REQUIRE_EQ_MSG(i, 17, "bad length for sin4");
+	ATF_REQUIRE_STREQ(buf, "2 16 80 127.0.0.1");
+}
+
+ATF_TC(sockaddr_snprintf_in6);
+ATF_TC_HEAD(sockaddr_snprintf_in6, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sockaddr_snprintf(3) with sockaddr_in6");
+}
+ATF_TC_BODY(sockaddr_snprintf_in6, tc)
+{
+#ifdef INET6
+	char buf[1024];
+	struct sockaddr_in6 sin6;
+	int i;
+
+	memset(&sin6, 0, sizeof(sin6));
+	sin6.sin6_len = sizeof(sin6);
+	sin6.sin6_family = AF_INET6;
+	sin6.sin6_port = ntohs(80);
+	sin6.sin6_addr = in6addr_nodelocal_allnodes;
+	i = sockaddr_snprintf(buf, sizeof(buf), "%f %l %p %a",
+		(struct sockaddr *)&sin6);
+
+	ATF_REQUIRE_EQ_MSG(i, 16, "bad length for sin6");
+	ATF_REQUIRE_STREQ(buf, "24 28 80 ff01::1");
+#else
+	atf_tc_skip("Tests built with USE_INET6=no");
+#endif /* INET6 */
+}
+
+ATF_TC(sockaddr_snprintf_un);
+ATF_TC_HEAD(sockaddr_snprintf_un, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sockaddr_snprintf(3) with sockaddr_un");
+}
+ATF_TC_BODY(sockaddr_snprintf_un, tc)
+{
+	char buf[1024];
+	struct sockaddr_un sun;
+	int i;
+
+	memset(&sun, 0, sizeof(sun));
+	sun.sun_len = sizeof(sun);
+	sun.sun_family = AF_UNIX;
+	strncpy(sun.sun_path, "/tmp/sock", sizeof(sun.sun_path));
+	i = sockaddr_snprintf(buf, sizeof(buf), "%f %l %a",
+		(struct sockaddr *)&sun);
+
+	ATF_REQUIRE_EQ_MSG(i, 15, "bad length for sun");
+	ATF_REQUIRE_STREQ(buf, "1 106 /tmp/sock");
+}
+
+ATF_TC(sockaddr_snprintf_at);
+ATF_TC_HEAD(sockaddr_snprintf_at, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sockaddr_snprintf(3) with sockaddr_at");
+}
+ATF_TC_BODY(sockaddr_snprintf_at, tc)
+{
+	char buf[1024];
+	struct sockaddr_at sat;
+	int i;
+
+	memset(&sat, 0, sizeof(sat));
+	sat.sat_len = sizeof(sat);
+	sat.sat_family = AF_APPLETALK;
+	sat.sat_addr.s_net = ntohs(101);
+	sat.sat_addr.s_node = 3;
+	i = sockaddr_snprintf(buf, sizeof(buf), "%f %l %a",
+		(struct sockaddr *)&sat);
+
+	ATF_REQUIRE_EQ_MSG(i, 11, "bad length for sat");
+	ATF_REQUIRE_STREQ(buf, "16 16 101.3");
+}
+
+ATF_TC(sockaddr_snprintf_dl);
+ATF_TC_HEAD(sockaddr_snprintf_dl, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks sockaddr_snprintf(3) with sockaddr_dl");
+}
+ATF_TC_BODY(sockaddr_snprintf_dl, tc)
+{
+	char buf[1024];
+	struct sockaddr_dl sdl;
+	int i;
+
+	memset(&sdl, 0, sizeof(sdl));
+	sdl.sdl_len = sizeof(sdl);
+	sdl.sdl_family = AF_LINK;
+	sdl.sdl_index = 0;
+	sdl.sdl_type = 0;
+	sdl.sdl_nlen = 0;
+	sdl.sdl_alen = 6;
+	sdl.sdl_slen = 0;
+	memcpy(sdl.sdl_data, "\01\02\03\04\05\06", 6);
+	i = sockaddr_snprintf(buf, sizeof(buf), "%f %l %a",
+		(struct sockaddr *)&sdl);
+
+	ATF_REQUIRE_EQ_MSG(i, 17, "bad length for sdl");
+	ATF_REQUIRE_STREQ(buf, "18 20 1.2.3.4.5.6");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sockaddr_snprintf_in);
+	ATF_TP_ADD_TC(tp, sockaddr_snprintf_in6);
+	ATF_TP_ADD_TC(tp, sockaddr_snprintf_un);
+	ATF_TP_ADD_TC(tp, sockaddr_snprintf_at);
+	ATF_TP_ADD_TC(tp, sockaddr_snprintf_dl);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/semaphore/pthread/t_sem_pth.c b/contrib/netbsd-tests/lib/semaphore/pthread/t_sem_pth.c
new file mode 100644
index 000000000000..b32d954d2bb0
--- /dev/null
+++ b/contrib/netbsd-tests/lib/semaphore/pthread/t_sem_pth.c
@@ -0,0 +1,17 @@
+#define LIBNAME "pthread"
+#include "sem.c"
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, postwait);
+	ATF_TP_ADD_TC(tp, initvalue);
+	ATF_TP_ADD_TC(tp, destroy);
+	ATF_TP_ADD_TC(tp, busydestroy);
+	ATF_TP_ADD_TC(tp, blockwait);
+	ATF_TP_ADD_TC(tp, blocktimedwait);
+	ATF_TP_ADD_TC(tp, named);
+	ATF_TP_ADD_TC(tp, unlink);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/lib/semaphore/sem.c b/contrib/netbsd-tests/lib/semaphore/sem.c
new file mode 100644
index 000000000000..5967b88d3fff
--- /dev/null
+++ b/contrib/netbsd-tests/lib/semaphore/sem.c
@@ -0,0 +1,332 @@
+/*	$NetBSD: sem.c,v 1.10 2012/03/09 14:25:34 joerg Exp $	*/
+
+/*
+ * Common code for semaphore tests.  This can be included both into
+ * programs using librt and libpthread.
+ */
+
+#include <sys/types.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <sched.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(postwait);
+ATF_TC_HEAD(postwait, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests post and wait from a "
+	    "single thread (%s)", LIBNAME);
+}
+
+ATF_TC_BODY(postwait, tc)
+{
+	sem_t sem;
+	int rv;
+
+	rump_init();
+
+	ATF_REQUIRE_EQ(sem_init(&sem, 1, 0), 0);
+
+	sem_post(&sem);
+	sem_post(&sem);
+
+	sem_wait(&sem);
+	sem_wait(&sem);
+	rv = sem_trywait(&sem);
+	ATF_REQUIRE(errno == EAGAIN);
+	ATF_REQUIRE(rv == -1);
+}
+
+ATF_TC(initvalue);
+ATF_TC_HEAD(initvalue, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests initialization with a non-zero "
+	    "value (%s)", LIBNAME);
+}
+
+ATF_TC_BODY(initvalue, tc)
+{
+	sem_t sem;
+
+	rump_init();
+	sem_init(&sem, 1, 4);
+
+	ATF_REQUIRE_EQ(sem_trywait(&sem), 0);
+	ATF_REQUIRE_EQ(sem_trywait(&sem), 0);
+	ATF_REQUIRE_EQ(sem_trywait(&sem), 0);
+	ATF_REQUIRE_EQ(sem_trywait(&sem), 0);
+	ATF_REQUIRE_EQ(sem_trywait(&sem), -1);
+}
+
+ATF_TC(destroy);
+ATF_TC_HEAD(destroy, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests sem_destroy works (%s)", LIBNAME);
+}
+
+ATF_TC_BODY(destroy, tc)
+{
+	sem_t sem;
+	int rv, i;
+
+	rump_init();
+	for (i = 0; i < 2; i++) {
+		sem_init(&sem, 1, 1);
+
+		ATF_REQUIRE_EQ(sem_trywait(&sem), 0);
+		ATF_REQUIRE_EQ(sem_trywait(&sem), -1);
+		ATF_REQUIRE_EQ(sem_destroy(&sem), 0);
+		rv = sem_trywait(&sem);
+		ATF_REQUIRE_EQ(errno, EINVAL);
+		ATF_REQUIRE_EQ(rv, -1);
+	}
+}
+
+ATF_TC(busydestroy);
+ATF_TC_HEAD(busydestroy, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests sem_destroy report EBUSY for "
+	    "a busy semaphore (%s)", LIBNAME);
+}
+
+static void *
+hthread(void *arg)
+{
+	sem_t *semmarit = arg;
+
+	for (;;) {
+		sem_post(&semmarit[2]);
+		sem_wait(&semmarit[1]);
+		sem_wait(&semmarit[0]);
+	}
+
+	return NULL;
+}
+
+ATF_TC_BODY(busydestroy, tc)
+{
+	sem_t semmarit[3];
+	pthread_t pt;
+	int i;
+
+	/* use a unicpu rump kernel.  this means less chance for race */
+	setenv("RUMP_NCPU", "1", 1);
+
+	rump_init();
+	sem_init(&semmarit[0], 1, 0);
+	sem_init(&semmarit[1], 1, 0);
+	sem_init(&semmarit[2], 1, 0);
+
+	pthread_create(&pt, NULL, hthread, semmarit);
+
+	/*
+	 * Make a best-effort to catch the other thread with its pants down.
+	 * We can't do this for sure, can we?  Although, we could reach
+	 * inside the rump kernel and inquire about the thread's sleep
+	 * status.
+	 */
+	for (i = 0; i < 1000; i++) {
+		sem_wait(&semmarit[2]);
+		usleep(1);
+		if (sem_destroy(&semmarit[1]) == -1)
+			if (errno == EBUSY)
+				break;
+
+		/*
+		 * Didn't catch it?  ok, recreate and post to make the
+		 * other thread run
+		 */
+		sem_init(&semmarit[1], 1, 0);
+		sem_post(&semmarit[0]);
+		sem_post(&semmarit[1]);
+
+	}
+	if (i == 1000)
+		atf_tc_fail("sem destroy not reporting EBUSY");
+
+	pthread_cancel(pt);
+	pthread_join(pt, NULL);
+}
+
+ATF_TC(blockwait);
+ATF_TC_HEAD(blockwait, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests sem_wait can handle blocking "
+	    "(%s)", LIBNAME);
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(blockwait, tc)
+{
+	sem_t semmarit[3];
+	pthread_t pt;
+	int i;
+
+	rump_init();
+	sem_init(&semmarit[0], 1, 0);
+	sem_init(&semmarit[1], 1, 0);
+	sem_init(&semmarit[2], 1, 0);
+
+	pthread_create(&pt, NULL, hthread, semmarit);
+
+	/*
+	 * Make a best-effort.  Unless we're extremely unlucky, we should
+	 * at least one blocking wait.
+	 */
+	for (i = 0; i < 10; i++) {
+		sem_wait(&semmarit[2]);
+		usleep(1);
+		sem_post(&semmarit[0]);
+		sem_post(&semmarit[1]);
+
+	}
+
+	pthread_cancel(pt);
+	pthread_join(pt, NULL);
+}
+
+ATF_TC(blocktimedwait);
+ATF_TC_HEAD(blocktimedwait, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests sem_timedwait can handle blocking"
+	    " (%s)", LIBNAME);
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(blocktimedwait, tc)
+{
+	sem_t semid;
+	struct timespec tp;
+
+	rump_init();
+
+	clock_gettime(CLOCK_REALTIME, &tp);
+	tp.tv_nsec += 50000000;
+	tp.tv_sec += tp.tv_nsec / 1000000000;
+	tp.tv_nsec %= 1000000000;
+
+	ATF_REQUIRE_EQ(sem_init(&semid, 1, 0), 0);
+	ATF_REQUIRE_ERRNO(ETIMEDOUT, sem_timedwait(&semid, &tp) == -1);
+}
+
+ATF_TC(named);
+ATF_TC_HEAD(named, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests named semaphores (%s)", LIBNAME);
+}
+
+/*
+ * Wow, easy naming rules.  it's these times i'm really happy i can
+ * single-step into the kernel.
+ */
+#define SEM1 "/precious_sem"
+#define SEM2 "/justsem"
+ATF_TC_BODY(named, tc)
+{
+	sem_t *sem1, *sem2;
+	void *rv;
+
+	rump_init();
+	sem1 = sem_open(SEM1, 0);
+	ATF_REQUIRE_EQ(errno, ENOENT);
+	ATF_REQUIRE_EQ(sem1, NULL);
+
+	sem1 = sem_open(SEM1, O_CREAT, 0444, 1);
+	if (sem1 == NULL)
+		atf_tc_fail_errno("sem_open O_CREAT");
+
+	rv = sem_open(SEM1, O_CREAT | O_EXCL);
+	ATF_REQUIRE_EQ(errno, EEXIST);
+	ATF_REQUIRE_EQ(rv, NULL);
+
+	sem2 = sem_open(SEM2, O_CREAT, 0444, 0);
+	if (sem2 == NULL)
+		atf_tc_fail_errno("sem_open O_CREAT");
+
+	/* check that semaphores are independent */
+	ATF_REQUIRE_EQ(sem_trywait(sem2), -1);
+	ATF_REQUIRE_EQ(sem_trywait(sem1), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem1), -1);
+
+	/* check that unlinked remains valid */
+	sem_unlink(SEM2);
+	ATF_REQUIRE_EQ(sem_post(sem2), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem2), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem2), -1);
+	ATF_REQUIRE_EQ(errno, EAGAIN);
+
+#if 0 /* see unlink */
+	/* close it and check that it's gone */
+	if (sem_close(sem2) != 0)
+		atf_tc_fail_errno("sem close");
+	ATF_REQUIRE_EQ(sem_trywait(sem2), -1);
+	ATF_REQUIRE_EQ(errno, EINVAL);
+#endif
+
+	/* check that we still have sem1 */
+	sem_post(sem1);
+	ATF_REQUIRE_EQ(sem_trywait(sem1), 0);
+	ATF_REQUIRE_EQ(sem_trywait(sem1), -1);
+	ATF_REQUIRE_EQ(errno, EAGAIN);
+}
+
+ATF_TC(unlink);
+ATF_TC_HEAD(unlink, tc)
+{
+
+	/* this is currently broken.  i'll append the PR number soon */
+	atf_tc_set_md_var(tc, "descr", "tests unlinked semaphores can be "
+	    "closed (%s)", LIBNAME);
+}
+
+#define SEM "/thesem"
+ATF_TC_BODY(unlink, tc)
+{
+	sem_t *sem;
+
+	rump_init();
+	sem = sem_open(SEM, O_CREAT, 0444, 0);
+	ATF_REQUIRE(sem);
+
+	if (sem_unlink(SEM) == -1)
+		atf_tc_fail_errno("unlink");
+	if (sem_close(sem) == -1)
+		atf_tc_fail_errno("close unlinked semaphore");
+}
+
+/* use rump calls for libpthread _ksem_foo() calls */
+#define F1(name, a) int _ksem_##name(a); \
+int _ksem_##name(a v1) {return rump_sys__ksem_##name(v1);}
+#define F2(name, a, b) int _ksem_##name(a, b); \
+int _ksem_##name(a v1, b v2) {return rump_sys__ksem_##name(v1, v2);}
+F2(init, unsigned int, intptr_t *);
+F1(close, intptr_t);
+F1(destroy, intptr_t);
+F1(post, intptr_t);
+F1(unlink, const char *);
+F1(trywait, intptr_t);
+F1(wait, intptr_t);
+F2(getvalue, intptr_t, unsigned int *);
+F2(timedwait, intptr_t, const struct timespec *);
+int _ksem_open(const char *, int, mode_t, unsigned int, intptr_t *);
+int _ksem_open(const char *a, int b, mode_t c, unsigned int d, intptr_t *e)
+    {return rump_sys__ksem_open(a,b,c,d,e);}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v0
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v1
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v0-v2
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0
new file mode 100644
index 000000000000..8cfcf2793b6c
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v0
@@ -0,0 +1 @@
+/usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so.1: version V_1 required by /usr/tests/libexec/ld.elf_so/h_dl_symver_v1 not defined
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v1
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v1-v2
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0
new file mode 100644
index 000000000000..e43fc56a274e
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v0
@@ -0,0 +1 @@
+/usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so.1: version V_3 required by /usr/tests/libexec/ld.elf_so/h_dl_symver_v2 not defined
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1
new file mode 100644
index 000000000000..494c3212f0f0
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v1
@@ -0,0 +1 @@
+/usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso.so.1: version V_3 required by /usr/tests/libexec/ld.elf_so/h_dl_symver_v2 not found
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stderr.v2-v2
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v0
@@ -0,0 +1 @@
+0
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v1
@@ -0,0 +1 @@
+1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v0-v2
@@ -0,0 +1 @@
+1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v0
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v1
@@ -0,0 +1 @@
+1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v1-v2
@@ -0,0 +1 @@
+1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v0 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v0
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v1 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v1
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2 b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/data/symver-output-ref-stdout.v2-v2
@@ -0,0 +1 @@
+3
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/h_df_1_noopen.c b/contrib/netbsd-tests/libexec/ld.elf_so/h_df_1_noopen.c
new file mode 100644
index 000000000000..518f39bca83f
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/h_df_1_noopen.c
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson.
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	void *handle;
+
+	handle = dlopen("libpthread.so", RTLD_NOLOAD);
+	if (handle == NULL)
+		errx(1, "%s", dlerror());
+
+	printf("libpthread loaded successfully\n");
+	return 0;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/h_dl_symver.c b/contrib/netbsd-tests/libexec/ld.elf_so/h_dl_symver.c
new file mode 100644
index 000000000000..71e4dc19a7ee
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/h_dl_symver.c
@@ -0,0 +1,42 @@
+/*	$NetBSD: h_dl_symver.c,v 1.1 2011/06/25 05:45:13 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by NONAKA Kimihiro.
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+
+extern int testfunc(void);
+
+int
+main(void)
+{
+
+	printf("%d\n", testfunc());
+	return 0;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/h_ifunc.c b/contrib/netbsd-tests/libexec/ld.elf_so/h_ifunc.c
new file mode 100644
index 000000000000..ac446fa2a0e0
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/h_ifunc.c
@@ -0,0 +1,43 @@
+/*	$NetBSD: h_ifunc.c,v 1.1 2014/08/25 20:40:53 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <stdlib.h>
+
+extern int ifunc(void);
+
+int
+main(int argc, char **argv)
+{
+
+	if (argc != 2)
+		return 1;
+	return ifunc() != atoi(argv[1]);
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/h_locking.c b/contrib/netbsd-tests/libexec/ld.elf_so/h_locking.c
new file mode 100644
index 000000000000..4ff3fc4f0765
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/h_locking.c
@@ -0,0 +1,149 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <dlfcn.h>
+#include <link_elf.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+int sleep_init;
+int sleep_fini;
+int dlopen_cookie;
+int dlclose_cookie;
+
+void (*tls_callback_sym)(void);
+
+static int
+dl_iterate_phdr_cb(struct dl_phdr_info *info, size_t size, void *data)
+{
+	(*tls_callback_sym)();
+	return 0;
+}
+
+static void *
+test_dl_iterate_phdr_helper(void *dummy)
+{
+	sleep(10);
+	_exit(1);
+}
+
+static void
+test_dl_iterate_phdr(void)
+{
+	pthread_t t;
+	void *dso;
+	sleep_init = 0;
+	sleep_fini = 0;
+	if ((dso = dlopen("libh_helper_dso2.so", RTLD_LAZY)) == NULL) {
+		fprintf(stderr, "opening helper failed\n");
+		_exit(1);
+	}
+	tls_callback_sym = dlsym(dso, "tls_callback");
+	if (tls_callback_sym == NULL) {
+		fprintf(stderr, "bad helper\n");
+		_exit(1);
+	}
+	pthread_create(&t, NULL, test_dl_iterate_phdr_helper, NULL);
+	if (dl_iterate_phdr(dl_iterate_phdr_cb, NULL))
+		_exit(1);
+	_exit(0);
+}
+
+static void *
+init_fini_helper(void *arg)
+{
+	void *dso;
+	if ((dso = dlopen(arg, RTLD_LAZY)) == NULL) {
+		fprintf(stderr, "opening %s failed\n", (char *)arg);
+		exit(1);
+	}
+	dlclose(dso);
+	return NULL;
+}
+
+static void
+test_dlopen(void)
+{
+	pthread_t t1, t2;
+	sleep_init = 1;
+	sleep_fini = 0;
+	printf("%d\n", dlopen_cookie);
+	pthread_create(&t1, NULL, init_fini_helper,
+	    __UNCONST("libh_helper_dso2.so"));
+	sleep(1);
+	printf("%d\n", dlopen_cookie);
+	if (dlopen_cookie != 1)
+		_exit(1);
+	sleep(1);
+	pthread_create(&t2, NULL, init_fini_helper,
+	    __UNCONST("libutil.so"));
+	printf("%d\n", dlopen_cookie);
+	if (dlopen_cookie != 1)
+		_exit(1);
+	_exit(0);
+}
+
+static void
+test_dlclose(void)
+{
+	pthread_t t1, t2;
+	sleep_init = 0;
+	sleep_fini = 1;
+	printf("%d\n", dlclose_cookie);
+	pthread_create(&t1, NULL, init_fini_helper,
+	    __UNCONST("libh_helper_dso2.so"));
+	sleep(1);
+	printf("%d\n", dlclose_cookie);
+	if (dlclose_cookie != 2)
+		_exit(1);
+	pthread_create(&t2, NULL, init_fini_helper,
+	    __UNCONST("libutil.so"));
+	sleep(1);
+	printf("%d\n", dlclose_cookie);
+	if (dlclose_cookie != 2)
+		_exit(1);
+	_exit(0);
+}
+
+int
+main(int argc, char **argv)
+{
+	if (argc != 2)
+		return 1;
+	if (strcmp(argv[1], "dl_iterate_phdr") == 0)
+		test_dl_iterate_phdr();
+	if (strcmp(argv[1], "dlopen") == 0)
+		test_dlopen();
+	if (strcmp(argv[1], "dlclose") == 0)
+		test_dlclose();
+	return 1;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c
new file mode 100644
index 000000000000..e89e3ff4b777
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c
@@ -0,0 +1,70 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <poll.h>
+#include <stddef.h>
+#include <sys/tls.h>
+
+#ifdef __HAVE_NO___THREAD
+#define	__thread
+#endif
+
+extern int sleep_init;
+extern int sleep_fini;
+extern int dlopen_cookie;
+
+static void __attribute__((__constructor__))
+init1(void)
+{
+	dlopen_cookie = 1;
+	if (!sleep_init)
+		return;
+	for (;;)
+		poll(NULL, 0, -1);
+}
+
+extern int dlclose_cookie;
+
+static void __attribute__((__destructor__))
+fini1(void)
+{
+	dlclose_cookie = 1;
+	if (!sleep_fini)
+		return;
+	for (;;)
+		poll(NULL, 0, -1);
+}
+
+static __thread int tls_callback_var;
+
+static void __attribute__((__used__))
+tls_callback(void)
+{
+	tls_callback_var = 1;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso2/h_helper_dso2.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso2/h_helper_dso2.c
new file mode 100644
index 000000000000..adeef6b5a715
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_dso2/h_helper_dso2.c
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <poll.h>
+#include <stddef.h>
+
+extern int sleep_init;
+extern int sleep_fini;
+extern int dlopen_cookie;
+
+static void __attribute__((__constructor__))
+init2(void)
+{
+	dlopen_cookie = 2;
+	if (!sleep_init)
+		return;
+	for (;;)
+		poll(NULL, 0, -1);
+}
+
+extern int dlclose_cookie;
+
+static void __attribute__((__destructor__))
+fini2(void)
+{
+	dlclose_cookie = 2;
+	if (!sleep_fini)
+		return;
+	for (;;)
+		poll(NULL, 0, -1);
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
new file mode 100644
index 000000000000..c04f77547e71
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+static int
+ifunc1(void)
+{
+	return 0xdeadbeef;
+}
+
+static int
+ifunc2(void)
+{
+	return 0xbeefdead;
+}
+
+static __attribute__((used))
+int (*resolve_ifunc(void))(void)
+{
+	const char *e = getenv("USE_IFUNC2");
+	return e && strcmp(e, "1") == 0 ? ifunc2 : ifunc1;
+}
+
+__ifunc(ifunc, resolve_ifunc);
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso0/h_helper_symver_dso0.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso0/h_helper_symver_dso0.c
new file mode 100644
index 000000000000..a34bf3164678
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso0/h_helper_symver_dso0.c
@@ -0,0 +1,39 @@
+/*	$NetBSD: h_helper_symver_dso0.c,v 1.1 2011/06/25 05:45:13 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by NONAKA Kimihiro.
+ *
+ * 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.
+ */
+
+int testfunc(void);
+
+int
+testfunc(void)
+{
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.c
new file mode 100644
index 000000000000..615816b362d8
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.c
@@ -0,0 +1,41 @@
+/*	$NetBSD: h_helper_symver_dso1.c,v 1.1 2011/06/25 05:45:13 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by NONAKA Kimihiro.
+ *
+ * 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.
+ */
+
+__asm(".symver testfunc_new, testfunc@@V_1");
+
+int testfunc_new(void);
+
+int
+testfunc_new(void)
+{
+
+	return 1;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.map b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.map
new file mode 100644
index 000000000000..c813f5d4e43e
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso1/h_helper_symver_dso1.map
@@ -0,0 +1,5 @@
+#	$NetBSD: h_helper_symver_dso1.map,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+
+V_1 {
+	testfunc;
+};
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.c b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.c
new file mode 100644
index 000000000000..f5ae4c86a244
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.c
@@ -0,0 +1,59 @@
+/*	$NetBSD: h_helper_symver_dso2.c,v 1.1 2011/06/25 05:45:13 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by NONAKA Kimihiro.
+ *
+ * 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.
+ */
+
+__asm(".symver testfunc_new, testfunc@@V_3");
+__asm(".symver testfunc_compat1, testfunc@V_1");
+__asm(".symver testfunc_compat2, testfunc@V_2");
+
+int testfunc_new(void);
+int testfunc_compat1(void);
+int testfunc_compat2(void);
+
+int
+testfunc_new(void)
+{
+
+	return 3;
+}
+
+int
+testfunc_compat1(void)
+{
+
+	return 1;
+}
+
+int
+testfunc_compat2(void)
+{
+
+	return 2;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.map b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.map
new file mode 100644
index 000000000000..518c76b693fb
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/helper_symver_dso2/h_helper_symver_dso2.map
@@ -0,0 +1,13 @@
+#	$NetBSD: h_helper_symver_dso2.map,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+
+V_1 {
+	testfunc;
+};
+
+V_2 {
+	testfunc;
+};
+
+V_3 {
+	testfunc;
+};
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_df_1_noopen.sh b/contrib/netbsd-tests/libexec/ld.elf_so/t_df_1_noopen.sh
new file mode 100755
index 000000000000..31851f490dab
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_df_1_noopen.sh
@@ -0,0 +1,63 @@
+# $NetBSD: t_df_1_noopen.sh,v 1.3 2011/03/17 15:59:32 skrll Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Nick Hudson.
+#
+# 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.
+#
+
+atf_test_case df_1_noopen1
+df_1_noopen1_head()
+{
+	atf_set "descr" "Checks DF_1_NOOPEN prevents dlopening of library"
+}
+df_1_noopen1_body()
+{
+	cat >expout <<EOF
+h_df_1_noopen1: Cannot dlopen non-loadable /usr/lib/libpthread.so
+EOF
+
+	atf_check -s exit:1 -e file:expout "$(atf_get_srcdir)/h_df_1_noopen1"
+}
+
+atf_test_case df_1_noopen2
+df_1_noopen2_head()
+{
+	atf_set "descr" "Checks DF_1_NOOPEN is allowed on already loaded library"
+}
+df_1_noopen2_body()
+{
+	cat >expout <<EOF
+libpthread loaded successfully
+EOF
+
+	atf_check -o file:expout "$(atf_get_srcdir)/h_df_1_noopen2"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case df_1_noopen1
+	atf_add_test_case df_1_noopen2
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_dl_symver.sh b/contrib/netbsd-tests/libexec/ld.elf_so/t_dl_symver.sh
new file mode 100755
index 000000000000..afca0f69dc1e
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_dl_symver.sh
@@ -0,0 +1,55 @@
+# $NetBSD: t_dl_symver.sh,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by NONAKA Kimihiro.
+#
+# 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.
+#
+
+datadir() {
+	echo "$(atf_get_srcdir)/data"
+}
+
+atf_test_case dl_symver
+dl_symver_head()
+{
+	atf_set "descr" "Checks ELF symbol versioning functions"
+}
+dl_symver_body()
+{
+	for tv in 0 1 2; do
+		for lv in 0 1 2; do 
+			atf_check -s ignore \
+			    -o file:$(datadir)/symver-output-ref-stdout.v$tv-v$lv \
+			    -e file:$(datadir)/symver-output-ref-stderr.v$tv-v$lv \
+			    -x "LD_LIBRARY_PATH=$(atf_get_srcdir)/h_helper_symver_dso$lv $(atf_get_srcdir)/h_dl_symver_v$tv"
+		done
+	done
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case dl_symver
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-cleared.c b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-cleared.c
new file mode 100644
index 000000000000..03940c2de013
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-cleared.c
@@ -0,0 +1,67 @@
+/*	$NetBSD: t_dlerror-cleared.c,v 1.1 2010/12/14 05:57:32 skrll Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <link_elf.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(rtld_dlerror_cleared);
+ATF_TC_HEAD(rtld_dlerror_cleared, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "error set by dlopen persists past a successful dlopen call");
+}
+
+ATF_TC_BODY(rtld_dlerror_cleared, tc)
+{
+	void *handle;
+	char *error;
+	
+	/*
+	 * Test that an error set by dlopen() persists past a successful
+	 * dlopen() call.
+	 */
+	handle = dlopen("libnonexistent.so", RTLD_LAZY);
+	ATF_CHECK(handle == NULL);
+	handle = dlopen("libm.so", RTLD_NOW);
+	ATF_CHECK(handle);
+	error = dlerror();
+	ATF_CHECK(error);
+
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rtld_dlerror_cleared);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-false.c b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-false.c
new file mode 100644
index 000000000000..8b80c260d630
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlerror-false.c
@@ -0,0 +1,79 @@
+/*	$NetBSD: t_dlerror-false.c,v 1.1 2010/12/14 05:57:32 skrll Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <link_elf.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(rtld_dlerror_false);
+ATF_TC_HEAD(rtld_dlerror_false, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "error set by dlopen persists past a successful dlopen call");
+}
+
+ATF_TC_BODY(rtld_dlerror_false, tc)
+{
+	void *handle, *sym;
+	char *error;
+	
+	/*
+	 * 
+	 * Test for dlerror() being set by a successful library open.
+	 * Requires that the rpath be set to something that does not
+	 * include libm.so.
+	 */
+
+	handle = dlopen("libm.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+	
+	sym = dlsym(handle, "sin");
+	error = dlerror();
+	ATF_CHECK(sym != NULL);
+	ATF_CHECK(error == NULL);
+
+	dlclose(handle);
+	error = dlerror();
+
+	ATF_CHECK(error == NULL);
+	
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rtld_dlerror_false);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_dlinfo.c b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlinfo.c
new file mode 100644
index 000000000000..a15ba5d5a909
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlinfo.c
@@ -0,0 +1,120 @@
+/*	$NetBSD: t_dlinfo.c,v 1.4 2011/03/25 14:47:31 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <link_elf.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(rtld_dlinfo_linkmap_self);
+ATF_TC_HEAD(rtld_dlinfo_linkmap_self, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "dlinfo with RTLD_SELF handle works");
+}
+ATF_TC_BODY(rtld_dlinfo_linkmap_self, tc)
+{
+	struct link_map *map;
+	int rv;
+
+	rv = dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
+	ATF_CHECK_EQ(rv, 0);
+	ATF_CHECK((strstr(map->l_name, "t_dlinfo") != NULL));
+}
+
+ATF_TC(rtld_dlinfo_linkmap_inval);
+ATF_TC_HEAD(rtld_dlinfo_linkmap_inval, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "dlinfo with invalid handle fails");
+}
+ATF_TC_BODY(rtld_dlinfo_linkmap_inval, tc)
+{
+	void *v;
+	int rv;
+
+	rv = dlinfo(NULL, RTLD_DI_LINKMAP, &v);
+	ATF_CHECK_EQ(rv, -1);
+}
+
+ATF_TC(rtld_dlinfo_linkmap_dlopen);
+ATF_TC_HEAD(rtld_dlinfo_linkmap_dlopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "dlinfo dlopen'd handle works");
+}
+ATF_TC_BODY(rtld_dlinfo_linkmap_dlopen, tc)
+{
+	struct link_map *map;
+	void *handle;
+	int rv;
+
+	handle = dlopen("libutil.so", RTLD_LAZY);
+	ATF_CHECK(handle);
+
+	rv = dlinfo(handle, RTLD_DI_LINKMAP, &map);
+	ATF_CHECK_EQ(rv, 0);
+	ATF_CHECK((strstr(map->l_name, "libutil.so") != NULL));
+	dlclose(handle);
+}
+
+ATF_TC(rtld_dlinfo_linkmap_dlopen_iter);
+ATF_TC_HEAD(rtld_dlinfo_linkmap_dlopen_iter, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "dlopen'd dso's show up in the list");
+}
+ATF_TC_BODY(rtld_dlinfo_linkmap_dlopen_iter, tc)
+{
+	struct link_map *map;
+	void *handle;
+
+	handle = dlopen("libutil.so", RTLD_LAZY);
+	ATF_CHECK(handle);
+
+	RZ(dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map));
+
+	for (; map->l_next; map = map->l_next)
+		continue;
+	for (; map; map = map->l_prev)
+		if (strstr(map->l_name, "libutil.so") != NULL)
+			break;
+	
+	ATF_REQUIRE_MSG(map, "dlopen()d object not found from linkmap");
+	ATF_REQUIRE_MSG(dlopen(map->l_name, RTLD_LAZY) != NULL,
+	    "could not dlopen() name in linkmap");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rtld_dlinfo_linkmap_self);
+	ATF_TP_ADD_TC(tp, rtld_dlinfo_linkmap_inval);
+	ATF_TP_ADD_TC(tp, rtld_dlinfo_linkmap_dlopen);
+	ATF_TP_ADD_TC(tp, rtld_dlinfo_linkmap_dlopen_iter);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_dlvsym.c b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlvsym.c
new file mode 100644
index 000000000000..ce437d45904c
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_dlvsym.c
@@ -0,0 +1,203 @@
+/*	$NetBSD: t_dlvsym.c,v 1.1 2011/06/25 05:45:13 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by NONAKA Kimihiro.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+
+ATF_TC(rtld_dlvsym_v1);
+ATF_TC_HEAD(rtld_dlvsym_v1, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check dlvsym() function (V_1)");
+}
+ATF_TC_BODY(rtld_dlvsym_v1, tc)
+{
+	void *handle;
+	char *error;
+	int (*sym)(void);
+	int result;
+
+	/* Clear previous error */
+	(void) dlerror();
+
+	handle = dlopen("libh_helper_symver_dso.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+
+	sym = dlvsym(handle, "testfunc", "V_1");
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+
+	result = (*sym)();
+	ATF_CHECK(result == 1);
+
+	dlclose(handle);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+}
+
+ATF_TC(rtld_dlvsym_v3);
+ATF_TC_HEAD(rtld_dlvsym_v3, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check dlvsym() function (V_3)");
+}
+ATF_TC_BODY(rtld_dlvsym_v3, tc)
+{
+	void *handle;
+	char *error;
+	int (*sym)(void);
+	int result;
+
+	/* Clear previous error */
+	(void) dlerror();
+
+	handle = dlopen("libh_helper_symver_dso.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+
+	sym = dlvsym(handle, "testfunc", "V_3");
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+
+	result = (*sym)();
+	ATF_CHECK(result == 3);
+
+	dlclose(handle);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+}
+
+ATF_TC(rtld_dlvsym_symbol_nonexistent);
+ATF_TC_HEAD(rtld_dlvsym_symbol_nonexistent, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Check dlvsym() function (symbol is nonexistent)");
+}
+ATF_TC_BODY(rtld_dlvsym_symbol_nonexistent, tc)
+{
+	void *handle;
+	char *error;
+	int (*sym)(void);
+
+	/* Clear previous error */
+	(void) dlerror();
+
+	handle = dlopen("libh_helper_symver_dso.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+
+	sym = dlvsym(handle, "symbol_nonexistent", "V_3");
+	error = dlerror();
+	ATF_CHECK(sym == NULL);
+	ATF_CHECK(error != NULL);
+
+	dlclose(handle);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+}
+
+ATF_TC(rtld_dlvsym_version_nonexistent);
+ATF_TC_HEAD(rtld_dlvsym_version_nonexistent, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Check dlvsym() function (version is nonexistent)");
+}
+ATF_TC_BODY(rtld_dlvsym_version_nonexistent, tc)
+{
+	void *handle;
+	char *error;
+	int (*sym)(void);
+
+	/* Clear previous error */
+	(void) dlerror();
+
+	handle = dlopen("libh_helper_symver_dso.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+
+	sym = dlvsym(handle, "testfunc", "");
+	error = dlerror();
+	ATF_CHECK(sym == NULL);
+	ATF_CHECK(error != NULL);
+
+	dlclose(handle);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+}
+
+ATF_TC(rtld_dlvsym_version_null);
+ATF_TC_HEAD(rtld_dlvsym_version_null, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Check dlvsym() function (version is NULL)");
+}
+ATF_TC_BODY(rtld_dlvsym_version_null, tc)
+{
+	void *handle;
+	char *error;
+	int (*sym)(void);
+	int result;
+
+	/* Clear previous error */
+	(void) dlerror();
+
+	handle = dlopen("libh_helper_symver_dso.so", RTLD_LAZY);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+	ATF_CHECK(handle != NULL);
+
+	sym = dlvsym(handle, "testfunc", NULL);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+
+	result = (*sym)();
+	ATF_CHECK(result == 3);
+
+	dlclose(handle);
+	error = dlerror();
+	ATF_CHECK(error == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rtld_dlvsym_v1);
+	ATF_TP_ADD_TC(tp, rtld_dlvsym_v3);
+	ATF_TP_ADD_TC(tp, rtld_dlvsym_symbol_nonexistent);
+	ATF_TP_ADD_TC(tp, rtld_dlvsym_version_nonexistent);
+	ATF_TP_ADD_TC(tp, rtld_dlvsym_version_null);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/libexec/ld.elf_so/t_ifunc.c b/contrib/netbsd-tests/libexec/ld.elf_so/t_ifunc.c
new file mode 100644
index 000000000000..1c85672af5f7
--- /dev/null
+++ b/contrib/netbsd-tests/libexec/ld.elf_so/t_ifunc.c
@@ -0,0 +1,92 @@
+/*	$NetBSD: t_ifunc.c,v 1.1 2014/08/25 20:40:53 joerg Exp $	*/
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <util.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(rtld_ifunc);
+
+ATF_TC_HEAD(rtld_ifunc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "ifunc functions are resolved");
+}
+
+ATF_TC_BODY(rtld_ifunc, tc)
+{
+	const char *envstr[] = {
+	    "0", "1"
+	};
+	int expected_result[] = {
+	    0xdeadbeef, 0xbeefdead
+	};
+	void *handle;
+	int (*sym)(void);
+	int result;
+	const char *error;
+	size_t i;
+
+	for (i = 0; i < __arraycount(envstr); ++i) {
+		setenv("USE_IFUNC2", envstr[i], 1);
+
+		handle = dlopen("libh_helper_ifunc_dso.so", RTLD_LAZY);
+		error = dlerror();
+		ATF_CHECK(error == NULL);
+		ATF_CHECK(handle != NULL);
+
+		sym = dlsym(handle, "ifunc");
+		error = dlerror();
+		ATF_CHECK(error == NULL);
+		ATF_CHECK(sym != NULL);
+
+		result = (*sym)();
+		ATF_CHECK(result == expected_result[i]);
+
+		dlclose(handle);
+		error = dlerror();
+		ATF_CHECK(error == NULL);
+
+		char *command;
+		easprintf(&command, "%s/h_ifunc %d",
+		    atf_tc_get_config_var(tc, "srcdir"), expected_result[i]);
+		if (system(command) != EXIT_SUCCESS)
+			atf_tc_fail("Test failed; see output for details");
+		free(command);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, rtld_ifunc);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/modules/k_helper/k_helper.c b/contrib/netbsd-tests/modules/k_helper/k_helper.c
new file mode 100644
index 000000000000..6a54ccdc3f92
--- /dev/null
+++ b/contrib/netbsd-tests/modules/k_helper/k_helper.c
@@ -0,0 +1,202 @@
+/*	$NetBSD: k_helper.c,v 1.6 2012/06/03 10:59:44 dsl Exp $	*/
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: k_helper.c,v 1.6 2012/06/03 10:59:44 dsl Exp $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+
+#include <prop/proplib.h>
+
+MODULE(MODULE_CLASS_MISC, k_helper, NULL);
+
+/* --------------------------------------------------------------------- */
+/* Sysctl interface to query information about the module.               */
+/* --------------------------------------------------------------------- */
+
+/* TODO: Change the integer variables below that represent booleans to
+ * bools, once sysctl(8) supports CTLTYPE_BOOL nodes. */
+
+static struct sysctllog *clogp;
+static int present = 1;
+static int prop_str_ok;
+static char prop_str_val[128];
+static int prop_int_ok;
+static int64_t prop_int_val;
+static int prop_int_load;
+
+#define K_HELPER 0x12345678
+#define K_HELPER_PRESENT 0
+#define K_HELPER_PROP_STR_OK 1
+#define K_HELPER_PROP_STR_VAL 2
+#define K_HELPER_PROP_INT_OK 3
+#define K_HELPER_PROP_INT_VAL 4
+#define K_HELPER_PROP_INT_LOAD 5
+
+SYSCTL_SETUP(sysctl_k_helper_setup, "sysctl k_helper subtree setup")
+{
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_NODE, "k_helper", NULL,
+	               NULL, 0, NULL, 0,
+	               CTL_VENDOR, K_HELPER, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "present",
+		       SYSCTL_DESCR("Whether the module was loaded or not"),
+		       NULL, 0, &present, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PRESENT, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "prop_str_ok",
+		       SYSCTL_DESCR("String property's validity"),
+		       NULL, 0, &prop_str_ok, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PROP_STR_OK, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_STRING, "prop_str_val",
+		       SYSCTL_DESCR("String property's value"),
+		       NULL, 0, prop_str_val, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PROP_STR_VAL, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "prop_int_ok",
+		       SYSCTL_DESCR("String property's validity"),
+		       NULL, 0, &prop_int_ok, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PROP_INT_OK, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_QUAD, "prop_int_val",
+		       SYSCTL_DESCR("String property's value"),
+		       NULL, 0, &prop_int_val, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PROP_INT_VAL, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "prop_int_load",
+		       SYSCTL_DESCR("Status of recursive modload"),
+		       NULL, 0, &prop_int_load, 0,
+	               CTL_VENDOR, K_HELPER, K_HELPER_PROP_INT_LOAD, CTL_EOL);
+}
+
+/* --------------------------------------------------------------------- */
+/* Module management.                                                    */
+/* --------------------------------------------------------------------- */
+
+static
+int
+k_helper_init(prop_dictionary_t props)
+{
+	prop_object_t p;
+
+	p = prop_dictionary_get(props, "prop_str");
+	if (p == NULL)
+		prop_str_ok = 0;
+	else if (prop_object_type(p) != PROP_TYPE_STRING)
+		prop_str_ok = 0;
+	else {
+		const char *msg = prop_string_cstring_nocopy(p);
+		if (msg == NULL)
+			prop_str_ok = 0;
+		else {
+			strlcpy(prop_str_val, msg, sizeof(prop_str_val));
+			prop_str_ok = 1;
+		}
+	}
+	if (!prop_str_ok)
+		strlcpy(prop_str_val, "", sizeof(prop_str_val));
+
+	p = prop_dictionary_get(props, "prop_int");
+	if (p == NULL)
+		prop_int_ok = 0;
+	else if (prop_object_type(p) != PROP_TYPE_NUMBER)
+		prop_int_ok = 0;
+	else {
+		prop_int_val = prop_number_integer_value(p);
+		prop_int_ok = 1;
+	}
+	if (!prop_int_ok)
+		prop_int_val = -1;
+
+	p = prop_dictionary_get(props, "prop_recurse");
+	if (p != NULL && prop_object_type(p) == PROP_TYPE_STRING) {
+		const char *recurse_name = prop_string_cstring_nocopy(p);
+		if (recurse_name != NULL)
+			prop_int_load = module_load(recurse_name,
+			    MODCTL_NO_PROP, NULL, MODULE_CLASS_ANY);
+		else
+			prop_int_load = -1;
+	} else
+		prop_int_load = -2;
+
+	sysctl_k_helper_setup(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_helper_fini(void *arg)
+{
+
+	sysctl_teardown(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_helper_modcmd(modcmd_t cmd, void *arg)
+{
+	int ret;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+		ret = k_helper_init(arg);
+		break;
+
+	case MODULE_CMD_FINI:
+		ret = k_helper_fini(arg);
+		break;
+
+	case MODULE_CMD_STAT:
+	default:
+		ret = ENOTTY;
+	}
+
+	return ret;
+}
diff --git a/contrib/netbsd-tests/modules/k_helper2/k_helper2.c b/contrib/netbsd-tests/modules/k_helper2/k_helper2.c
new file mode 100644
index 000000000000..286b25a5713f
--- /dev/null
+++ b/contrib/netbsd-tests/modules/k_helper2/k_helper2.c
@@ -0,0 +1,115 @@
+/*	$NetBSD: k_helper2.c,v 1.2 2010/11/03 16:10:23 christos Exp $ */
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: k_helper2.c,v 1.2 2010/11/03 16:10:23 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+
+#include <prop/proplib.h>
+
+MODULE(MODULE_CLASS_MISC, k_helper2, NULL);
+
+/* --------------------------------------------------------------------- */
+/* Sysctl interface to query information about the module.               */
+/* --------------------------------------------------------------------- */
+
+/* TODO: Change the integer variables below that represent booleans to
+ * bools, once sysctl(8) supports CTLTYPE_BOOL nodes. */
+
+static struct sysctllog *clogp;
+static int present = 1;
+
+#define K_HELPER2 0x23456781
+#define K_HELPER_PRESENT 0
+
+SYSCTL_SETUP(sysctl_k_helper2_setup, "sysctl k_helper subtree setup")
+{
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_NODE, "k_helper2", NULL,
+	               NULL, 0, NULL, 0,
+	               CTL_VENDOR, K_HELPER2, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "present",
+		       SYSCTL_DESCR("Whether the module was loaded or not"),
+		       NULL, 0, &present, 0,
+	               CTL_VENDOR, K_HELPER2, K_HELPER_PRESENT, CTL_EOL);
+}
+
+/* --------------------------------------------------------------------- */
+/* Module management.                                                    */
+/* --------------------------------------------------------------------- */
+
+static
+int
+k_helper2_init(prop_dictionary_t props)
+{
+	sysctl_k_helper2_setup(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_helper2_fini(void *arg)
+{
+
+	sysctl_teardown(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_helper2_modcmd(modcmd_t cmd, void *arg)
+{
+	int ret;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+		ret = k_helper2_init(arg);
+		break;
+
+	case MODULE_CMD_FINI:
+		ret = k_helper2_fini(arg);
+		break;
+
+	case MODULE_CMD_STAT:
+	default:
+		ret = ENOTTY;
+	}
+
+	return ret;
+}
diff --git a/contrib/netbsd-tests/modules/k_helper3/k_helper3.c b/contrib/netbsd-tests/modules/k_helper3/k_helper3.c
new file mode 100644
index 000000000000..4e0984da5967
--- /dev/null
+++ b/contrib/netbsd-tests/modules/k_helper3/k_helper3.c
@@ -0,0 +1,102 @@
+/*	$NetBSD: k_helper3.c,v 1.3 2012/04/17 21:39:19 martin Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: k_helper3.c,v 1.3 2012/04/17 21:39:19 martin Exp $");
+
+#include <sys/module.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <prop/proplib.h>
+
+static int load(const char *, ...);
+
+/*
+ * A program that loads a module and returns the errno(2) from modctl(8).
+ */
+int
+main(int argc, char *argv[])
+{
+	assert(argc == 3);
+
+	return load(argv[1], argv[2]);
+}
+
+static __printflike(1, 2) int
+load(const char *fmt, ...)
+{
+	char filename[MAXPATHLEN], *propsstr, *shortname, *dot;
+	prop_dictionary_t props;
+	modctl_load_t ml;
+	int serrno, rv;
+	va_list ap;
+
+	props = prop_dictionary_create();
+	propsstr = prop_dictionary_externalize(props);
+	assert(propsstr != NULL);
+	prop_object_release(props);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(filename, sizeof(filename), fmt, ap);
+	va_end(ap);
+
+	ml.ml_filename = filename;
+	ml.ml_flags = 0;
+	ml.ml_props = propsstr;
+	ml.ml_propslen = strlen(propsstr);
+
+	printf("Loading module %s\n", filename);
+	errno = serrno = 0;
+
+	rv = modctl(MODCTL_LOAD, &ml);
+
+	if (rv != 0)
+		serrno = errno;
+
+	shortname = strrchr(filename, '/');
+	if (shortname != NULL)
+		shortname++;
+	else
+		shortname = filename;
+	dot = strrchr(shortname, '.');
+	if (dot)
+		*dot = 0;
+	(void)modctl(MODCTL_UNLOAD, shortname);
+
+	free(propsstr);
+
+	return serrno;
+}
diff --git a/contrib/netbsd-tests/modules/k_uvm/k_uvm.c b/contrib/netbsd-tests/modules/k_uvm/k_uvm.c
new file mode 100644
index 000000000000..7f8d3b0ef950
--- /dev/null
+++ b/contrib/netbsd-tests/modules/k_uvm/k_uvm.c
@@ -0,0 +1,113 @@
+/*	$NetBSD: k_uvm.c,v 1.1 2012/02/17 22:36:50 jmmv Exp $	*/
+/*
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: k_uvm.c,v 1.1 2012/02/17 22:36:50 jmmv Exp $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+
+MODULE(MODULE_CLASS_MISC, k_uvm, NULL);
+
+/* --------------------------------------------------------------------- */
+/* Sysctl interface to query information about the module.               */
+/* --------------------------------------------------------------------- */
+
+static struct sysctllog *clogp;
+static int page_size;
+
+#define K_UVM 0x12345678
+#define K_UVM_VALUE 0
+
+SYSCTL_SETUP(sysctl_k_uvm_setup, "sysctl k_uvm subtree setup")
+{
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_NODE, "k_uvm", NULL,
+	               NULL, 0, NULL, 0,
+	               CTL_VENDOR, K_UVM, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+	               CTLFLAG_PERMANENT,
+	               CTLTYPE_INT, "page_size",
+		       SYSCTL_DESCR("Value of PAGE_SIZE"),
+		       NULL, 0, &page_size, 0,
+	               CTL_VENDOR, K_UVM, K_UVM_VALUE, CTL_EOL);
+}
+
+/* --------------------------------------------------------------------- */
+/* Module management.                                                    */
+/* --------------------------------------------------------------------- */
+
+static
+int
+k_uvm_init(prop_dictionary_t props)
+{
+
+	page_size = PAGE_SIZE;
+
+	sysctl_k_uvm_setup(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_uvm_fini(void *arg)
+{
+
+	sysctl_teardown(&clogp);
+
+	return 0;
+}
+
+static
+int
+k_uvm_modcmd(modcmd_t cmd, void *arg)
+{
+	int ret;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+		ret = k_uvm_init(arg);
+		break;
+
+	case MODULE_CMD_FINI:
+		ret = k_uvm_fini(arg);
+		break;
+
+	case MODULE_CMD_STAT:
+	default:
+		ret = ENOTTY;
+	}
+
+	return ret;
+}
diff --git a/contrib/netbsd-tests/modules/t_abi_uvm.sh b/contrib/netbsd-tests/modules/t_abi_uvm.sh
new file mode 100755
index 000000000000..b855bc831dac
--- /dev/null
+++ b/contrib/netbsd-tests/modules/t_abi_uvm.sh
@@ -0,0 +1,70 @@
+# $NetBSD: t_abi_uvm.sh,v 1.3 2012/04/20 05:41:25 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case PAGE_SIZE cleanup
+PAGE_SIZE_head() {
+	atf_set "descr" "Ensures that modules have access to PAGE_SIZE"
+	atf_set "require.user" "root"
+}
+PAGE_SIZE_body() {
+
+	# XXX: Adjust when modctl(8) fails consistently.
+	#
+	$(atf_get_srcdir)/k_helper3 \
+		"%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
+
+	if [ $? -eq 1 ] || [ $? -eq 78 ]; then
+		atf_skip "host does not support modules"
+	fi
+
+	if modload $(atf_get_srcdir)/k_uvm/k_uvm.kmod; then
+		:
+	else
+		case "$(uname -m)" in
+		macppc)
+			atf_expect_fail "PR port-macppc/46041"
+			;;
+		esac
+		atf_fail "Failed to load k_uvm; missing uvmexp_pagesize?"
+	fi
+
+	kernel_pagesize="$(sysctl -n hw.pagesize || echo fail1)"
+	module_pagesize="$(sysctl -n vendor.k_uvm.page_size || echo fail2)"
+	echo "Kernel PAGE_SIZE: ${kernel_pagesize}"
+	echo "Module PAGE_SIZE: ${module_pagesize}"
+	atf_check_equal "${kernel_pagesize}" "${module_pagesize}"
+
+	atf_check -s eq:0 -o empty -e empty modunload k_uvm
+}
+PAGE_SIZE_cleanup() {
+	modunload k_uvm >/dev/null 2>&1 || true
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case PAGE_SIZE
+}
diff --git a/contrib/netbsd-tests/modules/t_builtin.c b/contrib/netbsd-tests/modules/t_builtin.c
new file mode 100644
index 000000000000..0d9a3f0dc129
--- /dev/null
+++ b/contrib/netbsd-tests/modules/t_builtin.c
@@ -0,0 +1,194 @@
+/*	$NetBSD: t_builtin.c,v 1.2 2010/11/03 16:10:23 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.  All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/module.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdbool.h>
+
+#include <miscfs/kernfs/kernfs.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../h_macros.h"
+
+#define MYMP "/mnt"
+#define HZFILE MYMP "/hz"
+
+static char kernfs[] = "kernfs";
+
+static bool
+check_kernfs(void)
+{
+	char buf[16];
+	bool rv = true;
+	int fd;
+
+	fd = rump_sys_open(HZFILE, O_RDONLY);
+	if (fd == -1)
+		return false;
+	if (rump_sys_read(fd, buf, sizeof(buf)) < 1)
+		rv = false;
+	RL(rump_sys_close(fd));
+
+	return rv;
+}
+
+ATF_TC(disable);
+ATF_TC_HEAD(disable, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests that builtin modules can "
+	    "be disabled");
+}
+
+ATF_TC_BODY(disable, tc)
+{
+
+	rump_init();
+	RL(rump_sys_mkdir(MYMP, 0777));
+	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
+	ATF_REQUIRE(check_kernfs());
+	RL(rump_sys_unmount(MYMP, 0));
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
+}
+
+ATF_TC(noauto);
+ATF_TC_HEAD(noauto, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
+	    "will not autoload");
+}
+
+ATF_TC_BODY(noauto, tc)
+{
+
+	rump_init();
+	RL(rump_sys_mkdir(MYMP, 0777));
+
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
+
+	ATF_REQUIRE_ERRNO(ENODEV,
+	    rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0) == -1);
+}
+
+ATF_TC(forcereload);
+ATF_TC_HEAD(forcereload, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
+	    "can be force-reloaded");
+}
+
+ATF_TC_BODY(forcereload, tc)
+{
+	struct modctl_load mod;
+
+	rump_init();
+	RL(rump_sys_mkdir(MYMP, 0777));
+
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
+	ATF_REQUIRE_ERRNO(ENODEV,
+	    rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0) == -1);
+
+	memset(&mod, 0, sizeof(mod));
+	mod.ml_filename = kernfs;
+	mod.ml_flags = MODCTL_LOAD_FORCE;
+
+	RL(rump_sys_modctl(MODCTL_LOAD, &mod));
+
+	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
+	ATF_REQUIRE(check_kernfs());
+	RL(rump_sys_unmount(MYMP, 0));
+}
+
+ATF_TC(disabledstat);
+ATF_TC_HEAD(disabledstat, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
+	    "show up in modstat with refcount -1");
+}
+
+ATF_TC_BODY(disabledstat, tc)
+{
+	struct modstat ms[128];
+	struct iovec iov;
+	size_t i;
+	bool found = false;
+
+	rump_init();
+	RL(rump_sys_mkdir(MYMP, 0777));
+
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
+
+	iov.iov_base = ms;
+	iov.iov_len = sizeof(ms);
+	RL(rump_sys_modctl(MODCTL_STAT, &iov));
+
+	for (i = 0; i < __arraycount(ms); i++) {
+		if (strcmp(ms[i].ms_name, kernfs) == 0) {
+			ATF_REQUIRE_EQ(ms[i].ms_refcnt, (u_int)-1);
+			found = 1;
+			break;
+		}
+	}
+	ATF_REQUIRE(found);
+}
+
+ATF_TC(busydisable);
+ATF_TC_HEAD(busydisable, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests that busy builtin modules "
+	    "cannot be disabled");
+}
+
+ATF_TC_BODY(busydisable, tc)
+{
+
+	rump_init();
+	RL(rump_sys_mkdir(MYMP, 0777));
+	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
+	ATF_REQUIRE(check_kernfs());
+	ATF_REQUIRE_ERRNO(EBUSY,
+	    rump_sys_modctl(MODCTL_UNLOAD, kernfs) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, disable);
+	ATF_TP_ADD_TC(tp, noauto);
+	ATF_TP_ADD_TC(tp, forcereload);
+	ATF_TP_ADD_TC(tp, disabledstat);
+	ATF_TP_ADD_TC(tp, busydisable);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/modules/t_modctl.c b/contrib/netbsd-tests/modules/t_modctl.c
new file mode 100644
index 000000000000..50cd907f3748
--- /dev/null
+++ b/contrib/netbsd-tests/modules/t_modctl.c
@@ -0,0 +1,493 @@
+/*	$NetBSD: t_modctl.c,v 1.12 2012/08/20 08:07:52 martin Exp $	*/
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.12 2012/08/20 08:07:52 martin Exp $");
+
+#include <sys/module.h>
+#include <sys/sysctl.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <prop/proplib.h>
+
+#include <atf-c.h>
+
+enum presence_check { both_checks, stat_check, sysctl_check };
+
+static void	check_permission(void);
+static bool	get_modstat_info(const char *, modstat_t *);
+static bool	get_sysctl(const char *, void *buf, const size_t);
+static bool	k_helper_is_present_stat(void);
+static bool	k_helper_is_present_sysctl(void);
+static bool	k_helper_is_present(enum presence_check);
+static int	load(prop_dictionary_t, bool, const char *, ...);
+static int	unload(const char *, bool);
+static void	unload_cleanup(const char *);
+
+/* --------------------------------------------------------------------- */
+/* Auxiliary functions                                                   */
+/* --------------------------------------------------------------------- */
+
+/*
+ * A function checking wether we are allowed to load modules currently
+ * (either the kernel is not modular, or securelevel may prevent it)
+ */
+static void
+check_permission(void)
+{
+	int err;
+
+	err = modctl(MODCTL_EXISTS, 0);
+	if (err == 0) return;
+	if (errno == ENOSYS)
+		atf_tc_skip("Kernel does not have 'options MODULAR'.");
+	else if (errno == EPERM)
+		atf_tc_skip("Module loading administratively forbidden");
+	ATF_REQUIRE_EQ_MSG(errno, 0, "unexpected error %d from "
+	    "modctl(MODCTL_EXISTS, 0)", errno);
+}
+
+static bool
+get_modstat_info(const char *name, modstat_t *msdest)
+{
+	bool found;
+	size_t len;
+	struct iovec iov;
+	modstat_t *ms;
+
+	check_permission();
+	for (len = 4096; ;) {
+		iov.iov_base = malloc(len);
+		iov.iov_len = len;
+
+		errno = 0;
+
+		if (modctl(MODCTL_STAT, &iov) != 0) {
+			int err = errno;
+			fprintf(stderr, "modctl(MODCTL_STAT) failed: %s\n",
+			    strerror(err));
+			atf_tc_fail("Failed to query module status");
+		}
+		if (len >= iov.iov_len)
+			break;
+		free(iov.iov_base);
+		len = iov.iov_len;
+	}
+
+	found = false;
+	len = iov.iov_len / sizeof(modstat_t);
+	for (ms = (modstat_t *)iov.iov_base; len != 0 && !found;
+	    ms++, len--) {
+		if (strcmp(ms->ms_name, name) == 0) {
+			if (msdest != NULL)
+				*msdest = *ms;
+			found = true;
+		}
+	}
+
+	free(iov.iov_base);
+
+	return found;
+}
+
+/*
+ * Queries a sysctl property.
+ */
+static bool
+get_sysctl(const char *name, void *buf, const size_t len)
+{
+	size_t len2 = len;
+	printf("Querying sysctl variable: %s\n", name);
+	int ret = sysctlbyname(name, buf, &len2, NULL, 0);
+	if (ret == -1 && errno != ENOENT) {
+		fprintf(stderr, "sysctlbyname(2) failed: %s\n",
+		    strerror(errno));
+		atf_tc_fail("Failed to query %s", name);
+	}
+	return ret != -1;
+}
+
+/*
+ * Returns a boolean indicating if the k_helper module was loaded
+ * successfully.  This implementation uses modctl(2)'s MODCTL_STAT
+ * subcommand to do the check.
+ */
+static bool
+k_helper_is_present_stat(void)
+{
+
+	return get_modstat_info("k_helper", NULL);
+}
+
+/*
+ * Returns a boolean indicating if the k_helper module was loaded
+ * successfully.  This implementation uses the module's sysctl
+ * installed node to do the check.
+ */
+static bool
+k_helper_is_present_sysctl(void)
+{
+	size_t present;
+
+	return get_sysctl("vendor.k_helper.present", &present,
+	    sizeof(present));
+}
+
+/*
+ * Returns a boolean indicating if the k_helper module was loaded
+ * successfully.  The 'how' parameter specifies the implementation to
+ * use to do the check.
+ */
+static bool
+k_helper_is_present(enum presence_check how)
+{
+	bool found;
+
+	switch (how) {
+	case both_checks:
+		found = k_helper_is_present_stat();
+		ATF_CHECK(k_helper_is_present_sysctl() == found);
+		break;
+
+	case stat_check:
+		found = k_helper_is_present_stat();
+		break;
+
+	case sysctl_check:
+		found = k_helper_is_present_sysctl();
+		break;
+
+	default:
+		found = false;
+		assert(found);
+	}
+
+	return found;
+}
+
+/*
+ * Loads the specified module from a file.  If fatal is set and an error
+ * occurs when loading the module, an error message is printed and the
+ * test case is aborted.
+ */
+static __printflike(3, 4) int
+load(prop_dictionary_t props, bool fatal, const char *fmt, ...)
+{
+	int err;
+	va_list ap;
+	char filename[MAXPATHLEN], *propsstr;
+	modctl_load_t ml;
+
+	check_permission();
+	if (props == NULL) {
+		props = prop_dictionary_create();
+		propsstr = prop_dictionary_externalize(props);
+		ATF_CHECK(propsstr != NULL);
+		prop_object_release(props);
+	} else {
+		propsstr = prop_dictionary_externalize(props);
+		ATF_CHECK(propsstr != NULL);
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(filename, sizeof(filename), fmt, ap);
+	va_end(ap);
+
+	ml.ml_filename = filename;
+	ml.ml_flags = 0;
+	ml.ml_props = propsstr;
+	ml.ml_propslen = strlen(propsstr);
+
+	printf("Loading module %s\n", filename);
+	errno = err = 0;
+
+	if (modctl(MODCTL_LOAD, &ml) == -1) {
+		err = errno;
+		fprintf(stderr, "modctl(MODCTL_LOAD, %s), failed: %s\n",
+		    filename, strerror(err));
+		if (fatal)
+			atf_tc_fail("Module load failed");
+	}
+
+	free(propsstr);
+
+	return err;
+}
+
+/*
+ * Unloads the specified module.  If silent is true, nothing will be
+ * printed and no errors will be raised if the unload was unsuccessful.
+ */
+static int
+unload(const char *name, bool fatal)
+{
+	int err;
+
+	check_permission();
+	printf("Unloading module %s\n", name);
+	errno = err = 0;
+
+	if (modctl(MODCTL_UNLOAD, __UNCONST(name)) == -1) {
+		err = errno;
+		fprintf(stderr, "modctl(MODCTL_UNLOAD, %s) failed: %s\n",
+		    name, strerror(err));
+		if (fatal)
+			atf_tc_fail("Module unload failed");
+	}
+	return err;
+}
+
+/*
+ * A silent version of unload, to be called as part of the cleanup
+ * process only.
+ */
+static void
+unload_cleanup(const char *name)
+{
+
+	(void)modctl(MODCTL_UNLOAD, __UNCONST(name));
+}
+
+/* --------------------------------------------------------------------- */
+/* Test cases                                                            */
+/* --------------------------------------------------------------------- */
+
+ATF_TC_WITH_CLEANUP(cmd_load);
+ATF_TC_HEAD(cmd_load, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests for the MODCTL_LOAD command");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(cmd_load, tc)
+{
+	char longname[MAXPATHLEN];
+	size_t i;
+
+	ATF_CHECK(load(NULL, false, " ") == ENOENT);
+	ATF_CHECK(load(NULL, false, "non-existent.o") == ENOENT);
+
+	for (i = 0; i < MAXPATHLEN - 1; i++)
+		longname[i] = 'a';
+	longname[MAXPATHLEN - 1] = '\0';
+	ATF_CHECK(load(NULL, false, "%s", longname) == ENAMETOOLONG);
+
+	ATF_CHECK(!k_helper_is_present(stat_check));
+	load(NULL, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	printf("Checking if load was successful\n");
+	ATF_CHECK(k_helper_is_present(stat_check));
+}
+ATF_TC_CLEANUP(cmd_load, tc)
+{
+	unload_cleanup("k_helper");
+}
+
+ATF_TC_WITH_CLEANUP(cmd_load_props);
+ATF_TC_HEAD(cmd_load_props, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests for the MODCTL_LOAD command, "
+	    "providing extra load-time properties");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(cmd_load_props, tc)
+{
+	prop_dictionary_t props;
+
+	printf("Loading module without properties\n");
+	props = prop_dictionary_create();
+	load(props, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	prop_object_release(props);
+	{
+		int ok;
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_str_ok",
+		    &ok, sizeof(ok)));
+		ATF_CHECK(!ok);
+	}
+	unload("k_helper", true);
+
+	printf("Loading module with a string property\n");
+	props = prop_dictionary_create();
+	prop_dictionary_set(props, "prop_str",
+	    prop_string_create_cstring("1st string"));
+	load(props, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	prop_object_release(props);
+	{
+		int ok;
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_str_ok",
+		    &ok, sizeof(ok)));
+		ATF_CHECK(ok);
+
+		char val[128];
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_str_val",
+		    &val, sizeof(val)));
+		ATF_CHECK(strcmp(val, "1st string") == 0);
+	}
+	unload("k_helper", true);
+
+	printf("Loading module with a different string property\n");
+	props = prop_dictionary_create();
+	prop_dictionary_set(props, "prop_str",
+	    prop_string_create_cstring("2nd string"));
+	load(props, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	prop_object_release(props);
+	{
+		int ok;
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_str_ok",
+		    &ok, sizeof(ok)));
+		ATF_CHECK(ok);
+
+		char val[128];
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_str_val",
+		    &val, sizeof(val)));
+		ATF_CHECK(strcmp(val, "2nd string") == 0);
+	}
+	unload("k_helper", true);
+}
+ATF_TC_CLEANUP(cmd_load_props, tc)
+{
+	unload_cleanup("k_helper");
+}
+
+ATF_TC_WITH_CLEANUP(cmd_load_recurse);
+ATF_TC_HEAD(cmd_load_recurse, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests for the MODCTL_LOAD command, "
+	    "with recursive module_load()");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(cmd_load_recurse, tc)
+{
+	prop_dictionary_t props;
+	char filename[MAXPATHLEN];
+
+	printf("Loading module with request to load another module\n");
+	props = prop_dictionary_create();
+	snprintf(filename, sizeof(filename), "%s/k_helper2/k_helper2.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	prop_dictionary_set(props, "prop_recurse",
+	    prop_string_create_cstring(filename));
+	load(props, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	{
+		int ok;
+		ATF_CHECK(get_sysctl("vendor.k_helper.prop_int_load",
+		    &ok, sizeof(ok)));
+		ATF_CHECK(ok == 0);
+		ATF_CHECK(get_sysctl("vendor.k_helper2.present",
+		    &ok, sizeof(ok)));
+		ATF_CHECK(ok);
+	}
+	unload("k_helper", true);
+	unload("k_helper2", true);
+}
+ATF_TC_CLEANUP(cmd_load_recurse, tc)
+{
+	unload_cleanup("k_helper");
+	unload_cleanup("k_helper2");
+}
+
+ATF_TC_WITH_CLEANUP(cmd_stat);
+ATF_TC_HEAD(cmd_stat, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests for the MODCTL_STAT command");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(cmd_stat, tc)
+{
+	ATF_CHECK(!k_helper_is_present(both_checks));
+
+	load(NULL, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	ATF_CHECK(k_helper_is_present(both_checks));
+	{
+		modstat_t ms;
+		ATF_CHECK(get_modstat_info("k_helper", &ms));
+
+		ATF_CHECK(ms.ms_class == MODULE_CLASS_MISC);
+		ATF_CHECK(ms.ms_source == MODULE_SOURCE_FILESYS);
+		ATF_CHECK(ms.ms_refcnt == 0);
+	}
+	unload("k_helper", true);
+
+	ATF_CHECK(!k_helper_is_present(both_checks));
+}
+ATF_TC_CLEANUP(cmd_stat, tc)
+{
+	unload_cleanup("k_helper");
+}
+
+ATF_TC_WITH_CLEANUP(cmd_unload);
+ATF_TC_HEAD(cmd_unload, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Tests for the MODCTL_UNLOAD command");
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(cmd_unload, tc)
+{
+	load(NULL, true, "%s/k_helper/k_helper.kmod",
+	    atf_tc_get_config_var(tc, "srcdir"));
+
+	ATF_CHECK(unload("", false) == ENOENT);
+	ATF_CHECK(unload("non-existent.kmod", false) == ENOENT);
+	ATF_CHECK(unload("k_helper.kmod", false) == ENOENT);
+
+	ATF_CHECK(k_helper_is_present(stat_check));
+	unload("k_helper", true);
+	printf("Checking if unload was successful\n");
+	ATF_CHECK(!k_helper_is_present(stat_check));
+}
+ATF_TC_CLEANUP(cmd_unload, tc)
+{
+	unload_cleanup("k_helper");
+}
+
+/* --------------------------------------------------------------------- */
+/* Main                                                                  */
+/* --------------------------------------------------------------------- */
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, cmd_load);
+	ATF_TP_ADD_TC(tp, cmd_load_props);
+	ATF_TP_ADD_TC(tp, cmd_stat);
+	ATF_TP_ADD_TC(tp, cmd_load_recurse);
+	ATF_TP_ADD_TC(tp, cmd_unload);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/modules/t_modload.sh b/contrib/netbsd-tests/modules/t_modload.sh
new file mode 100755
index 000000000000..561bb6f6d574
--- /dev/null
+++ b/contrib/netbsd-tests/modules/t_modload.sh
@@ -0,0 +1,205 @@
+# $NetBSD: t_modload.sh,v 1.13 2012/04/20 05:41:25 jruoho Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+check_sysctl() {
+	echo "${1} = ${2}" >expout
+	atf_check -s eq:0 -o file:expout -e empty sysctl ${1}
+}
+
+atf_test_case plain cleanup
+plain_head() {
+	atf_set "descr" "Test load without arguments"
+	atf_set "require.user" "root"
+}
+plain_body() {
+
+	# XXX: Adjust when modctl(8) fails consistently.
+	#
+	$(atf_get_srcdir)/k_helper3 \
+		"%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
+
+	if [ $? -eq 1 ] || [ $? -eq 78 ]; then
+		atf_skip "host does not support modules"
+	fi
+
+	cat >experr <<EOF
+modload: No such file or directory
+EOF
+	atf_check -s eq:1 -o empty -e ignore modload non-existent.o
+
+	atf_check -s eq:0 -o empty -e empty \
+	    modload $(atf_get_srcdir)/k_helper/k_helper.kmod
+	check_sysctl vendor.k_helper.present 1
+	check_sysctl vendor.k_helper.prop_int_ok 0
+	check_sysctl vendor.k_helper.prop_str_ok 0
+	atf_check -s eq:0 -o empty -e empty modunload k_helper
+	touch done
+}
+plain_cleanup() {
+	test -f done || modunload k_helper >/dev/null 2>&1
+}
+
+atf_test_case bflag cleanup
+bflag_head() {
+	atf_set "descr" "Test the -b flag"
+	atf_set "require.user" "root"
+}
+bflag_body() {
+	echo "Checking error conditions"
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -b foo k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid parameter.*foo' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -b foo= k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid boolean value' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -b foo=bar k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid boolean value.*bar' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -b foo=falsea k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid boolean value.*falsea' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -b foo=truea k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid boolean value.*truea' stderr
+
+	# TODO Once sysctl(8) supports CTLTYPE_BOOL nodes.
+	#echo "Checking valid values"
+}
+bflag_cleanup() {
+	modunload k_helper >/dev/null 2>&1 || true
+}
+
+atf_test_case iflag cleanup
+iflag_head() {
+	atf_set "descr" "Test the -i flag"
+	atf_set "require.user" "root"
+}
+iflag_body() {
+
+	# XXX: Adjust when modctl(8) fails consistently.
+	#
+	$(atf_get_srcdir)/k_helper3 \
+		"%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
+
+	if [ $? -eq 1 ] || [ $? -eq 78 ]; then
+		atf_skip "host does not support modules"
+	fi
+
+	echo "Checking error conditions"
+
+	atf_check -s eq:1 -o empty -e save:stderr modload -i foo \
+	    k_helper/k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid parameter.*foo' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr modload -i foo= \
+	    k_helper/k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid integer value' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -i foo=bar k_helper/k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid integer value.*bar' stderr
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    modload -i foo=123a k_helper/k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid integer value.*123a' stderr
+
+	echo "Checking valid values"
+
+	for v in 5 10; do
+		atf_check -s eq:0 -o empty -e empty \
+		    modload -i prop_int="${v}" \
+		    $(atf_get_srcdir)/k_helper/k_helper.kmod
+		check_sysctl vendor.k_helper.prop_int_ok 1
+		check_sysctl vendor.k_helper.prop_int_val "${v}"
+		atf_check -s eq:0 -o empty -e empty modunload k_helper
+	done
+	touch done
+}
+iflag_cleanup() {
+	test -f done || modunload k_helper >/dev/null 2>&1
+}
+
+atf_test_case sflag cleanup
+sflag_head() {
+	atf_set "descr" "Test the -s flag"
+	atf_set "require.user" "root"
+}
+sflag_body() {
+
+	# XXX: Adjust when modctl(8) fails consistently.
+	#
+	$(atf_get_srcdir)/k_helper3 \
+		"%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
+
+	if [ $? -eq 1 ] || [ $? -eq 78 ]; then
+		atf_skip "host does not support modules"
+	fi
+
+	echo "Checking error conditions"
+
+	atf_check -s eq:1 -o empty -e save:stderr modload -s foo \
+	    k_helper/k_helper.kmod
+	atf_check -s eq:0 -o ignore -e empty \
+	    grep 'Invalid parameter.*foo' stderr
+
+	echo "Checking valid values"
+
+	for v in '1st string' '2nd string'; do
+		atf_check -s eq:0 -o empty -e empty \
+		    modload -s prop_str="${v}" \
+		    $(atf_get_srcdir)/k_helper/k_helper.kmod
+		check_sysctl vendor.k_helper.prop_str_ok 1
+		check_sysctl vendor.k_helper.prop_str_val "${v}"
+		atf_check -s eq:0 -o empty -e empty modunload k_helper
+	done
+	touch done
+}
+sflag_cleanup() {
+	test -f done || modunload k_helper >/dev/null 2>&1
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case plain
+	atf_add_test_case bflag
+	atf_add_test_case iflag
+	atf_add_test_case sflag
+}
diff --git a/contrib/netbsd-tests/net/bpf/h_bpf.h b/contrib/netbsd-tests/net/bpf/h_bpf.h
new file mode 100644
index 000000000000..307bc50d56e7
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpf/h_bpf.h
@@ -0,0 +1,171 @@
+/*	$NetBSD: h_bpf.h,v 1.2 2014/07/08 21:44:26 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 _TESTS_NET_BPF_H_BPF_H_
+#define _TESTS_NET_BPF_H_BPF_H_
+
+#include <sys/param.h>
+#include <sys/mbuf.h>
+
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <stdint.h>
+#include <string.h>
+
+/* XXX These declarations don't look kosher. */
+int rumpns_bpf_validate(const struct bpf_insn *, int);
+unsigned int rumpns_bpf_filter_ext(const bpf_ctx_t *,
+    const struct bpf_insn *, bpf_args_t *);
+bpfjit_func_t rumpns_bpfjit_generate_code(const bpf_ctx_t *,
+    const struct bpf_insn *, size_t);
+void rumpns_bpfjit_free_code(bpfjit_func_t);
+
+/*
+ * Init mbuf chain with one or two chunks. The first chunk holds
+ * [pkt, pkt + split] bytes, the second chunk (if it's not empty)
+ * holds (pkt + split, pkt + pktsize) bytes.
+ * The function returns (const uint8_t *)mb1.
+ */
+static inline const uint8_t *
+init_mchain2(struct mbuf *mb1, struct mbuf *mb2,
+    unsigned char pkt[], size_t pktsize, size_t split)
+{
+
+	(void)memset(mb1, 0, sizeof(*mb1));
+	mb1->m_data = (char *)pkt;
+	mb1->m_next = (split < pktsize) ? mb2 : NULL;
+	mb1->m_len = (split < pktsize) ? split : pktsize;
+
+	if (split < pktsize) {
+		(void)memset(mb2, 0, sizeof(*mb2));
+		mb2->m_next = NULL;
+		mb2->m_data = (char *)&pkt[split];
+		mb2->m_len = pktsize - split;
+	}
+
+	return (const uint8_t*)mb1;
+}
+
+/*
+ * Compile and run a filter program.
+ */
+static inline unsigned int
+exec_prog(struct bpf_insn *insns, size_t insn_count,
+    unsigned char pkt[], size_t pktsize)
+{
+	bpfjit_func_t fn;
+	bpf_args_t args;
+	unsigned int res;
+
+	args.pkt = (const uint8_t *)pkt;
+	args.buflen = pktsize;
+	args.wirelen = pktsize;
+
+	rump_schedule();
+	fn = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+
+	res = fn(NULL, &args);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(fn);
+	rump_unschedule();
+
+	return res;
+}
+
+/*
+ * Interpret a filter program with mbuf chain passed to bpf_filter_ext().
+ */
+static inline unsigned int
+interp_prog_mchain2(struct bpf_insn *insns,
+    unsigned char pkt[], size_t pktsize, size_t split)
+{
+	uint32_t mem[BPF_MEMWORDS];
+	struct mbuf mb1, mb2;
+	bpf_args_t args;
+	unsigned int res;
+
+	args.pkt = init_mchain2(&mb1, &mb2, pkt, pktsize, split);
+	args.buflen = 0;
+	args.wirelen = pktsize;
+	args.mem = mem;
+
+	rump_schedule();
+	res = rumpns_bpf_filter_ext(NULL, insns, &args);
+	rump_unschedule();
+
+	return res;
+}
+
+/*
+ * Compile and run a filter program with mbuf chain passed to compiled function.
+ */
+static inline unsigned int
+exec_prog_mchain2(struct bpf_insn *insns, size_t insn_count,
+    unsigned char pkt[], size_t pktsize, size_t split)
+{
+	bpfjit_func_t fn;
+	struct mbuf mb1, mb2;
+	bpf_args_t args;
+	unsigned int res;
+
+	args.pkt = init_mchain2(&mb1, &mb2, pkt, pktsize, split);
+	args.buflen = 0;
+	args.wirelen = pktsize;
+
+	rump_schedule();
+	fn = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+
+	res = fn(NULL, &args);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(fn);
+	rump_unschedule();
+
+	return res;
+}
+
+static inline bool
+prog_validate(struct bpf_insn *insns, size_t insn_count)
+{
+	bool res;
+
+	rump_schedule();
+	res = rumpns_bpf_validate(insns, insn_count);
+	rump_unschedule();
+
+	return res;
+}
+
+#endif /* _TESTS_NET_BPF_H_BPF_H_ */
diff --git a/contrib/netbsd-tests/net/bpf/t_bpf.c b/contrib/netbsd-tests/net/bpf/t_bpf.c
new file mode 100644
index 000000000000..95ca2fc48de7
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpf/t_bpf.c
@@ -0,0 +1,177 @@
+/*	$NetBSD: t_bpf.c,v 1.5 2012/08/14 19:40:30 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bpf.c,v 1.5 2012/08/14 19:40:30 alnsn Exp $");
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/mbuf.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+#include <net/if.h>
+#include <net/bpf.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../config/netconfig.c"
+
+ATF_TC(bpfwriteleak);
+ATF_TC_HEAD(bpfwriteleak, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that writing to /dev/bpf "
+	    "does not leak mbufs");
+}
+
+static int
+getmtdata(void)
+{
+	struct mbstat mbstat;
+	size_t mbstatlen = sizeof(mbstat);
+	const int mbstat_mib[] = { CTL_KERN, KERN_MBUF, MBUF_STATS };
+
+	RL(rump_sys___sysctl(mbstat_mib, __arraycount(mbstat_mib),
+	    &mbstat, &mbstatlen, NULL, 0));
+	return mbstat.m_mtypes[MT_DATA];
+}
+
+ATF_TC_BODY(bpfwriteleak, tc)
+{
+	char buf[28]; /* sizeof(garbage) > etherhdrlen */
+	struct ifreq ifr;
+	int ifnum, bpfd;
+
+	RZ(rump_init());
+	RZ(rump_pub_shmif_create(NULL, &ifnum));
+	sprintf(ifr.ifr_name, "shmif%d", ifnum);
+
+	RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+	RL(rump_sys_ioctl(bpfd, BIOCSETIF, &ifr));
+	RL(rump_sys_ioctl(bpfd, BIOCSFEEDBACK, &ifr));
+
+	if (getmtdata() != 0)
+		atf_tc_fail("test precondition failed: MT_DATA mbufs != 0");
+
+	ATF_REQUIRE_ERRNO(ENETDOWN, rump_sys_write(bpfd, buf, sizeof(buf))==-1);
+
+	ATF_REQUIRE_EQ(getmtdata(), 0);
+}
+
+#if (SIZE_MAX > UINT_MAX)
+ATF_TC(bpfwritetrunc);
+ATF_TC_HEAD(bpfwritetrunc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that write to /dev/bpf "
+	    "does not truncate size_t to int");
+}
+
+ATF_TC_BODY(bpfwritetrunc, tc)
+{
+	int bpfd;
+	struct ifreq ifr;
+	struct iovec *iov;
+	size_t iovlen, sz;
+	const size_t extra_bytes = 28;
+	const size_t total = extra_bytes + UINT_MAX + 1;
+	long iov_max, vm_page_size; /* round_page wants vm_page_size variable */
+
+	memset(&ifr, 0, sizeof(ifr));
+
+	iov_max      = sysconf(_SC_IOV_MAX);
+	vm_page_size = sysconf(_SC_PAGE_SIZE);
+	ATF_REQUIRE(iov_max > 1 && vm_page_size > 1);
+
+	/*
+	 * Minimize memory consumption by using many iovecs
+	 * all pointing to one memory region.
+	 */
+	iov = calloc(iov_max, sizeof(struct iovec));
+	ATF_REQUIRE(iov != NULL);
+
+	sz = round_page((total + (iov_max - 1)) / iov_max);
+
+	iov[0].iov_len = sz;
+	iov[0].iov_base = mmap(NULL, sz, PROT_READ, MAP_ANON, -1, 0);
+	ATF_REQUIRE(iov[0].iov_base != MAP_FAILED);
+
+	iovlen = 1;
+	while (sz + iov[0].iov_len <= total)
+	{
+		iov[iovlen].iov_len  = iov[0].iov_len;
+		iov[iovlen].iov_base = iov[0].iov_base;
+		sz += iov[0].iov_len;
+		iovlen++;
+	}
+
+	if (sz < total)
+	{
+		iov[iovlen].iov_len = total - sz;
+		iov[iovlen].iov_base = iov[0].iov_base;
+		iovlen++;
+	}
+
+	/* Sanity checks */
+	ATF_REQUIRE(iovlen >= 1 && iovlen <= (size_t)iov_max);
+	ATF_REQUIRE_EQ(iov[iovlen-1].iov_len, total % iov[0].iov_len);
+
+	RZ(rump_init());
+	netcfg_rump_makeshmif("bpfwritetrunc", ifr.ifr_name);
+	netcfg_rump_if(ifr.ifr_name, "10.1.1.1", "255.0.0.0");
+
+	RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+	RL(rump_sys_ioctl(bpfd, BIOCSETIF, &ifr));
+
+	ATF_CHECK_ERRNO(EMSGSIZE, rump_sys_writev(bpfd, iov, iovlen) == -1);
+
+	munmap(iov[0].iov_base, iov[0].iov_len);
+	free(iov);
+}
+#endif /* #if (SIZE_MAX > UINT_MAX) */
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, bpfwriteleak);
+#if (SIZE_MAX > UINT_MAX)
+	ATF_TP_ADD_TC(tp, bpfwritetrunc);
+#endif
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpf/t_div-by-zero.c b/contrib/netbsd-tests/net/bpf/t_div-by-zero.c
new file mode 100644
index 000000000000..542d08a793d4
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpf/t_div-by-zero.c
@@ -0,0 +1,52 @@
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <net/bpf.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+ATF_TC(div_by_zero);
+ATF_TC_HEAD(div_by_zero, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF rejects a filter "
+	    "which divides by 0");
+}
+
+ATF_TC_BODY(div_by_zero, tc)
+{
+	struct bpf_program bp;
+	int fd;
+
+	/*
+	 * Source code for following program:
+	 * link[0:4]/0 = 2
+	 */
+	struct bpf_insn bins[] = {
+	    { 0x20, 0, 0, 0x00000000 },
+	    { 0x34, 0, 0, 0x00000000 },
+	    { 0x15, 0, 1, 0x00000002 },
+	    { 0x6, 0, 0, 0x00000060 },
+	    { 0x6, 0, 0, 0x00000000 },
+	};
+
+	bp.bf_len = __arraycount(bins);
+	bp.bf_insns = bins;
+
+	rump_init();
+	fd = rump_sys_open("/dev/bpf", O_RDWR);
+	ATF_CHECK(fd != -1);
+	ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(fd, BIOCSETF, &bp), -1,
+	    "bpf accepted program with division by zero");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, div_by_zero);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpf/t_mbuf.c b/contrib/netbsd-tests/net/bpf/t_mbuf.c
new file mode 100644
index 000000000000..965dd02e285b
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpf/t_mbuf.c
@@ -0,0 +1,961 @@
+/*	$NetBSD: t_mbuf.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mbuf.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $");
+
+#include <sys/param.h>
+#include <sys/mbuf.h>
+
+#include <net/bpf.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../net/bpf/h_bpf.h"
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static bool
+test_ldb_abs(size_t split)
+{
+	/* Return a product of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),  /* A <- P[0]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 1),  /* A <- P[1]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 2),  /* A <- P[2]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3),  /* A <- P[3]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 4),  /* A <- P[4]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A      */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 120;
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldh_abs(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 0),  /* A <- P[0:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 1),  /* A <- P[1:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 2),  /* A <- P[2:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 3),  /* A <- P[3:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A        */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x0a0e; /* 10 14 */
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldw_abs(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 0),  /* A <- P[0:4] */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 1),  /* A <- P[1:4] */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A       */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x03050709;
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldb_ind(size_t split)
+{
+	/* Return a sum of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),  /* A <- P[0+X] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),  /* A <- P[1+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),  /* A <- P[1+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),  /* A <- P[2+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 3),  /* A <- P[3+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A       */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 15;
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldw_ind(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),  /* A <- P[X+0:4] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),  /* A <- P[X+0:4] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0), /* X <- 0        */
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),  /* A <- P[X+1:4] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A         */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x05080b0e;
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldh_ind(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),  /* A <- P[X+0:2] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),  /* A <- P[X+1:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),  /* A <- P[X+1:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 2),  /* A <- P[X+2:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A         */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x0a0e; /* 10 14 */
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_msh(size_t split)
+{
+	/* Return a product of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),        /* A <- 1     */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 0), /* X <- 4*(P[0]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 1), /* X <- 4*(P[1]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 2), /* X <- 4*(P[2]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 3), /* X <- 4*(P[3]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 4), /* X <- 4*(P[4]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A      */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 120;
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldb_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 4),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 4),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_msh_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 5),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+
+	if (!prog_validate(insns, sizeof(insns) / sizeof(insns[0])))
+		return false;
+
+	return interp_prog_mchain2(insns, P, sizeof(P), split) == 0;
+}
+
+ATF_TC(bpf_mbuf_ldb_abs);
+ATF_TC_HEAD(bpf_mbuf_ldb_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_ABS "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_abs(0));
+	ATF_CHECK(test_ldb_abs(1));
+	ATF_CHECK(test_ldb_abs(2));
+	ATF_CHECK(test_ldb_abs(3));
+	ATF_CHECK(test_ldb_abs(4));
+	ATF_CHECK(test_ldb_abs(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_abs);
+ATF_TC_HEAD(bpf_mbuf_ldh_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_ABS "
+	    "loads halfwords from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_abs(0));
+	ATF_CHECK(test_ldh_abs(1));
+	ATF_CHECK(test_ldh_abs(2));
+	ATF_CHECK(test_ldh_abs(3));
+	ATF_CHECK(test_ldh_abs(4));
+	ATF_CHECK(test_ldh_abs(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_abs);
+ATF_TC_HEAD(bpf_mbuf_ldw_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_ABS "
+	    "loads words from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_abs(0));
+	ATF_CHECK(test_ldw_abs(1));
+	ATF_CHECK(test_ldw_abs(2));
+	ATF_CHECK(test_ldw_abs(3));
+	ATF_CHECK(test_ldw_abs(4));
+	ATF_CHECK(test_ldw_abs(5));
+}
+
+ATF_TC(bpf_mbuf_ldb_ind);
+ATF_TC_HEAD(bpf_mbuf_ldb_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind(0));
+	ATF_CHECK(test_ldb_ind(1));
+	ATF_CHECK(test_ldb_ind(2));
+	ATF_CHECK(test_ldb_ind(3));
+	ATF_CHECK(test_ldb_ind(4));
+	ATF_CHECK(test_ldb_ind(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_ind);
+ATF_TC_HEAD(bpf_mbuf_ldh_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "loads halfwords from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind(0));
+	ATF_CHECK(test_ldh_ind(1));
+	ATF_CHECK(test_ldh_ind(2));
+	ATF_CHECK(test_ldh_ind(3));
+	ATF_CHECK(test_ldh_ind(4));
+	ATF_CHECK(test_ldh_ind(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_ind);
+ATF_TC_HEAD(bpf_mbuf_ldw_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "loads words from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind(0));
+	ATF_CHECK(test_ldw_ind(1));
+	ATF_CHECK(test_ldw_ind(2));
+	ATF_CHECK(test_ldw_ind(3));
+	ATF_CHECK(test_ldw_ind(4));
+	ATF_CHECK(test_ldw_ind(5));
+}
+
+ATF_TC(bpf_mbuf_msh);
+ATF_TC_HEAD(bpf_mbuf_msh, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LDX+BPF_B+BPF_MSH "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpf_mbuf_msh, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_msh(0));
+	ATF_CHECK(test_msh(1));
+	ATF_CHECK(test_msh(2));
+	ATF_CHECK(test_msh(3));
+	ATF_CHECK(test_msh(4));
+	ATF_CHECK(test_msh(5));
+}
+
+ATF_TC(bpf_mbuf_ldb_abs_overflow);
+ATF_TC_HEAD(bpf_mbuf_ldb_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_abs_overflow(0));
+	ATF_CHECK(test_ldb_abs_overflow(1));
+	ATF_CHECK(test_ldb_abs_overflow(2));
+	ATF_CHECK(test_ldb_abs_overflow(3));
+	ATF_CHECK(test_ldb_abs_overflow(4));
+	ATF_CHECK(test_ldb_abs_overflow(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_abs_overflow);
+ATF_TC_HEAD(bpf_mbuf_ldh_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_abs_overflow(0));
+	ATF_CHECK(test_ldh_abs_overflow(1));
+	ATF_CHECK(test_ldh_abs_overflow(2));
+	ATF_CHECK(test_ldh_abs_overflow(3));
+	ATF_CHECK(test_ldh_abs_overflow(4));
+	ATF_CHECK(test_ldh_abs_overflow(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_abs_overflow);
+ATF_TC_HEAD(bpf_mbuf_ldw_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_abs_overflow(0));
+	ATF_CHECK(test_ldw_abs_overflow(1));
+	ATF_CHECK(test_ldw_abs_overflow(2));
+	ATF_CHECK(test_ldw_abs_overflow(3));
+	ATF_CHECK(test_ldw_abs_overflow(4));
+	ATF_CHECK(test_ldw_abs_overflow(5));
+}
+
+ATF_TC(bpf_mbuf_ldb_ind_overflow1);
+ATF_TC_HEAD(bpf_mbuf_ldb_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow1(0));
+	ATF_CHECK(test_ldb_ind_overflow1(1));
+	ATF_CHECK(test_ldb_ind_overflow1(2));
+	ATF_CHECK(test_ldb_ind_overflow1(3));
+	ATF_CHECK(test_ldb_ind_overflow1(4));
+	ATF_CHECK(test_ldb_ind_overflow1(5));
+}
+
+ATF_TC(bpf_mbuf_ldb_ind_overflow2);
+ATF_TC_HEAD(bpf_mbuf_ldb_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow2(0));
+	ATF_CHECK(test_ldb_ind_overflow2(1));
+	ATF_CHECK(test_ldb_ind_overflow2(2));
+	ATF_CHECK(test_ldb_ind_overflow2(3));
+	ATF_CHECK(test_ldb_ind_overflow2(4));
+	ATF_CHECK(test_ldb_ind_overflow2(5));
+}
+
+ATF_TC(bpf_mbuf_ldb_ind_overflow3);
+ATF_TC_HEAD(bpf_mbuf_ldb_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldb_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow3(0));
+	ATF_CHECK(test_ldb_ind_overflow3(1));
+	ATF_CHECK(test_ldb_ind_overflow3(2));
+	ATF_CHECK(test_ldb_ind_overflow3(3));
+	ATF_CHECK(test_ldb_ind_overflow3(4));
+	ATF_CHECK(test_ldb_ind_overflow3(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_ind_overflow1);
+ATF_TC_HEAD(bpf_mbuf_ldh_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow1(0));
+	ATF_CHECK(test_ldh_ind_overflow1(1));
+	ATF_CHECK(test_ldh_ind_overflow1(2));
+	ATF_CHECK(test_ldh_ind_overflow1(3));
+	ATF_CHECK(test_ldh_ind_overflow1(4));
+	ATF_CHECK(test_ldh_ind_overflow1(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_ind_overflow2);
+ATF_TC_HEAD(bpf_mbuf_ldh_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow2(0));
+	ATF_CHECK(test_ldh_ind_overflow2(1));
+	ATF_CHECK(test_ldh_ind_overflow2(2));
+	ATF_CHECK(test_ldh_ind_overflow2(3));
+	ATF_CHECK(test_ldh_ind_overflow2(4));
+	ATF_CHECK(test_ldh_ind_overflow2(5));
+}
+
+ATF_TC(bpf_mbuf_ldh_ind_overflow3);
+ATF_TC_HEAD(bpf_mbuf_ldh_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldh_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow3(0));
+	ATF_CHECK(test_ldh_ind_overflow3(1));
+	ATF_CHECK(test_ldh_ind_overflow3(2));
+	ATF_CHECK(test_ldh_ind_overflow3(3));
+	ATF_CHECK(test_ldh_ind_overflow3(4));
+	ATF_CHECK(test_ldh_ind_overflow3(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_ind_overflow1);
+ATF_TC_HEAD(bpf_mbuf_ldw_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow1(0));
+	ATF_CHECK(test_ldw_ind_overflow1(1));
+	ATF_CHECK(test_ldw_ind_overflow1(2));
+	ATF_CHECK(test_ldw_ind_overflow1(3));
+	ATF_CHECK(test_ldw_ind_overflow1(4));
+	ATF_CHECK(test_ldw_ind_overflow1(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_ind_overflow2);
+ATF_TC_HEAD(bpf_mbuf_ldw_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow2(0));
+	ATF_CHECK(test_ldw_ind_overflow2(1));
+	ATF_CHECK(test_ldw_ind_overflow2(2));
+	ATF_CHECK(test_ldw_ind_overflow2(3));
+	ATF_CHECK(test_ldw_ind_overflow2(4));
+	ATF_CHECK(test_ldw_ind_overflow2(5));
+}
+
+ATF_TC(bpf_mbuf_ldw_ind_overflow3);
+ATF_TC_HEAD(bpf_mbuf_ldw_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_ldw_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow3(0));
+	ATF_CHECK(test_ldw_ind_overflow3(1));
+	ATF_CHECK(test_ldw_ind_overflow3(2));
+	ATF_CHECK(test_ldw_ind_overflow3(3));
+	ATF_CHECK(test_ldw_ind_overflow3(4));
+	ATF_CHECK(test_ldw_ind_overflow3(5));
+}
+
+ATF_TC(bpf_mbuf_msh_overflow);
+ATF_TC_HEAD(bpf_mbuf_msh_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LDX+BPF_B+BPF_MSH "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpf_mbuf_msh_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_msh_overflow(0));
+	ATF_CHECK(test_msh_overflow(1));
+	ATF_CHECK(test_msh_overflow(2));
+	ATF_CHECK(test_msh_overflow(3));
+	ATF_CHECK(test_msh_overflow(4));
+	ATF_CHECK(test_msh_overflow(5));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../net/bpfjit/t_mbuf.c
+	 */
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_abs);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_abs);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_abs);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_ind);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_ind);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_ind);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_msh);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldb_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldh_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_ldw_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpf_mbuf_msh_overflow);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpfilter/t_bpfilter.c b/contrib/netbsd-tests/net/bpfilter/t_bpfilter.c
new file mode 100644
index 000000000000..9d8d56fca6ad
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpfilter/t_bpfilter.c
@@ -0,0 +1,400 @@
+/*	$NetBSD: t_bpfilter.c,v 1.8 2014/06/24 11:32:36 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bpfilter.c,v 1.8 2014/06/24 11:32:36 alnsn Exp $");
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/mbuf.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <net/if.h>
+#include <net/if_ether.h>
+#include <net/bpf.h>
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../config/netconfig.c"
+
+
+#define SNAPLEN UINT32_MAX
+
+#define BMAGIC UINT32_C(0x37)
+#define HMAGIC UINT32_C(0xc2c2)
+#define WMAGIC UINT32_C(0x7d7d7d7d)
+
+static const char magic_echo_reply_tail[7] = {
+	BMAGIC,
+	HMAGIC & 0xff,
+	HMAGIC & 0xff,
+	WMAGIC & 0xff,
+	WMAGIC & 0xff,
+	WMAGIC & 0xff,
+	WMAGIC & 0xff
+};
+
+/*
+ * Match ICMP_ECHOREPLY packet with 7 magic bytes at the end.
+ */
+static struct bpf_insn magic_echo_reply_prog[] = {
+	BPF_STMT(BPF_LD+BPF_ABS+BPF_B,
+	    sizeof(struct ip) + offsetof(struct icmp, icmp_type)),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ICMP_ECHOREPLY, 1, 0),
+	BPF_STMT(BPF_RET+BPF_K, 0),
+
+	BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),  /* A <- len   */
+	BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, 7), /* A <- A - 7 */
+	BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+	BPF_STMT(BPF_LD+BPF_IND+BPF_B, 0),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, BMAGIC, 1, 0),
+	BPF_STMT(BPF_RET+BPF_K, 0),
+
+	BPF_STMT(BPF_LD+BPF_IND+BPF_H, 1),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, HMAGIC, 1, 0),
+	BPF_STMT(BPF_RET+BPF_K, 0),
+
+	BPF_STMT(BPF_LD+BPF_IND+BPF_W, 3),
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, WMAGIC, 1, 0),
+	BPF_STMT(BPF_RET+BPF_K, 0),
+
+	BPF_STMT(BPF_RET+BPF_K, SNAPLEN)
+};
+
+static struct bpf_insn badmem_prog[] = {
+	BPF_STMT(BPF_LD+BPF_MEM, 5),
+	BPF_STMT(BPF_RET+BPF_A, 0),
+};
+
+static struct bpf_insn noinitA_prog[] = {
+	BPF_STMT(BPF_RET+BPF_A, 0),
+};
+
+static struct bpf_insn noinitX_prog[] = {
+	BPF_STMT(BPF_MISC+BPF_TXA, 0),
+	BPF_STMT(BPF_RET+BPF_A, 0),
+};
+
+static uint16_t
+in_cksum(void *data, size_t len)
+{
+	uint16_t *buf = data;
+	unsigned sum;
+
+	for (sum = 0; len > 1; len -= 2)
+		sum += *buf++;
+	if (len)
+		sum += *(uint8_t *)buf;
+
+	sum = (sum >> 16) + (sum & 0xffff);
+	sum += (sum >> 16);
+
+	return ~sum;
+}
+
+/*
+ * Based on netcfg_rump_pingtest().
+ */
+static bool __unused
+pingtest(const char *dst, unsigned int wirelen, const char tail[7])
+{
+	struct timeval tv;
+	struct sockaddr_in sin;
+	struct icmp *icmp;
+	char *pkt;
+	unsigned int pktsize;
+	socklen_t slen;
+	int s;
+	bool rv = false;
+
+	if (wirelen < ETHER_HDR_LEN + sizeof(struct ip))
+		return false;
+
+	pktsize = wirelen - ETHER_HDR_LEN - sizeof(struct ip);
+	if (pktsize < sizeof(struct icmp) + 7)
+		return false;
+
+	s = rump_sys_socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+	if (s == -1)
+		return false;
+
+	pkt = NULL;
+
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	if (rump_sys_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
+	    &tv, sizeof(tv)) == -1)
+		goto out;
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_addr.s_addr = inet_addr(dst);
+
+	pkt = calloc(1, pktsize);
+	icmp = (struct icmp *)pkt;
+	if (pkt == NULL)
+		goto out;
+
+	memcpy(pkt + pktsize - 7, tail, 7);
+	icmp->icmp_type = ICMP_ECHO;
+	icmp->icmp_id = htons(37);
+	icmp->icmp_seq = htons(1);
+	icmp->icmp_cksum = in_cksum(pkt, pktsize);
+
+	slen = sizeof(sin);
+	if (rump_sys_sendto(s, pkt, pktsize, 0,
+	    (struct sockaddr *)&sin, slen) == -1) {
+		goto out;
+	}
+
+	if (rump_sys_recvfrom(s, pkt, pktsize, 0,
+	    (struct sockaddr *)&sin, &slen) == -1)
+		goto out;
+
+	rv = true;
+ out:
+	if (pkt != NULL)
+		free(pkt);
+	rump_sys_close(s);
+	return rv;
+}
+
+static void
+magic_ping_test(const char *name, unsigned int wirelen)
+{
+	struct bpf_program prog;
+	struct bpf_stat bstat;
+	struct ifreq ifr;
+	struct timeval tv;
+	unsigned int bufsize;
+	bool pinged;
+	ssize_t n;
+	char *buf;
+	pid_t child;
+	int bpfd;
+	char token;
+	int channel[2];
+
+	struct bpf_hdr *hdr;
+
+	RL(pipe(channel));
+
+	prog.bf_len = __arraycount(magic_echo_reply_prog);
+	prog.bf_insns = magic_echo_reply_prog;
+
+	child = fork();
+	RZ(rump_init());
+	netcfg_rump_makeshmif(name, ifr.ifr_name);
+
+	switch (child) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		netcfg_rump_if(ifr.ifr_name, "10.1.1.10", "255.0.0.0");
+		close(channel[0]);
+		ATF_CHECK(write(channel[1], "U", 1) == 1);
+		close(channel[1]);
+		pause();
+		return;
+	default:
+		break;
+	}
+
+	netcfg_rump_if(ifr.ifr_name, "10.1.1.20", "255.0.0.0");
+
+	RL(bpfd = rump_sys_open("/dev/bpf", O_RDONLY));
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 500;
+	RL(rump_sys_ioctl(bpfd, BIOCSRTIMEOUT, &tv));
+
+	RL(rump_sys_ioctl(bpfd, BIOCGBLEN, &bufsize));
+	RL(rump_sys_ioctl(bpfd, BIOCSETF, &prog));
+	RL(rump_sys_ioctl(bpfd, BIOCSETIF, &ifr));
+
+	close(channel[1]);
+	ATF_CHECK(read(channel[0], &token, 1) == 1 && token == 'U');
+
+	pinged = pingtest("10.1.1.10", wirelen, magic_echo_reply_tail);
+	ATF_CHECK(pinged);
+
+	buf = malloc(bufsize);
+	hdr = (struct bpf_hdr *)buf;
+	ATF_REQUIRE(buf != NULL);
+	ATF_REQUIRE(bufsize > sizeof(struct bpf_hdr));
+
+	n = rump_sys_read(bpfd, buf, bufsize);
+
+	ATF_CHECK(n > (int)sizeof(struct bpf_hdr));
+	ATF_CHECK(hdr->bh_caplen == MIN(SNAPLEN, wirelen));
+
+	RL(rump_sys_ioctl(bpfd, BIOCGSTATS, &bstat));
+	ATF_CHECK(bstat.bs_capt >= 1); /* XXX == 1 */
+
+	rump_sys_close(bpfd);
+	free(buf);
+
+	close(channel[0]);
+
+	kill(child, SIGKILL);
+}
+
+static int
+send_bpf_prog(const char *ifname, struct bpf_program *prog)
+{
+	struct ifreq ifr;
+	int bpfd, e, rv;
+
+	RZ(rump_init());
+	netcfg_rump_makeshmif(ifname, ifr.ifr_name);
+	netcfg_rump_if(ifr.ifr_name, "10.1.1.20", "255.0.0.0");
+
+	RL(bpfd = rump_sys_open("/dev/bpf", O_RDONLY));
+
+	rv = rump_sys_ioctl(bpfd, BIOCSETF, prog);
+	e = errno;
+
+	rump_sys_close(bpfd);
+	errno = e;
+
+	return rv;
+}
+
+ATF_TC(bpfiltercontig);
+ATF_TC_HEAD(bpfiltercontig, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that bpf program "
+	    "can read bytes from contiguous buffer.");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+ATF_TC_BODY(bpfiltercontig, tc)
+{
+
+	magic_ping_test("bpfiltercontig", 128);
+}
+
+
+ATF_TC(bpfiltermchain);
+ATF_TC_HEAD(bpfiltermchain, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that bpf program "
+	    "can read bytes from mbuf chain.");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+ATF_TC_BODY(bpfiltermchain, tc)
+{
+
+	magic_ping_test("bpfiltermchain", MINCLSIZE + 1);
+}
+
+
+ATF_TC(bpfilterbadmem);
+ATF_TC_HEAD(bpfilterbadmem, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that bpf program that "
+	    "doesn't initialize memomy store is rejected by the kernel");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+ATF_TC_BODY(bpfilterbadmem, tc)
+{
+	struct bpf_program prog;
+
+	prog.bf_len = __arraycount(badmem_prog);
+	prog.bf_insns = badmem_prog;
+	ATF_CHECK_ERRNO(EINVAL, send_bpf_prog("bpfilterbadmem", &prog) == -1);
+}
+
+ATF_TC(bpfilternoinitA);
+ATF_TC_HEAD(bpfilternoinitA, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that bpf program that "
+	    "doesn't initialize the A register is accepted by the kernel");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+ATF_TC_BODY(bpfilternoinitA, tc)
+{
+	struct bpf_program prog;
+
+	prog.bf_len = __arraycount(noinitA_prog);
+	prog.bf_insns = noinitA_prog;
+	RL(send_bpf_prog("bpfilternoinitA", &prog));
+}
+
+ATF_TC(bpfilternoinitX);
+ATF_TC_HEAD(bpfilternoinitX, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that bpf program that "
+	    "doesn't initialize the X register is accepted by the kernel");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+ATF_TC_BODY(bpfilternoinitX, tc)
+{
+	struct bpf_program prog;
+
+	prog.bf_len = __arraycount(noinitX_prog);
+	prog.bf_insns = noinitX_prog;
+	RL(send_bpf_prog("bpfilternoinitX", &prog));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, bpfiltercontig);
+	ATF_TP_ADD_TC(tp, bpfiltermchain);
+	ATF_TP_ADD_TC(tp, bpfilterbadmem);
+	ATF_TP_ADD_TC(tp, bpfilternoinitA);
+	ATF_TP_ADD_TC(tp, bpfilternoinitX);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c b/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c
new file mode 100644
index 000000000000..a9f8f41955b1
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c
@@ -0,0 +1,3979 @@
+/*	$NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2011-2012, 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $");
+
+#include <sys/param.h>
+#include <sys/mbuf.h>
+#include <unistd.h>
+
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../net/bpf/h_bpf.h"
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+
+static uint8_t deadbeef_at_5[16] = {
+	0, 0xf1, 2, 0xf3, 4, 0xde, 0xad, 0xbe, 0xef, 0xff
+};
+
+static inline
+unsigned int jitcall(bpfjit_func_t fn,
+    const uint8_t *pkt, unsigned int wirelen, unsigned int buflen)
+{
+	bpf_args_t args;
+
+	args.pkt = pkt;
+	args.wirelen = wirelen;
+	args.buflen = buflen;
+
+	return fn(NULL, &args);
+}
+
+ATF_TC(bpfjit_empty);
+ATF_TC_HEAD(bpfjit_empty, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that JIT compilation of an empty bpf program fails");
+}
+
+ATF_TC_BODY(bpfjit_empty, tc)
+{
+	struct bpf_insn dummy;
+	bpfjit_func_t fn;
+
+	RZ(rump_init());
+
+	rump_schedule();
+	fn = rumpns_bpfjit_generate_code(NULL, &dummy, 0);
+	rump_unschedule();
+
+	ATF_CHECK(fn == NULL);
+}
+
+ATF_TC(bpfjit_alu_add_k);
+ATF_TC_HEAD(bpfjit_alu_add_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_ADD+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_add_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 5);
+}
+
+ATF_TC(bpfjit_alu_sub_k);
+ATF_TC_HEAD(bpfjit_alu_sub_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_sub_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_alu_mul_k);
+ATF_TC_HEAD(bpfjit_alu_mul_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_mul_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xfffffffd);
+}
+
+ATF_TC(bpfjit_alu_div0_k);
+ATF_TC_HEAD(bpfjit_alu_div0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_div0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	//ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0);
+}
+
+ATF_TC(bpfjit_alu_div1_k);
+ATF_TC_HEAD(bpfjit_alu_div1_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=1");
+}
+
+ATF_TC_BODY(bpfjit_alu_div1_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 7);
+}
+
+ATF_TC(bpfjit_alu_div2_k);
+ATF_TC_HEAD(bpfjit_alu_div2_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=2");
+}
+
+ATF_TC_BODY(bpfjit_alu_div2_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3);
+}
+
+ATF_TC(bpfjit_alu_div4_k);
+ATF_TC_HEAD(bpfjit_alu_div4_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=4");
+}
+
+ATF_TC_BODY(bpfjit_alu_div4_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x3fffffff);
+}
+
+ATF_TC(bpfjit_alu_div10_k);
+ATF_TC_HEAD(bpfjit_alu_div10_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=10");
+}
+
+ATF_TC_BODY(bpfjit_alu_div10_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 10),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484384);
+}
+
+ATF_TC(bpfjit_alu_div10000_k);
+ATF_TC_HEAD(bpfjit_alu_div10000_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=10000");
+}
+
+ATF_TC_BODY(bpfjit_alu_div10000_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 10000),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484);
+}
+
+ATF_TC(bpfjit_alu_div7609801_k);
+ATF_TC_HEAD(bpfjit_alu_div7609801_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=7609801");
+}
+
+ATF_TC_BODY(bpfjit_alu_div7609801_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(7609801)),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 564);
+}
+
+ATF_TC(bpfjit_alu_div80000000_k);
+ATF_TC_HEAD(bpfjit_alu_div80000000_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_K with k=0x80000000");
+}
+
+ATF_TC_BODY(bpfjit_alu_div80000000_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffde)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(0x80000000)),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1);
+}
+
+ATF_TC(bpfjit_alu_and_k);
+ATF_TC_HEAD(bpfjit_alu_and_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_AND+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_and_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_K, 0xbeef),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == (0xdead&0xbeef));
+}
+
+ATF_TC(bpfjit_alu_or_k);
+ATF_TC_HEAD(bpfjit_alu_or_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_OR+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_or_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead0000),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_K, 0x0000beef),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_lsh_k);
+ATF_TC_HEAD(bpfjit_alu_lsh_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_lsh_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 16),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xbeef0000);
+}
+
+ATF_TC(bpfjit_alu_lsh0_k);
+ATF_TC_HEAD(bpfjit_alu_lsh0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_K with k=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_lsh0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_rsh_k);
+ATF_TC_HEAD(bpfjit_alu_rsh_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_alu_rsh_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 16),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x0000dead);
+}
+
+ATF_TC(bpfjit_alu_rsh0_k);
+ATF_TC_HEAD(bpfjit_alu_rsh0_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_K with k=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_rsh0_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_modulo_k);
+ATF_TC_HEAD(bpfjit_alu_modulo_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_ALU+BPF_K operations");
+}
+
+ATF_TC_BODY(bpfjit_alu_modulo_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+
+		/* (7FFFFF77 * 0FFFFF77) = 07FFFFB2,F0004951 */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, UINT32_C(0x0fffff77)),
+
+		/* 07FFFFB2,F0004951 << 1 = 0FFFFF65,E00092A2 */
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 1),
+
+		/* 0FFFFF65,E00092A2 + DDDDDDDD = 0FFFFF66,BDDE707F */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xdddddddd)),
+
+		/* 0FFFFF66,BDDE707F - FFFFFFFF = 0FFFFF65,BDDE7080 */
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_K, UINT32_C(0xffffffff)),
+
+		/* 0FFFFF65,BDDE7080 | 0000030C = 0FFFFF65,BDDE738C */
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_K, UINT32_C(0x0000030c)),
+
+		/* -0FFFFF65,BDDE738C mod(2^64) = F000009A,42218C74 */
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+
+		/* F000009A,42218C74 & FFFFFF0F = F000009A,42218C04 */
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_K, UINT32_C(0xffffff0f)),
+
+		/* F000009A,42218C74 >> 3 = 1E000013,48443180 */
+		/* 00000000,42218C74 >> 3 = 00000000,08443180 */
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 3),
+
+		/* 00000000,08443180 * 7FFFFF77 = 042218BB,93818280 */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_K, UINT32_C(0x7fffff77)),
+
+		/* 042218BB,93818280 / DEAD = 000004C0,71CBBBC3 */
+		/* 00000000,93818280 / DEAD = 00000000,0000A994 */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, UINT32_C(0xdead)),
+
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) != UINT32_C(0x71cbbbc3));
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x0000a994));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_alu_add_x);
+ATF_TC_HEAD(bpfjit_alu_add_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_ADD+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_add_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 5);
+}
+
+ATF_TC(bpfjit_alu_sub_x);
+ATF_TC_HEAD(bpfjit_alu_sub_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_sub_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_alu_mul_x);
+ATF_TC_HEAD(bpfjit_alu_mul_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_mul_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xfffffffd);
+}
+
+ATF_TC(bpfjit_alu_div0_x);
+ATF_TC_HEAD(bpfjit_alu_div0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_div0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0);
+}
+
+ATF_TC(bpfjit_alu_div1_x);
+ATF_TC_HEAD(bpfjit_alu_div1_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=1");
+}
+
+ATF_TC_BODY(bpfjit_alu_div1_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 7);
+}
+
+ATF_TC(bpfjit_alu_div2_x);
+ATF_TC_HEAD(bpfjit_alu_div2_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=2");
+}
+
+ATF_TC_BODY(bpfjit_alu_div2_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 7),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3);
+}
+
+ATF_TC(bpfjit_alu_div4_x);
+ATF_TC_HEAD(bpfjit_alu_div4_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=4");
+}
+
+ATF_TC_BODY(bpfjit_alu_div4_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x3fffffff);
+}
+
+ATF_TC(bpfjit_alu_div10_x);
+ATF_TC_HEAD(bpfjit_alu_div10_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10");
+}
+
+ATF_TC_BODY(bpfjit_alu_div10_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484384);
+}
+
+ATF_TC(bpfjit_alu_div10000_x);
+ATF_TC_HEAD(bpfjit_alu_div10000_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10000");
+}
+
+ATF_TC_BODY(bpfjit_alu_div10000_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10000),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484);
+}
+
+ATF_TC(bpfjit_alu_div7609801_x);
+ATF_TC_HEAD(bpfjit_alu_div7609801_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=7609801");
+}
+
+ATF_TC_BODY(bpfjit_alu_div7609801_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(7609801)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 564);
+}
+
+ATF_TC(bpfjit_alu_div80000000_x);
+ATF_TC_HEAD(bpfjit_alu_div80000000_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0x80000000");
+}
+
+ATF_TC_BODY(bpfjit_alu_div80000000_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_MAX - 33),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0x80000000)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1);
+}
+
+ATF_TC(bpfjit_alu_and_x);
+ATF_TC_HEAD(bpfjit_alu_and_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_AND+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_and_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0xbeef),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == (0xdead&0xbeef));
+}
+
+ATF_TC(bpfjit_alu_or_x);
+ATF_TC_HEAD(bpfjit_alu_or_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_OR+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_or_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdead0000),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0x0000beef),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_lsh_x);
+ATF_TC_HEAD(bpfjit_alu_lsh_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_lsh_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 16),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xbeef0000);
+}
+
+ATF_TC(bpfjit_alu_lsh0_x);
+ATF_TC_HEAD(bpfjit_alu_lsh0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_LSH+BPF_X with k=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_lsh0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_rsh_x);
+ATF_TC_HEAD(bpfjit_alu_rsh_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_alu_rsh_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 16),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x0000dead);
+}
+
+ATF_TC(bpfjit_alu_rsh0_x);
+ATF_TC_HEAD(bpfjit_alu_rsh0_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_RSH+BPF_X with k=0");
+}
+
+ATF_TC_BODY(bpfjit_alu_rsh0_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 0xdeadbeef),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
+ATF_TC(bpfjit_alu_modulo_x);
+ATF_TC_HEAD(bpfjit_alu_modulo_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_ALU+BPF_X operations");
+}
+
+ATF_TC_BODY(bpfjit_alu_modulo_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+
+		/* (7FFFFF77 * 0FFFFF77) = 07FFFFB2,F0004951 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x0fffff77)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+
+		/* 07FFFFB2,F0004951 << 1 = 0FFFFF65,E00092A2 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, 1),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_X, 0),
+
+		/* 0FFFFF65,E00092A2 + DDDDDDDD = 0FFFFF66,BDDE707F */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xdddddddd)),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+
+		/* 0FFFFF66,BDDE707F - FFFFFFFF = 0FFFFF65,BDDE7080 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0),
+
+		/* 0FFFFF65,BDDE7080 | 0000030C = 0FFFFF65,BDDE738C */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x0000030c)),
+		BPF_STMT(BPF_ALU+BPF_OR+BPF_X, 0),
+
+		/* -0FFFFF65,BDDE738C mod(2^64) = F000009A,42218C74 */
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+
+		/* F000009A,42218C74 & FFFFFF0F = F000009A,42218C04 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xffffff0f)),
+		BPF_STMT(BPF_ALU+BPF_AND+BPF_X, 0),
+
+		/* F000009A,42218C74 >> 3 = 1E000013,48443180 */
+		/* 00000000,42218C74 >> 3 = 00000000,08443180 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, 3),
+		BPF_STMT(BPF_ALU+BPF_RSH+BPF_X, 0),
+
+		/* 00000000,08443180 * 7FFFFF77 = 042218BB,93818280 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0x7fffff77)),
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0),
+
+		/* 042218BB,93818280 / DEAD = 000004C0,71CBBBC3 */
+		/* 00000000,93818280 / DEAD = 00000000,0000A994 */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_K, UINT32_C(0xdead)),
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0),
+
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) != UINT32_C(0x71cbbbc3));
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == UINT32_C(0x0000a994));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_alu_neg);
+ATF_TC_HEAD(bpfjit_alu_neg, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ALU+BPF_NEG");
+}
+
+ATF_TC_BODY(bpfjit_alu_neg, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 777),
+		BPF_STMT(BPF_ALU+BPF_NEG, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0u-777u);
+}
+
+ATF_TC(bpfjit_jmp_ja);
+ATF_TC_HEAD(bpfjit_jmp_ja, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JA");
+}
+
+ATF_TC_BODY(bpfjit_jmp_ja, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_jmp_jgt_k);
+ATF_TC_HEAD(bpfjit_jmp_jgt_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGT+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jgt_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 7, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 2, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 9, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 4, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 6, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 5, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jge_k);
+ATF_TC_HEAD(bpfjit_jmp_jge_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGE+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jge_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 3, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 9, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 5, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 7, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 6, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jeq_k);
+ATF_TC_HEAD(bpfjit_jmp_jeq_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JEQ+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jeq_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 3, 1, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 9, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 5, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 7, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 6, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 7);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jset_k);
+ATF_TC_HEAD(bpfjit_jmp_jset_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JSET+BPF_K");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jset_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 8, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 4, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 3, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 2, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 1, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 2, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 7, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 5);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_modulo_k);
+ATF_TC_HEAD(bpfjit_jmp_modulo_k, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_JMP+BPF_K operations");
+}
+
+ATF_TC_BODY(bpfjit_jmp_modulo_k, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xfffff770), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xfffff770), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xfffff771), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xfffff770), 0, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xfffff770), 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xfffff771), 1, 0),
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+
+		/* FFFFF770+FFFFF770 = 00000001,FFFFEEE0 */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xfffff770)),
+
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xffffeee0), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xffffeee0), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xffffeee1), 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, UINT32_C(0xffffeee0), 0, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, UINT32_C(0xffffeee0), 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, UINT32_C(0xffffeee1), 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_jmp_jgt_x);
+ATF_TC_HEAD(bpfjit_jmp_jgt_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGT+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jgt_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jge_x);
+ATF_TC_HEAD(bpfjit_jmp_jge_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JGE+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jge_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 7);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jeq_x);
+ATF_TC_HEAD(bpfjit_jmp_jeq_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JEQ+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jeq_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 3, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 1, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 7);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 7);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 7);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_jset_x);
+ATF_TC_HEAD(bpfjit_jmp_jset_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_JMP+BPF_JSET+BPF_X");
+}
+
+ATF_TC_BODY(bpfjit_jmp_jset_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 2, 0),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 3, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 1, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 2, 3),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 4, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_X, 0, 0, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, 8)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[8]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 1);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 1);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 7);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 5);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 8);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 5);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_jmp_modulo_x);
+ATF_TC_HEAD(bpfjit_jmp_modulo_x, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of modulo logic of BPF_JMP+BPF_X operations");
+}
+
+ATF_TC_BODY(bpfjit_jmp_modulo_x, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0x7fffff77)),
+		/* FFFFF770 << 4 = FFFFF770 */
+		BPF_STMT(BPF_ALU+BPF_LSH+BPF_K, 4),
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff770)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff771)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff770)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xfffff771)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_JMP+BPF_JA, 1),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+
+		/* FFFFF770+FFFFF770 = 00000001,FFFFEEE0 */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xfffff770)),
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee0)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 5),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee1)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 6),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee0)),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 4),
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_X, 0, 3, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0xffffeee1)),
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_ld_abs);
+ATF_TC_HEAD(bpfjit_ld_abs, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(bpfjit_ld_abs, tc)
+{
+	static struct bpf_insn insns[3][2] = {
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 5),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		}
+	};
+
+	static size_t lengths[3] = { 1, 2, 4 };
+	static unsigned int expected[3] = { 0xde, 0xdead, 0xdeadbeef };
+
+	size_t i, l;
+	uint8_t *pkt = deadbeef_at_5;
+	size_t pktsize = sizeof(deadbeef_at_5);
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	RZ(rump_init());
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(prog_validate(insns[i], insn_count));
+
+		rump_schedule();
+		code = rumpns_bpfjit_generate_code(NULL, insns[i], insn_count);
+		rump_unschedule();
+		ATF_REQUIRE(code != NULL);
+
+		for (l = 1; l < 5 + lengths[i]; l++) {
+			ATF_CHECK(jitcall(code, pkt, l, l) == 0);
+			ATF_CHECK(jitcall(code, pkt, pktsize, l) == 0);
+		}
+
+		l = 5 + lengths[i];
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+		ATF_CHECK(jitcall(code, pkt, pktsize, l) == expected[i]);
+
+		l = pktsize;
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+
+		rump_schedule();
+		rumpns_bpfjit_free_code(code);
+		rump_unschedule();
+	}
+}
+
+ATF_TC(bpfjit_ld_abs_k_overflow);
+ATF_TC_HEAD(bpfjit_ld_abs_k_overflow, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_ABS with overflow in k+4");
+}
+
+ATF_TC_BODY(bpfjit_ld_abs_k_overflow, tc)
+{
+	static struct bpf_insn insns[12][3] = {
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 2),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 3),
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 2),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_ABS, UINT32_MAX - 3),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		}
+	};
+
+	int i;
+	uint8_t pkt[8] = { 0 };
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	RZ(rump_init());
+
+	for (i = 0; i < 3; i++) {
+		ATF_CHECK(prog_validate(insns[i], insn_count));
+		ATF_CHECK(exec_prog(insns[i], insn_count, pkt, 8) == 0);
+	}
+}
+
+ATF_TC(bpfjit_ld_ind);
+ATF_TC_HEAD(bpfjit_ld_ind, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(bpfjit_ld_ind, tc)
+{
+	static struct bpf_insn insns[6][3] = {
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, 2),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		},
+		{
+			BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),
+			BPF_STMT(BPF_RET+BPF_A, 0)
+		}
+	};
+
+	static size_t lengths[6] = { 1, 2, 4, 1, 2, 4 };
+
+	static unsigned int expected[6] = {
+		0xde, 0xdead, 0xdeadbeef,
+		0xde, 0xdead, 0xdeadbeef
+	};
+
+	size_t i, l;
+	uint8_t *pkt = deadbeef_at_5;
+	size_t pktsize = sizeof(deadbeef_at_5);
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	RZ(rump_init());
+
+	for (i = 0; i < 3; i++) {
+		bpfjit_func_t code;
+
+		ATF_CHECK(prog_validate(insns[i], insn_count));
+
+		rump_schedule();
+		code = rumpns_bpfjit_generate_code(NULL, insns[i], insn_count);
+		rump_unschedule();
+		ATF_REQUIRE(code != NULL);
+
+		for (l = 1; l < 5 + lengths[i]; l++) {
+			ATF_CHECK(jitcall(code, pkt, l, l) == 0);
+			ATF_CHECK(jitcall(code, pkt, pktsize, l) == 0);
+		}
+
+		l = 5 + lengths[i];
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+		ATF_CHECK(jitcall(code, pkt, pktsize, l) == expected[i]);
+
+		l = pktsize;
+		ATF_CHECK(jitcall(code, pkt, l, l) == expected[i]);
+
+		rump_schedule();
+		rumpns_bpfjit_free_code(code);
+		rump_unschedule();
+	}
+}
+
+ATF_TC(bpfjit_ld_ind_k_overflow);
+ATF_TC_HEAD(bpfjit_ld_ind_k_overflow, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in k+4");
+}
+
+ATF_TC_BODY(bpfjit_ld_ind_k_overflow, tc)
+{
+	static struct bpf_insn insns[12][3] = {
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 2),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 3),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 1),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 2),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		},
+		{
+			BPF_STMT(BPF_LD+BPF_H+BPF_IND, 7),
+			BPF_STMT(BPF_LD+BPF_W+BPF_IND, UINT32_MAX - 3),
+			BPF_STMT(BPF_RET+BPF_K, 1)
+		}
+	};
+
+	int i;
+	uint8_t pkt[8] = { 0 };
+
+	size_t insn_count = sizeof(insns[0]) / sizeof(insns[0][0]);
+
+	RZ(rump_init());
+
+	for (i = 0; i < 3; i++) {
+
+		ATF_CHECK(prog_validate(insns[i], insn_count));
+		ATF_CHECK(exec_prog(insns[i], insn_count, pkt, 8) == 0);
+	}
+}
+
+ATF_TC(bpfjit_ld_ind_x_overflow1);
+ATF_TC_HEAD(bpfjit_ld_ind_x_overflow1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in X+4");
+}
+
+ATF_TC_BODY(bpfjit_ld_ind_x_overflow1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[8] = { 10, 20, 30, 40, 50, 60, 70, 80 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++) {
+		//ATF_CHECK(bpf_filter(insns, pkt, i, i) == 10 * i);
+		ATF_CHECK(jitcall(code, pkt, i, i) == 10 * i);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_ld_ind_x_overflow2);
+ATF_TC_HEAD(bpfjit_ld_ind_x_overflow2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IND with overflow in X+4");
+}
+
+ATF_TC_BODY(bpfjit_ld_ind_x_overflow2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, UINT32_C(0xffffffff)),
+		BPF_STMT(BPF_ST, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 3),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[8] = { 10, 20, 30, 40, 50, 60, 70, 80 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++) {
+		//ATF_CHECK(bpf_filter(insns, pkt, i, i) == 10 * i);
+		ATF_CHECK(jitcall(code, pkt, i, i) == 10 * i);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_ld_len);
+ATF_TC_HEAD(bpfjit_ld_len, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_W+BPF_LEN");
+}
+
+ATF_TC_BODY(bpfjit_ld_len, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[32]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, 1) == i);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_ld_imm);
+ATF_TC_HEAD(bpfjit_ld_imm, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LD+BPF_IMM");
+}
+
+ATF_TC_BODY(bpfjit_ld_imm, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_ldx_imm1);
+ATF_TC_HEAD(bpfjit_ldx_imm1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_IMM");
+}
+
+ATF_TC_BODY(bpfjit_ldx_imm1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX - 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX - 5);
+}
+
+ATF_TC(bpfjit_ldx_imm2);
+ATF_TC_HEAD(bpfjit_ldx_imm2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_IMM");
+}
+
+ATF_TC_BODY(bpfjit_ldx_imm2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5),
+		BPF_STMT(BPF_LD+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_ldx_len1);
+ATF_TC_HEAD(bpfjit_ldx_len1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_LEN");
+}
+
+ATF_TC_BODY(bpfjit_ldx_len1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[5]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i < sizeof(pkt); i++) {
+		ATF_CHECK(jitcall(code, pkt, i, 1) == i);
+		ATF_CHECK(jitcall(code, pkt, i + 1, i) == i + 1);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_ldx_len2);
+ATF_TC_HEAD(bpfjit_ldx_len2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_LEN");
+}
+
+ATF_TC_BODY(bpfjit_ldx_len2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_LD+BPF_IMM, 5),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[5]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 5, 1) == UINT32_MAX);
+	ATF_CHECK(jitcall(code, pkt, 6, 5) == 7);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_ldx_msh);
+ATF_TC_HEAD(bpfjit_ldx_msh, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_LDX+BPF_MSH");
+}
+
+ATF_TC_BODY(bpfjit_ldx_msh, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[2] = { 0, 0x7a };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 2) == 40);
+}
+
+ATF_TC(bpfjit_misc_tax);
+ATF_TC_HEAD(bpfjit_misc_tax, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_MISC+BPF_TAX");
+}
+
+ATF_TC_BODY(bpfjit_misc_tax, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 3),
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[6] = { 0, 11, 22, 33, 44, 55 };
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 6) == 55);
+}
+
+ATF_TC(bpfjit_misc_txa);
+ATF_TC_HEAD(bpfjit_misc_txa, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_MISC+BPF_TXA");
+}
+
+ATF_TC_BODY(bpfjit_misc_txa, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 391),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 391);
+}
+
+ATF_TC(bpfjit_st1);
+ATF_TC_HEAD(bpfjit_st1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(bpfjit_st1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == i);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_st2);
+ATF_TC_HEAD(bpfjit_st2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(bpfjit_st2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0);
+}
+
+ATF_TC(bpfjit_st3);
+ATF_TC_HEAD(bpfjit_st3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(bpfjit_st3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 100),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 200),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 301, 2, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[2]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_REQUIRE(BPF_MEMWORDS > 1);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 102);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_st4);
+ATF_TC_HEAD(bpfjit_st4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(bpfjit_st4, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_ST, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 100),
+		BPF_STMT(BPF_ST, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 200),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 301, 2, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_LD+BPF_MEM, 5),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[2]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	ATF_REQUIRE(BPF_MEMWORDS > 6);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 1);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 102);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_st5);
+ATF_TC_HEAD(bpfjit_st5, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_ST");
+}
+
+ATF_TC_BODY(bpfjit_st5, tc)
+{
+	struct bpf_insn insns[5*BPF_MEMWORDS+2];
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	size_t k;
+	bpfjit_func_t code;
+	uint8_t pkt[BPF_MEMWORDS]; /* the program doesn't read any data */
+
+	memset(insns, 0, sizeof(insns));
+
+	/* for each k do M[k] = k */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*k].code   = BPF_LD+BPF_IMM;
+		insns[2*k].k      = 3*k;
+		insns[2*k+1].code = BPF_ST;
+		insns[2*k+1].k    = k;
+	}
+
+	/* load wirelen into A */
+	insns[2*BPF_MEMWORDS].code = BPF_LD+BPF_W+BPF_LEN;
+
+	/* for each k, if (A == k + 1) return M[k] */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*BPF_MEMWORDS+3*k+1].code = BPF_JMP+BPF_JEQ+BPF_K;
+		insns[2*BPF_MEMWORDS+3*k+1].k    = k+1;
+		insns[2*BPF_MEMWORDS+3*k+1].jt   = 0;
+		insns[2*BPF_MEMWORDS+3*k+1].jf   = 2;
+		insns[2*BPF_MEMWORDS+3*k+2].code = BPF_LD+BPF_MEM;
+		insns[2*BPF_MEMWORDS+3*k+2].k    = k;
+		insns[2*BPF_MEMWORDS+3*k+3].code = BPF_RET+BPF_A;
+		insns[2*BPF_MEMWORDS+3*k+3].k    = 0;
+	}
+
+	insns[5*BPF_MEMWORDS+1].code = BPF_RET+BPF_K;
+	insns[5*BPF_MEMWORDS+1].k    = UINT32_MAX;
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (k = 1; k <= sizeof(pkt); k++)
+		ATF_CHECK(jitcall(code, pkt, k, k) == 3*(k-1));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_stx1);
+ATF_TC_HEAD(bpfjit_stx1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(bpfjit_stx1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == i);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_stx2);
+ATF_TC_HEAD(bpfjit_stx2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(bpfjit_stx2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ST, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, BPF_MEMWORDS-1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0);
+}
+
+ATF_TC(bpfjit_stx3);
+ATF_TC_HEAD(bpfjit_stx3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(bpfjit_stx3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_STX, 6),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0),
+		BPF_STMT(BPF_STX, 5),
+		BPF_STMT(BPF_STX, 2),
+		BPF_STMT(BPF_STX, 3),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 3),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 6),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	size_t i;
+	bpfjit_func_t code;
+	uint8_t pkt[16]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 1; i <= sizeof(pkt); i++)
+		ATF_CHECK(jitcall(code, pkt, i, sizeof(pkt)) == 3 * i);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_stx4);
+ATF_TC_HEAD(bpfjit_stx4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation of BPF_STX");
+}
+
+ATF_TC_BODY(bpfjit_stx4, tc)
+{
+	struct bpf_insn insns[5*BPF_MEMWORDS+2];
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	size_t k;
+	bpfjit_func_t code;
+	uint8_t pkt[BPF_MEMWORDS]; /* the program doesn't read any data */
+
+	memset(insns, 0, sizeof(insns));
+
+	/* for each k do M[k] = k */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*k].code   = BPF_LDX+BPF_W+BPF_IMM;
+		insns[2*k].k      = 3*k;
+		insns[2*k+1].code = BPF_STX;
+		insns[2*k+1].k    = k;
+	}
+
+	/* load wirelen into A */
+	insns[2*BPF_MEMWORDS].code = BPF_LD+BPF_W+BPF_LEN;
+
+	/* for each k, if (A == k + 1) return M[k] */
+	for (k = 0; k < BPF_MEMWORDS; k++) {
+		insns[2*BPF_MEMWORDS+3*k+1].code = BPF_JMP+BPF_JEQ+BPF_K;
+		insns[2*BPF_MEMWORDS+3*k+1].k    = k+1;
+		insns[2*BPF_MEMWORDS+3*k+1].jt   = 0;
+		insns[2*BPF_MEMWORDS+3*k+1].jf   = 2;
+		insns[2*BPF_MEMWORDS+3*k+2].code = BPF_LD+BPF_MEM;
+		insns[2*BPF_MEMWORDS+3*k+2].k    = k;
+		insns[2*BPF_MEMWORDS+3*k+3].code = BPF_RET+BPF_A;
+		insns[2*BPF_MEMWORDS+3*k+3].k    = 0;
+	}
+
+	insns[5*BPF_MEMWORDS+1].code = BPF_RET+BPF_K;
+	insns[5*BPF_MEMWORDS+1].k    = UINT32_MAX;
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (k = 1; k <= sizeof(pkt); k++)
+		ATF_CHECK(jitcall(code, pkt, k, k) == 3*(k-1));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_abs_1);
+ATF_TC_HEAD(bpfjit_opt_ld_abs_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_abs_1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_abs_2);
+ATF_TC_HEAD(bpfjit_opt_ld_abs_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_abs_2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_abs_3);
+ATF_TC_HEAD(bpfjit_opt_ld_abs_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_ABS");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_abs_3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_ind_1);
+ATF_TC_HEAD(bpfjit_opt_ld_ind_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_ind_1, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 12),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 14),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 18),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 18),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_ind_2);
+ATF_TC_HEAD(bpfjit_opt_ld_ind_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_ind_2, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 6),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 5),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_ind_3);
+ATF_TC_HEAD(bpfjit_opt_ld_ind_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_ind_3, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 15),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 11),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 6),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 11),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 4),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_opt_ld_ind_4);
+ATF_TC_HEAD(bpfjit_opt_ld_ind_4, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test JIT compilation with length optimization "
+	    "applied to BPF_LD+BPF_IND");
+}
+
+ATF_TC_BODY(bpfjit_opt_ld_ind_4, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 11),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 19),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 3, 7),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 6),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 15),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 4),
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x800, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	size_t i, j;
+	bpfjit_func_t code;
+	uint8_t pkt[2][34] = {
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x0f,
+			0x80, 0x03, 0x70, 0x23
+		},
+		{
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0x08, 0x00,
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+			0x80, 0x03, 0x70, 0x23,
+			0x80, 0x03, 0x70, 0x0f
+		}
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	for (i = 0; i < 2; i++) {
+		for (j = 1; j < sizeof(pkt[i]); j++)
+			ATF_CHECK(jitcall(code, pkt[i], j, j) == 0);
+		ATF_CHECK(jitcall(code, pkt[i], j, j) == UINT32_MAX);
+	}
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_abc_ja);
+ATF_TC_HEAD(bpfjit_abc_ja, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization with a single BPF_JMP+BPF_JA");
+}
+
+ATF_TC_BODY(bpfjit_abc_ja, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3), /* min. length 4 */
+		BPF_STMT(BPF_JMP+BPF_JA, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, UINT32_MAX - 1),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 2), /* min. length 6 */
+		BPF_STMT(BPF_RET+BPF_A, 0),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 6),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 7),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[6] = {0, 0, /* UINT32_MAX: */ 255, 255, 255, 255};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == UINT32_MAX);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_abc_ja_over);
+ATF_TC_HEAD(bpfjit_abc_ja_over, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization when BPF_JMP+BPF_JA jumps over all loads");
+}
+
+ATF_TC_BODY(bpfjit_abc_ja_over, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_JMP+BPF_JA, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 4),
+		BPF_STMT(BPF_RET+BPF_K, 1),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+		BPF_STMT(BPF_RET+BPF_K, 2),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 6),
+		BPF_STMT(BPF_RET+BPF_K, 3),
+	};
+
+	uint8_t pkt[1]; /* the program doesn't read any data */
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+	ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX);
+}
+
+ATF_TC(bpfjit_abc_ld_chain);
+ATF_TC_HEAD(bpfjit_abc_ld_chain, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test ABC optimization of a chain of BPF_LD instructions "
+	    "with exits leading to a single BPF_RET");
+}
+
+ATF_TC_BODY(bpfjit_abc_ld_chain, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3), /* min. length 4 */
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 8, 0, 4),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 4), /* min. length 6 */
+		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 7, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 6), /* min. length 10 */
+		BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, 6, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 123456789),
+		BPF_STMT(BPF_RET+BPF_K, 987654321),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[10] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+
+	/* !(pkt[3] == 8) => return 123456789 */
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 123456789);
+
+	/* !(pkt[4:2] >= 7) => too short or return 123456789 */
+	pkt[3] = 8;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 123456789);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 123456789);
+
+	/* !(pkt[6:4] > 6) => too short or return 987654321 */
+	pkt[4] = pkt[5] = 1;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 987654321);
+
+	/* (pkt[6:4] > 6) => too short or return 123456789 */
+	pkt[6] = pkt[7] = pkt[8] = pkt[9] = 1;
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 123456789);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_examples_1);
+ATF_TC_HEAD(bpfjit_examples_1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the first example from bpf(4) - "
+	    "accept Reverse ARP requests");
+}
+
+ATF_TC_BODY(bpfjit_examples_1, tc)
+{
+	/*
+	 * The following filter is taken from the Reverse ARP
+	 * Daemon. It accepts only Reverse ARP requests.
+	 */
+	struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8035, 0, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 3, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, 42),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[22] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 0x80; pkt[13] = 0x35;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	/* Set RARP message type. */
+	pkt[21] = 3;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 42);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+
+	/* Change RARP message type. */
+	pkt[20] = 3;
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_examples_2);
+ATF_TC_HEAD(bpfjit_examples_2, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the second example from bpf(4) - "
+	    "accept IP packets between two specified hosts");
+}
+
+ATF_TC_BODY(bpfjit_examples_2, tc)
+{
+	/*
+	 * This filter accepts only IP packets between host 128.3.112.15
+	 * and 128.3.112.35.
+	 */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x0800, 0, 8),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 26),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 2),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 3, 4),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x80037023, 0, 3),
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 30),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x8003700f, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[34] = {};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+	ATF_CHECK(jitcall(code, pkt, 31, 31) == 0);
+	ATF_CHECK(jitcall(code, pkt, 32, 32) == 0);
+	ATF_CHECK(jitcall(code, pkt, 33, 33) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 8;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[26] = 128; pkt[27] = 3; pkt[28] = 112; pkt[29] = 15;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[30] = 128; pkt[31] = 3; pkt[32] = 112; pkt[33] = 35;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == UINT32_MAX);
+
+	/* Swap the ip addresses. */
+	pkt[26] = 128; pkt[27] = 3; pkt[28] = 112; pkt[29] = 35;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	pkt[30] = 128; pkt[31] = 3; pkt[32] = 112; pkt[33] = 15;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == UINT32_MAX);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+	ATF_CHECK(jitcall(code, pkt, 31, 31) == 0);
+	ATF_CHECK(jitcall(code, pkt, 32, 32) == 0);
+	ATF_CHECK(jitcall(code, pkt, 33, 33) == 0);
+
+	/* Change the protocol field. */
+	pkt[13] = 8;
+	ATF_CHECK(jitcall(code, pkt, 34, 34) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_examples_3);
+ATF_TC_HEAD(bpfjit_examples_3, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test the third example from bpf(4) - "
+	    "accept TCP finger packets");
+}
+
+ATF_TC_BODY(bpfjit_examples_3, tc)
+{
+	/*
+	 * This filter returns only TCP finger packets.
+	 */
+	struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x0800, 0, 10),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 23),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 6, 0, 8),
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
+		BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, 0x1fff, 6, 0),
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 14),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 14),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 79, 2, 0),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 16),
+		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 79, 0, 1),
+		BPF_STMT(BPF_RET+BPF_K, UINT32_MAX),
+		BPF_STMT(BPF_RET+BPF_K, 0),
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[30] = {};
+
+	/* Set IP fragment offset to non-zero. */
+	pkt[20] = 1; pkt[21] = 1;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+
+	/* The packet doesn't match. */
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Still no match after setting the protocol field. */
+	pkt[12] = 8;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Get one step closer to the match. */
+	pkt[23] = 6;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Set IP fragment offset to zero. */
+	pkt[20] = 0x20; pkt[21] = 0;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Set IP header length to 12. */
+	pkt[14] = 0xd3;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	/* Match one branch of the program. */
+	pkt[27] = 79;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == UINT32_MAX);
+
+	/* Match the other branch of the program. */
+	pkt[29] = 79; pkt[27] = 0;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == UINT32_MAX);
+
+	/* Packet is too short. */
+	ATF_CHECK(jitcall(code, pkt, 1, 1) == 0);
+	ATF_CHECK(jitcall(code, pkt, 2, 2) == 0);
+	ATF_CHECK(jitcall(code, pkt, 3, 3) == 0);
+	ATF_CHECK(jitcall(code, pkt, 4, 4) == 0);
+	ATF_CHECK(jitcall(code, pkt, 5, 5) == 0);
+	ATF_CHECK(jitcall(code, pkt, 6, 6) == 0);
+	ATF_CHECK(jitcall(code, pkt, 7, 7) == 0);
+	ATF_CHECK(jitcall(code, pkt, 8, 8) == 0);
+	ATF_CHECK(jitcall(code, pkt, 9, 9) == 0);
+	ATF_CHECK(jitcall(code, pkt, 10, 10) == 0);
+	ATF_CHECK(jitcall(code, pkt, 11, 11) == 0);
+	ATF_CHECK(jitcall(code, pkt, 12, 12) == 0);
+	ATF_CHECK(jitcall(code, pkt, 13, 13) == 0);
+	ATF_CHECK(jitcall(code, pkt, 14, 14) == 0);
+	ATF_CHECK(jitcall(code, pkt, 15, 15) == 0);
+	ATF_CHECK(jitcall(code, pkt, 16, 16) == 0);
+	ATF_CHECK(jitcall(code, pkt, 17, 17) == 0);
+	ATF_CHECK(jitcall(code, pkt, 18, 18) == 0);
+	ATF_CHECK(jitcall(code, pkt, 19, 19) == 0);
+	ATF_CHECK(jitcall(code, pkt, 20, 20) == 0);
+	ATF_CHECK(jitcall(code, pkt, 21, 21) == 0);
+	ATF_CHECK(jitcall(code, pkt, 22, 22) == 0);
+	ATF_CHECK(jitcall(code, pkt, 23, 23) == 0);
+	ATF_CHECK(jitcall(code, pkt, 24, 24) == 0);
+	ATF_CHECK(jitcall(code, pkt, 25, 25) == 0);
+	ATF_CHECK(jitcall(code, pkt, 26, 26) == 0);
+	ATF_CHECK(jitcall(code, pkt, 27, 27) == 0);
+	ATF_CHECK(jitcall(code, pkt, 28, 28) == 0);
+	ATF_CHECK(jitcall(code, pkt, 29, 29) == 0);
+
+	/* Set IP header length to 16. Packet is too short. */
+	pkt[14] = 4;
+	ATF_CHECK(jitcall(code, pkt, 30, 30) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_no_ctx);
+ATF_TC_HEAD(bpfjit_cop_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that BPF_MISC|BPF_COP "
+	    "instruction can't be accepted without a context");
+}
+
+ATF_TC_BODY(bpfjit_cop_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(!prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_copx_no_ctx);
+ATF_TC_HEAD(bpfjit_copx_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that BPF_MISC|BPF_COPX "
+	    "instruction can't be accepted without a context");
+}
+
+ATF_TC_BODY(bpfjit_copx_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(!prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../lib/libbpfjit/t_bpfjit.c
+	 */
+	ATF_TP_ADD_TC(tp, bpfjit_empty);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_add_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_sub_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_mul_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div0_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div1_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div2_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div4_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div10_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div10000_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div7609801_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div80000000_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_and_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_or_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_rsh0_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_modulo_k);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_add_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_sub_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_mul_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div0_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div1_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div2_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div4_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div10_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div10000_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div7609801_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_div80000000_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_and_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_or_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_rsh0_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_modulo_x);
+	ATF_TP_ADD_TC(tp, bpfjit_alu_neg);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_ja);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jgt_k);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jge_k);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_k);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jset_k);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_modulo_k);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jgt_x);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jge_x);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_x);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_jset_x);
+	ATF_TP_ADD_TC(tp, bpfjit_jmp_modulo_x);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_abs);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_abs_k_overflow);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_ind);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_ind_k_overflow);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_ind_x_overflow1);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_ind_x_overflow2);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_len);
+	ATF_TP_ADD_TC(tp, bpfjit_ld_imm);
+	ATF_TP_ADD_TC(tp, bpfjit_ldx_imm1);
+	ATF_TP_ADD_TC(tp, bpfjit_ldx_imm2);
+	ATF_TP_ADD_TC(tp, bpfjit_ldx_len1);
+	ATF_TP_ADD_TC(tp, bpfjit_ldx_len2);
+	ATF_TP_ADD_TC(tp, bpfjit_ldx_msh);
+	ATF_TP_ADD_TC(tp, bpfjit_misc_tax);
+	ATF_TP_ADD_TC(tp, bpfjit_misc_txa);
+	ATF_TP_ADD_TC(tp, bpfjit_st1);
+	ATF_TP_ADD_TC(tp, bpfjit_st2);
+	ATF_TP_ADD_TC(tp, bpfjit_st3);
+	ATF_TP_ADD_TC(tp, bpfjit_st4);
+	ATF_TP_ADD_TC(tp, bpfjit_st5);
+	ATF_TP_ADD_TC(tp, bpfjit_stx1);
+	ATF_TP_ADD_TC(tp, bpfjit_stx2);
+	ATF_TP_ADD_TC(tp, bpfjit_stx3);
+	ATF_TP_ADD_TC(tp, bpfjit_stx4);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_abs_1);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_abs_2);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_abs_3);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_ind_1);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_ind_2);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_ind_3);
+	ATF_TP_ADD_TC(tp, bpfjit_opt_ld_ind_4);
+	ATF_TP_ADD_TC(tp, bpfjit_abc_ja);
+	ATF_TP_ADD_TC(tp, bpfjit_abc_ja_over);
+	ATF_TP_ADD_TC(tp, bpfjit_abc_ld_chain);
+	ATF_TP_ADD_TC(tp, bpfjit_examples_1);
+	ATF_TP_ADD_TC(tp, bpfjit_examples_2);
+	ATF_TP_ADD_TC(tp, bpfjit_examples_3);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_no_ctx);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_no_ctx);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpfjit/t_cop.c b/contrib/netbsd-tests/net/bpfjit/t_cop.c
new file mode 100644
index 000000000000..5a007e6510a5
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpfjit/t_cop.c
@@ -0,0 +1,757 @@
+/*	$NetBSD: t_cop.c,v 1.3 2014/07/13 21:35:33 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_cop.c,v 1.3 2014/07/13 21:35:33 alnsn Exp $");
+
+#include <stdint.h>
+#include <string.h>
+
+#define __BPF_PRIVATE
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+#include "../../net/bpf/h_bpf.h"
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static uint32_t retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+static uint32_t setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+
+static const bpf_copfunc_t copfuncs[] = {
+	&retA,
+	&retBL,
+	&retWL,
+	&retNF,
+	&setARG
+};
+
+static const bpf_ctx_t ctx = {
+	.copfuncs = copfuncs,
+	.nfuncs = sizeof(copfuncs) / sizeof(copfuncs[0]),
+	.extwords = 0
+};
+
+static uint32_t
+retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return A;
+}
+
+static uint32_t
+retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->buflen;
+}
+
+static uint32_t
+retWL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->wirelen;
+}
+
+static uint32_t
+retNF(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return bc->nfuncs;
+}
+
+/*
+ * COP function with a side effect.
+ */
+static uint32_t
+setARG(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+	bool *arg = (bool *)args->arg;
+	bool old = *arg;
+
+	*arg = true;
+	return old;
+}
+
+ATF_TC(bpfjit_cop_no_ctx);
+ATF_TC_HEAD(bpfjit_cop_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that bpf program with BPF_COP "
+	    "instruction isn't valid without a context");
+}
+
+ATF_TC_BODY(bpfjit_cop_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(!prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_cop_ret_A);
+ATF_TC_HEAD(bpfjit_cop_ret_A, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of the A register");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_A, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retA
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_ret_buflen);
+ATF_TC_HEAD(bpfjit_cop_ret_buflen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the buflen argument");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_buflen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 1), // retBL
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_ret_wirelen);
+ATF_TC_HEAD(bpfjit_cop_ret_wirelen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the wirelen argument");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_wirelen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 2), // retWL
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_ret_nfuncs);
+ATF_TC_HEAD(bpfjit_cop_ret_nfuncs, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns nfuncs member of the context argument");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_nfuncs, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 3), // retNF
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == ctx.nfuncs);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_side_effect);
+ATF_TC_HEAD(bpfjit_cop_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that ABC optimization doesn't skip BPF_COP call");
+}
+
+ATF_TC_BODY(bpfjit_cop_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),
+		BPF_STMT(BPF_MISC+BPF_COP, 4), // setARG
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99999),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	bool arg = false;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = NULL,
+		.arg = &arg
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+	ATF_CHECK(arg == true);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_copx);
+ATF_TC_HEAD(bpfjit_cop_copx, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test BPF_COP call followed by BPF_COPX call");
+}
+
+ATF_TC_BODY(bpfjit_cop_copx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),         /* A <- 1    */
+		BPF_STMT(BPF_MISC+BPF_COP, 0),       /* retA      */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),   /* A = P[0]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),      /* retNF     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 2 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3 + ctx.nfuncs);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_invalid_index);
+ATF_TC_HEAD(bpfjit_cop_invalid_index, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that out-of-range coprocessor function fails validation");
+}
+
+ATF_TC_BODY(bpfjit_cop_invalid_index, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COP, 6), // invalid index
+		BPF_STMT(BPF_RET+BPF_K, 27)
+	};
+
+	bpfjit_func_t code;
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_copx_no_ctx);
+ATF_TC_HEAD(bpfjit_copx_no_ctx, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that bpf program with BPF_COPX "
+	    "instruction isn't valid without a context");
+}
+
+ATF_TC_BODY(bpfjit_copx_no_ctx, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_MISC+BPF_COP, 0),
+		BPF_STMT(BPF_RET+BPF_K, 7)
+	};
+
+	bpfjit_func_t code;
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	ATF_CHECK(!prog_validate(insns, insn_count));
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(NULL, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_copx_ret_A);
+ATF_TC_HEAD(bpfjit_copx_ret_A, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of the A register");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_A, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retA
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_ret_buflen);
+ATF_TC_HEAD(bpfjit_copx_ret_buflen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the buflen argument");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_buflen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 1), // retBL
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_ret_wirelen);
+ATF_TC_HEAD(bpfjit_copx_ret_wirelen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns the wirelen argument");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_wirelen, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 2), // retWL
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == sizeof(pkt));
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_ret_nfuncs);
+ATF_TC_HEAD(bpfjit_copx_ret_nfuncs, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns nfuncs member of the context argument");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_nfuncs, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LDX+BPF_IMM, 3), // retNF
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == ctx.nfuncs);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_side_effect);
+ATF_TC_HEAD(bpfjit_copx_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that ABC optimization doesn't skip BPF_COPX call");
+}
+
+ATF_TC_BODY(bpfjit_copx_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),
+		BPF_STMT(BPF_LDX+BPF_IMM, 4), // setARG
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99999),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	bool arg = false;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = NULL,
+		.arg = &arg
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+	ATF_CHECK(arg == true);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_cop);
+ATF_TC_HEAD(bpfjit_copx_cop, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test BPF_COPX call followed by BPF_COP call");
+}
+
+ATF_TC_BODY(bpfjit_copx_cop, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 2),        /* X <- 2    */
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),      /* retWL     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),   /* A = P[0]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),       /* X <- A    */
+		BPF_STMT(BPF_MISC+BPF_COP, 3),      /* retNF     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1),  /* A = A + X */
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 2 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 5 + ctx.nfuncs);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_invalid_index);
+ATF_TC_HEAD(bpfjit_copx_invalid_index, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Test that out-of-range BPF_COPX call fails at runtime");
+}
+
+ATF_TC_BODY(bpfjit_copx_invalid_index, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_IMM, 5), // invalid index
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_K, 27)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt)
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../lib/libbpfjit/t_cop.c
+	 */
+	ATF_TP_ADD_TC(tp, bpfjit_cop_no_ctx);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_A);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_buflen);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_wirelen);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_nfuncs);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_side_effect);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_copx);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_invalid_index);
+
+	ATF_TP_ADD_TC(tp, bpfjit_copx_no_ctx);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_A);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_buflen);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_wirelen);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_nfuncs);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_side_effect);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_cop);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_invalid_index);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpfjit/t_extmem.c b/contrib/netbsd-tests/net/bpfjit/t_extmem.c
new file mode 100644
index 000000000000..915c4366467e
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpfjit/t_extmem.c
@@ -0,0 +1,506 @@
+/*	$NetBSD: t_extmem.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $ */
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_extmem.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $");
+
+#include <stdint.h>
+#include <string.h>
+
+#define __BPF_PRIVATE
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+#include "../../net/bpf/h_bpf.h"
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static uint32_t retM(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
+
+static const bpf_copfunc_t copfuncs[] = {
+	&retM
+};
+
+static const bpf_ctx_t ctx = {
+	.copfuncs = copfuncs,
+	.nfuncs = sizeof(copfuncs) / sizeof(copfuncs[0]),
+	.extwords = 4,
+	.preinited = BPF_MEMWORD_INIT(0) | BPF_MEMWORD_INIT(3),
+};
+
+static uint32_t
+retM(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A)
+{
+
+	return args->mem[(uintptr_t)args->arg];
+}
+
+
+ATF_TC(bpfjit_extmem_load_preinited);
+ATF_TC_HEAD(bpfjit_extmem_load_preinited, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test a load of external "
+	    "pre-initialized memory");
+}
+
+ATF_TC_BODY(bpfjit_extmem_load_preinited, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_MEM, 3),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_extmem_invalid_load);
+ATF_TC_HEAD(bpfjit_extmem_invalid_load, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that out-of-range load "
+	    "fails validation");
+}
+
+ATF_TC_BODY(bpfjit_extmem_invalid_load, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_MEM, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_extmem_store);
+ATF_TC_HEAD(bpfjit_extmem_store, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test stores to external memory");
+}
+
+ATF_TC_BODY(bpfjit_extmem_store, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),        /* A <- 1     */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), /* X <- 2     */
+		BPF_STMT(BPF_ST, 1),                /* M[1] <- A  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X */
+		BPF_STMT(BPF_STX, 2),               /* M[2] <- X  */
+		BPF_STMT(BPF_ST, 3),                /* M[3] <- A  */
+		BPF_STMT(BPF_RET+BPF_A, 0)          /* ret A      */
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 7;
+
+	mem[1] = mem[2] = 0xdeadbeef;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+
+	ATF_CHECK(mem[0] == 0);
+	ATF_CHECK(mem[1] == 1);
+	ATF_CHECK(mem[2] == 2);
+	ATF_CHECK(mem[3] == 3);
+}
+
+ATF_TC(bpfjit_extmem_side_effect);
+ATF_TC_HEAD(bpfjit_extmem_side_effect, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that ABC optimization doesn\'t "
+	    "skip stores to external memory");
+}
+
+ATF_TC_BODY(bpfjit_extmem_side_effect, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),  /* A <- P[0]  */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), /* X <- 2     */
+		BPF_STMT(BPF_ST, 1),                /* M[1] <- A  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X */
+		BPF_STMT(BPF_STX, 2),               /* M[2] <- X  */
+		BPF_STMT(BPF_ST, 3),                /* M[3] <- A  */
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 99), /* A <- P[99] */
+		BPF_STMT(BPF_RET+BPF_A, 0)          /* ret A      */
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 1 };
+	uint32_t mem[ctx.extwords];
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 7;
+
+	mem[1] = mem[2] = 0xdeadbeef;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 0);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+
+	ATF_CHECK(mem[0] == 0);
+	ATF_CHECK(mem[1] == 1);
+	ATF_CHECK(mem[2] == 2);
+	ATF_CHECK(mem[3] == 3);
+}
+
+ATF_TC(bpfjit_extmem_invalid_store);
+ATF_TC_HEAD(bpfjit_extmem_invalid_store, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that out-of-range store "
+	    "fails validation");
+}
+
+ATF_TC_BODY(bpfjit_extmem_invalid_store, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_ST, 4),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_CHECK(code == NULL);
+}
+
+ATF_TC(bpfjit_cop_ret_mem);
+ATF_TC_HEAD(bpfjit_cop_ret_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of external memory word");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retM
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)2;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_cop_ret_preinited_mem);
+ATF_TC_HEAD(bpfjit_cop_ret_preinited_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function that "
+	    "returns a content of external pre-initialized memory word");
+}
+
+ATF_TC_BODY(bpfjit_cop_ret_preinited_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_MISC+BPF_COP, 0), // retM
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)3;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_ret_mem);
+ATF_TC_HEAD(bpfjit_copx_ret_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function "
+	    "that returns a content of external memory word");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retM
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)2;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 13);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TC(bpfjit_copx_ret_preinited_mem);
+ATF_TC_HEAD(bpfjit_copx_ret_preinited_mem, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test coprocessor function that "
+	    "returns a content of external pre-initialized memory word");
+}
+
+ATF_TC_BODY(bpfjit_copx_ret_preinited_mem, tc)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 13),
+		BPF_STMT(BPF_ST, 2),
+		BPF_STMT(BPF_LD+BPF_IMM, 137),
+		BPF_STMT(BPF_ST, 1),
+		BPF_STMT(BPF_LDX+BPF_IMM, 0), // retM
+		BPF_STMT(BPF_MISC+BPF_COPX, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0)
+	};
+
+	bpfjit_func_t code;
+	uint8_t pkt[1] = { 0 };
+	uint32_t mem[ctx.extwords];
+	void *arg = (void*)(uintptr_t)3;
+
+	/* Pre-inited words. */
+	mem[0] = 0;
+	mem[3] = 3;
+
+	bpf_args_t args = {
+		.pkt = pkt,
+		.buflen = sizeof(pkt),
+		.wirelen = sizeof(pkt),
+		.arg = arg,
+		.mem = mem,
+	};
+
+	size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	RZ(rump_init());
+
+	rump_schedule();
+	code = rumpns_bpfjit_generate_code(&ctx, insns, insn_count);
+	rump_unschedule();
+	ATF_REQUIRE(code != NULL);
+
+	ATF_CHECK(code(&ctx, &args) == 3);
+
+	rump_schedule();
+	rumpns_bpfjit_free_code(code);
+	rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../lib/libbpfjit/t_extmem.c
+	 */
+	//ATF_TP_ADD_TC(tp, bpfjit_extmem_load_default);
+	ATF_TP_ADD_TC(tp, bpfjit_extmem_load_preinited);
+	ATF_TP_ADD_TC(tp, bpfjit_extmem_invalid_load);
+	ATF_TP_ADD_TC(tp, bpfjit_extmem_store);
+	ATF_TP_ADD_TC(tp, bpfjit_extmem_side_effect);
+	ATF_TP_ADD_TC(tp, bpfjit_extmem_invalid_store);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_mem);
+	ATF_TP_ADD_TC(tp, bpfjit_cop_ret_preinited_mem);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_mem);
+	ATF_TP_ADD_TC(tp, bpfjit_copx_ret_preinited_mem);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/bpfjit/t_mbuf.c b/contrib/netbsd-tests/net/bpfjit/t_mbuf.c
new file mode 100644
index 000000000000..489ef802d9ab
--- /dev/null
+++ b/contrib/netbsd-tests/net/bpfjit/t_mbuf.c
@@ -0,0 +1,982 @@
+/*	$NetBSD: t_mbuf.c,v 1.1 2014/07/08 21:45:55 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2014 Alexander Nasonov.
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_mbuf.c,v 1.1 2014/07/08 21:45:55 alnsn Exp $");
+
+#include <sys/param.h>
+#include <sys/mbuf.h>
+
+#include <net/bpf.h>
+#include <net/bpfjit.h>
+
+#include <stdint.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../net/bpf/h_bpf.h"
+
+/* XXX: atf-c.h has collisions with mbuf */
+#undef m_type
+#undef m_data
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+static bool
+test_ldb_abs(size_t split)
+{
+	/* Return a product of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0),  /* A <- P[0]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 1),  /* A <- P[1]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 2),  /* A <- P[2]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 3),  /* A <- P[3]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A     */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 4),  /* A <- P[4]  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A      */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 120;
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldh_abs(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 0),  /* A <- P[0:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 1),  /* A <- P[1:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 2),  /* A <- P[2:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 3),  /* A <- P[3:2]  */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X   */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A        */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x0a0e; /* 10 14 */
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldw_abs(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 0),  /* A <- P[0:4] */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_MISC+BPF_TAX, 0),      /* X <- A       */
+
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 1),  /* A <- P[1:4] */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A       */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x03050709;
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldb_ind(size_t split)
+{
+	/* Return a sum of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 0),  /* A <- P[0+X] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),  /* A <- P[1+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),  /* A <- P[1+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 2),  /* A <- P[2+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A   */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1      */
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 3),  /* A <- P[3+X] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]   */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X  */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A       */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 15;
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldw_ind(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),  /* A <- P[X+0:4] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 0),  /* A <- P[X+0:4] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0), /* X <- 0        */
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),  /* A <- P[X+1:4] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A         */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x05080b0e;
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldh_ind(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 0),  /* A <- P[X+0:2] */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),  /* A <- P[X+1:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),  /* A <- P[X+1:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_ST, 0),                /* M[0] <- A     */
+
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), /* X <- 1        */
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 2),  /* A <- P[X+2:2] */
+		BPF_STMT(BPF_LDX+BPF_W+BPF_MEM, 0), /* X <- M[0]     */
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0), /* A <- A + X    */
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A         */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 0x0a0e; /* 10 14 */
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_msh(size_t split)
+{
+	/* Return a product of all packet bytes. */
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_IMM, 1),        /* A <- 1     */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 0), /* X <- 4*(P[0]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 1), /* X <- 4*(P[1]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 2), /* X <- 4*(P[2]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 3), /* X <- 4*(P[3]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 4), /* X <- 4*(P[4]&0xf)  */
+		BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), /* A <- A * X         */
+		BPF_STMT(BPF_ALU+BPF_DIV+BPF_K, 4), /* A <- A / 4         */
+
+		BPF_STMT(BPF_RET+BPF_A, 0),         /* ret A      */
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const unsigned int res = 120;
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == res;
+}
+
+static bool
+test_ldb_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 4),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_abs_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 5),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldb_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_B+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 4),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldh_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_H+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow1(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 2),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow2(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 0),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_ldw_ind_overflow3(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_MAX),
+		BPF_STMT(BPF_LD+BPF_W+BPF_IND, 1),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+static bool
+test_msh_overflow(size_t split)
+{
+	static struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LDX+BPF_B+BPF_MSH, 5),
+		BPF_STMT(BPF_MISC+BPF_TXA, 0),
+		BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, 1),
+		BPF_STMT(BPF_RET+BPF_A, 0),
+	};
+
+	static unsigned char P[] = { 1, 2, 3, 4, 5 };
+	const size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+	if (!prog_validate(insns, insn_count))
+		return false;
+
+	return exec_prog_mchain2(insns, insn_count, P, sizeof(P), split) == 0;
+}
+
+ATF_TC(bpfjit_mbuf_ldb_abs);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_ABS "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_abs(0));
+	ATF_CHECK(test_ldb_abs(1));
+	ATF_CHECK(test_ldb_abs(2));
+	ATF_CHECK(test_ldb_abs(3));
+	ATF_CHECK(test_ldb_abs(4));
+	ATF_CHECK(test_ldb_abs(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_abs);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_ABS "
+	    "loads halfwords from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_abs(0));
+	ATF_CHECK(test_ldh_abs(1));
+	ATF_CHECK(test_ldh_abs(2));
+	ATF_CHECK(test_ldh_abs(3));
+	ATF_CHECK(test_ldh_abs(4));
+	ATF_CHECK(test_ldh_abs(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_abs);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_abs, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_ABS "
+	    "loads words from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_abs, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_abs(0));
+	ATF_CHECK(test_ldw_abs(1));
+	ATF_CHECK(test_ldw_abs(2));
+	ATF_CHECK(test_ldw_abs(3));
+	ATF_CHECK(test_ldw_abs(4));
+	ATF_CHECK(test_ldw_abs(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldb_ind);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind(0));
+	ATF_CHECK(test_ldb_ind(1));
+	ATF_CHECK(test_ldb_ind(2));
+	ATF_CHECK(test_ldb_ind(3));
+	ATF_CHECK(test_ldb_ind(4));
+	ATF_CHECK(test_ldb_ind(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_ind);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "loads halfwords from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind(0));
+	ATF_CHECK(test_ldh_ind(1));
+	ATF_CHECK(test_ldh_ind(2));
+	ATF_CHECK(test_ldh_ind(3));
+	ATF_CHECK(test_ldh_ind(4));
+	ATF_CHECK(test_ldh_ind(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_ind);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_ind, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "loads words from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_ind, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind(0));
+	ATF_CHECK(test_ldw_ind(1));
+	ATF_CHECK(test_ldw_ind(2));
+	ATF_CHECK(test_ldw_ind(3));
+	ATF_CHECK(test_ldw_ind(4));
+	ATF_CHECK(test_ldw_ind(5));
+}
+
+ATF_TC(bpfjit_mbuf_msh);
+ATF_TC_HEAD(bpfjit_mbuf_msh, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LDX+BPF_B+BPF_MSH "
+	    "loads bytes from mbuf correctly");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_msh, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_msh(0));
+	ATF_CHECK(test_msh(1));
+	ATF_CHECK(test_msh(2));
+	ATF_CHECK(test_msh(3));
+	ATF_CHECK(test_msh(4));
+	ATF_CHECK(test_msh(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldb_abs_overflow);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_abs_overflow(0));
+	ATF_CHECK(test_ldb_abs_overflow(1));
+	ATF_CHECK(test_ldb_abs_overflow(2));
+	ATF_CHECK(test_ldb_abs_overflow(3));
+	ATF_CHECK(test_ldb_abs_overflow(4));
+	ATF_CHECK(test_ldb_abs_overflow(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_abs_overflow);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_abs_overflow(0));
+	ATF_CHECK(test_ldh_abs_overflow(1));
+	ATF_CHECK(test_ldh_abs_overflow(2));
+	ATF_CHECK(test_ldh_abs_overflow(3));
+	ATF_CHECK(test_ldh_abs_overflow(4));
+	ATF_CHECK(test_ldh_abs_overflow(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_abs_overflow);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_abs_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_ABS "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_abs_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_abs_overflow(0));
+	ATF_CHECK(test_ldw_abs_overflow(1));
+	ATF_CHECK(test_ldw_abs_overflow(2));
+	ATF_CHECK(test_ldw_abs_overflow(3));
+	ATF_CHECK(test_ldw_abs_overflow(4));
+	ATF_CHECK(test_ldw_abs_overflow(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldb_ind_overflow1);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow1(0));
+	ATF_CHECK(test_ldb_ind_overflow1(1));
+	ATF_CHECK(test_ldb_ind_overflow1(2));
+	ATF_CHECK(test_ldb_ind_overflow1(3));
+	ATF_CHECK(test_ldb_ind_overflow1(4));
+	ATF_CHECK(test_ldb_ind_overflow1(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldb_ind_overflow2);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow2(0));
+	ATF_CHECK(test_ldb_ind_overflow2(1));
+	ATF_CHECK(test_ldb_ind_overflow2(2));
+	ATF_CHECK(test_ldb_ind_overflow2(3));
+	ATF_CHECK(test_ldb_ind_overflow2(4));
+	ATF_CHECK(test_ldb_ind_overflow2(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldb_ind_overflow3);
+ATF_TC_HEAD(bpfjit_mbuf_ldb_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_B+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldb_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldb_ind_overflow3(0));
+	ATF_CHECK(test_ldb_ind_overflow3(1));
+	ATF_CHECK(test_ldb_ind_overflow3(2));
+	ATF_CHECK(test_ldb_ind_overflow3(3));
+	ATF_CHECK(test_ldb_ind_overflow3(4));
+	ATF_CHECK(test_ldb_ind_overflow3(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_ind_overflow1);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow1(0));
+	ATF_CHECK(test_ldh_ind_overflow1(1));
+	ATF_CHECK(test_ldh_ind_overflow1(2));
+	ATF_CHECK(test_ldh_ind_overflow1(3));
+	ATF_CHECK(test_ldh_ind_overflow1(4));
+	ATF_CHECK(test_ldh_ind_overflow1(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_ind_overflow2);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow2(0));
+	ATF_CHECK(test_ldh_ind_overflow2(1));
+	ATF_CHECK(test_ldh_ind_overflow2(2));
+	ATF_CHECK(test_ldh_ind_overflow2(3));
+	ATF_CHECK(test_ldh_ind_overflow2(4));
+	ATF_CHECK(test_ldh_ind_overflow2(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldh_ind_overflow3);
+ATF_TC_HEAD(bpfjit_mbuf_ldh_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_H+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldh_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldh_ind_overflow3(0));
+	ATF_CHECK(test_ldh_ind_overflow3(1));
+	ATF_CHECK(test_ldh_ind_overflow3(2));
+	ATF_CHECK(test_ldh_ind_overflow3(3));
+	ATF_CHECK(test_ldh_ind_overflow3(4));
+	ATF_CHECK(test_ldh_ind_overflow3(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_ind_overflow1);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_ind_overflow1, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_ind_overflow1, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow1(0));
+	ATF_CHECK(test_ldw_ind_overflow1(1));
+	ATF_CHECK(test_ldw_ind_overflow1(2));
+	ATF_CHECK(test_ldw_ind_overflow1(3));
+	ATF_CHECK(test_ldw_ind_overflow1(4));
+	ATF_CHECK(test_ldw_ind_overflow1(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_ind_overflow2);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_ind_overflow2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_ind_overflow2, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow2(0));
+	ATF_CHECK(test_ldw_ind_overflow2(1));
+	ATF_CHECK(test_ldw_ind_overflow2(2));
+	ATF_CHECK(test_ldw_ind_overflow2(3));
+	ATF_CHECK(test_ldw_ind_overflow2(4));
+	ATF_CHECK(test_ldw_ind_overflow2(5));
+}
+
+ATF_TC(bpfjit_mbuf_ldw_ind_overflow3);
+ATF_TC_HEAD(bpfjit_mbuf_ldw_ind_overflow3, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LD+BPF_W+BPF_IND "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_ldw_ind_overflow3, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_ldw_ind_overflow3(0));
+	ATF_CHECK(test_ldw_ind_overflow3(1));
+	ATF_CHECK(test_ldw_ind_overflow3(2));
+	ATF_CHECK(test_ldw_ind_overflow3(3));
+	ATF_CHECK(test_ldw_ind_overflow3(4));
+	ATF_CHECK(test_ldw_ind_overflow3(5));
+}
+
+ATF_TC(bpfjit_mbuf_msh_overflow);
+ATF_TC_HEAD(bpfjit_mbuf_msh_overflow, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that BPF_LDX+BPF_B+BPF_MSH "
+	    "with out-of-bounds index aborts a filter program");
+}
+
+ATF_TC_BODY(bpfjit_mbuf_msh_overflow, tc)
+{
+
+	RZ(rump_init());
+
+	ATF_CHECK(test_msh_overflow(0));
+	ATF_CHECK(test_msh_overflow(1));
+	ATF_CHECK(test_msh_overflow(2));
+	ATF_CHECK(test_msh_overflow(3));
+	ATF_CHECK(test_msh_overflow(4));
+	ATF_CHECK(test_msh_overflow(5));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	/*
+	 * For every new test please also add a similar test
+	 * to ../../net/bpf/t_mbuf.c
+	 */
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_abs);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_abs);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_abs);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_ind);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_ind);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_ind);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_msh);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_abs_overflow);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldb_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldh_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_ind_overflow1);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_ind_overflow2);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_ldw_ind_overflow3);
+	ATF_TP_ADD_TC(tp, bpfjit_mbuf_msh_overflow);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/carp/t_basic.c b/contrib/netbsd-tests/net/carp/t_basic.c
new file mode 100644
index 000000000000..fe2e6b5f2f66
--- /dev/null
+++ b/contrib/netbsd-tests/net/carp/t_basic.c
@@ -0,0 +1,221 @@
+/*	$NetBSD: t_basic.c,v 1.5 2011/06/26 13:13:31 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: t_basic.c,v 1.5 2011/06/26 13:13:31 christos Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip_carp.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include "../config/netconfig.c"
+#include "../../h_macros.h"
+
+static bool oknow = false;
+
+static void
+sighnd(int sig)
+{
+
+	ATF_REQUIRE_EQ(sig, SIGCHLD);
+	if (oknow)
+		return;
+
+	atf_tc_fail("child died unexpectedly");
+}
+
+ATF_TC(handover);
+ATF_TC_HEAD(handover, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that carp handover works if "
+	    "the master dies");
+}
+
+#define THEBUS "buuuuuuus,etherbus"
+
+static void
+child(bool master)
+{
+	char ifname[IFNAMSIZ];
+	struct carpreq cr;
+	struct ifreq ifr;
+	const char *carpif;
+	int s;
+
+	/* helps reading carp debug output */
+	if (master)
+		carpif = "carp0";
+	else
+		carpif = "carp1";
+
+	/*
+	 * Should use sysctl, bug debug is dabug.
+	 */
+	{
+	//extern int rumpns_carp_opts[]; /* XXX */
+	//rumpns_carp_opts[CARPCTL_LOG] = 1;
+	}
+
+
+	rump_init();
+
+	memset(&ifr, 0, sizeof(ifr));
+	strlcpy(ifr.ifr_name, carpif, sizeof(ifr.ifr_name));
+
+	RL(s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0));
+	RL(rump_sys_ioctl(s, SIOCIFCREATE, &ifr));
+
+	netcfg_rump_makeshmif(THEBUS, ifname);
+
+	if (master)
+		netcfg_rump_if(ifname, "10.1.1.1", "255.255.255.0");
+	else
+		netcfg_rump_if(ifname, "10.1.1.2", "255.255.255.0");
+
+	/* configure the carp interface */
+	ifr.ifr_data = &cr;
+	RL(rump_sys_ioctl(s, SIOCGVH, &ifr));
+
+	strlcpy(cr.carpr_carpdev, ifname, sizeof(cr.carpr_carpdev));
+	cr.carpr_vhid = 175;
+	if (master)
+		cr.carpr_advskew = 0;
+	else
+		cr.carpr_advskew = 200;
+	cr.carpr_advbase = 1;
+	strcpy((char *)cr.carpr_key, "s3cret");
+
+	RL(rump_sys_ioctl(s, SIOCSVH, &ifr));
+	netcfg_rump_if(carpif, "10.1.1.100", "255.255.255.0");
+
+	/* tassa pause()en enka muuta voi */
+	pause();
+}
+
+ATF_TC_BODY(handover, tc)
+{
+	char ifname[IFNAMSIZ];
+	pid_t mpid, cpid;
+	int i, status;
+
+	signal(SIGCHLD, sighnd);
+
+	/* fork master */
+	switch (mpid = fork()) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+		/*NOTREACHED*/
+	case 0:
+		child(true);
+		/*NOTREACHED*/
+	default:
+		break;
+	}
+
+	usleep(500000);
+
+	/* fork backup */
+	switch (cpid = fork()) {
+	case -1:
+		kill(mpid, SIGKILL);
+		atf_tc_fail_errno("fork failed");
+		/*NOTREACHED*/
+	case 0:
+		child(false);
+		/*NOTREACHED*/
+	default:
+		break;
+	}
+
+	usleep(500000);
+
+	rump_init();
+	netcfg_rump_makeshmif(THEBUS, ifname);
+	netcfg_rump_if(ifname, "10.1.1.240", "255.255.255.0");
+
+	/* check that the primary addresses are up */
+	ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.1", 1000), true);
+	ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.2", 1000), true);
+
+	/* give carp a while to croak */
+	sleep(4);
+
+	/* check that the shared IP works */
+	ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.100", 500), true);
+
+	/* KILLING SPREE */
+	oknow = true;
+	kill(mpid, SIGKILL);
+	wait(&status);
+	usleep(10000); /* just in case */
+	oknow = false;
+
+	/* check that primary is now dead */
+	ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.1", 100), false);
+
+	/* do it in installments. carp will cluck meanwhile */
+	for (i = 0; i < 5; i++) {
+		if (netcfg_rump_pingtest("10.1.1.100", 1000) == true)
+			break;
+	}
+	if (i == 5)
+		atf_tc_fail("failed to failover");
+
+	/* to kill the child */
+	oknow = true;
+	kill(cpid, SIGKILL);
+
+	/* clean & done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, handover);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/config/netconfig.c b/contrib/netbsd-tests/net/config/netconfig.c
new file mode 100644
index 000000000000..c2f9dd477896
--- /dev/null
+++ b/contrib/netbsd-tests/net/config/netconfig.c
@@ -0,0 +1,231 @@
+/*	$NetBSD: netconfig.c,v 1.8 2013/07/03 19:13:33 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: netconfig.c,v 1.8 2013/07/03 19:13:33 pooka Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
+#include <arpa/inet.h>
+
+#include <net/route.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+
+int noatf;
+
+static void __unused
+netcfg_rump_makeshmif(const char *busname, char *ifname)
+{
+	int rv, ifnum;
+
+	if ((rv = rump_pub_shmif_create(busname, &ifnum)) != 0) {
+		if (noatf)
+			err(1, "makeshmif: rump_pub_shmif_create %d", rv);
+		else
+			atf_tc_fail("makeshmif: rump_pub_shmif_create %d", rv);
+	}
+	sprintf(ifname, "shmif%d", ifnum);
+}
+
+static void __unused
+netcfg_rump_if(const char *ifname, const char *addr, const char *mask)
+{
+	struct ifaliasreq ia;
+	struct sockaddr_in *sin;
+	in_addr_t inaddr, inmask;
+	int s, rv;
+
+	s = -1;
+	if ((s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
+		if (noatf)
+			err(1, "if config socket");
+		else
+			atf_tc_fail_errno("if config socket");
+	}
+
+	inaddr = inet_addr(addr);
+	inmask = inet_addr(mask);
+
+	/* Address */
+	memset(&ia, 0, sizeof(ia));
+	strcpy(ia.ifra_name, ifname);
+	sin = (struct sockaddr_in *)&ia.ifra_addr;
+	sin->sin_family = AF_INET;
+	sin->sin_len = sizeof(struct sockaddr_in);
+	sin->sin_addr.s_addr = inaddr;
+
+	/* Netmask */
+	sin = (struct sockaddr_in *)&ia.ifra_mask;
+	sin->sin_family = AF_INET;
+	sin->sin_len = sizeof(struct sockaddr_in);
+	sin->sin_addr.s_addr = inmask;
+
+	/* Broadcast address */
+	sin = (struct sockaddr_in *)&ia.ifra_broadaddr;
+	sin->sin_family = AF_INET;
+	sin->sin_len = sizeof(struct sockaddr_in);
+	sin->sin_addr.s_addr = inaddr | ~inmask;
+
+	rv = rump_sys_ioctl(s, SIOCAIFADDR, &ia);
+	if (rv == -1) {
+		if (noatf)
+			err(1, "SIOCAIFADDR");
+		else
+			atf_tc_fail_errno("SIOCAIFADDR");
+	}
+	rump_sys_close(s);
+}
+
+static void __unused
+netcfg_rump_route(const char *dst, const char *mask, const char *gw)
+{
+	size_t len;
+	struct {
+		struct rt_msghdr m_rtm;
+		uint8_t m_space[512];
+	} m_rtmsg;
+#define rtm m_rtmsg.m_rtm
+	uint8_t *bp = m_rtmsg.m_space;
+	struct sockaddr_in sinstore;
+	int s, rv;
+
+	s = rump_sys_socket(PF_ROUTE, SOCK_RAW, 0);
+	if (s == -1) {
+		if (noatf)
+			err(1, "routing socket");
+		else
+			atf_tc_fail_errno("routing socket");
+	}
+
+	memset(&m_rtmsg, 0, sizeof(m_rtmsg));
+	rtm.rtm_type = RTM_ADD;
+	rtm.rtm_flags = RTF_UP | RTF_GATEWAY | RTF_STATIC;
+	rtm.rtm_version = RTM_VERSION;
+	rtm.rtm_seq = 2;
+	rtm.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK;
+
+	/* dst */
+	memset(&sinstore, 0, sizeof(sinstore));
+	sinstore.sin_family = AF_INET;
+	sinstore.sin_len = sizeof(sinstore);
+	sinstore.sin_addr.s_addr = inet_addr(dst);
+	memcpy(bp, &sinstore, sizeof(sinstore));
+	bp += sizeof(sinstore);
+
+	/* gw */
+	memset(&sinstore, 0, sizeof(sinstore));
+	sinstore.sin_family = AF_INET;
+	sinstore.sin_len = sizeof(sinstore);
+	sinstore.sin_addr.s_addr = inet_addr(gw);
+	memcpy(bp, &sinstore, sizeof(sinstore));
+	bp += sizeof(sinstore);
+
+	/* netmask */
+	memset(&sinstore, 0, sizeof(sinstore));
+	sinstore.sin_family = AF_INET;
+	sinstore.sin_len = sizeof(sinstore);
+	sinstore.sin_addr.s_addr = inet_addr(mask);
+	memcpy(bp, &sinstore, sizeof(sinstore));
+	bp += sizeof(sinstore);
+
+	len = bp - (uint8_t *)&m_rtmsg;
+	rtm.rtm_msglen = len;
+
+	rv = rump_sys_write(s, &m_rtmsg, len);
+	if (rv != (int)len) {
+		if (noatf)
+			err(1, "write routing message");
+		else
+			atf_tc_fail_errno("write routing message");
+	}
+	rump_sys_close(s);
+}
+
+static bool __unused
+netcfg_rump_pingtest(const char *dst, int ms_timo)
+{
+	struct timeval tv;
+	struct sockaddr_in sin;
+	struct icmp icmp;
+	socklen_t slen;
+	int s;
+	bool rv = false;
+
+	s = rump_sys_socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+	if (s == -1)
+		return false;
+	tv.tv_sec = ms_timo / 1000;
+	tv.tv_usec = 1000 * (ms_timo % 1000);
+	if (rump_sys_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
+	    &tv, sizeof(tv)) == -1)
+		goto out;
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_addr.s_addr = inet_addr(dst);
+
+	memset(&icmp, 0, sizeof(icmp));
+	icmp.icmp_type = ICMP_ECHO;
+	icmp.icmp_id = htons(37); 
+	icmp.icmp_cksum = htons(0xf7da); /* precalc */
+
+	slen = sizeof(sin);
+	if (rump_sys_sendto(s, &icmp, sizeof(icmp), 0,
+	    (struct sockaddr *)&sin, slen) == -1) {
+		goto out;
+	}
+
+	if (rump_sys_recvfrom(s, &icmp, sizeof(icmp), 0,
+	    (struct sockaddr *)&sin, &slen) == -1)
+		goto out;
+
+	rv = true;
+ out:
+	rump_sys_close(s);
+	return rv;
+}
diff --git a/contrib/netbsd-tests/net/fdpass/fdpass.c b/contrib/netbsd-tests/net/fdpass/fdpass.c
new file mode 100644
index 000000000000..17b0a1d88b14
--- /dev/null
+++ b/contrib/netbsd-tests/net/fdpass/fdpass.c
@@ -0,0 +1,231 @@
+/*	$NetBSD: fdpass.c,v 1.1 2012/08/13 11:15:05 christos Exp $	*/
+/* $OpenBSD: monitor_fdpass.c,v 1.19 2010/01/12 00:58:25 djm Exp $ */
+/*
+ * Copyright 2001 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: fdpass.c,v 1.1 2012/08/13 11:15:05 christos Exp $");
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
+
+#include <stdio.h>
+#include <errno.h>
+#include <err.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <string.h>
+
+static int debug;
+
+static int
+send_fd(int sock, int fd)
+{
+	struct msghdr msg;
+	union {
+		struct cmsghdr hdr;
+		char buf[1024];
+	} cmsgbuf;
+	struct cmsghdr *cmsg;
+	struct iovec vec;
+	char ch = '\0';
+	ssize_t n;
+	struct pollfd pfd;
+
+	if (sizeof(cmsgbuf.buf) < CMSG_SPACE(sizeof(int)))
+		errx(1, "%s: %zu < %zu, recompile", __func__, 
+		    sizeof(cmsgbuf.buf), CMSG_SPACE(sizeof(int)));
+
+	memset(&msg, 0, sizeof(msg));
+	msg.msg_control = &cmsgbuf.buf;
+	msg.msg_controllen = CMSG_SPACE(sizeof(int));
+	cmsg = CMSG_FIRSTHDR(&msg);
+	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = SCM_RIGHTS;
+	*(int *)CMSG_DATA(cmsg) = fd;
+	msg.msg_controllen = cmsg->cmsg_len;
+
+	vec.iov_base = &ch;
+	vec.iov_len = 1;
+	msg.msg_iov = &vec;
+	msg.msg_iovlen = 1;
+
+	pfd.fd = sock;
+	pfd.events = POLLOUT;
+	while ((n = sendmsg(sock, &msg, 0)) == -1 &&
+	    (errno == EAGAIN || errno == EINTR)) {
+		(void)poll(&pfd, 1, -1);
+	}
+	switch (n) {
+	case -1:
+		err(1, "%s: sendmsg(%d)", __func__, fd);
+	case 1:
+		if (debug)
+			fprintf(stderr, "%d: send fd %d\n", getpid(), fd);
+		return 0;
+	default:
+		errx(1, "%s: sendmsg: expected sent 1 got %ld",
+		    __func__, (long)n);
+	}
+}
+
+static int
+recv_fd(int sock)
+{
+	struct msghdr msg;
+	union {
+		struct cmsghdr hdr;
+		char buf[1024];
+	} cmsgbuf;
+	struct cmsghdr *cmsg;
+	struct iovec vec;
+	ssize_t n;
+	char ch;
+	int fd;
+	struct pollfd pfd;
+
+	if (sizeof(cmsgbuf.buf) < CMSG_SPACE(sizeof(int)))
+		errx(1, "%s: %zu < %zu, recompile", __func__, 
+		    sizeof(cmsgbuf.buf), CMSG_SPACE(sizeof(int)));
+
+	memset(&msg, 0, sizeof(msg));
+	vec.iov_base = &ch;
+	vec.iov_len = 1;
+	msg.msg_iov = &vec;
+	msg.msg_iovlen = 1;
+	msg.msg_control = &cmsgbuf.buf;
+	msg.msg_controllen = CMSG_SPACE(sizeof(int));
+
+	pfd.fd = sock;
+	pfd.events = POLLIN;
+	while ((n = recvmsg(sock, &msg, 0)) == -1 &&
+	    (errno == EAGAIN || errno == EINTR)) {
+		(void)poll(&pfd, 1, -1);
+	}
+	switch (n) {
+	case -1:
+		err(1, "%s: recvmsg", __func__);
+	case 1:
+		break;
+	default:
+		errx(1, "%s: recvmsg: expected received 1 got %ld",
+		    __func__, (long)n);
+	}
+
+	cmsg = CMSG_FIRSTHDR(&msg);
+	if (cmsg == NULL)
+		errx(1, "%s: no message header", __func__);
+
+	if (cmsg->cmsg_type != SCM_RIGHTS)
+		err(1, "%s: expected type %d got %d", __func__,
+		    SCM_RIGHTS, cmsg->cmsg_type);
+	fd = (*(int *)CMSG_DATA(cmsg));
+	if (debug)
+		fprintf(stderr, "%d: recv fd %d\n", getpid(), fd);
+	return fd;
+}
+
+static void usage(void) __attribute__((__noreturn__));
+
+static void
+usage(void)
+{
+	fprintf(stderr, "Usage: %s [-vd] -i <input> -o <output>\n"
+	    "\t %s [-v] -p <progname>\n", getprogname(), getprogname());
+	exit(EXIT_FAILURE);
+}
+
+int
+main(int argc, char *argv[])
+{
+	int s[2], fd, status, c, verbose;
+	char buf[1024], *prog;
+
+	prog = NULL;
+	s[0] = s[1] = -1;
+	verbose = 0;
+
+	while ((c = getopt(argc, argv, "di:o:p:")) != -1)
+		switch (c) {
+		case 'd':
+			debug++;
+			break;
+		case 'i':
+			s[0] = atoi(optarg);
+			break;
+		case 'o':
+			s[1] = atoi(optarg);
+			break;
+		case 'p':
+			prog = optarg;
+			break;
+		default:
+			usage();
+		}
+
+	if ((s[0] == -1 && s[1] != -1) || (s[0] != -1 && s[1] == -1))
+		usage();
+
+	if (s[0] == -1) {
+		if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, s) == -1)
+			err(1, "socketpair");
+	} else
+		goto recv;
+
+	switch (fork()) {
+	case -1:
+		err(1, "fork");
+	default:
+		fd = open("foo", O_RDWR|O_CREAT|O_TRUNC, 0666);
+		if (fd == -1)
+			err(1, "open");
+		send_fd(s[0], fd);
+		wait(&status);
+		return 0;
+	case 0:
+		if (prog != NULL) {
+			char i[64], o[64];
+			snprintf(i, sizeof(i), "%d", s[0]);
+			snprintf(o, sizeof(o), "%d", s[1]);
+			execlp(prog, prog, "-i", i, "-o", o, NULL);
+			err(1, "execlp");
+		}
+	recv:
+		fd = recv_fd(s[1]);
+		if (verbose) {
+			snprintf(buf, sizeof(buf), "ls -l /proc/%d/fd",
+			    getpid());
+			system(buf);
+		}
+		if (write(fd, "foo\n", 4) == -1)
+			err(1, "write");
+		close(fd);
+		return 0;
+	}
+}
diff --git a/contrib/netbsd-tests/net/fdpass/t_fdpass.sh b/contrib/netbsd-tests/net/fdpass/t_fdpass.sh
new file mode 100755
index 000000000000..4e4ac044ca1a
--- /dev/null
+++ b/contrib/netbsd-tests/net/fdpass/t_fdpass.sh
@@ -0,0 +1,99 @@
+# $NetBSD: t_fdpass.sh,v 1.2 2012/08/16 08:39:43 martin Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Christos Zoulas
+#
+# 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.
+#
+
+have32() {
+	local src="$(atf_get_srcdir)"
+	if cmp "${src}/fdpass64" "${src}/fdpass32" > /dev/null
+	then
+		# echo "no -m32 support"
+		return 1
+	else
+		return 0
+	fi
+}
+
+atf_test_case fdpass_normal
+
+fdpass_normal_head() {
+	atf_set "descr" "Test file descriptor passing (default)"
+}
+
+fdpass_normal_body() {
+	local src="$(atf_get_srcdir)"
+	atf_check "${src}/fdpass64"
+}
+
+
+atf_test_case fdpass_compat
+
+fdpass_compat_head() {
+	atf_set "descr" "Test file descriptor passing (compat)"
+}
+
+fdpass_compat_body() {
+	local src="$(atf_get_srcdir)"
+	have32 && atf_check "${src}/fdpass32"
+}
+
+
+atf_test_case fdpass_normal_compat
+
+fdpass_normal_compat_head() {
+	atf_set "descr" "Test file descriptor passing (normal->compat)"
+}
+
+fdpass_normal_compat_body() {
+	local src="$(atf_get_srcdir)"
+	have32 && atf_check "${src}/fdpass64" -p "${src}/fdpass32"
+}
+
+
+atf_test_case fdpass_compat_normal
+
+fdpass_compat_normal_head() {
+	atf_set "descr" "Test file descriptor passing (normal->compat)"
+}
+
+fdpass_compat_normal_body() {
+	local src="$(atf_get_srcdir)"
+	have32 && atf_check "${src}/fdpass32" -p "${src}/fdpass64"
+}
+
+
+atf_init_test_cases()
+{
+	atf_add_test_case fdpass_normal
+	if have32
+	then
+		atf_add_test_case fdpass_compat
+		atf_add_test_case fdpass_compat_normal
+		atf_add_test_case fdpass_normal_compat
+	fi
+}
diff --git a/contrib/netbsd-tests/net/icmp/t_forward.c b/contrib/netbsd-tests/net/icmp/t_forward.c
new file mode 100644
index 000000000000..d0c23cc96fa2
--- /dev/null
+++ b/contrib/netbsd-tests/net/icmp/t_forward.c
@@ -0,0 +1,169 @@
+/*	$NetBSD: t_forward.c,v 1.8 2012/03/18 09:46:50 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: t_forward.c,v 1.8 2012/03/18 09:46:50 jruoho Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <arpa/inet.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/icmp_var.h>
+#include <net/route.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+#include "../config/netconfig.c"
+
+/*
+ * Since our maxttl is in our private namespace, we don't need raw packet
+ * construction like traceroute(8) -- we can just use the global maxttl.
+ */
+static void
+sendttl(void)
+{
+	struct sockaddr_in sin;
+	char payload[1024];
+	char ifname[IFNAMSIZ];
+	int mib[4] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFTTL };
+	int nv;
+	int s;
+
+	netcfg_rump_makeshmif("bus1", ifname);
+	netcfg_rump_if(ifname, "1.0.0.1", "255.255.255.0");
+	netcfg_rump_route("0.0.0.0", "0.0.0.0", "1.0.0.2"); /* default router */
+
+	/* set global ttl to 1 */
+	nv = 1;
+	if (rump_sys___sysctl(mib, 4, NULL, NULL, &nv, sizeof(nv)) == -1)
+		atf_tc_fail_errno("set ttl");
+
+	s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1)
+		atf_tc_fail_errno("create send socket");
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_len = sizeof(sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(33434);
+	sin.sin_addr.s_addr = inet_addr("9.9.9.9");
+
+	/* send udp datagram with ttl == 1 */
+	if (rump_sys_sendto(s, payload, sizeof(payload), 0,
+	    (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		atf_tc_fail_errno("sendto");
+}
+
+static void
+router(void)
+{
+	int mib[4] = { CTL_NET, PF_INET, IPPROTO_ICMP,
+		    ICMPCTL_RETURNDATABYTES };
+	char ifname[IFNAMSIZ];
+	int nv;
+
+	/* set returndatabytes to 200 */
+	nv = 200;
+	if (rump_sys___sysctl(mib, 4, NULL, NULL, &nv, sizeof(nv)) == -1)
+		atf_tc_fail_errno("sysctl returndatabytes");
+
+	netcfg_rump_makeshmif("bus1", ifname);
+	netcfg_rump_if(ifname, "1.0.0.2", "255.255.255.0");
+
+	/*
+	 * Wait for parent to send us the data and for us to have
+	 * a chance to process it.
+	 */
+	sleep(1);
+	exit(0);
+}
+
+ATF_TC(returndatabytes);
+ATF_TC_HEAD(returndatabytes, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "icmp.returndatabytes with certain "
+	    "packets can cause kernel panic (PR kern/43548)");
+	atf_tc_set_md_var(tc, "timeout", "4"); /* just in case */
+}
+
+ATF_TC_BODY(returndatabytes, tc)
+{
+	pid_t cpid;
+	int status;
+
+	cpid = fork();
+	rump_init();
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		router();
+		break;
+	default:
+		sendttl();
+		if (wait(&status) == -1)
+			atf_tc_fail_errno("wait");
+		if (WIFEXITED(status)) {
+			if (WEXITSTATUS(status))
+				atf_tc_fail("child exited with status %d",
+				    WEXITSTATUS(status));
+		} else {
+			atf_tc_fail("child died");
+		}
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, returndatabytes);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/icmp/t_ping.c b/contrib/netbsd-tests/net/icmp/t_ping.c
new file mode 100644
index 000000000000..fd8067c803aa
--- /dev/null
+++ b/contrib/netbsd-tests/net/icmp/t_ping.c
@@ -0,0 +1,438 @@
+/*	$NetBSD: t_ping.c,v 1.15 2012/09/04 22:31:58 alnsn Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: t_ping.c,v 1.15 2012/09/04 22:31:58 alnsn Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <netinet/in.h>
+#include <netinet/ip_var.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../../h_macros.h"
+#include "../config/netconfig.c"
+
+ATF_TC(simpleping);
+ATF_TC_HEAD(simpleping, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that kernel responds to ping");
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(simpleping, tc)
+{
+	char ifname[IFNAMSIZ];
+	pid_t cpid;
+	bool win, win2;
+	char token;
+	int channel[2];
+
+	RL(pipe(channel));
+
+	cpid = fork();
+	rump_init();
+	netcfg_rump_makeshmif("but-can-i-buy-your-ether-bus", ifname);
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		netcfg_rump_if(ifname, "1.1.1.10", "255.255.255.0");
+		close(channel[0]);
+		ATF_CHECK(write(channel[1], "U", 1) == 1);
+		close(channel[1]);
+		pause();
+		break;
+	default:
+		break;
+	}
+
+	close(channel[1]);
+	ATF_CHECK(read(channel[0], &token, 1) == 1 && token == 'U');
+	close(channel[0]);
+
+	netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
+
+	/*
+	 * The beauty of shmif is that we don't have races here.
+	 */
+	win = netcfg_rump_pingtest("1.1.1.10", 500);
+	win2 = netcfg_rump_pingtest("1.1.1.30", 500);
+
+	kill(cpid, SIGKILL);
+
+	if (!win)
+		atf_tc_fail("ping failed");
+	if (win2)
+		atf_tc_fail("non-existent host responded");
+}
+
+ATF_TC(floodping);
+ATF_TC_HEAD(floodping, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "see how kernel responds to floodping");
+}
+
+/* why the hell isn't this available in userspace??? */
+static uint16_t
+in_cksum(void *data, size_t len)
+{
+	uint16_t *buf = data;
+	unsigned sum;
+
+	for (sum = 0; len > 1; len -= 2)
+		sum += *buf++;
+	if (len)
+		sum += *(uint8_t *)buf;
+
+	sum = (sum >> 16) + (sum & 0xffff);
+	sum += (sum >> 16);
+
+	return ~sum;
+}
+
+static int
+doping(const char *target, int loops, u_int pktsize)
+{
+	union {
+		char buf[IP_MAXPACKET - sizeof(struct ip)];
+		struct icmp i;	/* ensure proper alignment */
+	} sndbuf;
+	char recvbuf[IP_MAXPACKET];
+	struct sockaddr_in dst, pingee;
+	struct icmp *icmp;
+	socklen_t slen;
+	ssize_t n;
+	int loop, succ;
+	int x, xnon, s;
+
+	RL(s = rump_sys_socket(PF_INET, SOCK_RAW, IPPROTO_ICMP));
+	RL(x = rump_sys_fcntl(s, F_GETFL, 0));
+	xnon = x | O_NONBLOCK;
+
+	memset(&dst, 0, sizeof(dst));
+	dst.sin_len = sizeof(dst);
+	dst.sin_family = AF_INET;
+	dst.sin_addr.s_addr = inet_addr(target);
+
+	icmp = (struct icmp *)&sndbuf;
+	memset(icmp, 0, sizeof(*icmp));
+	icmp->icmp_type = ICMP_ECHO;
+	icmp->icmp_id = htons(37);
+
+	if (pktsize < sizeof(*icmp))
+		pktsize = sizeof(*icmp);
+	if (pktsize > sizeof(sndbuf.buf))
+		pktsize = sizeof(sndbuf.buf);
+
+	RL(rump_sys_setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+	    &pktsize, sizeof(pktsize)));
+	RL(rump_sys_setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+	    &pktsize, sizeof(pktsize)));
+
+	slen = sizeof(pingee);
+	succ = 0;
+	for (loop = 0; loop < loops; loop++) {
+		RL(rump_sys_fcntl(s, F_SETFL, x));
+		icmp->icmp_seq = htons(loop);
+		icmp->icmp_cksum = 0;
+		icmp->icmp_cksum = in_cksum(icmp, pktsize);
+		RL(rump_sys_sendto(s, icmp, pktsize, 0,
+		    (struct sockaddr *)&dst, sizeof(dst)));
+
+		RL(rump_sys_fcntl(s, F_SETFL, xnon));
+		while ((n = rump_sys_recvfrom(s, recvbuf, sizeof(recvbuf), 0,
+		    (struct sockaddr *)&pingee, &slen)) > 0) {
+			succ++;
+		}
+		if (n == -1 && errno == EAGAIN)
+			continue;
+		atf_tc_fail_errno("recv failed");
+	}
+
+	rump_sys_close(s);
+	return succ;
+}
+
+#define LOOPS 10000
+
+ATF_TC_BODY(floodping, tc)
+{
+	char ifname[IFNAMSIZ];
+	pid_t cpid;
+	int succ;
+
+	cpid = fork();
+	rump_init();
+	netcfg_rump_makeshmif("thank-you-driver-for-getting-me-here", ifname);
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		netcfg_rump_if(ifname, "1.1.1.10", "255.255.255.0");
+		pause();
+		break;
+	default:
+		break;
+	}
+
+	netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
+
+	succ = doping("1.1.1.10", LOOPS, 56);
+	printf("got %d/%d\n", succ, LOOPS);
+
+	kill(cpid, SIGKILL);
+}
+
+ATF_TC(floodping2);
+ATF_TC_HEAD(floodping2, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "two hosts floodpinging each other");
+}
+
+ATF_TC_BODY(floodping2, tc)
+{
+	char ifname[IFNAMSIZ];
+	pid_t cpid;
+	int succ;
+
+	cpid = fork();
+	rump_init();
+	netcfg_rump_makeshmif("floodping2", ifname);
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		netcfg_rump_if(ifname, "1.1.1.10", "255.255.255.0");
+		succ = doping("1.1.1.20", LOOPS, 56);
+		break;
+	default:
+		netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
+		succ = doping("1.1.1.10", LOOPS, 56);
+		break;
+	}
+
+	printf("got %d/%d\n", succ, LOOPS);
+}
+
+ATF_TC(pingsize);
+ATF_TC_HEAD(pingsize, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "ping with packets min <= size <= max");
+}
+
+ATF_TC_BODY(pingsize, tc)
+{
+	char ifname[IFNAMSIZ];
+	pid_t cpid;
+	int succ, i;
+
+	cpid = fork();
+	rump_init();
+	netcfg_rump_makeshmif("jippikaiee", ifname);
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		netcfg_rump_if(ifname, "1.1.1.10", "255.255.255.0");
+		pause();
+		break;
+	default:
+		break;
+	}
+
+	netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
+
+	succ = 0;
+
+	/* small sizes */
+	for (i = 0 ; i < IP_MAXPACKET - 60000; i++)
+		succ += doping("1.1.1.10", 1, i);
+
+	/* medium sizes */
+	for (i = IP_MAXPACKET - 60000; i < IP_MAXPACKET - 100; i += 1000)
+		succ += doping("1.1.1.10", 1, i);
+
+	/* big sizes */
+	for (i = IP_MAXPACKET - 100; i < IP_MAXPACKET; i += 10)
+		succ += doping("1.1.1.10", 1, i);
+
+	printf("got %d/%d\n", succ, IP_MAXPACKET);
+	kill(cpid, SIGKILL);
+}
+
+ATF_TC(ping_of_death);
+ATF_TC_HEAD(ping_of_death, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "send a \"ping of death\"");
+	atf_tc_set_md_var(tc, "timeout", "2");
+}
+
+ATF_TC_BODY(ping_of_death, tc)
+{
+	char data[1500];
+	struct sockaddr_in dst;
+	struct ip *ip;
+	struct icmp *icmp;
+	char ifname[IFNAMSIZ];
+	pid_t cpid;
+	size_t tot, frag;
+	int s, x, loop;
+
+	cpid = fork();
+	rump_init();
+	netcfg_rump_makeshmif("jippikaiee", ifname);
+
+	switch (cpid) {
+	case -1:
+		atf_tc_fail_errno("fork failed");
+	case 0:
+		/* wait until we receive a too long IP packet */
+		for (loop = 0;; loop++) {
+			uint64_t ipstat[IP_NSTATS];
+			size_t arglen;
+			int mib[4];
+
+			if (loop == 1)
+				netcfg_rump_if(ifname,
+				    "1.1.1.10", "255.255.255.0");
+
+			mib[0] = CTL_NET;
+			mib[1] = PF_INET;
+			mib[2] = IPPROTO_IP;
+			mib[3] = IPCTL_STATS;
+
+			arglen = sizeof(ipstat);
+			RL(rump_sys___sysctl(mib, 4, &ipstat, &arglen,
+			    NULL, 0));
+			if (loop == 0 && ipstat[IP_STAT_TOOLONG] != 0)
+				_exit(1);
+			if (ipstat[IP_STAT_TOOLONG])
+				break;
+			usleep(10000);
+		}
+
+		_exit(0);
+		break;
+	default:
+		break;
+	}
+
+	netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
+
+	RL(s = rump_sys_socket(PF_INET, SOCK_RAW, 0));
+	x = 1;
+	RL(rump_sys_setsockopt(s, IPPROTO_IP, IP_HDRINCL, &x, sizeof(x)));
+
+	memset(&dst, 0, sizeof(dst));
+	dst.sin_len = sizeof(dst);
+	dst.sin_family = AF_INET;
+	dst.sin_addr.s_addr = inet_addr("1.1.1.10");
+
+	/* construct packet */
+	memset(data, 0, sizeof(data));
+	ip = (struct ip *)data;
+	ip->ip_v = 4;
+	ip->ip_hl = sizeof(*ip) >> 2;
+	ip->ip_p = IPPROTO_ICMP;
+	ip->ip_ttl = IPDEFTTL;
+	ip->ip_dst = dst.sin_addr;
+	ip->ip_id = 1234;
+
+	icmp = (struct icmp *)(ip + 1);
+	icmp->icmp_type = ICMP_ECHO;
+	icmp->icmp_cksum = in_cksum(icmp, sizeof(*icmp));
+
+	for (;;) {
+		int status;
+
+		/* resolve arp before sending raw stuff */
+		netcfg_rump_pingtest("1.1.1.10", 1);
+
+		for (tot = 0;
+		    tot < 65538 - sizeof(*ip);
+		    tot += (frag - sizeof(*ip))) {
+			frag = MIN(65538 - tot, sizeof(data));
+			ip->ip_off = tot >> 3;
+			assert((size_t)ip->ip_off << 3 == tot);
+			ip->ip_len = frag;
+
+			if (frag == sizeof(data)) {
+				ip->ip_off |= IP_MF;
+			}
+
+			RL(rump_sys_sendto(s, data, frag, 0,
+			    (struct sockaddr *)&dst, sizeof(dst)));
+		}
+		if (waitpid(-1, &status, WNOHANG) > 0) {
+			if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+				break;
+			atf_tc_fail("child did not exit clean");
+		}
+			
+		usleep(10000);
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, simpleping);
+	ATF_TP_ADD_TC(tp, floodping);
+	ATF_TP_ADD_TC(tp, floodping2);
+	ATF_TP_ADD_TC(tp, pingsize);
+	ATF_TP_ADD_TC(tp, ping_of_death);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/icmp/t_ping2.sh b/contrib/netbsd-tests/net/icmp/t_ping2.sh
new file mode 100755
index 000000000000..30ff73b220e4
--- /dev/null
+++ b/contrib/netbsd-tests/net/icmp/t_ping2.sh
@@ -0,0 +1,78 @@
+#	$NetBSD: t_ping2.sh,v 1.4 2010/12/30 16:58:07 pooka Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+	atf_set "descr" "Checks that a simple ping works"
+}
+
+docfg ()
+{
+
+	sock=${1}
+	addr=${2}
+
+	atf_check -s exit:0 \
+	    env RUMP_SERVER=${sock} rump.ifconfig shmif0 create
+	atf_check -s exit:0 \
+	    env RUMP_SERVER=${sock} rump.ifconfig shmif0 linkstr bus
+	atf_check -s exit:0 \
+	    env RUMP_SERVER=${sock} rump.ifconfig shmif0 inet ${addr}
+}
+
+basic_body()
+{
+
+	atf_check -s exit:0 ${netserver} unix://commsock1
+	atf_check -s exit:0 ${netserver} unix://commsock2
+
+	docfg unix://commsock1 1.2.3.4
+	docfg unix://commsock2 1.2.3.5
+
+	atf_check -s exit:0 -o ignore \
+	    env RUMP_SERVER=unix://commsock1 rump.ping -n -c 1 1.2.3.5
+	atf_check -s exit:0 -o ignore \
+	    env RUMP_SERVER=unix://commsock2 rump.ping -n -c 1 1.2.3.5
+}
+
+basic_cleanup()
+{
+
+	env RUMP_SERVER=unix://commsock1 rump.halt
+	env RUMP_SERVER=unix://commsock2 rump.halt
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/net/if/t_compat.c b/contrib/netbsd-tests/net/if/t_compat.c
new file mode 100644
index 000000000000..4798034fa2cc
--- /dev/null
+++ b/contrib/netbsd-tests/net/if/t_compat.c
@@ -0,0 +1,83 @@
+/*	$NetBSD: t_compat.c,v 1.1 2010/11/07 19:53:42 pooka Exp $	*/
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "../config/netconfig.c"
+
+/*
+ * Test for stack smashing in compat ioctl handling.  Adapted as an
+ * atf test from code provided by Onno van der Linden in PR kern/44054
+ */
+
+struct oifreq {
+        char    ifr_name[IFNAMSIZ];             /* if name, e.g. "en0" */
+        union {
+                struct  sockaddr ifru_addr;
+                struct  sockaddr ifru_dstaddr;
+                struct  sockaddr ifru_broadaddr;
+                short   ifru_flags;  
+                int     ifru_metric;
+                int     ifru_mtu; 
+                int     ifru_dlt;
+                u_int   ifru_value;
+                void *  ifru_data;
+                struct {
+                        uint32_t        b_buflen;
+                        void            *b_buf;
+                } ifru_b;
+        } ifr_ifru;
+};      
+#define OOSIOCGIFBRDADDR _IOWR('i', 18, struct oifreq)
+
+ATF_TC(OOSIOCGIFBRDADDR);
+ATF_TC_HEAD(OOSIOCGIFBRDADDR, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks that OOSIOCGIFBRDADDR works "
+	    "(PR kern/44054)");
+}
+
+ATF_TC_BODY(OOSIOCGIFBRDADDR, tc)
+{
+        int fd, ifnum;
+        struct oifreq ifreq;
+        struct sockaddr_in *sin;
+	int rv;
+
+        memset(&ifreq,'\0',sizeof ifreq);
+
+	rump_init();
+
+	/* create an interface and give it netmask 0xffff0000 */
+	rv = rump_pub_shmif_create("bus", &ifnum);
+	if (rv)
+		atf_tc_fail("failed to create shmif: %s", strerror(rv));
+	sprintf(ifreq.ifr_name, "shmif%d", ifnum);
+	netcfg_rump_if(ifreq.ifr_name, "1.7.64.10", "255.255.0.0");
+
+	/* query kernel for iface bcast */
+        RL(fd = rump_sys_socket(AF_INET, SOCK_DGRAM, 0));
+        RL(rump_sys_ioctl(fd, OOSIOCGIFBRDADDR, &ifreq));
+
+	/* make sure we got what we deserve */
+        sin = (struct sockaddr_in *)&ifreq.ifr_broadaddr;
+	ATF_REQUIRE_EQ(sin->sin_addr.s_addr, htonl(0x0107ffff));
+        rump_sys_close(fd);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, OOSIOCGIFBRDADDR);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/if_bridge/t_bridge.sh b/contrib/netbsd-tests/net/if_bridge/t_bridge.sh
new file mode 100755
index 000000000000..5fbafc7fb36a
--- /dev/null
+++ b/contrib/netbsd-tests/net/if_bridge/t_bridge.sh
@@ -0,0 +1,312 @@
+#! /usr/bin/atf-sh
+#	$NetBSD: t_bridge.sh,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_bridge -lrumpnet_shmif"
+inet6server="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_bridge -lrumpnet_shmif"
+
+SOCK1=unix://commsock1
+SOCK2=unix://commsock2
+SOCK3=unix://commsock3
+IP1=10.0.0.1
+IP2=10.0.0.2
+IP61=fc00::1
+IP62=fc00::2
+
+atf_test_case basic cleanup
+atf_test_case basic6 cleanup
+
+basic_head()
+{
+	atf_set "descr" "Does simple if_bridge tests"
+	atf_set "require.progs" "rump_server"
+}
+
+basic6_head()
+{
+	atf_set "descr" "Does simple if_bridge tests (IPv6)"
+	atf_set "require.progs" "rump_server"
+}
+
+setup_endpoint()
+{
+	sock=${1}
+	addr=${2}
+	bus=${3}
+	mode=${4}
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+	if [ $mode = "ipv6" ]; then
+		atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${addr}
+	else
+		atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xffffff00
+	fi
+
+	atf_check -s exit:0 rump.ifconfig shmif0 up
+	rump.ifconfig shmif0
+}
+
+test_endpoint()
+{
+	sock=${1}
+	addr=${2}
+	bus=${3}
+	mode=${4}
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	if [ $mode = "ipv6" ]; then
+		export LD_PRELOAD=/usr/lib/librumphijack.so
+		atf_check -s exit:0 -o ignore ping6 -n -c 1 ${addr}
+		unset LD_PRELOAD
+	else
+		atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 ${addr}
+	fi
+}
+
+show_endpoint()
+{
+	sock=${1}
+
+	export RUMP_SERVER=${sock}
+	rump.ifconfig -v shmif0
+}
+
+test_setup()
+{
+	test_endpoint $SOCK1 $IP1 bus1 ipv4
+	test_endpoint $SOCK3 $IP2 bus2 ipv4
+
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	atf_check -s exit:0 -o match:shmif1 rump.ifconfig
+}
+
+test_setup6()
+{
+	test_endpoint $SOCK1 $IP61 bus1 ipv6
+	test_endpoint $SOCK3 $IP62 bus2 ipv6
+
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	atf_check -s exit:0 -o match:shmif1 rump.ifconfig
+}
+
+setup_bridge_server()
+{
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+	atf_check -s exit:0 rump.ifconfig shmif0 up
+
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr bus2
+	atf_check -s exit:0 rump.ifconfig shmif1 up
+}
+
+setup()
+{
+	atf_check -s exit:0 ${inetserver} $SOCK1
+	atf_check -s exit:0 ${inetserver} $SOCK2
+	atf_check -s exit:0 ${inetserver} $SOCK3
+
+	setup_endpoint $SOCK1 $IP1 bus1 ipv4
+	setup_endpoint $SOCK3 $IP2 bus2 ipv4
+	setup_bridge_server
+}
+
+setup6()
+{
+	atf_check -s exit:0 ${inet6server} $SOCK1
+	atf_check -s exit:0 ${inet6server} $SOCK2
+	atf_check -s exit:0 ${inet6server} $SOCK3
+
+	setup_endpoint $SOCK1 $IP61 bus1 ipv6
+	setup_endpoint $SOCK3 $IP62 bus2 ipv6
+	setup_bridge_server
+}
+
+setup_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 rump.ifconfig bridge0 create
+	atf_check -s exit:0 rump.ifconfig bridge0 up
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 /sbin/brconfig bridge0 add shmif0
+	atf_check -s exit:0 /sbin/brconfig bridge0 add shmif1
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+	rump.ifconfig shmif0
+	rump.ifconfig shmif1
+}
+
+teardown_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	/sbin/brconfig bridge0
+	atf_check -s exit:0 /sbin/brconfig bridge0 delete shmif0
+	atf_check -s exit:0 /sbin/brconfig bridge0 delete shmif1
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+	rump.ifconfig shmif0
+	rump.ifconfig shmif1
+}
+
+test_setup_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o match:shmif0 /sbin/brconfig bridge0
+	atf_check -s exit:0 -o match:shmif1 /sbin/brconfig bridge0
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+}
+
+cleanup()
+{
+	env RUMP_SERVER=$SOCK1 rump.halt
+	env RUMP_SERVER=$SOCK2 rump.halt
+	env RUMP_SERVER=$SOCK3 rump.halt
+}
+
+dump_bus()
+{
+	/usr/bin/shmif_dumpbus -p - bus1 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+	/usr/bin/shmif_dumpbus -p - bus2 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+}
+
+down_up_interfaces()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig shmif0 down
+	rump.ifconfig shmif0 up
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig shmif0 down
+	rump.ifconfig shmif0 up
+}
+
+test_ping_failure()
+{
+	export RUMP_SERVER=$SOCK1
+	atf_check -s not-exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP2
+	export RUMP_SERVER=$SOCK3
+	atf_check -s not-exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP1
+}
+
+test_ping_success()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig -v shmif0
+	atf_check -s exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP2
+	rump.ifconfig -v shmif0
+
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig -v shmif0
+	atf_check -s exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP1
+	rump.ifconfig -v shmif0
+}
+
+test_ping6_failure()
+{
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	export RUMP_SERVER=$SOCK1
+	atf_check -s not-exit:0 -o ignore ping6 -q -n -c 1 $IP62
+	export RUMP_SERVER=$SOCK3
+	atf_check -s not-exit:0 -o ignore ping6 -q -n -c 1 $IP61
+	unset LD_PRELOAD
+}
+
+test_ping6_success()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig -v shmif0
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o ignore ping6 -q -n -c 1 $IP62
+	unset LD_PRELOAD
+	rump.ifconfig -v shmif0
+
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig -v shmif0
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o ignore ping6 -q -n -c 1 $IP61
+	unset LD_PRELOAD
+	rump.ifconfig -v shmif0
+}
+
+basic_body()
+{
+	setup
+	test_setup
+
+	setup_bridge
+	test_setup_bridge
+
+	test_ping_success
+
+	teardown_bridge
+	test_ping_failure
+}
+
+basic6_body()
+{
+	setup6
+	test_setup6
+
+	# TODO: enable once ping6 implements timeout feature
+	#test_ping6_failure
+
+	setup_bridge
+	test_setup_bridge
+
+	test_ping6_success
+
+	teardown_bridge
+	# TODO: enable once ping6 implements timeout feature
+	#test_ping6_failure
+}
+
+basic_cleanup()
+{
+	dump_bus
+	cleanup
+}
+
+basic6_cleanup()
+{
+	dump_bus
+	cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case basic6
+}
diff --git a/contrib/netbsd-tests/net/if_loop/t_pr.c b/contrib/netbsd-tests/net/if_loop/t_pr.c
new file mode 100644
index 000000000000..a22953f933b2
--- /dev/null
+++ b/contrib/netbsd-tests/net/if_loop/t_pr.c
@@ -0,0 +1,229 @@
+/*	$NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+
+#include <netinet/in.h>
+#include <net/route.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../config/netconfig.c"
+#include "../../h_macros.h"
+
+/*
+ * Prepare rump, configure interface and route to cause fragmentation
+ */
+static void
+setup(void)
+{
+	char ifname[IFNAMSIZ];
+	struct {
+		struct rt_msghdr m_rtm;
+		struct sockaddr_in m_sin;
+	} m_rtmsg;
+#define rtm m_rtmsg.m_rtm
+#define rsin m_rtmsg.m_sin
+	struct ifreq ifr;
+	int s;
+
+	rump_init();
+
+	/* first, config lo0 & route */
+	strcpy(ifname, "lo0");
+	netcfg_rump_if(ifname, "127.0.0.1", "255.0.0.0");
+	netcfg_rump_route("127.0.0.1", "255.0.0.0", "127.0.0.1");
+
+	if ((s = rump_sys_socket(PF_ROUTE, SOCK_RAW, 0)) == -1)
+		atf_tc_fail_errno("routing socket");
+
+	/*
+	 * set MTU for interface so that route MTU doesn't
+	 * get overridden by it.
+	 */
+	memset(&ifr, 0, sizeof(ifr));
+	strcpy(ifr.ifr_name, "lo0");
+	ifr.ifr_mtu = 1300;
+	if (rump_sys_ioctl(s, SIOCSIFMTU, &ifr) == -1)
+		atf_tc_fail_errno("set mtu");
+
+	/* change route MTU to 100 */
+	memset(&m_rtmsg, 0, sizeof(m_rtmsg));
+	rtm.rtm_type = RTM_CHANGE;
+	rtm.rtm_flags = RTF_STATIC;
+	rtm.rtm_version = RTM_VERSION;
+	rtm.rtm_seq = 3;
+	rtm.rtm_inits = RTV_MTU;
+	rtm.rtm_addrs = RTA_DST;
+	rtm.rtm_rmx.rmx_mtu = 100;
+	rtm.rtm_msglen = sizeof(m_rtmsg);
+
+	memset(&rsin, 0, sizeof(rsin));
+	rsin.sin_family = AF_INET;
+	rsin.sin_len = sizeof(rsin);
+	rsin.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	if (rump_sys_write(s, &m_rtmsg, sizeof(m_rtmsg)) != sizeof(m_rtmsg))
+		atf_tc_fail_errno("set route mtu");
+	rump_sys_close(s);
+}
+
+/*
+ * Turn on checksums on loopback interfaces
+ */
+static int
+enable_locsums(void)
+{
+	struct sysctlnode q, ans[256];
+	int mib[5], enable;
+	size_t alen;
+	unsigned i;
+
+	mib[0] = CTL_NET;
+	mib[1] = PF_INET;
+	mib[2] = IPPROTO_IP;
+	mib[3] = CTL_QUERY;
+	alen = sizeof(ans);
+
+	memset(&q, 0, sizeof(q));
+	q.sysctl_flags = SYSCTL_VERSION;
+
+	if (rump_sys___sysctl(mib, 4, ans, &alen, &q, sizeof(q)) == -1)
+		return -1;
+
+	for (i = 0; i < __arraycount(ans); i++)
+		if (strcmp("do_loopback_cksum", ans[i].sysctl_name) == 0)
+			break;
+	if (i == __arraycount(ans)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	mib[3] = ans[i].sysctl_num;
+
+	enable = 1;
+	if (rump_sys___sysctl(mib, 4, NULL, NULL, &enable,
+	    sizeof(enable)) == -1)
+		return errno;
+
+	return 0;
+}
+
+ATF_TC(loopmtu);
+ATF_TC_HEAD(loopmtu, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "test lo0 fragmentation (PR kern/43664)");
+}
+
+ATF_TC_BODY(loopmtu, tc)
+{
+	struct sockaddr_in sin;
+	char data[2000];
+	int s;
+
+	setup();
+
+	/* open raw socket */
+	s = rump_sys_socket(PF_INET, SOCK_RAW, 0);
+	if (s == -1)
+		atf_tc_fail_errno("raw socket");
+
+	/* then, send data */
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_len = sizeof(sin);
+	sin.sin_port = htons(12345);
+	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	if (rump_sys_sendto(s, data, sizeof(data), 0,
+	    (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		atf_tc_fail_errno("sendto failed");
+}
+
+ATF_TC(loopmtu_csum);
+ATF_TC_HEAD(loopmtu_csum, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr",
+	    "test lo0 fragmentation with checksums (PR kern/43664)");
+}
+
+ATF_TC_BODY(loopmtu_csum, tc)
+{
+	struct sockaddr_in sin;
+	char data[2000];
+	int s;
+
+	setup();
+
+	ATF_CHECK(enable_locsums() == 0);
+
+	/* open raw socket */
+	s = rump_sys_socket(PF_INET, SOCK_RAW, 0);
+	if (s == -1)
+		atf_tc_fail_errno("raw socket");
+
+	/* then, send data */
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_len = sizeof(sin);
+	sin.sin_port = htons(12345);
+	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	if (rump_sys_sendto(s, data, sizeof(data), 0,
+	    (struct sockaddr *)&sin, sizeof(sin)) == -1)
+		atf_tc_fail_errno("sendto failed");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, loopmtu);
+	ATF_TP_ADD_TC(tp, loopmtu_csum);
+
+	return atf_no_error();
+}
+
diff --git a/contrib/netbsd-tests/net/mpls/t_ldp_regen.sh b/contrib/netbsd-tests/net/mpls/t_ldp_regen.sh
new file mode 100755
index 000000000000..65fc29f79080
--- /dev/null
+++ b/contrib/netbsd-tests/net/mpls/t_ldp_regen.sh
@@ -0,0 +1,178 @@
+# $NetBSD: t_ldp_regen.sh,v 1.4 2014/09/01 06:38:35 gson Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# IP/MPLS & LDP label reallocation test
+# Create 4 routers connected like this: R1--R2--R3--R4--
+# The goal is to push packets from R1 to the R4 shmif1 (the right one) interface
+# Enable MPLS forwarding on R2
+# Disable IP forwarding and enable MPLS forwarding on R3
+# Start ldpd and wait for adjancencies to come up
+# Add an alias on shmif1 on R4 for which we already have a route on R3
+# Now: * R4 should install label IMPLNULL for that prefix
+#      * R3 should realloc the target label from IMPLNULL to something else
+
+
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+RUMP_SERVER3=unix://./r3
+RUMP_SERVER4=unix://./r4
+
+RUMP_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
+LDP_FLAGS=""
+
+atf_test_case ldp_regen cleanup
+ldp_regen_head() {
+
+	atf_set "descr" "IP/MPLS and LDP label regeneration test"
+	atf_set "require.progs" "rump_server"
+	atf_set "use.fs" "true"
+}
+
+newaddr_and_ping() {
+
+	# Add new address on R4
+	RUMP_SERVER=${RUMP_SERVER4} atf_check -s exit:0 \
+		rump.ifconfig shmif1 10.0.5.1/24 alias
+
+	# Now ldpd on R5 should take notice of the new route and announce it
+	# to R4's ldpd. ldpd on R4 should verify that the next hop
+	# corresponds to its routing table and change its tag entry
+	RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
+		rump.ping -n -o -w 5 10.0.5.1
+}
+
+create_servers() {
+
+	# allows us to run as normal user
+	ulimit -r 400
+
+	atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER1}
+	atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER2}
+	atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER3}
+	atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER4}
+
+	# LDP HIJACK
+	export RUMPHIJACK=path=/rump,socket=all,sysctl=yes
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+
+	# Setup first server
+	export RUMP_SERVER=${RUMP_SERVER1}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.4.0/24 10.0.1.2
+	atf_check -s exit:0 rump.route -q add 10.0.5.0/24 10.0.1.2
+	atf_check -s exit:0 /usr/sbin/ldpd ${LDP_FLAGS}
+
+	# Setup second server
+	export RUMP_SERVER=${RUMP_SERVER2}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	# This one should still do ip forwarding because it announces IMPLNULL
+	# for the 10.0.1.0/24 subnet
+	atf_check -s exit:0 rump.route -q add 10.0.4.0/24 10.0.2.2
+	atf_check -s exit:0 rump.route -q add 10.0.5.0/24 10.0.2.2
+	atf_check -s exit:0 /usr/sbin/ldpd ${LDP_FLAGS}
+
+	# Setup third server
+	export RUMP_SERVER=${RUMP_SERVER3}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.1.0/24 10.0.2.1
+	atf_check -s exit:0 rump.route -q add 10.0.4.0/24 10.0.3.2
+	atf_check -s exit:0 rump.route -q add 10.0.5.0/24 10.0.3.2
+	atf_check -s exit:0 /usr/sbin/ldpd ${LDP_FLAGS}
+
+	# Setup fourth server
+	export RUMP_SERVER=${RUMP_SERVER4}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom4
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.route -q add 10.0.1.0/24 10.0.3.1
+	atf_check -s exit:0 /usr/sbin/ldpd ${LDP_FLAGS}
+
+	unset RUMP_SERVER
+	unset LD_PRELOAD
+	unset RUMPHIJACK
+}
+
+wait_ldp_ok() {
+
+	RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
+		rump.ping -o -w 60 10.0.4.1
+}
+
+docleanup() {
+
+	RUMP_SERVER=${RUMP_SERVER1} rump.halt
+	RUMP_SERVER=${RUMP_SERVER2} rump.halt
+	RUMP_SERVER=${RUMP_SERVER3} rump.halt
+	RUMP_SERVER=${RUMP_SERVER4} rump.halt
+}
+
+ldp_regen_body() {
+
+        if sysctl machdep.cpu_brand | grep QEMU >/dev/null 2>&1
+	then
+	    atf_skip "unreliable under qemu, skip until PR kern/43997 fixed"
+	fi
+	create_servers
+	wait_ldp_ok
+	newaddr_and_ping
+}
+
+ldp_regen_cleanup() {
+
+	docleanup
+}
+
+atf_init_test_cases() {
+
+	atf_add_test_case ldp_regen
+}
diff --git a/contrib/netbsd-tests/net/mpls/t_mpls_fw.sh b/contrib/netbsd-tests/net/mpls/t_mpls_fw.sh
new file mode 100755
index 000000000000..ddd42dff83c2
--- /dev/null
+++ b/contrib/netbsd-tests/net/mpls/t_mpls_fw.sh
@@ -0,0 +1,188 @@
+# $NetBSD: t_mpls_fw.sh,v 1.4 2014/03/18 18:20:44 riastradh Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# TEST MPLS encap/decap and forwarding using INET as encapsulated protocol
+# Setup four routers connected like this: R1---R2---R3---R4--
+# Goal is to be able to ping from R1 the outermost interface of R4
+# Disable net.inet.ip.forwarding, enable net.mpls.forwarding
+# Add route on R1 in order to encapsulate into MPLS the IP packets with
+#     destination equal to R4 right hand side interface
+# Add MPLS routes on R2 in order to forward frames belonging to that FEC to R3
+# Add MPLS "POP" route on R3 for that FEC, pointing to R4
+# Do the same for the reverse direction (R4 to R1)
+# ping from R1 to R4 right hand side interface
+
+
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+RUMP_SERVER3=unix://./r3
+RUMP_SERVER4=unix://./r4
+
+RUMP_FLAGS=\
+"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif"
+
+atf_test_case mplsfw4 cleanup
+mplsfw4_head()
+{
+
+	atf_set "descr" "IP/MPLS forwarding test using PHP"
+	atf_set "require.progs" "rump_server"
+}
+
+startservers()
+{
+
+	ulimit -r 300
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER1}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER2}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER3}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER4}
+}
+
+configservers()
+{
+
+	# Setup the first server
+	export RUMP_SERVER=${RUMP_SERVER1}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.4.0/24 -ifa 10.0.1.1 \
+	    -ifp mpls0 -tag 25 -inet 10.0.1.2
+
+	# Setup the second server
+	export RUMP_SERVER=${RUMP_SERVER2}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add -mpls 25 -tag 30 -inet 10.0.2.2
+	atf_check -s exit:0 rump.route -q add -mpls 27 -tag ${1} -inet 10.0.1.1
+
+	# Setup the third server
+	export RUMP_SERVER=${RUMP_SERVER3}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add -mpls 30 -tag ${1} -inet 10.0.3.2
+	atf_check -s exit:0 rump.route -q add -mpls 26 -tag 27 -inet 10.0.2.1
+
+	# Setup the fourth server
+	export RUMP_SERVER=${RUMP_SERVER4}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom4
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.1.0/24 -ifa 10.0.3.2 \
+	    -ifp mpls0 -tag 26 -inet 10.0.3.1
+
+	unset RUMP_SERVER
+}
+
+doping()
+{
+
+	export RUMP_SERVER=${RUMP_SERVER1}
+	atf_check -s exit:0 -o match:"64 bytes from 10.0.4.1: icmp_seq=" \
+	    rump.ping -n -o -w 5 10.0.4.1
+	unset RUMP_SERVER
+}
+
+docleanup()
+{
+
+	RUMP_SERVER=${RUMP_SERVER1} rump.halt
+	RUMP_SERVER=${RUMP_SERVER2} rump.halt
+	RUMP_SERVER=${RUMP_SERVER3} rump.halt
+	RUMP_SERVER=${RUMP_SERVER4} rump.halt
+}
+
+mplsfw4_body()
+{
+
+	startservers
+	configservers 3
+	doping
+}
+
+mplsfw4_cleanup()
+{
+
+	docleanup
+}
+
+
+atf_test_case mplsfw4_expl cleanup
+mplsfw4_expl_head()
+{
+
+	atf_set "descr" "IP/MPLS forwarding test using explicit NULL labels"
+	atf_set "require.progs" "rump_server"
+}
+
+mplsfw4_expl_body()
+{
+
+	startservers
+	configservers 0
+	doping
+}
+
+mplsfw4_expl_cleanup()
+{
+
+	docleanup
+}
+
+
+atf_init_test_cases()
+{ 
+
+	atf_add_test_case mplsfw4
+	atf_add_test_case mplsfw4_expl
+} 
diff --git a/contrib/netbsd-tests/net/mpls/t_rfc4182.sh b/contrib/netbsd-tests/net/mpls/t_rfc4182.sh
new file mode 100755
index 000000000000..8c166f924504
--- /dev/null
+++ b/contrib/netbsd-tests/net/mpls/t_rfc4182.sh
@@ -0,0 +1,165 @@
+# $NetBSD: t_rfc4182.sh,v 1.3 2014/03/18 18:20:44 riastradh Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# TEST RFC 4182
+# Setup four routers connected like this: R1---R2---R3---R4--
+# Goal is to be able to ping from R1 the outermost interface of R4
+# Disable net.inet.ip.forwarding, enable net.mpls.forwarding
+# Add route on R1 in order to encapsulate into MPLS the IP packets with
+#     destination equal to R4 right hand side interface. Use two labels here:
+#     25 and IPv6 Explicit NULL
+# Add a double tagged MPLS route on R2 in order to forward frames belonging to
+#     that FEC to R3, with IPv4 NULL being the most outermost one
+# Add MPLS "POP" route on R3 for that FEC, pointing to R4
+# Do the same for the reverse direction (R4 to R1)
+# ping from R1 to R4 right hand side interface
+
+
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+RUMP_SERVER3=unix://./r3
+RUMP_SERVER4=unix://./r4
+
+RUMP_FLAGS=\
+"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif"
+
+atf_test_case rfc4182 cleanup
+rfc4182_head()
+{
+
+	atf_set "descr" "RFC 4182 conformance test"
+	atf_set "require.progs" "rump_server"
+}
+
+startservers()
+{
+
+	ulimit -r 300
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER1}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER2}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER3}
+	atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER4}
+}
+
+configservers()
+{
+
+	# Setup the first server
+	export RUMP_SERVER=${RUMP_SERVER1}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.4.0/24 -ifa 10.0.1.1 \
+	    -ifp mpls0 -tag 25,2 -inet 10.0.1.2
+
+	# Setup the second server
+	export RUMP_SERVER=${RUMP_SERVER2}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add -mpls 25 -tag 30,0 -inet 10.0.2.2
+	atf_check -s exit:0 rump.route -q add -mpls 27 -tag 3 -inet 10.0.1.1
+
+	# Setup the third server
+	export RUMP_SERVER=${RUMP_SERVER3}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom2
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add -mpls 30 -tag 3 -inet 10.0.3.2
+	atf_check -s exit:0 rump.route -q add -mpls 26 -tag 27,0 -inet 10.0.2.1
+
+	# Setup the fourth server
+	export RUMP_SERVER=${RUMP_SERVER4}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom3
+	atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom4
+	atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
+	atf_check -s exit:0 rump.ifconfig mpls0 create up
+	atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+	atf_check -s exit:0 rump.route -q add 10.0.1.0/24 -ifa 10.0.3.2 \
+	    -ifp mpls0 -tag 26 -inet 10.0.3.1
+
+	unset RUMP_SERVER
+}
+
+doping()
+{
+
+	export RUMP_SERVER=${RUMP_SERVER1}
+	atf_check -s exit:0 -o match:"64 bytes from 10.0.4.1: icmp_seq=" \
+	    rump.ping -n -o -w 5 10.0.4.1
+	unset RUMP_SERVER
+}
+
+docleanup()
+{
+
+	RUMP_SERVER=${RUMP_SERVER1} rump.halt
+	RUMP_SERVER=${RUMP_SERVER2} rump.halt
+	RUMP_SERVER=${RUMP_SERVER3} rump.halt
+	RUMP_SERVER=${RUMP_SERVER4} rump.halt
+}
+
+rfc4182_body()
+{
+
+	startservers
+	configservers
+	doping
+}
+
+rfc4182_cleanup()
+{
+
+	docleanup
+}
+
+atf_init_test_cases()
+{ 
+
+	atf_add_test_case rfc4182
+} 
diff --git a/contrib/netbsd-tests/net/net/t_pktinfo.c b/contrib/netbsd-tests/net/net/t_pktinfo.c
new file mode 100644
index 000000000000..326f9f6c3b76
--- /dev/null
+++ b/contrib/netbsd-tests/net/net/t_pktinfo.c
@@ -0,0 +1,194 @@
+/*	$NetBSD: t_pktinfo.c,v 1.2 2013/10/19 17:45:01 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_pktinfo.c,v 1.2 2013/10/19 17:45:01 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+static const char traffic[] = "foo";
+
+#ifdef TEST
+#include <err.h>
+#define ERR(msg) err(EXIT_FAILURE, msg)
+#define ERRX(msg, a) errx(EXIT_FAILURE, msg, a)
+#define ERRX2(msg, a1, a2) errx(EXIT_FAILURE, msg, a1, a2)
+#else
+#include <atf-c.h>
+#define ERR(msg) ATF_REQUIRE_MSG(0, "%s: %s", msg, strerror(errno))
+#define ERRX(msg, a) ATF_REQUIRE_MSG(0, msg, a)
+#define ERRX2(msg, a1, a2) ATF_REQUIRE_MSG(0, msg, a1, a2)
+#endif
+
+static int
+server(struct sockaddr_in *sin) {
+	int s, one;
+	socklen_t len = sizeof(*sin);
+
+	if ((s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
+		ERR("socket");
+
+	memset(sin, 0, len);
+	sin->sin_family = AF_INET;
+	sin->sin_len = len;
+	sin->sin_port = 0;
+	sin->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+	if (bind(s, (const struct sockaddr *)sin, len) == -1)
+		ERR("bind");
+
+	if (getsockname(s, (struct sockaddr *)sin, &len) == -1)
+		ERR("getsockname");
+
+	one = 1;
+	if (setsockopt(s, IPPROTO_IP, IP_PKTINFO, &one, sizeof(one)) == -1)
+		ERR("setsockopt");
+	if (setsockopt(s, IPPROTO_IP, IP_RECVPKTINFO, &one, sizeof(one)) == -1)
+		ERR("setsockopt");
+
+	return s;
+}
+
+static int
+client(struct sockaddr_in *sin) {
+	int s;
+
+	if ((s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
+		ERR("socket");
+	if (sendto(s, traffic, sizeof(traffic), 0,
+	    (const struct sockaddr *)sin, sizeof(*sin)) == -1)
+		ERR("sendto");
+	return s;
+}
+
+static void
+receive(int s) {
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	struct iovec iov;
+	char buf[sizeof(traffic)];
+	struct in_pktinfo *ipi;
+	char control[CMSG_SPACE(sizeof(*ipi)) * 2];
+
+	memset(&msg, 0, sizeof(msg));
+	msg.msg_name = NULL;
+	msg.msg_namelen = 0;
+	msg.msg_iov = &iov;
+	memset(&iov, 0, sizeof(iov));
+	iov.iov_base = buf;
+	iov.iov_len = sizeof(buf);
+	msg.msg_iovlen = 1;
+	msg.msg_control = control;
+	msg.msg_controllen = sizeof(control);
+	msg.msg_flags = 0;
+	
+	if (recvmsg(s, &msg, 0) == -1)
+		ERR("recvmsg");
+
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+	    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (cmsg->cmsg_level != IPPROTO_IP)
+			ERRX("bad level %d", cmsg->cmsg_level);
+		const char *m;
+		switch (cmsg->cmsg_type) {
+		case IP_PKTINFO:
+			m = "pktinfo";
+			break;
+		case IP_RECVPKTINFO:
+			m = "recvpktinfo";
+			break;
+		default:
+			m = NULL;
+			ERRX("bad type %d", cmsg->cmsg_type);
+		}
+		ipi = (void *)CMSG_DATA(cmsg);
+#ifdef TEST
+		printf("%s message received on address %s at interface %d\n",
+		    m, inet_ntoa(ipi->ipi_addr), ipi->ipi_ifindex);
+#else
+		__USE(m);
+		ATF_REQUIRE_MSG(ipi->ipi_addr.s_addr == htonl(INADDR_LOOPBACK),
+			"address 0x%x != 0x%x", ipi->ipi_addr.s_addr,
+			htonl(INADDR_LOOPBACK));
+#endif
+	}
+
+	if (strcmp(traffic, buf) != 0)
+		ERRX2("Bad message '%s' != '%s'", buf, traffic);
+}
+
+static void
+doit(void)
+{
+	struct sockaddr_in sin;
+	int s, c;
+	s = server(&sin);
+	c = client(&sin);
+	receive(s);
+	close(s);
+	close(c);
+}
+
+#ifndef TEST
+ATF_TC(pktinfo);
+ATF_TC_HEAD(pktinfo, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that IP_PKTINFO and "
+	    "IP_RECVPKTINFO work");
+}
+
+ATF_TC_BODY(pktinfo, tc)
+{
+	doit();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, pktinfo);
+	return atf_no_error();
+}
+#else
+
+int
+main(int argc, char *argv[]) {
+	doit();
+	return 0;
+}
+#endif
diff --git a/contrib/netbsd-tests/net/net/t_raw.c b/contrib/netbsd-tests/net/net/t_raw.c
new file mode 100644
index 000000000000..ef3262dfa372
--- /dev/null
+++ b/contrib/netbsd-tests/net/net/t_raw.c
@@ -0,0 +1,41 @@
+/*	$NetBSD: t_raw.c,v 1.1 2011/01/11 10:51:45 pooka Exp $	*/
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(PRU_SENSE);
+ATF_TC_HEAD(PRU_SENSE, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Biglock leak with PRU_SENSE on "
+	    "raw sockets (PR kern/44369)");
+}
+
+ATF_TC_BODY(PRU_SENSE, tc)
+{
+	struct stat sb;
+	int s;
+
+	rump_init();
+	RL(s = rump_sys_socket(PF_ROUTE, SOCK_RAW, 0));
+	/* call PRU_SENSE.  unfixed bug causes panic in rump_unschedule() */
+	RL(rump_sys_fstat(s, &sb));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, PRU_SENSE);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/net/t_tcp.c b/contrib/netbsd-tests/net/net/t_tcp.c
new file mode 100644
index 000000000000..8972a0fd4c61
--- /dev/null
+++ b/contrib/netbsd-tests/net/net/t_tcp.c
@@ -0,0 +1,220 @@
+/*	$NetBSD: t_tcp.c,v 1.3 2013/10/17 12:53:28 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifdef __RCSID
+__RCSID("$Id: t_tcp.c,v 1.3 2013/10/17 12:53:28 christos Exp $");
+#endif
+
+/* Example code. Should block; does with accept not paccept. */
+/* Original by: Justin Cormack <justin@specialbusrvrervice.com> */
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <err.h>
+#include <stdlib.h>
+#include <signal.h>
+
+#ifdef TEST
+#define FAIL(msg, ...)  err(EXIT_FAILURE, msg, ## __VA_ARGS__)
+#else 
+#include <atf-c.h> 
+#define FAIL(msg, ...)  ATF_CHECK_MSG(0, msg, ## __VA_ARGS__); goto fail
+#endif
+
+static void
+ding(int al)
+{
+}
+
+static void 
+paccept_block(bool pacceptblock, bool fcntlblock)
+{
+	int srvr = -1, clnt = -1, as = -1;
+	int ok, fl, n;
+	char buf[10];
+	struct sockaddr_in sin, ba;
+	struct sigaction sa;
+
+	srvr = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
+	if (srvr == -1)
+		FAIL("socket");
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+#ifdef BSD4_4
+	sin.sin_len = sizeof(sin);
+#endif
+	sin.sin_port = htons(0);
+	sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	ok = bind(srvr, (const struct sockaddr *)&sin, (socklen_t)sizeof(sin));
+	if (ok == -1)
+		FAIL("bind");
+
+	socklen_t addrlen = sizeof(struct sockaddr_in);
+	ok = getsockname(srvr, (struct sockaddr *)&ba, &addrlen);
+	if (ok == -1)
+		FAIL("getsockname");
+
+	ok = listen(srvr, SOMAXCONN);
+	if (ok == -1)
+		FAIL("listen");
+
+	clnt = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
+	if (clnt == -1)
+		FAIL("socket");
+
+	/* may not connect first time */
+	ok = connect(clnt, (struct sockaddr *) &ba, addrlen);
+	as = paccept(srvr, NULL, NULL, NULL, pacceptblock ? 0 : SOCK_NONBLOCK);
+	ok = connect(clnt, (struct sockaddr *) &ba, addrlen);
+	if (ok == -1 && errno != EISCONN)
+		FAIL("both connects failed");
+
+#if 0
+	fl = fcntl(srvr, F_GETFL, 0);
+	if (fl == -1)
+		FAIL("fnctl getfl");
+
+	ok = fcntl(srvr, F_SETFL, fl & ~O_NONBLOCK);
+	if (ok == -1)
+		FAIL("fnctl setfl");
+#endif
+
+	if (as == -1) {		/* not true under NetBSD */
+		as = paccept(srvr, NULL, NULL, NULL, pacceptblock ? 0 : SOCK_NONBLOCK);
+		if (as == -1)
+			FAIL("paccept");
+	}
+	if (fcntlblock) {
+		fl = fcntl(as, F_GETFL, 0);
+		if (fl == -1)
+			FAIL("fnctl");
+		if (fl != (O_RDWR|O_NONBLOCK))
+			FAIL("fl 0x%x != 0x%x\n", fl, O_RDWR|O_NONBLOCK);
+		ok = fcntl(as, F_SETFL, fl & ~O_NONBLOCK);
+		if (ok == -1)
+			FAIL("fnctl setfl");
+
+		fl = fcntl(as, F_GETFL, 0);
+		if (fl & O_NONBLOCK)
+			FAIL("fl non blocking after reset");
+	}
+	sa.sa_handler = ding;
+	sa.sa_flags = 0;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGALRM, &sa, NULL);
+	alarm(1);
+	n = read(as, buf, 10);
+
+	if (pacceptblock || fcntlblock) {
+		if (n == -1 && errno != EINTR)
+			FAIL("read");
+	} else {
+		if (n != -1 || errno != EWOULDBLOCK)
+			FAIL("read");
+	}
+	return;
+fail:
+	close(srvr);
+	close(clnt);
+	close(as);
+}
+
+#ifndef TEST
+
+ATF_TC(paccept_reset_nonblock);
+ATF_TC_HEAD(paccept_reset_nonblock, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that paccept(2) resets "
+	    "the non-blocking flag on non-blocking sockets");
+}
+
+ATF_TC_BODY(paccept_reset_nonblock, tc)
+{
+	paccept_block(true, false);
+}
+
+ATF_TC(fcntl_reset_nonblock);
+ATF_TC_HEAD(fcntl_reset_nonblock, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that fcntl(2) resets "
+	    "the non-blocking flag on non-blocking sockets");
+}
+
+ATF_TC_BODY(fcntl_reset_nonblock, tc)
+{
+	paccept_block(false, true);
+}
+
+ATF_TC(paccept_nonblock);
+ATF_TC_HEAD(paccept_nonblock, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that fcntl(2) resets "
+	    "the non-blocking flag on non-blocking sockets");
+}
+
+ATF_TC_BODY(paccept_nonblock, tc)
+{
+	paccept_block(false, false);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, paccept_reset_nonblock);
+	ATF_TP_ADD_TC(tp, fcntl_reset_nonblock);
+	ATF_TP_ADD_TC(tp, paccept_nonblock);
+	return atf_no_error();
+}
+#else
+int
+main(int argc, char *argv[])
+{
+	paccept_block(false);
+	paccept_block(true);
+	return 0;
+}
+#endif
diff --git a/contrib/netbsd-tests/net/net/t_udp.c b/contrib/netbsd-tests/net/net/t_udp.c
new file mode 100644
index 000000000000..db593424ee64
--- /dev/null
+++ b/contrib/netbsd-tests/net/net/t_udp.c
@@ -0,0 +1,110 @@
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_udp.c,v 1.2 2013/01/06 02:22:50 christos Exp $");
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include <netdb.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+static const char msg[] = "sendto test";
+
+static void
+sendit(int family)
+{
+	struct addrinfo hints;
+	struct addrinfo *res;
+	int             S, s;
+	int             e;
+
+	/* lookup localhost addr, depending on argv[1] */
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = family;
+	hints.ai_socktype = SOCK_DGRAM;
+	hints.ai_protocol = IPPROTO_UDP;
+	hints.ai_flags = 0;
+
+	e = getaddrinfo("localhost", "9999", &hints, &res);
+	ATF_REQUIRE_MSG(e == 0, "getaddrinfo AF=%d: %s", family,
+	    gai_strerror(e));
+
+	/* server socket */
+	S = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	ATF_REQUIRE_MSG(S >= 0, "server-socket AF=%d: %s", family,
+	    strerror(errno));
+
+	e = bind(S, res->ai_addr, res->ai_addrlen);
+	ATF_REQUIRE_MSG(e == 0, "bind AF=%d: %s", family,
+	    strerror(errno));
+
+	/* client socket */
+	s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	ATF_REQUIRE_MSG(s >= 0, "client-socket AF=%d: %s", family,
+	    strerror(errno));
+
+	/* sendto */
+	e = sendto(s, msg, sizeof(msg), 0, res->ai_addr, res->ai_addrlen);
+	ATF_REQUIRE_MSG(e == sizeof(msg), "sendto(1) AF=%d: %s", family,
+	    strerror(errno));
+
+	e = sendto(s, msg, sizeof(msg), 0, res->ai_addr, res->ai_addrlen);
+	ATF_REQUIRE_MSG(e == sizeof(msg), "sendto(2) AF=%d: %s", family,
+	    strerror(errno));
+
+	/* connect + send */
+	e = connect(s, res->ai_addr, res->ai_addrlen);
+	ATF_REQUIRE_MSG(e == 0, "connect(1) AF=%d: %s", family,
+	    strerror(errno));
+
+	e = send(s, msg, sizeof(msg), 0);
+	ATF_REQUIRE_MSG(e == sizeof(msg), "send(1) AF=%d: %s", family,
+	    strerror(errno));
+
+	e = connect(s, res->ai_addr, res->ai_addrlen);
+	ATF_REQUIRE_MSG(e == 0, "connect(2) AF=%d: %s", family,
+	    strerror(errno));
+
+	e = send(s, msg, sizeof(msg), 0);
+	ATF_REQUIRE_MSG(e == sizeof(msg), "send(2) AF=%d: %s", family,
+	    strerror(errno));
+
+	close(s);
+}
+
+ATF_TC(udp4_send);
+ATF_TC_HEAD(udp4_send, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that inet4 udp send works both"
+	    " for connected and unconnected sockets");
+}
+
+ATF_TC_BODY(udp4_send, tc)
+{
+	sendit(AF_INET);
+}
+
+ATF_TC(udp6_send);
+ATF_TC_HEAD(udp6_send, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that inet6 udp send works both"
+	    " for connected and unconnected sockets");
+}
+
+ATF_TC_BODY(udp6_send, tc)
+{
+	sendit(AF_INET6);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, udp4_send);
+	ATF_TP_ADD_TC(tp, udp6_send);
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/net/net/t_unix.c b/contrib/netbsd-tests/net/net/t_unix.c
new file mode 100644
index 000000000000..30759f19c936
--- /dev/null
+++ b/contrib/netbsd-tests/net/net/t_unix.c
@@ -0,0 +1,328 @@
+/*	$NetBSD: t_unix.c,v 1.11 2013/11/13 21:41:23 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#ifdef __RCSID
+__RCSID("$Id: t_unix.c,v 1.11 2013/11/13 21:41:23 christos Exp $");
+#else
+#define getprogname() argv[0]
+#endif
+
+#ifdef __linux__
+#define LX -1
+#else
+#define LX
+#endif
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdbool.h>
+
+#ifdef TEST
+#define FAIL(msg, ...)	err(EXIT_FAILURE, msg, ## __VA_ARGS__)
+#else
+
+#include <atf-c.h>
+#define FAIL(msg, ...)	\
+	do { \
+		ATF_CHECK_MSG(0, msg, ## __VA_ARGS__); \
+		goto fail; \
+	} while (/*CONSTCOND*/0)
+
+#endif
+
+#define OF offsetof(struct sockaddr_un, sun_path)
+
+static void
+print(const char *msg, struct sockaddr_un *addr, socklen_t len)
+{
+	size_t i;
+
+	printf("%s: client socket length: %zu\n", msg, (size_t)len);
+	printf("%s: client family %d\n", msg, addr->sun_family);
+#ifdef BSD4_4
+	printf("%s: client len %d\n", msg, addr->sun_len);
+#endif
+	printf("%s: socket name: ", msg);
+	for (i = 0; i < len - OF; i++) {
+		int ch = addr->sun_path[i];
+		if (ch < ' ' || '~' < ch)
+			printf("\\x%02x", ch);
+		else
+			printf("%c", ch);
+	}
+	printf("\n");
+}
+
+static int
+acc(int s)
+{
+	char guard1;
+	struct sockaddr_un sun;
+	char guard2;
+	socklen_t len;
+
+	guard1 = guard2 = 's';
+
+	memset(&sun, 0, sizeof(sun));
+	len = sizeof(sun);
+	if ((s = accept(s, (struct sockaddr *)&sun, &len)) == -1)
+		FAIL("accept");
+	if (guard1 != 's')
+		FAIL("guard1 = '%c'", guard1);
+	if (guard2 != 's')
+		FAIL("guard2 = '%c'", guard2);
+#ifdef DEBUG
+	print("accept", &sun, len);
+#endif
+	if (len != 2)
+		FAIL("len %d != 2", len);
+	if (sun.sun_family != AF_UNIX)
+		FAIL("sun->sun_family %d != AF_UNIX", sun.sun_family);
+#ifdef BSD4_4
+	if (sun.sun_len != 2)
+		FAIL("sun->sun_len %d != 2", sun.sun_len);
+#endif
+	for (size_t i = 0; i < sizeof(sun.sun_path); i++)
+		if (sun.sun_path[i])
+			FAIL("sun.sun_path[%zu] %d != NULL", i,
+			    sun.sun_path[i]);
+	return s;
+fail:
+	if (s != -1)
+		close(s);
+	return -1;
+}
+
+static int
+test(bool closeit, size_t len)
+{
+	size_t slen;
+	socklen_t sl;
+	int srvr = -1, clnt = -1, acpt = -1;
+	struct sockaddr_un *sock_addr = NULL, *sun = NULL;
+	socklen_t sock_addrlen;
+
+	srvr = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (srvr == -1)
+		FAIL("socket(srvrer)");
+
+	slen = len + OF + 1;
+	
+	if ((sun = calloc(1, slen)) == NULL)
+		FAIL("calloc");
+
+	srvr = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (srvr == -1)
+		FAIL("socket");
+
+	memset(sun->sun_path, 'a', len);
+	sun->sun_path[len] = '\0';
+	(void)unlink(sun->sun_path);
+
+	sl = SUN_LEN(sun);
+#ifdef BSD4_4
+	sun->sun_len = sl;
+#endif
+	sun->sun_family = AF_UNIX;
+
+	if (bind(srvr, (struct sockaddr *)sun, sl) == -1) {
+		if (errno == EINVAL && sl >= 256) {
+			close(srvr);
+			return -1;
+		}
+		FAIL("bind");
+	}
+
+	if (listen(srvr, SOMAXCONN) == -1)
+		FAIL("listen");
+
+	clnt = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (clnt == -1)
+		FAIL("socket(client)");
+
+	if (connect(clnt, (const struct sockaddr *)sun, sl) == -1)
+		FAIL("connect");
+
+	if (closeit) {
+		if (close(clnt) == -1)
+			FAIL("close");
+		clnt = -1;
+	}
+
+	acpt = acc(srvr);
+#if 0
+	/*
+	 * Both linux and NetBSD return ENOTCONN, why?
+	 */
+	if (!closeit) {
+		socklen_t peer_addrlen;
+		sockaddr_un peer_addr;
+
+		peer_addrlen = sizeof(peer_addr);
+		memset(&peer_addr, 0, sizeof(peer_addr));
+		if (getpeername(srvr, (struct sockaddr *)&peer_addr,
+		    &peer_addrlen) == -1)
+			FAIL("getpeername");
+		print("peer", &peer_addr, peer_addrlen);
+	}
+#endif
+
+	if ((sock_addr = calloc(1, slen)) == NULL)
+		FAIL("calloc");
+	sock_addrlen = slen;
+	if (getsockname(srvr, (struct sockaddr *)sock_addr, &sock_addrlen)
+	    == -1)
+		FAIL("getsockname");
+	print("sock", sock_addr, sock_addrlen);
+
+	if (sock_addr->sun_family != AF_UNIX)
+		FAIL("sock_addr->sun_family %d != AF_UNIX",
+		    sock_addr->sun_family);
+
+	len += OF;
+	if (sock_addrlen LX != len)
+		FAIL("sock_addr_len %zu != %zu", (size_t)sock_addrlen, len);
+#ifdef BSD4_4
+	if (sock_addr->sun_len != sl)
+		FAIL("sock_addr.sun_len %d != %zu", sock_addr->sun_len,
+		    (size_t)sl);
+#endif
+	for (size_t i = 0; i < slen - OF; i++)
+		if (sock_addr->sun_path[i] != sun->sun_path[i])
+			FAIL("sock_addr.sun_path[%zu] %d != "
+			    "sun->sun_path[%zu] %d\n", i, 
+			    sock_addr->sun_path[i], i, sun->sun_path[i]);
+
+	if (acpt != -1)
+		(void)close(acpt);
+	if (srvr != -1)
+		(void)close(srvr);
+	if (clnt != -1 && !closeit)
+		(void)close(clnt);
+
+	free(sock_addr);
+	free(sun);
+	return 0;
+fail:
+	if (acpt != -1)
+		(void)close(acpt);
+	if (srvr != -1)
+		(void)close(srvr);
+	if (clnt != -1 && !closeit)
+		(void)close(clnt);
+	free(sock_addr);
+	free(sun);
+	return -1;
+}
+
+#ifndef TEST
+
+ATF_TC(sockaddr_un_len_exceed);
+ATF_TC_HEAD(sockaddr_un_len_exceed, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that exceeding the size of "
+	    "unix domain sockets does not trash memory or kernel when "
+	    "exceeding the size of the fixed sun_path");
+}
+
+ATF_TC_BODY(sockaddr_un_len_exceed, tc)
+{
+	ATF_REQUIRE_MSG(test(false, 254) == -1, "test(false, 254): %s",
+	    strerror(errno));
+}
+
+ATF_TC(sockaddr_un_len_max);
+ATF_TC_HEAD(sockaddr_un_len_max, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that we can use the maximum "
+	    "unix domain socket pathlen (253): 255 - sizeof(sun_len) - "
+	    "sizeof(sun_family)");
+}
+
+ATF_TC_BODY(sockaddr_un_len_max, tc)
+{
+	ATF_REQUIRE_MSG(test(false, 253) == 0, "test(false, 253): %s",
+	    strerror(errno));
+}
+
+ATF_TC(sockaddr_un_closed);
+ATF_TC_HEAD(sockaddr_un_closed, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check that we can use the accepted "
+	    "address of unix domain socket when closed");
+}
+
+ATF_TC_BODY(sockaddr_un_closed, tc)
+{
+	ATF_REQUIRE_MSG(test(true, 100) == 0, "test(true, 100): %s",
+	    strerror(errno));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sockaddr_un_len_exceed);
+	ATF_TP_ADD_TC(tp, sockaddr_un_len_max);
+	ATF_TP_ADD_TC(tp, sockaddr_un_closed);
+	return atf_no_error();
+}
+#else
+int
+main(int argc, char *argv[])
+{
+	size_t len;
+
+	if (argc == 1) {
+		fprintf(stderr, "Usage: %s <len>\n", getprogname());
+		return EXIT_FAILURE;
+	}
+	test(false, atoi(argv[1]));
+	test(true, atoi(argv[1]));
+}
+#endif
diff --git a/contrib/netbsd-tests/net/npf/t_npf.sh b/contrib/netbsd-tests/net/npf/t_npf.sh
new file mode 100755
index 000000000000..bf247fc7e70b
--- /dev/null
+++ b/contrib/netbsd-tests/net/npf/t_npf.sh
@@ -0,0 +1,63 @@
+# $NetBSD: t_npf.sh,v 1.2 2012/09/18 08:28:15 martin Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+run_test()
+{
+	local name="${1}"
+
+	atf_check -o ignore -e ignore npfctl debug "$(atf_get_srcdir)/npftest.conf" ./npf.plist
+	atf_check -o ignore npftest -c npf.plist -T "${name}"
+}
+
+add_test()
+{
+	local name="${1}"; shift
+	local desc="${*}";
+
+	atf_test_case "npf_${name}"
+	eval "npf_${name}_head() { \
+			atf_set \"descr\" \"${desc}\"; \
+			atf_set \"require.progs\" \"npfctl npftest\"; \
+		}; \
+	    npf_${name}_body() { \
+			run_test \"${name}\"; \
+		}"
+	atf_add_test_case "npf_${name}"
+}
+
+atf_init_test_cases()
+{
+	LIST=/tmp/t_npf.$$
+	trap "rm -f $LIST" EXIT
+
+	sh -ec 'npftest -L || printf "dummy\tnone\n"' > $LIST 2>/dev/null
+
+	while read tag desc
+	do
+		add_test "${tag}" "${desc}"
+	done < $LIST
+}
diff --git a/contrib/netbsd-tests/net/route/t_change.sh b/contrib/netbsd-tests/net/route/t_change.sh
new file mode 100755
index 000000000000..3618aee4b54c
--- /dev/null
+++ b/contrib/netbsd-tests/net/route/t_change.sh
@@ -0,0 +1,65 @@
+#	$NetBSD: t_change.sh,v 1.4 2013/02/19 21:08:25 joerg Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
+export RUMP_SERVER=unix://commsock
+
+atf_test_case reject2blackhole cleanup
+reject2blackhole_head()
+{
+
+	atf_set "descr" "Change a reject route to blackhole"
+	atf_set "require.progs" "rump_server"
+}
+
+reject2blackhole_body()
+{
+
+	atf_check -s exit:0 ${netserver} ${RUMP_SERVER}
+
+	atf_check -s exit:0 -o ignore \
+	    rump.route add 207.46.197.32 127.0.0.1 -reject
+	atf_check -s exit:0 -o match:UGHR -x \
+	    "rump.route -n show -inet | grep ^207.46"
+	atf_check -s exit:0 -o ignore \
+	    rump.route change 207.46.197.32 127.0.0.1 -blackhole
+	atf_check -s exit:0 -o match:' UGHBS ' -e ignore -x \
+	    "rump.netstat -rn -f inet | grep ^207.46| grep ^207.46"
+}
+
+reject2blackhole_cleanup()
+{
+
+	env RUMP_SERVER=unix://commsock rump.halt
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case reject2blackhole
+}
diff --git a/contrib/netbsd-tests/net/sys/t_rfc6056.c b/contrib/netbsd-tests/net/sys/t_rfc6056.c
new file mode 100644
index 000000000000..944521b40334
--- /dev/null
+++ b/contrib/netbsd-tests/net/sys/t_rfc6056.c
@@ -0,0 +1,152 @@
+/* $NetBSD: t_rfc6056.c,v 1.3 2012/06/22 14:54:35 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_rfc6056.c,v 1.3 2012/06/22 14:54:35 christos Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
+#include <arpa/inet.h>
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <netdb.h>
+#include <err.h>
+
+#include <atf-c.h>
+
+static void
+test(const char *hostname, const char *service, int family, int al)
+{
+	static const char hello[] = "hello\n";
+	int s, error, proto, option;
+	struct sockaddr_storage ss;
+	struct addrinfo hints, *res;
+	
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = family;
+	hints.ai_socktype = SOCK_DGRAM;
+
+	switch (family) {
+	case AF_INET:
+		proto = IPPROTO_IP;
+		option = IP_PORTALGO;
+		break;
+	case AF_INET6:
+		proto = IPPROTO_IPV6;
+		option = IPV6_PORTALGO;
+		break;
+	default:
+		abort();
+	}
+
+	error = getaddrinfo(hostname, service, &hints, &res);
+	if (error)
+		errx(EXIT_FAILURE, "Cannot get address for %s (%s)",
+		    hostname, gai_strerror(error));
+	
+	s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	if (s == -1)
+		err(EXIT_FAILURE, "socket");
+	
+	if (setsockopt(s, proto, option, &al, sizeof(al)) == -1)
+		err(EXIT_FAILURE, "setsockopt");
+
+	memset(&ss, 0, sizeof(ss));
+	ss.ss_len = res->ai_addrlen;
+	ss.ss_family = res->ai_family;
+
+	if (bind(s, (struct sockaddr *)&ss, ss.ss_len) == -1)
+		err(EXIT_FAILURE, "bind");
+		
+	if (sendto(s, hello, sizeof(hello) - 1, 0,
+	    res->ai_addr, res->ai_addrlen) == -1)
+		err(EXIT_FAILURE, "sendto");
+
+	if (close(s) == -1)
+		err(EXIT_FAILURE, "close");
+
+	s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	if (s == -1)
+		err(EXIT_FAILURE, "socket");
+
+	if (setsockopt(s, proto, option, &al, sizeof(al)) == -1)
+		err(EXIT_FAILURE, "setsockopt");
+
+	if (connect(s, res->ai_addr, res->ai_addrlen) == -1)
+		err(EXIT_FAILURE, "connect");
+
+	if (send(s, hello, sizeof(hello) - 1, 0) == -1)
+		err(EXIT_FAILURE, "send");
+
+	if (close(s) == -1)
+		err(EXIT_FAILURE, "close");
+
+	freeaddrinfo(res);
+}
+
+ATF_TC(inet4);
+ATF_TC_HEAD(inet4, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks random port allocation "
+	    "for ipv4");
+}
+
+ATF_TC_BODY(inet4, tc)
+{
+	for (int i = 0; i < 6; i++)
+		test("localhost", "http", AF_INET, i);
+}
+
+ATF_TC(inet6);
+ATF_TC_HEAD(inet6, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks random port allocation "
+	    "for ipv6");
+}
+
+ATF_TC_BODY(inet6, tc)
+{
+	for (int i = 0; i < 6; i++)
+		test("localhost", "http", AF_INET6, i);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+        ATF_TP_ADD_TC(tp, inet4);
+        ATF_TP_ADD_TC(tp, inet6);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/alloc.c b/contrib/netbsd-tests/rump/kernspace/alloc.c
new file mode 100644
index 000000000000..5cbcfb61f2ce
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/alloc.c
@@ -0,0 +1,122 @@
+/*	$NetBSD: alloc.c,v 1.1 2010/06/14 21:06:09 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: alloc.c,v 1.1 2010/06/14 21:06:09 pooka Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/condvar.h>
+#include <sys/kmem.h>
+#include <sys/kthread.h>
+#include <sys/mutex.h>
+#include <sys/pool.h>
+#include <sys/proc.h>
+
+#include <uvm/uvm.h>
+
+#include <rump/rumpuser.h>
+#include "kernspace.h"
+
+static void *store[32];
+static struct pool pp1, pp2;
+
+static kmutex_t mtx;
+static kcondvar_t kcv;
+static int curstat;
+
+static void
+hthr(void *arg)
+{
+	int i;
+
+	mutex_enter(&mtx);
+	curstat++;
+	cv_signal(&kcv);
+
+	while (curstat < 2)
+		cv_wait(&kcv, &mtx);
+	mutex_exit(&mtx);
+
+	/* try to guarantee that the sleep is triggered in PR_WAITOK */
+	while ((kernel_map->flags & VM_MAP_WANTVA) == 0)
+		kpause("take5", false, 1, NULL);
+
+	for (i = 0; i < __arraycount(store); i++) {
+		pool_put(&pp1, store[i]);
+	}
+
+	kthread_exit(0);
+}
+
+void
+rumptest_alloc(size_t thelimit)
+{
+	char *c;
+	int succ, i;
+
+	mutex_init(&mtx, MUTEX_DEFAULT, IPL_NONE);
+	cv_init(&kcv, "venailu");
+
+	kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL, hthr, NULL, NULL, "h");
+
+	pool_init(&pp1, 1024, 0, 0, 0, "vara-allas",
+	    &pool_allocator_nointr, IPL_NONE);
+	pool_init(&pp2, 1024, 0, 0, 0, "allas",
+	    &pool_allocator_nointr, IPL_NONE);
+	
+	for (i = 0; i < __arraycount(store); i++) {
+		store[i] = pool_get(&pp1, PR_NOWAIT);
+		if (store[i] == NULL) {
+			panic("pool_get store failed");
+		}
+	}
+
+	/* wait until other thread runs */
+	mutex_enter(&mtx);
+	while (curstat == 0)
+		cv_wait(&kcv, &mtx);
+	mutex_exit(&mtx);
+
+	for (succ = 0;; succ++) {
+		if (succ * 1024 > thelimit)
+			panic("managed to allocate over limit");
+		if ((c = pool_get(&pp2, PR_NOWAIT)) == NULL) {
+			mutex_enter(&mtx);
+			curstat++;
+			cv_signal(&kcv);
+			mutex_exit(&mtx);
+			if (pool_get(&pp2, PR_WAITOK) == NULL)
+				panic("pool get PR_WAITOK failed");
+			break;
+		}
+		*c = 'a';
+	}
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/busypage.c b/contrib/netbsd-tests/rump/kernspace/busypage.c
new file mode 100644
index 000000000000..e0142b7d915c
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/busypage.c
@@ -0,0 +1,94 @@
+/*	$NetBSD: busypage.c,v 1.5 2011/08/07 14:03:15 rmind Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: busypage.c,v 1.5 2011/08/07 14:03:15 rmind Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/condvar.h>
+#include <sys/kthread.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+
+#include <uvm/uvm.h>
+
+#include "kernspace.h"
+
+static struct uvm_object *uobj;
+static struct vm_page *testpg;
+static kcondvar_t tcv;
+
+static bool threadrun = false;
+
+static void
+thread(void *arg)
+{
+
+	mutex_enter(uobj->vmobjlock);
+	threadrun = true;
+	cv_signal(&tcv);
+	testpg->flags |= PG_WANTED;
+	UVM_UNLOCK_AND_WAIT(testpg, uobj->vmobjlock, false, "tw", 0);
+	kthread_exit(0);
+}
+
+void
+rumptest_busypage()
+{
+	struct lwp *newl;
+	int rv;
+
+	cv_init(&tcv, "napina");
+
+	uobj = uao_create(1, 0);
+	mutex_enter(uobj->vmobjlock);
+	testpg = uvm_pagealloc(uobj, 0, NULL, 0);
+	mutex_exit(uobj->vmobjlock);
+	if (testpg == NULL)
+		panic("couldn't create vm page");
+
+	rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
+	    thread, NULL, &newl, "jointest");
+	if (rv)
+		panic("thread creation failed: %d", rv);
+
+	mutex_enter(uobj->vmobjlock);
+	while (!threadrun)
+		cv_wait(&tcv, uobj->vmobjlock);
+
+	uvm_page_unbusy(&testpg, 1);
+	mutex_exit(uobj->vmobjlock);
+
+	rv = kthread_join(newl);
+	if (rv)
+		panic("thread join failed: %d", rv);
+
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/kernspace.h b/contrib/netbsd-tests/rump/kernspace/kernspace.h
new file mode 100644
index 000000000000..248f62fa792a
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/kernspace.h
@@ -0,0 +1,47 @@
+/*	$NetBSD: kernspace.h,v 1.4 2011/01/14 13:08:00 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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 _TESTS_RUMP_KERNSPACE_KERNSPACE_H_
+#define _TESTS_RUMP_KERNSPACE_KERNSPACE_H_
+
+enum locktest { LOCKME_MTX, LOCKME_RWDOUBLEX, LOCKME_RWRX, LOCKME_RWXR,
+	LOCKME_DESTROYHELD, LOCKME_DOUBLEINIT, LOCKME_DOUBLEFREE,
+	LOCKME_MEMFREE };
+
+void rumptest_busypage(void);
+void rumptest_threadjoin(void);
+void rumptest_thread(void);
+void rumptest_tsleep(void);
+void rumptest_alloc(size_t);
+void rumptest_lockme(enum locktest);
+
+void rumptest_sendsig(char *);
+void rumptest_localsig(int);
+
+#endif /* _TESTS_RUMP_KERNSPACE_KERNSPACE_H_ */
diff --git a/contrib/netbsd-tests/rump/kernspace/lockme.c b/contrib/netbsd-tests/rump/kernspace/lockme.c
new file mode 100644
index 000000000000..6f9bd587e472
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/lockme.c
@@ -0,0 +1,92 @@
+/*	$NetBSD: lockme.c,v 1.1 2011/01/06 13:12:52 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: lockme.c,v 1.1 2011/01/06 13:12:52 pooka Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/kmem.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
+
+#include "kernspace.h"
+
+struct somemem {
+	char foo;
+	kmutex_t mutexetum;
+	char oof;
+};
+
+void
+rumptest_lockme(enum locktest what)
+{
+	struct somemem *some;
+	kmutex_t mtx;
+	krwlock_t rw;
+
+	rw_init(&rw);
+	mutex_init(&mtx, MUTEX_DEFAULT, IPL_NONE);
+
+	switch (what) {
+	case LOCKME_MTX:
+		mutex_enter(&mtx);
+		mutex_enter(&mtx);
+		break;
+	case LOCKME_RWDOUBLEX:
+		rw_enter(&rw, RW_WRITER);
+		rw_enter(&rw, RW_WRITER);
+		break;
+	case LOCKME_RWRX:
+		rw_enter(&rw, RW_READER);
+		rw_enter(&rw, RW_WRITER);
+		break;
+	case LOCKME_RWXR:
+		rw_enter(&rw, RW_WRITER);
+		rw_enter(&rw, RW_READER);
+		break;
+	case LOCKME_DOUBLEINIT:
+		mutex_init(&mtx, MUTEX_DEFAULT, IPL_NONE);
+		break;
+	case LOCKME_DOUBLEFREE:
+		mutex_destroy(&mtx);
+		mutex_destroy(&mtx);
+		break;
+	case LOCKME_DESTROYHELD:
+		mutex_enter(&mtx);
+		mutex_destroy(&mtx);
+		break;
+	case LOCKME_MEMFREE:
+		some = kmem_alloc(sizeof(*some), KM_SLEEP);
+		mutex_init(&some->mutexetum, MUTEX_DEFAULT, IPL_NONE);
+		kmem_free(some, sizeof(*some));
+		break;
+	}
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/sendsig.c b/contrib/netbsd-tests/rump/kernspace/sendsig.c
new file mode 100644
index 000000000000..f0b17a8d1fcf
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/sendsig.c
@@ -0,0 +1,82 @@
+/*	$NetBSD: sendsig.c,v 1.1 2011/01/14 13:08:00 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: sendsig.c,v 1.1 2011/01/14 13:08:00 pooka Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/proc.h>
+
+#include <rump/rump.h>
+
+#include "kernspace.h"
+
+/*
+ * loop until a non-system process appears and we can send it a signal
+ */
+void
+rumptest_sendsig(char *signo)
+{
+	struct proc *p;
+	bool sent = false;
+	int sig;
+
+	sig = strtoull(signo, NULL, 10);
+	rump_boot_setsigmodel(RUMP_SIGMODEL_RAISE);
+
+	mutex_enter(proc_lock);
+	while (!sent) {
+		PROCLIST_FOREACH(p, &allproc) {
+			if (p->p_pid > 1) {
+				mutex_enter(p->p_lock);
+				psignal(p, sig);
+				mutex_exit(p->p_lock);
+				sent = true;
+				break;
+			}
+		}
+		kpause("w8", false, 1, proc_lock);
+	}
+	mutex_exit(proc_lock);
+
+	/* restore default */
+	rump_boot_setsigmodel(RUMP_SIGMODEL_PANIC);
+}
+
+void
+rumptest_localsig(int signo)
+{
+	struct proc *p = curproc;
+
+	mutex_enter(p->p_lock);
+	psignal(p, signo);
+	mutex_exit(p->p_lock);
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/thread.c b/contrib/netbsd-tests/rump/kernspace/thread.c
new file mode 100644
index 000000000000..5c24f1252517
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/thread.c
@@ -0,0 +1,108 @@
+/*	$NetBSD: thread.c,v 1.2 2011/08/07 14:03:15 rmind Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: thread.c,v 1.2 2011/08/07 14:03:15 rmind Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+
+#include "kernspace.h"
+
+static volatile int testit;
+
+static void
+jointhread(void *arg)
+{
+
+	kpause("take5", false, 1, NULL);
+	testit = 1;
+	kthread_exit(0);
+}
+
+void
+rumptest_threadjoin()
+{
+	struct lwp *newl;
+	int rv;
+
+	rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
+	    jointhread, NULL, &newl, "jointest");
+	if (rv)
+		panic("thread creation failed: %d", rv);
+	rv = kthread_join(newl);
+	if (rv)
+		panic("thread join failed: %d", rv);
+
+	if (testit != 1)
+		panic("new thread did not run");
+}
+
+static kmutex_t mtx;
+static kcondvar_t cv;
+static int value;
+
+static void
+thethread(void *arg)
+{
+
+	mutex_enter(&mtx);
+	value = 1;
+	cv_signal(&cv);
+	mutex_exit(&mtx);
+
+	kthread_exit(0);
+}
+
+void
+rumptest_thread()
+{
+	struct lwp *newl;
+	int rv;
+
+	mutex_init(&mtx, MUTEX_DEFAULT, IPL_NONE);
+	cv_init(&cv, "jooei");
+	rv = kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
+	    thethread, NULL, &newl, "ktest");
+	if (rv)
+		panic("thread creation failed: %d", rv);
+
+	mutex_enter(&mtx);
+	while (value == 0)
+		cv_wait(&cv, &mtx);
+	mutex_exit(&mtx);
+
+	/* try to verify thread really exists and we don't crash */
+	kpause("take1", false, 1, NULL);
+}
diff --git a/contrib/netbsd-tests/rump/kernspace/tsleep.c b/contrib/netbsd-tests/rump/kernspace/tsleep.c
new file mode 100644
index 000000000000..4d08e0a5b37e
--- /dev/null
+++ b/contrib/netbsd-tests/rump/kernspace/tsleep.c
@@ -0,0 +1,100 @@
+/*	$NetBSD: tsleep.c,v 1.4 2014/03/21 22:18:57 dholland Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(lint)
+__RCSID("$NetBSD: tsleep.c,v 1.4 2014/03/21 22:18:57 dholland Exp $");
+#endif /* !lint */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/kthread.h>
+#include <sys/proc.h>
+
+#include "kernspace.h"
+
+#define NTHREADS 10
+
+/*
+ * mpsafe thread.  need dedicated interlock
+ */
+static kmutex_t mymtx;
+
+static void
+tinythread(void *arg)
+{
+	static int wakeups;
+	int i, rv;
+	bool relock = ((uintptr_t)arg % 2) == 0;
+
+	for (i = 0; i < 1000; i++) {
+		mutex_enter(&mymtx);
+		wakeup(tinythread);
+		if (wakeups >= NTHREADS-1) {
+			mutex_exit(&mymtx);
+			break;
+		}
+		rv = mtsleep(tinythread, relock ? 0 : PNORELOCK,
+		    "haa", 0, &mymtx);
+		if (relock)
+			mutex_exit(&mymtx);
+		if (rv != 0)
+			panic("mtsleep failed");
+	}
+
+	mutex_enter(&mymtx);
+	wakeups++;
+	wakeup(tinythread);
+
+	rv = mtsleep(rumptest_tsleep, PNORELOCK, "kepuli", 1, &mymtx);
+	if (rv != EWOULDBLOCK)
+		panic("mtsleep unexpected return value %d", rv);
+
+	kthread_exit(0);
+}
+
+void
+rumptest_tsleep()
+{
+	struct lwp *notbigl[NTHREADS];
+	int rv, i;
+
+	mutex_init(&mymtx, MUTEX_DEFAULT, IPL_NONE);
+
+	for (i = 0; i < NTHREADS; i++) {
+		rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN| KTHREAD_MPSAFE,
+		    NULL, tinythread, (void *)(uintptr_t)i, &notbigl[i], "nb");
+		if (rv)
+			panic("thread create failed: %d", rv);
+	}
+
+	for (i = 0; i < NTHREADS; i++) {
+		kthread_join(notbigl[i]);
+	}
+}
diff --git a/contrib/netbsd-tests/rump/modautoload/t_modautoload.c b/contrib/netbsd-tests/rump/modautoload/t_modautoload.c
new file mode 100644
index 000000000000..f28ad556808a
--- /dev/null
+++ b/contrib/netbsd-tests/rump/modautoload/t_modautoload.c
@@ -0,0 +1,75 @@
+/*	$NetBSD: t_modautoload.c,v 1.2 2014/03/10 22:38:53 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/module.h>
+#include <sys/dirent.h>
+#include <sys/sysctl.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/kernfs/kernfs.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(modautoload);
+ATF_TC_HEAD(modautoload, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests that kernel module "
+	    "autoload works in rump");
+}
+
+static void
+mountkernfs(void)
+{
+
+	if (!rump_nativeabi_p())
+		atf_tc_skip("host kernel modules not supported");
+
+	rump_init();
+
+	if (rump_sys_mkdir("/kern", 0777) == -1)
+		atf_tc_fail_errno("mkdir /kern");
+	if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1)
+		atf_tc_fail_errno("could not mount kernfs");
+}
+
+/*
+ * Why use kernfs here?  It talks to plenty of other parts with the
+ * kernel (e.g. vfs_attach() in modcmd), but is still easy to verify
+ * it's working correctly.
+ */
+
+#define MAGICNUM 1323
+ATF_TC_BODY(modautoload, tc)
+{
+	extern int rumpns_hz;
+	char buf[64];
+	int fd;
+
+	mountkernfs();
+	rumpns_hz = MAGICNUM;
+	if ((fd = rump_sys_open("/kern/hz", O_RDONLY)) == -1)
+		atf_tc_fail_errno("open /kern/hz");
+	if (rump_sys_read(fd, buf, sizeof(buf)) <= 0)
+		atf_tc_fail_errno("read");
+	ATF_REQUIRE(atoi(buf) == MAGICNUM);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, modautoload);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_client/h_forkcli.c b/contrib/netbsd-tests/rump/rumpkern/h_client/h_forkcli.c
new file mode 100644
index 000000000000..3b89727bedd6
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_client/h_forkcli.c
@@ -0,0 +1,169 @@
+/*	$NetBSD: h_forkcli.c,v 1.1 2011/01/05 17:19:09 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rumpclient.h>
+
+static void
+simple(void)
+{
+	struct rumpclient_fork *rf;
+	pid_t pid1, pid2;
+	int fd, status;
+
+	if ((pid1 = rump_sys_getpid()) < 2)
+		errx(1, "unexpected pid %d", pid1);
+
+	fd = rump_sys_open("/dev/null", O_CREAT | O_RDWR);
+	if (rump_sys_write(fd, &fd, sizeof(fd)) != sizeof(fd))
+		errx(1, "write newlyopened /dev/null");
+
+	if ((rf = rumpclient_prefork()) == NULL)
+		err(1, "prefork");
+
+	switch (fork()) {
+	case -1:
+		err(1, "fork");
+		break;
+	case 0:
+		if (rumpclient_fork_init(rf) == -1)
+			err(1, "postfork init failed");
+
+		if ((pid2 = rump_sys_getpid()) < 2)
+			errx(1, "unexpected pid %d", pid2);
+		if (pid1 == pid2)
+			errx(1, "child and parent pids are equal");
+
+		/* check that we can access the fd, the close it and exit */
+		if (rump_sys_write(fd, &fd, sizeof(fd)) != sizeof(fd))
+			errx(1, "write child /dev/null");
+		rump_sys_close(fd);
+		break;
+	default:
+		/*
+		 * check that we can access the fd, wait for the child, and
+		 * check we can still access the fd
+		 */
+		if (rump_sys_write(fd, &fd, sizeof(fd)) != sizeof(fd))
+			errx(1, "write parent /dev/null");
+		if (wait(&status) == -1)
+			err(1, "wait failed");
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			errx(1, "child exited with status %d", status);
+		if (rump_sys_write(fd, &fd, sizeof(fd)) != sizeof(fd))
+			errx(1, "write parent /dev/null");
+		break;
+	}
+}
+
+static void
+cancel(void)
+{
+
+	/* XXX: not implemented in client / server !!! */
+}
+
+#define TESTSTR "i am your fatherrrrrrr"
+#define TESTSLEN (sizeof(TESTSTR)-1)
+static void
+pipecomm(void)
+{
+	struct rumpclient_fork *rf;
+	char buf[TESTSLEN+1];
+	int pipetti[2];
+	int status;
+
+	if (rump_sys_pipe(pipetti) == -1)
+		errx(1, "pipe");
+
+	if ((rf = rumpclient_prefork()) == NULL)
+		err(1, "prefork");
+
+	switch (fork()) {
+	case -1:
+		err(1, "fork");
+		break;
+	case 0:
+		if (rumpclient_fork_init(rf) == -1)
+			err(1, "postfork init failed");
+
+		memset(buf, 0, sizeof(buf));
+		if (rump_sys_read(pipetti[0], buf, TESTSLEN) != TESTSLEN)
+			err(1, "pipe read");
+		if (strcmp(TESTSTR, buf) != 0)
+			errx(1, "teststring doesn't match, got %s", buf);
+		break;
+	default:
+		if (rump_sys_write(pipetti[1], TESTSTR, TESTSLEN) != TESTSLEN)
+			err(1, "pipe write");
+		if (wait(&status) == -1)
+			err(1, "wait failed");
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			errx(1, "child exited with status %d", status);
+		break;
+	}
+}
+
+static void
+fakeauth(void)
+{
+	struct rumpclient_fork *rf;
+	uint32_t *auth;
+	int rv;
+
+	if ((rf = rumpclient_prefork()) == NULL)
+		err(1, "prefork");
+
+	/* XXX: we know the internal structure of rf */
+	auth = (void *)rf;
+	*(auth+3) = *(auth+3) ^ 0x1;
+
+	rv = rumpclient_fork_init(rf);
+	if (!(rv == -1 && errno == ESRCH))
+		exit(1);
+}
+
+struct parsa {
+	const char *arg;		/* sp arg, el		*/
+	void (*spring)(void);		/* spring into action	*/
+} paragus[] = {
+	{ "simple", simple },
+	{ "cancel", cancel },
+	{ "pipecomm", pipecomm },
+	{ "fakeauth", fakeauth },
+};
+
+int
+main(int argc, char *argv[])
+{
+	unsigned i;
+
+	if (argc != 2)
+		errx(1, "invalid usage");
+
+	if (rumpclient_init() == -1)
+		err(1, "rumpclient init");
+
+	for (i = 0; i < __arraycount(paragus); i++) {
+		if (strcmp(argv[1], paragus[i].arg) == 0) {
+			paragus[i].spring();
+			break;
+		}
+	}
+	if (i == __arraycount(paragus)) {
+		printf("invalid test %s\n", argv[1]);
+		exit(1);
+	}
+
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_client/h_reconcli.c b/contrib/netbsd-tests/rump/rumpkern/h_client/h_reconcli.c
new file mode 100644
index 000000000000..c594bbf8b834
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_client/h_reconcli.c
@@ -0,0 +1,121 @@
+/*	$NetBSD: h_reconcli.c,v 1.2 2011/02/19 09:56:45 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <rump/rumpclient.h>
+#include <rump/rump_syscalls.h>
+
+#include <err.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static volatile int quit, riseandwhine;
+
+static pthread_mutex_t closermtx;
+static pthread_cond_t closercv;
+
+static void *
+closer(void *arg)
+{
+
+	pthread_mutex_lock(&closermtx);
+	while (!quit) {
+		while (!riseandwhine)
+			pthread_cond_wait(&closercv, &closermtx);
+		riseandwhine = 0;
+		pthread_mutex_unlock(&closermtx);
+
+		/* try to catch a random slot */
+		usleep(random() % 100000);
+
+		/*
+		 * wide-angle disintegration beam, but takes care
+		 * of the client rumpkernel communication socket.
+		 */
+		closefrom(3);
+
+		pthread_mutex_lock(&closermtx);
+	}
+	pthread_mutex_unlock(&closermtx);
+
+	return NULL;
+}
+
+static const int hostnamemib[] = { CTL_KERN, KERN_HOSTNAME };
+static char goodhostname[128];
+
+static void *
+worker(void *arg)
+{
+	char hostnamebuf[128];
+	size_t blen;
+
+	pthread_mutex_lock(&closermtx);
+	while (!quit) {
+		pthread_mutex_unlock(&closermtx);
+		if (rump_sys_getpid() == -1)
+			err(1, "getpid");
+
+		blen = sizeof(hostnamebuf);
+		memset(hostnamebuf, 0, sizeof(hostnamebuf));
+		if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+		    hostnamebuf, &blen, NULL, 0) == -1)
+			err(1, "sysctl");
+		if (strcmp(hostnamebuf, goodhostname) != 0)
+			exit(1);
+		pthread_mutex_lock(&closermtx);
+		riseandwhine = 1;
+		pthread_cond_signal(&closercv);
+	}
+	riseandwhine = 1;
+	pthread_cond_signal(&closercv);
+	pthread_mutex_unlock(&closermtx);
+
+	return NULL;
+}
+
+int
+main(int argc, char *argv[])
+{
+	pthread_t pt, w1, w2, w3, w4;
+	size_t blen;
+	int timecount;
+
+	if (argc != 2)
+		errx(1, "need timecount");
+	timecount = atoi(argv[1]);
+	if (timecount <= 0)
+		errx(1, "invalid timecount %d\n", timecount);
+
+	srandom(time(NULL));
+
+	rumpclient_setconnretry(RUMPCLIENT_RETRYCONN_INFTIME);
+	if (rumpclient_init() == -1)
+		err(1, "init");
+
+	blen = sizeof(goodhostname);
+	if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+	    goodhostname, &blen, NULL, 0) == -1)
+		err(1, "sysctl");
+
+	pthread_create(&pt, NULL, closer, NULL);
+	pthread_create(&w1, NULL, worker, NULL);
+	pthread_create(&w2, NULL, worker, NULL);
+	pthread_create(&w3, NULL, worker, NULL);
+	pthread_create(&w4, NULL, worker, NULL);
+
+	sleep(timecount);
+	quit = 1;
+
+	pthread_join(pt, NULL);
+	pthread_join(w1, NULL);
+	pthread_join(w2, NULL);
+	pthread_join(w3, NULL);
+	pthread_join(w4, NULL);
+
+	exit(0);
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_client/h_sigcli.c b/contrib/netbsd-tests/rump/rumpkern/h_client/h_sigcli.c
new file mode 100644
index 000000000000..9134f98b5741
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_client/h_sigcli.c
@@ -0,0 +1,84 @@
+/*	$NetBSD: h_sigcli.c,v 1.3 2011/02/07 20:05:09 pooka Exp $	*/
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <err.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rumpclient.h>
+
+static const int hostnamemib[] = { CTL_KERN, KERN_HOSTNAME };
+static char hostnamebuf[128];
+
+static volatile sig_atomic_t sigexecs;
+
+static void
+sighand(int sig)
+{
+	char buf[128];
+	size_t blen = sizeof(buf);
+
+	if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+	    buf, &blen, NULL, 0) == -1)
+		err(1, "sighand sysctl");
+	if (strcmp(buf, hostnamebuf) != 0)
+		errx(1, "sighandler hostname");
+	sigexecs++;
+}
+
+int
+main(void)
+{
+	char buf[128];
+	time_t tstart;
+	struct itimerval itv;
+	size_t hnbsize;
+	int i;
+	size_t blen;
+
+	if (rumpclient_init() == -1)
+		err(1, "rumpclient init");
+
+	hnbsize = sizeof(hostnamebuf);
+	if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+	    hostnamebuf, &hnbsize, NULL, 0) == -1)
+		err(1, "sysctl");
+
+	if (signal(SIGALRM, sighand) == SIG_ERR)
+		err(1, "signal");
+
+	itv.it_interval.tv_sec = itv.it_value.tv_sec = 0;
+	itv.it_interval.tv_usec = itv.it_value.tv_usec = 10000; /* 10ms */
+
+	if (setitimer(ITIMER_REAL, &itv, NULL) == -1)
+		err(1, "itimer");
+
+	tstart = time(NULL);
+	for (i = 0;; i++) {
+		blen = sizeof(buf);
+		if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+		    buf, &blen, NULL, 0) == -1)
+			err(1, "sysctl");
+		if (strcmp(buf, hostnamebuf) != 0)
+			errx(1, "main hostname");
+
+		/*
+		 * check every 100 cycles to avoid doing
+		 * nothing but gettimeofday()
+		 */
+		if (i == 100) {
+			if (time(NULL) - tstart > 5)
+				break;
+			i = 0;
+		}
+	}
+
+	if (!sigexecs) {
+		printf("no signal handlers run.  test busted?\n");
+	}
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_client/h_simplecli.c b/contrib/netbsd-tests/rump/rumpkern/h_client/h_simplecli.c
new file mode 100644
index 000000000000..11f432c38aad
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_client/h_simplecli.c
@@ -0,0 +1,30 @@
+/*	$NetBSD: h_simplecli.c,v 1.2 2011/01/14 13:23:15 pooka Exp $	*/
+
+#include <sys/types.h>
+
+#include <err.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rumpclient.h>
+
+int
+main(int argc, char *argv[])
+{
+
+	if (rumpclient_init() == -1)
+		err(1, "rumpclient init");
+
+	if (argc > 1) {
+		for (;;) {
+			rump_sys_getpid();
+			usleep(10000);
+		}
+	} else {
+		if (rump_sys_getpid() > 0)
+			exit(0);
+		err(1, "getpid");
+	}
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_client/h_stresscli.c b/contrib/netbsd-tests/rump/rumpkern/h_client/h_stresscli.c
new file mode 100644
index 000000000000..d49edeb9a6f2
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_client/h_stresscli.c
@@ -0,0 +1,219 @@
+/*	$NetBSD: h_stresscli.c,v 1.9 2011/06/26 13:17:36 christos Exp $	*/
+
+#include <sys/types.h>
+#include <sys/atomic.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <rump/rump_syscalls.h>
+#include <rump/rumpclient.h>
+
+static unsigned int syscalls, bindcalls;
+static pid_t mypid;
+static volatile sig_atomic_t doquit;
+
+static void
+signaali(int sig)
+{
+
+	doquit = 1;
+}
+
+static const int hostnamemib[] = { CTL_KERN, KERN_HOSTNAME };
+static char hostnamebuf[128];
+#define HOSTNAMEBASE "rumpclient"
+
+static int iskiller;
+
+static void *
+client(void *arg)
+{
+	char buf[256];
+	struct sockaddr_in sin;
+	size_t blen;
+	int port = (int)(uintptr_t)arg;
+	int s, fd, x;
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_len = sizeof(sin);
+	sin.sin_port = htons(port);
+
+	while (!doquit) {
+		pid_t pidi;
+		blen = sizeof(buf);
+		s = rump_sys_socket(PF_INET, SOCK_STREAM, 0);
+		if (s == -1)
+			err(1, "socket");
+		atomic_inc_uint(&syscalls);
+
+		fd = rump_sys_open("/dev/null", O_RDWR);
+		atomic_inc_uint(&syscalls);
+
+		if (doquit)
+			goto out;
+
+		x = 1;
+		if (rump_sys_setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+		    &x, sizeof(x)) == -1)
+			err(1, "reuseaddr");
+
+		/*
+		 * we don't really know when the kernel handles our disconnect,
+		 * so be soft about about the failure in case of a killer client
+		 */
+		if (rump_sys_bind(s, (struct sockaddr*)&sin, sizeof(sin))==-1) {
+			if (!iskiller)
+				err(1, "bind to port %d failed",
+				    ntohs(sin.sin_port));
+		} else {
+			atomic_inc_uint(&bindcalls);
+		}
+		atomic_inc_uint(&syscalls);
+
+		if (doquit)
+			goto out;
+
+		if (rump_sys___sysctl(hostnamemib, __arraycount(hostnamemib),
+		    buf, &blen, NULL, 0) == -1)
+			err(1, "sysctl");
+		if (strncmp(buf, hostnamebuf, sizeof(HOSTNAMEBASE)-1) != 0)
+			errx(1, "hostname (%s/%s) mismatch", buf, hostnamebuf);
+		atomic_inc_uint(&syscalls);
+
+		if (doquit)
+			goto out;
+
+		pidi = rump_sys_getpid();
+		if (pidi == -1)
+			err(1, "getpid");
+		if (pidi != mypid)
+			errx(1, "mypid mismatch");
+		atomic_inc_uint(&syscalls);
+
+		if (doquit)
+			goto out;
+
+		if (rump_sys_write(fd, buf, 16) != 16)
+			err(1, "write /dev/null");
+		atomic_inc_uint(&syscalls);
+
+ out:
+		rump_sys_close(fd);
+		atomic_inc_uint(&syscalls);
+		rump_sys_close(s);
+		atomic_inc_uint(&syscalls);
+	}
+
+	return NULL;
+}
+
+/* Stress with max 32 clients, 8 threads each (256 concurrent threads) */
+#define NCLI 32
+#define NTHR 8
+
+int
+main(int argc, char *argv[])
+{
+	pthread_t pt[NTHR-1];
+	pid_t clis[NCLI];
+	pid_t apid;
+	int ncli = 0;
+	int i = 0, j;
+	int status, thesig;
+	int rounds, myport;
+
+	if (argc != 2 && argc != 3)
+		errx(1, "need roundcount");
+
+	if (argc == 3) {
+		if (strcmp(argv[2], "kill") != 0)
+			errx(1, "optional 3rd param must be kill");
+		thesig = SIGKILL;
+		iskiller = 1;
+	} else {
+		thesig = SIGUSR1;
+	}
+
+	signal(SIGUSR1, signaali);
+
+	memset(clis, 0, sizeof(clis));
+	for (rounds = 1; rounds < atoi(argv[1])*10; rounds++) {
+		while (ncli < NCLI) {
+			switch ((apid = fork())) {
+			case -1:
+				err(1, "fork failed");
+			case 0:
+				if (rumpclient_init() == -1)
+					err(1, "rumpclient init");
+
+				mypid = rump_sys_getpid();
+				sprintf(hostnamebuf, HOSTNAMEBASE "%d", mypid);
+				if (rump_sys___sysctl(hostnamemib,
+				    __arraycount(hostnamemib), NULL, NULL,
+				    hostnamebuf, strlen(hostnamebuf)+1) == -1)
+					err(1, "sethostname");
+
+				for (j = 0; j < NTHR-1; j++) {
+					myport = i*NCLI + j+2;
+					if (pthread_create(&pt[j], NULL,
+					    client,
+					    (void*)(uintptr_t)myport) !=0 )
+						err(1, "pthread create");
+				}
+				myport = i*NCLI+1;
+				client((void *)(uintptr_t)myport);
+				for (j = 0; j < NTHR-1; j++)
+					pthread_join(pt[j], NULL);
+				membar_consumer();
+				fprintf(stderr, "done %d\n", syscalls);
+				exit(0);
+				/* NOTREACHED */
+			default:
+				ncli++;
+				clis[i] = apid;
+				break;
+			}
+			
+			i = (i + 1) % NCLI;
+		}
+
+		usleep(100000);
+		kill(clis[i], thesig);
+
+		apid = wait(&status);
+		if (apid != clis[i])
+			errx(1, "wanted pid %d, got %d\n", clis[i], apid);
+		clis[i] = 0;
+		ncli--;
+		if (thesig == SIGUSR1) {
+			if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+				fprintf(stderr, "child died with 0x%x\n",
+				    status);
+				exit(1);
+			}
+		} else {
+			if (!WIFSIGNALED(status) || WTERMSIG(status) != thesig){
+				fprintf(stderr, "child died with 0x%x\n",
+				    status);
+				exit(1);
+			}
+		}
+	}
+
+	for (i = 0; i < NCLI; i++)
+		if (clis[i])
+			kill(clis[i], SIGKILL);
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c b/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c
new file mode 100644
index 000000000000..4e04c2269177
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c
@@ -0,0 +1,63 @@
+/*	$NetBSD: h_simpleserver.c,v 1.3 2011/01/14 13:23:15 pooka Exp $	*/
+
+#include <sys/types.h>
+
+#include <rump/rump.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../../kernspace/kernspace.h"
+
+#define NOFAIL(e) do { int rv = e; if (rv) err(1, #e); } while (/*CONSTCOND*/0)
+
+struct {
+	const char *str;
+	void (*dofun)(char *);
+} actions[] = {
+	{ "sendsig", rumptest_sendsig },
+};
+
+int
+main(int argc, char *argv[])
+{
+	unsigned i;
+	bool match;
+
+	if (argc < 2)
+		exit(1);
+
+	NOFAIL(rump_daemonize_begin());
+	NOFAIL(rump_init());
+	NOFAIL(rump_init_server(argv[1]));
+	NOFAIL(rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS));
+
+	if (argc > 2) {
+		char *arg = NULL;
+
+		if (argc == 4)
+			arg = argv[3];
+
+		for (i = 0; i < __arraycount(actions); i++) {
+			if (strcmp(actions[i].str, argv[2]) == 0) {
+				rump_schedule();
+				actions[i].dofun(arg);
+				rump_unschedule();
+				match = true;
+			}
+		}
+
+		if (!match) {
+			exit(1);
+		}
+		pause();
+	} else {
+		for (;;)
+			pause();
+	}
+
+	return 0;
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_copy.c b/contrib/netbsd-tests/rump/rumpkern/t_copy.c
new file mode 100644
index 000000000000..a31e58ca7a37
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_copy.c
@@ -0,0 +1,139 @@
+/*	$NetBSD: t_copy.c,v 1.2 2013/07/26 16:09:48 njoly Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+
+#include <rump/rump.h>
+
+ATF_TC(copystr);
+ATF_TC_HEAD(copystr, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests copystr()");
+}
+
+ATF_TC(copyinstr);
+ATF_TC_HEAD(copyinstr, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests copyinstr()");
+}
+
+ATF_TC(copyoutstr);
+ATF_TC_HEAD(copyoutstr, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests copyoutstr()");
+}
+
+typedef int (copystr_fn)(const void *, void *, size_t, size_t *);
+typedef int (copy_fn)(const void *, void *, size_t);
+
+extern copystr_fn rumpns_copystr, rumpns_copyinstr, rumpns_copyoutstr;
+extern copy_fn rumpns_copyin, rumpns_copyout;
+
+#define TESTSTR "jippii, lisaa puuroa"
+
+static void
+dotest(copystr_fn *thefun)
+{
+	char buf[sizeof(TESTSTR)+1];
+	size_t len;
+
+	rump_init();
+	rump_schedule();
+
+	/* larger buffer */
+	memset(buf, 0xaa, sizeof(buf));
+	ATF_REQUIRE_EQ(thefun(TESTSTR, buf, sizeof(buf), &len), 0);
+	ATF_REQUIRE_EQ(len, sizeof(TESTSTR));
+	ATF_REQUIRE_STREQ(TESTSTR, buf);
+
+	/* just large enough */
+	memset(buf, 0xaa, sizeof(buf));
+	ATF_REQUIRE_EQ(thefun(TESTSTR, buf, sizeof(buf)-1, &len), 0);
+	ATF_REQUIRE_EQ(len, sizeof(TESTSTR));
+	ATF_REQUIRE_STREQ(TESTSTR, buf);
+
+	/* one too small */
+	memset(buf, 0xaa, sizeof(buf));
+	ATF_REQUIRE_EQ(thefun(TESTSTR, buf, sizeof(buf)-2, NULL), ENAMETOOLONG);
+
+	rump_unschedule();
+}
+
+ATF_TC_BODY(copystr, tc)
+{
+
+	dotest(rumpns_copystr);
+}
+
+ATF_TC_BODY(copyinstr, tc)
+{
+
+	dotest(rumpns_copyinstr);
+}
+
+ATF_TC_BODY(copyoutstr, tc)
+{
+
+	dotest(rumpns_copyoutstr);
+}
+
+ATF_TC(copy_efault);
+ATF_TC_HEAD(copy_efault, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests that copy(9) functions can return EFAULT");
+}
+ATF_TC_BODY(copy_efault, tc)
+{
+	char buf[1024];
+
+	ATF_REQUIRE_EQ(rumpns_copyin(NULL, buf, sizeof(buf)), EFAULT);
+	ATF_REQUIRE_EQ(rumpns_copyout(buf, NULL, sizeof(buf)), EFAULT);
+
+	ATF_REQUIRE_EQ(rumpns_copyinstr(NULL, buf, sizeof(buf), NULL), EFAULT);
+	ATF_REQUIRE_EQ(rumpns_copyoutstr(buf, NULL, sizeof(buf), NULL), EFAULT);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, copystr);
+	ATF_TP_ADD_TC(tp, copyinstr);
+	ATF_TP_ADD_TC(tp, copyoutstr);
+	ATF_TP_ADD_TC(tp, copy_efault);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_kern.c b/contrib/netbsd-tests/rump/rumpkern/t_kern.c
new file mode 100644
index 000000000000..fcaf1f8178de
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_kern.c
@@ -0,0 +1,119 @@
+/*	$NetBSD: t_kern.c,v 1.3 2012/01/30 13:05:52 njoly Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/signal.h>
+#include <sys/wait.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+#define LOCKFUN(_name_, _descr_,_needld_, _expect_)			\
+	ATF_TC(lockme_##_name_);					\
+	ATF_TC_HEAD(lockme_##_name_, tc) {				\
+		atf_tc_set_md_var(tc, "descr", _descr_);		\
+	}								\
+	ATF_TC_BODY(lockme_##_name_, tc) {				\
+		locktest(tc, LOCKME_##_name_, _needld_, _expect_);	\
+	}
+
+static void
+locktest(const atf_tc_t *tc, enum locktest lt, int needld, const char *expect)
+{
+	extern const int rump_lockdebug;
+	int pipetti[2];
+	int status;
+
+	if (needld && !rump_lockdebug)
+		atf_tc_skip("test requires LOCKDEBUG kernel");
+	RL(pipe(pipetti));
+
+	switch (fork()) {
+	case 0:
+		RL(dup2(pipetti[1], STDOUT_FILENO));
+		RL(dup2(pipetti[1], STDOUT_FILENO));
+		rump_init();
+		rump_schedule();
+		rumptest_lockme(lt);
+		rump_unschedule();
+		break;
+	default:
+		RL(wait(&status));
+		ATF_REQUIRE(WIFSIGNALED(status) && WTERMSIG(status) == SIGABRT);
+		if (rump_lockdebug) {
+			char buf[8192];
+
+			ATF_REQUIRE(read(pipetti[0], buf, sizeof(buf)) > 0);
+			if (strncmp(buf, expect, strlen(expect)) != 0)
+				atf_tc_fail("unexpected output");
+		}
+		break;
+	case -1:
+		atf_tc_fail("fork");
+	}
+}
+
+LOCKFUN(DESTROYHELD, "destroy lock while held", 0,
+    "mutex error: lockdebug_free: is locked or in use");
+LOCKFUN(DOUBLEFREE, "free lock twice", 0,
+    "panic: lockdebug_lookup: uninitialized lock");
+LOCKFUN(DOUBLEINIT, "init lock twice", 1,
+    "mutex error: lockdebug_alloc: already initialized");
+LOCKFUN(MEMFREE, "free memory active lock is in", 1,
+    "mutex error: kmem_intr_free: allocation contains active lock");
+LOCKFUN(MTX, "locking-against-self mutex", 0,
+    "mutex error: lockdebug_wantlock: locking against myself");
+LOCKFUN(RWDOUBLEX, "locking-against-self exclusive rwlock", 0,
+    "rwlock error: lockdebug_wantlock: locking against myself");
+LOCKFUN(RWRX, "rw: first shared, then exclusive", 1,
+    "rwlock error: lockdebug_wantlock: locking against myself");
+LOCKFUN(RWXR, "rw: first execusive, then shared", 0,
+    "rwlock error: lockdebug_wantlock: locking against myself");
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, lockme_MTX);
+	ATF_TP_ADD_TC(tp, lockme_RWDOUBLEX);
+	ATF_TP_ADD_TC(tp, lockme_RWRX);
+	ATF_TP_ADD_TC(tp, lockme_RWXR);
+	ATF_TP_ADD_TC(tp, lockme_DOUBLEINIT);
+	ATF_TP_ADD_TC(tp, lockme_DOUBLEFREE);
+	ATF_TP_ADD_TC(tp, lockme_DESTROYHELD);
+	ATF_TP_ADD_TC(tp, lockme_MEMFREE);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c b/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c
new file mode 100644
index 000000000000..dcdfdb6f30a4
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c
@@ -0,0 +1,316 @@
+/*	$NetBSD: t_lwproc.c,v 1.5 2011/01/02 12:58:17 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(makelwp);
+ATF_TC_HEAD(makelwp, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "tests that lwps can be attached to "
+	    "processes");
+}
+
+ATF_TC_BODY(makelwp, tc)
+{
+	struct lwp *l;
+	pid_t pid;
+
+	rump_init();
+	RZ(rump_pub_lwproc_newlwp(0));
+	ATF_REQUIRE_EQ(rump_pub_lwproc_newlwp(37), ESRCH);
+	l = rump_pub_lwproc_curlwp();
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	ATF_REQUIRE(rump_pub_lwproc_curlwp() != l);
+	l = rump_pub_lwproc_curlwp();
+
+	RZ(rump_pub_lwproc_newlwp(rump_sys_getpid()));
+	ATF_REQUIRE(rump_pub_lwproc_curlwp() != l);
+
+	pid = rump_sys_getpid();
+	ATF_REQUIRE(pid != -1 && pid != 0);
+}
+
+ATF_TC(proccreds);
+ATF_TC_HEAD(proccreds, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that procs have different creds");
+}
+
+ATF_TC_BODY(proccreds, tc)
+{
+	struct lwp *l1, *l2;
+
+	rump_init();
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	l1 = rump_pub_lwproc_curlwp();
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	l2 = rump_pub_lwproc_curlwp();
+
+	RL(rump_sys_setuid(22));
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 22);
+
+	rump_pub_lwproc_switch(l1);
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 0); /* from parent, proc0 */
+	RL(rump_sys_setuid(11));
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 11);
+
+	rump_pub_lwproc_switch(l2);
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 22);
+	rump_pub_lwproc_newlwp(rump_sys_getpid());
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 22);
+}
+
+
+ATF_TC(inherit);
+ATF_TC_HEAD(inherit, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "new processes inherit creds from "
+	    "parents");
+}
+
+ATF_TC_BODY(inherit, tc)
+{
+
+	rump_init();
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	RL(rump_sys_setuid(66));
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 66);
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 66);
+
+	/* release lwp and proc */
+	rump_pub_lwproc_releaselwp();
+	ATF_REQUIRE_EQ(rump_sys_getuid(), 0);
+}
+
+ATF_TC(lwps);
+ATF_TC_HEAD(lwps, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "proc can hold many lwps and is "
+	    "automatically g/c'd when the last one exits");
+}
+
+#define LOOPS 128
+ATF_TC_BODY(lwps, tc)
+{
+	struct lwp *l[LOOPS];
+	pid_t mypid;
+	struct lwp *l_orig;
+	int i;
+
+	rump_init();
+
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	mypid = rump_sys_getpid();
+	RL(rump_sys_setuid(375));
+
+	l_orig = rump_pub_lwproc_curlwp();
+	for (i = 0; i < LOOPS; i++) {
+		mypid = rump_sys_getpid();
+		ATF_REQUIRE(mypid != -1 && mypid != 0);
+		RZ(rump_pub_lwproc_newlwp(mypid));
+		l[i] = rump_pub_lwproc_curlwp();
+		ATF_REQUIRE_EQ(rump_sys_getuid(), 375);
+	}
+
+	rump_pub_lwproc_switch(l_orig);
+	rump_pub_lwproc_releaselwp();
+	for (i = 0; i < LOOPS; i++) {
+		rump_pub_lwproc_switch(l[i]);
+		ATF_REQUIRE_EQ(rump_sys_getpid(), mypid);
+		ATF_REQUIRE_EQ(rump_sys_getuid(), 375);
+		rump_pub_lwproc_releaselwp();
+		ATF_REQUIRE_EQ(rump_sys_getpid(), 1);
+		ATF_REQUIRE_EQ(rump_sys_getuid(), 0);
+	}
+
+	ATF_REQUIRE_EQ(rump_pub_lwproc_newlwp(mypid), ESRCH);
+}
+
+ATF_TC(nolwprelease);
+ATF_TC_HEAD(nolwprelease, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that lwp context is required "
+	    "for lwproc_releaselwp()");
+}
+
+ATF_TC_BODY(nolwprelease, tc)
+{
+	int status;
+
+	switch (fork()) {
+	case 0:
+		rump_init();
+		rump_pub_lwproc_releaselwp();
+		atf_tc_fail("survived");
+		break;
+	case -1:
+		atf_tc_fail_errno("fork");
+		break;
+	default:
+		wait(&status);
+		ATF_REQUIRE(WIFSIGNALED(status));
+		ATF_REQUIRE_EQ(WTERMSIG(status), SIGABRT);
+
+	}
+}
+
+ATF_TC(nolwp);
+ATF_TC_HEAD(nolwp, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that curlwp for an implicit "
+	    "context is NULL");
+}
+
+ATF_TC_BODY(nolwp, tc)
+{
+
+	rump_init();
+	ATF_REQUIRE_EQ(rump_pub_lwproc_curlwp(), NULL);
+}
+
+ATF_TC(nullswitch);
+ATF_TC_HEAD(nullswitch, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that switching to NULL marks "
+	    "current lwp as not running");
+}
+
+ATF_TC_BODY(nullswitch, tc)
+{
+	struct lwp *l;
+
+	rump_init();
+	RZ(rump_pub_lwproc_newlwp(0));
+	l = rump_pub_lwproc_curlwp();
+	rump_pub_lwproc_switch(NULL);
+	/* if remains LP_RUNNING, next call will panic */
+	rump_pub_lwproc_switch(l);
+}
+
+ATF_TC(rfork);
+ATF_TC_HEAD(rfork, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "check that fork shares fd's");
+}
+
+ATF_TC_BODY(rfork, tc)
+{
+	struct stat sb;
+	struct lwp *l, *l2;
+	int fd;
+
+	RZ(rump_init());
+
+	ATF_REQUIRE_EQ(rump_pub_lwproc_rfork(RUMP_RFFDG|RUMP_RFCFDG), EINVAL);
+
+	RZ(rump_pub_lwproc_rfork(0));
+	l = rump_pub_lwproc_curlwp();
+
+	RL(fd = rump_sys_open("/file", O_RDWR | O_CREAT, 0777));
+
+	/* ok, first check rfork(RUMP_RFCFDG) does *not* preserve fd's */
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+	ATF_REQUIRE_ERRNO(EBADF, rump_sys_write(fd, &fd, sizeof(fd)) == -1);
+
+	/* then check that rfork(0) does */
+	rump_pub_lwproc_switch(l);
+	RZ(rump_pub_lwproc_rfork(0));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, &fd, sizeof(fd)), sizeof(fd));
+	RL(rump_sys_fstat(fd, &sb));
+	l2 = rump_pub_lwproc_curlwp();
+
+	/*
+	 * check that the shared fd table is really shared by
+	 * closing fd in parent
+	 */
+	rump_pub_lwproc_switch(l);
+	RL(rump_sys_close(fd));
+	rump_pub_lwproc_switch(l2);
+	ATF_REQUIRE_ERRNO(EBADF, rump_sys_fstat(fd, &sb) == -1);
+
+	/* redo, this time copying the fd table instead of sharing it */
+	rump_pub_lwproc_releaselwp();
+	rump_pub_lwproc_switch(l);
+	RL(fd = rump_sys_open("/file", O_RDWR, 0777));
+	RZ(rump_pub_lwproc_rfork(RUMP_RFFDG));
+	ATF_REQUIRE_EQ(rump_sys_write(fd, &fd, sizeof(fd)), sizeof(fd));
+	RL(rump_sys_fstat(fd, &sb));
+	l2 = rump_pub_lwproc_curlwp();
+
+	/* check that the fd table is copied */
+	rump_pub_lwproc_switch(l);
+	RL(rump_sys_close(fd));
+	rump_pub_lwproc_switch(l2);
+	RL(rump_sys_fstat(fd, &sb));
+	ATF_REQUIRE_EQ(sb.st_size, sizeof(fd));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, makelwp);
+	ATF_TP_ADD_TC(tp, proccreds);
+	ATF_TP_ADD_TC(tp, inherit);
+	ATF_TP_ADD_TC(tp, lwps);
+	ATF_TP_ADD_TC(tp, nolwprelease);
+	ATF_TP_ADD_TC(tp, nolwp);
+	ATF_TP_ADD_TC(tp, nullswitch);
+	ATF_TP_ADD_TC(tp, rfork);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_modcmd.c b/contrib/netbsd-tests/rump/rumpkern/t_modcmd.c
new file mode 100644
index 000000000000..032e31296a98
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_modcmd.c
@@ -0,0 +1,182 @@
+/*	$NetBSD: t_modcmd.c,v 1.9 2010/05/31 23:51:28 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "../../h_macros.h"
+/*
+ * We verify that modules can be loaded and unloaded.
+ * tmpfs was chosen because it does not depend on an image.
+ */
+
+ATF_TC(cmsg_modcmd);
+ATF_TC_HEAD(cmsg_modcmd, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks that loading and unloading "
+	    "a module (vfs/tmpfs) is possible");
+}
+
+static int
+disable_autoload(void)
+{
+	struct sysctlnode q, ans[256];
+	int mib[3];
+	size_t alen;
+	unsigned i;
+	bool no;
+
+	mib[0] = CTL_KERN;
+	mib[1] = CTL_QUERY;
+	alen = sizeof(ans);
+
+	memset(&q, 0, sizeof(q));
+	q.sysctl_flags = SYSCTL_VERSION;
+
+	if (rump_sys___sysctl(mib, 2, ans, &alen, &q, sizeof(q)) == -1)
+		return -1;
+
+	for (i = 0; i < __arraycount(ans); i++)
+		if (strcmp("module", ans[i].sysctl_name) == 0)
+			break;
+	if (i == __arraycount(ans)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	mib[1] = ans[i].sysctl_num;
+	mib[2] = CTL_QUERY;
+
+	if (rump_sys___sysctl(mib, 3, ans, &alen, &q, sizeof(q)) == -1)
+		return errno;
+
+	for (i = 0; i < __arraycount(ans); i++)
+		if (strcmp("autoload", ans[i].sysctl_name) == 0)
+			break;
+	if (i == __arraycount(ans)) {
+		errno = ENOENT;
+		return -1;
+	}
+
+	mib[2] = ans[i].sysctl_num;
+
+	no = false;
+	alen = 0;
+	if (rump_sys___sysctl(mib, 3, NULL, &alen, &no, sizeof(no)) == -1)
+		return errno;
+
+	return 0;
+
+}
+
+#define TMPFSMODULE "librumpfs_tmpfs.so"
+ATF_TC_BODY(cmsg_modcmd, tc)
+{
+	struct tmpfs_args args;
+	const struct modinfo *const *mi_start, *const *mi_end;
+	void *handle;
+	int i, rv, loop = 0;
+
+	rump_init();
+
+	if (disable_autoload() == -1)
+		atf_tc_fail_errno("count not disable module autoload");
+
+	memset(&args, 0, sizeof(args));
+	args.ta_version = TMPFS_ARGS_VERSION;
+	args.ta_root_mode = 0777;
+	
+	if (rump_sys_mkdir("/mp", 0777) == -1)
+		atf_tc_fail_errno("mkdir mountpoint");
+	if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) != -1)
+		atf_tc_fail("mount unexpectedly succeeded");
+
+	handle = dlopen(TMPFSMODULE, RTLD_GLOBAL);
+	if (handle == NULL) {
+		const char *dlmsg = dlerror();
+		atf_tc_fail("cannot open %s: %s", TMPFSMODULE, dlmsg);
+	}
+
+ again:
+	mi_start = dlsym(handle, "__start_link_set_modules");
+	mi_end = dlsym(handle, "__stop_link_set_modules");
+	if (mi_start == NULL || mi_end == NULL)
+		atf_tc_fail("cannot find module info");
+	if ((rv = rump_pub_module_init(mi_start, (size_t)(mi_end-mi_start)))!=0)
+		atf_tc_fail("module init failed: %d (%s)", rv, strerror(rv));
+	if ((rv = rump_pub_module_init(mi_start, (size_t)(mi_end-mi_start)))==0)
+		atf_tc_fail("module double init succeeded");
+
+	if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) == -1)
+		atf_tc_fail_errno("still cannot mount");
+	if (rump_sys_unmount("/mp", 0) == -1)
+		atf_tc_fail("cannot unmount");
+	for (i = 0; i < (int)(mi_end-mi_start); i++) {
+		if ((rv = rump_pub_module_fini(mi_start[i])) != 0)
+			atf_tc_fail("module fini failed: %d (%s)",
+			    rv, strerror(rv));
+	}
+	for (i = 0; i < (int)(mi_end-mi_start); i++) {
+		if ((rv = rump_pub_module_fini(mi_start[i])) == 0)
+			atf_tc_fail("module double fini succeeded");
+	}
+	if (loop++ == 0)
+		goto again;
+
+	if (dlclose(handle)) {
+		const char *dlmsg = dlerror();
+		atf_tc_fail("cannot close %s: %s", TMPFSMODULE, dlmsg);
+	}
+
+	if (rump_sys_mount(MOUNT_TMPFS, "/mp", 0, &args, sizeof(args)) != -1)
+		atf_tc_fail("mount unexpectedly succeeded");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, cmsg_modcmd);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_modlinkset.c b/contrib/netbsd-tests/rump/rumpkern/t_modlinkset.c
new file mode 100644
index 000000000000..a4d34bb913fd
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_modlinkset.c
@@ -0,0 +1,73 @@
+/*	$NetBSD: t_modlinkset.c,v 1.2 2009/11/06 15:26:54 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <rump/rump.h>
+#include <rump/ukfs.h>
+
+#include <atf-c.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(modlinkset);
+ATF_TC_HEAD(modlinkset, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Check that module linkset bootstrap "
+	    "works");
+}
+
+/*
+ * We link against cd9660 and msdosfs (both chosed because the names
+ * are unlikely to ever be a substring of a another file system).
+ * Without proper linkset handling at most one will be reported.
+ */
+ATF_TC_BODY(modlinkset, tc)
+{
+	char buf[1024];
+
+	rump_init();
+	if (ukfs_vfstypes(buf, sizeof(buf)) == -1)
+		atf_tc_fail_errno("ukfs_vfstypes");
+
+	ATF_CHECK((strstr(buf, "msdos") != NULL));
+	ATF_CHECK((strstr(buf, "cd9660") != NULL));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, modlinkset);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_signals.c b/contrib/netbsd-tests/rump/rumpkern/t_signals.c
new file mode 100644
index 000000000000..e113af29a1fa
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_signals.c
@@ -0,0 +1,127 @@
+/*	$NetBSD: t_signals.c,v 1.2 2011/02/20 19:45:45 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <rump/rump.h>
+
+#include "../kernspace/kernspace.h"
+#include "../../h_macros.h"
+
+ATF_TC(sigraise);
+ATF_TC_HEAD(sigraise, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "RUMP_SIGMODEL_RAISE");
+}
+
+ATF_TC(sigignore);
+ATF_TC_HEAD(sigignore, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "RUMP_SIGMODEL_IGNORE");
+}
+
+ATF_TC(sigpanic);
+ATF_TC_HEAD(sigpanic, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "RUMP_SIGMODEL_PANIC");
+}
+
+static volatile sig_atomic_t sigcnt;
+static void
+thehand(int sig)
+{
+
+	sigcnt++;
+}
+
+ATF_TC_BODY(sigraise, tc)
+{
+
+	signal(SIGUSR2, thehand);
+	rump_boot_setsigmodel(RUMP_SIGMODEL_RAISE);
+
+	rump_init();
+	rump_schedule();
+	rumptest_localsig(SIGUSR2);
+	rump_unschedule();
+	ATF_REQUIRE_EQ(sigcnt, 1);
+}
+
+ATF_TC_BODY(sigignore, tc)
+{
+
+	rump_boot_setsigmodel(RUMP_SIGMODEL_IGNORE);
+
+	rump_init();
+	rump_schedule();
+	rumptest_localsig(SIGKILL);
+	rump_unschedule();
+}
+
+ATF_TC_BODY(sigpanic, tc)
+{
+	int status;
+
+	rump_boot_setsigmodel(RUMP_SIGMODEL_PANIC);
+
+	switch (fork()) {
+	case 0:
+		rump_init();
+		rump_schedule();
+		rumptest_localsig(SIGCONT);
+		/* NOTREACHED */
+		exit(1);
+	default:
+		wait(&status);
+		ATF_REQUIRE(WIFSIGNALED(status) && WTERMSIG(status) == SIGABRT);
+		break;
+	case -1:
+		atf_tc_fail_errno("fork");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, sigraise);
+	ATF_TP_ADD_TC(tp, sigignore);
+	ATF_TP_ADD_TC(tp, sigpanic);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_sp.sh b/contrib/netbsd-tests/rump/rumpkern/t_sp.sh
new file mode 100755
index 000000000000..9d11d2af7085
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_sp.sh
@@ -0,0 +1,128 @@
+#	$NetBSD: t_sp.sh,v 1.12 2014/08/30 12:14:17 gson Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		${check_function} " "${@}" "; \
+	}"
+        eval "${name}_cleanup() { \
+		RUMP_SERVER=unix://commsock rump.halt
+        }"
+}
+
+test_case basic basic
+test_case stress_short stress 1
+test_case stress_long stress 2
+test_case stress_killer stress 5 kill
+test_case fork_simple fork simple
+test_case fork_pipecomm fork pipecomm
+test_case fork_fakeauth fork fakeauth
+test_case sigsafe sigsafe sigsafe
+test_case signal signal
+test_case reconnect reconnect
+
+basic()
+{
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 rump_server ${RUMP_SERVER}
+	atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_simplecli
+}
+
+stress_short_head()
+{
+	atf_set "require.memory" "64M"
+}
+
+stress_long_head()
+{
+	atf_set "require.memory" "64M"
+}
+
+stress()
+{
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 rump_server \
+	    -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet ${RUMP_SERVER}
+	atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_stresscli $@
+}
+
+fork()
+{
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
+	atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_forkcli ${1}
+}
+
+sigsafe()
+{
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 rump_server ${RUMP_SERVER}
+	atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_sigcli
+
+}
+
+signal()
+{
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 $(atf_get_srcdir)/h_server/h_simpleserver \
+	    ${RUMP_SERVER} sendsig 27
+	atf_check -s signal:27 $(atf_get_srcdir)/h_client/h_simplecli block
+}
+
+reconnect()
+{
+
+
+	export RUMP_SERVER=unix://commsock
+	atf_check -s exit:0 rump_server ${RUMP_SERVER}
+	atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_reconcli 2
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+	atf_add_test_case stress_short
+	atf_add_test_case stress_long
+	atf_add_test_case stress_killer
+	atf_add_test_case fork_simple
+	atf_add_test_case fork_pipecomm
+	atf_add_test_case fork_fakeauth
+	atf_add_test_case sigsafe
+	atf_add_test_case signal
+	atf_add_test_case reconnect
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_threads.c b/contrib/netbsd-tests/rump/rumpkern/t_threads.c
new file mode 100644
index 000000000000..24155ec7ca14
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_threads.c
@@ -0,0 +1,81 @@
+/*	$NetBSD: t_threads.c,v 1.1 2010/05/31 23:36:12 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(threadjoin);
+ATF_TC_HEAD(threadjoin, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks joinable threads work");
+}
+
+ATF_TC_BODY(threadjoin, tc)
+{
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_threadjoin(); /* panics if fails */
+	rump_unschedule();
+}
+
+ATF_TC(kthread);
+ATF_TC_HEAD(kthread, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks kthread_create/exit works");
+}
+
+ATF_TC_BODY(kthread, tc)
+{
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_threadjoin(); /* panics if fails */
+	rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, threadjoin);
+	ATF_TP_ADD_TC(tp, kthread);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_tsleep.c b/contrib/netbsd-tests/rump/rumpkern/t_tsleep.c
new file mode 100644
index 000000000000..efd9f4c4b270
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_tsleep.c
@@ -0,0 +1,63 @@
+/*	$NetBSD: t_tsleep.c,v 1.1 2010/05/31 23:36:12 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(tsleep);
+ATF_TC_HEAD(tsleep, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check tsleep variants");
+}
+
+ATF_TC_BODY(tsleep, tc)
+{
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_tsleep(); /* panics if fails */
+	rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, tsleep);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpkern/t_vm.c b/contrib/netbsd-tests/rump/rumpkern/t_vm.c
new file mode 100644
index 000000000000..4445983dcb56
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpkern/t_vm.c
@@ -0,0 +1,91 @@
+/*	$NetBSD: t_vm.c,v 1.3 2012/03/17 18:00:28 hannken Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../../h_macros.h"
+#include "../kernspace/kernspace.h"
+
+ATF_TC(busypage);
+ATF_TC_HEAD(busypage, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks VM pagewaits work");
+}
+
+ATF_TC_BODY(busypage, tc)
+{
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_busypage();
+	rump_unschedule();
+}
+
+ATF_TC(uvmwait);
+ATF_TC_HEAD(uvmwait, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests that uvm_wait works");
+	atf_tc_set_md_var(tc, "timeout", "30");
+}
+
+#define UVMWAIT_LIMIT 1024*1024
+ATF_TC_BODY(uvmwait, tc)
+{
+	char buf[64];
+
+	/* limit rump kernel memory */
+	snprintf(buf, sizeof(buf), "%d", UVMWAIT_LIMIT);
+	setenv("RUMP_MEMLIMIT", buf, 1);
+
+	rump_init();
+
+	rump_schedule();
+	rumptest_alloc(UVMWAIT_LIMIT);
+	rump_unschedule();
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, busypage);
+	ATF_TP_ADD_TC(tp, uvmwait);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh b/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh
new file mode 100755
index 000000000000..dc463f2ba435
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh
@@ -0,0 +1,80 @@
+#	$NetBSD: t_shmif.sh,v 1.2 2013/09/09 19:27:49 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case crossping cleanup
+
+NKERN=8
+
+crossping_head()
+{
+	atf_set "descr" "run $NKERN rump kernels on one shmif bus and crossping"
+}
+
+startserver()
+{
+
+	export RUMP_SERVER=unix://sock${1}
+	atf_check -s exit:0 rump_server -lrumpnet -lrumpnet_net \
+	    -lrumpnet_netinet -lrumpnet_shmif ${RUMP_SERVER}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+	atf_check -s exit:0 rump.ifconfig shmif0 inet 1.1.1.${1}
+}
+
+pingothers()
+{
+
+}
+
+crossping_body()
+{
+
+	for x in `jot ${NKERN}` ; do startserver $x ; done
+	for x in `jot ${NKERN}`
+	do
+		export RUMP_SERVER=unix://sock${x}
+		for y in `jot ${NKERN}`
+		do
+			[ ${y} -eq ${x} ] && continue
+			atf_check -s exit:0 -o ignore -e ignore \
+			    rump.ping -c 1 1.1.1.${y}
+		done
+	done
+}
+
+crossping_cleanup()
+{
+
+	for x in `jot ${NKERN}` ; do RUMP_SERVER=unix://sock${x} rump.halt ;done
+	:
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case crossping
+}
diff --git a/contrib/netbsd-tests/rump/rumpvfs/t_basic.c b/contrib/netbsd-tests/rump/rumpvfs/t_basic.c
new file mode 100644
index 000000000000..c136558b579b
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpvfs/t_basic.c
@@ -0,0 +1,81 @@
+/*	$NetBSD: t_basic.c,v 1.2 2011/02/22 13:25:18 pooka Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(lseekrv);
+ATF_TC_HEAD(lseekrv, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Test lseek return values");
+}
+
+#define TESTFILE "testi"
+
+#define FIVE_MEGS (5*1024*1024)
+#define FIVE_GIGS (5*1024*1024*1024LL)
+
+ATF_TC_BODY(lseekrv, tc)
+{
+	off_t rv;
+	int fd;
+
+	RZ(rump_init());
+	RL(fd = rump_sys_open(TESTFILE, O_RDWR | O_CREAT, 0777));
+
+	rv = rump_sys_lseek(37, FIVE_MEGS, SEEK_SET);
+	ATF_REQUIRE_ERRNO(EBADF, rv == -1);
+
+	rv = rump_sys_lseek(fd, FIVE_MEGS, SEEK_SET);
+	ATF_REQUIRE_EQ(rv, FIVE_MEGS);
+
+	rv = rump_sys_lseek(fd, FIVE_GIGS, SEEK_SET);
+	ATF_REQUIRE_EQ(rv, FIVE_GIGS);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, lseekrv);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpvfs/t_etfs.c b/contrib/netbsd-tests/rump/rumpvfs/t_etfs.c
new file mode 100644
index 000000000000..787f5e6eb9df
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpvfs/t_etfs.c
@@ -0,0 +1,302 @@
+/*	$NetBSD: t_etfs.c,v 1.10 2014/05/12 15:33:12 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(reregister_reg);
+ATF_TC_HEAD(reregister_reg, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests register/unregister/register "
+	    "for a regular file");
+}
+
+#define TESTSTR1 "hi, it's me again!"
+#define TESTSTR1SZ (sizeof(TESTSTR1)-1)
+
+#define TESTSTR2 "what about the old vulcan proverb?"
+#define TESTSTR2SZ (sizeof(TESTSTR2)-1)
+
+#define TESTPATH1 "/trip/to/the/moon"
+#define TESTPATH2 "/but/not/the/dark/size"
+ATF_TC_BODY(reregister_reg, tc)
+{
+	char buf[1024];
+	int localfd, etcfd;
+	ssize_t n;
+	int tfd;
+
+	etcfd = open("/etc/passwd", O_RDONLY);
+	ATF_REQUIRE(etcfd != -1);
+
+	localfd = open("./testfile", O_RDWR | O_CREAT, 0666);
+	ATF_REQUIRE(localfd != -1);
+
+	ATF_REQUIRE_EQ(write(localfd, TESTSTR1, TESTSTR1SZ), TESTSTR1SZ);
+	/* testfile now contains test string */
+
+	rump_init();
+
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH1, "/etc/passwd",
+	    RUMP_ETFS_REG), 0);
+	tfd = rump_sys_open(TESTPATH1, O_RDONLY);
+	ATF_REQUIRE(tfd != -1);
+	ATF_REQUIRE(rump_sys_read(tfd, buf, sizeof(buf)) > 0);
+	rump_sys_close(tfd);
+	rump_pub_etfs_remove(TESTPATH1);
+
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH2, "./testfile",
+	    RUMP_ETFS_REG), 0);
+	tfd = rump_sys_open(TESTPATH2, O_RDWR);
+	ATF_REQUIRE(tfd != -1);
+	memset(buf, 0, sizeof(buf));
+	ATF_REQUIRE((n = rump_sys_read(tfd, buf, sizeof(buf))) > 0);
+
+	/* check that we have what we expected */
+	ATF_REQUIRE_STREQ(buf, TESTSTR1);
+
+	/* ... while here, check that writing works too */
+	ATF_REQUIRE_EQ(rump_sys_lseek(tfd, 0, SEEK_SET), 0);
+	ATF_REQUIRE(TESTSTR1SZ <= TESTSTR2SZ);
+	ATF_REQUIRE_EQ(rump_sys_write(tfd, TESTSTR2, TESTSTR2SZ), TESTSTR2SZ);
+
+	memset(buf, 0, sizeof(buf));
+	ATF_REQUIRE_EQ(lseek(localfd, 0, SEEK_SET), 0);
+	ATF_REQUIRE(read(localfd, buf, sizeof(buf)) > 0);
+	ATF_REQUIRE_STREQ(buf, TESTSTR2);
+	close(etcfd);
+	close(localfd);
+}
+
+ATF_TC(reregister_blk);
+ATF_TC_HEAD(reregister_blk, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests register/unregister/register "
+	    "for a block device");
+}
+
+ATF_TC_BODY(reregister_blk, tc)
+{
+	char buf[512 * 128];
+	char cmpbuf[512 * 128];
+	int rv, tfd;
+
+	/* first, create some image files */
+	rv = system("dd if=/dev/zero bs=512 count=64 "
+	    "| tr '\\0' '\\1' > disk1.img");
+	ATF_REQUIRE_EQ(rv, 0);
+
+	rv = system("dd if=/dev/zero bs=512 count=128 "
+	    "| tr '\\0' '\\2' > disk2.img");
+	ATF_REQUIRE_EQ(rv, 0);
+
+	rump_init();
+
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH1, "./disk1.img",
+	    RUMP_ETFS_BLK), 0);
+	tfd = rump_sys_open(TESTPATH1, O_RDONLY);
+	ATF_REQUIRE(tfd != -1);
+	ATF_REQUIRE_EQ(rump_sys_read(tfd, buf, sizeof(buf)), 64*512);
+	memset(cmpbuf, 1, sizeof(cmpbuf));
+	ATF_REQUIRE_EQ(memcmp(buf, cmpbuf, 64*512), 0);
+	ATF_REQUIRE_EQ(rump_sys_close(tfd), 0);
+	ATF_REQUIRE_EQ(rump_pub_etfs_remove(TESTPATH1), 0);
+
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH2, "./disk2.img",
+	    RUMP_ETFS_BLK), 0);
+	tfd = rump_sys_open(TESTPATH2, O_RDONLY);
+	ATF_REQUIRE(tfd != -1);
+	ATF_REQUIRE_EQ(rump_sys_read(tfd, buf, sizeof(buf)), 128*512);
+	memset(cmpbuf, 2, sizeof(cmpbuf));
+	ATF_REQUIRE_EQ(memcmp(buf, cmpbuf, 128*512), 0);
+	ATF_REQUIRE_EQ(rump_sys_close(tfd), 0);
+	ATF_REQUIRE_EQ(rump_pub_etfs_remove(TESTPATH2), 0);
+}
+
+ATF_TC_WITH_CLEANUP(large_blk);
+ATF_TC_HEAD(large_blk, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Check etfs block devices work for "
+	    ">2TB images");
+}
+
+#define IMG_ON_MFS "mfsdir/disk.img"
+ATF_TC_BODY(large_blk, tc)
+{
+	char buf[128];
+	char cmpbuf[128];
+	ssize_t n;
+	int rv, tfd;
+
+	/*
+	 * mount mfs.  it would be nice if this would not be required,
+	 * but a) tmpfs doesn't "support" sparse files b) we don't really
+	 * know what fs atf workdir is on anyway.
+	 */
+	if (mkdir("mfsdir", 0777) == -1)
+		atf_tc_fail_errno("mkdir failed");
+	if (system("mount_mfs -s 64m -o nosuid,nodev mfs mfsdir") != 0)
+		atf_tc_skip("could not mount mfs");
+
+	/* create a 8TB sparse file */
+	rv = system("dd if=/dev/zero of=" IMG_ON_MFS " bs=1 count=1 seek=8t");
+	ATF_REQUIRE_EQ(rv, 0);
+
+	/*
+	 * map it and issue write at 6TB, then unmap+remap and check
+	 * we get the same stuff back
+	 */
+
+	rump_init();
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH1, IMG_ON_MFS,
+	    RUMP_ETFS_BLK), 0);
+	tfd = rump_sys_open(TESTPATH1, O_RDWR);
+	ATF_REQUIRE(tfd != -1);
+	memset(buf, 12, sizeof(buf));
+	n = rump_sys_pwrite(tfd, buf, sizeof(buf), 6*1024*1024*1024ULL*1024ULL);
+	ATF_REQUIRE_EQ(n, sizeof(buf));
+	ATF_REQUIRE_EQ(rump_sys_close(tfd), 0);
+	ATF_REQUIRE_EQ(rump_pub_etfs_remove(TESTPATH1), 0);
+
+	ATF_REQUIRE_EQ(rump_pub_etfs_register(TESTPATH2, IMG_ON_MFS,
+	    RUMP_ETFS_BLK), 0);
+	tfd = rump_sys_open(TESTPATH2, O_RDWR);
+	ATF_REQUIRE(tfd != -1);
+	memset(buf, 0, sizeof(buf));
+	n = rump_sys_pread(tfd, buf, sizeof(buf), 6*1024*1024*1024ULL*1024ULL);
+	ATF_REQUIRE_EQ(n, sizeof(buf));
+
+	memset(cmpbuf, 12, sizeof(cmpbuf));
+	ATF_REQUIRE_EQ(memcmp(cmpbuf, buf, 128), 0);
+}
+
+ATF_TC_CLEANUP(large_blk, tc)
+{
+
+	system("umount mfsdir");
+}
+
+ATF_TC(range_blk);
+ATF_TC_HEAD(range_blk, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks ranged (offset,size) mappings");
+}
+
+ATF_TC_BODY(range_blk, tc)
+{
+	char buf[32000];
+	char cmpbuf[32000];
+	ssize_t n;
+	int rv, tfd;
+
+	/* create a 64000 byte file with 16 1's at offset = 32000 */
+	rv = system("dd if=/dev/zero of=disk.img bs=1000 count=64");
+	ATF_REQUIRE_EQ(rv, 0);
+	rv = system("yes | tr '\\ny' '\\1' "
+	    "| dd of=disk.img conv=notrunc bs=1 count=16 seek=32000");
+	ATF_REQUIRE_EQ(rv, 0);
+
+	/* map the file at [16000,48000].  this puts our 1's at offset 16000 */
+	rump_init();
+	ATF_REQUIRE_EQ(rump_pub_etfs_register_withsize(TESTPATH1, "disk.img",
+	    RUMP_ETFS_BLK, 16000, 32000), 0);
+	tfd = rump_sys_open(TESTPATH1, O_RDWR);
+	ATF_REQUIRE(tfd != -1);
+	n = rump_sys_read(tfd, buf, sizeof(buf));
+	ATF_REQUIRE_EQ(n, sizeof(buf));
+	ATF_REQUIRE_EQ(rump_sys_close(tfd), 0);
+	ATF_REQUIRE_EQ(rump_pub_etfs_remove(TESTPATH1), 0);
+
+	/* check that we got what is expected */
+	memset(cmpbuf, 0, sizeof(cmpbuf));
+	memset(cmpbuf+16000, 1, 16);
+	ATF_REQUIRE_EQ(memcmp(buf, cmpbuf, sizeof(buf)), 0);
+}
+
+ATF_TC(key);
+ATF_TC_HEAD(key, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Checks key format");
+}
+
+ATF_TC_BODY(key, tc)
+{
+
+	RZ(rump_init());
+
+	RL(open("hostfile", O_RDWR | O_CREAT, 0777));
+
+	RZ(rump_pub_etfs_register("/key", "hostfile", RUMP_ETFS_REG));
+	ATF_REQUIRE_EQ(rump_pub_etfs_register("key", "hostfile", RUMP_ETFS_REG),
+	    EINVAL);
+
+	RL(rump_sys_open("/key", O_RDONLY));
+	RL(rump_sys_open("////////key", O_RDONLY));
+
+	RZ(rump_pub_etfs_register("////key//with/slashes", "hostfile",
+	    RUMP_ETFS_REG));
+
+	RL(rump_sys_open("/key//with/slashes", O_RDONLY));
+	RL(rump_sys_open("key//with/slashes", O_RDONLY));
+	ATF_REQUIRE_ERRNO(ENOENT,
+	    rump_sys_open("/key/with/slashes", O_RDONLY) == -1);
+
+	RL(rump_sys_mkdir("/a", 0777));
+	ATF_REQUIRE_ERRNO(ENOENT,
+	    rump_sys_open("/a/key//with/slashes", O_RDONLY) == -1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, reregister_reg);
+	ATF_TP_ADD_TC(tp, reregister_blk);
+	ATF_TP_ADD_TC(tp, large_blk);
+	ATF_TP_ADD_TC(tp, range_blk);
+	ATF_TP_ADD_TC(tp, key);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c b/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c
new file mode 100644
index 000000000000..735c607eb1cd
--- /dev/null
+++ b/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c
@@ -0,0 +1,92 @@
+/*	$NetBSD: t_p2kifs.c,v 1.4 2014/02/07 15:29:23 hannken Exp $	*/
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "../../h_macros.h"
+
+ATF_TC(makecn);
+ATF_TC_HEAD(makecn, tc)
+{
+
+	atf_tc_set_md_var(tc, "descr", "Tests makecn/LOOKUP/freecn");
+}
+
+#define TESTFILE "testi"
+
+ATF_TC_BODY(makecn, tc)
+{
+	struct componentname *cn;
+	char pathstr[MAXPATHLEN] = TESTFILE;
+	struct vnode *vp;
+	extern struct vnode *rumpns_rootvnode;
+
+	rump_init();
+
+	/*
+	 * Strategy is to create a componentname, edit the passed
+	 * string, and then do a lookup with the componentname.
+	 */
+	RL(rump_sys_mkdir("/" TESTFILE, 0777));
+
+	/* need stable lwp for componentname */
+	RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
+
+	/* try it once with the right path */
+	cn = rump_pub_makecn(RUMP_NAMEI_LOOKUP, 0, pathstr, strlen(pathstr),
+	    rump_pub_cred_create(0, 0, 0, NULL), rump_pub_lwproc_curlwp());
+	RZ(RUMP_VOP_LOOKUP(rumpns_rootvnode, &vp, cn));
+	rump_pub_freecn(cn, RUMPCN_FREECRED);
+
+	/* and then with modification-in-the-middle */
+	cn = rump_pub_makecn(RUMP_NAMEI_LOOKUP, 0, pathstr, strlen(pathstr),
+	    rump_pub_cred_create(0, 0, 0, NULL), rump_pub_lwproc_curlwp());
+	strcpy(pathstr, "/muuta");
+	RZ(RUMP_VOP_LOOKUP(rumpns_rootvnode, &vp, cn));
+	rump_pub_freecn(cn, RUMPCN_FREECRED);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, makecn);
+
+	return atf_no_error();
+}
diff --git a/contrib/netbsd-tests/sbin/fsck_ffs/quotas_common.sh b/contrib/netbsd-tests/sbin/fsck_ffs/quotas_common.sh
new file mode 100755
index 000000000000..7d4ab58b9951
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/fsck_ffs/quotas_common.sh
@@ -0,0 +1,44 @@
+# $NetBSD: quotas_common.sh,v 1.2 2011/03/06 17:08:41 bouyer Exp $ 
+
+create_with_quotas()
+{
+	local endian=$1; shift
+	local vers=$1; shift
+	local uid=$(id -u)
+	local gid=$(id -g)
+
+	atf_check -o ignore -e ignore newfs -B ${endian} -O ${vers} \
+		-s 4000 -F ${IMG}
+	atf_check -o ignore -e ignore tunefs -q user -q group -F ${IMG}
+	atf_check -s exit:0 -o 'match:NO USER QUOTA INODE \(CREATED\)' \
+	    -o 'match:USER QUOTA MISMATCH FOR ID '${uid}': 0/0 SHOULD BE 1/1' \
+	    -o 'match:GROUP QUOTA MISMATCH FOR ID '${gid}': 0/0 SHOULD BE 1/1' \
+	    fsck_ffs -p -F ${IMG}
+}
+
+# from tests/ipf/h_common.sh via tests/sbin/resize_ffs
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local descr="${1}"; shift
+	
+	atf_test_case "${name}"
+
+	eval "${name}_head() { \
+		atf_set "descr" "Checks ${descr} quotas inodes"
+	}"
+	eval "${name}_body() { \
+		${check_function} " "${@}" "; \
+	}"
+	tests="${tests} ${name}"
+}
+
+atf_init_test_cases()
+{
+	IMG=fsimage
+	DIR=target
+	for i in ${tests}; do
+		atf_add_test_case $i
+	done
+}
diff --git a/contrib/netbsd-tests/sbin/fsck_ffs/t_check_quotas.sh b/contrib/netbsd-tests/sbin/fsck_ffs/t_check_quotas.sh
new file mode 100755
index 000000000000..804c5b54d772
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/fsck_ffs/t_check_quotas.sh
@@ -0,0 +1,73 @@
+# $NetBSD: t_check_quotas.sh,v 1.2 2011/03/06 17:08:41 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    test_case corrupt_list_${e}_${v} corrupt_list \
+	"recovery of corrupted free list in" ${e} ${v}
+    test_case expand1_list_${e}_${v} expand_list \
+	"allocation of direct block in" 40 ${e} ${v}
+    test_case expand2_list_${e}_${v} expand_list \
+	"allocation of indirect block in" 1000 ${e} ${v}
+  done
+done
+
+corrupt_list()
+{
+	create_with_quotas $*
+	local blkno=$(printf "inode 3\nblks\n" | /sbin/fsdb -nF -f ${IMG} | awk '$1 == "0:" {print $2}')
+	blkno=$(($blkno * 512 + 104))
+	#clear the free list
+	atf_check -o ignore -e ignore dd if=/dev/zero of=${IMG} bs=1 \
+		count=8 seek=${blkno} conv=notrunc
+	atf_check -s exit:0 \
+		-o "match:QUOTA ENTRY NOT IN LIST \(FIXED\)" \
+		fsck_ffs -fp -F ${IMG}
+	atf_check -s exit:0 -o "match:3 files" fsck_ffs -nf -F ${IMG}
+}
+
+expand_list()
+{
+	local nuid=$1; shift
+	local expected_files=$((nuid + 2))
+	echo "/set uid=0 gid=0" > spec
+	echo ".		type=dir  mode=0755" >> spec
+	mkdir ${DIR}
+	for i in $(seq ${nuid}); do
+		touch ${DIR}/f${i}
+		echo "./f$i	type=file mode=0600 uid=$i gid=$i" >> spec
+	done
+
+	atf_check -o ignore -e ignore makefs -B $1 -o version=$2 \
+		-F spec -s 4000b ${IMG} ${DIR}
+	atf_check -o ignore -e ignore tunefs -q user -F ${IMG}
+	atf_check -s exit:0 -o 'match:NO USER QUOTA INODE \(CREATED\)' \
+		-o 'match:USER QUOTA MISMATCH FOR ID 10: 0/0 SHOULD BE 0/1' \
+		fsck_ffs -p -F ${IMG}
+	atf_check -s exit:0 -o "match:${expected_files} files" \
+		fsck_ffs -nf -F ${IMG}
+}
diff --git a/contrib/netbsd-tests/sbin/fsck_ffs/t_enable_quotas.sh b/contrib/netbsd-tests/sbin/fsck_ffs/t_enable_quotas.sh
new file mode 100755
index 000000000000..314891185b49
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/fsck_ffs/t_enable_quotas.sh
@@ -0,0 +1,105 @@
+# $NetBSD: t_enable_quotas.sh,v 1.2 2011/03/06 17:08:41 bouyer Exp $ 
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+# 
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    test_case disable_${e}_${v} disable_quotas "creation/removal of" ${e} ${v}
+    test_case corrupt_${e}_${v} corrupt_quotas "repair of corrupted" ${e} ${v}
+    test_case unallocated_${e}_${v} unallocated_quotas \
+		"recovery of unallocated" ${e} ${v}
+    test_case dir1_${e}_${v} dir1_quotas \
+		"successfull clear of wrong type of" ${e} ${v}
+    test_case notreg_${e}_${v} notreg_quotas \
+		"successfull clear of wrong type of" ${e} ${v}
+  done
+done
+
+disable_quotas()
+{
+	create_with_quotas $*
+	
+# check that the quota inode creation didn't corrupt the filesystem
+	atf_check -s exit:0 -o "match:already clean" -o  "match:3 files" \
+		fsck_ffs -nf -F ${IMG}
+#now check fsck can properly clear the quota inode when quota flags are
+# cleared
+	atf_check -o ignore -e ignore tunefs -q nouser -q nogroup -F ${IMG}
+	atf_check -s exit:0 -o "match:SUPERBLOCK QUOTA FLAG CLEARED" \
+		fsck_ffs -fp -F ${IMG}
+	atf_check -s exit:0 -o "match:1 files, 1 used" fsck_ffs -nf -F ${IMG}
+}
+
+corrupt_quotas()
+{
+	create_with_quotas $*
+
+	local blkno=$(printf "inode 3\nblks\n" | /sbin/fsdb -nF -f ${IMG} | awk '$1 == "0:" {print $2}')
+	atf_check -o ignore -e ignore dd if=/dev/zero of=${IMG} bs=512 \
+		count=1 seek=${blkno} conv=notrunc
+	atf_check -s exit:0 \
+		-o "match:CORRUPTED USER QUOTA INODE 3 \(CLEARED\)" \
+		-o "match:NO USER QUOTA INODE \(CREATED\)" \
+		fsck_ffs -fp -F ${IMG}
+	atf_check -s exit:0 -o "match:3 files" fsck_ffs -nf -F ${IMG}
+}
+
+unallocated_quotas()
+{
+	create_with_quotas $*
+
+	atf_check -o ignore -e ignore clri ${IMG} 3
+	atf_check -s exit:0 \
+		-o "match:UNALLOCATED USER QUOTA INODE 3 \(CLEARED\)" \
+		-o "match:NO USER QUOTA INODE \(CREATED\)" \
+		fsck_ffs -fp -F ${IMG}
+	atf_check -s exit:0 -o "match:3 files" fsck_ffs -nf -F ${IMG}
+}
+
+dir1_quotas()
+{
+	create_with_quotas $*
+
+	atf_check -s exit:255 -o ignore -e ignore -x \
+		"printf 'inode 3\nchtype dir\nexit\n' | fsdb -F -f ${IMG}"
+	atf_check -s exit:0 \
+		-o "match:DIR I=3 CONNECTED. PARENT WAS I=0" \
+		-o "match:USER QUOTA INODE 3 IS A DIRECTORY" \
+		fsck_ffs -y -F ${IMG}
+}
+
+notreg_quotas()
+{
+	create_with_quotas $*
+
+	atf_check -s exit:255 -o ignore -e ignore -x \
+		"printf 'inode 3\nchtype fifo\nexit\n' | fsdb -F -f ${IMG}"
+	atf_check -s exit:0 \
+		-o "match:WRONG TYPE 4096 for USER QUOTA INODE 3 \(CLEARED\)" \
+		-o "match:NO USER QUOTA INODE \(CREATED\)" \
+		fsck_ffs -p -F ${IMG}
+	atf_check -s exit:0 -o "match:3 files" fsck_ffs -nf -F ${IMG}
+}
diff --git a/contrib/netbsd-tests/sbin/ifconfig/t_nonexistent.sh b/contrib/netbsd-tests/sbin/ifconfig/t_nonexistent.sh
new file mode 100755
index 000000000000..8670323e0e13
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/ifconfig/t_nonexistent.sh
@@ -0,0 +1,45 @@
+# $NetBSD: t_nonexistent.sh,v 1.4 2012/03/18 09:46:50 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case nonexistent
+nonexistent_head() {
+	atf_set "descr" "Check ifconfig(8) with " \
+		"a nonexistent interface (PR bin/43141)"
+}
+
+nonexistent_body() {
+
+	atf_check -s not-exit:0 -e ignore \
+		ifconfig nonexistent0 1.2.3.4/24
+}
+
+atf_init_test_cases() {
+	atf_add_test_case nonexistent
+}
diff --git a/contrib/netbsd-tests/sbin/newfs/quotas_common.sh b/contrib/netbsd-tests/sbin/newfs/quotas_common.sh
new file mode 100755
index 000000000000..3ea89a22b010
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/newfs/quotas_common.sh
@@ -0,0 +1,68 @@
+# $NetBSD: quotas_common.sh,v 1.3 2012/03/18 09:31:50 jruoho Exp $
+
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+#
+#  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.
+#
+
+create_with_quotas()
+{
+	local endian=$1; shift
+	local vers=$1; shift
+	local type=$1; shift
+	local op;
+	if [ ${type} = "both" ]; then
+		op="-q user -q group"
+	else
+		op="-q ${type}"
+	fi
+	atf_check -o ignore -e ignore newfs ${op} \
+		-B ${endian} -O ${vers} -s 4000 -F ${IMG}
+}
+
+# from tests/ipf/h_common.sh via tests/sbin/resize_ffs
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+	local descr="${1}"; shift
+
+	atf_test_case "${name}"
+
+	eval "${name}_head() { \
+		atf_set "descr" "Checks ${descr} quotas inodes"
+	}"
+	eval "${name}_body() { \
+		${check_function} " "${@}" "; \
+	}"
+	tests="${tests} ${name}"
+}
+
+atf_init_test_cases()
+{
+	IMG=fsimage
+	DIR=target
+	for i in ${tests}; do
+		atf_add_test_case $i
+	done
+}
diff --git a/contrib/netbsd-tests/sbin/newfs/t_enable_quotas.sh b/contrib/netbsd-tests/sbin/newfs/t_enable_quotas.sh
new file mode 100755
index 000000000000..62218e906057
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/newfs/t_enable_quotas.sh
@@ -0,0 +1,57 @@
+# $NetBSD: t_enable_quotas.sh,v 1.3 2012/03/18 09:31:50 jruoho Exp $
+#
+#  Copyright (c) 2011 Manuel Bouyer
+#  All rights reserved.
+#
+#  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.
+#
+
+for e in le be; do
+  for v in 1 2; do
+    for q in "user" "group"; do
+      test_case enabled_${e}_${v}_${q} quota_enabled_single \
+	 "creation of" ${e} ${v} ${q}
+    done
+    test_case enabled_${e}_${v}_"both" quota_enabled_both \
+	 "creation of" ${e} ${v} "both"
+  done
+done
+
+quota_enabled_single()
+{
+	create_with_quotas $*
+
+# check that the quota inode creation didn't corrupt the filesystem
+	atf_check -s exit:0 -o "match:already clean" -o "match:2 files" \
+		-o "match:Phase 6 - Check Quotas" \
+		fsck_ffs -nf -F ${IMG}
+}
+
+quota_enabled_both()
+{
+	create_with_quotas $*
+
+# check that the quota inode creation didn't corrupt the filesystem
+	atf_check -s exit:0 -o "match:already clean" -o "match:3 files" \
+		-o "match:Phase 6 - Check Quotas" \
+		fsck_ffs -nf -F ${IMG}
+}
diff --git a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh
new file mode 100755
index 000000000000..dc431166a469
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh
@@ -0,0 +1,45 @@
+# $NetBSD: t_create.sh,v 1.3 2014/01/05 12:59:03 martin Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case validfat32
+validfat32_head() {
+	atf_set "descr" "Verifies that fat32 created filesystems are valid"
+}
+validfat32_body() {
+
+	atf_check -s eq:0 -o ignore -e ignore \
+	    newfs_msdos -b 512 -C 33m -F 32 msdos.img
+#	fsck_msdos/newfs_msdos have been fixed
+#	atf_expect_fail "PR bin/46743"
+	atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img
+	atf_expect_pass
+}
+
+
+atf_init_test_cases() {
+	atf_add_test_case validfat32
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/common.sh b/contrib/netbsd-tests/sbin/resize_ffs/common.sh
new file mode 100755
index 000000000000..1b1d5da93d70
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/common.sh
@@ -0,0 +1,159 @@
+
+# Common settings and functions for the various resize_ffs tests.
+# 
+
+# called from atf_init_test_cases
+setupvars()
+{
+	IMG=fsimage
+	TDBASE64=$(atf_get_srcdir)/testdata.tar.gz.base64
+	GOODMD5=$(atf_get_srcdir)/testdata.md5
+	# set BYTESWAP to opposite-endian.
+	if [ $(sysctl -n hw.byteorder) = "1234" ]; then
+		BYTESWAP=be
+	else
+		BYTESWAP=le
+	fi
+}
+
+# test_case() taken from the tests/ipf/h_common.sh
+# Used to declare the atf goop for a test.
+test_case()
+{
+	local name="${1}"; shift
+	local check_function="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() { \
+		atf_set "require.user" "root" ; \
+		atf_set "require.progs" "rump_ffs" ; \
+	}"
+	eval "${name}_body() { \
+		${check_function} " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		umount -f mnt  ; \
+		: reset error ; \
+	}"
+}
+
+# Used to declare the atf goop for a test expected to fail.
+test_case_xfail()
+{
+	local name="${1}"; shift
+	local reason="${1}"; shift
+	local check_function="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() { \
+		atf_set "require.user" "root" ; \
+	}"
+	eval "${name}_body() { \
+		atf_expect_fail "${reason}" ; \
+		${check_function} " "${@}" "; \
+	}"
+	eval "${name}_cleanup() { \
+		umount -f mnt  ; \
+		: reset error ; \
+	}"
+}
+
+# copy_data requires the mount already done;  makes one copy of the test data
+copy_data ()
+{
+	uudecode -p ${TDBASE64} | (cd mnt; tar xzf - -s/testdata/TD$1/)
+}
+
+copy_multiple ()
+{
+	local i
+	for i in $(seq $1); do
+		copy_data $i
+	done
+}
+
+# remove_data removes one directory worth of test data; the purpose
+# is to ensure data exists near the end of the fs under test.
+remove_data ()
+{
+	rm -rf mnt/TD$1
+}
+
+remove_multiple ()
+{
+	local i
+	for i in $(seq $1); do
+		remove_data $i
+	done
+}
+
+# verify that the data in a particular directory is still OK
+# generated md5 file doesn't need explicit cleanup thanks to ATF
+check_data ()
+{
+	(cd mnt/TD$1 && md5 *) > TD$1.md5
+	atf_check diff -u ${GOODMD5} TD$1.md5
+}
+
+# supply begin and end arguments
+check_data_range ()
+{
+	local i
+	for i in $(seq $1 $2); do
+		check_data $i
+	done
+}
+
+
+resize_ffs()
+{
+	echo "in resize_ffs:" ${@}
+	local bs=$1
+	local fragsz=$2
+	local osize=$3
+	local nsize=$4
+	local fslevel=$5
+	local numdata=$6
+	local swap=$7
+	mkdir -p mnt
+	echo "bs is ${bs} numdata is ${numdata}"
+	echo "****resizing fs with blocksize ${bs}"
+
+	# we want no more than 16K/inode to allow test files to copy.
+	local fpi=$((fragsz * 4))
+	local i
+	if [ $fpi -gt 16384 ]; then
+		i="-i 16384"
+	fi
+	if [ x$swap != x ]; then
+		newfs -B ${BYTESWAP} -O${fslevel} -b ${bs} -f ${fragsz} \
+			-s ${osize} ${i} -F ${IMG}
+	else
+		newfs -O${fslevel} -b ${bs} -f ${fragsz} -s ${osize} ${i} \
+			-F ${IMG}
+	fi
+
+	# we're specifying relative paths, so rump_ffs warns - ignore.
+	atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
+	copy_multiple ${numdata}
+
+	if [ ${nsize} -lt ${osize} ]; then
+	    # how much data to remove so fs can be shrunk
+	    local remove=$((numdata-numdata*nsize/osize))
+	    local dataleft=$((numdata-remove))
+	    echo remove is $remove dataleft is $dataleft
+	    remove_multiple ${remove}
+	fi
+
+	umount mnt
+	atf_check -s exit:0 -o ignore resize_ffs -y -s ${nsize} ${IMG}
+	atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+	atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
+	if [ ${nsize} -lt ${osize} ]; then
+	    check_data_range $((remove + 1)) ${numdata}
+	else
+	    # checking everything because we don't delete on grow
+	    check_data_range 1 ${numdata}
+	fi
+	umount mnt
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/t_grow.sh b/contrib/netbsd-tests/sbin/resize_ffs/t_grow.sh
new file mode 100755
index 000000000000..31d117bbf861
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/t_grow.sh
@@ -0,0 +1,221 @@
+# $NetBSD: t_grow.sh,v 1.8 2011/01/11 00:50:02 riz Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jeffrey C. Rizzo.
+#
+# 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.
+#
+
+
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
+# where 'numdata' is the number of data directories to copy - this is
+# determined manually based on the maximum number that will fit in the
+# created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
+# If 'swap' is included, byteswap the fs
+
+# v0 == newfs -O0  (4.3BSD layout, ffsv1 superblock)
+test_case grow_16M_v0_4096 resize_ffs 4096 512 32768 131072 0 28
+test_case grow_16M_v0_8192 resize_ffs 8192 1024 32768 131072 0 28
+test_case grow_16M_v0_16384 resize_ffs 16384 2048 32768 131072 0 29
+test_case grow_16M_v0_32768 resize_ffs 32768 4096 32768 131072 0 28
+test_case grow_16M_v0_65536 resize_ffs 65536 8192 32768 131072 0 26
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v0_4096 resize_ffs 4096 512 49152 65536 0 41
+test_case grow_24M_v0_8192 resize_ffs 8192 1024 49152 65536 0 42
+test_case grow_24M_v0_16384 resize_ffs 16384 2048 49152 65536 0 43
+test_case grow_24M_v0_32768 resize_ffs 32768 4096 49152 65536 0 42
+test_case grow_24M_v0_65536 resize_ffs 65536 8192 49152 65536 0 38
+test_case grow_32M_v0_4096 resize_ffs 4096 512 65536 131072 0 55
+test_case grow_32M_v0_8192 resize_ffs 8192 1024 65536 131072 0 56
+test_case grow_32M_v0_16384 resize_ffs 16384 2048 65536 131072 0 58
+test_case grow_32M_v0_32768 resize_ffs 32768 4096 65536 131072 0 56
+test_case grow_32M_v0_65536 resize_ffs 65536 8192 65536 131072 0 51
+test_case grow_48M_v0_4096 resize_ffs 4096 512 98304 131072 0 82
+test_case grow_48M_v0_8192 resize_ffs 8192 1024 98304 131072 0 84
+test_case grow_48M_v0_16384 resize_ffs 16384 2048 98304 131072 0 87
+test_case grow_48M_v0_32768 resize_ffs 32768 4096 98304 131072 0 83
+test_case grow_48M_v0_65536 resize_ffs 65536 8192 98304 131072 0 76
+test_case grow_64M_v0_4096 resize_ffs 4096 512 131072 262144 0 109
+test_case grow_64M_v0_8192 resize_ffs 8192 1024 131072 262144 0 111
+test_case grow_64M_v0_16384 resize_ffs 16384 2048 131072 262144 0 115
+test_case grow_64M_v0_32768 resize_ffs 32768 4096 131072 262144 0 111
+test_case grow_64M_v0_65536 resize_ffs 65536 8192 131072 262144 0 101
+
+# v1 == newfs -O1 (FFSv1, v2 superblock layout)
+test_case grow_16M_v1_4096 resize_ffs 4096 512 32768 131072 1 28
+test_case grow_16M_v1_8192 resize_ffs 8192 1024 32768 131072 1 28
+test_case grow_16M_v1_16384 resize_ffs 16384 2048 32768 131072 1 29
+test_case grow_16M_v1_32768 resize_ffs 32768 4096 32768 131072 1 28
+test_case grow_16M_v1_65536 resize_ffs 65536 8192 32768 131072 1 26
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v1_4096 resize_ffs 4096 512 49152 65536 1 41
+test_case grow_24M_v1_8192 resize_ffs 8192 1024 49152 65536 1 42
+test_case grow_24M_v1_16384 resize_ffs 16384 2048 49152 65536 1 43
+test_case grow_24M_v1_32768 resize_ffs 32768 4096 49152 65536 1 42
+test_case grow_24M_v1_65536 resize_ffs 65536 8192 49152 65536 1 38
+test_case grow_32M_v1_4096 resize_ffs 4096 512 65536 131072 1 55
+test_case grow_32M_v1_8192 resize_ffs 8192 1024 65536 131072 1 56
+test_case grow_32M_v1_16384 resize_ffs 16384 2048 65536 131072 1 58
+test_case grow_32M_v1_32768 resize_ffs 32768 4096 65536 131072 1 56
+test_case grow_32M_v1_65536 resize_ffs 65536 8192 65536 131072 1 51
+test_case grow_48M_v1_4096 resize_ffs 4096 512 98304 131072 1 82
+test_case grow_48M_v1_8192 resize_ffs 8192 1024 98304 131072 1 84
+test_case grow_48M_v1_16384 resize_ffs 16384 2048 98304 131072 1 87
+test_case grow_48M_v1_32768 resize_ffs 32768 4096 98304 131072 1 83
+test_case grow_48M_v1_65536 resize_ffs 65536 8192 98304 131072 1 76
+test_case grow_64M_v1_4096 resize_ffs 4096 512 131072 262144 1 109
+test_case grow_64M_v1_8192 resize_ffs 8192 1024 131072 262144 1 111
+test_case grow_64M_v1_16384 resize_ffs 16384 2048 131072 262144 1 115
+test_case grow_64M_v1_32768 resize_ffs 32768 4096 131072 262144 1 111
+test_case grow_64M_v1_65536 resize_ffs 65536 8192 131072 262144 1 101
+test_case grow_16M_v2_4096 resize_ffs 4096 512 32768 131072 2 26
+test_case grow_16M_v2_8192 resize_ffs 8192 1024 32768 131072 2 28
+test_case grow_16M_v2_16384 resize_ffs 16384 2048 32768 131072 2 29
+test_case grow_16M_v2_32768 resize_ffs 32768 4096 32768 131072 2 28
+test_case grow_16M_v2_65536 resize_ffs 65536 8192 32768 131072 2 25
+test_case grow_24M_v2_4096 resize_ffs 4096 512 49152 65536 2 40
+test_case grow_24M_v2_8192 resize_ffs 8192 1024 49152 65536 2 42
+test_case grow_24M_v2_16384 resize_ffs 16384 2048 49152 65536 2 43
+test_case grow_24M_v2_32768 resize_ffs 32768 4096 49152 65536 2 42
+test_case grow_24M_v2_65536 resize_ffs 65536 8192 49152 65536 2 38
+test_case grow_32M_v2_4096 resize_ffs 4096 512 65536 131072 2 53
+test_case grow_32M_v2_8192 resize_ffs 8192 1024 65536 131072 2 56
+test_case grow_32M_v2_16384 resize_ffs 16384 2048 65536 131072 2 58
+test_case grow_32M_v2_32768 resize_ffs 32768 4096 65536 131072 2 56
+test_case grow_32M_v2_65536 resize_ffs 65536 8192 65536 131072 2 51
+test_case grow_48M_v2_4096 resize_ffs 4096 512 98304 131072 2 80
+test_case grow_48M_v2_8192 resize_ffs 8192 1024 98304 131072 2 84
+test_case grow_48M_v2_16384 resize_ffs 16384 2048 98304 131072 2 87
+test_case grow_48M_v2_32768 resize_ffs 32768 4096 98304 131072 2 83
+test_case grow_48M_v2_65536 resize_ffs 65536 8192 98304 131072 2 76
+test_case grow_64M_v2_4096 resize_ffs 4096 512 131072 262144 2 107
+test_case grow_64M_v2_8192 resize_ffs 8192 1024 131072 262144 2 111
+test_case grow_64M_v2_16384 resize_ffs 16384 2048 131072 262144 2 115
+test_case grow_64M_v2_32768 resize_ffs 32768 4096 131072 262144 2 111
+test_case grow_64M_v2_65536 resize_ffs 65536 8192 131072 262144 2 101
+
+atf_test_case grow_ffsv1_partial_cg
+grow_ffsv1_partial_cg_head()
+{
+	atf_set "descr" "Checks successful ffsv1 growth by less" \
+			"than a cylinder group"
+}
+grow_ffsv1_partial_cg_body()
+{
+	echo "***resize_ffs grow test"
+
+	# resize_ffs only supports ffsv1 at the moment
+	atf_check -o ignore -e ignore newfs -V1 -s 4000 -F ${IMG}
+
+	# size to grow to is chosen to cause partial cg
+	atf_check -s exit:0 -o ignore resize_ffs -y -s 5760 ${IMG}
+	atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+}
+
+atf_init_test_cases()
+{
+	setupvars
+	atf_add_test_case grow_16M_v0_8192
+	atf_add_test_case grow_16M_v1_16384
+	atf_add_test_case grow_16M_v2_32768
+if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+	atf_add_test_case grow_16M_v0_4096
+	atf_add_test_case grow_16M_v0_16384
+	atf_add_test_case grow_16M_v0_32768
+	atf_add_test_case grow_16M_v0_65536
+	atf_add_test_case grow_16M_v1_4096
+	atf_add_test_case grow_16M_v1_8192
+	atf_add_test_case grow_16M_v1_32768
+	atf_add_test_case grow_16M_v1_65536
+	atf_add_test_case grow_16M_v2_4096
+	atf_add_test_case grow_16M_v2_8192
+	atf_add_test_case grow_16M_v2_16384
+	atf_add_test_case grow_16M_v2_65536
+	atf_add_test_case grow_24M_v0_4096
+	atf_add_test_case grow_24M_v0_8192
+	atf_add_test_case grow_24M_v0_16384
+	atf_add_test_case grow_24M_v0_32768
+	atf_add_test_case grow_24M_v0_65536
+	atf_add_test_case grow_32M_v0_4096
+	atf_add_test_case grow_32M_v0_8192
+	atf_add_test_case grow_32M_v0_16384
+	atf_add_test_case grow_32M_v0_32768
+	atf_add_test_case grow_32M_v0_65536
+	atf_add_test_case grow_48M_v0_4096
+	atf_add_test_case grow_48M_v0_8192
+	atf_add_test_case grow_48M_v0_16384
+	atf_add_test_case grow_48M_v0_32768
+	atf_add_test_case grow_48M_v0_65536
+	atf_add_test_case grow_64M_v0_4096
+	atf_add_test_case grow_64M_v0_8192
+	atf_add_test_case grow_64M_v0_16384
+	atf_add_test_case grow_64M_v0_32768
+	atf_add_test_case grow_64M_v0_65536
+
+	atf_add_test_case grow_24M_v1_4096
+	atf_add_test_case grow_24M_v1_8192
+	atf_add_test_case grow_24M_v1_16384
+	atf_add_test_case grow_24M_v1_32768
+	atf_add_test_case grow_24M_v1_65536
+	atf_add_test_case grow_32M_v1_4096
+	atf_add_test_case grow_32M_v1_8192
+	atf_add_test_case grow_32M_v1_16384
+	atf_add_test_case grow_32M_v1_32768
+	atf_add_test_case grow_32M_v1_65536
+	atf_add_test_case grow_48M_v1_4096
+	atf_add_test_case grow_48M_v1_8192
+	atf_add_test_case grow_48M_v1_16384
+	atf_add_test_case grow_48M_v1_32768
+	atf_add_test_case grow_48M_v1_65536
+	atf_add_test_case grow_64M_v1_4096
+	atf_add_test_case grow_64M_v1_8192
+	atf_add_test_case grow_64M_v1_16384
+	atf_add_test_case grow_64M_v1_32768
+	atf_add_test_case grow_64M_v1_65536
+
+	atf_add_test_case grow_24M_v2_4096
+	atf_add_test_case grow_24M_v2_8192
+	atf_add_test_case grow_24M_v2_16384
+	atf_add_test_case grow_24M_v2_32768
+	atf_add_test_case grow_24M_v2_65536
+	atf_add_test_case grow_32M_v2_4096
+	atf_add_test_case grow_32M_v2_8192
+	atf_add_test_case grow_32M_v2_16384
+	atf_add_test_case grow_32M_v2_32768
+	atf_add_test_case grow_32M_v2_65536
+	atf_add_test_case grow_48M_v2_4096
+	atf_add_test_case grow_48M_v2_8192
+	atf_add_test_case grow_48M_v2_16384
+	atf_add_test_case grow_48M_v2_32768
+	atf_add_test_case grow_48M_v2_65536
+	atf_add_test_case grow_64M_v2_4096
+	atf_add_test_case grow_64M_v2_8192
+	atf_add_test_case grow_64M_v2_16384
+	atf_add_test_case grow_64M_v2_32768
+	atf_add_test_case grow_64M_v2_65536
+fi
+	atf_add_test_case grow_ffsv1_partial_cg
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/t_grow_swapped.sh b/contrib/netbsd-tests/sbin/resize_ffs/t_grow_swapped.sh
new file mode 100755
index 000000000000..07dc514d8bbf
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/t_grow_swapped.sh
@@ -0,0 +1,220 @@
+# $NetBSD: t_grow_swapped.sh,v 1.2 2011/01/11 00:50:02 riz Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jeffrey C. Rizzo.
+#
+# 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.
+#
+
+
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
+# where 'numdata' is the number of data directories to copy - this is
+# determined manually based on the maximum number that will fit in the
+# created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
+# If 'swap' is included, byteswap the fs
+
+# v0 == newfs -O0  (4.3BSD layout, ffsv1 superblock)
+test_case grow_16M_v0_4096 resize_ffs 4096 512 32768 131072 0 28 swap
+test_case grow_16M_v0_8192 resize_ffs 8192 1024 32768 131072 0 28 swap
+test_case grow_16M_v0_16384 resize_ffs 16384 2048 32768 131072 0 29 swap
+test_case grow_16M_v0_32768 resize_ffs 32768 4096 32768 131072 0 28 swap
+test_case grow_16M_v0_65536 resize_ffs 65536 8192 32768 131072 0 26 swap
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v0_4096 resize_ffs 4096 512 49152 65536 0 41 swap
+test_case grow_24M_v0_8192 resize_ffs 8192 1024 49152 65536 0 42 swap
+test_case grow_24M_v0_16384 resize_ffs 16384 2048 49152 65536 0 43 swap
+test_case grow_24M_v0_32768 resize_ffs 32768 4096 49152 65536 0 42 swap
+test_case grow_24M_v0_65536 resize_ffs 65536 8192 49152 65536 0 38 swap
+test_case grow_32M_v0_4096 resize_ffs 4096 512 65536 131072 0 55 swap
+test_case grow_32M_v0_8192 resize_ffs 8192 1024 65536 131072 0 56 swap
+test_case grow_32M_v0_16384 resize_ffs 16384 2048 65536 131072 0 58 swap
+test_case grow_32M_v0_32768 resize_ffs 32768 4096 65536 131072 0 56 swap
+test_case grow_32M_v0_65536 resize_ffs 65536 8192 65536 131072 0 51 swap
+test_case grow_48M_v0_4096 resize_ffs 4096 512 98304 131072 0 82 swap
+test_case grow_48M_v0_8192 resize_ffs 8192 1024 98304 131072 0 84 swap
+test_case grow_48M_v0_16384 resize_ffs 16384 2048 98304 131072 0 87 swap
+test_case grow_48M_v0_32768 resize_ffs 32768 4096 98304 131072 0 83 swap
+test_case grow_48M_v0_65536 resize_ffs 65536 8192 98304 131072 0 76 swap
+test_case grow_64M_v0_4096 resize_ffs 4096 512 131072 262144 0 109 swap
+test_case grow_64M_v0_8192 resize_ffs 8192 1024 131072 262144 0 111 swap
+test_case grow_64M_v0_16384 resize_ffs 16384 2048 131072 262144 0 115 swap
+test_case grow_64M_v0_32768 resize_ffs 32768 4096 131072 262144 0 111 swap
+test_case grow_64M_v0_65536 resize_ffs 65536 8192 131072 262144 0 101 swap
+
+# v1 == newfs -O1 (FFSv1, v2 superblock layout)
+test_case grow_16M_v1_4096 resize_ffs 4096 512 32768 131072 1 28 swap
+test_case grow_16M_v1_8192 resize_ffs 8192 1024 32768 131072 1 28 swap
+test_case grow_16M_v1_16384 resize_ffs 16384 2048 32768 131072 1 29 swap
+test_case grow_16M_v1_32768 resize_ffs 32768 4096 32768 131072 1 28 swap
+test_case grow_16M_v1_65536 resize_ffs 65536 8192 32768 131072 1 26 swap
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v1_4096 resize_ffs 4096 512 49152 65536 1 41 swap
+test_case grow_24M_v1_8192 resize_ffs 8192 1024 49152 65536 1 42 swap
+test_case grow_24M_v1_16384 resize_ffs 16384 2048 49152 65536 1 43 swap
+test_case grow_24M_v1_32768 resize_ffs 32768 4096 49152 65536 1 42 swap
+test_case grow_24M_v1_65536 resize_ffs 65536 8192 49152 65536 1 38 swap
+test_case grow_32M_v1_4096 resize_ffs 4096 512 65536 131072 1 55 swap
+test_case grow_32M_v1_8192 resize_ffs 8192 1024 65536 131072 1 56 swap
+test_case grow_32M_v1_16384 resize_ffs 16384 2048 65536 131072 1 58 swap
+test_case grow_32M_v1_32768 resize_ffs 32768 4096 65536 131072 1 56 swap
+test_case grow_32M_v1_65536 resize_ffs 65536 8192 65536 131072 1 51 swap
+test_case grow_48M_v1_4096 resize_ffs 4096 512 98304 131072 1 82 swap
+test_case grow_48M_v1_8192 resize_ffs 8192 1024 98304 131072 1 84 swap
+test_case grow_48M_v1_16384 resize_ffs 16384 2048 98304 131072 1 87 swap
+test_case grow_48M_v1_32768 resize_ffs 32768 4096 98304 131072 1 83 swap
+test_case grow_48M_v1_65536 resize_ffs 65536 8192 98304 131072 1 76 swap
+test_case grow_64M_v1_4096 resize_ffs 4096 512 131072 262144 1 109 swap
+test_case grow_64M_v1_8192 resize_ffs 8192 1024 131072 262144 1 111 swap
+test_case grow_64M_v1_16384 resize_ffs 16384 2048 131072 262144 1 115 swap
+test_case grow_64M_v1_32768 resize_ffs 32768 4096 131072 262144 1 111 swap
+test_case grow_64M_v1_65536 resize_ffs 65536 8192 131072 262144 1 101 swap
+test_case grow_16M_v2_4096 resize_ffs 4096 512 32768 131072 2 26 swap
+test_case grow_16M_v2_8192 resize_ffs 8192 1024 32768 131072 2 28 swap
+test_case grow_16M_v2_16384 resize_ffs 16384 2048 32768 131072 2 29 swap
+test_case grow_16M_v2_32768 resize_ffs 32768 4096 32768 131072 2 28 swap
+test_case grow_16M_v2_65536 resize_ffs 65536 8192 32768 131072 2 25 swap
+test_case grow_24M_v2_4096 resize_ffs 4096 512 49152 65536 2 40 swap
+test_case grow_24M_v2_8192 resize_ffs 8192 1024 49152 65536 2 42 swap
+test_case grow_24M_v2_16384 resize_ffs 16384 2048 49152 65536 2 43 swap
+test_case grow_24M_v2_32768 resize_ffs 32768 4096 49152 65536 2 42 swap
+test_case grow_24M_v2_65536 resize_ffs 65536 8192 49152 65536 2 38 swap
+test_case grow_32M_v2_4096 resize_ffs 4096 512 65536 131072 2 53 swap
+test_case grow_32M_v2_8192 resize_ffs 8192 1024 65536 131072 2 56 swap
+test_case grow_32M_v2_16384 resize_ffs 16384 2048 65536 131072 2 58 swap
+test_case grow_32M_v2_32768 resize_ffs 32768 4096 65536 131072 2 56 swap
+test_case grow_32M_v2_65536 resize_ffs 65536 8192 65536 131072 2 51 swap
+test_case grow_48M_v2_4096 resize_ffs 4096 512 98304 131072 2 80 swap
+test_case grow_48M_v2_8192 resize_ffs 8192 1024 98304 131072 2 84 swap
+test_case grow_48M_v2_16384 resize_ffs 16384 2048 98304 131072 2 87 swap
+test_case grow_48M_v2_32768 resize_ffs 32768 4096 98304 131072 2 83 swap
+test_case grow_48M_v2_65536 resize_ffs 65536 8192 98304 131072 2 76 swap
+test_case grow_64M_v2_4096 resize_ffs 4096 512 131072 262144 2 107 swap
+test_case grow_64M_v2_8192 resize_ffs 8192 1024 131072 262144 2 111 swap
+test_case grow_64M_v2_16384 resize_ffs 16384 2048 131072 262144 2 115 swap
+test_case grow_64M_v2_32768 resize_ffs 32768 4096 131072 262144 2 111 swap
+test_case grow_64M_v2_65536 resize_ffs 65536 8192 131072 262144 2 101 swap
+
+atf_test_case grow_ffsv1_partial_cg
+grow_ffsv1_partial_cg_head()
+{
+	atf_set "descr" "Checks successful ffsv1 growth by less" \
+			"than a cylinder group"
+}
+grow_ffsv1_partial_cg_body()
+{
+	echo "***resize_ffs grow test"
+
+	atf_check -o ignore -e ignore newfs -B be -V1 -s 4000 -F ${IMG}
+
+	# size to grow to is chosen to cause partial cg
+	atf_check -s exit:0 -o ignore resize_ffs -y -s 5760 ${IMG}
+	atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+}
+
+atf_init_test_cases()
+{
+	setupvars
+	atf_add_test_case grow_16M_v0_65536
+	atf_add_test_case grow_16M_v1_4096
+	atf_add_test_case grow_16M_v2_8192
+if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+	atf_add_test_case grow_16M_v0_4096
+	atf_add_test_case grow_16M_v0_8192
+	atf_add_test_case grow_16M_v0_16384
+	atf_add_test_case grow_16M_v0_32768
+	atf_add_test_case grow_16M_v1_8192
+	atf_add_test_case grow_16M_v1_16384
+	atf_add_test_case grow_16M_v1_32768
+	atf_add_test_case grow_16M_v1_65536
+	atf_add_test_case grow_16M_v2_4096
+	atf_add_test_case grow_16M_v2_16384
+	atf_add_test_case grow_16M_v2_32768
+	atf_add_test_case grow_16M_v2_65536
+	atf_add_test_case grow_24M_v0_4096
+	atf_add_test_case grow_24M_v0_8192
+	atf_add_test_case grow_24M_v0_16384
+	atf_add_test_case grow_24M_v0_32768
+	atf_add_test_case grow_24M_v0_65536
+	atf_add_test_case grow_32M_v0_4096
+	atf_add_test_case grow_32M_v0_8192
+	atf_add_test_case grow_32M_v0_16384
+	atf_add_test_case grow_32M_v0_32768
+	atf_add_test_case grow_32M_v0_65536
+	atf_add_test_case grow_48M_v0_4096
+	atf_add_test_case grow_48M_v0_8192
+	atf_add_test_case grow_48M_v0_16384
+	atf_add_test_case grow_48M_v0_32768
+	atf_add_test_case grow_48M_v0_65536
+	atf_add_test_case grow_64M_v0_4096
+	atf_add_test_case grow_64M_v0_8192
+	atf_add_test_case grow_64M_v0_16384
+	atf_add_test_case grow_64M_v0_32768
+	atf_add_test_case grow_64M_v0_65536
+
+	atf_add_test_case grow_24M_v1_4096
+	atf_add_test_case grow_24M_v1_8192
+	atf_add_test_case grow_24M_v1_16384
+	atf_add_test_case grow_24M_v1_32768
+	atf_add_test_case grow_24M_v1_65536
+	atf_add_test_case grow_32M_v1_4096
+	atf_add_test_case grow_32M_v1_8192
+	atf_add_test_case grow_32M_v1_16384
+	atf_add_test_case grow_32M_v1_32768
+	atf_add_test_case grow_32M_v1_65536
+	atf_add_test_case grow_48M_v1_4096
+	atf_add_test_case grow_48M_v1_8192
+	atf_add_test_case grow_48M_v1_16384
+	atf_add_test_case grow_48M_v1_32768
+	atf_add_test_case grow_48M_v1_65536
+	atf_add_test_case grow_64M_v1_4096
+	atf_add_test_case grow_64M_v1_8192
+	atf_add_test_case grow_64M_v1_16384
+	atf_add_test_case grow_64M_v1_32768
+	atf_add_test_case grow_64M_v1_65536
+
+	atf_add_test_case grow_24M_v2_4096
+	atf_add_test_case grow_24M_v2_8192
+	atf_add_test_case grow_24M_v2_16384
+	atf_add_test_case grow_24M_v2_32768
+	atf_add_test_case grow_24M_v2_65536
+	atf_add_test_case grow_32M_v2_4096
+	atf_add_test_case grow_32M_v2_8192
+	atf_add_test_case grow_32M_v2_16384
+	atf_add_test_case grow_32M_v2_32768
+	atf_add_test_case grow_32M_v2_65536
+	atf_add_test_case grow_48M_v2_4096
+	atf_add_test_case grow_48M_v2_8192
+	atf_add_test_case grow_48M_v2_16384
+	atf_add_test_case grow_48M_v2_32768
+	atf_add_test_case grow_48M_v2_65536
+	atf_add_test_case grow_64M_v2_4096
+	atf_add_test_case grow_64M_v2_8192
+	atf_add_test_case grow_64M_v2_16384
+	atf_add_test_case grow_64M_v2_32768
+	atf_add_test_case grow_64M_v2_65536
+fi
+	atf_add_test_case grow_ffsv1_partial_cg
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/t_shrink.sh b/contrib/netbsd-tests/sbin/resize_ffs/t_shrink.sh
new file mode 100755
index 000000000000..1b667593d4d5
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/t_shrink.sh
@@ -0,0 +1,185 @@
+# $NetBSD: t_shrink.sh,v 1.7 2011/01/05 02:25:27 riz Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jeffrey C. Rizzo.
+#
+# 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.
+#
+
+
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
+# where 'numdata' is the number of data directories to copy - this is
+# determined manually based on the maximum number that will fit in the
+# created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
+# If 'swap' is included, byteswap the fs
+test_case shrink_24M_16M_v0_4096 resize_ffs 4096 512 49152 32768 0 41
+test_case shrink_24M_16M_v0_8192 resize_ffs 8192 1024 49152 32768 0 42
+test_case shrink_24M_16M_v0_16384 resize_ffs 16384 2048 49152 32768 0 43
+test_case shrink_24M_16M_v0_32768 resize_ffs 32768 4096 49152 32768 0 42
+test_case shrink_24M_16M_v0_65536 resize_ffs 65536 8192 49152 32768 0 38
+test_case shrink_32M_24M_v0_4096 resize_ffs 4096 512 65536 49152 0 55
+test_case shrink_32M_24M_v0_8192 resize_ffs 8192 1024 65536 49152 0 56
+test_case shrink_32M_24M_v0_16384 resize_ffs 16384 2048 65536 49152 0 58
+test_case shrink_32M_24M_v0_32768 resize_ffs 32768 4096 65536 49152 0 56
+test_case_xfail shrink_32M_24M_v0_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 0 51
+test_case shrink_48M_16M_v0_4096 resize_ffs 4096 512 98304 32768 0 82
+test_case shrink_48M_16M_v0_8192 resize_ffs 8192 1024 98304 32768 0 84
+test_case shrink_48M_16M_v0_16384 resize_ffs 16384 2048 98304 32768 0 87
+test_case shrink_48M_16M_v0_32768 resize_ffs 32768 4096 98304 32768 0 83
+test_case shrink_48M_16M_v0_65536 resize_ffs 65536 8192 98304 32768 0 76
+test_case shrink_64M_48M_v0_4096 resize_ffs 4096 512 131072 98304 0 109
+test_case shrink_64M_48M_v0_8192 resize_ffs 8192 1024 131072 98304 0 111
+test_case shrink_64M_48M_v0_16384 resize_ffs 16384 2048 131072 98304 0 115
+test_case shrink_64M_48M_v0_32768 resize_ffs 32768 4096 131072 98304 0 111
+test_case shrink_64M_48M_v0_65536 resize_ffs 65536 8192 131072 98304 0 101
+
+test_case shrink_24M_16M_v1_4096 resize_ffs 4096 512 49152 32768 1 41
+test_case shrink_24M_16M_v1_8192 resize_ffs 8192 1024 49152 32768 1 42
+test_case shrink_24M_16M_v1_16384 resize_ffs 16384 2048 49152 32768 1 43
+test_case shrink_24M_16M_v1_32768 resize_ffs 32768 4096 49152 32768 1 42
+test_case shrink_24M_16M_v1_65536 resize_ffs 65536 8192 49152 32768 1 38
+test_case shrink_32M_24M_v1_4096 resize_ffs 4096 512 65536 49152 1 55
+test_case shrink_32M_24M_v1_8192 resize_ffs 8192 1024 65536 49152 1 56
+test_case shrink_32M_24M_v1_16384 resize_ffs 16384 2048 65536 49152 1 58
+test_case shrink_32M_24M_v1_32768 resize_ffs 32768 4096 65536 49152 1 56
+test_case_xfail shrink_32M_24M_v1_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 1 51
+test_case shrink_48M_16M_v1_4096 resize_ffs 4096 512 98304 32768 1 82
+test_case shrink_48M_16M_v1_8192 resize_ffs 8192 1024 98304 32768 1 84
+test_case shrink_48M_16M_v1_16384 resize_ffs 16384 2048 98304 32768 1 87
+test_case shrink_48M_16M_v1_32768 resize_ffs 32768 4096 98304 32768 1 83
+test_case shrink_48M_16M_v1_65536 resize_ffs 65536 8192 98304 32768 1 76
+test_case shrink_64M_48M_v1_4096 resize_ffs 4096 512 131072 98304 1 109
+test_case shrink_64M_48M_v1_8192 resize_ffs 8192 1024 131072 98304 1 111
+test_case shrink_64M_48M_v1_16384 resize_ffs 16384 2048 131072 98304 1 115
+test_case shrink_64M_48M_v1_32768 resize_ffs 32768 4096 131072 98304 1 111
+test_case shrink_64M_48M_v1_65536 resize_ffs 65536 8192 131072 98304 1 101
+
+test_case_xfail shrink_24M_16M_v2_4096 "PR bin/44205" resize_ffs 4096 512 49152 32768 2 41
+test_case_xfail shrink_24M_16M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 49152 32768 2 42
+test_case_xfail shrink_24M_16M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 49152 32768 2 43
+test_case_xfail shrink_24M_16M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 49152 32768 2 42
+test_case_xfail shrink_24M_16M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 49152 32768 2 38
+test_case_xfail shrink_32M_24M_v2_4096 "PR bin/44205" resize_ffs 4096 512 65536 49152 2 55
+test_case_xfail shrink_32M_24M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 65536 49152 2 56
+test_case_xfail shrink_32M_24M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 65536 49152 2 58
+test_case_xfail shrink_32M_24M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 65536 49152 2 56
+test_case_xfail shrink_32M_24M_v2_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 2 51
+test_case_xfail shrink_48M_16M_v2_4096 "PR bin/44205" resize_ffs 4096 512 98304 32768 2 82
+test_case_xfail shrink_48M_16M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 98304 32768 2 84
+test_case_xfail shrink_48M_16M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 98304 32768 2 87
+test_case_xfail shrink_48M_16M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 98304 32768 2 83
+test_case_xfail shrink_48M_16M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 98304 32768 2 76
+test_case_xfail shrink_64M_48M_v2_4096 "PR bin/44205" resize_ffs 4096 512 131072 98304 2 109
+test_case_xfail shrink_64M_48M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 131072 98304 2 111
+test_case_xfail shrink_64M_48M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 131072 98304 2 115
+test_case_xfail shrink_64M_48M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 131072 98304 2 111
+test_case_xfail shrink_64M_48M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 131072 98304 2 101
+
+
+atf_test_case shrink_ffsv1_partial_cg
+shrink_ffsv1_partial_cg_head()
+{
+	atf_set "descr" "Checks successful shrinkage of ffsv1 by" \
+			"less than a cylinder group"
+}
+shrink_ffsv1_partial_cg_body()
+{
+	echo "*** resize_ffs shrinkage partial cg test"
+
+	atf_check -o ignore -e ignore newfs -V1 -F -s 5760 ${IMG}
+
+	# shrink so there's a partial cg at the end
+	atf_check -s exit:0 resize_ffs -s 4000 -y ${IMG}
+	atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+}
+
+atf_init_test_cases()
+{
+	setupvars
+	atf_add_test_case shrink_24M_16M_v0_32768
+	atf_add_test_case shrink_24M_16M_v1_65536
+	atf_add_test_case shrink_24M_16M_v2_4096
+if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+	atf_add_test_case shrink_24M_16M_v0_4096
+	atf_add_test_case shrink_24M_16M_v0_8192
+	atf_add_test_case shrink_24M_16M_v0_16384
+	atf_add_test_case shrink_24M_16M_v0_65536
+	atf_add_test_case shrink_24M_16M_v1_4096
+	atf_add_test_case shrink_24M_16M_v1_8192
+	atf_add_test_case shrink_24M_16M_v1_16384
+	atf_add_test_case shrink_24M_16M_v1_32768
+	atf_add_test_case shrink_24M_16M_v2_8192
+	atf_add_test_case shrink_24M_16M_v2_16384
+	atf_add_test_case shrink_24M_16M_v2_32768
+	atf_add_test_case shrink_24M_16M_v2_65536
+	atf_add_test_case shrink_32M_24M_v0_4096
+	atf_add_test_case shrink_32M_24M_v0_8192
+	atf_add_test_case shrink_32M_24M_v0_16384
+	atf_add_test_case shrink_32M_24M_v0_32768
+	atf_add_test_case shrink_32M_24M_v0_65536
+	atf_add_test_case shrink_48M_16M_v0_4096
+	atf_add_test_case shrink_48M_16M_v0_8192
+	atf_add_test_case shrink_48M_16M_v0_16384
+	atf_add_test_case shrink_48M_16M_v0_32768
+	atf_add_test_case shrink_48M_16M_v0_65536
+	atf_add_test_case shrink_64M_48M_v0_4096
+	atf_add_test_case shrink_64M_48M_v0_8192
+	atf_add_test_case shrink_64M_48M_v0_16384
+	atf_add_test_case shrink_64M_48M_v0_32768
+	atf_add_test_case shrink_64M_48M_v0_65536
+	atf_add_test_case shrink_32M_24M_v1_4096
+	atf_add_test_case shrink_32M_24M_v1_8192
+	atf_add_test_case shrink_32M_24M_v1_16384
+	atf_add_test_case shrink_32M_24M_v1_32768
+	atf_add_test_case shrink_32M_24M_v1_65536
+	atf_add_test_case shrink_48M_16M_v1_4096
+	atf_add_test_case shrink_48M_16M_v1_8192
+	atf_add_test_case shrink_48M_16M_v1_16384
+	atf_add_test_case shrink_48M_16M_v1_32768
+	atf_add_test_case shrink_48M_16M_v1_65536
+	atf_add_test_case shrink_64M_48M_v1_4096
+	atf_add_test_case shrink_64M_48M_v1_8192
+	atf_add_test_case shrink_64M_48M_v1_16384
+	atf_add_test_case shrink_64M_48M_v1_32768
+	atf_add_test_case shrink_64M_48M_v1_65536
+	atf_add_test_case shrink_32M_24M_v2_4096
+	atf_add_test_case shrink_32M_24M_v2_8192
+	atf_add_test_case shrink_32M_24M_v2_16384
+	atf_add_test_case shrink_32M_24M_v2_32768
+	atf_add_test_case shrink_32M_24M_v2_65536
+	atf_add_test_case shrink_48M_16M_v2_4096
+	atf_add_test_case shrink_48M_16M_v2_8192
+	atf_add_test_case shrink_48M_16M_v2_16384
+	atf_add_test_case shrink_48M_16M_v2_32768
+	atf_add_test_case shrink_48M_16M_v2_65536
+	atf_add_test_case shrink_64M_48M_v2_4096
+	atf_add_test_case shrink_64M_48M_v2_8192
+	atf_add_test_case shrink_64M_48M_v2_16384
+	atf_add_test_case shrink_64M_48M_v2_32768
+	atf_add_test_case shrink_64M_48M_v2_65536
+fi
+	atf_add_test_case shrink_ffsv1_partial_cg
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/t_shrink_swapped.sh b/contrib/netbsd-tests/sbin/resize_ffs/t_shrink_swapped.sh
new file mode 100755
index 000000000000..30e4adddb08e
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/t_shrink_swapped.sh
@@ -0,0 +1,185 @@
+# $NetBSD: t_shrink_swapped.sh,v 1.1 2011/01/05 02:25:27 riz Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jeffrey C. Rizzo.
+#
+# 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.
+#
+
+
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
+# where 'numdata' is the number of data directories to copy - this is
+# determined manually based on the maximum number that will fit in the
+# created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
+# If 'swap' is included, byteswap the fs
+test_case shrink_24M_16M_v0_4096 resize_ffs 4096 512 49152 32768 0 41 swap
+test_case shrink_24M_16M_v0_8192 resize_ffs 8192 1024 49152 32768 0 42 swap
+test_case shrink_24M_16M_v0_16384 resize_ffs 16384 2048 49152 32768 0 43 swap
+test_case shrink_24M_16M_v0_32768 resize_ffs 32768 4096 49152 32768 0 42 swap
+test_case shrink_24M_16M_v0_65536 resize_ffs 65536 8192 49152 32768 0 38 swap
+test_case shrink_32M_24M_v0_4096 resize_ffs 4096 512 65536 49152 0 55 swap
+test_case shrink_32M_24M_v0_8192 resize_ffs 8192 1024 65536 49152 0 56 swap
+test_case shrink_32M_24M_v0_16384 resize_ffs 16384 2048 65536 49152 0 58 swap
+test_case shrink_32M_24M_v0_32768 resize_ffs 32768 4096 65536 49152 0 56 swap
+test_case_xfail shrink_32M_24M_v0_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 0 51 swap
+test_case shrink_48M_16M_v0_4096 resize_ffs 4096 512 98304 32768 0 82 swap
+test_case shrink_48M_16M_v0_8192 resize_ffs 8192 1024 98304 32768 0 84 swap
+test_case shrink_48M_16M_v0_16384 resize_ffs 16384 2048 98304 32768 0 87 swap
+test_case shrink_48M_16M_v0_32768 resize_ffs 32768 4096 98304 32768 0 83 swap
+test_case shrink_48M_16M_v0_65536 resize_ffs 65536 8192 98304 32768 0 76 swap
+test_case shrink_64M_48M_v0_4096 resize_ffs 4096 512 131072 98304 0 109 swap
+test_case shrink_64M_48M_v0_8192 resize_ffs 8192 1024 131072 98304 0 111 swap
+test_case shrink_64M_48M_v0_16384 resize_ffs 16384 2048 131072 98304 0 115 swap
+test_case shrink_64M_48M_v0_32768 resize_ffs 32768 4096 131072 98304 0 111 swap
+test_case shrink_64M_48M_v0_65536 resize_ffs 65536 8192 131072 98304 0 101 swap
+
+test_case shrink_24M_16M_v1_4096 resize_ffs 4096 512 49152 32768 1 41 swap
+test_case shrink_24M_16M_v1_8192 resize_ffs 8192 1024 49152 32768 1 42 swap
+test_case shrink_24M_16M_v1_16384 resize_ffs 16384 2048 49152 32768 1 43 swap
+test_case shrink_24M_16M_v1_32768 resize_ffs 32768 4096 49152 32768 1 42 swap
+test_case shrink_24M_16M_v1_65536 resize_ffs 65536 8192 49152 32768 1 38 swap
+test_case shrink_32M_24M_v1_4096 resize_ffs 4096 512 65536 49152 1 55 swap
+test_case shrink_32M_24M_v1_8192 resize_ffs 8192 1024 65536 49152 1 56 swap
+test_case shrink_32M_24M_v1_16384 resize_ffs 16384 2048 65536 49152 1 58 swap
+test_case shrink_32M_24M_v1_32768 resize_ffs 32768 4096 65536 49152 1 56 swap
+test_case_xfail shrink_32M_24M_v1_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 1 51 swap
+test_case shrink_48M_16M_v1_4096 resize_ffs 4096 512 98304 32768 1 82 swap
+test_case shrink_48M_16M_v1_8192 resize_ffs 8192 1024 98304 32768 1 84 swap
+test_case shrink_48M_16M_v1_16384 resize_ffs 16384 2048 98304 32768 1 87 swap
+test_case shrink_48M_16M_v1_32768 resize_ffs 32768 4096 98304 32768 1 83 swap
+test_case shrink_48M_16M_v1_65536 resize_ffs 65536 8192 98304 32768 1 76 swap
+test_case shrink_64M_48M_v1_4096 resize_ffs 4096 512 131072 98304 1 109 swap
+test_case shrink_64M_48M_v1_8192 resize_ffs 8192 1024 131072 98304 1 111 swap
+test_case shrink_64M_48M_v1_16384 resize_ffs 16384 2048 131072 98304 1 115 swap
+test_case shrink_64M_48M_v1_32768 resize_ffs 32768 4096 131072 98304 1 111 swap
+test_case shrink_64M_48M_v1_65536 resize_ffs 65536 8192 131072 98304 1 101 swap
+
+test_case_xfail shrink_24M_16M_v2_4096 "PR bin/44205" resize_ffs 4096 512 49152 32768 2 41 swap
+test_case_xfail shrink_24M_16M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 49152 32768 2 42 swap
+test_case_xfail shrink_24M_16M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 49152 32768 2 43 swap
+test_case_xfail shrink_24M_16M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 49152 32768 2 42 swap
+test_case_xfail shrink_24M_16M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 49152 32768 2 38 swap
+test_case_xfail shrink_32M_24M_v2_4096 "PR bin/44205" resize_ffs 4096 512 65536 49152 2 55 swap
+test_case_xfail shrink_32M_24M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 65536 49152 2 56 swap
+test_case_xfail shrink_32M_24M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 65536 49152 2 58 swap
+test_case_xfail shrink_32M_24M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 65536 49152 2 56 swap
+test_case_xfail shrink_32M_24M_v2_65536 "PR bin/44204" resize_ffs 65536 8192 65536 49152 2 51 swap
+test_case_xfail shrink_48M_16M_v2_4096 "PR bin/44205" resize_ffs 4096 512 98304 32768 2 82 swap
+test_case_xfail shrink_48M_16M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 98304 32768 2 84 swap
+test_case_xfail shrink_48M_16M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 98304 32768 2 87 swap
+test_case_xfail shrink_48M_16M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 98304 32768 2 83 swap
+test_case_xfail shrink_48M_16M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 98304 32768 2 76 swap
+test_case_xfail shrink_64M_48M_v2_4096 "PR bin/44205" resize_ffs 4096 512 131072 98304 2 109 swap
+test_case_xfail shrink_64M_48M_v2_8192 "PR bin/44205" resize_ffs 8192 1024 131072 98304 2 111 swap
+test_case_xfail shrink_64M_48M_v2_16384 "PR bin/44205" resize_ffs 16384 2048 131072 98304 2 115 swap
+test_case_xfail shrink_64M_48M_v2_32768 "PR bin/44205" resize_ffs 32768 4096 131072 98304 2 111 swap
+test_case_xfail shrink_64M_48M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 131072 98304 2 101 swap
+
+
+atf_test_case shrink_ffsv1_partial_cg
+shrink_ffsv1_partial_cg_head()
+{
+	atf_set "descr" "Checks successful shrinkage of ffsv1 by" \
+			"less than a cylinder group"
+}
+shrink_ffsv1_partial_cg_body()
+{
+	echo "*** resize_ffs shrinkage partial cg test"
+
+	atf_check -o ignore -e ignore newfs -V1 -F -s 5760 ${IMG}
+
+	# shrink so there's a partial cg at the end
+	atf_check -s exit:0 resize_ffs -s 4000 -y ${IMG}
+	atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+}
+
+atf_init_test_cases()
+{
+	setupvars
+	atf_add_test_case shrink_24M_16M_v0_4096
+	atf_add_test_case shrink_24M_16M_v1_8192
+	atf_add_test_case shrink_24M_16M_v2_16384
+if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+	atf_add_test_case shrink_24M_16M_v0_8192
+	atf_add_test_case shrink_24M_16M_v0_16384
+	atf_add_test_case shrink_24M_16M_v0_32768
+	atf_add_test_case shrink_24M_16M_v0_65536
+	atf_add_test_case shrink_24M_16M_v1_4096
+	atf_add_test_case shrink_24M_16M_v1_16384
+	atf_add_test_case shrink_24M_16M_v1_32768
+	atf_add_test_case shrink_24M_16M_v1_65536
+	atf_add_test_case shrink_24M_16M_v2_4096
+	atf_add_test_case shrink_24M_16M_v2_8192
+	atf_add_test_case shrink_24M_16M_v2_32768
+	atf_add_test_case shrink_24M_16M_v2_65536
+	atf_add_test_case shrink_32M_24M_v0_4096
+	atf_add_test_case shrink_32M_24M_v0_8192
+	atf_add_test_case shrink_32M_24M_v0_16384
+	atf_add_test_case shrink_32M_24M_v0_32768
+	atf_add_test_case shrink_32M_24M_v0_65536
+	atf_add_test_case shrink_48M_16M_v0_4096
+	atf_add_test_case shrink_48M_16M_v0_8192
+	atf_add_test_case shrink_48M_16M_v0_16384
+	atf_add_test_case shrink_48M_16M_v0_32768
+	atf_add_test_case shrink_48M_16M_v0_65536
+	atf_add_test_case shrink_64M_48M_v0_4096
+	atf_add_test_case shrink_64M_48M_v0_8192
+	atf_add_test_case shrink_64M_48M_v0_16384
+	atf_add_test_case shrink_64M_48M_v0_32768
+	atf_add_test_case shrink_64M_48M_v0_65536
+	atf_add_test_case shrink_32M_24M_v1_4096
+	atf_add_test_case shrink_32M_24M_v1_8192
+	atf_add_test_case shrink_32M_24M_v1_16384
+	atf_add_test_case shrink_32M_24M_v1_32768
+	atf_add_test_case shrink_32M_24M_v1_65536
+	atf_add_test_case shrink_48M_16M_v1_4096
+	atf_add_test_case shrink_48M_16M_v1_8192
+	atf_add_test_case shrink_48M_16M_v1_16384
+	atf_add_test_case shrink_48M_16M_v1_32768
+	atf_add_test_case shrink_48M_16M_v1_65536
+	atf_add_test_case shrink_64M_48M_v1_4096
+	atf_add_test_case shrink_64M_48M_v1_8192
+	atf_add_test_case shrink_64M_48M_v1_16384
+	atf_add_test_case shrink_64M_48M_v1_32768
+	atf_add_test_case shrink_64M_48M_v1_65536
+	atf_add_test_case shrink_32M_24M_v2_4096
+	atf_add_test_case shrink_32M_24M_v2_8192
+	atf_add_test_case shrink_32M_24M_v2_16384
+	atf_add_test_case shrink_32M_24M_v2_32768
+	atf_add_test_case shrink_32M_24M_v2_65536
+	atf_add_test_case shrink_48M_16M_v2_4096
+	atf_add_test_case shrink_48M_16M_v2_8192
+	atf_add_test_case shrink_48M_16M_v2_16384
+	atf_add_test_case shrink_48M_16M_v2_32768
+	atf_add_test_case shrink_48M_16M_v2_65536
+	atf_add_test_case shrink_64M_48M_v2_4096
+	atf_add_test_case shrink_64M_48M_v2_8192
+	atf_add_test_case shrink_64M_48M_v2_16384
+	atf_add_test_case shrink_64M_48M_v2_32768
+	atf_add_test_case shrink_64M_48M_v2_65536
+fi
+	atf_add_test_case shrink_ffsv1_partial_cg
+}
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/testdata.md5 b/contrib/netbsd-tests/sbin/resize_ffs/testdata.md5
new file mode 100644
index 000000000000..9a3f76fdd0dd
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/testdata.md5
@@ -0,0 +1,18 @@
+MD5 (1024) = eadce85bc513cc7b9b46c027ce07ccdb
+MD5 (1025) = 3cf2a95b3af7377ca81ff08265534334
+MD5 (131072) = 3bf5f82ad5e1f8878caa699548cc0955
+MD5 (131073) = 3423d2f10e3abb20e1ceae4b055f5071
+MD5 (16384) = 933f03c66d4e2da32089ed994c9b34bd
+MD5 (16385) = d0b296920f44ef298880a2d963066026
+MD5 (2048) = fb03fb8916dd57f9648f89a06bb46f06
+MD5 (2049) = f2e489640fc3af5f09352d27717d832e
+MD5 (32768) = d940d6ccf83aeb00e71b9bbeaf860962
+MD5 (32769) = 760e060cefd844c082a10b3bef1408f7
+MD5 (4096) = a04926ee9302f93a322e784a6b044577
+MD5 (4097) = bf13de3963f43a0ffaadb1c782b71372
+MD5 (512) = 991ad794ac386e8ba71d9bb64ab4c979
+MD5 (513) = ede1dc964fe2460dd74c3c87942162ad
+MD5 (65536) = 1ee304df7275d8f88c5c0650536c842c
+MD5 (65537) = 964632a8f1a323e31af6cf1297f88041
+MD5 (8192) = 51ce7789ae9662b2c13195573a447206
+MD5 (8193) = 35d478bc5fba0d96ffb318748d1035c7
diff --git a/contrib/netbsd-tests/sbin/resize_ffs/testdata.tar.gz.base64 b/contrib/netbsd-tests/sbin/resize_ffs/testdata.tar.gz.base64
new file mode 100644
index 000000000000..d8fe84000f52
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/resize_ffs/testdata.tar.gz.base64
@@ -0,0 +1,10938 @@
+begin-base64 644 testdata.tar.gz
+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
+BYj5GMUVET4FSnC6zauv7ZhiE9U17V6WFnmIBwZ3zhWkL8eb2TzvTOfZw4L4ZCSK
+cIKEs8jOM49qBE+6P+x6jbp2GNtOuFp/WxCyQIQXG7XDE9YeaUu4/S5aegmdM0S2
+tnDHEHrk2s6EkH89wbEXwccsZ9PgafhhorasAQoZOdKzAMmt0MEDB3b7BrlNGFCr
+wS6KSfX8vrIVGNSMqGyxUfLYggRNtWxE7x4tN8JAbXQ6gspaRMjprpuvGieqYPgT
+V52s3D4jneWAyy+XhUQHWxCLUbiCG4PQmAF0RVj9tJZwSMjW/PpUlL1bFjiYdCl5
+YEekzVs4YDjkG8MKJH1B3lOgqmKYm/4MRr0rq9eMOKU1dnfHuAuCG1txYRwCPbWg
+XRwT2BNm1cmQh6/0teqJ2L/iZLOEsSckj6W5mP/OWSAtEEK15zahOU6rmICfQD1H
+q9Z3D/qdG9q7+q+beRhOG8zSq9ykOm6N3NhnInjQbOZ5keGsLd9Cvdh3u+4pNU8m
+hopfl5xK3tu1z1x+f8dSdqPPoQgiclOr3oErSjL0sJYyUlsXGttjmZ1CX+qlqdP5
+21bFA46l90h5lCEb1deme5wEn7sVkL22sfNO/ZgN49TpUn21jVGs/GlzTsDlApAP
+0LQnh/tyE10vhL0eS2zyr8NX/fLPMfasOuvhm/LZiKoe8TQNYaLkEt04ozbKD4eM
+2YiRtBVuaTAgj4FS/tn0ZOOoevcNVST1lxrjrZ6q25Quj/YB7jwUdOsNPdF8NR1H
+eHASk1IuFqiYj9he2A0lJU0QcYqFUbWtE6tkySrAshSfmgRohskjvDtnXIJn2DA5
+7bODLbkoJws5nUjM1vkeuprzI6aC12rfkhr6X/bonNnyEKKDeQKJ509JmQM2JQLo
+yLdred1IXifjIzIDVYgQTbvgnw3d1720RWNLJhAgnqrCfqZC6R3ebCT0zwnQqNJg
+P52OqBqHuim6yrgGyNEg6dJLJE64Ipjk//a+En0xQsXHqvwsYdCHebu3auiZqrUx
+EYV2cVGW7H/iW6psFjGW2jAoYjb06zm08upWuuGkxli6dqBORKWUakecTh7NGKXr
+wGTur8a31lvkzlCkycZp3MkYW2RjyMeVkqLSwT7fWqmm6Mjldb8BziOELUvgP5XE
+XuOVXwKmPyeZDvJ2/K6g+KFM6euWYWqP31e7/2yq2uvbffL+p46h83/SQtDe3JYz
+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
+1M+q804BKH73FL8J+w1SXX3tvkdMy2z82pyD3xsOfnrjoOQyYxucPyZn8hcwL32c
+6r5+xqss+XXcpc8+hc/J3mW7VImdKDkvR+8bM5a9Kc8Khmi15NdSQtd4yGjuyEAM
+ibFGTK4JRr5IzO5H5H/SgmQzoBEV9eDgYqtm+4t3YOOgcGAqvZJXvUkwKwrLj1QR
+TAhA7WXl3BpueZCwN9sFiXSLyuRm2O8S8MAJ6kPwqiGdGAjjkdecM2POiJ7LxAgp
+sCCkJKsLIK7G/SHaYWnkmKZROdcohPE85CI9hgdS+IZlKMFS3ja9OYVEYytyYPiQ
+UXZ1S/4QGVkNAxMCv2Reymir+FQGpy5BeITgr0gQ3RYNVcs8lJVvp409Lr6gpekt
+WBT3V4E/mx0yY4W9FVcA1R2ZJoRKTpZLkoyxsXFZaZk0X76zeCR2O3mMOa4uNHEH
+dpImS6fiXFUpfkwJ+wDxGS02WEFtbk2c1M0PdjRdZ0CwKDj5om06XXHLjpi2MY7x
+3sqGMGe7nwPwJRE1guKv27xCuwZzryfktEA3trycM8rNmyfWZ86wAAahS8bw30se
+GgtG/d1E7DRO2vxvigyL05FnDA9niWAP84VVPTfkakDTdGqspgJwjCJxM+C+AxlF
+z4aTAgvKJux9ISmDM2x0zk+mON/3/ySwCOvmnZJWnFgYD+CtJyYUwJYSwgqWPUlf
+Yvj/AhuojfJfk7o+HKRdE5vow1qlRCbOHDmKbR3Fh+Rd0NnXKIQzz4mfVReHfebl
+3pfolvW1Dhse4Uixbk98MQnN7wyVRY2KNK7yHkG4DPGi/e5UgVMLDM0o054sRgdL
+6nu8Co+BrDAXjusqeLzajyyijzrOpmFl6UqyaDW9mNYpjuS9gGkrfv4QOXREeJkN
+SarPWgEU/dArOOQTcH7sH158JIW8OtCJbQRYORll6DDHyR2NFYt4sgu4InLjSgzs
+Qmf4q57yan2TpjloCvyiSPJAwAmGdM10WkTOvpF8a/36N1Sm01jdochVQjSQrQ3e
+HvVHhy+wUU0sfbDaUbpMWBp2Uph4GMbwP0oAJXRObfU2aGL85nYm9Z5DKBIqzR7l
+LQDJLrgcQAwH4xUCJLEVnKpGHsEqcGs50cO7BM4Gmuk3/9LqtMBLyai+g/HjSn2W
+2G3iAhNVXh6y+GFLV+Rc4n9bafGPoB7SBSLN7eubkXF5wAGjztz6Tm+09keUSIMh
+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
+//znP//5z3/+85//L/0vxuXHSABICAA=
+====
diff --git a/contrib/netbsd-tests/sbin/route/t_missing.sh b/contrib/netbsd-tests/sbin/route/t_missing.sh
new file mode 100755
index 000000000000..cd9387eb55f8
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/route/t_missing.sh
@@ -0,0 +1,45 @@
+# $NetBSD: t_missing.sh,v 1.3 2012/03/17 08:34:55 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case missing
+missing_head() {
+	atf_set "descr" "Check route(8) with a missing argument (PR bin/42179)"
+}
+
+missing_body() {
+
+	atf_check -s exit:1 \
+	-e not-inline:"route: writing to routing socket: Invalid argument\n" \
+	route -n get
+}
+
+atf_init_test_cases() {
+	atf_add_test_case missing
+}
diff --git a/contrib/netbsd-tests/sbin/sysctl/t_perm.sh b/contrib/netbsd-tests/sbin/sysctl/t_perm.sh
new file mode 100755
index 000000000000..6acfd1935b8d
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/sysctl/t_perm.sh
@@ -0,0 +1,209 @@
+# $NetBSD: t_perm.sh,v 1.6 2012/03/18 09:46:50 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+file="/tmp/d_sysctl.out"
+
+clean() {
+
+	if [ -f $file ]; then
+		rm $file
+	fi
+}
+
+sysctl_write() {
+
+	deadbeef="3735928559"
+
+	sysctl $1 | cut -d= -f1 > $file
+
+	if [ ! -f $file ]; then
+		atf_fail "sysctl failed"
+	fi
+
+	while read line; do
+
+		node=$(echo $line)
+
+		case $node in
+
+		"$1."*)
+			atf_check -s not-exit:0 -e ignore \
+				-x sysctl -w $node=$deadbeef
+			;;
+		esac
+
+	done < $file
+
+	# A functional verification that $deadbeef
+	# was not actually written to the node.
+	#
+	if [ ! -z $(sysctl $1 | grep $deadbeef) ]; then
+		atf_fail "value was written"
+	fi
+}
+
+# ddb.
+#
+atf_test_case sysctl_ddb cleanup
+sysctl_ddb_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'ddb' sysctl node as an user"
+}
+
+sysctl_ddb_body() {
+	sysctl_write "ddb"
+}
+
+sysctl_ddb_cleanup() {
+	clean
+}
+
+# hw.
+#
+atf_test_case sysctl_hw cleanup
+sysctl_hw_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'hw' sysctl node as an user"
+}
+
+sysctl_hw_body() {
+	sysctl_write "hw"
+}
+
+sysctl_hw_cleanup() {
+	clean
+}
+
+# kern.
+#
+atf_test_case sysctl_kern cleanup
+sysctl_kern_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'kern' " \
+		"sysctl node as an user (PR kern/44946)"
+}
+
+sysctl_kern_body() {
+	sysctl_write "kern"
+}
+
+sysctl_kern_cleanup() {
+	clean
+}
+
+# machdep.
+#
+atf_test_case sysctl_machdep cleanup
+sysctl_machdep_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'machdep' sysctl node as an user"
+}
+
+sysctl_machdep_body() {
+	sysctl_write "machdep"
+}
+
+sysctl_machdep_cleanup() {
+	clean
+}
+
+# net.
+#
+atf_test_case sysctl_net cleanup
+sysctl_net_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'net' sysctl node as an user"
+}
+
+sysctl_net_body() {
+	sysctl_write "net"
+}
+
+sysctl_net_cleanup() {
+	clean
+}
+
+# security.
+#
+atf_test_case sysctl_security cleanup
+sysctl_security_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'security' sysctl node as an user"
+}
+
+sysctl_security_body() {
+	sysctl_write "security"
+}
+
+sysctl_security_cleanup() {
+	clean
+}
+
+# vfs.
+#
+atf_test_case sysctl_vfs cleanup
+sysctl_vfs_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'vfs' sysctl node as an user"
+}
+
+sysctl_vfs_body() {
+	sysctl_write "vfs"
+}
+
+sysctl_vfs_cleanup() {
+	clean
+}
+
+# vm.
+#
+atf_test_case sysctl_vm cleanup
+sysctl_vm_head() {
+	atf_set "require.user" "unprivileged"
+	atf_set "descr" "Test writing to 'vm' sysctl node as an user"
+}
+
+sysctl_vm_body() {
+	sysctl_write "vm"
+}
+
+sysctl_vm_cleanup() {
+	clean
+}
+
+atf_init_test_cases() {
+	atf_add_test_case sysctl_ddb
+	atf_add_test_case sysctl_hw
+	atf_add_test_case sysctl_kern
+	atf_add_test_case sysctl_machdep
+	atf_add_test_case sysctl_net
+	atf_add_test_case sysctl_security
+	atf_add_test_case sysctl_vfs
+	atf_add_test_case sysctl_vm
+}
diff --git a/contrib/netbsd-tests/sbin/sysctl/t_sysctl.sh b/contrib/netbsd-tests/sbin/sysctl/t_sysctl.sh
new file mode 100755
index 000000000000..6573d8dd71d7
--- /dev/null
+++ b/contrib/netbsd-tests/sbin/sysctl/t_sysctl.sh
@@ -0,0 +1,45 @@
+# $NetBSD: t_sysctl.sh,v 1.2 2014/05/16 18:50:28 palle Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Test that sysctl(8) works"
+}
+
+basic_body() {
+
+	atf_check -s exit:0 -o ignore -e empty -x "sysctl -a"
+	atf_check -s exit:0 -o ignore -e empty -x "sysctl -d"
+}
+
+atf_init_test_cases() {
+
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/share/examples/t_asm.sh b/contrib/netbsd-tests/share/examples/t_asm.sh
new file mode 100755
index 000000000000..f615935faa46
--- /dev/null
+++ b/contrib/netbsd-tests/share/examples/t_asm.sh
@@ -0,0 +1,74 @@
+# $NetBSD: t_asm.sh,v 1.1 2013/02/16 12:44:26 jmmv Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# check_implemented <example_name>
+#
+# Verifies if a particular asm example is implemented for the current
+# platform.  The example_name argument is the name of the subdirectory
+# of the examples/asm/ subtree that includes the code for the example
+# under test.
+#
+# If the example is not implemented, the calling test is skipped.  If the
+# check for implementation fails, the calling test is failed.
+check_implemented() {
+	local name="${1}"; shift
+
+	local implemented=$(cd /usr/share/examples/asm/${name}/ && \
+	                    make check-implemented)
+	[ $? -eq 0 ] || atf_fail "Failed to determine if the sample" \
+	    "program is supported"
+	[ "${implemented}" = yes ] || atf_skip "Example program not" \
+	    "implemented on this platform"
+}
+
+# copy_example <example_name>
+#
+# Copies the example code and supporting Makefiles into the current
+# directory.
+copy_example() {
+	local name="${1}"; shift
+
+	cp /usr/share/examples/asm/${name}/* .
+}
+
+atf_test_case hello
+hello_head() {
+	atf_set "descr" "Builds, runs and validates the 'hello' asm example"
+	atf_set "require.files" "/usr/share/examples/asm/hello/"
+	atf_set "require.progs" "make"
+}
+hello_body() {
+	check_implemented hello
+	copy_example hello
+	atf_check -s exit:0 -o ignore -e ignore make
+	atf_check -s exit:0 -o inline:'Hello, world!\n' -e empty ./hello
+}
+
+atf_init_test_cases() {
+	atf_add_test_case hello
+}
diff --git a/contrib/netbsd-tests/share/mk/common.subr b/contrib/netbsd-tests/share/mk/common.subr
new file mode 100644
index 000000000000..0b542feeab4d
--- /dev/null
+++ b/contrib/netbsd-tests/share/mk/common.subr
@@ -0,0 +1,132 @@
+# Copyright 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+# Dumps a file to the test's stdout for debugging purposes.
+dump_file() {
+	local file="${1}"; shift
+
+	echo "==== BEGIN ${file}"
+	cat "${file}"
+	echo "==== END   ${file}"
+}
+
+# Creates a C source file with a single symbol in it.
+#
+# The file parameter specifies the path to the file to create, WITHOUT the
+# C extension.  Both a source file and a header file are created.  Any
+# intermediate directories are created too.
+#
+# The symbol parameter specifies the name of the symbol to place in the
+# module, which is defined as a string holding the name of the module.
+create_c_module() {
+	local file="${1}"; shift
+	local symbol="${1}"; shift
+
+	mkdir -p "$(dirname ${file})"
+	echo "extern const char *${symbol};" >"${file}.h"
+	echo "const char *${symbol} = \"${file}\";" >"${file}.c"
+
+	dump_file "${file}.h"
+	dump_file "${file}.c"
+}
+
+# Creates a main C source file that references a set of modules.
+#
+# The modules to be referenced should have been created with
+# create_c_module.  The generated source file ensures that all the modules
+# are referenced in some way, which helps in testing that the generated
+# binary holds all the necessary objects.
+#
+# The file parameter specifies the name of the file to create.
+#
+# The rest of the parameters are module:symbol pairs that specify the
+# module to include and the symbol within them to reference.
+create_main_using_modules() {
+	local file="${1}"; shift
+
+	local modules=
+	local symbols=
+	for spec in "${@}"; do
+		modules="${modules} $(echo ${spec} | cut -d : -f 1)"
+		symbols="${symbols} $(echo ${spec} | cut -d : -f 2)"
+	done
+
+	echo '#include <stdio.h>' >"${file}"
+	for module in ${modules}; do
+		echo "#include \"${module}\"" >>"${file}"
+	done
+	echo 'int main(void) {' >>"${file}"
+	for symbol in ${symbols}; do
+		echo "printf(\"%s\n\", ${symbol});" >>"${file}"
+	done
+	echo 'return 0; }' >>"${file}"
+
+	dump_file "${file}"
+}
+
+# Creates a mk.conf file and points MAKECONF to it.
+#
+# The first argument specifies the name of the configuration file to
+# create.
+#
+# The rest of the arguments include a collection of modifiers for the
+# generated configuration file and/or a collection of explicit variable
+# names and their values to set.
+#
+# The qualifiers can be one of:
+# - owngrp: Override the *OWN and *GRP variables to point to the current
+#   user.
+create_make_conf() {
+	local file="${1}"; shift
+
+	echo "# Test configuration file" >"${file}"
+	for arg in "${@}"; do
+		case "${arg}" in
+		*=*)
+			echo "${arg}" >>"${file}"
+			;;
+		owngrp)
+			for class in BIN DOC LIB LINKS MAN; do
+				echo "${class}OWN=$(id -un)" >>"${file}"
+				echo "${class}GRP=$(id -gn)" >>"${file}"
+			done
+			;;
+		esac
+	done
+
+	case "${file}" in
+	/*)
+		MAKECONF="${file}"; export MAKECONF
+		;;
+	*)
+		MAKECONF="$(pwd)/${file}"; export MAKECONF
+		;;
+	esac
+
+	dump_file "${file}"
+}
diff --git a/contrib/netbsd-tests/share/mk/t_lib.sh b/contrib/netbsd-tests/share/mk/t_lib.sh
new file mode 100755
index 000000000000..5f18e14a5618
--- /dev/null
+++ b/contrib/netbsd-tests/share/mk/t_lib.sh
@@ -0,0 +1,54 @@
+# Copyright 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+atf_test_case defaults__build_and_install
+defaults__build_and_install_body() {
+	create_c_module module1 first
+	create_c_module module2 second
+
+	cat >Makefile <<EOF
+LIB = two-modules
+SRCS = module1.c module2.c
+.include <bsd.lib.mk>
+EOF
+
+	atf_check -o ignore make
+	mkdir -p root/usr/lib
+	mkdir -p root/usr/libdata/lint
+	create_make_conf mk.conf owngrp DESTDIR="$(pwd)/root"
+	atf_check -o ignore make install
+
+	create_main_using_modules main.c module1.h:first module2.h:second
+	atf_check -o ignore gcc -I. -Lroot/usr/lib -o main main.c -ltwo-modules
+
+	atf_check -o inline:'module1\nmodule2\n' ./main
+}
+
+atf_init_test_cases() {
+	atf_add_test_case defaults__build_and_install
+}
diff --git a/contrib/netbsd-tests/share/mk/t_own.sh b/contrib/netbsd-tests/share/mk/t_own.sh
new file mode 100755
index 000000000000..7372dd2fe8d8
--- /dev/null
+++ b/contrib/netbsd-tests/share/mk/t_own.sh
@@ -0,0 +1,72 @@
+# Copyright 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+atf_test_case makeconf__ok
+makeconf__ok_body() {
+	cat >Makefile <<EOF
+A_TEST_CONFIG_VARIABLE = not overriden
+
+.PHONY: show-config-var
+show-config-var:
+	@echo \${A_TEST_CONFIG_VARIABLE}
+
+.include <bsd.own.mk>
+EOF
+
+	echo >empty.conf
+	cat >custom.conf <<EOF
+A_TEST_CONFIG_VARIABLE = 'a value'
+EOF
+	atf_check -o inline:'not overriden\n' \
+	    make MAKECONF="$(pwd)/empty.conf" show-config-var
+	atf_check -o inline:'a value\n' \
+	    make MAKECONF="$(pwd)/custom.conf" show-config-var
+}
+
+atf_test_case makeconf__missing
+makeconf__missing_body() {
+	cat >Makefile <<EOF
+.PHONY: hello
+hello:
+	@echo 'Did not error out on a missing file!'
+
+.include <bsd.own.mk>
+EOF
+
+	echo >empty.conf
+	cat >custom.conf <<EOF
+A_TEST_CONFIG_VARIABLE = 'a value'
+EOF
+	atf_check -o inline:'Did not error out on a missing file!\n' \
+	    make MAKECONF="$(pwd)/non-existent.conf" hello
+}
+
+atf_init_test_cases() {
+	atf_add_test_case makeconf__ok
+	atf_add_test_case makeconf__missing
+}
diff --git a/contrib/netbsd-tests/share/mk/t_prog.sh b/contrib/netbsd-tests/share/mk/t_prog.sh
new file mode 100755
index 000000000000..d0040701e9c5
--- /dev/null
+++ b/contrib/netbsd-tests/share/mk/t_prog.sh
@@ -0,0 +1,87 @@
+# Copyright 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+atf_test_case defaults__build_and_install
+defaults__build_and_install_head() {
+	atf_set "require.progs" "/usr/bin/mandoc"
+}
+defaults__build_and_install_body() {
+	cat >hello.c <<EOF
+#include <stdio.h>
+int main(void) { printf("Hello, test!\n"); return 0; }
+EOF
+	cat >hello.1 <<EOF
+Manpage of hello(1).
+EOF
+
+	cat >Makefile <<EOF
+BINDIR = /the/bin/dir
+PROG = hello
+.include <bsd.prog.mk>
+EOF
+
+	atf_check -o ignore make
+	mkdir -p root/the/bin/dir
+	mkdir -p root/usr/share/man/man1
+	mkdir -p root/usr/share/man/html1
+	create_make_conf mk.conf owngrp DESTDIR="$(pwd)/root"
+	atf_check -o ignore make install
+
+	atf_check -o inline:'Hello, test!\n' ./root/the/bin/dir/hello
+	atf_check -o inline:'Manpage of hello(1).\n' \
+	    cat root/usr/share/man/man1/hello.1
+	atf_check -o match:'Manpage of hello' \
+	    cat root/usr/share/man/html1/hello.html
+}
+
+atf_test_case without_man__build_and_install
+without_man__build_and_install_body() {
+	cat >hello.c <<EOF
+#include <stdio.h>
+int main(void) { printf("Hello, test!\n"); return 0; }
+EOF
+
+	cat >Makefile <<EOF
+BINDIR = /the/bin/dir
+PROG = hello
+MAN =
+.include <bsd.prog.mk>
+EOF
+
+	atf_check -o ignore make
+	mkdir -p root/the/bin/dir
+	create_make_conf mk.conf owngrp DESTDIR="$(pwd)/root"
+	atf_check -o ignore make install
+
+	atf_check -o inline:'Hello, test!\n' ./root/the/bin/dir/hello
+}
+
+atf_init_test_cases() {
+	atf_add_test_case defaults__build_and_install
+	atf_add_test_case without_man__build_and_install
+}
diff --git a/contrib/netbsd-tests/share/mk/t_test.sh b/contrib/netbsd-tests/share/mk/t_test.sh
new file mode 100755
index 000000000000..c8bb1f3d8b17
--- /dev/null
+++ b/contrib/netbsd-tests/share/mk/t_test.sh
@@ -0,0 +1,111 @@
+# Copyright 2012 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * 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.
+# * Neither the name of Google Inc. nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# OWNER 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.
+
+# Helper function for the various one_* test cases.
+#
+# The first argument must be one of C, CXX or SH, and this indicates the
+# language of the test program.
+#
+# The second argument is the name of the test program, without an extension.
+# The corresponding source file must exist in the current directory.
+one_test() {
+	local lang="${1}"; shift
+	local name="${1}"; shift
+
+	cat >Makefile <<EOF
+.include <bsd.own.mk>
+TESTSDIR = \${TESTSBASE}/fake
+TESTS_${lang} = ${name}
+.include <bsd.test.mk>
+EOF
+
+	atf_check -o ignore make
+	mkdir -p root/usr/tests/fake
+	create_make_conf mk.conf owngrp DESTDIR="$(pwd)/root"
+	atf_check -o ignore make install
+
+	atf_check -o match:'ident: one_tc' "./root/usr/tests/fake/${name}" -l
+}
+
+atf_test_case one_c
+one_c_body() {
+	cat >t_fake.c <<EOF
+#include <atf-c.h>
+ATF_TC_WITHOUT_HEAD(one_tc);
+ATF_TC_BODY(one_tc, tc)
+{
+	atf_tc_fail("Failing explicitly");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, one_tc);
+	return atf_no_error();
+}
+EOF
+	one_test C t_fake
+}
+
+atf_test_case one_cxx
+one_cxx_body() {
+	cat >t_fake.cpp <<EOF
+#include <atf-c++.hpp>
+ATF_TEST_CASE_WITHOUT_HEAD(one_tc);
+ATF_TEST_CASE_BODY(one_tc)
+{
+	fail("Failing explicitly");
+}
+
+ATF_INIT_TEST_CASES(tcs)
+{
+	ATF_ADD_TEST_CASE(tcs, one_tc);
+}
+EOF
+	one_test CXX t_fake
+}
+
+atf_test_case one_sh
+one_sh_body() {
+	cat >t_fake.sh <<EOF
+atf_test_case one_tc
+one_tc_body() {
+	atf_fail "Failing explicitly"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case one_tc
+}
+EOF
+	one_test SH t_fake
+}
+
+atf_init_test_cases() {
+	atf_add_test_case one_c
+	atf_add_test_case one_cxx
+	atf_add_test_case one_sh
+}
diff --git a/contrib/netbsd-tests/sys/rc/h_args.sh b/contrib/netbsd-tests/sys/rc/h_args.sh
new file mode 100755
index 000000000000..2b03f294bc6a
--- /dev/null
+++ b/contrib/netbsd-tests/sys/rc/h_args.sh
@@ -0,0 +1,64 @@
+#! /bin/sh
+#
+# $NetBSD: h_args.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# 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.
+#
+
+#
+# An rc.d script that overrides all standard comands and adds a non-standard
+# command.  All of them print the set of arguments passed to them and take no
+# further action.
+#
+
+${_rc_subr_loaded} . /etc/rc.subr
+
+name="h_args"
+rcvar="${name}"
+command="/usr/bin/true"
+extra_commands="custom"
+
+for command in start stop restart custom; do
+	eval ${command}_precmd=\'print_args pre${command}\'
+	eval ${command}_cmd=\'print_args ${command}\'
+	eval ${command}_postcmd=\'print_args post${command}\'
+done
+
+print_args() {
+	local command="${1}"; shift
+
+	printf "${command}:"
+	while [ ${#} -gt 0 ]; do
+		printf " >%s<" "${1}"
+		shift
+	done
+	printf ".\n"
+}
+
+load_rc_config "${name}"
+run_rc_command "${@}"
diff --git a/contrib/netbsd-tests/sys/rc/h_simple.sh b/contrib/netbsd-tests/sys/rc/h_simple.sh
new file mode 100755
index 000000000000..4ed62a7f61c9
--- /dev/null
+++ b/contrib/netbsd-tests/sys/rc/h_simple.sh
@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# $NetBSD: h_simple.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# 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.
+#
+
+#
+# A very simple rc.d script that defines the minimum variables to be functional.
+#
+
+${_rc_subr_loaded} . /etc/rc.subr
+
+name="h_simple"
+rcvar="${name}"
+command="/bin/sleep"
+command_args="300 &"
+
+load_rc_config "${name}"
+run_rc_command "${@}"
diff --git a/contrib/netbsd-tests/sys/rc/t_rc_d_cli.sh b/contrib/netbsd-tests/sys/rc/t_rc_d_cli.sh
new file mode 100755
index 000000000000..d97f8cca6638
--- /dev/null
+++ b/contrib/netbsd-tests/sys/rc/t_rc_d_cli.sh
@@ -0,0 +1,250 @@
+# $NetBSD: t_rc_d_cli.sh,v 1.4 2010/11/07 17:51:21 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# 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.
+#
+
+atf_test_case no_command
+no_command_head() {
+	atf_set "descr" "Tests that the lack of a command errors out"
+}
+no_command_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	atf_check -s eq:1 -o empty -e ignore ${rc_helper}
+}
+
+atf_test_case default_start_no_args
+default_start_no_args_head() {
+	atf_set "descr" "Tests that running the default 'start' without" \
+	    "arguments does not error out"
+}
+default_start_no_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	atf_check -s eq:0 -o ignore -e empty ${rc_helper} start
+	${rc_helper} forcestop
+}
+
+atf_test_case default_start_with_args
+default_start_with_args_head() {
+	atf_set "descr" "Tests that running the default 'start' with" \
+	    "arguments errors out"
+}
+default_start_with_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	atf_check -s eq:1 -o ignore -e ignore ${rc_helper} start foo
+	if ${rc_helper} status >/dev/null; then
+		${rc_helper} forcestop
+		atf_fail 'extra argument to start did not error out'
+	fi
+}
+
+atf_test_case default_stop_no_args
+default_stop_no_args_head() {
+	atf_set "descr" "Tests that running the default 'stop' without" \
+	    "arguments does not error out"
+}
+default_stop_no_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	${rc_helper} start
+	atf_check -s eq:0 -o ignore -e empty ${rc_helper} stop
+}
+
+atf_test_case default_stop_with_args
+default_stop_with_args_head() {
+	atf_set "descr" "Tests that running the default 'stop' with" \
+	    "arguments errors out"
+}
+default_stop_with_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	${rc_helper} start
+	atf_check -s eq:1 -o ignore -e ignore ${rc_helper} stop foo
+	if ${rc_helper} status >/dev/null; then
+		${rc_helper} forcestop
+	else
+		atf_fail 'extra argument to stop did not error out'
+	fi
+}
+
+atf_test_case default_restart_no_args
+default_restart_no_args_head() {
+	atf_set "descr" "Tests that running the default 'restart' without" \
+	    "arguments does not error out"
+}
+default_restart_no_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	${rc_helper} start
+	atf_check -s eq:0 -o ignore -e empty ${rc_helper} restart
+	${rc_helper} forcestop
+}
+
+atf_test_case default_restart_with_args
+default_restart_with_args_head() {
+	atf_set "descr" "Tests that running the default 'restart' with" \
+	    "arguments errors out"
+}
+default_restart_with_args_body() {
+	export h_simple=YES
+	rc_helper=$(atf_get_srcdir)/h_simple
+
+	${rc_helper} start
+	atf_check -s eq:1 -o ignore -e ignore ${rc_helper} restart foo
+	${rc_helper} forcestop
+}
+
+do_overriden_no_args() {
+	local command="${1}"; shift
+
+	export h_args=YES
+	rc_helper=$(atf_get_srcdir)/h_args
+
+	cat >expout <<EOF
+pre${command}:.
+${command}:.
+post${command}:.
+EOF
+	atf_check -s eq:0 -o file:expout -e empty ${rc_helper} ${command}
+}
+
+do_overriden_with_args() {
+	local command="${1}"; shift
+
+	export h_args=YES
+	rc_helper=$(atf_get_srcdir)/h_args
+
+	cat >expout <<EOF
+pre${command}:.
+${command}: >arg1< > arg 2 < >arg3< >*<.
+post${command}:.
+EOF
+	atf_check -s eq:0 -o file:expout -e empty ${rc_helper} ${command} \
+	    'arg1' ' arg 2 ' 'arg3' '*'
+}
+
+atf_test_case overriden_start_no_args
+overriden_start_no_args_head() {
+	atf_set "descr" "Tests that running a custom 'start' without" \
+	    "arguments does not pass any parameters to the command"
+}
+overriden_start_no_args_body() {
+	do_overriden_no_args start
+}
+
+atf_test_case overriden_start_with_args
+overriden_start_with_args_head() {
+	atf_set "descr" "Tests that running a custom 'start' with" \
+	    "arguments passes those arguments as parameters to the command"
+}
+overriden_start_with_args_body() {
+	do_overriden_with_args start
+}
+
+atf_test_case overriden_stop_no_args
+overriden_stop_no_args_head() {
+	atf_set "descr" "Tests that running a custom 'stop' without" \
+	    "arguments does not pass any parameters to the command"
+}
+overriden_stop_no_args_body() {
+	do_overriden_no_args stop
+}
+
+atf_test_case overriden_stop_with_args
+overriden_stop_with_args_head() {
+	atf_set "descr" "Tests that running a custom 'stop' with" \
+	    "arguments passes those arguments as parameters to the command"
+}
+overriden_stop_with_args_body() {
+	do_overriden_with_args stop
+}
+
+atf_test_case overriden_restart_no_args
+overriden_restart_no_args_head() {
+	atf_set "descr" "Tests that running a custom 'restart' without" \
+	    "arguments does not pass any parameters to the command"
+}
+overriden_restart_no_args_body() {
+	do_overriden_no_args restart
+}
+
+atf_test_case overriden_restart_with_args
+overriden_restart_with_args_head() {
+	atf_set "descr" "Tests that running a custom 'restart' with" \
+	    "arguments passes those arguments as parameters to the command"
+}
+overriden_restart_with_args_body() {
+	do_overriden_with_args restart
+}
+
+atf_test_case overriden_custom_no_args
+overriden_custom_no_args_head() {
+	atf_set "descr" "Tests that running a custom command without" \
+	    "arguments does not pass any parameters to the command"
+}
+overriden_custom_no_args_body() {
+	do_overriden_no_args custom
+}
+
+atf_test_case overriden_custom_with_args
+overriden_custom_with_args_head() {
+	atf_set "descr" "Tests that running a custom command with" \
+	    "arguments passes those arguments as parameters to the command"
+}
+overriden_custom_with_args_body() {
+	do_overriden_with_args custom
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case no_command
+
+	atf_add_test_case default_start_no_args
+	atf_add_test_case default_start_with_args
+	atf_add_test_case default_stop_no_args
+	atf_add_test_case default_stop_with_args
+	atf_add_test_case default_restart_no_args
+	atf_add_test_case default_restart_with_args
+
+	atf_add_test_case overriden_start_no_args
+	atf_add_test_case overriden_start_with_args
+	atf_add_test_case overriden_stop_no_args
+	atf_add_test_case overriden_stop_with_args
+	atf_add_test_case overriden_restart_no_args
+	atf_add_test_case overriden_restart_with_args
+	atf_add_test_case overriden_custom_no_args
+	atf_add_test_case overriden_custom_with_args
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.awk b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.awk
new file mode 100644
index 000000000000..52c39124cbf6
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.awk
@@ -0,0 +1,16 @@
+# $NetBSD: d_assign_NF.awk,v 1.1 2012/03/11 18:35:59 jruoho Exp $
+
+{
+	NF = 2
+	print "$0=`" $0 "`"
+	print "$3=`" $3 "`"
+	print "$4=`" $4 "`"
+	NF = 3
+	print "$0=`" $0 "`"
+	print "$3=`" $3 "`"
+	print "$4=`" $4 "`"
+	NF = 4
+	print "$0=`" $0 "`"
+	print "$3=`" $3 "`"
+	print "$4=`" $4 "`"
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.in b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.in
new file mode 100644
index 000000000000..1245b922123b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.in
@@ -0,0 +1 @@
+ 1    2  3
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.out b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.out
new file mode 100644
index 000000000000..2631a7a92db8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_assign_NF.out
@@ -0,0 +1,9 @@
+$0=`1 2`
+$3=``
+$4=``
+$0=`1 2 `
+$3=``
+$4=``
+$0=`1 2  `
+$3=``
+$4=``
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.awk b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.awk
new file mode 100644
index 000000000000..1502b5e75462
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.awk
@@ -0,0 +1,3 @@
+# $NetBSD: d_big_regexp.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+/^[^_][^ ]*_NNIFO([ ]+[^_]+[^ ]*_(CC|INR|JJFO|JJMA|JJPG|NNIFG|NNIFO|NNIMPG|NNIMR|NNING|PP3FD|PQINO|PQMO|PSFR|RQ|TC|VIIR3|VPIPN|VPLIPF|NOTAG|RQR))*$/
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.in b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.in
new file mode 100644
index 000000000000..ad82078afc0d
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.in
@@ -0,0 +1 @@
+1_NNIFO 1_PSFR 1_JJFO 1_NNIFO 1_INR 1_NNIMR 1_CC 1_NNING 1_RQ 1_VPLIPF 1_NNIFG 1_JJPG 1_NNIMPG 1_PQINO 1_VPIPN 1_PP3FD 1_JJMA 1_PQMO 1_TC 1_VIIR3
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.out b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.out
new file mode 100644
index 000000000000..ad82078afc0d
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_big_regexp.out
@@ -0,0 +1 @@
+1_NNIFO 1_PSFR 1_JJFO 1_NNIFO 1_INR 1_NNIMR 1_CC 1_NNING 1_RQ 1_VPLIPF 1_NNIFG 1_JJPG 1_NNIMPG 1_PQINO 1_VPIPN 1_PP3FD 1_JJMA 1_PQMO 1_TC 1_VIIR3
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end1.awk b/contrib/netbsd-tests/usr.bin/awk/d_end1.awk
new file mode 100644
index 000000000000..cb8b0d0ed208
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end1.awk
@@ -0,0 +1,5 @@
+# $NetBSD: d_end1.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+	print NF;
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end1.in b/contrib/netbsd-tests/usr.bin/awk/d_end1.in
new file mode 100644
index 000000000000..8e13e468a002
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end1.in
@@ -0,0 +1 @@
+a b c d
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end1.out b/contrib/netbsd-tests/usr.bin/awk/d_end1.out
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end1.out
@@ -0,0 +1 @@
+4
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end2.awk b/contrib/netbsd-tests/usr.bin/awk/d_end2.awk
new file mode 100644
index 000000000000..8b10b828779c
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end2.awk
@@ -0,0 +1,5 @@
+# $NetBSD: d_end2.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+	print $0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end2.in b/contrib/netbsd-tests/usr.bin/awk/d_end2.in
new file mode 100644
index 000000000000..8e13e468a002
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end2.in
@@ -0,0 +1 @@
+a b c d
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_end2.out b/contrib/netbsd-tests/usr.bin/awk/d_end2.out
new file mode 100644
index 000000000000..8e13e468a002
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_end2.out
@@ -0,0 +1 @@
+a b c d
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_period.awk b/contrib/netbsd-tests/usr.bin/awk/d_period.awk
new file mode 100644
index 000000000000..d1dabf751304
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_period.awk
@@ -0,0 +1 @@
+{print x + $1 + 0.125}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_period.in b/contrib/netbsd-tests/usr.bin/awk/d_period.in
new file mode 100644
index 000000000000..d10c0e2f9d08
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_period.in
@@ -0,0 +1 @@
+0,25
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_period.out b/contrib/netbsd-tests/usr.bin/awk/d_period.out
new file mode 100644
index 000000000000..3382aa6e35b8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_period.out
@@ -0,0 +1 @@
+0.625
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_string1.awk b/contrib/netbsd-tests/usr.bin/awk/d_string1.awk
new file mode 100644
index 000000000000..d690240fa17b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_string1.awk
@@ -0,0 +1,7 @@
+# $NetBSD: d_string1.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+BEGIN {
+	print "A\
+B";
+	print "CD"
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_string1.out b/contrib/netbsd-tests/usr.bin/awk/d_string1.out
new file mode 100644
index 000000000000..96c017b97b70
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_string1.out
@@ -0,0 +1,2 @@
+AB
+CD
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_tolower.awk b/contrib/netbsd-tests/usr.bin/awk/d_tolower.awk
new file mode 100644
index 000000000000..258d181ce30b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_tolower.awk
@@ -0,0 +1,5 @@
+# $NetBSD: d_tolower.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+	print tolower($0);
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_tolower.in b/contrib/netbsd-tests/usr.bin/awk/d_tolower.in
new file mode 100644
index 000000000000..66ed03c2d27a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_tolower.in
@@ -0,0 +1 @@
+ABCÆØÅ
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_tolower.out b/contrib/netbsd-tests/usr.bin/awk/d_tolower.out
new file mode 100644
index 000000000000..83b2bf51cdf4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_tolower.out
@@ -0,0 +1 @@
+abcæøå
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_toupper.awk b/contrib/netbsd-tests/usr.bin/awk/d_toupper.awk
new file mode 100644
index 000000000000..0719aa9b86e9
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_toupper.awk
@@ -0,0 +1,5 @@
+# $NetBSD: d_toupper.awk,v 1.1 2012/03/11 18:36:01 jruoho Exp $
+
+END {
+	print toupper($0);
+}
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_toupper.in b/contrib/netbsd-tests/usr.bin/awk/d_toupper.in
new file mode 100644
index 000000000000..83b2bf51cdf4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_toupper.in
@@ -0,0 +1 @@
+abcæøå
diff --git a/contrib/netbsd-tests/usr.bin/awk/d_toupper.out b/contrib/netbsd-tests/usr.bin/awk/d_toupper.out
new file mode 100644
index 000000000000..66ed03c2d27a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/d_toupper.out
@@ -0,0 +1 @@
+ABCÆØÅ
diff --git a/contrib/netbsd-tests/usr.bin/awk/t_awk.sh b/contrib/netbsd-tests/usr.bin/awk/t_awk.sh
new file mode 100755
index 000000000000..77cb5f86df01
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/awk/t_awk.sh
@@ -0,0 +1,378 @@
+# $NetBSD: t_awk.sh,v 1.5 2012/12/10 20:30:06 christos Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Christos Zoulas
+#
+# 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.
+#
+
+awk=awk
+
+h_check()
+{
+	local fname=d_$1
+	for sfx in in out awk; do
+		cp -r $(atf_get_srcdir)/$fname.$sfx .
+	done
+	shift 1
+	atf_check -o file:$fname.out -x "awk $@ -f $fname.awk < $fname.in"
+}
+
+atf_test_case big_regexp
+
+big_regexp_head() {
+	atf_set "descr" "Checks matching long regular expressions (PR/33392)"
+}
+
+big_regexp_body() {
+	h_check big_regexp
+}
+
+atf_test_case end
+
+end_head() {
+	atf_set "descr" "Checks that the last line of the input" \
+	                "is available under END pattern (PR/29659)"
+}
+
+end_body() {
+	h_check end1
+	h_check end2
+}
+
+atf_test_case string1
+
+string1_head() {
+	atf_set "descr" "Checks escaping newlines in string literals"
+}
+
+string1_body() {
+	for sfx in out awk; do
+		cp -r $(atf_get_srcdir)/d_string1.$sfx .
+	done
+	atf_check -o file:d_string1.out awk -f d_string1.awk
+}
+
+atf_test_case multibyte
+
+multibyte_head() {
+	atf_set "descr" "Checks multibyte charsets support" \
+	                "in tolower and toupper (PR/36394)"
+}
+
+multibyte_body() {
+	export LANG=en_US.UTF-8
+
+	h_check tolower
+	h_check toupper
+}
+
+atf_test_case period
+
+period_head() {
+	atf_set "descr" "Checks that the period character is recognised" \
+	                "in awk program regardless of locale (bin/42320)"
+}
+
+period_body() {
+	export LANG=ru_RU.KOI8-R
+
+	h_check period -v x=0.5
+}
+
+atf_test_case assign_NF
+
+assign_NF_head() {
+	atf_set "descr" 'Checks that assign to NF changes $0 and $n (PR/44063)'
+}
+
+assign_NF_body() {
+	h_check assign_NF
+}
+
+atf_test_case single_char_rs
+
+single_char_rs_head() {
+	atf_set "descr" "Test awk(1) with single character RS"
+}
+
+single_char_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n\n3\n\n\n4\n\n" \
+		-x "echo 1a2aa3aaa4 | $awk 1 RS=a"
+}
+
+atf_test_case two_char_rs
+
+two_char_rs_head() {
+	atf_set "descr" "Test awk(1) with two characters RS"
+}
+
+two_char_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n3\n4\n\n" \
+		-x "echo 1ab2ab3ab4 | $awk 1 RS=ab"
+}
+
+atf_test_case single_char_regex_group_rs
+
+single_char_regex_group_rs_head() {
+	atf_set "descr" "Test awk(1) with single character regex group RS"
+}
+
+single_char_regex_group_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n\n3\n\n\n4\n\n" \
+		-x "echo 1a2aa3aaa4 | $awk 1 RS='[a]'"
+}
+
+atf_test_case two_char_regex_group_rs
+
+two_char_regex_group_rs_head() {
+	atf_set "descr" "Test awk(1) with two characters regex group RS"
+}
+
+two_char_regex_group_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n\n3\n\n\n4\n\n" \
+		-x "echo 1a2ab3aba4 | $awk 1 RS='[ab]'"
+}
+
+atf_test_case single_char_regex_star_rs
+
+single_char_regex_star_rs_head() {
+	atf_set "descr" "Test awk(1) with single character regex star RS"
+}
+
+single_char_regex_star_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n3\n4\n\n" \
+		-x "echo 1a2aa3aaa4 | $awk 1 RS='a*'"
+}
+
+atf_test_case two_char_regex_star_rs
+
+two_char_regex_star_rs_head() {
+	atf_set "descr" "Test awk(1) with two characters regex star RS"
+}
+
+two_char_regex_star_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n3\n4\n\n" \
+		-x "echo 1a2aa3aaa4 | $awk 1 RS='aa*'"
+}
+
+atf_test_case regex_two_star_rs
+
+regex_two_star_rs_head() {
+	atf_set "descr" "Test awk(1) with regex two star RS"
+}
+
+regex_two_star_rs_body() {
+	atf_check \
+		-o "inline:1\n2\n3\n4\n\n" \
+		-x "echo 1a2ab3aab4 | $awk 1 RS='aa*b*'"
+}
+
+atf_test_case regex_or_1_rs
+
+regex_or_1_rs_head() {
+	atf_set "descr" "Test awk(1) with regex | case 1 RS"
+}
+
+regex_or_1_rs_body() {
+	atf_check \
+		-o "inline:1a\nc\n\n" \
+		-x "echo 1abc | $awk 1 RS='abcde|b'"
+}
+
+atf_test_case regex_or_2_rs
+
+regex_or_2_rs_head() {
+	atf_set "descr" "Test awk(1) with regex | case 2 RS"
+}
+
+regex_or_2_rs_body() {
+	atf_check \
+		-o "inline:1a\ncdf2\n\n" \
+		-x "echo 1abcdf2 | $awk 1 RS='abcde|b'"
+}
+
+atf_test_case regex_or_3_rs
+
+regex_or_3_rs_head() {
+	atf_set "descr" "Test awk(1) with regex | case 3 RS"
+}
+
+regex_or_3_rs_body() {
+	atf_check \
+		-o "inline:1\n\nf2\n\n" \
+		-x "echo 1abcdebf2 | $awk 1 RS='abcde|b'"
+}
+
+atf_test_case regex_or_4_rs
+
+regex_or_4_rs_head() {
+	atf_set "descr" "Test awk(1) with regex | case 4 RS"
+}
+
+regex_or_4_rs_body() {
+	atf_check \
+		-o "inline:1\nbcdf2\n\n" \
+		-x "echo 1abcdf2 | $awk 1 RS='abcde|a'"
+
+}
+
+atf_test_case regex_caret_1_rs
+
+regex_caret_1_rs_head() {
+	atf_set "descr" "Test awk(1) with regex ^ case 1 RS"
+}
+
+regex_caret_1_rs_body() {
+	atf_check \
+		-o "inline:\n1a2a3a\n\n" \
+		-x "echo a1a2a3a | $awk 1 RS='^a'"
+
+}
+
+atf_test_case regex_caret_2_rs
+
+regex_caret_2_rs_head() {
+	atf_set "descr" "Test awk(1) with regex ^ case 2 RS"
+}
+
+regex_caret_2_rs_body() {
+	atf_check \
+		-o "inline:\naa1a2a\n\n" \
+		-x "echo aaa1a2a | $awk 1 RS='^a'"
+
+}
+
+atf_test_case regex_dollar_1_rs
+
+regex_dollar_1_rs_head() {
+	atf_set "descr" "Test awk(1) with regex $ case 1 RS"
+}
+
+regex_dollar_1_rs_body() {
+	atf_check \
+		-o "inline:a1a2a3a\n\n" \
+		-x "echo a1a2a3a | $awk 1 RS='a$'"
+
+}
+
+atf_test_case regex_dollar_2_rs
+
+regex_dollar_2_rs_head() {
+	atf_set "descr" "Test awk(1) with regex $ case 2 RS"
+}
+
+regex_dollar_2_rs_body() {
+	atf_check \
+		-o "inline:a1a2aaa\n\n" \
+		-x "echo a1a2aaa | $awk 1 RS='a$'"
+
+}
+
+atf_test_case regex_reallocation_rs
+
+regex_reallocation_rs_head() {
+	atf_set "descr" "Test awk(1) with regex reallocation RS"
+}
+
+regex_reallocation_rs_body() {
+	atf_check \
+		-o "inline:a\na\na\na\na\na\na\na\na\na10000\n\n" \
+		-x "jot -s a 10000 | $awk 'NR>1' RS='999[0-9]'"
+
+}
+
+atf_test_case empty_rs
+
+empty_rs_head() {
+	atf_set "descr" "Test awk(1) with empty RS"
+}
+
+empty_rs_body() {
+	atf_check \
+		-o "inline:foo\n" \
+		-x "echo foo | $awk 1 RS=''"
+
+}
+
+atf_test_case newline_rs
+
+newline_rs_head() {
+	atf_set "descr" "Test awk(1) with newline RS"
+}
+
+newline_rs_body() {
+	atf_check \
+		-o "inline:r1f1:r1f2\nr2f1:r2f2\n" \
+		-x "printf '\n\n\nr1f1\nr1f2\n\nr2f1\nr2f2\n\n\n' | $awk '{\$1=\$1}1' RS= OFS=:"
+}
+
+atf_test_case modify_subsep
+
+modify_subsep_head() {
+	atf_set "descr" "Test awk(1) SUPSEP modification (PR/47306)"
+}
+
+modify_subsep_body() {
+	atf_check \
+		-o "inline:1\n1\n1\n" \
+		-x "printf '1\n1 2\n' | \
+		$awk '1{ arr[\$1 SUBSEP \$2 SUBSEP ++cnt[\$1]]=1} {for (f in arr) print arr[f];}'"
+}
+
+atf_init_test_cases() {
+
+	atf_add_test_case big_regexp
+	atf_add_test_case end
+	atf_add_test_case string1
+	atf_add_test_case multibyte
+	atf_add_test_case period
+	atf_add_test_case assign_NF
+
+	atf_add_test_case single_char_rs
+	atf_add_test_case two_char_rs
+	atf_add_test_case single_char_regex_group_rs
+	atf_add_test_case two_char_regex_group_rs
+	atf_add_test_case two_char_regex_star_rs
+	atf_add_test_case single_char_regex_star_rs
+	atf_add_test_case regex_two_star_rs
+	atf_add_test_case regex_or_1_rs
+	atf_add_test_case regex_or_2_rs
+	atf_add_test_case regex_or_3_rs
+	atf_add_test_case regex_caret_1_rs
+	atf_add_test_case regex_caret_2_rs
+	atf_add_test_case regex_dollar_1_rs
+	atf_add_test_case regex_dollar_2_rs
+	atf_add_test_case regex_reallocation_rs
+	atf_add_test_case empty_rs
+	atf_add_test_case newline_rs
+	atf_add_test_case modify_subsep
+}
diff --git a/contrib/netbsd-tests/usr.bin/basename/t_basename.sh b/contrib/netbsd-tests/usr.bin/basename/t_basename.sh
new file mode 100755
index 000000000000..d22b7a9a82a8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/basename/t_basename.sh
@@ -0,0 +1,62 @@
+# $NetBSD: t_basename.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Checks basic functionality"
+}
+basic_body()
+{
+	atf_check -o inline:"bin\n" basename /usr/bin
+	atf_check -o inline:"usr\n" basename /usr
+	atf_check -o inline:"/\n" basename /
+	atf_check -o inline:"/\n" basename ///
+	atf_check -o inline:"usr\n" basename /usr//
+	atf_check -o inline:"bin\n" basename //usr//bin
+	atf_check -o inline:"usr\n" basename usr
+	atf_check -o inline:"bin\n" basename usr/bin
+}
+
+atf_test_case suffix
+suffix_head()
+{
+	atf_set "descr" "Checks removing of provided suffix"
+}
+suffix_body()
+{
+	atf_check -o inline:"bi\n" basename /usr/bin n
+	atf_check -o inline:"bin\n" basename /usr/bin bin
+	atf_check -o inline:"/\n" basename / /
+	atf_check -o inline:"g\n" basename /usr/bin/gcc cc
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case suffix
+}
diff --git a/contrib/netbsd-tests/usr.bin/bzip2/t_bzip2.sh b/contrib/netbsd-tests/usr.bin/bzip2/t_bzip2.sh
new file mode 100755
index 000000000000..447fea90662e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/bzip2/t_bzip2.sh
@@ -0,0 +1,52 @@
+# $NetBSD: t_bzip2.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Checks basic functionality"
+}
+basic_body()
+{ 
+	atf_check -o file:$(atf_get_srcdir)/d_sample1.bz2 \
+	    bzip2 -1c $(atf_get_srcdir)/d_sample1.ref
+	atf_check -o file:$(atf_get_srcdir)/d_sample2.bz2 \
+	    bzip2 -2c $(atf_get_srcdir)/d_sample2.ref
+	atf_check -o file:$(atf_get_srcdir)/d_sample3.bz2 \
+	    bzip2 -3c $(atf_get_srcdir)/d_sample3.ref
+	atf_check -o file:$(atf_get_srcdir)/d_sample1.ref \
+	    bzip2 -dc $(atf_get_srcdir)/d_sample1.bz2
+	atf_check -o file:$(atf_get_srcdir)/d_sample2.ref \
+	    bzip2 -dc $(atf_get_srcdir)/d_sample2.bz2
+	atf_check -o file:$(atf_get_srcdir)/d_sample3.ref \
+	    bzip2 -dsc $(atf_get_srcdir)/d_sample3.bz2
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/usr.bin/cc/t_hello.sh b/contrib/netbsd-tests/usr.bin/cc/t_hello.sh
new file mode 100755
index 000000000000..9fa1352512db
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cc/t_hello.sh
@@ -0,0 +1,144 @@
+#	$NetBSD: t_hello.sh,v 1.2 2012/07/21 12:30:55 martin Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case hello
+hello_head() {
+	atf_set "descr" "compile and run \"hello world\""
+	atf_set "require.progs" "cc"
+}
+
+atf_test_case hello_pic
+hello_pic_head() {
+	atf_set "descr" "compile and run PIC \"hello world\""
+	atf_set "require.progs" "cc"
+}
+
+atf_test_case hello_pie
+hello_pie_head() {
+	atf_set "descr" "compile and run position independend (PIE) \"hello world\""
+	atf_set "require.progs" "cc"
+}
+
+atf_test_case hello32
+hello32_head() {
+	atf_set "descr" "compile and run \"hello world\" for/in netbsd32 emulation"
+	atf_set "require.progs" "cc file diff cat"
+}
+
+hello_body() {
+	cat > test.c << EOF
+#include <stdio.h>
+#include <stdlib.h>
+int main(void) {printf("hello world\n");exit(0);}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -o hello test.c
+	atf_check -s exit:0 -o inline:"hello world\n" ./hello
+}
+
+hello_pic_body() {
+	cat > test.c << EOF
+#include <stdlib.h>
+int main(void) {callpic();exit(0);}
+EOF
+	cat > pic.c << EOF
+#include <stdio.h>
+int callpic(void) {printf("hello world\n");}
+EOF
+
+	atf_check -s exit:0 -o ignore -e ignore \
+	    cc -fPIC -dPIC -shared -o libtest.so pic.c
+	atf_check -s exit:0 -o ignore -e ignore \
+	    cc -o hello test.c -L. -ltest
+
+	export LD_LIBRARY_PATH=.
+	atf_check -s exit:0 -o inline:"hello world\n" ./hello
+}
+
+hello_pie_body() {
+	# check whether this arch supports -pie
+	if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+		atf_skip "cc -pie not supported on this architecture"
+	fi
+	cat > test.c << EOF
+#include <stdio.h>
+#include <stdlib.h>
+int main(void) {printf("hello world\n");exit(0);}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -fpie -pie -o hello test.c
+	atf_check -s exit:0 -o inline:"hello world\n" ./hello
+}
+
+hello32_body() {
+	# check whether this arch is 64bit
+	if ! cc -dM -E - < /dev/null | fgrep -q _LP64; then
+		atf_skip "this is not a 64 bit architecture"
+	fi
+	if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "cc -m32 not supported on this architecture"
+	else
+		if fgrep -q _LP64 ./def32; then
+			atf_fail "cc -m32 does not generate netbsd32 binaries"
+		fi
+	fi
+
+	cat > test.c << EOF
+#include <stdio.h>
+#include <stdlib.h>
+int main(void) {printf("hello world\n");exit(0);}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -o hello32 -m32 test.c
+	atf_check -s exit:0 -o ignore -e ignore cc -o hello64 test.c
+	file -b ./hello32 > ./ftype32
+	file -b ./hello64 > ./ftype64
+	if diff ./ftype32 ./ftype64 >/dev/null; then
+		atf_fail "generated binaries do not differ"
+	fi
+	echo "32bit binaries on this platform are:"
+	cat ./ftype32
+	echo "While native (64bit) binaries are:"
+	cat ./ftype64
+	atf_check -s exit:0 -o inline:"hello world\n" ./hello32
+
+	# do another test with static 32bit binaries
+	cat > test.c << EOF
+#include <stdio.h>
+#include <stdlib.h>
+int main(void) {printf("hello static world\n");exit(0);}
+EOF
+	atf_check -s exit:0 -o ignore -e ignore cc -o hello -m32 \
+	    -static test.c
+	atf_check -s exit:0 -o inline:"hello static world\n" ./hello
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case hello
+	atf_add_test_case hello_pic
+	atf_add_test_case hello_pie
+	atf_add_test_case hello32
+}
diff --git a/contrib/netbsd-tests/usr.bin/cmp/t_cmp.sh b/contrib/netbsd-tests/usr.bin/cmp/t_cmp.sh
new file mode 100755
index 000000000000..341047fb5e06
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cmp/t_cmp.sh
@@ -0,0 +1,67 @@
+# $NetBSD: t_cmp.sh,v 1.1 2012/03/19 07:05:18 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case missing
+missing_head() {
+	atf_set "descr" "Test that cmp(1) with '-s' is silent " \
+			"when files are missing (PR bin/2642)"
+}
+
+missing_body() {
+
+	echo a > a
+
+	atf_check -s not-exit:0 -o empty -e empty -x "cmp -s a x"
+	atf_check -s not-exit:0 -o empty -e empty -x "cmp -s x a"
+	atf_check -s not-exit:0 -o empty -e empty -x "cmp -s x y"
+	atf_check -s not-exit:0 -o empty -e empty -x "cmp -s y x"
+}
+
+atf_test_case skip
+skip_head() {
+	atf_set "descr" "Test that cmp(1) handles skip " \
+			"parameters correctly (PR bin/23836)"
+}
+
+skip_body() {
+
+	echo 0123456789abcdef > a
+	echo abcdef > b
+
+	atf_check -s exit:0 -o empty -e empty -x "cmp a b '10'"
+	atf_check -s exit:0 -o empty -e empty -x "cmp a b '0xa'"
+	atf_check -s exit:1 -o not-empty -e empty -x "cmp a b '9'"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case missing
+	atf_add_test_case skip
+}
diff --git a/contrib/netbsd-tests/usr.bin/config/d_deffs_redef b/contrib/netbsd-tests/usr.bin/config/d_deffs_redef
new file mode 100644
index 000000000000..d84d1f7128ed
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_deffs_redef
@@ -0,0 +1,10 @@
+include "arch/regress/conf/std.regress"
+maxusers 4
+file-system	REGRESSFS
+
+master0		at root
+
+defflag		NOT_A_FS
+deffs		NOT_A_FS
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_loop b/contrib/netbsd-tests/usr.bin/config/d_loop
new file mode 100644
index 000000000000..674a209e18de
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_loop
@@ -0,0 +1,23 @@
+include "arch/regress/conf/std.regress"
+maxusers 4
+file-system	REGRESSFS
+
+master0		at root
+
+# The following definitions build a loop of 'looper' devices.
+# This tests how well the code that look for orphans handle loops.
+#
+# In that case, while the loopchild devices will always be seen in
+# time, the code has to make sure it reaches all the loopbaby
+# devices.
+
+looper0		at master0
+looper1		at looper0
+
+loopchild0	at looper0
+loopchild1	at looper1
+
+loopbaby0	at loopchild0
+loopbaby1	at loopchild1
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_loop2 b/contrib/netbsd-tests/usr.bin/config/d_loop2
new file mode 100644
index 000000000000..8e7238de5321
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_loop2
@@ -0,0 +1,16 @@
+include "arch/regress/conf/std.regress"
+maxusers 4
+file-system	REGRESSFS
+
+master0		at root
+
+# Devices that are their own parent must be handled properly
+# when the instance is negated.
+
+looper*		at master0
+looper*		at looper?
+looper1		at looper0
+
+no looper*	at looper?
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_no_pseudo b/contrib/netbsd-tests/usr.bin/config/d_no_pseudo
new file mode 100644
index 000000000000..9ee8564741bc
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_no_pseudo
@@ -0,0 +1,14 @@
+include "arch/regress/conf/std.regress"
+
+maxusers 4
+
+file-system 	REGRESSFS
+
+master0 	at root
+
+# Simply negating a pseudo-device should yield an error.
+
+pseudo-device 	pseudodev
+no pseudodev
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_postponed_orphan b/contrib/netbsd-tests/usr.bin/config/d_postponed_orphan
new file mode 100644
index 000000000000..bb5ec0461140
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_postponed_orphan
@@ -0,0 +1,21 @@
+include "arch/regress/conf/std.regress"
+
+maxusers 4
+
+file-system	REGRESSFS
+
+master0		at root
+
+parenti*	at master?
+
+# Here, parenti is negated before the child* instance is declared.  That
+# means the child* instance does not qualify as an explicit orphan and
+# therefore should _not_ be ignored.
+#
+# config(1) should error out on that config file.
+
+no parenti
+
+child*		at parenti?
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_pseudo_parent b/contrib/netbsd-tests/usr.bin/config/d_pseudo_parent
new file mode 100644
index 000000000000..aebad8bd2508
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_pseudo_parent
@@ -0,0 +1,13 @@
+include "arch/regress/conf/std.regress"
+maxusers 4
+file-system	REGRESSFS
+
+# Pseudo-devices can have children on interface attributes,
+# which means they don't necessarily have to explicitly
+# define locators (see pseudodev definition).
+
+pseudo-device	pseudodev
+
+child*	at pseudodev?
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/d_shadow_instance b/contrib/netbsd-tests/usr.bin/config/d_shadow_instance
new file mode 100644
index 000000000000..60228214b770
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/d_shadow_instance
@@ -0,0 +1,25 @@
+include "arch/regress/conf/std.regress"
+
+maxusers 4
+
+file-system 	REGRESSFS
+
+master0 	at root
+
+parenti* 	at master?
+parentii* 	at master?
+
+# The second child* instance (attaching at parentii) is useless: it will be
+# shadowed by the first one, which is semantically the same, from a parentii
+# device's point of view.
+#
+# The two child* instances are aliases, and at some point the orphan-checking
+# code skipped some aliases, in the shadowing situation and some others.
+#
+# This test should pass, the lines are valid, even though the second one is
+# useless.
+
+child* 	at hook?
+child* 	at parentii?
+
+config regress root on ?
diff --git a/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/files.regress b/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/files.regress
new file mode 100644
index 000000000000..e9488d65f08a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/files.regress
@@ -0,0 +1,2 @@
+maxpartitions 8
+maxusers 2 4 8
diff --git a/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/std.regress b/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/std.regress
new file mode 100644
index 000000000000..f92baafe017a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/support/arch/regress/conf/std.regress
@@ -0,0 +1 @@
+machine regress
diff --git a/contrib/netbsd-tests/usr.bin/config/support/conf/files b/contrib/netbsd-tests/usr.bin/config/support/conf/files
new file mode 100644
index 000000000000..d525782c6141
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/support/conf/files
@@ -0,0 +1,26 @@
+deffs   REGRESSFS
+
+device	master { }
+attach	master at root
+
+define	hook { }
+
+device	parentii:	hook
+attach	parentii at master
+device	parenti:	hook
+attach	parenti at master
+
+device	child
+attach	child at hook
+
+device	looper { }
+attach	looper at master with looper_master
+attach	looper at looper with looper_looper 
+ 
+device	loopchild { } 
+attach	loopchild at looper
+ 
+device	loopbaby
+attach	loopbaby at loopchild
+
+defpseudo	pseudodev: hook
diff --git a/contrib/netbsd-tests/usr.bin/config/t_config.sh b/contrib/netbsd-tests/usr.bin/config/t_config.sh
new file mode 100755
index 000000000000..9f97b5e101ee
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/config/t_config.sh
@@ -0,0 +1,91 @@
+# $NetBSD: t_config.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+run_and_check_pass()
+{
+	local name="${1}"; shift
+
+	mkdir compile
+	supportdir="$(atf_get_srcdir)/support"
+	config="$(atf_get_srcdir)/d_${name}"
+
+	atf_check -o ignore \
+	    config -s "${supportdir}" -b "compile/${name}" "${config}"
+}
+
+run_and_check_fail()
+{
+	local name="${1}"; shift
+
+	mkdir compile
+	supportdir="$(atf_get_srcdir)/support"
+	config="$(atf_get_srcdir)/d_${name}"
+
+	atf_check -o ignore -e ignore -s ne:0 \
+	    config -s "${supportdir}" -b "compile/${name}" "${config}"
+}
+
+# Defines a test case for config(1).
+test_case()
+{
+	local name="${1}"; shift
+	local type="${1}"; shift
+	local descr="${*}"
+
+	atf_test_case "${name}"
+	eval "${name}_head() { \
+		atf_set descr \"${descr}\"; \
+		atf_set require.progs \"config\"; \
+	}"
+	eval "${name}_body() { \
+		run_and_check_${type} '${name}'; \
+	}"
+}
+
+test_case shadow_instance pass "Checks correct handling of shadowed instances"
+test_case loop pass "Checks correct handling of loops"
+test_case loop2 pass "Checks correct handling of devices that can be their" \
+    "own parents"
+test_case pseudo_parent pass "Checks correct handling of children of pseudo" \
+    "devices (PR/32329)"
+test_case postponed_orphan fail "Checks that config catches adding an" \
+    "instance of a child of a negated instance as error"
+test_case no_pseudo fail "Checks that config catches ommited 'pseudo-device'" \
+    "as error (PR/34111)"
+test_case deffs_redef fail "Checks that config doesn't allow a deffs to use" \
+    "the same name as a previous defflag/defparam"
+
+atf_init_test_cases()
+{
+	atf_add_test_case shadow_instance
+	atf_add_test_case loop
+	atf_add_test_case loop2
+	atf_add_test_case pseudo_parent
+	atf_add_test_case postponed_orphan
+	atf_add_test_case no_pseudo
+	atf_add_test_case deffs_redef
+}
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_basic.out b/contrib/netbsd-tests/usr.bin/cut/d_basic.out
new file mode 100644
index 000000000000..f704cdfbb481
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_basic.out
@@ -0,0 +1,88 @@
+----- test: cut -f 1  d_cut.in -----
+1
+
+12
+
+qwe
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 2  d_cut.in -----
+1
+
+34
+12
+
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 3  d_cut.in -----
+1
+
+56
+
+rty
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 1-2  d_cut.in -----
+1
+
+12	34
+	12
+qwe	
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 2,3  d_cut.in -----
+1
+
+34	56
+12	
+	rty
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 4  d_cut.in -----
+1
+
+
+34
+uio
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 1-3,4-7  d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd	
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
+----- test: cut -f 1,2-7  d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd	
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_cut.in b/contrib/netbsd-tests/usr.bin/cut/d_cut.in
new file mode 100644
index 000000000000..85b4184b4ec0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_cut.in
@@ -0,0 +1,10 @@
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl:zxc:vbn:nm
+:qwe:::rty:uio::p[]:asd:fgh:jkl:zxc:vbn:nm
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_dflag.out b/contrib/netbsd-tests/usr.bin/cut/d_dflag.out
new file mode 100644
index 000000000000..63b814f80646
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_dflag.out
@@ -0,0 +1,88 @@
+----- test: cut -f 1 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+12
+qwe
+
+----- test: cut -f 2 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+34
+rty
+qwe
+----- test: cut -f 3 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+56
+uio
+
+----- test: cut -f 1-2 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+12:34
+qwe:rty
+:qwe
+----- test: cut -f 2,3 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+34:56
+rty:uio
+qwe:
+----- test: cut -f 4 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+
+p[]
+
+----- test: cut -f 1-3,4-7 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl
+:qwe:::rty:uio:
+----- test: cut -f 1,2-7 -d : d_cut.in -----
+1
+
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd		fgh	jkl	zxc	vbn	nm
+1
+
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl
+:qwe:::rty:uio:
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_dsflag.out b/contrib/netbsd-tests/usr.bin/cut/d_dsflag.out
new file mode 100644
index 000000000000..e3d1beb23123
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_dsflag.out
@@ -0,0 +1,32 @@
+----- test: cut -f 1 -d : -s d_cut.in -----
+12
+qwe
+
+----- test: cut -f 2 -d : -s d_cut.in -----
+34
+rty
+qwe
+----- test: cut -f 3 -d : -s d_cut.in -----
+56
+uio
+
+----- test: cut -f 1-2 -d : -s d_cut.in -----
+12:34
+qwe:rty
+:qwe
+----- test: cut -f 2,3 -d : -s d_cut.in -----
+34:56
+rty:uio
+qwe:
+----- test: cut -f 4 -d : -s d_cut.in -----
+
+p[]
+
+----- test: cut -f 1-3,4-7 -d : -s d_cut.in -----
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl
+:qwe:::rty:uio:
+----- test: cut -f 1,2-7 -d : -s d_cut.in -----
+12:34:56
+qwe:rty:uio:p[]:asd:fgh:jkl
+:qwe:::rty:uio:
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_latin1.in b/contrib/netbsd-tests/usr.bin/cut/d_latin1.in
new file mode 100644
index 000000000000..00255b11376a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_latin1.in
@@ -0,0 +1,4 @@
+fooÄ:bar:Äbaz
+FooÄ:Bar:ÄBaz
+FOoÄ:BAr:ÄBAz
+FOOÄ:BAR:ÄBAZ
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_sflag.out b/contrib/netbsd-tests/usr.bin/cut/d_sflag.out
new file mode 100644
index 000000000000..88c2b3ef5f05
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_sflag.out
@@ -0,0 +1,32 @@
+----- test: cut -f 1 -s d_cut.in -----
+12
+
+qwe
+----- test: cut -f 2 -s d_cut.in -----
+34
+12
+
+----- test: cut -f 3 -s d_cut.in -----
+56
+
+rty
+----- test: cut -f 1-2 -s d_cut.in -----
+12	34
+	12
+qwe	
+----- test: cut -f 2,3 -s d_cut.in -----
+34	56
+12	
+	rty
+----- test: cut -f 4 -s d_cut.in -----
+
+34
+uio
+----- test: cut -f 1-3,4-7 -s d_cut.in -----
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd	
+----- test: cut -f 1,2-7 -s d_cut.in -----
+12	34	56
+	12		34	56
+qwe		rty	uio	p[]	asd	
diff --git a/contrib/netbsd-tests/usr.bin/cut/d_utf8.in b/contrib/netbsd-tests/usr.bin/cut/d_utf8.in
new file mode 100644
index 000000000000..320a0637c6e1
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/d_utf8.in
@@ -0,0 +1,4 @@
+fooÄ:bar:Äbaz
+FooÄ:Bar:ÄBaz
+FOoÄ:BAr:ÄBAz
+FOOÄ:BAR:ÄBAZ
diff --git a/contrib/netbsd-tests/usr.bin/cut/t_cut.sh b/contrib/netbsd-tests/usr.bin/cut/t_cut.sh
new file mode 100755
index 000000000000..3c3793f84f28
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/cut/t_cut.sh
@@ -0,0 +1,130 @@
+# $NetBSD: t_cut.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+h_run()
+{
+	file="${1}"; shift
+	opts="${*}"
+
+	for fields in 1 2 3 1-2 2,3 4 1-3,4-7 1,2-7
+	do
+		opts="-f ${fields} $@"
+		echo "----- test: cut ${opts} $(basename $file) -----"
+		cut $opts "$file" || atf_fail "command failed: cut ${opts} $file"
+	done
+}
+
+h_check()
+{
+	diff -Nru "$1" "$2" || atf_fail "files $1 and $2 differ"
+}
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Checks basic functionality"
+}
+basic_body()
+{
+	h_run "$(atf_get_srcdir)/d_cut.in" > out
+	h_check out "$(atf_get_srcdir)/d_basic.out"
+}
+
+atf_test_case sflag
+sflag_head()
+{
+	atf_set "descr" "Checks -s flag"
+}
+sflag_body()
+{
+	h_run "$(atf_get_srcdir)/d_cut.in" -s > out
+	h_check out "$(atf_get_srcdir)/d_sflag.out"
+}
+
+atf_test_case dflag
+dflag_head()
+{
+	atf_set "descr" "Checks -d flag"
+}
+dflag_body()
+{
+	h_run "$(atf_get_srcdir)/d_cut.in" -d ":" > out
+	h_check out "$(atf_get_srcdir)/d_dflag.out"
+}
+
+atf_test_case dsflag
+dsflag_head()
+{
+	atf_set "descr" "Checks -s and -d flags combined"
+}
+dsflag_body()
+{
+	h_run "$(atf_get_srcdir)/d_cut.in" -d ":" -s > out
+	h_check out "$(atf_get_srcdir)/d_dsflag.out"
+}
+
+atf_test_case latin1
+latin1_head()
+{
+	atf_set "descr" "Checks support for non-ascii characters"
+}
+latin1_body()
+{
+	export LC_ALL=C
+
+	atf_check -o inline:"bar\nBar\nBAr\nBAR\n" \
+		cut -b 6,7,8 "$(atf_get_srcdir)/d_latin1.in"
+
+	atf_check -o inline:"bar\nBar\nBAr\nBAR\n" \
+		cut -c 6,7,8 "$(atf_get_srcdir)/d_latin1.in"
+}
+
+atf_test_case utf8
+utf8_head()
+{
+	atf_set "descr" "Checks support for multibyte characters"
+}
+utf8_body()
+{
+	export LC_ALL=en_US.UTF-8
+
+	atf_check -o inline:":ba\n:Ba\n:BA\n:BA\n" \
+		cut -b 6,7,8 "$(atf_get_srcdir)/d_utf8.in"
+
+	atf_check -o inline:"bar\nBar\nBAr\nBAR\n" \
+		cut -c 6,7,8 "$(atf_get_srcdir)/d_utf8.in"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case sflag
+	atf_add_test_case dflag
+	atf_add_test_case dsflag
+	atf_add_test_case latin1
+	atf_add_test_case utf8
+}
diff --git a/contrib/netbsd-tests/usr.bin/diff/d_mallocv1.in b/contrib/netbsd-tests/usr.bin/diff/d_mallocv1.in
new file mode 100644
index 000000000000..27ab50336b08
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/diff/d_mallocv1.in
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94a
+ 488ca910cc447e121b2a19450239e75d24
diff --git a/contrib/netbsd-tests/usr.bin/diff/d_mallocv2.in b/contrib/netbsd-tests/usr.bin/diff/d_mallocv2.in
new file mode 100644
index 000000000000..27ab50336b08
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/diff/d_mallocv2.in
@@ -0,0 +1,5 @@
+18086b1e91f730facb2d6e1b
+c562653b24814eb3651b1e68301a3c14b96302bb
+6d017f7aef74662ed8dd51eef14281eaad223298db370bfaca
+30c04231cb3de404e4b8a5359a74066fd963291d7986be835834ab07870c097682a953bfff38784780eef844de47fb36c34f8e034c96cfa64d9cb5decee472138236e9fb79e9fe1fba6b7757b970f22477d167832206900473f09f3e8c822db6d9a8273340ed6743d99638d6cf192d821b6f33d23278b1a929f303a80865c426d01add11b2f2416babd13e70b44d8eeb731c09c7163af9d1a23cbe20ddb08b0f67ecaa2eed511263a67e9c12e59ef113f0b9e4e4e140b43896078a7571c61826ba099b3dd8c4b096a9785b4434e97ea99e662ba6fdb60a41547ccae4c67d3e1f3ef515198e91f009c75c9e80fda90d13ee29d8aad5d87cc2437ce60e6ce55700837fb0815bfd2495f8aa1a33fe67c1ae28a885506a78ca6257f5a5f2a8042e28680acc83b1aecb3a9cb51911126f2f0deaf14fcfa5f165e9a5c3f8f2d1c3f4683b2d75927a7bc802d63b680a5e22768cc0439854ccd49e58a002794f541bddd6ef6fbd4f9869843a72d0ae9d438c90353a46c0c9863a16b1de206c717ab7ce6ea6f648a38efa12b70bbe3388b35adec7a789ea98de217520d7d6ce699841e17e5946bf5a8b3c7a2c3e2d6767422baf3159ff08d913ec78011ab7d34bc24af26c24a8d46f7261c7705a7b270e27590c29583c659a0df8dada4e7a0532f115040165d18f74a55a4f39bb1dcfd865e94a
+ 488ca910cc447e121b2a19450239e75d24
diff --git a/contrib/netbsd-tests/usr.bin/diff/t_diff.sh b/contrib/netbsd-tests/usr.bin/diff/t_diff.sh
new file mode 100755
index 000000000000..e33edeeb3c60
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/diff/t_diff.sh
@@ -0,0 +1,75 @@
+# $NetBSD: t_diff.sh,v 1.3 2012/03/13 05:40:00 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case mallocv
+mallocv_head() {
+	atf_set "descr" "Test diff(1) with MALLOC_OPTIONS=V (cf. PR bin/26453)"
+}
+
+mallocv_body() {
+
+	atf_check -s ignore \
+		-e not-inline:"diff: memory exhausted\n" \
+		-x "env MALLOC_OPTIONS=V diff " \
+		   "$(atf_get_srcdir)/d_mallocv1.in" \
+		   "$(atf_get_srcdir)/d_mallocv2.in"
+}
+
+atf_test_case nomallocv
+nomallocv_head() {
+	atf_set "descr" "Test diff(1) with no MALLOC_OPTIONS=V"
+}
+
+nomallocv_body() {
+
+	atf_check -s exit:0 \
+		-e inline:"" \
+		-x "diff " \
+		   "$(atf_get_srcdir)/d_mallocv1.in" \
+		   "$(atf_get_srcdir)/d_mallocv2.in"
+}
+
+atf_test_case same
+same_head() {
+	atf_set "descr" "Test diff(1) with identical files"
+}
+
+same_body() {
+
+	atf_check -s exit:0 \
+		-e inline:"" \
+		-x "diff $(atf_get_srcdir)/t_diff $(atf_get_srcdir)/t_diff"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case mallocv
+	atf_add_test_case nomallocv
+	atf_add_test_case same
+}
diff --git a/contrib/netbsd-tests/usr.bin/dirname/t_dirname.sh b/contrib/netbsd-tests/usr.bin/dirname/t_dirname.sh
new file mode 100755
index 000000000000..a3935249f47e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/dirname/t_dirname.sh
@@ -0,0 +1,49 @@
+# $NetBSD: t_dirname.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Checks basic functionality"
+}
+basic_body()
+{
+	atf_check -o inline:"/\n" dirname /
+	atf_check -o inline:"/\n" dirname //
+	atf_check -o inline:"/usr\n" dirname /usr/bin/
+	atf_check -o inline:"//usr\n" dirname //usr//bin//
+	atf_check -o inline:".\n" dirname usr
+	atf_check -o inline:".\n" dirname ""
+	atf_check -o inline:"/\n" dirname /usr
+	atf_check -o inline:"/usr\n" dirname /usr/bin
+	atf_check -o inline:"usr\n" dirname usr/bin
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/usr.bin/find/t_find.sh b/contrib/netbsd-tests/usr.bin/find/t_find.sh
new file mode 100755
index 000000000000..b30de5eee9d4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/find/t_find.sh
@@ -0,0 +1,73 @@
+# $NetBSD: t_find.sh,v 1.6 2012/03/19 12:58:41 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case emptyperm
+emptyperm_head() {
+	atf_set "descr" "Test that 'find -empty' does not error out " \
+			"when directory access is denied (PR bin/44179)"
+	atf_set "require.user" "unprivileged"
+}
+
+emptyperm_body() {
+
+	# The case assumes that at least some directories
+	# in /var are unavailable for the user '_tests'.
+	#
+	# TODO: Parse the output.file for actual verification.
+	#
+	atf_check -s exit:1 -o save:output.file \
+		-e not-empty -x "find /var -empty -type d"
+}
+
+atf_test_case exit
+exit_head() {
+	atf_set "descr" "Test that find(1) with -exit works (PR bin/44973)"
+}
+
+exit_body() {
+	atf_check -o ignore \
+		-s exit:0 -x "find /etc -type f -exit"
+}
+
+atf_test_case exit_status
+exit_status_head() {
+	atf_set "descr" "Test exit status from 'find -exit'"
+}
+
+exit_status_body() {
+	num=$(jot -r 1 0 99)
+	atf_check -o ignore -e ignore -s exit:$num -x "find / -exit $num"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case emptyperm
+	atf_add_test_case exit
+	atf_add_test_case exit_status
+}
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_basic.out b/contrib/netbsd-tests/usr.bin/grep/d_basic.out
new file mode 100644
index 000000000000..ccefccb1c091
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_basic.out
@@ -0,0 +1,20 @@
+123
+1123
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+2123
+3123
+4123
+5123
+6123
+7123
+8123
+9123
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_begin_end_a.out b/contrib/netbsd-tests/usr.bin/grep/d_begin_end_a.out
new file mode 100644
index 000000000000..3288aec6693f
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_begin_end_a.out
@@ -0,0 +1 @@
+Front of the line
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_begin_end_b.out b/contrib/netbsd-tests/usr.bin/grep/d_begin_end_b.out
new file mode 100644
index 000000000000..dd09e02da358
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_begin_end_b.out
@@ -0,0 +1 @@
+This is a another line with a Front and an ending
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_binary.out b/contrib/netbsd-tests/usr.bin/grep/d_binary.out
new file mode 100644
index 000000000000..ce030561340d
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_binary.out
@@ -0,0 +1 @@
+Binary file /bin/sh matches
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context2_a.out b/contrib/netbsd-tests/usr.bin/grep/d_context2_a.out
new file mode 100644
index 000000000000..384d280aac8f
Binary files /dev/null and b/contrib/netbsd-tests/usr.bin/grep/d_context2_a.out differ
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context2_b.out b/contrib/netbsd-tests/usr.bin/grep/d_context2_b.out
new file mode 100644
index 000000000000..c1d1222370d6
Binary files /dev/null and b/contrib/netbsd-tests/usr.bin/grep/d_context2_b.out differ
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context2_c.out b/contrib/netbsd-tests/usr.bin/grep/d_context2_c.out
new file mode 100644
index 000000000000..1692c2aa8f5c
Binary files /dev/null and b/contrib/netbsd-tests/usr.bin/grep/d_context2_c.out differ
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_a.in b/contrib/netbsd-tests/usr.bin/grep/d_context_a.in
new file mode 100644
index 000000000000..670e4cefc9fa
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_a.in
@@ -0,0 +1,10 @@
+A pig is a jolly companion,
+Boar, sow, barrow, or gilt --
+A pig is a pal, who'll boost your morale, 
+Though mountains may topple and tilt.
+When they've blackballed, bamboozled, and burned you,
+When they've turned on you, Tory and Whig,
+Though you may be thrown over by Tabby and Rover,
+You'll never go wrong with a pig, a pig,
+You'll never go wrong with a pig!
+                -- Thomas Pynchon, "Gravity's Rainbow"
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_a.out b/contrib/netbsd-tests/usr.bin/grep/d_context_a.out
new file mode 100644
index 000000000000..5788aa5a3cc2
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_a.out
@@ -0,0 +1,5 @@
+A pig is a pal, who'll boost your morale, 
+Though mountains may topple and tilt.
+When they've blackballed, bamboozled, and burned you,
+When they've turned on you, Tory and Whig,
+Though you may be thrown over by Tabby and Rover,
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_b.in b/contrib/netbsd-tests/usr.bin/grep/d_context_b.in
new file mode 100644
index 000000000000..663c9928a09e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_b.in
@@ -0,0 +1,3 @@
+This is to test output of context from multiple files.
+Dave was a happy pig who wandered around the orchard eating
+apples all day long.
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_b.out b/contrib/netbsd-tests/usr.bin/grep/d_context_b.out
new file mode 100644
index 000000000000..aa18352e65c4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_b.out
@@ -0,0 +1,4 @@
+Though mountains may topple and tilt.
+When they've blackballed, bamboozled, and burned you,
+When they've turned on you, Tory and Whig,
+Though you may be thrown over by Tabby and Rover,
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_c.out b/contrib/netbsd-tests/usr.bin/grep/d_context_c.out
new file mode 100644
index 000000000000..f91b7123c453
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_c.out
@@ -0,0 +1,5 @@
+Boar, sow, barrow, or gilt --
+A pig is a pal, who'll boost your morale, 
+Though mountains may topple and tilt.
+When they've blackballed, bamboozled, and burned you,
+When they've turned on you, Tory and Whig,
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_context_d.out b/contrib/netbsd-tests/usr.bin/grep/d_context_d.out
new file mode 100644
index 000000000000..225df69371fc
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_context_d.out
@@ -0,0 +1,13 @@
+d_context_a.in:A pig is a jolly companion,
+d_context_a.in-Boar, sow, barrow, or gilt --
+d_context_a.in:A pig is a pal, who'll boost your morale, 
+d_context_a.in-Though mountains may topple and tilt.
+--
+d_context_a.in-Though you may be thrown over by Tabby and Rover,
+d_context_a.in:You'll never go wrong with a pig, a pig,
+d_context_a.in:You'll never go wrong with a pig!
+d_context_a.in-                -- Thomas Pynchon, "Gravity's Rainbow"
+--
+d_context_b.in-This is to test output of context from multiple files.
+d_context_b.in:Dave was a happy pig who wandered around the orchard eating
+d_context_b.in-apples all day long.
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_egrep.out b/contrib/netbsd-tests/usr.bin/grep/d_egrep.out
new file mode 100644
index 000000000000..2cc0277e4d29
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_egrep.out
@@ -0,0 +1 @@
+Special characters [, $, ^, *
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_file_exp.in b/contrib/netbsd-tests/usr.bin/grep/d_file_exp.in
new file mode 100644
index 000000000000..9faee939e2ee
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_file_exp.in
@@ -0,0 +1,2 @@
+-0.[24]0
+0.[35]0
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_file_exp.out b/contrib/netbsd-tests/usr.bin/grep/d_file_exp.out
new file mode 100644
index 000000000000..7d975222674a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_file_exp.out
@@ -0,0 +1,6 @@
+-0.50
+-0.40
+-0.30
+-0.20
+0.30
+0.50
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_ignore_case.out b/contrib/netbsd-tests/usr.bin/grep/d_ignore_case.out
new file mode 100644
index 000000000000..c14d8dd38a64
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_ignore_case.out
@@ -0,0 +1,2 @@
+Mostly I prefer lower case to upper case,
+but UpPeR cAsE has its merits too.
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_input b/contrib/netbsd-tests/usr.bin/grep/d_input
new file mode 100644
index 000000000000..5e38c39ed414
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_input
@@ -0,0 +1,12 @@
+dot.separated@words
+kkseparatedkk
+Front of the line
+This is a another line with a Front and an ending
+Special characters [, $, ^, *
+Here is another ending.
+
+Mostly I prefer lower case to upper case,
+but UpPeR cAsE has its merits too.
+
+matchme
+
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_invert.in b/contrib/netbsd-tests/usr.bin/grep/d_invert.in
new file mode 100644
index 000000000000..631cf834c1b8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_invert.in
@@ -0,0 +1,10 @@
+
+fish
+fish
+dog
+cat
+fish
+fish
+
+poodle
+fish
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_invert.out b/contrib/netbsd-tests/usr.bin/grep/d_invert.out
new file mode 100644
index 000000000000..7d7c54a184c3
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_invert.out
@@ -0,0 +1,5 @@
+
+dog
+cat
+
+poodle
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_recurse.out b/contrib/netbsd-tests/usr.bin/grep/d_recurse.out
new file mode 100644
index 000000000000..0ba61c83bcd2
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_recurse.out
@@ -0,0 +1,2 @@
+recurse/a/f/favourite-fish:haddock
+recurse/d/fish:haddock
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.err b/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.err
new file mode 100644
index 000000000000..b4bff9829d1c
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.err
@@ -0,0 +1 @@
+grep: warning: test/c/d/d: recursive directory loop
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.out b/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.out
new file mode 100644
index 000000000000..284923904773
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_recurse_symlink.out
@@ -0,0 +1 @@
+test/c/match:Test string
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_whole_line.out b/contrib/netbsd-tests/usr.bin/grep/d_whole_line.out
new file mode 100644
index 000000000000..16febeb04ce0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_whole_line.out
@@ -0,0 +1 @@
+matchme
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_word_regexps.out b/contrib/netbsd-tests/usr.bin/grep/d_word_regexps.out
new file mode 100644
index 000000000000..e6c4af4a7e64
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_word_regexps.out
@@ -0,0 +1 @@
+dot.separated@words
diff --git a/contrib/netbsd-tests/usr.bin/grep/d_zgrep.out b/contrib/netbsd-tests/usr.bin/grep/d_zgrep.out
new file mode 100644
index 000000000000..c5fe9b8d4ec2
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/d_zgrep.out
@@ -0,0 +1,2 @@
+Front of the line
+This is a another line with a Front and an ending
diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
new file mode 100755
index 000000000000..f2d70f08bded
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
@@ -0,0 +1,246 @@
+# $NetBSD: t_grep.sh,v 1.2 2013/05/17 15:39:17 christos Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Checks basic functionality"
+}
+basic_body()
+{ 
+	atf_check -o file:"$(atf_get_srcdir)/d_basic.out" -x \
+	    'jot 10000 | grep 123'
+}
+
+atf_test_case binary
+binary_head()
+{
+	atf_set "descr" "Checks handling of binary files"
+}
+binary_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_binary.out" grep $(uname) /bin/sh
+}
+
+atf_test_case recurse
+recurse_head()
+{
+	atf_set "descr" "Checks recursive searching"
+}
+recurse_body()
+{
+	mkdir -p recurse/a/f recurse/d
+	echo -e "cod\ndover sole\nhaddock\nhalibut\npilchard" > recurse/d/fish
+	echo -e "cod\nhaddock\nplaice" > recurse/a/f/favourite-fish
+
+	atf_check -o file:"$(atf_get_srcdir)/d_recurse.out" grep -r haddock recurse
+}
+
+atf_test_case recurse_symlink
+recurse_symlink_head()
+{
+	atf_set "descr" "Checks symbolic link recursion"
+}
+recurse_symlink_body()
+{
+	mkdir -p test/c/d
+	(cd test/c/d && ln -s ../d .)
+	echo "Test string" > test/c/match
+
+	atf_check -o file:"$(atf_get_srcdir)/d_recurse_symlink.out" \
+	    -e file:"$(atf_get_srcdir)/d_recurse_symlink.err" \
+	    grep -r string test
+}
+
+atf_test_case word_regexps
+word_regexps_head()
+{
+	atf_set "descr" "Checks word-regexps"
+}
+word_regexps_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_word_regexps.out" \
+	    grep -w separated $(atf_get_srcdir)/d_input
+}
+
+atf_test_case begin_end
+begin_end_head()
+{
+	atf_set "descr" "Checks handling of line beginnings and ends"
+}
+begin_end_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_begin_end_a.out" \
+	    grep ^Front "$(atf_get_srcdir)/d_input"
+
+	atf_check -o file:"$(atf_get_srcdir)/d_begin_end_b.out" \
+	    grep ending$ "$(atf_get_srcdir)/d_input"
+}
+
+atf_test_case ignore_case
+ignore_case_head()
+{
+	atf_set "descr" "Checks ignore-case option"
+}
+ignore_case_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_ignore_case.out" \
+	    grep -i Upper "$(atf_get_srcdir)/d_input"
+}
+
+atf_test_case invert
+invert_head()
+{
+	atf_set "descr" "Checks selecting non-matching lines with -v option"
+}
+invert_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_invert.out" \
+	    grep -v fish "$(atf_get_srcdir)/d_invert.in"
+}
+
+atf_test_case whole_line
+whole_line_head()
+{
+	atf_set "descr" "Checks whole-line matching with -x flag"
+}
+whole_line_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_whole_line.out" \
+	    grep -x matchme "$(atf_get_srcdir)/d_input"
+}
+
+atf_test_case negative
+negative_head()
+{
+	atf_set "descr" "Checks handling of files with no matches"
+}
+negative_body()
+{
+	atf_check -s ne:0 grep "not a hope in hell" "$(atf_get_srcdir)/d_input"
+}
+
+atf_test_case context
+context_head()
+{
+	atf_set "descr" "Checks displaying context with -A, -B and -C flags"
+}
+context_body()
+{
+	cp $(atf_get_srcdir)/d_context_*.* .
+
+	atf_check -o file:d_context_a.out grep -C2 bamboo d_context_a.in
+	atf_check -o file:d_context_b.out grep -A3 tilt d_context_a.in
+	atf_check -o file:d_context_c.out grep -B4 Whig d_context_a.in
+	atf_check -o file:d_context_d.out grep -C1 pig d_context_a.in d_context_b.in
+}
+
+atf_test_case file_exp
+file_exp_head()
+{
+	atf_set "descr" "Checks reading expressions from file"
+}
+file_exp_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_file_exp.out" -x \
+	    'jot 21 -1 1.00 | grep -f '"$(atf_get_srcdir)"'/d_file_exp.in'
+}
+
+atf_test_case egrep
+egrep_head()
+{
+	atf_set "descr" "Checks matching special characters with egrep"
+}
+egrep_body()
+{
+	atf_check -o file:"$(atf_get_srcdir)/d_egrep.out" \
+		egrep '\?|\*$$' "$(atf_get_srcdir)/d_input"
+}
+
+atf_test_case zgrep
+zgrep_head()
+{
+	atf_set "descr" "Checks handling of gzipped files with zgrep"
+}
+zgrep_body()
+{
+	cp "$(atf_get_srcdir)/d_input" .
+	gzip d_input || atf_fail "gzip failed"
+
+	atf_check -o file:"$(atf_get_srcdir)/d_zgrep.out" zgrep -h line d_input.gz
+}
+
+atf_test_case nonexistent
+nonexistent_head()
+{
+	atf_set "descr" "Checks that -s flag suppresses error" \
+	                "messages about nonexistent files"
+}
+nonexistent_body()
+{
+	atf_check -s ne:0 grep -s foobar nonexistent
+}
+
+atf_test_case context2
+context2_head()
+{
+	atf_set "descr" "Checks displaying context with -z flag"
+}
+context2_body()
+{
+	printf "haddock\000cod\000plaice\000" > test1
+	printf "mackeral\000cod\000crab\000" > test2
+
+	atf_check -o file:"$(atf_get_srcdir)/d_context2_a.out" \
+	    grep -z -A1 cod test1 test2
+
+	atf_check -o file:"$(atf_get_srcdir)/d_context2_b.out" \
+	    grep -z -B1 cod test1 test2
+
+	atf_check -o file:"$(atf_get_srcdir)/d_context2_c.out" \
+	    grep -z -C1 cod test1 test2
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic 
+	atf_add_test_case binary
+	atf_add_test_case recurse
+	atf_add_test_case recurse_symlink
+	atf_add_test_case word_regexps
+	atf_add_test_case begin_end
+	atf_add_test_case ignore_case
+	atf_add_test_case invert
+	atf_add_test_case whole_line
+	atf_add_test_case negative
+	atf_add_test_case context
+	atf_add_test_case file_exp
+	atf_add_test_case egrep
+	atf_add_test_case zgrep
+	atf_add_test_case nonexistent
+	atf_add_test_case context2
+}
diff --git a/contrib/netbsd-tests/usr.bin/gzip/t_gzip.sh b/contrib/netbsd-tests/usr.bin/gzip/t_gzip.sh
new file mode 100755
index 000000000000..bee6655758c8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/gzip/t_gzip.sh
@@ -0,0 +1,110 @@
+# $NetBSD: t_gzip.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
+#
+# Copyright (c) 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case concatenated
+concatenated_head()
+{
+	atf_set "descr" "Checks concatenated gzipped data"
+}
+concatenated_body()
+{
+	echo -n "aaaa" | gzip > tmp.gz
+	echo -n "bbbb" | gzip >> tmp.gz
+
+	atf_check -o inline:"aaaabbbb" gzip -d tmp.gz -c
+}
+
+atf_test_case pipe
+pipe_head()
+{
+	atf_set "descr" "Checks input from pipe"
+}
+pipe_body()
+{
+	atf_check -x "dd if=/dev/zero count=102400 2>/dev/null \
+| gzip -c | dd bs=1 2>/dev/null | gzip -tc"
+}
+
+atf_test_case truncated
+truncated_head()
+{
+	atf_set "descr" "Checks that gzip fails on truncated data"
+}
+truncated_body()
+{
+	cat >truncated.gz.uue <<EOF
+begin-base64 644 truncated.gz
+H4sIAAAAAAAAA0tMSk7hAgCspIpYCg==
+====
+EOF
+	uudecode -m truncated.gz.uue
+
+	atf_check -s ne:0 -e ignore gzip -d truncated.gz
+}
+
+atf_test_case crcerror
+crcerror_head()
+{
+	atf_set "descr" "Checks that gzip fails on crc error"
+}
+crcerror_body()
+{
+	cat >crcerror.gz.uue <<EOF
+begin-base64 644 crcerror.gz
+H4sIAAAAAAAAA0tMSk7hAgCspFhYBQAAAA==
+====
+EOF
+	uudecode -m crcerror.gz.uue
+
+	atf_check -s ne:0 -e ignore gzip -d crcerror.gz
+}
+
+atf_test_case good
+good_head()
+{
+	atf_set "descr" "Checks decompressing correct file"
+}
+good_body()
+{
+	cat >good.gz.uue <<EOF
+begin-base64 644 good.gz
+H4sICC8G8UAAA2FiY2QAS0xKTuECAKykilgFAAAA
+====
+EOF
+	uudecode -m good.gz.uue
+
+	atf_check gzip -d good.gz
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case concatenated
+	atf_add_test_case pipe
+	atf_add_test_case truncated
+	atf_add_test_case crcerror
+	atf_add_test_case good
+}
diff --git a/contrib/netbsd-tests/usr.bin/id/pwgr.c b/contrib/netbsd-tests/usr.bin/id/pwgr.c
new file mode 100644
index 000000000000..364f64226fbb
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/id/pwgr.c
@@ -0,0 +1,187 @@
+/* $NetBSD: pwgr.c,v 1.1 2012/03/17 16:33:14 jruoho Exp $ */
+/*
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*
+ * This file implements replacements for all user/group-related functions
+ * called by id(1).  It provides fake but deterministic user and group
+ * information.  The details are as such:
+ * User root, uid 0, primary group 0 (wheel).
+ * User test, uid 100, primary group 100 (users), secondary group 0 (wheel).
+ */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+char Login[16];
+struct group GrEntry;
+struct passwd PwEntry;
+
+gid_t
+getgid(void)
+{
+	return 100;
+}
+
+gid_t
+getegid(void)
+{
+	if (getenv("LIBFAKE_EGID_ROOT") != NULL)
+		return 0;
+	else
+		return 100;
+}
+
+uid_t
+getuid(void)
+{
+	return 100;
+}
+
+uid_t
+geteuid(void)
+{
+	if (getenv("LIBFAKE_EUID_ROOT") != NULL)
+		return 0;
+	else
+		return 100;
+}
+
+char *
+getlogin(void)
+{
+	strcpy(Login, "test");
+	return Login;
+}
+
+struct group *
+getgrgid(gid_t gid)
+{
+	struct group *g = &GrEntry;
+
+	memset(g, 0, sizeof(*g));
+	if (gid == 0) {
+		g->gr_name = __UNCONST("wheel");
+		g->gr_gid = 0;
+	} else if (gid == 100) {
+		g->gr_name = __UNCONST("users");
+		g->gr_gid = 100;
+	} else
+		g = NULL;
+
+	return g;
+}
+
+int
+getgrouplist(const char *name, gid_t basegid, gid_t *groups, int *ngroups)
+{
+	int cnt, ret;
+
+	if (strcmp(name, "root") == 0) {
+		if (*ngroups >= 1) {
+			groups[0] = basegid;
+			cnt = 1;
+		}
+
+		ret = (*ngroups >= cnt) ? 0 : -1;
+		*ngroups = cnt;
+	} else if (strcmp(name, "test") == 0) {
+		if (*ngroups >= 1) {
+			groups[0] = basegid;
+			cnt = 1;
+		}
+
+		if (*ngroups >= 2) {
+			groups[1] = 0;
+			cnt = 2;
+		}
+
+		ret = (*ngroups >= cnt) ? 0 : -1;
+		*ngroups = cnt;
+	} else
+		ret = -1;
+
+	return ret;
+}
+
+int
+getgroups(int gidsetlen, gid_t *gidset)
+{
+	if (gidsetlen < 2) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	gidset[0] = 100;
+	gidset[1] = 0;
+	return 2;
+}
+
+struct passwd *
+getpwnam(const char *login)
+{
+	struct passwd *p = &PwEntry;
+
+	memset(p, 0, sizeof(*p));
+	if (strcmp(login, "root") == 0) {
+		p->pw_name = __UNCONST("root");
+		p->pw_uid = 0;
+		p->pw_gid = 0;
+	} else if (strcmp(login, "test") == 0) {
+		p->pw_name = __UNCONST("test");
+		p->pw_uid = 100;
+		p->pw_gid = 100;
+	} else
+		p = NULL;
+
+	return p;
+}
+
+struct passwd *
+getpwuid(uid_t uid)
+{
+	struct passwd *p = &PwEntry;
+
+	memset(p, 0, sizeof(*p));
+	if (uid == 0) {
+		p->pw_name = __UNCONST("root");
+		p->pw_uid = 0;
+		p->pw_gid = 0;
+	} else if (uid == 100) {
+		p->pw_name = __UNCONST("test");
+		p->pw_uid = 100;
+		p->pw_gid = 100;
+	} else
+		p = NULL;
+
+	return p;
+}
diff --git a/contrib/netbsd-tests/usr.bin/id/t_groups.sh b/contrib/netbsd-tests/usr.bin/id/t_groups.sh
new file mode 100755
index 000000000000..71121ab38e32
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/id/t_groups.sh
@@ -0,0 +1,71 @@
+# $NetBSD: t_groups.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+create_run_groups() {
+	cat >run_groups.sh <<EOF
+#! /bin/sh
+[ -f ./groups ] || ln -s $(atf_get_srcdir)/h_id ./groups
+./groups "\${@}"
+EOF
+	chmod +x run_groups.sh
+}
+
+atf_test_case correct
+correct_head() {
+	atf_set "descr" "Checks that correct queries work"
+}
+correct_body() {
+	create_run_groups
+
+	echo "users wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_groups.sh
+	atf_check -s eq:0 -o file:expout -e empty ./run_groups.sh 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_groups.sh test
+
+	echo "wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_groups.sh 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_groups.sh root
+}
+
+atf_test_case syntax
+syntax_head() {
+	atf_set "descr" "Checks the command's syntax"
+}
+syntax_body() {
+	create_run_groups
+
+	# Give an invalid flag but which is allowed by id (with which
+	# groups shares code) when using the -Gn options.
+	atf_check -s eq:1 -o empty -e save:stderr ./run_groups.sh -r
+	atf_check -s eq:0 -o ignore -e empty grep '^usage:' stderr
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case correct
+	atf_add_test_case syntax
+}
diff --git a/contrib/netbsd-tests/usr.bin/id/t_id.sh b/contrib/netbsd-tests/usr.bin/id/t_id.sh
new file mode 100755
index 000000000000..9c877a6db7cf
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/id/t_id.sh
@@ -0,0 +1,305 @@
+# $NetBSD: t_id.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+create_run_id() {
+	cat >run_id.sh <<EOF
+#! /bin/sh
+[ -f ./id ] || ln -s $(atf_get_srcdir)/h_id ./id
+./id "\${@}"
+EOF
+	chmod +x run_id.sh
+}
+
+atf_test_case default
+default_head() {
+	atf_set "descr" "Checks that the output without options is correct"
+}
+default_body() {
+	create_run_id
+
+	echo "uid=100(test) gid=100(users) groups=100(users),0(wheel)" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh test
+
+	echo "uid=0(root) gid=0(wheel) groups=0(wheel)" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh root
+
+	export LIBFAKE_EGID_ROOT=1 LIBFAKE_EUID_ROOT=1
+	echo "uid=100(test) gid=100(users) euid=0(root) egid=0(wheel) groups=100(users),0(wheel)" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh
+	unset LIBFAKE_EGID_ROOT LIBFAKE_EUID_ROOT
+
+	echo 'id: nonexistent: No such user' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_id.sh nonexistent
+
+	atf_check -s eq:1 -o empty -e save:stderr ./run_id.sh root nonexistent
+	atf_check -s eq:0 -o ignore -e empty grep ^usage: stderr
+}
+
+atf_test_case primaries
+primaries_head() {
+	atf_set "descr" "Checks that giving multiple primaries" \
+	                "simultaneously provides an error"
+}
+primaries_body() {
+	create_run_id
+
+	for p1 in -G -g -p -u; do
+		for p2 in -G -g -p -u; do
+			if [ ${p1} != ${p2} ]; then
+				atf_check -s eq:1 -o empty -e save:stderr \
+				    ./run_id.sh ${p1} ${p2}
+				atf_check -s eq:0 -o ignore -e empty \
+				    grep ^usage: stderr
+			fi
+		done
+	done
+}
+
+atf_test_case Gflag
+Gflag_head() {
+	atf_set "descr" "Checks that the -G primary flag works"
+}
+Gflag_body() {
+	create_run_id
+
+	echo "100 0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G test
+
+	echo "users wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G -n
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G -n test
+
+	echo "0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G root
+
+	echo "wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G -n 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -G -n root
+
+	echo 'id: nonexistent: No such user' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_id.sh -G nonexistent
+
+	atf_check -s eq:1 -o empty -e save:stderr ./run_id.sh -G root nonexistent
+	atf_check -s eq:0 -o ignore -e empty grep ^usage: stderr
+}
+
+atf_test_case gflag
+gflag_head() {
+	atf_set "descr" "Checks that the -g primary flag works"
+}
+gflag_body() {
+	create_run_id
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g test
+
+	echo "users" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n test
+
+	echo "0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g root
+
+	echo "wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n root
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r
+
+	echo "users" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r test
+
+	echo "users" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n test
+
+	export LIBFAKE_EGID_ROOT=1 LIBFAKE_EUID_ROOT=1
+
+	echo "0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g
+
+	echo "wheel" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r
+
+	echo "users" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r test
+
+	echo "users" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -g -r -n test
+
+	unset LIBFAKE_EGID_ROOT LIBFAKE_EUID_ROOT
+
+	echo 'id: nonexistent: No such user' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_id.sh -g nonexistent
+
+	atf_check -s eq:1 -o empty -e save:stderr ./run_id.sh -g root nonexistent
+	atf_check -s eq:0 -o ignore -e empty grep ^usage: stderr
+}
+
+atf_test_case pflag
+pflag_head() {
+	atf_set "descr" "Checks that the -p primary flag works"
+}
+pflag_body() {
+	create_run_id
+
+	cat >expout <<EOF
+uid	test
+groups	users wheel
+EOF
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p test
+
+	cat >expout <<EOF
+uid	root
+groups	wheel
+EOF
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p root
+
+	export LIBFAKE_EGID_ROOT=1 LIBFAKE_EUID_ROOT=1
+	cat >expout <<EOF
+uid	test
+euid	root
+rgid	users
+groups	users wheel
+EOF
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -p
+	unset LIBFAKE_EGID_ROOT LIBFAKE_EUID_ROOT
+
+	echo 'id: nonexistent: No such user' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_id.sh -p nonexistent
+
+	atf_check -s eq:1 -o empty -e save:stderr ./run_id.sh -p root nonexistent
+	atf_check -s eq:0 -o ignore -e empty grep ^usage: stderr
+}
+
+atf_test_case uflag
+uflag_head() {
+	atf_set "descr" "Checks that the -u primary flag works"
+}
+uflag_body() {
+	create_run_id
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u test
+
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n test
+
+	echo "0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u root
+
+	echo "root" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n 0
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n root
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r
+
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r test
+
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n test
+
+	export LIBFAKE_EGID_ROOT=1 LIBFAKE_EUID_ROOT=1
+
+	echo "0" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u
+
+	echo "root" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r
+
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n
+
+	echo "100" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r test
+
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n 100
+	atf_check -s eq:0 -o file:expout -e empty ./run_id.sh -u -r -n test
+
+	unset LIBFAKE_EGID_ROOT LIBFAKE_EUID_ROOT
+
+	echo 'id: nonexistent: No such user' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_id.sh -u nonexistent
+
+	atf_check -s eq:1 -o empty -e save:stderr \
+	    ./run_id.sh -u root nonexistent
+	atf_check -s eq:0 -o ignore -e empty grep ^usage: stderr
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case default
+	atf_add_test_case primaries
+	atf_add_test_case Gflag
+	atf_add_test_case gflag
+	atf_add_test_case pflag
+	atf_add_test_case uflag
+}
diff --git a/contrib/netbsd-tests/usr.bin/id/t_whoami.sh b/contrib/netbsd-tests/usr.bin/id/t_whoami.sh
new file mode 100755
index 000000000000..c8df7452e5ca
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/id/t_whoami.sh
@@ -0,0 +1,75 @@
+# $NetBSD: t_whoami.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+#
+# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+create_run_whoami() {
+	cat >run_whoami.sh <<EOF
+#! /bin/sh
+[ -f ./whoami ] || ln -s $(atf_get_srcdir)/h_id ./whoami
+./whoami "\${@}"
+EOF
+	chmod +x run_whoami.sh
+}
+
+atf_test_case correct
+correct_head() {
+	atf_set "descr" "Checks that correct queries work"
+}
+correct_body() {
+	create_run_whoami
+
+	echo "Checking with EUID=100"
+	echo "test" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_whoami.sh
+
+	echo "Checking with EUID=0"
+	export LIBFAKE_EUID_ROOT=1
+	echo "root" >expout
+	atf_check -s eq:0 -o file:expout -e empty ./run_whoami.sh
+}
+
+atf_test_case syntax
+syntax_head() {
+	atf_set "descr" "Checks the command's syntax"
+}
+syntax_body() {
+	create_run_whoami
+
+	# Give a user to the command.
+	echo 'usage: whoami' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_whoami.sh root
+
+	# Give an invalid flag but which is allowed by id (with which
+	# whoami shares code) when using the -un options.
+	echo 'usage: whoami' >experr
+	atf_check -s eq:1 -o empty -e file:experr ./run_whoami.sh -r
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case correct
+	atf_add_test_case syntax
+}
diff --git a/contrib/netbsd-tests/usr.bin/infocmp/t_terminfo.sh b/contrib/netbsd-tests/usr.bin/infocmp/t_terminfo.sh
new file mode 100755
index 000000000000..8ede2405804c
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/infocmp/t_terminfo.sh
@@ -0,0 +1,62 @@
+#	$NetBSD: t_terminfo.sh,v 1.1 2012/06/06 21:23:10 martin Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "infocmp can decode one of some existing term types"
+	atf_set "require.progs" "infocmp env"
+}
+
+basic_body() {
+	for term in ansi vt100 wsvt25 sun-ss5 ibcs2 vt52 386at h19k h19kermit
+	do
+		atf_check -s exit:0 -e empty -o not-empty \
+			env TERM="${term}" infocmp
+	done
+}
+
+atf_test_case missing
+missing_head() {
+	atf_set "descr" "infocmp fails to decode non existent entries"
+	atf_set "require.progs" "infocmp env"
+}
+
+missing_body() {
+	for term in this-is-no-term nonexistent
+	do
+		atf_check -s not-exit:0 -e not-empty -o empty \
+			env TERM="${term}" infocmp
+	done
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+	atf_add_test_case missing
+}
+
diff --git a/contrib/netbsd-tests/usr.bin/jot/d_basic.out b/contrib/netbsd-tests/usr.bin/jot/d_basic.out
new file mode 100644
index 000000000000..89b0879a5642
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/jot/d_basic.out
@@ -0,0 +1,21 @@
+-1.00
+-0.90
+-0.80
+-0.70
+-0.60
+-0.50
+-0.40
+-0.30
+-0.20
+-0.10
+-0.00
+0.10
+0.20
+0.30
+0.40
+0.50
+0.60
+0.70
+0.80
+0.90
+1.00
diff --git a/contrib/netbsd-tests/usr.bin/jot/t_jot.sh b/contrib/netbsd-tests/usr.bin/jot/t_jot.sh
new file mode 100755
index 000000000000..bcdae329c8e0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/jot/t_jot.sh
@@ -0,0 +1,56 @@
+# $NetBSD: t_jot.sh,v 1.1 2012/03/20 06:18:34 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "Test that jot(1)'s output is sane (PR bin/12424)"
+}
+
+basic_body() {
+	atf_check -o file:"$(atf_get_srcdir)/d_basic.out" jot 21 -1 1.00
+}
+
+atf_test_case format
+format_head() {
+	atf_set "descr" "Test that jot(1) handles format strings " \
+			"correctly (PR bin/12316, PR bin/14253)"
+}
+
+format_body() {
+	atf_check -s exit:0 -o ignore jot -w xa%c 26 a
+	atf_check -s not-exit:0 -e not-empty jot -w %2 12
+	atf_check -s not-exit:0 -e not-empty jot -w %0 10 1 10
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case format
+}
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.m4.uue b/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.m4.uue
new file mode 100644
index 000000000000..8b900447dd7b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.m4.uue
@@ -0,0 +1,9 @@
+$NetBSD: d_ff_after_dnl.m4.uue,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+
+begin 644 d_ff_after_dnl.m4
+M"0E42$E3(%-(3U5,1"!32$]7(%50("A,24Y%(#$I"F1N;`D)5$A)4R!32$]5
+M3$0@3D]4(%-(3U<@55`@*$Q)3D4@,BD*9&YL_PD)5$A)4R!32$]53$0@3D]4
+M(%-(3U<@55`@*$Q)3D4@,RD*9&YL"?\)5$A)4R!32$]53$0@3D]4(%-(3U<@
+K55`@*$Q)3D4@-"D*"0E42$E3(%-(3U5,1"!32$]7(%50("A,24Y%(#4I"E<@
+`
+end
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.out b/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.out
new file mode 100644
index 000000000000..8e51f1ea05c5
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_ff_after_dnl.out
@@ -0,0 +1,2 @@
+		THIS SHOULD SHOW UP (LINE 1)
+		THIS SHOULD SHOW UP (LINE 5)
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.m4 b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.m4
new file mode 100644
index 000000000000..e0298587f03b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.m4
@@ -0,0 +1,5 @@
+m4_dnl	$NetBSD: d_m4wrap-P.m4,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+m4_define(`ateof', `TEXT AT EOF
+')m4_dnl
+m4_m4wrap(`ateof()')m4_dnl
+TEXT IN BODY
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.out b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.out
new file mode 100644
index 000000000000..a1bc22a09729
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap-P.out
@@ -0,0 +1,2 @@
+TEXT IN BODY
+TEXT AT EOF
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.m4 b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.m4
new file mode 100644
index 000000000000..b74db961c375
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.m4
@@ -0,0 +1,5 @@
+dnl	$NetBSD: d_m4wrap.m4,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+define(`ateof', `TEXT AT EOF
+')dnl
+m4wrap(`ateof()')dnl
+TEXT IN BODY
diff --git a/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.out b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.out
new file mode 100644
index 000000000000..a1bc22a09729
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/d_m4wrap.out
@@ -0,0 +1,2 @@
+TEXT IN BODY
+TEXT AT EOF
diff --git a/contrib/netbsd-tests/usr.bin/m4/t_m4.sh b/contrib/netbsd-tests/usr.bin/m4/t_m4.sh
new file mode 100755
index 000000000000..a0e1e7060f9e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/m4/t_m4.sh
@@ -0,0 +1,50 @@
+# $NetBSD: t_m4.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case eof
+eof_head()
+{
+	atf_set "descr" "Checks that m4 doesn't confuse 0xFF with EOF"
+}
+eof_body()
+{
+	cp "$(atf_get_srcdir)/d_ff_after_dnl.m4.uue" .
+	uudecode d_ff_after_dnl.m4.uue
+	atf_check -o file:"$(atf_get_srcdir)/d_ff_after_dnl.out" \
+	    m4 d_ff_after_dnl.m4
+
+	atf_check -o file:"$(atf_get_srcdir)/d_m4wrap.out" \
+	    m4 "$(atf_get_srcdir)/d_m4wrap.m4"
+
+	atf_check -o file:"$(atf_get_srcdir)/d_m4wrap-P.out" \
+	    m4 -P "$(atf_get_srcdir)/d_m4wrap-P.m4"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case eof
+}
diff --git a/contrib/netbsd-tests/usr.bin/make/t_make.sh b/contrib/netbsd-tests/usr.bin/make/t_make.sh
new file mode 100755
index 000000000000..70c3ead9edec
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/make/t_make.sh
@@ -0,0 +1,74 @@
+# $NetBSD: t_make.sh,v 1.6 2014/08/23 16:26:13 apb Exp $
+#
+# Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# Executes make and compares the output to a golden file.
+run_and_check()
+{
+	local atfname="${1}"; shift
+	local makename="${1}"; shift
+
+	local srcdir="$(atf_get_srcdir)"
+
+	local testdir="$(atf_get_srcdir)/unit-tests"
+
+	atf_check -s exit:0 -o ignore -e ignore \
+	    make -f "${testdir}/Makefile" "${makename}.out"
+	atf_check -o file:"${testdir}/${makename}.exp" cat "${makename}.out"
+}
+
+# Defines a test case for make(1), parsing a given file and comparing the
+# output to prerecorded results.
+test_case()
+{
+	local atfname="${1}"; shift	# e.g. foo_bar
+	local makename="${1}"; shift	# e.g. foo-bar
+	local descr="${1}"; shift
+
+	atf_test_case "${atfname}"
+	eval "${atfname}_head() { \
+		if [ -n '${descr}' ]; then \
+		    atf_set descr '${descr}'; \
+		fi \
+	}"
+	eval "${atfname}_body() { \
+		run_and_check '${atfname}' '${makename}'; \
+	}"
+}
+
+atf_init_test_cases()
+{
+	local filename basename atfname descr
+
+	for filename in "$(atf_get_srcdir)"/unit-tests/*.mk ; do
+	    basename="${filename##*/}"
+	    basename="${basename%.mk}"
+	    atfname="$(echo "${basename}" | tr "x-" "x_")"
+	    descr='' # XXX
+            test_case "${atfname}" "${basename}" "${descr}"
+	    atf_add_test_case "${atfname}"
+	done
+}
diff --git a/contrib/netbsd-tests/usr.bin/mkdep/t_mkdep.sh b/contrib/netbsd-tests/usr.bin/mkdep/t_mkdep.sh
new file mode 100755
index 000000000000..7ad6fd95ebc7
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/mkdep/t_mkdep.sh
@@ -0,0 +1,83 @@
+# $NetBSD: t_mkdep.sh,v 1.4 2012/08/26 22:37:19 jmmv Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Nicolas Joly.
+#
+# 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.
+#
+
+atf_test_case prefix
+prefix_head() {
+	atf_set "descr" "Test adding a prefix to a single target"
+	atf_set "require.progs" "mkdep cc"
+}
+prefix_body() {
+
+	atf_check touch sample.c
+
+	atf_check mkdep -f sample.d -P some/path/ sample.c
+	atf_check -o ignore grep '^some/path/sample.o:' sample.d
+}
+
+atf_test_case suffixes
+suffixes_head() {
+	atf_set "descr" "Test suffixes list"
+	atf_set "require.progs" "mkdep cc"
+}
+suffixes_body() {
+
+	atf_check touch sample.c
+
+	# No list
+	atf_check mkdep -f sample.d sample.c
+	atf_check -o ignore grep '^sample.o:' sample.d
+
+	# Suffix list
+	atf_check mkdep -f sample.d -s '.a .b' sample.c
+	atf_check -o ignore grep '^sample.b sample.a:' sample.d
+
+	# Empty list
+	atf_check mkdep -f sample.d -s '' sample.c
+	atf_check -o ignore grep '^sample:' sample.d
+}
+
+atf_test_case prefix_and_suffixes
+prefix_and_suffixes_head() {
+	atf_set "descr" "Test the combination of a prefix and suffixes"
+	atf_set "require.progs" "mkdep cc"
+}
+prefix_and_suffixes_body() {
+
+	atf_check touch sample.c
+
+	atf_check mkdep -f sample.d -s '.a .b' -P c/d sample.c
+	atf_check -o ignore grep '^c/dsample.b c/dsample.a:' sample.d
+}
+
+atf_init_test_cases() {
+	atf_add_test_case prefix
+	atf_add_test_case suffixes
+	atf_add_test_case prefix_and_suffixes
+}
diff --git a/contrib/netbsd-tests/usr.bin/nbperf/h_nbperf.sh b/contrib/netbsd-tests/usr.bin/nbperf/h_nbperf.sh
new file mode 100755
index 000000000000..2587ed043150
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/nbperf/h_nbperf.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $NetBSD: h_nbperf.sh,v 1.2 2012/09/25 20:53:46 joerg Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+set -e
+head -n $4 $1 | nbperf -m hash.map -o hash.c -a $2 2> /dev/null
+cc -o testprog -I. $5
+head -n $4 $1 | ./testprog | $3
diff --git a/contrib/netbsd-tests/usr.bin/nbperf/hash_driver.c b/contrib/netbsd-tests/usr.bin/nbperf/hash_driver.c
new file mode 100644
index 000000000000..e4195d9e2d94
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/nbperf/hash_driver.c
@@ -0,0 +1,53 @@
+/*	$NetBSD: hash_driver.c,v 1.3 2014/02/06 14:57:16 joerg Exp $	*/
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * 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 COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+
+#include "hash.c"
+
+int
+main(void)
+{
+	char *line = NULL;
+	size_t buflen;
+	ssize_t len;
+
+	while ((len = getline(&line, &buflen, stdin)) > 0) {
+		if (len && line[len - 1] == '\n')
+			--len;
+		printf("%" PRId32 "\n", hash(line, len));
+	}
+	free(line);
+	return 0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/nbperf/t_nbperf.sh b/contrib/netbsd-tests/usr.bin/nbperf/t_nbperf.sh
new file mode 100755
index 000000000000..37b7d907e2bb
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/nbperf/t_nbperf.sh
@@ -0,0 +1,110 @@
+# $NetBSD: t_nbperf.sh,v 1.3 2014/04/30 21:04:21 joerg Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+cleanup()
+{
+	rm -f reference.txt hash.c hash.map testprog
+}
+
+atf_test_case chm
+chm_head()
+{
+	atf_set "descr" "Checks chm algorithm"
+	atf_set "require.files" "/usr/share/dict/web2"
+	atf_set "require.progs" "cc"
+}
+chm_body()
+{ 
+	for n in 4 32 128 1024 65536; do
+		seq 0 $(($n - 1)) > reference.txt
+		atf_check -o file:reference.txt \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 chm cat \
+		    $n $(atf_get_srcdir)/hash_driver.c
+		atf_check -o file:hash.map \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 chm cat \
+		    $n $(atf_get_srcdir)/hash_driver.c
+	done
+}
+chm_clean()
+{
+	cleanup
+}
+
+atf_test_case chm3
+chm3_head()
+{
+	atf_set "descr" "Checks chm3 algorithm"
+	atf_set "require.files" "/usr/share/dict/web2"
+	atf_set "require.progs" "cc"
+}
+chm3_body()
+{ 
+	for n in 4 32 128 1024 65536; do
+		seq 0 $(($n - 1)) > reference.txt
+		atf_check -o file:reference.txt \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 chm3 cat \
+		    $n $(atf_get_srcdir)/hash_driver.c
+		atf_check -o file:hash.map \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 chm3 cat \
+		    $n $(atf_get_srcdir)/hash_driver.c
+	done
+}
+chm3_clean()
+{
+	cleanup
+}
+
+atf_test_case bdz
+bdz_head()
+{
+	atf_set "descr" "Checks bdz algorithm"
+	atf_set "require.files" "/usr/share/dict/web2"
+	atf_set "require.progs" "cc"
+}
+bdz_body()
+{ 
+	for n in 4 32 128 1024 65536 131072; do
+		seq 0 $(($n - 1)) > reference.txt
+		atf_check -o file:reference.txt \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 bdz "sort -n" \
+		    $n $(atf_get_srcdir)/hash_driver.c
+		atf_check -o file:hash.map \
+		    $(atf_get_srcdir)/h_nbperf /usr/share/dict/web2 bdz cat \
+		    $n $(atf_get_srcdir)/hash_driver.c
+	done
+}
+bdz_clean()
+{
+	cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case chm
+	atf_add_test_case chm3
+	atf_add_test_case bdz
+}
diff --git a/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh b/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh
new file mode 100755
index 000000000000..110761c4e301
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh
@@ -0,0 +1,8907 @@
+#! /bin/sh
+
+# $NetBSD: t_netpgpverify.sh,v 1.1 2012/11/20 07:55:54 agc Exp $
+
+# Copyright (c) 2012 Alistair Crooks <agc@NetBSD.org>
+# All rights reserved.
+#
+# 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 AUTHOR ``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 AUTHOR 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.
+#
+
+atf_test_case netpgpverify_case
+
+netpgpverify_rsa_head() {
+	atf_set "descr" "RSA signatures for netpgpverify"
+}
+
+netpgpverify_rsa_body() {
+	uudecode << EOF
+begin-base64 644 b.gpg
+xA0DAAgBG2jc/MBZaCMBy4tiAAAAAABQUk9HPXAKU1JDUz1wYXJzZS5jCldBUk5T
+PTUKTUtNQU49bm8KQ1BQRkxBR1MrPS1nIC1PMApMREZMQUdTKz0tZyAtTzAKCi5p
+bmNsdWRlIDxic2QucHJvZy5taz4KCnQ6ICR7UFJPR30KCS4vJHtQUk9HfSBncGdz
+aWduZWQtYS5ncGcKwsBiBAABCAAWBQJQTZOaBQMAAAAACRAbaNz8wFloIwAABTcH
+/RhxktWLH3Cw6YkC/4Wcm9yq6flgiKQsB0VUaVgmmOfWnLxcowyH5ISENo/J6qhT
+S8Z0B2lAkRzBhXbfSe8GoESc/NsXTuOIvdjZEy7FBkl9Lumuqp1IlmoXh3RgPv5Z
+gcJ+uDCV958uXAxLn017xN/CVKi5yBiNWWk/mOJuI8FCiQCyFVQ3dOXcFU/gf4iZ
+YkH6OMX6eNpLQXp+s1ar6ZqpFE09QEoiFuIiDas+V6g0IG1c+PgP+TOlO5ztaKjx
+XxejP0Thtft0T+AKTANVrtx+aTseVt4CR3jBt0n4CJjTTRQwnIYxGML3ddgMXSPT
+0c4J/4dwyMqdDuhby//52Nw=
+====
+EOF
+	cat >det << EOF
+To Do
+=====
+tests with -k sig
+detached sigs
+DSA
+
+Done
+====
+basics
+localise pgp_read_packets
+fix lint
+WARNS=5
+lib man page
+prog man page
+do we do it statically linked as well?
+multiple files in netpgpverify
+EOF
+	uudecode << EOF
+begin-base64 644 det.sig
+iQEcBAABAgAGBQJQf8gBAAoJEBto3PzAWWgjbLoH/i9MZSv2l9lJ5O+bfGmRSUxe
+rGeAM0dq//xi+AABByDEWNYORq2I6CO6k2eVPv7YbNE2Whn7qXA6U7LotM7Lt61l
+MCLRhuTv9RViV1qzsy+Z8VAQmhERAcG/qA5JSQbzjuVYhg5FexpiVmxgG9L8Z/Oj
+4pU9zIId1vH7CvAcy/mfSyM8Ih8bmsrgs9b1wzMPLQKl0v0jtcrEcnwMtscXa9Mw
+X66bHxCHtRyGcWsHU8Ab2fJCvsCbBBMtg3JjZ7+VgDoZqPqBgIkhmppqC05vU5QR
+leNo8g9OwiJ6fMtdwTMsFkxqjjVKk5//X/6jQd/mf55XcxLOw4UK4ev5ADExnOU=
+====
+EOF
+	cat >jj.asc << EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+1. tag & 0x3f
+2. len
+
+one pass (tag 4)
+========
+b version:3
+b sig type
+b hash alg
+b pubkey alg
+8b keyid
+
+literal data (tag 11)
+=============
+b binary/text
+b length
+c string
+L mtime
+text
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (NetBSD)
+
+iQEcBAEBAgAGBQJQaIZcAAoJEBto3PzAWWgj678IALbDHon3Rm6qUhn7k1TFT6D3
+yi/jzf3piSJGsgUg2wEghs175edC/cJK3lG9Gx/3/uQq06R9g37nVRX8I0sK7yT2
+XgR+RHoGh/b+CQxdRNC+ub5QoNb8LcmCb/MQGq2KK9otSExiy4WMUP4K1DblaK5L
++Hg4VTooMot1NVqyFSoB2aZauXc2F4ZVh5q0fn8w5GEw45P+AUUbmzpgbLwXbl+I
+tMsX54V1dxyDcCYUs0xUH/VxJUQEeIlDbCOXYMbCVtggYRqKksTr+u/riw/Llnql
+jQdq5rBRW1SlD7Ll6z/LF2WBJOWtHzp4qbnBGSq5uB1q37H3mWL28f1tL//TUjM=
+=EX8W
+-----END PGP SIGNATURE-----
+EOF
+	uudecode << EOF
+begin-base64 644 pubring.gpg
+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
+StZtC+VbuN66pfHwsAIAAw==
+====
+EOF
+	cat >NetBSD-6.0_hashes.asc << EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+
+
+The following is a complete list of distribution files for NetBSD-6.0
+
+This includes all binary distributions, kernels, install images,
+source tarballs, release notes and related files.  Multiple hash
+formats are used for each file.
+
+Signatures will be made available for any additional install media as
+they are published.
+
+UPDATE: the macppc ISO was replaced, the mac68k and source ISOs were added,
+and a new signature was generated for this hashes file on 15 October 2012.
+
+						NetBSD Security-Officer
+						security-officer@NetBSD.org
+
+SHA1 (NetBSD-6.0/CHANGES) = 44ed658e4f8c813d67613497afdc6656470aab00
+SHA512 (NetBSD-6.0/CHANGES) = ababa97f9674bfaa4d941515cff2b98a1c254221394e10f3060f456474f6888f5e79aa6480bebb6f69dc1e682cd8f4c450feee91c0da1a2ed1fc805bd1dec273
+RMD160 (NetBSD-6.0/CHANGES) = 2a0ed7457dfe13229bb72cfde66668ffff4ec7ff
+MD5 (NetBSD-6.0/CHANGES) = 63363144027cac2345030caf2d934d05
+SHA1 (NetBSD-6.0/CHANGES-6.0) = 159eef1002f7e904954fb3bd9490ac2e5391fdbb
+SHA512 (NetBSD-6.0/CHANGES-6.0) = f09bf320629f6db65a469c4220eebd8db668a81fcc1a8d41b9fb06bbadbcdafd76c9d6372d8d9e5258af8424abf648d1114da2eef3ae9b396642b9b3aba434ec
+RMD160 (NetBSD-6.0/CHANGES-6.0) = b03df64c3b4081c56578066c23a24db14ae935e1
+MD5 (NetBSD-6.0/CHANGES-6.0) = 92a82839d67702799f45da9167b0a60e
+SHA1 (NetBSD-6.0/CHANGES.prev) = 25bdfe4a49acc75ee3a59ca04dc3b3c7c71a4563
+SHA512 (NetBSD-6.0/CHANGES.prev) = 73057475c27c98d729dc97f6203f89f39459405c74f7abd7b18d4382f7c5ad6c3f598989cecdd5013ba4b77d66e694c05e3fcd51fd9776fde908513ea70e63d5
+RMD160 (NetBSD-6.0/CHANGES.prev) = 38f959a7c9d0c8da19eeb1740126b04dbb71a90e
+MD5 (NetBSD-6.0/CHANGES.prev) = 0a50635a033237b439f5d7ef4c29b802
+SHA1 (NetBSD-6.0/LAST_MINUTE) = 49f8a218ff6657e0d30449a87b7c4f65ccf6115b
+SHA512 (NetBSD-6.0/LAST_MINUTE) = d6b47cdd24a6be60d68f867c361106da69dea5f9b7f4f9764d1bd0f706e8fc9d604a6b89b95eb2829dba78df936f824be3dec21318da495705796a1882ee9277
+RMD160 (NetBSD-6.0/LAST_MINUTE) = ba07328d66f7955cc9fcb402e461871bfcf2aad3
+MD5 (NetBSD-6.0/LAST_MINUTE) = fb247c08580991ef0cc5f126b62f3b6e
+SHA1 (NetBSD-6.0/README.files) = 183b12bef627768c595ab7df30bc038952166809
+SHA512 (NetBSD-6.0/README.files) = 9aacd7e1042c7579309ed9ec1ee0fb017803f967be04e51f08e78fd56537ceae6ee79ed0bd3250994e4c16dd7de6995c1be3a301aeb95a500bbc77f6915ecb31
+RMD160 (NetBSD-6.0/README.files) = 61301ea3ffe6a3e1c415ce00cfe6d22b2d544365
+MD5 (NetBSD-6.0/README.files) = 7e47e7eb92db7cb8b8ce39ceb5986847
+SHA1 (NetBSD-6.0/acorn26/binary/kernel/netbsd-FOURMEG.gz) = e127c41d5e332c75e79f5ca0e72ba250ef3c739a
+SHA512 (NetBSD-6.0/acorn26/binary/kernel/netbsd-FOURMEG.gz) = 7487273a4289d2f1dd69fb0230c263ac4fd198aac5399de043e1416834ea4b0bb4970129886223b9c5090ea9526dd765e6152f89ccfa58d4c8ba95597a845a34
+RMD160 (NetBSD-6.0/acorn26/binary/kernel/netbsd-FOURMEG.gz) = 09dcd3b8f9be85b99ed094fefc6a88e27be9b91d
+MD5 (NetBSD-6.0/acorn26/binary/kernel/netbsd-FOURMEG.gz) = 5aef629404b3d65f15bc44554b948145
+SHA1 (NetBSD-6.0/acorn26/binary/kernel/netbsd-GENERIC.gz) = c6362b83dbc496509c4e539cca33924b14318804
+SHA512 (NetBSD-6.0/acorn26/binary/kernel/netbsd-GENERIC.gz) = da75edae5fcd456028c5699d3872ac6e9c041aafb37141cfbf6b5f374f5c69d21979d23709f7e82a9198580e6f5c3c50060b9d1cd3dcac74c1e2530131c5e892
+RMD160 (NetBSD-6.0/acorn26/binary/kernel/netbsd-GENERIC.gz) = 6caa2f5e65c871664b1af2dd2a5eceb8b64f2212
+MD5 (NetBSD-6.0/acorn26/binary/kernel/netbsd-GENERIC.gz) = b14bd857ffbe97a3601f91bc0a1b388d
+SHA1 (NetBSD-6.0/acorn26/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/acorn26/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/acorn26/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/acorn26/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/acorn26/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/acorn26/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/acorn26/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/acorn26/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/acorn26/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/acorn26/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/acorn26/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/acorn26/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/acorn26/binary/sets/xbase.tgz) = 875fd641f969ec00f854ca1334d084947450c740
+SHA512 (NetBSD-6.0/acorn26/binary/sets/xbase.tgz) = 75d0c9e9685b6b7bb706df7427c8b52f59c4fc4d0e725b02ee18024f75a546dc41de5f1a5d8552a8d2c84bdf87856e5857b0f12914801ca7b36b69536d617b4e
+RMD160 (NetBSD-6.0/acorn26/binary/sets/xbase.tgz) = 1a4d099d59b2bd882e99f1b2df1c7bf22b890d48
+MD5 (NetBSD-6.0/acorn26/binary/sets/xbase.tgz) = 5eb9c573c5a0c96701f268a3470a58b9
+SHA1 (NetBSD-6.0/acorn26/binary/sets/xcomp.tgz) = 8d7469a85b7433c89690cce74e6b3f4e66cf0647
+SHA512 (NetBSD-6.0/acorn26/binary/sets/xcomp.tgz) = 411304cf66e300a7f162128203099bb4d6eebc4a93ba18ed7caf79f30b31cc7ffcede85c4e1bad02c3f5f8a27d009fb71f3ce5862c1d8aa477f39a25c535fdaa
+RMD160 (NetBSD-6.0/acorn26/binary/sets/xcomp.tgz) = 822d26e0ee08b72ca8b991f0709a8c1bf0399208
+MD5 (NetBSD-6.0/acorn26/binary/sets/xcomp.tgz) = 5af361f0334d28119d703064278b3ed3
+SHA1 (NetBSD-6.0/acorn26/binary/sets/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/acorn26/binary/sets/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/acorn26/binary/sets/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/acorn26/binary/sets/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/acorn26/binary/sets/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/acorn26/binary/sets/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/acorn26/binary/sets/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/acorn26/binary/sets/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/acorn26/binary/sets/xserver.tgz) = 4ccfef1d49179603286042088bec0218c6b2031d
+SHA512 (NetBSD-6.0/acorn26/binary/sets/xserver.tgz) = 809fc0a9065c1b9e7cd17aeb0d41cfd3158efd6c585556af01c4a3c93f0df3646a2ff77c6994449a703a408c0988fc1aa68cf34c7e297a3056d73ded57034c12
+RMD160 (NetBSD-6.0/acorn26/binary/sets/xserver.tgz) = 403604404261764c74f10fab774c4653fd20cc9b
+MD5 (NetBSD-6.0/acorn26/binary/sets/xserver.tgz) = 914f909b6878cef16a92765a8cbb52ca
+SHA1 (NetBSD-6.0/acorn26/binary/sets/kern-FOURMEG.tgz) = 3e74d7ca4f0ad181d8f37a28fc179fe4fdc3521f
+SHA512 (NetBSD-6.0/acorn26/binary/sets/kern-FOURMEG.tgz) = 794689c5f293ed453fe424f3e1cd45bdf6127a08da0e6ded9b6f3c8afe0af6f65b1ca1aca96db5b8a4891102f38b2895aca82bba0dce8ee1389f2eb439ce11b7
+RMD160 (NetBSD-6.0/acorn26/binary/sets/kern-FOURMEG.tgz) = 66e7db127f67cf318789d74d7bdf5a57fdb922ed
+MD5 (NetBSD-6.0/acorn26/binary/sets/kern-FOURMEG.tgz) = f26ed42c971ee7ce64682f5fa5a5c2b5
+SHA1 (NetBSD-6.0/acorn26/binary/sets/base.tgz) = 48cf8b5b14a8a61a85bf8bfa1ae739ef599a17e6
+SHA512 (NetBSD-6.0/acorn26/binary/sets/base.tgz) = f68d2d3e80b88fad8ff98a9bfdac7cc039d51e766130d3cade364a83bede6c6984c0cbcc56588f81760e6754ebbb08ad444fe4dd006e8ef91a3bc4e66c777e4a
+RMD160 (NetBSD-6.0/acorn26/binary/sets/base.tgz) = 090a8ef5abfede25635b86e1ed989bd8c7b988e5
+MD5 (NetBSD-6.0/acorn26/binary/sets/base.tgz) = 6ea39b172012faf2bdbcb861d0de443c
+SHA1 (NetBSD-6.0/acorn26/binary/sets/comp.tgz) = 8d6222fb0ba80750737719e3c9eb4d42aef1c92e
+SHA512 (NetBSD-6.0/acorn26/binary/sets/comp.tgz) = eeacb62b5075abfd130a4ee4bcc8b3ada6fe2e3b4ad95cfa65fb45e61956092368c9e7dd90b7fbfefd7d96162890d23872d3bc4ad92488d92a50738d59629f9c
+RMD160 (NetBSD-6.0/acorn26/binary/sets/comp.tgz) = adc77379342aa005884eb58a65a8d57d07e63853
+MD5 (NetBSD-6.0/acorn26/binary/sets/comp.tgz) = a660a76cb874c828690f5a128ff61501
+SHA1 (NetBSD-6.0/acorn26/binary/sets/etc.tgz) = 183e6af0c9ddf7c62218f3616129ed1223e0fd0b
+SHA512 (NetBSD-6.0/acorn26/binary/sets/etc.tgz) = 0c9967126ddf9cdfdf568b6a7183bd9a17a119798f318f511ec9b9351770ffb8a394d57ccf09ce1e38b4e56d836f4ab61c943e81d932007e8726819733b0b108
+RMD160 (NetBSD-6.0/acorn26/binary/sets/etc.tgz) = 92fab0f295c28c53f693444918b12bc026596a3f
+MD5 (NetBSD-6.0/acorn26/binary/sets/etc.tgz) = 1c4124013d68bbf2b85d3025aab1a0a9
+SHA1 (NetBSD-6.0/acorn26/binary/sets/kern-GENERIC.tgz) = 86de3875a3df7b400d86d2f97ea02067dac49288
+SHA512 (NetBSD-6.0/acorn26/binary/sets/kern-GENERIC.tgz) = c3eb9e9e696c7f166c9da1acdbf14b314863f68a5af5786c9d79c5e2ffd9c70ad366a6cec7ff0858ffae2ab8e028c0224b091de5bfcfad6a4ae5327709c7981e
+RMD160 (NetBSD-6.0/acorn26/binary/sets/kern-GENERIC.tgz) = f2b59e92e18402c2e96a4b254fa18f21b339629c
+MD5 (NetBSD-6.0/acorn26/binary/sets/kern-GENERIC.tgz) = 107061f8599c58b8a982c7f6b96e0fd3
+SHA1 (NetBSD-6.0/acorn26/binary/sets/modules.tgz) = 2e72e54d98a0bae829f2fdd53a9a927a4269fe83
+SHA512 (NetBSD-6.0/acorn26/binary/sets/modules.tgz) = 560d27968ab9740b7fec62e5afefddc5d6db9ebb73b79c38c34ab4d609fc4cfebe8bef7e05eb5fdacc17502236ae95675e2db87e5a8c258a3633f93635fe5aae
+RMD160 (NetBSD-6.0/acorn26/binary/sets/modules.tgz) = eee9e83fc9e9936b93f382beb4f619c0d7010cd8
+MD5 (NetBSD-6.0/acorn26/binary/sets/modules.tgz) = 3e0985108f65114c721c3672279d28cb
+SHA1 (NetBSD-6.0/acorn26/binary/sets/tests.tgz) = 72b14d964822d8a2e03c4d3855c33b2d5a02bcf5
+SHA512 (NetBSD-6.0/acorn26/binary/sets/tests.tgz) = 1b87e9174bb22df4c6b894fb731c53df03af87e6dbb8b2488fec832721c3ef3508c7dac35a2f51f144c6e726a8fff61d6f66d6a5c354c11ca2f2c8fe31a7d7a8
+RMD160 (NetBSD-6.0/acorn26/binary/sets/tests.tgz) = aa26cbefa7b2891c0d2e51a5f59c123c223721ff
+MD5 (NetBSD-6.0/acorn26/binary/sets/tests.tgz) = a69e9d96707beccb4149aed72d701bfa
+SHA1 (NetBSD-6.0/acorn26/binary/sets/text.tgz) = b4974a12425354e1d6dbe8e1e7def8ca2c8bea5a
+SHA512 (NetBSD-6.0/acorn26/binary/sets/text.tgz) = 360652de2f694807759927e57beff0e60fae7855d4ab55a574e8c2d9cab25bf76bf1b880dd419c4bef6339dc72a16959f563e964644d64a81029354c87fb1b08
+RMD160 (NetBSD-6.0/acorn26/binary/sets/text.tgz) = e40abdac843b3ac9055fdacff0c74d259609886d
+MD5 (NetBSD-6.0/acorn26/binary/sets/text.tgz) = e1ad13174b20a114fd74863b8a5a0399
+SHA1 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.gz) = e7fda95700ee86c95cb2135c841840b815319eb5
+SHA512 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.gz) = 79c810a6e1f7221aacd1e7b7edca4064ec6c3b7b99bbbe7282bdec0354c9387f9170019c7e6df5ec049497d8b0a69c07aaf485dfd286069437c16b7a44dd04ab
+RMD160 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.gz) = 68c551c4746c765068cc39e81eff40d13065ac19
+MD5 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.gz) = 2f3714cfea4b8ace15469ca877ddcaf2
+SHA1 (NetBSD-6.0/acorn26/installation/misc/boot26,ffa) = 983591033b4f5301e5c3f9696b3e9037aaa11047
+SHA512 (NetBSD-6.0/acorn26/installation/misc/boot26,ffa) = 16ef2baf8d00639c68dafbf42a563815ca6a0cc51c1083820c47d10c06422abfa8257d25be675024bf674d70def6747cb70a45d2a8451551e0b7ac6915057bfe
+RMD160 (NetBSD-6.0/acorn26/installation/misc/boot26,ffa) = a517e705c94bf87b617648aee6542e8194ad29b4
+MD5 (NetBSD-6.0/acorn26/installation/misc/boot26,ffa) = ed0fd36ea9ed9893250d9f588d5c358c
+SHA1 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.symbols.gz) = 3eca116cb41df17471b9e24e453c3164bc2f6fee
+SHA512 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.symbols.gz) = e2fce3e17958cd1865c584fa3a97a061f8fef09a8793f61018144e753d4667026349747ac7d9dfa6ad70afe2c4dbfeaef1f5718430947958f34785858e2424e3
+RMD160 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.symbols.gz) = 9f25df06373241ff5dfaafa250311a4bc5020197
+MD5 (NetBSD-6.0/acorn26/installation/misc/netbsd-INSTALL.symbols.gz) = 4daa298789745793c9f9f1a03c4ecdb5
+SHA1 (NetBSD-6.0/acorn26/INSTALL.html) = e1896519f52cf8b3574c2ddad19d135e837ff05b
+SHA512 (NetBSD-6.0/acorn26/INSTALL.html) = 9951385e876eed0126a9706c5c075453fd27ef0eb8fc42fa1bdca0e100a04d5f2d269145040eaffcfb683ef63f51a574254ce02cd3d0d3449ef867205e55c49a
+RMD160 (NetBSD-6.0/acorn26/INSTALL.html) = 4e81e718d1526b61a1ebfc3dde631cc1c4f1998d
+MD5 (NetBSD-6.0/acorn26/INSTALL.html) = e77700615f6d71545079d4f98be4fda3
+SHA1 (NetBSD-6.0/acorn26/INSTALL.more) = 31ce17bd0e1a3eb8956f06af4a2635a8cea3693e
+SHA512 (NetBSD-6.0/acorn26/INSTALL.more) = c9693333dbbde859f3f8e1f5cb571e43eeac2a1727ce7e4681b4dacda1e145a54bacbb16346bed669a0f83e3592e7b824b66d0e0a2a0f39ab41891a0bee78ca5
+RMD160 (NetBSD-6.0/acorn26/INSTALL.more) = 12606307f5f4314a84d4401c5297bcf701fc1dcb
+MD5 (NetBSD-6.0/acorn26/INSTALL.more) = 2104dbaa19182d2de7416aa62b7de537
+SHA1 (NetBSD-6.0/acorn26/INSTALL.ps) = 61b3e6838c01429478fd78f84fc380a320f1b2ba
+SHA512 (NetBSD-6.0/acorn26/INSTALL.ps) = d96d21356a59e59ab344d4e4b720e9425b3e7a3f926e8e7d453f33c907eff12c9dfdb8a97133d77bafc30a7fdf5fb63ab529a73facbad6ac8f9a36c63a236db5
+RMD160 (NetBSD-6.0/acorn26/INSTALL.ps) = 50c971d098fc714fb2efe2f3e2cf49351a0f8fc5
+MD5 (NetBSD-6.0/acorn26/INSTALL.ps) = f0d32affe70e695f4bcbe2df304f6a65
+SHA1 (NetBSD-6.0/acorn26/INSTALL.txt) = 00ac475ec70626dc1041211ecd0e5c7e213af948
+SHA512 (NetBSD-6.0/acorn26/INSTALL.txt) = 816c536f0caacbf292b9b54e812dc474299ee6a1084682321039bb1d3fd725523d76666fc14c772951ca45409550a25b5b74cefa0bf3f7539a17995a56df9756
+RMD160 (NetBSD-6.0/acorn26/INSTALL.txt) = c4618e23cd501a7520502285a24dc8813e1a4913
+MD5 (NetBSD-6.0/acorn26/INSTALL.txt) = f02c846c660d531f87f85271e991c77b
+SHA1 (NetBSD-6.0/acorn32/binary/kernel/netbsd-GENERIC.gz) = 8d2b1f19b2ba2231aba8e20c14ab5fd83dde59ae
+SHA512 (NetBSD-6.0/acorn32/binary/kernel/netbsd-GENERIC.gz) = 364ad36c66788c822a3cbfd0ddffafc6d19f9bb82144be988848970b7e0b6d11c2afaf4784f2132affe6ca052c69a4595181b1c37363637bb54f849e5bf4a1dd
+RMD160 (NetBSD-6.0/acorn32/binary/kernel/netbsd-GENERIC.gz) = 02d7f52cc0c15ff1039f3767cfa3840e5551e03a
+MD5 (NetBSD-6.0/acorn32/binary/kernel/netbsd-GENERIC.gz) = 96f504edccc8d4f5657c1837cdfd2aaa
+SHA1 (NetBSD-6.0/acorn32/binary/kernel/netbsd-NC.gz) = fc98fecc5548fde9220873e791d4d4846cefe4b3
+SHA512 (NetBSD-6.0/acorn32/binary/kernel/netbsd-NC.gz) = ff106589ca7b58c2ef3146a93be72b73987c221694400f3a2256728e618a7b486f32020f031e68edade5d13b3b9584a18ca88ce3fed71f06f9b494b3cb6eb844
+RMD160 (NetBSD-6.0/acorn32/binary/kernel/netbsd-NC.gz) = 4ff74a916d3283eb80e77739fd31dcda4890658b
+MD5 (NetBSD-6.0/acorn32/binary/kernel/netbsd-NC.gz) = f3a826b7eea3f009868a5ad419b69c3c
+SHA1 (NetBSD-6.0/acorn32/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/acorn32/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/acorn32/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/acorn32/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/acorn32/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/acorn32/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/acorn32/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/acorn32/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/acorn32/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/acorn32/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/acorn32/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/acorn32/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/acorn32/binary/sets/kern-GENERIC.tgz) = 0ec8993d446ad847bf7a6154a19c638d944bd24b
+SHA512 (NetBSD-6.0/acorn32/binary/sets/kern-GENERIC.tgz) = bed0345f83d42ee18b1cb1fab95e6780a217edda00c0c548aeb99323327493d1720b615d746a4e364a5217f963f24ae55142fc943a0d95aec65d8ddff2d36045
+RMD160 (NetBSD-6.0/acorn32/binary/sets/kern-GENERIC.tgz) = 2f27e6f036ad4fb08171f93e21324b9f901b781a
+MD5 (NetBSD-6.0/acorn32/binary/sets/kern-GENERIC.tgz) = 5eed762a46bf55d66491dab47bd40f23
+SHA1 (NetBSD-6.0/acorn32/binary/sets/base.tgz) = 519435bdcdffa41f24c56796558ad43ba6c89f31
+SHA512 (NetBSD-6.0/acorn32/binary/sets/base.tgz) = b7a3f4a5627790133104674c25e434d16a0e706006352f0032a4672f624c7fbf37b0678f72f593c5e17dea469afc03e09ac914eb4a02acb47b9a5673bd7e9777
+RMD160 (NetBSD-6.0/acorn32/binary/sets/base.tgz) = caf168bcd8c374896c8a0408e3d34e9c7e6f2c7b
+MD5 (NetBSD-6.0/acorn32/binary/sets/base.tgz) = b221228a61e59d66f1b457f5dcb1b5cc
+SHA1 (NetBSD-6.0/acorn32/binary/sets/comp.tgz) = 54b3cdd58c6db224ec42033f1f40842e55625e9f
+SHA512 (NetBSD-6.0/acorn32/binary/sets/comp.tgz) = a32e6f39ea01c783e1ff603c8774130698db0056923ef4c029f29f0df20f6b63885f33a50586774bc7c12b392f278344afd3aca42112bed8a3cd14d6ef72ff7e
+RMD160 (NetBSD-6.0/acorn32/binary/sets/comp.tgz) = cde7f725c376e8c0633d821357033e742358bb28
+MD5 (NetBSD-6.0/acorn32/binary/sets/comp.tgz) = c3866ce0cbc35fc4ffc58b14cc72ed31
+SHA1 (NetBSD-6.0/acorn32/binary/sets/etc.tgz) = e7c005ca92edbf1b8225f951b95b5938a94ee651
+SHA512 (NetBSD-6.0/acorn32/binary/sets/etc.tgz) = 01b47e91a0969eb2c3d7fd7f73563e98201ab401b9069b6d5e64e878757761410b8a181fcd04b141168c851d466e6d4e1b48b540e654d1831195deecbe5c23f7
+RMD160 (NetBSD-6.0/acorn32/binary/sets/etc.tgz) = f654da0c3fa14a8d8dc3a0cdb977d98b07b0d4ac
+MD5 (NetBSD-6.0/acorn32/binary/sets/etc.tgz) = 295b42a630082e4db876d35a7e5a204c
+SHA1 (NetBSD-6.0/acorn32/binary/sets/kern-NC.tgz) = e0744de8e7bc2a5808e603563cd8201de0601323
+SHA512 (NetBSD-6.0/acorn32/binary/sets/kern-NC.tgz) = 93c2fda5dd5a16eab210f74c0cf749fd013ec3488d6424fea84d404b2db5555a449a6a0ce9d936d7e18ec93216b1fa7a914e951dba3f223ac6b4de27d1f8cd32
+RMD160 (NetBSD-6.0/acorn32/binary/sets/kern-NC.tgz) = b0be18f3134075df50daec32dc87e30f370f7531
+MD5 (NetBSD-6.0/acorn32/binary/sets/kern-NC.tgz) = 5b8eb4b95fa6151bfbcaf0f72a6f6abb
+SHA1 (NetBSD-6.0/acorn32/binary/sets/modules.tgz) = 7df712c3742771ef53b42065426e7761020cf439
+SHA512 (NetBSD-6.0/acorn32/binary/sets/modules.tgz) = 3c682c61bca3059470ea6ceaf5e40314cc1876b9b183910692a1664a975aacae619c2214695a92f68463142940640042ba48f9acb39488fddfa757ffb74eb6e4
+RMD160 (NetBSD-6.0/acorn32/binary/sets/modules.tgz) = 35fc06c8194cb14f2258ce805c1e4fb8097669d0
+MD5 (NetBSD-6.0/acorn32/binary/sets/modules.tgz) = ffbd55bff72382bbc82342bacf6840ba
+SHA1 (NetBSD-6.0/acorn32/binary/sets/tests.tgz) = 68dae6dac916379bb48be79e8b2fe49898c4cfe5
+SHA512 (NetBSD-6.0/acorn32/binary/sets/tests.tgz) = b06a5ac96d76e0521e2d6666518a1549975a4d11767264c7d3b0d3dd8afe8aaa8e4f3113095d18d74146ee7e4c17a8d8a180bb4367c9aff6359b60ec06107970
+RMD160 (NetBSD-6.0/acorn32/binary/sets/tests.tgz) = 5a4c05ecc975a7ee61eda422a7dc7a5b1084424f
+MD5 (NetBSD-6.0/acorn32/binary/sets/tests.tgz) = ef0313ce1e3aec16c96660fc0b8e691b
+SHA1 (NetBSD-6.0/acorn32/binary/sets/text.tgz) = bb5835aee28d492add5e601c1323c4c1f0ac09e0
+SHA512 (NetBSD-6.0/acorn32/binary/sets/text.tgz) = ac45662324b717ccc775d4f4adfaf6623e8383fea5c5d4177fe21f8799a2a7534faff515c979f85cac6de86f166a0fcbc1021a8b8ff2a2c787fd341a4e6a6c91
+RMD160 (NetBSD-6.0/acorn32/binary/sets/text.tgz) = 96fbbe37b32d596fad17af067c28acf08eaaaa57
+MD5 (NetBSD-6.0/acorn32/binary/sets/text.tgz) = 1ff71742549a26794970d5aaef2c5f09
+SHA1 (NetBSD-6.0/acorn32/binary/sets/xbase.tgz) = 150aad78ea2477c5c1b395bda15bae8f0f72d36c
+SHA512 (NetBSD-6.0/acorn32/binary/sets/xbase.tgz) = 7ff70ee14b5943899517b4a7b2422ba1c62468399f55905e595d50de15fcfa2e89281a917c96d6d36e2dec519162227f7e6809c9a1da475c68982216d9acb242
+RMD160 (NetBSD-6.0/acorn32/binary/sets/xbase.tgz) = 0411d8686275c3d1146e42ddb69a0080bc82d950
+MD5 (NetBSD-6.0/acorn32/binary/sets/xbase.tgz) = 97aec1ef3a6ef744c85a7eaa6c403c1a
+SHA1 (NetBSD-6.0/acorn32/binary/sets/xcomp.tgz) = 9847900750d33556792e7b62e3e0ffc3f3ea625f
+SHA512 (NetBSD-6.0/acorn32/binary/sets/xcomp.tgz) = 010fc75bcd0355d1ea09cd8ddba94b16fab7224bec4aba26d07bf43f259b47b564fe008e6c477ce4a41161ae76dbd26d89f894ec5bf2ea7193cab2965d96de50
+RMD160 (NetBSD-6.0/acorn32/binary/sets/xcomp.tgz) = 975dbb1ec0a8f32cee4bfe55b4adb9f617d917be
+MD5 (NetBSD-6.0/acorn32/binary/sets/xcomp.tgz) = 7e761d7288845752bf05af5ac943d158
+SHA1 (NetBSD-6.0/acorn32/binary/sets/xetc.tgz) = 6b7815869c1c48a2efb0dfcdaae373700d5da8d9
+SHA512 (NetBSD-6.0/acorn32/binary/sets/xetc.tgz) = 42cbbc48a006498d46221eff6403acceeaf20ee5cb4a4f368b74e5b4599cccbd54f3d83b4a55359622599184f376f6bea2f2ad0feb364ce7d0293c3fb9d5b32d
+RMD160 (NetBSD-6.0/acorn32/binary/sets/xetc.tgz) = a60ea2e898741a2d009ca8c6c621fbcae1f1efce
+MD5 (NetBSD-6.0/acorn32/binary/sets/xetc.tgz) = 16cc8b76db930a1eb7b009e7776e2881
+SHA1 (NetBSD-6.0/acorn32/binary/sets/xfont.tgz) = 558af1104a11439ab8c868728c55027dd5862ce8
+SHA512 (NetBSD-6.0/acorn32/binary/sets/xfont.tgz) = fb28abf27b6cadadc9c0ca82df3025e22d4e0661dcc0488083c7339c5372acf0adea8edc848b7cea50980d971aa24f81bbda068b4b4bed6ac4cf26cc4f5b35bf
+RMD160 (NetBSD-6.0/acorn32/binary/sets/xfont.tgz) = f6df63aefaa5c459b2c86ae79fc7b07253424c97
+MD5 (NetBSD-6.0/acorn32/binary/sets/xfont.tgz) = 498abc855e6717ab51d5d0be8fa5662d
+SHA1 (NetBSD-6.0/acorn32/binary/sets/xserver.tgz) = 292d81e44c40c73e8341d59175695b649f839baa
+SHA512 (NetBSD-6.0/acorn32/binary/sets/xserver.tgz) = 3593eeeda7a9f55ff29622c2a95672c746f9235e007b3d8e81e33829fa655d0f6bc8ba90f6ef53baad1b25789fd656d5d8ea14152a9b41abf1a1bfbd2b11937f
+RMD160 (NetBSD-6.0/acorn32/binary/sets/xserver.tgz) = e0e2425da086891061ddae334fd8e98d77c519c9
+MD5 (NetBSD-6.0/acorn32/binary/sets/xserver.tgz) = bd36f768d1488956ea90a9f13ac8929c
+SHA1 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.symbols.gz) = b155be9bb81a3c15abe2b6732d48e8bfe53abc53
+SHA512 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.symbols.gz) = a3a1c068acbe2d634da3442aac4de7107dfcaf3634be291f9c3285aeb9fa680e59acb9273774e6317f71d6f9be2e1851a0e0f60b3cc83972f3e185f3e8237522
+RMD160 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.symbols.gz) = 3ac12cb07a5e8b9810946c489b9a4c3b9aecdcbc
+MD5 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.symbols.gz) = 1fe3c151480781a09a6f642ab87b9495
+SHA1 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.gz) = dc38de07bef2736068ee9cd3103f87ea6938fd6d
+SHA512 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.gz) = 11b29549b4b8232380eb6db4bf89a979e9b2a2726a3c7ff51ab059fd4f8b6a979d2cb7fe6d0c1802e345c445989655339a9a8b8d4a10f728ac7a24bae9f1830f
+RMD160 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.gz) = 605df2071d2e590be8a4d0f83c9a55a140066bc5
+MD5 (NetBSD-6.0/acorn32/installation/kernel/netbsd-INSTALL.gz) = dbc61ce2c5adf5f8e18441138aa4ae5a
+SHA1 (NetBSD-6.0/acorn32/installation/misc/BtNetBSD.spk) = 12dac3d0059f8eef736a378bb6e026166694c1a5
+SHA512 (NetBSD-6.0/acorn32/installation/misc/BtNetBSD.spk) = f54991c3e27613ac735b1a10d5ffcc102799417a68415b74c9557657c0e714fd7faa381a3945991bd80b49cefa2ec01395d88d0e935d063ff91174a8e12887ee
+RMD160 (NetBSD-6.0/acorn32/installation/misc/BtNetBSD.spk) = 02e5c2a9d751d8236ebbd0d4151f687fdd896735
+MD5 (NetBSD-6.0/acorn32/installation/misc/BtNetBSD.spk) = 4b3907f57b03d49765f92ffff178ef40
+SHA1 (NetBSD-6.0/acorn32/installation/misc/ramdisk.fs.gz) = 73ae7358fb27f8d227e253b6f43e5fcbdd7cb5f3
+SHA512 (NetBSD-6.0/acorn32/installation/misc/ramdisk.fs.gz) = 3c68e80766ae3603b289f11469c2c80ba1ffb5eb30f323fee016d992d7d226bf1984f487ee486cb3d0b1739bf45ae3ad52ddeb5f90ff2d0abd08cafc1a181ccf
+RMD160 (NetBSD-6.0/acorn32/installation/misc/ramdisk.fs.gz) = 3320c3a2a2d0e60d55b4612811d1870a4e8b9ec1
+MD5 (NetBSD-6.0/acorn32/installation/misc/ramdisk.fs.gz) = 70f0aee2f9cfc56744c50b3bed23b5a5
+SHA1 (NetBSD-6.0/acorn32/installation/misc/boot32,ffa) = 1a8c3e3a8950e68d6fd3d22ccf985814f67e00c1
+SHA512 (NetBSD-6.0/acorn32/installation/misc/boot32,ffa) = 2f7091d17fc4c910846f5cdc8cd267eb7d4056e281175c00407ab958548c62af4936394a04bde6549223fc874df72c5c46b0d11ae32ea6970c17326b0cedc6af
+RMD160 (NetBSD-6.0/acorn32/installation/misc/boot32,ffa) = 5821041d9dff2485cba9ab49e289a0bd479fc63d
+MD5 (NetBSD-6.0/acorn32/installation/misc/boot32,ffa) = 0f03b946d6479db2aaf8088dba4632ed
+SHA1 (NetBSD-6.0/acorn32/installation/misc/splug.bas) = 19015ba8a9efd73fea65fe180596271640893d1b
+SHA512 (NetBSD-6.0/acorn32/installation/misc/splug.bas) = ef38a1da79c93ff798c858f02d3d13e88d24bd0b56808ddb71b3dd577203195a60f601aa52e37892ab164ef7dd0cd490995ac9cd689fe33282fb49435f4c4d56
+RMD160 (NetBSD-6.0/acorn32/installation/misc/splug.bas) = 3080fc8d5ff946754a33bc41e7ad83cbe1eaa0b5
+MD5 (NetBSD-6.0/acorn32/installation/misc/splug.bas) = 5596dc5df580ceb656d040393e778087
+SHA1 (NetBSD-6.0/acorn32/INSTALL.html) = d16bd043227b34d9a9c3c69f380c6c42b50d080c
+SHA512 (NetBSD-6.0/acorn32/INSTALL.html) = 629401693cb91992f46b839a34bf4c4ac704194fd8aa6be3aa51e405920b697fe961fa7320eef7a4cf804dad96891b38ca57c61ef3c0c6096bb6bc71f58e55a9
+RMD160 (NetBSD-6.0/acorn32/INSTALL.html) = 222b9b590667b0a6dfe2717bb6dc94e95a485174
+MD5 (NetBSD-6.0/acorn32/INSTALL.html) = 07466bc8646d08bee6c7030d00cc9173
+SHA1 (NetBSD-6.0/acorn32/INSTALL.more) = 011db6fc8ab7b724dc66eafb3b712e9202bb2174
+SHA512 (NetBSD-6.0/acorn32/INSTALL.more) = d13335bfe65882608362fda44f89091113e3bffb53893f15bb747aaa72eefbb24ca3fd3d72017cfc446ba49ad7c00f34436e859f71727f9e6a182766a1810a13
+RMD160 (NetBSD-6.0/acorn32/INSTALL.more) = aaa800047583e64496187a80e54d0ac3bf4c851c
+MD5 (NetBSD-6.0/acorn32/INSTALL.more) = c45c7b7fd7522e41a977ffa6a58b5a4d
+SHA1 (NetBSD-6.0/acorn32/INSTALL.ps) = 78d2daf3255e7bc61b5682d5fcfd853d7dd25883
+SHA512 (NetBSD-6.0/acorn32/INSTALL.ps) = 4aec0769a5827735e13ab61dd80b5c7254561786afe0c95ff76796a8b29ae2284c064a1a1c523120366e37197bcbfd3d588985dbaae62c9848a4669d8c797714
+RMD160 (NetBSD-6.0/acorn32/INSTALL.ps) = 764dc8cc82d5623174886f98f77d808650ef90d1
+MD5 (NetBSD-6.0/acorn32/INSTALL.ps) = fc4371f1451a03c4ea429fe029e46d9c
+SHA1 (NetBSD-6.0/acorn32/INSTALL.txt) = 9d1ed61f6916645ffa30e66b23da2d0d24e18582
+SHA512 (NetBSD-6.0/acorn32/INSTALL.txt) = 10763c9164aeb2d4070f1677b0f97ca8263ec1b9d9c017fbcf348ce302d7d846fa669b741031eef4b12c27a7d077f6af9073f7668244b1b4daa39ab426d79ec7
+RMD160 (NetBSD-6.0/acorn32/INSTALL.txt) = 755fbe335d76c9b549fae4d01120cbe00290e8ca
+MD5 (NetBSD-6.0/acorn32/INSTALL.txt) = 1a6f36bd9f77e0773aeae95de9ceed8f
+SHA1 (NetBSD-6.0/acorn32/prep.RISCOS) = 269ee721985cbc44a8056ca4804f8b2d70d52a3e
+SHA512 (NetBSD-6.0/acorn32/prep.RISCOS) = 54923d8dc59e6a3852ceab25adbced3e545de19458c412552ef0cb47534303d812e8860662025b1aa9ddf9a99bb139f4be75656ef109546a328ba57985ec2cfa
+RMD160 (NetBSD-6.0/acorn32/prep.RISCOS) = 8e3acd93d35d85062996b061cff5d7293f46ee1f
+MD5 (NetBSD-6.0/acorn32/prep.RISCOS) = 3c0e290b44f735728abd3bda8bd96a0f
+SHA1 (NetBSD-6.0/algor/binary/kernel/netbsd-P4032.gz) = e9df71ffe487dd98c1aae0c6e79fbf8e4780340a
+SHA512 (NetBSD-6.0/algor/binary/kernel/netbsd-P4032.gz) = 48673b13075fc7694dccb1a31b6121281c5c0e85c5d7107a4f9414e9888c19f07133a07e43400495dd9e11757acc2fa2269458ae4b091900772c49a944624465
+RMD160 (NetBSD-6.0/algor/binary/kernel/netbsd-P4032.gz) = 85b0c6fde5bd0f4a02f71c30ccaf35d9bc29ac19
+MD5 (NetBSD-6.0/algor/binary/kernel/netbsd-P4032.gz) = 2f041466a193e263576e80bfca3ce8ef
+SHA1 (NetBSD-6.0/algor/binary/kernel/netbsd-P5064.gz) = f230eefee689dff40a0aca1983191c2e21c7dbde
+SHA512 (NetBSD-6.0/algor/binary/kernel/netbsd-P5064.gz) = eb7fea73f29d2141f508743785ee865bd5f7ce23477fc1bf256e40a0f47de76a7cdb22bfac0cb9dce94c0e1694b1c84b1760db13ab1b34248a6e04367817214d
+RMD160 (NetBSD-6.0/algor/binary/kernel/netbsd-P5064.gz) = 355d23c8cbde9c1a92bf5f1eb4e1f1890603e7f7
+MD5 (NetBSD-6.0/algor/binary/kernel/netbsd-P5064.gz) = 5ebc249debbe1797d915529f1d469f8b
+SHA1 (NetBSD-6.0/algor/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/algor/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/algor/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/algor/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/algor/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/algor/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/algor/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/algor/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/algor/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/algor/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/algor/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/algor/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/algor/binary/sets/xbase.tgz) = 76468fcada5a9e26652aa9f0f9f3c94829a317e9
+SHA512 (NetBSD-6.0/algor/binary/sets/xbase.tgz) = b2adcfc2dedef30b21b885c8fc757d0479541744a280a9997fbeaa9c881009ab4b0019e0001a540a8eb6db5f84db87b365e420bb2d4270af209821bdb080369c
+RMD160 (NetBSD-6.0/algor/binary/sets/xbase.tgz) = 1e0074d03d9fbb3373e0a427b25cc7097bf6d3c8
+MD5 (NetBSD-6.0/algor/binary/sets/xbase.tgz) = a8f29ec2e3768405942f97af3dd08ee7
+SHA1 (NetBSD-6.0/algor/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/algor/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/algor/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/algor/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/algor/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/algor/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/algor/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/algor/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/algor/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/algor/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/algor/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/algor/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/algor/binary/sets/xserver.tgz) = ff805022f409202f3346c45475c7ec0f8187218e
+SHA512 (NetBSD-6.0/algor/binary/sets/xserver.tgz) = f2bb3810a5572b519980126a3d934f63b5ab5c2fcf9fb8166c556bd3cc14cfaa151d582086bb1506ac9ac7e21d4e70a5cd5c3faed96212d8a14a0b5bafdcc4c1
+RMD160 (NetBSD-6.0/algor/binary/sets/xserver.tgz) = d5ae336337cc77f7f55f542b3457918d6fc0efe8
+MD5 (NetBSD-6.0/algor/binary/sets/xserver.tgz) = 92447a1560887d337d22e2deed0670a6
+SHA1 (NetBSD-6.0/algor/binary/sets/kern-P4032.tgz) = 810ebe688c1817dcfd7cab153a6d9997900555b8
+SHA512 (NetBSD-6.0/algor/binary/sets/kern-P4032.tgz) = 8846047a1a93d3ba853e235b2169286e09f5955d3116bd2bdb18f0d252c8b0ae0d310f3ccf6d30244d089f7b077579e8246ddb27f32ddcee26e6b7b7b2266aaa
+RMD160 (NetBSD-6.0/algor/binary/sets/kern-P4032.tgz) = 039bc25b47bc29648ebb86fad5fb52852badc0fc
+MD5 (NetBSD-6.0/algor/binary/sets/kern-P4032.tgz) = f8011c18eab0acde582df5ddda0d3a57
+SHA1 (NetBSD-6.0/algor/binary/sets/base.tgz) = 1cacc62a3d246592b148a70bef11a751b63a4810
+SHA512 (NetBSD-6.0/algor/binary/sets/base.tgz) = cd448e4f0533c50daf74ed21467409013d512e128b177c9b9ab47771d3d2cffcbe403ba207309af77eb6712d316d9db2923205765be8d9045e2b2216f94774d4
+RMD160 (NetBSD-6.0/algor/binary/sets/base.tgz) = c78efd1403b1cb3af77f5a0cbddbd095505d4f65
+MD5 (NetBSD-6.0/algor/binary/sets/base.tgz) = 33b467da96b628c9b68cd57209d353b7
+SHA1 (NetBSD-6.0/algor/binary/sets/comp.tgz) = 3e955d4a87fe115e37da729b9d2474a775614d30
+SHA512 (NetBSD-6.0/algor/binary/sets/comp.tgz) = 12ce5ac677ba9f44944f57859218d668d3d2bc3323ac5793545ca7de849480dc093f03226fed4dac42bf7a4ee69fc998b4a5e2c62607d754e0b58a3cc73d3d9d
+RMD160 (NetBSD-6.0/algor/binary/sets/comp.tgz) = 106fbdfddd7c9bd13d1b5d2111b39d4338bd8c10
+MD5 (NetBSD-6.0/algor/binary/sets/comp.tgz) = 8d493a09f9e5580f830f15a3c0b12d84
+SHA1 (NetBSD-6.0/algor/binary/sets/etc.tgz) = c0511cfd28c1b22e71166507a0f564c24015f025
+SHA512 (NetBSD-6.0/algor/binary/sets/etc.tgz) = d47fee208d0d59cf0edbbf2c75bbe404a176f66f0058db93ba553fffdc31d5b5ed6c2ba2df505f7b1576cd06cc27de5da3dfda1230927c2ac603a326aff688b2
+RMD160 (NetBSD-6.0/algor/binary/sets/etc.tgz) = 09d069cea8b5a133736d483097bcf24649f0d52a
+MD5 (NetBSD-6.0/algor/binary/sets/etc.tgz) = 4ce17fdd45c77f0d8632a836463db036
+SHA1 (NetBSD-6.0/algor/binary/sets/kern-P5064.tgz) = 1fa8786b3038a1bc218f5e8280ae3871f5687e4c
+SHA512 (NetBSD-6.0/algor/binary/sets/kern-P5064.tgz) = 0977b6911d05ee98e53841af3acff6b5f751c93841c96f3869cfad0e978596204cb22d3a1608842c36d24a50f16a35d0ec00288d56fd69e6cd33d8b2b1dc37c6
+RMD160 (NetBSD-6.0/algor/binary/sets/kern-P5064.tgz) = 8fd50961f224a94e272a15df2061f226d0d2456a
+MD5 (NetBSD-6.0/algor/binary/sets/kern-P5064.tgz) = 7932f7ce7a89995425a3e97319de27b7
+SHA1 (NetBSD-6.0/algor/binary/sets/modules.tgz) = 3627b369e3392221946d517d950da8bb6c3b6170
+SHA512 (NetBSD-6.0/algor/binary/sets/modules.tgz) = bbdaa688d423fce2ba3513727b4fd0758cb3c6b6db3147b09319990270380b4cf8feede38a2b57757095627356d6955a30d647d770d67a2bf97e66f0673e4770
+RMD160 (NetBSD-6.0/algor/binary/sets/modules.tgz) = 5040267ebae4a2069ad1b9168b31d568d2f81fca
+MD5 (NetBSD-6.0/algor/binary/sets/modules.tgz) = d3e9a884b3cef9a6ee2dd6b8c715901a
+SHA1 (NetBSD-6.0/algor/binary/sets/tests.tgz) = 76544bff809ab691a739a3ffebc3988b1473fdc2
+SHA512 (NetBSD-6.0/algor/binary/sets/tests.tgz) = 5e5709ec49a4e20f253ed5686f9fc62300b3c0aa70bc2cf036a41130803c578cc692b89fc234334723bc39f74cb0a8bd9e9be88cfa692213554713766c9a3b7b
+RMD160 (NetBSD-6.0/algor/binary/sets/tests.tgz) = 66eb344c33b3c463c3a6c3af96af263d8cb6dfe0
+MD5 (NetBSD-6.0/algor/binary/sets/tests.tgz) = 3ae196d57949ee2cb682ab871c9ef316
+SHA1 (NetBSD-6.0/algor/binary/sets/text.tgz) = fe2e0c01c5af66987eab5bb59b06fba32c006be2
+SHA512 (NetBSD-6.0/algor/binary/sets/text.tgz) = 3fdd84b91bc54bb3f045bf068d01b4b67fe35a62deffdf8b5964f5dc978d55b58b5b592c9fc9a05d40b305914ce7465981b4d55ec95571203c54f240a2bdff4c
+RMD160 (NetBSD-6.0/algor/binary/sets/text.tgz) = 420dc3d206809ea2438b82c912a041637e4d0949
+MD5 (NetBSD-6.0/algor/binary/sets/text.tgz) = b421f4428b8e52bb19e997954cb1d0ca
+SHA1 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.MP.gz) = 20bd351669d8b8c5e6ed9726567516aa2b20e101
+SHA512 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.MP.gz) = 16699cd9ff46de1282439235429a63aa38ad6eae8197f037e7f8bd2324ff696a04d4b2008723edb8bdae8e55f139024c55e3858670a3db4f6ff317fef3d39919
+RMD160 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.MP.gz) = 5897524a8bc830e819894c17803a141c65b4f417
+MD5 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.MP.gz) = 0ab46adc2ba2d37bfaac5fe5296fe616
+SHA1 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.gz) = daee92c8428d90796700da80702277f38afd7c78
+SHA512 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.gz) = 658bcdb3fe7c015e0de0d6fd795e9a9033618eb193c6e81b179b978836c93cd3b6a09f79ff4405f831f81e003bd190e91534112e9a923d10c3fb094478f4421a
+RMD160 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.gz) = 2bbdd4f11b998dbe08e2076e895785e90f17b192
+MD5 (NetBSD-6.0/alpha/binary/kernel/netbsd-GENERIC.gz) = 12d571967266dbdce4d9c0b02cda4718
+SHA1 (NetBSD-6.0/alpha/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/alpha/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/alpha/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/alpha/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/alpha/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/alpha/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/alpha/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/alpha/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.MP.tgz) = bef91c02bdb6ebd5e578bae73acbcbc5d9fcb47b
+SHA512 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.MP.tgz) = 0800ef43e76c838a4f91535fbad30adee37a4be94d01220ce3d0ca898204ef4b9140d753853faa29944ef1f0b7feff2a54551633ed10293751d0fb5c2134c858
+RMD160 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.MP.tgz) = bbc5e568ee1036473614f45ce443ae6129c2afb1
+MD5 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.MP.tgz) = 255686b1fa7b97a53599c7759fad4843
+SHA1 (NetBSD-6.0/alpha/binary/sets/base.tgz) = d6a62bc7f515a3cf470fe4298045346f79dbdfb8
+SHA512 (NetBSD-6.0/alpha/binary/sets/base.tgz) = b3eee92239be76b17cf36cf49d845123dd26853ec162d2f340338fff172af3ca20d6c85025e9a5fbc085d8522d331ecec488acc034c757f7a44d885b8f31ec41
+RMD160 (NetBSD-6.0/alpha/binary/sets/base.tgz) = 447c0754e06c36c2844563722dfd727938b7fdb5
+MD5 (NetBSD-6.0/alpha/binary/sets/base.tgz) = e898499ce51685436186e3be5227184a
+SHA1 (NetBSD-6.0/alpha/binary/sets/comp.tgz) = 3cd2356501ebeb4190de3596453b045f694f69de
+SHA512 (NetBSD-6.0/alpha/binary/sets/comp.tgz) = 51a526038f6e9cf7d787b86997abee47e9735a56f02215cd8f3260e50d2d3bd7a17d11b2f80b2010fd52640aab0afe074fa8997c3522ccf1a8463854bab9ee0b
+RMD160 (NetBSD-6.0/alpha/binary/sets/comp.tgz) = 5fd982783cb934f260a96a0f85279b07deb2b505
+MD5 (NetBSD-6.0/alpha/binary/sets/comp.tgz) = c5deb3e315f875050362df56411badcf
+SHA1 (NetBSD-6.0/alpha/binary/sets/etc.tgz) = b525757e8a68fee704bc4845c411c6e9ab06db01
+SHA512 (NetBSD-6.0/alpha/binary/sets/etc.tgz) = 4c881736688636b7376dc7f255266f606678d7fe57a9a787275dc78bbafb8c0f36948bc6b06ea853bd7d1e2dc3de90693fc518c3ffe57aa831777229d910b8c3
+RMD160 (NetBSD-6.0/alpha/binary/sets/etc.tgz) = bbacdc2a3adc49d3772faa1e60227d3f20357220
+MD5 (NetBSD-6.0/alpha/binary/sets/etc.tgz) = 5975a4d5767d0d68fd4371e32f1ebd40
+SHA1 (NetBSD-6.0/alpha/binary/sets/games.tgz) = f3c81c83cd5dd29ff44eeff54a39bc22e1739b43
+SHA512 (NetBSD-6.0/alpha/binary/sets/games.tgz) = f773dfef7f2449a7ea804e756181ea622428becff7cd86e227f8d9c33a343ea097a191c08b73f258e236695ac37df6af80ffcc930ae75a3f6bc4a542a0797673
+RMD160 (NetBSD-6.0/alpha/binary/sets/games.tgz) = 079affe9e062a8f418e15fc69dae6b19722d8e43
+MD5 (NetBSD-6.0/alpha/binary/sets/games.tgz) = 1bdf16fbef7c6ee4bc1e8f6e99cbe649
+SHA1 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.tgz) = e6e00d7a0d440b435c65b34ba6e5ea156f123f18
+SHA512 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.tgz) = b5a99efe112a3d00b4108dc632a2413c0edc72c8a4fdd4daba1c974b5f1233d48e21964e4e1f7588430d01b0813767861bc0a700910a1e288493fccf269255f3
+RMD160 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.tgz) = ccba42305acbf2080751f1b35c23a8bd2464d1c6
+MD5 (NetBSD-6.0/alpha/binary/sets/kern-GENERIC.tgz) = b05f2ce6966e37b9dd3018930753f14c
+SHA1 (NetBSD-6.0/alpha/binary/sets/modules.tgz) = 2ed2d5d8a1054fac920b44123147d1f445a8cd20
+SHA512 (NetBSD-6.0/alpha/binary/sets/modules.tgz) = e85332336dd7091fecb0d48aa772ec0f9890fae90a71bf3e79178cc319a32c7320e7e6357d4355292335809d12499875357583179199f9b0c94dedcce2bffee8
+RMD160 (NetBSD-6.0/alpha/binary/sets/modules.tgz) = 286d34676fdeb368fe4146a636878026b678afad
+MD5 (NetBSD-6.0/alpha/binary/sets/modules.tgz) = 31ddea9a696f752f01db0c8910252dbe
+SHA1 (NetBSD-6.0/alpha/binary/sets/tests.tgz) = 5a71181696e124159891257ed04551ca0fac96ed
+SHA512 (NetBSD-6.0/alpha/binary/sets/tests.tgz) = a62eb137237ed94f16b759f4b836932caf06f4fa4215126db879918e38b993349962b6cd63dc06b2516cccb2604208d12df0b599ae64c4b5bfacd8d51618be0c
+RMD160 (NetBSD-6.0/alpha/binary/sets/tests.tgz) = baaa5152926a07e890f3c6ab2e2ba0123e132d62
+MD5 (NetBSD-6.0/alpha/binary/sets/tests.tgz) = a3bfffe6cbdb12c847a397c474996dbd
+SHA1 (NetBSD-6.0/alpha/binary/sets/text.tgz) = 4087ff757867de3d1e48c7edcd0a1f63879141a2
+SHA512 (NetBSD-6.0/alpha/binary/sets/text.tgz) = 396175d3caa9afb10f69ca6724fe1544b685863edb272a36e46c6164f8a5ce8099d9ce98c988fc691e61cafa0741053b31f46af6d87873e7473ee2c7db05c5e2
+RMD160 (NetBSD-6.0/alpha/binary/sets/text.tgz) = 84877daedd720eaae66d03670b5391586cb5818d
+MD5 (NetBSD-6.0/alpha/binary/sets/text.tgz) = 3ad58e3441e75733d2bd172cc03d96c2
+SHA1 (NetBSD-6.0/alpha/binary/sets/xbase.tgz) = 8cb5878605114e42a100af9f6000da692936b458
+SHA512 (NetBSD-6.0/alpha/binary/sets/xbase.tgz) = 55901d2b29117e70ee9f60bca845a291f73c827b82a6d79d2035e8e861cc6d3553e9b698a2573af458ba7ff7f0d66c1b904e0510aac5391a768a7e85c8dcafa5
+RMD160 (NetBSD-6.0/alpha/binary/sets/xbase.tgz) = 27a6b757c2c136eb48d35e996bebae1154691620
+MD5 (NetBSD-6.0/alpha/binary/sets/xbase.tgz) = 7599e1da98dc669a5915742f46819445
+SHA1 (NetBSD-6.0/alpha/binary/sets/xcomp.tgz) = 0f7cf0e0611671bcc8763c66b6ddb96ba2b84cbc
+SHA512 (NetBSD-6.0/alpha/binary/sets/xcomp.tgz) = cabd0398fbb72d9d2c833a56c5ff77e5fcef535dd4ebb7ecf482fc278c6a05d9bdc4d0e443b2eaa9c1ba2ba6044cb066b9c10de8377bf754c3b2fde1925e90e8
+RMD160 (NetBSD-6.0/alpha/binary/sets/xcomp.tgz) = 0e6f7dfd1b78eed02bfedd4e354017d4ca193d3f
+MD5 (NetBSD-6.0/alpha/binary/sets/xcomp.tgz) = f830daacbaca8ab9bc135239ee1568ec
+SHA1 (NetBSD-6.0/alpha/binary/sets/xetc.tgz) = 392c70eb80215d3165d545e40212a8b5d0e071e1
+SHA512 (NetBSD-6.0/alpha/binary/sets/xetc.tgz) = 54d20a3d9023cb964eac1ea822cab4648ee70d4ddd4e45779077f9ee7bfeb895f06adf2ec5e6f63869c4746d89aaefad17837afe43023631a204b1e536b15447
+RMD160 (NetBSD-6.0/alpha/binary/sets/xetc.tgz) = 6308c2a5326f2e8dc958195e9c98e151c9727b06
+MD5 (NetBSD-6.0/alpha/binary/sets/xetc.tgz) = a591745a497f419dd0d277d43c2e7e1c
+SHA1 (NetBSD-6.0/alpha/binary/sets/xfont.tgz) = da7a98e196e0630e68572a298db959c1ad9e5cac
+SHA512 (NetBSD-6.0/alpha/binary/sets/xfont.tgz) = 6304ec4f69e76faaaea07f0ee720bc90dbbcb620d8980dedb6966767cd58be9ba2c8c4a7f977f4a4b9293f40dc267f7d1a92ced290e704ea6cab7f512a2e21eb
+RMD160 (NetBSD-6.0/alpha/binary/sets/xfont.tgz) = 51c4aeaae821cb352d3249f2894bbd4b90884e5b
+MD5 (NetBSD-6.0/alpha/binary/sets/xfont.tgz) = 18fdd4a9bed7c69c840cd8591c17670a
+SHA1 (NetBSD-6.0/alpha/binary/sets/xserver.tgz) = 32e0112e7e65de8beda18c41e9ddd18db5d586c9
+SHA512 (NetBSD-6.0/alpha/binary/sets/xserver.tgz) = 82587fb8cd0719eb39bc14f0e8bbf8a943d6ac710a9f4bed1ac8ea16443cf84a4f378a5dd8f077d5f8ce9213da74d6444a9da10b872f074ab45da8abc89135a5
+RMD160 (NetBSD-6.0/alpha/binary/sets/xserver.tgz) = 60936683b7027ff514f411e63c1767828afed830
+MD5 (NetBSD-6.0/alpha/binary/sets/xserver.tgz) = d8b3888a02b4e6f2198d67e731296e4a
+SHA1 (NetBSD-6.0/alpha/installation/diskimage/README.files) = 8fef6343776d407c097ffbb0622b509aa3b5d6ed
+SHA512 (NetBSD-6.0/alpha/installation/diskimage/README.files) = 0a37602db16239255dd32a5b6585a23780d9c7568e7bcdcd4f67f4cc5869ce772deda68df2428b6a8ae4e7e2e4e449f7b643d1fc5d929efa0409466a50cfaf74
+RMD160 (NetBSD-6.0/alpha/installation/diskimage/README.files) = ff4ac5a982e0c75bcc3a466b27b003da73573026
+MD5 (NetBSD-6.0/alpha/installation/diskimage/README.files) = 47f2c0383d6fc4ac6c8b25c348fa992c
+SHA1 (NetBSD-6.0/alpha/installation/diskimage/cdhdtape) = 560f896de7f7b1e2f8cb908048b3ebaeb6636263
+SHA512 (NetBSD-6.0/alpha/installation/diskimage/cdhdtape) = 10d6bd96b74b6df96c35533d14237b771d5f3f449120ea7062aff44960e8c0480048d607139ec2358961d93bba17afef407d0e775513c262e44249224ac54834
+RMD160 (NetBSD-6.0/alpha/installation/diskimage/cdhdtape) = 69eadfe52a7b4b3fe412190b7d2fd5fb83f7fe6a
+MD5 (NetBSD-6.0/alpha/installation/diskimage/cdhdtape) = 87f184344a501c90af4f7bcff11622ee
+SHA1 (NetBSD-6.0/alpha/installation/floppy/README.files) = 8fef6343776d407c097ffbb0622b509aa3b5d6ed
+SHA512 (NetBSD-6.0/alpha/installation/floppy/README.files) = 0a37602db16239255dd32a5b6585a23780d9c7568e7bcdcd4f67f4cc5869ce772deda68df2428b6a8ae4e7e2e4e449f7b643d1fc5d929efa0409466a50cfaf74
+RMD160 (NetBSD-6.0/alpha/installation/floppy/README.files) = ff4ac5a982e0c75bcc3a466b27b003da73573026
+MD5 (NetBSD-6.0/alpha/installation/floppy/README.files) = 47f2c0383d6fc4ac6c8b25c348fa992c
+SHA1 (NetBSD-6.0/alpha/installation/floppy/disk1of3) = 4d855acf87e1e1064b06c2232178d75a13c33fd3
+SHA512 (NetBSD-6.0/alpha/installation/floppy/disk1of3) = 9e86017634026e3e90a50c84a8f57badb1b7cf223aca9a643fae2bf186e443dc9eb5380cba764c89d64b7288078ca5b086b5a37b97fc47a4cc0ecfaad755af67
+RMD160 (NetBSD-6.0/alpha/installation/floppy/disk1of3) = 74abd218ad7f0299822e154ac2b420b258c83aad
+MD5 (NetBSD-6.0/alpha/installation/floppy/disk1of3) = 5a2d6e79a6714cf358c9ee8755e0aedf
+SHA1 (NetBSD-6.0/alpha/installation/floppy/disk2of3) = 4c8d4ef59efd9aeaceaef12aba4acb5c80ac3be2
+SHA512 (NetBSD-6.0/alpha/installation/floppy/disk2of3) = 72fcf5173d3b29eca98afcc9dd1c0ca172cf8509c9f449356086fcef28acff3641140745df32db394b43281a1421000959631cf55185673e430a792d026e4eb3
+RMD160 (NetBSD-6.0/alpha/installation/floppy/disk2of3) = 02ff0fdc28cb7ac47eae6869620ec5f801324654
+MD5 (NetBSD-6.0/alpha/installation/floppy/disk2of3) = 4f86d12bbbb50c2c06103f2002c88be9
+SHA1 (NetBSD-6.0/alpha/installation/floppy/disk3of3) = 4f0a721ea8eb063d964c3ec31e035f41febad205
+SHA512 (NetBSD-6.0/alpha/installation/floppy/disk3of3) = f3c66c64760246cde2e99999deac1a4dba5caa47603491de0edd47badafc5f6a08b7108e62a3e2c44d4cca55f17df48e1bc41fee948bca15d7dc0874ed321b18
+RMD160 (NetBSD-6.0/alpha/installation/floppy/disk3of3) = 1ca8581e23cc086d8bf93b39bf1efb34c8964d32
+MD5 (NetBSD-6.0/alpha/installation/floppy/disk3of3) = e558bf919697872fc6f5bfb8ef697f8f
+SHA1 (NetBSD-6.0/alpha/installation/instkernel/netbsd.symbols.gz) = 72358f5496a38794927cca6f55addc09e74983bd
+SHA512 (NetBSD-6.0/alpha/installation/instkernel/netbsd.symbols.gz) = f4fde67472e0cea2069a5d8c1a614429486c275a3ff38fd2f9c216a79749b366c79c898e9e4d58b4a2826c8b724d76b6de6b744d4eba058169ffb88b428b7790
+RMD160 (NetBSD-6.0/alpha/installation/instkernel/netbsd.symbols.gz) = 0b8b2fda5075cf789139581258d33e55e7edc18b
+MD5 (NetBSD-6.0/alpha/installation/instkernel/netbsd.symbols.gz) = 2f1474645c7c61a79af6046b873d0c53
+SHA1 (NetBSD-6.0/alpha/installation/instkernel/README.files) = 8fef6343776d407c097ffbb0622b509aa3b5d6ed
+SHA512 (NetBSD-6.0/alpha/installation/instkernel/README.files) = 0a37602db16239255dd32a5b6585a23780d9c7568e7bcdcd4f67f4cc5869ce772deda68df2428b6a8ae4e7e2e4e449f7b643d1fc5d929efa0409466a50cfaf74
+RMD160 (NetBSD-6.0/alpha/installation/instkernel/README.files) = ff4ac5a982e0c75bcc3a466b27b003da73573026
+MD5 (NetBSD-6.0/alpha/installation/instkernel/README.files) = 47f2c0383d6fc4ac6c8b25c348fa992c
+SHA1 (NetBSD-6.0/alpha/installation/instkernel/netbsd.gz) = 3057e0db687c65ad00bcc9433a8e1e8e8853b0f8
+SHA512 (NetBSD-6.0/alpha/installation/instkernel/netbsd.gz) = 72c72707e34bf282fec601e885eaa9dbfafc34dc44c97d1e100e439620ed5f3751e2b629b2b1ff40b229a29b1b217627f5fb70a198d571c0478d13d2c1f9d5e2
+RMD160 (NetBSD-6.0/alpha/installation/instkernel/netbsd.gz) = bb22d8b6c7113aad71720a489ab71dbe938e1475
+MD5 (NetBSD-6.0/alpha/installation/instkernel/netbsd.gz) = 9fece65592c8b7decdbff32513650306
+SHA1 (NetBSD-6.0/alpha/installation/netboot/netboot) = 17cf3e7f848aa8a853e322e977163547830f7357
+SHA512 (NetBSD-6.0/alpha/installation/netboot/netboot) = eb78138cdb1d289e4f39af61e24a2d0a42b5807c6869e921ffbcaf720902362f0c702ece18e1bbbb599d50b31b09ecebcaf9df5786f337ee511c0900e1bcb9cf
+RMD160 (NetBSD-6.0/alpha/installation/netboot/netboot) = 3228d2be31a224636f15cfa0f5c24cebea1d4b64
+MD5 (NetBSD-6.0/alpha/installation/netboot/netboot) = 2a71b40ce0eebc66564f796f681592b2
+SHA1 (NetBSD-6.0/alpha/INSTALL.html) = 6984fd17504c01e2c1dd83e7dbdf34bdcc7b6b1e
+SHA512 (NetBSD-6.0/alpha/INSTALL.html) = d4b63b33e62764fa6e008f5961599abf0ceb486aee59c55deb0e2f62f5e3efb0a7ec667217f72f553460d1931fff86c209345c6eccb688f67822e19f78f2b35b
+RMD160 (NetBSD-6.0/alpha/INSTALL.html) = 3d6597686d7079ca4857f5afe7fada4ddae2e4db
+MD5 (NetBSD-6.0/alpha/INSTALL.html) = c00f5ce1cc724dddfbe201deb54605d3
+SHA1 (NetBSD-6.0/alpha/INSTALL.more) = b670f381aeda31fa7a1c861aa90c8856a144460c
+SHA512 (NetBSD-6.0/alpha/INSTALL.more) = e8343ca62e59534c74a2cb3404092b71a771390943c5738c10cec908be2b202b4caafa09629b5086c0119f8c867a294fb759a76dc80705583f3db7115ad41b1c
+RMD160 (NetBSD-6.0/alpha/INSTALL.more) = 6236acfbb416a7f45499c9ba097b0ebc7df0ddc0
+MD5 (NetBSD-6.0/alpha/INSTALL.more) = c0f41cb950b8c2133e1c3d6005ed478b
+SHA1 (NetBSD-6.0/alpha/INSTALL.ps) = 902a55dd7d1b3cc6489f730e76fd8a656188ca3c
+SHA512 (NetBSD-6.0/alpha/INSTALL.ps) = 612f6a50dd02a6ef525948faaa4f77c6b60e6ea6b73fbf43fe28891523b0ba715c4c513991bbd99b36a1842c5bea3a4f59c31abcb7141af3ca77419d5ac7a399
+RMD160 (NetBSD-6.0/alpha/INSTALL.ps) = 95af61540f44c6ad5bde6110bb988b30144cac0e
+MD5 (NetBSD-6.0/alpha/INSTALL.ps) = d5cb827162bea74a99a75c4ec658cb13
+SHA1 (NetBSD-6.0/alpha/INSTALL.txt) = 00428f4fee211a107142bd3c673ac0e1bf82f8bb
+SHA512 (NetBSD-6.0/alpha/INSTALL.txt) = acc36a8ca1e2e171db9a482d5b5914cde68c2ba917478c91cbe4c6b1f14f0e46b6fc5393a6597b928b2fe043afe9373e92bc50eddaccad205b1513c9cfa5b89b
+RMD160 (NetBSD-6.0/alpha/INSTALL.txt) = c340c3eafed3235732e7bd6de8bd2e5798279a32
+MD5 (NetBSD-6.0/alpha/INSTALL.txt) = bebe671881b51664213b2b74a352ccea
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.symbols.gz) = cb8fb452336026da954a431064ac908983c73c56
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.symbols.gz) = 5ac462c2bbe07c1fc5bb719af9b8a048278c914e25c3e63a5908d04eed9b9ed3b3324af677f5910065c569e7eef9ab92fb7b23dc27a06361065193736170beb9
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.symbols.gz) = f294d6c837951cc2179aabe993db92be0507b73b
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.symbols.gz) = d5c7cba8ce43359a50bc6b41e1a59ac8
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.gz) = 0e1a51e79c8ed82328856cb4e9e1ca1f77f96ad6
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.gz) = 71822434adf5610fc6bf77371f0ea65403cbfac39194435c6fd0dcd62cfd214da5d9bd8c9a06ae300b81425339ecdca1e373e91d38870a56f1910e9e4b2f0dcb
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.gz) = 2344b490341441b4a08608454269d1bb55db13fa
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-GENERIC.gz) = fdba9cfe2198dbc3403ba5c9b251147e
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.symbols.gz) = b275c23887a6d7522777f6c70da7191ae2d3b64d
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.symbols.gz) = 30f57b1aa47d0c8dfae72063810dffda248ad25e03e432221861c4de98088eba502637675cf4d400809c6d2d45a17ee2b3ce87be4007fa8a2b86fb507d13426b
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.symbols.gz) = c98d06602cce33614079d4ac9049235aa71601f5
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.symbols.gz) = 5d2e2deeac92159eefa0c14bedb999e5
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.gz) = 22859d8f0aa148474db11e8493c1c1c5ca88a4bf
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.gz) = 5aad6a3e174330803b12b3c5566f422c96d6755e520b2bda951e7efd73f8f4bfbc0b902d7964688650717630355af96d51fed90fac5bbfe343f3c06d3354f5e6
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.gz) = 25124d4395c714580bcc3a2f8574df3d9a5e5ef4
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL.gz) = 09691319c1029293d76f2b51048cd7d8
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = 1ef0dce70ce636d55eb7cb5973f335729d17826a
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = 49a644ba39cd11ad2fd3c1aa27b7f2999019613bbb4731ee2098b484eee74d740baf4f67ddb7b4cdaf7f710e507ed719bc6840d704acf5ed80ce419fb8bfae1b
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = 459fb44892f496a9c7b445e837d875ddc1a7f056
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = 5902c6bc85313724e355e95a06e968a0
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOM0.gz) = 0f4ec7742c4c53d99cbc4b645931758d0a7ebe2a
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOM0.gz) = fa1e39362e515e808831bc81751231062ebe4987eb1790eb87cab7490697372472fac67df5d49fd41b1d6d3fbecc93f64d7c433d357c13a626636feda14f4a7e
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOM0.gz) = 2322a8960ba58563ea8507a0073c03934d8f58ad
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOM0.gz) = 31ea20a739a3e9caad0f4af0da531a0d
+SHA1 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOMU.gz) = 30bfc0edb5ec053c327cfab318877bcf633e3d26
+SHA512 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOMU.gz) = 7244306522782443df4e807ebf627eab0f6f994c3c1de9cde73781b7b8d16a2b3e7d1ab578c03bd3b2d6df19dc20485146ecb9ff920e2860a0858158509a4229
+RMD160 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOMU.gz) = bbae752f9fc5b0a9725e12aef5da652699ba614b
+MD5 (NetBSD-6.0/amd64/binary/kernel/netbsd-XEN3_DOMU.gz) = 72cc8998d1dd79b0471e4924a1ee9cbf
+SHA1 (NetBSD-6.0/amd64/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/amd64/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/amd64/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/amd64/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/amd64/binary/sets/kern-GENERIC.tgz) = 8880ef6795951dbca5379bffb7040b31e75e8217
+SHA512 (NetBSD-6.0/amd64/binary/sets/kern-GENERIC.tgz) = e1a58551a91511f0fa86ab4395a8901154e75bae344045200c1794d759cbd82c2441703123ee0c5d42561f08cb192e2bb39c57f4cb61b8fb970b579525fb1952
+RMD160 (NetBSD-6.0/amd64/binary/sets/kern-GENERIC.tgz) = be4c1cef72f8b3971890c549d908d03cf9ccae74
+MD5 (NetBSD-6.0/amd64/binary/sets/kern-GENERIC.tgz) = 60e67b64337a09d0d00bbe70c0ef43f6
+SHA1 (NetBSD-6.0/amd64/binary/sets/base.tgz) = 41f139d30b18839b0486e238bdcb1a08e084ac0f
+SHA512 (NetBSD-6.0/amd64/binary/sets/base.tgz) = 136fec9ccc141fbf39c4667f09f45ed3a7f07183c315819c391e3c47b67574d4278762e9be6ac7e325e7ebd2929dd59d1d8aa84411fb435baccf5b7d71c1e58b
+RMD160 (NetBSD-6.0/amd64/binary/sets/base.tgz) = 38903209c490bb8094061951fffc5ba7bf2cce24
+MD5 (NetBSD-6.0/amd64/binary/sets/base.tgz) = c4d69c1e245e95ee1ef891a998536f30
+SHA1 (NetBSD-6.0/amd64/binary/sets/comp.tgz) = 5d0d34f4debbf611578852fdc549197357f574c2
+SHA512 (NetBSD-6.0/amd64/binary/sets/comp.tgz) = 96cd27a092b2cbabc0f6f053d651ae94b6ec65b2c9f4812c6efd432c9ea9a321d38f8e88e6dba03ca7e6d3fe8dc2b43c3846880966964d6841d6cacb87f5c4a0
+RMD160 (NetBSD-6.0/amd64/binary/sets/comp.tgz) = 0fc9f9cef2839291204f399014f730a321ff846a
+MD5 (NetBSD-6.0/amd64/binary/sets/comp.tgz) = 1f6de4df6174d0e919b343bb0426ba92
+SHA1 (NetBSD-6.0/amd64/binary/sets/etc.tgz) = 23e42cd803c314f35f61713d7ce3d8ae6f978036
+SHA512 (NetBSD-6.0/amd64/binary/sets/etc.tgz) = 3aa2017bfd9d81b51371b31ae2eb4fa613c3cc90c532aabf1e76df938c312d1894f1b5313869a93fbd4463b903bb390ea5cf485e870d421ff0580240a04505e3
+RMD160 (NetBSD-6.0/amd64/binary/sets/etc.tgz) = d8d98a46df49ec9a28cda63da60c2fd8b2f5440c
+MD5 (NetBSD-6.0/amd64/binary/sets/etc.tgz) = d4d5351a9ee4c89d46d03025363d0af7
+SHA1 (NetBSD-6.0/amd64/binary/sets/games.tgz) = 535c8d580229e63485dbc9215ff8994babd19ba4
+SHA512 (NetBSD-6.0/amd64/binary/sets/games.tgz) = abc07cbb728d3b4148ca824f3d37c0fd789f22548f92c8d03c78cd04969828d6fb3e7396654e4709bfdc82783e5c17e3998372149b76a7bdfb186fd417a4e1cd
+RMD160 (NetBSD-6.0/amd64/binary/sets/games.tgz) = 80ca9419dae0b955ae39ba879b269eb27d34b0f9
+MD5 (NetBSD-6.0/amd64/binary/sets/games.tgz) = 1f7b98cfd037ac9a6b2487b1d3e2397a
+SHA1 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOM0.tgz) = 622ca31060c3d803bff339d53321e3b5cbe56fcf
+SHA512 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOM0.tgz) = 9943d8752f75569a2cb6611f2eb87a552cf98c92040cf2c0ec699ff0380b3b5395a7b2c951fcdbc6ef74d36073b7b066dc37ee1d60a3463836820fee7f15e5fe
+RMD160 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOM0.tgz) = 4627daedf28168da5994ad430aaac7b069785d42
+MD5 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOM0.tgz) = 3c473eed7a2c400bc22e743e6f2fad74
+SHA1 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOMU.tgz) = d29bb910d1ecf61700d54790c7376f2729dd6a71
+SHA512 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOMU.tgz) = e714d759a0635e3375ce56f945fa5df011b5037502ce0602d74db1a9d3ddf86144b13b9a2a503c231c931de998a645b8562b5254bc8e68c9537a7dea366957da
+RMD160 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOMU.tgz) = adb7515022b355b9b2f61a318d1fea6734e8859a
+MD5 (NetBSD-6.0/amd64/binary/sets/kern-XEN3_DOMU.tgz) = 3beec0bff32cc7c78bcadb6f90b0455f
+SHA1 (NetBSD-6.0/amd64/binary/sets/man.tgz) = f583717a7705475c144e1b66e93b3c9c6d8e3293
+SHA512 (NetBSD-6.0/amd64/binary/sets/man.tgz) = 92f6dbefacff42d2a6c317158aee801e8d4f3791704a792ce0761faf5425c516166a9769e7f3b81abd282cc9a60e0ff07c4350ac889fe66aec794f359a27452b
+RMD160 (NetBSD-6.0/amd64/binary/sets/man.tgz) = 02ffd712d7b6d265e8c566ccbfcaa34cc9916eda
+MD5 (NetBSD-6.0/amd64/binary/sets/man.tgz) = 59adc1ce49347d61ee6eea024e2ea2a2
+SHA1 (NetBSD-6.0/amd64/binary/sets/modules.tgz) = 46a78ea373e41e73dabc27ae802b395b7348c419
+SHA512 (NetBSD-6.0/amd64/binary/sets/modules.tgz) = 8dc00ff46c87d04b72f2e4fa0b2b290ab326b907f88f4d2667e63aa0390756df4c45ed5b9e36bec6e60e472a8162b9ddc55eea89b6ed65bd2f6cf5d760f611b9
+RMD160 (NetBSD-6.0/amd64/binary/sets/modules.tgz) = b2d93414e9e22b4b55dd73fb347aefe4b6a11d10
+MD5 (NetBSD-6.0/amd64/binary/sets/modules.tgz) = aa84f46e76b3f543ac9d8ea315869092
+SHA1 (NetBSD-6.0/amd64/binary/sets/tests.tgz) = cdcfc53423e8cd984258bc8635490bd815576322
+SHA512 (NetBSD-6.0/amd64/binary/sets/tests.tgz) = d11520f52dd889947a298a2428e4b81b840ef939ee82a63fb39ac30fa59918348a6546598b9b6f28268677f7bebf9e022f8ba568a47e3f9ff801ff08666c1366
+RMD160 (NetBSD-6.0/amd64/binary/sets/tests.tgz) = 7fb2dbecae8a377eca305f74075e9f4c4f326455
+MD5 (NetBSD-6.0/amd64/binary/sets/tests.tgz) = 4c8e0463db9e784b47d92aa43bd7ec82
+SHA1 (NetBSD-6.0/amd64/binary/sets/text.tgz) = 2ad7dfb1cf3e39da165e6d0d356444a3dda315ab
+SHA512 (NetBSD-6.0/amd64/binary/sets/text.tgz) = 77140ca96473762ba22737bdf1dcd74fbe7dea97778c2da7b8b015daa2af47c20a9663e5eee092a8b353cb36caf599efc5975b7572692cb5c8b77bcde7bb8fff
+RMD160 (NetBSD-6.0/amd64/binary/sets/text.tgz) = bdb4eb7e3081ec2bbd4b1eaaacd0cd96dfe92be1
+MD5 (NetBSD-6.0/amd64/binary/sets/text.tgz) = 3c9ac230578345961050fd8adbb15023
+SHA1 (NetBSD-6.0/amd64/binary/sets/xbase.tgz) = c88f6ae63e7acba75831ae5a19cfb8151f961780
+SHA512 (NetBSD-6.0/amd64/binary/sets/xbase.tgz) = be81153fc620a58e00ab7e1069dfa80567e9d641fc4ab6256512074d5cebb7a561fa8596de8f985022ef79ec0330ee317f2a2628a7236882f28a1ea9475d809f
+RMD160 (NetBSD-6.0/amd64/binary/sets/xbase.tgz) = 9e961b920bdc6432e1e0bfcad9adfb8dfc872cfb
+MD5 (NetBSD-6.0/amd64/binary/sets/xbase.tgz) = b98819c3afd401940a578ced15418ab6
+SHA1 (NetBSD-6.0/amd64/binary/sets/xcomp.tgz) = 7f6d2efa3a5e3a5ea2729020a8ad175929353995
+SHA512 (NetBSD-6.0/amd64/binary/sets/xcomp.tgz) = 35652d685c9581d20f198d13de8b34764c9a67e808416f006b98793f6ded279111d2bbeee6ad453a8416ba3259a5d7967d0327aa7e7109b7651d923bde31a8bd
+RMD160 (NetBSD-6.0/amd64/binary/sets/xcomp.tgz) = 0b3a659fdca9ed423aec4e799f739ad6ed3a2b7b
+MD5 (NetBSD-6.0/amd64/binary/sets/xcomp.tgz) = 72711d2c486caca7a8db94316c7704ad
+SHA1 (NetBSD-6.0/amd64/binary/sets/xetc.tgz) = d2a37199497c292f9a780bb5a77a14dd481bc0db
+SHA512 (NetBSD-6.0/amd64/binary/sets/xetc.tgz) = e8fe86ecaa56d0a016ad52024d956d8e77d690b4ccbb24b060d1c824f5e67979b2067ea6635361f25e80160e6abe3d4bce7ac586107fb673c12d65e9d9bbc4bf
+RMD160 (NetBSD-6.0/amd64/binary/sets/xetc.tgz) = e566d0c03e66e9365ad71c0057dd86bcc8663f96
+MD5 (NetBSD-6.0/amd64/binary/sets/xetc.tgz) = 6a1af564a85ba3996757440dfed4df94
+SHA1 (NetBSD-6.0/amd64/binary/sets/xfont.tgz) = 425d64efdeed5bf9f8038b9f0d61cdfd0b8679ba
+SHA512 (NetBSD-6.0/amd64/binary/sets/xfont.tgz) = c6e1b0829edb2e78302cf352880d4ee3cb6f6a5187f8082b0a0df3d49bd32f57cb0df450b850044cc0437da2f0ad75249cbf0777295d90ab38a9e1e13c786e08
+RMD160 (NetBSD-6.0/amd64/binary/sets/xfont.tgz) = d0f3520bdaad4cdbd90b3fe32e663c543153c0d0
+MD5 (NetBSD-6.0/amd64/binary/sets/xfont.tgz) = be05eeb3078d0fbb93b97130d49c5982
+SHA1 (NetBSD-6.0/amd64/binary/sets/xserver.tgz) = bc339a86b1e7d42e667a03561dd66835b0e39828
+SHA512 (NetBSD-6.0/amd64/binary/sets/xserver.tgz) = 00739626f1c78297988d1696e369b7ec933119ee7f76d57c426f83a1efba9414b7a1258258ab86b6b79a1277a327ac3ab0e2177bcaa396332ecc5221c6bf8954
+RMD160 (NetBSD-6.0/amd64/binary/sets/xserver.tgz) = 9adf580fd382fa5edc147da77b23410830e6ef9b
+MD5 (NetBSD-6.0/amd64/binary/sets/xserver.tgz) = b30af2c69ca833f25c0b163fea4496d8
+SHA1 (NetBSD-6.0/amd64/installation/cdrom/boot-com.iso) = 0aeb15a62bfd640903525b517b5cb254fbb8f694
+SHA512 (NetBSD-6.0/amd64/installation/cdrom/boot-com.iso) = c3998bedff5f4320e3b14b3bc07f7e348f45a106a1f78d738934fbce564b209eb9bce72f91bfbd4f95247a2eb4fb69366d3a8a4f7a597be3bfae889858f1badc
+RMD160 (NetBSD-6.0/amd64/installation/cdrom/boot-com.iso) = 90e7d9c68c959a8c3455fca88ac7fdc5af40589d
+MD5 (NetBSD-6.0/amd64/installation/cdrom/boot-com.iso) = 5551d8cd6c5675eda32c80de279860ee
+SHA1 (NetBSD-6.0/amd64/installation/cdrom/boot.iso) = 12323858ce09cfce6d3b294bb6d33a3ecd599400
+SHA512 (NetBSD-6.0/amd64/installation/cdrom/boot.iso) = 536021f6159e5412a9b7be41967e75cdaafb3fcb319ce7c712af6bac22cee2b07f185500fb77505f5a4018a0fa5e619a5e00dc11aee59babfc1dd3c69081a0c0
+RMD160 (NetBSD-6.0/amd64/installation/cdrom/boot.iso) = a66e6ff744cb27ed79f58824945806b4ddc5e743
+MD5 (NetBSD-6.0/amd64/installation/cdrom/boot.iso) = b4ae730ff5fcc86885c266665183dd35
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot-com1.fs) = 7773242845d56dae16e957ba3dcde54db2d44ad9
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot-com1.fs) = 14a0d9a1d7b6d893ee962b6c0e73cd2f44cdef9aa0c8d814465eb9e30bbee00fffd332a962d86430a04e13fb8b111fc857b5790648d27bbbe6eaac3fb0f6a0c5
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot-com1.fs) = 911fbf259c7ede76a08956e0e38ea8dba1522ae6
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot-com1.fs) = 18052eb95118b57ee28cff9cd78a0fab
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot-com2.fs) = 5a1705082aa0fdbe9df2deeb8bfcde27f62e39c9
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot-com2.fs) = 57a01c68902c568a9e061d588b3f96857de3ebe05eab55fffc38a843bb1e25d3c1962aeb78d711a5c70ee2cc7abd5717abc4b4224794803019cd1e81c9afa547
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot-com2.fs) = 03c5214a031d1cee57c50888bad984f59a0ec275
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot-com2.fs) = 9d14a976045f475ae3a96cb7ed04bae6
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot-com3.fs) = 80a4a45120aad34e9cc46b8f2fbba73977e395da
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot-com3.fs) = db431a6d199f53a3f367e759ed4fcb117a7b664dd9d5060677a7b3ef60853d3c6d31f5c4e6c54b33df6e4223a8aa7e27c3cb56f777205b58b7239980da5f58d5
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot-com3.fs) = fd6ca1f2110722e28189179a1e6ae1724c1b0c3d
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot-com3.fs) = cf7c49437a2e74cef7d07e5ecefe26f9
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot-com4.fs) = 611b759a6b95830057cea83517f8065fa131d328
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot-com4.fs) = 8d0229d04d365efe365a1dc84a5d05090290d684fda96cb637fd8989e162a6cd90c9a9409a80740356cdbe39cb81dcf498874db475b4c2aa443ec3087675611c
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot-com4.fs) = f7fda0f8502ab8255fc63de3de54c92d05ce6a17
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot-com4.fs) = 4e1c8e49e8592e5e7a13e4118df3a13c
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot-com5.fs) = 671ad9865cf186c69739279463e408504e89c072
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot-com5.fs) = 1a4329afefd19b3dbf37a12cb287aa771dfabdeeaf6b0302158eae0cde68d970a94a9643b4b18798654473c6eb577c8e555188a7c7776e6cccc05241a7b47c7f
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot-com5.fs) = 9e7000ef7b4a971936e74eb1858b0f74816d42f3
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot-com5.fs) = 52824ec1c65bc87f196fe4fcd1887cb2
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot1.fs) = 8393070ff7b79fb60d3aa6bf9675c5bce42b7340
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot1.fs) = 092f3177383ff4bb4f51fdca19069306f75bb0b86674e2862c34374bdc2da633008805c0cdd2bd352f0da12a2cd529e19086323f0c74d1fed89b2a0d65066bba
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot1.fs) = 9b24c6e8042942c96ad46c65443e48824c2b1fa8
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot1.fs) = ad5246fc6d7ce6840762ce87d281e0fc
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot2.fs) = 5a1705082aa0fdbe9df2deeb8bfcde27f62e39c9
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot2.fs) = 57a01c68902c568a9e061d588b3f96857de3ebe05eab55fffc38a843bb1e25d3c1962aeb78d711a5c70ee2cc7abd5717abc4b4224794803019cd1e81c9afa547
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot2.fs) = 03c5214a031d1cee57c50888bad984f59a0ec275
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot2.fs) = 9d14a976045f475ae3a96cb7ed04bae6
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot3.fs) = 80a4a45120aad34e9cc46b8f2fbba73977e395da
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot3.fs) = db431a6d199f53a3f367e759ed4fcb117a7b664dd9d5060677a7b3ef60853d3c6d31f5c4e6c54b33df6e4223a8aa7e27c3cb56f777205b58b7239980da5f58d5
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot3.fs) = fd6ca1f2110722e28189179a1e6ae1724c1b0c3d
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot3.fs) = cf7c49437a2e74cef7d07e5ecefe26f9
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot4.fs) = 611b759a6b95830057cea83517f8065fa131d328
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot4.fs) = 8d0229d04d365efe365a1dc84a5d05090290d684fda96cb637fd8989e162a6cd90c9a9409a80740356cdbe39cb81dcf498874db475b4c2aa443ec3087675611c
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot4.fs) = f7fda0f8502ab8255fc63de3de54c92d05ce6a17
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot4.fs) = 4e1c8e49e8592e5e7a13e4118df3a13c
+SHA1 (NetBSD-6.0/amd64/installation/floppy/boot5.fs) = 671ad9865cf186c69739279463e408504e89c072
+SHA512 (NetBSD-6.0/amd64/installation/floppy/boot5.fs) = 1a4329afefd19b3dbf37a12cb287aa771dfabdeeaf6b0302158eae0cde68d970a94a9643b4b18798654473c6eb577c8e555188a7c7776e6cccc05241a7b47c7f
+RMD160 (NetBSD-6.0/amd64/installation/floppy/boot5.fs) = 9e7000ef7b4a971936e74eb1858b0f74816d42f3
+MD5 (NetBSD-6.0/amd64/installation/floppy/boot5.fs) = 52824ec1c65bc87f196fe4fcd1887cb2
+SHA1 (NetBSD-6.0/amd64/installation/miniroot/miniroot.kmod) = dabc250e1cead594f5dea847da52d9ba2933b310
+SHA512 (NetBSD-6.0/amd64/installation/miniroot/miniroot.kmod) = a4dd87defdb602de2329e7397c503b075c1c373af8a0547e843040029aaf34595e117f11f9e184a69765386ed66283f3a9c994d2159e473792b4f49d45991cdb
+RMD160 (NetBSD-6.0/amd64/installation/miniroot/miniroot.kmod) = 92d16ace79c31254694e0b401abb19e659f7879f
+MD5 (NetBSD-6.0/amd64/installation/miniroot/miniroot.kmod) = df6ec580ac9753bd17f1e9aaada0be34
+SHA1 (NetBSD-6.0/amd64/installation/misc/pxeboot_ia32.bin) = 96287819b198b35ceaf13400e6852a472b0e86e1
+SHA512 (NetBSD-6.0/amd64/installation/misc/pxeboot_ia32.bin) = cad69e2c71ec9879adbcec03468172aa1c2b7dd2ae4d4b5315a7013a39a24667faa8610ab663d96d5d8229e74f8150a0afda03d3e308a54e67fb555bffba821e
+RMD160 (NetBSD-6.0/amd64/installation/misc/pxeboot_ia32.bin) = e226d78864e488c284063c1eeca1431babd8934e
+MD5 (NetBSD-6.0/amd64/installation/misc/pxeboot_ia32.bin) = a6cf18820ed6a4d823ae117148272279
+SHA1 (NetBSD-6.0/amd64/INSTALL.html) = 2ba66a1c4d70a9376ae64ba56e97acf97cb14064
+SHA512 (NetBSD-6.0/amd64/INSTALL.html) = 6fbece25fed2ab136a77f592975808e919260963a9be83b2d4ddbee6b9b24319fb08c6316f262fe208aba81e50d1156db6ad8e36974fecd6955608d807da4667
+RMD160 (NetBSD-6.0/amd64/INSTALL.html) = e4976765905456206ba0906f3d7aee383e80b5dd
+MD5 (NetBSD-6.0/amd64/INSTALL.html) = 9a1d1f0005ff232d9501ebe159d122b7
+SHA1 (NetBSD-6.0/amd64/INSTALL.more) = d1da705f0adc32b67801928824379ea45ddb70fd
+SHA512 (NetBSD-6.0/amd64/INSTALL.more) = f5e6d604726edc5759dcc63e32c046fc0f952b9e4357e331b3864d1074954db46f0a7295b63f6f3a2c5ecda4ad3fcfc568a6dfc7dc91db5559a768ad2f6fd6dd
+RMD160 (NetBSD-6.0/amd64/INSTALL.more) = 4b06e7cde85cdd8fef618f254e8a9136ff25e766
+MD5 (NetBSD-6.0/amd64/INSTALL.more) = c1d511b8ec407155635d1df1d3698af9
+SHA1 (NetBSD-6.0/amd64/INSTALL.ps) = dc0b32b40a813365cab508de06d4280a4ebe8496
+SHA512 (NetBSD-6.0/amd64/INSTALL.ps) = 62ad1a41b0101222de2a4aea45c32ed7a02a4b06d1fd86b1c4d35f6ac5605a3562ca21b815db8e27d67e4584a5e155bbf8d5dda842e165379f4efd962c19a4a8
+RMD160 (NetBSD-6.0/amd64/INSTALL.ps) = fc6b89c1155481439b4a4a66357b925227720d97
+MD5 (NetBSD-6.0/amd64/INSTALL.ps) = 833ee159c8aeb1456ad514df2b4da716
+SHA1 (NetBSD-6.0/amd64/INSTALL.txt) = fd054d29f49e793dec119508a0466e243d54d05d
+SHA512 (NetBSD-6.0/amd64/INSTALL.txt) = c5e9a67c9bcd990c16a13390db60ff432f4640434234dc69a412d2ebd57fd333ace7ea59dc5b3acc815ceef9077cd76cb26dc5d6fcc5ebaa5fc95a511928bd21
+RMD160 (NetBSD-6.0/amd64/INSTALL.txt) = 271a2919d0ff6fddc1bb771716e67a7319795f7c
+MD5 (NetBSD-6.0/amd64/INSTALL.txt) = 2de264a9a927f1f3513674ec16ac4d45
+SHA1 (NetBSD-6.0/amiga/binary/kernel/netbsd-GENERIC.gz) = ad3ce973bb574d84022cbc071997dca9377e1be7
+SHA512 (NetBSD-6.0/amiga/binary/kernel/netbsd-GENERIC.gz) = 23e227becd8364657d767347b251ca8f47efe9397b9a0cadec90aeb9e90372dc49f143026ca678d933acde69c9be780b50a589ce0cf164f61af8d4eb641f5c64
+RMD160 (NetBSD-6.0/amiga/binary/kernel/netbsd-GENERIC.gz) = 65ccd49cd01c0981f4b4a65914d59731492a9876
+MD5 (NetBSD-6.0/amiga/binary/kernel/netbsd-GENERIC.gz) = acb579f6a97b9a5909bebf16f2742b0a
+SHA1 (NetBSD-6.0/amiga/binary/kernel/netbsd-INSTALL.gz) = c3904eede4df412ea9a7db90f34009cdaee611dc
+SHA512 (NetBSD-6.0/amiga/binary/kernel/netbsd-INSTALL.gz) = 6087a06debbf2f6820f5c450495680b0f5356d2e5036e1a7787b02f9cd5c8c43da24069ac0cb14bf5b09ca5ff122905d0c26c044c361c27202b4aa9a561cfeba
+RMD160 (NetBSD-6.0/amiga/binary/kernel/netbsd-INSTALL.gz) = 8dcb009d9495e2c1f768e7900b28a263cafb1610
+MD5 (NetBSD-6.0/amiga/binary/kernel/netbsd-INSTALL.gz) = 635f24c98bd4bd94f42bf3daa9090b1c
+SHA1 (NetBSD-6.0/amiga/binary/kernel/netbsd-ISDN.gz) = c91b1e76e6f8d7b327728eb7110995968e56cb80
+SHA512 (NetBSD-6.0/amiga/binary/kernel/netbsd-ISDN.gz) = d1ba0cda42d6eaf9815f39a52429767c00769d671faaf7144c830f1d06dc5571c39e0e823a7764fbdfaad10a1f516385ed1d3d54c4053a913e8399e3a1d37084
+RMD160 (NetBSD-6.0/amiga/binary/kernel/netbsd-ISDN.gz) = 32dfb7318589e9e2445f781c1344f7b418b1b9e3
+MD5 (NetBSD-6.0/amiga/binary/kernel/netbsd-ISDN.gz) = efdc155fef394563fed3a0c32d90a291
+SHA1 (NetBSD-6.0/amiga/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/amiga/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/amiga/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/amiga/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/amiga/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/amiga/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/amiga/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/amiga/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/amiga/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/amiga/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/amiga/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/amiga/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/amiga/binary/sets/xcomp.tgz) = e13548b8974f5d55e98caf17b2b4bbbcf2430370
+SHA512 (NetBSD-6.0/amiga/binary/sets/xcomp.tgz) = e4b13c798df04ffef88e72100e2db5af400e5ae255cd7a1ca2907736b8138a59045b6f3bd8531b5753d0b87eadb1b5f801043a929bb25d1611e4be693c1da954
+RMD160 (NetBSD-6.0/amiga/binary/sets/xcomp.tgz) = 3b1f4e26ddd57e69afd9709553c1bf70d6e29ea0
+MD5 (NetBSD-6.0/amiga/binary/sets/xcomp.tgz) = 894bb9aa05b164d9923682165d708335
+SHA1 (NetBSD-6.0/amiga/binary/sets/xetc.tgz) = d2ca34bd668e108cbbfd4b45720823663339f8bd
+SHA512 (NetBSD-6.0/amiga/binary/sets/xetc.tgz) = 431ca465f300e7eb5d4dbd44c43e412a296fb4d3129217e752f86a720e8a8bdf736c9add05a45518a4f3e6cffa32381ef61e9186d360b68a5f8c64d87e385fb5
+RMD160 (NetBSD-6.0/amiga/binary/sets/xetc.tgz) = 4c5d664679856b02b694534cd6afdf20597e6d53
+MD5 (NetBSD-6.0/amiga/binary/sets/xetc.tgz) = 72bd67556ac14ea0ce147374af0ba624
+SHA1 (NetBSD-6.0/amiga/binary/sets/xfont.tgz) = 24ca4cb77a59246b1b05e0a91fed21c63259d12b
+SHA512 (NetBSD-6.0/amiga/binary/sets/xfont.tgz) = 8dc297fb6205a995767e68e77cc21169234dfb66a86bbcd2e1828fd32efeda0a25c9f2a9b1a39b97fe8d7b24f8cd5cf6160859af6be2259876f39ee4e76c405b
+RMD160 (NetBSD-6.0/amiga/binary/sets/xfont.tgz) = d2f134959940e6667aca185f01e388c05dc6bc85
+MD5 (NetBSD-6.0/amiga/binary/sets/xfont.tgz) = 3c96c1f0a13cd7d277ca35622ac9c058
+SHA1 (NetBSD-6.0/amiga/binary/sets/kern-GENERIC.tgz) = 295ba9f28d2b11af8b7ea93c0b4cec03e40002a7
+SHA512 (NetBSD-6.0/amiga/binary/sets/kern-GENERIC.tgz) = b762b6592db8439df6c8d7cfd26f509425c779dcb3d27face8aea6c50dec314c15124b6623152969d5a0998c6991050c5c18a4f547ff5027c8ef56e4d4b5baf3
+RMD160 (NetBSD-6.0/amiga/binary/sets/kern-GENERIC.tgz) = 566f5c6520f253fbd5c7043931b275811853e289
+MD5 (NetBSD-6.0/amiga/binary/sets/kern-GENERIC.tgz) = 3ef7c2157fd42c60a0c1c4c898855219
+SHA1 (NetBSD-6.0/amiga/binary/sets/base.tgz) = 863379dd24489824d8140df08e3f5ca5bb63c35a
+SHA512 (NetBSD-6.0/amiga/binary/sets/base.tgz) = 845fec5935b19d810896af3451bff4f2eb6b3b02b285e8e7651c3be32c60d2abacbbb614e3c11b96cf33497fbe6505458f9a292bb0393c54a764449b9b5dff65
+RMD160 (NetBSD-6.0/amiga/binary/sets/base.tgz) = 5c87d3799986d70963b0e02416ff7648602d31de
+MD5 (NetBSD-6.0/amiga/binary/sets/base.tgz) = c8b7075f670666c9492a46c44e4632de
+SHA1 (NetBSD-6.0/amiga/binary/sets/comp.tgz) = fad62d4d7c47d956a450773b817a838f30497212
+SHA512 (NetBSD-6.0/amiga/binary/sets/comp.tgz) = c8c85b7a59df5930e8cde1715b03c2ae7646d40902e2c402292308f8eba81132a155120215c763a68dd7f37ef489d786ee73911849b69cc9c9e3ba1e86de1bb9
+RMD160 (NetBSD-6.0/amiga/binary/sets/comp.tgz) = 46162e89fb8c66089ccf0523e3b3483834284284
+MD5 (NetBSD-6.0/amiga/binary/sets/comp.tgz) = f107b1d62d1535a4dc1052752837aecd
+SHA1 (NetBSD-6.0/amiga/binary/sets/etc.tgz) = 7a2e1bc8aa53aeea37bb71ae598886da762888c4
+SHA512 (NetBSD-6.0/amiga/binary/sets/etc.tgz) = 80d275882cc7df12a3ba35a9e101e1f4597c3cd16864026013be90f0a8e8ef2ab405b5b29dc39ed3e114fac9986dc05efb661cc4361cf4d05d4e6cb25462ae45
+RMD160 (NetBSD-6.0/amiga/binary/sets/etc.tgz) = 3b71a2cfee1368a862a75f44d249b85059f34bc6
+MD5 (NetBSD-6.0/amiga/binary/sets/etc.tgz) = e8fba82eea6cdabed070234fde1acf2b
+SHA1 (NetBSD-6.0/amiga/binary/sets/modules.tgz) = 412c02a1fe2bc42ffaa13e3b5cfe30ab89ca8066
+SHA512 (NetBSD-6.0/amiga/binary/sets/modules.tgz) = 0fcda39f953bfbeaae0480d14a4e36724296ff88185985aec0863d5730048da38dd37f5f609e4b085a4776fbf139e8ca3acd693e7a5827f5fa7f51b2006b1447
+RMD160 (NetBSD-6.0/amiga/binary/sets/modules.tgz) = 44f4e35271aa128a88c14913b82edc82f93ffb57
+MD5 (NetBSD-6.0/amiga/binary/sets/modules.tgz) = c0a7fed3fc40edbb00bc24975c10c011
+SHA1 (NetBSD-6.0/amiga/binary/sets/tests.tgz) = 3d5677828808ee833c1c65cf5ff5d1cf1f66611f
+SHA512 (NetBSD-6.0/amiga/binary/sets/tests.tgz) = 4d868f712f2e0e3e9b56e6f346934b71eb174d97ff197883f3e3d4923c3dabda651bb3fa3d172fcd32ee5d07b659e7639cff6d9c9450e605174d8a09a6ac730a
+RMD160 (NetBSD-6.0/amiga/binary/sets/tests.tgz) = 662e3dcc455114628676304b277a852a49597104
+MD5 (NetBSD-6.0/amiga/binary/sets/tests.tgz) = 84a17f9c5c7bb88e34f42e3a7cbdc490
+SHA1 (NetBSD-6.0/amiga/binary/sets/text.tgz) = 8153acee4263203531a66cdf71215db94d745bd9
+SHA512 (NetBSD-6.0/amiga/binary/sets/text.tgz) = 3ca801f17e44f701543140841123196e132f920d7ac5859dc2a5133da08b73f4d730cbfc62fee5ba9bac6b0d96cf4985b951aad33cf59d5470d7b99cadaf51dd
+RMD160 (NetBSD-6.0/amiga/binary/sets/text.tgz) = 5820be807d773054a2c25d0c0009141ddf4a3d5c
+MD5 (NetBSD-6.0/amiga/binary/sets/text.tgz) = 6640874a003b751e38fe8ecd14f001d7
+SHA1 (NetBSD-6.0/amiga/binary/sets/xbase.tgz) = c2df6e9a1c3bdae97964577118ae358efe3e3f38
+SHA512 (NetBSD-6.0/amiga/binary/sets/xbase.tgz) = 4751bb14d6a5da31d95ab7e5cef52fcba99b8e13b8379f7fcff8aafe8116c4a036553adf4e6e9bed1642cf39b8e3de6a4e29a37ea48d1363dad853ef3d198604
+RMD160 (NetBSD-6.0/amiga/binary/sets/xbase.tgz) = cbeb269f4126adf0e3e9894888047f70a42f1d6d
+MD5 (NetBSD-6.0/amiga/binary/sets/xbase.tgz) = 03727cb263b9f50dfec22ac09d5d0543
+SHA1 (NetBSD-6.0/amiga/binary/sets/xserver.tgz) = 3e746f532be1a2ea1d5d38894bf0be416021412a
+SHA512 (NetBSD-6.0/amiga/binary/sets/xserver.tgz) = b90fcec5aea23879b3c39aa516e1c658064d35e8dc8172fac9f722b9c08f71a73f3a33d84dc618c88bf368156e9e4bf220f3cbd110f66bd213838fef73af50f3
+RMD160 (NetBSD-6.0/amiga/binary/sets/xserver.tgz) = c50619861d88fbc22413aca3bad38cb33065b590
+MD5 (NetBSD-6.0/amiga/binary/sets/xserver.tgz) = 5ac22d2440ed272bbebec827a0134acc
+SHA1 (NetBSD-6.0/amiga/installation/miniroot/miniroot.fs.gz) = d83dc1458c18c0625f767f00066eff80547ee71f
+SHA512 (NetBSD-6.0/amiga/installation/miniroot/miniroot.fs.gz) = 415b4c824c4efdd1c8fd597c6c8222c26d77e56f6f36bcb65d9e7eb3882c20f3c452f05b4541a0832590e53a67b12423d21196626fcc7c1cad4992648a98e136
+RMD160 (NetBSD-6.0/amiga/installation/miniroot/miniroot.fs.gz) = 4cf219c14c3c367d95ff4aa4cf04dba379ee16c7
+MD5 (NetBSD-6.0/amiga/installation/miniroot/miniroot.fs.gz) = 1bb2a3735737d2af8155407157cb2120
+SHA1 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.14) = 32e902d420c2ba8498854bd26387369b09efabb6
+SHA512 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.14) = 3fe58857d83d88f1fc7f6e29e8ee079be25326abad3a25ba5f64e3429f22f08ef102551e15c4275fe973d5536a5d459edea384fdd2293f68fe6d293801fba85c
+RMD160 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.14) = 17a84971cee95ff8bf1b64d5071bd1fdbdbc5a99
+MD5 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.14) = 1f841716409b236df90d9c5d63332edf
+SHA1 (NetBSD-6.0/amiga/installation/misc/loadbsd) = 2c8e314ee812e159ea479bacf09c47a2a4911e17
+SHA512 (NetBSD-6.0/amiga/installation/misc/loadbsd) = 881d3187366e2736e65e22bae93f24afd0b34b841b733898d3d172d98084f1729b19a6277445601da35471e3583e98b86008262b1a77dbb8bcc37e0c03d07b32
+RMD160 (NetBSD-6.0/amiga/installation/misc/loadbsd) = 00249c76e9a57ed5e58efbdc1001f782595c3918
+MD5 (NetBSD-6.0/amiga/installation/misc/loadbsd) = c1cc983600053a7de29feb09d703754d
+SHA1 (NetBSD-6.0/amiga/installation/misc/device-streams.tar.gz) = 5b96fab4bbb49a985481dc5c1e2830e994bd88ec
+SHA512 (NetBSD-6.0/amiga/installation/misc/device-streams.tar.gz) = 88e35b476d60dd988e8056263fc4f86893c5a7c2c3125934db8d728e3b679554b229b2adc3babf8c2ff21af46530eea1ff30e4b6af550b331ad22bd29e18434f
+RMD160 (NetBSD-6.0/amiga/installation/misc/device-streams.tar.gz) = d0444d1e967a624fde15e4526f9c7f673566492d
+MD5 (NetBSD-6.0/amiga/installation/misc/device-streams.tar.gz) = 6a3eed6278587660ed543c7449ee571e
+SHA1 (NetBSD-6.0/amiga/installation/misc/runbootblock.README) = 2d62005b98533a4fffd7d0445ac8cb7c5ac11c59
+SHA512 (NetBSD-6.0/amiga/installation/misc/runbootblock.README) = 9f071ff7ac0d2eabc77d43faeee48cba3a1883c957b046fad4d7d3237f41d2752a1e010a5d9f5324f90b81bc9968afe425d320e6742ac8f5e081056d5e133baf
+RMD160 (NetBSD-6.0/amiga/installation/misc/runbootblock.README) = 872a2169c248b016d6782a6b9c4208c67a346d12
+MD5 (NetBSD-6.0/amiga/installation/misc/runbootblock.README) = c60fe181cd9b255e294bfeb4be411181
+SHA1 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.16) = eb660b987186a4e3a4eccb740dbb9e061a4b7216
+SHA512 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.16) = 0f4565e2de70eaaf1d973da2b4a988e794b4608b2b0fa9c84dd05c82ade92fc4b75339e94e4a593e051ab3a364611fd7dbc2b48dccd4906f7b42fb665f7d711c
+RMD160 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.16) = a071897afbdd11655a21df5a89c6e49b6e8a3574
+MD5 (NetBSD-6.0/amiga/installation/misc/loadbsd-2.16) = 8e67fb434887e942fe63cf308195b18f
+SHA1 (NetBSD-6.0/amiga/installation/misc/rdbinfo) = e413a8a5631dfedb4b1634c709836d1f92d9b08c
+SHA512 (NetBSD-6.0/amiga/installation/misc/rdbinfo) = 912ddb9bd1ba1af07e1072fee9a09f22124792abfc8f4f178a5df66dad17c39211c52d2a581111338a523f17a0dd58315d798659e901f14084d62a8c890e0a44
+RMD160 (NetBSD-6.0/amiga/installation/misc/rdbinfo) = 8fb8b41e39f6c2d48b6b46be0433dfc45c353621
+MD5 (NetBSD-6.0/amiga/installation/misc/rdbinfo) = 027c4bfce639d3cb88d617b0e85c0c4c
+SHA1 (NetBSD-6.0/amiga/installation/misc/runbootblock) = 598d688badd592a838dc260ce36b84c7835e72c0
+SHA512 (NetBSD-6.0/amiga/installation/misc/runbootblock) = d4cf9fe94244f1a832a6e474ff777ae7b901e86e0aabbbceb356c42f533dadb370686080b8e64993b9e07502310a4140fd393db5ddbdcd7a9e44c86b20f4c0a2
+RMD160 (NetBSD-6.0/amiga/installation/misc/runbootblock) = 2457b64f16ee58d22bacdf407ef35a1e9d244e1f
+MD5 (NetBSD-6.0/amiga/installation/misc/runbootblock) = d4d059566ad067e4d60259b389a5a9c3
+SHA1 (NetBSD-6.0/amiga/installation/misc/xstreamtodev) = eaf846a0d81754fb778b070926c495720cecffac
+SHA512 (NetBSD-6.0/amiga/installation/misc/xstreamtodev) = 873e7ffa5686a69b4a0ad68626f5e32176c03fc6231072531b36af3d0c0c055ced63e6c7f5cb0f3c6568f47720f31b76140aeede3f3dd9ddc8b639c6b3bdd5bf
+RMD160 (NetBSD-6.0/amiga/installation/misc/xstreamtodev) = 16910f7f243ca8ae74b8ff90d89163edbd4c3fbf
+MD5 (NetBSD-6.0/amiga/installation/misc/xstreamtodev) = a9e2e97f7945cf34da63aef17bed0f3f
+SHA1 (NetBSD-6.0/amiga/INSTALL.html) = 42ae087edd4c644275cb6a351bfc0801a23f7b41
+SHA512 (NetBSD-6.0/amiga/INSTALL.html) = e3f4389bff567192811d94c90b1df6d35d379774173ee935b2ebacf6ebc04edee9d270a71cf1e312bb52cfdfdf3ea7fa50f3cc6058bef88051f6da2953faefe0
+RMD160 (NetBSD-6.0/amiga/INSTALL.html) = 941e3e7501290a6a596c10bb9e9dce71fd68f01f
+MD5 (NetBSD-6.0/amiga/INSTALL.html) = ca5a2dcf7c5a927f0f89edabd084d59f
+SHA1 (NetBSD-6.0/amiga/INSTALL.more) = 2ef7c56d3b3789f858d82b96f8b955801feb402a
+SHA512 (NetBSD-6.0/amiga/INSTALL.more) = e1f87c081f267bb5bda5f1f07467e4081b3289cc1b5eead1ce26e954acf6704ad86ac95fb8958130f0a5b198eca80b967c7089cdc35ba4399cc79ab822df2ec2
+RMD160 (NetBSD-6.0/amiga/INSTALL.more) = 55a90159f299abe126ea37f0becea2f692fb1595
+MD5 (NetBSD-6.0/amiga/INSTALL.more) = 1357d2cc09f7d5429c5790dd32592032
+SHA1 (NetBSD-6.0/amiga/INSTALL.ps) = b4a7420ef6502bd98009c6f7b79053a076881f28
+SHA512 (NetBSD-6.0/amiga/INSTALL.ps) = 295f43cd3ba4b64deec0652bab61802cc37a7c3e75cab305cd0e12a682822a137abcd0915115709e1147e952b87bbb128e53251625288ba58068a52e491dd0da
+RMD160 (NetBSD-6.0/amiga/INSTALL.ps) = 07a4ea8478343a0f6a1e935eca5133ab116b5779
+MD5 (NetBSD-6.0/amiga/INSTALL.ps) = f07315266b0fd45fe58f107dda2177f8
+SHA1 (NetBSD-6.0/amiga/INSTALL.txt) = 6f5c90d805c69d5c75efb96b3b579d49bb123a6b
+SHA512 (NetBSD-6.0/amiga/INSTALL.txt) = 2fba02db405672d44df143421547a2291272a56f6d6e37b5da1f0396739ac55c695178c2e115a5af8574d6c323c8adc2747073e799b59d4e886191ce1baeb5cd
+RMD160 (NetBSD-6.0/amiga/INSTALL.txt) = 18db9a1a6e4af5935ed15d37c218b0309309c95c
+MD5 (NetBSD-6.0/amiga/INSTALL.txt) = 23deef4d8fd55d404915f004ba0fde9b
+SHA1 (NetBSD-6.0/amigappc/binary/kernel/netbsd-GENERIC.gz) = 1fb8ac599ecb67083a0505f7767600b5a00e6164
+SHA512 (NetBSD-6.0/amigappc/binary/kernel/netbsd-GENERIC.gz) = a41b53fecaa5077d80a2a6191073785c87ef703a4cd17e45ea1064e64c923fbf9d97edcc1c4e58ed205ea85f070f80a992198943a9384f4af473a11058c56d4f
+RMD160 (NetBSD-6.0/amigappc/binary/kernel/netbsd-GENERIC.gz) = b9f459e21e09ac314b2a02a2ec1a5ef0841af3d0
+MD5 (NetBSD-6.0/amigappc/binary/kernel/netbsd-GENERIC.gz) = 8c59d3085078659f9fd319d69ea1bc0a
+SHA1 (NetBSD-6.0/amigappc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/amigappc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/amigappc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/amigappc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/amigappc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/amigappc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/amigappc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/amigappc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/amigappc/binary/sets/kern-GENERIC.tgz) = 8cfda7d67d00c0344fc8b7e15c14367c9dd3c0d0
+SHA512 (NetBSD-6.0/amigappc/binary/sets/kern-GENERIC.tgz) = 00ecdc9511f389035fdd0d5786ec5b16ea52722cf390b75b11c0d0c5504d96bdfbaf6b19237e752aba9d530ed80cdaeadf18a7d0079c22a1560644fa8fb2ffc9
+RMD160 (NetBSD-6.0/amigappc/binary/sets/kern-GENERIC.tgz) = 0508773016c4dcf8b88d238235c66fc61785c0fe
+MD5 (NetBSD-6.0/amigappc/binary/sets/kern-GENERIC.tgz) = ada4ef952407ea1d320765955f626aed
+SHA1 (NetBSD-6.0/amigappc/binary/sets/base.tgz) = 69692adf17c4631804d6e78e96868bf22a0f80e4
+SHA512 (NetBSD-6.0/amigappc/binary/sets/base.tgz) = bc3f89b3201c184f38bed2dcd3e74ce01a8c9b5cdba1065bfe5bc0eadf0ed71fd73bcb9d0add77ab7d2cfc4848f40c482b0e2cbf50771577716f8a344eda5a6b
+RMD160 (NetBSD-6.0/amigappc/binary/sets/base.tgz) = 3cb20928324c3bf484a05a04d47afa4f587d5d52
+MD5 (NetBSD-6.0/amigappc/binary/sets/base.tgz) = 00d35c074b0f69e81494f42cd43ccecd
+SHA1 (NetBSD-6.0/amigappc/binary/sets/comp.tgz) = db98cb19c33216dafdd0ab26cbfa2a4f0cc685e7
+SHA512 (NetBSD-6.0/amigappc/binary/sets/comp.tgz) = 7dc6b1ed24deecd9f29aae5867bd2d89c9df3f443d522315f541eae77fde420d15b63233694043595a0f12491af5e24699598acc45ed05d9622911869f79ceb9
+RMD160 (NetBSD-6.0/amigappc/binary/sets/comp.tgz) = 776b79b7b476cc3b4caee7712070864d35779f66
+MD5 (NetBSD-6.0/amigappc/binary/sets/comp.tgz) = 385fe9939b6bb28a37cdf9cc3958dba8
+SHA1 (NetBSD-6.0/amigappc/binary/sets/etc.tgz) = f424a289be42a94c875757d9f83756d7e9286f20
+SHA512 (NetBSD-6.0/amigappc/binary/sets/etc.tgz) = b736da20bee72bb1962acce7cb8cd51e851f541ec79766d2258f1322ae843b0879208a6f69d6dda9ecc74a4bf7739fed626b8205432dd63f630b04803418307c
+RMD160 (NetBSD-6.0/amigappc/binary/sets/etc.tgz) = 0f163aa3a9450f45b40760786373089e52dae0bd
+MD5 (NetBSD-6.0/amigappc/binary/sets/etc.tgz) = c2cb43cbeb231d24b3864c7882da8edb
+SHA1 (NetBSD-6.0/amigappc/binary/sets/games.tgz) = d10c319a009f9859de37a5d5bb994d29669dce16
+SHA512 (NetBSD-6.0/amigappc/binary/sets/games.tgz) = 59e00cdf1b42e285db9cd29ab195b693f1989cd1480e644787307ea722a1a695e70708ad8fa6d0afbbb51de4ca8a4b81b550e2f1745d0140a47e1b6a7002a236
+RMD160 (NetBSD-6.0/amigappc/binary/sets/games.tgz) = 0baf65f6198b6f1c40960b30424a3ad44c1eca2f
+MD5 (NetBSD-6.0/amigappc/binary/sets/games.tgz) = 304dc86d68c23c7f30c30e4f092b6982
+SHA1 (NetBSD-6.0/amigappc/binary/sets/modules.tgz) = 2a05a8cf525b6b0323f54840bb42e069a36f1988
+SHA512 (NetBSD-6.0/amigappc/binary/sets/modules.tgz) = fc33e9c609d38775e7004d2715158178d08508f8a890831270191b7f32fae8a2d2b56e74e59d4f5d37574827cf85eda28e15f88ac1544a1ceec008105107dcb5
+RMD160 (NetBSD-6.0/amigappc/binary/sets/modules.tgz) = 931d81973e92a161da6468aeeb0b7a486fc96511
+MD5 (NetBSD-6.0/amigappc/binary/sets/modules.tgz) = 13f7ee97c852a71b51c91dd8f659b202
+SHA1 (NetBSD-6.0/amigappc/binary/sets/tests.tgz) = eee320cd38b5396a305b912cd43ad4f40dcb0e98
+SHA512 (NetBSD-6.0/amigappc/binary/sets/tests.tgz) = 3c2377b75fb69924c646904f67e3762bddbd5fe40214df319d205f412e7377e7695d5b648545f22e9b42696cb3fd3ddb9bde4ed7b3ad1d48ea32fbbf13356354
+RMD160 (NetBSD-6.0/amigappc/binary/sets/tests.tgz) = dd0ea2b9c6f23f409ced129c5dc847c582b572fe
+MD5 (NetBSD-6.0/amigappc/binary/sets/tests.tgz) = 2f0dc32c95f23026c06b50c946dce965
+SHA1 (NetBSD-6.0/amigappc/binary/sets/text.tgz) = 7b28a25a69ba9d2870c31c302be38d0c12b11486
+SHA512 (NetBSD-6.0/amigappc/binary/sets/text.tgz) = 77dcaa1c134ac4f346bf782c5c20ea4304b42a15a60a1321e944e59665946d1b3ddfcd9eba919f6ea4ca947dd8df63a9162adfea363e01758ffa5bf8e7f49e12
+RMD160 (NetBSD-6.0/amigappc/binary/sets/text.tgz) = 438d720340cbd19f86ac8449dd705d125958cdbf
+MD5 (NetBSD-6.0/amigappc/binary/sets/text.tgz) = 3fc18e1ff4fc50d561b478b39fe7f855
+SHA1 (NetBSD-6.0/amigappc/binary/sets/xbase.tgz) = 11ec98aff57d5a8f8cabcc0a41eb7e41c2cd750e
+SHA512 (NetBSD-6.0/amigappc/binary/sets/xbase.tgz) = c9c39d05fa60bc2a0e1a4aed89ecfafa47c203652f23b971fa9b3d23df291fbeb4735dd4621a81a46eff276c80410ee36492162e5282bf19bc9df4bf889d4fb8
+RMD160 (NetBSD-6.0/amigappc/binary/sets/xbase.tgz) = 4d1a32acb55c107327f1605a6a7d3379e3e3fbc1
+MD5 (NetBSD-6.0/amigappc/binary/sets/xbase.tgz) = 0a959da0b8e03e2686da275c8311addf
+SHA1 (NetBSD-6.0/amigappc/binary/sets/xcomp.tgz) = 5a450d9cb090214e14b45d59ee87d7786da4afcd
+SHA512 (NetBSD-6.0/amigappc/binary/sets/xcomp.tgz) = 2478cf90ce45e16d8854bfc2aad28d102aafb53f9b2fd39756bff0970c0546f52a3d31be85e581ae78e982b06f17a8de77eea776d7d8e0770e00a0e198c06bbe
+RMD160 (NetBSD-6.0/amigappc/binary/sets/xcomp.tgz) = 82323c0e4b56e79891087934eed15d1472646bec
+MD5 (NetBSD-6.0/amigappc/binary/sets/xcomp.tgz) = 096eaba339adb8b492dc1ce5de1dada0
+SHA1 (NetBSD-6.0/amigappc/binary/sets/xetc.tgz) = 98fd5a6cb8eab73e8453afe8626198945e0cd1e4
+SHA512 (NetBSD-6.0/amigappc/binary/sets/xetc.tgz) = 13b0c70af019c1e2bf14c8df794f497c317cc94e23012f61b88e7386327cd43c6a7b00a04ed4d65975849db9978fa63b401a2d1a49f0d476e17e4d5123d66e8b
+RMD160 (NetBSD-6.0/amigappc/binary/sets/xetc.tgz) = ce7639ef1eebd525f0f6631e4aa80a5d44a9ba5e
+MD5 (NetBSD-6.0/amigappc/binary/sets/xetc.tgz) = 2bdf6c00be2e1b9420a8d6fd6ab9e285
+SHA1 (NetBSD-6.0/amigappc/binary/sets/xfont.tgz) = f87acd8ea1747d825ad1038f8984bfd9cc5ed3c8
+SHA512 (NetBSD-6.0/amigappc/binary/sets/xfont.tgz) = bd4c6c5913572cfaff4c3cdd66d2e745605d4f8c70f46e25951c109700c4a05a4b8d1202beb90b7b0cb5ba7b37bdcb3bc31a5ddba8737b7133fa3c2239312f62
+RMD160 (NetBSD-6.0/amigappc/binary/sets/xfont.tgz) = 6ff6daa8eff23cd8f49f60ac7adf82afaf029a02
+MD5 (NetBSD-6.0/amigappc/binary/sets/xfont.tgz) = e9eb507d880069bb39bca1e12ca61f05
+SHA1 (NetBSD-6.0/amigappc/binary/sets/xserver.tgz) = 5dca2b2f9ebbdd6d659e06bdb69987fe02278968
+SHA512 (NetBSD-6.0/amigappc/binary/sets/xserver.tgz) = e2e87ac352cbadc9e0590b7ddc402de6dc4ee3fb26a504265aa1a706ef53135fb80d0d3e149e94825485fd121add254d68a88ead521949f55da7d9e252192575
+RMD160 (NetBSD-6.0/amigappc/binary/sets/xserver.tgz) = 94ab84cf7ee91393ef0630b7b3110a4846940dfa
+MD5 (NetBSD-6.0/amigappc/binary/sets/xserver.tgz) = 6ca7773bb022c8842ce6a0a4a0f23c80
+SHA1 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.symbols.gz) = f4e479e3fec7462469600527ae1b9aecd1c86bcd
+SHA512 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.symbols.gz) = 8cd3e3d089a53b56fdd47ab4cda09b42bf12c92074699a3764f4fdbb23c58425d68f0ee8e862987386d9c8107e0e115daf39bd35058b4e51d93c4dc7d5756d04
+RMD160 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.symbols.gz) = 79dd220dcba4f30fd629e744993e3d8617d2c3ac
+MD5 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.symbols.gz) = 2ffba67d5ec969424a75c71e5f04c77f
+SHA1 (NetBSD-6.0/arc/binary/kernel/netbsd-GENERIC.gz) = c34a668c8d951cd778d973a0066223bd4ea98133
+SHA512 (NetBSD-6.0/arc/binary/kernel/netbsd-GENERIC.gz) = 47685372141fd6fae114fcbcc57016c6896f96705be116020802c6e6a7493cbea9ecf62dbbfc89c49f0f90d42aee1f06b9d6ed3eb679b0b1e3e2705c3ff0ec1c
+RMD160 (NetBSD-6.0/arc/binary/kernel/netbsd-GENERIC.gz) = d46270739b1bc29e7e361805d4f23a28ced95975
+MD5 (NetBSD-6.0/arc/binary/kernel/netbsd-GENERIC.gz) = 046973b3c11b35cb476d07db96419743
+SHA1 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.gz) = 01c3eb7eabe2423ff73da425627b361ff99bbe21
+SHA512 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.gz) = ae090ee3642160ed2ab38f6cc1487b545cce31320c8561bb4af5501dc757f24997798a7556a2048cd7f7e0da9ad3415e458273245317bcacafa0d9b76f4326a8
+RMD160 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.gz) = 9bd6a441f8fbbf01f78b536d75bb8cfdaa56f8cd
+MD5 (NetBSD-6.0/arc/binary/kernel/netbsd-RAMDISK.gz) = 6103f4c89298eab52773ed2a6fa59de6
+SHA1 (NetBSD-6.0/arc/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/arc/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/arc/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/arc/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/arc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/arc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/arc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/arc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/arc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/arc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/arc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/arc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/arc/binary/sets/xbase.tgz) = 76468fcada5a9e26652aa9f0f9f3c94829a317e9
+SHA512 (NetBSD-6.0/arc/binary/sets/xbase.tgz) = b2adcfc2dedef30b21b885c8fc757d0479541744a280a9997fbeaa9c881009ab4b0019e0001a540a8eb6db5f84db87b365e420bb2d4270af209821bdb080369c
+RMD160 (NetBSD-6.0/arc/binary/sets/xbase.tgz) = 1e0074d03d9fbb3373e0a427b25cc7097bf6d3c8
+MD5 (NetBSD-6.0/arc/binary/sets/xbase.tgz) = a8f29ec2e3768405942f97af3dd08ee7
+SHA1 (NetBSD-6.0/arc/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/arc/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/arc/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/arc/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/arc/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/arc/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/arc/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/arc/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/arc/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/arc/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/arc/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/arc/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/arc/binary/sets/xserver.tgz) = ff805022f409202f3346c45475c7ec0f8187218e
+SHA512 (NetBSD-6.0/arc/binary/sets/xserver.tgz) = f2bb3810a5572b519980126a3d934f63b5ab5c2fcf9fb8166c556bd3cc14cfaa151d582086bb1506ac9ac7e21d4e70a5cd5c3faed96212d8a14a0b5bafdcc4c1
+RMD160 (NetBSD-6.0/arc/binary/sets/xserver.tgz) = d5ae336337cc77f7f55f542b3457918d6fc0efe8
+MD5 (NetBSD-6.0/arc/binary/sets/xserver.tgz) = 92447a1560887d337d22e2deed0670a6
+SHA1 (NetBSD-6.0/arc/binary/sets/kern-GENERIC.tgz) = a49dc5701671d377df81d0dc82ebca225e8aff4a
+SHA512 (NetBSD-6.0/arc/binary/sets/kern-GENERIC.tgz) = 75bf73c2b22aac1948b5c0fd6ca0a0d240fc398baf7dfe4bbb155f44c8e3bf47d618fb5ee97215728baa471c25dddc285643064acbfed88fcc33f463ec36162a
+RMD160 (NetBSD-6.0/arc/binary/sets/kern-GENERIC.tgz) = 49075dea0d02de7d508afb65fa4c4591f7ab1b0a
+MD5 (NetBSD-6.0/arc/binary/sets/kern-GENERIC.tgz) = 3dd1b55b9d8aaa84ce5630c649d6d17e
+SHA1 (NetBSD-6.0/arc/binary/sets/base.tgz) = 5c25c736260c32dc5e61db84d779f979421417c4
+SHA512 (NetBSD-6.0/arc/binary/sets/base.tgz) = 7bccf72e05a792158f7aa8617b270d860221b935c3c092da8961b35277931500f5e6e8a572536b7371e66dbe7368b17f62512783240dce9aa2990af50c60fc1e
+RMD160 (NetBSD-6.0/arc/binary/sets/base.tgz) = c36e7a0c39a18646de9363196aa56dd0c4a6ea6b
+MD5 (NetBSD-6.0/arc/binary/sets/base.tgz) = 97e2836870812371a84cf44790cf6f16
+SHA1 (NetBSD-6.0/arc/binary/sets/comp.tgz) = 52ac953130a36ae6bba2139c7892d6ccbab0f0cf
+SHA512 (NetBSD-6.0/arc/binary/sets/comp.tgz) = a09590c181019592ffb4341620eeaaae1f25e971ee975ac337c96cdc5dc6ceb2074dcba6a5dcc723c30e5db3d32148146eb6c1eb38390d0162aff4d5071434c6
+RMD160 (NetBSD-6.0/arc/binary/sets/comp.tgz) = e9c5ae0abd43a2ac743f62a498ad8bb0dde61ed2
+MD5 (NetBSD-6.0/arc/binary/sets/comp.tgz) = 2eebbc2b1b8bbe21166a0d860bea9dd5
+SHA1 (NetBSD-6.0/arc/binary/sets/etc.tgz) = cfa766b3b33eeae2aa28312e0ca6e434e2573487
+SHA512 (NetBSD-6.0/arc/binary/sets/etc.tgz) = ef3806802fa813b1bb60674c032f31e5a140b89953aabe715d050e7c820413ae991de791e96d8aecaa1aea8989f6f0268726ad5dc62e42ef06ca6670fb6744ba
+RMD160 (NetBSD-6.0/arc/binary/sets/etc.tgz) = 395630144133efd05b0fbe596773c5ea4218aa8c
+MD5 (NetBSD-6.0/arc/binary/sets/etc.tgz) = af810d6fb839f2953bba9844501cdcab
+SHA1 (NetBSD-6.0/arc/binary/sets/modules.tgz) = cfd582b6f65203d1916ed6655d02f5aa6ad5ba88
+SHA512 (NetBSD-6.0/arc/binary/sets/modules.tgz) = 86be394fe232856d0de502fb1569fd03de91a81ad782389414ed75618d63d97d8abebc14fd44843414d865071f51940c248d076a57524e8ef91c791ee98620c9
+RMD160 (NetBSD-6.0/arc/binary/sets/modules.tgz) = c63e9a0caaf005f8c03275c8faf582d95b3c6700
+MD5 (NetBSD-6.0/arc/binary/sets/modules.tgz) = cd4a56dcabef37fbf7a3fb7ee95ea738
+SHA1 (NetBSD-6.0/arc/binary/sets/tests.tgz) = 25fca6e0ee3c0c05615fb5753d78584e0c3fd5ca
+SHA512 (NetBSD-6.0/arc/binary/sets/tests.tgz) = 54fd09bdf390959e4a795af7efa34cf463f0d41676a87bceae7e8278f97693549bea10d7de099c0f3af34f58ea76820ecd357894d9c7e5bccc65d2fa9736dd40
+RMD160 (NetBSD-6.0/arc/binary/sets/tests.tgz) = baf5b98a820547d80922493f59c48028345306da
+MD5 (NetBSD-6.0/arc/binary/sets/tests.tgz) = 601e2f0d37d00e07a671ed2cb823e68e
+SHA1 (NetBSD-6.0/arc/binary/sets/text.tgz) = fe43613098e27d16d74e9c21e0b18cc5e932e673
+SHA512 (NetBSD-6.0/arc/binary/sets/text.tgz) = 4935e883c8328121eb941726a41487dc9048a9d3265460e9730465a3d1b8283e4bd01ad2c220607848f898f178dac0738c6bb6402243bcc338e5f933a6c99f06
+RMD160 (NetBSD-6.0/arc/binary/sets/text.tgz) = b57da314266be1fdf31856f5ad5a52703016b61e
+MD5 (NetBSD-6.0/arc/binary/sets/text.tgz) = 9236a9d595f3a96234ba9156ed3437e2
+SHA1 (NetBSD-6.0/arc/installation/boot) = 889f35138bde05f74032980aa2ca7c17442c4324
+SHA512 (NetBSD-6.0/arc/installation/boot) = 9a1ccabb379ab44784c481e749f633cf4235c03e22c24f2a837e6fcbe28b23f7bde8a7ed596dde93996bdc5efbf639ed6a073fd848eef2b0d80e932ba360c9e5
+RMD160 (NetBSD-6.0/arc/installation/boot) = 369fb440abfca5f2f4340740265f61a9d2ca8df7
+MD5 (NetBSD-6.0/arc/installation/boot) = 36b7e6f86ddc8aede5c9ea0160939cb2
+SHA1 (NetBSD-6.0/arc/INSTALL.html) = 0cf4b01d7175a1eb6dd2734e412c3bed0fb0967d
+SHA512 (NetBSD-6.0/arc/INSTALL.html) = 68a51695f6fbe96610354b253741efcd7f52bd543351a3f3b734398264f7b75c03e72ee731be917b2e34a0041c621107177efb57ba9abe6158456e19526845db
+RMD160 (NetBSD-6.0/arc/INSTALL.html) = e174f77ca32ded5ae5363e88ca33ec17df6b95ae
+MD5 (NetBSD-6.0/arc/INSTALL.html) = 94eb6340dc1e3d6ae7b539e3ca3744a4
+SHA1 (NetBSD-6.0/arc/INSTALL.more) = 6146391a310edb4727d4b5a61793d535c0983c0d
+SHA512 (NetBSD-6.0/arc/INSTALL.more) = 12e1ebc08bd3fb259caafd6b75e1120daba07fb4ad201f513459e5e36ad96790a26076cf154b34332a54192cbda13bf0b85847478a2443114522225f1adbf95d
+RMD160 (NetBSD-6.0/arc/INSTALL.more) = 52a7433c4a3fbb3fa6ca52117f9f902a96748dee
+MD5 (NetBSD-6.0/arc/INSTALL.more) = 9a6a3c4c52c723151ac81fc40567f625
+SHA1 (NetBSD-6.0/arc/INSTALL.ps) = ed6ce1da53cd979819a5080666fef04c62c3cf60
+SHA512 (NetBSD-6.0/arc/INSTALL.ps) = 8ea3bef19288069a145d6873030895c960811c8dbcff956101f425a9ce0a57701f0f0579c925248b5ecc9f7ac110ddcb18b8041ed74ffd69c22b598ce8d89788
+RMD160 (NetBSD-6.0/arc/INSTALL.ps) = e1c8d2d8ef5b2d170f659f14bf124063d8d34c22
+MD5 (NetBSD-6.0/arc/INSTALL.ps) = f97b10a669be7ec3f9603d5f936fe9fe
+SHA1 (NetBSD-6.0/arc/INSTALL.txt) = 799c2e5d3f8a8d4c93e0ba1e0e738dffbec98504
+SHA512 (NetBSD-6.0/arc/INSTALL.txt) = ed89213d84a4ce5ca43b8b7ed35b6e2e731c77205518b8c48258b18567ecc6e2150e81c2d2a4ca0b3c2bbf8059218d0cf918b168c2f55b305815f89ce3cb45c7
+RMD160 (NetBSD-6.0/arc/INSTALL.txt) = d9be36fb053f75805f95439723d18875e6d0cd5c
+MD5 (NetBSD-6.0/arc/INSTALL.txt) = 56f07f0f3cd11f592b56f5978d23c533
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-ISAIDE.gz) = abe68fd4d9212fee55be19e05105bed9ee51687b
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-ISAIDE.gz) = 759476c2983250d38267853ca369a432b968e9d8187ae8476d5e2931667518abc63fadef50c6bcf55299866c019d74790e8268b58f433c6413c03cfe1460d8a0
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-ISAIDE.gz) = defe3e00a5198a97320f53a1460eb7601f2d5a9d
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-ISAIDE.gz) = fadc1a2fcec83bae67e6e70f1ee8d4c6
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-ATARITT.gz) = 9d2e04ce73a5a24cfb10801c0ccf659242602dd3
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-ATARITT.gz) = 27b28318b371707290e3b8482dc0e98e32c6d5b7fb4d38e3bddda7bc5e1b953ae0651b680cf7ea9a296018b5a0ac883cb59d4da3c02db1baa67e151da783f6ed
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-ATARITT.gz) = 77d47ef664e710823cef2633c92bde054a970552
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-ATARITT.gz) = f99c55c64e84c84de3991fa4f21897c5
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-FALCON.gz) = 9c0e5bc223f81e24108dde3428ee8833e557d891
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-FALCON.gz) = 6147ba07227f85a3ba2ee1e78449aa2c4e0ad708e9cc000f456a74a69f6443f099e200f2dd3602ceb453dffe7b41c90c32f45ff63d44d59cd0ce24ba68f3ffa1
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-FALCON.gz) = b2c8d8f4742da6ccf1e0ec3811160d9ce9606baf
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-FALCON.gz) = 2189a16e1ee3e1586f691490fe6bfc9a
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-HADES.gz) = c4f3101449a14e294394b13eacff10053078ad4d
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-HADES.gz) = bef4589fa86a33df94fdb36038e93528984629682c2827ed4dad582ae17cfea37b9841608dacc95fd8a55c57c40a81b8d24d7afd253dd46d7af970e0927518bc
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-HADES.gz) = 821bc772711ece35be32f1fadac8fa31a10041ac
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-HADES.gz) = 82b69e45fbf4740774a338f62c987dec
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-PCIIDE.gz) = 4e056fe210771d7d97ad303cc4d92fed64d883f2
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-PCIIDE.gz) = 2c303e9421be0eae122cf55c2b5205b4c2129e6bf3033372f8fca93ad410f92137db6463ad9b75db53526dccb2b9c8a3da23d04357a6a3663aa58972c39184ad
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-PCIIDE.gz) = 878a29fec55b0429c47f0932facf25139721c88d
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-MILAN-PCIIDE.gz) = b2e52ec52845325caf8fce89fcf5b034
+SHA1 (NetBSD-6.0/atari/binary/kernel/netbsd-SMALL030.gz) = e6b4dad71f39674e21a0baa6cd5bbc61872786e1
+SHA512 (NetBSD-6.0/atari/binary/kernel/netbsd-SMALL030.gz) = 856e3435c5ae454b145bb16a679da93cc966cd7ee75ab8cce77f216d4070b9e3f1a0d2bf15ae9eda28f48a0eaeeae590559888eef477ab4c72badcaed7b7484e
+RMD160 (NetBSD-6.0/atari/binary/kernel/netbsd-SMALL030.gz) = 449713cd4e5c43656648e76a59b0228cbf51de82
+MD5 (NetBSD-6.0/atari/binary/kernel/netbsd-SMALL030.gz) = d38e0f0b5090a8d0d6552092c241e105
+SHA1 (NetBSD-6.0/atari/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/atari/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/atari/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/atari/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/atari/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/atari/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/atari/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/atari/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/atari/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/atari/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/atari/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/atari/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/atari/binary/sets/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/atari/binary/sets/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/atari/binary/sets/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/atari/binary/sets/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-ATARITT.tgz) = 589b0e48516d961e8961847f441bf7dbcbb67700
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-ATARITT.tgz) = 00ad9fefd5c3fb87f45b20612582b818def61c0f08483f923622a19e94090feb7ba1e39dc8d3b4b7d57e70c60aacaaeee966e1a6a788aff9fbbedc6848e52cd4
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-ATARITT.tgz) = 510465a0b2f0e19a4873fa87fa66d7c47ec8226e
+MD5 (NetBSD-6.0/atari/binary/sets/kern-ATARITT.tgz) = cea983b428fc041a9ad553b25e6de431
+SHA1 (NetBSD-6.0/atari/binary/sets/base.tgz) = 948b83244fe16e439af84cee9dd48f555ff2c479
+SHA512 (NetBSD-6.0/atari/binary/sets/base.tgz) = ee2c41fa904f75740c358f85bc97c36537d6a0f252bfb4ca3ec60098109ca07b8be38e8474ea7355e557793fe726160e1f0d10de2769720432a8cb0896bdcf7f
+RMD160 (NetBSD-6.0/atari/binary/sets/base.tgz) = d08e1a2d3eb8629aafe49fe89e9c00c65c97967b
+MD5 (NetBSD-6.0/atari/binary/sets/base.tgz) = 07d14a63f5591f86d0cb7728174ad6b1
+SHA1 (NetBSD-6.0/atari/binary/sets/comp.tgz) = 081806be5308d18e9910a9f3394bb15fec7111bb
+SHA512 (NetBSD-6.0/atari/binary/sets/comp.tgz) = 17e0a84c5ccefcbee5807012b93f413fa90d6fdb55bc91020cc5265528eb4331a4e2d5f951ac457b0fbf24ce2a97f7dde29a2cfda946edc5db2bf7c574289a75
+RMD160 (NetBSD-6.0/atari/binary/sets/comp.tgz) = e2f1fbee6aa542a8b2d80cb2eb4b593fa13a4dae
+MD5 (NetBSD-6.0/atari/binary/sets/comp.tgz) = 46cdf183c47138a86c07a43cc4c365d7
+SHA1 (NetBSD-6.0/atari/binary/sets/etc.tgz) = 7e13a9c53246d90a86a0db1a3e38ade70705402d
+SHA512 (NetBSD-6.0/atari/binary/sets/etc.tgz) = d751e14266428861f1ef067f02c8e4f79047e3c482f9b89ca44e880ea71ef66de3792d03f4b3704fc98bd8c9ff17cbdb42fa4c4cf3dccff9a94e88662a9035bb
+RMD160 (NetBSD-6.0/atari/binary/sets/etc.tgz) = f09fa0ba9766e3cbaf7eb0f59f32dac370d37f14
+MD5 (NetBSD-6.0/atari/binary/sets/etc.tgz) = 42096354bae512677af5f6d5c9a8484c
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-MILAN-ISAIDE.tgz) = c623eff071500b740c875a6984194d2826ab66c1
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-MILAN-ISAIDE.tgz) = 25f68ad0b3a910cad6f8d8a7cc232a3e6e71ea381fa8cefd342ff3c18c869abdcdfa517984c54ffcdf72e7393b79aeff78467137d6729447042233a55297bfe7
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-MILAN-ISAIDE.tgz) = 16cc868818532530f4441eed778a26b98ba06190
+MD5 (NetBSD-6.0/atari/binary/sets/kern-MILAN-ISAIDE.tgz) = cc65ece6a5e66a5c1f0aa67a24bb1726
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-FALCON.tgz) = 4e7e28bad7354a7bb7fdde4f608340c4907b4453
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-FALCON.tgz) = 24d5df6a74be2fa65016ab03eb11bcd6dbab11ebc33b0ab936685345ff54fe518b6b87171c93c4afab54b0374fb9d5ffa29390a34dd218b400e985dfeae8d147
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-FALCON.tgz) = 82c44f12a090c11dd2b7de11b8b9ae95fa74ed08
+MD5 (NetBSD-6.0/atari/binary/sets/kern-FALCON.tgz) = fea878ea06b74eef20f60e192539f033
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-HADES.tgz) = 24a828836e47ffe647f8a16b1fd0469a9ee62f03
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-HADES.tgz) = 8bbc2397d01594b89515abea27fa58e9ce7dbda5d2f9468b5bc46576d858395c11e4e1d6a9c25dd9b7d5ddb7ac2c2fd2208d95274f9ce7519fb470cbf08da2ae
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-HADES.tgz) = ae93fdba82eecea06486ad88927f25fe1013803d
+MD5 (NetBSD-6.0/atari/binary/sets/kern-HADES.tgz) = 244b09181178cc0b51c79ad7568f4d9e
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-MILAN-PCIIDE.tgz) = 0269a5f553ad95565fb5092460fbefb4567afa27
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-MILAN-PCIIDE.tgz) = cd74cbc52c0357b9af3290dd02362e5561202c14d58bad0d65b96c84361be2e774c9c58b5e38ca9523a7e796d778330cf257f8e2482bf8153e7a43c167e7c392
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-MILAN-PCIIDE.tgz) = 87ac890b25b9bacc28ce600476add0d6fd8aba03
+MD5 (NetBSD-6.0/atari/binary/sets/kern-MILAN-PCIIDE.tgz) = f18391129e4495470783e0a1d8467a81
+SHA1 (NetBSD-6.0/atari/binary/sets/kern-SMALL030.tgz) = fff933858b1ef2c086ce99631195c2e89714b540
+SHA512 (NetBSD-6.0/atari/binary/sets/kern-SMALL030.tgz) = 40458f1b8455fcd8fb3d01dc52815294705ab3752a5952ce93de01c5b7fb553d5aa0aaff4d9124d46e43d318ed6289c336e0a73470d7471fe4989877cae347a7
+RMD160 (NetBSD-6.0/atari/binary/sets/kern-SMALL030.tgz) = 08e49adb3414a2c4490b143865dcf2f0ab3ff337
+MD5 (NetBSD-6.0/atari/binary/sets/kern-SMALL030.tgz) = f0aee544f1a3c894e71ff07e1ab135a7
+SHA1 (NetBSD-6.0/atari/binary/sets/modules.tgz) = 8ea8801011d50b52e637ee0cb1b94fdbf79b9de4
+SHA512 (NetBSD-6.0/atari/binary/sets/modules.tgz) = 6f002bf0695f00d06ce7f43f3087d6c06949b5df8e33baf0b8b30ac18e72700445dcfeb74b51c16fab32e63e537c10bf696bfdb31ab8b08d25c9189075cd3673
+RMD160 (NetBSD-6.0/atari/binary/sets/modules.tgz) = 2bf65897ea1432bac2666df1b221821a5a0642a5
+MD5 (NetBSD-6.0/atari/binary/sets/modules.tgz) = 4dda2688a56fa0774342c63c367c8ec6
+SHA1 (NetBSD-6.0/atari/binary/sets/tests.tgz) = 88a32113d4d6d34b29a94e69c0e4510b51e7e059
+SHA512 (NetBSD-6.0/atari/binary/sets/tests.tgz) = 53fa49988eca04a409dad693f26d5445cdafa9ff69ac918583849d9c6726278b9f0d2fd0da23c05e73d23453970eaadb7b233d951b430c1b7b3ca1b05bab5a24
+RMD160 (NetBSD-6.0/atari/binary/sets/tests.tgz) = ab9f0395fd5d0d1a732000d07e71efe3860f9a32
+MD5 (NetBSD-6.0/atari/binary/sets/tests.tgz) = 213a94d65400a854c2260e98f6150df5
+SHA1 (NetBSD-6.0/atari/binary/sets/text.tgz) = de8e33381d0714b33aab422c2aa5841352941712
+SHA512 (NetBSD-6.0/atari/binary/sets/text.tgz) = bf15a081319d8ce62cc14f465bce3b204bc9a5f57f7ed9d163cf71a9422eeec5ff0e84de7c43d0fc503e9422283e2f99e1e48ee5ccb9224effdc2e3ba70f31db
+RMD160 (NetBSD-6.0/atari/binary/sets/text.tgz) = 387ade3ddcc90bd7b6174deeb24bd8cc6a818e46
+MD5 (NetBSD-6.0/atari/binary/sets/text.tgz) = 937c56219d0ec6a96aef98533e10b569
+SHA1 (NetBSD-6.0/atari/binary/sets/xbase.tgz) = 07c1478cf8a0e4b7ee4b5e49841966fe17f3d797
+SHA512 (NetBSD-6.0/atari/binary/sets/xbase.tgz) = 54d845bc341dc68debf004659d2dcd753604de16e896bceabe6587bfa2934bd5b81b19936c3635cb61dbdee4b4d571603659cd6ae8206ccdaa345f3779e4a83c
+RMD160 (NetBSD-6.0/atari/binary/sets/xbase.tgz) = 6a3aba94b4acef9e311f61c1acc96b33c8707ea8
+MD5 (NetBSD-6.0/atari/binary/sets/xbase.tgz) = e02f145dcfd9f7d1c7be166b28559094
+SHA1 (NetBSD-6.0/atari/binary/sets/xcomp.tgz) = cea8de3b7820897ee8270ae3b591fb602e0028d9
+SHA512 (NetBSD-6.0/atari/binary/sets/xcomp.tgz) = 9e6344200d3ba54e29db576b9f7c0c1d2465cbda8b8a05d015596e2b162c207453cfe0ddc7f9d55bd8463bf2c200c2dd43b4ec34c30635fc0923a0d31c2a8ff8
+RMD160 (NetBSD-6.0/atari/binary/sets/xcomp.tgz) = e64e955294f627c722087a4d1e62a6d646028a37
+MD5 (NetBSD-6.0/atari/binary/sets/xcomp.tgz) = 870efcab1ee55d57351c55ac3c412dda
+SHA1 (NetBSD-6.0/atari/binary/sets/xetc.tgz) = 64dca98d1263e3d78ef7e240c9975e9077356ce0
+SHA512 (NetBSD-6.0/atari/binary/sets/xetc.tgz) = 1e76598c460681b43f2c5b19f2f4af9efeed6ce16aa8bb4d34f99083ee46cf6c5c31c0aeab974a723a3338c3a9ab1a50ad273061f9f02870d9741ec8809ce0cb
+RMD160 (NetBSD-6.0/atari/binary/sets/xetc.tgz) = f147db5da2954155dbc754963d02f309ab41e923
+MD5 (NetBSD-6.0/atari/binary/sets/xetc.tgz) = d23248d3d92350124d8e9e869b28a5f7
+SHA1 (NetBSD-6.0/atari/binary/sets/xfont.tgz) = ad9fb5958debad82e953bc2b1e7e53292d70463b
+SHA512 (NetBSD-6.0/atari/binary/sets/xfont.tgz) = 789529bdf38abda3b00e1db3cffc12272af8ec7f7a52855e0ef5af09ac7cea8639b407265ee6082809127b3bd1b673d686d967c987be6ac12be3825f9531933e
+RMD160 (NetBSD-6.0/atari/binary/sets/xfont.tgz) = f060722e795db40bec2c283ecbb5f7bdbb688ce0
+MD5 (NetBSD-6.0/atari/binary/sets/xfont.tgz) = 1b83f33dd3e43db09d0b55502a7b347a
+SHA1 (NetBSD-6.0/atari/installation/miniroot/prepare.fs.gz) = c4e92cdcb08838b9fa5dc32fb1bd923dd2b97291
+SHA512 (NetBSD-6.0/atari/installation/miniroot/prepare.fs.gz) = 4c25bd0fa0c584b09c2b0a2f9a4a67e942d9a16d9646f1364c71b8bf24326902fae74dce17ee60c81261777ac27e69c2ce4988779ac604a6ac6ebbd4636698d6
+RMD160 (NetBSD-6.0/atari/installation/miniroot/prepare.fs.gz) = 247f6e13edeb6272ceeed462d8729d5e27db000b
+MD5 (NetBSD-6.0/atari/installation/miniroot/prepare.fs.gz) = e99c7d5da695d99c717db4585cac009c
+SHA1 (NetBSD-6.0/atari/installation/miniroot/sysinst.fs.gz) = 353039d699408734197b1a5ecc2490310269e23f
+SHA512 (NetBSD-6.0/atari/installation/miniroot/sysinst.fs.gz) = bd8f6ce4115a98b026fc906c1259ce8ea91d51b97ac44190362a03154ad12c05419d848daf27749a17f0e255b9cb01d2ccae81e75f634825865b95032e5e634f
+RMD160 (NetBSD-6.0/atari/installation/miniroot/sysinst.fs.gz) = 3f866900d10efc89f1f22e8ab6099f26d79cb5f4
+MD5 (NetBSD-6.0/atari/installation/miniroot/sysinst.fs.gz) = 4fabfb561929af7e667fdf39a64e58dd
+SHA1 (NetBSD-6.0/atari/installation/misc/file2swp.ttp) = 9aabfba1673d710445ce4a151e070cd00a364795
+SHA512 (NetBSD-6.0/atari/installation/misc/file2swp.ttp) = d522703bab622aad1f125bf076fa58ea8a309c34425d188df8130298f5af0ccf8d0b0980ddbb90bff86e73cf11d082081f5d0cbe5e8dba68fdc87c9fbdbe2da4
+RMD160 (NetBSD-6.0/atari/installation/misc/file2swp.ttp) = 5bc12b2214b90eefc315f50321b072f3359443eb
+MD5 (NetBSD-6.0/atari/installation/misc/file2swp.ttp) = b2e39863389322ab0834a30a58fbe553
+SHA1 (NetBSD-6.0/atari/installation/misc/aptck.ttp) = 9a1b1b99bd6b50281cb1a1416f854b1d1e0909c4
+SHA512 (NetBSD-6.0/atari/installation/misc/aptck.ttp) = 90fedb40ba1ada8a28b228c0ad34ce9e400b3f9985d69b52345df1e29c7b9b2fd0ceafe1ae91cab0095f3f24ec8bbb274e2f514e351b39eeb8591d3c5ec46d03
+RMD160 (NetBSD-6.0/atari/installation/misc/aptck.ttp) = e399308e499e2e859eba1fc190208537421e407a
+MD5 (NetBSD-6.0/atari/installation/misc/aptck.ttp) = 5061a34d4cd283af586c5f382b546a82
+SHA1 (NetBSD-6.0/atari/installation/misc/chg_pid.ttp) = a989a7318087ebccdb92ea9c84e81a8fcb1d2bd3
+SHA512 (NetBSD-6.0/atari/installation/misc/chg_pid.ttp) = 15dca31b0555023ba6e2b04e6bca504adddcc56177f6224a2757d8784ded4a53fd5cf68b3dd5e794b46bcfba69d199dd430aa9379ed565a7aff4c360855cc4cd
+RMD160 (NetBSD-6.0/atari/installation/misc/chg_pid.ttp) = fef62601213fdafa60099375eaed9ea23163e165
+MD5 (NetBSD-6.0/atari/installation/misc/chg_pid.ttp) = c414114be1b45d1b8abcd41091fb0c6d
+SHA1 (NetBSD-6.0/atari/installation/misc/rawwrite.ttp) = 18c663ff37bf90130bc6eeefd3aabfcd632c654c
+SHA512 (NetBSD-6.0/atari/installation/misc/rawwrite.ttp) = 259903e1e3439b3a3d128a18a597ccb6ccec507bc6b1c449445e7e00c4e0d37e436ba2be0cdb71a7a756c30c2a6406cffd3bef0631b2083a2f0402ab322dbf96
+RMD160 (NetBSD-6.0/atari/installation/misc/rawwrite.ttp) = 3b66c3e7f84325e3be39c15e2a597d2bbd233a79
+MD5 (NetBSD-6.0/atari/installation/misc/rawwrite.ttp) = 20458ba9d4f2fae37607648aeb92bf71
+SHA1 (NetBSD-6.0/atari/installation/misc/gzip.ttp) = 2f3c87cac323a1641622ed960d7ca3df6d8e92ce
+SHA512 (NetBSD-6.0/atari/installation/misc/gzip.ttp) = 37be09560542fd55afebe8f3a07a76d4121a49c5d8771107a6065dbe55c3d8e33ca25326ffdecb38ceaba0e5b6af33f78f92ecf2600169779b5d7282f74335a2
+RMD160 (NetBSD-6.0/atari/installation/misc/gzip.ttp) = 8e9dbdb381f2b7ebaf01597bca73ba920e18427f
+MD5 (NetBSD-6.0/atari/installation/misc/gzip.ttp) = e27e5b3c585ad0a96daaaa810b56f5ef
+SHA1 (NetBSD-6.0/atari/installation/misc/loadbsd.ttp) = c7f08ef85b1b3120061b3b651456cd23f8937c16
+SHA512 (NetBSD-6.0/atari/installation/misc/loadbsd.ttp) = 2b645062a84fe5892c3d424d181dd6ad11f134c4a6728b4ca9a67f1912642daabdfaecdf7af985b4d4907d93adc1b72ed86a5cf9b57de42e9213582ec89a8723
+RMD160 (NetBSD-6.0/atari/installation/misc/loadbsd.ttp) = 802c240f7069d79c0432b28dead7884bc4a06d38
+MD5 (NetBSD-6.0/atari/installation/misc/loadbsd.ttp) = e5e92b220890c5ca942d0c878fd090ca
+SHA1 (NetBSD-6.0/atari/INSTALL.html) = f71f76494a6bf37c8aefe74e698838c1a03b14c0
+SHA512 (NetBSD-6.0/atari/INSTALL.html) = a12b9739f7918dd22bb0434c3d1c41c5031454fd6dbcb53df4eca669b9b4bc918c1f8df379bcac46204664dc521a049b5c39b4151f207a4a22b19b436917fd35
+RMD160 (NetBSD-6.0/atari/INSTALL.html) = f634ad4adfaa1002f352d703118aba204cbe4f60
+MD5 (NetBSD-6.0/atari/INSTALL.html) = 7eac9b0603de1d7d718b994c92b7a229
+SHA1 (NetBSD-6.0/atari/INSTALL.more) = 6ba2460611e6f92531b9ae9d28f4c68d302b9dc5
+SHA512 (NetBSD-6.0/atari/INSTALL.more) = 718766711a583a0539790a3fa7046f845a15f53dd1cd1f0ddadea939158256b3fbf5dced1a88ea592ded2685f0fda81984d6cb137f26f7b543aded6c7c1ca6a8
+RMD160 (NetBSD-6.0/atari/INSTALL.more) = 8bdd7c42fa93913bd14d5ab80457394e289f8c03
+MD5 (NetBSD-6.0/atari/INSTALL.more) = 19adcdce47ce4b9070326b433afe5a3a
+SHA1 (NetBSD-6.0/atari/INSTALL.ps) = 2d9874be06bf612885e3f19fc37635b0c421f52e
+SHA512 (NetBSD-6.0/atari/INSTALL.ps) = 0dd3a09f0a91403f412aa3650847c3512db2ac3d36d0133ac924db74d07b59607c9f57df7fd0df4a3652adbba4842f6b6afa01c07cc4a06c36623ad9c60a9ca3
+RMD160 (NetBSD-6.0/atari/INSTALL.ps) = 83f619a939ef01654f3e3bce7f7ddea0b88828bc
+MD5 (NetBSD-6.0/atari/INSTALL.ps) = 73fd3b04168f78f2de31b91190851ba9
+SHA1 (NetBSD-6.0/atari/INSTALL.txt) = 711ce58ce059429925a6e08ad178569c5e00a00d
+SHA512 (NetBSD-6.0/atari/INSTALL.txt) = b837d76a7e0d754c09fff90845906ec6a1dc5ed77832b91442d5a9ec3608f5e6785782ff1debe3b145f23ba382c5472abec75f49055859bc715caf713941cf41
+RMD160 (NetBSD-6.0/atari/INSTALL.txt) = ecd373463a1cfd5b5399cb3ca0204362ddb22be2
+MD5 (NetBSD-6.0/atari/INSTALL.txt) = f6b564115bd3ae1a28f79dd879fe8ce6
+SHA1 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.symbols.gz) = bdb282bf1fce2a0c48cf661a68b16fb7663859df
+SHA512 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.symbols.gz) = c476616f879c94a8135889c4691ca927896c74950c16543039a74e4befd918619845f31e519cb452bd215d8ca4fa1acd697f9867810f4961d517f7803f7e2c33
+RMD160 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.symbols.gz) = dbb18f3fb59483723599306093a562a45f23392b
+MD5 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.symbols.gz) = 582ae8bf879f7bc42d24bf114a5d6a5a
+SHA1 (NetBSD-6.0/bebox/binary/kernel/netbsd-GENERIC.gz) = ecfa395d442d86acbc8bbd080c04a8137012138c
+SHA512 (NetBSD-6.0/bebox/binary/kernel/netbsd-GENERIC.gz) = b48b213c4ffd06180d1272a65e27ec0ed539e731e07aea29d31f6c939fef99e1a965c42e2fdd99daad1e8ee543c99a02c420fbcf6531d47e961e7b295150fdb9
+RMD160 (NetBSD-6.0/bebox/binary/kernel/netbsd-GENERIC.gz) = 0b01e797fe821429603d9252035e7425f388046e
+MD5 (NetBSD-6.0/bebox/binary/kernel/netbsd-GENERIC.gz) = 22289b3d7d60df27fd0ed86731ab77bf
+SHA1 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.gz) = 8721973ccd6399bf563bdb266d9e5316e1ef98ed
+SHA512 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.gz) = 5390ebe49a1d50d2ba42e529c8fb2c23606e4650cd3225783809ee4dee6013f60cf7dbb347fabf48f3d7ce98ededef37cfc8d5de5c07ad7462dacc668243f429
+RMD160 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.gz) = 8228a5df5239737e7ba039b84303c4cd491e26f6
+MD5 (NetBSD-6.0/bebox/binary/kernel/netbsd-INSTALL.gz) = 9165b1f4313cc543868d7ab7f6eff5ad
+SHA1 (NetBSD-6.0/bebox/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/bebox/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/bebox/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/bebox/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/bebox/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/bebox/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/bebox/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/bebox/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/bebox/binary/sets/kern-GENERIC.tgz) = d4e8dde09eeb9886e1d84573d136ea92db147201
+SHA512 (NetBSD-6.0/bebox/binary/sets/kern-GENERIC.tgz) = bb375fbcd379a02ccb0f770ae22aeb02f90fda95be2864f085bd46ad58c670e5fda2792b9af8acb5972398a4056ef4ca8d95367f20f57e1258401d1b02d29abd
+RMD160 (NetBSD-6.0/bebox/binary/sets/kern-GENERIC.tgz) = 2726cf7d2e1fa0278bb78a1f1d21e3a6846bec27
+MD5 (NetBSD-6.0/bebox/binary/sets/kern-GENERIC.tgz) = 17e1bdb7465cc8aff08f41a81a37913e
+SHA1 (NetBSD-6.0/bebox/binary/sets/base.tgz) = cb3438d686bc37c67ef3506e7b5f14af708d0f69
+SHA512 (NetBSD-6.0/bebox/binary/sets/base.tgz) = caaf5501269c91599fe8a6315a14bd33776549df0d82d34e516b846df3ace79c1b3a77ef745da87fca1bcc822201765366a373c2d9e29195b4f76bc954f6903e
+RMD160 (NetBSD-6.0/bebox/binary/sets/base.tgz) = 9eaed756de31f7ef1f390895400ff57d90b6936f
+MD5 (NetBSD-6.0/bebox/binary/sets/base.tgz) = 844ca078de04b6965afc9d6840712a87
+SHA1 (NetBSD-6.0/bebox/binary/sets/comp.tgz) = fa35a56729cf7a8957a24482e5855629b63da9ca
+SHA512 (NetBSD-6.0/bebox/binary/sets/comp.tgz) = dae46ff9a1b0ec32444bf93501e5ce5a003556ec6e057c1a85ef63d6f18fab00370fb5c8c6dda14da7222032f26aded43ff2ba4619df58f13d773f3c55a3203a
+RMD160 (NetBSD-6.0/bebox/binary/sets/comp.tgz) = e23f0ffdecc624bd584b1bdafcc1919c0a6b4bee
+MD5 (NetBSD-6.0/bebox/binary/sets/comp.tgz) = e24aedf775e35faa7b0be771def8e964
+SHA1 (NetBSD-6.0/bebox/binary/sets/etc.tgz) = 7955187dd8c102acefc90e649d70bf87334b8c15
+SHA512 (NetBSD-6.0/bebox/binary/sets/etc.tgz) = 3dbc921b6f58296fecb96ac7a0497f4de1f84179128afa3fe2f0a9260399934f659c53346ab55dbf387f19e348e4cf441506b2b92a72f0a2de71d59701289e34
+RMD160 (NetBSD-6.0/bebox/binary/sets/etc.tgz) = 7426566e042dd69397282ea85d9999952d57fde4
+MD5 (NetBSD-6.0/bebox/binary/sets/etc.tgz) = 8980eb4fe0883bbcf7d2001bc9d705a4
+SHA1 (NetBSD-6.0/bebox/binary/sets/games.tgz) = 780b002a35471789a68ee7be17362c60e96fa5fd
+SHA512 (NetBSD-6.0/bebox/binary/sets/games.tgz) = 954365033c924762b524f0f1e4732216b4c661697336b0947943f05a1d1e0ecc12c1679c1c5d7572e1a15a7296bd7b14d31749917ef03a2b097b94bfa0f16837
+RMD160 (NetBSD-6.0/bebox/binary/sets/games.tgz) = 9b237eefee5dc43fb3fffca5a2aa390fb2c3031f
+MD5 (NetBSD-6.0/bebox/binary/sets/games.tgz) = 337e6739c192296cac92b610d0ad6945
+SHA1 (NetBSD-6.0/bebox/binary/sets/modules.tgz) = 14ad320114a249b1ed676832524f773dae772798
+SHA512 (NetBSD-6.0/bebox/binary/sets/modules.tgz) = 1aa3a619fdff5824c904495352248fe990130b9ce9d9a3cd443afd2f088acf7048150de54f1cc304ccf08587fd91f7614521a0b9be96fc7768c06e0a80ed72ac
+RMD160 (NetBSD-6.0/bebox/binary/sets/modules.tgz) = d1df79e00026a19f724c6115055c611c07d592cb
+MD5 (NetBSD-6.0/bebox/binary/sets/modules.tgz) = 8dc1d2dbc89e5e6aa3e04b0033cc4a22
+SHA1 (NetBSD-6.0/bebox/binary/sets/tests.tgz) = 979d26c8e2e5283c416a2e4f4b603acdb43756a0
+SHA512 (NetBSD-6.0/bebox/binary/sets/tests.tgz) = e726187887b9429ce3bd39fb51e7703792f288c47eb9c0f20b85e1a2be4f6448bc3e73919c5d28c28f400ada5b0b024b647079a3670f0a2153aff9b7f5738f13
+RMD160 (NetBSD-6.0/bebox/binary/sets/tests.tgz) = 5cd1c8a42ae7a6ef706de0fcae5292db026efa9c
+MD5 (NetBSD-6.0/bebox/binary/sets/tests.tgz) = 122dc0ea7ebc7ca924301e406ef6e002
+SHA1 (NetBSD-6.0/bebox/binary/sets/text.tgz) = 30f7a17a6d9b03c7ce09bce6341895ac27c2f7b4
+SHA512 (NetBSD-6.0/bebox/binary/sets/text.tgz) = e258a9a741918d6bd8de1e10cff771541b1f1191af776101ff38c722fb037d44d51879d45a5a90342c7e2c21d36cbf5a9a6f5f1a047e61bb18609385381fc3ae
+RMD160 (NetBSD-6.0/bebox/binary/sets/text.tgz) = 6dee36ded12f84c00d7c82912da8755b0d04d497
+MD5 (NetBSD-6.0/bebox/binary/sets/text.tgz) = e1e3ed8f872b4dd51b555e9100ed6173
+SHA1 (NetBSD-6.0/bebox/binary/sets/xbase.tgz) = 03f73933d3719ef967af4a003282e1d56453e3f5
+SHA512 (NetBSD-6.0/bebox/binary/sets/xbase.tgz) = d90e373c143773a93e430058628bc65161e6c25c725fcb279ac0765edcee8e9cab4ff55fa1d99ea66ccb6ca06133145eaaa77f2c26a082c27a53e2e10a19cfdb
+RMD160 (NetBSD-6.0/bebox/binary/sets/xbase.tgz) = 0fe0422c310a56e55e2d5e4b85e8d8a41daaaf4e
+MD5 (NetBSD-6.0/bebox/binary/sets/xbase.tgz) = 7120010c15d5f84927963c780c9197e9
+SHA1 (NetBSD-6.0/bebox/binary/sets/xcomp.tgz) = 1c7522ec79f661a84912a5213ed835d400e108f7
+SHA512 (NetBSD-6.0/bebox/binary/sets/xcomp.tgz) = bfc0d388d18e14cfe99e6bcbda22e4b11e5082b0acf5b314c6f0275823138c35d1a16c3ab3e3fc27e5a04228d6380ef3c2f45dc807715db2c1de689e5674a397
+RMD160 (NetBSD-6.0/bebox/binary/sets/xcomp.tgz) = 23c8e8bb0e2f0708d2bd464468196f4d74359302
+MD5 (NetBSD-6.0/bebox/binary/sets/xcomp.tgz) = b6fb09a621ed2138ed674838c72ec64a
+SHA1 (NetBSD-6.0/bebox/binary/sets/xetc.tgz) = a14b23868bf88e59f5a845bd86cf4af61522f482
+SHA512 (NetBSD-6.0/bebox/binary/sets/xetc.tgz) = a2aee6ee11a89b3fe3b5834502dfd1a50aec7bdcc0f424b3e9d19400370b922258d77a979dae0bd87f8e55df8da9b98f8bf88a73792b1ca6a8915e5cd08777aa
+RMD160 (NetBSD-6.0/bebox/binary/sets/xetc.tgz) = bf37bf09d79777922f344d6b52f69d50c708b64c
+MD5 (NetBSD-6.0/bebox/binary/sets/xetc.tgz) = 837bbc31ba2a81d2610adf225551a61a
+SHA1 (NetBSD-6.0/bebox/binary/sets/xfont.tgz) = e44a6f29bfb3a947ca7d916c7556386a900cb3ee
+SHA512 (NetBSD-6.0/bebox/binary/sets/xfont.tgz) = 9ca97fbe1d40c26938f5a84f09bf273f132b40a82f3ef548295901840155ca45c68ce0d0d980f7fe63bd8acb57be487fcc5f81e61ae4f9765151333a84636a43
+RMD160 (NetBSD-6.0/bebox/binary/sets/xfont.tgz) = e9e153af690a96523a3b7af0a314e1104fa694af
+MD5 (NetBSD-6.0/bebox/binary/sets/xfont.tgz) = 1323ead1d7e9f69f6790c1eb836ec117
+SHA1 (NetBSD-6.0/bebox/binary/sets/xserver.tgz) = 05c93b9d2b3774b6cb71b9d829f5d21860f549ae
+SHA512 (NetBSD-6.0/bebox/binary/sets/xserver.tgz) = 28c97ffdd74c9a2d1d060ce356fd6951d377b61b7fa691c01a150472b082dd027b2be909508ee3370ec59d89bd9c5e12914b3f34feccc6c7904a9ce49869d7d8
+RMD160 (NetBSD-6.0/bebox/binary/sets/xserver.tgz) = 52564d70781876abda7f16a678791c8b3753f53b
+MD5 (NetBSD-6.0/bebox/binary/sets/xserver.tgz) = aeca26a6ae798bcf849e7bd4df423614
+SHA1 (NetBSD-6.0/bebox/installation/floppy/boot_com0.fs) = 1fc015fd100d0518a57e3e7a30e336be1000c098
+SHA512 (NetBSD-6.0/bebox/installation/floppy/boot_com0.fs) = 674ae651d28163eae5f02f78e427d7291e4b977fff90036b1d6870f572e63b1963ef83453ff9da1d49ebb707ff918c0f64889bc0f7d17072690aadd65837e14a
+RMD160 (NetBSD-6.0/bebox/installation/floppy/boot_com0.fs) = 1f59e43c9e6b08ccd63506a5179fdd2a365151b8
+MD5 (NetBSD-6.0/bebox/installation/floppy/boot_com0.fs) = 300dd58c4641cf1fda257074b674937c
+SHA1 (NetBSD-6.0/bebox/installation/floppy/boot.fs) = 8a5770fb10efc7d7c453138ca866b93e2287607a
+SHA512 (NetBSD-6.0/bebox/installation/floppy/boot.fs) = ffbb187efcdeaaf5018827b619abe00ee42aedabab188a443b494c3a5ab94d21fea4761409d9eb23b5a37d5daee602baa838b1d052e1f66b5380a09ed446fb89
+RMD160 (NetBSD-6.0/bebox/installation/floppy/boot.fs) = 58430893606678b17f132c3f3559dd4d30a7246d
+MD5 (NetBSD-6.0/bebox/installation/floppy/boot.fs) = f807ed8a7b25aa9fc9c08637a5188dbf
+SHA1 (NetBSD-6.0/bebox/installation/floppy/boot_vga.fs) = a922c42dd39babfb12443b7d122526f207969577
+SHA512 (NetBSD-6.0/bebox/installation/floppy/boot_vga.fs) = 4f547ce92d72d826253aafab92f9df42b5dba05031ab4d8537fcd40291a703b06eb2e972729c8e703f4e4e0f75d2a0ee2e2f69e8f5d66735f2932089bf1ec7fc
+RMD160 (NetBSD-6.0/bebox/installation/floppy/boot_vga.fs) = c999c7705d258c4b294f0905ba519ec86b7f34f3
+MD5 (NetBSD-6.0/bebox/installation/floppy/boot_vga.fs) = 343aba7dd2584f3945d1fb539a72dc82
+SHA1 (NetBSD-6.0/bebox/installation/floppy/kernel1.fs) = 8af8e65d2919686db6121c68347b8541991e373a
+SHA512 (NetBSD-6.0/bebox/installation/floppy/kernel1.fs) = 91e8df83298ea05c0bec3920d491ff2277d2342a803f84b7393a160ae4a108b84b7d21a0fbf2875d9248287bf047d075e4d33c582a6083ad276e974139635172
+RMD160 (NetBSD-6.0/bebox/installation/floppy/kernel1.fs) = 169667f00c760604c7302d9299448769c8e07b9f
+MD5 (NetBSD-6.0/bebox/installation/floppy/kernel1.fs) = 84f875ee3ca1633777ae9db0acd4e8ae
+SHA1 (NetBSD-6.0/bebox/installation/floppy/kernel2.fs) = 12e804736be0c389da64cd888c3ebfeeec2a1078
+SHA512 (NetBSD-6.0/bebox/installation/floppy/kernel2.fs) = 151b541d723ea1c09bc93cd2cc6abc6a04d0adff1b20c24f53c5b0a8b72462614e64912c6b21dfc9bf4676e2a60a03cab40b44fa23f7dd70183116b4b55f6725
+RMD160 (NetBSD-6.0/bebox/installation/floppy/kernel2.fs) = 159915fd391a03f34782322760d31e1966669b50
+MD5 (NetBSD-6.0/bebox/installation/floppy/kernel2.fs) = 229b4ef55392a3b8c25b6b53691b5fbb
+SHA1 (NetBSD-6.0/bebox/INSTALL.html) = 836f306d6806f97de5e27bce454acd5882b63090
+SHA512 (NetBSD-6.0/bebox/INSTALL.html) = f903a8d35baabfc1ecf5107a6b321930a4b6966d25e8064c6a14d19ddcf67906fbfe5f227487e4120a876dfdad3ebf4664d3f22a14bed7d970bf3f29ffd2c7b2
+RMD160 (NetBSD-6.0/bebox/INSTALL.html) = 4ad2f27fa58d87d0a1b22c6282894af983f4e89a
+MD5 (NetBSD-6.0/bebox/INSTALL.html) = 8015ad9791e90ca1c944d1ecaab10a88
+SHA1 (NetBSD-6.0/bebox/INSTALL.more) = f00ff910b68e2f4f98bfe3b08c6713a5d27c308c
+SHA512 (NetBSD-6.0/bebox/INSTALL.more) = 2ab02d1a9d69c28d6b0248fd75c3395b5bc6fdefd099c1c8f199c083fc87383478818a152842f749bab553a6420df0c1427820c2b893a47cce693a65db91d175
+RMD160 (NetBSD-6.0/bebox/INSTALL.more) = 357216417da8c0e9fa268285ae401c9b289f56a0
+MD5 (NetBSD-6.0/bebox/INSTALL.more) = 55e950718919e06393d4eec6eeb33feb
+SHA1 (NetBSD-6.0/bebox/INSTALL.ps) = 76f8926725f4b4b2c67518ba8a08c7804d8455a1
+SHA512 (NetBSD-6.0/bebox/INSTALL.ps) = b730f63d8d471706dfb44484b7adb22374a51ca8e506f9b848ff7936149bf3f7b1b335b3e061b4c89904f53556bdd9bffba99a9275a5c78299705600adad6eee
+RMD160 (NetBSD-6.0/bebox/INSTALL.ps) = 4edf6341d842d3626be2f6e51b9fb1e8e2e2331b
+MD5 (NetBSD-6.0/bebox/INSTALL.ps) = 09cc4abbf4039ab00e41994c0e274550
+SHA1 (NetBSD-6.0/bebox/INSTALL.txt) = f826c7a4f2f3500f258f40bb89fd5d996527e6a6
+SHA512 (NetBSD-6.0/bebox/INSTALL.txt) = c8cc1e6e07c502ec0d6d807a67de6ffc943d260e2538d512d4322199e49e70fdcf01cb389455ea6d48655c4a246fa31dedf6c18ec58ef58c6f9b17de068b3944
+RMD160 (NetBSD-6.0/bebox/INSTALL.txt) = 17fb9bcbdd888e110926df401169d8ead0aa1dca
+MD5 (NetBSD-6.0/bebox/INSTALL.txt) = f256d74bbee88c7bb349992fd11f975d
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.symbols.gz) = 6e64a8b0dec1e052750bd03c3e240e2e4678a0d7
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.symbols.gz) = bcbaa47e0c29054669a3fccdade1fd64b75934f33cf34ce59675190fd62074920973675f85dc4a6a4973898df0c41b71bab47cde0bd438db97c56a13e3e5fe14
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.symbols.gz) = 18c790be97dc94277543ab409b0c46a186fc8ded
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.symbols.gz) = fd246c1c2231766dfcd5307328d6791f
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.ABLE.gz) = 837fee4fd025b1b6302e59feb9d0996a5a69069d
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.ABLE.gz) = 8a24960901173b604e26992c2dc3b401eb20787952f6b6c0fa070b10c0d3b5a188241b9353c4ef405c4e9864cf200bf97edf692c45e2eede38b858a890fe7b47
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.ABLE.gz) = 68c9d5f9f4278bbcd6431b34d62a4971e953767a
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.ABLE.gz) = 2f4ae7ec3badbee7e9739207599e1edf
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.aout.gz) = 572497febedc95796b46a3bc0aecad740db1da14
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.aout.gz) = 549c46b80cec59bc05d9c06f03fea4cfe1789c0ca51f2a95ab6f37df7b2dd6450f056e8bd60499ae8d96547c36f2ddb3367910d52b397d2ed5188e25424fe174
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.aout.gz) = cbd8947668d7cf78e2074436ef9d0a046a919870
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.aout.gz) = 82285aa28d3e972d574d369dc25b5f50
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.gz) = 54e76627b1fd3ee4c32046f4105f5809408f881f
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.gz) = ef934d136eccb13da91a086e43c915a52f8206f8fda3237034f9bc03d73fa0147466efd58e231217be5179a8c1e6bc288c55b0c56bc47adb0f7bd45aa89be64d
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.gz) = 39d74bb0008f44f71e73ae7deabaa0795b331564
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-GENERIC.gz) = 11fb2ce363dc7e39ca3a62b11d2aa62f
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.gz) = c55e66950e096d68620ed1fc3296f1d557ed45eb
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.gz) = 32253268b69d201a700dea2a855e966bf9860321e94b99507960b5e6bf870f18f856e4a7e425a236752e48bbf5875ceae38627d2d49e9a63faf0377f75c002c1
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.gz) = 7f7bbdcb761251ba78d769e045a53a73e67c2788
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.ABLE.gz) = 93e3ff78c78c67a40de296421d949551
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.symbols.gz) = 56742c573641715c2ad92e38a0f3206e4b6b3629
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.symbols.gz) = 41ec7eef2073b8f6fd9e34fbe9670cdaafd65b1712397db855eb44212b17a96addcd31ae62479fac09ff73cb650fa9859aab905c727305f28a6841c30c7df54c
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.symbols.gz) = c52d4eb8b33f9562c241dc296f9d9c06ee685e58
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.symbols.gz) = c51c51101225f4f260e1ec92aa64f689
+SHA1 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.gz) = 58e8d3c14ca2714bbb91003f533ae5f967f524b4
+SHA512 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.gz) = e2c5f771f02b6d7896841bf5a25efc16b34830ff375e9be1f3911225313c664b7f3a0ac023e5928c2d5fb7ab584f9bde029480b84ce67bd67ee862673cf45705
+RMD160 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.gz) = 4282d861ac62fa542e4496cbfaca087476d60597
+MD5 (NetBSD-6.0/cats/binary/kernel/netbsd-INSTALL.aout.gz) = e64438671861843fdc0fd4c9f324f04a
+SHA1 (NetBSD-6.0/cats/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/cats/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/cats/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/cats/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/cats/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/cats/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/cats/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/cats/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/cats/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/cats/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/cats/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/cats/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.tgz) = 5ca14afa2e8a62cb54d2ae62e3516ffc10b4568b
+SHA512 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.tgz) = e0189ff9d057ac445ef5ea45155f0a7045b876f7ddbd912b45fb3ee7f2c8bf83a46d167d9a916214d6cc1de9b825dcf91f35384bd3690f885acb44be5356c625
+RMD160 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.tgz) = 5324b2a4cfd27b7aeee8c2bc2cbb6041669e0bff
+MD5 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.tgz) = 6825664fe2f18e25fe7cb307b8f2923f
+SHA1 (NetBSD-6.0/cats/binary/sets/base.tgz) = c458481bd58c1d1dca0329bc28de71409c1e4aba
+SHA512 (NetBSD-6.0/cats/binary/sets/base.tgz) = 52550865b944057be1c4de1f30cb1ef8bf1b126258a0ef2ff7d2108b562b211149cc05b8397fb7c6142a5276e2636192c54cffbf8d424d528c0bce462f155d49
+RMD160 (NetBSD-6.0/cats/binary/sets/base.tgz) = 7977e28aedfcc3e97ad9e748c6d3c7abd4aa831c
+MD5 (NetBSD-6.0/cats/binary/sets/base.tgz) = 2a41824b43d9f6cfee26ea6fe3a04368
+SHA1 (NetBSD-6.0/cats/binary/sets/comp.tgz) = b725c4d09fc5f7ee54c5d800e4c2e12b3af6f669
+SHA512 (NetBSD-6.0/cats/binary/sets/comp.tgz) = e36e73f377ca33d2a76ca25973464ee54c70bafc05fea574fa2edc2060ad93be714a9ee6cb7173b52a75a77b47b49e50dd5b7803fd84afbd6be19b858147d551
+RMD160 (NetBSD-6.0/cats/binary/sets/comp.tgz) = fcc12fec265d939130a40cd2b2d73bc5a97ab1fa
+MD5 (NetBSD-6.0/cats/binary/sets/comp.tgz) = 33321cea969922b1a6ec122d03546470
+SHA1 (NetBSD-6.0/cats/binary/sets/etc.tgz) = 89dc5b13c09b5325742e8e4ca8a22857b29a2bcf
+SHA512 (NetBSD-6.0/cats/binary/sets/etc.tgz) = f18e1f34fd7b909422e431fa16738b047afa451ea9e7e77bbbcf4fc465835ad4b3b5b145efd2a609130d057e5adab868e544806ad7584947dfb82440e976c6f0
+RMD160 (NetBSD-6.0/cats/binary/sets/etc.tgz) = 81e6058380507732dcc4157e10c849d896fc51aa
+MD5 (NetBSD-6.0/cats/binary/sets/etc.tgz) = da8349c012e9f029cef0f909cc466973
+SHA1 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.ABLE.tgz) = c9adc81c86dda4d994d79fd37b7622475310fda5
+SHA512 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.ABLE.tgz) = 5a2c270a700ae0f433afba336f4270c1a9f0646ddc0839318638946f38f23b150775d9f6e2cb91d08ce327f4c2057377e5c27e525277f5c001d1c03fad852ce8
+RMD160 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.ABLE.tgz) = 7c83c750bff69191dc40b6bf34d801cc082f4970
+MD5 (NetBSD-6.0/cats/binary/sets/kern-GENERIC.ABLE.tgz) = 18c1f0b06270fb64a47ffdb95edb7f0e
+SHA1 (NetBSD-6.0/cats/binary/sets/modules.tgz) = fd876e3d182e55ff19b6121b07b8e69fa1d0df29
+SHA512 (NetBSD-6.0/cats/binary/sets/modules.tgz) = a9a55cb34e467094be7e72a443b8a449078efaab3adc8a9b1496e45ea6c9fc7d5b3cc7523b30fade9263cb2f90fe9e18825bc6d5acd415a3fbea1c444ec0ed5d
+RMD160 (NetBSD-6.0/cats/binary/sets/modules.tgz) = 8c6829a3b9d46c091203f11ae7809fe1087e8fbc
+MD5 (NetBSD-6.0/cats/binary/sets/modules.tgz) = fec5cad3f45abd455761405b2b352a1a
+SHA1 (NetBSD-6.0/cats/binary/sets/tests.tgz) = bdfb9591316f5c17b8acfff63b0ab895cb9fe3e8
+SHA512 (NetBSD-6.0/cats/binary/sets/tests.tgz) = aaf8d4b6e428dbd0a162cf09d5bbb3273450b4ddacd6cdcb9ba2175cde5276fc30173466a1e394ca2fadb3e92ee7637d9e8fdfdc7f6e59436b9178efc1806b4c
+RMD160 (NetBSD-6.0/cats/binary/sets/tests.tgz) = cf4cb18da6b8c46c0648d6c33556dca95035b024
+MD5 (NetBSD-6.0/cats/binary/sets/tests.tgz) = 5f83acde92619b5eb23f3b21c3bdfbed
+SHA1 (NetBSD-6.0/cats/binary/sets/text.tgz) = 4434e6febe84969a66d92fdfa147aec4a6f18549
+SHA512 (NetBSD-6.0/cats/binary/sets/text.tgz) = 41206832dff7217dc0f61fa8ed39c7b824bd7f781318317520aaf3b190cf5d8588b5c06a8252fa8318ded7df84a104b9718dbbc4e6d2e3c62c822d79b9be4d3f
+RMD160 (NetBSD-6.0/cats/binary/sets/text.tgz) = d7a3c7498b28f79cb6044f4483f6b4970c2d265d
+MD5 (NetBSD-6.0/cats/binary/sets/text.tgz) = dbd9391020e7272a288c0c30002cad8a
+SHA1 (NetBSD-6.0/cats/binary/sets/xbase.tgz) = ae3b8c01b219ca930ad23427b88601c98fce9ae9
+SHA512 (NetBSD-6.0/cats/binary/sets/xbase.tgz) = a06f8a61a8c61df4aa2f9e0efdaede96e56765552d642ab3f048afeeada1716fbb5a0a5b3f2d511e7a146fa7d173ad0b59d5707a7c9b29216c014ec3911d3d37
+RMD160 (NetBSD-6.0/cats/binary/sets/xbase.tgz) = 032ae59bb4c894f973b3fba09b9c72762f4be5f2
+MD5 (NetBSD-6.0/cats/binary/sets/xbase.tgz) = d021cc89a93acc430e5cad14758b1ef3
+SHA1 (NetBSD-6.0/cats/binary/sets/xcomp.tgz) = 2daa1f374f82e66d62900af2252f72a06f366ebc
+SHA512 (NetBSD-6.0/cats/binary/sets/xcomp.tgz) = 803d5501dfcda968a4f098378989cc8186bda8f9dc28af6b9bc591301edfd0dd194922a0d661c75f3ced1fcdbb700e61eeb7bbf5b95ee6ec1111cb8bb9eec933
+RMD160 (NetBSD-6.0/cats/binary/sets/xcomp.tgz) = 4bf6721bd75641fef50dce9cc5781b6991acd0fa
+MD5 (NetBSD-6.0/cats/binary/sets/xcomp.tgz) = c78fd7987bf26697dcb6447c6818c8f5
+SHA1 (NetBSD-6.0/cats/binary/sets/xetc.tgz) = 081116c5590415004358c063c13f77a32c0fa5ba
+SHA512 (NetBSD-6.0/cats/binary/sets/xetc.tgz) = 129cc55a79bee0d1d821c137fa27ae1fdaa82d71cecbbecd555e7d8ab649dfccbb1c2086575e97ff66bd40a50a34ab5b45233ceb15bc9770044bc776c646d86b
+RMD160 (NetBSD-6.0/cats/binary/sets/xetc.tgz) = eb721c7066e0088a6be10b2214fa7227d2b95043
+MD5 (NetBSD-6.0/cats/binary/sets/xetc.tgz) = 7904920faa3acddfb9b635b88789a440
+SHA1 (NetBSD-6.0/cats/binary/sets/xfont.tgz) = f6547d11ac8302fda8b2b992e99f5d8c03ef9f0b
+SHA512 (NetBSD-6.0/cats/binary/sets/xfont.tgz) = c38be1439bd2a0b9a10978e1833a5ad243f3d3ed557bb05033aa6c76d1320851663e8819987b4a77c8f4f123820d82cfa950e8e486986686030aa9a40b7577ae
+RMD160 (NetBSD-6.0/cats/binary/sets/xfont.tgz) = 401d3e9883c381410c7e45ee3cb1ab72e9fd54a7
+MD5 (NetBSD-6.0/cats/binary/sets/xfont.tgz) = d154b32a82c67ebba30762daad5a37e9
+SHA1 (NetBSD-6.0/cats/binary/sets/xserver.tgz) = 941b1622f43738a9a31860ad6464f2fff35e9f1b
+SHA512 (NetBSD-6.0/cats/binary/sets/xserver.tgz) = dbbd41022a86bfd59958a96f821256bec29793952b4adfff10e3974d437e1317b8312662359a27a961d76f4c0ac7e7af9482603d6ab918668174818f9b1c1008
+RMD160 (NetBSD-6.0/cats/binary/sets/xserver.tgz) = 4fb11053b3a0ad7775efdb502bbf8e1198dc0348
+MD5 (NetBSD-6.0/cats/binary/sets/xserver.tgz) = 20c811752f066b472b1f578431f25d42
+SHA1 (NetBSD-6.0/cats/INSTALL.html) = cbe385200e2572a8325f1559ff0b00914b6892f8
+SHA512 (NetBSD-6.0/cats/INSTALL.html) = a62d6cbd6f300d4287f899e76526282ac04a538aedd201754876f8ea906eb3c486e8580b7d373eb6436ffb6c6b0d47273a3999ebfb852b1cecd7d9714931b7af
+RMD160 (NetBSD-6.0/cats/INSTALL.html) = 8fd593263624ff1e7a45b7102956094a71f16576
+MD5 (NetBSD-6.0/cats/INSTALL.html) = 50947ae742e64480da9f0f3964789ee0
+SHA1 (NetBSD-6.0/cats/INSTALL.more) = 8343db2afce040778ea31ae38be9700674dc5f02
+SHA512 (NetBSD-6.0/cats/INSTALL.more) = d40356dbe2c728dc51d6cd0efe3857a27ec9b39e2a03a01efe67733debda54b58e768218eba79dd20f97614e4a8c1138362c65acdef1aec922e157bb638f2a18
+RMD160 (NetBSD-6.0/cats/INSTALL.more) = 76588eb4c081058584fc7bd3d350f896177bec31
+MD5 (NetBSD-6.0/cats/INSTALL.more) = a912e620c4899d40ffaf15a00b033920
+SHA1 (NetBSD-6.0/cats/INSTALL.ps) = 06fff86ec204f92418e0050417a548da63a2ddad
+SHA512 (NetBSD-6.0/cats/INSTALL.ps) = 31a7ca304e80c80942d5c3b1f055251194981e7e98096fbca7c1d56f6617e5aae082a44702fcbda9cec006823d093973bdf24f1af369c532d72706b5c44243f2
+RMD160 (NetBSD-6.0/cats/INSTALL.ps) = 80c4749fc0e3d9144cae101e3e83709b509eb541
+MD5 (NetBSD-6.0/cats/INSTALL.ps) = aa6a7a310a23fcf771ab49fcec71a77d
+SHA1 (NetBSD-6.0/cats/INSTALL.txt) = 59e12295d3e1819f7ff76701baeb4541e637ef88
+SHA512 (NetBSD-6.0/cats/INSTALL.txt) = a710c598d300605c2d2f373f12f8b9b2366dd28f6cf84ccedc3c6ac3efa410e2c0a3e454489824c4a65467b0947231a6f280a4ea2cb3582bdd3d532ed994e63e
+RMD160 (NetBSD-6.0/cats/INSTALL.txt) = 5f0042bf269b86bb159915585707077a98a5f06d
+MD5 (NetBSD-6.0/cats/INSTALL.txt) = 8cb2eb0a3f5249382607fb963ca82313
+SHA1 (NetBSD-6.0/cesfic/binary/kernel/netbsd-GENERIC.gz) = 5d2bcce895dd7d88e0d5600b6ca55a4b216bd368
+SHA512 (NetBSD-6.0/cesfic/binary/kernel/netbsd-GENERIC.gz) = 85e01da3fe9ebb93fb7ae3f028297972bf4538117430185bf0885b46352f68df08fe025d91569ee0da2e17e8b83a4de99e1f3d56d2c5cb31ede3beb366afa157
+RMD160 (NetBSD-6.0/cesfic/binary/kernel/netbsd-GENERIC.gz) = 7c946881e8b671248896e5e620f8125426911450
+MD5 (NetBSD-6.0/cesfic/binary/kernel/netbsd-GENERIC.gz) = 39a8c5037a6266d0bb6df8fdb5c14c7d
+SHA1 (NetBSD-6.0/cesfic/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/cesfic/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/cesfic/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/cesfic/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/cesfic/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/cesfic/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/cesfic/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/cesfic/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/cesfic/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/cesfic/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/cesfic/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/cesfic/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/cesfic/binary/sets/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/cesfic/binary/sets/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/cesfic/binary/sets/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/cesfic/binary/sets/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/cesfic/binary/sets/kern-GENERIC.tgz) = 682508a28054a48a7242a494917ac4889bc67992
+SHA512 (NetBSD-6.0/cesfic/binary/sets/kern-GENERIC.tgz) = 0225b3aa055ad8d4c5b3029cea2459cc27e5670cd4aa50529c3490f93692273fabf6fb1d47336ca82e7b9b97c9cd6eaa6da29f1c71076c36664952cd2e8f92cb
+RMD160 (NetBSD-6.0/cesfic/binary/sets/kern-GENERIC.tgz) = 39e19612b53e389e4da7ab24ad463d19da13f296
+MD5 (NetBSD-6.0/cesfic/binary/sets/kern-GENERIC.tgz) = ae69c0b436f251484d22512f3207263f
+SHA1 (NetBSD-6.0/cesfic/binary/sets/base.tgz) = df22763e9478973636b3651d21f5cc5c5b065515
+SHA512 (NetBSD-6.0/cesfic/binary/sets/base.tgz) = bfdab8e7b9dcbd14d7e6321edbfbf06c45eafc0c85dcace6879ff485d45262706dd29a165c9d89a041618244977763af4c0f0c93d48ac39c96c5a4446122d2b9
+RMD160 (NetBSD-6.0/cesfic/binary/sets/base.tgz) = 1359d35509d93695dd0cfda9adead93875618ddd
+MD5 (NetBSD-6.0/cesfic/binary/sets/base.tgz) = 232f3d5ccd51c66577dc50e25c149476
+SHA1 (NetBSD-6.0/cesfic/binary/sets/comp.tgz) = dbd27c5388fd2ccfa90ceaf819f5fb3b86bac78e
+SHA512 (NetBSD-6.0/cesfic/binary/sets/comp.tgz) = 0657745dfedf6283919628d26665d30374807c78e049cdf5d9ce3d3dca54275ccaa992b5c21ef5c850decd1def118cb14c1e89a2bbdbe55b905e0f8100e259ef
+RMD160 (NetBSD-6.0/cesfic/binary/sets/comp.tgz) = b0bdc0fd2ca77bdadb6d03a465333bd9dca2a016
+MD5 (NetBSD-6.0/cesfic/binary/sets/comp.tgz) = 8ff8a532ccd1d24e93b4ca53a41d1efa
+SHA1 (NetBSD-6.0/cesfic/binary/sets/etc.tgz) = 20b9dc0339ed74a93dc82fc1b60f9b3fbf6b4b8d
+SHA512 (NetBSD-6.0/cesfic/binary/sets/etc.tgz) = 593ef36e7f37c6153b8068a2f8b433a6bbe821a2bfcad7ea6ce4e30bf5611172aa94e82b7aca57c141d84381c597306779e5023cab4ff28fa415b6b6bac69e3d
+RMD160 (NetBSD-6.0/cesfic/binary/sets/etc.tgz) = cd6bcc3d96f38f8e9a00cfedbeb4463a27708d9d
+MD5 (NetBSD-6.0/cesfic/binary/sets/etc.tgz) = 343a0c8c930807f71f37e7116bf8f391
+SHA1 (NetBSD-6.0/cesfic/binary/sets/modules.tgz) = d5191e8899d7345c88bae6f65c1fd249b02a0063
+SHA512 (NetBSD-6.0/cesfic/binary/sets/modules.tgz) = 22e74e63cdc763effdcb58c7d549c0811dedee37953a9669dca09010dde364c6ba7440a29ad1e1e634a7c44b69cbca65afe006b9f564bd10bc4f0852cb55dc75
+RMD160 (NetBSD-6.0/cesfic/binary/sets/modules.tgz) = 5ad1d1c039de7da6dd1183ea6f4e9c319931dc86
+MD5 (NetBSD-6.0/cesfic/binary/sets/modules.tgz) = c0dda9a6803a213f3bca675728056dfd
+SHA1 (NetBSD-6.0/cesfic/binary/sets/tests.tgz) = fdf867451cd371c25672448a1dbc7c204e8534b7
+SHA512 (NetBSD-6.0/cesfic/binary/sets/tests.tgz) = 9f137af1458c138a40dd2cf293e58deaa93a7145457127ddddabad1c23f380e36950d21cc6051bc5a4b101a632b9610a74cc3fc4bf6129e29e57ee8fd9d2da6b
+RMD160 (NetBSD-6.0/cesfic/binary/sets/tests.tgz) = 0c27b80fb02f5ca0dfea6854d0df2818df52b9e1
+MD5 (NetBSD-6.0/cesfic/binary/sets/tests.tgz) = 2cb77946d9b305a0e03a6ac5fed04ff7
+SHA1 (NetBSD-6.0/cesfic/binary/sets/text.tgz) = d9f8aaf67b6ffd9828d447b5a6b208ea5bffcbd3
+SHA512 (NetBSD-6.0/cesfic/binary/sets/text.tgz) = 931dc3aec206ff95df08c36ed09a01caa2b10bdff34affc723e7ea0c6d2cdfc493d02b9875568ec9276c2d35a74cc782ec8c8cee10ad62879831b1d728cd3d62
+RMD160 (NetBSD-6.0/cesfic/binary/sets/text.tgz) = cec72f88379d8c6b30730568eb653de4a07f8c8d
+MD5 (NetBSD-6.0/cesfic/binary/sets/text.tgz) = 1daceefaf9afa99dfb01cde29485cfe2
+SHA1 (NetBSD-6.0/cesfic/binary/sets/xbase.tgz) = d052985aaeadbeaad2aab5aab60ef68f5527a9eb
+SHA512 (NetBSD-6.0/cesfic/binary/sets/xbase.tgz) = 83089a0b043d1413d865ea766cf1c50da9d1c12165e05bfc72f26b4d4513549119cc716ffebda1fd82b20ff1766c579aa000b7c10b4f29fcca49f0ff9f05177b
+RMD160 (NetBSD-6.0/cesfic/binary/sets/xbase.tgz) = 3a8239f2ecb4e13e2352e3b09c3496f51dd12fb4
+MD5 (NetBSD-6.0/cesfic/binary/sets/xbase.tgz) = 61c565148bfbdd631981e7d42845c147
+SHA1 (NetBSD-6.0/cesfic/binary/sets/xcomp.tgz) = f3eda836d68a0b648fec7072373ae0b7267ab7d4
+SHA512 (NetBSD-6.0/cesfic/binary/sets/xcomp.tgz) = c448fa8a9665c6cd19aa05eae8456a06e0301fed427eff4d20f4a337e398c4346b285bea3c46924eada81d2bd1c34bcfa91cfd36d15eeb8ca6e9f7606514f131
+RMD160 (NetBSD-6.0/cesfic/binary/sets/xcomp.tgz) = 68333053bfff6afe3fa5e7555e58039ca42b679e
+MD5 (NetBSD-6.0/cesfic/binary/sets/xcomp.tgz) = c318f3138aabcb6453f77a6dfa4778c7
+SHA1 (NetBSD-6.0/cesfic/binary/sets/xetc.tgz) = 5965357819e9e3e64a9cf0963595a5870699cd82
+SHA512 (NetBSD-6.0/cesfic/binary/sets/xetc.tgz) = da1f214b6de2a4a1ef227c608b741a076a7d4ba491131fadd33ebbf0782fd6c0d1ade406b4aa92c973c9f87ee70b2dff20d3a710df08201aac3c1a9ad339fe31
+RMD160 (NetBSD-6.0/cesfic/binary/sets/xetc.tgz) = 7151d3746cae1d748a566356431ca8ba4a5b51f3
+MD5 (NetBSD-6.0/cesfic/binary/sets/xetc.tgz) = 616f7da77033039c3b6972c33223215f
+SHA1 (NetBSD-6.0/cesfic/binary/sets/xfont.tgz) = 46a06412b08381288aeb30ddc5b5a30d09530fcf
+SHA512 (NetBSD-6.0/cesfic/binary/sets/xfont.tgz) = b5c5c517924de3ae3bc0fd094c0be19501668f4ad25feae8768c5c17065ff90b9b60760afa47ee93909fb92c4c12a818a95f0744e988a04e20be51f0d5dd4d66
+RMD160 (NetBSD-6.0/cesfic/binary/sets/xfont.tgz) = b58231d11d9ea95811dd0a6f548b6bdb18eae61e
+MD5 (NetBSD-6.0/cesfic/binary/sets/xfont.tgz) = e52bf6c25b8e5fcef899329b68856e5e
+SHA1 (NetBSD-6.0/cobalt/binary/kernel/netbsd-GENERIC.gz) = c9618dcb53044599e6397eac6bfd5dbd6f106cf0
+SHA512 (NetBSD-6.0/cobalt/binary/kernel/netbsd-GENERIC.gz) = f46c57b34ffc0f0140094384a10ea7c3d0140f315fceed6b02a1ec4770d6114eb1e995020fd056e03af71185f0448fde86829f5921b961a903bf0c275ff730e3
+RMD160 (NetBSD-6.0/cobalt/binary/kernel/netbsd-GENERIC.gz) = 4f69bb230b7c20fc591af0ff0e788e0f9a6dfff7
+MD5 (NetBSD-6.0/cobalt/binary/kernel/netbsd-GENERIC.gz) = 4ef49f4e446b38c2dcecf61dbca8fa25
+SHA1 (NetBSD-6.0/cobalt/binary/kernel/netbsd-INSTALL.gz) = 8c6edfcb94e9c0bfe670a78e6599dbba4787ef6b
+SHA512 (NetBSD-6.0/cobalt/binary/kernel/netbsd-INSTALL.gz) = aa2dd1067f3fe253b43eb3a1ec0c8119a717c43236f1df4d72a4ac5667de310ac904bbca89588b9438a3aacdee5bb3d569e170dab17487ec5c6d9c148086085f
+RMD160 (NetBSD-6.0/cobalt/binary/kernel/netbsd-INSTALL.gz) = 54a79af6fbce4c15b3415137f67a35e0d5e34daa
+MD5 (NetBSD-6.0/cobalt/binary/kernel/netbsd-INSTALL.gz) = 112e15f9d41a31dbe6eb6864d62633ef
+SHA1 (NetBSD-6.0/cobalt/binary/kernel/netbsd-RAMDISK.gz) = 4075b370e08ffe708669556c584e79073a9280b0
+SHA512 (NetBSD-6.0/cobalt/binary/kernel/netbsd-RAMDISK.gz) = ae5eb10935acf635e7a3abf985b86fbe9a57a071dea8ef7fe08ff5fd887901331d603e61d1bfeba330489534c4accae61e8c63fcc0cbb4a248e8fffa53d59fec
+RMD160 (NetBSD-6.0/cobalt/binary/kernel/netbsd-RAMDISK.gz) = 9537810097f1bfe7c0cb7a4154639c8374a17c63
+MD5 (NetBSD-6.0/cobalt/binary/kernel/netbsd-RAMDISK.gz) = 0a477e1b678ab3c2906eef7d9082d2a5
+SHA1 (NetBSD-6.0/cobalt/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/cobalt/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/cobalt/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/cobalt/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/cobalt/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/cobalt/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/cobalt/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/cobalt/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/cobalt/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/cobalt/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/cobalt/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/cobalt/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/cobalt/binary/sets/xbase.tgz) = 76468fcada5a9e26652aa9f0f9f3c94829a317e9
+SHA512 (NetBSD-6.0/cobalt/binary/sets/xbase.tgz) = b2adcfc2dedef30b21b885c8fc757d0479541744a280a9997fbeaa9c881009ab4b0019e0001a540a8eb6db5f84db87b365e420bb2d4270af209821bdb080369c
+RMD160 (NetBSD-6.0/cobalt/binary/sets/xbase.tgz) = 1e0074d03d9fbb3373e0a427b25cc7097bf6d3c8
+MD5 (NetBSD-6.0/cobalt/binary/sets/xbase.tgz) = a8f29ec2e3768405942f97af3dd08ee7
+SHA1 (NetBSD-6.0/cobalt/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/cobalt/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/cobalt/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/cobalt/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/cobalt/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/cobalt/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/cobalt/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/cobalt/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/cobalt/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/cobalt/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/cobalt/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/cobalt/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/cobalt/binary/sets/xserver.tgz) = ff805022f409202f3346c45475c7ec0f8187218e
+SHA512 (NetBSD-6.0/cobalt/binary/sets/xserver.tgz) = f2bb3810a5572b519980126a3d934f63b5ab5c2fcf9fb8166c556bd3cc14cfaa151d582086bb1506ac9ac7e21d4e70a5cd5c3faed96212d8a14a0b5bafdcc4c1
+RMD160 (NetBSD-6.0/cobalt/binary/sets/xserver.tgz) = d5ae336337cc77f7f55f542b3457918d6fc0efe8
+MD5 (NetBSD-6.0/cobalt/binary/sets/xserver.tgz) = 92447a1560887d337d22e2deed0670a6
+SHA1 (NetBSD-6.0/cobalt/binary/sets/kern-GENERIC.tgz) = d085ff7c5cd7f260cc1aaca4c2e54c26c948d893
+SHA512 (NetBSD-6.0/cobalt/binary/sets/kern-GENERIC.tgz) = 0c1ad1014af64d059a5ce8261e46534e0eaed8702440b93f5109c19ed9fb0b2dbf37a23cc28f1a688ca45f9e721dd0f4a1ee6771990a835a459cd633ff0f4887
+RMD160 (NetBSD-6.0/cobalt/binary/sets/kern-GENERIC.tgz) = cfecc943b0e501f53558c87be282a948469c57fe
+MD5 (NetBSD-6.0/cobalt/binary/sets/kern-GENERIC.tgz) = 630b91f62d422855f30b33590119e9d7
+SHA1 (NetBSD-6.0/cobalt/binary/sets/base.tgz) = 90870f3189063cb2c4a2aa81d1c68d835e48ee25
+SHA512 (NetBSD-6.0/cobalt/binary/sets/base.tgz) = 9a962443ad380ef6d4dce623bb41e6b1aecd452b0adfc6e51d1c17610829f17a1b02cf5be2e539eeafcc7ff47ae79f8f7a367eebd74ea6cb70e0fc57eebbf27b
+RMD160 (NetBSD-6.0/cobalt/binary/sets/base.tgz) = 12111c0c67c4f8fbb3c54c2c3480e73caee6f33c
+MD5 (NetBSD-6.0/cobalt/binary/sets/base.tgz) = d7aba51f2552fb2e19af9adbd673dff9
+SHA1 (NetBSD-6.0/cobalt/binary/sets/comp.tgz) = f22b026d0b9c1e7725e4db4b9abbda1160a9c80a
+SHA512 (NetBSD-6.0/cobalt/binary/sets/comp.tgz) = a0a6f6185d30e28c4db98189134bcb5e2dc9820c748911e36483b84fb598c5b122c10863ccff82a2f2556734004fab2c9ac59cbc1530ec79ec535e4e426d4e5c
+RMD160 (NetBSD-6.0/cobalt/binary/sets/comp.tgz) = ed9d28519a8cc55a2806d6c1df0953c535075b1d
+MD5 (NetBSD-6.0/cobalt/binary/sets/comp.tgz) = 44112b73f63f4cddda4ac8ab8f5ba1f5
+SHA1 (NetBSD-6.0/cobalt/binary/sets/etc.tgz) = 7109941b0df321286aaf226ee48222fbc7ad692f
+SHA512 (NetBSD-6.0/cobalt/binary/sets/etc.tgz) = 1d18f21beb41dd07c5744b127209b5de8f5fd2fbbd109c3c65dbe73126e2a987e1e1d08a68668f597ecce1d0e9875fe349bf89d74d3add850a3c4554808cda07
+RMD160 (NetBSD-6.0/cobalt/binary/sets/etc.tgz) = 1687c63ca2d75377354754bb425c02bd6907c445
+MD5 (NetBSD-6.0/cobalt/binary/sets/etc.tgz) = 3b36b16b387597ceb2233eaa72d3bea6
+SHA1 (NetBSD-6.0/cobalt/binary/sets/kern-INSTALL.tgz) = cfefd1fef2db13b66730678c9df067ab208158ad
+SHA512 (NetBSD-6.0/cobalt/binary/sets/kern-INSTALL.tgz) = 2a62524f994a5034d60f679b1d30eafe60dafb35216458055ad9e25f3c7053f4556f1edd233754e0e4eb4a79373fb814c28e832b67d9de69035513b819d5080f
+RMD160 (NetBSD-6.0/cobalt/binary/sets/kern-INSTALL.tgz) = 894035c7e551dfee7ae53cd1e7b358876fef240f
+MD5 (NetBSD-6.0/cobalt/binary/sets/kern-INSTALL.tgz) = c6f35e3463064c86be5b3229fdf23ce1
+SHA1 (NetBSD-6.0/cobalt/binary/sets/modules.tgz) = eda182e3418c72ab2d0bb33efa014d77be461b73
+SHA512 (NetBSD-6.0/cobalt/binary/sets/modules.tgz) = 52a988323ace3452cdd3c8db6d03e26f15b3d9570314c8e8efd80169676d36209a8dee6736d4a1aed53beb3ad3ecd6fe8ea9d4b3b0a85417a6540cc4f6ca2154
+RMD160 (NetBSD-6.0/cobalt/binary/sets/modules.tgz) = 0610022e6cce6e576d3bbc6f3bca284d36eff821
+MD5 (NetBSD-6.0/cobalt/binary/sets/modules.tgz) = 2850ca4ea69cbac5274f2307a48394f1
+SHA1 (NetBSD-6.0/cobalt/binary/sets/tests.tgz) = ae62656c92b1883296087eec3534d7542356c79e
+SHA512 (NetBSD-6.0/cobalt/binary/sets/tests.tgz) = 35a22f1ede3db17eaa2c29645c5675fe5a2c4fd6deefc5d372cbdf1ac61c592fe7acf65486a8c576d3ee8651ddb3afa33e39e644de18d2831d25c89aa74c734b
+RMD160 (NetBSD-6.0/cobalt/binary/sets/tests.tgz) = fba7399b23a918470dcd108a422bb4f998a94a42
+MD5 (NetBSD-6.0/cobalt/binary/sets/tests.tgz) = 21dee182d4f02df926ce52688347af72
+SHA1 (NetBSD-6.0/cobalt/binary/sets/text.tgz) = 58049b832c3722ddb05f8eca622f77ff8e4e8a4f
+SHA512 (NetBSD-6.0/cobalt/binary/sets/text.tgz) = 4eb3919068d26f193fcca2a30e27152421be198b313fa9700612a0d9d094d67d329b2e72e70b02c4789c1430378269f35f0758042faf60c26a18e293947c7db9
+RMD160 (NetBSD-6.0/cobalt/binary/sets/text.tgz) = a2eaa36b8c306e0cd6a9e17218aad574d4fc3508
+MD5 (NetBSD-6.0/cobalt/binary/sets/text.tgz) = e0f6aa8df8d17719f265922d2aebc787
+SHA1 (NetBSD-6.0/cobalt/installation/boot.gz) = 59e1785a9e2ea35df01f4726b62f6fbbc74c56df
+SHA512 (NetBSD-6.0/cobalt/installation/boot.gz) = ad2baef23c54d600d49e7777b924c7d79c8e7e3f74107e9fcd939b16811b31979391ce8f3ebeb4b31810fef2cec13df063d31e4b3a5b5c57b550156b796a4410
+RMD160 (NetBSD-6.0/cobalt/installation/boot.gz) = 9ac9dbfb3932a92e2b4e03664bdb8dbed4fc0e71
+MD5 (NetBSD-6.0/cobalt/installation/boot.gz) = f4b10cb6244d765eb7a9a6a3ef1d09ba
+SHA1 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.bin.gz) = 971d8de48c6c6be81f723ada4b7c509dd152b86c
+SHA512 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.bin.gz) = ac63feaca53a1abad181877bec95098e06e89343cd783f309ed3d223a80005d49fd5b3420a36c8e2894389373a9a8d4a023f134e1ff847f240864b8f529adfbd
+RMD160 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.bin.gz) = 5abfe7b82ce9b81c69818cbb533a9d7e69f01081
+MD5 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.bin.gz) = 6ed9526e1fc60db1cdab3dfedb2a4ffe
+SHA1 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.bin.gz) = 7950c0154a603614e8aaa75da019ffe266fe36de
+SHA512 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.bin.gz) = 2421894a9dda95a17a30b6a4d87e350f7bd17f467362255eb22c8a56e0ac1e54592136d0b0d218c16a14afb8684bb8eaf11442217af1c217ea4588d6290c761e
+RMD160 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.bin.gz) = 326f220c689b47fb30e91d483a009246993da43e
+MD5 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.bin.gz) = acaf2f6174037777dc0dfc175da86403
+SHA1 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.gz) = 85e46b6fa4ab45b810f6c3f4b3268cba0f895cb4
+SHA512 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.gz) = d3f2e7306c8b8ea0969bb68e5888ba16436632479a6555a4fffe2479c4cea1dce048c2d18b6653fe1946b9a9bd2d2df1da172d71df45c6eca59a1c91e81f51a9
+RMD160 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.gz) = 31820c3a9b7305792ca4246aaa0d8e5474c2a8ba
+MD5 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC.gz) = b48de4452de2d94b74d617ba30b529f8
+SHA1 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = 83040bbf6395952a68fbfde410db2729c8d814c9
+SHA512 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = c48a2bb6dc2bac588b3e9690dbeed3b85361439e40e3410220c0b9fcb70e2e6a2bdffd24ddb428f740895ef34c3e56955f2877509441be0c158e97407656da24
+RMD160 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = a6f75d1e098e0bebb9da8f6149114de13416b210
+MD5 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = d72d4a1170c9f40c41c951eb2f40dd9c
+SHA1 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.gz) = 98765e3c532799a669420e9b6a89b22033059d66
+SHA512 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.gz) = 34a64fc5eb79bec00adf55f9788139730c5f35bb8e05f0b00899776836aa0dc7c372482ed5cb9341fa7354d5f8c76ed6b879ac516210d89e33794efbccf40127
+RMD160 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.gz) = 5a4349f94c8afe0d7ad4c6ca4b02d766ddfc63b3
+MD5 (NetBSD-6.0/dreamcast/binary/kernel/netbsd-GENERIC_MD.gz) = 7c4659ca64c7f31b205e8d1ce4166597
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/games.tgz) = 2040b4af557a62f2ade5fc9fcfe4cab3df88c7e2
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/games.tgz) = 8b5071337dc844042537c24c75660e61c9709cd10cbbeab059a84da6d482260b73365ff3870f85060c130a291b6f02be174d288127ca62ce4d291a6982192317
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/games.tgz) = 28acfa5a131d52df7c157e2edca1dd0f20e774dc
+MD5 (NetBSD-6.0/dreamcast/binary/sets/games.tgz) = d82c46dbc0021fd4694e464042936052
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/dreamcast/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/dreamcast/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/xcomp.tgz) = 53aa1e2a910e8eed09dc07f8b724804f53fe5e2f
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/xcomp.tgz) = 24645da85419528015cdaefd0c835741fa801392e795b363bdfc39558e75e7f384511c0668d12e2440114b7c543c7532aaec438048f08d35c54c9c7a748f20c0
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/xcomp.tgz) = 60a461ffc1f1562274110d65c72a541ee131cd21
+MD5 (NetBSD-6.0/dreamcast/binary/sets/xcomp.tgz) = f1d2650a8d7a4ecd60fda8e1aaf8c09b
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/xetc.tgz) = 1636a6fe3e01f6d8a07a19cd204a6807c8caa4c7
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/xetc.tgz) = 9cea4ba4af287dd57e591d4269f2f2582010250316f323746ac56b12cefcf2590b93fbb0197c665f61b1df41dcca62d17fb6ad80d4b1feb8ac8265e91e15074f
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/xetc.tgz) = 5f68e3f96f7bb9ae07fccdb1d058e4b1307b4b29
+MD5 (NetBSD-6.0/dreamcast/binary/sets/xetc.tgz) = da84d97230787283e215a4ee1c4053ad
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/xfont.tgz) = 97439ccf6840b18b1e9885f5504a401bf1a93650
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/xfont.tgz) = 3d15541f7d7ae2128f44355bf110415adfa4e5182829259d2c6f7a4217feff99e236d13c5bb7bbeb724ff1a09ac1f58f02bdd6eef528bc416ec3118db6fc7d45
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/xfont.tgz) = cdc9fcdb5fd5032803d5bba18db58f3ea6d62c85
+MD5 (NetBSD-6.0/dreamcast/binary/sets/xfont.tgz) = a8466a0477c6c443eafe99e9d1c61131
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/kern-GENERIC.tgz) = 8f11a046a1e6277a5f90f44142735f39375f949c
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/kern-GENERIC.tgz) = 12786eb317effcd2f7f108a139a95b99c6026e75370853d3761292d431063859dfff26ab4a2bdf5c8bfcfbda4deaed9025583b30367e00074dc875d759f1cf76
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/kern-GENERIC.tgz) = 464ed36bd11cfa0b181632d2b1c54f34a511fd14
+MD5 (NetBSD-6.0/dreamcast/binary/sets/kern-GENERIC.tgz) = 1cd64692f608f13541288f3ff263fa82
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/base.tgz) = ce23182c9b35fcba35fce0e3f12578a988a8ecc7
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/base.tgz) = 20dc7d634449bb7e57ae55458aa0f2d53c5f03f92df3df5a6429c1f3192871ed2fb8ec64700a045591d308a31baa3212c8a7ee6f3bfcccc05974557bc2e1ebad
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/base.tgz) = 7fbdce2370f91ad3aa3abec889333b59755b0f4b
+MD5 (NetBSD-6.0/dreamcast/binary/sets/base.tgz) = 3aee642fc36860e63bf85392888ab2a2
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/comp.tgz) = c288c3890b514eb00673399571a6d22d4abf7608
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/comp.tgz) = cfbe2ddaf47453f9b20a74890e3585fd82a23d25489378b41276848019971f1e740e00203418db16e1832777b96d3b16eeeae1a4fcdf9551b93582395c5a3838
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/comp.tgz) = b79a42001602eb84e650fe34a25ac20e5773703e
+MD5 (NetBSD-6.0/dreamcast/binary/sets/comp.tgz) = 57451cb40d16c7d6dfb960eb4848754e
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/etc.tgz) = df82ad0e59f00bfa96ca079e1dac2b0f772a6b1b
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/etc.tgz) = 87d552690ee356eb3a82c763ddf3f44ed57a5d0d8616974570ba21a2901371e6ee6e54d0b25cb5607466f01cbabca86fe096572f395c74aa6dd98be45e4c7ee8
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/etc.tgz) = bbc9f48831c1483ffe9c9aab353995e162a5a385
+MD5 (NetBSD-6.0/dreamcast/binary/sets/etc.tgz) = f0881f75efa980e58cea0c0d60f55656
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/modules.tgz) = 243ab8d8f5d3375fbd17efb668c1abe45d0d1487
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/modules.tgz) = 193c158f2d2f64c3b571c6e10d97bdbca141faf5ee1a970e3c1e194970e2723e74d8372e0110b52d11e210e860102ebf24012a2267a0f98dedeceb0cc60429f8
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/modules.tgz) = 788e45cc0d8a03191c14f3fe0d429ae331d96895
+MD5 (NetBSD-6.0/dreamcast/binary/sets/modules.tgz) = 83acdebfad50fc820d420b4e74c87762
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/tests.tgz) = 263b82b9d13d080e46cd27e4a6e5df9d43e6f74e
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/tests.tgz) = ffc4a4348c68f8b06f1387d60e1d5b1bcc1b42ec6d255cd267dea08aef4874591dfc95f69ce416333679cdbc124540cb9b92e58ad9f522e6f34eafa2f6dd9ef2
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/tests.tgz) = 2518cdf17a8f82dcf39525e2928ef52e46e32325
+MD5 (NetBSD-6.0/dreamcast/binary/sets/tests.tgz) = 2f0af9ef7e65f9afb0185e305a206183
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/text.tgz) = 577c45d37aefc65d2787bd989002bd3748440b56
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/text.tgz) = f1a7e6beac2f881e8b9d356491e4b09d7b92b0a0ed33462575db59ce8effae6ca2a1989e4fa9b78fc5d012b118b2f99a2e2fcd7505a0ca80eb61684d5bceb096
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/text.tgz) = 2688ae8578acf1b6b8937abf4d05cb09e7e2ce8d
+MD5 (NetBSD-6.0/dreamcast/binary/sets/text.tgz) = 0cc81795b0f4ddd432f3dfa01eb2a530
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/xbase.tgz) = 7305b994f65ffa7d67a9f99d0146e705f81ec723
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/xbase.tgz) = 904f0c21201d51b58c366a984eb20191c620287b77b12b520003d48fb0ce1a3ae10fa871c3514598a74071ce0cc1321ff781b96195a13e81c75d35cdc7958030
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/xbase.tgz) = faa8760bbee9d3b2a21e3b62fddb641faf939ee9
+MD5 (NetBSD-6.0/dreamcast/binary/sets/xbase.tgz) = 655c33ebf6f37bd90b1921b220dff2ac
+SHA1 (NetBSD-6.0/dreamcast/binary/sets/xserver.tgz) = df506c92cf396d2d59ee212c03a10f44129f51a3
+SHA512 (NetBSD-6.0/dreamcast/binary/sets/xserver.tgz) = ee8b15abf9e8115ffc50deeb372e9c7dfe9412f8e94d65b3ed78f78fba63e9282b668c8fc2fb2a22437f950adafd1dedf2e9baf395fa945d04eeb50db0d1f5cd
+RMD160 (NetBSD-6.0/dreamcast/binary/sets/xserver.tgz) = 73bcaffdf98d0a5c4d5c22c97c5476c1b5901eec
+MD5 (NetBSD-6.0/dreamcast/binary/sets/xserver.tgz) = c5e16ae2cf663c0373fbb82f64f4f48b
+SHA1 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.symbols.gz) = 7ffd5f42e92a4ae32ca78766815db12dbfd4c4f6
+SHA512 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.symbols.gz) = f7a50a9ee148ac9566dbc3722b14d904c02a3cbf285ea8efb10a24b8a93db514abbf825dbde48a8c494da6b02f48408b9414a6d8a45ed61f334afd2dd148aa71
+RMD160 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.symbols.gz) = e03b53e71c192a3de6d720b0502e0597f2ab0aee
+MD5 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.symbols.gz) = 014979ca9f7b5feb3664479cd34dd2d3
+SHA1 (NetBSD-6.0/emips/binary/kernel/netbsd-GENERIC.gz) = 663be1ef5f9177715d8a299d3e610b21a942dc16
+SHA512 (NetBSD-6.0/emips/binary/kernel/netbsd-GENERIC.gz) = 006a5189536650946aeddb6763997bab1cafe82b578777674f75df8346d6bd01467d532de7be3c5ed0664d9b85e4da90a90871f6e15fa5166af29f1e87d9d7ea
+RMD160 (NetBSD-6.0/emips/binary/kernel/netbsd-GENERIC.gz) = 15cbdb609c3925081aac2e84ebc104775601fad5
+MD5 (NetBSD-6.0/emips/binary/kernel/netbsd-GENERIC.gz) = 71af44cf65da1b8ecdadbbf037f07ec5
+SHA1 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.gz) = 4f40fd5aa8028bd956dfc51a5e61be77ca742adc
+SHA512 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.gz) = 9fb9cfe8aa5d8ea350b24ad80a207d9439141914bd4e3371297b9971969c96ca6899b45f099e1e02ed4c8ffbea75d421b22af7d09b5b91c2f435df176229b4c8
+RMD160 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.gz) = b269d2a87391b9640988493e3493edd114e7e8b2
+MD5 (NetBSD-6.0/emips/binary/kernel/netbsd-INSTALL.gz) = 59724cb6c92366dc47fa0b4ecf2fe22f
+SHA1 (NetBSD-6.0/emips/binary/kernel/nfsnetbsd-GENERIC.gz) = 5dc90ad559e682bd427b6165f760bb09ba676e7d
+SHA512 (NetBSD-6.0/emips/binary/kernel/nfsnetbsd-GENERIC.gz) = 4992a1e1bd6cc1dc21821a6151aa3561fda5e369ab6057575cd70d63503a98a8d9da257956486f2f58996b0aaabf20266c16033c1f069e3dcc21f582f74006f8
+RMD160 (NetBSD-6.0/emips/binary/kernel/nfsnetbsd-GENERIC.gz) = e7f4efd86d048e9f9857bb3cbf136a3e461b9463
+MD5 (NetBSD-6.0/emips/binary/kernel/nfsnetbsd-GENERIC.gz) = 66abd685dbc87ed5282e1b55a6b7bfbd
+SHA1 (NetBSD-6.0/emips/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/emips/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/emips/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/emips/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/emips/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/emips/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/emips/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/emips/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/emips/binary/sets/kern-GENERIC.tgz) = ed3903192d38367303cf5210725c33ba123c216d
+SHA512 (NetBSD-6.0/emips/binary/sets/kern-GENERIC.tgz) = 62687e8a1af317454e30a65dafd1b54eb444db9a27abf987ba17bfaf4b9796623f279011c2102500563c9a862fa983c5e48a9c94afdedeee15414840dcd328fb
+RMD160 (NetBSD-6.0/emips/binary/sets/kern-GENERIC.tgz) = 070bb8b5cab57c375fad13304165f8825e6647d5
+MD5 (NetBSD-6.0/emips/binary/sets/kern-GENERIC.tgz) = 732ac8530d63fe2f3eea6e2def05ab4b
+SHA1 (NetBSD-6.0/emips/binary/sets/base.tgz) = d058920475032b263b2020af3230894da8ded663
+SHA512 (NetBSD-6.0/emips/binary/sets/base.tgz) = 606b27579e80fca77e82a385dfda2e03bac6d8563186ccc98d993cd532bc79da93883cf71f850380cafb31107efb424585a4aa5946f54bbc36aae5d9d9495a44
+RMD160 (NetBSD-6.0/emips/binary/sets/base.tgz) = 2663d48750530861b5e9514902b9cc44e8a4162a
+MD5 (NetBSD-6.0/emips/binary/sets/base.tgz) = 22ff23e09d0502d77de5fb289ad53427
+SHA1 (NetBSD-6.0/emips/binary/sets/comp.tgz) = 5c25affcdce77ce7a77755c866316a9db89272a1
+SHA512 (NetBSD-6.0/emips/binary/sets/comp.tgz) = d2b09aa5b72624ad3f25fa1438a8feef1e02b8f9ff064dd1d05a621f29a9790b0029baf652ab5c0ae2c3811532208235288c6614f62c378bc6b1b4a5494fd06d
+RMD160 (NetBSD-6.0/emips/binary/sets/comp.tgz) = 2fd5cfc13841a1188580c6584f78bf8262752da9
+MD5 (NetBSD-6.0/emips/binary/sets/comp.tgz) = dc12cdcce6751fd44291a95a06cf97aa
+SHA1 (NetBSD-6.0/emips/binary/sets/etc.tgz) = 6bf20c929df89dfe6764df1f4ab15b6aeb45d4cb
+SHA512 (NetBSD-6.0/emips/binary/sets/etc.tgz) = 4ee6668a884bb4b4c3ccc4370a7ac70ed14f32b7856219fa375f200ad259087400e93fe144bad4650318cbe9af4133e8d8d8f79cd0d91aeb24df117117ac54bd
+RMD160 (NetBSD-6.0/emips/binary/sets/etc.tgz) = 9081112a95ee958fce83e79f687b97ef847587b4
+MD5 (NetBSD-6.0/emips/binary/sets/etc.tgz) = 912ab9bd3949946dc2af9522581118fe
+SHA1 (NetBSD-6.0/emips/binary/sets/games.tgz) = ec034031c6b1ea012c36910f2e901b032b0aaebe
+SHA512 (NetBSD-6.0/emips/binary/sets/games.tgz) = e9bd506e1f6a6c17c0505db90f7da49795dc63905c9962e01a69224a1cf22312d9e4c68d815e9c487f21fd0791bac3a65a5e5f7bce46198694f673522b057d96
+RMD160 (NetBSD-6.0/emips/binary/sets/games.tgz) = 393d511e3432d93932f2b3d2308d6a16b7cce764
+MD5 (NetBSD-6.0/emips/binary/sets/games.tgz) = 71d23c31e025ff3b1eece7b3cb170abe
+SHA1 (NetBSD-6.0/emips/binary/sets/modules.tgz) = f9aef1ecd6e2ee16d7ddfdad51da034bbdcd8aa6
+SHA512 (NetBSD-6.0/emips/binary/sets/modules.tgz) = abaa6c62593d85131f691a3125e055970a8c3fdd7d8103db6e501dc2d2379c9dd16f9a819e14ac20959011d8946c40a8dc59ee0b7ead8a8f25c20a6475696bc6
+RMD160 (NetBSD-6.0/emips/binary/sets/modules.tgz) = bca8a2cdb2ced4804cc2e0543981b1db671732e1
+MD5 (NetBSD-6.0/emips/binary/sets/modules.tgz) = c98d2b8fab6184f74545c6fa54897a35
+SHA1 (NetBSD-6.0/emips/binary/sets/tests.tgz) = 05a68659aec8758adb269e6f898607e1fc3f9089
+SHA512 (NetBSD-6.0/emips/binary/sets/tests.tgz) = 1434cd321d5f37e6482645a11ce4f203ea3406fcea550103e1881bc68b1e8760697e5e6207ad01d4dba2d1b71c2ed0488bbb0c01dec2b28a6a74e3529ab81a8a
+RMD160 (NetBSD-6.0/emips/binary/sets/tests.tgz) = dc76faefeb42e73abb5727e46bdb46ce7a737be3
+MD5 (NetBSD-6.0/emips/binary/sets/tests.tgz) = 1ef426de07b570c1d9affeb44e452225
+SHA1 (NetBSD-6.0/emips/binary/sets/text.tgz) = 96fc1b82a283a2bf4cdd76168ee3cefa73191be8
+SHA512 (NetBSD-6.0/emips/binary/sets/text.tgz) = 7cfdb8107f4d0bfe28bf41c15b2fe7f9c0aa0d075cdb7fdb0b4566ed512da3123eff94410bf563c6a37aa498d83ed9cc7b9e16d54c8bf33605fc60bf1357c4c4
+RMD160 (NetBSD-6.0/emips/binary/sets/text.tgz) = 1e1ad1dd678eb777938e2320522e275a5751475c
+MD5 (NetBSD-6.0/emips/binary/sets/text.tgz) = 11f296781f98a8ae6aac39f40cb45805
+SHA1 (NetBSD-6.0/emips/binary/sets/xbase.tgz) = 535b4c29666ef2de43bb6017102e9181576255ea
+SHA512 (NetBSD-6.0/emips/binary/sets/xbase.tgz) = 31656ac187e0adf03eff3f896876510bb7624bb18789094abf22a59008e9d7b8d848cc1703e15b799fa2b4cd9e108f1d29c5625f1ae9f012edf8cf35912e4590
+RMD160 (NetBSD-6.0/emips/binary/sets/xbase.tgz) = c8b8ebfb26aaecc931b8d8a17625eb91f904fcfb
+MD5 (NetBSD-6.0/emips/binary/sets/xbase.tgz) = 46641b24d37899b78ef7a83559bfc3b0
+SHA1 (NetBSD-6.0/emips/binary/sets/xcomp.tgz) = 6cddeb4f503fb424f9a06645ef46701288799401
+SHA512 (NetBSD-6.0/emips/binary/sets/xcomp.tgz) = 45f779894389850776fdd4785165f6bf07dfcd46d408199eb352492536b254fa229b9d4e99a716657f210c4772feea966814329f3f2aaa729112c9b8f9d4e50a
+RMD160 (NetBSD-6.0/emips/binary/sets/xcomp.tgz) = 9203f95dc810dbbd873aa54234dada2961a6d309
+MD5 (NetBSD-6.0/emips/binary/sets/xcomp.tgz) = cbb4c61d832ebb4aa97c99484e9109b5
+SHA1 (NetBSD-6.0/emips/binary/sets/xetc.tgz) = 7db74837c8e702a831451e4660c1f8670e674003
+SHA512 (NetBSD-6.0/emips/binary/sets/xetc.tgz) = d68c233f0e4dcf5961bfc214fa10188d5fcb954e103ad610b76964c8e832e5758283bb28ef3eba448cde496d610b488f7958fb391371e1230a7b6127c267dcc5
+RMD160 (NetBSD-6.0/emips/binary/sets/xetc.tgz) = 2d5fd67c9ef6ddef6c3f5fdc845ea23f2b0e3b57
+MD5 (NetBSD-6.0/emips/binary/sets/xetc.tgz) = 98767dc7c3a45e641592807be04f1a64
+SHA1 (NetBSD-6.0/emips/binary/sets/xfont.tgz) = 6f8acfd3feb8f6421cfea08d8cfe514ad7bc7acc
+SHA512 (NetBSD-6.0/emips/binary/sets/xfont.tgz) = 2b4d59176fdef5055b0c5d8ef7677d6a1ae823d86d5955a2c33be046ba7bd8bfad85ae21e8acb11a50cba250d21bf0f2bb8c43aaa5d7d0767998dfbbfa54d014
+RMD160 (NetBSD-6.0/emips/binary/sets/xfont.tgz) = 34878c9b7c1380c42f57eadea7369b687d0e45bc
+MD5 (NetBSD-6.0/emips/binary/sets/xfont.tgz) = 540f04b4c6acb6e1b6364303388f82ed
+SHA1 (NetBSD-6.0/emips/binary/sets/xserver.tgz) = a85da9c68ded22e61f2234e696b0bd61739f4a08
+SHA512 (NetBSD-6.0/emips/binary/sets/xserver.tgz) = fd1bf84b2f34befbae2dc34e3fc5af3048c93c185d8cf5e8afe91e324bba7005d14d9cd73db5e09bee783116b9a09b01b650a9097df07a335fc81a2bc569c2b1
+RMD160 (NetBSD-6.0/emips/binary/sets/xserver.tgz) = f066886778a33191aaed1a30ac8494b6deb152c5
+MD5 (NetBSD-6.0/emips/binary/sets/xserver.tgz) = fc4fa9292f46a325f74c4abc922fd215
+SHA1 (NetBSD-6.0/emips/installation/diskimage/diskimage.gz) = 9c4d0f6ee9e3251ef720acdb06e20683c55a3db7
+SHA512 (NetBSD-6.0/emips/installation/diskimage/diskimage.gz) = 5b9c5d72e5e4bfcae27bf51c2ec9fa849b019b475d6677be8c49c31f18eaff6e559d80790ba6d5e606169215e46e04322c4d12ed0386e76635fdebe380cadd28
+RMD160 (NetBSD-6.0/emips/installation/diskimage/diskimage.gz) = e7373c5f20e4728fef9951dfc1beffb70390f651
+MD5 (NetBSD-6.0/emips/installation/diskimage/diskimage.gz) = 4f2e15b3d203006588a75670b4d3e75c
+SHA1 (NetBSD-6.0/emips/installation/miniroot/miniroot.fs.gz) = 4075299a2ef6a4368234ed1e378c2931b0df6376
+SHA512 (NetBSD-6.0/emips/installation/miniroot/miniroot.fs.gz) = cee815c8a985125fd2c1a9a4811542371ade25fa7f35b4cc4da1783186146d4620d1910a24b92beb02d1cf836e9cfc2921ff9d8c81ecb4babf585b1ec3601496
+RMD160 (NetBSD-6.0/emips/installation/miniroot/miniroot.fs.gz) = 1701f681ccb15b5232abc07550de79d3380af96c
+MD5 (NetBSD-6.0/emips/installation/miniroot/miniroot.fs.gz) = 5cb7df17380c5bd1d56b28d6061332f8
+SHA1 (NetBSD-6.0/emips/installation/netboot/diskimage.tgz) = 04f571f04a2227b98df91f97023e860af233d2c8
+SHA512 (NetBSD-6.0/emips/installation/netboot/diskimage.tgz) = e5c7354014f23996e0e5c331103b9936387b9c6402491041727b69353f6af08b57cf429b51ee0c28e76e3f4506479b0559dac18b05a009a3afca76ad2edbd29d
+RMD160 (NetBSD-6.0/emips/installation/netboot/diskimage.tgz) = c57777b29a2c589549a906fd0f425c56366a7075
+MD5 (NetBSD-6.0/emips/installation/netboot/diskimage.tgz) = 9d1bfe38f9ec7d4ed86173bb157abf52
+SHA1 (NetBSD-6.0/emips/INSTALL.html) = bad639d8582318241d268e529e8e024159dc5997
+SHA512 (NetBSD-6.0/emips/INSTALL.html) = 94627da8cf355e0f7b3a597e2e22be0b151a9c4e40301c7c0b67c1877c34abff57476a5c177035c032cfc1d9b8f9d38aa919c27f1f3c15d3edb3403d18e71b44
+RMD160 (NetBSD-6.0/emips/INSTALL.html) = f2b00377e6a6d060e9027d78d2278445ff6b4d75
+MD5 (NetBSD-6.0/emips/INSTALL.html) = 825b11bed2394322021f65e43627a391
+SHA1 (NetBSD-6.0/emips/INSTALL.more) = 9906d8f0c74d8538aa2e7d1361800cbbc2db2d29
+SHA512 (NetBSD-6.0/emips/INSTALL.more) = e8419f85e6beef4bf18f6bc916141ae9bca52eb6f56e2ae7133fc771ca1033cf2172a644e4415be0019868004278605f0e93c42f8f4f60d1e2fecf8c06a51a90
+RMD160 (NetBSD-6.0/emips/INSTALL.more) = 70fa5e023134732afc81b3622480328ae9f5d449
+MD5 (NetBSD-6.0/emips/INSTALL.more) = 0cff06f0f5c3bac3eaf4bf4336494217
+SHA1 (NetBSD-6.0/emips/INSTALL.ps) = 5783005eb38711a9ffb248fb5bdf2987912f26fc
+SHA512 (NetBSD-6.0/emips/INSTALL.ps) = a27d36ced381f22565ac6ee290d4ef43de834977ca8be3d96bf758005a6fe0875aa03f703da08b7dfd5fdbd48c19c77ef5263f8571d0f5f983ff7c1d08088873
+RMD160 (NetBSD-6.0/emips/INSTALL.ps) = b8e28009dd02ff9c1f98d5fadadc6455c262238e
+MD5 (NetBSD-6.0/emips/INSTALL.ps) = c16b7dcef0674aaf0dd240381961eaa5
+SHA1 (NetBSD-6.0/emips/INSTALL.txt) = 0d166d27be7166a76ad58779f1272a1a1542e952
+SHA512 (NetBSD-6.0/emips/INSTALL.txt) = ba74f2486c3bee1b30fc39edae6ad38b0abcd9610afdad172a49590aa0c1fd8a2256d185a699baf6bea9e40d9fec7d1e56c17d77858d9ebde027419cc044b8dd
+RMD160 (NetBSD-6.0/emips/INSTALL.txt) = 729887c61690c966497811da66852780d0d3eec5
+MD5 (NetBSD-6.0/emips/INSTALL.txt) = 8a28948bd5d45a30ca79556be75dbd69
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TEAMASA_NPWR_sd0_flash_0x00080000.gz) = e8620ef3bbba89642fcce48ed01e16f0783e889e
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TEAMASA_NPWR_sd0_flash_0x00080000.gz) = 055cdfd0872737d68054fa4c2125d131e6ee3f60135be817da7fe111adb2290c4ad8d968b4cbefc67658c3e9f3dfdf99caaec320f572a00a790604c93fa73408
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TEAMASA_NPWR_sd0_flash_0x00080000.gz) = db49ed4cceac70d18a8a6b335f20923d07c8ad8f
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TEAMASA_NPWR_sd0_flash_0x00080000.gz) = 12617c0444b2a570637a45339937c77f
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_sd0_flash_0x00140000.gz) = 3160f03e833b96020804361b1d98c0cffd8c5345
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_sd0_flash_0x00140000.gz) = e5d7ceae7a4b4446002170c84a44dcd65cdbb2458c889582ff3070a20580ff31d2f497b07c320217b55f75e6b343f689b9312d172dd3880bd82808e6cdb995c9
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_sd0_flash_0x00140000.gz) = 41f31d747ec5265903490d300bce1e6c34ef32ca
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_sd0_flash_0x00140000.gz) = efec631edb7870b4cc3ab1cec8d98810
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_wd0_flash_0x00140000.gz) = e1c927a0718d63609fe15d9dc9c265ab0172ddc5
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_wd0_flash_0x00140000.gz) = 5418c2ebffd11c30028d867561e26dc5857167698c88f5d9eb30af3944fdab4950ec2f6953999689c03cf684aaada038d6f7f07494988dba9467a814fcfe1d3f
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_wd0_flash_0x00140000.gz) = 05680bce8a448c3fec2149d6c89dced13166f34e
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_ADI_BRH_wd0_flash_0x00140000.gz) = 36d8336012f5603e1b30565061fd8c3a
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_sd0_flash_0xf0080000.gz) = 9419b71634e5ff228357a37651061a1c4c2c2ebe
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_sd0_flash_0xf0080000.gz) = b17b66b1b62c16d6a0add67d55f82a6943557abbbcb8001b328770dcd2191b1b55881dca2919d7f76381aceb1ed53ae81ff002317e99d02fbfc2817d9b366661
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_sd0_flash_0xf0080000.gz) = dcf913149707315fda181d6dd6967b68fe61fd22
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_sd0_flash_0xf0080000.gz) = 4f81965829024ad764d293456cd96fbd
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_wd0_flash_0xf0080000.gz) = 748d01d1b8796881f853c31ce98e0dbf473bcf8e
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_wd0_flash_0xf0080000.gz) = 898de3034e164cbef89c0f09c76decf48c4291c7c0d077134ba1695cf0c9287d658e61c82cb2d3d46dce986014d2e52d84f0600dab0f99db996623eed7ad93ea
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_wd0_flash_0xf0080000.gz) = 452633be8258bf3df07d6e9461785a8f3ac09f98
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_CP3100_wd0_flash_0xf0080000.gz) = f6644ec6b9e7cbeb624d57e00e764b5e
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_GEMINI_flash_0x01600000.gz) = 2dece6cc86980856d901df11995ecb0a5524451b
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_GEMINI_flash_0x01600000.gz) = 270b8d528bed206bfee4cfc63ae9a04f69c282d52b2beae8cbc8298872d2ff0e50e00d849c6e435d472845a0f6b8601b94a0fe52e63c61e7b5c534b9d830d252
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_GEMINI_flash_0x01600000.gz) = fbd959fffd37010a92a76026469affec9bbe95da
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_GEMINI_flash_0x01600000.gz) = adaae55226bd3fc806962ae70e9281dd
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_sd0_flash_0x00080000.gz) = 97ec6f4a472d0b73f1d3b8d284f57debab190c78
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_sd0_flash_0x00080000.gz) = c52a596cd2ffb52c1321b2e8006a590186dddde671f4325067e546338eac4d405c7d5fe559ba6d187a1c26eba4c45d233505a434a98ee11b88b315db0a42d63d
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_sd0_flash_0x00080000.gz) = 3305a23227d275c25307ab7b999f5e0c0560195b
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_sd0_flash_0x00080000.gz) = fd76ab094a19b1f66c9d21df4cb69700
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_wd0_flash_0x00080000.gz) = 0ed362fdba88789a5d26d00e0e8285f75587f5c2
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_wd0_flash_0x00080000.gz) = 78110414c2dc51bc378c3a1d44914b4f5dffd6b1d6d0a749576e2d7d5474e7856a2235641fe310fb87b3789bbf495b16459f9c773bdab19161e65af671ae6bec
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_wd0_flash_0x00080000.gz) = 4d958d9f772b214efbf9932a00970375a6fa7e57
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80310_wd0_flash_0x00080000.gz) = ec5386e862bee8da4d46a124584e2cee
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_sd0_flash_0xf0080000.gz) = 037aa337f876321d75654dfd576dbc0c4c301e0e
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_sd0_flash_0xf0080000.gz) = e033668a417f453ca35b2b43633a7eb9160765eb42ba1b86ea61d5fd4cb5136123a69194d58b3bddc51fd7e319bae1d70028e1215a1e8f4e98270bf0b4eabfa2
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_sd0_flash_0xf0080000.gz) = a8e8d6ea67cf26c422d638794675626e7261b3ea
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_sd0_flash_0xf0080000.gz) = 2b3bb43bdb7fcd4999377eaa3b994c48
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_wd0_flash_0xf0080000.gz) = 6d8870ad00ed9f496738dd5cf7f670b5b43d2f34
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_wd0_flash_0xf0080000.gz) = 414a11de38ff565307fbe599b87b0f59ddf91db1882b5e246774ac23f6af49411ae33de4145a0d8e10755d6e78d85c930ecd0705804a25ad10e3957765e565c1
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_wd0_flash_0xf0080000.gz) = 27959615599b74b946e9e8483c2284aa3f80ffa7
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_IQ80321_wd0_flash_0xf0080000.gz) = cc0f0b0621d6d931f6dec494c7bb2305
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_SMDK2800_flash_0x00000000.gz) = 09617a28f2da331a17efe6cbdd4df7367f8ff98a
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_SMDK2800_flash_0x00000000.gz) = 9324e9fe0d4756cac25b33f8b6592f2a1a25d12b0f3752447cf660c21a3b2e93eaeb3e41a15d91c2edd827e2f5318a241c58129cff998d8f0a0a7a6a6bbc598f
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_SMDK2800_flash_0x00000000.gz) = c2e0b7b74df9090350d1afc52a15465b77eea3b9
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_SMDK2800_flash_0x00000000.gz) = ee28fbd00b44705a33d6ca6e6982507f
+SHA1 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TS7200_wd0_flash_0x60660000.gz) = 3036d8f2318c69d791b710a06d2e94c5c563fcac
+SHA512 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TS7200_wd0_flash_0x60660000.gz) = e8f2cab3b75e3f4ecfd2ed85b624c8c643eab3cd32a8d0398148f49923622df598071fbb2fef6b5687c8273762d197992a03b1d8465d96630202b78592199a1f
+RMD160 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TS7200_wd0_flash_0x60660000.gz) = ead79fd1f78230bd30f851b78dd13b670a791863
+MD5 (NetBSD-6.0/evbarm/binary/gzimg/gzimg_TS7200_wd0_flash_0x60660000.gz) = 1e25872ad616b30406dab15aa8c20b22
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.bin.gz) = e673789f88d60407c85c744a64382c102b91e983
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.bin.gz) = 43aa01312bac8975f2f66cfc47e9cbdcbfe37eb37f2076c221e5c118521e987f18c1b14bf2d94b390942820e5f6218cfa1eba67a1818f8723481d434f9fea00c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.bin.gz) = 7c45cf94c28c04db6df14decfede69e83bc0cf4c
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.bin.gz) = 49da3170f0fe2fb304e1131bf77d4c3d
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.bin.gz) = 8f057cc764ab0cc64689c2df8652f9db24e20004
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.bin.gz) = 537b67fb3baf1f5363dec0079a7bf64c0ed7d5ec9b2a383362ca04ce3f746011798d12fe10ff6e4a77ccde35aa66e8cb06e689dcd7f19b5233999ffd7a2f817b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.bin.gz) = 3119fe0017084fdb8a97ba14a7f6258450c6b938
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.bin.gz) = 755aa54a7e8e2091f3f3e7c37f34f45c
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.gz) = f133ab0dedf14635b824f7a0a7d55451933e23be
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.gz) = 56d8d397af893debd28cf4283759213f8c3171647fb4df80b570991792d2addf4473d5ac0ac8a4e4dc4a668035ee37d3331cc3b6d5e029876760d4a6e0aab459
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.gz) = 59b03c3a53d5b54cef8240612a803d1ea61486f9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.gz) = 9e800486bef03915eec15ca90ea163fe
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.srec.gz) = 18f4bd985378baf25a9e28ffeaf95423b4bf85c7
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.srec.gz) = 9a535fc733582c7e8b59784c117f6714a96a1be2e9f65be2074731532511458a97b344359992de681bd7d7980c63dcbe98e7cef4bd58cd4cd3a313cefe822814
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.srec.gz) = 0e3554f0de32a39d19c1e674084e6b42f7ddfde8
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ADI_BRH.srec.gz) = 22db840fa81c95919f08d2cb7ef81450
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.bin.gz) = 5e3cd42ec6e6af1203ea8921eb1979183164c8b4
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.bin.gz) = 21cc95b8e28d50eab2b20e5eda315781ba95c34a4e4f8d1c5907ddd81ed4b236dd100b3bdb957456e3a713211f5de11a0f55cc6516a58dab3d7212b23de95120
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.bin.gz) = 5a1f1e22d7a29bf8205c1a3550fd78d2cdbe1d38
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.bin.gz) = 61edb94110b4be5c9d8bc9ee660dbd41
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.gz) = 19c96d4bf28919a4f30e55838b0859e197d0759f
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.gz) = 823dd6b45920bae6c2817091c106af7d7fd4ffc965f64c68da520fcdd70b8bd341765d33f1adf06574baaa79395a501b58aa64b8b83628209f3a08560b90c0d5
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.gz) = 30566487cbea824734bd4d9061f5a9df30875b07
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.gz) = b35c13395ed69e7931eefff8e42f1198
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.srec.gz) = a7d4841b78d684f17658819d150d7d16b135786c
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.srec.gz) = e196c13406146baa4b8d923b4406d8e3b2a451a7cfb174a4c652b8a702b0d619d30705bc998acbe8a037fca1c8f2fda53aee9ce8d4a52722cb11c40bf1288f75
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.srec.gz) = 78cd23cb694a0062858e5e3bb2959d794176c2db
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-CP3100.srec.gz) = b4e62ffbd5091a667a7fb61c31ff578e
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.bin.gz) = 6f6bf5de9d82b058100eb089aca61b9bd59aaf61
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.bin.gz) = f91cf6eada8a84ce9c0036a4c0b22e550d71bf20fcb67d6b409d252e7db2c707aa104ae68a998cf87e98e8a47e3cda2cfa67f19c6792d3cf4f32bee59f3e2c48
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.bin.gz) = b7ec88f6f6604e897b2450223e791758e1c278d9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.bin.gz) = fb61d11fbdd49a4d826896bc45bad653
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.gz) = d44a7af68b2dffe73d6a28a742a15a64ad1c7f17
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.gz) = 244d5a9e1b36b7a18f77a1689d444375f733e4abe0a13047300b815633fe76af3bf595544078f89b1de302619e10f6d19245adeabd177fafeba93b7889dd34d8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.gz) = cad1e137c7d8bdb92221cb76679bee0ecb78f7a7
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GEMINI.gz) = d5a82888cc0477c064dc3ae9dfb29110
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.bin.gz) = af321ff02cea6f05295ed48d63145f2557065034
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.bin.gz) = 103b4e272b4ffd89e2705edcde9ecdff2d1b11bb4e4f6c46a2cfed6ea8bae9386bb357dda1fb04ca558f30d201171f2ec2aaae84b39b792715f142ab83772988
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.bin.gz) = 69a190021189d71376d88493fbe9bceb5c1bb50a
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.bin.gz) = cddd2da663644297ba2737081b26fab8
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.gz) = b7ec166d07220620ec458e776df34ce0f954a861
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.gz) = 8b38c79a2e2533d85733cc5dd176f808036e3d04f91134fab57110aa2c827f26487cbee563fe85cfb0facd6a463c7069d5d22aafe90c1803a8f0b7df2fe526fe
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.gz) = d71b9dc8f5d59f8b126ce83dc06df5f97a009195
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-GUMSTIX.gz) = a8fe08eb1fd48f4870f1f736c4a72cb0
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.bin.gz) = 33e9946d8fc4834f9c74647b322a79425d3d6c52
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.bin.gz) = 354db08b656e913a0803051b861cc77d90c3c7e170362488c9940c3d0dae047e7a9d92fec348f92d951ea4093196b9f0b210d9d0cf04b9d842494c45b6feda5f
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.bin.gz) = 393631ffd8b30a1e3dd5ecccbf950bb1a75759a3
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.bin.gz) = e650bd0cf7ad90361db3a5cd788553e9
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.gz) = eeccc5e10b4cc5b8900e9dca97222f0329c5ee67
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.gz) = 3ef842acc43f885398224dfb7c696d2334aecce84aecf7ea11d9464332e62fb796b45b302a097fd3a1ec4fe48ea92a029a8301f9d97899a51cea19c3524e39cb
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.gz) = b402a5e445815908643d27c5b69b7e055f2487ed
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-HDL_G.gz) = a74d0d8c03f2d840e118654bada47b03
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.gz) = 9380dcaafde1fc16b90858e04d0804b159a18b6a
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.gz) = 20e027261b82d2188342fc3e10bdf1c2531c9012b4c0a5fea9d480c70bf00f118f0a0487646f541a63422d1acddf4abaabb34ea0a9161bb8f429708fedd18e63
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.gz) = 23e93e206ce3d710bdb9f4e57c342aaac073ff70
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.gz) = 2101cfda9d3ee129a2768bab982c7d4d
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-RPI.gz) = 1558752bbd6b362decdd3caef1d05b8c80dcf43b
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-RPI.gz) = 15dedb25bd8759aa736fd0ce444c4c782a65ec6cdd64e3fe424e1665d3e937df88b375dae773dda973a66264b90e10d0aa89e03cc217a8afbf4d79a23cce635e
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-RPI.gz) = e64628b2e9cc699bb0a48172cc4422e9e50a624b
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-RPI.gz) = 2224734e36d6bc4a139efdad6cc86978
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.gz) = 2c4862e6fdd14328dee5191b7e007fd7f2e626e3
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.gz) = 259b9964b3d10a4b49a413ad6355c16960a538b02f19bf4c0e07fcfc51699ba9df0a0b6342e6f67b9366302026bade0bf46a53356dfe42342e06f6fcbaf64dcb
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.gz) = afcc94417f4da4b84269420db2b0952565bbee93
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.gz) = 6010c0404590c4264ff824a9a57c0e04
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.srec.gz) = 0226f405675defd77c9dcdda8916e5b372cd206d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.srec.gz) = 0213a4b6784f018154bc11a148fcd6eec14ab26bc7b714d087c845db361776a6d37ff11aab7b1c1218e7a143e7fb12a85fff77f93d97832fa12d4ac39764691c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.srec.gz) = c5132bac29060129efd95b4d9beb4eee87e0b6a8
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-INTEGRATOR.srec.gz) = d176d5afd6c40c0cbfd4f64a19e39a25
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.bin.gz) = d105689d85a45fc834acd60c920d1420782e47ed
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.bin.gz) = bbe9fdeebed0c150622bd216013971c27646a4496f4ba64a8dcb0748e91c402a03441a0ee7b78341107f4d92f81771f41299b52d4142c6fd93e345f46a9319d8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.bin.gz) = ee05e9b64e9039aaee667dfdd71934a2b029b22a
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.bin.gz) = 993d3e5e2595d0da326ec142a45b2750
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.gz) = 7bacc9ecbca2a680a72fa9d71d0f622302fd94ec
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.gz) = f12ed4db4fae72630b905b3edd5f6eaa87f84db7a13d908559f7c1bab054054440dedf6806b8ae6ce873bb09bf2a4cf69d89529f21abbc476ac50274d9a71741
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.gz) = 360190a9de654cf05c1aa9a6edc908079fa2c237
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.gz) = 73b8043c242bb9739d216f3f8da7d3a5
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.srec.gz) = 2c976175ede9683b8a8ec5b8c3711df84001300b
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.srec.gz) = c683332d8fb46e88dd0dc5d9b56a4fa942fe9cc7cb79a005ce59609caa9d357d7dc5126feae3b181f63009980a9bf1700130d086b7b7103a8ac199c2a25090dc
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.srec.gz) = a1cde3a2841db820d89ffaa32232ce83fd5f44f9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80310.srec.gz) = 811e47b38fb8e8c1c7f228f0bbab9a74
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.bin.gz) = 862eb1a7ee9de8e3b3525e7d7d26d2cc5ba9bc59
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.bin.gz) = 884b2229b6a78748f61fdba23fe88a623a05c974d71e711821d902fea63e258fea523b9d9c1044ce5afd1d941a2e73d09649a6abc6d38ba0c263bbb4700dcfc1
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.bin.gz) = f3c4d5b5ec632c62410643b9e12960a40b2074ab
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.bin.gz) = 31e7f8b3e40c22ade7cc22d01d95b532
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.gz) = a60ac00d16384a828eef8a837fb21e00b53a8a4a
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.gz) = 54bceeae1a8b27e59a3767284017552f717cefafc71e68b6c74a40429131709ecfd79726737d2dbaefc30e70d09fdab893e4651d125c85f10d9017b1c9e1db7d
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.gz) = f5ce2ac5312c8fecbd072965df9bc2eb0c340d5b
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.gz) = dc8d921c26170e31f92bf29b1ce1a183
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.srec.gz) = 6fc69281083cfff4fa9fe78ab260619b92972167
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.srec.gz) = aaacf4b2b3f5ac015eddf58f6e5757c061b94ad57b8dc850cd5285fa4e111aaacfa2dbc0c9cc3b4e7a866a2fe2b55b900a33fed48e8587b50c6dede0dc66cd9f
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.srec.gz) = d63585bed43debdbb05df1eb44130fc50e2edfb9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IQ80321.srec.gz) = db12176962530274584befedc2794d71
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IXM1200.gz) = cbf69533e9704756eed91dc42ab880300452cbf2
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IXM1200.gz) = 104cbab6498100ebf4e91b89055568f8e770f33abf331787d061ad000c506caf54ca9cd9afe2d6c16b6874502e10e3b20c0fdb97607f18d2ffb59718b2df62c8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IXM1200.gz) = 24af829fe0a4c696a78dc11eeb9a6830c1faded6
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-IXM1200.gz) = e3634e55cff56a10538e3139c4eaf83a
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.bin.gz) = 3921a70d245903a0c95e4944b835f8b05326278d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.bin.gz) = 49bf1c9de5e10f21603f8eb6a45b7ae29bda1fa9ba8fd4b0c2a07e498af6bfc818be5d59e384ae3afbe6a0aa8000ea494f2a431067d5f32e553d09c4346b488a
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.bin.gz) = 506b209365f4650bf205b3c989504665e6a464da
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.bin.gz) = 4d00574f0fccd038ce96a75e40119f54
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.gz) = ac288980ec3e5615d33d18bbb5b20b863b64d4e5
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.gz) = c96f2aac73d0e62c35d76c6a467f5b3b4ecd8461504a0ebbba456868f5ac1a42b6ff7c80aa2717bdeea242d79b940cd3584184da0fe8a07a79e2ac2f7bdc96bc
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.gz) = 02fd101de84eb4c6aa40bfa7cc477305246a7610
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.gz) = d4f8e1de25f4050d4b357cc9222799a6
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.srec.gz) = 10bb46c7b4e78af1cf9978c76759694a10f5b2b5
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.srec.gz) = 75b010e6766552928518ebda6daca8a979dd9a2168e932621c63271607c48ced148b11ed29cb14a11a1905f4a30a3613a63a41a5743b5857b346501b5516c3b0
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.srec.gz) = c18f791fe071f039783b42800302d62d407245fe
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MINI2440.srec.gz) = a749256c48d3b8ac02d6ddca5fc669bc
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.bin.gz) = 5f240a5493136d85a3b3ce856856a5781873834a
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.bin.gz) = 19b95311ee9fe25d64d8eff569a02b68672348a1c7372bb99f9f07421e390ccaa0e1a3c65b6d8a67baae1b34859b5ae2ae0d1471c4c1bce0f249765ee085dd03
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.bin.gz) = b0536ea2075ddf15ba68cd3597aca512d25404c5
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.bin.gz) = 0174a07da16cafc0426a75dd4c9affbc
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.gz) = f59146a75e366ba624eaf77f9582cd7200f56530
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.gz) = d68a8a5c29cbcab54673232481a17bb901d64d15de7df630c1657494cb70494436a0763a38ab31b12e3f273c8e8404f8515d29f2f290c99d25372d46763ab6ec
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.gz) = 2cf27b32a9bfd684b5f4013c9d25b8837aab0a08
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-MV2120.gz) = f623986c6286c02be5144d832c0fd3c2
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.bin.gz) = dc5760fca180affcb51da10f190dffbfd1b56cd1
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.bin.gz) = 56d1f1d5cf1faecbd845eb2a4a8fb88ac6d54808c87a6b39c70249231a532c7b7d858d5d89981f5feb726d93bfab384c6e5b8697a020e1c7ab495c13a5580e6f
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.bin.gz) = 9be387154227f881c0ed38529c7a7a6916a59433
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.bin.gz) = 338ce4a5cb70414c375f3ef8cc9385d6
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.bin.gz) = 9d9cab4789700632fb90b593893a81015b51f619
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.bin.gz) = b1632b6bf5b3e6ebe3b8f311d8de3218e42e40bfabeabb2ddfd99285b31a0451e4ee4267d0dfbae1618c023b52bbeea5b76aea7162d4bf108f74538b5aa535b3
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.bin.gz) = b6861bc0a0266cf68f5d91e6e3fb8c7da61690c5
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SHEEVAPLUG.bin.gz) = 9da615e9589e8b82d9a7e30c680d87d1
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.bin.gz) = c7ed735255266257fb135c4abc2187199970ad3c
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.bin.gz) = fac2299142fe0f8b45f7a433b756d1e48e66940155cf5dd53bfd6bd2827d66fbf43c08306a0cf5d69e25ece03253ce5f806498cc925786d55973f95bc6079c7f
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.bin.gz) = c3a03ab1bcd188d70b889c6384417025abe0f459
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.bin.gz) = bc3474cddb53421b463c1172621fd278
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.gz) = 0b08bd196892dff6fc1997afb9110e3f756f3124
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.gz) = 77b0d553364442904b9b08a3db76c70a7306b23b1b9f71a495eac9b294165da023d9ded9f8ee86f6e0ef336b514d83461cefc63885f754d4f6e03ea208842326
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.gz) = c0be26eb32c1d60435e1fea7521fee95660772fb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.gz) = 79e74c16602e752a034f0d93be2ca62b
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.srec.gz) = ecffff46a8c528208595aa47d6739be05f4be815
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.srec.gz) = 532657ee54b385c79c7ef9768044d4d4012f16f54eb0fba2b743cadd66bc8288b00fac818503faf00db6f28a54f2bf51c7bc7f6ae8d5562e84a60149af119e63
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.srec.gz) = 749c2ad2c37bc095893a6ae9bf2b614af1effeb6
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2410.srec.gz) = bfebb327393531018e6b9f6e66738805
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.bin.gz) = cbc1ebd6e56937148dae2c2d968add4d8b3df600
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.bin.gz) = 463210825ff997e4cb1a7dcb36ed0d0f352ce8ab72ce55fdadfdb03f38d18fd524452fc2129942cf78d2911bf7be4875df238a03f8108ce2708944ed8a9682f9
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.bin.gz) = de526c5e982f7173406cd0b2fffcea1dd4fc9a7e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.bin.gz) = 9c8cdb5067ff1bee4fe4705cc1cfebad
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.gz) = feeb3ef6e66284fa727a9feb4f3d7c45fedd0ca6
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.gz) = 9ec41f1cbabe0c960134267ec18fe6f1c5d8062489735a85bd3b1b8d9ee2acbbbe5f32c8e8e416ba3bdd55e563dc25c8224500702bbc5038e7bc5f91be5fed05
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.gz) = d03357b46454c1ffef1b1e3524c8b56a61336a06
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.gz) = 39dfa81264cd40fa3e0baf2db3f2fb8f
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.srec.gz) = e7908babcfe4f8e9400a83351028545d87c111d1
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.srec.gz) = 3e13a586fde15f0fff6be7719975eb9f2fb1c4778de5a19b30b208b050e2b8549de137c5820b0c233af3bb32d4b0dcbcb7d50d4012c6418146c78358f11ad194
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.srec.gz) = d8a910ca9c3b14abb626d94cce73ffee1d951258
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-SMDK2800.srec.gz) = 43252ffe4ce1a12b526af0b37aa7a2c2
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.bin.gz) = 1eaa16791cd37e16ece1fd2a3f84a9f1b744de4a
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.bin.gz) = c12fe5137c903af5a4291fa06d95408e1a554ff70834036766a971693edb8164dbfecd8783ced92f548a42eb354da31e658e6ea3b347cb41d7551a85ff14b441
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.bin.gz) = a630baa7e17c1dd8e67f5d925fcfa782301efd09
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.bin.gz) = 8bf004134779adbfd47e710810cd541d
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.gz) = 8f750421edb291b7231b9ebb2df970f5da937ba5
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.gz) = fbd4cc574e78cbbdd68754790777507f8b6b6288e05cb5261423f21545ff0825c9be03bc1ec663bf6a5552ac6686cff980ed1f2e4716a4690132058107a6fcf3
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.gz) = dc315d5e0fb0cadb02954e75fb78670244ad1878
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.gz) = a0a2a1a1e5fa5e566b076fd1925f5a0b
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.srec.gz) = 27a486313bf959dbdc89279b8da39ecb7ebf7e6d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.srec.gz) = 4dca299d4f9a90a2bffe3ffea6b5262e6cd248b9abae0fbd838e6bd83502fd573428952180f2dbd77284907fd7b1ffd1ef0c7524897dce49ab05c8c3aeec3aa3
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.srec.gz) = e06dcfeb9376bb44f0444e71afd03c51754ad533
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TEAMASA_NPWR.srec.gz) = 0478aad2e41f791604d7d9e33efc16c1
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.bin.gz) = a9c56c83c032a539bf23ac6250412bdd71a996a8
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.bin.gz) = d61d6f3e0a937039f13182d03ef1bbce0ff4f04a0b59e60096fbffd34f810d8e254d8e42b456a2be03bd84ce127cbe40e12c7864c85e4bf963ec9761ae322b9c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.bin.gz) = fdcb7c9bf1b49107c95e7c0731a6ca97922dfceb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.bin.gz) = 23acbd88065f394218ead9a00dbc6daa
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.gz) = 2d4f5baf51625ecb75fc4d043d248ea326c13102
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.gz) = 2bb556b33c74bc49b82693a4b66437498f7630709923aa54ae0cfbb0af50f5d28db62d062eb234e6c5b33bfb081490e9cbd687a899fece106756c79abe325a85
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.gz) = 84c7b73fd2c20914727a86e8aeeecba0e3b54ce9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TISDP2420.gz) = c1ef3736981fd98a6f6636a8785066ed
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.bin.gz) = 80dea7855e77c34fa5a6df8fb657f23b02777a71
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.bin.gz) = 673533b24668f44c09364ddb22f1fe3e058b5aacb2c544b0fe2c70eba9823e8aefcddcd02f6df8fabd74b5283e585b30ae33501e02b7edb7bc05cadcf8deaf07
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.bin.gz) = ba834fcc21f7b5210f10388a209172e2a1554944
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.bin.gz) = 6228219fac300e28fee657b3d640d2cb
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.gz) = 5d321821199ef390140e42f5de3aadbef178ec7d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.gz) = e5c98ca85a4a926860f11a84abbfeadbfdf2ded1f7ba8fe4f852e48188c16878016f66bd79585eef8d8cf1afa28be748ca144cddb742029c27b97051224fd41c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.gz) = ce45d65a2eeb0e8b3af0ce02b09a1dfeeea56d3e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TS7200.gz) = 9b77d5ea8b37b0550d4610e53bcce56b
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.bin.gz) = cc608ec28ab6439d45fdcaceb2608d00b20f5739
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.bin.gz) = 18d2c25112a185bf5b7e23a7c30ebd183a29f16cbc79e11327fb086efd8f04faaa1fdee8ecfda8de6e437eea0ef79f788ee89d4388aa37fbc88331ba3a8cfd4b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.bin.gz) = 85e82f3918141510d0f3b9741fb10e15616d38c8
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.bin.gz) = 62e6180d8bc9b2ed8ffd209115083506
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.gz) = 784f311793c86ea06397c5e35f93833f1711c92e
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.gz) = 3d481b051578603414849bf1e43bc84cca28049991640d3c41af3bf1f223623e46200c872cb29e3f98ad2bfcad5c377c1b489f074ac390f4ac9a04b4260e8c77
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.gz) = 17e6e1253799aac23cb810aa24e81c060115d311
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-TWINTAIL.gz) = 823ed2d54f115836527299f9542b1531
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.bin.gz) = 0d27b6fb7baf68c25f5e37005c6864cb82e075e2
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.bin.gz) = 70d04bcb2896f6e27c0278189d57549f9c3a286e43a827a704255487095123fb61b00b155750fd007491e42f5498d4fb207e9ff40d32354d1bb8b4adea67db1b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.bin.gz) = e2850dff5c5d6a2dcb975ed69d9cdc3dab59304f
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.bin.gz) = 1b5cd32ef196ccff17b3a3bfc3a790f1
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.gz) = 2778315d331ffc62b829685c27668514472f3e19
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.gz) = 1fb7e68c7599c6174abce47d01c5376bd37e966342c5b377e0375e050200737f507c34e76653377a787bd9ea11ce526c0e52fa01009d10ccb4e124b77f59ac33
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.gz) = 08efa696270c86ab0b2ccecec2f65fd0f6ed07e4
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-epe0-TS7200.gz) = 103a3dadd04cf056386a2b7bbd0d666e
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.bin.gz) = 11f132f4c6e60f09f84e8cc536c38d125336373e
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.bin.gz) = 0a6442acb206b96f9450a80a1a02f5420fea62d96464695490a5efdd63b11c30ab38e2ba270fbb4125386a5b3bf452ae44427f75fb5dd675202e862301cf28ca
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.bin.gz) = 14a2ee2c2477084bd47369e3ab5bff9ec5163a2a
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.bin.gz) = 13646782aa47578a9ad12f7c07907633
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.gz) = 41474e92c5c2634a3ea25bba4510dffc8d2e399d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.gz) = 269cfa9fdab9f28e0931d20e6ff68284ef6e578d11c1c2b23fb272d9e82b12b19fddec101e24032b479c15ce8042efd2265678cf7a3e951e6b2429deb2de2b11
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.gz) = b080ed55c674ec69554713838ef050eba2a195a9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.gz) = 37ec6bc374177e34ac79e774e15cc679
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.srec.gz) = 98d97a466e67c472d2b778cabb6ff6196b379079
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.srec.gz) = 8ea14e0483850adef7d6bc614527739e9f3d1880a03522ca6d7c3df1e38222200983ff4fca413b9aa2c2e6d90efd5170aa7b43be8ea68eb9c8cb8f024c9954f4
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.srec.gz) = b88e4587b48064fc6719bf3e776bc3163efad390
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-ADI_BRH.srec.gz) = 5b59dd3b2796db425638472b47970280
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.srec.gz) = 77140597384a41679467c0cb3814f4524f5a7fbf
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.srec.gz) = 104d1a827d7a622c77139c4a5f6f36a205d708ffa3f3b438ba139981aaca00342288fca6adc82f00603d0210e05e9187fd4fabe3a79b3ab0baa5899a72ce6253
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.srec.gz) = 3c1e9ccfe1c9df8c07976c82348191273a09024e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.srec.gz) = 4a503d1c30776dc77a7dc3ba3e160f37
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.gz) = f74be1c541128bf2c1bc8992058df64b48d1fb97
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.gz) = cf97c8ab92e45baf4fe64c2d5722391cc35569c035143371cdb746c9a3704954a06fc336c50af51f9f0b198a5e05d6e7e3a3e5b5257ed214489fc124525b8104
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.gz) = fd503fa3df024d8aa2397a060e986074453d8ed4
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-INTEGRATOR.gz) = 240f52b880f6c81b4e67314404fc5a97
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.gz) = 55a7ccaf693a8f72322bd4e898b4ecae4a8e0c80
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.gz) = fd40bcb076b661407034b45baf50731dfcdd9ff9f78b4768b0c300fc6e0187204fba1e9491c8ced8a12e77070a3f599608d7c2c649222a142efd0b799e414499
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.gz) = 6e69674afd923ffa4e320a7c1cdde0224959b3ad
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.gz) = f783d0328ed41dac449058e80fa81dde
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.bin.gz) = cd7ca6c6ba8134af29a1cb3c4db19e80753b5cda
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.bin.gz) = f1b0bcc810fa29ddd4102477ea422457aca2e037964a284f1eab1b2e31c4c408c5d495eb489c7b4b5c2c578998a9643f68e8577670b9b04e177b5147dc6b17dc
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.bin.gz) = 2e7c3d70ad38408b2e24ef3a6e3a5c22c8724706
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.bin.gz) = 693dfec6cb311df0ba890e55c610121e
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.gz) = a5ed3ef72be67e59c81f1701c630e420c19df6c1
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.gz) = b9b4dfb8d4aaabaf3346d5af652fb4d79b15c8ea43eba94bf3ee3b0a9f05bd129a050ede2b4c127f14c3df1149f7a9f965499d09a55640eae83151c42f054dcc
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.gz) = 12ea272d03d51081eee0ab7858e05bd77c21a86d
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.gz) = 114b5ae7efcf519aa2f969e827ef03a8
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.srec.gz) = 01d52551442d858c9e8b9404311a0c3e421083a5
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.srec.gz) = f74951ab8e5b2445643c046bee3d34c67310399a84db9b0c2e1c3fb7f460eb1d863f520c6703f51f270d6cd1bdd8ed0569bd32fda709e6f62a4ec9a8088418be
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.srec.gz) = 9baca8969db5db172716ad6b6e9154c42c0816ec
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-fxp0-IQ80310.srec.gz) = 60528f9ba917f0412d4c9026c58dba5e
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.bin.gz) = 1d0c2b24a143a451f4ea9e11f4580e45ecab2237
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.bin.gz) = 367845db7dac4bb80eab23acb6d40c193ac2c53239deca54acca2adc5c1161240755bc9dbf9ea4082b48b83eea70f4b01909c46f26f4221df8af74cf64524cd5
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.bin.gz) = 5bb353dba0b6a32a0916359fdaa5b06a260de51c
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.bin.gz) = 56c549b0fe6d221922b59b7ae00c6ca6
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.gz) = 72017ac40eb0de30cee8ffc340e9bb7f33cc40bc
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.gz) = 836362bfbeb34fc0040b9a3492012e1dbea1cf8c1b7bc6afa45c59e784caa1d07be1b829d10e807d1701d71d6350a3d1a5e63ff71d85cb3c37fe8b9b4f65c47f
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.gz) = d74682aaee589c7ca089a49bbaa6029175d13c3c
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-mvgbe0-MV2120.gz) = 6712477894ae747784d281b4ea595131
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.bin.gz) = 0044ec7b51299209fe8a15443aace1984350d1c3
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.bin.gz) = becc7276686635e6b10b03d8374f1a24526066692cdfcc72d556ce07a0a06ac44144ed011451b4542105211d9a9d0b24f408d193a932bf161a52cebcb49a6e06
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.bin.gz) = 35e63f0805242303ded144ee50f429ed6b165797
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.bin.gz) = 56670b2148acf612495ae5a30662bedb
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.gz) = 3e68e8b0d100356489f0a5b027c19139ef9e97ea
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.gz) = 6e87c01ae9a15702a15b2d6eb36a7a4ddaccd3ae0ff9188b3aca9f3c48207443829e2b57cbdbbb01b958cec1f8416e326547380928c928d0fe67a66adff9d2d9
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.gz) = 50496c450bc32fd7da2e16674eff08df7e3ffbc9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-ne0-TWINTAIL.gz) = 2d40cabe8960a91cb7b995cac28c016c
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.bin.gz) = 4fce330a36c78eb1de452bc0df57a84b5df02ddd
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.bin.gz) = d021074a1083f3cdf55ac1a1ef9a1e93268b418e36c01bc3a401d52d418f8402c19cba1c06a380c86c0b9f5f552cdf7cafeea19b2f03dfd46aad733ac7095479
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.bin.gz) = b573e7bcafe3e1d1fc25aa34177b9c5d845095f9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.bin.gz) = 5035eae6a7bdbf82b39960661bbc1548
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.gz) = 3e5e3eaa9d205254d39746b8cc9c4291fc1a8aae
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.gz) = c454baa740a1e8e7e16c027ca4da512731a8cee8d265bd7ca7110fecb1019cff0e5b0db423aface71e0228639c4a7465108bf3fe69b9d711bd5f5113c4a0a6b3
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.gz) = 1aa0d312767044b044041a1d9431b7d4b4841bef
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.gz) = ccc8b7e6d1627a24e5ee493d3d769681
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.srec.gz) = 9e3be145e73c346fc467de425aa5ae84c8e86dcb
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.srec.gz) = c7f1566fa1665b6f81a36e0c4f7e00f1ccb08af73698d5d938fc26770c65f5485da4c106cde8aa8518fc312208c58182e4a9e6bd92f2cf6c3b7ffd0c822e8fe8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.srec.gz) = 5446c67277640bac0811d35a413b2c9747d2f1f6
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-ADI_BRH.srec.gz) = 9072dfcce2a2736faeff274a61d6b378
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.bin.gz) = a8aa9bf7afaf2468e38fd8f9f3e2fbf1957c47e6
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.bin.gz) = c40af33b0a32888b18dc3e05cb747269ccdeb38f7fea3457be91688e44ee256754d8b31489b9cb6495af63bdfc6a6ea16a6f800b70f5f567d85130ca50ead974
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.bin.gz) = b0b41be5da00dd6a4c84277bfe39975a4cfe31a0
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.bin.gz) = b63766732a4710924581351a1778f71f
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.gz) = 6a53fe270036359318eb84b30bfd04f089cc6e6e
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.gz) = 8c61a2d1a08ae6c889304a8a1335d0b40d092f4f7a1ebc0a14fb721efe1d56fa7c3c3a43c65249754f0bd1baacae5f16a6ff497c6146c6c1fb805aeb14d07f65
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.gz) = 1de7507b9869a86de2468c9200d728f6a379148d
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.gz) = d878c13f9a7706e55848df3b09563620
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.srec.gz) = 4a762c7e63648a321e727cff47e99a01570ed1ee
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.srec.gz) = 19e1b9284fe2a46a5952c379400bb1d74117b3b8d2aea91e6820c1356f4e6761add87d462ec0a14a545534d1e17f211e505f539ff681f39eafa10b0893b13038
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.srec.gz) = f4b31cb80b5da3de1ab654f7287e544ca9e761cf
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-CP3100.srec.gz) = aa4640c78d3499c1bd1b6ade6b5564df
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.bin.gz) = d297e9f63876e259acadf43d735d26c70648cfea
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.bin.gz) = bba032dbe3a47aa40f45e232a06c38edf352515983e9896b56a28510fc031edb12a3b462ea799bcbe5e3dd2ca7585729c40e8203a02347aaf27f367ebc027cf8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.bin.gz) = 3c2d8df7cda72b357e291b47454859098d5a71b5
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.bin.gz) = 2cb06ddf778f331df715f39fe0443219
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.gz) = 0ed7595924e6d03491d2bd7d32d42d00f96a3834
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.gz) = 0e33713d7943731f3430b74e4a72cb98ace2878790ad7dc2d185f0e8a825c2a9db9c3194418bf91ebb30c4f87659d1de36706b57349a38d85e584456071d2d84
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.gz) = fef4dbb06bdf1299ffd2719ef5c147f51704ae0d
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.gz) = 142bf1b95c4e72d91063e29379b858a5
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.srec.gz) = 4a12c83305d58e03cd8c49f05cc6b32660939700
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.srec.gz) = c7e132403f37ca9514a8bcd8c8a94de04fb63a2319b1510db5ce9f14d60ff45778228e4c6d9ca5b042bd16ea26396e035a31f948908bbff152a7bf9529b3854a
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.srec.gz) = 306ccfdb478dae1136303199e84f54f1e65a63f9
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-INTEGRATOR.srec.gz) = 4805ccd3adcb1ff438b7c4d900416284
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.bin.gz) = f3f8c21960efb2c67418c29fef978e98b472a813
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.bin.gz) = 7b37f0c129e92372d4f170ab4106c2bcbdce9628c03a22ee1a265ee73263e78e3befbb712ea1f241b2e2b0e0b54bca3a9b3f7628927a18ee28551e867e526bf0
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.bin.gz) = 237204cf97f62dbb37ec28d9a12158f3d7ec01ef
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.bin.gz) = ed5f31fe08e40a01da35e68a8ce24da5
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.gz) = 2aee3ee787581f73d3e667aaa72e5211a316db75
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.gz) = 6a131f56fb801174037294c32a30244a500fa4bcacfccc65b2e1904b63450cd0ef0656dfadb4eaf1db651b8378070b97a93ab2df053641324c345766b4b043ae
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.gz) = f4a9d9ec37f3a9bb98055681735399a914673fb4
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.gz) = 25bbb323800e83e721976fcf4b5d42c1
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.srec.gz) = 766410442e0892a471e2dd4420209f6974ef16ca
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.srec.gz) = ce977a4a9c87431fc57805ee22efe908bb79a344c6a1d2f3c75b974db3b54626908fd25e524a4ed3f55327877c97f78e9496515fd6c4677fd98b3c273ccf1c2e
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.srec.gz) = 093855469bff467f4744c3bf678d55d9eb08b951
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80310.srec.gz) = fead543e57b7c2f2a458d451b6c59f08
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.bin.gz) = 257ee7c14d678bfbe2511fbd47d72f6c8c461752
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.bin.gz) = db6a78dd47b3298d8f66fedb46e00b6c269e3ea389aa276480c947f606690002c95e7cc2306fe7f243117da3894ca7f7ce9b3bbc12e2cbed4d17b0ece02dddec
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.bin.gz) = 542ae9874a3223e014f50d542c9a677d0a0efdf1
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.bin.gz) = a70cbdb6278eab864d1bf3b288c3392b
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.srec.gz) = 697561a2e82361d2d92775821ea4cd03e163c217
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.srec.gz) = c1959211704f091e865ee26560496424974c0dc3ad3085df21fe51b21c95a56d7f024f833728f9748b02f4ef409a24454ae731d071764921b0fe57df38a3ed3d
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.srec.gz) = 7d95cff40a30f44d91013c8bf2e13a540470e5cd
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-IQ80321.srec.gz) = 7cb2d5067df40372c016211fee729a1c
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.bin.gz) = dc0f06b24ab21f8188a4e3f0321246acf541854c
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.bin.gz) = 13a84014dbb366e32bd715279e46c67a00f09cd40eacdc0fa91cd0e8a7e3e4862110161ca56be8024d3a0cd14f2a17c539111b366e91a27c65c5c47a741dc4e2
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.bin.gz) = 79967e4ee6c3b5038007f8deb9b6ec9172bcd4dd
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.bin.gz) = c5caa593ac363dd9dbf8f44de4c06099
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.gz) = 6f5c0d944bdcf0b3dfa76f60e6b5035dedc94c00
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.gz) = cd56585b5fd7a8d4c15453966942d48c538004a142daf8b0f30d26637e82e0483dba20680a303bd561341b0c35aa4a537f6a24764bd96ca8102fb018d57b22c4
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.gz) = f0c30e5955068a64ce24eb6d96793fd4cabebba5
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.gz) = de797d7956e6fd360b2f4028d05e7608
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.srec.gz) = 0689f7b9a0ff0140a28fdcce4d8cd206d566c680
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.srec.gz) = eafe6cf5e618cf43054145f925f154d99acaffc7eff8d4be2bb801de61c27193debb983412b45c4b14b5dc834633452f89c170a895078ccd31f00a5a0685661e
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.srec.gz) = b07d921cd736ac79d88e8f0e041db636c198faad
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sd0-TEAMASA_NPWR.srec.gz) = 146f7101d810d5b401dc3b320a2f89bc
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.bin.gz) = 393c30bf2cdc7bd75e749dd8b2537bd77dc91a65
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.bin.gz) = 44d1609a6be448f0df6d7f733a9fa544fdc673da11e0b64b66174a9889b4bd6c069c69a312853954c0c631eb036f37ce56beac486e347e600be01de6c9c3a73d
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.bin.gz) = b7b4482aa76347a87722d9eb34662af96fe94e00
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.bin.gz) = 6bc478629045ffcd392adc0f5c9d133a
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.gz) = 1ae50b9a6c3554474481cfe3c37dc88bc29cc436
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.gz) = c1827ec89039136799b21418e0df33992f4ee4c166c130c34865f22cab0601fde056078892a76075714bb3ff09dd1edc54f33464c0dd8854f303398b6357b09d
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.gz) = 823391035b738182fdee19bfc807eb2f09573f1d
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-sm0-GUMSTIX.gz) = 46159d039abfeb7e9dc00177ba1f9271
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.bin.gz) = c7bb680f57a438d65351ba2e665b0c98b979fb80
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.bin.gz) = c8cc5ec9d35ef1c8bb0db010e358f331335fc69db09f67110a92eea46eb275950f2ea5cb4e9f88ea2ed80561a5e31d88ae6f76e5582c448f3df265dc6141be9a
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.bin.gz) = cfa0506e9de7a97955bf05bb9d89275ae65bd77e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.bin.gz) = ed0673b11f604500c60263dd3dca3991
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.gz) = 6a22b3a0b0baeb17201a15a1e46b6a1bc22345f5
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.gz) = 1a44e1fc731b0099fc726ba2362c5967f0073ada7d036656d5f60df865217349b5304bf05c7699662f582ac2519f2db64ee774bfe58c1780824ad04c8ddc8390
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.gz) = e5872e39e97e9a9e1d72da6d35d5a8013e168b59
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-smsh0-GUMSTIX.gz) = 2d76c6a78af5dbc9a1e5200819e53511
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.bin.gz) = 298b05e33ef85a4b937c2a5e84a48022e388d0f7
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.bin.gz) = 3d709cc48eee7fad9cd986542430e23a4b81c84e549d2f0f9210df57a38a9d36eb3abe1bc2ccf2c66d9ec84575bdc9c1b55981f3686de5ff857b55f86d9ab661
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.bin.gz) = c2d4ab46b1b90b55bc40c74d31f287487f781142
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.bin.gz) = 91e2b298632e8fa0ebebad32ef0df715
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.gz) = a63011e3f96507e9585442178de4c0e41338cf87
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.gz) = 76b99b424e4f8cc4f47b0ba7ed8b4679a5d49ea3a022a84d2cd74be396bc497f481fb3fa16e23deac876d5dcbfc9a29f745bb1672d2844fce15252db989c7677
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.gz) = 8cddff412a5b879ce5b17a5a22b09603ae9f9324
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.gz) = 85c7096f583e4f9f3841d7f663de4999
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.srec.gz) = 83cec666fdaa7fd2d5fb6de32461615839932cc6
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.srec.gz) = ec118ec8fba3c15ba1b6725a1b9778d14c4b4fc6f624d7979c281d6195271df3bbcc6668eaf0bb25b6089243c5d7b05e43ca6247e3d72a548abfff0f31f14f10
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.srec.gz) = 6741604d5336591c02e6a9fce7cd093f7e0703fb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-ADI_BRH.srec.gz) = e98cf8ea7ce8704d98880ca519bde38f
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.bin.gz) = faaa399c0796bde9609425f73ebf4b7436516a09
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.bin.gz) = c61821bf159dca3ef32e69aff1f935a9de0228e5e0568afc74dfaa5e91902fdb0b13589e70af2871b3c7afbe2cc3777be64e9bf52798534addd6338ef6fb2095
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.bin.gz) = 081460e1657d3f542615c9b63d2bd8638d4f64bb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.bin.gz) = f79d3833d46191e99e7617029c981cf8
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.gz) = e56e0fbbbe556a6741af58398b3d7d116f3ce469
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.gz) = ebdbee8f4ffed5e2ffbb7890a8e693299e441aa70aa5a7249f1b468373970bc29d2284d82bf638cbbc258ee8b500ba5b3244b83fedcff1e1465218d9fc76575c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.gz) = 881461289bc9ee95132cd5997c19c3838aaa6c39
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.gz) = c5d42e48168ba69e065be3f44d2e2e09
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.srec.gz) = 1fb817599a91b10187301c3f2333dc6484451556
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.srec.gz) = 19f6d85d50d1fdd5fbabe1f60b67992acaa80e0afa44ab7d94f31e095592b7852f2c8f42227bd9d90de9698211085a69aa86d4076100711f96e59bd446317164
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.srec.gz) = bd13c2dec6d22ca3e1d245159b0e765ff03301bb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-CP3100.srec.gz) = 916df9db9485676f33a5bfd017e4cd2a
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.bin.gz) = 2c81eb3878a53e36a554b1f4e91c5011ce4ba507
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.bin.gz) = 2aa85113e7bf69371c8027929857e4c35623f07a16db83bf1cd3824053776e0daf33ab8ddd2e954b938fc33424ea044101c6f9c6bd500a32b030f28ffe40049e
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.bin.gz) = 1e1187fd6a831f7e9dfc546280681b924c03b36e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.bin.gz) = a767b383bfbe980c1da78e744144dbd3
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.gz) = e60bf72e33a1948bfdf1d84a209b1ab6e4ec6522
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.gz) = 9459f4a7532ac2d2890c538a3325c217d1ba468db8e8d4c7d2fae8e7a4ba256e0b0453e5757e1e2ecfffa5f1382d843289279d471562911d56215f2f3ee73eac
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.gz) = 95de4a223120d3c34a7862edb781345652904ffc
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.gz) = b7113d5899d418131a2d376711e32379
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.srec.gz) = cc193aac830dabd4793f1fb6722cadc6fed0bdd4
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.srec.gz) = 05a81920bb52518267ce4046aa79824a763dca9643146646bc6746d16dab1854140d28dabb5f7ba1ce9cfa1cea3a2e9d76df3bdcf227da89ea883011c464a579
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.srec.gz) = d458f2b8a4afddecde3bad093576b0b6a17b2f3f
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80310.srec.gz) = 9d205882f4befbe25707f009910f95b2
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.bin.gz) = 78884cf87f77551ec0e47bf3d629b41ca5a4420e
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.bin.gz) = 094252727a03ca3dce207c5c92959ba21a888bddf502d5a9ee9709bfbdf9eba5d60dae5793ca6ab5dacf720d475499710d70b36622b97c1449badc5ba85e82e1
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.bin.gz) = 4d7b190601413c8c89ed39d8dee44abbd388d8ad
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.bin.gz) = 6aed071b41867489457065cc3bddb0bb
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.gz) = 771add734839295eaeb51bb341d43cdeb64733b9
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.gz) = 1ad26279054ef65ab4c4c37ed2443087a04d530641cd005b7d02dba395bad6770270b6f4e5d9ee522fde9ffcf3e4842e704b4fac2896eff2e73db39cd4c7e96d
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.gz) = 578a063f106ea04a6e8133cfa3c0eb94b0decac3
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.gz) = bc6fd4df95278bf2e327a3b85a5528eb
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.srec.gz) = 1b77033ac9b0bba5b829868fc3a826cc2b8bfc3e
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.srec.gz) = f14f41fd0600a3502383ffcedc902975372ee3ac03ff8e5ff156e93230eb8572798b00a6049a1cbe6c09d53002a07d6242064068b030a8e588355c0c67508e4c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.srec.gz) = 5360066de4b445f57064f767cd41c16d2104da1a
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-IQ80321.srec.gz) = c4197fe93de106e7b927570baa374dbc
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.bin.gz) = 70a3d642aa8ea8d1a3e9df143a9e453aa1f6284b
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.bin.gz) = 391ac58855b9c24a8dbf8baaab4e9b4efd956eddf343a0bdea8351e1469187798e36ea875d6f4d91b5ba2be0eba5b9b02f33a6eded8fe6d727d3703950d554d8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.bin.gz) = 7f860a8346d99c80a3cd48694244040d976283ef
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.bin.gz) = 379072e809792e50b4015b9577360574
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.gz) = 0616f7ca1f3ef9c60e4c34aa459b40fb72277025
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.gz) = 8530ac25385210421ab23391925fee75ffd81e369c6b9773034e850519577ec69ba74493a22b08835ff847251ed16bbadc5e86c7956ae88c48e5bd2fff61417c
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.gz) = 18dd6a88210d336fb61e3dcd0826fe50c8d13f94
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0-TS7200.gz) = 10be5c2ffaf39f29b3948473e78ea1a8
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.bin.gz) = 3ca17c6882a1519488a77a45207f3ed8ea19fa23
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.bin.gz) = bd41dc8a2e268be47c2900ee5564bbbcd2ad6635f7ab99ff059efb71c27c277cb9da8ebfc34eff5d17839f345867ab9d478d0d027e7980fff4fc3e7494b1ad4b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.bin.gz) = daeda9ae3e3cbbf3f5a7a7c6381d13a30070ccaa
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.bin.gz) = 6eccdeef46d96a5ed0267484262bdee2
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.gz) = 219f483fe3afb49cdefa8b1865cbbc69730090de
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.gz) = 937fb99f921b629c1fbecbd60a4de24fe1c55ea70211b03ac15d2b20ae925122a6e3d3b43e34cc8ca6fa9b1d8a1f500ef29ea55f72b1a80a8f52ad43ed6fe1e1
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.gz) = 437b6861a5f1288ea6553790feb1de02293ed3b4
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0e-MV2120.gz) = 4d05c9e5325526185f0db4a6a11edc92
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.bin.gz) = a2d678ea1b57438872bb33f8e3f5ab311680ba55
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.bin.gz) = adc42e2e13bdef6fc24f27cc4cff4363e0287350ba2afd7681e8f3f027865cd7f58e3e5d4fe59131870b34e8e6a8721a935adfb4930957525a24c02cd4c2ceb3
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.bin.gz) = bc32af49bdcc8ae9226c97ae03f4306efb1b646e
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.bin.gz) = 344ed7e1145103dd1f747176fa09a993
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.gz) = 98a9af8c3b74a45940b587383545587a300274cf
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.gz) = ef6b06092f0a9ada2774b3b172ed405d82f9fb3ea0c3c53c7da7d493f9c4fdd92124970af972342e3134852d9575a80c05f0ab22fcff70b52dfa4007b31c5a10
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.gz) = 1558754fb8015e4564b65823fa61d74e7ee2758f
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0f-MV2120.gz) = 4c2d594388f5d5ada250a5e9137a2dd1
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.bin.gz) = 655147b472960f9a2f0addaec681344d62344d52
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.bin.gz) = 91448fa3831d263781cc4a54b9103ef3fe99f7f71d1b4d5f25ffdc049ad34e9ab84fd38e7703ec55f1875278dc94e808b984b6d6610a0a310b9cb633205a864b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.bin.gz) = d985973ac1155c6506fd2dc36208da2c89c1c010
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.bin.gz) = def424287a7d6e0c9dc9878cb6af8d9b
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.gz) = ecd70279e4ba36c40e8aa14b9d2705942e48e0de
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.gz) = 1f4fad54a9a843e66fca15c0ab3de33388b5c94006a051eea03cb3078fce4a671aae802eeb94b410a47b4ea291c7bdac0100359fdd5405fdcc2b0d8db3aad9df
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.gz) = 16f2789c94f147c86ee94427a2bb0cee353d91bf
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0g-MV2120.gz) = 9df82b31b91bceb714ebd8a7036eec8f
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.gz) = 7f65f7ce1167b8b0bea66a821a28f8a328f960bc
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.gz) = 7d98ecd33f11bfcdc1e89d02df391b5c7fb4d66bd66af2713913b9ad8a6de264fb18f64020f009e21f7fe7fadf6cfeadcf72b195be731c5365745d2119a22c08
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.gz) = d84424851ce6a0cefd0881650870f5c902a50e37
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.gz) = 2b7ec0cac876ff4758fdb4cfe7e32d7d
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.bin.gz) = 92236b446b36023cd70765c10fa61fbe3bd2414f
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.bin.gz) = 2882f6b905d11bd0019d4657586412e93c566abf48d10702af36ccac9f688886fbad3d8ef62c3342bb7ddbfaf72f2cf7510d6635f9388187bd7932c814aea288
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.bin.gz) = 7bb29d6cd1f68788fdf3a98d198ca7d98e264c7b
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wd0h-MV2120.bin.gz) = a1d749d80636959956efface64861885
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.bin.gz) = b3937345ad5103a5331f8f3d9217f6c73b7a2e28
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.bin.gz) = 1ddce72f72e631cd8af38d326ff826ac52005cda9974dcf87c33370adf04f90e7a9025177948ef2ddf2f78e259c535bdd5ce2d9da2541f4ca4cc8d57a927afa6
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.bin.gz) = adeb55b34d1468ac0fa1ac03ddeb6d86749a4994
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.bin.gz) = c10dbd3dd8b711e0e431146585d862c8
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.gz) = cf1dad35f06a51619d75518386fb7f0f60330734
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.gz) = 085729350310674f285fe2ca0fb41f63701eb1f8f38da50329483d2dd1e4644a84c20815f94cecadf686d925a808eac57a986338aac762e4fe9080b2ad5adf99
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.gz) = c51e997b08e72d5e9a1a4953dfca874d4d86d4f6
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.gz) = aa4e8b576991e29425d66131a6737800
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.srec.gz) = 6823aedd0b5469af8bdc05b9fde2fa1bd5133e48
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.srec.gz) = 1b372e4d5cc54171ae399d5d55558e8cc99234c08172c7cd2c83185ec2de4a326aac04a800a050be1d1ef42b60dcc4b20ae25b5fd1f08f707a09926268207031
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.srec.gz) = e072eb111fb0bb71c30fc8ad457e1d2711591887
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-CP3100.srec.gz) = db7f9d23f27d533266eda56715e2adfc
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.bin.gz) = fd211bf40ed4f68e9f05bb5f6da85eeeb92e35d3
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.bin.gz) = 1f8dcdc7f7d06a42111745ac2754644cc5796552417f7a0a6d80fb4a7ffa667c6ab577e76f84e2f497d367b244f578b5a1c1d882c558929b12470d02026a3b3b
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.bin.gz) = e853cff382e03161c0354f83f100c67779ecc7bb
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.bin.gz) = 75e9772c889f60ae2baf766aff24f997
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.gz) = 03973311d8dc84c5522524968506a70f3e69e93d
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.gz) = 0582b69eaa266f9874ad02fb21fb7e70fbebe3952d8d2826bc6d58f23cd4d043ff3971775ecd1a12b0a828ff7266677f40c495bf394a2f33c41d372fa1ef7668
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.gz) = 8e8b7d0e5619ca58a50f6ad1f15b2764f9a3570b
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.gz) = ccfc004433b54dc119d556d198e611d6
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.srec.gz) = 72b16c8dea4c9391cb9282e2c1f91e3ba30d9522
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.srec.gz) = 94d123f6a62639d3849b60441d19e49359a922881b8818c11a41cf43ffaccea3e30b5a001e6b96ffea0f6863ca5ed6465d4ae6ea9ec6e91f95c9e498deb44105
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.srec.gz) = 4c94b472797fe5fdfc6bfc8427abe598f7ffbe21
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-IQ80321.srec.gz) = 3c722e71ccd200b5d113f3d5d3b177d0
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.bin.gz) = fc8ab0bc9eb0d8956ade1baa5651d278852ee08a
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.bin.gz) = 00c22223dd564fb484a1a477efca1a4af97bd910a88b722cd3ef05a55f4c56dc90ca0eebb6563ef73106bbe1e3ff1e9c2f51e14ac1ad5277035a1beed8250651
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.bin.gz) = 081ee767155378a6cefb29064e13c46e4de45508
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.bin.gz) = 7c1846c7207b9760e716581a07a5d366
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.gz) = 72d1968438f4d0b4c063d5b85009669416b39892
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.gz) = cfccacff88e457bf30f0336db8882c63e03fa8ac8eb7d2ae87b7a6bd0eb36b5708eaa512aba0df46ebcd0a89cd7732a0ccadeab0776a54eb4e61ed32bec40df8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.gz) = 3fdc54921cf7a3e81ae3be6854847d0026720467
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.gz) = 74ef3b97327e4591d8a3d6acb59c6c3e
+SHA1 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.srec.gz) = 26020265778b152f20cd35c43dd0a8e8be644f74
+SHA512 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.srec.gz) = 672d1ca404b4dabe7791bbe1506b47e64445c047f92c3eac1810b8deb25e23e6a1e554acc88a307e4f85850df967e521f36c7ffb90da7325f7a3d76aba3494b8
+RMD160 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.srec.gz) = 2e0466a32e150882f148c40d8096b53849a7bfc6
+MD5 (NetBSD-6.0/evbarm/binary/kernel/netbsd-wm0-TEAMASA_NPWR.srec.gz) = 9b35a2416410acc9d4fac08926ffa38c
+SHA1 (NetBSD-6.0/evbarm/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/evbarm/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/evbarm/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/evbarm/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/evbarm/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbarm/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbarm/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbarm/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbarm/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbarm/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbarm/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbarm/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbarm/binary/sets/xbase.tgz) = 875fd641f969ec00f854ca1334d084947450c740
+SHA512 (NetBSD-6.0/evbarm/binary/sets/xbase.tgz) = 75d0c9e9685b6b7bb706df7427c8b52f59c4fc4d0e725b02ee18024f75a546dc41de5f1a5d8552a8d2c84bdf87856e5857b0f12914801ca7b36b69536d617b4e
+RMD160 (NetBSD-6.0/evbarm/binary/sets/xbase.tgz) = 1a4d099d59b2bd882e99f1b2df1c7bf22b890d48
+MD5 (NetBSD-6.0/evbarm/binary/sets/xbase.tgz) = 5eb9c573c5a0c96701f268a3470a58b9
+SHA1 (NetBSD-6.0/evbarm/binary/sets/xcomp.tgz) = 8d7469a85b7433c89690cce74e6b3f4e66cf0647
+SHA512 (NetBSD-6.0/evbarm/binary/sets/xcomp.tgz) = 411304cf66e300a7f162128203099bb4d6eebc4a93ba18ed7caf79f30b31cc7ffcede85c4e1bad02c3f5f8a27d009fb71f3ce5862c1d8aa477f39a25c535fdaa
+RMD160 (NetBSD-6.0/evbarm/binary/sets/xcomp.tgz) = 822d26e0ee08b72ca8b991f0709a8c1bf0399208
+MD5 (NetBSD-6.0/evbarm/binary/sets/xcomp.tgz) = 5af361f0334d28119d703064278b3ed3
+SHA1 (NetBSD-6.0/evbarm/binary/sets/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/evbarm/binary/sets/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/evbarm/binary/sets/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/evbarm/binary/sets/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/evbarm/binary/sets/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/evbarm/binary/sets/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/evbarm/binary/sets/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/evbarm/binary/sets/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/evbarm/binary/sets/xserver.tgz) = 4ccfef1d49179603286042088bec0218c6b2031d
+SHA512 (NetBSD-6.0/evbarm/binary/sets/xserver.tgz) = 809fc0a9065c1b9e7cd17aeb0d41cfd3158efd6c585556af01c4a3c93f0df3646a2ff77c6994449a703a408c0988fc1aa68cf34c7e297a3056d73ded57034c12
+RMD160 (NetBSD-6.0/evbarm/binary/sets/xserver.tgz) = 403604404261764c74f10fab774c4653fd20cc9b
+MD5 (NetBSD-6.0/evbarm/binary/sets/xserver.tgz) = 914f909b6878cef16a92765a8cbb52ca
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-ADI_BRH.tgz) = d9cf46427b7ceed2cbe9e6bb2b62a5d461799474
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-ADI_BRH.tgz) = f2beff9ed4d712db8eb3bf1d9e8f60942e3fab2a834b73fed76ac79bd012fccbbb6698e04edd7ce7dba7802852386bdd2996dadc2c8a04a409fae303dace1104
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-ADI_BRH.tgz) = 443b7c69a5f5abeaa3dedd3b6213486af56eeaef
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-ADI_BRH.tgz) = 6e3e8b794a16eb8a079342ec0b1af212
+SHA1 (NetBSD-6.0/evbarm/binary/sets/base.tgz) = 74a00851a474a252991743274528e6272f50dd57
+SHA512 (NetBSD-6.0/evbarm/binary/sets/base.tgz) = 154a8230676785921f3d6819d25a2900fe860291ebc2e4891fe94b039871e1515199a4c0e6fe3bb5aba4f9ee802a977e985f87206a1688e4d7e0ad24e1069eee
+RMD160 (NetBSD-6.0/evbarm/binary/sets/base.tgz) = c6d3c3b83b8a2a56870929a9d616393e6d19e9fc
+MD5 (NetBSD-6.0/evbarm/binary/sets/base.tgz) = 2e26124352843379db4fcc7ab680ec5f
+SHA1 (NetBSD-6.0/evbarm/binary/sets/comp.tgz) = 4004f24b5f208575da97b542db46731015cb7573
+SHA512 (NetBSD-6.0/evbarm/binary/sets/comp.tgz) = a0950dab5cbb258ee2f29f2d35173e00a5cfd79ef30b27605782b9f22b8564e05d9633ca6886178c1b1b0cdd6a8112d3a9f663211804e554ac63ac691ff3f9f7
+RMD160 (NetBSD-6.0/evbarm/binary/sets/comp.tgz) = e8a618972f78271ba8a957f4f626b632d1b03ae1
+MD5 (NetBSD-6.0/evbarm/binary/sets/comp.tgz) = ae2425114d29b9fd2136342ce730baf0
+SHA1 (NetBSD-6.0/evbarm/binary/sets/etc.tgz) = e3f3386182b99812eb3fe35daec274b0da1aaa1c
+SHA512 (NetBSD-6.0/evbarm/binary/sets/etc.tgz) = 46337fca0954acb3b4e0e6af3b6ecd473002d2f482468ac98c62ee7ff7bd84d90ec9c2bb13d29c5ae608e625f3075471af1da22f8a4254d4e8efc9ab8dcff21d
+RMD160 (NetBSD-6.0/evbarm/binary/sets/etc.tgz) = 098b5563540c880d69e0ba9aa793ec9ba6f33a10
+MD5 (NetBSD-6.0/evbarm/binary/sets/etc.tgz) = d3f4709b5264a9a8bd820648330a9653
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-GUMSTIX.tgz) = 8a21525ca51f643747145c529add5e1de487f0fc
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-GUMSTIX.tgz) = f0f9d6e4d8f34b446e511db5a0df6b3d81b20334169caa79790cbbf34a8eaaae0f9da332559b3cb78a00fa05b807b9e3a118474146c69e75d1519c46420003c1
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-GUMSTIX.tgz) = 47002447a76cd76c4a2687923682dff473ec25dc
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-GUMSTIX.tgz) = 1ad356834d9467703647793950ccd9a5
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-CP3100.tgz) = 4baaacdf8b2ae99e945eabb70c425fd5952eca48
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-CP3100.tgz) = 467818af6caa1068437b691fdbc77e11617808fa44e2b3caf3634f7cc8bec1cca7f3a46325825d9427cbfd113eba01a8d3a4d78da832290ff40aa60964c4b42c
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-CP3100.tgz) = b2a46e69e6b4ce2264eb78a2151274796b224dba
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-CP3100.tgz) = 1528b53a9a8a622972ed1e6891535619
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-GEMINI.tgz) = 38ac63a06193c3ad7814b39a11d911da20db6ca4
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-GEMINI.tgz) = c05553408f0fde7a1a428faac350de7f969396f9e8caef6e83a269875743472e52435d6bcb1ad5531f9622c1289aebd419cdb02ad83c92d4797e1b4b952e7fdf
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-GEMINI.tgz) = 5f8d006417864f9609d691652fc03f37f1d12769
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-GEMINI.tgz) = 0767217ae126cf86a65cb17bdbeb884f
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-INTEGRATOR.tgz) = a18100b11fa96e4cd1eb1e36831f14c3d17da04c
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-INTEGRATOR.tgz) = d8bb0260e9e2b687bce84053cb3c88ef6ca3eaf12b79337746e62be94555233c8a1302dc104359b2aa6eb64eac8d633d0640d533688af4c4971a8ea095b96940
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-INTEGRATOR.tgz) = b8b57516a6d2c5e62d57dd9437fde58485989d09
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-INTEGRATOR.tgz) = 7f80ec30a784dddfe53492ecdf78646d
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-HDL_G.tgz) = 6e95c2e313c04d228a65da51f252791fd1476827
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-HDL_G.tgz) = 380861d0bafe812937f004ed00054b6fbcc1dc581fbddf3f745101ec39a57759dbc0a33f0f1e8429a9630febd7ae69e1fc88c75d39c196234260bda58641edd3
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-HDL_G.tgz) = 5262674ba10ad272c62440d4f61034dad9be072d
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-HDL_G.tgz) = 1af966fc2df6c623f4147d3cc648d22d
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-TEAMASA_NPWR.tgz) = 239e37769ab837541fc445e7a74a9bc02c74f0d3
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-TEAMASA_NPWR.tgz) = c3d61466da0066d0a61d1fa3052e54f10c19f2f20fe8342c64f0dc6365d95602e47c1e1722d242219e698c824cb4c6dd823b54915eb98f9c6af8a6119920fd6c
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-TEAMASA_NPWR.tgz) = a4be2875ed76751028c167d6a0c2efecdf3b79d3
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-TEAMASA_NPWR.tgz) = 72220c0d721aae18cf77bc235bb03cfb
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80310.tgz) = dda069ed4e7ad7df46bc23e51a6ef2013af45dc4
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80310.tgz) = 91bd0716398c20a01510a6fe340891d1712da51882e2019bcb7e5852c5b3ac706aa36cc0ebe3f1c1db4b4318624f767118b9ab549a38f253c477b4b25acb84fa
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80310.tgz) = bf180d150abaedea9aad9265bb4965197a587490
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80310.tgz) = c00c7a69803c130c2f7d34fb3d91610e
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80321.tgz) = 2d3162d5072ec3659964ff812b3595ff82830fbb
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80321.tgz) = 199bd6e9a8ee5547f4b589c2172400dc1d8204ff2c75ac021004aecc816f5840b04f3e8408e43d64722e829acf654069a161750b733af045648ab5647071a113
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80321.tgz) = 22d77cc3665909c23cbbd57dda56f412c683b75a
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-IQ80321.tgz) = 2bc4f1eb1a0355fdc0dc886c13c895ab
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-IXM1200.tgz) = eaedad32158dd867e95063f5bb56c66ac8a8f3c3
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-IXM1200.tgz) = a8c1730348c3b3aac15b11c2cb598f6a667b9528748e4361baa33ee7a899aadc43366cab3ac0d6a4305e605287952a8ba6db210f4a15fb3158bded3da4071a67
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-IXM1200.tgz) = 206d96f4304bb755159fb72884977e53bd608c34
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-IXM1200.tgz) = 2e6747257e639f5fe31d23d1834ee9c6
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-MINI2440.tgz) = bf2d80624e97f1964673908ef28ded8091568b21
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-MINI2440.tgz) = 1669f39e3caab537018880d4e93d6010860689f37e60f9d17ceb0a7209442053b1f461b683b6ba201dfd1f0c8641b8650d1561985e8fd47fb80aa3c71d2ee938
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-MINI2440.tgz) = be7274304c9c2bb18fe71bbeb9368719ca155cbb
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-MINI2440.tgz) = 1c1547b85d29dae79c76f4d7ee727b31
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-MV2120.tgz) = 363e695b0fd04709143647a1f07b22a8029c24b6
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-MV2120.tgz) = 99cbcf9b5969385787e852546f3e5685e721c7ff5fb2f898e4d9f29e2bb7640bd08e38cf38eba4cfbfc5d2c1ba3fabcc074328b5ec9bcd13faee233e9a5c10f5
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-MV2120.tgz) = 7dcee51999f376d080942e2f46cb936dc32385b9
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-MV2120.tgz) = 82c6e07c9bb44d8c06d4d4ef7228fc1f
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-RPI.tgz) = d01b81e07470d09296ca9e2e07eff84ef739865d
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-RPI.tgz) = df740174545dd2a34f6692b7a15b329c93bf1496b32b70270e339f91cbd6e9c980d92a4da0ea5a8e825eb39cf6b4514ade0d2c78846128ee424fba595e175748
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-RPI.tgz) = fb98d2b03e66057f4e002505e26af67d23da171b
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-RPI.tgz) = a07be9e2696fa18bae91363005cd09b0
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-SHEEVAPLUG.tgz) = 0f11f8084b40c9f41ef77dc6ae2ec257e819f5c4
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-SHEEVAPLUG.tgz) = 8444ff6b4f85c4a8569d51147c83583b37a1dee134c01bb1991666f02d1fd674d80899ac9d11dbe0457a6a1246028a2898444ef0070367edf66dcdde5118d6e8
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-SHEEVAPLUG.tgz) = 0f00bd92326287b2db8c825f6e7a93c34e8d7c63
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-SHEEVAPLUG.tgz) = 3221d316f1518d5bc0680bf7b1179a4f
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2410.tgz) = 93da07d5884e0c20544d001c5f9fb49893f5055f
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2410.tgz) = 69d65444df4a31c129ac2b2f216d6c0c27e84243f3c1870d0e7f133afe6c95e419f1e907b4a4f0ce05162be24ac149616da16d0f840700b39393bf090e1421f1
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2410.tgz) = 0e515ec91a4186de8cae2243fb079348e91acaab
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2410.tgz) = 6a86551a8997ef91ea427022568a658a
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2800.tgz) = 2cdcb47ec0f5173ef5b2dd3ba319dfe10dad37e9
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2800.tgz) = 106b6c4241c7d4d51f77f2dba13c4977fbf09e8c3b2c4762d9b4de224d04c94a94bd192b89bb3e10a5a52c27141518a0429d09fa39023c9bb59569de7bcc897b
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2800.tgz) = 84e4387b95d8731489c37d13bfd9eb68f323b19b
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-SMDK2800.tgz) = 00ed7a1a639ecc17b6f627bc5e7b2862
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-TISDP2420.tgz) = 11e7dfd918fa822c19633b2c0d7139fe3e5b4cbc
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-TISDP2420.tgz) = f5e0b25240b828e657de6818580bfb5dd47c3d1da978a44f60cbd0fdd86ac824f09922f4ab8ac8af8eb63c32ceb726ce2835498f649828fdae867fca4991a412
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-TISDP2420.tgz) = defb0cc263198d9ab3f0fc3e2702d6a2405de15e
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-TISDP2420.tgz) = 00fd1b9a1cc66dc3eff9fe90f85aca6b
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-TS7200.tgz) = 6e0547db5e16621220bb45150a22b25123022be1
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-TS7200.tgz) = e507e5475501cf9b96d1a7f88d5fd8783f089c756a36c6975bdfa0a33ecec441d1c15c06b8387ad5a0cda0a7ce2e18ab731365f8efef4fe8d615da1dd8f8cf52
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-TS7200.tgz) = 9b9bc14c01328090ec8b855f30690202a2e3e639
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-TS7200.tgz) = 1086e9efedf641d90a2fdef271d69944
+SHA1 (NetBSD-6.0/evbarm/binary/sets/kern-TWINTAIL.tgz) = 6587a6dbfe1479c459d670942e9abed58c2077b8
+SHA512 (NetBSD-6.0/evbarm/binary/sets/kern-TWINTAIL.tgz) = 4f2978dada20c19a2b2a35dcee406fdbced5caad7c46b6c733c2c24b2952202d872f666d2ac139baf5b0ff98092a5509594eb8fb70627a25a268fdefa36f1162
+RMD160 (NetBSD-6.0/evbarm/binary/sets/kern-TWINTAIL.tgz) = 49bee3aea5f5b88b79344836c779d428fcd0d19f
+MD5 (NetBSD-6.0/evbarm/binary/sets/kern-TWINTAIL.tgz) = c70d7c187e58dd8415522bce16bb12de
+SHA1 (NetBSD-6.0/evbarm/binary/sets/modules.tgz) = f9a8894103100366dbd4343aecc6452a35c2fae0
+SHA512 (NetBSD-6.0/evbarm/binary/sets/modules.tgz) = ac2fdf8cc9bff05a5f66749e4dd96a2f0ed4d143acd490e6f8b3826a9b9538918a8fec0045d40f6f418aab80372b23729410997fd81a05f9d9aad27c2dc3589a
+RMD160 (NetBSD-6.0/evbarm/binary/sets/modules.tgz) = 35204da96f307f853b28c487b0b78c478cbe99c6
+MD5 (NetBSD-6.0/evbarm/binary/sets/modules.tgz) = b6886a6197725ed21d53bae4a089fc1d
+SHA1 (NetBSD-6.0/evbarm/binary/sets/tests.tgz) = 971ffc9e0521617dc678b9e9923371af2e9fca64
+SHA512 (NetBSD-6.0/evbarm/binary/sets/tests.tgz) = 55013634b7d0e607d847ef69ea6a72b7f939830caf8e08dc55c78b04a27897490210377bf1c5b1216778d4ffca44145a0fabddd8ffc449acc93f40877a71daea
+RMD160 (NetBSD-6.0/evbarm/binary/sets/tests.tgz) = c9be008f99e4d72d0260139d3ece0db37454d842
+MD5 (NetBSD-6.0/evbarm/binary/sets/tests.tgz) = e1bbc8e25aabbda881eb290efc4b25e2
+SHA1 (NetBSD-6.0/evbarm/binary/sets/text.tgz) = 08a253fdb7a0118ada516bcfd1293100728240c8
+SHA512 (NetBSD-6.0/evbarm/binary/sets/text.tgz) = 41eb29b2f82b18d916d1fa2e858d45fff23f613120c53256c7f7f3dcf7e31ddede9f954a143d9d8c3ec95cd967f46861a1385382634028d61eb0883bebb294b2
+RMD160 (NetBSD-6.0/evbarm/binary/sets/text.tgz) = b2cd2ecb39f44039e90a2465047b5510d0de2eb2
+MD5 (NetBSD-6.0/evbarm/binary/sets/text.tgz) = b5a8566f96d102342467dde0a2ffeeb7
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.symbols.gz) = ea2b03a807cb44578f36e3f34d58a0435434f421
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.symbols.gz) = f8d97b757b0d0d82f5e4ff14afa6abd1d41ed35e3c97684ade36a0dbb277cfcb55a6f9ef656b1983507247b07f164ecb407d0973d57d1533b2a1e1364ccd51ce
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.symbols.gz) = 33c2edc444787b5477a459d6426d80ec2ac8c9c1
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.symbols.gz) = b06f95b94e9fc3ff03d7c02485d9226e
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.bin.gz) = 72839e1353d343d2ba5e449273aea745a980cb50
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.bin.gz) = 9f8019273ef9b3f46a70e6faa97a580e6ae1d0d820974de24033c55a729fff2d2780d5096964673f97e26b3af86835c5087fd0b09a345e15c29403bc1f467c3d
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.bin.gz) = 81b228fe339897de8d47c2cf5555c39eb891193a
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.bin.gz) = 662f1773c969157b42f70b72bd72c9f8
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.gz) = 257f98f33f8429d27486ea526b045f31cc4b9ab0
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.gz) = b2b2aff23b6be4c84ef07f1c3ac698f9554a13a54c8fd49ee12b0e175d09da2f116799260083e6a87a8b4e761a4a66ad8d3f02fb6fcec9f3f4b928271cea12a2
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.gz) = 0f5a2cdc5951921440a7147912e722a481c1360d
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.gz) = 117ff4be0dd35bb5cfaff3414c27a3f1
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.srec.gz) = 1fa80c74c4b2f44a9db4f1d5e0be62a7fd6f68e3
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.srec.gz) = 9d291a02fc808baaa9ffe3b259239d64758aa394b6fd782b4220ab47eec1106a33e9972d06ac07fbc1632923b12a9dee9574bfacf5a2dcc096490aedebaa7309
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.srec.gz) = cf28c82c673429f391bcfc37493f07489ab8e260
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-ADI_BRH_INSTALL.srec.gz) = 6a743321a49a841146309dd71a2b7782
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.symbols.gz) = 1d15f8fd20b400aac41fda396b615742593f14c2
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.symbols.gz) = 8a2ef21088d568841b740d0c316f513a98ac3f45f1c0d994dc199b4e2529836da832b8409368295b4b326de2f4defdef34f1829e3e4fb7217b39c858ab0eb09b
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.symbols.gz) = 2202821e57d5506b266456b70f18ff6a1506487e
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.symbols.gz) = 026ab51e016618bcc9f1f1bf363492ce
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.bin.gz) = feeb79b4d6334a0f6a87ca2c63d195e7039caae7
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.bin.gz) = f76735623ac3295690df2eabeefeb39c8cd3e5d85fd09833f9e58b8aa1bbec65f462e8a1edd683a75e5ac2188a50e3ef9f574b00dcbe6f7ffb0c02c4aaaafe26
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.bin.gz) = 5344ba62b8815bff63195fb12c5804194c5b74f7
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.bin.gz) = 1bf8ae796a35caa01e0332fb0c193e2c
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.gz) = d1d88ea80333147d4b73f6c20d5f0cf9af362acf
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.gz) = e525b3d43fe6ff0d7ffe83e546b80cdc1892140e3dad8cc409312a544f9ea111869e085fdfb736a1dde3d029d39e84443f06f0175d28a5b21a1a2967c82d904b
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.gz) = bae57fad021b76fc1a9e9c796b9b6df84b3a8814
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.gz) = eb56d7e3dbbfffd56cdd5b995690e1d8
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.srec.gz) = b0b4f43f1f4f8bcd5ca1a9a0d2877fdce3397998
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.srec.gz) = 50c8e9381dfff94d56c7330b217ab079fd3daaa77935dea557d321eca5e5ca59866e59b59b9ac498b0b4a71410dd776c8068f9ee2ee3ed646a39029ba1d6e9da
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.srec.gz) = 9c88faf5c7de521d9fa0be09a4d9b3b9206a2dcf
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-CP3100_INSTALL.srec.gz) = 558c67513391c3825047d26f08d48997
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.bin.gz) = 7e8c3f055b239755fecc8aa462e54b8b89a9e8c9
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.bin.gz) = 6977a4d96f1b1cb16ccfe4b15678b40b6627b01385fe6961487817f7ebf84d470277fad37c53ea7bb48e7c19e7b37dd8be3152a6e0274e6f8d6bee69bbb7feab
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.bin.gz) = 28fee55b727cc25187df3981d6fbe2bfa64b9e4c
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.bin.gz) = ecb5118258da0bdb24ec8ab9ac6faa0c
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.gz) = 0af690fd4f7fa383ddca7ee5f63bdc698d6ec5a3
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.gz) = 7be43506576a17872997db65441e436b51f1fe3bcc9c42eeea4fd19809f8d3f61d2cb9027ad6cc7e2a26fa3261482b9ff1b7e00878b5bc18ba4e7130919e8dc9
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.gz) = 46c65905cec0fc54bacb408d57af312598bf8502
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.gz) = 28ef106d2bffe72fe879c19ef7f25741
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.srec.gz) = f3646a6435283a79f0580692798694d31d8b672b
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.srec.gz) = 4b85ad5c44a4076715d43f51aa94e33ddf7f1e6645c7dbbd490ec8d8b305766f3e6a6facdc5c87a20be3865a827e531810e288eeab2184155d83cbc062a0e14a
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.srec.gz) = 7f87fafe296706dae3a75441b4f6fe26f52cace7
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.srec.gz) = b81ffbbeb626dde373c9c54e4cb15b03
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.symbols.gz) = 0ac81f8038480354e6fafbfba5da86ab333f85e7
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.symbols.gz) = 116b9be7c9e3135d1d1847e084a10e5bb2dc2a95b4810a2e268fee9e6e5b3a5f157b2f34b94a2e03256d959b2bb10d01760347398dc81bda5d6ce64aeac1c2a1
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.symbols.gz) = 4cd6b326352d9398035a2c7eb157c34604da6709
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.symbols.gz) = 938ba4475e1668e7fa02cd727e237339
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.symbols.gz) = 9634080097f581271b2e0aa1bc2f87b10c7c57f1
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.symbols.gz) = fb85279a670488e7e8b83c91188bf075363ab8278335c1d3a06411effe829cd8a47cfd269aed5e9a598414fbeb56165eb0ad27550f6f6838d2c9ae9847525e99
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.symbols.gz) = 81c648d753322e87068041c7bdc30dea925ec2ce
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GEMINI_INSTALL.symbols.gz) = e4b9a0b3e230fb2cb6a6e2ad3162b1f7
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.bin.gz) = 5c60fde2ead5db357827530b6b899e3236fbf814
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.bin.gz) = 953fda76c9d47d8af51e578049e98a5f169cf141a057ff1933bccec43ce89b419182f533fd105462af3c09a0a843e8e766f96d2ebcce4cf404166d80ab6b1f08
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.bin.gz) = 34e148a900e77f07aa63f0fbbf181bcbc79e2026
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.bin.gz) = 60aed2122f98e633e78e0f19a3724881
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.gz) = d94e8dcfc14fd6928b3d2c784cb38f0f55b009c3
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.gz) = 9ef172a0aabcffae7abe5312415da7d407975905484f69ffe73dda2389f0230a39ab2d03e9ca42005db662ca2f6060a4a6ed0db4b5cbf23676a35af38d23a416
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.gz) = bd13d39ee7366ba6ab2a1ee1b6094322a5b894fa
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.gz) = 9c16afcb3ce11d9923247d310c23875b
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.srec.gz) = 380390e6eba24b258a8eed603561f05e2a1cdfd6
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.srec.gz) = 519683b9ee12d3dcce26182bd8a46c27d9f6285debe96df2b88d46d0eff372deb2342a1823216da2dd0c28f90732858e7e8a4d9d6305d5e0b82b5345dce92112
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.srec.gz) = ad5c85bb6d641596e2b0ae7dbdb6f235b758546f
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.srec.gz) = e2612b861cab60aa64008ab686f570bd
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.symbols.gz) = 91f9c530da00c48d4b22b7fd98916ba4528f77a8
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.symbols.gz) = cefcbae785c5fb72ef5548c16a8ae083a5be19fd27f386c1eaa723c7cd296dbf4c4e774150bf3017a5ae52eecff0aef125f7ebce87f73fd930a019759e0ce7a8
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.symbols.gz) = e91be60bcee907ee6259c16e54ce1e3e79f7937b
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-GUMSTIX_INSTALL.symbols.gz) = 088c9eeabf75406c634a15511972829e
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.bin.gz) = 3fb32f0f8c981cf7d0012870d9c5019f06b844b9
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.bin.gz) = 7b7ecc024c36ffe8d57ffb7f53f25e9a3aaa203605ef955c3d94b47627bdf63cb0ac49a8ab230f5f7d5c07c4a56aca94787e861b381af4c84acf48c8b6040b4e
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.bin.gz) = f0faa1b8b1d48e6c736959211a1581221e92de24
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.bin.gz) = 66e3c14d2f927cd248e0b07882892fdf
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.gz) = 90ef61bc7a306fae7f41e20a6c615e37b7d51bb1
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.gz) = 98bcba4e6a5ea6260f42e44b78010bf5b02475a12c198c5898a6e4342bdbfb0207a5b7ee17ebb7cda0859057abe0e5442a41e7fed2c9b78b566e67c7897c21c1
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.gz) = a0fb23b82b04fcd0817a38d5b1b2da620bf23ccf
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.gz) = 546a0231797a48e08fcba615fbb5dc5c
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.srec.gz) = d234b22bf784c64b812dcf9afeba9f106c969e08
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.srec.gz) = f7f78ffeb87a42943c8271cc0bb7d9a3805569fe0cc75f62359ea827cd44ae48f425bdecae341f1a947a10f35df32ce12155105f333b97c765d48db2b1f4c0f7
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.srec.gz) = 218875a0a61876726f5790366ba2748acaf63996
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-INTEGRATOR_INSTALL.srec.gz) = 63e3b095ce7b3512ab0fcdc562cff952
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.bin.gz) = 9b24a0420c1b2b406fd2b6d8fc7f25a3dca984ca
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.bin.gz) = 5a46d91f646c354c5bf39ae4c15cf45b2ea205328f859a3006bfef815a40b71109b748e6efe91b85ce692663db36c2b6f08e6a43b4ee843c5d1dbb2eb095a7ac
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.bin.gz) = 4a6cb6eb7612c34d1b3c68ab7cb56fe32e45b7f4
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.bin.gz) = 86823cc4ac5a09992501014bf88c877b
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.gz) = a4c5e90d5a9fc6c4b127fd2ba479b27228b64f98
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.gz) = 98f9d8a9bb4c6b29be7002dc4aba375b89a7e98d23fe77634c26efcf4bfec3bec46917718f4c245a9ad8a480db0205224bf0946962ad5b748e04f2b170645344
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.gz) = c9756d9b19051c3f34a748eeca4fc283784f205c
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.gz) = edc01ffccbf9a6db1d1b40878927b492
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.srec.gz) = 1d2d7369ea182d3cbe36b6cf0929bd26e48e7799
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.srec.gz) = 2164f0f36fbdf41d2fb37ca8a19beffcfdbcfee8a5629350e28a94a105e9b9707fa44b99cf122c102e073084d09905a75a69a8da2f263882e89e9192d66c232b
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.srec.gz) = 91147de829c8e594800eb713e55330fb2160c062
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.srec.gz) = 1ac108b4534ab6529420b5e6eb4596ee
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.symbols.gz) = a594571814d5fd54f060a324f961c8728207414c
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.symbols.gz) = 6a55dbba559e4675123270036ef2b05d877463c0101628e50d6f84d12035784a76e010e469840b46cf56291e5d27fa5569457cf83fe7d5a5f128ef6777d4b0fa
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.symbols.gz) = 54553929ec55ca2d3e1a34163f79019ce8d21f68
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80310_INSTALL.symbols.gz) = 796f55a92c0f4a29a920251d51a90d9d
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.bin.gz) = 8667913b1247f23e940f945fc1d3c6d7b42e3bc1
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.bin.gz) = 30df01772cc961320c0600225caad50145a9f84b9fa5689ed61c59b136c4489e4f6ce3f1075e53c46335f955ed2dd94e662ba2674c56a0171f33e3ace70af2c8
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.bin.gz) = b6c98b6c38bfb10e36bf119c49749cd5c6be20b0
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.bin.gz) = 9a3b14a1e64592301beaa6c7581e5f3f
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.gz) = e619f80715bb394b1fe67cc05f45cf0e076fc3d5
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.gz) = b131081790eb4e2a82ac2cbd9726b8239f8ec91e25567606411bbcb4c9cb0676f8f15d1daca89623e29d6045fb4e6b6edc40ec7bff4d0646cd06313c8a827672
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.gz) = f791654aa8cf1ee8d9d71aef03ac0f904345465f
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.gz) = 42b4d81e7d76bf98705e97927f1a6fed
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.srec.gz) = 418c6e4fdae62a9dffc0cc52300b3308d4c39726
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.srec.gz) = c6025b5ca7555b4870026cf2a9b23a000bf3f3bdac4a20347593f431062ccfa8b43c29dd1caf17f95787ef685066509e409164c302fcbb40cc18307fec372442
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.srec.gz) = fcaa8176ac524a456a5e75dfcffadbeafc133187
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.srec.gz) = 0674c1b44f421bd847dddac9e87e1221
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.symbols.gz) = 579e6ecfc351e91ba0bcf36918bd3fb781b7c1e7
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.symbols.gz) = 34074f57b8eeca79deb3f2a070ea824be2fddae7e8b5a2d8bedab2b4dd4796f2eb1baab06cdf95b53da4b43cbd8e8fa873dc0986325282dea9902ffe9fe521da
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.symbols.gz) = 139e713201e03fa17e31803834d898d1ef636bb6
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-IQ80321_INSTALL.symbols.gz) = d08f0319e5ccb9d142f20f81a1a4d0f9
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.bin.gz) = eb490e7ec36f92c871934f2cd7c1fcb2339ad2a7
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.bin.gz) = 7be26fc8e01142f873d0e2ca89a414bb4d2dd332dabfec1f7cd126ba2eaf0d803abde4f62c627b583fe2a57b93bd1669fc669666185ce1d5cdbeb47b88690ca6
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.bin.gz) = a93d35c0251e92ac7562cc6138419fefb6fca84b
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.bin.gz) = dc54e455b762156bdfd6a0fb2d14fe2f
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.gz) = 2567dce09ac1764f78ec074e4f5644a87ac83c8c
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.gz) = 6beb220906314c4ac93a058a4994104ec2dccefcca4e8c2a0be6d3399536b4765e49294b275dacfe20e39c7cccd81b88c9521b2b273835001cc6b131237b20d2
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.gz) = bc87bf5b540e6847689016b2301ad48aa637a3eb
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.gz) = c96abcd45f88d52e5826c9419e895e49
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.srec.gz) = 82575c4f3f6344ff9fcd848f30364fd1b65eed82
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.srec.gz) = f1c6e41724db95eefe005e2a4f3defa81b7d8319521ad2897fb976cc8fd31af9f9399bb0df03e8b910d72baf25384112efad9699a111c6a0ebc2e8d79dc63f72
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.srec.gz) = 82c356d5a3916d82b941cfca334f55586b30805b
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.srec.gz) = 16ff2a11bc97e2bddfa4ecda023be897
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.symbols.gz) = a8cf19b83ab6b0aa48e6486a2ef5717c14025933
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.symbols.gz) = 3c9919130d4470ff778d77119b4f17132002de6229a1d0f4f2024e1bbe8e68de7cfe93a4da18835c111dad1de50bbc4e5e0e50a89e71757acc2da888afcf944a
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.symbols.gz) = 53339f2e886137c722353c7e4641fb79fb4160c9
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-MINI2440_INSTALL.symbols.gz) = 2125d332a50f2382dc9ea2fa1c76fff6
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.bin.gz) = 7f7533adb7f744376eda30bed953e0c24925a7ac
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.bin.gz) = 6df01180c26dea9f40e427414375f872d65be05f1541d887fedf8d98f22e3f98354ca15aa058c1cba0d0e4d30974b37787855c1a9ee36f7b702ad42c31ef69ab
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.bin.gz) = 1c6192b2841123a6a7b34f46530a49cf731fe8b0
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.bin.gz) = 7080e515fcdbe3d4d976da0bd0db1356
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.gz) = 009c609c69eb87be8129cb8cca61732493771053
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.gz) = 1aef3bb8e1f66280e2478e207618ef125b02fee796f1d31bc9c8ab5e28f132bd5aa5c6e78cf1dd2e63a72cfe814264db394c74a2c1f04ae139dbd3d592bca8ce
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.gz) = 6b7f00ce3de221960905acde44c93679d12318b0
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.gz) = cb78419cf4b8862517c4cdb83f09edcb
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.srec.gz) = 5405155f29eab526e4b489e156a3a6a84b694c04
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.srec.gz) = e4ddb650bed5716c2a6070a88104ead0119e3e41a6ad61d0a1ab944966fd5e29d3c17b83061940c81788583d833b3b90e2b3fca30a2291bb7e99be7acfc52eb4
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.srec.gz) = d28c777e9f79b74d39d9cebeb55582bf6554bdf4
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.srec.gz) = e33527c137440f91dc481372e55b5153
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.symbols.gz) = 0adc4d2b9af7fed43f2cb2a6d461b0b67dca64ff
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.symbols.gz) = fac69e001c5383808c41901f250e53267cee4df0738cf2fda17675057f397d33fd2be817b4235ba4ff47c3ad4c667388fe94e935372702729e38a39d95932bf1
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.symbols.gz) = 08cb50f087ee2c1edcb6bb8b0a10fd9436ee5291
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TEAMASA_NPWR_INSTALL.symbols.gz) = 303fa88bab1f84ce1e5e7392b63d335f
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.bin.gz) = 6d96ba7627a743040710559958052fe5ad516e07
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.bin.gz) = c8980e5a5fcbf6d16a94b273537d0b7e684d46621d46cb52b1c2672e67c864bc4651a09fed96356e441d209f57c5eba10696d9d82a3aba7bca24781ef6e6d570
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.bin.gz) = 8faf196aecee5eab9fe5a256daf1bdeee5f485e0
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.bin.gz) = fa021fd649cc68d99ed50414c562937e
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.gz) = 7084ab7948465cd7fb832a191991166d460bcbe9
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.gz) = a6e2dd918a3965573e3417e24984ff5d4c546a9bade8d7b68a930e695a76243aa4acb89eaede1ad8ea07280a836fbdc3200b7cade29486e1a1783734ad3164aa
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.gz) = eb9e46f17f5a0d0d296fcf3983fc7cac086d139d
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.gz) = ad30409880e74a4c9aa9be2f0cd67ba4
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.srec.gz) = 5dce945d53df7aa098712e966a08d8c4a11d5615
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.srec.gz) = 13270d86a94b74829fdd691cd97b8afbebf397fd68d9e8ecc8dcce611b3eca79666e5da303d75ad0af56f762b65d3d487ef1317685538b6962ff5b482e57c954
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.srec.gz) = dbb6b76ac38227dc2b5e0dcf35dbbc187a0f9cec
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.srec.gz) = 573eddbddcc0e213758ee25fd7f3d6e0
+SHA1 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.symbols.gz) = 7a5bcaaa2847b816c0568f28647ee07a18650c38
+SHA512 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.symbols.gz) = e7fa9c30cef40ab421ed36421f9c92bac2fb21c88077d4dd176a55b3b82cb94ff1e912b35d6504e5d37ca737378da3eae0f64e7721a023e7af596a037f0970a0
+RMD160 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.symbols.gz) = dbe42d8b278149bae03d553e4d8a2676544b53ba
+MD5 (NetBSD-6.0/evbarm/installation/instkernel/netbsd-TS7200_INSTALL.symbols.gz) = 28d969c46d89d77b04fdc532621a9c5b
+SHA1 (NetBSD-6.0/evbarm/installation/bootmini2440) = 322711938832b81edf3a30de085fe84c118fffdd
+SHA512 (NetBSD-6.0/evbarm/installation/bootmini2440) = f985790660b66ab4843a2e938e67bb7b1856e6acfee877e00bcadaf945cae7f85dd5f5ea2557f331d142c2f79ff129ac505a9f8ac276650ed49ae86b202cdd1f
+RMD160 (NetBSD-6.0/evbarm/installation/bootmini2440) = 6549e1c02eec982d3bfbd42317bc0c49bd7a3fcc
+MD5 (NetBSD-6.0/evbarm/installation/bootmini2440) = ab71c605b7165325bc2efffbf8366e01
+SHA1 (NetBSD-6.0/evbarm/INSTALL.html) = 364e208c39e0aa0c1a873702629363049749555b
+SHA512 (NetBSD-6.0/evbarm/INSTALL.html) = 0d23a02d74624eceee1b8908f49ca677ab4c260725798614faf67cfcf396aa0862aaf5296ab68315b3a1b110a998cd9fc08f36630aa3202ffb18db915e6bc5cf
+RMD160 (NetBSD-6.0/evbarm/INSTALL.html) = 5e46ad234a6311ea55f157da0978fd0ca4543ee1
+MD5 (NetBSD-6.0/evbarm/INSTALL.html) = 4ddc104e853a1b0a9ff34bdeffdb849a
+SHA1 (NetBSD-6.0/evbarm/INSTALL.more) = 49005be72eacdfd5e58240ea40c272362f1794ca
+SHA512 (NetBSD-6.0/evbarm/INSTALL.more) = 29b0240cd5e8b957fd6f0cb26858f856f2ca1e5bc664d7617138519d38788f442bd0e2045f506eb49b6fb07200e3251694679c7e9079e152e022e4c36d69339c
+RMD160 (NetBSD-6.0/evbarm/INSTALL.more) = b2227c9abf8c42edad582429b388b46292b2b642
+MD5 (NetBSD-6.0/evbarm/INSTALL.more) = 8f7edc27634f260c5216ce2ac1c7ab20
+SHA1 (NetBSD-6.0/evbarm/INSTALL.ps) = be244573aa70f6ea8bd6afef50d3129e95ecb232
+SHA512 (NetBSD-6.0/evbarm/INSTALL.ps) = b4dcdf490b1e2fdfb72a21fbd00922eef14da81665f56e69d5fce4458222a3108c27fc793a1507e9f6f3b3555c236899f06863282b3a0dcf061ddd81451e0f82
+RMD160 (NetBSD-6.0/evbarm/INSTALL.ps) = 38340ef793c940f555c637fb63ed603e2813b6b0
+MD5 (NetBSD-6.0/evbarm/INSTALL.ps) = 0702cfb1c18290c2f6b3990ec2b9b838
+SHA1 (NetBSD-6.0/evbarm/INSTALL.txt) = 84d0cf406199e9e160201946ef76c5544f859094
+SHA512 (NetBSD-6.0/evbarm/INSTALL.txt) = 779245d5eac9f6aad487d0ef8c09ad8ed1ccd1ab6b315d5436d681422a1ca23376304d9f5f36e0010d38a26947c2d67b214f7fe06207b52ec4ca1d1abf996280
+RMD160 (NetBSD-6.0/evbarm/INSTALL.txt) = f21886bd1f37f1557a890ce294fc842a4a9322ba
+MD5 (NetBSD-6.0/evbarm/INSTALL.txt) = 4e8f849ebf04f5af7feb401bd8b828ac
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA32.gz) = 837f5c347644ad20116892b91a170bd9a177cf25
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA32.gz) = 83ef6ec1fea23841a6a03d5f91d0c00f8dae56d78276b04dc56f3be1121950c8b21cdc3b4f580929f85e0b7dca9f5635cbc248cd9bdf018bd019837953165796
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA32.gz) = da9f38ccb4f1a09ce9567d148115538eedddfd64
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA32.gz) = 94e33f6853b4a1d9253b01310a9d31e8
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA64.gz) = 1194bf50c6a2a1cccfd7017ec100e18840cab60a
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA64.gz) = 05939d55299eb8c98f89c0cced1f090fc47568c81be3c4aaf32325ce4a087b44b1c6945bb8b9a12384ae588e9dfb1ad0ca1c701e2f0603a672bf3ea1d2bad1d0
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA64.gz) = ceecace87ff5c72a8bf0551d03e7f24297c8210e
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-MALTA64.gz) = f70db6b8696d6db6538471a0389aba6a
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX32.gz) = 50baddbb54cecc95e5aacae73100b35b1a50808a
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX32.gz) = 937b7632d22c4e22bdacdad4bb473b1c4537cccb35f97d1bb08b80d64c6228a410f59310ba336d19e62e0bf38f3ccb9c5e1c27aed8d769ef66657de06070b273
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX32.gz) = 97d67324ca36d259e51a80f89b3ff8c32aeb0936
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX32.gz) = 2c17d4f86050689342b031332bae427b
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX64.gz) = 1e1c1a9cd9c7bedace03b3c25a736014d7053adf
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX64.gz) = dd0689962b451e442a48a35c35f426d4428aad93a22e6e2d33dd0033125eeb8e763ed31ee13410a6f7b7d337a46c351a736605adf49e301e09df14096fffbf41
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX64.gz) = c94021afffc7e21001cd3f045063b725fcbbdb96
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/kernel/netbsd-XLSATX64.gz) = 7ed50990347095eced85286bac3894ad
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA32.tgz) = 8aef48b2afd3a5c2daaf9298b1377e5fb48a4775
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA32.tgz) = 769777c570e41cef669cadd1caca734ca55f71382656b3d229bf32811e22fcac10c3258032e79ad190d9e34b4a4168269b0a44352209f9321d3b3d18e1d920ef
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA32.tgz) = 27fd132ecb4aef492c8194a598641b0d57df788f
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA32.tgz) = 547ed14fd7607348ac12d50d6e142625
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/base.tgz) = 321d0a48e96415413f6c76fe94cfae0b763c0ab4
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/base.tgz) = e3306d01022a478928ebf33894603aa4788983b58b73beb1cdd1592cc5d545bb3eefcc07ef381f7be24099bf5100914d65f5575c9ccc43279332972d5e84c01c
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/base.tgz) = 822520b0721dbc6ff7402acf65a7078df4ee495b
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/base.tgz) = 838db1b3837f00c46b9b7f8e2ceddee5
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/comp.tgz) = 9e1125bb9734db8e861c085c3f4baeefed5bc5ca
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/comp.tgz) = 405ffdb54d1ad4f0cb56b07ade8ef1cf26235526e143f62622870e9733d9f860405519b355129bfad7ebe659c56358c73dcc941bf0554a89ef210a70e69c2855
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/comp.tgz) = 13b1ab9f477f0d22afd1dc11d7a0ce04ed87e247
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/comp.tgz) = 880a15da9d452aba11a9c3e4b8c32c44
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/etc.tgz) = 793af95b8423250427980e55e1b40e7d2d946dd7
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/etc.tgz) = 9c9dafc30b85ced01a296fa4464bed9c8bbed77b359307a637e236646880d93aa3b17c857423f26c286732686b00855131a359295fbb22c4f4d4271aaf21fd23
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/etc.tgz) = dc21febaa97b3f196ddf788541e93081919ac05d
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/etc.tgz) = affff84911016dc75d8dcc556ed1cd90
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/games.tgz) = 6a9922b70c13cccb7e2c3b2d2b4f63f4d6ba8b83
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/games.tgz) = e17192d20cebcb6583f76e3badf382c2734bdccb596b5a7c7104c28bd6d96419a59a642c4eac1e246d821d8cdf211e8b00aeb7043a439edfa6cf9e5554441007
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/games.tgz) = f93c4992616fc210ae24c58b64f8607ca6f3d1af
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/games.tgz) = 2186988f1072dc9be8a8e1ea77bc1906
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA64.tgz) = 6cff22a0f2e961617cd4eaf3bb571a7b7f4845a0
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA64.tgz) = 05b431e02e4e858f79103bc1950c4da7fc87d476d46479a8f0c2a9850b96391d8a55cedc0fa3b47da4857d7f91a9acacc08369e2121a7d47af3bda5712ad333f
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA64.tgz) = e1048547f5851837f476010b3c5866f527542465
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-MALTA64.tgz) = 3ccf1d8db71de9c182c81d99689aab8d
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX32.tgz) = 4400d1601558ff59a7d90028bd91e00c4b67e230
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX32.tgz) = a16e8b5d34e07c97fdda6b09e41a67d48fcf56b4276e9e52c2a2d8ce1eac5d21abb542afb67991f7b2bf87261c8134f8e522d59375ccd251f4e853d3ed877b71
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX32.tgz) = a7ea06c9ce95d00548c7dc9a3403f873d3f42749
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX32.tgz) = a6c542f79813324f5ddaf80a9a12a531
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX64.tgz) = 47cc48be2b1edf22d48fb3d45c2ebcf1e6b84655
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX64.tgz) = ce9378b66f327c84e004d075e0033e195c1e649acc7f668d154b5608fa71070cfed74b1eedea404cead8c92a9f9f332fb5f2407a14d80175d4f2e7f3115962d7
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX64.tgz) = 64602c29c9cad9767bdc771464f766d4c4bc7a14
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/kern-XLSATX64.tgz) = f55ccc413a2546e5db4c66b38095dfb2
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/modules.tgz) = 150d99ebadd4c626bf48d9dd772584df18d0f161
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/modules.tgz) = eb3e15f4dd50d6eb59ffec96245ca440abdc2427f7cd14f6405ce979f9ee13b5d40ed30d0fc544cd92e5c8dd49b2cd033cafa44f32baef8c434734665c7b35d2
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/modules.tgz) = 74a564f4270f8b8df9c0f207512ccbf02cd4436e
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/modules.tgz) = 6f2c6d66540b3994a5400f1b3a7c0e06
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/tests.tgz) = 607a8a23fb7447a1bd6363feb446cdfc7110ac7f
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/tests.tgz) = babcea43b781105dea81af3797bce6f77bbf2766a28104c45aa7f43952d0a0a7e3c981927d4b2745ed46b290ff4db7d43b5a2620b82d7185a55e06156604432f
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/tests.tgz) = 90dc0855b2b85584cc08f07d55645bd98f04b40b
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/tests.tgz) = c0dc4879f5bf2e13462fe11f1afb9755
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/text.tgz) = a38aef75824fe9c86579b8a320ec645e1079224d
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/text.tgz) = 39f42cbd084867ba177e3f3c7eda0ae19040eac2ee4dca991caa172211ba499081f720f16511b967fe6e4529f78e446cf9cf8ab89b595bca41aff3e7017b2028
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/text.tgz) = af58fb15683143196193ee0ad443a9fc94b6f8b7
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/text.tgz) = 8716d1b4d2cb02c015e20e87650021ed
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xbase.tgz) = f22a560c757bc506a118ce9803f68e148fbcf5f8
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xbase.tgz) = 5ee7c1db10aaf6a67fe6e9026057266340e901a2a4042d126862bb3ebc1b26dc824a3d47febaf2c38738b10e563feb903c1020ef98dd34a34ed6ab1811e1dd0a
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xbase.tgz) = 4dd1d30eed29fad5ad00d08f8655850ba2966beb
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xbase.tgz) = 83fe206984459147b084ce31f5712ac5
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xcomp.tgz) = 6a62de4e61ca7fb51120a2d949f0c6a76728c795
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xcomp.tgz) = 1a4d6159f2afb79ea54d7b50515d33585ac70a41da0dce13790d9acc1bc83636eedf83284aa76c4b9be2d51e25000fcb000842d4491edc1f0032e6e68f591359
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xcomp.tgz) = b5d253b8ed963d2aa4542c177199f8bf56a7413f
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xcomp.tgz) = 9ab19bfd18fe8afea9ec8b987eb3f745
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xetc.tgz) = b3ca1c7e85d0832091fc391717c914889f745a13
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xetc.tgz) = e386fa04d66afe2b4817c6e77d6ae351e7a10265099395285e15ff5fb8c41d169de511b3bdc71d9b8fd144a0153262b068b6b837b846310e255bfea1a06ac5e6
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xetc.tgz) = d7cd1c13d547ec0fe4ad59ee92be9499cbeb53ed
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xetc.tgz) = 8165fb3d8f4f335f32f391d6f6ba414c
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xfont.tgz) = c3b40e7a439d60c27022fc1cea5e58fff68f2da3
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xfont.tgz) = 5a7e564dc9cc41d3704722a461ffe7ada8011510e3db08c2a209afc462a69986261ec02d41e792f1e1a305300f4d23216cb07c231c461df5edb2fb54916d2438
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xfont.tgz) = 03066eeaa22fac20cb69be43939f870a313519d2
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xfont.tgz) = 46e16e5288c250f4f2394bf709df039b
+SHA1 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xserver.tgz) = 13d61af721933a9484ea722fcf5a151900b07d55
+SHA512 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xserver.tgz) = 1372c13478ca7da2c5ba2b3d56f2f09f2bd764f2c345a9e4b8c2fa81fd101d557d53b16637b7644676431cc57b481d22d7f702c1a24d7c6456c04b75422f9485
+RMD160 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xserver.tgz) = 3cc8603545553cf13c0e41525d4f71df2f04a243
+MD5 (NetBSD-6.0/evbmips-mips64eb/binary/sets/xserver.tgz) = 599284f9e42a94928802db5b36d6c8db
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.srec.gz) = f94948277528ab8356fbcb1f447ea3f88da0dbff
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.srec.gz) = 37025250657daad79c15d79ade2f1e815b551bb9541d852e0e0b208b6964b2e7bcff4eab477ff9dc8c62b23a061681c6076684f41d50ffac2b9ca1c9b85eb657
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.srec.gz) = e0f5ead94d76d0131e9b6351a1b32066c0e37004
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.srec.gz) = f07bb28b2742e51e8a130a1633813342
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.gz) = ce135463449caf04fe5915edf2689e53f7d34450
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.gz) = e30a6963cdee29fc634232bad314c1093df462a1fc2751908ff1f6118165b1f4cbc7fa3fb780c7483b26dbed2339f562d75618ed355388ca4a7ea8da182f5718
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.gz) = 726d74693693f22e261de851efc11f489af83d5e
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.gz) = cf0519b0dc9ab365ee268ee0cf667cd3
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.symbols.gz) = 7d61c5ea450b2348bbf829f17801d1444142030a
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.symbols.gz) = be8fadc2f971b5ceae719fe76f121a1d394826c0509d0052eb681ec3398e8944a8866c45ed213bc1a07ccc0306ede8ec3c28c1415a26bfc92721fe8a90ec8c86
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.symbols.gz) = 8be481d57e200549bddd24d27e640fc192758aa8
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA32.symbols.gz) = 23dc546c19890b5bfe2981a4be93cf61
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.gz) = 774d5ac21ea9f3b0d356a7de041c89afedd85cb4
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.gz) = 228797b395c498e531f359c59d8a79f336138923e95881c1506c9b1a772865b6a7df96be8a05e62a8f3a3b791e208173e35bc6ac1ad29d8c62b388620d3bb828
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.gz) = d84a8c78f5f81c897066771fabb70dd447d423ab
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.gz) = 9392b5ff6a21a0f043f4ba6e9ff14a00
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.srec.gz) = 028bf1fb8a8e7f1733eecb45b7016b387660558c
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.srec.gz) = c7d3178f2dc591e1d39e8e04aaae780cdd38c190d850d0b71a0c69eca7a8dc29b8adb300e106a236e9fbd7ea9e85dc070bc5ae6baf6bc742aff4dbafca91c00e
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.srec.gz) = b4f76a19a3119f6b35830db195d0db3b40b962d7
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.srec.gz) = 6f1c87fa36192f6cce9fe900576de781
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 05ebd0d64d73f452fbc31f9a7945fc1503bfa23d
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 839eafde2ed98b6be776ad75e591c23a295aae726a2d384fa1c2f9e52333f1d5ba14c21473ad5d7c51098608d04b055cc163e743485556ac30c75a5a913f0422
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 6f1dbafcaf7ca5df8c47a61b5f6d8805a209d7eb
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_MALTA64.symbols.gz) = cebaa3e1af8c79ccb42a92f25140c653
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.gz) = 039e0a1c46bd768a34bd4522d2523018429e6987
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.gz) = 4914b5675a4b3858c3feee1eed653a75f0708b84c12d80a82715502fc9e2761eef8d23735ccdff6c596a93fa3e01ee69dcdc39cd44b5e3876722134ee90ef31b
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.gz) = c0cb5df60249fca57ac322b2cb8fcc6f90645698
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.gz) = ee03b9d28419f05275ee663b8b9d0ac9
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.srec.gz) = e831083d34e0200ed793aee4a890a80f518e1ab1
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.srec.gz) = 7cd35c5f5ed1ee14dbabfa9c7d89a6ed592e37b66676c1a523422d24830a28507afea99d6408dbe436d59233703257684a9cc765370c98dc23de78f3931b50c3
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.srec.gz) = e6de2239f84cf7cacf8ae6b1bb62326483a1c62e
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.srec.gz) = d7de63125741840ff89a6dff9fda38c8
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = 5aa1511398191686462abbd5e20ab6e6b56fb325
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = bd4c5f4b969c6c5bbb5d424c21430a3c1cbdc1f6d40a60842402ffe2d812393e0556ef6b7fade839a117a0ec601359127fd2957d35bf7468217c9adcaca53e70
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = 6a2fd527f96c49423f58f6f8363e0582e2b894e9
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = d0654f9677e051fc34fed0d81a27e528
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.gz) = 39ea7d6f681981f11fbdd9e63473e4dd69cc2f9c
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.gz) = 41378a129484896d4598dcfd29b1f65cc462c5746d4793e973b7912ad10cf3f1e487701f4d3267ba7615bb6fbe9390a356f1d89146e8f90d7bc8aa57ae575dec
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.gz) = cd77d4e08b77ede06fdcacf53cac8360b115b11d
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.gz) = d736cdad40ba2ae3beba484dd5a5ce05
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.srec.gz) = a2fd46154978cde95b379f110407c52ae0c688e1
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.srec.gz) = c778ee1c88dc9aed20d7113233f43660258d1f7616e611d8e8df413b9db1e73039fe422a9ddc8c02039baea5bf5434f660fed57148f13ee641e339f9277f2c51
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.srec.gz) = e98d08b85f6aae19176ad570f061f4ac14c42629
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.srec.gz) = c2de85181edf54b18fbe495d65faf32a
+SHA1 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = 2808091cbd1d32e9f38e7c38e7f2a0aa8c66e617
+SHA512 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = 7c4157a809dec6f292fafd1fa21744932e8b0add59d2f3ea62c4536d31e14c6b8a24633354cb4918dd38fc88695d373d356dda7e93dfb77f83c6a6fcf6e70b54
+RMD160 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = a31fb2125afada861428f3b416218cef7a641caf
+MD5 (NetBSD-6.0/evbmips-mips64eb/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = d727b2cd38e49bed46bba3a1d33f9b97
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-GDIUM64.gz) = 938493a6f165b0a66e87d0ced332116b3e5fa1e7
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-GDIUM64.gz) = 05906bce297394f48bddff8ea2a92f527ca5a673c1ddad6ee776eaeeb5298c562e01b533288add57bf39239c9cb02e6e8f3569c4430b658bf99b0bac61245aaf
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-GDIUM64.gz) = a2d803c0597759fcaebb669d3f4ccb7d008d2e9b
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-GDIUM64.gz) = e1f26f59ce4ff562a5c8e6f8bd511a0b
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-LOONGSON.gz) = b717b1950f7e2ee2745b74e32c9f6cfc7d7ca15a
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-LOONGSON.gz) = 47916c7dc402df96876307fe31e21de43b5dcd6a57425d2454ba44593c03b0852b6dc1c5822880590a14a91717e7478314e6ac0a099004596f4d256ba3427e4b
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-LOONGSON.gz) = a1c0e2c2ea412fa4a49fce8cc1a366d9d373a5d0
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-LOONGSON.gz) = 7da6b1ffa558b1b211fe3702c5837e54
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA32.gz) = 7c79ae79c6672c73ac03b88dab24103a01a86658
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA32.gz) = de76f96e25bb798dfc28c0e186676833392c47a47e9eaa9c0883f9ac43f89946addd61ebfd3c91a9556eee4bb218f483053513190242abe472ddc79131224081
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA32.gz) = 325db86c0e99e01418f70575d75c3285ad586bad
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA32.gz) = 67b5fcff9d18ad156d0c028ab16ba081
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA64.gz) = 8c7904ebdd030a94458f13ac7c11df832929cc86
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA64.gz) = a51547232434584769c0a8ea108bff1425e5e96f1989224b3420863ebeded4a3cb272b6873e3fe860aef3658982bcde844d86fcb46d79ce647b6969e6758c978
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA64.gz) = 656bc08ab196ab9e4638804a5ca840327a8a31a4
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-MALTA64.gz) = 8cad946d5e2a395f26d8f18eba137ada
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-P5064-64.gz) = a228a6982bb8c5cf468860e09fd9b17b4307f356
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-P5064-64.gz) = db4187479c550a71c23f9bde6cc8dc50d2eb758293b293c7444a786ab30becbae9e150c12ef3fd55a42df1b88efdb937a7fffc48457c20c5441b082e0c0e2745
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-P5064-64.gz) = 8d9bc3f9d1ea60e3322fac87a3c9ccd43a54055d
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-P5064-64.gz) = c318ae2623b38a290cce71191c6c6afd
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX32.gz) = 2ef72f56c819a2bc0fd4d48e463161ebef9551f2
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX32.gz) = 4b80ebf478d77d91205ab2d89d2459317c4b61bbae18646c2c201fb4ba1ee2978f5be3a87ad33c83d9b139d3ffa077a4bcb3e315c16fb68f116b802dd2217637
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX32.gz) = b5a20d970f5ad8c177c6244b1e527ea04c705cce
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX32.gz) = 34ceee3acf4435335a43c594dceff98e
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX64.gz) = 5bf585188ba90ab0231e99247967eacfff520cc8
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX64.gz) = 20e39f09067084fccb2587a05a3820e50816fb3f097e8e89cb07091c937fe97aa27593948fa3466f9a5d6835a8bd1bfe31268a2414c6c8694fb9fac156e68f98
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX64.gz) = 96ebcf3117c2a1f60b50ba1de3852898083393d4
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/kernel/netbsd-XLSATX64.gz) = 335908a4efd612fbc51487db37af3eb0
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-GDIUM64.tgz) = a09a36dad31ab7a766bcddea3fb08807d93819bd
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-GDIUM64.tgz) = e3876e7f4164e117ada834e6769fd3357d144fe36779a197573a8ea735821150fbc6c4b6c2b9ea917b14b23a795e4db7e069cb8e121ac3fe9ae5e0296400d065
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-GDIUM64.tgz) = 945ea08a5fdad4d8ac8504212712b40aa01d1443
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-GDIUM64.tgz) = 2fcaffaee00d469cb7f2756fdcfd2fa6
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/base.tgz) = e7550ddcf5edc7c3c27f53b7e6b4636f744108c7
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/base.tgz) = 0096eb300e8a71093cbe3e84830ff048af73e85cbbad1986390b8838c50ab6bd63cdc201062514aa63529c2043e1a2b2428cb2b50fa2bcb9dfd4ed11e42febdc
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/base.tgz) = a5509e8f5a4e5aadcf057710489fa4105dc4dcbc
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/base.tgz) = 76f45332e5fae1c999dba2da97f92834
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/comp.tgz) = 2475e5bc61cb7084e06f111d6e24e3ef4527ab0e
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/comp.tgz) = 5ca83f2b42cd3145d3fa5c88e72dec3509f52f63bd0e5ac26f752a18065473ea298bc0e88cb0b954a06d3d7eba5a9afdee3087feb06079e9c76cd5a0ae3a6759
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/comp.tgz) = 8bf71a3552e3e9388c85d5426530e58d2ff15f9f
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/comp.tgz) = e8dcb0d4b7b5acbf8f4603be69f4e9b1
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/etc.tgz) = 106b0102ae77486072a61db71016443e4a63af9e
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/etc.tgz) = 386948f2aa4dd140bf17c9aa0a8bd0b41096603497dbb9792454fa3772724312a3a2ddd3e69a7b1a710e6339f799b5174b16f8f91ef123ebde548eb47aee4e90
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/etc.tgz) = c704f1a292af8fbfe37a9a61654f8e8873b6cf49
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/etc.tgz) = ea16b2ab565706b8038b459e0519936e
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/games.tgz) = fbb547d701d95fa7c9fedb8ce1616fa73dc0a962
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/games.tgz) = 9b0c4338c3227f974305624f0ba8756836f156f3d3f9bbb1ec3188ca9ec2de344d5ff3f8b9969180e2c871cc0b09b12b9e6311e33ca548d59f4596a04224f14e
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/games.tgz) = ae8ec9dca5729ee4203ff86e10ebb16379ccf5f5
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/games.tgz) = 18b0244267ae2ea671632562ebf493c2
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-LOONGSON.tgz) = 8da37bef5b86301e6e5741969aaab713752c2866
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-LOONGSON.tgz) = be868f49e960bdee048cc1a717d17563c081afdf2a258007312f306f14470159943877ef29d0c3c783b32682074c299aeb2b48a7623bdc4af2adaf82ee9b52e1
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-LOONGSON.tgz) = 10f65602b7dab9305df83c26e670221efe1b452c
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-LOONGSON.tgz) = caffb25555770c6474b23e6cd028e82e
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA32.tgz) = 7e5d386cee62920ecd932af45ff4a854234edc8a
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA32.tgz) = f5e9bb4886260c3eb0b18e29999047b1f39692be5cd5cbeb58638604efae408f167cbccb81d2fc6c601f20515955b48035113cc2cb2e6d30088cd9750fa64465
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA32.tgz) = e0a36f2148ed78c4eda1c26e5ef0045ff6b97e22
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA32.tgz) = 3ccd62f53f80b0eabb9baa2a29a691ac
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA64.tgz) = 225382c44befe15c46b05f2f052718bd80dd9a7d
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA64.tgz) = 1c1a13c0b73098d14468cf12d7744f79696773698adf94e622afd95e436560fc4934d3b02390187647a9d97effbed9162542149fbe06628cf38aff197faaafd6
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA64.tgz) = e5ae37af03461f04dc6550141e4c2301dce51ff2
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-MALTA64.tgz) = 672129c4f8f0315c9b374ac5651f82cc
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-P5064-64.tgz) = a41b86f2235180b688882c8eb2959edcb48c81ca
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-P5064-64.tgz) = 9db6c584144a249006a671894e010fa0674e62e6abc60d43441462d1f1478bf4b1f9c6d9b46f14a1e9ffc3f7641bc206f5ed95c90b405e57f3f40e54d74aec92
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-P5064-64.tgz) = a7f59b498f286aeffe614b4ae43461d8a859f758
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-P5064-64.tgz) = 5dc76b6c8b5b49b757dd4a5dfa370420
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX32.tgz) = 9cdf4993097b04929dbad4b76c5bbf0cd6796c7d
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX32.tgz) = 171bcfbb92a1c1ca96dc14707604998eb4c5760179e9781da9b0ad18ad9695ea44d49c5cdd9ac9250a7a60e08b336daefa9a6efc2f172c9a70d10417e4643b0d
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX32.tgz) = a1a517153943866b07fb5850644d1079721fd131
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX32.tgz) = f68253bb53367876e463884c2a8eaabf
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX64.tgz) = 73dcbbb4ffbd263a8ab68a5144b16cda35e14272
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX64.tgz) = bee28f3a052cad0a8624729675f28d42847b7545234f98e141c180e851a3f2052236606c512f1a7515c7ba115417eb8e8a9ceba2224a1c5915ea44f25cd99abb
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX64.tgz) = ba17bd15f5e3b131ed77687817b58f8a1730232c
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/kern-XLSATX64.tgz) = 0a2ea3efdd4858019a64cf67994cbc36
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/modules.tgz) = 4ce7dd5ecba275042042fc283bf93453fc57b2fa
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/modules.tgz) = b90e1c87a5ad7981bf51e9fd33b2614d6d092c10c6d67a242ebd814276dd116ac660d9801ad02a5b9b09ce58e3c2aca802322c97ea73c9e270f88d1162e7ae24
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/modules.tgz) = 73d91a2e36f2ec78fc3aa1f2c2af0d2a2d9174a8
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/modules.tgz) = ead882dfd50f9421b51a5fc5deb0151e
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/tests.tgz) = 441100d5b3275b38c206eeb86a9153084f37e613
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/tests.tgz) = e3f33662a577ad2ec975b432424b5d2c2b3b2b742d5e2ce37043cb1820ba225b185638c5c88a34fe05af9fa0083db918074cbb8f091354c35e8f2fd121f93dea
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/tests.tgz) = 64e119a7b1ed5eec0151ebe0ac8c6d2f362e8dc0
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/tests.tgz) = 0d6eedfa2f9aae4c8f0055ca1a358c66
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/text.tgz) = b7f32924a9d2c54824fb19b1bb3158b2996a16d1
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/text.tgz) = 00b6a2831c439c9a5bb07023fecbd7ac99285b2f08a2eb2ba00ace828eaa4cb5fdbd12c339170b9235713d9936683837214389ebfeb52c9bc4be07bcc0df0e15
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/text.tgz) = 6f72bbbef2e15bc63b99ae7419a6a68f3a82b7e5
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/text.tgz) = ec982ff4007c1082127af777e978bc85
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/xbase.tgz) = 2e87de8a350d32c3529222c0195e8b89a03f1192
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/xbase.tgz) = 65ba278254dcef89f1cc464487921995413a5400cf0a3388eb987416486f96f510c91569b6c3145d687e05eedc93be79bf54374c67fb33ffc57eb2b89902d096
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/xbase.tgz) = 7acd24fa398777d99977da6d6080c89ab8a75ef3
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/xbase.tgz) = 5535460ce0de58bbbd1aa49741edc463
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/xcomp.tgz) = 70a07fcea399d1032660b185c2d9ac6486da8fbc
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/xcomp.tgz) = a803322c59fef449066d1d2e42beec42587e40f6134f5c62d475440a01fbf93a91aa9bfae96b89eb6394e2f20d925fb85dc23754bf8600feb40cc98a9beb844e
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/xcomp.tgz) = 12a13cd5fa3a63ddc24e4f4bfc6d35ce99dad31d
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/xcomp.tgz) = 0b455b3722b1429e0a134317b8dbdea2
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/xetc.tgz) = a95c9eb9995be3639417ed3098f7ef36baa0d729
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/xetc.tgz) = be4544652b01b9161ba2f27461ed723378712d0b34058ba5a16de3cc366a5b551f0e8e7b740404eebbee7ae656e7745281b7d329068bb1aedf8f757ed06e9f98
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/xetc.tgz) = b7e1bac15f5d4dda393d5e07e2b26d3c3877a01d
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/xetc.tgz) = ee2771391cc229fb9bea94f455e841e4
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/xfont.tgz) = b985c741b487ae0e65ca36e318c558c147d1eca5
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/xfont.tgz) = 3da2aa9b1cb7906f515d0c02d67a8aa994a0022189dab11428a28040f57f5ae3cfb758cc7676837aca3479bfcc1e1551afe592417b59ad79b80a6392d6f34929
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/xfont.tgz) = bccdaaa5821219a03bd67a57320311b265a19e94
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/xfont.tgz) = 60eaa14a01f682577ab5b1774fefd7b8
+SHA1 (NetBSD-6.0/evbmips-mips64el/binary/sets/xserver.tgz) = 30134e060bc2ad1df81dfb637ec9d7e35bbc4932
+SHA512 (NetBSD-6.0/evbmips-mips64el/binary/sets/xserver.tgz) = 94e7986f96ec8b41653db1b4c05d0237c614678b43f1a52ab3b40c5627ffea2c7e91ae3e154391b964dc36edbd60aaed767427bd50eae5306beb0fead97c0346
+RMD160 (NetBSD-6.0/evbmips-mips64el/binary/sets/xserver.tgz) = 2423334e389526cac76e76fa0fa38fd671e0d3c2
+MD5 (NetBSD-6.0/evbmips-mips64el/binary/sets/xserver.tgz) = 508453785f0150d7115610f4ab1f0ae9
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.srec.gz) = 3d7cbad15200cb0e18ed529e8d65768503bd0a96
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.srec.gz) = c549dc552ae2b10bd3d8b6b716d6a107e5ef6988a49b2ae1292b40608d217cafa8bbb77974c3e8fe9291820bd534b0713c1136a09c173c282384f2805cabad1c
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.srec.gz) = eb53ea3f18593ad0a8d23ab92b8d78e590709cae
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.srec.gz) = 6c0fbfaa9cafb5799820bf14e057a5fe
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.gz) = 5f370ee3290556f0df9346c1c279b4cd239815bd
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.gz) = 8a7770a9dca3bd6bb59525c7f5340c9347d7c315e6f54c719d5f46312e0ff25d1fd6ba0e31d881ee680d904534a71f7258c49c16e706a46cb6ff0ada537630fc
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.gz) = ed1b7878ae50846b27db943ff3f82d0be2e4bd05
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.gz) = d935eea2ed1da5225fd8af96482ecc08
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.symbols.gz) = 0f65b3f9550c07786d711dfa98c426f3601e0f01
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.symbols.gz) = b37c854b5a20cd45da6e1fb4132a0fc8bf1234ff08294168249a3a38e8463a9c52fc9863af80787c10ae62e1bb17be087cab605478f5fb29dd615f8168ea9180
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.symbols.gz) = 1365f99730e4ab317d1d35e73f2eb5592680ece6
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_LOONGSON.symbols.gz) = af18fc0829c787d47e6cdc7e6146413f
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.gz) = 24b04245cb3bb8808c2643f6efa74677e18425c9
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.gz) = 4d76662f4aaa9fbdb3bc3e807eb716804f4ac070e8b0e6def5e9c4c816ed456894bad40a3b51ff8f68a21b05bee08de02e7fb1ee1ece8e625884dbb2bccd9109
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.gz) = cdff1dcb0aecc09f926915055769081acab42201
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.gz) = 06cca864f41f90c5f0bd6d95a57ecc5c
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.srec.gz) = 5a432e451fb73617b8377b4f479a6eaf611bac29
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.srec.gz) = 3f92a16819d8452f7d105e19d803985832f89e1d6c09b067d6ffe4522c7e924707d9411535ccf838cdec3b7fd1fa17cd7cfbb6e2d3bd369690dcd9094f5e10f3
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.srec.gz) = 71a1e5b455df4458e1bb4ec9d45b4043bebc5788
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.srec.gz) = 98534235eaeb7626a485458779a0e6a8
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.symbols.gz) = 2f3ed468ae1a3a4082bfd5412bc11ee8d8cb90f9
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.symbols.gz) = fc3b4ac13b3c951037e30132d9178dd79635cb78adea2b97046ef6d8a8486bf9b12e43d26897f32f7db967fddd048c177acbb5585b573bc2b9c80374b59c133d
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.symbols.gz) = 5e863f2e95a8623056dc32ea5ba0265876f102df
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA32.symbols.gz) = e84090937754b1d91357b759679a2ae4
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.gz) = 3e9f23c9e3f15de38a7e0908f0253d1f23e49a43
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.gz) = 57cf422b28f5442c105e23fae81119e993b543e3eb2c344ab5334e8edb1018c54f3b39245d1bc4091b8de4e28fe78e357dfef31bfa51de174342ba881ef9cf45
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.gz) = 9950fb85a0100463810fee9d0ab79d4297e94401
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.gz) = 571361834195d0048cfb4c2bb13faf10
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.srec.gz) = 03a6a6428275c9f01f514031f5c288739a081850
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.srec.gz) = 4165164e3830c5dd897107c64cd6dcbb27edc31e32bf6cf7305fe74024c467a81e703ed1be94071c62cf467eab89ecd66b3b72876fc1d8fece4792dbb8384255
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.srec.gz) = 68586dd9c3e823a26a5439907f088772a5939b88
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.srec.gz) = 37ec696958709fadbfe7e08fcac3bb57
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.symbols.gz) = bdc6c366da273e056df2ea2bd9d92813b61f5b36
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 574c80f478e5f87eae6602a8e8b6d52df19061199f2e78d05bc6e662daca5f9b6aef26dd4b543d24e557b78aa2d5f0a5e80aa9cdfca5fbcdfc8a4da7a84b95d0
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 4f8ba01f1ba53c8b8230a974d7c8aa45a9667915
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_MALTA64.symbols.gz) = 5e726ecc87a4406b10e5c11cbf745a7e
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.gz) = a21c899aa2389958474b94a057e7356da840589f
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.gz) = d092b4d17356ed34a9a7a79838b76a487c35d99b26671f1ddfadb85db810bda74b3db64f7734e30114429cd8fad87f13c04ca462c6d3bb56dc1f78855d7b9def
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.gz) = ae46da84fdb8a17e60c91ef88049989eed666a96
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.gz) = 1ec7762cd142ac3eacfad76ebd7f018d
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.srec.gz) = b76ec124d80dbda9a425bd14737ff88105d4c053
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.srec.gz) = eb446974d31976ddac9313a0a45ffc084dea1bfff75d18e6544f16cab3333dcaf6e62cff59b0cf88070985c1ab7a4c0285cdd0b54eb75d73f538d45a80be9256
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.srec.gz) = 1eae8b53f9ad020c3a39d67502e74888059125f1
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.srec.gz) = 3c2a22221dab7153f7eb41daec3a4de3
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = 0be09076adaccfe13864e71c9f1ed8085a515401
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = 7bd72d9d584872ca346e2ee6eeebc8e8fd06a7e655acf621ad1b849b440ff66a33bf71650738a074732845c2bde24acb08e1b457e08abde3234d2972da370773
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = cfc81eef00d46e0c1deea04c9364f64e87d637db
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX32.symbols.gz) = 11e04b25355c8c60ba97c142c21ba8f3
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.gz) = a68f5f892312208526869378614a6c38f0ce7ac1
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.gz) = 7b298f7fe80f77e2283c407af4736c643e3b0d0710d43bbe809dda43660344caa948ebb07727ec80cf19065eb1a30ef24c68d0249d2cbc9598833c14f36a04fb
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.gz) = 431a3a8bf7ea9aa86b7c82075a2c6272ea9f4938
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.gz) = d1cfbf1aea636ec7f9b36760eea32d08
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.srec.gz) = e766bb842b698937ab7252c0bf6f325f1ec2c7b6
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.srec.gz) = 832e277c2366f3379f104fe68aa927b3c7358c40df62f393419ae9f2fe30a989a532f4d4cac8dd821ea07c5707246329990e64ded734cad1c4e755a59cb59402
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.srec.gz) = 44af060baa21f3c09fa3e283cde72a7171f6e6f2
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.srec.gz) = 058b4dc450b1e2e5fc14136e4ccf3743
+SHA1 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = 5130e72edc460e5bc620f9101c6b260db4417ef3
+SHA512 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = 53360173909b40e40ac018fa0f5211a74970d3429c85c182f59a6ee4ce782f54d707f2d6205d9bb5f4fd5b100b074babec12bbaf178f74b867cfba5964aa2ec2
+RMD160 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = db94d2cc9bfc2eb2fd44e87d47be4b273aa7533e
+MD5 (NetBSD-6.0/evbmips-mips64el/installation/netbsd-INSTALL_XLSATX64.symbols.gz) = 37e4e9464364847ad2327d6352019047
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = c8b43df25bfc2e9171d6ddaa73b436f63a9c7085
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = 73d80744cb6154342f5c3d36f8849c2a9686c1318fea913b840eb97e3177f1b225f4cb9178a9e15b4cadae35579c2258b38d180d1aedfb0e9ffa00543b1cd8e6
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = c8e8dd4c41e4e88fd7bc0c34420df32a00a941b6
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = 53e030127285e17b67640e9fd98af1a6
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-ALCHEMY.gz) = 9f738766737db8cb0f2404c4952bb75cbf407669
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-ALCHEMY.gz) = 1298e944b4d8495905e6649476cb8e1bf49719abf2d2fb3ae55f5e1416a2af3234310047926fc261264bb12b8c40d09159a42cd978297cd6ee4197249a34561e
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-ALCHEMY.gz) = 53f5c1646d7811b99d2a6bade48712647802264e
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-ALCHEMY.gz) = 7315ee909933e50ada51ab5652ad0d2f
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DB120.gz) = ff83b1a41048bcef21a723c356d5e762d1ae697f
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DB120.gz) = 400430bfab26962e450f73640ca169fdf4f748ff34c63dac1edaab893f58a3494a81ecefa807bd80cdf846213d004dcedeeb0b57e785436488c26a66c06ed685
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DB120.gz) = aa36f1124c77777325cf30badccc02f2353e9065
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DB120.gz) = 8e6dfcd4eaa37591d2648cfbead5b650
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1500.gz) = 5e4747aafb2621b40c0adb250613225090d8f219
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1500.gz) = a24d3164c5f9eac497b338e99fd04881e9fb3ea1e25844c4d9927383f306b9d0fe16e26f61e33ca7fcc47be9e6b1a04b2cc6b397f51187e49c5683714ee4880f
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1500.gz) = c90b133fd12b1327cbf8cd0229df26d3b71774dd
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1500.gz) = b691ce9b6e0e31b0945fb7ff041e336d
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1550.gz) = 62ac90542124d3b65582b7c5667e545fbd7b1145
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1550.gz) = 29622cc0d471a80ab095fda13f2d06ac32d4757d2a2ce4c4c7a54b490b6445ee86c702007de54ac9fe81515566d7eca3805f2d1c4d842a49d8c752df4d09099c
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1550.gz) = b624724146136eaf312d9be3cead0eb8f55445bc
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-DBAU1550.gz) = 0d30e656a06c9c5ab86c9097e08b2ca8
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-MALTA.gz) = 83ac7456a68f04283e651f472160025d9af2b256
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-MALTA.gz) = 1c36d9ef350ae385688a4300af725d1b2ccc94ca3f6eded04d54ca2dcfceb40d5ef8db88610428051598e7a1504340ab86bfda25d96bfc3b454aa74f0f35ece7
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-MALTA.gz) = 59acc8c3c660bf2256966b58cce5df78cc6a4da3
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-MALTA.gz) = a64c723ecc8ff566fc859d155bf288a5
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-RB433UAH.gz) = 8af25f51ed2e87eaa234c4bf43a0c8adefa3c267
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-RB433UAH.gz) = ecfff13379b5e6a657670f69aec3ce471a593505e0f6284f80c0b4f3c4c903bc9bb7d9cf0c9385e0b0f5288cc141bf5c21e56250ae17107f53ca38152fc59a13
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-RB433UAH.gz) = 38d8fcad12171bb0209eaef94e137483d6d3f5e5
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/kernel/netbsd-RB433UAH.gz) = da92ce6119755ebd89fe27c24f452aea
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/xcomp.tgz) = c8f5ff5ea9f9bbe231f92d8b7f3bfcbd2897069f
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/xcomp.tgz) = c7590075195019078b68ec5f87e36479ae2e7b7749c523df4ef21c9d881c343cda9f5c2bba897dd313329a76fe5c18e920d92827878d98ce08a7dc776352cd02
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/xcomp.tgz) = bc60e267cb6e11b4a7305f8b7074084e179e0ff5
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/xcomp.tgz) = 8e58ee51667def3bd015f79769c0d932
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/xfont.tgz) = c551bd13179b9508c2e3a7e19cec323e8ba21844
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/xfont.tgz) = 764527f2f3f4686759fcae3fd093f4e00f34e1249994126221a6f9afe73d4cf8ddfbe8b8311798da2ed38c52466a44bb26ea08ad5aab1c08eebcc9019b4223f7
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/xfont.tgz) = b3a365bedf8b4a20f3920d0e33b9a42fce288953
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/xfont.tgz) = adac8939da213a0195cc1d351f979199
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-ALCHEMY.tgz) = 0adc8f742c596217127185e8f9e4db43896d9299
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-ALCHEMY.tgz) = 35865aa4e39ecbf9c8f4e48ac85b804b571b1488de729cbbc5663deec75bdbf90a229ce99473975ea46715d502442497a596fa35ed89e5d3602c3b1221db6676
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-ALCHEMY.tgz) = 8a4fea3817d615408966528475869669efc69701
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-ALCHEMY.tgz) = 94e9d6a99aa8ad762dfd71d5c2c5a410
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/base.tgz) = 152709728189dfceee8db96c9b793229d80514ca
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/base.tgz) = fab7d3d262ebc5bff7c6edd891b967dc10f4c274b33da21a874ef874ccd1f1917afef30cccc27efce5869296e9bcec95584fd6109a48abd94b958b231a5e2fbe
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/base.tgz) = e52f8333537d524fd1580d0b07c9c63414fe680b
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/base.tgz) = b2dae13bf91a2929948ee84429598111
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/comp.tgz) = b04647e2ea51827ceff965350bff9290cb4e1da7
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/comp.tgz) = 15b6bda11ff6d85a0e1696a2fbd174d1b060e606f52e7447d6c25a48de41f03e99e8601f098c6604608e3a056096c8b17ea6865802db353a018860a3c563d387
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/comp.tgz) = 0ca46bc47c48ba36c8e56b9131abd9d61d5c7ae6
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/comp.tgz) = 5917382e90e63ec66e687546760a8532
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/etc.tgz) = e55b4d17ca25e42c4a0652a40106d64eda9f8096
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/etc.tgz) = e6286e75f5ec6591a53162c332be61b976e4e0386d429aa675cce295ed8fdb90d62287b244eecd0e0341235a637bbd593f50164dc8f589ac4f969991d2a3f0f9
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/etc.tgz) = b45e18e794d732b11dc8eb3ef733c2dfdbd0155a
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/etc.tgz) = 2a4d24ad39ee26ad3bf2a6c9d86381a2
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1500.tgz) = d6c5b3f1074c70e13e1388d68a1932cc11b6a3ff
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1500.tgz) = 6ed5b668ff52a75aeadbf11b1096822b97f01af47d8b6b171343feab7e10258cc02b04e151f37995bc85cf6a7c562c4404181c8484a3aa3d593ba9a2c934cd04
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1500.tgz) = 3f5750e9b576ed3e05624052d5f69103eb32c61d
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1500.tgz) = a4513305f6d3e69cc52c47047d89de2a
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DB120.tgz) = 2f08fca9d13f265f4d560740a55bebf8b115dc37
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DB120.tgz) = a4a2c6e1711da7562520ee189131e499aa65ec114f713cccd7ccb94f55d9e845a253607ec2219284df1422ba5492a0f24004b8088601dc807aaa2a925e14bcab
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DB120.tgz) = 018c1be32ee04724b86fa2ea173adbe460f63e50
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DB120.tgz) = d89deab24227d2179a680db2c9477357
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1550.tgz) = efd95e1f98f8ebc28f7621e5696b7ac148091aa4
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1550.tgz) = c67276ab70bdfef9c8a9b9ace43ae950a686aa630f0bd11fb06c533cc463faf41ad1bb89d5a6f2cd6d4d04914ada697da20ec19924720aeeb4d5d1282393cad6
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1550.tgz) = d91cfd72640e117cf952ea3978af6ad106fbed88
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-DBAU1550.tgz) = 1e914a5acbbc55fdab0a70d059171d99
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-MALTA.tgz) = a5da116a64f3b9e840cd568391f7f755a1ca3f14
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-MALTA.tgz) = aef284a501e6b2cd16293a5689c5c798dc6bfdc0879fe2cf212b43a4f9d33e9f7dc863f7020c6eda08c8958e713412e5b531e0af799c4695d327c4b66206030e
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-MALTA.tgz) = ed3afb30019e8ac95a9a7348c9099827de561edc
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-MALTA.tgz) = c85bd4c68c3458f9581c45a240f5e1ab
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-RB433UAH.tgz) = 64f38dca64142a0a8426e216cb8edd0884551603
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-RB433UAH.tgz) = b0904e89e80ee6b16f9a97a36974ac5e8a4a7ca8dda9e5f4b27de218fd824d9515ad446574337139aab25fb290c6a93a177f4ddbae7b7a92c8daf5586c87f727
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-RB433UAH.tgz) = b5e20de5b71f3f0880f714b49e0c39a54d19736e
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/kern-RB433UAH.tgz) = 687ac6220a984373b976c5e73cf23240
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/modules.tgz) = f46c0e5db2b77d898161bf6e3ebac55b05413047
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/modules.tgz) = 04dfd0379e10923c47b740c5ceed84f69beecf5a72f581885e5c4dddcf9d241499578e6b7a435a119ef8be74909878620fdb700e6638ae119da59c635883aae7
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/modules.tgz) = 1b674a6cc66d8c1362d66acc69f99f1e0fd70bd9
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/modules.tgz) = a3500877590cea3b09db38130581d10d
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/tests.tgz) = c0a06d6671f0141559bfc80c076fe6f0b2d87003
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/tests.tgz) = 114f7f7e299614296fe2b272a172b9c1d77da42dfe09064c6d9fe9a6450322a38a3c1fc403348aa536d2039884899200591b59d653a3a7d89d22ea22b1750b29
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/tests.tgz) = 4833a7fb848401385159dd129da45d96a9a7b180
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/tests.tgz) = fb54298f8aa3423bcf7bc43b3fea488e
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/text.tgz) = 91921b0be07535e75e97288e49ee2bc0b3c9949b
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/text.tgz) = 336ae450c79b99cf2f2c64a9b378125904c2b7f2d2b6de8eb0f8cd5a2b735cc7a55fe69b599daed3e3e8ef9c51bc6044d994e6dcda85adba659204b92724b814
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/text.tgz) = 3e1e8f989f25749485c0ce9471dedc141cb73726
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/text.tgz) = ff542bf96a0884faa5df5e30d2ac2ff5
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/xbase.tgz) = 6c4272f0ef26a4f32eb393bb479f62b2b7142bc5
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/xbase.tgz) = 568a69f2077f011b98792eb1f71a8b7bf11251f42ca8a082559fd3d836a6afcb7eb05e77331b1cd8b996731c4fddd4ddc8abc6b82cc3c4d9460827e52dde424b
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/xbase.tgz) = 4bcb45e19d2da3ccb065977c5cbdf640144afb8f
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/xbase.tgz) = f7cc64d9cdf50d1c85923eb835bc6dcd
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/xetc.tgz) = 19444f8d1799d782bc72d2684588b1479ee5976b
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/xetc.tgz) = 0075efc99fa5c63bfce8806d5bc083e3e68bb6e9dc885b382353dff0bf55b85a27608318deeeb504833cc5abcedd5bacb45b943bc3beba42e202d08ed368962d
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/xetc.tgz) = 32b296247a2f343a49473e7d54987c6d87229a38
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/xetc.tgz) = 7d63fd2d8fdbb123792d61e4fa3ece2f
+SHA1 (NetBSD-6.0/evbmips-mipseb/binary/sets/xserver.tgz) = 2f38506d78bb7be30d5cd8719f3c137dc28b7f92
+SHA512 (NetBSD-6.0/evbmips-mipseb/binary/sets/xserver.tgz) = 3364dfa7db892eb0c1c92ff50c1e321687300a2cb572da25e55ff501d958201fc3f2d916681778de0879ea20cb31ccf30766038863e0b97e4ca52365b5dcbf51
+RMD160 (NetBSD-6.0/evbmips-mipseb/binary/sets/xserver.tgz) = 9a26ea480f7ff2ce07a648e0004dcabcadb8432e
+MD5 (NetBSD-6.0/evbmips-mipseb/binary/sets/xserver.tgz) = 00b808e0f27ff7924b22f2c74b1f7121
+SHA1 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.srec.gz) = a05b722b902910be1bda3a582d3ebc850048ced1
+SHA512 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.srec.gz) = fcde1c3163e2973f213350595dd38d202524e4f125f14ff48b68f9d569f10788c8796123e051ae72e64b786452f60ac7079ae59390333b63252a8991ee1a1786
+RMD160 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.srec.gz) = 2d4a3c604fec21934e0bf2c4e987c8978aa8bce3
+MD5 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.srec.gz) = ecd58d8ad5bf459ed7022e72580b9942
+SHA1 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.gz) = fde4c37b9543ae150854af55c5c34243e1316c05
+SHA512 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.gz) = b72c9f6516e3ff03e64c6598e153893d6beb5c64997488571bf3aa4547f2f251b78721fb4a23892470c8b352b0ba3a6c95f2e0c8e450918533ed1b9cbebf90ef
+RMD160 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.gz) = c37277dcb3eff20bf03c9319d4a6766d1f869225
+MD5 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.gz) = d6f55d866675b4e51178d7c7daeb7b6c
+SHA1 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.symbols.gz) = baff18cdf467ce42a54eb77e9774c524c9ba347d
+SHA512 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.symbols.gz) = 530df115006eef8bf3f3ea78c1bc1b8a37e90dc460fc8c3cfbeb70422bcb0a9ef52fd116b5b9ae3a9eec83fe60cd3a32fa0933ac0589e2c68c831978e7e988b7
+RMD160 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.symbols.gz) = e4ed20740fecd9b75d635d99567d3b67f5ae5cf6
+MD5 (NetBSD-6.0/evbmips-mipseb/installation/netbsd-INSTALL_MALTA.symbols.gz) = 6c54f00839d4980e95252520ce7a3814
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = 134fb77bafabb2f5cdc53713cedd145c6695b5c2
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = f21c2b6185b6ddfcca9f1873239ca3855165898d537f4ceb6fec7818ae157ac95b143f559c77be261d4fa3c427e0579d5ecdcdd6047944d0faa94681b8375c16
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = 003133387cb76ab3a8afcb59683cd6d117e4dd0a
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-aumac0-ALCHEMY.gz) = c99637f4bab91983011482c5cd8f84e7
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-ALCHEMY.gz) = 87f20bbd047d0c7b793c4ad98ecb01128565e2c6
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-ALCHEMY.gz) = 25a0f40f69c8fa908265a4e757cb64c074f47442b3f9e4d6051e7024042d2685b4e01bf3b0081d603bd633523b8f28c3570b93f5886a4021986b03131175854c
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-ALCHEMY.gz) = 4f0ded0dec635ab37d6e43e5198a3eebb9d5432f
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-ALCHEMY.gz) = 886795f8573d66ada3b5bf8f8443cbc4
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-CPMBR1400.gz) = f90b68d7d1fb37b69896657f4060f0dc1c196951
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-CPMBR1400.gz) = a639799a0431ab22cc468f7168358416ff6095a6015cfd783406b24a6e62f1dc38a978c2c4875cef999654c3f0fa2f8cdadaed5d0283fa05bc56db9ff89d4c68
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-CPMBR1400.gz) = 5265e5e99e360048b07d997d3bf0f73b806f905c
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-CPMBR1400.gz) = 5447c227f2147295b74c3cd9a62efa60
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1500.gz) = c298c37feb22bee4f641ede6c29b82f55a15fb43
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1500.gz) = 9ac3727e8f9777042fe7aab1613e910da72d07fd5b8277349f2b538f620f6ac34cfe5972fa72a91275cf99ce0e98e062bd559b169eab6cf9700d0065262d2d98
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1500.gz) = 45fbbb985b1bd77331e018f10df8d95d17c12af1
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1500.gz) = 3391b8ea4799c856e260069f7a4a0761
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1550.gz) = 2a32d5bda59467bf957d1dba8f4c716c553436bc
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1550.gz) = f5b499dd62317cda4483cc70f65e56d7a8a6be0095dfa1a3836158b6615066237ecc13b3ca66a11545a47a938ec2f2c54c27c8613d16f931ba0b3a8bdbabd2dd
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1550.gz) = 52319f5ea1ba91f0e3d762df4580873ae8015f3f
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-DBAU1550.gz) = e55c5185cd7d35ddf3a8aaca93be4598
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-GDIUM.gz) = cd1ba889150b543a42b1abc72bed2da50a4705ee
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-GDIUM.gz) = ba267fc4d44531b95167b3321c4b6f2885902a8a19332c647ea325ba2ab37e7d48a1753d2ebe3991dde1ea286455b1062e56242b0d7804b9db51bd906fc6fa46
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-GDIUM.gz) = c4fc7d36e9e1b9d22f04c85db96894267551ce4a
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-GDIUM.gz) = 53fbc4ff1eabc437ff5546fa12df92df
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MALTA.gz) = 18cb97fb9b5fa551a4230460d66174bec28a7017
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MALTA.gz) = 5887e65233675d5584c5f8b9d14ab70b0368ad9c9d6e085470f63f3a37a82d5adfab7306866fa55303cb73668ab8b836082609da77eb5ebb5fb7b05fcf36ad03
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MALTA.gz) = 326fb5286d584548044d264ce8650cf9b13e3901
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MALTA.gz) = 06f4d46d9d802dac0954390934246fa3
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MTX-1.gz) = 95b45facdc9fa0b69709e7e5505e3849eb3c318d
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MTX-1.gz) = abf3ee530bf7a515fb2f4d93ff50d5ead425232171eaf33ecd9fdc56fb0ee37e976aa918fb3a153b0c8d8b7b51cf288bca1acf7a9a61402d149818e83ff70296
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MTX-1.gz) = eeb4eac3e382e41631e8f3f8806e2c3f10355a4e
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-MTX-1.gz) = 36da2e3383b17e5bf06844c414dc239a
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-OMSAL400.gz) = 44841ceb6f1af159ff6056ef89884da1f3c7cb3a
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-OMSAL400.gz) = 7ed282421374238ff02c9ca3e413165be0d0b16e1011cdab9d4af9f9b3b868b05d5832a8f24ea396222035ebf46ea3b02b2eb49cf378f93f26d807192a5b6458
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-OMSAL400.gz) = 7b039a86fd581c56153a113366efd278414f9921
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-OMSAL400.gz) = a8bcd078458637f91753faae2c99c8ac
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P4032.gz) = e14fd9558a2cf7405398aec0f3df97f846ccbbdd
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P4032.gz) = 4640b39a386e0223ff255ddb9796820a249e34e25eb2f550cae3ca36d2a3af7eeb2f0133d084323b964b8aa3db93db462db2bd3debdd78388e71eedcce37a48d
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P4032.gz) = 845c8595b29846b3ad87272048e0d5ea18413c2a
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P4032.gz) = c2e071d630599cb393bc13e4db60a187
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P5064.gz) = 11fecb91f2c90740271dcc51a7fe5f78cfd35281
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P5064.gz) = 076c38f8684254a744cb14d592b5f0404d5a7944cbd486b2b6da4c4a1057057029f5f1949f007ad5255d97466ca5ea1b5af047566823526b7e7804280b0206f9
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P5064.gz) = c2e78b4d2da205e8af4b8bffe97e71b78649917c
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P5064.gz) = ae9f3bd2236f924b501fc6d0ae0b42c0
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P6032.gz) = cd8af99e05c16d79b574f176d0229bc363c3f094
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P6032.gz) = f1375dd13b2950afed3a0b3c9217a0630da47ce52fe467140217a2b29706e68354018d2e5c4b0ab7b16a9af119a66b6430cdca1298275dfd1d9b22eb65cd9ea3
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P6032.gz) = 0af7124d320813134c90c509027396730e0bb758
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-P6032.gz) = 277e59364f2ed7160337ec3d20060a9b
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-reth0-CPMBR1400.gz) = 55565c142f55fac5076d21a61b0a5ac8cad002ee
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-reth0-CPMBR1400.gz) = 8db0765cc0d2affa6cf5490d766f577f202c89d6694fb8e57f81c076257242ad47439fa9e3d46c738d2e1dc1bc306f951fff54211f48c4bcf3c27ce672db67bd
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-reth0-CPMBR1400.gz) = 015a00aebbe3f9ff27bbc38e50863794829c34a5
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-reth0-CPMBR1400.gz) = 994571e2665c04bfc5ed50709b09d74e
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-sd0a-CPMBR1400.gz) = 7c23499487a89cd84aa8b4a429b097e8ace4c0bb
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-sd0a-CPMBR1400.gz) = 1a517e528904e379b39f740f0335c93de12e1b9398fa0564ebfd702fa064b75dab85bcbbd44f2f5baca767dcc61cd79bc7415648ed346e2e4d15ff3c2c278bb8
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-sd0a-CPMBR1400.gz) = 95ca7bbed50714a1aa9694362565c4219305a9a8
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/kernel/netbsd-sd0a-CPMBR1400.gz) = df9de39483767ed081aeb4bfe5d87f23
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-ALCHEMY.tgz) = 5835e5112e44bae1346420ffc0f3e09a2e4f6117
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-ALCHEMY.tgz) = c3b2ad6f9678403cb3a6e0b8dbd05b6717aceac5472eac0c2bad86dbeb30b509f7a8b865daa499279bd524a10b075da08f6fa9736994cdc4633b0f67b0ac22b6
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-ALCHEMY.tgz) = 3b7c2006143846db5c3eab27c2f881dc22ef5e05
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-ALCHEMY.tgz) = da923fa9431ec9e4349f58d50bea5adc
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/base.tgz) = f0e2ba7bc4f19f19c71a28de51c4359ac56a6a44
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/base.tgz) = fbf1b00664f9a8530afad453e1af05ff39741d87187d25e3e5242c06fa013e6f6027d40944ef82fbc12c0ced24e90824a135bdff8ecfd69b04f2ffd03aa8d065
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/base.tgz) = 581b658d659de51923f79c189fb4dc75201aff64
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/base.tgz) = 185928a3ba27f23a06356b0b0df0ff4a
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/comp.tgz) = 66f0609c617456757b6563e94e2feaa2f788d2df
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/comp.tgz) = 83bc3d7127bbf0bb9d86f015d4cded042e1c0cdb75efdab00fd7941a7d96e8b54893b54a36b489d221dcbc17348473ba73287708f031b2ef37e0288074201400
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/comp.tgz) = d8d32c55c767525effee5ea75186373d6c253873
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/comp.tgz) = e56af26f877a19649c558c9d3ced6e6c
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/etc.tgz) = df85d74c9f2767c9be3de45d693f13547ff9e3da
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/etc.tgz) = e06ac6ef086e5951de773f02fe83c16ca1804611dda15b1dfcc0a44e81c3e6e6acf06b94480b0f643ef63e1a90c8eea81b2af4302e82801c033705418201e66a
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/etc.tgz) = 16cb173c32cd73373937f89eab796e5bc987ec96
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/etc.tgz) = 81f8caccfb4f464cf105f293393f6c78
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-CPMBR1400.tgz) = 1da339adf6e178fd648cf87cc4d2b5e1ad0bcc2a
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-CPMBR1400.tgz) = eb2c935de15c5622d5752c949b86965ec587b5c36c5f51ae2b801a9e20482772d1d728563aa70b299ec0316bc71f7754a0c4fb2e9795c01effcafa9123bf2029
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-CPMBR1400.tgz) = 3dd811b1a249023ffa47e31969f4086b9e156a15
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-CPMBR1400.tgz) = bd1349e129ae6367bf0e3532935c2317
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1500.tgz) = 3f3199d94860f1a97269132ec110acb983133723
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1500.tgz) = 1a1ed387d0902cad78598dba5c0a088e231594d16b4f49ac73c082f5c05f972b1a8e5ab5f28b97b23d696297cc9f334f1c8bff2daeb8a386aebf1930e3587007
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1500.tgz) = d7f81fc610d0f09a26d14a082c9a143283d8594f
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1500.tgz) = 54e6afe80b72e44b94d994d2465d63f1
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1550.tgz) = 22c9cf65d89b9042f2b47316b99368dc0cad4d45
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1550.tgz) = 3d2e737026c76a192d4461234be70622682563a14584ba8da5272be018a711dd108fc71f93d8251f8851246f8998c768f4a2f6e81b7985482dccf1fc166b5138
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1550.tgz) = bde90234bc61e0105d5b7d1b23c23cae81461f84
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-DBAU1550.tgz) = 2905ebd9467c3a2ca17f776044ac9b80
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-GDIUM.tgz) = d7085296fbaf3357d9b3bdfc107c0632b7855d24
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-GDIUM.tgz) = 8841e72b1c725be15c37489f42254fc84feecfc2bc90050a4360ffc248ec14dce16dfe41ed8950f198c6a13fe78f287ed53d5545a9c0de775161de52994c1c21
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-GDIUM.tgz) = 49552df226923fde73b20818fcc3b88859095252
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-GDIUM.tgz) = e24f2b056cbf42955f24fc45075f2836
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MALTA.tgz) = bbd9390fc5aee7d91c0fe0651503360f32fa6498
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MALTA.tgz) = c09a032170d82e55a1c32fc468e6656509c99e9ee2a661255ed92d663c0605e1836afa2a098b40cbb9f6ca16854973733f6aacafafd129ca752c3ef569434f76
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MALTA.tgz) = ff39a003e6a67114cbf0cac19c38f958cd07cc14
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MALTA.tgz) = f9b7bf0cc95c4da411d9342dd2ebe8b8
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MTX-1.tgz) = 5d4fb7abbffb58499873b02451e2d87e3818cd3f
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MTX-1.tgz) = 2801b511740ce3310fb21ed8d1d1bba46ec2565721bbea394e1e1683c05984a88b2346b6949e90dcc737929e2919fb752661582984b27ea4c726ca6c70fdcff7
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MTX-1.tgz) = 5b55476b98c8b0610bb7b03b15a457640b03df95
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-MTX-1.tgz) = f185c47ceea774af477cdc675e5da827
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-OMSAL400.tgz) = 854aac9898f3c0552fb0b4491d45dae21dc084b3
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-OMSAL400.tgz) = eb6aa82deeb2fa15ea59198d3ba10275eb73b85a902af353442138df9b66307ac2a595a61824301e56bdcf3fddea03414fd7c312564d039fb8d75fd9159cde58
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-OMSAL400.tgz) = 0fc4d0bf3a667e4fae2f60a504a4032751a5bb84
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-OMSAL400.tgz) = 53a48a5e4731a1160347ad6c655ccf5b
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P4032.tgz) = 9e8cb0ee684033f08ba0b4bda5a4eb16eac71fb6
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P4032.tgz) = 100f84c1ca2763695d90d8b65822c0ce4156c5c51236be33e395dcb7e68c806f979f7afc50c3c76457c82f225df32c44b7cf42c9c8a183469ead0b512a5880f2
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P4032.tgz) = bdda2cb2f34b84c0d46a8dfb7ef72bb6f3562018
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P4032.tgz) = 36f64c61f21f88c7d6067d2e9b1476ab
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P5064.tgz) = 8d6f635c7b19fe4b4ae3f81b8e55782ff929a275
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P5064.tgz) = 4382b4df12950d3ee601efd85e13a0b3aa4e41ec9ab7f1bb5024d1b198ee8c588592c2b50099354f1164aedb585ffd7e9dd123516f32f1f30c32cf78e77fc70f
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P5064.tgz) = b0bccd6abe423b957c452d1d42f40796f42533d4
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P5064.tgz) = b9659cc8f1fba16994a78e42ba17d9ed
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P6032.tgz) = 86427980342dd947c57c838152ae64d15cff5142
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P6032.tgz) = c86734213f246621075f8b35f51997d4abfc722502a4b8a3006d8224b1808871fb9103e539ab7ebf730dbb94377c3f75cd1596a3f7d3fda2505cca879c4608b8
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P6032.tgz) = 75aa0da6324608e7055e923ba1004f5427c88770
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/kern-P6032.tgz) = abcfe72de3e084c79528616c061d70ad
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/modules.tgz) = 66831501dc768e732c9b93cd102bd84f078ea1a6
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/modules.tgz) = 6b50ee54d67e9f57f125ac1eb0f1cf849f566a2ca4055032f708d8bda121b8ba96274c5fca21deec4753a3bbd64e18ffa66fc0548b363f95b5c0d0d4f2690dcd
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/modules.tgz) = 1db5ef74be63618d39d44716face7ca5cbafb86f
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/modules.tgz) = 47d708c50d3fbb3f170883f337a84a3c
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/tests.tgz) = b87c52edef5dae8c13e4982f742d107c6bde617a
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/tests.tgz) = a227c03925059ca58390063e75c934e9bebda7f2944478302ffca4f53a48bf991314c4bf837c4e833aa700424e154cc62526f76c53f23ac7281457606e975c20
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/tests.tgz) = ea25f7257b61f3530435a9dc66123831d59e6c43
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/tests.tgz) = 42da5bef4121a88ef7ba8e89bbd065d6
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/text.tgz) = 38e7f089801576d8a7370546c8f6dfee8938c54d
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/text.tgz) = 4694ab32a63c7a00b2da8921e278d14ac83dd114beec338716a98cfbdbe7c06ed07abe0d6a10b317b50a9deeff4f4049c487458bfa9cef043b92905e9f4828e7
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/text.tgz) = 6b4ed0dc8220b79963b2cbabfcbe1ae449cb4509
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/text.tgz) = bfbab9eee77986403da3513d836616bf
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/xbase.tgz) = 71f5a25bb86649bdbeab0146bb32c76329afa9c6
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/xbase.tgz) = 70afd5fdc176eda270259b113d7f28cc92fe2037d7bc84cc69a2bb32ea05b23bf26c10f834fa9d59be9900a2ef780b55e5e181d6b1a88ff51ccf35488d28fa22
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/xbase.tgz) = 95a5dcc67edbe81dccf5f90e0125e84a6f267cfe
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/xbase.tgz) = b0a603b80fceb0f5f0c02786d87542cc
+SHA1 (NetBSD-6.0/evbmips-mipsel/binary/sets/xserver.tgz) = 9be61698fe883646972e3441d1ea02e16fa351d2
+SHA512 (NetBSD-6.0/evbmips-mipsel/binary/sets/xserver.tgz) = 17d9d25171859208b00a7e64dc74eeaf4a2533cb86d7be138227aa731a09654c007bc4245817177dc2308d693c1792ad247bc0692de79e3b0dd8e5d2257c7246
+RMD160 (NetBSD-6.0/evbmips-mipsel/binary/sets/xserver.tgz) = 168f6c36213258b1f7f3019bc47434a58cf68a54
+MD5 (NetBSD-6.0/evbmips-mipsel/binary/sets/xserver.tgz) = fdf224dd21749c1a2eb06f6ebde96338
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.srec.gz) = 1148ef0c3e4745f529e78b33e048e77a2357b107
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.srec.gz) = 127eac81b94185bea670ef1766abe38506310147c058be948614bb472cd97444402c65eef69375c39d6bad518b617a2fcfae314095c94c9263b322e061ffda0b
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.srec.gz) = 88a878858ddcfbdcc82d30efe6db396e12324245
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.srec.gz) = e0fd06b18d51bbed126e558fa66a0124
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.gz) = 388abbcf174f34d8615308f4d9387534d0dd4973
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.gz) = 6aa9bcccacbb410b5f0fc8fc905e78bde3af777913ea3c2035cc6f9a6e4a436fefb7a3afa987403d16a6f1e7151cec117391ba0d146679e7c0c4c9ab1f9727dd
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.gz) = de9ce82a62f7f24c1c78b0bde362f0e4e1d66293
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.gz) = b90209535b8a3e40f5d020a99bba9813
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.symbols.gz) = b1199797080df5d8669b35bcde9172d628bee188
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.symbols.gz) = 3b4d915b17ba81bfe9b4f9768841c8a140359ea07121d88b2016f0712f42de965f5cf37dca483ba718d47743da6c300b38499ab5c93ff1978d10622e203f84db
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.symbols.gz) = cdb363ed9995287373ce565c3a6a0a4c0441e9cd
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.symbols.gz) = 16a4265a582c47946a7bb8ad40f93856
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.symbols.gz) = 067b86e211cec25f5b7b826139195679a7b13ad8
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.symbols.gz) = 7d4006e0da241ee8b44572a510dcdc33d14cd543d46022faa855b1a554832309d0ca756702a0c7eb551d0d2b77643bf1905153c59cfabd9879e8057d4d9ba89d
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.symbols.gz) = 432610d592a1e11d09d2c6de9bcfa6eb8021e2cf
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_MALTA.symbols.gz) = 4c03720d979460cbb6b5311c54214642
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.gz) = bf85a74b3aba2ec80e8aa7b595e34ed729b9beba
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.gz) = efe3a15153df52551b5542dcceb8c41c9ac74a56cb9e5e4fb2d531d0d933d6ea3f8555831e8e9b707d724ae15cc27b79c790232fa9c5ad142f71b6a15ec61e1d
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.gz) = 4299849406f323f0f65a40f74734a1cd34206bb8
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.gz) = 54ed1ba8d8009ba512e9019f905c0368
+SHA1 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.srec.gz) = 2f72f6fe9f6a716994fc2dd68ae51c6401c7389e
+SHA512 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.srec.gz) = 4d8d6a4eebdda98b6a8074ea33ee54f729bff3e8e1f8c5c47699819a3cd29d329853bf0083024f9ba3a8893a2255651fe00232408433de8654308d27ba72560d
+RMD160 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.srec.gz) = b05f15e41052f8ab490d7cc00367eb5ce2430bde
+MD5 (NetBSD-6.0/evbmips-mipsel/installation/netbsd-INSTALL_OMSAL400.srec.gz) = 1b2e3da6a2b2dfea79a9669561f04413
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.img.gz) = 963fb1dfd634ec77183e0e19e63add5d6f515a46
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.img.gz) = 670195305b6eba8bc6cd2b5a05bcae746dffd3a9bcac873d61bc659893de97f35dca7707d073d9fd2e55058f99f83102364bcaa64d0fa9954aba2bd42eaf297a
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.img.gz) = 4ff261bfda6f964c67273e2c6cad05577ff39cc8
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.img.gz) = b3cbc16d9f2d3870fb9c137fa21b7625
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.gz) = f74b0a7d7afc324d7b463780fc6cbcee71030e28
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.gz) = 894aa697fd0f0968e534db42528be520c74adec169dcbd2d3603cc262d33e23092253494b072f7239f1542b6237128d8c5069616e28e51422dc69d0bca117d1b
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.gz) = 7d00ed85fbb611948f16e513072f2a307fa46d83
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EV64260.gz) = fce468eda12d673785cf7b16c7f4355c
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.img.gz) = 0dcdbfd5853cd5ee3649e1bcdfe16e3133128dce
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.img.gz) = 0654c6b68a52bdee61715fb8b2b1af775f4c7b4a034d11ad7d4cf9f31cae4b8fb327a78dbabfaefcf6d68352ef8be2b4e71d053c97c0c59a24250358fbf47589
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.img.gz) = e307e29dbdc57b0843e54caf02092c38dcb11cae
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.img.gz) = 444e406bfe16f2653bf60273db88dc3a
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.gz) = 54c5de8e61a39b7114fab8a4a28036ae9d44090e
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.gz) = 092f45dab2ddc2cfb79b1c1d649f3a86f169a380c01b7016737bff28b4404a47871546c33e89fe43a6db0255556a2a1cfb2bf8cfd725a852af2c19dea35462bb
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.gz) = 30903e7cf5db4e4f57334f71240da21f6e0fbad2
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-EXPLORA451.gz) = 229f310637a0c65b47a078f2a6f0df82
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.img.gz) = 5046cdf7029475b3c2d6f8fb0eb9ac766d55d568
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.img.gz) = db6f4a419ea019f46205cbb75f76bb8a35bc9d6cee83f9da3b776abb3f83334a60fcad2ef6de4041c0ed3b0689cc259789ca2517dca0e101fd46ede807846d20
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.img.gz) = 42f2c254a99df74b42ae21c1a89d42ca1d8dc105
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.img.gz) = c7b61fa28cd76c1c694fad7becf124c5
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.gz) = caf9b0a77c6adfa8d6cf1effad83b107ea9c5976
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.gz) = 14db94aae558e9e3311e667343468625f309cb71dafc7610f029e6b6e27267ad6169ce21320d6fc512bef2cba49c3f1919d396fbaccbeebe49e8e53dcab865b0
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.gz) = 3a12875aed7924a33df8290b73576ecfbc8dd752
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.gz) = 20580d5bd36fc097ce824bf9915fae05
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8536DS.gz) = 54b88ef9d752b74a27f85affe9d162bcb43009b2
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8536DS.gz) = 42903a0d5f74e45d00cb48a4cca92c164e26097791048f2cc1c2b7a1d8b243cebe9f64a3daba9542c12b077017e59c1d0d6c8a8c11ea120855f0f40cc7ff8fb0
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8536DS.gz) = fd7ac6dae359227cb757ae1eadf39b1fe08e43d3
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8536DS.gz) = 505ede4a04c4726a1121a17a531a74d4
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.symbols.gz) = 9c6ab2ce83f2ca09cc8789a9431638f7fccdd64a
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.symbols.gz) = 8ffdfde54ed60c89f642b91c6e434fb4ed4de6ed91009df3bd70556e73f6eb5cc28b7bb3090823cd8671e052c5d52bb15eaf8409e779cbbbf4ee6776580b67e7
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.symbols.gz) = d52adf8dfa375abc8e4d0cfd7a414afc7b44aef9
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_OPENBLOCKS266.symbols.gz) = 6bf07ac6f2c54f9b46171b57492b6c4d
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.gz) = c4999c62d6e7c7c8351dba57c34ed0213d2d374e
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.gz) = 2acf7209a186bb3c52c54e49660c76629fdc8e80e73e1b77beb23e6b56c7acd1d985c958f152c8692303c41d3a4bdcb753ba00c232a772919ce106b1c439d697
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.gz) = 9a5d70bdff7b5208eb2f7f6bc2df3b72ce770588
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.gz) = 777ada452ccd51471ab700f4a6f9e652
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.img.gz) = 2a5de49c3e1b5a2f4455ea780f85d185b26845fb
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.img.gz) = f1f740403f47dc84dd3935611f4e1f71d860c202baeb8b53c23c4c4c6543f9b903cfd559465f7a5c3e1e59a8604f0194af556ebbc7000592cd532c7895b25287
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.img.gz) = e974201a8d50e1c9a77bc34a4df289e94a58e966
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.img.gz) = f710c52befd5c32ae49e90b7f74f8e77
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.symbols.gz) = 89c1b110f3a260ae41093f65323a11028f37826b
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.symbols.gz) = 30c988a3a2b647a1c93a95ab3bc7fcf0428f89dcce44152f81c2a58af49f5e6c95817650f5affca8a83ea0318d913a0ba20c28dfb6b7cb3027dce2c5561ece52
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.symbols.gz) = 4838d9d57fdcd79da40dbf3fdbbf09e77118ff2d
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-INSTALL_WALNUT.symbols.gz) = 5b9c0173413ff799fe5140db7ab9c13b
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8548CDS.gz) = fa0461c820b70c326f5f2867ff081cc88d357aa4
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8548CDS.gz) = 436d573a0b468d6794a9fc16955bca56a7b726c3e0e306f05e6965bcbd109ebf71fff060b8afcda9782043bd5389e961f1bb191d9b9dd209b385e64e448eb63f
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8548CDS.gz) = 01ccef4bca33dfd5dbc63d901d9b006a930858ed
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-MPC8548CDS.gz) = 9c552da04cd50465e8451c12ce98ac4c
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.gz) = d8431c30e8c1e34eb2b721d51f10e2429b542cf9
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.gz) = 1d111341a7439e63ec210bc09c168cd613b114222241cba494f19e6bf582a0085a8894e1a6a8842b7b1c6f8ee5f2c8b39238b9dd714727a053637cbb59a1f77e
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.gz) = 47a3f7ebc1980ce1817112520f13396d6efa2d44
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.gz) = 4875531aefe44295429c200a8dbbf3d6
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.img.gz) = e7e23c8fbe61ca6ef52822a4fb9336be7168abba
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.img.gz) = 6c78a517557651386736d048efb9953b4df3350b411291fae3029074ad0dd961f128ebcac4e6f14dd56e53d43465994972ca29572fbcdcd8793f713df74a3e5c
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.img.gz) = 04ea401821e981bff21fd61d8503608fde540bb8
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS200.img.gz) = 3e5f6b82afebe7b1ab5de3fca0bd75f0
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.gz) = 22aed20110feacb4634479f3080db81e3a511e30
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.gz) = e0934031d3b963fe5edbb5944b92a57c8f4ba4b496d8c5ab6aed555012a53f73bfcaba7eebcc1669bd6a308603360804242b7c37e92c022872c524c159c92f54
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.gz) = ad1b890f8ef6418a1ed2858dadafc7e99729b6bd
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.gz) = e935df1037b38d1a903359f63aca6df4
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.img.gz) = a3b023c3bf29f930fc5ff0e0c074e54e23141963
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.img.gz) = 3d1c0b86676c2bdd861f7e8e4e20d6a34d1a04079d908b6d2ef5404b1d00ec1f394a8b13fe5d4b4906c996d1912777e0f52ec367ad6e1c9db64cbd22931347c0
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.img.gz) = abdf86f9c182d23740543843d59e4dfcb05e59cb
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-OPENBLOCKS266.img.gz) = 84ce6f797d900ad639313c55e64178b2
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020DS.gz) = 8cc216c33fcb3f59904067c3e9294f0369d6f1e9
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020DS.gz) = 6bb4dd7dba52e6a6f4dcb76aa5218ab893deb64d57a87048ed5dbf882c13e92646ca89a037ebcba5211407363a9365d2bc9296397322dac95374e3f03bd88e51
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020DS.gz) = d8f03ff91019223b562ee52da049a4f71facf379
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020DS.gz) = 958385f31a4f6b1a234652faa95c6c95
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020RDB.gz) = 9140563a57548b77f93eee35e2615f4a377612d3
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020RDB.gz) = 1fbddd9a55f6669c1f2f48dd96b7147cae93a2d5642b262a81669fa4a2670d465cd09347a6f9b7751baa338935114bc2ba2e67622e2f524d9793628274f92625
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020RDB.gz) = 3ad3d010c5c0f34a69d7b49c7c1d639f7c5c3618
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-P2020RDB.gz) = 094787fd9d22021a1b63422895976203
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-PMPPC.gz) = 8f72cbe7df21613d6b796b579ced2911efbe66e3
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-PMPPC.gz) = f4f11445454376ec9f83f9e3072421a8ccb7bee9b1aaf01aee70a6c044e0de1156a5fbe28b1243e8efb334adeb70621e8eab875c44f590fd0276114a26d8db15
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-PMPPC.gz) = ff1f745891b1c4a02836982de15575afe78c16eb
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-PMPPC.gz) = 87d0847ec4707e24c58146eb0475d1aa
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-RB800.gz) = 139b9c2b87b112ab2d6498e726360504d0adedd1
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-RB800.gz) = 8ffc6ac565bf37ee69f8736d7c86738dd69ab7873b77ec062a12a442851559e4c94c903f76e649a21984efd4b98ccaa97333177be635807e6dec8a17bd421880
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-RB800.gz) = b6724d690aef60f63c4b1339eb6ce514e0886151
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-RB800.gz) = 2df5233415f6f20f2af441b4b54379b5
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.gz) = d5e489629cc8d1b2903e541b944a123cfc0937bb
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.gz) = 77d3eda4223f4cf9120a7e84e8c61917749462734c5adc70d95e3108a1b151e0ab7518092d37ddceead9e9047297ef47f4712de7eb0dc05f4190ab60e775d313
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.gz) = 15568ccc03d6a06ebdaf407b6d2b4ac07985a0f1
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.gz) = 11d3fcb67c3ec63c5c43ab5bfe06c0b1
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.img.gz) = f001160c675e3d0f73978743c88bf61561a7b10a
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.img.gz) = a85072ff3b1a1d8b9e35b40b1bb49f5065bad003f603add8330de38a71c19028ed54e377534e4e901281ad5eb65dcf73e8657a39bffac9645e6fee6bce7ac391
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.img.gz) = 31480f15986b52f445cefa8aa4e056b6fcb74f1b
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-WALNUT.img.gz) = a0719a86fd17f9ddfa5131e58f77622d
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-esata-P2020DS.gz) = 50b925468b1ace37856fbfbd4fe5363ed187b4e6
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-esata-P2020DS.gz) = f8cde43dbaf1744d7dec3437beb43be1b73178fb95038771a52315b5b54f4ae369c9261c35b710be563b0bc9be07e4801100e012c8313c564f3bf66845082c31
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-esata-P2020DS.gz) = cff81475ea7ebe293bbefc4088d5dcb76906108d
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-esata-P2020DS.gz) = d79a18ae8aa921fbd0df460cd5e550a3
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020DS.gz) = 1c75ca32cb0267f982916a5fb2740483e5aa9f7b
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020DS.gz) = 99d1b928ee2674f7dd22a10ea6c3cb7b24f5bdd4961a5315ad310e2189cf4508bde00d9b752cf3eb6843c3a461f748deeda4f395206a4973be55165f6f17c9ff
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020DS.gz) = 24d2b7dab4018de8de5feb65f23cda0e8b4c1502
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020DS.gz) = 6fc3a2ba5e17d4ecef5cb52b482761ff
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020RDB.gz) = 342dcb5cc506d3272737f3b2c0fd16b7221ef429
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020RDB.gz) = c74ccc79f91ac3780093676aa88cb544da9cd17abaee1c1d2692acef50c5f13c4ff1e6ea4c334c43242f20460ca6f08406c1514f4b84cb7206900192699b2e09
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020RDB.gz) = db206fd4eaec146d07e71794320de0e680bed506
+MD5 (NetBSD-6.0/evbppc/binary/kernel/netbsd-sd0a-P2020RDB.gz) = 6a7ec6e8e8a7a2f75e60073154234efa
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8536DS.gz) = 3c9abf574a3c5dd2c38ef5af3433ce2123a30192
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8536DS.gz) = e58dd95eadafef8b242ce0894ec809b1d73063f7142cb0d6ce42dd03f5a71032ef3d31ef09e19f9cd6594b5bf65806473f560e17f0d505f5491c3651d6f9e930
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8536DS.gz) = a419d3af2732cc85c1fe0ca06322e0996a7946cb
+MD5 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8536DS.gz) = c900656ec6ae14a67385ea265639a500
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8548CDS.gz) = 14a02ead1d8e5963e96ddd3a5b3b2625202d0011
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8548CDS.gz) = c51940733928beb1f9beb280ecc642dd867317be5d0ca36ed9e0e01b1c8b2a1d788658bdb822e4b7be358fca34fce4620a9e2afb10a265007824efb965dfeaf6
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8548CDS.gz) = fbf09f5e31f3b61a3cb4f1cde889a2c91635cfd3
+MD5 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-MPC8548CDS.gz) = a4094ff843bdcfcd143957a0fd15a01e
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020DS.gz) = d5125242574b57126e0a9ed0b2c9e18ba47ba7dd
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020DS.gz) = af9b230b2940352e71cba43854b29418e2d1c6a51cfbac7cfcc801a4c1ecbc0605d055fe673fae7f244a421058073f921f1cbc8ce55b3131017138396f2071ac
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020DS.gz) = 7e25cb6632e7d744f60572c578fe34ea1acecae8
+MD5 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020DS.gz) = 3659db43dbb405a80a675b7f2840c7df
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020RDB.gz) = 9a55d38b7e6f8c5b274ab45f20794feab61a6264
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020RDB.gz) = 15ee2dfc4c476a54f0483facb66aec9b2b743775df471353ca1e443522119af238bebf7a986413d6cfac237aec8242180499b23fa85b85017d20179561025ab8
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020RDB.gz) = dceb778c7ea33542379775b8481122d7e55f9e98
+MD5 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-P2020RDB.gz) = 39f5865216f1e2e37984109a0cf2c708
+SHA1 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-RB800.gz) = ea5d21d649ce2a6c3502b58446cbe747433dcf12
+SHA512 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-RB800.gz) = 8748659a4a7e79a6b4b00dcb90ed2cf8213c138d4df7f93e6e53bee63f0c8f6c9a837f9522c9dba0580226eaa756473640226d1f4edb688a5b04807cb588730c
+RMD160 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-RB800.gz) = 9fe62c16553ca3e5955d12ca7e59cd0336bba55d
+MD5 (NetBSD-6.0/evbppc/binary/kernel/nfsnetbsd-RB800.gz) = b4a5d575b02cf078c5c31542e5b4954f
+SHA1 (NetBSD-6.0/evbppc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbppc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbppc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbppc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbppc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbppc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbppc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbppc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbppc/binary/sets/xbase.tgz) = b7c8146146ebc15191c1bf53f51f8f980fe8c816
+SHA512 (NetBSD-6.0/evbppc/binary/sets/xbase.tgz) = 091f5d00414a9ad478811bfb0e953f2a204869bc5e310790886a59c11953974cf7068cd9a96c8823856ab2687ffa2ac31e97494f47338bfe31d80217382c59f1
+RMD160 (NetBSD-6.0/evbppc/binary/sets/xbase.tgz) = 4bd1bfdc7c1e1619de63fb83276c21039b945357
+MD5 (NetBSD-6.0/evbppc/binary/sets/xbase.tgz) = e621806afa0fcc9cdcef0f9b3c7dfcbd
+SHA1 (NetBSD-6.0/evbppc/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/evbppc/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/evbppc/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/evbppc/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/evbppc/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/evbppc/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/evbppc/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/evbppc/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/evbppc/binary/sets/xserver.tgz) = 05aac7e617e0cac05a88062fef29bb459da7a1d1
+SHA512 (NetBSD-6.0/evbppc/binary/sets/xserver.tgz) = 19fb5af5d6afd78839a22e5c0694a492047b5200c569cbf58c676ff32ec250b21edcfe2ed00b65092fdac374d1ab9eaaed6113c69bc03009cf458aedc6014913
+RMD160 (NetBSD-6.0/evbppc/binary/sets/xserver.tgz) = 774d2a1072b8d122790ad189a6d2ada2ad99e7cf
+MD5 (NetBSD-6.0/evbppc/binary/sets/xserver.tgz) = 3daf1477cadf3593e9ba45e3703fe8a5
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-EV64260.tgz) = f49583bb3bdb33b9eb3b0b4136668772da20f45b
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-EV64260.tgz) = ba5c1437d9a233dc818880e72de7746dced45081a2fe998ca922c51eaf404bce9f42f7f763a611485bb518e50c1e4da5a6906d0b28d01b9cd3c9f1be4d8c2761
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-EV64260.tgz) = f477b6948cae222002fa140de299929d9d9807c5
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-EV64260.tgz) = 168a599ee54d18f0eab734e5717b2984
+SHA1 (NetBSD-6.0/evbppc/binary/sets/base.tgz) = 660713e719fb1be5824c7b5f573730b9d1408922
+SHA512 (NetBSD-6.0/evbppc/binary/sets/base.tgz) = 366e7065fad6b8e8a7e593fa5790eaaba11a8ad49006730fc01fba2f1d7908a6ac1ebfc88a4cf7731b1d31b3e21dd5d0aa5c5433cd4f01ce95254735da15c772
+RMD160 (NetBSD-6.0/evbppc/binary/sets/base.tgz) = a460662933495846dc34b422fbf2f2f3b7141068
+MD5 (NetBSD-6.0/evbppc/binary/sets/base.tgz) = f527c4156acc659412d01a00756d57f3
+SHA1 (NetBSD-6.0/evbppc/binary/sets/comp.tgz) = c9caa7ece23746ea1423f1cb05924d7aafb69081
+SHA512 (NetBSD-6.0/evbppc/binary/sets/comp.tgz) = d60f9bbefcaa3331646da3e9bd2738cf11e357807ce64619cd48db62cd3c72469f39113b04883771c610c63f74e574941add1d83ee2cce2a7b13e85e844b9eaf
+RMD160 (NetBSD-6.0/evbppc/binary/sets/comp.tgz) = 2db97b320a8befeb352b84a44e32b3844648b85a
+MD5 (NetBSD-6.0/evbppc/binary/sets/comp.tgz) = ab787a55ed8b6765619f75f613914955
+SHA1 (NetBSD-6.0/evbppc/binary/sets/etc.tgz) = 01f15943e5ac9e3d4885c4391f332b3367a96483
+SHA512 (NetBSD-6.0/evbppc/binary/sets/etc.tgz) = 3d69692f01bf9b9dd36e719af4f2e99d7c9aac0b92925e2751b0ff8ff7651e37f948d18765fda1d1841fe8d97a7869674d584423594ad1ca48da8b4c35e0a3ec
+RMD160 (NetBSD-6.0/evbppc/binary/sets/etc.tgz) = 6422793912a3843dafb20baa3c9ecdc10305262a
+MD5 (NetBSD-6.0/evbppc/binary/sets/etc.tgz) = 789c56228f05a0cf67d1917ae04862f5
+SHA1 (NetBSD-6.0/evbppc/binary/sets/games.tgz) = e7bde1f51127db8c3a7d15ec931c915806661f0b
+SHA512 (NetBSD-6.0/evbppc/binary/sets/games.tgz) = f39fcc09a9b81a604a29c968dc74264a42c46ccc122c9ac01030e6ca01c28967fb7e20d8fa182f2ba07ade376a14a802c2abd06154c754f907a9879b7e7ab52e
+RMD160 (NetBSD-6.0/evbppc/binary/sets/games.tgz) = a09ee1c7811eaa0ed3aa1ca0f85e1279b096fc46
+MD5 (NetBSD-6.0/evbppc/binary/sets/games.tgz) = 81e8837aedbfcea8d6957f192e54545f
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS200.tgz) = 561ca3ad31c44deca4b197207d2a2e6a92ed4bd4
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS200.tgz) = b47b23e9b6c3efdc389ce3b47218eea8da190734075985e7ad009a10addcba48e565efabbc3b11c32e220d6059fe5114ae77351bc72549e8b8f37be98dcba27b
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS200.tgz) = b2058d6a4e4fe11ebb19f429347a6ed69a1b014a
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS200.tgz) = b2ea5966c8110677fd107fd4029242f1
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-EXPLORA451.tgz) = 7a6fe1de68c0fffedc5918ffabeb87ee71ad3da1
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-EXPLORA451.tgz) = 2e30f89fc77fd9bcd9310c4d12379245a18aed68b661c037593870c86ea806edb62f32a433f46e4f4c205c2eddfd86c353c3ca970a887a324b4d9eaf952b537d
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-EXPLORA451.tgz) = d68c12c132889e9cb48e003811e9c2de7fe41aa3
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-EXPLORA451.tgz) = b5ba93f49378f17fa86d91832a97d63b
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8536DS.tgz) = cb9e2b4befa9231d5c6bcf52460189d6ad18fe85
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8536DS.tgz) = 937bdfd98369d438c25a0839e50cac22602b3766db5f359d31825445c156fbe94de24956584b0668bf5c1b09565733c5dc4e9dec8fb5c034f5764edbf8241bff
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8536DS.tgz) = 63389f49fc87afc7227318374fa8fbb130c1f076
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8536DS.tgz) = b4ccb088690ba31893f554c22874c25c
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8548CDS.tgz) = f17cacf88747cab418fed98c8f2d4341d883c45c
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8548CDS.tgz) = 13adbfaa5c03713aba913d4bb08f6c8f654b3af210164d111d4c5825bd49ebc7ea8b0b4e5dabecfe685cc9ea9bbdbd0c41cbbe3e3a4bf9d497186c0cc15ed3b7
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8548CDS.tgz) = 5e2198d8b2c62f629a2e41ff422f50f0d90b2ca2
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-MPC8548CDS.tgz) = efdf3c8e143e54c672ba669c5b2211c7
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS266.tgz) = 3dff6cb4cc77e770b17e56dc132fbb3ecafa65f1
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS266.tgz) = 6309b5240c155074f7f0ad04684043e26886283d81369faa2c5d5ae202a82c5fad980c1101cb5f03fbf50e61b78fa87cf5ce633ab354b90ae0f267c4fc03dd92
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS266.tgz) = 22a0af77fbc2dc62e11aabc36b92701e12a23624
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-OPENBLOCKS266.tgz) = 776cb54622eca1a207cef956b8fe9a2f
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-P2020DS.tgz) = 6ce50d8dc26e08d660edc8daf9b4c35e2a03b005
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-P2020DS.tgz) = b04c1630a1bcf4ac4855e4242c5cd12b82c846b371b6257abb99ba4b28026c546ae914d68ed31ecfc02d952aef81bd8fa50879c698735d453bb0a8ed72131fd0
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-P2020DS.tgz) = 16938708031722094448b4a613dce8e2acbf8c63
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-P2020DS.tgz) = 94ba27899a9ee3756ec7084e362ca968
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-P2020RDB.tgz) = b0bbfe5b10d1596af93eec4960120ebb23d00411
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-P2020RDB.tgz) = 536a382b932643d9e4a65dca9f4601edce766799da3e291484e9460291ce4168b5cfc59a39bb1169e69065bb65d1ff8f56caa98651d643bad9f33ef35b219d0f
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-P2020RDB.tgz) = ea8619e5c65fa02151fb23136e03ee8889f68ab4
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-P2020RDB.tgz) = b14ef5c3eff1d4c89afb1e9d883aa3d4
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-PMPPC.tgz) = 56e8d8a4c533163eaf18a2b9cb988e0a61be8174
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-PMPPC.tgz) = 87f5c77334788e59662c95dd073e3fa8a680f840ccab27e839fb405cc942941d5c2459cfa4d93a02179ab27fc6e75f8d3c957c3c95e5e271a404f64ec08a0b19
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-PMPPC.tgz) = 7160a35f527dc620a2e67e17a22e8cbdffd8fdfe
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-PMPPC.tgz) = d0459860eae7ad936e2b318a2cbfd7ac
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-RB800.tgz) = 79b942c2076a9219525ec9da7b25da3a21488675
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-RB800.tgz) = 0c9462c4519ed0fc1b378a7abb23c3a89768d6fe128c726e2847c6daf576757492438d4cab244e32f1bd7601f1a3e808d79f874b3480e22abff4a45b9cc5a8fb
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-RB800.tgz) = 6c7309b72d5a61879c3151d2065cb70361ad5c70
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-RB800.tgz) = 9951a8e7708ca609ec9abfb3b313f03b
+SHA1 (NetBSD-6.0/evbppc/binary/sets/kern-WALNUT.tgz) = 0a60e6f9a6fbaa8477b05baae64d4b405c9c252d
+SHA512 (NetBSD-6.0/evbppc/binary/sets/kern-WALNUT.tgz) = cf5e16c71fbe6366c41503578254a5be9bacf01cab691f3667c6b3b5ec3413cfd30f3dd00152a7c0dea73effa0f46fde1070df5aa29db02c021bc60a83d2ebc9
+RMD160 (NetBSD-6.0/evbppc/binary/sets/kern-WALNUT.tgz) = 54ade37dbefe29a6de73720d7900ce68b7dff1f3
+MD5 (NetBSD-6.0/evbppc/binary/sets/kern-WALNUT.tgz) = 4f92053a06ab8e494ae5068657a449ee
+SHA1 (NetBSD-6.0/evbppc/binary/sets/modules.tgz) = 3297a716bfbfdb870519304912c1f0ba834ef318
+SHA512 (NetBSD-6.0/evbppc/binary/sets/modules.tgz) = 586c1502a8fcb99323ba75ca343fbb8204fb80a00de8b09aa6722bc4d7bb142dd35bf023f11ef981f5ede707dec673dc1040578677216cb0aab2e1d9d871263d
+RMD160 (NetBSD-6.0/evbppc/binary/sets/modules.tgz) = bb87c0bfbb41190443d888876e2f6329f8c5a0c6
+MD5 (NetBSD-6.0/evbppc/binary/sets/modules.tgz) = be483e96c1f3eb3a155b17fe7097d398
+SHA1 (NetBSD-6.0/evbppc/binary/sets/tests.tgz) = a9c5bab23ec89b45bc96550385064ca681c1aaf7
+SHA512 (NetBSD-6.0/evbppc/binary/sets/tests.tgz) = a629539a7f807f4cf5651329769924fbd42102b4e9f96b4aaef254d1237e0ff4b6a55a9a1968bd6aaecf5f4e4db667fe59b8e2afa8232b80af4372fc436eed18
+RMD160 (NetBSD-6.0/evbppc/binary/sets/tests.tgz) = 8f786bbb44342927ecaee51314d2492b228ca507
+MD5 (NetBSD-6.0/evbppc/binary/sets/tests.tgz) = 6d2a4b03364dadacd276c5e908c6053d
+SHA1 (NetBSD-6.0/evbppc/binary/sets/text.tgz) = 9b944538cc5e87133cecd712523216a783ba97d7
+SHA512 (NetBSD-6.0/evbppc/binary/sets/text.tgz) = 7d87e8bfe246ce56e93257beac1808fd00160911acc22b5abcfc4de9125182d982e69709ff8e7f5dabd2454024cbf2969d836cfec0bc8b314f09143654648e99
+RMD160 (NetBSD-6.0/evbppc/binary/sets/text.tgz) = cf2dc7ca65a246453309df0e94e804c5a04b0719
+MD5 (NetBSD-6.0/evbppc/binary/sets/text.tgz) = e8220cff6b33bd3cb4e91d50573b43ff
+SHA1 (NetBSD-6.0/evbppc/binary/sets/xetc.tgz) = b6aafacecaf76d99a4c3c428e33a23633419f52d
+SHA512 (NetBSD-6.0/evbppc/binary/sets/xetc.tgz) = 9257fc58e039f2afc1ae7f46a7ed2ecdd1a13e67a76960490e89efb8fb12b44100a465270469058071249e0864346ff4dca825786552a4a8ddc804cc7a90dd33
+RMD160 (NetBSD-6.0/evbppc/binary/sets/xetc.tgz) = 6c17517837ddebee9482883db92d1542a89835b4
+MD5 (NetBSD-6.0/evbppc/binary/sets/xetc.tgz) = 77d81348f7721a447c8548aac150659b
+SHA1 (NetBSD-6.0/evbppc/INSTALL.html) = d106438243f94987f5d126102e6324f6c1ad274c
+SHA512 (NetBSD-6.0/evbppc/INSTALL.html) = d83cf719d3601674fe54b1fff57a8916d342ca9924dd38eaf3f6be43a3d109b85213d4217a5ede1f54734644d1e062437a63f428063cc3bf66166c6131860cc8
+RMD160 (NetBSD-6.0/evbppc/INSTALL.html) = 991e52340a15583f9b28560cacf1d10a5e8a6617
+MD5 (NetBSD-6.0/evbppc/INSTALL.html) = ab505dcacfa6b669a830b026c43d929d
+SHA1 (NetBSD-6.0/evbppc/INSTALL.more) = 375545e5f7e921c1635e3538cfa3f615f58ba82a
+SHA512 (NetBSD-6.0/evbppc/INSTALL.more) = d2c28cbf4417afcfcb33f363f3c234403f60c3899cee910767c9dcb7c8f39ef2f1dcc84779e67c5ad386a162ba886c37dfc64d4c7e8a70a3b0fcba1286a5a059
+RMD160 (NetBSD-6.0/evbppc/INSTALL.more) = af295999442791298fff266b84d6ab1a92c3cbe1
+MD5 (NetBSD-6.0/evbppc/INSTALL.more) = b21374e21e9e0599b62595c1aca77cce
+SHA1 (NetBSD-6.0/evbppc/INSTALL.ps) = ec4c228a542dd84139f5eb00ff550be759020a10
+SHA512 (NetBSD-6.0/evbppc/INSTALL.ps) = f784251812449ee49a2a2f69b54e20aaad818e0c07c220553da4d1c34676f843c7f60472c750a3dbe952725aad68e5abdf5dc19bb4d3b90cb742d8fcacf1334a
+RMD160 (NetBSD-6.0/evbppc/INSTALL.ps) = 525b9a28bed1478b2c2ff4a94da78aaae125bcc7
+MD5 (NetBSD-6.0/evbppc/INSTALL.ps) = cfa9f4c9a173353430edc81cfe8a37af
+SHA1 (NetBSD-6.0/evbppc/INSTALL.txt) = fc26b26f28fb8eeeb5bb990fc72d9c3d57067350
+SHA512 (NetBSD-6.0/evbppc/INSTALL.txt) = 1bd1da4343b0ab19075682a1ea38e33c7a0e11aa2253bae18a19dfb82c99c2b21b7e74e28f0952cbe6c3499a00bf412e998309b52c0c6fffafc868fd5a370e43
+RMD160 (NetBSD-6.0/evbppc/INSTALL.txt) = 9d44c454ba9249c02ac948603f1305342bedf9a5
+MD5 (NetBSD-6.0/evbppc/INSTALL.txt) = 44b21d90e58f137302ac1c96f78914ef
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEX7750.gz) = 99907a8b29592f20a683481b351d6c3b629ae74d
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEX7750.gz) = d25c300a0bef7432042f22856f899b60993f739522f62d7c1450da81c6774d01769d54f83b1039ed7b97af8ea4cabd954f8017b77b35d0d1a09c47baa09f0cae
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEX7750.gz) = cca19d946d47159fc455f36067dbd3cfee7f0f5f
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEX7750.gz) = 2556834458fa65b30784812d6defbce0
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEXEVB.gz) = b4fcb725319fdf75cb8fbfe3cc385f0546536032
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEXEVB.gz) = 3ae3fa47d5e760564ba5309b5bcbd4ca32ec52bf80ede5764811779acf73c206643cdfa9b0020b300ee70d75af820aa28ba798663ea962b16af935df79c9e4df
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEXEVB.gz) = 697977f6961f8dc0b2204532edc875fc23dd309b
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-COMPUTEXEVB.gz) = a163b83287053245cd74d74a2c66a13b
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-CQREEKSH3.gz) = 3bc3953e940f68f2edadd93f79c8ef7c841c4000
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-CQREEKSH3.gz) = 532a1d96716c85a6b77ebcbeb19560f2e402cbf68a50feafa6452117b477285ca05a0c86dd073bf9c237b6156fa59b42c05fa5c4029739b4fdb277a0c5238e09
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-CQREEKSH3.gz) = dad35f588cb96a63d46bad58b6f4e565402ecc3e
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-CQREEKSH3.gz) = dfdbab13faaee507abaa31e6b1819e30
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-KZSH401.gz) = 6bc4eb9bc72f6ab2412a0f4db523f849955d12e6
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-KZSH401.gz) = 80208e8df1f7c9fdc60ba1558c6f7182d65d6f96f7d57afc3d41887908dfee3598db6e82e827d2a9f14106ec262c4428fcf1a2046dc847c7993cabd9e6e668e6
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-KZSH401.gz) = e16349b9d4c834165922b78175d291af77caa0d9
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/kernel/netbsd-KZSH401.gz) = f95e0f3c93cff1ad0ea5667fdaba435b
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/games.tgz) = 37e15b0950aaaf1af36427ae5dd5866c1879b6b3
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/games.tgz) = e674abb1b1966acbc581a8f8b3e37841f48656e66f3302077cbb2de443487912b99521336ec5dc096fa3c7769b2d7623e1d1720a079407ec1861d32159a72ebc
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/games.tgz) = 36070071e8315d2352be1b3e563ce7ef7625d184
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/games.tgz) = 0016145b46957b95dd158b4441dfb010
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xbase.tgz) = 564bce6dd7c37b5e941e41d50f363c133fdf8f97
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xbase.tgz) = 23b3306254c789331542e63974f9d7cdc54d99ba2cd67cf6a1c97f09afa4f6cf6aa8798e37b7c38f4a55afd1572154f291fa1bf2e2a1fc87165fd6bd7f89fb80
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xbase.tgz) = 476fbd8301bec0795a01552728ada44204d2dbe6
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xbase.tgz) = 9fbbbdb3acfa4ccd9f0b309ea0ed0700
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xcomp.tgz) = 526a278a13833073e6231e879abdec85400ca888
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xcomp.tgz) = d2081a7536e3d7fa27a363afd8f6eb5fc3de4606f11b4857be2f1df59934da9d3d16e0df3a6edf4cdf52c8f579e0e4c06f07de0959b5213c21be1a8fdc2ee134
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xcomp.tgz) = 4a767ff08e9bcf98f886849cabebd1300397256f
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xcomp.tgz) = a23a2d8be9298497b4b6d39fda330bf4
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xetc.tgz) = 93a5cfbbfdc641f91ab363d4b65d1158d71c0cfc
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xetc.tgz) = 85a67734801e81e129a37b73ae62211459fb16d4e52a945ef21a4bb908dd7d1d775233956086dd3d59af45bcea24fbd6f54a2a9175756d242b57e07d10767548
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xetc.tgz) = 6fb055d0e1b6264bf1ec396236d903218832377a
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xetc.tgz) = af954b56e624948145b91aa451d77392
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xfont.tgz) = 6139c05273b6feeecdfcd11cbe0da91256d12a11
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xfont.tgz) = bb849454ede88d39ca60d6c513c833c2b29ea548adedb9f76870839174a3daa838d38a6ad701c78bfc164e690c5ebda9c9d00d4c23ad816df9f1962313afdbf2
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xfont.tgz) = ea8f123f9f78b429b77ff15c924803da1da2068d
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xfont.tgz) = a87cb6769c37ae20dbf0dd70cef93d11
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xserver.tgz) = 6cd4fdb0ff00ef5d89b47e68e538c86e395b2054
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xserver.tgz) = e3b575cab95e297a05a26a03eeff0cf843d665ebdfd103846ad544bef1d04f93aa20ceab09b1dfaae8f59d89ebb1cbef400b7521bdb41f7542f23156540aa4c0
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xserver.tgz) = 7e52b98276b4d097f7babe918e6768ae9d7945db
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/xserver.tgz) = a505ab4ce0801aabe21fe6038b63809f
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-CQREEKSH3.tgz) = 126932a5bc72bd20874c71d76047894c6a7fedb4
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-CQREEKSH3.tgz) = 89727c156d25912c17f801e7cab55d487eff7abc0a9168f490f77313d38eed5a37bde3c0ffbad4db49cc70c335b1147df1408ded59c4b5aeec9a0557a47e7b8f
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-CQREEKSH3.tgz) = 427056f8e924c6346b86a52b73dc8f0e9a98e44b
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-CQREEKSH3.tgz) = 07b32973dbbb2d0a7bf8f397349c032e
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/base.tgz) = 3dc230ebfc3669475edb5f69a61191cf0310b438
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/base.tgz) = e60bf3c63a76db118e7646ddc582150558df14cfde8cb8a6fa74f06bdfcb1f920e6015091ef4763be13072da77e2243b69a8e2739cc8945ec388b8f7fdb2fe50
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/base.tgz) = 5b347ce9da19b214d2069c8dc029cd0448af298d
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/base.tgz) = 79849fe1cbe830a98d8bc0a7db8f4e62
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/comp.tgz) = 882b629fd6de1ec706834199fb45736bb599bbd9
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/comp.tgz) = 700640c27a7453cb2ca1b5c29a2e0558a9cce8f21e4c44e17659bff25c4727aa578f85d3bdbf6da6173c80cac33955ec1731288160b1870fbf92a5df0ed258c1
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/comp.tgz) = 0c3da5c9c5ad1e9d8835040b230e89192f8cc98f
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/comp.tgz) = ae57e406883549f546048ff2480c5707
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/etc.tgz) = 5ef345b014742f576164cd85dc6744b87a4da775
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/etc.tgz) = 998a737bb0964b9bb61798310ae4f979c9e8518f90c482817bcaff1251036e51bdefb39a6b9595f2e313c0df79d44b387c960878582d7721c551882f2a3aba14
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/etc.tgz) = 64d587adda384831dccfee1548c9c09ed5c36f44
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/etc.tgz) = 495f4d62d00649132f218565bddeb50b
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEX7750.tgz) = 364b983f7368d62a6f35a63945026cd8c19c3bf6
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEX7750.tgz) = 8341464294654062caf3c3cfdc1ece9bff1cb6642b9873cebc4520e4ff9a0ed27e5e0106a488ee323d41d77b0bed99d7ad450c35d9d2f805ab18b3e3a941ea71
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEX7750.tgz) = c84e2532d3efe0b47b0db0c7471f9f78b0fd6dde
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEX7750.tgz) = bf341bdb90b335be676be766b8949217
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEXEVB.tgz) = fd664ded3626416bfbabf99bc73dac4a2bac909e
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEXEVB.tgz) = 3adcebf6f3acda9c84666cc1ce39a75302776e0f640cc02024d1ae2a7fb4ef7df14bfbb32e808f4a30fb482fdf181670c87327c0d5ded1145ee0f6bda268e369
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEXEVB.tgz) = f21c49e3f0a4a5fe70070da938296750a222e0f4
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-COMPUTEXEVB.tgz) = 39ababb0c8156e51b2c9b3854286a72f
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-KZSH401.tgz) = 58b48cb56251a87dfc59abd0ae25e8cb0e0ec7bb
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-KZSH401.tgz) = 4c3c9efd94bf1b9080d7355143d40f2796841448a92bf25c6f8b49772dec595915c8d7aa091afffab8df6f2eec40685c5a008ea65abe3ab32f2da6a7000de523
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-KZSH401.tgz) = 5931d576a61a240dacf5dfdaaeab6ac8a435b17e
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/kern-KZSH401.tgz) = d4dfbdffb2514e61fbfb4d7d39962091
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/modules.tgz) = e5078cfd24cfc29249d14a6a6f84de8d27bf1153
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/modules.tgz) = bc00fa4158aa2606925bd8f71698e543a5628739dcaa953ae99c0218fb8d3d1b70c78134cc5554353c612ec7be6fb4efe2f57b28a91a54c87266a9f7450eb38d
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/modules.tgz) = d35c1aa762a049440ce3095ae19f14cece89102f
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/modules.tgz) = 09a7af7e7ec408df3bd4541aa159ee66
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/tests.tgz) = bc89ec5fa64ca7df4c9b4a748cdf2ea437bbbf11
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/tests.tgz) = 011d3773e6363fccfb41d424a51d455d5508cdfb8da226a3a08670c0f5f96a613f0fa5b9818b634d750ab728a8e1546b3c8823b37c91317eb1d0b1cbd85cb0e6
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/tests.tgz) = b5534365eea74dcca99a5d5568c41b3ce79109c2
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/tests.tgz) = 324430decd8312ba548bff34d8197b5a
+SHA1 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/text.tgz) = 8cbc530ce508c246c6bfca4abc898f139da4cb39
+SHA512 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/text.tgz) = 6cb69d7b7019a82cc1db4326cff681916eee736081c55e08d8a7ff163db75deb91ce2b6feed78fd5775224d3aa24d74d0ca594535447826c03f6613792c9871b
+RMD160 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/text.tgz) = 85f073b017e79c9f8069912fe27ac96b7ad84cc8
+MD5 (NetBSD-6.0/evbsh3-sh3eb/binary/sets/text.tgz) = 72ac1c599c8f41bbe40cad9c17afb550
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.bin.gz) = 156a43383fb461877ca595a24fe433c41bb53505
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.bin.gz) = 74da9a5e48ac2fcc998176c4a8ae90f6d82e4269b071af2922210d23075c5c8b9b41ee63e9a4a7eddf5edb98a7b1ff32d07ea78a3b1ca95f533bc69a108ecb4b
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.bin.gz) = bb94e484f2bfba2253bc36a6724491e54d94739c
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.bin.gz) = 02ffe820f66f7d380b2a35522ea3d438
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.gz) = 0056d5cf3c88e73792a091ea2aea6ccdfa8ae908
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.gz) = 678c13171474bc55453f9a69467b8d85365e6a61e371e212e6e03a75193170bbd033575a46450b11c31724e56eeae77991a225aca564f1e1ca27e625f0dca191
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.gz) = 5303158d3acafe0290bbbbff80db24fb2ca0ec28
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-AP_MS104_SH4.gz) = 30c622231e6b9daac8ed290bdeebd164
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.bin.gz) = 16ae6982b9df3f6eb4a035477fd951edb3d300af
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.bin.gz) = c1ca446d125f788e8a155d7069247c3d63daf8ac9c99da2ad9f3b7d56e11b4491444f0ff0fdb2f4ff3722834d9e811f38621d4aa22d2f15434beb2d7033a0355
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.bin.gz) = 032c5396f55b50ad489e595c91c08b680d045154
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.bin.gz) = 47885af19837e332b23aea912dd25c3c
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.gz) = fbe844ab7e33356c35da0a05e841a4e01e4adfa0
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.gz) = abd3144c85d886bf6ed4be0315fe8a6f027d7c31be94d4252fc005c243abe8ac92de6fbb6a5459c0ead867de119ec83caaf6a078c6a6544dfc8c0a98661ed11a
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.gz) = a2e21620fb48f5eac2314187bbafd65cfd80cbcc
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LAN.gz) = c3681279fd8bb4637c6552ba2be82ea6
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.bin.gz) = 3abb9efd6ce8a3dc1fe36eda3e3544d40b8fadaa
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.bin.gz) = 881ed27f7a5b433a6189fa71445db10f9525396c230b1c28a6bdaca291ac658ea15b479cb0bea31a9f1e97ce3d348ec10fbb590c46543a3beb0284b3b12cacfb
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.bin.gz) = fae500b91381408aa48f2cbbd2f10ff4f7f10744
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.bin.gz) = 5b3c31bbb5f5ef0a547728d1d38fe0ad
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.gz) = e108054983abed92e290fb262e94a13afa9d9863
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.gz) = d7c0232734a6cca9d6e077da1b287dc2dbea5c195efd838de60a90121f3625b56978327fd28630d04249faf4f780a54a9154fdab5bf52226a1e7744d417d9d91
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.gz) = c1f2c381a07c03b405656f033475ca9faede3ba2
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/kernel/netbsd-T_SH7706LSR.gz) = 8c1c70f2f1a89d30184699d3a72d690f
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/games.tgz) = 2040b4af557a62f2ade5fc9fcfe4cab3df88c7e2
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/games.tgz) = 8b5071337dc844042537c24c75660e61c9709cd10cbbeab059a84da6d482260b73365ff3870f85060c130a291b6f02be174d288127ca62ce4d291a6982192317
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/games.tgz) = 28acfa5a131d52df7c157e2edca1dd0f20e774dc
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/games.tgz) = d82c46dbc0021fd4694e464042936052
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xcomp.tgz) = 53aa1e2a910e8eed09dc07f8b724804f53fe5e2f
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xcomp.tgz) = 24645da85419528015cdaefd0c835741fa801392e795b363bdfc39558e75e7f384511c0668d12e2440114b7c543c7532aaec438048f08d35c54c9c7a748f20c0
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xcomp.tgz) = 60a461ffc1f1562274110d65c72a541ee131cd21
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xcomp.tgz) = f1d2650a8d7a4ecd60fda8e1aaf8c09b
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xetc.tgz) = 1636a6fe3e01f6d8a07a19cd204a6807c8caa4c7
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xetc.tgz) = 9cea4ba4af287dd57e591d4269f2f2582010250316f323746ac56b12cefcf2590b93fbb0197c665f61b1df41dcca62d17fb6ad80d4b1feb8ac8265e91e15074f
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xetc.tgz) = 5f68e3f96f7bb9ae07fccdb1d058e4b1307b4b29
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xetc.tgz) = da84d97230787283e215a4ee1c4053ad
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xfont.tgz) = 97439ccf6840b18b1e9885f5504a401bf1a93650
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xfont.tgz) = 3d15541f7d7ae2128f44355bf110415adfa4e5182829259d2c6f7a4217feff99e236d13c5bb7bbeb724ff1a09ac1f58f02bdd6eef528bc416ec3118db6fc7d45
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xfont.tgz) = cdc9fcdb5fd5032803d5bba18db58f3ea6d62c85
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xfont.tgz) = a8466a0477c6c443eafe99e9d1c61131
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/base.tgz) = 125d939841f4c0d2d66af02a7cafcb788e62f49e
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/base.tgz) = 768d8f497c4f735be3799406807852393df11f432b5cc9b1ec69ebe56953f1592a48794629c6cf556eb7bbfed2fd8c0c308b91ca9349256d28ce475a75c44ffb
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/base.tgz) = 94a40312cf09aa8867a6dedb8cdb8b3fbdc00f76
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/base.tgz) = 2f9a062d6116d6c89893fc2d0568521c
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/comp.tgz) = b1c32d11d282303c29854fa152b78be77361dfcb
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/comp.tgz) = 715ed5bd87827f3a84d78b28e855c28ea91944b02c1020551d1fa171239547c7b131f11149fae355ae75aae3059c1cbdbaefaa8a22e6daecf26dd045193bd424
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/comp.tgz) = 25c1503f1c807c8edb6521d85a26c45130b066e1
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/comp.tgz) = 5b355abbc1cd023a56a5d91b06b00883
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/etc.tgz) = 9e2708dd9d1dfabdb39ed6979adb744ab09c72af
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/etc.tgz) = c13a2812104b2f36cf94129d638cdffdd62bb86928eb1478306e205745ea5dc56038e40051da26a94cf56a25a6acd46c86cec2e4e04680715089dc8591d84e0c
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/etc.tgz) = 741003e38321059470fcb7bd727ee4c05add965c
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/etc.tgz) = 474217b3b8eb1c86fba55ed465eb0bff
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/modules.tgz) = a6704d748c69ac31bfc6277d625ba6ecce318deb
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/modules.tgz) = ccccacf090cf2a8dcef8df2c43b99f188d6a8898d30546d2f69341819e9feac6f2fd92e0f14086c45e9afcd462a6e4320ef3fc13bde002f3c697094d2d98144e
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/modules.tgz) = 68a529c0d25d89b79bc283b265fb5fd355328d2f
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/modules.tgz) = d7d56e99bb5ba43313e55abf65901ef0
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/tests.tgz) = 68b5f95807399dc8a592abdd911d015938152e1f
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/tests.tgz) = 2798d89e86057ced5d3e12c7771db2e94a96bd6c09fb49ec5803a56d0c484ea0614a1ea6a8a8647ec4427ee34fc191968e9a4025ca1257d072adcd536bc7c3f2
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/tests.tgz) = 6a3f335d038da0dcb81227f0b909399ddecdb0c3
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/tests.tgz) = 7de6b24e3df249a77cdc4c002259ef30
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-AP_MS104_SH4.tgz) = 74f70ee0502eab199c5d1a5855698772627c4ac7
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-AP_MS104_SH4.tgz) = 76656c9b809e842a7db95daa3a5210f845dbc1a6cc2c05dfcd2d31b4404178ab6c3f9dce8705c4c1f1841ee6d75121fec557ffe25660fa24b492e4ee3f4dde4d
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-AP_MS104_SH4.tgz) = d4e2fc853980b624a04b6a4f895a65ea99c3fa6f
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-AP_MS104_SH4.tgz) = cbf232a6d90bbb23a2ff524dc95d0765
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LAN.tgz) = bd3d26a06d12126b4bcfd594ec43b5b1b2b141ad
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LAN.tgz) = 7eaeccc298861c058298a99c1f77c4bdc201a4dd11704fa3033177412893e3934f4f6018ba26604c0da00d1544f610af3e606d40b647d25f4d758ebd3803e3f0
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LAN.tgz) = 802229436fd22dd4213b8ee964c06d0e264032cc
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LAN.tgz) = d0f7d8401f8a43421267722847806897
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LSR.tgz) = 07c0d72f0d893ce0812faf6c6a5c98d7b3b58035
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LSR.tgz) = 8c724d951a2492d879318720c6e768b86094ffbb935c6107ec0bc42fd225e45ec2ac301bd6bad4e2d8df1b59fdf10f0c68df542369ef57c2e2b4ab537b39efe4
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LSR.tgz) = ce3c2734ca7c81d61f7794add983ac3d40d6c0f1
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/kern-T_SH7706LSR.tgz) = 9efdd97f65905080d86975228272f5ad
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/text.tgz) = ec93765a5c45be2526dd74721c706cf2349cbcad
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/text.tgz) = ca1d8ae749a5cae5b06f568bd4d6cfb9b0af76848cac05b3d6bd6e1bbecbf84a76213064de51cd4ffff3062b5ee039fb7a99b8336474b39110d298dde616a51f
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/text.tgz) = 55c63f02b460a593dcca374f26d03b9595b6a20a
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/text.tgz) = a7d639318aac350f9f955f97035a8fd4
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xbase.tgz) = 4cb422608de78100a7b3bb2113f334951a6d8602
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xbase.tgz) = acbe1e8859d013a1756d97db9bb194d7ead04db13102f45437f1e3054308471ca2c2498cc0c60c4ac8f6431e58ccf7ad4bae62a9d8e2b9857689af4c0f637de2
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xbase.tgz) = 94f03b6f83e22818d2c98c726a4065680049385a
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xbase.tgz) = 7e4b59a51385b2d05aa15b0d98179e7c
+SHA1 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xserver.tgz) = 1423504dda963a794f5710462bd0e3b0ad2a23ba
+SHA512 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xserver.tgz) = 36e50002ccd00c6e945a3e9f49f3f210a3bdd5c493aad4932cb81d30ffcc22ab1d11403bfa04859153148bec4a1c57d6f8d2206dc8ee37dfb2ccb23914144c8c
+RMD160 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xserver.tgz) = 23d438695d917fcf7ece054eeea841fe02bf268c
+MD5 (NetBSD-6.0/evbsh3-sh3el/binary/sets/xserver.tgz) = b526fe22ecba0abf60efad839e21f4d7
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.symbols.gz) = 1a3978b4d00f62cb2ff6277dcdbf79fa3f9bf2eb
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.symbols.gz) = b504aaa9957cb2b08b5656c1c38e35697d38b3fb8f7fe2dcd2942bc0dcbf7d7fd6cfa1ebd79f536a8cb8e86eb1b69a3676afb3c01f9cdd50c2a61a8fa7f6fcb6
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.symbols.gz) = 48c1c3a15270f558fe3b30cbf745a790e51acff6
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.symbols.gz) = e2e15163e4bae081865da32d01514e6f
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.bin.gz) = 873515f4532952c89f5a9f6d91a3f7fa7f948490
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.bin.gz) = c19c7a649d4723f255d79005c6da3caa022857e7a7dfee1afdcaf7db9138d777eebec9a2715032e461ec10129403bbdbb25a5bde1eb84efc2a1e7dc044921149
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.bin.gz) = 18f832108e5af4f1db1314b3d619950f22660c32
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.bin.gz) = 5c15217d997a48ae98f97ef5bc1d9f37
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.gz) = 86b21fd531bdc7e87b16064ae739b5dcb3c92e81
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.gz) = 4e2413b98a091922a7b468169345e4c5090b87264b7232105b0684c2511c78d44a0b0b72f9a8c4ed37bdfb1f24826f87347f883074225fcdd715cadbbf6e8b2b
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.gz) = 882aff308401e9ef5a895233e0759a69840da2f7
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-AP_MS104_SH4_INSTALL.gz) = fa60323505d7a47e47b73dc44e394e47
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.symbols.gz) = 349e56359f7f6dec8f0ae526b3a789516a9e4f88
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.symbols.gz) = c1c075a4ac229add650e83aa77c6d7efe562793645fe7ca868234f53bd79a112f2198905255f0f03e8bdf7a2e44904146907aaf67da9e41652faa7014686ba08
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.symbols.gz) = 6c87f32161c4c2d529cb6a8026cc481dd1d42139
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.symbols.gz) = b64153e036a04f448159999e4f96b863
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.bin.gz) = 23b1af2b9b450007d33c9c68946d6650f8121077
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.bin.gz) = 51a3cb3daaba5d099524325af6a4f32ed164bff6118e88c1e4a5f33ff8a69df456833e5a041396179660af053bd0d1c6a43b5f72ad524be4e61ae9e833222c99
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.bin.gz) = e5bcd565add34239cf0c2083fad873dd12f4e13d
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.bin.gz) = 54fde28b5da7660812ff14933dabc902
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.gz) = 26f7c3703bac98f6350f5a2423f5d9df4a46bbb3
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.gz) = a0a4afa1c58fe9ae74fc03a3780ce16d10f6f00ed6db84e713e2fa51d3b6fb697e281f412eed74d30206edf624ed3bb585b7706252cee2ea37b85de9ed7fe2e4
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.gz) = 6e9be1eba2d6db27781fbcc035d794758b4dd444
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LAN_INSTALL.gz) = d2d661e75be21be7987c548ee785236a
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.bin.gz) = 9f3fabe29ffe68e56430d35f894893491a16c169
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.bin.gz) = 8ca978143e29fed1916beccb35493521ad70772cc7d4093dd2d2d0bee973e06275abd8167a072db9d79f28d2cba1394d7fd940baaf8d55c84622db60ecce735b
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.bin.gz) = 3ecea6d66ed1fc3adb83b5e68d7b5d03ee2ab8ca
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.bin.gz) = 853aef3ffec3749a8e387c0b8cf9c183
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.gz) = 5ea3158a1ddb01af1b0ad97d2788d1e70341faa6
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.gz) = 9d2e7c9da144cc79317b2e40f737b09f5320b90c920d7927db332ed3638c68b5cfbdda3f8dbefcb74330e98bcd9163d9003666b842ef74aada7b2b609de25b1a
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.gz) = 1f2d464e7b2c50a3c33b0a7d2076ff44627e476d
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.gz) = 79f028dbbb91d2c182523ef5d1a26b1e
+SHA1 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.symbols.gz) = e1393c12d538858fc67c3dbb850099d363802af8
+SHA512 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.symbols.gz) = 1a2d80f70a65e38f036a652bcad7774bbc11df1ef51d96868c988dadd25e07c96c2c19d29095b8cebadc6460b2ed5fd141254313d8e3c3f968098cfc136a1b95
+RMD160 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.symbols.gz) = 50d94667fa3c0d7f63e9a6e202967ca006f2f00d
+MD5 (NetBSD-6.0/evbsh3-sh3el/installation/instkernel/netbsd-T_SH7706LSR_INSTALL.symbols.gz) = bd8daee983f82ce040f96f6f929f273d
+SHA1 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.symbols.gz) = 25a30d5745b993e2102a3786fe1a6f39f470ce45
+SHA512 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.symbols.gz) = 2c6541b1f613443ffd5f7b331a19ec7e8426783232e3fa9241e621ed96ced5e030fcde14e27c1127e336d74f60e21908f2ff4240285df516a5315c37d5e39943
+RMD160 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.symbols.gz) = 5736b4fd760d469af93d177f831ea83e63fcee43
+MD5 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.symbols.gz) = f9ae07f7f20a790a2bba49ed48e9f50b
+SHA1 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-GENERIC.gz) = 4c6d1486cc99844354d97e2b1b2ebd6fe061ecc6
+SHA512 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-GENERIC.gz) = 6f5e544688a50385b3c519e4929508d663e646457c832cd715d0e05ef5f1ef38a40206c90e95356e17cdef5eede141f10371abab306b534087afca9b65536061
+RMD160 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-GENERIC.gz) = 81246f09144ee348e548fa9b7cee0d410ec98f38
+MD5 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-GENERIC.gz) = c861b19c9c0ac6c97350564aebddbe77
+SHA1 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.gz) = 95a9a9ba6a613ba5be0afdd1457f7243f01d7efd
+SHA512 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.gz) = 8a36cc3704bc474e9ca4542c8cedcf59dfb93b71a2a5ad44d4c605f059cc515742921eb6de4b64382735a09ae9a72c1fc14e08107480a5090f4319d196a304c3
+RMD160 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.gz) = 5577d47f6a4429aef2e64789a3ea604718275d7c
+MD5 (NetBSD-6.0/ews4800mips/binary/kernel/netbsd-RAMDISK.gz) = cc1a04eff2275ed68971e5799b9d8af9
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/kern-GENERIC.tgz) = 81a3b610f413d0a6be35c6de2b7047dc4dd1cbf3
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/kern-GENERIC.tgz) = c9716b08912af531dc5304baac333f34ddc0899bca52dc53185bc48d22217613c03533bed4d70faa01423f0a253d2d03ecc6e1c1704430b28eedaec74110cbab
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/kern-GENERIC.tgz) = 5cd01bbebf5245014d265995f6f96e699dd4bad8
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/kern-GENERIC.tgz) = 5a01f783440f099de1bd80cc3abeb52b
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/base.tgz) = 7b4b71623002896a52c0a7c9efe856a0c95de7b1
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/base.tgz) = 97361d892e6c9618569c1022f7b2c2e3485cdf3f1db8b3da1fadd8051a9241dd8baae01c89ffc4b2209651df13be64e8121fa34e1e9373b877add6a4c497e72e
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/base.tgz) = 93372c7049c0a931f1f408d764c3a25600944d7f
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/base.tgz) = 0ba9f6bb4c14ce56fb8b4c24d28c5b54
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/comp.tgz) = fb67d7d7410b3489167d90ac9eab8739d5981b69
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/comp.tgz) = 123e4214744b4b319f93de9443465a1185a755ad34053ef82ed74b5b859ab2ba08655528b98110f7b90973c2f6fe6cc4567d83117e215078819d5558e4795829
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/comp.tgz) = 2949a78034cb32eaf732d7127b21990ef697247e
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/comp.tgz) = 1eaf1d6e18c59de98043f4e477aef4d2
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/etc.tgz) = 9112e98e3b0e6214758b386e4d49dddff2c53fa8
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/etc.tgz) = f6e54b49bd6585c117474ca5a04c9efecebb63f9c074b5e81fc73bb8c4508d21695f8b6689aa518b0a156c1d0fc3653c5d7487e7f373c5eec679bd7d5b80bbc0
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/etc.tgz) = d797fc90bbdef32b5b9d024d4363acec2abbf787
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/etc.tgz) = eb8800ef4e55b63b58066f1f85001efc
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/games.tgz) = e4e2e655f93f3594f4db543839016077023fd1ab
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/games.tgz) = 377f737cae00cc7d9ccc2eae825e68d08a9f6d09474f39294406699ff7d9ca5a0a4347004759b6da9e3a4fb46f3e7ea14c90183bd0ee983cd3625bafb1712e23
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/games.tgz) = 96e4da250eec674b1f3a795026593364798b6a7f
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/games.tgz) = cefe2cbb2de8304de93b3fdb34c664ec
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/modules.tgz) = 5179ba1557042dd0edf4b0dcb43feeb51a51fd9c
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/modules.tgz) = c1f026f1e1ef0dfb74347a9f846971ec05d9c9cd27d9480b4dca4105d7f87c39678c8c76557a8bec407b985087c2371f47856cb81912ccf0e8e219d8f2b1ba4f
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/modules.tgz) = 8cacd504f4fce3b4547758a812d28fc41f1c29a4
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/modules.tgz) = 17f5259f27b6b9e35e05d38e32a47bc7
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/tests.tgz) = 05f79c3300425fa9c41fb0f6d4b67bbd22143c43
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/tests.tgz) = 5202c4bf6086643686bf4fef3927bedb17262acba8c62bfad92db632d6b545a9ffba8eafbb237f8076beba9da3f496f2da068031745bbad9c042d84b954d7bc2
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/tests.tgz) = 7dceaf484da2d9856cbea453914309af8f75faff
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/tests.tgz) = 379a301eaec46b70599b92ff3d69e568
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/text.tgz) = 591abf75de4e52fa3c188ff87fe5fbf28f541766
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/text.tgz) = 0fa9434b5447025c84b3fccbf175b25fe975e88fe711126a9b0625fa070bcfc05c6c962dc59a57ecec38e97e85455911bdc59c411cb6ea9ba2232256191fea4b
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/text.tgz) = 8ccae27fd5067d3e60148abc0751ed5cfb1fb10a
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/text.tgz) = 93c20890d37a4c4b7aacb3cdd534070c
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/xbase.tgz) = 5516e5fd661a6aa8886689fbeab06f0d6ef315bc
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/xbase.tgz) = 16f7b97341977b5b7d1629598d8cc250b0fd361f01b2b65afff93dcc97fcd81e3df2b20b42ef37902b64a20fa5a96c48407eac6f0faa8f6467bddfdfa6dcc975
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/xbase.tgz) = 55c47dd7eed35b436fb033ce22281a13d3c016fb
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/xbase.tgz) = 949eb603afb4e09b5c53facf3ffcba03
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/xcomp.tgz) = c20568ce72c1ab65b9b2b7d6063d4b330c67e0dd
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/xcomp.tgz) = 5ce8a9f1749abed8c536fabd262ca65297d851a26dd108bf917171ae38dc82dda3ecc4315b5d532e8a393778ed566394c3b7a0cd4d8140f4e9ad275371360504
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/xcomp.tgz) = 138ba52cf36085ea08c8f9022fce482e2b119b1e
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/xcomp.tgz) = 9267462e8d885667f784d3e444574bab
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/xetc.tgz) = 0b6040849347e71dc6694909b064c46858ef7267
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/xetc.tgz) = 94cf5fe5f971595d5e17d182aa5fd5cae717fb030336783ec18b34bc054da2b183c184e948b75dda13b1b31468bdadf228682c586e2c1687f4acca2c3545da04
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/xetc.tgz) = f90d3564bda34f368372300e7e0f1dbc716f0761
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/xetc.tgz) = 08fbdb1532ed26f606faba4a71052f15
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/xfont.tgz) = 1c83cc716a88a16e480948fb712c55617dac4840
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/xfont.tgz) = b1913d99dc60c680f2fc82aa8d2ff0970cc7c5a712ca412445334cc2b6136993b6fc58c27aecf12d24455bd8ed5e434e4b6e7067b87f8df73960c5b090f4e624
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/xfont.tgz) = a079720a15cdc7659a8efc5a3ef574814993f517
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/xfont.tgz) = 1ceec721c52139d9b94d42631fb45b5b
+SHA1 (NetBSD-6.0/ews4800mips/binary/sets/xserver.tgz) = 5acda874d4e98472f3bde4d22ee5c76f8e63753d
+SHA512 (NetBSD-6.0/ews4800mips/binary/sets/xserver.tgz) = 044bc28fb73dff4c2c50482adc2b69ec1b0b880b40ca25ea528be078b8f1d84e9e797b5238ea5ce0103aed54f5b32d0ff96ab67661156e28e9969aebe33a548b
+RMD160 (NetBSD-6.0/ews4800mips/binary/sets/xserver.tgz) = df7ea47ab25dbe8529abb8f5dc1d49cd996d6cdc
+MD5 (NetBSD-6.0/ews4800mips/binary/sets/xserver.tgz) = 20191a4f5c5a6cca80c760bfd8836183
+SHA1 (NetBSD-6.0/ews4800mips/installation/boot/boot-RAMDISK.gz) = c0d874d928968bc07c4378652d9df32f5ea0367b
+SHA512 (NetBSD-6.0/ews4800mips/installation/boot/boot-RAMDISK.gz) = 2cfedab16bbb540c131f2518ed74ee2692d96d8a11d008a11279d4c4b95cdf52fb76baf81823e49d3037f1f5230c1194a473f9e0fd37b36025a14988f6e49de3
+RMD160 (NetBSD-6.0/ews4800mips/installation/boot/boot-RAMDISK.gz) = ee3f845cb765fca243be9bb84f17162c7a865304
+MD5 (NetBSD-6.0/ews4800mips/installation/boot/boot-RAMDISK.gz) = 42ccd2d2f905ccadd7497ccd4ff91996
+SHA1 (NetBSD-6.0/ews4800mips/installation/boot/boot) = df1c0cdcdea86e38dface2a89e2fe26dc7df108f
+SHA512 (NetBSD-6.0/ews4800mips/installation/boot/boot) = 6007e2ed816488fc00fca543ab2541f5db95f7a6ad44d4dbde05f4a397fcbf667a41290f7fab5249d6a2f80870a6c04a6bf061d8a25c91b496cbb02d5699b29e
+RMD160 (NetBSD-6.0/ews4800mips/installation/boot/boot) = d321a217c04aafeb530f5d3eb29954eda9fb5838
+MD5 (NetBSD-6.0/ews4800mips/installation/boot/boot) = f39fbdcdde61cea48a1e10e426480550
+SHA1 (NetBSD-6.0/ews4800mips/installation/boot/boot.coff) = e0b297b3888ffdfd4077e67124efa2444194cdc7
+SHA512 (NetBSD-6.0/ews4800mips/installation/boot/boot.coff) = 2c465d178b1c8b4688249410c55b6224b06436dc0b42f09028bd1ce7352c2542749a9e3b685b92f670d3401d6b3b207dfbbf549e19ba38bfe3522f09e08f9429
+RMD160 (NetBSD-6.0/ews4800mips/installation/boot/boot.coff) = 7e7161d03b7f04a55c35dfd8c34a2a5debed56c7
+MD5 (NetBSD-6.0/ews4800mips/installation/boot/boot.coff) = 6bc92c0ddea36ee0816580d8cce6167d
+SHA1 (NetBSD-6.0/ews4800mips/installation/floppy/boot1.fs) = e706f91cc1733ab264473d3f1a887285ca79f013
+SHA512 (NetBSD-6.0/ews4800mips/installation/floppy/boot1.fs) = b946e58e4d1318d5be27e7bfc943b464309c02c63b936f3d11f57a519988d8847b172f30e2d61dad13bd672325dd2dc9ad502ddc5ed0dd49ca5583c1c51c1fed
+RMD160 (NetBSD-6.0/ews4800mips/installation/floppy/boot1.fs) = 16d59bb5fd830cf9551e4184bc338b7395bef5f7
+MD5 (NetBSD-6.0/ews4800mips/installation/floppy/boot1.fs) = 1a09cfb0f06ab364b4a5b55754474310
+SHA1 (NetBSD-6.0/ews4800mips/installation/floppy/boot2.fs) = 73d13ad2676d8db24c4c53e59be5cd53a70e7dee
+SHA512 (NetBSD-6.0/ews4800mips/installation/floppy/boot2.fs) = 4841e1aeb787ece67e3d172c2a614655746beab89f2b09a7566d36979b57d5793d0a308122182e1ca4e052257501f460d0e3d692ef701a1c869041b95e452c14
+RMD160 (NetBSD-6.0/ews4800mips/installation/floppy/boot2.fs) = 3fac30b411e6650a18a85afdca71695e7ecf2d4b
+MD5 (NetBSD-6.0/ews4800mips/installation/floppy/boot2.fs) = 4f501c25c15a582ed08e3e211c040506
+SHA1 (NetBSD-6.0/ews4800mips/installation/floppy/boot3.fs) = 32e2072f8bcef77633e24ec29215c45d2a448c5e
+SHA512 (NetBSD-6.0/ews4800mips/installation/floppy/boot3.fs) = 31f812f795fcecef8d5acf1511e0ccf8a498a51a199cef9384e4f197ecb28409fe9dfa7ccc66ea88fdcdfb7c11bbf2a908f3afda7aba16d4adbce172c48a291c
+RMD160 (NetBSD-6.0/ews4800mips/installation/floppy/boot3.fs) = baa412f7b18b72d89a2f7468b5d10bf76aa1a437
+MD5 (NetBSD-6.0/ews4800mips/installation/floppy/boot3.fs) = e0a8da5b5ed80730a3c4ff8ec316f22b
+SHA1 (NetBSD-6.0/ews4800mips/INSTALL.html) = a2b19549f5348d2f1d52980adce6b6dd1c5fa58c
+SHA512 (NetBSD-6.0/ews4800mips/INSTALL.html) = f70a62de3ff88606a2193b8bf01036b6770079bc8e5c7912c82e223d81671f8e2bc6dddbcd1022fce4352bccee3a1c19c90a2b1fa72bd12bf7edcf4dd42fb101
+RMD160 (NetBSD-6.0/ews4800mips/INSTALL.html) = 500263b32d3fd4f6459496b7e9d250d0d048c79c
+MD5 (NetBSD-6.0/ews4800mips/INSTALL.html) = a341d2e552eea54e2887ab795e752d24
+SHA1 (NetBSD-6.0/ews4800mips/INSTALL.more) = 112fc313673a7ec94f1c6a7ab3ba79d232e0b866
+SHA512 (NetBSD-6.0/ews4800mips/INSTALL.more) = 61df394591fc7b7554c82ced0edec2bd62e7a7e98e0203cc908c6fa48f961062a42148b856f2046f9a3d5262de7d7cc392c15e346b0bea8ec5ef2717760dc30f
+RMD160 (NetBSD-6.0/ews4800mips/INSTALL.more) = e92e60dd50dfc2ed354ed18f01cd412f62257367
+MD5 (NetBSD-6.0/ews4800mips/INSTALL.more) = f6ff574342525c12f5e039e524ab23cf
+SHA1 (NetBSD-6.0/ews4800mips/INSTALL.ps) = a5e622805b2d9d7f96b2aae0b819b7607335d8fc
+SHA512 (NetBSD-6.0/ews4800mips/INSTALL.ps) = c8cfeb73d5c4f033877795597dc9edd1dab7902a9753b09127bd9e1875d55ead42746d06b3b31b6ddecc19d876495201736b9ef6c242c357d0bca6d74aac9dc3
+RMD160 (NetBSD-6.0/ews4800mips/INSTALL.ps) = 07d50c1fde4cd58f0db754495c39509f69e1dbbe
+MD5 (NetBSD-6.0/ews4800mips/INSTALL.ps) = 831c1f71243c24726c508a45dfa97dbc
+SHA1 (NetBSD-6.0/ews4800mips/INSTALL.txt) = 6528e1b0d61bf2daab21a1ad8b36dfaf56ef8289
+SHA512 (NetBSD-6.0/ews4800mips/INSTALL.txt) = f2f1d34cc0d64c9764604de75197554e49095f305042d0d729da16a0a8edfa4792ce647d3321072af4c1980367270b7097275b32bcacf841409ba4eaa6e97edd
+RMD160 (NetBSD-6.0/ews4800mips/INSTALL.txt) = 5311f44e35a9074f47aec723c579e2c04e9928ea
+MD5 (NetBSD-6.0/ews4800mips/INSTALL.txt) = 1e6dfee2b6a42e87aa56dbf9f345174c
+SHA1 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.symbols.gz) = 3e4f61e16b7b76ffbda7ab2b2826ed6e47f55cac
+SHA512 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.symbols.gz) = 7c0389792e3d8722cd6187619978b413194ec8aebc17fab04ea75f37207c1c74bcf6f44a70beb5ca6712382b745d37d6e1ea3c87e1e93cf03c5891b583f5b513
+RMD160 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.symbols.gz) = 94f4e2e55d48069e13e05c43ee7688999a9d8488
+MD5 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.symbols.gz) = a1f4d88bc66a8924f563b00b4c194823
+SHA1 (NetBSD-6.0/hp300/binary/kernel/netbsd-GENERIC.gz) = 70a5a051fb4b94008c3598cf7432e40048ac15b5
+SHA512 (NetBSD-6.0/hp300/binary/kernel/netbsd-GENERIC.gz) = 342651536f367f4adcae4435afd623af0818e56362ba8f8c9376b49a0f2c57af2ca568edd32954744792904aa1fdf98392d398d75b5c8cc4f30ac456fdedb62d
+RMD160 (NetBSD-6.0/hp300/binary/kernel/netbsd-GENERIC.gz) = ce09eea6cbeaf12e2fcd4aabcdb2047e48c686ac
+MD5 (NetBSD-6.0/hp300/binary/kernel/netbsd-GENERIC.gz) = d1b8cd8ebde9c0bf97177f7cc8615bbf
+SHA1 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.gz) = 653c4beb8dc20a0c8d66e9cee85225fc221b5e8e
+SHA512 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.gz) = 62259ecdcaf08723230e0fcd0c9738fa3b4e42954e114146a7bfc11ab775adf2c36a7924fc9532ffeb5b50da52c9789162b56fd991511922a074f109edf22212
+RMD160 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.gz) = 634dcaef5fd936621863005e583978fff3f4638c
+MD5 (NetBSD-6.0/hp300/binary/kernel/netbsd-RAMDISK.gz) = b4cfe5ee1d9fcffa55595ceceb2cf7dd
+SHA1 (NetBSD-6.0/hp300/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/hp300/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/hp300/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/hp300/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/hp300/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/hp300/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/hp300/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/hp300/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/hp300/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/hp300/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/hp300/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/hp300/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/hp300/binary/sets/xbase.tgz) = ffc6dc889560371042dd12a5486a9a2c499b86a9
+SHA512 (NetBSD-6.0/hp300/binary/sets/xbase.tgz) = 9aa2ba4d703a13020acf8543d1efcde76b6f0f4b411be20f804709b3802e537be1e651eba469830c4fd4777a379ea9936200a3a3eb4b1a702c04bb81aafcc723
+RMD160 (NetBSD-6.0/hp300/binary/sets/xbase.tgz) = 3ecf53e7414ef859a47fe5afc108cf3bfa82fb1d
+MD5 (NetBSD-6.0/hp300/binary/sets/xbase.tgz) = a6af002ce158cf72eb5c6a7cde2c0989
+SHA1 (NetBSD-6.0/hp300/binary/sets/kern-GENERIC.tgz) = 7ab2f7be438f52926aee3c94e07951b7eb288775
+SHA512 (NetBSD-6.0/hp300/binary/sets/kern-GENERIC.tgz) = a4fdc0d2604b8f00790d8a3766bca90391cde8f0f564b7409738f151355f2bc1bc512a25629ee45ba7321a8791f983dda206124a7280ab082f7b255d50b57df2
+RMD160 (NetBSD-6.0/hp300/binary/sets/kern-GENERIC.tgz) = 85283b11855a8e69be87b21678328f4a675ca02e
+MD5 (NetBSD-6.0/hp300/binary/sets/kern-GENERIC.tgz) = 64374db1afce82099588ba9afc920440
+SHA1 (NetBSD-6.0/hp300/binary/sets/base.tgz) = 06b4b615865b0d72c01ca5676c7755af13eaec39
+SHA512 (NetBSD-6.0/hp300/binary/sets/base.tgz) = 326b28bb808cfc55a3f25766ba747483c7b1ec585b56ef8deaabbb62e3a6adbee3af61eeadf34ea1b6ff41a379e267bfea7516ee2bd80684e3228913c11f771f
+RMD160 (NetBSD-6.0/hp300/binary/sets/base.tgz) = e1bffbda1eb605d10b7eb6e607971d53ba6bf26a
+MD5 (NetBSD-6.0/hp300/binary/sets/base.tgz) = 23ecb1b54aa4c4f5d8a3217a1ef01ca0
+SHA1 (NetBSD-6.0/hp300/binary/sets/comp.tgz) = 3031c0b6b9903720a6b1fe865c366faf35e35af9
+SHA512 (NetBSD-6.0/hp300/binary/sets/comp.tgz) = 37ec2ee919d9d087dd0690cfce76d6be60abc618c3939ab32941ee6c0990c9d5de75f0035f56d2c501d0c5f6e016098bacd502eeaf0849c091dff2ec1ec52cb4
+RMD160 (NetBSD-6.0/hp300/binary/sets/comp.tgz) = 2b934c679fb8e8c0f79a2dcec65e9ffb1ee3477f
+MD5 (NetBSD-6.0/hp300/binary/sets/comp.tgz) = 5db470910b6991bd50d1003122e50bec
+SHA1 (NetBSD-6.0/hp300/binary/sets/etc.tgz) = 6f8edda4999c8a4343fc2bc279241b9550ea490c
+SHA512 (NetBSD-6.0/hp300/binary/sets/etc.tgz) = 562d88456cedf5e071d8fa1d93a8dce22f687ffdac77354129d67db4f701cae1af8108a27d9bbd3fae6035f29cea3438d08954e4e784e0a4a103bbc97362179d
+RMD160 (NetBSD-6.0/hp300/binary/sets/etc.tgz) = 924ef5e6623a78f068d2be3eb41d7acd6dc767d4
+MD5 (NetBSD-6.0/hp300/binary/sets/etc.tgz) = 21fd073754ac797a337928786b03c811
+SHA1 (NetBSD-6.0/hp300/binary/sets/modules.tgz) = 83594fc109e081cdb189cc607f9f0e2bdbd17149
+SHA512 (NetBSD-6.0/hp300/binary/sets/modules.tgz) = 0741d29e6d7a9ab7bdcd0f7d24cfdce277787bb4e4677035222b34a66570a245279b257b1adb1a0e174af3009ba8f54db7801238b754365efee73af0c1aedef7
+RMD160 (NetBSD-6.0/hp300/binary/sets/modules.tgz) = bdf66666ad75847756c3fc123fdcc44ce959e1af
+MD5 (NetBSD-6.0/hp300/binary/sets/modules.tgz) = 28892a09bb10b455457f5f581f57f2f0
+SHA1 (NetBSD-6.0/hp300/binary/sets/tests.tgz) = a5ef542440872976bdd13a62aefa0d14d61c26c0
+SHA512 (NetBSD-6.0/hp300/binary/sets/tests.tgz) = c3f7eec4bdf7dee4746ce7c6f234fb0fd98b97cf4d8eaf6b3ac2f90c3e9ca5cb8cdf35427310135ff7e90f81f584ac3e42c5e7ccfdf2de03c07bca5b5768e078
+RMD160 (NetBSD-6.0/hp300/binary/sets/tests.tgz) = 1088670cc9cf63a9232b07ead39467b939007ec5
+MD5 (NetBSD-6.0/hp300/binary/sets/tests.tgz) = afa98cf6d10be6bd60a4122ad26f69b6
+SHA1 (NetBSD-6.0/hp300/binary/sets/text.tgz) = 34cbcecdf88d3b20397c210adaef51a7aeebdbf1
+SHA512 (NetBSD-6.0/hp300/binary/sets/text.tgz) = 9718fde476237be7d04c9e3bc0fef0ac97fe275d6c98cc58f42e4266a7501b8a95e0edf8b46e1a33b4aef67222731978be2fe427d52993a0fc8ea30185411c5c
+RMD160 (NetBSD-6.0/hp300/binary/sets/text.tgz) = c96e584c3615a0f4e9eb12a8542b0fa8e60e1f1f
+MD5 (NetBSD-6.0/hp300/binary/sets/text.tgz) = 3dc6892231a62bff94ab46648015667f
+SHA1 (NetBSD-6.0/hp300/binary/sets/xcomp.tgz) = 55de1ba9512bb95b3678c1569840e740e6f5b556
+SHA512 (NetBSD-6.0/hp300/binary/sets/xcomp.tgz) = 83011012f7ce5cd11e58e12f068cfbb5ee4987d40aeae1026503899cdb9d5cf4d4edd6497b2ef0a3e75894d6bcf962fc3492572b51a505fae38ce9d12e4dc36b
+RMD160 (NetBSD-6.0/hp300/binary/sets/xcomp.tgz) = d696a85c3da7325eb570111f63f9d3517d47572f
+MD5 (NetBSD-6.0/hp300/binary/sets/xcomp.tgz) = 5729b37859a9265fbbfe184d66daaa9b
+SHA1 (NetBSD-6.0/hp300/binary/sets/xetc.tgz) = 64f0dab5e32092b4ea7dc9352efd06fd648f5f4b
+SHA512 (NetBSD-6.0/hp300/binary/sets/xetc.tgz) = 6fdac8545bf826d9a263cef4354914842986159aae07cd49ffbdda2cefeff6906f3f369141e0f54a213f4530b34160ac420c91c0fa9638354f244c1a625c8ffe
+RMD160 (NetBSD-6.0/hp300/binary/sets/xetc.tgz) = b1167b7794746ee9e9828f6b5d3a34efee1e0fe4
+MD5 (NetBSD-6.0/hp300/binary/sets/xetc.tgz) = fd2d95f88081017c690d585af9cb52fa
+SHA1 (NetBSD-6.0/hp300/binary/sets/xfont.tgz) = 7ff182435282d7ae2377257437bf5f2ead69bf6a
+SHA512 (NetBSD-6.0/hp300/binary/sets/xfont.tgz) = aec8b80b466469fd5ab3d851f46cdeccb90b708401d15bd97301001640888b1d6cb50d4b5df95e95516e74e2b644e9b940be085ecd174a7b165ec6557b15fd40
+RMD160 (NetBSD-6.0/hp300/binary/sets/xfont.tgz) = 1de0aef2c305fd7dd1ed69d5c14ada0f1b709bc7
+MD5 (NetBSD-6.0/hp300/binary/sets/xfont.tgz) = cc29580d8a56cca694e732c04ec99480
+SHA1 (NetBSD-6.0/hp300/binary/sets/xserver.tgz) = 2c9dda0fd8c1e7212d505f36e5c89ad2468efe52
+SHA512 (NetBSD-6.0/hp300/binary/sets/xserver.tgz) = 412e82089215b7a52c4fd12ad4df99d3c2a0ed39207e41b102163ae7a627fd765f6b3b93cf0d197d2122d50a2196f17ff1bcfbdcc99c44f03e4b4cc80ee95455
+RMD160 (NetBSD-6.0/hp300/binary/sets/xserver.tgz) = 133cec24a054a44d8137770ae19faeae2d454a43
+MD5 (NetBSD-6.0/hp300/binary/sets/xserver.tgz) = 5f4ca5d0340f3616df2a4514e9bee2e3
+SHA1 (NetBSD-6.0/hp300/installation/miniroot/miniroot.fs.gz) = 2bffdc8e8f2ad0c26c428349eb4e04adcaaaf0da
+SHA512 (NetBSD-6.0/hp300/installation/miniroot/miniroot.fs.gz) = 6a9135af4681c6b56877b2beff8a5e3e5bd2ae07283f1c78ad2b52d7c56db82779daf57c8c1939aba1dbab03be129372a2d1255f7c23692f548d684bcab2825f
+RMD160 (NetBSD-6.0/hp300/installation/miniroot/miniroot.fs.gz) = f81c0d294b7e481ea7f881e4ee89dfe9090e30bd
+MD5 (NetBSD-6.0/hp300/installation/miniroot/miniroot.fs.gz) = 6e487378f7e4b0cff281e3d2270e0a80
+SHA1 (NetBSD-6.0/hp300/installation/misc/HP-IB.geometry) = 1f0f75de1ee7d8e3181a5d6aa66773677755a884
+SHA512 (NetBSD-6.0/hp300/installation/misc/HP-IB.geometry) = 92d43dab00d4075e373ef3bb391cbfc404778b79b12da342eecc67a3c1a6cd1bcdf6da79ce48dc7262fe8b7d58f62317d4c2175ae67e3b7c69bdab6708509e50
+RMD160 (NetBSD-6.0/hp300/installation/misc/HP-IB.geometry) = c98d08dbec0a38097b07350201358ce795207abb
+MD5 (NetBSD-6.0/hp300/installation/misc/HP-IB.geometry) = 5d37ef7fbd5c7cf0fc9be6ca42e13766
+SHA1 (NetBSD-6.0/hp300/installation/misc/SYS_INST) = a49379b1d8420e60551f6255fef597495bfa6ed1
+SHA512 (NetBSD-6.0/hp300/installation/misc/SYS_INST) = 6c56496dbd3c76c120c9b4acec61a2e91bce64c9c640cc7d2d1aeb7865f57aff311b71526e82eae87b92d5938ce56264d427dfa02b434ce1859ff179e64cfb6f
+RMD160 (NetBSD-6.0/hp300/installation/misc/SYS_INST) = 827a7056af385da9b3d3adaea74d39e819dc0041
+MD5 (NetBSD-6.0/hp300/installation/misc/SYS_INST) = f396854e44d13f00a55e32217d907781
+SHA1 (NetBSD-6.0/hp300/installation/misc/SYS_UBOOT) = 2939db5d57267e58c09ce33be7a91e4842cd8152
+SHA512 (NetBSD-6.0/hp300/installation/misc/SYS_UBOOT) = d609c8e747839742255b0826d0024adb2c9fd6b454e4ab6af71f371c2e437fea20f74eaeec52446d1eeff113edb7a4335a435bd9493d4356f2c6fdabfff6a99b
+RMD160 (NetBSD-6.0/hp300/installation/misc/SYS_UBOOT) = 94935b4c88578641336c28fca15951e613869a4d
+MD5 (NetBSD-6.0/hp300/installation/misc/SYS_UBOOT) = ca853b39c14fb1cf61fb9a8291e86c0f
+SHA1 (NetBSD-6.0/hp300/INSTALL.html) = 8e1c3fbcbc18743ea7a5e551efdb53f84615c5f6
+SHA512 (NetBSD-6.0/hp300/INSTALL.html) = 03450311591c740dd9a59f7d59c82d347f216141a7d297b2aceec341ba73afaa39fe7a97c7d929e93e48db1a38d3e8e82fd5df6036ca1387a9fdcb67e5f1860e
+RMD160 (NetBSD-6.0/hp300/INSTALL.html) = 74b4c33c7bdf6739b4fab6d95811c4a6e705f441
+MD5 (NetBSD-6.0/hp300/INSTALL.html) = b432699922bc91b44886f23df7cf19f3
+SHA1 (NetBSD-6.0/hp300/INSTALL.more) = 1cf75d206beed7a64d40e96fbe895f74a70d1f16
+SHA512 (NetBSD-6.0/hp300/INSTALL.more) = d4ba1700ff39cce32ce327e810d4e87d40d942209a323beee44697e44e541acb0fe44e66d16277a0cda05cbebd0051e6c7573269868b1e7574e6645c678449ff
+RMD160 (NetBSD-6.0/hp300/INSTALL.more) = 89b542e3ef218607f3e65413c3965b7f2333187f
+MD5 (NetBSD-6.0/hp300/INSTALL.more) = 624bd59da093361cdaaab5c1de5cecba
+SHA1 (NetBSD-6.0/hp300/INSTALL.ps) = 382b1bee832f5d64618348011bbafa088821422f
+SHA512 (NetBSD-6.0/hp300/INSTALL.ps) = d986b290afd180501692aca87592c0c71f4a79a2ab774b4b5f28a2fec714547732964125e11ac047afdabbe5f2aec9c44c40d4abbe064716368d012c88a696e6
+RMD160 (NetBSD-6.0/hp300/INSTALL.ps) = 484e2cd1d11eccb452fe023cf442225f60381c75
+MD5 (NetBSD-6.0/hp300/INSTALL.ps) = 532f28fb7f53079a80b851a5ada9cdf5
+SHA1 (NetBSD-6.0/hp300/INSTALL.txt) = 5f6a19f1fcbe957565baf1fae076513a127af37c
+SHA512 (NetBSD-6.0/hp300/INSTALL.txt) = 39744f1a32fa5869dac98bdf458d4c43b55857ea7881f3f66e437c496840707fe2a587be8c38bf1d61593c7d3603d231df56f8110be97a65f6a551d4aa75c1f0
+RMD160 (NetBSD-6.0/hp300/INSTALL.txt) = 026e4872a0fc52ba4d08907a6907cc72a814c577
+MD5 (NetBSD-6.0/hp300/INSTALL.txt) = 025fee7db55908a9ba7a358d3598a074
+SHA1 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.symbols.gz) = 3b574a0a7fa12dccfe7ec7a74f3c6d44b3de73d8
+SHA512 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.symbols.gz) = 3de19c62127f98cc12b223d296bf8c69c262c7cc79e4eb4975eb313c96882f4df8d8bc0ff64a7c57b7e7d30896b49935c5475203a369a8f2e134622dcc29d3cd
+RMD160 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.symbols.gz) = 9c58c704e1a31f946467144840d8eeb207137fbb
+MD5 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.symbols.gz) = de4a876f7ef0c5aa9c566e4f976723c5
+SHA1 (NetBSD-6.0/hp700/binary/kernel/netbsd-GENERIC.gz) = b9b1dddb8855998b36022d03cc9c49ce5e6ed212
+SHA512 (NetBSD-6.0/hp700/binary/kernel/netbsd-GENERIC.gz) = 39bcd475712ece695379203c3ec20e2bada75f8b6b6c6f8f80a8826c65ff112a6e2cc8e8c18a5547fa4fa2e2bb7704d6f5b303b2c600f05cadd9dff1da997904
+RMD160 (NetBSD-6.0/hp700/binary/kernel/netbsd-GENERIC.gz) = 0b67d5990ab7491b64a591e99053470eadcb13a6
+MD5 (NetBSD-6.0/hp700/binary/kernel/netbsd-GENERIC.gz) = 2090d459fd5d513c070c401d72b3ca74
+SHA1 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.gz) = 38bb542016466c8e1a7c8535520729cc5b9726b8
+SHA512 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.gz) = 49d747023260ee1b61b59e0a14ff413c97b1daaf5cc20ae916b42d83b99f7438465afed77185c7ef0154ac762edfa93acc8733574fed66e68b58db11c34ce72f
+RMD160 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.gz) = 268e5e4322fb04246e0a1f8df5788e8530cb88c7
+MD5 (NetBSD-6.0/hp700/binary/kernel/netbsd-RAMDISK.gz) = 4175ca432943eb0d4cae87e5eafd3316
+SHA1 (NetBSD-6.0/hp700/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/hp700/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/hp700/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/hp700/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/hp700/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/hp700/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/hp700/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/hp700/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/hp700/binary/sets/kern-GENERIC.tgz) = a7b11dacf977418c4a57b400530c123c99447a66
+SHA512 (NetBSD-6.0/hp700/binary/sets/kern-GENERIC.tgz) = 071f2e512f843bd91f68e757682e5414600220833b8269be06956d29e61f0383a5f187bdf9a9414a8d64edc6ed9808c8df468fabca174f9079954991c6582300
+RMD160 (NetBSD-6.0/hp700/binary/sets/kern-GENERIC.tgz) = be81b5bc0509f3c9a10888b8f7fac2982871320a
+MD5 (NetBSD-6.0/hp700/binary/sets/kern-GENERIC.tgz) = 313aa8cbee11f72da2bb608cb35f7a29
+SHA1 (NetBSD-6.0/hp700/binary/sets/base.tgz) = 4cc8adc7171679140335cc44ecc8f4f338f47ba5
+SHA512 (NetBSD-6.0/hp700/binary/sets/base.tgz) = 48e68c7d28cbc15733f8677d7d139897350c389f7032e78e06d6cbb8b9debc09bde2aa52e7226ef58660da81c238e960e5794689a3f3e19f5eca40f532117542
+RMD160 (NetBSD-6.0/hp700/binary/sets/base.tgz) = 3582b7f0c2852854cccad70a2e8f372a7acf0369
+MD5 (NetBSD-6.0/hp700/binary/sets/base.tgz) = f8166ed58eec05489e3857d9e09469ad
+SHA1 (NetBSD-6.0/hp700/binary/sets/comp.tgz) = d9f4674db21772a521c5eb24e5fbe4ae2656c5d6
+SHA512 (NetBSD-6.0/hp700/binary/sets/comp.tgz) = caa488b17380cc2cc8f35ed9703bcac5c778fd597f8f607b26328c58b6b64dec7a784b22335a5c144f31fddf6d03a67d0f2c473ed7498e4f1ada17570f2893aa
+RMD160 (NetBSD-6.0/hp700/binary/sets/comp.tgz) = b625cf9eaa395a2844cea44b1904ce9358c862b8
+MD5 (NetBSD-6.0/hp700/binary/sets/comp.tgz) = 07a825a8852f558425856a06e5677bfd
+SHA1 (NetBSD-6.0/hp700/binary/sets/etc.tgz) = 0576313db33f67f3208c996a1819d19b5f0bd2e3
+SHA512 (NetBSD-6.0/hp700/binary/sets/etc.tgz) = 4d1eb5b04fd24f34112c49829b68ea0b7c841fc8b465e363ed4e79d58cd448ddcc6a493bae49cc9a4a4e9bb92314ddc032c5ed060f48b6de60e5045e981809af
+RMD160 (NetBSD-6.0/hp700/binary/sets/etc.tgz) = eedfb6a8724ef33f4bc3ef4e08c1ec6f868d548b
+MD5 (NetBSD-6.0/hp700/binary/sets/etc.tgz) = 8c95ad14875e9a87428ac7f6cf3a944e
+SHA1 (NetBSD-6.0/hp700/binary/sets/games.tgz) = 1be2d6b3d863032e376b31b2b4489a65acd09d94
+SHA512 (NetBSD-6.0/hp700/binary/sets/games.tgz) = 322569b0060cc67b16d15a79b8c813e548ea4908ec18fdb91472a4ac5b03bc8abcbba2e5bfed3ed400cbc84ecc82a5edf087f54c06bc682c276a15b516f4dacd
+RMD160 (NetBSD-6.0/hp700/binary/sets/games.tgz) = b4d4f8cbddbca828beadbd87ef4f20f1b23d7421
+MD5 (NetBSD-6.0/hp700/binary/sets/games.tgz) = 235dc6818c1a24a788301264c292ca2a
+SHA1 (NetBSD-6.0/hp700/binary/sets/modules.tgz) = 1b4ecd74bda33a325888994e03e67327a959a381
+SHA512 (NetBSD-6.0/hp700/binary/sets/modules.tgz) = 7f77163eb7973139a1e6a2c4aaf3147b94e5f1f977ee642c08b1ad912861d810d953c71ac9db5c5b74c9f9b691a48faeccb4192b099f6ba3cc7fb41093f55533
+RMD160 (NetBSD-6.0/hp700/binary/sets/modules.tgz) = e6f669845fcac20f9921602a26bfed3d83c0b453
+MD5 (NetBSD-6.0/hp700/binary/sets/modules.tgz) = d5fdd2b3f62edab0ea9e9652c2274b01
+SHA1 (NetBSD-6.0/hp700/binary/sets/tests.tgz) = 4a3701895f22ba6d97662a345fa9c14bda977335
+SHA512 (NetBSD-6.0/hp700/binary/sets/tests.tgz) = 9ec93c9ec1b2732690f2a3d07cce15569b5ff57a2cabe9489ad28e7b52ccbc0382795267abb6d30a7db9b38f3b7b6a0c6016ea175b1d91f24b50922e3098cc4a
+RMD160 (NetBSD-6.0/hp700/binary/sets/tests.tgz) = f62f1798af8d3df9d9653487c543be4411fb2037
+MD5 (NetBSD-6.0/hp700/binary/sets/tests.tgz) = 764d8df608cc1e9c23923eb7292f1962
+SHA1 (NetBSD-6.0/hp700/binary/sets/text.tgz) = 12fe20e8ab174d0f6bcd8ec6be600ed0e0cca782
+SHA512 (NetBSD-6.0/hp700/binary/sets/text.tgz) = b56b29228d79ba548c3ad908f9c81cf7e427bc72e607820438c6154e256f5bb4bd102aab7c31e86b241ecc42f824420aa7969e6ac418250c344eeffd1280abdc
+RMD160 (NetBSD-6.0/hp700/binary/sets/text.tgz) = 1e16f9ea1efaee41bc10b045105a1d0dc4f0d17c
+MD5 (NetBSD-6.0/hp700/binary/sets/text.tgz) = 09610caef8a531f7c490920d43a7c3d0
+SHA1 (NetBSD-6.0/hp700/binary/sets/xbase.tgz) = 0c5e93ea81c0f09063e5c30f42c9d652aa9b68cc
+SHA512 (NetBSD-6.0/hp700/binary/sets/xbase.tgz) = 03f48b4ef5dc3f869866f00214d7d5482f03d2d838ceb05e0003484d8835f05b484d998debf24d801721dbb155aa5632a9a1e6d3a830d6faddc552c4500ac3e7
+RMD160 (NetBSD-6.0/hp700/binary/sets/xbase.tgz) = 8661bbe49a27e86810bee528b84947926e0a2e65
+MD5 (NetBSD-6.0/hp700/binary/sets/xbase.tgz) = 21b4506d3d4f407c33d8c152ca8ef304
+SHA1 (NetBSD-6.0/hp700/binary/sets/xcomp.tgz) = a70481db9baba9f60cf23c52e72dac446888df2d
+SHA512 (NetBSD-6.0/hp700/binary/sets/xcomp.tgz) = 07c5ba6aa0ce0da2c5c2a3987c7c20226e4ee3158578a7ff70609bbfafc83becdd6a6185fd2c0b4a441f7d92c2cf5be3c767252c11f8fae07068f3ddeb48382e
+RMD160 (NetBSD-6.0/hp700/binary/sets/xcomp.tgz) = 2d0179f816fb0a90c931f0733cbfad6dfe3f4d17
+MD5 (NetBSD-6.0/hp700/binary/sets/xcomp.tgz) = 84ddb46d08c60fab91553d60f848e21d
+SHA1 (NetBSD-6.0/hp700/binary/sets/xetc.tgz) = 0ba461866c920a4fb82c50eede51ec242527a428
+SHA512 (NetBSD-6.0/hp700/binary/sets/xetc.tgz) = 1e84618c1e253df70f3801c93b1276ab63df818b231afb21a6c34089fd53cc95c9314a8ff14270d622a231c7fb963473e152f013e1cc2f338e7f231eabf524af
+RMD160 (NetBSD-6.0/hp700/binary/sets/xetc.tgz) = a98382606c9775e89131fc737d791b9c4c8334d6
+MD5 (NetBSD-6.0/hp700/binary/sets/xetc.tgz) = 626d88e448091f14845bf3a565d330ec
+SHA1 (NetBSD-6.0/hp700/binary/sets/xfont.tgz) = b70a4c27223f81cf49a62a85c3addc59b52f4b48
+SHA512 (NetBSD-6.0/hp700/binary/sets/xfont.tgz) = 82d94e80e98de78d71d5bae5af20b2755cadbaca48d548b2575fba4a52b2f35e09b71efb4fc8f0f1eadb5282e449807745feeb1d121275e9457eebe93722deb1
+RMD160 (NetBSD-6.0/hp700/binary/sets/xfont.tgz) = ec9a08a3c3e1563d8c4bd9a86d0e7fa38dcfa944
+MD5 (NetBSD-6.0/hp700/binary/sets/xfont.tgz) = 0bd2c8bc1760f957a2dec6126148ccb3
+SHA1 (NetBSD-6.0/hp700/binary/sets/xserver.tgz) = 892de89d8c46c05b44affea346312132bdc9d7b8
+SHA512 (NetBSD-6.0/hp700/binary/sets/xserver.tgz) = 18f1705c9e448b34e240f0f215fd618f62af2c1efa59fc9456a28df4fd477a6da26af82f7a99c359edd312abfedfc7b3058f651472a17d339f672db872ade390
+RMD160 (NetBSD-6.0/hp700/binary/sets/xserver.tgz) = dadd7b1915e43f92a618b65f739d91fc47cb17f4
+MD5 (NetBSD-6.0/hp700/binary/sets/xserver.tgz) = d0ce54a0227edeea0ed0572c32f7382e
+SHA1 (NetBSD-6.0/hp700/installation/netinstall.lif) = e4f530ba8005c2a02ab8cc5f6f2f9bc266ed7d27
+SHA512 (NetBSD-6.0/hp700/installation/netinstall.lif) = 9cb62f32608d400472276a255cc25c872406cd9a2113a787dd9735759a3d05a1de97c2b53daeeb35b4ab07e3e016aaea0bcc2da165c3c07633ac716900383354
+RMD160 (NetBSD-6.0/hp700/installation/netinstall.lif) = 00807d44c30717d4b524a94e209ae8881d9894b8
+MD5 (NetBSD-6.0/hp700/installation/netinstall.lif) = 070bcd9b95c8c1f02cb3e233bbfd997d
+SHA1 (NetBSD-6.0/hp700/installation/SYSNBSD) = 0458f52af240895100db4e2c15e685a9a8af00da
+SHA512 (NetBSD-6.0/hp700/installation/SYSNBSD) = 6acc8321830dbb38cbbbe88bba88c6f0bbdfcfe60380f11fbe92724b0defcb8dbf3ea9207e7522fb90b95a0a401114a751cdef01ddcd5d354cb7ec058c83f98a
+RMD160 (NetBSD-6.0/hp700/installation/SYSNBSD) = 2c9d5b050abe290f785eaf9fd1fb746ec0c2d310
+MD5 (NetBSD-6.0/hp700/installation/SYSNBSD) = d6cb9aa32688c2b571b6b62f7141d23d
+SHA1 (NetBSD-6.0/hp700/INSTALL.html) = caa84e344b51c67646142496becf7b3580bdd769
+SHA512 (NetBSD-6.0/hp700/INSTALL.html) = 87e4eaa6077a464832397ddf9eb59ca95949c655d9897fb630899274176ded45b22f4da21ebbfad688515b7cb63a7aca9e5fa8b003d4c81208c0c514ddaa9d3f
+RMD160 (NetBSD-6.0/hp700/INSTALL.html) = e46593839ae31aa17259f36ae4f71ee9cf56d317
+MD5 (NetBSD-6.0/hp700/INSTALL.html) = 5b63b1d8b0e76a1626ced50e760b6a24
+SHA1 (NetBSD-6.0/hp700/INSTALL.more) = bec1e3da9f724159b4a5b52e7bde3948e92573a4
+SHA512 (NetBSD-6.0/hp700/INSTALL.more) = 14a618c17e946dfc8c537f48b3f8c225ccf0484acdd1311555c7273a720a867f57b0f72786bf1c5ce874c0a8dc122d6452e476f6b3b5cfd2fdcf3e7b90c20b0a
+RMD160 (NetBSD-6.0/hp700/INSTALL.more) = 3cf2ba4b0c27b4e83b2275ffe8b0736c536b40b0
+MD5 (NetBSD-6.0/hp700/INSTALL.more) = 211474596cbc940278e9edfbf8ab7d23
+SHA1 (NetBSD-6.0/hp700/INSTALL.ps) = 31767f9d14e0018f59f4bf89233f3a546d53234b
+SHA512 (NetBSD-6.0/hp700/INSTALL.ps) = 7f1ef8344a35e0aacf8246212f9ef07fe7727048de0a7b24030fdf7698e736152623e6d5d02c32bffbceb3c0337aeac719c523711f838118f0d31316d46c6fb1
+RMD160 (NetBSD-6.0/hp700/INSTALL.ps) = bca575e3df8abf0c7f8ff70e614fe52a9c39f645
+MD5 (NetBSD-6.0/hp700/INSTALL.ps) = 644eaeb94d45f3183b9cae5f0b39d974
+SHA1 (NetBSD-6.0/hp700/INSTALL.txt) = 546cea2f82e5c548de6f6978f569d3dcf65476ce
+SHA512 (NetBSD-6.0/hp700/INSTALL.txt) = 4d0d5e6363680e11da17d445fe7156b709e11d28f3226d1374e3612e68ba9c445bd2ec01e4422b523ea2d4197fc8a8b465da0c75401b9560ced43f217931b558
+RMD160 (NetBSD-6.0/hp700/INSTALL.txt) = b7536cf8d4f664d03d213978619724a94a16b1d5
+MD5 (NetBSD-6.0/hp700/INSTALL.txt) = 241f27fd87ec0932db94a067465d30b0
+SHA1 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-JORNADA720.gz) = 7a39f220d6af810e25b4799685aab25a226b9b91
+SHA512 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-JORNADA720.gz) = 4b2d4125cf737229264e73bd830c4def0ee33dba71cc5f68abf3e8e936dc89fb02f48a0d821754d2427fe1f72595dd266cd9cfc369c778f50f48573fb2c0bbe1
+RMD160 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-JORNADA720.gz) = 129136e4544bb8fcee75e1addd1fee16c522e416
+MD5 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-JORNADA720.gz) = 6ed126d914383f7ca0c3269960e885db
+SHA1 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-IPAQ.gz) = 7750f05c52fc8460f3ad8b271ae2d9e723c24ebe
+SHA512 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-IPAQ.gz) = 485f621f65f80fa02b8fbc08a876aa135d3e4c541ccc6d13ebb3bf119b0628dc5a540ba168a6e908b84422450829dd5a98915a145d629e893930ed40d9e3dfde
+RMD160 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-IPAQ.gz) = ee2d243a0fd633e6dac497b28b420b4a8157879f
+MD5 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-IPAQ.gz) = 563942f00d685c8618fb5bfa2a6a893b
+SHA1 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-WZERO3.gz) = e6f2cede1c69a3f41582f1a8f2a5187948512248
+SHA512 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-WZERO3.gz) = 8cc9f93b55a9a64341b266f7d3b8c6d1051f84a36f8aa398b24404d8aa57a16e883b1e7215b7cd235764b4507e04259525333f28369aa95efa39713e17bef07b
+RMD160 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-WZERO3.gz) = 536bc6153a0c83339c95e38b87a87bc98e738cb5
+MD5 (NetBSD-6.0/hpcarm/binary/kernel/netbsd-WZERO3.gz) = c4092d8e84f02fa75ea88436d404f1b1
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/hpcarm/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/hpcarm/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/hpcarm/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/kern-IPAQ.tgz) = c2bc2e5d8606cbd122fc825031025e2946f06e40
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/kern-IPAQ.tgz) = 52e8c28012dca6e4cc1bab2cce4443a6600a9cd42b3e1e027e715792e794f34baab32300da9ad58fbc23ecb2a22e7787a1d181577317a0dc6fd457ba66f11fc6
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/kern-IPAQ.tgz) = 7be149eb7b493fd76dfe0dfc533315458fb0bfea
+MD5 (NetBSD-6.0/hpcarm/binary/sets/kern-IPAQ.tgz) = 0d6a168f2d92d06962b581d06f807d46
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/base.tgz) = 080c8331106fce332cc5092a8332c2ad603e2596
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/base.tgz) = e22024be4e644ae872d6cf538a1210f8ec2aefeadfb47f6497e3892de2b617109a082650e1c1b16006cb84312c1550d3e98610ca63a36a083a073c55a08a3ab2
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/base.tgz) = dc0f2bef3b562a81901faf28d738e34168c3b812
+MD5 (NetBSD-6.0/hpcarm/binary/sets/base.tgz) = 0e05338048fb790920168e820e0f5771
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/comp.tgz) = 8ae72e40483c13b3ea15aebb3efbcb5cedcf921e
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/comp.tgz) = 3ee22dfba60196fe19897537c3139dff0b50d1aa6f6c27a024dcdbdc810a9dccd2c32480f73c0ffb0e4dcc4261e03ca6c565a875e291c963011467bc119f292c
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/comp.tgz) = 8bbf9baef503fd64c7676821abad991027f42ccf
+MD5 (NetBSD-6.0/hpcarm/binary/sets/comp.tgz) = 84a5d47bbb69b46673a2b2a53ffe3854
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/etc.tgz) = cbd3aeb7eee9da4d67693adee922e65835ad8908
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/etc.tgz) = 96f02aae1ff4fe6096261449dabe1c749ddf179e809b936393bd3b1aea3d708b878ea9c6fcededf0820216bc3f5a4862da04cd9ad5cd4991094bfc309421dc4f
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/etc.tgz) = b3f5dbf2f1a092a0fed4f7ff661635387bdfb7cc
+MD5 (NetBSD-6.0/hpcarm/binary/sets/etc.tgz) = 940a5d84fd6546eb8ef1fc0fc2af9f12
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/kern-JORNADA720.tgz) = fbe60c24963e700dbcded7ed9d6a006fce937c4d
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/kern-JORNADA720.tgz) = 0ff4a883f983d768355dab3a124bb1ccc3418d7a61bd8dbfc571089b934153eda2b9bcedf4d655e61c680c60b50772a40322804f86accb96acbd11dbd0159aab
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/kern-JORNADA720.tgz) = 010eea6fd1f9645480ed8d96e67a7a87766e6097
+MD5 (NetBSD-6.0/hpcarm/binary/sets/kern-JORNADA720.tgz) = 8a1eb406cc9cb944a0dc11ade6d139d9
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/kern-WZERO3.tgz) = 5a30317da0f7f2c6f1998a8c53350da39a390bff
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/kern-WZERO3.tgz) = 6908dea8428f52a08f481105b602fd2b93318207b5142ccec5104a897a9ad5b10ec25db1a5849074c179e064c7c418cebccbc529609873b031dde5ef1659ec6e
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/kern-WZERO3.tgz) = db2ec740804a2c22b4d9d5f05f7b20748206fcca
+MD5 (NetBSD-6.0/hpcarm/binary/sets/kern-WZERO3.tgz) = b745687a92452be38b0d2cdb625175e8
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/modules.tgz) = cd6c4ccc2c87d573cdb5a92a8806292c5063bd28
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/modules.tgz) = 66efd8e33cb118fcb7e6094a55dce87db0b38f03398688e19eaa29a88a61075ca4456cfbcf262e4ad372d1a85d31f1a230e79a09a60d9d0315ee2691f836f408
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/modules.tgz) = 1a4f4a21d35c183594080c4c2c6aeb63d0f07ec0
+MD5 (NetBSD-6.0/hpcarm/binary/sets/modules.tgz) = 0d07dc5c45004e2442e6da94a40e2082
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/tests.tgz) = d77efdefa2b3df022767062ce3e5b37ee33aca9f
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/tests.tgz) = b2827bef6684fe45b1ca7dc690a30787a0033b46013281c0d12dc182939a32287579ea0ed6dfdda5ac357cb69a1bfccffcce2cbc991a3b47f0cf714df45f511c
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/tests.tgz) = c51c78a413d9b8d240db9965edd6732158319bec
+MD5 (NetBSD-6.0/hpcarm/binary/sets/tests.tgz) = a157cb333c867f1efce0c0009db0c596
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/text.tgz) = 5e276b4e097bd1ab37a48ba8ac4591d784311152
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/text.tgz) = f7d62b4ac928028f37cc0ad711a12e4f5d4a2b77d2e108ce8716194052e6796bf5fb54ce77fa148aa257165f3d71f2e30d562d3dc809052020b85daaa5ba9fcb
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/text.tgz) = 806a5e59b90062c827a23ca33be22cda14a2e0c6
+MD5 (NetBSD-6.0/hpcarm/binary/sets/text.tgz) = e4ed04614c1a767e663fc73d647f5b7a
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/xbase.tgz) = 56daf552141d6161e0b08d5918e351f9cf5f783b
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/xbase.tgz) = ccc570735b9636dad693a87964efa1c6d5b14a15e8e9ea28b0ebbcf97db04a671a771d6163a62f78d9979357f7fb0d5543591ac584781cfb47778228a268d723
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/xbase.tgz) = 134800ce03d324aa4090e1ce235cc5a6e5ba9f2b
+MD5 (NetBSD-6.0/hpcarm/binary/sets/xbase.tgz) = e3afaa495833b5492470b03d432bc773
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/xcomp.tgz) = 380508f5e8d94d66e301a6f8fddbddddaf2eb15d
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/xcomp.tgz) = 4860c2274b0d4d3b1188d915c90b7e183672527e6734023c78694df3f507d2e920e5af9374353f7581c8f0e22462e8af30aff7e989146de61c0c7b9de7cff93c
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/xcomp.tgz) = 2f0f86a40b6887699ea5949b994007a9bb6ad876
+MD5 (NetBSD-6.0/hpcarm/binary/sets/xcomp.tgz) = 8f917121a2bbc2df46c6ab3db5f7c276
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/xetc.tgz) = 4109069bd859ebc949dede730589472e53e9e73a
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/xetc.tgz) = 260ee8565cb3b0fc496ff20856cc718585d36d380a85a5793c0e6502e57b683e132a3904ddb5990ce670ad9069eb999c2a41e427d5bb4ce96dd7f526427dfecf
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/xetc.tgz) = 24731afa16c748e4129111adbc446931859ac8b5
+MD5 (NetBSD-6.0/hpcarm/binary/sets/xetc.tgz) = c5aa4d6e7bda3c04ff21c49fa7a88349
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/xfont.tgz) = 93475dc493faa6b2df35bede901aa170b6f9e9af
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/xfont.tgz) = 182e2f9f19c09b4a10c5591d2d9a85a151263ed9773ecc581fd4ab155f5342b364b2fd15c3ce7e82ba9b760ef567f0ccaa8fd51fa4ad3e70dbc63a429ec544b4
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/xfont.tgz) = ea5190cce3fb48693746b233b2173595263d0b64
+MD5 (NetBSD-6.0/hpcarm/binary/sets/xfont.tgz) = e866b30099f57e267e8be054446c259b
+SHA1 (NetBSD-6.0/hpcarm/binary/sets/xserver.tgz) = 33ea7cf47464441ccaa2779544df524406479446
+SHA512 (NetBSD-6.0/hpcarm/binary/sets/xserver.tgz) = 718cb878630d6a3d8e2a4c8c0ca427e36f6772017810df557ff9bb0a688445af10f4087662e91631ec07a0a83e3007fa016c485950b3753c50bfdd3cc219ccd1
+RMD160 (NetBSD-6.0/hpcarm/binary/sets/xserver.tgz) = 09ce10d8e2254deac07ece3f8625d6c3bf2c4513
+MD5 (NetBSD-6.0/hpcarm/binary/sets/xserver.tgz) = a36d535d398b0d6e6e66da91d03ddb6a
+SHA1 (NetBSD-6.0/hpcarm/installation/miniroot/miniroot.fs.gz) = add38fbef1c9a42872427fc3ae856cc490dba491
+SHA512 (NetBSD-6.0/hpcarm/installation/miniroot/miniroot.fs.gz) = 1ac653efe632dd53dc6bf8f1abda479a4bdecf57b4aadce9b289381a8608601e7444404bac4b4187ea5eb87a8e56affafb06b30c5f27264797b8811b4b4a61ce
+RMD160 (NetBSD-6.0/hpcarm/installation/miniroot/miniroot.fs.gz) = d36e893b023bc07b2ae23e65891cd8edd74ae60c
+MD5 (NetBSD-6.0/hpcarm/installation/miniroot/miniroot.fs.gz) = d790021f968d07d34a34acb3fdc18a3c
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.gz) = 640e6d70fa752f3f1e6b415d79bfa26eb524d49f
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.gz) = 0266c16c91cd0edf3fad56c8806d8736edcb70138486a8596afd2ad58a89846ed319973d4383c6dc240e894a23658effd390012c6bb55d768a3980c5cb9bfa34
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.gz) = 8b57f335f3ce186509ff88c07bc85c27716b542d
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.gz) = 4963aae14a8da8a218ec0f43110e4329
+SHA1 (NetBSD-6.0/hpcarm/installation/hpcboot.exe) = f62f1b2bbf14dd5ee1159d987365122bbfa061d4
+SHA512 (NetBSD-6.0/hpcarm/installation/hpcboot.exe) = b1ad5471eec903659a2fe6ff79e631ea40d940e447126a6d8d6b46166dadd7cbbbea4285927968134d2ff493fe66a698d97374febf991ee9ecd4d295f06c92b8
+RMD160 (NetBSD-6.0/hpcarm/installation/hpcboot.exe) = fefa32b139995cd0b71c59d09cfb225fce08dbc8
+MD5 (NetBSD-6.0/hpcarm/installation/hpcboot.exe) = e8da90c935c719d600bed4f07046950f
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.symbols.gz) = 04eac0a968c96a038388c18816b735fd0fda5c2e
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.symbols.gz) = 61357b623b75c75df8f2c5318c82f3300183de81003900fb10a1caa566cd9cbc90563277a5d0738b0a7ed52934cfb40d08b4c7af428b06bca90dd907b89673ad
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.symbols.gz) = 43b52d529a62cbfeacdae60b54d9e0fece7a1ab0
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.symbols.gz) = acfc91c707d81e9c84b3fb7f6626f9e5
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.symbols.gz) = 48c1a0db5c6a2e7d69b1bcf77763e88adadf6373
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.symbols.gz) = de5ef76b391472a2c18637f36f58a904d693085bfd9108676a1c0476712ab94b72ac41628a65a9c0bfcd5f33c9e141540906f63cfa5614ab8ea2f3f6867b9b1d
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.symbols.gz) = 383e05d6255afda312b4b81fdaffe4e4a9c83dbf
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-IPAQ.symbols.gz) = 4b4a3474459c93e727e4f20559139464
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.gz) = 70818132f816688fa6d74e13544e9e6f07faaddb
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.gz) = 0b9b7718b30b88b81fb66cdc32ddee57ac7fd6c90c1ecb6a422f84513df70d594b48badb8b71f00b3ef8d90f544c01439bef4942a51eace3d1fc5dbca1461ced
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.gz) = bd193cf9815e6f8a60ca9df77eb1537913c2daa0
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-JORNADA720.gz) = 39c8584c95a8c2197165b102a1548a5c
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.symbols.gz) = 2afaf89d89ef9c6538960f64b36802beb3e74472
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.symbols.gz) = 53c9ddac6c56fa5e1c77323483b129b0b1ebe88b558f0e50346d17d54477db1187831c6c8e0e2a231b9473dfcf8d285672f69cbca8197e6fa889f8285836b38f
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.symbols.gz) = 9dfb61526eb859fd999c8c05b257d436a6d209f3
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.symbols.gz) = c8aa20ace8e4938a05386d8c02f1cb6c
+SHA1 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.gz) = ded59dfdb078cd978a9a74670d43899ef5186b39
+SHA512 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.gz) = f93d2e0c80f5b9f8d2f1d851515b2b50f8f518caf7e0b8b71dfdb002a2f97c1da80f7a7d7263228a0d5400267d0be91ee649b558eb4fea8dac4fe07f23b24138
+RMD160 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.gz) = 99920bf26d5c1697ed030c151c630b125e3b6cf1
+MD5 (NetBSD-6.0/hpcarm/installation/netbsd-WZERO3.gz) = c958ba2807a0e03d47f98fa66fcbccef
+SHA1 (NetBSD-6.0/hpcarm/INSTALL.html) = 90f13483a6a7cefd8261806546700202df5e89ee
+SHA512 (NetBSD-6.0/hpcarm/INSTALL.html) = f7b3a19235b72a4a19c27380e6e22f89e4ce58864a8ef3b492b05aff47cd017a0157adf96bf1d04ef4d6c9b1f4f24980afad91f2644e74fccac06274a35bc75b
+RMD160 (NetBSD-6.0/hpcarm/INSTALL.html) = 6228411bb6d6018e59a1fd74f2887aefed5ae8fe
+MD5 (NetBSD-6.0/hpcarm/INSTALL.html) = 3d21d24e5a8b5a1ed45afd2f0e7c25e0
+SHA1 (NetBSD-6.0/hpcarm/INSTALL.more) = bab711c6d2c3ef110b778fa3bb18a690e3350071
+SHA512 (NetBSD-6.0/hpcarm/INSTALL.more) = 85c117ec4b92633391497f62723320999e714a68f0a9b008508fd1b884f77729235859c2ed0ff9539af6615eb452cd87a9bf9f10456ae53fc057b5a3d665dbb5
+RMD160 (NetBSD-6.0/hpcarm/INSTALL.more) = 5283c45bcd291d03e3d2f579eaccdc78708a2dc6
+MD5 (NetBSD-6.0/hpcarm/INSTALL.more) = fd547cbcd59d803d4f5ef38f619fca0c
+SHA1 (NetBSD-6.0/hpcarm/INSTALL.ps) = 6ce0b3584e4b45bbed722cb8bddb66e3deedc88a
+SHA512 (NetBSD-6.0/hpcarm/INSTALL.ps) = 3d766bafb31be6edb83b4ada23bd1eec923f7297f6b4cf51adc247a160749c5488a99282ce7e4380b4c27025581901c6f5d7d774c799fdb23f8410c43c8e4b0b
+RMD160 (NetBSD-6.0/hpcarm/INSTALL.ps) = e8c042d83705b3b63bcb793d856307b95ed31521
+MD5 (NetBSD-6.0/hpcarm/INSTALL.ps) = 1a50f108a265984cdd0f0206c83daa35
+SHA1 (NetBSD-6.0/hpcarm/INSTALL.txt) = 06a8b26e2de81570eaaa71593a67b1e4c517590a
+SHA512 (NetBSD-6.0/hpcarm/INSTALL.txt) = 4fa7355a943c7e48925ab6db1c281ee9cc7e674095c7eea355d270d15afbb73d45891ce07a4b6104b1fcb0dfaceb3af48db6cb134070077fa4f1bcab453e83eb
+RMD160 (NetBSD-6.0/hpcarm/INSTALL.txt) = 3bb0f03d782104ec4792423f3d640e8e7adc29b8
+MD5 (NetBSD-6.0/hpcarm/INSTALL.txt) = 68c0576d6d8b54ebfbb0728b7a73438b
+SHA1 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-GENERIC.gz) = b038fa721af9faeddea84add1762439db98cf908
+SHA512 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-GENERIC.gz) = 6d550d0b1797734c7340d8632930c78be193f397591767e2eed674423ad469dda333206a8f539adfba9d0d81ee70cda7c01de58cfcc4e3ca0440cd6615ba8167
+RMD160 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-GENERIC.gz) = a4627fac6aad12dd9a2f04c3aa90fc8c61699d4f
+MD5 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-GENERIC.gz) = 6b0e8c6ff949fbea7ff99cbbed4df778
+SHA1 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-TX3912.gz) = be377f94448f7026050fbd885d0eeb2ed6a1e84f
+SHA512 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-TX3912.gz) = 3855f4e59d507281b41d8363e8d39ea229bd41fd1cc6090704727dcd97bb75f3c265f68a0cfe84a10292e55c7d58a266f4d27705a1fb9218d34e1727210692f0
+RMD160 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-TX3912.gz) = 686c703228a5ace7ddb3dcbb232bdb4ece47b6f1
+MD5 (NetBSD-6.0/hpcmips/binary/kernel/netbsd-TX3912.gz) = e462f4f6a2cbc6d8eb20e49cbcfed56f
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/hpcmips/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/hpcmips/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/hpcmips/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/hpcmips/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/hpcmips/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/hpcmips/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/kern-GENERIC.tgz) = 5a49a4163b7d841104dd4082113ba253ca95f946
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/kern-GENERIC.tgz) = 3856b27c3d200e162fb88b7e094e38d843a91f67dadb56b31bd66c18daddd2c0aed58dbea87d43a3d530d3ece68bac562c20d623b613bdd4855fb86bc4794463
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/kern-GENERIC.tgz) = cbd699ebfe796b39eee403ac3831765f5871e789
+MD5 (NetBSD-6.0/hpcmips/binary/sets/kern-GENERIC.tgz) = 22031cc2c2f3a4a6002fe20cff53264c
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/base.tgz) = ff9051176546bd2cacea52fee85fcef472e0fc39
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/base.tgz) = 2a770bede2e0f7af3a0d8c2a1f3871bd72c1f67dbe5aed9f6d1cf12b78c8676c819dfd99d3c7cbfc1794c993e8cf059f9e72b764f8d25a5f1ad3406c42169d6d
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/base.tgz) = c0d7aa660957624cda33c738d6026870f14fb823
+MD5 (NetBSD-6.0/hpcmips/binary/sets/base.tgz) = b79936c5e1c4ff6a86270da2931b1c54
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/comp.tgz) = 32515af667967de5ad8dbca2ad993c62c9794b80
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/comp.tgz) = 5604e8af6fe737b81128a976cd53cc5f5b287f04de2b21fdbc8bfffa1b521ceae4f7244ad8b98580ca77af7c43b75623e2e9ab8772bd23e8e3c7d297b6c54bfa
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/comp.tgz) = b9a5cf74d2c16f7870081a27a3862459c101b690
+MD5 (NetBSD-6.0/hpcmips/binary/sets/comp.tgz) = 4265c60c89150dc4c7de32c0c3f4aeac
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/etc.tgz) = 68b265bdfcdf09e792bcdfe69656516b44d37b66
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/etc.tgz) = af2d02e2aa9a03df02dd8f0a8840e7d185e18b57e8086f0eeb5b7a1349e02433bd7ef1c83f77d5962f90350b71fb4610932e29d723f1cf4488c930048ab43dd1
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/etc.tgz) = 3a5d433571b7a9c44fa0ffca6efd6df514101b15
+MD5 (NetBSD-6.0/hpcmips/binary/sets/etc.tgz) = 295c108b6f0e7a9dd8f7cc142e87dbd9
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/kern-TX3912.tgz) = e1ff4c2bdcfe12d8c26b87801f28970661e5e109
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/kern-TX3912.tgz) = 42d069cd3e055b33ffd04b0e99f3db75a45c80cf8cfffb0a4cc08fd3fafb9e9e8c8c6205cf827689a91080c75250c9e753c5c4f1657427287bd567244e29891a
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/kern-TX3912.tgz) = d5d7c8d6ab8d3cec287bd0ede9c658f5e196471d
+MD5 (NetBSD-6.0/hpcmips/binary/sets/kern-TX3912.tgz) = d9aa987b53c079063b97e947c2b561ed
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/modules.tgz) = fd655bd27b90d1cd9ebb2f64a2b744e5f57178bc
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/modules.tgz) = c7b1ba107094c528d6edc3c3fa68962882af4fa207bb6b323e6230ebd09f0d7555abc34a4f76bc7f6c7fbf393258089a3a11d9ed7284edd0a9deb44bd8b6b1a7
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/modules.tgz) = 13356c7a4e3f09123b31fbd42bcef53ebb10ed61
+MD5 (NetBSD-6.0/hpcmips/binary/sets/modules.tgz) = b820dfc2e2d9420fa72bd887eb9ab505
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/tests.tgz) = 12c5aab5f1f4ab6124d3cb5e8598359b5f893652
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/tests.tgz) = e7656a5f8bb8104576f8218fcbc48c5fdf4d4cfdf407c6805421f1101471c95ac6e1f83444c13ffd1cd82d3b51d4da0d8fc726795b0765363b700d5054cfd553
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/tests.tgz) = 8abc82efc30f6bde5b48bd7778a3774fcd993ae4
+MD5 (NetBSD-6.0/hpcmips/binary/sets/tests.tgz) = d1cd20123adb795808586fef4825bc29
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/text.tgz) = 66f261af8763d48f3c6e62511b0660801b89115a
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/text.tgz) = f7428c73f23bfaec5ddad225487c3e569479c537231c2c7ce46869c6debe07a0bf2f139cecd1622230337871a706d6da3891759bd75166d1ae700e85c014dcca
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/text.tgz) = 8735b6f7b4e4f04f0db4736cce5cced1b12a4cfb
+MD5 (NetBSD-6.0/hpcmips/binary/sets/text.tgz) = 69d9e8e32932f359964186ee95b11c42
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/xbase.tgz) = 0299ef346075a8066e40486b3de09de5148940a3
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/xbase.tgz) = 077e6b5023eeb6ccbbdd3ebe6b4f677d8a2ac2e76ff235951fe3cfba327f87149e9dd46abedf0963ef465fa829589a802cd0b1ad76a49b983f1766a881c648c4
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/xbase.tgz) = 3c7a528dfb109df9525b7f41dd3c1a0ef7ce8bda
+MD5 (NetBSD-6.0/hpcmips/binary/sets/xbase.tgz) = 24312b9cd85e739ec15b4b53ad6955f6
+SHA1 (NetBSD-6.0/hpcmips/binary/sets/xserver.tgz) = 9faebdfa18d6846a47ee49174a2b510265cf26c0
+SHA512 (NetBSD-6.0/hpcmips/binary/sets/xserver.tgz) = 367f12b49e0ab6793075bed49a4830d8d4ca08eca3d93489c90e55201a4e5d7c1454aaea447684309552c5ca3a695abb800fe9da35ec129f1fc11f80f3d904bd
+RMD160 (NetBSD-6.0/hpcmips/binary/sets/xserver.tgz) = ece37a2b4b5096401d6add543d13dc136cabe85d
+MD5 (NetBSD-6.0/hpcmips/binary/sets/xserver.tgz) = 3c0b67d9f4dc00af6b197724b41b572e
+SHA1 (NetBSD-6.0/hpcmips/installation/miniroot/miniroot.fs.gz) = 1e1ce1cba7ab9b704105a3d52f7c5b17773e9ba5
+SHA512 (NetBSD-6.0/hpcmips/installation/miniroot/miniroot.fs.gz) = f1746402d265c51ed693fd30961d3dd7da011a30ad47ccdc709a2a9a5dd665dd884f91de6d56ecab947d8c958bb572a4a19b8c446ec6644fd2f3b3096b14e615
+RMD160 (NetBSD-6.0/hpcmips/installation/miniroot/miniroot.fs.gz) = 15102213a728cb35bcac2a49f93b496b8f9aa838
+MD5 (NetBSD-6.0/hpcmips/installation/miniroot/miniroot.fs.gz) = d910bba08c66b4454242edd78b73cebc
+SHA1 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.gz) = b1cb178b2c1edd93e4d03ab3205c07c701c1a7ce
+SHA512 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.gz) = b982379b9ed3f09895be90c2dcaff7c041e249102bbf72f6ff41bd9100e28990095563db8de6c6dbd40accf3b11f9e0848c2b1bff5dcf0ab9688e65d5229d39a
+RMD160 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.gz) = 6923c07471d3beb90bdb466c1cb76f03ac65ad00
+MD5 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.gz) = 8860562df651f9ca3adf61dd62718dba
+SHA1 (NetBSD-6.0/hpcmips/installation/hpcboot.exe) = 70e5234558257f49964fcb28a19f544670791c47
+SHA512 (NetBSD-6.0/hpcmips/installation/hpcboot.exe) = bcde10547db4de0623863c93a733706edc1096e2535ff6a7574e86ccab25144c0c653d80ccfb1989eaf685e0b0710eab41f34cc2c45a7bbdc10bb9f845326102
+RMD160 (NetBSD-6.0/hpcmips/installation/hpcboot.exe) = ec4e5dfcbb787ba57de55209e12cbbf891c29f7d
+MD5 (NetBSD-6.0/hpcmips/installation/hpcboot.exe) = 9c4073db4cb8cc5a534f709731e271bf
+SHA1 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.symbols.gz) = 6aea661d601c817cef6d1283efe84a23e98bfef8
+SHA512 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.symbols.gz) = 0ae88640bdd00cfd0f1d908bab889b72f71173a376d26159e5bd9221e4241a867f4050bb9c349bf4225ecc4b82ae558002b3303e7c03e98dff7f72f57b08a9fc
+RMD160 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.symbols.gz) = 1ddaff9ebe6775a9b1f98e3d592c9e38f944a5f3
+MD5 (NetBSD-6.0/hpcmips/installation/netbsd-TX3912.symbols.gz) = ccf4219237474d2c8e2fa02fe33f2e9b
+SHA1 (NetBSD-6.0/hpcmips/installation/netbsd.gz) = 75ecc93d0f321a819aca2fafbf58a92651c2ef8e
+SHA512 (NetBSD-6.0/hpcmips/installation/netbsd.gz) = 94ef6d49c91ac5ffba39ada8854d3a7be535bdcc7a5121a4941255a30a8c9d68acaebcb1e99ad804360910a45562e3c17b307819ed4f97c1f9a4900c765ac06c
+RMD160 (NetBSD-6.0/hpcmips/installation/netbsd.gz) = 10470fb18a31416543c016667bcbcaab1b454297
+MD5 (NetBSD-6.0/hpcmips/installation/netbsd.gz) = 1acf8ad6849c07fb17c0646acf7e76c2
+SHA1 (NetBSD-6.0/hpcmips/installation/netbsd.symbols.gz) = 8a2bfae03f350dc2c9d83709c8255b8ee4eb9e15
+SHA512 (NetBSD-6.0/hpcmips/installation/netbsd.symbols.gz) = c4917814e14d1163139be52927a5a59d422304289239eae15e91495a9964a16e005865f231b3647964bdfed2658d955ef983fccda7775616df92487e10f36b53
+RMD160 (NetBSD-6.0/hpcmips/installation/netbsd.symbols.gz) = b353f7752d20b78218082d129e4ed5b6702ee2a2
+MD5 (NetBSD-6.0/hpcmips/installation/netbsd.symbols.gz) = 453e0c8ae44500b483151a83e1689a2f
+SHA1 (NetBSD-6.0/hpcmips/installation/pbsdboot.exe) = 3b0a8ac9c0d4c6e7fef95970e81f1ae42462f405
+SHA512 (NetBSD-6.0/hpcmips/installation/pbsdboot.exe) = 28b6b8b3ac983d5fa9ae9dd28127981367720c3754a88fd0b08e404093c657df3df93bceae63835fdaf021fd608002464411818ef3e9becf100e0e7ffd94fcbc
+RMD160 (NetBSD-6.0/hpcmips/installation/pbsdboot.exe) = d713fda3478b92d9dc71347122a1fd7bac6cab9b
+MD5 (NetBSD-6.0/hpcmips/installation/pbsdboot.exe) = 5c184fc062316a94d8408adf0884bee2
+SHA1 (NetBSD-6.0/hpcmips/installation/pbsdboot1.exe) = e937c9bf2759e58c32523ff19c45feeb5e90fe77
+SHA512 (NetBSD-6.0/hpcmips/installation/pbsdboot1.exe) = 65e044958194d15fd58b222dba5470343068ffbe968d43819b11744c711bf75083d1e61df0e433ac846629d8d0ccd14ccd0388b58424a123d4018f9731b6415d
+RMD160 (NetBSD-6.0/hpcmips/installation/pbsdboot1.exe) = 9e072b9c080bcfa4213b36fe9d85ac684de46f06
+MD5 (NetBSD-6.0/hpcmips/installation/pbsdboot1.exe) = 4d6c719c61a98aae297369c41e3991a8
+SHA1 (NetBSD-6.0/hpcmips/INSTALL.html) = 34d4a448b23da2e50007d37ba33938d78baf8b03
+SHA512 (NetBSD-6.0/hpcmips/INSTALL.html) = 508dd90bf6b4543b31108ec82b96a8ef765ffd29d2fcfbb463e380bd8cff6909fcad9673a8c7307b8a524347c20c117a94220dc743813028785520f1739b8d89
+RMD160 (NetBSD-6.0/hpcmips/INSTALL.html) = 3e111666257f4bcbc22fba2a542559733ab56f28
+MD5 (NetBSD-6.0/hpcmips/INSTALL.html) = cea8b96d283b5ddec4b1be43b327a986
+SHA1 (NetBSD-6.0/hpcmips/INSTALL.more) = d4dc5bdab669d3e4a97c6e07e3a4e6634a171103
+SHA512 (NetBSD-6.0/hpcmips/INSTALL.more) = 90924423731cdaeca599d151e56ef996a4a217432ffe1791b3bf7ad2ea3e025ae031d9e237377d1cd7fbab33a6e8e666909a77bb4867be3aac99340e4292d140
+RMD160 (NetBSD-6.0/hpcmips/INSTALL.more) = d8517223e07059e28737972d4cc4ebee900a308f
+MD5 (NetBSD-6.0/hpcmips/INSTALL.more) = 6b918c9fc18e093fdae5e4c61fe2fe3e
+SHA1 (NetBSD-6.0/hpcmips/INSTALL.ps) = eb7befb368fa0e792db5c250f1cf7cfa9d21d529
+SHA512 (NetBSD-6.0/hpcmips/INSTALL.ps) = 42f376e89f871f1a1f223d12816ffa887891818897a591d7b6ac0495c088559eac383449569dda24bfae563991e775c89b55dbec27aac2449ce5363c02581ec9
+RMD160 (NetBSD-6.0/hpcmips/INSTALL.ps) = 718659993cfe1a81d63fcb9b7717e551c7213944
+MD5 (NetBSD-6.0/hpcmips/INSTALL.ps) = 660ff8cf43dcbeacb63a10a2ac4442cd
+SHA1 (NetBSD-6.0/hpcmips/INSTALL.txt) = 93686fc2958437cddbb8e0ab34efa7a153b16939
+SHA512 (NetBSD-6.0/hpcmips/INSTALL.txt) = f71addf8728978547ec7d560a4590e392cfb55bd2d06b9987def48a08373fa27fdc7d2d1bfd241d6c9d8b22297b180b434043ffbbe86281b56edb9d4b714a567
+RMD160 (NetBSD-6.0/hpcmips/INSTALL.txt) = 0da553b2c528d6766776dfae2005bd6ff531e905
+MD5 (NetBSD-6.0/hpcmips/INSTALL.txt) = 3c60451e18599c7e2d8bc6a79c6fc8e9
+SHA1 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-GENERIC.gz) = 0a43926fc91b70cb80d51c78394a2fa54fd98ae1
+SHA512 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-GENERIC.gz) = 42ba58126c60285a642156c27dfa9d89009b41739a832898f876abe6387edac7c36f08e71028c326ef617a29020e525d779def3e583381645b5a1fc6ba6413b3
+RMD160 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-GENERIC.gz) = 0d01f666a4b6fd2df148381e442ee85aa8afc635
+MD5 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-GENERIC.gz) = de0c019c15358bd1673689f590e64529
+SHA1 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-HPW650PA.gz) = c0359ab834228b4b0af9fd92ec0870cfa424fcab
+SHA512 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-HPW650PA.gz) = 6e2d1f10d4eda5725c7293c179162091fb9f04630f14bf37506e49700178b1baee5594ccf70fa3ede42ef702bb512016d9edef3a23cd0777fd40f961a43ba021
+RMD160 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-HPW650PA.gz) = f6b944beeaf6fda516165b2196b429db28741e96
+MD5 (NetBSD-6.0/hpcsh/binary/kernel/netbsd-HPW650PA.gz) = 7dc95c93d4b9b5a94e566c9f5565bd74
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/games.tgz) = 2040b4af557a62f2ade5fc9fcfe4cab3df88c7e2
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/games.tgz) = 8b5071337dc844042537c24c75660e61c9709cd10cbbeab059a84da6d482260b73365ff3870f85060c130a291b6f02be174d288127ca62ce4d291a6982192317
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/games.tgz) = 28acfa5a131d52df7c157e2edca1dd0f20e774dc
+MD5 (NetBSD-6.0/hpcsh/binary/sets/games.tgz) = d82c46dbc0021fd4694e464042936052
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/hpcsh/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/hpcsh/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/xcomp.tgz) = 53aa1e2a910e8eed09dc07f8b724804f53fe5e2f
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/xcomp.tgz) = 24645da85419528015cdaefd0c835741fa801392e795b363bdfc39558e75e7f384511c0668d12e2440114b7c543c7532aaec438048f08d35c54c9c7a748f20c0
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/xcomp.tgz) = 60a461ffc1f1562274110d65c72a541ee131cd21
+MD5 (NetBSD-6.0/hpcsh/binary/sets/xcomp.tgz) = f1d2650a8d7a4ecd60fda8e1aaf8c09b
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/xetc.tgz) = 1636a6fe3e01f6d8a07a19cd204a6807c8caa4c7
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/xetc.tgz) = 9cea4ba4af287dd57e591d4269f2f2582010250316f323746ac56b12cefcf2590b93fbb0197c665f61b1df41dcca62d17fb6ad80d4b1feb8ac8265e91e15074f
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/xetc.tgz) = 5f68e3f96f7bb9ae07fccdb1d058e4b1307b4b29
+MD5 (NetBSD-6.0/hpcsh/binary/sets/xetc.tgz) = da84d97230787283e215a4ee1c4053ad
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/xfont.tgz) = 97439ccf6840b18b1e9885f5504a401bf1a93650
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/xfont.tgz) = 3d15541f7d7ae2128f44355bf110415adfa4e5182829259d2c6f7a4217feff99e236d13c5bb7bbeb724ff1a09ac1f58f02bdd6eef528bc416ec3118db6fc7d45
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/xfont.tgz) = cdc9fcdb5fd5032803d5bba18db58f3ea6d62c85
+MD5 (NetBSD-6.0/hpcsh/binary/sets/xfont.tgz) = a8466a0477c6c443eafe99e9d1c61131
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/kern-GENERIC.tgz) = 567f596fd760416c4805a60ccdc39634394b368a
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/kern-GENERIC.tgz) = 517a450a02d80e4ae14463b5abcbb4e887d404ac5fd97a2d70092d9d53b6117af874171db26e1b43712b81f6f5f7c23d34ef4d6ee60a911c1288f07ed86675ba
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/kern-GENERIC.tgz) = 9f9a50ba10b38fd0a92e4671a61dc968ed206c49
+MD5 (NetBSD-6.0/hpcsh/binary/sets/kern-GENERIC.tgz) = 43c86c80541870470199c27117d78bdd
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/base.tgz) = 09469ee791c205b746f290108fb4e0fd2d2e157c
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/base.tgz) = b4f946a01df921d1b6b83db51e4da06934be1c23d5bd8602d357c4716524a944abd24f9053c130121a05a0a73b06124b1fb8d2e433b461e7122a6f7994b70d4f
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/base.tgz) = 9ba69deac2b406c07e38117048bc439865eb8061
+MD5 (NetBSD-6.0/hpcsh/binary/sets/base.tgz) = 7a62d7baa2d993d1de3d579d7076fdb2
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/comp.tgz) = 2487c8289908b3f46b47dfe16a78d041d159e4a9
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/comp.tgz) = 9e89c2f701cd69fc74aeb6ab03304f4bb51d73b6ff6c75b93906d2b05e42639e1da36dbce39a37519070a991bf5efe9ae93b29b6ae20da42fe2b01e951a51cf1
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/comp.tgz) = 3843c49d31f966f8d41b2b07407d5952eb788d18
+MD5 (NetBSD-6.0/hpcsh/binary/sets/comp.tgz) = 313b69abf3e1a78923f1a7c5c6f171b4
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/etc.tgz) = 0ede2593731365cb6501ca69865e1fdcfa72717c
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/etc.tgz) = 612da4fc764826c7f374c846d7712c4142d1cd041eb13944c578054fec342a2cb435c8815f9c477afc70a5655e35e9fb9eb1d01ee6c57218c944c6e11f18ffd7
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/etc.tgz) = e226671156547333000c60e32b9b24376cc63885
+MD5 (NetBSD-6.0/hpcsh/binary/sets/etc.tgz) = 420c5afbc0c1dd6c1d7a085979bab643
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/kern-HPW650PA.tgz) = 5534a47bdec7e7e6ce7d5474d3b159ffebe72cd1
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/kern-HPW650PA.tgz) = a7d789cafbe113131a7a93700ec06da4256ab5f93513d2ce96e0ed715a7dd99e866a89a907336a761ff53e53c20ca325b4a569198b75ca806e810395638a0ebd
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/kern-HPW650PA.tgz) = 2dcb3e3e54ce471cd2185469e4f788aeef5c6539
+MD5 (NetBSD-6.0/hpcsh/binary/sets/kern-HPW650PA.tgz) = e146321b865991498743de2b41a3c034
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/modules.tgz) = 36ccb3afb83508f713aa2aabd8c66990a7bee974
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/modules.tgz) = a9cc7bdcc7e3cb7aab35d329095b0b67cb46b13850f9897433539ce2836b96d38ba69ec95515ae8988a80864f865546dbb619352261f8e413ac21580c78a7be4
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/modules.tgz) = 29b45abec58e7be9e801cf6a2be74bcc56df595e
+MD5 (NetBSD-6.0/hpcsh/binary/sets/modules.tgz) = 82ca10605dffe603d39ad994e305b53e
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/tests.tgz) = d7eb3b59410ff4f341e9dd65c9995e160684fada
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/tests.tgz) = 443ff8b932876a515b75ac9b4eb1e225d2d09bd7dfc531f6e19f812e659de4644d0aac96ca74e73aa877bffbaddf13d308905f28cfe23d48a6cef1decf9b820b
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/tests.tgz) = 7030e2b09ddbe4bd952524d58f0916b2079a4bb1
+MD5 (NetBSD-6.0/hpcsh/binary/sets/tests.tgz) = 9a95f9e73414b2c3ad7acbb2241178fe
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/text.tgz) = 028f0e33f75acdbab625786cec067f630aa63e4a
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/text.tgz) = 434ec2e2627f4068e75db33cf4ad353ae1c7437c21d4aa0e861f06fb5eb1d85bae5ca15f7c1091017f76adb8b517a6e7860c5a406d157cf4485c1e6acfedfdda
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/text.tgz) = 37213e71f1fe2e1d8222d4b64ea6cbbbd2e40a4f
+MD5 (NetBSD-6.0/hpcsh/binary/sets/text.tgz) = da797fc1c503a808baea4b873b4575eb
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/xbase.tgz) = 3c17cc530069599ced85ef999be6012422973217
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/xbase.tgz) = 3dd6421f3248867b6015fcc420b29dcdbe82506c75b7bdd9698dc55b1a93e54d078cc93a68015ccf4bae00dcc96695702acde53f0a47f521116081f44255e205
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/xbase.tgz) = f3a5a0df1ced2758ac1016c970034a8a7e9f16c2
+MD5 (NetBSD-6.0/hpcsh/binary/sets/xbase.tgz) = fef3052b786c27898ebfcab88012729d
+SHA1 (NetBSD-6.0/hpcsh/binary/sets/xserver.tgz) = e518391c0fa08ecefd59c19049aa8b6e05427683
+SHA512 (NetBSD-6.0/hpcsh/binary/sets/xserver.tgz) = 85fe307f64bf7b5eb0300293426a377ddde46de15d7cdc7365eea65651d5b952cee395107dc6d73c55b19d43b19c47bac3bdc253d251c5f98858cd2d0aee8cad
+RMD160 (NetBSD-6.0/hpcsh/binary/sets/xserver.tgz) = 04274aa41e6f003c492c4d27e8a7182694a98386
+MD5 (NetBSD-6.0/hpcsh/binary/sets/xserver.tgz) = 3fb668ea3e2d13574cd78b5a59cc40df
+SHA1 (NetBSD-6.0/hpcsh/installation/miniroot/miniroot.fs.gz) = d65c961e5411c64f1110f55036f20c59b3a4ef75
+SHA512 (NetBSD-6.0/hpcsh/installation/miniroot/miniroot.fs.gz) = 95a54cd59939533feb467c23085569f35f2ac246a205825acb84ad8c144ae0c6cda888844270f74d452c5bbf4bd7056e9ae62e56f22c598f21a2cb92dcd8499b
+RMD160 (NetBSD-6.0/hpcsh/installation/miniroot/miniroot.fs.gz) = 10cd9e01b234129588477829523bed1ea19164f2
+MD5 (NetBSD-6.0/hpcsh/installation/miniroot/miniroot.fs.gz) = f5098b166d3da210356a284e484315e5
+SHA1 (NetBSD-6.0/hpcsh/installation/netbsd.symbols.gz) = 1a92b94312e5e4cdf5c088342d52040948fefc6c
+SHA512 (NetBSD-6.0/hpcsh/installation/netbsd.symbols.gz) = c0ca68315dee6c402bcd7a0180808d4a1c9fab799466d76a8fb460ae110c22fee7ceae5dbac451cb7a0d7ddb59d3af49f3965de88201778c7b14513f2ba1e61a
+RMD160 (NetBSD-6.0/hpcsh/installation/netbsd.symbols.gz) = d9c41a7a101b96727c040c0fdd992ba57999fc89
+MD5 (NetBSD-6.0/hpcsh/installation/netbsd.symbols.gz) = 67c48072e6d7c01c9c35c60071d1e371
+SHA1 (NetBSD-6.0/hpcsh/installation/hpcboot-sh3.exe) = 567ca586f3c3604143e61ee4b644faed466cf60c
+SHA512 (NetBSD-6.0/hpcsh/installation/hpcboot-sh3.exe) = bbbda6cb7c671816e07ac1ba9a05f57632f501019f9e7e2b3a373aa2b55bd56d600f7a6353fe433201284b0ff43908bc988f12568d95b251e8b89d5d5656b244
+RMD160 (NetBSD-6.0/hpcsh/installation/hpcboot-sh3.exe) = cac5d9056182928594f5c15b2c5d8a6bb54e6654
+MD5 (NetBSD-6.0/hpcsh/installation/hpcboot-sh3.exe) = af41643f4b488f837514418c34d06eee
+SHA1 (NetBSD-6.0/hpcsh/installation/hpcboot-sh4.exe) = 3b04443ede94fb5345be01440dfac5c600e46683
+SHA512 (NetBSD-6.0/hpcsh/installation/hpcboot-sh4.exe) = 60ae23af771f81a472d5ea84b5df140f9b2c2678753ca1878d51157366c9d04253a41b19a6bb5ef08ce755ec82b9fa67f82209fa6a0e49eb507e4ba8118dbc3e
+RMD160 (NetBSD-6.0/hpcsh/installation/hpcboot-sh4.exe) = 69a4509e0e173a94a2720f1469a00dd424e19ee4
+MD5 (NetBSD-6.0/hpcsh/installation/hpcboot-sh4.exe) = d259e7fcc3c329c95448f96b7fda6920
+SHA1 (NetBSD-6.0/hpcsh/installation/netbsd.gz) = 77bc4656ee9ce29522e56beeedf26cdec6df77ef
+SHA512 (NetBSD-6.0/hpcsh/installation/netbsd.gz) = 98ba42e9f3d8be016785ef5a807d009f6f8cf46a7c9c4abd8ad860fca5db37bbae22bdfe54bcd8b5963b1d0aa8610fca21402817ceac6b6e59a2c8cf7e986f21
+RMD160 (NetBSD-6.0/hpcsh/installation/netbsd.gz) = 705cf57dfbf1a1ee4e3629d1d82a60b8aa8cd6b6
+MD5 (NetBSD-6.0/hpcsh/installation/netbsd.gz) = 75c72e83a03c4d9f316f28e81c428c2b
+SHA1 (NetBSD-6.0/hpcsh/INSTALL.html) = 8ab73c33b0ecde2e0b0beea372a7996e866553ef
+SHA512 (NetBSD-6.0/hpcsh/INSTALL.html) = 7d7f628cd37890c8db79d76dcc9d87984b6ded522ccb2cb5670aa4a40114b1b323cb78b1b7274bb4bd27daefa25c3ee1dd0c6611736222ee546d0dd895cd6e52
+RMD160 (NetBSD-6.0/hpcsh/INSTALL.html) = 1e3edb91c943f9e1aa17315a592f5c68e7d66487
+MD5 (NetBSD-6.0/hpcsh/INSTALL.html) = 7b6883d6de2349156019286bbf61d14f
+SHA1 (NetBSD-6.0/hpcsh/INSTALL.more) = 29137bc092201f10bb2f2725d72299b5e5475b5b
+SHA512 (NetBSD-6.0/hpcsh/INSTALL.more) = 6a8737896c43bed9befbd131f8b13fc6070008f13bf9a9e798cc5bcb2210271f92c8b4138b20e716b5f48aeb478bc7ca9be66347d8636fdecd7bebb013b35ebc
+RMD160 (NetBSD-6.0/hpcsh/INSTALL.more) = b50c579d04464e3781f5bf7dcb4b69327d79a9a9
+MD5 (NetBSD-6.0/hpcsh/INSTALL.more) = 4f08e258b707193fea1797d2915df90f
+SHA1 (NetBSD-6.0/hpcsh/INSTALL.ps) = bc5b3e51e6a6f8a09ccac7db7f1ac85366921911
+SHA512 (NetBSD-6.0/hpcsh/INSTALL.ps) = 3945a024ba07da3ff29847c33f4061c8395113eaadf053b603b1391c3b994ee23c271442d90b8e9cfe104aee458348422068b5e704f8c89f2cd248e248414f36
+RMD160 (NetBSD-6.0/hpcsh/INSTALL.ps) = fadfccdee249158cab774c1bae128f6889f9bbd1
+MD5 (NetBSD-6.0/hpcsh/INSTALL.ps) = 01cdb6201ba834eb25dd70d0cd7dd827
+SHA1 (NetBSD-6.0/hpcsh/INSTALL.txt) = b291d1be7635867dda1fe5ffb3f24d41b43107ff
+SHA512 (NetBSD-6.0/hpcsh/INSTALL.txt) = 7a5ecbef64ad55680dcaa3e58319a5019096e1fef9ff24de2a8401c29b4006520dc724ff740c14f8bf56cc4fca1bf26a5525040c63d0de3559cfdc7f34710e2c
+RMD160 (NetBSD-6.0/hpcsh/INSTALL.txt) = a2e4347c690cb982b5097800f74a3729dc6c2628
+MD5 (NetBSD-6.0/hpcsh/INSTALL.txt) = 39020135702f1291d2691258a598ef52
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.symbols.gz) = 747df3225196d826d632a750770850510c725c3d
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.symbols.gz) = bf7546bf878dc86c2579e4660adfe0dfc2e7aa06416526ba2ce70425fee806f92bd7e61d2211aa8f302e167f77dd5e61674a1144274be7a3b9a14c13f2a758f0
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.symbols.gz) = e2aef01c044902e8685f72d3f0bba4b0ed6857ce
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.symbols.gz) = 71aca09f9e5bd22fd42144fbadabcda5
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.gz) = d680282ec53e51ed2f2df312764748ef2dbce31f
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.gz) = b9c3bf1bd9a442e5a7e7f515561771436b4c43e44cf454db37c94070de292aa6c00ab0a95957f80f71ffaa517a60dc1651bcb4452853f35fd541cbca2df87139
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.gz) = 60783b17fa32bdef611c8c8c793248f2494f8b4f
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-GENERIC.gz) = 780873f1a06cad1f8e2644f2827e6b8b
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.symbols.gz) = 986e2b589d49d58105c82c1a3bf8d4292f5ec1c0
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.symbols.gz) = 0919e2e21da9aace7144d82119ecf8097548ad7179b5f8b495b72b6ad75544c72d462526d7625a2b42fbf9c68a436b2d233ca7e06367f5ddf5be3386d67659ac
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.symbols.gz) = 4abf1e4dd5c1df9578a256eb7fc9bfc6de174f60
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.symbols.gz) = acd73bddb752df740099d651da32881d
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.gz) = 88fdedc8bea8f6e139947e6e4a8922324a2073a2
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.gz) = 0f13507f05a4dc76faa937fbb9dc8c5107b55e2a7dbcd97a6fd2dede7c2dff1f16ff0b908433b826125a2e1f5c4b9d14b9a809e920b92acd88968588b8129f1a
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.gz) = 0b7be220f16b74210af24ce8bbb42402909ad847
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL.gz) = 85d626d678c978ad387238dfc76e20a9
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3PAE_DOMU.gz) = 82987dd8d3d035c3741ec54e567c797aa527b85e
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3PAE_DOMU.gz) = 43c9d6c594b997834e1bfadf63a20fe0735947419a1e86e9e06bc97a7953738219eba2072f9a7b1fa6b23870287be413650145234d2c58166138bb00bd0136a2
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3PAE_DOMU.gz) = c0c2edf5e75878f0a07a2d7f971d020a16bd33dc
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3PAE_DOMU.gz) = a6a8ef4a7c0da213a9821e7f2d0e18c8
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = 67b61d551fd822e4578b9a8d54bc4a08a39f8b34
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = bfdb3e7ab7a5456434117156bd187d1f111eeedbc7a2d568266fecfeab33bf847fcc4b72e6edffe8015841b87aa04645c1c0442ce521c8965cd7007326b38e78
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = c5378820ecdb9baf20fabded1f5caa4a1d6a3021
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-INSTALL_XEN3_DOMU.gz) = a09e8070066fb225a26b0904422e1704
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-MONOLITHIC.gz) = 205b7f5a5c457a2db4c997c75c02d1f55a0692e7
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-MONOLITHIC.gz) = 68953183a437b13d94af72acbc231553e6aa57f4e3acbe432e710ad452317b974509a9ae83ea0f350d24164de4d1ae6a3d8d4a221e31c61734b67df026b93b03
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-MONOLITHIC.gz) = 11fd88405a800b36b7b030991e632d17992f5e15
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-MONOLITHIC.gz) = f746f0b2fcebfb329cdd45181f2acb74
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOM0.gz) = 6c7943423d026377f0d9308e8aac75d52f08907c
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOM0.gz) = a2fea33cd4aaebb2c2e69d8790ea40b0c2f00e8be3a823ca93274e534a751fe04efdc9d5ed7fc15897c42c9cc7d987ee645f50897cf6ef55383c448885a324f5
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOM0.gz) = 948c072d5d1424578e2ff5bc3bc7bca39364f8e0
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOM0.gz) = 1d4aafba1a470802f7f2c7e10e98ca52
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOMU.gz) = 2ae71d2f1c2b512d124e2d92d431ab5b2c1f05a7
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOMU.gz) = 9b553c5b145d2b29b9032416bc01f5c43bbad80f2c6feb1e96c881e4d1dd77c02740413cefbbd4fb6cd247cb75fd24959d5a60d3210020548236e3a14a82a65a
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOMU.gz) = 2b884a96bb6cdc3059448104c7ddafc31be7c188
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3PAE_DOMU.gz) = dba74b4cb61cf1606556492f6f1b213c
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOM0.gz) = 7b21a86bc29b1573539105b83e6f847124afee15
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOM0.gz) = 9f0a07816ba899e5d003750e1320c6f83c66bee70b71b1356980e64019a4eeff2ee105eea33dc31822c614609782e3143c6575afa7cd9dbfdf05c119ab2cb92c
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOM0.gz) = e976db5aa9e2e5e1109f804913e5a8f075708f85
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOM0.gz) = b8ec7670143458921b7dd71f05251257
+SHA1 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOMU.gz) = f528d474640a5bda692eb50859c208f2277ca61f
+SHA512 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOMU.gz) = 24f2b7317b51e12e15084d1aad1177a63d37be3ecc3777de4f7b2b93076e4c980a4667c7013db8bdb500e033e745adb665c45aa842d4422494d67beb3f2f4442
+RMD160 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOMU.gz) = 373525999967fd37d620cea1b0b38692ea102d64
+MD5 (NetBSD-6.0/i386/binary/kernel/netbsd-XEN3_DOMU.gz) = f76afc8d70580acebe22d4daba31df3b
+SHA1 (NetBSD-6.0/i386/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/i386/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/i386/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/i386/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-GENERIC.tgz) = dfbdb16d93f42cafac4314e173c3698abb2b2249
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-GENERIC.tgz) = 572284b4e2daab363f9f89f6bb9b80428f6d048fbb70120541b7cff881ed7fd8145b2a5dcafb63160a4292d286e57a3191154267167cedb7641f1ee3098072fc
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-GENERIC.tgz) = e663f76167f352828f007b3271408d0c4d1f6735
+MD5 (NetBSD-6.0/i386/binary/sets/kern-GENERIC.tgz) = 43a3993a20de2d5c58aa9a1aa90dc667
+SHA1 (NetBSD-6.0/i386/binary/sets/base.tgz) = 5847817e7b75483373fe51fb6b465404cb74e1ad
+SHA512 (NetBSD-6.0/i386/binary/sets/base.tgz) = 927acc412e1372e2205d4c90fe017b2812bbd6036823b6a18bfcc33513279bdf9f02731b874ad73f614da46194bdacd525a8bf9e301c5842f3f6475fa27507be
+RMD160 (NetBSD-6.0/i386/binary/sets/base.tgz) = b36be3ba67b7b2209c5baf2fe314ddc2a7254054
+MD5 (NetBSD-6.0/i386/binary/sets/base.tgz) = c643ea74ea234056b1f741a561790c1f
+SHA1 (NetBSD-6.0/i386/binary/sets/comp.tgz) = 0f22e69dce5b6678e1ab117b875c7b28f2a1224a
+SHA512 (NetBSD-6.0/i386/binary/sets/comp.tgz) = 99a73445be3ac1354a3ec94c7b4d231d3fe72bc2bc7cc020c9dd4c74d5fa06f1a7e681f48a2dbf3e90f0d8e611d51e6524883a1a4edf1494607259bc1c49a99b
+RMD160 (NetBSD-6.0/i386/binary/sets/comp.tgz) = 1bae0e183624d0dc957e24eb52041e2b3e42492c
+MD5 (NetBSD-6.0/i386/binary/sets/comp.tgz) = 5cff8ef6491c3b9270310558ca8360db
+SHA1 (NetBSD-6.0/i386/binary/sets/etc.tgz) = 00df7a05fddcdbbf9e0ee430c634fd1e1da2a2db
+SHA512 (NetBSD-6.0/i386/binary/sets/etc.tgz) = 0100afa02f2c0f09bcbe513b282b7e23124b94d5d77816f88c7b927e0625bedde3020b0c34e03f26da5d53941cdb0aac1398d2e15c9b4bc6cbb4e46e4bf8786a
+RMD160 (NetBSD-6.0/i386/binary/sets/etc.tgz) = 978efa1d91dea561eaa148f4da679a88e1730c7e
+MD5 (NetBSD-6.0/i386/binary/sets/etc.tgz) = 3f174862437df05c82293f93a42a52f3
+SHA1 (NetBSD-6.0/i386/binary/sets/games.tgz) = eb79bb969242401a2573c8cb861e399f374ffdce
+SHA512 (NetBSD-6.0/i386/binary/sets/games.tgz) = 537eaab987a71933b63673477c276cf3b558f4dd46331ea224f5c0f2b0ac387fb591a7880b1055225746b9c46fcb4ff0f8b72382a629abc6af6315ee038c0d0d
+RMD160 (NetBSD-6.0/i386/binary/sets/games.tgz) = cfbc8842fcc975fdff71c6fc472396d533d8aa5c
+MD5 (NetBSD-6.0/i386/binary/sets/games.tgz) = df096416d676f1a44710711d7c895329
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOM0.tgz) = 714c9b6c0a41973c06ea62a97babb7000ea1245e
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOM0.tgz) = 97529a4c90a36ad65bec57dca59bc80f724981c4358d32195e3b4e614761fae96a79cab552fe0388e7c8e57da581a2b07a84a44d12d32f23e6ce45c771493ccc
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOM0.tgz) = 0171b60434e21cf6d29d38300c05988d19ad1783
+MD5 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOM0.tgz) = 6baad66e20421f3fb0af25e4b95f8a6d
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-MONOLITHIC.tgz) = 52d1f2b561194201e67abf1ba2c1726d72e97984
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-MONOLITHIC.tgz) = 19aa162f30e144882f2924be4b864821e109991ca16027c4016d54baf812945c8231f423d141091f08ecf8dc9310a74fcbae43b6ea18578afd1bef3346772cf6
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-MONOLITHIC.tgz) = ca3d3b0cb59e5d5ba2089b6cf250c62c079b6855
+MD5 (NetBSD-6.0/i386/binary/sets/kern-MONOLITHIC.tgz) = 56528935806a8a2ec9f48c6dbfd9c175
+SHA1 (NetBSD-6.0/i386/binary/sets/modules.tgz) = a6d22e796d8b1f344b43bcf38fbb79e53ffdce13
+SHA512 (NetBSD-6.0/i386/binary/sets/modules.tgz) = 9bbf31b0e1c1192e9ff0ff38f0978c4c2972a82638e63f5f023bd7263ff9386d36cfd666e55e62a6bf3bf3e8c47571252b3508e485ec86830caaa89c66c19fe7
+RMD160 (NetBSD-6.0/i386/binary/sets/modules.tgz) = e3dcc86e04adaa6f347d51801422854b35fcedfb
+MD5 (NetBSD-6.0/i386/binary/sets/modules.tgz) = 71908d43cbba617e2ff14e3fffa3dae0
+SHA1 (NetBSD-6.0/i386/binary/sets/man.tgz) = f526dfe015359f1181af9cf3dc6061960289451f
+SHA512 (NetBSD-6.0/i386/binary/sets/man.tgz) = 75dc7781f8531f09bee6f1696561d036b12f08a66a44c4e56b11986e6d91df213ca8b4c6e59da9a2168038c94322c6cfdcdeb52125f5fb03c5b84cdb9522bd7a
+RMD160 (NetBSD-6.0/i386/binary/sets/man.tgz) = 1f8551b79ca0342aaf8df0c6f2a77e7337cb7672
+MD5 (NetBSD-6.0/i386/binary/sets/man.tgz) = 6114b3fadf0a5e3bf8fde0e7bf0101fc
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOMU.tgz) = 4e24d5f9641c69962f0e9124a3a0082074db7117
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOMU.tgz) = cbbd3c74d74bcd20c8fe2dfa5052b6886a5d25bf8c7aa595638655af790072bd3067e8555201849c2f3d0ec67465f41721c4a8aa14fb060231683de850fd6e99
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOMU.tgz) = 56610e7d2c9e2844ce0516255bbf76b330d23f80
+MD5 (NetBSD-6.0/i386/binary/sets/kern-XEN3PAE_DOMU.tgz) = e79dd5d5ca1fc640045efccb106e6a01
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOM0.tgz) = 9c8c6c75aec356a4b6591bd5ce5fcf0e76536c41
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOM0.tgz) = 2acd400b61f87b32e41daf0cb89b512d887f222310cab9be25f2b030480b720042c86abb68ae81ba73875a2c70dfc01184e1e771ad671e98383ce9c8357b4e8e
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOM0.tgz) = ac64d2c3ff6ff7352d43f4f275cfc07a509e40de
+MD5 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOM0.tgz) = 5541acebbb837f4882be868d86bc2b22
+SHA1 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOMU.tgz) = 01432bab26f65297c0739bc3eb4740bd984d67ab
+SHA512 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOMU.tgz) = bd7221f127923ebbd3099589b5bfd332cadbdcf2ad29870b9eee66b8241d1ad50c4d9481647d41d9ceba1e7071735538acd19d458d78e666d2b8ae1b097f993b
+RMD160 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOMU.tgz) = f9c5fd62ac6b11f4cb1ab8eb648f4ee51209ff17
+MD5 (NetBSD-6.0/i386/binary/sets/kern-XEN3_DOMU.tgz) = fead463ca4403cdf358b55114421e53e
+SHA1 (NetBSD-6.0/i386/binary/sets/tests.tgz) = 65e60f978857f50c36bf4066ad82acee0ef06af4
+SHA512 (NetBSD-6.0/i386/binary/sets/tests.tgz) = 714220aecacd2640160768ae00089cb25b5d3b5cf29f715e32257889159699566fe8d9b3bbcfa7bb6e2864ee1945dbfc61b48a66e20463025774616d91cc5392
+RMD160 (NetBSD-6.0/i386/binary/sets/tests.tgz) = 83c54132cfa9e7b0b5352466070bba098576ff86
+MD5 (NetBSD-6.0/i386/binary/sets/tests.tgz) = 1cf15f457ca67156d7dad0f7723ed259
+SHA1 (NetBSD-6.0/i386/binary/sets/text.tgz) = 0e426ee26f13d2523798fa8c09e934725087dc5e
+SHA512 (NetBSD-6.0/i386/binary/sets/text.tgz) = 2809f127e3baa3e6ebdb181c31620b68d01e90208bd191db99aa9657c91db9a97b061cdfdc2d7a39fbedf2288067f2ed885d6515fdcf8e5b5a68dc754e9b3e30
+RMD160 (NetBSD-6.0/i386/binary/sets/text.tgz) = b30ff1dd8f2cfe414939980d4be3b61f39c04353
+MD5 (NetBSD-6.0/i386/binary/sets/text.tgz) = 2667947b26dffe05f3de7d1e2c8906d7
+SHA1 (NetBSD-6.0/i386/binary/sets/xbase.tgz) = 934f64b717d722045717691a55fb9d295f83b4e3
+SHA512 (NetBSD-6.0/i386/binary/sets/xbase.tgz) = 385cf3a944f4a6ef7271220f0367f12d123d9a2b84ebd3ca46181279f7cf5d544a946df3e10ea52f1e07638c5bc5d0b766fd63bed4e08b468f6ea5b0a75e17de
+RMD160 (NetBSD-6.0/i386/binary/sets/xbase.tgz) = 04203a7b8bb5cd1a41aeeb2b92697677cfe58e98
+MD5 (NetBSD-6.0/i386/binary/sets/xbase.tgz) = ec9f6a167fd05c459f1fdf8cc889785d
+SHA1 (NetBSD-6.0/i386/binary/sets/xcomp.tgz) = 7bc2f4e10afaa599959832c62f024d9f2f45bc10
+SHA512 (NetBSD-6.0/i386/binary/sets/xcomp.tgz) = 148bfb83357133e5377aeee82fdae29e0b90913ba59b1f51264108ca70010d55bd4adc4ce0ba7611a83b5f3f13307f196f724f3cb3a170d7f2caef801b79cc38
+RMD160 (NetBSD-6.0/i386/binary/sets/xcomp.tgz) = be8c61b5890936fc93dfb88c02c5f17f79f3cc73
+MD5 (NetBSD-6.0/i386/binary/sets/xcomp.tgz) = 9c25f1bf64f97c778e3c87b6e0e72871
+SHA1 (NetBSD-6.0/i386/binary/sets/xetc.tgz) = ea4db636b3919906a00e7b161b2c5f62fe7b4fa6
+SHA512 (NetBSD-6.0/i386/binary/sets/xetc.tgz) = a59442b3ab58c33774197f9bb28a96836b4c519c750270bd880d166250523f8119a68a9de6b6861f76cdf713da9682772e754075c965c56aa260b52ed837943e
+RMD160 (NetBSD-6.0/i386/binary/sets/xetc.tgz) = 28e3ce094b557af508e1ec82ef46ebb01eb68509
+MD5 (NetBSD-6.0/i386/binary/sets/xetc.tgz) = 2a521f73ba4bd630070b01f24c8647d6
+SHA1 (NetBSD-6.0/i386/binary/sets/xfont.tgz) = a7a41c82046568a695ba0afeb81d11bf92e67950
+SHA512 (NetBSD-6.0/i386/binary/sets/xfont.tgz) = f46f4c6b4c61bbcbde85333cc714654902263c92e70035545caba3f3e2d5029cb074c8e427c85ea83b8478b19f32b93c4735a7adf64cc75609a4acd1118d0416
+RMD160 (NetBSD-6.0/i386/binary/sets/xfont.tgz) = 8863108bc2cc456cd1298b5317f519c5c6b3147a
+MD5 (NetBSD-6.0/i386/binary/sets/xfont.tgz) = 36e968072dae462efddd6014f9f44272
+SHA1 (NetBSD-6.0/i386/binary/sets/xserver.tgz) = 27fd7ca36d5a3ca94b66eb5fd81ceeaed1648fe0
+SHA512 (NetBSD-6.0/i386/binary/sets/xserver.tgz) = 6a0d364672e4513dbf4c76c1cada80f84e774efa85c3e1fe4865ab26333765fab1db8ce3b590682a3e2c63895165e0d694c3e6717789b2f0ec87defa608930dd
+RMD160 (NetBSD-6.0/i386/binary/sets/xserver.tgz) = 7521930788a2410a2842767b9c2886af83fccad7
+MD5 (NetBSD-6.0/i386/binary/sets/xserver.tgz) = ce3565a1b5e8af09e54ef8488edb14df
+SHA1 (NetBSD-6.0/i386/installation/cdrom/boot-com.iso) = bcfbd8c6288248e55d78704802dfdbbd1d20519a
+SHA512 (NetBSD-6.0/i386/installation/cdrom/boot-com.iso) = 9531877436cf8853db4dbd96672cb13a0784a1eef2a90ab43aeaae421f70bb6bdab7d5c10095f186b733d04ee1184087ff7b5d26ec7ef77d0783ee0f5c0d21f3
+RMD160 (NetBSD-6.0/i386/installation/cdrom/boot-com.iso) = 46205ca4d924c43e85b01b7750274f31fa2ad170
+MD5 (NetBSD-6.0/i386/installation/cdrom/boot-com.iso) = da3da9b120520e631bc5c17dfb70bd27
+SHA1 (NetBSD-6.0/i386/installation/cdrom/boot.iso) = 146e96103568f2ab3e98c1a0c7b98f89a93ac474
+SHA512 (NetBSD-6.0/i386/installation/cdrom/boot.iso) = 5073e008276c0fe9a4c3231bea37b2534e40d20b17d32a5bb30e9811a0578feae08a810a808201f44f74ab7258a58c5c1dfa1cc59ad0d4d41eff02f6772dade5
+RMD160 (NetBSD-6.0/i386/installation/cdrom/boot.iso) = 54ff36aedaa5266fb788b1b3f74dee0799c432f7
+MD5 (NetBSD-6.0/i386/installation/cdrom/boot.iso) = 6d1fae4935084e853fa152e09b472be5
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot-com1.fs) = d4891595c9155d7598f1718cce43ed2fde9d4aa8
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot-com1.fs) = 89d2af1f41e20deba16c1abfdc4709f353021710ae33ff40f9f4f20dd4c875db855f2bddf9af444f49dfb2d1d1caf0a2f3eab7bced113c45708da590092c9b04
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot-com1.fs) = f2d8d259d8abaed540079cb0301fd111462bc0ba
+MD5 (NetBSD-6.0/i386/installation/floppy/boot-com1.fs) = 320d7fcd247eee78495d4bc56205ba9f
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot-com2.fs) = 25012df4758eca3d307004fe1b448bfd1002b6ba
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot-com2.fs) = 3ad3778e665bbb8a0ea8e39d9c6a9144a79fc158aeef0af4bac90ee98561beb460b2f3993c929f27a1f26170be53d153faa0ec523e402bb1143d9cec5a54ac91
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot-com2.fs) = e76b6f6a667e4548f8efdce8fded360a9ab7ce00
+MD5 (NetBSD-6.0/i386/installation/floppy/boot-com2.fs) = 1c731748f3af6300b39311051870dd5d
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot-com3.fs) = 00f812e968818ac87e2f0217b9aa2f67cf1826b2
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot-com3.fs) = ac293ed38646e83851e74e70451893b301fe935fd4ee91fbe2f66d4a49583763ce3a5a123f05e38d0806e6b51c6db01dce467908f7ac49447b872e1a06364e74
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot-com3.fs) = cd261aa83970e5699763ec792aebbc4bcedae712
+MD5 (NetBSD-6.0/i386/installation/floppy/boot-com3.fs) = a9073f83732b763206b32fd46c166fab
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot-com4.fs) = 6d9f052a4ba66b7a8d818418c7548a96b358189c
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot-com4.fs) = 86909e41525fe7744c3e10f523b7bd2651a80a000906e7040bae8fadeed8f2ee00e6d39998aab110a4aedbe9af95aa15eff7a8fd5781b6d979545c7751c54aea
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot-com4.fs) = 64980af391f001e6b67d6b603fd67e3d424a48a4
+MD5 (NetBSD-6.0/i386/installation/floppy/boot-com4.fs) = 9868c40fe2e4e26b0db5eb1a24d4b84b
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot-com5.fs) = e138754c8978462f24c07a3e61be0085592ab1be
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot-com5.fs) = 785ae7b940e77d108d20f4c8f9625db138334144e740ccf15949e4434572115fdcafecce25c3ea9c0e0d260e7d4c526a860bacda09ab8b2823d5d48a3a220b1a
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot-com5.fs) = 9eae2380cd42784b68dba1da19eb8e7a2f37940e
+MD5 (NetBSD-6.0/i386/installation/floppy/boot-com5.fs) = 6f1b2546ecddd49db5fae090706ced45
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot1.fs) = 955c193dc080b69fe111652972bb1a4a5fb88b70
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot1.fs) = bea5bb410069dc463f5d670ca33a8040c6bc741ee30e90c93492ce5110334f0e87cc519571f35f2962bc18de0352c3f50002ceb8346f4aed84069b60c61740a8
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot1.fs) = 3828a790e9743011d6b2f257f79deecee3686c4b
+MD5 (NetBSD-6.0/i386/installation/floppy/boot1.fs) = 83997622af685d71b47e687ee0226d5c
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot2.fs) = 25012df4758eca3d307004fe1b448bfd1002b6ba
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot2.fs) = 3ad3778e665bbb8a0ea8e39d9c6a9144a79fc158aeef0af4bac90ee98561beb460b2f3993c929f27a1f26170be53d153faa0ec523e402bb1143d9cec5a54ac91
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot2.fs) = e76b6f6a667e4548f8efdce8fded360a9ab7ce00
+MD5 (NetBSD-6.0/i386/installation/floppy/boot2.fs) = 1c731748f3af6300b39311051870dd5d
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot3.fs) = 00f812e968818ac87e2f0217b9aa2f67cf1826b2
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot3.fs) = ac293ed38646e83851e74e70451893b301fe935fd4ee91fbe2f66d4a49583763ce3a5a123f05e38d0806e6b51c6db01dce467908f7ac49447b872e1a06364e74
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot3.fs) = cd261aa83970e5699763ec792aebbc4bcedae712
+MD5 (NetBSD-6.0/i386/installation/floppy/boot3.fs) = a9073f83732b763206b32fd46c166fab
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot4.fs) = 6d9f052a4ba66b7a8d818418c7548a96b358189c
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot4.fs) = 86909e41525fe7744c3e10f523b7bd2651a80a000906e7040bae8fadeed8f2ee00e6d39998aab110a4aedbe9af95aa15eff7a8fd5781b6d979545c7751c54aea
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot4.fs) = 64980af391f001e6b67d6b603fd67e3d424a48a4
+MD5 (NetBSD-6.0/i386/installation/floppy/boot4.fs) = 9868c40fe2e4e26b0db5eb1a24d4b84b
+SHA1 (NetBSD-6.0/i386/installation/floppy/boot5.fs) = e138754c8978462f24c07a3e61be0085592ab1be
+SHA512 (NetBSD-6.0/i386/installation/floppy/boot5.fs) = 785ae7b940e77d108d20f4c8f9625db138334144e740ccf15949e4434572115fdcafecce25c3ea9c0e0d260e7d4c526a860bacda09ab8b2823d5d48a3a220b1a
+RMD160 (NetBSD-6.0/i386/installation/floppy/boot5.fs) = 9eae2380cd42784b68dba1da19eb8e7a2f37940e
+MD5 (NetBSD-6.0/i386/installation/floppy/boot5.fs) = 6f1b2546ecddd49db5fae090706ced45
+SHA1 (NetBSD-6.0/i386/installation/miniroot/miniroot.kmod) = 3949ed3ca0384f45c40b59eef585566e947fc150
+SHA512 (NetBSD-6.0/i386/installation/miniroot/miniroot.kmod) = e91e8d4aa8ef1f81945c495df4b43f8bcc669fa1f0183c5d0092d526889d985432d6f318418a42910596f1f44cc0d235d32a0b5e3aa1572198182ff1d90188c1
+RMD160 (NetBSD-6.0/i386/installation/miniroot/miniroot.kmod) = 2d67e98155d79210ae2349fb13937724f79cef47
+MD5 (NetBSD-6.0/i386/installation/miniroot/miniroot.kmod) = 2fbac91d26cec04141c2c79a18aa839e
+SHA1 (NetBSD-6.0/i386/installation/misc/pfdisktc.zip) = e3dedc5211120fdb8259075541a6bf4fdb5a0c5b
+SHA512 (NetBSD-6.0/i386/installation/misc/pfdisktc.zip) = 2f4daa1b52b4f40be868ee04faf9b55f17df64ca03ed0b6577f2f1680692226b68d84c0a9f59fd0b08085219555c25e52e447053a6e03589957718b954aadeaf
+RMD160 (NetBSD-6.0/i386/installation/misc/pfdisktc.zip) = 29ed32ef8b4390bd1545f9337f16994a154c20e6
+MD5 (NetBSD-6.0/i386/installation/misc/pfdisktc.zip) = 33c938480de81999f82a3ba3fca0b233
+SHA1 (NetBSD-6.0/i386/installation/misc/dosboot.com) = 0c89f2a01913cbd69002b821273fe196ff835f89
+SHA512 (NetBSD-6.0/i386/installation/misc/dosboot.com) = 661bb1a057d23a8dbd8f33216e590439e83b8cbc1ee7988980de68890148c8d86b9e58254be366afdc92b8238cf1d304ce972b518e4656ed9a378fa5eb7e03e6
+RMD160 (NetBSD-6.0/i386/installation/misc/dosboot.com) = 11182a8c2c18dc561e9b07f84895e21f81d42aeb
+MD5 (NetBSD-6.0/i386/installation/misc/dosboot.com) = 8d32a69f5a7c200404b5e6747eb38397
+SHA1 (NetBSD-6.0/i386/installation/misc/pfdisk.doc) = 9886ea575769f46c49251fe1b096c860457e996b
+SHA512 (NetBSD-6.0/i386/installation/misc/pfdisk.doc) = a34e971ec8a0d1eb5107ddfa2a5a6c7eb028ec58235983658ccee2e3b42bd2e40e2ff4504a2b6aa16668a918e17f0d1866ca4ef904df114f30674dd9f8e32c17
+RMD160 (NetBSD-6.0/i386/installation/misc/pfdisk.doc) = 9e6ddcbeab7d6894f3173efbc9b1067d40d79409
+MD5 (NetBSD-6.0/i386/installation/misc/pfdisk.doc) = 7c9091037c42ecd0d1fb67275af0650a
+SHA1 (NetBSD-6.0/i386/installation/misc/pfdisk.exe) = e780cbcd893d446cc9d07950e9b9462d9a02e439
+SHA512 (NetBSD-6.0/i386/installation/misc/pfdisk.exe) = 798a00ddfd76ffcae1dd427ebcd9eac6ef4fc54bb0eeeba36ecca3903b9de785ff6113e3ee0960ca695d9a8196dbdd3f7434530e50dd0208d5b872e989038c3b
+RMD160 (NetBSD-6.0/i386/installation/misc/pfdisk.exe) = 4569b5259fb5d13606e521a4d85a0748afa92670
+MD5 (NetBSD-6.0/i386/installation/misc/pfdisk.exe) = 6e470b18a39a3b7bf7c8fe7c34241da7
+SHA1 (NetBSD-6.0/i386/installation/misc/pxeboot_ia32.bin) = a1c0c4f7137ad0c4131aec154c3cdc7fd62c4ad6
+SHA512 (NetBSD-6.0/i386/installation/misc/pxeboot_ia32.bin) = 4ef5af523ac4d164885c4ce7ea8286303ce1a60d6225730d98b14f6b96c56c1227bf8bbd4d4ee77ff30645e5f0375aea1f879fc1f61de1263bc5f68e470abe28
+RMD160 (NetBSD-6.0/i386/installation/misc/pxeboot_ia32.bin) = 732aa68a238219b0fa20ac73fed5cdd59ba4b775
+MD5 (NetBSD-6.0/i386/installation/misc/pxeboot_ia32.bin) = d56818a2c96b381e6b907ef7ee5c146d
+SHA1 (NetBSD-6.0/i386/installation/misc/rawr32.exe) = b43acce43bab52a4d7a5cca69b5c448700c3084c
+SHA512 (NetBSD-6.0/i386/installation/misc/rawr32.exe) = c8e466f2a57083a0cd577720f31ec6d84096680e89c824b633f168ccde962be28cc3ec8019cf136a12437b3df92b872a3600266857c4e5c43f12c6989ce3490c
+RMD160 (NetBSD-6.0/i386/installation/misc/rawr32.exe) = b0cafd5f6dab34b71cbd5885821188bb8479bdc8
+MD5 (NetBSD-6.0/i386/installation/misc/rawr32.exe) = a38e68ebd955604d1b4e137c8eb63dbc
+SHA1 (NetBSD-6.0/i386/installation/misc/rawrite.c) = 45e127dcd24e3a5666d1d4fff54349ca9bf5c077
+SHA512 (NetBSD-6.0/i386/installation/misc/rawrite.c) = 05315a055d1b95bb409c986e3a4faa0ffaf407a239ca32638b8df05757af480cd409abf141cc9b695bf2f61ececbb0de07737a9a927e8c9d9e9f78c39a54c9a1
+RMD160 (NetBSD-6.0/i386/installation/misc/rawrite.c) = 424511ff8fe6118c147cda137803fbc3bdea34a0
+MD5 (NetBSD-6.0/i386/installation/misc/rawrite.c) = 606e8042f2343028bbe2fbb7db391c53
+SHA1 (NetBSD-6.0/i386/installation/misc/rawrite.doc) = a5d3f4916c427ec4ec93d3b1e044f8141ed83dd8
+SHA512 (NetBSD-6.0/i386/installation/misc/rawrite.doc) = ccc3a2b7daadd7527e048de382bdf37580fc8069f5ad2e9f5f8feec5e50374ad2c8a8cbd293f38fffddb08a84573f13ed1152695f64a9c4b745c6e6dae793401
+RMD160 (NetBSD-6.0/i386/installation/misc/rawrite.doc) = 892d37aa0401f9d42effec57944c007e7a6d530d
+MD5 (NetBSD-6.0/i386/installation/misc/rawrite.doc) = 0006cfba390f738eb0d4f6c2fcafb7c6
+SHA1 (NetBSD-6.0/i386/installation/misc/rawrite.exe) = 81152a9688b5fdce26ba09c1685ffa842e31c83d
+SHA512 (NetBSD-6.0/i386/installation/misc/rawrite.exe) = 76ca20eca1b087c8d583b23c52734ef6db49f15d5bbbc4da0eef301b2b46fad5b86c063e4d868bf3db41c625e022c4604759e1a1bc50c9caff2665eaecf11920
+RMD160 (NetBSD-6.0/i386/installation/misc/rawrite.exe) = 2b5707df5c5a7a84b8e80fafb03442fd29ca3eac
+MD5 (NetBSD-6.0/i386/installation/misc/rawrite.exe) = 7dac6ea496014d32dbce6c50feb254ca
+SHA1 (NetBSD-6.0/i386/INSTALL.html) = 6b92ae0724869e0b33123151562db113ff87310d
+SHA512 (NetBSD-6.0/i386/INSTALL.html) = a3541d32c0c954af91d5af22c7b1d134096a4d87f61baa9e76d192aed5461f5a44bca260dfabc3cf1979b9736958ea2d4467a5f98023bf816ea9915c6ad81786
+RMD160 (NetBSD-6.0/i386/INSTALL.html) = beba55314f919265ffba84528a2ed7b2ebc2ef7d
+MD5 (NetBSD-6.0/i386/INSTALL.html) = 5597002f70f1f3e1905becc1a21b5046
+SHA1 (NetBSD-6.0/i386/INSTALL.more) = fd226e8ade97b7071048c7f3a71d68b8f2fbc440
+SHA512 (NetBSD-6.0/i386/INSTALL.more) = df5bfc36c307a943d5def074292619b8b9452b7d8ad612feb6e3aed63534c5698701fa0008e007f6b08a742141643b2d9d82d3386a1194421c556a499e12b1b6
+RMD160 (NetBSD-6.0/i386/INSTALL.more) = 811bda03f587e977180da84b2ee3a1715e059a68
+MD5 (NetBSD-6.0/i386/INSTALL.more) = a080d66a0f33055ae14ac59dd13b6c11
+SHA1 (NetBSD-6.0/i386/INSTALL.ps) = 81b57f86901189d2f513553abf30858d95ce11d0
+SHA512 (NetBSD-6.0/i386/INSTALL.ps) = b2fcab6677f9949755c9aa702719c0572c7a7198c926e8d50103e513f2c44ec92b11147488eea8a1f0e5f04c3e024480cde2c47e538137b99f80df27f9deab91
+RMD160 (NetBSD-6.0/i386/INSTALL.ps) = f7e87587ad8249b5f71b89988802cbff68e645cf
+MD5 (NetBSD-6.0/i386/INSTALL.ps) = 134248944ca4bca697eeb3aaa49c1dc6
+SHA1 (NetBSD-6.0/i386/INSTALL.txt) = a1072904f9c7baa1f3b9136a12e7b8fe7821f757
+SHA512 (NetBSD-6.0/i386/INSTALL.txt) = 4229cbe31deb065a67fd10b737e4acb0784f9a8b31546e4c9d8b41fd002e81a9d48acf08a455dfa488669358d19cc1daa5c329cd3ccad5bfa1471432656fc70f
+RMD160 (NetBSD-6.0/i386/INSTALL.txt) = 2dee238856637d6990f33f3aac177f34478c6ff1
+MD5 (NetBSD-6.0/i386/INSTALL.txt) = 92702556c5a08e156b8eae602d975fdf
+SHA1 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.symbols.gz) = c4b53dcc495fbb67f30084776444088c6fa69af6
+SHA512 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.symbols.gz) = 08dc9f41dbc5f88e4e4d718880f8ac072ee9386daf727cd717b7276c88443dbe194781b062cd29409a964737cb8b27f0b158dfefbcb1b4226f9bc40deedd1f19
+RMD160 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.symbols.gz) = 5d66efd39a08359a525748ecd06b42705c53028f
+MD5 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.symbols.gz) = e819b2d7af2bddcf3d4cf935724695f0
+SHA1 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.gz) = 0494a909caf1ca5dec73b1f5aada6ef099653a7d
+SHA512 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.gz) = 5ca8f4fec7a5b89369934e081f7316c4e482ef7090ed8904f0985e941e20bf42fae8396d7da4151b78234568b0a735667b56f7b480fa37d1bba36b594d3d71f6
+RMD160 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.gz) = 2ff1c7a5c604f56f85ff3ade294e3cb55c053ac3
+MD5 (NetBSD-6.0/ibmnws/binary/kernel/netbsd-GENERIC.gz) = d4f4dfb62bac44f16e9bd16c7df8a501
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/ibmnws/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/ibmnws/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/ibmnws/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/xbase.tgz) = b7c8146146ebc15191c1bf53f51f8f980fe8c816
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/xbase.tgz) = 091f5d00414a9ad478811bfb0e953f2a204869bc5e310790886a59c11953974cf7068cd9a96c8823856ab2687ffa2ac31e97494f47338bfe31d80217382c59f1
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/xbase.tgz) = 4bd1bfdc7c1e1619de63fb83276c21039b945357
+MD5 (NetBSD-6.0/ibmnws/binary/sets/xbase.tgz) = e621806afa0fcc9cdcef0f9b3c7dfcbd
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/ibmnws/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/ibmnws/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/xserver.tgz) = 05aac7e617e0cac05a88062fef29bb459da7a1d1
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/xserver.tgz) = 19fb5af5d6afd78839a22e5c0694a492047b5200c569cbf58c676ff32ec250b21edcfe2ed00b65092fdac374d1ab9eaaed6113c69bc03009cf458aedc6014913
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/xserver.tgz) = 774d2a1072b8d122790ad189a6d2ada2ad99e7cf
+MD5 (NetBSD-6.0/ibmnws/binary/sets/xserver.tgz) = 3daf1477cadf3593e9ba45e3703fe8a5
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/kern-GENERIC.tgz) = c9804814e9b76392c467295e0700798f7305d9ea
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/kern-GENERIC.tgz) = dbe66f41c0023cf48726763c0accca7d17146888cef03f6bcd8356f48bca2a5685e60224e3369fcf4ebc524843a9e3a2df558199a4b2b1a43cc7b22931c52c5b
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/kern-GENERIC.tgz) = e054c430a723e57798b9f13d852d6be6895a6b18
+MD5 (NetBSD-6.0/ibmnws/binary/sets/kern-GENERIC.tgz) = 9bb6d0f70b522f8bdfe0da0855fe12b2
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/base.tgz) = 150b9b1ed403c611d17b3bf258f7bf064f3f76c6
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/base.tgz) = 7c9eb4dbb9e770395ea516b27dc37c86a34d10437bfbc59bd6b55ebd9a3565e470ee7553a238e69012c7eb19f1fafe3bb94d750c642c179190566d0b97ba79f7
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/base.tgz) = 6f959eb6b88fa607c19c9ab5e0b82d172960676e
+MD5 (NetBSD-6.0/ibmnws/binary/sets/base.tgz) = 1d2ccb914175ffb1a6e90e787914e08d
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/comp.tgz) = 449a6e0ccfaa3b9105912d05d4204242bab79635
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/comp.tgz) = 5ceb6d751f429f466ae15f98244e82f32461f7f0bf546c982a1e35bcfc4c6c845a121ecf07b387189fa4173d672e0291a0d396010f5c6ab9130f3264ef26f36d
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/comp.tgz) = 6d544592799a77914a724215f8514f0d22bae2b2
+MD5 (NetBSD-6.0/ibmnws/binary/sets/comp.tgz) = 84f35afba48084d9eed192a484616382
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/etc.tgz) = 4ec9d5606ead158c85791c298c829a030aaa6acd
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/etc.tgz) = 2786ad3a1aca388352f2c4fa1da7da624d9762c4d8c7deec54441bd3ce95c79cb2ccd6fd15619a224987f9726c66d5a88b825e57b69b68aac7033ce80c96af3e
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/etc.tgz) = 25c6401fec22c9ec3f2bc6c3d33127b9222def9b
+MD5 (NetBSD-6.0/ibmnws/binary/sets/etc.tgz) = 9f83cc04c872ec0e355e2528387cdcac
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/modules.tgz) = fef0894685186ef94fc691e71a8a366fe7bb66e0
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/modules.tgz) = 0051ecab124fbe7a4a8005ae4fddc9b4be520e6be5c34cd1811f6c280e35f10d79914756f5106a840177b7cc33f39db337c3f461f00669c1838a6ac0c2204ee5
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/modules.tgz) = fce29d3683f7e0eec8e0b45c94bba924bad6b5d7
+MD5 (NetBSD-6.0/ibmnws/binary/sets/modules.tgz) = a47b110fc0e721d6849bb6fa4d3a7ab3
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/tests.tgz) = 3eb8ca45b13b0c43f1d9e10322b8b8469859ffac
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/tests.tgz) = d9d2bc61ad2f5ba8ca9bd4b53c348b01fc4f7dc7417d14fe7c6c3f68b2a0ff32221bda546b9ca26a0b998ee72a393e3231de17c94bd1e72a0bc6365dba42ea5f
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/tests.tgz) = 8348b43e8543ad7ab8ba46978930fd7bef910c6d
+MD5 (NetBSD-6.0/ibmnws/binary/sets/tests.tgz) = 5cb30f9ed33e774f3c1bc14cea070f34
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/text.tgz) = 38ca726175c32d5ef01309254f51584001f2888b
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/text.tgz) = 78102b1494c3e0d92ee40eaed00cdf6a4cd9e6d5dcfe2f523442fdce7f46d9de2e63c9ee5e0ba90fbae71509518ed2d212a0eab357f0a235ad8b4339b8f74bc6
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/text.tgz) = 9532b62eed56ed6308d0b564552a77239ddcc406
+MD5 (NetBSD-6.0/ibmnws/binary/sets/text.tgz) = 25b993723182c6c3fc4c4c7d5544a7c0
+SHA1 (NetBSD-6.0/ibmnws/binary/sets/xetc.tgz) = 6068a07bd5602c1e57dcce29ce0a58ab8d6fc63f
+SHA512 (NetBSD-6.0/ibmnws/binary/sets/xetc.tgz) = 2bc55ed596339c00a303d972145c4621db7f5781f7f4bf7bd8cd6ca634cd397f8b603c83b2f607f9a65c73cc237b16db0fa3ac30f28ed898d555224355741f4f
+RMD160 (NetBSD-6.0/ibmnws/binary/sets/xetc.tgz) = f5b7f09b378d534eb6436d76a135192dae3cae0a
+MD5 (NetBSD-6.0/ibmnws/binary/sets/xetc.tgz) = 1c3134612470159dcad9c60e9e0664d9
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-amd64-install.img.gz) = 0fb40298c03dc94850911ccf296f74b4daee6ab1
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-amd64-install.img.gz) = e0cf82777d65c1f8fa2776a154f297f8cadcca5c8ea8064adf0ac87b51f5999af8208fe284e95478d87f45d68ece4c63e82611d624514b96a9e236bfbe2aa56d
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-amd64-install.img.gz) = 0f38bf9ac003bdc7b7a73a1321af35f77e498de4
+MD5 (NetBSD-6.0/images/NetBSD-6.0-amd64-install.img.gz) = 05aa2e9948e5f613ac8942f04f5703b3
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-acorn26.iso) = 3d532f8e1c0d8c70ac0204a0e30352946d5b4cf8
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-acorn26.iso) = faac85c94da6ff71b98f6ee934aee21d972c52b4ecf1a1bd39609b31ac80956fed51442fa34e423c432fe6a2957768df5db91585c0edd385cbd4e13f067eedfe
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-acorn26.iso) = db40e23e1cd76af703d18f9e9fadfb7bad0bdbc0
+MD5 (NetBSD-6.0/images/NetBSD-6.0-acorn26.iso) = c3adc16971c37d3319e62fe83dbc6fe9
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-acorn32.iso) = 1b8406a3ddc779f865e4edca16d6e5cbb0b33728
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-acorn32.iso) = 8c15a060921d1339eb814456955753badacc1db25f84f471ae66106f78f3ebc22f017ec1ff9af71cf1c59ad9a669943210967105e2669ba9093596e6b2009020
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-acorn32.iso) = 58b72463d91d486398514eac65f3cebb2bbcb0db
+MD5 (NetBSD-6.0/images/NetBSD-6.0-acorn32.iso) = eef67583eee51a578d4f6ce69864fd25
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-alpha.iso) = ff793eb5257ba6f7c3ca97049cab973dafc70785
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-alpha.iso) = e2fcfb789c6c0bf801cb02b1a4f9d133902a9d78be3458b19e12b8050c0686cfae37d2ad4a5661ffc3cddb089e7079d0bfe5b0c7fddbc0ad7c43abc250f21db4
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-alpha.iso) = 50a4b3f98483a0ff94e2c6c4d93615069d2c4953
+MD5 (NetBSD-6.0/images/NetBSD-6.0-alpha.iso) = eacfcb881765bac2c8fc45e1650091a1
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-dreamcast.iso) = dd89f98a8bcd0d8bdc9861682227cd1e48031db3
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-dreamcast.iso) = f18e432d93110b9cafe06c1a5bb13a27b028a5a773bc9ddfc59685737b2939f4ebf30de6e8e7fc5d6bca2f16b576af48cd2aa62ebd791b28d499b008cb5f11db
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-dreamcast.iso) = 763baa9e578be882dd458c8879f42745cf6ff2f2
+MD5 (NetBSD-6.0/images/NetBSD-6.0-dreamcast.iso) = 19d1400e0b92a906c4f01cae132e5d22
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-amd64.iso) = 78d8ca5aa25eef0bdab5c794550e7c43637169a5
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-amd64.iso) = f4900e8effcb1f5b5767873976dbb231a07346f48df20f56a8441942a91ecca0b6ea1309e01ea6a67b0513e61ebe3b8501b436063676558f119735f6d35592b6
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-amd64.iso) = 76a6c030ca86c7d5abdfe91568a543d3bad04ffa
+MD5 (NetBSD-6.0/images/NetBSD-6.0-amd64.iso) = 9155899df5ebc1a69c7f13ef004677a0
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-amiga.iso) = 7a81516c832299ddcfa8b364422e82a63b3869df
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-amiga.iso) = 6695416ad0dbe2bf03bb75df8b40b04cec9179d2f60aec0b1a5e8f56ad12995911158251cb78c67d62d60324e8708c85c02b84ba0fcffd3fcf73a69aaa497b0b
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-amiga.iso) = 72c96741b1fad68368043e16d21ff533490b8275
+MD5 (NetBSD-6.0/images/NetBSD-6.0-amiga.iso) = 6b214d3da92f2d84210ac00c4eb9650b
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-arc.iso) = 09dd2c85bf2772333ec299e45dec5c016dc22d7e
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-arc.iso) = 6eaab9510f8ea92a175115377924dfb7806be38c78d12920a86e6284bc59bf0711adbb5b46809eb48fa8c299d8c9683b777ad16fe78c3e4760adc6ff605941e6
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-arc.iso) = d4f2d0301da83d93a18cce50be4a878cb5955202
+MD5 (NetBSD-6.0/images/NetBSD-6.0-arc.iso) = a4c2332dc064e7d8cbccb921af5c2022
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-atari.iso) = 9976598eb68ec6bb90329161c3ffad985e2b3c35
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-atari.iso) = ac4951dcf3f148925c19db7bc7027db69549ac90e57db25994c7de5959943476eff7eeb0c490ca7b3df4b6f7bc0604fb5515c337e776a384d5b6a8169e92bf47
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-atari.iso) = 35d389ebb1ea02751e819cd76750a1116d472b1f
+MD5 (NetBSD-6.0/images/NetBSD-6.0-atari.iso) = 44c8de8283cccb8a576242adcad878fc
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-cats.iso) = a1f0554b7193949055ee9cb35eae529893bfc8a8
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-cats.iso) = 7a38bfe0e1ff3948579dbcceed822634e3352e690911052dcf25f9b8746f457f1acb80830b6ca22637c559948eb8fb1eab8c9434225f13c000204879b9edc16c
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-cats.iso) = 2116103ecfe4c450432b7c1bad8787aaa6149a51
+MD5 (NetBSD-6.0/images/NetBSD-6.0-cats.iso) = ebcfe064bb40fc87487654d7f8ccc15a
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-cobalt.iso) = d5e6a8be8cfcef7362542c2ecbfe7e0173845061
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-cobalt.iso) = 28181b68559432a4c566bcc9f71a5ed2b00a5d7118073d114ce4085f39d2139ce50e6b843beb46a59ab4e55aab4ead1e2fb952610f633fb77ae87edb5d2c3d76
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-cobalt.iso) = ddcff88c659b8f0190e66ed2df4014395bf819e7
+MD5 (NetBSD-6.0/images/NetBSD-6.0-cobalt.iso) = 5975ccac715d36432aa101e6c1c745e4
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-emips.iso) = 0c9a09ee73ef6d90af39aca9513b539a79e7c505
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-emips.iso) = a0ec2048ab0c44ac69722b79b56308781e9f298fc3366bd628d4cfeebd8891e08091e8d86a576be50ccb12b1ae48263f86c8f0bf42d743d040a2407fb21039de
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-emips.iso) = 2d0e11edc64ceb8af1fc7239a9390868e1febfae
+MD5 (NetBSD-6.0/images/NetBSD-6.0-emips.iso) = d5dbd826114f5e530d171761462718c6
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbarm.iso) = 95e132f2d72a36eadf98b59d6883cac167d22887
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbarm.iso) = 5c3a43f9609687ac5e5f5d5f21cdc798dd75f0d89bfe3a4d46ee151f60e13a90e2059d9906efcc5831f5e7ef0c267c3615737da03cb781eeff39dcff518b4114
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbarm.iso) = 99c9115a98e45e96730163fde4fc90f37ef11e26
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbarm.iso) = 1bb998b53e8a82a28fdefecd4c2d559b
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64eb.iso) = 0ffea2aa4fb1fc1d58b87259e56080caa9fd6996
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64eb.iso) = 2d3a7807156a465c9b2d8ee5d23951f5415984c2bc0cd8a7e06102399ac4b89d247380542efe1148d5bf71bb945c4de005fc64df7ecf2cdc9ce63481a2f10d07
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64eb.iso) = 1de400a05e285d41af9eb1fcb4164932ecee0888
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64eb.iso) = 62143f6b35eee23d62a01b9cd05e17bf
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64el.iso) = 5b0f9688d925754bd79d28226f29dc0057c634b0
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64el.iso) = d4dda568787efe15faa1c00b604c9c262c579ae86f4abd07dcdb796112fa9ca41122efc9c3beedf2281ab1859e11e2ede536d3a7d679a31590021acca4b32324
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64el.iso) = 9cb45c46d6ce9d9cabcee0f660fc1a646f849190
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mips64el.iso) = 320f53af1cf67bf37bf6d962a49aa688
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipseb.iso) = c9894866972a80c2ff9032d21339e3ca59c8d0dd
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipseb.iso) = 04a89998d1cd8e70b045479265ce82b3733aa630d536c349e12b4d12e3aae123bd29cc0a7a6930fe07dc121a89e0327d14c2b78987542f064b67287268300830
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipseb.iso) = 13cc4119e07eb9a8a26666cbf6ae983001cbf39c
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipseb.iso) = a5af80295a5bce15ae2cb3c585891d7e
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipsel.iso) = 09155023a46f527048b17f00f554d64b73fb1d40
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipsel.iso) = 21108a854d7f8ee48d18f8d1fc74886350d1d95ca2eef044f5314570619f108f471c768f93b99b917b887fca4a1d5bfb9f858929c88672faf505ccc6493eef61
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipsel.iso) = c6c4eddd0acb7b311e6bc40a9ef7acea4c8792d9
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbmips-mipsel.iso) = 37b00a36438893f30b98de7327628d48
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbppc.iso) = bba761cfabb03d27837a21a61e681c0a39b82b50
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbppc.iso) = 615d5ba030e1d19c56aaf9152640e652c6aa3ab3609d357b859df61a874125c551ae912f01179f861bae6fa0b09cbb899e9ad689dd62ec7edcd1caec3157d5ca
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbppc.iso) = 4cba6606c2fc9febb684665512c89ff8106790bd
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbppc.iso) = 45b10af76ae7128c4619864237e703fc
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3eb.iso) = 51da3d8f99c84a9e12bab81442a0249624550532
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3eb.iso) = c804c8f1457178bffa1e5b7989a5818381f4911a8fe18a2c75ef9c02b866a9f53be17926faaa4a9460852e482d7a304a13424b8fd6b8013cae15696ebcc24bea
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3eb.iso) = 05f04f2d8e64a4508034424bbd9f6adf795675a5
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3eb.iso) = c9358e63b62edc277bb8e630627fa49d
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3el.iso) = 89dd396a870a8d08bb1ab2a09f9e8b24bb55bb53
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3el.iso) = d9d2018111fc190ab0602e87572e210572bebf2185df101265f29d4ac8bfed8ca671038131eefe125ffacef63924e1274c34fa248b88d01764d138144e768b2b
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3el.iso) = ccc5e6f669147c71f9272cae12d63bb270407748
+MD5 (NetBSD-6.0/images/NetBSD-6.0-evbsh3-sh3el.iso) = d33272ecf641d0c4ced897c2fb4d0ae1
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-ews4800mips.iso) = 029c1d1910dd234ad3b33f8a53557a56779dde86
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-ews4800mips.iso) = 09e0dec1e67c44a29cea4eae8c2e7840906c8cc6881331b720905c71dfd0f8050210568d2e5ad6a325a827a08e1e440d84980cb4b515d76501616c7e3f104cf2
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-ews4800mips.iso) = bd7da2f0e68a488d351eab9cda26f11ca2ddaa35
+MD5 (NetBSD-6.0/images/NetBSD-6.0-ews4800mips.iso) = 1286a5646c2f93fc128c8fabb2244bd1
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-hp300.iso) = 3b62c2c6037a1009b5d417e6f09dfdda2781f12a
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-hp300.iso) = 2a3d668fde1b5098933d0fbd9fe9100092043a81389f6f7b457a3425dfca5cca52382a29434309baae791c908855b1aed99d32f290723172c62f439f68e4fe5d
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-hp300.iso) = 8314b4f992aff06157d9dae5951cce3d6083e6cf
+MD5 (NetBSD-6.0/images/NetBSD-6.0-hp300.iso) = 144eb416cc2563df1330cecf26c19f2c
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-hp700.iso) = d2840fa102cff8b3d5825304818c98ba2ffdcbe5
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-hp700.iso) = 322461efc0e1648c8e4e16c93421831d14937b5ca93f2a6f25405882c2de40482315ee9e4c914a2e9206cc25eade89687a2a248bc60ea1145626272067fdecba
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-hp700.iso) = 11dad584942591d9c719eab0248dba8f71ba8ec8
+MD5 (NetBSD-6.0/images/NetBSD-6.0-hp700.iso) = 93522e82b2562f1f889f74153deccf30
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-hpcarm.iso) = 5afcc737502c47e2a4efcf6a897ecbdee400d3aa
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-hpcarm.iso) = 32bd828c5ef1b50b6a9cdac2a419ef80522625bedd2bbb9f60b8076b7f9bef969af19fe28da9b56b6f552e008700b9fa586e1159706aa6eb4c998b2dcf89384f
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-hpcarm.iso) = 9a609fb57d4c4a2f8fd9aecee475eddaf7e26da7
+MD5 (NetBSD-6.0/images/NetBSD-6.0-hpcarm.iso) = 7b8bbdc89300d63043e233de6d56584b
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-hpcmips.iso) = 203b9953e02574d71e49277b847dfd4b253199cb
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-hpcmips.iso) = 72a2e1eb4f9398c3779a64226c8e442e9628edcc0601b9e0c835af9e2ac31d77217b731c831d8d9bbb2c9322ef28b61194281beb0074e39aaa747610fa065ca1
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-hpcmips.iso) = b384e1bd9b5e0644e1d98f68270a82b47e1e0103
+MD5 (NetBSD-6.0/images/NetBSD-6.0-hpcmips.iso) = fc5caa7af29622771e2451debd59f75a
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-hpcsh.iso) = 1b3ad4689058b56f012dcdf2ec78d046c7469d0c
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-hpcsh.iso) = f2d4686d5560a5ebadbd0f235033bb18db4b291ac9080635e67a8b42328108f0944c69e81ff9daaf28820f0ee98d32c0faba0ba3d397053670f4b2312ba7fdf2
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-hpcsh.iso) = a39e04b9cdcfb2d21fe9ee262756b05f122893b7
+MD5 (NetBSD-6.0/images/NetBSD-6.0-hpcsh.iso) = ca44003562262d681f9eb5e6e3c1f25f
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-i386-install.img.gz) = 43e6d3f9d0ae352b8eaec597e3ab48590a8dd62c
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-i386-install.img.gz) = 2911ec984eb0b74ffc89dea948d2f0ec6570cf0a13790be8ce31bfe7d90cbcf132d9b7fa27bc3202d16426cf15c192c3543db7d108455f375aebd291e5162827
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-i386-install.img.gz) = 7da2b6c329c7e19a96d7473bed4fed2847a9e7dd
+MD5 (NetBSD-6.0/images/NetBSD-6.0-i386-install.img.gz) = 9db5437e777175f3d9fee3370070cca1
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-i386.iso) = ccc8c4d50aaa0e43724df3b3c3afa0e130164053
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-i386.iso) = e71e4dc1ab41720e04f34ae8f5daccd5441f58efe983683574578b4f6c3019b53060e25e4e4880792f3012e47acfeb7eb0f571d01910435db6a4ac541ede8fef
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-i386.iso) = 4aefd7279ff09f228506f66ac5e91195c081e31c
+MD5 (NetBSD-6.0/images/NetBSD-6.0-i386.iso) = 9b7aca4464fdd5dbeea6d6d85c5ba64f
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-ibmnws.iso) = 766ffac66f62d90b017d02b9f571b27ee002eb30
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-ibmnws.iso) = ba2e04ac3173b765d98a72796f643f2c7fe2fbc9eae9f7a85402e65d731c3a089df5a685ad98603e6e44c72956507bd77939d855f4820bcf0aaa1e705be68ec4
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-ibmnws.iso) = f6c480b79e05eb34818b5f018750c4dbfceb7b38
+MD5 (NetBSD-6.0/images/NetBSD-6.0-ibmnws.iso) = 8cbc5b4e8fd0cd9d6cbf6d77f1285f3f
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-luna68k.iso) = fb688537b94273c74c52027a5bd0e9f0f1d96381
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-luna68k.iso) = 62911e352841866cdadd4f9ebf909cfe496a03ac4f4452f83ed7a96890448a527a0afc3ab199bcc13a12760bbf287b5b367b96ac340d148d522e759db20a7c5c
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-luna68k.iso) = ad5c1f6747d72a83816e13c37eb97cc4b6b0bbfb
+MD5 (NetBSD-6.0/images/NetBSD-6.0-luna68k.iso) = 5373e0ffd08922c1e8e5a1f66908d2b7
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-mac68k.iso) = 2216006dda929d7b66bb2c92549378362f772b52
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-mac68k.iso) = 26d539ab284db402e00b48bddcdd726e7869bd28f717771d45cb6e5934fb069ec98f789a2baab8b7fd76aa35db5f9992f58094b9e3e936c83901e277a4bbe6b8
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-mac68k.iso) = b8cf8d1c1ccbb739ce29c01896a4aa55ad66469c
+MD5 (NetBSD-6.0/images/NetBSD-6.0-mac68k.iso) = 4e06fdc52d82cc401d3b02c4d0232733
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-macppc.iso) = a8697c11dbd8b3811f1fcc8562a9d11a35f4431b
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-macppc.iso) = ba31ab8d00ac0038dc6509661eb39b41d7cafc268b17e9ff75809aac3fc4978fe338b2ee4c2ff59991ae93c11c32cfe019e7309fc507562f9c276172e63492e4
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-macppc.iso) = 36f6b8b12eba9cb39f412ce2cba71ab88a4445fe
+MD5 (NetBSD-6.0/images/NetBSD-6.0-macppc.iso) = ca246495fb1465b57eb93c826063a20d
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-mipsco.iso) = 5f3a351f960e81c829d7bb8f6924b0b912006c05
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-mipsco.iso) = e04111c293c6a3a6df5433aaa8d7883c7f88bf03c868ddccb05ae7c243d9a880e54329d4d995cc5bfc6539fdb7120207463f54c3a4a5c0a317bd12173e0fac18
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-mipsco.iso) = 85552cf47b7eab35619385444e0d76ce8c6ed887
+MD5 (NetBSD-6.0/images/NetBSD-6.0-mipsco.iso) = 7e684c533513710039e0fa96ba70b51c
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-mvme68k.iso) = 48ed08c58863636dcf49ad5728812def96cf82eb
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-mvme68k.iso) = ded376941ef8437fcf37f7ca801f4e9996b4adcd97d9ccc7a16d30c8045880d4e7a894ab5cd44000bb3895950c007669207bfd58bdbde3a11b2a123e5b747c47
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-mvme68k.iso) = cfb7ee4fc9422ebf6dc0c7d73b59dc2b161d58ef
+MD5 (NetBSD-6.0/images/NetBSD-6.0-mvme68k.iso) = 9ee62757053b2cb7f7a1d6ab82db929d
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-mvmeppc.iso) = 5b74dd3e1d76f697d089ad1a769ef8aba17330ba
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-mvmeppc.iso) = a007559063e269c4f27597f27c3bf6dda97f34a33d7e750c2a6fb36bacc0a64b12a0011b0570ae71b5977735de5f1d58de553e5a89ea4f61b6c09fc34e3989ea
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-mvmeppc.iso) = 9d26c663310b2555b8dc544e9b286a7ab80e8bd3
+MD5 (NetBSD-6.0/images/NetBSD-6.0-mvmeppc.iso) = 3c8ab738e662b3b7f1b481a4712c4525
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-news68k.iso) = b40de418e4f4140f31895100674dc69e1b3c2f80
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-news68k.iso) = bfca4085850abfe577482870397af0c964574cb7b426903c5634a747026e1db835fe6db0dde4d8a320438b1f136dc7aa2dd0bd1e05d664c92ddd307b3ad718e9
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-news68k.iso) = 00df7a8b50bb5b4f45b56107db94a559b1571458
+MD5 (NetBSD-6.0/images/NetBSD-6.0-news68k.iso) = a9a9524f9d696a5104d2b9f157f8a416
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-newsmips.iso) = 91c6ba0265d2ab04f60358dbf8fcb388c81e674f
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-newsmips.iso) = 182904027a2e24e0869e0c177915c2d99be87ea8994298f7106940bfde95feacb1ab07e17f0535adaea35d63eb6ec014378bb2777b0a3dc4e15f362038050460
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-newsmips.iso) = 93bedba32f25a7d6f658e396de5b7eb98ec7654a
+MD5 (NetBSD-6.0/images/NetBSD-6.0-newsmips.iso) = c6a0377dfb49f663d7bf657589a68c48
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-ofppc.iso) = 1b0927effa1f68779ec787536f67447574f50674
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-ofppc.iso) = 7cfa755bab97c165f5ed60063d4fde79d90fa4a786cf13d32617f324759719175b909806aac34df32b39a5a443348f020787bce43f4d7600ba9bc65ec00e111a
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-ofppc.iso) = aab50e82812ffe6b4216d9c9a44787d9f0f667b8
+MD5 (NetBSD-6.0/images/NetBSD-6.0-ofppc.iso) = 97772de08fb8020d661192e622e3cf21
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-pmax.iso) = 5293cfe1a34eced76bd825d7eeef7ee55af98299
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-pmax.iso) = 681eb46ded55a111f6ac2f5baa9ebe4f3f6c252ecd20270377b466305402a97f6be47db192e5a05920a17ecbf03c03bb169161bcb75b4813af5a2e10b1becd53
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-pmax.iso) = b61b7ee3525e26f990f4276d689d23469b4639a1
+MD5 (NetBSD-6.0/images/NetBSD-6.0-pmax.iso) = 4211afdc8ed6225b395f65a089347ebb
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-prep.iso) = e1702b470594f9b5955bba78d9179eec12176e9d
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-prep.iso) = 552a43f2a255b844a0a39db0e352dcf04b7df73cbe6eb4851a2bbfd1f5bcdf12d4742ef9f596052fd678ff4adae4c92a1eda71acccaa53c8bf310cf5900dbaa2
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-prep.iso) = 382ff5006df921cb66fc8ab2bf78544c1dc501ae
+MD5 (NetBSD-6.0/images/NetBSD-6.0-prep.iso) = 2cacc13c35c1e406dfe0aec549f97eee
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sandpoint.iso) = 6d866b095f838011b6132d443b602d4b97a644e0
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sandpoint.iso) = 6e6a0eaa9de07b142c43a749bc6257a410f9c7f801c450cfec17fa30c0f7b0f5a925d1c73705a4d2d567451fe5c88304c6e85c4f1ba1c0127b07f9bd0ed452c5
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sandpoint.iso) = a2d052a86ed3bc1a751de334b737cdd1e1661f8b
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sandpoint.iso) = 8a137ad061aba60a2bcffa8b9c9fa370
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sgimips.iso) = eee6aecc9d478d101b20756b5438e858d43f2700
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sgimips.iso) = 3979fa422cd562e6dcfa83eefc072d66380ce1ec10f5534c394c08bebcc977d58d5c27f0f41efe1555570be9eb93e33143df0c1fb1cec47b29f3f8961853132e
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sgimips.iso) = b20388701c9428de38cf7cd5afa7464bb0d5a07c
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sgimips.iso) = 73c4e4f6723ef82859be32abb34b9367
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-shark.iso) = d331eaa8be85d8a112c277ac018d9d0cc88d8b39
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-shark.iso) = 91aacdd54e4ae41cbf71d4a91533bf66ef9dacaf7d71ffa81f0fabec5e98f3f5685f62b75ceac6db51a3da160a4c3e92fe3a5469165fa92c23d76d4e9aebe9a2
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-shark.iso) = 88a248ed7456f4c08fa9581026c555df29c05daf
+MD5 (NetBSD-6.0/images/NetBSD-6.0-shark.iso) = ea424a950e7168c79a2b80152504fe61
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-source.iso) = 09749966ddaadad296254adec70d4f4c01f20fdf
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-source.iso) = d45abaf7551b96232228024a7f08d19943a8912a2383c456a66aff8bde1dc4ec60a3dc084ea4801c6c4691d714e257672f87436d7070a939fbf0fb5b2119854e
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-source.iso) = 002f87e50d6113c7a2820a4888b8484c1848bfa7
+MD5 (NetBSD-6.0/images/NetBSD-6.0-source.iso) = 4d63a05600813e5588720da5328967ac
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sparc.iso) = c60cdabd739d287e3424f8a6e2b671b7b41a944a
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sparc.iso) = 1dd5305519efa2c90341088e26b66b38426ce5e42a066277605abaa0e85322a9af2031ada8faf1e303e7f10f8b29e8765673de14a5a04c4e5f2f6001b7c52241
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sparc.iso) = ba9dc6b22a648f9b0af3c44eed518401b20e50ab
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sparc.iso) = ec7578864447eb816413264ad512b017
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sparc64.iso) = a6a5475eeb3e88d520a5bbed7d62f0067c5fe65d
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sparc64.iso) = 50f36f089ee8c27190512d16ec50661db4136c257c947439d670893fe610a9b07d577a7ab8b9f4d9cd6766e9daa8b619aa3a0f6f95e3abe43a4955dbf9d2d401
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sparc64.iso) = b8dd4236c01dbe061cc0e0e20e71b805aee8b998
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sparc64.iso) = dd2dd0625585e969262fd0c99751c64e
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sun2.iso) = 1c0755c7c8a094769b4c1b50566fa05e4848e113
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sun2.iso) = d37ddcca3ac60bba6e8547c8bdd2029d5ee39517eff1b90534dd02eacb5e5e36b3be9a06b86386d451ee89c2408c151fb55f0427d3ba682b4076dc3f5c8925a8
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sun2.iso) = 4a20723c243cd7dd43c8eb4272971072d21a2efc
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sun2.iso) = c2f9f999646eef2bcf2c9bdb6d2e860d
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-sun3.iso) = db35e360979a3c38984afb91309387fa9a415bf0
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-sun3.iso) = c4a8fde6c486ee8b23a485d6b2947a1620a2f7582df13a255dc8f6fd2860dd93b0e1c2dc3b56387adad49b935999c70cdb293f25f87c2f227af35e158fe6a7b5
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-sun3.iso) = 0ff6f3798f945c797b2ccae534cbece05e3a4d34
+MD5 (NetBSD-6.0/images/NetBSD-6.0-sun3.iso) = 042f8191d0aa3b4ee986408c1bcce04a
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-vax.iso) = 8f43de5ed15d0178faa9b79763c7564d479711c8
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-vax.iso) = afa099641b4684f021c3a94f3a8624c3aad92a8083555ad3bf78028fcb530d08b9b778d96635bbe098c88e6e08be2733d01c4dfca8933d4120e7571dbc715a88
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-vax.iso) = 09800ce94b2007f7c51850e9db87270e0123e9f7
+MD5 (NetBSD-6.0/images/NetBSD-6.0-vax.iso) = 0830c9dc45aa84e08cf97580708cc60e
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-x68k.iso) = 022558b77ecb7c5b6a35aa0e79c6aaab56031d16
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-x68k.iso) = 0cf2986fa2477df206a46bc19f566c6cbe8712ad14fbf40d9d4c20aa104a65eaeb93d73c86ac101125d0c5b5619f53a7296d032f56c15930baf496853b604902
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-x68k.iso) = 5becbb0b0c10a69dfaf131910da0c72a208beeb3
+MD5 (NetBSD-6.0/images/NetBSD-6.0-x68k.iso) = 6f7c0d6afb962d18f61cfafc78f38b12
+SHA1 (NetBSD-6.0/images/NetBSD-6.0-zaurus.iso) = 5c78cce50c6f26c64456228695ff51b12b8cd44f
+SHA512 (NetBSD-6.0/images/NetBSD-6.0-zaurus.iso) = 8a0849c505a0db1ed89fb066f6814f32e9998017cfd684ac38b9027d94ba4a2ebec496ba1ee194e0f98d176820077ea50c5a45cb85b6f24a1d1a2b14e9a0dd1a
+RMD160 (NetBSD-6.0/images/NetBSD-6.0-zaurus.iso) = f505c50d0049b053abd5fce076e0e67dcd13c2aa
+MD5 (NetBSD-6.0/images/NetBSD-6.0-zaurus.iso) = 5e3a023090f8b8df40a7372dc1749b81
+SHA1 (NetBSD-6.0/iyonix/binary/kernel/netbsd-GENERIC.gz) = 235873272a098d18934590d26ab5c636859262ad
+SHA512 (NetBSD-6.0/iyonix/binary/kernel/netbsd-GENERIC.gz) = 0a4f296210a18785815dc51d191c97aa069403e2e0460038f6dc59a65a97f39d9345abf0e793a12dc562068a7eb0d825881030969ea43a48775704958700ee86
+RMD160 (NetBSD-6.0/iyonix/binary/kernel/netbsd-GENERIC.gz) = 1c5a2e39c1876ee7b46a9ee9751da1d418c2a607
+MD5 (NetBSD-6.0/iyonix/binary/kernel/netbsd-GENERIC.gz) = 5f2302d30d7dcfa644d62c656eeb33e3
+SHA1 (NetBSD-6.0/iyonix/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/iyonix/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/iyonix/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/iyonix/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/iyonix/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/iyonix/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/iyonix/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/iyonix/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/iyonix/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/iyonix/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/iyonix/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/iyonix/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/iyonix/binary/sets/xbase.tgz) = 875fd641f969ec00f854ca1334d084947450c740
+SHA512 (NetBSD-6.0/iyonix/binary/sets/xbase.tgz) = 75d0c9e9685b6b7bb706df7427c8b52f59c4fc4d0e725b02ee18024f75a546dc41de5f1a5d8552a8d2c84bdf87856e5857b0f12914801ca7b36b69536d617b4e
+RMD160 (NetBSD-6.0/iyonix/binary/sets/xbase.tgz) = 1a4d099d59b2bd882e99f1b2df1c7bf22b890d48
+MD5 (NetBSD-6.0/iyonix/binary/sets/xbase.tgz) = 5eb9c573c5a0c96701f268a3470a58b9
+SHA1 (NetBSD-6.0/iyonix/binary/sets/xcomp.tgz) = 8d7469a85b7433c89690cce74e6b3f4e66cf0647
+SHA512 (NetBSD-6.0/iyonix/binary/sets/xcomp.tgz) = 411304cf66e300a7f162128203099bb4d6eebc4a93ba18ed7caf79f30b31cc7ffcede85c4e1bad02c3f5f8a27d009fb71f3ce5862c1d8aa477f39a25c535fdaa
+RMD160 (NetBSD-6.0/iyonix/binary/sets/xcomp.tgz) = 822d26e0ee08b72ca8b991f0709a8c1bf0399208
+MD5 (NetBSD-6.0/iyonix/binary/sets/xcomp.tgz) = 5af361f0334d28119d703064278b3ed3
+SHA1 (NetBSD-6.0/iyonix/binary/sets/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/iyonix/binary/sets/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/iyonix/binary/sets/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/iyonix/binary/sets/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/iyonix/binary/sets/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/iyonix/binary/sets/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/iyonix/binary/sets/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/iyonix/binary/sets/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/iyonix/binary/sets/xserver.tgz) = 4ccfef1d49179603286042088bec0218c6b2031d
+SHA512 (NetBSD-6.0/iyonix/binary/sets/xserver.tgz) = 809fc0a9065c1b9e7cd17aeb0d41cfd3158efd6c585556af01c4a3c93f0df3646a2ff77c6994449a703a408c0988fc1aa68cf34c7e297a3056d73ded57034c12
+RMD160 (NetBSD-6.0/iyonix/binary/sets/xserver.tgz) = 403604404261764c74f10fab774c4653fd20cc9b
+MD5 (NetBSD-6.0/iyonix/binary/sets/xserver.tgz) = 914f909b6878cef16a92765a8cbb52ca
+SHA1 (NetBSD-6.0/iyonix/binary/sets/kern-GENERIC.tgz) = 13354b2863a67ec38b91a8b8cab2ae5081cf68cf
+SHA512 (NetBSD-6.0/iyonix/binary/sets/kern-GENERIC.tgz) = 02ad11423d70de2c4b1e937bfdb6348af4025c026513f4f05768f2344997a4414896f10b72af056410dcc62d8760449c2dd47ff2bd37d0e4011d45a1fe0e98b1
+RMD160 (NetBSD-6.0/iyonix/binary/sets/kern-GENERIC.tgz) = 4a98f89230f9faaf839d5b607097d7612aa6741e
+MD5 (NetBSD-6.0/iyonix/binary/sets/kern-GENERIC.tgz) = ecfbf309ba59a5ed39e46ed54b8173e4
+SHA1 (NetBSD-6.0/iyonix/binary/sets/base.tgz) = 697554f5182bff135cb94ba8c99b29d719aeefc1
+SHA512 (NetBSD-6.0/iyonix/binary/sets/base.tgz) = 52b73ea3de1d96f706a48b02e7cc6234576d5bad72828ef34e61929c460ea839f6051e3a650880307a86757f35265c2a33780bbe4640d301f70a4ebae06c7e8b
+RMD160 (NetBSD-6.0/iyonix/binary/sets/base.tgz) = 7e7a5a24095a326e8998ba95c291c5380a89600f
+MD5 (NetBSD-6.0/iyonix/binary/sets/base.tgz) = 74682becd88ad5b73b5434940f1e8436
+SHA1 (NetBSD-6.0/iyonix/binary/sets/comp.tgz) = ab05d7d706899d1a555b6ec101f6d13d7f13ad97
+SHA512 (NetBSD-6.0/iyonix/binary/sets/comp.tgz) = 246d589d8d3c37375496ddd3e15da6a5bb101bc1405c13ba2751818555eaad37c403e27437326bac2ff3c20763c95a49df0bfdb324faf3110c7ec01d7676b78e
+RMD160 (NetBSD-6.0/iyonix/binary/sets/comp.tgz) = a5835f803a5c74d6484e7171085460b803705e22
+MD5 (NetBSD-6.0/iyonix/binary/sets/comp.tgz) = 53c3ef4ec81bc6b1f89e15081ad4bb48
+SHA1 (NetBSD-6.0/iyonix/binary/sets/etc.tgz) = 7294ce630333a9bea7392c5083118cc68bcb5732
+SHA512 (NetBSD-6.0/iyonix/binary/sets/etc.tgz) = f1699017e37109605eecfb44174327a974f1a7a741e16f67f387170ddd1b2c661c58bd9b6dc0795153e828ef52d16cc45b37743cb86be98623da38736938061b
+RMD160 (NetBSD-6.0/iyonix/binary/sets/etc.tgz) = 1a9cdec0a39de8c3d0b2ec63b7c674bd597e67e0
+MD5 (NetBSD-6.0/iyonix/binary/sets/etc.tgz) = d655e4ef20778005efe66b02cdd5f471
+SHA1 (NetBSD-6.0/iyonix/binary/sets/modules.tgz) = 2689f2acb9a977df7801394cd49f6f84d93fab8a
+SHA512 (NetBSD-6.0/iyonix/binary/sets/modules.tgz) = 853553a5ae0acde4b24a80372c1fa71777ede655a76c60f1d2bc835df50fc2ff03270a5edca72c492fe07a3208a8680a10277b83fab4e7a3f064ded4c91cd151
+RMD160 (NetBSD-6.0/iyonix/binary/sets/modules.tgz) = 4d2d0ba3492b751accda0a03daef7cba859f223f
+MD5 (NetBSD-6.0/iyonix/binary/sets/modules.tgz) = 129dd8d6331eacc63934568b1467edc9
+SHA1 (NetBSD-6.0/iyonix/binary/sets/tests.tgz) = b54fb7a814d7bebe4a40a00c17253d0bc6ca4544
+SHA512 (NetBSD-6.0/iyonix/binary/sets/tests.tgz) = c99e6c4b80fc2d6a0f236f324f844a562db128876a5b89ced62097a732b273fb6d9af8fde55f3e949768882cb31fab2918cd731f1259b67a1b2548030417c2de
+RMD160 (NetBSD-6.0/iyonix/binary/sets/tests.tgz) = 61ee29ddcfd0268fb7ef37829aeb75e3152b76d8
+MD5 (NetBSD-6.0/iyonix/binary/sets/tests.tgz) = ce8b49fc2bfd31965b5b989de17d5cd1
+SHA1 (NetBSD-6.0/iyonix/binary/sets/text.tgz) = 6f119b3eb99d94a4aa41b5bde28856b3daa83d84
+SHA512 (NetBSD-6.0/iyonix/binary/sets/text.tgz) = 03a29fcc5ba8ce7d6ab590d61bc0a3f4dbb9bbce89d4e8cefc00cf398fa92e2363f3e3fa5da4cc17d3bd9195434c5a951550c6091b1168614a6a0b2831f3f881
+RMD160 (NetBSD-6.0/iyonix/binary/sets/text.tgz) = 2a1331121dc41105accbf9b491bcd4aaa3589907
+MD5 (NetBSD-6.0/iyonix/binary/sets/text.tgz) = 9bd5612ff2228f1bfee64c0f6a872fe4
+SHA1 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.symbols.gz) = d9440af1a917beaff6598eec266db86853625b08
+SHA512 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.symbols.gz) = 982b13dc871a9e562e191ff6d156f202cef18174b66e18adac8e77037fd4edbd29848dfbfec15f94744375b7967bdbd0c5bac0414eac22b78c5ea1fae91f0ed6
+RMD160 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.symbols.gz) = 6320116f0640f069a52a4c52196ba45a306b594f
+MD5 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.symbols.gz) = b6d766477c4b69e1e3003d68a28d742a
+SHA1 (NetBSD-6.0/landisk/binary/kernel/netbsd-GENERIC.gz) = 2f1a4b4a1b4b88ab919ce3addcf2310da10c1c12
+SHA512 (NetBSD-6.0/landisk/binary/kernel/netbsd-GENERIC.gz) = 21fe1b84d9c5c85f3c9d963ce9497d6b8250a3c5789dcf387612089aea424a728503c9adc5e047d8887959be84a8cbbdf397b7f2685fbef2d0fab448238279fb
+RMD160 (NetBSD-6.0/landisk/binary/kernel/netbsd-GENERIC.gz) = e35fb6d1b917230c4b622ea52276a47e2a711d33
+MD5 (NetBSD-6.0/landisk/binary/kernel/netbsd-GENERIC.gz) = b6c0c1333ca3b1a45d3a828f7d18d918
+SHA1 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.gz) = 3348d95ce13a6217331a1992064194aec1775db4
+SHA512 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.gz) = bfa4fa3ab82db17aef5f5b4b818cb8fb5d9101d6709752bd88231042ce3c2c731a452a1360fdcd77d8eb3c0cd7368de7aa359b65b7d35d4f78d8182670de4a72
+RMD160 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.gz) = 95d2efee62025110beb81c829712563b4495633b
+MD5 (NetBSD-6.0/landisk/binary/kernel/netbsd-INSTALL.gz) = 143697e4aa570e39175812011fca30f1
+SHA1 (NetBSD-6.0/landisk/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/landisk/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/landisk/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/landisk/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/landisk/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/landisk/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/landisk/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/landisk/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/landisk/binary/sets/kern-GENERIC.tgz) = 4ed0c44b9ce3362aa10429a75e3dcd4a01963055
+SHA512 (NetBSD-6.0/landisk/binary/sets/kern-GENERIC.tgz) = 1764a9d7ef8a4fc9cc321cecd486f767096a6bc34eb83b3bf3fd24c0383a3df139200560a7846d23bebdc4e02feffe7252a26689b2971964b9240a26abf4acd7
+RMD160 (NetBSD-6.0/landisk/binary/sets/kern-GENERIC.tgz) = 75e8fa6b9c66cec999c28d9242379df0142d0bdc
+MD5 (NetBSD-6.0/landisk/binary/sets/kern-GENERIC.tgz) = 7226e2efa45822998b444dfbce3affe8
+SHA1 (NetBSD-6.0/landisk/binary/sets/base.tgz) = 7cef6d1878fea6a5448eb32456056155477dbb47
+SHA512 (NetBSD-6.0/landisk/binary/sets/base.tgz) = fd16dca9619d1e1a3770486594935e091bc7219b24db8bf91ec0cc8b064f2a201d13dca61b50885e1a2428512bbf510ea7f69a9b8174ac82f511f66c6a8cb70b
+RMD160 (NetBSD-6.0/landisk/binary/sets/base.tgz) = 97e06530ed9a98f0d48746c33db25e2ee0460360
+MD5 (NetBSD-6.0/landisk/binary/sets/base.tgz) = d0e0468ef015bcada5e688057a53efc2
+SHA1 (NetBSD-6.0/landisk/binary/sets/comp.tgz) = fb19c5e935ea83f6c5679796cc9527fa3e435508
+SHA512 (NetBSD-6.0/landisk/binary/sets/comp.tgz) = 0636a207ee4126ef209fee7b5fdbee6eea677cd8b640798aeab5138803fbe8754de69aeff925e3298783409009e6cf8658f9983a213425d397e90f76a93e3f7e
+RMD160 (NetBSD-6.0/landisk/binary/sets/comp.tgz) = 0f4190b6173c8618f7609ba726e73cb041ac75e6
+MD5 (NetBSD-6.0/landisk/binary/sets/comp.tgz) = 7317e108ba56869a21b9d7137605eaf5
+SHA1 (NetBSD-6.0/landisk/binary/sets/etc.tgz) = 25f6f82b594c5d383d45e6c7ee3e0720afe0cb32
+SHA512 (NetBSD-6.0/landisk/binary/sets/etc.tgz) = f2f77e86753a1193cc4c37372a303a88e6c51fd0d3d2e6ffa1927a697aab915c9fd5f1f7ac81137e9182388a6a60912b0b2d6d6975abe0029cf9206367b7454d
+RMD160 (NetBSD-6.0/landisk/binary/sets/etc.tgz) = a5db723013194035deb0e61dc04f6985fcc4a51f
+MD5 (NetBSD-6.0/landisk/binary/sets/etc.tgz) = 92d41bd9cd00823be1afb0d3846e10e2
+SHA1 (NetBSD-6.0/landisk/binary/sets/games.tgz) = 65ef265cc562c21af9cea790c1eb0f7d1ee4ac50
+SHA512 (NetBSD-6.0/landisk/binary/sets/games.tgz) = f55cb863e6bd20e52f04d643199317ffeb673d8ad7a1b1506ccb6d798d6b511766d8188b1a567ab148ad38ab8dfb4516eb624044827880a0c1f289631e9d7f88
+RMD160 (NetBSD-6.0/landisk/binary/sets/games.tgz) = 9a0cfcc234841f9b3086c8e6479686a9e486fe27
+MD5 (NetBSD-6.0/landisk/binary/sets/games.tgz) = 9f57cb59ad62f29327c1f1daf6d8e130
+SHA1 (NetBSD-6.0/landisk/binary/sets/modules.tgz) = 0755c390f758947aaa8fa5942c3600a9c1da0155
+SHA512 (NetBSD-6.0/landisk/binary/sets/modules.tgz) = d20bbd1969460b825f413f06e28280bfc549d74e82287ec6f8b7eb70db2dc8680fcb5f1b42e96e48feda3c377eda9ef4890bcb03aeb2401dc45cc79353826a5a
+RMD160 (NetBSD-6.0/landisk/binary/sets/modules.tgz) = b43dea943dd41ece88282f1a858926afba42f061
+MD5 (NetBSD-6.0/landisk/binary/sets/modules.tgz) = 77fe2185916c4e1df174079291a33e61
+SHA1 (NetBSD-6.0/landisk/binary/sets/tests.tgz) = d5cafffe5049a81843f684c81ff1909669e6e8a4
+SHA512 (NetBSD-6.0/landisk/binary/sets/tests.tgz) = b01eccf78b1fac7ca92a10e6440a80ccccbcbc90dcafc44692d149a0b719c9058de6e1a28207f06fa7db29403552df527c200a27ffda708cf49ae2f2c7033886
+RMD160 (NetBSD-6.0/landisk/binary/sets/tests.tgz) = 0a2d702412e9add961586f2cd87eb2895889cdef
+MD5 (NetBSD-6.0/landisk/binary/sets/tests.tgz) = 7fa1f86aabba0e9ff906164c5046418f
+SHA1 (NetBSD-6.0/landisk/binary/sets/text.tgz) = 753e3063d3a42b43208bfb9ee44cadfbf777b02b
+SHA512 (NetBSD-6.0/landisk/binary/sets/text.tgz) = 63c337c80b7fb440d813803b06c0b34d1a484c1e5a18f1bcf6fe90f3880bde3269c8ed7fb0485405bd9ba618069fbe680163be2b4c53c6d81ff8e263777fd51c
+RMD160 (NetBSD-6.0/landisk/binary/sets/text.tgz) = 83afeda6e537627561023c5570ca05aaa2d3027c
+MD5 (NetBSD-6.0/landisk/binary/sets/text.tgz) = fae31d47dbe89c926a95c602012bcd36
+SHA1 (NetBSD-6.0/landisk/binary/sets/xbase.tgz) = 240739fa38b2f6bf5ff63504fc02b5e006d404fa
+SHA512 (NetBSD-6.0/landisk/binary/sets/xbase.tgz) = 93ace6b1ec640cb33e586a2e3b4b53c46b34efa1c3cb40ac7bde2531a6b253a42fa92564ba203f7f5b725b9673017766ba5a7636ac32e6722a3787559be916be
+RMD160 (NetBSD-6.0/landisk/binary/sets/xbase.tgz) = e76eddb131991fd9641a77469b782e1672370644
+MD5 (NetBSD-6.0/landisk/binary/sets/xbase.tgz) = f0502dec4137d4ba757447285b98f09e
+SHA1 (NetBSD-6.0/landisk/binary/sets/xcomp.tgz) = 06e8daf72bf753e226e3d5df7b47ef8344470c27
+SHA512 (NetBSD-6.0/landisk/binary/sets/xcomp.tgz) = 101b0c365ad2209e8b4520f586a9cd60595b0dfa414c061cf24cfbf18a9455ab6a786f968d3a5eb5f06db57cd9cde4262d5031aaf6d5cdde152ac92c91a31c09
+RMD160 (NetBSD-6.0/landisk/binary/sets/xcomp.tgz) = 3bfd31356e625cbb25f035db41d44d3a4523fb25
+MD5 (NetBSD-6.0/landisk/binary/sets/xcomp.tgz) = 2d4a2c3e4a93d2b1e56e7641bfa730d9
+SHA1 (NetBSD-6.0/landisk/binary/sets/xetc.tgz) = 06a24e45e73bf98cb87b951fe3bfe4a81a1d0793
+SHA512 (NetBSD-6.0/landisk/binary/sets/xetc.tgz) = 72d35ff20eec9cb6674031e31c382ff63fea51f6cb10290a540cb83de5639145faff66119fe7f176ba97bb389b9edf4aae3838f008df9f1b111699fb8555f4ee
+RMD160 (NetBSD-6.0/landisk/binary/sets/xetc.tgz) = e63035911479f2a87f20fe5f030ef31b3bee1878
+MD5 (NetBSD-6.0/landisk/binary/sets/xetc.tgz) = 309875d5ca3be7fb66f2ec0ab6e2e18b
+SHA1 (NetBSD-6.0/landisk/binary/sets/xfont.tgz) = 06922d4fa8af9ec61283885a5040552442f1a0dd
+SHA512 (NetBSD-6.0/landisk/binary/sets/xfont.tgz) = 48790c97453934379e37f2826498b64480554cad16ee807d44e83eed4c53b324659df0cc8aa954ec6f5f5a16ae03209a0c03dcf45db3bd807011d6d16d66654a
+RMD160 (NetBSD-6.0/landisk/binary/sets/xfont.tgz) = 5f1a4142f95c2fbf064d94e11afb0660d17c384f
+MD5 (NetBSD-6.0/landisk/binary/sets/xfont.tgz) = 0a8a39b6c5e1ae9be657196b82c16717
+SHA1 (NetBSD-6.0/landisk/binary/sets/xserver.tgz) = fc311910c92490d19bb81ff540f65370a01cfa9d
+SHA512 (NetBSD-6.0/landisk/binary/sets/xserver.tgz) = 8f8f392ab9696e20149e94dc85061be26982179e63fbfaac269dcb13509d4e9ec44c8188b6f333cad0b2139703c78e1f0919b71394ac6ac2526ce7935ec2329d
+RMD160 (NetBSD-6.0/landisk/binary/sets/xserver.tgz) = 86ec983a4047e7a0c146cfab94df6331f0363e89
+MD5 (NetBSD-6.0/landisk/binary/sets/xserver.tgz) = 2befe5df4dce2ccb1770ac2019da8ec6
+SHA1 (NetBSD-6.0/landisk/installation/misc/boot.fs) = b8bbc9b7108311040a9a3e1bad714efccbdeab21
+SHA512 (NetBSD-6.0/landisk/installation/misc/boot.fs) = 8fbf69cfcb9e7e104c244a8cc2c11d0bc2e2f006eb8a5b8e97267604519fb0e415a9da6bc81a0e75fd30e2ce8fb40a4026a97cbd413de71c05caa1e5f16871fa
+RMD160 (NetBSD-6.0/landisk/installation/misc/boot.fs) = 333044e352899852a8fbb7308a6009c1b5a69bcb
+MD5 (NetBSD-6.0/landisk/installation/misc/boot.fs) = 47ea13afac308dfe956f2d5c16a3a285
+SHA1 (NetBSD-6.0/landisk/installation/netboot) = ca38444ab6911f5b12f0797a6198f082030ba9b3
+SHA512 (NetBSD-6.0/landisk/installation/netboot) = 064115997cd9a49abeb68a811406fad102a2ad325dd1e3ddac075f19e86d04d660bc4f6640483f825310e51d7cfdd90de4997c52dabc883e64f7d984444ef276
+RMD160 (NetBSD-6.0/landisk/installation/netboot) = dad8b6e8b216ef75971c7805baf4b4f86ecfad60
+MD5 (NetBSD-6.0/landisk/installation/netboot) = d29e773e58700dde6b5384464b517785
+SHA1 (NetBSD-6.0/landisk/INSTALL.html) = 5222270ac1c6fa408d5ef0bb7e901d99e916be72
+SHA512 (NetBSD-6.0/landisk/INSTALL.html) = 4011e42ffc09b225893c360690d01099ef76445c496e10c2434e50f8c97755d15038206bd2bc9bb4ee773c24e7b5bb64bf969a1e4ac4e07f4ec84c0beb21bf8d
+RMD160 (NetBSD-6.0/landisk/INSTALL.html) = 48a1b2c374b38629c87e1c04e661e36182caab0a
+MD5 (NetBSD-6.0/landisk/INSTALL.html) = dfa8413fc180b897d13c0964362e7b3f
+SHA1 (NetBSD-6.0/landisk/INSTALL.more) = add61a5d904d34e380a4fcd69cb7fffd24143a42
+SHA512 (NetBSD-6.0/landisk/INSTALL.more) = 4165166b8cc79bd589c80490352c0741edc2087e7560658ea0da993347301f94b3685babd2c40e8927fdd8ca9a58350232dad0cc1ec0c247890a283f1ca191b2
+RMD160 (NetBSD-6.0/landisk/INSTALL.more) = 7416e0e529dcbd99dca03cb901e7038cc60731a5
+MD5 (NetBSD-6.0/landisk/INSTALL.more) = 871f600baa29f1db802884fc26783526
+SHA1 (NetBSD-6.0/landisk/INSTALL.ps) = 734d5c64f3e69a68dd0b987492851f7f915692a9
+SHA512 (NetBSD-6.0/landisk/INSTALL.ps) = a34a07c314fe9a7e4f9dfc296f9e05116675f722ad0aaab757d76c31246a9182398bca5906c3882ff1b14fda9480bb674f12daa90274df9968f2c374d7a2d356
+RMD160 (NetBSD-6.0/landisk/INSTALL.ps) = 88c78a031426844ab1afca9dec3ba7289e994dd3
+MD5 (NetBSD-6.0/landisk/INSTALL.ps) = 446d71c39365e90bf6491895a781a4e7
+SHA1 (NetBSD-6.0/landisk/INSTALL.txt) = f4d9af9565019dda406298ac72875959cdcb1b72
+SHA512 (NetBSD-6.0/landisk/INSTALL.txt) = fe20c04bf5c15d95d5bcf8cafc9efd9ffb07e37ed6234c7abe8a2ff01fae1cb7aca2c4eb28a7d032212a31cae34331d0ce9fad7a3f7a01bb0a9b66e40352f5ec
+RMD160 (NetBSD-6.0/landisk/INSTALL.txt) = 3739b2ac5572c87aa6e8a86c6b33023db1c5e6f1
+MD5 (NetBSD-6.0/landisk/INSTALL.txt) = 7e1c46e08b5773bcd5ecc0717834c25a
+SHA1 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 6d24a14ed0376a5672de20c9c3b64137fcfe3b90
+SHA512 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 5b4957606a4a575aa8c0fea6dbb10df17ef4ac7afa8624c456cc625a0e0e2d1d86c2ca9a4fcf770949933af22cda99479bfab55d383878d0acd8f0c0a260820f
+RMD160 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.symbols.gz) = bd90a974d6697d2921362ed308fef5df89a6a7f5
+MD5 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.symbols.gz) = b5fa03bb653ae6c758c1374109969d01
+SHA1 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.aout.gz) = 1a6b46426c3e93110e9138dc56dbf4e15391c7c4
+SHA512 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.aout.gz) = fe4cf575cd9e08ccf01adec28e38311c7fda42dfd2de5d17f98be37fbac8023b9fa4225c58b5d46728af2f3885825f34068acb82f600447ed60ec54ccc5753ad
+RMD160 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.aout.gz) = d1e8da51257a921f3d3c0ecec9f5a06712018302
+MD5 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.aout.gz) = 1d29443ff1170766ece9a482e2468f73
+SHA1 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.gz) = d36634bfc138c395323135e9c60824b7f987b588
+SHA512 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.gz) = b7cdfcd815eea67d65ea003a2e56fd0a83ddfa1695749a5316566f9e59ef69dd9d78e80c54e99c9aa2db57d8e0ee9a3af43580ed40b45086b357362428e4faf1
+RMD160 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.gz) = 2d36be27f36008788fee498a9c18dbe7a3d66c08
+MD5 (NetBSD-6.0/luna68k/binary/kernel/netbsd-GENERIC.gz) = ca10cc06f8e60b045230888b523f71ad
+SHA1 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.aout.gz) = e081ce3c03ff74c60f2a0ba80540e5b398aac926
+SHA512 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.aout.gz) = a02d1a6974fe702be5e51419440ebdf00bd333b0c4b88cf1289a992bfc21be4f731edb386bdb5e559b5f1fac064e392b97a800431538bd21e76ebb2f6f1c24a6
+RMD160 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.aout.gz) = 0db65548da46e8d651e8b2b9d4ee3b1f95086f61
+MD5 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.aout.gz) = 22e3b4a434ae0bf2e200bd4f6f223ff9
+SHA1 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.gz) = 43172b3e8115db8f41cff2170f4b5d47dd1da8e5
+SHA512 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.gz) = e7e217acc802aff14a3ea852a1dd0f62088dea15ecadc3cc9b335259ecabf352028dfa5929ff139f31f5b299311a5e42e944c0979be0299501caed3592e1d86e
+RMD160 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.gz) = c53f3f5d7e4150eb768b377877d8a8d71f22d156
+MD5 (NetBSD-6.0/luna68k/binary/kernel/netbsd-INSTALL.gz) = 5d3869dcf1301987a12ffa512b626d19
+SHA1 (NetBSD-6.0/luna68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/luna68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/luna68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/luna68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/luna68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/luna68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/luna68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/luna68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/luna68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/luna68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/luna68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/luna68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/luna68k/binary/sets/xbase.tgz) = ffc6dc889560371042dd12a5486a9a2c499b86a9
+SHA512 (NetBSD-6.0/luna68k/binary/sets/xbase.tgz) = 9aa2ba4d703a13020acf8543d1efcde76b6f0f4b411be20f804709b3802e537be1e651eba469830c4fd4777a379ea9936200a3a3eb4b1a702c04bb81aafcc723
+RMD160 (NetBSD-6.0/luna68k/binary/sets/xbase.tgz) = 3ecf53e7414ef859a47fe5afc108cf3bfa82fb1d
+MD5 (NetBSD-6.0/luna68k/binary/sets/xbase.tgz) = a6af002ce158cf72eb5c6a7cde2c0989
+SHA1 (NetBSD-6.0/luna68k/binary/sets/kern-GENERIC.tgz) = dca3d0e2fc1d884287bd283e81bc797ceeb13195
+SHA512 (NetBSD-6.0/luna68k/binary/sets/kern-GENERIC.tgz) = 58388c5d51f6f09f0884904ba8b18ae63374f807312177898080267382141c631e6aa0698a55b427e5673b34fa995cb3d8cd7e77dc1036c9812fe8356f976dc7
+RMD160 (NetBSD-6.0/luna68k/binary/sets/kern-GENERIC.tgz) = d9c5321bc472e64656a250e3e3bd6d72119435ce
+MD5 (NetBSD-6.0/luna68k/binary/sets/kern-GENERIC.tgz) = 374856b19bd6eb0c072c4b25933f5f8d
+SHA1 (NetBSD-6.0/luna68k/binary/sets/base.tgz) = bc10452b7a7a1a24dec1813d74ff78d1d82ae750
+SHA512 (NetBSD-6.0/luna68k/binary/sets/base.tgz) = 5525e21ff9566b0c7ce169e2a087094e41cd3e60d4f67d8ae026c4169cc5b606cb88f600e4410570053dd9ea8202b0da0fd7293fc8c6531c722bb4109accc605
+RMD160 (NetBSD-6.0/luna68k/binary/sets/base.tgz) = d763e9b40ced7122fa0ccb461386a7b7ff1dce1a
+MD5 (NetBSD-6.0/luna68k/binary/sets/base.tgz) = 665d860c4af2fd73227eda7bbfbf124f
+SHA1 (NetBSD-6.0/luna68k/binary/sets/comp.tgz) = c69dde9c6ef3a0ed4457ced09c7016465b0e82df
+SHA512 (NetBSD-6.0/luna68k/binary/sets/comp.tgz) = bbb46b665a23fb728945c51cc19ae85da4e33da19d91ce15ed24d7832258c0cb53f75351c869aa46704cf09245403b9b28fb55624e0b8e28c2e509b653d459ba
+RMD160 (NetBSD-6.0/luna68k/binary/sets/comp.tgz) = c622dbd3522567457fd890414386ebbebf6204e9
+MD5 (NetBSD-6.0/luna68k/binary/sets/comp.tgz) = c0c2030d7bd68b455be0b4094a1e949a
+SHA1 (NetBSD-6.0/luna68k/binary/sets/etc.tgz) = 7d1db50a753d92b90ee1eaf6b4a4f02cab03d981
+SHA512 (NetBSD-6.0/luna68k/binary/sets/etc.tgz) = 86c1904b4007d3a1f4a91f30140a3c6d53af8b90c38c01fee75b679484096079d357e7a71c027464a5d48d4789d9c4a04f3f2545df907953c739a22877ae130e
+RMD160 (NetBSD-6.0/luna68k/binary/sets/etc.tgz) = 52873f9a82119f52ef847e3e27e00ab4e10c68cf
+MD5 (NetBSD-6.0/luna68k/binary/sets/etc.tgz) = cef84e15f32a2bf92f3657f981235991
+SHA1 (NetBSD-6.0/luna68k/binary/sets/modules.tgz) = 9428e74da3601eab14416d01bc4880dcfe21a6f7
+SHA512 (NetBSD-6.0/luna68k/binary/sets/modules.tgz) = ec64bcf7ebed5af30e85708133fcac6f0946aa0ba7175906b1f9ed06c300c23028ba0ba1957c1e4fe6d4c7a99877e7ed104b1439cec728db79fe9f3cad3eccb1
+RMD160 (NetBSD-6.0/luna68k/binary/sets/modules.tgz) = 8060c8587dfadee593f84db43c0e63acfc259e06
+MD5 (NetBSD-6.0/luna68k/binary/sets/modules.tgz) = 1477ab794d1c6494bb5a9628820c4c08
+SHA1 (NetBSD-6.0/luna68k/binary/sets/tests.tgz) = 8380e48719aca55a72f3f91629e52a774eb7e4d7
+SHA512 (NetBSD-6.0/luna68k/binary/sets/tests.tgz) = eced534537094e8ee83154a5319f89f4cf8e46bf8715ff6329a01f8824e231bdf726ea6f6cd4ad940d0a0a45b5b99c27eb5083e69ae915f56b2beaa7d8b63d89
+RMD160 (NetBSD-6.0/luna68k/binary/sets/tests.tgz) = 05c755294af5ff529c495865595c8bfe7f5d91fb
+MD5 (NetBSD-6.0/luna68k/binary/sets/tests.tgz) = 4e8df8ec4228f385e7eb7d097904a8fc
+SHA1 (NetBSD-6.0/luna68k/binary/sets/text.tgz) = 19f8fb95eef7c6162c661a5262f5f41fd92f6078
+SHA512 (NetBSD-6.0/luna68k/binary/sets/text.tgz) = f2a4f42b05526d21fffc8d4783885b155bdcd8183b194058e9554bb34eb47a6b0ba2d6a9779c12f17844a6bb2fc07530a7a1d7dcacbec44b437fbc08796b65bf
+RMD160 (NetBSD-6.0/luna68k/binary/sets/text.tgz) = f01ee7d5dd88c612e8c8b3aae25ca93e1c70df0b
+MD5 (NetBSD-6.0/luna68k/binary/sets/text.tgz) = c55b5fb2f398aaebe749d7d2a6fc8570
+SHA1 (NetBSD-6.0/luna68k/binary/sets/xcomp.tgz) = 01bdf2494bf84313fb000f36606161f17cbc0114
+SHA512 (NetBSD-6.0/luna68k/binary/sets/xcomp.tgz) = d4fb1fb22011bf3b178593e1a2be51626563c6ccb35f3c2db922374d9dc1dc1fdd7830df24f1f699a89c46d5a7044c221372015134682aba5a2010d5f44ef77f
+RMD160 (NetBSD-6.0/luna68k/binary/sets/xcomp.tgz) = 03191d2a871d99076fe73355da23bfaf537294bf
+MD5 (NetBSD-6.0/luna68k/binary/sets/xcomp.tgz) = c30eac2a665f533444de26dafbbdd77f
+SHA1 (NetBSD-6.0/luna68k/binary/sets/xetc.tgz) = 3d78331b298a38fb6bd231bff59cccdedceaf71a
+SHA512 (NetBSD-6.0/luna68k/binary/sets/xetc.tgz) = ecaaaaa343d9abb3d24d147826956ad64fe96338d38511b5226d3cf2cc564eb8cc39aa833c7e0875fc4378aa6b8c2f3a7ad17c8906f8c68e5adc16c3cec5b715
+RMD160 (NetBSD-6.0/luna68k/binary/sets/xetc.tgz) = 7734dfa9521226f76e23b91d237109bf30855cbf
+MD5 (NetBSD-6.0/luna68k/binary/sets/xetc.tgz) = 0e5ef946483a93d487b70b526477efb0
+SHA1 (NetBSD-6.0/luna68k/binary/sets/xfont.tgz) = dca18181278f672451b3902ebdbf3d79ccfdedb4
+SHA512 (NetBSD-6.0/luna68k/binary/sets/xfont.tgz) = 3979a9cc4b1731c8b31f44cabbe74920cb03d7e7d551743eee78442e0ba67a6faa854cdc674cd0338422aa09119ae653f2fdbd2c78dc6811c49661e812ce7fc1
+RMD160 (NetBSD-6.0/luna68k/binary/sets/xfont.tgz) = 9b946721f534b2fd651e742f9061ef5d648efd3a
+MD5 (NetBSD-6.0/luna68k/binary/sets/xfont.tgz) = a3b4aad9b96343e5565a441b3376f454
+SHA1 (NetBSD-6.0/luna68k/binary/sets/xserver.tgz) = 859f7b47396c427f5d6c3570f6f68227131b2b34
+SHA512 (NetBSD-6.0/luna68k/binary/sets/xserver.tgz) = e1eee654564f67397c0324d8f89e62b0fcb40857b423ad2fb47c04d3bca7fa833a04adef639baf3c48bc27400f4d8a548d55efc7e29dfac74a82794e5182ce2a
+RMD160 (NetBSD-6.0/luna68k/binary/sets/xserver.tgz) = 1f75e4523b978323e96a0c986edbd700ae351846
+MD5 (NetBSD-6.0/luna68k/binary/sets/xserver.tgz) = e50f795889ea9f0cfc49fcc6d8991ec4
+SHA1 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERICSBC.gz) = 33453c6105617ec6e41c81d71be7b04b68f26e24
+SHA512 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERICSBC.gz) = 9ea5036462094ff9ff7696cc13f9b76166f4c6058ee8e79547898866c27e96b5e31e4e27228fc7bddc69b0f11ca242113778b2ab8c6c458d16fd08e7b5148557
+RMD160 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERICSBC.gz) = aa85610097d3144646f7bdcbdfd1cd55fd248280
+MD5 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERICSBC.gz) = 4b4ce73206f5d0203aedf08b4e9e73e4
+SHA1 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERIC.gz) = 644b65114d6ffc9bef291f18e3935ca539ed29e5
+SHA512 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERIC.gz) = 8e590640af3dfd78202b83a4bc6afec869ee37b467a10b3221c08e54c3a66bddc1726cca88d09fa98598f77d8bbc6dd36c136c685bab7e75198a9b6fa89e11da
+RMD160 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERIC.gz) = 2bccecd72133b03055457567ea8eca57acc56ac6
+MD5 (NetBSD-6.0/mac68k/binary/kernel/netbsd-GENERIC.gz) = ece356c2c95629fc502bb2e9382f9b4c
+SHA1 (NetBSD-6.0/mac68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/mac68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/mac68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/mac68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/mac68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/mac68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/mac68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/mac68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/mac68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/mac68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/mac68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/mac68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/mac68k/binary/sets/xcomp.tgz) = e13548b8974f5d55e98caf17b2b4bbbcf2430370
+SHA512 (NetBSD-6.0/mac68k/binary/sets/xcomp.tgz) = e4b13c798df04ffef88e72100e2db5af400e5ae255cd7a1ca2907736b8138a59045b6f3bd8531b5753d0b87eadb1b5f801043a929bb25d1611e4be693c1da954
+RMD160 (NetBSD-6.0/mac68k/binary/sets/xcomp.tgz) = 3b1f4e26ddd57e69afd9709553c1bf70d6e29ea0
+MD5 (NetBSD-6.0/mac68k/binary/sets/xcomp.tgz) = 894bb9aa05b164d9923682165d708335
+SHA1 (NetBSD-6.0/mac68k/binary/sets/xetc.tgz) = d2ca34bd668e108cbbfd4b45720823663339f8bd
+SHA512 (NetBSD-6.0/mac68k/binary/sets/xetc.tgz) = 431ca465f300e7eb5d4dbd44c43e412a296fb4d3129217e752f86a720e8a8bdf736c9add05a45518a4f3e6cffa32381ef61e9186d360b68a5f8c64d87e385fb5
+RMD160 (NetBSD-6.0/mac68k/binary/sets/xetc.tgz) = 4c5d664679856b02b694534cd6afdf20597e6d53
+MD5 (NetBSD-6.0/mac68k/binary/sets/xetc.tgz) = 72bd67556ac14ea0ce147374af0ba624
+SHA1 (NetBSD-6.0/mac68k/binary/sets/xfont.tgz) = 24ca4cb77a59246b1b05e0a91fed21c63259d12b
+SHA512 (NetBSD-6.0/mac68k/binary/sets/xfont.tgz) = 8dc297fb6205a995767e68e77cc21169234dfb66a86bbcd2e1828fd32efeda0a25c9f2a9b1a39b97fe8d7b24f8cd5cf6160859af6be2259876f39ee4e76c405b
+RMD160 (NetBSD-6.0/mac68k/binary/sets/xfont.tgz) = d2f134959940e6667aca185f01e388c05dc6bc85
+MD5 (NetBSD-6.0/mac68k/binary/sets/xfont.tgz) = 3c96c1f0a13cd7d277ca35622ac9c058
+SHA1 (NetBSD-6.0/mac68k/binary/sets/kern-GENERIC.tgz) = f8cc845ee4bb3a6eaba937a9aa9ef56ee7df39a1
+SHA512 (NetBSD-6.0/mac68k/binary/sets/kern-GENERIC.tgz) = 173879f5b2cee758aaec0d6baa6adfe208aa0817ce70edb8a4d821189de5e6a64dd5a4f0cd1da4b166579427f416383bc068d7e49677999e075cbe3ed40c99d8
+RMD160 (NetBSD-6.0/mac68k/binary/sets/kern-GENERIC.tgz) = 2e10430ed05682c3d2e2c9496d847535a68988a8
+MD5 (NetBSD-6.0/mac68k/binary/sets/kern-GENERIC.tgz) = 4c60130363f2cf09731d6dd9b98fbcb3
+SHA1 (NetBSD-6.0/mac68k/binary/sets/base.tgz) = 702a0468018c02cc7ce229811a3905477da4f722
+SHA512 (NetBSD-6.0/mac68k/binary/sets/base.tgz) = 871ff91422cfc76ef2e1fdf7a2052cbceaba0b7afacbf5856f2b440e834f1f4cc3759322f99bf85c4effff2a657f03a68978479d495985cf3ecf1cc3d0db4d88
+RMD160 (NetBSD-6.0/mac68k/binary/sets/base.tgz) = 184263ea29fe40e2def660f30c049a1f7c80d42d
+MD5 (NetBSD-6.0/mac68k/binary/sets/base.tgz) = ee8a6af6800f2a8ad6b9d6bb099bdf1d
+SHA1 (NetBSD-6.0/mac68k/binary/sets/comp.tgz) = c355ad494accbc2a9cc99011c6a7f1030027b4cd
+SHA512 (NetBSD-6.0/mac68k/binary/sets/comp.tgz) = 084828af876a61b296f6d34258462165cd23bdcb43ff5ac7f30d2b1ca43be31716c98de636e708ff193d8f97671eff2535d09710a66e4aa67151f326e423052c
+RMD160 (NetBSD-6.0/mac68k/binary/sets/comp.tgz) = 3119965a0c66603ebb2b62b7ca53838f2a468e0b
+MD5 (NetBSD-6.0/mac68k/binary/sets/comp.tgz) = 777aac0001fb61b70b6f5da36c73e8ea
+SHA1 (NetBSD-6.0/mac68k/binary/sets/etc.tgz) = a279de07a8d912b05e056c846bc616c084edeab9
+SHA512 (NetBSD-6.0/mac68k/binary/sets/etc.tgz) = 833a3c74e048bf2cc9f148b14a81eeb526071a1226fbafc3b501409922f4bb67b69d68cdd59cc8b83fe8fccb0afd1135e64b16683e8f42230530efab0e3ed115
+RMD160 (NetBSD-6.0/mac68k/binary/sets/etc.tgz) = 11fed26b10f5d68485667c9b0eb0673b4fb17390
+MD5 (NetBSD-6.0/mac68k/binary/sets/etc.tgz) = c6e0534c4470b66908a3f6e194723ffe
+SHA1 (NetBSD-6.0/mac68k/binary/sets/kern-GENERICSBC.tgz) = 851fd53f568f2c855c934f975d322954de4c6b07
+SHA512 (NetBSD-6.0/mac68k/binary/sets/kern-GENERICSBC.tgz) = 869f6b8f6eb4408a4f2950e8b9e10d020d14c0b829dd951d9746a9a778dbf142d53cb263cd797ec862b34a1aa367dfdbef5a633bd1181e442cce9fc0da2c8de7
+RMD160 (NetBSD-6.0/mac68k/binary/sets/kern-GENERICSBC.tgz) = ff894994dc6fe3773893eae064bbd95aca6077ab
+MD5 (NetBSD-6.0/mac68k/binary/sets/kern-GENERICSBC.tgz) = 0f2df7a929df022d55d5a73fe75e47a4
+SHA1 (NetBSD-6.0/mac68k/binary/sets/modules.tgz) = aefbcaa2fb397cb690e38e3be240caabf9282947
+SHA512 (NetBSD-6.0/mac68k/binary/sets/modules.tgz) = 83c696fccc6143c9c03e4efdf8ec65363dad51bbc48b434dc21a9949424f12db413de66abfa328b6d45f4097c59ee0324797ccc4ee7e462451170ce9ed7a81f9
+RMD160 (NetBSD-6.0/mac68k/binary/sets/modules.tgz) = 44606993e2ae655bdafaf93a92cee5a85efb9e2a
+MD5 (NetBSD-6.0/mac68k/binary/sets/modules.tgz) = 03bdab5790fdf19db36149fc33857b4f
+SHA1 (NetBSD-6.0/mac68k/binary/sets/tests.tgz) = 56b5e85ef88683b81048d2e6136aa949e690d92a
+SHA512 (NetBSD-6.0/mac68k/binary/sets/tests.tgz) = d4290b5069cb2290aac992145bcd69ff6e34b98ae2661e5cc16dd5b70362c1036c079dad7c96288f473c600e9cd1870c079268ffd08acb418ecc21708e3399ae
+RMD160 (NetBSD-6.0/mac68k/binary/sets/tests.tgz) = 7d46086a6a53cd19439f6967849dd294bb27b631
+MD5 (NetBSD-6.0/mac68k/binary/sets/tests.tgz) = 746ea69e63fb5af15f526f2f950ea449
+SHA1 (NetBSD-6.0/mac68k/binary/sets/text.tgz) = db35814cfb2c8ecce27765b3257b885d2e6debde
+SHA512 (NetBSD-6.0/mac68k/binary/sets/text.tgz) = 4110c6d47405005eafdb9fb205505f2cc40c6a2ace5b611312f4ef15ae5207a9ef5c4a42ca3b53164ec6f00a80efa5aa6d669a79a9e89da6f73fadd2dc5e437d
+RMD160 (NetBSD-6.0/mac68k/binary/sets/text.tgz) = 38345e956e8a7be25706d4809bfa83ac626a3e96
+MD5 (NetBSD-6.0/mac68k/binary/sets/text.tgz) = 90b4f37e590530f361f5ba22882f6184
+SHA1 (NetBSD-6.0/mac68k/binary/sets/xbase.tgz) = a9988db70cf4a221f20fa81d7f2525575eff6161
+SHA512 (NetBSD-6.0/mac68k/binary/sets/xbase.tgz) = 996a52c0e2a69be7ffbad4fca9e79e03cd72533d3c5059660b2bc5ebb3e982e010f53a870583d9eba702f143365508f5a8ab307d9806fda3df1f48021a3dcf4e
+RMD160 (NetBSD-6.0/mac68k/binary/sets/xbase.tgz) = 10e9d44638eab39da8b579a32ebf1ae283901401
+MD5 (NetBSD-6.0/mac68k/binary/sets/xbase.tgz) = 649bdf23aca348bbb0d7d3741154cbcd
+SHA1 (NetBSD-6.0/mac68k/binary/sets/xserver.tgz) = 2139abe77fda0708a14f6cf7cb3787ede3369f35
+SHA512 (NetBSD-6.0/mac68k/binary/sets/xserver.tgz) = db558b4f6be34da37cc971183c3a67d8d51ea26f3852b9ae53844ca5bc3fc0be405b6c30b6409d1e0d653178f4f6dc46645f37526ddd7d74be735a38beeaab09
+RMD160 (NetBSD-6.0/mac68k/binary/sets/xserver.tgz) = 32d160c3aab16c5a3ed819c9c020c8189e735c9f
+MD5 (NetBSD-6.0/mac68k/binary/sets/xserver.tgz) = c17de992b6f02ad51a720faaf0ac04d5
+SHA1 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.symbols.gz) = 7ab45cb4b64d15f930d7b275acf62d70015c7d9c
+SHA512 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.symbols.gz) = 107b76145d7484485984483a8b793bbd3fd56f0eccafc619f9b5cb119bdbd0f87ca5918257554a9623c535416368eb4dac4df8fcdfdd12ac279459b775827e56
+RMD160 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.symbols.gz) = 2f2e4239577f923664edb12730c51e15106079a2
+MD5 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.symbols.gz) = d53fc2a484e0add618fcdd9b236ffdd3
+SHA1 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.gz) = 6f94e9d416e73a7019fd05338369616e459db5a3
+SHA512 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.gz) = 8fc1096815fdcc6e987e0c69b991553ff094e226127a10bcd9510ffa0dcc746fb7416896e54ea32f18e80c5782937b8af34d20c55d8758c750ff7810ec69c203
+RMD160 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.gz) = 6ddc97fcb3cf13544c3190956c37f34897cf35f7
+MD5 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALL.gz) = 3d4a8d946ed122290abac6375a9ef863
+SHA1 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.symbols.gz) = 2672525b1b4997e3793edea3ee8b30c23cffb102
+SHA512 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.symbols.gz) = 003877e10fb0dad0b7190bbf559f190f3de2c0e1068caa5601a0a938706225e2cb7b141f8e4e767da7ed1ff15350f42792ee9a7de5e1d7149dfc233d6dbb4da9
+RMD160 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.symbols.gz) = 8f7b7ddfd1b96f5ca34f4a074cf27adf7701ceca
+MD5 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.symbols.gz) = 2aba4f14a7812f2d935c5ddd84634529
+SHA1 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.gz) = c91cbdc339088c1c32868779c918f746d4b5f4f7
+SHA512 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.gz) = 11eff94f2d5aaef7decbf6447a91f692c605a5d36acbea876e6a2501dddc681a60a89d3084ed1413c80ba3d8b23c90abfc567dc99254a9d810353992757d6284
+RMD160 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.gz) = f26b7b6f484d727ff6aa460985f23af89f72c8f7
+MD5 (NetBSD-6.0/mac68k/installation/instkernel/netbsd-INSTALLSBC.gz) = 2dffa66829a868235a11ab636e793d52
+SHA1 (NetBSD-6.0/mac68k/installation/miniroot/miniroot.fs.gz) = dc091b6ed92bd1269a8f76c427d606345a8f49fa
+SHA512 (NetBSD-6.0/mac68k/installation/miniroot/miniroot.fs.gz) = ba5b9a96d964da2b2c0c5640a4669840352057ea799013ceae75d3d9a7782d6a4096cbc591b287b663edd27a3db54ff5a5b62a81099c2f97d21c3919b0bc7b59
+RMD160 (NetBSD-6.0/mac68k/installation/miniroot/miniroot.fs.gz) = dc09fba5a4fe6ead5f59da6026018a63065ee414
+MD5 (NetBSD-6.0/mac68k/installation/miniroot/miniroot.fs.gz) = ab49b728c7a2ef8c273a3ad07b5e3e6b
+SHA1 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1g.src.sea.hqx) = 5ae75a6179968ac955f38b60f57e3811a1e4a3de
+SHA512 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1g.src.sea.hqx) = 0017e59c1c000d154df2f9e868a85df1897b8a7918471dd6d468a4527b092ae2d069bbd686487b0b05ed4d61abfffaa7eb6584f5ee03b320469386e2b64c89cf
+RMD160 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1g.src.sea.hqx) = d29a9600c614d00c7af518b2f75f1d1ebebf4b6d
+MD5 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1g.src.sea.hqx) = 5d00aedc5729c2e2ffcea77e666a4adc
+SHA1 (NetBSD-6.0/mac68k/installation/misc/src/Booter2.0.0-src.sea) = 5a4598fcbd39bfed29d58f9d712ed8d3408ae5c1
+SHA512 (NetBSD-6.0/mac68k/installation/misc/src/Booter2.0.0-src.sea) = 4828cb2efb9b40753be27ecd1cbe235e3842b9b2b024070eb6135f10716dfae1ab7cd6d45db862c64eb5b2267b40c6660af53986d3b5fcfab03600a75c0b08f3
+RMD160 (NetBSD-6.0/mac68k/installation/misc/src/Booter2.0.0-src.sea) = 9f284e11ef74ef0202d4a46ffcdafce282f3104f
+MD5 (NetBSD-6.0/mac68k/installation/misc/src/Booter2.0.0-src.sea) = d9185a15e8dbcefdc26e8dceea7eaa51
+SHA1 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1h.src.sea.hqx) = 3a4d1868a5f6c6e010dd6e3d0ff7ddb63a034c9e
+SHA512 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1h.src.sea.hqx) = cafa4aadc01ce3c515945359d67df14aefb9cf36cafab93d113cc5079e0cdc06360310173febca13cf7bc8fe66eb9161f6afed97a0810ddf025bca38d327e444
+RMD160 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1h.src.sea.hqx) = 90b7070035d00fe09ac95962c4d47e1ba2f565e2
+MD5 (NetBSD-6.0/mac68k/installation/misc/src/Installer_1.1h.src.sea.hqx) = 9f792b26b1a5691f13193a7e08cf6d18
+SHA1 (NetBSD-6.0/mac68k/installation/misc/src/Mkfs_1.47src.sea.hqx) = 76823266114b2ff531d35c646eef705677085907
+SHA512 (NetBSD-6.0/mac68k/installation/misc/src/Mkfs_1.47src.sea.hqx) = ceb5f5665acc0a9c8f273bf659e17a55dec3ffde647deb90cfa9001e43a82d5e1b4e8001175559b2f1d6327f2a80f86bfbf2798f27bbe6bbe52547a92de11d57
+RMD160 (NetBSD-6.0/mac68k/installation/misc/src/Mkfs_1.47src.sea.hqx) = af8327f6e2d66bbd8a04498d27ab3f5668556cce
+MD5 (NetBSD-6.0/mac68k/installation/misc/src/Mkfs_1.47src.sea.hqx) = 61facd7fdeb336f108d78feb8327555b
+SHA1 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin.uue) = 432b619e0eb127a5fd70fd3dc8f2988a93211a34
+SHA512 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin.uue) = ab3650cca71dc57f38f480bfa74f6bdffe2d0ccbf76072658503cd168b91f90a7fe5ba0ef4f51aa497a11684ee05d73376e059957c75773d92f894877042c0ab
+RMD160 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin.uue) = 61bdb1fc795bfe9242816682fc98cfdee036e0ef
+MD5 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin.uue) = aed2003c59f8e824dc30c44366439426
+SHA1 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin) = 8e940cccdfe4e645ddd01738477f7f58342788e0
+SHA512 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin) = 0d3e0d39aa811921b012a6fd07dbf97b63f61dd14800c61d2941f3c624db88cd0805478df900120cd20c3fcf6af11c5989c52400e5b4eefabd4bf5c62f9f2023
+RMD160 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin) = 49146172c77c05a522bdf118e879f0bd933bc99c
+MD5 (NetBSD-6.0/mac68k/installation/misc/BSD_Mac68k_Booter.bin) = 757b6ca3559185feafc36927ce9ab578
+SHA1 (NetBSD-6.0/mac68k/installation/misc/res-edit-and-others.hqx) = fe505f1ff77f1574ddec17dd4de93f0370fe236b
+SHA512 (NetBSD-6.0/mac68k/installation/misc/res-edit-and-others.hqx) = cf382e50ea9a8fd8c30c8bddfadf44b64b94216656dc623039a37c88bc642080b54002b9aca1cad25c251c719cda9fb3ad89bbf3ed645672c0040baf459e0ae9
+RMD160 (NetBSD-6.0/mac68k/installation/misc/res-edit-and-others.hqx) = 19be7f536eee28b7e30cffc4ef3e8a2f8c7fe88f
+MD5 (NetBSD-6.0/mac68k/installation/misc/res-edit-and-others.hqx) = 707c4953e155315abe519d5d48c54318
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Booter-HTML-manual-12.tar) = 94e2f09daeb119ece95abfe24b103f85f9c5d558
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Booter-HTML-manual-12.tar) = 3d9a743e71ee985134ab679608ffc31b197a638e302450c888f90d02fefae72b647622024b3ebb4263e57b6e58ce457890d6a0774c62a8e4a9f90d235d04c15a
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Booter-HTML-manual-12.tar) = ee32b1b55b0495b9b4723ff3cbc42123f5b360a2
+MD5 (NetBSD-6.0/mac68k/installation/misc/Booter-HTML-manual-12.tar) = 24120554ffbac39c8edd8e939706b7c5
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Booter2.0.0.sea) = d5178c25cc71514816986842e39c716e6cd5ab4c
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Booter2.0.0.sea) = fafbf6f153e9b9bf657aac3c74d569b44ff21c1e306f0cbc4a2fcab5fbe439bd46746ff0469113bc715b69990507994ae94934d8caf82321684326f4e8b4d146
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Booter2.0.0.sea) = 97798bf61397243efee8480c7f2f19e63fda7d00
+MD5 (NetBSD-6.0/mac68k/installation/misc/Booter2.0.0.sea) = 05b46210443c60ee28bcbe81f1ebc004
+SHA1 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin) = 2859ea6089df13333b6b521d8bc858079083251c
+SHA512 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin) = 1891f4c07bfb51de08fea8e3a5cd572e99897d20f6df748ae72af8da5e8191ca07d5f0dc836b39be12236286926677896e4a456a8f64b31517d09285bebed460
+RMD160 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin) = 37fe1a762925b8bb8ae71177bea992aad27ee03f
+MD5 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin) = fcc43fd81d5691559a5aa8ae15be8899
+SHA1 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin.uue) = beb0225c706b12fc8a241025c483133c1d5e6b86
+SHA512 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin.uue) = 7e98b555d7cf30da5948b115595f06a725c55cc0ef3e7a705423c600cafceca2e04966c65573805e6e553cf9f7a2faa05803ff2d6cd9deb714f4e98924e2a5d7
+RMD160 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin.uue) = ed9a5860dafd3484d380f1f3a91cec366b59be9d
+MD5 (NetBSD-6.0/mac68k/installation/misc/BooterManual.stxt.bin.uue) = cacb436bfbfc9a4b0995c789fee8342f
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Installer.sea.hqx) = c6a6c25ae1fcdfe4a0ba90616c3779068280b759
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Installer.sea.hqx) = 5ff75859fd5eb2fdcf75215ec6c045518ef111d0e8caecbe951dbf6f9f1129cac6948ab991949cbb3ee68d05ee8f398b07206acc9af53a5db1c4c6c7148a3a2a
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Installer.sea.hqx) = 36b141ff6722fd5e76fe293d1247587ae0efdd8a
+MD5 (NetBSD-6.0/mac68k/installation/misc/Installer.sea.hqx) = 01bc744d539b4f2f8e4fb2761d4c77e7
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.bin) = 8ef8265fa77478a6741bc65ceb6f64e790c7aac2
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.bin) = 45324e1231e7d53816640b8867eb117294373e90463297f05e6d187b1fe719b82bc1782b24dff8ad6a71e0383eddd0f47bd15d604f6cf3bb2bf3499df887eb48
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.bin) = 506451703e3f00ac0a26b450d33463fd2c1e4582
+MD5 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.bin) = ea338e4327628024d670ae9eb64323db
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.hqx) = 8e28517a94b1b0b57a504938077aa740de7e3b80
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.hqx) = 6e07c3682a0bbb4f7d23c235f83f3d22d4a8813cade67ab9f76092c68f41767c00eccde01600283df36e4d222bddd2b7fec355db468d07d7db8dbf51adc9f5bb
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.hqx) = 4159e0226c6f58b480bd0cdc42f9d2d411521034
+MD5 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1g.sea.hqx) = 2c214a1b2429702942436e92e2a408c3
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.bin) = 0bda2b9e6a95f1b10414823f048087ad6455e6ed
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.bin) = bb9ad3f95609c3f23d31a876055f2cae692d8abb853431d0945ee7e66e292fe7069dda82f5ee615ac5fe5893e0699323632de8d4c1c668d987a8172597d78386
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.bin) = bc7f88652ae4d51954c967dde99dc6c11494a7c8
+MD5 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.bin) = 763ff66b2234fd52ffe4ad08de5f090f
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.hqx) = c6a6c25ae1fcdfe4a0ba90616c3779068280b759
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.hqx) = 5ff75859fd5eb2fdcf75215ec6c045518ef111d0e8caecbe951dbf6f9f1129cac6948ab991949cbb3ee68d05ee8f398b07206acc9af53a5db1c4c6c7148a3a2a
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.hqx) = 36b141ff6722fd5e76fe293d1247587ae0efdd8a
+MD5 (NetBSD-6.0/mac68k/installation/misc/Installer_1.1h.sea.hqx) = 01bc744d539b4f2f8e4fb2761d4c77e7
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.bin) = 9783f80336af95dfbf854278f58b577891a6442e
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.bin) = fb3d537f73cd7a5c05b4deeacfebe4805de1172071b97af545ef0c360c8093dd34007cdb498dad1b8fba4930e939c35429b314c575ab1e6d57fc208d72bee767
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.bin) = eb92d84b516d3c84a2c54fa501a1f585434639cb
+MD5 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.bin) = 0b6f626c1d8f578e01818cfc2a2e79b5
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Mkfs.sea.hqx) = e2286a389c29eebadaad19c9c3f3c9095b8bcb3d
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Mkfs.sea.hqx) = 5021b88d12bdc6545c681a3df24750375d63cac19b9e0f6a7148cb8592de6d0cc22f254b9755a96e1780541acbbdf54f0f6f9b62ff7cdab8dc94db0d247b2b87
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Mkfs.sea.hqx) = 14c18aceaab0593ca0f41bcce95499db3fc4f8f7
+MD5 (NetBSD-6.0/mac68k/installation/misc/Mkfs.sea.hqx) = a20825a32ee72f356880169993c3ac73
+SHA1 (NetBSD-6.0/mac68k/installation/misc/README) = 6f10f67afd988de6fa0a66f78ec46da15cc994f3
+SHA512 (NetBSD-6.0/mac68k/installation/misc/README) = e8f6d9c3217e7ad084ebc6758a07f14a664db9a34feb2b4dfb19fce8692ca1703f2b119eabcb13cb38f629a9588dea3279bfcf0cda65260acd585514d129701d
+RMD160 (NetBSD-6.0/mac68k/installation/misc/README) = 9d125cfe0be05fb26b9b5f52690b9280e282af44
+MD5 (NetBSD-6.0/mac68k/installation/misc/README) = 6081e0a4521b8f229bd3c09e094d4bc0
+SHA1 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.hqx) = e2286a389c29eebadaad19c9c3f3c9095b8bcb3d
+SHA512 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.hqx) = 5021b88d12bdc6545c681a3df24750375d63cac19b9e0f6a7148cb8592de6d0cc22f254b9755a96e1780541acbbdf54f0f6f9b62ff7cdab8dc94db0d247b2b87
+RMD160 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.hqx) = 14c18aceaab0593ca0f41bcce95499db3fc4f8f7
+MD5 (NetBSD-6.0/mac68k/installation/misc/Mkfs_1.47.sea.hqx) = a20825a32ee72f356880169993c3ac73
+SHA1 (NetBSD-6.0/mac68k/installation/misc/NetBSD_ROM.sit.hqx) = 009c5f376751cda897cdd5707932a42ed8c4c75f
+SHA512 (NetBSD-6.0/mac68k/installation/misc/NetBSD_ROM.sit.hqx) = a04d6873fe2e0d3b543a05d1c12893f2715479e5bbfeeb9657babd146610197e4eec045a428d51bce4a9f8fb90f23f81b31b35f672692de953d6df8379a7531c
+RMD160 (NetBSD-6.0/mac68k/installation/misc/NetBSD_ROM.sit.hqx) = 6dcd7e0f25e19d77d38b18c22af77ef0c80769e6
+MD5 (NetBSD-6.0/mac68k/installation/misc/NetBSD_ROM.sit.hqx) = 6d9984dacf90adcd3f5f4a906b72b436
+SHA1 (NetBSD-6.0/mac68k/installation/misc/README.Booter) = cb2fb0233a1f5444c5c1b9648a6c167a4ce09437
+SHA512 (NetBSD-6.0/mac68k/installation/misc/README.Booter) = b233f9b5f8e6b615ecbb117d1853c64a82b1ac78958a7d394133e6e5f777ca6075b1e65d74ce52d1bc9cc97257584cbc4c70a11b0865ef095e6376d2c4e46bf4
+RMD160 (NetBSD-6.0/mac68k/installation/misc/README.Booter) = 2bd403db763c410b968f85cb8da32d10a7520b59
+MD5 (NetBSD-6.0/mac68k/installation/misc/README.Booter) = ae0f90a35340fc51be774ebd33674a41
+SHA1 (NetBSD-6.0/mac68k/installation/misc/README.Installer) = e8e4011a516b40ea99e9f1b16708fc91878f88fb
+SHA512 (NetBSD-6.0/mac68k/installation/misc/README.Installer) = 791e8a5415bdfd0ac0412e964d0ed1dac9dbebfbe9d546fbd92d3aa3d9b82eececba55628ac6cbbd7dd843f62183d718e2a1ad98c10311fb76c24dd40c77af06
+RMD160 (NetBSD-6.0/mac68k/installation/misc/README.Installer) = fc1b834d11c4df6677ee4a40b1e3ba2015d5ad00
+MD5 (NetBSD-6.0/mac68k/installation/misc/README.Installer) = bd6be3091a274d7c68da789ad1db0eda
+SHA1 (NetBSD-6.0/mac68k/installation/misc/extensions.map) = 4a5fa646db0c73433f3538e17e7d18b38679284f
+SHA512 (NetBSD-6.0/mac68k/installation/misc/extensions.map) = 32db0ebf9c0e80e4856c963ef21d3626060e20ba33cd61301e4114b77a636cf248e705700444b42a4631d1c56ef09294981158e1f0b0527b795501b9cea1b8f6
+RMD160 (NetBSD-6.0/mac68k/installation/misc/extensions.map) = f6811f3b103ab5c902a204dce2578e8cba6e8e9a
+MD5 (NetBSD-6.0/mac68k/installation/misc/extensions.map) = 5007a814ca2442a9693969cb997b4905
+SHA1 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.bin) = 6eb3cb3b988e6295f7222016d241f53c61cf347e
+SHA512 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.bin) = 16f05d2792e03d3a9c9ccd9d435ca5556224bd73619d89b9d2f6ac3b282f6587b76745bbbc9383c20f11c2125b60dff138845dac4a269e459a5b76ee1d5e865c
+RMD160 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.bin) = be8fc56378e697fc1f6fe9da5e8e69c787dbc434
+MD5 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.bin) = 33ff34f5db2f0ba88c83ce85b1e51664
+SHA1 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.hqx) = f588fece9bb911749d1038da2ec31e5ea50b2b21
+SHA512 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.hqx) = 1d4a1b489419171022e120d7292f479ea0d47833b2868bccc47ea1d97c442ff1e18044f43783fbd920145a6e6aad094be796dc8db00d5d997235c8f9d8ecb7ab
+RMD160 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.hqx) = 6e0bd805b5595d6d8ee3a24a63290978bd8da8cc
+MD5 (NetBSD-6.0/mac68k/installation/misc/mode32-7.5.hqx) = cf14fb32d042ba270b527ec8b11f6d3e
+SHA1 (NetBSD-6.0/mac68k/installation/misc/pdisk.sea.hqx) = ac3641da27c3615456310ff795b2d684eb2661ef
+SHA512 (NetBSD-6.0/mac68k/installation/misc/pdisk.sea.hqx) = a5404597c2479adf6ad9a910771f8d9cff57dbc4066d73346bfde3f1380a59641855820658ff3a6c8c0fd97b242dcfd4c30e7ecde50047bbbc7a7d45e9d77e4e
+RMD160 (NetBSD-6.0/mac68k/installation/misc/pdisk.sea.hqx) = a5368be868266f37bdf3459067659ef0c4186dc6
+MD5 (NetBSD-6.0/mac68k/installation/misc/pdisk.sea.hqx) = 71be22598a33042751caa6dc6c0af834
+SHA1 (NetBSD-6.0/mac68k/INSTALL.html) = 85efa4b8402dccb52805752ff82e87eb1259e5cd
+SHA512 (NetBSD-6.0/mac68k/INSTALL.html) = dd8012db2cb801b02b808eadd473f529b58977b9d2088c878aeb7deafc214adb2e281aa3b2094e0988f23e1ede88a1528492634211f86fe73d4b6085a1a917fe
+RMD160 (NetBSD-6.0/mac68k/INSTALL.html) = 01614436a73df3cae2149a607abb6c59671dcb63
+MD5 (NetBSD-6.0/mac68k/INSTALL.html) = deaafd9baf0d73ad2fe1e731ca8d4391
+SHA1 (NetBSD-6.0/mac68k/INSTALL.more) = 02b0da5241dfb0e94347c45aa2b59230a4c4beaa
+SHA512 (NetBSD-6.0/mac68k/INSTALL.more) = e167052f3a76308dda76a45e7fe93622a3e40fb7905d2bfc3e6438007d5bee8cafa06f9bddf4fabd9801d82bc3de56fbec1892a4977d2b818ece0ee570bc7729
+RMD160 (NetBSD-6.0/mac68k/INSTALL.more) = 1602b574a726ead87163bea4a121dc4d5573c321
+MD5 (NetBSD-6.0/mac68k/INSTALL.more) = ab7ed66c5f64540dc7b9d036048fcfb1
+SHA1 (NetBSD-6.0/mac68k/INSTALL.ps) = 999ea4a94acf0cf256157ba3b447d866b0347bfa
+SHA512 (NetBSD-6.0/mac68k/INSTALL.ps) = dfaf48953a73ed32b722bc95d34a58866ea8ccbf0d9d79e1fd9769634920426826a1e5cc86b94cc2eaf39eb3365bd5977ae0ee4284af484f64bb3e92847567ce
+RMD160 (NetBSD-6.0/mac68k/INSTALL.ps) = 73548f30c2c139ae5e62e98dbc54a4a80d1398c5
+MD5 (NetBSD-6.0/mac68k/INSTALL.ps) = 43662b6328dcc148ea4b6121de934e7b
+SHA1 (NetBSD-6.0/mac68k/INSTALL.txt) = d198c59c8fb2bcb408013794ef3d8cadcb4ad448
+SHA512 (NetBSD-6.0/mac68k/INSTALL.txt) = efb0679da4c0f9b6b8f15f92579ecabb67a4e7451e156430f9a748368bf8815d563d83050c24784c80985d06d0c257d66f91a03c792ad9b65da17e408d2e732b
+RMD160 (NetBSD-6.0/mac68k/INSTALL.txt) = 3ea97712841cab74a13994769fbe4ff66705b6c0
+MD5 (NetBSD-6.0/mac68k/INSTALL.txt) = ed4f38a04160feaf88388c0970e6ed6e
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = ce9bd080acdc497dd570c416befca032a1e8d823
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = 39b5933f7f43c990c2478041d398e9764dce24bfbae9baba2f603fe574448370d9d5cef5e398613fa047648cc0120dc7e878f527bc12751c6a37fe8966cb9d2b
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = d23e372373d18f19b55bc87635bc45f3f730a91d
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.symbols.gz) = c0e545e698824468f2b0acefaf788bea
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.MP.gz) = 0a065a75b49d53c192d1a79e9d216a2d9382d570
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.MP.gz) = dc2a00bcdf70c08d7089b775b3328f1b828c5a5962ec077d95c8ea279586c6b65c48bcde34b9432c4f7a0a7cb4dc6e8f4887ae254038919de8b4f2d2a3d2e3c3
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.MP.gz) = 39e88535fff406327f536ecd319c2b5785898fbf
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.MP.gz) = 3410df9cc4df7b28a292ed3d150808ea
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.gz) = 597f394bd55facd236e90f6aa213a5eef4711f7c
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.gz) = f7cbec6767fd9ce1aa61065ebc360d4aa1d2fcb26c4457f38c409fb5465753b726c8fb37ab0448863efd69c21a8216dea27e8067cd1fa1f74299677985195181
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.gz) = 21e5329fc0c500af9e333fabef527385021bde0a
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC.gz) = 7da219cc304f59d1662eaf7f4dc1833f
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.gz) = e594f013594f13f586f6789005e49f13b9f3467f
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.gz) = bc68d5a6cf29cdc0c9ee8b9ca7610703025621f64a9b427f04b87cf53bf9e14e765785283a0a66aed1a15dd0abbe81e8fc2029c3310b715ef75cacc7eec93283
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.gz) = 7ce6740e080b6f9b5dc8d99c70c779b0486ad916
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-GENERIC_MD.gz) = 3f6f6c37b2c6f7b04c9595245c7224c4
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.symbols.gz) = de3656de1e94d49bb43e6f0b21fc21ee15f2170a
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.symbols.gz) = c90cb34afa99a7ceb8ba3742a0a4b7bd59da93ecb4aca1ff1a540d18d540947446467627e3df717bb880f1b0a567336316bc8a2d59026a7a8f6935eca93984ff
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.symbols.gz) = b617db2dfd9b44f855f06b777f4c69680115ed27
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.symbols.gz) = c90b9ecfb302f54de790366b2e17b625
+SHA1 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.gz) = 661d08043304e74da8232e5d14d1f4f748762510
+SHA512 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.gz) = e4dec9781eea446f078df552033c52e4b8df30231ecbc14131ece1f7312c8a0f98d47b06d9b66988c5c4c2ff45e8dd57e7f2715e165c431b391127f0e5c03565
+RMD160 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.gz) = 99e3fd9681bd7f400de2e2206163d501b6d23d41
+MD5 (NetBSD-6.0/macppc/binary/kernel/netbsd-INSTALL.gz) = 1f1b3e39dcde937788a32ef3a4f65c1b
+SHA1 (NetBSD-6.0/macppc/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/macppc/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/macppc/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/macppc/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/macppc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/macppc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/macppc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/macppc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/macppc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/macppc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/macppc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/macppc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.MP.tgz) = e11a4e1da81be3a4650be198c5f9fe7204991540
+SHA512 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.MP.tgz) = 924fc04dff6c7458196d0a19ec38a9a1114ef3cf5cd557aa68563c3d1d2dee67d9daf3ec72fec95c9bad8862ceb663c1f96cad61965e65c042c2723ffacfe43e
+RMD160 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.MP.tgz) = 585796f103490e30928aca2c4977a41acb990c84
+MD5 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.MP.tgz) = 5b9f58a612ad00b10d4812ce9e325204
+SHA1 (NetBSD-6.0/macppc/binary/sets/base.tgz) = a31efb13ffcb70f4f429ad018d0ca6f9bc9e1db5
+SHA512 (NetBSD-6.0/macppc/binary/sets/base.tgz) = 9746428cdb65b283fa668f63cd33cc2c0bff75e85f4357f460da4d7c0c874bbc0369170d813fa70a1f0933fc2240da6536fa1c2c2be59c6722ab3849d92a3dc0
+RMD160 (NetBSD-6.0/macppc/binary/sets/base.tgz) = c83a80159c7128c8d311c62c15776776dae0fd97
+MD5 (NetBSD-6.0/macppc/binary/sets/base.tgz) = 13ea19ca37828efa708cc77efe1a18f4
+SHA1 (NetBSD-6.0/macppc/binary/sets/comp.tgz) = 2608b27059b55a9d53c2e4fb0f6f3417aafa8293
+SHA512 (NetBSD-6.0/macppc/binary/sets/comp.tgz) = 2f6ec81a049c6c4688fc362a341d11c100ce057760eb5832fceb039ce810abde76d035a3f8e9a23fbb0f4ec3709a8729eba0e92c0f56aed9aed0779588b44bc0
+RMD160 (NetBSD-6.0/macppc/binary/sets/comp.tgz) = 566f37564d448641e6bdcbd70e87c7b9406ee78e
+MD5 (NetBSD-6.0/macppc/binary/sets/comp.tgz) = 0ab55dfc92d16a84368d2f1118b6385d
+SHA1 (NetBSD-6.0/macppc/binary/sets/etc.tgz) = 42a97230bebad52fff9236fe06f3ac0aab27f929
+SHA512 (NetBSD-6.0/macppc/binary/sets/etc.tgz) = b574a57a33d58eebac3a048823fa845d4a403e0503b21340c9cfb05ae9a743a213aa7222530c9e20d30fd90003b56366815ebcb28d085c2d9c998a73972ce602
+RMD160 (NetBSD-6.0/macppc/binary/sets/etc.tgz) = dfbd6641e45fed5e9fa425be5c8878462ff8c6fe
+MD5 (NetBSD-6.0/macppc/binary/sets/etc.tgz) = aa3881b4329b45b318e6d6f0d97ac24a
+SHA1 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.tgz) = 77f4b674c6ef5bf00c6d6173d2498ff7ebbc64f9
+SHA512 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.tgz) = f16e4dcf74059eafc235bbe7d7b59de1071b56ade3f77308bbb646fdd19e90362635125bff5f81ca92e51502c668106067ca6b377a8aec2bff708e589380977a
+RMD160 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.tgz) = 0906acf7e10f69ea769a5a58d0ffe2d1e060ba98
+MD5 (NetBSD-6.0/macppc/binary/sets/kern-GENERIC.tgz) = 50cf40ab93c7505da5fe7c9bd488abd2
+SHA1 (NetBSD-6.0/macppc/binary/sets/modules.tgz) = b2c51fb3ca33a8f70c00f9e7d49cd4b91fb79673
+SHA512 (NetBSD-6.0/macppc/binary/sets/modules.tgz) = 2cfd8f4f53c0561b8ab8aafac2c38363750be6484c21c8d670b7afb89390875893a9b549b2e28d08cdeeb81217f7e0e0fe437e09059871d4b063ffa0057bae97
+RMD160 (NetBSD-6.0/macppc/binary/sets/modules.tgz) = 9fb4d8eb95a719022a522b3e9a970cda1a416f15
+MD5 (NetBSD-6.0/macppc/binary/sets/modules.tgz) = 54914b3291b652b921239631c740dcea
+SHA1 (NetBSD-6.0/macppc/binary/sets/tests.tgz) = f87666428063cf6b980c1d284aab5894e2c3d2b3
+SHA512 (NetBSD-6.0/macppc/binary/sets/tests.tgz) = 94474f3ed0feff6b8c10299c4e190154bf4c6d579dd3edced5de901aec60c9413a921b282bc7ae0c2dd3ec49de8162204660a7fe80393102aa7ebd3318f4124e
+RMD160 (NetBSD-6.0/macppc/binary/sets/tests.tgz) = 7467da9599fb2cb270854e337b696568de24b205
+MD5 (NetBSD-6.0/macppc/binary/sets/tests.tgz) = 165d0d19f6c40d8249ddd46214a68e25
+SHA1 (NetBSD-6.0/macppc/binary/sets/text.tgz) = b3e0e6f977a3598fb6f8a377cf91a67aa21ff74f
+SHA512 (NetBSD-6.0/macppc/binary/sets/text.tgz) = 361c67a072fbfe6055fcf8436f3a84b10d92a0cc987c818a32a9f536466b285d47ef2ba39c8f04319ac0a93e7b2353eed589e6b72c3bd32f38c12aae82ff26ed
+RMD160 (NetBSD-6.0/macppc/binary/sets/text.tgz) = 3d0c5c4e3a84335431a0d6cc9b78315495e137d0
+MD5 (NetBSD-6.0/macppc/binary/sets/text.tgz) = d968d8f10bd69add51020decb7cd01bf
+SHA1 (NetBSD-6.0/macppc/binary/sets/xbase.tgz) = 63043b541de378d777f43d0a333d2112a98a4e8a
+SHA512 (NetBSD-6.0/macppc/binary/sets/xbase.tgz) = 189d8b05121b356d4fa587c46cd4bb50df1ff89a197c983dafed9ce93293ad16e82f77d14ae3ea2c8e9f01f8a5eab4d9841274d9caa7143f4d977d921d3e1a84
+RMD160 (NetBSD-6.0/macppc/binary/sets/xbase.tgz) = 3cccd55a4407632e7d7444a6919901aca686c9cb
+MD5 (NetBSD-6.0/macppc/binary/sets/xbase.tgz) = 1e9175f276efb45934e2e976787ec61b
+SHA1 (NetBSD-6.0/macppc/binary/sets/xcomp.tgz) = 9322a94973bf4e59542a1c3fe2d307f1dee362ff
+SHA512 (NetBSD-6.0/macppc/binary/sets/xcomp.tgz) = ca37cdedb39625b92d2068c8736c2d1bdadd132edbffb4bf6ea3a4b1a21ffcd5bfdd78e5aaad874be32cff4d1b98059e142c5a2192dc1f38ffb7a64e8e180a17
+RMD160 (NetBSD-6.0/macppc/binary/sets/xcomp.tgz) = 48ef59c053d4a964872a70f1350252f98423794b
+MD5 (NetBSD-6.0/macppc/binary/sets/xcomp.tgz) = fc0aa962b13c0e092657bfc3d6368284
+SHA1 (NetBSD-6.0/macppc/binary/sets/xetc.tgz) = 5ace04f9545e5ac27432bddcde0d42dd592540c1
+SHA512 (NetBSD-6.0/macppc/binary/sets/xetc.tgz) = ccdaeb27301167072fc0c98b78633c2d52b1eb4a5bf3ed5c606a646a420c7bd73e197b73d1a928c4aa17013fca5bbbd98f06fc4baa4ca97ada3a3e89490fdc06
+RMD160 (NetBSD-6.0/macppc/binary/sets/xetc.tgz) = 048fd168d184f88b2164c654594e68665dec62c4
+MD5 (NetBSD-6.0/macppc/binary/sets/xetc.tgz) = 1735140072351ccaa55f8b25cd002fd6
+SHA1 (NetBSD-6.0/macppc/binary/sets/xfont.tgz) = 2cea3fa057b220c72ba147f9821d33b18d8346d2
+SHA512 (NetBSD-6.0/macppc/binary/sets/xfont.tgz) = d76f6d6613f96475c85427792ad339576815f1423ae7e84018944d31cb66aa6ec14f2a8886f0912963745293326812a7efb8b1d2f08a6ee27da8fbf53c3223d7
+RMD160 (NetBSD-6.0/macppc/binary/sets/xfont.tgz) = 42190ebf50a1db179d8d7b1bdd1aa3e86082ac77
+MD5 (NetBSD-6.0/macppc/binary/sets/xfont.tgz) = 752888a1280d52af5e6b3c79287738e4
+SHA1 (NetBSD-6.0/macppc/binary/sets/xserver.tgz) = 4c9ca17aec65f27a569ee9e6ed4af95ad3b9cd21
+SHA512 (NetBSD-6.0/macppc/binary/sets/xserver.tgz) = 208d60880438a476ecacab3a4ab5872007c2728cafe16022cee9c0d781ce4dd8ef95d302ac9212a1a66b825869dc35c8df096d9f7c97a97054cf963ba58418fa
+RMD160 (NetBSD-6.0/macppc/binary/sets/xserver.tgz) = f0bd1020d51ed7036593840c49bfaee57e09e58c
+MD5 (NetBSD-6.0/macppc/binary/sets/xserver.tgz) = c241cf0caa30e6ae203fef4c95d2d74d
+SHA1 (NetBSD-6.0/macppc/installation/floppy/boot1.fs) = 053808f21cbc6acc50469ffa2a6c48471bfbf8fe
+SHA512 (NetBSD-6.0/macppc/installation/floppy/boot1.fs) = 82f844d8ee09d09a5cb06ad8cf8131826ad9e8c38a289e95757d6b9664b0aff4e30743ba750dd7ea780d556b4aa619388fbbef8727c52b302e314b08a6853306
+RMD160 (NetBSD-6.0/macppc/installation/floppy/boot1.fs) = 291a7e7bd8b98758f2dce412054abbb69c6cf4cb
+MD5 (NetBSD-6.0/macppc/installation/floppy/boot1.fs) = 369cf1bf5a69c9220d3ab6213c0a10d1
+SHA1 (NetBSD-6.0/macppc/installation/floppy/boot2.fs) = 46098cec194fe5de4ffc1b66508397916cabd968
+SHA512 (NetBSD-6.0/macppc/installation/floppy/boot2.fs) = 25ed41f6712ae333101fb168cdafbdb4c4dc677e4a0c701665d02758202af2238a2a53828e833b0917ac0547ea34a1a1c95f8b9018084ff9053bbba985814b91
+RMD160 (NetBSD-6.0/macppc/installation/floppy/boot2.fs) = 9e743d123b1f43953743e347218ad29f022822be
+MD5 (NetBSD-6.0/macppc/installation/floppy/boot2.fs) = 05843ccdeb93f326ddad69e810303fe5
+SHA1 (NetBSD-6.0/macppc/installation/ofwboot.elf) = a013bc2f2d4d39cf9e56b0d625b6c48d08bb455d
+SHA512 (NetBSD-6.0/macppc/installation/ofwboot.elf) = d28569738cfad70b6d5aef80b32e9d44f38dc5038f38143bf93f78eba708ff05e9a7955c03a682833ace2cd20daf4adb1a3c36956768e5f2b08fb59a44573854
+RMD160 (NetBSD-6.0/macppc/installation/ofwboot.elf) = 9a9f54b00b80d91a934e83cb17a68b15a9fe8c00
+MD5 (NetBSD-6.0/macppc/installation/ofwboot.elf) = 2d4598a059853f8f7e99541afcf6e31e
+SHA1 (NetBSD-6.0/macppc/installation/ofwboot.xcf) = a15eef375d155080b6809e2db46d0475baebd872
+SHA512 (NetBSD-6.0/macppc/installation/ofwboot.xcf) = 4756b6eeb05754185c16ff02e9d98642ae75c3545b385a67870e58b8211feda3ce265eaf020ca5252e9c47fab64922d9af8eead98b2cff798c58af9840fbd345
+RMD160 (NetBSD-6.0/macppc/installation/ofwboot.xcf) = 1654bc8a15f5d3c2bb248033cbfbc37ca23980a7
+MD5 (NetBSD-6.0/macppc/installation/ofwboot.xcf) = 84cc2385de486f3e72868ab7c75c8683
+SHA1 (NetBSD-6.0/macppc/INSTALL.html) = 9752ce3a0ae1964208f027404c5aa3b526efe08c
+SHA512 (NetBSD-6.0/macppc/INSTALL.html) = 71dbe4d992bcea022b1aac0dbdc3cf596a7538bf3fd2de390925094bfaa5cb1f71e332a2eb419cdfa1528cb7951c92491b3b3d7b88cd9e4c40f81af0a8ea34b2
+RMD160 (NetBSD-6.0/macppc/INSTALL.html) = b5e2c12fbcf7fcf56e6e9354b178188c88e772b2
+MD5 (NetBSD-6.0/macppc/INSTALL.html) = 31c92f0b3c87409d1d74b17912f05333
+SHA1 (NetBSD-6.0/macppc/INSTALL.more) = 7b4f4aa288bbbacca5a7f69f7fb1dde30b6a67e4
+SHA512 (NetBSD-6.0/macppc/INSTALL.more) = 7ab24e82eb0b779f11e16b10982fb82d6831058b0a51b57c2abbb0c91f09daa92a7a724c18f775d551b6bc4b8bff36eb91b6a823d2f9810a478180c50f9c676e
+RMD160 (NetBSD-6.0/macppc/INSTALL.more) = 7bc31a39cfc1017821c29032432a8765af7b240c
+MD5 (NetBSD-6.0/macppc/INSTALL.more) = 0a198a6d31ac02b702c103117400eafb
+SHA1 (NetBSD-6.0/macppc/INSTALL.ps) = 9a14912c8a58fc4e6d004dc2426c189b991d5e6a
+SHA512 (NetBSD-6.0/macppc/INSTALL.ps) = 94ffb000d582ea09c0f3d4e0b6e757f0bbbe50e6793d33e3e3ec29a0da26a0130f23c778e19e681892ceab4f440dc01d37b206272d24aa96c9ef3a9a6c49ed0e
+RMD160 (NetBSD-6.0/macppc/INSTALL.ps) = edde76230d345a53de93bb00af333be03971d0dc
+MD5 (NetBSD-6.0/macppc/INSTALL.ps) = f275f19c885be2a1ca922cff1561b5c8
+SHA1 (NetBSD-6.0/macppc/INSTALL.txt) = e7e55b4231206d5fc087d6ad0c4b8ef52a73e385
+SHA512 (NetBSD-6.0/macppc/INSTALL.txt) = 51f4462c903b0948ca5634bf27a9988924cfc3a8249310f1c5f2fc3c8372e9ab916cf106fa7bd9153ccc44454a1fc298024214575f43bf938a7e8a8a18163038
+RMD160 (NetBSD-6.0/macppc/INSTALL.txt) = 8213d05b6c035c0932159f098633921ab6d79247
+MD5 (NetBSD-6.0/macppc/INSTALL.txt) = 319bfbce37725d2bbafa032c7891529a
+SHA1 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.ecoff.gz) = c7357a28d27e6ba6fd9a1ca72b7f0d0d95c23089
+SHA512 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.ecoff.gz) = 3a0fbe1a79b886094cbb8a3613d3193d2731dbace050847c6d70ee8961b4d0e0dbf2f5d666e5f6c43e5ee2871ef9c59823b5fcadbf2dba16144f8c13e778c821
+RMD160 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.ecoff.gz) = 12b0c1cda3875379f2cd582b5eac8316d9fec2f4
+MD5 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.ecoff.gz) = c24f3d6e9a289d321c0ee250817cd348
+SHA1 (NetBSD-6.0/mipsco/binary/kernel/netbsd-GENERIC.gz) = 188a82d7aab86e27f7defbd0318c12deb06a5200
+SHA512 (NetBSD-6.0/mipsco/binary/kernel/netbsd-GENERIC.gz) = e6c278b3bc3e93137e2a0ccd894420671dc3d8f880b08aa673e51b758d88667fd416b317b90e1eaa72087a8b97322ce629f538f7daf2bc7746f0209d00e3d2f4
+RMD160 (NetBSD-6.0/mipsco/binary/kernel/netbsd-GENERIC.gz) = 19b32d196282fccad2907b3972d0bd8673b0b63b
+MD5 (NetBSD-6.0/mipsco/binary/kernel/netbsd-GENERIC.gz) = d91b37f1b364bf92609c4cd56e738873
+SHA1 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.symbols.gz) = cfae9b61b6577966f0bf0f99e4592ce788f2e047
+SHA512 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.symbols.gz) = e100ef50b40411ee3886ec6b0a77ac45459c4a50b1f5b6fee1961aecbef6ee4fcc5a4a1a215eeaefcf5a47407a3d907848e09fa0299be61acb7a93da813da77f
+RMD160 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.symbols.gz) = 1e65145861489b78275308a994aca38a4e60e3d6
+MD5 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.symbols.gz) = 5a441172f0a1659f405e7db91dcbdbc9
+SHA1 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.gz) = 517897ab45650448a730ae2d9df177e3858c7ecf
+SHA512 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.gz) = c8f2a2b0e243000b5c6a134b1c822e40cd454230039ed39a147320e049a8c4b8f540ba32613a1a189455d2f14f56b2291549b3cc40a16c65baf451e5e6005874
+RMD160 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.gz) = 7a428cf2e424233910e6941975b984f54639d581
+MD5 (NetBSD-6.0/mipsco/binary/kernel/netbsd-INSTALL.gz) = 989821fb043e7208eb7464b9cc3d6faf
+SHA1 (NetBSD-6.0/mipsco/binary/sets/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/mipsco/binary/sets/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/mipsco/binary/sets/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/mipsco/binary/sets/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/mipsco/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/mipsco/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/mipsco/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/mipsco/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/mipsco/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/mipsco/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/mipsco/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/mipsco/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/mipsco/binary/sets/xbase.tgz) = d81c7fe75a90f1b2111a066e78f1f2b3e8edcd8c
+SHA512 (NetBSD-6.0/mipsco/binary/sets/xbase.tgz) = c241391fcde4a685a0a2af6f843844ac2e918024c447a2b5ea2cf5300f69acc42fdadf53d3b0348f10723b786bcc0f420e68fe36228375bf3cb5140de41eb40f
+RMD160 (NetBSD-6.0/mipsco/binary/sets/xbase.tgz) = 2fbf60b64c0b7ac2be72ebf998d9d7390fc40705
+MD5 (NetBSD-6.0/mipsco/binary/sets/xbase.tgz) = cd23ca0f6b359c4d695d4494a147d40f
+SHA1 (NetBSD-6.0/mipsco/binary/sets/xcomp.tgz) = c8f5ff5ea9f9bbe231f92d8b7f3bfcbd2897069f
+SHA512 (NetBSD-6.0/mipsco/binary/sets/xcomp.tgz) = c7590075195019078b68ec5f87e36479ae2e7b7749c523df4ef21c9d881c343cda9f5c2bba897dd313329a76fe5c18e920d92827878d98ce08a7dc776352cd02
+RMD160 (NetBSD-6.0/mipsco/binary/sets/xcomp.tgz) = bc60e267cb6e11b4a7305f8b7074084e179e0ff5
+MD5 (NetBSD-6.0/mipsco/binary/sets/xcomp.tgz) = 8e58ee51667def3bd015f79769c0d932
+SHA1 (NetBSD-6.0/mipsco/binary/sets/xfont.tgz) = c551bd13179b9508c2e3a7e19cec323e8ba21844
+SHA512 (NetBSD-6.0/mipsco/binary/sets/xfont.tgz) = 764527f2f3f4686759fcae3fd093f4e00f34e1249994126221a6f9afe73d4cf8ddfbe8b8311798da2ed38c52466a44bb26ea08ad5aab1c08eebcc9019b4223f7
+RMD160 (NetBSD-6.0/mipsco/binary/sets/xfont.tgz) = b3a365bedf8b4a20f3920d0e33b9a42fce288953
+MD5 (NetBSD-6.0/mipsco/binary/sets/xfont.tgz) = adac8939da213a0195cc1d351f979199
+SHA1 (NetBSD-6.0/mipsco/binary/sets/xserver.tgz) = 686f6e6d722c9676351ab058736f7077b4ebd2f6
+SHA512 (NetBSD-6.0/mipsco/binary/sets/xserver.tgz) = 5c818f22edbeac7325228af99d6da6e44b5eb659c7c9fcc6b332071e97a0a490081eda7f9e0f22d6a3f3a589ae34179b434751a6191db5c664683d7510aecedc
+RMD160 (NetBSD-6.0/mipsco/binary/sets/xserver.tgz) = 0e9f066095b505c7f062bf877147189a7a2f0649
+MD5 (NetBSD-6.0/mipsco/binary/sets/xserver.tgz) = cdd2e5127838437df40af161e0c8398f
+SHA1 (NetBSD-6.0/mipsco/binary/sets/kern-GENERIC.tgz) = 814522219e9ef7544ff09e8a1aeec2544e62e456
+SHA512 (NetBSD-6.0/mipsco/binary/sets/kern-GENERIC.tgz) = 2e81957dd87b68e9f3b69b89d1eaf2f1cea45ea237558bc50e953d1d4987e86bd1fd7701f00971b252df35c8dfa8c006b1777c5941ee4385894680346aa3f286
+RMD160 (NetBSD-6.0/mipsco/binary/sets/kern-GENERIC.tgz) = 00a21ba72b46c7d743c2255d02a5fe462ac90774
+MD5 (NetBSD-6.0/mipsco/binary/sets/kern-GENERIC.tgz) = 85c821c524ccbfede1d34c6436de595e
+SHA1 (NetBSD-6.0/mipsco/binary/sets/base.tgz) = 1a989a4f1f5bd6aa082d2af9c9e339530994e710
+SHA512 (NetBSD-6.0/mipsco/binary/sets/base.tgz) = 0b0029d19eba066306c386aa7569a5af8ce9e2d4e12f73539cceabb3bf3eb9696f006b0fefda001cef488fe4db40a3b519928fa139fd025c8e95669a2b7fddec
+RMD160 (NetBSD-6.0/mipsco/binary/sets/base.tgz) = 30de7c1cda91944523275d184e5629beb3be54f8
+MD5 (NetBSD-6.0/mipsco/binary/sets/base.tgz) = dbf30b2affc7c471b1488c36fab8c383
+SHA1 (NetBSD-6.0/mipsco/binary/sets/comp.tgz) = eae1cdcf3ca993f6903f7c0315b3bded0cb19954
+SHA512 (NetBSD-6.0/mipsco/binary/sets/comp.tgz) = a777f285e5b72c5cd21eae29dc374956a80b738acd11f13d536513cb30a31273043c8c73554e4d227df99d4ef7d20f15bcc8fafc1af1c16718dbe6276c28f5b9
+RMD160 (NetBSD-6.0/mipsco/binary/sets/comp.tgz) = c4dcbd1a3ddec8bf1dddd2ec18d6d9de13dddcb8
+MD5 (NetBSD-6.0/mipsco/binary/sets/comp.tgz) = 2df422a2c23ad3357f41a02d305ca753
+SHA1 (NetBSD-6.0/mipsco/binary/sets/etc.tgz) = 4035cdd82aad7dd4b19ce7b4f18f93de45b4a35a
+SHA512 (NetBSD-6.0/mipsco/binary/sets/etc.tgz) = 8df26b3954bda34cd79ee7036056c166654d36d642c7abddd10caafb0f6692bd745a1f336047de01dcefc32060712559b82ea4381dbb1c3d90eb962a798e9ed0
+RMD160 (NetBSD-6.0/mipsco/binary/sets/etc.tgz) = cb67e9de5fb8560ab973dd6dd877f856582c0538
+MD5 (NetBSD-6.0/mipsco/binary/sets/etc.tgz) = 7cc0cebd7f9c62e5e2cd7fe61e041a2a
+SHA1 (NetBSD-6.0/mipsco/binary/sets/modules.tgz) = 17b0db51acea9fb430bf4f9ee65a3d10b7e01747
+SHA512 (NetBSD-6.0/mipsco/binary/sets/modules.tgz) = 4b60e6a7405c8cdda48f8c85723b4245f3af0f31c333090bc3833f203606d91cdf067a02a9a179956642b368d4f78d1da53cb48bb783a0abf24ac5a1c56681cd
+RMD160 (NetBSD-6.0/mipsco/binary/sets/modules.tgz) = 34019b1b1080db5d84607337765c6fb19c103651
+MD5 (NetBSD-6.0/mipsco/binary/sets/modules.tgz) = f53620978a24bc909f9555125ddc6416
+SHA1 (NetBSD-6.0/mipsco/binary/sets/tests.tgz) = 528b2898dfd85f9c51f382d31f357ff470fccbed
+SHA512 (NetBSD-6.0/mipsco/binary/sets/tests.tgz) = fb52dddb334a13e19dfd657aa165a2be4c9ed546e739d337141735927c74ed444c63a2ccfc7676ddc7301ade3bd9b713ac238a3cc37b8716705222856f26edde
+RMD160 (NetBSD-6.0/mipsco/binary/sets/tests.tgz) = 4bf30f676d0c7cdb6838ea7807c505de82372884
+MD5 (NetBSD-6.0/mipsco/binary/sets/tests.tgz) = a150e930291903d9751319a92ad116be
+SHA1 (NetBSD-6.0/mipsco/binary/sets/text.tgz) = 01174401e42d87684ed569f3001994142451fe29
+SHA512 (NetBSD-6.0/mipsco/binary/sets/text.tgz) = 8f2c57883df809889d5371730ff738429f147eb659895ef3bd25c23a1c78ed3baacee1e09d82630daa92b9dc5810167924537cdcb1234536acbc02269acbfd2f
+RMD160 (NetBSD-6.0/mipsco/binary/sets/text.tgz) = 690f4481c50ab0bcd2a2773e762f250b60a7d088
+MD5 (NetBSD-6.0/mipsco/binary/sets/text.tgz) = 0bb0dfa52358016da848c0783a4e9ccd
+SHA1 (NetBSD-6.0/mipsco/binary/sets/xetc.tgz) = 1824720386f5e1fca6135a77aad15444221ffd3f
+SHA512 (NetBSD-6.0/mipsco/binary/sets/xetc.tgz) = 1f752393b0913fa39f222eb8cff44c9c4b8045008459e2c2122748114a5c69c684153aed737aabceb9fde1cb4852527d6f4375be177b6f8e270aaef9a3360ab7
+RMD160 (NetBSD-6.0/mipsco/binary/sets/xetc.tgz) = 346eb417698387537bd483d12d70796c968c970a
+MD5 (NetBSD-6.0/mipsco/binary/sets/xetc.tgz) = d9822dfdedccbf5fbd3bf6ab9b178186
+SHA1 (NetBSD-6.0/mipsco/installation/diskimage/diskimage.gz) = 7f3836f8a683b1bc03880af9a5440ce0c43d45be
+SHA512 (NetBSD-6.0/mipsco/installation/diskimage/diskimage.gz) = 1c513851002df0e3d6d11e33b5b62df96547e75c300c22737be8f553613404d94dbddf036cb2a00707b8d23b00a14ab3b37fd2251fa0f04b05ab35fd13c241a8
+RMD160 (NetBSD-6.0/mipsco/installation/diskimage/diskimage.gz) = 8b22ef52868c3da50f224a8663683a990816d87e
+MD5 (NetBSD-6.0/mipsco/installation/diskimage/diskimage.gz) = 0264b27319b43fd4e9c8c74e0478dac4
+SHA1 (NetBSD-6.0/mipsco/installation/netboot/diskimage.tgz) = 62ce9d94cbc2d187ef03f9c4c22f0d865c482500
+SHA512 (NetBSD-6.0/mipsco/installation/netboot/diskimage.tgz) = 4b53601368b9a70e6391efab32547a038c5b05b39ac73c1677f8b1317ca0d0458d1178218aa5457d8e0d8545a1f2a20e65e200c3e8d8b04e395d11886e30c22c
+RMD160 (NetBSD-6.0/mipsco/installation/netboot/diskimage.tgz) = 8da2d5476ab14c8f44c732fc07202a234d5b4abc
+MD5 (NetBSD-6.0/mipsco/installation/netboot/diskimage.tgz) = b83ebc427977f9b30679b06765d6babe
+SHA1 (NetBSD-6.0/mmeye/binary/kernel/netbsd-GENERIC.gz) = 93157fd963d5e5967b626593297490082c21b426
+SHA512 (NetBSD-6.0/mmeye/binary/kernel/netbsd-GENERIC.gz) = 300868a582f1eaa960d0d211374ca563a7a5f8347239b178a368ad3c527ee8ef76ca54628fbacc01521903cda04309b666953e1136d1f1fa8ddd28a046d1182c
+RMD160 (NetBSD-6.0/mmeye/binary/kernel/netbsd-GENERIC.gz) = 7da72149fd4cbd471bf3abf076a4f33c8dc0a3a5
+MD5 (NetBSD-6.0/mmeye/binary/kernel/netbsd-GENERIC.gz) = 053862a7ced67c229e688793b99d2fa1
+SHA1 (NetBSD-6.0/mmeye/binary/sets/games.tgz) = 37e15b0950aaaf1af36427ae5dd5866c1879b6b3
+SHA512 (NetBSD-6.0/mmeye/binary/sets/games.tgz) = e674abb1b1966acbc581a8f8b3e37841f48656e66f3302077cbb2de443487912b99521336ec5dc096fa3c7769b2d7623e1d1720a079407ec1861d32159a72ebc
+RMD160 (NetBSD-6.0/mmeye/binary/sets/games.tgz) = 36070071e8315d2352be1b3e563ce7ef7625d184
+MD5 (NetBSD-6.0/mmeye/binary/sets/games.tgz) = 0016145b46957b95dd158b4441dfb010
+SHA1 (NetBSD-6.0/mmeye/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/mmeye/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/mmeye/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/mmeye/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/mmeye/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/mmeye/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/mmeye/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/mmeye/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/mmeye/binary/sets/xbase.tgz) = 564bce6dd7c37b5e941e41d50f363c133fdf8f97
+SHA512 (NetBSD-6.0/mmeye/binary/sets/xbase.tgz) = 23b3306254c789331542e63974f9d7cdc54d99ba2cd67cf6a1c97f09afa4f6cf6aa8798e37b7c38f4a55afd1572154f291fa1bf2e2a1fc87165fd6bd7f89fb80
+RMD160 (NetBSD-6.0/mmeye/binary/sets/xbase.tgz) = 476fbd8301bec0795a01552728ada44204d2dbe6
+MD5 (NetBSD-6.0/mmeye/binary/sets/xbase.tgz) = 9fbbbdb3acfa4ccd9f0b309ea0ed0700
+SHA1 (NetBSD-6.0/mmeye/binary/sets/xcomp.tgz) = 526a278a13833073e6231e879abdec85400ca888
+SHA512 (NetBSD-6.0/mmeye/binary/sets/xcomp.tgz) = d2081a7536e3d7fa27a363afd8f6eb5fc3de4606f11b4857be2f1df59934da9d3d16e0df3a6edf4cdf52c8f579e0e4c06f07de0959b5213c21be1a8fdc2ee134
+RMD160 (NetBSD-6.0/mmeye/binary/sets/xcomp.tgz) = 4a767ff08e9bcf98f886849cabebd1300397256f
+MD5 (NetBSD-6.0/mmeye/binary/sets/xcomp.tgz) = a23a2d8be9298497b4b6d39fda330bf4
+SHA1 (NetBSD-6.0/mmeye/binary/sets/xetc.tgz) = 93a5cfbbfdc641f91ab363d4b65d1158d71c0cfc
+SHA512 (NetBSD-6.0/mmeye/binary/sets/xetc.tgz) = 85a67734801e81e129a37b73ae62211459fb16d4e52a945ef21a4bb908dd7d1d775233956086dd3d59af45bcea24fbd6f54a2a9175756d242b57e07d10767548
+RMD160 (NetBSD-6.0/mmeye/binary/sets/xetc.tgz) = 6fb055d0e1b6264bf1ec396236d903218832377a
+MD5 (NetBSD-6.0/mmeye/binary/sets/xetc.tgz) = af954b56e624948145b91aa451d77392
+SHA1 (NetBSD-6.0/mmeye/binary/sets/xfont.tgz) = 6139c05273b6feeecdfcd11cbe0da91256d12a11
+SHA512 (NetBSD-6.0/mmeye/binary/sets/xfont.tgz) = bb849454ede88d39ca60d6c513c833c2b29ea548adedb9f76870839174a3daa838d38a6ad701c78bfc164e690c5ebda9c9d00d4c23ad816df9f1962313afdbf2
+RMD160 (NetBSD-6.0/mmeye/binary/sets/xfont.tgz) = ea8f123f9f78b429b77ff15c924803da1da2068d
+MD5 (NetBSD-6.0/mmeye/binary/sets/xfont.tgz) = a87cb6769c37ae20dbf0dd70cef93d11
+SHA1 (NetBSD-6.0/mmeye/binary/sets/xserver.tgz) = 6cd4fdb0ff00ef5d89b47e68e538c86e395b2054
+SHA512 (NetBSD-6.0/mmeye/binary/sets/xserver.tgz) = e3b575cab95e297a05a26a03eeff0cf843d665ebdfd103846ad544bef1d04f93aa20ceab09b1dfaae8f59d89ebb1cbef400b7521bdb41f7542f23156540aa4c0
+RMD160 (NetBSD-6.0/mmeye/binary/sets/xserver.tgz) = 7e52b98276b4d097f7babe918e6768ae9d7945db
+MD5 (NetBSD-6.0/mmeye/binary/sets/xserver.tgz) = a505ab4ce0801aabe21fe6038b63809f
+SHA1 (NetBSD-6.0/mmeye/binary/sets/kern-GENERIC.tgz) = e14c11631e2e88e3b57b7d20fc3c645faf18fe37
+SHA512 (NetBSD-6.0/mmeye/binary/sets/kern-GENERIC.tgz) = 29dfa7b68e616b6192620316e85972381e7c104070f2570a4222b22c738eddeebd3d8a49518f64adada548f3cbc31a2c501db6f186d7c2fb4178cd9187d7e289
+RMD160 (NetBSD-6.0/mmeye/binary/sets/kern-GENERIC.tgz) = b4289ab1966d34a7fc19d6736c374e98c969f2f0
+MD5 (NetBSD-6.0/mmeye/binary/sets/kern-GENERIC.tgz) = 6469d2d171a8a4bb99ec9a396d43c4b1
+SHA1 (NetBSD-6.0/mmeye/binary/sets/base.tgz) = f26be3019cb31f22bea52c431ec65026536117d8
+SHA512 (NetBSD-6.0/mmeye/binary/sets/base.tgz) = d595fa01b6176f11dd722a4c0416e83975fabb7669cfb018b364681a82c1fab6d456e35aee5c1e8f62d721708976da1ddea203ba31c782265d95dadc046080b8
+RMD160 (NetBSD-6.0/mmeye/binary/sets/base.tgz) = d08e45a281fa538ba47d5e01b7ca7d2c34d05847
+MD5 (NetBSD-6.0/mmeye/binary/sets/base.tgz) = 3a7f10d4e415aeeab19f10c6cd9683e6
+SHA1 (NetBSD-6.0/mmeye/binary/sets/comp.tgz) = 0e37635ed1c12873ba9443f765fa8ecd7441aa43
+SHA512 (NetBSD-6.0/mmeye/binary/sets/comp.tgz) = 2528bf14ced0b15c49452d705cb60cf9e33187fc759920e4e400fc7a2cbb140efb4e46a135a3c06b7c8b4ae9a2b06094e4f14b32372d3b744d0d898818ac0e4a
+RMD160 (NetBSD-6.0/mmeye/binary/sets/comp.tgz) = 51bee8a0d676f8f51918b76a816ddd417cc38a6b
+MD5 (NetBSD-6.0/mmeye/binary/sets/comp.tgz) = cb209fc3bf35ff197cec755c15879f27
+SHA1 (NetBSD-6.0/mmeye/binary/sets/etc.tgz) = 574390c9066c5a2867c217726a60c5b0fcd954c6
+SHA512 (NetBSD-6.0/mmeye/binary/sets/etc.tgz) = 29f0fdf264263ddca8a04e2a645999127bac3025daf2ee560647f4d15fbaec3d929c725256244fa561ee69d8eddf4c9439d81629894dcccba13d063ec1a0d70f
+RMD160 (NetBSD-6.0/mmeye/binary/sets/etc.tgz) = 5e68a1f6a88a56e63788525987bcbef81314cfd0
+MD5 (NetBSD-6.0/mmeye/binary/sets/etc.tgz) = bb1639782d6f4027a7b872732e0f819c
+SHA1 (NetBSD-6.0/mmeye/binary/sets/modules.tgz) = d687589906a811d0ecf22c89bf54248326aa0bef
+SHA512 (NetBSD-6.0/mmeye/binary/sets/modules.tgz) = fd536f114ba71d1ed7241a81f89af7d26a8b554b6fa12ccb16d2d4e6e23029be66fbf4d2cb4990c65102bf3206972ca00a329c6a6c8cb86ad283356aa38434bc
+RMD160 (NetBSD-6.0/mmeye/binary/sets/modules.tgz) = c2bde6622408d084a8ed7fbeafce2260220c5560
+MD5 (NetBSD-6.0/mmeye/binary/sets/modules.tgz) = d833b7a1b95c96a2fb4c526ddc7b6a62
+SHA1 (NetBSD-6.0/mmeye/binary/sets/tests.tgz) = 28c07cc4ab9c6688c615ecfae68cdd7afeaf627b
+SHA512 (NetBSD-6.0/mmeye/binary/sets/tests.tgz) = bdf6463ad028eef4bfb3feb78d43924c4c176b8195509d25d1f98cc772cd1d4edf1820497dfb1baee7dcc142d0e64e78d3203feab0636fe4d821a4cd64250459
+RMD160 (NetBSD-6.0/mmeye/binary/sets/tests.tgz) = f10cf5b11bb96eb0be1c08f698897cb2c609c2f8
+MD5 (NetBSD-6.0/mmeye/binary/sets/tests.tgz) = a0f6fcd15874d6439da5f852487e3539
+SHA1 (NetBSD-6.0/mmeye/binary/sets/text.tgz) = 59d1600b40b17a4c0459e6b3e0a0c2cff1194270
+SHA512 (NetBSD-6.0/mmeye/binary/sets/text.tgz) = 0c44d1c586ad834e2ecca5bf57e88d3315e19341deefb36e8f9584d22328fa255d9e7c26028091e8e0465aea5e68ead7fe343138f54cd219c69eaeb7facdf85f
+RMD160 (NetBSD-6.0/mmeye/binary/sets/text.tgz) = 258e107b924fc698dd9ac2933f4b040374cc9291
+MD5 (NetBSD-6.0/mmeye/binary/sets/text.tgz) = 241e3f6acd2a44f23f1368c4897ea43a
+SHA1 (NetBSD-6.0/mmeye/INSTALL.html) = 307db90e852c93274d4d475013aa29db682ad785
+SHA512 (NetBSD-6.0/mmeye/INSTALL.html) = 6a10441885d95313036134e897f41508c5823386532d4e57e33d693164d8a6a727f39aad44e3606b614cd037eed7096a2c88962b495f1915dd9db0f1165897dc
+RMD160 (NetBSD-6.0/mmeye/INSTALL.html) = efd26420ebc8e2bbca8e756d05a8978b3c8f6a21
+MD5 (NetBSD-6.0/mmeye/INSTALL.html) = 4074818595561d15e823f3fcf0e319ab
+SHA1 (NetBSD-6.0/mmeye/INSTALL.more) = 508b142e63e52558c975e9b9e8d3ddd5f392f47a
+SHA512 (NetBSD-6.0/mmeye/INSTALL.more) = da8142dcec08c7c1dd64b680e987abed58c6d8685c93c66fc4b1218f18cb64c626949d841b5ee379a09a0b8d1ae8af12a2690d8dbc4f768497f1c3e8e646f377
+RMD160 (NetBSD-6.0/mmeye/INSTALL.more) = 58a81c1cc83e5033ab3a527190e7ee1fae534d76
+MD5 (NetBSD-6.0/mmeye/INSTALL.more) = 248b67d9ac8e481bdfd7952cef78a14e
+SHA1 (NetBSD-6.0/mmeye/INSTALL.ps) = 4bf1609d1513b6e41cfc5cb480dee72432e5a416
+SHA512 (NetBSD-6.0/mmeye/INSTALL.ps) = 691a138a6af72a7e42cc03c71d6bcde5c210ec570507ee25333e1ef9702aa689be0c7d46009aea72dc1dbca93c52a46f1745c1dc985725fa5e63922c4f5927e2
+RMD160 (NetBSD-6.0/mmeye/INSTALL.ps) = 4387c8bab777418797ccf13a05abc4a085b28fab
+MD5 (NetBSD-6.0/mmeye/INSTALL.ps) = 98a48fdc04e24e9d6976363721d644aa
+SHA1 (NetBSD-6.0/mmeye/INSTALL.txt) = 75f5b090195d57c0542212c1b5eed5e5ccd3297e
+SHA512 (NetBSD-6.0/mmeye/INSTALL.txt) = 7c1310578154afee26aa66db4198dc5ba98b9f985f05c9e6a3847fe88e947e1161d541527dd1986ff3ca20ad92468483a2195013ccb8d16e89914006f1d0b566
+RMD160 (NetBSD-6.0/mmeye/INSTALL.txt) = e05dd82511b132d9047eddeee16043524246867b
+MD5 (NetBSD-6.0/mmeye/INSTALL.txt) = e3de50b8b8480113536fa86b62245902
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-GENERIC.gz) = a13aee658df1b52a7aaf3029d425e922ec26d4c1
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-GENERIC.gz) = 218d038a60dc542188f10c56e096434ebd26acddb4919ceb7ef4263ee85a3d25c60e9265683298fccfdcdb6b7d155138428f5029d37c11455d8f49077e0753cc
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-GENERIC.gz) = 5963381f5dff4d47bd58e488fdead7f9e4886d26
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-GENERIC.gz) = 86d45589986fb0bb05dc8c7dc77278a1
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME147.gz) = ea20eed9edbc71eca530c3280770e6f8b09fa270
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME147.gz) = 75a7255373b228b1932477a121111add15fa0ec8b03594794c6b6e3c45055f7ca2be29923b263ffab7ab51b3c9bebc9d8280ea701916b76f581dcc18bb510584
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME147.gz) = ea31d6a830019327b2c3435afdfd947d8464ef23
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME147.gz) = 15c5a42f970736283e7a6a0849bd86d4
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME162.gz) = 041755caacc323b08d0d4bc7d7d50fb178374f24
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME162.gz) = 0f9165f9574da412d25c74601c42f6678b78ae78c04b0eb0753dce9266289fb656071115c32425e79dbb88df2482971d3808095228ce56fa7124ba34a396b0d2
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME162.gz) = d93f72e9bf72b15a7f740977f51270620e17afe6
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME162.gz) = 0c35781afea5d9df108ffe2ff82563f9
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME167.gz) = 4ede6bb44a66a1ca0582e2bd6b38d94dc66e5c22
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME167.gz) = 33feb4ceaa5352e85ed445bb355d997181f69cfe2b08de57a631be7c93c85cb1f42d052bd6de489f6ac631c88c77192785d170e41c0ec6315b88fd429d88f3bf
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME167.gz) = 6768bab2219da0e3ef78324a701e0fb112c18153
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME167.gz) = 6e65873511ff8bb90d721f0c2e559bf4
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME172.gz) = 01ee771c809080dce253e2acbce1bcdfdd46b055
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME172.gz) = 65e0680d9ce92aed2ba08971a434f2a290ccf9f85ce3365327ec8185c5d57e1bdf08593c5ff18e3c0e6581c78ceadd570d25fb1e714edd7896fca09fae727695
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME172.gz) = 93136f2a9773f5e243622e756ea3969c3732403d
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME172.gz) = 08a73d99398505743b3de4f5394ffdd7
+SHA1 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME177.gz) = e884157c76ca076bd53f3c1752b4f95ade2eacea
+SHA512 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME177.gz) = 13a0a7e5c50848593ccbf5876cf27988b138582fff9d4f140cc3b63b9d768163ddea65752fd0676614ccbb85f64d0efdd3611ff2fce31837afb9acebcdb63657
+RMD160 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME177.gz) = 898154c89255fca36e0ec7051638b32cfb541dfd
+MD5 (NetBSD-6.0/mvme68k/binary/kernel/netbsd-VME177.gz) = 77d2383aa5faff6ecc139af1e7dc51fa
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/mvme68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/mvme68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/mvme68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/mvme68k/binary/sets/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-GENERIC.tgz) = b5f282108361e17368d9ca8615f3021473169abf
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-GENERIC.tgz) = 165bec66d47652cb43981780aa068960efd933f9538145f363a559d8cc58d16d78ae5d588d98bb39795cdde762f280b36750211da2ed3a5298b0d94edf2e0bb5
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-GENERIC.tgz) = 1ad2613634bf8c7654f87c4a54c9d3e6c0b1f349
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-GENERIC.tgz) = b4b8eee7f4f1854f8632928b5ee516de
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/base.tgz) = c3e2ce1f54481094d67ff2a87a6b5000d8130ad2
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/base.tgz) = 02c29cbe0171a6c5312fb1a468e68bb8a5a5258df936c0a31fccb7bc04c8e1293d41ce6f67de08ca5584c6208dd9050c70f99c1c3b8c35a499bf94a957808797
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/base.tgz) = 7920bf359b28e793c0410ce08a98025dd3ea6971
+MD5 (NetBSD-6.0/mvme68k/binary/sets/base.tgz) = c9893e324841703eed47b475c2d37607
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/comp.tgz) = 100d0663bb2c601df55d490315c9b36b7ea700f3
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/comp.tgz) = 70bf8fc817821c6c5061776bac0ee9ebf8567fd19a2d98c751d1073a706290eb9870627b2f1fea650d19a876e8a5215e5e52407437d6be977777013f5f59fa8a
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/comp.tgz) = 497fb5a993abc08f005e1f287b8520dbace84549
+MD5 (NetBSD-6.0/mvme68k/binary/sets/comp.tgz) = 24cf494b20e22c8630e6bbba17b96bc1
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/etc.tgz) = c6f1d70ad7bf234c79f4e15508b09c7b0c33f1d8
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/etc.tgz) = 13a8204695757c27b69ed52a02c55a1e2b2d6140a5dfffd8f9f24625a56c9f3bd1f5de868a99c265e5fc759cb80cb7239dbe965c44693fcce6e98e7691076d36
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/etc.tgz) = 7365dfc472b89a3b017cdcf41bf10f928dcf723e
+MD5 (NetBSD-6.0/mvme68k/binary/sets/etc.tgz) = 1e8812db12c38683ce12950d00ded70a
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-VME147.tgz) = 96374aa39856e13589e98f1552dd756b4f1911e9
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-VME147.tgz) = f31cc707ced4c96b2019d7d44169e203f6df2616d09e7a3f4e2a4f0e4c509e978ba324761bdd26d1ee443e4d72e90e00effc24e537644013d5a2de95f3812574
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-VME147.tgz) = 219ba053784c069875b7434631463f61293bab1c
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-VME147.tgz) = 5349b757ec12a84df1e102583674646d
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-VME162.tgz) = c56ed72a7c0da9fb44d19ece17801d1b7527e05a
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-VME162.tgz) = 12078cbbbd7b1093f956b6526643b446890b82c043b17fc97e61259f54fc81cdbd8ebc56a735eb5937bff004b63d7f291e7ea2cd0dad3bd5b07f089df2c83ab7
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-VME162.tgz) = cfddd4246205e867729907015fc6dd16da7fe6e5
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-VME162.tgz) = 432a04306d40c933f2e04e5a332800e2
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-VME167.tgz) = 90302a0bc14e084f2643de427e87bc5b04553ab0
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-VME167.tgz) = 62c19ad0fb282a427beb1bf2d0d1b9a1cfc2681bcd04e3fb51ade0e793f26b52d04b5eb28e4c25524244e8c6dad724fc07de7a6544438cbd2a503972999f23ea
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-VME167.tgz) = d84d45b735805261e014ae52746e279902ad7e9a
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-VME167.tgz) = 8d38010b19b455f324d0b08485482395
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-VME172.tgz) = 017724bf77e35e2021308dadafe5a90e59a32498
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-VME172.tgz) = c3ca75dd2287e6af935934a4dabba21f085889383c395c8c72636047d682541ee5669998dd5988e0127879d7b34df260dc9109c292a2c2663ca8cfbed9c03278
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-VME172.tgz) = d8676c3325db3b3f619599f9e7a33cf3b1eb5bf1
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-VME172.tgz) = b89cd9b71b5b68285bf36d958a3b8746
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/kern-VME177.tgz) = f9bdc8e89488ba91385adf9f0960633ba7dbf6da
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/kern-VME177.tgz) = 642825fa141d2de457a0d3eca1224cdb5b087383dca6ed4f36668be6f6fe9f9e30b942ec5eb177b4733aaad40f6a0eace0f744fba3777eb356dd75d8c113785f
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/kern-VME177.tgz) = ef6abd72e2a71a5995c628107f473ceabe2945e6
+MD5 (NetBSD-6.0/mvme68k/binary/sets/kern-VME177.tgz) = 42b79dd96c98e97639d1a9d698673996
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/modules.tgz) = 5479e9142d1f21bc8346cd34e9f00761e2e05f48
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/modules.tgz) = 094b2d20eb3dc973fc212085dcc4d110249fc71eb017ea390b7f9aeffd4d8d0aeb51d421b4c95add33a17ac5d7dae1e3c9fc654f8a4181d078dbe2bac95a96b6
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/modules.tgz) = 187b451690395a8e05f22294016a627e4db4539f
+MD5 (NetBSD-6.0/mvme68k/binary/sets/modules.tgz) = 5d3d2aa79488e5f8e90ff7b26f80fc97
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/tests.tgz) = b994ffc0b63206aa7a8ab6de392ec33189894764
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/tests.tgz) = 714ac7fe966021f842409c135711b7adfb03c4b6a095df9527d02d1b83b14db62f1ec1a7eaaaebc68e4f12588e52fab9318c21912f20b8380a7a8b8e30e8576d
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/tests.tgz) = ba3293225ace42d8c47037879ba0cecd8f883aaf
+MD5 (NetBSD-6.0/mvme68k/binary/sets/tests.tgz) = e32c51104c90b3b684d1d640ba79b46a
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/text.tgz) = 61b398a67c4c47f8633d393dda778ac5c1ed8698
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/text.tgz) = 29b9bb0c5aefb3d765eb6204967c3ff14f7a28b0987723c3685a2b34fa799947c876971bf524a8e43b146e9e91e37cbc89a0c4da87c47e9856bdf9d96a67f125
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/text.tgz) = a73c95546d018a1853c6d00f5924da860fe9e5d0
+MD5 (NetBSD-6.0/mvme68k/binary/sets/text.tgz) = b0dbc4ddc47ab74ab24bdc0bede769a2
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/xbase.tgz) = a31e38ba081b5abb671cf5f7350799782a628712
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/xbase.tgz) = fa78acfbace842e0995a7f181193220f80dcae731221bf1722ece1a5bef6de846089b919beebacd7921567105f8ddae9bdaaabe0b065b62a0f18d917f03b54d9
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/xbase.tgz) = 1cb1d631feb356639d3b1362518ba5f09f084510
+MD5 (NetBSD-6.0/mvme68k/binary/sets/xbase.tgz) = dae635ef3bd334e14be8b8b66a227353
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/xcomp.tgz) = fbc80a68ccbef35cab4228a5ce96b22b383d9080
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/xcomp.tgz) = 694780dd165f0831eac6b47ec6fd5c60589749a21e88700965a99154067b76fa374b8f7a55f26963cdba8caafe9548f66b222826cc265393e992addbf19dd468
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/xcomp.tgz) = 7db19d8ccd7dbda6032d9c29a65d03bf9c71644d
+MD5 (NetBSD-6.0/mvme68k/binary/sets/xcomp.tgz) = 913bbabb9e401d6a31cc09a3d259b132
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/xetc.tgz) = 1aa27f8388f5bb0aa85eec00e225fc92736da214
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/xetc.tgz) = 1b524f2137ea4cc5f816623a7b042b05b1303664d244b0172799b365cb16df34f0a8a47277077055baf266c7c92d5f112830ed357fa811bdf6bd713b2f90275e
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/xetc.tgz) = b50ff4df41b13b9276393e871e976648d344ee7f
+MD5 (NetBSD-6.0/mvme68k/binary/sets/xetc.tgz) = d7709463a7a8404b6ef93aeb60755f7f
+SHA1 (NetBSD-6.0/mvme68k/binary/sets/xfont.tgz) = 4f8d5c51bdd02bdff0dca66f54e5ebd25e4d6110
+SHA512 (NetBSD-6.0/mvme68k/binary/sets/xfont.tgz) = fbad852b3a697906a2ffb460f8fefe8f9aa9f2088f66423d838abc18941d497bf6f9491934de0e3359159d35c98f205b23bb9c328f832e7e62c99310067687e6
+RMD160 (NetBSD-6.0/mvme68k/binary/sets/xfont.tgz) = 41c3686ef9c2cc25eff4b9923ae3163aa9c28590
+MD5 (NetBSD-6.0/mvme68k/binary/sets/xfont.tgz) = 2ec6dafe4dbe645a90960ade3e86caed
+SHA1 (NetBSD-6.0/mvme68k/installation/miniroot/miniroot.fs.gz) = 12df0f0fef9a077c27d02d2960d04ea3a148fa76
+SHA512 (NetBSD-6.0/mvme68k/installation/miniroot/miniroot.fs.gz) = fa3eeb4f14b741311ef72000e6c283195f4513e81a35f9c0a1829dbf8795d0518355b0d54d35a17c56568ac8e6db5977c1a7d4bb902c20786f901efd9b35ec42
+RMD160 (NetBSD-6.0/mvme68k/installation/miniroot/miniroot.fs.gz) = aeeeee1a475c8ef1d595c5cdff5bb3cc765bbea1
+MD5 (NetBSD-6.0/mvme68k/installation/miniroot/miniroot.fs.gz) = 9bff82e8d2d57a3fad2e831272aee965
+SHA1 (NetBSD-6.0/mvme68k/installation/netboot/netboot) = 588e8808e6e24e0a570f529c0dde8f02bcb74edd
+SHA512 (NetBSD-6.0/mvme68k/installation/netboot/netboot) = 6e0b6bc3f5de5940811d0929dd0d5f65351402176ae9c8e44a0220b807b41e98c8363d4917b1f506a847c3510bfec3d78584eae8f9e1c337130b37da4d3c6f07
+RMD160 (NetBSD-6.0/mvme68k/installation/netboot/netboot) = f1239616c5743fba614065450b1aa9ca8f4057f5
+MD5 (NetBSD-6.0/mvme68k/installation/netboot/netboot) = ee5d8acc83e9f62ee902acd1da69b3d5
+SHA1 (NetBSD-6.0/mvme68k/installation/netboot/sboot) = 5f45e50e16e46d9ab20ad20d929d1a01e4d60ad5
+SHA512 (NetBSD-6.0/mvme68k/installation/netboot/sboot) = bcd667220dd50d44aa895c0d76b9ee906dd6e3ff72d9bb80167cf48ddb6456c5cb8c06829e66ee06cf69c99e50afa3005f23a6854fc56ea2a027b50315eace2c
+RMD160 (NetBSD-6.0/mvme68k/installation/netboot/sboot) = eee81405c2dd838804a4d13219b431e93120fdae
+MD5 (NetBSD-6.0/mvme68k/installation/netboot/sboot) = bd2f963054643f0ffa22af1ea8ecda92
+SHA1 (NetBSD-6.0/mvme68k/installation/tapeimage/bootst) = df842ee6dc97b75a8f8b8e20996f60fa5c0e6ff9
+SHA512 (NetBSD-6.0/mvme68k/installation/tapeimage/bootst) = 3a6900acfffe7118e262864abea6c325e1e69060f2b47556b8865f2f28458beb29e56d96a61a8b98520530ba3d6b5ee4e0d5499cc698497445e0d480d0b9466b
+RMD160 (NetBSD-6.0/mvme68k/installation/tapeimage/bootst) = 78ea882ed8fd3cadb3b25971c7d0ad2ef159918b
+MD5 (NetBSD-6.0/mvme68k/installation/tapeimage/bootst) = 720e708780805b3a7afa57bcdb9ee62b
+SHA1 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.symbols.gz) = 0c590bfc2ae0c74a96ac421e16e9f6aea312d63f
+SHA512 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.symbols.gz) = 1f91be15380c61c4b2eebc8e34fb6eba768dc06fe958ba03cd1a074ef76e77c490d63484834b458bef181f18a5dd84444dcb33b4ed1b35360f7df9ab727a5088
+RMD160 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.symbols.gz) = 49fe1be9202c415a147b25ca21b57c4e91f3d886
+MD5 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.symbols.gz) = 387b741997770fa953dd689bdc7c2dce
+SHA1 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.gz) = 071feb6189682ed7fde6e75790b17ed023512e15
+SHA512 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.gz) = 029ef207dc80563c3d28369d7f6b1a99dae4ca573dccae9983bf3d135cbef8aece9d69a8fafe0c989bf5fc851d5a31d61c77911f7680dc4584a9229f582359f5
+RMD160 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.gz) = 6ca56e2be45d06a300f533941a582caafcbe5623
+MD5 (NetBSD-6.0/mvme68k/installation/tapeimage/netbsd-RAMDISK.gz) = 16c9e88acf91351f83fcec78132304bd
+SHA1 (NetBSD-6.0/mvme68k/installation/tapeimage/stboot) = 652f8b35ed92540699c4a0b92d781bab584ff9ed
+SHA512 (NetBSD-6.0/mvme68k/installation/tapeimage/stboot) = 63627858e9ea5ddf22d56e9f5bbc94c53a5fa45eb877b7b540931eaee973bf82251afaf6acf6078456f9aec047eb60b7bd66e694bafaa2210b51b0e83e19fd21
+RMD160 (NetBSD-6.0/mvme68k/installation/tapeimage/stboot) = 1283f83860ab4f66692d5ef01d0cdeceb40668b8
+MD5 (NetBSD-6.0/mvme68k/installation/tapeimage/stboot) = a54cfad8cf02a1a31a004dbc5c0a037e
+SHA1 (NetBSD-6.0/mvme68k/INSTALL.html) = e3f98f5f338b9417a3f88ccc83fda9eb47696c0e
+SHA512 (NetBSD-6.0/mvme68k/INSTALL.html) = b1750f826b36c84a821126455bdba2e1116bd51cd3b404c7b0c0b80110130e81e19105cd5d04563d31824e996820e1992486827b818f3f9a01d87f2b2d4da46b
+RMD160 (NetBSD-6.0/mvme68k/INSTALL.html) = d6ab4cf012544dae8696f8f41208dd27ddc1ea7b
+MD5 (NetBSD-6.0/mvme68k/INSTALL.html) = cd685f3e5b2052919547bfd9c8d98d0e
+SHA1 (NetBSD-6.0/mvme68k/INSTALL.more) = 82746f9fb96a2db4cec433f8bad448fccaa98eef
+SHA512 (NetBSD-6.0/mvme68k/INSTALL.more) = 676952c9168c0dcaea1eef58271884f95e8ad80380e33a060e29be2da7e7b139a731369e6cc0a112779be95c412de4be19f716284a3724b41f93cc5075e93b9d
+RMD160 (NetBSD-6.0/mvme68k/INSTALL.more) = 79436013f39135308106f0d08b8a0fc951773a09
+MD5 (NetBSD-6.0/mvme68k/INSTALL.more) = 95f12215d3961d47f7cc70f786c331da
+SHA1 (NetBSD-6.0/mvme68k/INSTALL.ps) = b2c39b95dd800c754733c8986e8f279a5895b9f9
+SHA512 (NetBSD-6.0/mvme68k/INSTALL.ps) = 120009d7f5781b9c060f3852d92bc047590b3d86d6491aa700c61d935ce8bccec1ddcca64f60fe17ffffa66871ec9c9908d42b738f8e37def53c97ac3a339c6a
+RMD160 (NetBSD-6.0/mvme68k/INSTALL.ps) = 1cc7939281b187b32afa1a30955dfc3751d8dc4b
+MD5 (NetBSD-6.0/mvme68k/INSTALL.ps) = b0c09fe08cf758e2dea14a23111c0c2f
+SHA1 (NetBSD-6.0/mvme68k/INSTALL.txt) = d25191ccd7930c3335bacbc56dfcbfd7ab04091d
+SHA512 (NetBSD-6.0/mvme68k/INSTALL.txt) = 581736f1c9236b74a0321e060d27305911aa735244a5b2e54825617cd97fa5bc1523472b87b65057fb3bc0f08216c7b53e60dca0c8ead238d7ea3da16502f16a
+RMD160 (NetBSD-6.0/mvme68k/INSTALL.txt) = 05b193bfebc12030dcbe3c96273582360eb132e3
+MD5 (NetBSD-6.0/mvme68k/INSTALL.txt) = c895e463555bd32f7b61fa481b63213d
+SHA1 (NetBSD-6.0/mvmeppc/binary/kernel/netbsd-GENERIC.gz) = 418f7d15770b902578623141540daa7987ed2659
+SHA512 (NetBSD-6.0/mvmeppc/binary/kernel/netbsd-GENERIC.gz) = f8ad97d747d2ffc1de7408ae9360afe25fb82eb60f73fc62198432ecb059aa64dfdc7ed74fc0d63e70a815d12414c6c9f1d8e5a717d614bafa0c9c299548ab9a
+RMD160 (NetBSD-6.0/mvmeppc/binary/kernel/netbsd-GENERIC.gz) = e3603ef7455506046e4f789e2341020d81bfb46b
+MD5 (NetBSD-6.0/mvmeppc/binary/kernel/netbsd-GENERIC.gz) = 713e8e8d42cebf7dea0ae4e96670a52a
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/xbase.tgz) = b7c8146146ebc15191c1bf53f51f8f980fe8c816
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/xbase.tgz) = 091f5d00414a9ad478811bfb0e953f2a204869bc5e310790886a59c11953974cf7068cd9a96c8823856ab2687ffa2ac31e97494f47338bfe31d80217382c59f1
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/xbase.tgz) = 4bd1bfdc7c1e1619de63fb83276c21039b945357
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/xbase.tgz) = e621806afa0fcc9cdcef0f9b3c7dfcbd
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/xserver.tgz) = 05aac7e617e0cac05a88062fef29bb459da7a1d1
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/xserver.tgz) = 19fb5af5d6afd78839a22e5c0694a492047b5200c569cbf58c676ff32ec250b21edcfe2ed00b65092fdac374d1ab9eaaed6113c69bc03009cf458aedc6014913
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/xserver.tgz) = 774d2a1072b8d122790ad189a6d2ada2ad99e7cf
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/xserver.tgz) = 3daf1477cadf3593e9ba45e3703fe8a5
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/kern-GENERIC.tgz) = cb6794f87c6c90ffe561a49bb2b3b48a5dacb40a
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/kern-GENERIC.tgz) = 6ee4daa27b1f69c1df2bcfb09ba9efd43a3ffd07e7de964e8f6a59ab46e0f36681a410527be024a58dff6f2efcb8f7a5af5da857fc36cca6d6bb8b71a3fd7c4e
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/kern-GENERIC.tgz) = 809b466fff3437d0e9ef68e9380b08145900b9cb
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/kern-GENERIC.tgz) = 21a47714184c5a998e528ceac6d8acb3
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/base.tgz) = cd5e92a746545a809e765ded7acbaac7de15f633
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/base.tgz) = ae16a9e58ccadf19e57966b608b0230cdeb066f65997cf36749dd72597ad80741f9a5a8f6f9b49e7ff42fe071c07fbdcc237e076ffd7a9fc4cfe94e9aecae6ef
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/base.tgz) = e8ce9e46b09fea354214094c65f085f963f9fabb
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/base.tgz) = 3480b07c4c07ba28b82c27eb4e566b9b
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/comp.tgz) = f8a50dda9bf86a613d543daad62ea5aeb0455af8
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/comp.tgz) = 5a042383539c5fa72acca742a572cc185f28e2e82f9b0a05af00a57ba3ef220272f4221718cb05322b6010236af0a29254afb0e7716a7bc1543a72bdb7ab2990
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/comp.tgz) = e13123ebdbe098433cfe3c82ff350ccf23206004
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/comp.tgz) = 93a0b66d03af7b52d9e2394c7fcc93b4
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/etc.tgz) = 7295ed78597062a35a244940465c2148ba96ccb1
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/etc.tgz) = 28ab60b5de702a8c4369ef7a04fd88d92a33eb79c3537c7593f1e2c3b16aecfdfb03582daa36dc97d1ab147d0a217a0354906475dae397970b991e39d88905b1
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/etc.tgz) = 814c4c6297cc41c8961e92e042c1ceea8d0f7bf5
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/etc.tgz) = 9b00467e487f1dc4c8e6e520f531e48b
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/modules.tgz) = 07df9e6517dc7ab1f7b4d89e4c69a0f6ed5e2551
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/modules.tgz) = bdb4958d494d5cb163ab0c77759fcf2c7c826e4f026d25fd156a19c44dd337064b604d9e5fcfd2bf60140be482cdfce94ce6d382911b813291ba2bf5a0c424cc
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/modules.tgz) = 43473d4d0defd1cff47ee9f1874161538a4b82ac
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/modules.tgz) = b73307a25c9030b40171a0360293a564
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/tests.tgz) = 9b7fcd1db26e218ce61b5325966cbc8fdf647ec7
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/tests.tgz) = c18be2b0c91b327f620d40c6ee7890dbff28fb4a431f2fec6a870c7542e08a0545c256547371cb2039a8707ae5d5d0a5b876ab209f7ea4f2ec66e4d5f676f05b
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/tests.tgz) = 78c4ec64a4a643c239af74a89cc617bd5e959fa2
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/tests.tgz) = d6e2627f54fc989e87ba95e4243e933e
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/text.tgz) = 0ef97a5332a5c76de8329dd7dd9d97fe8528a83b
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/text.tgz) = b75d8259b2a0886380f796340d08c4f56ab60002e02c04b09665e87e14eed8cddd86ae483c12e236e7589291f579a516dd049be349fd3af7c63f245cd8ddc0a4
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/text.tgz) = eaad1bf719adc5b5e1645c5fc77be97c1c946ddf
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/text.tgz) = 22b500a7593d8b412fc9c000558444a3
+SHA1 (NetBSD-6.0/mvmeppc/binary/sets/xetc.tgz) = 98938e35cc38b7007b05b049e42e888ec0a93860
+SHA512 (NetBSD-6.0/mvmeppc/binary/sets/xetc.tgz) = 0e9027a638278b6102fab31d408f258e8798bfffc6400e99b434656b81bf13053605caa8c3e8d0744685d359261fd8576c267f5eeb987da4c3a054aaf17bb993
+RMD160 (NetBSD-6.0/mvmeppc/binary/sets/xetc.tgz) = f71d30b8062059ead3243e21c732ebca57eb117d
+MD5 (NetBSD-6.0/mvmeppc/binary/sets/xetc.tgz) = e09a8d3ed7015c6b274ef5a025041fa2
+SHA1 (NetBSD-6.0/netwinder/binary/kernel/netbsd-GENERIC.gz) = e5f0ce4b52ffef57f8ecc29a7c26ddb9181a5c59
+SHA512 (NetBSD-6.0/netwinder/binary/kernel/netbsd-GENERIC.gz) = e1d81a5be8964559be0b23b0d6a4ca22f95dac64abf4a1ebc7912cbab18f47ee31ab954d85155feb750926267b7b886c1eead88223b16a4c4a363f8286d5110a
+RMD160 (NetBSD-6.0/netwinder/binary/kernel/netbsd-GENERIC.gz) = e270203b95b8a0f7736779454b07957e20ccdbbf
+MD5 (NetBSD-6.0/netwinder/binary/kernel/netbsd-GENERIC.gz) = 18ec5abd22e842bdc99a66e283e07231
+SHA1 (NetBSD-6.0/netwinder/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/netwinder/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/netwinder/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/netwinder/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/netwinder/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/netwinder/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/netwinder/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/netwinder/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/netwinder/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/netwinder/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/netwinder/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/netwinder/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/netwinder/binary/sets/kern-GENERIC.tgz) = 3f337b136bc35343128f53eabc787cf5a5a5a6a4
+SHA512 (NetBSD-6.0/netwinder/binary/sets/kern-GENERIC.tgz) = 2243a1cbdf776e683d5cb32b411adddd35e137dec2bea0e9a2d9df17972a8ebea0302328171c8fdd06da240689991c623b07a953cb8e374ace3607c0bbb6c5f7
+RMD160 (NetBSD-6.0/netwinder/binary/sets/kern-GENERIC.tgz) = bb3ef1387ed7dcee67af89f3662f2eb39a23ee7b
+MD5 (NetBSD-6.0/netwinder/binary/sets/kern-GENERIC.tgz) = b370234d8f18c218bc78739602325c44
+SHA1 (NetBSD-6.0/netwinder/binary/sets/base.tgz) = feddaeaf51113aca08fb9dd5689745efcd3ea178
+SHA512 (NetBSD-6.0/netwinder/binary/sets/base.tgz) = 1fc5531cf2b47451e0eff63df4222a4e88f7f0112d4f0b2e43009b39dd98a0550f015833d22fb0d7c0ffa9b699944fb72283715f51e5bdae97d263e167b787b4
+RMD160 (NetBSD-6.0/netwinder/binary/sets/base.tgz) = 4e1e7dcd563d7e68d0cfa8824cfa25bffd17187b
+MD5 (NetBSD-6.0/netwinder/binary/sets/base.tgz) = b5f660d9a7fe6f6fa951a3a7c3c0f6a5
+SHA1 (NetBSD-6.0/netwinder/binary/sets/comp.tgz) = 06b1e34718e894be491327ee15f5464e91aaac32
+SHA512 (NetBSD-6.0/netwinder/binary/sets/comp.tgz) = 3f6ea371d7852951a374855e3ed4396b683b752aabe0d47e0e6b1d7243b9468023ec6893076a6d77861ccc6f8ff74957bdb4675adc878fcfa620dda04f13d02b
+RMD160 (NetBSD-6.0/netwinder/binary/sets/comp.tgz) = 21fb07ace630d66e088ca8fba7f3de545bf75b0c
+MD5 (NetBSD-6.0/netwinder/binary/sets/comp.tgz) = 0b21dce21957ca73da5de9ebbeb3a157
+SHA1 (NetBSD-6.0/netwinder/binary/sets/etc.tgz) = 6eb3f0d4ee4b86c87bd03cc4f93958a42e9079f3
+SHA512 (NetBSD-6.0/netwinder/binary/sets/etc.tgz) = 2de4303f21bd502d062486b8789198bbf3e7f5068888d62d4da08e5e51d58f42ede6ea13c8a83bfbc9d0cc64cc6e11d3f2e949a3c2ad800aa78680d4046aa7d1
+RMD160 (NetBSD-6.0/netwinder/binary/sets/etc.tgz) = 3a77fb3f3a4ea25db5b8b450274bade4192541c8
+MD5 (NetBSD-6.0/netwinder/binary/sets/etc.tgz) = f57f45618396a67a169ab7c0e74be2d5
+SHA1 (NetBSD-6.0/netwinder/binary/sets/modules.tgz) = 780745396f7dee2fcce36e4c401f9462ee620e55
+SHA512 (NetBSD-6.0/netwinder/binary/sets/modules.tgz) = 9e4ffad337fd2e30a157ec7ade8f868043addcc2e8020a950cfd8e515d17bccae185b04ff15dfccebce764c1e0a8f1f722bac33e385ae294700dac0b0c3a5792
+RMD160 (NetBSD-6.0/netwinder/binary/sets/modules.tgz) = af686e341bf03f36fc43b5bfa86015e3204803f9
+MD5 (NetBSD-6.0/netwinder/binary/sets/modules.tgz) = eb5745d3d6289ded145654a58bf4a9e0
+SHA1 (NetBSD-6.0/netwinder/binary/sets/tests.tgz) = 46a999d0afcee9103c765b57765971557cffb18d
+SHA512 (NetBSD-6.0/netwinder/binary/sets/tests.tgz) = 0937f49f33fd690da609dff62adf04978e1ca36e61e3357e360e3ca622e406758a12e5909fa0aa431f914eb145625cc7dc3dc1caf09bf2793feec7db45cba00a
+RMD160 (NetBSD-6.0/netwinder/binary/sets/tests.tgz) = 7d070858cc4bdbbee9bd6568acf73cc9b70147b0
+MD5 (NetBSD-6.0/netwinder/binary/sets/tests.tgz) = 879591282409cebe2b0c397f9c05f417
+SHA1 (NetBSD-6.0/netwinder/binary/sets/text.tgz) = bc73c2b37be55d902c10db2244412f884dcb2c49
+SHA512 (NetBSD-6.0/netwinder/binary/sets/text.tgz) = cbf470fcdd95eb9bf94d5296d7d728eb537a243ed03448e134e56c6714c6528968d217c69e3ac830045f2b8b5c8c4df451fd24ff2b5b176d37fcd84ca1f07f92
+RMD160 (NetBSD-6.0/netwinder/binary/sets/text.tgz) = 00aeff72db0b05b48fa40bf80b1e24c5a667fd0f
+MD5 (NetBSD-6.0/netwinder/binary/sets/text.tgz) = 42470e4348951037fd056476c26dbb77
+SHA1 (NetBSD-6.0/netwinder/binary/sets/xbase.tgz) = 66d3e62a116c56bfaac8ee3257ba675a845b9ab3
+SHA512 (NetBSD-6.0/netwinder/binary/sets/xbase.tgz) = bfc8c00cfc6bf2fcb3d26ff9abb9e6091c5389aeac5370ae475b3c74569e3ccf05494e363544d6c805820e2c7554a1fea936abab6e3212dd4710e2463625006a
+RMD160 (NetBSD-6.0/netwinder/binary/sets/xbase.tgz) = 26ff99801c9a84190cca4292c137c17305bec08c
+MD5 (NetBSD-6.0/netwinder/binary/sets/xbase.tgz) = 532381165745c160613ef72bcd7e7848
+SHA1 (NetBSD-6.0/netwinder/binary/sets/xcomp.tgz) = 0eed09b5c7a6e8d76c99ddaa31029f414a14d6bd
+SHA512 (NetBSD-6.0/netwinder/binary/sets/xcomp.tgz) = b03064377958f9ca9252e83d2933574a5f0fedc89ac864641340f8e50a6d5fa1a074d45a80f0dcb1567ef7d23eb2bc4bec3de866c2d07912ab4122acaf062c35
+RMD160 (NetBSD-6.0/netwinder/binary/sets/xcomp.tgz) = f7a208a7ac2137d4940ec2f78c0658e630ea329e
+MD5 (NetBSD-6.0/netwinder/binary/sets/xcomp.tgz) = fa248543b87b553473cc67fd45e385ae
+SHA1 (NetBSD-6.0/netwinder/binary/sets/xetc.tgz) = 4e2fdc95511cd90317da41fb941f7ec6f622b84e
+SHA512 (NetBSD-6.0/netwinder/binary/sets/xetc.tgz) = 57a60f983fadbdb0a0ef5720c2bda405d4052d460f67976e71a34ad016d25357cd04fbdf48e866c3641dcabc55194a683931a0b36c7f55549a7998c31e42ef88
+RMD160 (NetBSD-6.0/netwinder/binary/sets/xetc.tgz) = fef501d07dce370292072f65ed25dd32df41bfcb
+MD5 (NetBSD-6.0/netwinder/binary/sets/xetc.tgz) = efdbfcb8e6fbf0c4cb2094e749c54b1a
+SHA1 (NetBSD-6.0/netwinder/binary/sets/xfont.tgz) = b92ebefbcc4a96bdbba5540df3119bed0ee2efdf
+SHA512 (NetBSD-6.0/netwinder/binary/sets/xfont.tgz) = 605e099b75b0133d811b12387461856bcf7ef7cc0dddc68490eb6ef51ba284ac2edafcc757feb0665618b119eacd2509c302f42736eb0d582ab7f17f5fdb1b23
+RMD160 (NetBSD-6.0/netwinder/binary/sets/xfont.tgz) = 084a5e8e5f95debf53ba5be9e52230fe72dbb2d0
+MD5 (NetBSD-6.0/netwinder/binary/sets/xfont.tgz) = 02b5344f23cdb9eb4d9cbe8b30c7707e
+SHA1 (NetBSD-6.0/netwinder/binary/sets/xserver.tgz) = 570bbfb56fda998c07f8414731eaf79af5b01bd1
+SHA512 (NetBSD-6.0/netwinder/binary/sets/xserver.tgz) = b70eccc78ca3e290869502760fcc8a8378db3d49c402f075e2f12e1453a7fbb68911df18993c0966ce840b837225d577344ec7088d2aea5eac78130e9dcce0ec
+RMD160 (NetBSD-6.0/netwinder/binary/sets/xserver.tgz) = 5b7c5740805aebc0ea76f778b429803b25cf9128
+MD5 (NetBSD-6.0/netwinder/binary/sets/xserver.tgz) = d866ffe531725f8c18bd3f88129d09db
+SHA1 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC_TINY.gz) = c260c1b8e7017de3a9c7383ebad6833c172b745c
+SHA512 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC_TINY.gz) = da338bee7bcaf58401ea3fa629c91fc5732016581d869f2bb8897f252c90e296773eaf35dae48667a753e7119340ac376fff713f3f87e25802fb3874879fcc65
+RMD160 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC_TINY.gz) = 25e70f61645eea330feda79fa0e6302bedeecdc3
+MD5 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC_TINY.gz) = df5ca7bb950327f08e460757a4b03de4
+SHA1 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC.gz) = 96c08009db46bd9bf3e0b1b0b8ea6b96b7772396
+SHA512 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC.gz) = 635ef8e6ee4c767afba768a982f587d6040afeb15585be8a8fcfd44e75bcd9031f8965f1bef2b7fdb955b81b2e09f0dc6a51618b48827898763cd75310669a6b
+RMD160 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC.gz) = b9a864c14cc967d2336473c2c2c19eeeefa5b3ec
+MD5 (NetBSD-6.0/news68k/binary/kernel/netbsd-GENERIC.gz) = 76b1a1ad9865766e5d7b1ceb1d374f26
+SHA1 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 620ddb95366fb58c53d115681a205d73fb79bf02
+SHA512 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 4eb494f02f39ee17205b28f07993fd1c9bbb872f2617aacdb173f9b458603fe284dedcde279eb0b9ffe083b01f485dc04963ec09117c31927e3e97a9b5441f6f
+RMD160 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 3456f6c84edd59e0e1db531ec40b838fdd076d14
+MD5 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 0898606b528a29a5c2c754d365e1fb22
+SHA1 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.gz) = 76b25bf6b038d7c48a55bf1f1df350717707af3f
+SHA512 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.gz) = 7aadf02eb4862fc3cf8a0099673414092e8a113e59dfcfda713e430422cc8f03fd4a711ec767b10905ac5feeb6823054e372da6da4f19e15c595712a75dff046
+RMD160 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.gz) = 4e01f28fc0dd67b8a2b16ac61c27adf4ec83c7e7
+MD5 (NetBSD-6.0/news68k/binary/kernel/netbsd-INSTALL.gz) = 7ecaba69661efb53aea818bfc0df2870
+SHA1 (NetBSD-6.0/news68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/news68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/news68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/news68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/news68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/news68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/news68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/news68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/news68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/news68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/news68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/news68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/news68k/binary/sets/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/news68k/binary/sets/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/news68k/binary/sets/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/news68k/binary/sets/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC.tgz) = 6d14a82918f258c781499c87f7ef23fca3c85c68
+SHA512 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC.tgz) = ed399e3bab46335dc4d2bb1f2971692d8a1d8aa22c4196bb340e005c951a3941517d64de8be8c8047a60de791ae934197b38fe02706bcde080f4062a5ffbf431
+RMD160 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC.tgz) = 74c42f841cfb865522b4eda052f46a7b13e491d0
+MD5 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC.tgz) = 6ac0ec8267f457a0d94feba55a094773
+SHA1 (NetBSD-6.0/news68k/binary/sets/base.tgz) = 14763cf9124eb67c9440727bf0559d98d9aa4765
+SHA512 (NetBSD-6.0/news68k/binary/sets/base.tgz) = 24bf851943de08a6e5cb869a69d8d4350f6d6c64988741dbb8691afb927fa8ccb922a7e608da48ef52913796c0e6172c8302b22248c64ce576446d26f26add71
+RMD160 (NetBSD-6.0/news68k/binary/sets/base.tgz) = fc4ad357c41d200d8e12444d1f4e13956521a4d5
+MD5 (NetBSD-6.0/news68k/binary/sets/base.tgz) = 5401468976f41209a9a28889d85f52be
+SHA1 (NetBSD-6.0/news68k/binary/sets/comp.tgz) = 6b20fee4bcb085b5b09893416ce5eee6a96ca5bd
+SHA512 (NetBSD-6.0/news68k/binary/sets/comp.tgz) = 3550045bb700ea29604590e25cd9e6305459476a837f67b4d746e62ce0facc8218aca1d03f2dd570e2590802f32079e438ad4e977a96f9a8939dd986d725d898
+RMD160 (NetBSD-6.0/news68k/binary/sets/comp.tgz) = 85fb356111807dbc811b8fe2fb3d294e4544b358
+MD5 (NetBSD-6.0/news68k/binary/sets/comp.tgz) = 223302daf2a8f7f52863763374438b3e
+SHA1 (NetBSD-6.0/news68k/binary/sets/etc.tgz) = 575f76fc225f509cec73dbc1e6a213d4370c221f
+SHA512 (NetBSD-6.0/news68k/binary/sets/etc.tgz) = 4705c91993153a30b1bf6bab9f1d0b75d9bc29ccbd698d26c44ae70fadeb4a8390298eb1e0e590f0da62748d9429e8e5927558a31d2efe0ef068a9ca353681b4
+RMD160 (NetBSD-6.0/news68k/binary/sets/etc.tgz) = 7ce6e09c062f61b659f2c16138516b3629c010bf
+MD5 (NetBSD-6.0/news68k/binary/sets/etc.tgz) = 234be1ba6587866294eb09b75439840b
+SHA1 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC_TINY.tgz) = 119015b6a9a67300144e248352a3842857ba86e9
+SHA512 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC_TINY.tgz) = 2eecd5ff4fd2a1ca0edc61ff92c804f5202ffedc5b6e74c5c0be372f74cf533e4b4f1b6a69625a155a33661185e1a56943947ab1c98fa8b4dc3892526781950a
+RMD160 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC_TINY.tgz) = 5477d4127ff479fa19aa58a3de57bbd3a4cc0b90
+MD5 (NetBSD-6.0/news68k/binary/sets/kern-GENERIC_TINY.tgz) = fd4f85a1589e4907b314ae996b3aa08a
+SHA1 (NetBSD-6.0/news68k/binary/sets/modules.tgz) = 1885df3fb4ea56feab816bd8dc5e0dc08fae234b
+SHA512 (NetBSD-6.0/news68k/binary/sets/modules.tgz) = beeb1e94ef6f34b7525c0c2de9bfe9927aa443bfdc5be8c4a5546a27483c0ca45006d3f546d93bc0036f25804e7827ea1b8fd943e7642bc73c4b6c75710362ed
+RMD160 (NetBSD-6.0/news68k/binary/sets/modules.tgz) = e3ed23f75e48c70efbdf3b5ec9c28ec41886d878
+MD5 (NetBSD-6.0/news68k/binary/sets/modules.tgz) = e4db103ff1b7f68a57e8fe813b2b8d3c
+SHA1 (NetBSD-6.0/news68k/binary/sets/tests.tgz) = 984686c1f0ad93ff8200e810482527b87bad3de3
+SHA512 (NetBSD-6.0/news68k/binary/sets/tests.tgz) = 508704556a3bc66c9f5f88a6377d34d81edf9aaace78a4496c550021dd5a88c2ff85d5663ff2aa42c4e7a74721249b2dddabd50bf597572b016794c42d22a622
+RMD160 (NetBSD-6.0/news68k/binary/sets/tests.tgz) = 06cb486210f5e4ef2ec33d863cf995780caa24df
+MD5 (NetBSD-6.0/news68k/binary/sets/tests.tgz) = 60053afffd0ad1c95c2654ce6a991d21
+SHA1 (NetBSD-6.0/news68k/binary/sets/text.tgz) = edd7603519c0dbdddbe9b9c8d9ddf066d62ee617
+SHA512 (NetBSD-6.0/news68k/binary/sets/text.tgz) = b5c7ca241708d02df4df5a6bf43b6329cdb063a922bdf23955b3807cf813d10718cdd1a7a4c3167e0869d5f8f0a742ee275951a72fa2cbfbd32a0afa37d3e49e
+RMD160 (NetBSD-6.0/news68k/binary/sets/text.tgz) = c54012faa763171bbd263ba23d4d2495e7cf2762
+MD5 (NetBSD-6.0/news68k/binary/sets/text.tgz) = 2088a3dfd39fd763db42fe375a460a3e
+SHA1 (NetBSD-6.0/news68k/binary/sets/xbase.tgz) = 9b8940f65ca6a841b84406a22a13971665edc464
+SHA512 (NetBSD-6.0/news68k/binary/sets/xbase.tgz) = 4a7d78ad9cf1b84c183fc731bac2fce861f94bc26c7a1681ab1d62a9b761ba89538469688b24588f6c671503a1b66a1e521c2eeef2fd528d21dc0351272e56e8
+RMD160 (NetBSD-6.0/news68k/binary/sets/xbase.tgz) = 85735e089a6ac5293e7438a609dd11105cd4eb25
+MD5 (NetBSD-6.0/news68k/binary/sets/xbase.tgz) = b6f52c8fde2fb1a5372a12d2f321e9c5
+SHA1 (NetBSD-6.0/news68k/binary/sets/xcomp.tgz) = 63a79437c028936698509a386963708082356d29
+SHA512 (NetBSD-6.0/news68k/binary/sets/xcomp.tgz) = 25791832de667b9a44f341f7267f09aaa6b9a4216452ceaab8b56dc6ea5fca3be2da53868b624f47a275edf19ada59dfed40e355e2ff1f62ab96bb54448c1e00
+RMD160 (NetBSD-6.0/news68k/binary/sets/xcomp.tgz) = e681ae34bd83be8dbb6945cef3a129bc1538b66a
+MD5 (NetBSD-6.0/news68k/binary/sets/xcomp.tgz) = c87752020f2ad29a80262eae4bbeaece
+SHA1 (NetBSD-6.0/news68k/binary/sets/xetc.tgz) = 76661bc6d6851cb2ae57f3a7f25f816a33360a2b
+SHA512 (NetBSD-6.0/news68k/binary/sets/xetc.tgz) = a1994fbd97492275e9128c5fc764dc7cf5539bee26bb9d13d9f3fcc14429858e794ed8a10554570c4f70b87714f8b0ab23269ebbaf44d4fb95d0901dcc28fe81
+RMD160 (NetBSD-6.0/news68k/binary/sets/xetc.tgz) = f9f8fc83764439a533110c614e1ef19ffe98361a
+MD5 (NetBSD-6.0/news68k/binary/sets/xetc.tgz) = ab945fe1f43ea47433a047babda53a81
+SHA1 (NetBSD-6.0/news68k/binary/sets/xfont.tgz) = 4403bc158b92ded3d27646c6c0858aa6c117cb8d
+SHA512 (NetBSD-6.0/news68k/binary/sets/xfont.tgz) = 79e31eee0397803ec17a9413b50a5d501fbc3515e4080a0e9e053498c64557809cddfd5718f131d3c451a231c4a38ff4f40b50ef401af5c204a68b61df8f8ba7
+RMD160 (NetBSD-6.0/news68k/binary/sets/xfont.tgz) = b7e19b89a1f67382428aeaf248710dade3b0672e
+MD5 (NetBSD-6.0/news68k/binary/sets/xfont.tgz) = 8a1f532d7a481f797deb226b66d15ceb
+SHA1 (NetBSD-6.0/news68k/installation/floppy/boot.fs) = baea772f5bf7116b8c489a2e75f77c98e308ac5f
+SHA512 (NetBSD-6.0/news68k/installation/floppy/boot.fs) = be4dbd6dc24f56ac71f96d60b8ed0e6b4f725bae2b9d39ef1b9e5ea5fe71053f5fea04979676ff13a50685bcbce539bbc93631408c56d29a2924c79370ded347
+RMD160 (NetBSD-6.0/news68k/installation/floppy/boot.fs) = ff9f3a85babe4d597e2ccb4a864eb0c611a7894f
+MD5 (NetBSD-6.0/news68k/installation/floppy/boot.fs) = 98f566671f6dd720fb61e8c657bd93e8
+SHA1 (NetBSD-6.0/news68k/INSTALL.html) = 8d9ab316296bfbb751b0a05557f4648ff2990af0
+SHA512 (NetBSD-6.0/news68k/INSTALL.html) = 5916c04ef717b2e47ee36f93a1e3a43a27215b5c688b36520e0f160bda3816d6e4645e2e9e922d564260e8b8a60e46da67fbd3b443832032a66e76153596c4eb
+RMD160 (NetBSD-6.0/news68k/INSTALL.html) = a07fa866614d3f5ecfb5642eeb354b6b9c675318
+MD5 (NetBSD-6.0/news68k/INSTALL.html) = 89f43b16d907873c28b8b7b6ab8cb4a9
+SHA1 (NetBSD-6.0/news68k/INSTALL.more) = db7d9b68680f5c20b525bf253e342f2775d04a71
+SHA512 (NetBSD-6.0/news68k/INSTALL.more) = ab50b18effb102ac017c0cad2c054dffe8ccec3876ff9cc6a0353762b5a2b11651296f05b3cf3da76cbb10a4561bc529b5cf113141c742a96fdb73a5358e129c
+RMD160 (NetBSD-6.0/news68k/INSTALL.more) = d6aacc53d5c3384704e2ff1f64a4eb9fd474effe
+MD5 (NetBSD-6.0/news68k/INSTALL.more) = 4c22b00a52d8ad3cdb12f66d23a069a9
+SHA1 (NetBSD-6.0/news68k/INSTALL.ps) = 021d67431fbc7f9fd378e496c25c28097b72af46
+SHA512 (NetBSD-6.0/news68k/INSTALL.ps) = 224e78f8ddc0149a710511083c55a69e1eb2f37089ad15ce1fbc1c07733055eb5b34ad4c32b2803d1f3050b1c5a038ef1d429af780c0a57c8a4b41fde8d10413
+RMD160 (NetBSD-6.0/news68k/INSTALL.ps) = 86b953fd3860caadf7a681e0d75486cb2ac453d2
+MD5 (NetBSD-6.0/news68k/INSTALL.ps) = 4f2098f135e2d4f945dd6365a55b7bc2
+SHA1 (NetBSD-6.0/news68k/INSTALL.txt) = 1491600e777e5a7a96cc05a7fc5a0ab0edf2072f
+SHA512 (NetBSD-6.0/news68k/INSTALL.txt) = 0552976751403a424febde147bdbf34b7e589c0f27225072c9691e30f630e1f49be93c9e75ebbc7d0c6d06ab78419506d4c4313059023e9ae13dbd8d1f5c4445
+RMD160 (NetBSD-6.0/news68k/INSTALL.txt) = 2c6df35393c4ee9d9fb7dcb58002f996c587c32a
+MD5 (NetBSD-6.0/news68k/INSTALL.txt) = 9cff69046f721931b5b5ef4bd511d12c
+SHA1 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.symbols.gz) = 0e0add1125bb456d3210efa5035169e1bd7ae98a
+SHA512 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.symbols.gz) = 138e28fb744019ee2e89cb8ef1f3e23b5fd296b2f8c12a26245cef11aef9540f12eb2c180e5847d047d74d593e62916694c7f031fda0e3477e42ecdb79da7510
+RMD160 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.symbols.gz) = 4ee95362c6f9e38a32cd9e0fe36cdc3aadb91291
+MD5 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.symbols.gz) = 0d8837629ba02a89e50b6764649d03a2
+SHA1 (NetBSD-6.0/newsmips/binary/kernel/netbsd-GENERIC.gz) = decd427b7283d775b0356186a50720409c1c2ecf
+SHA512 (NetBSD-6.0/newsmips/binary/kernel/netbsd-GENERIC.gz) = 05df61671fb365dba6ee67d097f5e51b372720a260b0dd05913a4cf283f323836aa7b157d88eaa68e4cdfa2a7180e57e3ba8ee3cd538dffe4a6afadc1ce880c9
+RMD160 (NetBSD-6.0/newsmips/binary/kernel/netbsd-GENERIC.gz) = e997c6efa2aacfb924670a53162157c8fbd93bdd
+MD5 (NetBSD-6.0/newsmips/binary/kernel/netbsd-GENERIC.gz) = 1b105c1608405606b59942471102880a
+SHA1 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.gz) = 42aeaa1b3dd454b7ac007db9ac4f9b43ca2bd52f
+SHA512 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.gz) = f4262b07a27e2166082ed9cd4b0a247fcbd65f3aebc1c1f8e502f5fc931e130627b0906c92263d2f748d3d30d482391c6b72637c29812f98aaed2fd85830cfdf
+RMD160 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.gz) = ab7e5e64d2b4761006e95f8d1605d767f6ace146
+MD5 (NetBSD-6.0/newsmips/binary/kernel/netbsd-INSTALL.gz) = e23868785597388ddbae56348a08d9d7
+SHA1 (NetBSD-6.0/newsmips/binary/sets/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/newsmips/binary/sets/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/newsmips/binary/sets/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/newsmips/binary/sets/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/newsmips/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/newsmips/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/newsmips/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/newsmips/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/newsmips/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/newsmips/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/newsmips/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/newsmips/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/newsmips/binary/sets/kern-GENERIC.tgz) = 7b98d2f4f3acbf629e953e6b694d8f4755b8e8bd
+SHA512 (NetBSD-6.0/newsmips/binary/sets/kern-GENERIC.tgz) = 5d7e2e9bce3611aee142686bab7a69abc59ddb5e1308694cc88e63645d3b411013765ffa5198cbb44fa445ae258f85cfae976c239875ea26ac4d0439cb497746
+RMD160 (NetBSD-6.0/newsmips/binary/sets/kern-GENERIC.tgz) = 849d144d0090f36a2d013a9f85c9b4c472c595df
+MD5 (NetBSD-6.0/newsmips/binary/sets/kern-GENERIC.tgz) = 40ecc8186e3d4328e24ef91e817c5a4e
+SHA1 (NetBSD-6.0/newsmips/binary/sets/base.tgz) = c229edbeb3438aa2444933af1633c73b66f23748
+SHA512 (NetBSD-6.0/newsmips/binary/sets/base.tgz) = 8ce8dce68f07ee529d0f079794502bd225475cabe7f0dd351caf01b5acf8a34d5f865eea046c06998db53a2cb23c7c36764314493d537ecad8e69c5908a07dbe
+RMD160 (NetBSD-6.0/newsmips/binary/sets/base.tgz) = 6d2365c6adbf64a1b6655c7341a7fa1756878e93
+MD5 (NetBSD-6.0/newsmips/binary/sets/base.tgz) = 650ad75dc13c5edd48f4d8a58759375e
+SHA1 (NetBSD-6.0/newsmips/binary/sets/comp.tgz) = d6ce335f1f52b3d77282e7c08c3781202018257f
+SHA512 (NetBSD-6.0/newsmips/binary/sets/comp.tgz) = 4c8cac5f9fff3b5334083d5df788b0967f62817e797206393f6b83a9cbb0b78c151408440045b92bc50ac2540e0b5d38ea854f29b6af69c1043952d472cf0a85
+RMD160 (NetBSD-6.0/newsmips/binary/sets/comp.tgz) = 7985588ccbaf837e8fd044a0ea7064aa023245c4
+MD5 (NetBSD-6.0/newsmips/binary/sets/comp.tgz) = ac02ccf4b35b94d87960214974f909ba
+SHA1 (NetBSD-6.0/newsmips/binary/sets/etc.tgz) = 1744b2b2050df7622a70aec4c4ab39ff4766b598
+SHA512 (NetBSD-6.0/newsmips/binary/sets/etc.tgz) = 933f4b9af8a1f5033c88ecb680c70b258b36267cbd3d8804aa7d2c0ce797f272a4ffc7266bb369505635e0e0ce0efef285d8fa26704ba28690f1dc6db810c42e
+RMD160 (NetBSD-6.0/newsmips/binary/sets/etc.tgz) = c41f76161f0a9ada7ee8cad68d5311f70051c08e
+MD5 (NetBSD-6.0/newsmips/binary/sets/etc.tgz) = adb5f50f9862a06a123d1d848dbeaef0
+SHA1 (NetBSD-6.0/newsmips/binary/sets/modules.tgz) = 494b6a3b255bace06cfee70f87d2ac213b190a5f
+SHA512 (NetBSD-6.0/newsmips/binary/sets/modules.tgz) = c8274f58ae9d514e72f8d82e46599c655e1b959b744e73340a6a106dce528f83687b7bd7f8e769eab60294e6962a7bc5e0d7173330710ee381219ca6f87b51c7
+RMD160 (NetBSD-6.0/newsmips/binary/sets/modules.tgz) = 3536ddd91df0d4d53e6da53bf30548ac60062349
+MD5 (NetBSD-6.0/newsmips/binary/sets/modules.tgz) = 4cefc39360426c683af0c3031403bd54
+SHA1 (NetBSD-6.0/newsmips/binary/sets/tests.tgz) = 8c653879bccb5f7b67536fb96f92fa52cf11e69f
+SHA512 (NetBSD-6.0/newsmips/binary/sets/tests.tgz) = 5cc47261708222b4fe1ca43d1dc014909df674db2c477c9d814e2af319e2c21c66555df78786ec48c08b21c4c8c1ddc8d815967ffaaceb625f61687df9ac46b1
+RMD160 (NetBSD-6.0/newsmips/binary/sets/tests.tgz) = 8712fce841356834ff6036bdcfe58dbb391ffd4e
+MD5 (NetBSD-6.0/newsmips/binary/sets/tests.tgz) = ccc445c6ba7fc49d4de4b0dcb26aefff
+SHA1 (NetBSD-6.0/newsmips/binary/sets/text.tgz) = 766d9d6d34c79c7be29da59f543f6e029090ecff
+SHA512 (NetBSD-6.0/newsmips/binary/sets/text.tgz) = d11a630ead4cf249224c0f887cf6c2ef347983e885f5657c44cc988733880ccfee735f36dd5558ca60ffffb5ea8dab042d016d3824d8e9116cda749516508624
+RMD160 (NetBSD-6.0/newsmips/binary/sets/text.tgz) = 53cfd7b3389f1b71430daad46ff3be2c692690a3
+MD5 (NetBSD-6.0/newsmips/binary/sets/text.tgz) = f0692f4de9721110ecf0e1ecac4bf1d9
+SHA1 (NetBSD-6.0/newsmips/binary/sets/xbase.tgz) = 19fb5f83a2ef362388d812fbe3c4ccad858dd191
+SHA512 (NetBSD-6.0/newsmips/binary/sets/xbase.tgz) = 4774d680e11097be0f6d8b9cdd2a296cfceefdf1c19d0e8188c742efb2603b253b46c2d01084c6bd5470e34ecc6dd81f502a97c9c69e02b9aca1af80f9d3bafb
+RMD160 (NetBSD-6.0/newsmips/binary/sets/xbase.tgz) = b52fbd33962b06618a8334439f89a7114cb762a5
+MD5 (NetBSD-6.0/newsmips/binary/sets/xbase.tgz) = d9c670a2392dd2f58f041b18ecd32be6
+SHA1 (NetBSD-6.0/newsmips/binary/sets/xcomp.tgz) = e99076dd0244130e9ae9ac14533df11f058aab3c
+SHA512 (NetBSD-6.0/newsmips/binary/sets/xcomp.tgz) = 2869e7c2d397772612ce36217da0c8f7ab0ed5b18694d0620e789854dcd2fbc6763dab632614cb9df7be4c7697065db5f68e9e400fc2068a03e38d98709399b7
+RMD160 (NetBSD-6.0/newsmips/binary/sets/xcomp.tgz) = af2372e9b8ba4ed8a4d8f951b9570e411be2dcf8
+MD5 (NetBSD-6.0/newsmips/binary/sets/xcomp.tgz) = cb05a7f616ecaa766d696b7ab5d9120e
+SHA1 (NetBSD-6.0/newsmips/binary/sets/xetc.tgz) = 973a0c9b770b14e156ea2d999b0c155f8675e95f
+SHA512 (NetBSD-6.0/newsmips/binary/sets/xetc.tgz) = 4298ae57e88d6a5853a8832cf06c6d294051708ffaff6e2fa28efd06c2a8cf99274f5d1be0bff31248d3d9d9ee7bcb2738fcc9b5a4f55a2f34246cf5e1bd3546
+RMD160 (NetBSD-6.0/newsmips/binary/sets/xetc.tgz) = 4b9023581af4b378be8ce78fa812c832dae9f682
+MD5 (NetBSD-6.0/newsmips/binary/sets/xetc.tgz) = 8eee7c09a6b78148e9b1260abee79e53
+SHA1 (NetBSD-6.0/newsmips/binary/sets/xfont.tgz) = 389d0d14a3b5ebbdf3f49b0c5bca3efcf7155a42
+SHA512 (NetBSD-6.0/newsmips/binary/sets/xfont.tgz) = e246f6527bb91eecd3190cd9eb82157db0a0d868f95acd47bb292caea573405170156e37dfb50d3ec97b00ac7c50cf0893640945575638bd9f958cfbece4bd72
+RMD160 (NetBSD-6.0/newsmips/binary/sets/xfont.tgz) = eab3db1a489e432867ce806385ed12e1b25165ff
+MD5 (NetBSD-6.0/newsmips/binary/sets/xfont.tgz) = 4030cc9fd13f8d3524a8c161715edc6b
+SHA1 (NetBSD-6.0/newsmips/binary/sets/xserver.tgz) = 2e0e1a1280e01a64615430396697d3a4cc4aabee
+SHA512 (NetBSD-6.0/newsmips/binary/sets/xserver.tgz) = e5c9d65657227d24b52db9d109c9a4993c5962c3f8171b1353709464a0ba18c99264bf3cd8dc53478692cf2a297f36bccf15519f1aa198cf1a6392e3557914da
+RMD160 (NetBSD-6.0/newsmips/binary/sets/xserver.tgz) = 82a04ae9c10abf44d00acaa3f97f99150e7dc607
+MD5 (NetBSD-6.0/newsmips/binary/sets/xserver.tgz) = 9f3edc37a2f786ee70d5f0e100105971
+SHA1 (NetBSD-6.0/newsmips/installation/floppy/boot1.fs) = d55e9f59aac50a141dbec353c4bc9586faa8d00d
+SHA512 (NetBSD-6.0/newsmips/installation/floppy/boot1.fs) = 659476e61e29371975130565ae2e343ad3bc9423a910ef0b08cffe41e87179020c5b2f42f98d351c9957655b67ded13cf6111835e441d2ddd39584bc1a57c7ba
+RMD160 (NetBSD-6.0/newsmips/installation/floppy/boot1.fs) = f3becca1f4c20eadf3e77ff4bcb84990a9e543f6
+MD5 (NetBSD-6.0/newsmips/installation/floppy/boot1.fs) = 992e9d201b2a7183a6f8725486e8f2d0
+SHA1 (NetBSD-6.0/newsmips/installation/floppy/boot2.fs) = 2c228b57a187bbfae507d67aae5d0faef2f308ea
+SHA512 (NetBSD-6.0/newsmips/installation/floppy/boot2.fs) = 72c6b63777f2171c852f15cfd2c04fd9b21a9cfc423542d0127012be6d5ca85ad15bb33a67b1fb28e1f07f2652f94ae2d2f0c0641c6e860c0ed50d9556eacc59
+RMD160 (NetBSD-6.0/newsmips/installation/floppy/boot2.fs) = 495d95dd6cdcbf0a0cdb07fb8500738e306dd970
+MD5 (NetBSD-6.0/newsmips/installation/floppy/boot2.fs) = 90827190455600b1692585932670fc44
+SHA1 (NetBSD-6.0/newsmips/INSTALL.html) = 3bba0333ef60ff85cbb905deb86171f67a7e7d35
+SHA512 (NetBSD-6.0/newsmips/INSTALL.html) = 4778fb087bc4c44b84fec903f4e00003a41cfa3675a2f712bba28b33773800ad6b7d546074787caff68fd34a885ed84e05a0183a4867bed9c3e881ab30c68c64
+RMD160 (NetBSD-6.0/newsmips/INSTALL.html) = 27d6089590736239f38e1b0638f0b1662465ada6
+MD5 (NetBSD-6.0/newsmips/INSTALL.html) = 5041c29c150843c89b4dfa0c1cea869e
+SHA1 (NetBSD-6.0/newsmips/INSTALL.more) = 91afcc03bfa9fd0c378f7d9d22ab81cfe214f36c
+SHA512 (NetBSD-6.0/newsmips/INSTALL.more) = fc99840a5b29382c2f54287ded48994162804002b6947d2fc1fe907a0674b3827c64fa52e2bd3de735f387e09627ea254820bcd142f0552374acd2c951b0edec
+RMD160 (NetBSD-6.0/newsmips/INSTALL.more) = cdb0bd00e8d126b4736b77688ca2ac9bcc330283
+MD5 (NetBSD-6.0/newsmips/INSTALL.more) = 0dd24b3ef2da6fb2fd0989edf90aecd5
+SHA1 (NetBSD-6.0/newsmips/INSTALL.ps) = 2e236b56c944116ec48df342a4a4ab1414be54c8
+SHA512 (NetBSD-6.0/newsmips/INSTALL.ps) = 22e6e7b9975ffcc75b2560ecc103ab0f3337c0e637fc0b13e73c52b8d726c5a7676f8eb60a931113d2ce9570ca78209008810495d6260b374c61aeb79bf1915a
+RMD160 (NetBSD-6.0/newsmips/INSTALL.ps) = 031019f4af07c2dbb384bbb76702d2a6da747a0d
+MD5 (NetBSD-6.0/newsmips/INSTALL.ps) = fe0ac420b2c0c7a4fba8bfbbc247c0fb
+SHA1 (NetBSD-6.0/newsmips/INSTALL.txt) = d2abcef4ce10c3f567350ad9de6370a0f972f3f8
+SHA512 (NetBSD-6.0/newsmips/INSTALL.txt) = a26df9df3950896c9fb77d728190516f1211b1630dff4969c651ad3f343acd9359a9a6251815c560a6e47071717c53b123d911776d5f5d6b8dee38c12d075381
+RMD160 (NetBSD-6.0/newsmips/INSTALL.txt) = f2ef263bdb545134c7dbadb4509ff94ecf14d84d
+MD5 (NetBSD-6.0/newsmips/INSTALL.txt) = fea6e65c9aac2b407af208e4f7272cf9
+SHA1 (NetBSD-6.0/next68k/binary/kernel/netbsd-GENERIC.gz) = 9f78ea3f1d4a4b1c07d0a25487b20560adcb7fab
+SHA512 (NetBSD-6.0/next68k/binary/kernel/netbsd-GENERIC.gz) = daae6643ef07004beaaa345b57182f2d2b69e990896734e18ec50ee925e17acf334da7a5478fa0fa38de4062fef3285582c9a4fe352759770e4cd9012d70d6f6
+RMD160 (NetBSD-6.0/next68k/binary/kernel/netbsd-GENERIC.gz) = 2dcc60a3c451aaf9303c328a8471775b83ae066a
+MD5 (NetBSD-6.0/next68k/binary/kernel/netbsd-GENERIC.gz) = d4502e039874ee01d7564f7572fa4789
+SHA1 (NetBSD-6.0/next68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/next68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/next68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/next68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/next68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/next68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/next68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/next68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/next68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/next68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/next68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/next68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/next68k/binary/sets/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/next68k/binary/sets/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/next68k/binary/sets/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/next68k/binary/sets/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/next68k/binary/sets/kern-GENERIC.tgz) = 86b352f48720312e04260ba1dcf2f6e7e9d31e25
+SHA512 (NetBSD-6.0/next68k/binary/sets/kern-GENERIC.tgz) = 602f5ac04b050c0462d21d4e50a9a8e5c794a3b4442b6df19370ab6dbd6839755bc61e2c7745f777aef417d5c1179ff4a2af52a5880d35eb20d1c5d3a580a844
+RMD160 (NetBSD-6.0/next68k/binary/sets/kern-GENERIC.tgz) = f625cea32a206f3738a72b5ec0b01d8485c7eccc
+MD5 (NetBSD-6.0/next68k/binary/sets/kern-GENERIC.tgz) = ff2d20b2f2b0a12231e405b582b61801
+SHA1 (NetBSD-6.0/next68k/binary/sets/base.tgz) = d68bfc49aa82b76a52007a927f1a7bac692aaf18
+SHA512 (NetBSD-6.0/next68k/binary/sets/base.tgz) = 4d2c20f0dcfa061e1a1176d34111225b6c8a94b0742141560ccdc986cd5311906967d06e4294a6f988bcea4cbc09d1a9607810960f2d0be35f4ab2895f68f112
+RMD160 (NetBSD-6.0/next68k/binary/sets/base.tgz) = 6d98b84ec87a909545f72526f63cc27d450865fb
+MD5 (NetBSD-6.0/next68k/binary/sets/base.tgz) = e40a7e78d87959c20f37bd937921383d
+SHA1 (NetBSD-6.0/next68k/binary/sets/comp.tgz) = eb3082aae89eb8720e91538fd100125c9e6a717f
+SHA512 (NetBSD-6.0/next68k/binary/sets/comp.tgz) = 8c695463b6ac0a403023068b670d04c7cbe50a9e3925e19896fddba7f409b2d142e9b2817bf18144d9bb55aefe2d7cd90c1242f9bdd6cea628332277d08f8520
+RMD160 (NetBSD-6.0/next68k/binary/sets/comp.tgz) = 81c05df1b3c2c6a72575a325b2c507081279a587
+MD5 (NetBSD-6.0/next68k/binary/sets/comp.tgz) = 11b81d6d2371e3b3123f0fc776526b80
+SHA1 (NetBSD-6.0/next68k/binary/sets/etc.tgz) = d7697b36fa1c6c814b0745d496709c177b43441d
+SHA512 (NetBSD-6.0/next68k/binary/sets/etc.tgz) = 9b4ed551eb36810109e30dee6273d5c18fc918686ba9cab5ffc4ab25a1763e645a179920e7d4ba56be3b15269425e38abf3237e1e6a788b369a4d26d59aa8a6d
+RMD160 (NetBSD-6.0/next68k/binary/sets/etc.tgz) = beadac2eb477aca072b36fa2587e46645e908d11
+MD5 (NetBSD-6.0/next68k/binary/sets/etc.tgz) = ebd0202a3d65b7a528b4854483ac669d
+SHA1 (NetBSD-6.0/next68k/binary/sets/modules.tgz) = 49e37041d779f3b282c12b3f41d876e4621914f2
+SHA512 (NetBSD-6.0/next68k/binary/sets/modules.tgz) = c8f22b3d92b7089aaf3b5fe563a9d0cbc7124b6e402e53b458881c123468e51b5b4f92d8e8b1a5c0f7ff19fc032bdd012db8dfd801be6330e96e0e79917df08a
+RMD160 (NetBSD-6.0/next68k/binary/sets/modules.tgz) = 093e67a0796abb445f0f3b7f6bbfa42a68dff403
+MD5 (NetBSD-6.0/next68k/binary/sets/modules.tgz) = dcf44be798ece88e148faaabe70e2251
+SHA1 (NetBSD-6.0/next68k/binary/sets/tests.tgz) = 28b7d959516205c1231c7f756614c776fdba9576
+SHA512 (NetBSD-6.0/next68k/binary/sets/tests.tgz) = b704bcbe14b260067ea704350ff9b49d49e040a6a87597211de8cea7e05039054c4f4996bd96829a9acc1a97320b3fa3f1ca2300717365e2c13fefac4e13ec11
+RMD160 (NetBSD-6.0/next68k/binary/sets/tests.tgz) = b7ad8dc285efaeb99c3d1384dada9b20cc7104bb
+MD5 (NetBSD-6.0/next68k/binary/sets/tests.tgz) = 45d4bf99be70595e367459256c139b65
+SHA1 (NetBSD-6.0/next68k/binary/sets/text.tgz) = e079bed4ddd9e37cd0cb2f514823f81de9200669
+SHA512 (NetBSD-6.0/next68k/binary/sets/text.tgz) = 3f66684ea0cdaaa433f52dc40eb6776091d19e5f53c87c3fa888ceaef29524dcd7b5c08ce8f08df94db7f039026dfe60a963d23f888bdeab70da4bf71592b122
+RMD160 (NetBSD-6.0/next68k/binary/sets/text.tgz) = 692b64c1a4e521caa76fdc109175a636ef4f9d21
+MD5 (NetBSD-6.0/next68k/binary/sets/text.tgz) = ea58b70eb622e2bc8fb610431f9f27c4
+SHA1 (NetBSD-6.0/next68k/binary/sets/xbase.tgz) = 5e093e4987d3ef6e66dee1dbf5d2c2781a7be759
+SHA512 (NetBSD-6.0/next68k/binary/sets/xbase.tgz) = 9bf75e2feb514bf47ead4151dfc44e0bd8361bd2155bdd7f5f5bda16c2ce60edef88cfbfe054161af32ea2804ccc5903b5ecc8a4270b2d19d6e864c7df776ef7
+RMD160 (NetBSD-6.0/next68k/binary/sets/xbase.tgz) = 6c8fe359b16a5d6d7ab318ad8970b36b3a9d8b41
+MD5 (NetBSD-6.0/next68k/binary/sets/xbase.tgz) = 4dc8195a284c6ff792f07b0279a1ffee
+SHA1 (NetBSD-6.0/next68k/binary/sets/xcomp.tgz) = 6248c1a2455726a172e7d41ad3b71396d1569c27
+SHA512 (NetBSD-6.0/next68k/binary/sets/xcomp.tgz) = 03272ed1984404a7ed8d6753aae6fd2797b82da0f856173bff109dd46909561af865acf81ec8007e8e95794d41e49caa4ffead9d0f5a304e4fe3a627fc62b5ca
+RMD160 (NetBSD-6.0/next68k/binary/sets/xcomp.tgz) = a6fd52049b8fb32c457db212ea0b0f04ae8837f6
+MD5 (NetBSD-6.0/next68k/binary/sets/xcomp.tgz) = 1e5c017075bcb0ddc800674737475134
+SHA1 (NetBSD-6.0/next68k/binary/sets/xetc.tgz) = fc7edd9e51673c25587253ccfa05b06556554596
+SHA512 (NetBSD-6.0/next68k/binary/sets/xetc.tgz) = 6d1f1584a7dbf8ddc3695951796b3951ef5fcae7176c93e5992aa84618b1a935d28baf14dac468cfd50e084414978e824054e08d30b3761e2467aecaa8a2d5cc
+RMD160 (NetBSD-6.0/next68k/binary/sets/xetc.tgz) = 287ef7ae8028b2cdfdd081f19a387900bcb49b37
+MD5 (NetBSD-6.0/next68k/binary/sets/xetc.tgz) = 9cc9fc5b70004b4e532fc745ac7c07f8
+SHA1 (NetBSD-6.0/next68k/binary/sets/xfont.tgz) = 66f50766e91abe745da27688863877f1002907c7
+SHA512 (NetBSD-6.0/next68k/binary/sets/xfont.tgz) = 3f1fd3be74c0971fe2217fb8e39f6ca693d07b5a272b3eff1028ee2f012ec2c04239ec90cd90846553e3a066b58fa957d0ab1d3695faaf0063a6c947165e63f4
+RMD160 (NetBSD-6.0/next68k/binary/sets/xfont.tgz) = 185771ae1f0ed1ca9d8e7025f402bb41c5a14519
+MD5 (NetBSD-6.0/next68k/binary/sets/xfont.tgz) = 57e25cb12fb7ae0b3cd06def9e685b7d
+SHA1 (NetBSD-6.0/next68k/installation/boot) = 1678cf659734cb8f7d5d034bf1ce6aa506278920
+SHA512 (NetBSD-6.0/next68k/installation/boot) = bf027e98b6c1a81300dfe506c084a9777f4f5f9b4078b35d61ea0a39ff73a5d9abe526f423164ed3c076ce7a33cedf460111142f24861c142a5b2c6485881ab9
+RMD160 (NetBSD-6.0/next68k/installation/boot) = 8d3d5e3786b272a9dda7ca19185e3802639f7f6b
+MD5 (NetBSD-6.0/next68k/installation/boot) = ec7ee9f5d5be157c6a9a56ac77835f47
+SHA1 (NetBSD-6.0/next68k/INSTALL.html) = aaf1f7407874cf9d7bdff5b434a74e298b7dc52f
+SHA512 (NetBSD-6.0/next68k/INSTALL.html) = b2d952c916578af512363fa118f81950b95b545aac62474194ef2ed4df3fc4fd9f334f7b3171335f7669c8d0992c37140daa86bab57dcb0020dfa39abfcc4ecd
+RMD160 (NetBSD-6.0/next68k/INSTALL.html) = 52a08c6bd446a00228899639e98aeb8327f100ee
+MD5 (NetBSD-6.0/next68k/INSTALL.html) = f08b6811f0f572819de3b455714166b7
+SHA1 (NetBSD-6.0/next68k/INSTALL.more) = dced1147a6dc54b1365d13a49d0bf57d596653aa
+SHA512 (NetBSD-6.0/next68k/INSTALL.more) = 5136e7a75ef6c3a39ca15112414c73c023c560dfbc09d4da60e6435112a4108c192f25b200f0a149a9eafdff3a74001630f972f58dcc2a9d18174286c906b680
+RMD160 (NetBSD-6.0/next68k/INSTALL.more) = fd826a26af8b89375881dc361a7426b7841baa52
+MD5 (NetBSD-6.0/next68k/INSTALL.more) = 0d480ba3bfd38cc17c62d387a740111d
+SHA1 (NetBSD-6.0/next68k/INSTALL.ps) = 47541be31baefad1f76a45e45b2050cda159953f
+SHA512 (NetBSD-6.0/next68k/INSTALL.ps) = 297a4fb8e5242a764b721a3bea309d123d3f71b67aec903926d5118b42831ba054242783fcbdc19520609ac06f81b733785b5952e24ae23218219046922f8f8a
+RMD160 (NetBSD-6.0/next68k/INSTALL.ps) = 56423276a2db90876c067eb51b7c19f1341d261b
+MD5 (NetBSD-6.0/next68k/INSTALL.ps) = ed71185d0510303cbb5d8ff681dcfaf5
+SHA1 (NetBSD-6.0/next68k/INSTALL.txt) = 3d70ff39023294025c590934bdaca3fce5dd33bd
+SHA512 (NetBSD-6.0/next68k/INSTALL.txt) = d0485c5d3587022d986a53345ed78f49130ef54070d0c45a7812d57400402079855d6cc72401579d1185d2dbeb5e5846efebfa50fda484cc5a1ac719ca7b706a
+RMD160 (NetBSD-6.0/next68k/INSTALL.txt) = bd984eb4c13e1ec872ee2517b72c13ac7e90e090
+MD5 (NetBSD-6.0/next68k/INSTALL.txt) = 0cf50370809ab3ff52dc710474d37edb
+SHA1 (NetBSD-6.0/ofppc/binary/kernel/netbsd-GENERIC.gz) = 31cf98d9ea175b5ea6fe09455217e660d44f1973
+SHA512 (NetBSD-6.0/ofppc/binary/kernel/netbsd-GENERIC.gz) = 22e1ac76e1fa230f69485f53ac23186a97562a1088b1a99979d9d446dcef8a863f1bd63eb6bf16ebf990b40b161fb75025890d9d52474b82cdb3d497e2056b2a
+RMD160 (NetBSD-6.0/ofppc/binary/kernel/netbsd-GENERIC.gz) = 1ade658130f4e40d57cee2ab641234c1e93c3f01
+MD5 (NetBSD-6.0/ofppc/binary/kernel/netbsd-GENERIC.gz) = ae8374ac0ba9ca59c6068561dcad1ba3
+SHA1 (NetBSD-6.0/ofppc/binary/kernel/netbsd-INSTALL.gz) = 0b815e688d07caf3d93190562bcd53f3057ec1b6
+SHA512 (NetBSD-6.0/ofppc/binary/kernel/netbsd-INSTALL.gz) = 43255a25b3044320db3d12f474a70920efe93a52aad3351933ae80bd079a8f93a866fa1c939a92d075161822066dc76ffe314feaf493a783ca51058eba9e96e0
+RMD160 (NetBSD-6.0/ofppc/binary/kernel/netbsd-INSTALL.gz) = 87995ce3c896b4ffcef1eaeef9c7ff27e8c5446f
+MD5 (NetBSD-6.0/ofppc/binary/kernel/netbsd-INSTALL.gz) = 008fbd36266fbb4ef45c3c289d07dbd3
+SHA1 (NetBSD-6.0/ofppc/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/ofppc/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/ofppc/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/ofppc/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/ofppc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/ofppc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/ofppc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/ofppc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/ofppc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/ofppc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/ofppc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/ofppc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/ofppc/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/ofppc/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/ofppc/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/ofppc/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/ofppc/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/ofppc/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/ofppc/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/ofppc/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/ofppc/binary/sets/kern-GENERIC.tgz) = 7ace360c931ac41952447fce2d6241a8393a7b3c
+SHA512 (NetBSD-6.0/ofppc/binary/sets/kern-GENERIC.tgz) = 9c63f0169c8bf1282c54a5ae3b1396376b69a23b6ac881859a304a9d21aad45f64d0998eae3399cc397489a1c3e1b7f52cdce0ee806c160ae5da3287b113c00b
+RMD160 (NetBSD-6.0/ofppc/binary/sets/kern-GENERIC.tgz) = b96e84c0a6d945475f6523d73cabb42ff80caa46
+MD5 (NetBSD-6.0/ofppc/binary/sets/kern-GENERIC.tgz) = 2153bc142bb6f9067287344b5d3703e6
+SHA1 (NetBSD-6.0/ofppc/binary/sets/base.tgz) = 48aef3545f49ee86082480f6712e6c7df6c1c82f
+SHA512 (NetBSD-6.0/ofppc/binary/sets/base.tgz) = 580ad38769fc64e5f50a59f726d13d21625392459a03633c4908fbaf16e08715032dd10fbee9f4efe5261beb24169dcdaf86f11d20f2e2bfc7af22f16ce5b10c
+RMD160 (NetBSD-6.0/ofppc/binary/sets/base.tgz) = 93fe246dba1352ba0bc5ef955094069e82e777cc
+MD5 (NetBSD-6.0/ofppc/binary/sets/base.tgz) = 6a0ea91d58c236cd1d72963bee61dbc8
+SHA1 (NetBSD-6.0/ofppc/binary/sets/comp.tgz) = 7d553fd5460fd823ee474377ad7e4e4a57796d04
+SHA512 (NetBSD-6.0/ofppc/binary/sets/comp.tgz) = 17dff29a91c71c4fcabe616595144201b999b75d56033109f24dfa89e5653ea24890e2657fc007cc0bcbceb749213eb99db5d268db8c96f41f1c2ec203e951ef
+RMD160 (NetBSD-6.0/ofppc/binary/sets/comp.tgz) = 79001f2a220166711cf3e076c137d9944cb72d07
+MD5 (NetBSD-6.0/ofppc/binary/sets/comp.tgz) = bb52657afeeafa0a04fc52d5b96130cb
+SHA1 (NetBSD-6.0/ofppc/binary/sets/etc.tgz) = b19a807890c2859c0c5dfcc27d97c7b94703ba1c
+SHA512 (NetBSD-6.0/ofppc/binary/sets/etc.tgz) = 157110603a432bdf8da99f467e263037d2683372b37c2fb9e8ba7a25a5ed6e44b6d62aa3d60464ea3d0dd101d55b85ff951afde528cc0f61158892a3b379bc90
+RMD160 (NetBSD-6.0/ofppc/binary/sets/etc.tgz) = 8e67db3042b34b9e0ec19853d0209996cb18cc22
+MD5 (NetBSD-6.0/ofppc/binary/sets/etc.tgz) = 7c3ef92dc32ef4a24a29fd071fad94f5
+SHA1 (NetBSD-6.0/ofppc/binary/sets/modules.tgz) = 976ee92c542c431c7eadaf77dc3267c54643aef9
+SHA512 (NetBSD-6.0/ofppc/binary/sets/modules.tgz) = eedd03d73c348500f3df270f002d65d16cdc9f5318ecf14ebc8c4e27af6aff26701d985e5c5a47ed9f37359fb119d61ebe64cbcd726bb5ea7a0b2947aa312a8a
+RMD160 (NetBSD-6.0/ofppc/binary/sets/modules.tgz) = 03d76ba89e00f988e16e0a5cd6798fca65852c82
+MD5 (NetBSD-6.0/ofppc/binary/sets/modules.tgz) = 132d39b3a365d6ecd924789660a7b72c
+SHA1 (NetBSD-6.0/ofppc/binary/sets/tests.tgz) = f643b7607751a3355cc6e9e8d26fcc1bfdd14a22
+SHA512 (NetBSD-6.0/ofppc/binary/sets/tests.tgz) = 0a517f2c914e449c0bedb3be5e96e76c369be5be270ad8ba2aee4b96f3a3d7afce2bb56de0eef54d97b1194101eb24331dd202605eb58e648b3f79f04b44d96a
+RMD160 (NetBSD-6.0/ofppc/binary/sets/tests.tgz) = aca5ea7884341e0dc0f4e06d552b908550cb7dde
+MD5 (NetBSD-6.0/ofppc/binary/sets/tests.tgz) = d8c47bef7caa4afa0ea7967d42a59cfa
+SHA1 (NetBSD-6.0/ofppc/binary/sets/text.tgz) = 010dbafdbd84074ed3acf0bacea61b34dad4005d
+SHA512 (NetBSD-6.0/ofppc/binary/sets/text.tgz) = a8a4fe56016f47a03dd2e23cfb5368111cc7734a7a9dba9ab42081b609c00ac812ec8e73eb75b5dc2f81b847f0bf782257834e09603aac858c8efe1e6755eaf8
+RMD160 (NetBSD-6.0/ofppc/binary/sets/text.tgz) = 263b72d30191910c092ab984458cd1442ba67f3a
+MD5 (NetBSD-6.0/ofppc/binary/sets/text.tgz) = a6dfbc450a9aec79555f52694a2971f0
+SHA1 (NetBSD-6.0/ofppc/binary/sets/xbase.tgz) = 292a1ad5d516609f5c3c5e78e83f4f200f967775
+SHA512 (NetBSD-6.0/ofppc/binary/sets/xbase.tgz) = b3c082fb1fe52edc65fb728d9347d51285a761ba8bbb56cf84744f70614c2c1207a8b48c49d5ad598fc09745f3a900ca2bb08cff4381be8f007d6b89faf7c058
+RMD160 (NetBSD-6.0/ofppc/binary/sets/xbase.tgz) = 954ba03beb3cc9b5064c0d9e9008358cf9c490f5
+MD5 (NetBSD-6.0/ofppc/binary/sets/xbase.tgz) = 410d993f39451d776e2c9d9ca55414ac
+SHA1 (NetBSD-6.0/ofppc/binary/sets/xetc.tgz) = b83db52f87a7a2ba08d22f29249f2b0d8af31028
+SHA512 (NetBSD-6.0/ofppc/binary/sets/xetc.tgz) = 541ca16e25a0cd271b490773e043e6d66d9d704f4d4bd22458d5f3c4f76f23190264201a80cd57b567d8410ca2944a36e10868c4e2916300d978949d78293b33
+RMD160 (NetBSD-6.0/ofppc/binary/sets/xetc.tgz) = de0ae01a1d264465ca58a678c658f75d2844d04a
+MD5 (NetBSD-6.0/ofppc/binary/sets/xetc.tgz) = d60b94274347e3f9073b80da9f5dd874
+SHA1 (NetBSD-6.0/ofppc/binary/sets/xserver.tgz) = e8fd963e80c60b8a85a284484d0d78463038f413
+SHA512 (NetBSD-6.0/ofppc/binary/sets/xserver.tgz) = ca88d3ce0ccd0e82636ae59d4ea4acba9d29ba6fb51be52c6d8de5986d7b037e6062d00bc45390783efd3089de3eabbdbf565929936af7f46c207b705c33176f
+RMD160 (NetBSD-6.0/ofppc/binary/sets/xserver.tgz) = a6b1345264d3fcddf0ff72b3005dd71053aba0f5
+MD5 (NetBSD-6.0/ofppc/binary/sets/xserver.tgz) = 8150c6dfee587ce36ff31c34a1929e29
+SHA1 (NetBSD-6.0/ofppc/installation/netboot/netbsd-GENERIC.gz) = 31cf98d9ea175b5ea6fe09455217e660d44f1973
+SHA512 (NetBSD-6.0/ofppc/installation/netboot/netbsd-GENERIC.gz) = 22e1ac76e1fa230f69485f53ac23186a97562a1088b1a99979d9d446dcef8a863f1bd63eb6bf16ebf990b40b161fb75025890d9d52474b82cdb3d497e2056b2a
+RMD160 (NetBSD-6.0/ofppc/installation/netboot/netbsd-GENERIC.gz) = 1ade658130f4e40d57cee2ab641234c1e93c3f01
+MD5 (NetBSD-6.0/ofppc/installation/netboot/netbsd-GENERIC.gz) = ae8374ac0ba9ca59c6068561dcad1ba3
+SHA1 (NetBSD-6.0/ofppc/installation/netboot/netbsd-INSTALL.gz) = 0b815e688d07caf3d93190562bcd53f3057ec1b6
+SHA512 (NetBSD-6.0/ofppc/installation/netboot/netbsd-INSTALL.gz) = 43255a25b3044320db3d12f474a70920efe93a52aad3351933ae80bd079a8f93a866fa1c939a92d075161822066dc76ffe314feaf493a783ca51058eba9e96e0
+RMD160 (NetBSD-6.0/ofppc/installation/netboot/netbsd-INSTALL.gz) = 87995ce3c896b4ffcef1eaeef9c7ff27e8c5446f
+MD5 (NetBSD-6.0/ofppc/installation/netboot/netbsd-INSTALL.gz) = 008fbd36266fbb4ef45c3c289d07dbd3
+SHA1 (NetBSD-6.0/ofppc/installation/netboot/ofwboot) = 56bb70527f572ae12667a4d9dc71027032602d26
+SHA512 (NetBSD-6.0/ofppc/installation/netboot/ofwboot) = d137aad957d917f4db49ad9b912cf794d5ba9e52ac0f0d1926599dcac166df97c5b81292247b62d15a495134d4c9967ba777b0570701b3340021dcac293ab2d2
+RMD160 (NetBSD-6.0/ofppc/installation/netboot/ofwboot) = 5a6f580e7c000543b09dc7590555ce944b7f2df1
+MD5 (NetBSD-6.0/ofppc/installation/netboot/ofwboot) = 139a6e28174158a78719ab4e67de40b5
+SHA1 (NetBSD-6.0/ofppc/INSTALL.html) = 70ffc237a74825aeff35c638c9dd33b10334c09e
+SHA512 (NetBSD-6.0/ofppc/INSTALL.html) = 5df9959e93527b0f53d3866b15fcac4dbce2edd6a1bff082e588348ada3767bd0ca45d99089540fde08ecc73b8c8846ca7a046ada5f1f1072d6cd1e6c3268497
+RMD160 (NetBSD-6.0/ofppc/INSTALL.html) = 3718a3b3de1edc4d81cc61c88146e69d8b126266
+MD5 (NetBSD-6.0/ofppc/INSTALL.html) = 4a16acd4059c24dbcf1ccab96be7928c
+SHA1 (NetBSD-6.0/ofppc/INSTALL.more) = 14b22fc68257222ce1d15d02554588760ce4fc62
+SHA512 (NetBSD-6.0/ofppc/INSTALL.more) = e0c15cc5760ad5087d58c7659e8692b18fa805b6df85a7965ce142bb7506d3105c1dea0c7acdecfc51fa63f857dc959e25c74fa0ee871417670e013f4c2b2a1c
+RMD160 (NetBSD-6.0/ofppc/INSTALL.more) = b726d0dd772cab274c9b2f6f484d5b1903151827
+MD5 (NetBSD-6.0/ofppc/INSTALL.more) = 40e2acf64e90023938d03f0ff945ab0f
+SHA1 (NetBSD-6.0/ofppc/INSTALL.ps) = 16a078ed4ada6fe71e1d5939bacd3a60c10cefbd
+SHA512 (NetBSD-6.0/ofppc/INSTALL.ps) = 1d9815a162a77d91aebbfd11e0fe6d386c24be9e734683a6eee3cc49e059e8c4c9e559d00c3bfdbd3ceaaf885c11deb5c985ab4de41f1e1b1c9c5b037d300ec5
+RMD160 (NetBSD-6.0/ofppc/INSTALL.ps) = 83f80393d6bd7845dac2c2f789b14104b5ed3b9e
+MD5 (NetBSD-6.0/ofppc/INSTALL.ps) = 9ef011b3eea954489d1e03261175f278
+SHA1 (NetBSD-6.0/ofppc/INSTALL.txt) = 0703c2fc0836a815f8a23c9e295482feced08667
+SHA512 (NetBSD-6.0/ofppc/INSTALL.txt) = e5a59c4554e4dad54c4de8af3ef1fc051a3ed6ddcca88fe60b0f1c5e52c75507268a0cd154482fd7f8633ef0b6de5fa9052334adb93bc787e0f45db400018aea
+RMD160 (NetBSD-6.0/ofppc/INSTALL.txt) = b4b1e1c493973acc61f5280eec83fd1a4b386f9e
+MD5 (NetBSD-6.0/ofppc/INSTALL.txt) = 167ec8dd0f2430f3baafba98c15b0b77
+SHA1 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.ecoff.gz) = c3341e74bbfc424f067743c23369e7d4de2320d8
+SHA512 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.ecoff.gz) = 902237dd2bac97bbf8bc0d70e933307897e375cf760f90531ae39ff8f9abaf1c70091d61678e56448b46d060919eb93b052e0bdcba34482b12174855bf29a941
+RMD160 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.ecoff.gz) = 12abc208e6d943a92255fa99934e2fbdd98b86d5
+MD5 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.ecoff.gz) = 3a5c93ed6aedf91145618578c0283312
+SHA1 (NetBSD-6.0/pmax/binary/kernel/netbsd-GENERIC.gz) = c673249c82581fc220eeab9db4826ae70a879f7d
+SHA512 (NetBSD-6.0/pmax/binary/kernel/netbsd-GENERIC.gz) = 28c33a6cbb2cb4ad53e3e780c74a903ee93a6350da5a36c0232a57e690b80caf1053dc2bad1badd5631abeb20dbfbd223413762bf576db7363a3bd07aa91ddee
+RMD160 (NetBSD-6.0/pmax/binary/kernel/netbsd-GENERIC.gz) = 1c56f35974b50c40595fb19a763e6e13a052136c
+MD5 (NetBSD-6.0/pmax/binary/kernel/netbsd-GENERIC.gz) = 27f93c549aa40bae7bae47978622eb2c
+SHA1 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.symbols.gz) = af7b35f9bea1761095521088a9bad8d6122565c9
+SHA512 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.symbols.gz) = 506859e85d0266360f83d3a7af1deb8f9a84c8f1bbab10c1bd8b9b43bdf8ff7056629450f8aff2ed6f3424ff2034cd36e21144bceaaac6048fe54f58982dfa8f
+RMD160 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.symbols.gz) = 71b182d23dfaa77e92597e840c0d5cb502b9ff7b
+MD5 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.symbols.gz) = f70b79efeefcd03ef2b47a6d61b723c8
+SHA1 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.gz) = f22aa49d239f1c2b49fc2779dbc71b79d6470468
+SHA512 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.gz) = 82136634c9a3ea07a6eb23ad3e6d4214d796f54d406de73cd23f0da45a3872bae0f7f120ddb67aab0da05ef88feb21bb63ec1adf880469ee5d4eda2e32080732
+RMD160 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.gz) = 351fe6fec563003dcb4a0045c740ba3f2fcb73ad
+MD5 (NetBSD-6.0/pmax/binary/kernel/netbsd-INSTALL.gz) = 50f2b444f3462f71810f3c93b47083ff
+SHA1 (NetBSD-6.0/pmax/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/pmax/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/pmax/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/pmax/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/pmax/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/pmax/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/pmax/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/pmax/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/pmax/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/pmax/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/pmax/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/pmax/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/pmax/binary/sets/kern-GENERIC.tgz) = 1ae699dc77ef033860c3fcc0df198c6ec15bf312
+SHA512 (NetBSD-6.0/pmax/binary/sets/kern-GENERIC.tgz) = 1a29fbe70596378ab0f543dd010c24ca327822d743152ce0405eb0e4ab268224b91d346d23b9ee1eec706b4cbe88ccdea27cb6a9b115ce9ddcdaced115a58682
+RMD160 (NetBSD-6.0/pmax/binary/sets/kern-GENERIC.tgz) = 5edbc95d6df7a073b545902862a9e012a981b36b
+MD5 (NetBSD-6.0/pmax/binary/sets/kern-GENERIC.tgz) = d9d9dab85e423b5953eb17bdf8072375
+SHA1 (NetBSD-6.0/pmax/binary/sets/base.tgz) = a7e09afd631257929bbc0a4c6705fd56cafdda30
+SHA512 (NetBSD-6.0/pmax/binary/sets/base.tgz) = 8313b9e6146645955a135e9f9c69b90688f9011ef4087a7911e842ff13802150347ac4e7e9b3f60313a06300e90e93c192910741fd427705709be5f669a45701
+RMD160 (NetBSD-6.0/pmax/binary/sets/base.tgz) = 52eb2bdd47d2a4ae8ac2b780e70006dcc79f4cf6
+MD5 (NetBSD-6.0/pmax/binary/sets/base.tgz) = 3b726d62e4341637cf824c141cdc362c
+SHA1 (NetBSD-6.0/pmax/binary/sets/comp.tgz) = 9cc5684de31ac3b6c086f3716926eccbfaec6191
+SHA512 (NetBSD-6.0/pmax/binary/sets/comp.tgz) = fbead7650935dcbea46ef3e11ef03468287b0461cbb70b51e330e641dd7e246bd602bc92935980e3e8ea8100e8ea487906763fc615e477462a9644201a7f616f
+RMD160 (NetBSD-6.0/pmax/binary/sets/comp.tgz) = def96b7d151cc9405fe72c51f7ca95b552f3bd46
+MD5 (NetBSD-6.0/pmax/binary/sets/comp.tgz) = 93a3bdd6f9461cc642955b749cddb59a
+SHA1 (NetBSD-6.0/pmax/binary/sets/etc.tgz) = 73127a1dcbea90c9029538e87773bc7846ac2016
+SHA512 (NetBSD-6.0/pmax/binary/sets/etc.tgz) = b96b30df1576538bcbaddcf471cd4d87258c06d199077d35d4ea37dfc9c3f388bd62c1ea8c3634ee501d6f28409bd966b791bf3eef8741ca2234c12e1101008a
+RMD160 (NetBSD-6.0/pmax/binary/sets/etc.tgz) = 44ef8ce24cdd12aa5af0cbbf700abeef900e12e5
+MD5 (NetBSD-6.0/pmax/binary/sets/etc.tgz) = 0dd976e6a6c855f02a86fc0fb624b4af
+SHA1 (NetBSD-6.0/pmax/binary/sets/modules.tgz) = 9ed1e0f57d9ee14dc3850e541f0b95132a3048c2
+SHA512 (NetBSD-6.0/pmax/binary/sets/modules.tgz) = 7a367e78224326f43584bb7cfa1aedd74763ccfca9d6abc8587882ecb1b8276851ead5ff1afbe9cd16accfd0d415e26db6604d3a9c3a1bac78d94107a57d033b
+RMD160 (NetBSD-6.0/pmax/binary/sets/modules.tgz) = cff6f3fc309012a3f45c047ea5238f83432235a5
+MD5 (NetBSD-6.0/pmax/binary/sets/modules.tgz) = 825fa6d6cac00e2629ec059fcb68008b
+SHA1 (NetBSD-6.0/pmax/binary/sets/tests.tgz) = 802f716b73250eee2696cac4b6e3395833c0237d
+SHA512 (NetBSD-6.0/pmax/binary/sets/tests.tgz) = f56cba629167f2f679a460679faaf566f4baf053d644a71fd70fa3041aa592aa0a53b98876ce474b48f46a582401a882161005360fdddc49246f094680b1029f
+RMD160 (NetBSD-6.0/pmax/binary/sets/tests.tgz) = a9b17f97265bdfb69402190690d77306f42ecb6b
+MD5 (NetBSD-6.0/pmax/binary/sets/tests.tgz) = 54dd7a96d4abee24bb0019a846d77825
+SHA1 (NetBSD-6.0/pmax/binary/sets/text.tgz) = a0b59e7fb204b9db40df7edda528e8ca8b4e3fd6
+SHA512 (NetBSD-6.0/pmax/binary/sets/text.tgz) = fb7c0d5cb17bb2ef1ffeefa5791bab7932a05e33cd064f279d99eebe07a52f1420aa64a8c6acf191efacbfd130509fb427e6d5d8f14c042b3c0e5e285282592b
+RMD160 (NetBSD-6.0/pmax/binary/sets/text.tgz) = b0495549753b7c3a8abb342045ef4f65e7b640d5
+MD5 (NetBSD-6.0/pmax/binary/sets/text.tgz) = 9f9e6d5b8f9dbb70b845a9aba07ffff4
+SHA1 (NetBSD-6.0/pmax/binary/sets/xbase.tgz) = 99d83d866f2f15b6030b0533990e012ab59b1f46
+SHA512 (NetBSD-6.0/pmax/binary/sets/xbase.tgz) = 238db55892d9cbb0bd5dacb225a16e694c79af2fe461f06563a65c5d2c5b3abfc823ab26f23c54bc1514568018726baab0258aac0e52ccf7615d59c2a6ef324a
+RMD160 (NetBSD-6.0/pmax/binary/sets/xbase.tgz) = 16560205f7564558bc22495116ace64618834133
+MD5 (NetBSD-6.0/pmax/binary/sets/xbase.tgz) = 384d33f9a8ec5c7bc8e104869e3e493a
+SHA1 (NetBSD-6.0/pmax/binary/sets/xcomp.tgz) = 6b6b8d6b522b0546a13a304195765526158f6eb2
+SHA512 (NetBSD-6.0/pmax/binary/sets/xcomp.tgz) = 37af51b256f03e8b4c61d4c67724cead53115ccbfda7d597f3b00a020bd8f4c1fff4f6206e5fe8246e0b3fae50c7dc1df313858670a6e1729b1155e0f97e9b23
+RMD160 (NetBSD-6.0/pmax/binary/sets/xcomp.tgz) = 91d9a2cecb3955beabb71191b73d3586f2c370bd
+MD5 (NetBSD-6.0/pmax/binary/sets/xcomp.tgz) = 9028e22a82276249cc188f83101af806
+SHA1 (NetBSD-6.0/pmax/binary/sets/xetc.tgz) = 2171c5c0cb3143aa83fb8e55d4d98fd87d3e556d
+SHA512 (NetBSD-6.0/pmax/binary/sets/xetc.tgz) = a63407a7d884ea60761ccdee9279c37b790aa08defced01410786e0e020a63b5a4e4cfd503a0ef09e555d04a98a99dbfcfb087c476070771f8b5b5a205b4495a
+RMD160 (NetBSD-6.0/pmax/binary/sets/xetc.tgz) = fa4c1f7437db71fb1a3122cc366591b39b00fa07
+MD5 (NetBSD-6.0/pmax/binary/sets/xetc.tgz) = be3b5f617ddd47650cf9423451320c4a
+SHA1 (NetBSD-6.0/pmax/binary/sets/xfont.tgz) = ca16714159668bc20017cbb9a81fe3746171e383
+SHA512 (NetBSD-6.0/pmax/binary/sets/xfont.tgz) = 077ab3a7540abb8d4039b7f017ff52dcb5aae2ba5a984dd12b04d22908863cc60db8aa67b5f772a584aabbe05a74426534eeced9f323aa07c9225c8333c41f3f
+RMD160 (NetBSD-6.0/pmax/binary/sets/xfont.tgz) = 33beb97b3267941786413a7c5624d78297f5ccf6
+MD5 (NetBSD-6.0/pmax/binary/sets/xfont.tgz) = c262ee8846a85c1e5b00a8ecbe754dcc
+SHA1 (NetBSD-6.0/pmax/binary/sets/xserver.tgz) = 86332fccabc2c7b8e7ef7f8fa9eebc2f22c8afba
+SHA512 (NetBSD-6.0/pmax/binary/sets/xserver.tgz) = e02ed6aa6333bd8941d02f15a3797f862f3fe47b5afce08d60021a06d5ed9db56e8bf802920e8b7614ff5e3127706b195ab9a678710b7b6afb6b70e0f3a7f636
+RMD160 (NetBSD-6.0/pmax/binary/sets/xserver.tgz) = 4bc06df7b2012be80b61ef6b9860a4698b815353
+MD5 (NetBSD-6.0/pmax/binary/sets/xserver.tgz) = 5dd0ae8362aa55b5c7ab207d771834f3
+SHA1 (NetBSD-6.0/pmax/installation/diskimage/diskimage.gz) = 013da364eedff1ef317fe4933205a1f6e45a7520
+SHA512 (NetBSD-6.0/pmax/installation/diskimage/diskimage.gz) = 9a415703b540ea67b99a367bf8a2dbd73c18fc1aff0ee2b3ffedb858d09cfa1b3e7bc62a654061963394f3540c50259ad343edfc41518fa444332d7ab9ea5e8e
+RMD160 (NetBSD-6.0/pmax/installation/diskimage/diskimage.gz) = 3c7faef744c1c309dbad390121852ca1ad8ed0f1
+MD5 (NetBSD-6.0/pmax/installation/diskimage/diskimage.gz) = 2e40475c5dfbfa75ac856a0a02f4afd7
+SHA1 (NetBSD-6.0/pmax/installation/miniroot/miniroot.fs.gz) = fb7b259d7649170e5eaa31217417b6e75291529f
+SHA512 (NetBSD-6.0/pmax/installation/miniroot/miniroot.fs.gz) = 3ef73219ab90c01753bf53dc325b64e26b8b41a7cd78ff1fcb85c4d27ab44b2979b6d312c17383ae9f8c3d24c968f5b896fd04a0679e64a47ea859b578022722
+RMD160 (NetBSD-6.0/pmax/installation/miniroot/miniroot.fs.gz) = 4f8d0f80c84f93b4ea5d9025c4fd3227c2880641
+MD5 (NetBSD-6.0/pmax/installation/miniroot/miniroot.fs.gz) = 3e2cc1da2be2c9ae099bd488393a9904
+SHA1 (NetBSD-6.0/pmax/installation/netboot/diskimage.tgz) = de0f5cd5da27716499b56ae61afe5ca6a8bb0839
+SHA512 (NetBSD-6.0/pmax/installation/netboot/diskimage.tgz) = 0283bc16d8fef0704b0d90bda6213d05e63271053ce59cb20d6cf0dc3a76bb8ed711e968de5a194d2d900becf83eb4fccbd82c22ed868c9a79b7cfbbc43acef7
+RMD160 (NetBSD-6.0/pmax/installation/netboot/diskimage.tgz) = a46875bffd27ea9d145b5e5f2a286a49c5b93cdb
+MD5 (NetBSD-6.0/pmax/installation/netboot/diskimage.tgz) = a491535a6424e97d5c52207404922ba9
+SHA1 (NetBSD-6.0/pmax/INSTALL.html) = 416fb09d6569c88845b26c89d9062106799cb772
+SHA512 (NetBSD-6.0/pmax/INSTALL.html) = cc06ccfbe9a109b6873a6e280baa5d401d3adb507160e145446e0c6d3c042cd5ba2f9edbe1c8d9731722d12fcc42bf40c5ff7a8e1746d096c182fe92437d2072
+RMD160 (NetBSD-6.0/pmax/INSTALL.html) = c40efcbd9facf5dce4471b1adf725830cd53b934
+MD5 (NetBSD-6.0/pmax/INSTALL.html) = 140966d090ff98ea58dc24cf673a5e11
+SHA1 (NetBSD-6.0/pmax/INSTALL.more) = c737caf24e7e33dd11ee48d0f0b1c0ec2efe8010
+SHA512 (NetBSD-6.0/pmax/INSTALL.more) = e014f63f15cfe131b38adf13500caab4ba7d43a7dce6432b2d688e916c3939ac851e5cb9af544db231cf729e5e39f223b1a73cff5ad66a92714aac71546c863d
+RMD160 (NetBSD-6.0/pmax/INSTALL.more) = 3d69b81b9dacf7933a2b0e9c76568f9ccd212330
+MD5 (NetBSD-6.0/pmax/INSTALL.more) = 7aae0fb416c11b3ba0558595afc3af37
+SHA1 (NetBSD-6.0/pmax/INSTALL.ps) = 64b1af6366baed6f548759b6a09fdbbfbb85dbf2
+SHA512 (NetBSD-6.0/pmax/INSTALL.ps) = ec6c213be8ee3af8e2720fcce970c9e8d5e220b1b94ba5f1ef1d8fd4a4c1ae773d522e077e28aadbb4c78a814ea4c06e2f1a915de8e8628f2602cd8705ff786a
+RMD160 (NetBSD-6.0/pmax/INSTALL.ps) = 17eac5c26ecf0947848d6742ba0aeb54d5b7ad21
+MD5 (NetBSD-6.0/pmax/INSTALL.ps) = 242d97c9cf75db873cb975d2788a24c5
+SHA1 (NetBSD-6.0/pmax/INSTALL.txt) = 90f4bfa985417eff921768c47ffc495b066292f6
+SHA512 (NetBSD-6.0/pmax/INSTALL.txt) = 36a7a301319525765fa1ae6c4d73b93c02b59a6f532f0dd1f96503a330daf0ba903f97df81dbd906bd54f83a83332efb28a8450d3a99ec5214abe0ed5369041f
+RMD160 (NetBSD-6.0/pmax/INSTALL.txt) = 02fe56f81cd11b4c65a13da0868e887ccfd7d511
+MD5 (NetBSD-6.0/pmax/INSTALL.txt) = c6a7c6addcfbd8f1b1bc708946065b52
+SHA1 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.symbols.gz) = 4a2e47a10e1c8913a04a5c574a0f09b82540b23d
+SHA512 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.symbols.gz) = 07c86d3b4d188d94141d181b1828e0548bf1e9597c6b470e7a35c787e7c830905fdc63ea4c8ea3f8310378f2e2bb55097c915d1785379d30c12861047d95af12
+RMD160 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.symbols.gz) = 70b4600b73a7d8b937790bb9d69c68e82fdf559f
+MD5 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.symbols.gz) = b0f9598d18b5ff0081a3dcc02e4ae185
+SHA1 (NetBSD-6.0/prep/binary/kernel/netbsd-GENERIC.gz) = aadff547ddd7061ee0fe0c72833b691eaeae554a
+SHA512 (NetBSD-6.0/prep/binary/kernel/netbsd-GENERIC.gz) = 57a25d74b982bbd519271f24456cd5de583e9e5c7e2ef7d8850d6aa64fcccddc9a2e6545c3ed7323e087d04116c2c78ace5b427b14fc3542435ba3bb9497e4b5
+RMD160 (NetBSD-6.0/prep/binary/kernel/netbsd-GENERIC.gz) = 9a642cc44881b1f2b6049710d159f7a4ffa0f25d
+MD5 (NetBSD-6.0/prep/binary/kernel/netbsd-GENERIC.gz) = 2a37ae4ea5cdc2702db0dba34cf7be3c
+SHA1 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.gz) = c138618a1e3ab93778033de4e66966f08e047d2b
+SHA512 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.gz) = b4045a71215ac632950cae3022d9d2d7ce9af9d225ffd8a0e775093e934cc4b0492f1e95167bcb7bc245bb9d5f3390de974158b0d0ea8146fd54bc40199ed10f
+RMD160 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.gz) = 5a2a9371e99acf25730bdd8e9826afc16257560b
+MD5 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL.gz) = 3aaa4706000b77fc8078bf2dc572c746
+SHA1 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.symbols.gz) = 1ef4af8edaba52436270f4eabc0549fd8c57767d
+SHA512 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.symbols.gz) = fba7441719c1023b2719179ad017ac8e4c7a99499d2152ce75dc54014cfb55eecd0bb50e549ce976e1a5d58b420cd60416db364ed8633682a7c9c66a22af1329
+RMD160 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.symbols.gz) = 428a02bccd74b8b6462a0ec5ecfebab5a9576def
+MD5 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.symbols.gz) = 901fb77c124b0ba7923d535a65a06fa6
+SHA1 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.gz) = ec4f1dffaaffea221d480df7dfe89d7a129dd9b1
+SHA512 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.gz) = d5ee09d3d063a6a816b7fd0fd3fa3d0251e1b056ec75368bf557e79836afc0292274d3642d9afedbfb4893a4d4cca97e4f1d0d859db60e3a8b644d9826e57d94
+RMD160 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.gz) = 0bfa88f9965abca2ffa342158b4e1621183887e1
+MD5 (NetBSD-6.0/prep/binary/kernel/netbsd-INSTALL_SMALL.gz) = 8d52534cc5095a06286d6644f2ede176
+SHA1 (NetBSD-6.0/prep/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/prep/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/prep/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/prep/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/prep/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/prep/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/prep/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/prep/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/prep/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/prep/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/prep/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/prep/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/prep/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/prep/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/prep/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/prep/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/prep/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/prep/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/prep/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/prep/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/prep/binary/sets/kern-GENERIC.tgz) = 7ea9bbc043530351e4dfc3ac54ce19938a412ec4
+SHA512 (NetBSD-6.0/prep/binary/sets/kern-GENERIC.tgz) = 0123955eb6ead53c99c21e1dcd5b17f62f228c35e8d17c9f540291f0022574e2ae331a9aebc2ed947cc0cabf439fa47c59e8f820eb8e5241b6446eb79c11bdee
+RMD160 (NetBSD-6.0/prep/binary/sets/kern-GENERIC.tgz) = ef4531ac387b909f96b2cd3079ba8f12ecc61aa9
+MD5 (NetBSD-6.0/prep/binary/sets/kern-GENERIC.tgz) = 3d31ea9358a8ba0d7cb49ae1baf77e52
+SHA1 (NetBSD-6.0/prep/binary/sets/base.tgz) = 586f23dd6c50c12204650c92632bf016c9e4d57e
+SHA512 (NetBSD-6.0/prep/binary/sets/base.tgz) = 712c63416a188e041d85155a36248e5580df0aace895b045b9a2a6cb68f5cb80315dd7f731e5a79139ee19d670c7278e44561336e1224c56a71f89ece1aa79ac
+RMD160 (NetBSD-6.0/prep/binary/sets/base.tgz) = 11a21367c332428fc4e855764763276bae636fb3
+MD5 (NetBSD-6.0/prep/binary/sets/base.tgz) = 8d8b79b420ca775f8a7f33a109e40f0a
+SHA1 (NetBSD-6.0/prep/binary/sets/comp.tgz) = 2ecb14f0695750113144390d254e685c1c41331a
+SHA512 (NetBSD-6.0/prep/binary/sets/comp.tgz) = 7f8528e32862466f82158d4a60e46cf04a9c451b13655d2f25e929bf9df3dcda5c90e1e491457be3a82caea35cb2cfafdd307286e82bbddc466e8b929f44c322
+RMD160 (NetBSD-6.0/prep/binary/sets/comp.tgz) = 8ac4b55abc59b0089485a58d43d304c23dfa7519
+MD5 (NetBSD-6.0/prep/binary/sets/comp.tgz) = 7dc818422b8bdb702d921d284f0f1246
+SHA1 (NetBSD-6.0/prep/binary/sets/etc.tgz) = 56d8194e33b3ee4a1c059b1435e89a915add1275
+SHA512 (NetBSD-6.0/prep/binary/sets/etc.tgz) = 4b5eb6c9222bdcc591d9e6ad9e0781fcaa6a3bb981fe7d5f4b7137ec8df902b9fb979ea419db313dc1a823dbbdc284204b46872516d8f801f18854f75da74d68
+RMD160 (NetBSD-6.0/prep/binary/sets/etc.tgz) = 4b2fb8d900c22be6844c8931cf4c660954d123e4
+MD5 (NetBSD-6.0/prep/binary/sets/etc.tgz) = 553a0fb84d187ff3c420d5b5dc7287eb
+SHA1 (NetBSD-6.0/prep/binary/sets/modules.tgz) = 60eb72b005b0e80f397d42ed5d78fea15e867a1c
+SHA512 (NetBSD-6.0/prep/binary/sets/modules.tgz) = 98ef7da109a52a1814d3a7ff1c6377fd30140cc9783a919d6b3331226b1ea3c7b168598fb3102533637e24ad48be9f265063c0a55043e6614ae5959a56ba0aba
+RMD160 (NetBSD-6.0/prep/binary/sets/modules.tgz) = 214a8c4490e3ba6d6a4861d19bc88700de79a2b8
+MD5 (NetBSD-6.0/prep/binary/sets/modules.tgz) = 775b2278852b97f68453f62cb4a1fabd
+SHA1 (NetBSD-6.0/prep/binary/sets/tests.tgz) = baf4e3d6a0237d7eac65eca2d3e571ccde49c97d
+SHA512 (NetBSD-6.0/prep/binary/sets/tests.tgz) = beea30696935343ffd119c696e826a617a189dd4e9be2a08f468207f0dfa518af4164a1c0bfb6e8d796f609888ef2e1c8d2b1481c58309cd3077cf361118052a
+RMD160 (NetBSD-6.0/prep/binary/sets/tests.tgz) = 8547af5c43e56924032b7b7205c61c7dfb90c018
+MD5 (NetBSD-6.0/prep/binary/sets/tests.tgz) = fad9ca518beadf4a15db6b0aace1d019
+SHA1 (NetBSD-6.0/prep/binary/sets/text.tgz) = 265ca8e29442ca31af66219963a9931d7f71fcd0
+SHA512 (NetBSD-6.0/prep/binary/sets/text.tgz) = 50cd104f35d738fded65600514abc46f96dbcc010f13cade2131a3aad0feb7cf1208360d5869114ca13276096a83e4960ff2f342c1c58b04c26232bc23a8d950
+RMD160 (NetBSD-6.0/prep/binary/sets/text.tgz) = bf0370ee7934a80fdd3dadfe68b2124a7d1a3784
+MD5 (NetBSD-6.0/prep/binary/sets/text.tgz) = 2305e5d5fe891fca62f8500eaf7e32ec
+SHA1 (NetBSD-6.0/prep/binary/sets/xbase.tgz) = a9c6040c6de18dcf42371b7eb0eaa88cb005f1e6
+SHA512 (NetBSD-6.0/prep/binary/sets/xbase.tgz) = 2f5640b41005ccc6b989454a60ae68f9637d701aca7e62a0c5f9965efda0bed43891a239be22ef2f837d0769ce54a649b9e357a920f007778e182d7362feb3e3
+RMD160 (NetBSD-6.0/prep/binary/sets/xbase.tgz) = b171d2bf07e02360363a642a9ccf6b624bdb85cf
+MD5 (NetBSD-6.0/prep/binary/sets/xbase.tgz) = f1029043dab956ff0864f197dc1c0875
+SHA1 (NetBSD-6.0/prep/binary/sets/xetc.tgz) = 3d9da3ee21149017269ed1870b2c5c1096e9ed50
+SHA512 (NetBSD-6.0/prep/binary/sets/xetc.tgz) = d971316b80d139e87b2f7fa47f64ecc41a6285e002986165268e551b0ab059ffa332b9e9278b1e86d60829dac01f8c7cdd3a36f047f0e4a50469046456dbce46
+RMD160 (NetBSD-6.0/prep/binary/sets/xetc.tgz) = e6a7c17de4ac3a609498d8005165277e34f40b8d
+MD5 (NetBSD-6.0/prep/binary/sets/xetc.tgz) = 8ad7ef8013d48e0ca196e8fd2a4fd0aa
+SHA1 (NetBSD-6.0/prep/binary/sets/xserver.tgz) = 16190128b64666ba44729a72387061d80fd14c1e
+SHA512 (NetBSD-6.0/prep/binary/sets/xserver.tgz) = 8f9b3a559b5b53dc2161128db89509e12bb3adc951dd51141212c5082e3afc19b6bd5d960900e7986c72a6ee664ebab7473e2119657c1f34cfebb05737655b6f
+RMD160 (NetBSD-6.0/prep/binary/sets/xserver.tgz) = d62cfac8d16c1e56e866fe621b3cb5bbace44d07
+MD5 (NetBSD-6.0/prep/binary/sets/xserver.tgz) = eafffc08a401b7b8e92e47968dc8faaf
+SHA1 (NetBSD-6.0/prep/installation/floppy/generic_com0.fs) = 7bfb784953be9b7b783a4d7927b8795441ec6096
+SHA512 (NetBSD-6.0/prep/installation/floppy/generic_com0.fs) = 59567fa24b9801e9aaba2fa0b85245b3c1a34894e6f2f58c39877bdb3053b3e21cce4cad703d60626466a2c0d2cd75715919df4a3acacefa627d19946123a840
+RMD160 (NetBSD-6.0/prep/installation/floppy/generic_com0.fs) = 0614c7375a11ffba581e95ea182aef3b59f7f624
+MD5 (NetBSD-6.0/prep/installation/floppy/generic_com0.fs) = b93c25c459836cca031a48a788ac7c78
+SHA1 (NetBSD-6.0/prep/installation/floppy/generic.fs) = c4d629bee0746f9d60ffb5ee501e4e9e73ef3724
+SHA512 (NetBSD-6.0/prep/installation/floppy/generic.fs) = 4df78c22f6a3d4ad414bb85ff6305a0d5caa97cc88375f3bdb2f3872e8103135f5716e72d564fe5fd3b7c1dbf7353f5464317ca30feb7187599186320da0a912
+RMD160 (NetBSD-6.0/prep/installation/floppy/generic.fs) = 7e34800d3411adb3862a914554d3ad27f7775e02
+MD5 (NetBSD-6.0/prep/installation/floppy/generic.fs) = c40503911a43d7bb98c5a5224c776666
+SHA1 (NetBSD-6.0/prep/installation/floppy/sysinst_com0.fs) = 3d67fecfe7d82c9cf7479152b092bd106b87f2fd
+SHA512 (NetBSD-6.0/prep/installation/floppy/sysinst_com0.fs) = 929443de2610ee9409ed76468aa9645a917bdc03366267e8483cc83bbcecb35208acc06ef0d2520d389b408b566c113f5e6b71f5568a7e1c029532979221682f
+RMD160 (NetBSD-6.0/prep/installation/floppy/sysinst_com0.fs) = 51197c7d8ae21a29cf54064c3cf11f8d1eeef956
+MD5 (NetBSD-6.0/prep/installation/floppy/sysinst_com0.fs) = d1e27f1504e7dfeeab0714332e89fda2
+SHA1 (NetBSD-6.0/prep/installation/floppy/sysinst.fs) = 47998496e145c48564efadaf91f3ba4aede44ccd
+SHA512 (NetBSD-6.0/prep/installation/floppy/sysinst.fs) = 6688642f8ad525611b7757bfaa63c958abc0cc1f0c17219df85055c7d97c20896156a543992bbcaf08bfe1bfe36e112e8c8af8610c971585dffa27ae2083d410
+RMD160 (NetBSD-6.0/prep/installation/floppy/sysinst.fs) = d674830e0387841948abeb5e194ab60d9ab942fd
+MD5 (NetBSD-6.0/prep/installation/floppy/sysinst.fs) = 3164ba344aa2283cc7aca4efbd627dd3
+SHA1 (NetBSD-6.0/prep/installation/floppy/sysinst_small_com0.fs) = 2614d29a10f74be3e6ec6563046d2129976f3e1e
+SHA512 (NetBSD-6.0/prep/installation/floppy/sysinst_small_com0.fs) = 061156a6e9e1f9130d9ae085838526f027f3f4263ed03ebc3b5a4532e75243715bc554e4a0ad307401c792f35334d79653642e0d2e1e438dbacc246cda1a92fc
+RMD160 (NetBSD-6.0/prep/installation/floppy/sysinst_small_com0.fs) = 58ef2e610b17686a92958917250c4252bf2d2530
+MD5 (NetBSD-6.0/prep/installation/floppy/sysinst_small_com0.fs) = e1b821660c4f9a7b22a9069631fcefcb
+SHA1 (NetBSD-6.0/prep/installation/floppy/sysinst_small.fs) = 73f7d288f4026018498e79c14d362eeb5e25ef01
+SHA512 (NetBSD-6.0/prep/installation/floppy/sysinst_small.fs) = b65d0794537f5dea1b2a3d6afbd08b85d6d97193a6f0c69928b2edb3fd90c1202035df882878e8f45ddca7214a1abd28e312ab6c334a0708bea0daa1a2686a94
+RMD160 (NetBSD-6.0/prep/installation/floppy/sysinst_small.fs) = b40f136693485d517b455f0443614a487904776b
+MD5 (NetBSD-6.0/prep/installation/floppy/sysinst_small.fs) = 3d605afd5b9a7b57949f448c43e8274c
+SHA1 (NetBSD-6.0/prep/INSTALL.html) = 2674ff3a673f19a61cac4e2877a5656f053b2a3f
+SHA512 (NetBSD-6.0/prep/INSTALL.html) = aabbf165a39dc0207f39cfd27508821de8e50d26892baa27daf1a9b1a01841777fa59a147baa2fc082ebe5ee1f7cafd27674ea44c3e9410179bfbafb33130b49
+RMD160 (NetBSD-6.0/prep/INSTALL.html) = a818880156d01aebc4c92e2e82677fb0890e92c4
+MD5 (NetBSD-6.0/prep/INSTALL.html) = c716d934eb76805dd4acbd677ef13fe5
+SHA1 (NetBSD-6.0/prep/INSTALL.more) = f408ad8a753e682120f22e8763d9e20d8eeda7ed
+SHA512 (NetBSD-6.0/prep/INSTALL.more) = 0a27fc0b1bc6bdf44bc2aced239066f13e352ff248d8ed50d430e676bba3132f26ba807259fda765738bc915a6765fab2fd2e97e04b0166a50cefc4c88de38d2
+RMD160 (NetBSD-6.0/prep/INSTALL.more) = 5cc22227f3a244681cc352cc364650ad683c2fc1
+MD5 (NetBSD-6.0/prep/INSTALL.more) = 69c4b26606cf1e071a451c5afab13cd0
+SHA1 (NetBSD-6.0/prep/INSTALL.ps) = 9ab023c53af56e033541d6c27abf9b666b3f6a06
+SHA512 (NetBSD-6.0/prep/INSTALL.ps) = b68f21d8587797e750a6eabe92273481a396bf68d62e300e6e07139439144660d1e8769404b109759707bccf02a97b27fde4aed219f2b760e9e1f65c0b8c7016
+RMD160 (NetBSD-6.0/prep/INSTALL.ps) = baf09ab6b65aa90ca2f415e4428e21edf2d6d7a5
+MD5 (NetBSD-6.0/prep/INSTALL.ps) = dd269cf99b1eb54e0f7c376c10330ec4
+SHA1 (NetBSD-6.0/prep/INSTALL.txt) = 38f3b013b2b744dd7e21df3db8308dad808e45cd
+SHA512 (NetBSD-6.0/prep/INSTALL.txt) = 2a42b7a45500710fd4df5f3883f8fef5aac4416c41a54c532ce358255541fbf3cd1e5ae03863f1721d845c82caab792d5c8d85feba2cd87225edc8f5606de585
+RMD160 (NetBSD-6.0/prep/INSTALL.txt) = 71583c4ea3b65f1e17ccede286d6025fb6f281cf
+MD5 (NetBSD-6.0/prep/INSTALL.txt) = 15bc48222a898edd8de0a70f559c4a4e
+SHA1 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.symbols.gz) = e7fddbe9a6fe76bfec3ec556acf83101b6b1b27d
+SHA512 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.symbols.gz) = 7a96ad902221852bdbc290707be328b8374e69d7339165e8af54a65abc17707a1177c2534306ba28e066eaca2eb1cd9bd76fcceaffef911926dacd88c22e3edb
+RMD160 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.symbols.gz) = 3f5d25d432d08fa0458c087a3928d3370e60d080
+MD5 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.symbols.gz) = f7adcf576fff9a965730d8cb07b677c3
+SHA1 (NetBSD-6.0/rs6000/binary/kernel/netbsd-GENERIC.gz) = 3786662f4c42751a4ad0475d5b7674ba8ecf6113
+SHA512 (NetBSD-6.0/rs6000/binary/kernel/netbsd-GENERIC.gz) = d0ecc5a21218668d185cc74f70ccd066dd08c39ca5e092966623857e7e0e0a9e0d350a055e8f54ed96a046e970ac6e8fbefe3aca12f8cbb238a1240858353dfb
+RMD160 (NetBSD-6.0/rs6000/binary/kernel/netbsd-GENERIC.gz) = edfd5c086e4207543b08fa1125d137a436a17caa
+MD5 (NetBSD-6.0/rs6000/binary/kernel/netbsd-GENERIC.gz) = d2909133467c780a0364052df6f5a906
+SHA1 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.gz) = 0588aeaa722ae0065f1e5d92187e088c75000be7
+SHA512 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.gz) = 53b6d6603b831ffbb5016ab99f61a20fad9900bbd76b18cd33608c499ad1d2b7a07dd3d0ea386bc27f1f9a8fe68db48691e128186cb4a810c82eca63e8e04e8c
+RMD160 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.gz) = 4bbcd396759fe15f6052ec4ebf5b1ab0d1780a77
+MD5 (NetBSD-6.0/rs6000/binary/kernel/netbsd-INSTALL.gz) = 2a0d673dd3b76fbdef31325f905bf6f2
+SHA1 (NetBSD-6.0/rs6000/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/rs6000/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/rs6000/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/rs6000/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/rs6000/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/rs6000/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/rs6000/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/rs6000/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/rs6000/binary/sets/kern-GENERIC.tgz) = 953706a28ce3b7a195c738f805b6ecf878555e93
+SHA512 (NetBSD-6.0/rs6000/binary/sets/kern-GENERIC.tgz) = a699aa0db691fd82015721bf9aab0b201574798731a795112cbe358a61f7fc3b4b1b0540abd25fc52b4c44692b81c4fe400dc6f90315d97563c32c1e2ef12a27
+RMD160 (NetBSD-6.0/rs6000/binary/sets/kern-GENERIC.tgz) = 697ddaf6582c2712860f4c5abd80537b50da0059
+MD5 (NetBSD-6.0/rs6000/binary/sets/kern-GENERIC.tgz) = 6d7ea95cdb07cb265eda9f09ca484ac9
+SHA1 (NetBSD-6.0/rs6000/binary/sets/base.tgz) = c973cd9af8b007e754b99ead0517ab7bed7d3fa3
+SHA512 (NetBSD-6.0/rs6000/binary/sets/base.tgz) = a82112dc5f53f010f6c259a543502b6a0d90259169233b2b043786cfa677ace8ed63f648dd738cc08730d6ac35233a2b1b60cd606222f399546b5f0a61488656
+RMD160 (NetBSD-6.0/rs6000/binary/sets/base.tgz) = 0e84db039067d0ee045bdae56557595dfeb51935
+MD5 (NetBSD-6.0/rs6000/binary/sets/base.tgz) = af2472e60e90aafe55028b419b776975
+SHA1 (NetBSD-6.0/rs6000/binary/sets/comp.tgz) = 2dcac8a8c80d565b5373277deec9a67aee293370
+SHA512 (NetBSD-6.0/rs6000/binary/sets/comp.tgz) = b6b94000d67080ab3ff62768c3afa85ee4a63a0ee62440648bb8c1728c6e4df9b72cc13927e012d9eee0a73792f2ce5e22d6c9d86eaa7c4a6789643177b44371
+RMD160 (NetBSD-6.0/rs6000/binary/sets/comp.tgz) = fc6b3a3b6bb9613f29c50451190dba5fc7884df2
+MD5 (NetBSD-6.0/rs6000/binary/sets/comp.tgz) = e7c6fcfdf054fef00feececd660789ca
+SHA1 (NetBSD-6.0/rs6000/binary/sets/etc.tgz) = 302c5ba7b8efb24364748a665f5cfb824f6068b5
+SHA512 (NetBSD-6.0/rs6000/binary/sets/etc.tgz) = 1ab1027b3082336f54fa330dd4d21924a42a4f76602d35bb2108229b745b305356c5f944247d0b9bfda63f66318a8ad6525eaf5af42cb3a8d0c3cf6e8b4d45b7
+RMD160 (NetBSD-6.0/rs6000/binary/sets/etc.tgz) = 21418d6a16eb9e779b5e6d86cc411c9ab531453b
+MD5 (NetBSD-6.0/rs6000/binary/sets/etc.tgz) = 695e526865e9cf18c91a35647fd75bf8
+SHA1 (NetBSD-6.0/rs6000/binary/sets/games.tgz) = 0a7cc1be35944ade7ef1c617e0bb5f1a60a891e5
+SHA512 (NetBSD-6.0/rs6000/binary/sets/games.tgz) = dacf177fc2affd7189a7cb7b166bf0b3f6b1a92cf1358f1dad2c5e364d28a7183f841befea024435b0f125cf4008741c26f98e5860ea3872d7a8c36e0e699430
+RMD160 (NetBSD-6.0/rs6000/binary/sets/games.tgz) = 2620719e3f39dc3137ebb8f47fcbe482d77ff5e7
+MD5 (NetBSD-6.0/rs6000/binary/sets/games.tgz) = 175c85d188b3c9b4922c4aaa7adc3dc3
+SHA1 (NetBSD-6.0/rs6000/binary/sets/modules.tgz) = a710b61251bc52c73e64a0254489fd7ca7fb766b
+SHA512 (NetBSD-6.0/rs6000/binary/sets/modules.tgz) = a39d57fa5428c4734bf521afdd1356df4213980a9180b4bb28731b5ff7c22b606b2b2189cfba9741cc98fa049ae01a26516c1096969f2b0b17d24e1d1112eb94
+RMD160 (NetBSD-6.0/rs6000/binary/sets/modules.tgz) = ebbd79b609edee28f4c8331d5dfef0e510f67d9e
+MD5 (NetBSD-6.0/rs6000/binary/sets/modules.tgz) = 825a589361390bbf9d409497e022b2ef
+SHA1 (NetBSD-6.0/rs6000/binary/sets/tests.tgz) = a0eb45c7b71306f6cacafd52bf8f7f06b9d5fabc
+SHA512 (NetBSD-6.0/rs6000/binary/sets/tests.tgz) = 4a95458b6a260485c6fa3d136abc9c76c6764f870d30bbf4f7c78c86233241366f84bc5cf7d7be0a3ccf49afd7f5c95e0f732d4164d6f32a01f953ac51a529de
+RMD160 (NetBSD-6.0/rs6000/binary/sets/tests.tgz) = 67ec4f342cf6d25a56f4b0b62675b12df01ae445
+MD5 (NetBSD-6.0/rs6000/binary/sets/tests.tgz) = 1ccae2c93acbafe1ffc9dc329c8a73de
+SHA1 (NetBSD-6.0/rs6000/binary/sets/text.tgz) = ec4ec898eb442d2f8d86aaca0ce5490c7dc1722b
+SHA512 (NetBSD-6.0/rs6000/binary/sets/text.tgz) = cbf687bd4d20115e4f993b08ed41dde158b39a0133af78503c41b3240e7f7aeef3a015594eeb423d6a8c7d74549646e06170eb7dee86d76919163083c81a27d9
+RMD160 (NetBSD-6.0/rs6000/binary/sets/text.tgz) = e638a4bf115fc0fa2e4ef7d5399d79597762b94d
+MD5 (NetBSD-6.0/rs6000/binary/sets/text.tgz) = 6e84e62deb9c45636b7047e88a6b1dce
+SHA1 (NetBSD-6.0/rs6000/binary/sets/xbase.tgz) = 143ea7f8f94f52bf946db4dbf3fccb963f0006fd
+SHA512 (NetBSD-6.0/rs6000/binary/sets/xbase.tgz) = 66442666aa2e6b9139ae8acf690e1c671edb34160977f786332b6f18c87d8be537160b4d8a114b48660a09cdb349890514b9cd6c3cf12a2f5c3e49e6ef070ed0
+RMD160 (NetBSD-6.0/rs6000/binary/sets/xbase.tgz) = f28a5be274784cb9b35ca7c9a452e6fb1758562f
+MD5 (NetBSD-6.0/rs6000/binary/sets/xbase.tgz) = ba48685231270484c0e79da384a77a28
+SHA1 (NetBSD-6.0/rs6000/binary/sets/xcomp.tgz) = 1b1dda90e8376c39a124f39cb8f09824e1d88599
+SHA512 (NetBSD-6.0/rs6000/binary/sets/xcomp.tgz) = c53a3e10df7ec1ddc2687ebf299a37f0b721f83df64797b64968bf1ebf2cdf7becd0ea8505a6a77864e9119c8817aa78deccac0d198b9c815f750a248fdbd5ba
+RMD160 (NetBSD-6.0/rs6000/binary/sets/xcomp.tgz) = 4d57950bc653c7030f7ccae430f5b00812f106c2
+MD5 (NetBSD-6.0/rs6000/binary/sets/xcomp.tgz) = 0cbd6372a9d8cc2488e23708a105f563
+SHA1 (NetBSD-6.0/rs6000/binary/sets/xetc.tgz) = a1c99d1c17918fad811cf27b08625a0b1461f583
+SHA512 (NetBSD-6.0/rs6000/binary/sets/xetc.tgz) = 567bf3cde35f4e54ad9875625c64895d28a5c8accbfb0d5339ca523a9192c312db7ee3c44f9fde3fb5a765839630d282fa59fbe483f5deed16811bb82d8bb3be
+RMD160 (NetBSD-6.0/rs6000/binary/sets/xetc.tgz) = 263747682247c8c38b367970ff103f92d92b0fae
+MD5 (NetBSD-6.0/rs6000/binary/sets/xetc.tgz) = e69bc3b1b38e787aff9d1df386ac63e6
+SHA1 (NetBSD-6.0/rs6000/binary/sets/xfont.tgz) = ebe1c8e3f81f06dc9a816b1ff31240517e9b102d
+SHA512 (NetBSD-6.0/rs6000/binary/sets/xfont.tgz) = 11f0db11eacf0ee00ecafa091c0f9cee84402dcf44a4467d809355d464eb698ff805acfc3da5752b167a2398a1f1080c93e3ca1ed8f08a6129ffe4e4a2402da1
+RMD160 (NetBSD-6.0/rs6000/binary/sets/xfont.tgz) = 7997ed31cdf3895e1fc12b024314c1b72d94be89
+MD5 (NetBSD-6.0/rs6000/binary/sets/xfont.tgz) = 9e4241f680bc0b0303a0aa682b61b1c9
+SHA1 (NetBSD-6.0/rs6000/binary/sets/xserver.tgz) = e0f7bcff652a034a14b70eb608f9d48a21cff87e
+SHA512 (NetBSD-6.0/rs6000/binary/sets/xserver.tgz) = 9838dce48efcde1f60ff163b1c5da7a19d414c730d97d8db7ed19ac77a52f27f2294ba24de75f15fd4d11a30a97830ca2f68b4311379505208025b2ea4913644
+RMD160 (NetBSD-6.0/rs6000/binary/sets/xserver.tgz) = 9072c3c3519475c71ea42925c529ce5e323e9661
+MD5 (NetBSD-6.0/rs6000/binary/sets/xserver.tgz) = 997077c1eb372bf091c82bf06f96f7b6
+SHA1 (NetBSD-6.0/rs6000/installation/bootfs/boot.fs.gz) = 56e0afc45b285ce022bd561db40dcda0eb2fdca4
+SHA512 (NetBSD-6.0/rs6000/installation/bootfs/boot.fs.gz) = c88fa6848032305418c173e9bca58e76545523b762e5ef4f65bc84f1f820e5813a37dcd256af8b0352f5d6f6e1c700d888f5633d1ce58664cbc5886114aa5332
+RMD160 (NetBSD-6.0/rs6000/installation/bootfs/boot.fs.gz) = c575e56387f6956fd086bfeb5f85fed7a9fb4c27
+MD5 (NetBSD-6.0/rs6000/installation/bootfs/boot.fs.gz) = d47804a5227b204d2bea50e243a749ae
+SHA1 (NetBSD-6.0/rs6000/INSTALL.html) = 0f891193771ae2bbe138549727d4df583dc39a94
+SHA512 (NetBSD-6.0/rs6000/INSTALL.html) = 84b1ae87d5befd27db8ed74276b95a91228bf60a05ecf610adacbddc7905cebbfa3909eb6fe8bed0c8f31bb92112fad398f9d4594204057892a538c16861551e
+RMD160 (NetBSD-6.0/rs6000/INSTALL.html) = ca2e4dce100c234133c9da46ffb498d84e0115d3
+MD5 (NetBSD-6.0/rs6000/INSTALL.html) = 031cc1f873f6c8d6f6472b991915701e
+SHA1 (NetBSD-6.0/rs6000/INSTALL.more) = d86963437bc21fb0eb944b4562b79aefcec5c511
+SHA512 (NetBSD-6.0/rs6000/INSTALL.more) = 130cf1977b54ee32332c7c1a2f35e9c19c088753ad8755ce48965aebc1cc19cd89f37f073749ee5f8b84223a8e8b3fc4a68993e0b22d35663c5850c419a0c84e
+RMD160 (NetBSD-6.0/rs6000/INSTALL.more) = 7e35c4d92d61591cf32e7fc4f272734817b60eb8
+MD5 (NetBSD-6.0/rs6000/INSTALL.more) = 4bb3c03008a5857e2c1f7b30cd76f10e
+SHA1 (NetBSD-6.0/rs6000/INSTALL.ps) = 52af7c1bd8dc0f193c6ebaad3320a0d9b9c82497
+SHA512 (NetBSD-6.0/rs6000/INSTALL.ps) = 44c13947238205228eecd13b48642f68179745ae8441ed58db4a3e7103c431a86c86d9ca88d0f71c656f1f0d54e2ebed8b395dbe1a9a437ccac79f91df7ff56b
+RMD160 (NetBSD-6.0/rs6000/INSTALL.ps) = 545bc23ee542bce73f526bfb4184cc2b9314b0f4
+MD5 (NetBSD-6.0/rs6000/INSTALL.ps) = 06416001febd58f722bad81cc2a585d8
+SHA1 (NetBSD-6.0/rs6000/INSTALL.txt) = cfc54ae2bb8482e56b8b0e130285a78532b9772f
+SHA512 (NetBSD-6.0/rs6000/INSTALL.txt) = 9fe957ce5896aa3ca77bf2b62a785904d22b21250e1ed6a18ca0b0e68268ba76f314948e052a0bbea78abe78e95a2d5ca51bf70b7cde2d935ab802a1e276b888
+RMD160 (NetBSD-6.0/rs6000/INSTALL.txt) = aa823cc8082e6b246dc65bce012fec305a7d3ef4
+MD5 (NetBSD-6.0/rs6000/INSTALL.txt) = b47464cee8c76f0b619c0a70acca22ca
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.symbols.gz) = d09224835f9948e426f67e0008e9e40de1a39635
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.symbols.gz) = b130c4fc02e1783188dcb4b5a3f8fc88f4294cd331d3beddb039364aa8557c61cf050ccaf520fbbd8badeb018e1c676b589d6eff6a17189ae8edd3dc7d6f94d6
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.symbols.gz) = cb79e2871b79e109038c8b7e62ec213695e9aff1
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.symbols.gz) = 5f38dd4085224ecbd6ecae5e07a92e1d
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-GENERIC.gz) = c315b6db09ef1d0161ad647352d9983b72da2ba9
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-GENERIC.gz) = 27bf14f92d278fe7b4174cb265862fbd24c96a006f99e5d241f52fee928fdcaed13528f058d6e5cf78656ab7e0e17e974394a2dff8ab37664689ac8eeb457c61
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-GENERIC.gz) = 4aa32ba67c19f07cc67a13835b3773b2bb8178d4
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-GENERIC.gz) = 87054c981c0647f65a1aa363c3ad3074
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.gz) = b43de7e1f292d5d1e050668babd148e3310cbe81
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.gz) = 0c591bfbaab13c5c0d03a50e0914a97444f87d9513ea48a96fa84e05ea1bed95a63a7ae3cf77c5c71f79cf774f1d1eef2b866c6125173e97027882bb37c38565
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.gz) = 3bc37d3a7d32ba229944341349eee1d7498487c5
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL.gz) = 1812ae09823196a8493b490db6d35829
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.symbols.gz) = 81f74ee4373718b36152d797c812097688ce515e
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.symbols.gz) = e26f69d2d4df43224e12a922b2d1602678db53a8f7f5823776047ed0f1106e6ffcbaf6d88a4101a75bd3b298737971a99d82b806f78e70a7039dc1e8c027a0cb
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.symbols.gz) = 32e0b167f67afd79e83b8b5da906e7eb9822640b
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.symbols.gz) = 31c633e475629988bf3addc50252b158
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.gz) = b857802c9d1b447b451a50601e7592b6c72208a7
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.gz) = ef8318f98fc351491b88805dfb1150beb5bac352b18504bbe4756fb9fc54b064ee442999e08fa2a0b82306e717dd100a8a45e02814c5a03d168f33d05c34bd1c
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.gz) = 4add6bd73eeaf1c25a9d732adad0e24304e39b39
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-INSTALL_KURO.gz) = 61015da4f88490480f8553e59599dbd2
+SHA1 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-KUROBOX.gz) = a2b339d5cb7d614c94341cd9dc8928597275fdbf
+SHA512 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-KUROBOX.gz) = 44b9aa3d91de2f2e0d1c3ec42000182ad97fde311c2bebed17f21fa2165e9f2d574a2fff2330d9f9c2534e595e78bf1eb25e605158e62bf9c65fa449d4d426ef
+RMD160 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-KUROBOX.gz) = 8548f8853cf766e38388c6f16da063334cb4a8a1
+MD5 (NetBSD-6.0/sandpoint/binary/kernel/netbsd-KUROBOX.gz) = 9b8e45e5e31d018a614b2f9f2ec67f95
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/sandpoint/binary/sets/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sandpoint/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sandpoint/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/xbase.tgz) = b7c8146146ebc15191c1bf53f51f8f980fe8c816
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/xbase.tgz) = 091f5d00414a9ad478811bfb0e953f2a204869bc5e310790886a59c11953974cf7068cd9a96c8823856ab2687ffa2ac31e97494f47338bfe31d80217382c59f1
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/xbase.tgz) = 4bd1bfdc7c1e1619de63fb83276c21039b945357
+MD5 (NetBSD-6.0/sandpoint/binary/sets/xbase.tgz) = e621806afa0fcc9cdcef0f9b3c7dfcbd
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/sandpoint/binary/sets/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/sandpoint/binary/sets/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/xserver.tgz) = 05aac7e617e0cac05a88062fef29bb459da7a1d1
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/xserver.tgz) = 19fb5af5d6afd78839a22e5c0694a492047b5200c569cbf58c676ff32ec250b21edcfe2ed00b65092fdac374d1ab9eaaed6113c69bc03009cf458aedc6014913
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/xserver.tgz) = 774d2a1072b8d122790ad189a6d2ada2ad99e7cf
+MD5 (NetBSD-6.0/sandpoint/binary/sets/xserver.tgz) = 3daf1477cadf3593e9ba45e3703fe8a5
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/kern-GENERIC.tgz) = 3120fc2c7bad39d27640482bb99222862238a9bd
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/kern-GENERIC.tgz) = 38c1992332ac419fa5e630965bf0bac621fbea752cdec3c147bafdff55bf8b24343913cec8e645b3170cddb071ed501781a47048be08d03c21154c7cf0e2ff6c
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/kern-GENERIC.tgz) = 3964f06ff1e895fe07b28c6758713c82cf0eec72
+MD5 (NetBSD-6.0/sandpoint/binary/sets/kern-GENERIC.tgz) = 1ff2a1c2e3cb2d7f2fd9a270d9cae445
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/base.tgz) = 9e8d3d9c03cbd6db0b99c34641dab20f5835b6bb
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/base.tgz) = 4eb8d796b52589cc4132777dbfeb5295ef44bbe83e1e7c804540d39b98dbf66d7b0805a8e00dcab835309c9a69b3ca518288e0992e53b773d588339da9bbe0ac
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/base.tgz) = 48e26330269decea0489889a395af45b39ad55ff
+MD5 (NetBSD-6.0/sandpoint/binary/sets/base.tgz) = 2f7c4bf56ff06bf89e9c5d49b1154805
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/comp.tgz) = 8f217e53da02ee1bf5445f76ccccd7262aaad680
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/comp.tgz) = 71a6e2221f054534477100908bb3ae686e88eeed96bc7d28920b39863d10881e6951d39011f65415d50c2cadc78874582a1d7f0505c29fbef25800003310febb
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/comp.tgz) = 8507052499e85b2c4d6fd985f3d0ddc099732443
+MD5 (NetBSD-6.0/sandpoint/binary/sets/comp.tgz) = cb3a0690211b22d68a64e941711cc03e
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/etc.tgz) = 6b44f637dd5d01718b446128da95e0bb37c1682a
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/etc.tgz) = 8795d966d0da1b5419f50e577036167ab6e5de5589080ed0ee6903e0d3b59ae9bfd2395d7951b2b38a025acc39daf302a3d22212e0a6ba94344889d7f99d9d57
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/etc.tgz) = df0e4d773d5a180fba5b21b73cb6aabdaec11487
+MD5 (NetBSD-6.0/sandpoint/binary/sets/etc.tgz) = c8ec3910d995970ea51634c4f126474a
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/kern-KUROBOX.tgz) = b4c7f1bc4058463ebb759d84f0ed8a5613cb3c44
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/kern-KUROBOX.tgz) = 50df0ca65f4f7ed454cc4176eb26b63df738d658536d63dfcacf8ea6def0cf3f4778d686b19ff4f5b32dd07e862f9b0d753ac34c93eedc21f47bd27a0ab5a7df
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/kern-KUROBOX.tgz) = a86947596f1a0b658f0cf664ddd67c05385efb56
+MD5 (NetBSD-6.0/sandpoint/binary/sets/kern-KUROBOX.tgz) = 30f2e8b4824b9cedf289c6cdd46df34e
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/modules.tgz) = 7c4b66eea61f3cd7bebee7421f78ddabdce86b26
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/modules.tgz) = db987ae1a97bcaec2085bec2e33c49a53dedad2499e91db24570b50b6f83cd3387e2be0fd6f23dd0611f676133c5fb524c06a4c42c864b41acd74b88e1a2eb34
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/modules.tgz) = 24ff5d8cba57c1fd9aac448c121d8b5446c3d7aa
+MD5 (NetBSD-6.0/sandpoint/binary/sets/modules.tgz) = 380e4c6e51bf10cf6fd605b12332badf
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/tests.tgz) = 45a3f3ff64bc425bfd332e018456252756b0b3af
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/tests.tgz) = 37a7200f8d06849b2eb8e82a19284edcba07a3445ffa40725f288d09eb4e6dba18856b97c64b24373c3c191343c64df2bb2cd5ea8b1367ccae239cb1db9755b8
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/tests.tgz) = ff0eaa5ae045658f2e34b26ee39f41fc03f40589
+MD5 (NetBSD-6.0/sandpoint/binary/sets/tests.tgz) = 19128cd2482ccb19f4486a6090b89d41
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/text.tgz) = 8f4f8a5d09b63477d2a051e2d628b512363ae893
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/text.tgz) = e24825ec69e7b195c384e0fc83bd56a39598721ee30bde5dafc433e24fbedc2e5555a628ec1df0427cff6691f11040e244abd2f8f518421cdf53a94aca7752c6
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/text.tgz) = 264071e66052088a2a9c93b7d030331aa64dc522
+MD5 (NetBSD-6.0/sandpoint/binary/sets/text.tgz) = 3a05d3c0c3a0074852621cc38b0afe82
+SHA1 (NetBSD-6.0/sandpoint/binary/sets/xetc.tgz) = 80be15e90a6779956ecd9acecae91936d1417c2d
+SHA512 (NetBSD-6.0/sandpoint/binary/sets/xetc.tgz) = fa0fd709723b8c3768f9797e34f30dc3cd8a16e3bf178beb883ccddf5041f196fe85828a32e3296c24f96a8a942927aac4587142705d7cd6ce8ffbcc6d4a2fda
+RMD160 (NetBSD-6.0/sandpoint/binary/sets/xetc.tgz) = 02d7f0088ce5bda4f14607ca80de273d00a82137
+MD5 (NetBSD-6.0/sandpoint/binary/sets/xetc.tgz) = e285972d692807df05e4f96ac34ef6f0
+SHA1 (NetBSD-6.0/sandpoint/installation/altboot.bin) = 56c653262e9e672cd47728f06dbf1428a7a16604
+SHA512 (NetBSD-6.0/sandpoint/installation/altboot.bin) = 0ff15a1e8f4fdff1c97f5539c69c4f40e1bbec0ceb6d3ae0df8e6e472fa25dd1b44398135cff0995ca21389819fba455b70a59e2af6fcc817781e09b1b11a3f5
+RMD160 (NetBSD-6.0/sandpoint/installation/altboot.bin) = 7fd0c6c48de76b1fb04eb16a2cbd53531f67d78f
+MD5 (NetBSD-6.0/sandpoint/installation/altboot.bin) = a2b44c7df7a4199c917096623275d178
+SHA1 (NetBSD-6.0/sandpoint/installation/altboot) = 420331106c0a0f28c0cb27f39016852d65f47533
+SHA512 (NetBSD-6.0/sandpoint/installation/altboot) = 7569cc668f087aa5a2af3ed0f231cdc8a0364cf7f64fcb06b08b3aab17e3bd295bcc8f2c8175f1efe73a1e7cca4ba459d35e65872fa8436d729697517dedfe29
+RMD160 (NetBSD-6.0/sandpoint/installation/altboot) = ef26fc304a3f7bfa4717b03a4544207b44e2c382
+MD5 (NetBSD-6.0/sandpoint/installation/altboot) = a5c881881c99da3587d7db293ce8b453
+SHA1 (NetBSD-6.0/sandpoint/installation/altboot.img) = 9db4851a0e6349ca1ae912e60a329b8f250bb51b
+SHA512 (NetBSD-6.0/sandpoint/installation/altboot.img) = 2bfb5c17dcfa6f1619f398a6f994f57be2f2a5e5bee0d2542bfe076f46d13567cf5519ccbea8bc97962122073bcb002309509caa06eab11014ee85766d813410
+RMD160 (NetBSD-6.0/sandpoint/installation/altboot.img) = a140607e1b7ba43d76b22db739253f59234398bd
+MD5 (NetBSD-6.0/sandpoint/installation/altboot.img) = f007fcb1d420ec5ab2f662013f78663a
+SHA1 (NetBSD-6.0/sandpoint/INSTALL.html) = 87c1358b7dd97f4166607bc031ee8fd603d8a2c9
+SHA512 (NetBSD-6.0/sandpoint/INSTALL.html) = b27b71a7b9fe4a37e2ffe20eb09588a3e3aa1337aa7936c064a35752b02ff8b1f560f053206db9ddc4b0a7a5f9163f221dba4690c54f3791fdccdf791b1893ed
+RMD160 (NetBSD-6.0/sandpoint/INSTALL.html) = 790a76dee78dc46f35cf2b4f6078d699707d2adb
+MD5 (NetBSD-6.0/sandpoint/INSTALL.html) = b1a454f7901f9b043c6993ba09ce7e20
+SHA1 (NetBSD-6.0/sandpoint/INSTALL.more) = 60d0c93b382dfe57cc87c292f3cb53f66bc0ef7e
+SHA512 (NetBSD-6.0/sandpoint/INSTALL.more) = 6b1ac0a4e00aee1bcf54d434b02b41102927bb125be551b0cf8cd25016104b3a03f3bf40506bc6076ed3af4a8128a81f733d523e5ccc3679cd8b51bba105cc27
+RMD160 (NetBSD-6.0/sandpoint/INSTALL.more) = 46c78bd1d9df63eeed2f580faaabbac38f5757dd
+MD5 (NetBSD-6.0/sandpoint/INSTALL.more) = f317efc426b562d069a20655d45d361a
+SHA1 (NetBSD-6.0/sandpoint/INSTALL.ps) = f67cac326fc01aa5d0e47013afb174ce0962a46b
+SHA512 (NetBSD-6.0/sandpoint/INSTALL.ps) = ab10cc2d28735af2a34ab85a4c84d7da346375a964a65ba9a328cd93b4b55c6badba306bd7093be08b662695d8ad82e96c4def014a7bac3f711767c9b741c33f
+RMD160 (NetBSD-6.0/sandpoint/INSTALL.ps) = 5db8cd9595e21ecf5132a9bfb2574aaa01260515
+MD5 (NetBSD-6.0/sandpoint/INSTALL.ps) = c36aec246e63cd311c87bdd6ff54f28a
+SHA1 (NetBSD-6.0/sandpoint/INSTALL.txt) = 545b47f56ca866c03078d60d49d3276d4d000648
+SHA512 (NetBSD-6.0/sandpoint/INSTALL.txt) = d7a925733a465005a83a915d9c58ded20149a6118013493b687c7b0ef2e816d8340631828ce1ec7ca13400c0d7a2dbe86c4fed363baf84ba288cb57a47384f89
+RMD160 (NetBSD-6.0/sandpoint/INSTALL.txt) = 1a30cf24c59bd8394d8748102ceb9027d81d66d1
+MD5 (NetBSD-6.0/sandpoint/INSTALL.txt) = 25fb074abc8d6bd5c9aec25dcf7c3667
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/kernel/netbsd-GENERIC.gz) = f23f0dec597709dddd3a0ee1d355f7beb9110b46
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/kernel/netbsd-GENERIC.gz) = c07b4b1360396b00184b77c19fda5ddb4463eef2fddf2c9ba43cbc4e7b0548e79999928db4f662046f73e282051bef9912f497c91b3757d60a1a11a520c3703f
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/kernel/netbsd-GENERIC.gz) = 22b4ec375839d277a7cddcfdf9df0a122a9cba19
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/kernel/netbsd-GENERIC.gz) = b4ee3e5e49f3bdf6fed5e7f9028fe2f1
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/xbase.tgz) = d81c7fe75a90f1b2111a066e78f1f2b3e8edcd8c
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/xbase.tgz) = c241391fcde4a685a0a2af6f843844ac2e918024c447a2b5ea2cf5300f69acc42fdadf53d3b0348f10723b786bcc0f420e68fe36228375bf3cb5140de41eb40f
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/xbase.tgz) = 2fbf60b64c0b7ac2be72ebf998d9d7390fc40705
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/xbase.tgz) = cd23ca0f6b359c4d695d4494a147d40f
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/xcomp.tgz) = c8f5ff5ea9f9bbe231f92d8b7f3bfcbd2897069f
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/xcomp.tgz) = c7590075195019078b68ec5f87e36479ae2e7b7749c523df4ef21c9d881c343cda9f5c2bba897dd313329a76fe5c18e920d92827878d98ce08a7dc776352cd02
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/xcomp.tgz) = bc60e267cb6e11b4a7305f8b7074084e179e0ff5
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/xcomp.tgz) = 8e58ee51667def3bd015f79769c0d932
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/xfont.tgz) = c551bd13179b9508c2e3a7e19cec323e8ba21844
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/xfont.tgz) = 764527f2f3f4686759fcae3fd093f4e00f34e1249994126221a6f9afe73d4cf8ddfbe8b8311798da2ed38c52466a44bb26ea08ad5aab1c08eebcc9019b4223f7
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/xfont.tgz) = b3a365bedf8b4a20f3920d0e33b9a42fce288953
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/xfont.tgz) = adac8939da213a0195cc1d351f979199
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/xserver.tgz) = 686f6e6d722c9676351ab058736f7077b4ebd2f6
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/xserver.tgz) = 5c818f22edbeac7325228af99d6da6e44b5eb659c7c9fcc6b332071e97a0a490081eda7f9e0f22d6a3f3a589ae34179b434751a6191db5c664683d7510aecedc
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/xserver.tgz) = 0e9f066095b505c7f062bf877147189a7a2f0649
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/xserver.tgz) = cdd2e5127838437df40af161e0c8398f
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/kern-GENERIC.tgz) = 3dee2d103b30c27015f41f351b45247d1f1067af
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/kern-GENERIC.tgz) = d9393724341c9d8036646fc768c21cb510aa4915555460753caded9c1f7a5355501d801e72ffb12e3ac1d25a57797b3b9b8c38787f7ae42906c6dbfecd0bf384
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/kern-GENERIC.tgz) = 9e22ac41f53032ad9194b1b0002c56c13211cf65
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/kern-GENERIC.tgz) = 6b9b0560a05738c70d580a25e0c5f203
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/base.tgz) = 61ec72dd34b2103b7b2f3228ee7766133a089c29
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/base.tgz) = 9aa13fa9008c18633f949ee74c5aaa5fa1d58d59459e48cf5f161d3f11e133a0cdaf7caa941a4e435076644ea799d7c9e73274267b18c3401866fdae5444f491
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/base.tgz) = ebc31ee01aa8cf119d20f5e084d536bcc610623b
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/base.tgz) = 828ed9e45442d989a4a5233b6523d82e
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/comp.tgz) = 705bd29c423e517e231920389f853990b8103339
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/comp.tgz) = 33d7feebe4ce7a3f8a4317c49f10f51e69e40374a9291c6b9e657f3e965d533702513b92dba0cba318a786f33fb5f275237be13870c093dc229d2c826a6b15ae
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/comp.tgz) = ea75f4ad366964a45cc5c8aac35cee5a56460d6a
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/comp.tgz) = e37746a52cc63d8d2992aef55484bb81
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/etc.tgz) = 9b4b768dc9d999330aa8fe804d604738fbabf650
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/etc.tgz) = 6e56a5122f29741aa02b651671d5ecdaef0adac94f52c8d550ab8a17352d3fa6755a87c13bd707d1a7f4259fef1c77e4ec85699cabb96bac5c47b82f2fdb6086
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/etc.tgz) = c2c3fbfe163cc38ff774413c1be35f0fee0b0c3f
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/etc.tgz) = 3d6d678755b01ec623ed215f7e1bbbc6
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/modules.tgz) = de0c98fc8b4bb81299edb50e3f99f222ac383dcf
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/modules.tgz) = c279717a8c4a6c66f3dff4e22d72466cf7b2c82070bba336bce5e659dc520c8c1fa1ef80f6f3154b665e0fb76dc2745ac8cf3996389209966f3976c36dc591c2
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/modules.tgz) = 80479a2131441999c8d251d822e00800e4f69b9c
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/modules.tgz) = cef9345e5430560c5955adee76e537c5
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/tests.tgz) = 92c135698d2030f4b378f18fc991c9f4efbcbf1a
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/tests.tgz) = 7fde9b55e820f169c4d1820d5b3f213f460c81bf892df6bff0ccf47ee73054c651c7277d956af77eb6f3d75648c7916be72d08dc3970601dc872662f009e9117
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/tests.tgz) = 38049cb62625ec093f26a53f6fdad2bce0b5a2ee
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/tests.tgz) = dfc74f3ea392e2c963257cb48926147c
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/text.tgz) = f8ddb7ac8fe765ad3760b3c00516f209f31ba211
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/text.tgz) = 9e8f6eb5da98c7c88d96d539e5379bf98f0d6726b84c5d4c2e1236d515d3cc31a4e1deedf1beab8335084f0c8d2795e8bef3391feff024d654877cd105254e03
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/text.tgz) = fc5441996f0f1650b41b80cdeacd377cec93c8ca
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/text.tgz) = 22ad03bdad15b336ac4f73bc31c29d78
+SHA1 (NetBSD-6.0/sbmips-mipseb/binary/sets/xetc.tgz) = f89ac267632b07b88fa020f09c395a6766a2b9b1
+SHA512 (NetBSD-6.0/sbmips-mipseb/binary/sets/xetc.tgz) = 59325ee391ab258e507fad56e2f38e5062c2ca15599c71ed06bd0373dfb109d61605dad949434d521d5ab9ea6139ee099919d485cb6d680d20b1bffc6881fd9a
+RMD160 (NetBSD-6.0/sbmips-mipseb/binary/sets/xetc.tgz) = 6e805117acfbb8c9af9eb6f105b15c11447faaa8
+MD5 (NetBSD-6.0/sbmips-mipseb/binary/sets/xetc.tgz) = 3e113c15bdfceb0a896ebfcee6e75172
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/kernel/netbsd-GENERIC.gz) = 017c9fbd7101f94f65ae9f0a41a1a028a8bd3435
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/kernel/netbsd-GENERIC.gz) = 45e2aa91e69a575f02a48dd776cc7401f37e60905ffc986634f53829aabc87d2dfc52840fc92821a3611b61e728f415ac44ab19f73db85786962df64d87b60c6
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/kernel/netbsd-GENERIC.gz) = 56ea720eb521974e26c07d74f93fcebd6e67de91
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/kernel/netbsd-GENERIC.gz) = e5f16d9d0838695b251b809dd42e10b9
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/xbase.tgz) = 76468fcada5a9e26652aa9f0f9f3c94829a317e9
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/xbase.tgz) = b2adcfc2dedef30b21b885c8fc757d0479541744a280a9997fbeaa9c881009ab4b0019e0001a540a8eb6db5f84db87b365e420bb2d4270af209821bdb080369c
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/xbase.tgz) = 1e0074d03d9fbb3373e0a427b25cc7097bf6d3c8
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/xbase.tgz) = a8f29ec2e3768405942f97af3dd08ee7
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/xserver.tgz) = ff805022f409202f3346c45475c7ec0f8187218e
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/xserver.tgz) = f2bb3810a5572b519980126a3d934f63b5ab5c2fcf9fb8166c556bd3cc14cfaa151d582086bb1506ac9ac7e21d4e70a5cd5c3faed96212d8a14a0b5bafdcc4c1
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/xserver.tgz) = d5ae336337cc77f7f55f542b3457918d6fc0efe8
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/xserver.tgz) = 92447a1560887d337d22e2deed0670a6
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/kern-GENERIC.tgz) = 8c185e51bf6d6c63d23ce62fd86e5f7bfb3d3845
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/kern-GENERIC.tgz) = 6f1a341b96a6890f1bfe68a588e74639caec8c320b72bac774f03d8f7e71d9198887b791e6528a10bd201bb14537e2f83a4e81aa402adc5bd57e4ada3c8022a9
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/kern-GENERIC.tgz) = 43be2a6c07b4b366d31b2b74ce7666d0337cb84c
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/kern-GENERIC.tgz) = 1ad137c19b7c2df8bcb8bfbe053466d6
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/base.tgz) = d0664b8cdc36b3e6b0381b6a9de9c7556bd383ef
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/base.tgz) = 737f1bed2c71e1473483bec24e7e48be28fca93e0ccb7e124661569d1960fa99bfdfc7f8e86bd3a61f744593346ef767b1ae2ed0c1e2fb9c5b421dd2b8125dcb
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/base.tgz) = 130c2d1408fad9b0c2e8c612b6d720a6c92674b6
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/base.tgz) = c2623377960d1a7fe4db1ffff70882f2
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/comp.tgz) = ed63cf25383b8110ece9e4cb4752fe762b636cd5
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/comp.tgz) = f699747ae04f024400653aa5bf5be624e4cd0bd92c9086ee8f89ce9327c5adb27e7cc53f1a85904b3e0f2cbbb49e45a3098fc803e131338a3100a56f1628218e
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/comp.tgz) = ca975dc6b36da0208cc2a79c346e74fe367ba833
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/comp.tgz) = 063da88eb27db9b012142fbec1707b34
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/etc.tgz) = a6430055b2ccc0d418f11c4eb5628d091998d4f3
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/etc.tgz) = 51a2c3cbb860e042c3ecc234e1e0645489a5546ccf0c87a2925f32c01dfb3fbc1dd088b4bc947cb27c731b9645f234e13fa9e805665be34aa3fe9318c51d12a7
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/etc.tgz) = a7c1913e10b8fdc44a191159b5b6278728bd8a0a
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/etc.tgz) = 690495c3b0cbba76f83085422161887c
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/modules.tgz) = 37c4fabb3a3edebf715572a4c7deca5c2f63508f
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/modules.tgz) = 2245821ee48c5a4a4c7ad378c2d726975b18a3f04b1e4cf04e78ee0c15855502eca0673b11420af837146c9003ec6c9899b815a37aef06632b9e8a00f4f95f0d
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/modules.tgz) = 2ae1af8e754811706b0d5633f2631a306eee664a
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/modules.tgz) = 3136834e1ac671cf35958f353e33d8c0
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/tests.tgz) = d3118b0c152c61b20933e5dc38272991b808fce0
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/tests.tgz) = ce817f1900de3b09a7b063abed50f10f78042f3000f1bb031963db7eb1666fb55b42ffcf446370b4ef2541ea86739e43c9bf0771aba86f5bcd62e6181975a62b
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/tests.tgz) = 6fe992cf685d12015118ce0faf06d77b241e10d6
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/tests.tgz) = d59a11116844dc6e6a754ab8676e30f3
+SHA1 (NetBSD-6.0/sbmips-mipsel/binary/sets/text.tgz) = 82712c2413930b0726af1cc8e3d7f7183e789534
+SHA512 (NetBSD-6.0/sbmips-mipsel/binary/sets/text.tgz) = 2681e2fd0973fa7573dd6a1746ba7c491956a82256a8522cbb65c267402ba700da71b0ce44c65269787385e596913ba1042eca4542e5751f55beaa2679d673d7
+RMD160 (NetBSD-6.0/sbmips-mipsel/binary/sets/text.tgz) = aba3f473d85e3a8fd5ae41ca25c7433a22b11f36
+MD5 (NetBSD-6.0/sbmips-mipsel/binary/sets/text.tgz) = 0b2dbc9b54843ba81289bc994b3fcf7a
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.symbols.gz) = b1a8652e56663a63c6376ecf20ccf9f8f876a9e8
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.symbols.gz) = 3e4a01eeec83c7da8725badd449c51dcc677203373d1ca0725a157a6f9ebee86fa8ca7d66e1936420569e7152fe9bf2089764b94132aa04d61e36661ea0d1b32
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.symbols.gz) = ae01910e3901d7adf1b925f13b4520e46bce2917
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.symbols.gz) = 14b2804f6c6f16940d4bdda28c6426e1
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.ecoff.gz) = 532b94eea6032bf2867a860f78973c95b3baf210
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.ecoff.gz) = a3017e2f1bc7d008d45d53f3733ed573c18de5d44c2c7a1e969f2938119a5d6996c1eb913e7ef6b28cddfb2e6da4e4ddb6aaddbb9caa6c43b90d046f2ba396db
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.ecoff.gz) = bfbcc81a415674512ffdaa8ad7180d4499fd410d
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.ecoff.gz) = 01742badd90ac599c850ef5d7f98de49
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.gz) = 1040bc406f9543efe4f2a6c198d136ef45d0e9f7
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.gz) = 1bb8fe9e495603393f69f25ac5fe57d8f26e64cc1573af4088d3e2929d8043ecff721d38b0d4f3f6b6934661df6f6f2790d1d506ced6f8f21b57c1f1554e79a2
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.gz) = eece122ff5df495cfee6fafeba2fb086cce6623b
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP12.gz) = 8bc4a605a8cb06bfcf835aa4a5b16411
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.ecoff.gz) = 0fa0539d5bdaa751a71d3df4a573adb90d742cb3
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.ecoff.gz) = 4e94bbc422b322b6b250a8cdf31144cb97f6349a2cd075b8720497dbae36dc9f90d0b48da549bbfd3d7908bdf078cc95e300bde365df6e204008a0af85a5e7e6
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.ecoff.gz) = ec847458dd2c3b20dcd27d5bc14ced2601c998e5
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.ecoff.gz) = e74b65c6a2f141174323dfe40cc0e730
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.gz) = 2c863ba399e4aad44ef7b76dc60bcedbc112d1dc
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.gz) = 27c329497ed9ac49c096071c6250b01135b590b9d2f5d79366f53409b4abf9daeca15f323a35521b9a79f4264d5784e1d49dec269cc51ee0df52a686bf6fea88
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.gz) = 410dae1e4c4a5b3f2b9b000c413faa6ccedddd5e
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP2x.gz) = 0538c7187f0c5778a89a660749018ccc
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP3x.gz) = 1968926bf27f4cb8f5fac47a22ed3327dfb52c43
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP3x.gz) = 0d5d484b19505ebbebda2daff665c43c77aa9e087946daf198684f7cba944f11e2dde344930e99ef4a24c02c6fb83009115b45a0100b955b0dc8450c00fc2f38
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP3x.gz) = 4194967cb2a542b818e0f4670e194e91c6b20635
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-GENERIC32_IP3x.gz) = 2d25467ddd2b88d4110211ab86f1c77b
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.ecoff.gz) = 8bbc293222db73fb4be9015b07e05070c413de50
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.ecoff.gz) = 7c0f743299c829bea945e1f927dce38ad44b07f012949532d1e0f73bf3f44bb5931f1772db34b8598cb46b1e8d522c1de29e537105e8f4f1c10057bebaabe33c
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.ecoff.gz) = 4c67683e70c5c31659196601d15fc98de34dbd10
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.ecoff.gz) = e3cb87e4586bd5e1ec2602cf7767495f
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz) = 66a33c0bed49bb9e1dd95cb3c79f944ee56fea31
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz) = f3dfc078ef7e21741758b7e3ea76af80772a1d3218b0178ce825814bd16a895115df7122b394c58f63af6b2128e57a95064ae3fc44a5a3e56d8a03327bf3174f
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz) = c60e7094e3801d730f699b7a67c4403ced988c92
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz) = 2c406bbd7ec78cc4c97dcdc48ee476d1
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.symbols.gz) = af7722c589f536235fb6d25f27231a6a3eacd3c4
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.symbols.gz) = f7b6acf595cbb8e7a54b34b458c39c384ea0e3ce44fcd142c7f71cb08551b56624969872fde0f90614e40582bc45fa3e41be31de0de954ce43fcd34375cd5d04
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.symbols.gz) = 3b853ba98c7c4016aeec80103318c1147aa52ac6
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.symbols.gz) = 001d3d08526a1d35fe6a2d66baa59ff9
+SHA1 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz) = 9fef8eeac9eedbd6ce7744b13c0e14efc835c1fd
+SHA512 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz) = d4af0b7ffc0596e209e19161bce14533610fd414350b761a58873c16858c3f44f2bc20135f7f14ffc9458dbfc029dfebb998e19f02176c9718f6a6406ea5b262
+RMD160 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz) = 420fe89a1bf2f952113c22d083512456f98738db
+MD5 (NetBSD-6.0/sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz) = 7081086c1dca701908d84d74c29fc81e
+SHA1 (NetBSD-6.0/sgimips/binary/sets/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/sgimips/binary/sets/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/sgimips/binary/sets/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/sgimips/binary/sets/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/sgimips/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sgimips/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sgimips/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sgimips/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sgimips/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sgimips/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sgimips/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sgimips/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sgimips/binary/sets/base.tgz) = d02636d2688644bf3230c10bf072000a44cd2f5a
+SHA512 (NetBSD-6.0/sgimips/binary/sets/base.tgz) = abc4fb8ba2047eb2c99070b0b7a22e29a071c44ef8ce3d896969648dfb6ead55d396e8a7c0716e34e45f51565c6e29011d0e35cb914cab4691c8672a29f24fbc
+RMD160 (NetBSD-6.0/sgimips/binary/sets/base.tgz) = f91ad6342293731972f28cb6286e6926b3de10e0
+MD5 (NetBSD-6.0/sgimips/binary/sets/base.tgz) = ff1da3a02630406282d40b75528def3e
+SHA1 (NetBSD-6.0/sgimips/binary/sets/comp.tgz) = 27ba59fd7d5e90f91446a151f804437f8c249e8b
+SHA512 (NetBSD-6.0/sgimips/binary/sets/comp.tgz) = f119dbb5c22cab49fdd8f0dec15407fa520d1d8eb02cb4550bd01f88d49378b4999e0041f6da8d4ee2bfa4712590a5345a184ead5a4b014d80c79c459bb34e3e
+RMD160 (NetBSD-6.0/sgimips/binary/sets/comp.tgz) = 9cf77a31c5419a857ccf19a148eaf510a4d83aed
+MD5 (NetBSD-6.0/sgimips/binary/sets/comp.tgz) = 2a2b72f824b9953fe580cb284a37c96c
+SHA1 (NetBSD-6.0/sgimips/binary/sets/etc.tgz) = 6140d0c55fb88e07b633da0abfd0d5a345eb908b
+SHA512 (NetBSD-6.0/sgimips/binary/sets/etc.tgz) = da25730f805732e0d4b90612dd9b5236f6fed96c75f022f4d1053495d897f7355b5d75b95f010b041795d6331285a2ab0ada3f34175b611147b295e697d54eb9
+RMD160 (NetBSD-6.0/sgimips/binary/sets/etc.tgz) = 79973e6b9ad3344bb4e64ed23a1ba9bcd16fb8a1
+MD5 (NetBSD-6.0/sgimips/binary/sets/etc.tgz) = c96ede97a5ce906a1fb580fc1dabbf94
+SHA1 (NetBSD-6.0/sgimips/binary/sets/modules.tgz) = a206108d50c0e8a138571adf8a674334de685263
+SHA512 (NetBSD-6.0/sgimips/binary/sets/modules.tgz) = bfb96bc27db44cc540d3ca143099e2574ca9a42eeea307eb3b835b624b52ebc14fead54754fb3d95916e6f4c2fecafcaedebaf28a32ec0c1e1b798caf9a7e44c
+RMD160 (NetBSD-6.0/sgimips/binary/sets/modules.tgz) = 9114bd11fa6c211d72726f5e88458396165a6fe4
+MD5 (NetBSD-6.0/sgimips/binary/sets/modules.tgz) = 8f298135900ed72db173ffa002c4103b
+SHA1 (NetBSD-6.0/sgimips/binary/sets/tests.tgz) = b10f0716cc4a705193fe7485de5b6123153a40a0
+SHA512 (NetBSD-6.0/sgimips/binary/sets/tests.tgz) = 79061c6367c51f6b0769e7ad724d440d055cefcc6ce1bf1730e602b2080af16be5a7f74a3c57391567dfb62f49588721bee5704d71039527c4269add0bd8420f
+RMD160 (NetBSD-6.0/sgimips/binary/sets/tests.tgz) = 869f46c688b7d65e6f93dcf06e4d406fea799082
+MD5 (NetBSD-6.0/sgimips/binary/sets/tests.tgz) = b02332c28d31942e96e416d4dbf2f6d8
+SHA1 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP12.tgz) = 18e386c5766aa3391d5d29a7d55ae1eb3b69af2b
+SHA512 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP12.tgz) = 8caad11aefe7fe71d346fbe3950fcaeb08a3454793e24f12c83b91c3078ef4e15f44c94cf47aa785e8b975f7403f0de2be38fa3ad3a48798e70efcdded5eed0d
+RMD160 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP12.tgz) = 8e7531be01ac24bab8b898224ae33df0e84d637c
+MD5 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP12.tgz) = 2f1a7076fdb72698d28a9d8032b79943
+SHA1 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP2x.tgz) = 4097c0cfecd7e8766e4542ffd936ac18fb9ed32f
+SHA512 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP2x.tgz) = 9595785d477c04e57b81e2dd71957dfc3309fad013b7210d93d2501e64c308b57af9a22581ac3e61d8f3ec91aa62d49bb01ed5ab1eaf90557f41c0d4d3c3096f
+RMD160 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP2x.tgz) = 2479e9e6495e16753c6c0e3e8dead0c49095c245
+MD5 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP2x.tgz) = 8661ec66f60bce4cb75af3d6756580c5
+SHA1 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP3x.tgz) = a5a29b61f5eba57e0bcdbd6af9ecfb9a4485a90b
+SHA512 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP3x.tgz) = 4a5c4ebea7ddfad9bf8f3536212eeed17f22dbd74a38b7f48bd7963c6c7c4f29da10ec6454053a441db830cd5c18a3a342b6ad22f5fbb9d97104b683b94685cd
+RMD160 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP3x.tgz) = 3bae9be1ed83ab2eeb80905c1e1bcfc59a4b6f7b
+MD5 (NetBSD-6.0/sgimips/binary/sets/kern-GENERIC32_IP3x.tgz) = e402bda170a73a296a773b851afa1a3b
+SHA1 (NetBSD-6.0/sgimips/binary/sets/text.tgz) = 11418c012b904e8a99e91493d36fdca3f6e6f006
+SHA512 (NetBSD-6.0/sgimips/binary/sets/text.tgz) = 501a9e78e9310aeb3f0c766464b5453e2718f23b5d3290428ad775977cd2a42b5444b91d7b1707ae9991b58af14f376d9d93cebdc54c74ea8d20ed06a7e0387d
+RMD160 (NetBSD-6.0/sgimips/binary/sets/text.tgz) = 272adf1723ad8ab137b985946e64ca3b27055199
+MD5 (NetBSD-6.0/sgimips/binary/sets/text.tgz) = 0f6d77a90f9714d54517c4b5660150fa
+SHA1 (NetBSD-6.0/sgimips/binary/sets/xbase.tgz) = 0e912b46017d4afca665692603e483e95d627af5
+SHA512 (NetBSD-6.0/sgimips/binary/sets/xbase.tgz) = 54c6bb297c09510019a0e21816018b7f8abbecd3e9dab5f5dd48d1cf35493b0cb0ec5ca01f1bbc9066fa1b964cf550119c1678a70d80d4471d9df73627655bb6
+RMD160 (NetBSD-6.0/sgimips/binary/sets/xbase.tgz) = d8b979b953547c386cf66488db96771f3923cc2f
+MD5 (NetBSD-6.0/sgimips/binary/sets/xbase.tgz) = c04dfa38a56e78bf0d075dd4d333a869
+SHA1 (NetBSD-6.0/sgimips/binary/sets/xcomp.tgz) = d764bc540d10ebb805e8c976e8b300d9c6a108e0
+SHA512 (NetBSD-6.0/sgimips/binary/sets/xcomp.tgz) = a6795d24491875468bdabf17698ee483c0aaeaae64772667083049c7f2b2ae82943277cd41fe870c085ae7498f6546d971362d77e62f6150f40aa23f6b92d732
+RMD160 (NetBSD-6.0/sgimips/binary/sets/xcomp.tgz) = 99f0489f322b26960b51a53e24fd03faccccc512
+MD5 (NetBSD-6.0/sgimips/binary/sets/xcomp.tgz) = d6e8029f965bcade40d027658ea70e14
+SHA1 (NetBSD-6.0/sgimips/binary/sets/xetc.tgz) = bcbb9c22987ffa1ec653920c5013030fb974d73c
+SHA512 (NetBSD-6.0/sgimips/binary/sets/xetc.tgz) = 7e2ad6276a043e98c194a03fc38f3754193c0f75bfbb79cc855bf08d7336d01763d7df89edb3ac63056a403d08e7e21b43a1b4468c34cb2969024bf5894988e2
+RMD160 (NetBSD-6.0/sgimips/binary/sets/xetc.tgz) = 35c9e251920fa14e32a68f6d811ec8ef81a233b1
+MD5 (NetBSD-6.0/sgimips/binary/sets/xetc.tgz) = baf2f338baf24e78da645312b33eab7b
+SHA1 (NetBSD-6.0/sgimips/binary/sets/xfont.tgz) = 43b823091c3c5b340538ecf7cbd17be47e6d5692
+SHA512 (NetBSD-6.0/sgimips/binary/sets/xfont.tgz) = 63a18f59b0c2ef7eab2ba7526fe2815155e476426d34e21e06d2c00fc872cc01bc241704971524c9c6410f420650a7d69914205a45a1b232413e9ccbff2d6b93
+RMD160 (NetBSD-6.0/sgimips/binary/sets/xfont.tgz) = 3cee7affdad412ed072636553915fab9f0d23ca2
+MD5 (NetBSD-6.0/sgimips/binary/sets/xfont.tgz) = 0be724043d9312d60c89901238982903
+SHA1 (NetBSD-6.0/sgimips/binary/sets/xserver.tgz) = f604963ee4c952665400bd5742f6ac3925903291
+SHA512 (NetBSD-6.0/sgimips/binary/sets/xserver.tgz) = 2f5d36f2f728aeed88a3a2e8da36acb3117018fe92f97769babe2b37670c0ad9cce319bded4a4c78d7859c12df4124fdb2faed33abaae1b4cea20098582ff99e
+RMD160 (NetBSD-6.0/sgimips/binary/sets/xserver.tgz) = c18f29c81d11389a45b5c8a6226ec1e7c074582c
+MD5 (NetBSD-6.0/sgimips/binary/sets/xserver.tgz) = 41d79391ddbccae7930228219015083b
+SHA1 (NetBSD-6.0/sgimips/installation/diskimage/diskimage.gz) = 5acd23fd19ce75e45f071d5de6396668b89ea681
+SHA512 (NetBSD-6.0/sgimips/installation/diskimage/diskimage.gz) = 007da5ebfe4af418c4f696956cb768575b656dd40297cb39dea7b03146bf48aa22fe9f288325737b6904f5e08b89c79d60a375dce4d885fc83f3bb85595507b2
+RMD160 (NetBSD-6.0/sgimips/installation/diskimage/diskimage.gz) = d4fabae9c31423c0557937fd07cc796f48f392fa
+MD5 (NetBSD-6.0/sgimips/installation/diskimage/diskimage.gz) = 8575ffc5db9771c5aa948ab437c80e1a
+SHA1 (NetBSD-6.0/sgimips/installation/netboot/diskimage.tgz) = 075e8acd73646b2b89509714ba7ca7a001cb72a1
+SHA512 (NetBSD-6.0/sgimips/installation/netboot/diskimage.tgz) = e0dc8dfb79ee590decb7c315fd4b8cf7a55a2981a3752aeddc25afd83a79fd72d6852f9823ab857077cfe40c9619dc8b537ab1227c42441b43b2fb9129a419a3
+RMD160 (NetBSD-6.0/sgimips/installation/netboot/diskimage.tgz) = 4b4d8d21878765a902c28673fa2ff2fe62ccbc55
+MD5 (NetBSD-6.0/sgimips/installation/netboot/diskimage.tgz) = 250ed8b78bb6bc799d92f3e82d62003a
+SHA1 (NetBSD-6.0/sgimips/INSTALL.html) = 57dd965aef89b4c8190886a37ab3fff06021b8eb
+SHA512 (NetBSD-6.0/sgimips/INSTALL.html) = c1e5774651642601daaedef68c0337dbf8d634abddc9eaf8d33d38358076f49867df6644d0c8c7e8e730c2d37a2a35af9c7c03dbd817f5b4eae5d7383e900190
+RMD160 (NetBSD-6.0/sgimips/INSTALL.html) = a5c94dcca469b47cb176426a8cbd4c0e2df210e5
+MD5 (NetBSD-6.0/sgimips/INSTALL.html) = 7c4d8de6801d46c1dac589fc304590a5
+SHA1 (NetBSD-6.0/sgimips/INSTALL.more) = b9c2017ba93cbb87b7d0a88fd6912eb81a9b7ed7
+SHA512 (NetBSD-6.0/sgimips/INSTALL.more) = ca9a739d8c56336ebbfffb856904a4753e8948cf8c1a4da057f212cffaba7493c07467bcd0608923d1dc3deb76ceac989cc556cd025380ad1f80109a46aa6746
+RMD160 (NetBSD-6.0/sgimips/INSTALL.more) = 0e733569f0cd6acc3de8e7b3acdac89953e554d7
+MD5 (NetBSD-6.0/sgimips/INSTALL.more) = a43c8c4a3aea3585e8de329c8efef129
+SHA1 (NetBSD-6.0/sgimips/INSTALL.ps) = e61b0904bc556853037f1a9564486e0962a8b8e2
+SHA512 (NetBSD-6.0/sgimips/INSTALL.ps) = 122ebadac3919533845714c90f87c59a65722d6e79f50bf231866f2917e6d4ebcb4a8b5da8e4ac9acbe4e333e841611ef80665b7e69427db90d4843e5f630c8b
+RMD160 (NetBSD-6.0/sgimips/INSTALL.ps) = efbc102832be0cee24ce3a5810999c5ea9c4b18e
+MD5 (NetBSD-6.0/sgimips/INSTALL.ps) = e86216add5a2ed163e13a17c6ff291f2
+SHA1 (NetBSD-6.0/sgimips/INSTALL.txt) = 104c1ef873cfbe774ba106e437168053539b65b1
+SHA512 (NetBSD-6.0/sgimips/INSTALL.txt) = 8b5ad1ef07604c0e8ac5ec2c7f43a4c483610a7ad7ac4c15a13c4151652500a21b203569bcc9ecbb53e035f8b90e1c7e3fc81d985fe3817685957865fb4924cf
+RMD160 (NetBSD-6.0/sgimips/INSTALL.txt) = 7cc2ca6174d6b5e2ed23f8db3d6b62bb02c41637
+MD5 (NetBSD-6.0/sgimips/INSTALL.txt) = 99bca5bfeb2112666aba79a96379899a
+SHA1 (NetBSD-6.0/shared/ALL/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/shared/ALL/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/shared/ALL/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/shared/ALL/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/shared/ALL/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/shared/ALL/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/shared/ALL/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/shared/ALL/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/shared/arm/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/shared/arm/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/shared/arm/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/shared/arm/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/shared/arm/xbase.tgz) = 875fd641f969ec00f854ca1334d084947450c740
+SHA512 (NetBSD-6.0/shared/arm/xbase.tgz) = 75d0c9e9685b6b7bb706df7427c8b52f59c4fc4d0e725b02ee18024f75a546dc41de5f1a5d8552a8d2c84bdf87856e5857b0f12914801ca7b36b69536d617b4e
+RMD160 (NetBSD-6.0/shared/arm/xbase.tgz) = 1a4d099d59b2bd882e99f1b2df1c7bf22b890d48
+MD5 (NetBSD-6.0/shared/arm/xbase.tgz) = 5eb9c573c5a0c96701f268a3470a58b9
+SHA1 (NetBSD-6.0/shared/arm/xcomp.tgz) = 8d7469a85b7433c89690cce74e6b3f4e66cf0647
+SHA512 (NetBSD-6.0/shared/arm/xcomp.tgz) = 411304cf66e300a7f162128203099bb4d6eebc4a93ba18ed7caf79f30b31cc7ffcede85c4e1bad02c3f5f8a27d009fb71f3ce5862c1d8aa477f39a25c535fdaa
+RMD160 (NetBSD-6.0/shared/arm/xcomp.tgz) = 822d26e0ee08b72ca8b991f0709a8c1bf0399208
+MD5 (NetBSD-6.0/shared/arm/xcomp.tgz) = 5af361f0334d28119d703064278b3ed3
+SHA1 (NetBSD-6.0/shared/arm/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/shared/arm/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/shared/arm/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/shared/arm/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/shared/arm/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/shared/arm/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/shared/arm/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/shared/arm/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/shared/arm/xserver.tgz) = 4ccfef1d49179603286042088bec0218c6b2031d
+SHA512 (NetBSD-6.0/shared/arm/xserver.tgz) = 809fc0a9065c1b9e7cd17aeb0d41cfd3158efd6c585556af01c4a3c93f0df3646a2ff77c6994449a703a408c0988fc1aa68cf34c7e297a3056d73ded57034c12
+RMD160 (NetBSD-6.0/shared/arm/xserver.tgz) = 403604404261764c74f10fab774c4653fd20cc9b
+MD5 (NetBSD-6.0/shared/arm/xserver.tgz) = 914f909b6878cef16a92765a8cbb52ca
+SHA1 (NetBSD-6.0/shared/m68k/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/shared/m68k/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/shared/m68k/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/shared/m68k/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/shared/m68k/xbase.tgz) = ffc6dc889560371042dd12a5486a9a2c499b86a9
+SHA512 (NetBSD-6.0/shared/m68k/xbase.tgz) = 9aa2ba4d703a13020acf8543d1efcde76b6f0f4b411be20f804709b3802e537be1e651eba469830c4fd4777a379ea9936200a3a3eb4b1a702c04bb81aafcc723
+RMD160 (NetBSD-6.0/shared/m68k/xbase.tgz) = 3ecf53e7414ef859a47fe5afc108cf3bfa82fb1d
+MD5 (NetBSD-6.0/shared/m68k/xbase.tgz) = a6af002ce158cf72eb5c6a7cde2c0989
+SHA1 (NetBSD-6.0/shared/m68k/xcomp.tgz) = e13548b8974f5d55e98caf17b2b4bbbcf2430370
+SHA512 (NetBSD-6.0/shared/m68k/xcomp.tgz) = e4b13c798df04ffef88e72100e2db5af400e5ae255cd7a1ca2907736b8138a59045b6f3bd8531b5753d0b87eadb1b5f801043a929bb25d1611e4be693c1da954
+RMD160 (NetBSD-6.0/shared/m68k/xcomp.tgz) = 3b1f4e26ddd57e69afd9709553c1bf70d6e29ea0
+MD5 (NetBSD-6.0/shared/m68k/xcomp.tgz) = 894bb9aa05b164d9923682165d708335
+SHA1 (NetBSD-6.0/shared/m68k/xetc.tgz) = d2ca34bd668e108cbbfd4b45720823663339f8bd
+SHA512 (NetBSD-6.0/shared/m68k/xetc.tgz) = 431ca465f300e7eb5d4dbd44c43e412a296fb4d3129217e752f86a720e8a8bdf736c9add05a45518a4f3e6cffa32381ef61e9186d360b68a5f8c64d87e385fb5
+RMD160 (NetBSD-6.0/shared/m68k/xetc.tgz) = 4c5d664679856b02b694534cd6afdf20597e6d53
+MD5 (NetBSD-6.0/shared/m68k/xetc.tgz) = 72bd67556ac14ea0ce147374af0ba624
+SHA1 (NetBSD-6.0/shared/m68k/xfont.tgz) = 24ca4cb77a59246b1b05e0a91fed21c63259d12b
+SHA512 (NetBSD-6.0/shared/m68k/xfont.tgz) = 8dc297fb6205a995767e68e77cc21169234dfb66a86bbcd2e1828fd32efeda0a25c9f2a9b1a39b97fe8d7b24f8cd5cf6160859af6be2259876f39ee4e76c405b
+RMD160 (NetBSD-6.0/shared/m68k/xfont.tgz) = d2f134959940e6667aca185f01e388c05dc6bc85
+MD5 (NetBSD-6.0/shared/m68k/xfont.tgz) = 3c96c1f0a13cd7d277ca35622ac9c058
+SHA1 (NetBSD-6.0/shared/m68k/xserver.tgz) = 1d20fd039546a66b428b854c659ea5e2ee9f8114
+SHA512 (NetBSD-6.0/shared/m68k/xserver.tgz) = 091d09049d0af5555feec02065234e281677aeb3ecbab5a19413d924a8b58dc7f64401ef68e68bc52d8b6eeb73e091d351c45805374b8bf276b0181415968561
+RMD160 (NetBSD-6.0/shared/m68k/xserver.tgz) = feef5d52278d23637d7b8ba77639bfd96918e90e
+MD5 (NetBSD-6.0/shared/m68k/xserver.tgz) = b2bd6057c374376388766fc8667eb9a9
+SHA1 (NetBSD-6.0/shared/mipseb/games.tgz) = f56d3e5181634f6a3d7908dcb002ebcb1c5aaff0
+SHA512 (NetBSD-6.0/shared/mipseb/games.tgz) = 0cff50ea13e34fe338edf70da6a28af061580feb4cb0773828adefa631ebd471a96568a3b30ea0f13f3bb116856a1b6aad8a5a52443346f52e4907f4caabc5f1
+RMD160 (NetBSD-6.0/shared/mipseb/games.tgz) = 1538910578dbb8eee2931200fac0ccda44758e5f
+MD5 (NetBSD-6.0/shared/mipseb/games.tgz) = 2bd5bd0ce72df5cf92767b8c3f7cc208
+SHA1 (NetBSD-6.0/shared/mipseb/xbase.tgz) = d81c7fe75a90f1b2111a066e78f1f2b3e8edcd8c
+SHA512 (NetBSD-6.0/shared/mipseb/xbase.tgz) = c241391fcde4a685a0a2af6f843844ac2e918024c447a2b5ea2cf5300f69acc42fdadf53d3b0348f10723b786bcc0f420e68fe36228375bf3cb5140de41eb40f
+RMD160 (NetBSD-6.0/shared/mipseb/xbase.tgz) = 2fbf60b64c0b7ac2be72ebf998d9d7390fc40705
+MD5 (NetBSD-6.0/shared/mipseb/xbase.tgz) = cd23ca0f6b359c4d695d4494a147d40f
+SHA1 (NetBSD-6.0/shared/mipseb/xcomp.tgz) = c8f5ff5ea9f9bbe231f92d8b7f3bfcbd2897069f
+SHA512 (NetBSD-6.0/shared/mipseb/xcomp.tgz) = c7590075195019078b68ec5f87e36479ae2e7b7749c523df4ef21c9d881c343cda9f5c2bba897dd313329a76fe5c18e920d92827878d98ce08a7dc776352cd02
+RMD160 (NetBSD-6.0/shared/mipseb/xcomp.tgz) = bc60e267cb6e11b4a7305f8b7074084e179e0ff5
+MD5 (NetBSD-6.0/shared/mipseb/xcomp.tgz) = 8e58ee51667def3bd015f79769c0d932
+SHA1 (NetBSD-6.0/shared/mipseb/xfont.tgz) = c551bd13179b9508c2e3a7e19cec323e8ba21844
+SHA512 (NetBSD-6.0/shared/mipseb/xfont.tgz) = 764527f2f3f4686759fcae3fd093f4e00f34e1249994126221a6f9afe73d4cf8ddfbe8b8311798da2ed38c52466a44bb26ea08ad5aab1c08eebcc9019b4223f7
+RMD160 (NetBSD-6.0/shared/mipseb/xfont.tgz) = b3a365bedf8b4a20f3920d0e33b9a42fce288953
+MD5 (NetBSD-6.0/shared/mipseb/xfont.tgz) = adac8939da213a0195cc1d351f979199
+SHA1 (NetBSD-6.0/shared/mipseb/xserver.tgz) = 686f6e6d722c9676351ab058736f7077b4ebd2f6
+SHA512 (NetBSD-6.0/shared/mipseb/xserver.tgz) = 5c818f22edbeac7325228af99d6da6e44b5eb659c7c9fcc6b332071e97a0a490081eda7f9e0f22d6a3f3a589ae34179b434751a6191db5c664683d7510aecedc
+RMD160 (NetBSD-6.0/shared/mipseb/xserver.tgz) = 0e9f066095b505c7f062bf877147189a7a2f0649
+MD5 (NetBSD-6.0/shared/mipseb/xserver.tgz) = cdd2e5127838437df40af161e0c8398f
+SHA1 (NetBSD-6.0/shared/mipsel/games.tgz) = 27d9f98fecb3495e51939df9f107e81e527af26f
+SHA512 (NetBSD-6.0/shared/mipsel/games.tgz) = 46bb4e10313cfffaaf4f7fa2157474ef940f94bcc9f84b46f829c7615bbf45e4e01edee7b7efb84bc28561e0712c37cfc737f9c2a0d9a73b67c80c8aa0f3a9af
+RMD160 (NetBSD-6.0/shared/mipsel/games.tgz) = 947feea90ec2698a65d555cb78a29a001b086589
+MD5 (NetBSD-6.0/shared/mipsel/games.tgz) = 355f00978fed8e8da6a251e591be5387
+SHA1 (NetBSD-6.0/shared/mipsel/xbase.tgz) = 76468fcada5a9e26652aa9f0f9f3c94829a317e9
+SHA512 (NetBSD-6.0/shared/mipsel/xbase.tgz) = b2adcfc2dedef30b21b885c8fc757d0479541744a280a9997fbeaa9c881009ab4b0019e0001a540a8eb6db5f84db87b365e420bb2d4270af209821bdb080369c
+RMD160 (NetBSD-6.0/shared/mipsel/xbase.tgz) = 1e0074d03d9fbb3373e0a427b25cc7097bf6d3c8
+MD5 (NetBSD-6.0/shared/mipsel/xbase.tgz) = a8f29ec2e3768405942f97af3dd08ee7
+SHA1 (NetBSD-6.0/shared/mipsel/xcomp.tgz) = d8ac89f3f6ff20abb0adabc49227afdb74aa2040
+SHA512 (NetBSD-6.0/shared/mipsel/xcomp.tgz) = 4f03213fb061dae9421747209628d06ede6bbb71a7560a9e1a54796b907f1620146a33fdce52974227a21acedcc210b99e15c4fdd36432eba60c1041a92d8cee
+RMD160 (NetBSD-6.0/shared/mipsel/xcomp.tgz) = 6be5e72b9b57c9bdf8ed8ea127e2a73830feeecb
+MD5 (NetBSD-6.0/shared/mipsel/xcomp.tgz) = 59a7ea141587417be38ab1f6056cc780
+SHA1 (NetBSD-6.0/shared/mipsel/xetc.tgz) = b9f6b1a54ffab37b11f4c6e717b481cd087fb609
+SHA512 (NetBSD-6.0/shared/mipsel/xetc.tgz) = 72f35e65f3a90967e250a2006d500619b3824f7f5c3d7494554f153ec5cda5b28c445f28c34a1e4463f40da5855e8d4257726411796967fe37763d90cf7fe461
+RMD160 (NetBSD-6.0/shared/mipsel/xetc.tgz) = 1169c246f91189fd0c4ae86ac27a92f5c2edda3e
+MD5 (NetBSD-6.0/shared/mipsel/xetc.tgz) = 8f3c52cc5af1cafaf7b0d0f884a5b537
+SHA1 (NetBSD-6.0/shared/mipsel/xfont.tgz) = d06848571034f3b7fc975082f1de37b912acb18c
+SHA512 (NetBSD-6.0/shared/mipsel/xfont.tgz) = 66a1013c935bee5e7e5d24325a527522306bcded7ced63790f2e58831b3ed91176a1b9510b2159be63504d5167d48d534919927ffc6e225ae2bb2487f90a9ede
+RMD160 (NetBSD-6.0/shared/mipsel/xfont.tgz) = c9502843a5d4dd7e996e8d158c519cf7f8575cbd
+MD5 (NetBSD-6.0/shared/mipsel/xfont.tgz) = e812899176eac2bf65a6d949ac3f3424
+SHA1 (NetBSD-6.0/shared/mipsel/xserver.tgz) = ff805022f409202f3346c45475c7ec0f8187218e
+SHA512 (NetBSD-6.0/shared/mipsel/xserver.tgz) = f2bb3810a5572b519980126a3d934f63b5ab5c2fcf9fb8166c556bd3cc14cfaa151d582086bb1506ac9ac7e21d4e70a5cd5c3faed96212d8a14a0b5bafdcc4c1
+RMD160 (NetBSD-6.0/shared/mipsel/xserver.tgz) = d5ae336337cc77f7f55f542b3457918d6fc0efe8
+MD5 (NetBSD-6.0/shared/mipsel/xserver.tgz) = 92447a1560887d337d22e2deed0670a6
+SHA1 (NetBSD-6.0/shared/powerpc/games.tgz) = fbf69640b362df2446d7414ac3a13db100c289eb
+SHA512 (NetBSD-6.0/shared/powerpc/games.tgz) = d86b41d79aea4204ccf45306937a5ec45629e37873a5956c0280fd1d54cf4a808542d097f9d978fd3277791554ce8a6fb4d0ccd46e30210549d5cce1145bb499
+RMD160 (NetBSD-6.0/shared/powerpc/games.tgz) = fd2aed1eb51f4db522fb5163e8fde4c040b55d30
+MD5 (NetBSD-6.0/shared/powerpc/games.tgz) = 997ae5fb42196a787df89873be321e47
+SHA1 (NetBSD-6.0/shared/powerpc/xbase.tgz) = b7c8146146ebc15191c1bf53f51f8f980fe8c816
+SHA512 (NetBSD-6.0/shared/powerpc/xbase.tgz) = 091f5d00414a9ad478811bfb0e953f2a204869bc5e310790886a59c11953974cf7068cd9a96c8823856ab2687ffa2ac31e97494f47338bfe31d80217382c59f1
+RMD160 (NetBSD-6.0/shared/powerpc/xbase.tgz) = 4bd1bfdc7c1e1619de63fb83276c21039b945357
+MD5 (NetBSD-6.0/shared/powerpc/xbase.tgz) = e621806afa0fcc9cdcef0f9b3c7dfcbd
+SHA1 (NetBSD-6.0/shared/powerpc/xcomp.tgz) = 960dd33b61e19dec92096a54791aca1cdf56ce54
+SHA512 (NetBSD-6.0/shared/powerpc/xcomp.tgz) = 111dd50041e4008aeadb898c3d08f9995c5c13a41ccc20993b4ad51c81d7f6ee3b4dab16158ac7436d085b80e4a643b236a9c97edd3e915125a1466154538420
+RMD160 (NetBSD-6.0/shared/powerpc/xcomp.tgz) = 0cf8b9a8d1489a32ba0b5a277d90e429c40650fb
+MD5 (NetBSD-6.0/shared/powerpc/xcomp.tgz) = 4ba4077ca2c0edf71813165fcf5321fb
+SHA1 (NetBSD-6.0/shared/powerpc/xfont.tgz) = 4711fcbade0238d60b7b89cf0d7873b03d7ed1f7
+SHA512 (NetBSD-6.0/shared/powerpc/xfont.tgz) = c29130f55f536f602253a7f92f073ebf6ba02baea09f8011530bbf7e03ae96594334f0c60b29a8bceaffc3eb8b152db47548e38a3c8a14abc5fe35bc5d1d7d93
+RMD160 (NetBSD-6.0/shared/powerpc/xfont.tgz) = 3b01af0f8e34367988d559fe0fbb0acbbafb0b2b
+MD5 (NetBSD-6.0/shared/powerpc/xfont.tgz) = 6ba15ed12217b726d9129db8e942a048
+SHA1 (NetBSD-6.0/shared/powerpc/xserver.tgz) = 05aac7e617e0cac05a88062fef29bb459da7a1d1
+SHA512 (NetBSD-6.0/shared/powerpc/xserver.tgz) = 19fb5af5d6afd78839a22e5c0694a492047b5200c569cbf58c676ff32ec250b21edcfe2ed00b65092fdac374d1ab9eaaed6113c69bc03009cf458aedc6014913
+RMD160 (NetBSD-6.0/shared/powerpc/xserver.tgz) = 774d2a1072b8d122790ad189a6d2ada2ad99e7cf
+MD5 (NetBSD-6.0/shared/powerpc/xserver.tgz) = 3daf1477cadf3593e9ba45e3703fe8a5
+SHA1 (NetBSD-6.0/shared/sh3eb/games.tgz) = 37e15b0950aaaf1af36427ae5dd5866c1879b6b3
+SHA512 (NetBSD-6.0/shared/sh3eb/games.tgz) = e674abb1b1966acbc581a8f8b3e37841f48656e66f3302077cbb2de443487912b99521336ec5dc096fa3c7769b2d7623e1d1720a079407ec1861d32159a72ebc
+RMD160 (NetBSD-6.0/shared/sh3eb/games.tgz) = 36070071e8315d2352be1b3e563ce7ef7625d184
+MD5 (NetBSD-6.0/shared/sh3eb/games.tgz) = 0016145b46957b95dd158b4441dfb010
+SHA1 (NetBSD-6.0/shared/sh3eb/xbase.tgz) = 564bce6dd7c37b5e941e41d50f363c133fdf8f97
+SHA512 (NetBSD-6.0/shared/sh3eb/xbase.tgz) = 23b3306254c789331542e63974f9d7cdc54d99ba2cd67cf6a1c97f09afa4f6cf6aa8798e37b7c38f4a55afd1572154f291fa1bf2e2a1fc87165fd6bd7f89fb80
+RMD160 (NetBSD-6.0/shared/sh3eb/xbase.tgz) = 476fbd8301bec0795a01552728ada44204d2dbe6
+MD5 (NetBSD-6.0/shared/sh3eb/xbase.tgz) = 9fbbbdb3acfa4ccd9f0b309ea0ed0700
+SHA1 (NetBSD-6.0/shared/sh3eb/xcomp.tgz) = 526a278a13833073e6231e879abdec85400ca888
+SHA512 (NetBSD-6.0/shared/sh3eb/xcomp.tgz) = d2081a7536e3d7fa27a363afd8f6eb5fc3de4606f11b4857be2f1df59934da9d3d16e0df3a6edf4cdf52c8f579e0e4c06f07de0959b5213c21be1a8fdc2ee134
+RMD160 (NetBSD-6.0/shared/sh3eb/xcomp.tgz) = 4a767ff08e9bcf98f886849cabebd1300397256f
+MD5 (NetBSD-6.0/shared/sh3eb/xcomp.tgz) = a23a2d8be9298497b4b6d39fda330bf4
+SHA1 (NetBSD-6.0/shared/sh3eb/xetc.tgz) = 93a5cfbbfdc641f91ab363d4b65d1158d71c0cfc
+SHA512 (NetBSD-6.0/shared/sh3eb/xetc.tgz) = 85a67734801e81e129a37b73ae62211459fb16d4e52a945ef21a4bb908dd7d1d775233956086dd3d59af45bcea24fbd6f54a2a9175756d242b57e07d10767548
+RMD160 (NetBSD-6.0/shared/sh3eb/xetc.tgz) = 6fb055d0e1b6264bf1ec396236d903218832377a
+MD5 (NetBSD-6.0/shared/sh3eb/xetc.tgz) = af954b56e624948145b91aa451d77392
+SHA1 (NetBSD-6.0/shared/sh3eb/xfont.tgz) = 6139c05273b6feeecdfcd11cbe0da91256d12a11
+SHA512 (NetBSD-6.0/shared/sh3eb/xfont.tgz) = bb849454ede88d39ca60d6c513c833c2b29ea548adedb9f76870839174a3daa838d38a6ad701c78bfc164e690c5ebda9c9d00d4c23ad816df9f1962313afdbf2
+RMD160 (NetBSD-6.0/shared/sh3eb/xfont.tgz) = ea8f123f9f78b429b77ff15c924803da1da2068d
+MD5 (NetBSD-6.0/shared/sh3eb/xfont.tgz) = a87cb6769c37ae20dbf0dd70cef93d11
+SHA1 (NetBSD-6.0/shared/sh3eb/xserver.tgz) = 6cd4fdb0ff00ef5d89b47e68e538c86e395b2054
+SHA512 (NetBSD-6.0/shared/sh3eb/xserver.tgz) = e3b575cab95e297a05a26a03eeff0cf843d665ebdfd103846ad544bef1d04f93aa20ceab09b1dfaae8f59d89ebb1cbef400b7521bdb41f7542f23156540aa4c0
+RMD160 (NetBSD-6.0/shared/sh3eb/xserver.tgz) = 7e52b98276b4d097f7babe918e6768ae9d7945db
+MD5 (NetBSD-6.0/shared/sh3eb/xserver.tgz) = a505ab4ce0801aabe21fe6038b63809f
+SHA1 (NetBSD-6.0/shared/sh3el/games.tgz) = 2040b4af557a62f2ade5fc9fcfe4cab3df88c7e2
+SHA512 (NetBSD-6.0/shared/sh3el/games.tgz) = 8b5071337dc844042537c24c75660e61c9709cd10cbbeab059a84da6d482260b73365ff3870f85060c130a291b6f02be174d288127ca62ce4d291a6982192317
+RMD160 (NetBSD-6.0/shared/sh3el/games.tgz) = 28acfa5a131d52df7c157e2edca1dd0f20e774dc
+MD5 (NetBSD-6.0/shared/sh3el/games.tgz) = d82c46dbc0021fd4694e464042936052
+SHA1 (NetBSD-6.0/shared/sh3el/xcomp.tgz) = 53aa1e2a910e8eed09dc07f8b724804f53fe5e2f
+SHA512 (NetBSD-6.0/shared/sh3el/xcomp.tgz) = 24645da85419528015cdaefd0c835741fa801392e795b363bdfc39558e75e7f384511c0668d12e2440114b7c543c7532aaec438048f08d35c54c9c7a748f20c0
+RMD160 (NetBSD-6.0/shared/sh3el/xcomp.tgz) = 60a461ffc1f1562274110d65c72a541ee131cd21
+MD5 (NetBSD-6.0/shared/sh3el/xcomp.tgz) = f1d2650a8d7a4ecd60fda8e1aaf8c09b
+SHA1 (NetBSD-6.0/shared/sh3el/xetc.tgz) = 1636a6fe3e01f6d8a07a19cd204a6807c8caa4c7
+SHA512 (NetBSD-6.0/shared/sh3el/xetc.tgz) = 9cea4ba4af287dd57e591d4269f2f2582010250316f323746ac56b12cefcf2590b93fbb0197c665f61b1df41dcca62d17fb6ad80d4b1feb8ac8265e91e15074f
+RMD160 (NetBSD-6.0/shared/sh3el/xetc.tgz) = 5f68e3f96f7bb9ae07fccdb1d058e4b1307b4b29
+MD5 (NetBSD-6.0/shared/sh3el/xetc.tgz) = da84d97230787283e215a4ee1c4053ad
+SHA1 (NetBSD-6.0/shared/sh3el/xfont.tgz) = 97439ccf6840b18b1e9885f5504a401bf1a93650
+SHA512 (NetBSD-6.0/shared/sh3el/xfont.tgz) = 3d15541f7d7ae2128f44355bf110415adfa4e5182829259d2c6f7a4217feff99e236d13c5bb7bbeb724ff1a09ac1f58f02bdd6eef528bc416ec3118db6fc7d45
+RMD160 (NetBSD-6.0/shared/sh3el/xfont.tgz) = cdc9fcdb5fd5032803d5bba18db58f3ea6d62c85
+MD5 (NetBSD-6.0/shared/sh3el/xfont.tgz) = a8466a0477c6c443eafe99e9d1c61131
+SHA1 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.symbols.gz) = 4033fc14abf440fef2f4e6370dead899e4983721
+SHA512 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.symbols.gz) = 17fb47f8b2731f8fe73376ab664040eefdc64690156e26acad0791871e64e5d401ea95f592a034eaf963ceebc919a6d54c06874c8be8141b049637cc55aabc84
+RMD160 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.symbols.gz) = 9de247cfdaae7ee9022f6d09030b58665536dd2f
+MD5 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.symbols.gz) = c89c4849f164a941bc9a17cb89ca4dc2
+SHA1 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.aout.gz) = 98a104383326606b65c14160cf13b700c0d0becc
+SHA512 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.aout.gz) = 60c184cc2a78026b2ae297623a540618e63a58962e578fa8ecb0e68c5e94e9c64fe910da565b6e9427e0e99aae311e8645e2083a4cd02373f08c514a29fa9bfc
+RMD160 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.aout.gz) = c1569194e6d7d526911ecc813919db5103eba092
+MD5 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.aout.gz) = 77f58eeb32ecae1a67c7821cfef3e1f1
+SHA1 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.gz) = 3aec79cc4bd37f7777e326445a18e4d551f4dc23
+SHA512 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.gz) = 46894446ed52b86e01d7fed75aa5285670d2d32a972be76a1019ea797583fff37423f4d9d40c29c394d123365b9a196fc7bb3824dc5952f6407b21198127cdba
+RMD160 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.gz) = e34c8493497296b2d98dc0522d2d4d58b56a3546
+MD5 (NetBSD-6.0/shark/binary/kernel/netbsd-GENERIC.gz) = 9ccf14a3d80b596f8e594c2e7db89224
+SHA1 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.aout.gz) = 08fdda8c99f112770acb58f662e7dc7f92e211aa
+SHA512 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.aout.gz) = eb7dd72ec967546883dbf9e50fc9bf770e8aced07020c03f93abdc0c9bd6b1a03ff320a3f5167f74caf732ff37495e7507628e0ea213ae8fbf209fbfc2ed2368
+RMD160 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.aout.gz) = 97cd05778ad6cbef869bfd1ef9bda107db56b099
+MD5 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.aout.gz) = f174a788515cbae3b497a13a1f27b68b
+SHA1 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.gz) = 78fa421384bc331c7bf1194c90f45969e0b9f9ca
+SHA512 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.gz) = c97fe5aa7c364929d749ee65dec8b6a7736da39e4d3366dfd8b17e67e8b5e56f9d37a0b8b4437c161602bfd265b486378ac272fc4e7917851b64faf8a9389370
+RMD160 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.gz) = ef146283b89c96c7d68bef166e853a83df6a65ee
+MD5 (NetBSD-6.0/shark/binary/kernel/netbsd-INSTALL.gz) = dda410ee10ec3e07d4b962e08e5895c6
+SHA1 (NetBSD-6.0/shark/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/shark/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/shark/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/shark/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/shark/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/shark/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/shark/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/shark/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/shark/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/shark/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/shark/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/shark/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/shark/binary/sets/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/shark/binary/sets/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/shark/binary/sets/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/shark/binary/sets/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/shark/binary/sets/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/shark/binary/sets/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/shark/binary/sets/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/shark/binary/sets/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/shark/binary/sets/kern-GENERIC.tgz) = 436b25de68b7e666f29611394561037b31f1a9b7
+SHA512 (NetBSD-6.0/shark/binary/sets/kern-GENERIC.tgz) = 64acef2068786ba3afa466eda01db892f03fb48db03ad9ee0817f6a78b8019225beac65553dcd733d9858b4c35da337cbb20a7efa7019e77178e637dd5cb25f2
+RMD160 (NetBSD-6.0/shark/binary/sets/kern-GENERIC.tgz) = 83396c190ee6331e8297e4abc20d5b940b654e23
+MD5 (NetBSD-6.0/shark/binary/sets/kern-GENERIC.tgz) = a00e97b04a6d5affc36743311bc2293e
+SHA1 (NetBSD-6.0/shark/binary/sets/base.tgz) = fa2c393fa435744e1b106d19470278c97d9419fb
+SHA512 (NetBSD-6.0/shark/binary/sets/base.tgz) = a6ec0e86858f7c9faef7b4df4f2a951fa120af290d18d06598bb82b54541fe1a36d60b47f03da404a0d97889a5ea582db0a13b4a1827acf9e1842c70c90fcc0c
+RMD160 (NetBSD-6.0/shark/binary/sets/base.tgz) = 151c8a2e662926762a132b689b24943ac8b93c01
+MD5 (NetBSD-6.0/shark/binary/sets/base.tgz) = 787953226e7c5d1aeb78aba04cb18579
+SHA1 (NetBSD-6.0/shark/binary/sets/comp.tgz) = d37041a235ddf0a129bfa9f1d5e11d2fdb77816f
+SHA512 (NetBSD-6.0/shark/binary/sets/comp.tgz) = 19427e8b7dc48941e4e54ff0b8841358a551599c43862f830a752551044f96ed39bbd8038348fb3f3bf15ee831e0638cc4a3b4f0c04037222666f017cb11b862
+RMD160 (NetBSD-6.0/shark/binary/sets/comp.tgz) = 58df952b8aea84f1e0bc2658871408502eef4667
+MD5 (NetBSD-6.0/shark/binary/sets/comp.tgz) = ef10bf2cdec1811b1d3a2d3376201583
+SHA1 (NetBSD-6.0/shark/binary/sets/etc.tgz) = 07309c170d21a4c786ac5a12f5e792580788cd76
+SHA512 (NetBSD-6.0/shark/binary/sets/etc.tgz) = 6424ecfc34615c6fd1acb909b70414806e516119f30df73b70ee7128e69060da9457043da999de6011e7556a6685091cd30f4033e0ab7ea8cb0a2c6cc02c03ec
+RMD160 (NetBSD-6.0/shark/binary/sets/etc.tgz) = b2fa61062310af5511249b80505cefc966801f9b
+MD5 (NetBSD-6.0/shark/binary/sets/etc.tgz) = 1b69ed72ccfb0af799b148825a53bc9c
+SHA1 (NetBSD-6.0/shark/binary/sets/modules.tgz) = 3ef4de9b2730972b94688f3674b121eeabd2448d
+SHA512 (NetBSD-6.0/shark/binary/sets/modules.tgz) = 7c29c66462378dc8d7e7d5bfce324b012383176d8b381e83122808920f2d88d80665547a6e2974738fb6b1268aeacc4a7cde9ef17faec3d9d5c155ae2544cd37
+RMD160 (NetBSD-6.0/shark/binary/sets/modules.tgz) = ae6f3aba96b1b9b2d2a412754a42296afc85a69c
+MD5 (NetBSD-6.0/shark/binary/sets/modules.tgz) = 5f374bf40599728af733192b3a546d7e
+SHA1 (NetBSD-6.0/shark/binary/sets/tests.tgz) = 62e58a9b83eec5a0fb21b9fe7f5845e5315811e7
+SHA512 (NetBSD-6.0/shark/binary/sets/tests.tgz) = 43d78bd32bff49e6f6c62914cd16916e41541fb446913c688d0fe4fdbcf5fff6d5605688ec165f8e856a418bba4f36c7d7233b8344c86b954ce104e963abe0a0
+RMD160 (NetBSD-6.0/shark/binary/sets/tests.tgz) = 560f27cf65beada1eb6e62458b7450968218fd37
+MD5 (NetBSD-6.0/shark/binary/sets/tests.tgz) = 4d39b8cb6664b022b300186cb7afa8e6
+SHA1 (NetBSD-6.0/shark/binary/sets/text.tgz) = 663a9a70c81324796717d31e46d5e8c00620a132
+SHA512 (NetBSD-6.0/shark/binary/sets/text.tgz) = ae6817fabcfae5fd0a9f35787e6d9af82d64a14c6d532c1a54c347c367d23c6ccc274eb813a23e4bb4dcb036b829437130400c418ffd0eb9c36858443f8d9b84
+RMD160 (NetBSD-6.0/shark/binary/sets/text.tgz) = 51994c6b412ee1e6834b270482f8c0dbbc95a835
+MD5 (NetBSD-6.0/shark/binary/sets/text.tgz) = c93688098447ac5ebf664bfb3362615e
+SHA1 (NetBSD-6.0/shark/binary/sets/xbase.tgz) = 2782c3a99b0cdb6ea4c4b29543f6f06b24c1726f
+SHA512 (NetBSD-6.0/shark/binary/sets/xbase.tgz) = 90a42af846fd7479e30789a28c7908b2b70416e7824d7f78c31b378c5e1dd38d4eb797f4430f6dd9baf051afe1750ad4bacdd3e93f2b65b2ad92945f682a1685
+RMD160 (NetBSD-6.0/shark/binary/sets/xbase.tgz) = 6b4e44c69f47563964562f18c42a5bc5a99e750a
+MD5 (NetBSD-6.0/shark/binary/sets/xbase.tgz) = 1c370ba00bea97b4afbef7e3bc919655
+SHA1 (NetBSD-6.0/shark/binary/sets/xcomp.tgz) = 997e19373b3e9b90464e849f1d635e33235aa5f7
+SHA512 (NetBSD-6.0/shark/binary/sets/xcomp.tgz) = 1e9d84d70a45aa3ea4d4bff9066594e853b9af68912e58bc933060f2b652ceea2d40231e04debed15dc569ec3d1d2d3682b3042b009c0738f17bf11979f2e86e
+RMD160 (NetBSD-6.0/shark/binary/sets/xcomp.tgz) = 60b1ce3cf224d2caf6d4c9757761c8145d4bcc4f
+MD5 (NetBSD-6.0/shark/binary/sets/xcomp.tgz) = 0bd79975afc5e2dbf542c8ab9363b664
+SHA1 (NetBSD-6.0/shark/binary/sets/xserver.tgz) = cf7350b715c568255b8d095503eed754c3d1ff31
+SHA512 (NetBSD-6.0/shark/binary/sets/xserver.tgz) = 3c88b006114891f2e3aaac95d15f25de6c8ac1dd00802097d1885f015326e926a297dcdf6c9c10a798ff73242e3130a7e359bd7f4bab45b23408a628da011725
+RMD160 (NetBSD-6.0/shark/binary/sets/xserver.tgz) = e9a9b2579181cfc7974ab1586990bbb0f2470299
+MD5 (NetBSD-6.0/shark/binary/sets/xserver.tgz) = 795a4afd76d016cb1868344522fb0fb4
+SHA1 (NetBSD-6.0/shark/installation/instkernel/netbsd.gz) = 08fdda8c99f112770acb58f662e7dc7f92e211aa
+SHA512 (NetBSD-6.0/shark/installation/instkernel/netbsd.gz) = eb7dd72ec967546883dbf9e50fc9bf770e8aced07020c03f93abdc0c9bd6b1a03ff320a3f5167f74caf732ff37495e7507628e0ea213ae8fbf209fbfc2ed2368
+RMD160 (NetBSD-6.0/shark/installation/instkernel/netbsd.gz) = 97cd05778ad6cbef869bfd1ef9bda107db56b099
+MD5 (NetBSD-6.0/shark/installation/instkernel/netbsd.gz) = f174a788515cbae3b497a13a1f27b68b
+SHA1 (NetBSD-6.0/shark/INSTALL.html) = ee446561ae849bf3326e81939b2071c706bbbe7e
+SHA512 (NetBSD-6.0/shark/INSTALL.html) = 01bd9dca202f365a64c9f523cf025abc31a7180a8b45f843d1e60cfe4682329aedc8a892b8e2a6a230bfda1803c6740b6d9fe415992f5a2206425cd875ca3e1f
+RMD160 (NetBSD-6.0/shark/INSTALL.html) = c73d5cfb8e656b4634046ab9dabaa09772f8e383
+MD5 (NetBSD-6.0/shark/INSTALL.html) = 4207442c91faf52d0f3778fb77943ec0
+SHA1 (NetBSD-6.0/shark/INSTALL.more) = 9259e39f2fbc92e793da04efa5acb0318ee257c6
+SHA512 (NetBSD-6.0/shark/INSTALL.more) = a9510586f73298c7b0b8af60cf30b86d4588b90682b73adc3f14cb862f0f7ec0f103ff62eda6d4a141a2c5a24fa13d108f08817829a00545f8400ff9785460dc
+RMD160 (NetBSD-6.0/shark/INSTALL.more) = f80b0169a0a6cc36d204319f0e5ea6ac9e3c6256
+MD5 (NetBSD-6.0/shark/INSTALL.more) = cc98ec10bfc9ee19abfac7bb78843b52
+SHA1 (NetBSD-6.0/shark/INSTALL.ps) = d63b6262c2b64c83f763fdc888153b4d5785a5d7
+SHA512 (NetBSD-6.0/shark/INSTALL.ps) = e7082fc171e77f43761b8f8dba6443f9a76103be8b964d70e845940cec689c10579d8e5a6aa80bbb008cbde61c125fe348a3db7d157235df9dd6b53d247c3b8d
+RMD160 (NetBSD-6.0/shark/INSTALL.ps) = 5ae64ccead4bce193eef02a56c1883be5836e3f6
+MD5 (NetBSD-6.0/shark/INSTALL.ps) = b80bf37de21a0d2a7c1891ea18ee27cc
+SHA1 (NetBSD-6.0/shark/INSTALL.txt) = 21743fee95f9d668c37c80415896d05a652d8e5f
+SHA512 (NetBSD-6.0/shark/INSTALL.txt) = 80bc5a7e1ef3338c29c29b51f72b5c014bb10a7e7f367912ecc1e6633c7882ad23c119733c81dbcc4d7ff5178303dc555fa42951a48d364613ff52048d8e500d
+RMD160 (NetBSD-6.0/shark/INSTALL.txt) = 15c92de408750d0c47946ad7c7c7371a79e1e2c6
+MD5 (NetBSD-6.0/shark/INSTALL.txt) = ba3059416376468dad953da22a4bf29e
+SHA1 (NetBSD-6.0/source/sets/sharesrc.tgz) = 87a69ce98fc413c46524823e16dcd0dce768698c
+SHA512 (NetBSD-6.0/source/sets/sharesrc.tgz) = aedb194ace955f8c15820ae3e6d8bdbf67992da79f8cb3d2d0a2ad409819a78c7d3921fda193a982a6f032f92113fc807e0ad2eb064a82da98b8f5ec957bc53a
+RMD160 (NetBSD-6.0/source/sets/sharesrc.tgz) = 8e03f055e853b3b44d48cbafde267da9acd549f2
+MD5 (NetBSD-6.0/source/sets/sharesrc.tgz) = cdf8ab923e83b705dfc8e47e47ebdecf
+SHA1 (NetBSD-6.0/source/sets/gnusrc.tgz) = a5bb46c56b0f27a47dbaa3690758336bdc472292
+SHA512 (NetBSD-6.0/source/sets/gnusrc.tgz) = d94945054d64c9b16ddf2b3fbcf0dc8aa41965f76e469e8da0fc822082189d87324169709f5a95aa8461209522d3cdb387f52beaada7ecefb46571b021d925bf
+RMD160 (NetBSD-6.0/source/sets/gnusrc.tgz) = 562debda10c4d28bc11f9760fa7f7797f062a9fb
+MD5 (NetBSD-6.0/source/sets/gnusrc.tgz) = b72569083f678e665d6658cbd2c3e587
+SHA1 (NetBSD-6.0/source/sets/syssrc.tgz) = 8206633fc5ac0f890ecffdd50176768236cd4cc6
+SHA512 (NetBSD-6.0/source/sets/syssrc.tgz) = 566104c4324710005c869e065dc03889e85824910520d097a88c1bd5219adc750b3ef8d0057a7d98a7d535002c4c6e04594d98b5be138b8e29d74b1f3965b045
+RMD160 (NetBSD-6.0/source/sets/syssrc.tgz) = 8f26506a9ce36e2a163026804d629e30628f8c4b
+MD5 (NetBSD-6.0/source/sets/syssrc.tgz) = 8ece18d74c2fbd264198467f47e8b4bb
+SHA1 (NetBSD-6.0/source/sets/src.tgz) = bada9cb20d00977af0fc80b465ae9bd20648c893
+SHA512 (NetBSD-6.0/source/sets/src.tgz) = 981158338e0123f59b5a38f3f5c3a4fb8142f0280e49db0af5f0753512035113887bdcc9aa3f980761b51abf625764d0e89ca4de41cb80145f5ef7239676d1b2
+RMD160 (NetBSD-6.0/source/sets/src.tgz) = 90dc01e48266e240dd95962496cd2a1aa1ca90f9
+MD5 (NetBSD-6.0/source/sets/src.tgz) = 58e1e661d9640ca3eb542ac3086580f3
+SHA1 (NetBSD-6.0/source/sets/xsrc.tgz) = 73f98faff9d1b90c50d50d50a1f17e6880f43f12
+SHA512 (NetBSD-6.0/source/sets/xsrc.tgz) = dbcf2591e42422a0ddb15529b35cd7e1f198589459806239d9efc917c5b604cd152fda76c5fd5a8e912410ee1fc25e561f7e505b63461192406a121e84fe3784
+RMD160 (NetBSD-6.0/source/sets/xsrc.tgz) = 617e6308cfbb0899c230ceea2d843c197c4f4804
+MD5 (NetBSD-6.0/source/sets/xsrc.tgz) = 68d1535d0baed6625f6dd95fd20758ba
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.MP.gz) = 496928e218106c5bc8d32bd6c736eddf69258416
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.MP.gz) = cc26d9ef454d86c7e95a122eb0ef5d6f9dc742b0f9718d0a798e9666974d977de44d90025f38c2947c9d161c3b52a9eb8f42aa866a0198d310f7defd7f472db8
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.MP.gz) = 3ccc735931179c31c8f2d4b5ce1e9f96121ff695
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.MP.gz) = 61be9899c92c833cb52f77b6f8e6aee4
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.gz) = 7b45c74363d7977534a97b006e114ef4051246c0
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.gz) = fc19ac6cf8544def619f803ab7573083991e050b8d551e9c4967d1e327e4ebfe51137f516815152fc00dceed5879309ba4e5e9c420b088378c0323c739df8cdc
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.gz) = 86944c7c8fbed3cad7ddfef09833eee06231c3bd
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC.gz) = 2daad7afb8771cd536a5bd668d3e981b
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SCSI3.gz) = 1138b7a86c5bb93d6b3904164e3841031880b675
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SCSI3.gz) = df36f0aac760c383f970b2dd9e13a4e6e3ca28d47846c904cc07ba11b6e289fe6c8319a40fd51850e5ced7a4585d61c83f489769cfe8aac189b650116f8faeeb
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SCSI3.gz) = e95d11e401563a66d9cc798db312d3f2a1b96c5f
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SCSI3.gz) = 0aaca233a00a9fce3265a749b9a2852d
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SUN4U.gz) = 0732f8665299b419119c4507e525a6c992f20656
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SUN4U.gz) = dcd45f52ade746443eeb910f331ccbce2d48eaf03f2e49c7ac75940b36e2097e41ed5873224bf664e4bd935ba17b1503a61640427a7d9ea87ecdcad39f7eee60
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SUN4U.gz) = 568b09bb65717c3ae1b2f2e3a5b1c15316a3c53d
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-GENERIC_SUN4U.gz) = 785d8668cfd1df9f6bd6af6587636e0f
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-KRUPS.gz) = bd5c8ef678bdeca11a32980b732803967ab0398f
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-KRUPS.gz) = 1c79b7d19dbab9bb132529d1bf10f6a3d9f8bdbf006d1296721c5a987812cf55a077368b75b4775e1425dda56afde6ab35f5995648187c623dcdb3154d2a050a
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-KRUPS.gz) = 93604d098cedbfd647a5ac6ea9409928bebc48d6
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-KRUPS.gz) = 7108981b6236f991fca67fe58d6eae81
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE.gz) = 976e0a56648d3e03356d7f76426971fa523e4551
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE.gz) = 172bd67678acdf034d897369d1d92be25dd684dbd14f362fad6c9655f7d5265caf4b57d495c570eebc1e53a87c53374d8f552656fa66366d3ac6221ccf98a752
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE.gz) = b3a6897f2e3eb5acfe2d87f7d377697caeb3b007
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE.gz) = 7ea122d02744bc1fc5e42853992c908a
+SHA1 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE_OFW.gz) = 181bf7c2d1cd731f71c5334a5d0d097749f166af
+SHA512 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE_OFW.gz) = 63f26657f4bdde1cff58858fd5ffda69867a45d8148c4b4cf13804281389f34026a09f9f228eb670ff01ed8a02e99affb67b7a170fdcdda5f8f5cb128eaa9ece
+RMD160 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE_OFW.gz) = fabe6d8566d88af5324ffa952c57f0fad3accd95
+MD5 (NetBSD-6.0/sparc/binary/kernel/netbsd-MRCOFFEE_OFW.gz) = 8a5f7d38f6ddc835e528d51886df36e7
+SHA1 (NetBSD-6.0/sparc/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sparc/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sparc/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sparc/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sparc/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sparc/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sparc/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sparc/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.MP.tgz) = c77b07953f63e5e21d1313e08dacf592acbddeef
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.MP.tgz) = 40e533f5b17404c1d1137cee7e541193f5f6ad323bc615ba5db6a1dfd4816a27eb54b26d272886dbedc9184e85b36ba1ef6e798e140f84e669475eebdd61a015
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.MP.tgz) = 2e067f3f9ef9697eba5185ff0d15d847c6e277a4
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.MP.tgz) = 496e0471d0eb80e227337bdaa45db5b2
+SHA1 (NetBSD-6.0/sparc/binary/sets/base.tgz) = 952c71b877521b1af63302bbe4c072b482c3723e
+SHA512 (NetBSD-6.0/sparc/binary/sets/base.tgz) = 14dc66a667648834321d8bde6c4f9e07c582ac569ceda4991552119282b53690521a89cb0fc06e2c0952f75d9dbc6c9c554f922e74111f4d42c94085bd4697ec
+RMD160 (NetBSD-6.0/sparc/binary/sets/base.tgz) = e57ecaa3098d2ae780c38e3e085c6f164498cd95
+MD5 (NetBSD-6.0/sparc/binary/sets/base.tgz) = b9fb689a8d63084ad2d6a4089028296d
+SHA1 (NetBSD-6.0/sparc/binary/sets/comp.tgz) = 59f49bbeaebf959d30414d0cacca3724359d55e8
+SHA512 (NetBSD-6.0/sparc/binary/sets/comp.tgz) = a800a26ddca7c79ccda284ab3b5e815cc4b53c409ca78bb00f386348e4ae973edf66440a931d9fe2ab0f8a16e329d885c3a2f190780600ca4e205936d7d01e8d
+RMD160 (NetBSD-6.0/sparc/binary/sets/comp.tgz) = 3a0cc6492eb72ee033ccd0b60c0c1698fa6b49d1
+MD5 (NetBSD-6.0/sparc/binary/sets/comp.tgz) = 39c91111ea991ede7ef81fa845ac319d
+SHA1 (NetBSD-6.0/sparc/binary/sets/etc.tgz) = 7cca1a9e594b2122f17b67a26d15e2051403bc68
+SHA512 (NetBSD-6.0/sparc/binary/sets/etc.tgz) = 191f890e7588a17a3258e92d51a91407281c97fe84e2ce68f6fc1db48b95011b1c15f86cc3bef58dff5b167c8ee1608fb42c22b55b78df7461a60827882bb0e4
+RMD160 (NetBSD-6.0/sparc/binary/sets/etc.tgz) = 39d06e86cfc8d3fb588c5b95371ece29ef11b5de
+MD5 (NetBSD-6.0/sparc/binary/sets/etc.tgz) = f909a9a70e65ad480468d1de75f057b0
+SHA1 (NetBSD-6.0/sparc/binary/sets/games.tgz) = 352b9089651bdd1ba05526f34fd99bf8e89db039
+SHA512 (NetBSD-6.0/sparc/binary/sets/games.tgz) = bd7c551fde89b7339d6b652a2583322c662bf0d4b69ce143034253f9764cfefabc5abe45d8e8850f7b9ee2d5714cda13f26f1d516679b544c096d27cbaf87b08
+RMD160 (NetBSD-6.0/sparc/binary/sets/games.tgz) = 9e71d26c198691e30f653c47b3b725ab54f1144e
+MD5 (NetBSD-6.0/sparc/binary/sets/games.tgz) = f6932706a5fba3dc666106b7b84ea734
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SCSI3.tgz) = e5359bdc3fc08e7fc7b5f0ffae289d8e3bbebe72
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SCSI3.tgz) = 88e1c0850a758a10d7752c1c64d4d80b5fc9935eb8cd9f4869585ca42cb5706bb6c1fa38467e7ba67a28f0b3e4e12df989839b1c7f6a777785e919eda6c4e464
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SCSI3.tgz) = 6486dfa05e73ea92b83ab42151f3978fb8d9cb3b
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SCSI3.tgz) = 8965e59f45390938dd1f4cca3b47b215
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.tgz) = 0803f566c7ab3cc4ac8bdb66f0e6e93e44f6780b
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.tgz) = ac72f82075f9cd2d7a5aaa4556f0e6efcdd6207ecfd3c6eef2773281f9088fca35169b68987c3a95f8481670fbd637caaccc48a6fea450c5334e1a5a61a009ab
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.tgz) = 4a8db5843d949d1d2b6c45e23313628ef2db07ae
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC.tgz) = 7c8d15c09c139fc7445d83e669004f26
+SHA1 (NetBSD-6.0/sparc/binary/sets/xcomp.tgz) = 4671cf1becbd220fb0693d8dc580bf90fd558a38
+SHA512 (NetBSD-6.0/sparc/binary/sets/xcomp.tgz) = a37753c7f879f4d7205dfa23488b6fda40aa098cdf5d998f3b8335c487d2bffc7d9edbd57de2f12dfce586d60f2044f1617173fa6902e821a74dacc314382b98
+RMD160 (NetBSD-6.0/sparc/binary/sets/xcomp.tgz) = ed445184a03edb2cf1bf204e9cbbd04ce6f8367e
+MD5 (NetBSD-6.0/sparc/binary/sets/xcomp.tgz) = 82dc6b78584e5997bcdf436f37400177
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SUN4U.tgz) = 478f84d19aae7f5aee8ddfdb45eb9aa37a21a3d3
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SUN4U.tgz) = b9168217a02a3da991b5b3fb069097b663dea23088a529f16ea09dc12c233bc4d63b4310fbc8e26285e6bc9cd566144141898743fc8617bd9296956432b2f9b2
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SUN4U.tgz) = e9e53c86f42b75fcc12853ed2dfd5423b0968581
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-GENERIC_SUN4U.tgz) = ee3736e6af879f5d4e0cc369bfa579b5
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-KRUPS.tgz) = bc69fd900a788cd8ce5d7413b4716f656814b804
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-KRUPS.tgz) = 64c42a3748d62926aa10870c08331bce20b67f6b50afd13a19a76b232b2f9f2d1c2fa04819cf88f211badbdff0cc1684ca48ca7f1c6d8f44859257764e882842
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-KRUPS.tgz) = 18df230d31af7e526b9f6fb3254061e6601a9b15
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-KRUPS.tgz) = 1057e644aef74d636a558c03dd9f7e7e
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE.tgz) = 58b500435295d07ef47bd1702ce2f8c5fe798e8c
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE.tgz) = f3657cd11910995d2bf8e4140f4df4d6829311de9d5a4fa39a980af3577035ad7cc1189066aa0d9093803727b0e1405e9e2c5bbad4db8e4e172e9d5d000c2541
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE.tgz) = 91c5e94452446fb8838dfadab79d8f0c915669a5
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE.tgz) = 2535895e15ea9dc1c4806df090d1bc81
+SHA1 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE_OFW.tgz) = cc966bc2458bae8bdd3995d423ae83707d0a0a38
+SHA512 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE_OFW.tgz) = 35967055f863081ef3d16144c5324ab62c2e44942100202414961a58b8b3e1243e8a2b3e2ff4d7075df0e624d9da1ff7889f8c9dc710c888f6654d8d845233d9
+RMD160 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE_OFW.tgz) = 5451d5da667a2a57e3af6df7119703db7a2ec8a2
+MD5 (NetBSD-6.0/sparc/binary/sets/kern-MRCOFFEE_OFW.tgz) = 8cb1f508b5103088f400e7422e23a34f
+SHA1 (NetBSD-6.0/sparc/binary/sets/modules.tgz) = 6519d6696e013f8a9e51d2856aac1390c0c3e69a
+SHA512 (NetBSD-6.0/sparc/binary/sets/modules.tgz) = 4dd5d8721c4d0733813e1fc884e9242cbf957f33ccf92fa7a8f3255bcf1af3598de843e15ad052a696cd95065251cae8a6927816c041732a6f12823657ef22fd
+RMD160 (NetBSD-6.0/sparc/binary/sets/modules.tgz) = cab574162ec0996f845835763055d6e65bb4ceb4
+MD5 (NetBSD-6.0/sparc/binary/sets/modules.tgz) = a60477fd2b83a211972512c035679276
+SHA1 (NetBSD-6.0/sparc/binary/sets/tests.tgz) = 816dc19db04ba2f95dcf80c62598f9fec7fa92ff
+SHA512 (NetBSD-6.0/sparc/binary/sets/tests.tgz) = 80c23ac0ed623404542d3e6b6e7dc8194ae876c6a0d17b250151ce6e941e874a033dcce8afa002fbe3d875b1c79687e392fa6f527fa46ec0e3c82ae31cfd5eb9
+RMD160 (NetBSD-6.0/sparc/binary/sets/tests.tgz) = 834ebf4c2126e3ec1b2226e48564ab87d7ff8da0
+MD5 (NetBSD-6.0/sparc/binary/sets/tests.tgz) = 9d0c1bd587f83df1b0090f88357f8531
+SHA1 (NetBSD-6.0/sparc/binary/sets/text.tgz) = 92d7911a1d761b73c8d2080e819705f901d1ce6d
+SHA512 (NetBSD-6.0/sparc/binary/sets/text.tgz) = 4e8e2f2abc8cf95a4672ef492e091142b6cc4a4baafddb6fc123fa5b3cc3d67a16e61ab4a7b188dac4b8ea198d8c88c1c81ffe1eca70f9900780a8a134257c36
+RMD160 (NetBSD-6.0/sparc/binary/sets/text.tgz) = 4d5ca8f6d680d3389d6b90c45875bcc4b4e962f3
+MD5 (NetBSD-6.0/sparc/binary/sets/text.tgz) = c16beb242b426177d80af90e40266abf
+SHA1 (NetBSD-6.0/sparc/binary/sets/xbase.tgz) = 2809df01d9a0aa85270f6f77341cf50d72bc78bc
+SHA512 (NetBSD-6.0/sparc/binary/sets/xbase.tgz) = 886f26f21f95ea17ef60d28fabebf415485d13647d335b237a4ee954039c7c6dfc0d9e68c06aec52ef463b6c2b7b88cd6baf514f2c5b567b8f5421c99df12672
+RMD160 (NetBSD-6.0/sparc/binary/sets/xbase.tgz) = 499a1e2a76a05fa4a0b3b53438d60b8434198695
+MD5 (NetBSD-6.0/sparc/binary/sets/xbase.tgz) = 82bb74d040bf256d711afb55db6c4066
+SHA1 (NetBSD-6.0/sparc/binary/sets/xetc.tgz) = 997196c30074dcc988f2dfa2a7f5dfc8c31df3db
+SHA512 (NetBSD-6.0/sparc/binary/sets/xetc.tgz) = 09670a40f33c9902b5b22c4400f9e8151f1985504cc1c956df68697e3bd6a7b841391d6dd32cdbba42aebf42f4a1cdd3559c5783f79da236603dc6b5cf86d33c
+RMD160 (NetBSD-6.0/sparc/binary/sets/xetc.tgz) = 50061239bbe31a4dce18784bfcece78a234e6ef5
+MD5 (NetBSD-6.0/sparc/binary/sets/xetc.tgz) = 12ae04f5957291f424568bb61a138079
+SHA1 (NetBSD-6.0/sparc/binary/sets/xfont.tgz) = 7e5ccc7436f81855bd5e20960adaddd9b9851fd5
+SHA512 (NetBSD-6.0/sparc/binary/sets/xfont.tgz) = f263bf4a2b1bc795c1c4dcaf0db819dca08e90c51b41c144911f897a991a3575dcbbac203060d8f51842c85c6e85c4839297fb7307353a38b1a46e1b446d29a3
+RMD160 (NetBSD-6.0/sparc/binary/sets/xfont.tgz) = cb721308df7413a821278143750bf95844eb4d82
+MD5 (NetBSD-6.0/sparc/binary/sets/xfont.tgz) = 9de78b2d18118d7435a6c95d8a503ae4
+SHA1 (NetBSD-6.0/sparc/binary/sets/xserver.tgz) = 0d3b410b9501560307d3b9b17a431be0da1de869
+SHA512 (NetBSD-6.0/sparc/binary/sets/xserver.tgz) = d3dceb5ebfb5085e905e8121c952a97bf7035bbd4e60898d913fbaf58c147181ae7c97f913a122e9ce83523d05a585d1e771139192d42c44fa85e60e2bed762a
+RMD160 (NetBSD-6.0/sparc/binary/sets/xserver.tgz) = fd59e7a1c949c113ec555a9ee63ab369f64559fa
+MD5 (NetBSD-6.0/sparc/binary/sets/xserver.tgz) = a89a1c519c6d6759f810717fc0ec43ab
+SHA1 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.aout.gz) = c2c368ba46549cb580707b799f4f0f88b26128de
+SHA512 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.aout.gz) = 9fb6bef663b2fb68b9bf3591834f6e653c0b3b7f69ac8c40f2479efaa5d0641140d87623fe8eeb8a21cb0e0065ceacb57d6a5db4e1905db97f7dffa52ba8b565
+RMD160 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.aout.gz) = 8fbcdca0f8214901d1fec117c567cfe93865e391
+MD5 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.aout.gz) = 1cf0fdefa01fee95d494b3418ea4a0ea
+SHA1 (NetBSD-6.0/sparc/installation/bootfs/boot.fs.gz) = e36798e87b9d195c7df8602883c775f8f4268448
+SHA512 (NetBSD-6.0/sparc/installation/bootfs/boot.fs.gz) = acd6ad2fa9c1618b4b14d6a63679e347aad6302001e36ea63c58968252ce993df23af7e05e590b72efbcdbc1013192b1862d70d7737fc2fa804249410c9d2724
+RMD160 (NetBSD-6.0/sparc/installation/bootfs/boot.fs.gz) = 986addabcfd9f0b1faccd9fed0081f88e78f2aaf
+MD5 (NetBSD-6.0/sparc/installation/bootfs/boot.fs.gz) = 93526666c7879bc6391c5b7c38b24cb0
+SHA1 (NetBSD-6.0/sparc/installation/bootfs/instfs.tgz) = 98f621b007b19382a0d529f2056cd8c82feb863f
+SHA512 (NetBSD-6.0/sparc/installation/bootfs/instfs.tgz) = 7131f92cd02791f6d351a8ea5d8b5fe93b643ba5975522e85bf81da8f69157ebb21f80f5696beca47809a9732e79e85c7e97e07a33e830eeac2f9542685a01ce
+RMD160 (NetBSD-6.0/sparc/installation/bootfs/instfs.tgz) = dc7168f774cac7e9f7eba640dc55c878ab2c16db
+MD5 (NetBSD-6.0/sparc/installation/bootfs/instfs.tgz) = 80ed52c842f1d4d56d4506d293e30b57
+SHA1 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.symbols.gz) = 673b10e3d23ee6e204bdba91b52b0b50304cb8e3
+SHA512 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.symbols.gz) = edf95ecf1f6133e5228d4f8b6a8d004c1f172354acfa34f1235a488456a69b2fd19cd959f97a0a7d06f007347815672bfce07a3ee25ae511ce73a6e5de217267
+RMD160 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.symbols.gz) = 8829961d6f2e5487af4bd4418335139d06916659
+MD5 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.symbols.gz) = 75ea54ba199fcf8a56054d15e4fb3b96
+SHA1 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.gz) = 8eb131ce31d568ee4fb0674f1732052bc686bb18
+SHA512 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.gz) = 7345380b1e2e1140564b9886e4d2afc5dc21dacf7148a5680283abc41f7249a8e8512db23ca58533ebf5bffc588bb6a28b18c7e0eb5d50c8a5a06da4043af319
+RMD160 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.gz) = 37ae0d93bd4532ff69c9187a1fd8ee3b75e97671
+MD5 (NetBSD-6.0/sparc/installation/bootfs/netbsd.ram.gz) = dc1f591b5bca88a07ff8e67a1c3dc01d
+SHA1 (NetBSD-6.0/sparc/installation/miniroot/miniroot.fs.gz) = 4e71664ebc1dc62f55992a935734fe61f52177cd
+SHA512 (NetBSD-6.0/sparc/installation/miniroot/miniroot.fs.gz) = 3cf2607774e1aa7343ed57c78034828878665e9a041561702daf18539a0775d27768ad89d9336c77d897a0f040c71c8cefdd555c00397d26fded0b6ce72c1dc3
+RMD160 (NetBSD-6.0/sparc/installation/miniroot/miniroot.fs.gz) = 39fff07e0ce17f0c62c3a399173b5a8681fa3559
+MD5 (NetBSD-6.0/sparc/installation/miniroot/miniroot.fs.gz) = 0355cc648c33e3ed61ac4ff2f51edd04
+SHA1 (NetBSD-6.0/sparc/installation/netboot/rootfs.tgz) = 98f621b007b19382a0d529f2056cd8c82feb863f
+SHA512 (NetBSD-6.0/sparc/installation/netboot/rootfs.tgz) = 7131f92cd02791f6d351a8ea5d8b5fe93b643ba5975522e85bf81da8f69157ebb21f80f5696beca47809a9732e79e85c7e97e07a33e830eeac2f9542685a01ce
+RMD160 (NetBSD-6.0/sparc/installation/netboot/rootfs.tgz) = dc7168f774cac7e9f7eba640dc55c878ab2c16db
+MD5 (NetBSD-6.0/sparc/installation/netboot/rootfs.tgz) = 80ed52c842f1d4d56d4506d293e30b57
+SHA1 (NetBSD-6.0/sparc/installation/netboot/boot.net) = af35e94ca3d3ca7e07084d17c7d16370c2be1949
+SHA512 (NetBSD-6.0/sparc/installation/netboot/boot.net) = 42e02f39699d1ef5f76a2a07641f5405b74a0ce72df8c1306cdc1bf9e8e176b0857a4c6c1098a35bdaaebb729e887633bfc91cd7ed4316ff549b474e4b29932f
+RMD160 (NetBSD-6.0/sparc/installation/netboot/boot.net) = 5f64296269674b5af481fa3a55d6268bafcdd50c
+MD5 (NetBSD-6.0/sparc/installation/netboot/boot.net) = 9a2b02686d556555bf350f6eb35e07f1
+SHA1 (NetBSD-6.0/sparc/installation/netboot/bootjs.net) = 9bba50438d03cdef774f7572e6260bf1feb544f4
+SHA512 (NetBSD-6.0/sparc/installation/netboot/bootjs.net) = afa66b734ea6f3f9551680c5dc1af1ce43de4b385eed1c732dbf22f676e5adf1432a2048a494932650e36667405df0160b3d1cb87d4d78b5d064dfab2d366cd0
+RMD160 (NetBSD-6.0/sparc/installation/netboot/bootjs.net) = b2cde57103124271b4b9332cb99a7b7e01db3477
+MD5 (NetBSD-6.0/sparc/installation/netboot/bootjs.net) = b6958131d22fe5ced08a41671ddfa073
+SHA1 (NetBSD-6.0/sparc/installation/tape/tapefile1.gz) = c2c368ba46549cb580707b799f4f0f88b26128de
+SHA512 (NetBSD-6.0/sparc/installation/tape/tapefile1.gz) = 9fb6bef663b2fb68b9bf3591834f6e653c0b3b7f69ac8c40f2479efaa5d0641140d87623fe8eeb8a21cb0e0065ceacb57d6a5db4e1905db97f7dffa52ba8b565
+RMD160 (NetBSD-6.0/sparc/installation/tape/tapefile1.gz) = 8fbcdca0f8214901d1fec117c567cfe93865e391
+MD5 (NetBSD-6.0/sparc/installation/tape/tapefile1.gz) = 1cf0fdefa01fee95d494b3418ea4a0ea
+SHA1 (NetBSD-6.0/sparc/installation/tape/tapefile2) = 98f621b007b19382a0d529f2056cd8c82feb863f
+SHA512 (NetBSD-6.0/sparc/installation/tape/tapefile2) = 7131f92cd02791f6d351a8ea5d8b5fe93b643ba5975522e85bf81da8f69157ebb21f80f5696beca47809a9732e79e85c7e97e07a33e830eeac2f9542685a01ce
+RMD160 (NetBSD-6.0/sparc/installation/tape/tapefile2) = dc7168f774cac7e9f7eba640dc55c878ab2c16db
+MD5 (NetBSD-6.0/sparc/installation/tape/tapefile2) = 80ed52c842f1d4d56d4506d293e30b57
+SHA1 (NetBSD-6.0/sparc/INSTALL.html) = 8213ae2b753d10e3eec349c15a7cabde6ae1c3d5
+SHA512 (NetBSD-6.0/sparc/INSTALL.html) = 7a12bfc31cddfda66761861cb87fc54deb5f683863b41ff44152198ea44e9489c8cce0d4702c278e2586dd3189e5c31692a02a3f17b112bfa19f1134571ff8f9
+RMD160 (NetBSD-6.0/sparc/INSTALL.html) = 77a4274595de342e22766d8c468e2a324c26fbf5
+MD5 (NetBSD-6.0/sparc/INSTALL.html) = 80cd31d110f62b89b7b910ee0aecd7b8
+SHA1 (NetBSD-6.0/sparc/INSTALL.more) = fce351f89d2da1fb9f709bbe890892db755f56c4
+SHA512 (NetBSD-6.0/sparc/INSTALL.more) = 496bb7e73d2dda1eb01518c40ab3abc767b8fb6a8b406b07176b9e926c2f4d0e5512bfdc9c26dbfa1b3a4c5069355f6ee1bb8ad8c1d459b71011ea9034f89d17
+RMD160 (NetBSD-6.0/sparc/INSTALL.more) = 89c6de032d286741f2ddde15e4b796205a8b8511
+MD5 (NetBSD-6.0/sparc/INSTALL.more) = 308ae548170c8b1b5a9bf59f64b1df7f
+SHA1 (NetBSD-6.0/sparc/INSTALL.ps) = 3e6e3cbbf8141043fce33e2245513a9683be0edd
+SHA512 (NetBSD-6.0/sparc/INSTALL.ps) = 93b81d3ba2fd2e1fa3ef46360e92e247fa72b320af7b0e60ab35fd90cdd10d7bc3dfc03920b4a8b209ef95facc74e047630cdec03cabe06edde21e795e158e60
+RMD160 (NetBSD-6.0/sparc/INSTALL.ps) = 8d4373a814dc88c7865b14a59e27731783e711e5
+MD5 (NetBSD-6.0/sparc/INSTALL.ps) = ecde0171eda632b616139caf04081ec4
+SHA1 (NetBSD-6.0/sparc/INSTALL.txt) = 556744433939c09c3ef5ee3e9b12c1570ebb1211
+SHA512 (NetBSD-6.0/sparc/INSTALL.txt) = 1686bb5982301002cb580022760f12fe9160a4fe826d7e0fe74cc4a480c891d31099d5219678b0768c0fbc04be329f0f40511d739c201a5e43367b5a27e72545
+RMD160 (NetBSD-6.0/sparc/INSTALL.txt) = cbc495189f2ce52328d87a1a73dc8452ad23e723
+MD5 (NetBSD-6.0/sparc/INSTALL.txt) = 17100faaf077e73c2549484e7623550f
+SHA1 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.symbols.gz) = b76da4e7c7cdcdbebd2148ee815c24554b0c4bee
+SHA512 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.symbols.gz) = f31c311444a309674e2718baab015b47c0139523e7996a29ab8d3e97a941b5d74be8765571bf3239375c979fff1e963d32d2dbae19ad5c7dedcbd79a8827575f
+RMD160 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.symbols.gz) = 95a34099fb1159f17619713ae37d3c6337b479c5
+MD5 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.symbols.gz) = ab2e1333f6d957074854ea8f92320442
+SHA1 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.UP.gz) = 961388f6e1c9522c0d8f19f0a471f14d3c35fef7
+SHA512 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.UP.gz) = 7b3fc655414c6c2334e46315eb91ee562b94400f5729e0a33dcc9e9a79c431b4b5e0c124541b9666731740ce365c034718671348a494c43167eb0b73966133a2
+RMD160 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.UP.gz) = e02a398cd00c0b8ab7bc3b6dbd52e767b18e3275
+MD5 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.UP.gz) = 200fd2ad96dfa6ec886585e20d4b4b06
+SHA1 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.gz) = bf5fe38aaa01c9b2e9963b540f1550562789da22
+SHA512 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.gz) = c2b63ce56ff32ddaa96642ae15a33143a245b9239560c86e51e78db333d8bfd19e761d6cbe27ce69647a62fa4c76317670f0d22aa491a2cadf45dae18573511f
+RMD160 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.gz) = 65f66c6c7f87e3be728339a1b294b4240b14b953
+MD5 (NetBSD-6.0/sparc64/binary/kernel/netbsd-GENERIC.gz) = 44d6f63922847e6f53d78f10bc776e3d
+SHA1 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.gz) = 1fe47cdf745a00c31a47faf1155eb0f9af2ec4fc
+SHA512 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.gz) = 7a10dbbdcfdcad97fec4ef476e9b6c876a3bb80b78fb4634e3f502b043b392faaf457b90ff572cc9fcf35c8c26fc908fe035b5859ed66ea2f0db490d2638f9a4
+RMD160 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.gz) = 06d3a86dbdb12e0b810888233ed79bc735ab13c7
+MD5 (NetBSD-6.0/sparc64/binary/kernel/netbsd-INSTALL.gz) = 203f7a8aad11cea65388e14dec6a65f9
+SHA1 (NetBSD-6.0/sparc64/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sparc64/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sparc64/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sparc64/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sparc64/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sparc64/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sparc64/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sparc64/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.UP.tgz) = 643e8b15fb356856d93258e6c5d05cb14eb7d569
+SHA512 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.UP.tgz) = 26c4eb3392f80d4ba7c28038f548e59a04a84742962da3340fb49d09ef42b2e3debc1387710b3c4baa6c735370b5daaa23a6f4da91f1be6552ae4c0cd314f4de
+RMD160 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.UP.tgz) = 37e5fdfd623c179edfa002163e005518b26fab7d
+MD5 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.UP.tgz) = 70d61e4a2588eb3242e66d0cd4cf1b1e
+SHA1 (NetBSD-6.0/sparc64/binary/sets/base.tgz) = cdce0eb09c71244d8362eb4e09c0bdbd92fb4900
+SHA512 (NetBSD-6.0/sparc64/binary/sets/base.tgz) = 455fa6b72e5735a13b3106260b7cb5cabeefd3ca83603dd9daf3805a0abe55acc6b484ad8b4875590e5d949c35b8476cec136f79f8ecfcd7b12cbeee44d6f305
+RMD160 (NetBSD-6.0/sparc64/binary/sets/base.tgz) = 13508c9d394104d0c0b460a895f796e091ca8635
+MD5 (NetBSD-6.0/sparc64/binary/sets/base.tgz) = cdafa4124cc784a56444f96fb24a7a34
+SHA1 (NetBSD-6.0/sparc64/binary/sets/comp.tgz) = 71040515074d030a65e0200afe6dbd6955251af6
+SHA512 (NetBSD-6.0/sparc64/binary/sets/comp.tgz) = 52a075300885b0d15ac960430ac3ed1ecb4434cd0bb2de216c6d8c27239011544628ad1ccd87076ac9d40d64e0c088cc2ce0e928902f80629cea11631f30e35c
+RMD160 (NetBSD-6.0/sparc64/binary/sets/comp.tgz) = 96bd6b8b5758360970d9d5b703019bf660aa56d5
+MD5 (NetBSD-6.0/sparc64/binary/sets/comp.tgz) = be2c961313f29bb9c0282516867850d2
+SHA1 (NetBSD-6.0/sparc64/binary/sets/etc.tgz) = e3bae514025003988d5de6ffcc14e130ee8da818
+SHA512 (NetBSD-6.0/sparc64/binary/sets/etc.tgz) = 2e5d76dc66495eb24d8abd5eed70cb05cfef3190e81875f0d6e6da67af962b0de0062bc4e9758859647ebc5d4334bd9bc28a20508f8ddecc7c183de8174a4ed4
+RMD160 (NetBSD-6.0/sparc64/binary/sets/etc.tgz) = 3fe88c6bd07952ad383d6ab1dbb7d6c3d5315b4a
+MD5 (NetBSD-6.0/sparc64/binary/sets/etc.tgz) = 810c7b6940fd2e8049abf4318577f5fa
+SHA1 (NetBSD-6.0/sparc64/binary/sets/games.tgz) = a40f5681634cff38215edeb22795d4e5f3f35324
+SHA512 (NetBSD-6.0/sparc64/binary/sets/games.tgz) = ff66f16eea28f3191abed7466b21d1c1969f0556cb5a9a61e5167bb7a2c4e55ed8682222a389a04d44306b39b424be25623cf8bcd41c97139960ee48ba91199d
+RMD160 (NetBSD-6.0/sparc64/binary/sets/games.tgz) = c3cc1abe005bc98e0afebadc87f0181ba1fd8d6d
+MD5 (NetBSD-6.0/sparc64/binary/sets/games.tgz) = a70797dbec20b831d406952468b8376a
+SHA1 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.tgz) = c047c462dd890c992df60d0f23657638875f90c2
+SHA512 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.tgz) = 79ca275266c148fa3db47ac564e8f764c75b80a8243a0a32bbd3cd3392621b47733afdedf64f3a2103a99c03ee2f63494d892260951b85949e1383d3bf8c5673
+RMD160 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.tgz) = c0b40543a2674c1db7d554e9ad19f8e289683de8
+MD5 (NetBSD-6.0/sparc64/binary/sets/kern-GENERIC.tgz) = a9346477bd0ae3d50b4b82f8f8da8531
+SHA1 (NetBSD-6.0/sparc64/binary/sets/modules.tgz) = c24c622359c9e5f8a05c03adb30e56c8a9862abd
+SHA512 (NetBSD-6.0/sparc64/binary/sets/modules.tgz) = f2f834fded5c1142611bd5ff4ebcec67db75f620256fb27689e4cc626785a1bdf90235965e2fc4f2ee7c0ba574e73063e7f13d7f85d291dd23395074517abb9d
+RMD160 (NetBSD-6.0/sparc64/binary/sets/modules.tgz) = 6a1b6845fc699f9837a88fc3c18585162a7a0aaa
+MD5 (NetBSD-6.0/sparc64/binary/sets/modules.tgz) = e8588a8eed7bb775dfb236cfc8c458d4
+SHA1 (NetBSD-6.0/sparc64/binary/sets/tests.tgz) = 1103500cca9a6dcabfafd50046f15e035a1d0914
+SHA512 (NetBSD-6.0/sparc64/binary/sets/tests.tgz) = cc628d649f4d16af2300baf5edbf075bc43c91b027c19dcd59b6f1be0ff1b02a3f8f97eb88db2f2bcfa93f69ef02653021f416c546dcdb0f0aa5bf4726257f79
+RMD160 (NetBSD-6.0/sparc64/binary/sets/tests.tgz) = ce47518fd68d02d821bb4b4060ea3a775f64e37e
+MD5 (NetBSD-6.0/sparc64/binary/sets/tests.tgz) = 2444ea500f4f8363d339a5eb58b50e27
+SHA1 (NetBSD-6.0/sparc64/binary/sets/text.tgz) = 09bdcb54fb74d5ae4e43b5b74a6a35467e385e09
+SHA512 (NetBSD-6.0/sparc64/binary/sets/text.tgz) = 82834b26dc0a102bdb5da4744fe2677fb50a6018b34a656d7f0813919bfe66168e37b5b47ad027ee6912fb77cceaa5a1cc33eef8269eb6a8a9f42368d01b3037
+RMD160 (NetBSD-6.0/sparc64/binary/sets/text.tgz) = 376a9a61492aed41b486fa58060edcb472152739
+MD5 (NetBSD-6.0/sparc64/binary/sets/text.tgz) = 69cce7d6bb4cb104cc27f75f17da32e2
+SHA1 (NetBSD-6.0/sparc64/binary/sets/xbase.tgz) = 865d8aa735ba57980974089ee2e44d79c69cd036
+SHA512 (NetBSD-6.0/sparc64/binary/sets/xbase.tgz) = 2b7f8d15caf6a2b831bdba3e8a2d4f78633f3350d0fc93f107c35cba746c1423c966313224422832484166e384a54b1fc2c75cba78ab138bf36e81c5468c2952
+RMD160 (NetBSD-6.0/sparc64/binary/sets/xbase.tgz) = ec680d9c70f3e6729a19167932b552a727c628a5
+MD5 (NetBSD-6.0/sparc64/binary/sets/xbase.tgz) = a1907a4afda2ea247a6b54b158ac97f3
+SHA1 (NetBSD-6.0/sparc64/binary/sets/xcomp.tgz) = c0b90da52efa86aadb3af4b7de3773c29289c65c
+SHA512 (NetBSD-6.0/sparc64/binary/sets/xcomp.tgz) = d3774cc192c6ea74391dc0323db4f7e1695f290908c1ba68f885a9e670fb2c31f9a0c831a6020cd1a98e1b93691e02fadb260b26d8c6d252e9638ebf9cc0e8e5
+RMD160 (NetBSD-6.0/sparc64/binary/sets/xcomp.tgz) = 40969f50dcfbfd6948b48f819a7f84957bf14134
+MD5 (NetBSD-6.0/sparc64/binary/sets/xcomp.tgz) = 681754abde2de73609efdcbc7370dbe4
+SHA1 (NetBSD-6.0/sparc64/binary/sets/xetc.tgz) = 43c0a0b2db4bc88c509eb0d271a99e11f823babb
+SHA512 (NetBSD-6.0/sparc64/binary/sets/xetc.tgz) = 4d28ba7d6db0b7c7cb005697eabd739544bae3e3128eb29b8ce62297b26b81d944d0992a6ca3522a51bb83ca874c4a5cf844e06a7aac0a6ab26b30838016faf2
+RMD160 (NetBSD-6.0/sparc64/binary/sets/xetc.tgz) = bf885030bc65c540373a06e2b4c6257a5b634b61
+MD5 (NetBSD-6.0/sparc64/binary/sets/xetc.tgz) = 006f8b77a6fb41dad2dcbf2f28efdb8f
+SHA1 (NetBSD-6.0/sparc64/binary/sets/xfont.tgz) = adf52a9866ae0e4b1e871102f664dd42907d327f
+SHA512 (NetBSD-6.0/sparc64/binary/sets/xfont.tgz) = a02de6961b726d4f5fc291ac48a0a59d0f991ba96fd83788e766be8591e94a64eae0fdb23262f965042348516c52a173e332b8d90b21457d9089b7478273221c
+RMD160 (NetBSD-6.0/sparc64/binary/sets/xfont.tgz) = b458181e798b9b33d15ad35adfb734a0b597d042
+MD5 (NetBSD-6.0/sparc64/binary/sets/xfont.tgz) = cf37180a29cdf9bd6a34a24a8608e6bd
+SHA1 (NetBSD-6.0/sparc64/binary/sets/xserver.tgz) = 6ac9cf2e66f22ee56ef1d692e9bed5ae97092088
+SHA512 (NetBSD-6.0/sparc64/binary/sets/xserver.tgz) = b6c611b3360d537e94339536354d0a5904137b519e4debab49a93a874429a115cee276f3550a6db23ec9caeb17af3ab162999d181189311a66d65f5230a3a99c
+RMD160 (NetBSD-6.0/sparc64/binary/sets/xserver.tgz) = eb216c772571b79eb35e44285f8bed559eeb4fd7
+MD5 (NetBSD-6.0/sparc64/binary/sets/xserver.tgz) = e7994f53d2b295259dfb313f86d4fe4d
+SHA1 (NetBSD-6.0/sparc64/installation/miniroot/miniroot.fs.gz) = dcedff4706750585b89433f833cfe99fdd454400
+SHA512 (NetBSD-6.0/sparc64/installation/miniroot/miniroot.fs.gz) = 94360d4f72150432307bd097e8fa02b18bf3d63ea095b8cecfb4de863ab367c73268116681bb94083bef6445842d4718bfdeec200f57124e95c1de8dfff96b4a
+RMD160 (NetBSD-6.0/sparc64/installation/miniroot/miniroot.fs.gz) = 344981ca28094153d14b7d36321dc5e747f214cf
+MD5 (NetBSD-6.0/sparc64/installation/miniroot/miniroot.fs.gz) = 8e457a7c91b800f997cdaf6a17e79bc8
+SHA1 (NetBSD-6.0/sparc64/installation/misc/boot.fs.gz) = d5afbef3f3b358e77789ea7e9f22298a77415d22
+SHA512 (NetBSD-6.0/sparc64/installation/misc/boot.fs.gz) = aba7c9613d7a34e3b939644d37b0a8fb6c27fa0a8aa208aa729499b367f76fc6d5e1a9a06a5a779748c2d2ebfdf9521ac2fcd484608bf64ee3fa0eee8b97fd5c
+RMD160 (NetBSD-6.0/sparc64/installation/misc/boot.fs.gz) = bb8a8ed04649c3369dd5893897f7ea2ce7085739
+MD5 (NetBSD-6.0/sparc64/installation/misc/boot.fs.gz) = b9aef29dae0ef2a33611cd4655ff58f0
+SHA1 (NetBSD-6.0/sparc64/installation/misc/bootblk) = 9aee0c29c2eeb5c2e61aa9bfcd289e88c1fe1e97
+SHA512 (NetBSD-6.0/sparc64/installation/misc/bootblk) = 294708defc60602553eef0ae08ed910845b4c89ed72f33493c5fedad3737c9ae1cc96e947a11227e52505c62e04ad6d1f8f1f292df7e7885346acb824c4ea3fe
+RMD160 (NetBSD-6.0/sparc64/installation/misc/bootblk) = 28bd7d5c0fe6f33afb9627a3e3c8950ca062afa8
+MD5 (NetBSD-6.0/sparc64/installation/misc/bootblk) = 16b4c89c82c34d5795a50c811941022c
+SHA1 (NetBSD-6.0/sparc64/installation/misc/installboot) = d1cb90b57a258cef3671cc649d50aa7ea6f73f4e
+SHA512 (NetBSD-6.0/sparc64/installation/misc/installboot) = bf100237898c168e020c365da754b8a659b7cbc01ab310fd9b77a2ab60982c67e5f28cfbc7cd152ec37bc9591c1d0402c850803d57a45591282f774b97da3e2e
+RMD160 (NetBSD-6.0/sparc64/installation/misc/installboot) = 64f2ea944507466a6f5a61367e6190897cf00dc5
+MD5 (NetBSD-6.0/sparc64/installation/misc/installboot) = 7436c373285d89dc76dc705c3bbba5c0
+SHA1 (NetBSD-6.0/sparc64/installation/misc/instfs.tgz) = 3715a9104cdd1744835ef982a2a95525a5500c42
+SHA512 (NetBSD-6.0/sparc64/installation/misc/instfs.tgz) = 17a2112d5279ffd1a5889e55cf8e7081d564c330645f8c90082e324d413568db5bb58f8281a5b8e22d566b8699c326fa1661a0eb31d4b167874ea828a283bcc6
+RMD160 (NetBSD-6.0/sparc64/installation/misc/instfs.tgz) = 1065f4e43c679d182e72c654ce6a236f57350137
+MD5 (NetBSD-6.0/sparc64/installation/misc/instfs.tgz) = 75c25d3de06e50ff85364600e40380f4
+SHA1 (NetBSD-6.0/sparc64/installation/misc/ofwboot) = 42516022d9da6a2cd08daa28c5e60e68c6accd8b
+SHA512 (NetBSD-6.0/sparc64/installation/misc/ofwboot) = 1d63340007e8aefb0f0a725f444f8cd8bd62c68045c0ba6bede194f5d5f4c05a795f728ae00b4cdf65dd82cfa163c2f954ebc2a8caa54b35a908a337f1cac736
+RMD160 (NetBSD-6.0/sparc64/installation/misc/ofwboot) = 53bf739509e7c3fe2f4ef8cad8aecec6fed9fd1e
+MD5 (NetBSD-6.0/sparc64/installation/misc/ofwboot) = dfafb8bbdf16b3219ff2b38d69dffb87
+SHA1 (NetBSD-6.0/sparc64/installation/netboot/ofwboot.net) = 42516022d9da6a2cd08daa28c5e60e68c6accd8b
+SHA512 (NetBSD-6.0/sparc64/installation/netboot/ofwboot.net) = 1d63340007e8aefb0f0a725f444f8cd8bd62c68045c0ba6bede194f5d5f4c05a795f728ae00b4cdf65dd82cfa163c2f954ebc2a8caa54b35a908a337f1cac736
+RMD160 (NetBSD-6.0/sparc64/installation/netboot/ofwboot.net) = 53bf739509e7c3fe2f4ef8cad8aecec6fed9fd1e
+MD5 (NetBSD-6.0/sparc64/installation/netboot/ofwboot.net) = dfafb8bbdf16b3219ff2b38d69dffb87
+SHA1 (NetBSD-6.0/sparc64/INSTALL.html) = 0422ec241b04a9456f70ae28d29c7bc2be78b7f4
+SHA512 (NetBSD-6.0/sparc64/INSTALL.html) = 15bd5a5a0362c4412c416767608ce7b9580ebe8777ad15fa529af5a2e658a250000fa4a8d9313e2f7f718bc904518943d0ef095d8f0ba50deb50997f6a447fe7
+RMD160 (NetBSD-6.0/sparc64/INSTALL.html) = d534bc86ddea48b776c562b00bf67b686b91ea9d
+MD5 (NetBSD-6.0/sparc64/INSTALL.html) = 90c6044241bca2933db37134f775bf07
+SHA1 (NetBSD-6.0/sparc64/INSTALL.more) = 055a5f58c1a926fdc7d272cf573eddd0c868ef7f
+SHA512 (NetBSD-6.0/sparc64/INSTALL.more) = 403ee0491131f45d867e10305a65b801f95bd8fa195bfd4e95499d63ba74851774ef14f1fcc8cbd03220f973050903279438f15cb824ae2b294ead99c7d07bcc
+RMD160 (NetBSD-6.0/sparc64/INSTALL.more) = 1744bae9283a6f0e12f95e382f3bedd44bb6da14
+MD5 (NetBSD-6.0/sparc64/INSTALL.more) = c42b30d10ac37a1ac1270335414e796b
+SHA1 (NetBSD-6.0/sparc64/INSTALL.ps) = 60073507d2c04d97ccd9cbbf5fc51458cfd12509
+SHA512 (NetBSD-6.0/sparc64/INSTALL.ps) = 86c33bcc6fb6ff78056914afa17cfbd8efbea1f2100569f4169ba49d1033e4a86ea3ce49d1c5932012712bdf49bd356dcbe59aea4f8271c822482722dc08c7ce
+RMD160 (NetBSD-6.0/sparc64/INSTALL.ps) = 51b6801d68738b1606a65969c2ae3c3fa811310f
+MD5 (NetBSD-6.0/sparc64/INSTALL.ps) = bfeb86c3637bf7b5af6fcb553b62ab1b
+SHA1 (NetBSD-6.0/sparc64/INSTALL.txt) = 518f7cf7bfb65b40a409b78375c0276569ac5540
+SHA512 (NetBSD-6.0/sparc64/INSTALL.txt) = f3e1503729f62b588c53747850b7907b92d823f702ec484925d3c0173c6dd866626ef500b8b581f72d54ce4b2aa72788a5543d98c72408a5060067b832e93a88
+RMD160 (NetBSD-6.0/sparc64/INSTALL.txt) = 2716b124f107462bce88b2bc12d54d5d5aaaef81
+MD5 (NetBSD-6.0/sparc64/INSTALL.txt) = 26984ffe79eab5c070bafdc74267e26a
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.symbols.gz) = a1a418aa1a4815cd42b51d842b61002b4acded14
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.symbols.gz) = 272b8dc02294eb259adca2d15a6ea1633066c7708a1d8461d5d299bc7ff5887510fd6f20f490a781813fd61e6f95eed92ef03ba3b4f846ba4ecfe6b7a1d91682
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.symbols.gz) = c69407e3e5bddd21575929744fd986e7795c7382
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.symbols.gz) = c47a2dcd2bac0d4ade29e3ceba7b8b90
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-DISKLESS.gz) = c6cb928563370afd5d467adbd4d24a0ac37bc8c0
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-DISKLESS.gz) = e24a4feb31212693c9c77732473107dc01cbe19c4d23a3f50a7028079f669e66c5252b9d39904e4d1daab0af8ac020b993f36f027df256a008249a8879d848f9
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-DISKLESS.gz) = b3bd2f4f03f92c810f3b21d3163d4fad1383a0a9
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-DISKLESS.gz) = 2d2987883fb76005f8b4ca0686fdb261
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-FOURMEG.gz) = 83451516991b23dddcd67b3d4aed3d4d5eef0af9
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-FOURMEG.gz) = 8ea5066dcd3ab85ca812a169d2a385befcf5717e1dca01c4d5a9daae2368498c1eedcb683aa76d912be0cb6193217c33a5819d8c597521a21fd9ccc5c4f84932
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-FOURMEG.gz) = f8dbe58a262e48a7a1bdddfad8bcbf4c02455f93
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-FOURMEG.gz) = f717bd51debc97e9efb5979b5ba425e8
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-GENERIC.gz) = 89a4c10827c07a9100a4cf7692012221e6f7d99d
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-GENERIC.gz) = f53dd3eaf33dac52acfcbd6657269783ca14c1a33ea4e0cdf47fe96f3a620961e07905d5eccc2e15ff75cb0910f9e47d8a37487c7a8b455db494b5690d9ce5cf
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-GENERIC.gz) = dca21703d8350ff9c84920da0fe38b4e96b58c73
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-GENERIC.gz) = 5be2117280d7f1f78689744e44903f49
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-INSTALL.gz) = 31619c78adb4831a8ae456942ee6a31c5bc0576b
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-INSTALL.gz) = 08d1e00c5013bfab18920543807657eb480d54d0270d1699a9a583ac0c8fd4df0750924727ee2723c7ad6bd1c0450c5c89378c450b412ab6d6e6c8be723f2b86
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-INSTALL.gz) = 3d651236509dbd65a585082b2adffa0abd47c298
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-INSTALL.gz) = d39784e7514b56ad37120e1accca74e9
+SHA1 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.gz) = abe6ff67ad153c993974749b41bbf6b2e207792a
+SHA512 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.gz) = 63fcbf6f7b5582b69aa77b4dcfed2125f32b40a622b2eb533eefd92bf829513488e37c4947c44e004ec8006a7e35030fb3e500f1584922101d376e9cc67dc8aa
+RMD160 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.gz) = aa2ba7c4930e6f557f809407458f12a5fe2da818
+MD5 (NetBSD-6.0/sun2/binary/kernel/netbsd-RAMDISK.gz) = 10a7099f6bfc84a63eb89985f93dfab6
+SHA1 (NetBSD-6.0/sun2/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sun2/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sun2/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sun2/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sun2/binary/sets/kern-DISKLESS.tgz) = a6ddacc5894ed442e82fc8ad75e4ba5a85acbdd0
+SHA512 (NetBSD-6.0/sun2/binary/sets/kern-DISKLESS.tgz) = 7b0afaf8fcafd005d56142659c130fa14fed8681f0907c262b52ba367db985390c1ada5b3c22705655fb8fdbdb2577f112b2e867dae8a47d30da17db9f68dca1
+RMD160 (NetBSD-6.0/sun2/binary/sets/kern-DISKLESS.tgz) = b1566d3099e8654a48e74a7f4b959d22ce72241a
+MD5 (NetBSD-6.0/sun2/binary/sets/kern-DISKLESS.tgz) = 320ebbbe9568d045ad4dc2f4284e45e5
+SHA1 (NetBSD-6.0/sun2/binary/sets/base.tgz) = cdfdfc1f6d5fd3fab1cd9e5546d1060a4cb16b45
+SHA512 (NetBSD-6.0/sun2/binary/sets/base.tgz) = d7a0059ea7babe24d603084826c5a338b33ef3ac4ce1a6039f926692141f28e32d654656a85e995aa000742f8971b33d3e4fad8dbee8a9e6b3cac2c15b9cf01d
+RMD160 (NetBSD-6.0/sun2/binary/sets/base.tgz) = 3652a11470a78517f725320750e8a61c5328510f
+MD5 (NetBSD-6.0/sun2/binary/sets/base.tgz) = 3505f44ff71277ff11e5402646e110ef
+SHA1 (NetBSD-6.0/sun2/binary/sets/comp.tgz) = 40c4eb1b75f3e903a92ea86d8919fd23a56e470d
+SHA512 (NetBSD-6.0/sun2/binary/sets/comp.tgz) = a52435520af63ae741654d81bdd5abd611857aaa19dc757bce5c841fa13b15d878780509be22a31ed893a2a4ca1c29548c5a737a2a650a7241805b518f9c70ac
+RMD160 (NetBSD-6.0/sun2/binary/sets/comp.tgz) = d51f8b1dbebe3ba6c4c3623351e647981b20f9da
+MD5 (NetBSD-6.0/sun2/binary/sets/comp.tgz) = cfdfa248cfcb4e2ae4af64f3f8a4eddf
+SHA1 (NetBSD-6.0/sun2/binary/sets/etc.tgz) = 5872a9f5eeb6004802bba9df4a0d4ec1dfccea8d
+SHA512 (NetBSD-6.0/sun2/binary/sets/etc.tgz) = 617be23175e9c578e834e039720a0c23357cd24b22639c5641a54c5b36ccb725446cda8e3c3def6e8e73c39c1f90065c348a0ea990f7a50384ba9a65ada10e16
+RMD160 (NetBSD-6.0/sun2/binary/sets/etc.tgz) = fa533eae2fafa51d8e2643dbe20be6ac179f5d05
+MD5 (NetBSD-6.0/sun2/binary/sets/etc.tgz) = ea43e005a9a50dcbbf704fa27745eb78
+SHA1 (NetBSD-6.0/sun2/binary/sets/games.tgz) = 97fe1f17370ab456fea7c21c66dabbaefbb8bf39
+SHA512 (NetBSD-6.0/sun2/binary/sets/games.tgz) = 2dfb36fb06f40d0ce519fe3808d53b8babd8bc9ae810c4fadb09e84e93e57b88b893c04cecbaf062c4ed2257eacec30127513aaca5c91ef9234da9226f366c4f
+RMD160 (NetBSD-6.0/sun2/binary/sets/games.tgz) = 6affdde9886085d8acd3bef196096dbff77fd99f
+MD5 (NetBSD-6.0/sun2/binary/sets/games.tgz) = 7eeaf3572032c8e522266e0283594105
+SHA1 (NetBSD-6.0/sun2/binary/sets/kern-FOURMEG.tgz) = 81e4d6b63aa15ea1f60604aa24a21d0eb4ddedf0
+SHA512 (NetBSD-6.0/sun2/binary/sets/kern-FOURMEG.tgz) = 117485cb1d871f3e643c009a998998885011c1d2d826ec2db092d0e3569a21fc63618a73a803332fdd936ecb30738e76f75be3e76ee17d71b190a8bb188aa873
+RMD160 (NetBSD-6.0/sun2/binary/sets/kern-FOURMEG.tgz) = 3c7e6d14f1a2a9b288f245ad0d6f115469b060c2
+MD5 (NetBSD-6.0/sun2/binary/sets/kern-FOURMEG.tgz) = f9ac31754f27f2e22aff03c5ce4e166d
+SHA1 (NetBSD-6.0/sun2/binary/sets/kern-GENERIC.tgz) = 05b5ac2735fe34a61df42c13670bf7a758b8c37a
+SHA512 (NetBSD-6.0/sun2/binary/sets/kern-GENERIC.tgz) = d5273855067665e77291f477adc2bcf482db2ac749b078502d04bc53b103977f4f16da05acbe917a97d4bba20626dd1954132939cfcf168cf8b75f5e12fe71b6
+RMD160 (NetBSD-6.0/sun2/binary/sets/kern-GENERIC.tgz) = bf5c45b36a68224af25aca91aa2eac8d213442c9
+MD5 (NetBSD-6.0/sun2/binary/sets/kern-GENERIC.tgz) = baac1013c64948cd3fb2bff22a21e5c4
+SHA1 (NetBSD-6.0/sun2/binary/sets/man.tgz) = 9bb0fc4bb2f60df3acbdcbd6d03d11e52227c70f
+SHA512 (NetBSD-6.0/sun2/binary/sets/man.tgz) = 3bdb75b91c18982b39f2c2842d9260749491f16c6da624510c603ef0e897298f6ecd620a63a96ccf21354f6a4008b4723249635280e4e956a4668d1984faf7f5
+RMD160 (NetBSD-6.0/sun2/binary/sets/man.tgz) = 3b28f01096b5070887994e84b171cd6c59f0ad94
+MD5 (NetBSD-6.0/sun2/binary/sets/man.tgz) = 06cfb9c81392e3ae7b04daa01475db38
+SHA1 (NetBSD-6.0/sun2/binary/sets/modules.tgz) = 0ff7c443e874d15372f107b6772b5004ee0ff6d2
+SHA512 (NetBSD-6.0/sun2/binary/sets/modules.tgz) = ad3913a8edf4494515dab3a4df4a56799f7cb2cf335ca9e4cf78e61a8b92f161cf2148ea2201ce9e9a6966872c5ee749b69642205ef4fa475aae1b3671e49d69
+RMD160 (NetBSD-6.0/sun2/binary/sets/modules.tgz) = ecbeaeb92cd60504c907b743ebf8bc729483eb35
+MD5 (NetBSD-6.0/sun2/binary/sets/modules.tgz) = 94f595d3a8f52f8b7b202c1715896b1e
+SHA1 (NetBSD-6.0/sun2/binary/sets/tests.tgz) = 4651980ab126f0fb7fa3282e401fed649129dd46
+SHA512 (NetBSD-6.0/sun2/binary/sets/tests.tgz) = 4fcec0fde688d32f2f53d0c3d6ec9218a2c670f0006b421ab907098f7210481d0ef690d9e8415dd5201be799f83b303a8a2a5b4f8b35af16b311b4996a353b93
+RMD160 (NetBSD-6.0/sun2/binary/sets/tests.tgz) = d260affd3d3656aa73171aca7e8f40f2f502a645
+MD5 (NetBSD-6.0/sun2/binary/sets/tests.tgz) = 801c9c531d070d152c1f259dd1111f64
+SHA1 (NetBSD-6.0/sun2/binary/sets/text.tgz) = b76b4bc516bd7a1747415f9bdbd6af7370cded48
+SHA512 (NetBSD-6.0/sun2/binary/sets/text.tgz) = 5654c7217b9d02e327c7803de1dc67d5df4225d1399c3c0a433728fb2fc124ddf0fb2e8cc89d304e03a7c1104a1e1b6ff665b5b29825e3afb0acb43f37fa327a
+RMD160 (NetBSD-6.0/sun2/binary/sets/text.tgz) = 89f288a449a1049aabef74f6033bf00611123bf7
+MD5 (NetBSD-6.0/sun2/binary/sets/text.tgz) = bc500c71253fd2e2b3bb1dac2bf2b738
+SHA1 (NetBSD-6.0/sun2/installation/miniroot/miniroot.fs.gz) = 74ae5c6fe766a40a9bf149885809186bdaae96ff
+SHA512 (NetBSD-6.0/sun2/installation/miniroot/miniroot.fs.gz) = 4c7ab73a13c13b3b4cd7a01e12ca25d7a385691dee2b830fb94885c9eece4e62c45cdb9e3961b5426f0e979b2e0f2e951c52774231129f824787ee6daa8d8ed1
+RMD160 (NetBSD-6.0/sun2/installation/miniroot/miniroot.fs.gz) = 032b6ddf1452800c8f824983c6d3c1310ba723dc
+MD5 (NetBSD-6.0/sun2/installation/miniroot/miniroot.fs.gz) = 6d2927b0648b018b2726f7159e60a911
+SHA1 (NetBSD-6.0/sun2/installation/netboot/bootyy) = f97ac30d2c6258791d64d408e295cc2f48e7892b
+SHA512 (NetBSD-6.0/sun2/installation/netboot/bootyy) = c0aa6a81071323564d4445ae06b9e0629b32b118bf6c516e28109d3c2d7a72613b8a2005b6f968a43acc6115e3edba57f15c314b77a774cfbb977ff668dd946b
+RMD160 (NetBSD-6.0/sun2/installation/netboot/bootyy) = 3de2112b92a222b55ffeff2d5930ed5eccf70a7a
+MD5 (NetBSD-6.0/sun2/installation/netboot/bootyy) = 7a6fce60607e791e1c40186b0b7a5403
+SHA1 (NetBSD-6.0/sun2/installation/netboot/netboot) = f0ab4e961148d2d8885a47a4fd1b2bc1350e4978
+SHA512 (NetBSD-6.0/sun2/installation/netboot/netboot) = b462fb05ea093921b40a1042c15b0013a848c7b022f22523e3dfe73e0141b35982d26825812604bbfcb735f8851fafe9709979d90fb1db21ee552f0e93db6a86
+RMD160 (NetBSD-6.0/sun2/installation/netboot/netboot) = c7c6416042d8ed641a8ed033541a7757492229ba
+MD5 (NetBSD-6.0/sun2/installation/netboot/netboot) = 52d961060a7035f07cb1946d71736289
+SHA1 (NetBSD-6.0/sun2/installation/tapeimage/MakeBootTape) = 1c24969b0bded7ed9bed7203e9c577d896d25566
+SHA512 (NetBSD-6.0/sun2/installation/tapeimage/MakeBootTape) = 33eeb495736ac60dabd87faf803defa85f2e400f49b1b4078c16aff18404673a7e668676dc90eb92dc597835ccac8abe26fb68ecb22ddc5afd5afd7de8f2d680
+RMD160 (NetBSD-6.0/sun2/installation/tapeimage/MakeBootTape) = 234492df364f78e2aef3c9cd8ac4496077ba2760
+MD5 (NetBSD-6.0/sun2/installation/tapeimage/MakeBootTape) = 924860ba84acf16d29a70783d6e106a3
+SHA1 (NetBSD-6.0/sun2/installation/tapeimage/MakeInstTape) = 75b8d9faa2e1960a48354922aef5c25c76f66ee6
+SHA512 (NetBSD-6.0/sun2/installation/tapeimage/MakeInstTape) = ba61feb33064bdb843f8cd563135cc8fe28e9bbbaf8d1ac2eba2c5e1ad083daba83b47295f3c677caa014c9be7606ef6a40a6c1bc9b07e4eaed139d8299be97d
+RMD160 (NetBSD-6.0/sun2/installation/tapeimage/MakeInstTape) = 198879d5058f7ee226c4c669f3a7429bb49c12ce
+MD5 (NetBSD-6.0/sun2/installation/tapeimage/MakeInstTape) = 58a95592c402c3f752f4c801fa3d20a7
+SHA1 (NetBSD-6.0/sun2/installation/tapeimage/tapeboot) = 1612942dd5bbca5773de6ac02723ea898ea4e172
+SHA512 (NetBSD-6.0/sun2/installation/tapeimage/tapeboot) = c5b75882d4b9041edfd74cbf9dc4df8393e687503043e77af766452d780cc8a5584b916d0a792748730e9c87bd52803bbfc0a043720e611079a5cdcce6243bff
+RMD160 (NetBSD-6.0/sun2/installation/tapeimage/tapeboot) = 61a36a8d1737147b7b4587353f974c87fca2b442
+MD5 (NetBSD-6.0/sun2/installation/tapeimage/tapeboot) = 751ee54f544a63177c273ea6757dbdc0
+SHA1 (NetBSD-6.0/sun2/INSTALL.html) = 40cf15ad864adcc8d6216b9d4220cc3eab1463ff
+SHA512 (NetBSD-6.0/sun2/INSTALL.html) = 0992031a6cae198c16b08553e94277a39b34886cf0bfea343b95493439d79868cd50a1c2b9f2ce9852068b43beb7ee2a2016480c3ea452b9d62a25b71c72d567
+RMD160 (NetBSD-6.0/sun2/INSTALL.html) = f7aaba481555931612488d204c9a256899f04efb
+MD5 (NetBSD-6.0/sun2/INSTALL.html) = ccf725a8f39711748946cc414f688dde
+SHA1 (NetBSD-6.0/sun2/INSTALL.more) = 21b6ecc61f6d15fd2b54511150b840b242996f02
+SHA512 (NetBSD-6.0/sun2/INSTALL.more) = 5c43f22fe85470c7069ea524ff18570a1a3605a956157d9f662cf8b76fa6f52e4eef41e765488ae00b491830cde3b148254ed5bec6b20db0f5661d29ff0f7fce
+RMD160 (NetBSD-6.0/sun2/INSTALL.more) = 9adc2008a6388ec7ce907c23ac6f1de1f941c979
+MD5 (NetBSD-6.0/sun2/INSTALL.more) = 79afb0a5f30435a2731e455a85884a28
+SHA1 (NetBSD-6.0/sun2/INSTALL.ps) = 37c7ffa52cf698e058442a61d937a0ad09fa0156
+SHA512 (NetBSD-6.0/sun2/INSTALL.ps) = 09998f504688d7144d223f857edd4273bf00c1c50b1ec47294db2be1abdc050cbf73d0037c0b88279fb1028fde2556bbcadc2d4fbb7466834385905c46f3d688
+RMD160 (NetBSD-6.0/sun2/INSTALL.ps) = cac0f152af9ddd8fd643b2578688e7db03a3deb5
+MD5 (NetBSD-6.0/sun2/INSTALL.ps) = b2a094aacd3846aa4c121629daa938fb
+SHA1 (NetBSD-6.0/sun2/INSTALL.txt) = 90377374ac7c61d0fb6bafdaecd790a86fe7a447
+SHA512 (NetBSD-6.0/sun2/INSTALL.txt) = c37c159387cdfa0f40268a16c5a55cef0473b31f51e5c978ec948fe4964d3e9574dd9bbbd758eccb9304a9af6d8216b38aa256676a36537b480a5606b2cb1fde
+RMD160 (NetBSD-6.0/sun2/INSTALL.txt) = b16dee40608a6b8e8022df13c27783e34e48279f
+MD5 (NetBSD-6.0/sun2/INSTALL.txt) = b33826d2ef20420c36a3723256cd4488
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS3X.gz) = 08ec51564fa19e69828a501a60ac05c687f8471f
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS3X.gz) = d31891f04947a6295085ee899ccb5d532b5e50eb66d1c4f7f7779aae9a1c711b54e142c1d26f45ce10f6ef6815894fe545b436d40cc0ba05149e02885981f029
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS3X.gz) = a71a82ee59a431dd5c7a6d5100d84fd264ca4e4c
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS3X.gz) = 261995193793314b7306c5753aed0e23
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS.gz) = 941fbb0e064253228f04d4baaa8e2db4a09b8d88
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS.gz) = 2013168c4985c258bd2f605cda56dd678c394580edf2afa1fb37fd243b748b4d50e049a2f4b314ee5b70f30d181ec684d886094258115a0cdf0e485c120a2628
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS.gz) = 6028696adecea1922e0bdb1d757a4d70725c3639
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-DISKLESS.gz) = a49e05dd12628e1fcf1a30e8815ea72e
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.symbols.gz) = be5066fcab92b01e828769c3766ac902896a9dae
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.symbols.gz) = cc0f0b30fa4b28c2fbaf9229568530ee61e17b9ec8515242e53d4d6ac32d1f3ace313c4d138ff173a2301e208ded7389e93551a4a05d7f9a5bf536a8566c2de2
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.symbols.gz) = 832199c94540e3274e2376b17e23144cf99af3c7
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.symbols.gz) = fb76fe7920f7c1e0138270f64dd90315
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC.gz) = a1458c3d482f170ce26ff1b4ae12fcbe82206cd0
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC.gz) = 703f16ca7fb7cddbf33e84bf7859d73ad619464c859927767e6f3e292c63b7da65ed90d20a32cb7364f425c41aff05e0a08f7ba4e7bcfaa04804f4389425d402
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC.gz) = 5a542bbb7c45f6940f5c9a63deba729d2d6e8b75
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC.gz) = 28729a3aab91b7b81a0bb5af1378c67c
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC3X.gz) = 50f6f8937a0b18960660908aea8a5cd490175077
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC3X.gz) = 2798612a5e0d6d60f80dded7a22bdd6c1f5a64709b65fa33bfe8dfa873c38da0269b0a080185efe2025b5682ba9fd18bb3063a1133f8227cdc41acb03fc4bc2c
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC3X.gz) = ecd36a3bb10a07cb7dacfd2a8add6b4e51eddcf1
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-GENERIC3X.gz) = 63a3954b02444ee35ebdfc8a280c6eb8
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL.gz) = 2da156899061f57aabfe77a55081e1281cc46107
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL.gz) = a316b1fb791d3df671cf366c911756cd9e87735247eda75372d73075bd8ec8bfae4aba620740f86cfe8011ffe0614777d480d4979ca021912702ce5699865244
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL.gz) = 51a1809d8ddf6701d556d858a18416a72afb0f37
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL.gz) = b4a756c7502efd5883243e26139d206a
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL3X.gz) = 78f041430b2aafc6768aef55603c4427f90c44ed
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL3X.gz) = be3a7f26745d4693d2393f0ee044871dca2ec554f8897b7ec54bba85ff3cd75143a548fa0880bb76810d2811018c9c3b5e8cc44fbe163588b82c0344a2f0cf81
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL3X.gz) = 9d21135a1448a6fdc1fa052c56434cf809e43046
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-INSTALL3X.gz) = 0ff6857605eea16d5d90a85b77335229
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.gz) = 6f90c82aa6150d861190e41dca228549cedcc458
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.gz) = e4e4f5901d286b164f9e4b471f6084a6ba879c91b21b4e86f44650ccf0447698a11f33008d75cb3e12673396094d91e2d715e24b596727cb97c125340fa82abe
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.gz) = 13e4983150a8508d64c022000d27b77c1e0da384
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK.gz) = 6ce2d84c334909c66b0d54b928fdcb2d
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.symbols.gz) = 6c31ae63d1149ae040b2f04fdcce0f41aa8095af
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.symbols.gz) = f986b22aef0685dbb454c95d9f0f6b7379a15b365f56f3a13e1357b8b2bf7fb787b09eb4b474d06dd78e6869152e6493177f911929f972a819f688af90854d1e
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.symbols.gz) = 18640447fceaf27b7ebfd19917bf40521718c441
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.symbols.gz) = 639d60631052afddcfb58f64847964c8
+SHA1 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.gz) = 78efb67e8cb813af99a12a1c67c9238916bb1071
+SHA512 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.gz) = ef27cfba56aff6b13544132e71513598e68e488cb27b7038442279eaec9d6a715cf9196ce98d93acfc4a7e89cb679e5ce787f7c4b14a661a2113b1a987861a9f
+RMD160 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.gz) = 556c68e9415f0795d58c4f8c491eed75755a59fa
+MD5 (NetBSD-6.0/sun3/binary/kernel/netbsd-RAMDISK3X.gz) = ff2a3fad6f6dd6504713e5874b3eb8cb
+SHA1 (NetBSD-6.0/sun3/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/sun3/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/sun3/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/sun3/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/sun3/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/sun3/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/sun3/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/sun3/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/sun3/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/sun3/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/sun3/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/sun3/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/sun3/binary/sets/xcomp.tgz) = e13548b8974f5d55e98caf17b2b4bbbcf2430370
+SHA512 (NetBSD-6.0/sun3/binary/sets/xcomp.tgz) = e4b13c798df04ffef88e72100e2db5af400e5ae255cd7a1ca2907736b8138a59045b6f3bd8531b5753d0b87eadb1b5f801043a929bb25d1611e4be693c1da954
+RMD160 (NetBSD-6.0/sun3/binary/sets/xcomp.tgz) = 3b1f4e26ddd57e69afd9709553c1bf70d6e29ea0
+MD5 (NetBSD-6.0/sun3/binary/sets/xcomp.tgz) = 894bb9aa05b164d9923682165d708335
+SHA1 (NetBSD-6.0/sun3/binary/sets/xetc.tgz) = d2ca34bd668e108cbbfd4b45720823663339f8bd
+SHA512 (NetBSD-6.0/sun3/binary/sets/xetc.tgz) = 431ca465f300e7eb5d4dbd44c43e412a296fb4d3129217e752f86a720e8a8bdf736c9add05a45518a4f3e6cffa32381ef61e9186d360b68a5f8c64d87e385fb5
+RMD160 (NetBSD-6.0/sun3/binary/sets/xetc.tgz) = 4c5d664679856b02b694534cd6afdf20597e6d53
+MD5 (NetBSD-6.0/sun3/binary/sets/xetc.tgz) = 72bd67556ac14ea0ce147374af0ba624
+SHA1 (NetBSD-6.0/sun3/binary/sets/xfont.tgz) = 24ca4cb77a59246b1b05e0a91fed21c63259d12b
+SHA512 (NetBSD-6.0/sun3/binary/sets/xfont.tgz) = 8dc297fb6205a995767e68e77cc21169234dfb66a86bbcd2e1828fd32efeda0a25c9f2a9b1a39b97fe8d7b24f8cd5cf6160859af6be2259876f39ee4e76c405b
+RMD160 (NetBSD-6.0/sun3/binary/sets/xfont.tgz) = d2f134959940e6667aca185f01e388c05dc6bc85
+MD5 (NetBSD-6.0/sun3/binary/sets/xfont.tgz) = 3c96c1f0a13cd7d277ca35622ac9c058
+SHA1 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS.tgz) = 00b387b99dc84b6128941ae2b849feb76c7f88c8
+SHA512 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS.tgz) = 0b2cf325d14f69c5905bd6d832adfdc806bec302780811c6ad50ecbb646de07d1e91dd0cf16873b0128a44688f9e810d83ae7c6a4415b8393ea0567fe77d5f32
+RMD160 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS.tgz) = 71913a5ec9bab31e74ff27ab154715fd84b34a96
+MD5 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS.tgz) = 6988897d69e304577b9f493c44425ddb
+SHA1 (NetBSD-6.0/sun3/binary/sets/base.tgz) = 43ba28352421316629ca0c4a93709af5e5b588cd
+SHA512 (NetBSD-6.0/sun3/binary/sets/base.tgz) = 1b0efd643066d4cc5d689a64ba97092091ac8b94ac5244ca7955b27aa6ce60eaec0f020390d9ed60c00f894312fce76d1ca0555ac4626a4c5c140beb57b97ba4
+RMD160 (NetBSD-6.0/sun3/binary/sets/base.tgz) = 46456971e8d821c310f3ac304fcda320396916be
+MD5 (NetBSD-6.0/sun3/binary/sets/base.tgz) = ed8d7947e7e5282728b94a7fbae41ea3
+SHA1 (NetBSD-6.0/sun3/binary/sets/comp.tgz) = 960167513f2de6e53e0512ba9d8a8fa891d7f096
+SHA512 (NetBSD-6.0/sun3/binary/sets/comp.tgz) = a6d2d94ad9a752263254736253c7be190d2baa69140ca1e40c06719dfb89dd5660fa83c72392b2c5b30c0caee058cb049029b8414fdd48017fba2615781dc08b
+RMD160 (NetBSD-6.0/sun3/binary/sets/comp.tgz) = 9d995295dc5806397c31541ccd589210c0f675b2
+MD5 (NetBSD-6.0/sun3/binary/sets/comp.tgz) = 3f277a5219ca41a91776606698660e31
+SHA1 (NetBSD-6.0/sun3/binary/sets/etc.tgz) = be0c7f05a0122f7fa7e2bf1cf643080c5b434c1b
+SHA512 (NetBSD-6.0/sun3/binary/sets/etc.tgz) = 64d9a05110471e97c99c53479a14ba17dedd7c42f1471e26e2b8e73770d94a27b77ca12ab6cc014f8c131fb6757a26a565d4b8c71e78cab8dbbd21608fa76c33
+RMD160 (NetBSD-6.0/sun3/binary/sets/etc.tgz) = c4c29b032978e5a6f803c353d4d5b5ab4c58985d
+MD5 (NetBSD-6.0/sun3/binary/sets/etc.tgz) = 68851b8898496b07817e828fee991233
+SHA1 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS3X.tgz) = a63f54a0db8362478ef1f3fbbc18060e3834723a
+SHA512 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS3X.tgz) = 5ff8b7a463fc5e0edd17f47d2c59a01f9c53f23db8e73ba7bb0e67c73cd84d2688a22aa8e6b56bdccc29a0056fafeb6c984ea6a34a01e454a93d62eb2c54b623
+RMD160 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS3X.tgz) = 6ff482b8e336432022ac05a24c376d746fe7f8e8
+MD5 (NetBSD-6.0/sun3/binary/sets/kern-DISKLESS3X.tgz) = 1f49b690f568492ba1d2ff5cfd76ec6c
+SHA1 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC.tgz) = 9eb75c58a99f7b046dab7888235bf8162b10834c
+SHA512 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC.tgz) = 9cdcf4835398df2124cc418b977f1cdffaa87d4edaff2c61ded06b44cbd5aa656743e74abd4b5ccd5f7232e0890f4786523d4438feed288bf77df1482fbbb9fd
+RMD160 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC.tgz) = 8a50ed11d968a35170c50ddfcd51c3cfeaa7dfc0
+MD5 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC.tgz) = 510f2e6a9de0cd18e8dfc6cce74964d2
+SHA1 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC3X.tgz) = fc31315a9d236278dc8b6dda1e1385680e35eb4c
+SHA512 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC3X.tgz) = 9de034f2f6ee9cf0c65ba4fc41bf7147205c9918263131957d8555c7d54997d98dead2108ec2fac89805d371e673bd66abb93715b61f3c7a71c9db8caf761c40
+RMD160 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC3X.tgz) = d1b03f8e7188324e362e4fbd7764d4218a3a98d4
+MD5 (NetBSD-6.0/sun3/binary/sets/kern-GENERIC3X.tgz) = b8b84407a1e0d4e215a494aee08eafa8
+SHA1 (NetBSD-6.0/sun3/binary/sets/modules.tgz) = 7c6df8904730e2b7d3ea7e98d3a88ee7450e937c
+SHA512 (NetBSD-6.0/sun3/binary/sets/modules.tgz) = 95d55d7951896249f4b1b3c38ba80c75c415ffee77e3294f40f8680756cb1cd5b5c2b74740ccd66f218474f220f9603feb81bf9e6d72fa130a9ec3c595abba63
+RMD160 (NetBSD-6.0/sun3/binary/sets/modules.tgz) = 485905b274e58b342035d5485507e7c018ee62f0
+MD5 (NetBSD-6.0/sun3/binary/sets/modules.tgz) = 5350f1aec24cf27edd1c4d50c916ba33
+SHA1 (NetBSD-6.0/sun3/binary/sets/tests.tgz) = b76bdb5e8311a0fe1f22aab836007d5cbaf92618
+SHA512 (NetBSD-6.0/sun3/binary/sets/tests.tgz) = 475835a862280be0709e09a8ea5eb132d8c068c63df12dcc925ff3268250afbde228b593f66061d2b946dabc19eeebbb1a4fd313a751c4e5fd8a63ba63f2fdc4
+RMD160 (NetBSD-6.0/sun3/binary/sets/tests.tgz) = 58e77c597950e782b3c75967d864ebbc961ffede
+MD5 (NetBSD-6.0/sun3/binary/sets/tests.tgz) = 729752bb47500babd316c4776ba02e80
+SHA1 (NetBSD-6.0/sun3/binary/sets/text.tgz) = edf2e1f8352a2c45287ecff9c473da4673473a6f
+SHA512 (NetBSD-6.0/sun3/binary/sets/text.tgz) = 2098084f46640c2f45b0fb916a2123eacc2e390faaa04e3a8ea99d93f41c4ca5ba77d4192805b13a053ad8262aecccc2228448c9f048c03c96ca51869f342ebd
+RMD160 (NetBSD-6.0/sun3/binary/sets/text.tgz) = 1adc9b33d9aec637e1f8e7888f07076d500b2ea6
+MD5 (NetBSD-6.0/sun3/binary/sets/text.tgz) = 60c2eabb16dd9df538a98153e2dc7dc7
+SHA1 (NetBSD-6.0/sun3/binary/sets/xbase.tgz) = 404b75757bcc91b281fbd5ec9b9333e6c106579d
+SHA512 (NetBSD-6.0/sun3/binary/sets/xbase.tgz) = 0f1604049c7e1caac48d610304a1490d2e55dcf3f6a325139eaa57a38211836c479b1dc070cc3b8b0afcdddac7a84b679d96330f65f86015a80b7800fdca633e
+RMD160 (NetBSD-6.0/sun3/binary/sets/xbase.tgz) = b1e258608f09cd175c9e15844371daff5fe0f027
+MD5 (NetBSD-6.0/sun3/binary/sets/xbase.tgz) = a7ecfb2c66b224ecf2460fe5c6715f0b
+SHA1 (NetBSD-6.0/sun3/binary/sets/xserver.tgz) = 88091f11f474465d1a996569643d6e22cf08f717
+SHA512 (NetBSD-6.0/sun3/binary/sets/xserver.tgz) = 36de7d4b8be72d53d5f90a144d278359da55008917d2747419d3347d53989e9ceca6230fb2596d4ce6257d1bc9f171c6b9a8e738af86930adc8535e726a8e356
+RMD160 (NetBSD-6.0/sun3/binary/sets/xserver.tgz) = e161f48499d8f1ca64b22d65365704f65344875a
+MD5 (NetBSD-6.0/sun3/binary/sets/xserver.tgz) = 6ed6442ab169c491e991c8074512bb48
+SHA1 (NetBSD-6.0/sun3/installation/miniroot/miniroot.fs.gz) = 8b01f52ec164477fb5ec72725d941e3330c7da94
+SHA512 (NetBSD-6.0/sun3/installation/miniroot/miniroot.fs.gz) = fb6995a81aeb2f9fb89e096290cf0921e92b1b2be0adaf95dd2b62c89bbd047b0879231d4e5805a68bd023026ce563bf6f0fc3214ecfabc449650dee9790385f
+RMD160 (NetBSD-6.0/sun3/installation/miniroot/miniroot.fs.gz) = 54d3f3d3782536c89d2b6bbf6abb793617c83925
+MD5 (NetBSD-6.0/sun3/installation/miniroot/miniroot.fs.gz) = f9994dd6a5b9837915a4ff01a7c9baa2
+SHA1 (NetBSD-6.0/sun3/installation/netboot/netboot) = 88a9ccc7444c4692483705ef90da4af422b33497
+SHA512 (NetBSD-6.0/sun3/installation/netboot/netboot) = f0810823fbe7335cc83516a71bdf4d5ab281fc2fb71309d76cb979e741af00d81b55e4b298af07e4932ec8e70a79518ace9af7ebc3b5d8a3328555785a8c2d2b
+RMD160 (NetBSD-6.0/sun3/installation/netboot/netboot) = 57b89f091bf51dfda7a3b1b3e92bdd0c7e96e958
+MD5 (NetBSD-6.0/sun3/installation/netboot/netboot) = 9041ee544a0625228cbbb93e06d2961f
+SHA1 (NetBSD-6.0/sun3/installation/tapeimage/MakeBootTape) = 2b66897333fbeba29a086477f6d25026b6d60e55
+SHA512 (NetBSD-6.0/sun3/installation/tapeimage/MakeBootTape) = db9307323e7dc0d394fb2b8e012c86df51109357851f2c5ee7894468d4e3b54465ca5015141621fd9d28aeb7a2eef0beac987fc7faeee223f9571ff4589d1036
+RMD160 (NetBSD-6.0/sun3/installation/tapeimage/MakeBootTape) = 986f20c8bab33006ea857b9f925b964ab43b9b03
+MD5 (NetBSD-6.0/sun3/installation/tapeimage/MakeBootTape) = 68ea84a134fa2781294912ca85d4b1ee
+SHA1 (NetBSD-6.0/sun3/installation/tapeimage/MakeInstTape) = a242866885b14ec2e624319b2fe1fc4f940a422f
+SHA512 (NetBSD-6.0/sun3/installation/tapeimage/MakeInstTape) = bd5950ce181ae973784c56bed18085fdfd6fd8b1a46d83564c798c130bc265f7a811cb896be8b9f8f78f014aa1a1d37e34b307a7f806ad8f7790ce2308856b61
+RMD160 (NetBSD-6.0/sun3/installation/tapeimage/MakeInstTape) = cb0330a75c5b5fa600e3789d81ff75f1c1d81078
+MD5 (NetBSD-6.0/sun3/installation/tapeimage/MakeInstTape) = fdc38b08d909159925b6a4efca11a498
+SHA1 (NetBSD-6.0/sun3/installation/tapeimage/tapeboot) = 276be9760458783489c93cea994dc73289ace945
+SHA512 (NetBSD-6.0/sun3/installation/tapeimage/tapeboot) = 7d6f1a348f99e42960f1697105d2771228a921860b0bd78624e96efcd9dde839412511e414f824ea78f4d5c938141c96d896acb3af426fbb393bbc69825c6c57
+RMD160 (NetBSD-6.0/sun3/installation/tapeimage/tapeboot) = 585b74fc55271ea82d4c2e3a38cd3bd7fc9cebd4
+MD5 (NetBSD-6.0/sun3/installation/tapeimage/tapeboot) = 6e786930e4f263c8fd65c0684b10f17f
+SHA1 (NetBSD-6.0/sun3/INSTALL.html) = e1f85d7f20325efe213999b96d606094b64a2c3e
+SHA512 (NetBSD-6.0/sun3/INSTALL.html) = 571b45b18a5fa33d705470440bfc49b38b19f5625aa26b79241f27232a4e902c1689e6acfa563d95204a6bc5a9955565fdd915673db770f739003c8838a7b680
+RMD160 (NetBSD-6.0/sun3/INSTALL.html) = 10984fb54cdde46e9dfe3567fff0a41e2f2fddfa
+MD5 (NetBSD-6.0/sun3/INSTALL.html) = b221aa68f0c0063c7d4ceb493971636b
+SHA1 (NetBSD-6.0/sun3/INSTALL.more) = 3f54bfd9cb004fe817d400878e005dd81f1d2850
+SHA512 (NetBSD-6.0/sun3/INSTALL.more) = 6b56e0d51f7423f74aa64a269fe9a0787b0a71d54f8582242d874066df05cc6bb4840ff6d3fd2817f4919b707ff621ca00a77f32938ece1dada70d8a3e6eedef
+RMD160 (NetBSD-6.0/sun3/INSTALL.more) = 40aec024ba64af07553ff888f3140e1e6793ac68
+MD5 (NetBSD-6.0/sun3/INSTALL.more) = 9c67417a5a30c173b09f1a8b518032d1
+SHA1 (NetBSD-6.0/sun3/INSTALL.ps) = b83169ce92b3dc6bd83a1ca5e858120f8b91db45
+SHA512 (NetBSD-6.0/sun3/INSTALL.ps) = 546cc770038d3194ca5dfab82113644f6b4fbb5930b9560c14550234858d0bb0edc7fe1fe24d44413042dc7f2c64dc5e4002f3fb60b9893c76f0b80dbe02ae02
+RMD160 (NetBSD-6.0/sun3/INSTALL.ps) = 1110e213ad092c715e1c5314d9c11d4e4d0cd977
+MD5 (NetBSD-6.0/sun3/INSTALL.ps) = 848bd14e183958c567bdde20345d9b7b
+SHA1 (NetBSD-6.0/sun3/INSTALL.txt) = f37f80d7db1daf78f66d91f7f76ac9caecc69d65
+SHA512 (NetBSD-6.0/sun3/INSTALL.txt) = aaa6abd3508681ed137796f3f64187fe0e9c7ec26f0d0f81ae73a4e2853ef5aa6b70e861ba69fad5ab51d62f1b09440a0f3f033ef2443a8b12ffc2129e5efdb1
+RMD160 (NetBSD-6.0/sun3/INSTALL.txt) = dfcd996574e4d266e95640301662f4928e3a343b
+MD5 (NetBSD-6.0/sun3/INSTALL.txt) = 194d8eac56ca75bff60e3d8c6e003ab1
+SHA1 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.MP.gz) = 71d44bf3bd2a39ac207a085a22a8310014e4b062
+SHA512 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.MP.gz) = 875f45349bf522e4f63d8f1261433b3e109df5ce7c3ee1edd13e2d4526616b7863507dc305d954300308a4c650b9fa12168219d0deb6622b517442b34e10bcfa
+RMD160 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.MP.gz) = 357c54bfe13253c5fec2c4ca6cd18909b6a3a6a4
+MD5 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.MP.gz) = 5aa951b5c5cb5592f950fa3882b2f60f
+SHA1 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.gz) = 9b77cf6513c4cf4fdb0081400a46c34a1c0cf04b
+SHA512 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.gz) = ff9d18b6c5d3bcd7bf4ea6e341e77180a7c68b034c61e02dc3d540389e9690faf7a157587847b3f1c25199cee097178b0b658118daddd136aa5f5856dcec1c38
+RMD160 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.gz) = 2ed49d64a3f42845c08a8ae30d45569492895cc3
+MD5 (NetBSD-6.0/vax/binary/kernel/netbsd-GENERIC.gz) = 26548ca549cfa4f7c9be70e52a981d69
+SHA1 (NetBSD-6.0/vax/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/vax/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/vax/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/vax/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.MP.tgz) = d4cac92dc06ec7b3c4ec9ca0d60dd1ace1814e50
+SHA512 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.MP.tgz) = 3b10e201e963285a8c3d9319e818510701756a3c33003a5536d273e886cc0b3c02ffe10e762d5d7b4aee2d0098d3600396afc2baafea64cc268fa032203a46f9
+RMD160 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.MP.tgz) = d9b4a6a9c85abeee0178536cd1b5c4f0322067a4
+MD5 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.MP.tgz) = 15126f47c08adefe93c7261b6eeeddec
+SHA1 (NetBSD-6.0/vax/binary/sets/base.tgz) = 9b83f88ab7d06a112cfff79b6657912bddb77987
+SHA512 (NetBSD-6.0/vax/binary/sets/base.tgz) = de7c42524163a5d9de7fda440cd2523834d5c46e4e992724a4a7af5e0768e5b105909e9a60e603b2a942cade3795cf4cc2bb22c7627453eda92bf662da83a16a
+RMD160 (NetBSD-6.0/vax/binary/sets/base.tgz) = 3059d6e4a7d54ebc9c529f90719ca561ebbe8036
+MD5 (NetBSD-6.0/vax/binary/sets/base.tgz) = d06066c8a452b8a7831de680a420ea4c
+SHA1 (NetBSD-6.0/vax/binary/sets/comp.tgz) = 3ad25c223276936b26916121fe8341524e2e51a6
+SHA512 (NetBSD-6.0/vax/binary/sets/comp.tgz) = 852dc3d7a01fc8e11e66723930d90e7141d974b976d8f7986f068fb5202dad396ef2762400c1e9e02b0d6c5a087435a56f65e502079eec9d9e86c24cf81782bb
+RMD160 (NetBSD-6.0/vax/binary/sets/comp.tgz) = a4e74e817807d4d79a43ac450109b14474fda740
+MD5 (NetBSD-6.0/vax/binary/sets/comp.tgz) = cf51957de39d3a72c7dda2633d39e705
+SHA1 (NetBSD-6.0/vax/binary/sets/etc.tgz) = 21f4ff8b449498081fd6dde92b43eaca86d886ef
+SHA512 (NetBSD-6.0/vax/binary/sets/etc.tgz) = c6e43ea57dd0b53f9e0a995aa872d9f7f1d8852fbe7105e125116f577d0ce2acb1e8deddc6a8dcb51e272a982cf549706b23bb26b0acedad416ceef8910a6461
+RMD160 (NetBSD-6.0/vax/binary/sets/etc.tgz) = dd7a5f74812906801bf474d265a4846f069c00ef
+MD5 (NetBSD-6.0/vax/binary/sets/etc.tgz) = fbb2c18ea3be98a3624f54b834399ee9
+SHA1 (NetBSD-6.0/vax/binary/sets/games.tgz) = cd79679fa36349431355dcd14b8a058476f20086
+SHA512 (NetBSD-6.0/vax/binary/sets/games.tgz) = f68c931765849554222cc439d5761411d36e8e95b4331d15525e73f77b31249c220b9de4c2061f5e35207e75e27d5d6ade99a7eadf2baf54fc8eeb16ac243dbe
+RMD160 (NetBSD-6.0/vax/binary/sets/games.tgz) = 7da1dd4ece7e9062635f7b0766af245e2624c032
+MD5 (NetBSD-6.0/vax/binary/sets/games.tgz) = 995e32bef1b920f33c5d7eb946441682
+SHA1 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.tgz) = 6e61cfb380e7cf45e2094ef64d26d44ee33fd086
+SHA512 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.tgz) = 0d35a882e1e98796099bedc0157fc30978b2e43ef0627be603036259069dc13503fee5dd57b2e9da74dd5c2cb1bb823f4bf91d98259d84b993977bae05d8c10c
+RMD160 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.tgz) = 3e2f321e7934e6597ea83627934e88d2214baad3
+MD5 (NetBSD-6.0/vax/binary/sets/kern-GENERIC.tgz) = 2efb4b8d6a76ebb59f4ce1171e1502db
+SHA1 (NetBSD-6.0/vax/binary/sets/man.tgz) = 9c2da95fb72f9fd1eaa8f7baf5fe45496c8b4615
+SHA512 (NetBSD-6.0/vax/binary/sets/man.tgz) = 1a158e92b8414d92745a06fe1c721047e87fd768d7158e078c3a17de1d2634463f8f6b022a001f5f9010e14f0eedf6d5a94e4b73b4dd0ed9ac4576abbf2aeaf4
+RMD160 (NetBSD-6.0/vax/binary/sets/man.tgz) = d2485fd19bffbc6103f8aa7521e52c8f652fafa2
+MD5 (NetBSD-6.0/vax/binary/sets/man.tgz) = 83e81f5c82acdf7ee76ef5854eca3f5b
+SHA1 (NetBSD-6.0/vax/binary/sets/modules.tgz) = 4e60e0177f0e5d6e42ee875a7c30cc612c22ca64
+SHA512 (NetBSD-6.0/vax/binary/sets/modules.tgz) = 0e5926279b9534cb9bd34ff0c4d49fa4cd467966829d080ec8ab739039536f42173c2ec91aea40ca37d94625a5b395c3f55ce7936f963bd8d970d1a81fcff8af
+RMD160 (NetBSD-6.0/vax/binary/sets/modules.tgz) = 54b0d690b929b4df06adc044864e76d47f09c844
+MD5 (NetBSD-6.0/vax/binary/sets/modules.tgz) = aa18ce8768d9fd88206d465fd1ae155d
+SHA1 (NetBSD-6.0/vax/binary/sets/tests.tgz) = ec975a37d490f45fb9e7f0f30f0ec46fc0038531
+SHA512 (NetBSD-6.0/vax/binary/sets/tests.tgz) = 33b8686c97da76e031a9678103ba99a83cc4189545b4020241a83084585f0eb200c0cb44634e578c8882cd849f80151383a54511c80d1a35964a3567f8e6b314
+RMD160 (NetBSD-6.0/vax/binary/sets/tests.tgz) = c27fcdf838dfc43c1527fde3fba2735065a5d12c
+MD5 (NetBSD-6.0/vax/binary/sets/tests.tgz) = 3789eac68014743577dfe22503dd98a5
+SHA1 (NetBSD-6.0/vax/binary/sets/text.tgz) = c7dcf12545842d5563887c983d694fa569d25ab3
+SHA512 (NetBSD-6.0/vax/binary/sets/text.tgz) = 50a7ad69dc23c0d178a3f835e9bed7305cbe432a92cf947e64e28316ac94ddd7def90e91c53515d0cd3ac26c5df23d3f60932ba688ab04525d635555b6078a6a
+RMD160 (NetBSD-6.0/vax/binary/sets/text.tgz) = 24ae1e1016b492c3dd575099936598d00d8ac6fa
+MD5 (NetBSD-6.0/vax/binary/sets/text.tgz) = 99863a74757bc9677befe8c6ef049685
+SHA1 (NetBSD-6.0/vax/binary/sets/xbase.tgz) = 35f6a1b09f246736f7c1c6049831ca0704fe53d1
+SHA512 (NetBSD-6.0/vax/binary/sets/xbase.tgz) = d2d0b6a5702e4a87e4823ce7478f5c8f1527045d96040680960e3d96f98f64e40ac7263ad2ca4c4272d4d253fcb41b7e296a9d27f9ffa7dc03be6c437835878e
+RMD160 (NetBSD-6.0/vax/binary/sets/xbase.tgz) = e2455fc04171cd3aef8662a36820552811c7657b
+MD5 (NetBSD-6.0/vax/binary/sets/xbase.tgz) = ec8b6356f82d4ccb90e93dd78e5c741f
+SHA1 (NetBSD-6.0/vax/binary/sets/xcomp.tgz) = ebadf7653d6173ccc73d1228338a4df09eb7dce2
+SHA512 (NetBSD-6.0/vax/binary/sets/xcomp.tgz) = a4c4cfaaea473e617870a92bfce40fbc2e34413f31ec2159554031c4312dc1e605079a9e0fd3774967bba9cc27bf9efc97899f09959bd401726ceeeec7006790
+RMD160 (NetBSD-6.0/vax/binary/sets/xcomp.tgz) = e6d1591328fcc0af7336d22a5426f72c8343ad49
+MD5 (NetBSD-6.0/vax/binary/sets/xcomp.tgz) = 1cc0fa0971f06c2bd9e296db9d6d6fa5
+SHA1 (NetBSD-6.0/vax/binary/sets/xetc.tgz) = 2c85388aa75c419cc5651c053b00710471a87350
+SHA512 (NetBSD-6.0/vax/binary/sets/xetc.tgz) = 38c9f1abf9d6ff828c361a2c58690f70a7d707aa739f7ded9f256b414e7b78c11ff4f915a59f99884afd5ef0b874c1c1b70aa438f6bdff07e354d67d2257bf72
+RMD160 (NetBSD-6.0/vax/binary/sets/xetc.tgz) = b1186ef0c975fa76d8d4d0c62e24ae86cb3d433c
+MD5 (NetBSD-6.0/vax/binary/sets/xetc.tgz) = 46ca22a86d8052c1044717eb907d7874
+SHA1 (NetBSD-6.0/vax/binary/sets/xfont.tgz) = e9a33e8d99378b3944fc21aa983c02707831f0bf
+SHA512 (NetBSD-6.0/vax/binary/sets/xfont.tgz) = 3d09f4edf49bfa98c7817cdb1b91aa4ec902dc87c1765e9a92f143bf4918a60e011fe614a70d9dd926ca2a019a33e5f0dc2d7198205f2273e755049dd8d5a2a1
+RMD160 (NetBSD-6.0/vax/binary/sets/xfont.tgz) = 9ae96f8628d6a35053f093acee972bdd8b6722cd
+MD5 (NetBSD-6.0/vax/binary/sets/xfont.tgz) = 6e95a6fd030425bb19f0505b9308d20d
+SHA1 (NetBSD-6.0/vax/binary/sets/xserver.tgz) = aa6c021940fae979a4a3a3cd01a138808c49621d
+SHA512 (NetBSD-6.0/vax/binary/sets/xserver.tgz) = 540455f89e8dfe7d376322ab95288e96e54aa0531aab7cb96e0b1354f85ef64778cbf265bfc2fca7827879a286d80b15f9e973d62594e5bf02df4b0add15be0c
+RMD160 (NetBSD-6.0/vax/binary/sets/xserver.tgz) = 84dee738690e4487d7f28cba1d3f61ab9eb12240
+MD5 (NetBSD-6.0/vax/binary/sets/xserver.tgz) = e2df86b6bfa5259e72d02f40de72491b
+SHA1 (NetBSD-6.0/vax/installation/bootfs/boot.fs) = c4d1340eb7d2ea1d555a46fcf2071fa2f091d1d1
+SHA512 (NetBSD-6.0/vax/installation/bootfs/boot.fs) = 155e7faaf14e619309c3ca8cc163e08d6bd3cac41b4d38dc5dc4cd4736e99003a2b6a6d0ffb6cb698772f43d31f577732b9933a71fb1f6315af16dfae34d4f66
+RMD160 (NetBSD-6.0/vax/installation/bootfs/boot.fs) = 52a2200dbef9e624d7ca91eb6d2110599b8010b1
+MD5 (NetBSD-6.0/vax/installation/bootfs/boot.fs) = f02d1ee9291b0dd37f0dc75d0a27ad10
+SHA1 (NetBSD-6.0/vax/installation/miniroot/miniroot.fs.gz) = 5aed885a0dde234caed611cca0f474dc6cf8461b
+SHA512 (NetBSD-6.0/vax/installation/miniroot/miniroot.fs.gz) = 3d647213e86ccb976107853ab81ec82d339d2cc7c7bda4cc0c416f55e521c7a43a73523c7f9ff6e590531f019badcd414f1bdab4c95db0806a606065c6803ef4
+RMD160 (NetBSD-6.0/vax/installation/miniroot/miniroot.fs.gz) = 6ddb63ee115a7b4a78546092ac7b8cee7c056921
+MD5 (NetBSD-6.0/vax/installation/miniroot/miniroot.fs.gz) = 0f860ac5f201e72f4b22392027b25117
+SHA1 (NetBSD-6.0/vax/installation/netboot/install.ram.gz) = 8f48dc649fe71a6f861a9f96e2b63679971b762c
+SHA512 (NetBSD-6.0/vax/installation/netboot/install.ram.gz) = 857920e536fe08897d7e20c62c74a5606ea791d97111740222c8998ee4a1a9ae05f52ac27b5580d5f78a70f75d5a9ea9446802a85297a13411b98ebe8a84a3e1
+RMD160 (NetBSD-6.0/vax/installation/netboot/install.ram.gz) = 9c94e2d64328f88eb7157d6a47e5aec15b1da2a3
+MD5 (NetBSD-6.0/vax/installation/netboot/install.ram.gz) = 23d3d0b714186b3e2e7b70d5f0a1ce21
+SHA1 (NetBSD-6.0/vax/installation/netboot/boot) = 738e9f280ab9874a2eb21af8627d70e2abd2ba0c
+SHA512 (NetBSD-6.0/vax/installation/netboot/boot) = 934496142a69c247ce8b96ea6de19e0cbe0d9e4e8a1ae1043f4d60926c6b3deb30132f3bdc346b3422f1fea02da3a3feaf900d64a9759d265b33fe81ab3da070
+RMD160 (NetBSD-6.0/vax/installation/netboot/boot) = 8a60febc408768e89ebb1a834bffaa06a72d3503
+MD5 (NetBSD-6.0/vax/installation/netboot/boot) = f238dc1fafca2d7f1a83a22b6cb31091
+SHA1 (NetBSD-6.0/vax/installation/netboot/install.ram.symbols.gz) = 6b57f7a857c24539639cce3ed41ed5de16ec233b
+SHA512 (NetBSD-6.0/vax/installation/netboot/install.ram.symbols.gz) = e9ac802e948631231eda425e5bab76bf14bc59462613eb6c1025708d67f54c67e9b928cbf33253473605c6239842667eba5e58240d6cb53afc5c80c8546357f5
+RMD160 (NetBSD-6.0/vax/installation/netboot/install.ram.symbols.gz) = 5a6ea2a19caafd034e75e9440d1e139d1af3ef0c
+MD5 (NetBSD-6.0/vax/installation/netboot/install.ram.symbols.gz) = 712856f65322faccd1b116c548d40196
+SHA1 (NetBSD-6.0/vax/INSTALL.html) = 8d850ffd9374c9bdc63e37fa14dc63eda02a93fe
+SHA512 (NetBSD-6.0/vax/INSTALL.html) = 3c93355dbfd0cbad25eb74c8497975855706a20dafe8a1baa64d0b53801d5e02d81a93c3347c52950fdd424623cbb58c7a0aa58b7989e89116b157f9d18bef51
+RMD160 (NetBSD-6.0/vax/INSTALL.html) = 42d4d65000e12d8f2cbe30f6743d84d7a040bb05
+MD5 (NetBSD-6.0/vax/INSTALL.html) = bbad6392f6badb4a1d0ee2977b9df90c
+SHA1 (NetBSD-6.0/vax/INSTALL.more) = 624b96b802364eb833ca077dc706d75b5f68f336
+SHA512 (NetBSD-6.0/vax/INSTALL.more) = 300954b8c1f3c47a1a45d773f8c7bad3c12dbc292485b7a7206289f56584ce12befa89b8d315511c3e3f7c407de9ca068fbdaae9d75c52dff72a8f8a9b5e4a55
+RMD160 (NetBSD-6.0/vax/INSTALL.more) = ab1b5238e9eb5ad1c937c75901199023c08d2434
+MD5 (NetBSD-6.0/vax/INSTALL.more) = e634a224d0d67c5cc1c7dffd98156b79
+SHA1 (NetBSD-6.0/vax/INSTALL.ps) = 57710ab0d4450b0692b07eb812c9c7e6d70a49d5
+SHA512 (NetBSD-6.0/vax/INSTALL.ps) = 0afac140d664edbb10a41c6dd646c797b78e37c1d36aa4804653fbef64171ddf9688d7220755553ff4add8891bd97f083bde4b03c93fe579f1e9d030c83f3d07
+RMD160 (NetBSD-6.0/vax/INSTALL.ps) = e84f468d6f328faa9889cf2ad76cab5846c45da0
+MD5 (NetBSD-6.0/vax/INSTALL.ps) = 51b9a2a1046494b2443503636fa223da
+SHA1 (NetBSD-6.0/vax/INSTALL.txt) = 0a4b816342615d9a4e60cbc99bfea81afe41d0f1
+SHA512 (NetBSD-6.0/vax/INSTALL.txt) = b1853a3be6cd17449c4e5539945812b9ba87e02e07877dfe791e04c3db39ed1577e795d7d5e3b1048fc60eca5694592bb5671982c24aaa1f78e3783ede603ded
+RMD160 (NetBSD-6.0/vax/INSTALL.txt) = f774566773432a691acf285d569dabcf5037ecfb
+MD5 (NetBSD-6.0/vax/INSTALL.txt) = 43a9353717d9309c11fb5f4a9685942d
+SHA1 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 0e3d568ade336cd6e538d567ea11a965d49588cf
+SHA512 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 721a7e1ec94d9a37f37eb30b96d66b19d387090964ee93233de36771e4d106e72cdbeb4b0b17f8d490d9f64484b8a511526841c511b2d33624bd626b4388b623
+RMD160 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.symbols.gz) = 176ba2b94555c5bda82260a075ba295021d61e8a
+MD5 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.symbols.gz) = aa03bcea1e574f24c1ef0eeb364f1c8d
+SHA1 (NetBSD-6.0/x68k/binary/kernel/netbsd-GENERIC.gz) = 9a7796c7abf7b4828ee7eb7125b73f5ccd25e2db
+SHA512 (NetBSD-6.0/x68k/binary/kernel/netbsd-GENERIC.gz) = 58c7f85cf73d90a04c42c502a3dedd779d9f5013a58f0df8a279cf559dedb80b6bdf2a22804284fa58a7df9c1ba8a8f0454d3f76a43787a7372afb58d5d734b3
+RMD160 (NetBSD-6.0/x68k/binary/kernel/netbsd-GENERIC.gz) = efce8e9537f895492b5becab7878dec07fafe7c1
+MD5 (NetBSD-6.0/x68k/binary/kernel/netbsd-GENERIC.gz) = adf275bc0aec4a8ba50661637b7707e5
+SHA1 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.gz) = e5fee2392b742d34a50bd2236dc4ba26acdd57e2
+SHA512 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.gz) = 6aa21ef102224a5194fd6709b70a47788e073ad0d325dbe3b982a19a24c67b421acb003496ddf42804785b0dae9bb32dccde617e7d6d9185511205ab390cdcb3
+RMD160 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.gz) = 7251ea070e26aa877c85b9eabffd62cd6ee4b04c
+MD5 (NetBSD-6.0/x68k/binary/kernel/netbsd-INSTALL.gz) = e5e8b74d980cbbbc0324cab3da12af0b
+SHA1 (NetBSD-6.0/x68k/binary/sets/games.tgz) = 16ee93ea4d5fac2fb28fad5c32c8a3d57d011d79
+SHA512 (NetBSD-6.0/x68k/binary/sets/games.tgz) = a7f49ab72f50273f66c8dcf408b57ec4668debd5537c5bd0ec59aa0f4fa1d599ba0798d1b283315c4208cbcb608925808ce003b1ade79034886edb8208f9f48d
+RMD160 (NetBSD-6.0/x68k/binary/sets/games.tgz) = 1e09d99d7fe2e495763f05919472d27a4ba699df
+MD5 (NetBSD-6.0/x68k/binary/sets/games.tgz) = 8a26f3e864444209088bccf21419a616
+SHA1 (NetBSD-6.0/x68k/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/x68k/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/x68k/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/x68k/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/x68k/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/x68k/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/x68k/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/x68k/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/x68k/binary/sets/xcomp.tgz) = e13548b8974f5d55e98caf17b2b4bbbcf2430370
+SHA512 (NetBSD-6.0/x68k/binary/sets/xcomp.tgz) = e4b13c798df04ffef88e72100e2db5af400e5ae255cd7a1ca2907736b8138a59045b6f3bd8531b5753d0b87eadb1b5f801043a929bb25d1611e4be693c1da954
+RMD160 (NetBSD-6.0/x68k/binary/sets/xcomp.tgz) = 3b1f4e26ddd57e69afd9709553c1bf70d6e29ea0
+MD5 (NetBSD-6.0/x68k/binary/sets/xcomp.tgz) = 894bb9aa05b164d9923682165d708335
+SHA1 (NetBSD-6.0/x68k/binary/sets/xfont.tgz) = 24ca4cb77a59246b1b05e0a91fed21c63259d12b
+SHA512 (NetBSD-6.0/x68k/binary/sets/xfont.tgz) = 8dc297fb6205a995767e68e77cc21169234dfb66a86bbcd2e1828fd32efeda0a25c9f2a9b1a39b97fe8d7b24f8cd5cf6160859af6be2259876f39ee4e76c405b
+RMD160 (NetBSD-6.0/x68k/binary/sets/xfont.tgz) = d2f134959940e6667aca185f01e388c05dc6bc85
+MD5 (NetBSD-6.0/x68k/binary/sets/xfont.tgz) = 3c96c1f0a13cd7d277ca35622ac9c058
+SHA1 (NetBSD-6.0/x68k/binary/sets/kern-GENERIC.tgz) = 253e2e072ae66dd896be3d6d936c637bb96ef2c2
+SHA512 (NetBSD-6.0/x68k/binary/sets/kern-GENERIC.tgz) = e2b9221ffad2c150f1529243197e7672c58a41d865dcf02a7252c1bb1f0fdb644e8c6bc3250f16f2091748d2a009badd12c0cbda2ae2b186bbfa0b6302957293
+RMD160 (NetBSD-6.0/x68k/binary/sets/kern-GENERIC.tgz) = cd78ce4ed94bd540d9cfcf2d3a6d51fd83cbef95
+MD5 (NetBSD-6.0/x68k/binary/sets/kern-GENERIC.tgz) = a41a26a51d64ac00f3d0b1f5657a5400
+SHA1 (NetBSD-6.0/x68k/binary/sets/base.tgz) = 97339969786af5934c8db561afd33bf2fdd5cb77
+SHA512 (NetBSD-6.0/x68k/binary/sets/base.tgz) = a5cb607f828570f11ae3653032d442cc191339a00037cc6c37635c726fb2b06a9bf1d2dec7e71bfb824ac11810ff1ccbff55ec69659c66112b36fd28521a304c
+RMD160 (NetBSD-6.0/x68k/binary/sets/base.tgz) = f77783ac8537a39ac77014b7fd8860269a6aae0c
+MD5 (NetBSD-6.0/x68k/binary/sets/base.tgz) = 752b937da621346aaab5b18ac1fc9f3a
+SHA1 (NetBSD-6.0/x68k/binary/sets/comp.tgz) = 5b2f871bf928a68b7ffdf2b2f45e5ee80a8c83a0
+SHA512 (NetBSD-6.0/x68k/binary/sets/comp.tgz) = d037edaa7d8b4a275a39771f2f7ffd4dd46f68a3107af0ca88f9ce205370c756904c6c0bcb7f6138fabeaf0bfb504ce541253c9d6d2892675e7e308358045047
+RMD160 (NetBSD-6.0/x68k/binary/sets/comp.tgz) = b371813449f8d913bf22466d52a7a238522b8a5d
+MD5 (NetBSD-6.0/x68k/binary/sets/comp.tgz) = efab43faa3de48943a5ba3b96a07741d
+SHA1 (NetBSD-6.0/x68k/binary/sets/etc.tgz) = 52e6167471d4788f7f060166de8f23a31f731596
+SHA512 (NetBSD-6.0/x68k/binary/sets/etc.tgz) = ce530878bf230e22786bac9ce6075958eebb52c5119b760ebc183b8f7b2fa59297797768461a44f708b9ce993c21a96e0f49b207c79208e25eea93412889babc
+RMD160 (NetBSD-6.0/x68k/binary/sets/etc.tgz) = ad019f3b95e8cc9d3320909dee7dd91ff45a4da6
+MD5 (NetBSD-6.0/x68k/binary/sets/etc.tgz) = 9f179baf30026ced05db113a623006b9
+SHA1 (NetBSD-6.0/x68k/binary/sets/modules.tgz) = d52fa0ed8a899526add267f705735e9dcbb62a14
+SHA512 (NetBSD-6.0/x68k/binary/sets/modules.tgz) = af60d178109bc5330363f041d688e46e36e1894ca0320c7a1735f5de483349a38e63b316b297a5bbf7fb282c1f69539698f7704e759a27c1c833239ec775e371
+RMD160 (NetBSD-6.0/x68k/binary/sets/modules.tgz) = 5e3db9d5547a118143f5eac40b442cf27dce8a52
+MD5 (NetBSD-6.0/x68k/binary/sets/modules.tgz) = 18d52b98a32e1b37501fb2056be5d356
+SHA1 (NetBSD-6.0/x68k/binary/sets/tests.tgz) = 469b2b371980f0bd11407497ee2c104536867df3
+SHA512 (NetBSD-6.0/x68k/binary/sets/tests.tgz) = bfb64b49fd88386e2012b827d9af754bbc75a21e63650da66a8add45b54bfc700a3d22a3c6e98e8736309f1a1015f82c366e51ac6539556f1645b28d3d018ad5
+RMD160 (NetBSD-6.0/x68k/binary/sets/tests.tgz) = 8e674a86bd2551876719f842f61850d6505b290e
+MD5 (NetBSD-6.0/x68k/binary/sets/tests.tgz) = 5c524dfbbb575f61ff958baa317a4808
+SHA1 (NetBSD-6.0/x68k/binary/sets/text.tgz) = c8b514b008fdd482c7df7df5849c5bbcd04d289c
+SHA512 (NetBSD-6.0/x68k/binary/sets/text.tgz) = 37fe61c52eaa54e8de5709bb3494efe1845a0946c65ed007ec0785902d44acbb3b971bd31b53305ce72d4d32180a56f280a4b29a2a9dcb83c443299edcfe0ea8
+RMD160 (NetBSD-6.0/x68k/binary/sets/text.tgz) = d927619390ecab77ada3966395d227967cb38a43
+MD5 (NetBSD-6.0/x68k/binary/sets/text.tgz) = 1854795033d3fb974637643eed84359a
+SHA1 (NetBSD-6.0/x68k/binary/sets/xbase.tgz) = 012b5faed219406f267667b7d5047ea9e85ac58a
+SHA512 (NetBSD-6.0/x68k/binary/sets/xbase.tgz) = 88b65e79f9801e1d3a0da5d3407754c7d48911bf86e5262fb8d02c46c5653b6fd55e6588177771ff82740b12fc84c8a19e207cee83ceee3a772e5beb182ae72b
+RMD160 (NetBSD-6.0/x68k/binary/sets/xbase.tgz) = e5d43999d4316d561ee7689321c04698af4ed5b4
+MD5 (NetBSD-6.0/x68k/binary/sets/xbase.tgz) = e5cdea5cf19b94dc3ef382951ef923e3
+SHA1 (NetBSD-6.0/x68k/binary/sets/xetc.tgz) = bf1f9fa57ffed50beb8d7d455c95928d560bf224
+SHA512 (NetBSD-6.0/x68k/binary/sets/xetc.tgz) = 3bf13d97afb20cb5e7098d9837f0a1bf471e49ec53672948373fcdb23c25c56fcb6de974a021c7e3bcb00e6069e0a68c5a84cd187e4304af129b3db66942d953
+RMD160 (NetBSD-6.0/x68k/binary/sets/xetc.tgz) = d2f0715f277a6de929f1504d50ce1b5fe27327fc
+MD5 (NetBSD-6.0/x68k/binary/sets/xetc.tgz) = 85342c60f299840da352a811f666392c
+SHA1 (NetBSD-6.0/x68k/binary/sets/xserver.tgz) = 54b441f5b0afb06e26e816a729b259abe8b3c234
+SHA512 (NetBSD-6.0/x68k/binary/sets/xserver.tgz) = a81cf87de57b646f79cbbdf5cf9a69c90bb2f97adccc1310bfaf639313c3027b04cb7591d49cf7dd07f4f6210e971656c7ae8980d8e0a1e854fbbc87ccfd91d0
+RMD160 (NetBSD-6.0/x68k/binary/sets/xserver.tgz) = 0ddef8e502a8ca10a21d59aa99f9476dbac2d29f
+MD5 (NetBSD-6.0/x68k/binary/sets/xserver.tgz) = e60e100d889a7377fd708a441d2a818a
+SHA1 (NetBSD-6.0/x68k/installation/floppy/sysinst1.fs) = 0c52f0ff358294b5fefca38d963f7fcc3c6dfe93
+SHA512 (NetBSD-6.0/x68k/installation/floppy/sysinst1.fs) = aeaba8cc7f83d83ec41a0ffef1a01203de34a89ad6028f8d5df06b2a6523b82ca44f13370f0f2f03e65cf2bb8a76532868471f25ddac4a8e53aa2f8a57f4be57
+RMD160 (NetBSD-6.0/x68k/installation/floppy/sysinst1.fs) = 396eff107455609a3b7322595660741e14a57077
+MD5 (NetBSD-6.0/x68k/installation/floppy/sysinst1.fs) = e1a273155ed6f80cc365bf441909a914
+SHA1 (NetBSD-6.0/x68k/installation/floppy/sysinst2.fs) = 35344d834aba89ce14574026bdc0c3648c4bed0d
+SHA512 (NetBSD-6.0/x68k/installation/floppy/sysinst2.fs) = 59d6206fafca21e1ad29ef12d869f7ad81855f0b1124625278db71dff739a76bc36da83a1bfa4ee920602a246f3f925e4c383ab8ad5455ae3cc19408347da8ed
+RMD160 (NetBSD-6.0/x68k/installation/floppy/sysinst2.fs) = ee5f34edcf9ae13406c1db031b9d99cf2e485c4f
+MD5 (NetBSD-6.0/x68k/installation/floppy/sysinst2.fs) = c5cf691f0b3380cfa9ed93158a0598a2
+SHA1 (NetBSD-6.0/x68k/installation/misc/gz124x5f.lzh) = 50ef2f563b410530f5f52a857705848973a870a4
+SHA512 (NetBSD-6.0/x68k/installation/misc/gz124x5f.lzh) = 7df17f64a217eaba1374a2833326824d43acbe84a8e47e558ec805053fb3d93e07619d5c89287951eb7e6961068aa8e534f74b7da87106d3c0f306bf5191acbe
+RMD160 (NetBSD-6.0/x68k/installation/misc/gz124x5f.lzh) = 2ebf89a1a5ee6564bbd9bdcb5a8d2716f4bc121d
+MD5 (NetBSD-6.0/x68k/installation/misc/gz124x5f.lzh) = e27b76e450d506e3cd555f8ae3a99e61
+SHA1 (NetBSD-6.0/x68k/installation/misc/gzip.x) = 639b9edf903ccc07259e146ac141cc8c102bab95
+SHA512 (NetBSD-6.0/x68k/installation/misc/gzip.x) = cac2274fa0b5e1ac2ef978b8a09c001cf3e3acdeaf7131e93677b4fb13d56412bcfee86fe886758866d6daffb67f54dd6fa4c2796bda49ca0e59e4d3a113e7d6
+RMD160 (NetBSD-6.0/x68k/installation/misc/gzip.x) = 7c431086e8719f5e48c9d698808a1ae74a78b2d1
+MD5 (NetBSD-6.0/x68k/installation/misc/gzip.x) = 69fb6553b4cf7d3825b53c8d7bf5a865
+SHA1 (NetBSD-6.0/x68k/installation/misc/loadbsd.0) = 45a858903634d838d7525fff2db12467195ce1d5
+SHA512 (NetBSD-6.0/x68k/installation/misc/loadbsd.0) = 7c67ae6947fb128acfe72dab897edc0d8cb4c8e82b1886337ed07b5d031e0e550ff791b470f0276ef0fb920b4d6eefdc574efec0dc04116b05b510684ad8044d
+RMD160 (NetBSD-6.0/x68k/installation/misc/loadbsd.0) = 4b30a14f171cf026efa10f44dd0357cc2db91d17
+MD5 (NetBSD-6.0/x68k/installation/misc/loadbsd.0) = 25b2b8aa6efadacb72cf96f497a38d5a
+SHA1 (NetBSD-6.0/x68k/installation/misc/loadbsd.html) = 9cd27c39d6fa54fc2c534e4e6dfb30f86764ea49
+SHA512 (NetBSD-6.0/x68k/installation/misc/loadbsd.html) = 71544bd6ce6c3139654cd55ec1ed293fee603e733fb2cde6574ace66df4ee8450182cf890c4519313ac74bc0d43919340cf277c329e6b7a66734aa33d6465593
+RMD160 (NetBSD-6.0/x68k/installation/misc/loadbsd.html) = d43cd8e0a08f11a2bdd4fcf2d8489761a8dfd629
+MD5 (NetBSD-6.0/x68k/installation/misc/loadbsd.html) = 3228e40e5e967fb87b75ee462388f92a
+SHA1 (NetBSD-6.0/x68k/installation/misc/loadbsd.x) = 9ecad059bb18bfc8fb33c165f63a15770326d3bf
+SHA512 (NetBSD-6.0/x68k/installation/misc/loadbsd.x) = 7ed4df332f2e65e5db31f95bc7635f2ea1f5b638727509ff16ee7a531a0006addf16f1da4eceb727d4148dcad8686b3dc960760d289f361fbdb2177e1089032f
+RMD160 (NetBSD-6.0/x68k/installation/misc/loadbsd.x) = ead03264a128cab57ebeb615b42e3688b5641f80
+MD5 (NetBSD-6.0/x68k/installation/misc/loadbsd.x) = 4b9bcac67fd51cd5bf95911a5431b49a
+SHA1 (NetBSD-6.0/x68k/installation/misc/rawrite.doc) = e2cab55990a4835524655fbaf2ade5d9eee29c17
+SHA512 (NetBSD-6.0/x68k/installation/misc/rawrite.doc) = d9df8ac2fe18ff8cc13ad62af9107e821c40ca41cd0ae6d3cd0dd1c55351f8b0f7bb2cdd7f0917a16738d11e0230c0ec233f2297b8603f3a619ef99b0eb1ed9a
+RMD160 (NetBSD-6.0/x68k/installation/misc/rawrite.doc) = ada5298cb0d2df6d1833f32ff21cc97244376748
+MD5 (NetBSD-6.0/x68k/installation/misc/rawrite.doc) = 53481a27e630ca1b583cd953d24d13ca
+SHA1 (NetBSD-6.0/x68k/installation/misc/rawrite.lzh) = 575e26ad9625ca21e5f3aad4c32fbbe01312c97f
+SHA512 (NetBSD-6.0/x68k/installation/misc/rawrite.lzh) = 36104c3fcd87dbedc2421541f14f54151087348f45f69508e5916c3570915f0b0fc355b3c075e4c1cc3907094abe87e14c85ff333e0064403c8230d93719ea0a
+RMD160 (NetBSD-6.0/x68k/installation/misc/rawrite.lzh) = 4c0538916a9ca007aa9ba66ea42c6c46a4c563f2
+MD5 (NetBSD-6.0/x68k/installation/misc/rawrite.lzh) = c15b00572229133bf9505876ea120a31
+SHA1 (NetBSD-6.0/x68k/installation/misc/rawrite.x) = 30e3d4504bfbf7c55a77a19435d75bb1069ed596
+SHA512 (NetBSD-6.0/x68k/installation/misc/rawrite.x) = 06d706b3581dc972d282ef9a6d254740b721a43d5f9c6325af7fb3d1fc8402071887b0ca99c720c5d02c8edcab6086b819faa69640ba4463c1713b168d432059
+RMD160 (NetBSD-6.0/x68k/installation/misc/rawrite.x) = 844aa4ab7dbef030c140e543475f24fc60f0a075
+MD5 (NetBSD-6.0/x68k/installation/misc/rawrite.x) = 6efe87d85560d8d6e3eec7a7b9d1545a
+SHA1 (NetBSD-6.0/x68k/INSTALL.html) = 5ef0d8d03b7f3f600444752d3763c17000da1e3b
+SHA512 (NetBSD-6.0/x68k/INSTALL.html) = 94181608314a1dcc1fa0c634060b28ce229883affc9f64c33d9eeae09b21f9f88149deff8d84a7f64b6b5e7cfb741b6c43d9ccdd2ccdd4c9d6e043f22452adb5
+RMD160 (NetBSD-6.0/x68k/INSTALL.html) = a5e8a1d8e28859a3e08b662d2363d758baf23eac
+MD5 (NetBSD-6.0/x68k/INSTALL.html) = c7154e6e818d1490ce1dbc392bb8207e
+SHA1 (NetBSD-6.0/x68k/INSTALL.more) = 9771b22f8b8b9a5a3ad2aead71a06bccd63caae8
+SHA512 (NetBSD-6.0/x68k/INSTALL.more) = 4f3561d62f5d3a6f1f936d476d783dca2d4caaa50e21d8571ac795a8f3a06ad10f490d02b05ae8e51ed3e6eeb7aba645215339632aa61c99b93c4c4b37ee5329
+RMD160 (NetBSD-6.0/x68k/INSTALL.more) = a8994368a67cb7bd6df0232815e6c21a1a69537b
+MD5 (NetBSD-6.0/x68k/INSTALL.more) = 13d4f52ad2a72fc92e24c1467463be66
+SHA1 (NetBSD-6.0/x68k/INSTALL.ps) = 3dfb26b142ddfa2771a49a371bcbf72cacd74f7c
+SHA512 (NetBSD-6.0/x68k/INSTALL.ps) = bc12356b462b30559d05d0ce0ccc73f07fda3f5575121bf2911db6c638375416e4a79364f7727ea1adef19ed2679e86600c960585e9ef7899ed583d630655b20
+RMD160 (NetBSD-6.0/x68k/INSTALL.ps) = f46789b092425a148d38cae66d987253e12efecd
+MD5 (NetBSD-6.0/x68k/INSTALL.ps) = 34b1b9c1a6ef25bb677408f0a869ed52
+SHA1 (NetBSD-6.0/x68k/INSTALL.txt) = 7371dc6f22eece4157c00dfb01f59a035f305da6
+SHA512 (NetBSD-6.0/x68k/INSTALL.txt) = 600911e35b9c641ee4315452cc4b534e844695af852328eec243632f462b0685acad59f35588c46d5c083f745ea5c1ab1df32e8e4f2307409dc5dd8cdafe110c
+RMD160 (NetBSD-6.0/x68k/INSTALL.txt) = 8f3c307f17b591859a241414a6a0f33f592e811a
+MD5 (NetBSD-6.0/x68k/INSTALL.txt) = 6bd22ee53bf58cae2454a2f8627718f9
+SHA1 (NetBSD-6.0/zaurus/binary/kernel/netbsd-GENERIC.gz) = 7f4cbcd7d5390357b1873da969b0a7cca60e73c1
+SHA512 (NetBSD-6.0/zaurus/binary/kernel/netbsd-GENERIC.gz) = 0c552ce725209b5686341ac0101cb7969a5a43ab8ba5d1b9a540fa07979e93921acfca844622ee00f5be4d3b06598ef4750772767b72b754e5cae22735ec24e1
+RMD160 (NetBSD-6.0/zaurus/binary/kernel/netbsd-GENERIC.gz) = 2ba59423e410d54f3a829f2ce9e5bcbd43b5b840
+MD5 (NetBSD-6.0/zaurus/binary/kernel/netbsd-GENERIC.gz) = 4cd87eddf3285a67e0f463d4896db002
+SHA1 (NetBSD-6.0/zaurus/binary/kernel/netbsd-C700.gz) = 01cc33fb982cd5f2b188d4688147750a94863fe2
+SHA512 (NetBSD-6.0/zaurus/binary/kernel/netbsd-C700.gz) = ceac21a76cc922a67cbf4d8cc83f471015d36d0896efabbf232ebec9217a3d56f8cea43f3e1c22bc527b32be5179898822807a041ef418e3fd6ff942d09dbac7
+RMD160 (NetBSD-6.0/zaurus/binary/kernel/netbsd-C700.gz) = 781cc21ea042587fe9f4c0fe9305ae159f5a15e5
+MD5 (NetBSD-6.0/zaurus/binary/kernel/netbsd-C700.gz) = 95bcd094f576b6f49e7a1bdbb5048a13
+SHA1 (NetBSD-6.0/zaurus/binary/sets/games.tgz) = e1d2bb091d8202962133475bc83edb55230b9008
+SHA512 (NetBSD-6.0/zaurus/binary/sets/games.tgz) = a147fe6d0419d53d5a428802d0bb6c9fa8a84a76c96d7d6d7c0d399e5af3a69240116463549a83d53387b0214ba0207796d7c10228d92a684fe7ff0ece3aec16
+RMD160 (NetBSD-6.0/zaurus/binary/sets/games.tgz) = 2be515c495548ba5135ff42a75a8ebbfc35ea776
+MD5 (NetBSD-6.0/zaurus/binary/sets/games.tgz) = 9059a6f2cd41cb58827709c9e9a1649b
+SHA1 (NetBSD-6.0/zaurus/binary/sets/man.tgz) = 899b9d8242e983a5110ab755651c24f709b5af67
+SHA512 (NetBSD-6.0/zaurus/binary/sets/man.tgz) = 410999db110d710f4bb498c3d7ae7adc62170c7c2f470ce189c92f6c436c5ea96149659c631ef0b5605caaa025d97dfe1c07c428d86f51239657bd6b71717b15
+RMD160 (NetBSD-6.0/zaurus/binary/sets/man.tgz) = c1270f68c6d41b351877f71f0396ac34877dfc8d
+MD5 (NetBSD-6.0/zaurus/binary/sets/man.tgz) = df4db2bbfa39ef6a4a215d949653d04a
+SHA1 (NetBSD-6.0/zaurus/binary/sets/misc.tgz) = 982918d46b2da2693dded747147baed27160d325
+SHA512 (NetBSD-6.0/zaurus/binary/sets/misc.tgz) = 54a45fa2bf5c57e3b63e23a95b6ca74f3b8e6b8f655715663ec5f83f713a9c6149b8b1ccc298dfa2eff9e81376f9f64107b35841cbd20ee62be6575539e01c81
+RMD160 (NetBSD-6.0/zaurus/binary/sets/misc.tgz) = 9c9161a1e855276c6aa3fe61de655dbea3ec9a43
+MD5 (NetBSD-6.0/zaurus/binary/sets/misc.tgz) = 7b0005d0512287e8a34e24c043582fb8
+SHA1 (NetBSD-6.0/zaurus/binary/sets/xcomp.tgz) = 8d7469a85b7433c89690cce74e6b3f4e66cf0647
+SHA512 (NetBSD-6.0/zaurus/binary/sets/xcomp.tgz) = 411304cf66e300a7f162128203099bb4d6eebc4a93ba18ed7caf79f30b31cc7ffcede85c4e1bad02c3f5f8a27d009fb71f3ce5862c1d8aa477f39a25c535fdaa
+RMD160 (NetBSD-6.0/zaurus/binary/sets/xcomp.tgz) = 822d26e0ee08b72ca8b991f0709a8c1bf0399208
+MD5 (NetBSD-6.0/zaurus/binary/sets/xcomp.tgz) = 5af361f0334d28119d703064278b3ed3
+SHA1 (NetBSD-6.0/zaurus/binary/sets/xetc.tgz) = 222d14c205f1018cc5a86eb03214d18cda2abb82
+SHA512 (NetBSD-6.0/zaurus/binary/sets/xetc.tgz) = fb82261996aa772fd8a9022eadebf899ee04ee70229ee4fe07758ca14937bdb34752c8218eb4c5b722b6208f719891493bbc141372fcfa503de83e0a61aa7387
+RMD160 (NetBSD-6.0/zaurus/binary/sets/xetc.tgz) = 511ebfe5076f361b7f7ca03a265d16052a16d259
+MD5 (NetBSD-6.0/zaurus/binary/sets/xetc.tgz) = 165cffbb6d2c79663198d80c82afac1e
+SHA1 (NetBSD-6.0/zaurus/binary/sets/xfont.tgz) = ce0e141beeffeb5b470478e9887e4127da85de3c
+SHA512 (NetBSD-6.0/zaurus/binary/sets/xfont.tgz) = 5d98354ff77103793d56af3192ab5f9afcde62208791976064ac33a149f994e0227dd5dd28ed544eeac5ea504e5212d5fb9e7d05e59e5a48a2fe4062e34e3106
+RMD160 (NetBSD-6.0/zaurus/binary/sets/xfont.tgz) = 4d09f5e82fec875ef0ea328809465e7a98f2ebfc
+MD5 (NetBSD-6.0/zaurus/binary/sets/xfont.tgz) = be26b3890261302420b09976a1d38144
+SHA1 (NetBSD-6.0/zaurus/binary/sets/kern-C700.tgz) = 645cc6b6c3250ead1e2e121bcc179be2e9056b65
+SHA512 (NetBSD-6.0/zaurus/binary/sets/kern-C700.tgz) = 833883cb8aada6c391917ec890282011d2cfa6c5068d9483ab1b8c9b74361baa093b1c6b074dd5cd89709eb67636cbba1a6be292c23b28b8ff7578194c427263
+RMD160 (NetBSD-6.0/zaurus/binary/sets/kern-C700.tgz) = 0867bac200dd8bd12d1c4d225d392a175e06f24a
+MD5 (NetBSD-6.0/zaurus/binary/sets/kern-C700.tgz) = d1c5388985d5693d492ec75713ef3ccd
+SHA1 (NetBSD-6.0/zaurus/binary/sets/base.tgz) = fcee164dc5d4cd72f3c9841b7c7fbe295c4b3e6a
+SHA512 (NetBSD-6.0/zaurus/binary/sets/base.tgz) = 910606c4dedf523e5db213165fd5a244a655a40a7c4686e7a8e80f015d8ca496a1770b1a94532e118ad7cb4d2f4cfd0abb4e07560e0507275b4a27fefa3fb8af
+RMD160 (NetBSD-6.0/zaurus/binary/sets/base.tgz) = c1f5fb6f7b18486f08cacbf1ea6cef5d852a3b4d
+MD5 (NetBSD-6.0/zaurus/binary/sets/base.tgz) = e646c1da6b4ca9c38607d97cbbb6871a
+SHA1 (NetBSD-6.0/zaurus/binary/sets/comp.tgz) = 9af4ccb1edd8eea77f32d50aad4592c483bc41bc
+SHA512 (NetBSD-6.0/zaurus/binary/sets/comp.tgz) = b3eecf648f57fcc3af7ed707bf7f584db4aff71b7755986652e80e2a11e83b7a663263800f143d4dfe668bff0dd606f7733f1ae36be132f70c888a45e210d14c
+RMD160 (NetBSD-6.0/zaurus/binary/sets/comp.tgz) = ef64fdf6c3e118e4aab5264d457278d625408275
+MD5 (NetBSD-6.0/zaurus/binary/sets/comp.tgz) = c22150f0e6684dc1d64fef0abf882dec
+SHA1 (NetBSD-6.0/zaurus/binary/sets/etc.tgz) = 04a520449ff803fefaf80b0beaee929122d9a5bd
+SHA512 (NetBSD-6.0/zaurus/binary/sets/etc.tgz) = a109dffb85cd44758b30a9fd7b5eeb0e68b43babb96984974662ede674c4e4b06cddfdb84fd4377cdcf66944506547585f2e4e1fde1dd2c6ba0c823fec5af6e7
+RMD160 (NetBSD-6.0/zaurus/binary/sets/etc.tgz) = 1412ce7fbadb5bc2a7ea54662dc5af065a52fd06
+MD5 (NetBSD-6.0/zaurus/binary/sets/etc.tgz) = fdcf4276a2adc8bc6b8899a0f92827b2
+SHA1 (NetBSD-6.0/zaurus/binary/sets/kern-GENERIC.tgz) = 5a4db67f97cbf15dfa86f3d1bdd1e0fbf45cf2c3
+SHA512 (NetBSD-6.0/zaurus/binary/sets/kern-GENERIC.tgz) = d47f1b328c845abe0a131e5fec333a5badbbde60e1abb1c2a01032128350ae33a69df720f9a5a944e93a9c29e04b669f530d7d4b803d9262edef1ce8953099d9
+RMD160 (NetBSD-6.0/zaurus/binary/sets/kern-GENERIC.tgz) = 57cc4468fe4f292c4798dcaf7c7ee8b6a79c72cd
+MD5 (NetBSD-6.0/zaurus/binary/sets/kern-GENERIC.tgz) = 7b6a87debe65e4d987181b2a600a0cc9
+SHA1 (NetBSD-6.0/zaurus/binary/sets/modules.tgz) = 97cf73286143f2ee9d1d75d291226b14382bc3e9
+SHA512 (NetBSD-6.0/zaurus/binary/sets/modules.tgz) = 819d952342aedefae4120c8b0f3aa362089528ea9a604479b4242154b52e76688353386c6c6fe7f675086997459a1038f74037840642d4d522145be09d13b01c
+RMD160 (NetBSD-6.0/zaurus/binary/sets/modules.tgz) = 1c5ade56f427ccb12d516da4b60266496a0dbe7f
+MD5 (NetBSD-6.0/zaurus/binary/sets/modules.tgz) = fdf54f31acaaf41ae7e04155dc2ed8e3
+SHA1 (NetBSD-6.0/zaurus/binary/sets/tests.tgz) = d267f0e6d994c769d85698d5fe84dc84d3eb0aea
+SHA512 (NetBSD-6.0/zaurus/binary/sets/tests.tgz) = 400bcfd917639182daf83eddf20aa476be42285c8c5fdeb187b5086c7c00b0ebf2a0aa7badb7f4e1e43e70f43c46972003a4e6b4dd95eb5b7d621e2f8a562623
+RMD160 (NetBSD-6.0/zaurus/binary/sets/tests.tgz) = b8578e18377c21e4f0bc5509eddaacca4e439849
+MD5 (NetBSD-6.0/zaurus/binary/sets/tests.tgz) = ae201c948e67c3c74b0f5f89dde362ce
+SHA1 (NetBSD-6.0/zaurus/binary/sets/text.tgz) = 3467c94a0c6bcd54efe8849c282fa26f9f02624a
+SHA512 (NetBSD-6.0/zaurus/binary/sets/text.tgz) = 0f24772a93aa15de7b2a40e237ea5efeb0f701a6c3645b7add0e478bfcfb3d3050a74d80b1328eb821591ee0464e051572f2afa6bb2935d34ae369809546cf65
+RMD160 (NetBSD-6.0/zaurus/binary/sets/text.tgz) = 6acb227a392a29ef30d17e861ec681c56da75790
+MD5 (NetBSD-6.0/zaurus/binary/sets/text.tgz) = b4ed717b1487f24bf1768305e0c0065d
+SHA1 (NetBSD-6.0/zaurus/binary/sets/xbase.tgz) = 8b5a46ee79d9bffd6d6eb0af06ff3928029b7a92
+SHA512 (NetBSD-6.0/zaurus/binary/sets/xbase.tgz) = c675ab7e92391becf93b9894115e5149b1ef4b4cb9b2f41a58a12c0009c8c1999de4aa8e239f82308c5892accac5cbbe0a3d380f30134bec29b433a5357d1cfc
+RMD160 (NetBSD-6.0/zaurus/binary/sets/xbase.tgz) = 81d52af994bb130ce57e83468b7ce350f107f3bd
+MD5 (NetBSD-6.0/zaurus/binary/sets/xbase.tgz) = 02cd86601f44cd4ba11e466236b04e1d
+SHA1 (NetBSD-6.0/zaurus/binary/sets/xserver.tgz) = e293d1143593154074951807e155c8e87adff50a
+SHA512 (NetBSD-6.0/zaurus/binary/sets/xserver.tgz) = 060d8e60ec568aebafef85ab34b527dafe11516ef5761598e2ba79e5e7994cd4f710812e857fd20bb1e09b0df5692ef1e10949273027c66ce2255e2b15f78132
+RMD160 (NetBSD-6.0/zaurus/binary/sets/xserver.tgz) = 8ea704c20eb2aafb79603904423f7e137136ef4e
+MD5 (NetBSD-6.0/zaurus/binary/sets/xserver.tgz) = f8d5d948e6ccb12094636c6d4106f895
+SHA1 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL_C700) = 08e381ea42ccb632460555771fd7fe6bae057a24
+SHA512 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL_C700) = de5d9f71284b987f67077a0fcf2273d11418b73108ada25e4807614752eea38d58b8d32c53e86293a0492d05a842e81f44e5e5e5bdf3f0ca76e440263becd5ff
+RMD160 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL_C700) = 91c741493cd043610e542d01a4cde6ed30469be3
+MD5 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL_C700) = 5544b1f0b4a87402fc0fc5951aa303ae
+SHA1 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL) = a54eadb65290c45af5e6ae4d0cb0b803640fa2b0
+SHA512 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL) = e78fc99a17c732908af345a40f102ae8eef248f4c5c3a4fad85a8e9d497346f86b65096e816aba26975a71780672040c148f40fc4879cf0b6f5d5ec7f6aa34af
+RMD160 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL) = e0bde1431f7c4b3f649b2721c0c38f02ad273bc3
+MD5 (NetBSD-6.0/zaurus/installation/kernel/netbsd-INSTALL) = 02bd814abd9951fec27c269ddefb6346
+SHA1 (NetBSD-6.0/zaurus/installation/zbsdmod.o) = 6f5a55fa2497fac0ae75f20df2074eaedde0aa0c
+SHA512 (NetBSD-6.0/zaurus/installation/zbsdmod.o) = 46e48ce8f3e637b5e708a066847e2f7449c8134f8f8d327e3ace9116cae4fc7b77aeee136cb797e00000277c4d224dcb10d946aff983be3292690580ba666b8b
+RMD160 (NetBSD-6.0/zaurus/installation/zbsdmod.o) = b96bdc9f3009ddb56d5b4b05e01e2cc3862a9e11
+MD5 (NetBSD-6.0/zaurus/installation/zbsdmod.o) = 49e746ab92af22b281d4c15eecf85c10
+SHA1 (NetBSD-6.0/zaurus/installation/zboot) = 142512f9c4e5a1a3762dc5b96416392a19fba367
+SHA512 (NetBSD-6.0/zaurus/installation/zboot) = 30520adab63612d4cf76919b21d2262235d3e2996c5a308f050e480acee5f544aad94993e53cd1e7490ef054b2fecfab7db0483ca1f9c045287debeedd84300e
+RMD160 (NetBSD-6.0/zaurus/installation/zboot) = ebd6148f2ed15ea48fd7a2f2a273136661287134
+MD5 (NetBSD-6.0/zaurus/installation/zboot) = da83febbb31821d4b68c07a9c9487946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (NetBSD)
+
+iQIcBAEBAgAGBQJQfDnGAAoJEAZJc6xMSnBuq9AP/1n7mninneKOiCjD5RTtdS96
+sjxa7DbX1xd8ZIL+klchZurlqqKeBdk63gALDo6VpAsSbNH45R0Ib9rzvJiwSkRK
+7PHPqijtxgACFV4UclrUXWts+Px6AS8QxMfuLgRwu0KETYMnuR8Ghp9YD6xIGqaw
+kG5Pfnqs2qWi9Q/70uTlmJgl3iEj/KStdDyxcmH2VlejtAGxJxqVVwQ6XpAu5z1Z
+OVMmoZoReFeDiTZAydf0VzvwyfmHuPvXKfO8Z+PhkFboAUfuIKIO8DfljQ7A5OBp
+oEEK1nnjeac59KWPAvI4IbXfVuC1o2rEYmLHz9vBxHKiPf9SxL4XjNbZozejXsMD
+h1NWWt4q6nD4nGQaOPyR4afN0ZWluC+6cASQ+Srmr/0QJbsBwgtXuKza2vwNs0iC
+IF80PL1iPjDPmf1CQnOZqJktUfv4aeAcwNs8oiq+toIlgOkIwCzFQFjflny9pRKp
+/YOxwFY8izCb6pu0/3LM2CSutwDEkR7I6aAn65BFW0ia6Ty5azf9iIFOAIbzefkH
+AP1CJKn36vgtcny/R9KueIw/50Hok2rrFrDqzC8mMq5j3Pletm/4equmVu27e+uc
+0jTiNwCHb6ZvuoO7d1clrIEEJPEXe66Xcmj9iJzo+Ai1nhCj1BDNZnj9zHbIwPIQ
+6yQgxCHP9Ney/0j1V+sF
+=nHXc
+-----END PGP SIGNATURE-----
+EOF
+	cat > expected16 << EOF
+Good signature for b.gpg made Mon Sep 10 00:15:38 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected17 <<EOF
+Good signature for a.gpg made Sun Sep  9 17:44:11 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected18 <<EOF
+Good signature for gpgsigned-a.gpg made Sun Sep  9 17:43:01 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected19 <<EOF
+Good signature for NetBSD-6.0_RC2_hashes.asc made Wed Sep 19 07:53:18 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected20 <<EOF
+1. tag & 0x3f
+2. len
+
+one pass (tag 4)
+========
+b version:3
+b sig type
+b hash alg
+b pubkey alg
+8b keyid
+
+literal data (tag 11)
+=============
+b binary/text
+b length
+c string
+L mtime
+text
+EOF
+	cat >expected21 <<EOF
+Good signature for [stdin] made Sun Sep  9 17:44:11 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected22 <<EOF
+Good signature for [stdin] made Sun Sep 30 10:50:20 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected23 <<EOF
+Good signature for [stdin] made Wed Sep 19 07:53:18 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected24 <<EOF
+Good signature for [stdin] made Mon Sep 10 00:15:38 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected25 <<EOF
+Good signature for NetBSD-6.0_RC1_hashes.gpg made Tue Oct 16 08:12:16 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected26 <<EOF
+Good signature for [stdin] made Tue Oct 16 08:12:16 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected27 <<EOF
+Good signature for [stdin] made Mon Oct 15 09:28:54 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected28 <<EOF
+Good signature for NetBSD-6.0_hashes.asc made Mon Oct 15 09:28:54 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected29 <<EOF
+Good signature for NetBSD-6.0_RC1_hashes_ascii.gpg made Sun Sep  9 17:41:24 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	cat >expected30 <<EOF
+Good signature for [stdin] made Sun Sep  9 17:41:24 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	uudecode <<EOF
+begin-base64 644 expected31
+UFJPRz1wClNSQ1M9cGFyc2UuYwpXQVJOUz01Ck1LTUFOPW5vCkNQUEZMQUdTKz0t
+ZyAtTzAKTERGTEFHUys9LWcgLU8wCgouaW5jbHVkZSA8YnNkLnByb2cubWs+Cgp0
+OiAke1BST0d9CgkuLyR7UFJPR30gZ3Bnc2lnbmVkLWEuZ3BnClBST0c9cApTUkNT
+PXBhcnNlLmMKV0FSTlM9NQpNS01BTj1ubwpDUFBGTEFHUys9LWcgLU8wCkxERkxB
+R1MrPS1nIC1PMAoKLmluY2x1ZGUgPGJzZC5wcm9nLm1rPgoKdDogJHtQUk9HfQoJ
+Li8ke1BST0d9IGdwZ3NpZ25lZC1hLmdwZwpQUk9HPXAKU1JDUz1wYXJzZS5jCldB
+Uk5TPTUKTUtNQU49bm8KQ1BQRkxBR1MrPS1nIC1PMApMREZMQUdTKz0tZyAtTzAK
+Ci5pbmNsdWRlIDxic2QucHJvZy5taz4KCnQ6ICR7UFJPR30KCS4vJHtQUk9HfSBn
+cGdzaWduZWQtYS5ncGcK
+====
+EOF
+	cat >expected32 <<EOF
+Good signature for b.gpg made Mon Sep 10 00:15:38 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+Good signature for b.gpg made Mon Sep 10 00:15:38 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+Good signature for b.gpg made Mon Sep 10 00:15:38 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	uudecode <<EOF
+begin-base64 644 expected33
+UFJPRz1wClNSQ1M9cGFyc2UuYwpXQVJOUz01Ck1LTUFOPW5vCkNQUEZMQUdTKz0t
+ZyAtTzAKTERGTEFHUys9LWcgLU8wCgouaW5jbHVkZSA8YnNkLnByb2cubWs+Cgp0
+OiAke1BST0d9CgkuLyR7UFJPR30gZ3Bnc2lnbmVkLWEuZ3BnCjEuIHRhZyAmIDB4
+M2YKMi4gbGVuCgpvbmUgcGFzcyAodGFnIDQpCj09PT09PT09CmIgdmVyc2lvbjoz
+CmIgc2lnIHR5cGUKYiBoYXNoIGFsZwpiIHB1YmtleSBhbGcKOGIga2V5aWQKCmxp
+dGVyYWwgZGF0YSAodGFnIDExKQo9PT09PT09PT09PT09CmIgYmluYXJ5L3RleHQK
+YiBsZW5ndGgKYyBzdHJpbmcKTCBtdGltZQp0ZXh0ClBST0c9cApTUkNTPXBhcnNl
+LmMKV0FSTlM9NQpNS01BTj1ubwpDUFBGTEFHUys9LWcgLU8wCkxERkxBR1MrPS1n
+IC1PMAoKLmluY2x1ZGUgPGJzZC5wcm9nLm1rPgoKdDogJHtQUk9HfQoJLi8ke1BS
+T0d9IGdwZ3NpZ25lZC1hLmdwZwo=
+====
+EOF
+	cat >expected34 <<EOF
+Good signature for det.sig made Thu Oct 18 02:12:33 2012
+signature  2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12
+fingerprint:  d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 
+uid              Alistair Crooks <agc@alistaircrooks.com>
+uid              Alistair Crooks <agc@pkgsrc.org>
+uid              Alistair Crooks <agc@netbsd.org>
+uid              Alistair Crooks <agc@netflix.com>
+encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12
+fingerprint:  57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 
+
+EOF
+	cat >expected35 <<EOF
+To Do
+=====
+tests with -k sig
+detached sigs
+DSA
+
+Done
+====
+basics
+localise pgp_read_packets
+fix lint
+WARNS=5
+lib man page
+prog man page
+do we do it statically linked as well?
+multiple files in netpgpverify
+EOF
+	atf_check -s eq:0 -o file:expected16 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg -c verify b.gpg
+	#atf_check -s eq:0 -o file:expected17 -e empty netpgpverify -c verify a.gpg
+	#atf_check -s eq:0 -o file:expected18 -e empty netpgpverify -c verify gpgsigned-a.gpg
+	#atf_check -s eq:0 -o file:expected19 -e empty netpgpverify -c verify NetBSD-6.0_RC2_hashes.asc
+	atf_check -s eq:0 -o file:expected20 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg -c cat jj.asc
+	#atf_check -s eq:0 -o file:expected21 -e empty netpgpverify < a.gpg
+	atf_check -s eq:0 -o file:expected22 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg < jj.asc
+	#atf_check -s eq:0 -o file:expected23 -e empty netpgpverify < NetBSD-6.0_RC2_hashes.asc
+	atf_check -s eq:0 -o file:expected24 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg < b.gpg
+	#atf_check -s eq:0 -o file:expected25 -e empty netpgpverify NetBSD-6.0_RC1_hashes.gpg
+	#atf_check -s eq:0 -o file:expected26 -e empty netpgpverify < NetBSD-6.0_RC1_hashes.gpg
+	atf_check -s eq:0 -o file:expected27 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg < NetBSD-6.0_hashes.asc
+	atf_check -s eq:0 -o file:expected28 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg NetBSD-6.0_hashes.asc
+	#atf_check -s eq:0 -o file:expected29 -e empty netpgpverify NetBSD-6.0_RC1_hashes_ascii.gpg
+	#atf_check -s eq:0 -o file:expected30 -e empty netpgpverify < NetBSD-6.0_RC1_hashes_ascii.gpg
+	atf_check -s eq:0 -o file:expected31 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg -c cat b.gpg b.gpg b.gpg
+	atf_check -s eq:0 -o file:expected32 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg b.gpg b.gpg b.gpg
+	atf_check -s eq:0 -o file:expected33 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg -c cat b.gpg jj.asc b.gpg
+	atf_check -s eq:0 -o file:expected34 -e empty env TZ=US/Pacific netpgpverify -k pubring.gpg det.sig
+	atf_check -s eq:0 -o file:expected35 -e empty env TZ=US/Pacific netpgpverify -c cat -k pubring.gpg det.sig
+	#atf_check -s eq:0 -o file:expected46 -e empty netpgpverify -k problem-pubring.gpg NetBSD-6.0_hashes.asc
+
+}
+
+atf_test_case netpgpverify_dsa
+netpgpverify_dsa_head() {
+    atf_set "descr" "DSA signatures for netpgpverify"
+}
+netpgpverify_dsa_body() {
+	uudecode << EOF
+begin-base64 600 dsa-pubring.gpg
+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
+OTZKjAvuLXkOVnawAgAD
+====
+EOF
+	uudecode << EOF
+begin-base64 644 in1.gpg
+owGbwMvMwCGoZv+8NenRnzrGNY1JzJl5hgGthk+VOfX8Ukucgl2sFHwTs1PTMnNS
+dcoUDPVM9QwN9AwVjAwMjfQNTPUNzBQMLawMTawMzRQS05MVXCsKFPS4uIJDnVw8
+g7RtOXMykxT0wh09QxBCSZl5XFx6mXnJOaUpqQo2ScUpesWlSSmZRXq52XZcHXEs
+DIIcDGysTCBXMHBxCsBct0iSkWHa0k9iZ5i+mtQ43zvsb7nA9sWeSrvwubEbQw0P
+MNe3Vuky/C+59v/fFbGv5ofnzRSY/ld6vkfIxCtxoVEnvHZVrZeeb60BAA==
+====
+EOF
+	cat > in1.asc << EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp .
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (NetBSD)
+
+iF4EAREIAAYFAlCFMdYACgkQJj/nhWLi/H7CkQEAgDQrFwPD76JC+6FnOKEz/9DP
+H7WjRRMoIQNTGC3ZXRsA/1xah8eFePQDmTO1sQGnINbgX9vZ7GAFOgTjW7+tVb7H
+=wtKb
+-----END PGP SIGNATURE-----
+EOF
+	uudecode << EOF
+begin-base64 644 in2.gpg
+owGbwMvMwCGoZv+8NenRnzrGNU1JzJl5RgGtHj+VOfX8Ukucgl2sFHwTs1PTMnNS
+dcoUDPVM9QwN9AwVjAwMjfQNTPUNzBQMLawMTawMzRQS05MVXCsKFPQUuLiCQ51c
+PIO0bTlzMpMU9MIdPUMQQkmZeVxcepl5yTmlKakKNknFKXrFpUkpmUV6udl2XB1x
+LAyCHAxsrEwgZzBwcQrAnFfzjeGv9GtuvQj7X/Kv5IQ8f2s9n/36yaOmu9HPs8/V
+8pg+SdfaxMhwdEOjtLVOGtuaizmXnJ8oa4fN/bfL0WfP1smOn38vsLFlBQA=
+====
+EOF
+	cat > in2.asc << EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp . 
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (NetBSD)
+
+iF4EAREIAAYFAlCFSQoACgkQJj/nhWLi/H6aKAD9HCLTwY8CwiqTXrzKxHZ5lHQn
+qEZbcbXjkCxlk+m/PHUA/2Whlc0t5ZtmI221LQy5inTnzpu1U75E5lJvw0YMTdXJ
+=v788
+-----END PGP SIGNATURE-----
+EOF
+	cat > expected36 << EOF
+Good signature for in1.gpg made Mon Oct 22 04:45:41 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected37 <<EOF
+Good signature for [stdin] made Mon Oct 22 04:45:41 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected38 <<EOF
+Good signature for in1.asc made Mon Oct 22 04:45:26 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected39 <<EOF
+Good signature for [stdin] made Mon Oct 22 04:45:26 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected40 <<EOF
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp .
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+EOF
+	cat >expected41 <<EOF
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp .
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+EOF
+	cat >expected42 <<EOF
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp .
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+EOF
+	cat >expected43 <<EOF
+#	.NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp .
+
+SUBDIR+=	lib .WAIT
+SUBDIR+=	bin
+
+.include <bsd.subdir.mk>
+EOF
+	cat >expected44 <<EOF
+Good signature for in2.gpg made Mon Oct 22 06:24:09 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected45 <<EOF
+Good signature for in2.asc made Mon Oct 22 06:24:26 2012
+signature  2048/DSA 263fe78562e2fc7e 2012-10-21
+fingerprint:  d2e5 07b6 5d59 33d3 9c8d a618 263f e785 62e2 fc7e 
+uid              David Armstrong (Test DSA key - do not use) <dsa@dsa.com>
+encryption 2048/Elgamal (Encrypt Only) 53d1f21240f293c6 2012-10-21 [Expiry 2014-10-21]
+fingerprint:  6a83 d4aa 791f d8af a967 5e44 53d1 f212 40f2 93c6 
+
+EOF
+	cat >expected46 <<EOF
+Ignoring unusual/reserved signature subpacket 18
+Good signature for NetBSD-6.0_hashes.asc made Mon Oct 15 09:28:54 2012
+signature  4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23
+fingerprint:  ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e 
+uid              NetBSD Security Officer <security-officer@NetBSD.org>
+encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620 2009-06-23 [Expiry 2019-06-21]
+fingerprint:  1915 0801 fbd8 f45d 89f2 0205 9ff2 c24f df2c e620 
+
+EOF
+	atf_check -s eq:0 -o file:expected36 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg in1.gpg
+	atf_check -s eq:0 -o file:expected37 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg < in1.gpg
+	atf_check -s eq:0 -o file:expected38 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg in1.asc
+	atf_check -s eq:0 -o file:expected39 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg < in1.asc
+	atf_check -s eq:0 -o file:expected40 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg -c cat in1.gpg
+	atf_check -s eq:0 -o file:expected41 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg -c cat < in1.gpg
+	atf_check -s eq:0 -o file:expected42 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg -c cat in1.asc
+	atf_check -s eq:0 -o file:expected43 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg -c cat < in1.asc
+	atf_check -s eq:0 -o file:expected44 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg in2.gpg
+	atf_check -s eq:0 -o file:expected45 -e empty env TZ=US/Pacific netpgpverify -k dsa-pubring.gpg in2.asc
+}
+
+atf_init_test_cases() {
+    atf_add_test_case netpgpverify_rsa
+    atf_add_test_case netpgpverify_dsa
+}
diff --git a/contrib/netbsd-tests/usr.bin/pr/d_basic.in b/contrib/netbsd-tests/usr.bin/pr/d_basic.in
new file mode 100644
index 000000000000..4e36f6e5f6fb
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/pr/d_basic.in
@@ -0,0 +1,2 @@
+123 456 789
+abc def ghi
diff --git a/contrib/netbsd-tests/usr.bin/pr/d_basic.out b/contrib/netbsd-tests/usr.bin/pr/d_basic.out
new file mode 100644
index 000000000000..e187104a4764
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/pr/d_basic.out
@@ -0,0 +1 @@
+123 456 789			    abc def ghi
diff --git a/contrib/netbsd-tests/usr.bin/pr/t_basic.sh b/contrib/netbsd-tests/usr.bin/pr/t_basic.sh
new file mode 100755
index 000000000000..6bd80dd217f1
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/pr/t_basic.sh
@@ -0,0 +1,46 @@
+# $NetBSD: t_basic.sh,v 1.4 2012/03/13 05:40:00 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "A basic test of pr(1) (cf. PR bin/41880)"
+}
+
+basic_body() {
+
+	# The output file was generated with "pr (GNU coreutils) 6.10".
+	#
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_basic.out \
+		-x "pr -t -2 $(atf_get_srcdir)/d_basic.in"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case basic
+}
diff --git a/contrib/netbsd-tests/usr.bin/rump_server/t_disk.sh b/contrib/netbsd-tests/usr.bin/rump_server/t_disk.sh
new file mode 100755
index 000000000000..bf1e7e1b9952
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/rump_server/t_disk.sh
@@ -0,0 +1,130 @@
+#	$NetBSD: t_disk.sh,v 1.5 2013/02/19 21:08:25 joerg Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+server='rump_server -lrumpvfs'
+export RUMP_SERVER='unix://commsock'
+
+startsrv()
+{
+
+	atf_check -s exit:0 ${server} $@ ${RUMP_SERVER}
+}
+
+test_case()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  \
+		atf_set "require.progs" "rump_server" ; \
+	}"
+	eval "${name}_body() { \
+		${name}_prefun ; \
+		startsrv $@ ; \
+		${name} ; \
+	}"
+	eval "${name}_cleanup() { \
+		[ -f halted ] && return 0 ; rump.halt ;
+	}"
+}
+
+test_case size -d key=/img,hostpath=the.img,size=32k
+size()
+{
+	atf_check -s exit:0 -o inline:'32768\n' stat -f %z the.img
+}
+
+test_case offset -d key=/img,hostpath=the.img,size=32k,offset=16k
+offset()
+{
+	atf_check -s exit:0 -o inline:'49152\n' stat -f %z the.img
+}
+
+test_case notrunc -d key=/img,hostpath=the.img,size=8k,offset=16k
+notrunc_prefun()
+{
+	dd if=/dev/zero of=the.img bs=1 oseek=65535 count=1 
+}
+notrunc()
+{
+	atf_check -s exit:0 -o inline:'65536\n' stat -f %z the.img
+}
+
+test_case data -d key=/img,hostpath=the.img,size=8k,offset=16k
+data()
+{
+	echo 'test string' | dd of=testfile ibs=512 count=1 conv=sync
+	atf_check -s exit:0 -e ignore -x \
+	    "dd if=testfile | rump.dd of=/img bs=512 count=1"
+
+	# cheap fsync
+	atf_check -s exit:0 rump.halt
+	touch halted
+	atf_check -s exit:0 -e ignore -o file:testfile \
+	    dd if=the.img iseek=16k bs=1 count=512
+}
+
+test_case type_chr -d key=/img,hostpath=the.img,size=32k,type=chr
+type_chr()
+{
+	atf_check -s exit:0 -o inline:'Character Device\n' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so stat -f %HT /rump/img
+}
+
+test_case type_reg -d key=/img,hostpath=the.img,size=32k,type=reg
+type_reg()
+{
+	atf_check -s exit:0 -o inline:'Regular File\n' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so stat -f %HT /rump/img
+}
+
+test_case type_blk -d key=/img,hostpath=the.img,size=32k,type=blk
+type_blk()
+{
+	atf_check -s exit:0 -o inline:'Block Device\n' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so stat -f %HT /rump/img
+}
+
+test_case type_blk_default -d key=/img,hostpath=the.img,size=32k
+type_blk_default()
+{
+	atf_check -s exit:0 -o inline:'Block Device\n' \
+	    env LD_PRELOAD=/usr/lib/librumphijack.so stat -f %HT /rump/img
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case size
+	atf_add_test_case offset
+	atf_add_test_case notrunc
+	atf_add_test_case data
+	atf_add_test_case type_chr
+	atf_add_test_case type_reg
+	atf_add_test_case type_blk
+	atf_add_test_case type_blk_default
+}
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_dot.in b/contrib/netbsd-tests/usr.bin/sdiff/d_dot.in
new file mode 100644
index 000000000000..9c558e357c41
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_dot.in
@@ -0,0 +1 @@
+.
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_flags_l.out b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_l.out
new file mode 100644
index 000000000000..c7afce0d98bf
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_l.out
@@ -0,0 +1,102 @@
+Policy: /usr/bin/lynx, Emulation: native
+                                                                >     native-issetugid: permit
+                                                                >     native-mprotect: permit
+                                                                >     native-mmap: permit
+    native-__sysctl: permit
+                                                                >     native-fsread: filename eq "/var/run/ld.so.hints" then perm
+                                                                >     native-fstat: permit
+    native-close: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm |     native-fsread: filename match "/usr/lib/libssl.so.*" then p
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then per |     native-read: permit
+    native-exit: permit                                         |     native-fsread: filename match "/usr/lib/libcrypto.so.*" the
+    native-fcntl: cmd eq "F_SETFD" then permit                  |     native-fsread: filename match "/usr/lib/libncurses.so.*" th
+    native-fsread: filename eq "/" then permit                  |     native-fsread: filename match "/usr/lib/libc.so.*" then per
+    native-fsread: filename match "/<non-existent filename>: *" |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit      |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit   |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit          <
+    native-fsread: filename eq "/home" then permit              <
+    native-fsread: filename eq "$HOME" then permit              <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then permi <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit      <
+    native-fsread: filename eq "$HOME/.mailcap" then permit     <
+    native-fsread: filename eq "$HOME/.mime.types" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo" then permit    <
+    native-fsread: filename eq "$HOME/.terminfo.db" then permit <
+    native-fsread: filename eq "/obj" then permit               <
+    native-fsread: filename eq "/tmp" then permit
+                                                                >     native-fswrite: filename match "/tmp/lynx-*" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit
+                                                                >     native-fsread: filename eq "$HOME" then permit
+                                                                >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                                >     native-fsread: filename eq "/" then permit
+                                                                >     native-fsread: filename eq "/usr/obj/bin/systrace/." then p
+                                                                >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                                >     native-fcntl: permit
+                                                                >     native-getdirentries: permit
+                                                                >     native-lseek: permit
+                                                                >     native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then per <
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" the <
+    native-fsread: filename match "/usr/lib/libncurses.so.*" th <
+    native-fsread: filename match "/usr/lib/libssl.so.*" then p <
+    native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/obj" then permit           |     native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit       |     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then p |     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                                >     native-fsread: filename match "/<non-existent filename>: *"
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"
+                                                                >     native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ
+                                                                >     native-fsread: filename eq "$HOME/.mime.types" then permit
+                                                                >     native-sigaction: permit
+                                                                >     native-ioctl: permit
+                                                                >     native-fsread: filename eq "$HOME/.terminfo.db" then permit
+                                                                >     native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db" th
+                                                                >     native-pread: permit
+                                                                >     native-write: permit
+                                                                >     native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
+    native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then perm |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                        <
+    native-fswrite: filename match "/tmp/lynx-*" then permit    <
+    native-getdirentries: permit                                <
+    native-getpid: permit                                       <
+    native-gettimeofday: permit                                 <
+    native-ioctl: permit                                        <
+    native-issetugid: permit                                    <
+    native-lseek: permit                                        <
+    native-mmap: permit                                         <
+    native-mprotect: prot eq "PROT_READ" then permit            <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit  <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t <
+    native-munmap: permit                                       <
+    native-nanosleep: permit                                    <
+    native-poll: permit
+    native-pread: permit                                        |     native-nanosleep: permit
+    native-read: permit                                         |     native-gettimeofday: permit
+    native-recvfrom: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                       <
+    native-sendto: true then permit                             <
+    native-sigaction: permit                                    <
+    native-sigprocmask: permit                                  <
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D
+                                                                >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
+                                                                >     native-sendto: true then permit
+                                                                >     native-select: permit
+                                                                >     native-recvfrom: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S
+    native-write: permit                                        |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
+                                                                >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_flags_s.out b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_s.out
new file mode 100644
index 000000000000..19179fe5113d
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_s.out
@@ -0,0 +1,79 @@
+                                                                >     native-issetugid: permit
+                                                                >     native-mprotect: permit
+                                                                >     native-mmap: permit
+                                                                >     native-fsread: filename eq "/var/run/ld.so.hints" then perm
+                                                                >     native-fstat: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm |     native-fsread: filename match "/usr/lib/libssl.so.*" then p
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then per |     native-read: permit
+    native-exit: permit                                         |     native-fsread: filename match "/usr/lib/libcrypto.so.*" the
+    native-fcntl: cmd eq "F_SETFD" then permit                  |     native-fsread: filename match "/usr/lib/libncurses.so.*" th
+    native-fsread: filename eq "/" then permit                  |     native-fsread: filename match "/usr/lib/libc.so.*" then per
+    native-fsread: filename match "/<non-existent filename>: *" |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit      |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit   |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit          <
+    native-fsread: filename eq "/home" then permit              <
+    native-fsread: filename eq "$HOME" then permit              <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then permi <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit      <
+    native-fsread: filename eq "$HOME/.mailcap" then permit     <
+    native-fsread: filename eq "$HOME/.mime.types" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo" then permit    <
+    native-fsread: filename eq "$HOME/.terminfo.db" then permit <
+    native-fsread: filename eq "/obj" then permit               <
+                                                                >     native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                                >     native-fsread: filename eq "$HOME" then permit
+                                                                >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                                >     native-fsread: filename eq "/" then permit
+                                                                >     native-fsread: filename eq "/usr/obj/bin/systrace/." then p
+                                                                >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                                >     native-fcntl: permit
+                                                                >     native-getdirentries: permit
+                                                                >     native-lseek: permit
+                                                                >     native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then per <
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" the <
+    native-fsread: filename match "/usr/lib/libncurses.so.*" th <
+    native-fsread: filename match "/usr/lib/libssl.so.*" then p <
+    native-fsread: filename eq "/usr/obj" then permit           |     native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit       |     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then p |     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                                >     native-fsread: filename match "/<non-existent filename>: *"
+                                                                >     native-fsread: filename eq "$HOME/.mailcap" then permit
+                                                                >     native-fsread: filename eq "$HOME/.mime.types" then permit
+                                                                >     native-sigaction: permit
+                                                                >     native-ioctl: permit
+                                                                >     native-fsread: filename eq "$HOME/.terminfo.db" then permit
+                                                                >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                                >     native-pread: permit
+                                                                >     native-write: permit
+                                                                >     native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
+    native-fsread: filename eq "/var/run/ld.so.hints" then perm |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                        <
+    native-fswrite: filename match "/tmp/lynx-*" then permit    <
+    native-getdirentries: permit                                <
+    native-getpid: permit                                       <
+    native-gettimeofday: permit                                 <
+    native-ioctl: permit                                        <
+    native-issetugid: permit                                    <
+    native-lseek: permit                                        <
+    native-mmap: permit                                         <
+    native-mprotect: prot eq "PROT_READ" then permit            <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit  <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t <
+    native-munmap: permit                                       <
+    native-nanosleep: permit                                    <
+    native-pread: permit                                        |     native-nanosleep: permit
+    native-read: permit                                         |     native-gettimeofday: permit
+    native-recvfrom: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                       <
+    native-sendto: true then permit                             <
+    native-sigaction: permit                                    <
+    native-sigprocmask: permit                                  <
+                                                                >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
+                                                                >     native-sendto: true then permit
+                                                                >     native-select: permit
+                                                                >     native-recvfrom: permit
+    native-write: permit                                        |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
+                                                                >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_flags_w.out b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_w.out
new file mode 100644
index 000000000000..19ea79bf6112
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_flags_w.out
@@ -0,0 +1,102 @@
+Policy: /usr/bin/lynx, Emulation: native                        Policy: /usr/bin/lynx, Emulation: native
+                                                              >     native-issetugid: permit
+                                                              >     native-mprotect: permit
+                                                              >     native-mmap: permit
+    native-__sysctl: permit                                         native-__sysctl: permit
+                                                              >     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                              >     native-fstat: permit
+    native-close: permit                                            native-close: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-read: permit
+    native-exit: permit                                       |     native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fcntl: cmd eq "F_SETFD" then permit                |     native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/" then permit                |     native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename match "/<non-existent filename>:  |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit       native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit        <
+    native-fsread: filename eq "/home" then permit            <
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    <
+    native-fsread: filename eq "$HOME/.mailcap" then permit   <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "/obj" then permit             <
+    native-fsread: filename eq "/tmp" then permit                   native-fsread: filename eq "/tmp" then permit
+                                                              >     native-fswrite: filename match "/tmp/lynx-*" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit       native-fsread: filename match "/tmp/lynx-*/." then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                              >     native-fsread: filename eq "/" then permit
+                                                              >     native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                              >     native-fcntl: permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-lseek: permit
+                                                              >     native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr" then permit                   native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit               native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit             native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit           native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit               native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p <
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t <
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  <
+    native-fsread: filename match "/usr/lib/libssl.so.*" then <
+    native-fsread: filename eq "/usr/libdata" then permit           native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/usr/libexec" then permit           native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/usr/lkm" then permit               native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "/usr/local" then permit             native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/mdec" then permit              native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/obj" then permit         |     native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit     |     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then |     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                              >     native-fsread: filename match "/<non-existent filename>: 
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailca       native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
+                                                              >     native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t       native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-sigaction: permit
+                                                              >     native-ioctl: permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db"        native-fsread: filename eq "/usr/share/misc/terminfo.db" 
+                                                              >     native-pread: permit
+                                                              >     native-write: permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+    native-fsread: filename eq "/var/run/dev.db" then permit        native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                      <
+    native-fswrite: filename match "/tmp/lynx-*" then permit  <
+    native-getdirentries: permit                              <
+    native-getpid: permit                                     <
+    native-gettimeofday: permit                               <
+    native-ioctl: permit                                      <
+    native-issetugid: permit                                  <
+    native-lseek: permit                                      <
+    native-mmap: permit                                       <
+    native-mprotect: prot eq "PROT_READ" then permit          <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
+    native-munmap: permit                                     <
+    native-nanosleep: permit                                  <
+    native-poll: permit                                             native-poll: permit
+    native-pread: permit                                      |     native-nanosleep: permit
+    native-read: permit                                       |     native-gettimeofday: permit
+    native-recvfrom: permit                                   |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                     <
+    native-sendto: true then permit                           <
+    native-sigaction: permit                                  <
+    native-sigprocmask: permit                                <
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+                                                              >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                              >     native-sendto: true then permit
+                                                              >     native-select: permit
+                                                              >     native-recvfrom: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-write: permit                                      |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                              >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a1.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a1.out
new file mode 100644
index 000000000000..2a0f5328aeb2
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a1.out
@@ -0,0 +1,100 @@
+Policy: /usr/bin/lynx, Emulation: native                        Policy: /usr/bin/lynx, Emulation: native
+                                                              >     native-issetugid: permit
+                                                              >     native-mprotect: permit
+                                                              >     native-mmap: permit
+    native-__sysctl: permit                                         native-__sysctl: permit
+                                                              >     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                              >     native-fstat: permit
+    native-close: permit                                            native-close: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-read: permit
+    native-exit: permit                                       |     native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fcntl: cmd eq "F_SETFD" then permit                |     native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/" then permit                |     native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename match "/<non-existent filename>:  |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit       native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit        <
+    native-fsread: filename eq "/home" then permit            <
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    <
+    native-fsread: filename eq "$HOME/.mailcap" then permit   <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "/obj" then permit             <
+    native-fsread: filename eq "/tmp" then permit                   native-fsread: filename eq "/tmp" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit       native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                              )     native-fsread: filename match "/tmp/lynx-*/." then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                              >     native-fsread: filename eq "/" then permit
+                                                              >     native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                              >     native-fcntl: permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-lseek: permit
+                                                              >     native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr" then permit                   native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit               native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit             native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit           native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit               native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p       native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t       native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*"        native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename match "/usr/lib/libssl.so.*" then       native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/libdata" then permit           native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/libexec" then permit           native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "/usr/lkm" then permit               native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/usr/local" then permit             native-fsread: filename eq "$HOME/.lynxrc" then permit
+    native-fsread: filename eq "/usr/mdec" then permit              native-fsread: filename match "/<non-existent filename>: 
+    native-fsread: filename eq "/usr/obj" then permit               native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
+    native-fsread: filename eq "/usr/obj/bin" then permit           native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then       native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-sigaction: permit
+                                                              >     native-ioctl: permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db"        native-fsread: filename eq "/usr/share/misc/terminfo.db" 
+                                                              >     native-pread: permit
+                                                              >     native-write: permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+    native-fsread: filename eq "/var/run/dev.db" then permit        native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                      <
+    native-fswrite: filename match "/tmp/lynx-*" then permit  <
+    native-getdirentries: permit                              <
+    native-getpid: permit                                     <
+    native-gettimeofday: permit                               <
+    native-ioctl: permit                                      <
+    native-issetugid: permit                                  <
+    native-lseek: permit                                      <
+    native-mmap: permit                                       <
+    native-mprotect: prot eq "PROT_READ" then permit          <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
+    native-munmap: permit                                     <
+    native-nanosleep: permit                                  <
+    native-poll: permit                                             native-poll: permit
+    native-pread: permit                                      |     native-nanosleep: permit
+    native-read: permit                                       |     native-gettimeofday: permit
+    native-recvfrom: permit                                   |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                     <
+    native-sendto: true then permit                           <
+    native-sigaction: permit                                  <
+    native-sigprocmask: permit                                <
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+                                                              >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                              >     native-sendto: true then permit
+                                                              >     native-select: permit
+                                                              >     native-recvfrom: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-write: permit                                      |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                              >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a2.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a2.out
new file mode 100644
index 000000000000..4e0d349b79e7
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_a2.out
@@ -0,0 +1,96 @@
+Policy: /usr/bin/lynx, Emulation: native                        Policy: /usr/bin/lynx, Emulation: native
+    native-issetugid: permit                                  <
+    native-mprotect: permit                                   <
+    native-mmap: permit                                       <
+    native-__sysctl: permit                                         native-__sysctl: permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe <
+    native-fstat: permit                                      <
+    native-close: permit                                            native-close: permit
+    native-fsread: filename match "/usr/lib/libssl.so.*" then |     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+    native-read: permit                                       |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t |     native-exit: permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  |     native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p |     native-fsread: filename eq "/" then permit
+    native-munmap: permit                                     |     native-fsread: filename match "/<non-existent filename>: 
+    native-sigprocmask: permit                                |     native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit       native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-getpid: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+                                                              >     native-fsread: filename eq "/etc/utmp" then permit
+                                                              >     native-fsread: filename eq "/home" then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+                                                              >     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mailcap" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/tmp" then permit                   native-fsread: filename eq "/tmp" then permit
+    native-fswrite: filename match "/tmp/lynx-*" then permit        native-fsread: filename match "/tmp/lynx-*/." then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit (
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    <
+    native-fsread: filename eq "/" then permit                <
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then <
+    native-fsread: filename eq "/usr/obj/bin" then permit     <
+    native-fcntl: permit                                      <
+    native-getdirentries: permit                              <
+    native-lseek: permit                                      <
+    native-fsread: filename eq "/usr/obj" then permit         <
+    native-fsread: filename eq "/usr" then permit                   native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit               native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit             native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit           native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit               native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename eq "/usr/libdata" then permit           native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename eq "/usr/libexec" then permit           native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fsread: filename eq "/usr/lkm" then permit               native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/usr/local" then permit             native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-fsread: filename eq "/usr/mdec" then permit              native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/home" then permit                  native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/obj" then permit                   native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "$HOME/.lynxrc" then permit          native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename match "/<non-existent filename>:        native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailca       native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "$HOME/.mailcap" then permit         native-fsread: filename eq "/usr/obj/bin" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t       native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              )     native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
+                                                              )     native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-sigaction: permit                                  <
+    native-ioctl: permit                                      <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "/usr/share/misc/terminfo.db"        native-fsread: filename eq "/usr/share/misc/terminfo.db" 
+    native-pread: permit                                      <
+    native-write: permit                                      <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "/var/run/dev.db" then permit        native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/etc/utmp" then permit        |     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+    native-poll: permit                                       |     native-fstat: permit
+    native-nanosleep: permit                                  |     native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-getpid: permit
+    native-gettimeofday: permit                                     native-gettimeofday: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-ioctl: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |     native-issetugid: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-lseek: permit
+    native-sendto: true then permit                           |     native-mmap: permit
+    native-select: permit                                     |     native-mprotect: prot eq "PROT_READ" then permit
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
+                                                              >     native-munmap: permit
+                                                              >     native-nanosleep: permit
+                                                              >     native-poll: permit
+                                                              >     native-pread: permit
+                                                              >     native-read: permit
+    native-recvfrom: permit                                         native-recvfrom: permit
+                                                              >     native-select: permit
+                                                              >     native-sendto: true then permit
+                                                              >     native-sigaction: permit
+                                                              >     native-sigprocmask: permit
+                                                              >     native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-write: permit
+    native-exit: permit                                       <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b1.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b1.out
new file mode 100644
index 000000000000..3e548b693d08
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b1.out
@@ -0,0 +1,69 @@
+                                                              >     native-issetugid: permit
+                                                              >     native-mprotect: permit
+                                                              >     native-mmap: permit
+                                                              >     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                              >     native-fstat: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-read: permit
+    native-exit: permit                                       |     native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fcntl: cmd eq "F_SETFD" then permit                |     native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/" then permit                |     native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename match "/<non-existent filename>:  |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit        <
+    native-fsread: filename eq "/home" then permit            <
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    <
+    native-fsread: filename eq "$HOME/.mailcap" then permit   <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "/obj" then permit             <
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                              >     native-fsread: filename eq "/" then permit
+                                                              >     native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                              >     native-fcntl: permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-lseek: permit
+                                                              >     native-fsread: filename eq "/usr/obj" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-sigaction: permit
+                                                              >     native-ioctl: permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-pread: permit
+                                                              >     native-write: permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                      <
+    native-fswrite: filename match "/tmp/lynx-*" then permit  <
+    native-getdirentries: permit                              <
+    native-getpid: permit                                     <
+    native-gettimeofday: permit                               <
+    native-ioctl: permit                                      <
+    native-issetugid: permit                                  <
+    native-lseek: permit                                      <
+    native-mmap: permit                                       <
+    native-mprotect: prot eq "PROT_READ" then permit          <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
+    native-munmap: permit                                     <
+    native-nanosleep: permit                                  <
+    native-pread: permit                                      |     native-nanosleep: permit
+    native-read: permit                                       |     native-gettimeofday: permit
+    native-recvfrom: permit                                   |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                     <
+    native-sendto: true then permit                           <
+    native-sigaction: permit                                  <
+    native-sigprocmask: permit                                <
+                                                              >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                              >     native-sendto: true then permit
+                                                              >     native-select: permit
+                                                              >     native-recvfrom: permit
+    native-write: permit                                      |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                              >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b2.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b2.out
new file mode 100644
index 000000000000..4504c36ec035
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_b2.out
@@ -0,0 +1,65 @@
+    native-issetugid: permit                                  <
+    native-mprotect: permit                                   <
+    native-mmap: permit                                       <
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe <
+    native-fstat: permit                                      <
+    native-fsread: filename match "/usr/lib/libssl.so.*" then |     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+    native-read: permit                                       |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t |     native-exit: permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  |     native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p |     native-fsread: filename eq "/" then permit
+    native-munmap: permit                                     |     native-fsread: filename match "/<non-existent filename>: 
+    native-sigprocmask: permit                                |     native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-getpid: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+                                                              >     native-fsread: filename eq "/etc/utmp" then permit
+                                                              >     native-fsread: filename eq "/home" then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+                                                              >     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mailcap" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    <
+    native-fsread: filename eq "/" then permit                <
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then <
+    native-fsread: filename eq "/usr/obj/bin" then permit     <
+    native-fcntl: permit                                      <
+    native-getdirentries: permit                              <
+    native-lseek: permit                                      <
+    native-fsread: filename eq "/usr/obj" then permit         <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-sigaction: permit                                  <
+    native-ioctl: permit                                      <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-pread: permit                                      <
+    native-write: permit                                      <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "/etc/utmp" then permit        |     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+    native-poll: permit                                       |     native-fstat: permit
+    native-nanosleep: permit                                  |     native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-getpid: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-ioctl: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |     native-issetugid: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-lseek: permit
+    native-sendto: true then permit                           |     native-mmap: permit
+    native-select: permit                                     |     native-mprotect: prot eq "PROT_READ" then permit
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
+                                                              >     native-munmap: permit
+                                                              >     native-nanosleep: permit
+                                                              >     native-poll: permit
+                                                              >     native-pread: permit
+                                                              >     native-read: permit
+                                                              >     native-select: permit
+                                                              >     native-sendto: true then permit
+                                                              >     native-sigaction: permit
+                                                              >     native-sigprocmask: permit
+                                                              >     native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-write: permit
+    native-exit: permit                                       <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c1.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c1.out
new file mode 100644
index 000000000000..e9ac88e54ae1
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c1.out
@@ -0,0 +1,99 @@
+Policy: /usr/bin/lynx, Emulation: native                      (
+                                                              >     native-issetugid: permit
+                                                              >     native-mprotect: permit
+                                                              >     native-mmap: permit
+    native-__sysctl: permit                                   (
+                                                              >     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                              >     native-fstat: permit
+    native-close: permit                                      (
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-read: permit
+    native-exit: permit                                       |     native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fcntl: cmd eq "F_SETFD" then permit                |     native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/" then permit                |     native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename match "/<non-existent filename>:  |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit (
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit        <
+    native-fsread: filename eq "/home" then permit            <
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    <
+    native-fsread: filename eq "$HOME/.mailcap" then permit   <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "/obj" then permit             <
+    native-fsread: filename eq "/tmp" then permit             (
+    native-fsread: filename match "/tmp/lynx-*/." then permit (
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                              >     native-fsread: filename eq "/" then permit
+                                                              >     native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                              >     native-fcntl: permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-lseek: permit
+                                                              >     native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr" then permit             (
+    native-fsread: filename eq "/usr/bin" then permit         (
+    native-fsread: filename eq "/usr/games" then permit       (
+    native-fsread: filename eq "/usr/include" then permit     (
+    native-fsread: filename eq "/usr/lib" then permit         (
+    native-fsread: filename match "/usr/lib/libc.so.*" then p (
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t (
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  (
+    native-fsread: filename match "/usr/lib/libssl.so.*" then (
+    native-fsread: filename eq "/usr/libdata" then permit     (
+    native-fsread: filename eq "/usr/libexec" then permit     (
+    native-fsread: filename eq "/usr/lkm" then permit         (
+    native-fsread: filename eq "/usr/local" then permit       (
+    native-fsread: filename eq "/usr/mdec" then permit        (
+    native-fsread: filename eq "/usr/obj" then permit         (
+    native-fsread: filename eq "/usr/obj/bin" then permit     (
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then (
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-sigaction: permit
+                                                              >     native-ioctl: permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db"  (
+                                                              >     native-pread: permit
+                                                              >     native-write: permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+    native-fsread: filename eq "/var/run/dev.db" then permit  (
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                      <
+    native-fswrite: filename match "/tmp/lynx-*" then permit  <
+    native-getdirentries: permit                              <
+    native-getpid: permit                                     <
+    native-gettimeofday: permit                               <
+    native-ioctl: permit                                      <
+    native-issetugid: permit                                  <
+    native-lseek: permit                                      <
+    native-mmap: permit                                       <
+    native-mprotect: prot eq "PROT_READ" then permit          <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
+    native-munmap: permit                                     <
+    native-nanosleep: permit                                  <
+    native-poll: permit                                       (
+    native-pread: permit                                      |     native-nanosleep: permit
+    native-read: permit                                       |     native-gettimeofday: permit
+    native-recvfrom: permit                                   |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                     <
+    native-sendto: true then permit                           <
+    native-sigaction: permit                                  <
+    native-sigprocmask: permit                                <
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
+                                                              >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                              >     native-sendto: true then permit
+                                                              >     native-select: permit
+                                                              >     native-recvfrom: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
+    native-write: permit                                      |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                              >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c2.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c2.out
new file mode 100644
index 000000000000..fe7af0ebee54
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_c2.out
@@ -0,0 +1,94 @@
+Policy: /usr/bin/lynx, Emulation: native                      (
+    native-issetugid: permit                                  <
+    native-mprotect: permit                                   <
+    native-mmap: permit                                       <
+    native-__sysctl: permit                                   (
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe <
+    native-fstat: permit                                      <
+    native-close: permit                                      (
+    native-fsread: filename match "/usr/lib/libssl.so.*" then |     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+    native-read: permit                                       |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t |     native-exit: permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  |     native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p |     native-fsread: filename eq "/" then permit
+    native-munmap: permit                                     |     native-fsread: filename match "/<non-existent filename>: 
+    native-sigprocmask: permit                                |     native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit (
+    native-getpid: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+                                                              >     native-fsread: filename eq "/etc/utmp" then permit
+                                                              >     native-fsread: filename eq "/home" then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+                                                              >     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mailcap" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/tmp" then permit             (
+    native-fswrite: filename match "/tmp/lynx-*" then permit  (
+    native-fsread: filename match "/tmp/lynx-*/." then permit (
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    <
+    native-fsread: filename eq "/" then permit                <
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then <
+    native-fsread: filename eq "/usr/obj/bin" then permit     <
+    native-fcntl: permit                                      <
+    native-getdirentries: permit                              <
+    native-lseek: permit                                      <
+    native-fsread: filename eq "/usr/obj" then permit         <
+    native-fsread: filename eq "/usr" then permit             (
+    native-fsread: filename eq "/usr/bin" then permit         (
+    native-fsread: filename eq "/usr/games" then permit       (
+    native-fsread: filename eq "/usr/include" then permit     (
+    native-fsread: filename eq "/usr/lib" then permit         (
+    native-fsread: filename eq "/usr/libdata" then permit     (
+    native-fsread: filename eq "/usr/libexec" then permit     (
+    native-fsread: filename eq "/usr/lkm" then permit         (
+    native-fsread: filename eq "/usr/local" then permit       (
+    native-fsread: filename eq "/usr/mdec" then permit        (
+    native-fsread: filename eq "/home" then permit            (
+    native-fsread: filename eq "/obj" then permit             (
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    (
+    native-fsread: filename match "/<non-existent filename>:  (
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailca (
+    native-fsread: filename eq "$HOME/.mailcap" then permit   (
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t (
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-sigaction: permit                                  <
+    native-ioctl: permit                                      <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "/usr/share/misc/terminfo.db"  (
+    native-pread: permit                                      <
+    native-write: permit                                      <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "/var/run/dev.db" then permit  (
+    native-fsread: filename eq "/etc/utmp" then permit        |     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+    native-poll: permit                                       |     native-fstat: permit
+    native-nanosleep: permit                                  |     native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-getpid: permit
+    native-gettimeofday: permit                               (
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-ioctl: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |     native-issetugid: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-lseek: permit
+    native-sendto: true then permit                           |     native-mmap: permit
+    native-select: permit                                     |     native-mprotect: prot eq "PROT_READ" then permit
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
+                                                              >     native-munmap: permit
+                                                              >     native-nanosleep: permit
+                                                              >     native-poll: permit
+                                                              >     native-pread: permit
+                                                              >     native-read: permit
+    native-recvfrom: permit                                   (
+                                                              >     native-select: permit
+                                                              >     native-sendto: true then permit
+                                                              >     native-sigaction: permit
+                                                              >     native-sigprocmask: permit
+                                                              >     native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK (
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-write: permit
+    native-exit: permit                                       <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d1.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d1.out
new file mode 100644
index 000000000000..3e548b693d08
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d1.out
@@ -0,0 +1,69 @@
+                                                              >     native-issetugid: permit
+                                                              >     native-mprotect: permit
+                                                              >     native-mmap: permit
+                                                              >     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                              >     native-fstat: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-fsread: filename match "/usr/lib/libssl.so.*" then
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-read: permit
+    native-exit: permit                                       |     native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+    native-fcntl: cmd eq "F_SETFD" then permit                |     native-fsread: filename match "/usr/lib/libncurses.so.*" 
+    native-fsread: filename eq "/" then permit                |     native-fsread: filename match "/usr/lib/libc.so.*" then p
+    native-fsread: filename match "/<non-existent filename>:  |     native-munmap: permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    |     native-sigprocmask: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-getpid: permit
+    native-fsread: filename eq "/etc/utmp" then permit        <
+    native-fsread: filename eq "/home" then permit            <
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "$HOME/.lynxrc" then permit    <
+    native-fsread: filename eq "$HOME/.mailcap" then permit   <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "/obj" then permit             <
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                              >     native-fsread: filename eq "/" then permit
+                                                              >     native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                              >     native-fsread: filename eq "/usr/obj/bin" then permit
+                                                              >     native-fcntl: permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-lseek: permit
+                                                              >     native-fsread: filename eq "/usr/obj" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-sigaction: permit
+                                                              >     native-ioctl: permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-pread: permit
+                                                              >     native-write: permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe |     native-fsread: filename eq "/etc/utmp" then permit
+    native-fstat: permit                                      <
+    native-fswrite: filename match "/tmp/lynx-*" then permit  <
+    native-getdirentries: permit                              <
+    native-getpid: permit                                     <
+    native-gettimeofday: permit                               <
+    native-ioctl: permit                                      <
+    native-issetugid: permit                                  <
+    native-lseek: permit                                      <
+    native-mmap: permit                                       <
+    native-mprotect: prot eq "PROT_READ" then permit          <
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm <
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" <
+    native-munmap: permit                                     <
+    native-nanosleep: permit                                  <
+    native-pread: permit                                      |     native-nanosleep: permit
+    native-read: permit                                       |     native-gettimeofday: permit
+    native-recvfrom: permit                                   |     native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-select: permit                                     <
+    native-sendto: true then permit                           <
+    native-sigaction: permit                                  <
+    native-sigprocmask: permit                                <
+                                                              >     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                              >     native-sendto: true then permit
+                                                              >     native-select: permit
+                                                              >     native-recvfrom: permit
+    native-write: permit                                      |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                              >     native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d2.out b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d2.out
new file mode 100644
index 000000000000..4504c36ec035
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_iflags_d2.out
@@ -0,0 +1,65 @@
+    native-issetugid: permit                                  <
+    native-mprotect: permit                                   <
+    native-mmap: permit                                       <
+    native-fsread: filename eq "/var/run/ld.so.hints" then pe <
+    native-fstat: permit                                      <
+    native-fsread: filename match "/usr/lib/libssl.so.*" then |     native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+    native-read: permit                                       |     native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" t |     native-exit: permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*"  |     native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then p |     native-fsread: filename eq "/" then permit
+    native-munmap: permit                                     |     native-fsread: filename match "/<non-existent filename>: 
+    native-sigprocmask: permit                                |     native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-getpid: permit                                     |     native-fsread: filename eq "/etc/resolv.conf" then permit
+                                                              >     native-fsread: filename eq "/etc/utmp" then permit
+                                                              >     native-fsread: filename eq "/home" then permit
+                                                              >     native-fsread: filename eq "$HOME" then permit
+                                                              >     native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+                                                              >     native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mailcap" then permit
+                                                              >     native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                              >     native-fsread: filename eq "$HOME/.terminfo" then permit
+                                                              >     native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                              >     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "$HOME" then permit            <
+    native-fsread: filename eq "/etc/lynx.cfg" then permit    <
+    native-fsread: filename eq "/" then permit                <
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then <
+    native-fsread: filename eq "/usr/obj/bin" then permit     <
+    native-fcntl: permit                                      <
+    native-getdirentries: permit                              <
+    native-lseek: permit                                      <
+    native-fsread: filename eq "/usr/obj" then permit         <
+    native-fsread: filename eq "$HOME/.mime.types" then permi <
+    native-sigaction: permit                                  <
+    native-ioctl: permit                                      <
+    native-fsread: filename eq "$HOME/.terminfo.db" then perm <
+    native-fsread: filename eq "$HOME/.terminfo" then permit  <
+    native-pread: permit                                      <
+    native-write: permit                                      <
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then per <
+    native-fsread: filename eq "/etc/utmp" then permit        |     native-fsread: filename eq "/var/run/ld.so.hints" then pe
+    native-poll: permit                                       |     native-fstat: permit
+    native-nanosleep: permit                                  |     native-fswrite: filename match "/tmp/lynx-*" then permit
+                                                              >     native-getdirentries: permit
+                                                              >     native-getpid: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit |     native-ioctl: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK |     native-issetugid: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe |     native-lseek: permit
+    native-sendto: true then permit                           |     native-mmap: permit
+    native-select: permit                                     |     native-mprotect: prot eq "PROT_READ" then permit
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permi
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE" then perm
+                                                              >     native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC"
+                                                              >     native-munmap: permit
+                                                              >     native-nanosleep: permit
+                                                              >     native-poll: permit
+                                                              >     native-pread: permit
+                                                              >     native-read: permit
+                                                              >     native-select: permit
+                                                              >     native-sendto: true then permit
+                                                              >     native-sigaction: permit
+                                                              >     native-sigprocmask: permit
+                                                              >     native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then p |     native-write: permit
+    native-exit: permit                                       <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_input1 b/contrib/netbsd-tests/usr.bin/sdiff/d_input1
new file mode 100644
index 000000000000..686e8ea22774
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_input1
@@ -0,0 +1,72 @@
+Policy: /usr/bin/lynx, Emulation: native
+    native-__sysctl: permit
+    native-close: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
+    native-exit: permit
+    native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename eq "/" then permit
+    native-fsread: filename match "/<non-existent filename>: *" then permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-fsread: filename eq "/etc/utmp" then permit
+    native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "$HOME" then permit
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
+    native-fsread: filename eq "$HOME/.lynxrc" then permit
+    native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "$HOME/.mime.types" then permit
+    native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "$HOME/.terminfo.db" then permit
+    native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/tmp" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit
+    native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then permit
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
+    native-fsread: filename match "/usr/lib/libssl.so.*" then permit
+    native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
+    native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then permit
+    native-fstat: permit
+    native-fswrite: filename match "/tmp/lynx-*" then permit
+    native-getdirentries: permit
+    native-getpid: permit
+    native-gettimeofday: permit
+    native-ioctl: permit
+    native-issetugid: permit
+    native-lseek: permit
+    native-mmap: permit
+    native-mprotect: prot eq "PROT_READ" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" then permit
+    native-munmap: permit
+    native-nanosleep: permit
+    native-poll: permit
+    native-pread: permit
+    native-read: permit
+    native-recvfrom: permit
+    native-select: permit
+    native-sendto: true then permit
+    native-sigaction: permit
+    native-sigprocmask: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
+    native-write: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_input2 b/contrib/netbsd-tests/usr.bin/sdiff/d_input2
new file mode 100644
index 000000000000..70e1b57f5fbf
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_input2
@@ -0,0 +1,69 @@
+Policy: /usr/bin/lynx, Emulation: native
+    native-issetugid: permit
+    native-mprotect: permit
+    native-mmap: permit
+    native-__sysctl: permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then permit
+    native-fstat: permit
+    native-close: permit
+    native-fsread: filename match "/usr/lib/libssl.so.*" then permit
+    native-read: permit
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then permit
+    native-munmap: permit
+    native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-getpid: permit
+    native-fsread: filename eq "/tmp" then permit
+    native-fswrite: filename match "/tmp/lynx-*" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit
+    native-fsread: filename eq "$HOME" then permit
+    native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-fsread: filename eq "/" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit
+    native-fcntl: permit
+    native-getdirentries: permit
+    native-lseek: permit
+    native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "$HOME/.lynxrc" then permit
+    native-fsread: filename match "/<non-existent filename>: *" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
+    native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
+    native-fsread: filename eq "$HOME/.mime.types" then permit
+    native-sigaction: permit
+    native-ioctl: permit
+    native-fsread: filename eq "$HOME/.terminfo.db" then permit
+    native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
+    native-pread: permit
+    native-write: permit
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
+    native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/etc/utmp" then permit
+    native-poll: permit
+    native-nanosleep: permit
+    native-gettimeofday: permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
+    native-sendto: true then permit
+    native-select: permit
+    native-recvfrom: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
+    native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_oneline.in b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline.in
new file mode 100644
index 000000000000..acbe86c7c895
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline.in
@@ -0,0 +1 @@
+abcd
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_a.out b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_a.out
new file mode 100644
index 000000000000..99560a6ddd07
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_a.out
@@ -0,0 +1 @@
+                                                                > abcd
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_b.out b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_b.out
new file mode 100644
index 000000000000..7300b1de1085
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_oneline_b.out
@@ -0,0 +1 @@
+abcd                                                            <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_same.out b/contrib/netbsd-tests/usr.bin/sdiff/d_same.out
new file mode 100644
index 000000000000..bce894420ce4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_same.out
@@ -0,0 +1,72 @@
+Policy: /usr/bin/lynx, Emulation: native                          Policy: /usr/bin/lynx, Emulation: native
+    native-__sysctl: permit                                           native-__sysctl: permit
+    native-close: permit                                              native-close: permit
+    native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm       native-connect: sockaddr eq "inet-[127.0.0.1]:53" then perm
+    native-connect: sockaddr match "inet-\\\[*\\\]:80" then per       native-connect: sockaddr match "inet-\\\[*\\\]:80" then per
+    native-exit: permit                                               native-exit: permit
+    native-fcntl: cmd eq "F_SETFD" then permit                        native-fcntl: cmd eq "F_SETFD" then permit
+    native-fsread: filename eq "/" then permit                        native-fsread: filename eq "/" then permit
+    native-fsread: filename match "/<non-existent filename>: *"       native-fsread: filename match "/<non-existent filename>: *"
+    native-fsread: filename eq "/etc/lynx.cfg" then permit            native-fsread: filename eq "/etc/lynx.cfg" then permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit         native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit         native-fsread: filename eq "/etc/resolv.conf" then permit
+    native-fsread: filename eq "/etc/utmp" then permit                native-fsread: filename eq "/etc/utmp" then permit
+    native-fsread: filename eq "/home" then permit                    native-fsread: filename eq "/home" then permit
+    native-fsread: filename eq "$HOME" then permit                    native-fsread: filename eq "$HOME" then permit
+    native-fsread: filename eq "$HOME/.lynx-keymaps" then permi       native-fsread: filename eq "$HOME/.lynx-keymaps" then permi
+    native-fsread: filename eq "$HOME/.lynxrc" then permit            native-fsread: filename eq "$HOME/.lynxrc" then permit
+    native-fsread: filename eq "$HOME/.mailcap" then permit           native-fsread: filename eq "$HOME/.mailcap" then permit
+    native-fsread: filename eq "$HOME/.mime.types" then permit        native-fsread: filename eq "$HOME/.mime.types" then permit
+    native-fsread: filename eq "$HOME/.terminfo" then permit          native-fsread: filename eq "$HOME/.terminfo" then permit
+    native-fsread: filename eq "$HOME/.terminfo.db" then permit       native-fsread: filename eq "$HOME/.terminfo.db" then permit
+    native-fsread: filename eq "/obj" then permit                     native-fsread: filename eq "/obj" then permit
+    native-fsread: filename eq "/tmp" then permit                     native-fsread: filename eq "/tmp" then permit
+    native-fsread: filename match "/tmp/lynx-*/." then permit         native-fsread: filename match "/tmp/lynx-*/." then permit
+    native-fsread: filename eq "/usr" then permit                     native-fsread: filename eq "/usr" then permit
+    native-fsread: filename eq "/usr/bin" then permit                 native-fsread: filename eq "/usr/bin" then permit
+    native-fsread: filename eq "/usr/games" then permit               native-fsread: filename eq "/usr/games" then permit
+    native-fsread: filename eq "/usr/include" then permit             native-fsread: filename eq "/usr/include" then permit
+    native-fsread: filename eq "/usr/lib" then permit                 native-fsread: filename eq "/usr/lib" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then per       native-fsread: filename match "/usr/lib/libc.so.*" then per
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" the       native-fsread: filename match "/usr/lib/libcrypto.so.*" the
+    native-fsread: filename match "/usr/lib/libncurses.so.*" th       native-fsread: filename match "/usr/lib/libncurses.so.*" th
+    native-fsread: filename match "/usr/lib/libssl.so.*" then p       native-fsread: filename match "/usr/lib/libssl.so.*" then p
+    native-fsread: filename eq "/usr/libdata" then permit             native-fsread: filename eq "/usr/libdata" then permit
+    native-fsread: filename eq "/usr/libexec" then permit             native-fsread: filename eq "/usr/libexec" then permit
+    native-fsread: filename eq "/usr/lkm" then permit                 native-fsread: filename eq "/usr/lkm" then permit
+    native-fsread: filename eq "/usr/local" then permit               native-fsread: filename eq "/usr/local" then permit
+    native-fsread: filename eq "/usr/mdec" then permit                native-fsread: filename eq "/usr/mdec" then permit
+    native-fsread: filename eq "/usr/obj" then permit                 native-fsread: filename eq "/usr/obj" then permit
+    native-fsread: filename eq "/usr/obj/bin" then permit             native-fsread: filename eq "/usr/obj/bin" then permit
+    native-fsread: filename eq "/usr/obj/bin/systrace/." then p       native-fsread: filename eq "/usr/obj/bin/systrace/." then p
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"       native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap"
+    native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ       native-fsread: filename eq "/usr/obj/bin/systrace/.mime.typ
+    native-fsread: filename eq "/usr/share/misc/terminfo.db" th       native-fsread: filename eq "/usr/share/misc/terminfo.db" th
+    native-fsread: filename eq "/var/run/dev.db" then permit          native-fsread: filename eq "/var/run/dev.db" then permit
+    native-fsread: filename eq "/var/run/ld.so.hints" then perm       native-fsread: filename eq "/var/run/ld.so.hints" then perm
+    native-fstat: permit                                              native-fstat: permit
+    native-fswrite: filename match "/tmp/lynx-*" then permit          native-fswrite: filename match "/tmp/lynx-*" then permit
+    native-getdirentries: permit                                      native-getdirentries: permit
+    native-getpid: permit                                             native-getpid: permit
+    native-gettimeofday: permit                                       native-gettimeofday: permit
+    native-ioctl: permit                                              native-ioctl: permit
+    native-issetugid: permit                                          native-issetugid: permit
+    native-lseek: permit                                              native-lseek: permit
+    native-mmap: permit                                               native-mmap: permit
+    native-mprotect: prot eq "PROT_READ" then permit                  native-mprotect: prot eq "PROT_READ" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit        native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit       native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
+    native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t       native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" t
+    native-munmap: permit                                             native-munmap: permit
+    native-nanosleep: permit                                          native-nanosleep: permit
+    native-poll: permit                                               native-poll: permit
+    native-pread: permit                                              native-pread: permit
+    native-read: permit                                               native-read: permit
+    native-recvfrom: permit                                           native-recvfrom: permit
+    native-select: permit                                             native-select: permit
+    native-sendto: true then permit                                   native-sendto: true then permit
+    native-sigaction: permit                                          native-sigaction: permit
+    native-sigprocmask: permit                                        native-sigprocmask: permit
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_D
+    native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S       native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_S
+    native-write: permit                                              native-write: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_short.out b/contrib/netbsd-tests/usr.bin/sdiff/d_short.out
new file mode 100644
index 000000000000..7a334601721c
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_short.out
@@ -0,0 +1,15 @@
+Policy: /usr/bin/lynx, Emulation: native
+    native-issetugid: permit
+    native-mprotect: permit
+    native-mmap: permit
+    native-__sysctl: permit
+    native-close: permit
+    native-fsread: filename match "/usr/lib/libssl.so.*" then permit
+    native-read: permit
+    native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
+    native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
+    native-fsread: filename match "/usr/lib/libc.so.*" then permit
+    native-munmap: permit
+    native-sigprocmask: permit
+    native-fsread: filename eq "/etc/malloc.conf" then permit
+    native-fsread: filename eq "/etc/resolv.conf" then permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabends.in b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends.in
new file mode 100644
index 000000000000..0547049d45cc
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends.in
@@ -0,0 +1,17 @@
+			
+0			
+01			
+012			
+0123			
+01234			
+012345			
+0123456			
+01234567		
+012345670		
+0123456701		
+01234567012		
+012345670123		
+0123456701234		
+01234567012345		
+012345670123456		
+0123456701234567	
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_a.out b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_a.out
new file mode 100644
index 000000000000..423bd02ce1b6
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_a.out
@@ -0,0 +1,17 @@
+	      <
+0	      <
+01	      <
+012	      <
+0123	      <
+01234	      <
+012345	      <
+0123456	      <
+01234567      <
+012345670     <
+0123456701    <
+01234567012   <
+012345670123  <
+0123456701234 <
+0123456701234 <
+0123456701234 <
+0123456701234 <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_b.out b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_b.out
new file mode 100644
index 000000000000..b180705452a4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_b.out
@@ -0,0 +1,17 @@
+              > 	
+              > 0	
+              > 01	
+              > 012	
+              > 0123	
+              > 01234	
+              > 012345	
+              > 0123456	
+              > 01234567
+              > 012345670
+              > 0123456701
+              > 01234567012
+              > 012345670123
+              > 0123456701234
+              > 0123456701234
+              > 0123456701234
+              > 0123456701234
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_c.out b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_c.out
new file mode 100644
index 000000000000..c3013824af74
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabends_c.out
@@ -0,0 +1,17 @@
+	 <
+0	 <
+01	 <
+012	 <
+0123	 <
+01234	 <
+012345	 <
+0123456	 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
+01234567 <
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabs.out b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs.out
new file mode 100644
index 000000000000..eb34bace6c01
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs.out
@@ -0,0 +1,102 @@
+Policy: /usr/bin/lynx, Emulation: native                          Policy: /usr/bin/lynx, Emulation: native
+                                                                > 	native-issetugid: permit
+                                                                > 	native-mprotect: permit
+                                                                > 	native-mmap: permit
+	native-__sysctl: permit                                   	native-__sysctl: permit
+                                                                > 	native-fsread: filename eq "/var/run/ld.so.hints" then pe
+                                                                > 	native-fstat: permit
+	native-close: permit                                      	native-close: permit
+	native-connect: sockaddr eq "inet-[127.0.0.1]:53" then  | 	native-fsread: filename match "/usr/lib/libssl.so.*" then
+	native-connect: sockaddr match "inet-\\\[*\\\]:80" then | 	native-read: permit
+	native-exit: permit                                     | 	native-fsread: filename match "/usr/lib/libcrypto.so.*" t
+	native-fcntl: cmd eq "F_SETFD" then permit              | 	native-fsread: filename match "/usr/lib/libncurses.so.*" 
+	native-fsread: filename eq "/" then permit              | 	native-fsread: filename match "/usr/lib/libc.so.*" then p
+	native-fsread: filename match "/<non-existent filename> | 	native-munmap: permit
+	native-fsread: filename eq "/etc/lynx.cfg" then permit  | 	native-sigprocmask: permit
+	native-fsread: filename eq "/etc/malloc.conf" then perm   	native-fsread: filename eq "/etc/malloc.conf" then permit
+	native-fsread: filename eq "/etc/resolv.conf" then perm | 	native-getpid: permit
+	native-fsread: filename eq "/etc/utmp" then permit      <
+	native-fsread: filename eq "/home" then permit          <
+	native-fsread: filename eq "$HOME" then permit          <
+	native-fsread: filename eq "$HOME/.lynx-keymaps" then p <
+	native-fsread: filename eq "$HOME/.lynxrc" then permit  <
+	native-fsread: filename eq "$HOME/.mailcap" then permit <
+	native-fsread: filename eq "$HOME/.mime.types" then per <
+	native-fsread: filename eq "$HOME/.terminfo" then permi <
+	native-fsread: filename eq "$HOME/.terminfo.db" then pe <
+	native-fsread: filename eq "/obj" then permit           <
+	native-fsread: filename eq "/tmp" then permit             	native-fsread: filename eq "/tmp" then permit
+                                                                > 	native-fswrite: filename match "/tmp/lynx-*" then permit
+	native-fsread: filename match "/tmp/lynx-*/." then perm   	native-fsread: filename match "/tmp/lynx-*/." then permit
+                                                                > 	native-fsread: filename eq "$HOME" then permit
+                                                                > 	native-fsread: filename eq "/etc/lynx.cfg" then permit
+                                                                > 	native-fsread: filename eq "/" then permit
+                                                                > 	native-fsread: filename eq "/usr/obj/bin/systrace/." then
+                                                                > 	native-fsread: filename eq "/usr/obj/bin" then permit
+                                                                > 	native-fcntl: permit
+                                                                > 	native-getdirentries: permit
+                                                                > 	native-lseek: permit
+                                                                > 	native-fsread: filename eq "/usr/obj" then permit
+	native-fsread: filename eq "/usr" then permit             	native-fsread: filename eq "/usr" then permit
+	native-fsread: filename eq "/usr/bin" then permit         	native-fsread: filename eq "/usr/bin" then permit
+	native-fsread: filename eq "/usr/games" then permit       	native-fsread: filename eq "/usr/games" then permit
+	native-fsread: filename eq "/usr/include" then permit     	native-fsread: filename eq "/usr/include" then permit
+	native-fsread: filename eq "/usr/lib" then permit         	native-fsread: filename eq "/usr/lib" then permit
+	native-fsread: filename match "/usr/lib/libc.so.*" then <
+	native-fsread: filename match "/usr/lib/libcrypto.so.*" <
+	native-fsread: filename match "/usr/lib/libncurses.so.* <
+	native-fsread: filename match "/usr/lib/libssl.so.*" th <
+	native-fsread: filename eq "/usr/libdata" then permit     	native-fsread: filename eq "/usr/libdata" then permit
+	native-fsread: filename eq "/usr/libexec" then permit     	native-fsread: filename eq "/usr/libexec" then permit
+	native-fsread: filename eq "/usr/lkm" then permit         	native-fsread: filename eq "/usr/lkm" then permit
+	native-fsread: filename eq "/usr/local" then permit       	native-fsread: filename eq "/usr/local" then permit
+	native-fsread: filename eq "/usr/mdec" then permit        	native-fsread: filename eq "/usr/mdec" then permit
+	native-fsread: filename eq "/usr/obj" then permit       | 	native-fsread: filename eq "/home" then permit
+	native-fsread: filename eq "/usr/obj/bin" then permit   | 	native-fsread: filename eq "/obj" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/." th | 	native-fsread: filename eq "$HOME/.lynxrc" then permit
+                                                                > 	native-fsread: filename match "/<non-existent filename>: 
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mail   	native-fsread: filename eq "/usr/obj/bin/systrace/.mailca
+                                                                > 	native-fsread: filename eq "$HOME/.mailcap" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mime   	native-fsread: filename eq "/usr/obj/bin/systrace/.mime.t
+                                                                > 	native-fsread: filename eq "$HOME/.mime.types" then permi
+                                                                > 	native-sigaction: permit
+                                                                > 	native-ioctl: permit
+                                                                > 	native-fsread: filename eq "$HOME/.terminfo.db" then perm
+                                                                > 	native-fsread: filename eq "$HOME/.terminfo" then permit
+	native-fsread: filename eq "/usr/share/misc/terminfo.db   	native-fsread: filename eq "/usr/share/misc/terminfo.db" 
+                                                                > 	native-pread: permit
+                                                                > 	native-write: permit
+                                                                > 	native-fsread: filename eq "$HOME/.lynx-keymaps" then per
+	native-fsread: filename eq "/var/run/dev.db" then permi   	native-fsread: filename eq "/var/run/dev.db" then permit
+	native-fsread: filename eq "/var/run/ld.so.hints" then  | 	native-fsread: filename eq "/etc/utmp" then permit
+	native-fstat: permit                                    <
+	native-fswrite: filename match "/tmp/lynx-*" then permi <
+	native-getdirentries: permit                            <
+	native-getpid: permit                                   <
+	native-gettimeofday: permit                             <
+	native-ioctl: permit                                    <
+	native-issetugid: permit                                <
+	native-lseek: permit                                    <
+	native-mmap: permit                                     <
+	native-mprotect: prot eq "PROT_READ" then permit        <
+	native-mprotect: prot eq "PROT_READ|PROT_EXEC" then per <
+	native-mprotect: prot eq "PROT_READ|PROT_WRITE" then pe <
+	native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXE <
+	native-munmap: permit                                   <
+	native-nanosleep: permit                                <
+	native-poll: permit                                       	native-poll: permit
+	native-pread: permit                                    | 	native-nanosleep: permit
+	native-read: permit                                     | 	native-gettimeofday: permit
+	native-recvfrom: permit                                 | 	native-fsread: filename eq "/etc/resolv.conf" then permit
+	native-select: permit                                   <
+	native-sendto: true then permit                         <
+	native-sigaction: permit                                <
+	native-sigprocmask: permit                              <
+	native-socket: sockdom eq "AF_INET" and socktype eq "SO   	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+                                                                > 	native-connect: sockaddr eq "inet-[127.0.0.1]:53" then pe
+                                                                > 	native-sendto: true then permit
+                                                                > 	native-select: permit
+                                                                > 	native-recvfrom: permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SO   	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK
+	native-write: permit                                    | 	native-connect: sockaddr match "inet-\\\[*\\\]:80" then p
+                                                                > 	native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabs1.in b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs1.in
new file mode 100644
index 000000000000..b5a1834a3397
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs1.in
@@ -0,0 +1,72 @@
+Policy: /usr/bin/lynx, Emulation: native
+	native-__sysctl: permit
+	native-close: permit
+	native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
+	native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
+	native-exit: permit
+	native-fcntl: cmd eq "F_SETFD" then permit
+	native-fsread: filename eq "/" then permit
+	native-fsread: filename match "/<non-existent filename>: *" then permit
+	native-fsread: filename eq "/etc/lynx.cfg" then permit
+	native-fsread: filename eq "/etc/malloc.conf" then permit
+	native-fsread: filename eq "/etc/resolv.conf" then permit
+	native-fsread: filename eq "/etc/utmp" then permit
+	native-fsread: filename eq "/home" then permit
+	native-fsread: filename eq "$HOME" then permit
+	native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
+	native-fsread: filename eq "$HOME/.lynxrc" then permit
+	native-fsread: filename eq "$HOME/.mailcap" then permit
+	native-fsread: filename eq "$HOME/.mime.types" then permit
+	native-fsread: filename eq "$HOME/.terminfo" then permit
+	native-fsread: filename eq "$HOME/.terminfo.db" then permit
+	native-fsread: filename eq "/obj" then permit
+	native-fsread: filename eq "/tmp" then permit
+	native-fsread: filename match "/tmp/lynx-*/." then permit
+	native-fsread: filename eq "/usr" then permit
+	native-fsread: filename eq "/usr/bin" then permit
+	native-fsread: filename eq "/usr/games" then permit
+	native-fsread: filename eq "/usr/include" then permit
+	native-fsread: filename eq "/usr/lib" then permit
+	native-fsread: filename match "/usr/lib/libc.so.*" then permit
+	native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
+	native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
+	native-fsread: filename match "/usr/lib/libssl.so.*" then permit
+	native-fsread: filename eq "/usr/libdata" then permit
+	native-fsread: filename eq "/usr/libexec" then permit
+	native-fsread: filename eq "/usr/lkm" then permit
+	native-fsread: filename eq "/usr/local" then permit
+	native-fsread: filename eq "/usr/mdec" then permit
+	native-fsread: filename eq "/usr/obj" then permit
+	native-fsread: filename eq "/usr/obj/bin" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
+	native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
+	native-fsread: filename eq "/var/run/dev.db" then permit
+	native-fsread: filename eq "/var/run/ld.so.hints" then permit
+	native-fstat: permit
+	native-fswrite: filename match "/tmp/lynx-*" then permit
+	native-getdirentries: permit
+	native-getpid: permit
+	native-gettimeofday: permit
+	native-ioctl: permit
+	native-issetugid: permit
+	native-lseek: permit
+	native-mmap: permit
+	native-mprotect: prot eq "PROT_READ" then permit
+	native-mprotect: prot eq "PROT_READ|PROT_EXEC" then permit
+	native-mprotect: prot eq "PROT_READ|PROT_WRITE" then permit
+	native-mprotect: prot eq "PROT_READ|PROT_WRITE|PROT_EXEC" then permit
+	native-munmap: permit
+	native-nanosleep: permit
+	native-poll: permit
+	native-pread: permit
+	native-read: permit
+	native-recvfrom: permit
+	native-select: permit
+	native-sendto: true then permit
+	native-sigaction: permit
+	native-sigprocmask: permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
+	native-write: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/d_tabs2.in b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs2.in
new file mode 100644
index 000000000000..d00f4155d23b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/d_tabs2.in
@@ -0,0 +1,69 @@
+Policy: /usr/bin/lynx, Emulation: native
+	native-issetugid: permit
+	native-mprotect: permit
+	native-mmap: permit
+	native-__sysctl: permit
+	native-fsread: filename eq "/var/run/ld.so.hints" then permit
+	native-fstat: permit
+	native-close: permit
+	native-fsread: filename match "/usr/lib/libssl.so.*" then permit
+	native-read: permit
+	native-fsread: filename match "/usr/lib/libcrypto.so.*" then permit
+	native-fsread: filename match "/usr/lib/libncurses.so.*" then permit
+	native-fsread: filename match "/usr/lib/libc.so.*" then permit
+	native-munmap: permit
+	native-sigprocmask: permit
+	native-fsread: filename eq "/etc/malloc.conf" then permit
+	native-getpid: permit
+	native-fsread: filename eq "/tmp" then permit
+	native-fswrite: filename match "/tmp/lynx-*" then permit
+	native-fsread: filename match "/tmp/lynx-*/." then permit
+	native-fsread: filename eq "$HOME" then permit
+	native-fsread: filename eq "/etc/lynx.cfg" then permit
+	native-fsread: filename eq "/" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/." then permit
+	native-fsread: filename eq "/usr/obj/bin" then permit
+	native-fcntl: permit
+	native-getdirentries: permit
+	native-lseek: permit
+	native-fsread: filename eq "/usr/obj" then permit
+	native-fsread: filename eq "/usr" then permit
+	native-fsread: filename eq "/usr/bin" then permit
+	native-fsread: filename eq "/usr/games" then permit
+	native-fsread: filename eq "/usr/include" then permit
+	native-fsread: filename eq "/usr/lib" then permit
+	native-fsread: filename eq "/usr/libdata" then permit
+	native-fsread: filename eq "/usr/libexec" then permit
+	native-fsread: filename eq "/usr/lkm" then permit
+	native-fsread: filename eq "/usr/local" then permit
+	native-fsread: filename eq "/usr/mdec" then permit
+	native-fsread: filename eq "/home" then permit
+	native-fsread: filename eq "/obj" then permit
+	native-fsread: filename eq "$HOME/.lynxrc" then permit
+	native-fsread: filename match "/<non-existent filename>: *" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mailcap" then permit
+	native-fsread: filename eq "$HOME/.mailcap" then permit
+	native-fsread: filename eq "/usr/obj/bin/systrace/.mime.types" then permit
+	native-fsread: filename eq "$HOME/.mime.types" then permit
+	native-sigaction: permit
+	native-ioctl: permit
+	native-fsread: filename eq "$HOME/.terminfo.db" then permit
+	native-fsread: filename eq "$HOME/.terminfo" then permit
+	native-fsread: filename eq "/usr/share/misc/terminfo.db" then permit
+	native-pread: permit
+	native-write: permit
+	native-fsread: filename eq "$HOME/.lynx-keymaps" then permit
+	native-fsread: filename eq "/var/run/dev.db" then permit
+	native-fsread: filename eq "/etc/utmp" then permit
+	native-poll: permit
+	native-nanosleep: permit
+	native-gettimeofday: permit
+	native-fsread: filename eq "/etc/resolv.conf" then permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_DGRAM" then permit
+	native-connect: sockaddr eq "inet-[127.0.0.1]:53" then permit
+	native-sendto: true then permit
+	native-select: permit
+	native-recvfrom: permit
+	native-socket: sockdom eq "AF_INET" and socktype eq "SOCK_STREAM" then permit
+	native-connect: sockaddr match "inet-\\\[*\\\]:80" then permit
+	native-exit: permit
diff --git a/contrib/netbsd-tests/usr.bin/sdiff/t_sdiff.sh b/contrib/netbsd-tests/usr.bin/sdiff/t_sdiff.sh
new file mode 100755
index 000000000000..2d6fc2dcc882
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sdiff/t_sdiff.sh
@@ -0,0 +1,206 @@
+# $NetBSD: t_sdiff.sh,v 1.1 2012/03/17 16:33:15 jruoho Exp $
+#
+# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case flags
+flags_head()
+{
+	atf_set "descr" "Checks -l, -s and -w flags"
+}
+flags_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_flags_l.out -s eq:1 \
+	    sdiff -l "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
+
+	atf_check -o file:$(atf_get_srcdir)/d_flags_s.out -s eq:1 \
+	    sdiff -s "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
+
+	atf_check -o file:$(atf_get_srcdir)/d_flags_w.out -s eq:1 \
+	    sdiff -w 125 "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
+}
+
+atf_test_case iflags
+iflags_head()
+{
+	atf_set "descr" "Checks flags -l, -s and -w combined with -I"
+}
+iflags_body()
+{
+	tail1="-w 125 -I .*filename.* $(atf_get_srcdir)/d_input1 $(atf_get_srcdir)/d_input2"
+	tail2="-w 125 -I .*filename.* $(atf_get_srcdir)/d_input2 $(atf_get_srcdir)/d_input1"
+
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_a1.out -s eq:1 sdiff ${tail1}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_a2.out -s eq:1 sdiff ${tail2}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_b1.out -s eq:1 sdiff -s ${tail1}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_b2.out -s eq:1 sdiff -s ${tail2}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_c1.out -s eq:1 sdiff -l ${tail1}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_c2.out -s eq:1 sdiff -l ${tail2}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_d1.out -s eq:1 sdiff -s ${tail1}
+	atf_check -o file:$(atf_get_srcdir)/d_iflags_d2.out -s eq:1 sdiff -s ${tail2}
+}
+
+atf_test_case tabs
+tabs_head()
+{
+	atf_set "descr" "Checks comparing files containing tabs"
+}
+tabs_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_tabs.out -s eq:1 \
+	    sdiff "$(atf_get_srcdir)/d_tabs1.in" "$(atf_get_srcdir)/d_tabs2.in"
+}
+
+atf_test_case tabends
+tabends_head()
+{
+	atf_set "descr" "Checks correct handling of lines ended with tabs"
+}
+tabends_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_tabends_a.out -s eq:1 \
+	    sdiff -w30 "$(atf_get_srcdir)/d_tabends.in" /dev/null
+
+	atf_check -o file:$(atf_get_srcdir)/d_tabends_b.out -s eq:1 \
+	    sdiff -w30 /dev/null "$(atf_get_srcdir)/d_tabends.in"
+
+	atf_check -o file:$(atf_get_srcdir)/d_tabends_c.out -s eq:1 \
+	    sdiff -w19 "$(atf_get_srcdir)/d_tabends.in" /dev/null
+}
+
+atf_test_case merge
+merge_head()
+{
+	atf_set "descr" "Checks interactive merging"
+}
+merge_body()
+{
+	merge_tail="-o merge.out $(atf_get_srcdir)/d_input1 \
+$(atf_get_srcdir)/d_input2 >/dev/null ; cat merge.out"
+
+	cp $(atf_get_srcdir)/d_input* .
+
+	atf_check -o file:d_input1 -x "yes l | sdiff ${merge_tail}"
+	atf_check -o file:d_input2 -x "yes r | sdiff ${merge_tail}"
+
+	atf_check -o file:d_input1 -x \
+		"yes el | EDITOR=cat VISUAL=cat sdiff ${merge_tail}"
+	atf_check -o file:d_input2 -x \
+		"yes er | EDITOR=cat VISUAL=cat sdiff ${merge_tail}"
+
+	atf_check -o file:d_input1 -x "yes l | sdiff -s ${merge_tail}"
+	atf_check -o file:d_input2 -x "yes r | sdiff -s ${merge_tail}"
+	atf_check -o file:d_input1 -x "yes l | sdiff -l ${merge_tail}"
+	atf_check -o file:d_input2 -x "yes r | sdiff -l ${merge_tail}"
+	atf_check -o file:d_input1 -x "yes l | sdiff -ls ${merge_tail}"
+	atf_check -o file:d_input2 -x "yes r | sdiff -ls ${merge_tail}"
+
+	atf_check -o file:d_input1 -x "{ while :; do echo s; echo l; \
+echo v; echo l; done; } | sdiff ${merge_tail}"
+
+	atf_check -o file:d_input2 -x "{ while :; do echo s; echo r; \
+echo v; echo r; done; } | sdiff ${merge_tail}"
+}
+
+atf_test_case same
+same_head()
+{
+	atf_set "descr" "Checks comparing file with itself"
+}
+same_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_same.out \
+	    sdiff "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input1"
+}
+
+atf_test_case oneline
+oneline_head()
+{
+	atf_set "descr" "Checks comparing one-line files"
+}
+oneline_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_oneline_a.out -s eq:1 \
+	    sdiff /dev/null "$(atf_get_srcdir)/d_oneline.in"
+
+	atf_check -o file:$(atf_get_srcdir)/d_oneline_b.out -s eq:1 \
+	    sdiff "$(atf_get_srcdir)/d_oneline.in" /dev/null
+}
+
+atf_test_case dot
+dot_head()
+{
+	atf_set "descr" "Checks comparing with file containing only one character"
+}
+dot_body()
+{
+	echo ".                                                               <" > expout
+	atf_check -o file:expout -s eq:1 sdiff "$(atf_get_srcdir)/d_dot.in" /dev/null
+
+	echo "                                                                > ." > expout
+	atf_check -o file:expout -s eq:1 sdiff /dev/null "$(atf_get_srcdir)/d_dot.in"
+}
+
+atf_test_case stdin
+stdin_head()
+{
+	atf_set "descr" "Checks reading data from stdin"
+}
+stdin_body()
+{
+	echo "                                                                > stdin" > expout
+	atf_check -o file:expout -s eq:1 -x \
+	    "echo stdin | sdiff /dev/null /dev/stdin"
+
+	echo "stdin                                                           <" > expout
+	atf_check -o file:expout -s eq:1 -x \
+	    "echo stdin | sdiff /dev/stdin /dev/null"
+}
+
+atf_test_case short
+short_head()
+{
+	atf_set "descr" "Checks premature stop of merging"
+}
+short_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_short.out -x \
+	    "printf \"r\\nl\\nr\\nl\" | sdiff -o merge.out $(atf_get_srcdir)/d_input1 \
+$(atf_get_srcdir)/d_input2 >/dev/null ; cat merge.out"
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case flags
+	atf_add_test_case iflags
+	atf_add_test_case tabs
+	atf_add_test_case tabends
+	atf_add_test_case merge
+	atf_add_test_case same
+	atf_add_test_case oneline
+	atf_add_test_case dot
+	atf_add_test_case stdin
+	atf_add_test_case short
+}
diff --git a/contrib/netbsd-tests/usr.bin/sed/d_c2048.in b/contrib/netbsd-tests/usr.bin/sed/d_c2048.in
new file mode 100644
index 000000000000..96ea71ecdb76
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sed/d_c2048.in
@@ -0,0 +1 @@
+s/1/abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabc\/defghij/
diff --git a/contrib/netbsd-tests/usr.bin/sed/t_sed.sh b/contrib/netbsd-tests/usr.bin/sed/t_sed.sh
new file mode 100755
index 000000000000..892feb90561f
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sed/t_sed.sh
@@ -0,0 +1,127 @@
+# $NetBSD: t_sed.sh,v 1.5 2013/03/14 06:03:44 jmmv Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen and David A. Holland.
+#
+# 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.
+#
+
+atf_test_case c2048
+c2048_head() {
+	atf_set "descr" "Test that sed(1) does not fail when the " \
+			"2048'th character is a backslash (PR bin/25899)"
+}
+
+c2048_body() {
+
+	atf_check -s exit:0 -o inline:'foo\n' -e empty \
+		-x "echo foo | sed -f $(atf_get_srcdir)/d_c2048.in"
+}
+
+atf_test_case emptybackref
+emptybackref_head() {
+	atf_set "descr" "Test that sed(1) handles " \
+			"empty back references (PR bin/28126)"
+}
+
+emptybackref_body() {
+
+	atf_check -o inline:"foo1bar1\n" \
+		-x "echo foo1bar1 | sed -ne '/foo\(.*\)bar\1/p'"
+
+	atf_expect_fail "PR bin/28126"
+
+	atf_check -o inline:"foobar\n" \
+		-x "echo foobar | sed -ne '/foo\(.*\)bar\1/p'"
+}
+
+atf_test_case longlines
+longlines_head() {
+	atf_set "descr" "Test that sed(1) handles " \
+			"long lines correctly (PR bin/42261)"
+}
+
+longlines_body() {
+
+	str=$(awk 'BEGIN {while(x<2043){printf "x";x++}}')
+	echo $str > input
+
+	atf_check -o save:output -x "echo x | sed s,x,${str},g"
+	atf_check -s exit:0 -o empty -e empty -x "diff input output"
+}
+
+atf_test_case rangeselection
+rangeselection_head() {
+	atf_set "descr" "Test that sed(1) handles " \
+			"range selection correctly"
+}
+
+rangeselection_body() {
+	# basic cases
+	atf_check -o inline:"D\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '1,3d'"
+	atf_check -o inline:"A\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '2,4d'"
+	# two nonoverlapping ranges
+	atf_check -o inline:"C\n" \
+		-x "printf 'A\nB\nC\nD\nE\n' | sed '1,2d;4,5d'"
+	# overlapping ranges; the first prevents the second from being entered
+	atf_check -o inline:"D\nE\n" \
+		-x "printf 'A\nB\nC\nD\nE\n' | sed '1,3d;3,5d'"
+	# the 'n' command can also prevent ranges from being entered
+	atf_check -o inline:"B\nB\nC\nD\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '1,3s/A/B/;1,3n;1,3s/B/C/'"
+	atf_check -o inline:"B\nC\nC\nD\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '1,3s/A/B/;1,3n;2,3s/B/C/'"
+
+	# basic cases using regexps
+	atf_check -o inline:"D\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '/A/,/C/d'"
+	atf_check -o inline:"A\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '/B/,/D/d'"
+	# two nonoverlapping ranges
+	atf_check -o inline:"C\n" \
+		-x "printf 'A\nB\nC\nD\nE\n' | sed '/A/,/B/d;/D/,/E/d'"
+	# two overlapping ranges; the first blocks the second as above
+	atf_check -o inline:"D\nE\n" \
+		-x "printf 'A\nB\nC\nD\nE\n' | sed '/A/,/C/d;/C/,/E/d'"
+	# the 'n' command makes some lines invisible to downstreap regexps
+	atf_check -o inline:"B\nC\nC\nD\n" \
+		-x "printf 'A\nB\nC\nD\n' | sed '/A/,/C/s/A/B/;1,3n;/B/,/C/s/B/C/'"
+
+	# a range ends at the *first* matching end line
+	atf_check -o inline:"D\nC\n" \
+		-x "printf 'A\nB\nC\nD\nC\n' | sed '/A/,/C/d'"
+	# another matching start line within the range has no effect
+	atf_check -o inline:"D\nC\n" \
+		-x "printf 'A\nB\nA\nC\nD\nC\n' | sed '/A/,/C/d'"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case c2048
+	atf_add_test_case emptybackref
+	atf_add_test_case longlines
+	atf_add_test_case rangeselection
+}
diff --git a/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue
new file mode 100644
index 000000000000..5bc3348e7983
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue
@@ -0,0 +1,104 @@
+begin 644 d_pcap.out.bz2
+M0EIH.3%!62936=O8'&4!%NW?@$`00`5_\0@B0``.Y_X@8"=^\@0```````!P
+M```````![XY0O$\'N'"@P'!M=O2E=5*>#>[0M50X0`Q@V@,$-!@@$%T!A:`P
+MNATWD`,83$T&",0R,)AE/4?O1O52E*@P`$`820U`]4JH-#(#0-`)/5*JFU,:
+MAIDQ--,`("DJ$*>E&F@!B:9'J>H%0J0>BI0``:`#P[E![R+ZY%2,<&JMJ-E3
+M46V)*F;;EK75-K&QM&I2K*&T&T6+/K6_NM*C]*2HP@P@TB)E$3A/FJ+(T01D
+MEE3)*^*HLJRIC"2U2*M!2L$O=47PI1'PJ+)#2".()^T@)^44*>9`3@D/Q2`G
+MVD!-(%K\?\`````````````````````````````````!`D````D`````````
+M`````````````````````````````)"```2$````````````````````````
+M````0```````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````]]]]]]]]]]]]]]]]\]_U>^N]_A_'^7[OYZ?8#!^`0.`X
+M-W=&9F```````]]`-/L!@_`)))``````````*?;[]```````````````````
+M````````````````````````#P``!;;;;0```'.<YP````-W=W=T````DDD`
+M```&9F9F````#,S,S````!F9F9@````S,S,P````DDD````#=W=W=````)))
+M`````W=W=W0```"220````-W=W=T````DDD````#=W=W=````)))`````W=W
+M=W0```"220'\`!T`#=W=W=````)))`````W=W=W0```"220````-W=W=T```
+M`DDD````#=W=W=````)))`````W=W=W0```"220````-W=W=T````DDD````
+M#=W=W=````)))````!F9F9@`=`'0,S,S,````&9F9F````#,S,S````!F9F9
+M@````S,S,P````9F9F8````,S!)`````````````````````````````````
+M```````'FWVVVVM/L!@_`('`<!`_/S\_`````!]_?V``````S,S,P```````
+M``"WWVVVVM/L!@_`<YSG``/?0`````````6VVVT`````````````\>/'CQX\
+M>/'CQX\]]/ODW8-=SN^=SF_;]WWM/UWKN][\SQTV<,++++++9E55"JRD964C
+M*RD964C*RD964C*RD964C*RD969F4C*RF5F:2222222ZZZ2222222222ZZZ2
+M222155555569E5ZA"1F835JZZ2222222_2ZZ2222222222ZZZ2222222222Z
+MZZ2222222222ZZZ22225555557)N<Z(3KKKJ!.B2>PDA8BUYY[\["YG,W,XZ
+M0ZI3(:35+77/7,ERN5RNJ#J*U!J646HJIJB32D)4$%2$(L$/23K?/G?/O?.[
+MWWI()MWWWWWWSN]]Z$D?"0.)(_CSGOG+V]`#ODDD@``!(+:M@MX%L@MX%L%M
+M@MX%L@MX%L%M@MX%L@MX%L%M@MX%L%M@;NZ```=MMJ2#I))T=_.][WO3=W=U
+MX\[[50XD`D),$@##G.6\;VXXX\MC-"@U#LAV@]U!V@Z0Z0\J.DV39-DV39-9
+M-O,<9-DV39-DV3:>9QDT'.R;)LFR;)LFDT','*'=!\0?$'U!V@X@X@X@X@X@
+MX@X@X@X@X@X@X@X@X@Y(.0.(Q$TEJ+46HM1]?9/LT,I35%FD1K8&)PC7A-DV
+M3:U59-DV39%1*@^H/D#X@^H.(/J#B#B#B#B#B#B#B#B#B#B#B#B#B#D#B#B#
+MB#D]/4GJ:,EB*DDTDQ@S1:AW$@(KX(2E50B555WWWO>-Z?'Q^>6QB11WO;[C
+M>GU]?7EL8?S`2H!B2*$>]Z_9QZ?GQ^>6QAY)(H0;0D`"/>]>9MZ?GY^>6QF@
+M$"H$=[VWFGI]?7UY;&)'>]ON:>GU]?7EL9HH\D(H0>]Z]9MZ?GY^>6QFBCP)
+M*A!:$@6"0`520``'O>MXWI^?GYY;&:*/"%0@][UZS;T_/S\\MC#P@*$%`EY]
+M?7UYY\_/S,SY\^?*`/GDDDG0``$@MJV"W@6P6V"W@6R"W@6P6V"W@6R"W@6P
+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
+<@)V2`F0$]$!/:0$]4!/?0$_\7<D4X4)#;V!QE/"J
+`
+end
diff --git a/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pkthdrs.out.bz2.uue b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pkthdrs.out.bz2.uue
new file mode 100644
index 000000000000..aa4cb6fb778b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/d_pkthdrs.out.bz2.uue
@@ -0,0 +1,297 @@
+begin 644 d_pkthdrs.out.bz2
+M0EIH.3%!6293686CW<D`OI[9@$`00`3_\#_MWT!@5=\'P````````!\`````
+M````8[P/O`>````````M5ZU2M8;`<R[:5VT[:FVI@\!X&XTWM3;=.FFK00.=
+MWUZUJJJJ#@`!\!P.[W=:U5:P!`=ANULVU4'@,#>7KK33;500',-455U@\!@/
+M.T7K$JH^L!YM3K6M5L$^!>)T:*I:U*:`-<!&J%`*`44L!M4';&V*!@&`::0&
+MC)E355'E'J`VD)1^P89O54J@```JGL)B8$E51@`C!48CT_U4C3%*J,`$8,I[
+M?ZI-JIZC(R5$T&(`,]4B(T1B:JDR>HT]1ZC3GMVDMDD^>,22V26SY_K_%DLD
+MED))+)(MMLMP222663_4DLE1"$6RR62?Y6VV72RVR6S5DDMEJV1))9*B$(0B
+M(0A"$(LD22V2(EI+26K;^VVR6623.N_?K_&_NIK6M`;F`,8P`;[@``#8````
+M`````````````````````````````9S^O]0&Y@8DD`````N[QB;`$D@2JJ@)
+M550$JJHDD```````"20````"20````"20````"20````$D@````$D@````$D
+M@````&))`````)F0````&,8`````22`````22`````22`````22`````22``
+M```22`````22`````22`````22`````22`````22`````22`````22`````2
+M2`````22`````;[@```$D@````&<R``````22`````DD`````DD`````DD``
+M```DD`````DD`````DD`````DD`````DEW=@````````````````````````
+M```````````````"20````````````````````````````````))````````
+M`````````````````````````E3,N222222222]V0```````````````*S<`
+M```````````````E3,N8J][S>V4,W!,R)4VMG$B0NIF[D,YDDDDDDDDDR)),
+MU4WWSF7)))G.<YS=W=W+N[O?>Y+8QE4J9EW)))))))))))))))))+N[N[DDD
+MDDDDDDDDEW=W<N[NY=W=R[N\YJ8M=R23&,27=W=[W>3.,I<DDDDDDDDDDDDD
+MDFTDDJJJIM))*JJJ;222JJJF?TK]9^U]R2>MOVUK6@`J#H!V*``)@(`()@`%
+M`.P!9R``*@Z`!(`#D`L`03``3`0`+.0`"@'8`)``!T%0`.0"P``J#H``'8H`
+M``LY```$@```3`0``*@Z``Y`+``%`.Y``````````````````"0`````````
+M````````````````#L4`````````````````````````!4'0````````````
+M````````````!R`6`````````````````````````2``````````````````
+M``2``````````````````````````()@`````````````_\`%P`````````#
+MH*@````````````````````````"8"`````````````````````````$@```
+M``````````````````````!9R`````````````````````````!T%0``````
+M````````````!V*``````````````````````````J#H````````````````
+M```7`%P```.0"P`````````03``*''''$I<>\2EQ*4I<2E[+B4I2XG;Q99>N
+MV6V69FM26W5MMO:2U?-NK,3S;EEN[9;$LD66)+9$DM;MW;NW4LEW9+4DDJV5
+M)));9N2VZSGGSY[>>_7361`$0*K,S,VV9K(``@R`B``?[_SJ>:U_7],TKGOO
+MK82220```````````````$DDD`&`````````````````````````5\\KG%-6
+MJ("[N[MD"6=1=8-^TK/9E?'6*[QA".*KS7+Z;Q]F)>_>@`.@J``#MKKKJM[Q
+M>]P``````````````````````"8"`````````````M+J4N.)2E+K[YXQGV_O
+MFM9SG,>UA/$[?(M$1$>^@`*2EQQ*2=][679+"6$L*O4L)82PJ6=[9)-VR2;E
+MDCKKK7/`#G,`-Y@!K,`-9@!K,!LWF`&^V`&\P`YS`#MO6@#>8`:S!R&\P#NX
+MS`#>8`:S`#68`:S`#68V!K>M!R-Y@``&9@``&9@`T`:S#L``-9@!K,`-9@``
+M-:S``P`@``!```"`8(`'&```9F```9F``,"`%ETEDRWN,S```,S```,S`#,L
+M)WDF)863#,P`[@#68`<9@!K,```S,&P`.[G,```S,```S,`.,P;#>8'<`!K,
+M```S,```S-`'.8=@;[:`)QF`&LP`UF`&LP`UF`&LP`UF`.^\P`WF`&LP`33`
+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
+0++9);/_XNY(IPH2$+1[N2/KJ
+`
+end
diff --git a/contrib/netbsd-tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue
new file mode 100644
index 000000000000..56348b16f4c6
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue
@@ -0,0 +1,620 @@
+begin 644 shmbus.bz2
+M0EIH.3%!62936>\/Z2$`TP#_____________________________________
+M________X'+^>H!`P```````#['(&C```````(@``+7@```]````%48Z``4)
+M:\Y``%``/H`!U(`#O=O=L=`=V`#2`#8#*V,E&9CM@=MUNW7=F@6LP!\````(
+M(0>]Z[.^O<VRE(E*;#W!;%44;8*((F;2B,%@[LZ1;=P:*=V-T`66VE';!E4T
+MT[NVQ731=6;L;L9MQX`#0``H``:!.LXX`````!YCT`.G:P#3J7AFE7B`TWL#
+M5P0``````!T-W@E554``````````````````#0````?_ZJJ``-#(R>_]5-2G
+MM4#]I4_*@`#U&GO_550W_^JJH````!H]3(?^__5554(HC)30PTT#`$$W@1-(
+M%/>IH](>D](](R'J``&@`#$TT:--'J-^DD#0:`(V@9!HPF()A,$S0":,>H``
+M$P#0-#]4H)40A!C`"`S$TBGJ@/4C333$-#31B:9#":::`R9,F$TPC)@!`P$T
+M,FF)HTR:9#1B9)^A#)IB)Z,C$8AIHGID:9,0"-3U!*?JBJFDFIHVF)A2>$(T
+M_433(`/4,T3)D::9``--```&(9,",AIDT8FAB&(`::`:-&F@`&@-!@`C1D!D
+MT&$P")2:*-%/3:-!-,A,U3P3TIHFTGAH_548GZHVH>H>H_0F4]1ZAXC*:#:3
+M:GIDFU'J;4>4,Q)FIZGJ/$F)ZC;U4T]33U/4/2>4T]3TGE/4\:I^E/TIZF:3
+M]$1Y0T_2&3(GBCTTU`JI)"1C3`3U&A'HF'J8DWJ!,0C#(GIIB384S(TT$]3Q
+M3?ZJ3T:GD&331B!J;0FTT,4S)D">0TU3S1HT--!,&AHWZJ-3TTQ3Q,33$:8"
+M83:J9V-0K45+8@O4H`HM("H,@-N/CX^/OM]OM]C"9$$$9`4O0%!I`7(@,@(4
+M666%16%49%EE85AEDC(!($@2#)N3B3DRQ&L50D1%DS(S)2RS,SP1$1$1AAAA
+MAA%$41AF9F&9E1EE&%$48888888811%$9'O&6564M9M9596[AA$1AF9F&9E1
+MAAAAAAAAD11%$41D8811%$485919E11AAAAAAAAA1AAA!%$&&%)E2``D0!18
+MJ/)(C[I5(^2HE@")5`08.-!H080(08081(08Q81818141A%A!$6D%5S@+X`P
+M"(#`BI`@#$8*A&"%%*4&0:+2@R#16E!D&@"@4`08!"!")""BFKJZNKJZNKJZ
+MNKJZNKJZNKJZNKJZNKZ1O>][WO>][WO>][WO>][WZIO>][WO>][WO>][WO>]
+M[WO>][WO>][W[WOWK>][WO>_@][WO>]^$\)SG.<YSG.<YSG.<YSG.<YSG.<Y
+MSG.<YSFM:UK6M:UK6M:UK6M:UK6M:UK6M:UK6M:UK6M:UK6M:UK6M:UK6M:U
+MK6M:UK6M:UK6M:UK6M:UK6M:UK6M:UK6N<YSG.<YSG/#\YSG.<YSO><YSG.<
+MYSG.<YS\[G.<YSG.<YSP/TO`\#O^_[_Q7/%```#^<```````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````!F9F9F9F9F9F9F9F9F9F9F9F9F9F
+M9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F
+M9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F9F8`````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````_8\>NW[C(Y&B]C2Z7V?:U.KBBX"L
+M6Q.SL225*BGD\GD[.SS5HD-6B0I$$5+8EM&8IBF*5K)-H*@]:@V0&R`2`!2%
+MQ<7%@*V@@$`)`N5(14@(W06R`-("\(=V9!?*C"#"!""EB4DDE)9GCS*I6RQ+
+M))*DL2Q*2Q*2S,S5F48QC&,6"WH`6P1*04"D!6D%I`2D!QA$"$$0("MD%`+B
+MXN+`*P02Z`T@@4@(%(`!2"T@#2`H%I:6E@JML`"V"4@`4@@E("XX`@L("*P%
+MLA9!`I`0+BXN+!`MMDDDM+2TK625*E2M9))4J5*E223J=3J=G8HHO5>F]-ZK
+MUGJ/4:-ZS2-&(:1$0HE$HFD5`#*@JY4!6D!&D%4*4DN+BXK6222I4J5K)))4
+MJ5*UDDE2I4K625*E2I4A)*E2I4J1$"I4J5K(BK)*E2I7Q`/%>*\5WB@/%==P
+M'77<.NNY!UUW"ZZZX===Q)====)===G29UUUTEUUW'77721UUUUUUW"2LJZZ
+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
+MJU:>M*4I5N54<DLRE*4I2E*4J,C,<8D?("$B'D(QB?5=1N?KVF$[G<?+<<<Z
+M0JJDDTI*HHY):JJJJJJJJJJJ:A,I*/D!"1%L)!(<IR6H.G._J_%N_#\+S';^
+MI\A*>%*ZYYZY*YIZ,%==========?MA`&@C*RLG(2(C)"T$XDG$GT/BN&H<-
+M[_TFU>3V?GU:9SWW>FZEU+KO4DQFS8)L,]ZC!AU,V;-FS9LV;-FS6%9&7Q\@
+M(3(@MB9B8<V&Z4@E3`.$YEL?(KK)=YO4T-BZ4[\*/(D$$$$90#'Z&AEL*8K6
+M+5QAAAAAAE34U-39%J5Y0*%1)XI52E/8A!`@06!B\#3I]3L-U&;L_[[+B[F:
+M@?7LZ+OP@!';X<<5YL"1(D//5J5JD]>P8PYYYYYYYYYYYZP9]"\7Q\>#7"8Q
+M-0F8>)C<.9H-&]I3^TR9-33O:61^"&+)DR9,F3)DR9,G\^*!"!"$!E07Q\@(
+M1X1E/,_F<V;*=6?<&'.C[&M:N;\F'8%3*93*99GP/1=,T;/O@7I@6,?N<P]Y
+M@F<=&W[/+L\A[[\'1MTUCPG_%Q7)<ER=R^UX;(N"^QU;L'BOF<16-HUC$-"\
+MA]CB/X-*]IJV#7]@'\G2.E:9YS"K\K'%:]V+X'AO>?:K'&:IW3KV9<9G7[/N
+M:-K7:,\_)6*QL'?.\=PSS8..XKQW^7?O^MRK'&<!GGI/$9]H62;)P7F."_T]
+M%O7Y/,<%H&Y>4V;V'P-TU3;OA:MFVL9E\SSFQ;5L''>V_9^+4O<2-.^=[S8/
+MU<-M&W;!(X*1QFS:AN&S;MQ6M<!MFL;-^3ZWSM\WC]6O;9PGW/L;AMVY?]:Y
+MOV_<!MWX-BXCA-LW+AMB_1^#?-PW+CMZ_1QE8W;]'"?LX+@7^MXZ_WO&WCKQ
+ME_U?]W2\9>#>#>#>#>-O_+I=+I+I))))))))))))))))))))))))))))))))
+M))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+M))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+M))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+M))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+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
+!"$Q#
+`
+end
diff --git a/contrib/netbsd-tests/usr.bin/shmif_dumpbus/t_basic.sh b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/t_basic.sh
new file mode 100755
index 000000000000..10fea105c9b1
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/shmif_dumpbus/t_basic.sh
@@ -0,0 +1,86 @@
+#	$NetBSD: t_basic.sh,v 1.8 2013/04/07 19:14:03 christos Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+unpack_file()
+{
+
+	atf_check -s exit:0 uudecode $(atf_get_srcdir)/${1}.bz2.uue
+	atf_check -s exit:0 bunzip2 -f ${1}.bz2
+}
+
+test_case()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}"
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		unpack_file shmbus ; \
+		${name} ; \
+	}"
+}
+
+test_case header
+test_case contents
+test_case pcap
+
+ehdr='bus version 2, lock: 0, generation: 22, firstoff: 0x9e414, lastoff: 0x9dfd0'
+
+header()
+{
+
+	atf_check -s exit:0 -o inline:"${ehdr}\n" shmif_dumpbus -h shmbus
+}
+
+contents()
+{
+
+	unpack_file d_pkthdrs.out
+	atf_check -s exit:0 -o file:d_pkthdrs.out \
+	    shmif_dumpbus shmbus
+}
+
+pcap()
+{
+
+	unpack_file d_pcap.out
+	atf_check -s exit:0 -o ignore shmif_dumpbus -p pcap shmbus
+#
+#	should not fail anymore...
+#
+#	Used to fail for "PR bin/44721"
+	atf_check -s exit:0 -o file:d_pcap.out -e ignore \
+	    tcpdump -tt -r pcap
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case header
+	atf_add_test_case contents
+	atf_add_test_case pcap
+}
diff --git a/contrib/netbsd-tests/usr.bin/sort/d_any_char_dflag_out.txt b/contrib/netbsd-tests/usr.bin/sort/d_any_char_dflag_out.txt
new file mode 100644
index 000000000000..a43554513f36
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sort/d_any_char_dflag_out.txt
@@ -0,0 +1 @@
+000 
\ No newline at end of file
diff --git a/contrib/netbsd-tests/usr.bin/sort/d_any_char_fflag_out.txt b/contrib/netbsd-tests/usr.bin/sort/d_any_char_fflag_out.txt
new file mode 100644
index 000000000000..a43554513f36
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sort/d_any_char_fflag_out.txt
@@ -0,0 +1 @@
+000 
\ No newline at end of file
diff --git a/contrib/netbsd-tests/usr.bin/sort/d_any_char_iflag_out.txt b/contrib/netbsd-tests/usr.bin/sort/d_any_char_iflag_out.txt
new file mode 100644
index 000000000000..a43554513f36
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sort/d_any_char_iflag_out.txt
@@ -0,0 +1 @@
+000 
\ No newline at end of file
diff --git a/contrib/netbsd-tests/usr.bin/sort/d_any_char_in.txt b/contrib/netbsd-tests/usr.bin/sort/d_any_char_in.txt
new file mode 100644
index 000000000000..5963fcacfdbb
Binary files /dev/null and b/contrib/netbsd-tests/usr.bin/sort/d_any_char_in.txt differ
diff --git a/contrib/netbsd-tests/usr.bin/sort/t_sort.sh b/contrib/netbsd-tests/usr.bin/sort/t_sort.sh
new file mode 100755
index 000000000000..a36457cb41ec
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/sort/t_sort.sh
@@ -0,0 +1,1023 @@
+# $NetBSD: t_sort.sh,v 1.1 2012/03/17 16:33:15 jruoho Exp $
+#
+# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+	atf_set "descr" "Basic functionality test"
+}
+basic_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+x a n g
+x a n h
+y c o e
+z b m f
+EOF
+
+	atf_check -o file:expout sort in
+}
+
+atf_test_case empty_file
+empty_file_head()
+{
+	atf_set "descr" "Tests sorting an empty file"
+}
+empty_file_body()
+{
+	touch empty
+	atf_check -o empty sort -S empty
+	atf_check sort -S -c empty
+	atf_check sort -S -c -u empty
+}
+
+atf_test_case end_of_options
+end_of_options_head()
+{
+	atf_set "descr" "Determination of end of option list"
+}
+end_of_options_body()
+{
+	echo x >-k
+	atf_check -o file:-k -x "sort -S -- -k </dev/null"
+	atf_check -s not-exit:1 -e ignore -x "sort -S - -c </dev/null"
+}
+
+atf_test_case missing_newline
+missing_newline_head()
+{
+	atf_set "descr" "Tests with missing new line in input file"
+}
+missing_newline_body()
+{
+	printf '%s' x >in
+	atf_check -o inline:'x\n' sort in
+}
+
+atf_test_case null_bytes
+null_bytes_head()
+{
+	atf_set "descr" "Tests the behavior of null bytes"
+}
+null_bytes_body()
+{
+	printf '\0b\n\0a\n' >in
+	atf_check -o inline:'\0a\n\0b\n' sort -S in
+}
+
+atf_test_case long_records
+long_records_head()
+{
+	atf_set "descr" "Tests long lines and keys"
+}
+long_records_body()
+{
+	awk 'BEGIN {	x="x"
+	for(i=1; i<=12; i++) x = x x
+	for(i=15; i<=25; i++) print x i
+}' >in
+
+	awk 'BEGIN {	x="x"
+	for(i=1; i<=12; i++) x = x x
+	for(i=25; i>=15; i--) print x i
+}' >out
+
+	atf_check -o file:out sort -r in
+	atf_check -o file:out sort -k 1,1r -k 1 in
+}
+
+atf_test_case long_file
+long_file_head()
+{
+	atf_set "descr" "Tests with a long file to try to force intermediate" \
+	    "files"
+}
+long_file_body()
+{
+	awk 'BEGIN { for(i=0; i<20000; i++) print rand() }' >in
+	sort -S -r in | awk '$0 "x" != x { print ; x = $0 "x" }' >out
+	atf_check -o file:out sort -u -r in
+}
+
+atf_test_case any_char
+any_char_head()
+{
+	atf_set "descr" "Tests with files containing non-printable/extended" \
+	    "characters"
+}
+any_char_body()
+{
+	atf_check -o file:$(atf_get_srcdir)/d_any_char_dflag_out.txt \
+	    sort -d -k 2 $(atf_get_srcdir)/d_any_char_in.txt
+
+	atf_check -o file:$(atf_get_srcdir)/d_any_char_fflag_out.txt \
+	    sort -f -k 2 $(atf_get_srcdir)/d_any_char_in.txt
+
+	atf_check -o file:$(atf_get_srcdir)/d_any_char_iflag_out.txt \
+	    sort -i -k 2 $(atf_get_srcdir)/d_any_char_in.txt
+}
+
+atf_test_case bflag
+bflag_head()
+{
+	atf_set "descr" "Tests the -b flag"
+}
+bflag_body()
+{
+	cat >in <<EOF
+  b
+ a
+EOF
+
+	atf_check -o file:in sort -b in
+	atf_check -o file:in -x "sort -b <in"
+	atf_check -s exit:1 -o ignore -e ignore -x "sort in | sort -c -r"
+}
+
+atf_test_case cflag
+cflag_head()
+{
+	atf_set "descr" "Tests the -c flag"
+}
+cflag_body()
+{
+	cat >in <<EOF
+b
+a
+EOF
+
+	atf_check -s exit:1 -e ignore sort -S -c in
+}
+
+atf_test_case kflag_one_field
+kflag_one_field_head()
+{
+	atf_set "descr" "Tests the -k flag with one field"
+}
+kflag_one_field_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+x a n g
+x a n h
+z b m f
+y c o e
+EOF
+
+	atf_check -o file:expout sort -k2.1 in
+}
+
+atf_test_case kflag_two_fields
+kflag_two_fields_head()
+{
+	atf_set "descr" "Tests the -k flag with two fields"
+}
+kflag_two_fields_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+x a n h
+x a n g
+z b m f
+y c o e
+EOF
+	atf_check -o file:expout sort -k2.1,2.0 in
+}
+
+atf_test_case kflag_many_fields
+kflag_many_fields_head()
+{
+	atf_set "descr" "Tests the -k flag with many fields"
+}
+kflag_many_fields_body()
+{
+	cat >in <<EOF
+0:2:3:4:5:6:7:8:9
+1:1:3:4:5:6:7:8:9
+1:2:2:4:5:6:7:8:9
+1:2:3:3:5:6:7:8:9
+1:2:3:4:4:6:7:8:9
+1:2:3:4:5:5:7:8:9
+1:2:3:4:5:6:6:8:9
+1:2:3:4:5:6:7:7:9
+1:2:3:4:5:6:7:8:8
+EOF
+
+	cat >out <<EOF
+1:2:3:4:5:6:7:8:8
+1:2:3:4:5:6:7:7:9
+1:2:3:4:5:6:6:8:9
+1:2:3:4:5:5:7:8:9
+1:2:3:4:4:6:7:8:9
+1:2:3:3:5:6:7:8:9
+1:2:2:4:5:6:7:8:9
+1:1:3:4:5:6:7:8:9
+0:2:3:4:5:6:7:8:9
+EOF
+
+	atf_check -o file:out sort -t: -k9 -k8 -k7 -k6 -k5 -k4 -k3 \
+	    -k2 -k1 in
+}
+
+atf_test_case kflag_outofbounds
+kflag_outofbounds_head()
+{
+	atf_set "descr" "Tests the -k flag with out of bounds fields"
+}
+kflag_outofbounds_body()
+{
+	cat >in <<EOF
+0 5
+1 4
+2 3
+3 2
+4 1
+5 0
+EOF
+
+	atf_check -o file:in sort -k2.2,2.1 -k2.3,2.4 in
+}
+
+atf_test_case kflag_nonmonotone
+kflag_nonmonotone_head()
+{
+	atf_set "descr" "Tests the -k flag with apparently nonmonotone" \
+	    "field specs"
+}
+kflag_nonmonotone_body()
+{
+	cat >in <<EOF
+aaaa c
+x a
+0 b
+EOF
+
+	atf_check -o file:in sort -k2,1.3 -k2.5,2.5 in
+}
+
+atf_test_case kflag_limits
+kflag_limits_head()
+{
+	atf_set "descr" "Tests the -k flag field limits"
+}
+kflag_limits_body()
+{
+	cat >in <<EOF
+a	2
+a	1
+b	2
+b	1
+EOF
+
+	cat >out <<EOF
+b	2
+b	1
+a	2
+a	1
+EOF
+
+	atf_check -o file:out sort -r -k1,1 -k2n in
+}
+
+atf_test_case kflag_alpha
+kflag_alpha_head()
+{
+	atf_set "descr" "Tests the -k flag with various alpha fields"
+}
+kflag_alpha_body()
+{
+	sort >in <<EOF
+01:04:19:01:16:01:21:01 a
+02:03:13:15:13:19:15:02  a
+03:02:07:09:07:13:09:03   a
+04:01:01:03:01:07:03:04    a
+05:08:20:16:17:02:20:05 aa
+06:07:14:18:14:20:14:06  aa
+07:06:08:10:08:14:08:07   aa
+08:05:02:04:02:08:02:08    aa
+09:16:22:02:22:04:24:13 b
+10:15:16:20:19:22:18:14  b
+11:14:10:12:10:16:12:15   b
+12:13:04:06:04:10:06:16    b
+13:24:24:22:24:06:22:21 bb
+14:23:18:24:21:24:16:22  bb
+15:22:12:14:12:18:10:23   bb
+16:21:06:08:06:12:04:24    bb
+17:12:21:21:18:03:19:09 ab
+18:11:15:19:15:21:13:10  ab
+19:10:09:11:09:15:07:11   ab
+20:09:03:05:03:09:01:12    ab
+21:20:23:17:23:05:23:17 ba
+22:19:17:23:20:23:17:18  ba
+23:18:11:13:11:17:11:19   ba
+24:17:05:07:05:11:05:20    ba
+EOF
+
+	atf_check -x "sort -S -k2b -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k2n xx
+
+	atf_check -x "sort -S -k2,2.1b -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k3n xx
+
+	atf_check -x "sort -S -k2.3 -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k4n xx
+
+	atf_check -x "sort -S -k2b,2.3 -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k5n xx
+
+	atf_check -x "sort -S -k2.3,2.1b -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k6n xx
+
+	atf_check -x "sort -S -k2,2.1b -k2r in >xx"
+	atf_check -e ignore sort -c -t: -k7n xx
+
+	atf_check -x "sort -S -b -k2,2 -k2 in >xx"
+	atf_check -e ignore sort -c -t: -k8n xx
+
+	# XXX This test is broken.  The standard is not clear on the behavior.
+	#atf_check -x "sort -S -b -k2,2b -k2 in >xx"
+	#atf_check -e ignore sort -c -t: -k3n xx
+}
+
+atf_test_case kflag_no_end
+kflag_no_end_head()
+{
+	atf_set "descr" "Tests the -k flag with a field without end"
+}
+kflag_no_end_body()
+{
+	cat >in <<EOF
+a-B
+a+b
+a b
+A+b
+a	b
+EOF
+
+	cat >out <<EOF
+a	b
+a b
+A+b
+a-B
+a+b
+EOF
+
+	atf_check -o file:out sort -df -k 1 -k 1d <in
+}
+
+atf_test_case mflag
+mflag_head()
+{
+	atf_set "descr" "Tests the -m flag"
+}
+mflag_body()
+{
+	cat >in1 <<EOF
+a
+ab
+ab
+bc
+ca
+EOF
+	cat >in2 <<EOF
+Z
+a
+aa
+ac
+c
+EOF
+	cat >out <<EOF
+Z
+a
+a
+aa
+ab
+ab
+ac
+bc
+c
+ca
+EOF
+
+	atf_check -o file:out sort -S -m in1 in2
+}
+
+atf_test_case mflag_uflag
+mflag_uflag_head()
+{
+	atf_set "descr" "Tests the -m flag together with -u"
+}
+mflag_uflag_body()
+{
+	cat >in <<EOF
+a
+b
+c
+d
+EOF
+
+	atf_check -o file:in sort -m -u in
+}
+
+atf_test_case mflag_uflag_first
+mflag_uflag_first_head()
+{
+	atf_set "descr" "Tests that the -m flag together with -u picks the" \
+	    "first among equal"
+}
+mflag_uflag_first_body()
+{
+	cat >in <<EOF
+3B
+3b
+3B2
+~3B2
+4.1
+41
+5
+5.
+EOF
+
+	cat >out <<EOF
+3B
+3B2
+4.1
+5
+EOF
+
+	atf_check -o file:out sort -mudf in
+	atf_check -o file:out sort -mudf -k1 in
+}
+
+atf_test_case nflag
+nflag_head()
+{
+	atf_set "descr" "Tests the -n flag"
+}
+nflag_body()
+{
+	cat >in <<EOF
+-99.0
+-99.1
+-.0002
+-10
+2
+0010.000000000000000000000000000000000001
+10
+3x
+x
+EOF
+
+	cat >expout <<EOF
+-99.1
+-99.0
+-10
+-.0002
+x
+2
+3x
+10
+0010.000000000000000000000000000000000001
+EOF
+
+	atf_check -o file:expout sort -n in
+}
+
+atf_test_case nflag_rflag
+nflag_rflag_head()
+{
+	atf_set "descr" "Tests the -n and -r flag combination"
+}
+nflag_rflag_body()
+{
+	cat >in <<EOF
+1
+123
+2
+EOF
+
+	cat >expout <<EOF
+123
+2
+1
+EOF
+
+	atf_check -o file:expout sort -rn in
+}
+
+atf_test_case oflag
+oflag_head()
+{
+	atf_set "descr" "Tests the -o flag"
+}
+oflag_body()
+{
+	cat >in <<EOF
+1
+1
+2
+2
+3
+3
+4
+4
+EOF
+
+	atf_check sort -u -o in in
+
+	cat >expout <<EOF
+1
+2
+3
+4
+EOF
+
+	atf_check -o file:expout cat in
+}
+
+atf_test_case oflag_displaced
+oflag_displaced_head()
+{
+	atf_set "descr" "Tests the -o flag after the file names"
+}
+oflag_displaced_body()
+{
+	atf_check sort -S /dev/null -o out
+	test -f out || atf_fail "File not created"
+}
+
+atf_test_case rflag
+rflag_head()
+{
+	atf_set "descr" "Tests the -r flag"
+}
+rflag_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	atf_check -o file:expout sort -r in
+}
+
+atf_test_case sflag
+sflag_head()
+{
+	atf_set "descr" "Tests the -s flag"
+}
+sflag_body()
+{
+	cat >in <<EOF
+a 2
+b 1
+c 2
+a 1
+b 2
+c 1
+EOF
+
+	cat >out <<EOF
+a 2
+a 1
+b 1
+b 2
+c 2
+c 1
+EOF
+
+	atf_check -o file:out sort -s -k1,1 in
+}
+
+atf_test_case sflag_many_files
+sflag_many_files_head()
+{
+	atf_set "descr" "Tests the -s flag with multiple files"
+}
+sflag_many_files_body()
+{
+	cat >in1 <<EOF
+c 2
+a 2
+EOF
+
+	cat >in2 <<EOF
+c 1
+b 1
+a 1
+EOF
+
+	cat >out <<EOF
+c 2
+b 1
+a 2
+EOF
+
+	atf_check -o file:out sort -smru -k1,1 in1 in1 in2 in2
+}
+
+atf_test_case tflag
+tflag_head()
+{
+	atf_set "descr" "Tests the -t flag"
+}
+tflag_body()
+{
+	cat >in <<EOF
+a:
+a!
+EOF
+
+	atf_check -o file:in sort -t : -r +0 in
+	atf_check -o file:in sort -t : +0 -1 in
+	atf_check -o file:in sort -t : -r -k 1 in
+	atf_check -o file:in sort -t : -k 1,1 in
+}
+
+atf_test_case tflag_alphabetic
+tflag_alphabetic_head()
+{
+	atf_set "descr" "Tests the -t flag with a character as the delimiter"
+}
+tflag_alphabetic_body()
+{
+	cat >in <<EOF
+zXa
+yXa
+zXb
+EOF
+
+	atf_check -o file:in sort -tX -k2 -k1r,1 in
+}
+
+atf_test_case tflag_char_pos
+tflag_char_pos_head()
+{
+	atf_set "descr" "Tests the -t flag with character positions in fields"
+}
+tflag_char_pos_body()
+{
+	cat >in <<EOF
+: ab
+:bac
+EOF
+
+	cat >out <<EOF
+:bac
+: ab
+EOF
+
+	atf_check -o file:out sort -b -t: +1.1 in
+	atf_check -o file:out sort -t: +1.1r in
+	atf_check -o file:out sort -b -t: -k 2.2 in
+	atf_check -o file:out sort -t: -k 2.2r in
+}
+
+atf_test_case tflag_whitespace
+tflag_whitespace_head()
+{
+	atf_set "descr" "Tests the -t flag with spaces and tabs as the" \
+	    "delimiter"
+}
+tflag_whitespace_body()
+{
+	cat >in <<EOF
+ b c
+ b	c
+	b c
+EOF
+
+	atf_check -o file:in sort -t ' ' -k2,2 in
+	atf_check -o file:in sort -t ' ' -k2.1,2.0 in
+
+	cat >out <<EOF
+ b c
+	b c
+ b	c
+EOF
+
+	atf_check -o file:out sort -t '	' -k2,2 in
+	atf_check -o file:out sort -t '	' -k2.1,2.0 in
+
+	cat >out <<EOF
+ b	c
+	b c
+ b c
+EOF
+
+	atf_check -o file:out sort -S -k2 in
+
+	cat >out <<EOF
+	b c
+ b	c
+ b c
+EOF
+
+	atf_check -o file:out sort -S -k2b in
+}
+
+atf_test_case uflag
+uflag_head()
+{
+	atf_set "descr" "Tests the -u flag"
+}
+uflag_body()
+{
+	cat >in <<EOF
+a
+aa
+aaa
+aa
+EOF
+
+	cat >expout <<EOF
+a
+aa
+aaa
+EOF
+
+	atf_check -o file:expout sort -u in
+}
+
+atf_test_case uflag_rflag
+uflag_rflag_head()
+{
+	atf_set "descr" "Tests the -u and -r flag combination"
+}
+uflag_rflag_body()
+{
+	cat >in <<EOF
+a
+aa
+aaa
+aa
+EOF
+
+	cat >expout <<EOF
+aaa
+aa
+a
+EOF
+
+	atf_check -o file:expout sort -ru in
+}
+
+atf_test_case plus_one
+plus_one_head()
+{
+	atf_set "descr" "Tests +- addressing: +1 should become -k2.1"
+}
+plus_one_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+x a n g
+x a n h
+z b m f
+y c o e
+EOF
+
+	atf_check -o file:expout sort +1 in
+}
+
+atf_test_case plus_one_minus_two
+plus_one_minus_two_head()
+{
+	atf_set "descr" "Tests +- addressing: +1 -2 should become -k2.1,2.0"
+}
+plus_one_minus_two_body()
+{
+	cat >in <<EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+	cat >expout <<EOF
+x a n h
+x a n g
+z b m f
+y c o e
+EOF
+
+	atf_check -o file:expout sort +1 -2 in
+}
+
+atf_test_case plus_zero
+plus_zero_head()
+{
+	atf_set "descr" "Tests +- addressing: '-- +0' raised a '-k1.1: No" \
+	    "such file or directory' error"
+}
+plus_zero_body()
+{
+	echo 'good contents' >./+0
+
+	atf_check -o file:+0 sort -- +0
+}
+
+atf_test_case plus_nonmonotone
+plus_nonmonotone_head()
+{
+	atf_set "descr" "Tests += addressing: apparently nonmonotone field" \
+	    "specs"
+}
+plus_nonmonotone_body()
+{
+	cat >in <<EOF
+aaaa c
+x a
+0 b
+EOF
+
+	atf_check -o file:in sort +1 -0.3 +1.4 -1.5 in
+}
+
+atf_test_case plus_as_path
+plus_as_path_head()
+{
+	atf_set "descr" "Tests +- addressing: 'file +0' raised a '-k1.1: No" \
+	    "such file or directory' error"
+}
+plus_as_path_body()
+{
+	echo 'good contents' >./+0
+	echo 'more contents' >in
+	cat ./+0 in >expout
+
+	atf_check -o file:expout sort in +0
+}
+
+atf_test_case plus_bad_tempfile
+plus_bad_tempfile_head()
+{
+	atf_set "descr" "Tests +- addressing: intermediate wrong behavior" \
+	    "that raised a '+0: No such file or directory' error"
+}
+plus_bad_tempfile_body()
+{
+	echo 'good contents' >in
+	atf_check -o file:in sort -T /tmp +0 in
+}
+
+atf_test_case plus_rflag_invalid
+plus_rflag_invalid_head()
+{
+	atf_set "descr" "Tests +- addressing: invalid record delimiter"
+}
+plus_rflag_invalid_body()
+{
+	(
+	    echo 'z b m f'
+	    echo 'y c o e'
+	    echo 'x a n h'
+	    echo 'x a n g'
+	) | tr '\n' '+' >in
+
+	atf_check -o inline:'x a n g+x a n h+z b m f+y c o e+' \
+	    sort -R + -k2 in
+}
+
+atf_test_case plus_tflag
+plus_tflag_head()
+{
+	atf_set "descr" "Tests +- addressing: using -T caused a 'No such file" \
+	    "or directory' error"
+}
+plus_tflag_body()
+{
+	mkdir ./+
+	yes | sed 200000q | sort -T + >/dev/null || atf_fail "program failed"
+}
+
+atf_test_case plus_no_end
+plus_no_end_head()
+{
+	atf_set "descr" "Tests +- addressing: field without end"
+}
+plus_no_end_body()
+{
+	cat >in <<EOF
+a-B
+a+b
+a b
+A+b
+a	b
+EOF
+
+	cat >out <<EOF
+a	b
+a b
+A+b
+a-B
+a+b
+EOF
+
+	atf_check -o file:out sort -df +0 +0d in
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case empty_file
+	atf_add_test_case end_of_options
+	atf_add_test_case missing_newline
+	atf_add_test_case null_bytes
+	atf_add_test_case long_records
+	atf_add_test_case long_file
+	atf_add_test_case any_char
+	atf_add_test_case bflag
+	atf_add_test_case cflag
+	atf_add_test_case kflag_one_field
+	atf_add_test_case kflag_two_fields
+	atf_add_test_case kflag_many_fields
+	atf_add_test_case kflag_outofbounds
+	atf_add_test_case kflag_nonmonotone
+	atf_add_test_case kflag_limits
+	atf_add_test_case kflag_alpha
+	atf_add_test_case kflag_no_end
+	atf_add_test_case mflag
+	atf_add_test_case mflag_uflag
+	atf_add_test_case mflag_uflag_first
+	atf_add_test_case nflag
+	atf_add_test_case nflag_rflag
+	atf_add_test_case oflag
+	atf_add_test_case oflag_displaced
+	atf_add_test_case rflag
+	atf_add_test_case sflag
+	atf_add_test_case sflag_many_files
+	atf_add_test_case tflag
+	atf_add_test_case tflag_alphabetic
+	atf_add_test_case tflag_char_pos
+	atf_add_test_case tflag_whitespace
+	atf_add_test_case uflag
+	atf_add_test_case uflag_rflag
+	atf_add_test_case plus_one
+	atf_add_test_case plus_one_minus_two
+	atf_add_test_case plus_zero
+	atf_add_test_case plus_nonmonotone
+	atf_add_test_case plus_as_path
+	atf_add_test_case plus_bad_tempfile
+	atf_add_test_case plus_rflag_invalid
+	atf_add_test_case plus_tflag
+	atf_add_test_case plus_no_end
+}
diff --git a/contrib/netbsd-tests/usr.bin/tmux/t_tmux.sh b/contrib/netbsd-tests/usr.bin/tmux/t_tmux.sh
new file mode 100755
index 000000000000..f1852e5bbac6
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/tmux/t_tmux.sh
@@ -0,0 +1,49 @@
+# $NetBSD: t_tmux.sh,v 1.2 2012/05/19 07:30:37 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+stdincrash() {
+	atf_check -s ignore -o ignore -e ignore -x \
+	"\"tmux list-sessions 0<&-\" & sleep 2; kill $! >/dev/null 2>&1"
+}
+
+atf_test_case stdin
+stdin_head() {
+	atf_set "descr" "Test that tmux(1) does not crash the system " \
+			"when stdin(4) is closed (PR kern/46463)"
+}
+
+stdin_body() {
+	stdincrash
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case stdin
+}
diff --git a/contrib/netbsd-tests/usr.bin/tr/t_basic.sh b/contrib/netbsd-tests/usr.bin/tr/t_basic.sh
new file mode 100755
index 000000000000..4515d114a800
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/tr/t_basic.sh
@@ -0,0 +1,195 @@
+# $NetBSD: t_basic.sh,v 1.3 2013/08/11 01:50:02 dholland Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by David A. Holland.
+#
+# 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.
+#
+
+#
+# tr -d: delete character
+#
+atf_test_case dopt
+dopt_head() {
+	atf_set "descr" "Tests for tr -d"
+}
+
+dopt_body() {
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -d x'
+	atf_check -o inline:'abde\n' -x 'echo abcde | tr -d c'
+	atf_check -o inline:'ace\n' -x 'echo abcde | tr -d bd'
+	atf_check -o inline:'ae\n' -x 'echo abcde | tr -d b-d'
+	atf_check -o inline:'b\n' -x 'echo abcde | tr -d ac-e'
+	atf_check -o inline:'d\n' -x 'echo abcde | tr -d a-ce'
+	atf_check -o inline:'aei\n' -x 'echo abcdefghi | tr -d b-df-h'
+
+	atf_check -o inline:'' -x 'echo abcde | tr -c -d x'
+	atf_check -o inline:'c' -x 'echo abcde | tr -c -d c'
+	atf_check -o inline:'bd' -x 'echo abcde | tr -c -d bd'
+	atf_check -o inline:'bcd' -x 'echo abcde | tr -c -d b-d'
+	atf_check -o inline:'acde' -x 'echo abcde | tr -c -d ac-e'
+	atf_check -o inline:'abce' -x 'echo abcde | tr -c -d a-ce'
+	atf_check -o inline:'bcdfgh' -x 'echo abcdefghi | tr -c -d b-df-h'
+
+	# see if escape codes work
+	atf_check -o inline:'splice' -x '(echo spl; echo ice) | tr -d '"'\n'"
+	atf_check -o inline:'splice' -x '(echo spl; echo ice) | tr -d '"'\012'"
+
+	# see if escape codes work when followed by other things
+	atf_check -o inline:'slice' -x '(echo spl; echo ice) | tr -d '"'\n'p"
+	atf_check -o inline:'slice' -x '(echo spl; echo ice) | tr -d '"'\012'p"
+
+	# see if the [=x=] syntax works
+	atf_check -o inline:'abde\n' -x 'echo abcde | tr -d '"'[=c=]'"
+	atf_check -o inline:'bde\n' -x 'echo abcde | tr -d '"'[=c=]'a"
+
+	# make sure 0 works
+	# (ignore stderr as dd blabbers to it)
+	atf_check -e ignore -o inline:'ab\n' \
+	  -x '(echo -n a; dd if=/dev/zero bs=3 count=1; echo b) | tr -d '"'\0'"
+
+	# test posix classes
+	atf_check -o inline:'.\n' -x 'echo aAzZ.123 | tr -d '"'[:alnum:]'"
+	atf_check -o inline:'.123\n' -x 'echo aAzZ.123 | tr -d '"'[:alpha:]'"
+	atf_check -o inline:'az\n' -x 'echo "a z" | tr -d '"'[:blank:]'"
+	atf_check -o inline:'az' -x '(echo a; echo z) | tr -d '"'[:cntrl:]'"
+	atf_check -o inline:'aAzZ.\n' -x 'echo aAzZ.123 | tr -d '"'[:digit:]'"
+	atf_check -o inline:' \n' -x 'echo "a z.123" | tr -d '"'[:graph:]'"
+	atf_check -o inline:'AZ.123\n' -x 'echo aAzZ.123 | tr -d '"'[:lower:]'"
+	atf_check -o inline:'\n' -x 'echo aAzZ.123 | tr -d '"'[:print:]'"
+	atf_check -o inline:'aAzZ12\n' -x 'echo aAzZ.12 | tr -d '"'[:punct:]'"
+	atf_check -o inline:'az' -x 'echo "a z" | tr -d '"'[:space:]'"
+	atf_check -o inline:'az.123\n' -x 'echo aAzZ.123 | tr -d '"'[:upper:]'"
+	atf_check -o inline:'zZ.\n' -x 'echo aAzZ.123 | tr -d '"'[:xdigit:]'"
+}
+
+#
+# tr -s: squeeze duplicate character runs
+#
+atf_test_case sopt
+sopt_head() {
+	atf_set "descr" "Tests for tr -s"
+}
+
+sopt_body() {
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -s x'
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -s c'
+	atf_check -o inline:'abcde\n' -x 'echo abccccde | tr -s c'
+	atf_check -o inline:'abcde\n' -x 'echo abbbcddde | tr -s bd'
+	atf_check -o inline:'abcde\n' -x 'echo abbbcccddde | tr -s b-d'
+
+	atf_check -o inline:'acac\n' -x 'echo acac | tr -s c'
+	atf_check -o inline:'acac\n' -x 'echo accacc | tr -s c'
+
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -c -s x'
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -c -s c'
+	atf_check -o inline:'abcccde\n' -x 'echo abcccde | tr -c -s c'
+	atf_check -o inline:'abbbcddde\n' -x 'echo abbbcddde | tr -c -s bd'
+	atf_check -o inline:'abbbccddde\n' -x 'echo abbbccddde | tr -c -s b-d'
+	atf_check -o inline:'abcccde\n' -x 'echo aaabcccde | tr -c -s b-d'
+}
+
+#
+# tr -ds: both -d and -s at once
+#
+atf_test_case dsopt
+dsopt_head() {
+	atf_set "descr" "Tests for tr -ds"
+}
+
+dsopt_body() {
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -ds x y'
+	atf_check -o inline:'abde\n' -x 'echo abcde | tr -ds c x'
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr -ds x c'
+	atf_check -o inline:'abde\n' -x 'echo abcde | tr -ds c c'
+	atf_check -o inline:'abde\n' -x 'echo abcccde | tr -ds c x'
+	atf_check -o inline:'abcde\n' -x 'echo abcccde | tr -ds x c'
+	atf_check -o inline:'abde\n' -x 'echo abcccde | tr -ds c c'
+
+	# -c complements only the first string
+	atf_check -o inline:'' -x 'echo abcde | tr -c -ds x y'
+	atf_check -o inline:'c' -x 'echo abcde | tr -c -ds c x'
+	atf_check -o inline:'' -x 'echo abcde | tr -c -ds x c'
+	atf_check -o inline:'c' -x 'echo abcde | tr -c -ds c c'
+	atf_check -o inline:'ccc' -x 'echo abcccde | tr -c -ds c x'
+	atf_check -o inline:'' -x 'echo abcccde | tr -c -ds x c'
+	atf_check -o inline:'c' -x 'echo abcccde | tr -c -ds c c'
+}
+
+#
+# test substitution
+#
+atf_test_case subst
+subst_head() {
+	atf_set "descr" "Tests for tr substitution"
+}
+
+subst_body() {
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr a-c a-c'
+	atf_check -o inline:'cbade\n' -x 'echo abcde | tr a-c cba'
+	atf_check -o inline:'abcde\n' -x 'echo abcde | tr a-z a-z'
+	atf_check -o inline:'bcdef\n' -x 'echo abcde | tr a-z b-za'
+	atf_check -o inline:'zabcd\n' -x 'echo abcde | tr b-za a-z'
+	atf_check -o inline:'bbbbb\n' -x 'echo ababa | tr a b'
+	atf_check -o inline:'furrfu\n' -x 'echo sheesh | tr a-z n-za-m'
+	atf_check -o inline:'furrfu\n' -x 'echo sheesh | tr n-za-m a-z'
+
+	atf_check -o inline:'ABCDE\n' -x 'echo abcde | tr a-z A-Z'
+	atf_check -o inline:'ABC\n' \
+	    -x 'echo abc | tr '"'[:lower:]' '[:upper:]'"
+
+	# If you don't give enough substitution chars the last is repeated.
+	atf_check -o inline:'bozoo\n' -x 'echo abcde | tr a-z bozo'
+	atf_check -o inline:'qaaaa\n' -x 'echo abcde | tr a-z qa'
+
+	# You can use -s with substitution.
+	atf_check -o inline:'cbade\n' -x 'echo abcde | tr -s a-c cba'
+	atf_check -o inline:'cbaddee\n' -x 'echo aabbccddee | tr -s a-c cba'
+}
+
+#
+# test substitution with -c (does not currently work)
+#
+atf_test_case csubst
+csubst_head() {
+	atf_set "descr" "Tests for tr substitution with -c"
+}
+
+csubst_body() {
+	atf_check -o inline:'abcde\n' -x \
+	    'echo abcde | tr -c '"'\0-ac-\377' b"
+	atf_check -o inline:'abcde\n' -x \
+	    'echo abcde | tr -c '"'\0-ad-\377' bc"
+	atf_check -o inline:'QUACK\n' -x \
+	    'echo ABCDE | tr -c '"'\0-@' QUACK"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case dopt
+	atf_add_test_case sopt
+	atf_add_test_case dsopt
+	atf_add_test_case subst
+	atf_add_test_case csubst
+}
diff --git a/contrib/netbsd-tests/usr.bin/unifdef/d_basic.in b/contrib/netbsd-tests/usr.bin/unifdef/d_basic.in
new file mode 100644
index 000000000000..9de6a94a0773
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/unifdef/d_basic.in
@@ -0,0 +1,25 @@
+#if defined(__FreeBSD__)
+#include <netinet/if_fddi.h>
+#else
+#include <net/if_fddi.h>
+#endif
+
+#if defined(__FreeBSD__)
+	#include <stdbool.h>
+		#include <stdbool.h>
+			#include <stdbool.h>
+			#include <stdbool.h>
+		#include <stdbool.h>
+	#include <stdbool.h>
+#else
+#include <stdint.h>
+#endif
+
+#if defined(__FreeBSD__)
+#endif
+
+#ifdef __FreeBSD__
+#include <unistd.h>
+#else
+#include <inttypes.h>
+#endif
diff --git a/contrib/netbsd-tests/usr.bin/unifdef/d_basic.out b/contrib/netbsd-tests/usr.bin/unifdef/d_basic.out
new file mode 100644
index 000000000000..2d52e9e7ae29
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/unifdef/d_basic.out
@@ -0,0 +1,6 @@
+#include <net/if_fddi.h>
+
+#include <stdint.h>
+
+
+#include <inttypes.h>
diff --git a/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh b/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh
new file mode 100755
index 000000000000..43ca2808d7fa
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/unifdef/t_basic.sh
@@ -0,0 +1,62 @@
+# $NetBSD: t_basic.sh,v 1.6 2012/10/15 17:49:58 njoly Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head() {
+	atf_set "descr" "A basic test of unifdef(1) (PR bin/42628)"
+	atf_set "require.progs" "unifdef"
+}
+
+basic_body() {
+
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_basic.out \
+		-x "unifdef -U__FreeBSD__ $(atf_get_srcdir)/d_basic.in"
+}
+
+atf_test_case lastline
+lastline_head() {
+	atf_set "descr" "Checks with directive on last line (PR bin/47068)"
+}
+
+lastline_body() {
+
+	# With newline after cpp directive
+	printf '#ifdef foo\n#endif\n' >input
+	atf_check -o file:input unifdef -Ubar input
+
+	# Without newline after cpp directive
+	printf '#ifdef foo\n#endif' >input
+	atf_check -o file:input unifdef -Ubar input
+}
+
+atf_init_test_cases() {
+	atf_add_test_case basic
+	atf_add_test_case lastline
+}
diff --git a/contrib/netbsd-tests/usr.bin/vmstat/t_vmstat.sh b/contrib/netbsd-tests/usr.bin/vmstat/t_vmstat.sh
new file mode 100755
index 000000000000..66769007e3b6
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/vmstat/t_vmstat.sh
@@ -0,0 +1,48 @@
+# $NetBSD: t_vmstat.sh,v 1.1 2014/01/07 16:47:13 gson Exp $
+#
+# Copyright (c) 2013 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+atf_test_case default
+default_head() {
+	atf_set "descr" "Test that vmstat(1) returns success when run with no arguments"
+}
+default_body() {
+	atf_check -s exit:0 -o ignore -e empty vmstat
+}
+
+atf_test_case opt_s
+opt_s_head() {
+	atf_set "descr" "Test that vmstat(1) returns success when run with -s (PR 44518)"
+}
+opt_s_body() {
+	atf_check -s exit:0 -o ignore -e empty vmstat -s
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case default
+	atf_add_test_case opt_s
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_alignof.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_alignof.c
new file mode 100644
index 000000000000..4a661346305b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_alignof.c
@@ -0,0 +1,6 @@
+/* __alignof__ */
+int
+main(void)
+{
+	return __alignof__(short);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_num.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_num.c
new file mode 100644
index 000000000000..c3c952e7b722
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_num.c
@@ -0,0 +1,7 @@
+double cabs(double _Complex);
+
+double cabs(double _Complex foo)
+{
+	double d = __real__ foo;
+	return d + 0.1fi;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_split.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_split.c
new file mode 100644
index 000000000000..7b3d1a1d501e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_complex_split.c
@@ -0,0 +1,8 @@
+int b(double a) {
+	return a == 0;
+}
+void a(void) {
+    double _Complex z = 0;
+    if (b(__real__ z) && b(__imag__ z))
+	return;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c
new file mode 100644
index 000000000000..f32a963c76b0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c
@@ -0,0 +1,5 @@
+void sample(void)
+{
+  int i = 0; i += 1;
+  int j = 0; j += 1;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c
new file mode 100644
index 000000000000..960d392350ca
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c
@@ -0,0 +1,6 @@
+typedef int int_t;
+int main(void) {
+int i = 0; i += 1;
+int_t j = 0; j += 1;
+return 0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
new file mode 100644
index 000000000000..278fe1bb713c
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
@@ -0,0 +1,5 @@
+void sample(int i)
+{
+  i += 1;
+  int j = 0; j += 1;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_for_loops.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_for_loops.c
new file mode 100644
index 000000000000..48e380cb3600
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_for_loops.c
@@ -0,0 +1,15 @@
+/* c99 for loops */
+extern void foo(int);
+
+int
+main(void)
+{
+	// Test the basic functionality
+	for (int i = 0; i < 10; i++)
+		foo(i);
+
+	// Test that the scope of the iterator is correct
+	for (int i = 0; i < 10; i++)
+		continue;
+	return 0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_func.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_func.c
new file mode 100644
index 000000000000..b827bfa9f6bc
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_func.c
@@ -0,0 +1,7 @@
+/* C99 __func__ */
+
+void
+foo(const char *p) {
+	p = __func__;
+	foo(p);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_recursive_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_recursive_init.c
new file mode 100644
index 000000000000..347644ffe107
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_recursive_init.c
@@ -0,0 +1,13 @@
+/* C99 recursive struct/union initialization */
+struct top {
+	int i;
+	char c;
+	union onion {
+		short us;
+		char uc;
+	}  u;
+	char *s;
+} c[] = { 
+	{ .s = "foo", .c = 'b', .u = { .uc = 'c' } },
+	{ .i = 1, .c = 'a', .u = { .us = 2 } },
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_struct_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_struct_init.c
new file mode 100644
index 000000000000..a94cbd163897
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_struct_init.c
@@ -0,0 +1,10 @@
+/* C99 struct initialization */
+struct {
+	int i;
+	char *s;
+} c[] = { 
+	{ .i =  2, },
+	{ .s =  "foo" },
+	{ .i =  1, .s = "bar" },
+	{ .s =  "foo", .i = -1 },
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init1.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init1.c
new file mode 100644
index 000000000000..0e1a1a8323d9
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init1.c
@@ -0,0 +1,8 @@
+/* C99 union initialization */
+union {
+	int i;
+	char *s;
+} c[] = { 
+	{ i: 1 },
+	{ s: "foo" }
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init2.c
new file mode 100644
index 000000000000..51d34d450f21
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init2.c
@@ -0,0 +1,8 @@
+/* C99 union initialization */
+union {
+	int i[10];
+	short s;
+} c[] = { 
+	{ s: 2 },
+	{ i: { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 } },
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init3.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init3.c
new file mode 100644
index 000000000000..f5e8b59f4621
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init3.c
@@ -0,0 +1,8 @@
+/* C99 union initialization */
+struct {
+	int i[10];
+	char *s;
+} c[] = { 
+	{ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+	"foo" },
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_array_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_array_init.c
new file mode 100644
index 000000000000..66f0e9ec158e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_array_init.c
@@ -0,0 +1,6 @@
+/* C9X array initializers */
+int foo[256] = {
+	[2] = 1,
+	[3] = 2,
+	[4 ... 5] = 3
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c
new file mode 100644
index 000000000000..df907cd7a3cd
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c
@@ -0,0 +1,16 @@
+/* C9X struct/union member init, with nested union and trailing member */
+union node {
+	void *next;
+	char *data;
+};
+struct foo {
+	int b;
+	union node n;
+	int c;
+};
+
+struct foo f = {
+	.b = 1,
+	.n = { .next = 0, },
+	.c = 1
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init.c
new file mode 100644
index 000000000000..36986e800ac4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init.c
@@ -0,0 +1,27 @@
+/* cast initialization */
+typedef unsigned char u_char;
+typedef unsigned int size_t;
+struct	sockaddr_x25 {
+	u_char	x25_len;
+	u_char	x25_family;	 
+	short	x25_net;	 
+	char	x25_addr[16];	 
+	struct	x25opts {
+		char	op_flags;	 
+		char	op_psize;	 
+		char	op_wsize;	 
+		char	op_speed;	 
+	} x25_opts;
+	short	x25_udlen;	 
+	char	x25_udata[16];	 
+};
+
+struct sockaddr_x25 x25_dgmask = {
+	(unsigned char)(unsigned char)(unsigned int)(unsigned long)(&((( struct sockaddr_x25  *)0)->x25_udata[1])) ,	 
+	0,		 
+	0,		 
+	{-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},	 
+	{0, 0, 0, 0},		 
+	-1,		 
+	{-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},	 
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init2.c
new file mode 100644
index 000000000000..9597d3580397
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_init2.c
@@ -0,0 +1,7 @@
+/* cast initialization as the rhs of a - operand */
+struct sockaddr_dl {
+	char sdl_data[2];
+};
+
+int             npdl_datasize = sizeof(struct sockaddr_dl) -
+((int) ((unsigned long)&((struct sockaddr_dl *) 0)->sdl_data[0]));
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_lhs.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_lhs.c
new file mode 100644
index 000000000000..eb865695535f
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_lhs.c
@@ -0,0 +1,7 @@
+/* pointer casts are valid lhs lvalues */
+struct sockaddr { };
+void
+foo() {
+    unsigned long p = 6;
+    ((struct sockaddr *)p) = 0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals1.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals1.c
new file mode 100644
index 000000000000..cd1987ae17de
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals1.c
@@ -0,0 +1,11 @@
+/* compound literals */
+
+struct p {
+	short a, b, c, d;
+};
+
+foo()
+{
+	struct p me = (struct p) {1, 2, 3, 4};
+	me.a = me.b;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals2.c
new file mode 100644
index 000000000000..e4ffb929873f
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_compound_literals2.c
@@ -0,0 +1,18 @@
+/* compound literals */
+
+struct p {
+	short a, b, c, d;
+} zz = {
+	1, 2, 3, 4
+};
+
+struct p *bar(int i)
+{
+	static struct p q[10];
+	return &q[i];
+}
+
+foo()
+{
+	*bar(1) = (struct p) { 1, 2, 3, 4 };
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv1.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv1.c
new file mode 100644
index 000000000000..53795c5fe858
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv1.c
@@ -0,0 +1,9 @@
+/* Flag information-losing constant conversion in argument lists */
+
+int f(unsigned int);
+
+void
+should_fail()
+{
+	f(-1);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv2.c
new file mode 100644
index 000000000000..87066c96b5a8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_constant_conv2.c
@@ -0,0 +1,9 @@
+/* Flag information-losing constant conversion in argument lists */
+
+int f(unsigned int);
+
+void
+should_fail()
+{
+	f(2.1);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_constant.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_constant.c
new file mode 100644
index 000000000000..aa74509fa42e
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_constant.c
@@ -0,0 +1,8 @@
+/* the second assignment assumes failed before */
+int
+main(void) {
+    double x = 1;
+    int foo = 0;
+    if (foo)
+	x = 1;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c
new file mode 100644
index 000000000000..4a6149c67224
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cvt_in_ternary.c
@@ -0,0 +1,13 @@
+/* CVT node handling in ?: operator */
+typedef unsigned long int size_t;
+struct filecore_direntry {
+	unsigned len:32;
+};
+int
+main(void)
+{
+	struct filecore_direntry dirent = { 0 };
+	size_t  uio_resid = 0;
+	size_t bytelen = (((dirent.len)<(uio_resid))?(dirent.len):(uio_resid));
+	return bytelen;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c
new file mode 100644
index 000000000000..ba4a338d29ae
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_ellipsis_in_switch.c
@@ -0,0 +1,11 @@
+int x(void)
+{
+	int i = 33;
+	switch (i) {
+	case 1 ... 40:
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c
new file mode 100644
index 000000000000..d970be182648
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements1.c
@@ -0,0 +1,7 @@
+/* GCC compound statements */
+
+foo(unsigned long z)
+{
+	z = ({ unsigned long tmp; tmp = 1; tmp; });
+	foo(z);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements2.c
new file mode 100644
index 000000000000..fa1ee67302c5
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements2.c
@@ -0,0 +1,14 @@
+/* GCC compound statements with non-expressions */
+struct cpu_info {
+	int bar;
+};
+
+int
+main(void)
+{
+	return ({
+	    struct cpu_info *__ci;
+	    __asm__ volatile("movl %%fs:4,%0":"=r" (__ci));
+	    __ci;
+	})->bar;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements3.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements3.c
new file mode 100644
index 000000000000..29e9063dcf4a
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_compound_statements3.c
@@ -0,0 +1,10 @@
+/* GCC compound statements with void type */
+
+void
+main(void)
+{
+	({
+		void *v;
+		__asm__ volatile("noop");
+	});
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_extension.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_extension.c
new file mode 100644
index 000000000000..d8bd8f5fe944
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_extension.c
@@ -0,0 +1,6 @@
+/* extension */
+void a(void) {
+    double __logbw = 1;
+    if (__extension__(({ __typeof((__logbw)) x_ = (__logbw); !__builtin_isinf((x_)) && !__builtin_isnan((x_)); })))
+	__logbw = 1;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_func.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_func.c
new file mode 100644
index 000000000000..459919de2955
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_func.c
@@ -0,0 +1,7 @@
+/* gcc __FUNCTION__ */
+
+void
+foo(const char *p) {
+	p = __FUNCTION__;
+	foo(p);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c
new file mode 100644
index 000000000000..d5b01ad0c2d2
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c
@@ -0,0 +1,7 @@
+/* gcc: variable array initializer */
+void foo(int i)
+{
+	int array[i];
+	while (i--)
+		foo(array[i] = 0);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_incorrect_array_size.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_incorrect_array_size.c
new file mode 100644
index 000000000000..c86c0d6b3b70
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_incorrect_array_size.c
@@ -0,0 +1,3 @@
+struct foo {
+	int a[-1];
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_long_double_int.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_long_double_int.c
new file mode 100644
index 000000000000..a5a644e3e3d4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_long_double_int.c
@@ -0,0 +1,7 @@
+/* PR 39639: writing "long double" gave "long int" */
+
+int
+fail(long double *a, long int *b)
+{
+	return a == b;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nested_structs.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nested_structs.c
new file mode 100644
index 000000000000..edd3396bd224
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nested_structs.c
@@ -0,0 +1,21 @@
+/* Nested struct */
+typedef void *EditLine;
+typedef void *History;
+
+typedef struct {
+	EditLine	*el;
+	History		*hist;
+} el_mode_t;
+
+struct el_modes_s {
+	el_mode_t command;
+	el_mode_t string;
+	el_mode_t filec;
+	el_mode_t mime_enc;
+};
+
+struct el_modes_s elm = {
+	.command  = { .el = 0, .hist = 0, },
+	.string   = { .el = 0, .hist = 0, },
+	.filec    = { .el = 0, .hist = 0, },
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nolimit_init.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nolimit_init.c
new file mode 100644
index 000000000000..68e71b4df050
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_nolimit_init.c
@@ -0,0 +1,4 @@
+/* no limit initializers */
+char foo[][4] = {
+	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_packed_structs.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_packed_structs.c
new file mode 100644
index 000000000000..71b438496f92
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_packed_structs.c
@@ -0,0 +1,35 @@
+/* packed tests */
+
+struct in_addr {
+	int x;
+};
+struct	ip_timestamp {
+	char ipt_code;
+	char ipt_len;
+	char ipt_ptr;
+	unsigned int ipt_flg:4,
+		     ipt_oflw:4;
+	union ipt_timestamp {
+		 int	ipt_time[1];
+		 struct	ipt_ta {
+			struct in_addr ipt_addr;
+			int ipt_time;
+		 } ipt_ta[1] __packed;
+	} ipt_timestamp __packed;
+} __packed;
+
+typedef struct __packed {
+	int x;
+} t;
+
+struct x {
+	char c;
+	long l;
+} __packed;
+
+struct y {
+	char c;
+	long l;
+};
+
+int a[sizeof(struct y) - sizeof(struct x) - 1];
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c
new file mode 100644
index 000000000000..0208944a2d12
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c
@@ -0,0 +1,24 @@
+// Test that type shifts that result to narrower types don't produce warnings.
+
+void
+foo(void) {
+	unsigned long l = 100;
+	unsigned long long ll = 100;
+	unsigned int i = 100;
+	unsigned short s = 100;
+	unsigned char c = 1;
+
+	l = ll >> 32;
+//	i = ll >> 31;
+	i = ll >> 32;
+	s = ll >> 48;
+	c = ll >> 56;
+	s = i >> 16;
+	c = i >> 24;
+	c = s >> 8;
+	(void)&ll;
+	(void)&l;
+	(void)&i;
+	(void)&s;
+	(void)&c;
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv1.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv1.c
new file mode 100644
index 000000000000..d9e470e941b9
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv1.c
@@ -0,0 +1,11 @@
+/* Flag information-losing type conversion in argument lists */
+
+int f(unsigned int);
+
+void
+should_fail()
+{
+	long long x = 20;
+
+	f(x);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv2.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv2.c
new file mode 100644
index 000000000000..7c2e1f478ecd
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv2.c
@@ -0,0 +1,11 @@
+/* Flag information-losing type conversion in argument lists */
+
+int f(float);
+
+void
+should_fail()
+{
+	double x = 2.0;
+
+	f(x);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv3.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv3.c
new file mode 100644
index 000000000000..bc6a8e695ada
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_conv3.c
@@ -0,0 +1,10 @@
+/* Flag information-losing type conversion in argument lists */
+
+int f(unsigned int);
+
+void
+should_fail()
+{
+
+	f(0x7fffffffffffffffLL);
+}
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typename_as_var.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typename_as_var.c
new file mode 100644
index 000000000000..248dc7558b52
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typename_as_var.c
@@ -0,0 +1,14 @@
+typedef char h[10];
+
+typedef struct {
+	int i;
+	char *c;
+} fh;
+
+struct foo {
+	fh h;
+	struct {
+		int x;
+		int y;
+	} fl;
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c
new file mode 100644
index 000000000000..9c06c6b5e413
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c
@@ -0,0 +1,3 @@
+struct foo {
+int a[0];
+};
diff --git a/contrib/netbsd-tests/usr.bin/xlint/lint1/t_integration.sh b/contrib/netbsd-tests/usr.bin/xlint/lint1/t_integration.sh
new file mode 100755
index 000000000000..9575f9664d3b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.bin/xlint/lint1/t_integration.sh
@@ -0,0 +1,132 @@
+# $NetBSD: t_integration.sh,v 1.4 2014/04/21 19:10:41 christos Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+LINT1=/usr/libexec/lint1
+
+Names=
+
+check_valid()
+{
+	atf_check -s exit:0 ${LINT1} -g -S "$(atf_get_srcdir)/$1" /dev/null
+}
+
+check_invalid()
+{
+	atf_check -s not-exit:0 -o ignore -e ignore ${LINT1} -g -S -w \
+	    "$(atf_get_srcdir)/$1" /dev/null
+}
+
+test_case()
+{
+	local result="${1}"; shift
+	local name="${1}"; shift
+	local descr="${*}"
+
+	atf_test_case ${name}
+	eval "${name}_head() {
+		atf_set \"descr\" \"${descr}\";
+		atf_set \"require.progs\" \"${LINT1}\";
+	}"
+	eval "${name}_body() {
+		${result} d_${name}.c;
+	}"
+
+	Names="${Names} ${name}"
+}
+
+test_case check_valid c99_struct_init "Checks C99 struct initialization"
+test_case check_valid c99_union_init1 "Checks C99 union initialization"
+test_case check_valid c99_union_init2 "Checks C99 union initialization"
+test_case check_valid c99_union_init3 "Checks C99 union initialization"
+test_case check_valid c99_recursive_init "Checks C99 recursive struct/union" \
+    "initialization"
+test_case check_valid c9x_recursive_init "Checks C9X struct/union member" \
+    "init, with nested union and trailing member"
+test_case check_valid nested_structs "Checks nested structs"
+test_case check_valid packed_structs "Checks packed structs"
+
+test_case check_valid cast_init "Checks cast initialization"
+test_case check_valid cast_init2 "Checks cast initialization as the rhs of a" \
+    "- operand"
+test_case check_valid cast_lhs "Checks whether pointer casts are valid lhs" \
+    "lvalues"
+
+test_case check_valid gcc_func "Checks GCC __FUNCTION__"
+test_case check_valid c99_func "Checks C99 __func__"
+
+test_case check_valid gcc_variable_array_init "Checks GCC variable array" \
+    "initializers"
+test_case check_valid c9x_array_init "Checks C9X array initializers"
+test_case check_valid c99_decls_after_stmt "Checks C99 decls after statements"
+test_case check_valid c99_decls_after_stmt3 "Checks C99 decls after statements"
+test_case check_valid nolimit_init "Checks no limit initializers"
+test_case check_valid zero_sized_arrays "Checks zero sized arrays"
+
+test_case check_valid compound_literals1 "Checks compound literals"
+test_case check_valid compound_literals2 "Checks compound literals"
+test_case check_valid gcc_compound_statements1 "Checks GCC compound statements"
+test_case check_valid gcc_compound_statements2 "Checks GCC compound" \
+    "statements with non-expressions"
+test_case check_valid gcc_compound_statements3 "Checks GCC compound" \
+    "statements with void type"
+# XXX: Because of polymorphic __builtin_isnan and expression has null effect
+# test_case check_valid gcc_extension "Checks GCC __extension__ and __typeof__"
+
+test_case check_valid cvt_in_ternary "Checks CVT nodes handling in ?" \
+test_case check_valid cvt_constant "Checks constant conversion"
+test_case check_valid ellipsis_in_switch "Checks ellipsis in switch()"
+test_case check_valid c99_complex_num "Checks C99 complex numbers"
+test_case check_valid c99_complex_split "Checks C99 complex access"
+test_case check_valid c99_for_loops "Checks C99 for loops"
+test_case check_valid alignof "Checks __alignof__"
+test_case check_valid shift_to_narrower_type "Checks that type shifts that" \
+    "result in narrower types do not produce warnings"
+
+test_case check_invalid constant_conv1 "Checks failing on information-losing" \
+    "constant conversion in argument lists"
+test_case check_invalid constant_conv2 "Checks failing on information-losing" \
+    "constant conversion in argument lists"
+
+test_case check_invalid type_conv1 "Checks failing on information-losing" \
+    "type conversion in argument lists"
+test_case check_invalid type_conv2 "Checks failing on information-losing" \
+    "type conversion in argument lists"
+test_case check_invalid type_conv3 "Checks failing on information-losing" \
+    "type conversion in argument lists"
+
+test_case check_invalid incorrect_array_size "Checks failing on incorrect" \
+    "array sizes"
+
+test_case check_invalid long_double_int "Checks for confusion of 'long" \
+    "double' with 'long int'; PR 39639"
+
+atf_init_test_cases()
+{
+	for name in ${Names}; do
+		atf_add_test_case ${name}
+	done
+}
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_convert.in b/contrib/netbsd-tests/usr.sbin/mtree/d_convert.in
new file mode 100644
index 000000000000..6a1abb07e1b0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_convert.in
@@ -0,0 +1,40 @@
+# Similar to d_create.out, but a few entries have been deleted; nlink,
+# size and sha256 attributes have been removed; and the order has been
+# changed to test sorting.
+
+# .
+.               type=dir
+    a.symlink.1 type=link link=a.file.1
+    top.dangling type=link link=nonexistent
+    top.symlink.b \
+                type=link link=b
+
+# ./b
+b               type=dir
+    b.file.2    type=file
+    b.file.1    type=file
+# end ./b, up to "."
+..
+
+    top.file.1  type=file
+
+# ./a
+a               type=dir
+    a.file.2    type=file
+
+# ./a/1
+1               type=dir
+    a1.file.1   type=file
+# end ./a/1, up to "./a"
+..
+
+    a.file.1    type=file
+
+# ./a/2
+2               type=dir
+# end ./a/2, up to "./a"
+..
+
+# end ./a, up to "."
+..
+
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C.out b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C.out
new file mode 100644
index 000000000000..de4d9f6e5a2d
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C.out
@@ -0,0 +1,14 @@
+. type=dir
+./a.symlink.1 type=link link=a.file.1
+./top.dangling type=link link=nonexistent
+./top.symlink.b type=link link=b
+./b type=dir
+./b/b.file.2 type=file
+./b/b.file.1 type=file
+./top.file.1 type=file
+./a type=dir
+./a/a.file.2 type=file
+./a/1 type=dir
+./a/1/a1.file.1 type=file
+./a/a.file.1 type=file
+./a/2 type=dir
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C_S.out b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C_S.out
new file mode 100644
index 000000000000..bd03cc458859
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_C_S.out
@@ -0,0 +1,14 @@
+. type=dir
+./a.symlink.1 type=link link=a.file.1
+./top.dangling type=link link=nonexistent
+./top.file.1 type=file
+./top.symlink.b type=link link=b
+./a type=dir
+./a/a.file.1 type=file
+./a/a.file.2 type=file
+./a/1 type=dir
+./a/1/a1.file.1 type=file
+./a/2 type=dir
+./b type=dir
+./b/b.file.1 type=file
+./b/b.file.2 type=file
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D.out b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D.out
new file mode 100644
index 000000000000..c059478131a0
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D.out
@@ -0,0 +1,14 @@
+type=dir .
+type=link link=a.file.1 ./a.symlink.1
+type=link link=nonexistent ./top.dangling
+type=link link=b ./top.symlink.b
+type=dir ./b
+type=file ./b/b.file.2
+type=file ./b/b.file.1
+type=file ./top.file.1
+type=dir ./a
+type=file ./a/a.file.2
+type=dir ./a/1
+type=file ./a/1/a1.file.1
+type=file ./a/a.file.1
+type=dir ./a/2
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D_S.out b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D_S.out
new file mode 100644
index 000000000000..a777a0b0112f
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_convert_D_S.out
@@ -0,0 +1,14 @@
+type=dir .
+type=link link=a.file.1 ./a.symlink.1
+type=link link=nonexistent ./top.dangling
+type=file ./top.file.1
+type=link link=b ./top.symlink.b
+type=dir ./a
+type=file ./a/a.file.1
+type=file ./a/a.file.2
+type=dir ./a/1
+type=file ./a/1/a1.file.1
+type=dir ./a/2
+type=dir ./b
+type=file ./b/b.file.1
+type=file ./b/b.file.2
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_merge.in b/contrib/netbsd-tests/usr.sbin/mtree/d_merge.in
new file mode 100644
index 000000000000..9efd04b018c8
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_merge.in
@@ -0,0 +1,27 @@
+# The last entry for any duplicate node should take precedence.
+
+.                               type=dir
+
+# directory "a" with only one entry, changing from dir to link
+./a                             type=dir
+./a/change-dir-to-link          type=dir  mode=0755
+./a/change-dir-to-link          type=link  mode=0755
+
+# directory "b" with only one entry, changing from link to dir
+./b                             type=dir
+./b/change-link-to-dir          type=link  mode=0755
+./b/change-link-to-dir          type=dir  mode=0755
+
+# directory "c" with multiple entries, one changing from dir to link
+./c                             type=dir
+./c/aaa                         type=file
+./c/zzz                         type=file
+./c/change-dir-to-link          type=dir  mode=0755
+./c/change-dir-to-link          type=link  mode=0755
+
+# directory "d" with multiple entries, one changing from link to dir
+./d                             type=dir
+./d/aaa                         type=file
+./d/zzz                         type=file
+./d/change-link-to-dir          type=link  mode=0755
+./d/change-link-to-dir          type=dir  mode=0755
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M.out b/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M.out
new file mode 100644
index 000000000000..dea996699ffc
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M.out
@@ -0,0 +1,13 @@
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/zzz type=file
+./c/change-dir-to-link type=link mode=0755
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M_S.out b/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M_S.out
new file mode 100644
index 000000000000..9f02beae7a2b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/d_merge_C_M_S.out
@@ -0,0 +1,13 @@
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/change-dir-to-link type=link mode=0755
+./c/zzz type=file
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/mtree_d_create.out b/contrib/netbsd-tests/usr.sbin/mtree/mtree_d_create.out
new file mode 100644
index 000000000000..389ec653e076
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/mtree_d_create.out
@@ -0,0 +1,55 @@
+#	   user: x
+#	machine: x
+#	   tree: x
+#	   date: x
+
+# .
+/set type=file nlink=1
+.               type=dir nlink=4
+    a.symlink.1 type=link link=a.file.1
+    top.dangling \
+                type=link link=nonexistent
+    top.file.1  size=18 \
+                sha256=74c53aaf0cd9543b7efad969de1058ee38859134ba467500b849811fc3513195
+    top.symlink.b \
+                type=link link=b
+
+# ./a
+a               type=dir nlink=4
+    a.file.1    size=18 \
+                sha256=bdbea62f7ccdf862f22254ea871d523845250010d5f233896e800142a859eef2
+    a.file.2    size=18 \
+                sha256=77876d113fe1b45a41f8d1d3e178aaad7f91fcd93d3df782690625b74ad90fe6
+    a.hardlink.b2 \
+                nlink=2 size=18 \
+                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
+
+# ./a/1
+1               type=dir nlink=2
+    a1.file.1   size=21 \
+                sha256=a062cd272facdd38c4fdeff2a18947b28c99a28a8fe51f88468978740382e592
+# ./a/1
+..
+
+
+# ./a/2
+2               type=dir nlink=2
+# ./a/2
+..
+
+# ./a
+..
+
+
+# ./b
+b               type=dir nlink=2
+    b.file.1    nlink=2 size=18 \
+                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
+    b.file.2    nlink=2 size=18 \
+                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
+    b.hardlink.1 \
+                nlink=2 size=18 \
+                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
+# ./b
+..
+
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/netbsd6_d_create.out b/contrib/netbsd-tests/usr.sbin/mtree/netbsd6_d_create.out
new file mode 100644
index 000000000000..389ec653e076
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/netbsd6_d_create.out
@@ -0,0 +1,55 @@
+#	   user: x
+#	machine: x
+#	   tree: x
+#	   date: x
+
+# .
+/set type=file nlink=1
+.               type=dir nlink=4
+    a.symlink.1 type=link link=a.file.1
+    top.dangling \
+                type=link link=nonexistent
+    top.file.1  size=18 \
+                sha256=74c53aaf0cd9543b7efad969de1058ee38859134ba467500b849811fc3513195
+    top.symlink.b \
+                type=link link=b
+
+# ./a
+a               type=dir nlink=4
+    a.file.1    size=18 \
+                sha256=bdbea62f7ccdf862f22254ea871d523845250010d5f233896e800142a859eef2
+    a.file.2    size=18 \
+                sha256=77876d113fe1b45a41f8d1d3e178aaad7f91fcd93d3df782690625b74ad90fe6
+    a.hardlink.b2 \
+                nlink=2 size=18 \
+                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
+
+# ./a/1
+1               type=dir nlink=2
+    a1.file.1   size=21 \
+                sha256=a062cd272facdd38c4fdeff2a18947b28c99a28a8fe51f88468978740382e592
+# ./a/1
+..
+
+
+# ./a/2
+2               type=dir nlink=2
+# ./a/2
+..
+
+# ./a
+..
+
+
+# ./b
+b               type=dir nlink=2
+    b.file.1    nlink=2 size=18 \
+                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
+    b.file.2    nlink=2 size=18 \
+                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
+    b.hardlink.1 \
+                nlink=2 size=18 \
+                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
+# ./b
+..
+
diff --git a/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh b/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
new file mode 100755
index 000000000000..20fda75e02ea
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
@@ -0,0 +1,422 @@
+# $NetBSD: t_mtree.sh,v 1.6 2013/02/05 16:49:42 christos Exp $
+#
+# Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# Postprocess mtree output, canonicalising portions that
+# are expected to differ from one run to another.
+#
+
+h_postprocess()
+{
+	sed -e '
+		/^#	   user: /s/:.*/: x/
+		/^#	machine: /s/:.*/: x/
+		/^#	   tree: /s/:.*/: x/
+		/^#	   date: /s/:.*/: x/
+		' \
+	    -e '/type=dir/s/ size=[0-9]*//'
+}
+
+h_check()
+{
+        diff -Nru "$1" "$2" || atf_fail "files $1 and $2 differ"
+}
+
+
+atf_test_case mtree_create
+atf_test_case netbsd6_create
+create_head()
+{
+	atf_set "descr" "Create a specfile describing a directory tree"
+}
+
+create_setup()
+{
+	# create some directories
+	rm -fr create
+	mkdir -p create/a/1 create/a/2 create/b
+	# create some files
+	for file in create/top.file.1 \
+		    create/a/a.file.1 \
+		    create/a/a.file.2 \
+		    create/a/1/a1.file.1 \
+		    create/b/b.file.1 \
+		    create/b/b.file.2
+	do
+		echo "$file" >$file
+	done
+	# hard link to file in same dir
+	ln create/b/b.file.1 create/b/b.hardlink.1
+	# hard link to file in another dir
+	ln create/b/b.file.2 create/a/a.hardlink.b2
+	# symlink to file
+	ln -s a.file.1 create/a.symlink.1
+	# symlink to dir
+	ln -s b create/top.symlink.b
+	# dangling symlink
+	ln -s nonexistent create/top.dangling
+}
+
+create_body()
+{
+	create_setup
+
+	# run mtree and check output
+	( cd create && mtree -F ${FLAVOR} -c -k type,nlink,link,size,sha256 ) >output.raw \
+	|| atf_fail "mtree exit status $?"
+	h_postprocess <output.raw >output
+	h_check "$(atf_get_srcdir)/${FLAVOR}_d_create.out" output
+}
+
+mtree_create_head() 
+{
+	FLAVOR=mtree create_head
+}
+netbsd6_create_head() 
+{
+	FLAVOR=netbsd6 create_head
+}
+
+mtree_create_body() 
+{
+	FLAVOR=mtree create_body
+}
+netbsd6_create_body() 
+{
+	FLAVOR=netbsd6 create_body
+}
+
+
+atf_test_case mtree_check
+atf_test_case netbsd6_check
+check_head()
+{
+	atf_set "descr" "Check a directory tree against a specfile"
+}
+
+check_body()
+{
+	# we use the same directory tree and specfile as in the "create" test
+	create_setup
+
+	# run mtree and check output
+	( cd create && mtree -F ${FLAVOR}  ) <"$(atf_get_srcdir)/${FLAVOR}_d_create.out" >output \
+	|| atf_fail "mtree exit status $?"
+	h_check /dev/null output
+}
+
+mtree_check_head() 
+{
+	FLAVOR=mtree check_head
+}
+netbsd6_check_head() 
+{
+	FLAVOR=netbsd6 check_head
+}
+
+mtree_check_body() 
+{
+	FLAVOR=mtree check_body
+}
+netbsd6_check_body() 
+{
+	FLAVOR=netbsd6 check_body
+}
+
+
+atf_test_case mtree_convert_C
+atf_test_case netbsd6_convert_C
+convert_C_head()
+{
+	atf_set "descr" "Convert a specfile to mtree -C format, unsorted"
+}
+
+convert_C_body()
+{
+	mtree -F ${FLAVOR} -C -K all <"$(atf_get_srcdir)/d_convert.in" >output
+	h_check "$(atf_get_srcdir)/d_convert_C.out" output
+}
+
+mtree_convert_C_head() 
+{
+	FLAVOR=mtree convert_C_head
+}
+netbsd6_convert_C_head() 
+{
+	FLAVOR=netbsd6 convert_C_head
+}
+
+mtree_convert_C_body() 
+{
+	FLAVOR=mtree convert_C_body
+}
+netbsd6_convert_C_body() 
+{
+	FLAVOR=netbsd6 convert_C_body
+}
+
+
+atf_test_case mtree_convert_C_S
+atf_test_case netbsd6_convert_C_S
+convert_C_S_head()
+{
+	atf_set "descr" "Convert a specfile to mtree -C format, sorted"
+}
+
+convert_C_S_body()
+{
+	mtree -F ${FLAVOR} -C -S -K all <"$(atf_get_srcdir)/d_convert.in" >output
+	h_check "$(atf_get_srcdir)/d_convert_C_S.out" output
+}
+
+mtree_convert_C_S_head() 
+{
+	FLAVOR=mtree convert_C_S_head
+}
+netbsd6_convert_C_S_head() 
+{
+	FLAVOR=netbsd6 convert_C_S_head
+}
+
+mtree_convert_C_S_body() 
+{
+	FLAVOR=mtree convert_C_S_body
+}
+netbsd6_convert_C_S_body() 
+{
+	FLAVOR=netbsd6 convert_C_S_body
+}
+
+
+atf_test_case mtree_convert_D
+atf_test_case netbsd6_convert_D
+convert_D_head()
+{
+	atf_set "descr" "Convert a specfile to mtree -D format, unsorted"
+}
+
+convert_D_body()
+{
+	mtree -F ${FLAVOR} -D -K all <"$(atf_get_srcdir)/d_convert.in" >output
+	h_check "$(atf_get_srcdir)/d_convert_D.out" output
+}
+
+mtree_convert_D_head() 
+{
+	FLAVOR=mtree convert_D_head
+}
+netbsd6_convert_D_head() 
+{
+	FLAVOR=netbsd6 convert_D_head
+}
+
+mtree_convert_D_body() 
+{
+	FLAVOR=mtree convert_D_body
+}
+netbsd6_convert_D_body() 
+{
+	FLAVOR=netbsd6 convert_D_body
+}
+
+
+atf_test_case mtree_convert_D_S
+atf_test_case netbsd6_convert_D_S
+convert_D_S_head()
+{
+	atf_set "descr" "Convert a specfile to mtree -D format, sorted"
+}
+
+convert_D_S_body()
+{
+	mtree -F ${FLAVOR} -D -S -K all <"$(atf_get_srcdir)/d_convert.in" >output
+	h_check "$(atf_get_srcdir)/d_convert_D_S.out" output
+}
+
+mtree_convert_D_S_head() 
+{
+	FLAVOR=mtree convert_D_S_head
+}
+netbsd6_convert_D_S_head() 
+{
+	FLAVOR=netbsd6 convert_D_S_head
+}
+
+mtree_convert_D_S_body() 
+{
+	FLAVOR=mtree convert_D_S_body
+}
+netbsd6_convert_D_S_body() 
+{
+	FLAVOR=netbsd6 convert_D_S_body
+}
+
+
+atf_test_case mtree_ignore
+atf_test_case netbs6_ignore
+ignore_head()
+{
+	atf_set "descr" "Test that -d ignores symlinks (PR bin/41061)"
+}
+
+ignore_body()
+{
+	mkdir newdir
+	mtree -F ${FLAVOR} -c | mtree -F ${FLAVOR} -Ck uid,gid,mode > mtree.spec
+	ln -s newdir otherdir
+
+	# This yields "extra: otherdir" even with -d.
+	# (PR bin/41061)
+	atf_check -s ignore -o empty -e empty -x "mtree -F ${FLAVOR} -d < mtree.spec"
+
+	# Delete the symlink and re-verify.
+	#
+	rm otherdir
+	atf_check -s ignore -o empty -e empty -x "mtree -F ${FLAVOR} -d < mtree.spec"
+}
+
+mtree_ignore_head() 
+{
+	FLAVOR=mtree ignore_head
+}
+netbsd6_ignore_head() 
+{
+	FLAVOR=netbsd6 ignore_head
+}
+
+mtree_ignore_body() 
+{
+	FLAVOR=mtree ignore_body
+}
+netbsd6_ignore_body() 
+{
+	FLAVOR=netbsd6 ignore_body
+}
+
+
+atf_test_case mtree_merge
+atf_test_case netbsd6_merge
+merge_head()
+{
+	atf_set "descr" "Merge records of different type"
+}
+
+merge_body()
+{
+	mtree -F ${FLAVOR} -C -M -K all <"$(atf_get_srcdir)/d_merge.in" >output
+	h_check "$(atf_get_srcdir)/d_merge_C_M.out" output
+	# same again, with sorting
+	mtree -F ${FLAVOR} -C -M -S -K all <"$(atf_get_srcdir)/d_merge.in" >output
+	h_check "$(atf_get_srcdir)/d_merge_C_M_S.out" output
+}
+
+mtree_merge_head() 
+{
+	FLAVOR=mtree merge_head
+}
+netbsd6_merge_head() 
+{
+	FLAVOR=netbsd6 merge_head
+}
+
+mtree_merge_body() 
+{
+	FLAVOR=mtree merge_body
+}
+netbsd6_merge_body() 
+{
+	FLAVOR=netbsd6 merge_body
+}
+
+
+atf_test_case mtree_nonemptydir
+atf_test_case netbsd6_nonemptydir
+nonemptydir_head()
+{
+	atf_set "descr" "Test that new non-empty " \
+			"directories are recorded (PR bin/25693)"
+}
+
+nonemptydir_body()
+{
+	mkdir testdir
+	cd testdir
+
+	mtree -F ${FLAVOR} -c > mtree.spec
+
+	if [ ! -f mtree.spec ]; then
+		atf_fail "mtree failed"
+	fi
+
+	touch bar
+	atf_check -s ignore -o save:output -x "mtree -F ${FLAVOR} -f mtree.spec"
+
+	if [ ! -n "$(egrep "extra: bar" output)" ]; then
+		atf_fail "mtree did not record changes (PR bin/25693)"
+	fi
+}
+
+mtree_nonemptydir_head() 
+{
+	FLAVOR=mtree nonemptydir_head
+}
+netbsd6_nonemptydir_head() 
+{
+	FLAVOR=netbsd6 nonemptydir_head
+}
+
+mtree_nonemptydir_body() 
+{
+	FLAVOR=mtree nonemptydir_body
+}
+netbsd6_nonemptydir_body() 
+{
+	FLAVOR=netbsd6 nonemptydir_body
+}
+
+
+atf_init_test_cases()
+{
+	atf_add_test_case mtree_create
+	atf_add_test_case mtree_check
+	atf_add_test_case mtree_convert_C
+	atf_add_test_case mtree_convert_C_S
+	atf_add_test_case mtree_convert_D
+	atf_add_test_case mtree_convert_D_S
+	atf_add_test_case mtree_ignore
+	atf_add_test_case mtree_merge
+	atf_add_test_case mtree_nonemptydir
+
+	atf_add_test_case netbsd6_create
+	atf_add_test_case netbsd6_check
+	atf_add_test_case netbsd6_convert_C
+	atf_add_test_case netbsd6_convert_C_S
+	atf_add_test_case netbsd6_convert_D
+	atf_add_test_case netbsd6_convert_D_S
+	atf_add_test_case netbsd6_ignore
+	atf_add_test_case netbsd6_merge
+	atf_add_test_case netbsd6_nonemptydir
+}
diff --git a/contrib/netbsd-tests/usr.sbin/tcpdump/t_tcpdump.sh b/contrib/netbsd-tests/usr.sbin/tcpdump/t_tcpdump.sh
new file mode 100755
index 000000000000..5cd89b41abe4
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/tcpdump/t_tcpdump.sh
@@ -0,0 +1,59 @@
+# $NetBSD: t_tcpdump.sh,v 1.4 2014/09/20 06:08:07 ozaki-r Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+prom() {
+	atf_check -s ignore -o ignore -e ignore -x "tcpdump -c 1 -i $1" &
+	sleep 2; kill $! >/dev/null 2>&1
+}
+
+atf_test_case promiscuous
+promiscuous_head() {
+	atf_set "require.user" "root"
+	atf_set "descr" "Test that switching an interface into and out " \
+			"of promiscuous mode does not lockup (PR kern/46328)"
+}
+
+promiscuous_body() {
+
+	for i in $(ifconfig -l); do
+		case $i in
+		bridge*)
+			echo "Skipping $i"
+			continue
+			;;
+		esac
+
+		echo "Testing $i"
+		prom $i
+	done
+}
+
+atf_init_test_cases() {
+	atf_add_test_case promiscuous
+}
diff --git a/contrib/netbsd-tests/usr.sbin/traceroute/t_traceroute.sh b/contrib/netbsd-tests/usr.sbin/traceroute/t_traceroute.sh
new file mode 100755
index 000000000000..cc2b2f40f89b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/traceroute/t_traceroute.sh
@@ -0,0 +1,128 @@
+#	$NetBSD: t_traceroute.sh,v 1.5 2013/02/19 21:08:25 joerg Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+	atf_set "descr" "Does a simple three-hop traceroute"
+	atf_set "require.progs" "rump_server"
+}
+
+cfgendpt ()
+{
+
+	sock=${1}
+	addr=${2}
+	route=${3}
+	bus=${4}
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+	atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xffffff00
+	atf_check -s exit:0 -o ignore rump.route add default ${route}
+}
+
+threeservers()
+{
+
+	atf_check -s exit:0 ${netserver} unix://commsock1
+	atf_check -s exit:0 ${netserver} unix://commsock2
+	atf_check -s exit:0 ${netserver} unix://commsock3
+
+	# configure endpoints
+	cfgendpt unix://commsock1 1.2.3.4 1.2.3.1 bus1
+	cfgendpt unix://commsock3 2.3.4.5 2.3.4.1 bus2
+
+	# configure the router
+	export RUMP_SERVER=unix://commsock2
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+	atf_check -s exit:0 rump.ifconfig shmif0 inet 1.2.3.1 netmask 0xffffff00
+
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr bus2
+	atf_check -s exit:0 rump.ifconfig shmif1 inet 2.3.4.1 netmask 0xffffff00
+}
+
+threecleanup()
+{
+	env RUMP_SERVER=unix://commsock1 rump.halt
+	env RUMP_SERVER=unix://commsock2 rump.halt
+	env RUMP_SERVER=unix://commsock3 rump.halt
+}
+
+threetests()
+{
+
+	threeservers
+	export RUMP_SERVER=unix://commsock1
+	atf_check -s exit:0 -o inline:'1.2.3.1\n2.3.4.5\n' -e ignore -x	\
+	    "rump.traceroute ${1} -n 2.3.4.5 | awk '{print \$2}'"
+	export RUMP_SERVER=unix://commsock3
+	atf_check -s exit:0 -o inline:'2.3.4.1\n1.2.3.4\n' -e ignore -x \
+	    "rump.traceroute ${1} -n 1.2.3.4 | awk '{print \$2}'"
+}
+
+basic_body()
+{
+	threetests
+}
+
+basic_cleanup()
+{
+	threecleanup
+}
+
+atf_test_case basic_icmp cleanup
+basic_icmp_head()
+{
+
+	atf_set "descr" "Does an ICMP-based three-hop traceroute"
+	atf_set "require.progs" "rump_server"
+}
+
+basic_icmp_body()
+{
+	threetests -I
+}
+
+basic_icmp_cleanup()
+{
+	threecleanup
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case basic
+	atf_add_test_case basic_icmp
+}
diff --git a/contrib/netbsd-tests/usr.sbin/useradd/t_useradd.sh b/contrib/netbsd-tests/usr.sbin/useradd/t_useradd.sh
new file mode 100755
index 000000000000..c55818e07f0b
--- /dev/null
+++ b/contrib/netbsd-tests/usr.sbin/useradd/t_useradd.sh
@@ -0,0 +1,50 @@
+# $NetBSD: t_useradd.sh,v 1.1 2012/04/19 18:51:36 jruoho Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+username="test5678901234567"
+
+atf_test_case longname cleanup
+longname_head() {
+	atf_set "require.user" "root"
+	atf_set "descr" "Test that usernames longer than 16 " \
+			"characters are allowed (PR bin/39546)"
+}
+
+longname_body() {
+	atf_expect_fail "PR bin/39546"
+	atf_check -s exit:0 -o ignore -e ignore -x "useradd $username"
+}
+
+longname_cleanup() {
+	atf_check -s ignore -o ignore -e ignore -x "userdel $username"
+}
+
+atf_init_test_cases() {
+	atf_add_test_case longname
+}
diff --git a/contrib/ofed/libibverbs/examples/asyncwatch.c b/contrib/ofed/libibverbs/examples/asyncwatch.c
index da7ebd42a328..0c82dee0fb75 100644
--- a/contrib/ofed/libibverbs/examples/asyncwatch.c
+++ b/contrib/ofed/libibverbs/examples/asyncwatch.c
@@ -35,8 +35,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
-#include <endian.h>
-#include <byteswap.h>
 
 #include <infiniband/verbs.h>
 
diff --git a/contrib/ofed/libibverbs/examples/device_list.c b/contrib/ofed/libibverbs/examples/device_list.c
index 70c3af51b6c3..d1b80517d195 100644
--- a/contrib/ofed/libibverbs/examples/device_list.c
+++ b/contrib/ofed/libibverbs/examples/device_list.c
@@ -36,9 +36,6 @@
 
 #include <stdio.h>
 
-#include <endian.h>
-#include <byteswap.h>
-
 #include <infiniband/verbs.h>
 #include <infiniband/arch.h>
 
diff --git a/contrib/ofed/libibverbs/examples/devinfo.c b/contrib/ofed/libibverbs/examples/devinfo.c
index 393ec042a5d8..4bcb91119839 100644
--- a/contrib/ofed/libibverbs/examples/devinfo.c
+++ b/contrib/ofed/libibverbs/examples/devinfo.c
@@ -41,8 +41,6 @@
 #include <string.h>
 #include <getopt.h>
 #include <netinet/in.h>
-#include <endian.h>
-#include <byteswap.h>
 
 #include <infiniband/verbs.h>
 #include <infiniband/driver.h>
diff --git a/contrib/ofed/libmlx4/src/mlx4-abi.h b/contrib/ofed/libmlx4/src/mlx4-abi.h
index 1b1253c764d8..cc054e419579 100644
--- a/contrib/ofed/libmlx4/src/mlx4-abi.h
+++ b/contrib/ofed/libmlx4/src/mlx4-abi.h
@@ -36,7 +36,7 @@
 #include <infiniband/kern-abi.h>
 
 #define MLX4_UVERBS_MIN_ABI_VERSION	2
-#define MLX4_UVERBS_MAX_ABI_VERSION	3
+#define MLX4_UVERBS_MAX_ABI_VERSION	4
 
 struct mlx4_alloc_ucontext_resp {
 	struct ibv_get_context_resp	ibv_resp;
diff --git a/contrib/one-true-awk/awk.1 b/contrib/one-true-awk/awk.1
index 6119613c1aae..b0d243b495cc 100644
--- a/contrib/one-true-awk/awk.1
+++ b/contrib/one-true-awk/awk.1
@@ -208,7 +208,7 @@ or of
 if no argument.
 .TP
 .B rand
-random number on (0,1)
+random number on [0,1)
 .TP
 .B srand
 sets seed for
diff --git a/contrib/one-true-awk/main.c b/contrib/one-true-awk/main.c
index ab01676f394e..ec7029454386 100644
--- a/contrib/one-true-awk/main.c
+++ b/contrib/one-true-awk/main.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 	signal(SIGFPE, fpecatch);
 
 	srand_seed = 1;
-	srand(srand_seed);
+	srandom((unsigned long) srand_seed);
 
 	yyin = NULL;
 	symtab = makesymtab(NSYMTAB/NSYMTAB);
diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c
index cafaff3e4ad9..2bcd9dfa252a 100644
--- a/contrib/one-true-awk/run.c
+++ b/contrib/one-true-awk/run.c
@@ -1521,8 +1521,10 @@ Cell *bltin(Node **a, int n)	/* builtin functions. a[0] is type, a[1] is arg lis
 		u = (Awkfloat) system(getsval(x)) / 256;   /* 256 is unix-dep */
 		break;
 	case FRAND:
-		/* in principle, rand() returns something in 0..RAND_MAX */
-		u = (Awkfloat) (rand() % RAND_MAX) / RAND_MAX;
+		/* random() returns numbers in [0..2^31-1]
+		 * in order to get a number in [0, 1), divide it by 2^31
+		 */
+		u = (Awkfloat) random() / (0x7fffffffL + 0x1UL);
 		break;
 	case FSRAND:
 		if (isrec(x))	/* no argument provided */
@@ -1530,7 +1532,7 @@ Cell *bltin(Node **a, int n)	/* builtin functions. a[0] is type, a[1] is arg lis
 		else
 			u = getfval(x);
 		tmp = u;
-		srand((unsigned int) u);
+		srandom((unsigned long) u);
 		u = srand_seed;
 		srand_seed = tmp;
 		break;
diff --git a/contrib/openbsm/bin/auditdistd/subr.c b/contrib/openbsm/bin/auditdistd/subr.c
index e98ed1e74480..0f531cc22d0d 100644
--- a/contrib/openbsm/bin/auditdistd/subr.c
+++ b/contrib/openbsm/bin/auditdistd/subr.c
@@ -228,6 +228,11 @@ wait_for_file_init(int fd)
 	PJDLOG_ASSERT(fd != -1);
 
 #ifdef HAVE_KQUEUE
+	if (wait_for_file_kq != -1) {
+		close(wait_for_file_kq);
+		wait_for_file_kq = -1;
+	}
+
 	kq = kqueue();
 	if (kq == -1) {
 		pjdlog_errno(LOG_WARNING, "kqueue() failed");
diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS
index 8315415027cb..a2fc7d3407e8 100644
--- a/contrib/openpam/CREDITS
+++ b/contrib/openpam/CREDITS
@@ -15,6 +15,8 @@ directly or indirectly, with patches, criticism, suggestions, or
 ideas:
 
 	Andrew Morgan <morgan@transmeta.com>
+	Ankita Pal <pal.ankita.ankita@gmail.com>
+	Baptiste Daroussin <bapt@freebsd.org>
 	Brian Fundakowski Feldman <green@freebsd.org>
 	Christos Zoulas <christos@netbsd.org>
 	Daniel Richard G. <skunk@iskunk.org>
@@ -25,6 +27,7 @@ ideas:
 	Eric Melville <eric@freebsd.org>
 	Espen Grøndahl <espegro@usit.uio.no>
 	Gary Winiger <gary.winiger@sun.com>
+	Gavin Atkinson <gavin@freebsd.org>
 	Gleb Smirnoff <glebius@freebsd.org>
 	Hubert Feyrer <hubert@feyrer.de>
 	Jason Evans <jasone@freebsd.org>
@@ -46,5 +49,3 @@ ideas:
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
 	Wojciech A. Koszek <wkoszek@freebsd.org>
 	Yar Tikhiy <yar@freebsd.org>
-
-$Id: CREDITS 648 2013-03-05 17:54:27Z des $
diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY
index ddb4d423459e..31a2c7125454 100644
--- a/contrib/openpam/HISTORY
+++ b/contrib/openpam/HISTORY
@@ -1,3 +1,24 @@
+OpenPAM Ourouparia						2014-09-12
+
+ - ENHANCE: When executing a chain, require at least one service
+   function to succeed.  This mitigates fail-open scenarios caused by
+   misconfigurations or missing modules.
+
+ - ENHANCE: Make sure to overwrite buffers which may have contained an
+   authentication token when they're no longer needed.
+
+ - BUGFIX: Under certain circumstances, specifying a non-existent
+   module (or misspelling the name of a module) in a policy could
+   result in a fail-open scenario.  (CVE-2014-3879)
+
+ - FEATURE: Add a search path for modules.  This was implemented in
+   Nummularia but inadvertently left out of the release notes.
+
+ - BUGFIX: The is_upper() predicate only accepted the letter A as an
+   upper-case character instead of the entire A-Z range.  As a result,
+   service and module names containing upper-case letters other than A
+   would be rejected.
+============================================================================
 OpenPAM Nummularia						2013-09-07
 
  - ENHANCE: Rewrite the dynamic loader to improve readability and
@@ -97,7 +118,7 @@ OpenPAM Lycopsida						2011-12-18
    module before loading it.
 
  - ENHANCE: added / improved input validation in many cases, including
-   the policy file and some function arguments.
+   the policy file and some function arguments.  (CVE-2011-4122)
 ============================================================================
 OpenPAM Hydrangea						2007-12-21
 
@@ -427,5 +448,3 @@ Fixed a number of bugs in the previous release, including:
 OpenPAM Calamite						2002-02-09
 
 First (beta) release.
-============================================================================
-$Id: HISTORY 737 2013-09-07 12:53:55Z des $
diff --git a/contrib/openpam/INSTALL b/contrib/openpam/INSTALL
index 8c27b932fc48..a88a8a4ab76b 100644
--- a/contrib/openpam/INSTALL
+++ b/contrib/openpam/INSTALL
@@ -54,5 +54,3 @@
   directory:
 
   # make install
-
-$Id: INSTALL 648 2013-03-05 17:54:27Z des $
diff --git a/contrib/openpam/LICENSE b/contrib/openpam/LICENSE
index a894e43a3953..18ff4890812d 100644
--- a/contrib/openpam/LICENSE
+++ b/contrib/openpam/LICENSE
@@ -31,5 +31,3 @@ 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.
-
-$Id: LICENSE 648 2013-03-05 17:54:27Z des $
diff --git a/contrib/openpam/Makefile.am b/contrib/openpam/Makefile.am
index 1c873117ce08..7640742ff194 100644
--- a/contrib/openpam/Makefile.am
+++ b/contrib/openpam/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $
+# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/contrib/openpam/Makefile.in b/contrib/openpam/Makefile.in
index c8e77d9a4305..963e9d4a6e2a 100644
--- a/contrib/openpam/Makefile.in
+++ b/contrib/openpam/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 623 2013-02-25 07:24:51Z des $
+# $Id: Makefile.am 816 2014-09-12 07:50:22Z des $
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -84,13 +84,10 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in $(srcdir)/pamgdb.in $(srcdir)/mkpkgng.in \
-	INSTALL README TODO compile config.guess config.sub depcomp \
-	install-sh missing ltmain.sh
+	INSTALL README TODO compile config.guess config.sub install-sh \
+	missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/contrib/openpam/README b/contrib/openpam/README
index 2fe00efe47ba..b0eb1a441740 100644
--- a/contrib/openpam/README
+++ b/contrib/openpam/README
@@ -23,5 +23,3 @@ These are some of OpenPAM's features:
      this will be made configurable in a future release.
 
 Please direct bug reports and inquiries to <des@des.no>.
-
-$Id: README 648 2013-03-05 17:54:27Z des $
diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES
index 4518551c1e3d..fbd48d81bb7f 100644
--- a/contrib/openpam/RELNOTES
+++ b/contrib/openpam/RELNOTES
@@ -1,6 +1,6 @@
 
-		 Release notes for OpenPAM Nummularia
-		 ====================================
+                 Release notes for OpenPAM Ourouparia
+                 ====================================
 
 This release corresponds to the code used in FreeBSD HEAD as of the
 release date, and is also expected to work on almost any POSIX-like
@@ -20,5 +20,3 @@ The distribution consists of the following components:
  - Unit tests for limited portions of the libraries.
 
 Please direct bug reports and inquiries to <des@des.no>.
-
-$Id: RELNOTES 741 2013-09-07 13:34:02Z des $
diff --git a/contrib/openpam/TODO b/contrib/openpam/TODO
index d245361782bc..3790d6fd08e4 100644
--- a/contrib/openpam/TODO
+++ b/contrib/openpam/TODO
@@ -13,5 +13,3 @@ Before the next release:
    wrapper for) openpam_log() which respects the PAM_SILENT flag and
    the no_warn module option.  This would eliminate the need for
    FreeBSD's _pam_verbose_error().
-
-$Id: TODO 736 2013-09-07 12:52:42Z des $
diff --git a/contrib/openpam/aclocal.m4 b/contrib/openpam/aclocal.m4
index 9a730e043752..9fad4b40f5d5 100644
--- a/contrib/openpam/aclocal.m4
+++ b/contrib/openpam/aclocal.m4
@@ -20,6 +20,8593 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
+
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1176,8 +9763,3 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/libtool.m4])
-m4_include([m4/ltoptions.m4])
-m4_include([m4/ltsugar.m4])
-m4_include([m4/ltversion.m4])
-m4_include([m4/lt~obsolete.m4])
diff --git a/contrib/openpam/autogen.sh b/contrib/openpam/autogen.sh
index 1958dfc958cf..ce42fd5eb330 100755
--- a/contrib/openpam/autogen.sh
+++ b/contrib/openpam/autogen.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 709 2013-08-18 14:47:20Z des $
+# $Id: autogen.sh 815 2014-09-12 07:47:27Z des $
 #
 
 aclocal -I m4
 libtoolize --copy --force
 autoheader
-automake -a -c --foreign
+automake --add-missing --copy --foreign
 autoconf
diff --git a/contrib/openpam/bin/Makefile.in b/contrib/openpam/bin/Makefile.in
index 1df083a2498a..452bc64f8f27 100644
--- a/contrib/openpam/bin/Makefile.in
+++ b/contrib/openpam/bin/Makefile.in
@@ -84,10 +84,7 @@ host_triplet = @host@
 subdir = bin
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/bin/openpam_dump_policy/Makefile.in b/contrib/openpam/bin/openpam_dump_policy/Makefile.in
index 3bef96dce3c1..f40bd169b95a 100644
--- a/contrib/openpam/bin/openpam_dump_policy/Makefile.in
+++ b/contrib/openpam/bin/openpam_dump_policy/Makefile.in
@@ -85,10 +85,7 @@ subdir = bin/openpam_dump_policy
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c b/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c
index d16289c07a4b..74129f33b139 100644
--- a/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c
+++ b/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_dump_policy.c 648 2013-03-05 17:54:27Z des $
+ * $Id: openpam_dump_policy.c 798 2014-06-10 21:28:14Z des $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ openpam_facility_index_name(pam_facility_t fclt)
 	if (asprintf(&name, "PAM_%s", facility) == -1)
 		return (NULL);
 	for (p = name + 4; *p; ++p)
-		*p = toupper(*p);
+		*p = toupper((unsigned char)*p);
 	return (name);
 }
 
diff --git a/contrib/openpam/bin/pamtest/Makefile.in b/contrib/openpam/bin/pamtest/Makefile.in
index c9b933f777ae..d628e7ead855 100644
--- a/contrib/openpam/bin/pamtest/Makefile.in
+++ b/contrib/openpam/bin/pamtest/Makefile.in
@@ -85,10 +85,7 @@ subdir = bin/pamtest
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(dist_man1_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/bin/pamtest/pamtest.1 b/contrib/openpam/bin/pamtest/pamtest.1
index 76fc99ecd9e2..7fcaf66987d9 100644
--- a/contrib/openpam/bin/pamtest/pamtest.1
+++ b/contrib/openpam/bin/pamtest/pamtest.1
@@ -26,15 +26,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: pamtest.1 741 2013-09-07 13:34:02Z des $
+.\" $Id: pamtest.1 816 2014-09-12 07:50:22Z des $
 .\"
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAMTEST 1
 .Os
 .Sh NAME
 .Nm pamtest
 .Nd PAM policy tester
-.Sh SYNOPSYS
+.Sh SYNOPSIS
 .Nm
 .Op Fl dkMPsv
 .Op Fl H Ar rhost
diff --git a/contrib/openpam/bin/su/Makefile.in b/contrib/openpam/bin/su/Makefile.in
index 7a37fc7e4bd0..12a5234cf798 100644
--- a/contrib/openpam/bin/su/Makefile.in
+++ b/contrib/openpam/bin/su/Makefile.in
@@ -85,10 +85,7 @@ subdir = bin/su
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(dist_man1_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/bin/su/su.1 b/contrib/openpam/bin/su/su.1
index 9d328e7fc996..41f270f4c8d6 100644
--- a/contrib/openpam/bin/su/su.1
+++ b/contrib/openpam/bin/su/su.1
@@ -26,15 +26,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: su.1 741 2013-09-07 13:34:02Z des $
+.\" $Id: su.1 816 2014-09-12 07:50:22Z des $
 .\"
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt SU 1
 .Os
 .Sh NAME
 .Nm su
 .Nd switch user identity
-.Sh SYNOPSYS
+.Sh SYNOPSIS
 .Nm
 .Op Ar login Op Ar ...
 .Sh DESCRIPTION
diff --git a/contrib/openpam/config.h.in b/contrib/openpam/config.h.in
index 780803efcd81..9eb76b5c94fb 100644
--- a/contrib/openpam/config.h.in
+++ b/contrib/openpam/config.h.in
@@ -60,6 +60,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
+/* Define to 1 if you have the `strlset' function. */
+#undef HAVE_STRLSET
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
diff --git a/contrib/openpam/configure b/contrib/openpam/configure
index bad8c990942c..07e2a917e20f 100755
--- a/contrib/openpam/configure
+++ b/contrib/openpam/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 741 2013-09-07 13:34:02Z des .
+# From configure.ac Id: configure.ac 816 2014-09-12 07:50:22Z des .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenPAM 20130907.
+# Generated by GNU Autoconf 2.69 for OpenPAM 20140912.
 #
 # Report bugs to <des@des.no>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenPAM'
 PACKAGE_TARNAME='openpam'
-PACKAGE_VERSION='20130907'
-PACKAGE_STRING='OpenPAM 20130907'
+PACKAGE_VERSION='20140912'
+PACKAGE_STRING='OpenPAM 20140912'
 PACKAGE_BUGREPORT='des@des.no'
 PACKAGE_URL='http://www.openpam.org/'
 
@@ -1335,7 +1335,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenPAM 20130907 to adapt to many kinds of systems.
+\`configure' configures OpenPAM 20140912 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1405,7 +1405,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenPAM 20130907:";;
+     short | recursive ) echo "Configuration of OpenPAM 20140912:";;
    esac
   cat <<\_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenPAM configure 20130907
+OpenPAM configure 20140912
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1893,7 +1893,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenPAM $as_me 20130907, which was
+It was created by OpenPAM $as_me 20140912, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2758,7 +2758,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openpam'
- VERSION='20130907'
+ VERSION='20140912'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8454,10 +8454,6 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -12181,7 +12177,7 @@ _ACEOF
 fi
 done
 
-for ac_func in strlcat strlcmp strlcpy
+for ac_func in strlcat strlcmp strlcpy strlset
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -12918,7 +12914,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenPAM $as_me 20130907, which was
+This file was extended by OpenPAM $as_me 20140912, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12985,7 +12981,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenPAM config.status 20130907
+OpenPAM config.status 20140912
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/contrib/openpam/configure.ac b/contrib/openpam/configure.ac
index 1dd0053747dc..1412b7a8e30b 100644
--- a/contrib/openpam/configure.ac
+++ b/contrib/openpam/configure.ac
@@ -1,8 +1,8 @@
-dnl $Id: configure.ac 741 2013-09-07 13:34:02Z des $
+dnl $Id: configure.ac 816 2014-09-12 07:50:22Z des $
 
 AC_PREREQ([2.62])
-AC_REVISION([$Id: configure.ac 741 2013-09-07 13:34:02Z des $])
-AC_INIT([OpenPAM], [20130907], [des@des.no], [openpam], [http://www.openpam.org/])
+AC_REVISION([$Id: configure.ac 816 2014-09-12 07:50:22Z des $])
+AC_INIT([OpenPAM], [20140912], [des@des.no], [openpam], [http://www.openpam.org/])
 AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -85,7 +85,7 @@ AC_CHECK_FUNCS([asprintf vasprintf])
 AC_CHECK_FUNCS([dlfunc fdlopen])
 AC_CHECK_FUNCS([fpurge])
 AC_CHECK_FUNCS([setlogmask])
-AC_CHECK_FUNCS([strlcat strlcmp strlcpy])
+AC_CHECK_FUNCS([strlcat strlcmp strlcpy strlset])
 
 saved_LIBS="${LIBS}"
 LIBS=""
diff --git a/contrib/openpam/doc/Makefile.in b/contrib/openpam/doc/Makefile.in
index 83070401d420..26ac55c8651e 100644
--- a/contrib/openpam/doc/Makefile.in
+++ b/contrib/openpam/doc/Makefile.in
@@ -82,10 +82,7 @@ host_triplet = @host@
 subdir = doc
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/doc/man/Makefile.in b/contrib/openpam/doc/man/Makefile.in
index efb43c1ed947..84236b7ea755 100644
--- a/contrib/openpam/doc/man/Makefile.in
+++ b/contrib/openpam/doc/man/Makefile.in
@@ -82,10 +82,7 @@ subdir = doc/man
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(dist_man3_MANS) $(dist_man5_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/doc/man/openpam.3 b/contrib/openpam/doc/man/openpam.3
index f7b737386ff6..35f135dd11c6 100644
--- a/contrib/openpam/doc/man/openpam.3
+++ b/contrib/openpam/doc/man/openpam.3
@@ -1,5 +1,5 @@
 .\" Generated by gendoc.pl
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_borrow_cred.3 b/contrib/openpam/doc/man/openpam_borrow_cred.3
index 57a1fe0a9e92..523ee634ce32 100644
--- a/contrib/openpam/doc/man/openpam_borrow_cred.3
+++ b/contrib/openpam/doc/man/openpam_borrow_cred.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_borrow_cred.c by gendoc.pl
 .\" $Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_BORROW_CRED 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_free_data.3 b/contrib/openpam/doc/man/openpam_free_data.3
index a0d72468063f..1010f023d245 100644
--- a/contrib/openpam/doc/man/openpam_free_data.3
+++ b/contrib/openpam/doc/man/openpam_free_data.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_free_data.c by gendoc.pl
 .\" $Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_FREE_DATA 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_free_envlist.3 b/contrib/openpam/doc/man/openpam_free_envlist.3
index f417278b3ed1..2bddfb1b9896 100644
--- a/contrib/openpam/doc/man/openpam_free_envlist.3
+++ b/contrib/openpam/doc/man/openpam_free_envlist.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_free_envlist.c by gendoc.pl
 .\" $Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_FREE_ENVLIST 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_get_feature.3 b/contrib/openpam/doc/man/openpam_get_feature.3
index 83e64e24557d..b001ce027874 100644
--- a/contrib/openpam/doc/man/openpam_get_feature.3
+++ b/contrib/openpam/doc/man/openpam_get_feature.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_get_feature.c by gendoc.pl
 .\" $Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_GET_FEATURE 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_get_option.3 b/contrib/openpam/doc/man/openpam_get_option.3
index e986e7dc2487..7ff839b0bd15 100644
--- a/contrib/openpam/doc/man/openpam_get_option.3
+++ b/contrib/openpam/doc/man/openpam_get_option.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_get_option.c by gendoc.pl
 .\" $Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_GET_OPTION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_log.3 b/contrib/openpam/doc/man/openpam_log.3
index 0ab721e7fcf5..18691fec8149 100644
--- a/contrib/openpam/doc/man/openpam_log.3
+++ b/contrib/openpam/doc/man/openpam_log.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_log.c by gendoc.pl
 .\" $Id: openpam_log.c 686 2013-07-11 16:36:02Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_LOG 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_nullconv.3 b/contrib/openpam/doc/man/openpam_nullconv.3
index 03cfe53b8408..1f657f5ea8ba 100644
--- a/contrib/openpam/doc/man/openpam_nullconv.3
+++ b/contrib/openpam/doc/man/openpam_nullconv.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_nullconv.c by gendoc.pl
 .\" $Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_NULLCONV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_readline.3 b/contrib/openpam/doc/man/openpam_readline.3
index 8916911fec37..c0ad9b82d847 100644
--- a/contrib/openpam/doc/man/openpam_readline.3
+++ b/contrib/openpam/doc/man/openpam_readline.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_readline.c by gendoc.pl
 .\" $Id: openpam_readline.c 703 2013-08-16 11:57:54Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_READLINE 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_readlinev.3 b/contrib/openpam/doc/man/openpam_readlinev.3
index 1ffe8afe9445..7801843a7920 100644
--- a/contrib/openpam/doc/man/openpam_readlinev.3
+++ b/contrib/openpam/doc/man/openpam_readlinev.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_readlinev.c by gendoc.pl
 .\" $Id: openpam_readlinev.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_READLINEV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_readword.3 b/contrib/openpam/doc/man/openpam_readword.3
index d680e15049cf..39b4726b79ab 100644
--- a/contrib/openpam/doc/man/openpam_readword.3
+++ b/contrib/openpam/doc/man/openpam_readword.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_readword.c by gendoc.pl
 .\" $Id: openpam_readword.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_READWORD 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_restore_cred.3 b/contrib/openpam/doc/man/openpam_restore_cred.3
index 313626cc95aa..900bca6b71bd 100644
--- a/contrib/openpam/doc/man/openpam_restore_cred.3
+++ b/contrib/openpam/doc/man/openpam_restore_cred.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_restore_cred.c by gendoc.pl
 .\" $Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_RESTORE_CRED 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_set_feature.3 b/contrib/openpam/doc/man/openpam_set_feature.3
index 68eafa092ded..475a89bcde54 100644
--- a/contrib/openpam/doc/man/openpam_set_feature.3
+++ b/contrib/openpam/doc/man/openpam_set_feature.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_set_feature.c by gendoc.pl
 .\" $Id: openpam_set_feature.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_SET_FEATURE 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_set_option.3 b/contrib/openpam/doc/man/openpam_set_option.3
index cee2540c0e83..6ed8b1b0aa74 100644
--- a/contrib/openpam/doc/man/openpam_set_option.3
+++ b/contrib/openpam/doc/man/openpam_set_option.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_set_option.c by gendoc.pl
 .\" $Id: openpam_set_option.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_SET_OPTION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_straddch.3 b/contrib/openpam/doc/man/openpam_straddch.3
index ec4f607a667c..3263ee11ca45 100644
--- a/contrib/openpam/doc/man/openpam_straddch.3
+++ b/contrib/openpam/doc/man/openpam_straddch.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_straddch.c by gendoc.pl
 .\" $Id: openpam_straddch.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_STRADDCH 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_subst.3 b/contrib/openpam/doc/man/openpam_subst.3
index 2ae0e27c2469..bc9c3a2953a4 100644
--- a/contrib/openpam/doc/man/openpam_subst.3
+++ b/contrib/openpam/doc/man/openpam_subst.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_subst.c by gendoc.pl
 .\" $Id: openpam_subst.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt OPENPAM_SUBST 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_ttyconv.3 b/contrib/openpam/doc/man/openpam_ttyconv.3
index f3ef85c8ec70..e7bd8b186ce5 100644
--- a/contrib/openpam/doc/man/openpam_ttyconv.3
+++ b/contrib/openpam/doc/man/openpam_ttyconv.3
@@ -1,6 +1,6 @@
 .\" Generated from openpam_ttyconv.c by gendoc.pl
-.\" $Id: openpam_ttyconv.c 688 2013-07-11 16:40:08Z des $
-.Dd September 7, 2013
+.\" $Id: openpam_ttyconv.c 807 2014-09-09 09:41:32Z des $
+.Dd September 12, 2014
 .Dt OPENPAM_TTYCONV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam.3 b/contrib/openpam/doc/man/pam.3
index 9ee08d17c309..20ff3950a464 100644
--- a/contrib/openpam/doc/man/pam.3
+++ b/contrib/openpam/doc/man/pam.3
@@ -1,5 +1,5 @@
 .\" Generated by gendoc.pl
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam.conf.5 b/contrib/openpam/doc/man/pam.conf.5
index 9b4f4ce285d7..112762c2ada3 100644
--- a/contrib/openpam/doc/man/pam.conf.5
+++ b/contrib/openpam/doc/man/pam.conf.5
@@ -26,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: pam.conf.5 741 2013-09-07 13:34:02Z des $
+.\" $Id: pam.conf.5 816 2014-09-12 07:50:22Z des $
 .\"
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM.CONF 5
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_acct_mgmt.3 b/contrib/openpam/doc/man/pam_acct_mgmt.3
index 08cde6bcaa75..f5bea769644d 100644
--- a/contrib/openpam/doc/man/pam_acct_mgmt.3
+++ b/contrib/openpam/doc/man/pam_acct_mgmt.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_acct_mgmt.c by gendoc.pl
 .\" $Id: pam_acct_mgmt.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_ACCT_MGMT 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_authenticate.3 b/contrib/openpam/doc/man/pam_authenticate.3
index 6e5a4c39a259..4ba1d2b0d76c 100644
--- a/contrib/openpam/doc/man/pam_authenticate.3
+++ b/contrib/openpam/doc/man/pam_authenticate.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_authenticate.c by gendoc.pl
 .\" $Id: pam_authenticate.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_AUTHENTICATE 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_chauthtok.3 b/contrib/openpam/doc/man/pam_chauthtok.3
index 11cf878754aa..3ecf82276f1e 100644
--- a/contrib/openpam/doc/man/pam_chauthtok.3
+++ b/contrib/openpam/doc/man/pam_chauthtok.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_chauthtok.c by gendoc.pl
 .\" $Id: pam_chauthtok.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_CHAUTHTOK 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_close_session.3 b/contrib/openpam/doc/man/pam_close_session.3
index de922db177ab..32ba20085872 100644
--- a/contrib/openpam/doc/man/pam_close_session.3
+++ b/contrib/openpam/doc/man/pam_close_session.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_close_session.c by gendoc.pl
 .\" $Id: pam_close_session.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_CLOSE_SESSION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_conv.3 b/contrib/openpam/doc/man/pam_conv.3
index bb77e74d8c9b..225df9670e71 100644
--- a/contrib/openpam/doc/man/pam_conv.3
+++ b/contrib/openpam/doc/man/pam_conv.3
@@ -32,9 +32,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: pam_conv.3 741 2013-09-07 13:34:02Z des $
+.\" $Id: pam_conv.3 816 2014-09-12 07:50:22Z des $
 .\"
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_CONV 3
 .Os
 .Sh NAME
@@ -76,7 +76,7 @@ item.
 .Pp
 The conversation function's first argument specifies the number of
 messages (up to
-.Dv PAM_NUM_MSG )
+.Dv PAM_MAX_NUM_MSG )
 to process.
 The second argument is a pointer to an array of pointers to
 .Vt pam_message
diff --git a/contrib/openpam/doc/man/pam_end.3 b/contrib/openpam/doc/man/pam_end.3
index a7f408bf6afa..2bb581e0a399 100644
--- a/contrib/openpam/doc/man/pam_end.3
+++ b/contrib/openpam/doc/man/pam_end.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_end.c by gendoc.pl
 .\" $Id: pam_end.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_END 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_error.3 b/contrib/openpam/doc/man/pam_error.3
index 5f9163ca769d..73ba5f64b776 100644
--- a/contrib/openpam/doc/man/pam_error.3
+++ b/contrib/openpam/doc/man/pam_error.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_error.c by gendoc.pl
 .\" $Id: pam_error.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_ERROR 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_get_authtok.3 b/contrib/openpam/doc/man/pam_get_authtok.3
index 64c98d4c1dcc..27bfb36d39bd 100644
--- a/contrib/openpam/doc/man/pam_get_authtok.3
+++ b/contrib/openpam/doc/man/pam_get_authtok.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_get_authtok.c by gendoc.pl
-.\" $Id: pam_get_authtok.c 670 2013-03-17 19:26:07Z des $
-.Dd September 7, 2013
+.\" $Id: pam_get_authtok.c 807 2014-09-09 09:41:32Z des $
+.Dd September 12, 2014
 .Dt PAM_GET_AUTHTOK 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_get_data.3 b/contrib/openpam/doc/man/pam_get_data.3
index f76213daeee7..f470d91eafb4 100644
--- a/contrib/openpam/doc/man/pam_get_data.3
+++ b/contrib/openpam/doc/man/pam_get_data.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_get_data.c by gendoc.pl
 .\" $Id: pam_get_data.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_GET_DATA 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_get_item.3 b/contrib/openpam/doc/man/pam_get_item.3
index 7ee6f0ba65a8..2e24405040d4 100644
--- a/contrib/openpam/doc/man/pam_get_item.3
+++ b/contrib/openpam/doc/man/pam_get_item.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_get_item.c by gendoc.pl
 .\" $Id: pam_get_item.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_GET_ITEM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_get_user.3 b/contrib/openpam/doc/man/pam_get_user.3
index beed4a96aba9..fad7e5d80542 100644
--- a/contrib/openpam/doc/man/pam_get_user.3
+++ b/contrib/openpam/doc/man/pam_get_user.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_get_user.c by gendoc.pl
 .\" $Id: pam_get_user.c 670 2013-03-17 19:26:07Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_GET_USER 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_getenv.3 b/contrib/openpam/doc/man/pam_getenv.3
index f26cb81802e6..5302975e9a34 100644
--- a/contrib/openpam/doc/man/pam_getenv.3
+++ b/contrib/openpam/doc/man/pam_getenv.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_getenv.c by gendoc.pl
 .\" $Id: pam_getenv.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_GETENV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_getenvlist.3 b/contrib/openpam/doc/man/pam_getenvlist.3
index dd01d2928011..b94087609c06 100644
--- a/contrib/openpam/doc/man/pam_getenvlist.3
+++ b/contrib/openpam/doc/man/pam_getenvlist.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_getenvlist.c by gendoc.pl
 .\" $Id: pam_getenvlist.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_GETENVLIST 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_info.3 b/contrib/openpam/doc/man/pam_info.3
index 1d14ec141a9c..018c98e9c9ee 100644
--- a/contrib/openpam/doc/man/pam_info.3
+++ b/contrib/openpam/doc/man/pam_info.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_info.c by gendoc.pl
 .\" $Id: pam_info.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_INFO 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_open_session.3 b/contrib/openpam/doc/man/pam_open_session.3
index 768629d1f612..1e80873ad2f5 100644
--- a/contrib/openpam/doc/man/pam_open_session.3
+++ b/contrib/openpam/doc/man/pam_open_session.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_open_session.c by gendoc.pl
 .\" $Id: pam_open_session.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_OPEN_SESSION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_prompt.3 b/contrib/openpam/doc/man/pam_prompt.3
index 231e3b6ce6dd..8fcf93dd261c 100644
--- a/contrib/openpam/doc/man/pam_prompt.3
+++ b/contrib/openpam/doc/man/pam_prompt.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_prompt.c by gendoc.pl
 .\" $Id: pam_prompt.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_PROMPT 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_putenv.3 b/contrib/openpam/doc/man/pam_putenv.3
index 02f60155cf55..0043a7b42e0b 100644
--- a/contrib/openpam/doc/man/pam_putenv.3
+++ b/contrib/openpam/doc/man/pam_putenv.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_putenv.c by gendoc.pl
 .\" $Id: pam_putenv.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_PUTENV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_set_data.3 b/contrib/openpam/doc/man/pam_set_data.3
index 29e4bf21e27d..85f77f29e3bb 100644
--- a/contrib/openpam/doc/man/pam_set_data.3
+++ b/contrib/openpam/doc/man/pam_set_data.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_set_data.c by gendoc.pl
 .\" $Id: pam_set_data.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SET_DATA 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_set_item.3 b/contrib/openpam/doc/man/pam_set_item.3
index b29e3a18a686..855ce542c850 100644
--- a/contrib/openpam/doc/man/pam_set_item.3
+++ b/contrib/openpam/doc/man/pam_set_item.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_set_item.c by gendoc.pl
 .\" $Id: pam_set_item.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SET_ITEM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_setcred.3 b/contrib/openpam/doc/man/pam_setcred.3
index 5c9a57ed73b0..4b4833c8ccc8 100644
--- a/contrib/openpam/doc/man/pam_setcred.3
+++ b/contrib/openpam/doc/man/pam_setcred.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_setcred.c by gendoc.pl
 .\" $Id: pam_setcred.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SETCRED 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_setenv.3 b/contrib/openpam/doc/man/pam_setenv.3
index 2991e09d7fc9..40f7fde67f01 100644
--- a/contrib/openpam/doc/man/pam_setenv.3
+++ b/contrib/openpam/doc/man/pam_setenv.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_setenv.c by gendoc.pl
 .\" $Id: pam_setenv.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SETENV 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 b/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
index f5c04da672b3..cbf0e81404e8 100644
--- a/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
+++ b/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_acct_mgmt.c by gendoc.pl
 .\" $Id: pam_sm_acct_mgmt.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_ACCT_MGMT 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_authenticate.3 b/contrib/openpam/doc/man/pam_sm_authenticate.3
index d49936922b43..ed4db85d45ca 100644
--- a/contrib/openpam/doc/man/pam_sm_authenticate.3
+++ b/contrib/openpam/doc/man/pam_sm_authenticate.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_authenticate.c by gendoc.pl
 .\" $Id: pam_sm_authenticate.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_AUTHENTICATE 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_chauthtok.3 b/contrib/openpam/doc/man/pam_sm_chauthtok.3
index 289c34582e6d..a574ce3bf750 100644
--- a/contrib/openpam/doc/man/pam_sm_chauthtok.3
+++ b/contrib/openpam/doc/man/pam_sm_chauthtok.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_chauthtok.c by gendoc.pl
 .\" $Id: pam_sm_chauthtok.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_CHAUTHTOK 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_close_session.3 b/contrib/openpam/doc/man/pam_sm_close_session.3
index 3072ffe5c0df..ff39eb3f44b9 100644
--- a/contrib/openpam/doc/man/pam_sm_close_session.3
+++ b/contrib/openpam/doc/man/pam_sm_close_session.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_close_session.c by gendoc.pl
 .\" $Id: pam_sm_close_session.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_CLOSE_SESSION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_open_session.3 b/contrib/openpam/doc/man/pam_sm_open_session.3
index 1da278674534..ffe6c2c44e7e 100644
--- a/contrib/openpam/doc/man/pam_sm_open_session.3
+++ b/contrib/openpam/doc/man/pam_sm_open_session.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_open_session.c by gendoc.pl
 .\" $Id: pam_sm_open_session.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_OPEN_SESSION 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_sm_setcred.3 b/contrib/openpam/doc/man/pam_sm_setcred.3
index e4689d4e542f..0d532b9c1bf8 100644
--- a/contrib/openpam/doc/man/pam_sm_setcred.3
+++ b/contrib/openpam/doc/man/pam_sm_setcred.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_sm_setcred.c by gendoc.pl
 .\" $Id: pam_sm_setcred.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_SM_SETCRED 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_start.3 b/contrib/openpam/doc/man/pam_start.3
index 3d5a9d911852..3d1cee15bf9e 100644
--- a/contrib/openpam/doc/man/pam_start.3
+++ b/contrib/openpam/doc/man/pam_start.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_start.c by gendoc.pl
 .\" $Id: pam_start.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_START 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_strerror.3 b/contrib/openpam/doc/man/pam_strerror.3
index 2e16d8e8fa2a..8ac60be520c9 100644
--- a/contrib/openpam/doc/man/pam_strerror.3
+++ b/contrib/openpam/doc/man/pam_strerror.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_strerror.c by gendoc.pl
 .\" $Id: pam_strerror.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_STRERROR 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_verror.3 b/contrib/openpam/doc/man/pam_verror.3
index 6634cd16cc96..23c856a12205 100644
--- a/contrib/openpam/doc/man/pam_verror.3
+++ b/contrib/openpam/doc/man/pam_verror.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_verror.c by gendoc.pl
 .\" $Id: pam_verror.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_VERROR 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_vinfo.3 b/contrib/openpam/doc/man/pam_vinfo.3
index e0e08e0ed8d7..879963650950 100644
--- a/contrib/openpam/doc/man/pam_vinfo.3
+++ b/contrib/openpam/doc/man/pam_vinfo.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_vinfo.c by gendoc.pl
 .\" $Id: pam_vinfo.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_VINFO 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_vprompt.3 b/contrib/openpam/doc/man/pam_vprompt.3
index ae9801cc264b..fb4a8ac345d6 100644
--- a/contrib/openpam/doc/man/pam_vprompt.3
+++ b/contrib/openpam/doc/man/pam_vprompt.3
@@ -1,6 +1,6 @@
 .\" Generated from pam_vprompt.c by gendoc.pl
 .\" $Id: pam_vprompt.c 648 2013-03-05 17:54:27Z des $
-.Dd September 7, 2013
+.Dd September 12, 2014
 .Dt PAM_VPROMPT 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/include/Makefile.in b/contrib/openpam/include/Makefile.in
index a8d4fa31ef8a..b8354681a94e 100644
--- a/contrib/openpam/include/Makefile.in
+++ b/contrib/openpam/include/Makefile.in
@@ -82,10 +82,7 @@ host_triplet = @host@
 subdir = include
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/include/security/Makefile.in b/contrib/openpam/include/security/Makefile.in
index b9e446127b99..b36341bc7fc3 100644
--- a/contrib/openpam/include/security/Makefile.in
+++ b/contrib/openpam/include/security/Makefile.in
@@ -84,10 +84,7 @@ subdir = include/security
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(security_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/include/security/openpam_version.h b/contrib/openpam/include/security/openpam_version.h
index 8f1adc26651f..c5bf71dd6d97 100644
--- a/contrib/openpam/include/security/openpam_version.h
+++ b/contrib/openpam/include/security/openpam_version.h
@@ -32,14 +32,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_version.h 737 2013-09-07 12:53:55Z des $
+ * $Id: openpam_version.h 812 2014-09-12 07:24:23Z des $
  */
 
 #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
 #define SECURITY_OPENPAM_VERSION_H_INCLUDED
 
 #define OPENPAM
-#define OPENPAM_VERSION	20130907
-#define OPENPAM_RELEASE	"Nummularia"
+#define OPENPAM_VERSION	20140912
+#define OPENPAM_RELEASE	"Ourouparia"
 
 #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
diff --git a/contrib/openpam/lib/Makefile.am b/contrib/openpam/lib/Makefile.am
index 4cd38c2e5cf9..9f2d21d7a44f 100644
--- a/contrib/openpam/lib/Makefile.am
+++ b/contrib/openpam/lib/Makefile.am
@@ -1,3 +1,3 @@
-# $Id: Makefile.am 255376 2013-09-07 19:43:39Z des $
+# $Id: Makefile.am 714 2013-08-19 15:30:21Z des $
 
 SUBDIRS = libpam
diff --git a/contrib/openpam/lib/Makefile.in b/contrib/openpam/lib/Makefile.in
index 3ea0f711e7d3..198e909926da 100644
--- a/contrib/openpam/lib/Makefile.in
+++ b/contrib/openpam/lib/Makefile.in
@@ -82,10 +82,7 @@ host_triplet = @host@
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/lib/libpam/Makefile.am b/contrib/openpam/lib/libpam/Makefile.am
index 99c37f00ee6b..a7781d656786 100644
--- a/contrib/openpam/lib/libpam/Makefile.am
+++ b/contrib/openpam/lib/libpam/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 660 2013-03-11 15:08:52Z des $
+# $Id: Makefile.am 807 2014-09-09 09:41:32Z des $
 
 NULL =
 
@@ -18,6 +18,7 @@ noinst_HEADERS = \
 	openpam_strlcat.h \
 	openpam_strlcmp.h \
 	openpam_strlcpy.h \
+	openpam_strlset.h \
 	openpam_vasprintf.h
 
 libpam_la_SOURCES = \
@@ -44,9 +45,10 @@ libpam_la_SOURCES = \
 	openpam_set_option.c \
 	openpam_set_feature.c \
 	openpam_static.c \
+	openpam_straddch.c \
 	openpam_strlcat.c \
 	openpam_strlcpy.c \
-	openpam_straddch.c \
+	openpam_strlset.c \
 	openpam_subst.c \
 	openpam_vasprintf.c \
 	openpam_ttyconv.c \
diff --git a/contrib/openpam/lib/libpam/Makefile.in b/contrib/openpam/lib/libpam/Makefile.in
index b84d4793f05c..f2971163e0ed 100644
--- a/contrib/openpam/lib/libpam/Makefile.in
+++ b/contrib/openpam/lib/libpam/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 660 2013-03-11 15:08:52Z des $
+# $Id: Makefile.am 807 2014-09-09 09:41:32Z des $
 
 
 VPATH = @srcdir@
@@ -85,10 +85,7 @@ subdir = lib/libpam
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -135,10 +132,10 @@ am_libpam_la_OBJECTS = openpam_asprintf.lo openpam_borrow_cred.lo \
 	openpam_nullconv.lo openpam_readline.lo openpam_readlinev.lo \
 	openpam_readword.lo openpam_restore_cred.lo \
 	openpam_set_option.lo openpam_set_feature.lo openpam_static.lo \
-	openpam_strlcat.lo openpam_strlcpy.lo openpam_straddch.lo \
-	openpam_subst.lo openpam_vasprintf.lo openpam_ttyconv.lo \
-	pam_acct_mgmt.lo pam_authenticate.lo pam_chauthtok.lo \
-	pam_close_session.lo pam_end.lo pam_error.lo \
+	openpam_straddch.lo openpam_strlcat.lo openpam_strlcpy.lo \
+	openpam_strlset.lo openpam_subst.lo openpam_vasprintf.lo \
+	openpam_ttyconv.lo pam_acct_mgmt.lo pam_authenticate.lo \
+	pam_chauthtok.lo pam_close_session.lo pam_end.lo pam_error.lo \
 	pam_get_authtok.lo pam_get_data.lo pam_get_item.lo \
 	pam_get_user.lo pam_getenv.lo pam_getenvlist.lo pam_info.lo \
 	pam_open_session.lo pam_prompt.lo pam_putenv.lo \
@@ -349,6 +346,7 @@ noinst_HEADERS = \
 	openpam_strlcat.h \
 	openpam_strlcmp.h \
 	openpam_strlcpy.h \
+	openpam_strlset.h \
 	openpam_vasprintf.h
 
 libpam_la_SOURCES = \
@@ -375,9 +373,10 @@ libpam_la_SOURCES = \
 	openpam_set_option.c \
 	openpam_set_feature.c \
 	openpam_static.c \
+	openpam_straddch.c \
 	openpam_strlcat.c \
 	openpam_strlcpy.c \
-	openpam_straddch.c \
+	openpam_strlset.c \
 	openpam_subst.c \
 	openpam_vasprintf.c \
 	openpam_ttyconv.c \
@@ -534,6 +533,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@
diff --git a/contrib/openpam/lib/libpam/openpam_configure.c b/contrib/openpam/lib/libpam/openpam_configure.c
index 4e3de577dcdb..5a4ca620222f 100644
--- a/contrib/openpam/lib/libpam/openpam_configure.c
+++ b/contrib/openpam/lib/libpam/openpam_configure.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_configure.c 667 2013-03-17 14:24:00Z des $
+ * $Id: openpam_configure.c 796 2014-06-03 21:30:08Z des $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/openpam/lib/libpam/openpam_ctype.h b/contrib/openpam/lib/libpam/openpam_ctype.h
index 38016227a687..d99d34b4dacf 100644
--- a/contrib/openpam/lib/libpam/openpam_ctype.h
+++ b/contrib/openpam/lib/libpam/openpam_ctype.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_ctype.h 666 2013-03-17 14:22:17Z des $
+ * $Id: openpam_ctype.h 763 2014-02-26 16:29:16Z des $
  */
 
 #ifndef OPENPAM_CTYPE_H_INCLUDED
diff --git a/contrib/openpam/lib/libpam/openpam_dispatch.c b/contrib/openpam/lib/libpam/openpam_dispatch.c
index 0dcc73223ce3..5fa068f8e261 100644
--- a/contrib/openpam/lib/libpam/openpam_dispatch.c
+++ b/contrib/openpam/lib/libpam/openpam_dispatch.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_dispatch.c 649 2013-03-05 17:58:33Z des $
+ * $Id: openpam_dispatch.c 807 2014-09-09 09:41:32Z des $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +63,7 @@ openpam_dispatch(pam_handle_t *pamh,
 	int flags)
 {
 	pam_chain_t *chain;
-	int err, fail, r;
+	int err, fail, nsuccess, r;
 	int debug;
 
 	ENTER();
@@ -101,7 +101,9 @@ openpam_dispatch(pam_handle_t *pamh,
 	}
 
 	/* execute */
-	for (err = fail = 0; chain != NULL; chain = chain->next) {
+	err = PAM_SUCCESS;
+	fail = nsuccess = 0;
+	for (; chain != NULL; chain = chain->next) {
 		if (chain->module->func[primitive] == NULL) {
 			openpam_log(PAM_LOG_ERROR, "%s: no %s()",
 			    chain->module->path, pam_sm_func_name[primitive]);
@@ -126,7 +128,8 @@ openpam_dispatch(pam_handle_t *pamh,
 
 		if (r == PAM_IGNORE)
 			continue;
-		if (r == PAM_SUCCESS) {
+		if (r == PAM_SUCCESS) {	
+			++nsuccess;
 			/*
 			 * For pam_setcred() and pam_chauthtok() with the
 			 * PAM_PRELIM_CHECK flag, treat "sufficient" as
@@ -148,7 +151,7 @@ openpam_dispatch(pam_handle_t *pamh,
 		 * fail.  If a required module fails, record the
 		 * return code from the first required module to fail.
 		 */
-		if (err == 0)
+		if (err == PAM_SUCCESS)
 			err = r;
 		if ((chain->flag == PAM_REQUIRED ||
 		    chain->flag == PAM_BINDING) && !fail) {
@@ -170,6 +173,18 @@ openpam_dispatch(pam_handle_t *pamh,
 
 	if (!fail && err != PAM_NEW_AUTHTOK_REQD)
 		err = PAM_SUCCESS;
+
+	/*
+	 * Require the chain to be non-empty, and at least one module
+	 * in the chain to be successful, so that we don't fail open.
+	 */
+	if (err == PAM_SUCCESS && nsuccess < 1) {
+		openpam_log(PAM_LOG_ERROR,
+		    "all modules were unsuccessful for %s()",
+		    pam_sm_func_name[primitive]);
+		err = PAM_SYSTEM_ERR;
+	}
+
 	RETURNC(err);
 }
 
diff --git a/lib/libproc/test/t1-bkpt/t1-bkpt.c b/contrib/openpam/lib/libpam/openpam_strlset.c
similarity index 51%
rename from lib/libproc/test/t1-bkpt/t1-bkpt.c
rename to contrib/openpam/lib/libpam/openpam_strlset.c
index 1cd4d17f5612..2f4c4fa7e188 100644
--- a/lib/libproc/test/t1-bkpt/t1-bkpt.c
+++ b/contrib/openpam/lib/libpam/openpam_strlset.c
@@ -1,71 +1,58 @@
-/*
- * Copyright (c) 2010 The FreeBSD Foundation 
- * All rights reserved. 
- * 
- * This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation. 
- *  
- * 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 AUTHOR 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 AUTHOR 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. 
+/*-
+ * Copyright (c) 2011-2012 Dag-Erling Smørgrav
+ * All rights reserved.
  *
- * $FreeBSD$
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $Id: openpam_strlset.c 807 2014-09-09 09:41:32Z des $
  */
-#include <sys/types.h>
-#include <sys/wait.h>
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <libproc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-int __noinline
-t1_bkpt_t()
+#ifndef HAVE_STRLSET
+
+#include <stddef.h>
+
+#include "openpam_strlset.h"
+
+/*
+ * like memset(3), but stops at the first NUL byte and NUL-terminates the
+ * result.  Returns the number of bytes that were written, not including
+ * the terminating NUL.
+ */
+size_t
+openpam_strlset(char *str, int ch, size_t size)
 {
-	printf("TEST OK\n");
-}
-
-int
-t1_bkpt_d()
-{
-	struct proc_handle *phdl;
-	char *targv[] = { "t1-bkpt-t", NULL};
-	unsigned long saved;
-
-	proc_create("./t1-bkpt", targv, NULL, NULL, &phdl);
-	assert(proc_bkptset(phdl, (uintptr_t)t1_bkpt_t, &saved) == 0);
-	proc_continue(phdl);
-	assert(proc_wstatus(phdl) == PS_STOP);
-	proc_bkptexec(phdl, saved);
-	proc_continue(phdl);
-	proc_wstatus(phdl);
-	proc_free(phdl);
-}
-
-
-int
-main(int argc, char **argv)
-{
-	if (!strcmp(argv[0], "t1-bkpt-t"))
-		t1_bkpt_t();
-	else
-		t1_bkpt_d();
+	size_t len;
+
+	for (len = 0; *str && size > 1; ++len, --size)
+		*str++ = ch;
+	*str = '\0';
+	return (++len);
 }
 
+#endif
diff --git a/contrib/openpam/lib/libpam/openpam_strlset.h b/contrib/openpam/lib/libpam/openpam_strlset.h
new file mode 100644
index 000000000000..4bb0bb6404d0
--- /dev/null
+++ b/contrib/openpam/lib/libpam/openpam_strlset.h
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2011 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $Id: openpam_strlset.h 807 2014-09-09 09:41:32Z des $
+ */
+
+#ifndef OPENPAM_STRLSET_H_INCLUDED
+#define OPENPAM_STRLSET_H_INCLUDED
+
+#ifndef HAVE_STRLSET
+size_t openpam_strlset(char *, int, size_t);
+#undef strlset
+#define strlset(arg, ...) openpam_strlset(arg, __VA_ARGS__)
+#endif
+
+#endif
diff --git a/contrib/openpam/lib/libpam/openpam_ttyconv.c b/contrib/openpam/lib/libpam/openpam_ttyconv.c
index 01e61810ccff..d21320ca7228 100644
--- a/contrib/openpam/lib/libpam/openpam_ttyconv.c
+++ b/contrib/openpam/lib/libpam/openpam_ttyconv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openpam_ttyconv.c 688 2013-07-11 16:40:08Z des $
+ * $Id: openpam_ttyconv.c 807 2014-09-09 09:41:32Z des $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -55,6 +55,7 @@
 #include <security/pam_appl.h>
 
 #include "openpam_impl.h"
+#include "openpam_strlset.h"
 
 int openpam_ttyconv_timeout = 0;
 
@@ -366,7 +367,7 @@ openpam_ttyconv(int n,
 fail:
 	for (i = 0; i < n; ++i) {
 		if (aresp[i].resp != NULL) {
-			memset(aresp[i].resp, 0, strlen(aresp[i].resp));
+			strlset(aresp[i].resp, 0, PAM_MAX_RESP_SIZE);
 			FREE(aresp[i].resp);
 		}
 	}
diff --git a/contrib/openpam/lib/libpam/pam_get_authtok.c b/contrib/openpam/lib/libpam/pam_get_authtok.c
index a0629341c22a..36382f5d8690 100644
--- a/contrib/openpam/lib/libpam/pam_get_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_get_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pam_get_authtok.c 670 2013-03-17 19:26:07Z des $
+ * $Id: pam_get_authtok.c 807 2014-09-09 09:41:32Z des $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -48,6 +48,7 @@
 #include <security/openpam.h>
 
 #include "openpam_impl.h"
+#include "openpam_strlset.h"
 
 static const char authtok_prompt[] = "Password:";
 static const char authtok_prompt_remote[] = "Password for %u@%h:";
@@ -140,16 +141,21 @@ pam_get_authtok(pam_handle_t *pamh,
 	if (twice) {
 		r = pam_prompt(pamh, style, &resp2, "Retype %s", prompt);
 		if (r != PAM_SUCCESS) {
+			strlset(resp, 0, PAM_MAX_RESP_SIZE);
 			FREE(resp);
 			RETURNC(r);
 		}
-		if (strcmp(resp, resp2) != 0)
+		if (strcmp(resp, resp2) != 0) {
+			strlset(resp, 0, PAM_MAX_RESP_SIZE);
 			FREE(resp);
+		}
+		strlset(resp2, 0, PAM_MAX_RESP_SIZE);
 		FREE(resp2);
 	}
 	if (resp == NULL)
 		RETURNC(PAM_TRY_AGAIN);
 	r = pam_set_item(pamh, item, resp);
+	strlset(resp, 0, PAM_MAX_RESP_SIZE);
 	FREE(resp);
 	if (r != PAM_SUCCESS)
 		RETURNC(r);
diff --git a/contrib/openpam/ltmain.sh b/contrib/openpam/ltmain.sh
index 16ddbf884b67..dc8e388a6340 100755
--- a/contrib/openpam/ltmain.sh
+++ b/contrib/openpam/ltmain.sh
@@ -1377,8 +1377,8 @@ func_infer_tag ()
     $opt_debug
 
     # FreeBSD-specific: where we install compilers with non-standard names
-    tag_compilers_CC="*cc cc* *gcc gcc* clang"
-    tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
+    tag_compilers_CC="*cc cc* *gcc gcc* clang*"
+    tag_compilers_CXX="*c++ c++* *g++ g++* clang++*"
     base_compiler=`set -- "$@"; echo $1`
 
     # If $tagname isn't set, then try to infer if the default "CC" tag applies
diff --git a/contrib/openpam/m4/libtool.m4 b/contrib/openpam/m4/libtool.m4
deleted file mode 100644
index 44e0ecff11e3..000000000000
--- a/contrib/openpam/m4/libtool.m4
+++ /dev/null
@@ -1,7982 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/contrib/openpam/m4/ltoptions.m4 b/contrib/openpam/m4/ltoptions.m4
deleted file mode 100644
index 5d9acd8e23bc..000000000000
--- a/contrib/openpam/m4/ltoptions.m4
+++ /dev/null
@@ -1,384 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/contrib/openpam/m4/ltsugar.m4 b/contrib/openpam/m4/ltsugar.m4
deleted file mode 100644
index 9000a057d31d..000000000000
--- a/contrib/openpam/m4/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/contrib/openpam/m4/ltversion.m4 b/contrib/openpam/m4/ltversion.m4
deleted file mode 100644
index 07a8602d48d6..000000000000
--- a/contrib/openpam/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/contrib/openpam/m4/lt~obsolete.m4 b/contrib/openpam/m4/lt~obsolete.m4
deleted file mode 100644
index c573da90c5cc..000000000000
--- a/contrib/openpam/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/contrib/openpam/mkpkgng.in b/contrib/openpam/mkpkgng.in
index 31efc84a6026..5c14c1848909 100644
--- a/contrib/openpam/mkpkgng.in
+++ b/contrib/openpam/mkpkgng.in
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: mkpkgng.in 740 2013-09-07 13:03:20Z des $
+# $Id: mkpkgng.in 816 2014-09-12 07:50:22Z des $
 #
 
 # Print an informational message
@@ -69,9 +69,9 @@ cd "$srcdir"
 #
 # Determine pkgng version and ABI
 #
-pkgver=$(pkg -vv | awk '$1 == "Version:" { print $2 }')
+pkgver=$(pkg -v)
 [ -n "$pkgver" ] || error "Unable to determine pkgng version."
-pkgabi=$(pkg -vv | awk '$1 == "ABI:" { print $2 }')
+pkgabi=$(pkg config abi)
 [ -n "$pkgabi" ] || error "Unable to determine package ABI."
 
 #
diff --git a/contrib/openpam/modules/Makefile.in b/contrib/openpam/modules/Makefile.in
index 2b88ac696bf2..412068ab0afd 100644
--- a/contrib/openpam/modules/Makefile.in
+++ b/contrib/openpam/modules/Makefile.in
@@ -83,10 +83,7 @@ host_triplet = @host@
 subdir = modules
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/modules/pam_deny/Makefile.in b/contrib/openpam/modules/pam_deny/Makefile.in
index 7369bdbc0bca..f38452ac0a99 100644
--- a/contrib/openpam/modules/pam_deny/Makefile.in
+++ b/contrib/openpam/modules/pam_deny/Makefile.in
@@ -84,10 +84,7 @@ subdir = modules/pam_deny
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/modules/pam_permit/Makefile.in b/contrib/openpam/modules/pam_permit/Makefile.in
index f84e317dc0dd..9949ebdf6ed0 100644
--- a/contrib/openpam/modules/pam_permit/Makefile.in
+++ b/contrib/openpam/modules/pam_permit/Makefile.in
@@ -84,10 +84,7 @@ subdir = modules/pam_permit
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/modules/pam_unix/Makefile.in b/contrib/openpam/modules/pam_unix/Makefile.in
index 022e833a3a60..b5d116a07d3f 100644
--- a/contrib/openpam/modules/pam_unix/Makefile.in
+++ b/contrib/openpam/modules/pam_unix/Makefile.in
@@ -84,10 +84,7 @@ subdir = modules/pam_unix
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/contrib/openpam/pamgdb.in b/contrib/openpam/pamgdb.in
index 5b463900ff08..7667e0b45173 100644
--- a/contrib/openpam/pamgdb.in
+++ b/contrib/openpam/pamgdb.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: pamgdb.in 648 2013-03-05 17:54:27Z des $
+# $Id: pamgdb.in 816 2014-09-12 07:50:22Z des $
 #
 
 srcdir="@abs_top_srcdir@"
diff --git a/contrib/openpam/t/Makefile.am b/contrib/openpam/t/Makefile.am
index fd9a3e21eb3e..bf3801b5417b 100644
--- a/contrib/openpam/t/Makefile.am
+++ b/contrib/openpam/t/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 714 2013-08-19 15:30:21Z des $
+# $Id: Makefile.am 763 2014-02-26 16:29:16Z des $
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
diff --git a/contrib/openpam/t/Makefile.in b/contrib/openpam/t/Makefile.in
index 2e7eda7622d0..756951eced11 100644
--- a/contrib/openpam/t/Makefile.in
+++ b/contrib/openpam/t/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 714 2013-08-19 15:30:21Z des $
+# $Id: Makefile.am 763 2014-02-26 16:29:16Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
@@ -80,17 +80,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = t_openpam_readword$(EXEEXT) t_openpam_readlinev$(EXEEXT)
+TESTS = t_openpam_ctype$(EXEEXT) t_openpam_readword$(EXEEXT) \
+	t_openpam_readlinev$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_1)
 subdir = t
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(noinst_HEADERS) \
 	$(top_srcdir)/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -106,17 +104,22 @@ libt_a_AR = $(AR) $(ARFLAGS)
 libt_a_LIBADD =
 am_libt_a_OBJECTS = t_main.$(OBJEXT) t_file.$(OBJEXT)
 libt_a_OBJECTS = $(am_libt_a_OBJECTS)
-am__EXEEXT_1 = t_openpam_readword$(EXEEXT) \
+am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) t_openpam_readword$(EXEEXT) \
 	t_openpam_readlinev$(EXEEXT)
-t_openpam_readlinev_SOURCES = t_openpam_readlinev.c
-t_openpam_readlinev_OBJECTS = t_openpam_readlinev.$(OBJEXT)
-t_openpam_readlinev_LDADD = $(LDADD)
-t_openpam_readlinev_DEPENDENCIES = libt.a \
+t_openpam_ctype_SOURCES = t_openpam_ctype.c
+t_openpam_ctype_OBJECTS = t_openpam_ctype.$(OBJEXT)
+t_openpam_ctype_LDADD = $(LDADD)
+t_openpam_ctype_DEPENDENCIES = libt.a \
 	$(top_builddir)/lib/libpam/libpam.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+t_openpam_readlinev_SOURCES = t_openpam_readlinev.c
+t_openpam_readlinev_OBJECTS = t_openpam_readlinev.$(OBJEXT)
+t_openpam_readlinev_LDADD = $(LDADD)
+t_openpam_readlinev_DEPENDENCIES = libt.a \
+	$(top_builddir)/lib/libpam/libpam.la
 t_openpam_readword_SOURCES = t_openpam_readword.c
 t_openpam_readword_OBJECTS = t_openpam_readword.$(OBJEXT)
 t_openpam_readword_LDADD = $(LDADD)
@@ -156,9 +159,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libt_a_SOURCES) t_openpam_readlinev.c t_openpam_readword.c
-DIST_SOURCES = $(libt_a_SOURCES) t_openpam_readlinev.c \
+SOURCES = $(libt_a_SOURCES) t_openpam_ctype.c t_openpam_readlinev.c \
 	t_openpam_readword.c
+DIST_SOURCES = $(libt_a_SOURCES) t_openpam_ctype.c \
+	t_openpam_readlinev.c t_openpam_readword.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -569,6 +573,10 @@ clean-checkPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+t_openpam_ctype$(EXEEXT): $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_DEPENDENCIES) $(EXTRA_t_openpam_ctype_DEPENDENCIES) 
+	@rm -f t_openpam_ctype$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_LDADD) $(LIBS)
+
 t_openpam_readlinev$(EXEEXT): $(t_openpam_readlinev_OBJECTS) $(t_openpam_readlinev_DEPENDENCIES) $(EXTRA_t_openpam_readlinev_DEPENDENCIES) 
 	@rm -f t_openpam_readlinev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_openpam_readlinev_OBJECTS) $(t_openpam_readlinev_LDADD) $(LIBS)
@@ -585,6 +593,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@
 
@@ -808,6 +817,13 @@ recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+t_openpam_ctype.log: t_openpam_ctype$(EXEEXT)
+	@p='t_openpam_ctype$(EXEEXT)'; \
+	b='t_openpam_ctype'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 t_openpam_readword.log: t_openpam_readword$(EXEEXT)
 	@p='t_openpam_readword$(EXEEXT)'; \
 	b='t_openpam_readword'; \
diff --git a/contrib/pjdfstest/FREEBSD-upgrade b/contrib/pjdfstest/FREEBSD-upgrade
new file mode 100644
index 000000000000..eff295fbfdc0
--- /dev/null
+++ b/contrib/pjdfstest/FREEBSD-upgrade
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+This document contains a collection of notes specific to the import
+of pjdfstest into head.  These notes are built on the instructions in
+the FreeBSD Subversion Primer that detail how to deal with vendor
+branches and you are supposed to follow those:
+
+	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
+
+The pjdfstest source code is hosted on GitHub:
+
+	https://github.com/pjd/pjdfstest
+
+and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/).
+
+To merge the vendor branch into head do something like this:
+
+	cd .../base/head/contrib/pjdfstest
+	svn merge --accept=postpone \
+	    svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist .
+
+and resolve any conflicts that may arise at this point.
+
+Lastly, with the list of old and new files in this import, make sure
+to update the reachover Makefiles accordingly.
diff --git a/tools/regression/pjdfstest/LICENSE b/contrib/pjdfstest/LICENSE
similarity index 89%
rename from tools/regression/pjdfstest/LICENSE
rename to contrib/pjdfstest/LICENSE
index bde2232c223f..f91e71b37bf4 100644
--- a/tools/regression/pjdfstest/LICENSE
+++ b/contrib/pjdfstest/LICENSE
@@ -1,8 +1,8 @@
-$FreeBSD$
+$FreeBSD: head/tools/regression/pjdfstest/LICENSE 211354 2010-08-15 21:29:03Z pjd $
 
 License for all regression tests available with pjdfstest:
 
-Copyright (c) 2006-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
+Copyright (c) 2006-2012 Pawel Jakub Dawidek <pawel@dawidek.net>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tools/regression/pjdfstest/Makefile b/contrib/pjdfstest/Makefile
similarity index 100%
rename from tools/regression/pjdfstest/Makefile
rename to contrib/pjdfstest/Makefile
diff --git a/tools/regression/pjdfstest/README b/contrib/pjdfstest/README
similarity index 81%
rename from tools/regression/pjdfstest/README
rename to contrib/pjdfstest/README
index fb1cda52ab62..dcc5a64ba3f4 100644
--- a/tools/regression/pjdfstest/README
+++ b/contrib/pjdfstest/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: head/tools/regression/pjdfstest/README 211354 2010-08-15 21:29:03Z pjd $
 
 Few notes on how to use pjdfstest in short steps:
 
@@ -19,4 +19,4 @@ Currently supported operating systems: FreeBSD, Solaris.
 Currently supported file system types: UFS, ZFS.
 
 -- 
-Pawel Jakub Dawidek <pjd@FreeBSD.org>
+Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/tools/regression/pjdfstest/pjdfstest.c b/contrib/pjdfstest/pjdfstest.c
similarity index 100%
rename from tools/regression/pjdfstest/pjdfstest.c
rename to contrib/pjdfstest/pjdfstest.c
diff --git a/tools/regression/pjdfstest/tests/chflags/00.t b/contrib/pjdfstest/tests/chflags/00.t
similarity index 97%
rename from tools/regression/pjdfstest/tests/chflags/00.t
rename to contrib/pjdfstest/tests/chflags/00.t
index b233b8ea697c..4d7b4c9a3464 100644
--- a/tools/regression/pjdfstest/tests/chflags/00.t
+++ b/contrib/pjdfstest/tests/chflags/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags changes flags"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/01.t b/contrib/pjdfstest/tests/chflags/01.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/chflags/01.t
rename to contrib/pjdfstest/tests/chflags/01.t
index b71951bb71f0..62713fd0347a 100644
--- a/tools/regression/pjdfstest/tests/chflags/01.t
+++ b/contrib/pjdfstest/tests/chflags/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="chflags returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/02.t b/contrib/pjdfstest/tests/chflags/02.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/chflags/02.t
rename to contrib/pjdfstest/tests/chflags/02.t
index b64345b22ea9..d4a0b371b094 100644
--- a/tools/regression/pjdfstest/tests/chflags/02.t
+++ b/contrib/pjdfstest/tests/chflags/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/03.t b/contrib/pjdfstest/tests/chflags/03.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/chflags/03.t
rename to contrib/pjdfstest/tests/chflags/03.t
index 9552831b3846..87a62029509b 100644
--- a/tools/regression/pjdfstest/tests/chflags/03.t
+++ b/contrib/pjdfstest/tests/chflags/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/04.t b/contrib/pjdfstest/tests/chflags/04.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/chflags/04.t
rename to contrib/pjdfstest/tests/chflags/04.t
index 591ae69e130e..3d5aa3b42ba3 100644
--- a/tools/regression/pjdfstest/tests/chflags/04.t
+++ b/contrib/pjdfstest/tests/chflags/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/05.t b/contrib/pjdfstest/tests/chflags/05.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/chflags/05.t
rename to contrib/pjdfstest/tests/chflags/05.t
index 7409798f889e..cc3e04b3ec57 100644
--- a/tools/regression/pjdfstest/tests/chflags/05.t
+++ b/contrib/pjdfstest/tests/chflags/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/06.t b/contrib/pjdfstest/tests/chflags/06.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/chflags/06.t
rename to contrib/pjdfstest/tests/chflags/06.t
index ae5973e288b2..e4899eb7642e 100644
--- a/tools/regression/pjdfstest/tests/chflags/06.t
+++ b/contrib/pjdfstest/tests/chflags/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/07.t b/contrib/pjdfstest/tests/chflags/07.t
similarity index 91%
rename from tools/regression/pjdfstest/tests/chflags/07.t
rename to contrib/pjdfstest/tests/chflags/07.t
index 5d898d849dd5..c2d0af2447b9 100644
--- a/tools/regression/pjdfstest/tests/chflags/07.t
+++ b/contrib/pjdfstest/tests/chflags/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EPERM when the effective user ID does not match the owner of the file and the effective user ID is not the super-user"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/08.t b/contrib/pjdfstest/tests/chflags/08.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/chflags/08.t
rename to contrib/pjdfstest/tests/chflags/08.t
index 18d593d035f5..62ed480feec0 100644
--- a/tools/regression/pjdfstest/tests/chflags/08.t
+++ b/contrib/pjdfstest/tests/chflags/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and the user is not the super-user"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/09.t b/contrib/pjdfstest/tests/chflags/09.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/chflags/09.t
rename to contrib/pjdfstest/tests/chflags/09.t
index e40d7a8e0793..e7bd5cc8d660 100644
--- a/tools/regression/pjdfstest/tests/chflags/09.t
+++ b/contrib/pjdfstest/tests/chflags/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and securelevel is greater than 0"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/10.t b/contrib/pjdfstest/tests/chflags/10.t
similarity index 92%
rename from tools/regression/pjdfstest/tests/chflags/10.t
rename to contrib/pjdfstest/tests/chflags/10.t
index 55f0be6d68ef..11ce36b4d0ab 100644
--- a/tools/regression/pjdfstest/tests/chflags/10.t
+++ b/contrib/pjdfstest/tests/chflags/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EPERM if non-super-user tries to set one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/11.t b/contrib/pjdfstest/tests/chflags/11.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/chflags/11.t
rename to contrib/pjdfstest/tests/chflags/11.t
index 19af4115452e..33acca7f327a 100644
--- a/tools/regression/pjdfstest/tests/chflags/11.t
+++ b/contrib/pjdfstest/tests/chflags/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EPERM if a user tries to set or remove the SF_SNAPSHOT flag"
 
diff --git a/tools/regression/pjdfstest/tests/chflags/12.t b/contrib/pjdfstest/tests/chflags/12.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/chflags/12.t
rename to contrib/pjdfstest/tests/chflags/12.t
index 950458e775c4..794139becf59 100644
--- a/tools/regression/pjdfstest/tests/chflags/12.t
+++ b/contrib/pjdfstest/tests/chflags/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EROFS if the named file resides on a read-only file system"
 
@@ -16,8 +16,8 @@ FreeBSD:UFS)
 	n1=`namegen`
 
 	expect 0 mkdir ${n0} 0755
-	n=`mdconfig -a -n -t malloc -s 1m`
-	newfs /dev/md${n} >/dev/null
+	n=`mdconfig -a -n -t malloc -s 1m` || exit
+	newfs /dev/md${n} >/dev/null || exit
 	mount /dev/md${n} ${n0}
 	expect 0 create ${n0}/${n1} 0644
 	expect 0 chflags ${n0}/${n1} UF_IMMUTABLE
@@ -34,7 +34,7 @@ FreeBSD:UFS)
 	expect none stat ${n0}/${n1} flags
 	expect 0 unlink ${n0}/${n1}
 	umount /dev/md${n}
-	mdconfig -d -u ${n}
+	mdconfig -d -u ${n} || exit
 	expect 0 rmdir ${n0}
 	;;
 FreeBSD:ZFS)
@@ -43,7 +43,7 @@ FreeBSD:ZFS)
 	n0=`namegen`
 	n1=`namegen`
 
-	n=`mdconfig -a -n -t malloc -s 128m`
+	n=`mdconfig -a -n -t malloc -s 128m` || exit
 	zpool create ${n0} /dev/md${n}
 	expect 0 create /${n0}/${n1} 0644
 	expect 0 chflags /${n0}/${n1} UF_NODUMP
@@ -60,7 +60,7 @@ FreeBSD:ZFS)
 	expect none stat /${n0}/${n1} flags
 	expect 0 unlink /${n0}/${n1}
 	zpool destroy ${n0}
-	mdconfig -d -u ${n}
+	mdconfig -d -u ${n} || exit
 	;;
 *)
 	quick_exit
diff --git a/tools/regression/pjdfstest/tests/chflags/13.t b/contrib/pjdfstest/tests/chflags/13.t
similarity index 72%
rename from tools/regression/pjdfstest/tests/chflags/13.t
rename to contrib/pjdfstest/tests/chflags/13.t
index 247246a6cc1d..981122c8b3be 100644
--- a/tools/regression/pjdfstest/tests/chflags/13.t
+++ b/contrib/pjdfstest/tests/chflags/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chflags/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chflags returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/00.t b/contrib/pjdfstest/tests/chmod/00.t
similarity index 97%
rename from tools/regression/pjdfstest/tests/chmod/00.t
rename to contrib/pjdfstest/tests/chmod/00.t
index 311a8c8c56f8..d68d0cf4e652 100644
--- a/tools/regression/pjdfstest/tests/chmod/00.t
+++ b/contrib/pjdfstest/tests/chmod/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod changes permission"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/01.t b/contrib/pjdfstest/tests/chmod/01.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/chmod/01.t
rename to contrib/pjdfstest/tests/chmod/01.t
index 49164e71585e..85802fca2439 100644
--- a/tools/regression/pjdfstest/tests/chmod/01.t
+++ b/contrib/pjdfstest/tests/chmod/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="chmod returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/02.t b/contrib/pjdfstest/tests/chmod/02.t
similarity index 83%
rename from tools/regression/pjdfstest/tests/chmod/02.t
rename to contrib/pjdfstest/tests/chmod/02.t
index ece2b6c23cb6..0cadec29bf0c 100644
--- a/tools/regression/pjdfstest/tests/chmod/02.t
+++ b/contrib/pjdfstest/tests/chmod/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/03.t b/contrib/pjdfstest/tests/chmod/03.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/chmod/03.t
rename to contrib/pjdfstest/tests/chmod/03.t
index 30261d53e38d..fa4580fbcfeb 100644
--- a/tools/regression/pjdfstest/tests/chmod/03.t
+++ b/contrib/pjdfstest/tests/chmod/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/04.t b/contrib/pjdfstest/tests/chmod/04.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/chmod/04.t
rename to contrib/pjdfstest/tests/chmod/04.t
index a125ae2ed9cb..9386c9a3e6ba 100644
--- a/tools/regression/pjdfstest/tests/chmod/04.t
+++ b/contrib/pjdfstest/tests/chmod/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/05.t b/contrib/pjdfstest/tests/chmod/05.t
similarity index 91%
rename from tools/regression/pjdfstest/tests/chmod/05.t
rename to contrib/pjdfstest/tests/chmod/05.t
index c06895a86377..5648e46eef8b 100644
--- a/tools/regression/pjdfstest/tests/chmod/05.t
+++ b/contrib/pjdfstest/tests/chmod/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/06.t b/contrib/pjdfstest/tests/chmod/06.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/chmod/06.t
rename to contrib/pjdfstest/tests/chmod/06.t
index c06fe2bb59f6..d44b3cb1ea52 100644
--- a/tools/regression/pjdfstest/tests/chmod/06.t
+++ b/contrib/pjdfstest/tests/chmod/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/06.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="chmod returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/07.t b/contrib/pjdfstest/tests/chmod/07.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/chmod/07.t
rename to contrib/pjdfstest/tests/chmod/07.t
index 519b7fdddbc1..012e59a97bb5 100644
--- a/tools/regression/pjdfstest/tests/chmod/07.t
+++ b/contrib/pjdfstest/tests/chmod/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EPERM if the operation would change the ownership, but the effective user ID is not the super-user"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/08.t b/contrib/pjdfstest/tests/chmod/08.t
similarity index 96%
rename from tools/regression/pjdfstest/tests/chmod/08.t
rename to contrib/pjdfstest/tests/chmod/08.t
index bf2713468694..5b37569a82d7 100644
--- a/tools/regression/pjdfstest/tests/chmod/08.t
+++ b/contrib/pjdfstest/tests/chmod/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/09.t b/contrib/pjdfstest/tests/chmod/09.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/chmod/09.t
rename to contrib/pjdfstest/tests/chmod/09.t
index 18e4cdc4e23c..f4b911e2f15a 100644
--- a/tools/regression/pjdfstest/tests/chmod/09.t
+++ b/contrib/pjdfstest/tests/chmod/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EROFS if the named file resides on a read-only file system"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 expect 0 chmod ${n0}/${n1} 0640
 expect 0640 stat ${n0}/${n1} mode
@@ -33,5 +33,5 @@ expect 0 lchmod ${n0}/${n1} 0640
 expect 0640 stat ${n0}/${n1} mode
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/chmod/10.t b/contrib/pjdfstest/tests/chmod/10.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/chmod/10.t
rename to contrib/pjdfstest/tests/chmod/10.t
index b75b712ba8ca..1153429ac1dc 100644
--- a/tools/regression/pjdfstest/tests/chmod/10.t
+++ b/contrib/pjdfstest/tests/chmod/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/11.t b/contrib/pjdfstest/tests/chmod/11.t
similarity index 96%
rename from tools/regression/pjdfstest/tests/chmod/11.t
rename to contrib/pjdfstest/tests/chmod/11.t
index 882989681677..94c5e5f4f319 100644
--- a/tools/regression/pjdfstest/tests/chmod/11.t
+++ b/contrib/pjdfstest/tests/chmod/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chmod returns EFTYPE if the effective user ID is not the super-user, the mode includes the sticky bit (S_ISVTX), and path does not refer to a directory"
 
diff --git a/tools/regression/pjdfstest/tests/chmod/12.t b/contrib/pjdfstest/tests/chmod/12.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/chmod/12.t
rename to contrib/pjdfstest/tests/chmod/12.t
index affa8de0fbeb..b7f7d67997fb 100644
--- a/tools/regression/pjdfstest/tests/chmod/12.t
+++ b/contrib/pjdfstest/tests/chmod/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chmod/12.t 219463 2011-03-10 20:59:02Z pjd $
 
 desc="verify SUID/SGID bit behaviour"
 
diff --git a/contrib/pjdfstest/tests/chmod/foo b/contrib/pjdfstest/tests/chmod/foo
new file mode 100755
index 000000000000..e69de29bb2d1
diff --git a/tools/regression/pjdfstest/tests/chown/00.t b/contrib/pjdfstest/tests/chown/00.t
similarity index 99%
rename from tools/regression/pjdfstest/tests/chown/00.t
rename to contrib/pjdfstest/tests/chown/00.t
index a3ccbac6db25..5c6be97d66dd 100644
--- a/tools/regression/pjdfstest/tests/chown/00.t
+++ b/contrib/pjdfstest/tests/chown/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/00.t 228975 2011-12-30 00:04:11Z uqs $
 
 desc="chown changes ownership"
 
diff --git a/tools/regression/pjdfstest/tests/chown/01.t b/contrib/pjdfstest/tests/chown/01.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/chown/01.t
rename to contrib/pjdfstest/tests/chown/01.t
index 249ce4de4c93..1813394aee83 100644
--- a/tools/regression/pjdfstest/tests/chown/01.t
+++ b/contrib/pjdfstest/tests/chown/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="chown returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/chown/02.t b/contrib/pjdfstest/tests/chown/02.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/chown/02.t
rename to contrib/pjdfstest/tests/chown/02.t
index 2225f64dcd17..e110db8261ba 100644
--- a/tools/regression/pjdfstest/tests/chown/02.t
+++ b/contrib/pjdfstest/tests/chown/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chown returns ENAMETOOLONG if a component of a pathname exceeded ${NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chown/03.t b/contrib/pjdfstest/tests/chown/03.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/chown/03.t
rename to contrib/pjdfstest/tests/chown/03.t
index 6bb43a292ff5..031a878f3524 100644
--- a/tools/regression/pjdfstest/tests/chown/03.t
+++ b/contrib/pjdfstest/tests/chown/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chown returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/chown/04.t b/contrib/pjdfstest/tests/chown/04.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/chown/04.t
rename to contrib/pjdfstest/tests/chown/04.t
index e66d936ed5c0..d6eac198ed1e 100644
--- a/tools/regression/pjdfstest/tests/chown/04.t
+++ b/contrib/pjdfstest/tests/chown/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/04.t 211410 2010-08-17 06:08:09Z pjd $
 
 desc="chown returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/chown/05.t b/contrib/pjdfstest/tests/chown/05.t
similarity index 91%
rename from tools/regression/pjdfstest/tests/chown/05.t
rename to contrib/pjdfstest/tests/chown/05.t
index ec7cd5ccecec..5a27a9ca90fc 100644
--- a/tools/regression/pjdfstest/tests/chown/05.t
+++ b/contrib/pjdfstest/tests/chown/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/05.t 211410 2010-08-17 06:08:09Z pjd $
 
 desc="chown returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/chown/06.t b/contrib/pjdfstest/tests/chown/06.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/chown/06.t
rename to contrib/pjdfstest/tests/chown/06.t
index 39ccac68e879..a7ac349c02f8 100644
--- a/tools/regression/pjdfstest/tests/chown/06.t
+++ b/contrib/pjdfstest/tests/chown/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/06.t 211410 2010-08-17 06:08:09Z pjd $
 
 desc="chown returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/chown/07.t b/contrib/pjdfstest/tests/chown/07.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/chown/07.t
rename to contrib/pjdfstest/tests/chown/07.t
index 7f73cbe0ec09..f188080d05ec 100644
--- a/tools/regression/pjdfstest/tests/chown/07.t
+++ b/contrib/pjdfstest/tests/chown/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/07.t 211410 2010-08-17 06:08:09Z pjd $
 
 desc="chown returns EPERM if the operation would change the ownership, but the effective user ID is not the super-user and the process is not an owner of the file"
 
diff --git a/tools/regression/pjdfstest/tests/chown/08.t b/contrib/pjdfstest/tests/chown/08.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/chown/08.t
rename to contrib/pjdfstest/tests/chown/08.t
index 9bff354e673f..a98f873ff91b 100644
--- a/tools/regression/pjdfstest/tests/chown/08.t
+++ b/contrib/pjdfstest/tests/chown/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chown returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/chown/09.t b/contrib/pjdfstest/tests/chown/09.t
similarity index 73%
rename from tools/regression/pjdfstest/tests/chown/09.t
rename to contrib/pjdfstest/tests/chown/09.t
index cc14328036f6..a99751e175c8 100644
--- a/tools/regression/pjdfstest/tests/chown/09.t
+++ b/contrib/pjdfstest/tests/chown/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="chown returns EROFS if the named file resides on a read-only file system"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 expect 0 chown ${n0}/${n1} 65534 65534
 expect 65534,65534 stat ${n0}/${n1} uid,gid
@@ -28,5 +28,5 @@ expect 0 chown ${n0}/${n1} 65533 65533
 expect 65533,65533 stat ${n0}/${n1} uid,gid
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/chown/10.t b/contrib/pjdfstest/tests/chown/10.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/chown/10.t
rename to contrib/pjdfstest/tests/chown/10.t
index 961a5be27a78..e791008ee54e 100644
--- a/tools/regression/pjdfstest/tests/chown/10.t
+++ b/contrib/pjdfstest/tests/chown/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/chown/10.t 211410 2010-08-17 06:08:09Z pjd $
 
 desc="chown returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/conf b/contrib/pjdfstest/tests/conf
similarity index 90%
rename from tools/regression/pjdfstest/tests/conf
rename to contrib/pjdfstest/tests/conf
index f914941482a8..adb6cd6fb9b5 100644
--- a/tools/regression/pjdfstest/tests/conf
+++ b/contrib/pjdfstest/tests/conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/conf 211354 2010-08-15 21:29:03Z pjd $
 # pjdfstest configuration file
 
 # Supported operating systems: FreeBSD, Darwin, SunOS, Linux
diff --git a/tools/regression/pjdfstest/tests/ftruncate/00.t b/contrib/pjdfstest/tests/ftruncate/00.t
similarity index 92%
rename from tools/regression/pjdfstest/tests/ftruncate/00.t
rename to contrib/pjdfstest/tests/ftruncate/00.t
index 9028a296b5dd..0f253017f8f3 100644
--- a/tools/regression/pjdfstest/tests/ftruncate/00.t
+++ b/contrib/pjdfstest/tests/ftruncate/00.t
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/ftruncate/00.t 219439 2011-03-09 23:11:30Z pjd $
 
 desc="ftruncate descrease/increase file size"
 
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..21"
+echo "1..26"
 
 n0=`namegen`
 n1=`namegen`
diff --git a/tools/regression/pjdfstest/tests/truncate/01.t b/contrib/pjdfstest/tests/ftruncate/01.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/truncate/01.t
rename to contrib/pjdfstest/tests/ftruncate/01.t
index ac504a1f5124..a8e95ac60181 100644
--- a/tools/regression/pjdfstest/tests/truncate/01.t
+++ b/contrib/pjdfstest/tests/ftruncate/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/02.t b/contrib/pjdfstest/tests/ftruncate/02.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/truncate/02.t
rename to contrib/pjdfstest/tests/ftruncate/02.t
index 3f3590f38c0e..83de38d3244f 100644
--- a/tools/regression/pjdfstest/tests/truncate/02.t
+++ b/contrib/pjdfstest/tests/ftruncate/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/03.t b/contrib/pjdfstest/tests/ftruncate/03.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/truncate/03.t
rename to contrib/pjdfstest/tests/ftruncate/03.t
index 0ed60a917474..41e98625ba4f 100644
--- a/tools/regression/pjdfstest/tests/truncate/03.t
+++ b/contrib/pjdfstest/tests/ftruncate/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/04.t b/contrib/pjdfstest/tests/ftruncate/04.t
similarity index 74%
rename from tools/regression/pjdfstest/tests/truncate/04.t
rename to contrib/pjdfstest/tests/ftruncate/04.t
index 14f513c84795..cd1cfc66b2b0 100644
--- a/tools/regression/pjdfstest/tests/truncate/04.t
+++ b/contrib/pjdfstest/tests/ftruncate/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/05.t b/contrib/pjdfstest/tests/ftruncate/05.t
similarity index 89%
rename from tools/regression/pjdfstest/tests/truncate/05.t
rename to contrib/pjdfstest/tests/ftruncate/05.t
index 9aa65c84afcb..f12881581bce 100644
--- a/tools/regression/pjdfstest/tests/truncate/05.t
+++ b/contrib/pjdfstest/tests/ftruncate/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/06.t b/contrib/pjdfstest/tests/ftruncate/06.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/truncate/06.t
rename to contrib/pjdfstest/tests/ftruncate/06.t
index 8e0ca5bd55c5..1ce516fa74a6 100644
--- a/tools/regression/pjdfstest/tests/truncate/06.t
+++ b/contrib/pjdfstest/tests/ftruncate/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EACCES if the named file is not writable by the user"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/07.t b/contrib/pjdfstest/tests/ftruncate/07.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/truncate/07.t
rename to contrib/pjdfstest/tests/ftruncate/07.t
index 60b8b907bf46..44f87e7ea859 100644
--- a/tools/regression/pjdfstest/tests/truncate/07.t
+++ b/contrib/pjdfstest/tests/ftruncate/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/08.t b/contrib/pjdfstest/tests/ftruncate/08.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/truncate/08.t
rename to contrib/pjdfstest/tests/ftruncate/08.t
index 75d6679e915e..6f205ef965f2 100644
--- a/tools/regression/pjdfstest/tests/truncate/08.t
+++ b/contrib/pjdfstest/tests/ftruncate/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/09.t b/contrib/pjdfstest/tests/ftruncate/09.t
similarity index 69%
rename from tools/regression/pjdfstest/tests/truncate/09.t
rename to contrib/pjdfstest/tests/ftruncate/09.t
index 1d95c7fe918c..d7e082ddbe0e 100644
--- a/tools/regression/pjdfstest/tests/truncate/09.t
+++ b/contrib/pjdfstest/tests/ftruncate/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EISDIR if the named file is a directory"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/10.t b/contrib/pjdfstest/tests/ftruncate/10.t
similarity index 71%
rename from tools/regression/pjdfstest/tests/truncate/10.t
rename to contrib/pjdfstest/tests/ftruncate/10.t
index 6fcd129573a4..ced3583ec21d 100644
--- a/tools/regression/pjdfstest/tests/truncate/10.t
+++ b/contrib/pjdfstest/tests/ftruncate/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EROFS if the named file resides on a read-only file system"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 expect 0 truncate ${n0}/${n1} 123
 expect 123 stat ${n0}/${n1} size
@@ -28,5 +28,5 @@ expect 0 truncate ${n0}/${n1} 1234
 expect 1234 stat ${n0}/${n1} size
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/truncate/11.t b/contrib/pjdfstest/tests/ftruncate/11.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/truncate/11.t
rename to contrib/pjdfstest/tests/ftruncate/11.t
index 255fd19d5fca..b00d7b89c16d 100644
--- a/tools/regression/pjdfstest/tests/truncate/11.t
+++ b/contrib/pjdfstest/tests/ftruncate/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns ETXTBSY the file is a pure procedure (shared text) file that is being executed"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/12.t b/contrib/pjdfstest/tests/ftruncate/12.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/truncate/12.t
rename to contrib/pjdfstest/tests/ftruncate/12.t
index cf6a49743e49..1825456a7b13 100644
--- a/tools/regression/pjdfstest/tests/truncate/12.t
+++ b/contrib/pjdfstest/tests/ftruncate/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EFBIG or EINVAL if the length argument was greater than the maximum file size"
 
diff --git a/contrib/pjdfstest/tests/ftruncate/13.t b/contrib/pjdfstest/tests/ftruncate/13.t
new file mode 100644
index 000000000000..28307ae40af7
--- /dev/null
+++ b/contrib/pjdfstest/tests/ftruncate/13.t
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/13.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="ftruncate returns EINVAL if the length argument was less than 0"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..4"
+
+n0=`namegen`
+
+expect 0 create ${n0} 0644
+expect EINVAL -- open ${n0} O_RDWR : ftruncate 0 -1
+expect EINVAL -- open ${n0} O_WRONLY : ftruncate 0 -999999
+expect 0 unlink ${n0}
diff --git a/tools/regression/pjdfstest/tests/truncate/14.t b/contrib/pjdfstest/tests/ftruncate/14.t
similarity index 70%
rename from tools/regression/pjdfstest/tests/truncate/14.t
rename to contrib/pjdfstest/tests/ftruncate/14.t
index 53dca715237e..a238771264f9 100644
--- a/tools/regression/pjdfstest/tests/truncate/14.t
+++ b/contrib/pjdfstest/tests/ftruncate/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/14.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/granular/00.t b/contrib/pjdfstest/tests/granular/00.t
similarity index 97%
rename from tools/regression/pjdfstest/tests/granular/00.t
rename to contrib/pjdfstest/tests/granular/00.t
index 4e0426092b42..629f66e419ac 100644
--- a/tools/regression/pjdfstest/tests/granular/00.t
+++ b/contrib/pjdfstest/tests/granular/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories"
 
diff --git a/tools/regression/pjdfstest/tests/granular/01.t b/contrib/pjdfstest/tests/granular/01.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/granular/01.t
rename to contrib/pjdfstest/tests/granular/01.t
index 1c6b3f3429fe..f6658cc5f840 100644
--- a/tools/regression/pjdfstest/tests/granular/01.t
+++ b/contrib/pjdfstest/tests/granular/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES"
 
diff --git a/tools/regression/pjdfstest/tests/granular/02.t b/contrib/pjdfstest/tests/granular/02.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/granular/02.t
rename to contrib/pjdfstest/tests/granular/02.t
index 4a33dad99c2c..32a318cc0d90 100644
--- a/tools/regression/pjdfstest/tests/granular/02.t
+++ b/contrib/pjdfstest/tests/granular/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL"
 
diff --git a/tools/regression/pjdfstest/tests/granular/03.t b/contrib/pjdfstest/tests/granular/03.t
similarity index 97%
rename from tools/regression/pjdfstest/tests/granular/03.t
rename to contrib/pjdfstest/tests/granular/03.t
index 195065f9c268..3b825ccef3a3 100644
--- a/tools/regression/pjdfstest/tests/granular/03.t
+++ b/contrib/pjdfstest/tests/granular/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD"
 
diff --git a/tools/regression/pjdfstest/tests/granular/04.t b/contrib/pjdfstest/tests/granular/04.t
similarity index 96%
rename from tools/regression/pjdfstest/tests/granular/04.t
rename to contrib/pjdfstest/tests/granular/04.t
index 9c0841ded9b7..a06b0d605ebd 100644
--- a/tools/regression/pjdfstest/tests/granular/04.t
+++ b/contrib/pjdfstest/tests/granular/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER"
 
diff --git a/tools/regression/pjdfstest/tests/granular/05.t b/contrib/pjdfstest/tests/granular/05.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/granular/05.t
rename to contrib/pjdfstest/tests/granular/05.t
index 8abf3578fc25..c42f51a90987 100644
--- a/tools/regression/pjdfstest/tests/granular/05.t
+++ b/contrib/pjdfstest/tests/granular/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/granular/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD with directories"
 
diff --git a/tools/regression/pjdfstest/tests/link/00.t b/contrib/pjdfstest/tests/link/00.t
similarity index 96%
rename from tools/regression/pjdfstest/tests/link/00.t
rename to contrib/pjdfstest/tests/link/00.t
index b003d7867739..1bcb32ad17ac 100644
--- a/tools/regression/pjdfstest/tests/link/00.t
+++ b/contrib/pjdfstest/tests/link/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link creates hardlinks"
 
diff --git a/tools/regression/pjdfstest/tests/link/01.t b/contrib/pjdfstest/tests/link/01.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/link/01.t
rename to contrib/pjdfstest/tests/link/01.t
index 94009010d4d1..fe05aeba7119 100644
--- a/tools/regression/pjdfstest/tests/link/01.t
+++ b/contrib/pjdfstest/tests/link/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="link returns ENOTDIR if a component of either path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/link/02.t b/contrib/pjdfstest/tests/link/02.t
similarity index 83%
rename from tools/regression/pjdfstest/tests/link/02.t
rename to contrib/pjdfstest/tests/link/02.t
index 32f78c451668..ca3e092edf99 100644
--- a/tools/regression/pjdfstest/tests/link/02.t
+++ b/contrib/pjdfstest/tests/link/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ENAMETOOLONG if a component of either pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/link/03.t b/contrib/pjdfstest/tests/link/03.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/link/03.t
rename to contrib/pjdfstest/tests/link/03.t
index 0ad79c3d71e1..22f8e55e0cb3 100644
--- a/tools/regression/pjdfstest/tests/link/03.t
+++ b/contrib/pjdfstest/tests/link/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ENAMETOOLONG if an entire length of either path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/link/04.t b/contrib/pjdfstest/tests/link/04.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/link/04.t
rename to contrib/pjdfstest/tests/link/04.t
index d27beef1760d..bb095396005e 100644
--- a/tools/regression/pjdfstest/tests/link/04.t
+++ b/contrib/pjdfstest/tests/link/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ENOENT if a component of either path prefix does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/link/05.t b/contrib/pjdfstest/tests/link/05.t
similarity index 68%
rename from tools/regression/pjdfstest/tests/link/05.t
rename to contrib/pjdfstest/tests/link/05.t
index ee63ef666056..c6f55fa957dd 100644
--- a/tools/regression/pjdfstest/tests/link/05.t
+++ b/contrib/pjdfstest/tests/link/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EMLINK if the link count of the file named by name1 would exceed 32767"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs -i 1 /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs -i 1 /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 i=1
 while :; do
@@ -32,5 +32,5 @@ test_check $i -eq 32767
 expect EMLINK link ${n0}/${n1} ${n0}/${n2}
 
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/link/06.t b/contrib/pjdfstest/tests/link/06.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/link/06.t
rename to contrib/pjdfstest/tests/link/06.t
index 3ce091918765..73ab01e9ae15 100644
--- a/tools/regression/pjdfstest/tests/link/06.t
+++ b/contrib/pjdfstest/tests/link/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EACCES when a component of either path prefix denies search permission"
 
diff --git a/tools/regression/pjdfstest/tests/link/07.t b/contrib/pjdfstest/tests/link/07.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/link/07.t
rename to contrib/pjdfstest/tests/link/07.t
index f9d35e76f9ae..68495dd7c0b8 100644
--- a/tools/regression/pjdfstest/tests/link/07.t
+++ b/contrib/pjdfstest/tests/link/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EACCES when the requested link requires writing in a directory with a mode that denies write permission"
 
diff --git a/tools/regression/pjdfstest/tests/link/08.t b/contrib/pjdfstest/tests/link/08.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/link/08.t
rename to contrib/pjdfstest/tests/link/08.t
index f9d9445db5f0..f4599d50f01b 100644
--- a/tools/regression/pjdfstest/tests/link/08.t
+++ b/contrib/pjdfstest/tests/link/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ELOOP if too many symbolic links were encountered in translating one of the pathnames"
 
diff --git a/tools/regression/pjdfstest/tests/link/09.t b/contrib/pjdfstest/tests/link/09.t
similarity index 74%
rename from tools/regression/pjdfstest/tests/link/09.t
rename to contrib/pjdfstest/tests/link/09.t
index 224395f42187..5f89655d3610 100644
--- a/tools/regression/pjdfstest/tests/link/09.t
+++ b/contrib/pjdfstest/tests/link/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ENOENT if the source file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/link/10.t b/contrib/pjdfstest/tests/link/10.t
similarity index 81%
rename from tools/regression/pjdfstest/tests/link/10.t
rename to contrib/pjdfstest/tests/link/10.t
index 725a020d7a2b..03ebbd25ffdb 100644
--- a/tools/regression/pjdfstest/tests/link/10.t
+++ b/contrib/pjdfstest/tests/link/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/10.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="link returns EEXIST if the destination file does exist"
 
diff --git a/tools/regression/pjdfstest/tests/link/11.t b/contrib/pjdfstest/tests/link/11.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/link/11.t
rename to contrib/pjdfstest/tests/link/11.t
index cf31c9ee31fd..260342cd1d31 100644
--- a/tools/regression/pjdfstest/tests/link/11.t
+++ b/contrib/pjdfstest/tests/link/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EPERM if the source file is a directory"
 
diff --git a/tools/regression/pjdfstest/tests/link/12.t b/contrib/pjdfstest/tests/link/12.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/link/12.t
rename to contrib/pjdfstest/tests/link/12.t
index 8bf9510f7c7a..a5408b656418 100644
--- a/tools/regression/pjdfstest/tests/link/12.t
+++ b/contrib/pjdfstest/tests/link/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EPERM if the source file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/link/13.t b/contrib/pjdfstest/tests/link/13.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/link/13.t
rename to contrib/pjdfstest/tests/link/13.t
index 9b35a4b430e5..2da8621f23cc 100644
--- a/tools/regression/pjdfstest/tests/link/13.t
+++ b/contrib/pjdfstest/tests/link/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EPERM if the parent directory of the destination file has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/link/14.t b/contrib/pjdfstest/tests/link/14.t
similarity index 67%
rename from tools/regression/pjdfstest/tests/link/14.t
rename to contrib/pjdfstest/tests/link/14.t
index 4eb5a5629a53..aa587e5a6d67 100644
--- a/tools/regression/pjdfstest/tests/link/14.t
+++ b/contrib/pjdfstest/tests/link/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/14.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EXDEV if the source and the destination files are on different file systems"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 expect EXDEV link ${n0}/${n1} ${n2}
 expect 0 unlink ${n0}/${n1}
@@ -25,5 +25,5 @@ expect 0 create ${n1} 0644
 expect EXDEV link ${n1} ${n0}/${n2}
 expect 0 unlink ${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/link/15.t b/contrib/pjdfstest/tests/link/15.t
similarity index 71%
rename from tools/regression/pjdfstest/tests/link/15.t
rename to contrib/pjdfstest/tests/link/15.t
index eea184443841..a740126a0d80 100644
--- a/tools/regression/pjdfstest/tests/link/15.t
+++ b/contrib/pjdfstest/tests/link/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/15.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns ENOSPC if the directory in which the entry for the new link is being placed cannot be extended because there is no space left on the file system containing the directory"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 i=0
 while :; do
@@ -29,5 +29,5 @@ while :; do
 done
 expect ENOSPC link ${n0}/${n1} ${n0}/${n2}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/link/16.t b/contrib/pjdfstest/tests/link/16.t
similarity index 71%
rename from tools/regression/pjdfstest/tests/link/16.t
rename to contrib/pjdfstest/tests/link/16.t
index df04521eafd4..2d67f30c2a55 100644
--- a/tools/regression/pjdfstest/tests/link/16.t
+++ b/contrib/pjdfstest/tests/link/16.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/16.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EROFS if the requested link requires writing in a directory on a read-only file system"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 
 expect 0 link ${n0}/${n1} ${n0}/${n2}
@@ -30,5 +30,5 @@ expect 0 unlink ${n0}/${n2}
 
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/link/17.t b/contrib/pjdfstest/tests/link/17.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/link/17.t
rename to contrib/pjdfstest/tests/link/17.t
index cb56128642bc..9b7e6fc68366 100644
--- a/tools/regression/pjdfstest/tests/link/17.t
+++ b/contrib/pjdfstest/tests/link/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/link/17.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="link returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/misc.sh b/contrib/pjdfstest/tests/misc.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/regression/pjdfstest/tests/misc.sh
rename to contrib/pjdfstest/tests/misc.sh
diff --git a/tools/regression/pjdfstest/tests/mkdir/00.t b/contrib/pjdfstest/tests/mkdir/00.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/mkdir/00.t
rename to contrib/pjdfstest/tests/mkdir/00.t
index d640de9b1a2d..fa1cbc126ebe 100644
--- a/tools/regression/pjdfstest/tests/mkdir/00.t
+++ b/contrib/pjdfstest/tests/mkdir/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir creates directories"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/01.t b/contrib/pjdfstest/tests/mkdir/01.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/mkdir/01.t
rename to contrib/pjdfstest/tests/mkdir/01.t
index c1de087079cd..c33ce1fe9a09 100644
--- a/tools/regression/pjdfstest/tests/mkdir/01.t
+++ b/contrib/pjdfstest/tests/mkdir/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="mkdir returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/02.t b/contrib/pjdfstest/tests/mkdir/02.t
similarity index 74%
rename from tools/regression/pjdfstest/tests/mkdir/02.t
rename to contrib/pjdfstest/tests/mkdir/02.t
index edb103d33517..e877f20f4c10 100644
--- a/tools/regression/pjdfstest/tests/mkdir/02.t
+++ b/contrib/pjdfstest/tests/mkdir/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/03.t b/contrib/pjdfstest/tests/mkdir/03.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/mkdir/03.t
rename to contrib/pjdfstest/tests/mkdir/03.t
index aa3b44c5446e..57ddd20a8627 100644
--- a/tools/regression/pjdfstest/tests/mkdir/03.t
+++ b/contrib/pjdfstest/tests/mkdir/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/04.t b/contrib/pjdfstest/tests/mkdir/04.t
similarity index 72%
rename from tools/regression/pjdfstest/tests/mkdir/04.t
rename to contrib/pjdfstest/tests/mkdir/04.t
index cd6581964155..0917ef15516d 100644
--- a/tools/regression/pjdfstest/tests/mkdir/04.t
+++ b/contrib/pjdfstest/tests/mkdir/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns ENOENT if a component of the path prefix does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/05.t b/contrib/pjdfstest/tests/mkdir/05.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mkdir/05.t
rename to contrib/pjdfstest/tests/mkdir/05.t
index 7e97d9bc6ed6..de351ca37ca7 100644
--- a/tools/regression/pjdfstest/tests/mkdir/05.t
+++ b/contrib/pjdfstest/tests/mkdir/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/06.t b/contrib/pjdfstest/tests/mkdir/06.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mkdir/06.t
rename to contrib/pjdfstest/tests/mkdir/06.t
index 79aa5395615a..2d2b8c22234b 100644
--- a/tools/regression/pjdfstest/tests/mkdir/06.t
+++ b/contrib/pjdfstest/tests/mkdir/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EACCES when write permission is denied on the parent directory of the directory to be created"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/07.t b/contrib/pjdfstest/tests/mkdir/07.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/mkdir/07.t
rename to contrib/pjdfstest/tests/mkdir/07.t
index dbb00df16a87..72ac2b69499f 100644
--- a/tools/regression/pjdfstest/tests/mkdir/07.t
+++ b/contrib/pjdfstest/tests/mkdir/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/08.t b/contrib/pjdfstest/tests/mkdir/08.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/mkdir/08.t
rename to contrib/pjdfstest/tests/mkdir/08.t
index ed6d92eb8cb2..366f223a8074 100644
--- a/tools/regression/pjdfstest/tests/mkdir/08.t
+++ b/contrib/pjdfstest/tests/mkdir/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EPERM if the parent directory of the directory to be created has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/09.t b/contrib/pjdfstest/tests/mkdir/09.t
similarity index 67%
rename from tools/regression/pjdfstest/tests/mkdir/09.t
rename to contrib/pjdfstest/tests/mkdir/09.t
index ce4bc9d754e1..2035b31fbbf4 100644
--- a/tools/regression/pjdfstest/tests/mkdir/09.t
+++ b/contrib/pjdfstest/tests/mkdir/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EROFS if the named file resides on a read-only file system"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 mkdir ${n0}/${n1} 0755
 expect 0 rmdir ${n0}/${n1}
 mount -ur /dev/md${n}
@@ -25,5 +25,5 @@ mount -uw /dev/md${n}
 expect 0 mkdir ${n0}/${n1} 0755
 expect 0 rmdir ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/mkdir/10.t b/contrib/pjdfstest/tests/mkdir/10.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/mkdir/10.t
rename to contrib/pjdfstest/tests/mkdir/10.t
index f64b8fddfd38..732dcb882562 100644
--- a/tools/regression/pjdfstest/tests/mkdir/10.t
+++ b/contrib/pjdfstest/tests/mkdir/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EEXIST if the named file exists"
 
diff --git a/tools/regression/pjdfstest/tests/mkdir/11.t b/contrib/pjdfstest/tests/mkdir/11.t
similarity index 66%
rename from tools/regression/pjdfstest/tests/mkdir/11.t
rename to contrib/pjdfstest/tests/mkdir/11.t
index 3943e61f7ddc..a0c905545c4a 100644
--- a/tools/regression/pjdfstest/tests/mkdir/11.t
+++ b/contrib/pjdfstest/tests/mkdir/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns ENOSPC if there are no free inodes on the file system on which the directory is being created"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 i=0
 while :; do
 	mkdir ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
 done
 expect ENOSPC mkdir ${n0}/${n1} 0755
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/mkdir/12.t b/contrib/pjdfstest/tests/mkdir/12.t
similarity index 70%
rename from tools/regression/pjdfstest/tests/mkdir/12.t
rename to contrib/pjdfstest/tests/mkdir/12.t
index af322c4247aa..7c27f74264f6 100644
--- a/tools/regression/pjdfstest/tests/mkdir/12.t
+++ b/contrib/pjdfstest/tests/mkdir/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkdir/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkdir returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/00.t b/contrib/pjdfstest/tests/mkfifo/00.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/mkfifo/00.t
rename to contrib/pjdfstest/tests/mkfifo/00.t
index eda7b1789f73..ad88e2836fbb 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/00.t
+++ b/contrib/pjdfstest/tests/mkfifo/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo creates fifo files"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/01.t b/contrib/pjdfstest/tests/mkfifo/01.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/mkfifo/01.t
rename to contrib/pjdfstest/tests/mkfifo/01.t
index 1c6193b18679..fae5c23091bc 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/01.t
+++ b/contrib/pjdfstest/tests/mkfifo/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="mkfifo returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/02.t b/contrib/pjdfstest/tests/mkfifo/02.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/mkfifo/02.t
rename to contrib/pjdfstest/tests/mkfifo/02.t
index 8589e9db067f..e51bcd5fdff2 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/02.t
+++ b/contrib/pjdfstest/tests/mkfifo/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/03.t b/contrib/pjdfstest/tests/mkfifo/03.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/mkfifo/03.t
rename to contrib/pjdfstest/tests/mkfifo/03.t
index caf529f9da8d..06265293517b 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/03.t
+++ b/contrib/pjdfstest/tests/mkfifo/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/04.t b/contrib/pjdfstest/tests/mkfifo/04.t
similarity index 72%
rename from tools/regression/pjdfstest/tests/mkfifo/04.t
rename to contrib/pjdfstest/tests/mkfifo/04.t
index d9ad95114418..981015808a18 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/04.t
+++ b/contrib/pjdfstest/tests/mkfifo/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ENOENT if a component of the path prefix does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/05.t b/contrib/pjdfstest/tests/mkfifo/05.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mkfifo/05.t
rename to contrib/pjdfstest/tests/mkfifo/05.t
index d93d568e733d..a9510e284841 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/05.t
+++ b/contrib/pjdfstest/tests/mkfifo/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/06.t b/contrib/pjdfstest/tests/mkfifo/06.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mkfifo/06.t
rename to contrib/pjdfstest/tests/mkfifo/06.t
index 47f199b31118..a1fa76135152 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/06.t
+++ b/contrib/pjdfstest/tests/mkfifo/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns EACCES when write permission is denied on the parent directory of the file to be created"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/07.t b/contrib/pjdfstest/tests/mkfifo/07.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/mkfifo/07.t
rename to contrib/pjdfstest/tests/mkfifo/07.t
index 44271b6df534..0ba1ac4bde30 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/07.t
+++ b/contrib/pjdfstest/tests/mkfifo/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/08.t b/contrib/pjdfstest/tests/mkfifo/08.t
similarity index 67%
rename from tools/regression/pjdfstest/tests/mkfifo/08.t
rename to contrib/pjdfstest/tests/mkfifo/08.t
index 0bdf430826e6..8e1bd2759524 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/08.t
+++ b/contrib/pjdfstest/tests/mkfifo/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns EROFS if the named file resides on a read-only file system"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 mkfifo ${n0}/${n1} 0644
 expect 0 unlink ${n0}/${n1}
 mount -ur /dev/md${n}
@@ -25,5 +25,5 @@ mount -uw /dev/md${n}
 expect 0 mkfifo ${n0}/${n1} 0644
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/mkfifo/09.t b/contrib/pjdfstest/tests/mkfifo/09.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/mkfifo/09.t
rename to contrib/pjdfstest/tests/mkfifo/09.t
index 6b2015e28f3e..15af5d106180 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/09.t
+++ b/contrib/pjdfstest/tests/mkfifo/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/09.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="mkfifo returns EEXIST if the named file exists"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/10.t b/contrib/pjdfstest/tests/mkfifo/10.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/mkfifo/10.t
rename to contrib/pjdfstest/tests/mkfifo/10.t
index e6aec4479ea8..4c8bcab5ff21 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/10.t
+++ b/contrib/pjdfstest/tests/mkfifo/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns EPERM if the parent directory of the file to be created has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/mkfifo/11.t b/contrib/pjdfstest/tests/mkfifo/11.t
similarity index 66%
rename from tools/regression/pjdfstest/tests/mkfifo/11.t
rename to contrib/pjdfstest/tests/mkfifo/11.t
index 261a8a7e244a..8b2396f3be0e 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/11.t
+++ b/contrib/pjdfstest/tests/mkfifo/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ENOSPC if there are no free inodes on the file system on which the file is being created"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 i=0
 while :; do
 	mkfifo ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
 done
 expect ENOSPC mkfifo ${n0}/${n1} 0644
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/mkfifo/12.t b/contrib/pjdfstest/tests/mkfifo/12.t
similarity index 70%
rename from tools/regression/pjdfstest/tests/mkfifo/12.t
rename to contrib/pjdfstest/tests/mkfifo/12.t
index 40c1455ad395..ad044b9f702c 100644
--- a/tools/regression/pjdfstest/tests/mkfifo/12.t
+++ b/contrib/pjdfstest/tests/mkfifo/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mkfifo/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/00.t b/contrib/pjdfstest/tests/mknod/00.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/mknod/00.t
rename to contrib/pjdfstest/tests/mknod/00.t
index 13f017d429bb..67f4046a6ffb 100644
--- a/tools/regression/pjdfstest/tests/mknod/00.t
+++ b/contrib/pjdfstest/tests/mknod/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod creates fifo files"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/01.t b/contrib/pjdfstest/tests/mknod/01.t
similarity index 83%
rename from tools/regression/pjdfstest/tests/mknod/01.t
rename to contrib/pjdfstest/tests/mknod/01.t
index bc2b658417b8..84a0a9731cd7 100644
--- a/tools/regression/pjdfstest/tests/mknod/01.t
+++ b/contrib/pjdfstest/tests/mknod/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="mknod returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/02.t b/contrib/pjdfstest/tests/mknod/02.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/mknod/02.t
rename to contrib/pjdfstest/tests/mknod/02.t
index 99e607f7554e..4e864fe69f69 100644
--- a/tools/regression/pjdfstest/tests/mknod/02.t
+++ b/contrib/pjdfstest/tests/mknod/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/03.t b/contrib/pjdfstest/tests/mknod/03.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/mknod/03.t
rename to contrib/pjdfstest/tests/mknod/03.t
index 10776c7a14c0..d5c572cbf460 100644
--- a/tools/regression/pjdfstest/tests/mknod/03.t
+++ b/contrib/pjdfstest/tests/mknod/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/04.t b/contrib/pjdfstest/tests/mknod/04.t
similarity index 73%
rename from tools/regression/pjdfstest/tests/mknod/04.t
rename to contrib/pjdfstest/tests/mknod/04.t
index 6c303185fb6a..4b80208caffe 100644
--- a/tools/regression/pjdfstest/tests/mknod/04.t
+++ b/contrib/pjdfstest/tests/mknod/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mkfifo returns ENOENT if a component of the path prefix does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/05.t b/contrib/pjdfstest/tests/mknod/05.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mknod/05.t
rename to contrib/pjdfstest/tests/mknod/05.t
index 800354149612..deafda620750 100644
--- a/tools/regression/pjdfstest/tests/mknod/05.t
+++ b/contrib/pjdfstest/tests/mknod/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/06.t b/contrib/pjdfstest/tests/mknod/06.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/mknod/06.t
rename to contrib/pjdfstest/tests/mknod/06.t
index 180cb9a56945..da7a5497b5a6 100644
--- a/tools/regression/pjdfstest/tests/mknod/06.t
+++ b/contrib/pjdfstest/tests/mknod/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns EACCES when write permission is denied on the parent directory of the file to be created"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/07.t b/contrib/pjdfstest/tests/mknod/07.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/mknod/07.t
rename to contrib/pjdfstest/tests/mknod/07.t
index 855d990d1110..1b39cc7c6d94 100644
--- a/tools/regression/pjdfstest/tests/mknod/07.t
+++ b/contrib/pjdfstest/tests/mknod/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/08.t b/contrib/pjdfstest/tests/mknod/08.t
similarity index 81%
rename from tools/regression/pjdfstest/tests/mknod/08.t
rename to contrib/pjdfstest/tests/mknod/08.t
index 47d001073c94..a8055629de07 100644
--- a/tools/regression/pjdfstest/tests/mknod/08.t
+++ b/contrib/pjdfstest/tests/mknod/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/08.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="mknod returns EEXIST if the named file exists"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/09.t b/contrib/pjdfstest/tests/mknod/09.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/mknod/09.t
rename to contrib/pjdfstest/tests/mknod/09.t
index a12a02cfb4b0..00c2a2f6d8b5 100644
--- a/tools/regression/pjdfstest/tests/mknod/09.t
+++ b/contrib/pjdfstest/tests/mknod/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns EPERM if the parent directory of the file to be created has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/10.t b/contrib/pjdfstest/tests/mknod/10.t
similarity index 71%
rename from tools/regression/pjdfstest/tests/mknod/10.t
rename to contrib/pjdfstest/tests/mknod/10.t
index fa6730f2532f..5bf18d37adc4 100644
--- a/tools/regression/pjdfstest/tests/mknod/10.t
+++ b/contrib/pjdfstest/tests/mknod/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/mknod/11.t b/contrib/pjdfstest/tests/mknod/11.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/mknod/11.t
rename to contrib/pjdfstest/tests/mknod/11.t
index da46cb9aacb4..309f71695f31 100644
--- a/tools/regression/pjdfstest/tests/mknod/11.t
+++ b/contrib/pjdfstest/tests/mknod/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/mknod/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="mknod creates device files"
 
diff --git a/tools/regression/pjdfstest/tests/open/00.t b/contrib/pjdfstest/tests/open/00.t
similarity index 97%
rename from tools/regression/pjdfstest/tests/open/00.t
rename to contrib/pjdfstest/tests/open/00.t
index caa24f0a8b13..cf11a9290e8e 100644
--- a/tools/regression/pjdfstest/tests/open/00.t
+++ b/contrib/pjdfstest/tests/open/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open opens (and eventually creates) a file"
 
diff --git a/tools/regression/pjdfstest/tests/open/01.t b/contrib/pjdfstest/tests/open/01.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/open/01.t
rename to contrib/pjdfstest/tests/open/01.t
index 6dfc6f54b2a9..df17590113ab 100644
--- a/tools/regression/pjdfstest/tests/open/01.t
+++ b/contrib/pjdfstest/tests/open/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/01.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="open returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/open/02.t b/contrib/pjdfstest/tests/open/02.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/open/02.t
rename to contrib/pjdfstest/tests/open/02.t
index 44ca1d7a97a8..adb3bb09d39b 100644
--- a/tools/regression/pjdfstest/tests/open/02.t
+++ b/contrib/pjdfstest/tests/open/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/open/03.t b/contrib/pjdfstest/tests/open/03.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/open/03.t
rename to contrib/pjdfstest/tests/open/03.t
index c398be15f6cc..89e67bb46eb2 100644
--- a/tools/regression/pjdfstest/tests/open/03.t
+++ b/contrib/pjdfstest/tests/open/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ENAMETOOLONG if an entire path name exceeded ${PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/open/04.t b/contrib/pjdfstest/tests/open/04.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/open/04.t
rename to contrib/pjdfstest/tests/open/04.t
index 1ce99cbb6341..84b0441f11d8 100644
--- a/tools/regression/pjdfstest/tests/open/04.t
+++ b/contrib/pjdfstest/tests/open/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ENOENT if a component of the path name that must exist does not exist or O_CREAT is not set and the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/open/05.t b/contrib/pjdfstest/tests/open/05.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/open/05.t
rename to contrib/pjdfstest/tests/open/05.t
index 25ad7daed165..1b69c61333c3 100644
--- a/tools/regression/pjdfstest/tests/open/05.t
+++ b/contrib/pjdfstest/tests/open/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/open/06.t b/contrib/pjdfstest/tests/open/06.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/open/06.t
rename to contrib/pjdfstest/tests/open/06.t
index 007e24a164cd..b33e6404e70b 100644
--- a/tools/regression/pjdfstest/tests/open/06.t
+++ b/contrib/pjdfstest/tests/open/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EACCES when the required permissions (for reading and/or writing) are denied for the given flags"
 
diff --git a/tools/regression/pjdfstest/tests/open/07.t b/contrib/pjdfstest/tests/open/07.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/open/07.t
rename to contrib/pjdfstest/tests/open/07.t
index a41d1933a810..edc4be13649b 100644
--- a/tools/regression/pjdfstest/tests/open/07.t
+++ b/contrib/pjdfstest/tests/open/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EACCES when O_TRUNC is specified and write permission is denied"
 
diff --git a/tools/regression/pjdfstest/tests/open/08.t b/contrib/pjdfstest/tests/open/08.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/open/08.t
rename to contrib/pjdfstest/tests/open/08.t
index 22ea29be5631..f47ff8720419 100644
--- a/tools/regression/pjdfstest/tests/open/08.t
+++ b/contrib/pjdfstest/tests/open/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EACCES when O_CREAT is specified, the file does not exist, and the directory in which it is to be created does not permit writing"
 
diff --git a/tools/regression/pjdfstest/tests/open/09.t b/contrib/pjdfstest/tests/open/09.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/open/09.t
rename to contrib/pjdfstest/tests/open/09.t
index 106e36fcdeb8..b76c70da8190 100644
--- a/tools/regression/pjdfstest/tests/open/09.t
+++ b/contrib/pjdfstest/tests/open/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="O_CREAT is specified, the file does not exist, and the directory in which it is to be created has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/open/10.t b/contrib/pjdfstest/tests/open/10.t
similarity index 92%
rename from tools/regression/pjdfstest/tests/open/10.t
rename to contrib/pjdfstest/tests/open/10.t
index 2cc943f79a50..bd6fdd25241f 100644
--- a/tools/regression/pjdfstest/tests/open/10.t
+++ b/contrib/pjdfstest/tests/open/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EPERM when the named file has its immutable flag set and the file is to be modified"
 
diff --git a/tools/regression/pjdfstest/tests/open/11.t b/contrib/pjdfstest/tests/open/11.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/open/11.t
rename to contrib/pjdfstest/tests/open/11.t
index c68bb251c4a1..e4a3a2d45e8f 100644
--- a/tools/regression/pjdfstest/tests/open/11.t
+++ b/contrib/pjdfstest/tests/open/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EPERM when the named file has its append-only flag set, the file is to be modified, and O_TRUNC is specified or O_APPEND is not specified"
 
diff --git a/tools/regression/pjdfstest/tests/open/12.t b/contrib/pjdfstest/tests/open/12.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/open/12.t
rename to contrib/pjdfstest/tests/open/12.t
index 2726dc1f9fe9..d38309d4a118 100644
--- a/tools/regression/pjdfstest/tests/open/12.t
+++ b/contrib/pjdfstest/tests/open/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/open/13.t b/contrib/pjdfstest/tests/open/13.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/open/13.t
rename to contrib/pjdfstest/tests/open/13.t
index 77bc4c224934..64bb0b8f825f 100644
--- a/tools/regression/pjdfstest/tests/open/13.t
+++ b/contrib/pjdfstest/tests/open/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EISDIR when trying to open a directory for writing"
 
diff --git a/tools/regression/pjdfstest/tests/open/14.t b/contrib/pjdfstest/tests/open/14.t
similarity index 73%
rename from tools/regression/pjdfstest/tests/open/14.t
rename to contrib/pjdfstest/tests/open/14.t
index 3d81f3e5cb26..8d90065f7171 100644
--- a/tools/regression/pjdfstest/tests/open/14.t
+++ b/contrib/pjdfstest/tests/open/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/14.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EROFS if the named file resides on a read-only file system, and the file is to be modified"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 expect 0 open ${n0}/${n1} O_WRONLY
 expect 0 open ${n0}/${n1} O_RDWR
@@ -28,5 +28,5 @@ expect EROFS open ${n0}/${n1} O_RDONLY,O_TRUNC
 mount -uw /dev/md${n}
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/open/15.t b/contrib/pjdfstest/tests/open/15.t
similarity index 67%
rename from tools/regression/pjdfstest/tests/open/15.t
rename to contrib/pjdfstest/tests/open/15.t
index d90877b51fea..a8230d89e2f0 100644
--- a/tools/regression/pjdfstest/tests/open/15.t
+++ b/contrib/pjdfstest/tests/open/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/15.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EROFS when O_CREAT is specified and the named file would reside on a read-only file system"
 
@@ -14,14 +14,14 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 open ${n0}/${n1} O_RDONLY,O_CREAT 0644
 expect 0 unlink ${n0}/${n1}
 mount -ur /dev/md${n}
 expect EROFS open ${n0}/${n1} O_RDONLY,O_CREAT 0644
 mount -uw /dev/md${n}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/open/16.t b/contrib/pjdfstest/tests/open/16.t
new file mode 100644
index 000000000000..7f796d61a365
--- /dev/null
+++ b/contrib/pjdfstest/tests/open/16.t
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/16.t 219621 2011-03-13 19:35:13Z pjd $
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+case "${os}" in
+Darwin|Linux)
+	error=ELOOP
+	;;
+*)
+	error=EMLINK
+	;;
+esac
+desc="open returns $error when O_NOFOLLOW was specified and the target is a symbolic link"
+
+echo "1..6"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 symlink ${n0} ${n1}
+expect $error open ${n1} O_RDONLY,O_CREAT,O_NOFOLLOW 0644
+expect $error open ${n1} O_RDONLY,O_NOFOLLOW
+expect $error open ${n1} O_WRONLY,O_NOFOLLOW
+expect $error open ${n1} O_RDWR,O_NOFOLLOW
+expect 0 unlink ${n1}
diff --git a/tools/regression/pjdfstest/tests/open/17.t b/contrib/pjdfstest/tests/open/17.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/open/17.t
rename to contrib/pjdfstest/tests/open/17.t
index 2224daf5ea59..e5888fc176f2 100644
--- a/tools/regression/pjdfstest/tests/open/17.t
+++ b/contrib/pjdfstest/tests/open/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/17.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ENXIO when O_NONBLOCK is set, the named file is a fifo, O_WRONLY is set, and no process has the file open for reading"
 
diff --git a/tools/regression/pjdfstest/tests/open/18.t b/contrib/pjdfstest/tests/open/18.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/open/18.t
rename to contrib/pjdfstest/tests/open/18.t
index bd8eea47f891..6d0713b43a89 100644
--- a/tools/regression/pjdfstest/tests/open/18.t
+++ b/contrib/pjdfstest/tests/open/18.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/18.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EWOULDBLOCK when O_NONBLOCK and one of O_SHLOCK or O_EXLOCK is specified and the file is locked"
 
diff --git a/tools/regression/pjdfstest/tests/open/19.t b/contrib/pjdfstest/tests/open/19.t
similarity index 69%
rename from tools/regression/pjdfstest/tests/open/19.t
rename to contrib/pjdfstest/tests/open/19.t
index b1c3994b25bc..c9d98eb5480e 100644
--- a/tools/regression/pjdfstest/tests/open/19.t
+++ b/contrib/pjdfstest/tests/open/19.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/19.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ENOSPC when O_CREAT is specified, the file does not exist, and there are no free inodes on the file system on which the file is being created"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 i=0
 while :; do
 	touch ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
 done
 expect ENOSPC open ${n0}/${i} O_RDONLY,O_CREAT 0644
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/open/20.t b/contrib/pjdfstest/tests/open/20.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/open/20.t
rename to contrib/pjdfstest/tests/open/20.t
index 736ad721bf81..de80b6122b7d 100644
--- a/tools/regression/pjdfstest/tests/open/20.t
+++ b/contrib/pjdfstest/tests/open/20.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/20.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns ETXTBSY when the file is a pure procedure (shared text) file that is being executed and the open() system call requests write access"
 
diff --git a/tools/regression/pjdfstest/tests/open/21.t b/contrib/pjdfstest/tests/open/21.t
similarity index 71%
rename from tools/regression/pjdfstest/tests/open/21.t
rename to contrib/pjdfstest/tests/open/21.t
index c43d7fd70faa..4a2422cfa6aa 100644
--- a/tools/regression/pjdfstest/tests/open/21.t
+++ b/contrib/pjdfstest/tests/open/21.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/21.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/open/22.t b/contrib/pjdfstest/tests/open/22.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/open/22.t
rename to contrib/pjdfstest/tests/open/22.t
index 464dae786566..55d4b9b3f8a3 100644
--- a/tools/regression/pjdfstest/tests/open/22.t
+++ b/contrib/pjdfstest/tests/open/22.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/22.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EEXIST when O_CREAT and O_EXCL were specified and the file exists"
 
diff --git a/tools/regression/pjdfstest/tests/open/23.t b/contrib/pjdfstest/tests/open/23.t
similarity index 81%
rename from tools/regression/pjdfstest/tests/open/23.t
rename to contrib/pjdfstest/tests/open/23.t
index fc2c6b9d7e91..4728c18896cd 100644
--- a/tools/regression/pjdfstest/tests/open/23.t
+++ b/contrib/pjdfstest/tests/open/23.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/23.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open may return EINVAL when an attempt was made to open a descriptor with an illegal combination of O_RDONLY, O_WRONLY, and O_RDWR"
 
diff --git a/tools/regression/pjdfstest/tests/open/24.t b/contrib/pjdfstest/tests/open/24.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/open/24.t
rename to contrib/pjdfstest/tests/open/24.t
index d51d63277463..ca709f221214 100644
--- a/tools/regression/pjdfstest/tests/open/24.t
+++ b/contrib/pjdfstest/tests/open/24.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/open/24.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="open returns EOPNOTSUPP when trying to open UNIX domain socket"
 
diff --git a/tools/regression/pjdfstest/tests/rename/00.t b/contrib/pjdfstest/tests/rename/00.t
similarity index 96%
rename from tools/regression/pjdfstest/tests/rename/00.t
rename to contrib/pjdfstest/tests/rename/00.t
index 49f7609e868f..2126a86a5488 100644
--- a/tools/regression/pjdfstest/tests/rename/00.t
+++ b/contrib/pjdfstest/tests/rename/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename changes file name"
 
diff --git a/tools/regression/pjdfstest/tests/rename/01.t b/contrib/pjdfstest/tests/rename/01.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/rename/01.t
rename to contrib/pjdfstest/tests/rename/01.t
index 291216d56f4f..dbb9c0660d41 100644
--- a/tools/regression/pjdfstest/tests/rename/01.t
+++ b/contrib/pjdfstest/tests/rename/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns ENAMETOOLONG if a component of either pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/rename/02.t b/contrib/pjdfstest/tests/rename/02.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/rename/02.t
rename to contrib/pjdfstest/tests/rename/02.t
index 7557e89ce09e..23425bada559 100644
--- a/tools/regression/pjdfstest/tests/rename/02.t
+++ b/contrib/pjdfstest/tests/rename/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns ENAMETOOLONG if an entire length of either path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/rename/03.t b/contrib/pjdfstest/tests/rename/03.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/rename/03.t
rename to contrib/pjdfstest/tests/rename/03.t
index 8404dbe27d0f..fb1d16f10d10 100644
--- a/tools/regression/pjdfstest/tests/rename/03.t
+++ b/contrib/pjdfstest/tests/rename/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns ENOENT if a component of the 'from' path does not exist, or a path prefix of 'to' does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/rename/04.t b/contrib/pjdfstest/tests/rename/04.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/rename/04.t
rename to contrib/pjdfstest/tests/rename/04.t
index af3801f94983..19d1791a71a8 100644
--- a/tools/regression/pjdfstest/tests/rename/04.t
+++ b/contrib/pjdfstest/tests/rename/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EACCES when a component of either path prefix denies search permission"
 
diff --git a/tools/regression/pjdfstest/tests/rename/05.t b/contrib/pjdfstest/tests/rename/05.t
similarity index 90%
rename from tools/regression/pjdfstest/tests/rename/05.t
rename to contrib/pjdfstest/tests/rename/05.t
index 39aa28f2f54c..52deac153b8c 100644
--- a/tools/regression/pjdfstest/tests/rename/05.t
+++ b/contrib/pjdfstest/tests/rename/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EACCES when the requested link requires writing in a directory with a mode that denies write permission"
 
diff --git a/tools/regression/pjdfstest/tests/rename/06.t b/contrib/pjdfstest/tests/rename/06.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/rename/06.t
rename to contrib/pjdfstest/tests/rename/06.t
index 2606c4e53e12..ffcf61e83a5c 100644
--- a/tools/regression/pjdfstest/tests/rename/06.t
+++ b/contrib/pjdfstest/tests/rename/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EPERM if the file pointed at by the 'from' argument has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/rename/07.t b/contrib/pjdfstest/tests/rename/07.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/rename/07.t
rename to contrib/pjdfstest/tests/rename/07.t
index 450b653b4677..522e67df9181 100644
--- a/tools/regression/pjdfstest/tests/rename/07.t
+++ b/contrib/pjdfstest/tests/rename/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EPERM if the parent directory of the file pointed at by the 'from' argument has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/rename/08.t b/contrib/pjdfstest/tests/rename/08.t
similarity index 92%
rename from tools/regression/pjdfstest/tests/rename/08.t
rename to contrib/pjdfstest/tests/rename/08.t
index 480672fd50cd..beffb41f8785 100644
--- a/tools/regression/pjdfstest/tests/rename/08.t
+++ b/contrib/pjdfstest/tests/rename/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EPERM if the parent directory of the file pointed at by the 'to' argument has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/rename/09.t b/contrib/pjdfstest/tests/rename/09.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/rename/09.t
rename to contrib/pjdfstest/tests/rename/09.t
index 91d16a6ff833..299ff64c57e0 100644
--- a/tools/regression/pjdfstest/tests/rename/09.t
+++ b/contrib/pjdfstest/tests/rename/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EACCES or EPERM if the directory containing 'from' is marked sticky, and neither the containing directory nor 'from' are owned by the effective user ID"
 
diff --git a/tools/regression/pjdfstest/tests/rename/10.t b/contrib/pjdfstest/tests/rename/10.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/rename/10.t
rename to contrib/pjdfstest/tests/rename/10.t
index 3b48d1f22136..268c3b647de1 100644
--- a/tools/regression/pjdfstest/tests/rename/10.t
+++ b/contrib/pjdfstest/tests/rename/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EACCES or EPERM if the file pointed at by the 'to' argument exists, the directory containing 'to' is marked sticky, and neither the containing directory nor 'to' are owned by the effective user ID"
 
diff --git a/tools/regression/pjdfstest/tests/rename/11.t b/contrib/pjdfstest/tests/rename/11.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/rename/11.t
rename to contrib/pjdfstest/tests/rename/11.t
index 6120e648120a..3bcd97ed18f3 100644
--- a/tools/regression/pjdfstest/tests/rename/11.t
+++ b/contrib/pjdfstest/tests/rename/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns ELOOP if too many symbolic links were encountered in translating one of the pathnames"
 
diff --git a/tools/regression/pjdfstest/tests/rename/12.t b/contrib/pjdfstest/tests/rename/12.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/rename/12.t
rename to contrib/pjdfstest/tests/rename/12.t
index 4383d843b622..c8939fe85ebf 100644
--- a/tools/regression/pjdfstest/tests/rename/12.t
+++ b/contrib/pjdfstest/tests/rename/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/12.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="rename returns ENOTDIR if a component of either path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/rename/13.t b/contrib/pjdfstest/tests/rename/13.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/rename/13.t
rename to contrib/pjdfstest/tests/rename/13.t
index 5e39698de421..00b0bfb6f577 100644
--- a/tools/regression/pjdfstest/tests/rename/13.t
+++ b/contrib/pjdfstest/tests/rename/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns ENOTDIR when the 'from' argument is a directory, but 'to' is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/rename/14.t b/contrib/pjdfstest/tests/rename/14.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/rename/14.t
rename to contrib/pjdfstest/tests/rename/14.t
index 8133c9127718..251a1bd66393 100644
--- a/tools/regression/pjdfstest/tests/rename/14.t
+++ b/contrib/pjdfstest/tests/rename/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/14.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EISDIR when the 'to' argument is a directory, but 'from' is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/rename/15.t b/contrib/pjdfstest/tests/rename/15.t
similarity index 70%
rename from tools/regression/pjdfstest/tests/rename/15.t
rename to contrib/pjdfstest/tests/rename/15.t
index 46927bab8cc9..cd2e44b4830b 100644
--- a/tools/regression/pjdfstest/tests/rename/15.t
+++ b/contrib/pjdfstest/tests/rename/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/15.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EXDEV if the link named by 'to' and the file named by 'from' are on different file systems"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 
 for type in regular dir fifo block char socket symlink; do
 	create_file ${type} ${n0}/${n1}
@@ -30,5 +30,5 @@ for type in regular dir fifo block char socket symlink; do
 done
 
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/rename/16.t b/contrib/pjdfstest/tests/rename/16.t
similarity index 69%
rename from tools/regression/pjdfstest/tests/rename/16.t
rename to contrib/pjdfstest/tests/rename/16.t
index b327f365eda5..102657d59cef 100644
--- a/tools/regression/pjdfstest/tests/rename/16.t
+++ b/contrib/pjdfstest/tests/rename/16.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/16.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EROFS if the requested link requires writing in a directory on a read-only file system"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 mount -ur /dev/md${n}
 
@@ -28,5 +28,5 @@ expect EROFS rename ${n2} ${n0}/${n2}
 expect 0 unlink ${n2}
 
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/rename/17.t b/contrib/pjdfstest/tests/rename/17.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/rename/17.t
rename to contrib/pjdfstest/tests/rename/17.t
index a3913499d44e..6deb7b704f06 100644
--- a/tools/regression/pjdfstest/tests/rename/17.t
+++ b/contrib/pjdfstest/tests/rename/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/17.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/rename/18.t b/contrib/pjdfstest/tests/rename/18.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/rename/18.t
rename to contrib/pjdfstest/tests/rename/18.t
index a69913bdc210..8a9594ec4127 100644
--- a/tools/regression/pjdfstest/tests/rename/18.t
+++ b/contrib/pjdfstest/tests/rename/18.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/18.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EINVAL when the 'from' argument is a parent directory of 'to'"
 
diff --git a/tools/regression/pjdfstest/tests/rename/19.t b/contrib/pjdfstest/tests/rename/19.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/rename/19.t
rename to contrib/pjdfstest/tests/rename/19.t
index 7459523f02ba..2cd95615e42b 100644
--- a/tools/regression/pjdfstest/tests/rename/19.t
+++ b/contrib/pjdfstest/tests/rename/19.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/19.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EINVAL/EBUSY when an attempt is made to rename '.' or '..'"
 
diff --git a/tools/regression/pjdfstest/tests/rename/20.t b/contrib/pjdfstest/tests/rename/20.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/rename/20.t
rename to contrib/pjdfstest/tests/rename/20.t
index 619fea3ecfb5..8ec37cf7d4cc 100644
--- a/tools/regression/pjdfstest/tests/rename/20.t
+++ b/contrib/pjdfstest/tests/rename/20.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/20.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rename returns EEXIST or ENOTEMPTY if the 'to' argument is a directory and is not empty"
 
diff --git a/tools/regression/pjdfstest/tests/rename/21.t b/contrib/pjdfstest/tests/rename/21.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/rename/21.t
rename to contrib/pjdfstest/tests/rename/21.t
index 12d98e3c9656..bba1467069da 100644
--- a/tools/regression/pjdfstest/tests/rename/21.t
+++ b/contrib/pjdfstest/tests/rename/21.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rename/21.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="write access to subdirectory is required to move it to another directory"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/00.t b/contrib/pjdfstest/tests/rmdir/00.t
similarity index 84%
rename from tools/regression/pjdfstest/tests/rmdir/00.t
rename to contrib/pjdfstest/tests/rmdir/00.t
index 4381e6643d79..9e75be6b9884 100644
--- a/tools/regression/pjdfstest/tests/rmdir/00.t
+++ b/contrib/pjdfstest/tests/rmdir/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir removes directories"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/01.t b/contrib/pjdfstest/tests/rmdir/01.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/rmdir/01.t
rename to contrib/pjdfstest/tests/rmdir/01.t
index d2d407dd0e24..b89ffefbe763 100644
--- a/tools/regression/pjdfstest/tests/rmdir/01.t
+++ b/contrib/pjdfstest/tests/rmdir/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns ENOTDIR if a component of the path is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/02.t b/contrib/pjdfstest/tests/rmdir/02.t
similarity index 75%
rename from tools/regression/pjdfstest/tests/rmdir/02.t
rename to contrib/pjdfstest/tests/rmdir/02.t
index 3daae4eb3d18..eb8a774bf240 100644
--- a/tools/regression/pjdfstest/tests/rmdir/02.t
+++ b/contrib/pjdfstest/tests/rmdir/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/03.t b/contrib/pjdfstest/tests/rmdir/03.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/rmdir/03.t
rename to contrib/pjdfstest/tests/rmdir/03.t
index a7259e044533..3d5a11a3611d 100644
--- a/tools/regression/pjdfstest/tests/rmdir/03.t
+++ b/contrib/pjdfstest/tests/rmdir/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns ENAMETOOLONG if an entire path name exceeded ${PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/04.t b/contrib/pjdfstest/tests/rmdir/04.t
similarity index 72%
rename from tools/regression/pjdfstest/tests/rmdir/04.t
rename to contrib/pjdfstest/tests/rmdir/04.t
index 77e1d30e57c3..d5abc31cfd18 100644
--- a/tools/regression/pjdfstest/tests/rmdir/04.t
+++ b/contrib/pjdfstest/tests/rmdir/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns ENOENT if the named directory does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/05.t b/contrib/pjdfstest/tests/rmdir/05.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/rmdir/05.t
rename to contrib/pjdfstest/tests/rmdir/05.t
index fd973a93af5f..eb984533d057 100644
--- a/tools/regression/pjdfstest/tests/rmdir/05.t
+++ b/contrib/pjdfstest/tests/rmdir/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/06.t b/contrib/pjdfstest/tests/rmdir/06.t
similarity index 83%
rename from tools/regression/pjdfstest/tests/rmdir/06.t
rename to contrib/pjdfstest/tests/rmdir/06.t
index 9de34b0e1d6b..64a6ac85fe49 100644
--- a/tools/regression/pjdfstest/tests/rmdir/06.t
+++ b/contrib/pjdfstest/tests/rmdir/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/06.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="rmdir returns EEXIST or ENOTEMPTY the named directory contains files other than '.' and '..' in it"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/07.t b/contrib/pjdfstest/tests/rmdir/07.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/rmdir/07.t
rename to contrib/pjdfstest/tests/rmdir/07.t
index 2528245c0a41..10a78a71e9d5 100644
--- a/tools/regression/pjdfstest/tests/rmdir/07.t
+++ b/contrib/pjdfstest/tests/rmdir/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/08.t b/contrib/pjdfstest/tests/rmdir/08.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/rmdir/08.t
rename to contrib/pjdfstest/tests/rmdir/08.t
index c1fb819732c3..fe70c8683d0b 100644
--- a/tools/regression/pjdfstest/tests/rmdir/08.t
+++ b/contrib/pjdfstest/tests/rmdir/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EACCES when write permission is denied on the directory containing the link to be removed"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/09.t b/contrib/pjdfstest/tests/rmdir/09.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/rmdir/09.t
rename to contrib/pjdfstest/tests/rmdir/09.t
index 240fd5c3f73f..8b0276c980ed 100644
--- a/tools/regression/pjdfstest/tests/rmdir/09.t
+++ b/contrib/pjdfstest/tests/rmdir/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EPERM if the named directory has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/10.t b/contrib/pjdfstest/tests/rmdir/10.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/rmdir/10.t
rename to contrib/pjdfstest/tests/rmdir/10.t
index 7bdc261487fe..5d2e37ef4557 100644
--- a/tools/regression/pjdfstest/tests/rmdir/10.t
+++ b/contrib/pjdfstest/tests/rmdir/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EPERM if the parent directory of the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/11.t b/contrib/pjdfstest/tests/rmdir/11.t
similarity index 94%
rename from tools/regression/pjdfstest/tests/rmdir/11.t
rename to contrib/pjdfstest/tests/rmdir/11.t
index 6e4b0b1ebf85..b8e059135400 100644
--- a/tools/regression/pjdfstest/tests/rmdir/11.t
+++ b/contrib/pjdfstest/tests/rmdir/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EACCES or EPERM if the directory containing the directory to be removed is marked sticky, and neither the containing directory nor the directory to be removed are owned by the effective user ID"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/12.t b/contrib/pjdfstest/tests/rmdir/12.t
similarity index 86%
rename from tools/regression/pjdfstest/tests/rmdir/12.t
rename to contrib/pjdfstest/tests/rmdir/12.t
index 9ba45a4b372c..57d144da58f2 100644
--- a/tools/regression/pjdfstest/tests/rmdir/12.t
+++ b/contrib/pjdfstest/tests/rmdir/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EINVAL if the last component of the path is '.' and EEXIST or ENOTEMPTY if the last component of the path is '..'"
 
diff --git a/tools/regression/pjdfstest/tests/rmdir/13.t b/contrib/pjdfstest/tests/rmdir/13.t
similarity index 56%
rename from tools/regression/pjdfstest/tests/rmdir/13.t
rename to contrib/pjdfstest/tests/rmdir/13.t
index 6140e7b82390..4a1a88542d64 100644
--- a/tools/regression/pjdfstest/tests/rmdir/13.t
+++ b/contrib/pjdfstest/tests/rmdir/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EBUSY if the directory to be removed is the mount point for a mounted file system"
 
@@ -13,10 +13,10 @@ echo "1..3"
 n0=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect EBUSY rmdir ${n0}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/rmdir/14.t b/contrib/pjdfstest/tests/rmdir/14.t
similarity index 64%
rename from tools/regression/pjdfstest/tests/rmdir/14.t
rename to contrib/pjdfstest/tests/rmdir/14.t
index faa5d5e466d8..bdefeaedac08 100644
--- a/tools/regression/pjdfstest/tests/rmdir/14.t
+++ b/contrib/pjdfstest/tests/rmdir/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/14.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EROFS if the named file resides on a read-only file system"
 
@@ -14,14 +14,14 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 mkdir ${n0}/${n1} 0755
 mount -ur /dev/md${n}
 expect EROFS rmdir ${n0}/${n1}
 mount -uw /dev/md${n}
 expect 0 rmdir ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/rmdir/15.t b/contrib/pjdfstest/tests/rmdir/15.t
similarity index 69%
rename from tools/regression/pjdfstest/tests/rmdir/15.t
rename to contrib/pjdfstest/tests/rmdir/15.t
index 8bfa1491f7ba..5390403bcb3e 100644
--- a/tools/regression/pjdfstest/tests/rmdir/15.t
+++ b/contrib/pjdfstest/tests/rmdir/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/rmdir/15.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="rmdir returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/00.t b/contrib/pjdfstest/tests/symlink/00.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/symlink/00.t
rename to contrib/pjdfstest/tests/symlink/00.t
index 6e6d46d918ff..1f2693938a35 100644
--- a/tools/regression/pjdfstest/tests/symlink/00.t
+++ b/contrib/pjdfstest/tests/symlink/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink creates symbolic links"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/01.t b/contrib/pjdfstest/tests/symlink/01.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/symlink/01.t
rename to contrib/pjdfstest/tests/symlink/01.t
index f19870cf31de..3a40b54a45c2 100644
--- a/tools/regression/pjdfstest/tests/symlink/01.t
+++ b/contrib/pjdfstest/tests/symlink/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ENOTDIR if a component of the name2 path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/02.t b/contrib/pjdfstest/tests/symlink/02.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/symlink/02.t
rename to contrib/pjdfstest/tests/symlink/02.t
index e06b936fff8b..4b81f169f7a6 100644
--- a/tools/regression/pjdfstest/tests/symlink/02.t
+++ b/contrib/pjdfstest/tests/symlink/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ENAMETOOLONG if a component of the name2 pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/03.t b/contrib/pjdfstest/tests/symlink/03.t
similarity index 81%
rename from tools/regression/pjdfstest/tests/symlink/03.t
rename to contrib/pjdfstest/tests/symlink/03.t
index 38ebe5eebccf..68ecfbdfecbc 100644
--- a/tools/regression/pjdfstest/tests/symlink/03.t
+++ b/contrib/pjdfstest/tests/symlink/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ENAMETOOLONG if an entire length of either path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/04.t b/contrib/pjdfstest/tests/symlink/04.t
similarity index 73%
rename from tools/regression/pjdfstest/tests/symlink/04.t
rename to contrib/pjdfstest/tests/symlink/04.t
index cc5e7b7f3db1..ca1c8eedf48b 100644
--- a/tools/regression/pjdfstest/tests/symlink/04.t
+++ b/contrib/pjdfstest/tests/symlink/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ENOENT if a component of the name2 path prefix does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/05.t b/contrib/pjdfstest/tests/symlink/05.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/symlink/05.t
rename to contrib/pjdfstest/tests/symlink/05.t
index c823a5940130..801e46714a96 100644
--- a/tools/regression/pjdfstest/tests/symlink/05.t
+++ b/contrib/pjdfstest/tests/symlink/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns EACCES when a component of the name2 path prefix denies search permission"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/06.t b/contrib/pjdfstest/tests/symlink/06.t
similarity index 87%
rename from tools/regression/pjdfstest/tests/symlink/06.t
rename to contrib/pjdfstest/tests/symlink/06.t
index 1f2781865137..db61ad01c392 100644
--- a/tools/regression/pjdfstest/tests/symlink/06.t
+++ b/contrib/pjdfstest/tests/symlink/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns EACCES if the parent directory of the file to be created denies write permission"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/07.t b/contrib/pjdfstest/tests/symlink/07.t
similarity index 79%
rename from tools/regression/pjdfstest/tests/symlink/07.t
rename to contrib/pjdfstest/tests/symlink/07.t
index aa60b771fe96..c6aedc0570e0 100644
--- a/tools/regression/pjdfstest/tests/symlink/07.t
+++ b/contrib/pjdfstest/tests/symlink/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ELOOP if too many symbolic links were encountered in translating the name2 path name"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/08.t b/contrib/pjdfstest/tests/symlink/08.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/symlink/08.t
rename to contrib/pjdfstest/tests/symlink/08.t
index 9d539f166482..ef7915dbe72b 100644
--- a/tools/regression/pjdfstest/tests/symlink/08.t
+++ b/contrib/pjdfstest/tests/symlink/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/08.t 211474 2010-08-18 22:06:43Z pjd $
 
 desc="symlink returns EEXIST if the name2 argument already exists"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/09.t b/contrib/pjdfstest/tests/symlink/09.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/symlink/09.t
rename to contrib/pjdfstest/tests/symlink/09.t
index 4807db4e3076..6292aaf7649f 100644
--- a/tools/regression/pjdfstest/tests/symlink/09.t
+++ b/contrib/pjdfstest/tests/symlink/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns EPERM if the parent directory of the file named by name2 has its immutable flag set"
 
diff --git a/tools/regression/pjdfstest/tests/symlink/10.t b/contrib/pjdfstest/tests/symlink/10.t
similarity index 68%
rename from tools/regression/pjdfstest/tests/symlink/10.t
rename to contrib/pjdfstest/tests/symlink/10.t
index b43da77ecc7e..47a6eb4b636a 100644
--- a/tools/regression/pjdfstest/tests/symlink/10.t
+++ b/contrib/pjdfstest/tests/symlink/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns EROFS if the file name2 would reside on a read-only file system"
 
@@ -15,9 +15,9 @@ n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 
 expect 0 symlink test ${n0}/${n1}
 expect 0 unlink ${n0}/${n1}
@@ -28,5 +28,5 @@ expect 0 symlink test ${n0}/${n1}
 expect 0 unlink ${n0}/${n1}
 
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/symlink/11.t b/contrib/pjdfstest/tests/symlink/11.t
similarity index 66%
rename from tools/regression/pjdfstest/tests/symlink/11.t
rename to contrib/pjdfstest/tests/symlink/11.t
index 2f04b7bf2fe1..e9f78e845c8b 100644
--- a/tools/regression/pjdfstest/tests/symlink/11.t
+++ b/contrib/pjdfstest/tests/symlink/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns ENOSPC if there are no free inodes on the file system on which the symbolic link is being created"
 
@@ -14,9 +14,9 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 256k`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 512k` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 i=0
 while :; do
 	ln -s test ${n0}/${i} >/dev/null 2>&1
@@ -27,5 +27,5 @@ while :; do
 done
 expect ENOSPC symlink test ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/symlink/12.t b/contrib/pjdfstest/tests/symlink/12.t
similarity index 80%
rename from tools/regression/pjdfstest/tests/symlink/12.t
rename to contrib/pjdfstest/tests/symlink/12.t
index 8606a38acf35..2c699050e673 100644
--- a/tools/regression/pjdfstest/tests/symlink/12.t
+++ b/contrib/pjdfstest/tests/symlink/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/symlink/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="symlink returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/pjdfstest/tests/truncate/00.t b/contrib/pjdfstest/tests/truncate/00.t
similarity index 91%
rename from tools/regression/pjdfstest/tests/truncate/00.t
rename to contrib/pjdfstest/tests/truncate/00.t
index c09f0680865d..6a77a8f796b0 100644
--- a/tools/regression/pjdfstest/tests/truncate/00.t
+++ b/contrib/pjdfstest/tests/truncate/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate descrease/increase file size"
 
diff --git a/contrib/pjdfstest/tests/truncate/01.t b/contrib/pjdfstest/tests/truncate/01.t
new file mode 100644
index 000000000000..a8e95ac60181
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/01.t
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/01.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ENOTDIR if a component of the path prefix is not a directory"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..5"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 mkdir ${n0} 0755
+expect 0 create ${n0}/${n1} 0644
+expect ENOTDIR truncate ${n0}/${n1}/test 123
+expect 0 unlink ${n0}/${n1}
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/02.t b/contrib/pjdfstest/tests/truncate/02.t
new file mode 100644
index 000000000000..83de38d3244f
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/02.t
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/02.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..5"
+
+nx=`namegen_max`
+nxx="${nx}x"
+
+expect 0 create ${nx} 0644
+expect 0 truncate ${nx} 123
+expect 123 stat ${nx} size
+expect 0 unlink ${nx}
+expect ENAMETOOLONG truncate ${nxx} 123
diff --git a/contrib/pjdfstest/tests/truncate/03.t b/contrib/pjdfstest/tests/truncate/03.t
new file mode 100644
index 000000000000..41e98625ba4f
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/03.t
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/03.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..5"
+
+nx=`dirgen_max`
+nxx="${nx}x"
+
+mkdir -p "${nx%/*}"
+
+expect 0 create ${nx} 0644
+expect 0 truncate ${nx} 123
+expect regular,123 stat ${nx} type,size
+expect 0 unlink ${nx}
+expect ENAMETOOLONG truncate ${nxx} 123
+
+rm -rf "${nx%%/*}"
diff --git a/contrib/pjdfstest/tests/truncate/04.t b/contrib/pjdfstest/tests/truncate/04.t
new file mode 100644
index 000000000000..cd1cfc66b2b0
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/04.t
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/04.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ENOENT if the named file does not exist"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..4"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 mkdir ${n0} 0755
+expect ENOENT truncate ${n0}/${n1}/test 123
+expect ENOENT truncate ${n0}/${n1} 123
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/05.t b/contrib/pjdfstest/tests/truncate/05.t
new file mode 100644
index 000000000000..f12881581bce
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/05.t
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/05.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EACCES when search permission is denied for a component of the path prefix"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..15"
+
+n0=`namegen`
+n1=`namegen`
+n2=`namegen`
+
+expect 0 mkdir ${n0} 0755
+cdir=`pwd`
+cd ${n0}
+expect 0 mkdir ${n1} 0755
+expect 0 chown ${n1} 65534 65534
+expect 0 -u 65534 -g 65534 create ${n1}/${n2} 0644
+expect 0 -u 65534 -g 65534 truncate ${n1}/${n2} 123
+expect 123 -u 65534 -g 65534 stat ${n1}/${n2} size
+expect 0 chmod ${n1} 0644
+expect EACCES -u 65534 -g 65534 truncate ${n1}/${n2} 1234
+expect 0 chmod ${n1} 0755
+expect 123 -u 65534 -g 65534 stat ${n1}/${n2} size
+expect 0 -u 65534 -g 65534 truncate ${n1}/${n2} 1234
+expect 1234 -u 65534 -g 65534 stat ${n1}/${n2} size
+expect 0 -u 65534 -g 65534 unlink ${n1}/${n2}
+expect 0 rmdir ${n1}
+cd ${cdir}
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/06.t b/contrib/pjdfstest/tests/truncate/06.t
new file mode 100644
index 000000000000..1ce516fa74a6
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/06.t
@@ -0,0 +1,24 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/06.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EACCES if the named file is not writable by the user"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..8"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 mkdir ${n0} 0755
+cdir=`pwd`
+cd ${n0}
+expect 0 create ${n1} 0644
+expect EACCES -u 65534 -g 65534 truncate ${n1} 123
+expect 0 chown ${n1} 65534 65534
+expect 0 chmod ${n1} 0444
+expect EACCES -u 65534 -g 65534 truncate ${n1} 123
+expect 0 unlink ${n1}
+cd ${cdir}
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/07.t b/contrib/pjdfstest/tests/truncate/07.t
new file mode 100644
index 000000000000..44f87e7ea859
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/07.t
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/07.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ELOOP if too many symbolic links were encountered in translating the pathname"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..6"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 symlink ${n0} ${n1}
+expect 0 symlink ${n1} ${n0}
+expect ELOOP truncate ${n0}/test 123
+expect ELOOP truncate ${n1}/test 123
+expect 0 unlink ${n0}
+expect 0 unlink ${n1}
diff --git a/contrib/pjdfstest/tests/truncate/08.t b/contrib/pjdfstest/tests/truncate/08.t
new file mode 100644
index 000000000000..6f205ef965f2
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/08.t
@@ -0,0 +1,78 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/08.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EPERM if the named file has its immutable or append-only flag set"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+require chflags
+
+case "${os}:${fs}" in
+FreeBSD:ZFS)
+	echo "1..22"
+	;;
+FreeBSD:UFS)
+	echo "1..44"
+	;;
+*)
+	quick_exit
+esac
+
+n0=`namegen`
+
+expect 0 create ${n0} 0644
+expect 0 chflags ${n0} SF_IMMUTABLE
+expect EPERM truncate ${n0} 123
+expect 0 stat ${n0} size
+expect 0 chflags ${n0} none
+expect 0 truncate ${n0} 123
+expect 123 stat ${n0} size
+expect 0 unlink ${n0}
+
+expect 0 create ${n0} 0644
+expect 0 chflags ${n0} SF_NOUNLINK
+expect 0 truncate ${n0} 123
+expect 123 stat ${n0} size
+expect 0 chflags ${n0} none
+expect 0 unlink ${n0}
+
+expect 0 create ${n0} 0644
+expect 0 chflags ${n0} SF_APPEND
+todo FreeBSD:ZFS "Truncating a file protected by SF_APPEND should return EPERM."
+expect EPERM truncate ${n0} 123
+todo FreeBSD:ZFS "Truncating a file protected by SF_APPEND should return EPERM."
+expect 0 stat ${n0} size
+expect 0 chflags ${n0} none
+expect 0 truncate ${n0} 123
+expect 123 stat ${n0} size
+expect 0 unlink ${n0}
+
+case "${os}:${fs}" in
+FreeBSD:UFS)
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_IMMUTABLE
+	expect EPERM truncate ${n0} 123
+	expect 0 stat ${n0} size
+	expect 0 chflags ${n0} none
+	expect 0 truncate ${n0} 123
+	expect 123 stat ${n0} size
+	expect 0 unlink ${n0}
+
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_NOUNLINK
+	expect 0 truncate ${n0} 123
+	expect 123 stat ${n0} size
+	expect 0 chflags ${n0} none
+	expect 0 unlink ${n0}
+
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_APPEND
+	expect EPERM truncate ${n0} 123
+	expect 0 stat ${n0} size
+	expect 0 chflags ${n0} none
+	expect 0 truncate ${n0} 123
+	expect 123 stat ${n0} size
+	expect 0 unlink ${n0}
+	;;
+esac
diff --git a/contrib/pjdfstest/tests/truncate/09.t b/contrib/pjdfstest/tests/truncate/09.t
new file mode 100644
index 000000000000..d7e082ddbe0e
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/09.t
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/09.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EISDIR if the named file is a directory"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..3"
+
+n0=`namegen`
+
+expect 0 mkdir ${n0} 0755
+expect EISDIR truncate ${n0} 123
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/10.t b/contrib/pjdfstest/tests/truncate/10.t
new file mode 100644
index 000000000000..ced3583ec21d
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/10.t
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/10.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EROFS if the named file resides on a read-only file system"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+[ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit
+
+echo "1..10"
+
+n0=`namegen`
+n1=`namegen`
+
+expect 0 mkdir ${n0} 0755
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
+expect 0 create ${n0}/${n1} 0644
+expect 0 truncate ${n0}/${n1} 123
+expect 123 stat ${n0}/${n1} size
+mount -ur /dev/md${n}
+expect EROFS truncate ${n0}/${n1} 1234
+expect 123 stat ${n0}/${n1} size
+mount -uw /dev/md${n}
+expect 0 truncate ${n0}/${n1} 1234
+expect 1234 stat ${n0}/${n1} size
+expect 0 unlink ${n0}/${n1}
+umount /dev/md${n}
+mdconfig -d -u ${n} || exit
+expect 0 rmdir ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/11.t b/contrib/pjdfstest/tests/truncate/11.t
new file mode 100644
index 000000000000..b00d7b89c16d
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/11.t
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/11.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns ETXTBSY the file is a pure procedure (shared text) file that is being executed"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+[ "${os}" = "FreeBSD" ] || quick_exit
+
+echo "1..2"
+
+n0=`namegen`
+
+cp -pf `which sleep` ${n0}
+./${n0} 3 &
+expect ETXTBSY truncate ${n0} 123
+expect 0 unlink ${n0}
diff --git a/contrib/pjdfstest/tests/truncate/12.t b/contrib/pjdfstest/tests/truncate/12.t
new file mode 100644
index 000000000000..1825456a7b13
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/12.t
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/12.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EFBIG or EINVAL if the length argument was greater than the maximum file size"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..3"
+
+n0=`namegen`
+
+expect 0 create ${n0} 0644
+r=`${fstest} truncate ${n0} 999999999999999 2>/dev/null`
+case "${r}" in
+EFBIG|EINVAL)
+	expect 0 stat ${n0} size
+	;;
+0)
+	expect 999999999999999 stat ${n0} size
+	;;
+*)
+	echo "not ok ${ntest}"
+	ntest=`expr ${ntest} + 1`
+	;;
+esac
+expect 0 unlink ${n0}
diff --git a/tools/regression/pjdfstest/tests/truncate/13.t b/contrib/pjdfstest/tests/truncate/13.t
similarity index 73%
rename from tools/regression/pjdfstest/tests/truncate/13.t
rename to contrib/pjdfstest/tests/truncate/13.t
index 9e40928ebd07..7c9f0d4e14ec 100644
--- a/tools/regression/pjdfstest/tests/truncate/13.t
+++ b/contrib/pjdfstest/tests/truncate/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="truncate returns EINVAL if the length argument was less than 0"
 
diff --git a/contrib/pjdfstest/tests/truncate/14.t b/contrib/pjdfstest/tests/truncate/14.t
new file mode 100644
index 000000000000..a238771264f9
--- /dev/null
+++ b/contrib/pjdfstest/tests/truncate/14.t
@@ -0,0 +1,12 @@
+#!/bin/sh
+# $FreeBSD: head/tools/regression/pjdfstest/tests/truncate/14.t 211352 2010-08-15 21:24:17Z pjd $
+
+desc="truncate returns EFAULT if the path argument points outside the process's allocated address space"
+
+dir=`dirname $0`
+. ${dir}/../misc.sh
+
+echo "1..2"
+
+expect EFAULT truncate NULL 123
+expect EFAULT truncate DEADCODE 123
diff --git a/tools/regression/pjdfstest/tests/unlink/00.t b/contrib/pjdfstest/tests/unlink/00.t
similarity index 98%
rename from tools/regression/pjdfstest/tests/unlink/00.t
rename to contrib/pjdfstest/tests/unlink/00.t
index 9120a6244523..0b9b1f1b59cf 100644
--- a/tools/regression/pjdfstest/tests/unlink/00.t
+++ b/contrib/pjdfstest/tests/unlink/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/00.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink removes regular files, symbolic links, fifos and sockets"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/01.t b/contrib/pjdfstest/tests/unlink/01.t
similarity index 76%
rename from tools/regression/pjdfstest/tests/unlink/01.t
rename to contrib/pjdfstest/tests/unlink/01.t
index 13fa0fe4eab6..7e29671ecb70 100644
--- a/tools/regression/pjdfstest/tests/unlink/01.t
+++ b/contrib/pjdfstest/tests/unlink/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/01.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/02.t b/contrib/pjdfstest/tests/unlink/02.t
similarity index 75%
rename from tools/regression/pjdfstest/tests/unlink/02.t
rename to contrib/pjdfstest/tests/unlink/02.t
index 1324ba3f4df3..e624d987e813 100644
--- a/tools/regression/pjdfstest/tests/unlink/02.t
+++ b/contrib/pjdfstest/tests/unlink/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/02.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns ENAMETOOLONG if a component of a pathname exceeded {NAME_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/03.t b/contrib/pjdfstest/tests/unlink/03.t
similarity index 77%
rename from tools/regression/pjdfstest/tests/unlink/03.t
rename to contrib/pjdfstest/tests/unlink/03.t
index db4b4a49c9f3..f4c939e721e6 100644
--- a/tools/regression/pjdfstest/tests/unlink/03.t
+++ b/contrib/pjdfstest/tests/unlink/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/03.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns ENAMETOOLONG if an entire path name exceeded {PATH_MAX} characters"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/04.t b/contrib/pjdfstest/tests/unlink/04.t
similarity index 72%
rename from tools/regression/pjdfstest/tests/unlink/04.t
rename to contrib/pjdfstest/tests/unlink/04.t
index 7885f27858ff..0717eaad01b9 100644
--- a/tools/regression/pjdfstest/tests/unlink/04.t
+++ b/contrib/pjdfstest/tests/unlink/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/04.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/05.t b/contrib/pjdfstest/tests/unlink/05.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/unlink/05.t
rename to contrib/pjdfstest/tests/unlink/05.t
index c30c3537e50d..91dccf90afea 100644
--- a/tools/regression/pjdfstest/tests/unlink/05.t
+++ b/contrib/pjdfstest/tests/unlink/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/05.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/06.t b/contrib/pjdfstest/tests/unlink/06.t
similarity index 85%
rename from tools/regression/pjdfstest/tests/unlink/06.t
rename to contrib/pjdfstest/tests/unlink/06.t
index 3a64aa27509f..293742966c0e 100644
--- a/tools/regression/pjdfstest/tests/unlink/06.t
+++ b/contrib/pjdfstest/tests/unlink/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/06.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EACCES when write permission is denied on the directory containing the link to be removed"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/07.t b/contrib/pjdfstest/tests/unlink/07.t
similarity index 78%
rename from tools/regression/pjdfstest/tests/unlink/07.t
rename to contrib/pjdfstest/tests/unlink/07.t
index ea9d2a345df1..e63eafa6e7a4 100644
--- a/tools/regression/pjdfstest/tests/unlink/07.t
+++ b/contrib/pjdfstest/tests/unlink/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/07.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/08.t b/contrib/pjdfstest/tests/unlink/08.t
similarity index 82%
rename from tools/regression/pjdfstest/tests/unlink/08.t
rename to contrib/pjdfstest/tests/unlink/08.t
index ac81bd66876e..666400cd2a2e 100644
--- a/tools/regression/pjdfstest/tests/unlink/08.t
+++ b/contrib/pjdfstest/tests/unlink/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/08.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink may return EPERM if the named file is a directory"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/09.t b/contrib/pjdfstest/tests/unlink/09.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/unlink/09.t
rename to contrib/pjdfstest/tests/unlink/09.t
index f3422a581ab8..dbc202a6954d 100644
--- a/tools/regression/pjdfstest/tests/unlink/09.t
+++ b/contrib/pjdfstest/tests/unlink/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/09.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EPERM if the named file has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/10.t b/contrib/pjdfstest/tests/unlink/10.t
similarity index 93%
rename from tools/regression/pjdfstest/tests/unlink/10.t
rename to contrib/pjdfstest/tests/unlink/10.t
index 84f3154a04a9..9ca1d5bc3fb1 100644
--- a/tools/regression/pjdfstest/tests/unlink/10.t
+++ b/contrib/pjdfstest/tests/unlink/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/10.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EPERM if the parent directory of the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/11.t b/contrib/pjdfstest/tests/unlink/11.t
similarity index 95%
rename from tools/regression/pjdfstest/tests/unlink/11.t
rename to contrib/pjdfstest/tests/unlink/11.t
index b0d27f9a9518..d7d71d842d0d 100644
--- a/tools/regression/pjdfstest/tests/unlink/11.t
+++ b/contrib/pjdfstest/tests/unlink/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/11.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EACCES or EPERM if the directory containing the file is marked sticky, and neither the containing directory nor the file to be removed are owned by the effective user ID"
 
diff --git a/tools/regression/pjdfstest/tests/unlink/12.t b/contrib/pjdfstest/tests/unlink/12.t
similarity index 64%
rename from tools/regression/pjdfstest/tests/unlink/12.t
rename to contrib/pjdfstest/tests/unlink/12.t
index b8116d6e7e0d..ae39724faeab 100644
--- a/tools/regression/pjdfstest/tests/unlink/12.t
+++ b/contrib/pjdfstest/tests/unlink/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/12.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EROFS if the named file resides on a read-only file system"
 
@@ -14,14 +14,14 @@ n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-n=`mdconfig -a -n -t malloc -s 1m`
-newfs /dev/md${n} >/dev/null
-mount /dev/md${n} ${n0}
+n=`mdconfig -a -n -t malloc -s 1m` || exit
+newfs /dev/md${n} >/dev/null || exit
+mount /dev/md${n} ${n0} || exit
 expect 0 create ${n0}/${n1} 0644
 mount -ur /dev/md${n}
 expect EROFS unlink ${n0}/${n1}
 mount -uw /dev/md${n}
 expect 0 unlink ${n0}/${n1}
 umount /dev/md${n}
-mdconfig -d -u ${n}
+mdconfig -d -u ${n} || exit
 expect 0 rmdir ${n0}
diff --git a/tools/regression/pjdfstest/tests/unlink/13.t b/contrib/pjdfstest/tests/unlink/13.t
similarity index 69%
rename from tools/regression/pjdfstest/tests/unlink/13.t
rename to contrib/pjdfstest/tests/unlink/13.t
index da5e718d58de..c424b7ed0094 100644
--- a/tools/regression/pjdfstest/tests/unlink/13.t
+++ b/contrib/pjdfstest/tests/unlink/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/tools/regression/pjdfstest/tests/unlink/13.t 211352 2010-08-15 21:24:17Z pjd $
 
 desc="unlink returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/contrib/smbfs/lib/smb/ctx.c b/contrib/smbfs/lib/smb/ctx.c
index c7b3ecaba663..2458607f2a65 100644
--- a/contrib/smbfs/lib/smb/ctx.c
+++ b/contrib/smbfs/lib/smb/ctx.c
@@ -191,10 +191,6 @@ smb_ctx_parseunc(struct smb_ctx *ctx, const char *unc, int sharetype,
 			smb_error("no user name required", 0);
 			return EINVAL;
 		}
-		if (*p1 == 0) {
-			smb_error("empty user name", 0);
-			return EINVAL;
-		}
 		error = smb_ctx_setuser(ctx, tmp);
 		if (error)
 			return error;
@@ -521,11 +517,6 @@ smb_ctx_resolve(struct smb_ctx *ctx)
 		smb_error("no server name specified", 0);
 		return EINVAL;
 	}
-	if (ssn->ioc_user[0] == 0) {
-		smb_error("no user name specified for server %s",
-		    0, ssn->ioc_srvname);
-		return EINVAL;
-	}
 	if (ctx->ct_minlevel >= SMBL_SHARE && sh->ioc_share[0] == 0) {
 		smb_error("no share name specified for %s@%s",
 		    0, ssn->ioc_user, ssn->ioc_srvname);
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c
index 8f159ce68e00..99f1cee8ed2e 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.c
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c
@@ -81,7 +81,7 @@ main(int argc, char *argv[])
 #else
 	struct xvfsconf vfc;
 #endif
-	char *next;
+	char *next, *p, *val;
 	int opt, error, mntflags, caseopt, fd;
 	uid_t uid;
 	gid_t gid;
@@ -194,6 +194,13 @@ main(int argc, char *argv[])
 		    };
 		    case 'o':
 			getmntopts(optarg, mopts, &mntflags, 0);
+			p = strchr(optarg, '=');
+			val = NULL;
+			if (p != NULL) {
+				*p = '\0';
+				val = p + 1;
+			}
+			build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
 			break;
 		    case 'c':
 			switch (optarg[0]) {
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index b2124a65aa15..af34f88f8224 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -1533,7 +1533,12 @@ main(int argc, char **argv)
 	if (RFileName == NULL && VFileName == NULL) {
 		static const unsigned long cmds[] = { BIOCGSTATS };
 
-		cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
+		/*
+		 * the various libpcap devices use a combination of
+		 * read (bpf), ioctl (bpf, netmap), poll (netmap)
+		 * so we add the relevant access rights.
+		 */
+		cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_EVENT);
 		if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&
 		    errno != ENOSYS) {
 			error("unable to limit pcap descriptor");
diff --git a/crypto/heimdal/tools/krb5-config.in b/crypto/heimdal/tools/krb5-config.in
index 317270e4263b..d1f1a3fdc37e 100755
--- a/crypto/heimdal/tools/krb5-config.in
+++ b/crypto/heimdal/tools/krb5-config.in
@@ -123,7 +123,7 @@ if test "$do_libs" = "yes"; then
     lib_flags="-L${libdir}"
     case $library in
     gssapi)
-	lib_flags="$lib_flags -lgssapi -lheimntlm"
+	lib_flags="$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm"
 	;;
     kadm-client)
 	lib_flags="$lib_flags -lkadm5clnt"
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 8520fc5bbf35..bbf97d9a36b2 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -75,10 +75,6 @@ daily_backup_passwd_enable="YES"			# Backup passwd & group
 # 210.backup-aliases
 daily_backup_aliases_enable="YES"			# Backup mail aliases
 
-# 220.backup-pkgdb
-daily_backup_pkgdb_enable="YES"				# Backup /var/db/pkg
-daily_backup_pkgdb_dir="/var/backups"
-
 # 300.calendar
 daily_calendar_enable="NO"				# Run calendar -a
 
@@ -257,10 +253,6 @@ security_status_passwdless_period="daily"
 security_status_logincheck_enable="YES"
 security_status_logincheck_period="daily"
 
-# 460.chkportsum
-security_status_chkportsum_enable="NO"		# Check ports w/ wrong checksum
-security_status_chkportsum_period="daily"
-
 # 500.ipfwdenied
 security_status_ipfwdenied_enable="YES"
 security_status_ipfwdenied_period="daily"
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 190bb9c074bd..b24e869cdd43 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -110,6 +110,7 @@ synchronous_dhclient="NO"	# Start dhclient directly on configured
 				# interfaces during startup.
 defaultroute_delay="30"		# Time to wait for a default route on a DHCP interface.
 defaultroute_carrier_delay="5"	# Time to wait for carrier while waiting for a default route.
+netif_ipexpand_max="2048"	# Maximum number of IP addrs in a range spec.
 wpa_supplicant_program="/usr/sbin/wpa_supplicant"
 wpa_supplicant_flags="-s"	# Extra flags to pass to wpa_supplicant
 wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
@@ -292,7 +293,7 @@ ipropd_slave_enable="NO"	# Run Heimdal incremental propagation daemon
 ipropd_slave_program="/usr/libexec/ipropd-slave"
 ipropd_slave_flags=""		# Flags to ipropd-slave.
 ipropd_slave_keytab="/etc/krb5.keytab"	# keytab for ipropd-slave.
-ipropd_slave_masters=""		# master node names.
+ipropd_slave_master=""		# master node name.
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_program="/usr/sbin/gssd"	# Path to gssd.
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 94cafdc66288..82a5000ff8ae 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -18,6 +18,10 @@ FILES+=	uath.conf usb.conf
 FILES+=	zfs.conf
 .endif
 
+.if ${MK_HYPERV} != "no"
+FILES+=	hyperv.conf
+.endif
+
 NO_OBJ=
 FILESDIR=	/etc/devd
 FILESMODE=	644
diff --git a/etc/devd/hyperv.conf b/etc/devd/hyperv.conf
new file mode 100644
index 000000000000..bed7383d0816
--- /dev/null
+++ b/etc/devd/hyperv.conf
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# Hyper-V specific events
+
+notify 10 {
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"CREATE";
+	match "cdev"		"hv_kvp_dev";
+	action "/usr/sbin/hv_kvp_daemon";
+};
+
+notify 10 {
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"DESTROY";
+	match "cdev"		"hv_kvp_dev";
+	action "pkill -x hv_kvp_daemon";
+};
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index c8d252abe387..7828a8561cfe 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -65,7 +65,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
-	match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116)";
+	match "product" "(0x2016|0x2116|0x2216)";
+	action "kldload -n uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x241d|0x251d)";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x3016|0x3116)";
 	action "kldload -n uipaq";
 };
 
@@ -129,7 +145,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0403";
-	match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
+	match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
 	action "kldload -n uftdi";
 };
 
@@ -1057,7 +1073,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
-	match "product" "(0x3416|0x341a)";
+	match "product" "(0x3416|0x341a|0x341e)";
 	action "kldload -n if_run";
 };
 
@@ -1097,7 +1113,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
-	match "product" "(0x020d|0x020e|0x020f|0x0215|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
+	match "product" "(0x020d|0x020e|0x020f|0x0210|0x0214|0x0215|0x0216|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
 	action "kldload -n atp";
 };
 
@@ -2353,7 +2369,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
-	match "product" "(0x17b5|0x17cb)";
+	match "product" "0x17b5";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b05";
+	match "product" "0x17ba";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b05";
+	match "product" "0x17cb";
 	action "kldload -n ng_ubt";
 };
 
@@ -2481,7 +2513,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x018a|0x317f)";
+	match "product" "(0x0179|0x018a|0x317f)";
 	action "kldload -n if_urtwn";
 };
 
@@ -2513,7 +2545,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x8176|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+	match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e)";
 	action "kldload -n if_urtwn";
 };
 
@@ -2925,6 +2957,14 @@ nomatch 32 {
 	action "kldload -n if_urtwn";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0df6";
+	match "product" "0x0072";
+	action "kldload -n if_axge";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -3577,7 +3617,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521|0x1803|0x1c05|0x1c0b)";
+	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521)";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
+	match "product" "0x155b";
+	action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
+	match "product" "(0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
@@ -3753,7 +3809,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1410";
-	match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7042)";
+	match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7001|0x7031|0x7042)";
 	action "kldload -n u3g";
 };
 
@@ -4553,7 +4609,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1cf1";
-	match "product" "(0x0001|0x0004)";
+	match "product" "(0x0001|0x0004|0x0022)";
 	action "kldload -n uftdi";
 };
 
@@ -4565,6 +4621,14 @@ nomatch 32 {
 	action "kldload -n u3g";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1d34";
+	match "product" "0x0004";
+	action "kldload -n uled";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -4633,7 +4697,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d)";
+	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f)";
 	action "kldload -n if_urtwn";
 };
 
@@ -4665,7 +4729,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b|0x3c1f)";
+	match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b|0x3c1f|0x3c20)";
 	action "kldload -n if_run";
 };
 
@@ -4685,6 +4749,14 @@ nomatch 32 {
 	action "kldload -n if_aue";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2001";
+	match "product" "0x4a00";
+	action "kldload -n if_axge";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -5229,6 +5301,36 @@ nomatch 32 {
 	action "kldload -n ng_ubt";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
+	match "intclass" "0xff";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0x16";
+	action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
+	match "intclass" "0xff";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0x46";
+	action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
+	match "intclass" "0xff";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0x76";
+	action "kldload -n if_cdce";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -5399,5 +5501,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2621 USB entries processed
+# 2643 USB entries processed
 
diff --git a/etc/mail/Makefile b/etc/mail/Makefile
index 3f085cc2d780..510b0243f984 100644
--- a/etc/mail/Makefile
+++ b/etc/mail/Makefile
@@ -69,7 +69,7 @@ SENDMAIL_MC!=           hostname
 SENDMAIL_MC:=           ${SENDMAIL_MC}.mc
 
 ${SENDMAIL_MC}:
-	cp freebsd.mc ${SENDMAIL_MC}
+	cp -f freebsd.mc ${SENDMAIL_MC}
 .endif
 
 .ifndef SENDMAIL_SUBMIT_MC
@@ -77,7 +77,7 @@ SENDMAIL_SUBMIT_MC!=	hostname
 SENDMAIL_SUBMIT_MC:=	${SENDMAIL_SUBMIT_MC}.submit.mc
 
 ${SENDMAIL_SUBMIT_MC}:
-	cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
+	cp -f freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
 .endif
 
 INSTALL_CF=		${SENDMAIL_MC:R}.cf
diff --git a/etc/motd b/etc/motd
index 50ce29d4b344..e70e98d025c9 100644
--- a/etc/motd
+++ b/etc/motd
@@ -2,24 +2,20 @@ FreeBSD ?.?.?  (UNKNOWN)
 
 Welcome to FreeBSD!
 
-Before seeking technical support, please use the following resources:
+Release Notes, Errata: https://www.FreeBSD.org/releases/
+Security Advisories:   https://www.FreeBSD.org/security/
+FreeBSD Handbook:      https://www.FreeBSD.org/handbook/
+FreeBSD FAQ:           https://www.FreeBSD.org/faq/
+Questions List: https://lists.FreeBSD.org/mailman/listinfo/freebsd-questions/
+FreeBSD Forums:        https://forums.FreeBSD.org/
 
-o  Security advisories and updated errata information for all releases are
-   at http://www.FreeBSD.org/releases/ - always consult the ERRATA section
-   for your release first as it's updated frequently.
+Documents installed with the system are in the /usr/local/share/doc/freebsd/
+directory, or can be installed later with:  pkg install en-freebsd-doc
+For other languages, replace "en" with a language code like de or fr.
 
-o  The Handbook and FAQ documents are at http://www.FreeBSD.org/ and,
-   along with the mailing lists, can be searched by going to
-   http://www.FreeBSD.org/search/.  If the doc package has been installed
-   (or fetched via pkg install lang-freebsd-doc, where lang is the
-   2-letter language code, e.g. en), they are also available formatted
-   in /usr/local/share/doc/freebsd.
-
-If you still have a question or problem, please take the output of
-`uname -a', along with any relevant error messages, and email it
-as a question to the questions@FreeBSD.org mailing list.  If you are
-unfamiliar with FreeBSD's directory layout, please refer to the hier(7)
-manual page.  If you are not familiar with manual pages, type `man man'.
+Show the version of FreeBSD installed:  uname -a
+Please include that output and any error messages when posting questions.
+Introduction to manual pages:  man man
+FreeBSD directory layout:      man hier
 
 Edit /etc/motd to change this login announcement.
-
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 5438176e0c5b..3a9d0e001db4 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -89,6 +89,8 @@
             ..
             libnv
             ..
+            libproc
+            ..
             libutil
             ..
         ..
@@ -253,6 +255,8 @@
             ..
             m4
             ..
+            mkimg
+            ..
             ncal
             ..
             printf
@@ -283,6 +287,8 @@
             ..
             newsyslog
             ..
+            pw
+            ..
             sa
             ..
         ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 084850014d04..977cf754d451 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -108,6 +108,8 @@
         ..
         bsdinstall
         ..
+        hyperv
+        ..
         lpr
             ru
             ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 990c23c9abb3..7d4af0be5ab6 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -42,6 +42,8 @@
         ..
         freebsd-update  mode=0700
         ..
+        hyperv          mode=0700
+        ..
         ipf             mode=0700
         ..
         pkg
diff --git a/etc/network.subr b/etc/network.subr
index f67622d51efd..520c9e86a7e5 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -25,9 +25,7 @@
 # $FreeBSD$
 #
 IFCONFIG_CMD="/sbin/ifconfig"
-
-# Maximum number of addresses expanded from a address range specification.
-_IPEXPANDMAX=31
+: ${netif_ipexpand_max:=2048}
 
 #
 # Subroutines commonly used from network startup scripts.
@@ -886,8 +884,8 @@ ifalias_expand_addr_inet()
 		_ipcount=$_iplow
 		while [ "$_ipcount" -le "$_iphigh" ]; do
 			_retstr="${_retstr} ${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail}${_plen:+/}${_plen}"
-			if [ $_ipcount -gt $(($_iplow + $_IPEXPANDMAX)) ]; then
-				warn "Range specification is too large (${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_iphigh}${_iptail:+.}${_iptail}).  ${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail} was processed."
+			if [ $_ipcount -gt $(($_iplow + $netif_ipexpand_max)) ]; then
+				warn "Range specification is too large (${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_iphigh}${_iptail:+.}${_iptail}).  ${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail} was processed.  Increase \$netif_ipexpand_max in rc.conf."
 				break
 			else
 				_ipcount=$(($_ipcount + 1))
@@ -976,9 +974,9 @@ ifalias_expand_addr_inet6()
 					    $_ipleft $_ipcount $_ipright \
 					    ${_plen:+/}$_plen`
 					_retstr="$_retstr $_r"
-					if [ $_ipcount -gt $(($_iplow + $_IPEXPANDMAX)) ]
+					if [ $_ipcount -gt $(($_iplow + $netif_ipexpand_max)) ]
 					then
-						warn "Range specification is too large $(printf '(%s:%04x%s-%s:%04x%s)' $_ipleft $_iplow $_ipright $_ipleft $_iphigh $_ipright). $(printf '%s:%04x%s-%s:%04x%s' $_ipleft $_iplow $_ipright $_ipleft $_ipcount $_ipright) was processed."
+						warn "Range specification is too large $(printf '(%s:%x%s-%s:%x%s)' "$_ipleft" "$_iplow" "$_ipright" "$_ipleft" "$_iphigh" "$_ipright"). $(printf '%s:%x%s-%s:%x%s' "$_ipleft" "$_iplow" "$_ipright" "$_ipleft" "$_ipcount" "$_ipright") was processed.  Increase \$netif_ipexpand_max in rc.conf."
 						break
 					else
 						_ipcount=$(($_ipcount + 1))
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index eef3bc6545b5..67bcec6f00d3 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -45,8 +45,8 @@ case "$daily_clean_tmps_enable" in
 	    rc=$(for dir in $daily_clean_tmps_dirs
 		do
 		    [ ."${dir#/}" != ."$dir" -a -d $dir ] && cd $dir && {
-			find -d . -type f $args -delete $print
-			find -d . ! -name . -type d $dargs -delete $print
+			find -x -d . -type f $args -delete $print
+			find -x -d . ! -name . -type d $dargs -delete $print
 		    } | sed "s,^\\.,  $dir,"
 		done | tee /dev/stderr | wc -l)
 	    [ -z "$print" ] && rc=0
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 64e83ac8ca50..12c87db584cd 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -44,7 +44,6 @@ FILES=	DAEMON \
 	dumpon \
 	faith \
 	fsck \
-	ftp-proxy \
 	ftpd \
 	gbde \
 	geli \
@@ -73,7 +72,6 @@ FILES=	DAEMON \
 	jail \
 	kadmind \
 	kdc \
-	keyserv \
 	kfd \
 	kld \
 	kldxref \
@@ -133,7 +131,6 @@ FILES=	DAEMON \
 	rpcbind \
 	rtadvd \
 	rtsold \
-	rwho \
 	savecore \
 	sdpd \
 	securelevel \
@@ -169,18 +166,6 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
-.if ${MK_OFED} != "no"
-_opensm=	opensm
-.endif
-
-.if ${MK_OPENSSH} != "no"
-_sshd=		sshd
-.endif
-
-.if ${MK_NS_CACHING} != "no"
-_nscd=		nscd
-.endif
-
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd
@@ -192,6 +177,30 @@ _ubthidhci=	ubthidhci
 _casperd=	casperd
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+_nscd=		nscd
+.endif
+
+.if ${MK_OFED} != "no"
+_opensm=	opensm
+.endif
+
+.if ${MK_OPENSSL} != "no"
+FILES+=		keyserv
+.endif
+
+.if ${MK_OPENSSH} != "no"
+_sshd=		sshd
+.endif
+
+.if ${MK_PF} != "no"
+FILES+=		ftp-proxy
+.endif
+
+.if ${MK_RCMDS} != "no"
+FILES+=		rwho
+.endif
+
 .if ${MK_UNBOUND} != "no"
 _unbound=	local_unbound
 .endif
diff --git a/etc/rc.d/ipropd_slave b/etc/rc.d/ipropd_slave
index 803281e0e9fe..70c4c70e98cc 100755
--- a/etc/rc.d/ipropd_slave
+++ b/etc/rc.d/ipropd_slave
@@ -17,15 +17,15 @@ start_precmd=${name}_start_precmd
 ipropd_slave_start_precmd()
 {
 
-	if [ -z "$ipropd_slave_masters" ]; then
-		warn "\$ipropd_slave_masters is empty."
+	if [ -z "$ipropd_slave_master" ]; then
+		warn "\$ipropd_slave_master is empty."
 		return 1
 	fi
 	command_args=" \
 	    $command_args \
 	    --keytab=\"$ipropd_slave_keytab\" \
 	    --detach \
-	    $ipropd_slave_masters"
+	    $ipropd_slave_master"
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index cf1c6e2fae9d..0b886fd56b59 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -321,8 +321,6 @@ jail_extract_address()
 	elif [ "${_type}" = "inet6" ]; then
 		# In case _mask is not set for IPv6, use /128.
 		_mask=${_mask:-/128}
-		warn "$_type $_addr: an IPv6 address should always be " \
-		    "specified with a prefix length.  /128 is used."
 	fi
 }
 
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 0dc41ad5f0b8..a60ac4c7318d 100755
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -167,7 +167,7 @@ syscons_configure_keyboard()
 	# keymap
 	#
 	case ${keymap} in
-	[Nn][Oo] | '')
+	NO | '')
 		;;
 	*)
 		sc_init
diff --git a/etc/rc.subr b/etc/rc.subr
index ff4e898597ca..4b3fddf5d929 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -68,6 +68,39 @@ list_vars()
 	done; }
 }
 
+# set_rcvar [var] [defval] [desc]
+#
+#	Echo or define a rc.conf(5) variable name.  Global variable
+#	$rcvars is used.
+#
+#	If no argument is specified, echo "${name}_enable".
+#
+#	If only a var is specified, echo "${var}_enable".
+#
+#	If var and defval are specified, the ${var} is defined as
+#	rc.conf(5) variable and the default value is ${defvar}.  An
+#	optional argument $desc can also be specified to add a
+#	description for that.
+#
+set_rcvar()
+{
+	local _var
+
+	case $# in
+	0)	echo ${name}_enable ;;
+	1)	echo ${1}_enable ;;
+	*)
+		debug "set_rcvar: \$$1=$2 is added" \
+		    " as a rc.conf(5) variable."
+		_var=$1
+		rcvars="${rcvars# } $_var"
+		eval ${_var}_defval=\"$2\"
+		shift 2
+		eval ${_var}_desc=\"$*\"
+	;;
+	esac
+}
+
 # set_rcvar_obsolete oldvar [newvar] [msg]
 #	Define obsolete variable.
 #	Global variable $rcvars_obsolete is used.
@@ -76,7 +109,7 @@ set_rcvar_obsolete()
 {
 	local _var
 	_var=$1
-	debug "rcvar_obsolete: \$$1(old) -> \$$2(new) is defined"
+	debug "set_rcvar_obsolete: \$$1(old) -> \$$2(new) is defined"
 
 	rcvars_obsolete="${rcvars_obsolete# } $1"
 	eval ${1}_newvar=\"$2\"
@@ -1091,8 +1124,8 @@ $command $rc_flags $command_args"
 				echo ""
 			fi
 			echo "#"
-			# Get unique vars in $rcvar
-			for _v in $rcvar; do
+			# Get unique vars in $rcvar $rcvars
+			for _v in $rcvar $rcvars; do
 				case $v in
 				$_v\ *|\ *$_v|*\ $_v\ *) ;;
 				*)	v="${v# } $_v" ;;
@@ -1238,7 +1271,7 @@ run_rc_script()
 
 	unset	name command command_args command_interpreter \
 		extra_commands pidfile procname \
-		rcvar rcvars_obsolete required_dirs required_files \
+		rcvar rcvars rcvars_obsolete required_dirs required_files \
 		required_vars
 	eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
 
@@ -1306,7 +1339,7 @@ load_rc_config()
 	done
 
 	# Set defaults if defined.
-	for _var in $rcvar; do
+	for _var in $rcvar $rcvars; do
 		eval _defval=\$${_var}_defval
 		if [ -n "$_defval" ]; then
 			eval : \${$_var:=\$${_var}_defval}
@@ -1966,6 +1999,22 @@ check_required_after()
 	return 0
 }
 
+# check_jail mib
+#	Return true if security.jail.$mib exists and set to 1.
+
+check_jail()
+{
+	local _mib _v
+
+	_mib=$1
+	if _v=$(${SYSCTL_N} "security.jail.$_mib" 2> /dev/null); then
+		case $_v in
+		1)	return 0;;
+		esac
+	fi
+	return 1
+}
+
 # check_kern_features mib
 #	Return existence of kern.features.* sysctl MIB as true or
 #	false.  The result will be cached in $_rc_cache_kern_features_
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index a4d35e9fe78d..ba82f1407237 100644
--- a/games/factor/factor.6
+++ b/games/factor/factor.6
@@ -89,8 +89,7 @@ The
 value must not be greater than the maximum.
 The default and maximum value of
 .Ar stop
-is 4294967295 on 32-bit architectures
-and 18446744073709551615 on 64-bit ones.
+is 3825123056546413050.
 .Pp
 When the
 .Nm primes
@@ -120,3 +119,9 @@ cannot handle the
 factor list,
 .Nm primes
 will not get you a world record.
+.Pp
+.Nm primes
+is unable to list primes between 3825123056546413050 and 18446744073709551615
+since it relies on strong pseudoprime tests after sieving, and nobody has
+proven how many strong pseudoprime tests are required to prove primality for
+integers larger than 3825123056546413050.
diff --git a/games/factor/factor.c b/games/factor/factor.c
index 8b76c175e2a8..19fe830ca59d 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -227,7 +228,7 @@ pr_fact(BIGNUM *val)
 
 		/* Divide factor out until none are left. */
 		do {
-			printf(hflag ? " 0x%lx" : " %lu", *fact);
+			printf(hflag ? " 0x%" PRIx64 "" : " %" PRIu64 "", *fact);
 			BN_div_word(val, (BN_ULONG)*fact);
 		} while (BN_mod_word(val, (BN_ULONG)*fact) == 0);
 
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 13c9048a91cf..bfc4147883bf 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	primes
-SRCS=	pattern.c pr_tbl.c primes.c
+SRCS=	pattern.c pr_tbl.c primes.c spsp.c
 MAN=
 DPADD=	${LIBM}
 LDADD=	-lm
diff --git a/games/primes/primes.c b/games/primes/primes.c
index 33838ee933da..a1c95c2a8a02 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -64,6 +64,7 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
@@ -111,10 +112,10 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	start = 0;
-	stop = BIG;
+	stop = SPSPMAX;
 
 	/*
-	 * Convert low and high args.  Strtoul(3) sets errno to
+	 * Convert low and high args.  Strtoumax(3) sets errno to
 	 * ERANGE if the number is too large, but, if there's
 	 * a leading minus sign it returns the negation of the
 	 * result of the conversion, which we'd rather disallow.
@@ -126,18 +127,20 @@ main(int argc, char *argv[])
 			errx(1, "negative numbers aren't permitted.");
 
 		errno = 0;
-		start = strtoul(argv[0], &p, 0);
+		start = strtoumax(argv[0], &p, 0);
 		if (errno)
 			err(1, "%s", argv[0]);
 		if (*p != '\0')
 			errx(1, "%s: illegal numeric format.", argv[0]);
 
 		errno = 0;
-		stop = strtoul(argv[1], &p, 0);
+		stop = strtoumax(argv[1], &p, 0);
 		if (errno)
 			err(1, "%s", argv[1]);
 		if (*p != '\0')
 			errx(1, "%s: illegal numeric format.", argv[1]);
+		if (stop > SPSPMAX)
+			errx(1, "%s: stop value too large.", argv[1]);
 		break;
 	case 1:
 		/* Start on the command line. */
@@ -145,7 +148,7 @@ main(int argc, char *argv[])
 			errx(1, "negative numbers aren't permitted.");
 
 		errno = 0;
-		start = strtoul(argv[0], &p, 0);
+		start = strtoumax(argv[0], &p, 0);
 		if (errno)
 			err(1, "%s", argv[0]);
 		if (*p != '\0')
@@ -186,7 +189,7 @@ read_num_buf(void)
 		if (*p == '-')
 			errx(1, "negative numbers aren't permitted.");
 		errno = 0;
-		val = strtoul(buf, &p, 0);
+		val = strtoumax(buf, &p, 0);
 		if (errno)
 			err(1, "%s", buf);
 		if (*p != '\n')
@@ -241,7 +244,7 @@ primes(ubig start, ubig stop)
 		for (p = &prime[0], factor = prime[0];
 		    factor < stop && p <= pr_limit; factor = *(++p)) {
 			if (factor >= start) {
-				printf(hflag ? "0x%lx\n" : "%lu\n", factor);
+				printf(hflag ? "%" PRIx64 "\n" : "%" PRIu64 "\n", factor);
 			}
 		}
 		/* return early if we are done */
@@ -304,7 +307,11 @@ primes(ubig start, ubig stop)
 		 */
 		for (q = table; q < tab_lim; ++q, start+=2) {
 			if (*q) {
-				printf(hflag ? "0x%lx\n" : "%lu\n", start);
+				if (start > SIEVEMAX) {
+					if (!isprime(start))
+						continue;
+				}
+				printf(hflag ? "%" PRIx64 "\n" : "%" PRIu64 "\n", start);
 			}
 		}
 	}
diff --git a/games/primes/primes.h b/games/primes/primes.h
index 0951bbf5ad9c..3a18fc7dd127 100644
--- a/games/primes/primes.h
+++ b/games/primes/primes.h
@@ -41,8 +41,10 @@
  * chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
  */
 
+#include <stdint.h>
+
 /* ubig is the type that holds a large unsigned value */
-typedef unsigned long ubig;		/* must be >=32 bit unsigned value */
+typedef uint64_t ubig;			/* must be >=32 bit unsigned value */
 #define	BIG		ULONG_MAX	/* largest value will sieve */
 
 /* bytes in sieve table (must be > 3*5*7*11) */
@@ -57,6 +59,9 @@ typedef unsigned long ubig;		/* must be >=32 bit unsigned value */
 extern const ubig prime[];
 extern const ubig *const pr_limit;	/* largest prime in the prime array */
 
+/* Maximum size sieving alone can handle. */
+#define	SIEVEMAX 4295098368ULL
+
 /*
  * To avoid excessive sieves for small factors, we use the table below to
  * setup our sieve blocks.  Each element represents an odd number starting
@@ -64,3 +69,9 @@ extern const ubig *const pr_limit;	/* largest prime in the prime array */
  */
 extern const char pattern[];
 extern const size_t pattern_size;	/* length of pattern array */
+
+/* Test for primality using strong pseudoprime tests. */
+int isprime(ubig);
+
+/* Maximum value which the SPSP code can handle. */
+#define	SPSPMAX 3825123056546413050ULL
diff --git a/games/primes/spsp.c b/games/primes/spsp.c
new file mode 100644
index 000000000000..f61acd63b117
--- /dev/null
+++ b/games/primes/spsp.c
@@ -0,0 +1,181 @@
+/*-
+ * Copyright (c) 2014 Colin Percival
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "primes.h"
+
+/* Return a * b % n, where 0 <= a, b < 2^63, 0 < n < 2^63. */
+static uint64_t
+mulmod(uint64_t a, uint64_t b, uint64_t n)
+{
+	uint64_t x = 0;
+
+	while (b != 0) {
+		if (b & 1)
+			x = (x + a) % n;
+		a = (a + a) % n;
+		b >>= 1;
+	}
+
+	return (x);
+}
+
+/* Return a^r % n, where 0 <= a < 2^63, 0 < n < 2^63. */
+static uint64_t
+powmod(uint64_t a, uint64_t r, uint64_t n)
+{
+	uint64_t x = 1;
+
+	while (r != 0) {
+		if (r & 1)
+			x = mulmod(a, x, n);
+		a = mulmod(a, a, n);
+		r >>= 1;
+	}
+
+	return (x);
+}
+
+/* Return non-zero if n is a strong pseudoprime to base p. */
+static int
+spsp(uint64_t n, uint64_t p)
+{
+	uint64_t x;
+	uint64_t r = n - 1;
+	int k = 0;
+
+	/* Compute n - 1 = 2^k * r. */
+	while ((r & 1) == 0) {
+		k++;
+		r >>= 1;
+	}
+
+	/* Compute x = p^r mod n.  If x = 1, n is a p-spsp. */
+	x = powmod(p, r, n);
+	if (x == 1)
+		return (1);
+
+	/* Compute x^(2^i) for 0 <= i < n.  If any are -1, n is a p-spsp. */
+	while (k > 0) {
+		if (x == n - 1)
+			return (1);
+		x = powmod(x, 2, n);
+		k--;
+	}
+
+	/* Not a p-spsp. */
+	return (0);
+}
+
+/* Test for primality using strong pseudoprime tests. */
+int
+isprime(ubig _n)
+{
+	uint64_t n = _n;
+
+	/*
+	 * Values from:
+	 * C. Pomerance, J.L. Selfridge, and S.S. Wagstaff, Jr.,
+	 * The pseudoprimes to 25 * 10^9, Math. Comp. 35(151):1003-1026, 1980.
+	 */
+
+	/* No SPSPs to base 2 less than 2047. */
+	if (!spsp(n, 2))
+		return (0);
+	if (n < 2047ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3 less than 1373653. */
+	if (!spsp(n, 3))
+		return (0);
+	if (n < 1373653ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3,5 less than 25326001. */
+	if (!spsp(n, 5))
+		return (0);
+	if (n < 25326001ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3,5,7 less than 3215031751. */
+	if (!spsp(n, 7))
+		return (0);
+	if (n < 3215031751ULL)
+		return (1);
+
+	/*
+	 * Values from:
+	 * G. Jaeschke, On strong pseudoprimes to several bases,
+	 * Math. Comp. 61(204):915-926, 1993.
+	 */
+
+	/* No SPSPs to bases 2,3,5,7,11 less than 2152302898747. */
+	if (!spsp(n, 11))
+		return (0);
+	if (n < 2152302898747ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3,5,7,11,13 less than 3474749660383. */
+	if (!spsp(n, 13))
+		return (0);
+	if (n < 3474749660383ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3,5,7,11,13,17 less than 341550071728321. */
+	if (!spsp(n, 17))
+		return (0);
+	if (n < 341550071728321ULL)
+		return (1);
+
+	/* No SPSPs to bases 2,3,5,7,11,13,17,19 less than 341550071728321. */
+	if (!spsp(n, 19))
+		return (0);
+	if (n < 341550071728321ULL)
+		return (1);
+
+	/*
+	 * Value from:
+	 * Y. Jiang and Y. Deng, Strong pseudoprimes to the first eight prime
+	 * bases, Math. Comp. 83(290):2915-2924, 2014.
+	 */
+
+	/* No SPSPs to bases 2..23 less than 3825123056546413051. */
+	if (!spsp(n, 23))
+		return (0);
+	if (n < 3825123056546413051)
+		return (1);
+
+	/* We can't handle values larger than this. */
+	assert(n <= SPSPMAX);
+
+	/* UNREACHABLE */
+	return (0);
+}
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index dee77dfe5349..e1224ca5d9f0 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -24,7 +24,7 @@ CFLAGS+=	-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
 CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
 MKDEP=		-DCRT_BEGIN
 
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 8480ef475070..4fd8b8d45147 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -15,7 +15,7 @@ MK_SSP=	no
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
@@ -56,7 +56,7 @@ LIB2FUNCS+= _fixuns${mode}si
 .endfor
 
 # Likewise double-word routines.
-.if ${TARGET_CPUARCH} != "arm" || ${MK_ARM_EABI} == "no"
+.if ${TARGET_CPUARCH} != "arm"
 # These are implemented in an ARM specific file but will not be filtered out
 .for mode in sf df xf tf
 LIB2FUNCS+= _fix${mode}di _fixuns${mode}di
@@ -117,14 +117,10 @@ CFLAGS.clang+=	-fheinous-gnu-extensions
 
 LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
-.if ${MK_ARM_EABI} != "no"
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
 DPADD+=		${LIBCOMPILER_RT}
 LDADD+=		-lcompiler_rt
-.else
-LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
-.endif
 .endif
 
 .if ${TARGET_CPUARCH} == mips
@@ -319,7 +315,7 @@ CLEANFILES += cs-*.h option*
 SHLIB_MKMAP      = ${GCCDIR}/mkmap-symver.awk
 SHLIB_MKMAP_OPTS =
 SHLIB_MAPFILES   = ${GCCDIR}/libgcc-std.ver
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 SHLIB_MAPFILES  += ${GCCDIR}/config/arm/libgcc-bpabi.ver
 .endif
 VERSION_MAP      = libgcc.map
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index e2b80744cf5f..7582720f53b7 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
 CFLAGS+=	-I${.CURDIR}/../../usr.bin/cc/cc_tools \
 		-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I.
 
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index fa1d67e7ce64..98a08f416499 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -16,9 +16,6 @@ LIB=		stdc++
 SHLIB_MAJOR=	6
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
-CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
-.endif
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
 CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}/include -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
@@ -596,7 +593,7 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h
 
 CLEANFILES+=	${THRHDRS}
 
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${MACHINE_CPUARCH} == "arm"
 unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 .else
 unwind.h: ${GCCDIR}/unwind-generic.h
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index c7cc30e53787..0531a73ae8ff 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -22,9 +22,6 @@ SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \
 SRCS+=	cp-demangle.c
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
-CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
-.endif
 CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR}
 CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
@@ -35,7 +32,7 @@ HDRS=	exception new typeinfo cxxabi.h exception_defines.h
 INCS=	${HDRS:S;^;${SRCDIR}/;}
 INCSDIR=${INCLUDEDIR}/c++/${GCCVER}
 
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${MACHINE_CPUARCH} == "arm"
 unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 .else
 unwind.h: ${GCCDIR}/unwind-generic.h
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index dc9779973210..1d66b3dee7ff 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -27,7 +27,7 @@ CSTD?=	gnu89
 CFLAGS+=	-DCROSS_DIRECTORY_STRUCTURE
 .endif
 
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index ae7f8b82d17d..af731c13519b 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -51,10 +51,8 @@ TARGET_INC+=	${GCC_CPU}/elf.h
 .endif
 .if ${TARGET_CPUARCH} == "arm"
 TARGET_INC+=	${GCC_CPU}/aout.h
-.if ${MK_ARM_EABI} != "no"
 TARGET_INC+=	${GCC_CPU}/bpabi.h
 .endif
-.endif
 .if ${TARGET_ARCH} == "powerpc64"
 TARGET_INC+=	${GCC_CPU}/biarch64.h
 TARGET_INC+=    ${GCC_CPU}/default64.h
@@ -352,7 +350,7 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h
 
 GENSRCS+=	gthr-default.h
 
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
 unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 .else
 unwind.h: ${GCCDIR}/unwind-generic.h
diff --git a/include/unistd.h b/include/unistd.h
index f1913b693458..0329122f7e7c 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -453,7 +453,6 @@ int	 encrypt(char *, int);
 long	 gethostid(void);
 int	 lockf(int, int, off_t);
 int	 nice(int);
-int	 setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */
 int	 setregid(gid_t, gid_t);
 int	 setreuid(uid_t, uid_t);
 
@@ -567,6 +566,7 @@ int	 setkey(const char *);
 int	 setlogin(const char *);
 int	 setloginclass(const char *);
 void	*setmode(const char *);
+int	 setpgrp(pid_t, pid_t);			/* obsoleted by setpgid() */
 void	 setproctitle(const char *_fmt, ...) __printf0like(1, 2);
 int	 setresgid(gid_t, gid_t, gid_t);
 int	 setresuid(uid_t, uid_t, uid_t);
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index dc1de5c61506..02e6a4975fd4 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -112,10 +112,10 @@ ${GEN_KX509}: kx509.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 	
 .include <bsd.lib.mk>
 
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 3b30fe7b9d56..241d15efa503 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -22,11 +22,10 @@ CFLAGS+=	-fno-strict-aliasing
 TARGET_ARCH?=	${MACHINE_ARCH}
 BUILD_ARCH?=	${MACHINE_ARCH}
 
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
-    ${MK_ARM_EABI} != "no"
-TARGET_ABI=	gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET_ARCH:Marm*hf*} != ""
 TARGET_ABI=	gnueabihf
+.elif ${TARGET_ARCH:Marm*} != ""
+TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 5a02e51b6ca4..ad3cc7415d7d 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -151,11 +151,11 @@ KSRCS=	bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \
 libkern: libkern.gen libkern.${LIBC_ARCH}
 
 libkern.gen: ${KQSRCS} ${KSRCS}
-	cp -p ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
+	cp -fp ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
 
 libkern.${LIBC_ARCH}:: ${KMSRCS}
 .if defined(KMSRCS) && !empty(KMSRCS)
-	cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
+	cp -fp ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc
index 6e61dcd9e1c8..418f54d1d51a 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -9,10 +9,9 @@ SOFTFLOAT_BITS=32
 MDSRCS+=machdep_ldisd.c
 SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
 
-.if ${MK_ARM_EABI} == "no"
-# This contains the symbols that were removed when moving to the ARM EABI
-SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_oabi.map
-.else
 .include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
+
+.if ${MACHINE_ARCH:Marm*hf*} != ""
+SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_vfp.map
 .endif
 
diff --git a/lib/libc/arm/Symbol_oabi.map b/lib/libc/arm/Symbol_oabi.map
deleted file mode 100644
index 0c22e4a5827d..000000000000
--- a/lib/libc/arm/Symbol_oabi.map
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * $FreeBSD$
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...)
- * and are not used in the ARM EABI.
- */
-FBSDprivate_1.0 {
-	__umodsi3;
-	__modsi3;
-	__udivsi3;
-	__divsi3;
-};
diff --git a/lib/libc/arm/Symbol_vfp.map b/lib/libc/arm/Symbol_vfp.map
new file mode 100644
index 000000000000..82cfcfb574f5
--- /dev/null
+++ b/lib/libc/arm/Symbol_vfp.map
@@ -0,0 +1,10 @@
+/*
+ * $FreeBSD$
+ */
+
+FBSD_1.0 {
+	fpgetmask;
+	fpgetround;
+	fpsetmask;
+	fpsetround;
+};
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc
index 0957c922e2d1..c0ce512c81e6 100644
--- a/lib/libc/arm/aeabi/Makefile.inc
+++ b/lib/libc/arm/aeabi/Makefile.inc
@@ -5,7 +5,7 @@
 SRCS+=	aeabi_atexit.c		\
 	aeabi_unwind_cpp.c	\
 	aeabi_unwind_exidx.c
-.if ${MACHINE_ARCH} != "armv6hf"
+.if ${MACHINE_ARCH:Marm*hf*} == ""
 SRCS+=	aeabi_double.c		\
 	aeabi_float.c
 .endif
diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc
index 5fd52c2fd589..8efde09ff3e0 100644
--- a/lib/libc/arm/gen/Makefile.inc
+++ b/lib/libc/arm/gen/Makefile.inc
@@ -6,10 +6,6 @@ SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	__aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S flt_rounds.c \
 	arm_initfini.c
 
-.if ${MK_ARM_EABI} == "no"
-SRCS+=	divsi3.S
-.endif
-
 .if ${MACHINE_ARCH} == "armv6hf"
 SRCS+=	fpgetmask_vfp.c fpgetround_vfp.c fpgetsticky_vfp.c fpsetmask_vfp.c \
 	fpsetround_vfp.c fpsetsticky_vfp.c
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 159731c4337b..bdadd55389c3 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -268,7 +268,7 @@ __elf_fdnlist(fd, list)
 	}
 
 	/* mmap section header table */
-	base = mmap(NULL, (size_t)shdr_size, PROT_READ, 0, fd,
+	base = mmap(NULL, (size_t)shdr_size, PROT_READ, MAP_PRIVATE, fd,
 	    (off_t)ehdr.e_shoff);
 	if (base == MAP_FAILED)
 		return (-1);
@@ -301,7 +301,7 @@ __elf_fdnlist(fd, list)
 	 * making the memory allocation permanent as with malloc/free
 	 * (i.e., munmap will return it to the system).
 	 */
-	base = mmap(NULL, (size_t)symstrsize, PROT_READ, 0, fd,
+	base = mmap(NULL, (size_t)symstrsize, PROT_READ, MAP_PRIVATE, fd,
 	    (off_t)symstroff);
 	if (base == MAP_FAILED)
 		goto done;
diff --git a/lib/libc/powerpc/gen/_ctx_start.S b/lib/libc/powerpc/gen/_ctx_start.S
index 2d3cfcfcf1ef..4b9fc1d53ae0 100644
--- a/lib/libc/powerpc/gen/_ctx_start.S
+++ b/lib/libc/powerpc/gen/_ctx_start.S
@@ -41,5 +41,6 @@
 	 * above branch.
 	 */
 	bl	PIC_PLT(CNAME(abort))	/* abort */
+ END(_cts_start)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/gen/_setjmp.S b/lib/libc/powerpc/gen/_setjmp.S
index bbf8644357ec..e28386c24b9c 100644
--- a/lib/libc/powerpc/gen/_setjmp.S
+++ b/lib/libc/powerpc/gen/_setjmp.S
@@ -58,6 +58,7 @@ ENTRY(_setjmp)
 	stmw	%r9,20(%r3)
 	li	%r3,0
 	blr
+END(_setjmp)
 
 ENTRY(_longjmp)
 	lmw	%r9,20(%r3)
@@ -68,5 +69,6 @@ ENTRY(_longjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(_longjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/gen/eabi.S b/lib/libc/powerpc/gen/eabi.S
index 59c231123f20..3296af88a4d1 100644
--- a/lib/libc/powerpc/gen/eabi.S
+++ b/lib/libc/powerpc/gen/eabi.S
@@ -29,5 +29,6 @@ __FBSDID("$FreeBSD$");
 
 ENTRY(__eabi)
 	blr
+END(__eabi)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/gen/fabs.S b/lib/libc/powerpc/gen/fabs.S
index 7891012e281c..ac083ae636ac 100644
--- a/lib/libc/powerpc/gen/fabs.S
+++ b/lib/libc/powerpc/gen/fabs.S
@@ -33,5 +33,6 @@ __FBSDID("$FreeBSD$");
 ENTRY(fabs)
 	fabs	%f1,%f1
 	blr
+END(fabs)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/gen/setjmp.S b/lib/libc/powerpc/gen/setjmp.S
index 6df4f937ff17..9325fc2378cb 100644
--- a/lib/libc/powerpc/gen/setjmp.S
+++ b/lib/libc/powerpc/gen/setjmp.S
@@ -68,6 +68,7 @@ ENTRY(setjmp)
 	stmw	%r9,20(%r6)
 	li	%r3,0			/* return (0) */
 	blr
+END(setjmp)
 
 	WEAK_REFERENCE(CNAME(__longjmp), longjmp)
 ENTRY(__longjmp)
@@ -86,5 +87,6 @@ ENTRY(__longjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(__longjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/gen/sigsetjmp.S b/lib/libc/powerpc/gen/sigsetjmp.S
index 9639dd11c81e..c67afc610316 100644
--- a/lib/libc/powerpc/gen/sigsetjmp.S
+++ b/lib/libc/powerpc/gen/sigsetjmp.S
@@ -73,6 +73,7 @@ ENTRY(sigsetjmp)
 	stmw	%r9,20(%r6)
 	li	%r3,0
 	blr
+END(sigsetjmp)
 
 ENTRY(siglongjmp)
 	lmw	%r9,20(%r3)
@@ -94,5 +95,6 @@ ENTRY(siglongjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(siglongjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/sys/brk.S b/lib/libc/powerpc/sys/brk.S
index 018eec9ebf53..e14be1058b51 100644
--- a/lib/libc/powerpc/sys/brk.S
+++ b/lib/libc/powerpc/sys/brk.S
@@ -71,5 +71,6 @@ ENTRY(brk)
 
 1:
 	b	PIC_PLT(HIDENAME(cerror))
+END(brk)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/sys/exect.S b/lib/libc/powerpc/sys/exect.S
index 3c39b3c47e6b..701f5b00f45c 100644
--- a/lib/libc/powerpc/sys/exect.S
+++ b/lib/libc/powerpc/sys/exect.S
@@ -37,5 +37,6 @@ ENTRY(exect)
 	blr
 1:
 	b	PIC_PLT(HIDENAME(cerror))
+END(exect)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/sys/pipe.S b/lib/libc/powerpc/sys/pipe.S
index 3f6d9a474353..1cbbef042751 100644
--- a/lib/libc/powerpc/sys/pipe.S
+++ b/lib/libc/powerpc/sys/pipe.S
@@ -41,5 +41,6 @@ ENTRY(pipe)
 	blr			/* and return 0 */
 1:
 	b	PIC_PLT(HIDENAME(cerror))
+END(pipe)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/sys/ptrace.S b/lib/libc/powerpc/sys/ptrace.S
index 0bc25c91fa78..cff463dd009c 100644
--- a/lib/libc/powerpc/sys/ptrace.S
+++ b/lib/libc/powerpc/sys/ptrace.S
@@ -56,5 +56,6 @@ ENTRY(ptrace)
 	blr
 1:
 	b	PIC_PLT(HIDENAME(cerror))
+END(ptrace)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc/sys/sbrk.S b/lib/libc/powerpc/sys/sbrk.S
index a5e402001334..f058d112e863 100644
--- a/lib/libc/powerpc/sys/sbrk.S
+++ b/lib/libc/powerpc/sys/sbrk.S
@@ -68,5 +68,6 @@ ENTRY(sbrk)
 	blr
 2:
 	b	PIC_PLT(HIDENAME(cerror))
+END(sbrk)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/_ctx_start.S b/lib/libc/powerpc64/gen/_ctx_start.S
index 79df0413d2e8..17ec44e739cd 100644
--- a/lib/libc/powerpc64/gen/_ctx_start.S
+++ b/lib/libc/powerpc64/gen/_ctx_start.S
@@ -46,5 +46,6 @@
 	nop
 	bl	CNAME(abort)	/* abort */
 	nop
+ END(_ctx_start)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/_setjmp.S b/lib/libc/powerpc64/gen/_setjmp.S
index ac0555e28850..207c4f7d10d9 100644
--- a/lib/libc/powerpc64/gen/_setjmp.S
+++ b/lib/libc/powerpc64/gen/_setjmp.S
@@ -80,6 +80,7 @@ ENTRY(_setjmp)
 	std	%r31,40 + 22*8(%r3)
 	li	%r3,0
 	blr
+END(_setjmp)
 
 ENTRY(_longjmp)
 	ld	%r9,40 + 0*8(%r3)
@@ -113,5 +114,6 @@ ENTRY(_longjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(_longjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/fabs.S b/lib/libc/powerpc64/gen/fabs.S
index 7891012e281c..ac083ae636ac 100644
--- a/lib/libc/powerpc64/gen/fabs.S
+++ b/lib/libc/powerpc64/gen/fabs.S
@@ -33,5 +33,6 @@ __FBSDID("$FreeBSD$");
 ENTRY(fabs)
 	fabs	%f1,%f1
 	blr
+END(fabs)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/setjmp.S b/lib/libc/powerpc64/gen/setjmp.S
index 8fe285201dc2..14954667b9b4 100644
--- a/lib/libc/powerpc64/gen/setjmp.S
+++ b/lib/libc/powerpc64/gen/setjmp.S
@@ -92,6 +92,7 @@ ENTRY(setjmp)
 
 	li	%r3,0			/* return (0) */
 	blr
+END(setjmp)
 
 	WEAK_REFERENCE(__longjmp, longjmp)
 ENTRY(__longjmp)
@@ -132,5 +133,6 @@ ENTRY(__longjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(__longjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/gen/sigsetjmp.S b/lib/libc/powerpc64/gen/sigsetjmp.S
index d5341eaf47b9..5cfd684d38da 100644
--- a/lib/libc/powerpc64/gen/sigsetjmp.S
+++ b/lib/libc/powerpc64/gen/sigsetjmp.S
@@ -97,6 +97,7 @@ ENTRY(sigsetjmp)
 
 	li	%r3,0
 	blr
+END(sigsetjmp)
 
 ENTRY(siglongjmp)
 	ld	%r9,40 + 0*8(%r3)
@@ -141,5 +142,6 @@ ENTRY(siglongjmp)
 	bnelr
 	li	%r3,1
 	blr
+END(siglongjmp)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/brk.S b/lib/libc/powerpc64/sys/brk.S
index 675b400419e2..cbcecc7abb11 100644
--- a/lib/libc/powerpc64/sys/brk.S
+++ b/lib/libc/powerpc64/sys/brk.S
@@ -69,5 +69,6 @@ ENTRY(brk)
 	ld	%r0,16(%r1)
 	mtlr	%r0
 	blr
+END(brk)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/exect.S b/lib/libc/powerpc64/sys/exect.S
index aa34b9e530f8..b6cda9c90773 100644
--- a/lib/libc/powerpc64/sys/exect.S
+++ b/lib/libc/powerpc64/sys/exect.S
@@ -45,5 +45,6 @@ ENTRY(exect)
 	ld	%r0,16(%r1)
 	mtlr	%r0
 	blr
+END(exect)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/pipe.S b/lib/libc/powerpc64/sys/pipe.S
index efd3dd63a4e6..ee255a9867f1 100644
--- a/lib/libc/powerpc64/sys/pipe.S
+++ b/lib/libc/powerpc64/sys/pipe.S
@@ -49,5 +49,6 @@ ENTRY(pipe)
 	ld	%r0,16(%r1)
 	mtlr	%r0
 	blr
+END(pipe)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/ptrace.S b/lib/libc/powerpc64/sys/ptrace.S
index ede00e7da269..69709dd936b5 100644
--- a/lib/libc/powerpc64/sys/ptrace.S
+++ b/lib/libc/powerpc64/sys/ptrace.S
@@ -63,5 +63,6 @@ ENTRY(ptrace)
 	ld	%r0,16(%r1)
 	mtlr	%r0
 	blr
+END(ptrace)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/powerpc64/sys/sbrk.S b/lib/libc/powerpc64/sys/sbrk.S
index e147493cf65c..4e3b57abf458 100644
--- a/lib/libc/powerpc64/sys/sbrk.S
+++ b/lib/libc/powerpc64/sys/sbrk.S
@@ -64,5 +64,6 @@ ENTRY(sbrk)
 	ld	%r0,16(%r1)
 	mtlr	%r0
 	blr
+END(sbrk)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 1b1ab60234af..94697faf2fdd 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -8,7 +8,7 @@
 
 SRCS+=	cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c
 
-.elif ${LIBC_ARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.elif ${LIBC_ARCH} == "arm"
 
 SRCS+=	adddi3.c anddi3.c floatunsdidf.c iordi3.c lshldi3.c notdi2.c \
 	qdivrem.c subdi3.c xordi3.c
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index 34d2b791e70c..27054460e03e 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\" "
-.Dd June 25, 2012
+.Dd October 2, 2014
 .Dt STRPTIME 3
 .Os
 .Sh NAME
@@ -79,7 +79,11 @@ and
 .Fa \&%D ,
 are now interpreted as beginning at 1969 per POSIX requirements.
 Years 69-00 are interpreted in the 20th century (1969-2000), years
-01-68 in the 21st century (2001-2068).
+01-68 in the 21st century (2001-2068).  The
+.Fa \&%U
+and
+.Fa %W
+format specifiers accept any value within the range 00 to 53.
 .Pp
 If the
 .Fa format
@@ -161,14 +165,6 @@ and 12PM
 is taken as noon.
 .Pp
 The
-.Fa \&%U
-and
-.Fa %W
-format specifiers accept any value within the range 00 to 53
-without validating against other values supplied (like month
-or day of the year, for example).
-.Pp
-The
 .Fa %Z
 format specifier only accepts time zone abbreviations of the local time zone,
 or the value "GMT".
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index 2333ab47e76e..8576bdb3750a 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -55,10 +55,32 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "timelocal.h"
+#include "tzfile.h"
 
 static char * _strptime(const char *, const char *, struct tm *, int *, locale_t);
 
-#define	asizeof(a)	(sizeof (a) / sizeof ((a)[0]))
+#define	asizeof(a)	(sizeof(a) / sizeof((a)[0]))
+
+#define	FLAG_NONE	(1 << 0)
+#define	FLAG_YEAR	(1 << 1)
+#define	FLAG_MONTH	(1 << 2)
+#define	FLAG_YDAY	(1 << 3)
+#define	FLAG_MDAY	(1 << 4)
+#define	FLAG_WDAY	(1 << 5)
+
+/*
+ * Calculate the week day of the first day of a year. Valid for
+ * the Gregorian calendar, which began Sept 14, 1752 in the UK
+ * and its colonies. Ref:
+ * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week
+ */
+
+static int
+first_wday_of(int year)
+{
+	return (((2 * (3 - (year / 100) % 4)) + (year % 100) +
+		((year % 100) / 4) + (isleap(year) ? 6 : 0) + 1) % 7);
+}
 
 static char *
 _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
@@ -66,9 +88,18 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 {
 	char	c;
 	const char *ptr;
+	int	day_offset = -1, wday_offset;
+	int week_offset;
 	int	i, len;
+	int flags;
 	int Ealternative, Oalternative;
-	struct lc_time_T *tptr = __get_current_time_locale(locale);
+	const struct lc_time_T *tptr = __get_current_time_locale(locale);
+	static int start_of_month[2][13] = {
+		{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
+		{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366}
+	};
+
+	flags = FLAG_NONE;
 
 	ptr = fmt;
 	while (*ptr != 0) {
@@ -102,6 +133,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			buf = _strptime(buf, tptr->date_fmt, tm, GMTp, locale);
 			if (buf == NULL)
 				return (NULL);
+			flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
 			break;
 
 		case 'C':
@@ -119,19 +151,23 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			if (i < 19)
 				return (NULL);
 
-			tm->tm_year = i * 100 - 1900;
+			tm->tm_year = i * 100 - TM_YEAR_BASE;
+			flags |= FLAG_YEAR;
+
 			break;
 
 		case 'c':
 			buf = _strptime(buf, tptr->c_fmt, tm, GMTp, locale);
 			if (buf == NULL)
 				return (NULL);
+			flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
 			break;
 
 		case 'D':
 			buf = _strptime(buf, "%m/%d/%y", tm, GMTp, locale);
 			if (buf == NULL)
 				return (NULL);
+			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
 			break;
 
 		case 'E':
@@ -150,6 +186,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			buf = _strptime(buf, "%Y-%m-%d", tm, GMTp, locale);
 			if (buf == NULL)
 				return (NULL);
+			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
 			break;
 
 		case 'R':
@@ -180,6 +217,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			buf = _strptime(buf, tptr->x_fmt, tm, GMTp, locale);
 			if (buf == NULL)
 				return (NULL);
+			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
 			break;
 
 		case 'j':
@@ -197,6 +235,8 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				return (NULL);
 
 			tm->tm_yday = i - 1;
+			flags |= FLAG_YDAY;
+
 			break;
 
 		case 'M':
@@ -302,8 +342,9 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			if (i == asizeof(tptr->weekday))
 				return (NULL);
 
-			tm->tm_wday = i;
 			buf += len;
+			tm->tm_wday = i;
+			flags |= FLAG_WDAY;
 			break;
 
 		case 'U':
@@ -327,6 +368,14 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			if (i > 53)
 				return (NULL);
 
+			if (c == 'U')
+				day_offset = TM_SUNDAY;
+			else
+				day_offset = TM_MONDAY;
+
+
+			week_offset = i;
+
 			break;
 
 		case 'w':
@@ -338,6 +387,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				return (NULL);
 
 			tm->tm_wday = i;
+			flags |= FLAG_WDAY;
 
 			break;
 
@@ -374,6 +424,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				return (NULL);
 
 			tm->tm_mday = i;
+			flags |= FLAG_MDAY;
 
 			break;
 
@@ -413,6 +464,8 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 
 			tm->tm_mon = i;
 			buf += len;
+			flags |= FLAG_MONTH;
+
 			break;
 
 		case 'm':
@@ -430,6 +483,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				return (NULL);
 
 			tm->tm_mon = i - 1;
+			flags |= FLAG_MONTH;
 
 			break;
 
@@ -449,8 +503,11 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			}
 			errno = sverrno;
 			buf = cp;
-			gmtime_r(&t, tm);
+			if (gmtime_r(&t, tm) == NULL)
+				return (NULL);
 			*GMTp = 1;
+			flags |= FLAG_YDAY | FLAG_WDAY | FLAG_MONTH |
+			    FLAG_MDAY | FLAG_YEAR;
 			}
 			break;
 
@@ -471,13 +528,14 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (c == 'Y')
-				i -= 1900;
+				i -= TM_YEAR_BASE;
 			if (c == 'y' && i < 69)
 				i += 100;
 			if (i < 0)
 				return (NULL);
 
 			tm->tm_year = i;
+			flags |= FLAG_YEAR;
 
 			break;
 
@@ -543,10 +601,67 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			break;
 		}
 	}
+
+	if (!(flags & FLAG_YDAY) && (flags & FLAG_YEAR)) {
+		if ((flags & (FLAG_MONTH | FLAG_MDAY)) ==
+		    (FLAG_MONTH | FLAG_MDAY)) {
+			tm->tm_yday = start_of_month[isleap(tm->tm_year +
+			    TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
+			flags |= FLAG_YDAY;
+		} else if (day_offset != -1) {
+			/* Set the date to the first Sunday (or Monday)
+			 * of the specified week of the year.
+			 */
+			if (!(flags & FLAG_WDAY)) {
+				tm->tm_wday = day_offset;
+				flags |= FLAG_WDAY;
+			}
+			tm->tm_yday = (7 -
+			    first_wday_of(tm->tm_year + TM_YEAR_BASE) +
+			    day_offset) % 7 + (week_offset - 1) * 7 +
+			    tm->tm_wday - day_offset;
+			flags |= FLAG_YDAY;
+		}
+	}
+
+	if ((flags & (FLAG_YEAR | FLAG_YDAY)) == (FLAG_YEAR | FLAG_YDAY)) {
+		if (!(flags & FLAG_MONTH)) {
+			i = 0;
+			while (tm->tm_yday >=
+			    start_of_month[isleap(tm->tm_year +
+			    TM_YEAR_BASE)][i])
+				i++;
+			if (i > 12) {
+				i = 1;
+				tm->tm_yday -=
+				    start_of_month[isleap(tm->tm_year +
+				    TM_YEAR_BASE)][12];
+				tm->tm_year++;
+			}
+			tm->tm_mon = i - 1;
+			flags |= FLAG_MONTH;
+		}
+		if (!(flags & FLAG_MDAY)) {
+			tm->tm_mday = tm->tm_yday -
+			    start_of_month[isleap(tm->tm_year + TM_YEAR_BASE)]
+			    [tm->tm_mon] + 1;
+			flags |= FLAG_MDAY;
+		}
+		if (!(flags & FLAG_WDAY)) {
+			i = 0;
+			wday_offset = first_wday_of(tm->tm_year);
+			while (i++ <= tm->tm_yday) {
+				if (wday_offset++ >= 6)
+					wday_offset = 0;
+			}
+			tm->tm_wday = wday_offset;
+			flags |= FLAG_WDAY;
+		}
+	}
+
 	return ((char *)buf);
 }
 
-
 char *
 strptime_l(const char * __restrict buf, const char * __restrict fmt,
     struct tm * __restrict tm, locale_t loc)
@@ -564,6 +679,7 @@ strptime_l(const char * __restrict buf, const char * __restrict fmt,
 
 	return (ret);
 }
+
 char *
 strptime(const char * __restrict buf, const char * __restrict fmt,
     struct tm * __restrict tm)
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 65b8fb6bfbb1..46bf9488de81 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -28,7 +28,7 @@
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd September 15, 2014
 .Dt ACCESS 2
 .Os
 .Sh NAME
@@ -133,8 +133,16 @@ and
 .Sh RETURN VALUES
 .Rv -std
 .Sh ERRORS
-Access to the file is denied if:
+.Fn access ,
+.Fn eaccess ,
+or
+.Fn faccessat 
+will fail if:
 .Bl -tag -width Er
+.It Bq Er EINVAL
+The value of the
+.Fa mode
+argument is invalid.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index 8ed3f12bc8a2..e3e57831475a 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -28,7 +28,7 @@
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 26, 2014
+.Dd September 29, 2014
 .Dt CONNECT 2
 .Os
 .Sh NAME
@@ -160,6 +160,8 @@ Search permission is denied for a component of the path prefix.
 Write access to the named socket is denied.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
+.It Bq Er EPERM
+Write access to the named socket is denied.
 .El
 .Sh SEE ALSO
 .Xr accept 2 ,
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index f84bc05ba293..9a7cc235e0c0 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -478,7 +478,6 @@ is in microseconds.
 .It Dv NOTE_NSECONDS
 .Va data
 is in nanoseconds.
-.It
 .El
 .Pp
 If
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 3dd830326ad0..7380a7fb3f31 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd June 19, 2014
+.Dd September 17, 2014
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -176,11 +176,6 @@ already exists within the range.
 .It Dv MAP_HASSEMAPHORE
 Notify the kernel that the region may contain semaphores and that special
 handling may be necessary.
-.It Dv MAP_INHERIT
-This flag never operated as advertised and is no longer supported.
-Please refer to
-.Xr minherit 2
-for further information.
 .It Dv MAP_NOCORE
 Region is not included in a core file.
 .It Dv MAP_NOSYNC
@@ -300,14 +295,6 @@ The
 system call does not unmap pages, see
 .Xr munmap 2
 for further information.
-.Pp
-The current design does not allow a process to specify the location of
-swap space.
-In the future we may define an additional mapping type,
-.Dv MAP_SWAP ,
-in which
-the file descriptor argument specifies a file or device to which swapping
-should be done.
 .Sh NOTES
 Although this implementation does not impose any alignment restrictions on
 the
@@ -372,6 +359,29 @@ The
 argument
 is not a valid open file descriptor.
 .It Bq Er EINVAL
+An invalid value was passed in the
+.Fa prot
+argument.
+.It Bq Er EINVAL
+An undefined option was set in the
+.Fa flags
+argument.
+.It Bq Er EINVAL
+Both
+.Dv MAP_PRIVATE
+and
+.Dv MAP_SHARED
+were specified.
+.It Bq Er EINVAL
+None of
+.Dv MAP_ANON ,
+.Dv MAP_PRIVATE ,
+.Dv MAP_SHARED ,
+or
+.Dv MAP_STACK
+was specified.
+At least one of these flags must be included.
+.It Bq Er EINVAL
 .Dv MAP_FIXED
 was specified and the
 .Fa addr
diff --git a/lib/libc/sys/mq_open.2 b/lib/libc/sys/mq_open.2
index 5acc59beab95..ef6154b7ff5a 100644
--- a/lib/libc/sys/mq_open.2
+++ b/lib/libc/sys/mq_open.2
@@ -37,7 +37,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 29, 2005
+.Dd September 15, 2014
 .Dt MQ_OPEN 2
 .Os
 .Sh NAME
@@ -223,6 +223,11 @@ The
 and
 .Xr kevent 2
 system calls are supported for message queue descriptor.
+.Pp
+Please see the
+.Xr mqueuefs 5
+man page for instructions on loading the module or compiling the service into
+the kernel.
 .Sh RETURN VALUES
 Upon successful completion, the function returns a message queue
 descriptor; otherwise, the function returns
@@ -294,7 +299,8 @@ There is insufficient space for the creation of the new message queue.
 .Xr mq_setattr 2 ,
 .Xr mq_timedreceive 3 ,
 .Xr mq_timedsend 3 ,
-.Xr mq_unlink 3
+.Xr mq_unlink 3 ,
+.Xr mqueuefs 5
 .Sh STANDARDS
 The
 .Fn mq_open
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 91ce965739c9..c31eced57468 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -144,8 +144,7 @@ SRCF+=	adddf3 \
 	truncdfsf2
 .endif
 
-.if ${MACHINE_CPUARCH} != "mips" && \
-    (${MACHINE_CPUARCH} != "arm" || ${MK_ARM_EABI} != "no")
+.if ${MACHINE_CPUARCH} != "mips"
 SRCF+=	divsi3 \
 	modsi3 \
 	udivsi3 \
@@ -165,16 +164,16 @@ SRCF+=	stdatomic
 .endif
 
 .for file in ${SRCF}
-. if ${MACHINE_ARCH} == "armv6hf" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
+. if ${MACHINE_ARCH:Marm*hf*} != "" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
 SRCS+= ${file}vfp.S
-. elif (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH} == "armv6hf") && exists(${CRTSRC}/${CRTARCH}/${file}.S)
+. elif !(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH:Marm*hf*} == "") && exists(${CRTSRC}/${CRTARCH}/${file}.S)
 SRCS+=	${file}.S
 . else
 SRCS+=	${file}.c
 . endif
 .endfor
 
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${MACHINE_CPUARCH} == "arm"
 SRCS+=	aeabi_idivmod.S \
 	aeabi_ldivmod.S \
 	aeabi_memcmp.S \
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index 14f9b222123c..48f71609a4b6 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -68,7 +68,7 @@ geom_stats_resync(void)
 		return;
 	for (;;) {
 		p = mmap(statp, (npages + 1) * pagesize, 
-		    PROT_READ, 0, statsfd, 0);
+		    PROT_READ, MAP_SHARED, statsfd, 0);
 		if (p == MAP_FAILED)
 			break;
 		else
@@ -90,7 +90,7 @@ geom_stats_open(void)
 		return (errno);
 	pagesize = getpagesize();
 	spp = pagesize / sizeof(struct devstat);
-	p = mmap(NULL, pagesize, PROT_READ, 0, statsfd, 0);
+	p = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, statsfd, 0);
 	if (p == MAP_FAILED) {
 		error = errno;
 		close(statsfd);
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index cad1ea4eba63..4a7c76a3114e 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
+SHLIBDIR?= /lib
+
 .include <src.opts.mk>
 
 LIB=	nv
-SHLIBDIR?= /lib
 SHLIB_MAJOR= 0
 
 SRCS=	dnvlist.c
diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c
index 41292aa1b0c9..27620a184f9a 100644
--- a/lib/libnv/msgio.c
+++ b/lib/libnv/msgio.c
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <errno.h>
@@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
 #define	PJDLOG_ABORT(...)		abort()
 #endif
 
+#define	PKG_MAX_SIZE	(MCLBYTES / CMSG_SPACE(sizeof(int)) - 1)
+
 static int
 msghdr_add_fd(struct cmsghdr *cmsg, int fd)
 {
@@ -234,22 +236,31 @@ cred_recv(int sock, struct cmsgcred *cred)
 	return (0);
 }
 
-int
-fd_send(int sock, const int *fds, size_t nfds)
+static int
+fd_package_send(int sock, const int *fds, size_t nfds)
 {
 	struct msghdr msg;
 	struct cmsghdr *cmsg;
+	struct iovec iov;
 	unsigned int i;
 	int serrno, ret;
+	uint8_t dummy;
 
-	if (nfds == 0 || fds == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
+	PJDLOG_ASSERT(sock >= 0);
+	PJDLOG_ASSERT(fds != NULL);
+	PJDLOG_ASSERT(nfds > 0);
 
 	bzero(&msg, sizeof(msg));
-	msg.msg_iov = NULL;
-	msg.msg_iovlen = 0;
+
+	/*
+	 * XXX: Look into cred_send function for more details.
+	 */
+	dummy = 0;
+	iov.iov_base = &dummy;
+	iov.iov_len = sizeof(dummy);
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 	msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
 	msg.msg_control = calloc(1, msg.msg_controllen);
 	if (msg.msg_control == NULL)
@@ -274,22 +285,32 @@ fd_send(int sock, const int *fds, size_t nfds)
 	return (ret);
 }
 
-int
-fd_recv(int sock, int *fds, size_t nfds)
+static int
+fd_package_recv(int sock, int *fds, size_t nfds)
 {
 	struct msghdr msg;
 	struct cmsghdr *cmsg;
 	unsigned int i;
 	int serrno, ret;
+	struct iovec iov;
+	uint8_t dummy;
 
-	if (nfds == 0 || fds == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
+	PJDLOG_ASSERT(sock >= 0);
+	PJDLOG_ASSERT(nfds > 0);
+	PJDLOG_ASSERT(fds != NULL);
 
+	i = 0;
 	bzero(&msg, sizeof(msg));
-	msg.msg_iov = NULL;
-	msg.msg_iovlen = 0;
+	bzero(&iov, sizeof(iov));
+
+	/*
+	 * XXX: Look into cred_send function for more details.
+	 */
+	iov.iov_base = &dummy;
+	iov.iov_len = sizeof(dummy);
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 	msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
 	msg.msg_control = calloc(1, msg.msg_controllen);
 	if (msg.msg_control == NULL)
@@ -332,6 +353,64 @@ fd_recv(int sock, int *fds, size_t nfds)
 	return (ret);
 }
 
+int
+fd_recv(int sock, int *fds, size_t nfds)
+{
+	unsigned int i, step, j;
+	int ret, serrno;
+
+	if (nfds == 0 || fds == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	ret = i = step = 0;
+	while (i < nfds) {
+		if (PKG_MAX_SIZE < nfds - i)
+			step = PKG_MAX_SIZE;
+		else
+			step = nfds - i;
+		ret = fd_package_recv(sock, fds + i, step);
+		if (ret != 0) {
+			/* Close all received descriptors. */
+			serrno = errno;
+			for (j = 0; j < i; j++)
+				close(fds[j]);
+			errno = serrno;
+			break;
+		}
+		i += step;
+	}
+
+	return (ret);
+}
+
+int
+fd_send(int sock, const int *fds, size_t nfds)
+{
+	unsigned int i, step;
+	int ret;
+
+	if (nfds == 0 || fds == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	ret = i = step = 0;
+	while (i < nfds) {
+		if (PKG_MAX_SIZE < nfds - i)
+			step = PKG_MAX_SIZE;
+		else
+			step = nfds - i;
+		ret = fd_package_send(sock, fds + i, step);
+		if (ret != 0)
+			break;
+		i += step;
+	}
+
+	return (ret);
+}
+
 int
 buf_send(int sock, void *buf, size_t size)
 {
diff --git a/lib/libnv/nv.3 b/lib/libnv/nv.3
index 63c8e8b0e202..29ba744389cb 100644
--- a/lib/libnv/nv.3
+++ b/lib/libnv/nv.3
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2014
+.Dd September 25, 2014
 .Dt NV 3
 .Os
 .Sh NAME
@@ -150,6 +150,8 @@
 .Fn nvlist_get_descriptor "const nvlist_t *nvl" "const char *name"
 .Ft "const void *"
 .Fn nvlist_get_binary "const nvlist_t *nvl" "const char *name" "size_t *sizep"
+.Ft "const nvlist_t *"
+.Fn nvlist_get_parent "const nvlist_t *nvl"
 .\"
 .Ft bool
 .Fn nvlist_take_bool "nvlist_t *nvl" "const char *name"
@@ -437,6 +439,10 @@ extension, which allows to provide default value for a missing element.
 The nvlist must not be in error state.
 .Pp
 The
+.Fn nvlist_get_parent
+function allows to obtain the parent nvlist from the nested nvlist.
+.Pp
+The
 .Fn nvlist_take_bool ,
 .Fn nvlist_take_number ,
 .Fn nvlist_take_string ,
diff --git a/lib/libnv/nv.h b/lib/libnv/nv.h
index e2d7030f665b..1b55be1fc2a0 100644
--- a/lib/libnv/nv.h
+++ b/lib/libnv/nv.h
@@ -83,6 +83,8 @@ nvlist_t *nvlist_xfer(int sock, nvlist_t *nvl);
 
 const char *nvlist_next(const nvlist_t *nvl, int *typep, void **cookiep);
 
+const nvlist_t *nvlist_get_parent(const nvlist_t *nvl);
+
 /*
  * The nvlist_exists functions check if the given name (optionally of the given
  * type) exists on nvlist.
diff --git a/lib/libnv/nv_impl.h b/lib/libnv/nv_impl.h
index 32060061f413..3ed45b3c785d 100644
--- a/lib/libnv/nv_impl.h
+++ b/lib/libnv/nv_impl.h
@@ -39,6 +39,8 @@ struct nvpair;
 typedef struct nvpair nvpair_t;
 #endif
 
+#define	NV_TYPE_NVLIST_UP		255
+
 #define	NV_TYPE_FIRST		NV_TYPE_NULL
 #define	NV_TYPE_LAST		NV_TYPE_BINARY
 
@@ -55,6 +57,8 @@ void nvlist_add_nvpair(nvlist_t *nvl, const nvpair_t *nvp);
 
 void nvlist_move_nvpair(nvlist_t *nvl, nvpair_t *nvp);
 
+void nvlist_set_parent(nvlist_t *nvl, nvpair_t *parent);
+
 const nvpair_t *nvlist_get_nvpair(const nvlist_t *nvl, const char *name);
 
 nvpair_t *nvlist_take_nvpair(nvlist_t *nvl, const char *name);
diff --git a/lib/libnv/nvlist.c b/lib/libnv/nvlist.c
index 9534fea84d05..c7c3cb9a2862 100644
--- a/lib/libnv/nvlist.c
+++ b/lib/libnv/nvlist.c
@@ -73,10 +73,11 @@ __FBSDID("$FreeBSD$");
 
 #define	NVLIST_MAGIC	0x6e766c	/* "nvl" */
 struct nvlist {
-	int		nvl_magic;
-	int		nvl_error;
-	int		nvl_flags;
-	struct nvl_head	nvl_head;
+	int		 nvl_magic;
+	int		 nvl_error;
+	int		 nvl_flags;
+	nvpair_t	*nvl_parent;
+	struct nvl_head	 nvl_head;
 };
 
 #define	NVLIST_ASSERT(nvl)	do {					\
@@ -106,6 +107,7 @@ nvlist_create(int flags)
 	nvl = malloc(sizeof(*nvl));
 	nvl->nvl_error = 0;
 	nvl->nvl_flags = flags;
+	nvl->nvl_parent = NULL;
 	TAILQ_INIT(&nvl->nvl_head);
 	nvl->nvl_magic = NVLIST_MAGIC;
 
@@ -147,6 +149,36 @@ nvlist_error(const nvlist_t *nvl)
 	return (nvl->nvl_error);
 }
 
+nvpair_t *
+nvlist_get_nvpair_parent(const nvlist_t *nvl)
+{
+
+	NVLIST_ASSERT(nvl);
+
+	return (nvl->nvl_parent);
+}
+
+const nvlist_t *
+nvlist_get_parent(const nvlist_t *nvl)
+{
+
+	NVLIST_ASSERT(nvl);
+
+	if (nvl->nvl_parent == NULL)
+		return (NULL);
+
+	return (nvpair_nvlist(nvl->nvl_parent));
+}
+
+void
+nvlist_set_parent(nvlist_t *nvl, nvpair_t *parent)
+{
+
+	NVLIST_ASSERT(nvl);
+
+	nvl->nvl_parent = parent;
+}
+
 bool
 nvlist_empty(const nvlist_t *nvl)
 {
@@ -301,24 +333,34 @@ nvlist_clone(const nvlist_t *nvl)
 	return (newnvl);
 }
 
-/*
- * Dump content of nvlist.
- */
-static void
-nvlist_xdump(const nvlist_t *nvl, int fd, int level)
+static bool
+nvlist_dump_error_check(const nvlist_t *nvl, int fd, int level)
 {
-	nvpair_t *nvp;
-
-	PJDLOG_ASSERT(level < 3);
 
 	if (nvlist_error(nvl) != 0) {
 		dprintf(fd, "%*serror: %d\n", level * 4, "",
 		    nvlist_error(nvl));
-		return;
+		return (true);
 	}
 
-	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
-	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+	return (false);
+}
+
+/*
+ * Dump content of nvlist.
+ */
+void
+nvlist_dump(const nvlist_t *nvl, int fd)
+{
+	nvpair_t *nvp;
+	int level;
+
+	level = 0;
+	if (nvlist_dump_error_check(nvl, fd, level))
+		return;
+
+	nvp = nvlist_first_nvpair(nvl);
+	while (nvp != NULL) {
 		dprintf(fd, "%*s%s (%s):", level * 4, "", nvpair_name(nvp),
 		    nvpair_type_string(nvpair_type(nvp)));
 		switch (nvpair_type(nvp)) {
@@ -340,8 +382,14 @@ nvlist_xdump(const nvlist_t *nvl, int fd, int level)
 			break;
 		case NV_TYPE_NVLIST:
 			dprintf(fd, "\n");
-			nvlist_xdump(nvpair_get_nvlist(nvp), fd, level + 1);
-			break;
+			nvl = nvpair_get_nvlist(nvp);
+			if (nvlist_dump_error_check(nvl, fd, level + 1)) {
+				nvl = nvlist_get_parent(nvl);
+				break;
+			}
+			level += 1;
+			nvp = nvlist_first_nvpair(nvl);
+			continue;
 		case NV_TYPE_DESCRIPTOR:
 			dprintf(fd, " %d\n", nvpair_get_descriptor(nvp));
 			break;
@@ -361,16 +409,17 @@ nvlist_xdump(const nvlist_t *nvl, int fd, int level)
 		default:
 			PJDLOG_ABORT("Unknown type: %d.", nvpair_type(nvp));
 		}
+
+		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
+			nvp = nvlist_get_nvpair_parent(nvl);
+			if (nvp == NULL)
+				return;
+			nvl = nvlist_get_parent(nvl);
+			level --;
+		}
 	}
 }
 
-void
-nvlist_dump(const nvlist_t *nvl, int fd)
-{
-
-	nvlist_xdump(nvl, fd, 0);
-}
-
 void
 nvlist_fdump(const nvlist_t *nvl, FILE *fp)
 {
@@ -381,41 +430,44 @@ nvlist_fdump(const nvlist_t *nvl, FILE *fp)
 
 /*
  * The function obtains size of the nvlist after nvlist_pack().
- * Additional argument 'level' allows to track how deep are we as we obtain
- * size of the NV_TYPE_NVLIST elements using recursion. We allow at most
- * three levels of recursion.
  */
-static size_t
-nvlist_xsize(const nvlist_t *nvl, int level)
+size_t
+nvlist_size(const nvlist_t *nvl)
 {
 	const nvpair_t *nvp;
 	size_t size;
 
 	NVLIST_ASSERT(nvl);
 	PJDLOG_ASSERT(nvl->nvl_error == 0);
-	PJDLOG_ASSERT(level < 3);
 
 	size = sizeof(struct nvlist_header);
-	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
-	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+	nvp = nvlist_first_nvpair(nvl);
+	while (nvp != NULL) {
 		size += nvpair_header_size();
 		size += strlen(nvpair_name(nvp)) + 1;
-		if (nvpair_type(nvp) == NV_TYPE_NVLIST)
-			size += nvlist_xsize(nvpair_get_nvlist(nvp), level + 1);
-		else
+		if (nvpair_type(nvp) == NV_TYPE_NVLIST) {
+			size += sizeof(struct nvlist_header);
+			size += nvpair_header_size() + 1;
+			nvl = nvpair_get_nvlist(nvp);
+			PJDLOG_ASSERT(nvl->nvl_error == 0);
+			nvp = nvlist_first_nvpair(nvl);
+			continue;
+		} else {
 			size += nvpair_size(nvp);
+		}
+
+		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
+			nvp = nvlist_get_nvpair_parent(nvl);
+			if (nvp == NULL)
+				goto out;
+			nvl = nvlist_get_parent(nvl);
+		}
 	}
 
+out:
 	return (size);
 }
 
-size_t
-nvlist_size(const nvlist_t *nvl)
-{
-
-	return (nvlist_xsize(nvl, 0));
-}
-
 static int *
 nvlist_xdescriptors(const nvlist_t *nvl, int *descs, int level)
 {
@@ -541,15 +593,59 @@ nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep)
 
 	ptr = nvlist_pack_header(nvl, ptr, &left);
 
-	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
-	    nvp = nvlist_next_nvpair(nvl, nvp)) {
-		ptr = nvpair_pack(nvp, ptr, fdidxp, &left);
+	nvp = nvlist_first_nvpair(nvl);
+	while (nvp != NULL) {
+		NVPAIR_ASSERT(nvp);
+
+		nvpair_init_datasize(nvp);
+		ptr = nvpair_pack_header(nvp, ptr, &left);
 		if (ptr == NULL) {
 			free(buf);
 			return (NULL);
 		}
+		switch (nvpair_type(nvp)) {
+		case NV_TYPE_NULL:
+			ptr = nvpair_pack_null(nvp, ptr, &left);
+			break;
+		case NV_TYPE_BOOL:
+			ptr = nvpair_pack_bool(nvp, ptr, &left);
+			break;
+		case NV_TYPE_NUMBER:
+			ptr = nvpair_pack_number(nvp, ptr, &left);
+			break;
+		case NV_TYPE_STRING:
+			ptr = nvpair_pack_string(nvp, ptr, &left);
+			break;
+		case NV_TYPE_NVLIST:
+			nvl = nvpair_get_nvlist(nvp);
+			nvp = nvlist_first_nvpair(nvl);
+			ptr = nvlist_pack_header(nvl, ptr, &left);
+			continue;
+		case NV_TYPE_DESCRIPTOR:
+			ptr = nvpair_pack_descriptor(nvp, ptr, fdidxp, &left);
+			break;
+		case NV_TYPE_BINARY:
+			ptr = nvpair_pack_binary(nvp, ptr, &left);
+			break;
+		default:
+			PJDLOG_ABORT("Invalid type (%d).", nvpair_type(nvp));
+		}
+		if (ptr == NULL) {
+			free(buf);
+			return (NULL);
+		}
+		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
+			nvp = nvlist_get_nvpair_parent(nvl);
+			if (nvp == NULL)
+				goto out;
+			ptr = nvpair_pack_nvlist_up(ptr, &left);
+			if (ptr == NULL)
+				goto out;
+			nvl = nvlist_get_parent(nvl);
+		}
 	}
 
+out:
 	if (sizep != NULL)
 		*sizep = size;
 	return (buf);
@@ -600,7 +696,7 @@ nvlist_check_header(struct nvlist_header *nvlhdrp)
 	return (true);
 }
 
-static const unsigned char *
+const unsigned char *
 nvlist_unpack_header(nvlist_t *nvl, const unsigned char *ptr, size_t nfds,
     int *flagsp, size_t *leftp)
 {
@@ -642,7 +738,7 @@ nvlist_t *
 nvlist_xunpack(const void *buf, size_t size, const int *fds, size_t nfds)
 {
 	const unsigned char *ptr;
-	nvlist_t *nvl;
+	nvlist_t *nvl, *retnvl, *tmpnvl;
 	nvpair_t *nvp;
 	size_t left;
 	int flags;
@@ -650,7 +746,8 @@ nvlist_xunpack(const void *buf, size_t size, const int *fds, size_t nfds)
 	left = size;
 	ptr = buf;
 
-	nvl = nvlist_create(0);
+	tmpnvl = NULL;
+	nvl = retnvl = nvlist_create(0);
 	if (nvl == NULL)
 		goto failed;
 
@@ -659,15 +756,55 @@ nvlist_xunpack(const void *buf, size_t size, const int *fds, size_t nfds)
 		goto failed;
 
 	while (left > 0) {
-		ptr = nvpair_unpack(flags, ptr, &left, fds, nfds, &nvp);
+		ptr = nvpair_unpack(flags, ptr, &left, &nvp);
+		if (ptr == NULL)
+			goto failed;
+		switch (nvpair_type(nvp)) {
+		case NV_TYPE_NULL:
+			ptr = nvpair_unpack_null(flags, nvp, ptr, &left);
+			break;
+		case NV_TYPE_BOOL:
+			ptr = nvpair_unpack_bool(flags, nvp, ptr, &left);
+			break;
+		case NV_TYPE_NUMBER:
+			ptr = nvpair_unpack_number(flags, nvp, ptr, &left);
+			break;
+		case NV_TYPE_STRING:
+			ptr = nvpair_unpack_string(flags, nvp, ptr, &left);
+			break;
+		case NV_TYPE_NVLIST:
+			ptr = nvpair_unpack_nvlist(&flags, nvp, ptr, &left,
+			    nfds, &tmpnvl);
+			nvlist_set_parent(tmpnvl, nvp);
+			break;
+		case NV_TYPE_DESCRIPTOR:
+			ptr = nvpair_unpack_descriptor(flags, nvp, ptr, &left,
+			    fds, nfds);
+			break;
+		case NV_TYPE_BINARY:
+			ptr = nvpair_unpack_binary(flags, nvp, ptr, &left);
+			break;
+		case NV_TYPE_NVLIST_UP:
+			if (nvl->nvl_parent == NULL)
+				goto failed;
+			nvl = nvpair_nvlist(nvl->nvl_parent);
+			flags = nvl->nvl_flags;
+			continue;
+		default:
+			PJDLOG_ABORT("Invalid type (%d).", nvpair_type(nvp));
+		}
 		if (ptr == NULL)
 			goto failed;
 		nvlist_move_nvpair(nvl, nvp);
+		if (tmpnvl != NULL) {
+			nvl = tmpnvl;
+			tmpnvl = NULL;
+		}
 	}
 
-	return (nvl);
+	return (retnvl);
 failed:
-	nvlist_destroy(nvl);
+	nvlist_destroy(retnvl);
 	return (NULL);
 }
 
@@ -1331,7 +1468,8 @@ nvlist_movev_nvlist(nvlist_t *nvl, nvlist_t *value, const char *namefmt,
 	nvpair_t *nvp;
 
 	if (nvlist_error(nvl) != 0) {
-		nvlist_destroy(value);
+		if (value != NULL && nvlist_get_nvpair_parent(value) != NULL)
+			nvlist_destroy(value);
 		errno = nvlist_error(nvl);
 		return;
 	}
diff --git a/lib/libnv/nvlist_impl.h b/lib/libnv/nvlist_impl.h
index 43a7bb0a80c1..28894c07d2b7 100644
--- a/lib/libnv/nvlist_impl.h
+++ b/lib/libnv/nvlist_impl.h
@@ -40,4 +40,8 @@ void *nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep);
 nvlist_t *nvlist_xunpack(const void *buf, size_t size, const int *fds,
     size_t nfds);
 
+nvpair_t *nvlist_get_nvpair_parent(const nvlist_t *nvl);
+const unsigned char *nvlist_unpack_header(nvlist_t *nvl,
+    const unsigned char *ptr, size_t nfds, int *flagsp, size_t *leftp);
+
 #endif	/* !_NVLIST_IMPL_H_ */
diff --git a/lib/libnv/nvpair.c b/lib/libnv/nvpair.c
index 916444f76a60..8ff85388f8bb 100644
--- a/lib/libnv/nvpair.c
+++ b/lib/libnv/nvpair.c
@@ -67,7 +67,7 @@ struct nvpair {
 	int		 nvp_type;
 	uint64_t	 nvp_data;
 	size_t		 nvp_datasize;
-	nvlist_t	*nvp_list;	/* Used for sanity checks. */
+	nvlist_t	*nvp_list;
 	TAILQ_ENTRY(nvpair) nvp_next;
 };
 
@@ -90,7 +90,7 @@ nvpair_assert(const nvpair_t *nvp)
 	NVPAIR_ASSERT(nvp);
 }
 
-const nvlist_t *
+nvlist_t *
 nvpair_nvlist(const nvpair_t *nvp)
 {
 
@@ -131,6 +131,17 @@ nvpair_insert(struct nvl_head *head, nvpair_t *nvp, nvlist_t *nvl)
 	nvp->nvp_list = nvl;
 }
 
+static void
+nvpair_remove_nvlist(nvpair_t *nvp)
+{
+	nvlist_t *nvl;
+
+	/* XXX: DECONST is bad, mkay? */
+	nvl = __DECONST(nvlist_t *, nvpair_get_nvlist(nvp));
+	PJDLOG_ASSERT(nvl != NULL);
+	nvlist_set_parent(nvl, NULL);
+}
+
 void
 nvpair_remove(struct nvl_head *head, nvpair_t *nvp, const nvlist_t *nvl)
 {
@@ -138,6 +149,9 @@ nvpair_remove(struct nvl_head *head, nvpair_t *nvp, const nvlist_t *nvl)
 	NVPAIR_ASSERT(nvp);
 	PJDLOG_ASSERT(nvp->nvp_list == nvl);
 
+	if (nvpair_type(nvp) == NV_TYPE_NVLIST)
+		nvpair_remove_nvlist(nvp);
+
 	TAILQ_REMOVE(head, nvp, nvp_next);
 	nvp->nvp_list = NULL;
 }
@@ -201,7 +215,7 @@ nvpair_size(const nvpair_t *nvp)
 	return (nvp->nvp_datasize);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_header(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 {
 	struct nvpair_header nvphdr;
@@ -227,7 +241,7 @@ nvpair_pack_header(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_null(const nvpair_t *nvp, unsigned char *ptr,
     size_t *leftp __unused)
 {
@@ -238,7 +252,7 @@ nvpair_pack_null(const nvpair_t *nvp, unsigned char *ptr,
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_bool(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 {
 	uint8_t value;
@@ -256,7 +270,7 @@ nvpair_pack_bool(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_number(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 {
 	uint64_t value;
@@ -274,7 +288,7 @@ nvpair_pack_number(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_string(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 {
 
@@ -289,37 +303,31 @@ nvpair_pack_string(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 	return (ptr);
 }
 
-static unsigned char *
-nvpair_pack_nvlist(const nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
-    size_t *leftp)
+unsigned char *
+nvpair_pack_nvlist_up(unsigned char *ptr, size_t *leftp)
 {
-	unsigned char *data;
-	size_t size;
+	struct nvpair_header nvphdr;
+	size_t namesize;
+	const char *name = "";
 
-	NVPAIR_ASSERT(nvp);
-	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NVLIST);
+	namesize = 1;
+	nvphdr.nvph_type = NV_TYPE_NVLIST_UP;
+	nvphdr.nvph_namesize = namesize;
+	nvphdr.nvph_datasize = 0;
+	PJDLOG_ASSERT(*leftp >= sizeof(nvphdr));
+	memcpy(ptr, &nvphdr, sizeof(nvphdr));
+	ptr += sizeof(nvphdr);
+	*leftp -= sizeof(nvphdr);
 
-	if (nvp->nvp_datasize == 0)
-		return (ptr);
-
-	data = nvlist_xpack((const nvlist_t *)(intptr_t)nvp->nvp_data, fdidxp,
-	    &size);
-	if (data == NULL)
-		return (NULL);
-
-	PJDLOG_ASSERT(size == nvp->nvp_datasize);
-	PJDLOG_ASSERT(*leftp >= nvp->nvp_datasize);
-
-	memcpy(ptr, data, nvp->nvp_datasize);
-	free(data);
-
-	ptr += nvp->nvp_datasize;
-	*leftp -= nvp->nvp_datasize;
+	PJDLOG_ASSERT(*leftp >= namesize);
+	memcpy(ptr, name, namesize);
+	ptr += namesize;
+	*leftp -= namesize;
 
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_descriptor(const nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
     size_t *leftp)
 {
@@ -349,7 +357,7 @@ nvpair_pack_descriptor(const nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
 	return (ptr);
 }
 
-static unsigned char *
+unsigned char *
 nvpair_pack_binary(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 {
 
@@ -364,17 +372,12 @@ nvpair_pack_binary(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
 	return (ptr);
 }
 
-unsigned char *
-nvpair_pack(nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp, size_t *leftp)
+void
+nvpair_init_datasize(nvpair_t *nvp)
 {
 
 	NVPAIR_ASSERT(nvp);
 
-	/*
-	 * We have to update datasize for NV_TYPE_NVLIST on every pack,
-	 * so that proper datasize is placed into nvpair_header
-	 * during the nvpair_pack_header() call below.
-	 */
 	if (nvp->nvp_type == NV_TYPE_NVLIST) {
 		if (nvp->nvp_data == 0) {
 			nvp->nvp_datasize = 0;
@@ -383,41 +386,9 @@ nvpair_pack(nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp, size_t *leftp)
 			    nvlist_size((const nvlist_t *)(intptr_t)nvp->nvp_data);
 		}
 	}
-
-	ptr = nvpair_pack_header(nvp, ptr, leftp);
-	if (ptr == NULL)
-		return (NULL);
-
-	switch (nvp->nvp_type) {
-	case NV_TYPE_NULL:
-		ptr = nvpair_pack_null(nvp, ptr, leftp);
-		break;
-	case NV_TYPE_BOOL:
-		ptr = nvpair_pack_bool(nvp, ptr, leftp);
-		break;
-	case NV_TYPE_NUMBER:
-		ptr = nvpair_pack_number(nvp, ptr, leftp);
-		break;
-	case NV_TYPE_STRING:
-		ptr = nvpair_pack_string(nvp, ptr, leftp);
-		break;
-	case NV_TYPE_NVLIST:
-		ptr = nvpair_pack_nvlist(nvp, ptr, fdidxp, leftp);
-		break;
-	case NV_TYPE_DESCRIPTOR:
-		ptr = nvpair_pack_descriptor(nvp, ptr, fdidxp, leftp);
-		break;
-	case NV_TYPE_BINARY:
-		ptr = nvpair_pack_binary(nvp, ptr, leftp);
-		break;
-	default:
-		PJDLOG_ABORT("Invalid type (%d).", nvp->nvp_type);
-	}
-
-	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_header(int flags, nvpair_t *nvp, const unsigned char *ptr,
     size_t *leftp)
 {
@@ -434,8 +405,10 @@ nvpair_unpack_header(int flags, nvpair_t *nvp, const unsigned char *ptr,
 	if (nvphdr.nvph_type < NV_TYPE_FIRST)
 		goto failed;
 #endif
-	if (nvphdr.nvph_type > NV_TYPE_LAST)
+	if (nvphdr.nvph_type > NV_TYPE_LAST &&
+	    nvphdr.nvph_type != NV_TYPE_NVLIST_UP) {
 		goto failed;
+	}
 
 #if BYTE_ORDER == BIG_ENDIAN
 	if ((flags & NV_FLAG_BIG_ENDIAN) == 0) {
@@ -477,7 +450,7 @@ nvpair_unpack_header(int flags, nvpair_t *nvp, const unsigned char *ptr,
 	return (NULL);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_null(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
     size_t *leftp __unused)
 {
@@ -492,7 +465,7 @@ nvpair_unpack_null(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
 	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_bool(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
     size_t *leftp)
 {
@@ -523,9 +496,9 @@ nvpair_unpack_bool(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
 	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_number(int flags, nvpair_t *nvp, const unsigned char *ptr,
-    size_t *leftp)
+     size_t *leftp)
 {
 
 	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NUMBER);
@@ -549,7 +522,7 @@ nvpair_unpack_number(int flags, nvpair_t *nvp, const unsigned char *ptr,
 	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_string(int flags __unused, nvpair_t *nvp,
     const unsigned char *ptr, size_t *leftp)
 {
@@ -577,9 +550,9 @@ nvpair_unpack_string(int flags __unused, nvpair_t *nvp,
 	return (ptr);
 }
 
-static const unsigned char *
-nvpair_unpack_nvlist(int flags __unused, nvpair_t *nvp,
-    const unsigned char *ptr, size_t *leftp, const int *fds, size_t nfds)
+const unsigned char *
+nvpair_unpack_nvlist(int *flagsp, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp, size_t nfds, nvlist_t **child)
 {
 	nvlist_t *value;
 
@@ -590,19 +563,21 @@ nvpair_unpack_nvlist(int flags __unused, nvpair_t *nvp,
 		return (NULL);
 	}
 
-	value = nvlist_xunpack(ptr, nvp->nvp_datasize, fds, nfds);
+	value = nvlist_create(0);
 	if (value == NULL)
 		return (NULL);
 
-	nvp->nvp_data = (uint64_t)(uintptr_t)value;
+	ptr = nvlist_unpack_header(value, ptr, nfds, flagsp, leftp);
+	if (ptr == NULL)
+		return (NULL);
 
-	ptr += nvp->nvp_datasize;
-	*leftp -= nvp->nvp_datasize;
+	nvp->nvp_data = (uint64_t)(uintptr_t)value;
+	*child = value;
 
 	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_descriptor(int flags, nvpair_t *nvp, const unsigned char *ptr,
     size_t *leftp, const int *fds, size_t nfds)
 {
@@ -642,7 +617,7 @@ nvpair_unpack_descriptor(int flags, nvpair_t *nvp, const unsigned char *ptr,
 	return (ptr);
 }
 
-static const unsigned char *
+const unsigned char *
 nvpair_unpack_binary(int flags __unused, nvpair_t *nvp,
     const unsigned char *ptr, size_t *leftp)
 {
@@ -670,7 +645,7 @@ nvpair_unpack_binary(int flags __unused, nvpair_t *nvp,
 
 const unsigned char *
 nvpair_unpack(int flags, const unsigned char *ptr, size_t *leftp,
-    const int *fds, size_t nfds, nvpair_t **nvpp)
+    nvpair_t **nvpp)
 {
 	nvpair_t *nvp, *tmp;
 
@@ -686,40 +661,10 @@ nvpair_unpack(int flags, const unsigned char *ptr, size_t *leftp,
 	if (tmp == NULL)
 		goto failed;
 	nvp = tmp;
+
 	/* Update nvp_name after realloc(). */
 	nvp->nvp_name = (char *)(nvp + 1);
-
-	switch (nvp->nvp_type) {
-	case NV_TYPE_NULL:
-		ptr = nvpair_unpack_null(flags, nvp, ptr, leftp);
-		break;
-	case NV_TYPE_BOOL:
-		ptr = nvpair_unpack_bool(flags, nvp, ptr, leftp);
-		break;
-	case NV_TYPE_NUMBER:
-		ptr = nvpair_unpack_number(flags, nvp, ptr, leftp);
-		break;
-	case NV_TYPE_STRING:
-		ptr = nvpair_unpack_string(flags, nvp, ptr, leftp);
-		break;
-	case NV_TYPE_NVLIST:
-		ptr = nvpair_unpack_nvlist(flags, nvp, ptr, leftp, fds,
-		    nfds);
-		break;
-	case NV_TYPE_DESCRIPTOR:
-		ptr = nvpair_unpack_descriptor(flags, nvp, ptr, leftp, fds,
-		    nfds);
-		break;
-	case NV_TYPE_BINARY:
-		ptr = nvpair_unpack_binary(flags, nvp, ptr, leftp);
-		break;
-	default:
-		PJDLOG_ABORT("Invalid type (%d).", nvp->nvp_type);
-	}
-
-	if (ptr == NULL)
-		goto failed;
-
+	nvp->nvp_data = 0x00;
 	nvp->nvp_magic = NVPAIR_MAGIC;
 	*nvpp = nvp;
 	return (ptr);
@@ -1018,6 +963,8 @@ nvpair_createv_nvlist(const nvlist_t *value, const char *namefmt,
 	    namefmt, nameap);
 	if (nvp == NULL)
 		nvlist_destroy(nvl);
+	else
+		nvlist_set_parent(nvl, nvp);
 
 	return (nvp);
 }
@@ -1172,7 +1119,7 @@ nvpair_movev_nvlist(nvlist_t *value, const char *namefmt, va_list nameap)
 {
 	nvpair_t *nvp;
 
-	if (value == NULL) {
+	if (value == NULL || nvlist_get_nvpair_parent(value) != NULL) {
 		errno = EINVAL;
 		return (NULL);
 	}
@@ -1181,6 +1128,8 @@ nvpair_movev_nvlist(nvlist_t *value, const char *namefmt, va_list nameap)
 	    namefmt, nameap);
 	if (nvp == NULL)
 		nvlist_destroy(value);
+	else
+		nvlist_set_parent(value, nvp);
 
 	return (nvp);
 }
diff --git a/lib/libnv/nvpair_impl.h b/lib/libnv/nvpair_impl.h
index aa4046c2c3b8..70dbbc09ad99 100644
--- a/lib/libnv/nvpair_impl.h
+++ b/lib/libnv/nvpair_impl.h
@@ -41,18 +41,52 @@
 TAILQ_HEAD(nvl_head, nvpair);
 
 void nvpair_assert(const nvpair_t *nvp);
-const nvlist_t *nvpair_nvlist(const nvpair_t *nvp);
+nvlist_t *nvpair_nvlist(const nvpair_t *nvp);
 nvpair_t *nvpair_next(const nvpair_t *nvp);
 nvpair_t *nvpair_prev(const nvpair_t *nvp);
 void nvpair_insert(struct nvl_head *head, nvpair_t *nvp, nvlist_t *nvl);
 void nvpair_remove(struct nvl_head *head, nvpair_t *nvp, const nvlist_t *nvl);
 size_t nvpair_header_size(void);
 size_t nvpair_size(const nvpair_t *nvp);
-unsigned char *nvpair_pack(nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
-    size_t *leftp);
 const unsigned char *nvpair_unpack(int flags, const unsigned char *ptr,
-    size_t *leftp, const int *fds, size_t nfds, nvpair_t **nvpp);
+    size_t *leftp, nvpair_t **nvpp);
 void nvpair_free_structure(nvpair_t *nvp);
+void nvpair_init_datasize(nvpair_t *nvp);
 const char *nvpair_type_string(int type);
 
+/* Pack functions. */
+unsigned char *nvpair_pack_header(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_null(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_bool(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_number(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_string(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_descriptor(const nvpair_t *nvp, unsigned char *ptr,
+    int64_t *fdidxp, size_t *leftp);
+unsigned char *nvpair_pack_binary(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp);
+unsigned char *nvpair_pack_nvlist_up(unsigned char *ptr, size_t *leftp);
+
+/* Unpack data functions. */
+const unsigned char *nvpair_unpack_header(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+const unsigned char *nvpair_unpack_null(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+const unsigned char *nvpair_unpack_bool(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+const unsigned char *nvpair_unpack_number(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+const unsigned char *nvpair_unpack_string(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+const unsigned char *nvpair_unpack_nvlist(int *flagsp, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp, size_t nvlist, nvlist_t **child);
+const unsigned char *nvpair_unpack_descriptor(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp, const int *fds, size_t nfds);
+const unsigned char *nvpair_unpack_binary(int flags, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp);
+
 #endif	/* !_NVPAIR_IMPL_H_ */
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 7b6c9adba76b..f6c90633723d 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -66,6 +66,7 @@ SRCS=	openpam_asprintf.c \
 	openpam_straddch.c \
 	openpam_strlcat.c \
 	openpam_strlcpy.c \
+	openpam_strlset.c \
 	openpam_subst.c \
 	openpam_ttyconv.c \
 	openpam_vasprintf.c \
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c
index 945d5eb913a7..fe16662dd722 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.c
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.c
@@ -79,20 +79,27 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
 
 	gethostname(hostname, sizeof hostname);
 
-	if (rhost == NULL || *(const char *)rhost == '\0') {
-		PAM_LOG("Checking login.access for user %s on tty %s",
-		    (const char *)user, (const char *)tty);
-		if (login_access(user, tty) != 0)
-			return (PAM_SUCCESS);
-		PAM_VERBOSE_ERROR("%s is not allowed to log in on %s",
-		    user, tty);
-	} else {
+	if (rhost != NULL && *(const char *)rhost != '\0') {
 		PAM_LOG("Checking login.access for user %s from host %s",
 		    (const char *)user, (const char *)rhost);
 		if (login_access(user, rhost) != 0)
 			return (PAM_SUCCESS);
 		PAM_VERBOSE_ERROR("%s is not allowed to log in from %s",
-		    user, rhost);
+		    (const char *)user, (const char *)rhost);
+	} else if (tty != NULL && *(const char *)tty != '\0') {
+		PAM_LOG("Checking login.access for user %s on tty %s",
+		    (const char *)user, (const char *)tty);
+		if (login_access(user, tty) != 0)
+			return (PAM_SUCCESS);
+		PAM_VERBOSE_ERROR("%s is not allowed to log in on %s",
+		    (const char *)user, (const char *)tty);
+	} else {
+		PAM_LOG("Checking login.access for user %s",
+		    (const char *)user);
+		if (login_access(user, "***unknown***") != 0)
+			return (PAM_SUCCESS);
+		PAM_VERBOSE_ERROR("%s is not allowed to log in",
+		    (const char *)user);
 	}
 
 	return (PAM_AUTH_ERR);
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index dafe10df7134..8a0f4b2a702c 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -25,8 +25,23 @@ LDADD+=		-lsupc++
 DPADD+=		${LIBSTDCPLUSPLUS}
 .endif
 
-SHLIB_MAJOR=	2
+.if ${MK_CDDL} != "no"
+LDADD+=		-lctf
+DPADD+=		${LIBCTF}
+IGNORE_PRAGMA=	YES
+CFLAGS+=	-I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
+		-I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../sys/cddl/compat/opensolaris
+.else
+CFLAGS+=	-DNO_CTF
+.endif
+
+SHLIB_MAJOR=	3
 
 MAN=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libproc/libproc.h b/lib/libproc/libproc.h
index be77e4b59214..5d81c2bf4505 100644
--- a/lib/libproc/libproc.h
+++ b/lib/libproc/libproc.h
@@ -37,6 +37,7 @@
 #include <rtld_db.h>
 #include <limits.h>
 
+struct ctf_file;
 struct proc_handle;
 
 typedef void (*proc_child_func)(void *);
@@ -67,6 +68,11 @@ typedef struct prmap {
 #define	MA_NOCOREDUMP	0x20
 } prmap_t;
 
+typedef struct prsyminfo {
+	u_int		prs_lmid;	/* Map id. */
+	u_int		prs_id;		/* Symbol id. */
+} prsyminfo_t;
+
 typedef int proc_map_f(void *, const prmap_t *, const char *);
 typedef int proc_sym_f(void *, const GElf_Sym *, const char *);
 
@@ -125,7 +131,9 @@ int	proc_create(const char *, char * const *, proc_child_func *, void *,
 	    struct proc_handle **);
 int	proc_detach(struct proc_handle *, int);
 int	proc_getflags(struct proc_handle *);
-int	proc_name2sym(struct proc_handle *, const char *, const char *, GElf_Sym *);
+int	proc_name2sym(struct proc_handle *, const char *, const char *,
+	    GElf_Sym *, prsyminfo_t *);
+struct ctf_file *proc_name2ctf(struct proc_handle *, const char *);
 int	proc_setflags(struct proc_handle *, int);
 int	proc_state(struct proc_handle *);
 pid_t	proc_getpid(struct proc_handle *);
@@ -133,8 +141,7 @@ int	proc_wstatus(struct proc_handle *);
 int	proc_getwstat(struct proc_handle *);
 char *	proc_signame(int, char *, size_t);
 int	proc_read(struct proc_handle *, void *, size_t, size_t);
-const lwpstatus_t *
-	proc_getlwpstatus(struct proc_handle *);
+const lwpstatus_t *proc_getlwpstatus(struct proc_handle *);
 void	proc_free(struct proc_handle *);
 rd_agent_t *proc_rdagent(struct proc_handle *);
 void	proc_updatesyms(struct proc_handle *);
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c
index aa879ec128e1..766ff73446e2 100644
--- a/lib/libproc/proc_sym.c
+++ b/lib/libproc/proc_sym.c
@@ -26,26 +26,37 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
+#ifndef NO_CTF
+#include <sys/ctf.h>
+#include <sys/ctf_api.h>
+#endif
 #include <sys/user.h>
 
 #include <assert.h>
 #include <err.h>
-#include <stdio.h>
-#include <libgen.h>
-#include <string.h>
-#include <stdlib.h>
 #include <fcntl.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifndef NO_CTF
+#include <libctf.h>
+#endif
 #include <libutil.h>
 
 #include "_libproc.h"
 
+#ifdef NO_CTF
+typedef struct ctf_file ctf_file_t;
+#endif
+
 #ifndef NO_CXA_DEMANGLE
 extern char *__cxa_demangle(const char *, char *, size_t *, int *);
 #endif /* NO_CXA_DEMANGLE */
@@ -228,22 +239,56 @@ proc_addr2map(struct proc_handle *p, uintptr_t addr)
 	return (NULL);
 }
 
+/*
+ * Look up the symbol at addr, returning a copy of the symbol and its name.
+ */
+static int
+lookup_addr(Elf *e, Elf_Scn *scn, u_long stridx, uintptr_t off, uintptr_t addr,
+    const char **name, GElf_Sym *symcopy)
+{
+	GElf_Sym sym;
+	Elf_Data *data;
+	const char *s;
+	uint64_t rsym;
+	int i;
+
+	if ((data = elf_getdata(scn, NULL)) == NULL) {
+		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
+		return (1);
+	}
+	for (i = 0; gelf_getsym(data, i, &sym) != NULL; i++) {
+		rsym = off + sym.st_value;
+		if (addr >= rsym && addr < rsym + sym.st_size) {
+			s = elf_strptr(e, stridx, sym.st_name);
+			if (s != NULL) {
+				*name = s;
+				memcpy(symcopy, &sym, sizeof(*symcopy));
+				/*
+				 * DTrace expects the st_value to contain
+				 * only the address relative to the start of
+				 * the function.
+				 */
+				symcopy->st_value = rsym;
+				return (0);
+			}
+		}
+	}
+	return (1);
+}
+
 int
 proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
     size_t namesz, GElf_Sym *symcopy)
 {
+	GElf_Ehdr ehdr;
+	GElf_Shdr shdr;
 	Elf *e;
 	Elf_Scn *scn, *dynsymscn = NULL, *symtabscn = NULL;
-	Elf_Data *data;
-	GElf_Shdr shdr;
-	GElf_Sym sym;
-	GElf_Ehdr ehdr;
-	int fd, error = -1;
-	size_t i;
-	uint64_t rsym;
 	prmap_t *map;
-	char *s;
-	unsigned long symtabstridx = 0, dynsymstridx = 0;
+	const char *s;
+	uintptr_t off;
+	u_long symtabstridx = 0, dynsymstridx = 0;
+	int fd, error = -1;
 
 	if ((map = proc_addr2map(p, addr)) == NULL)
 		return (-1);
@@ -259,6 +304,7 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 		DPRINTFX("ERROR: gelf_getehdr() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
+
 	/*
 	 * Find the index of the STRTAB and SYMTAB sections to locate
 	 * symbol names.
@@ -275,80 +321,25 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 			dynsymscn = scn;
 			dynsymstridx = shdr.sh_link;
 			break;
-		default:
-			break;
 		}
 	}
+
+	off = ehdr.e_type == ET_EXEC ? 0 : map->pr_vaddr;
+
 	/*
-	 * Iterate over the Dynamic Symbols table to find the symbol.
-	 * Then look up the string name in STRTAB (.dynstr)
+	 * First look up the symbol in the dynsymtab, and fall back to the
+	 * symtab if the lookup fails.
 	 */
-	if ((data = elf_getdata(dynsymscn, NULL)) == NULL) {
-		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
-		goto symtab;
-	}
-	i = 0;
-	while (gelf_getsym(data, i++, &sym) != NULL) {
-		/*
-		 * Calculate the address mapped to the virtual memory
-		 * by rtld.
-		 */
-		if (ehdr.e_type != ET_EXEC)
-			rsym = map->pr_vaddr + sym.st_value;
-		else
-			rsym = sym.st_value;
-		if (addr >= rsym && addr < rsym + sym.st_size) {
-			s = elf_strptr(e, dynsymstridx, sym.st_name);
-			if (s) {
-				demangle(s, name, namesz);
-				memcpy(symcopy, &sym, sizeof(sym));
-				/*
-				 * DTrace expects the st_value to contain
-				 * only the address relative to the start of
-				 * the function.
-				 */
-				symcopy->st_value = rsym;
-				error = 0;
-				goto out;
-			}
-		}
-	}
-symtab:
-	/*
-	 * Iterate over the Symbols Table to find the symbol.
-	 * Then look up the string name in STRTAB (.dynstr)
-	 */
-	if ((data = elf_getdata(symtabscn, NULL)) == NULL) {
-		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
-		goto err2;
-	}
-	i = 0;
-	while (gelf_getsym(data, i++, &sym) != NULL) {
-		/*
-		 * Calculate the address mapped to the virtual memory
-		 * by rtld.
-		 */
-		if (ehdr.e_type != ET_EXEC)
-			rsym = map->pr_vaddr + sym.st_value;
-		else
-			rsym = sym.st_value;
-		if (addr >= rsym && addr < rsym + sym.st_size) {
-			s = elf_strptr(e, symtabstridx, sym.st_name);
-			if (s) {
-				demangle(s, name, namesz);
-				memcpy(symcopy, &sym, sizeof(sym));
-				/*
-				 * DTrace expects the st_value to contain
-				 * only the address relative to the start of
-				 * the function.
-				 */
-				symcopy->st_value = rsym;
-				error = 0;
-				goto out;
-			}
-		}
-	}
+	error = lookup_addr(e, dynsymscn, dynsymstridx, off, addr, &s, symcopy);
+	if (error == 0)
+		goto out;
+
+	error = lookup_addr(e, symtabscn, symtabstridx, off, addr, &s, symcopy);
+	if (error == 0)
+		goto out;
+
 out:
+	demangle(s, name, namesz);
 err2:
 	elf_end(e);
 err1:
@@ -363,7 +354,7 @@ proc_name2map(struct proc_handle *p, const char *name)
 {
 	size_t i;
 	int cnt;
-	prmap_t *map;
+	prmap_t *map = NULL;
 	char tmppath[MAXPATHLEN];
 	struct kinfo_vmentry *kves, *kve;
 	rd_loadobj_t *rdl;
@@ -382,47 +373,68 @@ proc_name2map(struct proc_handle *p, const char *name)
 			basename_r(kve->kve_path, tmppath);
 			if (strcmp(tmppath, name) == 0) {
 				map = proc_addr2map(p, kve->kve_start);
-				free(kves);
-				return (map);
+				break;
 			}
 		}
 		free(kves);
-		return (NULL);
-	}
-	if ((name == NULL || strcmp(name, "a.out") == 0) &&
-	    p->rdexec != NULL) {
+	} else
+		for (i = 0; i < p->nobjs; i++) {
+			rdl = &p->rdobjs[i];
+			basename_r(rdl->rdl_path, tmppath);
+			if (strcmp(tmppath, name) == 0) {
+				if ((map = malloc(sizeof(*map))) == NULL)
+					return (NULL);
+				proc_rdl2prmap(rdl, map);
+				break;
+			}
+		}
+
+	if (map == NULL && strcmp(name, "a.out") == 0 && p->rdexec != NULL)
 		map = proc_addr2map(p, p->rdexec->rdl_saddr);
-		return (map);
+
+	return (map);
+}
+
+/*
+ * Look up the symbol with the given name and return a copy of it.
+ */
+static int
+lookup_name(Elf *e, Elf_Scn *scn, u_long stridx, const char *symbol,
+    GElf_Sym *symcopy, prsyminfo_t *si)
+{
+	GElf_Sym sym;
+	Elf_Data *data;
+	char *s;
+	int i;
+
+	if ((data = elf_getdata(scn, NULL)) == NULL) {
+		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
+		return (1);
 	}
-	for (i = 0; i < p->nobjs; i++) {
-		rdl = &p->rdobjs[i];
-		basename_r(rdl->rdl_path, tmppath);
-		if (strcmp(tmppath, name) == 0) {
-			if ((map = malloc(sizeof(*map))) == NULL)
-				return (NULL);
-			proc_rdl2prmap(rdl, map);
-			return (map);
+	for (i = 0; gelf_getsym(data, i, &sym) != NULL; i++) {
+		s = elf_strptr(e, stridx, sym.st_name);
+		if (s != NULL && strcmp(s, symbol) == 0) {
+			memcpy(symcopy, &sym, sizeof(*symcopy));
+			if (si != NULL)
+				si->prs_id = i;
+			return (0);
 		}
 	}
-
-	return (NULL);
+	return (1);
 }
 
 int
 proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
-    GElf_Sym *symcopy)
+    GElf_Sym *symcopy, prsyminfo_t *si)
 {
 	Elf *e;
 	Elf_Scn *scn, *dynsymscn = NULL, *symtabscn = NULL;
-	Elf_Data *data;
 	GElf_Shdr shdr;
-	GElf_Sym sym;
 	GElf_Ehdr ehdr;
-	int fd, error = -1;
-	size_t i;
 	prmap_t *map;
-	char *s;
-	unsigned long symtabstridx = 0, dynsymstridx = 0;
+	uintptr_t off;
+	u_long symtabstridx = 0, dynsymstridx = 0;
+	int fd, error = -1;
 
 	if ((map = proc_name2map(p, object)) == NULL) {
 		DPRINTFX("ERROR: couldn't find object %s", object);
@@ -456,46 +468,25 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 			dynsymscn = scn;
 			dynsymstridx = shdr.sh_link;
 			break;
-		default:
-			break;
 		}
 	}
+
 	/*
-	 * Iterate over the Dynamic Symbols table to find the symbol.
-	 * Then look up the string name in STRTAB (.dynstr)
+	 * First look up the symbol in the dynsymtab, and fall back to the
+	 * symtab if the lookup fails.
 	 */
-	if ((data = elf_getdata(dynsymscn, NULL))) {
-		i = 0;
-		while (gelf_getsym(data, i++, &sym) != NULL) {
-			s = elf_strptr(e, dynsymstridx, sym.st_name);
-			if (s && strcmp(s, symbol) == 0) {
-				memcpy(symcopy, &sym, sizeof(sym));
-				if (ehdr.e_type != ET_EXEC)
-					symcopy->st_value += map->pr_vaddr;
-				error = 0;
-				goto out;
-			}
-		}
-	}
-	/*
-	 * Iterate over the Symbols Table to find the symbol.
-	 * Then look up the string name in STRTAB (.dynstr)
-	 */
-	if ((data = elf_getdata(symtabscn, NULL))) {
-		i = 0;
-		while (gelf_getsym(data, i++, &sym) != NULL) {
-			s = elf_strptr(e, symtabstridx, sym.st_name);
-			if (s && strcmp(s, symbol) == 0) {
-				memcpy(symcopy, &sym, sizeof(sym));
-				if (ehdr.e_type != ET_EXEC)
-					symcopy->st_value += map->pr_vaddr;
-				error = 0;
-				goto out;
-			}
-		}
-	}
+	error = lookup_name(e, dynsymscn, dynsymstridx, symbol, symcopy, si);
+	if (error == 0)
+		goto out;
+
+	error = lookup_name(e, symtabscn, symtabstridx, symbol, symcopy, si);
+	if (error == 0)
+		goto out;
+
 out:
-	DPRINTFX("found addr 0x%lx for %s", symcopy->st_value, symbol);
+	off = ehdr.e_type == ET_EXEC ? 0 : map->pr_vaddr;
+	symcopy->st_value += off;
+
 err2:
 	elf_end(e);
 err1:
@@ -506,6 +497,23 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 	return (error);
 }
 
+ctf_file_t *
+proc_name2ctf(struct proc_handle *p, const char *name)
+{
+#ifndef NO_CTF
+	prmap_t *map;
+	int error;
+
+	if ((map = proc_name2map(p, name)) == NULL)
+		return (NULL);
+
+	return (ctf_open(map->pr_mapname, &error));
+#else
+	(void)p;
+	(void)name;
+	return (NULL);
+#endif
+}
 
 int
 proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
@@ -543,7 +551,7 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 	scn = NULL;
 	while ((scn = elf_nextscn(e, scn)) != NULL) {
 		gelf_getshdr(scn, &shdr);
-		if (which == PR_SYMTAB && 
+		if (which == PR_SYMTAB &&
 		    shdr.sh_type == SHT_SYMTAB) {
 			foundscn = scn;
 			break;
@@ -560,8 +568,7 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
-	i = 0;
-	while (gelf_getsym(data, i++, &sym) != NULL) {
+	for (i = 0; gelf_getsym(data, i, &sym) != NULL; i++) {
 		if (GELF_ST_BIND(sym.st_info) == STB_LOCAL &&
 		    (mask & BIND_LOCAL) == 0)
 			continue;
diff --git a/lib/libproc/test/Makefile b/lib/libproc/test/Makefile
deleted file mode 100644
index e4d33f82ce44..000000000000
--- a/lib/libproc/test/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	t1-bkpt t2-name2map t3-name2sym
-
-.include <bsd.subdir.mk>
diff --git a/lib/libproc/test/t1-bkpt/Makefile b/lib/libproc/test/t1-bkpt/Makefile
deleted file mode 100644
index eb5b37f94936..000000000000
--- a/lib/libproc/test/t1-bkpt/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=	t1-bkpt
-
-SRCS=	t1-bkpt.c
-
-LDADD=	-lproc -lelf -lrtld_db -lutil
-DPADD=	${LIBPROC} ${LIBELF}
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/lib/libproc/test/t2-name2map/Makefile b/lib/libproc/test/t2-name2map/Makefile
deleted file mode 100644
index 9002accf6904..000000000000
--- a/lib/libproc/test/t2-name2map/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=	t2-name2map
-
-SRCS=	t2-name2map.c
-
-LDADD=	-lproc -lelf -lrtld_db -lutil
-DPADD=	${LIBPROC} ${LIBELF}
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/lib/libproc/test/t3-name2sym/Makefile b/lib/libproc/test/t3-name2sym/Makefile
deleted file mode 100644
index 68e23c6199d9..000000000000
--- a/lib/libproc/test/t3-name2sym/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=	t3-name2sym
-
-SRCS=	t3-name2sym.c
-
-LDADD=	-lproc -lelf -lrtld_db -lutil
-DPADD=	${LIBPROC} ${LIBELF}
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile
new file mode 100644
index 000000000000..1f98467df24f
--- /dev/null
+++ b/lib/libproc/tests/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/lib/libproc
+
+ATF_TESTS_C+=	proc_test
+
+PROGS=		target_prog
+SRCS_target_prog=	target_prog.c
+BINDIR_target_prog=	${TESTSDIR}
+
+LDADD+=	-lelf -lproc -lrtld_db -lutil
+DPADD+=	${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL}
+
+# Ensure that symbols aren't stripped from the test program, as they're needed
+# for testing symbol lookup.
+STRIP=
+
+MAN=
+WARNS?=	6
+
+.include <bsd.test.mk>
diff --git a/lib/libproc/tests/proc_test.c b/lib/libproc/tests/proc_test.c
new file mode 100644
index 000000000000..0242b5b5ee96
--- /dev/null
+++ b/lib/libproc/tests/proc_test.c
@@ -0,0 +1,349 @@
+/*-
+ * Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <libgen.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <atf-c.h>
+#include <libelf.h>
+#include <libproc.h>
+
+static const char *aout_object = "a.out";
+static const char *ldelf_object = "ld-elf.so.1";
+static const char *target_prog_file = "target_prog";
+
+/*
+ * Run the test program. If the sig parameter is set to true, the test program
+ * will deliver SIGUSR1 to itself during execution.
+ */
+static struct proc_handle *
+start_prog(const struct atf_tc *tc, bool sig)
+{
+	char *argv[3];
+	struct proc_handle *phdl;
+	int error;
+
+	asprintf(&argv[0], "%s/%s", atf_tc_get_config_var(tc, "srcdir"),
+	    target_prog_file);
+	ATF_REQUIRE(argv[0] != NULL);
+
+	if (sig) {
+		argv[1] = strdup("-s");
+		argv[2] = NULL;
+	} else {
+		argv[1] = NULL;
+	}
+
+	error = proc_create(argv[0], argv, NULL, NULL, &phdl);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to run '%s'", target_prog_file);
+	ATF_REQUIRE(phdl != NULL);
+
+	free(argv[0]);
+	free(argv[1]);
+
+	return (phdl);
+}
+
+static void
+set_bkpt(struct proc_handle *phdl, uintptr_t addr, u_long *saved)
+{
+	int error;
+
+	error = proc_bkptset(phdl, addr, saved);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to set breakpoint at 0x%jx",
+	    (uintmax_t)addr);
+}
+
+static void
+remove_bkpt(struct proc_handle *phdl, uintptr_t addr, u_long val)
+{
+	int error;
+
+	error = proc_bkptdel(phdl, addr, val);
+	ATF_REQUIRE_EQ_MSG(error, 0,
+	    "failed to delete breakpoint at 0x%jx", (uintmax_t)addr);
+
+	error = proc_regset(phdl, REG_PC, addr);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to reset program counter");
+}
+
+/*
+ * Wait for the specified process to hit a breakpoint at the specified symbol.
+ */
+static void
+verify_bkpt(struct proc_handle *phdl, GElf_Sym *sym, const char *symname,
+    const char *mapname)
+{
+	char mapbname[MAXPATHLEN], *name;
+	GElf_Sym tsym;
+	prmap_t *map;
+	size_t namesz;
+	u_long addr;
+	int error, state;
+
+	state = proc_wstatus(phdl);
+	ATF_REQUIRE_EQ_MSG(state, PS_STOP, "process has state %d", state);
+
+	/* Get the program counter and decrement it. */
+	error = proc_regget(phdl, REG_PC, &addr);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to obtain PC for '%s'",
+	    target_prog_file);
+	proc_bkptregadj(&addr);
+
+	/*
+	 * Make sure the PC matches the expected value obtained from the symbol
+	 * definition we looked up earlier.
+	 */
+	ATF_CHECK_EQ_MSG(addr, sym->st_value,
+	    "program counter 0x%lx doesn't match expected value 0x%jx",
+	    addr, (uintmax_t)sym->st_value);
+
+	/*
+	 * Ensure we can look up the r_debug_state symbol using its starting
+	 * address and that the resulting symbol matches the one we found using
+	 * a name lookup.
+	 */
+	namesz = strlen(symname) + 1;
+	name = malloc(namesz);
+	ATF_REQUIRE(name != NULL);
+
+	error = proc_addr2sym(phdl, addr, name, namesz, &tsym);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to look up symbol at 0x%lx", addr);
+	ATF_REQUIRE_EQ(memcmp(sym, &tsym, sizeof(*sym)), 0);
+	ATF_REQUIRE_EQ(strcmp(symname, name), 0);
+	free(name);
+
+	map = proc_addr2map(phdl, addr);
+	ATF_REQUIRE_MSG(map != NULL, "failed to look up map for address 0x%lx",
+	    addr);
+	basename_r(map->pr_mapname, mapbname);
+	ATF_REQUIRE_EQ_MSG(strcmp(mapname, mapbname), 0,
+	    "expected map name '%s' doesn't match '%s'", mapname, mapbname);
+}
+
+ATF_TC(map_alias_obj2map);
+ATF_TC_HEAD(map_alias_obj2map, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Callers are supposed to be able to use \"a.out\" as an alias for "
+	    "the program executable. Make sure that proc_obj2map() handles "
+	    "this properly.");
+}
+ATF_TC_BODY(map_alias_obj2map, tc)
+{
+	struct proc_handle *phdl;
+	prmap_t *map1, *map2;
+
+	phdl = start_prog(tc, false);
+
+	/* Initialize the rtld_db handle. */
+	(void)proc_rdagent(phdl);
+
+	/* Ensure that "target_prog" and "a.out" return the same map. */
+	map1 = proc_obj2map(phdl, target_prog_file);
+	ATF_REQUIRE_MSG(map1 != NULL, "failed to look up map for '%s'",
+	    target_prog_file);
+	map2 = proc_obj2map(phdl, aout_object);
+	ATF_REQUIRE_MSG(map2 != NULL, "failed to look up map for '%s'",
+	    aout_object);
+	ATF_CHECK_EQ(strcmp(map1->pr_mapname, map2->pr_mapname), 0);
+
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	proc_free(phdl);
+}
+
+ATF_TC(map_alias_name2map);
+ATF_TC_HEAD(map_alias_name2map, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Callers are supposed to be able to use \"a.out\" as an alias for "
+	    "the program executable. Make sure that proc_name2map() handles "
+	    "this properly.");
+}
+ATF_TC_BODY(map_alias_name2map, tc)
+{
+	struct proc_handle *phdl;
+	prmap_t *map1, *map2;
+
+	phdl = start_prog(tc, false);
+
+	/* Initialize the rtld_db handle. */
+	(void)proc_rdagent(phdl);
+
+	/* Ensure that "target_prog" and "a.out" return the same map. */
+	map1 = proc_name2map(phdl, target_prog_file);
+	ATF_REQUIRE_MSG(map1 != NULL, "failed to look up map for '%s'",
+	    target_prog_file);
+	map2 = proc_name2map(phdl, aout_object);
+	ATF_REQUIRE_MSG(map2 != NULL, "failed to look up map for '%s'",
+	    aout_object);
+	ATF_CHECK_EQ(strcmp(map1->pr_mapname, map2->pr_mapname), 0);
+
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	proc_free(phdl);
+}
+
+ATF_TC(map_alias_name2sym);
+ATF_TC_HEAD(map_alias_name2sym, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Callers are supposed to be able to use \"a.out\" as an alias for "
+	    "the program executable. Make sure that proc_name2sym() handles "
+	    "this properly.");
+}
+ATF_TC_BODY(map_alias_name2sym, tc)
+{
+	GElf_Sym sym1, sym2;
+	prsyminfo_t si1, si2;
+	struct proc_handle *phdl;
+	int error;
+
+	phdl = start_prog(tc, false);
+
+	/* Initialize the rtld_db handle. */
+	(void)proc_rdagent(phdl);
+
+	/*
+	 * Make sure that "target_prog:main" and "a.out:main" return the same
+	 * symbol.
+	 */
+	error = proc_name2sym(phdl, target_prog_file, "main", &sym1, &si1);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to look up 'main' via %s",
+	    target_prog_file);
+	error = proc_name2sym(phdl, aout_object, "main", &sym2, &si2);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to look up 'main' via %s",
+	    aout_object);
+
+	ATF_CHECK_EQ(memcmp(&sym1, &sym2, sizeof(sym1)), 0);
+	ATF_CHECK_EQ(si1.prs_id, si2.prs_id);
+
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	proc_free(phdl);
+}
+
+ATF_TC(symbol_lookup);
+ATF_TC_HEAD(symbol_lookup, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Look up a couple of well-known symbols in the test program, place "
+	    "breakpoints on them, and verify that we hit the breakpoints. Also "
+	    "make sure that we can use the breakpoint address to look up the "
+	    "corresponding symbol.");
+}
+ATF_TC_BODY(symbol_lookup, tc)
+{
+	GElf_Sym main_sym, r_debug_state_sym;
+	struct proc_handle *phdl;
+	u_long saved;
+	int error;
+
+	phdl = start_prog(tc, false);
+
+	error = proc_name2sym(phdl, target_prog_file, "main", &main_sym, NULL);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to look up 'main'");
+
+	error = proc_name2sym(phdl, ldelf_object, "r_debug_state",
+	    &r_debug_state_sym, NULL);
+	ATF_REQUIRE_EQ_MSG(error, 0, "failed to look up 'r_debug_state'");
+
+	set_bkpt(phdl, r_debug_state_sym.st_value, &saved);
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+	verify_bkpt(phdl, &r_debug_state_sym, "r_debug_state", ldelf_object);
+	remove_bkpt(phdl, r_debug_state_sym.st_value, saved);
+
+	set_bkpt(phdl, main_sym.st_value, &saved);
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+	verify_bkpt(phdl, &main_sym, "main", target_prog_file);
+	remove_bkpt(phdl, main_sym.st_value, saved);
+
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	proc_free(phdl);
+}
+
+ATF_TC(signal_forward);
+ATF_TC_HEAD(signal_forward, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Run the test program in a mode which causes it to send a signal "
+	    "to itself. Make sure that we intercept the signal and that "
+	    "proc_continue() forwards it to the process.");
+}
+ATF_TC_BODY(signal_forward, tc)
+{
+	struct proc_handle *phdl;
+	int state, status;
+
+	phdl = start_prog(tc, true);
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	/* The process should have been interrupted by a signal. */
+	state = proc_wstatus(phdl);
+	ATF_REQUIRE_EQ_MSG(state, PS_STOP, "process has unexpected state %d",
+	    state);
+
+	/* Continue execution and allow the signal to be delivered. */
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	/*
+	 * Make sure the process exited with status 0. If it didn't receive the
+	 * SIGUSR1 that it sent to itself, it'll exit with a non-zero exit
+	 * status, causing the test to fail.
+	 */
+	state = proc_wstatus(phdl);
+	ATF_REQUIRE_EQ_MSG(state, PS_UNDEAD, "process has unexpected state %d",
+	    state);
+
+	status = proc_getwstat(phdl);
+	ATF_REQUIRE(status >= 0);
+	ATF_REQUIRE(WIFEXITED(status));
+	ATF_REQUIRE_EQ(WEXITSTATUS(status), 0);
+
+	proc_free(phdl);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, map_alias_obj2map);
+	ATF_TP_ADD_TC(tp, map_alias_name2map);
+	ATF_TP_ADD_TC(tp, map_alias_name2sym);
+	ATF_TP_ADD_TC(tp, symbol_lookup);
+	ATF_TP_ADD_TC(tp, signal_forward);
+
+	return (atf_no_error());
+}
diff --git a/lib/libproc/test/t3-name2sym/t3-name2sym.c b/lib/libproc/tests/target_prog.c
similarity index 55%
rename from lib/libproc/test/t3-name2sym/t3-name2sym.c
rename to lib/libproc/tests/target_prog.c
index 0be8653d4a49..1edf0ded6122 100644
--- a/lib/libproc/test/t3-name2sym/t3-name2sym.c
+++ b/lib/libproc/tests/target_prog.c
@@ -1,51 +1,59 @@
-/*
- * Copyright (c) 2010 The FreeBSD Foundation 
- * All rights reserved. 
- * 
- * This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation. 
- *  
- * 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 AUTHOR 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 AUTHOR 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. 
+/*-
+ * Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org>
+ * All rights reserved.
  *
- * $FreeBSD$
+ * 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 AUTHOR 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 AUTHOR 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.
  */
-#include <sys/types.h>
-#include <assert.h>
-#include <stdio.h>
-#include <libproc.h>
-#include <gelf.h>
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <err.h>
+#include <signal.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
+static volatile sig_atomic_t saw;
+
+static void
+usr1(int sig __unused)
+{
+
+	saw = 1;
+}
 
 int
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
-	prmap_t *map = NULL;
-	struct proc_handle *phdl;
-	GElf_Sym sym;
 
-	proc_create("./t3-name2sym", argv, NULL, NULL, &phdl);
-	memset(&sym, 0, sizeof(sym));
-	assert(proc_name2sym(phdl, "ld-elf.so.1", "r_debug_state", &sym) == 0);
-	printf("0x%lx\n", sym.st_value);
-	assert(proc_name2sym(phdl, "t3-name2sym", "main", &sym) == 0);
-	printf("0x%lx\n", sym.st_value);
+	if (argc == 1)
+		return (EXIT_SUCCESS);
+	if (argc == 2 && strcmp(argv[1], "-s") == 0) {
+		if (signal(SIGUSR1, usr1) == SIG_ERR)
+			err(1, "signal");
+		if (kill(getpid(), SIGUSR1) != 0)
+			err(1, "kill");
+		return (saw == 1 ? EXIT_SUCCESS : EXIT_FAILURE);
+	}
+	return (EXIT_FAILURE);
 }
diff --git a/lib/librtld_db/rtld_db.c b/lib/librtld_db/rtld_db.c
index 2d1f6e697fac..cd4377e12904 100644
--- a/lib/librtld_db/rtld_db.c
+++ b/lib/librtld_db/rtld_db.c
@@ -237,14 +237,14 @@ rd_reset(rd_agent_t *rdap)
 	GElf_Sym sym;
 
 	if (proc_name2sym(rdap->rda_php, "ld-elf.so.1", "r_debug_state",
-	    &sym) < 0)
+	    &sym, NULL) < 0)
 		return (RD_ERR);
 	DPRINTF("found r_debug_state at 0x%lx\n", (unsigned long)sym.st_value);
 	rdap->rda_preinit_addr = sym.st_value;
 	rdap->rda_dlactivity_addr = sym.st_value;
 
 	if (proc_name2sym(rdap->rda_php, "ld-elf.so.1", "_r_debug_postinit",
-	    &sym) < 0)
+	    &sym, NULL) < 0)
 		return (RD_ERR);
 	DPRINTF("found _r_debug_postinit at 0x%lx\n",
 	    (unsigned long)sym.st_value);
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index ebf5c300811e..e57407fb4094 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -64,9 +64,6 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${.CURDIR}/../libc/arm/gen
 
-.if ${MK_ARM_EABI} == "no"
-SRCS+= divsi3.S
-.else
 # Compiler support functions
 .PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
 # __clzsi2 and ctzsi2 for various builtin functions
@@ -78,7 +75,6 @@ SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
 .PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/
 SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
-.endif
 
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3
index bfbebec340bd..4b636ce3fb6c 100644
--- a/lib/libthr/libthr.3
+++ b/lib/libthr/libthr.3
@@ -1,6 +1,11 @@
 .\" Copyright (c) 2005 Robert N. M. Watson
+.\" Copyright (c) 2014 The FreeBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
+.\" Part of this documentation was written by
+.\" Konstantin Belousov <kib@FreeBSD.org> under sponsorship
+.\" from the FreeBSD Foundation.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -24,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 19, 2007
+.Dd September 26, 2014
 .Dt LIBTHR 3
 .Os
 .Sh NAME
@@ -45,8 +50,222 @@ has been optimized for use by applications expecting system scope thread
 semantics, and can provide significant performance improvements
 compared to
 .Lb libkse .
+.Pp
+The library is tightly integrated with the run-time link editor
+.Xr ld-elf.so.1 1
+and
+.Lb libc ;
+all three components must be built from the same source tree.
+Mixing
+.Li libc
+and
+.Nm
+libraries from different versions of
+.Fx
+is not supported.
+The run-time linker
+.Xr ld-elf.so.1 1
+has some code to ensure backward-compatibility with older versions of
+.Nm .
+.Pp
+The man page documents the quirks and tunables of the
+.Nm .
+When linking with
+.Li -lpthread ,
+the run-time dependency
+.Li libthr.so.3
+is recorded in the produced object.
+.Sh MUTEX ACQUISITION
+A locked mutex (see
+.Xr pthread_mutex_lock 3 )
+is represented by a volatile variable of type
+.Dv lwpid_t ,
+which records the global system identifier of the thread
+owning the lock.
+.Nm
+performs a contested mutex acquisition in three stages, each of which
+is more resource-consuming than the previous.
+The first two stages are only applied for a mutex of
+.Dv PTHREAD_MUTEX_ADAPTIVE_NP
+type and
+.Dv PTHREAD_PRIO_NONE
+protocol (see
+.Xr pthread_mutexattr 3 ) .
+.Pp
+First, on SMP systems, a spin loop
+is performed, where the library attempts to acquire the lock by
+.Xr atomic 9
+operations.
+The loop count is controlled by the
+.Ev LIBPTHREAD_SPINLOOPS
+environment variable, with a default value of 2000.
+.Pp
+If the spin loop
+was unable to acquire the mutex, a yield loop
+is executed, performing the same
+.Xr atomic 9
+acquisition attempts as the spin loop,
+but each attempt is followed by a yield of the CPU time
+of the thread using the
+.Xr sched_yield 2
+syscall.
+By default, the yield loop
+is not executed.
+This is controlled by the
+.Ev LIBPTHREAD_YIELDLOOPS
+environment variable.
+.Pp
+If both the spin and yield loops
+failed to acquire the lock, the thread is taken off the CPU and
+put to sleep in the kernel with the
+.Xr umtx 2
+syscall.
+The kernel wakes up a thread and hands the ownership of the lock to
+the woken thread when the lock becomes available.
+.Sh THREAD STACKS
+Each thread is provided with a private user-mode stack area
+used by the C runtime.
+The size of the main (initial) thread stack is set by the kernel, and is
+controlled by the
+.Dv RLIMIT_STACK
+process resource limit (see
+.Xr getrlimit 2 ) .
+.Pp
+By default, the main thread's stack size is equal to the value of
+.Dv RLIMIT_STACK
+for the process.
+If the
+.Ev LIBPTHREAD_SPLITSTACK_MAIN
+environment variable is present in the process environment
+(its value does not matter),
+the main thread's stack is reduced to 4MB on 64bit architectures, and to
+2MB on 32bit architectures, when the threading library is initialized.
+The rest of the address space area which has been reserved by the
+kernel for the initial process stack is used for non-initial thread stacks
+in this case.
+The presence of the
+.Ev LIBPTHREAD_BIGSTACK_MAIN
+environment variable overrides
+.Ev LIBPTHREAD_SPLITSTACK_MAIN ;
+it is kept for backward-compatibility.
+.Pp
+The size of stacks for threads created by the process at run-time
+with the
+.Xr pthread_create 3
+call is controlled by thread attributes: see
+.Xr pthread_attr 3 ,
+in particular, the
+.Xr pthread_attr_setstacksize 3 ,
+.Xr pthread_attr_setguardsize 3
+and
+.Xr pthread_attr_setstackaddr 3
+functions.
+If no attributes for the thread stack size are specified, the default
+non-initial thread stack size is 2MB for 64bit architectures, and 1MB
+for 32bit architectures.
+.Sh RUN-TIME SETTINGS
+The following environment variables are recognized by
+.Nm
+and adjust the operation of the library at run-time:
+.Bl -tag -width LIBPTHREAD_SPLITSTACK_MAIN
+.It Ev LIBPTHREAD_BIGSTACK_MAIN
+Disables the reduction of the initial thread stack enabled by
+.Ev LIBPTHREAD_SPLITSTACK_MAIN .
+.It Ev LIBPTHREAD_SPLITSTACK_MAIN
+Causes a reduction of the initial thread stack, as described in the
+section
+.Sx THREAD STACKS .
+This was the default behaviour of
+.Nm
+before
+.Fx 11.0 .
+.It Ev LIBPTHREAD_SPINLOOPS
+The integer value of the variable overrides the default count of
+iterations in the
+.Li spin loop
+of the mutex acquisition.
+The default count is 2000, set by the
+.Dv MUTEX_ADAPTIVE_SPINS
+constant in the
+.Nm
+sources.
+.It Ev LIBPTHREAD_YIELDLOOPS
+A non-zero integer value enables the yield loop
+in the process of the mutex acquisition.
+The value is the count of loop operations.
+.It Ev LIBPTHREAD_QUEUE_FIFO
+The integer value of the variable specifies how often blocked
+threads are inserted at the head of the sleep queue, instead of its tail.
+Bigger values reduce the frequency of the FIFO discipline.
+The value must be between 0 and 255.
+.El
+.Sh INTERACTION WITH RUN-TIME LINKER
+The
+.Nm
+library must appear before
+.Li libc
+in the global order of depended objects.
+.Pp
+Loading
+.Nm
+with the
+.Xr dlopen 3
+call in the process after the program binary is activated
+is not supported, and causes miscellaneous and hard-to-diagnose misbehaviour.
+This is due to
+.Nm
+interposing several important
+.Li libc
+symbols to provide thread-safe services.
+In particular,
+.Dv errno
+and the locking stubs from
+.Li libc
+are affected.
+This requirement is currently not enforced.
+.Pp
+If the program loads any modules at run-time, and those modules may require
+threading services, the main program binary must be linked with
+.Li libpthread ,
+even if it does not require any services from the library.
+.Pp
+.Nm
+cannot be unloaded; the
+.Xr dlclose 3
+function does not perform any action when called with a handle for
+.Nm .
+One of the reasons is that the interposing of
+.Li libc
+functions cannot be undone.
+.Sh SIGNALS
+The implementation also interposes the user-installed
+.Xr signal 3
+handlers.
+This interposing is done to postpone signal delivery to threads which
+entered (libthr-internal) critical sections, where the calling
+of the user-provided signal handler is unsafe.
+An example of such a situation is owning the internal library lock.
+When a signal is delivered while the signal handler cannot be safely
+called, the call is postponed and performed until after the exit from
+the critical section.
+This should be taken into account when interpreting
+.Xr ktrace 1
+logs.
 .Sh SEE ALSO
-.Xr pthread 3
+.Xr ktrace 1 ,
+.Xr ld-elf.so.1 1 ,
+.Xr getrlimit 2 ,
+.Xr umtx 2 ,
+.Xr dlclose 3 ,
+.Xr dlopen 3 ,
+.Xr errno 3 ,
+.Xr getenv 3 ,
+.Xr libc 3 ,
+.Xr pthread_attr 3 ,
+.Xr pthread_attr_setstacksize 3 ,
+.Xr pthread_create 3 ,
+.Xr signal 3 ,
+.Xr atomic 9
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 9bf0e2955158..6d6a53215b8c 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -445,7 +445,7 @@ init_private(void)
 	struct rlimit rlim;
 	size_t len;
 	int mib[2];
-	char *env;
+	char *env, *env_bigstack, *env_splitstack;
 
 	_thr_umutex_init(&_mutex_static_lock);
 	_thr_umutex_init(&_cond_static_lock);
@@ -473,8 +473,9 @@ init_private(void)
 		len = sizeof (_usrstack);
 		if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1)
 			PANIC("Cannot get kern.usrstack from sysctl");
-		env = getenv("LIBPTHREAD_BIGSTACK_MAIN");
-		if (env != NULL) {
+		env_bigstack = getenv("LIBPTHREAD_BIGSTACK_MAIN");
+		env_splitstack = getenv("LIBPTHREAD_SPLITSTACK_MAIN");
+		if (env_bigstack != NULL || env_splitstack == NULL) {
 			if (getrlimit(RLIMIT_STACK, &rlim) == -1)
 				PANIC("Cannot get stack rlimit");
 			_thr_stack_initial = rlim.rlim_cur;
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index c6bbedead598..aca30237ad1e 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -33,7 +33,7 @@ LDADD+=	-lssl -lcrypto -lpthread
 
 # Misnamed file in upstream source
 configlexer.l: configlexer.lex
-	cp -p ${.ALLSRC} ${.TARGET}
+	cp -fp ${.ALLSRC} ${.TARGET}
 CLEANFILES+= configlexer.l
 
 # Symbol prefix for lex and yacc
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 654d0f5500ba..e8277676818c 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -98,6 +98,7 @@ COMMON_SRCS+=	s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c
 # If long double != double use these; otherwise, we alias the double versions.
 COMMON_SRCS+=	e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \
 	e_coshl.c e_fmodl.c e_hypotl.c \
+	e_lgammal.c e_lgammal_r.c \
 	e_remainderl.c e_sinhl.c e_sqrtl.c \
 	invtrig.c k_cosl.c k_sinl.c k_tanl.c \
 	s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \
@@ -188,7 +189,8 @@ MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3 \
 	ilogb.3 logb.3 ilogb.3 logbf.3 ilogb.3 logbl.3
 MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3
 MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3
-MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 \
+MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 \
+	lgamma.3 lgammaf.3 lgamma.3 lgammal.3 \
 	lgamma.3 tgamma.3 lgamma.3 tgammaf.3
 MLINKS+=log.3 log10.3 log.3 log10f.3 log.3 log10l.3 \
 	log.3 log1p.3 log.3 log1pf.3 log.3 log1pl.3 \
diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map
index e53ca07118fd..d5b7f4699f10 100644
--- a/lib/msun/Symbol.map
+++ b/lib/msun/Symbol.map
@@ -269,6 +269,7 @@ FBSD_1.3 {
 	erfl;
 	expl;
 	expm1l;
+	lgammal;
 	log10l;
 	log1pl;
 	log2l;
@@ -276,7 +277,11 @@ FBSD_1.3 {
 	sinhl;
 	tanhl;
 	/* Implemented as weak aliases for imprecise versions */
-	lgammal;
 	powl;
 	tgammal;
 };
+
+/* First added in 11.0-CURRENT */
+FBSD_1.4 {
+	lgammal_r;
+};
diff --git a/lib/msun/ld128/e_lgammal_r.c b/lib/msun/ld128/e_lgammal_r.c
new file mode 100644
index 000000000000..13f8f75a46c6
--- /dev/null
+++ b/lib/msun/ld128/e_lgammal_r.c
@@ -0,0 +1,333 @@
+/* @(#)e_lgamma_r.c 1.3 95/01/18 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunSoft, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * See e_lgamma_r.c for complete comments.
+ *
+ * Converted to long double by Steven G. Kargl.
+ */
+
+#include "fpmath.h"
+#include "math.h"
+#include "math_private.h"
+
+static const volatile double vzero = 0;
+
+static const double
+zero=  0,
+half=  0.5,
+one =  1;
+
+static const long double
+pi  =  3.14159265358979323846264338327950288e+00L;
+/*
+ * Domain y in [0x1p-119, 0.28], range ~[-1.4065e-36, 1.4065e-36]:
+ * |(lgamma(2 - y) + y / 2) / y - a(y)| < 2**-119.1
+ */
+static const long double
+a0  =  7.72156649015328606065120900824024296e-02L,
+a1  =  3.22467033424113218236207583323018498e-01L,
+a2  =  6.73523010531980951332460538330282217e-02L,
+a3  =  2.05808084277845478790009252803463129e-02L,
+a4  =  7.38555102867398526627292839296001626e-03L,
+a5  =  2.89051033074152328576829509522483468e-03L,
+a6  =  1.19275391170326097618357349881842913e-03L,
+a7  =  5.09669524743042462515256340206203019e-04L,
+a8  =  2.23154758453578096143609255559576017e-04L,
+a9  =  9.94575127818397632126978731542755129e-05L,
+a10 =  4.49262367375420471287545895027098145e-05L,
+a11 =  2.05072127845117995426519671481628849e-05L,
+a12 =  9.43948816959096748454087141447939513e-06L,
+a13 =  4.37486780697359330303852050718287419e-06L,
+a14 =  2.03920783892362558276037363847651809e-06L,
+a15 =  9.55191070057967287877923073200324649e-07L,
+a16 =  4.48993286185740853170657139487620560e-07L,
+a17 =  2.13107543597620911675316728179563522e-07L,
+a18 =  9.70745379855304499867546549551023473e-08L,
+a19 =  5.61889970390290257926487734695402075e-08L,
+a20 =  6.42739653024130071866684358960960951e-09L,
+a21 =  3.34491062143649291746195612991870119e-08L,
+a22 = -1.57068547394315223934653011440641472e-08L,
+a23 =  1.30812825422415841213733487745200632e-08L;
+/*
+ * Domain x in [tc-0.24, tc+0.28], range ~[-6.3201e-37, 6.3201e-37]:
+ * |(lgamma(x) - tf) - t(x - tc)| < 2**-120.3.
+ */
+static const long double
+tc  =  1.46163214496836234126265954232572133e+00L,
+tf  = -1.21486290535849608095514557177691584e-01L,
+tt  =  1.57061739945077675484237837992951704e-36L,
+t0  = -1.99238329499314692728655623767019240e-36L,
+t1  = -6.08453430711711404116887457663281416e-35L,
+t2  =  4.83836122723810585213722380854828904e-01L,
+t3  = -1.47587722994530702030955093950668275e-01L,
+t4  =  6.46249402389127526561003464202671923e-02L,
+t5  = -3.27885410884813055008502586863748063e-02L,
+t6  =  1.79706751152103942928638276067164935e-02L,
+t7  = -1.03142230366363872751602029672767978e-02L,
+t8  =  6.10053602051788840313573150785080958e-03L,
+t9  = -3.68456960831637325470641021892968954e-03L,
+t10 =  2.25976482322181046611440855340968560e-03L,
+t11 = -1.40225144590445082933490395950664961e-03L,
+t12 =  8.78232634717681264035014878172485575e-04L,
+t13 = -5.54194952796682301220684760591403899e-04L,
+t14 =  3.51912956837848209220421213975000298e-04L,
+t15 = -2.24653443695947456542669289367055542e-04L,
+t16 =  1.44070395420840737695611929680511823e-04L,
+t17 = -9.27609865550394140067059487518862512e-05L,
+t18 =  5.99347334438437081412945428365433073e-05L,
+t19 = -3.88458388854572825603964274134801009e-05L,
+t20 =  2.52476631610328129217896436186551043e-05L,
+t21 = -1.64508584981658692556994212457518536e-05L,
+t22 =  1.07434583475987007495523340296173839e-05L,
+t23 = -7.03070407519397260929482550448878399e-06L,
+t24 =  4.60968590693753579648385629003100469e-06L,
+t25 = -3.02765473778832036018438676945512661e-06L,
+t26 =  1.99238771545503819972741288511303401e-06L,
+t27 = -1.31281299822614084861868817951788579e-06L,
+t28 =  8.60844432267399655055574642052370223e-07L,
+t29 = -5.64535486432397413273248363550536374e-07L,
+t30 =  3.99357783676275660934903139592727737e-07L,
+t31 = -2.95849029193433121795495215869311610e-07L,
+t32 =  1.37790144435073124976696250804940384e-07L;
+/*
+ * Domain y in [-0.1, 0.232], range ~[-1.4046e-37, 1.4181e-37]:
+ * |(lgamma(1 + y) + 0.5 * y) / y - u(y) / v(y)| < 2**-122.8
+ */
+static const long double
+u0  = -7.72156649015328606065120900824024311e-02L,
+u1  =  4.24082772271938167430983113242482656e-01L,
+u2  =  2.96194003481457101058321977413332171e+00L,
+u3  =  6.49503267711258043997790983071543710e+00L,
+u4  =  7.40090051288150177152835698948644483e+00L,
+u5  =  4.94698036296756044610805900340723464e+00L,
+u6  =  2.00194224610796294762469550684947768e+00L,
+u7  =  4.82073087750608895996915051568834949e-01L,
+u8  =  6.46694052280506568192333848437585427e-02L,
+u9  =  4.17685526755100259316625348933108810e-03L,
+u10 =  9.06361003550314327144119307810053410e-05L,
+v1  =  5.15937098592887275994320496999951947e+00L,
+v2  =  1.14068418766251486777604403304717558e+01L,
+v3  =  1.41164839437524744055723871839748489e+01L,
+v4  =  1.07170702656179582805791063277960532e+01L,
+v5  =  5.14448694179047879915042998453632434e+00L,
+v6  =  1.55210088094585540637493826431170289e+00L,
+v7  =  2.82975732849424562719893657416365673e-01L,
+v8  =  2.86424622754753198010525786005443539e-02L,
+v9  =  1.35364253570403771005922441442688978e-03L,
+v10 =  1.91514173702398375346658943749580666e-05L,
+v11 = -3.25364686890242327944584691466034268e-08L;
+/*
+ * Domain x in (2, 3], range ~[-1.3341e-36, 1.3536e-36]:
+ * |(lgamma(y+2) - 0.5 * y) / y - s(y)/r(y)| < 2**-120.1
+ * with y = x - 2.
+ */
+static const long double
+s0  = -7.72156649015328606065120900824024297e-02L,
+s1  =  1.23221687850916448903914170805852253e-01L,
+s2  =  5.43673188699937239808255378293820020e-01L,
+s3  =  6.31998137119005233383666791176301800e-01L,
+s4  =  3.75885340179479850993811501596213763e-01L,
+s5  =  1.31572908743275052623410195011261575e-01L,
+s6  =  2.82528453299138685507186287149699749e-02L,
+s7  =  3.70262021550340817867688714880797019e-03L,
+s8  =  2.83374000312371199625774129290973648e-04L,
+s9  =  1.15091830239148290758883505582343691e-05L,
+s10 =  2.04203474281493971326506384646692446e-07L,
+s11 =  9.79544198078992058548607407635645763e-10L,
+r1  =  2.58037466655605285937112832039537492e+00L,
+r2  =  2.86289413392776399262513849911531180e+00L,
+r3  =  1.78691044735267497452847829579514367e+00L,
+r4  =  6.89400381446725342846854215600008055e-01L,
+r5  =  1.70135865462567955867134197595365343e-01L,
+r6  =  2.68794816183964420375498986152766763e-02L,
+r7  =  2.64617234244861832870088893332006679e-03L,
+r8  =  1.52881761239180800640068128681725702e-04L,
+r9  =  4.63264813762296029824851351257638558e-06L,
+r10 =  5.89461519146957343083848967333671142e-08L,
+r11 =  1.79027678176582527798327441636552968e-10L;
+/*
+ * Domain z in [8, 0x1p70], range ~[-9.8214e-35, 9.8214e-35]:
+ * |lgamma(x) - (x - 0.5) * (log(x) - 1) - w(1/x)| < 2**-113.0
+ */
+static const long double
+w0  =  4.18938533204672741780329736405617738e-01L,
+w1  =  8.33333333333333333333333333332852026e-02L,
+w2  = -2.77777777777777777777777727810123528e-03L,
+w3  =  7.93650793650793650791708939493907380e-04L,
+w4  = -5.95238095238095234390450004444370959e-04L,
+w5  =  8.41750841750837633887817658848845695e-04L,
+w6  = -1.91752691752396849943172337347259743e-03L,
+w7  =  6.41025640880333069429106541459015557e-03L,
+w8  = -2.95506530801732133437990433080327074e-02L,
+w9  =  1.79644237328444101596766586979576927e-01L,
+w10 = -1.39240539108367641920172649259736394e+00L,
+w11 =  1.33987701479007233325288857758641761e+01L,
+w12 = -1.56363596431084279780966590116006255e+02L,
+w13 =  2.14830978044410267201172332952040777e+03L,
+w14 = -3.28636067474227378352761516589092334e+04L,
+w15 =  5.06201257747865138432663574251462485e+05L,
+w16 = -6.79720123352023636706247599728048344e+06L,
+w17 =  6.57556601705472106989497289465949255e+07L,
+w18 = -3.26229058141181783534257632389415580e+08L;
+
+static long double
+sin_pil(long double x)
+{
+	volatile long double vz;
+	long double y,z;
+	uint64_t lx, n;
+	uint16_t hx;
+
+	y = -x;
+
+	vz = y+0x1.p112;
+	z = vz-0x1.p112;
+	if (z == y)
+	    return zero;
+
+	vz = y+0x1.p110;
+	EXTRACT_LDBL128_WORDS(hx,lx,n,vz);
+	z = vz-0x1.p110;
+	if (z > y) {
+	    z -= 0.25;
+	    n--;
+	}
+	n &= 7;
+	y = y - z + n * 0.25L;
+
+	switch (n) {
+	    case 0:   y =  __kernel_sinl(pi*y,zero,0); break;
+	    case 1:
+	    case 2:   y =  __kernel_cosl(pi*(0.5-y),zero); break;
+	    case 3: 
+	    case 4:   y =  __kernel_sinl(pi*(one-y),zero,0); break;
+	    case 5:
+	    case 6:   y = -__kernel_cosl(pi*(y-1.5),zero); break;
+	    default:  y =  __kernel_sinl(pi*(y-2.0),zero,0); break;
+	    }
+	return -y;
+}
+
+
+long double
+lgammal_r(long double x, int *signgamp)
+{
+	long double nadj,p,p1,p2,p3,q,r,t,w,y,z;
+	uint64_t llx,lx;
+	int i;
+	uint16_t hx;
+
+	EXTRACT_LDBL128_WORDS(hx, lx, llx, x);
+
+	if((hx & 0x7fff) == 0x7fff) {	/* erfl(nan)=nan */
+		i = (hx>>15)<<1;
+		return (1-i)+one/x;	/* erfl(+-inf)=+-1 */
+	}
+
+    /* purge off +-inf, NaN, +-0, tiny and negative arguments */
+	*signgamp = 1;
+	if((hx & 0x7fff) == 0x7fff)	/* x is +-Inf or NaN */
+		return x*x;
+	if((hx==0||hx==0x8000)&&lx==0) {
+	    if (hx&0x8000)
+		*signgamp = -1;
+	    return one/vzero;
+	}
+
+   /* purge off tiny and negative arguments */
+	if(fabsl(x)<0x1p-119L) {
+	    if(hx&0x8000) {
+	        *signgamp = -1;
+	        return -logl(-x);
+	    } else return -logl(x);
+	}
+	if(hx&0x8000) {
+	    if(fabsl(x)>=0x1p112)
+		return one/vzero;
+	    t = sin_pil(x);
+	    if(t==zero) return one/vzero;
+	    nadj = logl(pi/fabsl(t*x));
+	    if(t<zero) *signgamp = -1;
+	    x = -x;
+	}
+
+	if(x == 1 || x ==2) r = 0;
+	else if(x<2) {
+	    if(x<=0.8999996185302734) {
+		r = -logl(x);
+		if(x>=0.7315998077392578) {y = 1-x; i= 0;}
+		else if(x>=0.2316399812698364) {y= x-(tc-1); i=1;}
+	  	else {y = x; i=2;}
+	    } else {
+	  	r = 0;
+	        if(x>=1.7316312789916992) {y=2-x;i=0;}
+	        else if(x>=1.2316322326660156) {y=x-tc;i=1;}
+		else {y=x-1;i=2;}
+	    }
+	    switch(i) {
+	      case 0:
+		z = y*y;
+		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*(a10+z*(a12+z*(a14+z*(a16+
+		    z*(a18+z*(a20+z*a22))))))))));
+		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*(a11+z*(a13+z*(a15+
+		    z*(a17+z*(a19+z*(a21+z*a23)))))))))));
+		p  = y*p1+p2;
+		r  += (p-y/2); break;
+	      case 1:
+		p = t0+y*t1+tt+y*y*(t2+y*(t3+y*(t4+y*(t5+y*(t6+y*(t7+y*(t8+
+		    y*(t9+y*(t10+y*(t11+y*(t12+y*(t13+y*(t14+y*(t15+y*(t16+
+		    y*(t17+y*(t18+y*(t19+y*(t20+y*(t21+y*(t22+y*(t23+
+		    y*(t24+y*(t25+y*(t26+y*(t27+y*(t28+y*(t29+y*(t30+
+		    y*(t31+y*t32))))))))))))))))))))))))))))));
+		r += (tf + p); break;
+	      case 2:
+		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*(u5+y*(u6+y*(u7+
+		    y*(u8+y*(u9+y*u10))))))))));
+		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*(v5+y*(v6+y*(v7+
+		    y*(v8+y*(v9+y*(v10+y*v11))))))))));
+		r += (-y/2 + p1/p2);
+	    }
+	}
+	else if(x<8) {
+	    i = x;
+	    y = x-i;
+	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*(s6+y*(s7+y*(s8+
+		y*(s9+y*(s10+y*s11)))))))))));
+	    q = one+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*(r6+y*(r7+y*(r8+
+		y*(r9+y*(r10+y*r11))))))))));
+	    r = y/2+p/q;
+	    z = 1;	/* lgamma(1+s) = log(s) + lgamma(s) */
+	    switch(i) {
+	    case 7: z *= (y+6);		/* FALLTHRU */
+	    case 6: z *= (y+5);		/* FALLTHRU */
+	    case 5: z *= (y+4);		/* FALLTHRU */
+	    case 4: z *= (y+3);		/* FALLTHRU */
+	    case 3: z *= (y+2);		/* FALLTHRU */
+		    r += logl(z); break;
+	    }
+	} else if (x < 0x1p119L) {
+	    t = logl(x);
+	    z = one/x;
+	    y = z*z;
+	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*(w6+y*(w7+y*(w8+
+		y*(w9+y*(w10+y*(w11+y*(w12+y*(w13+y*(w14+y*(w15+y*(w16+
+		y*(w17+y*w18)))))))))))))))));
+	    r = (x-half)*(t-one)+w;
+	} else 
+	    r =  x*(logl(x)-1);
+	if(hx&0x8000) r = nadj - r;
+	return r;
+}
diff --git a/lib/msun/ld80/e_lgammal_r.c b/lib/msun/ld80/e_lgammal_r.c
new file mode 100644
index 000000000000..621b04e74022
--- /dev/null
+++ b/lib/msun/ld80/e_lgammal_r.c
@@ -0,0 +1,349 @@
+/* @(#)e_lgamma_r.c 1.3 95/01/18 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunSoft, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * See s_lgamma_r.c for complete comments.
+ *
+ * Converted to long double by Steven G. Kargl.
+ */
+
+#include <float.h>
+#ifdef __i386__
+#include <ieeefp.h>
+#endif
+
+#include "fpmath.h"
+#include "math.h"
+#include "math_private.h"
+
+static const volatile double vzero = 0;
+
+static const double
+zero=  0,
+half=  0.5,
+one =  1;
+
+static const union IEEEl2bits
+piu = LD80C(0xc90fdaa22168c235, 1,  3.14159265358979323851e+00L);
+#define	pi	(piu.e)
+/*
+ * Domain y in [0x1p-70, 0.27], range ~[-4.5264e-22, 4.5264e-22]:
+ * |(lgamma(2 - y) + y / 2) / y - a(y)| < 2**-70.9
+ */
+static const union IEEEl2bits
+a0u = LD80C(0x9e233f1bed863d26, -4,  7.72156649015328606028e-02L),
+a1u = LD80C(0xa51a6625307d3249, -2,  3.22467033424113218889e-01L),
+a2u = LD80C(0x89f000d2abafda8c, -4,  6.73523010531979398946e-02L),
+a3u = LD80C(0xa8991563eca75f26, -6,  2.05808084277991211934e-02L),
+a4u = LD80C(0xf2027e10634ce6b6, -8,  7.38555102796070454026e-03L),
+a5u = LD80C(0xbd6eb76dd22187f4, -9,  2.89051035162703932972e-03L),
+a6u = LD80C(0x9c562ab05e0458ed, -10,  1.19275351624639999297e-03L),
+a7u = LD80C(0x859baed93ee48e46, -11,  5.09674593842117925320e-04L),
+a8u = LD80C(0xe9f28a4432949af2, -13,  2.23109648015769155122e-04L),
+a9u = LD80C(0xd12ad0d9b93c6bb0, -14,  9.97387167479808509830e-05L),
+a10u= LD80C(0xb7522643c78a219b, -15,  4.37071076331030136818e-05L),
+a11u= LD80C(0xca024dcdece2cb79, -16,  2.40813493372040143061e-05L),
+a12u= LD80C(0xbb90fb6968ebdbf9, -19,  2.79495621083634031729e-06L),
+a13u= LD80C(0xba1c9ffeeae07b37, -17,  1.10931287015513924136e-05L);
+#define	a0	(a0u.e)
+#define	a1	(a1u.e)
+#define	a2	(a2u.e)
+#define	a3	(a3u.e)
+#define	a4	(a4u.e)
+#define	a5	(a5u.e)
+#define	a6	(a6u.e)
+#define	a7	(a7u.e)
+#define	a8	(a8u.e)
+#define	a9	(a9u.e)
+#define	a10	(a10u.e)
+#define	a11	(a11u.e)
+#define	a12	(a12u.e)
+#define	a13	(a13u.e)
+/*
+ * Domain x in [tc-0.24, tc+0.28], range ~[-6.1205e-22, 6.1205e-22]:
+ * |(lgamma(x) - tf) -  t(x - tc)| < 2**-70.5
+ */
+static const union IEEEl2bits
+tcu  = LD80C(0xbb16c31ab5f1fb71, 0,  1.46163214496836234128e+00L),
+tfu  = LD80C(0xf8cdcde61c520e0f, -4, -1.21486290535849608093e-01L),
+ttu  = LD80C(0xd46ee54b27d4de99, -69, -2.81152980996018785880e-21L),
+t0u  = LD80C(0x80b9406556a62a6b, -68,  3.40728634996055147231e-21L),
+t1u  = LD80C(0xc7e9c6f6df3f8c39, -67, -1.05833162742737073665e-20L),
+t2u  = LD80C(0xf7b95e4771c55d51, -2,  4.83836122723810583532e-01L),
+t3u  = LD80C(0x97213c6e35e119ff, -3, -1.47587722994530691476e-01L),
+t4u  = LD80C(0x845a14a6a81dc94b, -4,  6.46249402389135358063e-02L),
+t5u  = LD80C(0x864d46fa89997796, -5, -3.27885410884846056084e-02L),
+t6u  = LD80C(0x93373cbd00297438, -6,  1.79706751150707171293e-02L),
+t7u  = LD80C(0xa8fcfca7eddc8d1d, -7, -1.03142230361450732547e-02L),
+t8u  = LD80C(0xc7e7015ff4bc45af, -8,  6.10053603296546099193e-03L),
+t9u  = LD80C(0xf178d2247adc5093, -9, -3.68456964904901200152e-03L),
+t10u = LD80C(0x94188d58f12e5e9f, -9,  2.25976420273774583089e-03L),
+t11u = LD80C(0xb7cbaef14e1406f1, -10, -1.40224943666225639823e-03L),
+t12u = LD80C(0xe63a671e6704ea4d, -11,  8.78250640744776944887e-04L),
+t13u = LD80C(0x914b6c9cae61783e, -11, -5.54255012657716808811e-04L),
+t14u = LD80C(0xb858f5bdb79276fe, -12,  3.51614951536825927370e-04L),
+t15u = LD80C(0xea73e744c34b9591, -13, -2.23591563824520112236e-04L),
+t16u = LD80C(0x99aeabb0d67ba835, -13,  1.46562869351659194136e-04L),
+t17u = LD80C(0xd7c6938325db2024, -14, -1.02889866046435680588e-04L),
+t18u = LD80C(0xe24cb1e3b0474775, -15,  5.39540265505221957652e-05L);
+#define	tc	(tcu.e)
+#define	tf	(tfu.e)
+#define	tt	(ttu.e)
+#define	t0	(t0u.e)
+#define	t1	(t1u.e)
+#define	t2	(t2u.e)
+#define	t3	(t3u.e)
+#define	t4	(t4u.e)
+#define	t5	(t5u.e)
+#define	t6	(t6u.e)
+#define	t7	(t7u.e)
+#define	t8	(t8u.e)
+#define	t9	(t9u.e)
+#define	t10	(t10u.e)
+#define	t11	(t11u.e)
+#define	t12	(t12u.e)
+#define	t13	(t13u.e)
+#define	t14	(t14u.e)
+#define	t15	(t15u.e)
+#define	t16	(t16u.e)
+#define	t17	(t17u.e)
+#define	t18	(t18u.e)
+/*
+ * Domain y in [-0.1, 0.232], range ~[-8.1938e-22, 8.3815e-22]:
+ * |(lgamma(1 + y) + 0.5 * y) / y - u(y) / v(y)| < 2**-71.2
+ */
+static const union IEEEl2bits
+u0u = LD80C(0x9e233f1bed863d27, -4, -7.72156649015328606095e-02L),
+u1u = LD80C(0x98280ee45e4ddd3d, -1,  5.94361239198682739769e-01L),
+u2u = LD80C(0xe330c8ead4130733, 0,  1.77492629495841234275e+00L),
+u3u = LD80C(0xd4a213f1a002ec52, 0,  1.66119622514818078064e+00L),
+u4u = LD80C(0xa5a9ca6f5bc62163, -1,  6.47122051417476492989e-01L),
+u5u = LD80C(0xc980e49cd5b019e6, -4,  9.83903751718671509455e-02L),
+u6u = LD80C(0xff636a8bdce7025b, -9,  3.89691687802305743450e-03L),
+v1u = LD80C(0xbd109c533a19fbf5, 1,  2.95413883330948556544e+00L),
+v2u = LD80C(0xd295cbf96f31f099, 1,  3.29039286955665403176e+00L),
+v3u = LD80C(0xdab8bcfee40496cb, 0,  1.70876276441416471410e+00L),
+v4u = LD80C(0xd2f2dc3638567e9f, -2,  4.12009126299534668571e-01L),
+v5u = LD80C(0xa07d9b0851070f41, -5,  3.91822868305682491442e-02L),
+v6u = LD80C(0xe3cd8318f7adb2c4, -11,  8.68998648222144351114e-04L);
+#define	u0	(u0u.e)
+#define	u1	(u1u.e)
+#define	u2	(u2u.e)
+#define	u3	(u3u.e)
+#define	u4	(u4u.e)
+#define	u5	(u5u.e)
+#define	u6	(u6u.e)
+#define	v1	(v1u.e)
+#define	v2	(v2u.e)
+#define	v3	(v3u.e)
+#define	v4	(v4u.e)
+#define	v5	(v5u.e)
+#define	v6	(v6u.e)
+/*
+ * Domain x in (2, 3], range ~[-3.3648e-22, 3.4416e-22]:
+ * |(lgamma(y+2) - 0.5 * y) / y - s(y)/r(y)| < 2**-72.3
+ * with y = x - 2.
+ */
+static const union IEEEl2bits
+s0u = LD80C(0x9e233f1bed863d27, -4, -7.72156649015328606095e-02L),
+s1u = LD80C(0xd3ff0dcc7fa91f94, -3,  2.07027640921219389860e-01L),
+s2u = LD80C(0xb2bb62782478ef31, -2,  3.49085881391362090549e-01L),
+s3u = LD80C(0xb49f7438c4611a74, -3,  1.76389518704213357954e-01L),
+s4u = LD80C(0x9a957008fa27ecf9, -5,  3.77401710862930008071e-02L),
+s5u = LD80C(0xda9b389a6ca7a7ac, -9,  3.33566791452943399399e-03L),
+s6u = LD80C(0xbc7a2263faf59c14, -14,  8.98728786745638844395e-05L),
+r1u = LD80C(0xbf5cff5b11477d4d, 0,  1.49502555796294337722e+00L),
+r2u = LD80C(0xd9aec89de08e3da6, -1,  8.50323236984473285866e-01L),
+r3u = LD80C(0xeab7ae5057c443f9, -3,  2.29216312078225806131e-01L),
+r4u = LD80C(0xf29707d9bd2b1e37, -6,  2.96130326586640089145e-02L),
+r5u = LD80C(0xd376c2f09736c5a3, -10,  1.61334161411590662495e-03L),
+r6u = LD80C(0xc985983d0cd34e3d, -16,  2.40232770710953450636e-05L),
+r7u = LD80C(0xe5c7a4f7fc2ef13d, -25, -5.34997929289167573510e-08L);
+#define	s0	(s0u.e)
+#define	s1	(s1u.e)
+#define	s2	(s2u.e)
+#define	s3	(s3u.e)
+#define	s4	(s4u.e)
+#define	s5	(s5u.e)
+#define	s6	(s6u.e)
+#define	r1	(r1u.e)
+#define	r2	(r2u.e)
+#define	r3	(r3u.e)
+#define	r4	(r4u.e)
+#define	r5	(r5u.e)
+#define	r6	(r6u.e)
+#define	r7	(r7u.e)
+/*
+ * Domain z in [8, 0x1p70], range ~[-3.0235e-22, 3.0563e-22]:
+ * |lgamma(x) - (x - 0.5) * (log(x) - 1) - w(1/x)| < 2**-71.7
+ */
+static const union IEEEl2bits
+w0u = LD80C(0xd67f1c864beb4a69, -2,  4.18938533204672741776e-01L),
+w1u = LD80C(0xaaaaaaaaaaaaaaa1, -4,  8.33333333333333332678e-02L),
+w2u = LD80C(0xb60b60b60b5491c9, -9, -2.77777777777760927870e-03L),
+w3u = LD80C(0xd00d00cf58aede4c, -11,  7.93650793490637233668e-04L),
+w4u = LD80C(0x9c09bf626783d4a5, -11, -5.95238023926039051268e-04L),
+w5u = LD80C(0xdca7cadc5baa517b, -11,  8.41733700408000822962e-04L),
+w6u = LD80C(0xfb060e361e1ffd07, -10, -1.91515849570245136604e-03L),
+w7u = LD80C(0xcbd5101bb58d1f2b, -8,  6.22046743903262649294e-03L),
+w8u = LD80C(0xad27a668d32c821b, -6, -2.11370706734662081843e-02L);
+#define	w0	(w0u.e)
+#define	w1	(w1u.e)
+#define	w2	(w2u.e)
+#define	w3	(w3u.e)
+#define	w4	(w4u.e)
+#define	w5	(w5u.e)
+#define	w6	(w6u.e)
+#define	w7	(w7u.e)
+#define	w8	(w8u.e)
+
+static long double
+sin_pil(long double x)
+{
+	volatile long double vz;
+	long double y,z;
+	uint64_t n;
+	uint16_t hx;
+
+	y = -x;
+
+	vz = y+0x1p63L;
+	z = vz-0x1p63L;
+	if (z == y)
+	    return zero;
+
+	vz = y+0x1p61;
+	EXTRACT_LDBL80_WORDS(hx,n,vz);
+	z = vz-0x1p61;
+	if (z > y) {
+	    z -= 0.25;			/* adjust to round down */
+	    n--;
+	}
+	n &= 7;				/* octant of y mod 2 */
+	y = y - z + n * 0.25;		/* y mod 2 */
+
+	switch (n) {
+	    case 0:   y =  __kernel_sinl(pi*y,zero,0); break;
+	    case 1:
+	    case 2:   y =  __kernel_cosl(pi*(0.5-y),zero); break;
+	    case 3:
+	    case 4:   y =  __kernel_sinl(pi*(one-y),zero,0); break;
+	    case 5:
+	    case 6:   y = -__kernel_cosl(pi*(y-1.5),zero); break;
+	    default:  y =  __kernel_sinl(pi*(y-2.0),zero,0); break;
+	}
+	return -y;
+}
+
+long double
+lgammal_r(long double x, int *signgamp)
+{
+	long double nadj,p,p1,p2,p3,q,r,t,w,y,z;
+	uint64_t lx;
+	int i;
+	uint16_t hx;
+
+	EXTRACT_LDBL80_WORDS(hx,lx,x);
+
+    /* purge off +-inf, NaN, +-0 */
+	*signgamp = 1;
+	if((hx & 0x7fff) == 0x7fff)	/* x is +-Inf or NaN */
+		return x*x;
+	if((hx==0||hx==0x8000)&&lx==0) {
+	    if (hx&0x8000)
+		*signgamp = -1;
+	    return one/vzero;
+	}
+
+	ENTERI();
+
+    /* purge off tiny and negative arguments */
+	if(fabsl(x)<0x1p-70L) {		/* |x|<2**-70, return -log(|x|) */
+	    if(hx&0x8000) {
+	        *signgamp = -1;
+	        RETURNI(-logl(-x));
+	    } else RETURNI(-logl(x));
+	}
+	if(hx&0x8000) {
+	    if(fabsl(x)>=0x1p63) 	/* |x|>=2**(p-1), must be -integer */
+		RETURNI(one/vzero);
+	    t = sin_pil(x);
+	    if(t==zero) RETURNI(one/vzero); /* -integer */
+	    nadj = logl(pi/fabsl(t*x));
+	    if(t<zero) *signgamp = -1;
+	    x = -x;
+	}
+
+    /* purge off 1 and 2 */
+	if(x == 1 || x == 2) r = 0;
+    /* for x < 2.0 */
+	else if(x<2) {
+	    if(x<=0.8999996185302734) {	/* lgamma(x) = lgamma(x+1)-log(x) */
+		r = - logl(x);
+		if(x>=0.7315998077392578) {y = 1-x; i= 0;}
+		else if(x>=0.2316399812698364) {y= x-(tc-1); i=1;}
+	  	else {y = x; i=2;}
+	    } else {
+		r = 0;
+	        if(x>=1.7316312789916992) {y=2-x;i=0;}
+	        else if(x>=1.2316322326660156) {y=x-tc;i=1;}
+		else {y=x-1;i=2;}
+	    }
+	    switch(i) {
+	      case 0:
+		z = y*y;
+		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*(a10+z*a12)))));
+		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*(a11+z*a13))))));
+		p  = y*p1+p2;
+		r  += (p-y/2); break;
+	      case 1:
+		p = t0+y*t1+tt+y*y*(t2+y*(t3+y*(t4+y*(t5+y*(t6+y*(t7+y*(t8+
+		    y*(t9+y*(t10+y*(t11+y*(t12+y*(t13+y*(t14+y*(t15+y*(t16+
+		    y*(t17+y*t18))))))))))))))));
+		r += (tf + p); break;
+	      case 2:
+		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*(u5+y*u6))))));
+		p2 = 1+y*(v1+y*(v2+y*(v3+y*(v4+y*(v5+y*v6)))));
+		r += (-y/2 + p1/p2);
+	    }
+	}
+	else if(x<8) {
+	    i = x;
+	    y = x-i;
+	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*s6))))));
+	    q = 1+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*(r6+y*r7))))));
+	    r = y/2+p/q;
+	    z = 1;	/* lgamma(1+s) = log(s) + lgamma(s) */
+	    switch(i) {
+	    case 7: z *= (y+6);		/* FALLTHRU */
+	    case 6: z *= (y+5);		/* FALLTHRU */
+	    case 5: z *= (y+4);		/* FALLTHRU */
+	    case 4: z *= (y+3);		/* FALLTHRU */
+	    case 3: z *= (y+2);		/* FALLTHRU */
+		    r += logl(z); break;
+	    }
+    /* 8.0 <= x < 2**70 */
+	} else if (x < 0x1p70L) {
+	    t = logl(x);
+	    z = one/x;
+	    y = z*z;
+	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*(w6+y*(w7+y*w8)))))));
+	    r = (x-half)*(t-one)+w;
+	} else 
+    /* 2**70 <= x <= inf */
+	    r =  x*(logl(x)-1);
+	if(hx&0x8000) r = nadj - r;
+	RETURNI(r);
+}
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index ea6eb6f76f9b..d244722a0c15 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -28,7 +28,7 @@
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2005
+.Dd September 12, 2014
 .Dt LGAMMA 3
 .Os
 .Sh NAME
@@ -36,6 +36,8 @@
 .Nm lgamma_r ,
 .Nm lgammaf ,
 .Nm lgammaf_r ,
+.Nm lgammal ,
+.Nm lgammal_r ,
 .Nm gamma ,
 .Nm gamma_r ,
 .Nm gammaf ,
@@ -58,6 +60,10 @@
 .Fn lgammaf "float x"
 .Ft float
 .Fn lgammaf_r "float x" "int *signgamp"
+.Ft "long double"
+.Fn lgammal "long double x"
+.Ft "long double"
+.Fn lgammal_r "long double x" "int *signgamp"
 .Ft double
 .Fn gamma "double x"
 .Ft double
@@ -66,14 +72,15 @@
 .Fn gammaf "float x"
 .Ft float
 .Fn gammaf_r "float x" "int *signgamp"
-.Ft double
+.Ft "long double"
 .Fn tgamma "double x"
 .Ft float
 .Fn tgammaf "float x"
 .Sh DESCRIPTION
-.Fn lgamma x
+.Fn lgamma x ,
+.Fn lgammaf x ,
 and
-.Fn lgammaf x
+.Fn lgammal x
 .if t \{\
 return ln\||\(*G(x)| where
 .Bd -unfilled -offset indent
@@ -87,13 +94,15 @@ The external integer
 .Fa signgam
 returns the sign of \(*G(x).
 .Pp
-.Fn lgamma_r x signgamp
+.Fn lgamma_r x signgamp ,
+.Fn lgammaf_r x signgamp ,
 and
-.Fn lgammaf_r x signgamp
+.Fn lgammal_r x signgamp
 provide the same functionality as
-.Fn lgamma x
+.Fn lgamma x , 
+.Fn lgammaf x ,
 and
-.Fn lgammaf x
+.Fn lgammal x ,
 but the caller must provide an integer to store the sign of \(*G(x).
 .Pp
 The
@@ -115,6 +124,7 @@ are deprecated aliases for
 and
 .Fn lgammaf_r ,
 respectively.
+
 .Sh IDIOSYNCRASIES
 Do not use the expression
 .Dq Li signgam\(**exp(lgamma(x))
@@ -139,14 +149,18 @@ Exponentiation of
 will lose up to 10 significant bits.
 .Sh RETURN VALUES
 .Fn gamma ,
-.Fn gamma_r ,
 .Fn gammaf ,
+.Fn gammal ,
+.Fn gamma_r ,
 .Fn gammaf_r ,
+.Fn gammal_r ,
 .Fn lgamma ,
-.Fn lgamma_r ,
 .Fn lgammaf ,
+.Fn lgammal ,
+.Fn lgamma_r ,
+.Fn lgammaf_r ,
 and
-.Fn lgammaf_r
+.Fn lgammal_r
 return appropriate values unless an argument is out of range.
 Overflow will occur for sufficiently large positive values, and
 non-positive integers.
@@ -159,6 +173,7 @@ will underflow.
 The
 .Fn lgamma ,
 .Fn lgammaf ,
+.Fn lgammal ,
 .Fn tgamma ,
 and
 .Fn tgammaf
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 4674d9bf0a64..43f5175603ec 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -21,6 +21,8 @@ __FBSDID("$FreeBSD$");
  * Method: call __ieee754_lgamma_r
  */
 
+#include <float.h>
+
 #include "math.h"
 #include "math_private.h"
 
@@ -31,3 +33,7 @@ __ieee754_lgamma(double x)
 {
 	return __ieee754_lgamma_r(x,&signgam);
 }
+
+#if (LDBL_MANT_DIG == 53)
+__weak_reference(lgamma, lgammal);
+#endif
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index 7a95ea47f016..a0bd31096bdd 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -1,4 +1,3 @@
-
 /* @(#)e_lgamma_r.c 1.3 95/01/18 */
 /*
  * ====================================================
@@ -6,22 +5,21 @@
  *
  * Developed at SunSoft, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
- *
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /* __ieee754_lgamma_r(x, signgamp)
- * Reentrant version of the logarithm of the Gamma function 
- * with user provide pointer for the sign of Gamma(x). 
+ * Reentrant version of the logarithm of the Gamma function
+ * with user provide pointer for the sign of Gamma(x).
  *
  * Method:
  *   1. Argument Reduction for 0 < x <= 8
- * 	Since gamma(1+s)=s*gamma(s), for x in [0,8], we may 
+ * 	Since gamma(1+s)=s*gamma(s), for x in [0,8], we may
  * 	reduce x to a number in [1.5,2.5] by
  * 		lgamma(1+s) = log(s) + lgamma(s)
  *	for example,
@@ -59,20 +57,20 @@ __FBSDID("$FreeBSD$");
  *	by
  *	  			    3       5             11
  *		w = w0 + w1*z + w2*z  + w3*z  + ... + w6*z
- *	where 
+ *	where
  *		|w - f(z)| < 2**-58.74
- *		
+ *
  *   4. For negative x, since (G is gamma function)
  *		-x*G(-x)*G(x) = pi/sin(pi*x),
  * 	we have
  * 		G(x) = pi/(sin(pi*x)*(-x)*G(-x))
  *	since G(-x) is positive, sign(G(x)) = sign(sin(pi*x)) for x<0
- *	Hence, for x<0, signgam = sign(sin(pi*x)) and 
+ *	Hence, for x<0, signgam = sign(sin(pi*x)) and
  *		lgamma(x) = log(|Gamma(x)|)
  *			  = log(pi/(|x*sin(pi*x)|)) - lgamma(-x);
- *	Note: one should avoid compute pi*(-x) directly in the 
+ *	Note: one should avoid compute pi*(-x) directly in the
  *	      computation of sin(pi*(-x)).
- *		
+ *
  *   5. Special Cases
  *		lgamma(2+s) ~ s*(1-Euler) for tiny s
  *		lgamma(1) = lgamma(2) = 0
@@ -80,9 +78,10 @@ __FBSDID("$FreeBSD$");
  *		lgamma(0) = lgamma(neg.integer) = inf and raise divide-by-zero
  *		lgamma(inf) = inf
  *		lgamma(-inf) = inf (bug for bug compatible with C99!?)
- *	
  */
 
+#include <float.h>
+
 #include "math.h"
 #include "math_private.h"
 
@@ -187,9 +186,9 @@ sin_pi(double x)
 
 	switch (n) {
 	    case 0:   y =  __kernel_sin(pi*y,zero,0); break;
-	    case 1:   
+	    case 1:
 	    case 2:   y =  __kernel_cos(pi*(0.5-y),zero); break;
-	    case 3:  
+	    case 3:
 	    case 4:   y =  __kernel_sin(pi*(one-y),zero,0); break;
 	    case 5:
 	    case 6:   y = -__kernel_cos(pi*(y-1.5),zero); break;
@@ -212,7 +211,11 @@ __ieee754_lgamma_r(double x, int *signgamp)
 	*signgamp = 1;
 	ix = hx&0x7fffffff;
 	if(ix>=0x7ff00000) return x*x;
-	if((ix|lx)==0) return one/vzero;
+	if((ix|lx)==0) {
+	   if(hx<0)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 	if(ix<0x3b900000) {	/* |x|<2**-70, return -log(|x|) */
 	    if(hx<0) {
 	        *signgamp = -1;
@@ -250,7 +253,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
 		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*a10))));
 		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*a11)))));
 		p  = y*p1+p2;
-		r  += (p-0.5*y); break;
+		r  += (p-y/2); break;
 	      case 1:
 		z = y*y;
 		w = z*y;
@@ -259,7 +262,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
 		p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
 		p  = z*p1-(tt-w*(p2+y*p3));
 		r += (tf + p); break;
-	      case 2:	
+	      case 2:
 		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5)))));
 		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5))));
 		r += (-0.5*y + p1/p2);
@@ -273,11 +276,11 @@ __ieee754_lgamma_r(double x, int *signgamp)
 	    r = half*y+p/q;
 	    z = one;	/* lgamma(1+s) = log(s) + lgamma(s) */
 	    switch(i) {
-	    case 7: z *= (y+6.0);	/* FALLTHRU */
-	    case 6: z *= (y+5.0);	/* FALLTHRU */
-	    case 5: z *= (y+4.0);	/* FALLTHRU */
-	    case 4: z *= (y+3.0);	/* FALLTHRU */
-	    case 3: z *= (y+2.0);	/* FALLTHRU */
+	    case 7: z *= (y+6);		/* FALLTHRU */
+	    case 6: z *= (y+5);		/* FALLTHRU */
+	    case 5: z *= (y+4);		/* FALLTHRU */
+	    case 4: z *= (y+3);		/* FALLTHRU */
+	    case 3: z *= (y+2);		/* FALLTHRU */
 		    r += __ieee754_log(z); break;
 	    }
     /* 8.0 <= x < 2**58 */
@@ -287,9 +290,13 @@ __ieee754_lgamma_r(double x, int *signgamp)
 	    y = z*z;
 	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6)))));
 	    r = (x-half)*(t-one)+w;
-	} else 
+	} else
     /* 2**58 <= x <= inf */
 	    r =  x*(__ieee754_log(x)-one);
 	if(hx<0) r = nadj - r;
 	return r;
 }
+
+#if (LDBL_MANT_DIG == 53)
+__weak_reference(lgamma_r, lgammal_r);
+#endif
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index 9a7ab39dca4b..9d23053b1f3b 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -1,5 +1,6 @@
 /* e_lgammaf_r.c -- float version of e_lgamma_r.c.
  * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
+ * Conversion to float fixed By Steven G. Kargl.
  */
 
 /*
@@ -22,72 +23,63 @@ __FBSDID("$FreeBSD$");
 static const volatile float vzero = 0;
 
 static const float
-zero=  0.0000000000e+00,
-half=  5.0000000000e-01, /* 0x3f000000 */
-one =  1.0000000000e+00, /* 0x3f800000 */
+zero=  0,
+half=  0.5,
+one =  1,
 pi  =  3.1415927410e+00, /* 0x40490fdb */
-a0  =  7.7215664089e-02, /* 0x3d9e233f */
-a1  =  3.2246702909e-01, /* 0x3ea51a66 */
-a2  =  6.7352302372e-02, /* 0x3d89f001 */
-a3  =  2.0580807701e-02, /* 0x3ca89915 */
-a4  =  7.3855509982e-03, /* 0x3bf2027e */
-a5  =  2.8905137442e-03, /* 0x3b3d6ec6 */
-a6  =  1.1927076848e-03, /* 0x3a9c54a1 */
-a7  =  5.1006977446e-04, /* 0x3a05b634 */
-a8  =  2.2086278477e-04, /* 0x39679767 */
-a9  =  1.0801156895e-04, /* 0x38e28445 */
-a10 =  2.5214456400e-05, /* 0x37d383a2 */
-a11 =  4.4864096708e-05, /* 0x383c2c75 */
-tc  =  1.4616321325e+00, /* 0x3fbb16c3 */
-tf  = -1.2148628384e-01, /* 0xbdf8cdcd */
-/* tt = -(tail of tf) */
-tt  =  6.6971006518e-09, /* 0x31e61c52 */
-t0  =  4.8383611441e-01, /* 0x3ef7b95e */
-t1  = -1.4758771658e-01, /* 0xbe17213c */
-t2  =  6.4624942839e-02, /* 0x3d845a15 */
-t3  = -3.2788541168e-02, /* 0xbd064d47 */
-t4  =  1.7970675603e-02, /* 0x3c93373d */
-t5  = -1.0314224288e-02, /* 0xbc28fcfe */
-t6  =  6.1005386524e-03, /* 0x3bc7e707 */
-t7  = -3.6845202558e-03, /* 0xbb7177fe */
-t8  =  2.2596477065e-03, /* 0x3b141699 */
-t9  = -1.4034647029e-03, /* 0xbab7f476 */
-t10 =  8.8108185446e-04, /* 0x3a66f867 */
-t11 = -5.3859531181e-04, /* 0xba0d3085 */
-t12 =  3.1563205994e-04, /* 0x39a57b6b */
-t13 = -3.1275415677e-04, /* 0xb9a3f927 */
-t14 =  3.3552918467e-04, /* 0x39afe9f7 */
-u0  = -7.7215664089e-02, /* 0xbd9e233f */
-u1  =  6.3282704353e-01, /* 0x3f2200f4 */
-u2  =  1.4549225569e+00, /* 0x3fba3ae7 */
-u3  =  9.7771751881e-01, /* 0x3f7a4bb2 */
-u4  =  2.2896373272e-01, /* 0x3e6a7578 */
-u5  =  1.3381091878e-02, /* 0x3c5b3c5e */
-v1  =  2.4559779167e+00, /* 0x401d2ebe */
-v2  =  2.1284897327e+00, /* 0x4008392d */
-v3  =  7.6928514242e-01, /* 0x3f44efdf */
-v4  =  1.0422264785e-01, /* 0x3dd572af */
-v5  =  3.2170924824e-03, /* 0x3b52d5db */
-s0  = -7.7215664089e-02, /* 0xbd9e233f */
-s1  =  2.1498242021e-01, /* 0x3e5c245a */
-s2  =  3.2577878237e-01, /* 0x3ea6cc7a */
-s3  =  1.4635047317e-01, /* 0x3e15dce6 */
-s4  =  2.6642270386e-02, /* 0x3cda40e4 */
-s5  =  1.8402845599e-03, /* 0x3af135b4 */
-s6  =  3.1947532989e-05, /* 0x3805ff67 */
-r1  =  1.3920053244e+00, /* 0x3fb22d3b */
-r2  =  7.2193557024e-01, /* 0x3f38d0c5 */
-r3  =  1.7193385959e-01, /* 0x3e300f6e */
-r4  =  1.8645919859e-02, /* 0x3c98bf54 */
-r5  =  7.7794247773e-04, /* 0x3a4beed6 */
-r6  =  7.3266842264e-06, /* 0x36f5d7bd */
-w0  =  4.1893854737e-01, /* 0x3ed67f1d */
-w1  =  8.3333335817e-02, /* 0x3daaaaab */
-w2  = -2.7777778450e-03, /* 0xbb360b61 */
-w3  =  7.9365057172e-04, /* 0x3a500cfd */
-w4  = -5.9518753551e-04, /* 0xba1c065c */
-w5  =  8.3633989561e-04, /* 0x3a5b3dd2 */
-w6  = -1.6309292987e-03; /* 0xbad5c4e8 */
+/*
+ * Domain y in [0x1p-27, 0.27], range ~[-3.4599e-10, 3.4590e-10]:
+ * |(lgamma(2 - y) + 0.5 * y) / y - a(y)| < 2**-31.4
+ */
+a0  =  7.72156641e-02, /* 0x3d9e233f */
+a1  =  3.22467119e-01, /* 0x3ea51a69 */
+a2  =  6.73484802e-02, /* 0x3d89ee00 */
+a3  =  2.06395667e-02, /* 0x3ca9144f */
+a4  =  6.98275631e-03, /* 0x3be4cf9b */
+a5  =  4.11768444e-03, /* 0x3b86eda4 */
+/*
+ * Domain x in [tc-0.24, tc+0.28], range ~[-5.6577e-10, 5.5677e-10]:
+ * |(lgamma(x) - tf) - t(x - tc)| < 2**-30.8.
+ */
+tc  =  1.46163213e+00, /* 0x3fbb16c3 */
+tf  = -1.21486291e-01, /* 0xbdf8cdce */
+t0  = -2.94064460e-11, /* 0xae0154b7 */
+t1  = -2.35939837e-08, /* 0xb2caabb8 */
+t2  =  4.83836412e-01, /* 0x3ef7b968 */
+t3  = -1.47586212e-01, /* 0xbe1720d7 */
+t4  =  6.46013096e-02, /* 0x3d844db1 */
+t5  = -3.28450352e-02, /* 0xbd068884 */
+t6  =  1.86483748e-02, /* 0x3c98c47a */
+t7  = -9.89206228e-03, /* 0xbc221251 */
+/*
+ * Domain y in [-0.1, 0.232], range ~[-8.4931e-10, 8.7794e-10]:
+ * |(lgamma(1 + y) + 0.5 * y) / y - u(y) / v(y)| < 2**-31.2
+ */
+u0  = -7.72156641e-02, /* 0xbd9e233f */
+u1  =  7.36789703e-01, /* 0x3f3c9e40 */
+u2  =  4.95649040e-01, /* 0x3efdc5b6 */
+v1  =  1.10958421e+00, /* 0x3f8e06db */
+v2  =  2.10598111e-01, /* 0x3e57a708 */
+v3  = -1.02995494e-02, /* 0xbc28bf71 */
+/*
+ * Domain x in (2, 3], range ~[-5.5189e-11, 5.2317e-11]:
+ * |(lgamma(y+2) - 0.5 * y) / y - s(y)/r(y)| < 2**-35.0
+ * with y = x - 2.
+ */
+s0 = -7.72156641e-02, /* 0xbd9e233f */
+s1 =  2.69987404e-01, /* 0x3e8a3bca */
+s2 =  1.42851010e-01, /* 0x3e124789 */
+s3 =  1.19389519e-02, /* 0x3c439b98 */
+r1 =  6.79650068e-01, /* 0x3f2dfd8c */
+r2 =  1.16058730e-01, /* 0x3dedb033 */
+r3 =  3.75673687e-03, /* 0x3b763396 */
+/*
+ * Domain z in [8, 0x1p24], range ~[-1.2640e-09, 1.2640e-09]:
+ * |lgamma(x) - (x - 0.5) * (log(x) - 1) - w(1/x)| < 2**-29.6.
+ */
+w0 =  4.18938547e-01, /* 0x3ed67f1d */
+w1 =  8.33332464e-02, /* 0x3daaaa9f */
+w2 = -2.76129087e-03; /* 0xbb34f6c6 */
 
 static float
 sin_pif(float x)
@@ -140,7 +132,11 @@ __ieee754_lgammaf_r(float x, int *signgamp)
 	*signgamp = 1;
 	ix = hx&0x7fffffff;
 	if(ix>=0x7f800000) return x*x;
-	if(ix==0) return one/vzero;
+	if(ix==0) {
+	    if(hx<0)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 	if(ix<0x35000000) {	/* |x|<2**-21, return -log(|x|) */
 	    if(hx<0) {
 	        *signgamp = -1;
@@ -168,55 +164,50 @@ __ieee754_lgammaf_r(float x, int *signgamp)
 	  	else {y = x; i=2;}
 	    } else {
 	  	r = zero;
-	        if(ix>=0x3fdda618) {y=(float)2.0-x;i=0;} /* [1.7316,2] */
+	        if(ix>=0x3fdda618) {y=2-x;i=0;} /* [1.7316,2] */
 	        else if(ix>=0x3F9da620) {y=x-tc;i=1;} /* [1.23,1.73] */
 		else {y=x-one;i=2;}
 	    }
 	    switch(i) {
 	      case 0:
 		z = y*y;
-		p1 = a0+z*(a2+z*(a4+z*(a6+z*(a8+z*a10))));
-		p2 = z*(a1+z*(a3+z*(a5+z*(a7+z*(a9+z*a11)))));
+		p1 = a0+z*(a2+z*a4);
+		p2 = z*(a1+z*(a3+z*a5));
 		p  = y*p1+p2;
-		r  += (p-(float)0.5*y); break;
+		r  += (p-y/2); break;
 	      case 1:
-		z = y*y;
-		w = z*y;
-		p1 = t0+w*(t3+w*(t6+w*(t9 +w*t12)));	/* parallel comp */
-		p2 = t1+w*(t4+w*(t7+w*(t10+w*t13)));
-		p3 = t2+w*(t5+w*(t8+w*(t11+w*t14)));
-		p  = z*p1-(tt-w*(p2+y*p3));
+		p = t0+y*t1+y*y*(t2+y*(t3+y*(t4+y*(t5+y*(t6+y*t7)))));
 		r += (tf + p); break;
 	      case 2:
-		p1 = y*(u0+y*(u1+y*(u2+y*(u3+y*(u4+y*u5)))));
-		p2 = one+y*(v1+y*(v2+y*(v3+y*(v4+y*v5))));
-		r += (-(float)0.5*y + p1/p2);
+		p1 = y*(u0+y*(u1+y*u2));
+		p2 = one+y*(v1+y*(v2+y*v3));
+		r += (p1/p2-y/2);
 	    }
 	}
 	else if(ix<0x41000000) { 			/* x < 8.0 */
-	    i = (int)x;
-	    y = x-(float)i;
-	    p = y*(s0+y*(s1+y*(s2+y*(s3+y*(s4+y*(s5+y*s6))))));
-	    q = one+y*(r1+y*(r2+y*(r3+y*(r4+y*(r5+y*r6)))));
-	    r = half*y+p/q;
+	    i = x;
+	    y = x-i;
+	    p = y*(s0+y*(s1+y*(s2+y*s3)));
+	    q = one+y*(r1+y*(r2+y*r3));
+	    r = y/2+p/q;
 	    z = one;	/* lgamma(1+s) = log(s) + lgamma(s) */
 	    switch(i) {
-	    case 7: z *= (y+(float)6.0);	/* FALLTHRU */
-	    case 6: z *= (y+(float)5.0);	/* FALLTHRU */
-	    case 5: z *= (y+(float)4.0);	/* FALLTHRU */
-	    case 4: z *= (y+(float)3.0);	/* FALLTHRU */
-	    case 3: z *= (y+(float)2.0);	/* FALLTHRU */
+	    case 7: z *= (y+6);		/* FALLTHRU */
+	    case 6: z *= (y+5);		/* FALLTHRU */
+	    case 5: z *= (y+4);		/* FALLTHRU */
+	    case 4: z *= (y+3);		/* FALLTHRU */
+	    case 3: z *= (y+2);		/* FALLTHRU */
 		    r += __ieee754_logf(z); break;
 	    }
-    /* 8.0 <= x < 2**58 */
-	} else if (ix < 0x5c800000) {
+    /* 8.0 <= x < 2**24 */
+	} else if (ix < 0x4b800000) {
 	    t = __ieee754_logf(x);
 	    z = one/x;
 	    y = z*z;
-	    w = w0+z*(w1+y*(w2+y*(w3+y*(w4+y*(w5+y*w6)))));
+	    w = w0+z*(w1+y*w2);
 	    r = (x-half)*(t-one)+w;
 	} else
-    /* 2**58 <= x <= inf */
+    /* 2**24 <= x <= inf */
 	    r =  x*(__ieee754_logf(x)-one);
 	if(hx<0) r = nadj - r;
 	return r;
diff --git a/lib/msun/src/e_lgammal.c b/lib/msun/src/e_lgammal.c
new file mode 100644
index 000000000000..ebc2fc78cbb1
--- /dev/null
+++ b/lib/msun/src/e_lgammal.c
@@ -0,0 +1,25 @@
+/* @(#)e_lgamma.c 1.3 95/01/18 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunSoft, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "math.h"
+#include "math_private.h"
+
+extern int signgam;
+
+long double
+lgammal(long double x)
+{
+	return lgammal_r(x,&signgam);
+}
diff --git a/lib/msun/src/imprecise.c b/lib/msun/src/imprecise.c
index 92fb2d06e98a..08cd23980603 100644
--- a/lib/msun/src/imprecise.c
+++ b/lib/msun/src/imprecise.c
@@ -60,5 +60,4 @@ DECLARE_WEAK(powl);
 	long double imprecise_ ## f ## l(long double v) { return f(v); }\
 	DECLARE_WEAK(f ## l)
 
-DECLARE_IMPRECISE(lgamma);
 DECLARE_IMPRECISE(tgamma);
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index e4e5682c7d0f..2ff1731054be 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -496,8 +496,12 @@ long double	tanhl(long double);
 long double	tanl(long double);
 long double	tgammal(long double);
 long double	truncl(long double);
-
 #endif /* __ISO_C_VISIBLE >= 1999 */
+
+#if __BSD_VISIBLE
+long double	lgammal_r(long double, int *);
+#endif
+
 __END_DECLS
 
 #endif /* !_MATH_H_ */
diff --git a/libexec/Makefile b/libexec/Makefile
index 8a32694d4050..74cc6d8fb27f 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -13,6 +13,7 @@ SUBDIR=	${_atf} \
 	fingerd \
 	ftpd \
 	getty \
+	${_hyperv} \
 	${_mail.local} \
 	${_mknetid} \
 	${_pppoed} \
@@ -54,6 +55,10 @@ _dma=		dma
 _dma-mbox-create=	dma-mbox-create
 .endif
 
+.if ${MK_HYPERV} != "no"
+_hyperv=	hyperv
+.endif
+
 .if ${MK_NIS} != "no"
 _mknetid=	mknetid
 _ypxfr=		ypxfr
diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile
new file mode 100644
index 000000000000..37abdf5b8b3b
--- /dev/null
+++ b/libexec/hyperv/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../contrib/hyperv/tools/scripts
+
+BINDIR=		/usr/libexec/hyperv
+
+SCRIPTS=	hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info
+NO_OBJ=
+
+.include <bsd.prog.mk>
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 67544512715f..cc301328fb39 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -46,7 +46,7 @@ LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic
 
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${MACHINE_CPUARCH} == "arm"
 # Some of the required math functions (div & mod) are implemented in
 # libcompiler_rt on ARM. The library also needs to be placed first to be
 # correctly linked. As some of the functions are used before we have
diff --git a/release/Makefile b/release/Makefile
index 6b4517dc4377..8a6ece7d1b58 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -23,6 +23,9 @@
 #  WITH_DVD: if set, generate dvd1.iso
 #  WITH_COMPRESSED_IMAGES: if set, compress installation images with xz(1)
 #		(uncompressed images are not removed)
+#  WITH_VMIMAGES: if set, build virtual machine images with the release
+#  WITH_COMPRESSED_VMIMAGES: if set, compress virtual machine disk images
+#  		with xz(1) (extremely time consuming)
 #  TARGET/TARGET_ARCH: architecture of built release
 #
 
@@ -94,6 +97,11 @@ IMAGES+=	memstick.img
 IMAGES+=	mini-memstick.img
 .endif
 
+VMTARGETS=	vm-base vm-image
+VMFORMATS?=	vhd vmdk qcow2 raw
+VMSIZE?=	20G
+VMBASE?=	vm
+
 CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
 .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
 . for I in ${IMAGES}
@@ -103,7 +111,16 @@ CLEANFILES+=	${I}.xz
 .if defined(WITH_DVD) && !empty(WITH_DVD)
 CLEANFILES+=	pkg-stage
 .endif
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+CLEANFILES+=	${VMBASE}.img
+. for FORMAT in ${VMFORMATS}
+CLEANFILES+=	${VMBASE}.${FORMAT}
+. endfor
+.endif
 CLEANDIRS=	dist ftp release bootonly dvd
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+CLEANDIRS+=	${VMTARGETS}
+.endif
 beforeclean:
 	chflags -R noschg .
 .include <bsd.obj.mk>
@@ -263,6 +280,9 @@ ftp: packagesystem
 release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
+.endif
 
 install:
 .if defined(DESTDIR) && !empty(DESTDIR)
@@ -277,3 +297,44 @@ install:
 .endfor
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
 	cd ${DESTDIR} && md5 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.MD5
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+	mkdir -p ${DESTDIR}/vmimages
+. for FORMAT in ${VMFORMATS}
+	cp -p ${VMBASE}.${FORMAT} \
+		${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
+. endfor
+. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
+# This is very time consuming, so defer it after the images are moved to
+# the DESTDIR.
+.  for FORMAT in ${VMFORMATS}
+	# Don't keep the originals.  There is a copy in ${.OBJDIR} if needed.
+	${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
+.  endfor
+. endif
+	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
+		${DESTDIR}/vmimages/CHECKSUM.SHA256
+	cd ${DESTDIR}/vmimages && md5 ${OSRELEASE}* > \
+		${DESTDIR}/vmimages/CHECKSUM.MD5
+.endif
+
+vm-base:
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
+		${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE}
+. endif
+.endif
+	touch ${.TARGET}
+
+vm-image: vm-base
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+.  for FORMAT in ${VMFORMATS}
+	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
+		${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT}
+.  endfor
+. endif
+.endif
+	touch ${.TARGET}
diff --git a/release/amd64/mk-vmimage.sh b/release/amd64/mk-vmimage.sh
new file mode 100755
index 000000000000..6ee148248cd5
--- /dev/null
+++ b/release/amd64/mk-vmimage.sh
@@ -0,0 +1,188 @@
+#!/bin/sh
+#-
+# Copyright (c) 2014 The FreeBSD Foundation
+# All rights reserved.
+#
+# This software was developed by Glen Barber under sponsorship
+# from the FreeBSD Foundation.
+#
+# 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 AUTHOR 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 AUTHOR 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.
+#
+# mk-vmimage.sh: Create virtual machine disk images in various formats.
+#
+# $FreeBSD$
+#
+
+PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+export PATH
+
+usage_vm_base() {
+	echo -n "$(basename ${0}) vm-base <base image> <source tree>"
+	echo	" <dest dir> <disk image size>"
+	return 0
+}
+
+usage_vm_image() {
+	echo -n "$(basename ${0}) vm-image <base image> <image format>"
+	echo	" <output image>"
+	return 0
+}
+
+usage() {
+	echo "Usage:"
+	echo "$(basename ${0}) [vm-base|vm-image] [...]"
+	echo
+	usage_vm_base
+	echo
+	usage_vm_image
+	exit 1
+}
+
+panic() {
+	rc="${1}"
+	shift 1
+	msg="${@}"
+	printf "${msg}\n"
+	if [ ! -z "${mddev}" ]; then
+		mdconfig -d -u ${mddev}
+	fi
+	# Do not allow one failure case to chain through any remaining image
+	# builds.
+	exit 0
+}
+
+vm_create_baseimage() {
+	# Creates the UFS root filesystem for the virtual machine disk,
+	# written to the formatted disk image with mkimg(1).
+	#
+	# Arguments:
+	# vm-base <base image> <source tree> <dest dir> <disk image size>
+
+	VMBASE="${1}"
+	WORLDDIR="${2}"
+	DESTDIR="${3}"
+	VMSIZE="${4}"
+
+	if [ -z "${VMBASE}" -o -z "${WORLDDIR}" -o -z "${DESTDIR}" \
+		-o -z "${VMSIZE}" ]; then
+			usage
+	fi
+
+	i=0
+	mkdir -p ${DESTDIR}
+	truncate -s ${VMSIZE} ${VMBASE}
+	mddev=$(mdconfig -f ${VMBASE})
+	newfs -j /dev/${mddev}
+	mount /dev/${mddev} ${DESTDIR}
+	cd ${WORLDDIR} && \
+		make DESTDIR=${DESTDIR} \
+		installworld installkernel distribution || \
+		panic 1 "\n\nCannot install the base system to ${DESTDIR}."
+	chroot ${DESTDIR} /usr/bin/newaliases
+	echo '# Custom /etc/fstab for FreeBSD VM images' \
+		> ${DESTDIR}/etc/fstab
+	echo '/dev/gpt/rootfs	/	ufs	rw	2	2' \
+		>> ${DESTDIR}/etc/fstab
+	echo '/dev/gpt/swapfs	none	swap	sw	0	0' \
+		>> ${DESTDIR}/etc/fstab
+	sync
+	while ! umount ${DESTDIR}; do
+		i=$(( $i + 1 ))
+		if [ $i -ge 10 ]; then
+			# This should never happen.  But, it has happened.
+			msg="Cannot umount(8) ${DESTDIR}\n"
+			msg="${msg}Something has gone horribly wrong."
+			panic 1 "${msg}"
+		fi
+		sleep 1
+	done
+
+	return 0
+}
+
+vm_create_vmdisk() {
+	# Creates the virtual machine disk image from the raw disk image.
+	#
+	# Arguments:
+	# vm-image <base image> <image format> <output image>"
+
+	VMBASE="${1}"
+	FORMAT="${2}"
+	VMIMAGE="${3}"
+
+	if [ -z "${VMBASE}" -o -z "${FORMAT}" -o -z "${VMIMAGE}" ]; then
+		usage
+	fi
+
+	mkimg_version=$(mkimg --version 2>/dev/null | awk '{print $2}')
+
+	# We need mkimg(1) '--version' output, at minimum, to be able to
+	# tell what virtual machine disk image formats are available.
+	# Bail if mkimg(1) reports an empty '--version' value.
+	if [ -z "${mkimg_version}" ]; then
+		msg="Cannot determine mkimg(1) version.\n"
+		msg="${msg}Cannot continue without a known mkimg(1) version."
+		panic 0 "${msg}"
+	fi
+
+	if ! mkimg --formats 2>/dev/null | grep -q ${FORMAT}; then
+		panic 0 "'${FORMAT}' is not supported by this mkimg(1).\n"
+	fi
+
+	case ${FORMAT} in
+		vhd)
+			mkimg_format=vhdf
+			;;
+		*)
+			mkimg_format=${FORMAT}
+			;;
+	esac
+
+	mkimg -f ${mkimg_format} -s gpt \
+		-b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
+		-p freebsd-swap/swapfs::1G \
+		-p freebsd-ufs/rootfs:=${VMBASE} \
+		-o ${VMIMAGE}
+
+	return 0
+}
+
+main() {
+	cmd="${1}"
+	shift 1
+
+	case ${cmd} in
+		vm-base)
+			eval vm_create_baseimage "$@" || return 0
+			;;
+		vm-image)
+			eval vm_create_vmdisk "$@" || return 0
+			;;
+		*|\?)
+			usage
+			;;
+	esac
+
+	return 0
+}
+
+main "$@"
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 025bcb7725c8..28e084d808a7 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -33,5 +33,5 @@ load_target_env() {
 	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
 	export KERNEL="BEAGLEBONE"
 	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-	export CROCHETBRANCH="trunk"
+	export CROCHETBRANCH="trunk@r744"
 }
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index afc53d56f18d..a9fbb6f4f57f 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -33,5 +33,5 @@ load_target_env() {
 	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
 	export KERNEL="PANDABOARD"
 	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-	export CROCHETBRANCH="trunk"
+	export CROCHETBRANCH="trunk@r744"
 }
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 22ffb2b10a1a..d9ab15638afe 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -33,7 +33,7 @@ load_target_env() {
 	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
 	export KERNEL="RPI-B"
 	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-	export CROCHETBRANCH="trunk"
+	export CROCHETBRANCH="trunk@r744"
 	export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
 	export UBOOTBRANCH="trunk"
 	export UBOOTDIR="/tmp/crochet/u-boot-rpi"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 67933df57aed..4249bf65219e 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -33,5 +33,5 @@ load_target_env() {
 	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
 	export KERNEL="WANDBOARD-QUAD"
 	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-	export CROCHETBRANCH="trunk"
+	export CROCHETBRANCH="trunk@r744"
 }
diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
index c35d692d346e..a6d1de0b4a4e 100644
--- a/release/arm/ZEDBOARD.conf
+++ b/release/arm/ZEDBOARD.conf
@@ -32,5 +32,5 @@ load_target_env() {
 	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
 	export KERNEL="ZEDBOARD"
 	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-	export CROCHETBRANCH="trunk"
+	export CROCHETBRANCH="trunk@r744"
 }
diff --git a/release/arm/release.sh b/release/arm/release.sh
index 0dc8de7ada85..020583fdc25c 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -44,8 +44,8 @@ before_build() {
 	case ${KERNEL} in
 		BEAGLEBONE)
 			WANT_UBOOT=1
-			KNOWNHASH="4150e5a4480707c55a8d5b4570262e43af68d8ed3bdc0a433d8e7df47989a69e"
-			UBOOT_VERSION="u-boot-2013.04"
+			KNOWNHASH="7b6444bd23eb61068c43bd1d44ec7e7bfdbce5cadeca20c833eee186b4d3fd31"
+			UBOOT_VERSION="u-boot-2014.04"
 			;;
 		PANDABOARD)
 			WANT_UBOOT=1
@@ -54,8 +54,8 @@ before_build() {
 			;;
 		WANDBOARD-QUAD)
 			WANT_UBOOT=1
-			KNOWNHASH="0d71e62beb952b41ebafb20a7ee4df2f960db64c31b054721ceb79ff14014c55"
-			UBOOT_VERSION="u-boot-2013.10"
+			KNOWNHASH="b4f83b8db325c21671a997198ec3a373e2e00dde2fcf17be9b9afd7cfd727f56"
+			UBOOT_VERSION="u-boot-2014.07"
 			;;
 		*)
 			# Fallthrough.
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 8919eefd7de1..444e3cab796a 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -837,6 +837,8 @@
 
       &hwlist.igb;
 
+      &hwlist.ipheth;
+
       &hwlist.ixgb;
 
       &hwlist.ixgbe;
@@ -885,6 +887,8 @@
 
       &hwlist.sk;
 
+      &hwlist.smsc;
+
       &hwlist.sn;
 
       &hwlist.snc;
diff --git a/release/doc/en_US.ISO8859-1/share/xml/release.xsl b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
index f1d14795f794..a854cd903bc5 100644
--- a/release/doc/en_US.ISO8859-1/share/xml/release.xsl
+++ b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
@@ -8,6 +8,7 @@
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+  <xsl:param name="release.maillist"/>
 
   <xsl:template name="user.footer.content">
     <p align="center"><small>This file, and other release-related documents,
@@ -18,7 +19,7 @@
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p>
 
     <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should
-      subscribe to the &lt;<a href="mailto:current@FreeBSD.org">current@FreeBSD.org</a>&gt;
+      subscribe to the &lt;<a href="mailto:{$release.maillist}@FreeBSD.org"><xsl:value-of select="$release.maillist"/>@FreeBSD.org</a>&gt;
       mailing list.</small></p>
   
     <p align="center"><small>For questions about this documentation,
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 8034c6315d3d..8ae9fd0e92c0 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -6,6 +6,7 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
 RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
 RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
+RELEASEMAILLIST!= grep -o 'release.maillist "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
 .if ${RELEASETYPE} == "current"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
 .elif ${RELEASETYPE} == "snapshot"
@@ -15,6 +16,7 @@ PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'re
 .endif
 XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'"
 XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'"
+XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'"
 
 # Find the RELNOTESng document catalogs
 EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index bdd58b70bd6a..4e7709ab1304 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -27,6 +27,9 @@
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
 
+<!-- The recommended mailing list to track. -->
+<!ENTITY release.maillist "current">
+
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
 <!-- WARNING: Do not forget to also change the release type in
@@ -68,6 +71,7 @@
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
+<!ENTITY arch.powerpc64 "powerpc64">
 <!ENTITY arch.sparc64 "sparc64">
 
 <!-- The marker for MFCs. -->
diff --git a/release/doc/share/xml/release.xsl b/release/doc/share/xml/release.xsl
index d3616a0c2beb..f76ae683d8a5 100644
--- a/release/doc/share/xml/release.xsl
+++ b/release/doc/share/xml/release.xsl
@@ -12,6 +12,7 @@
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+  <xsl:param name="release.maillist"/>
 
   <xsl:template name="paragraph">
     <xsl:param name="class" select="''"/>
diff --git a/release/i386/mk-vmimage.sh b/release/i386/mk-vmimage.sh
new file mode 100755
index 000000000000..6ee148248cd5
--- /dev/null
+++ b/release/i386/mk-vmimage.sh
@@ -0,0 +1,188 @@
+#!/bin/sh
+#-
+# Copyright (c) 2014 The FreeBSD Foundation
+# All rights reserved.
+#
+# This software was developed by Glen Barber under sponsorship
+# from the FreeBSD Foundation.
+#
+# 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 AUTHOR 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 AUTHOR 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.
+#
+# mk-vmimage.sh: Create virtual machine disk images in various formats.
+#
+# $FreeBSD$
+#
+
+PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+export PATH
+
+usage_vm_base() {
+	echo -n "$(basename ${0}) vm-base <base image> <source tree>"
+	echo	" <dest dir> <disk image size>"
+	return 0
+}
+
+usage_vm_image() {
+	echo -n "$(basename ${0}) vm-image <base image> <image format>"
+	echo	" <output image>"
+	return 0
+}
+
+usage() {
+	echo "Usage:"
+	echo "$(basename ${0}) [vm-base|vm-image] [...]"
+	echo
+	usage_vm_base
+	echo
+	usage_vm_image
+	exit 1
+}
+
+panic() {
+	rc="${1}"
+	shift 1
+	msg="${@}"
+	printf "${msg}\n"
+	if [ ! -z "${mddev}" ]; then
+		mdconfig -d -u ${mddev}
+	fi
+	# Do not allow one failure case to chain through any remaining image
+	# builds.
+	exit 0
+}
+
+vm_create_baseimage() {
+	# Creates the UFS root filesystem for the virtual machine disk,
+	# written to the formatted disk image with mkimg(1).
+	#
+	# Arguments:
+	# vm-base <base image> <source tree> <dest dir> <disk image size>
+
+	VMBASE="${1}"
+	WORLDDIR="${2}"
+	DESTDIR="${3}"
+	VMSIZE="${4}"
+
+	if [ -z "${VMBASE}" -o -z "${WORLDDIR}" -o -z "${DESTDIR}" \
+		-o -z "${VMSIZE}" ]; then
+			usage
+	fi
+
+	i=0
+	mkdir -p ${DESTDIR}
+	truncate -s ${VMSIZE} ${VMBASE}
+	mddev=$(mdconfig -f ${VMBASE})
+	newfs -j /dev/${mddev}
+	mount /dev/${mddev} ${DESTDIR}
+	cd ${WORLDDIR} && \
+		make DESTDIR=${DESTDIR} \
+		installworld installkernel distribution || \
+		panic 1 "\n\nCannot install the base system to ${DESTDIR}."
+	chroot ${DESTDIR} /usr/bin/newaliases
+	echo '# Custom /etc/fstab for FreeBSD VM images' \
+		> ${DESTDIR}/etc/fstab
+	echo '/dev/gpt/rootfs	/	ufs	rw	2	2' \
+		>> ${DESTDIR}/etc/fstab
+	echo '/dev/gpt/swapfs	none	swap	sw	0	0' \
+		>> ${DESTDIR}/etc/fstab
+	sync
+	while ! umount ${DESTDIR}; do
+		i=$(( $i + 1 ))
+		if [ $i -ge 10 ]; then
+			# This should never happen.  But, it has happened.
+			msg="Cannot umount(8) ${DESTDIR}\n"
+			msg="${msg}Something has gone horribly wrong."
+			panic 1 "${msg}"
+		fi
+		sleep 1
+	done
+
+	return 0
+}
+
+vm_create_vmdisk() {
+	# Creates the virtual machine disk image from the raw disk image.
+	#
+	# Arguments:
+	# vm-image <base image> <image format> <output image>"
+
+	VMBASE="${1}"
+	FORMAT="${2}"
+	VMIMAGE="${3}"
+
+	if [ -z "${VMBASE}" -o -z "${FORMAT}" -o -z "${VMIMAGE}" ]; then
+		usage
+	fi
+
+	mkimg_version=$(mkimg --version 2>/dev/null | awk '{print $2}')
+
+	# We need mkimg(1) '--version' output, at minimum, to be able to
+	# tell what virtual machine disk image formats are available.
+	# Bail if mkimg(1) reports an empty '--version' value.
+	if [ -z "${mkimg_version}" ]; then
+		msg="Cannot determine mkimg(1) version.\n"
+		msg="${msg}Cannot continue without a known mkimg(1) version."
+		panic 0 "${msg}"
+	fi
+
+	if ! mkimg --formats 2>/dev/null | grep -q ${FORMAT}; then
+		panic 0 "'${FORMAT}' is not supported by this mkimg(1).\n"
+	fi
+
+	case ${FORMAT} in
+		vhd)
+			mkimg_format=vhdf
+			;;
+		*)
+			mkimg_format=${FORMAT}
+			;;
+	esac
+
+	mkimg -f ${mkimg_format} -s gpt \
+		-b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
+		-p freebsd-swap/swapfs::1G \
+		-p freebsd-ufs/rootfs:=${VMBASE} \
+		-o ${VMIMAGE}
+
+	return 0
+}
+
+main() {
+	cmd="${1}"
+	shift 1
+
+	case ${cmd} in
+		vm-base)
+			eval vm_create_baseimage "$@" || return 0
+			;;
+		vm-image)
+			eval vm_create_vmdisk "$@" || return 0
+			;;
+		*|\?)
+			usage
+			;;
+	esac
+
+	return 0
+}
+
+main "$@"
diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
index 0d53a09910e8..58d4febe0fe9 100644
--- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c
+++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
@@ -160,8 +160,8 @@ http_date(void)
 void
 http_output(const char *html)
 {
-        write(con_sock, html, strlen(html));
-        write(con_sock, "\r\n", 2);
+	write(con_sock, html, strlen(html));
+	write(con_sock, "\r\n", 2);
 }
 
 
@@ -172,30 +172,30 @@ http_output(const char *html)
 void
 log_line(char *req)
 {
-        char            log_buff[256];
-        char            msg[1024];
-	char            env_host[80], env_addr[80];
-	long            addr;
-	FILE           *log;
+	char	log_buff[256];
+	char	msg[1024];
+	char	env_host[80], env_addr[80];
+	long	addr;
+	FILE	*log;
 
 	strcpy(log_buff,inet_ntoa(source.sin_addr));
 	sprintf(env_addr, "REMOTE_ADDR=%s",log_buff);
 
-        addr=inet_addr(log_buff);
-        
-        strcpy(msg,adate());
-        strcat(msg,"    ");                 
-        hst=gethostbyaddr((char*) &addr, 4, AF_INET);
+	addr=inet_addr(log_buff);
+
+	strcpy(msg,adate());
+	strcat(msg,"    ");
+	hst=gethostbyaddr((char*) &addr, 4, AF_INET);
 
 	/* If DNS hostname exists */
-        if (hst) {
+	if (hst) {
 	  strcat(msg,hst->h_name);
 	  sprintf(env_host, "REMOTE_HOST=%s",hst->h_name);
 	}
-        strcat(msg," (");
-        strcat(msg,log_buff);
-        strcat(msg,")   ");
-        strcat(msg,req);
+	strcat(msg," (");
+	strcat(msg,log_buff);
+	strcat(msg,")   ");
+	strcat(msg,req);
 
 	if (daemonize) {
 	  log=fopen(logfile,"a");
@@ -226,8 +226,8 @@ http_request(void)
 
 	lg = read(con_sock, req, 1024);
 
-        if ((p=strstr(req,"\n"))) *p=0;
-        if ((p=strstr(req,"\r"))) *p=0;
+	if ((p=strstr(req,"\n"))) *p=0;
+	if ((p=strstr(req,"\r"))) *p=0;
 
 	log_line(req);
 
@@ -253,40 +253,40 @@ http_request(void)
 	filename = strtok(NULL, " ");
 
 	c = strtok(NULL, " ");
-	if (fetch_mode != NULL) filename=fetch_mode; 
-	if (filename == NULL || 
-            strlen(filename)==1) filename="/index.html"; 
+	if (fetch_mode != NULL) filename=fetch_mode;
+	if (filename == NULL ||
+	    strlen(filename)==1) filename="/index.html";
 
-	while (filename[0]== '/') filename++;        
+	while (filename[0]== '/') filename++;
 	
-        /* CGI handling.  Untested */
-        if (!strncmp(filename,"cgi-bin/",8))           
-           {
-           par=0;
-           if ((par=strstr(filename,"?")))                        
-              {
-               *par=0;            
-                par++;      
-              } 
-           if (access(filename,X_OK)) goto conti;
-           stat (filename,&file_status);
-           if (setuid(file_status.st_uid)) return;
-           if (seteuid(file_status.st_uid)) return;
-           if (!fork())
-              {
-               close(1);
-               dup(con_sock);
-               /*printf("HTTP/1.0 200 OK\nContent-type: text/html\n\n\n");*/
+	/* CGI handling.  Untested */
+	if (!strncmp(filename,"cgi-bin/",8))
+	   {
+	   par=0;
+	   if ((par=strstr(filename,"?")))
+	      {
+	       *par=0;
+	        par++;
+	      } 
+	   if (access(filename,X_OK)) goto conti;
+	   stat (filename,&file_status);
+	   if (setuid(file_status.st_uid)) return;
+	   if (seteuid(file_status.st_uid)) return;
+	   if (!fork())
+	      {
+	       close(1);
+	       dup(con_sock);
+	       /*printf("HTTP/1.0 200 OK\nContent-type: text/html\n\n\n");*/
 	       printf("HTTP/1.0 200 OK\r\n");
-               /* Plug in environment variable, others in log_line */
+	       /* Plug in environment variable, others in log_line */
 	       setenv("SERVER_SOFTWARE", "FreeBSD/PicoBSD", 1);
 
 	       execlp (filename,filename,par,(char *)0);
-              } 
-            wait(&i);
-            return;
-            }
-        conti:
+	      } 
+	    wait(&i);
+	    return;
+	    }
+	conti:
 	if (filename == NULL) {
 	  http_output(http_405[0]);
 	  http_output(http_405[1]);
@@ -307,8 +307,8 @@ http_request(void)
 	/* Open filename */
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-	        http_output(http_404[0]);
-	        http_output(http_404[1]);
+		http_output(http_404[0]);
+		http_output(http_404[1]);
 		goto end_request;
 	}
 
@@ -325,7 +325,7 @@ http_request(void)
 	  http_output(http_404[1]);
 	  goto end_request2;
 	}
-     
+
 	/* Past this point we are serving either a GET or HEAD */
 	/* Print all the header info */
 	http_output(http_200);
@@ -371,14 +371,14 @@ http_request(void)
 int
 main(int argc, char *argv[])
 {
-        int ch, ld;
-	int             httpd_group = 65534;
-        pid_t server_pid;
-  
+	int ch, ld;
+	pid_t httpd_group = 65534;
+	pid_t server_pid;
+
 	/* Default for html directory */
 	strcpy (homedir,getenv("HOME"));
-        if (!geteuid()) strcpy (homedir,"/httphome");
-           else         strcat (homedir,"/httphome");
+	if (!geteuid())	strcpy (homedir,"/httphome");
+	   else		strcat (homedir,"/httphome");
 
 	/* Defaults for log file */
 	if (geteuid()) {
@@ -420,10 +420,10 @@ main(int argc, char *argv[])
 	    printf("usage: simple_httpd [[-d directory][-g grpid][-l logfile][-p port][-vD]]\n");
 	    exit(1);
 	    /* NOTREACHED */
-	  }                           
+	  }
 
 	/* Not running as root and no port supplied, assume 1080 */
-        if ((http_port == 80) && geteuid()) {
+	if ((http_port == 80) && geteuid()) {
 	  http_port = 1080;
 	}
 
@@ -437,15 +437,15 @@ main(int argc, char *argv[])
 	}
 
 	/* Create log file if it doesn't exit */
-	if ((access(logfile,W_OK)) && daemonize) { 
-	  ld = open (logfile,O_WRONLY);         
+	if ((access(logfile,W_OK)) && daemonize) {
+	  ld = open (logfile,O_WRONLY);
 	  chmod (logfile,00600);
 	  close(ld);
 	}
 
-        init_servconnection();                  
+	init_servconnection();
 
-        if (verbose) {
+	if (verbose) {
 	  printf("Server started with options \n"); 
 	  printf("port: %d\n",http_port);
 	  if (fetch_mode == NULL) printf("html home: %s\n",homedir);
@@ -453,7 +453,7 @@ main(int argc, char *argv[])
 	}
 
 	/* httpd is spawned */
-        if (daemonize) {
+	if (daemonize) {
 	  if ((server_pid = fork()) != 0) {
 	    wait3(0,WNOHANG,0);
 	    if (verbose) printf("pid: %d\n",server_pid);
@@ -462,16 +462,17 @@ main(int argc, char *argv[])
 	  wait3(0,WNOHANG,0);
 	}
 
-	if (fetch_mode == NULL) setpgrp(0,httpd_group);
+	if (fetch_mode == NULL)
+		setpgrp((pid_t)0, httpd_group);
 
 	/* How many connections do you want? 
 	 * Keep this lower than the available number of processes
 	 */
-        if (listen(http_sock,15) < 0) exit(1);
+	if (listen(http_sock,15) < 0) exit(1);
 
-        label:	
+	label:	
 	wait_connection();
-    
+
 	if (fork()) {
 	  wait3(0,WNOHANG,0);
 	  close(con_sock);
@@ -488,13 +489,13 @@ main(int argc, char *argv[])
 char *
 adate(void)
 {
-        static char out[50];
-        time_t now;
-        struct tm *t;
-        time(&now);
-        t = localtime(&now);
-        sprintf(out, "%02d:%02d:%02d %02d/%02d/%02d",
-                     t->tm_hour, t->tm_min, t->tm_sec,
-                     t->tm_mday, t->tm_mon+1, t->tm_year );
-        return out;
+	static char out[50];
+	time_t now;
+	struct tm *t;
+	time(&now);
+	t = localtime(&now);
+	sprintf(out, "%02d:%02d:%02d %02d/%02d/%02d",
+		     t->tm_hour, t->tm_min, t->tm_sec,
+		     t->tm_mday, t->tm_mon+1, t->tm_year );
+	return out;
 }
diff --git a/release/rc.local b/release/rc.local
index 2c846c4e384d..cb442273c303 100755
--- a/release/rc.local
+++ b/release/rc.local
@@ -10,6 +10,9 @@
 
 MACHINE=`uname -m`
 
+# resolv.conf from DHCP ends up in here, so make sure the directory exists
+mkdir /tmp/bsdinstall_etc
+
 kbdcontrol -d >/dev/null 2>&1
 if [ $? -eq 0 ]; then
 	# Syscons: use xterm, start interesting things on other VTYs
diff --git a/release/release.conf.sample b/release/release.conf.sample
index bdd5a8a05d91..c79ed9f87003 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -77,3 +77,24 @@ PORTBRANCH="ports/head@rHEAD"
 ## as TARGET/TARGET_ARCH.
 #CHROOT_MAKEENV=
 
+## Set to a non-empty value to build virtual machine images as part of the
+## release build.
+#WITH_VMIMAGES=
+
+## Set to a non-empty value to compress virtual machine images with xz(1)
+## as part of the release build.
+#WITH_COMPRESSED_VMIMAGES=
+
+## If WITH_VMIMAGES is set to a non-empty value, this is the name of the
+## file to use for the installed userland/kernel.
+#VMBASE="vm"
+
+## If WITH_VMIMAGES is set to a non-empty value, this is the size of the
+## virtual machine disk filesystem.  Valid size values are described in
+## the truncate(1) manual page.
+#VMSIZE="20G"
+
+## If WITH_VMIMAGES is set to a non-empty value, this is a list of disk
+## image formats to create.  Valid values are listed in the mkimg(1)
+## manual page, as well as 'mkimg --formats' output.
+#VMFORMATS="vhdf vmdk qcow2 raw"
diff --git a/release/release.sh b/release/release.sh
index e99c403d22b0..87b36974070a 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -89,6 +89,11 @@ NOPORTS=
 WITH_DVD=
 WITH_COMPRESSED_IMAGES=
 
+# Set to non-empty value to build virtual machine images as part of
+# the release.
+WITH_VMIMAGES=
+WITH_COMPRESSED_VMIMAGES=
+
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
@@ -169,7 +174,7 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}"
 RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
-	${DOCPORTS} WITH_DVD=${WITH_DVD}"
+	${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=
@@ -274,4 +279,5 @@ eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
 	release
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
-	install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES}
+	install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \
+	WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 6d02ac630f21..0b9963284d60 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -40,20 +40,23 @@ if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
-PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
-PKG_ABI="${PKG_ABI%\";}"
-PKG_ABI="${PKG_ABI#\"}"
-export PKG_ABI
-export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PKG_ABI=$(pkg config ABI)
+export PKG_REPODIR="dvd/packages/${PKG_ABI}"
 
-/bin/mkdir -p ${PKG_CACHEDIR}
+/bin/mkdir -p ${PKG_REPODIR}
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f
-${PKGCMD} fetch -d ${DVD_PACKAGES}
+${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
-${PKGCMD} repo ${PKG_CACHEDIR}
+# Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
+# using the on-disc packages.
+mkdir -p ${PKG_REPODIR}/Latest
+(cd ${PKG_REPODIR}/Latest && \
+	ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).txz pkg.txz)
+
+${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.
 exit 0
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index e991fbbc0109..7445f29b8140 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -137,7 +137,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel
 .endif
 
 .if ${MACHINE} == "pc98"
-CRUNCH_PROGS_sbin+= bsdlabel
 CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
 .endif
 
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 12a0e5c56849..4129cf4c2724 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -4469,9 +4469,9 @@ tagcontrol(struct cam_device *device, int argc, char **argv,
 		fprintf(stdout, "%s", pathstr);
 		fprintf(stdout, "dev_active    %d\n", ccb->cgds.dev_active);
 		fprintf(stdout, "%s", pathstr);
-		fprintf(stdout, "devq_openings %d\n", ccb->cgds.devq_openings);
+		fprintf(stdout, "allocated     %d\n", ccb->cgds.allocated);
 		fprintf(stdout, "%s", pathstr);
-		fprintf(stdout, "devq_queued   %d\n", ccb->cgds.devq_queued);
+		fprintf(stdout, "queued        %d\n", ccb->cgds.queued);
 		fprintf(stdout, "%s", pathstr);
 		fprintf(stdout, "held          %d\n", ccb->cgds.held);
 		fprintf(stdout, "%s", pathstr);
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index f79ca2f7b95b..859f48b1a66a 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -127,17 +127,6 @@ assemble_udp_ip_header(unsigned char *buf, int *bufix, u_int32_t from,
 	ip.ip_dst.s_addr = to;
 
 	ip.ip_sum = wrapsum(checksum((unsigned char *)&ip, sizeof(ip), 0));
-
-	/*
-	 * While the BPF -- used for broadcasts -- expects a "true" IP header
-	 * with all the bytes in network byte order, the raw socket interface
-	 * which is used for unicasts expects the ip_len field to be in host
-	 * byte order.  In both cases, the checksum has to be correct, so this
-	 * is as good a place as any to turn the bytes around again.
-	 */
-	if (to != INADDR_BROADCAST)
-		ip.ip_len = ntohs(ip.ip_len);
-
 	memcpy(&buf[*bufix], &ip, sizeof(ip));
 	*bufix += sizeof(ip);
 
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 8258f079c0ed..8a9a378dfc40 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -673,7 +673,12 @@ ufs2_blksout(union dinode *dp, ufs2_daddr_t *blkp, int frags, ino_t ino,
 	 */
 	blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
 	if (last) {
-		resid = howmany(fragoff(sblock, dp->dp2.di_size), TP_BSIZE);
+		if (writingextdata)
+			resid = howmany(fragoff(sblock, spcl.c_extsize),
+			    TP_BSIZE);
+		else
+			resid = howmany(fragoff(sblock, dp->dp2.di_size),
+			    TP_BSIZE);
 		if (resid > 0)
 			blks -= howmany(sblock->fs_fsize, TP_BSIZE) - resid;
 	}
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index e5932f8a2d36..6961d31d58a8 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -7,7 +7,7 @@ MAN=	fdisk.8
 
 .PATH:	${.CURDIR}/../../sys/geom
 
-DPADD	+=	${LIBGEOM}
-LDADD	+=	-lgeom
+DPADD+=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
+LDADD+=	-lgeom -lbsdxml -lsbuf
 
 .include <bsd.prog.mk>
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index d2e65e4dc96f..0f8688a8b3e1 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -254,6 +254,8 @@ in6_status(int s __unused, const struct ifaddrs *ifa)
 		printf("autoconf ");
 	if ((flags6 & IN6_IFF_TEMPORARY) != 0)
 		printf("temporary ");
+	if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
+		printf("prefer_source ");
 
 	if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id)
 		printf("scopeid 0x%x ",
@@ -465,6 +467,8 @@ static struct cmd inet6_cmds[] = {
 	DEF_CMD("-deprecated", -IN6_IFF_DEPRECATED,	setip6flags),
 	DEF_CMD("autoconf",	IN6_IFF_AUTOCONF,	setip6flags),
 	DEF_CMD("-autoconf",	-IN6_IFF_AUTOCONF,	setip6flags),
+	DEF_CMD("prefer_source",IN6_IFF_PREFER_SOURCE,	setip6flags),
+	DEF_CMD("-prefer_source",-IN6_IFF_PREFER_SOURCE,setip6flags),
 	DEF_CMD("accept_rtadv",	ND6_IFF_ACCEPT_RTADV,	setnd6flags),
 	DEF_CMD("-accept_rtadv",-ND6_IFF_ACCEPT_RTADV,	setnd6flags),
 	DEF_CMD("no_radr",	ND6_IFF_NO_RADR,	setnd6flags),
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 5bf590d047d6..02766a142fea 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd June 5, 2014
+.Dd October 1, 2014
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -679,7 +679,7 @@ Set a flag to enable Neighbor Unreachability Detection.
 Clear a flag
 .Cm nud .
 .It Cm no_prefer_iface
-Set a flag to not honor rule 5 of source address selection in RFC 3484.         
+Set a flag to not honor rule 5 of source address selection in RFC 3484.
 In practice this means the address on the outgoing interface will not be
 preferred, effectively yielding the decision to the address selection
 policy table, configurable with
@@ -689,6 +689,19 @@ Clear a flag
 .Cm no_prefer_iface .
 .El
 .Pp
+The following parameters are specific for IPv6 addresses.
+Note that the address family keyword
+.Dq Li inet6
+is needed for them:
+.Bl -tag -width indent
+.It Cm prefer_source
+Set a flag to prefer address as a candidate of the source address for
+outgoing packets.
+.It Cm -prefer_source
+Clear a flag
+.Cm prefer_source .
+.El
+.Pp
 The following parameters are specific to cloning
 IEEE 802.11 wireless interfaces with the
 .Cm create
@@ -2318,9 +2331,16 @@ Remove the interface named by
 from the aggregation interface.
 .It Cm laggproto Ar proto
 Set the aggregation protocol.
-The default is failover.
-The available options are failover, fec, lacp, loadbalance, roundrobin and
-none.
+The default is
+.Li failover .
+The available options are
+.Li failover ,
+.Li lacp ,
+.Li loadbalance ,
+.Li roundrobin ,
+.Li broadcast
+and
+.Li none .
 .It Cm lagghash Ar option Ns Oo , Ns Ar option Oc
 Set the packet layers to hash for aggregation protocols which load balance.
 The default is
@@ -2335,6 +2355,34 @@ src/dst address for IPv4 or IPv6.
 .It Cm l4
 src/dst port for TCP/UDP/SCTP.
 .El
+.It Cm use_flowid
+Enable local hash computation for RSS hash on the interface.
+The
+.Li loadbalance
+and
+.Li lacp
+modes will use the RSS hash from the network card if available
+to avoid computing one, this may give poor traffic distribution
+if the hash is invalid or uses less of the protocol header information.
+.Cm use_flowid
+disables use of RSS hash from the network card.
+The default value can be set via the
+.Va net.link.lagg.default_use_flowid
+.Xr sysctl 8
+variable.
+.Li 0
+means
+.Dq disabled
+and
+.Li 1
+means
+.Dq enabled .
+.It Cm -use_flowid
+Disable local hash computation for RSS hash on the interface.
+.It Cm flowid_shift Ar number
+Set a shift parameter for RSS local hash computation.
+Hash is calculated by using flowid bits in a packet header mbuf
+which are shifted by the number of this parameter.
 .El
 .Pp
 The following parameters are specific to IP tunnel interfaces,
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index e449c1d4ccbd..6df9acf97313 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -74,6 +74,7 @@ void	callback_register(callback_func *, void *);
 #define	DEF_CMD_ARG2(name, func)	{ name, NEXTARG2, { .c_func2 = func }, 0, NULL }
 #define	DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1, NULL }
 #define	DEF_CLONE_CMD_ARG(name, func)	{ name, NEXTARG, { .c_func = func }, 1, NULL }
+#define	DEF_CLONE_CMD_ARG2(name, func)	{ name, NEXTARG2, { .c_func2 = func }, 1, NULL }
 
 struct ifaddrs;
 struct addrinfo;
diff --git a/sbin/ifconfig/iflagg.c b/sbin/ifconfig/iflagg.c
index 29b8574f4b1a..9c478b3dfc5f 100644
--- a/sbin/ifconfig/iflagg.c
+++ b/sbin/ifconfig/iflagg.c
@@ -68,7 +68,7 @@ setlaggproto(const char *val, int d, int s, const struct afswtch *afp)
 	bzero(&ra, sizeof(ra));
 	ra.ra_proto = LAGG_PROTO_MAX;
 
-	for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++) {
+	for (i = 0; i < nitems(lpr); i++) {
 		if (strcmp(val, lpr[i].lpr_name) == 0) {
 			ra.ra_proto = lpr[i].lpr_proto;
 			break;
@@ -82,6 +82,48 @@ setlaggproto(const char *val, int d, int s, const struct afswtch *afp)
 		err(1, "SIOCSLAGG");
 }
 
+static void
+setlaggflowidshift(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct lagg_reqopts ro;
+
+	bzero(&ro, sizeof(ro));
+	ro.ro_opts = LAGG_OPT_FLOWIDSHIFT;
+	strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
+	ro.ro_flowid_shift = (int)strtol(val, NULL, 10);
+	if (ro.ro_flowid_shift & ~LAGG_OPT_FLOWIDSHIFT_MASK)
+		errx(1, "Invalid flowid_shift option: %s", val);
+	
+	if (ioctl(s, SIOCSLAGGOPTS, &ro) != 0)
+		err(1, "SIOCSLAGGOPTS");
+}
+
+static void
+setlaggsetopt(const char *val, int d, int s, const struct afswtch *afp)
+{
+	struct lagg_reqopts ro;
+
+	bzero(&ro, sizeof(ro));
+	ro.ro_opts = d;
+	switch (ro.ro_opts) {
+	case LAGG_OPT_USE_FLOWID:
+	case -LAGG_OPT_USE_FLOWID:
+	case LAGG_OPT_LACP_STRICT:
+	case -LAGG_OPT_LACP_STRICT:
+	case LAGG_OPT_LACP_TXTEST:
+	case -LAGG_OPT_LACP_TXTEST:
+	case LAGG_OPT_LACP_RXTEST:
+	case -LAGG_OPT_LACP_RXTEST:
+		break;
+	default:
+		err(1, "Invalid lagg option");
+	}
+	strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
+	
+	if (ioctl(s, SIOCSLAGGOPTS, &ro) != 0)
+		err(1, "SIOCSLAGGOPTS");
+}
+
 static void
 setlagghash(const char *val, int d, int s, const struct afswtch *afp)
 {
@@ -144,6 +186,7 @@ lagg_status(int s)
 	struct lagg_protos lpr[] = LAGG_PROTOS;
 	struct lagg_reqport rp, rpbuf[LAGG_MAX_PORTS];
 	struct lagg_reqall ra;
+	struct lagg_reqopts ro;
 	struct lagg_reqflags rf;
 	struct lacp_opreq *lp;
 	const char *proto = "<unknown>";
@@ -151,6 +194,7 @@ lagg_status(int s)
 
 	bzero(&rp, sizeof(rp));
 	bzero(&ra, sizeof(ra));
+	bzero(&ro, sizeof(ro));
 
 	strlcpy(rp.rp_ifname, name, sizeof(rp.rp_ifname));
 	strlcpy(rp.rp_portname, name, sizeof(rp.rp_portname));
@@ -162,6 +206,9 @@ lagg_status(int s)
 	ra.ra_size = sizeof(rpbuf);
 	ra.ra_port = rpbuf;
 
+	strlcpy(ro.ro_ifname, name, sizeof(ro.ro_ifname));
+	ioctl(s, SIOCGLAGGOPTS, &ro);
+
 	strlcpy(rf.rf_ifname, name, sizeof(rf.rf_ifname));
 	if (ioctl(s, SIOCGLAGGFLAGS, &rf) != 0)
 		rf.rf_flags = 0;
@@ -169,7 +216,7 @@ lagg_status(int s)
 	if (ioctl(s, SIOCGLAGG, &ra) == 0) {
 		lp = (struct lacp_opreq *)&ra.ra_lacpreq;
 
-		for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++) {
+		for (i = 0; i < nitems(lpr); i++) {
 			if (ra.ra_proto == lpr[i].lpr_proto) {
 				proto = lpr[i].lpr_name;
 				break;
@@ -197,9 +244,28 @@ lagg_status(int s)
 		if (isport)
 			printf(" laggdev %s", rp.rp_ifname);
 		putchar('\n');
-		if (verbose && ra.ra_proto == LAGG_PROTO_LACP)
-			printf("\tlag id: %s\n",
-			    lacp_format_peer(lp, "\n\t\t "));
+		if (verbose) {
+			printf("\tlagg options:\n");
+			printf("\t\tuse_flowid: %d\n",
+			    (ro.ro_opts & LAGG_OPT_USE_FLOWID) ? 1 : 0);
+			printf("\t\tflowid_shift: %d\n", ro.ro_flowid_shift);
+			switch (ra.ra_proto) {
+			case LAGG_PROTO_LACP:
+				printf("\t\tlacp_strict: %d\n",
+				   (ro.ro_opts & LAGG_OPT_LACP_STRICT) ? 1 : 0);
+				printf("\t\tlacp_rxtest: %d\n",
+				   (ro.ro_opts & LAGG_OPT_LACP_RXTEST) ? 1 : 0);
+				printf("\t\tlacp_txtest: %d\n",
+				   (ro.ro_opts & LAGG_OPT_LACP_TXTEST) ? 1 : 0);
+			}
+			printf("\tlagg statistics:\n");
+			printf("\t\tactive ports: %d\n", ro.ro_active);
+			printf("\t\tflapping: %u\n", ro.ro_flapping);
+			if (ra.ra_proto == LAGG_PROTO_LACP) {
+				printf("\tlag id: %s\n",
+				    lacp_format_peer(lp, "\n\t\t "));
+			}
+		}
 
 		for (i = 0; i < ra.ra_ports; i++) {
 			lp = (struct lacp_opreq *)&rpbuf[i].rp_lacpreq;
@@ -226,6 +292,15 @@ static struct cmd lagg_cmds[] = {
 	DEF_CMD_ARG("-laggport",	unsetlaggport),
 	DEF_CMD_ARG("laggproto",	setlaggproto),
 	DEF_CMD_ARG("lagghash",		setlagghash),
+	DEF_CMD("use_flowid",	LAGG_OPT_USE_FLOWID,	setlaggsetopt),
+	DEF_CMD("-use_flowid",	-LAGG_OPT_USE_FLOWID,	setlaggsetopt),
+	DEF_CMD("lacp_strict",	LAGG_OPT_LACP_STRICT,	setlaggsetopt),
+	DEF_CMD("-lacp_strict",	-LAGG_OPT_LACP_STRICT,	setlaggsetopt),
+	DEF_CMD("lacp_txtest",	LAGG_OPT_LACP_TXTEST,	setlaggsetopt),
+	DEF_CMD("-lacp_txtest",	-LAGG_OPT_LACP_TXTEST,	setlaggsetopt),
+	DEF_CMD("lacp_rxtest",	LAGG_OPT_LACP_RXTEST,	setlaggsetopt),
+	DEF_CMD("-lacp_rxtest",	-LAGG_OPT_LACP_RXTEST,	setlaggsetopt),
+	DEF_CMD_ARG("flowid_shift",	setlaggflowidshift),
 };
 static struct afswtch af_lagg = {
 	.af_name	= "af_lagg",
diff --git a/sbin/ifconfig/sfp.c b/sbin/ifconfig/sfp.c
index 2e8039d8d363..abe71d69b9a1 100644
--- a/sbin/ifconfig/sfp.c
+++ b/sbin/ifconfig/sfp.c
@@ -764,11 +764,13 @@ sfp_status(int s, struct ifreq *ifr, int verbose)
 	/*
 	 * Try to read byte 0 from i2c:
 	 * Both SFF-8472 and SFF-8436 use it as
-	 * 'identification byte'
+	 * 'identification byte'.
+	 * Stop reading status on zero as value - 
+	 * this might happen in case of empty transceiver slot.
 	 */
 	id_byte = 0;
 	ii.f(&ii, SFF_8472_BASE, SFF_8472_ID, 1, (caddr_t)&id_byte);
-	if (ii.error != 0)
+	if (ii.error != 0 || id_byte == 0)
 		return;
 
 	switch (id_byte) {
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 89e7fbe2c6ae..7f3a00884977 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -4,7 +4,7 @@ PROG=	ping6
 MAN=	ping6.8
 
 CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
-	-DHAVE_POLL_H -DHAVE_ARC4RANDOM
+	-DHAVE_ARC4RANDOM
 WARNS?=	2
 
 BINOWN=	root
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index b963de176892..14f689d82630 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -125,10 +125,8 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
 
 #ifdef IPSEC
 #include <netipsec/ah.h>
@@ -207,7 +205,6 @@ u_int options;
 int mx_dup_ck = MAX_DUP_CHK;
 char rcvd_tbl[MAX_DUP_CHK / 8];
 
-struct addrinfo *res = NULL;
 struct sockaddr_in6 dst;	/* who to ping6 */
 struct sockaddr_in6 src;	/* src addr of this packet */
 socklen_t srclen;
@@ -223,12 +220,6 @@ u_int8_t nonce[8];		/* nonce field for node information */
 int hoplimit = -1;		/* hoplimit */
 int pathmtu = 0;		/* path MTU for the destination.  0 = unspec. */
 u_char *packet = NULL;
-#ifdef HAVE_POLL_H
-struct pollfd fdmaskp[1];
-#else
-fd_set *fdmaskp = NULL;
-int fdmasks;
-#endif
 
 /* counters */
 long nmissedmax;		/* max value of ntransmitted - nreceived - 1 */
@@ -236,7 +227,7 @@ long npackets;			/* max packets to transmit */
 long nreceived;			/* # of packets we got back */
 long nrepeats;			/* number of duplicates */
 long ntransmitted;		/* sequence # for outbound packets = #sent */
-struct timeval interval = {1, 0}; /* interval between packets */
+int interval = 1000;		/* interval between packets in ms */
 
 /* timing */
 int timing;			/* flag to do timing */
@@ -253,7 +244,6 @@ struct msghdr smsghdr;
 struct iovec smsgiov;
 char *scmsg = 0;
 
-volatile sig_atomic_t seenalrm;
 volatile sig_atomic_t seenint;
 #ifdef SIGINFO
 volatile sig_atomic_t seeninfo;
@@ -265,7 +255,6 @@ int	 get_hoplim(struct msghdr *);
 int	 get_pathmtu(struct msghdr *);
 struct in6_pktinfo *get_rcvpktinfo(struct msghdr *);
 void	 onsignal(int);
-void	 retransmit(void);
 void	 onint(int);
 size_t	 pingerlen(void);
 int	 pinger(void);
@@ -293,19 +282,15 @@ void	 usage(void);
 int
 main(int argc, char *argv[])
 {
-	struct itimerval itimer;
-	struct sockaddr_in6 from;
+	struct timeval last, intvl;
+	struct sockaddr_in6 from, *sin6;
 #ifndef HAVE_ARC4RANDOM
 	struct timeval seed;
 #endif
-#ifdef HAVE_POLL_H
-	int timeout;
-#else
-	struct timeval timeout, *tv;
-#endif
-	struct addrinfo hints;
+	struct addrinfo hints, *res;
+	struct sigaction si_sa;
 	int cc, i;
-	int ch, hold, packlen, preload, optval, ret_ga;
+	int almost_done, ch, hold, packlen, preload, optval, error;
 	int nig_oldmcprefix = -1;
 	u_char *datap;
 	char *e, *target, *ifname = NULL, *gateway = NULL;
@@ -326,7 +311,7 @@ main(int argc, char *argv[])
 	char *policy_in = NULL;
 	char *policy_out = NULL;
 #endif
-	double intval;
+	double t;
 	size_t rthlen;
 #ifdef IPV6_USE_MIN_MTU
 	int mflag = 0;
@@ -450,22 +435,22 @@ main(int argc, char *argv[])
 #endif
 			break;
 		case 'i':		/* wait between sending packets */
-			intval = strtod(optarg, &e);
+			t = strtod(optarg, &e);
 			if (*optarg == '\0' || *e != '\0')
 				errx(1, "illegal timing interval %s", optarg);
-			if (intval < 1 && getuid()) {
+			if (t < 1 && getuid()) {
 				errx(1, "%s: only root may use interval < 1s",
 				    strerror(EPERM));
 			}
-			interval.tv_sec = (long)intval;
-			interval.tv_usec =
-			    (long)((intval - interval.tv_sec) * 1000000);
-			if (interval.tv_sec < 0)
+			intvl.tv_sec = (long)t;
+			intvl.tv_usec =
+			    (long)((t - intvl.tv_sec) * 1000000);
+			if (intvl.tv_sec < 0)
 				errx(1, "illegal timing interval %s", optarg);
 			/* less than 1/hz does not make sense */
-			if (interval.tv_sec == 0 && interval.tv_usec < 1) {
+			if (intvl.tv_sec == 0 && intvl.tv_usec < 1) {
 				warnx("too small interval, raised to .000001");
-				interval.tv_usec = 1;
+				intvl.tv_usec = 1;
 			}
 			options |= F_INTERVAL;
 			break;
@@ -516,10 +501,10 @@ main(int argc, char *argv[])
 			hints.ai_socktype = SOCK_RAW;
 			hints.ai_protocol = IPPROTO_ICMPV6;
 
-			ret_ga = getaddrinfo(optarg, NULL, &hints, &res);
-			if (ret_ga) {
+			error = getaddrinfo(optarg, NULL, &hints, &res);
+			if (error) {
 				errx(1, "invalid source address: %s",
-				     gai_strerror(ret_ga));
+				     gai_strerror(error));
 			}
 			/*
 			 * res->ai_family must be AF_INET6 and res->ai_addrlen
@@ -622,9 +607,9 @@ main(int argc, char *argv[])
 	hints.ai_socktype = SOCK_RAW;
 	hints.ai_protocol = IPPROTO_ICMPV6;
 
-	ret_ga = getaddrinfo(target, NULL, &hints, &res);
-	if (ret_ga)
-		errx(1, "%s", gai_strerror(ret_ga));
+	error = getaddrinfo(target, NULL, &hints, &res);
+	if (error)
+		errx(1, "%s", gai_strerror(error));
 	if (res->ai_canonname)
 		hostname = res->ai_canonname;
 	else
@@ -647,28 +632,25 @@ main(int argc, char *argv[])
 
 	/* set the gateway (next hop) if specified */
 	if (gateway) {
-		struct addrinfo ghints, *gres;
-		int error;
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = AF_INET6;
+		hints.ai_socktype = SOCK_RAW;
+		hints.ai_protocol = IPPROTO_ICMPV6;
 
-		memset(&ghints, 0, sizeof(ghints));
-		ghints.ai_family = AF_INET6;
-		ghints.ai_socktype = SOCK_RAW;
-		ghints.ai_protocol = IPPROTO_ICMPV6;
-
-		error = getaddrinfo(gateway, NULL, &hints, &gres);
+		error = getaddrinfo(gateway, NULL, &hints, &res);
 		if (error) {
 			errx(1, "getaddrinfo for the gateway %s: %s",
 			     gateway, gai_strerror(error));
 		}
-		if (gres->ai_next && (options & F_VERBOSE))
+		if (res->ai_next && (options & F_VERBOSE))
 			warnx("gateway resolves to multiple addresses");
 
 		if (setsockopt(s, IPPROTO_IPV6, IPV6_NEXTHOP,
-			       gres->ai_addr, gres->ai_addrlen)) {
+		    res->ai_addr, res->ai_addrlen)) {
 			err(1, "setsockopt(IPV6_NEXTHOP)");
 		}
 
-		freeaddrinfo(gres);
+		freeaddrinfo(res);
 	}
 
 	/*
@@ -898,7 +880,7 @@ main(int argc, char *argv[])
 	}
 
 	if (argc > 1) {	/* some intermediate addrs are specified */
-		int hops, error;
+		int hops;
 #ifdef USE_RFC2292BIS
 		int rthdrlen;
 #endif
@@ -920,26 +902,25 @@ main(int argc, char *argv[])
 #endif /* USE_RFC2292BIS */
 
 		for (hops = 0; hops < argc - 1; hops++) {
-			struct addrinfo *iaip;
+			memset(&hints, 0, sizeof(hints));
+			hints.ai_family = AF_INET6;
 
 			if ((error = getaddrinfo(argv[hops], NULL, &hints,
-			    &iaip)))
+			    &res)))
 				errx(1, "%s", gai_strerror(error));
-			if (SIN6(iaip->ai_addr)->sin6_family != AF_INET6)
+			if (res->ai_addr->sa_family != AF_INET6)
 				errx(1,
 				    "bad addr family of an intermediate addr");
-
+			sin6 = (struct sockaddr_in6 *)(void *)res->ai_addr;
 #ifdef USE_RFC2292BIS
-			if (inet6_rth_add(rthdr,
-			    &(SIN6(iaip->ai_addr))->sin6_addr))
+			if (inet6_rth_add(rthdr, &sin6->sin6_addr))
 				errx(1, "can't add an intermediate node");
 #else  /* old advanced API */
-			if (inet6_rthdr_add(scmsgp,
-			    &(SIN6(iaip->ai_addr))->sin6_addr,
+			if (inet6_rthdr_add(scmsg, &sin6->sin6_addr,
 			    IPV6_RTHDR_LOOSE))
 				errx(1, "can't add an intermediate node");
 #endif /* USE_RFC2292BIS */
-			freeaddrinfo(iaip);
+			freeaddrinfo(res);
 		}
 
 #ifndef USE_RFC2292BIS
@@ -1055,58 +1036,46 @@ main(int argc, char *argv[])
 	printf("%s --> ", pr_addr((struct sockaddr *)&src, sizeof(src)));
 	printf("%s\n", pr_addr((struct sockaddr *)&dst, sizeof(dst)));
 
-	while (preload--)		/* Fire off them quickies. */
-		(void)pinger();
-
-	(void)signal(SIGINT, onsignal);
-#ifdef SIGINFO
-	(void)signal(SIGINFO, onsignal);
-#endif
-
-	if ((options & F_FLOOD) == 0) {
-		(void)signal(SIGALRM, onsignal);
-		itimer.it_interval = interval;
-		itimer.it_value = interval;
-		(void)setitimer(ITIMER_REAL, &itimer, NULL);
-		if (ntransmitted == 0)
-			retransmit();
+	if (preload == 0)
+		pinger();
+	else {
+		if (npackets != 0 && preload > npackets)
+			preload = npackets;
+		while (preload--)
+			pinger();
 	}
+	gettimeofday(&last, NULL);
 
-#ifndef HAVE_POLL_H
-	fdmasks = howmany(s + 1, NFDBITS) * sizeof(fd_mask);
-	if ((fdmaskp = malloc(fdmasks)) == NULL)
-		err(1, "malloc");
-#endif
-
-	seenalrm = seenint = 0;
+	sigemptyset(&si_sa.sa_mask);
+	si_sa.sa_flags = 0;
+	si_sa.sa_handler = onsignal;
+	if (sigaction(SIGINT, &si_sa, 0) == -1)
+		err(EX_OSERR, "sigaction SIGINT");
+	seenint = 0;
 #ifdef SIGINFO
+	if (sigaction(SIGINFO, &si_sa, 0) == -1)
+		err(EX_OSERR, "sigaction SIGINFO");
 	seeninfo = 0;
 #endif
+	if (options & F_FLOOD) {
+		intvl.tv_sec = 0;
+		intvl.tv_usec = 10000;
+	} else if ((options & F_INTERVAL) == 0) {
+		intvl.tv_sec = interval / 1000;
+		intvl.tv_usec = interval % 1000 * 1000;
+	}
 
-	for (;;) {
+	almost_done = 0;
+	while (seenint == 0) {
+		struct timeval now, timeout;
 		struct msghdr m;
 		struct iovec iov[2];
+		fd_set rfds;
+		int n;
 
 		/* signal handling */
-		if (seenalrm) {
-			/* last packet sent, timeout reached? */
-			if (npackets && ntransmitted >= npackets) {
-				struct timeval zerotime = {0, 0};
-				itimer.it_value = zerotime;
-				itimer.it_interval = zerotime;
-				(void)setitimer(ITIMER_REAL, &itimer, NULL);
-				seenalrm = 0;   /* clear flag */
-				continue;
-			}
-			retransmit();
-			seenalrm = 0;
-			continue;
-		}
-		if (seenint) {
+		if (seenint)
 			onint(SIGINT);
-			seenint = 0;
-			continue;
-		}
 #ifdef SIGINFO
 		if (seeninfo) {
 			summary();
@@ -1114,93 +1083,104 @@ main(int argc, char *argv[])
 			continue;
 		}
 #endif
-
-		if (options & F_FLOOD) {
-			(void)pinger();
-#ifdef HAVE_POLL_H
-			timeout = 10;
-#else
-			timeout.tv_sec = 0;
-			timeout.tv_usec = 10000;
-			tv = &timeout;
-#endif
-		} else {
-#ifdef HAVE_POLL_H
-			timeout = INFTIM;
-#else
-			tv = NULL;
-#endif
+		FD_ZERO(&rfds);
+		FD_SET(s, &rfds);
+		gettimeofday(&now, NULL);
+		timeout.tv_sec = last.tv_sec + intvl.tv_sec - now.tv_sec;
+		timeout.tv_usec = last.tv_usec + intvl.tv_usec - now.tv_usec;
+		while (timeout.tv_usec < 0) {
+			timeout.tv_usec += 1000000;
+			timeout.tv_sec--;
 		}
-#ifdef HAVE_POLL_H
-		fdmaskp[0].fd = s;
-		fdmaskp[0].events = POLLIN;
-		cc = poll(fdmaskp, 1, timeout);
-#else
-		memset(fdmaskp, 0, fdmasks);
-		FD_SET(s, fdmaskp);
-		cc = select(s + 1, fdmaskp, NULL, NULL, tv);
-#endif
-		if (cc < 0) {
-			if (errno != EINTR) {
-#ifdef HAVE_POLL_H
-				warn("poll");
-#else
-				warn("select");
-#endif
-				sleep(1);
-			}
-			continue;
-		} else if (cc == 0)
-			continue;
+		while (timeout.tv_usec > 1000000) {
+			timeout.tv_usec -= 1000000;
+			timeout.tv_sec++;
+		}
+		if (timeout.tv_sec < 0)
+			timeout.tv_sec = timeout.tv_usec = 0;
 
-		m.msg_name = (caddr_t)&from;
-		m.msg_namelen = sizeof(from);
-		memset(&iov, 0, sizeof(iov));
-		iov[0].iov_base = (caddr_t)packet;
-		iov[0].iov_len = packlen;
-		m.msg_iov = iov;
-		m.msg_iovlen = 1;
-		memset(cm, 0, CONTROLLEN);
-		m.msg_control = (void *)cm;
-		m.msg_controllen = CONTROLLEN;
+		n = select(s + 1, &rfds, NULL, NULL, &timeout);
+		if (n < 0)
+			continue;	/* EINTR */
+		if (n == 1) {
+			m.msg_name = (caddr_t)&from;
+			m.msg_namelen = sizeof(from);
+			memset(&iov, 0, sizeof(iov));
+			iov[0].iov_base = (caddr_t)packet;
+			iov[0].iov_len = packlen;
+			m.msg_iov = iov;
+			m.msg_iovlen = 1;
+			memset(cm, 0, CONTROLLEN);
+			m.msg_control = (void *)cm;
+			m.msg_controllen = CONTROLLEN;
 
-		cc = recvmsg(s, &m, 0);
-		if (cc < 0) {
-			if (errno != EINTR) {
-				warn("recvmsg");
-				sleep(1);
-			}
-			continue;
-		} else if (cc == 0) {
-			int mtu;
-
-			/*
-			 * receive control messages only. Process the
-			 * exceptions (currently the only possibility is
-			 * a path MTU notification.)
-			 */
-			if ((mtu = get_pathmtu(&m)) > 0) {
-				if ((options & F_VERBOSE) != 0) {
-					printf("new path MTU (%d) is "
-					    "notified\n", mtu);
+			cc = recvmsg(s, &m, 0);
+			if (cc < 0) {
+				if (errno != EINTR) {
+					warn("recvmsg");
+					sleep(1);
 				}
+				continue;
+			} else if (cc == 0) {
+				int mtu;
+
+				/*
+				 * receive control messages only. Process the
+				 * exceptions (currently the only possibility is
+				 * a path MTU notification.)
+				 */
+				if ((mtu = get_pathmtu(&m)) > 0) {
+					if ((options & F_VERBOSE) != 0) {
+						printf("new path MTU (%d) is "
+						    "notified\n", mtu);
+					}
+				}
+				continue;
+			} else {
+				/*
+				 * an ICMPv6 message (probably an echoreply)
+				 * arrived.
+				 */
+				pr_pack(packet, cc, &m);
 			}
-			continue;
-		} else {
-			/*
-			 * an ICMPv6 message (probably an echoreply) arrived.
-			 */
-			pr_pack(packet, cc, &m);
+			if (((options & F_ONCE) != 0 && nreceived > 0) ||
+			    (npackets > 0 && nreceived >= npackets))
+				break;
 		}
-		if (((options & F_ONCE) != 0 && nreceived > 0) ||
-		    (npackets > 0 && nreceived >= npackets))
-			break;
-		if (ntransmitted - nreceived - 1 > nmissedmax) {
-			nmissedmax = ntransmitted - nreceived - 1;
-			if (options & F_MISSED)
-				(void)write(STDOUT_FILENO, &BBELL, 1);
+		if (n == 0 || (options & F_FLOOD)) {
+			if (npackets == 0 || ntransmitted < npackets)
+				pinger();
+			else {
+				if (almost_done)
+					break;
+				almost_done = 1;
+			/*
+			 * If we're not transmitting any more packets,
+			 * change the timer to wait two round-trip times
+			 * if we've received any packets or ten seconds
+			 * if we haven't.
+			 */
+#define	MAXWAIT		10
+				intvl.tv_usec = 0;
+				if (nreceived) {
+					intvl.tv_sec = 2 * tmax / 1000;
+					if (intvl.tv_sec == 0)
+						intvl.tv_sec = 1;
+				} else
+					intvl.tv_sec = MAXWAIT;
+			}
+			gettimeofday(&last, NULL);
+			if (ntransmitted - nreceived - 1 > nmissedmax) {
+				nmissedmax = ntransmitted - nreceived - 1;
+				if (options & F_MISSED)
+					(void)write(STDOUT_FILENO, &BBELL, 1);
+			}
 		}
 	}
+	sigemptyset(&si_sa.sa_mask);
+	si_sa.sa_flags = 0;
+	si_sa.sa_handler = SIG_IGN;
+	sigaction(SIGINT, &si_sa, 0);
 	summary();
 
 	if (res != NULL)
@@ -1209,11 +1189,6 @@ main(int argc, char *argv[])
         if(packet != NULL)
                 free(packet);
 
-#ifndef HAVE_POLL_H
-        if(fdmaskp != NULL)
-                free(fdmaskp);
-#endif
-
 	exit(nreceived == 0 ? 2 : 0);
 }
 
@@ -1222,9 +1197,6 @@ onsignal(int sig)
 {
 
 	switch (sig) {
-	case SIGALRM:
-		seenalrm++;
-		break;
 	case SIGINT:
 		seenint++;
 		break;
@@ -1236,38 +1208,6 @@ onsignal(int sig)
 	}
 }
 
-/*
- * retransmit --
- *	This routine transmits another ping6.
- */
-void
-retransmit(void)
-{
-	struct itimerval itimer;
-
-	if (pinger() == 0)
-		return;
-
-	/*
-	 * If we're not transmitting any more packets, change the timer
-	 * to wait two round-trip times if we've received any packets or
-	 * ten seconds if we haven't.
-	 */
-#define	MAXWAIT		10
-	if (nreceived) {
-		itimer.it_value.tv_sec =  2 * tmax / 1000;
-		if (itimer.it_value.tv_sec == 0)
-			itimer.it_value.tv_sec = 1;
-	} else
-		itimer.it_value.tv_sec = MAXWAIT;
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_usec = 0;
-
-	(void)signal(SIGALRM, onsignal);
-	(void)setitimer(ITIMER_REAL, &itimer, NULL);
-}
-
 /*
  * pinger --
  *	Compose and transmit an ICMP ECHO REQUEST packet.  The IP packet
@@ -2247,24 +2187,12 @@ tvsub(struct timeval *out, struct timeval *in)
 void
 onint(int notused __unused)
 {
-	summary();
-
-	if (res != NULL)
-		freeaddrinfo(res);
-
-        if(packet != NULL)
-                free(packet);
-
-#ifndef HAVE_POLL_H
-        if(fdmaskp != NULL)
-                free(fdmaskp);
-#endif
-
-	(void)signal(SIGINT, SIG_DFL);
-	(void)kill(getpid(), SIGINT);
-
-	/* NOTREACHED */
-	exit(1);
+	/*
+	 * When doing reverse DNS lookups, the seenint flag might not
+	 * be noticed for a while.  Just exit if we get a second SIGINT.
+	 */
+	if ((options & F_HOSTNAME) && seenint != 0)
+		_exit(nreceived ? 0 : 2);
 }
 
 /*
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index c42cd806e150..a31d6f596e96 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -462,6 +462,7 @@ extern int	ridhosts;		/* 1=reduce host routes */
 extern int	mhome;			/* 1=want multi-homed host route */
 extern int	advertise_mhome;	/* 1=must continue advertising it */
 extern int	auth_ok;		/* 1=ignore auth if we do not care */
+extern int	insecure;		/* Reply to special queries or not */
 
 extern struct timeval clk;		/* system clock's idea of time */
 extern struct timeval epoch;		/* system clock when started */
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 8f8eefc5614c..901c4f3e6b9e 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -289,8 +289,19 @@ input(struct sockaddr_in *from,		/* received from this IP address */
 				 * with all we know.
 				 */
 				if (from->sin_port != htons(RIP_PORT)) {
-					supply(from, aifp, OUT_QUERY, 0,
-					       rip->rip_vers, ap != 0);
+					/*
+					 * insecure: query from non-router node
+					 *   > 1: allow from distant node
+					 *   > 0: allow from neighbor node
+					 *  == 0: deny
+					 */
+					if ((aifp != NULL && insecure > 0) ||
+					    (aifp == NULL && insecure > 1))
+						supply(from, aifp, OUT_QUERY, 0,
+						       rip->rip_vers, ap != 0);
+					else
+						trace_pkt("Warning: "
+						    "possible attack detected");
 					return;
 				}
 
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 1658d2e48cd8..5ebd7ec03a67 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -68,6 +68,7 @@ int	ridhosts;			/* 1=reduce host routes */
 int	mhome;				/* 1=want multi-homed host route */
 int	advertise_mhome;		/* 1=must continue advertising it */
 int	auth_ok = 1;			/* 1=ignore auth if we do not care */
+int	insecure;			/* Reply to special queries or not */
 
 struct timeval epoch;			/* when started */
 struct timeval clk;
@@ -136,8 +137,11 @@ main(int argc,
 	(void)gethostname(myname, sizeof(myname)-1);
 	(void)gethost(myname, &myaddr);
 
-	while ((n = getopt(argc, argv, "sqdghmAtvT:F:P:")) != -1) {
+	while ((n = getopt(argc, argv, "isqdghmAtvT:F:P:")) != -1) {
 		switch (n) {
+		case 'i':
+			insecure++;
+			break;
 		case 's':
 			supplier = 1;
 			supplier_set = 1;
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index 53eb4a5cff99..c2ed468c12c9 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -673,8 +673,6 @@ supply(struct sockaddr_in *dst,
 	struct rt_entry *rt;
 	int def_metric;
 
-	assert(ifp != NULL);
-
 	ws.state = 0;
 	ws.gen_limit = 1024;
 
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 2f8a02176d3d..ca5250b21efa 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -30,7 +30,7 @@
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd June 1, 1996
+.Dd August 26, 2014
 .Dt ROUTED 8
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nd network RIP and router discovery routing daemon
 .Sh SYNOPSIS
 .Nm
-.Op Fl sqdghmpAtv
+.Op Fl isqdghmpAtv
 .Op Fl T Ar tracefile
 .Oo
 .Fl F
@@ -250,6 +250,20 @@ to infer the netmask used by the remote system when RIPv1 is used.
 .Pp
 The following options are available:
 .Bl -tag -width indent
+.It Fl i
+allow
+.Nm
+to accept a RIP request from non-router node.
+When specified once, 
+.Nm
+replies to a route information query from neighbor nodes.
+When specified twice,
+it replies to a query from remote nodes in addition.
+.Xr rtquery 8
+utility can be used to send a request.
+.Pp
+This feature is disabled by default because of a risk of reflection attack
+though it is useful for debugging purpose.
 .It Fl s
 force
 .Nm
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 0f1d41ea83c1..7a5fc4c937da 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -151,7 +151,10 @@ getbounds(void) {
 	}
 
 	if (fgets(buf, sizeof buf, fp) == NULL) {
-		syslog(LOG_WARNING, "unable to read from bounds, using 0");
+		if (feof(fp))
+			syslog(LOG_WARNING, "bounds file is empty, using 0");
+		else
+			syslog(LOG_WARNING, "bounds file: %s", strerror(errno));
 		fclose(fp);
 		return (ret);
 	}
@@ -160,6 +163,7 @@ getbounds(void) {
 	ret = (int)strtol(buf, NULL, 10);
 	if (ret == 0 && (errno == EINVAL || errno == ERANGE))
 		syslog(LOG_WARNING, "invalid value found in bounds, using 0");
+	fclose(fp);
 	return (ret);
 }
 
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 578260d63185..a6ea9f9891a5 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -48,10 +48,16 @@ static const char rcsid[] =
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
 
+#ifdef __amd64__
+#include <sys/efi.h>
+#include <machine/metadata.h>
+#endif
+
 #if defined(__amd64__) || defined(__i386__)
 #include <machine/pc/bios.h>
 #endif
 
+#include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
@@ -73,9 +79,33 @@ static int	parsefile(const char *);
 static int	parse(const char *, int);
 static int	show_var(int *, int);
 static int	sysctl_all(int *oid, int len);
-static int	name2oid(char *, int *);
+static int	name2oid(const char *, int *);
 
-static int	set_IK(const char *, int *);
+static int	strIKtoi(const char *, char **);
+
+static int ctl_sign[CTLTYPE+1] = {
+	[CTLTYPE_INT] = 1,
+	[CTLTYPE_LONG] = 1,
+	[CTLTYPE_S64] = 1,
+};
+
+static int ctl_size[CTLTYPE+1] = {
+	[CTLTYPE_INT] = sizeof(int),
+	[CTLTYPE_UINT] = sizeof(u_int),
+	[CTLTYPE_LONG] = sizeof(long),
+	[CTLTYPE_ULONG] = sizeof(u_long),
+	[CTLTYPE_S64] = sizeof(int64_t),
+	[CTLTYPE_U64] = sizeof(uint64_t),
+};
+
+static const char *ctl_typename[CTLTYPE+1] = {
+	[CTLTYPE_INT] = "integer",
+	[CTLTYPE_UINT] = "unsigned integer",
+	[CTLTYPE_LONG] = "long integer",
+	[CTLTYPE_ULONG] = "unsigned long",
+	[CTLTYPE_S64] = "int64_t",
+	[CTLTYPE_U64] = "uint64_t",
+};
 
 static void
 usage(void)
@@ -186,7 +216,8 @@ static int
 parse(const char *string, int lineno)
 {
 	int len, i, j;
-	void *newval = 0;
+	const void *newval;
+	const char *newvalstr = NULL;
 	int intval;
 	unsigned int uintval;
 	long longval;
@@ -195,7 +226,7 @@ parse(const char *string, int lineno)
 	int64_t i64val;
 	uint64_t u64val;
 	int mib[CTL_MAXNAME];
-	char *cp, *bufp, buf[BUFSIZ], *endptr, fmt[BUFSIZ], line[BUFSIZ];
+	char *cp, *bufp, buf[BUFSIZ], *endptr = NULL, fmt[BUFSIZ], line[BUFSIZ];
 	u_int kind;
 
 	if (lineno)
@@ -225,7 +256,7 @@ parse(const char *string, int lineno)
 				cp[strlen(cp) - 1] = '\0';
 			cp++;
 		}
-		newval = cp;
+		newvalstr = cp;
 		newsize = strlen(cp);
 	}
 	len = name2oid(bufp, mib);
@@ -249,7 +280,7 @@ parse(const char *string, int lineno)
 			exit(1);
 	}
 
-	if (newval == NULL || dflag) {
+	if (newvalstr == NULL || dflag) {
 		if ((kind & CTLTYPE) == CTLTYPE_NODE) {
 			if (dflag) {
 				i = show_var(mib, len);
@@ -277,97 +308,77 @@ parse(const char *string, int lineno)
 			return (1);
 		}
 
-		if ((kind & CTLTYPE) == CTLTYPE_INT ||
-		    (kind & CTLTYPE) == CTLTYPE_UINT ||
-		    (kind & CTLTYPE) == CTLTYPE_LONG ||
-		    (kind & CTLTYPE) == CTLTYPE_ULONG ||
-		    (kind & CTLTYPE) == CTLTYPE_S64 ||
-		    (kind & CTLTYPE) == CTLTYPE_U64) {
-			if (strlen(newval) == 0) {
+		switch (kind & CTLTYPE) {
+		case CTLTYPE_INT:
+		case CTLTYPE_UINT:
+		case CTLTYPE_LONG:
+		case CTLTYPE_ULONG:
+		case CTLTYPE_S64:
+		case CTLTYPE_U64:
+			if (strlen(newvalstr) == 0) {
 				warnx("empty numeric value");
 				return (1);
 			}
+			/* FALLTHROUGH */
+		case CTLTYPE_STRING:
+			break;
+		default:
+			warnx("oid '%s' is type %d,"
+				" cannot set that%s", bufp,
+				kind & CTLTYPE, line);
+			return (1);
 		}
 
+		errno = 0;
+
 		switch (kind & CTLTYPE) {
 			case CTLTYPE_INT:
-				if (strcmp(fmt, "IK") == 0) {
-					if (!set_IK(newval, &intval)) {
-						warnx("invalid value '%s'%s",
-						    (char *)newval, line);
-						return (1);
-					}
- 				} else {
-					intval = (int)strtol(newval, &endptr,
+				if (strcmp(fmt, "IK") == 0)
+					intval = strIKtoi(newvalstr, &endptr);
+				else
+					intval = (int)strtol(newvalstr, &endptr,
 					    0);
-					if (endptr == newval || *endptr != '\0') {
-						warnx("invalid integer '%s'%s",
-						    (char *)newval, line);
-						return (1);
-					}
-				}
 				newval = &intval;
 				newsize = sizeof(intval);
 				break;
 			case CTLTYPE_UINT:
-				uintval = (int) strtoul(newval, &endptr, 0);
-				if (endptr == newval || *endptr != '\0') {
-					warnx("invalid unsigned integer '%s'%s",
-					    (char *)newval, line);
-					return (1);
-				}
+				uintval = (int) strtoul(newvalstr, &endptr, 0);
 				newval = &uintval;
 				newsize = sizeof(uintval);
 				break;
 			case CTLTYPE_LONG:
-				longval = strtol(newval, &endptr, 0);
-				if (endptr == newval || *endptr != '\0') {
-					warnx("invalid long integer '%s'%s",
-					    (char *)newval, line);
-					return (1);
-				}
+				longval = strtol(newvalstr, &endptr, 0);
 				newval = &longval;
 				newsize = sizeof(longval);
 				break;
 			case CTLTYPE_ULONG:
-				ulongval = strtoul(newval, &endptr, 0);
-				if (endptr == newval || *endptr != '\0') {
-					warnx("invalid unsigned long integer"
-					    " '%s'%s", (char *)newval, line);
-					return (1);
-				}
+				ulongval = strtoul(newvalstr, &endptr, 0);
 				newval = &ulongval;
 				newsize = sizeof(ulongval);
 				break;
 			case CTLTYPE_STRING:
+				newval = newvalstr;
 				break;
 			case CTLTYPE_S64:
-				i64val = strtoimax(newval, &endptr, 0);
-				if (endptr == newval || *endptr != '\0') {
-					warnx("invalid int64_t '%s'%s",
-					    (char *)newval, line);
-					return (1);
-				}
+				i64val = strtoimax(newvalstr, &endptr, 0);
 				newval = &i64val;
 				newsize = sizeof(i64val);
 				break;
 			case CTLTYPE_U64:
-				u64val = strtoumax(newval, &endptr, 0);
-				if (endptr == newval || *endptr != '\0') {
-					warnx("invalid uint64_t '%s'%s",
-					    (char *)newval, line);
-					return (1);
-				}
+				u64val = strtoumax(newvalstr, &endptr, 0);
 				newval = &u64val;
 				newsize = sizeof(u64val);
 				break;
-			case CTLTYPE_OPAQUE:
-				/* FALLTHROUGH */
 			default:
-				warnx("oid '%s' is type %d,"
-					" cannot set that%s", bufp,
-					kind & CTLTYPE, line);
-				return (1);
+				/* NOTREACHED */
+				abort();
+		}
+
+		if (errno != 0 || endptr == newvalstr ||
+		    (endptr != NULL && *endptr != '\0')) {
+			warnx("invalid %s '%s'%s", ctl_typename[kind & CTLTYPE],
+			    newvalstr, line);
+			return (1);
 		}
 
 		i = show_var(mib, len);
@@ -458,12 +469,12 @@ parsefile(const char *filename)
 /* These functions will dump out various interesting structures. */
 
 static int
-S_clockinfo(int l2, void *p)
+S_clockinfo(size_t l2, void *p)
 {
 	struct clockinfo *ci = (struct clockinfo*)p;
 
 	if (l2 != sizeof(*ci)) {
-		warnx("S_clockinfo %d != %zu", l2, sizeof(*ci));
+		warnx("S_clockinfo %zu != %zu", l2, sizeof(*ci));
 		return (1);
 	}
 	printf(hflag ? "{ hz = %'d, tick = %'d, profhz = %'d, stathz = %'d }" :
@@ -473,12 +484,12 @@ S_clockinfo(int l2, void *p)
 }
 
 static int
-S_loadavg(int l2, void *p)
+S_loadavg(size_t l2, void *p)
 {
 	struct loadavg *tv = (struct loadavg*)p;
 
 	if (l2 != sizeof(*tv)) {
-		warnx("S_loadavg %d != %zu", l2, sizeof(*tv));
+		warnx("S_loadavg %zu != %zu", l2, sizeof(*tv));
 		return (1);
 	}
 	printf(hflag ? "{ %'.2f %'.2f %'.2f }" : "{ %.2f %.2f %.2f }",
@@ -489,14 +500,14 @@ S_loadavg(int l2, void *p)
 }
 
 static int
-S_timeval(int l2, void *p)
+S_timeval(size_t l2, void *p)
 {
 	struct timeval *tv = (struct timeval*)p;
 	time_t tv_sec;
 	char *p1, *p2;
 
 	if (l2 != sizeof(*tv)) {
-		warnx("S_timeval %d != %zu", l2, sizeof(*tv));
+		warnx("S_timeval %zu != %zu", l2, sizeof(*tv));
 		return (1);
 	}
 	printf(hflag ? "{ sec = %'jd, usec = %'ld } " :
@@ -513,13 +524,13 @@ S_timeval(int l2, void *p)
 }
 
 static int
-S_vmtotal(int l2, void *p)
+S_vmtotal(size_t l2, void *p)
 {
 	struct vmtotal *v = (struct vmtotal *)p;
 	int pageKilo = getpagesize() / 1024;
 
 	if (l2 != sizeof(*v)) {
-		warnx("S_vmtotal %d != %zu", l2, sizeof(*v));
+		warnx("S_vmtotal %zu != %zu", l2, sizeof(*v));
 		return (1);
 	}
 
@@ -540,19 +551,104 @@ S_vmtotal(int l2, void *p)
 	    v->t_vmshr * pageKilo, v->t_avmshr * pageKilo);
 	printf("Shared Real Memory:\t(Total: %dK Active: %dK)\n",
 	    v->t_rmshr * pageKilo, v->t_armshr * pageKilo);
-	printf("Free Memory:\t%dK\n", v->t_free * pageKilo);
+	printf("Free Memory:\t%dK", v->t_free * pageKilo);
 
 	return (0);
 }
 
+#ifdef __amd64__
+#define efi_next_descriptor(ptr, size) \
+	((struct efi_md *)(((uint8_t *) ptr) + size))
+
+static int
+S_efi_map(size_t l2, void *p)
+{
+	struct efi_map_header *efihdr;
+	struct efi_md *map;
+	const char *type;
+	size_t efisz;
+	int ndesc, i;
+
+	static const char *types[] = {
+		"Reserved",
+		"LoaderCode",
+		"LoaderData",
+		"BootServicesCode",
+		"BootServicesData",
+		"RuntimeServicesCode",
+		"RuntimeServicesData",
+		"ConventionalMemory",
+		"UnusableMemory",
+		"ACPIReclaimMemory",
+		"ACPIMemoryNVS",
+		"MemoryMappedIO",
+		"MemoryMappedIOPortSpace",
+		"PalCode"
+	};
+
+	/*
+	 * Memory map data provided by UEFI via the GetMemoryMap
+	 * Boot Services API.
+	 */
+	if (l2 < sizeof(*efihdr)) {
+		warnx("S_efi_map length less than header");
+		return (1);
+	}
+	efihdr = p;
+	efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
+	map = (struct efi_md *)((uint8_t *)efihdr + efisz); 
+
+	if (efihdr->descriptor_size == 0)
+		return (0);
+	if (l2 != efisz + efihdr->memory_size) {
+		warnx("S_efi_map length mismatch %zu vs %zu", l2, efisz +
+		    efihdr->memory_size);
+		return (1);
+	}		
+	ndesc = efihdr->memory_size / efihdr->descriptor_size;
+
+	printf("\n%23s %12s %12s %8s %4s",
+	    "Type", "Physical", "Virtual", "#Pages", "Attr");
+
+	for (i = 0; i < ndesc; i++,
+	    map = efi_next_descriptor(map, efihdr->descriptor_size)) {
+		if (map->md_type <= EFI_MD_TYPE_PALCODE)
+			type = types[map->md_type];
+		else
+			type = "<INVALID>";
+		printf("\n%23s %012lx %12p %08lx ", type, map->md_phys,
+		    map->md_virt, map->md_pages);
+		if (map->md_attr & EFI_MD_ATTR_UC)
+			printf("UC ");
+		if (map->md_attr & EFI_MD_ATTR_WC)
+			printf("WC ");
+		if (map->md_attr & EFI_MD_ATTR_WT)
+			printf("WT ");
+		if (map->md_attr & EFI_MD_ATTR_WB)
+			printf("WB ");
+		if (map->md_attr & EFI_MD_ATTR_UCE)
+			printf("UCE ");
+		if (map->md_attr & EFI_MD_ATTR_WP)
+			printf("WP ");
+		if (map->md_attr & EFI_MD_ATTR_RP)
+			printf("RP ");
+		if (map->md_attr & EFI_MD_ATTR_XP)
+			printf("XP ");
+		if (map->md_attr & EFI_MD_ATTR_RT)
+			printf("RUNTIME");
+	}
+	return (0);
+}
+#endif
+
 #if defined(__amd64__) || defined(__i386__)
 static int
-S_bios_smap_xattr(int l2, void *p)
+S_bios_smap_xattr(size_t l2, void *p)
 {
 	struct bios_smap_xattr *smap, *end;
 
 	if (l2 % sizeof(*smap) != 0) {
-		warnx("S_bios_smap_xattr %d is not a multiple of %zu", l2,
+		warnx("S_bios_smap_xattr %zu is not a multiple of %zu", l2,
 		    sizeof(*smap));
 		return (1);
 	}
@@ -567,30 +663,35 @@ S_bios_smap_xattr(int l2, void *p)
 #endif
 
 static int
-set_IK(const char *str, int *val)
+strIKtoi(const char *str, char **endptrp)
 {
+	int kelv;
 	float temp;
-	int len, kelv;
+	size_t len;
 	const char *p;
-	char *endptr;
 
-	if ((len = strlen(str)) == 0)
-		return (0);
+	assert(errno == 0);
+
+	len = strlen(str);
+	/* caller already checked this */
+	assert(len > 0);
+
 	p = &str[len - 1];
 	if (*p == 'C' || *p == 'F') {
-		temp = strtof(str, &endptr);
-		if (endptr == str || endptr != p)
-			return (0);
-		if (*p == 'F')
-			temp = (temp - 32) * 5 / 9;
-		kelv = temp * 10 + 2732;
+		temp = strtof(str, endptrp);
+		if (*endptrp != str && *endptrp == p && errno != 0) {
+			if (*p == 'F')
+				temp = (temp - 32) * 5 / 9;
+			return (temp * 10 + 2732);
+		}
 	} else {
-		kelv = (int)strtol(str, &endptr, 10);
-		if (endptr == str || *endptr != '\0')
-			return (0);
+		kelv = (int)strtol(str, endptrp, 10);
+		if (*endptrp != str && *endptrp == p && errno != 0)
+			return (kelv);
 	}
-	*val = kelv;
-	return (1);
+
+	errno = ERANGE;
+	return (0);
 }
 
 /*
@@ -603,7 +704,7 @@ set_IK(const char *str, int *val)
  */
 
 static int
-name2oid(char *name, int *oidp)
+name2oid(const char *name, int *oidp)
 {
 	int oid[2];
 	int i;
@@ -645,21 +746,6 @@ oidfmt(int *oid, int len, char *fmt, u_int *kind)
 	return (0);
 }
 
-static int ctl_sign[CTLTYPE+1] = {
-	[CTLTYPE_INT] = 1,
-	[CTLTYPE_LONG] = 1,
-	[CTLTYPE_S64] = 1,
-};
-
-static int ctl_size[CTLTYPE+1] = {
-	[CTLTYPE_INT] = sizeof(int),
-	[CTLTYPE_UINT] = sizeof(u_int),
-	[CTLTYPE_LONG] = sizeof(long),
-	[CTLTYPE_ULONG] = sizeof(u_long),
-	[CTLTYPE_S64] = sizeof(int64_t),
-	[CTLTYPE_U64] = sizeof(int64_t),
-};
-
 /*
  * This formats and outputs the value of one variable
  *
@@ -680,7 +766,7 @@ show_var(int *oid, int nlen)
 	size_t intlen;
 	size_t j, len;
 	u_int kind;
-	int (*func)(int, void *);
+	int (*func)(size_t, void *);
 
 	/* Silence GCC. */
 	umv = mv = intlen = 0;
@@ -818,6 +904,10 @@ show_var(int *oid, int nlen)
 			func = S_loadavg;
 		else if (strcmp(fmt, "S,vmtotal") == 0)
 			func = S_vmtotal;
+#ifdef __amd64__
+		else if (strcmp(fmt, "S,efi_map_header") == 0)
+			func = S_efi_map;
+#endif
 #if defined(__amd64__) || defined(__i386__)
 		else if (strcmp(fmt, "S,bios_smap_xattr") == 0)
 			func = S_bios_smap_xattr;
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 793a63d426f0..f7bb2a01a9d5 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -196,7 +196,7 @@ while [ 1 ]; do
 			exit 1
 		fi
 		BOOTDISK=${isofile}
-		installer_opt="-s 31:0,virtio-blk,${BOOTDISK}"
+		installer_opt="-s 31:0,ahci-cd,${BOOTDISK}"
 	else
 		BOOTDISK=${virtio_diskdev}
 		installer_opt=""
@@ -204,7 +204,8 @@ while [ 1 ]; do
 
 	${LOADER} -c ${console} -m ${memsize} -d ${BOOTDISK} ${loader_opt} \
 		${vmname}
-	if [ $? -ne 0 ]; then
+	bhyve_exit=$?
+	if [ $bhyve_exit -ne 0 ]; then
 		break
 	fi
 
@@ -239,6 +240,7 @@ while [ 1 ]; do
 		${installer_opt}					\
 		${vmname}
 
+	bhyve_exit=$?
 	# bhyve returns the following status codes:
 	#  0 - VM has been reset
 	#  1 - VM has been powered off
@@ -246,9 +248,18 @@ while [ 1 ]; do
 	#  3 - VM generated a triple fault
 	#  all other non-zero status codes are errors
 	#
-	if [ $? -ne 0 ]; then
+	if [ $bhyve_exit -ne 0 ]; then
 		break
 	fi
 done
 
-exit 99
+
+case $bhyve_exit in
+	0|1|2)
+		# Cleanup /dev/vmm entry when bhyve did not exit
+		# due to an error.
+		${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1
+		;;
+esac
+
+exit $bhyve_exit
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 6a8d382ca26b..8200441d2b0e 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -200,12 +200,14 @@ MAN=	aac.4 \
 	ip.4 \
 	ip6.4 \
 	ipfirewall.4 \
+	ipheth.4 \
 	${_ipmi.4} \
 	ips.4 \
 	ipsec.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
+	iscsi.4 \
 	iscsi_initiator.4 \
 	ismt.4 \
 	isp.4 \
@@ -437,6 +439,7 @@ MAN=	aac.4 \
 	smb.4 \
 	smbus.4 \
 	smp.4 \
+	smsc.4 \
 	sn.4 \
 	snd_ad1816.4 \
 	snd_als4000.4 \
@@ -657,6 +660,7 @@ MLINKS+=ip.4 rawip.4
 MLINKS+=ipfirewall.4 ipaccounting.4 \
 	ipfirewall.4 ipacct.4 \
 	ipfirewall.4 ipfw.4
+MLINKS+=ipheth.4 if_ipheth.4
 MLINKS+=ipw.4 if_ipw.4
 MLINKS+=iwi.4 if_iwi.4
 MLINKS+=iwn.4 if_iwn.4
@@ -711,6 +715,7 @@ MLINKS+=sge.4 if_sge.4
 MLINKS+=sis.4 if_sis.4
 MLINKS+=sk.4 if_sk.4
 MLINKS+=smp.4 SMP.4
+MLINKS+=smsc.4 if_smsc.4
 MLINKS+=sn.4 if_sn.4
 MLINKS+=snd_envy24.4 snd_ak452x.4
 MLINKS+=snd_sbc.4 snd_sb16.4 \
diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4
index 433a5476244d..10897cf0b0bd 100644
--- a/share/man/man4/ada.4
+++ b/share/man/man4/ada.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 21, 2014
+.Dd September 21, 2014
 .Dt ADA 4
 .Os
 .Sh NAME
@@ -123,11 +123,13 @@ seconds.
 This variable determines whether to spin-down disks when shutting down.
 Set to 1 to enable spin-down, 0 to disable.
 The default is currently enabled.
+.It Va kern.cam.ada.read_ahead
+.It Va kern.cam.ada. Ns Ar X Ns Va .read_ahead
 .It Va kern.cam.ada.write_cache
 .It Va kern.cam.ada. Ns Ar X Ns Va .write_cache
 .Pp
-These variables determine whether device write cache should be enabled
-globally or per-device or disabled.
+These variables determine whether device read-ahead and write caches
+should be enabled globally or per-device or disabled.
 Set to 1 to enable write cache, 0 to disable, -1 to leave it as-is.
 Values modified at runtime take effect only after device reset 
 .Pq using the reset subcommand of Xr camcontrol 8 .
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index d38a9698f593..fa921b6aacfa 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -28,7 +28,7 @@
 .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2005
+.Dd September 25, 2014
 .Dt CDCE 4
 .Os
 .Sh NAME
@@ -114,9 +114,10 @@ is running low on mbufs.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr intro 4 ,
+.Xr ipheth 4 ,
 .Xr netintro 4 ,
+.Xr urndis 4 ,
 .Xr usb 4 ,
-.\" .Xr hostname.if 5 ,
 .Xr ifconfig 8
 .Rs
 .%T "Universal Serial Bus Class Definitions for Communication Devices"
diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4
index 215a1948381b..9a9f86850c56 100644
--- a/share/man/man4/cxgbe.4
+++ b/share/man/man4/cxgbe.4
@@ -240,8 +240,19 @@ The default is -1 which lets the driver pick a pad boundary.
 Controls the hardware response to congestion.
 -1 disables congestion feedback and is not recommended.
 0 instructs the hardware to backpressure its pipeline on congestion.
-This usually results in the port emitting pause frames.
+This usually results in the port emitting PAUSE frames.
 1 instructs the hardware to drop frames destined for congested queues.
+.It Va hw.cxgbe.pause_settings
+PAUSE frame settings.
+Bit 0 is rx_pause, bit 1 is tx_pause.
+rx_pause = 1 instructs the hardware to heed incoming PAUSE frames, 0 instructs
+it to ignore them.
+tx_pause = 1 allows the hardware to emit PAUSE frames when its receive FIFO
+reaches a high threshold, 0 prohibits the hardware from emitting PAUSE frames.
+The default is 3 (both rx_pause and tx_pause = 1).
+This tunable establishes the default PAUSE settings for all ports.
+Settings can be displayed and controlled on a per-port basis via the
+dev.cxgbe.X.pause_settings (dev.cxl.X.pause_settings for T5 cards) sysctl.
 .It Va hw.cxgbe.buffer_packing
 Allow the hardware to deliver multiple frames in the same receive buffer
 opportunistically.
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index 6b7f78eae926..c0f51b3e1de1 100644
--- a/share/man/man4/icmp.4
+++ b/share/man/man4/icmp.4
@@ -28,7 +28,7 @@
 .\"     @(#)icmp.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd February 9, 2007
+.Dd September 30, 2014
 .Dt ICMP 4
 .Os
 .Sh NAME
@@ -216,6 +216,10 @@ instead of the possibly different return path.
 Number of bytes from original packet to quote in ICMP reply.
 This number is internally enforced to be at least 8 bytes (per RFC792)
 and at most the maximal space left in the ICMP reply mbuf.
+.It Va tstamprepl
+.Pq Vt boolean
+Enable/disable replies to ICMP Timestamp packets.
+Defaults to true.
 .El
 .Sh ERRORS
 A socket operation may fail with one of the following errors returned:
diff --git a/share/man/man4/ipheth.4 b/share/man/man4/ipheth.4
new file mode 100644
index 000000000000..50491fb2f270
--- /dev/null
+++ b/share/man/man4/ipheth.4
@@ -0,0 +1,106 @@
+.\" Copyright (c) 2014 Gavin Atkinson
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\"    - Redistributions of source code must retain the above copyright
+.\"      notice, this list of conditions and the following disclaimer.
+.\"    - 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 COPYRIGHT HOLDERS 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
+.\" COPYRIGHT HOLDERS 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 30, 2014
+.Dt IPHETH 4
+.Os
+.Sh NAME
+.Nm ipheth
+.Nd "USB Apple iPhone/iPad tethered Ethernet driver"
+.Sh SYNOPSIS
+To load the driver as a module at boot time, place the
+following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+if_ipheth_load="YES"
+.Ed
+.Pp
+Alternatively, to compile this driver into the kernel, place the
+following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device uhci"
+.Cd "device ohci"
+.Cd "device usb"
+.Cd "device ipheth"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for network access through Apple
+iPhone and iPad devices, often referred to as USB tethering.
+.Pp
+.Nm
+should work with any Apple iPhone or iPad device.
+In most cases this must be explicitly enabled on the device first.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+The device does not support different media types or options.
+.Sh HARDWARE
+The following devices are supported by the
+.Nm
+driver:
+.Pp
+.Bl -bullet -compact
+.It
+Apple iPhone tethering (all models)
+.It
+Apple iPad tethering (all models)
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr cdce 4 ,
+.Xr intro 4 ,
+.Xr netintro 4 ,
+.Xr urndis 4 ,
+.Xr usb 4 ,
+.Xr ifconfig 8
+.Xr usbconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 8.2 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
+.Sh BUGS
+Some devices may need to be manually configured to use an alternative
+configuration with the
+.Xr usbconfig 8
+utility.
+A command similar to
+.Dl usbconfig -u 1 -a 2 set_config 3
+may be required if the device is not recognised automatically by
+.Nm
+after it is connected.
+
diff --git a/share/man/man4/iscsi.4 b/share/man/man4/iscsi.4
new file mode 100755
index 000000000000..2b0db75a2989
--- /dev/null
+++ b/share/man/man4/iscsi.4
@@ -0,0 +1,111 @@
+.\" Copyright (c) 2014 Edward Tomasz Napierala
+.\" All rights reserved.
+.\"
+.\" 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 AUTHOR 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 AUTHOR 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.
+.\"
+.\" $FreeBSD$
+.Dd September 11, 2014
+.Dt ISCSI 4
+.Os
+.Sh NAME
+.Nm iscsi
+.Nd iSCSI initiator
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in the
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device iscsi"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+iscsi_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+subsystem provides the kernel component of an iSCSI initiator.
+The initiator is the iSCSI client, which connects to an iSCSI target,
+providing local access to a remote block device.
+The userland component is provided by
+.Xr iscsid 8
+and both the kernel and userland are configured using
+.Xr iscsictl 8 .
+The
+.Nm
+subsystem is responsible for implementing the
+.Qq Full Feature Phase
+of the iSCSI protocol.
+.Sh SYSCTL VARIABLES
+The following variables are available as both
+.Xr sysctl 8
+variables and
+.Xr loader 8
+tunables:
+.Bl -tag -width indent
+.It Va kern.iscsi.ping_timeout
+The number of seconds to wait for the target to respond to a NOP-Out
+PDU.
+In the event that there is no response within that time the session gets
+forcibly restarted.
+.It Va kern.iscsi.iscsid_timeout
+The number of seconds to wait for
+.Xr ctld 8
+to establish a session.
+After that time
+.Nm
+will abort and retry.
+.It Va kern.iscsi.login_timeout
+The number of seconds to wait for a login attempt to succeed.
+After that time
+.Nm
+will abort and retry.
+.It Va kern.iscsi.maxtags
+The maximum number of outstanding IO requests.
+.It Va kern.iscsi.fail_on_disconnection
+Controls the behavior after an iSCSI connection has been dropped due to
+network problems.
+When set to 1, a dropped connection causes the iSCSI device nodes
+to be destroyed.
+After reconnecting, they will be created again.
+By default, the device nodes are left intact.
+While the connection is down all input/output operations are suspended, to be
+retried after the connection is reestablished.
+.El
+.Sh SEE ALSO
+.Xr iscsi.conf 5 ,
+.Xr iscsictl 8 ,
+.Xr iscsid 8
+.Sh HISTORY
+The
+.Nm
+subsystem first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+subsystem was developed by
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
+under sponsorship from the FreeBSD Foundation.
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index 392f5f73cdc6..1b4031593155 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 23, 2012
+.Dd October 1, 2014
 .Dt LAGG 4
 .Os
 .Sh NAME
@@ -61,10 +61,10 @@ option.
 The driver currently supports the aggregation protocols
 .Ic failover
 (the default),
-.Ic fec ,
 .Ic lacp ,
 .Ic loadbalance ,
 .Ic roundrobin ,
+.Ic broadcast ,
 and
 .Ic none .
 The protocols determine which ports are used for outgoing traffic
@@ -86,9 +86,6 @@ This constraint can be relaxed by setting the
 .Xr sysctl 8
 variable to a nonzero value,
 which is useful for certain bridged network setups.
-.It Ic fec
-Supports Cisco EtherChannel.
-This is an alias for
 .Ic loadbalance
 mode.
 .It Ic lacp
@@ -113,6 +110,9 @@ available, the VLAN tag, and the IP source and destination address.
 Distributes outgoing traffic using a round-robin scheduler
 through all active ports and accepts incoming traffic from
 any active port.
+.It Ic broadcast
+Sends frames to all ports of the LAG and receives frames on
+any port of the LAG.
 .It Ic none
 This protocol is intended to do nothing: it disables any traffic without
 disabling the
@@ -143,9 +143,9 @@ modes will use the RSS hash from the network card if available to avoid
 computing one, this may give poor traffic distribution if the hash is invalid
 or uses less of the protocol header information.
 Local hash computation can be forced per interface by setting the
-.Va net.link.lagg.X.use_flowid
-.Xr sysctl 8
-variable to zero where X is the interface number.
+.Cm use_flowid
+.Xr ifconfig 8
+flag.
 The default for new interfaces is set via the
 .Va net.link.lagg.default_use_flowid
 .Xr sysctl 8 .
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 22cc47142fbd..7f8a03631ff0 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd October 21, 2009
+.Dd September 20, 2014
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ kernel configuration file:
 .Ed
 .Pp
 Alternatively, to load the driver as a
-module at boot time, place the following lines in
+module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_malo_load="YES"
@@ -84,6 +84,15 @@ the archive and running
 in the
 .Pa malo-firmware-1.4
 directory.
+.Pp
+To load the
+.Nm malofw
+firmware kernel module at boot time, place the following
+line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+malofw_load="YES"
+.Ed
 .Sh HARDWARE
 The following cards are among those supported by the
 .Nm
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
index 73e7bf72fc54..0e5b576f4c44 100644
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
-MAN=	devcfg.4 \
+MAN=	cgem.4 \
+	devcfg.4 \
 	mge.4 \
 	npe.4 \
 	ti_adc.4
 
-MLINKS= mge.4 if_mge.4
+MLINKS= cgem.4 if_cgem.4
+MLINKS+= mge.4 if_mge.4
 MLINKS+=npe.4 if_npe.4
 
 MANSUBDIR=/arm
diff --git a/share/man/man4/man4.arm/cgem.4 b/share/man/man4/man4.arm/cgem.4
new file mode 100644
index 000000000000..8af1b2ab90c4
--- /dev/null
+++ b/share/man/man4/man4.arm/cgem.4
@@ -0,0 +1,297 @@
+.\"
+.\" Copyright (c) 2014 Thomas Skibo <thomasskibo@yahoo.com>
+.\" All rights reserved.
+.\"
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd August 26, 2014
+.Dt CGEM 4
+.Os
+.Sh NAME
+.Nm cgem
+.Nd "Cadence GEM Gigabit Ethernet driver"
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device ether"
+.Cd "device miibus"
+.Cd "device cgem"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Cadence GEM (Gigabit Ethernet MAC).
+The Cadence GEM is used in some SoC (System on a Chip) devices such as
+the Xilinx Zynq-7000 and the Atmel SAMA5D3.
+.Pp
+The
+.Nm
+driver supports the following media types:
+.Bl -tag -width ".Cm 10baseT/UTP"
+.It Cm autoselect
+Enable autoselection of the media type and options.
+The user can manually override
+the autoselected mode using
+.Xr ifconfig 8
+or by adding media options to
+.Xr rc.conf 5 .
+.It Cm 10baseT/UTP
+Set 10Mbps operation.
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.It Cm 1000baseT
+Set 1000Mbps (Gigabit Ethernet) operation over twisted pair.
+The GEM supports 1000Mbps in
+.Cm full-duplex
+mode only.
+.El
+.Pp
+The
+.Nm
+driver supports the following media options:
+.Bl -tag -width ".Cm full-duplex"
+.It Cm full-duplex
+Force full-duplex operation.
+.It Cm half-duplex
+Force half-duplex operation.
+.El
+.Pp
+The driver provides support for TCP/UDP/IP checksum offloading (although
+disabled by default).
+The device and driver also support 1536-byte frames for VLANs (vlanmtu).
+.Sh SYSCTL VARIABLES
+The following variables are available as both
+.Xr sysctl 8
+variables and
+.Xr loader 8
+tunables:
+.Bl -tag -width "xxxxxxxx"
+.It Va dev.cgem.%d.rxbufs
+The number of receive buffers allocated to the hardware.
+The default value is 256.
+The maximum value is 511.
+If this number is increased while the interface is UP, it will not
+take effect until the next packet is received.
+If this number is decreased while the interface is UP, buffers will
+not be immediately removed from the receive buffer ring but the
+number of buffers will decrease as packets are received until it
+reaches the new value.
+.It Va dev.cgem.%d.rxhangwar
+This tunable enables a work-around to recover from receive hangs.
+The default value is 1.
+Set to 0 to disable the work-around.
+.El
+.Pp
+The following read-only variables are available as
+.Xr sysctl 8
+variables:
+.Bl -tag -width "xxxxxxxx"
+.It Va dev.cgem.%d._rxoverruns
+This variable counts the number of receive packet buffer overrun interrupts.
+.It Va dev.cgem.%d._rxnobufs
+This variable counts the number of interrupts due to the GEM buffer ring
+going empty.
+.It Va dev.cgem.%d._rxdmamapfails
+This variable is the number of times bus_dmamap_load_mbuf_sg(9) failed in
+the receive path.
+.It Va dev.cgem.%d._txfull
+The number of times the GEM's transmit ring was full.
+.It Va dev.cgem.%d._txdmamapfails
+This variable is the number of times bus_dmamap_load_mbuf_sg(9) failed in
+the transmit path.
+.It Va dev.cgem.%d._txdefrags
+This variable is the number of times the driver needed to call m_defrag(9)
+because a packet queued for transmit had too many DMA segments.
+.It Va dev.cgem.%d._txdefragfails
+This variable is the number of times
+.Xr m_defrag 9
+failed.
+.It Va dev.cgem.%d.stats.*
+The following variables are useful MAC counters supplied by the hardware:
+.It Va dev.cgem.%d.stats.tx_bytes
+A 64-bit counter of the number of bytes transmitted in frames without error.
+.It Va dev.cgem.%d.stats.tx_frames
+Counter of frames transmitted without error excluding pause frames.
+.It Va dev.cgem.%d.stats.tx_frames_bcast
+Counter of broadcast frames transmitted without error excluding
+pause frames.
+.It Va dev.cgem.%d.stats.tx_frames_multi
+Counter of multicast frames transmitted without error excluding
+pause frames.
+.It Va dev.cgem.%d.stats.tx_frames_pause
+Counter of pause frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_64b
+Counter of 64 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_65to127b
+Counter of 65 to 127 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_128to255b
+Counter of 128 to 255 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_256to511b
+Counter of 256 to 511 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_512to1023b
+Counter of 512 to 1023 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_frames_1024to1536b
+Counter of 1024 to 1536 byte frames transmitted without error.
+.It Va dev.cgem.%d.stats.tx_under_runs
+Counter of frames not transmitted due to a transmit underrun.
+.It Va dev.cgem.%d.stats.tx_single_collisn
+Counter of frames experiencing a single collision before being successfully
+transmitted.
+.It Va dev.cgem.%d.stats.tx_multi_collisn
+Counter of frames experiencing between 2 and 15 collisions before
+being successfully transmitted.
+.It Va dev.cgem.%d.stats.tx_excsv_collisn
+Counter of frames that failed to transmit because they experienced 16
+collisions.
+.It Va dev.cgem.%d.stats.tx_late_collisn
+Counter of frames that experienced a late collision.
+.It Va dev.cgem.%d.stats.tx_deferred_frames
+Counter of frames experiencing deferral due to carrier sense being
+active on their first attempt at transmission.
+.It Va dev.cgem.%d.stats.tx_carrier_sense_errs
+Counter of frames transmitted where carrier sense was not seen during
+transmission or where carrier sense was deasserted after being asserted
+in a transmit frame without collision.
+.It Va dev.cgem.%d.stats.rx_bytes
+A 64-bit counter of bytes received without error excluding pause
+frames.
+.It Va dev.cgem.%d.stats.rx_frames
+Counter of frames received without error excluding pause frames.
+.It Va dev.cgem.%d.stats.rx_frames_bcast
+Counter of broadcast frames receive without error excluding pause frames.
+.It Va dev.cgem.%d.stats.rx_frames_multi
+Counter of multicast frames receive without error excluding pause frames.
+.It Va dev.cgem.%d.stats.rx_frames_pause
+Counter of pause frames recevied without error.
+.It Va dev.cgem.%d.stats.rx_frames_64b
+Counter of 64-byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_65to127b
+Counter of 65 to 127 byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_128to255b
+Counter of 128 to 255 byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_256to511b
+Counter of 256 to 511 byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_512to1023b
+Counter of 512 to 1023 byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_1024to1536b
+Counter of 1024 to 1536 byte frames received without error.
+.It Va dev.cgem.%d.stats.rx_frames_undersize
+Counter of frames received less than 64 bytes in length that
+do not also have either a CRC error or an alignment error.
+.It Va dev.cgem.%d.stats.rx_frames_oversize
+Counter of frames received exceeding 1536 bytes and do not also have either
+a CRC error or an alignment error.
+.It Va dev.cgem.%d.stats.rx_frames_jabber
+Counter of frames received exceeding 1536 bytes and also have either a CRC
+error, an alignment error, or a receive symbol error.
+.It Va dev.cgem.%d.stats.rx_frames_fcs_errs
+Counter of frames received with a bad CRC and are between 64
+and 1536 bytes.
+.It Va dev.cgem.%d.stats.rx_frames_length_errs
+Counter of frames received that are shorter than that extracted
+from the length field.
+.It Va dev.cgem.%d.stats.rx_symbol_errs
+Counter of receive symbol errors.
+.It Va dev.cgem.%d.stats.rx_align_errs
+Counter of received frames that are not an integral number of bytes.
+.It Va dev.cgem.%d.stats.rx_resource_errs
+Counter of frames successfully receive by the MAC but could not be
+copied to memory because no receive buffer was available.
+.It Va dev.cgem.%d.stats.rx_overrun_errs
+Counter of frames that are address recognized but were not copied
+to memory due to a receive overrun.
+.It Va dev.cgem.%d.stats.rx_frames_ip_hdr_csum_errs
+Counter of frames discarded due to an incorrect IP header checksum when
+checksum offloading is enabled.
+.It Va dev.cgem.%d.stats.rx_frames_tcp_csum_errs
+Counter of frames discarded due to an incorrect TCP checksum when
+checksum offloading is enabled.
+.It Va dev.cgem.%d.stats.rx_frames_udp_csum_errs
+Counter of frames discarded due to an incorrect UDP checksum when
+checksum offloading is enabled.
+.El
+.Sh BUGS
+The GEM can perform TCP/UDP/IP checksum offloading.
+However, when transmit checksum offloading is enabled, the GEM generates and
+replaces checksums for all packets it transmits.
+In a system that is forwarding packets, the device could potentially correct
+the checksum of packet that was corrupted in transit.
+For this reason, checksum offloading is disabled by default but can be
+enabled using ifconfig(8).
+.Pp
+When receive checksum offloading is enabled, the device will discard packets
+with bad TCP/UDP/IP checksums.
+The bad packets will not be counted in any
+.Xr netstat 1
+statistics.  There are
+.Xr sysctl 8
+variables that count
+packets discarded by the hardware (see below).
+.Pp
+The GEM used in the Zynq-7000 has a bug such that  the receiver can
+potentially freeze up under a high load.  The issue is described in sec. 16.7
+"Known Issues" of the Zynq-7000 SoC Technical Reference Manual (Xilinx
+UG585 v1.7).
+The
+.Nm
+driver implements the work-around suggested in the manual.
+If the bug does not exist in other versions of this device, the
+work-around can be disabled by setting the dev.cgem.%d.rxhangwar
+.Xr sysctl 8
+variable to 0.
+.Pp
+.Sh SEE ALSO
+.Xr miibus 4 ,
+.Xr ifconfig 8
+.Rs
+.%T "Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585)"
+.%U http://www.xilinx.com/support/documentation/user_guides/\:ug585-Zynq-7000-TRM.pdf
+.Re
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+driver and this manual page was written by
+.An Thomas Skibo Aq Mt thomasskibo@yahoo.com .
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index 6152095fc3b8..a04e7a83f523 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -8,7 +8,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 15, 2011
+.Dd September 26, 2014
 .Dt MIIBUS 4
 .Os
 .Sh NAME
@@ -103,6 +103,8 @@ Silicon Integrated Systems SiS190/191 Ethernet
 Silicon Integrated Systems SiS 900/SiS 7016
 .It Xr sk 4
 SysKonnect SK-984x and SK-982x Gigabit Ethernet
+.It Xr smsc 4
+SMSC LAN9xxx USB Fast Ethernet
 .It Xr ste 4
 Sundance ST201 (D-Link DFE-550TX)
 .It Xr stge 4
@@ -166,6 +168,7 @@ but as a result are not well behaved newbus device drivers.
 .Xr sge 4 ,
 .Xr sis 4 ,
 .Xr sk 4 ,
+.Xr smsc 4 ,
 .Xr ste 4 ,
 .Xr stge 4 ,
 .Xr tl 4 ,
diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4
index 5e4935d465ee..7930fcf6e1e7 100644
--- a/share/man/man4/sfxge.4
+++ b/share/man/man4/sfxge.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 8, 2012
+.Dd September 30, 2014
 .Dt SFXGE 4
 .Os
 .Sh NAME
@@ -76,6 +76,39 @@ The
 .Nm
 driver supports all 10Gb Ethernet adapters based on Solarflare SFC9000
 family controllers.
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+Actual values can be obtained using
+.Xr sysctl 8 .
+.Bl -tag -width indent
+.It Va hw.sfxge.rx_ring
+The maximum number of descriptors in a receive queue ring.
+Supported values are: 512, 1024, 2048 and 4096.
+.It Va hw.sfxge.tx_ring
+The maximum number of descriptors in a transmit queue ring.
+Supported values are: 512, 1024, 2048 and 4096.
+.It Va hw.sfxge.tx_dpl_get_max
+The maximum length of the deferred packet
+.Dq get-list
+for queued transmit
+packets, used only if the transmit queue lock can be acquired.
+If a packet is dropped, the
+.Va tx_early_drops
+counter is incremented and the local sender receives ENOBUFS.
+The value must be greater than 0.
+.It Va hw.sfxge.tx_dpl_put_max
+The maximum length of the deferred packet
+.Dq put-list
+for queued transmit
+packets, used if the transmit queue lock cannot be acquired.
+If a packet is dropped, the
+.Va tx_early_drops
+counter is incremented and the local sender receives ENOBUFS.
+The value must be greater than or equal to 0.
+.El
 .Sh SUPPORT
 For general information and support,
 go to the Solarflare support website at:
diff --git a/share/man/man4/smsc.4 b/share/man/man4/smsc.4
new file mode 100644
index 000000000000..fb375390632f
--- /dev/null
+++ b/share/man/man4/smsc.4
@@ -0,0 +1,91 @@
+.\" Copyright (c) 2014 Gavin Atkinson
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\"    - Redistributions of source code must retain the above copyright
+.\"      notice, this list of conditions and the following disclaimer.
+.\"    - 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 COPYRIGHT HOLDERS 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
+.\" COPYRIGHT HOLDERS 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 26, 2014
+.Dt SMSC 4
+.Os
+.Sh NAME
+.Nm smsc
+.Nd "USB SMSC LAN9xxx Fast Ethernet driver"
+.Sh SYNOPSIS
+To load the driver as a module at boot time, place the
+following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+if_smsc_load="YES"
+.Ed
+.Pp
+Alternatively, to compile this driver into the kernel, place the
+following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device uhci"
+.Cd "device ohci"
+.Cd "device usb"
+.Cd "device miibus"
+.Cd "device smsc"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+device driver provides support for USB Fast Ethernet adapters based
+on the SMSC LAN9xxx chipsets.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh HARDWARE
+The following devices are supported by the
+.Nm
+driver:
+.Pp
+.Bl -bullet -compact
+.It
+SMSC LAN9500, LAN9500A, LAN9505 and LAN9505A based Ethernet adapters
+.It
+SMSC LAN89530, LAN9530 and LAN9730 based Ethernet adapters
+.It
+SMSC LAN951x Ethernet adapters with integrated USB hub
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr intro 4 ,
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr usb 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Ben Gray Aq Mt bgray@FreeBSD.org .
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index 9be029424322..a13d4d939b25 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 1, 2008
+.Dd October 3, 2014
 .Dt UCOM 4
 .Os
 .Sh NAME
@@ -81,8 +81,10 @@ multiple external ports.
 .Xr umcs 4 ,
 .Xr umct 4 ,
 .Xr umodem 4 ,
+.Xr umoscom 4 ,
 .Xr uplcom 4 ,
 .Xr usb 4 ,
+.Xr uslcom 4 ,
 .Xr uvisor 4 ,
 .Xr uvscom 4
 .Sh HISTORY
diff --git a/share/man/man4/udplite.4 b/share/man/man4/udplite.4
index 5d06b1440984..859c9667629e 100644
--- a/share/man/man4/udplite.4
+++ b/share/man/man4/udplite.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 7, 2014
+.Dd October 1, 2014
 .Dt UDPLITE 4
 .Os
 .Sh NAME
@@ -55,16 +55,16 @@ and tested with
 .Bl -tag -width ".Dv UDPLITE_SEND_CSCOV"
 .It Dv UDPLITE_SEND_CSCOV
 This option sets the sender checksum coverage.
-A value of zero indicates that the entire packet
-is covered by the checksum. 
-A value of 1 to 7 must be discarded by the receiver.
+A value of zero indicates that all sent packets will have
+full checksum coverage.
+A value of 8 to 65535 limits the checksum coverage of all sent packets
+to the value given.
 .It Dv UDPLITE_RECV_CSCOV
 This option is the receiver-side analogue.
-It is truly optional, i.e. not required to enable traffic
-with partial checksum coverage.
-Its function is that of a traffic filter:
-when enabled, it instructs the kernel to drop
-all packets which have a coverage less than this value.
+A value of zero instructs the kernel to drop all received packets
+not having full checksum coverage.
+A value of 8 to 65535 instructs the kernel to drop all received
+packets with a partial checksum coverage smaller than the value specified.
 .El
 .Sh ERRORS
 A socket operation may fail with one of the following errors returned:
diff --git a/share/man/man4/uled.4 b/share/man/man4/uled.4
index 28b8623daedb..16b24baaa04d 100644
--- a/share/man/man4/uled.4
+++ b/share/man/man4/uled.4
@@ -73,7 +73,6 @@ struct uled_color {
 	uint8_t	blue;
 };
 .Ed
-.Pp
 .It Dv ULED_SET_COLOR
 The command sets LED colors with values for RGB.
 It uses the same structure as above.
diff --git a/share/man/man4/urndis.4 b/share/man/man4/urndis.4
index 9d126bd3fc77..ee367b7d5115 100644
--- a/share/man/man4/urndis.4
+++ b/share/man/man4/urndis.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 21, 2014
+.Dd October 2, 2014
 .Dt URNDIS 4
 .Os
 .Sh NAME
@@ -68,8 +68,16 @@ such as those commonly found on Android devices.
 It does not support different media types or options.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
+.Sh HARDWARE
+The
+.Nm
+driver supports the
+.Qq tethering
+functionality of many Android devices.
 .Sh SEE ALSO
 .Xr arp 4 ,
+.Xr cdce 4 ,
+.Xr ipheth 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,
 .Xr ifconfig 8
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index d63d00c031cf..de4ef6dba0da 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm urtwn
-.Nd Realtek RTL8188CU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device
+.Nd Realtek RTL8188CU/RTL8188RU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -82,10 +82,11 @@ firmware license
 .Sh HARDWARE
 The
 .Nm
-driver supports Realtek RTL8188CU/RTL8188EU/RTL8192CU based USB
+driver supports Realtek RTL8188CU/RTL8188RU/RTL8188EU/RTL8192CU based USB
 IEEE 802.11b/g/n wireless network adapters, including:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
+.It Alfa AWUS036NHR v2
 .It ASUS USB-N10 NANO
 .It Belkin F7D1102 Surf Wireless Micro
 .It D-Link DWA-125 rev D1
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 669e773bac64..47d9ef8e5520 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1199,6 +1199,19 @@ or
 .Li inet6 2001:db8:1-f::1/64 .
 This notation allows address and prefix length part only,
 not the other address modifiers.
+Note that the maximum number of the generated addresses from a range
+specification is limited to an integer value specified in
+.Va netif_ipexpand_max
+in
+.Xr rc.conf 5
+because a small typo can unexpectedly generate a large number of addresses.
+The default value is
+.Li 2048 .
+It can be increased by adding the following line into
+.Xr rc.conf 5 :
+.Bd -literal
+netif_ipexpand_max="4096"
+.Ed
 .Pp
 In the case of
 .Li 192.0.2.5-23/24 ,
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 2a20d7bad078..5997846cc330 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd August 19, 2014
+.Dd September 12, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -522,6 +522,18 @@ Set to build Hesiod support.
 .It Va WITHOUT_HTML
 .\" from FreeBSD: head/tools/build/options/WITHOUT_HTML 156932 2006-03-21 07:50:50Z ru
 Set to not build HTML docs.
+.It Va WITHOUT_HYPERV
+.\" from FreeBSD: head/tools/build/options/WITHOUT_HYPERV 271493 2014-09-13 02:15:31Z delphij
+Set to not build or install HyperV utilities.
+.Pp
+It is a default setting on
+arm/arm, arm/armeb, arm/armv6, arm/armv6hf, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+.It Va WITH_HYPERV
+.\" from FreeBSD: head/tools/build/options/WITH_HYPERV 271493 2014-09-13 02:15:31Z delphij
+Set to build and install HyperV utilities.
+.Pp
+It is a default setting on
+amd64/amd64, i386/i386 and pc98/i386.
 .It Va WITHOUT_ICONV
 .\" from FreeBSD: head/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine
 Set to not build iconv as part of libc.
@@ -926,10 +938,12 @@ This includes
 .Xr rsh 1 ,
 etc.
 .It Va WITHOUT_RCS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 256198 2013-10-09 17:07:20Z gjb
+.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 271401 2014-09-10 19:00:17Z asomers
 Set to not build
 .Xr rcs 1
-and related utilities.
+,
+.Xr etcupdate 8
+, and related utilities.
 .It Va WITHOUT_RESCUE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru
 Set to not build
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 8fc75f3da4eb..93aec89618a9 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 11, 2014
+.Dd October 2, 2014
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -351,6 +351,61 @@ Set to the target directory within
 to check out
 .Va ${UBOOTSRC}/${UBOOTBRANCH} .
 .El
+.Sh VIRTUAL MACHINE DISK IMAGES
+The following
+.Fa release.conf
+variables are relevant only to virtual machine disk image builds:
+.Bl -tag -width Ev
+.It Va WITH_VMIMAGES
+Set to a non-null value to build virtual machine disk images as part
+of the release build.
+.Va WITH_VMIMAGES
+may also be specified as an envirionment variable passed to
+.Xr make 1 .
+.Pp
+The option requires
+.Xr mkimg 1
+version 20140927 or later.
+.It Va WITH_COMPRESSED_VMIMAGES
+Set to a non-null value to compress the virtual machine disk images with
+.Xr xz 1
+as part of the
+.Cm install
+.Xr make 1
+target.
+Note that compressing virtual machine disk images may take a very long
+time on some systems.
+.It Va VMBASE
+Set to change the name of the resulting virtual machine disk image file.
+The default value is
+.Va vm .
+.It Va VMSIZE
+Set to change the size of the virtual machine disk capacity.
+The default value is
+.Va 20G .
+See
+.Xr truncate 1
+for valid values.
+.Pp
+Virtual machine disk images are, by default, created as sparse images.
+When
+.Va WITH_COMPRESSED_VMIMAGES
+is used, the resulting files compressed with
+.Xr xz 1
+compress to roughly the same size, regardless of the specified disk image
+size.
+.It Va VMFORMATS
+Set to the target virtual disk image format(s) to create.
+By default, the
+.Va vhdf , Va vmdk , Va qcow2 ,
+and
+.Va raw
+formats are created.
+See
+.Xr mkimg 1
+for valid format values
+.Pq requires version 20140927 or later .
+.El
 .Sh MAKEFILE TARGETS
 The release makefile
 .Pq Pa src/release/Makefile
@@ -407,6 +462,14 @@ Creates a directory named
 .Pa ftp
 containing the distribution files used in network installations
 and suitable for upload to an FTP mirror.
+.It Cm vm-image
+Creates virtual machine disk images in various formats.
+The
+.Cm vm-image
+target requires the
+.Va WITH_VMIMAGES
+.Xr make 1
+envirionment variable to be set to a non-null value.
 .El
 .Pp
 Major subtargets called by targets above:
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index b6fcb80021d3..9e8297aa965f 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -391,13 +391,21 @@ MLINKS=	unr.9 alloc_unr.9 \
 	unr.9 delete_unrhdr.9 \
 	unr.9 free_unr.9 \
 	unr.9 new_unrhdr.9
+MLINKS+=accept_filter.9 accept_filt_add.9 \
+	accept_filter.9 accept_filt_del.9 \
+	accept_filter.9 accept_filt_generic_mod_event.9 \
+	accept_filter.9 accept_filt_get.9
 MLINKS+=alq.9 ALQ.9 \
 	alq.9 alq_close.9 \
 	alq.9 alq_flush.9 \
 	alq.9 alq_get.9 \
+	alq.9 alq_getn.9 \
 	alq.9 alq_open.9 \
+	alq.9 alq_open_flags.9 \
 	alq.9 alq_post.9 \
-	alq.9 alq_write.9
+	alq.9 alq_post_flags.9 \
+	alq.9 alq_write.9 \
+	alq.9 alq_writen.9
 MLINKS+=altq.9 ALTQ.9
 MLINKS+=atomic.9 atomic_add.9 \
 	atomic.9 atomic_clear.9 \
@@ -407,7 +415,9 @@ MLINKS+=atomic.9 atomic_add.9 \
 	atomic.9 atomic_readandclear.9 \
 	atomic.9 atomic_set.9 \
 	atomic.9 atomic_store.9 \
-	atomic.9 atomic_subtract.9
+	atomic.9 atomic_subtract.9 \
+	atomic.9 atomic_swap.9 \
+	atomic.9 atomic_testandset.9
 MLINKS+=bpf.9 bpfattach.9 \
 	bpf.9 bpfattach2.9 \
 	bpf.9 bpfdetach.9 \
@@ -435,6 +445,8 @@ MLINKS+=bus_dma.9 busdma.9 \
 	bus_dma.9 bus_dmamap_create.9 \
 	bus_dma.9 bus_dmamap_destroy.9 \
 	bus_dma.9 bus_dmamap_load.9 \
+	bus_dma.9 bus_dmamap_load_bio.9 \
+	bus_dma.9 bus_dmamap_load_ccb.9 \
 	bus_dma.9 bus_dmamap_load_mbuf.9 \
 	bus_dma.9 bus_dmamap_load_mbuf_sg.9 \
 	bus_dma.9 bus_dmamap_load_uio.9 \
@@ -449,7 +461,8 @@ MLINKS+=BUS_READ_IVAR.9 BUS_WRITE_IVAR.9
 MLINKS+=BUS_SETUP_INTR.9 bus_setup_intr.9 \
 	BUS_SETUP_INTR.9 BUS_TEARDOWN_INTR.9 \
 	BUS_SETUP_INTR.9 bus_teardown_intr.9
-MLINKS+=bus_space.9 bus_space_barrier.9 \
+MLINKS+=bus_space.9 bus_space_alloc.9 \
+	bus_space.9 bus_space_barrier.9 \
 	bus_space.9 bus_space_copy_region_1.9 \
 	bus_space.9 bus_space_copy_region_2.9 \
 	bus_space.9 bus_space_copy_region_4.9 \
@@ -560,6 +573,7 @@ MLINKS+=condvar.9 cv_broadcast.9 \
 	condvar.9 cv_signal.9 \
 	condvar.9 cv_timedwait.9 \
 	condvar.9 cv_timedwait_sig.9 \
+	condvar.9 cv_timedwait_sig_sbt.9 \
 	condvar.9 cv_wait.9 \
 	condvar.9 cv_wait_sig.9 \
 	condvar.9 cv_wait_unlock.9 \
@@ -664,12 +678,21 @@ MLINKS+=eventtimers.9 et_register.9 \
 	eventtimers.9 ET_UNLOCK.9 \
 	eventtimers.9 et_start.9 \
 	eventtimers.9 et_stop.9
+MLINKS+=fail.9 KFAIL_POINT_CODE.9 \
+	fail.9 KFAIL_POINT_ERROR.9 \
+	fail.9 KFAIL_POINT_GOTO.9 \
+	fail.9 KFAIL_POINT_RETURN.9 \
+	fail.9 KFAIL_POINT_RETURN_VOID.9
 MLINKS+=fetch.9 fubyte.9 \
 	fetch.9 fuswintr.9 \
 	fetch.9 fuword.9 \
 	fetch.9 fuword16.9 \
 	fetch.9 fuword32.9 \
 	fetch.9 fuword64.9
+MLINKS+=firmware.9 firmware_get.9 \
+	firmware.9 firmware_put.9 \
+	firmware.9 firmware_register.9 \
+	firmware.9 firmware_unregister.9
 MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \
 	fpu_kern.9 fpu_kern_free_ctx.9 \
 	fpu_kern.9 fpu_kern_enter.9 \
@@ -677,8 +700,10 @@ MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \
 	fpu_kern.9 fpu_kern_thread.9 \
 	fpu_kern.9 is_fpu_kern_thread.9
 MLINKS+=g_attach.9 g_detach.9
-MLINKS+=g_bio.9 g_clone_bio.9 \
+MLINKS+=g_bio.9 g_alloc_bio.9 \
+	g_bio.9 g_clone_bio.9 \
 	g_bio.9 g_destroy_bio.9 \
+	g_bio.9 g_duplicate_bio.9 \
 	g_bio.9 g_new_bio.9 \
 	g_bio.9 g_print_bio.9
 MLINKS+=g_consumer.9 g_destroy_consumer.9 \
@@ -692,7 +717,9 @@ MLINKS+=getenv.9 freeenv.9 \
 	getenv.9 getenv_quad.9 \
 	getenv.9 getenv_uint.9 \
 	getenv.9 getenv_ulong.9 \
-	getenv.9 testenv.9
+	getenv.9 setenv.9 \
+	getenv.9 testenv.9 \
+	getenv.9 unsetenv.9
 MLINKS+=g_event.9 g_cancel_event.9 \
 	g_event.9 g_post_event.9 \
 	g_event.9 g_waitfor_event.9
@@ -706,13 +733,22 @@ MLINKS+=hash.9 hash32.9 \
 	hash.9 hash32_str.9 \
 	hash.9 hash32_stre.9 \
 	hash.9 hash32_strn.9 \
-	hash.9 hash32_strne.9
+	hash.9 hash32_strne.9 \
+	hash.9 jenkins_hash.9 \
+	hash.9 jenkins_hash32.9
 MLINKS+=hashinit.9 hashdestroy.9 \
 	hashinit.9 hashinit_flags.9 \
 	hashinit.9 phashinit.9
+MLINKS+=hhook.9 hhook_head_register.9 \
+	hhook.9 hhook_head_deregister.9 \
+	hhook.9 hhook_head_deregister_lookup.9 \
+	hhook.9 hhook_run_hooks.9 \
+	hhook.9 HHOOKS_RUN_IF.9 \
+	hhook.9 HHOOKS_RUN_LOOKUP_IF.9
 MLINKS+=ieee80211.9 ieee80211_ifattach.9 \
 	ieee80211.9 ieee80211_ifdetach.9
-MLINKS+=ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \
+MLINKS+=ieee80211_amrr.9 ieee80211_amrr_choose.9 \
+	ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \
 	ieee80211_amrr.9 ieee80211_amrr_init.9 \
 	ieee80211_amrr.9 ieee80211_amrr_node_init.9 \
 	ieee80211_amrr.9 ieee80211_amrr_setinterval.9 \
@@ -725,6 +761,7 @@ MLINKS+=ieee80211_bmiss.9 ieee80211_beacon_miss.9
 MLINKS+=ieee80211_crypto.9 ieee80211_crypto_available.9 \
 	ieee80211_crypto.9 ieee80211_crypto_decap.9 \
 	ieee80211_crypto.9 ieee80211_crypto_delglobalkeys.9 \
+	ieee80211_crypto.9 ieee80211_crypto_delkey.9 \
 	ieee80211_crypto.9 ieee80211_crypto_demic.9 \
 	ieee80211_crypto.9 ieee80211_crypto_encap.9 \
 	ieee80211_crypto.9 ieee80211_crypto_enmic.9 \
@@ -763,12 +800,55 @@ MLINKS+=ieee80211_radiotap.9 ieee80211_radiotap_active.9 \
 MLINKS+=ieee80211_regdomain.9 ieee80211_alloc_countryie.9 \
 	ieee80211_regdomain.9 ieee80211_init_channels.9 \
 	ieee80211_regdomain.9 ieee80211_sort_channels.9
+MLINKS+=ieee80211_scan.9 ieee80211_add_scan.9 \
+	ieee80211_scan.9 ieee80211_bg_scan.9 \
+	ieee80211_scan.9 ieee80211_cancel_scan.9 \
+	ieee80211_scan.9 ieee80211_cancel_scan_any.9 \
+	ieee80211_scan.9 ieee80211_check_scan.9 \
+	ieee80211_scan.9 ieee80211_check_scan_current.9 \
+	ieee80211_scan.9 ieee80211_flush.9 \
+	ieee80211_scan.9 ieee80211_probe_curchan.9 \
+	ieee80211_scan.9 ieee80211_scan_assoc_fail.9 \
+	ieee80211_scan.9 ieee80211_scan_done.9 \
+	ieee80211_scan.9 ieee80211_scan_dump_channels.9 \
+	ieee80211_scan.9 ieee80211_scan_flush.9 \
+	ieee80211_scan.9 ieee80211_scan_iterate.9 \
+	ieee80211_scan.9 ieee80211_scan_next.9 \
+	ieee80211_scan.9 ieee80211_scan_timeout.9 \
+	ieee80211_scan.9 ieee80211_scanner_get.9 \
+	ieee80211_scan.9 ieee80211_scanner_register.9 \
+	ieee80211_scan.9 ieee80211_scanner_unregister.9 \
+	ieee80211_scan.9 ieee80211_scanner_unregister_all.9 \
+	ieee80211_scan.9 ieee80211_start_scan.9
 MLINKS+=ieee80211_vap.9 ieee80211_vap_attach.9 \
 	ieee80211_vap.9 ieee80211_vap_detach.9 \
 	ieee80211_vap.9 ieee80211_vap_setup.9
-MLINKS+=ifnet.9 ifaddr.9 \
+MLINKS+=ifnet.9 if_addmulti.9 \
+	ifnet.9 if_alloc.9 \
+	ifnet.9 if_allmulti.9 \
+	ifnet.9 if_attach.9 \
 	ifnet.9 if_data.9 \
-	ifnet.9 ifqueue.9
+	ifnet.9 IF_DEQUEUE.9 \
+	ifnet.9 if_delmulti.9 \
+	ifnet.9 if_detach.9 \
+	ifnet.9 if_down.9 \
+	ifnet.9 if_findmulti.9 \
+	ifnet.9 if_free.9 \
+	ifnet.9 if_free_type.9 \
+	ifnet.9 if_up.9 \
+	ifnet.9 ifa_free.9 \
+	ifnet.9 ifa_ifwithaddr.9 \
+	ifnet.9 ifa_ifwithdstaddr.9 \
+	ifnet.9 ifa_ifwithnet.9 \
+	ifnet.9 ifa_ref.9 \
+	ifnet.9 ifaddr.9 \
+	ifnet.9 ifaddr_byindex.9 \
+	ifnet.9 ifaof_ifpforaddr.9 \
+	ifnet.9 ifioctl.9 \
+	ifnet.9 ifpromisc.9 \
+	ifnet.9 ifqueue.9 \
+	ifnet.9 ifunit.9 \
+	ifnet.9 ifunit_ref.9
 MLINKS+=insmntque.9 insmntque1.9
 MLINKS+=ithread.9 ithread_add_handler.9 \
 	ithread.9 ithread_create.9 \
@@ -783,6 +863,14 @@ MLINKS+=kernel_mount.9 free_mntarg.9 \
 	kernel_mount.9 mount_argb.9 \
 	kernel_mount.9 mount_argf.9 \
 	kernel_mount.9 mount_argsu.9
+MLINKS+=khelp.9 khelp_add_hhook.9 \
+	khelp.9 KHELP_DECLARE_MOD.9 \
+	khelp.9 KHELP_DECLARE_MOD_UMA.9 \
+	khelp.9 khelp_destroy_osd.9 \
+	khelp.9 khelp_get_id.9 \
+	khelp.9 khelp_get_osd.9 \
+	khelp.9 khelp_init_osd.9 \
+	khelp.9 khelp_remove_hhook.9
 MLINKS+=kobj.9 DEFINE_CLASS.9 \
 	kobj.9 kobj_class_compile.9 \
 	kobj.9 kobj_class_compile_static.9 \
@@ -793,6 +881,7 @@ MLINKS+=kobj.9 DEFINE_CLASS.9 \
 	kobj.9 kobj_init_static.9
 MLINKS+=kproc.9 kproc_create.9 \
 	kproc.9 kproc_exit.9 \
+	kproc.9 kproc_kthread_add.9 \
 	kproc.9 kproc_resume.9 \
 	kproc.9 kproc_shutdown.9 \
 	kproc.9 kproc_start.9 \
@@ -827,7 +916,8 @@ MLINKS+=ktr.9 CTR0.9 \
 	ktr.9 CTR2.9 \
 	ktr.9 CTR3.9 \
 	ktr.9 CTR4.9 \
-	ktr.9 CTR5.9
+	ktr.9 CTR5.9 \
+	ktr.9 CTR6.9
 MLINKS+=lock.9 lockdestroy.9 \
 	lock.9 lockinit.9 \
 	lock.9 lockmgr.9 \
@@ -884,6 +974,7 @@ MLINKS+=mbpool.9 mbp_alloc.9 \
 	mbpool.9 mbp_sync.9
 MLINKS+=\
 	mbuf.9 m_adj.9 \
+	mbuf.9 m_align.9 \
 	mbuf.9 M_ALIGN.9 \
 	mbuf.9 m_append.9 \
 	mbuf.9 m_apply.9 \
@@ -894,6 +985,7 @@ MLINKS+=\
 	mbuf.9 m_copydata.9 \
 	mbuf.9 m_copym.9 \
 	mbuf.9 m_copypacket.9 \
+	mbuf.9 m_copyup.9 \
 	mbuf.9 m_defrag.9 \
 	mbuf.9 m_devget.9 \
 	mbuf.9 m_dup.9 \
@@ -1009,9 +1101,38 @@ MLINKS+=mutex.9 mtx_assert.9 \
 MLINKS+=namei.9 NDFREE.9 \
 	namei.9 NDHASGIANT.9 \
 	namei.9 NDINIT.9
+MLINKS+=netisr.9 netisr_clearqdrops.9 \
+	netisr.9 netisr_default_flow2cpu.9 \
+	netisr.9 netisr_dispatch.9 \
+	netisr.9 netisr_dispatch_src.9 \
+	netisr.9 netisr_get_cpucount.9 \
+	netisr.9 netisr_get_cpuid.9 \
+	netisr.9 netisr_getqdrops.9 \
+	netisr.9 netisr_getqlimit.9 \
+	netisr.9 netisr_queue.9 \
+	netisr.9 netisr_queue_src.9 \
+	netisr.9 netisr_register.9 \
+	netisr.9 netisr_setqlimit.9 \
+	netisr.9 netisr_unregister.9
+MLINKS+=osd.9 osd_call.9 \
+	osd.9 osd_del.9 \
+	osd.9 osd_deregister.9 \
+	osd.9 osd_exit.9 \
+	osd.9 osd_get.9 \
+	osd.9 osd_register.9 \
+	osd.9 osd_set.9
 MLINKS+=pbuf.9 getpbuf.9 \
 	pbuf.9 relpbuf.9 \
 	pbuf.9 trypbuf.9
+MLINKS+=PCBGROUP.9 in_pcbgroup_byhash.9 \
+	PCBGROUP.9 in_pcbgroup_byinpcb.9 \
+	PCBGROUP.9 in_pcbgroup_destroy.9 \
+	PCBGROUP.9 in_pcbgroup_enabled.9 \
+	PCBGROUP.9 in_pcbgroup_init.9 \
+	PCBGROUP.9 in_pcbgroup_remove.9 \
+	PCBGROUP.9 in_pcbgroup_update.9 \
+	PCBGROUP.9 in_pcbgroup_update_mbuf.9 \
+	PCBGROUP.9 in6_pcbgroup_byhash.9
 MLINKS+=pci.9 pci_alloc_msi.9 \
 	pci.9 pci_alloc_msix.9 \
 	pci.9 pci_disable_busmaster.9 \
@@ -1040,8 +1161,15 @@ MLINKS+=pci.9 pci_alloc_msi.9 \
 	pci.9 pci_set_max_read_req.9 \
 	pci.9 pci_write_config.9
 MLINKS+=pfil.9 pfil_add_hook.9 \
+	pfil.9 pfil_head_register.9 \
+	pfil.9 pfil_head_unregister.9 \
 	pfil.9 pfil_hook_get.9 \
-	pfil.9 pfil_remove_hook.9
+	pfil.9 pfil_remove_hook.9 \
+	pfil.9 pfil_rlock.9 \
+	pfil.9 pfil_run_hooks.9 \
+	pfil.9 pfil_runlock.9 \
+	pfil.9 pfil_wlock.9 \
+	pfil.9 pfil_wunlock.9
 MLINKS+=pfind.9 zpfind.9
 MLINKS+=pmap_copy.9 pmap_copy_page.9
 MLINKS+=pmap_extract.9 pmap_extract_and_hold.9
@@ -1114,6 +1242,11 @@ MLINKS+=rmlock.9 rm_assert.9 \
 	rmlock.9 rm_wunlock.9
 MLINKS+=rtalloc.9 rtalloc1.9 \
 	rtalloc.9 rtalloc_ign.9 \
+	rtalloc.9 RT_ADDREF.9 \
+	rtalloc.9 RT_LOCK.9 \
+	rtalloc.9 RT_REMREF.9 \
+	rtalloc.9 RT_RTFREE.9 \
+	rtalloc.9 RT_UNLOCK.9 \
 	rtalloc.9 RTFREE_LOCKED.9 \
 	rtalloc.9 RTFREE.9 \
 	rtalloc.9 rtfree.9 \
@@ -1128,6 +1261,7 @@ MLINKS+=rwlock.9 rw_assert.9 \
 	rwlock.9 rw_destroy.9 \
 	rwlock.9 rw_downgrade.9 \
 	rwlock.9 rw_init.9 \
+	rwlock.9 rw_init_flags.9 \
 	rwlock.9 rw_initialized.9 \
 	rwlock.9 rw_rlock.9 \
 	rwlock.9 rw_runlock.9 \
@@ -1165,6 +1299,7 @@ MLINKS+=sbuf.9 sbuf_bcat.9 \
 	sbuf.9 sbuf_vprintf.9
 MLINKS+=scheduler.9 curpriority_cmp.9 \
 	scheduler.9 maybe_resched.9 \
+	scheduler.9 propagate_priority.9 \
 	scheduler.9 resetpriority.9 \
 	scheduler.9 roundrobin.9 \
 	scheduler.9 roundrobin_interval.9 \
@@ -1253,17 +1388,18 @@ MLINKS+=sleepqueue.9 init_sleepqueues.9 \
 	sleepqueue.9 sleepq_add.9 \
 	sleepqueue.9 sleepq_alloc.9 \
 	sleepqueue.9 sleepq_broadcast.9 \
-	sleepqueue.9 sleepq_calc_signal_retval.9 \
-	sleepqueue.9 sleepq_catch_signals.9 \
 	sleepqueue.9 sleepq_free.9 \
 	sleepqueue.9 sleepq_lookup.9 \
+	sleepqueue.9 sleepq_lock.9 \
 	sleepqueue.9 sleepq_release.9 \
 	sleepqueue.9 sleepq_remove.9 \
 	sleepqueue.9 sleepq_set_timeout.9 \
 	sleepqueue.9 sleepq_set_timeout_sbt.9 \
 	sleepqueue.9 sleepq_signal.9 \
+	sleepqueue.9 sleepq_sleepcnt.9 \
 	sleepqueue.9 sleepq_timedwait.9 \
 	sleepqueue.9 sleepq_timedwait_sig.9 \
+	sleepqueue.9 sleepq_type.9 \
 	sleepqueue.9 sleepq_wait.9 \
 	sleepqueue.9 sleepq_wait_sig.9
 MLINKS+=socket.9 soabort.9 \
@@ -1318,6 +1454,8 @@ MLINKS+=stack.9 stack_copy.9 \
 	stack.9 stack_destroy.9 \
 	stack.9 stack_print.9 \
 	stack.9 stack_print_ddb.9 \
+	stack.9 stack_print_short.9 \
+	stack.9 stack_print_short_ddb.9 \
 	stack.9 stack_put.9 \
 	stack.9 stack_save.9 \
 	stack.9 stack_sbuf_print.9 \
@@ -1339,6 +1477,7 @@ MLINKS+=sx.9 sx_assert.9 \
 	sx.9 sx_init_flags.9 \
 	sx.9 sx_sleep.9 \
 	sx.9 sx_slock.9 \
+	sx.9 sx_slock_sig.9 \
 	sx.9 sx_sunlock.9 \
 	sx.9 SX_SYSINIT.9 \
 	sx.9 sx_try_slock.9 \
@@ -1347,6 +1486,7 @@ MLINKS+=sx.9 sx_assert.9 \
 	sx.9 sx_unlock.9 \
 	sx.9 sx_xholder.9 \
 	sx.9 sx_xlock.9 \
+	sx.9 sx_xlock_sig.9 \
 	sx.9 sx_xlocked.9 \
 	sx.9 sx_xunlock.9
 MLINKS+=sysctl.9 SYSCTL_DECL.9 \
@@ -1390,6 +1530,7 @@ MLINKS+=taskqueue.9 TASK_INIT.9 \
 	taskqueue.9 TASK_INITIALIZER.9 \
 	taskqueue.9 taskqueue_block.9 \
 	taskqueue.9 taskqueue_cancel.9 \
+	taskqueue.9 taskqueue_cancel_timeout.9 \
 	taskqueue.9 taskqueue_create.9 \
 	taskqueue.9 taskqueue_create_fast.9 \
 	taskqueue.9 TASKQUEUE_DECLARE.9 \
@@ -1397,14 +1538,20 @@ MLINKS+=taskqueue.9 TASK_INIT.9 \
 	taskqueue.9 TASKQUEUE_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_drain.9 \
 	taskqueue.9 taskqueue_drain_all.9 \
+	taskqueue.9 taskqueue_drain_timeout.9 \
 	taskqueue.9 taskqueue_enqueue.9 \
 	taskqueue.9 taskqueue_enqueue_fast.9 \
+	taskqueue.9 taskqueue_enqueue_timeout.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_free.9 \
 	taskqueue.9 taskqueue_member.9 \
 	taskqueue.9 taskqueue_run.9 \
-	taskqueue.9 taskqueue_unblock.9
+	taskqueue.9 taskqueue_set_callback.9 \
+	taskqueue.9 taskqueue_start_threads.9 \
+	taskqueue.9 taskqueue_start_threads_pinned.9 \
+	taskqueue.9 taskqueue_unblock.9 \
+	taskqueue.9 TIMEOUT_TASK_INIT.9
 MLINKS+=time.9 boottime.9 \
 	time.9 time_second.9 \
 	time.9 time_uptime.9
@@ -1415,20 +1562,27 @@ MLINKS+=timeout.9 callout.9 \
 	timeout.9 callout_handle_init.9 \
 	timeout.9 callout_init.9 \
 	timeout.9 callout_init_mtx.9 \
+	timeout.9 callout_init_rm.9 \
 	timeout.9 callout_init_rw.9 \
 	timeout.9 callout_pending.9 \
 	timeout.9 callout_reset.9 \
+	timeout.9 callout_reset_curcpu.9 \
 	timeout.9 callout_reset_sbt.9 \
 	timeout.9 callout_reset_on.9 \
 	timeout.9 callout_reset_sbt_on.9 \
 	timeout.9 callout_schedule.9 \
+	timeout.9 callout_schedule_curcpu.9 \
+	timeout.9 callout_schedule_on.9 \
 	timeout.9 callout_stop.9 \
 	timeout.9 untimeout.9
-MLINKS+=ucred.9 crcopy.9 \
+MLINKS+=ucred.9 cred_update_thread.9 \
+	ucred.9 crcopy.9 \
+	ucred.9 crcopysafe.9 \
 	ucred.9 crdup.9 \
 	ucred.9 crfree.9 \
 	ucred.9 crget.9 \
 	ucred.9 crhold.9 \
+	ucred.9 crsetgroups.9 \
 	ucred.9 crshared.9 \
 	ucred.9 cru2x.9
 MLINKS+=uidinfo.9 uifind.9 \
@@ -1575,6 +1729,7 @@ MLINKS+=vrele.9 vput.9 \
 	vrele.9 vunref.9
 MLINKS+=vslock.9 vsunlock.9
 MLINKS+=zone.9 uma.9 \
+	zone.9 uma_find_refcnt.9 \
 	zone.9 uma_zalloc.9 \
 	zone.9 uma_zalloc_arg.9 \
 	zone.9 uma_zcreate.9 \
@@ -1583,6 +1738,7 @@ MLINKS+=zone.9 uma.9 \
 	zone.9 uma_zfree_arg.9 \
 	zone.9 uma_zone_get_cur.9 \
 	zone.9 uma_zone_get_max.9 \
-	zone.9 uma_zone_set_max.9
+	zone.9 uma_zone_set_max.9 \
+	zone.9 uma_zone_set_warning.9
 
 .include <bsd.prog.mk>
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 91bf4b1caf70..c65b82402ba6 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -24,13 +24,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 17, 2013
+.Dd September 18, 2014
 .Dt SDT 9
 .Os
 .Sh NAME
 .Nm SDT
 .Nd a DTrace framework for adding statically-defined tracing probes
 .Sh SYNOPSIS
+.In sys/param.h
+.In sys/queue.h
 .In sys/sdt.h
 .Fn SDT_PROVIDER_DECLARE prov
 .Fn SDT_PROVIDER_DEFINE prov
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index 7869d45474cd..2cc5b7acff10 100644
--- a/share/man/man9/VOP_GETPAGES.9
+++ b/share/man/man9/VOP_GETPAGES.9
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 27, 2003
+.Dd September 12, 2014
 .Dt VOP_GETPAGES 9
 .Os
 .Sh NAME
@@ -41,9 +41,9 @@
 .In sys/vnode.h
 .In vm/vm.h
 .Ft int
-.Fn VOP_GETPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int reqpage" "vm_ooffset_t offset"
+.Fn VOP_GETPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int reqpage"
 .Ft int
-.Fn VOP_PUTPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int sync" "int *rtvals" "vm_ooffset_t offset"
+.Fn VOP_PUTPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int sync" "int *rtvals"
 .Sh DESCRIPTION
 The
 .Fn VOP_GETPAGES
@@ -81,8 +81,6 @@ page written by
 .It Fa reqpage
 The index in the page array of the requested page; i.e., the one page which
 the implementation of this method must handle.
-.It Fa offset
-Offset in the file at which the mapped pages begin.
 .El
 .Pp
 The status of the
@@ -156,7 +154,7 @@ is
 .Sh SEE ALSO
 .Xr vm_object_pip_wakeup 9 ,
 .Xr vm_page_free 9 ,
-.Xr vm_pagge_sunbusy 9 ,
+.Xr vm_page_sunbusy 9 ,
 .Xr vm_page_undirty 9 ,
 .Xr vm_page_xunbusy 9 ,
 .Xr vnode 9
diff --git a/share/man/man9/altq.9 b/share/man/man9/altq.9
index fd9440420a98..e718027a5107 100644
--- a/share/man/man9/altq.9
+++ b/share/man/man9/altq.9
@@ -256,7 +256,6 @@ still work with
     struct mbuf *ifq_tail;             |    struct mbuf *ifq_tail;
     int          ifq_len;              |    int          ifq_len;
     int          ifq_maxlen;           |    int          ifq_maxlen;
-    int          ifq_drops;            |    int          ifq_drops;
  };                                    |    /* driver queue fields */
                                        |    ......
                                        |    /* altq related fields */
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index ae210726e792..7aef4def5176 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -77,9 +77,9 @@
 .Ft "struct ifaddr *"
 .Fn ifa_ifwithaddr "struct sockaddr *addr"
 .Ft "struct ifaddr *"
-.Fn ifa_ifwithdstaddr "struct sockaddr *addr"
+.Fn ifa_ifwithdstaddr "struct sockaddr *addr" "int fib"
 .Ft "struct ifaddr *"
-.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp"
+.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp" "int fib"
 .Ft "struct ifaddr *"
 .Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp"
 .Ft void
@@ -1389,7 +1389,16 @@ returns an interface address for a point-to-point interface whose
 remote
 .Pq Dq destination
 address is
-.Fa addr .
+.Fa addr
+and a fib is
+.Fa fib .
+If
+.Fa fib
+is
+.Dv RT_ALL_FIBS ,
+then the first interface address matching
+.Fa addr
+will be returned.
 .Pp
 .Fn ifa_ifwithnet
 returns the most specific interface address which matches the
@@ -1401,7 +1410,10 @@ address whose remote address is
 if one is found.
 If
 .Fa ignore_ptp
-is true, skip point-to-point interface addresses.
+is true, skip point-to-point interface addresses.  The 
+.Fa fib
+parameter is handled the same way as by
+.Fn ifa_ifwithdstaddr .
 .Pp
 .Fn ifaof_ifpforaddr
 returns the most specific address configured on interface
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index 8557b9f3e8e7..7f6269b95ed9 100644
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 19, 2013
+.Dd September 22, 2014
 .Dt SLEEPQUEUE 9
 .Os
 .Sh NAME
@@ -32,8 +32,6 @@
 .Nm sleepq_add ,
 .Nm sleepq_alloc ,
 .Nm sleepq_broadcast ,
-.Nm sleepq_calc_signal_retval ,
-.Nm sleepq_catch_signals ,
 .Nm sleepq_free ,
 .Nm sleepq_lock ,
 .Nm sleepq_lookup ,
@@ -62,10 +60,6 @@
 .Fn sleepq_alloc "void"
 .Ft int
 .Fn sleepq_broadcast "void *wchan" "int flags" "int pri" "int queue"
-.Ft int
-.Fn sleepq_calc_signal_retval "int sig"
-.Ft int
-.Fn sleepq_catch_signals "void *wchan"
 .Ft void
 .Fn sleepq_free "struct sleepqueue *sq"
 .Ft struct sleepqueue *
@@ -86,15 +80,15 @@
 .Ft u_int
 .Fn sleepq_sleepcnt "void *wchan" "int queue"
 .Ft int
-.Fn sleepq_timedwait "void *wchan"
+.Fn sleepq_timedwait "void *wchan" "int pri"
 .Ft int
-.Fn sleepq_timedwait_sig "void *wchan" "int signal_caught"
+.Fn sleepq_timedwait_sig "void *wchan" "int pri"
 .Ft int
 .Fn sleepq_type "void *wchan"
 .Ft void
-.Fn sleepq_wait "void *wchan"
+.Fn sleepq_wait "void *wchan" "int pri"
 .Ft int
-.Fn sleepq_wait_sig "void *wchan"
+.Fn sleepq_wait_sig "void *wchan" "int pri"
 .Sh DESCRIPTION
 Sleep queues provide a mechanism for suspending execution of a thread until
 some condition is met.
@@ -252,17 +246,6 @@ allows to pass additional
 .Fn callout_reset_sbt
 flags.
 .Pp
-The current thread may be marked interruptible by calling
-.Fn sleepq_catch_signals
-with
-.Fa wchan
-set to the wait channel.
-This function returns a signal number if there are any pending signals for
-the current thread and 0 if there is not a pending signal.
-The sleep queue chain associated with argument
-.Fa wchan
-should have been locked by a prior call to
-.Fn sleepq_lock .
 .Pp
 Once the thread is ready to suspend,
 one of the wait functions is called to put the current thread to sleep
@@ -289,12 +272,9 @@ The sleep queue chain associated with argument
 needs to have been locked with a prior call to
 .Fn sleepq_lock .
 The
-.Fa signal_caught
-parameter to
-.Fn sleepq_timedwait_sig
-specifies if a previous call to
-.Fn sleepq_catch_signals
-found a pending signal.
+.Fa pri
+argument is used to set the priority of the thread when it is awakened.
+If it is set to zero, the thread's priority is left alone.
 .Pp
 When the thread is resumed,
 the wait functions return a non-zero value if the thread was awakened due to
@@ -304,20 +284,6 @@ If the sleep timed out, then
 is returned.
 If the sleep was interrupted by something other than a signal,
 then some other return value will be returned.
-If zero is returned after resuming from an interruptible sleep,
-then
-.Fn sleepq_calc_signal_retval
-should be called to determine if the sleep was interrupted by a signal.
-If so,
-.Fn sleepq_calc_signal_retval
-returns
-.Er ERESTART
-if the interrupting signal is restartable and
-.Er EINTR
-otherwise.
-If the sleep was not interrupted by a signal,
-.Fn sleepq_calc_signal_retval
-will return 0.
 .Pp
 A sleeping thread is normally resumed by the
 .Fn sleepq_broadcast
diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index 8bc92e49bf57..e645046b34e6 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 31, 2014
+.Dd September 15, 2014
 .Dt SYSCTL 9
 .Os
 .Sh NAME
@@ -105,7 +105,7 @@
 .Fa "void *ptr"
 .Fa "intptr_t len"
 .Fa "const char *format"
-.Fa "const char *descr
+.Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_PROC
@@ -504,49 +504,8 @@ The initial sysctl value is tried fetched once from the system
 enviroment early during module load or system boot.
 .It Dv CTLFLAG_DYN
 Dynamically created OIDs automatically get this flag set.
-.El
-.Sh SECURITY CONSIDERATIONS
-When creating new sysctls, careful attention should be paid to the security
-implications of the monitoring or management interface being created.
-Most sysctls present in the kernel are read-only or writable only by the
-superuser.
-Sysctls exporting extensive information on system data structures and
-operation, especially those implemented using procedures, will wish to
-implement access control to limit the undesired exposure of information about
-other processes, network connections, etc.
-.Pp
-The following top level sysctl name spaces are commonly used:
-.Bl -tag -width ".Va regression"
-.It Va compat
-Compatibility layer information.
-.It Va debug
-Debugging information.
-Various name spaces exist under
-.Va debug .
-.It Va hw
-Hardware and device driver information.
-.It Va kern
-Kernel behavior tuning; generally deprecated in favor of more specific
-name spaces.
-.It Va machdep
-Machine-dependent configuration parameters.
-.It Va net
-Network subsystem.
-Various protocols have name spaces under
-.Va net .
-.It Va regression
-Regression test configuration and information.
-.It Va security
-Security and security-policy configuration and information.
-.It Va sysctl
-Reserved name space for the implementation of sysctl.
-.It Va user
-Configuration settings relating to user application behavior.
-Generally, configuring applications using kernel sysctls is discouraged.
-.It Va vfs
-Virtual file system configuration and information.
-.It Va vm
-Virtual memory subsystem configuration and information.
+.It Dv CTLFLAG_VNET
+OID references a VIMAGE-enabled variable.
 .El
 .Sh EXAMPLES
 Sample use of
@@ -702,3 +661,46 @@ addition of MIB nodes.
 .Pp
 This man page was written by
 .An Robert N. M. Watson .
+.Sh SECURITY CONSIDERATIONS
+When creating new sysctls, careful attention should be paid to the security
+implications of the monitoring or management interface being created.
+Most sysctls present in the kernel are read-only or writable only by the
+superuser.
+Sysctls exporting extensive information on system data structures and
+operation, especially those implemented using procedures, will wish to
+implement access control to limit the undesired exposure of information about
+other processes, network connections, etc.
+.Pp
+The following top level sysctl name spaces are commonly used:
+.Bl -tag -width ".Va regression"
+.It Va compat
+Compatibility layer information.
+.It Va debug
+Debugging information.
+Various name spaces exist under
+.Va debug .
+.It Va hw
+Hardware and device driver information.
+.It Va kern
+Kernel behavior tuning; generally deprecated in favor of more specific
+name spaces.
+.It Va machdep
+Machine-dependent configuration parameters.
+.It Va net
+Network subsystem.
+Various protocols have name spaces under
+.Va net .
+.It Va regression
+Regression test configuration and information.
+.It Va security
+Security and security-policy configuration and information.
+.It Va sysctl
+Reserved name space for the implementation of sysctl.
+.It Va user
+Configuration settings relating to user application behavior.
+Generally, configuring applications using kernel sysctls is discouraged.
+.It Va vfs
+Virtual file system configuration and information.
+.It Va vm
+Virtual memory subsystem configuration and information.
+.El
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 100a0ce656c1..07d6aa7ad229 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -179,6 +179,7 @@ ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"]
 jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"]
 jasone [label="Jason Evans\njasone@FreeBSD.org\n1999/03/03"]
 jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"]
+jch [label="Julien Charbon\njch@FreeBSD.org\n2014/09/24"]
 jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"]
 jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"]
 jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"]
@@ -484,6 +485,7 @@ jdp -> fjoe
 
 jhb -> arr
 jhb -> avg
+jhb -> jch
 jhb -> jeff
 jhb -> kbyanc
 jhb -> peterj
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 509c17f5823e..afc8ecb5c392 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -123,8 +123,8 @@ ${_YC:R}.o: ${_YC}
 # DTrace probe definitions
 # libelf is currently needed for drti.o
 .if ${SRCS:M*.d}
-LDFLAGS+=	-lelf
-LDADD+=		${LIBELF}
+LDADD+=		-lelf
+DPADD+=		${LIBELF}
 CFLAGS+=	-I${.OBJDIR}
 .endif
 .for _DSRC in ${SRCS:M*.d:N*/*}
@@ -215,8 +215,10 @@ cleandepend:
 .endif
 
 .if !target(checkdpadd) && (defined(DPADD) || defined(LDADD))
-_LDADD_FROM_DPADD=	${DPADD:C;^/usr/lib/lib(.*)\.a$;-l\1;}
-_LDADD_CANONICALIZED=	${LDADD:S/$//}
+_LDADD_FROM_DPADD=	${DPADD:R:T:C;^lib(.*)$;-l\1;g}
+# Ignore -Wl,--start-group/-Wl,--end-group as it might be required in the
+# LDADD list due to unresolved symbols
+_LDADD_CANONICALIZED=	${LDADD:N:R:T:C;^lib(.*)$;-l\1;g:N-Wl,--[es]*-group}
 checkdpadd:
 .if ${_LDADD_FROM_DPADD} != ${_LDADD_CANONICALIZED}
 	@echo ${.CURDIR}
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 565d1aa04790..c82c37f6945a 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -2,16 +2,13 @@
 
 .if ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "arm"  || \
-    ${MACHINE_ARCH} == "armv6"  || \
-    ${MACHINE_ARCH} == "armv6hf"  || \
+    (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} == "") || \
     ${MACHINE_ARCH:Mmips*el} != ""
 TARGET_ENDIANNESS= 1234
 .elif ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "powerpc64" || \
     ${MACHINE_ARCH} == "sparc64" || \
-    ${MACHINE_ARCH} == "armeb" || \
-    ${MACHINE_ARCH} == "armv6eb" || \
+    (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} != "") || \
     ${MACHINE_ARCH:Mmips*} != ""
 TARGET_ENDIANNESS= 4321
 .endif
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 87e49352f95d..4f73d12a926d 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,6 +1,18 @@
 # $FreeBSD$
 
-PORTSDIR?=	/usr/ports
+.if !defined(PORTSDIR)
+# Autodetect if the command is being run in a ports tree that's not rooted
+# in the default /usr/ports.  The ../../.. case is in case ports ever grows
+# a third level.
+.for RELPATH in . .. ../.. ../../..
+.if !defined(_PORTSDIR) && exists(${.CURDIR}/${RELPATH}/Mk/bsd.port.mk)
+_PORTSDIR=	${.CURDIR}/${RELPATH}
+.endif
+.endfor
+_PORTSDIR?=	/usr/ports
+PORTSDIR!=	realpath ${_PORTSDIR}
+.endif
+
 BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
 
 # Needed to keep bsd.own.mk from reading in /etc/src.conf
diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk
index 51156023efff..8e608a127aa7 100644
--- a/share/mk/bsd.port.subdir.mk
+++ b/share/mk/bsd.port.subdir.mk
@@ -1,6 +1,18 @@
 # $FreeBSD$
 
-PORTSDIR?=	/usr/ports
+.if !defined(PORTSDIR)
+# Autodetect if the command is being run in a ports tree that's not rooted
+# in the default /usr/ports.  The ../../.. case is in case ports ever grows
+# a third level.
+.for RELPATH in . .. ../.. ../../..
+.if !defined(_PORTSDIR) && exists(${.CURDIR}/${RELPATH}/Mk/bsd.port.mk)
+_PORTSDIR=	${.CURDIR}/${RELPATH}
+.endif
+.endfor
+_PORTSDIR?=	/usr/ports
+PORTSDIR!=	realpath ${_PORTSDIR}
+.endif
+
 BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
 
 .include "${BSDPORTSUBDIRMK}"
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index c5e8c3d85adc..5ca1e458026f 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -42,10 +42,15 @@ PROG ?= $t
 
 .if defined(PROG)
 # just one of many
-PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
+PROG_OVERRIDE_VARS += BINDIR MAN SRCS
+PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
-.if defined(${v}.${PROG}) || defined(${v}_${PROG})
-$v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.if empty(${PROG_OVERRIDE_VARS:M$v})
+.if defined(${v}.${PROG})
+$v += ${${v}.${PROG}}
+.elif defined(${v}_${PROG})
+$v += ${${v}_${PROG}}
+.endif
 .else
 $v ?=
 .endif
@@ -61,7 +66,7 @@ UPDATE_DEPENDFILE ?= NO
 DEPENDFILE?= .depend.${PROG}
 # prog.mk will do the rest
 .else
-all: ${PROGS}
+all: ${FILES} ${PROGS} ${SCRIPTS}
 
 # We cannot capture dependencies for meta mode here
 UPDATE_DEPENDFILE = NO
@@ -75,7 +80,7 @@ UPDATE_DEPENDFILE = NO
 
 .ifndef _RECURSING_PROGS
 # tell progs.mk we might want to install things
-PROGS_TARGETS+= cleandepend cleandir cleanobj depend install
+PROGS_TARGETS+= checkdpadd clean cleandepend cleandir cleanobj depend install
 
 .for p in ${PROGS}
 .if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
@@ -98,18 +103,15 @@ $p.$t: .PHONY .MAKE
 $t: ${PROGS:%=%.$t}
 .endfor
 
-SCRIPTS_TARGETS+= cleandepend cleandir cleanobj depend install
+.if empty(PROGS) && !empty(SCRIPTS)
 
-.for p in ${SCRIPTS}
-.for t in ${SCRIPTS_TARGETS:O:u}
-$p.$t: .PHONY .MAKE
-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= SCRIPT=$p ${x.$p} ${@:E})
-.endfor
-.endfor
-
-.for t in ${SCRIPTS_TARGETS:O:u}
-$t: ${SCRIPTS:%=%.$t}
+.for t in ${PROGS_TARGETS:O:u}
+scripts.$t: .PHONY .MAKE
+	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} SUBDIR= _RECURSING_PROGS= \
+	    $t)
+$t: scripts.$t
 .endfor
 
 .endif
+
+.endif
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index a4f3e25ce5cc..a852d3d7cee2 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -48,7 +48,6 @@ __DEFAULT_YES_OPTIONS = \
     ACPI \
     AMD \
     APM \
-    ARM_EABI \
     AT \
     ATM \
     AUDIT \
@@ -194,7 +193,7 @@ __TT=${MACHINE}
 # Clang is only for x86, powerpc and little-endian arm right now, by default.
 .if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP
-.elif ${__T} == "arm" || ${__T} == "armv6" || ${__T} == "armv6hf"
+.elif ${__TT} == "arm" && ${__T:Marm*eb*} == ""
 __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP
 # GCC is unable to build the full clang on arm, disable it by default.
 __DEFAULT_NO_OPTIONS+=CLANG_FULL
@@ -202,8 +201,8 @@ __DEFAULT_NO_OPTIONS+=CLANG_FULL
 __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP
 .endif
 # Clang the default system compiler only on little-endian arm and x86.
-.if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \
-    ${__T} == "armv6hf" || ${__T} == "i386"
+.if ${__T} == "amd64" || (${__TT} == "arm" && ${__T:Marm*eb*} == "") || \
+    ${__T} == "i386"
 __DEFAULT_YES_OPTIONS+=CLANG_IS_CC
 __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .else
@@ -212,6 +211,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP
 __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .endif
 
+# HyperV is only available for x86 and amd64.
+.if ${__T} == "amd64" || ${__T} == "i386"
+__DEFAULT_YES_OPTIONS+=HYPERV
+.else
+__DEFAULT_NO_OPTIONS+=HYPERV
+.endif
+
 .include <bsd.mkopt.mk>
 
 #
diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile
index 4e0b64c5e1e3..762cb17d8f41 100644
--- a/share/vt/keymaps/Makefile
+++ b/share/vt/keymaps/Makefile
@@ -31,8 +31,10 @@ FILES=	INDEX.keymaps \
 	es.dvorak.kbd \
 	es.kbd \
 	fi.kbd \
+	fr.acc.kbd \
 	fr.dvorak.acc.kbd \
 	fr.dvorak.kbd \
+	fr.kbd \
 	fr.macbook.kbd \
 	gr.101.acc.kbd \
 	gr.elot.acc.kbd \
diff --git a/sys/Makefile b/sys/Makefile
index dc1d5e984327..46d883e1e74d 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -5,7 +5,7 @@ CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 \
 		netgraph netinet netinet6 netipsec netnatm netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
-		pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
+		rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
 .if !defined(CSCOPE_ARCHDIR)
 .if defined(ALL_ARCH)
 CSCOPE_ARCHDIR = amd64 arm i386 mips pc98 powerpc sparc64 x86
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 7c37a41054ec..eb0ee8b5fdd5 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -399,10 +399,6 @@ ENTRY(savectx)
 	rdmsr
 	movl	%eax,PCB_SFMASK(%rdi)
 	movl	%edx,PCB_SFMASK+4(%rdi)
-	movl	xsave_mask,%eax
-	movl	%eax,PCB_XSMASK(%rdi)
-	movl	xsave_mask+4,%eax
-	movl	%eax,PCB_XSMASK+4(%rdi)
 
 	sgdt	PCB_GDT(%rdi)
 	sidt	PCB_IDT(%rdi)
@@ -467,12 +463,9 @@ ENTRY(resumectx)
 	movl	PCB_SFMASK(%rdi),%eax
 	wrmsr
 
-	/* Restore CR0 except for FPU mode. */
+	/* Restore CR0, CR2, CR4 and CR3. */
 	movq	PCB_CR0(%rdi),%rax
-	andq	$~(CR0_EM | CR0_TS),%rax
 	movq	%rax,%cr0
-
-	/* Restore CR2, CR4 and CR3. */
 	movq	PCB_CR2(%rdi),%rax
 	movq	%rax,%cr2
 	movq	PCB_CR4(%rdi),%rax
@@ -510,26 +503,6 @@ ENTRY(resumectx)
 	movq	PCB_DR7(%rdi),%rax
 	movq	%rax,%dr7
 
-	/* Restore FPU state. */
-	fninit
-	movq	PCB_FPUSUSPEND(%rdi),%rbx
-	movq	PCB_XSMASK(%rdi),%rax
-	testq	%rax,%rax
-	jz	1f
-	movq	%rax,%rdx
-	shrq	$32,%rdx
-	movl	$XCR0,%ecx
-	xsetbv
-	xrstor	(%rbx)
-	jmp	2f
-1:
-	fxrstor	(%rbx)
-2:
-
-	/* Reload CR0. */
-	movq	PCB_CR0(%rdi),%rax
-	movq	%rax,%cr0
-
 	/* Restore other callee saved registers. */
 	movq	PCB_R15(%rdi),%r15
 	movq	PCB_R14(%rdi),%r14
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 0f4b2b52aeef..5c61859fd902 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -173,6 +173,20 @@ fpususpend(void *addr)
 	load_cr0(cr0);
 }
 
+void
+fpuresume(void *addr)
+{
+	u_long cr0;
+
+	cr0 = rcr0();
+	stop_emulating();
+	fninit();
+	if (use_xsave)
+		load_xcr(XCR0, xsave_mask);
+	fpurestore(addr);
+	load_cr0(cr0);
+}
+
 /*
  * Enable XSAVE if supported and allowed by user.
  * Calculate the xsave_mask.
@@ -348,7 +362,7 @@ fpuexit(struct thread *td)
 		stop_emulating();
 		fpusave(curpcb->pcb_save);
 		start_emulating();
-		PCPU_SET(fpcurthread, 0);
+		PCPU_SET(fpcurthread, NULL);
 	}
 	critical_exit();
 }
@@ -589,33 +603,37 @@ fputrap_sse(void)
 }
 
 /*
- * Implement device not available (DNA) exception
+ * Device Not Available (DNA, #NM) exception handler.
  *
- * It would be better to switch FP context here (if curthread != fpcurthread)
- * and not necessarily for every context switch, but it is too hard to
- * access foreign pcb's.
+ * It would be better to switch FP context here (if curthread !=
+ * fpcurthread) and not necessarily for every context switch, but it
+ * is too hard to access foreign pcb's.
  */
-
-static int err_count = 0;
-
 void
 fpudna(void)
 {
 
+	/*
+	 * This handler is entered with interrupts enabled, so context
+	 * switches may occur before critical_enter() is executed.  If
+	 * a context switch occurs, then when we regain control, our
+	 * state will have been completely restored.  The CPU may
+	 * change underneath us, but the only part of our context that
+	 * lives in the CPU is CR0.TS and that will be "restored" by
+	 * setting it on the new CPU.
+	 */
 	critical_enter();
+
 	if (PCPU_GET(fpcurthread) == curthread) {
-		printf("fpudna: fpcurthread == curthread %d times\n",
-		    ++err_count);
+		printf("fpudna: fpcurthread == curthread\n");
 		stop_emulating();
 		critical_exit();
 		return;
 	}
 	if (PCPU_GET(fpcurthread) != NULL) {
-		printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n",
-		       PCPU_GET(fpcurthread),
-		       PCPU_GET(fpcurthread)->td_proc->p_pid,
-		       curthread, curthread->td_proc->p_pid);
-		panic("fpudna");
+		panic("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n",
+		    PCPU_GET(fpcurthread), PCPU_GET(fpcurthread)->td_tid,
+		    curthread, curthread->td_tid);
 	}
 	stop_emulating();
 	/*
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index ff1f28287b88..c4b1c2878497 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -163,8 +163,6 @@ ASSYM(PCB_STAR, offsetof(struct pcb, pcb_star));
 ASSYM(PCB_LSTAR, offsetof(struct pcb, pcb_lstar));
 ASSYM(PCB_CSTAR, offsetof(struct pcb, pcb_cstar));
 ASSYM(PCB_SFMASK, offsetof(struct pcb, pcb_sfmask));
-ASSYM(PCB_XSMASK, offsetof(struct pcb, pcb_xsmask));
-ASSYM(PCB_FPUSUSPEND, offsetof(struct pcb, pcb_fpususpend));
 ASSYM(PCB_SIZE, sizeof(struct pcb));
 ASSYM(PCB_FULL_IRET, PCB_FULL_IRET);
 ASSYM(PCB_DBREGS, PCB_DBREGS);
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index afd008688ae4..ab827718d764 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -177,6 +177,7 @@ struct init_ops init_ops = {
 	.mp_bootaddress =		mp_bootaddress,
 	.start_all_aps =		native_start_all_aps,
 #endif
+	.msi_init =			msi_init,
 };
 
 /*
@@ -184,9 +185,6 @@ struct init_ops init_ops = {
  * the physical address at which the kernel is loaded.
  */
 extern char kernphys[];
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
 
 struct msgbuf *msgbufp;
 
@@ -1823,6 +1821,10 @@ static caddr_t
 native_parse_preload_data(u_int64_t modulep)
 {
 	caddr_t kmdp;
+#ifdef DDB
+	vm_offset_t ksym_start;
+	vm_offset_t ksym_end;
+#endif
 
 	preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE);
 	preload_bootstrap_relocate(KERNBASE);
@@ -1834,6 +1836,7 @@ native_parse_preload_data(u_int64_t modulep)
 #ifdef DDB
 	ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t);
 	ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
+	db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
 
 	return (kmdp);
@@ -2124,6 +2127,26 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
     smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data");
 
+static int
+efi_map_sysctl_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct efi_map_header *efihdr;
+	caddr_t kmdp;
+	uint32_t efisize;
+
+	kmdp = preload_search_by_type("elf kernel");
+	if (kmdp == NULL)
+		kmdp = preload_search_by_type("elf64 kernel");
+	efihdr = (struct efi_map_header *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_EFI_MAP);
+	if (efihdr == NULL)
+		return (0);
+	efisize = *((uint32_t *)efihdr - 1);
+	return (SYSCTL_OUT(req, efihdr, efisize));
+}
+SYSCTL_PROC(_machdep, OID_AUTO, efi_map, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
+    efi_map_sysctl_handler, "S,efi_map_header", "Raw EFI Memory Map");
+
 void
 spinlock_enter(void)
 {
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 9b12449ef196..3184f1325374 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -102,7 +102,7 @@ char *nmi_stack;
 void *dpcpu;
 
 struct pcb stoppcbs[MAXCPU];
-struct pcb **susppcbs;
+struct susppcb **susppcbs;
 
 /* Variables needed for SMP tlb shootdown. */
 vm_offset_t smp_tlb_addr2;
@@ -721,7 +721,7 @@ init_secondary(void)
 	/* set up CPU registers and state */
 	cpu_setregs();
 
-	/* set up SSE/NX registers */
+	/* set up SSE/NX */
 	initializecpu();
 
 	/* set up FPU state on the AP */
@@ -1461,11 +1461,12 @@ cpususpend_handler(void)
 	mtx_assert(&smp_ipi_mtx, MA_NOTOWNED);
 
 	cpu = PCPU_GET(cpuid);
-	if (savectx(susppcbs[cpu])) {
-		fpususpend(susppcbs[cpu]->pcb_fpususpend);
+	if (savectx(&susppcbs[cpu]->sp_pcb)) {
+		fpususpend(susppcbs[cpu]->sp_fpususpend);
 		wbinvd();
 		CPU_SET_ATOMIC(cpu, &suspended_cpus);
 	} else {
+		fpuresume(susppcbs[cpu]->sp_fpususpend);
 		pmap_init_pat();
 		initializecpu();
 		PCPU_SET(switchtime, 0);
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index f0ea75c18a5b..3344b35c281c 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -3845,7 +3845,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 	pt_entry_t *pte, PG_G, PG_M, PG_RW, PG_V;
 	boolean_t anychanged, pv_lists_locked;
 
-	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
+	KASSERT((prot & ~VM_PROT_ALL) == 0, ("invalid prot %x", prot));
+	if (prot == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
 		return;
 	}
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index f6459f48cf81..4880c9135520 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -436,8 +436,8 @@ trap(struct trapframe *frame)
 		case T_XMMFLT:		/* SIMD floating-point exception */
 		case T_FPOPFLT:		/* FPU operand fetch fault */
 			/*
-			 * XXXKIB for now disable any FPU traps in kernel
-			 * handler registration seems to be overkill
+			 * For now, supporting kernel handler
+			 * registration for FPU traps is overkill.
 			 */
 			trap_fatal(frame, 0);
 			goto out;
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 698f510113d4..cf4fb46747ee 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -216,6 +216,8 @@ device		de			# DEC/Intel DC21x4x (``Tulip'')
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
 device		igb			# Intel PRO/1000 PCIE Server Gigabit Family
 device		ixgbe			# Intel PRO/10GbE PCIE Ethernet Family
+device		ixl			# Intel XL710 40Gbe PCIE Ethernet
+device		ixlv			# Intel XL710 40Gbe VF PCIE Ethernet
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp			# 3Com 3cR990 (``Typhoon'')
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 1262af3b87f4..a946c0587703 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -310,6 +310,8 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 # iwn:	Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn
 #	802.11 network adapters
 #	Requires the iwn firmware module
+# ixl:	Intel XL710 40Gbe PCIE Ethernet
+# ixlv:	Intel XL710 40Gbe VF PCIE Ethernet
 # mlx4ib: Mellanox ConnectX HCA InfiniBand
 # mlxen: Mellanox ConnectX HCA Ethernet
 # mthca: Mellanox HCA InfiniBand
@@ -327,6 +329,8 @@ options 	ED_SIC
 device		ipw		# Intel 2100 wireless NICs.
 device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
 device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
+device		ixl		# Intel XL710 40Gbe PCIE Ethernet
+device		ixlv		# Intel XL710 40Gbe VF PCIE Ethernet
 device  	mlx4ib		# Mellanox ConnectX HCA InfiniBand
 device  	mlxen		# Mellanox ConnectX HCA Ethernet
 device  	mthca		# Mellanox HCA InfiniBand
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index be1bdc6c5d7f..78d2fee2714d 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -58,6 +58,7 @@ int	fpuformat(void);
 int	fpugetregs(struct thread *td);
 void	fpuinit(void);
 void	fpurestore(void *addr);
+void	fpuresume(void *addr);
 void	fpusave(void *addr);
 int	fpusetregs(struct thread *td, struct savefpu *addr,
 	    char *xfpustate, size_t xfpustate_size);
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 80aff86eb685..153393ffc15b 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -97,14 +97,18 @@ struct pcb {
 	register_t	pcb_lstar;
 	register_t	pcb_cstar;
 	register_t	pcb_sfmask;
-	register_t	pcb_xsmask;
-
-	/* fpu context for suspend/resume */
-	void		*pcb_fpususpend;
 
 	struct savefpu	*pcb_save;
 
-	uint64_t	pcb_pad[3];
+	uint64_t	pcb_pad[5];
+};
+
+/* Per-CPU state saved during suspend and resume. */
+struct susppcb {
+	struct pcb	sp_pcb;
+
+	/* fpu context for suspend/resume */
+	void		*sp_fpususpend;
 };
 #endif
 
diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
index 58af2a5abfe3..b0d451d3b7f2 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -82,6 +82,7 @@ enum vm_reg_name {
 	VM_REG_GUEST_PDPTE1,
 	VM_REG_GUEST_PDPTE2,
 	VM_REG_GUEST_PDPTE3,
+	VM_REG_GUEST_INTR_SHADOW,
 	VM_REG_LAST
 };
 
@@ -194,7 +195,6 @@ void vm_nmi_clear(struct vm *vm, int vcpuid);
 int vm_inject_extint(struct vm *vm, int vcpu);
 int vm_extint_pending(struct vm *vm, int vcpuid);
 void vm_extint_clear(struct vm *vm, int vcpuid);
-uint64_t *vm_guest_msrs(struct vm *vm, int cpu);
 struct vlapic *vm_lapic(struct vm *vm, int cpu);
 struct vioapic *vm_ioapic(struct vm *vm);
 struct vhpet *vm_hpet(struct vm *vm);
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index 7b52a64cf0eb..39c17c8d2135 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.h
@@ -61,6 +61,11 @@ MALLOC_DECLARE(M_LINUX);
 #define	PTRIN(v)	(void *)(uintptr_t)(v)
 #define	PTROUT(v)	(l_uintptr_t)(uintptr_t)(v)
 
+#define	CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0)
+#define	CP2(src,dst,sfld,dfld) do { (dst).dfld = (src).sfld; } while (0)
+#define	PTRIN_CP(src,dst,fld) \
+	do { (dst).fld = PTRIN((src).fld); } while (0)
+
 /*
  * Provide a separate set of types for the Linux types.
  */
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 411c4d556fc4..ecf516830811 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -73,11 +73,6 @@ DUMMY(epoll_create);
 DUMMY(epoll_ctl);
 DUMMY(epoll_wait);
 DUMMY(remap_file_pages);
-DUMMY(timer_create);
-DUMMY(timer_settime);
-DUMMY(timer_gettime);
-DUMMY(timer_getoverrun);
-DUMMY(timer_delete);
 DUMMY(fstatfs64);
 DUMMY(mbind);
 DUMMY(get_mempolicy);
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 6bd0dffc5f57..8260a6cc278c 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -781,19 +781,25 @@ struct linux_set_tid_address_args {
 	char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)];
 };
 struct linux_timer_create_args {
-	register_t dummy;
+	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
+	char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)];
+	char timerid_l_[PADL_(l_timer_t *)]; l_timer_t * timerid; char timerid_r_[PADR_(l_timer_t *)];
 };
 struct linux_timer_settime_args {
-	register_t dummy;
+	char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
+	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+	char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)];
+	char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)];
 };
 struct linux_timer_gettime_args {
-	register_t dummy;
+	char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
+	char setting_l_[PADL_(struct itimerspec *)]; struct itimerspec * setting; char setting_r_[PADR_(struct itimerspec *)];
 };
 struct linux_timer_getoverrun_args {
-	register_t dummy;
+	char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
 };
 struct linux_timer_delete_args {
-	register_t dummy;
+	char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
 };
 struct linux_clock_settime_args {
 	char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)];
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index 31455fee7d98..8056a9f520d9 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #define	LINUX_SYS_exit	1
diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c
index 0d1e092e7cf9..002a0e540ecd 100644
--- a/sys/amd64/linux32/linux32_syscalls.c
+++ b/sys/amd64/linux32/linux32_syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index bdcbf13564aa..717161137be3 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #include "opt_compat.h"
@@ -278,11 +278,11 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 256 = linux_epoll_wait */
 	{ 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 257 = linux_remap_file_pages */
 	{ AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 258 = linux_set_tid_address */
-	{ 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 259 = linux_timer_create */
-	{ 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 260 = linux_timer_settime */
-	{ 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 261 = linux_timer_gettime */
-	{ 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 262 = linux_timer_getoverrun */
-	{ 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 263 = linux_timer_delete */
+	{ AS(linux_timer_create_args), (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 259 = linux_timer_create */
+	{ AS(linux_timer_settime_args), (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 260 = linux_timer_settime */
+	{ AS(linux_timer_gettime_args), (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 261 = linux_timer_gettime */
+	{ AS(linux_timer_getoverrun_args), (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 262 = linux_timer_getoverrun */
+	{ AS(linux_timer_delete_args), (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 263 = linux_timer_delete */
 	{ AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 264 = linux_clock_settime */
 	{ AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 265 = linux_clock_gettime */
 	{ AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 266 = linux_clock_getres */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 0b020a7350ef..dcaeb7d1c254 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -1720,27 +1720,43 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	}
 	/* linux_timer_create */
 	case 259: {
-		*n_args = 0;
+		struct linux_timer_create_args *p = params;
+		iarg[0] = p->clock_id; /* clockid_t */
+		uarg[1] = (intptr_t) p->evp; /* struct sigevent * */
+		uarg[2] = (intptr_t) p->timerid; /* l_timer_t * */
+		*n_args = 3;
 		break;
 	}
 	/* linux_timer_settime */
 	case 260: {
-		*n_args = 0;
+		struct linux_timer_settime_args *p = params;
+		iarg[0] = p->timerid; /* l_timer_t */
+		iarg[1] = p->flags; /* l_int */
+		uarg[2] = (intptr_t) p->new; /* const struct itimerspec * */
+		uarg[3] = (intptr_t) p->old; /* struct itimerspec * */
+		*n_args = 4;
 		break;
 	}
 	/* linux_timer_gettime */
 	case 261: {
-		*n_args = 0;
+		struct linux_timer_gettime_args *p = params;
+		iarg[0] = p->timerid; /* l_timer_t */
+		uarg[1] = (intptr_t) p->setting; /* struct itimerspec * */
+		*n_args = 2;
 		break;
 	}
 	/* linux_timer_getoverrun */
 	case 262: {
-		*n_args = 0;
+		struct linux_timer_getoverrun_args *p = params;
+		iarg[0] = p->timerid; /* l_timer_t */
+		*n_args = 1;
 		break;
 	}
 	/* linux_timer_delete */
 	case 263: {
-		*n_args = 0;
+		struct linux_timer_delete_args *p = params;
+		iarg[0] = p->timerid; /* l_timer_t */
+		*n_args = 1;
 		break;
 	}
 	/* linux_clock_settime */
@@ -4829,18 +4845,71 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		break;
 	/* linux_timer_create */
 	case 259:
+		switch(ndx) {
+		case 0:
+			p = "clockid_t";
+			break;
+		case 1:
+			p = "struct sigevent *";
+			break;
+		case 2:
+			p = "l_timer_t *";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_timer_settime */
 	case 260:
+		switch(ndx) {
+		case 0:
+			p = "l_timer_t";
+			break;
+		case 1:
+			p = "l_int";
+			break;
+		case 2:
+			p = "const struct itimerspec *";
+			break;
+		case 3:
+			p = "struct itimerspec *";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_timer_gettime */
 	case 261:
+		switch(ndx) {
+		case 0:
+			p = "l_timer_t";
+			break;
+		case 1:
+			p = "struct itimerspec *";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_timer_getoverrun */
 	case 262:
+		switch(ndx) {
+		case 0:
+			p = "l_timer_t";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_timer_delete */
 	case 263:
+		switch(ndx) {
+		case 0:
+			p = "l_timer_t";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_clock_settime */
 	case 264:
@@ -6413,14 +6482,29 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		break;
 	/* linux_timer_create */
 	case 259:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_timer_settime */
 	case 260:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_timer_gettime */
 	case 261:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_timer_getoverrun */
 	case 262:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_timer_delete */
 	case 263:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_clock_settime */
 	case 264:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index c3a10afeb0a3..00002a40d447 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -435,11 +435,13 @@
 256	AUE_NULL	STD	{ int linux_epoll_wait(void); }
 257	AUE_NULL	STD	{ int linux_remap_file_pages(void); }
 258	AUE_NULL	STD	{ int linux_set_tid_address(int *tidptr); }
-259	AUE_NULL	STD	{ int linux_timer_create(void); }
-260	AUE_NULL	STD	{ int linux_timer_settime(void); }
-261	AUE_NULL	STD	{ int linux_timer_gettime(void); }
-262	AUE_NULL	STD	{ int linux_timer_getoverrun(void); }
-263	AUE_NULL	STD	{ int linux_timer_delete(void); }
+259	AUE_NULL	STD	{ int linux_timer_create(clockid_t clock_id, \
+					struct sigevent *evp, l_timer_t *timerid); }
+260	AUE_NULL	STD	{ int linux_timer_settime(l_timer_t timerid, l_int flags, \
+					const struct itimerspec *new, struct itimerspec *old); }
+261	AUE_NULL	STD	{ int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); }
+262	AUE_NULL	STD	{ int linux_timer_getoverrun(l_timer_t timerid); }
+263	AUE_NULL	STD	{ int linux_timer_delete(l_timer_t timerid); }
 264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(clockid_t which, struct l_timespec *tp); }
 265	AUE_NULL	STD	{ int linux_clock_gettime(clockid_t which, struct l_timespec *tp); }
 266	AUE_NULL	STD	{ int linux_clock_getres(clockid_t which, struct l_timespec *tp); }
diff --git a/sys/amd64/vmm/intel/ept.c b/sys/amd64/vmm/intel/ept.c
index 5f6c4d017916..13c9788842ef 100644
--- a/sys/amd64/vmm/intel/ept.c
+++ b/sys/amd64/vmm/intel/ept.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 
 #include "vmx_cpufunc.h"
 #include "vmm_ipi.h"
-#include "vmx_msr.h"
 #include "ept.h"
 
 #define	EPT_SUPPORTS_EXEC_ONLY(cap)	((cap) & (1UL << 0))
diff --git a/sys/amd64/vmm/intel/vmcs.h b/sys/amd64/vmm/intel/vmcs.h
index 4e9557c39b9b..6122de581fac 100644
--- a/sys/amd64/vmm/intel/vmcs.h
+++ b/sys/amd64/vmm/intel/vmcs.h
@@ -54,6 +54,10 @@ int	vmcs_getdesc(struct vmcs *vmcs, int running, int ident,
 int	vmcs_setdesc(struct vmcs *vmcs, int running, int ident,
 		     struct seg_desc *desc);
 
+/*
+ * Avoid header pollution caused by inline use of 'vtophys()' in vmx_cpufunc.h
+ */
+#ifdef _VMX_CPUFUNC_H_
 static __inline uint64_t
 vmcs_read(uint32_t encoding)
 {
@@ -73,6 +77,7 @@ vmcs_write(uint32_t encoding, uint64_t val)
 	error = vmwrite(encoding, val);
 	KASSERT(error == 0, ("vmcs_write(%u) error %d", encoding, error));
 }
+#endif	/* _VMX_CPUFUNC_H_ */
 
 #define	vmexit_instruction_length()	vmcs_read(VMCS_EXIT_INSTRUCTION_LENGTH)
 #define	vmcs_guest_rip()		vmcs_read(VMCS_GUEST_RIP)
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index b2c570216a78..00c85d734961 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -52,20 +52,20 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>
 #include <machine/vmm_instruction_emul.h>
+#include "vmm_lapic.h"
 #include "vmm_host.h"
 #include "vmm_ioport.h"
 #include "vmm_ipi.h"
-#include "vmm_msr.h"
 #include "vmm_ktr.h"
 #include "vmm_stat.h"
 #include "vatpic.h"
 #include "vlapic.h"
 #include "vlapic_priv.h"
 
-#include "vmx_msr.h"
 #include "ept.h"
 #include "vmx_cpufunc.h"
 #include "vmx.h"
+#include "vmx_msr.h"
 #include "x86.h"
 #include "vmx_controls.h"
 
@@ -94,34 +94,23 @@ __FBSDID("$FreeBSD$");
 #define	PROCBASED_CTLS2_ONE_SETTING	PROCBASED2_ENABLE_EPT
 #define	PROCBASED_CTLS2_ZERO_SETTING	0
 
-#define VM_EXIT_CTLS_ONE_SETTING_NO_PAT					\
+#define	VM_EXIT_CTLS_ONE_SETTING					\
 	(VM_EXIT_HOST_LMA			|			\
 	VM_EXIT_SAVE_EFER			|			\
-	VM_EXIT_LOAD_EFER)
-
-#define	VM_EXIT_CTLS_ONE_SETTING					\
-	(VM_EXIT_CTLS_ONE_SETTING_NO_PAT       	|			\
+	VM_EXIT_LOAD_EFER			|			\
 	VM_EXIT_ACKNOWLEDGE_INTERRUPT		|			\
 	VM_EXIT_SAVE_PAT			|			\
 	VM_EXIT_LOAD_PAT)
+
 #define	VM_EXIT_CTLS_ZERO_SETTING	VM_EXIT_SAVE_DEBUG_CONTROLS
 
-#define	VM_ENTRY_CTLS_ONE_SETTING_NO_PAT	VM_ENTRY_LOAD_EFER
+#define	VM_ENTRY_CTLS_ONE_SETTING	(VM_ENTRY_LOAD_EFER | VM_ENTRY_LOAD_PAT)
 
-#define	VM_ENTRY_CTLS_ONE_SETTING					\
-	(VM_ENTRY_CTLS_ONE_SETTING_NO_PAT     	|			\
-	VM_ENTRY_LOAD_PAT)
 #define	VM_ENTRY_CTLS_ZERO_SETTING					\
 	(VM_ENTRY_LOAD_DEBUG_CONTROLS		|			\
 	VM_ENTRY_INTO_SMM			|			\
 	VM_ENTRY_DEACTIVATE_DUAL_MONITOR)
 
-#define	guest_msr_rw(vmx, msr) \
-	msr_bitmap_change_access((vmx)->msr_bitmap, (msr), MSR_BITMAP_ACCESS_RW)
-
-#define	guest_msr_ro(vmx, msr) \
-    msr_bitmap_change_access((vmx)->msr_bitmap, (msr), MSR_BITMAP_ACCESS_READ)
-
 #define	HANDLED		1
 #define	UNHANDLED	0
 
@@ -158,10 +147,6 @@ SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, initialized, CTLFLAG_RD,
  */
 static SYSCTL_NODE(_hw_vmm_vmx, OID_AUTO, cap, CTLFLAG_RW, NULL, NULL);
 
-static int vmx_patmsr;
-SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, patmsr, CTLFLAG_RD, &vmx_patmsr, 0,
-    "PAT MSR saved and restored in VCMS");
-
 static int cap_halt_exit;
 SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, halt_exit, CTLFLAG_RD, &cap_halt_exit, 0,
     "HLT triggers a VM-exit");
@@ -208,6 +193,7 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD,
 
 static int vmx_getdesc(void *arg, int vcpu, int reg, struct seg_desc *desc);
 static int vmx_getreg(void *arg, int vcpu, int reg, uint64_t *retval);
+static int vmxctx_setreg(struct vmxctx *vmxctx, int reg, uint64_t val);
 static void vmx_inject_pir(struct vlapic *vlapic);
 
 #ifdef KTR
@@ -474,22 +460,6 @@ vpid_init(void)
 	vpid_unr = new_unrhdr(VM_MAXCPU + 1, 0xffff, NULL);
 }
 
-static void
-msr_save_area_init(struct msr_entry *g_area, int *g_count)
-{
-	int cnt;
-
-	static struct msr_entry guest_msrs[] = {
-		{ MSR_KGSBASE, 0, 0 },
-	};
-
-	cnt = sizeof(guest_msrs) / sizeof(guest_msrs[0]);
-	if (cnt > GUEST_MSR_MAX_ENTRIES)
-		panic("guest msr save area overrun");
-	bcopy(guest_msrs, g_area, sizeof(guest_msrs));
-	*g_count = cnt;
-}
-
 static void
 vmx_disable(void *arg __unused)
 {
@@ -636,49 +606,24 @@ vmx_init(int ipinum)
 	}
 
 	/* Check support for VM-exit controls */
-	vmx_patmsr = 1;
 	error = vmx_set_ctlreg(MSR_VMX_EXIT_CTLS, MSR_VMX_TRUE_EXIT_CTLS,
 			       VM_EXIT_CTLS_ONE_SETTING,
 			       VM_EXIT_CTLS_ZERO_SETTING,
 			       &exit_ctls);
 	if (error) {
-		/* Try again without the PAT MSR bits */
-		error = vmx_set_ctlreg(MSR_VMX_EXIT_CTLS,
-				       MSR_VMX_TRUE_EXIT_CTLS,
-				       VM_EXIT_CTLS_ONE_SETTING_NO_PAT,
-				       VM_EXIT_CTLS_ZERO_SETTING,
-				       &exit_ctls);
-		if (error) {
-			printf("vmx_init: processor does not support desired "
-			       "exit controls\n");
-			return (error);
-		} else {
-			if (bootverbose)
-				printf("vmm: PAT MSR access not supported\n");
-			guest_msr_valid(MSR_PAT);
-			vmx_patmsr = 0;
-		}
+		printf("vmx_init: processor does not support desired "
+		    "exit controls\n");
+		return (error);
 	}
 
 	/* Check support for VM-entry controls */
-	if (vmx_patmsr) {
-		error = vmx_set_ctlreg(MSR_VMX_ENTRY_CTLS,
-				       MSR_VMX_TRUE_ENTRY_CTLS,
-				       VM_ENTRY_CTLS_ONE_SETTING,
-				       VM_ENTRY_CTLS_ZERO_SETTING,
-				       &entry_ctls);
-	} else {
-		error = vmx_set_ctlreg(MSR_VMX_ENTRY_CTLS,
-				       MSR_VMX_TRUE_ENTRY_CTLS,
-				       VM_ENTRY_CTLS_ONE_SETTING_NO_PAT,
-				       VM_ENTRY_CTLS_ZERO_SETTING,
-				       &entry_ctls);
-	}
-
+	error = vmx_set_ctlreg(MSR_VMX_ENTRY_CTLS, MSR_VMX_TRUE_ENTRY_CTLS,
+	    VM_ENTRY_CTLS_ONE_SETTING, VM_ENTRY_CTLS_ZERO_SETTING,
+	    &entry_ctls);
 	if (error) {
 		printf("vmx_init: processor does not support desired "
-		       "entry controls\n");
-		       return (error);
+		    "entry controls\n");
+		return (error);
 	}
 
 	/*
@@ -800,6 +745,8 @@ vmx_init(int ipinum)
 
 	vpid_init();
 
+	vmx_msr_init();
+
 	/* enable VMX operation */
 	smp_rendezvous(NULL, vmx_enable, NULL, NULL);
 
@@ -869,7 +816,7 @@ static void *
 vmx_vminit(struct vm *vm, pmap_t pmap)
 {
 	uint16_t vpid[VM_MAXCPU];
-	int i, error, guest_msr_count;
+	int i, error;
 	struct vmx *vmx;
 	struct vmcs *vmcs;
 
@@ -905,16 +852,14 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 	 * how they are saved/restored so can be directly accessed by the
 	 * guest.
 	 *
-	 * Guest KGSBASE is saved and restored in the guest MSR save area.
-	 * Host KGSBASE is restored before returning to userland from the pcb.
-	 * There will be a window of time when we are executing in the host
-	 * kernel context with a value of KGSBASE from the guest. This is ok
-	 * because the value of KGSBASE is inconsequential in kernel context.
-	 *
 	 * MSR_EFER is saved and restored in the guest VMCS area on a
 	 * VM exit and entry respectively. It is also restored from the
 	 * host VMCS area on a VM exit.
 	 *
+	 * MSR_PAT is saved and restored in the guest VMCS are on a VM exit
+	 * and entry respectively. It is also restored from the host VMCS
+	 * area on a VM exit.
+	 *
 	 * The TSC MSR is exposed read-only. Writes are disallowed as that
 	 * will impact the host TSC.
 	 * XXX Writes would be implemented with a wrmsr trap, and
@@ -925,21 +870,11 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 	    guest_msr_rw(vmx, MSR_SYSENTER_CS_MSR) ||
 	    guest_msr_rw(vmx, MSR_SYSENTER_ESP_MSR) ||
 	    guest_msr_rw(vmx, MSR_SYSENTER_EIP_MSR) ||
-	    guest_msr_rw(vmx, MSR_KGSBASE) ||
 	    guest_msr_rw(vmx, MSR_EFER) ||
+	    guest_msr_rw(vmx, MSR_PAT) ||
 	    guest_msr_ro(vmx, MSR_TSC))
 		panic("vmx_vminit: error setting guest msr access");
 
-	/*
-	 * MSR_PAT is saved and restored in the guest VMCS are on a VM exit
-	 * and entry respectively. It is also restored from the host VMCS
-	 * area on a VM exit. However, if running on a system with no
-	 * MSR_PAT save/restore support, leave access disabled so accesses
-	 * will be trapped.
-	 */
-	if (vmx_patmsr && guest_msr_rw(vmx, MSR_PAT))
-		panic("vmx_vminit: error setting guest pat msr access");
-
 	vpid_alloc(vpid, VM_MAXCPU);
 
 	if (virtual_interrupt_delivery) {
@@ -958,6 +893,8 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 			      error, i);
 		}
 
+		vmx_msr_guest_init(vmx, i);
+
 		error = vmcs_init(vmcs);
 		KASSERT(error == 0, ("vmcs_init error %d", error));
 
@@ -996,13 +933,6 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 		vmx->state[i].lastcpu = NOCPU;
 		vmx->state[i].vpid = vpid[i];
 
-		msr_save_area_init(vmx->guest_msrs[i], &guest_msr_count);
-
-		error = vmcs_set_msr_save(vmcs, vtophys(vmx->guest_msrs[i]),
-		    guest_msr_count);
-		if (error != 0)
-			panic("vmcs_set_msr_save error %d", error);
-
 		/*
 		 * Set up the CR0/4 shadows, and init the read shadow
 		 * to the power-on register value from the Intel Sys Arch.
@@ -2077,6 +2007,46 @@ vmx_task_switch_reason(uint64_t qual)
 	}
 }
 
+static int
+emulate_wrmsr(struct vmx *vmx, int vcpuid, u_int num, uint64_t val, bool *retu)
+{
+	int error;
+
+	if (lapic_msr(num))
+		error = lapic_wrmsr(vmx->vm, vcpuid, num, val, retu);
+	else
+		error = vmx_wrmsr(vmx, vcpuid, num, val, retu);
+
+	return (error);
+}
+
+static int
+emulate_rdmsr(struct vmx *vmx, int vcpuid, u_int num, bool *retu)
+{
+	struct vmxctx *vmxctx;
+	uint64_t result;
+	uint32_t eax, edx;
+	int error;
+
+	if (lapic_msr(num))
+		error = lapic_rdmsr(vmx->vm, vcpuid, num, &result, retu);
+	else
+		error = vmx_rdmsr(vmx, vcpuid, num, &result, retu);
+
+	if (error == 0) {
+		eax = result;
+		vmxctx = &vmx->ctx[vcpuid];
+		error = vmxctx_setreg(vmxctx, VM_REG_GUEST_RAX, eax);
+		KASSERT(error == 0, ("vmxctx_setreg(rax) error %d", error));
+
+		edx = result >> 32;
+		error = vmxctx_setreg(vmxctx, VM_REG_GUEST_RDX, edx);
+		KASSERT(error == 0, ("vmxctx_setreg(rdx) error %d", error));
+	}
+
+	return (error);
+}
+
 static int
 vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 {
@@ -2215,7 +2185,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		retu = false;
 		ecx = vmxctx->guest_rcx;
 		VCPU_CTR1(vmx->vm, vcpu, "rdmsr 0x%08x", ecx);
-		error = emulate_rdmsr(vmx->vm, vcpu, ecx, &retu);
+		error = emulate_rdmsr(vmx, vcpu, ecx, &retu);
 		if (error) {
 			vmexit->exitcode = VM_EXITCODE_RDMSR;
 			vmexit->u.msr.code = ecx;
@@ -2224,7 +2194,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		} else {
 			/* Return to userspace with a valid exitcode */
 			KASSERT(vmexit->exitcode != VM_EXITCODE_BOGUS,
-			    ("emulate_wrmsr retu with bogus exitcode"));
+			    ("emulate_rdmsr retu with bogus exitcode"));
 		}
 		break;
 	case EXIT_REASON_WRMSR:
@@ -2235,7 +2205,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		edx = vmxctx->guest_rdx;
 		VCPU_CTR2(vmx->vm, vcpu, "wrmsr 0x%08x value 0x%016lx",
 		    ecx, (uint64_t)edx << 32 | eax);
-		error = emulate_wrmsr(vmx->vm, vcpu, ecx,
+		error = emulate_wrmsr(vmx, vcpu, ecx,
 		    (uint64_t)edx << 32 | eax, &retu);
 		if (error) {
 			vmexit->exitcode = VM_EXITCODE_WRMSR;
@@ -2523,6 +2493,8 @@ vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
 	KASSERT(vmxctx->pmap == pmap,
 	    ("pmap %p different than ctx pmap %p", pmap, vmxctx->pmap));
 
+	vmx_msr_guest_enter(vmx, vcpu);
+
 	VMPTRLD(vmcs);
 
 	/*
@@ -2624,6 +2596,8 @@ vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
 	    vmexit->exitcode);
 
 	VMCLEAR(vmcs);
+	vmx_msr_guest_exit(vmx, vcpu);
+
 	return (0);
 }
 
@@ -2711,6 +2685,46 @@ vmxctx_setreg(struct vmxctx *vmxctx, int reg, uint64_t val)
 		return (EINVAL);
 }
 
+static int
+vmx_get_intr_shadow(struct vmx *vmx, int vcpu, int running, uint64_t *retval)
+{
+	uint64_t gi;
+	int error;
+
+	error = vmcs_getreg(&vmx->vmcs[vcpu], running, 
+	    VMCS_IDENT(VMCS_GUEST_INTERRUPTIBILITY), &gi);
+	*retval = (gi & HWINTR_BLOCKING) ? 1 : 0;
+	return (error);
+}
+
+static int
+vmx_modify_intr_shadow(struct vmx *vmx, int vcpu, int running, uint64_t val)
+{
+	struct vmcs *vmcs;
+	uint64_t gi;
+	int error, ident;
+
+	/*
+	 * Forcing the vcpu into an interrupt shadow is not supported.
+	 */
+	if (val) {
+		error = EINVAL;
+		goto done;
+	}
+
+	vmcs = &vmx->vmcs[vcpu];
+	ident = VMCS_IDENT(VMCS_GUEST_INTERRUPTIBILITY);
+	error = vmcs_getreg(vmcs, running, ident, &gi);
+	if (error == 0) {
+		gi &= ~HWINTR_BLOCKING;
+		error = vmcs_setreg(vmcs, running, ident, gi);
+	}
+done:
+	VCPU_CTR2(vmx->vm, vcpu, "Setting intr_shadow to %#lx %s", val,
+	    error ? "failed" : "succeeded");
+	return (error);
+}
+
 static int
 vmx_shadow_reg(int reg)
 {
@@ -2742,6 +2756,9 @@ vmx_getreg(void *arg, int vcpu, int reg, uint64_t *retval)
 	if (running && hostcpu != curcpu)
 		panic("vmx_getreg: %s%d is running", vm_name(vmx->vm), vcpu);
 
+	if (reg == VM_REG_GUEST_INTR_SHADOW)
+		return (vmx_get_intr_shadow(vmx, vcpu, running, retval));
+
 	if (vmxctx_getreg(&vmx->ctx[vcpu], reg, retval) == 0)
 		return (0);
 
@@ -2760,6 +2777,9 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
 	if (running && hostcpu != curcpu)
 		panic("vmx_setreg: %s%d is running", vm_name(vmx->vm), vcpu);
 
+	if (reg == VM_REG_GUEST_INTR_SHADOW)
+		return (vmx_modify_intr_shadow(vmx, vcpu, running, val));
+
 	if (vmxctx_setreg(&vmx->ctx[vcpu], reg, val) == 0)
 		return (0);
 
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
index 208fceed9b28..2124554887dc 100644
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -33,8 +33,6 @@
 
 struct pmap;
 
-#define	GUEST_MSR_MAX_ENTRIES	64		/* arbitrary */
-
 struct vmxctx {
 	register_t	guest_rdi;		/* Guest state */
 	register_t	guest_rsi;
@@ -97,13 +95,23 @@ struct pir_desc {
 } __aligned(64);
 CTASSERT(sizeof(struct pir_desc) == 64);
 
+/* Index into the 'guest_msrs[]' array */
+enum {
+	IDX_MSR_LSTAR,
+	IDX_MSR_CSTAR,
+	IDX_MSR_STAR,
+	IDX_MSR_SF_MASK,
+	IDX_MSR_KGSBASE,
+	GUEST_MSR_NUM		/* must be the last enumeration */
+};
+
 /* virtual machine softc */
 struct vmx {
 	struct vmcs	vmcs[VM_MAXCPU];	/* one vmcs per virtual cpu */
 	struct apic_page apic_page[VM_MAXCPU];	/* one apic page per vcpu */
 	char		msr_bitmap[PAGE_SIZE];
 	struct pir_desc	pir_desc[VM_MAXCPU];
-	struct msr_entry guest_msrs[VM_MAXCPU][GUEST_MSR_MAX_ENTRIES];
+	uint64_t	guest_msrs[VM_MAXCPU][GUEST_MSR_NUM];
 	struct vmxctx	ctx[VM_MAXCPU];
 	struct vmxcap	cap[VM_MAXCPU];
 	struct vmxstate	state[VM_MAXCPU];
@@ -113,7 +121,6 @@ struct vmx {
 };
 CTASSERT((offsetof(struct vmx, vmcs) & PAGE_MASK) == 0);
 CTASSERT((offsetof(struct vmx, msr_bitmap) & PAGE_MASK) == 0);
-CTASSERT((offsetof(struct vmx, guest_msrs) & 15) == 0);
 CTASSERT((offsetof(struct vmx, pir_desc[0]) & 63) == 0);
 
 #define	VMX_GUEST_VMEXIT	0
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
index a3428db8a87d..94d52e306cea 100644
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -31,10 +31,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/cpuset.h>
 
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
+#include <machine/vmm.h>
 
+#include "vmx.h"
 #include "vmx_msr.h"
 
 static boolean_t
@@ -171,3 +174,115 @@ msr_bitmap_change_access(char *bitmap, u_int msr, int access)
 
 	return (0);
 }
+
+static uint64_t misc_enable;
+static uint64_t host_msrs[GUEST_MSR_NUM];
+
+void
+vmx_msr_init(void)
+{
+	/*
+	 * It is safe to cache the values of the following MSRs because
+	 * they don't change based on curcpu, curproc or curthread.
+	 */
+	host_msrs[IDX_MSR_LSTAR] = rdmsr(MSR_LSTAR);
+	host_msrs[IDX_MSR_CSTAR] = rdmsr(MSR_CSTAR);
+	host_msrs[IDX_MSR_STAR] = rdmsr(MSR_STAR);
+	host_msrs[IDX_MSR_SF_MASK] = rdmsr(MSR_SF_MASK);
+
+	/*
+	 * Initialize emulated MSRs
+	 */
+	misc_enable = rdmsr(MSR_IA32_MISC_ENABLE);
+	/*
+	 * Set mandatory bits
+	 *  11:   branch trace disabled
+	 *  12:   PEBS unavailable
+	 * Clear unsupported features
+	 *  16:   SpeedStep enable
+	 *  18:   enable MONITOR FSM
+	 */
+	misc_enable |= (1 << 12) | (1 << 11);
+	misc_enable &= ~((1 << 18) | (1 << 16));
+}
+
+void
+vmx_msr_guest_init(struct vmx *vmx, int vcpuid)
+{
+	/*
+	 * The permissions bitmap is shared between all vcpus so initialize it
+	 * once when initializing the vBSP.
+	 */
+	if (vcpuid == 0) {
+		guest_msr_rw(vmx, MSR_LSTAR);
+		guest_msr_rw(vmx, MSR_CSTAR);
+		guest_msr_rw(vmx, MSR_STAR);
+		guest_msr_rw(vmx, MSR_SF_MASK);
+		guest_msr_rw(vmx, MSR_KGSBASE);
+	}
+	return;
+}
+
+void
+vmx_msr_guest_enter(struct vmx *vmx, int vcpuid)
+{
+	uint64_t *guest_msrs = vmx->guest_msrs[vcpuid];
+
+	/* Save host MSRs (if any) and restore guest MSRs */
+	wrmsr(MSR_LSTAR, guest_msrs[IDX_MSR_LSTAR]);
+	wrmsr(MSR_CSTAR, guest_msrs[IDX_MSR_CSTAR]);
+	wrmsr(MSR_STAR, guest_msrs[IDX_MSR_STAR]);
+	wrmsr(MSR_SF_MASK, guest_msrs[IDX_MSR_SF_MASK]);
+	wrmsr(MSR_KGSBASE, guest_msrs[IDX_MSR_KGSBASE]);
+}
+
+void
+vmx_msr_guest_exit(struct vmx *vmx, int vcpuid)
+{
+	uint64_t *guest_msrs = vmx->guest_msrs[vcpuid];
+
+	/* Save guest MSRs */
+	guest_msrs[IDX_MSR_LSTAR] = rdmsr(MSR_LSTAR);
+	guest_msrs[IDX_MSR_CSTAR] = rdmsr(MSR_CSTAR);
+	guest_msrs[IDX_MSR_STAR] = rdmsr(MSR_STAR);
+	guest_msrs[IDX_MSR_SF_MASK] = rdmsr(MSR_SF_MASK);
+	guest_msrs[IDX_MSR_KGSBASE] = rdmsr(MSR_KGSBASE);
+
+	/* Restore host MSRs */
+	wrmsr(MSR_LSTAR, host_msrs[IDX_MSR_LSTAR]);
+	wrmsr(MSR_CSTAR, host_msrs[IDX_MSR_CSTAR]);
+	wrmsr(MSR_STAR, host_msrs[IDX_MSR_STAR]);
+	wrmsr(MSR_SF_MASK, host_msrs[IDX_MSR_SF_MASK]);
+
+	/* MSR_KGSBASE will be restored on the way back to userspace */
+}
+
+int
+vmx_rdmsr(struct vmx *vmx, int vcpuid, u_int num, uint64_t *val, bool *retu)
+{
+	int error = 0;
+
+	switch (num) {
+	case MSR_IA32_MISC_ENABLE:
+		*val = misc_enable;
+		break;
+	default:
+		error = EINVAL;
+		break;
+	}
+	return (error);
+}
+
+int
+vmx_wrmsr(struct vmx *vmx, int vcpuid, u_int num, uint64_t val, bool *retu)
+{
+	int error = 0;
+
+	switch (num) {
+	default:
+		error = EINVAL;
+		break;
+	}
+
+	return (error);
+}
diff --git a/sys/amd64/vmm/intel/vmx_msr.h b/sys/amd64/vmm/intel/vmx_msr.h
index 340b0f7ab436..e77881c75e8f 100644
--- a/sys/amd64/vmm/intel/vmx_msr.h
+++ b/sys/amd64/vmm/intel/vmx_msr.h
@@ -29,6 +29,15 @@
 #ifndef _VMX_MSR_H_
 #define	_VMX_MSR_H_
 
+struct vmx;
+
+void vmx_msr_init(void);
+void vmx_msr_guest_init(struct vmx *vmx, int vcpuid);
+void vmx_msr_guest_enter(struct vmx *vmx, int vcpuid);
+void vmx_msr_guest_exit(struct vmx *vmx, int vcpuid);
+int vmx_rdmsr(struct vmx *, int vcpuid, u_int num, uint64_t *val, bool *retu);
+int vmx_wrmsr(struct vmx *, int vcpuid, u_int num, uint64_t val, bool *retu);
+
 uint32_t vmx_revision(void);
 
 int vmx_set_ctlreg(int ctl_reg, int true_ctl_reg, uint32_t ones_mask,
@@ -52,4 +61,10 @@ int vmx_set_ctlreg(int ctl_reg, int true_ctl_reg, uint32_t ones_mask,
 void	msr_bitmap_initialize(char *bitmap);
 int	msr_bitmap_change_access(char *bitmap, u_int msr, int access);
 
+#define	guest_msr_rw(vmx, msr) \
+    msr_bitmap_change_access((vmx)->msr_bitmap, (msr), MSR_BITMAP_ACCESS_RW)
+
+#define	guest_msr_ro(vmx, msr) \
+    msr_bitmap_change_access((vmx)->msr_bitmap, (msr), MSR_BITMAP_ACCESS_READ)
+
 #endif
diff --git a/sys/amd64/vmm/io/vatpic.c b/sys/amd64/vmm/io/vatpic.c
index d8ccebdeaa11..b710a8455aea 100644
--- a/sys/amd64/vmm/io/vatpic.c
+++ b/sys/amd64/vmm/io/vatpic.c
@@ -606,20 +606,19 @@ vatpic_write(struct vatpic *vatpic, struct atpic *atpic, bool in, int port,
 	VATPIC_LOCK(vatpic);
 
 	if (port & ICU_IMR_OFFSET) {
-		if (atpic->ready) {
+		switch (atpic->icw_num) {
+		case 2:
+			error = vatpic_icw2(vatpic, atpic, val);
+			break;
+		case 3:
+			error = vatpic_icw3(vatpic, atpic, val);
+			break;
+		case 4:
+			error = vatpic_icw4(vatpic, atpic, val);
+			break;
+		default:
 			error = vatpic_ocw1(vatpic, atpic, val);
-		} else {
-			switch (atpic->icw_num) {
-			case 2:
-				error = vatpic_icw2(vatpic, atpic, val);
-				break;
-			case 3:
-				error = vatpic_icw3(vatpic, atpic, val);
-				break;
-			case 4:
-				error = vatpic_icw4(vatpic, atpic, val);
-				break;
-			}
+			break;
 		}
 	} else {
 		if (val & (1 << 4))
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 3c9346334f5a..d684dbade70a 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -633,6 +633,7 @@ vlapic_fire_timer(struct vlapic *vlapic)
 	// The timer LVT always uses the fixed delivery mode.
 	lvt = vlapic_get_lvt(vlapic, APIC_OFFSET_TIMER_LVT);
 	if (vlapic_fire_lvt(vlapic, lvt | APIC_LVT_DM_FIXED)) {
+		VLAPIC_CTR0(vlapic, "vlapic timer fired");
 		vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_INTR_TIMER, 1);
 	}
 }
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index ae67c58962eb..7fc3a9bbdd10 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
 #include "vhpet.h"
 #include "vioapic.h"
 #include "vlapic.h"
-#include "vmm_msr.h"
 #include "vmm_ipi.h"
 #include "vmm_stat.h"
 #include "vmm_lapic.h"
@@ -105,7 +104,6 @@ struct vcpu {
 	struct savefpu	*guestfpu;	/* (a,i) guest fpu state */
 	uint64_t	guest_xcr0;	/* (i) guest %xcr0 register */
 	void		*stats;		/* (a,i) statistics */
-	uint64_t guest_msrs[VMM_MSR_NUM]; /* (i) emulated MSRs */
 	struct vm_exit	exitinfo;	/* (x) exit reason and collateral */
 };
 
@@ -188,7 +186,6 @@ static struct vmm_ops *ops;
 #define	fpu_stop_emulating()	clts()
 
 static MALLOC_DEFINE(M_VM, "vm", "vm");
-CTASSERT(VMM_MSR_NUM <= 64);	/* msr_mask can keep track of up to 64 msrs */
 
 /* statistics */
 static VMM_STAT(VCPU_TOTAL_RUNTIME, "vcpu total runtime");
@@ -249,7 +246,6 @@ vcpu_init(struct vm *vm, int vcpu_id, bool create)
 	vcpu->guest_xcr0 = XFEATURE_ENABLED_X87;
 	fpu_save_area_reset(vcpu->guestfpu);
 	vmm_stat_init(vcpu->stats);
-	guest_msrs_init(vm, vcpu_id);
 }
 
 struct vm_exit *
@@ -293,7 +289,6 @@ vmm_init(void)
 	else
 		return (ENXIO);
 
-	vmm_msr_init();
 	vmm_resume_p = vmm_resume;
 
 	return (VMM_INIT(vmm_ipinum));
@@ -1090,7 +1085,7 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu)
 {
 	struct vcpu *vcpu;
 	const char *wmesg;
-	int t, vcpu_halted, vm_halted;
+	int error, t, vcpu_halted, vm_halted;
 
 	KASSERT(!CPU_ISSET(vcpuid, &vm->halted_cpus), ("vcpu already halted"));
 
@@ -1098,6 +1093,22 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu)
 	vcpu_halted = 0;
 	vm_halted = 0;
 
+	/*
+	 * The typical way to halt a cpu is to execute: "sti; hlt"
+	 *
+	 * STI sets RFLAGS.IF to enable interrupts. However, the processor
+	 * remains in an "interrupt shadow" for an additional instruction
+	 * following the STI. This guarantees that "sti; hlt" sequence is
+	 * atomic and a pending interrupt will be recognized after the HLT.
+	 *
+	 * After the HLT emulation is done the vcpu is no longer in an
+	 * interrupt shadow and a pending interrupt can be injected on
+	 * the next entry into the guest.
+	 */
+	error = vm_set_register(vm, vcpuid, VM_REG_GUEST_INTR_SHADOW, 0);
+	KASSERT(error == 0, ("%s: error %d clearing interrupt shadow",
+	    __func__, error));
+
 	vcpu_lock(vcpu);
 	while (1) {
 		/*
@@ -1186,8 +1197,12 @@ vm_handle_paging(struct vm *vm, int vcpuid, bool *retu)
 	if (ftype == VM_PROT_READ || ftype == VM_PROT_WRITE) {
 		rv = pmap_emulate_accessed_dirty(vmspace_pmap(vm->vmspace),
 		    vme->u.paging.gpa, ftype);
-		if (rv == 0)
+		if (rv == 0) {
+			VCPU_CTR2(vm, vcpuid, "%s bit emulation for gpa %#lx",
+			    ftype == VM_PROT_READ ? "accessed" : "dirty",
+			    vme->u.paging.gpa);
 			goto done;
+		}
 	}
 
 	map = &vm->vmspace->vm_map;
@@ -1228,6 +1243,8 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *retu)
 	paging = &vme->u.inst_emul.paging;
 	cpu_mode = paging->cpu_mode;
 
+	VCPU_CTR1(vm, vcpuid, "inst_emul fault accessing gpa %#lx", gpa);
+
 	vie_init(vie);
 
 	/* Fetch, decode and emulate the faulting instruction */
@@ -1424,7 +1441,6 @@ vm_run(struct vm *vm, struct vm_run *vmrun)
 	pcb = PCPU_GET(curpcb);
 	set_pcb_flags(pcb, PCB_FULL_IRET);
 
-	restore_guest_msrs(vm, vcpuid);	
 	restore_guest_fpustate(vcpu);
 
 	vcpu_require_state(vm, vcpuid, VCPU_RUNNING);
@@ -1432,7 +1448,6 @@ vm_run(struct vm *vm, struct vm_run *vmrun)
 	vcpu_require_state(vm, vcpuid, VCPU_FROZEN);
 
 	save_guest_fpustate(vcpu);
-	restore_host_msrs(vm, vcpuid);
 
 	vmm_stat_incr(vm, vcpuid, VCPU_TOTAL_RUNTIME, rdtsc() - tscval);
 
@@ -1874,12 +1889,6 @@ vm_set_capability(struct vm *vm, int vcpu, int type, int val)
 	return (VMSETCAP(vm->cookie, vcpu, type, val));
 }
 
-uint64_t *
-vm_guest_msrs(struct vm *vm, int cpu)
-{
-	return (vm->vcpu[cpu].guest_msrs);
-}
-
 struct vlapic *
 vm_lapic(struct vm *vm, int cpu)
 {
diff --git a/sys/amd64/vmm/vmm_msr.c b/sys/amd64/vmm/vmm_msr.c
deleted file mode 100644
index 03e0071c311c..000000000000
--- a/sys/amd64/vmm/vmm_msr.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*-
- * Copyright (c) 2011 NetApp, Inc.
- * All rights reserved.
- *
- * 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 NETAPP, INC ``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 NETAPP, INC 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.
- *
- * $FreeBSD$
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/smp.h>
-
-#include <machine/specialreg.h>
-
-#include <machine/vmm.h>
-#include "vmm_lapic.h"
-#include "vmm_msr.h"
-
-#define	VMM_MSR_F_EMULATE	0x01
-#define	VMM_MSR_F_READONLY	0x02
-#define VMM_MSR_F_INVALID	0x04  /* guest_msr_valid() can override this */
-
-struct vmm_msr {
-	int		num;
-	int		flags;
-	uint64_t	hostval;
-};
-
-static struct vmm_msr vmm_msr[] = {
-	{ MSR_LSTAR,	0 },
-	{ MSR_CSTAR,	0 },
-	{ MSR_STAR,	0 },
-	{ MSR_SF_MASK,	0 },
-	{ MSR_PAT,      VMM_MSR_F_EMULATE | VMM_MSR_F_INVALID },
-	{ MSR_BIOS_SIGN,VMM_MSR_F_EMULATE },
-	{ MSR_MCG_CAP,	VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
-	{ MSR_IA32_PLATFORM_ID, VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
-	{ MSR_IA32_MISC_ENABLE, VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
-};
-
-#define	vmm_msr_num	(sizeof(vmm_msr) / sizeof(vmm_msr[0]))
-CTASSERT(VMM_MSR_NUM >= vmm_msr_num);
-
-#define	readonly_msr(idx)	\
-	((vmm_msr[(idx)].flags & VMM_MSR_F_READONLY) != 0)
-
-#define	emulated_msr(idx)	\
-	((vmm_msr[(idx)].flags & VMM_MSR_F_EMULATE) != 0)
-
-#define invalid_msr(idx)	\
-	((vmm_msr[(idx)].flags & VMM_MSR_F_INVALID) != 0)
-
-void
-vmm_msr_init(void)
-{
-	int i;
-
-	for (i = 0; i < vmm_msr_num; i++) {
-		if (emulated_msr(i))
-			continue;
-		/*
-		 * XXX this assumes that the value of the host msr does not
-		 * change after we have cached it.
-		 */
-		vmm_msr[i].hostval = rdmsr(vmm_msr[i].num);
-	}
-}
-
-void
-guest_msrs_init(struct vm *vm, int cpu)
-{
-	int i;
-	uint64_t *guest_msrs, misc;
-
-	guest_msrs = vm_guest_msrs(vm, cpu);
-	
-	for (i = 0; i < vmm_msr_num; i++) {
-		switch (vmm_msr[i].num) {
-		case MSR_LSTAR:
-		case MSR_CSTAR:
-		case MSR_STAR:
-		case MSR_SF_MASK:
-		case MSR_BIOS_SIGN:
-		case MSR_MCG_CAP:
-			guest_msrs[i] = 0;
-			break;
-		case MSR_PAT:
-			guest_msrs[i] = PAT_VALUE(0, PAT_WRITE_BACK)      |
-				PAT_VALUE(1, PAT_WRITE_THROUGH)   |
-				PAT_VALUE(2, PAT_UNCACHED)        |
-				PAT_VALUE(3, PAT_UNCACHEABLE)     |
-				PAT_VALUE(4, PAT_WRITE_BACK)      |
-				PAT_VALUE(5, PAT_WRITE_THROUGH)   |
-				PAT_VALUE(6, PAT_UNCACHED)        |
-				PAT_VALUE(7, PAT_UNCACHEABLE);
-			break;
-		case MSR_IA32_MISC_ENABLE:
-			misc = rdmsr(MSR_IA32_MISC_ENABLE);
-			/*
-			 * Set mandatory bits
-			 *  11:   branch trace disabled
-			 *  12:   PEBS unavailable
-			 * Clear unsupported features
-			 *  16:   SpeedStep enable
-			 *  18:   enable MONITOR FSM
-                         */
-			misc |= (1 << 12) | (1 << 11);
-			misc &= ~((1 << 18) | (1 << 16));
-			guest_msrs[i] = misc;
-			break;
-		case MSR_IA32_PLATFORM_ID:
-			guest_msrs[i] = 0;
-			break;
-		default:
-			panic("guest_msrs_init: missing initialization for msr "
-			      "0x%0x", vmm_msr[i].num);
-		}
-	}
-}
-
-static int
-msr_num_to_idx(u_int num)
-{
-	int i;
-
-	for (i = 0; i < vmm_msr_num; i++)
-		if (vmm_msr[i].num == num)
-			return (i);
-
-	return (-1);
-}
-
-int
-emulate_wrmsr(struct vm *vm, int cpu, u_int num, uint64_t val, bool *retu)
-{
-	int idx;
-	uint64_t *guest_msrs;
-
-	if (lapic_msr(num))
-		return (lapic_wrmsr(vm, cpu, num, val, retu));
-
-	idx = msr_num_to_idx(num);
-	if (idx < 0 || invalid_msr(idx))
-		return (EINVAL);
-
-	if (!readonly_msr(idx)) {
-		guest_msrs = vm_guest_msrs(vm, cpu);
-
-		/* Stash the value */
-		guest_msrs[idx] = val;
-
-		/* Update processor state for non-emulated MSRs */
-		if (!emulated_msr(idx))
-			wrmsr(vmm_msr[idx].num, val);
-	}
-
-	return (0);
-}
-
-int
-emulate_rdmsr(struct vm *vm, int cpu, u_int num, bool *retu)
-{
-	int error, idx;
-	uint32_t eax, edx;
-	uint64_t result, *guest_msrs;
-
-	if (lapic_msr(num)) {
-		error = lapic_rdmsr(vm, cpu, num, &result, retu);
-		goto done;
-	}
-
-	idx = msr_num_to_idx(num);
-	if (idx < 0 || invalid_msr(idx)) {
-		error = EINVAL;
-		goto done;
-	}
-
-	guest_msrs = vm_guest_msrs(vm, cpu);
-	result = guest_msrs[idx];
-
-	/*
-	 * If this is not an emulated msr register make sure that the processor
-	 * state matches our cached state.
-	 */
-	if (!emulated_msr(idx) && (rdmsr(num) != result)) {
-		panic("emulate_rdmsr: msr 0x%0x has inconsistent cached "
-		      "(0x%016lx) and actual (0x%016lx) values", num,
-		      result, rdmsr(num));
-	}
-
-	error = 0;
-
-done:
-	if (error == 0) {
-		eax = result;
-		edx = result >> 32;
-		error = vm_set_register(vm, cpu, VM_REG_GUEST_RAX, eax);
-		if (error)
-			panic("vm_set_register(rax) error %d", error);
-		error = vm_set_register(vm, cpu, VM_REG_GUEST_RDX, edx);
-		if (error)
-			panic("vm_set_register(rdx) error %d", error);
-	}
-	return (error);
-}
-
-void
-restore_guest_msrs(struct vm *vm, int cpu)
-{
-	int i;
-	uint64_t *guest_msrs;
-
-	guest_msrs = vm_guest_msrs(vm, cpu);
-
-	for (i = 0; i < vmm_msr_num; i++) {
-		if (emulated_msr(i))
-			continue;
-		else
-			wrmsr(vmm_msr[i].num, guest_msrs[i]);
-	}
-}
-
-void
-restore_host_msrs(struct vm *vm, int cpu)
-{
-	int i;
-
-	for (i = 0; i < vmm_msr_num; i++) {
-		if (emulated_msr(i))
-			continue;
-		else
-			wrmsr(vmm_msr[i].num, vmm_msr[i].hostval);
-	}
-}
-
-/*
- * Must be called by the CPU-specific code before any guests are
- * created
- */
-void
-guest_msr_valid(int msr)
-{
-	int i;
-
-	for (i = 0; i < vmm_msr_num; i++) {
-		if (vmm_msr[i].num == msr && invalid_msr(i)) {
-			vmm_msr[i].flags &= ~VMM_MSR_F_INVALID;
-		}
-	}
-}
diff --git a/sys/arm/allwinner/a10_clk.c b/sys/arm/allwinner/a10_clk.c
index 2bb683e015c8..af7e87588197 100644
--- a/sys/arm/allwinner/a10_clk.c
+++ b/sys/arm/allwinner/a10_clk.c
@@ -132,7 +132,7 @@ a10_clk_usb_activate(void)
 	/* Gating AHB clock for USB */
 	reg_value = ccm_read_4(sc, CCM_AHB_GATING0);
 	reg_value |= CCM_AHB_GATING_USB0; /* AHB clock gate usb0 */
-	reg_value |= CCM_AHB_GATING_EHCI0; /* AHB clock gate ehci1 */
+	reg_value |= CCM_AHB_GATING_EHCI0; /* AHB clock gate ehci0 */
 	reg_value |= CCM_AHB_GATING_EHCI1; /* AHB clock gate ehci1 */
 	ccm_write_4(sc, CCM_AHB_GATING0, reg_value);
 
@@ -167,6 +167,7 @@ a10_clk_usb_deactivate(void)
 	/* Disable gating AHB clock for USB */
 	reg_value = ccm_read_4(sc, CCM_AHB_GATING0);
 	reg_value &= ~CCM_AHB_GATING_USB0; /* disable AHB clock gate usb0 */
+	reg_value &= ~CCM_AHB_GATING_EHCI0; /* disable AHB clock gate ehci0 */
 	reg_value &= ~CCM_AHB_GATING_EHCI1; /* disable AHB clock gate ehci1 */
 	ccm_write_4(sc, CCM_AHB_GATING0, reg_value);
 
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index 88be55a90e02..7828661c82a3 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -260,7 +260,7 @@ emac_txeof(struct emac_softc *sc)
 	EMAC_ASSERT_LOCKED(sc);
 
 	ifp = sc->emac_ifp;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 	/* Unarm watchdog timer if no TX */
@@ -340,12 +340,12 @@ emac_rxeof(struct emac_softc *sc, int count)
 				if_printf(ifp,
 				    "bad packet: len = %i status = %i\n",
 				    len, status);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 #if 0
 		if (status & (EMAC_CRCERR | EMAC_LENERR)) {
 			good_packet = 0;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			if (status & EMAC_CRCERR)
 				if_printf(ifp, "crc error\n");
 			if (status & EMAC_LENERR)
@@ -393,18 +393,18 @@ emac_rxeof(struct emac_softc *sc, int count)
 					m0->m_next = m;
 					m = m0;
 				} else {
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					m_freem(m);
 					m = NULL;
 					continue;
 				}
 			} else if (m->m_len > EMAC_MAC_MAXF) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				m_freem(m);
 				m = NULL;
 				continue;
 			}
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			EMAC_UNLOCK(sc);
 			(*ifp->if_input)(ifp, m);
 			EMAC_LOCK(sc);
@@ -431,7 +431,7 @@ emac_watchdog(struct emac_softc *sc)
 	} else
 		if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n");
 	
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	emac_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
diff --git a/sys/arm/allwinner/timer.c b/sys/arm/allwinner/timer.c
index 5ab6d9d97f3d..a04fafac60c8 100644
--- a/sys/arm/allwinner/timer.c
+++ b/sys/arm/allwinner/timer.c
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #define TIMER_ENABLE		(1<<0)
 #define TIMER_AUTORELOAD	(1<<1)
 #define TIMER_OSC24M		(1<<2) /* oscillator = 24mhz */
-#define TIMER_PRESCALAR		(4<<4) /* prescalar = 16 */
+#define TIMER_PRESCALAR		(0<<4) /* prescalar = 1 */
 
 #define SYS_TIMER_CLKSRC	24000000 /* clock source */
 
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 654462d0d1fc..c420617fa614 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -15,3 +15,7 @@ arm/arm/mpcore_timer.c				standard
 
 arm/altera/socfpga/socfpga_common.c		standard
 arm/altera/socfpga/socfpga_machdep.c		standard
+arm/altera/socfpga/socfpga_manager.c		standard
+arm/altera/socfpga/socfpga_rstmgr.c		standard
+
+dev/dwc/if_dwc.c				optional dwc
diff --git a/sys/arm/altera/socfpga/socfpga_common.c b/sys/arm/altera/socfpga/socfpga_common.c
index 86d46e3f2dff..6531a416c1a9 100644
--- a/sys/arm/altera/socfpga/socfpga_common.c
+++ b/sys/arm/altera/socfpga/socfpga_common.c
@@ -42,20 +42,31 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/fdt.h>
 
-#define	RESMAN_BASE	0xFFD05000
-#define	RESMAN_CTRL	0x4
-#define	SWWARMRSTREQ	(1 << 1)
+#include <arm/altera/socfpga/socfpga_rstmgr.h>
 
 void
 cpu_reset(void)
 {
+	uint32_t addr, paddr;
 	bus_addr_t vaddr;
+	phandle_t node;
 
-	if (bus_space_map(fdtbus_bs_tag, RESMAN_BASE, 0x10, 0, &vaddr) == 0) {
-		bus_space_write_4(fdtbus_bs_tag, vaddr,
-		    RESMAN_CTRL, SWWARMRSTREQ);
+	if (rstmgr_warmreset() == 0)
+		goto end;
+
+	node = OF_finddevice("rstmgr");
+	if (node == -1)
+		goto end;
+
+	if ((OF_getprop(node, "reg", &paddr, sizeof(paddr))) > 0) {
+		addr = fdt32_to_cpu(paddr);
+		if (bus_space_map(fdtbus_bs_tag, addr, 0x8, 0, &vaddr) == 0) {
+			bus_space_write_4(fdtbus_bs_tag, vaddr,
+			    RSTMGR_CTRL, CTRL_SWWARMRSTREQ);
+		}
 	}
 
+end:
 	while (1);
 }
 
diff --git a/sys/arm/altera/socfpga/socfpga_common.h b/sys/arm/altera/socfpga/socfpga_common.h
new file mode 100644
index 000000000000..2b4e97bbb462
--- /dev/null
+++ b/sys/arm/altera/socfpga/socfpga_common.h
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#define	READ4(_sc, _reg) bus_read_4((_sc)->res[0], _reg)
+#define	READ2(_sc, _reg) bus_read_2((_sc)->res[0], _reg)
+#define	READ1(_sc, _reg) bus_read_1((_sc)->res[0], _reg)
+#define	WRITE4(_sc, _reg, _val) bus_write_4((_sc)->res[0], _reg, _val)
+#define	WRITE2(_sc, _reg, _val) bus_write_2((_sc)->res[0], _reg, _val)
+#define	WRITE1(_sc, _reg, _val) bus_write_1((_sc)->res[0], _reg, _val)
diff --git a/sys/arm/altera/socfpga/socfpga_l3regs.h b/sys/arm/altera/socfpga/socfpga_l3regs.h
new file mode 100644
index 000000000000..b4ef6f6d980d
--- /dev/null
+++ b/sys/arm/altera/socfpga/socfpga_l3regs.h
@@ -0,0 +1,54 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#define	L3REGS_REMAP		0x0	/* Remap */
+#define	 REMAP_LWHPS2FPGA	(1 << 4)
+#define	 REMAP_HPS2FPGA		(1 << 3)
+#define	 REMAP_MPUZERO		(1 << 0)
+#define	L3REGS_L4MAIN		0x8	/* L4 main peripherals security */
+#define	L3REGS_L4SP		0xC	/* L4 SP Peripherals Security */
+#define	L3REGS_L4MP		0x10	/* L4 MP Peripherals Security */
+#define	L3REGS_L4OSC1		0x14	/* L4 OSC1 Peripherals Security */
+#define	L3REGS_L4SPIM		0x18	/* L4 SPIM Peripherals Security */
+#define	L3REGS_STM		0x1C	/* STM Peripheral Security */
+#define	L3REGS_LWHPS2FPGAREGS	0x20	/* LWHPS2FPGA AXI Bridge Security */
+#define	L3REGS_USB1		0x28	/* USB1 Peripheral Security */
+#define	L3REGS_NANDDATA		0x2C	/* NAND Flash Controller Data Sec */
+#define	L3REGS_USB0		0x80	/* USB0 Peripheral Security */
+#define	L3REGS_NANDREGS		0x84	/* NAND Flash Controller Security */
+#define	L3REGS_QSPIDATA		0x88	/* QSPI Flash Controller Data Sec */
+#define	L3REGS_FPGAMGRDATA	0x8C	/* FPGA Manager Data Peripheral Sec */
+#define	L3REGS_HPS2FPGAREGS	0x90	/* HPS2FPGA AXI Bridge Perip. Sec */
+#define	L3REGS_ACP		0x94	/* MPU ACP Peripheral Security */
+#define	L3REGS_ROM		0x98	/* ROM Peripheral Security */
+#define	L3REGS_OCRAM		0x9C	/* On-chip RAM Peripheral Security */
+#define	L3REGS_SDRDATA		0xA0	/* SDRAM Data Peripheral Security */
diff --git a/sys/arm/altera/socfpga/socfpga_manager.c b/sys/arm/altera/socfpga/socfpga_manager.c
new file mode 100644
index 000000000000..47fd23fe0c7e
--- /dev/null
+++ b/sys/arm/altera/socfpga/socfpga_manager.c
@@ -0,0 +1,433 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+/*
+ * Altera FPGA Manager.
+ * Chapter 4, Cyclone V Device Handbook (CV-5V2 2014.07.22)
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/timeet.h>
+#include <sys/timetc.h>
+#include <sys/conf.h>
+#include <sys/uio.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/altera/socfpga/socfpga_common.h>
+
+/* FPGA Manager Module Registers */
+#define	FPGAMGR_STAT		0x0	/* Status Register */
+#define	 STAT_MSEL_MASK		0x1f
+#define	 STAT_MSEL_SHIFT	3
+#define	 STAT_MODE_SHIFT	0
+#define	 STAT_MODE_MASK		0x7
+#define	FPGAMGR_CTRL		0x4	/* Control Register */
+#define	 CTRL_AXICFGEN		(1 << 8)
+#define	 CTRL_CDRATIO_MASK	0x3
+#define	 CTRL_CDRATIO_SHIFT	6
+#define	 CTRL_CFGWDTH_MASK	1
+#define	 CTRL_CFGWDTH_SHIFT	9
+#define	 CTRL_NCONFIGPULL	(1 << 2)
+#define	 CTRL_NCE		(1 << 1)
+#define	 CTRL_EN		(1 << 0)
+#define	FPGAMGR_DCLKCNT		0x8	/* DCLK Count Register */
+#define	FPGAMGR_DCLKSTAT	0xC	/* DCLK Status Register */
+#define	FPGAMGR_GPO		0x10	/* General-Purpose Output Register */
+#define	FPGAMGR_GPI		0x14	/* General-Purpose Input Register */
+#define	FPGAMGR_MISCI		0x18	/* Miscellaneous Input Register */
+
+/* Configuration Monitor (MON) Registers */
+#define	GPIO_INTEN		0x830	/* Interrupt Enable Register */
+#define	GPIO_INTMASK		0x834	/* Interrupt Mask Register */
+#define	GPIO_INTTYPE_LEVEL	0x838	/* Interrupt Level Register */
+#define	GPIO_INT_POLARITY	0x83C	/* Interrupt Polarity Register */
+#define	GPIO_INTSTATUS		0x840	/* Interrupt Status Register */
+#define	GPIO_RAW_INTSTATUS	0x844	/* Raw Interrupt Status Register */
+#define	GPIO_PORTA_EOI		0x84C	/* Clear Interrupt Register */
+#define	 PORTA_EOI_NS		(1 << 0)
+#define	GPIO_EXT_PORTA		0x850	/* External Port A Register */
+#define	 EXT_PORTA_CDP		(1 << 10) /* Configuration done */
+#define	GPIO_LS_SYNC		0x860	/* Synchronization Level Register */
+#define	GPIO_VER_ID_CODE	0x86C	/* GPIO Version Register */
+#define	GPIO_CONFIG_REG2	0x870	/* Configuration Register 2 */
+#define	GPIO_CONFIG_REG1	0x874	/* Configuration Register 1 */
+
+#define	MSEL_PP16_FAST_NOAES_NODC	0x0
+#define	MSEL_PP16_FAST_AES_NODC		0x1
+#define	MSEL_PP16_FAST_AESOPT_DC	0x2
+#define	MSEL_PP16_SLOW_NOAES_NODC	0x4
+#define	MSEL_PP16_SLOW_AES_NODC		0x5
+#define	MSEL_PP16_SLOW_AESOPT_DC	0x6
+#define	MSEL_PP32_FAST_NOAES_NODC	0x8
+#define	MSEL_PP32_FAST_AES_NODC		0x9
+#define	MSEL_PP32_FAST_AESOPT_DC	0xa
+#define	MSEL_PP32_SLOW_NOAES_NODC	0xc
+#define	MSEL_PP32_SLOW_AES_NODC		0xd
+#define	MSEL_PP32_SLOW_AESOPT_DC	0xe
+
+#define	CFGWDTH_16	0
+#define	CFGWDTH_32	1
+
+#define	CDRATIO_1	0
+#define	CDRATIO_2	1
+#define	CDRATIO_4	2
+#define	CDRATIO_8	3
+
+#define	FPGAMGR_MODE_POWEROFF	0x0
+#define	FPGAMGR_MODE_RESET	0x1
+#define	FPGAMGR_MODE_CONFIG	0x2
+#define	FPGAMGR_MODE_INIT	0x3
+#define	FPGAMGR_MODE_USER	0x4
+
+struct cfgmgr_mode {
+	int msel;
+	int cfgwdth;
+	int cdratio;
+};
+
+static struct cfgmgr_mode cfgmgr_modes[] = {
+	{ MSEL_PP16_FAST_NOAES_NODC, CFGWDTH_16, CDRATIO_1 },
+	{ MSEL_PP16_FAST_AES_NODC,   CFGWDTH_16, CDRATIO_2 },
+	{ MSEL_PP16_FAST_AESOPT_DC,  CFGWDTH_16, CDRATIO_4 },
+	{ MSEL_PP16_SLOW_NOAES_NODC, CFGWDTH_16, CDRATIO_1 },
+	{ MSEL_PP16_SLOW_AES_NODC,   CFGWDTH_16, CDRATIO_2 },
+	{ MSEL_PP16_SLOW_AESOPT_DC,  CFGWDTH_16, CDRATIO_4 },
+	{ MSEL_PP32_FAST_NOAES_NODC, CFGWDTH_32, CDRATIO_1 },
+	{ MSEL_PP32_FAST_AES_NODC,   CFGWDTH_32, CDRATIO_4 },
+	{ MSEL_PP32_FAST_AESOPT_DC,  CFGWDTH_32, CDRATIO_8 },
+	{ MSEL_PP32_SLOW_NOAES_NODC, CFGWDTH_32, CDRATIO_1 },
+	{ MSEL_PP32_SLOW_AES_NODC,   CFGWDTH_32, CDRATIO_4 },
+	{ MSEL_PP32_SLOW_AESOPT_DC,  CFGWDTH_32, CDRATIO_8 },
+	{ -1, -1, -1 },
+};
+
+struct fpgamgr_softc {
+	struct resource		*res[3];
+	bus_space_tag_t		bst_data;
+	bus_space_handle_t	bsh_data;
+	struct cdev		*mgr_cdev;
+	device_t		dev;
+};
+
+static struct resource_spec fpgamgr_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+fpgamgr_state_get(struct fpgamgr_softc *sc)
+{
+	int reg;
+
+	reg = READ4(sc, FPGAMGR_STAT);
+	reg >>= STAT_MODE_SHIFT;
+	reg &= STAT_MODE_MASK;
+
+	return reg;
+}
+
+static int
+fpgamgr_state_wait(struct fpgamgr_softc *sc, int state)
+{
+	int tout;
+
+	tout = 1000;
+	while (tout > 0) {
+		if (fpgamgr_state_get(sc) == state)
+			break;
+		tout--;
+		DELAY(10);
+	}
+	if (tout == 0) {
+		return (1);
+	}
+
+	return (0);
+}
+
+static int
+fpga_open(struct cdev *dev, int flags __unused,
+    int fmt __unused, struct thread *td __unused)
+{
+	struct fpgamgr_softc *sc;
+	struct cfgmgr_mode *mode;
+	int msel;
+	int reg;
+	int i;
+
+	sc = dev->si_drv1;
+
+	msel = READ4(sc, FPGAMGR_STAT);
+	msel >>= STAT_MSEL_SHIFT;
+	msel &= STAT_MSEL_MASK;
+
+	mode = NULL;
+	for (i = 0; cfgmgr_modes[i].msel != -1; i++) {
+		if (msel == cfgmgr_modes[i].msel) {
+			mode = &cfgmgr_modes[i];
+			break;
+		}
+	}
+	if (mode == NULL) {
+		device_printf(sc->dev, "Can't configure: unknown mode\n");
+		return (ENXIO);
+	}
+
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg &= ~(CTRL_CDRATIO_MASK << CTRL_CDRATIO_SHIFT);
+	reg |= (mode->cdratio << CTRL_CDRATIO_SHIFT);
+	reg &= ~(CTRL_CFGWDTH_MASK << CTRL_CFGWDTH_SHIFT);
+	reg |= (mode->cfgwdth << CTRL_CFGWDTH_SHIFT);
+	reg &= ~(CTRL_NCE);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	/* Enable configuration */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg |= (CTRL_EN);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	/* Reset FPGA */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg |= (CTRL_NCONFIGPULL);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	/* Wait reset state */
+	if (fpgamgr_state_wait(sc, FPGAMGR_MODE_RESET)) {
+		device_printf(sc->dev, "Can't get RESET state\n");
+		return (ENXIO);
+	}
+
+	/* Release from reset */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg &= ~(CTRL_NCONFIGPULL);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	if (fpgamgr_state_wait(sc, FPGAMGR_MODE_CONFIG)) {
+		device_printf(sc->dev, "Can't get CONFIG state\n");
+		return (ENXIO);
+	}
+
+	/* Clear nSTATUS edge interrupt */
+	WRITE4(sc, GPIO_PORTA_EOI, PORTA_EOI_NS);
+
+	/* Enter configuration state */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg |= (CTRL_AXICFGEN);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	return (0);
+}
+
+static int
+fpga_wait_dclk_pulses(struct fpgamgr_softc *sc, int npulses)
+{
+	int tout;
+
+	/* Clear done bit, if any */
+	if (READ4(sc, FPGAMGR_DCLKSTAT) != 0)
+		WRITE4(sc, FPGAMGR_DCLKSTAT, 0x1);
+
+	/* Request DCLK pulses */
+	WRITE4(sc, FPGAMGR_DCLKCNT, npulses);
+
+	/* Wait finish */
+	tout = 1000;
+	while (tout > 0) {
+		if (READ4(sc, FPGAMGR_DCLKSTAT) == 1) {
+			WRITE4(sc, FPGAMGR_DCLKSTAT, 0x1);
+			break;
+		}
+		tout--;
+		DELAY(10);
+	}
+	if (tout == 0) {
+		return (1);
+	}
+
+	return (0);
+}
+
+static int
+fpga_close(struct cdev *dev, int flags __unused,
+    int fmt __unused, struct thread *td __unused)
+{
+	struct fpgamgr_softc *sc;
+	int reg;
+
+	sc = dev->si_drv1;
+
+	reg = READ4(sc, GPIO_EXT_PORTA);
+	if ((reg & EXT_PORTA_CDP) == 0) {
+		device_printf(sc->dev, "Err: configuration failed\n");
+		return (ENXIO);
+	}
+
+	/* Exit configuration state */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg &= ~(CTRL_AXICFGEN);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	/* Wait dclk pulses */
+	if (fpga_wait_dclk_pulses(sc, 4)) {
+		device_printf(sc->dev, "Can't proceed 4 dclk pulses\n");
+		return (ENXIO);
+	}
+
+	if (fpgamgr_state_wait(sc, FPGAMGR_MODE_USER)) {
+		device_printf(sc->dev, "Can't get USER mode\n");
+		return (ENXIO);
+	}
+
+	/* Disable configuration */
+	reg = READ4(sc, FPGAMGR_CTRL);
+	reg &= ~(CTRL_EN);
+	WRITE4(sc, FPGAMGR_CTRL, reg);
+
+	return (0);
+}
+
+static int
+fpga_write(struct cdev *dev, struct uio *uio, int ioflag)
+{
+	struct fpgamgr_softc *sc;
+	int buffer;
+
+	sc = dev->si_drv1;
+
+	/*
+	 * Device supports 4-byte copy only.
+	 * TODO: add padding for <4 bytes.
+	 */
+
+	while (uio->uio_resid > 0) {
+		uiomove(&buffer, 4, uio);
+		bus_space_write_4(sc->bst_data, sc->bsh_data,
+		    0x0, buffer);
+	}
+
+	return (0);
+}
+
+static int
+fpga_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags,
+    struct thread *td)
+{
+
+	return (0);
+}
+
+static struct cdevsw fpga_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_open =	fpga_open,
+	.d_close =	fpga_close,
+	.d_write =	fpga_write,
+	.d_ioctl =	fpga_ioctl,
+	.d_name =	"FPGA Manager",
+};
+
+static int
+fpgamgr_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "altr,fpga-mgr"))
+		return (ENXIO);
+
+	device_set_desc(dev, "FPGA Manager");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+fpgamgr_attach(device_t dev)
+{
+	struct fpgamgr_softc *sc;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, fpgamgr_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* Memory interface */
+	sc->bst_data = rman_get_bustag(sc->res[1]);
+	sc->bsh_data = rman_get_bushandle(sc->res[1]);
+
+	sc->mgr_cdev = make_dev(&fpga_cdevsw, 0, UID_ROOT, GID_WHEEL,
+	    0600, "fpga%d", device_get_unit(sc->dev));
+
+	if (sc->mgr_cdev == NULL) {
+		device_printf(dev, "Failed to create character device.\n");
+		return (ENXIO);
+	}
+
+	sc->mgr_cdev->si_drv1 = sc;
+
+	return (0);
+}
+
+static device_method_t fpgamgr_methods[] = {
+	DEVMETHOD(device_probe,		fpgamgr_probe),
+	DEVMETHOD(device_attach,	fpgamgr_attach),
+	{ 0, 0 }
+};
+
+static driver_t fpgamgr_driver = {
+	"fpgamgr",
+	fpgamgr_methods,
+	sizeof(struct fpgamgr_softc),
+};
+
+static devclass_t fpgamgr_devclass;
+
+DRIVER_MODULE(fpgamgr, simplebus, fpgamgr_driver, fpgamgr_devclass, 0, 0);
diff --git a/sys/arm/altera/socfpga/socfpga_rstmgr.c b/sys/arm/altera/socfpga/socfpga_rstmgr.c
new file mode 100644
index 000000000000..36a1d7558210
--- /dev/null
+++ b/sys/arm/altera/socfpga/socfpga_rstmgr.c
@@ -0,0 +1,259 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+/*
+ * SOCFPGA Reset Manager.
+ * Chapter 3, Cyclone V Device Handbook (CV-5V2 2014.07.22)
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/timeet.h>
+#include <sys/timetc.h>
+#include <sys/sysctl.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/altera/socfpga/socfpga_common.h>
+#include <arm/altera/socfpga/socfpga_rstmgr.h>
+#include <arm/altera/socfpga/socfpga_l3regs.h>
+
+struct rstmgr_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+};
+
+struct rstmgr_softc *rstmgr_sc;
+
+static struct resource_spec rstmgr_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+enum {
+	RSTMGR_SYSCTL_FPGA2HPS,
+	RSTMGR_SYSCTL_LWHPS2FPGA,
+	RSTMGR_SYSCTL_HPS2FPGA
+};
+
+static int
+l3remap(struct rstmgr_softc *sc, int remap, int enable)
+{
+	uint32_t addr, paddr;
+	bus_addr_t vaddr;
+	phandle_t node;
+	int reg;
+
+	/*
+	 * Control whether bridge is visible to L3 masters or not.
+	 * Register is write-only.
+	 */
+
+	reg = REMAP_MPUZERO;
+	if (enable)
+		reg |= (remap);
+	else
+		reg &= ~(remap);
+
+	node = OF_finddevice("l3regs");
+	if (node == -1) {
+		device_printf(sc->dev, "Can't find l3regs node\n");
+		return (1);
+	}
+
+	if ((OF_getprop(node, "reg", &paddr, sizeof(paddr))) > 0) {
+		addr = fdt32_to_cpu(paddr);
+		if (bus_space_map(fdtbus_bs_tag, addr, 0x4, 0, &vaddr) == 0) {
+			bus_space_write_4(fdtbus_bs_tag, vaddr,
+			    L3REGS_REMAP, reg);
+			return (0);
+		}
+	}
+
+	return (1);
+}
+
+static int
+rstmgr_sysctl(SYSCTL_HANDLER_ARGS)
+{
+	struct rstmgr_softc *sc;
+	int enable;
+	int remap;
+	int err;
+	int reg;
+	int bit;
+
+	sc = arg1;
+
+	switch (arg2) {
+	case RSTMGR_SYSCTL_FPGA2HPS:
+		bit = BRGMODRST_FPGA2HPS;
+		remap = 0;
+		break;
+	case RSTMGR_SYSCTL_LWHPS2FPGA:
+		bit = BRGMODRST_LWHPS2FPGA;
+		remap = REMAP_LWHPS2FPGA;
+		break;
+	case RSTMGR_SYSCTL_HPS2FPGA:
+		bit = BRGMODRST_HPS2FPGA;
+		remap = REMAP_HPS2FPGA;
+		break;
+	default:
+		return (1);
+	};
+
+	reg = READ4(sc, RSTMGR_BRGMODRST);
+	enable = reg & bit ? 0 : 1;
+
+	err = sysctl_handle_int(oidp, &enable, 0, req);
+	if (err || !req->newptr)
+		return (err);
+
+	if (enable == 1)
+		reg &= ~(bit);
+	else if (enable == 0)
+		reg |= (bit);
+	else
+		return (EINVAL);
+
+	WRITE4(sc, RSTMGR_BRGMODRST, reg);
+	l3remap(sc, remap, enable);
+
+	return (0);
+}
+
+int
+rstmgr_warmreset(void)
+{
+	struct rstmgr_softc *sc;
+
+	sc = rstmgr_sc;
+	if (sc == NULL)
+		return (1);
+
+	/* Request warm reset */
+	WRITE4(sc, RSTMGR_CTRL,
+	    CTRL_SWWARMRSTREQ);
+
+	return (0);
+}
+
+static int
+rstmgr_add_sysctl(struct rstmgr_softc *sc)
+{
+	struct sysctl_oid_list *children;
+	struct sysctl_ctx_list *ctx;
+
+	ctx = device_get_sysctl_ctx(sc->dev);
+	children = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev));
+
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "fpga2hps",
+	    CTLTYPE_UINT | CTLFLAG_RW, sc, RSTMGR_SYSCTL_FPGA2HPS,
+	    rstmgr_sysctl, "I", "Enable fpga2hps bridge");
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "lwhps2fpga",
+	    CTLTYPE_UINT | CTLFLAG_RW, sc, RSTMGR_SYSCTL_LWHPS2FPGA,
+	    rstmgr_sysctl, "I", "Enable lwhps2fpga bridge");
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "hps2fpga",
+	    CTLTYPE_UINT | CTLFLAG_RW, sc, RSTMGR_SYSCTL_HPS2FPGA,
+	    rstmgr_sysctl, "I", "Enable hps2fpga bridge");
+
+	return (0);
+}
+
+static int
+rstmgr_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "altr,rst-mgr"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Reset Manager");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+rstmgr_attach(device_t dev)
+{
+	struct rstmgr_softc *sc;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, rstmgr_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	rstmgr_sc = sc;
+	rstmgr_add_sysctl(sc);
+
+	return (0);
+}
+
+static device_method_t rstmgr_methods[] = {
+	DEVMETHOD(device_probe,		rstmgr_probe),
+	DEVMETHOD(device_attach,	rstmgr_attach),
+	{ 0, 0 }
+};
+
+static driver_t rstmgr_driver = {
+	"rstmgr",
+	rstmgr_methods,
+	sizeof(struct rstmgr_softc),
+};
+
+static devclass_t rstmgr_devclass;
+
+DRIVER_MODULE(rstmgr, simplebus, rstmgr_driver, rstmgr_devclass, 0, 0);
diff --git a/sys/arm/altera/socfpga/socfpga_rstmgr.h b/sys/arm/altera/socfpga/socfpga_rstmgr.h
new file mode 100644
index 000000000000..db7d2a088b40
--- /dev/null
+++ b/sys/arm/altera/socfpga/socfpga_rstmgr.h
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#define	RSTMGR_STAT		0x0	/* Status */
+#define	RSTMGR_CTRL		0x4	/* Control */
+#define	 CTRL_SWWARMRSTREQ	(1 << 1) /* Trigger warm reset */
+#define	RSTMGR_COUNTS		0x8	/* Reset Cycles Count */
+#define	RSTMGR_MPUMODRST	0x10	/* MPU Module Reset */
+#define	RSTMGR_PERMODRST	0x14	/* Peripheral Module Reset */
+#define	RSTMGR_PER2MODRST	0x18	/* Peripheral 2 Module Reset */
+#define	RSTMGR_BRGMODRST	0x1C	/* Bridge Module Reset */
+#define	 BRGMODRST_FPGA2HPS	(1 << 2)
+#define	 BRGMODRST_LWHPS2FPGA	(1 << 1)
+#define	 BRGMODRST_HPS2FPGA	(1 << 0)
+#define	RSTMGR_MISCMODRST	0x20	/* Miscellaneous Module Reset */
+
+int rstmgr_warmreset(void);
diff --git a/sys/arm/arm/cpufunc_asm_armv7.S b/sys/arm/arm/cpufunc_asm_armv7.S
index 93896d219c75..9fe6aa5c90d7 100644
--- a/sys/arm/arm/cpufunc_asm_armv7.S
+++ b/sys/arm/arm/cpufunc_asm_armv7.S
@@ -33,6 +33,8 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+#include <machine/sysreg.h>
+
 	.cpu cortex-a8
 
 .Lcoherency_level:
@@ -70,12 +72,12 @@ ENTRY(armv7_setttb)
  	dsb
 				
 	orr 	r0, r0, #PT_ATTR
- 	mcr	p15, 0, r0, c2, c0, 0	/* Translation Table Base Register 0 (TTBR0) */
+ 	mcr	CP15_TTBR0(r0)
 	isb
 #ifdef SMP
- 	mcr     p15, 0, r0, c8, c3, 0   /* invalidate I+D TLBs Inner Shareable*/
+ 	mcr	CP15_TLBIALLIS
 #else
- 	mcr     p15, 0, r0, c8, c7, 0   /* invalidate I+D TLBs */
+ 	mcr     CP15_TLBIALL
 #endif
  	dsb
  	isb
@@ -85,11 +87,11 @@ END(armv7_setttb)
 ENTRY(armv7_tlb_flushID)
 	dsb
 #ifdef SMP
-	mcr	p15, 0, r0, c8, c3, 0	/* flush Unified TLB all entries Inner Shareable */
-	mcr	p15, 0, r0, c7, c1, 6	/* flush BTB Inner Shareable */
+	mcr	CP15_TLBIALLIS
+	mcr	CP15_BPIALLIS
 #else
-	mcr	p15, 0, r0, c8, c7, 0	/* flush Unified TLB all entries */
-	mcr	p15, 0, r0, c7, c5, 6	/* flush BTB */
+	mcr	CP15_TLBIALL
+	mcr	CP15_BPIALL
 #endif
 	dsb
 	isb
@@ -100,11 +102,11 @@ ENTRY(armv7_tlb_flushID_SE)
 	ldr	r1, .Lpage_mask
 	bic	r0, r0, r1
 #ifdef SMP
-	mcr	p15, 0, r0, c8, c3, 3	/* flush Unified TLB single entry Inner Shareable */
-	mcr	p15, 0, r0, c7, c1, 6	/* flush BTB Inner Shareable */
+	mcr	CP15_TLBIMVAAIS(r0)
+	mcr	CP15_BPIALLIS
 #else
-	mcr	p15, 0, r0, c8, c7, 1	/* flush Unified TLB single entry */
-	mcr	p15, 0, r0, c7, c5, 6	/* flush BTB */
+	mcr	CP15_TLBIMVA(r0)
+	mcr	CP15_BPIALL
 #endif
 	dsb
 	isb
@@ -149,7 +151,7 @@ Loop3:
 	orr	r6, r6, r7, lsl r2
 
 	/* Clean and invalidate data cache by way/index */
-	mcr	p15, 0, r6, c7, c14, 2
+	mcr	CP15_DCCISW(r6)
 	subs	r9, r9, #1
 	bge	Loop3
 	subs	r7, r7, #1
@@ -168,9 +170,9 @@ ENTRY(armv7_idcache_wbinv_all)
 	stmdb	sp!, {lr}
 	bl armv7_dcache_wbinv_all
 #ifdef SMP
-	mcr	p15, 0, r0, c7, c1, 0	/* Invalidate all I caches to PoU (ICIALLUIS) */
+	mcr	CP15_ICIALLUIS
 #else
-	mcr	p15, 0, r0, c7, c5, 0	/* Invalidate all I caches to PoU (ICIALLU) */
+	mcr	CP15_ICIALLU
 #endif
 	dsb
 	isb
@@ -191,7 +193,7 @@ ENTRY(armv7_dcache_wb_range)
 	add	r1, r1, r2
 	bic	r0, r0, r3
 .Larmv7_wb_next:
-	mcr	p15, 0, r0, c7, c10, 1	/* Clean D cache SE with VA */
+	mcr	CP15_DCCMVAC(r0)
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bhi	.Larmv7_wb_next
@@ -206,7 +208,7 @@ ENTRY(armv7_dcache_wbinv_range)
 	add     r1, r1, r2
 	bic     r0, r0, r3
 .Larmv7_wbinv_next:
-	mcr	p15, 0, r0, c7, c14, 1	/* Purge D cache SE with VA */
+	mcr	CP15_DCCIMVAC(r0)
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bhi	.Larmv7_wbinv_next
@@ -225,7 +227,7 @@ ENTRY(armv7_dcache_inv_range)
 	add     r1, r1, r2
 	bic     r0, r0, r3
 .Larmv7_inv_next:
-	mcr	p15, 0, r0, c7, c6, 1	/* Invalidate D cache SE with VA */
+	mcr	CP15_DCIMVAC(r0)
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bhi	.Larmv7_inv_next
@@ -240,8 +242,8 @@ ENTRY(armv7_idcache_wbinv_range)
 	add     r1, r1, r2
 	bic     r0, r0, r3
 .Larmv7_id_wbinv_next:
-	mcr	p15, 0, r0, c7, c5, 1	/* Invalidate I cache SE with VA */
-	mcr	p15, 0, r0, c7, c14, 1	/* Purge D cache SE with VA */
+	mcr	CP15_ICIMVAU(r0)
+	mcr	CP15_DCCIMVAC(r0)
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bhi	.Larmv7_id_wbinv_next
@@ -252,9 +254,9 @@ END(armv7_idcache_wbinv_range)
 
 ENTRY_NP(armv7_icache_sync_all)
 #ifdef SMP
-	mcr	p15, 0, r0, c7, c1, 0	/* Invalidate all I cache to PoU Inner Shareable */
+	mcr	CP15_ICIALLUIS
 #else
-	mcr	p15, 0, r0, c7, c5, 0	/* Invalidate all I cache to PoU (ICIALLU) */
+	mcr	CP15_ICIALLU
 #endif
 	isb				/* instruction synchronization barrier */
 	dsb				/* data synchronization barrier */
@@ -264,8 +266,8 @@ END(armv7_icache_sync_all)
 ENTRY_NP(armv7_icache_sync_range)
 	ldr	ip, .Larmv7_line_size
 .Larmv7_sync_next:
-	mcr	p15, 0, r0, c7, c5, 1	/* Invalidate I cache SE with VA */
-	mcr	p15, 0, r0, c7, c10, 1	/* Clean D cache SE with VA */
+	mcr	CP15_ICIMVAU(r0)
+	mcr	CP15_DCCMVAC(r0)
 	add	r0, r0, ip
 	subs	r1, r1, ip
 	bhi	.Larmv7_sync_next
@@ -283,13 +285,13 @@ END(armv7_cpu_sleep)
 ENTRY(armv7_context_switch)
 	dsb
 	orr     r0, r0, #PT_ATTR
-			
-	mcr	p15, 0, r0, c2, c0, 0	/* set the new TTB */
+
+	mcr	CP15_TTBR0(r0)
 	isb
 #ifdef SMP
-	mcr	p15, 0, r0, c8, c3, 0	/* and flush the I+D tlbs Inner Sharable */
+	mcr	CP15_TLBIALLIS
 #else
-	mcr	p15, 0, r0, c8, c7, 0	/* and flush the I+D tlbs */
+	mcr	CP15_TLBIALL
 #endif
 	dsb
 	isb
@@ -309,12 +311,12 @@ ENTRY(armv7_sev)
 END(armv7_sev)
 
 ENTRY(armv7_auxctrl)
-	mrc p15, 0, r2, c1, c0, 1
+	mrc	CP15_ACTLR(r2)
 	bic r3, r2, r0	/* Clear bits */
 	eor r3, r3, r1  /* XOR bits */
 
 	teq r2, r3
-	mcrne p15, 0, r3, c1, c0, 1
+	mcrne	CP15_ACTLR(r3)
 	mov r0, r2
 	RET
 END(armv7_auxctrl)
@@ -325,8 +327,8 @@ END(armv7_auxctrl)
  */
 ENTRY(armv7_idcache_inv_all)
 	mov     r0, #0
-	mcr     p15, 2, r0, c0, c0, 0   @ set cache level to L1
-	mrc     p15, 1, r0, c0, c0, 0   @ read CCSIDR
+	mcr	CP15_CSSELR(r0)		@ set cache level to L1
+	mrc	CP15_CCSIDR(r0)
 
 	ubfx    r2, r0, #13, #15        @ get num sets - 1 from CCSIDR
 	ubfx    r3, r0, #3, #10         @ get numways - 1 from CCSIDR
@@ -345,7 +347,7 @@ ENTRY(armv7_idcache_inv_all)
 	mov     r2, ip                  @ r2 now contains set way decr
 
 	/* r3 = ways/sets, r2 = way decr, r1 = set decr, r0 and ip are free */
-1:      mcr     p15, 0, r3, c7, c6, 2   @ invalidate line
+1:	mcr	CP15_DCISW(r3)		@ invalidate line
 	movs    r0, r3                  @ get current way/set
 	beq     2f                      @ at 0 means we are done.
 	movs    r0, r0, lsl #10         @ clear way bits leaving only set bits
@@ -355,7 +357,7 @@ ENTRY(armv7_idcache_inv_all)
 
 2:	dsb                             @ wait for stores to finish
 	mov     r0, #0                  @ and ...
-	mcr     p15, 0, r0, c7, c5, 0   @ invalidate instruction+branch cache
+	mcr	CP15_ICIALLU		@ invalidate instruction+branch cache
 	isb                             @ instruction sync barrier
 	bx      lr                      @ return
 END(armv7_idcache_inv_all)
diff --git a/sys/arm/arm/cpufunc_asm_sheeva.S b/sys/arm/arm/cpufunc_asm_sheeva.S
index bd731fbddfe8..99b09a959c06 100644
--- a/sys/arm/arm/cpufunc_asm_sheeva.S
+++ b/sys/arm/arm/cpufunc_asm_sheeva.S
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/armreg.h>
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
@@ -42,7 +43,7 @@ __FBSDID("$FreeBSD$");
 ENTRY(sheeva_setttb)
 	/* Disable irqs */
 	mrs	r2, cpsr
-	orr	r3, r2, #I32_bit | F32_bit
+	orr	r3, r2, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 
 	mov	r1, #0
@@ -87,7 +88,7 @@ ENTRY(sheeva_dcache_wbinv_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c15, 0	/* Clean and inv zone start address */
 	mcr	p15, 5, r2, c15, c15, 1	/* Clean and inv zone end address */
@@ -130,7 +131,7 @@ ENTRY(sheeva_idcache_wbinv_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c15, 0	/* Clean and inv zone start address */
 	mcr	p15, 5, r2, c15, c15, 1	/* Clean and inv zone end address */
@@ -182,7 +183,7 @@ ENTRY(sheeva_dcache_inv_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c14, 0	/* Inv zone start address */
 	mcr	p15, 5, r2, c15, c14, 1	/* Inv zone end address */
@@ -225,7 +226,7 @@ ENTRY(sheeva_dcache_wb_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 5, r0, c15, c13, 0	/* Clean zone start address */
 	mcr	p15, 5, r2, c15, c13, 1	/* Clean zone end address */
@@ -268,7 +269,7 @@ ENTRY(sheeva_l2cache_wbinv_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c9, 4	/* Clean L2 zone start address */
 	mcr	p15, 1, r2, c15, c9, 5	/* Clean L2 zone end address */
@@ -313,7 +314,7 @@ ENTRY(sheeva_l2cache_inv_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c11, 4	/* Inv L2 zone start address */
 	mcr	p15, 1, r2, c15, c11, 5	/* Inv L2 zone end address */
@@ -356,7 +357,7 @@ ENTRY(sheeva_l2cache_wb_range)
 	add	r3, r0, ip
 	sub	r2, r3, #1
 	/* Disable irqs */
-	orr	r3, lr, #I32_bit | F32_bit
+	orr	r3, lr, #PSR_I | PSR_F
 	msr	cpsr_c, r3
 	mcr	p15, 1, r0, c15, c9, 4	/* Clean L2 zone start address */
 	mcr	p15, 1, r2, c15, c9, 5	/* Clean L2 zone end address */
@@ -379,7 +380,7 @@ END(sheeva_l2cache_wb_range)
 ENTRY(sheeva_l2cache_wbinv_all)
 	/* Disable irqs */
 	mrs	r1, cpsr
-	orr	r2, r1, #I32_bit | F32_bit
+	orr	r2, r1, #PSR_I | PSR_F
 	msr	cpsr_c, r2
 
 	mov	r0, #0
diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index fb99dea7cce4..3031b8c150f9 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -71,7 +71,7 @@
  *
  * XScale assembly functions for CPU / MMU / TLB specific operations
  */
-
+#include <machine/armreg.h>
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
@@ -135,7 +135,7 @@ END(xscale_control)
 ENTRY(xscale_setttb)
 #ifdef CACHE_CLEAN_BLOCK_INTR
 	mrs	r3, cpsr
-	orr	r1, r3, #(I32_bit | F32_bit)
+	orr	r1, r3, #(PSR_I | PSR_F)
 	msr	cpsr_fsxc, r1
 #else
 	ldr	r3, .Lblock_userspace_access
@@ -267,7 +267,7 @@ _C_LABEL(xscale_minidata_clean_size):
 #ifdef CACHE_CLEAN_BLOCK_INTR
 #define	XSCALE_CACHE_CLEAN_BLOCK					\
 	mrs	r3, cpsr					;	\
-	orr	r0, r3, #(I32_bit | F32_bit)			;	\
+	orr	r0, r3, #(PSR_I | PSR_F)			;	\
 	msr	cpsr_fsxc, r0
 
 #define	XSCALE_CACHE_CLEAN_UNBLOCK					\
diff --git a/sys/arm/arm/cpufunc_asm_xscale_c3.S b/sys/arm/arm/cpufunc_asm_xscale_c3.S
index 0fdb39c2cd64..6766a327156a 100644
--- a/sys/arm/arm/cpufunc_asm_xscale_c3.S
+++ b/sys/arm/arm/cpufunc_asm_xscale_c3.S
@@ -73,6 +73,7 @@
  * XScale core 3 assembly functions for CPU / MMU / TLB specific operations
  */
 
+#include <machine/armreg.h>
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
@@ -122,7 +123,7 @@ __FBSDID("$FreeBSD$");
 #define	XSCALE_CACHE_CLEAN_BLOCK					\
 	stmfd	sp!, {r4}					;	\
 	mrs	r4, cpsr					;	\
-	orr	r0, r4, #(I32_bit | F32_bit)			;	\
+	orr	r0, r4, #(PSR_I | PSR_F)			;	\
 	msr	cpsr_fsxc, r0
 
 #define	XSCALE_CACHE_CLEAN_UNBLOCK					\
@@ -350,7 +351,7 @@ END(xscalec3_l2cache_flush_rng)
 ENTRY(xscalec3_setttb)
 #ifdef CACHE_CLEAN_BLOCK_INTR
 	mrs	r3, cpsr
-	orr	r1, r3, #(I32_bit | F32_bit)
+	orr	r1, r3, #(PSR_I | PSR_F)
 	msr	cpsr_fsxc, r1
 #else
 	ldr	r3, .Lblock_userspace_access
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index 7f79654d3719..5cef9657600c 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -244,12 +244,12 @@ __FBSDID("$FreeBSD$");
 #define	DO_AST								\
 	ldr	r0, [sp]		/* Get the SPSR from stack */	;\
 	mrs	r4, cpsr		/* save CPSR */			;\
-	orr	r1, r4, #(I32_bit|F32_bit)				;\
+	orr	r1, r4, #(PSR_I|PSR_F)					;\
 	msr	cpsr_c, r1		/* Disable interrupts */	;\
 	and	r0, r0, #(PSR_MODE)	/* Returning to USR mode? */	;\
 	teq	r0, #(PSR_USR32_MODE)					;\
 	bne	2f			/* Nope, get out now */		;\
-	bic	r4, r4, #(I32_bit|F32_bit)				;\
+	bic	r4, r4, #(PSR_I|PSR_F)					;\
 1:	GET_CURTHREAD_PTR(r5)						;\
 	ldr	r1, [r5, #(TD_FLAGS)]					;\
 	and	r1, r1, #(TDF_ASTPENDING|TDF_NEEDRESCHED)		;\
@@ -258,7 +258,7 @@ __FBSDID("$FreeBSD$");
 	msr	cpsr_c, r4		/* Restore interrupts */	;\
 	mov	r0, sp							;\
 	bl	_C_LABEL(ast)		/* ast(frame) */		;\
-	orr	r0, r4, #(I32_bit|F32_bit)				;\
+	orr	r0, r4, #(PSR_I|PSR_F)					;\
 	msr	cpsr_c, r0						;\
 	b	1b							;\
 2:
@@ -382,7 +382,7 @@ END(irq_entry)
  */
 ASENTRY_NP(fiq_entry)
 	mrs	r8, cpsr		/* FIQ handling isn't supported, */
-	bic	r8, #(F32_bit)		/* just disable FIQ and return.  */
+	bic	r8, #(PSR_F)		/* just disable FIQ and return.  */
 	msr	cpsr_c, r8		/* The r8 we trash here is the  */
 	subs	pc, lr, #4		/* banked FIQ-mode r8. */
 END(fiq_entry)
diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c
index d9dbb5e155f9..08f867083e9e 100644
--- a/sys/arm/arm/fiq.c
+++ b/sys/arm/arm/fiq.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
+#include <machine/armreg.h>
 #include <machine/cpufunc.h>
 #include <machine/fiq.h>
 #include <vm/vm.h>
@@ -54,9 +55,6 @@ TAILQ_HEAD(, fiqhandler) fiqhandler_stack =
 extern char *fiq_nullhandler_code;
 extern uint32_t fiq_nullhandler_size;
 
-#define	IRQ_BIT		I32_bit
-#define	FIQ_BIT		F32_bit
-
 /*
  * fiq_installhandler:
  *
@@ -102,7 +100,7 @@ fiq_claim(struct fiqhandler *fh)
 	if (fh->fh_size > 0x100)
 		return (EFBIG);
 
-	oldirqstate = disable_interrupts(FIQ_BIT);
+	oldirqstate = disable_interrupts(PSR_F);
 
 	if ((ofh = TAILQ_FIRST(&fiqhandler_stack)) != NULL) {
 		if ((ofh->fh_flags & FH_CANPUSH) == 0) {
@@ -125,7 +123,7 @@ fiq_claim(struct fiqhandler *fh)
 	fiq_installhandler(fh->fh_func, fh->fh_size);
 
 	/* Make sure FIQs are enabled when we return. */
-	oldirqstate &= ~FIQ_BIT;
+	oldirqstate &= ~PSR_F;
 
  out:
 	restore_interrupts(oldirqstate);
@@ -143,7 +141,7 @@ fiq_release(struct fiqhandler *fh)
 	u_int oldirqstate;
 	struct fiqhandler *ofh;
 
-	oldirqstate = disable_interrupts(FIQ_BIT);
+	oldirqstate = disable_interrupts(PSR_F);
 
 	/*
 	 * If we are the currently active FIQ handler, then we
@@ -167,7 +165,7 @@ fiq_release(struct fiqhandler *fh)
 		fiq_installhandler(fiq_nullhandler_code, fiq_nullhandler_size);
 
 		/* Make sure FIQs are disabled when we return. */
-		oldirqstate |= FIQ_BIT;
+		oldirqstate |= PSR_F;
 	}
 
 	restore_interrupts(oldirqstate);
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index df7d0cd0b9b7..d9b42fcedae0 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 
 #define	GT_CNTKCTL_PL0PTEN	(1 << 9) /* PL0 Physical timer reg access */
 #define	GT_CNTKCTL_PL0VTEN	(1 << 8) /* PL0 Virtual timer reg access */
-#define	GT_CNTKCTL_EVNTI	(1 << 4) /* Virtual counter event bits */
+#define	GT_CNTKCTL_EVNTI	(0xf << 4) /* Virtual counter event bits */
 #define	GT_CNTKCTL_EVNTDIR	(1 << 3) /* Virtual counter event transition */
 #define	GT_CNTKCTL_EVNTEN	(1 << 2) /* Enables virtual counter events */
 #define	GT_CNTKCTL_PL0VCTEN	(1 << 1) /* PL0 CNTVCT and CNTFRQ access */
@@ -78,6 +78,7 @@ struct arm_tmr_softc {
 	void			*ihl[4];
 	uint32_t		clkfreq;
 	struct eventtimer	et;
+	bool			physical;
 };
 
 static struct arm_tmr_softc *arm_tmr_sc = NULL;
@@ -101,81 +102,83 @@ static struct timecounter arm_tmr_timecount = {
 	.tc_quality        = 1000,
 };
 
-static inline int
+static int
 get_freq(void)
 {
 	uint32_t val;
 
+	/* cntfrq */
 	__asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (val));
 
 	return (val);
 }
 
-static inline int
-set_freq(uint32_t val)
-{
-
-	__asm volatile("mcr p15, 0, %[val], c14, c0, 0" : :
-	    [val] "r" (val));
-	isb();
-
-	return (val);
-}
-
-
-static inline long
-get_cntpct(void)
+static long
+get_cntxct(bool physical)
 {
 	uint64_t val;
 
-	__asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (val));
+	isb();
+	if (physical)
+		/* cntpct */
+		__asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (val));
+	else
+		/* cntvct */
+		__asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (val));
 
 	return (val);
 }
 
-static inline int
-set_ctrl(uint32_t val)
+static int
+set_ctrl(uint32_t val, bool physical)
 {
 
-	__asm volatile("mcr p15, 0, %[val], c14, c2, 1" : :
-	    [val] "r" (val));
+	if (physical)
+		/* cntp_ctl */
+		__asm volatile("mcr p15, 0, %[val], c14, c2, 1" : :
+		    [val] "r" (val));
+	else
+		/* cntv_ctl */
+		__asm volatile("mcr p15, 0, %[val], c14, c3, 1" : :
+		    [val] "r" (val));
 	isb();
 
 	return (0);
 }
 
-static inline int
-set_tval(uint32_t val)
+static int
+set_tval(uint32_t val, bool physical)
 {
 
-	__asm volatile("mcr p15, 0, %[val], c14, c2, 0" : :
-	    [val] "r" (val));
+	if (physical)
+		/* cntp_tval */
+		__asm volatile("mcr p15, 0, %[val], c14, c2, 0" : :
+		    [val] "r" (val));
+	else
+		/* cntv_tval */
+		__asm volatile("mcr p15, 0, %[val], c14, c3, 0" : :
+		    [val] "r" (val));
 	isb();
 
 	return (0);
 }
 
-static inline int
-get_ctrl(void)
+static int
+get_ctrl(bool physical)
 {
 	uint32_t val;
 
-	__asm volatile("mrc p15, 0, %0, c14, c2, 1" : "=r" (val));
+	if (physical)
+		/* cntp_ctl */
+		__asm volatile("mrc p15, 0, %0, c14, c2, 1" : "=r" (val));
+	else
+		/* cntv_ctl */
+		__asm volatile("mrc p15, 0, %0, c14, c3, 1" : "=r" (val));
 
 	return (val);
 }
 
-static inline int
-get_tval(void)
-{
-	uint32_t val;
-
-	__asm volatile("mrc p15, 0, %0, c14, c2, 0" : "=r" (val));
-
-	return (val);
-}
-
-static inline void
+static void
 disable_user_access(void)
 {
 	uint32_t cntkctl;
@@ -191,7 +194,7 @@ static unsigned
 arm_tmr_get_timecount(struct timecounter *tc)
 {
 
-	return (get_cntpct());
+	return (get_cntxct(arm_tmr_sc->physical));
 }
 
 static int
@@ -204,11 +207,11 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 
 	if (first != 0) {
 		counts = ((uint32_t)et->et_frequency * first) >> 32;
-		ctrl = get_ctrl();
+		ctrl = get_ctrl(sc->physical);
 		ctrl &= ~GT_CTRL_INT_MASK;
 		ctrl |= GT_CTRL_ENABLE;
-		set_tval(counts);
-		set_ctrl(ctrl);
+		set_tval(counts, sc->physical);
+		set_ctrl(ctrl, sc->physical);
 		return (0);
 	}
 
@@ -219,11 +222,14 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 static int
 arm_tmr_stop(struct eventtimer *et)
 {
+	struct arm_tmr_softc *sc;
 	int ctrl;
 
-	ctrl = get_ctrl();
+	sc = (struct arm_tmr_softc *)et->et_priv;
+
+	ctrl = get_ctrl(sc->physical);
 	ctrl &= GT_CTRL_ENABLE;
-	set_ctrl(ctrl);
+	set_ctrl(ctrl, sc->physical);
 
 	return (0);
 }
@@ -235,10 +241,10 @@ arm_tmr_intr(void *arg)
 	int ctrl;
 
 	sc = (struct arm_tmr_softc *)arg;
-	ctrl = get_ctrl();
+	ctrl = get_ctrl(sc->physical);
 	if (ctrl & GT_CTRL_INT_STAT) {
 		ctrl |= GT_CTRL_INT_MASK;
-		set_ctrl(ctrl);
+		set_ctrl(ctrl, sc->physical);
 	}
 
 	if (sc->et.et_active)
@@ -295,12 +301,14 @@ arm_tmr_attach(device_t dev)
 	if (bus_alloc_resources(dev, timer_spec, sc->res)) {
 		device_printf(dev, "could not allocate resources\n");
 		return (ENXIO);
-	};
+	}
+
+	sc->physical = true;
 
 	arm_tmr_sc = sc;
 
-	/* Setup secure and non-secure IRQs handler */
-	for (i = 0; i < 2; i++) {
+	/* Setup secure, non-secure and virtual IRQs handler */
+	for (i = 0; i < 3; i++) {
 		error = bus_setup_intr(dev, sc->res[i], INTR_TYPE_CLK,
 		    arm_tmr_intr, NULL, sc, &sc->ihl[i]);
 		if (error) {
@@ -381,10 +389,10 @@ DELAY(int usec)
 	else
 		counts = usec * counts_per_usec;
 
-	first = get_cntpct();
+	first = get_cntxct(arm_tmr_sc->physical);
 
 	while (counts > 0) {
-		last = get_cntpct();
+		last = get_cntxct(arm_tmr_sc->physical);
 		counts -= (int32_t)(last - first);
 		first = last;
 	}
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 9a9275b08d6a..9e15f8bc2858 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -83,7 +83,11 @@ __FBSDID("$FreeBSD$");
 #define GICC_ABPR		0x001C			/* v1 ICCABPR */
 #define GICC_IIDR		0x00FC			/* v1 ICCIIDR*/
 
-#define	GIC_LAST_IPI		15	/* Irqs 0-15 are IPIs. */
+#define	GIC_FIRST_IPI		 0	/* Irqs 0-15 are SGIs/IPIs. */
+#define	GIC_LAST_IPI		15
+#define	GIC_FIRST_PPI		16	/* Irqs 16-31 are private (per */
+#define	GIC_LAST_PPI		31	/* core) peripheral interrupts. */
+#define	GIC_FIRST_SPI		32	/* Irqs 32+ are shared peripherals. */
 
 /* First bit is a polarity bit (0 - low, 1 - high) */
 #define GICD_ICFGR_POL_LOW	(0 << 0)
@@ -127,6 +131,17 @@ static int gic_config_irq(int irq, enum intr_trigger trig,
     enum intr_polarity pol);
 static void gic_post_filter(void *);
 
+static struct ofw_compat_data compat_data[] = {
+	{"arm,gic",		true},	/* Non-standard, used in FreeBSD dts. */
+	{"arm,gic-400",		true},
+	{"arm,cortex-a15-gic",	true},
+	{"arm,cortex-a9-gic",	true},
+	{"arm,cortex-a7-gic",	true},
+	{"arm,arm11mp-gic",	true},
+	{"brcm,brahma-b15-gic",	true},
+	{NULL,			false}
+};
+
 static int
 arm_gic_probe(device_t dev)
 {
@@ -134,7 +149,7 @@ arm_gic_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "arm,gic"))
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
 		return (ENXIO);
 	device_set_desc(dev, "ARM Generic Interrupt Controller");
 	return (BUS_PROBE_DEFAULT);
@@ -166,11 +181,59 @@ gic_init_secondary(void)
 	/* Enable interrupt distribution */
 	gic_d_write_4(GICD_CTLR, 0x01);
 
-	/* Activate IRQ 29-30, ie private timer (secure & non-secure) IRQs */
+	/*
+	 * Activate the timer interrupts: virtual, secure, and non-secure.
+	 */
+	gic_d_write_4(GICD_ISENABLER(27 >> 5), (1UL << (27 & 0x1F)));
 	gic_d_write_4(GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F)));
 	gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F)));
 }
 
+int
+gic_decode_fdt(uint32_t iparent, uint32_t *intr, int *interrupt,
+    int *trig, int *pol)
+{
+	static u_int num_intr_cells;
+
+	if (num_intr_cells == 0) {
+		if (OF_searchencprop(OF_node_from_xref(iparent), 
+		    "#interrupt-cells", &num_intr_cells, 
+		    sizeof(num_intr_cells)) == -1) {
+			num_intr_cells = 1;
+		}
+	}
+
+	if (num_intr_cells == 1) {
+		*interrupt = fdt32_to_cpu(intr[0]);
+		*trig = INTR_TRIGGER_CONFORM;
+		*pol = INTR_POLARITY_CONFORM;
+	} else {
+		if (intr[0] == 0)
+			*interrupt = fdt32_to_cpu(intr[1]) + GIC_FIRST_SPI;
+		else
+			*interrupt = fdt32_to_cpu(intr[1]) + GIC_FIRST_PPI;
+		/*
+		 * In intr[2], bits[3:0] are trigger type and level flags.
+		 *   1 = low-to-high edge triggered
+		 *   2 = high-to-low edge triggered
+		 *   4 = active high level-sensitive
+		 *   8 = active low level-sensitive
+		 * The hardware only supports active-high-level or rising-edge.
+		 */
+		if (intr[2] & 0x0a) {
+			printf("unsupported trigger/polarity configuration "
+			    "0x%2x\n", intr[2] & 0x0f);
+			return (ENOTSUP);
+		}
+		*pol  = INTR_POLARITY_CONFORM;
+		if (intr[2] & 0x01)
+			*trig = INTR_TRIGGER_EDGE;
+		else
+			*trig = INTR_TRIGGER_LEVEL;
+	}
+	return (0);
+}
+
 static int
 arm_gic_attach(device_t dev)
 {
@@ -266,6 +329,8 @@ static devclass_t arm_gic_devclass;
 
 EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(gic, ofwbus, arm_gic_driver, arm_gic_devclass, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 static void
 gic_post_filter(void *arg)
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index ff2ae1b36f1d..d245e2a9f07d 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -88,7 +88,7 @@ ASENTRY_NP(_start)
 
 	/* Make sure interrupts are disabled. */
 	mrs	r7, cpsr
-	orr	r7, r7, #(I32_bit|F32_bit)
+	orr	r7, r7, #(PSR_I | PSR_F)
 	msr	cpsr_c, r7
 
 #if defined (FLASHADDR) && defined(LOADERRAMADDR)
@@ -127,10 +127,6 @@ Lram_offset:	.word from_ram-_C_LABEL(_start)
 from_ram:
 	nop
 #endif
-	adr	r7, Lunmapped
-	bic     r7, r7, #0xf0000000
-	orr     r7, r7, #PHYSADDR
-
 
 disable_mmu:
 	/* Disable MMU for a while */
@@ -144,7 +140,8 @@ disable_mmu:
 	nop
 	nop
 	nop
-	mov	pc, r7
+	CPWAIT(r0)
+
 Lunmapped:
 	/*
 	 * Build page table from scratch.
@@ -152,21 +149,7 @@ Lunmapped:
 
 	/* Find the delta between VA and PA */
 	adr	r0, Lpagetable
-	ldr	r1, [r0]
-	sub	r2, r1, r0
-	/* At this point: r2 = VA - PA */
-
-	/*
-	 * Find the physical address of the table. After these two
-	 * instructions:
-	 * r1 = va(pagetable)
-	 *
-	 * r0 = va(pagetable) - (VA - PA)
-	 *    = va(pagetable) - VA + PA
-	 *    = pa(pagetable)
-	 */
-	ldr	r1, [r0, #4]
-	sub	r0, r1, r2
+	bl	translate_va_to_pa
 
 #ifndef _ARM_ARCH_6
 	/*
@@ -289,6 +272,41 @@ virt_done:
 	/* NOTREACHED */
 END(_start)
 
+#define VA_TO_PA_POINTER(name, table)	 \
+name:					;\
+	.word	.			;\
+	.word	table
+
+/*
+ * Returns the physical address of a magic va to pa pointer.
+ * r0     - The pagetable data pointer. This must be built using the
+ *          VA_TO_PA_POINTER macro.
+ *          e.g.
+ *            VA_TO_PA_POINTER(Lpagetable, pagetable)
+ *            ...
+ *            adr  r0, Lpagetable
+ *            bl   translate_va_to_pa
+ *            r0 will now contain the physical address of pagetable
+ * r1, r2 - Trashed
+ */
+translate_va_to_pa:
+	ldr	r1, [r0]
+	sub	r2, r1, r0
+	/* At this point: r2 = VA - PA */
+
+	/*
+	 * Find the physical address of the table. After these two
+	 * instructions:
+	 * r1 = va(pagetable)
+	 *
+	 * r0 = va(pagetable) - (VA - PA)
+	 *    = va(pagetable) - VA + PA
+	 *    = pa(pagetable)
+	 */
+	ldr	r1, [r0, #4]
+	sub	r0, r1, r2
+	RET
+
 /*
  * Builds the page table
  * r0 - The table base address
@@ -320,14 +338,8 @@ build_pagetables:
 
 	RET
 
-Lpagetable:
-	.word	.
-	.word	pagetable
+VA_TO_PA_POINTER(Lpagetable, pagetable)
 
-Lvirtaddr:
-	.word	KERNVIRTADDR
-Lphysaddr:
-	.word	KERNPHYSADDR
 Lreal_start:
 	.word	_start
 Lend:
@@ -368,14 +380,13 @@ pagetable:
 
 .Lmpvirt_done:
 	.word	mpvirt_done
-Lstartup_pagetable_secondary:
-	.word	temp_pagetable
+VA_TO_PA_POINTER(Lstartup_pagetable_secondary, temp_pagetable)
 
 ASENTRY_NP(mpentry)
 
 	/* Make sure interrupts are disabled. */
 	mrs	r7, cpsr
-	orr	r7, r7, #(I32_bit|F32_bit)
+	orr	r7, r7, #(PSR_I | PSR_F)
 	msr	cpsr_c, r7
 
 	/* Disable MMU.  It should be disabled already, but make sure. */
@@ -396,10 +407,12 @@ ASENTRY_NP(mpentry)
 	bl	armv7_idcache_inv_all	/* Modifies r0-r3, ip */
 #endif
 
-	ldr	r0, Lstartup_pagetable_secondary
-	bic	r0, r0, #0xf0000000
-	orr	r0, r0, #PHYSADDR
+	/* Load the page table physical address */
+	adr	r0, Lstartup_pagetable_secondary
+	bl	translate_va_to_pa
+	/* Load the address the secondary page table */
 	ldr	r0, [r0]
+
 	orr 	r0, r0, #2		/* Set TTB shared memory flag */
 	mcr	p15, 0, r0, c2, c0, 0	/* Set TTB */
 	mcr	p15, 0, r0, c8, c7, 0	/* Flush TLB */
@@ -453,7 +466,7 @@ ENTRY_NP(cpu_halt)
 	mrs     r2, cpsr
 	bic	r2, r2, #(PSR_MODE)
 	orr     r2, r2, #(PSR_SVC32_MODE)
-	orr	r2, r2, #(I32_bit | F32_bit)
+	orr	r2, r2, #(PSR_I | PSR_F)
 	msr     cpsr_fsxc, r2
 
 	ldr	r4, .Lcpu_reset_address
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 94d708163446..98c424e21953 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -111,6 +111,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 #endif
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 #ifdef DEBUG
 #define	debugf(fmt, args...) printf(fmt, ##args)
 #else
@@ -131,9 +135,6 @@ int _min_memcpy_size = 0;
 int _min_bzero_size = 0;
 
 extern int *end;
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
 
 #ifdef FDT
 /*
@@ -620,7 +621,7 @@ spinlock_enter(void)
 
 	td = curthread;
 	if (td->td_md.md_spinlock_count == 0) {
-		cspr = disable_interrupts(I32_bit | F32_bit);
+		cspr = disable_interrupts(PSR_I | PSR_F);
 		td->td_md.md_spinlock_count = 1;
 		td->td_md.md_saved_cspr = cspr;
 	} else
@@ -747,7 +748,7 @@ sys_sigreturn(td, uap)
 	 */
 	spsr = uc.uc_mcontext.__gregs[_REG_CPSR];
 	if ((spsr & PSR_MODE) != PSR_USR32_MODE ||
-	    (spsr & (I32_bit | F32_bit)) != 0)
+	    (spsr & (PSR_I | PSR_F)) != 0)
 		return (EINVAL);
 		/* Restore register context. */
 	set_mcontext(td, &uc.uc_mcontext);
@@ -817,8 +818,7 @@ fake_preload_metadata(struct arm_boot_params *abp __unused)
 		lastaddr = *(uint32_t *)(KERNVIRTADDR + 8);
 		zend = lastaddr;
 		zstart = *(uint32_t *)(KERNVIRTADDR + 4);
-		ksym_start = zstart;
-		ksym_end = zend;
+		db_fetch_ksymtab(zstart, zend);
 	} else
 #endif
 		lastaddr = (vm_offset_t)&end;
@@ -912,6 +912,10 @@ freebsd_parse_boot_param(struct arm_boot_params *abp)
 	vm_offset_t lastaddr = 0;
 	void *mdp;
 	void *kmdp;
+#ifdef DDB
+	vm_offset_t ksym_start;
+	vm_offset_t ksym_end;
+#endif
 
 	/*
 	 * Mask metadata pointer: it is supposed to be on page boundary. If
@@ -934,6 +938,7 @@ freebsd_parse_boot_param(struct arm_boot_params *abp)
 #ifdef DDB
 	ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t);
 	ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
+	db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
 	preload_addr_relocate = KERNVIRTADDR - abp->abp_physaddr;
 	return lastaddr;
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index 85ea2827c25c..13f32428b65d 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -154,7 +154,7 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz)
 			sz -= len;
 		} else {
 			for (i = 0; i < len; i += PAGE_SIZE)
-				dump_va = pmap_kenter_temp(pa + i,
+				dump_va = pmap_kenter_temporary(pa + i,
 				    (i + fragsz) >> PAGE_SHIFT);
 			fragsz += len;
 			pa += len;
@@ -244,7 +244,7 @@ minidumpsys(struct dumperinfo *di)
 		}
 		if (pmap_pde_v(pdp) && pmap_pde_page(pdp)) {
 			/* Set bit for each valid page in this 1MB block */
-			addr = pmap_kenter_temp(*pdp & L1_C_ADDR_MASK, 0);
+			addr = pmap_kenter_temporary(*pdp & L1_C_ADDR_MASK, 0);
 			pt = (pt_entry_t*)(addr +
 			    (((uint32_t)*pdp  & L1_C_ADDR_MASK) & PAGE_MASK));
 			for (k = 0; k < 256; k++) {
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index 6b16ad3fb26b..a1b29c112cb4 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 
+#include <machine/armreg.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/smp.h>
@@ -236,7 +237,7 @@ init_secondary(int cpu)
 				
 	for (int i = start; i <= end; i++)
 		arm_unmask_irq(i);
-	enable_interrupts(I32_bit);
+	enable_interrupts(PSR_I);
 
 	loop_counter = 0;
 	while (smp_started == 0) {
diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
index 3f87a2a94452..62c5344a0069 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -97,36 +97,25 @@ __FBSDID("$FreeBSD$");
 #define GBL_TIMER_INTR_EVENT           (1UL << 0)
 
 struct arm_tmr_softc {
-	struct resource *	tmr_res[4];
-	bus_space_tag_t		prv_bst;
-	bus_space_tag_t		gbl_bst;
-	bus_space_handle_t	prv_bsh;
-	bus_space_handle_t	gbl_bsh;
+	device_t		dev;
+	int			irqrid;
+	int			memrid;
+	struct resource *	gbl_mem;
+	struct resource *	prv_mem;
+	struct resource *	prv_irq;
 	uint64_t		clkfreq;
 	struct eventtimer	et;
 };
 
-static struct resource_spec arm_tmr_spec[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },	/* Global registers */
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },    /* Global timer interrupt (unused) */
-	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },	/* Private (per-CPU) registers */
-	{ SYS_RES_IRQ,		1,	RF_ACTIVE },    /* Private timer interrupt */
-	{ -1, 0 }
-};
-
-static struct arm_tmr_softc *arm_tmr_sc = NULL;
-
-static uint64_t platform_arm_tmr_freq = 0;
-
-#define	tmr_prv_read_4(reg)		\
-    bus_space_read_4(arm_tmr_sc->prv_bst, arm_tmr_sc->prv_bsh, reg)
-#define	tmr_prv_write_4(reg, val)		\
-    bus_space_write_4(arm_tmr_sc->prv_bst, arm_tmr_sc->prv_bsh, reg, val)
-#define	tmr_gbl_read_4(reg)		\
-    bus_space_read_4(arm_tmr_sc->gbl_bst, arm_tmr_sc->gbl_bsh, reg)
-#define	tmr_gbl_write_4(reg, val)		\
-    bus_space_write_4(arm_tmr_sc->gbl_bst, arm_tmr_sc->gbl_bsh, reg, val)
+static struct eventtimer *arm_tmr_et;
+static struct timecounter *arm_tmr_tc;
+static uint64_t arm_tmr_freq;
+static boolean_t arm_tmr_freq_varies;
 
+#define	tmr_prv_read_4(sc, reg)         bus_read_4((sc)->prv_mem, reg)
+#define	tmr_prv_write_4(sc, reg, val)   bus_write_4((sc)->prv_mem, reg, val)
+#define	tmr_gbl_read_4(sc, reg)         bus_read_4((sc)->gbl_mem, reg)
+#define	tmr_gbl_write_4(sc, reg, val)   bus_write_4((sc)->gbl_mem, reg, val)
 
 static timecounter_get_t arm_tmr_get_timecount;
 
@@ -139,6 +128,21 @@ static struct timecounter arm_tmr_timecount = {
 	.tc_quality        = 800,
 };
 
+#define	TMR_GBL		0x01
+#define	TMR_PRV		0x02
+#define	TMR_BOTH	(TMR_GBL | TMR_PRV)
+#define	TMR_NONE	0
+
+static struct ofw_compat_data compat_data[] = {
+	{"arm,mpcore-timers",		TMR_BOTH}, /* Non-standard, FreeBSD. */
+	{"arm,cortex-a9-global-timer",	TMR_GBL},
+	{"arm,cortex-a5-global-timer",	TMR_GBL},
+	{"arm,cortex-a9-twd-timer",	TMR_PRV},
+	{"arm,cortex-a5-twd-timer",	TMR_PRV},
+	{"arm,arm11mp-twd-timer",	TMR_PRV},
+	{NULL,				TMR_NONE}
+};
+
 /**
  *	arm_tmr_get_timecount - reads the timecount (global) timer
  *	@tc: pointer to arm_tmr_timecount struct
@@ -152,7 +156,10 @@ static struct timecounter arm_tmr_timecount = {
 static unsigned
 arm_tmr_get_timecount(struct timecounter *tc)
 {
-	return (tmr_gbl_read_4(GBL_TIMER_COUNT_LOW));
+	struct arm_tmr_softc *sc;
+
+	sc = tc->tc_priv;
+	return (tmr_gbl_read_4(sc, GBL_TIMER_COUNT_LOW));
 }
 
 /**
@@ -172,11 +179,13 @@ arm_tmr_get_timecount(struct timecounter *tc)
 static int
 arm_tmr_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 {
+	struct arm_tmr_softc *sc;
 	uint32_t load, count;
 	uint32_t ctrl;
 
-	tmr_prv_write_4(PRV_TIMER_CTRL, 0);
-	tmr_prv_write_4(PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
+	sc = et->et_priv;
+	tmr_prv_write_4(sc, PRV_TIMER_CTRL, 0);
+	tmr_prv_write_4(sc, PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
 
 	ctrl = PRV_TIMER_CTRL_IRQ_ENABLE | PRV_TIMER_CTRL_TIMER_ENABLE;
 
@@ -191,9 +200,9 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 	else
 		count = load;
 
-	tmr_prv_write_4(PRV_TIMER_LOAD, load);
-	tmr_prv_write_4(PRV_TIMER_COUNT, count);
-	tmr_prv_write_4(PRV_TIMER_CTRL, ctrl);
+	tmr_prv_write_4(sc, PRV_TIMER_LOAD, load);
+	tmr_prv_write_4(sc, PRV_TIMER_COUNT, count);
+	tmr_prv_write_4(sc, PRV_TIMER_CTRL, ctrl);
 
 	return (0);
 }
@@ -210,8 +219,11 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 static int
 arm_tmr_stop(struct eventtimer *et)
 {
-	tmr_prv_write_4(PRV_TIMER_CTRL, 0);
-	tmr_prv_write_4(PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
+	struct arm_tmr_softc *sc;
+
+	sc = et->et_priv;
+	tmr_prv_write_4(sc, PRV_TIMER_CTRL, 0);
+	tmr_prv_write_4(sc, PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
 	return (0);
 }
 
@@ -227,13 +239,12 @@ arm_tmr_stop(struct eventtimer *et)
 static int
 arm_tmr_intr(void *arg)
 {
-	struct arm_tmr_softc *sc = (struct arm_tmr_softc *)arg;
-
-	tmr_prv_write_4(PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
+	struct arm_tmr_softc *sc;
 
+	sc = arg;
+	tmr_prv_write_4(sc, PRV_TIMER_INTR, PRV_TIMER_INTR_EVENT);
 	if (sc->et.et_active)
 		sc->et.et_event_cb(&sc->et, sc->et.et_arg);
-
 	return (FILTER_HANDLED);
 }
 
@@ -257,94 +268,74 @@ arm_tmr_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "arm,mpcore-timers"))
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == TMR_NONE)
 		return (ENXIO);
 
 	device_set_desc(dev, "ARM MPCore Timers");
 	return (BUS_PROBE_DEFAULT);
 }
 
-/**
- *	arm_tmr_attach - attaches the timer to the simplebus
- *	@dev: new device
- *
- *	Reserves memory and interrupt resources, stores the softc structure
- *	globally and registers both the timecount and eventtimer objects.
- *
- *	RETURNS
- *	Zero on sucess or ENXIO if an error occuried.
- */
 static int
-arm_tmr_attach(device_t dev)
+attach_tc(struct arm_tmr_softc *sc)
+{
+	int rid;
+
+	if (arm_tmr_tc != NULL)
+		return (EBUSY);
+
+	rid = sc->memrid;
+	sc->gbl_mem = bus_alloc_resource_any(sc->dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->gbl_mem == NULL) {
+		device_printf(sc->dev, "could not allocate gbl mem resources\n");
+		return (ENXIO);
+	}
+	tmr_gbl_write_4(sc, GBL_TIMER_CTRL, 0x00000000);
+
+	arm_tmr_timecount.tc_frequency = sc->clkfreq;
+	arm_tmr_timecount.tc_priv = sc;
+	tc_init(&arm_tmr_timecount);
+	arm_tmr_tc = &arm_tmr_timecount;
+
+	tmr_gbl_write_4(sc, GBL_TIMER_CTRL, GBL_TIMER_CTRL_TIMER_ENABLE);
+
+	return (0);
+}
+
+static int
+attach_et(struct arm_tmr_softc *sc)
 {
-	struct arm_tmr_softc *sc = device_get_softc(dev);
-	phandle_t node;
-	pcell_t clock;
 	void *ihl;
-	boolean_t fixed_freq;
+	int irid, mrid;
 
-	if (arm_tmr_sc)
+	if (arm_tmr_et != NULL)
+		return (EBUSY);
+
+	mrid = sc->memrid;
+	sc->prv_mem = bus_alloc_resource_any(sc->dev, SYS_RES_MEMORY, &mrid,
+	    RF_ACTIVE);
+	if (sc->prv_mem == NULL) {
+		device_printf(sc->dev, "could not allocate prv mem resources\n");
 		return (ENXIO);
-
-	if (platform_arm_tmr_freq == ARM_TMR_FREQUENCY_VARIES) {
-		fixed_freq = false;
-	} else {
-		fixed_freq = true;
-		if (platform_arm_tmr_freq != 0) {
-			sc->clkfreq = platform_arm_tmr_freq;
-		} else {
-			/* Get the base clock frequency */
-			node = ofw_bus_get_node(dev);
-			if ((OF_getencprop(node, "clock-frequency", &clock,
-			    sizeof(clock))) <= 0) {
-				device_printf(dev, "missing clock-frequency "
-				    "attribute in FDT\n");
-				return (ENXIO);
-			}
-			sc->clkfreq = clock;
-		}
 	}
+	tmr_prv_write_4(sc, PRV_TIMER_CTRL, 0x00000000);
 
-	if (bus_alloc_resources(dev, arm_tmr_spec, sc->tmr_res)) {
-		device_printf(dev, "could not allocate resources\n");
+	irid = sc->irqrid;
+	sc->prv_irq = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &irid, RF_ACTIVE);
+	if (sc->prv_irq == NULL) {
+		bus_release_resource(sc->dev, SYS_RES_MEMORY, mrid, sc->prv_mem);
+		device_printf(sc->dev, "could not allocate prv irq resources\n");
 		return (ENXIO);
 	}
 
-	/* Global timer interface */
-	sc->gbl_bst = rman_get_bustag(sc->tmr_res[0]);
-	sc->gbl_bsh = rman_get_bushandle(sc->tmr_res[0]);
-
-	/* Private per-CPU timer interface */
-	sc->prv_bst = rman_get_bustag(sc->tmr_res[2]);
-	sc->prv_bsh = rman_get_bushandle(sc->tmr_res[2]);
-
-	arm_tmr_sc = sc;
-
-	/* Disable both timers to start off */
-	tmr_prv_write_4(PRV_TIMER_CTRL, 0x00000000);
-	tmr_gbl_write_4(GBL_TIMER_CTRL, 0x00000000);
-
-	if (bus_setup_intr(dev, sc->tmr_res[3], INTR_TYPE_CLK, arm_tmr_intr,
+	if (bus_setup_intr(sc->dev, sc->prv_irq, INTR_TYPE_CLK, arm_tmr_intr,
 			NULL, sc, &ihl) != 0) {
-		bus_release_resources(dev, arm_tmr_spec, sc->tmr_res);
-		device_printf(dev, "Unable to setup the clock irq handler.\n");
+		bus_release_resource(sc->dev, SYS_RES_MEMORY, mrid, sc->prv_mem);
+		bus_release_resource(sc->dev, SYS_RES_IRQ, irid, sc->prv_irq);
+		device_printf(sc->dev, "unable to setup the et irq handler.\n");
 		return (ENXIO);
 	}
 
-	/*
-	 * If the clock is fixed-frequency, setup and enable the global timer to
-	 * use as the timecounter.  If it's variable frequency it won't work as
-	 * a timecounter.  We also can't use it for DELAY(), so hopefully the
-	 * platform provides its own implementation.  If it doesn't, ours will
-	 * get used, but since the frequency isn't set, it will only use the
-	 * bogus loop counter.
-	 */
-	if (fixed_freq)  {
-		tmr_gbl_write_4(GBL_TIMER_CTRL, GBL_TIMER_CTRL_TIMER_ENABLE);
-		arm_tmr_timecount.tc_frequency = sc->clkfreq;
-		tc_init(&arm_tmr_timecount);
-	}
-
 	/*
 	 * Setup and register the eventtimer.  Most event timers set their min
 	 * and max period values to some value calculated from the clock
@@ -364,10 +355,87 @@ arm_tmr_attach(device_t dev)
 	sc->et.et_stop = arm_tmr_stop;
 	sc->et.et_priv = sc;
 	et_register(&sc->et);
+	arm_tmr_et = &sc->et;
 
 	return (0);
 }
 
+/**
+ *	arm_tmr_attach - attaches the timer to the simplebus
+ *	@dev: new device
+ *
+ *	Reserves memory and interrupt resources, stores the softc structure
+ *	globally and registers both the timecount and eventtimer objects.
+ *
+ *	RETURNS
+ *	Zero on sucess or ENXIO if an error occuried.
+ */
+static int
+arm_tmr_attach(device_t dev)
+{
+	struct arm_tmr_softc *sc;
+	phandle_t node;
+	pcell_t clock;
+	int et_err, tc_err, tmrtype;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (arm_tmr_freq_varies) {
+		sc->clkfreq = arm_tmr_freq;
+	} else {
+		if (arm_tmr_freq != 0) {
+			sc->clkfreq = arm_tmr_freq;
+		} else {
+			/* Get the base clock frequency */
+			node = ofw_bus_get_node(dev);
+			if ((OF_getencprop(node, "clock-frequency", &clock,
+			    sizeof(clock))) <= 0) {
+				device_printf(dev, "missing clock-frequency "
+				    "attribute in FDT\n");
+				return (ENXIO);
+			}
+			sc->clkfreq = clock;
+		}
+	}
+
+	tmrtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+	tc_err = ENXIO;
+	et_err = ENXIO;
+
+	/*
+	 * If we're handling the global timer and it is fixed-frequency, set it
+	 * up to use as a timecounter.  If it's variable frequency it won't work
+	 * as a timecounter.  We also can't use it for DELAY(), so hopefully the
+	 * platform provides its own implementation. If it doesn't, ours will
+	 * get used, but since the frequency isn't set, it will only use the
+	 * bogus loop counter.
+	 */
+	if (tmrtype & TMR_GBL) {
+		if (!arm_tmr_freq_varies)
+			tc_err = attach_tc(sc);
+		else if (bootverbose)
+			device_printf(sc->dev, 
+			    "not using variable-frequency device as timecounter");
+		sc->memrid++;
+		sc->irqrid++;
+	}
+
+	/* If we are handling the private timer, set it up as an eventtimer. */
+	if (tmrtype & TMR_PRV) {
+		et_err = attach_et(sc);
+	}
+
+	/*
+	 * If we didn't successfully set up a timecounter or eventtimer then we
+	 * didn't actually attach at all, return error.
+	 */
+	if (tc_err != 0 && et_err != 0) {
+		return (ENXIO);
+	}
+	return (0);
+}
+
 static device_method_t arm_tmr_methods[] = {
 	DEVMETHOD(device_probe,		arm_tmr_probe),
 	DEVMETHOD(device_attach,	arm_tmr_attach),
@@ -384,6 +452,8 @@ static devclass_t arm_tmr_devclass;
 
 EARLY_DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
     BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(mp_tmr, ofwbus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
 
 /*
  * Handle a change in clock frequency.  The mpcore timer runs at half the CPU
@@ -404,10 +474,14 @@ void
 arm_tmr_change_frequency(uint64_t newfreq)
 {
 
-	if (arm_tmr_sc == NULL)
-		platform_arm_tmr_freq = newfreq;
-	else
-		et_change_frequency(&arm_tmr_sc->et, newfreq);
+	if (newfreq == ARM_TMR_FREQUENCY_VARIES) {
+		arm_tmr_freq_varies = true;
+		return;
+	}
+
+	arm_tmr_freq = newfreq;
+	if (arm_tmr_et != NULL)
+		et_change_frequency(arm_tmr_et, newfreq);
 }
 
 /**
@@ -424,12 +498,13 @@ arm_tmr_change_frequency(uint64_t newfreq)
 static void __used /* Must emit function code for the weak ref below. */
 arm_tmr_DELAY(int usec)
 {
+	struct arm_tmr_softc *sc;
 	int32_t counts_per_usec;
 	int32_t counts;
 	uint32_t first, last;
 
 	/* Check the timers are setup, if not just use a for loop for the meantime */
-	if (arm_tmr_sc == NULL || arm_tmr_timecount.tc_frequency == 0) {
+	if (arm_tmr_tc == NULL || arm_tmr_timecount.tc_frequency == 0) {
 		for (; usec > 0; usec--)
 			for (counts = 200; counts > 0; counts--)
 				cpufunc_nullop();	/* Prevent gcc from optimizing
@@ -438,6 +513,8 @@ arm_tmr_DELAY(int usec)
 		return;
 	}
 
+	sc = arm_tmr_tc->tc_priv;
+
 	/* Get the number of times to count */
 	counts_per_usec = ((arm_tmr_timecount.tc_frequency / 1000000) + 1);
 
@@ -452,10 +529,10 @@ arm_tmr_DELAY(int usec)
 	else
 		counts = usec * counts_per_usec;
 
-	first = tmr_gbl_read_4(GBL_TIMER_COUNT_LOW);
+	first = tmr_gbl_read_4(sc, GBL_TIMER_COUNT_LOW);
 
 	while (counts > 0) {
-		last = tmr_gbl_read_4(GBL_TIMER_COUNT_LOW);
+		last = tmr_gbl_read_4(sc, GBL_TIMER_COUNT_LOW);
 		counts -= (int32_t)(last - first);
 		first = last;
 	}
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 9725f6480e7d..8b2d609ebb18 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -90,6 +90,8 @@ static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol);
 static	int nexus_deactivate_resource(device_t, device_t, int, int,
     struct resource *);
+static int nexus_release_resource(device_t, device_t, int, int,
+    struct resource *);
 
 static int nexus_setup_intr(device_t dev, device_t child, struct resource *res,
     int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep);
@@ -111,6 +113,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_activate_resource,	nexus_activate_resource),
 	DEVMETHOD(bus_config_intr,	nexus_config_intr),
 	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
+	DEVMETHOD(bus_release_resource,	nexus_release_resource),
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
 #ifdef FDT
@@ -205,6 +208,8 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	struct rman *rm;
 	int needactivate = flags & RF_ACTIVE;
 
+	flags &= ~RF_ACTIVE;
+
 	switch (type) {
 	case SYS_RES_MEMORY:
 	case SYS_RES_IOPORT:
@@ -212,15 +217,14 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		break;
 
 	default:
-		return (0);
+		return (NULL);
 	}
 
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
 	if (rv == 0)
-		return (0);
+		return (NULL);
 
 	rman_set_rid(rv, *rid);
-	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {
 		if (bus_activate_resource(child, type, *rid, rv)) {
@@ -232,6 +236,20 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	return (rv);
 }
 
+static int
+nexus_release_resource(device_t bus, device_t child, int type, int rid,
+    struct resource *res)
+{
+	int error;
+	
+	if (rman_get_flags(res) & RF_ACTIVE) {
+		error = bus_deactivate_resource(child, type, rid, res);
+		if (error)
+			return (error);
+	}
+	return (rman_release_resource(res));
+}
+
 static int
 nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol)
@@ -338,16 +356,16 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells,
     pcell_t *intr)
 {
 	fdt_pic_decode_t intr_decode;
-	phandle_t intr_offset;
+	phandle_t intr_parent;
 	int i, rv, interrupt, trig, pol;
 
-	intr_offset = OF_node_from_xref(iparent);
+	intr_parent = OF_node_from_xref(iparent);
 	for (i = 0; i < icells; i++)
 		intr[i] = cpu_to_fdt32(intr[i]);
 
 	for (i = 0; fdt_pic_table[i] != NULL; i++) {
 		intr_decode = fdt_pic_table[i];
-		rv = intr_decode(intr_offset, intr, &interrupt, &trig, &pol);
+		rv = intr_decode(intr_parent, intr, &interrupt, &trig, &pol);
 
 		if (rv == 0) {
 			/* This was recognized as our PIC and decoded. */
diff --git a/sys/arm/arm/physmem.c b/sys/arm/arm/physmem.c
index d42cac481ace..8618e46e27ae 100644
--- a/sys/arm/arm/physmem.c
+++ b/sys/arm/arm/physmem.c
@@ -168,6 +168,12 @@ regions_to_avail(vm_paddr_t *avail, uint32_t exflags)
 		end   = hwp->size + start;
 		realmem += arm32_btop(end - start);
 		for (exi = 0, exp = exregions; exi < excnt; ++exi, ++exp) {
+			/*
+			 * If the excluded region does not match given flags,
+			 * continue checking with the next excluded region.
+			 */
+			if ((exp->flags & exflags) == 0)
+				continue;
 			xstart = exp->addr;
 			xend   = exp->size + xstart;
 			/*
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 1be98885ec73..c0d5a2ebf629 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -2369,7 +2369,7 @@ pmap_kenter_section(vm_offset_t va, vm_offset_t pa, int flags)
  * to be used for panic dumps.
  */
 void *
-pmap_kenter_temp(vm_paddr_t pa, int i)
+pmap_kenter_temporary(vm_paddr_t pa, int i)
 {
 	vm_offset_t va;
 
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index ec0d236fa978..61afb4d72106 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -2663,7 +2663,7 @@ pmap_kenter_section(vm_offset_t va, vm_offset_t pa, int flags)
  * to be used for panic dumps.
  */
 void *
-pmap_kenter_temp(vm_paddr_t pa, int i)
+pmap_kenter_temporary(vm_paddr_t pa, int i)
 {
 	vm_offset_t va;
 
diff --git a/sys/arm/arm/syscall.c b/sys/arm/arm/syscall.c
new file mode 100644
index 000000000000..94a028a12407
--- /dev/null
+++ b/sys/arm/arm/syscall.c
@@ -0,0 +1,196 @@
+/*	$NetBSD: fault.c,v 1.45 2003/11/20 14:44:36 scw Exp $	*/
+
+/*-
+ * Copyright 2004 Olivier Houchard
+ * Copyright 2003 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed for the NetBSD Project by
+ *      Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+/*-
+ * Copyright (c) 1994-1997 Mark Brinicombe.
+ * Copyright (c) 1994 Brini.
+ * All rights reserved.
+ *
+ * This code is derived from software written for Brini by Mark Brinicombe
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Brini.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRINI ``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 BRINI 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.
+ *
+ * RiscBSD kernel project
+ *
+ * fault.c
+ *
+ * Fault handlers
+ *
+ * Created      : 28/11/94
+ */
+
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/syscall.h>
+#include <sys/sysent.h>
+#include <sys/signalvar.h>
+#include <sys/ptrace.h>
+#include <sys/pioctl.h>
+
+#include <machine/frame.h>
+
+void swi_handler(struct trapframe *);
+
+static __inline void
+call_trapsignal(struct thread *td, int sig, u_long code)
+{
+	ksiginfo_t ksi;
+
+	ksiginfo_init_trap(&ksi);
+	ksi.ksi_signo = sig;
+	ksi.ksi_code = (int)code;
+	trapsignal(td, &ksi);
+}
+
+int
+cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
+{
+	struct proc *p;
+	register_t *ap;
+	int error;
+
+	sa->code = td->td_frame->tf_r7;
+	ap = &td->td_frame->tf_r0;
+	if (sa->code == SYS_syscall) {
+		sa->code = *ap++;
+		sa->nap--;
+	} else if (sa->code == SYS___syscall) {
+		sa->code = ap[_QUAD_LOWWORD];
+		sa->nap -= 2;
+		ap += 2;
+	}
+	p = td->td_proc;
+	if (p->p_sysent->sv_mask)
+		sa->code &= p->p_sysent->sv_mask;
+	if (sa->code >= p->p_sysent->sv_size)
+		sa->callp = &p->p_sysent->sv_table[0];
+	else
+		sa->callp = &p->p_sysent->sv_table[sa->code];
+	sa->narg = sa->callp->sy_narg;
+	error = 0;
+	memcpy(sa->args, ap, sa->nap * sizeof(register_t));
+	if (sa->narg > sa->nap) {
+		error = copyin((void *)td->td_frame->tf_usr_sp, sa->args +
+		    sa->nap, (sa->narg - sa->nap) * sizeof(register_t));
+	}
+	if (error == 0) {
+		td->td_retval[0] = 0;
+		td->td_retval[1] = 0;
+	}
+	return (error);
+}
+
+#include "../../kern/subr_syscall.c"
+
+static void
+syscall(struct thread *td, struct trapframe *frame)
+{
+	struct syscall_args sa;
+	int error;
+
+	sa.nap = 4;
+
+	error = syscallenter(td, &sa);
+	KASSERT(error != 0 || td->td_ar == NULL,
+	    ("returning from syscall with td_ar set!"));
+	syscallret(td, error, &sa);
+}
+
+void
+swi_handler(struct trapframe *frame)
+{
+	struct thread *td = curthread;
+
+	td->td_frame = frame;
+
+	td->td_pticks = 0;
+	/*
+	 * Make sure the program counter is correctly aligned so we
+	 * don't take an alignment fault trying to read the opcode.
+	 * XXX: Fix for Thumb mode
+	 */
+	if (__predict_false(((frame->tf_pc - INSN_SIZE) & 3) != 0)) {
+		call_trapsignal(td, SIGILL, 0);
+		userret(td, frame);
+		return;
+	}
+	/*
+	 * Enable interrupts if they were enabled before the exception.
+	 * Since all syscalls *should* come from user mode it will always
+	 * be safe to enable them, but check anyway.
+	 */
+	if (td->td_md.md_spinlock_count == 0) {
+		if (__predict_true(frame->tf_spsr & PSR_I) == 0)
+			enable_interrupts(PSR_I);
+		if (__predict_true(frame->tf_spsr & PSR_F) == 0)
+			enable_interrupts(PSR_F);
+	}
+
+	syscall(td, frame);
+}
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 32624e3b0373..ec14feb16476 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -79,28 +79,15 @@
  */
 
 
-#include "opt_ktrace.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/syscall.h>
-#include <sys/sysent.h>
 #include <sys/signalvar.h>
-#include <sys/ktr.h>
-#ifdef KTRACE
-#include <sys/uio.h>
-#include <sys/ktrace.h>
-#endif
-#include <sys/ptrace.h>
-#include <sys/pioctl.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -108,28 +95,16 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/armreg.h>
-#include <machine/cpuconf.h>
-#include <machine/vmparam.h>
-#include <machine/frame.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/frame.h>
+#include <machine/machdep.h>
 #include <machine/pcb.h>
-#include <machine/proc.h>
-#include <machine/swi.h>
-
-#include <security/audit/audit.h>
+#include <machine/vmparam.h>
 
 #ifdef KDB
 #include <sys/kdb.h>
 #endif
 
-
-void swi_handler(struct trapframe *);
-
-#include <machine/disassem.h>
-#include <machine/machdep.h>
-
 extern char fusubailout[];
 
 #ifdef DEBUG
@@ -241,10 +216,10 @@ data_abort_handler(struct trapframe *tf)
 	pcb = td->td_pcb;
 	/* Re-enable interrupts if they were enabled previously */
 	if (td->td_md.md_spinlock_count == 0) {
-		if (__predict_true(tf->tf_spsr & I32_bit) == 0)
-			enable_interrupts(I32_bit);
-		if (__predict_true(tf->tf_spsr & F32_bit) == 0)
-			enable_interrupts(F32_bit);
+		if (__predict_true(tf->tf_spsr & PSR_I) == 0)
+			enable_interrupts(PSR_I);
+		if (__predict_true(tf->tf_spsr & PSR_F) == 0)
+			enable_interrupts(PSR_F);
 	}
 
 
@@ -451,7 +426,7 @@ dab_fatal(struct trapframe *tf, u_int fsr, u_int far, struct thread *td,
 
 	mode = TRAP_USERMODE(tf) ? "user" : "kernel";
 
-	disable_interrupts(I32_bit|F32_bit);
+	disable_interrupts(PSR_I|PSR_F);
 	if (td != NULL) {
 		printf("Fatal %s mode data abort: '%s'\n", mode,
 		    data_aborts[fsr & FAULT_TYPE_MASK].desc);
@@ -661,10 +636,10 @@ prefetch_abort_handler(struct trapframe *tf)
 	}
 	fault_pc = tf->tf_pc;
 	if (td->td_md.md_spinlock_count == 0) {
-		if (__predict_true(tf->tf_spsr & I32_bit) == 0)
-			enable_interrupts(I32_bit);
-		if (__predict_true(tf->tf_spsr & F32_bit) == 0)
-			enable_interrupts(F32_bit);
+		if (__predict_true(tf->tf_spsr & PSR_I) == 0)
+			enable_interrupts(PSR_I);
+		if (__predict_true(tf->tf_spsr & PSR_F) == 0)
+			enable_interrupts(PSR_F);
 	}
 
 	/* Prefetch aborts cannot happen in kernel mode */
@@ -775,106 +750,4 @@ badaddr_read(void *addr, size_t size, void *rptr)
 
 	/* Return EFAULT if the address was invalid, else zero */
 	return (rv);
-}
-
-int
-cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
-{
-	struct proc *p;
-	register_t *ap;
-	int error;
-
-#ifdef __ARM_EABI__
-	sa->code = td->td_frame->tf_r7;
-#else
-	sa->code = sa->insn & 0x000fffff;
-#endif
-	ap = &td->td_frame->tf_r0;
-	if (sa->code == SYS_syscall) {
-		sa->code = *ap++;
-		sa->nap--;
-	} else if (sa->code == SYS___syscall) {
-		sa->code = ap[_QUAD_LOWWORD];
-		sa->nap -= 2;
-		ap += 2;
-	}
-	p = td->td_proc;
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
-	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
-	else
-		sa->callp = &p->p_sysent->sv_table[sa->code];
-	sa->narg = sa->callp->sy_narg;
-	error = 0;
-	memcpy(sa->args, ap, sa->nap * sizeof(register_t));
-	if (sa->narg > sa->nap) {
-		error = copyin((void *)td->td_frame->tf_usr_sp, sa->args +
-		    sa->nap, (sa->narg - sa->nap) * sizeof(register_t));
-	}
-	if (error == 0) {
-		td->td_retval[0] = 0;
-		td->td_retval[1] = 0;
-	}
-	return (error);
-}
-
-#include "../../kern/subr_syscall.c"
-
-static void
-syscall(struct thread *td, struct trapframe *frame)
-{
-	struct syscall_args sa;
-	int error;
-
-#ifndef __ARM_EABI__
-	sa.insn = *(uint32_t *)(frame->tf_pc - INSN_SIZE);
-	switch (sa.insn & SWI_OS_MASK) {
-	case 0: /* XXX: we need our own one. */
-		break;
-	default:
-		call_trapsignal(td, SIGILL, 0);
-		userret(td, frame);
-		return;
-	}
-#endif
-	sa.nap = 4;
-
-	error = syscallenter(td, &sa);
-	KASSERT(error != 0 || td->td_ar == NULL,
-	    ("returning from syscall with td_ar set!"));
-	syscallret(td, error, &sa);
-}
-
-void
-swi_handler(struct trapframe *frame)
-{
-	struct thread *td = curthread;
-
-	td->td_frame = frame;
-
-	td->td_pticks = 0;
-	/*
-      	 * Make sure the program counter is correctly aligned so we
-	 * don't take an alignment fault trying to read the opcode.
-	 */
-	if (__predict_false(((frame->tf_pc - INSN_SIZE) & 3) != 0)) {
-		call_trapsignal(td, SIGILL, 0);
-		userret(td, frame);
-		return;
-	}
-	/*
-	 * Enable interrupts if they were enabled before the exception.
-	 * Since all syscalls *should* come from user mode it will always
-	 * be safe to enable them, but check anyway.
-	 */
-	if (td->td_md.md_spinlock_count == 0) {
-		if (__predict_true(frame->tf_spsr & I32_bit) == 0)
-			enable_interrupts(I32_bit);
-		if (__predict_true(frame->tf_spsr & F32_bit) == 0)
-			enable_interrupts(F32_bit);
-	}
-
-	syscall(td, frame);
-}
-
+}
\ No newline at end of file
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 5b7b91780871..d82fdd3048a6 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
+#include <machine/armreg.h>
 #include <machine/asm.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
@@ -180,8 +181,10 @@ undefinedinstruction(struct trapframe *frame)
 	ksiginfo_t ksi;
 
 	/* Enable interrupts if they were enabled before the exception. */
-	if (!(frame->tf_spsr & I32_bit))
-		enable_interrupts(I32_bit|F32_bit);
+	if (__predict_true(frame->tf_spsr & PSR_I) == 0)
+		enable_interrupts(PSR_I);
+	if (__predict_true(frame->tf_spsr & PSR_F) == 0)
+		enable_interrupts(PSR_F);
 
 	PCPU_INC(cnt.v_trap);
 
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 4a9cf3f6a595..7758a22f5ee6 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -120,7 +120,7 @@ cpu_fork(register struct thread *td1, register struct proc *p2,
 	sf->sf_r4 = (u_int)fork_return;
 	sf->sf_r5 = (u_int)td2;
 	sf->sf_pc = (u_int)fork_trampoline;
-	tf->tf_spsr &= ~PSR_C_bit;
+	tf->tf_spsr &= ~PSR_C;
 	tf->tf_r0 = 0;
 	tf->tf_r1 = 0;
 	pcb2->un_32.pcb32_sp = (u_int)sf;
@@ -190,7 +190,7 @@ cpu_set_syscall_retval(struct thread *td, int error)
 			frame->tf_r0 = td->td_retval[0];
 			frame->tf_r1 = td->td_retval[1];
 		}
-		frame->tf_spsr &= ~PSR_C_bit;   /* carry bit */
+		frame->tf_spsr &= ~PSR_C;   /* carry bit */
 		break;
 	case ERESTART:
 		/*
@@ -203,7 +203,7 @@ cpu_set_syscall_retval(struct thread *td, int error)
 		break;
 	default:
 		frame->tf_r0 = error;
-		frame->tf_spsr |= PSR_C_bit;    /* carry bit */
+		frame->tf_spsr |= PSR_C;    /* carry bit */
 		break;
 	}
 }
@@ -228,7 +228,7 @@ cpu_set_upcall(struct thread *td, struct thread *td0)
 	sf->sf_r4 = (u_int)fork_return;
 	sf->sf_r5 = (u_int)td;
 	sf->sf_pc = (u_int)fork_trampoline;
-	tf->tf_spsr &= ~PSR_C_bit;
+	tf->tf_spsr &= ~PSR_C;
 	tf->tf_r0 = 0;
 	td->td_pcb->un_32.pcb32_sp = (u_int)sf;
 	KASSERT((td->td_pcb->un_32.pcb32_sp & 7) == 0,
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index 56b32bdbaab0..1942389738b2 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 
+#include <machine/armreg.h>
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/devmap.h>
@@ -303,7 +304,7 @@ at91_attach(device_t dev)
 
 	bus_generic_probe(dev);
 	bus_generic_attach(dev);
-	enable_interrupts(I32_bit | F32_bit);
+	enable_interrupts(PSR_I | PSR_F);
 	return (0);
 }
 
diff --git a/sys/arm/at91/at91_aic.c b/sys/arm/at91/at91_aic.c
index f7489de2c4b4..300c99aea3d3 100644
--- a/sys/arm/at91/at91_aic.c
+++ b/sys/arm/at91/at91_aic.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/rman.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
@@ -149,7 +150,7 @@ at91_aic_attach(device_t dev)
 	/* Disable and clear all interrupts. */
 	WR4(sc, IC_IDCR, 0xffffffff);
 	WR4(sc, IC_ICCR, 0xffffffff);
-	enable_interrupts(I32_bit | F32_bit);
+	enable_interrupts(PSR_I | PSR_F);
 
 	return (err);
 }
diff --git a/sys/arm/at91/at91_pinctrl.c b/sys/arm/at91/at91_pinctrl.c
index 31140da603a8..7a90f0f80d15 100644
--- a/sys/arm/at91/at91_pinctrl.c
+++ b/sys/arm/at91/at91_pinctrl.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/at91/at91_piovar.h>
 
 #include <dev/fdt/fdt_common.h>
+#include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
@@ -250,6 +251,8 @@ at91_pinctrl_attach(device_t dev)
 		device_set_ivars(cdev, di);
 	}
 
+	fdt_pinctrl_register(dev, "atmel,pins");
+
 	return (bus_generic_attach(dev));
 }
 
@@ -370,93 +373,70 @@ pinctrl_print_child(device_t bus, device_t child)
 
 const char *periphs[] = {"gpio", "periph A", "periph B", "periph C", "periph D", "periph E" };
 
-static void
-pinctrl_walk_tree(device_t bus, phandle_t node)
+struct pincfg {
+	uint32_t unit;
+	uint32_t pin;
+	uint32_t periph;
+	uint32_t flags;
+};
+
+static int
+pinctrl_configure_pins(device_t bus, phandle_t cfgxref)
 {
 	struct pinctrl_softc *sc;
-	char status[10];
+	struct pincfg *cfg, *cfgdata;
 	char name[32];
-	phandle_t pinctrl[32], pins[32 * 4], scratch;
-	ssize_t len, npins;
-	int i, j;
+	phandle_t node;
+	ssize_t npins;
+	int i;
 
 	sc = device_get_softc(bus);
-	for (node = OF_child(node); node > 0; node = OF_peer(node)) {
-		pinctrl_walk_tree(bus, node);
-		memset(status, 0, sizeof(status));
-		memset(name, 0, sizeof(name));
-		OF_getprop(node, "status", status, sizeof(status));
-		OF_getprop(node, "name", name, sizeof(name));
-		if (strcmp(status, "okay") != 0) {
-//			printf("pinctrl: skipping node %s status %s\n", name,
-//			    status);
-			continue;
-		}
-		len = OF_getencprop(node, "pinctrl-0", pinctrl, sizeof(pinctrl));
-		if (len <= 0) {
-//			printf("pinctrl: skipping node %s no pinctrl-0\n",
-//			    name, status);
-			continue;
-		}
-		len /= sizeof(phandle_t);
-		printf("pinctrl: Found active node %s\n", name);
-		for (i = 0; i < len; i++) {
-			scratch = OF_node_from_xref(pinctrl[i]);
-			npins = OF_getencprop(scratch, "atmel,pins", pins,
-			    sizeof(pins));
-			if (npins <= 0) {
-				printf("We're doing it wrong %s\n", name);
-				continue;
-			}
-			memset(name, 0, sizeof(name));
-			OF_getprop(scratch, "name", name, sizeof(name));
-			npins /= (4 * 4);
-			printf("----> need to cope with %d more pins for %s\n",
-			    npins, name);
-			for (j = 0; j < npins; j++) {
-				uint32_t unit = pins[j * 4];
-				uint32_t pin = pins[j * 4 + 1];
-				uint32_t periph = pins[j * 4 + 2];
-				uint32_t flags = pins[j * 4 + 3];
-				uint32_t pio;
-
-				pio = (0xfffffff & sc->ranges[0].bus) +
-				    0x200 * unit;
-				printf("P%c%d %s %#x\n", unit + 'A', pin,
-				    periphs[periph], flags);
-				switch (periph) {
-				case 0:
-					at91_pio_use_gpio(pio, 1u << pin);
-					at91_pio_gpio_pullup(pio, 1u << pin,
-					    !!(flags & 1));
-					at91_pio_gpio_high_z(pio, 1u << pin,
-					    !!(flags & 2));
-					at91_pio_gpio_set_deglitch(pio,
-					    1u << pin, !!(flags & 4));
-//					at91_pio_gpio_pulldown(pio, 1u << pin,
-//					    !!(flags & 8));
-//					at91_pio_gpio_dis_schmidt(pio,
-//					    1u << pin, !!(flags & 16));
-					break;
-				case 1:
-					at91_pio_use_periph_a(pio, 1u << pin,
-					    flags);
-					break;
-				case 2:
-					at91_pio_use_periph_b(pio, 1u << pin,
-					    flags);
-					break;
-				}
-			}
+	node = OF_node_from_xref(cfgxref);
+	memset(name, 0, sizeof(name));
+	OF_getprop(node, "name", name, sizeof(name));
+	npins = OF_getencprop_alloc(node, "atmel,pins", sizeof(*cfgdata),
+	    (void **)&cfgdata);
+	if (npins < 0) {
+		printf("We're doing it wrong %s\n", name);
+		return (ENXIO);
+	}
+	if (npins == 0)
+		return (0);
+	for (i = 0, cfg = cfgdata; i < npins; i++, cfg++) {
+		uint32_t pio;
+		pio = (0xfffffff & sc->ranges[0].bus) + 0x200 * cfg->unit;
+		printf("P%c%d %s %#x\n", cfg->unit + 'A', cfg->pin,
+		    periphs[cfg->periph], cfg->flags);
+		switch (cfg->periph) {
+		case 0:
+			at91_pio_use_gpio(pio, 1u << cfg->pin);
+			at91_pio_gpio_pullup(pio, 1u << cfg->pin,
+			    !!(cfg->flags & 1));
+			at91_pio_gpio_high_z(pio, 1u << cfg->pin,
+			    !!(cfg->flags & 2));
+			at91_pio_gpio_set_deglitch(pio,
+			    1u << cfg->pin, !!(cfg->flags & 4));
+//			at91_pio_gpio_pulldown(pio, 1u << cfg->pin,
+//			    !!(cfg->flags & 8));
+//			at91_pio_gpio_dis_schmidt(pio,
+//			    1u << cfg->pin, !!(cfg->flags & 16));
+			break;
+		case 1:
+			at91_pio_use_periph_a(pio, 1u << cfg->pin, cfg->flags);
+			break;
+		case 2:
+			at91_pio_use_periph_b(pio, 1u << cfg->pin, cfg->flags);
+			break;
 		}
 	}
+	free(cfgdata, M_OFWPROP);
+	return (0);
 }
 
 static void
 pinctrl_new_pass(device_t bus)
 {
 	struct pinctrl_softc *sc;
-	phandle_t node;
 
 	sc = device_get_softc(bus);
 
@@ -466,10 +446,7 @@ pinctrl_new_pass(device_t bus)
 		return;
 	sc->done_pinmux++;
 
-	node = OF_peer(0);
-	if (node == -1)
-		return;
-	pinctrl_walk_tree(bus, node);
+	fdt_pinctrl_configure_tree(bus);
 }
 
 static device_method_t at91_pinctrl_methods[] = {
@@ -496,6 +473,8 @@ static device_method_t at91_pinctrl_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
+        /* fdt_pintrl interface */
+	DEVMETHOD(fdt_pinctrl_configure,pinctrl_configure_pins),
 	DEVMETHOD_END
 };
 
diff --git a/sys/arm/at91/at91rm9200.c b/sys/arm/at91/at91rm9200.c
index 2cc0c9cfcb6d..d350117f1dad 100644
--- a/sys/arm/at91/at91rm9200.c
+++ b/sys/arm/at91/at91rm9200.c
@@ -105,7 +105,7 @@ static const uint32_t at91_pio_base[] = {
 
 static const struct cpu_devs at91_devs[] =
 {
-	DEVICE("at91_aic", AIC,  0),
+	DEVICE("at91_aic",   AIC,    0),
 	DEVICE("at91_pmc",   PMC,    0),
 	DEVICE("at91_st",    ST,     0),
 	DEVICE("at91_pio",   PIOA,   0),
@@ -128,7 +128,6 @@ static const struct cpu_devs at91_devs[] =
 	DEVICE("uart",       USART1, 2),
 	DEVICE("uart",       USART2, 3),
 	DEVICE("uart",       USART3, 4),
-	DEVICE("at91_aic",   AIC,    0),
 	DEVICE("at91_mc",    MC,     0),
 	DEVICE("at91_tc",    TC0,    0),
 	DEVICE("at91_tc",    TC1,    1),
diff --git a/sys/arm/at91/at91rm92reg.h b/sys/arm/at91/at91rm92reg.h
index 5db3d7e2fb7a..16fc82c06ebb 100644
--- a/sys/arm/at91/at91rm92reg.h
+++ b/sys/arm/at91/at91rm92reg.h
@@ -124,7 +124,7 @@
  * 9: USART 3
  * 10: MMC Interface
  * 11: USB device port
- * 12: Two-wirte interface
+ * 12: Two-wire interface
  * 13: SPI
  * 14: SSC
  * 15: SSC
@@ -134,7 +134,7 @@
  * 19: Timer Counter 2
  * 20: Timer Counter 3
  * 21: Timer Counter 4
- * 22: Timer Counter 6
+ * 22: Timer Counter 5
  * 23: USB Host port
  * 24: Ethernet
  * 25: AIC
diff --git a/sys/arm/at91/at91sam9260reg.h b/sys/arm/at91/at91sam9260reg.h
index 839b7147ac93..1609ed17e869 100644
--- a/sys/arm/at91/at91sam9260reg.h
+++ b/sys/arm/at91/at91sam9260reg.h
@@ -164,7 +164,7 @@
  * 8: USART 2
  * 9: MMC Interface
  * 10: USB device port
- * 11: Two-wirte interface
+ * 11: Two-wire interface
  * 12: SPI 0
  * 13: SPI 1
  * 14: SSC
@@ -231,7 +231,7 @@
 #define AT91SAM9260_WDT_SIZE	0x10
 
 #define AT91SAM9260_PIT_BASE	0xffffd30
-#define AT91SAM9260_PIT_SIZE	10
+#define AT91SAM9260_PIT_SIZE	0x10
 
 #define AT91SAM9260_SMC_BASE	0xfffec00
 #define AT91SAM9260_SMC_SIZE	0x200
diff --git a/sys/arm/at91/at91sam9g20reg.h b/sys/arm/at91/at91sam9g20reg.h
index 59f6099b3ac3..d29dfa5ef57c 100644
--- a/sys/arm/at91/at91sam9g20reg.h
+++ b/sys/arm/at91/at91sam9g20reg.h
@@ -165,7 +165,7 @@
  * 8: USART 2
  * 9: MMC Interface
  * 10: USB device port
- * 11: Two-wirte interface
+ * 11: Two-wire interface
  * 12: SPI 0
  * 13: SPI 1
  * 14: SSC
diff --git a/sys/arm/at91/at91sam9g45reg.h b/sys/arm/at91/at91sam9g45reg.h
index a92e3b950f69..0dc31beea9be 100644
--- a/sys/arm/at91/at91sam9g45reg.h
+++ b/sys/arm/at91/at91sam9g45reg.h
@@ -142,13 +142,13 @@
  * 9: USART 2
  * 10: USART 3
  * 11: Multimedia Card interface 0
- * 12: Two-wirte interface 0
- * 13: Two-wirte interface 1
+ * 12: Two-wire interface 0
+ * 13: Two-wire interface 1
  * 14: SPI 0
  * 15: SPI 1
  * 16: SSC 0
- * 17: SSC 0
- * 18: Timer Counter 0, 2, 3, 4, 5
+ * 17: SSC 1
+ * 18: Timer Counter 0, 1, 2, 3, 4, 5
  * 19: PWM
  * 20: Touch Screen ADC
  * 21: DMA
@@ -168,8 +168,8 @@
 #define	AT91SAM9G45_IRQ_PIOA	2
 #define	AT91SAM9G45_IRQ_PIOB	3
 #define	AT91SAM9G45_IRQ_PIOC	4
-#define	AT91SAM9G45_IRQ_PIOD	5
-#define	AT91SAM9G45_IRQ_PIOE	6
+#define	AT91SAM9G45_IRQ_PIODE	5
+#define	AT91SAM9G45_IRQ_TRNG	6
 #define	AT91SAM9G45_IRQ_USART0	7
 #define	AT91SAM9G45_IRQ_USART1	8
 #define	AT91SAM9G45_IRQ_USART2	9
@@ -202,6 +202,8 @@
 #define	AT91SAM9G45_IRQ_WDT	AT91SAM9G45_IRQ_SYSTEM
 #define	AT91SAM9G45_IRQ_PIT	AT91SAM9G45_IRQ_SYSTEM
 #define	AT91SAM9G45_IRQ_RSTC	AT91SAM9G45_IRQ_SYSTEM
+#define	AT91SAM9G45_IRQ_PIOD	AT91SAM9G45_IRQ_PIODE
+#define	AT91SAM9G45_IRQ_PIOE	AT91SAM9G45_IRQ_PIODE
 #define	AT91SAM9G45_IRQ_OHCI	AT91SAM9G45_IRQ_UHP
 #define	AT91SAM9G45_IRQ_TC0	AT91SAM9G45_IRQ_TC0_TC5
 #define	AT91SAM9G45_IRQ_TC1	AT91SAM9G45_IRQ_TC0_TC5
@@ -225,9 +227,6 @@
 #define	AT91SAM9G45_SMC_BASE	0xfffe800
 #define	AT91SAM9G45_SMC_SIZE	0x200
 
-#define	AT91SAM9G45_PMC_BASE	0xffffc00
-#define	AT91SAM9G45_PMC_SIZE	0x100
-
 #define	AT91SAM9G45_HSMCI0_BASE	0xff80000
 #define	AT91SAM9G45_HSMCI0_SIZE	0x4000
 
diff --git a/sys/arm/at91/at91sam9x5reg.h b/sys/arm/at91/at91sam9x5reg.h
index 17c43ffa7491..dd777f9a6b2d 100644
--- a/sys/arm/at91/at91sam9x5reg.h
+++ b/sys/arm/at91/at91sam9x5reg.h
@@ -151,9 +151,9 @@
  * 6: USART 1
  * 7: USART 2
  * 8: USART 3
- * 9: Two-wirte interface
- * 10: Two-wirte interface
- * 11: Two-wirte interface
+ * 9: Two-wire interface
+ * 10: Two-wire interface
+ * 11: Two-wire interface
  * 12: HSMCI Interface
  * 13: SPI 0
  * 14: SPI 1
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index f8a98eb9ab4b..29ada7d26c1d 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -10,7 +10,7 @@ arm/at91/at91_smc.c		standard
 arm/at91/at91_cfata.c		optional	at91_cfata
 arm/at91/at91_common.c		optional	fdt
 arm/at91/at91_mci.c		optional	at91_mci
-arm/at91/at91_pinctrl.c		optional	fdt
+arm/at91/at91_pinctrl.c		optional	fdt fdt_pinctrl
 arm/at91/at91_pit.c		optional	at91sam9
 arm/at91/at91_reset.S		optional	at91sam9
 arm/at91/at91_rst.c		optional	at91sam9
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 6b2eabc54ccc..4497611a5319 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -776,19 +776,19 @@ ate_tick(void *xsc)
 	sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE);
 	sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE);
 	c = RD4(sc, ETH_SCOL);
-	ifp->if_collisions += c;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c);
 	sc->mibdata.dot3StatsSingleCollisionFrames += c;
 	c = RD4(sc, ETH_MCOL);
 	sc->mibdata.dot3StatsMultipleCollisionFrames += c;
-	ifp->if_collisions += c;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c);
 	sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE);
 	sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE);
 	c = RD4(sc, ETH_LCOL);
 	sc->mibdata.dot3StatsLateCollisions += c;
-	ifp->if_collisions += c;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c);
 	c = RD4(sc, ETH_ECOL);
 	sc->mibdata.dot3StatsExcessiveCollisions += c;
-	ifp->if_collisions += c;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c);
 	sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE);
 	sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR);
 	sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC);
@@ -797,9 +797,9 @@ ate_tick(void *xsc)
 	 * Not sure where to lump these, so count them against the errors
 	 * for the interface.
 	 */
-	sc->ifp->if_oerrors += RD4(sc, ETH_TUE);
-	sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) +
-	    RD4(sc, ETH_USF);
+	if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, RD4(sc, ETH_TUE));
+	if_inc_counter(sc->ifp, IFCOUNTER_IERRORS,
+	    RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF));
 
 	/* Schedule another timeout one second from now. */
 	callout_reset(&sc->tick_ch, hz, ate_tick, sc);
@@ -914,7 +914,7 @@ ate_intr(void *xsc)
 			mb = m_get2(remain + ETHER_ALIGN, M_NOWAIT, MT_DATA,
 			    M_PKTHDR);
 			if (mb == NULL) {
-				sc->ifp->if_iqdrops++;
+				if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1);
 				rxdhead->status = 0;
 				continue;
 			}
@@ -957,7 +957,7 @@ ate_intr(void *xsc)
 
 			} while (!done);
 
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			(*ifp->if_input)(ifp, mb);
 		}
 	}
@@ -990,7 +990,7 @@ ate_intr(void *xsc)
 			m_freem(sc->sent_mbuf[sc->txtail]);
 			sc->tx_descs[sc->txtail].addr = 0;
 			sc->sent_mbuf[sc->txtail] = NULL;
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			sc->txtail = NEXT_TX_IDX(sc, sc->txtail);
 		}
 
@@ -1162,7 +1162,7 @@ atestart_locked(struct ifnet *ifp)
 			    BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(sc->mtag, sc->tx_map[sc->txtail]);
 			m_free(sc->sent_mbuf[sc->txhead]);
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 		
 		sc->sent_mbuf[sc->txhead] = m;
diff --git a/sys/arm/at91/if_macb.c b/sys/arm/at91/if_macb.c
index a60cddfaf2b5..a7acc31d4399 100644
--- a/sys/arm/at91/if_macb.c
+++ b/sys/arm/at91/if_macb.c
@@ -522,12 +522,12 @@ macb_watchdog(struct macb_softc *sc)
 	ifp = sc->ifp;
 	if ((sc->flags & MACB_FLAG_LINK) == 0) {
 		if_printf(ifp, "watchdog timeout (missed link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return;
 	}
 
 	if_printf(ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	macbinit_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -677,7 +677,7 @@ macb_tx_cleanup(struct macb_softc *sc)
 					  td->dmamap);
 			m_freem(td->buff);
 			td->buff = NULL;
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		do {
@@ -732,7 +732,7 @@ macb_rx(struct macb_softc *sc)
 		bus_dmamap_sync(sc->dmatag_ring_rx,
 		    sc->rx_desc[sc->rx_cons].dmamap, BUS_DMASYNC_POSTREAD);
 		if (macb_new_rxbuf(sc, sc->rx_cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			first = sc->rx_cons;
 			
 			do  {
@@ -781,7 +781,7 @@ macb_rx(struct macb_softc *sc)
 			m->m_flags |= M_PKTHDR;
 			m->m_pkthdr.len = rxbytes;
 			m->m_pkthdr.rcvif = ifp;
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 			nsegs = 0;
 			MACB_UNLOCK(sc);
diff --git a/sys/arm/cavium/cns11xx/econa.c b/sys/arm/cavium/cns11xx/econa.c
index f9492b6d8228..c331e20d9260 100644
--- a/sys/arm/cavium/cns11xx/econa.c
+++ b/sys/arm/cavium/cns11xx/econa.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #define	_ARM32_BUS_DMA_PRIVATE
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/resource.h>
@@ -508,7 +509,7 @@ econa_attach(device_t dev)
 
 	bus_generic_probe(dev);
 	bus_generic_attach(dev);
-	enable_interrupts(I32_bit | F32_bit);
+	enable_interrupts(PSR_I | PSR_F);
 
 	return (0);
 }
diff --git a/sys/arm/cavium/cns11xx/if_ece.c b/sys/arm/cavium/cns11xx/if_ece.c
index 0ba2d774dc94..20bc07e7167f 100644
--- a/sys/arm/cavium/cns11xx/if_ece.c
+++ b/sys/arm/cavium/cns11xx/if_ece.c
@@ -1379,7 +1379,7 @@ ece_intr_rx_locked(struct ece_softc *sc, int count)
 		if (desc->length < ETHER_MIN_LEN - ETHER_CRC_LEN ||
 		    desc->length > ETHER_MAX_LEN - ETHER_CRC_LEN +
 		    ETHER_VLAN_ENCAP_LEN) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			desc->cown = 0;
 			desc->length = MCLBYTES - 2;
 			/* Invalid packet, skip and process next
@@ -1389,7 +1389,7 @@ ece_intr_rx_locked(struct ece_softc *sc, int count)
 		}
 
 		if (ece_new_rxbuf(sc, rxdesc) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			desc->cown = 0;
 			desc->length = MCLBYTES - 2;
 			break;
@@ -1478,7 +1478,7 @@ ece_intr_status(void *xsc)
 
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
 		if ((stat & ERROR_MASK) != 0)
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	}
 }
 
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index 286a83900828..77565588022f 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -17,51 +17,13 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
+include		"IMX53"
 ident		DIGI-CCWMX53
 
-include 	"../freescale/imx/std.imx53"
-
 makeoptions 	WITHOUT_MODULES="ahc"
 
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-#options 	DEBUG
-
-options 	SCHED_4BSD		# 4BSD scheduler
-#options 	PREEMPTION		# Enable kernel thread preemption
-options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
-#options 	SCTP			# Stream Control Transmission Protocol
-options 	FFS			# Berkeley Fast Filesystem
-options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	UFS_ACL			# Support for access control lists
-options 	UFS_DIRHASH		# Improve performance on big directories
-options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
-#options 	MD_ROOT			# MD is a potential root device
-options 	NFSCL			# New Network Filesystem Client
-#options 	NFSD			# New Network Filesystem Server
-options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	TMPFS			# Efficient memory filesystem
-options 	MSDOSFS			# MSDOS Filesystem
-options 	CD9660			# ISO 9660 Filesystem
-#options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	GEOM_PART_GPT		# GUID Partition Tables.
-options 	GEOM_LABEL		# Provides labelization
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options 	KTRACE			# ktrace(1) support
-options 	SYSVSHM			# SYSV-style shared memory
-options 	SYSVMSG			# SYSV-style message queues
-options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
-options 	VFP			# vfp/neon
-
 # required for netbooting
 #options 	BOOTP
 #options 	BOOTP_COMPAT
@@ -71,117 +33,6 @@ options 	VFP			# vfp/neon
 
 #options 	ROOTDEVNAME=\"ufs:ada0s2a\"
 
-
-# kernel/memory size reduction
-#options 	MUTEX_NOINLINE
-#options 	NO_FFS_SNAPSHOT
-#options 	NO_SWAPPING
-#options 	NO_SYSCTL_DESCR
-#options 	RWLOCK_NOINLINE
-
-# Debugging support.  Always need this:
-options 	KDB			# Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options 	KDB_TRACE		# Print a stack trace for a panic.
-# For full debugger support use this instead:
-options 	DDB			# Support DDB.
-#options 	GDB			# Support remote GDB.
-options 	DEADLKRES		# Enable the deadlock resolver
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf			# Berkeley packet filter
-
-# Pseudo devices.
-device		loop			# Network loopback
-device		random			# Entropy device
-device		ether			# Ethernet support
-#device		vlan			# 802.1Q VLAN support
-#device		tun			# Packet tunnel.
-#device		md			# Memory "disks"
-#device		gif			# IPv6 and IPv4 tunneling
-#device		faith			# IPv6-to-IPv4 relaying (translation)
-#device		firmware		# firmware assist module
-
-# Ethernet
-device		ffec			# Freescale Fast Ethernet Controller
-device		miibus			# Standard mii bus
-
-# Serial (COM) ports
-device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
-
-device		ata
-device		atapci			# Only for helper functions
-device		imxata
-options 	ATA_STATIC_ID		# Static device numbering
-
-device		gpio
-device		gpioled
-
-device		fsliic
-device		iic
-device		iicbus
-
-# SCSI peripherals
-device		scbus			# SCSI bus (required for ATA/SCSI)
-device		da			# Direct Access (disks)
-device		cd			# CD
-device		pass			# Passthrough device (direct ATA/SCSI access)
-
-# USB support
-options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-options 	USB_DEBUG		# enable debug msgs
-device		ehci			# OHCI USB interface
-device		usb			# USB Bus (required)
-device		umass			# Disks/Mass storage - Requires scbus and da
-device		uhid			# "Human Interface Devices"
-#device		ukbd			# Allow keyboard like HIDs to control console
-device		ums
-
-# USB Ethernet, requires miibus
-#device		miibus
-#device		aue			# ADMtek USB Ethernet
-#device		axe			# ASIX Electronics USB Ethernet
-#device		cdce			# Generic USB over Ethernet
-#device		cue			# CATC USB Ethernet
-#device		kue			# Kawasaki LSI USB Ethernet
-#device		rue			# RealTek RTL8150 USB Ethernet
-#device		udav			# Davicom DM9601E USB
-
-# USB Wireless
-#device		rum			# Ralink Technology RT2501USB wireless NICs
-
-# Watchdog timer.
-# WARNING: can't be disabled!!!
-device		imxwdt			# Watchdog
-
-# Wireless NIC cards
-device		wlan			# 802.11 support
-device		wlan_wep		# 802.11 WEP support
-device		wlan_ccmp		# 802.11 CCMP support
-device		wlan_tkip		# 802.11 TKIP support
-device		wlan_amrr		# AMRR transmit rate control algorithm
-
-# MMC
-#device  	sdhci			# SD controller
-#device  	mmc			# SD/MMC protocol
-#device  	mmcsd			# SDCard disk device
-
-
 # Flattened Device Tree
-options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=digi-ccwmx53.dts
-
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-#device		sc
-#device		vt
-#device		kbdmux
-#options         SC_DFLT_FONT		# compile font in
-#makeoptions     SC_DFLT_FONT=cp437
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
new file mode 100644
index 000000000000..1396578e3e58
--- /dev/null
+++ b/sys/arm/conf/IMX53
@@ -0,0 +1,173 @@
+# Kernel configuration for i.MX53 boards
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+ident		IMX53
+
+include 	"../freescale/imx/std.imx53"
+
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+#options 	DEBUG
+
+options 	SCHED_4BSD		# 4BSD scheduler
+#options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+#options 	SCTP			# Stream Control Transmission Protocol
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+#options 	MD_ROOT			# MD is a potential root device
+options 	NFSCL			# New Network Filesystem Client
+#options 	NFSD			# New Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+options 	TMPFS			# Efficient memory filesystem
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+#options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_LABEL		# Provides labelization
+#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
+#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
+options 	VFP			# vfp/neon
+
+# kernel/memory size reduction
+#options 	MUTEX_NOINLINE
+#options 	NO_FFS_SNAPSHOT
+#options 	NO_SWAPPING
+#options 	NO_SYSCTL_DESCR
+#options 	RWLOCK_NOINLINE
+
+# Debugging support.  Always need this:
+options 	KDB			# Enable kernel debugger support.
+# For minimum debugger support (stable branch) use:
+#options 	KDB_TRACE		# Print a stack trace for a panic.
+# For full debugger support use this instead:
+options 	DDB			# Support DDB.
+#options 	GDB			# Support remote GDB.
+options 	DEADLKRES		# Enable the deadlock resolver
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+#device		vlan			# 802.1Q VLAN support
+#device		tun			# Packet tunnel.
+device		md			# Memory "disks"
+#device		gif			# IPv6 and IPv4 tunneling
+#device		faith			# IPv6-to-IPv4 relaying (translation)
+#device		firmware		# firmware assist module
+
+# Ethernet
+device		ffec			# Freescale Fast Ethernet Controller
+device		miibus			# Standard mii bus
+
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	ALT_BREAK_TO_DEBUGGER
+
+device		ata
+device		atapci			# Only for helper functions
+device		imxata
+options 	ATA_STATIC_ID		# Static device numbering
+
+device		gpio
+device		gpioled
+
+device		fsliic
+device		iic
+device		iicbus
+
+# SCSI peripherals
+device		scbus			# SCSI bus (required for ATA/SCSI)
+device		da			# Direct Access (disks)
+device		cd			# CD
+device		pass			# Passthrough device (direct ATA/SCSI access)
+
+# USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
+options 	USB_DEBUG		# enable debug msgs
+device		ehci			# OHCI USB interface
+device		usb			# USB Bus (required)
+device		umass			# Disks/Mass storage - Requires scbus and da
+device		uhid			# "Human Interface Devices"
+#device		ukbd			# Allow keyboard like HIDs to control console
+device		ums
+
+# USB Ethernet, requires miibus
+#device		miibus
+#device		aue			# ADMtek USB Ethernet
+#device		axe			# ASIX Electronics USB Ethernet
+#device		cdce			# Generic USB over Ethernet
+#device		cue			# CATC USB Ethernet
+#device		kue			# Kawasaki LSI USB Ethernet
+#device		rue			# RealTek RTL8150 USB Ethernet
+#device		udav			# Davicom DM9601E USB
+
+# USB Wireless
+#device		rum			# Ralink Technology RT2501USB wireless NICs
+
+# Watchdog timer.
+# WARNING: can't be disabled!!!
+device		imxwdt			# Watchdog
+
+# Wireless NIC cards
+device		wlan			# 802.11 support
+device		wlan_wep		# 802.11 WEP support
+device		wlan_ccmp		# 802.11 CCMP support
+device		wlan_tkip		# 802.11 TKIP support
+device		wlan_amrr		# AMRR transmit rate control algorithm
+
+# MMC
+#device  	sdhci			# SD controller
+#device  	mmc			# SD/MMC protocol
+#device  	mmcsd			# SDCard disk device
+
+
+# Flattened Device Tree
+options         FDT
+
+# NOTE: serial console will be disabled if syscons enabled
+# Uncomment following lines for framebuffer/syscons support
+#device		sc
+#device		vt
+#device		kbdmux
+#options         SC_DFLT_FONT		# compile font in
+#makeoptions     SC_DFLT_FONT=cp437
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
index e4c3ad6e51c1..fdaa4ec0f405 100644
--- a/sys/arm/conf/IMX53-QSB
+++ b/sys/arm/conf/IMX53-QSB
@@ -17,49 +17,12 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
+include		"IMX53"
 ident		IMX53-QSB
 
-include 	"../freescale/imx/std.imx53"
-
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-#options 	DEBUG
-
 options 	HZ=250			# 4ms scheduling quantum
-options 	SCHED_4BSD		# 4BSD scheduler
-#options 	PREEMPTION		# Enable kernel thread preemption
-options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
-#options 	SCTP			# Stream Control Transmission Protocol
-options 	FFS			# Berkeley Fast Filesystem
-options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	UFS_ACL			# Support for access control lists
-options 	UFS_DIRHASH		# Improve performance on big directories
-options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
-#options 	MD_ROOT			# MD is a potential root device
-options 	NFSCL			# New Network Filesystem Client
-#options 	NFSD			# New Network Filesystem Server
-options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	TMPFS			# Efficient memory filesystem
-options 	MSDOSFS			# MSDOS Filesystem
-options 	CD9660			# ISO 9660 Filesystem
-#options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	GEOM_PART_GPT		# GUID Partition Tables.
-options 	GEOM_LABEL		# Provides labelization
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options 	KTRACE			# ktrace(1) support
-options 	SYSVSHM			# SYSV-style shared memory
-options 	SYSVMSG			# SYSV-style message queues
-options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
-options 	VFP			# vfp/neon
 
 # required for netbooting
 #options 	BOOTP
@@ -70,111 +33,6 @@ options 	VFP			# vfp/neon
 
 #options 	ROOTDEVNAME=\"ufs:ada0s2a\"
 
-
-# kernel/memory size reduction
-#options 	MUTEX_NOINLINE
-#options 	NO_FFS_SNAPSHOT
-#options 	NO_SWAPPING
-#options 	NO_SYSCTL_DESCR
-#options 	RWLOCK_NOINLINE
-
-# Debugging support.  Always need this:
-options 	KDB			# Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options 	KDB_TRACE		# Print a stack trace for a panic.
-# For full debugger support use this instead:
-options 	DDB			# Support DDB.
-#options 	GDB			# Support remote GDB.
-#options 	DEADLKRES		# Enable the deadlock resolver
-#options 	INVARIANTS		# Enable calls of extra sanity checking
-#options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			# Enable checks to detect deadlocks and cycles
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf			# Berkeley packet filter
-
-# Pseudo devices.
-device		loop			# Network loopback
-device		random			# Entropy device
-device		ether			# Ethernet support
-#device		vlan			# 802.1Q VLAN support
-#device		tun			# Packet tunnel.
-device		md			# Memory "disks"
-#device		gif			# IPv6 and IPv4 tunneling
-#device		faith			# IPv6-to-IPv4 relaying (translation)
-#device		firmware		# firmware assist module
-
-# Ethernet
-device  	ffec			# Freescale Fast Ethernet Controller
-device  	miibus			# Standard mii bus
-
-# Serial (COM) ports
-device		uart			# Multi-uart driver
-options 	ALT_BREAK_TO_DEBUGGER
-
-#device		ata
-#device		atapci			# Only for helper functions
-#device		imxata
-#options 	ATA_STATIC_ID		# Static device numbering
-
-device		gpio
-device		gpioled
-
-device		fsliic
-device		iic
-device		iicbus
-
-# SCSI peripherals
-device		scbus			# SCSI bus (required for ATA/SCSI)
-device		da			# Direct Access (disks)
-device		cd			# CD
-device		pass			# Passthrough device (direct ATA/SCSI access)
-
-# USB support
-options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
-#options 	USB_DEBUG		# enable debug msgs
-device		ehci			# OHCI USB interface
-device		usb			# USB Bus (required)
-device		umass			# Disks/Mass storage - Requires scbus and da
-#device		uhid			# "Human Interface Devices"
-#device		ukbd			# Allow keyboard like HIDs to control console
-#device		ums
-
-# USB Ethernet, requires miibus
-#device		miibus
-#device		aue			# ADMtek USB Ethernet
-#device		axe			# ASIX Electronics USB Ethernet
-#device		cdce			# Generic USB over Ethernet
-#device		cue			# CATC USB Ethernet
-#device		kue			# Kawasaki LSI USB Ethernet
-#device		rue			# RealTek RTL8150 USB Ethernet
-#device		udav			# Davicom DM9601E USB
-
-# USB Wireless
-#device		rum			# Ralink Technology RT2501USB wireless NICs
-
-# Watchdog timer.
-# WARNING: can't be disabled!!!
-device		imxwdt			# Watchdog
-
-# Wireless NIC cards
-device		wlan			# 802.11 support
-device		wlan_wep		# 802.11 WEP support
-device		wlan_ccmp		# 802.11 CCMP support
-device		wlan_tkip		# 802.11 TKIP support
-device		wlan_amrr		# AMRR transmit rate control algorithm
-
 # Flattened Device Tree
-options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=imx53-qsb.dts
-
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-#device		sc
-#device		kbdmux
-#options         SC_DFLT_FONT		# compile font in
-#makeoptions     SC_DFLT_FONT=cp437
-
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index 4c7480cac7f6..d4407eb509a4 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -19,7 +19,7 @@
 
 ident		LN2410SBC
 
-include 	"../s3c2xx0/std.ln2410sbc"
+include 	"../samsung/s3c2xx0/std.ln2410sbc"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 6a0218d6cee1..fa413bf861d7 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -19,7 +19,7 @@ files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 files	"../xscale/i80321/files.ep80219"
 files	"../xscale/i80321/files.i80219"
 files	"../xscale/i80321/files.i80321"
diff --git a/sys/arm/conf/SOCKIT b/sys/arm/conf/SOCKIT
index e524f30ee1bf..d56a7f222e49 100644
--- a/sys/arm/conf/SOCKIT
+++ b/sys/arm/conf/SOCKIT
@@ -124,6 +124,7 @@ device		ether
 device		mii
 device		smsc
 device		smscphy
+device		dwc
 
 # USB ethernet support, requires miibus
 device		miibus
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index f1c2c5d7ed25..951cb4d148b1 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -19,7 +19,7 @@ arm/arm/bus_space-v6.c			standard
 arm/freescale/imx/tzic.c		standard
 
 # IOMUX - external pins multiplexor
-arm/freescale/imx/imx51_iomux.c		standard
+arm/freescale/imx/imx_iomux.c		standard
 
 # GPIO
 arm/freescale/imx/imx_gpio.c		optional gpio
@@ -37,7 +37,7 @@ dev/ata/chipsets/ata-fsl.c		optional imxata
 dev/uart/uart_dev_imx.c			optional uart
 
 # USB OH3 controller (1 OTG, 3 EHCI)
-arm/freescale/imx/imx_nop_usbphy.c	optional echi
+arm/freescale/imx/imx_nop_usbphy.c	optional ehci
 dev/usb/controller/ehci_imx.c		optional ehci
 
 # Watchdog
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index 01fb10edf1a4..3918400edab1 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -22,7 +22,7 @@ dev/uart/uart_dev_imx.c 		optional uart
 arm/freescale/imx/tzic.c		standard
 
 # IOMUX - external pins multiplexor
-arm/freescale/imx/imx51_iomux.c		standard
+arm/freescale/imx/imx_iomux.c		standard
 
 # GPIO
 arm/freescale/imx/imx_gpio.c		optional gpio
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index e66ef8b8f8d4..2fc6d3fb7dfc 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -20,11 +20,10 @@ arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard
 arm/freescale/imx/imx6_ccm.c		standard
-arm/freescale/imx/imx6_iomux.c		standard
 arm/freescale/imx/imx6_machdep.c	standard
 arm/freescale/imx/imx6_mp.c		optional smp
 arm/freescale/imx/imx6_pl310.c		standard
-arm/freescale/imx/imx_common.c		standard
+arm/freescale/imx/imx_iomux.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx_gpt.c		standard
 arm/freescale/imx/imx_gpio.c		optional gpio
diff --git a/sys/arm/freescale/imx/imx51_iomux.c b/sys/arm/freescale/imx/imx51_iomux.c
deleted file mode 100644
index 1953b7a95831..000000000000
--- a/sys/arm/freescale/imx/imx51_iomux.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: imx51_iomux.c,v 1.3 2012/04/15 09:51:31 bsh Exp $	*/
-
-/*
- * Copyright (c) 2009, 2010  Genetec Corporation.  All rights reserved.
- * Written by Hashimoto Kenichi for Genetec Corporation.
- *
- * 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 GENETEC CORPORATION ``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 GENETEC CORPORATION
- * 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.
- */
-
-/*-
- * Copyright (c) 2012, 2013 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by Oleksandr Rybalko
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/rman.h>
-
-#include <machine/bus.h>
-#include <machine/fdt.h>
-
-#include <dev/fdt/fdt_common.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-
-#include <arm/freescale/imx/imx_iomuxvar.h>
-#include "imx51_iomuxreg.h"
-
-
-#define	IOMUX_WRITE(_sc, _r, _v)					\
-	    bus_write_4((_sc)->sc_res, (_r), (_v))
-#define	IOMUX_READ(_sc, _r)						\
-	    bus_read_4((_sc)->sc_res, (_r))
-#define	IOMUX_SET(_sc, _r, _m)						\
-	    IOMUX_WRITE((_sc), (_r), IOMUX_READ((_sc), (_r)) | (_m))
-#define	IOMUX_CLEAR(_sc, _r, _m)					\
-	    IOMUX_WRITE((_sc), (_r), IOMUX_READ((_sc), (_r)) & ~(_m))
-
-struct iomux_softc {
-	struct resource	*sc_res;
-	device_t 	sc_dev;
-};
-
-static int iomux_probe(device_t);
-static int iomux_attach(device_t);
-
-static struct iomux_softc *iomuxsc = NULL;
-
-static struct resource_spec imx_iomux_spec[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },	/* Global registers */
-	{ -1, 0 }
-};
-
-static int
-iomux_probe(device_t dev)
-{
-
-	if (!ofw_bus_status_okay(dev))
-		return (ENXIO);
-
-	if (!ofw_bus_is_compatible(dev, "fsl,imx51-iomux") &&
-	    !ofw_bus_is_compatible(dev, "fsl,imx53-iomux"))
-		return (ENXIO);
-
-	device_set_desc(dev, "Freescale i.MX51 IO pins multiplexor");
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-iomux_attach(device_t dev)
-{
-	struct iomux_softc * sc;
-
-	sc = device_get_softc(dev);
-
-	if (bus_alloc_resources(dev, imx_iomux_spec, &sc->sc_res)) {
-		device_printf(dev, "could not allocate resources\n");
-		return (ENXIO);
-	}
-
-	iomuxsc = sc;
-
-	/*
-	 * XXX: place to fetch all info about pinmuxing from loader data
-	 * (FDT blob) and apply. Loader (1st one) must care about
-	 * device-to-device difference.
-	 */
-
-	return (0);
-}
-
-static void
-iomux_set_function_sub(struct iomux_softc *sc, uint32_t pin, uint32_t fn)
-{
-	bus_size_t mux_ctl_reg = IOMUX_PIN_TO_MUX_ADDRESS(pin);
-
-	if (mux_ctl_reg != IOMUX_MUX_NONE)
-		IOMUX_WRITE(sc, mux_ctl_reg, fn);
-}
-
-void
-iomux_set_function(unsigned int pin, unsigned int fn)
-{
-
-	if (iomuxsc == NULL)
-		return;
-	iomux_set_function_sub(iomuxsc, pin, fn);
-}
-
-static void
-iomux_set_pad_sub(struct iomux_softc *sc, uint32_t pin, uint32_t config)
-{
-	bus_size_t pad_ctl_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin);
-
-	if (pad_ctl_reg != IOMUX_PAD_NONE)
-		IOMUX_WRITE(sc, pad_ctl_reg, config);
-}
-
-void
-iomux_set_pad(unsigned int pin, unsigned int config)
-{
-
-	if (iomuxsc == NULL)
-		return;
-	iomux_set_pad_sub(iomuxsc, pin, config);
-}
-
-static uint32_t
-iomux_get_pad_config_sub(struct iomux_softc *sc, uint32_t pin)
-{
-	bus_size_t pad_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin);
-	uint32_t result;
-
-	result = IOMUX_READ(sc, pad_reg);
-
-	return(result);
-}
-
-unsigned int
-iomux_get_pad_config(unsigned int pin)
-{
-
-	return(iomux_get_pad_config_sub(iomuxsc, pin));
-}
-
-uint32_t
-imx_iomux_gpr_get(u_int regnum)
-{
-
-	KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_get() called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 1, 
-	    ("imx_iomux_gpr_get bad regnum %u", regnum));
-	return (IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum));
-}
-
-void
-imx_iomux_gpr_set(u_int regnum, uint32_t val)
-{
-
-	KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_set() called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 1, 
-	    ("imx_iomux_gpr_set bad regnum %u", regnum));
-	IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
-}
-
-void
-imx_iomux_gpr_set_masked(u_int regnum, uint32_t clrbits, uint32_t setbits)
-{
-	uint32_t val;
-
-	KASSERT(iomuxsc != NULL, 
-	    ("imx_iomux_gpr_set_masked called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 1, 
-	    ("imx_iomux_gpr_set_masked bad regnum %u", regnum));
-
-	val = IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum);
-	val = (val & ~clrbits) | setbits;
-	IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
-}
-
-static device_method_t imx_iomux_methods[] = {
-	DEVMETHOD(device_probe,		iomux_probe),
-	DEVMETHOD(device_attach,	iomux_attach),
-
-	DEVMETHOD_END
-};
-
-static driver_t imx_iomux_driver = {
-	"imx_iomux",
-	imx_iomux_methods,
-	sizeof(struct iomux_softc),
-};
-
-static devclass_t imx_iomux_devclass;
-
-EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver,
-    imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
-
diff --git a/sys/arm/freescale/imx/imx51_iomuxreg.h b/sys/arm/freescale/imx/imx51_iomuxreg.h
deleted file mode 100644
index 1e90ffe58b06..000000000000
--- a/sys/arm/freescale/imx/imx51_iomuxreg.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- * This file was generated automatically from PDF file by mkiomuxreg_imx51.rb
- *
- */
-
-/*-
- * Copyright (c) 2012, 2013 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by Oleksandr Rybalko
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#ifndef	_IMX51_IOMUXREG_H
-#define	_IMX51_IOMUXREG_H
-
-#define	IOMUXC_MUX_CTL		0x001c		/* multiplex control */
-#define	 IOMUX_CONFIG_SION	(1 << 4)
-#define	 IOMUX_CONFIG_ALT0	(0)
-#define	 IOMUX_CONFIG_ALT1	(1)
-#define	 IOMUX_CONFIG_ALT2	(2)
-#define	 IOMUX_CONFIG_ALT3	(3)
-#define	 IOMUX_CONFIG_ALT4	(4)
-#define	 IOMUX_CONFIG_ALT5	(5)
-#define	 IOMUX_CONFIG_ALT6	(6)
-#define	 IOMUX_CONFIG_ALT7	(7)
-#define	IOMUXC_PAD_CTL		0x03f0		/* pad control */
-#define	 PAD_CTL_HVE		(1 << 13)
-#define	 PAD_CTL_DDR_INPUT	(1 << 9)
-#define	 PAD_CTL_HYS		(1 << 8)
-#define	 PAD_CTL_PKE		(1 << 7)
-#define	 PAD_CTL_PUE		(1 << 6)
-#define	 PAD_CTL_PULL		(PAD_CTL_PKE|PAD_CTL_PUE)
-#define	 PAD_CTL_KEEPER		(PAD_CTL_PKE|0)
-#define	 PAD_CTL_PUS_100K_PD	(0x0 << 4)
-#define	 PAD_CTL_PUS_47K_PU	(0x1 << 4)
-#define	 PAD_CTL_PUS_100K_PU	(0x2 << 4)
-#define	 PAD_CTL_PUS_22K_PU	(0x3 << 4)
-#define	 PAD_CTL_ODE		(1 << 3)	/* opendrain */
-#define	 PAD_CTL_DSE_LOW	(0x0 << 1)
-#define	 PAD_CTL_DSE_MID	(0x1 << 1)
-#define	 PAD_CTL_DSE_HIGH	(0x2 << 1)
-#define	 PAD_CTL_DSE_MAX	(0x3 << 1)
-#define	 PAD_CTL_SRE		(1 << 0)
-#define	IOMUXC_INPUT_CTL	0x08c4		/* input control */
-#define	 INPUT_DAISY_0		0
-#define	 INPUT_DAISY_1		1
-#define	 INPUT_DAISY_2		2
-#define	 INPUT_DAISY_3		3
-#define	 INPUT_DAISY_4		4
-#define	 INPUT_DAISY_5		5
-#define	 INPUT_DAISY_6		6
-#define	 INPUT_DAISY_7		7
-
-/*
- * IOMUX index
- */
-#define	IOMUX_PIN_TO_MUX_ADDRESS(pin)	(((pin) >> 16) & 0xffff)
-#define	IOMUX_PIN_TO_PAD_ADDRESS(pin)	(((pin) >>  0) & 0xffff)
-
-#define	IOMUX_PIN(mux_adr, pad_adr)			\
-	(((mux_adr) << 16) | (((pad_adr) << 0)))
-#define	IOMUX_MUX_NONE	0xffff
-#define	IOMUX_PAD_NONE	0xffff
-
-/* register offset address */
-#define IOMUXC_GPR0					0x0000
-#define IOMUXC_GPR1					0x0004
-#define IOMUXC_OBSERVE_MUX_0				0x0008
-#define IOMUXC_OBSERVE_MUX_1				0x000c
-#define IOMUXC_OBSERVE_MUX_2				0x0010
-#define IOMUXC_OBSERVE_MUX_3				0x0014
-#define IOMUXC_OBSERVE_MUX_4				0x0018
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA0			0x001c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA1			0x0020
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA2			0x0024
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA3			0x0028
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA4			0x002c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA5			0x0030
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA6			0x0034
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA7			0x0038
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA8			0x003c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA9			0x0040
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA10			0x0044
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA11			0x0048
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA12			0x004c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA13			0x0050
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA14			0x0054
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DA15			0x0058
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D16			0x005c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D17			0x0060
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D18			0x0064
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D19			0x0068
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D20			0x006c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D21			0x0070
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D22			0x0074
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D23			0x0078
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D24			0x007c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D25			0x0080
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D26			0x0084
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D27			0x0088
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D28			0x008c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D29			0x0090
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D30			0x0094
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_D31			0x0098
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A16			0x009c
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A17			0x00a0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A18			0x00a4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A19			0x00a8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A20			0x00ac
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A21			0x00b0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A22			0x00b4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A23			0x00b8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A24			0x00bc
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A25			0x00c0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A26			0x00c4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_A27			0x00c8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB0			0x00cc
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB1			0x00d0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB2			0x00d4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB3			0x00d8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_OE			0x00dc
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS0			0x00e0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS1			0x00e4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS2			0x00e8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS3			0x00ec
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS4			0x00f0
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS5			0x00f4
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DTACK			0x00f8
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_LBA			0x00fc
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CRE			0x0100
-#define IOMUXC_SW_MUX_CTL_PAD_DRAM_CS1			0x0104
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_WE_B		0x0108
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RE_B		0x010c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_ALE			0x0110
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CLE			0x0114
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_WP_B		0x0118
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RB0			0x011c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RB1			0x0120
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RB2			0x0124
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RB3			0x0128
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO_NAND			0x012c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS0			0x0130
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS1			0x0134
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS2			0x0138
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS3			0x013c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS4			0x0140
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS5			0x0144
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS6			0x0148
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_CS7			0x014c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_RDY_INT		0x0150
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D15			0x0154
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D14			0x0158
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D13			0x015c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D12			0x0160
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D11			0x0164
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D10			0x0168
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D9			0x016c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D8			0x0170
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D7			0x0174
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D6			0x0178
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D5			0x017c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D4			0x0180
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D3			0x0184
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D2			0x0188
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D1			0x018c
-#define IOMUXC_SW_MUX_CTL_PAD_NANDF_D0			0x0190
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D8			0x0194
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D9			0x0198
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D10			0x019c
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D11			0x01a0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D12			0x01a4
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D13			0x01a8
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D14			0x01ac
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D15			0x01b0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D16			0x01b4
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D17			0x01b8
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D18			0x01bc
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_D19			0x01c0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_VSYNC		0x01c4
-#define IOMUXC_SW_MUX_CTL_PAD_CSI1_HSYNC		0x01c8
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D12			0x01cc
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D13			0x01d0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D14			0x01d4
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D15			0x01d8
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D16			0x01dc
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D17			0x01e0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D18			0x01e4
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_D19			0x01e8
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_VSYNC		0x01ec
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_HSYNC		0x01f0
-#define IOMUXC_SW_MUX_CTL_PAD_CSI2_PIXCLK		0x01f4
-#define IOMUXC_SW_MUX_CTL_PAD_I2C1_CLK			0x01f8
-#define IOMUXC_SW_MUX_CTL_PAD_I2C1_DAT			0x01fc
-#define IOMUXC_SW_MUX_CTL_PAD_AUD3_BB_TXD		0x0200
-#define IOMUXC_SW_MUX_CTL_PAD_AUD3_BB_RXD		0x0204
-#define IOMUXC_SW_MUX_CTL_PAD_AUD3_BB_CK		0x0208
-#define IOMUXC_SW_MUX_CTL_PAD_AUD3_BB_FS		0x020c
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_MOSI		0x0210
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_MISO		0x0214
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_SS0			0x0218
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_SS1			0x021c
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_RDY			0x0220
-#define IOMUXC_SW_MUX_CTL_PAD_CSPI1_SCLK		0x0224
-#define IOMUXC_SW_MUX_CTL_PAD_UART1_RXD			0x0228
-#define IOMUXC_SW_MUX_CTL_PAD_UART1_TXD			0x022c
-#define IOMUXC_SW_MUX_CTL_PAD_UART1_RTS			0x0230
-#define IOMUXC_SW_MUX_CTL_PAD_UART1_CTS			0x0234
-#define IOMUXC_SW_MUX_CTL_PAD_UART2_RXD			0x0238
-#define IOMUXC_SW_MUX_CTL_PAD_UART2_TXD			0x023c
-#define IOMUXC_SW_MUX_CTL_PAD_UART3_RXD			0x0240
-#define IOMUXC_SW_MUX_CTL_PAD_UART3_TXD			0x0244
-#define IOMUXC_SW_MUX_CTL_PAD_OWIRE_LINE		0x0248
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW0			0x024c
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW1			0x0250
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW2			0x0254
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW3			0x0258
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL0			0x025c
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL1			0x0260
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL2			0x0264
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL3			0x0268
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL4			0x026c
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL5			0x0270
-#define IOMUXC_SW_MUX_CTL_PAD_JTAG_DE_B			0x0274
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_CLK			0x0278
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DIR			0x027c
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_STP			0x0280
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_NXT			0x0284
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA0		0x0288
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA1		0x028c
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA2		0x0290
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA3		0x0294
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA4		0x0298
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA5		0x029c
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA6		0x02a0
-#define IOMUXC_SW_MUX_CTL_PAD_USBH1_DATA7		0x02a4
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_PIN11			0x02a8
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_PIN12			0x02ac
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_PIN13			0x02b0
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_D0_CS			0x02b4
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_D1_CS			0x02b8
-#define IOMUXC_SW_MUX_CTL_PAD_DISPB2_SER_DIN		0x02bc
-#define IOMUXC_SW_MUX_CTL_PAD_DISPB2_SER_DIO		0x02c0
-#define IOMUXC_SW_MUX_CTL_PAD_DISPB2_SER_CLK		0x02c4
-#define IOMUXC_SW_MUX_CTL_PAD_DISPB2_SER_RS		0x02c8
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT0		0x02cc
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT1		0x02d0
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT2		0x02d4
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT3		0x02d8
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT4		0x02dc
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT5		0x02e0
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT6		0x02e4
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT7		0x02e8
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT8		0x02ec
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT9		0x02f0
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT10		0x02f4
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT11		0x02f8
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT12		0x02fc
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT13		0x0300
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT14		0x0304
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT15		0x0308
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT16		0x030c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT17		0x0310
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT18		0x0314
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT19		0x0318
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT20		0x031c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT21		0x0320
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT22		0x0324
-#define IOMUXC_SW_MUX_CTL_PAD_DISP1_DAT23		0x0328
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_PIN3			0x032c
-#define IOMUXC_SW_MUX_CTL_PAD_DI1_PIN2			0x0330
-#define IOMUXC_SW_MUX_CTL_PAD_DI_GP1			0x0334
-#define IOMUXC_SW_MUX_CTL_PAD_DI_GP2			0x0338
-#define IOMUXC_SW_MUX_CTL_PAD_DI_GP3			0x033c
-#define IOMUXC_SW_MUX_CTL_PAD_DI2_PIN4			0x0340
-#define IOMUXC_SW_MUX_CTL_PAD_DI2_PIN2			0x0344
-#define IOMUXC_SW_MUX_CTL_PAD_DI2_PIN3			0x0348
-#define IOMUXC_SW_MUX_CTL_PAD_DI2_DISP_CLK		0x034c
-#define IOMUXC_SW_MUX_CTL_PAD_DI_GP4			0x0350
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT0		0x0354
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT1		0x0358
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT2		0x035c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT3		0x0360
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT4		0x0364
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT5		0x0368
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT6		0x036c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT7		0x0370
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT8		0x0374
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT9		0x0378
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT10		0x037c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT11		0x0380
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT12		0x0384
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT13		0x0388
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT14		0x038c
-#define IOMUXC_SW_MUX_CTL_PAD_DISP2_DAT15		0x0390
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_CMD			0x0394
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_CLK			0x0398
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA0			0x039c
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA1			0x03a0
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA2			0x03a4
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA3			0x03a8
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_0			0x03ac
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_1			0x03b0
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_CMD			0x03b4
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_CLK			0x03b8
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA0			0x03bc
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA1			0x03c0
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA2			0x03c4
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA3			0x03c8
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_2			0x03cc
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_3			0x03d0
-#define IOMUXC_SW_MUX_CTL_PAD_PMIC_INT_REQ		0x03d4
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_4			0x03d8
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_5			0x03dc
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_6			0x03e0
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_7			0x03e4
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_8			0x03e8
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO1_9			0x03ec
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D16			0x03f0
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D17			0x03f4
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D18			0x03f8
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D19			0x03fc
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D20			0x0400
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D21			0x0404
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D22			0x0408
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D23			0x040c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D24			0x0410
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D25			0x0414
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D26			0x0418
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D27			0x041c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D28			0x0420
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D29			0x0424
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D30			0x0428
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_D31			0x042c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A16			0x0430
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A17			0x0434
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A18			0x0438
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A19			0x043c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A20			0x0440
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A21			0x0444
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A22			0x0448
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A23			0x044c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A24			0x0450
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A25			0x0454
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A26			0x0458
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_A27			0x045c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB0			0x0460
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB1			0x0464
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB2			0x0468
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB3			0x046c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_OE			0x0470
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS0			0x0474
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS1			0x0478
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS2			0x047c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS3			0x0480
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS4			0x0484
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS5			0x0488
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DTACK			0x048c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_WAIT			0x0490
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_LBA			0x0494
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_BCLK			0x0498
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_RW			0x049c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CRE			0x04a0
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS			0x04a4
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS			0x04a8
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE			0x04ac
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0		0x04b0
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1		0x04b4
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK		0x04b8
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0		0x04bc
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1		0x04c0
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2		0x04c4
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3		0x04c8
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0			0x04cc
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1			0x04d0
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0			0x04d4
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1			0x04d8
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2			0x04dc
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3			0x04e0
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_WE_B		0x04e4
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RE_B		0x04e8
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_ALE			0x04ec
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CLE			0x04f0
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_WP_B		0x04f4
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RB0			0x04f8
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RB1			0x04fc
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RB2			0x0500
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RB3			0x0504
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDBA2			0x0508
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT1		0x050c
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT0		0x0510
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO_NAND			0x0514
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS0			0x0518
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS1			0x051c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS2			0x0520
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS3			0x0524
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS4			0x0528
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS5			0x052c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS6			0x0530
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_CS7			0x0534
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_RDY_INT		0x0538
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D15			0x053c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D14			0x0540
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D13			0x0544
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D12			0x0548
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D11			0x054c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D10			0x0550
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D9			0x0554
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D8			0x0558
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D7			0x055c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D6			0x0560
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D5			0x0564
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D4			0x0568
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D3			0x056c
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D2			0x0570
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D1			0x0574
-#define IOMUXC_SW_PAD_CTL_PAD_NANDF_D0			0x0578
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D8			0x057c
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D9			0x0580
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D10			0x0584
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D11			0x0588
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D12			0x058c
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D13			0x0590
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D14			0x0594
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D15			0x0598
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D16			0x059c
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D17			0x05a0
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D18			0x05a4
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_D19			0x05a8
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_VSYNC		0x05ac
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_HSYNC		0x05b0
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_PIXCLK		0x05b4
-#define IOMUXC_SW_PAD_CTL_PAD_CSI1_MCLK			0x05b8
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D12			0x05bc
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D13			0x05c0
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D14			0x05c4
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D15			0x05c8
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D16			0x05cc
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D17			0x05d0
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D18			0x05d4
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_D19			0x05d8
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_VSYNC		0x05dc
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_HSYNC		0x05e0
-#define IOMUXC_SW_PAD_CTL_PAD_CSI2_PIXCLK		0x05e4
-#define IOMUXC_SW_PAD_CTL_PAD_I2C1_CLK			0x05e8
-#define IOMUXC_SW_PAD_CTL_PAD_I2C1_DAT			0x05ec
-#define IOMUXC_SW_PAD_CTL_PAD_AUD3_BB_TXD		0x05f0
-#define IOMUXC_SW_PAD_CTL_PAD_AUD3_BB_RXD		0x05f4
-#define IOMUXC_SW_PAD_CTL_PAD_AUD3_BB_CK		0x05f8
-#define IOMUXC_SW_PAD_CTL_PAD_AUD3_BB_FS		0x05fc
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_MOSI		0x0600
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_MISO		0x0604
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_SS0			0x0608
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_SS1			0x060c
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_RDY			0x0610
-#define IOMUXC_SW_PAD_CTL_PAD_CSPI1_SCLK		0x0614
-#define IOMUXC_SW_PAD_CTL_PAD_UART1_RXD			0x0618
-#define IOMUXC_SW_PAD_CTL_PAD_UART1_TXD			0x061c
-#define IOMUXC_SW_PAD_CTL_PAD_UART1_RTS			0x0620
-#define IOMUXC_SW_PAD_CTL_PAD_UART1_CTS			0x0624
-#define IOMUXC_SW_PAD_CTL_PAD_UART2_RXD			0x0628
-#define IOMUXC_SW_PAD_CTL_PAD_UART2_TXD			0x062c
-#define IOMUXC_SW_PAD_CTL_PAD_UART3_RXD			0x0630
-#define IOMUXC_SW_PAD_CTL_PAD_UART3_TXD			0x0634
-#define IOMUXC_SW_PAD_CTL_PAD_OWIRE_LINE		0x0638
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW0			0x063c
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW1			0x0640
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW2			0x0644
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW3			0x0648
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL0			0x064c
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL1			0x0650
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL2			0x0654
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL3			0x0658
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL4			0x065c
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL5			0x0660
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TCK			0x0664
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TMS			0x0668
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TDI			0x066c
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TRSTB		0x0670
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_MOD			0x0674
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_CLK			0x0678
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DIR			0x067c
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_STP			0x0680
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_NXT			0x0684
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA0		0x0688
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA1		0x068c
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA2		0x0690
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA3		0x0694
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA4		0x0698
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA5		0x069c
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA6		0x06a0
-#define IOMUXC_SW_PAD_CTL_PAD_USBH1_DATA7		0x06a4
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN11			0x06a8
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN12			0x06ac
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN13			0x06b0
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_D0_CS			0x06b4
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_D1_CS			0x06b8
-#define IOMUXC_SW_PAD_CTL_PAD_DISPB2_SER_DIN		0x06bc
-#define IOMUXC_SW_PAD_CTL_PAD_DISPB2_SER_DIO		0x06c0
-#define IOMUXC_SW_PAD_CTL_PAD_DISPB2_SER_CLK		0x06c4
-#define IOMUXC_SW_PAD_CTL_PAD_DISPB2_SER_RS		0x06c8
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT0		0x06cc
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT1		0x06d0
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT2		0x06d4
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT3		0x06d8
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT4		0x06dc
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT5		0x06e0
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT6		0x06e4
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT7		0x06e8
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT8		0x06ec
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT9		0x06f0
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT10		0x06f4
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT11		0x06f8
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT12		0x06fc
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT13		0x0700
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT14		0x0704
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT15		0x0708
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT16		0x070c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT17		0x0710
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT18		0x0714
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT19		0x0718
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT20		0x071c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT21		0x0720
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT22		0x0724
-#define IOMUXC_SW_PAD_CTL_PAD_DISP1_DAT23		0x0728
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN3			0x072c
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_DISP_CLK		0x0730
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN2			0x0734
-#define IOMUXC_SW_PAD_CTL_PAD_DI1_PIN15			0x0738
-#define IOMUXC_SW_PAD_CTL_PAD_DI_GP1			0x073c
-#define IOMUXC_SW_PAD_CTL_PAD_DI_GP2			0x0740
-#define IOMUXC_SW_PAD_CTL_PAD_DI_GP3			0x0744
-#define IOMUXC_SW_PAD_CTL_PAD_DI2_PIN4			0x0748
-#define IOMUXC_SW_PAD_CTL_PAD_DI2_PIN2			0x074c
-#define IOMUXC_SW_PAD_CTL_PAD_DI2_PIN3			0x0750
-#define IOMUXC_SW_PAD_CTL_PAD_DI2_DISP_CLK		0x0754
-#define IOMUXC_SW_PAD_CTL_PAD_DI_GP4			0x0758
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT0		0x075c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT1		0x0760
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT2		0x0764
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT3		0x0768
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT4		0x076c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT5		0x0770
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT6		0x0774
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT7		0x0778
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT8		0x077c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT9		0x0780
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT10		0x0784
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT11		0x0788
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT12		0x078c
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT13		0x0790
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT14		0x0794
-#define IOMUXC_SW_PAD_CTL_PAD_DISP2_DAT15		0x0798
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_CMD			0x079c
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_CLK			0x07a0
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA0			0x07a4
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA1			0x07a8
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA2			0x07ac
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA3			0x07b0
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_0			0x07b4
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_1			0x07b8
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_CMD			0x07bc
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_CLK			0x07c0
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA0			0x07c4
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA1			0x07c8
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA2			0x07cc
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA3			0x07d0
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_2			0x07d4
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_3			0x07d8
-#define IOMUXC_SW_PAD_CTL_PAD_RESET_IN_B		0x07dc
-#define IOMUXC_SW_PAD_CTL_PAD_POR_B			0x07e0
-#define IOMUXC_SW_PAD_CTL_PAD_BOOT_MODE1		0x07e4
-#define IOMUXC_SW_PAD_CTL_PAD_BOOT_MODE0		0x07e8
-#define IOMUXC_SW_PAD_CTL_PAD_PMIC_RDY			0x07ec
-#define IOMUXC_SW_PAD_CTL_PAD_CKIL			0x07f0
-#define IOMUXC_SW_PAD_CTL_PAD_PMIC_STBY_REQ		0x07f4
-#define IOMUXC_SW_PAD_CTL_PAD_PMIC_ON_REQ		0x07f8
-#define IOMUXC_SW_PAD_CTL_PAD_PMIC_INT_REQ		0x07fc
-#define IOMUXC_SW_PAD_CTL_PAD_CLK_SS			0x0800
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_4			0x0804
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_5			0x0808
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_6			0x080c
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_7			0x0810
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_8			0x0814
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO1_9			0x0818
-#define IOMUXC_SW_PAD_CTL_GRP_CSI2_PKE0			0x081c
-#define IOMUXC_SW_PAD_CTL_GRP_DDRPKS			0x0820
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_SR1			0x0824
-#define IOMUXC_SW_PAD_CTL_GRP_DISP2_PKE0		0x0828
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B4			0x082c
-#define IOMUXC_SW_PAD_CTL_GRP_INDDR			0x0830
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_SR2			0x0834
-#define IOMUXC_SW_PAD_CTL_GRP_PKEDDR			0x0838
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_A0			0x083c
-#define IOMUXC_SW_PAD_CTL_GRP_EMI_PKE0			0x0840
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_SR3			0x0844
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_A1			0x0848
-#define IOMUXC_SW_PAD_CTL_GRP_DDRAPUS			0x084c
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_SR4			0x0850
-#define IOMUXC_SW_PAD_CTL_GRP_EMI_SR5			0x0854
-#define IOMUXC_SW_PAD_CTL_GRP_EMI_SR6			0x0858
-#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR0			0x085c
-#define IOMUXC_SW_PAD_CTL_GRP_CSI1_PKE0			0x0860
-#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR1			0x0864
-#define IOMUXC_SW_PAD_CTL_GRP_DISP1_PKE0		0x0868
-#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR2			0x086c
-#define IOMUXC_SW_PAD_CTL_GRP_HVDDR			0x0870
-#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR3			0x0874
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B0		0x0878
-#define IOMUXC_SW_PAD_CTL_GRP_DDRAPKS			0x087c
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B1		0x0880
-#define IOMUXC_SW_PAD_CTL_GRP_DDRPUS			0x0884
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_DS1			0x0888
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B2		0x088c
-#define IOMUXC_SW_PAD_CTL_GRP_PKEADDR			0x0890
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_DS2			0x0894
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_DS3			0x0898
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B4		0x089c
-#define IOMUXC_SW_PAD_CTL_GRP_INMODE1			0x08a0
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B0			0x08a4
-#define IOMUXC_SW_PAD_CTL_GRP_EIM_DS4			0x08a8
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B1			0x08ac
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A0			0x08b0
-#define IOMUXC_SW_PAD_CTL_GRP_EMI_DS5			0x08b4
-#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B2			0x08b8
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A1			0x08bc
-#define IOMUXC_SW_PAD_CTL_GRP_EMI_DS6			0x08c0
-#define IOMUXC_AUDMUX_P4_INPUT_DA_AMX_SELECT_INPUT	0x08c4
-#define IOMUXC_AUDMUX_P4_INPUT_DB_AMX_SELECT_INPUT	0x08c8
-#define IOMUXC_AUDMUX_P4_INPUT_TXCLK_AMX_SELECT_INPUT	0x08cc
-#define IOMUXC_AUDMUX_P4_INPUT_TXFS_AMX_SELECT_INPUT	0x08d0
-#define IOMUXC_AUDMUX_P5_INPUT_DA_AMX_SELECT_INPUT	0x08d4
-#define IOMUXC_AUDMUX_P5_INPUT_DB_AMX_SELECT_INPUT	0x08d8
-#define IOMUXC_AUDMUX_P5_INPUT_RXCLK_AMX_SELECT_INPUT	0x08dc
-#define IOMUXC_AUDMUX_P5_INPUT_RXFS_AMX_SELECT_INPUT	0x08e0
-#define IOMUXC_AUDMUX_P5_INPUT_TXCLK_AMX_SELECT_INPUT	0x08e4
-#define IOMUXC_AUDMUX_P5_INPUT_TXFS_AMX_SELECT_INPUT	0x08e8
-#define IOMUXC_AUDMUX_P6_INPUT_DA_AMX_SELECT_INPUT	0x08ec
-#define IOMUXC_AUDMUX_P6_INPUT_DB_AMX_SELECT_INPUT	0x08f0
-#define IOMUXC_AUDMUX_P6_INPUT_RXCLK_AMX_SELECT_INPUT	0x08f4
-#define IOMUXC_AUDMUX_P6_INPUT_RXFS_AMX_SELECT_INPUT	0x08f8
-#define IOMUXC_AUDMUX_P6_INPUT_TXCLK_AMX_SELECT_INPUT	0x08fc
-#define IOMUXC_AUDMUX_P6_INPUT_TXFS_AMX_SELECT_INPUT	0x0900
-#define IOMUXC_CCM_IPP_DI0_CLK_SELECT_INPUT		0x0904
-#define IOMUXC_CCM_IPP_DI1_CLK_SELECT_INPUT		0x0908
-#define IOMUXC_CCM_PLL1_BYPASS_CLK_SELECT_INPUT		0x090c
-#define IOMUXC_CCM_PLL2_BYPASS_CLK_SELECT_INPUT		0x0910
-#define IOMUXC_CSPI_IPP_CSPI_CLK_IN_SELECT_INPUT	0x0914
-#define IOMUXC_CSPI_IPP_IND_MISO_SELECT_INPUT		0x0918
-#define IOMUXC_CSPI_IPP_IND_MOSI_SELECT_INPUT		0x091c
-#define IOMUXC_CSPI_IPP_IND_SS1_B_SELECT_INPUT		0x0920
-#define IOMUXC_CSPI_IPP_IND_SS2_B_SELECT_INPUT		0x0924
-#define IOMUXC_CSPI_IPP_IND_SS3_B_SELECT_INPUT		0x0928
-#define IOMUXC_DPLLIP1_L1T_TOG_EN_SELECT_INPUT		0x092c
-#define IOMUXC_ECSPI2_IPP_IND_SS_B_1_SELECT_INPUT	0x0930
-#define IOMUXC_ECSPI2_IPP_IND_SS_B_3_SELECT_INPUT	0x0934
-#define IOMUXC_EMI_IPP_IND_RDY_INT_SELECT_INPUT		0x0938
-#define IOMUXC_ESDHC3_IPP_DAT0_IN_SELECT_INPUT		0x093c
-#define IOMUXC_ESDHC3_IPP_DAT1_IN_SELECT_INPUT		0x0940
-#define IOMUXC_ESDHC3_IPP_DAT2_IN_SELECT_INPUT		0x0944
-#define IOMUXC_ESDHC3_IPP_DAT3_IN_SELECT_INPUT		0x0948
-#define IOMUXC_FEC_FEC_COL_SELECT_INPUT			0x094c
-#define IOMUXC_FEC_FEC_CRS_SELECT_INPUT			0x0950
-#define IOMUXC_FEC_FEC_MDI_SELECT_INPUT			0x0954
-#define IOMUXC_FEC_FEC_RDATA_0_SELECT_INPUT		0x0958
-#define IOMUXC_FEC_FEC_RDATA_1_SELECT_INPUT		0x095c
-#define IOMUXC_FEC_FEC_RDATA_2_SELECT_INPUT		0x0960
-#define IOMUXC_FEC_FEC_RDATA_3_SELECT_INPUT		0x0964
-#define IOMUXC_FEC_FEC_RX_CLK_SELECT_INPUT		0x0968
-#define IOMUXC_FEC_FEC_RX_DV_SELECT_INPUT		0x096c
-#define IOMUXC_FEC_FEC_RX_ER_SELECT_INPUT		0x0970
-#define IOMUXC_FEC_FEC_TX_CLK_SELECT_INPUT		0x0974
-#define IOMUXC_GPIO3_IPP_IND_G_IN_1_SELECT_INPUT	0x0978
-#define IOMUXC_GPIO3_IPP_IND_G_IN_2_SELECT_INPUT	0x097c
-#define IOMUXC_GPIO3_IPP_IND_G_IN_3_SELECT_INPUT	0x0980
-#define IOMUXC_GPIO3_IPP_IND_G_IN_4_SELECT_INPUT	0x0984
-#define IOMUXC_GPIO3_IPP_IND_G_IN_5_SELECT_INPUT	0x0988
-#define IOMUXC_GPIO3_IPP_IND_G_IN_6_SELECT_INPUT	0x098c
-#define IOMUXC_GPIO3_IPP_IND_G_IN_7_SELECT_INPUT	0x0990
-#define IOMUXC_GPIO3_IPP_IND_G_IN_8_SELECT_INPUT	0x0994
-#define IOMUXC_GPIO3_IPP_IND_G_IN_12_SELECT_INPUT	0x0998
-#define IOMUXC_HSC_MIPI_MIX_PAR0_VSYNC_SELECT_INPUT	0x09a4
-#define IOMUXC_HSC_MIPI_MIX_PAR1_DI_WAIT_SELECT_INPUT	0x09a8
-#define IOMUXC_HSC_MIPI_MIX_PAR_SISG_TRIG_SELECT_INPUT	0x09ac
-#define IOMUXC_I2C1_IPP_SCL_IN_SELECT_INPUT		0x09b0
-#define IOMUXC_I2C1_IPP_SDA_IN_SELECT_INPUT		0x09b4
-#define IOMUXC_I2C2_IPP_SCL_IN_SELECT_INPUT		0x09b8
-#define IOMUXC_I2C2_IPP_SDA_IN_SELECT_INPUT		0x09bc
-#define IOMUXC_IPU_IPP_DI_0_IND_DISPB_SD_D_SELECT_INPUT	0x09c0
-#define IOMUXC_IPU_IPP_DI_1_IND_DISPB_SD_D_SELECT_INPUT	0x09c4
-#define IOMUXC_KPP_IPP_IND_COL_6_SELECT_INPUT		0x09c8
-#define IOMUXC_KPP_IPP_IND_COL_7_SELECT_INPUT		0x09cc
-#define IOMUXC_KPP_IPP_IND_ROW_4_SELECT_INPUT		0x09d0
-#define IOMUXC_KPP_IPP_IND_ROW_5_SELECT_INPUT		0x09d4
-#define IOMUXC_KPP_IPP_IND_ROW_6_SELECT_INPUT		0x09d8
-#define IOMUXC_KPP_IPP_IND_ROW_7_SELECT_INPUT		0x09dc
-#define IOMUXC_UART1_IPP_UART_RTS_B_SELECT_INPUT	0x09e0
-#define IOMUXC_UART1_IPP_UART_RXD_MUX_SELECT_INPUT	0x09e4
-#define IOMUXC_UART2_IPP_UART_RTS_B_SELECT_INPUT	0x09e8
-#define IOMUXC_UART2_IPP_UART_RXD_MUX_SELECT_INPUT	0x09ec
-#define IOMUXC_UART3_IPP_UART_RTS_B_SELECT_INPUT	0x09f0
-#define IOMUXC_UART3_IPP_UART_RXD_MUX_SELECT_INPUT	0x09f4
-#define IOMUXC_USBOH3_IPP_IND_UH3_CLK_SELECT_INPUT	0x09f8
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_0_SELECT_INPUT	0x09fc
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_1_SELECT_INPUT	0x0a00
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_2_SELECT_INPUT	0x0a04
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_3_SELECT_INPUT	0x0a08
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_4_SELECT_INPUT	0x0a0c
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_5_SELECT_INPUT	0x0a10
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_6_SELECT_INPUT	0x0a14
-#define IOMUXC_USBOH3_IPP_IND_UH3_DATA_7_SELECT_INPUT	0x0a18
-#define IOMUXC_USBOH3_IPP_IND_UH3_DIR_SELECT_INPUT	0x0a1c
-#define IOMUXC_USBOH3_IPP_IND_UH3_NXT_SELECT_INPUT	0x0a20
-#define IOMUXC_USBOH3_IPP_IND_UH3_STP_SELECT_INPUT	0x0a24
-
-/* MUX & PAD Control */
-
-#define MUX_PIN(name)				\
-	IOMUX_PIN(IOMUXC_SW_MUX_CTL_PAD_##name,	\
-	    IOMUXC_SW_PAD_CTL_PAD_##name)
-
-#define MUX_PIN_MUX(name)			\
-	IOMUX_PIN(IOMUXC_SW_MUX_CTL_PAD_##name, IOMUX_PAD_NONE)
-
-#define MUX_PIN_PAD(name) \
-	IOMUX_PIN(IOMUX_MUX_NONE, IOMUXC_SW_PAD_CTL_PAD_##name)
-
-#define MUX_PIN_GRP(name) \
-	IOMUX_PIN(IOMUX_MUX_NONE, IOMUXC_SW_PAD_CTL_GRP_##name)
-
-#define MUX_PIN_PATH(name) \
-	IOMUX_PIN(IOMUXC_##name##_SELECT_INPUT, IOMUX_MUX_NONE)
-
-/* INPUT Control */
-
-#define MUX_SELECT(name) (name##_SELECT_INPUT)
-
-#endif /* _IMX51_IOMUXREG_H */
diff --git a/sys/arm/freescale/imx/imx6_iomux.c b/sys/arm/freescale/imx/imx6_iomux.c
deleted file mode 100644
index b15e503071d2..000000000000
--- a/sys/arm/freescale/imx/imx6_iomux.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * Copyright (c) 2014 Boris Samorodov <bsam@FreeBSD.org>
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/rman.h>
-
-#include <machine/bus.h>
-#include <machine/fdt.h>
-
-#include <dev/fdt/fdt_common.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-
-#include <arm/freescale/imx/imx_iomuxvar.h>
-#include "imx6_iomuxreg.h"
-
-#define	IOMUX_WRITE(_sc, _r, _v) \
-	bus_write_4((_sc)->sc_res, (_r), (_v))
-#define	IOMUX_READ(_sc, _r) \
-	bus_read_4((_sc)->sc_res, (_r))
-#define	IOMUX_SET(_sc, _r, _m) \
-	IOMUX_WRITE((_sc), (_r), IOMUX_READ((_sc), (_r)) | (_m))
-#define	IOMUX_CLEAR(_sc, _r, _m) \
-	IOMUX_WRITE((_sc), (_r), IOMUX_READ((_sc), (_r)) & ~(_m))
-
-struct imx6_iomux_softc {
-	struct resource *sc_res;
-	device_t sc_dev;
-};
-
-static struct imx6_iomux_softc *iomuxsc = NULL;
-
-static struct resource_spec imx6_iomux_spec[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
-	{ -1, 0 }
-};
-
-static int
-imx6_iomux_probe(device_t dev)
-{
-	if (!ofw_bus_status_okay(dev))
-		return (ENXIO);
-
-	if (!ofw_bus_is_compatible(dev, "fsl,imx6-iomux"))
-		return (ENXIO);
-
-	device_set_desc(dev, "Freescale i.MX6 IO pins multiplexor");
-	return (BUS_PROBE_DEFAULT);
-
-}
-
-static int
-imx6_iomux_attach(device_t dev)
-{
-	struct imx6_iomux_softc * sc;
-
-	sc = device_get_softc(dev);
-
-	if (bus_alloc_resources(dev, imx6_iomux_spec, &sc->sc_res)) {
-		device_printf(dev, "could not allocate resources\n");
-		return (ENXIO);
-	}
-
-	iomuxsc = sc;
-
-	/*
-	 * XXX: place to fetch all info about pinmuxing from loader data
-	 * (FDT blob) and apply. Loader (1st one) must care about
-	 * device-to-device difference.
-	 */
-
-	return (0);
-}
-
-static int
-imx6_iomux_detach(device_t dev)
-{
-
-	/* IOMUX registers are always accessible. */
-	return (EBUSY);
-}
-
-static void
-iomux_set_pad_sub(struct imx6_iomux_softc *sc, uint32_t pin, uint32_t config)
-{
-	bus_size_t pad_ctl_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin);
-
-	if (pad_ctl_reg != IOMUX_PAD_NONE)
-		IOMUX_WRITE(sc, pad_ctl_reg, config);
-}
-
-void
-iomux_set_pad(unsigned int pin, unsigned int config)
-{
-
-	if (iomuxsc == NULL)
-		return;
-	iomux_set_pad_sub(iomuxsc, pin, config);
-}
-
-static void
-iomux_set_function_sub(struct imx6_iomux_softc *sc, uint32_t pin, uint32_t fn)
-{
-	bus_size_t mux_ctl_reg = IOMUX_PIN_TO_MUX_ADDRESS(pin);
-
-	if (mux_ctl_reg != IOMUX_MUX_NONE)
-		IOMUX_WRITE(sc, mux_ctl_reg, fn);
-}
-
-void
-iomux_set_function(unsigned int pin, unsigned int fn)
-{
-
-	if (iomuxsc == NULL)
-		return;
-	iomux_set_function_sub(iomuxsc, pin, fn);
-}
-
-static uint32_t
-iomux_get_pad_config_sub(struct imx6_iomux_softc *sc, uint32_t pin)
-{
-	bus_size_t pad_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin);
-	uint32_t result;
-
-	result = IOMUX_READ(sc, pad_reg);
-
-	return(result);
-}
-
-unsigned int
-iomux_get_pad_config(unsigned int pin)
-{
-
-	return(iomux_get_pad_config_sub(iomuxsc, pin));
-}
-
-
-uint32_t
-imx_iomux_gpr_get(u_int regnum)
-{
-
-	KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_get() called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 13, 
-	    ("imx_iomux_gpr_get bad regnum %u", regnum));
-	return (IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum));
-}
-
-void
-imx_iomux_gpr_set(u_int regnum, uint32_t val)
-{
-
-	KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_set() called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 13, 
-	    ("imx_iomux_gpr_set bad regnum %u", regnum));
-	IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
-}
-
-void
-imx_iomux_gpr_set_masked(u_int regnum, uint32_t clrbits, uint32_t setbits)
-{
-	uint32_t val;
-
-	KASSERT(iomuxsc != NULL, 
-	    ("imx_iomux_gpr_set_masked called before attach"));
-	KASSERT(regnum >= 0 && regnum <= 13, 
-	    ("imx_iomux_gpr_set_masked bad regnum %u", regnum));
-
-	val = IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum);
-	val = (val & ~clrbits) | setbits;
-	IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val);
-}
-
-static device_method_t imx6_iomux_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,         imx6_iomux_probe),
-	DEVMETHOD(device_attach,        imx6_iomux_attach),
-	DEVMETHOD(device_detach,        imx6_iomux_detach),
-
-	DEVMETHOD_END
-};
-
-static driver_t imx6_iomux_driver = {
-	"imx6_iomux",
-	imx6_iomux_methods,
-	sizeof(struct imx6_iomux_softc),
-};
-
-static devclass_t imx6_iomux_devclass;
-
-EARLY_DRIVER_MODULE(imx6_iomux, simplebus, imx6_iomux_driver, 
-    imx6_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
-
-
diff --git a/sys/arm/freescale/imx/imx6_iomuxreg.h b/sys/arm/freescale/imx/imx6_iomuxreg.h
deleted file mode 100644
index 7b74cfc34cda..000000000000
--- a/sys/arm/freescale/imx/imx6_iomuxreg.h
+++ /dev/null
@@ -1,798 +0,0 @@
-/*-
- * Copyright (c) 2014 Boris Samorodov <bsam@FreeBSD.org>
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-/*
- * Pad                            : pin ("pin" is used at electric schemes,
- *                                  while at HW SOC it's named "pad").
- * Drive strength                 : the current that can be drawn with
- *                                  appropriate voltage (varies inversely with
- *                                  the supply impedance of the output pin).
- * Drive strength enable (DSE)    : The value of the current the pin uses.
- * HiZ (HYZ)                      : high input impedance value.
- * Daisy chain (DAISY)            : the one after another interconnection of
- *                                  devices.
- * On die termination (ODT)       : the termination resistor for impedance
- *                                  matching.
- * Software input on (SION)       : the value to force the pin to be an input
- *                                  one (i.e. to force the pin state reading).
- * Hysteresis (HYS)               : Controls if the value of the input pin
- *                                  remains the same until a sufficient change
- *                                  is applied.
- * Slow rate enable (SRE)         : How slow the pin value changes (slow rate
- *                                  saves power).
- * Open drain enable (ODE)        : If the input pin drains on low input or
- *                                  goes down.
- * Pull/keep enable (PKE)         : Enables pull/keep functionality.
- * PUll/keep select (PUE)         : Selects if the pin is pullup/pulldown one
- *                                  or remains it's previous role.
- *                                  A note: I'm not sure why it's not PKS...
- * Pullup (Pic.1)/pulldown (Pic.2): the pin's resistor connected to VCC (GND)
- *                                  to prevent random value drai.
- * Pullup/pulldown select (PUS)   : Selects the value of pullup/pulldown
- *                                  resistor.
- * Open drain (Pic.3)             : the output signal is applied to the base
- *                                  of a transistor whose collector is used
- *                                  as a pin.
- *
- * VCC o                VCC o                                 Open drain
- *     |                    |                             ---->  pin
- *    +++                   o|                           /
- *    | | R                  | Switch                   /
- *    +++  pullup           o|                      .---.
- *     |                    |                      / |/  \
- * >---+------> Pin     >---+------> Pin      >---{--|    )
- *     |                    |                      \ |\  /
- *     o|                  +++                      `--v'
- *      | Switch           | | R                        \
- *     o|                  +++  pulldown                 |
- *     |                    |                            |
- *   -----                -----                        -----
- *    ---                  ---                          ---
- *     -                    -                            -
- *
- *   Pic.1                Pic.2                        Pic.3
- */
-
-#ifndef	IMX6_IOMUXREG_H
-#define	IMX6_IOMUXREG_H
-
-/*
- * Multiplex control
- */
-#define	IOMUXC_MUX_CTL		0x004c
-#define	IOMUX_CONFIG_SION	(1<<4)
-#define	IOMUX_CONFIG_ALT0	0
-#define	IOMUX_CONFIG_ALT1	1
-#define	IOMUX_CONFIG_ALT2	2
-#define	IOMUX_CONFIG_ALT3	3
-#define	IOMUX_CONFIG_ALT4	4
-#define	IOMUX_CONFIG_ALT5	5
-#define	IOMUX_CONFIG_ALT6	6
-#define	IOMUX_CONFIG_ALT7	7
-
-/*
- * Pad control
- */
-#define	IOMUXC_PAD_CTL		0x0360
-						/* DDR Select Field */
-#define	PAD_CTL_DDR_SEL_0	(0x0<<18)
-#define	PAD_CTL_DDR_SEL_1	(0x1<<18)
-#define	PAD_CTL_DDR_SEL_2	(0x2<<18)
-#define	PAD_CTL_DDR_SEL_3	(0x3<<18)
-#define	PAD_CTL_DDR_INPUT	(0x1<<17)	/* DDR/CMOS Input Mode Field */
-#define	PAD_CTL_HYS		(1<<16)		/* Hysteresis Enable Field */
-						/* PullUp/Down Config Field: */
-#define	PAD_CTL_PUS_100K_PD	(0x0<<14)	/*   100K Ohm Pull Down */
-#define	PAD_CTL_PUS_47K_PU	(0x1<<14)	/*   47K Ohn Pull Up */
-#define	PAD_CTL_PUS_100K_PU	(0x2<<14)	/*   100K Ohm Pull Up */
-#define	PAD_CTL_PUS_22K_PU	(0x3<<14)	/*   22K Ohm Pull Up */
-#define	PAD_CTL_PUE		(1<<13)		/* Pull/Keep Select Field */
-#define	PAD_CTL_PKE		(1<<12)		/* Pull/Keep Enable Field */
-#define	PAD_CTL_ODE		(1<<11)		/* Open Drain Enable Field */
-						/* On Die Termination Field: */
-#define	PAD_CTL_ODT_DISABLED	(0x0<<8)	/*   Disabled */
-#define	PAD_CTL_ODT_1		(0x1<<8)
-#define	PAD_CTL_ODT_2		(0x2<<8)
-#define	PAD_CTL_ODT_3		(0x3<<8)
-#define	PAD_CTL_ODT_4		(0x4<<8)
-#define	PAD_CTL_ODT_5		(0x5<<8)
-#define	PAD_CTL_ODT_6		(0x6<<8)
-#define	PAD_CTL_ODT_7		(0x7<<8)
-						/* Speed Field: */
-#define	PAD_CTL_SPEED_RESERVED0	(0x0<<6)	/*   RESERVED */
-#define	PAD_CTL_SPEED_50_MHZ	(0x1<<6)	/*   50 MHz */
-#define	PAD_CTL_SPEED_100_MHZ	(0x2<<6)	/*   100 MHz */
-#define	PAD_CTL_SPEED_200_MHZ	(0x3<<6)	/*   200 MHz */
-						/* Drive Strength Field */
-#define	PAD_CTL_DSE_HIZ		(0x0<<3)	/*   HI-Z */
-#define	PAD_CTL_DSE_1		(0x1<<3)
-#define	PAD_CTL_DSE_2		(0x2<<3)
-#define	PAD_CTL_DSE_3		(0x3<<3)
-#define	PAD_CTL_DSE_4		(0x4<<3)
-#define	PAD_CTL_DSE_5		(0x5<<3)
-#define	PAD_CTL_DSE_6		(0x6<<3)
-#define	PAD_CTL_DSE_7		(0x7<<3)
-#define	PAD_CTL_SRE		(0x1<<0)	/* Slew rate Field */
-
-/*
- * Input control
- */
-#define	IOMUXC_INPUT_CTL	0x07b0			/* input control */
-#define	INPUT_DAISY_0		0
-#define	INPUT_DAISY_1		1
-#define	INPUT_DAISY_2		2
-#define	INPUT_DAISY_3		3
-#define	INPUT_DAISY_4		4
-#define	INPUT_DAISY_5		5
-#define	INPUT_DAISY_6		6
-#define	INPUT_DAISY_7		7
-
-/*
- * IOMUX index
- */
-#define	IOMUX_PIN_TO_MUX_ADDRESS(pin)	  (((pin) >> 16) & 0xffff)
-#define	IOMUX_PIN_TO_PAD_ADDRESS(pin)	  (((pin) >>  0) & 0xffff)
-#define	IOMUX_PIN(mux_adr, pad_adr) \
-	(((mux_adr) << 16) | (((pad_adr) << 0)))
-#define	IOMUX_MUX_NONE	 0xffff
-#define	IOMUX_PAD_NONE	 0xffff
-
-/*
- * MUX & PAD Control
- */
-#define MUX_PIN(name) \
-	IOMUX_PIN(IOMUXC_SW_MUX_CTL_PAD_##name, \
-	    IOMUXC_SW_PAD_CTL_PAD_##name)
-
-#define MUX_PIN_MUX(name) \
-	IOMUX_PIN(IOMUXC_SW_MUX_CTL_PAD_##name, IOMUX_PAD_NONE)
-
-#define MUX_PIN_PAD(name) \
-	IOMUX_PIN(IOMUX_MUX_NONE, IOMUXC_SW_PAD_CTL_PAD_##name)
-
-#define MUX_PIN_GRP(name) \
-	IOMUX_PIN(IOMUX_MUX_NONE, IOMUXC_SW_PAD_CTL_GRP_##name)
-
-#define MUX_PIN_PATH(name) \
-	IOMUX_PIN(IOMUXC_##name##_SELECT_INPUT, IOMUX_MUX_NONE)
-
-/*
- * INPUT Control
- */
-#define MUX_SELECT(name) (name##_SELECT_INPUT)
-
-/*
- * Register names, offset addresses (and reset values for reference)
- * from Chapter 36 IOMUX Controller (IOMUXC), IMX6DQRM, Rev.1, 04/2013
- *
- * General Purpose Registers
- */
-#define IOMUXC_GPR0					0x0000	/* 0x00000000 */
-#define IOMUXC_GPR1					0x0004	/* 0x48400005 */
-#define IOMUXC_GPR2					0x0008	/* 0x00000000 */
-#define IOMUXC_GPR3					0x000c	/* 0x01e00000 */
-#define IOMUXC_GPR4					0x0010	/* 0x00000000 */
-#define IOMUXC_GPR5					0x0014	/* 0x00000000 */
-#define IOMUXC_GPR6					0x0018	/* 0x22222222 */
-#define IOMUXC_GPR7					0x001c	/* 0x22222222 */
-#define IOMUXC_GPR8					0x0020	/* 0x00000000 */
-#define IOMUXC_GPR9					0x0024	/* 0x00000000 */
-#define IOMUXC_GPR10					0x0028	/* 0x00003800 */
-#define IOMUXC_GPR11					0x002c	/* 0x00003800 */
-#define IOMUXC_GPR12					0x0030	/* 0x0f000000 */
-#define IOMUXC_GPR13					0x0034	/* 0x059124c4 */
-/*
- * Pad Mux Registers
- */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA1			0x004c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA2			0x0050	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA0			0x0054	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TXC			0x0058	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TD0			0x005c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TD1			0x0060	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TD2			0x0064	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TD3			0x0068	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RX_CTL		0x006c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RD0			0x0070	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_TX_CTL		0x0074	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RD1			0x0078	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RD2			0x007c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RD3			0x0080	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_RGMII_RXC			0x0084	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR25		0x0088	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB2_B			0x008c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA16		0x0090	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA17		0x0094	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA18		0x0098	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA19		0x009c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA20		0x00a0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA21		0x00a4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA22		0x00a8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA23		0x00ac	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB3_B			0x00b0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA24		0x00b4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA25		0x00b8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA26		0x00bc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA27		0x00c0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA28		0x00c4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA29		0x00c8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA30		0x00cc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_DATA31		0x00d0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR24		0x00d4	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR23		0x00d8	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR22		0x00dc	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR21		0x00e0	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR20		0x00e4	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR19		0x00e8	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR18		0x00ec	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR17		0x00f0	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_ADDR16		0x00f4	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS0_B			0x00f8	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_CS1_B			0x00fc	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_OE_B			0x0100	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_RW			0x0104	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_LBA_B			0x0108	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB0_B			0x010c	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_EB1_B			0x0110	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD00			0x0114	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD01			0x0118	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD02			0x011c	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD03			0x0120	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD04			0x0124	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD05			0x0128	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD06			0x012c	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD07			0x0130	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD08			0x0134	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD09			0x0138	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD10			0x013c	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD11			0x0140	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD12			0x0144	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD13			0x0148	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD14			0x014c	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_AD15			0x0150	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_WAIT_B		0x0154	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_EIM_BCLK			0x0158	/* 0x00000000 */
-#define IOMUXC_SW_MUX_CTL_PAD_DI0_DISP_CLK		0x015c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DI0_PIN15			0x0160	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DI0_PIN02			0x0164	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DI0_PIN03			0x0168	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DI0_PIN04			0x016c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA00		0x0170	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA01		0x0174	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA02		0x0178	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA03		0x017c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA04		0x0180	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA05		0x0184	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA06		0x0188	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA07		0x018c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA08		0x0190	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA09		0x0194	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA10		0x0198	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA11		0x019c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA12		0x01a0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA13		0x01a4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA14		0x01a8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA15		0x01ac	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA16		0x01b0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA17		0x01b4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA18		0x01b8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA19		0x01bc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA20		0x01c0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA21		0x01c4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA22		0x01c8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_DISP0_DATA23		0x01cc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_MDIO			0x01d0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_REF_CLK		0x01d4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_RX_ER		0x01d8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_CRS_DV		0x01dc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_RX_DATA1		0x01e0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_RX_DATA0		0x01e4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_TX_EN		0x01e8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_TX_DATA1		0x01ec	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_TX_DATA0		0x01f0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_ENET_MDC			0x01f4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL0			0x01f8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW0			0x01fc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL1			0x0200	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW1			0x0204	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL2			0x0208	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW2			0x020c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL3			0x0210	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW3			0x0214	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_COL4			0x0218	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_KEY_ROW4			0x021c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO00			0x0220	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO01			0x0224	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO09			0x0228	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO03			0x022c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO06			0x0230	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO02			0x0234	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO04			0x0238	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO05			0x023c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO07			0x0240	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO08			0x0244	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO16			0x0248	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO17			0x024c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO18			0x0250	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_GPIO19			0x0254	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_PIXCLK		0x0258	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_HSYNC		0x025c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA_EN		0x0260	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_VSYNC		0x0264	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA04		0x0268	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA05		0x026c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA06		0x0270	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA07		0x0274	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA08		0x0278	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA09		0x027c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA10		0x0280	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA11		0x0284	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA12		0x0288	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA13		0x028c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA14		0x0290	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA15		0x0294	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA16		0x0298	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA17		0x029c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA18		0x02a0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_CSI0_DATA19		0x02a4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA7			0x02a8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA6			0x02ac	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA5			0x02b0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA4			0x02b4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_CMD			0x02b8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_CLK			0x02bc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA0			0x02c0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA1			0x02c4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA2			0x02c8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_DATA3			0x02cc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD3_RESET			0x02d0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_CLE			0x02d4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_ALE			0x02d8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_WP_B			0x02dc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_READY_B		0x02e0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_CS0_B		0x02e4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_CS1_B		0x02e8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_CS2_B		0x02ec	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_CS3_B		0x02f0	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_CMD			0x02f4	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_CLK			0x02f8	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA00		0x02fc	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA01		0x0300	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA02		0x0304	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA03		0x0308	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA04		0x030c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA05		0x0310	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA06		0x0314	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_NAND_DATA07		0x0318	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA0			0x031c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA1			0x0320	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA2			0x0324	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA3			0x0328	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA4			0x032c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA5			0x0330	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA6			0x0334	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD4_DATA7			0x0338	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA1			0x033c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA0			0x0340	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA3			0x0344	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_CMD			0x0348	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_DATA2			0x034c	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD1_CLK			0x0350	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_CLK			0x0354	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_CMD			0x0358	/* 0x00000005 */
-#define IOMUXC_SW_MUX_CTL_PAD_SD2_DATA3			0x035c	/* 0x00000005 */
-/*
- * Pad Control registers
- */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA1			0x0360	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA2			0x0364	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA0			0x0368	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TXC			0x036c	/* 0x00013030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TD0			0x0370	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TD1			0x0374	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TD2			0x0378	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TD3			0x037c	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RX_CTL		0x0380	/* 0x00013030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RD0			0x0384	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_TX_CTL		0x0388	/* 0x00013030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RD1			0x038c	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RD2			0x0390	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RD3			0x0394	/* 0x0001b030 */
-#define IOMUXC_SW_PAD_CTL_PAD_RGMII_RXC			0x0398	/* 0x00013030 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR25		0x039c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB2_B			0x03a0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA16		0x03a4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA17		0x03a8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA18		0x03ac	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA19		0x03b0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA20		0x03b4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA21		0x03b8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA22		0x03bc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA23		0x03c0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB3_B			0x03c4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA24		0x03c8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA25		0x03cc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA26		0x03d0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA27		0x03d4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA28		0x03d8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA29		0x03dc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA30		0x03e0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_DATA31		0x03e4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR24		0x03e8	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR23		0x03ec	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR22		0x03f0	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR21		0x03f4	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR20		0x03f8	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR19		0x03fc	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR18		0x0400	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR17		0x0404	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_ADDR16		0x0408	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS0_B			0x040c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_CS1_B			0x0410	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_OE_B			0x0414	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_RW			0x0418	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_LBA_B			0x041c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB0_B			0x0420	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_EB1_B			0x0424	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD00			0x0428	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD01			0x042c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD02			0x0430	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD03			0x0434	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD04			0x0438	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD05			0x043c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD06			0x0440	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD07			0x0444	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD08			0x0448	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD09			0x044c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD10			0x0450	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD11			0x0454	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD12			0x0458	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD13			0x045c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD14			0x0460	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_AD15			0x0464	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_WAIT_B		0x0468	/* 0x0000b060 */
-#define IOMUXC_SW_PAD_CTL_PAD_EIM_BCLK			0x046c	/* 0x0000b0b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_DI0_DISP_CLK		0x0470	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DI0_PIN15			0x0474	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DI0_PIN02			0x0478	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DI0_PIN03			0x047c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DI0_PIN04			0x0480	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA00		0x0484	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA01		0x0488	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA02		0x048c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA03		0x0490	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA04		0x0494	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA05		0x0498	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA06		0x049c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA07		0x04a0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA08		0x04a4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA09		0x04a8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA10		0x04ac	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA11		0x04b0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA12		0x04b4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA13		0x04b8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA14		0x04bc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA15		0x04c0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA16		0x04c4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA17		0x04c8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA18		0x04cc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA19		0x04d0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA20		0x04d4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA21		0x04d8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA22		0x04dc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DISP0_DATA23		0x04e0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_MDIO			0x04e4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_REF_CLK		0x04e8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_RX_ER		0x04ec	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_CRS_DV		0x04f0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_RX_DATA1		0x04f4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_RX_DATA0		0x04f8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_TX_EN		0x04fc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_TX_DATA1		0x0500	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_TX_DATA0		0x0504	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_ENET_MDC			0x0508	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS5_P		0x050c	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM5			0x0510	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM4			0x0514	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS4_P		0x0518	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3_P		0x051c	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3			0x0520	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2_P		0x0524	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2			0x0528	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR00		0x052c	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR01		0x0530	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR02		0x0534	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR03		0x0538	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR04		0x053c	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR05		0x0540	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR06		0x0544	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR07		0x0548	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR08		0x054c	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR09		0x0550	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR10		0x0554	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR11		0x0558	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR12		0x055c	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR13		0x0560	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR14		0x0564	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR15		0x0568	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS_B		0x056c	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0_B		0x0570	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1_B		0x0574	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS_B		0x0578	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_RESET		0x057c	/* 0x00083030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA0		0x0580	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA1		0x0584	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK0_P		0x0588	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA2		0x058c	/* 0x0000b000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0		0x0590	/* 0x00003000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK1_P		0x0594	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1		0x0598	/* 0x00003000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ODT0			0x059c	/* 0x00003030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_ODT1			0x05a0	/* 0x00003030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE_B		0x05a4	/* 0x00008000 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0_P		0x05a8	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0			0x05ac	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1_P		0x05b0	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1			0x05b4	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS6_P		0x05b8	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM6			0x05bc	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS7_P		0x05c0	/* 0x00002030 */
-#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM7			0x05c4	/* 0x00008030 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL0			0x05c8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW0			0x05cc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL1			0x05d0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW1			0x05d4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL2			0x05d8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW2			0x05dc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL3			0x05e0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW3			0x05e4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_COL4			0x05e8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_KEY_ROW4			0x05ec	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO00			0x05f0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO01			0x05f4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO09			0x05f8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO03			0x05fc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO06			0x0600	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO02			0x0604	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO04			0x0608	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO05			0x060c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO07			0x0610	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO08			0x0614	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO16			0x0618	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO17			0x061c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO18			0x0620	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_GPIO19			0x0624	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_PIXCLK		0x0628	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_HSYNC		0x062c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA_EN		0x0630	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_VSYNC		0x0634	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA04		0x0638	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA05		0x063c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA06		0x0640	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA07		0x0644	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA08		0x0648	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA09		0x064c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA10		0x0650	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA11		0x0654	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA12		0x0658	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA13		0x065c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA14		0x0660	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA15		0x0664	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA16		0x0668	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA17		0x066c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA18		0x0670	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_CSI0_DATA19		0x0674	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TMS			0x0678	/* 0x00007060 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_MOD			0x067c	/* 0x0000b060 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TRSTB		0x0680	/* 0x00007060 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TDI			0x0684	/* 0x00007060 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TCK			0x0688	/* 0x00007060 */
-#define IOMUXC_SW_PAD_CTL_PAD_JTAG_TDO			0x068c	/* 0x000090b1 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA7			0x0690	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA6			0x0694	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA5			0x0698	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA4			0x069c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_CMD			0x06a0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_CLK			0x06a4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA0			0x06a8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA1			0x06ac	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA2			0x06b0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_DATA3			0x06b4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD3_RESET			0x06b8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_CLE			0x06bc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_ALE			0x06c0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_WP_B			0x06c4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_READY_B		0x06c8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_CS0_B		0x06cc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_CS1_B		0x06d0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_CS2_B		0x06d4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_CS3_B		0x06d8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_CMD			0x06dc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_CLK			0x06e0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA00		0x06e4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA01		0x06e8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA02		0x06ec	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA03		0x06f0	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA04		0x06f4	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA05		0x06f8	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA06		0x06fc	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_NAND_DATA07		0x0700	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA0			0x0704	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA1			0x0708	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA2			0x070c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA3			0x0710	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA4			0x0714	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA5			0x0718	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA6			0x071c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD4_DATA7			0x0720	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA1			0x0724	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA0			0x0728	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA3			0x072c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_CMD			0x0730	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_DATA2			0x0734	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD1_CLK			0x0738	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_CLK			0x073c	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_CMD			0x0740	/* 0x0001b0b0 */
-#define IOMUXC_SW_PAD_CTL_PAD_SD2_DATA3			0x0744	/* 0x0001b0b0 */
-/*
- * Pad Group Control Registers
- */
-#define IOMUXC_SW_PAD_CTL_GRP_B7DS			0x0748	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_ADDDS			0x074c	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDRMODE_CTL		0x0750	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL0			0x0754	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDRPKE			0x0758	/* 0x00001000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL1			0x075c	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL2			0x0760	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL3			0x0764	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDRPK			0x0768	/* 0x00002000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL4			0x076c	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDRHYS			0x0770	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDRMODE			0x0774	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL5			0x0778	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL6			0x077c	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_TERM_CTL7			0x0780	/* 0x00000000 */
-#define IOMUXC_SW_PAD_CTL_GRP_B0DS			0x0784	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_B1DS			0x0788	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_CTLDS			0x078c	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE_RGMII		0x0790	/* 0x00080000 */
-#define IOMUXC_SW_PAD_CTL_GRP_B2DS			0x0794	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE			0x0798	/* 0x00080000 */
-#define IOMUXC_SW_PAD_CTL_GRP_B3DS			0x079c	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_B4DS			0x07a0	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_B5DS			0x07a4	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_B6DS			0x07a8	/* 0x00000030 */
-#define IOMUXC_SW_PAD_CTL_GRP_RGMII_TERM		0x07ac	/* 0x00000000 */
-/*
- * Select Input Registers
- */
-#define IOMUXC_ASRC_ASRCK_CLOCK_6_SELECT_INPUT		0x07b0	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_DA_AMX_SELECT_INPUT		0x07b4	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_DB_AMX_SELECT_INPUT		0x07b8	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_RXCLK_AMX_SELECT_INPUT	0x07bc	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_RXFS_AMX_SELECT_INPUT		0x07c0	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_TXCLK_AMX_SELECT_INPUT	0x07c4	/* 0x00000000 */
-#define IOMUXC_AUD4_INPUT_TXFS_AMX_SELECT_INPUT		0x07c8	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_DA_AMX_SELECT_INPUT		0x07cc	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_DB_AMX_SELECT_INPUT		0x07d0	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_RXCLK_AMX_SELECT_INPUT	0x07d4	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_RXFS_AMX_SELECT_INPUT		0x07d8	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_TXCLK_AMX_SELECT_INPUT	0x07dc	/* 0x00000000 */
-#define IOMUXC_AUD5_INPUT_TXFS_AMX_SELECT_INPUT		0x07e0	/* 0x00000000 */
-#define IOMUXC_FLEXCAN1_RX_SELECT_INPUT			0x07e4	/* 0x00000000 */
-#define IOMUXC_FLEXCAN2_RX_SELECT_INPUT			0x07e8	/* 0x00000000 */
-#define IOMUXC_CCM_PMIC_READY_SELECT_INPUT		0x07f0	/* 0x00000000 */
-#define IOMUXC_ECSPI1_CSPI_CLK_IN_SELECT_INPUT		0x07f4	/* 0x00000000 */
-#define IOMUXC_ECSPI1_MISO_SELECT_INPUT			0x07f8	/* 0x00000000 */
-#define IOMUXC_ECSPI1_MOSI_SELECT_INPUT			0x07fc	/* 0x00000000 */
-#define IOMUXC_ECSPI1_SS0_SELECT_INPUT			0x0800	/* 0x00000000 */
-#define IOMUXC_ECSPI1_SS1_SELECT_INPUT			0x0804	/* 0x00000000 */
-#define IOMUXC_ECSPI1_SS2_SELECT_INPUT			0x0808	/* 0x00000000 */
-#define IOMUXC_ECSPI1_SS3_SELECT_INPUT			0x080c	/* 0x00000000 */
-#define IOMUXC_ECSPI2_CSPI_CLK_IN_SELECT_INPUT		0x0810	/* 0x00000000 */
-#define IOMUXC_ECSPI2_MISO_SELECT_INPUT			0x0814	/* 0x00000000 */
-#define IOMUXC_ECSPI2_MOSI_SELECT_INPUT			0x0818	/* 0x00000000 */
-#define IOMUXC_ECSPI2_SS0_SELECT_INPUT			0x081c	/* 0x00000000 */
-#define IOMUXC_ECSPI2_SS1_SELECT_INPUT			0x0820	/* 0x00000000 */
-#define IOMUXC_ECSPI4_SS0_SELECT_INPUT			0x0824	/* 0x00000000 */
-#define IOMUXC_ECSPI5_CSPI_CLK_IN_SELECT_INPUT		0x0828	/* 0x00000000 */
-#define IOMUXC_ECSPI5_MISO_SELECT_INPUT			0x082c	/* 0x00000000 */
-#define IOMUXC_ECSPI5_MOSI_SELECT_INPUT			0x0830	/* 0x00000000 */
-#define IOMUXC_ECSPI5_SS0_SELECT_INPUT			0x0834	/* 0x00000000 */
-#define IOMUXC_ECSPI5_SS1_SELECT_INPUT			0x0838	/* 0x00000000 */
-#define IOMUXC_ENET_REF_CLK_SELECT_INPUT		0x083c	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_MDIO_SELECT_INPUT		0x0840	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_CLK_SELECT_INPUT		0x0844	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_DATA0_SELECT_INPUT		0x0848	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_DATA1_SELECT_INPUT		0x084c	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_DATA2_SELECT_INPUT		0x0850	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_DATA3_SELECT_INPUT		0x0854	/* 0x00000000 */
-#define IOMUXC_ENET_MAC0_RX_EN_SELECT_INPUT		0x0858	/* 0x00000000 */
-#define IOMUXC_ESAI_RX_FS_SELECT_INPUT			0x085c	/* 0x00000000 */
-#define IOMUXC_ESAI_TX_FS_SELECT_INPUT			0x0860	/* 0x00000000 */
-#define IOMUXC_ESAI_RX_HF_CLK_SELECT_INPUT		0x0864	/* 0x00000000 */
-#define IOMUXC_ESAI_TX_HF_CLK_SELECT_INPUT		0x0868	/* 0x00000000 */
-#define IOMUXC_ESAI_RX_CLK_SELECT_INPUT			0x086c	/* 0x00000000 */
-#define IOMUXC_ESAI_TX_CLK_SELECT_INPUT			0x0870	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO0_SELECT_INPUT			0x0874	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO1_SELECT_INPUT			0x0878	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO2_SDI3_SELECT_INPUT		0x087c	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO3_SDI2_SELECT_INPUT		0x0880	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO4_SDI1_SELECT_INPUT		0x0884	/* 0x00000000 */
-#define IOMUXC_ESAI_SDO5_SDI0_SELECT_INPUT		0x0888	/* 0x00000000 */
-#define IOMUXC_HDMI_ICECIN_SELECT_INPUT			0x088c	/* 0x00000000 */
-#define IOMUXC_HDMI_II2C_CLKIN_SELECT_INPUT		0x0890	/* 0x00000000 */
-#define IOMUXC_HDMI_II2C_DATAIN_SELECT_INPUT		0x0894	/* 0x00000000 */
-#define IOMUXC_I2C1_SCL_IN_SELECT_INPUT			0x0898	/* 0x00000000 */
-#define IOMUXC_I2C1_SDA_IN_SELECT_INPUT			0x089c	/* 0x00000000 */
-#define IOMUXC_I2C2_SCL_IN_SELECT_INPUT			0x08a0	/* 0x00000000 */
-#define IOMUXC_I2C2_SDA_IN_SELECT_INPUT			0x08a4	/* 0x00000000 */
-#define IOMUXC_I2C3_SCL_IN_SELECT_INPUT			0x08a8	/* 0x00000000 */
-#define IOMUXC_I2C3_SDA_IN_SELECT_INPUT			0x08ac	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA10_SELECT_INPUT		0x08b0	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA11_SELECT_INPUT		0x08b4	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA12_SELECT_INPUT		0x08b8	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA13_SELECT_INPUT		0x08bc	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA14_SELECT_INPUT		0x08c0	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA15_SELECT_INPUT		0x08c4	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA16_SELECT_INPUT		0x08c8	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA17_SELECT_INPUT		0x08cc	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA18_SELECT_INPUT		0x08d0	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA19_SELECT_INPUT		0x08d4	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_DATA_EN_SELECT_INPUT		0x08d8	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_HSYNC_SELECT_INPUT		0x08dc	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_PIX_CLK_SELECT_INPUT		0x08e0	/* 0x00000000 */
-#define IOMUXC_IPU2_SENS1_VSYNC_SELECT_INPUT		0x08e4	/* 0x00000000 */
-#define IOMUXC_KEY_COL5_SELECT_INPUT			0x08e8	/* 0x00000000 */
-#define IOMUXC_KEY_COL6_SELECT_INPUT			0x08ec	/* 0x00000000 */
-#define IOMUXC_KEY_COL7_SELECT_INPUT			0x08f0	/* 0x00000000 */
-#define IOMUXC_KEY_ROW5_SELECT_INPUT			0x08f4	/* 0x00000000 */
-#define IOMUXC_KEY_ROW6_SELECT_INPUT			0x08f8	/* 0x00000000 */
-#define IOMUXC_KEY_ROW7_SELECT_INPUT			0x08fc	/* 0x00000000 */
-#define IOMUXC_MLB_MLB_CLK_IN_SELECT_INPUT		0x0900	/* 0x00000000 */
-#define IOMUXC_MLB_MLB_DATA_IN_SELECT_INPUT		0x0904	/* 0x00000000 */
-#define IOMUXC_MLB_MLB_SIG_IN_SELECT_INPUT		0x0908	/* 0x00000000 */
-#define IOMUXC_SDMA_EVENTS14_SELECT_INPUT		0x090c	/* 0x00000000 */
-#define IOMUXC_SDMA_EVENTS15_SELECT_INPUT		0x0910	/* 0x00000000 */
-#define IOMUXC_SPDIF_SPDIF_IN1_SELECT_INPUT		0x0914	/* 0x00000000 */
-#define IOMUXC_SPDIF_TX_CLK2_SELECT_INPUT		0x0918	/* 0x00000000 */
-#define IOMUXC_UART1_UART_RTS_B_SELECT_INPUT		0x091c	/* 0x00000000 */
-#define IOMUXC_UART1_UART_RX_DATA_SELECT_INPUT		0x0920	/* 0x00000000 */
-#define IOMUXC_UART2_UART_RTS_B_SELECT_INPUT		0x0924	/* 0x00000000 */
-#define IOMUXC_UART2_UART_RX_DATA_SELECT_INPUT		0x0928	/* 0x00000000 */
-#define IOMUXC_UART3_UART_RTS_B_SELECT_INPUT		0x092c	/* 0x00000000 */
-#define IOMUXC_UART3_UART_RX_DATA_SELECT_INPUT		0x0930	/* 0x00000000 */
-#define IOMUXC_UART4_UART_RTS_B_SELECT_INPUT		0x0934	/* 0x00000000 */
-#define IOMUXC_UART4_UART_RX_DATA_SELECT_INPUT		0x0938	/* 0x00000000 */
-#define IOMUXC_UART5_UART_RTS_B_SELECT_INPUT		0x093c	/* 0x00000000 */
-#define IOMUXC_UART5_UART_RX_DATA_SELECT_INPUT		0x0940	/* 0x00000000 */
-#define IOMUXC_USB_OTG_OC_SELECT_INPUT			0x0944	/* 0x00000000 */
-#define IOMUXC_USB_H1_OC_SELECT_INPUT			0x0948	/* 0x00000000 */
-#define IOMUXC_USDHC1_WP_ON_SELECT_INPUT		0x094c	/* 0x00000000 */
-
-#endif /* IMX6_IOMUXREG_H */
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index 139e2cd2ecda..8841ec5b84b2 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/devmap.h>
+#include <machine/intr.h>
 #include <machine/machdep.h>
 #include <machine/platform.h> 
 
@@ -46,6 +47,18 @@ __FBSDID("$FreeBSD$");
 #include <arm/freescale/imx/imx6_anatopvar.h>
 #include <arm/freescale/imx/imx_machdep.h>
 
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+
+struct fdt_fixup_entry fdt_fixup_table[] = {
+	{ NULL, NULL }
+};
+
+fdt_pic_decode_t fdt_pic_table[] = {
+	&gic_decode_fdt,
+	NULL
+};
+
 vm_offset_t
 platform_lastaddr(void)
 {
diff --git a/sys/arm/freescale/imx/imx_iomux.c b/sys/arm/freescale/imx/imx_iomux.c
new file mode 100644
index 000000000000..e5d5085bf0e0
--- /dev/null
+++ b/sys/arm/freescale/imx/imx_iomux.c
@@ -0,0 +1,282 @@
+/*-
+ * Copyright (c) 2014 Ian Lepore
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Pin mux and pad control driver for imx5 and imx6.
+ *
+ * This driver implements the fdt_pinctrl interface for configuring the gpio and
+ * peripheral pins based on fdt configuration data.
+ *
+ * When the driver attaches, it walks the entire fdt tree and automatically
+ * configures the pins for each device which has a pinctrl-0 property and whose
+ * status is "okay".  In addition it implements the fdt_pinctrl_configure()
+ * method which any other driver can call at any time to reconfigure its pins.
+ *
+ * The nature of the fsl,pins property in fdt data makes this driver's job very
+ * easy.  Instead of representing each pin and pad configuration using symbolic
+ * properties such as pullup-enable="true" and so on, the data simply contains
+ * the addresses of the registers that control the pins, and the raw values to
+ * store in those registers.
+ *
+ * The imx5 and imx6 SoCs also have a small number of "general purpose
+ * registers" in the iomuxc device which are used to control an assortment
+ * of completely unrelated aspects of SoC behavior.  This driver provides other
+ * drivers with direct access to those registers via simple accessor functions.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/fdt/fdt_pinctrl.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <arm/freescale/imx/imx_iomuxvar.h>
+#include <arm/freescale/imx/imx_machdep.h>
+
+struct iomux_softc {
+	device_t	dev;
+	struct resource	*mem_res;
+	u_int		last_gpreg;
+};
+
+static struct iomux_softc *iomux_sc;
+
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6dl-iomuxc",	true},
+	{"fsl,imx6q-iomuxc",	true},
+	{"fsl,imx6sl-iomuxc",	true},
+	{"fsl,imx6sx-iomuxc",	true},
+	{"fsl,imx53-iomuxc",	true},
+	{"fsl,imx51-iomuxc",	true},
+	{NULL,			false},
+};
+
+/*
+ * Each tuple in an fsl,pins property contains these fields.
+ */
+struct pincfg {
+	uint32_t mux_reg;
+	uint32_t padconf_reg;
+	uint32_t input_reg;
+	uint32_t mux_val;
+	uint32_t input_val;
+	uint32_t padconf_val;
+};
+
+static inline uint32_t
+RD4(struct iomux_softc *sc, bus_size_t off)
+{
+
+	return (bus_read_4(sc->mem_res, off));
+}
+
+static inline void
+WR4(struct iomux_softc *sc, bus_size_t off, uint32_t val)
+{
+
+	bus_write_4(sc->mem_res, off, val);
+}
+
+static int
+iomux_configure_pins(device_t dev, phandle_t cfgxref)
+{
+	struct iomux_softc * sc;
+	struct pincfg *cfgtuples, *cfg;
+	phandle_t cfgnode;
+	int i, ntuples;
+
+	sc = device_get_softc(dev);
+	cfgnode = OF_node_from_xref(cfgxref);
+	ntuples = OF_getencprop_alloc(cfgnode, "fsl,pins", sizeof(*cfgtuples),
+	    (void **)&cfgtuples);
+	if (ntuples < 0)
+		return (ENOENT);
+	if (ntuples == 0)
+		return (0); /* Empty property is not an error. */
+	for (i = 0, cfg = cfgtuples; i < ntuples; i++, cfg++) {
+		WR4(sc, cfg->mux_reg, cfg->mux_val);
+		WR4(sc, cfg->input_reg, cfg->input_val);
+		WR4(sc, cfg->padconf_reg, cfg->padconf_val);
+	}
+	free(cfgtuples, M_OFWPROP);
+	return (0);
+}
+
+static int
+iomux_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
+		return (ENXIO);
+
+	device_set_desc(dev, "Freescale i.MX pin configuration");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+iomux_detach(device_t dev)
+{
+
+        /* This device is always present. */
+	return (EBUSY);
+}
+
+static int
+iomux_attach(device_t dev)
+{
+	struct iomux_softc * sc;
+	int rid;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	switch (imx_soc_type()) {
+	case IMXSOC_51:
+		sc->last_gpreg = 1;
+		break;
+	case IMXSOC_53:
+		sc->last_gpreg = 2;
+		break;
+	case IMXSOC_6DL:
+	case IMXSOC_6S:
+	case IMXSOC_6SL:
+	case IMXSOC_6Q:
+		sc->last_gpreg = 13;
+		break;
+	default:
+		device_printf(dev, "Unknown SoC type\n");
+		return (ENXIO);
+	}
+
+	rid = 0;
+	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->mem_res == NULL) {
+		device_printf(dev, "Cannot allocate memory resources\n");
+		return (ENXIO);
+	}
+
+	iomux_sc = sc;
+
+	/*
+	 * Register as a pinctrl device, and call the convenience function that
+	 * walks the entire device tree invoking FDT_PINCTRL_CONFIGURE() on any
+	 * pinctrl-0 property cells whose xref phandle refers to a configuration
+	 * that is a child node of our node in the tree.
+	 *
+	 * The pinctrl bindings documentation specifically mentions that the
+	 * pinctrl device itself may have a pinctrl-0 property which contains
+	 * static configuration to be applied at device init time.  The tree
+	 * walk will automatically handle this for us when it passes through our
+	 * node in the tree.
+	 */
+	fdt_pinctrl_register(dev, "fsl,pins");
+	fdt_pinctrl_configure_tree(dev);
+
+	return (0);
+}
+
+uint32_t
+imx_iomux_gpr_get(u_int regnum)
+{
+	struct iomux_softc * sc;
+
+	sc = iomux_sc;
+	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
+	KASSERT(regnum >= 0 && regnum <= sc->last_gpreg, 
+	    ("%s bad regnum %u, max %u", __FUNCTION__, regnum, sc->last_gpreg));
+
+	return (RD4(iomux_sc, regnum * 4));
+}
+
+void
+imx_iomux_gpr_set(u_int regnum, uint32_t val)
+{
+	struct iomux_softc * sc;
+
+	sc = iomux_sc;
+	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
+	KASSERT(regnum >= 0 && regnum <= sc->last_gpreg, 
+	    ("%s bad regnum %u, max %u", __FUNCTION__, regnum, sc->last_gpreg));
+
+	WR4(iomux_sc, regnum * 4, val);
+}
+
+void
+imx_iomux_gpr_set_masked(u_int regnum, uint32_t clrbits, uint32_t setbits)
+{
+	struct iomux_softc * sc;
+	uint32_t val;
+
+	sc = iomux_sc;
+	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
+	KASSERT(regnum >= 0 && regnum <= sc->last_gpreg, 
+	    ("%s bad regnum %u, max %u", __FUNCTION__, regnum, sc->last_gpreg));
+
+	val = RD4(iomux_sc, regnum * 4);
+	val = (val & ~clrbits) | setbits;
+	WR4(iomux_sc, regnum * 4, val);
+}
+
+static device_method_t imx_iomux_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,         iomux_probe),
+	DEVMETHOD(device_attach,        iomux_attach),
+	DEVMETHOD(device_detach,        iomux_detach),
+
+        /* fdt_pinctrl interface */
+	DEVMETHOD(fdt_pinctrl_configure,iomux_configure_pins),
+
+	DEVMETHOD_END
+};
+
+static driver_t imx_iomux_driver = {
+	"imx_iomux",
+	imx_iomux_methods,
+	sizeof(struct iomux_softc),
+};
+
+static devclass_t imx_iomux_devclass;
+
+EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver, 
+    imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
+
diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51
index a6b6ffadd9e7..ce9d7d26be7e 100644
--- a/sys/arm/freescale/imx/std.imx51
+++ b/sys/arm/freescale/imx/std.imx51
@@ -10,5 +10,7 @@ options		KERNPHYSADDR=0x90100000
 makeoptions	KERNPHYSADDR=0x90100000
 options		PHYSADDR=0x90000000
 
+device  	fdt_pinctrl
+
 files "../freescale/imx/files.imx51"
 
diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53
index 40fbb300a9c7..09bdb2d0e92c 100644
--- a/sys/arm/freescale/imx/std.imx53
+++ b/sys/arm/freescale/imx/std.imx53
@@ -10,5 +10,7 @@ options		KERNPHYSADDR=0x70100000
 makeoptions	KERNPHYSADDR=0x70100000
 options		PHYSADDR=0x70000000
 
+device  	fdt_pinctrl
+
 files "../freescale/imx/files.imx53"
 
diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6
index 51f82a8e2f90..a559f17ceb06 100644
--- a/sys/arm/freescale/imx/std.imx6
+++ b/sys/arm/freescale/imx/std.imx6
@@ -13,5 +13,7 @@ options		PHYSADDR		= 0x10000000
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
+device  	fdt_pinctrl
+
 files "../freescale/imx/files.imx6"
 
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 2f21f7c58d1f..f8536048e224 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -44,21 +44,29 @@
 #define INSN_SIZE	4
 #define INSN_COND_MASK	0xf0000000	/* Condition mask */
 #define PSR_MODE        0x0000001f      /* mode mask */
-#define PSR_USR26_MODE  0x00000000
-#define PSR_FIQ26_MODE  0x00000001
-#define PSR_IRQ26_MODE  0x00000002
-#define PSR_SVC26_MODE  0x00000003
 #define PSR_USR32_MODE  0x00000010
 #define PSR_FIQ32_MODE  0x00000011
 #define PSR_IRQ32_MODE  0x00000012
 #define PSR_SVC32_MODE  0x00000013
+#define PSR_MON32_MODE	0x00000016
 #define PSR_ABT32_MODE  0x00000017
+#define PSR_HYP32_MODE	0x0000001a
 #define PSR_UND32_MODE  0x0000001b
 #define PSR_SYS32_MODE  0x0000001f
 #define PSR_32_MODE     0x00000010
-#define PSR_FLAGS	0xf0000000    /* flags */
-
-#define PSR_C_bit (1 << 29)       /* carry */
+#define PSR_T		0x00000020	/* Instruction set bit */
+#define PSR_F		0x00000040	/* FIQ disable bit */
+#define PSR_I		0x00000080	/* IRQ disable bit */
+#define PSR_A		0x00000100	/* Imprecise abort bit */
+#define PSR_E		0x00000200	/* Data endianess bit */
+#define PSR_GE		0x000f0000	/* Greater than or equal to bits */
+#define PSR_J		0x01000000	/* Java bit */
+#define PSR_Q		0x08000000	/* Sticky overflow bit */
+#define PSR_V		0x10000000	/* Overflow bit */
+#define PSR_C		0x20000000	/* Carry bit */
+#define PSR_Z		0x40000000	/* Zero bit */
+#define PSR_N		0x80000000	/* Negative bit */
+#define PSR_FLAGS	0xf0000000	/* Flags mask. */
 
 /* The high-order byte is always the implementor */
 #define CPU_ID_IMPLEMENTOR_MASK	0xff000000
@@ -236,16 +244,23 @@
 #define CPU_CONTROL_SYST_ENABLE 0x00000100 /* S: System protection bit */
 #define CPU_CONTROL_ROM_ENABLE	0x00000200 /* R: ROM protection bit */
 #define CPU_CONTROL_CPCLK	0x00000400 /* F: Implementation defined */
+#define CPU_CONTROL_SW_ENABLE	0x00000400 /* SW: SWP instruction enable */
 #define CPU_CONTROL_BPRD_ENABLE 0x00000800 /* Z: Branch prediction enable */
 #define CPU_CONTROL_IC_ENABLE   0x00001000 /* I: IC enable */
 #define CPU_CONTROL_VECRELOC	0x00002000 /* V: Vector relocation */
 #define CPU_CONTROL_ROUNDROBIN	0x00004000 /* RR: Predictable replacement */
 #define CPU_CONTROL_V4COMPAT	0x00008000 /* L4: ARMv4 compat LDR R15 etc */
+#define CPU_CONTROL_HAF_ENABLE	0x00020000 /* HA: Hardware Access Flag Enable */
 #define CPU_CONTROL_FI_ENABLE	0x00200000 /* FI: Low interrupt latency */
 #define CPU_CONTROL_UNAL_ENABLE 0x00400000 /* U: unaligned data access */
 #define CPU_CONTROL_V6_EXTPAGE	0x00800000 /* XP: ARMv6 extended page tables */
+#define CPU_CONTROL_V_ENABLE	0x01000000 /* VE: Interrupt vectors enable */
+#define CPU_CONTROL_EX_BEND	0x02000000 /* EE: exception endianness */
 #define CPU_CONTROL_L2_ENABLE	0x04000000 /* L2 Cache enabled */
-#define CPU_CONTROL_AF_ENABLE	0x20000000 /* Access Flag enable */
+#define CPU_CONTROL_NMFI	0x08000000 /* NMFI: Non maskable FIQ */
+#define CPU_CONTROL_TR_ENABLE	0x10000000 /* TRE: TEX Remap*/
+#define CPU_CONTROL_AF_ENABLE	0x20000000 /* AFE: Access Flag enable */
+#define CPU_CONTROL_TE_ENABLE	0x40000000 /* TE: Thumb Exception enable */
 
 #define CPU_CONTROL_IDC_ENABLE	CPU_CONTROL_DC_ENABLE
 
@@ -362,6 +377,15 @@
 #define	FAULT_EXTERNAL	0x400	/* External abort (armv6+) */
 #define	FAULT_WNR	0x800	/* Write-not-Read access (armv6+) */
 
+/* Fault status register definitions - v6+ */
+#define	FSR_STATUS_TO_IDX(fsr)	(((fsr) & 0xF) | 			\
+				 (((fsr) & (1 << 10)>> (10 - 4))))
+#define	FSR_LPAE		(1 <<  9) /* LPAE indicator */
+#define	FSR_WNR			(1 << 11) /* Write-not-Read access */
+#define	FSR_EXT			(1 << 12) /* DECERR/SLVERR for external*/
+#define	FSR_CM			(1 << 13) /* Cache maintenance fault */
+
+
 /*
  * Address of the vector page, low and high versions.
  */
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 231d5598047b..9577001917b2 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -43,12 +43,6 @@
 #define	_C_LABEL(x)	x
 #define	_ASM_LABEL(x)	x
 
-#define I32_bit (1 << 7)	/* IRQ disable */
-#define F32_bit (1 << 6)        /* FIQ disable */
-
-#define CPU_CONTROL_32BP_ENABLE 0x00000010 /* P: 32-bit exception handlers */
-#define CPU_CONTROL_32BD_ENABLE 0x00000020 /* D: 32-bit addressing */
-
 #ifndef _ALIGN_TEXT
 # define _ALIGN_TEXT .align 0
 #endif
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index a62ca0037446..5857f5d96689 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -40,6 +40,7 @@
 #define	_MACHINE_ATOMIC_H_
 
 #include <sys/types.h>
+#include <machine/armreg.h>
 
 #ifndef _KERNEL
 #include <machine/sysarch.h>
@@ -67,12 +68,7 @@
 #define wmb()  dmb()
 #define rmb()  dmb()
 
-#ifndef I32_bit
-#define I32_bit (1 << 7)        /* IRQ disable */
-#endif
-#ifndef F32_bit
-#define F32_bit (1 << 6)        /* FIQ disable */
-#endif
+
 
 /*
  * It would be nice to use _HAVE_ARMv6_INSTRUCTIONS from machine/asm.h
@@ -268,12 +264,12 @@ atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval)
 	__asm __volatile(
 		"1:          \n"
 		"   ldrexd   %[tmp], [%[ptr]]\n"
-		"   teq      %Q[tmp], %Q[cmp]\n"
+		"   teq      %Q[tmp], %Q[cmpval]\n"
 		"   itee eq  \n"
-		"   teqeq    %R[tmp], %R[cmp]\n"
+		"   teqeq    %R[tmp], %R[cmpval]\n"
 		"   movne    %[ret], #0\n"
 		"   bne      2f\n"
-		"   strexd   %[ret], %[new], [%[ptr]]\n"
+		"   strexd   %[ret], %[newval], [%[ptr]]\n"
 		"   teq      %[ret], #0\n"
 		"   it ne    \n"
 		"   bne      1b\n"
@@ -282,8 +278,8 @@ atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval)
 		:   [ret]    "=&r"  (ret), 
 		    [tmp]    "=&r"  (tmp)
 		:   [ptr]    "r"    (p), 
-		    [cmp]    "r"    (cmpval), 
-		    [new]    "r"    (newval)
+		    [cmpval] "r"    (cmpval), 
+		    [newval] "r"    (newval)
 		:   "cc", "memory");
 	return (ret);
 }
@@ -702,7 +698,7 @@ atomic_store_rel_long(volatile u_long *p, u_long v)
 			"orr  %1, %0, %2;"		\
 			"msr  cpsr_fsxc, %1;"		\
 			: "=r" (cpsr_save), "=r" (tmp)	\
-			: "I" (I32_bit | F32_bit)		\
+			: "I" (PSR_I | PSR_F)		\
 		        : "cc" );		\
 		(expr);				\
 		 __asm __volatile(		\
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index c1d4e395e58d..35097725b71a 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -82,5 +82,7 @@ extern int (*arm_config_irq)(int irq, enum intr_trigger trig,
 void arm_irq_memory_barrier(uintptr_t);
 
 void gic_init_secondary(void);
+int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
+    int *trig, int *pol);
 
 #endif	/* _MACHINE_INTR_H */
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 70c337a9dfe7..3f0b9e984d77 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -256,7 +256,7 @@ int	pmap_change_attr(vm_offset_t, vm_size_t, int);
 void	pmap_kenter(vm_offset_t va, vm_paddr_t pa);
 void	pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa);
 void	pmap_kenter_device(vm_offset_t va, vm_paddr_t pa);
-void	*pmap_kenter_temp(vm_paddr_t pa, int i);
+void	*pmap_kenter_temporary(vm_paddr_t pa, int i);
 void 	pmap_kenter_user(vm_offset_t va, vm_paddr_t pa);
 vm_paddr_t pmap_kextract(vm_offset_t va);
 void	pmap_kremove(vm_offset_t);
diff --git a/sys/arm/include/sysreg.h b/sys/arm/include/sysreg.h
new file mode 100644
index 000000000000..76b1f2bc59ee
--- /dev/null
+++ b/sys/arm/include/sysreg.h
@@ -0,0 +1,232 @@
+/*-
+ * Copyright 2014 Svatopluk Kraus <onwahe@gmail.com>
+ * Copyright 2014 Michal Meloun <meloun@miracle.cz>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Macros to make working with the System Control Registers simpler.
+ */
+
+#ifndef MACHINE_SYSREG_H
+#define	MACHINE_SYSREG_H
+
+#include <machine/acle-compat.h>
+
+/*
+ * CP15 C0 registers
+ */
+#define	CP15_MIDR(rr)		p15, 0, rr, c0, c0,  0 /* Main ID Register */
+#define	CP15_CTR(rr)		p15, 0, rr, c0, c0,  1 /* Cache Type Register */
+#define	CP15_TCMTR(rr)		p15, 0, rr, c0, c0,  2 /* TCM Type Register */
+#define	CP15_TLBTR(rr)		p15, 0, rr, c0, c0,  3 /* TLB Type Register */
+#define	CP15_MPIDR(rr)		p15, 0, rr, c0, c0,  5 /* Multiprocessor Affinity Register */
+#define	CP15_REVIDR(rr)		p15, 0, rr, c0, c0,  6 /* Revision ID Register */
+
+#define	CP15_ID_PFR0(rr)	p15, 0, rr, c0, c1,  0 /* Processor Feature Register 0 */
+#define	CP15_ID_PFR1(rr)	p15, 0, rr, c0, c1,  1 /* Processor Feature Register 1 */
+#define	CP15_ID_DFR0(rr)	p15, 0, rr, c0, c1,  2 /* Debug Feature Register 0 */
+#define	CP15_ID_AFR0(rr)	p15, 0, rr, c0, c1,  3 /* Auxiliary Feature Register  0 */
+#define	CP15_ID_MMFR0(rr)	p15, 0, rr, c0, c1,  4 /* Memory Model Feature Register 0 */
+#define	CP15_ID_MMFR1(rr)	p15, 0, rr, c0, c1,  5 /* Memory Model Feature Register 1 */
+#define	CP15_ID_MMFR2(rr)	p15, 0, rr, c0, c1,  6 /* Memory Model Feature Register 2 */
+#define	CP15_ID_MMFR3(rr)	p15, 0, rr, c0, c1,  7 /* Memory Model Feature Register 3 */
+
+#define	CP15_ID_ISAR0(rr)	p15, 0, rr, c0, c2,  0 /* Instruction Set Attribute Register 0 */
+#define	CP15_ID_ISAR1(rr)	p15, 0, rr, c0, c2,  1 /* Instruction Set Attribute Register 1 */
+#define	CP15_ID_ISAR2(rr)	p15, 0, rr, c0, c2,  2 /* Instruction Set Attribute Register 2 */
+#define	CP15_ID_ISAR3(rr)	p15, 0, rr, c0, c2,  3 /* Instruction Set Attribute Register 3 */
+#define	CP15_ID_ISAR4(rr)	p15, 0, rr, c0, c2,  4 /* Instruction Set Attribute Register 4 */
+#define	CP15_ID_ISAR5(rr)	p15, 0, rr, c0, c2,  5 /* Instruction Set Attribute Register 5 */
+
+#define	CP15_CCSIDR(rr)		p15, 1, rr, c0, c0,  0 /* Cache Size ID Registers */
+#define	CP15_CLIDR(rr)		p15, 1, rr, c0, c0,  1 /* Cache Level ID Register */
+#define	CP15_AIDR(rr)		p15, 1, rr, c0, c0,  7 /* Auxiliary ID Register */
+
+#define	CP15_CSSELR(rr)		p15, 2, rr, c0, c0,  0 /* Cache Size Selection Register */
+
+/*
+ * CP15 C1 registers
+ */
+#define	CP15_SCTLR(rr)		p15, 0, rr, c1, c0,  0 /* System Control Register */
+#define	CP15_ACTLR(rr)		p15, 0, rr, c1, c0,  1 /* IMPLEMENTATION DEFINED Auxiliary Control Register */
+#define	CP15_CPACR(rr)		p15, 0, rr, c1, c0,  2 /* Coprocessor Access Control Register */
+
+#define	CP15_SCR(rr)		p15, 0, rr, c1, c1,  0 /* Secure Configuration Register */
+#define	CP15_SDER(rr)		p15, 0, rr, c1, c1,  1 /* Secure Debug Enable Register */
+#define	CP15_NSACR(rr)		p15, 0, rr, c1, c1,  2 /* Non-Secure Access Control Register */
+
+/*
+ * CP15 C2 registers
+ */
+#define	CP15_TTBR0(rr)		p15, 0, rr, c2, c0,  0 /* Translation Table Base Register 0 */
+#define	CP15_TTBR1(rr)		p15, 0, rr, c2, c0,  1 /* Translation Table Base Register 1 */
+#define	CP15_TTBCR(rr)		p15, 0, rr, c2, c0,  2 /* Translation Table Base Control Register */
+
+/*
+ * CP15 C3 registers
+ */
+#define	CP15_DACR(rr)		p15, 0, rr, c3, c0,  0 /* Domain Access Control Register */
+
+/*
+ * CP15 C5 registers
+ */
+#define	CP15_DFSR(rr)		p15, 0, rr, c5, c0,  0 /* Data Fault Status Register */
+
+#if __ARM_ARCH >= 6
+/* From ARMv6: */
+#define	CP15_IFSR(rr)		p15, 0, rr, c5, c0,  1 /* Instruction Fault Status Register */
+/* From ARMv7: */
+#define	CP15_ADFSR(rr)		p15, 0, rr, c5, c1,  0 /* Auxiliary Data Fault Status Register */
+#define	CP15_AIFSR(rr)		p15, 0, rr, c5, c1,  1 /* Auxiliary Instruction Fault Status Register */
+#endif
+
+
+/*
+ * CP15 C6 registers
+ */
+#define	CP15_DFAR(rr)		p15, 0, rr, c6, c0,  0 /* Data Fault Address Register */
+
+#if __ARM_ARCH >= 6
+/* From ARMv6k: */
+#define	CP15_IFAR(rr)		p15, 0, rr, c6, c0,  2 /* Instruction Fault Address Register */
+#endif
+
+/*
+ * CP15 C7 registers
+ */
+#if __ARM_ARCH >= 6
+/* From ARMv7: */
+#define	CP15_ICIALLUIS		p15, 0, r0, c7, c1,  0 /* Instruction cache invalidate all PoU, IS */
+#define	CP15_BPIALLIS		p15, 0, r0, c7, c1,  6 /* Branch predictor invalidate all IS */
+#endif
+
+#define	CP15_PAR		p15, 0, r0, c7, c4,  0 /* Physical Address Register */
+
+#define	CP15_ICIALLU		p15, 0, r0, c7, c5,  0 /* Instruction cache invalidate all PoU */
+#define	CP15_ICIMVAU(rr)	p15, 0, rr, c7, c5,  1 /* Instruction cache invalidate */
+#if __ARM_ARCH >= 6
+/* Deprecated in ARMv7 */
+#define	CP15_CP15ISB		p15, 0, r0, c7, c5,  4 /* ISB */
+#endif
+#define	CP15_BPIALL		p15, 0, r0, c7, c5,  6 /* Branch predictor invalidate all */
+#define	CP15_BPIMVA		p15, 0, rr, c7, c5,  7 /* Branch predictor invalidate by MVA */
+
+#if __ARM_ARCH >= 6
+/* Only ARMv6: */
+#define	CP15_DCIALL		p15, 0, r0, c7, c6,  0 /* Data cache invalidate all */
+#endif
+#define	CP15_DCIMVAC(rr)	p15, 0, rr, c7, c6,  1 /* Data cache invalidate by MVA PoC */
+#define	CP15_DCISW(rr)		p15, 0, rr, c7, c6,  2 /* Data cache invalidate by set/way */
+
+#define	CP15_ATS1CPR(rr)	p15, 0, rr, c7, c8,  0 /* Stage 1 Current state PL1 read */
+#define	CP15_ATS1CPW(rr)	p15, 0, rr, c7, c8,  1 /* Stage 1 Current state PL1 write */
+#define	CP15_ATS1CUR(rr)	p15, 0, rr, c7, c8,  2 /* Stage 1 Current state unprivileged read */
+#define	CP15_ATS1CUW(rr)	p15, 0, rr, c7, c8,  3 /* Stage 1 Current state unprivileged write */
+
+#if __ARM_ARCH >= 6
+/* From ARMv7: */
+#define	CP15_ATS12NSOPR(rr)	p15, 0, rr, c7, c8,  4 /* Stages 1 and 2 Non-secure only PL1 read */
+#define	CP15_ATS12NSOPW(rr)	p15, 0, rr, c7, c8,  5 /* Stages 1 and 2 Non-secure only PL1 write */
+#define	CP15_ATS12NSOUR(rr)	p15, 0, rr, c7, c8,  6 /* Stages 1 and 2 Non-secure only unprivileged read */
+#define	CP15_ATS12NSOUW(rr)	p15, 0, rr, c7, c8,  7 /* Stages 1 and 2 Non-secure only unprivileged write */
+#endif
+
+#if __ARM_ARCH >= 6
+/* Only ARMv6: */
+#define	CP15_DCCALL		p15, 0, r0, c7, c10, 0 /* Data cache clean all */
+#endif
+#define	CP15_DCCMVAC(rr)	p15, 0, rr, c7, c10, 1 /* Data cache clean by MVA PoC */
+#define	CP15_DCCSW(rr)		p15, 0, rr, c7, c10, 2 /* Data cache clean by set/way */
+#if __ARM_ARCH >= 6
+/* Only ARMv6: */
+#define	CP15_CP15DSB		p15, 0, r0, c7, c10, 4 /* DSB */
+#define	CP15_CP15DMB		p15, 0, r0, c7, c10, 5 /* DMB */
+#endif
+
+#if __ARM_ARCH >= 6
+/* From ARMv7: */
+#define	CP15_DCCMVAU(rr)	p15, 0, rr, c7, c11, 1 /* Data cache clean by MVA PoU */
+#endif
+
+#if __ARM_ARCH >= 6
+/* Only ARMv6: */
+#define	CP15_DCCIALL		p15, 0, r0, c7, c14, 0 /* Data cache clean and invalidate all */
+#endif
+#define	CP15_DCCIMVAC(rr)	p15, 0, rr, c7, c14, 1 /* Data cache clean and invalidate by MVA PoC */
+#define	CP15_DCCISW(rr)		p15, 0, rr, c7, c14, 2 /* Data cache clean and invalidate by set/way */
+
+/*
+ * CP15 C8 registers
+ */
+#if __ARM_ARCH >= 6
+/* From ARMv7: */
+#define	CP15_TLBIALLIS		p15, 0, r0, c8, c3, 0 /* Invalidate entire unified TLB IS */
+#define	CP15_TLBIMVAIS(rr)	p15, 0, rr, c8, c3, 1 /* Invalidate unified TLB by MVA IS */
+#define	CP15_TLBIASIDIS(rr)	p15, 0, rr, c8, c3, 2 /* Invalidate unified TLB by ASID IS */
+#define	CP15_TLBIMVAAIS(rr)	p15, 0, rr, c8, c3, 3 /* Invalidate unified TLB by MVA, all ASID IS */
+#endif
+
+#define	CP15_TLBIALL		p15, 0, r0, c8, c7, 0 /* Invalidate entire unified TLB */
+#define	CP15_TLBIMVA(rr)	p15, 0, rr, c8, c7, 1 /* Invalidate unified TLB by MVA */
+#define	CP15_TLBIASID(rr)	p15, 0, rr, c8, c7, 2 /* Invalidate unified TLB by ASID */
+
+#if __ARM_ARCH >= 6
+/* From ARMv6: */
+#define	CP15_TLBIMVAA(rr)	p15, 0, rr, c8, c7, 3 /* Invalidate unified TLB by MVA, all ASID */
+#endif
+
+/*
+ * CP15 C10 registers
+ */
+/* Without LPAE this is PRRR, with LPAE it's MAIR0 */
+#define	CP15_PRRR(rr)		p15, 0, rr, c10, c2, 0 /* Primary Region Remap Register */
+#define	CP15_MAIR0(rr)		p15, 0, rr, c10, c2, 0 /* Memory Attribute Indirection Register 0 */
+/* Without LPAE this is NMRR, with LPAE it's MAIR1 */
+#define	CP15_NMRR(rr)		p15, 0, rr, c10, c2, 1 /* Normal Memory Remap Register */
+#define	CP15_MAIR1(rr)		p15, 0, rr, c10, c2, 1 /* Memory Attribute Indirection Register 1 */
+
+#define	CP15_AMAIR0(rr)		p15, 0, rr, c10, c3, 0 /* Auxiliary Memory Attribute Indirection Register 0 */
+#define	CP15_AMAIR1(rr)		p15, 0, rr, c10, c3, 1 /* Auxiliary Memory Attribute Indirection Register 1 */
+
+/*
+ * CP15 C12 registers
+ */
+#define	CP15_VBAR(rr)		p15, 0, rr, c12, c0, 0 /* Vector Base Address Register */
+#define	CP15_MVBAR(rr)		p15, 0, rr, c12, c0, 1 /* Monitor Vector Base Address Register */
+
+#define	CP15_ISR(rr)		p15, 0, rr, c12, c1, 0 /* Interrupt Status Register */
+
+/*
+ * CP15 C13 registers
+ */
+#define	CP15_FCSEIDR(rr)	p15, 0, rr, c13, c0, 0 /* FCSE Process ID Register */
+#define	CP15_CONTEXTIDR(rr)	p15, 0, rr, c13, c0, 1 /* Context ID Register */
+#define	CP15_TPIDRURW(rr)	p15, 0, rr, c13, c0, 2 /* User Read/Write Thread ID Register */
+#define	CP15_TPIDRURO(rr)	p15, 0, rr, c13, c0, 3 /* User Read-Only Thread ID Register */
+#define	CP15_TPIDRPRW(rr)	p15, 0, rr, c13, c0, 4 /* PL1 only Thread ID Register */
+
+#endif /* !MACHINE_SYSREG_H */
diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index 50f5f37f7b3f..0ddd2a5a33b2 100644
--- a/sys/arm/lpc/if_lpe.c
+++ b/sys/arm/lpc/if_lpe.c
@@ -754,7 +754,7 @@ lpe_rxintr(struct lpe_softc *sc)
 
 		/* Check received frame for errors */
 		if (hws->lhs_info & LPE_HWDESC_RXERRS) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			lpe_discard_rxbuf(sc, cons);
 			lpe_init_rxbuf(sc, cons);
 			goto skip;
@@ -764,7 +764,7 @@ lpe_rxintr(struct lpe_softc *sc)
 		m->m_pkthdr.rcvif = ifp;
 		m->m_data += 2;
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		lpe_unlock(sc);
 		(*ifp->if_input)(ifp, m);	
@@ -800,12 +800,12 @@ lpe_txintr(struct lpe_softc *sc)
 		bus_dmamap_sync(sc->lpe_cdata.lpe_tx_buf_tag,
 		    txd->lpe_txdesc_dmamap, BUS_DMASYNC_POSTWRITE);
 
-		ifp->if_collisions += LPE_HWDESC_COLLISIONS(hws->lhs_info);
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, LPE_HWDESC_COLLISIONS(hws->lhs_info));
 
 		if (hws->lhs_info & LPE_HWDESC_TXERRS)
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		else
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		if (txd->lpe_txdesc_first) {
 			bus_dmamap_unload(sc->lpe_cdata.lpe_tx_buf_tag,
diff --git a/sys/arm/s3c2xx0/files.s3c2xx0 b/sys/arm/s3c2xx0/files.s3c2xx0
deleted file mode 100644
index 5ad289092fab..000000000000
--- a/sys/arm/s3c2xx0/files.s3c2xx0
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-arm/arm/bus_space_asm_generic.S	standard
-arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
-arm/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
-arm/s3c2xx0/s3c24x0_rtc.c	standard
-arm/s3c2xx0/s3c24x0_machdep.c	standard
-arm/s3c2xx0/s3c24x0.c   	standard
-arm/s3c2xx0/s3c2xx0_space.c	standard
-arm/s3c2xx0/s3c24x0_clk.c	standard
-arm/s3c2xx0/uart_bus_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_dev_s3c2410.c	optional	uart
-
-dev/usb/controller/ohci_s3c24x0.c	optional	ohci
diff --git a/sys/arm/s3c2xx0/board_ln2410sbc.c b/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
similarity index 94%
rename from sys/arm/s3c2xx0/board_ln2410sbc.c
rename to sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
index 5f5ac90652cd..d0f474ebb4d5 100644
--- a/sys/arm/s3c2xx0/board_ln2410sbc.c
+++ b/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 extern vm_offset_t s3c2410_uart_vaddr;
 
diff --git a/sys/arm/samsung/s3c2xx0/files.s3c2xx0 b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
new file mode 100644
index 000000000000..eb02fc52de34
--- /dev/null
+++ b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
@@ -0,0 +1,15 @@
+# $FreeBSD$
+arm/arm/bus_space_asm_generic.S	standard
+arm/arm/bus_space_generic.c	standard
+arm/arm/cpufunc_asm_arm9.S	standard
+arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
+arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
+arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard
+arm/samsung/s3c2xx0/s3c24x0.c   	standard
+arm/samsung/s3c2xx0/s3c2xx0_space.c	standard
+arm/samsung/s3c2xx0/s3c24x0_clk.c	standard
+arm/samsung/s3c2xx0/uart_bus_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_dev_s3c2410.c	optional	uart
+
+dev/usb/controller/ohci_s3c24x0.c	optional	ohci
diff --git a/sys/arm/s3c2xx0/s3c2410reg.h b/sys/arm/samsung/s3c2xx0/s3c2410reg.h
similarity index 98%
rename from sys/arm/s3c2xx0/s3c2410reg.h
rename to sys/arm/samsung/s3c2xx0/s3c2410reg.h
index 89298ea15ee1..e13ee3caf598 100644
--- a/sys/arm/s3c2xx0/s3c2410reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2410reg.h
@@ -42,7 +42,7 @@
 #define	_ARM_S3C2XX0_S3C2410REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map
diff --git a/sys/arm/s3c2xx0/s3c2410var.h b/sys/arm/samsung/s3c2xx0/s3c2410var.h
similarity index 97%
rename from sys/arm/s3c2xx0/s3c2410var.h
rename to sys/arm/samsung/s3c2xx0/s3c2410var.h
index b17784de2881..1ce9b99afc1c 100644
--- a/sys/arm/s3c2xx0/s3c2410var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2410var.h
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C2410VAR_H_
 #define _ARM_S3C2410VAR_H_
 
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 int	s3c2410_sscom_cnattach(bus_space_tag_t, int, int, int, tcflag_t);
 int	s3c2410_sscom_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t);
diff --git a/sys/arm/s3c2xx0/s3c2440reg.h b/sys/arm/samsung/s3c2xx0/s3c2440reg.h
similarity index 98%
rename from sys/arm/s3c2xx0/s3c2440reg.h
rename to sys/arm/samsung/s3c2xx0/s3c2440reg.h
index f3cda608d478..2304b69e0718 100644
--- a/sys/arm/s3c2xx0/s3c2440reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c2440reg.h
@@ -36,7 +36,7 @@
 #define	_ARM_S3C2XX0_S3C2440REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map
diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/samsung/s3c2xx0/s3c24x0.c
similarity index 99%
rename from sys/arm/s3c2xx0/s3c24x0.c
rename to sys/arm/samsung/s3c2xx0/s3c24x0.c
index 14e6f82ad02c..49acdc65dbdd 100644
--- a/sys/arm/s3c2xx0/s3c24x0.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0.c
@@ -43,14 +43,15 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/armreg.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
 #include <machine/cpufunc.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 #include <sys/rman.h>
 
 #define S3C2XX0_XTAL_CLK 12000000
@@ -638,7 +639,7 @@ s3c24x0_clock_freq(struct s3c2xx0_softc *sc)
 void
 cpu_reset(void)
 {
-	(void) disable_interrupts(I32_bit|F32_bit);
+	(void) disable_interrupts(PSR_I|PSR_F);
 
 	bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_wdt_ioh, WDT_WTCON,
 	    WTCON_ENABLE | WTCON_CLKSEL_16 | WTCON_ENRST);
diff --git a/sys/arm/s3c2xx0/s3c24x0_clk.c b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
similarity index 98%
rename from sys/arm/s3c2xx0/s3c24x0_clk.c
rename to sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
index 35ce349a8fd4..d4c4e984f7f9 100644
--- a/sys/arm/s3c2xx0/s3c24x0_clk.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c24x0reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 struct s3c24x0_timer_softc {
 	device_t	dev;
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
similarity index 98%
rename from sys/arm/s3c2xx0/s3c24x0_machdep.c
rename to sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
index 5264e7a805d5..411447b416cc 100644
--- a/sys/arm/s3c2xx0/s3c24x0_machdep.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
@@ -89,9 +89,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/reboot.h>
 
-#include <arm/s3c2xx0/s3c24x0var.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 /* Page table for mapping proc0 zero page */
 #define KERNEL_PT_SYS		0
diff --git a/sys/arm/s3c2xx0/s3c24x0_rtc.c b/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
similarity index 98%
rename from sys/arm/s3c2xx0/s3c24x0_rtc.c
rename to sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
index 8845c440d820..f0d35c9053b1 100644
--- a/sys/arm/s3c2xx0/s3c24x0_rtc.c
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "clock_if.h"
 
diff --git a/sys/arm/s3c2xx0/s3c24x0reg.h b/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
similarity index 99%
rename from sys/arm/s3c2xx0/s3c24x0reg.h
rename to sys/arm/samsung/s3c2xx0/s3c24x0reg.h
index e60ce8870f8b..2004e114701d 100644
--- a/sys/arm/s3c2xx0/s3c24x0reg.h
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
@@ -43,7 +43,7 @@
 #define	_ARM_S3C2XX0_S3C24X0REG_H_
 
 /* common definitions for S3C2800, S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
 
 /*
  * Map the device registers into kernel space.
diff --git a/sys/arm/s3c2xx0/s3c24x0var.h b/sys/arm/samsung/s3c2xx0/s3c24x0var.h
similarity index 97%
rename from sys/arm/s3c2xx0/s3c24x0var.h
rename to sys/arm/samsung/s3c2xx0/s3c24x0var.h
index 5209da8eb68d..2ee042ea4318 100644
--- a/sys/arm/s3c2xx0/s3c24x0var.h
+++ b/sys/arm/samsung/s3c2xx0/s3c24x0var.h
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C24X0VAR_H_
 #define _ARM_S3C24X0VAR_H_
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 struct s3c24x0_softc {
 	struct s3c2xx0_softc  sc_sx;
diff --git a/sys/arm/s3c2xx0/s3c2xx0_space.c b/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
similarity index 100%
rename from sys/arm/s3c2xx0/s3c2xx0_space.c
rename to sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
diff --git a/sys/arm/s3c2xx0/s3c2xx0board.h b/sys/arm/samsung/s3c2xx0/s3c2xx0board.h
similarity index 100%
rename from sys/arm/s3c2xx0/s3c2xx0board.h
rename to sys/arm/samsung/s3c2xx0/s3c2xx0board.h
diff --git a/sys/arm/s3c2xx0/s3c2xx0reg.h b/sys/arm/samsung/s3c2xx0/s3c2xx0reg.h
similarity index 100%
rename from sys/arm/s3c2xx0/s3c2xx0reg.h
rename to sys/arm/samsung/s3c2xx0/s3c2xx0reg.h
diff --git a/sys/arm/s3c2xx0/s3c2xx0var.h b/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
similarity index 100%
rename from sys/arm/s3c2xx0/s3c2xx0var.h
rename to sys/arm/samsung/s3c2xx0/s3c2xx0var.h
diff --git a/sys/arm/s3c2xx0/std.ln2410sbc b/sys/arm/samsung/s3c2xx0/std.ln2410sbc
similarity index 83%
rename from sys/arm/s3c2xx0/std.ln2410sbc
rename to sys/arm/samsung/s3c2xx0/std.ln2410sbc
index a76a849c97dd..1f1143e6cfbf 100644
--- a/sys/arm/s3c2xx0/std.ln2410sbc
+++ b/sys/arm/samsung/s3c2xx0/std.ln2410sbc
@@ -1,5 +1,5 @@
 #$FreeBSD$
-include "../s3c2xx0/std.s3c2410"
+include "../samsung/s3c2xx0/std.s3c2410"
 
 makeoptions	KERNPHYSADDR=0x30000000
 makeoptions	KERNVIRTADDR=0xc0000000
diff --git a/sys/arm/s3c2xx0/std.s3c2410 b/sys/arm/samsung/s3c2xx0/std.s3c2410
similarity index 71%
rename from sys/arm/s3c2xx0/std.s3c2410
rename to sys/arm/samsung/s3c2xx0/std.s3c2410
index 266d9e77f7ec..4f55b9335e72 100644
--- a/sys/arm/s3c2xx0/std.s3c2410
+++ b/sys/arm/samsung/s3c2xx0/std.s3c2410
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 cpu	CPU_ARM9
 machine 	arm
 
diff --git a/sys/arm/s3c2xx0/uart_bus_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
similarity index 96%
rename from sys/arm/s3c2xx0/uart_bus_s3c2410.c
rename to sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
index 41c750afb5cd..2102d8b013c4 100644
--- a/sys/arm/s3c2xx0/uart_bus_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
@@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "uart_if.h"
 
diff --git a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
similarity index 98%
rename from sys/arm/s3c2xx0/uart_cpu_s3c2410.c
rename to sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
index 2ed036b48ad7..37b668e85da3 100644
--- a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;
diff --git a/sys/arm/s3c2xx0/uart_dev_s3c2410.c b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
similarity index 98%
rename from sys/arm/s3c2xx0/uart_dev_s3c2410.c
rename to sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
index aadd835dcbec..2ee121700dec 100644
--- a/sys/arm/s3c2xx0/uart_dev_s3c2410.c
+++ b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
@@ -41,10 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 #include <dev/uart/uart_bus.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/uart_dev_s3c2410.h>
-#include <arm/s3c2xx0/s3c2xx0reg.h>
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/uart_dev_s3c2410.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 #include "uart_if.h"
 
 /* Finds the subirq from the parent */
diff --git a/sys/arm/s3c2xx0/uart_dev_s3c2410.h b/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.h
similarity index 100%
rename from sys/arm/s3c2xx0/uart_dev_s3c2410.h
rename to sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.h
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index ab0824e40950..5abad150a887 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -1837,7 +1837,7 @@ cpsw_tx_watchdog(struct cpsw_softc *sc)
 		++sc->watchdog.timer;
 		if (sc->watchdog.timer > 2) {
 			sc->watchdog.timer = 0;
-			++ifp->if_oerrors;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			++sc->watchdog.resets;
 			cpsw_tx_watchdog_full_reset(sc);
 		}
diff --git a/sys/arm/versatile/files.versatile b/sys/arm/versatile/files.versatile
index 254ebe1ea337..199fecbb566a 100644
--- a/sys/arm/versatile/files.versatile
+++ b/sys/arm/versatile/files.versatile
@@ -17,6 +17,5 @@ arm/versatile/versatile_pci.c			optional pci
 arm/versatile/versatile_pci_bus_space.c		optional pci
 arm/versatile/versatile_sic.c			standard
 arm/versatile/versatile_timer.c			standard
-arm/versatile/if_smc_fdt.c			optional smc
 
 kern/kern_clocksource.c                         standard
diff --git a/sys/arm/xscale/i80321/i80321_intr.h b/sys/arm/xscale/i80321/i80321_intr.h
index bde0bac97246..29003a05ce56 100644
--- a/sys/arm/xscale/i80321/i80321_intr.h
+++ b/sys/arm/xscale/i80321/i80321_intr.h
@@ -106,7 +106,7 @@ i80321_splx(int new)
 
 	hwpend = (i80321_ipending & ICU_INT_HWMASK) & ~new;
 	if (hwpend != 0) {
-		oldirqstate = disable_interrupts(I32_bit);
+		oldirqstate = disable_interrupts(PSR_I);
 		intr_enabled |= hwpend;
 		i80321_set_intrmask();
 		restore_interrupts(oldirqstate);
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 98c1805df6ee..3b4e5a11b552 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/timetc.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
@@ -381,7 +382,7 @@ cpu_initclocks(void)
 
 	/* Report the clock frequency. */
 
-	oldirqstate = disable_interrupts(I32_bit);
+	oldirqstate = disable_interrupts(PSR_I);
 
 	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
 #ifdef CPU_XSCALE_81342
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index 72300f13c0ee..fb344556ccb0 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/rman.h>
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
@@ -325,7 +326,7 @@ arm_unmask_irq(uintptr_t nb)
 void
 cpu_reset()
 {
-	(void) disable_interrupts(I32_bit|F32_bit);
+	(void) disable_interrupts(PSR_I|PSR_F);
 	*(__volatile uint32_t *)(IQ80321_80321_VBASE + VERDE_ATU_BASE +
 	    ATU_PCSR) = PCSR_RIB | PCSR_RPB;
 	printf("Reset failed!\n");
diff --git a/sys/arm/xscale/i8134x/i81342.c b/sys/arm/xscale/i8134x/i81342.c
index bb3795c5aeb2..49d658ae2d53 100644
--- a/sys/arm/xscale/i8134x/i81342.c
+++ b/sys/arm/xscale/i8134x/i81342.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 
 #define	_ARM32_BUS_DMA_PRIVATE
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
@@ -248,7 +249,7 @@ void
 cpu_reset(void)
 {
 
-	disable_interrupts(I32_bit);
+	disable_interrupts(PSR_I);
 	/* XXX: Use the watchdog to reset for now */
 	__asm __volatile("mcr p6, 0, %0, c8, c9, 0\n"
 	    		 "mcr p6, 0, %1, c7, c9, 0\n"
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index d031de674230..d6db7e6134fd 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -906,20 +906,18 @@ npe_addstats(struct npe_softc *sc)
 	      be32toh(ns->RxOverrunDiscards)
 	    + be32toh(ns->RxUnderflowEntryDiscards);
 
-	ifp->if_oerrors +=
-		  be32toh(ns->dot3StatsInternalMacTransmitErrors)
-		+ be32toh(ns->dot3StatsCarrierSenseErrors)
-		+ be32toh(ns->TxVLANIdFilterDiscards)
-		;
-	ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors)
-		+ be32toh(ns->dot3StatsInternalMacReceiveErrors)
-		+ be32toh(ns->RxOverrunDiscards)
-		+ be32toh(ns->RxUnderflowEntryDiscards)
-		;
-	ifp->if_collisions +=
-		  be32toh(ns->dot3StatsSingleCollisionFrames)
-		+ be32toh(ns->dot3StatsMultipleCollisionFrames)
-		;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    be32toh(ns->dot3StatsInternalMacTransmitErrors) +
+	    be32toh(ns->dot3StatsCarrierSenseErrors) +
+	    be32toh(ns->TxVLANIdFilterDiscards));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    be32toh(ns->dot3StatsFCSErrors) +
+	    be32toh(ns->dot3StatsInternalMacReceiveErrors) +
+	    be32toh(ns->RxOverrunDiscards) +
+	    be32toh(ns->RxUnderflowEntryDiscards));
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    be32toh(ns->dot3StatsSingleCollisionFrames) +
+	    be32toh(ns->dot3StatsMultipleCollisionFrames));
 #undef NPEADD
 #undef MIBADD
 }
@@ -999,7 +997,7 @@ npe_txdone_finish(struct npe_softc *sc, const struct txdone *td)
 	 * We're no longer busy, so clear the busy flag and call the
 	 * start routine to xmit more packets.
 	 */
-	ifp->if_opackets += td->count;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, td->count);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	sc->npe_watchdog_timer = 0;
 	npestart_locked(ifp);
@@ -1138,7 +1136,7 @@ npe_rxdone(int qid, void *arg)
 			mrx->m_pkthdr.len = mrx->m_len;
 			mrx->m_pkthdr.rcvif = ifp;
 
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			ifp->if_input(ifp, mrx);
 			rx_npkts++;
 		} else {
@@ -1467,7 +1465,7 @@ npewatchdog(struct npe_softc *sc)
 		return;
 
 	device_printf(sc->sc_dev, "watchdog timeout\n");
-	sc->sc_ifp->if_oerrors++;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 
 	npeinit_locked(sc);
 }
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index efe9aa3edeaa..07c491aa573f 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/rman.h>
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
@@ -202,7 +203,7 @@ arm_mask_irq(uintptr_t nb)
 {
 	int i;
 
-	i = disable_interrupts(I32_bit);
+	i = disable_interrupts(PSR_I);
 	if (nb < 32) {
 		intr_enabled &= ~(1 << nb);
 		ixp425_set_intrmask();
@@ -220,7 +221,7 @@ arm_unmask_irq(uintptr_t nb)
 {
 	int i;
 
-	i = disable_interrupts(I32_bit);
+	i = disable_interrupts(PSR_I);
 	if (nb < 32) {
 		intr_enabled |= (1 << nb);
 		ixp425_set_intrmask();
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index 9495ede5eea9..5a1321864621 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcivar.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
@@ -70,7 +71,7 @@ extern struct ixp425_softc *ixp425_softc;
 #define	PCI_CSR_READ_4(sc, reg)	\
 	bus_read_4(sc->sc_csr, reg)
 
-#define PCI_CONF_LOCK(s)	(s) = disable_interrupts(I32_bit)
+#define PCI_CONF_LOCK(s)	(s) = disable_interrupts(PSR_I)
 #define PCI_CONF_UNLOCK(s)	restore_interrupts((s))
 
 static device_probe_t ixppcib_probe;
@@ -319,9 +320,12 @@ static int
 ixppcib_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {
-
 	struct ixppcib_softc *sc = device_get_softc(bus);
+	int error;
 
+	error = rman_activate_resource(r);
+	if (error)
+		return (error);
 	switch (type) {
 	case SYS_RES_IOPORT:
 		rman_set_bustag(r, &sc->sc_pci_iot);
@@ -334,7 +338,7 @@ ixppcib_activate_resource(device_t bus, device_t child, int type, int rid,
 		break;
 	}
 		
-	return (rman_activate_resource(r));
+	return (0);
 }
 
 static int
diff --git a/sys/arm/xscale/ixp425/ixp425_timer.c b/sys/arm/xscale/ixp425/ixp425_timer.c
index e0b70e94e3ac..6357c1385664 100644
--- a/sys/arm/xscale/ixp425/ixp425_timer.c
+++ b/sys/arm/xscale/ixp425/ixp425_timer.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/timetc.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
@@ -175,7 +176,7 @@ cpu_initclocks(void)
 
 	/* Report the clock frequency. */
 
-	oldirqstate = disable_interrupts(I32_bit);
+	oldirqstate = disable_interrupts(PSR_I);
 
 	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, IXP425_INT_TMR0,
 	    IXP425_INT_TMR0, 1, RF_ACTIVE);
diff --git a/sys/arm/xscale/pxa/pxa_icu.c b/sys/arm/xscale/pxa/pxa_icu.c
index 0d7a51945d14..4194da3c036b 100644
--- a/sys/arm/xscale/pxa/pxa_icu.c
+++ b/sys/arm/xscale/pxa/pxa_icu.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/rman.h>
 #include <sys/timetc.h>
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
@@ -105,7 +106,7 @@ pxa_icu_attach(device_t dev)
 	pxa_icu_set_iclr(0);
 
 	/* XXX: This should move to configure_final or something. */
-	enable_interrupts(I32_bit|F32_bit);
+	enable_interrupts(PSR_I|PSR_F);
 
 	return (0);
 }
diff --git a/sys/arm/xscale/pxa/pxa_timer.c b/sys/arm/xscale/pxa/pxa_timer.c
index 77e68a2eb095..d62c1e1edbc4 100644
--- a/sys/arm/xscale/pxa/pxa_timer.c
+++ b/sys/arm/xscale/pxa/pxa_timer.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/rman.h>
 #include <sys/timetc.h>
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
@@ -190,7 +191,7 @@ cpu_reset(void)
 {
 	uint32_t	val;
 
-	(void)disable_interrupts(I32_bit|F32_bit);
+	(void)disable_interrupts(PSR_I|PSR_F);
 
 	val = pxa_timer_get_oscr();
 	val += PXA_TIMER_FREQUENCY;
diff --git a/sys/boot/Makefile.pc98 b/sys/boot/Makefile.pc98
index aa989e1784bd..84683991a645 100644
--- a/sys/boot/Makefile.pc98
+++ b/sys/boot/Makefile.pc98
@@ -1,4 +1,3 @@
 # $FreeBSD$
 
-# Blank, to override Makefile.i386 since Makefile.$MACHINE is included before 
-# Makefile.$MACHINE_ARCH
+SUBDIR+=		libstand32
diff --git a/sys/boot/amd64/boot1.efi/boot1.c b/sys/boot/amd64/boot1.efi/boot1.c
index 8661f0586877..eb27846383ab 100644
--- a/sys/boot/amd64/boot1.efi/boot1.c
+++ b/sys/boot/amd64/boot1.efi/boot1.c
@@ -26,6 +26,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 
 #include <efi.h>
+#include <eficonsctl.h>
 
 #define _PATH_LOADER	"/boot/loader.efi"
 #define _PATH_KERNEL	"/boot/kernel/kernel"
@@ -97,6 +98,7 @@ strcmp(const char *s1, const char *s2)
 static EFI_GUID BlockIoProtocolGUID = BLOCK_IO_PROTOCOL;
 static EFI_GUID DevicePathGUID = DEVICE_PATH_PROTOCOL;
 static EFI_GUID LoadedImageGUID = LOADED_IMAGE_PROTOCOL;
+static EFI_GUID ConsoleControlGUID = EFI_CONSOLE_CONTROL_PROTOCOL_GUID;
 
 static EFI_BLOCK_IO *bootdev;
 static EFI_DEVICE_PATH *bootdevpath;
@@ -109,11 +111,20 @@ EFI_STATUS efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE* Xsystab)
 	UINTN i, nparts = sizeof(handles);
 	EFI_STATUS status;
 	EFI_DEVICE_PATH *devpath;
+	EFI_BOOT_SERVICES *BS;
+	EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl = NULL;
 	char *path = _PATH_LOADER;
 
 	systab = Xsystab;
 	image = Ximage;
 
+	BS = systab->BootServices;
+	status = BS->LocateProtocol(&ConsoleControlGUID, NULL,
+	    (VOID **)&ConsoleControl);
+	if (status == EFI_SUCCESS)
+		(void)ConsoleControl->SetMode(ConsoleControl,
+		    EfiConsoleControlScreenText);
+
 	printf(" \n>> FreeBSD EFI boot block\n");
 	printf("   Loader path: %s\n", path);
 
diff --git a/sys/boot/amd64/efi/bootinfo.c b/sys/boot/amd64/efi/bootinfo.c
index db82b241df56..90798e888323 100644
--- a/sys/boot/amd64/efi/bootinfo.c
+++ b/sys/boot/amd64/efi/bootinfo.c
@@ -60,6 +60,7 @@ bi_getboothowto(char *kargs)
 {
 	const char *sw;
 	char *opts;
+	char *console;
 	int howto, i;
 
 	howto = 0;
@@ -70,6 +71,14 @@ bi_getboothowto(char *kargs)
 			howto |= howto_names[i].mask;
 	}
 
+	console = getenv("console");
+	if (console != NULL) {
+		if (strcmp(console, "comconsole") == 0)
+			howto |= RB_SERIAL;
+		if (strcmp(console, "nullconsole") == 0)
+			howto |= RB_MUTE;
+	}
+
 	/* Parse kargs */
 	if (kargs == NULL)
 		return (howto);
@@ -227,10 +236,14 @@ bi_load_efi_data(struct preloaded_file *kfp)
 
 	if (efi_find_framebuffer(&efifb) == 0) {
 		printf("EFI framebuffer information:\n");
-		printf("addr, size     0x%lx, 0x%lx\n", efifb.fb_addr, efifb.fb_size);
-		printf("dimensions     %d x %d\n", efifb.fb_width, efifb.fb_height);
+		printf("addr, size     0x%lx, 0x%lx\n", efifb.fb_addr,
+		    efifb.fb_size);
+		printf("dimensions     %d x %d\n", efifb.fb_width,
+		    efifb.fb_height);
 		printf("stride         %d\n", efifb.fb_stride);
-		printf("masks          0x%08x, 0x%08x, 0x%08x, 0x%08x\n", efifb.fb_mask_red, efifb.fb_mask_green, efifb.fb_mask_blue, efifb.fb_mask_reserved);
+		printf("masks          0x%08x, 0x%08x, 0x%08x, 0x%08x\n",
+		    efifb.fb_mask_red, efifb.fb_mask_green, efifb.fb_mask_blue,
+		    efifb.fb_mask_reserved);
 
 		file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb);
 	}
diff --git a/sys/boot/amd64/efi/conf.c b/sys/boot/amd64/efi/conf.c
index 0e67b6b0fd09..f9984a325210 100644
--- a/sys/boot/amd64/efi/conf.c
+++ b/sys/boot/amd64/efi/conf.c
@@ -62,8 +62,12 @@ struct file_format *file_formats[] = {
 };
 
 extern struct console efi_console;
+extern struct console comconsole;
+extern struct console nullconsole;
 
 struct console *consoles[] = {
 	&efi_console,
+	&comconsole,
+	&nullconsole,
 	NULL
 };
diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile
index 6fe515e0cfcb..fe1068faefaa 100644
--- a/sys/boot/arm/ixp425/boot2/Makefile
+++ b/sys/boot/arm/ixp425/boot2/Makefile
@@ -17,9 +17,7 @@ FILES=${P}
 SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c
 SRCS+=memchr.c memcmp.c memcpy.c memmem.c memset.c printf.c strcmp.c strcpy.c
 SRCS+=strlen.c ashldi3.c divsi3.S muldi3.c
-.if ${MK_ARM_EABI} != "no"
 SRCS+=aeabi_unwind.c
-.endif
 MAN=
 
 KERNPHYSADDR=0x180000
diff --git a/sys/boot/arm/uboot/help.uboot b/sys/boot/arm/uboot/help.uboot
index 5873eb0512d2..c1574af92715 100644
--- a/sys/boot/arm/uboot/help.uboot
+++ b/sys/boot/arm/uboot/help.uboot
@@ -1 +1,27 @@
 $FreeBSD$
+
+###############################################################################
+# Tubenv DShow or import U-Boot environment variables
+
+	ubenv <import | show> [varname ...]
+
+	Display U-Boot environment variables, or import them into the
+	loader environment (which makes them available in the kernel).
+
+###############################################################################
+# Tubenv Simport DImport U-Boot env vars
+
+	ubenv import [varname ...]
+
+	If no variable names are specified, all U-Boot environment
+	variables are imported.  Each variable is prefixed with "uboot."
+	to avoid any possible conflicts with loader or kernel variables.
+
+###############################################################################
+# Tubenv Sshow DShow U-Boot env vars
+
+	ubenv show [varname ...]
+
+	If no variable names are specified, all U-Boot environment
+	variables are shown.
+
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index a44dcc1f8183..dde687940650 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -78,3 +78,6 @@ CFLAGS+=-I${.CURDIR}/../../../../lib/libstand
 .endif
 
 MAN+=	loader.8
+.if ${MK_ZFS} != "no"
+MAN+=	zfsloader.8
+.endif
diff --git a/sys/boot/common/part.c b/sys/boot/common/part.c
index 086809f67aac..445761969563 100644
--- a/sys/boot/common/part.c
+++ b/sys/boot/common/part.c
@@ -53,6 +53,7 @@ static const uuid_t gpt_uuid_unused = GPT_ENT_TYPE_UNUSED;
 static const uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
 static const uuid_t gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
 static const uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI;
+static const uuid_t gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD;
 static const uuid_t gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
 static const uuid_t gpt_uuid_freebsd_nandfs = GPT_ENT_TYPE_FREEBSD_NANDFS;
 static const uuid_t gpt_uuid_freebsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP;
@@ -139,6 +140,8 @@ gpt_parttype(uuid_t type)
 		return (PART_FREEBSD_VINUM);
 	else if (uuid_equal(&type, &gpt_uuid_freebsd_nandfs, NULL))
 		return (PART_FREEBSD_NANDFS);
+	else if (uuid_equal(&type, &gpt_uuid_freebsd, NULL))
+		return (PART_FREEBSD);
 	return (PART_UNKNOWN);
 }
 
diff --git a/sys/boot/common/zfsloader.8 b/sys/boot/common/zfsloader.8
new file mode 100644
index 000000000000..9bb74a475171
--- /dev/null
+++ b/sys/boot/common/zfsloader.8
@@ -0,0 +1,109 @@
+.\" Copyright (c) 2014 Andriy Gapon <avg@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" 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 AUTHOR 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 AUTHOR 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 15, 2014
+.Dt ZFSLOADER 8
+.Os
+.Sh NAME
+.Nm zfsloader
+.Nd kernel bootstrapping final stage
+.Sh DESCRIPTION
+.Nm
+is an extended variant of
+.Xr loader 8
+with added support for booting from ZFS.
+This document describes only differences from
+.Xr loader 8 .
+.Sh ZFS FEATURES
+.Nm
+supports the following format for specifying ZFS filesystems which
+can be used wherever
+.Xr loader 8
+refers to a device specification:
+.Pp
+.Ar zfs:pool/filesystem:
+.Pp
+where
+.Pa pool/filesystem
+is a ZFS filesystem name as described in
+.Xr zfs 8 .
+.Pp
+If
+.Pa /etc/fstab
+does not have an entry for the root filesystem and
+.Va vfs.root.mountfrom
+is not set, but
+.Va currdev
+refers to a ZFS filesystem, then
+.Nm
+will instruct kernel to use that filesystem as the root filesystem.
+.Sh ZFS COMMAND EXTENSIONS
+.Bl -tag -width Ds -compact
+.Pp
+.It Ic lsdev Op Fl v
+Lists ZFS pools in addition to disks and partitions.
+Adding
+.Fl v
+shows more ZFS pool details in a format that resembles
+.Nm zpool Cm status
+output.
+.Pp
+.It Ic lszfs Ar filesystem
+A ZFS extended command that can be used to explore the ZFS filesystem
+hierarchy in a pool.
+Lists the immediate children of the
+.Ar filesystem .
+The filesystem hierarchy is rooted at a filesystem with the same name
+as the pool.
+.El
+.Sh FILES
+.Bl -tag -width /boot/zfsloader -compact
+.It Pa /boot/zfsloader
+.Nm
+itself.
+.El
+.Sh EXAMPLES
+Set the default device used for loading a kernel from a ZFS filesystem:
+.Pp
+.Bd -literal -offset indent
+set currdev=zfs:tank/ROOT/knowngood:
+.Ed
+.Pp
+.Sh SEE ALSO
+.Xr gptzfsboot 8 ,
+.Xr loader 8 ,
+.Xr zfs 8 ,
+.Xr zfsboot 8 ,
+.Xr zfsloader 8 ,
+.Xr zpool 8
+.Sh HISTORY
+The
+.Nm
+first appeared in
+.Fx 7.3 .
+.Sh AUTHORS
+This manual page was written by
+.An Andriy Gapon Aq avg@FreeBSD.org .
diff --git a/sys/boot/efi/include/eficonsctl.h b/sys/boot/efi/include/eficonsctl.h
new file mode 100644
index 000000000000..36dd2c1aceec
--- /dev/null
+++ b/sys/boot/efi/include/eficonsctl.h
@@ -0,0 +1,134 @@
+/*-
+ * Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+ *
+ * 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
+ */
+
+/*
+ * Original Module Name: ConsoleControl.h
+ * Abstract: Abstraction of a Text mode or GOP/UGA screen
+ */
+
+/* $FreeBSD$ */
+
+#ifndef _EFI_CONS_CTL_H
+#define _EFI_CONS_CTL_H
+
+#define EFI_CONSOLE_CONTROL_PROTOCOL_GUID \
+  { 0xf42f7782, 0x12e, 0x4c12, {0x99, 0x56, 0x49, 0xf9, 0x43, 0x4, 0xf7, 0x21} }
+
+typedef struct _EFI_CONSOLE_CONTROL_PROTOCOL   EFI_CONSOLE_CONTROL_PROTOCOL;
+
+
+typedef enum {
+  EfiConsoleControlScreenText,
+  EfiConsoleControlScreenGraphics,
+  EfiConsoleControlScreenMaxValue
+} EFI_CONSOLE_CONTROL_SCREEN_MODE;
+
+
+typedef
+EFI_STATUS
+(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (
+  IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,
+  OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,
+  OUT BOOLEAN                           *GopUgaExists,  OPTIONAL
+  OUT BOOLEAN                           *StdInLocked    OPTIONAL
+  )
+/*++
+
+  Routine Description:
+    Return the current video mode information. Also returns info about existence
+    of Graphics Output devices or UGA Draw devices in system, and if the Std In
+    device is locked. All the arguments are optional and only returned if a non
+    NULL pointer is passed in.
+
+  Arguments:
+    This         - Protocol instance pointer.
+    Mode         - Are we in text of grahics mode.
+    GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device
+    StdInLocked  - TRUE if StdIn device is keyboard locked
+
+  Returns:
+    EFI_SUCCESS     - Mode information returned.
+
+--*/
+;
+
+
+typedef
+EFI_STATUS
+(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE) (
+  IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,
+  IN  EFI_CONSOLE_CONTROL_SCREEN_MODE   Mode
+  )
+/*++
+
+  Routine Description:
+    Set the current mode to either text or graphics. Graphics is
+    for Quiet Boot.
+
+  Arguments:
+    This  - Protocol instance pointer.
+    Mode  - Mode to set the
+
+  Returns:
+    EFI_SUCCESS     - Mode information returned.
+
+--*/
+;
+
+
+typedef
+EFI_STATUS
+(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN) (
+  IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,
+  IN CHAR16                             *Password
+  )
+/*++
+
+  Routine Description:
+    Lock Std In devices until Password is typed.
+
+  Arguments:
+    This     - Protocol instance pointer.
+    Password - Password needed to unlock screen. NULL means unlock keyboard
+
+  Returns:
+    EFI_SUCCESS      - Mode information returned.
+    EFI_DEVICE_ERROR - Std In not locked
+
+--*/
+;
+
+
+
+struct _EFI_CONSOLE_CONTROL_PROTOCOL {
+  EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE           GetMode;
+  EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE           SetMode;
+  EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN        LockStdIn;
+};
+
+extern EFI_GUID gEfiConsoleControlProtocolGuid;
+
+#endif
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 60cb43f02744..3edeb22ea5a7 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -5,6 +5,8 @@ INTERNALLIB=
 
 SRCS=	delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
 	libefi.c time.c
+.PATH:	${.CURDIR}/../../i386/libi386
+SRCS+= nullconsole.c comconsole.c
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -fPIC
@@ -16,6 +18,8 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
 # Pick up the bootstrap header for some interface items
 CFLAGS+= -I${.CURDIR}/../../common
 
+CFLAGS+= -DNO_PCI
+
  
 # Suppress warning from clang for FreeBSD %b and %D formats
 CFLAGS+= -fformat-extensions
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index 45a48dc0c627..c6c01d39dc6d 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <efi.h>
+#include <eficonsctl.h>
 #include <efilib.h>
 #include <stand.h>
 
@@ -82,6 +83,9 @@ void
 efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
 {
 	static EFI_GUID image_protocol = LOADED_IMAGE_PROTOCOL;
+	static EFI_GUID console_control_protocol =
+	    EFI_CONSOLE_CONTROL_PROTOCOL_GUID;
+	EFI_CONSOLE_CONTROL_PROTOCOL *console_control = NULL;
 	EFI_LOADED_IMAGE *img;
 	CHAR16 *argp, *args, **argv;
 	EFI_STATUS status;
@@ -92,6 +96,12 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
 	BS = ST->BootServices;
 	RS = ST->RuntimeServices;
 
+	status = BS->LocateProtocol(&console_control_protocol, NULL,
+	    (VOID **)&console_control);
+	if (status == EFI_SUCCESS)
+		(void)console_control->SetMode(console_control,
+		    EfiConsoleControlScreenText);
+
 	heapsize = 2 * 1024 * 1024;
 	status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
 	    EFI_SIZE_TO_PAGES(heapsize), &heap);
diff --git a/sys/boot/fdt/dts/arm/socfpga-sockit.dts b/sys/boot/fdt/dts/arm/socfpga-sockit.dts
index 1cd90eaa87a6..d76b6cf2b3bd 100644
--- a/sys/boot/fdt/dts/arm/socfpga-sockit.dts
+++ b/sys/boot/fdt/dts/arm/socfpga-sockit.dts
@@ -51,6 +51,10 @@
 		usb1: usb@ffb40000 {
 			status = "okay";
 		};
+
+		gmac1: ethernet@ff702000 {
+			status = "okay";
+		};
 	};
 
 	chosen {
diff --git a/sys/boot/fdt/dts/arm/socfpga.dtsi b/sys/boot/fdt/dts/arm/socfpga.dtsi
index 8bdcda22412a..2480484692e1 100644
--- a/sys/boot/fdt/dts/arm/socfpga.dtsi
+++ b/sys/boot/fdt/dts/arm/socfpga.dtsi
@@ -39,6 +39,8 @@
 
 	aliases {
 		soc = &SOC;
+		rstmgr = &rstmgr;
+		l3regs = &l3regs;
 		serial0 = &serial0;
 		serial1 = &serial1;
 	};
@@ -69,6 +71,29 @@
 			interrupt-parent = < &GIC >;
 		};
 
+		sysmgr: sysmgr@ffd08000 {
+			compatible = "altr,sys-mgr";
+			reg = <0xffd08000 0x1000>;
+		};
+
+		rstmgr: rstmgr@ffd05000 {
+			compatible = "altr,rst-mgr";
+			reg = <0xffd05000 0x1000>;
+		};
+
+		l3regs: l3regs@ff800000 {
+			compatible = "altr,l3regs";
+			reg = <0xff800000 0x1000>;
+		};
+
+		fpgamgr: fpgamgr@ff706000 {
+			compatible = "altr,fpga-mgr";
+			reg = <0xff706000 0x1000>, /* FPGAMGRREGS */
+			      <0xffb90000 0x1000>; /* FPGAMGRDATA */
+			interrupts = < 207 >;
+			interrupt-parent = <&GIC>;
+		};
+
 		serial0: serial@ffc02000 {
 			compatible = "ns16550";
 			reg = <0xffc02000 0x1000>;
@@ -107,5 +132,25 @@
 			dr_mode = "host";
 			status = "disabled";
 		};
+
+		gmac0: ethernet@ff700000 {
+			compatible = "altr,socfpga-stmmac",
+				"snps,dwmac-3.70a", "snps,dwmac";
+			reg = <0xff700000 0x2000>;
+			interrupts = <147>;
+			interrupt-parent = <&GIC>;
+			phy-mode = "rgmii";
+			status = "disabled";
+		};
+
+		gmac1: ethernet@ff702000 {
+			compatible = "altr,socfpga-stmmac",
+				"snps,dwmac-3.70a", "snps,dwmac";
+			reg = <0xff702000 0x2000>;
+			interrupts = <152>;
+			interrupt-parent = <&GIC>;
+			phy-mode = "rgmii";
+			status = "disabled";
+		};
 	};
 };
diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c
index 349a7c66d1ca..6641438c234e 100644
--- a/sys/boot/ficl/loader.c
+++ b/sys/boot/ficl/loader.c
@@ -727,6 +727,142 @@ static void fkey(FICL_VM *pVM)
     return;
 }
 
+
+#ifdef __i386__
+/*
+ * pcibios-device-count (devid -- count)
+ *
+ * Returns the PCI BIOS' count of how many devices matching devid are in the system.
+ * devid is the 32-bit vendor + device.
+ */
+static void
+ficlPciBiosCountDevices(FICL_VM *pVM)
+{
+	uint32_t devid;
+	int i;
+
+	devid = stackPopINT(pVM->pStack);
+
+	i = biospci_count_device_type(devid);
+
+	stackPushINT(pVM->pStack, i);
+}
+
+/*
+ * pcibios-write-config (locator offset width value -- )
+ *
+ * Writes the specified config register.
+ * Locator is bus << 8 | device << 3 | fuction
+ * offset is the pci config register
+ * width is 0 for byte, 1 for word, 2 for dword
+ * value is the value to write
+ */
+static void
+ficlPciBiosWriteConfig(FICL_VM *pVM)
+{
+	uint32_t value, width, offset, locator;
+
+	value = stackPopINT(pVM->pStack);
+	width = stackPopINT(pVM->pStack);
+	offset = stackPopINT(pVM->pStack);
+	locator = stackPopINT(pVM->pStack);
+
+	biospci_write_config(locator, offset, width, value);
+}
+
+/*
+ * pcibios-read-config (locator offset width -- value)
+ *
+ * Reads the specified config register.
+ * Locator is bus << 8 | device << 3 | fuction
+ * offset is the pci config register
+ * width is 0 for byte, 1 for word, 2 for dword
+ * value is the value to read from the register
+ */
+static void
+ficlPciBiosReadConfig(FICL_VM *pVM)
+{
+	uint32_t value, width, offset, locator;
+
+	width = stackPopINT(pVM->pStack);
+	offset = stackPopINT(pVM->pStack);
+	locator = stackPopINT(pVM->pStack);
+
+	biospci_read_config(locator, offset, width, &value);
+
+	stackPushINT(pVM->pStack, value);
+}
+
+/*
+ * pcibios-find-devclass (class index -- locator)
+ *
+ * Finds the index'th instance of class in the pci tree.
+ * must be an exact match.
+ * class is the class to search for.
+ * index 0..N (set to 0, increment until error)
+ *
+ * Locator is bus << 8 | device << 3 | fuction (or -1 on error)
+ */
+static void
+ficlPciBiosFindDevclass(FICL_VM *pVM)
+{
+	uint32_t index, class, locator;
+
+	index = stackPopINT(pVM->pStack);
+	class = stackPopINT(pVM->pStack);
+
+	if (biospci_find_devclass(class, index, &locator))
+		locator = 0xffffffff;
+
+	stackPushINT(pVM->pStack, locator);
+}
+
+/*
+ * pcibios-find-device(devid index -- locator)
+ *
+ * Finds the index'th instance of devid in the pci tree.
+ * must be an exact match.
+ * class is the class to search for.
+ * index 0..N (set to 0, increment until error)
+ *
+ * Locator is bus << 8 | device << 3 | fuction (or -1 on error)
+ */
+static void
+ficlPciBiosFindDevice(FICL_VM *pVM)
+{
+	uint32_t index, devid, locator;
+
+	index = stackPopINT(pVM->pStack);
+	devid = stackPopINT(pVM->pStack);
+
+	if (biospci_find_device(devid, index, &locator))
+		locator = 0xffffffff;
+
+	stackPushINT(pVM->pStack, locator);
+}
+
+/*
+ * pcibios-find-device(bus device function -- locator)
+ *
+ * converts bus, device, function to locator.
+ *
+ * Locator is bus << 8 | device << 3 | fuction
+ */
+static void
+ficlPciBiosLocator(FICL_VM *pVM)
+{
+	uint32_t bus, device, function, locator;
+
+	function = stackPopINT(pVM->pStack);
+	device = stackPopINT(pVM->pStack);
+	bus = stackPopINT(pVM->pStack);
+
+	locator = biospci_locator(bus, device, function);
+
+	stackPushINT(pVM->pStack, locator);
+}
+#endif
+
 /*
 ** Retrieves free space remaining on the dictionary
 */
@@ -749,7 +885,6 @@ static void ficlDictIncrease(FICL_VM *pVM)
     stackPushPtr(pVM->pStack, &dictIncrease);
 }
 
-
 /**************************************************************************
                         f i c l C o m p i l e P l a t f o r m
 ** Build FreeBSD platform extensions into the system dictionary
@@ -795,6 +930,14 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys)
     dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
 #endif
 #endif
+#ifdef __i386__
+    dictAppendWord(dp, "pcibios-device-count", ficlPciBiosCountDevices, FW_DEFAULT);
+    dictAppendWord(dp, "pcibios-read-config", ficlPciBiosReadConfig, FW_DEFAULT);
+    dictAppendWord(dp, "pcibios-write-config", ficlPciBiosWriteConfig, FW_DEFAULT);
+    dictAppendWord(dp, "pcibios-find-devclass", ficlPciBiosFindDevclass, FW_DEFAULT);
+    dictAppendWord(dp, "pcibios-find-device", ficlPciBiosFindDevice, FW_DEFAULT);
+    dictAppendWord(dp, "pcibios-locator", ficlPciBiosLocator, FW_DEFAULT);
+#endif
 
 #if defined(PC98)
     ficlSetEnv(pSys, "arch-pc98",         FICL_TRUE);
@@ -808,4 +951,3 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys)
 
     return;
 }
-
diff --git a/sys/boot/forth/pcibios.4th b/sys/boot/forth/pcibios.4th
new file mode 100644
index 000000000000..392d236e5471
--- /dev/null
+++ b/sys/boot/forth/pcibios.4th
@@ -0,0 +1,47 @@
+\ Copyright (c) 2014 M. Warner Losh <imp@freebsd.org>
+\ All rights reserved.
+\
+\ 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 AUTHOR 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 AUTHOR 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.
+\
+\ $FreeBSD$
+
+only forth also support-functions also builtins definitions
+
+\ pci-device-count pci-id
+\
+\ Counts the number of instances of pci-id in the system and reports
+\ it to the user.
+: pci-device-count
+  0= if ( interpreted ) get_arguments then
+
+  0= if ." Need an argument" cr abort then
+  \ First argument is 0 when we're interprated.  See support.4th
+  \ for get_arguments reading the rest of the line and parsing it
+  \ stack: argN lenN ... arg1 len1 N
+  hex ?number decimal 
+  0= if ." Bad pci-id given (must be legal hex value)" cr abort then
+  dup pcibios-device-count ." Found " . ." instances of " hex . decimal cr
+;
+
+also forth definitions also builtins
+
+builtin: pci-device-count
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index fa8c29d33a88..40413e9477d4 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -37,7 +37,7 @@ CFLAGS=	-Os \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline \
+	-Winline
 
 CFLAGS.gcc+=	-fno-guess-branch-probability \
 		-fno-unit-at-a-time \
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index a9d6ac891f10..6fdf014a2184 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -5,6 +5,7 @@
 		${.CURDIR}/../../common
 
 FILES=		gptzfsboot
+MAN=		gptzfsboot.8
 
 NM?=		nm
 
diff --git a/sys/boot/i386/gptzfsboot/gptzfsboot.8 b/sys/boot/i386/gptzfsboot/gptzfsboot.8
new file mode 100644
index 000000000000..400c8c6128fe
--- /dev/null
+++ b/sys/boot/i386/gptzfsboot/gptzfsboot.8
@@ -0,0 +1,193 @@
+.\" Copyright (c) 2014 Andriy Gapon <avg@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" 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 AUTHORS 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 AUTHORS 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 15, 2014
+.Dt GPTZFSBOOT 8
+.Os
+.Sh NAME
+.Nm gptzfsboot
+.Nd GPT bootcode for ZFS on BIOS-based computers
+.Sh DESCRIPTION
+.Nm
+is used on BIOS-based computers to boot from a filesystem in
+a ZFS pool.
+.Nm
+is installed in a
+.Cm freebsd-boot
+partition of a GPT-partitioned disk with
+.Xr gpart 8 .
+.Sh IMPLEMENTATION NOTES
+The GPT standard allows a variable number of partitions, but
+.Nm
+only boots from tables with 128 partitions or less.
+.Sh BOOTING
+.Nm
+tries to find all ZFS pools that are composed of BIOS-visible
+hard disks or partitions on them.
+.Nm
+looks for ZFS device labels on all visible disks and in discovered
+supported partitions for all supported partition scheme types.
+The search starts with the disk from which
+.Nm
+itself was loaded.
+Other disks are probed in BIOS defined order.
+After a disk is probed and
+.Nm
+determines that the whole disk is not a ZFS pool member, then
+individual partitions are probed in their partition table order.
+Currently GPT and MBR partition schemes are supported.
+With the GPT scheme, only partitions of type
+.Cm freebsd-zfs
+are probed.
+The first pool seen during probing is used as a default boot pool.
+.Pp
+The filesystem specified by the
+.Cm bootfs
+property of the pool is used as a default boot filesystem.
+If the
+.Cm bootfs
+property is not set, then the root filesystem of the pool is used as
+the default.
+.Xr zfsloader 8
+is loaded from the boot filesystem.
+If
+.Pa /boot.config
+or
+.Pa /boot/config
+is present in the boot filesystem, boot options are read from it
+in the same way as
+.Xr boot 8 .
+.Pp
+The ZFS GUIDs of the first successfully probed device and the first
+detected pool are made available to
+.Xr zfsloader 8
+in the
+.Cm vfs.zfs.boot.primary_vdev
+and
+.Cm vfs.zfs.boot.primary_pool
+variables.
+.Sh USAGE
+Normally
+.Nm
+will boot in fully automatic mode.
+However, like
+.Xr boot 8 ,
+it is possible to interrupt the automatic boot process and interact with
+.Nm
+through a prompt.
+.Nm
+accepts all the options that
+.Xr boot 8
+supports.
+.Pp
+Filesystem specification and the path to
+.Xr zfsloader 8
+is different from
+.Xr boot 8 .
+The format is
+.Pp
+.Sm off
+.Oo zfs:pool/filesystem: Oc Oo /path/to/loader Oc
+.Sm on
+.Pp
+Both the filesystem and the path can be specified.
+If only a path is specified, then the default filesystem is used.
+If only a pool and filesystem are specified, then
+.Pa /boot/zfsloader
+is used as a path.
+.Pp
+Additionally, the
+.Ic status
+command can be used to query information about discovered pools.
+The output format is similar to that of
+.Cm zpool status
+.Pq see Xr zpool 8 .
+.Pp
+The configured or automatically determined ZFS boot filesystem is
+stored in the
+.Xr zfsloader 8
+.Cm loaddev
+variable, and also set as the initial value of the
+.Cm currdev
+variable.
+.Sh FILES
+.Bl -tag -width /boot/gptzfsboot -compact
+.It Pa /boot/gptzfsboot
+boot code binary
+.It Pa /boot.config
+parameters for the boot block
+.Pq optional
+.It Pa /boot/config
+alternative parameters for the boot block
+.Pq optional
+.El
+.Sh EXAMPLES
+.Nm
+is typically installed in combination with a
+.Dq protective MBR
+.Po
+see
+.Xr gpart 8
+.Pc .
+To install
+.Nm
+on the
+.Pa ada0
+drive:
+.Bd -literal -offset indent
+gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada0
+.Ed
+.Pp
+.Nm
+can also be installed without the PMBR:
+.Bd -literal -offset indent
+gpart bootcode -p /boot/gptzfsboot -i 1 ada0
+.Ed
+.Sh SEE ALSO
+.Xr boot.config 5 ,
+.Xr boot 8 ,
+.Xr gpart 8 ,
+.Xr loader 8 ,
+.Xr zfsloader 8 ,
+.Xr zpool 8
+.Sh HISTORY
+.Nm
+appeared in FreeBSD 7.3.
+.Sh BUGS
+.Nm
+looks for ZFS meta-data only in MBR partitions
+.Pq known on FreeBSD as slices .
+It does not look into BSD
+.Xr disklabel 8
+partitions that are traditionally called partitions.
+If a disklabel partition happens to be placed so that ZFS meta-data can be
+found at the fixed offsets relative to a slice, then
+.Nm
+will recognize the partition as a part of a ZFS pool,
+but this is not guaranteed to happen.
+.Sh AUTHORS
+This manual page was written by
+.An Andriy Gapon Aq avg@FreeBSD.org .
diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/sys/boot/i386/libfirewire/fwohcireg.h
index d24f65858315..d57870cd626e 100644
--- a/sys/boot/i386/libfirewire/fwohcireg.h
+++ b/sys/boot/i386/libfirewire/fwohcireg.h
@@ -235,7 +235,7 @@ struct ohci_registers {
 	fwohcireg_t	config_rom;	/* config ROM map 0x34 */
 	fwohcireg_t	post_wr_lo;	/* post write addr lo 0x38 */
 	fwohcireg_t	post_wr_hi;	/* post write addr hi 0x3c */
-	fwohcireg_t	vender;		/* vender ID 0x40 */
+	fwohcireg_t	vendor;		/* vendor ID 0x40 */
 	fwohcireg_t	dummy1[3];	/* dummy 0x44-0x4c */
 	fwohcireg_t	hcc_cntl_set;	/* HCC control set 0x50 */
 	fwohcireg_t	hcc_cntl_clr;	/* HCC control clr 0x54 */
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index ff4e86202c49..196590e1bf97 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -192,15 +192,69 @@ static struct pci_class
 static void	biospci_enumerate(void);
 static void	biospci_addinfo(int devid, struct pci_class *pc, struct pci_subclass *psc, struct pci_progif *ppi);
 
-static int	biospci_version;
-static int	biospci_hwcap;
-
 struct pnphandler biospcihandler =
 {
     "PCI BIOS",
     biospci_enumerate
 };
 
+#define PCI_BIOS_PRESENT	0xb101
+#define FIND_PCI_DEVICE		0xb102
+#define FIND_PCI_CLASS_CODE	0xb103
+#define GENERATE_SPECIAL_CYCLE	0xb106
+#define READ_CONFIG_BYTE	0xb108
+#define READ_CONFIG_WORD	0xb109
+#define READ_CONFIG_DWORD	0xb10a
+#define WRITE_CONFIG_BYTE	0xb10b
+#define WRITE_CONFIG_WORD	0xb10c
+#define WRITE_CONFIG_DWORD	0xb10d
+#define GET_IRQ_ROUTING_OPTIONS	0xb10e
+#define SET_PCI_IRQ		0xb10f
+
+#define PCI_INT			0x1a
+
+#define PCI_SIGNATURE		0x20494350	/* AKA "PCI " */
+
+void
+biospci_detect(void)
+{
+    uint16_t version, hwcap, maxbus;
+    char buf[24];
+
+    /* Find the PCI BIOS */
+    v86.ctl = V86_FLAGS;
+    v86.addr = PCI_INT;
+    v86.eax = PCI_BIOS_PRESENT;
+    v86.edi = 0x0;
+    v86int();
+
+    /* Check for OK response */
+    if (V86_CY(v86.efl) || ((v86.eax & 0xff00) != 0) ||
+	(v86.edx != PCI_SIGNATURE))
+	return;
+
+    version = v86.ebx & 0xffff;
+    hwcap = v86.eax & 0xff;
+    maxbus = v86.ecx & 0xff;
+#if 0
+    printf("PCI BIOS %d.%d%s%s maxbus %d\n", 
+	   bcd2bin((version >> 8) & 0xf), bcd2bin(version & 0xf),
+	   (hwcap & 1) ? " config1" : "", (hwcap & 2) ? " config2" : "",
+	   maxbus);
+#endif
+    sprintf(buf, "%d", bcd2bin((version >> 8) & 0xf));
+    setenv("pcibios.major", buf, 1);
+    sprintf(buf, "%d", bcd2bin(version & 0xf));
+    setenv("pcibios.minor", buf, 1);
+    sprintf(buf, "%d", !!(hwcap & 1));
+    setenv("pcibios.config1", buf, 1);
+    sprintf(buf, "%d", !!(hwcap & 2));
+    setenv("pcibios.config2", buf, 1);
+    sprintf(buf, "%d", maxbus);
+    setenv("pcibios.maxbus", buf, 1);
+
+}
+
 static void
 biospci_enumerate(void)
 {
@@ -210,25 +264,6 @@ biospci_enumerate(void)
     struct pci_subclass *psc;
     struct pci_progif	*ppi;
 
-    /* Find the PCI BIOS */
-    v86.ctl = V86_FLAGS;
-    v86.addr = 0x1a;
-    v86.eax = 0xb101;
-    v86.edi = 0x0;
-    v86int();
-
-    /* Check for OK response */
-    if (V86_CY(v86.efl) || ((v86.eax & 0xff00) != 0) ||
-	(v86.edx != 0x20494350))
-	return;
-
-    biospci_version = v86.ebx & 0xffff;
-    biospci_hwcap = v86.eax & 0xff;
-#if 0
-    printf("PCI BIOS %d.%d%s%s\n", 
-	   bcd2bin((biospci_version >> 8) & 0xf), bcd2bin(biospci_version & 0xf),
-	   (biospci_hwcap & 1) ? " config1" : "", (biospci_hwcap & 2) ? " config2" : "");
-#endif
     /* Iterate over known classes */
     for (pc = pci_classes; pc->pc_class >= 0; pc++) {
 	/* Iterate over subclasses */
@@ -289,8 +324,8 @@ int
 biospci_find_devclass(uint32_t class, int index, uint32_t *locator)
 {
 	v86.ctl = V86_FLAGS;
-	v86.addr = 0x1a;
-	v86.eax = 0xb103;
+	v86.addr = PCI_INT;
+	v86.eax = FIND_PCI_CLASS_CODE;
 	v86.ecx = class;
 	v86.esi = index;
 	v86int();
@@ -302,6 +337,25 @@ biospci_find_devclass(uint32_t class, int index, uint32_t *locator)
 	*locator = v86.ebx;
 	return (0);
 }
+
+int
+biospci_find_device(uint32_t devid, int index, uint32_t *locator)
+{
+	v86.ctl = V86_FLAGS;
+	v86.addr = PCI_INT;
+	v86.eax = FIND_PCI_DEVICE;
+	v86.edx = devid & 0xffff;		/* EDX - Vendor ID */
+	v86.ecx = (devid >> 16) & 0xffff;	/* ECX - Device ID */
+	v86.esi = index;
+	v86int();
+
+	 /* error */
+	if (V86_CY(v86.efl) || (v86.eax & 0xff00))
+		return (-1);
+
+	*locator = v86.ebx;
+	return (0);
+}
 /*
  * Configuration space access methods.
  * width = 0(byte), 1(word) or 2(dword).
@@ -310,8 +364,8 @@ int
 biospci_write_config(uint32_t locator, int offset, int width, uint32_t val)
 {
 	v86.ctl = V86_FLAGS;
-	v86.addr = 0x1a;
-	v86.eax = 0xb10b + width;
+	v86.addr = PCI_INT;
+	v86.eax = WRITE_CONFIG_BYTE + width;
 	v86.ebx = locator;
 	v86.edi = offset;
 	v86.ecx = val;
@@ -328,8 +382,8 @@ int
 biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val)
 {
 	v86.ctl = V86_FLAGS;
-	v86.addr = 0x1a;
-	v86.eax = 0xb108 + width;
+	v86.addr = PCI_INT;
+	v86.eax = READ_CONFIG_BYTE + width;
 	v86.ebx = locator;
 	v86.edi = offset;
 	v86int();
@@ -348,3 +402,27 @@ biospci_locator(int8_t bus, uint8_t device, uint8_t function)
 
 	return ((bus << 8) | ((device & 0x1f) << 3) | (function & 0x7));
 }
+
+/*
+ * Counts the number of instances of devid we have in the system, as least as
+ * far as the PCI BIOS is able to tell.
+ */
+int
+biospci_count_device_type(uint32_t devid)
+{
+	int i;
+
+	for (i = 0; 1; i++) {
+		v86.ctl = V86_FLAGS;
+		v86.addr = PCI_INT;
+		v86.eax = FIND_PCI_DEVICE;
+		v86.edx = devid & 0xffff;		/* EDX - Vendor ID */
+		v86.ecx = (devid >> 16) & 0xffff;	/* ECX - Device ID */
+		v86.esi = i;
+		v86int();
+		if (V86_CY(v86.efl) || (v86.eax & 0xff00))
+			break;
+
+	}
+	return i;
+}
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index 76a62401a9d2..bd2a2e864fa2 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -214,6 +214,9 @@ comc_port_set(struct env_var *ev, int flags, const void *value)
 static uint32_t
 comc_parse_pcidev(const char *string)
 {
+#ifdef NO_PCI
+	return (0);
+#else
 	char *p, *p1;
 	uint8_t bus, dev, func, bar;
 	uint32_t locator;
@@ -247,11 +250,15 @@ comc_parse_pcidev(const char *string)
 
 	locator = (bar << 16) | biospci_locator(bus, dev, func);
 	return (locator);
+#endif
 }
 
 static int
 comc_pcidev_handle(uint32_t locator)
 {
+#ifdef NO_PCI
+	return (CMD_ERROR);
+#else
 	char intbuf[64];
 	uint32_t port;
 
@@ -275,6 +282,7 @@ comc_pcidev_handle(uint32_t locator)
 	comc_locator = locator;
 
 	return (CMD_OK);
+#endif
 }
 
 static int
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index 24d6f56b8d7f..3f6704fac020 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -103,7 +103,10 @@ extern vm_offset_t	memtop_copyin;	/* memtop less heap size for the cases */
 extern uint32_t		high_heap_size;	/* extended memory region available */
 extern vm_offset_t	high_heap_base;	/* for use as the heap */
 
+void	biospci_detect(void);
+int	biospci_count_device_type(uint32_t devid);
 int biospci_find_devclass(uint32_t class, int index, uint32_t *locator);
+int biospci_find_device(uint32_t devid, int index, uint32_t *locator);
 int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val);
 int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val);
 uint32_t biospci_locator(int8_t bus, uint8_t device, uint8_t function);
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 6d372dd3b961..b10399e79d5a 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -110,6 +110,7 @@ FILES+=	loader.help loader.4th support.4th loader.conf
 FILES+= screen.4th frames.4th beastie.4th
 FILES+= brand.4th check-password.4th color.4th delay.4th
 FILES+= menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
+FILES+= pcibios.4th
 FILESDIR_loader.conf=	/boot/defaults
 
 .if !exists(${DESTDIR}/boot/loader.rc)
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 13f93350127f..347916964564 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -183,6 +183,9 @@ main(void)
     /* detect SMBIOS for future reference */
     smbios_detect();
 
+    /* detect PCI BIOS for future reference */
+    biospci_detect();
+
     printf("\n");
     printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
     printf("(%s, %s)\n", bootprog_maker, bootprog_date);
diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
index f4da642fdad2..0c24c40fed86 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/sys/boot/i386/zfsboot/Makefile
@@ -3,6 +3,7 @@
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		zfsboot
+MAN=		zfsboot.8
 
 NM?=		nm
 
diff --git a/sys/boot/i386/zfsboot/zfsboot.8 b/sys/boot/i386/zfsboot/zfsboot.8
new file mode 100644
index 000000000000..6450939de955
--- /dev/null
+++ b/sys/boot/i386/zfsboot/zfsboot.8
@@ -0,0 +1,133 @@
+.\" Copyright (c) 2014 Andriy Gapon <avg@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" 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 AUTHORS 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 AUTHORS 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 15, 2014
+.Dt ZFSBOOT 8
+.Os
+.Sh NAME
+.Nm zfsboot
+.Nd bootcode for ZFS on BIOS-based computers
+.Sh DESCRIPTION
+.Nm
+is used on BIOS-based computers to boot from a filesystem in
+a ZFS pool.
+.Nm
+is installed in two parts on a disk or a partition used by a ZFS pool.
+The first part, a single-sector starter boot block, is installed
+at the beginning of the disk or partition.
+The second part, a main boot block, is installed at a special offset
+within the disk or partition.
+Both areas are reserved by the ZFS on-disk specification for boot use.
+If
+.Nm
+is installed in a partition, then that partition should be made
+bootable using appropriate configuration and boot blocks described in
+.Xr boot 8 .
+.Sh BOOTING
+The
+.Nm
+boot process is very similar to that of
+.Xr gptzfsboot 8 .
+One significant difference is that
+.Nm
+does not currently support the GPT partitioning scheme.
+Thus only whole disks and MBR partitions, traditionally referred to as
+slices, are probed for ZFS disk labels.
+See the BUGS section in
+.Xr gptzfsboot 8
+for some limitations of the MBR scheme support.
+.Sh USAGE
+.Nm
+supports all the same prompt and configuration file arguments as
+.Xr gptzfsboot 8 .
+.Sh FILES
+.Bl -tag -width /boot/zfsboot -compact
+.It Pa /boot/zfsboot
+boot code binary
+.It Pa /boot.config
+parameters for the boot block
+.Pq optional
+.It Pa /boot/config
+alternative parameters for the boot block
+.Pq optional
+.El
+.Sh EXAMPLES
+.Nm
+is typically installed using
+.Xr dd 1 .
+To install
+.Nm
+on the
+.Pa ada0
+drive:
+.Bd -literal -offset indent
+dd if=/boot/zfsboot of=/dev/ada0 count=1
+dd if=/boot/zfsboot of=/dev/ada0 iseek=1 oseek=1024
+.Ed
+.Pp
+If the drive is currently in use, the GEOM safety will prevent writes
+and must be disabled before running the above commands:
+.Bd -literal -offset indent
+sysctl kern.geom.debugflags=0x10
+.Ed
+.Pp
+.Nm
+can also be installed in an MBR slice:
+.Bd -literal -offset indent
+gpart create -s mbr ada0
+gpart add -t freebsd ada0
+gpart create -s BSD ada0s1
+gpart bootcode -b /boot/boot0 ada0
+gpart set -a active -i 1 ada0
+dd if=/boot/zfsboot of=/dev/ada0s1 count=1
+dd if=/boot/zfsboot of=/dev/ada0s1 iseek=1 oseek=1024
+.Ed
+.Pp
+Note that commands to create and populate a pool are not shown
+in the example above.
+.Sh SEE ALSO
+.Xr dd 1 ,
+.Xr boot.config 5 ,
+.Xr boot 8 ,
+.Xr gptzfsboot 8 ,
+.Xr loader 8 ,
+.Xr zfsloader 8 ,
+.Xr zpool 8
+.Sh HISTORY
+.Nm
+appeared in FreeBSD 7.3.
+.Sh AUTHORS
+This manual page was written by
+.An Andriy Gapon Aq avg@FreeBSD.org .
+.Sh BUGS
+Installing
+.Nm
+with
+.Xr dd 1
+is a hack.
+ZFS needs a command to properly install
+.Nm
+onto a ZFS-controlled disk or partition.
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile
index 39c8e4003d58..437fa3bbe4d2 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@@ -67,9 +67,6 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${LIBC}/arm/gen
 
-.if ${MK_ARM_EABI} == "no"
-SRCS+= divsi3.S
-.else
 # Compiler support functions
 .PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/
 # __clzsi2 and ctzsi2 for various builtin functions
@@ -81,7 +78,6 @@ SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
 .PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/arm/
 SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
-.endif
 
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index f462717fee99..0b744aa83a30 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-# XXX: clang can compile the boot code just fine, but boot2 gets too big
-#CC:=		gcc
-#COMPILER_TYPE:=	gcc
-
 FILES=		boot boot1 boot2
 
 NM?=		nm
@@ -114,4 +110,5 @@ boot2.h: boot1.out
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=		${CLANG_NO_IAS}
+CFLAGS.boot1.S=		${CLANG_NO_IAS}
+CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
diff --git a/sys/boot/pc98/cdboot/cdboot.S b/sys/boot/pc98/cdboot/cdboot.S
index ae333d1d7ef3..c97c02bea31b 100644
--- a/sys/boot/pc98/cdboot/cdboot.S
+++ b/sys/boot/pc98/cdboot/cdboot.S
@@ -11,9 +11,6 @@
 # 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.
-# 3. Neither the name of the author nor the names of any co-contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index b4433a474d76..e612205de46c 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -44,4 +44,7 @@ CFLAGS+=	-I${.CURDIR}/../../common \
 # the location of libstand
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
+# Suppress warning from clang for FreeBSD %b and %D formats
+CFLAGS+= -fformat-extensions
+
 .include <bsd.lib.mk>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 7ab13a189dd3..4d865e7703ec 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -56,6 +56,8 @@ LDFLAGS=	-static -Ttext 0x0
 LIBPC98=	${.OBJDIR}/../libpc98/libpc98.a
 CFLAGS+=	-I${.CURDIR}/..
 
+LIBSTAND=	${.OBJDIR}/../../libstand32/libstand.a
+
 # BTX components
 CFLAGS+=	-I${.CURDIR}/../btx/lib
 
diff --git a/sys/boot/uboot/common/main.c b/sys/boot/uboot/common/main.c
index 288a02d14ce8..ae77766d1a8b 100644
--- a/sys/boot/uboot/common/main.c
+++ b/sys/boot/uboot/common/main.c
@@ -556,6 +556,75 @@ command_sysinfo(int argc, char *argv[])
 	return (CMD_OK);
 }
 
+enum ubenv_action {
+	UBENV_UNKNOWN,
+	UBENV_SHOW,
+	UBENV_IMPORT
+};
+
+static void
+handle_uboot_env_var(enum ubenv_action action, const char * var)
+{
+	const char * val;
+	char ubv[128];
+
+	/*
+	 * If the user prepended "uboot." (which is how they usually see these
+	 * names) strip it off as a convenience.
+	 */
+	if (strncmp(var, "uboot.", 6) == 0) {
+		snprintf(ubv, sizeof(ubv), "%s", &var[6]);
+		var = ubv;
+	}
+	val = ub_env_get(var);
+	if (action == UBENV_SHOW) {
+		if (val == NULL)
+			printf("uboot.%s is not set\n", var);
+		else
+			printf("uboot.%s=%s\n", var, val);
+	} else if (action == UBENV_IMPORT) {
+		if (val != NULL) {
+			snprintf(ubv, sizeof(ubv), "uboot.%s", var);
+			setenv(ubv, val, 1);
+		}
+	}
+}
+
+static int
+command_ubenv(int argc, char *argv[])
+{
+	enum ubenv_action action;
+	const char *var;
+	int i;
+
+	action = UBENV_UNKNOWN;
+	if (argc > 1) {
+		if (strcasecmp(argv[1], "import") == 0)
+			action = UBENV_IMPORT;
+		else if (strcasecmp(argv[1], "show") == 0)
+			action = UBENV_SHOW;
+	}
+	if (action == UBENV_UNKNOWN) {
+		command_errmsg = "usage: 'ubenv <import|show> [var ...]";
+		return (CMD_ERROR);
+	}
+
+	if (argc > 2) {
+		for (i = 2; i < argc; i++)
+			handle_uboot_env_var(action, argv[i]);
+	} else {
+		var = NULL;
+		for (;;) {
+			if ((var = ub_env_enum(var)) == NULL)
+				break;
+			handle_uboot_env_var(action, var);
+		}
+	}
+
+	return (CMD_OK);
+}
+COMMAND_SET(ubenv, "ubenv", "show or import U-Boot env vars", command_ubenv);
+
 #ifdef LOADER_FDT_SUPPORT
 /*
  * Since proper fdt command handling function is defined in fdt_loader_cmd.c,
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 87553c629380..7ee7d79bd352 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -347,8 +347,8 @@ struct ccb_getdevstats {
 	struct	ccb_hdr	ccb_h;
 	int	dev_openings;	/* Space left for more work on device*/	
 	int	dev_active;	/* Transactions running on the device */
-	int	devq_openings;	/* Space left for more queued work */
-	int	devq_queued;	/* Transactions queued to be sent */
+	int	allocated;	/* CCBs allocated for the device */
+	int	queued;		/* CCBs queued to be sent to the device */
 	int	held;		/*
 				 * CCBs held by peripheral drivers
 				 * for this device
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index f6624f30f068..b67f687c0c22 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -290,7 +290,6 @@ cam_ccbq_resize(struct cam_ccbq *ccbq, int new_size)
 
 	delta = new_size - (ccbq->dev_active + ccbq->dev_openings);
 	ccbq->total_openings += delta;
-	ccbq->devq_openings += delta;
 	ccbq->dev_openings += delta;
 
 	new_size = imax(64, 1 << fls(new_size + new_size / 2));
@@ -308,7 +307,6 @@ cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
 	    imax(64, 1 << fls(openings + openings / 2))) != 0)
 		return (1);
 	ccbq->total_openings = openings;
-	ccbq->devq_openings = openings;
 	ccbq->dev_openings = openings;
 	return (0);
 }
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 0f74e8241a40..33f6b1d979fc 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -62,10 +62,9 @@ struct cam_ccbq {
 	struct ccb_hdr_tailq	queue_extra_head;
 	int	queue_extra_entries;
 	int	total_openings;
-	int	devq_openings;
+	int	allocated;
 	int	dev_openings;
 	int	dev_active;
-	int	held;
 };
 
 struct cam_ed;
@@ -188,8 +187,8 @@ cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq)
 static __inline void
 cam_ccbq_take_opening(struct cam_ccbq *ccbq)
 {
-	ccbq->devq_openings--;
-	ccbq->held++;
+
+	ccbq->allocated++;
 }
 
 static __inline void
@@ -198,8 +197,6 @@ cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb)
 	struct ccb_hdr *old_ccb;
 	struct camq *queue = &ccbq->queue;
 
-	ccbq->held--;
-
 	/*
 	 * If queue is already full, try to resize.
 	 * If resize fail, push CCB with lowest priority out to the TAILQ.
@@ -264,7 +261,7 @@ cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb)
 
 	send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX;
 	ccbq->dev_active++;
-	ccbq->dev_openings--;		
+	ccbq->dev_openings--;
 }
 
 static __inline void
@@ -272,15 +269,14 @@ cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb)
 {
 
 	ccbq->dev_active--;
-	ccbq->dev_openings++;	
-	ccbq->held++;
+	ccbq->dev_openings++;
 }
 
 static __inline void
 cam_ccbq_release_opening(struct cam_ccbq *ccbq)
 {
-	ccbq->held--;
-	ccbq->devq_openings++;
+
+	ccbq->allocated--;
 }
 
 #endif /* _KERNEL */
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 4a8f14b0f732..3cba1b0e676e 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -2648,20 +2648,25 @@ xpt_action_default(union ccb *start_ccb)
 			struct ccb_getdevstats *cgds;
 			struct cam_eb *bus;
 			struct cam_et *tar;
+			struct cam_devq *devq;
 
 			cgds = &start_ccb->cgds;
 			bus = path->bus;
 			tar = path->target;
+			devq = bus->sim->devq;
+			mtx_lock(&devq->send_mtx);
 			cgds->dev_openings = dev->ccbq.dev_openings;
 			cgds->dev_active = dev->ccbq.dev_active;
-			cgds->devq_openings = dev->ccbq.devq_openings;
-			cgds->devq_queued = cam_ccbq_pending_ccb_count(&dev->ccbq);
-			cgds->held = dev->ccbq.held;
+			cgds->allocated = dev->ccbq.allocated;
+			cgds->queued = cam_ccbq_pending_ccb_count(&dev->ccbq);
+			cgds->held = cgds->allocated - cgds->dev_active -
+			    cgds->queued;
 			cgds->last_reset = tar->last_reset;
 			cgds->maxtags = dev->maxtags;
 			cgds->mintags = dev->mintags;
 			if (timevalcmp(&tar->last_reset, &bus->last_reset, <))
 				cgds->last_reset = bus->last_reset;
+			mtx_unlock(&devq->send_mtx);
 			cgds->ccb_h.status = CAM_REQ_CMP;
 		}
 		break;
@@ -3004,7 +3009,6 @@ xpt_polled_action(union ccb *start_ccb)
 	 * can get it before us while we simulate interrupts.
 	 */
 	mtx_lock(&devq->send_mtx);
-	dev->ccbq.devq_openings--;
 	dev->ccbq.dev_openings--;
 	while((devq->send_openings <= 0 || dev->ccbq.dev_openings < 0) &&
 	    (--timeout > 0)) {
@@ -3016,7 +3020,6 @@ xpt_polled_action(union ccb *start_ccb)
 		camisr_runqueue();
 		mtx_lock(&devq->send_mtx);
 	}
-	dev->ccbq.devq_openings++;
 	dev->ccbq.dev_openings++;
 	mtx_unlock(&devq->send_mtx);
 
@@ -3049,7 +3052,7 @@ xpt_polled_action(union ccb *start_ccb)
 }
 
 /*
- * Schedule a peripheral driver to receive a ccb when it's
+ * Schedule a peripheral driver to receive a ccb when its
  * target device has space for more transactions.
  */
 void
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 147441ca076f..3627a503c433 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -263,7 +263,7 @@ static struct scsi_caching_page caching_page_default = {
 static struct scsi_caching_page caching_page_changeable = {
 	/*page_code*/SMS_CACHING_PAGE,
 	/*page_length*/sizeof(struct scsi_caching_page) - 2,
-	/*flags1*/ 0,
+	/*flags1*/ SCP_WCE | SCP_RCD,
 	/*ret_priority*/ 0,
 	/*disable_pf_transfer_len*/ {0, 0},
 	/*min_prefetch*/ {0, 0},
@@ -280,7 +280,7 @@ static struct scsi_control_page control_page_default = {
 	/*page_code*/SMS_CONTROL_MODE_PAGE,
 	/*page_length*/sizeof(struct scsi_control_page) - 2,
 	/*rlec*/0,
-	/*queue_flags*/0,
+	/*queue_flags*/SCP_QUEUE_ALG_RESTRICTED,
 	/*eca_and_aen*/0,
 	/*flags4*/SCP_TAS,
 	/*aen_holdoff_period*/{0, 0},
@@ -292,7 +292,7 @@ static struct scsi_control_page control_page_changeable = {
 	/*page_code*/SMS_CONTROL_MODE_PAGE,
 	/*page_length*/sizeof(struct scsi_control_page) - 2,
 	/*rlec*/SCP_DSENSE,
-	/*queue_flags*/0,
+	/*queue_flags*/SCP_QUEUE_ALG_MASK,
 	/*eca_and_aen*/0,
 	/*flags4*/0,
 	/*aen_holdoff_period*/{0, 0},
@@ -320,10 +320,11 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, verbose, CTLFLAG_RWTUN,
 
 /*
  * Supported pages (0x00), Serial number (0x80), Device ID (0x83),
+ * Extended INQUIRY Data (0x86), Mode Page Policy (0x87),
  * SCSI Ports (0x88), Third-party Copy (0x8F), Block limits (0xB0),
  * Block Device Characteristics (0xB1) and Logical Block Provisioning (0xB2)
  */
-#define SCSI_EVPD_NUM_SUPPORTED_PAGES	8
+#define SCSI_EVPD_NUM_SUPPORTED_PAGES	10
 
 static void ctl_isc_event_handler(ctl_ha_channel chanel, ctl_ha_event event,
 				  int param);
@@ -379,6 +380,8 @@ static void ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg);
 static int ctl_inquiry_evpd_supported(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len);
+static int ctl_inquiry_evpd_eid(struct ctl_scsiio *ctsio, int alloc_len);
+static int ctl_inquiry_evpd_mpp(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_scsi_ports(struct ctl_scsiio *ctsio,
 					 int alloc_len);
 static int ctl_inquiry_evpd_block_limits(struct ctl_scsiio *ctsio,
@@ -387,10 +390,10 @@ static int ctl_inquiry_evpd_bdc(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd(struct ctl_scsiio *ctsio);
 static int ctl_inquiry_std(struct ctl_scsiio *ctsio);
-static int ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len);
+static int ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint64_t *len);
 static ctl_action ctl_extent_check(union ctl_io *io1, union ctl_io *io2);
-static ctl_action ctl_check_for_blockage(union ctl_io *pending_io,
-					 union ctl_io *ooa_io);
+static ctl_action ctl_check_for_blockage(struct ctl_lun *lun,
+    union ctl_io *pending_io, union ctl_io *ooa_io);
 static ctl_action ctl_check_ooa(struct ctl_lun *lun, union ctl_io *pending_io,
 				union ctl_io *starting_io);
 static int ctl_check_blocked(struct ctl_lun *lun);
@@ -437,7 +440,7 @@ static void ctl_enqueue_rtr(union ctl_io *io);
 static void ctl_enqueue_done(union ctl_io *io);
 static void ctl_enqueue_isc(union ctl_io *io);
 static const struct ctl_cmd_entry *
-    ctl_get_cmd_entry(struct ctl_scsiio *ctsio);
+    ctl_get_cmd_entry(struct ctl_scsiio *ctsio, int *sa);
 static const struct ctl_cmd_entry *
     ctl_validate_command(struct ctl_scsiio *ctsio);
 static int ctl_cmd_applicable(uint8_t lun_type,
@@ -641,7 +644,7 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			if (ctl_softc->ha_mode == CTL_HA_MODE_XFER) {
 				const struct ctl_cmd_entry *entry;
 
-				entry = ctl_get_cmd_entry(&io->scsiio);
+				entry = ctl_get_cmd_entry(&io->scsiio, NULL);
 				io->io_hdr.flags &= ~CTL_FLAG_DATA_MASK;
 				io->io_hdr.flags |=
 					entry->flags & CTL_FLAG_DATA_MASK;
@@ -2541,7 +2544,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 
 		mtx_lock(&softc->ctl_lock);
 		if (((ooa_hdr->flags & CTL_OOA_FLAG_ALL_LUNS) == 0)
-		 && ((ooa_hdr->lun_num > CTL_MAX_LUNS)
+		 && ((ooa_hdr->lun_num >= CTL_MAX_LUNS)
 		  || (softc->ctl_luns[ooa_hdr->lun_num] == NULL))) {
 			mtx_unlock(&softc->ctl_lock);
 			free(entries, M_CTL);
@@ -2736,7 +2739,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 #ifdef CTL_IO_DELAY
 		mtx_lock(&softc->ctl_lock);
 
-		if ((delay_info->lun_id > CTL_MAX_LUNS)
+		if ((delay_info->lun_id >= CTL_MAX_LUNS)
 		 || (softc->ctl_luns[delay_info->lun_id] == NULL)) {
 			delay_info->status = CTL_DELAY_STATUS_INVALID_LUN;
 		} else {
@@ -2897,6 +2900,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		lun = softc->ctl_luns[err_desc->lun_id];
 		if (lun == NULL) {
 			mtx_unlock(&softc->ctl_lock);
+			free(new_err_desc, M_CTL);
 			printf("%s: CTL_ERROR_INJECT: invalid LUN %ju\n",
 			       __func__, (uintmax_t)err_desc->lun_id);
 			retval = EINVAL;
@@ -4091,6 +4095,7 @@ ctl_init_page_index(struct ctl_lun *lun)
 	int i;
 	struct ctl_page_index *page_index;
 	struct ctl_softc *softc;
+	const char *value;
 
 	memcpy(&lun->mode_pages.index, page_index_template,
 	       sizeof(page_index_template));
@@ -4240,52 +4245,61 @@ ctl_init_page_index(struct ctl_lun *lun)
 			break;
 		}
 		case SMS_CACHING_PAGE: {
+			struct scsi_caching_page *caching_page;
 
 			if (page_index->subpage != SMS_SUBPAGE_PAGE_0)
 				panic("invalid subpage value %d",
 				      page_index->subpage);
-			/*
-			 * Defaults should be okay here, no calculations
-			 * needed.
-			 */
-			memcpy(&lun->mode_pages.caching_page[CTL_PAGE_CURRENT],
+			memcpy(&lun->mode_pages.caching_page[CTL_PAGE_DEFAULT],
 			       &caching_page_default,
 			       sizeof(caching_page_default));
 			memcpy(&lun->mode_pages.caching_page[
 			       CTL_PAGE_CHANGEABLE], &caching_page_changeable,
 			       sizeof(caching_page_changeable));
-			memcpy(&lun->mode_pages.caching_page[CTL_PAGE_DEFAULT],
-			       &caching_page_default,
-			       sizeof(caching_page_default));
 			memcpy(&lun->mode_pages.caching_page[CTL_PAGE_SAVED],
 			       &caching_page_default,
 			       sizeof(caching_page_default));
+			caching_page = &lun->mode_pages.caching_page[
+			    CTL_PAGE_SAVED];
+			value = ctl_get_opt(&lun->be_lun->options, "writecache");
+			if (value != NULL && strcmp(value, "off") == 0)
+				caching_page->flags1 &= ~SCP_WCE;
+			value = ctl_get_opt(&lun->be_lun->options, "readcache");
+			if (value != NULL && strcmp(value, "off") == 0)
+				caching_page->flags1 |= SCP_RCD;
+			memcpy(&lun->mode_pages.caching_page[CTL_PAGE_CURRENT],
+			       &lun->mode_pages.caching_page[CTL_PAGE_SAVED],
+			       sizeof(caching_page_default));
 			page_index->page_data =
 				(uint8_t *)lun->mode_pages.caching_page;
 			break;
 		}
 		case SMS_CONTROL_MODE_PAGE: {
+			struct scsi_control_page *control_page;
 
 			if (page_index->subpage != SMS_SUBPAGE_PAGE_0)
 				panic("invalid subpage value %d",
 				      page_index->subpage);
 
-			/*
-			 * Defaults should be okay here, no calculations
-			 * needed.
-			 */
-			memcpy(&lun->mode_pages.control_page[CTL_PAGE_CURRENT],
+			memcpy(&lun->mode_pages.control_page[CTL_PAGE_DEFAULT],
 			       &control_page_default,
 			       sizeof(control_page_default));
 			memcpy(&lun->mode_pages.control_page[
 			       CTL_PAGE_CHANGEABLE], &control_page_changeable,
 			       sizeof(control_page_changeable));
-			memcpy(&lun->mode_pages.control_page[CTL_PAGE_DEFAULT],
-			       &control_page_default,
-			       sizeof(control_page_default));
 			memcpy(&lun->mode_pages.control_page[CTL_PAGE_SAVED],
 			       &control_page_default,
 			       sizeof(control_page_default));
+			control_page = &lun->mode_pages.control_page[
+			    CTL_PAGE_SAVED];
+			value = ctl_get_opt(&lun->be_lun->options, "reordering");
+			if (value != NULL && strcmp(value, "unrestricted") == 0) {
+				control_page->queue_flags &= ~SCP_QUEUE_ALG_MASK;
+				control_page->queue_flags |= SCP_QUEUE_ALG_UNRESTRICTED;
+			}
+			memcpy(&lun->mode_pages.control_page[CTL_PAGE_CURRENT],
+			       &lun->mode_pages.control_page[CTL_PAGE_SAVED],
+			       sizeof(control_page_default));
 			page_index->page_data =
 				(uint8_t *)lun->mode_pages.control_page;
 			break;
@@ -5255,6 +5269,8 @@ ctl_data_submit_done(union ctl_io *io)
 void
 ctl_config_write_done(union ctl_io *io)
 {
+	uint8_t *buf;
+
 	/*
 	 * If the IO_CONT flag is set, we need to call the supplied
 	 * function to continue processing the I/O, instead of completing
@@ -5263,9 +5279,10 @@ ctl_config_write_done(union ctl_io *io)
 	 * If there is an error, though, we don't want to keep processing.
 	 * Instead, just send status back to the initiator.
 	 */
-	if ((io->io_hdr.flags & CTL_FLAG_IO_CONT)
-	 && (((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)
-	  || ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS))) {
+	if ((io->io_hdr.flags & CTL_FLAG_IO_CONT) &&
+	    (io->io_hdr.flags & CTL_FLAG_ABORT) == 0 &&
+	    ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE ||
+	     (io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS)) {
 		io->scsiio.io_cont(io);
 		return;
 	}
@@ -5274,9 +5291,13 @@ ctl_config_write_done(union ctl_io *io)
 	 * have data allocated, like write buffer, and commands that have
 	 * no data, like start/stop unit, we need to check here.
 	 */
-	if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_OUT)
-		free(io->scsiio.kern_data_ptr, M_CTL);
+	if (io->io_hdr.flags & CTL_FLAG_ALLOCATED)
+		buf = io->scsiio.kern_data_ptr;
+	else
+		buf = NULL;
 	ctl_done(io);
+	if (buf)
+		free(buf, M_CTL);
 }
 
 /*
@@ -5288,12 +5309,14 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 	int length, longid, thirdparty_id, resv_id;
 	struct ctl_softc *ctl_softc;
 	struct ctl_lun *lun;
+	uint32_t residx;
 
 	length = 0;
 	resv_id = 0;
 
 	CTL_DEBUG_PRINT(("ctl_scsi_release\n"));
 
+	residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	ctl_softc = control_softc;
 
@@ -5351,14 +5374,8 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 	 * released, though, by the initiator who made it or by one of
 	 * several reset type events.
 	 */
-	if (lun->flags & CTL_LUN_RESERVED) {
-		if ((ctsio->io_hdr.nexus.initid.id == lun->rsv_nexus.initid.id)
-		 && (ctsio->io_hdr.nexus.targ_port == lun->rsv_nexus.targ_port)
-		 && (ctsio->io_hdr.nexus.targ_target.id ==
-		     lun->rsv_nexus.targ_target.id)) {
+	if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx == residx))
 			lun->flags &= ~CTL_LUN_RESERVED;
-		}
-	}
 
 	mtx_unlock(&lun->lun_lock);
 
@@ -5382,6 +5399,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 	uint64_t thirdparty_id;
 	struct ctl_softc *ctl_softc;
 	struct ctl_lun *lun;
+	uint32_t residx;
 
 	extent = 0;
 	thirdparty = 0;
@@ -5392,6 +5410,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 
 	CTL_DEBUG_PRINT(("ctl_reserve\n"));
 
+	residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	ctl_softc = control_softc;
 
@@ -5440,19 +5459,14 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 		thirdparty_id = scsi_8btou64(ctsio->kern_data_ptr);
 
 	mtx_lock(&lun->lun_lock);
-	if (lun->flags & CTL_LUN_RESERVED) {
-		if ((ctsio->io_hdr.nexus.initid.id != lun->rsv_nexus.initid.id)
-		 || (ctsio->io_hdr.nexus.targ_port != lun->rsv_nexus.targ_port)
-		 || (ctsio->io_hdr.nexus.targ_target.id !=
-		     lun->rsv_nexus.targ_target.id)) {
-			ctsio->scsi_status = SCSI_STATUS_RESERV_CONFLICT;
-			ctsio->io_hdr.status = CTL_SCSI_ERROR;
-			goto bailout;
-		}
+	if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx != residx)) {
+		ctsio->scsi_status = SCSI_STATUS_RESERV_CONFLICT;
+		ctsio->io_hdr.status = CTL_SCSI_ERROR;
+		goto bailout;
 	}
 
 	lun->flags |= CTL_LUN_RESERVED;
-	lun->rsv_nexus = ctsio->io_hdr.nexus;
+	lun->res_idx = residx;
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 	ctsio->io_hdr.status = CTL_SUCCESS;
@@ -5973,6 +5987,15 @@ ctl_write_same(struct ctl_scsiio *ctsio)
 		break; /* NOTREACHED */
 	}
 
+	/* NDOB and ANCHOR flags can be used only together with UNMAP */
+	if ((byte2 & SWS_UNMAP) == 0 &&
+	    (byte2 & (SWS_NDOB | SWS_ANCHOR)) != 0) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 1, /*bit_valid*/ 1, /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
 	/*
 	 * The first check is to make sure we're in bounds, the second
 	 * check is to catch wrap-around problems.  If the lba + num blocks
@@ -6007,7 +6030,8 @@ ctl_write_same(struct ctl_scsiio *ctsio)
 	 * If we've got a kernel request that hasn't been malloced yet,
 	 * malloc it and tell the caller the data buffer is here.
 	 */
-	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
+	if ((byte2 & SWS_NDOB) == 0 &&
+	    (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
 		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);;
 		ctsio->kern_data_len = len;
 		ctsio->kern_total_len = len;
@@ -6037,7 +6061,7 @@ ctl_unmap(struct ctl_scsiio *ctsio)
 	struct scsi_unmap *cdb;
 	struct ctl_ptr_len_flags *ptrlen;
 	struct scsi_unmap_header *hdr;
-	struct scsi_unmap_desc *buf, *end;
+	struct scsi_unmap_desc *buf, *end, *endnz, *range;
 	uint64_t lba;
 	uint32_t num_blocks;
 	int len, retval;
@@ -6090,24 +6114,41 @@ ctl_unmap(struct ctl_scsiio *ctsio)
 	buf = (struct scsi_unmap_desc *)(hdr + 1);
 	end = buf + len / sizeof(*buf);
 
-	ptrlen = (struct ctl_ptr_len_flags *)&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
-	ptrlen->ptr = (void *)buf;
-	ptrlen->len = len;
-	ptrlen->flags = byte2;
-
-	for (; buf < end; buf++) {
-		lba = scsi_8btou64(buf->lba);
-		num_blocks = scsi_4btoul(buf->length);
+	endnz = buf;
+	for (range = buf; range < end; range++) {
+		lba = scsi_8btou64(range->lba);
+		num_blocks = scsi_4btoul(range->length);
 		if (((lba + num_blocks) > (lun->be_lun->maxlba + 1))
 		 || ((lba + num_blocks) < lba)) {
 			ctl_set_lba_out_of_range(ctsio);
 			ctl_done((union ctl_io *)ctsio);
 			return (CTL_RETVAL_COMPLETE);
 		}
+		if (num_blocks != 0)
+			endnz = range + 1;
 	}
 
-	retval = lun->backend->config_write((union ctl_io *)ctsio);
+	/*
+	 * Block backend can not handle zero last range.
+	 * Filter it out and return if there is nothing left.
+	 */
+	len = (uint8_t *)endnz - (uint8_t *)buf;
+	if (len == 0) {
+		ctl_set_success(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
 
+	mtx_lock(&lun->lun_lock);
+	ptrlen = (struct ctl_ptr_len_flags *)
+	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	ptrlen->ptr = (void *)buf;
+	ptrlen->len = len;
+	ptrlen->flags = byte2;
+	ctl_check_blocked(lun);
+	mtx_unlock(&lun->lun_lock);
+
+	retval = lun->backend->config_write((union ctl_io *)ctsio);
 	return (retval);
 }
 
@@ -6170,65 +6211,61 @@ ctl_control_page_handler(struct ctl_scsiio *ctsio,
 		lun->flags &= ~CTL_LUN_SENSE_DESC;
 		set_ua = 1;
 	}
-	if (current_cp->queue_flags & SCP_QUEUE_DQUE) {
-		if (user_cp->queue_flags & SCP_QUEUE_DQUE) {
-#ifdef NEEDTOPORT
-			csevent_log(CSC_CTL | CSC_SHELF_SW |
-				    CTL_UNTAG_TO_UNTAG,
-				    csevent_LogType_Trace,
-				    csevent_Severity_Information,
-				    csevent_AlertLevel_Green,
-				    csevent_FRU_Firmware,
-				    csevent_FRU_Unknown,
-				    "Received untagged to untagged transition");
-#endif /* NEEDTOPORT */
-		} else {
-#ifdef NEEDTOPORT
-			csevent_log(CSC_CTL | CSC_SHELF_SW |
-				    CTL_UNTAG_TO_TAG,
-				    csevent_LogType_ConfigChange,
-				    csevent_Severity_Information,
-				    csevent_AlertLevel_Green,
-				    csevent_FRU_Firmware,
-				    csevent_FRU_Unknown,
-				    "Received untagged to tagged "
-				    "queueing transition");
-#endif /* NEEDTOPORT */
+	if ((current_cp->queue_flags & SCP_QUEUE_ALG_MASK) !=
+	    (user_cp->queue_flags & SCP_QUEUE_ALG_MASK)) {
+		current_cp->queue_flags &= ~SCP_QUEUE_ALG_MASK;
+		current_cp->queue_flags |= user_cp->queue_flags & SCP_QUEUE_ALG_MASK;
+		saved_cp->queue_flags &= ~SCP_QUEUE_ALG_MASK;
+		saved_cp->queue_flags |= user_cp->queue_flags & SCP_QUEUE_ALG_MASK;
+		set_ua = 1;
+	}
+	if (set_ua != 0) {
+		int i;
+		/*
+		 * Let other initiators know that the mode
+		 * parameters for this LUN have changed.
+		 */
+		for (i = 0; i < CTL_MAX_INITIATORS; i++) {
+			if (i == initidx)
+				continue;
 
-			current_cp->queue_flags &= ~SCP_QUEUE_DQUE;
-			saved_cp->queue_flags &= ~SCP_QUEUE_DQUE;
-			set_ua = 1;
+			lun->pending_ua[i] |= CTL_UA_MODE_CHANGE;
 		}
-	} else {
-		if (user_cp->queue_flags & SCP_QUEUE_DQUE) {
-#ifdef NEEDTOPORT
-			csevent_log(CSC_CTL | CSC_SHELF_SW |
-				    CTL_TAG_TO_UNTAG,
-				    csevent_LogType_ConfigChange,
-				    csevent_Severity_Warning,
-				    csevent_AlertLevel_Yellow,
-				    csevent_FRU_Firmware,
-				    csevent_FRU_Unknown,
-				    "Received tagged queueing to untagged "
-				    "transition");
-#endif /* NEEDTOPORT */
+	}
+	mtx_unlock(&lun->lun_lock);
 
-			current_cp->queue_flags |= SCP_QUEUE_DQUE;
-			saved_cp->queue_flags |= SCP_QUEUE_DQUE;
-			set_ua = 1;
-		} else {
-#ifdef NEEDTOPORT
-			csevent_log(CSC_CTL | CSC_SHELF_SW |
-				    CTL_TAG_TO_TAG,
-				    csevent_LogType_Trace,
-				    csevent_Severity_Information,
-				    csevent_AlertLevel_Green,
-				    csevent_FRU_Firmware,
-				    csevent_FRU_Unknown,
-				    "Received tagged queueing to tagged "
-				    "queueing transition");
-#endif /* NEEDTOPORT */
-		}
+	return (0);
+}
+
+int
+ctl_caching_sp_handler(struct ctl_scsiio *ctsio,
+		     struct ctl_page_index *page_index, uint8_t *page_ptr)
+{
+	struct scsi_caching_page *current_cp, *saved_cp, *user_cp;
+	struct ctl_lun *lun;
+	int set_ua;
+	uint32_t initidx;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	initidx = ctl_get_initindex(&ctsio->io_hdr.nexus);
+	set_ua = 0;
+
+	user_cp = (struct scsi_caching_page *)page_ptr;
+	current_cp = (struct scsi_caching_page *)
+		(page_index->page_data + (page_index->page_len *
+		CTL_PAGE_CURRENT));
+	saved_cp = (struct scsi_caching_page *)
+		(page_index->page_data + (page_index->page_len *
+		CTL_PAGE_SAVED));
+
+	mtx_lock(&lun->lun_lock);
+	if ((current_cp->flags1 & (SCP_WCE | SCP_RCD)) !=
+	    (user_cp->flags1 & (SCP_WCE | SCP_RCD))) {
+		current_cp->flags1 &= ~(SCP_WCE | SCP_RCD);
+		current_cp->flags1 |= user_cp->flags1 & (SCP_WCE | SCP_RCD);
+		saved_cp->flags1 &= ~(SCP_WCE | SCP_RCD);
+		saved_cp->flags1 |= user_cp->flags1 & (SCP_WCE | SCP_RCD);
+		set_ua = 1;
 	}
 	if (set_ua != 0) {
 		int i;
@@ -7008,7 +7045,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 		header = (struct scsi_mode_hdr_6 *)ctsio->kern_data_ptr;
 
 		header->datalen = ctl_min(total_len - 1, 254);
-
+		if (control_dev == 0)
+			header->dev_specific = 0x10; /* DPOFUA */
 		if (dbd)
 			header->block_descr_len = 0;
 		else
@@ -7025,6 +7063,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 
 		datalen = ctl_min(total_len - 2, 65533);
 		scsi_ulto2b(datalen, header->datalen);
+		if (control_dev == 0)
+			header->dev_specific = 0x10; /* DPOFUA */
 		if (dbd)
 			scsi_ulto2b(0, header->block_descr_len);
 		else
@@ -7043,7 +7083,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 	 * descriptor.  Otherwise, just set it to 0.
 	 */
 	if (dbd == 0) {
-		if (control_dev != 0)
+		if (control_dev == 0)
 			scsi_ulto3b(lun->be_lun->blocksize,
 				    block_desc->block_len);
 		else
@@ -7857,7 +7897,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 
 		res_cap = (struct scsi_per_res_cap *)ctsio->kern_data_ptr;
 		scsi_ulto2b(sizeof(*res_cap), res_cap->length);
-		res_cap->flags2 |= SPRI_TMV | SPRI_ALLOW_3;
+		res_cap->flags2 |= SPRI_TMV | SPRI_ALLOW_5;
 		type_mask = SPRI_TM_WR_EX_AR |
 			    SPRI_TM_EX_AC_RO |
 			    SPRI_TM_WR_EX_RO |
@@ -7910,7 +7950,8 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 			scsi_ulto2b(i / CTL_MAX_INIT_PER_PORT,
 			    res_desc->rel_trgt_port_id);
 			len = 0;
-			port = softc->ctl_ports[i / CTL_MAX_INIT_PER_PORT];
+			port = softc->ctl_ports[
+			    ctl_port_idx(i / CTL_MAX_INIT_PER_PORT)];
 			if (port != NULL)
 				len = ctl_create_iid(port,
 				    i % CTL_MAX_INIT_PER_PORT,
@@ -8976,17 +9017,14 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 	struct ctl_lba_len_flags *lbalen;
 	uint64_t lba;
 	uint32_t num_blocks;
-	int fua, dpo;
-	int retval;
+	int flags, retval;
 	int isread;
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 
 	CTL_DEBUG_PRINT(("ctl_read_write: command: %#x\n", ctsio->cdb[0]));
 
-	fua = 0;
-	dpo = 0;
-
+	flags = 0;
 	retval = CTL_RETVAL_COMPLETE;
 
 	isread = ctsio->cdb[0] == READ_6  || ctsio->cdb[0] == READ_10
@@ -9032,12 +9070,10 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_rw_10 *cdb;
 
 		cdb = (struct scsi_rw_10 *)ctsio->cdb;
-
 		if (cdb->byte2 & SRW10_FUA)
-			fua = 1;
+			flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SRW10_DPO)
-			dpo = 1;
-
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_2btoul(cdb->length);
 		break;
@@ -9046,17 +9082,9 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_write_verify_10 *cdb;
 
 		cdb = (struct scsi_write_verify_10 *)ctsio->cdb;
-
-		/*
-		 * XXX KDM we should do actual write verify support at some
-		 * point.  This is obviously fake, we're just translating
-		 * things to a write.  So we don't even bother checking the
-		 * BYTCHK field, since we don't do any verification.  If
-		 * the user asks for it, we'll just pretend we did it.
-		 */
+		flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SWV_DPO)
-			dpo = 1;
-
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_2btoul(cdb->length);
 		break;
@@ -9066,11 +9094,10 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_rw_12 *cdb;
 
 		cdb = (struct scsi_rw_12 *)ctsio->cdb;
-
 		if (cdb->byte2 & SRW12_FUA)
-			fua = 1;
+			flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SRW12_DPO)
-			dpo = 1;
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
 		break;
@@ -9079,13 +9106,11 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_write_verify_12 *cdb;
 
 		cdb = (struct scsi_write_verify_12 *)ctsio->cdb;
-
+		flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SWV_DPO)
-			dpo = 1;
-		
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
-
 		break;
 	}
 	case READ_16:
@@ -9093,12 +9118,10 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_rw_16 *cdb;
 
 		cdb = (struct scsi_rw_16 *)ctsio->cdb;
-
 		if (cdb->byte2 & SRW12_FUA)
-			fua = 1;
+			flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SRW12_DPO)
-			dpo = 1;
-
+			flags |= CTL_LLF_DPO;
 		lba = scsi_8btou64(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
 		break;
@@ -9107,10 +9130,9 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		struct scsi_write_verify_16 *cdb;
 
 		cdb = (struct scsi_write_verify_16 *)ctsio->cdb;
-
+		flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SWV_DPO)
-			dpo = 1;
-
+			flags |= CTL_LLF_DPO;
 		lba = scsi_8btou64(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
 		break;
@@ -9127,13 +9149,6 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		break; /* NOTREACHED */
 	}
 
-	/*
-	 * XXX KDM what do we do with the DPO and FUA bits?  FUA might be
-	 * interesting for us, but if RAIDCore is in write-back mode,
-	 * getting it to do write-through for a particular transaction may
-	 * not be possible.
-	 */
-
 	/*
 	 * The first check is to make sure we're in bounds, the second
 	 * check is to catch wrap-around problems.  If the lba + num blocks
@@ -9158,11 +9173,22 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
+	/* Set FUA and/or DPO if caches are disabled. */
+	if (isread) {
+		if ((lun->mode_pages.caching_page[CTL_PAGE_CURRENT].flags1 &
+		    SCP_RCD) != 0)
+			flags |= CTL_LLF_FUA | CTL_LLF_DPO;
+	} else {
+		if ((lun->mode_pages.caching_page[CTL_PAGE_CURRENT].flags1 &
+		    SCP_WCE) == 0)
+			flags |= CTL_LLF_FUA;
+	}
+
 	lbalen = (struct ctl_lba_len_flags *)
 	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
 	lbalen->lba = lba;
 	lbalen->len = num_blocks;
-	lbalen->flags = isread ? CTL_LLF_READ : CTL_LLF_WRITE;
+	lbalen->flags = (isread ? CTL_LLF_READ : CTL_LLF_WRITE) | flags;
 
 	ctsio->kern_total_len = num_blocks * lun->be_lun->blocksize;
 	ctsio->kern_rel_offset = 0;
@@ -9188,7 +9214,8 @@ ctl_cnw_cont(union ctl_io *io)
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	lbalen = (struct ctl_lba_len_flags *)
 	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
-	lbalen->flags = CTL_LLF_WRITE;
+	lbalen->flags &= ~CTL_LLF_COMPARE;
+	lbalen->flags |= CTL_LLF_WRITE;
 
 	CTL_DEBUG_PRINT(("ctl_cnw_cont: calling data_submit()\n"));
 	retval = lun->backend->data_submit((union ctl_io *)ctsio);
@@ -9202,16 +9229,13 @@ ctl_cnw(struct ctl_scsiio *ctsio)
 	struct ctl_lba_len_flags *lbalen;
 	uint64_t lba;
 	uint32_t num_blocks;
-	int fua, dpo;
-	int retval;
+	int flags, retval;
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 
 	CTL_DEBUG_PRINT(("ctl_cnw: command: %#x\n", ctsio->cdb[0]));
 
-	fua = 0;
-	dpo = 0;
-
+	flags = 0;
 	retval = CTL_RETVAL_COMPLETE;
 
 	switch (ctsio->cdb[0]) {
@@ -9219,11 +9243,10 @@ ctl_cnw(struct ctl_scsiio *ctsio)
 		struct scsi_compare_and_write *cdb;
 
 		cdb = (struct scsi_compare_and_write *)ctsio->cdb;
-
 		if (cdb->byte2 & SRW10_FUA)
-			fua = 1;
+			flags |= CTL_LLF_FUA;
 		if (cdb->byte2 & SRW10_DPO)
-			dpo = 1;
+			flags |= CTL_LLF_DPO;
 		lba = scsi_8btou64(cdb->addr);
 		num_blocks = cdb->length;
 		break;
@@ -9240,13 +9263,6 @@ ctl_cnw(struct ctl_scsiio *ctsio)
 		break; /* NOTREACHED */
 	}
 
-	/*
-	 * XXX KDM what do we do with the DPO and FUA bits?  FUA might be
-	 * interesting for us, but if RAIDCore is in write-back mode,
-	 * getting it to do write-through for a particular transaction may
-	 * not be possible.
-	 */
-
 	/*
 	 * The first check is to make sure we're in bounds, the second
 	 * check is to catch wrap-around problems.  If the lba + num blocks
@@ -9269,6 +9285,11 @@ ctl_cnw(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
+	/* Set FUA if write cache is disabled. */
+	if ((lun->mode_pages.caching_page[CTL_PAGE_CURRENT].flags1 &
+	    SCP_WCE) == 0)
+		flags |= CTL_LLF_FUA;
+
 	ctsio->kern_total_len = 2 * num_blocks * lun->be_lun->blocksize;
 	ctsio->kern_rel_offset = 0;
 
@@ -9284,7 +9305,7 @@ ctl_cnw(struct ctl_scsiio *ctsio)
 	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
 	lbalen->lba = lba;
 	lbalen->len = num_blocks;
-	lbalen->flags = CTL_LLF_COMPARE;
+	lbalen->flags = CTL_LLF_COMPARE | flags;
 
 	CTL_DEBUG_PRINT(("ctl_cnw: calling data_submit()\n"));
 	retval = lun->backend->data_submit((union ctl_io *)ctsio);
@@ -9298,7 +9319,7 @@ ctl_verify(struct ctl_scsiio *ctsio)
 	struct ctl_lba_len_flags *lbalen;
 	uint64_t lba;
 	uint32_t num_blocks;
-	int bytchk, dpo;
+	int bytchk, flags;
 	int retval;
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
@@ -9306,7 +9327,7 @@ ctl_verify(struct ctl_scsiio *ctsio)
 	CTL_DEBUG_PRINT(("ctl_verify: command: %#x\n", ctsio->cdb[0]));
 
 	bytchk = 0;
-	dpo = 0;
+	flags = CTL_LLF_FUA;
 	retval = CTL_RETVAL_COMPLETE;
 
 	switch (ctsio->cdb[0]) {
@@ -9317,7 +9338,7 @@ ctl_verify(struct ctl_scsiio *ctsio)
 		if (cdb->byte2 & SVFY_BYTCHK)
 			bytchk = 1;
 		if (cdb->byte2 & SVFY_DPO)
-			dpo = 1;
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_2btoul(cdb->length);
 		break;
@@ -9329,7 +9350,7 @@ ctl_verify(struct ctl_scsiio *ctsio)
 		if (cdb->byte2 & SVFY_BYTCHK)
 			bytchk = 1;
 		if (cdb->byte2 & SVFY_DPO)
-			dpo = 1;
+			flags |= CTL_LLF_DPO;
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
 		break;
@@ -9341,7 +9362,7 @@ ctl_verify(struct ctl_scsiio *ctsio)
 		if (cdb->byte2 & SVFY_BYTCHK)
 			bytchk = 1;
 		if (cdb->byte2 & SVFY_DPO)
-			dpo = 1;
+			flags |= CTL_LLF_DPO;
 		lba = scsi_8btou64(cdb->addr);
 		num_blocks = scsi_4btoul(cdb->length);
 		break;
@@ -9383,10 +9404,10 @@ ctl_verify(struct ctl_scsiio *ctsio)
 	lbalen->lba = lba;
 	lbalen->len = num_blocks;
 	if (bytchk) {
-		lbalen->flags = CTL_LLF_COMPARE;
+		lbalen->flags = CTL_LLF_COMPARE | flags;
 		ctsio->kern_total_len = num_blocks * lun->be_lun->blocksize;
 	} else {
-		lbalen->flags = CTL_LLF_VERIFY;
+		lbalen->flags = CTL_LLF_VERIFY | flags;
 		ctsio->kern_total_len = 0;
 	}
 	ctsio->kern_rel_offset = 0;
@@ -9668,13 +9689,10 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 	if (lun->pending_ua[initidx] != CTL_UA_NONE) {
 		ctl_ua_type ua_type;
 
-		ua_type = ctl_build_ua(lun->pending_ua[initidx],
+		ua_type = ctl_build_ua(&lun->pending_ua[initidx],
 				       sense_ptr, sense_format);
-		if (ua_type != CTL_UA_NONE) {
+		if (ua_type != CTL_UA_NONE)
 			have_error = 1;
-			/* We're reporting this UA, so clear it */
-			lun->pending_ua[initidx] &= ~ua_type;
-		}
 	}
 	mtx_unlock(&lun->lun_lock);
 
@@ -9804,16 +9822,20 @@ ctl_inquiry_evpd_supported(struct ctl_scsiio *ctsio, int alloc_len)
 	pages->page_list[1] = SVPD_UNIT_SERIAL_NUMBER;
 	/* Device Identification */
 	pages->page_list[2] = SVPD_DEVICE_ID;
+	/* Extended INQUIRY Data */
+	pages->page_list[3] = SVPD_EXTENDED_INQUIRY_DATA;
+	/* Mode Page Policy */
+	pages->page_list[4] = SVPD_MODE_PAGE_POLICY;
 	/* SCSI Ports */
-	pages->page_list[3] = SVPD_SCSI_PORTS;
+	pages->page_list[5] = SVPD_SCSI_PORTS;
 	/* Third-party Copy */
-	pages->page_list[4] = SVPD_SCSI_TPC;
+	pages->page_list[6] = SVPD_SCSI_TPC;
 	/* Block limits */
-	pages->page_list[5] = SVPD_BLOCK_LIMITS;
+	pages->page_list[7] = SVPD_BLOCK_LIMITS;
 	/* Block Device Characteristics */
-	pages->page_list[6] = SVPD_BDC;
+	pages->page_list[8] = SVPD_BDC;
 	/* Logical Block Provisioning */
-	pages->page_list[7] = SVPD_LBP;
+	pages->page_list[9] = SVPD_LBP;
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
@@ -9881,6 +9903,109 @@ ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len)
 }
 
 
+static int
+ctl_inquiry_evpd_eid(struct ctl_scsiio *ctsio, int alloc_len)
+{
+	struct scsi_vpd_extended_inquiry_data *eid_ptr;
+	struct ctl_lun *lun;
+	int data_len;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	data_len = sizeof(struct scsi_vpd_mode_page_policy) +
+	    sizeof(struct scsi_vpd_mode_page_policy_descr);
+
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
+	eid_ptr = (struct scsi_vpd_extended_inquiry_data *)ctsio->kern_data_ptr;
+	ctsio->kern_sg_entries = 0;
+
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+
+	/*
+	 * The control device is always connected.  The disk device, on the
+	 * other hand, may not be online all the time.
+	 */
+	if (lun != NULL)
+		eid_ptr->device = (SID_QUAL_LU_CONNECTED << 5) |
+				     lun->be_lun->lun_type;
+	else
+		eid_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
+	eid_ptr->page_code = SVPD_EXTENDED_INQUIRY_DATA;
+	eid_ptr->page_length = data_len - 4;
+	eid_ptr->flags2 = SVPD_EID_HEADSUP | SVPD_EID_ORDSUP | SVPD_EID_SIMPSUP;
+	eid_ptr->flags3 = SVPD_EID_V_SUP;
+
+	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
+
+	return (CTL_RETVAL_COMPLETE);
+}
+
+static int
+ctl_inquiry_evpd_mpp(struct ctl_scsiio *ctsio, int alloc_len)
+{
+	struct scsi_vpd_mode_page_policy *mpp_ptr;
+	struct ctl_lun *lun;
+	int data_len;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	data_len = sizeof(struct scsi_vpd_mode_page_policy) +
+	    sizeof(struct scsi_vpd_mode_page_policy_descr);
+
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
+	mpp_ptr = (struct scsi_vpd_mode_page_policy *)ctsio->kern_data_ptr;
+	ctsio->kern_sg_entries = 0;
+
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+
+	/*
+	 * The control device is always connected.  The disk device, on the
+	 * other hand, may not be online all the time.
+	 */
+	if (lun != NULL)
+		mpp_ptr->device = (SID_QUAL_LU_CONNECTED << 5) |
+				     lun->be_lun->lun_type;
+	else
+		mpp_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
+	mpp_ptr->page_code = SVPD_MODE_PAGE_POLICY;
+	scsi_ulto2b(data_len - 4, mpp_ptr->page_length);
+	mpp_ptr->descr[0].page_code = 0x3f;
+	mpp_ptr->descr[0].subpage_code = 0xff;
+	mpp_ptr->descr[0].policy = SVPD_MPP_SHARED;
+
+	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
+
+	return (CTL_RETVAL_COMPLETE);
+}
+
 static int
 ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len)
 {
@@ -10160,7 +10285,7 @@ ctl_inquiry_evpd_block_limits(struct ctl_scsiio *ctsio, int alloc_len)
 		bl_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
 
 	bl_ptr->page_code = SVPD_BLOCK_LIMITS;
-	scsi_ulto2b(sizeof(*bl_ptr), bl_ptr->page_length);
+	scsi_ulto2b(sizeof(*bl_ptr) - 4, bl_ptr->page_length);
 	bl_ptr->max_cmp_write_len = 0xff;
 	scsi_ulto4b(0xffffffff, bl_ptr->max_txfer_len);
 	if (lun != NULL) {
@@ -10311,6 +10436,12 @@ ctl_inquiry_evpd(struct ctl_scsiio *ctsio)
 	case SVPD_DEVICE_ID:
 		retval = ctl_inquiry_evpd_devid(ctsio, alloc_len);
 		break;
+	case SVPD_EXTENDED_INQUIRY_DATA:
+		retval = ctl_inquiry_evpd_eid(ctsio, alloc_len);
+		break;
+	case SVPD_MODE_PAGE_POLICY:
+		retval = ctl_inquiry_evpd_mpp(ctsio, alloc_len);
+		break;
 	case SVPD_SCSI_PORTS:
 		retval = ctl_inquiry_evpd_scsi_ports(ctsio, alloc_len);
 		break;
@@ -10349,7 +10480,7 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	struct ctl_softc *ctl_softc;
 	struct ctl_lun *lun;
 	char *val;
-	uint32_t alloc_len;
+	uint32_t alloc_len, data_len;
 	ctl_port_type port_type;
 
 	ctl_softc = control_softc;
@@ -10373,16 +10504,17 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 * in.  If the user only asks for less, we'll give him
 	 * that much.
 	 */
-	ctsio->kern_data_ptr = malloc(sizeof(*inq_ptr), M_CTL, M_WAITOK | M_ZERO);
+	data_len = offsetof(struct scsi_inquiry_data, vendor_specific1);
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
 	inq_ptr = (struct scsi_inquiry_data *)ctsio->kern_data_ptr;
 	ctsio->kern_sg_entries = 0;
 	ctsio->kern_data_resid = 0;
 	ctsio->kern_rel_offset = 0;
 
-	if (sizeof(*inq_ptr) < alloc_len) {
-		ctsio->residual = alloc_len - sizeof(*inq_ptr);
-		ctsio->kern_data_len = sizeof(*inq_ptr);
-		ctsio->kern_total_len = sizeof(*inq_ptr);
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
 	} else {
 		ctsio->residual = 0;
 		ctsio->kern_data_len = alloc_len;
@@ -10462,15 +10594,12 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 */
 	inq_ptr->response_format = SID_HiSup | 2;
 
-	inq_ptr->additional_length =
-	    offsetof(struct scsi_inquiry_data, vendor_specific1) -
+	inq_ptr->additional_length = data_len -
 	    (offsetof(struct scsi_inquiry_data, additional_length) + 1);
 	CTL_DEBUG_PRINT(("additional_length = %d\n",
 			 inq_ptr->additional_length));
 
-	inq_ptr->spc3_flags = SPC3_SID_3PC;
-	if (!ctl_is_single)
-		inq_ptr->spc3_flags |= SPC3_SID_TPGS_IMPLICIT;
+	inq_ptr->spc3_flags = SPC3_SID_3PC | SPC3_SID_TPGS_IMPLICIT;
 	/* 16 bit addressing */
 	if (port_type == CTL_PORT_SCSI)
 		inq_ptr->spc2_flags = SPC2_SID_ADDR16;
@@ -10495,24 +10624,28 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 */
 	if (lun == NULL || (val = ctl_get_opt(&lun->be_lun->options,
 	    "vendor")) == NULL) {
-		strcpy(inq_ptr->vendor, CTL_VENDOR);
+		strncpy(inq_ptr->vendor, CTL_VENDOR, sizeof(inq_ptr->vendor));
 	} else {
 		memset(inq_ptr->vendor, ' ', sizeof(inq_ptr->vendor));
 		strncpy(inq_ptr->vendor, val,
 		    min(sizeof(inq_ptr->vendor), strlen(val)));
 	}
 	if (lun == NULL) {
-		strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
+		strncpy(inq_ptr->product, CTL_DIRECT_PRODUCT,
+		    sizeof(inq_ptr->product));
 	} else if ((val = ctl_get_opt(&lun->be_lun->options, "product")) == NULL) {
 		switch (lun->be_lun->lun_type) {
 		case T_DIRECT:
-			strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
+			strncpy(inq_ptr->product, CTL_DIRECT_PRODUCT,
+			    sizeof(inq_ptr->product));
 			break;
 		case T_PROCESSOR:
-			strcpy(inq_ptr->product, CTL_PROCESSOR_PRODUCT);
+			strncpy(inq_ptr->product, CTL_PROCESSOR_PRODUCT,
+			    sizeof(inq_ptr->product));
 			break;
 		default:
-			strcpy(inq_ptr->product, CTL_UNKNOWN_PRODUCT);
+			strncpy(inq_ptr->product, CTL_UNKNOWN_PRODUCT,
+			    sizeof(inq_ptr->product));
 			break;
 		}
 	} else {
@@ -10596,45 +10729,23 @@ ctl_inquiry(struct ctl_scsiio *ctsio)
 	struct scsi_inquiry *cdb;
 	int retval;
 
-	cdb = (struct scsi_inquiry *)ctsio->cdb;
-
-	retval = 0;
-
 	CTL_DEBUG_PRINT(("ctl_inquiry\n"));
 
-	/*
-	 * Right now, we don't support the CmdDt inquiry information.
-	 * This would be nice to support in the future.  When we do
-	 * support it, we should change this test so that it checks to make
-	 * sure SI_EVPD and SI_CMDDT aren't both set at the same time.
-	 */
-#ifdef notyet
-	if (((cdb->byte2 & SI_EVPD)
-	 && (cdb->byte2 & SI_CMDDT)))
-#endif
-	if (cdb->byte2 & SI_CMDDT) {
-		/*
-		 * Point to the SI_CMDDT bit.  We might change this
-		 * when we support SI_CMDDT, but since both bits would be
-		 * "wrong", this should probably just stay as-is then.
-		 */
+	cdb = (struct scsi_inquiry *)ctsio->cdb;
+	if (cdb->byte2 & SI_EVPD)
+		retval = ctl_inquiry_evpd(ctsio);
+	else if (cdb->page_code == 0)
+		retval = ctl_inquiry_std(ctsio);
+	else {
 		ctl_set_invalid_field(ctsio,
 				      /*sks_valid*/ 1,
 				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 1);
+				      /*field*/ 2,
+				      /*bit_valid*/ 0,
+				      /*bit*/ 0);
 		ctl_done((union ctl_io *)ctsio);
 		return (CTL_RETVAL_COMPLETE);
 	}
-	if (cdb->byte2 & SI_EVPD)
-		retval = ctl_inquiry_evpd(ctsio);
-#ifdef notyet
-	else if (cdb->byte2 & SI_CMDDT)
-		retval = ctl_inquiry_cmddt(ctsio);
-#endif
-	else
-		retval = ctl_inquiry_std(ctsio);
 
 	return (retval);
 }
@@ -10643,7 +10754,7 @@ ctl_inquiry(struct ctl_scsiio *ctsio)
  * For known CDB types, parse the LBA and length.
  */
 static int
-ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len)
+ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint64_t *len)
 {
 	if (io->io_hdr.io_type != CTL_IO_SCSI)
 		return (1);
@@ -10773,6 +10884,11 @@ ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len)
 		*len = scsi_4btoul(cdb->length);
 		break;
 	}
+	case UNMAP: {
+		*lba = 0;
+		*len = UINT64_MAX;
+		break;
+	}
 	default:
 		return (1);
 		break; /* NOTREACHED */
@@ -10782,7 +10898,7 @@ ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len)
 }
 
 static ctl_action
-ctl_extent_check_lba(uint64_t lba1, uint32_t len1, uint64_t lba2, uint32_t len2)
+ctl_extent_check_lba(uint64_t lba1, uint64_t len1, uint64_t lba2, uint64_t len2)
 {
 	uint64_t endlba1, endlba2;
 
@@ -10796,26 +10912,61 @@ ctl_extent_check_lba(uint64_t lba1, uint32_t len1, uint64_t lba2, uint32_t len2)
 		return (CTL_ACTION_BLOCK);
 }
 
+static int
+ctl_extent_check_unmap(union ctl_io *io, uint64_t lba2, uint64_t len2)
+{
+	struct ctl_ptr_len_flags *ptrlen;
+	struct scsi_unmap_desc *buf, *end, *range;
+	uint64_t lba;
+	uint32_t len;
+
+	/* If not UNMAP -- go other way. */
+	if (io->io_hdr.io_type != CTL_IO_SCSI ||
+	    io->scsiio.cdb[0] != UNMAP)
+		return (CTL_ACTION_ERROR);
+
+	/* If UNMAP without data -- block and wait for data. */
+	ptrlen = (struct ctl_ptr_len_flags *)
+	    &io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	if ((io->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0 ||
+	    ptrlen->ptr == NULL)
+		return (CTL_ACTION_BLOCK);
+
+	/* UNMAP with data -- check for collision. */
+	buf = (struct scsi_unmap_desc *)ptrlen->ptr;
+	end = buf + ptrlen->len / sizeof(*buf);
+	for (range = buf; range < end; range++) {
+		lba = scsi_8btou64(range->lba);
+		len = scsi_4btoul(range->length);
+		if ((lba < lba2 + len2) && (lba + len > lba2))
+			return (CTL_ACTION_BLOCK);
+	}
+	return (CTL_ACTION_PASS);
+}
+
 static ctl_action
 ctl_extent_check(union ctl_io *io1, union ctl_io *io2)
 {
 	uint64_t lba1, lba2;
-	uint32_t len1, len2;
+	uint64_t len1, len2;
 	int retval;
 
-	retval = ctl_get_lba_len(io1, &lba1, &len1);
-	if (retval != 0)
+	if (ctl_get_lba_len(io1, &lba1, &len1) != 0)
 		return (CTL_ACTION_ERROR);
 
-	retval = ctl_get_lba_len(io2, &lba2, &len2);
-	if (retval != 0)
+	retval = ctl_extent_check_unmap(io2, lba1, len1);
+	if (retval != CTL_ACTION_ERROR)
+		return (retval);
+
+	if (ctl_get_lba_len(io2, &lba2, &len2) != 0)
 		return (CTL_ACTION_ERROR);
 
 	return (ctl_extent_check_lba(lba1, len1, lba2, len2));
 }
 
 static ctl_action
-ctl_check_for_blockage(union ctl_io *pending_io, union ctl_io *ooa_io)
+ctl_check_for_blockage(struct ctl_lun *lun, union ctl_io *pending_io,
+    union ctl_io *ooa_io)
 {
 	const struct ctl_cmd_entry *pending_entry, *ooa_entry;
 	ctl_serialize_action *serialize_row;
@@ -10890,28 +11041,33 @@ ctl_check_for_blockage(union ctl_io *pending_io, union ctl_io *ooa_io)
 	  || (ooa_io->scsiio.tag_type == CTL_TAG_ORDERED)))
 		return (CTL_ACTION_BLOCK);
 
-	pending_entry = ctl_get_cmd_entry(&pending_io->scsiio);
-	ooa_entry = ctl_get_cmd_entry(&ooa_io->scsiio);
+	pending_entry = ctl_get_cmd_entry(&pending_io->scsiio, NULL);
+	ooa_entry = ctl_get_cmd_entry(&ooa_io->scsiio, NULL);
 
 	serialize_row = ctl_serialize_table[ooa_entry->seridx];
 
 	switch (serialize_row[pending_entry->seridx]) {
 	case CTL_SER_BLOCK:
 		return (CTL_ACTION_BLOCK);
-		break; /* NOTREACHED */
 	case CTL_SER_EXTENT:
 		return (ctl_extent_check(pending_io, ooa_io));
-		break; /* NOTREACHED */
+	case CTL_SER_EXTENTOPT:
+		if ((lun->mode_pages.control_page[CTL_PAGE_CURRENT].queue_flags
+		    & SCP_QUEUE_ALG_MASK) != SCP_QUEUE_ALG_UNRESTRICTED)
+			return (ctl_extent_check(pending_io, ooa_io));
+		/* FALLTHROUGH */
 	case CTL_SER_PASS:
 		return (CTL_ACTION_PASS);
-		break; /* NOTREACHED */
+	case CTL_SER_BLOCKOPT:
+		if ((lun->mode_pages.control_page[CTL_PAGE_CURRENT].queue_flags
+		    & SCP_QUEUE_ALG_MASK) != SCP_QUEUE_ALG_UNRESTRICTED)
+			return (CTL_ACTION_BLOCK);
+		return (CTL_ACTION_PASS);
 	case CTL_SER_SKIP:
 		return (CTL_ACTION_SKIP);
-		break;
 	default:
 		panic("invalid serialization value %d",
 		      serialize_row[pending_entry->seridx]);
-		break; /* NOTREACHED */
 	}
 
 	return (CTL_ACTION_ERROR);
@@ -10948,7 +11104,7 @@ ctl_check_ooa(struct ctl_lun *lun, union ctl_io *pending_io,
 		 * of it in the queue.  It doesn't queue/dequeue
 		 * cur_blocked.
 		 */
-		action = ctl_check_for_blockage(pending_io, ooa_io);
+		action = ctl_check_for_blockage(lun, pending_io, ooa_io);
 		switch (action) {
 		case CTL_ACTION_BLOCK:
 		case CTL_ACTION_OVERLAP:
@@ -11059,7 +11215,7 @@ ctl_check_blocked(struct ctl_lun *lun)
 				}
 				break;
 			}
-			entry = ctl_get_cmd_entry(&cur_blocked->scsiio);
+			entry = ctl_get_cmd_entry(&cur_blocked->scsiio, NULL);
 			softc = control_softc;
 
 			initidx = ctl_get_initindex(&cur_blocked->io_hdr.nexus);
@@ -11110,6 +11266,7 @@ ctl_scsiio_lun_check(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
     const struct ctl_cmd_entry *entry, struct ctl_scsiio *ctsio)
 {
 	int retval;
+	uint32_t residx;
 
 	retval = 0;
 
@@ -11134,12 +11291,10 @@ ctl_scsiio_lun_check(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
 	 * even on reserved LUNs, and if this initiator isn't the one who
 	 * reserved us, reject the command with a reservation conflict.
 	 */
+	residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
 	if ((lun->flags & CTL_LUN_RESERVED)
 	 && ((entry->flags & CTL_CMD_FLAG_ALLOW_ON_RESV) == 0)) {
-		if ((ctsio->io_hdr.nexus.initid.id != lun->rsv_nexus.initid.id)
-		 || (ctsio->io_hdr.nexus.targ_port != lun->rsv_nexus.targ_port)
-		 || (ctsio->io_hdr.nexus.targ_target.id !=
-		     lun->rsv_nexus.targ_target.id)) {
+		if (lun->res_idx != residx) {
 			ctsio->scsi_status = SCSI_STATUS_RESERV_CONFLICT;
 			ctsio->io_hdr.status = CTL_SCSI_ERROR;
 			retval = 1;
@@ -11147,11 +11302,8 @@ ctl_scsiio_lun_check(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
 		}
 	}
 
-	if ( (lun->flags & CTL_LUN_PR_RESERVED)
+	if ((lun->flags & CTL_LUN_PR_RESERVED)
 	 && ((entry->flags & CTL_CMD_FLAG_ALLOW_ON_PR_RESV) == 0)) {
-		uint32_t residx;
-
-		residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
 		/*
 		 * if we aren't registered or it's a res holder type
 		 * reservation and this isn't the res holder then set a
@@ -11588,8 +11740,7 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 	if ((entry->flags & CTL_CMD_FLAG_NO_SENSE) == 0) {
 		ctl_ua_type ua_type;
 
-		ua_type = lun->pending_ua[initidx];
-		if (ua_type != CTL_UA_NONE) {
+		if (lun->pending_ua[initidx] != CTL_UA_NONE) {
 			scsi_sense_data_type sense_format;
 
 			if (lun != NULL)
@@ -11599,14 +11750,13 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 			else
 				sense_format = SSD_TYPE_FIXED;
 
-			ua_type = ctl_build_ua(ua_type, &ctsio->sense_data,
-					       sense_format);
+			ua_type = ctl_build_ua(&lun->pending_ua[initidx],
+			    &ctsio->sense_data, sense_format);
 			if (ua_type != CTL_UA_NONE) {
 				ctsio->scsi_status = SCSI_STATUS_CHECK_COND;
 				ctsio->io_hdr.status = CTL_SCSI_ERROR |
 						       CTL_AUTOSENSE;
 				ctsio->sense_len = SSD_FULL_SIZE;
-				lun->pending_ua[initidx] &= ~ua_type;
 				mtx_unlock(&lun->lun_lock);
 				ctl_done((union ctl_io *)ctsio);
 				return (retval);
@@ -11710,12 +11860,14 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 }
 
 const struct ctl_cmd_entry *
-ctl_get_cmd_entry(struct ctl_scsiio *ctsio)
+ctl_get_cmd_entry(struct ctl_scsiio *ctsio, int *sa)
 {
 	const struct ctl_cmd_entry *entry;
 	int service_action;
 
 	entry = &ctl_cmd_table[ctsio->cdb[0]];
+	if (sa)
+		*sa = ((entry->flags & CTL_CMD_FLAG_SA5) != 0);
 	if (entry->flags & CTL_CMD_FLAG_SA5) {
 		service_action = ctsio->cdb[1] & SERVICE_ACTION_MASK;
 		entry = &((const struct ctl_cmd_entry *)
@@ -11728,12 +11880,20 @@ const struct ctl_cmd_entry *
 ctl_validate_command(struct ctl_scsiio *ctsio)
 {
 	const struct ctl_cmd_entry *entry;
-	int i;
+	int i, sa;
 	uint8_t diff;
 
-	entry = ctl_get_cmd_entry(ctsio);
+	entry = ctl_get_cmd_entry(ctsio, &sa);
 	if (entry->execute == NULL) {
-		ctl_set_invalid_opcode(ctsio);
+		if (sa)
+			ctl_set_invalid_field(ctsio,
+					      /*sks_valid*/ 1,
+					      /*command*/ 1,
+					      /*field*/ 1,
+					      /*bit_valid*/ 1,
+					      /*bit*/ 4);
+		else
+			ctl_set_invalid_opcode(ctsio);
 		ctl_done((union ctl_io *)ctsio);
 		return (NULL);
 	}
@@ -11787,7 +11947,7 @@ ctl_scsiio(struct ctl_scsiio *ctsio)
 
 	CTL_DEBUG_PRINT(("ctl_scsiio cdb[0]=%02X\n", ctsio->cdb[0]));
 
-	entry = ctl_get_cmd_entry(ctsio);
+	entry = ctl_get_cmd_entry(ctsio, NULL);
 
 	/*
 	 * If this I/O has been aborted, just send it straight to
@@ -11926,12 +12086,11 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
 	return (0);
 }
 
-static int
+static void
 ctl_abort_tasks_lun(struct ctl_lun *lun, uint32_t targ_port, uint32_t init_id,
     int other_sc)
 {
 	union ctl_io *xio;
-	int found;
 
 	mtx_assert(&lun->lun_lock, MA_OWNED);
 
@@ -11953,7 +12112,6 @@ ctl_abort_tasks_lun(struct ctl_lun *lun, uint32_t targ_port, uint32_t init_id,
 			    init_id != xio->io_hdr.nexus.initid.id)
 				xio->io_hdr.flags |= CTL_FLAG_ABORT_STATUS;
 			xio->io_hdr.flags |= CTL_FLAG_ABORT;
-			found = 1;
 			if (!other_sc && !(lun->flags & CTL_LUN_PRIMARY_SC)) {
 				union ctl_ha_msg msg_info;
 
@@ -11969,7 +12127,6 @@ ctl_abort_tasks_lun(struct ctl_lun *lun, uint32_t targ_port, uint32_t init_id,
 			}
 		}
 	}
-	return (found);
 }
 
 static int
@@ -12010,9 +12167,10 @@ ctl_i_t_nexus_reset(union ctl_io *io)
 {
 	struct ctl_softc *softc = control_softc;
 	struct ctl_lun *lun;
-	uint32_t initindex;
+	uint32_t initindex, residx;
 
 	initindex = ctl_get_initindex(&io->io_hdr.nexus);
+	residx = ctl_get_resindex(&io->io_hdr.nexus);
 	mtx_lock(&softc->ctl_lock);
 	STAILQ_FOREACH(lun, &softc->lun_list, links) {
 		mtx_lock(&lun->lun_lock);
@@ -12022,6 +12180,8 @@ ctl_i_t_nexus_reset(union ctl_io *io)
 #ifdef CTL_WITH_CA
 		ctl_clear_mask(lun->have_ca, initindex);
 #endif
+		if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx == residx))
+			lun->flags &= ~CTL_LUN_RESERVED;
 		lun->pending_ua[initindex] |= CTL_UA_I_T_NEXUS_LOSS;
 		mtx_unlock(&lun->lun_lock);
 	}
@@ -12320,7 +12480,7 @@ ctl_handle_isc(union ctl_io *io)
 		 * This is only used in SER_ONLY mode.
 		 */
 		free_io = 0;
-		entry = ctl_get_cmd_entry(&io->scsiio);
+		entry = ctl_get_cmd_entry(&io->scsiio, NULL);
 		mtx_lock(&lun->lun_lock);
 		if (ctl_scsiio_lun_check(ctl_softc, lun,
 		    entry, (struct ctl_scsiio *)io) != 0) {
@@ -12400,7 +12560,7 @@ ctl_cmd_pattern_match(struct ctl_scsiio *ctsio, struct ctl_error_desc *desc)
 	if ((pattern & CTL_LUN_PAT_MASK) == CTL_LUN_PAT_ANY)
 		return (CTL_LUN_PAT_ANY);
 
-	entry = ctl_get_cmd_entry(ctsio);
+	entry = ctl_get_cmd_entry(ctsio, NULL);
 
 	filtered_pattern = entry->pattern & pattern;
 
@@ -12422,7 +12582,7 @@ ctl_cmd_pattern_match(struct ctl_scsiio *ctsio, struct ctl_error_desc *desc)
 	 */
 	if (filtered_pattern & CTL_LUN_PAT_RANGE) {
 		uint64_t lba1;
-		uint32_t len1;
+		uint64_t len1;
 		ctl_action action;
 		int retval;
 
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index 0525a51d24a2..fa09c0e772e0 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -119,7 +119,7 @@ typedef enum {
 	CTL_UA_I_T_NEXUS_LOSS	= 0x0008,
 	CTL_UA_LUN_RESET	= 0x0010,
 	CTL_UA_LUN_CHANGE	= 0x0020,
-	CTL_UA_MODE_CHANGE	= 0x0030,
+	CTL_UA_MODE_CHANGE	= 0x0040,
 	CTL_UA_LOG_CHANGE	= 0x0080,
 	CTL_UA_LVD		= 0x0100,
 	CTL_UA_SE		= 0x0200,
@@ -162,6 +162,8 @@ int ctl_ffz(uint32_t *mask, uint32_t size);
 int ctl_set_mask(uint32_t *mask, uint32_t bit);
 int ctl_clear_mask(uint32_t *mask, uint32_t bit);
 int ctl_is_set(uint32_t *mask, uint32_t bit);
+int ctl_caching_sp_handler(struct ctl_scsiio *ctsio,
+			 struct ctl_page_index *page_index, uint8_t *page_ptr);
 int ctl_control_page_handler(struct ctl_scsiio *ctsio,
 			     struct ctl_page_index *page_index,
 			     uint8_t *page_ptr);
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index 1fe4874a0f76..0ae8ecb1eb10 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -203,7 +203,6 @@ struct ctl_be_block_io {
 	struct ctl_sg_entry		sg_segs[CTLBLK_MAX_SEGS];
 	struct iovec			xiovecs[CTLBLK_MAX_SEGS];
 	int				bio_cmd;
-	int				bio_flags;
 	int				num_segs;
 	int				num_bios_sent;
 	int				num_bios_done;
@@ -599,7 +598,11 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 
 	file_data = &be_lun->backend.file;
 	io = beio->io;
-	flags = beio->bio_flags;
+	flags = 0;
+	if (ARGS(io)->flags & CTL_LLF_DPO)
+		flags |= IO_DIRECT;
+	if (beio->bio_cmd == BIO_WRITE && ARGS(io)->flags & CTL_LLF_FUA)
+		flags |= IO_SYNC;
 
 	bzero(&xuio, sizeof(xuio));
 	if (beio->bio_cmd == BIO_READ) {
@@ -649,8 +652,7 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 		 * So, to attempt to provide some barrier semantics in the
 		 * BIO_ORDERED case, set both IO_DIRECT and IO_SYNC.
 		 */
-		error = VOP_READ(be_lun->vn, &xuio, (flags & BIO_ORDERED) ?
-				 (IO_DIRECT|IO_SYNC) : 0, file_data->cred);
+		error = VOP_READ(be_lun->vn, &xuio, flags, file_data->cred);
 
 		VOP_UNLOCK(be_lun->vn, 0);
 		SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
@@ -687,8 +689,7 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 		 * So if we've got the BIO_ORDERED flag set, we want
 		 * IO_SYNC in either the UFS or ZFS case.
 		 */
-		error = VOP_WRITE(be_lun->vn, &xuio, (flags & BIO_ORDERED) ?
-				  IO_SYNC : 0, file_data->cred);
+		error = VOP_WRITE(be_lun->vn, &xuio, flags, file_data->cred);
 		VOP_UNLOCK(be_lun->vn, 0);
 
 		vn_finished_write(mountpoint);
@@ -752,7 +753,11 @@ ctl_be_block_dispatch_zvol(struct ctl_be_block_lun *be_lun,
 
 	dev_data = &be_lun->backend.dev;
 	io = beio->io;
-	flags = beio->bio_flags;
+	flags = 0;
+	if (ARGS(io)->flags & CTL_LLF_DPO)
+		flags |= IO_DIRECT;
+	if (beio->bio_cmd == BIO_WRITE && ARGS(io)->flags & CTL_LLF_FUA)
+		flags |= IO_SYNC;
 
 	bzero(&xuio, sizeof(xuio));
 	if (beio->bio_cmd == BIO_READ) {
@@ -780,10 +785,10 @@ ctl_be_block_dispatch_zvol(struct ctl_be_block_lun *be_lun,
 	mtx_unlock(&be_lun->io_lock);
 
 	if (beio->bio_cmd == BIO_READ) {
-		error = (*dev_data->csw->d_read)(dev_data->cdev, &xuio, 0);
+		error = (*dev_data->csw->d_read)(dev_data->cdev, &xuio, flags);
 		SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
 	} else {
-		error = (*dev_data->csw->d_write)(dev_data->cdev, &xuio, 0);
+		error = (*dev_data->csw->d_write)(dev_data->cdev, &xuio, flags);
 		SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
 	}
 
@@ -874,7 +879,6 @@ ctl_be_block_unmap_dev_range(struct ctl_be_block_lun *be_lun,
 	while (len > 0) {
 		bio = g_alloc_bio();
 		bio->bio_cmd	    = BIO_DELETE;
-		bio->bio_flags	   |= beio->bio_flags;
 		bio->bio_dev	    = dev_data->cdev;
 		bio->bio_offset	    = off;
 		bio->bio_length	    = MIN(len, maxlen);
@@ -973,7 +977,6 @@ ctl_be_block_dispatch_dev(struct ctl_be_block_lun *be_lun,
 			KASSERT(bio != NULL, ("g_alloc_bio() failed!\n"));
 
 			bio->bio_cmd = beio->bio_cmd;
-			bio->bio_flags |= beio->bio_flags;
 			bio->bio_dev = dev_data->cdev;
 			bio->bio_caller1 = beio;
 			bio->bio_length = min(cur_size, max_iosize);
@@ -1039,7 +1042,7 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 	softc = be_lun->softc;
 	lbalen = ARGS(beio->io);
 
-	if (lbalen->flags & ~(SWS_LBDATA | SWS_UNMAP | SWS_ANCHOR) ||
+	if (lbalen->flags & ~(SWS_LBDATA | SWS_UNMAP | SWS_ANCHOR | SWS_NDOB) ||
 	    (lbalen->flags & (SWS_UNMAP | SWS_ANCHOR) && be_lun->unmap == NULL)) {
 		ctl_free_beio(beio);
 		ctl_set_invalid_field(&io->scsiio,
@@ -1052,15 +1055,6 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 		return;
 	}
 
-	/*
-	 * If the I/O came down with an ordered or head of queue tag, set
-	 * the BIO_ORDERED attribute.  For head of queue tags, that's
-	 * pretty much the best we can do.
-	 */
-	if ((io->scsiio.tag_type == CTL_TAG_ORDERED)
-	 || (io->scsiio.tag_type == CTL_TAG_HEAD_OF_QUEUE))
-		beio->bio_flags = BIO_ORDERED;
-
 	switch (io->scsiio.tag_type) {
 	case CTL_TAG_ORDERED:
 		beio->ds_tag_type = DEVSTAT_TAG_ORDERED;
@@ -1158,15 +1152,6 @@ ctl_be_block_cw_dispatch_unmap(struct ctl_be_block_lun *be_lun,
 		return;
 	}
 
-	/*
-	 * If the I/O came down with an ordered or head of queue tag, set
-	 * the BIO_ORDERED attribute.  For head of queue tags, that's
-	 * pretty much the best we can do.
-	 */
-	if ((io->scsiio.tag_type == CTL_TAG_ORDERED)
-	 || (io->scsiio.tag_type == CTL_TAG_HEAD_OF_QUEUE))
-		beio->bio_flags = BIO_ORDERED;
-
 	switch (io->scsiio.tag_type) {
 	case CTL_TAG_ORDERED:
 		beio->ds_tag_type = DEVSTAT_TAG_ORDERED;
@@ -1305,20 +1290,6 @@ ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
 	bptrlen = PRIV(io);
 	bptrlen->ptr = (void *)beio;
 
-	/*
-	 * If the I/O came down with an ordered or head of queue tag, set
-	 * the BIO_ORDERED attribute.  For head of queue tags, that's
-	 * pretty much the best we can do.
-	 *
-	 * XXX KDM we don't have a great way to easily know about the FUA
-	 * bit right now (it is decoded in ctl_read_write(), but we don't
-	 * pass that knowledge to the backend), and in any case we would
-	 * need to determine how to handle it.  
-	 */
-	if ((io->scsiio.tag_type == CTL_TAG_ORDERED)
-	 || (io->scsiio.tag_type == CTL_TAG_HEAD_OF_QUEUE))
-		beio->bio_flags = BIO_ORDERED;
-
 	switch (io->scsiio.tag_type) {
 	case CTL_TAG_ORDERED:
 		beio->ds_tag_type = DEVSTAT_TAG_ORDERED;
@@ -2307,7 +2278,9 @@ ctl_be_block_modify_file(struct ctl_be_block_lun *be_lun,
 	if (params->lun_size_bytes != 0) {
 		be_lun->size_bytes = params->lun_size_bytes;
 	} else  {
+		vn_lock(be_lun->vn, LK_SHARED | LK_RETRY);
 		error = VOP_GETATTR(be_lun->vn, &vattr, curthread->td_ucred);
+		VOP_UNLOCK(be_lun->vn, 0);
 		if (error != 0) {
 			snprintf(req->error_str, sizeof(req->error_str),
 				 "error calling VOP_GETATTR() for file %s",
@@ -2325,24 +2298,22 @@ static int
 ctl_be_block_modify_dev(struct ctl_be_block_lun *be_lun,
 			struct ctl_lun_req *req)
 {
-	struct cdev *dev;
-	struct cdevsw *devsw;
+	struct ctl_be_block_devdata *dev_data;
 	int error;
 	struct ctl_lun_modify_params *params;
 	uint64_t size_bytes;
 
 	params = &req->reqdata.modify;
 
-	dev = be_lun->vn->v_rdev;
-	devsw = dev->si_devsw;
-	if (!devsw->d_ioctl) {
+	dev_data = &be_lun->backend.dev;
+	if (!dev_data->csw->d_ioctl) {
 		snprintf(req->error_str, sizeof(req->error_str),
 			 "%s: no d_ioctl for device %s!", __func__,
 			 be_lun->dev_path);
 		return (ENODEV);
 	}
 
-	error = devsw->d_ioctl(dev, DIOCGMEDIASIZE,
+	error = dev_data->csw->d_ioctl(dev_data->cdev, DIOCGMEDIASIZE,
 			       (caddr_t)&size_bytes, FREAD,
 			       curthread);
 	if (error) {
@@ -2375,6 +2346,7 @@ ctl_be_block_modify(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 {
 	struct ctl_lun_modify_params *params;
 	struct ctl_be_block_lun *be_lun;
+	uint64_t oldsize;
 	int error;
 
 	params = &req->reqdata.modify;
@@ -2405,28 +2377,27 @@ ctl_be_block_modify(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 		}
 	}
 
-	vn_lock(be_lun->vn, LK_SHARED | LK_RETRY);
-
+	oldsize = be_lun->size_bytes;
 	if (be_lun->vn->v_type == VREG)
 		error = ctl_be_block_modify_file(be_lun, req);
 	else
 		error = ctl_be_block_modify_dev(be_lun, req);
-
-	VOP_UNLOCK(be_lun->vn, 0);
-
 	if (error != 0)
 		goto bailout_error;
 
-	be_lun->size_blocks = be_lun->size_bytes >> be_lun->blocksize_shift;
+	if (be_lun->size_bytes != oldsize) {
+		be_lun->size_blocks = be_lun->size_bytes >>
+		    be_lun->blocksize_shift;
 
-	/*
-	 * The maximum LBA is the size - 1.
-	 *
-	 * XXX: Note that this field is being updated without locking,
-	 * 	which might cause problems on 32-bit architectures.
-	 */
-	be_lun->ctl_be_lun.maxlba = be_lun->size_blocks - 1;
-	ctl_lun_capacity_changed(&be_lun->ctl_be_lun);
+		/*
+		 * The maximum LBA is the size - 1.
+		 *
+		 * XXX: Note that this field is being updated without locking,
+		 * 	which might cause problems on 32-bit architectures.
+		 */
+		be_lun->ctl_be_lun.maxlba = be_lun->size_blocks - 1;
+		ctl_lun_capacity_changed(&be_lun->ctl_be_lun);
+	}
 
 	/* Tell the user the exact size we ended up using */
 	params->lun_size_bytes = be_lun->size_bytes;
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index 6ad90dd36883..eb1b0ee41e2f 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -304,7 +304,8 @@ const struct ctl_cmd_entry ctl_cmd_table_84[32] =
 /* 00 RECEIVE COPY STATUS (LID1) */
 {ctl_receive_copy_status_lid1, CTL_SERIDX_RD_CAP,
  CTL_CMD_FLAG_OK_ON_BOTH |
- CTL_FLAG_DATA_IN,
+ CTL_FLAG_DATA_IN |
+ CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_NONE,
  16, {0x00, 0xff, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
@@ -320,14 +321,16 @@ const struct ctl_cmd_entry ctl_cmd_table_84[32] =
  CTL_CMD_FLAG_OK_ON_STOPPED |
  CTL_CMD_FLAG_OK_ON_INOPERABLE |
  CTL_CMD_FLAG_OK_ON_SECONDARY |
- CTL_FLAG_DATA_IN,
+ CTL_FLAG_DATA_IN |
+ CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_NONE,
  16, {0x03, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 04 RECEIVE COPY FAILURE DETAILS (LID1) */
 {ctl_receive_copy_failure_details, CTL_SERIDX_RD_CAP,
  CTL_CMD_FLAG_OK_ON_BOTH |
- CTL_FLAG_DATA_IN,
+ CTL_FLAG_DATA_IN |
+ CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_NONE,
  16, {0x04, 0xff, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
@@ -470,7 +473,8 @@ const struct ctl_cmd_entry ctl_cmd_table_a3[32] =
 						CTL_CMD_FLAG_OK_ON_STOPPED |
 						CTL_CMD_FLAG_OK_ON_INOPERABLE |
 						CTL_CMD_FLAG_OK_ON_SECONDARY |
-						CTL_FLAG_DATA_IN,
+						CTL_FLAG_DATA_IN |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_NONE,
  12, {0x0c, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
@@ -479,7 +483,8 @@ const struct ctl_cmd_entry ctl_cmd_table_a3[32] =
 					   CTL_CMD_FLAG_OK_ON_STOPPED |
 					   CTL_CMD_FLAG_OK_ON_INOPERABLE |
 					   CTL_CMD_FLAG_OK_ON_SECONDARY |
-					   CTL_FLAG_DATA_IN,
+					   CTL_FLAG_DATA_IN |
+					   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_NONE,
  12, {0x0d, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
@@ -631,7 +636,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
 				    CTL_FLAG_DATA_IN |
 				    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE, 6, {0x08, 0xff, 0, 0xff, 0x07}},
+ CTL_LUN_PAT_NONE, 6, {0x08, 0xff, 0xff, 0xff, 0x07}},
 
 /* 1B START STOP UNIT */
 {ctl_start_stop, CTL_SERIDX_START, CTL_CMD_FLAG_OK_ON_SLUN |
@@ -689,7 +694,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 				  CTL_FLAG_DATA_IN |
 				  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
- 10, {0x18, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
+ 10, {0x1a, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 29 READ GENERATION */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -697,7 +702,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* 2A WRITE(10) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 10, {0x18, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
+ 10, {0x1a, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 2B SEEK(10) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -711,7 +716,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* 2E WRITE AND VERIFY(10) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 10, {0x10, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
+ 10, {0x12, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 2F VERIFY(10) */
 {ctl_verify, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
@@ -885,7 +890,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
 				    CTL_FLAG_DATA_IN |
 				    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE, 10, {0x18, 0xff, 0, 0, 0, 0, 0xff, 0xff, 0x07} },
+ CTL_LUN_PAT_NONE, 10, {0x18, 0xff, 0xff, 0, 0, 0, 0xff, 0xff, 0x07} },
 
 /* 5B CLOSE TRACK/SESSION */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -1030,7 +1035,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN | CTL_FLAG_DATA_IN |
                                   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
- 16, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 16, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 89 COMPARE AND WRITE */
@@ -1042,7 +1047,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* 8A WRITE(16) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 16, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 16, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 8B */
@@ -1057,7 +1062,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* 8E WRITE AND VERIFY(16) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 16, {0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 16, {0x12, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 8F VERIFY(16) */
@@ -1085,7 +1090,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 {ctl_write_same, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 16, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 16, {0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 94 */
@@ -1164,7 +1169,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN | CTL_FLAG_DATA_IN |
                                   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
  CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
- 12, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+ 12, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* A9 PLAY TRACK RELATIVE(12) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -1172,7 +1177,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* AA WRITE(12) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 12, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+ 12, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* AB SERVICE ACTION IN(12) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -1186,7 +1191,7 @@ const struct ctl_cmd_entry ctl_cmd_table[256] =
 /* AE WRITE AND VERIFY(12) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
  CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
- 12, {0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+ 12, {0x12, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* AF VERIFY(12) */
 {ctl_verify, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c
index 6ecb54bee75a..d2edb2a95712 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -367,44 +367,42 @@ ctl_set_ua(struct ctl_scsiio *ctsio, int asc, int ascq)
 }
 
 ctl_ua_type
-ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense,
+ctl_build_ua(ctl_ua_type *ua_type, struct scsi_sense_data *sense,
 	     scsi_sense_data_type sense_format)
 {
-	ctl_ua_type ua_to_build;
-	int i, asc, ascq;
+	ctl_ua_type ua_to_build, ua_to_clear;
+	int asc, ascq;
 
-	if (ua_type == CTL_UA_NONE)
-		return (ua_type);
+	if (*ua_type == CTL_UA_NONE)
+		return (CTL_UA_NONE);
 
-	ua_to_build = CTL_UA_NONE;
-
-	for (i = 0; i < (sizeof(ua_type) * 8); i++) {
-		if (ua_type & (1 << i)) {
-			ua_to_build = 1 << i;
-			break;
-		}
-	}
+	ua_to_build = (1 << (ffs(*ua_type) - 1));
+	ua_to_clear = ua_to_build;
 
 	switch (ua_to_build) {
 	case CTL_UA_POWERON:
 		/* 29h/01h  POWER ON OCCURRED */
 		asc = 0x29;
 		ascq = 0x01;
+		ua_to_clear = ~0;
 		break;
 	case CTL_UA_BUS_RESET:
 		/* 29h/02h  SCSI BUS RESET OCCURRED */
 		asc = 0x29;
 		ascq = 0x02;
+		ua_to_clear = ~0;
 		break;
 	case CTL_UA_TARG_RESET:
 		/* 29h/03h  BUS DEVICE RESET FUNCTION OCCURRED*/
 		asc = 0x29;
 		ascq = 0x03;
+		ua_to_clear = ~0;
 		break;
 	case CTL_UA_I_T_NEXUS_LOSS:
 		/* 29h/07h  I_T NEXUS LOSS OCCURRED */
 		asc = 0x29;
 		ascq = 0x07;
+		ua_to_clear = ~0;
 		break;
 	case CTL_UA_LUN_RESET:
 		/* 29h/00h  POWER ON, RESET, OR BUS DEVICE RESET OCCURRED */
@@ -466,9 +464,7 @@ ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense,
 		ascq = 0x09;
 		break;
 	default:
-		ua_to_build = CTL_UA_NONE;
-		return (ua_to_build);
-		break; /* NOTREACHED */
+		panic("ctl_build_ua: Unknown UA %x", ua_to_build);
 	}
 
 	ctl_set_sense_data(sense,
@@ -480,6 +476,9 @@ ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense,
 			   ascq,
 			   SSD_ELEM_NONE);
 
+	/* We're reporting this UA, so clear it */
+	*ua_type &= ~ua_to_clear;
+
 	return (ua_to_build);
 }
 
@@ -694,7 +693,7 @@ ctl_set_lun_not_ready(struct ctl_scsiio *ctsio)
 		      /*current_error*/ 1,
 		      /*sense_key*/ SSD_KEY_NOT_READY,
 		      /*asc*/ 0x04,
-		      /*ascq*/ 0x05,
+		      /*ascq*/ 0x03,
 		      SSD_ELEM_NONE);
 }
 
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index 62596d0a1a40..034d14bff990 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -55,7 +55,7 @@ void ctl_sense_to_desc(struct scsi_sense_data_fixed *sense_src,
 void ctl_sense_to_fixed(struct scsi_sense_data_desc *sense_src,
 			struct scsi_sense_data_fixed *sense_dest);
 void ctl_set_ua(struct ctl_scsiio *ctsio, int asc, int ascq);
-ctl_ua_type ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense,
+ctl_ua_type ctl_build_ua(ctl_ua_type *ua_type, struct scsi_sense_data *sense,
 			 scsi_sense_data_type sense_format);
 void ctl_set_overlapped_cmd(struct ctl_scsiio *ctsio);
 void ctl_set_overlapped_tag(struct ctl_scsiio *ctsio, uint8_t tag);
diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c
index 34b4a9ef5875..8a992cc0ba74 100644
--- a/sys/cam/ctl/ctl_frontend.c
+++ b/sys/cam/ctl/ctl_frontend.c
@@ -147,9 +147,9 @@ ctl_port_register(struct ctl_port *port, int master_shelf)
 	KASSERT(control_softc != NULL, ("CTL is not initialized"));
 
 	mtx_lock(&control_softc->ctl_lock);
-	port_num = ctl_ffz(&control_softc->ctl_port_mask, CTL_MAX_PORTS);
+	port_num = ctl_ffz(control_softc->ctl_port_mask, CTL_MAX_PORTS);
 	if ((port_num == -1)
-	 || (ctl_set_mask(&control_softc->ctl_port_mask, port_num) == -1)) {
+	 || (ctl_set_mask(control_softc->ctl_port_mask, port_num) == -1)) {
 		port->targ_port = -1;
 		mtx_unlock(&control_softc->ctl_lock);
 		return (1);
@@ -183,7 +183,7 @@ ctl_port_register(struct ctl_port *port, int master_shelf)
 error:
 		port->targ_port = -1;
 		mtx_lock(&control_softc->ctl_lock);
-		ctl_clear_mask(&control_softc->ctl_port_mask, port_num);
+		ctl_clear_mask(control_softc->ctl_port_mask, port_num);
 		mtx_unlock(&control_softc->ctl_lock);
 		return (retval);
 	}
@@ -223,7 +223,7 @@ ctl_port_deregister(struct ctl_port *port)
 	control_softc->num_ports--;
 	port_num = (port->targ_port < CTL_MAX_PORTS) ? port->targ_port :
 	    port->targ_port - CTL_MAX_PORTS;
-	ctl_clear_mask(&control_softc->ctl_port_mask, port_num);
+	ctl_clear_mask(control_softc->ctl_port_mask, port_num);
 	control_softc->ctl_ports[port_num] = NULL;
 	mtx_unlock(&control_softc->ctl_lock);
 
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index d251789eb3ea..85a0667968ba 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -993,7 +993,7 @@ cfiscsi_callout(void *context)
 
 #ifdef ICL_KERNEL_PROXY
 	if (cs->cs_waiting_for_ctld || cs->cs_login_phase) {
-		if (cs->cs_timeout > login_timeout) {
+		if (login_timeout > 0 && cs->cs_timeout > login_timeout) {
 			CFISCSI_SESSION_WARN(cs, "login timed out after "
 			    "%d seconds; dropping connection", cs->cs_timeout);
 			cfiscsi_session_terminate(cs);
@@ -1002,6 +1002,19 @@ cfiscsi_callout(void *context)
 	}
 #endif
 
+	if (ping_timeout <= 0) {
+		/*
+		 * Pings are disabled.  Don't send NOP-In in this case;
+		 * user might have disabled pings to work around problems
+		 * with certain initiators that can't properly handle
+		 * NOP-In, such as iPXE.  Reset the timeout, to avoid
+		 * triggering reconnection, should the user decide to
+		 * reenable them.
+		 */
+		cs->cs_timeout = 0;
+		return;
+	}
+
 	if (cs->cs_timeout >= ping_timeout) {
 		CFISCSI_SESSION_WARN(cs, "no ping reply (NOP-Out) after %d seconds; "
 		    "dropping connection",  ping_timeout);
@@ -2492,10 +2505,10 @@ cfiscsi_datamove_in(union ctl_io *io)
 		sg_addr += len;
 		sg_len -= len;
 
-		KASSERT(buffer_offset + request->ip_data_len <= expected_len,
+		KASSERT(buffer_offset + response->ip_data_len <= expected_len,
 		    ("buffer_offset %zd + ip_data_len %zd > expected_len %zd",
-		    buffer_offset, request->ip_data_len, expected_len));
-		if (buffer_offset + request->ip_data_len == expected_len) {
+		    buffer_offset, response->ip_data_len, expected_len));
+		if (buffer_offset + response->ip_data_len == expected_len) {
 			/*
 			 * Already have the amount of data the initiator wanted.
 			 */
diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h
index 8f4ab92c330b..c81081734c26 100644
--- a/sys/cam/ctl/ctl_io.h
+++ b/sys/cam/ctl/ctl_io.h
@@ -139,6 +139,8 @@ struct ctl_lba_len_flags {
 	uint64_t lba;
 	uint32_t len;
 	uint32_t flags;
+#define CTL_LLF_FUA	0x04000000
+#define CTL_LLF_DPO	0x08000000
 #define CTL_LLF_READ	0x10000000
 #define CTL_LLF_WRITE	0x20000000
 #define CTL_LLF_VERIFY	0x40000000
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index 46527ba015b4..43ee3947434b 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -115,7 +115,9 @@ struct ctl_ioctl_info {
 
 typedef enum {
 	CTL_SER_BLOCK,
+	CTL_SER_BLOCKOPT,
 	CTL_SER_EXTENT,
+	CTL_SER_EXTENTOPT,
 	CTL_SER_PASS,
 	CTL_SER_SKIP
 } ctl_serialize_action;
@@ -304,7 +306,7 @@ static const struct ctl_page_index page_index_template[] = {
 	{SMS_RIGID_DISK_PAGE, 0, sizeof(struct scsi_rigid_disk_page), NULL,
 	 CTL_PAGE_FLAG_DISK_ONLY, NULL, NULL},
 	{SMS_CACHING_PAGE, 0, sizeof(struct scsi_caching_page), NULL,
-	 CTL_PAGE_FLAG_DISK_ONLY, NULL, NULL},
+	 CTL_PAGE_FLAG_DISK_ONLY, NULL, ctl_caching_sp_handler},
 	{SMS_CONTROL_MODE_PAGE, 0, sizeof(struct scsi_control_page), NULL,
 	 CTL_PAGE_FLAG_NONE, NULL, ctl_control_page_handler},
    	{SMS_VENDOR_SPECIFIC_PAGE | SMPH_SPF, PWR_SUBPAGE_CODE,
@@ -387,7 +389,6 @@ struct ctl_lun {
 	TAILQ_HEAD(ctl_blockq,ctl_io_hdr) blocked_queue;
 	STAILQ_ENTRY(ctl_lun)		links;
 	STAILQ_ENTRY(ctl_lun)		run_links;
-	struct ctl_nexus		rsv_nexus;
 #ifdef CTL_WITH_CA
 	uint32_t			have_ca[CTL_MAX_INITIATORS >> 5];
 	struct scsi_sense_data		pending_sense[CTL_MAX_INITIATORS];
@@ -395,6 +396,7 @@ struct ctl_lun {
 	ctl_ua_type			pending_ua[CTL_MAX_INITIATORS];
 	struct ctl_mode_pages		mode_pages;
 	struct ctl_lun_io_stats		stats;
+	uint32_t			res_idx;
 	struct ctl_per_res_info		per_res[2*CTL_MAX_INITIATORS];
 	unsigned int			PRGeneration;
 	int				pr_key_count;
@@ -441,9 +443,9 @@ struct ctl_softc {
 	struct ctl_io_pool *othersc_pool;
 	struct proc *ctl_proc;
 	int targ_online;
-	uint32_t ctl_lun_mask[CTL_MAX_LUNS >> 5];
+	uint32_t ctl_lun_mask[(CTL_MAX_LUNS + 31) / 32];
 	struct ctl_lun *ctl_luns[CTL_MAX_LUNS];
-	uint32_t ctl_port_mask;
+	uint32_t ctl_port_mask[(CTL_MAX_PORTS + 31) / 32];
 	uint64_t aps_locked_lun;
 	STAILQ_HEAD(, ctl_lun) lun_list;
 	STAILQ_HEAD(, ctl_be_lun) pending_lun_queue;
diff --git a/sys/cam/ctl/ctl_ser_table.c b/sys/cam/ctl/ctl_ser_table.c
index 2bf39e6955f9..d3693ce9c194 100644
--- a/sys/cam/ctl/ctl_ser_table.c
+++ b/sys/cam/ctl/ctl_ser_table.c
@@ -54,17 +54,19 @@
 /****************************************************************************/
 
 #define	sK	CTL_SER_SKIP		/* Skip */
-#define	pS	CTL_SER_PASS		/* pS */
+#define	pS	CTL_SER_PASS		/* Pass */
 #define	bK	CTL_SER_BLOCK		/* Blocked */
+#define	bO	CTL_SER_BLOCKOPT	/* Optional block */
 #define	xT	CTL_SER_EXTENT		/* Extent check */
+#define	xO	CTL_SER_EXTENTOPT	/* Optional extent check */
 
 static ctl_serialize_action
 ctl_serialize_table[CTL_SERIDX_COUNT][CTL_SERIDX_COUNT] = {
 /**>IDX_ :: 2nd:TUR RD  WRT UNM MDSN MDSL RQSN INQ RDCP RES LSNS FMT STR*/
 /*TUR     */{   pS, pS, pS, pS, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
-/*READ    */{   pS, pS, xT, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
-/*WRITE   */{   pS, xT, xT, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
-/*UNMAP   */{   pS, bK, bK, pS, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*READ    */{   pS, pS, xT, bO, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*WRITE   */{   pS, xT, xT, bO, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*UNMAP   */{   pS, xO, xO, pS, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
 /*MD_SNS  */{   bK, bK, bK, bK, pS,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
 /*MD_SEL  */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
 /*RQ_SNS  */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  bK, pS,  bK, bK},
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c
index 4d41005d2e61..60ae8a01347c 100644
--- a/sys/cam/ctl/ctl_tpc.c
+++ b/sys/cam/ctl/ctl_tpc.c
@@ -1811,6 +1811,8 @@ tpc_create_token(struct ctl_lun *lun, struct ctl_port *port, off_t len,
 {
 	static int id = 0;
 	struct scsi_vpd_id_descriptor *idd = NULL;
+	struct scsi_ec_cscd_id *cscd;
+	struct scsi_read_capacity_data_long *dtsd;
 	int targid_len;
 
 	scsi_ulto4b(ROD_TYPE_AUR, token->type);
@@ -1824,10 +1826,24 @@ tpc_create_token(struct ctl_lun *lun, struct ctl_port *port, off_t len,
 		idd = scsi_get_devid_desc((struct scsi_vpd_id_descriptor *)
 		    lun->lun_devid->data, lun->lun_devid->len,
 		    scsi_devid_is_lun_eui64);
-	if (idd != NULL)
-		memcpy(&token->body[8], idd, 4 + idd->length);
-	scsi_u64to8b(0, &token->body[40]);
+	if (idd != NULL) {
+		cscd = (struct scsi_ec_cscd_id *)&token->body[8];
+		cscd->type_code = EC_CSCD_ID;
+		cscd->luidt_pdt = T_DIRECT;
+		memcpy(&cscd->codeset, idd, 4 + idd->length);
+		scsi_ulto3b(lun->be_lun->blocksize, cscd->dtsp.block_length);
+	}
+	scsi_u64to8b(0, &token->body[40]); /* XXX: Should be 128bit value. */
 	scsi_u64to8b(len, &token->body[48]);
+
+	/* ROD token device type specific data (RC16 without first field) */
+	dtsd = (struct scsi_read_capacity_data_long *)&token->body[88 - 8];
+	scsi_ulto4b(lun->be_lun->blocksize, dtsd->length);
+	dtsd->prot_lbppbe = lun->be_lun->pblockexp & SRC16_LBPPBE;
+	scsi_ulto2b(lun->be_lun->pblockoff & SRC16_LALBA_A, dtsd->lalba_lbp);
+	if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP)
+		dtsd->lalba_lbp[0] |= SRC16_LBPME | SRC16_LBPRZ;
+
 	if (port->target_devid) {
 		targid_len = port->target_devid->len;
 		memcpy(&token->body[120], port->target_devid->data, targid_len);
@@ -1933,6 +1949,8 @@ ctl_populate_token(struct ctl_scsiio *ctsio)
 	token->range = &data->desc[0];
 	token->nrange = scsi_2btoul(data->range_descriptor_length) /
 	    sizeof(struct scsi_range_desc);
+	list->cursectors = tpc_ranges_length(token->range, token->nrange);
+	list->curbytes = (off_t)list->cursectors * lun->be_lun->blocksize;
 	tpc_create_token(lun, port, list->curbytes,
 	    (struct scsi_token *)token->token);
 	token->active = 0;
@@ -1949,8 +1967,6 @@ ctl_populate_token(struct ctl_scsiio *ctsio)
 	}
 	memcpy(list->res_token, token->token, sizeof(list->res_token));
 	list->res_token_valid = 1;
-	list->cursectors = tpc_ranges_length(token->range, token->nrange);
-	list->curbytes = (off_t)list->cursectors * lun->be_lun->blocksize;
 	list->curseg = 0;
 	list->completed = 1;
 	list->last_active = time_uptime;
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 010a4abcd2c0..8eb58fee60bd 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -317,6 +317,7 @@ struct scsi_per_res_cap
 #define	SPRI_ALLOW_2		0x20
 #define	SPRI_ALLOW_3		0x30
 #define	SPRI_ALLOW_4		0x40
+#define	SPRI_ALLOW_5		0x50
 #define	SPRI_PTPL_A		0x01
 	uint8_t type_mask[2];
 #define	SPRI_TM_WR_EX_AR	0x8000
@@ -1030,6 +1031,7 @@ struct scsi_write_same_16
 {
 	uint8_t	opcode;
 	uint8_t	byte2;
+#define	SWS_NDOB	0x01
 	uint8_t	addr[8];
 	uint8_t	length[4];
 	uint8_t	group;
@@ -1608,11 +1610,11 @@ struct scsi_token
 {
 	uint8_t  type[4];
 #define ROD_TYPE_INTERNAL	0x00000000
-#define ROD_TYPE_AUR		0x00001000
-#define ROD_TYPE_PIT_DEF	0x00080000
-#define ROD_TYPE_PIT_VULN	0x00080001
-#define ROD_TYPE_PIT_PERS	0x00080002
-#define ROD_TYPE_PIT_ANY	0x0008FFFF
+#define ROD_TYPE_AUR		0x00010000
+#define ROD_TYPE_PIT_DEF	0x00800000
+#define ROD_TYPE_PIT_VULN	0x00800001
+#define ROD_TYPE_PIT_PERS	0x00800002
+#define ROD_TYPE_PIT_ANY	0x0080FFFF
 #define ROD_TYPE_BLOCK_ZERO	0xFFFF0001
 	uint8_t  reserved[2];
 	uint8_t  length[2];
@@ -2110,6 +2112,76 @@ struct scsi_service_action_in
 	uint8_t control;
 };
 
+struct scsi_vpd_extended_inquiry_data
+{
+	uint8_t device;
+	uint8_t page_code;
+#define	SVPD_EXTENDED_INQUIRY_DATA	0x86
+	uint8_t reserved;
+	uint8_t page_length;
+	uint8_t flags1;
+#define	SVPD_EID_AM		0xC0
+#define	SVPD_EID_SPT		0x38
+#define	SVPD_EID_SPT_1		0x00
+#define	SVPD_EID_SPT_12		0x08
+#define	SVPD_EID_SPT_2		0x10
+#define	SVPD_EID_SPT_13		0x18
+#define	SVPD_EID_SPT_3		0x20
+#define	SVPD_EID_SPT_23		0x28
+#define	SVPD_EID_SPT_123	0x38
+#define	SVPD_EID_GRD_CHK	0x04
+#define	SVPD_EID_APP_CHK	0x02
+#define	SVPD_EID_REF_CHK	0x01
+	uint8_t flags2;
+#define	SVPD_EID_UASK_SUP	0x20
+#define	SVPD_EID_GROUP_SUP	0x10
+#define	SVPD_EID_PRIOR_SUP	0x08
+#define	SVPD_EID_HEADSUP	0x04
+#define	SVPD_EID_ORDSUP		0x02
+#define	SVPD_EID_SIMPSUP	0x01
+	uint8_t flags3;
+#define	SVPD_EID_WU_SUP		0x08
+#define	SVPD_EID_CRD_SUP	0x04
+#define	SVPD_EID_NV_SUP		0x02
+#define	SVPD_EID_V_SUP		0x01
+	uint8_t flags4;
+#define	SVPD_EID_P_I_I_SUP	0x10
+#define	SVPD_EID_LUICLT		0x01
+	uint8_t flags5;
+#define	SVPD_EID_R_SUP		0x10
+#define	SVPD_EID_CBCS		0x01
+	uint8_t flags6;
+#define	SVPD_EID_MULTI_I_T_FW	0x0F
+	uint8_t est[2];
+	uint8_t flags7;
+#define	SVPD_EID_POA_SUP	0x80
+#define	SVPD_EID_HRA_SUP	0x80
+#define	SVPD_EID_VSA_SUP	0x80
+	uint8_t max_sense_length;
+	uint8_t reserved2[50];
+};
+
+struct scsi_vpd_mode_page_policy_descr
+{
+	uint8_t page_code;
+	uint8_t subpage_code;
+	uint8_t policy;
+#define	SVPD_MPP_SHARED		0x00
+#define	SVPD_MPP_PORT		0x01
+#define	SVPD_MPP_I_T		0x03
+#define	SVPD_MPP_MLUS		0x80
+	uint8_t reserved;
+};
+
+struct scsi_vpd_mode_page_policy
+{
+	uint8_t device;
+	uint8_t page_code;
+#define	SVPD_MODE_PAGE_POLICY	0x87
+	uint8_t page_length[2];
+	struct scsi_vpd_mode_page_policy_descr descr[0];
+};
+
 struct scsi_diag_page {
 	uint8_t page_code;
 	uint8_t page_specific_flags;
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index a7a79020e086..3793f315e7fc 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -354,9 +354,9 @@ static struct da_quirk_entry da_quirk_table[] =
 	},
 	{
 		/*
-		 * The STEC 842 sometimes hang on UNMAP.
+		 * The STEC SSDs sometimes hang on UNMAP.
 		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "STEC", "S842E800M2", "*"},
+		{T_DIRECT, SIP_MEDIA_FIXED, "STEC", "*", "*"},
 		/*quirks*/ DA_Q_NO_UNMAP
 	},
 	/* USB mass storage devices supported by umass(4) */
@@ -545,6 +545,13 @@ static struct da_quirk_entry da_quirk_table[] =
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "TOSHIBA", "TransMemory",
 		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
+	{
+		/*
+		 * PNY USB 3.0 Flash Drives
+		*/
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "PNY", "USB 3.0 FD*",
+		"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE | DA_Q_NO_RC16
+	},
 	{
 		/*
 		 * PNY USB Flash keys
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 42b8774fd88a..5677cdde125f 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -1135,6 +1135,7 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 			u_int8_t periph_qual;
 
 			path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID;
+			scsi_find_quirk(path->device);
 			inq_buf = &path->device->inq_data;
 
 			periph_qual = SID_QUAL(inq_buf);
@@ -1163,8 +1164,6 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 					goto out;
 				}
 
-				scsi_find_quirk(path->device);
-
 				scsi_devise_transport(path);
 
 				if (path->device->lun_id == 0 &&
@@ -1192,15 +1191,9 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 				xpt_schedule(periph, priority);
 				goto out;
 			} else if (path->device->lun_id == 0 &&
-			    SID_ANSI_REV(inq_buf) > SCSI_REV_SPC2 &&
+			    SID_ANSI_REV(inq_buf) >= SCSI_REV_SPC2 &&
 			    (SCSI_QUIRK(path->device)->quirks &
 			     CAM_QUIRK_NORPTLUNS) == 0) {
-				if (path->device->flags &
-				    CAM_DEV_UNCONFIGURED) {
-					path->device->flags &=
-					    ~CAM_DEV_UNCONFIGURED;
-					xpt_acquire_device(path->device);
-				}
 				PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS);
 				periph->path->target->rpl_size = 16;
 				xpt_release_ccb(done_ccb);
@@ -1213,10 +1206,13 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 					    : SF_RETRY_UA,
 					    &softc->saved_ccb) == ERESTART) {
 			goto outr;
-		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
-			/* Don't wedge the queue */
-			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
-					 /*run_queue*/TRUE);
+		} else {
+			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
+				/* Don't wedge the queue */
+				xpt_release_devq(done_ccb->ccb_h.path,
+				    /*count*/1, /*run_queue*/TRUE);
+			}
+			path->device->flags &= ~CAM_DEV_INQUIRY_DATA_VALID;
 		}
 		/*
 		 * If we get to this point, we got an error status back
@@ -1308,14 +1304,6 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 					    tlun, 8);
 					CAM_DEBUG(path, CAM_DEBUG_PROBE,
 					    ("lun 0 in position %u\n", idx));
-				} else {
-					/*
-					 * There is no lun 0 in our list. Destroy
-					 * the validity of the inquiry data so we
-					 * bail here and now.
-					 */
-					path->device->flags &=
-					    ~CAM_DEV_INQUIRY_DATA_VALID;
 				}
 			}
 			/*
@@ -1328,7 +1316,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 			probe_purge_old(path, lp, softc->flags);
 			lp = NULL;
 		}
-		if (path->device->flags & CAM_DEV_INQUIRY_DATA_VALID) {
+		if (path->device->flags & CAM_DEV_INQUIRY_DATA_VALID &&
+		    SID_QUAL(&path->device->inq_data) == SID_QUAL_LU_CONNECTED) {
 			struct scsi_inquiry_data *inq_buf;
 			inq_buf = &path->device->inq_data;
 			if (INQ_DATA_TQ_ENABLED(inq_buf))
@@ -1343,6 +1332,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb)
 		if (lp) {
 			free(lp, M_CAMXPT);
 		}
+		PROBE_SET_ACTION(softc, PROBE_INVALID);
+		xpt_release_ccb(done_ccb);
 		break;
 	}
 	case PROBE_MODE_SENSE:
@@ -1975,7 +1966,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 		struct cam_path *path, *oldpath;
 		scsi_scan_bus_info *scan_info;
 		struct cam_et *target;
-		struct cam_ed *device;
+		struct cam_ed *device, *nextdev;
 		int next_target;
 		path_id_t path_id;
 		target_id_t target_id;
@@ -1984,18 +1975,10 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 		oldpath = request_ccb->ccb_h.path;
 
 		status = cam_ccb_status(request_ccb);
-		/* Reuse the same CCB to query if a device was really found */
 		scan_info = (scsi_scan_bus_info *)request_ccb->ccb_h.ppriv_ptr0;
-		xpt_setup_ccb(&request_ccb->ccb_h, request_ccb->ccb_h.path,
-			      request_ccb->ccb_h.pinfo.priority);
-		request_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
-
-
 		path_id = request_ccb->ccb_h.path_id;
 		target_id = request_ccb->ccb_h.target_id;
 		lun_id = request_ccb->ccb_h.target_lun;
-		xpt_action(request_ccb);
-
 		target = request_ccb->ccb_h.path->target;
 		next_target = 1;
 
@@ -2068,56 +2051,39 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 				}
 			}
 		} else {
-		    mtx_unlock(&target->luns_mtx);
-		    if (request_ccb->ccb_h.status != CAM_REQ_CMP) {
-			int phl;
-
-			/*
-			 * If we already probed lun 0 successfully, or
-			 * we have additional configured luns on this
-			 * target that might have "gone away", go onto
-			 * the next lun.
-			 */
-			/*
-			 * We may touch devices that we don't
-			 * hold references too, so ensure they
-			 * don't disappear out from under us.
-			 * The target above is referenced by the
-			 * path in the request ccb.
-			 */
-			phl = 0;
-			device = TAILQ_FIRST(&target->ed_entries);
-			if (device != NULL) {
-				phl = CAN_SRCH_HI_SPARSE(device);
-				if (device->lun_id == 0)
-					device = TAILQ_NEXT(device, links);
-			}
-			if ((lun_id != 0) || (device != NULL)) {
-				if (lun_id < (CAM_SCSI2_MAXLUN-1) || phl) {
-					lun_id++;
-					next_target = 0;
-				}
-			}
-			if (lun_id == request_ccb->ccb_h.target_lun
-			    || lun_id > scan_info->cpi->max_lun)
-				next_target = 1;
-		    } else {
-
+			mtx_unlock(&target->luns_mtx);
 			device = request_ccb->ccb_h.path->device;
-
-			if ((SCSI_QUIRK(device)->quirks &
-			    CAM_QUIRK_NOLUNS) == 0) {
-				/* Try the next lun */
-				if (lun_id < (CAM_SCSI2_MAXLUN-1)
-				  || CAN_SRCH_HI_DENSE(device)) {
-					lun_id++;
-					next_target = 0;
-				}
-			}
-			if (lun_id == request_ccb->ccb_h.target_lun
-			    || lun_id > scan_info->cpi->max_lun)
+			/* Continue sequential LUN scan if: */
+			/*  -- we have more LUNs that need recheck */
+			mtx_lock(&target->bus->eb_mtx);
+			nextdev = device;
+			while ((nextdev = TAILQ_NEXT(nextdev, links)) != NULL)
+				if ((nextdev->flags & CAM_DEV_UNCONFIGURED) == 0)
+					break;
+			mtx_unlock(&target->bus->eb_mtx);
+			if (nextdev != NULL) {
+				next_target = 0;
+			/*  -- stop if CAM_QUIRK_NOLUNS is set. */
+			} else if (SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOLUNS) {
 				next_target = 1;
-		    }
+			/*  -- this LUN is connected and its SCSI version
+			 *     allows more LUNs. */
+			} else if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) {
+				if (lun_id < (CAM_SCSI2_MAXLUN-1) ||
+				    CAN_SRCH_HI_DENSE(device))
+					next_target = 0;
+			/*  -- this LUN is disconnected, its SCSI version
+			 *     allows more LUNs and we guess they may be. */
+			} else if ((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0) {
+				if (lun_id < (CAM_SCSI2_MAXLUN-1) ||
+				    CAN_SRCH_HI_SPARSE(device))
+					next_target = 0;
+			}
+			if (next_target == 0) {
+				lun_id++;
+				if (lun_id > scan_info->cpi->max_lun)
+					next_target = 1;
+			}
 		}
 
 		/*
diff --git a/sys/cddl/boot/zfs/lz4.c b/sys/cddl/boot/zfs/lz4.c
index 78af95942eee..055bd627fd10 100644
--- a/sys/cddl/boot/zfs/lz4.c
+++ b/sys/cddl/boot/zfs/lz4.c
@@ -82,6 +82,17 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int dum
 	 */
 #endif
 
+/*
+ * Unaligned memory access is automatically enabled for "common" CPU,
+ * such as x86. For others CPU, the compiler will be more cautious, and
+ * insert extra code to ensure aligned access is respected. If you know
+ * your target CPU supports unaligned memory access, you may want to
+ * force this option manually to improve performance
+ */
+#if defined(__ARM_FEATURE_UNALIGNED)
+#define	LZ4_FORCE_UNALIGNED_ACCESS 1
+#endif
+
 /*
  * Compiler Options
  */
@@ -113,6 +124,10 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int dum
 #define	S32	int32_t
 #define	U64	uint64_t
 
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack(1)
+#endif
+
 typedef struct _U16_S {
 	U16 v;
 } U16_S;
@@ -123,6 +138,10 @@ typedef struct _U64_S {
 	U64 v;
 } U64_S;
 
+#ifndef LZ4_FORCE_UNALIGNED_ACCESS
+#pragma pack()
+#endif
+
 #define	A64(x)	(((U64_S *)(x))->v)
 #define	A32(x)	(((U32_S *)(x))->v)
 #define	A16(x)	(((U16_S *)(x))->v)
diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h
index 98f54791ae26..5f2e255e7707 100644
--- a/sys/cddl/boot/zfs/zfsimpl.h
+++ b/sys/cddl/boot/zfs/zfsimpl.h
@@ -840,7 +840,7 @@ struct uberblock {
  * Fixed constants.
  */
 #define	DNODE_SHIFT		9	/* 512 bytes */
-#define	DN_MIN_INDBLKSHIFT	10	/* 1k */
+#define	DN_MIN_INDBLKSHIFT	12	/* 4k */
 #define	DN_MAX_INDBLKSHIFT	14	/* 16k */
 #define	DNODE_BLOCK_SHIFT	14	/* 16k */
 #define	DNODE_CORE_SIZE		64	/* 64 bytes for dnode sans blkptrs */
diff --git a/lib/libproc/test/t2-name2map/t2-name2map.c b/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
similarity index 61%
rename from lib/libproc/test/t2-name2map/t2-name2map.c
rename to sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
index 825963d3f504..4d54b53fd4fe 100644
--- a/lib/libproc/test/t2-name2map/t2-name2map.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
@@ -1,46 +1,36 @@
-/*
- * Copyright (c) 2010 The FreeBSD Foundation 
- * All rights reserved. 
- * 
- * This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation. 
- *  
- * 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 AUTHOR 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 AUTHOR 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. 
+/*-
+ * Copyright 2014 The FreeBSD Project.
+ * All rights reserved.
  *
- * $FreeBSD$
+ * This software was developed by Steven Hartland.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
  */
 
-#include <sys/types.h>
-#include <assert.h>
-#include <stdio.h>
-#include <libproc.h>
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
-int
-main(int argc, char *argv[])
-{
-	prmap_t *map = NULL;
-	struct proc_handle *phdl;
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/sdt.h>
 
-	proc_create("./t2-name2map", argv, NULL, NULL, &phdl);
-	map = proc_name2map(phdl, "ld-elf.so.1");
-	assert(map);
-}
+SDT_PROBE_DEFINE1(sdt, , , set__error, "int");
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c b/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
index fd8798d2e16a..aa2661801cd0 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
@@ -126,42 +126,6 @@ kmem_size_init(void *unused __unused)
 }
 SYSINIT(kmem_size_init, SI_SUB_KMEM, SI_ORDER_ANY, kmem_size_init, NULL);
 
-/*
- * The return values from kmem_free_* are only valid once the pagedaemon
- * has been initialised, before then they return 0.
- * 
- * To ensure the returns are valid the caller can use a SYSINIT with
- * subsystem set to SI_SUB_KTHREAD_PAGE and an order of at least
- * SI_ORDER_SECOND.
- */
-u_int
-kmem_free_target(void)
-{
-
-	return (vm_cnt.v_free_target);
-}
-
-u_int
-kmem_free_min(void)
-{
-
-	return (vm_cnt.v_free_min);
-}
-
-u_int
-kmem_free_count(void)
-{
-
-	return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
-}
-
-u_int
-kmem_page_count(void)
-{
-
-	return (vm_cnt.v_page_count);
-}
-
 uint64_t
 kmem_size(void)
 {
@@ -169,13 +133,6 @@ kmem_size(void)
 	return (kmem_size_val);
 }
 
-uint64_t
-kmem_used(void)
-{
-
-	return (vmem_size(kmem_arena, VMEM_ALLOC));
-}
-
 static int
 kmem_std_constructor(void *mem, int size __unused, void *private, int flags)
 {
diff --git a/sys/cddl/compat/opensolaris/sys/kmem.h b/sys/cddl/compat/opensolaris/sys/kmem.h
index 1879ba44a4b3..5616067c1217 100644
--- a/sys/cddl/compat/opensolaris/sys/kmem.h
+++ b/sys/cddl/compat/opensolaris/sys/kmem.h
@@ -66,17 +66,6 @@ typedef struct kmem_cache {
 void *zfs_kmem_alloc(size_t size, int kmflags);
 void zfs_kmem_free(void *buf, size_t size);
 uint64_t kmem_size(void);
-uint64_t kmem_used(void);
-u_int kmem_page_count(void);
-
-/*
- * The return values from kmem_free_* are only valid once the pagedaemon
- * has been initialised, before then they return 0.
- */
-u_int kmem_free_count(void);
-u_int kmem_free_target(void);
-u_int kmem_free_min(void);
-
 kmem_cache_t *kmem_cache_create(char *name, size_t bufsize, size_t align,
     int (*constructor)(void *, void *, int), void (*destructor)(void *, void *),
     void (*reclaim)(void *) __unused, void *private, vmem_t *vmp, int cflags);
@@ -88,6 +77,9 @@ void kmem_reap(void);
 int kmem_debugging(void);
 void *calloc(size_t n, size_t s);
 
+#define	freemem				(vm_cnt.v_free_count + vm_cnt.v_cache_count)
+#define	minfree				vm_cnt.v_free_min
+#define	heap_arena			kmem_arena
 #define	kmem_alloc(size, kmflags)	zfs_kmem_alloc((size), (kmflags))
 #define	kmem_zalloc(size, kmflags)	zfs_kmem_alloc((size), (kmflags) | M_ZERO)
 #define	kmem_free(buf, size)		zfs_kmem_free((buf), (size))
diff --git a/sys/cddl/compat/opensolaris/sys/sdt.h b/sys/cddl/compat/opensolaris/sys/sdt.h
index 6d05ba9d6199..04e4abba88a9 100644
--- a/sys/cddl/compat/opensolaris/sys/sdt.h
+++ b/sys/cddl/compat/opensolaris/sys/sdt.h
@@ -31,6 +31,15 @@
 
 #include_next <sys/sdt.h>
 
-#define	SET_ERROR(err)	(err)
+#ifdef KDTRACE_HOOKS
+SDT_PROBE_DECLARE(sdt, , , set__error);
+
+#define SET_ERROR(err) \
+	((sdt_sdt___set__error->id ? \
+	(*sdt_probe_func)(sdt_sdt___set__error->id, \
+	    (uintptr_t)err, 0, 0, 0, 0) : 0), err)
+#else
+#define SET_ERROR(err) (err)
+#endif
 
 #endif	/* _OPENSOLARIS_SYS_SDT_H_ */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
index 4ae881198372..3eced1aea686 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
@@ -138,6 +138,7 @@
 #include <sys/sdt.h>
 
 #include <vm/vm_pageout.h>
+#include <machine/vmparam.h>
 
 #ifdef illumos
 #ifndef _KERNEL
@@ -201,7 +202,7 @@ int zfs_arc_shrink_shift = 0;
 int zfs_arc_p_min_shift = 0;
 int zfs_disable_dup_eviction = 0;
 uint64_t zfs_arc_average_blocksize = 8 * 1024; /* 8KB */
-u_int zfs_arc_free_target = (1 << 19); /* default before pagedaemon init only */
+u_int zfs_arc_free_target = 0;
 
 static int sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDLER_ARGS);
 
@@ -210,11 +211,10 @@ static void
 arc_free_target_init(void *unused __unused)
 {
 
-	zfs_arc_free_target = kmem_free_target();
+	zfs_arc_free_target = vm_pageout_wakeup_thresh;
 }
 SYSINIT(arc_free_target_init, SI_SUB_KTHREAD_PAGE, SI_ORDER_ANY,
     arc_free_target_init, NULL);
-#endif
 
 TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit);
 SYSCTL_DECL(_vfs_zfs);
@@ -245,15 +245,16 @@ sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDLER_ARGS)
 	if (err != 0 || req->newptr == NULL)
 		return (err);
 
-	if (val < kmem_free_min())
+	if (val < minfree)
 		return (EINVAL);
-	if (val > kmem_page_count())
+	if (val > vm_cnt.v_page_count)
 		return (EINVAL);
 
 	zfs_arc_free_target = val;
 
 	return (0);
 }
+#endif
 
 /*
  * Note that buffers can be in one of 6 states:
@@ -1503,23 +1504,6 @@ arc_space_return(uint64_t space, arc_space_type_t type)
 	atomic_add_64(&arc_size, -space);
 }
 
-void *
-arc_data_buf_alloc(uint64_t size)
-{
-	if (arc_evict_needed(ARC_BUFC_DATA))
-		cv_signal(&arc_reclaim_thr_cv);
-	atomic_add_64(&arc_size, size);
-	return (zio_data_buf_alloc(size));
-}
-
-void
-arc_data_buf_free(void *buf, uint64_t size)
-{
-	zio_data_buf_free(buf, size);
-	ASSERT(arc_size >= size);
-	atomic_add_64(&arc_size, -size);
-}
-
 arc_buf_t *
 arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type)
 {
@@ -2462,8 +2446,8 @@ arc_shrink(void)
 	if (arc_c > arc_c_min) {
 		uint64_t to_free;
 
-		DTRACE_PROBE2(arc__shrink, uint64_t, arc_c, uint64_t,
-			arc_c_min);
+		DTRACE_PROBE4(arc__shrink, uint64_t, arc_c, uint64_t,
+			arc_c_min, uint64_t, arc_p, uint64_t, to_free);
 #ifdef _KERNEL
 		to_free = arc_c >> arc_shrink_shift;
 #else
@@ -2479,6 +2463,10 @@ arc_shrink(void)
 			arc_c = MAX(arc_size, arc_c_min);
 		if (arc_p > arc_c)
 			arc_p = (arc_c >> 1);
+
+		DTRACE_PROBE2(arc__shrunk, uint64_t, arc_c, uint64_t,
+			arc_p);
+
 		ASSERT(arc_c >= arc_c_min);
 		ASSERT((int64_t)arc_p >= 0);
 	}
@@ -2503,18 +2491,13 @@ arc_reclaim_needed(void)
 		return (1);
 	}
 
-	if (kmem_free_count() < zfs_arc_free_target) {
-		DTRACE_PROBE2(arc__reclaim_freetarget, uint64_t,
-		    kmem_free_count(), uint64_t, zfs_arc_free_target);
-		return (1);
-	}
-
 	/*
 	 * Cooperate with pagedaemon when it's time for it to scan
 	 * and reclaim some pages.
 	 */
-	if (vm_paging_needed()) {
-		DTRACE_PROBE(arc__reclaim_paging);
+	if (freemem < zfs_arc_free_target) {
+		DTRACE_PROBE2(arc__reclaim_freemem, uint64_t,
+		    freemem, uint64_t, zfs_arc_free_target);
 		return (1);
 	}
 
@@ -2544,7 +2527,18 @@ arc_reclaim_needed(void)
 	if (availrmem < swapfs_minfree + swapfs_reserve + extra)
 		return (1);
 
-#if defined(__i386)
+	/*
+	 * Check that we have enough availrmem that memory locking (e.g., via
+	 * mlock(3C) or memcntl(2)) can still succeed.  (pages_pp_maximum
+	 * stores the number of pages that cannot be locked; when availrmem
+	 * drops below pages_pp_maximum, page locking mechanisms such as
+	 * page_pp_lock() will fail.)
+	 */
+	if (availrmem <= pages_pp_maximum)
+		return (1);
+
+#endif	/* sun */
+#if defined(__i386) || !defined(UMA_MD_SMALL_ALLOC)
 	/*
 	 * If we're on an i386 platform, it's possible that we'll exhaust the
 	 * kernel heap space before we ever run out of available physical
@@ -2556,25 +2550,33 @@ arc_reclaim_needed(void)
 	 * heap is allocated.  (Or, in the calculation, if less than 1/4th is
 	 * free)
 	 */
-	if (btop(vmem_size(heap_arena, VMEM_FREE)) <
-	    (btop(vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC)) >> 2))
-		return (1);
-#endif
-#else	/* sun */
-#ifdef __i386__
-	/* i386 has KVA limits that the raw page counts above don't consider */
-	if (kmem_used() > (kmem_size() * 3) / 4) {
+	if (vmem_size(heap_arena, VMEM_FREE) <
+	    (vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC) >> 2)) {
 		DTRACE_PROBE2(arc__reclaim_used, uint64_t,
-		    kmem_used(), uint64_t, (kmem_size() * 3) / 4);
+		    vmem_size(heap_arena, VMEM_FREE), uint64_t,
+		    (vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC)) >> 2);
 		return (1);
 	}
 #endif
+#ifdef sun
+	/*
+	 * If zio data pages are being allocated out of a separate heap segment,
+	 * then enforce that the size of available vmem for this arena remains
+	 * above about 1/16th free.
+	 *
+	 * Note: The 1/16th arena free requirement was put in place
+	 * to aggressively evict memory from the arc in order to avoid
+	 * memory fragmentation issues.
+	 */
+	if (zio_arena != NULL &&
+	    vmem_size(zio_arena, VMEM_FREE) <
+	    (vmem_size(zio_arena, VMEM_ALLOC) >> 4))
+		return (1);
 #endif	/* sun */
-
-#else
+#else	/* _KERNEL */
 	if (spa_get_random(100) == 0)
 		return (1);
-#endif
+#endif	/* _KERNEL */
 	DTRACE_PROBE(arc__reclaim_no);
 
 	return (0);
@@ -2583,13 +2585,15 @@ arc_reclaim_needed(void)
 extern kmem_cache_t	*zio_buf_cache[];
 extern kmem_cache_t	*zio_data_buf_cache[];
 
-static void
+static void __noinline
 arc_kmem_reap_now(arc_reclaim_strategy_t strat)
 {
 	size_t			i;
 	kmem_cache_t		*prev_cache = NULL;
 	kmem_cache_t		*prev_data_cache = NULL;
+	extern kmem_cache_t	*range_seg_cache;
 
+	DTRACE_PROBE(arc__kmem_reap_start);
 #ifdef _KERNEL
 	if (arc_meta_used >= arc_meta_limit) {
 		/*
@@ -2625,6 +2629,17 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat)
 	}
 	kmem_cache_reap_now(buf_cache);
 	kmem_cache_reap_now(hdr_cache);
+	kmem_cache_reap_now(range_seg_cache);
+
+#ifdef sun
+	/*
+	 * Ask the vmem arena to reclaim unused memory from its
+	 * quantum caches.
+	 */
+	if (zio_arena != NULL && strat == ARC_RECLAIM_AGGR)
+		vmem_qcache_reap(zio_arena);
+#endif
+	DTRACE_PROBE(arc__kmem_reap_end);
 }
 
 static void
@@ -2642,6 +2657,7 @@ arc_reclaim_thread(void *dummy __unused)
 
 			if (arc_no_grow) {
 				if (last_reclaim == ARC_RECLAIM_CONS) {
+					DTRACE_PROBE(arc__reclaim_aggr_no_grow);
 					last_reclaim = ARC_RECLAIM_AGGR;
 				} else {
 					last_reclaim = ARC_RECLAIM_CONS;
@@ -2649,6 +2665,7 @@ arc_reclaim_thread(void *dummy __unused)
 			} else {
 				arc_no_grow = TRUE;
 				last_reclaim = ARC_RECLAIM_AGGR;
+				DTRACE_PROBE(arc__reclaim_aggr);
 				membar_producer();
 			}
 
@@ -2753,6 +2770,7 @@ arc_adapt(int bytes, arc_state_t *state)
 	 * cache size, increment the target cache size
 	 */
 	if (arc_size > arc_c - (2ULL << SPA_MAXBLOCKSHIFT)) {
+		DTRACE_PROBE1(arc__inc_adapt, int, bytes);
 		atomic_add_64(&arc_c, (int64_t)bytes);
 		if (arc_c > arc_c_max)
 			arc_c = arc_c_max;
@@ -2774,20 +2792,6 @@ arc_evict_needed(arc_buf_contents_t type)
 	if (type == ARC_BUFC_METADATA && arc_meta_used >= arc_meta_limit)
 		return (1);
 
-#ifdef sun
-#ifdef _KERNEL
-	/*
-	 * If zio data pages are being allocated out of a separate heap segment,
-	 * then enforce that the size of available vmem for this area remains
-	 * above about 1/32nd free.
-	 */
-	if (type == ARC_BUFC_DATA && zio_arena != NULL &&
-	    vmem_size(zio_arena, VMEM_FREE) <
-	    (vmem_size(zio_arena, VMEM_ALLOC) >> 5))
-		return (1);
-#endif
-#endif	/* sun */
-
 	if (arc_reclaim_needed())
 		return (1);
 
@@ -3946,20 +3950,16 @@ static int
 arc_memory_throttle(uint64_t reserve, uint64_t txg)
 {
 #ifdef _KERNEL
-	uint64_t available_memory =
-	    ptoa((uintmax_t)vm_cnt.v_free_count + vm_cnt.v_cache_count);
+	uint64_t available_memory = ptob(freemem);
 	static uint64_t page_load = 0;
 	static uint64_t last_txg = 0;
 
-#ifdef sun
-#if defined(__i386)
+#if defined(__i386) || !defined(UMA_MD_SMALL_ALLOC)
 	available_memory =
-	    MIN(available_memory, vmem_size(heap_arena, VMEM_FREE));
+	    MIN(available_memory, ptob(vmem_size(heap_arena, VMEM_FREE)));
 #endif
-#endif	/* sun */
 
-	if (vm_cnt.v_free_count + vm_cnt.v_cache_count >
-	    (uint64_t)physmem * arc_lotsfree_percent / 100)
+	if (freemem > (uint64_t)physmem * arc_lotsfree_percent / 100)
 		return (0);
 
 	if (txg > last_txg) {
@@ -3972,7 +3972,7 @@ arc_memory_throttle(uint64_t reserve, uint64_t txg)
 	 * continue to let page writes occur as quickly as possible.
 	 */
 	if (curproc == pageproc) {
-		if (page_load > available_memory / 4)
+		if (page_load > MAX(ptob(minfree), available_memory) / 4)
 			return (SET_ERROR(ERESTART));
 		/* Note: reserve is inflated, so we deflate */
 		page_load += reserve / 8;
@@ -4000,8 +4000,10 @@ arc_tempreserve_space(uint64_t reserve, uint64_t txg)
 	int error;
 	uint64_t anon_size;
 
-	if (reserve > arc_c/4 && !arc_no_grow)
+	if (reserve > arc_c/4 && !arc_no_grow) {
 		arc_c = MIN(arc_c_max, reserve * 4);
+		DTRACE_PROBE1(arc__set_reserve, uint64_t, arc_c);
+	}
 	if (reserve > arc_c)
 		return (SET_ERROR(ENOMEM));
 
@@ -4055,6 +4057,7 @@ arc_lowmem(void *arg __unused, int howto __unused)
 	mutex_enter(&arc_lowmem_lock);
 	mutex_enter(&arc_reclaim_thr_lock);
 	needfree = 1;
+	DTRACE_PROBE(arc__needfree);
 	cv_signal(&arc_reclaim_thr_cv);
 
 	/*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
index e75ae72f9e9c..b19df1af3967 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
@@ -301,8 +301,10 @@ bpobj_iterate_impl(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx,
 		if (free) {
 			err = bpobj_space(&sublist,
 			    &used_before, &comp_before, &uncomp_before);
-			if (err)
+			if (err != 0) {
+				bpobj_close(&sublist);
 				break;
+			}
 		}
 		err = bpobj_iterate_impl(&sublist, func, arg, tx, free);
 		if (free) {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
index 9102322cb2d2..c9ea6c02a13e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
@@ -671,6 +671,8 @@ dbuf_read(dmu_buf_impl_t *db, zio_t *zio, uint32_t flags)
 			    db->db_state == DB_FILL) {
 				ASSERT(db->db_state == DB_READ ||
 				    (flags & DB_RF_HAVESTRUCT) == 0);
+				DTRACE_PROBE2(blocked__read, dmu_buf_impl_t *,
+				    db, zio_t *, zio);
 				cv_wait(&db->db_changed, &db->db_mtx);
 			}
 			if (db->db_state == DB_UNCACHED)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
index 55bf895aa883..0b19e76343f0 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
@@ -1948,6 +1948,15 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset,
 		    flags, offset, lvl, blkfill, txg);
 	}
 
+	/*
+	 * There's always a "virtual hole" at the end of the object, even
+	 * if all BP's which physically exist are non-holes.
+	 */
+	if ((flags & DNODE_FIND_HOLE) && error == ESRCH && txg == 0 &&
+	    minlvl == 1 && blkfill == 1 && !(flags & DNODE_FIND_BACKWARDS)) {
+		error = 0;
+	}
+
 	if (error == 0 && (flags & DNODE_FIND_BACKWARDS ?
 	    initial_offset < *offset : initial_offset > *offset))
 		error = SET_ERROR(ESRCH);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
index ff666b212d5e..2a57aee904fd 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
@@ -684,6 +684,11 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 		return;
 	}
 
+	if (dn->dn_next_nlevels[txgoff]) {
+		dnode_increase_indirection(dn, tx);
+		dn->dn_next_nlevels[txgoff] = 0;
+	}
+
 	if (dn->dn_next_nblkptr[txgoff]) {
 		/* this should only happen on a realloc */
 		ASSERT(dn->dn_allocated_txg == tx->tx_txg);
@@ -708,11 +713,6 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 		mutex_exit(&dn->dn_mtx);
 	}
 
-	if (dn->dn_next_nlevels[txgoff]) {
-		dnode_increase_indirection(dn, tx);
-		dn->dn_next_nlevels[txgoff] = 0;
-	}
-
 	dbuf_sync_list(list, tx);
 
 	if (!DMU_OBJECT_IS_SPECIAL(dn->dn_object)) {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
index a97a10a48621..d013206f11ab 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
@@ -2257,6 +2257,9 @@ dsl_dataset_promote_sync(void *arg, dmu_tx_t *tx)
 	dsl_dir_t *odd = NULL;
 	uint64_t oldnext_obj;
 	int64_t delta;
+#if defined(__FreeBSD__) && defined(_KERNEL)
+	char *oldname, *newname;
+#endif
 
 	VERIFY0(promote_hold(ddpa, dp, FTAG));
 	hds = ddpa->ddpa_clone;
@@ -2322,6 +2325,14 @@ dsl_dataset_promote_sync(void *arg, dmu_tx_t *tx)
 		    dd->dd_phys->dd_clones, origin_head->ds_object, tx));
 	}
 
+#if defined(__FreeBSD__) && defined(_KERNEL)
+	/* Take the spa_namespace_lock early so zvol renames don't deadlock. */
+	mutex_enter(&spa_namespace_lock);
+
+	oldname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
+	newname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
+#endif
+
 	/* move snapshots to this dir */
 	for (snap = list_head(&ddpa->shared_snaps); snap;
 	    snap = list_next(&ddpa->shared_snaps, snap)) {
@@ -2356,6 +2367,12 @@ dsl_dataset_promote_sync(void *arg, dmu_tx_t *tx)
 		VERIFY0(dsl_dir_hold_obj(dp, dd->dd_object,
 		    NULL, ds, &ds->ds_dir));
 
+#if defined(__FreeBSD__) && defined(_KERNEL)
+		dsl_dataset_name(ds, newname);
+		zfsvfs_update_fromname(oldname, newname);
+		zvol_rename_minors(oldname, newname);
+#endif
+
 		/* move any clone references */
 		if (ds->ds_phys->ds_next_clones_obj &&
 		    spa_version(dp->dp_spa) >= SPA_VERSION_DIR_CLONES) {
@@ -2393,6 +2410,12 @@ dsl_dataset_promote_sync(void *arg, dmu_tx_t *tx)
 		ASSERT(!dsl_prop_hascb(ds));
 	}
 
+#if defined(__FreeBSD__) && defined(_KERNEL)
+	mutex_exit(&spa_namespace_lock);
+
+	kmem_free(newname, MAXPATHLEN);
+	kmem_free(oldname, MAXPATHLEN);
+#endif
 	/*
 	 * Change space accounting.
 	 * Note, pa->*usedsnap and dd_used_breakdown[SNAP] will either
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
index ae2420b23963..53371e642294 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
@@ -116,8 +116,8 @@ int zfs_delay_min_dirty_percent = 60;
 
 /*
  * This controls how quickly the delay approaches infinity.
- * Larger values cause it to delay less for a given amount of dirty data.
- * Therefore larger values will cause there to be more dirty data for a
+ * Larger values cause it to delay more for a given amount of dirty data.
+ * Therefore larger values will cause there to be less dirty data for a
  * given throughput.
  *
  * For the smoothest delay, this value should be about 1 billion divided
@@ -130,11 +130,6 @@ int zfs_delay_min_dirty_percent = 60;
 uint64_t zfs_delay_scale = 1000 * 1000 * 1000 / 2000;
 
 
-/*
- * XXX someday maybe turn these into #defines, and you have to tune it on a
- * per-pool basis using zfs.conf.
- */
-
 #ifdef __FreeBSD__
 
 extern int zfs_vdev_async_write_active_max_dirty_percent;
@@ -150,8 +145,10 @@ SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_max_max, CTLFLAG_RDTUN,
     &zfs_dirty_data_max_max, 0,
     "The absolute cap on dirty_data_max when auto calculating");
 
-SYSCTL_INT(_vfs_zfs, OID_AUTO, dirty_data_max_percent, CTLFLAG_RDTUN,
-    &zfs_dirty_data_max_percent, 0,
+static int sysctl_zfs_dirty_data_max_percent(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, dirty_data_max_percent,
+    CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RWTUN, 0, sizeof(int),
+    sysctl_zfs_dirty_data_max_percent, "I",
     "The percent of physical memory used to auto calculate dirty_data_max");
 
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_sync, CTLFLAG_RWTUN,
@@ -172,6 +169,24 @@ SYSCTL_PROC(_vfs_zfs, OID_AUTO, delay_scale,
     sysctl_zfs_delay_scale, "QU",
     "Controls how quickly the delay approaches infinity");
 
+static int
+sysctl_zfs_dirty_data_max_percent(SYSCTL_HANDLER_ARGS)
+{
+	int val, err;
+
+	val = zfs_dirty_data_max_percent;
+	err = sysctl_handle_int(oidp, &val, 0, req);
+	if (err != 0 || req->newptr == NULL)
+		return (err);
+
+	if (val < 0 || val > 100)
+		return (EINVAL);
+
+	zfs_dirty_data_max_percent = val;
+
+	return (0);
+}
+
 static int
 sysctl_zfs_delay_min_dirty_percent(SYSCTL_HANDLER_ARGS)
 {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
index daf87eee8ca4..03dc7028864f 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
@@ -90,6 +90,11 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, no_scrub_prefetch, CTLFLAG_RWTUN,
     &zfs_no_scrub_prefetch, 0, "Disable scrub prefetching");
 
 enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE;
+/* max number of blocks to free in a single TXG */
+uint64_t zfs_free_max_blocks = UINT64_MAX;
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, free_max_blocks, CTLFLAG_RWTUN,
+    &zfs_free_max_blocks, 0, "Maximum number of blocks to free in one TXG");
+
 
 #define	DSL_SCAN_IS_SCRUB_RESILVER(scn) \
 	((scn)->scn_phys.scn_func == POOL_SCAN_SCRUB || \
@@ -1341,6 +1346,9 @@ dsl_scan_free_should_pause(dsl_scan_t *scn)
 	if (zfs_recover)
 		return (B_FALSE);
 
+	if (scn->scn_visited_this_txg >= zfs_free_max_blocks)
+		return (B_TRUE);
+
 	elapsed_nanosecs = gethrtime() - scn->scn_sync_start_time;
 	return (elapsed_nanosecs / NANOSEC > zfs_txg_timeout ||
 	    (NSEC2MSEC(elapsed_nanosecs) > zfs_free_min_time_ms &&
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
index 370556fcfb75..c2bcbfd0ccc7 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
@@ -75,7 +75,7 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_pct, CTLFLAG_RWTUN,
 /*
  * Condensing a metaslab is not guaranteed to actually reduce the amount of
  * space used on disk. In particular, a space map uses data in increments of
- * MAX(1 << ashift, SPACE_MAP_INITIAL_BLOCKSIZE), so a metaslab might use the
+ * MAX(1 << ashift, space_map_blksize), so a metaslab might use the
  * same number of blocks after condensing. Since the goal of condensing is to
  * reduce the number of IOPs required to read the space map, we only want to
  * condense when we can be sure we will reduce the number of blocks used by the
@@ -1470,10 +1470,12 @@ metaslab_fragmentation(metaslab_t *msp)
 		uint64_t txg = spa_syncing_txg(spa);
 		vdev_t *vd = msp->ms_group->mg_vd;
 
-		msp->ms_condense_wanted = B_TRUE;
-		vdev_dirty(vd, VDD_METASLAB, msp, txg + 1);
-		spa_dbgmsg(spa, "txg %llu, requesting force condense: "
-		    "msp %p, vd %p", txg, msp, vd);
+		if (spa_writeable(spa)) {
+			msp->ms_condense_wanted = B_TRUE;
+			vdev_dirty(vd, VDD_METASLAB, msp, txg + 1);
+			spa_dbgmsg(spa, "txg %llu, requesting force condense: "
+			    "msp %p, vd %p", txg, msp, vd);
+		}
 		return (ZFS_FRAG_INVALID);
 	}
 
@@ -1917,6 +1919,15 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 
 	mutex_enter(&msp->ms_lock);
 
+	/*
+	 * Note: metaslab_condense() clears the space_map's histogram.
+	 * Therefore we must verify and remove this histogram before
+	 * condensing.
+	 */
+	metaslab_group_histogram_verify(mg);
+	metaslab_class_histogram_verify(mg->mg_class);
+	metaslab_group_histogram_remove(mg, msp);
+
 	if (msp->ms_loaded && spa_sync_pass(spa) == 1 &&
 	    metaslab_should_condense(msp)) {
 		metaslab_condense(msp, txg, tx);
@@ -1925,9 +1936,6 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 		space_map_write(msp->ms_sm, *freetree, SM_FREE, tx);
 	}
 
-	metaslab_group_histogram_verify(mg);
-	metaslab_class_histogram_verify(mg->mg_class);
-	metaslab_group_histogram_remove(mg, msp);
 	if (msp->ms_loaded) {
 		/*
 		 * When the space map is loaded, we have an accruate
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
index 22175e06ab30..6422fd1c1fa6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
@@ -33,7 +33,7 @@
 #include <sys/zio.h>
 #include <sys/range_tree.h>
 
-static kmem_cache_t *range_seg_cache;
+kmem_cache_t *range_seg_cache;
 
 void
 range_tree_init(void)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
index 7d218964270a..0100206645f9 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
@@ -83,16 +83,20 @@
 /* Check hostid on import? */
 static int check_hostid = 1;
 
-SYSCTL_DECL(_vfs_zfs);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RWTUN, &check_hostid, 0,
-    "Check hostid on import?");
-
 /*
  * The interval, in seconds, at which failed configuration cache file writes
  * should be retried.
  */
 static int zfs_ccw_retry_interval = 300;
 
+SYSCTL_DECL(_vfs_zfs);
+SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RWTUN, &check_hostid, 0,
+    "Check hostid on import?");
+TUNABLE_INT("vfs.zfs.ccw_retry_interval", &zfs_ccw_retry_interval);
+SYSCTL_INT(_vfs_zfs, OID_AUTO, ccw_retry_interval, CTLFLAG_RW,
+    &zfs_ccw_retry_interval, 0,
+    "Configuration cache file write, retry after failure, interval (seconds)");
+
 typedef enum zti_modes {
 	ZTI_MODE_FIXED,			/* value is # of threads (min 1) */
 	ZTI_MODE_BATCH,			/* cpu-intensive; value is ignored */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
index 2ab28473be41..c3a42d026b60 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
@@ -243,9 +243,6 @@ int zfs_flags = ~(ZFS_DEBUG_DPRINTF | ZFS_DEBUG_SPA);
 #else
 int zfs_flags = 0;
 #endif
-SYSCTL_DECL(_debug);
-SYSCTL_INT(_debug, OID_AUTO, zfs_flags, CTLFLAG_RWTUN, &zfs_flags, 0,
-    "ZFS debug flags.");
 
 /*
  * zfs_recover can be set to nonzero to attempt to recover from
@@ -259,6 +256,32 @@ SYSCTL_DECL(_vfs_zfs);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, recover, CTLFLAG_RDTUN, &zfs_recover, 0,
     "Try to recover from otherwise-fatal errors.");
 
+static int
+sysctl_vfs_zfs_debug_flags(SYSCTL_HANDLER_ARGS)
+{
+	int err, val;
+
+	val = zfs_flags;
+	err = sysctl_handle_int(oidp, &val, 0, req);
+	if (err != 0 || req->newptr == NULL)
+		return (err);
+
+	/*
+	 * ZFS_DEBUG_MODIFY must be enabled prior to boot so all
+	 * arc buffers in the system have the necessary additional
+	 * checksum data.  However, it is safe to disable at any
+	 * time.
+	 */
+	if (!(zfs_flags & ZFS_DEBUG_MODIFY))
+		val &= ~ZFS_DEBUG_MODIFY;
+	zfs_flags = val;
+
+	return (0);
+}
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, debug_flags,
+    CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RWTUN, 0, sizeof(int),
+    sysctl_vfs_zfs_debug_flags, "IU", "Debug flags for ZFS testing.");
+
 /*
  * If destroy encounters an EIO while reading metadata (e.g. indirect
  * blocks), space referenced by the missing metadata can not be freed.
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
index d158b246d8c2..94790b9eaee5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
@@ -38,15 +38,12 @@
 #include <sys/zfeature.h>
 
 /*
- * This value controls how the space map's block size is allowed to grow.
- * If the value is set to the same size as SPACE_MAP_INITIAL_BLOCKSIZE then
- * the space map block size will remain fixed. Setting this value to something
- * greater than SPACE_MAP_INITIAL_BLOCKSIZE will allow the space map to
- * increase its block size as needed. To maintain backwards compatibilty the
- * space map's block size must be a power of 2 and SPACE_MAP_INITIAL_BLOCKSIZE
- * or larger.
+ * The data for a given space map can be kept on blocks of any size.
+ * Larger blocks entail fewer i/o operations, but they also cause the
+ * DMU to keep more data in-core, and also to waste more i/o bandwidth
+ * when only a few blocks have changed since the last transaction group.
  */
-int space_map_max_blksz = (1 << 12);
+int space_map_blksz = (1 << 12);
 
 /*
  * Load the space map disk into the specified range tree. Segments of maptype
@@ -233,58 +230,6 @@ space_map_entries(space_map_t *sm, range_tree_t *rt)
 	return (entries);
 }
 
-void
-space_map_set_blocksize(space_map_t *sm, uint64_t size, dmu_tx_t *tx)
-{
-	uint32_t blksz;
-	u_longlong_t blocks;
-
-	ASSERT3U(sm->sm_blksz, !=, 0);
-	ASSERT3U(space_map_object(sm), !=, 0);
-	ASSERT(sm->sm_dbuf != NULL);
-	VERIFY(ISP2(space_map_max_blksz));
-
-	if (sm->sm_blksz >= space_map_max_blksz)
-		return;
-
-	/*
-	 * The object contains more than one block so we can't adjust
-	 * its size.
-	 */
-	if (sm->sm_phys->smp_objsize > sm->sm_blksz)
-		return;
-
-	if (size > sm->sm_blksz) {
-		uint64_t newsz;
-
-		/*
-		 * Older software versions treat space map blocks as fixed
-		 * entities. The DMU is capable of handling different block
-		 * sizes making it possible for us to increase the
-		 * block size and maintain backwards compatibility. The
-		 * caveat is that the new block sizes must be a
-		 * power of 2 so that old software can append to the file,
-		 * adding more blocks. The block size can grow until it
-		 * reaches space_map_max_blksz.
-		 */
-		newsz = ISP2(size) ? size : 1ULL << highbit64(size);
-		if (newsz > space_map_max_blksz)
-			newsz = space_map_max_blksz;
-
-		VERIFY0(dmu_object_set_blocksize(sm->sm_os,
-		    space_map_object(sm), newsz, 0, tx));
-		dmu_object_size_from_db(sm->sm_dbuf, &blksz, &blocks);
-
-		zfs_dbgmsg("txg %llu, spa %s, increasing blksz from %d to %d",
-		    dmu_tx_get_txg(tx), spa_name(dmu_objset_spa(sm->sm_os)),
-		    sm->sm_blksz, blksz);
-
-		VERIFY3U(newsz, ==, blksz);
-		VERIFY3U(sm->sm_blksz, <, blksz);
-		sm->sm_blksz = blksz;
-	}
-}
-
 /*
  * Note: space_map_write() will drop sm_lock across dmu_write() calls.
  */
@@ -298,7 +243,7 @@ space_map_write(space_map_t *sm, range_tree_t *rt, maptype_t maptype,
 	range_seg_t *rs;
 	uint64_t size, total, rt_space, nodes;
 	uint64_t *entry, *entry_map, *entry_map_end;
-	uint64_t newsz, expected_entries, actual_entries = 1;
+	uint64_t expected_entries, actual_entries = 1;
 
 	ASSERT(MUTEX_HELD(rt->rt_lock));
 	ASSERT(dsl_pool_sync_context(dmu_objset_pool(os)));
@@ -324,13 +269,6 @@ space_map_write(space_map_t *sm, range_tree_t *rt, maptype_t maptype,
 
 	expected_entries = space_map_entries(sm, rt);
 
-	/*
-	 * Calculate the new size for the space map on-disk and see if
-	 * we can grow the block size to accommodate the new size.
-	 */
-	newsz = sm->sm_phys->smp_objsize + expected_entries * sizeof (uint64_t);
-	space_map_set_blocksize(sm, newsz, tx);
-
 	entry_map = zio_buf_alloc(sm->sm_blksz);
 	entry_map_end = entry_map + (sm->sm_blksz / sizeof (uint64_t));
 	entry = entry_map;
@@ -457,46 +395,48 @@ space_map_close(space_map_t *sm)
 	kmem_free(sm, sizeof (*sm));
 }
 
-static void
-space_map_reallocate(space_map_t *sm, dmu_tx_t *tx)
-{
-	ASSERT(dmu_tx_is_syncing(tx));
-
-	space_map_free(sm, tx);
-	dmu_buf_rele(sm->sm_dbuf, sm);
-
-	sm->sm_object = space_map_alloc(sm->sm_os, tx);
-	VERIFY0(space_map_open_impl(sm));
-}
-
 void
 space_map_truncate(space_map_t *sm, dmu_tx_t *tx)
 {
 	objset_t *os = sm->sm_os;
 	spa_t *spa = dmu_objset_spa(os);
 	dmu_object_info_t doi;
-	int bonuslen;
 
 	ASSERT(dsl_pool_sync_context(dmu_objset_pool(os)));
 	ASSERT(dmu_tx_is_syncing(tx));
 
-	VERIFY0(dmu_free_range(os, space_map_object(sm), 0, -1ULL, tx));
 	dmu_object_info_from_db(sm->sm_dbuf, &doi);
 
-	if (spa_feature_is_enabled(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) {
-		bonuslen = sizeof (space_map_phys_t);
-		ASSERT3U(bonuslen, <=, dmu_bonus_max());
-	} else {
-		bonuslen = SPACE_MAP_SIZE_V0;
-	}
-
-	if (bonuslen != doi.doi_bonus_size ||
-	    doi.doi_data_block_size != SPACE_MAP_INITIAL_BLOCKSIZE) {
+	/*
+	 * If the space map has the wrong bonus size (because
+	 * SPA_FEATURE_SPACEMAP_HISTOGRAM has recently been enabled), or
+	 * the wrong block size (because space_map_blksz has changed),
+	 * free and re-allocate its object with the updated sizes.
+	 *
+	 * Otherwise, just truncate the current object.
+	 */
+	if ((spa_feature_is_enabled(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM) &&
+	    doi.doi_bonus_size != sizeof (space_map_phys_t)) ||
+	    doi.doi_data_block_size != space_map_blksz) {
 		zfs_dbgmsg("txg %llu, spa %s, reallocating: "
 		    "old bonus %u, old blocksz %u", dmu_tx_get_txg(tx),
 		    spa_name(spa), doi.doi_bonus_size, doi.doi_data_block_size);
-		space_map_reallocate(sm, tx);
-		VERIFY3U(sm->sm_blksz, ==, SPACE_MAP_INITIAL_BLOCKSIZE);
+
+		space_map_free(sm, tx);
+		dmu_buf_rele(sm->sm_dbuf, sm);
+
+		sm->sm_object = space_map_alloc(sm->sm_os, tx);
+		VERIFY0(space_map_open_impl(sm));
+	} else {
+		VERIFY0(dmu_free_range(os, space_map_object(sm), 0, -1ULL, tx));
+
+		/*
+		 * If the spacemap is reallocated, its histogram
+		 * will be reset.  Do the same in the common case so that
+		 * bugs related to the uncommon case do not go unnoticed.
+		 */
+		bzero(sm->sm_phys->smp_histogram,
+		    sizeof (sm->sm_phys->smp_histogram));
 	}
 
 	dmu_buf_will_dirty(sm->sm_dbuf, tx);
@@ -535,7 +475,7 @@ space_map_alloc(objset_t *os, dmu_tx_t *tx)
 	}
 
 	object = dmu_object_alloc(os,
-	    DMU_OT_SPACE_MAP, SPACE_MAP_INITIAL_BLOCKSIZE,
+	    DMU_OT_SPACE_MAP, space_map_blksz,
 	    DMU_OT_SPACE_MAP_HEADER, bonuslen, tx);
 
 	return (object);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
index 8bf07c3ec8c2..9065a22afd4e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
@@ -83,8 +83,6 @@ typedef enum arc_space_type {
 
 void arc_space_consume(uint64_t space, arc_space_type_t type);
 void arc_space_return(uint64_t space, arc_space_type_t type);
-void *arc_data_buf_alloc(uint64_t space);
-void arc_data_buf_free(void *buf, uint64_t space);
 arc_buf_t *arc_buf_alloc(spa_t *spa, int size, void *tag,
     arc_buf_contents_t type);
 arc_buf_t *arc_loan_buf(spa_t *spa, int size);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
index 8a4f3f6185e3..5668af1fef08 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
@@ -56,7 +56,7 @@ extern "C" {
  * Fixed constants.
  */
 #define	DNODE_SHIFT		9	/* 512 bytes */
-#define	DN_MIN_INDBLKSHIFT	10	/* 1k */
+#define	DN_MIN_INDBLKSHIFT	12	/* 4k */
 #define	DN_MAX_INDBLKSHIFT	14	/* 16k */
 #define	DNODE_BLOCK_SHIFT	14	/* 16k */
 #define	DNODE_CORE_SIZE		64	/* 64 bytes for dnode sans blkptrs */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
index 67fa2767b1f8..a59e6d37d43a 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
@@ -133,17 +133,6 @@ typedef enum {
 	SM_FREE
 } maptype_t;
 
-/*
- * The data for a given space map can be kept on blocks of any size.
- * Larger blocks entail fewer i/o operations, but they also cause the
- * DMU to keep more data in-core, and also to waste more i/o bandwidth
- * when only a few blocks have changed since the last transaction group.
- * Rather than having a fixed block size for all space maps the block size
- * can adjust as needed (see space_map_max_blksz). Set the initial block
- * size for the space map to 4k.
- */
-#define	SPACE_MAP_INITIAL_BLOCKSIZE	(1ULL << 12)
-
 int space_map_load(space_map_t *sm, range_tree_t *rt, maptype_t maptype);
 
 void space_map_histogram_clear(space_map_t *sm);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
index 0c599b172d60..dea1a8fa7bf1 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
@@ -155,6 +155,15 @@ static vdev_ops_t *vdev_ops_table[] = {
 };
 
 
+/*
+ * When a vdev is added, it will be divided into approximately (but no
+ * more than) this number of metaslabs.
+ */
+int metaslabs_per_vdev = 200;
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, metaslabs_per_vdev, CTLFLAG_RDTUN,
+    &metaslabs_per_vdev, 0,
+    "When a vdev is added, how many metaslabs the vdev should be divided into");
+
 /*
  * Given a vdev type, return the appropriate ops vector.
  */
@@ -1663,9 +1672,9 @@ void
 vdev_metaslab_set_size(vdev_t *vd)
 {
 	/*
-	 * Aim for roughly 200 metaslabs per vdev.
+	 * Aim for roughly metaslabs_per_vdev (default 200) metaslabs per vdev.
 	 */
-	vd->vdev_ms_shift = highbit64(vd->vdev_asize / 200);
+	vd->vdev_ms_shift = highbit64(vd->vdev_asize / metaslabs_per_vdev);
 	vd->vdev_ms_shift = MAX(vd->vdev_ms_shift, SPA_MAXBLOCKSHIFT);
 }
 
@@ -1951,12 +1960,15 @@ vdev_dtl_reassess(vdev_t *vd, uint64_t txg, uint64_t scrub_txg, int scrub_done)
 
 		/*
 		 * If the vdev was resilvering and no longer has any
-		 * DTLs then reset its resilvering flag.
+		 * DTLs then reset its resilvering flag and dirty
+		 * the top level so that we persist the change.
 		 */
 		if (vd->vdev_resilver_txg != 0 &&
 		    range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0 &&
-		    range_tree_space(vd->vdev_dtl[DTL_OUTAGE]) == 0)
+		    range_tree_space(vd->vdev_dtl[DTL_OUTAGE]) == 0) {
 			vd->vdev_resilver_txg = 0;
+			vdev_config_dirty(vd->vdev_top);
+		}
 
 		mutex_exit(&vd->vdev_dtl_lock);
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
index 3071d5aa6d2f..395ea29ff187 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
@@ -176,6 +176,21 @@ int zfs_vdev_write_gap_limit = 4 << 10;
 
 #ifdef __FreeBSD__
 SYSCTL_DECL(_vfs_zfs_vdev);
+
+static int sysctl_zfs_async_write_active_min_dirty_percent(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_vfs_zfs_vdev, OID_AUTO, async_write_active_min_dirty_percent,
+    CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RWTUN, 0, sizeof(int),
+    sysctl_zfs_async_write_active_min_dirty_percent, "I",
+    "Percentage of async write dirty data below which "
+    "async_write_min_active is used.");
+
+static int sysctl_zfs_async_write_active_max_dirty_percent(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_vfs_zfs_vdev, OID_AUTO, async_write_active_max_dirty_percent,
+    CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RWTUN, 0, sizeof(int),
+    sysctl_zfs_async_write_active_max_dirty_percent, "I",
+    "Percentage of async write dirty data above which "
+    "async_write_max_active is used.");
+
 SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, max_active, CTLFLAG_RWTUN,
     &zfs_vdev_max_active, 0,
     "The maximum number of I/Os of all types active for each device.");
@@ -216,6 +231,44 @@ SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, read_gap_limit, CTLFLAG_RWTUN,
 SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, write_gap_limit, CTLFLAG_RWTUN,
     &zfs_vdev_write_gap_limit, 0,
     "Acceptable gap between two writes being aggregated");
+
+static int
+sysctl_zfs_async_write_active_min_dirty_percent(SYSCTL_HANDLER_ARGS)
+{
+	int val, err;
+
+	val = zfs_vdev_async_write_active_min_dirty_percent;
+	err = sysctl_handle_int(oidp, &val, 0, req);
+	if (err != 0 || req->newptr == NULL)
+		return (err);
+	
+	if (val < 0 || val > 100 ||
+	    val >= zfs_vdev_async_write_active_max_dirty_percent)
+		return (EINVAL);
+
+	zfs_vdev_async_write_active_min_dirty_percent = val;
+
+	return (0);
+}
+
+static int
+sysctl_zfs_async_write_active_max_dirty_percent(SYSCTL_HANDLER_ARGS)
+{
+	int val, err;
+
+	val = zfs_vdev_async_write_active_max_dirty_percent;
+	err = sysctl_handle_int(oidp, &val, 0, req);
+	if (err != 0 || req->newptr == NULL)
+		return (err);
+
+	if (val < 0 || val > 100 ||
+	    val <= zfs_vdev_async_write_active_min_dirty_percent)
+		return (EINVAL);
+
+	zfs_vdev_async_write_active_max_dirty_percent = val;
+
+	return (0);
+}
 #endif
 
 int
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
index a6246ccc9a85..5f42c79223f5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -3540,6 +3540,7 @@ zfs_destroy_unmount_origin(const char *fsname)
 static int
 zfs_ioc_destroy_snaps(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
 {
+	int error, poollen;
 	nvlist_t *snaps;
 	nvpair_t *pair;
 	boolean_t defer;
@@ -3548,9 +3549,25 @@ zfs_ioc_destroy_snaps(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
 		return (SET_ERROR(EINVAL));
 	defer = nvlist_exists(innvl, "defer");
 
+	poollen = strlen(poolname);
 	for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
 	    pair = nvlist_next_nvpair(snaps, pair)) {
-		(void) zfs_unmount_snap(nvpair_name(pair));
+		const char *name = nvpair_name(pair);
+
+		/*
+		 * The snap must be in the specified pool to prevent the
+		 * invalid removal of zvol minors below.
+		 */
+		if (strncmp(name, poolname, poollen) != 0 ||
+		    (name[poollen] != '/' && name[poollen] != '@'))
+			return (SET_ERROR(EXDEV));
+
+		error = zfs_unmount_snap(name);
+		if (error != 0)
+			return (error);
+#if defined(__FreeBSD__)
+		zvol_remove_minors(name);
+#endif
 	}
 
 	return (dsl_destroy_snapshots_nvl(snaps, defer, outnvl));
@@ -3644,7 +3661,6 @@ zfs_ioc_destroy_bookmarks(const char *poolname, nvlist_t *innvl,
 		if (strncmp(name, poolname, poollen) != 0 ||
 		    (name[poollen] != '/' && name[poollen] != '#'))
 			return (SET_ERROR(EXDEV));
-		(void) zvol_remove_minor(name);
 	}
 
 	error = dsl_bookmark_destroy(innvl, outnvl);
@@ -3675,7 +3691,11 @@ zfs_ioc_destroy(zfs_cmd_t *zc)
 	else
 		err = dsl_destroy_head(zc->zc_name);
 	if (zc->zc_objset_type == DMU_OST_ZVOL && err == 0)
+#ifdef __FreeBSD__
+		zvol_remove_minors(zc->zc_name);
+#else
 		(void) zvol_remove_minor(zc->zc_name);
+#endif
 	return (err);
 }
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
index d7d5fde35b86..ea17daf81f93 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
@@ -870,6 +870,17 @@ zfsvfs_create(const char *osname, zfsvfs_t **zfvp)
 	int i, error;
 	uint64_t sa_obj;
 
+	/*
+	 * XXX: Fix struct statfs so this isn't necessary!
+	 *
+	 * The 'osname' is used as the filesystem's special node, which means
+	 * it must fit in statfs.f_mntfromname, or else it can't be
+	 * enumerated, so libzfs_mnttab_find() returns NULL, which causes
+	 * 'zfs unmount' to think it's not mounted when it is.
+	 */
+	if (strlen(osname) >= MNAMELEN)
+		return (SET_ERROR(ENAMETOOLONG));
+
 	zfsvfs = kmem_zalloc(sizeof (zfsvfs_t), KM_SLEEP);
 
 	/*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index 1553a818136d..109a3393d53d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -266,16 +266,19 @@ zfs_holey(vnode_t *vp, u_long cmd, offset_t *off)
 
 	error = dmu_offset_next(zp->z_zfsvfs->z_os, zp->z_id, hole, &noff);
 
-	/* end of file? */
-	if ((error == ESRCH) || (noff > file_sz)) {
-		/*
-		 * Handle the virtual hole at the end of file.
-		 */
-		if (hole) {
-			*off = file_sz;
-			return (0);
-		}
+	if (error == ESRCH)
 		return (SET_ERROR(ENXIO));
+
+	/*
+	 * We could find a hole that begins after the logical end-of-file,
+	 * because dmu_offset_next() only works on whole blocks.  If the
+	 * EOF falls mid-block, then indicate that the "virtual hole"
+	 * at the end of the file begins at the logical EOF, rather than
+	 * at the end of the last block.
+	 */
+	if (noff > file_sz) {
+		ASSERT(hole);
+		noff = file_sz;
 	}
 
 	if (noff < *off)
@@ -2834,6 +2837,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr,
 #endif
 	vap->va_seq = zp->z_seq;
 	vap->va_flags = 0;	/* FreeBSD: Reset chflags(2) flags. */
+     	vap->va_filerev = zp->z_seq;
 
 	/*
 	 * Add in any requested optional attributes and the create time.
@@ -5829,7 +5833,6 @@ zfs_freebsd_getpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
@@ -5990,7 +5993,6 @@ zfs_freebsd_putpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
index 228e4591d50d..c26e53cea635 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
@@ -644,7 +644,14 @@ zil_claim(const char *osname, void *txarg)
 
 	error = dmu_objset_own(osname, DMU_OST_ANY, B_FALSE, FTAG, &os);
 	if (error != 0) {
-		cmn_err(CE_WARN, "can't open objset for %s", osname);
+		/*
+		 * EBUSY indicates that the objset is inconsistent, in which
+		 * case it can not have a ZIL.
+		 */
+		if (error != EBUSY) {
+			cmn_err(CE_WARN, "can't open objset for %s, error %u",
+			    osname, error);
+		}
 		return (0);
 	}
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
index 056efd8a82ec..f56efe8118a7 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
@@ -167,6 +167,14 @@ static LIST_HEAD(, zvol_state) all_zvols;
  */
 int zvol_maxphys = DMU_MAX_ACCESS/2;
 
+/*
+ * Toggle unmap functionality.
+ */
+boolean_t zvol_unmap_enabled = B_TRUE;
+SYSCTL_INT(_vfs_zfs_vol, OID_AUTO, unmap_enabled, CTLFLAG_RWTUN,
+    &zvol_unmap_enabled, 0,
+    "Enable UNMAP functionality");
+
 static d_open_t		zvol_d_open;
 static d_close_t	zvol_d_close;
 static d_read_t		zvol_read;
@@ -882,7 +890,8 @@ zvol_remove_minors(const char *name)
 	LIST_FOREACH_SAFE(zv, &all_zvols, zv_links, tzv) {
 		if (strcmp(zv->zv_name, name) == 0 ||
 		    (strncmp(zv->zv_name, name, namelen) == 0 &&
-		     zv->zv_name[namelen] == '/')) {
+		    strlen(zv->zv_name) > namelen && (zv->zv_name[namelen] == '/' ||
+		    zv->zv_name[namelen] == '@'))) {
 			(void) zvol_remove_zv(zv);
 		}
 	}
@@ -1633,7 +1642,7 @@ zvol_write(struct cdev *dev, struct uio *uio, int ioflag)
 #ifdef sun
 	sync = !(zv->zv_flags & ZVOL_WCE) ||
 #else
-	sync =
+	sync = (ioflag & IO_SYNC) ||
 #endif
 	    (zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS);
 
@@ -1970,6 +1979,9 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp)
 		dkioc_free_t df;
 		dmu_tx_t *tx;
 
+		if (!zvol_unmap_enabled)
+			break;
+
 		if (ddi_copyin((void *)arg, &df, sizeof (df), flag)) {
 			error = SET_ERROR(EFAULT);
 			break;
@@ -1982,8 +1994,8 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp)
 		 */
 		if (df.df_start >= zv->zv_volsize)
 			break;	/* No need to do anything... */
-		if (df.df_start + df.df_length > zv->zv_volsize)
-			df.df_length = DMU_OBJECT_END;
+
+		mutex_exit(&spa_namespace_lock);
 
 		rl = zfs_range_lock(&zv->zv_znode, df.df_start, df.df_length,
 		    RL_WRITER);
@@ -2022,7 +2034,7 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp)
 				    dmu_objset_pool(zv->zv_objset), 0);
 			}
 		}
-		break;
+		return (error);
 	}
 
 	default:
@@ -2570,9 +2582,10 @@ zvol_create_minors(const char *name)
 	if (dmu_objset_type(os) == DMU_OST_ZVOL) {
 		dsl_dataset_long_hold(os->os_dsl_dataset, FTAG);
 		dsl_pool_rele(dmu_objset_pool(os), FTAG);
-		if ((error = zvol_create_minor(name)) == 0)
+		error = zvol_create_minor(name);
+		if (error == 0 || error == EEXIST) {
 			error = zvol_create_snapshots(os, name);
-		else {
+		} else {
 			printf("ZFS WARNING: Unable to create ZVOL %s (error=%d).\n",
 			    name, error);
 		}
@@ -2673,12 +2686,17 @@ zvol_rename_minors(const char *oldname, const char *newname)
 	size_t oldnamelen, newnamelen;
 	zvol_state_t *zv;
 	char *namebuf;
+	boolean_t locked = B_FALSE;
 
 	oldnamelen = strlen(oldname);
 	newnamelen = strlen(newname);
 
 	DROP_GIANT();
-	mutex_enter(&spa_namespace_lock);
+	/* See comment in zvol_open(). */
+	if (!MUTEX_HELD(&spa_namespace_lock)) {
+		mutex_enter(&spa_namespace_lock);
+		locked = B_TRUE;
+	}
 
 	LIST_FOREACH(zv, &all_zvols, zv_links) {
 		if (strcmp(zv->zv_name, oldname) == 0) {
@@ -2693,7 +2711,8 @@ zvol_rename_minors(const char *oldname, const char *newname)
 		}
 	}
 
-	mutex_exit(&spa_namespace_lock);
+	if (locked)
+		mutex_exit(&spa_namespace_lock);
 	PICKUP_GIANT();
 }
 
@@ -2807,6 +2826,9 @@ zvol_d_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct threa
 		zil_commit(zv->zv_zilog, ZVOL_OBJ);
 		break;
 	case DIOCGDELETE:
+		if (!zvol_unmap_enabled)
+			break;
+
 		offset = ((off_t *)data)[0];
 		length = ((off_t *)data)[1];
 		if ((offset % DEV_BSIZE) != 0 || (length % DEV_BSIZE) != 0 ||
diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c b/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
index b7edca5acf32..d35bf773eb23 100644
--- a/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
@@ -52,9 +52,103 @@
 /* Offset to LR Save word (ppc64).  CR Save area sits between back chain and LR */
 #define RETURN_OFFSET64	16
 
+#ifdef __powerpc64__
+#define OFFSET 4 /* Account for the TOC reload slot */
+#else
+#define OFFSET 0
+#endif
+
 #define INKERNEL(x)	((x) <= VM_MAX_KERNEL_ADDRESS && \
 		(x) >= VM_MIN_KERNEL_ADDRESS)
 
+static __inline int
+dtrace_sp_inkernel(uintptr_t sp, int aframes)
+{
+	vm_offset_t callpc;
+
+#ifdef __powerpc64__
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET64);
+#else
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET);
+#endif
+	if ((callpc & 3) || (callpc < 0x100))
+		return (0);
+
+	/*
+	 * trapexit() and asttrapexit() are sentinels
+	 * for kernel stack tracing.
+	 *
+	 * Special-case this for 'aframes == 0', because fbt sets aframes to the
+	 * trap callchain depth, so we want to break out of it.
+	 */
+	if ((callpc + OFFSET == (vm_offset_t) &trapexit ||
+	    callpc + OFFSET == (vm_offset_t) &asttrapexit) &&
+	    aframes != 0)
+		return (0);
+
+	return (1);
+}
+
+static __inline uintptr_t
+dtrace_next_sp(uintptr_t sp)
+{
+	vm_offset_t callpc;
+
+#ifdef __powerpc64__
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET64);
+#else
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET);
+#endif
+
+	/*
+	 * trapexit() and asttrapexit() are sentinels
+	 * for kernel stack tracing.
+	 *
+	 * Special-case this for 'aframes == 0', because fbt sets aframes to the
+	 * trap callchain depth, so we want to break out of it.
+	 */
+	if ((callpc + OFFSET == (vm_offset_t) &trapexit ||
+	    callpc + OFFSET == (vm_offset_t) &asttrapexit))
+	    /* Access the trap frame */
+#ifdef __powerpc64__
+		return (*(uintptr_t *)sp + 48 + sizeof(register_t));
+#else
+		return (*(uintptr_t *)sp + 8 + sizeof(register_t));
+#endif
+
+	return (*(uintptr_t*)sp);
+}
+
+static __inline uintptr_t
+dtrace_get_pc(uintptr_t sp)
+{
+	vm_offset_t callpc;
+
+#ifdef __powerpc64__
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET64);
+#else
+	callpc = *(vm_offset_t *)(sp + RETURN_OFFSET);
+#endif
+
+	/*
+	 * trapexit() and asttrapexit() are sentinels
+	 * for kernel stack tracing.
+	 *
+	 * Special-case this for 'aframes == 0', because fbt sets aframes to the
+	 * trap callchain depth, so we want to break out of it.
+	 */
+	if ((callpc + OFFSET == (vm_offset_t) &trapexit ||
+	    callpc + OFFSET == (vm_offset_t) &asttrapexit))
+	    /* Access the trap frame */
+#ifdef __powerpc64__
+		return (*(uintptr_t *)sp + 48 + offsetof(struct trapframe, lr));
+#else
+		return (*(uintptr_t *)sp + 8 + offsetof(struct trapframe, lr));
+#endif
+
+	return (callpc);
+}
+
 greg_t
 dtrace_getfp(void)
 {
@@ -66,10 +160,11 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
     uint32_t *intrpc)
 {
 	int depth = 0;
-	register_t sp;
+	uintptr_t osp, sp;
 	vm_offset_t callpc;
 	pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
 
+	osp = PAGE_SIZE;
 	if (intrpc != 0)
 		pcstack[depth++] = (pc_t) intrpc;
 
@@ -78,17 +173,12 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 	sp = dtrace_getfp();
 
 	while (depth < pcstack_limit) {
-		if (!INKERNEL((long) sp))
+		if (sp <= osp)
 			break;
 
-#ifdef __powerpc64__
-		callpc = *(uintptr_t *)(sp + RETURN_OFFSET64);
-#else
-		callpc = *(uintptr_t *)(sp + RETURN_OFFSET);
-#endif
-
-		if (!INKERNEL(callpc))
+		if (!dtrace_sp_inkernel(sp, aframes))
 			break;
+		callpc = dtrace_get_pc(sp);
 
 		if (aframes > 0) {
 			aframes--;
@@ -100,7 +190,8 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 			pcstack[depth++] = callpc;
 		}
 
-		sp = *(uintptr_t*)sp;
+		osp = sp;
+		sp = dtrace_next_sp(sp);
 	}
 
 	for (; depth < pcstack_limit; depth++) {
@@ -368,8 +459,11 @@ dtrace_getarg(int arg, int aframes)
 		 * On ppc32 AIM, and booke, trapexit() is the immediately following
 		 * label.  On ppc64 AIM trapexit() follows a nop.
 		 */
-		if (((long)(fp[1]) == (long)trapexit) ||
-				(((long)(fp[1]) + 4 == (long)trapexit))) {
+#ifdef __powerpc64__
+		if ((long)(fp[2]) + 4 == (long)trapexit) {
+#else
+		if ((long)(fp[1]) == (long)trapexit) {
+#endif
 			/*
 			 * In the case of powerpc, we will use the pointer to the regs
 			 * structure that was pushed when we took the trap.  To get this
@@ -433,23 +527,31 @@ int
 dtrace_getstackdepth(int aframes)
 {
 	int depth = 0;
-	register_t sp;
+	uintptr_t osp, sp;
+	vm_offset_t callpc;
 
+	osp = PAGE_SIZE;
 	aframes++;
 	sp = dtrace_getfp();
 	depth++;
 	for(;;) {
-		if (!INKERNEL((long) sp))
+		if (sp <= osp)
 			break;
-		if (!INKERNEL((long) *(void **)sp))
+
+		if (!dtrace_sp_inkernel(sp, aframes))
 			break;
-		depth++;
+
+		if (aframes == 0)
+			depth++;
+		else
+			aframes--;
+		osp = sp;
 		sp = *(uintptr_t *)sp;
 	}
 	if (depth < aframes)
-		return 0;
-	else
-		return depth - aframes;
+		return (0);
+
+	return (depth);
 }
 
 ulong_t
diff --git a/sys/cddl/dev/fbt/powerpc/fbt_isa.c b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
index b862f8a773fe..f10ff7bb6f2f 100644
--- a/sys/cddl/dev/fbt/powerpc/fbt_isa.c
+++ b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
@@ -147,7 +147,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 	fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO);
 	fbt->fbtp_name = name;
 	fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
-	    name, FBT_ENTRY, 3, fbt);
+	    name, FBT_ENTRY, 7, fbt);
 	fbt->fbtp_patchpoint = instr;
 	fbt->fbtp_ctl = lf;
 	fbt->fbtp_loadcnt = lf->loadcnt;
@@ -210,7 +210,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 
 	if (retfbt == NULL) {
 		fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
-		    name, FBT_RETURN, 5, fbt);
+		    name, FBT_RETURN, 7, fbt);
 	} else {
 		retfbt->fbtp_next = fbt;
 		fbt->fbtp_id = retfbt->fbtp_id;
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index fb8736cacf2d..d909a71ff270 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -2984,7 +2984,7 @@ freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap)
 int
 freebsd32_fcntl(struct thread *td, struct freebsd32_fcntl_args *uap)
 {
-	intptr_t tmp;
+	long tmp;
 
 	switch (uap->cmd) {
 	/*
@@ -3003,5 +3003,5 @@ freebsd32_fcntl(struct thread *td, struct freebsd32_fcntl_args *uap)
 		tmp = uap->arg;
 		break;
 	}
-	return (kern_fcntl(td, uap->fd, uap->cmd, tmp));
+	return (kern_fcntl_freebsd(td, uap->fd, uap->cmd, tmp));
 }
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 7293a28d5846..92ecb2f308a0 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -1139,26 +1139,26 @@ linprocfs_donetdev(PFS_FILL_ARGS)
 		linux_ifname(ifp, ifname, sizeof ifname);
 		sbuf_printf(sb, "%6.6s: ", ifname);
 		sbuf_printf(sb, "%7ju %7ju %4ju %4ju %4lu %5lu %10lu %9ju ",
-		    (uintmax_t )ifp->if_ibytes,	/* rx_bytes */
-		    (uintmax_t )ifp->if_ipackets,	/* rx_packets */
-		    (uintmax_t )ifp->if_ierrors,	/* rx_errors */
-		    (uintmax_t )ifp->if_iqdrops,	/* rx_dropped +
-							 * rx_missed_errors */
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IBYTES),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IERRORS),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IQDROPS),
+							/* rx_missed_errors */
 		    0UL,				/* rx_fifo_errors */
 		    0UL,				/* rx_length_errors +
 							 * rx_over_errors +
 							 * rx_crc_errors +
 							 * rx_frame_errors */
 		    0UL,				/* rx_compressed */
-		    (uintmax_t )ifp->if_imcasts);	/* multicast,
-							 * XXX-BZ rx only? */
-		sbuf_printf(sb, "%8ju %7ju %4ju %4lu %4lu %5ju %7lu %10lu\n",
-		    (uintmax_t )ifp->if_obytes,	/* tx_bytes */
-		    (uintmax_t )ifp->if_opackets,	/* tx_packets */
-		    (uintmax_t )ifp->if_oerrors,	/* tx_errors */
-		    0UL,				/* tx_dropped */
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IMCASTS));
+							/* XXX-BZ rx only? */
+		sbuf_printf(sb, "%8ju %7ju %4ju %4ju %4lu %5ju %7lu %10lu\n",
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OBYTES),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OERRORS),
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OQDROPS),
 		    0UL,				/* tx_fifo_errors */
-		    (uintmax_t )ifp->if_collisions,	/* collisions */
+		    (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_COLLISIONS),
 		    0UL,				/* tx_carrier_errors +
 							 * tx_aborted_errors +
 							 * tx_window_errors +
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 77feed0870ee..0148fec97be5 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -1699,13 +1699,6 @@ linux_ioctl_vfat(struct thread *td, struct linux_ioctl_args *args)
  * Sound related ioctls
  */
 
-struct linux_mixer_info {
-	char	id[16];
-	char	name[32];
-	int	modify_counter;
-	int	fillers[10];
-};
-
 struct linux_old_mixer_info {
 	char	id[16];
 	char	name[32];
@@ -1793,12 +1786,8 @@ linux_ioctl_sound(struct thread *td, struct linux_ioctl_args *args)
 		/* Key on encoded length */
 		switch ((args->cmd >> 16) & 0x1fff) {
 		case 0x005c: {	/* SOUND_MIXER_INFO */
-			struct linux_mixer_info info;
-			bzero(&info, sizeof(info));
-			strncpy(info.id, "OSS", sizeof(info.id) - 1);
-			strncpy(info.name, "FreeBSD OSS Mixer", sizeof(info.name) - 1);
-			copyout(&info, (void *)args->arg, sizeof(info));
-			return (0);
+			args->cmd = SOUND_MIXER_INFO;
+			return (sys_ioctl(td, (struct ioctl_args *)args));
 		}
 		case 0x0030: {	/* SOUND_OLD_MIXER_INFO */
 			struct linux_old_mixer_info info;
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 3b75307337db..8f8cb81b48b6 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -129,9 +129,9 @@ struct linux_prison {
 
 static struct linux_prison lprison0 = {
 	.pr_osname =		"Linux",
-	.pr_osrelease =		"2.6.16",
+	.pr_osrelease =		"2.6.18",
 	.pr_oss_version =	0x030600,
-	.pr_osrel =		2006016
+	.pr_osrel =		2006018
 };
 
 static unsigned linux_osd_jail_slot;
diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c
new file mode 100644
index 000000000000..92dae4c67280
--- /dev/null
+++ b/sys/compat/linux/linux_timer.c
@@ -0,0 +1,182 @@
+/*-
+ * Copyright (c) 2014 Bjoern A. Zeeb
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249
+ * ("MRC2"), as part of the DARPA MRC research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_compat.h"
+
+#include <sys/param.h>
+#include <sys/errno.h>
+#include <sys/signal.h>
+#include <sys/syscallsubr.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#ifdef COMPAT_LINUX32
+#include <machine/../linux32/linux.h>
+#include <machine/../linux32/linux32_proto.h>
+#else
+#include <machine/../linux/linux.h>
+#include <machine/../linux/linux_proto.h>
+#endif
+#include <compat/linux/linux_timer.h>
+
+static int
+linux_convert_l_clockid(clockid_t *clock_id)
+{
+
+	switch (*clock_id) {
+	case LINUX_CLOCK_REALTIME:
+		*clock_id = CLOCK_REALTIME;
+		break;
+	case LINUX_CLOCK_MONOTONIC:
+		*clock_id = CLOCK_MONOTONIC;
+		break;
+	default:
+		return (EINVAL);
+	}
+
+	return (0);
+}
+
+static int
+linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
+{
+
+	CP(*l_sig, *sig, sigev_notify);
+	switch (l_sig->sigev_notify) {
+	case L_SIGEV_SIGNAL:
+		sig->sigev_notify = SIGEV_SIGNAL;
+		CP(*l_sig, *sig, sigev_signo);
+		PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
+		break;
+	case L_SIGEV_NONE:
+		sig->sigev_notify = SIGEV_NONE;
+		break;
+	case L_SIGEV_THREAD:
+#if 0
+		/* Seems to not be used anywhere (anymore)? */
+		sig->sigev_notify = SIGEV_THREAD;
+		return (ENOSYS);
+#else
+		return (EINVAL);
+#endif
+	case L_SIGEV_THREAD_ID:
+		sig->sigev_notify = SIGEV_THREAD_ID;
+		CP2(*l_sig, *sig, _l_sigev_un._tid, sigev_notify_thread_id);
+		CP(*l_sig, *sig, sigev_signo);
+		PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
+		break;
+	default:
+		return (EINVAL);
+	}
+	return (0);
+}
+
+int
+linux_timer_create(struct thread *td, struct linux_timer_create_args *uap)
+{
+	struct l_sigevent l_ev;
+	struct sigevent ev, *evp;
+	int error, id;
+
+	if (uap->evp == NULL) {
+		evp = NULL;
+	} else {
+		error = copyin(uap->evp, &l_ev, sizeof(l_ev));
+		if (error != 0)
+			return (error);
+		error = linux_convert_l_sigevent(&l_ev, &ev);
+		if (error != 0)
+			return (error);
+		evp = &ev;
+	}
+	error = linux_convert_l_clockid(&uap->clock_id);
+	if (error != 0)
+		return (error);
+	error = kern_ktimer_create(td, uap->clock_id, evp, &id, -1);
+	if (error == 0) {
+		error = copyout(&id, uap->timerid, sizeof(int));
+		if (error != 0)
+			kern_ktimer_delete(td, id);
+	}
+	return (error);
+}
+
+int
+linux_timer_settime(struct thread *td, struct linux_timer_settime_args *uap)
+{
+	struct l_itimerspec l_val, l_oval;
+	struct itimerspec val, oval, *ovalp;
+	int error;
+
+	error = copyin(uap->new, &l_val, sizeof(l_val));
+	if (error != 0)
+		return (error);
+	ITS_CP(l_val, val);
+	ovalp = uap->old != NULL ? &oval : NULL;
+	error = kern_ktimer_settime(td, uap->timerid, uap->flags, &val, ovalp);
+	if (error == 0 && uap->old != NULL) {
+		ITS_CP(oval, l_oval);
+		error = copyout(&l_oval, uap->old, sizeof(l_oval));
+	}
+	return (error);
+}
+
+int
+linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *uap)
+{
+	struct l_itimerspec l_val;
+	struct itimerspec val;
+	int error;
+
+	error = kern_ktimer_gettime(td, uap->timerid, &val);
+	if (error == 0) {
+		ITS_CP(val, l_val);
+		error = copyout(&l_val, uap->setting, sizeof(l_val));
+	}
+	return (error);
+}
+
+int
+linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *uap)
+{
+
+	return (kern_ktimer_getoverrun(td, uap->timerid));
+}
+
+int
+linux_timer_delete(struct thread *td, struct linux_timer_delete_args *uap)
+{
+
+	return (kern_ktimer_delete(td, uap->timerid));
+}
+
diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_timer.h
new file mode 100644
index 000000000000..4f64ee5fe9cb
--- /dev/null
+++ b/sys/compat/linux/linux_timer.h
@@ -0,0 +1,97 @@
+/*-
+ * Copyright (c) 2014 Bjoern A. Zeeb
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249
+ * ("MRC2"), as part of the DARPA MRC research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_LINUX_TIMER_H
+#define	_LINUX_TIMER_H
+
+#ifndef	__LINUX_ARCH_SIGEV_PREAMBLE_SIZE
+#define	__LINUX_ARCH_SIGEV_PREAMBLE_SIZE	\
+	(sizeof(l_int) * 2 + sizeof(l_sigval_t))
+#endif
+
+#define	LINUX_SIGEV_MAX_SIZE			64
+#define	LINUX_SIGEV_PAD_SIZE			\
+	((LINUX_SIGEV_MAX_SIZE - __LINUX_ARCH_SIGEV_PREAMBLE_SIZE) / \
+	sizeof(l_int))
+
+#define	LINUX_CLOCK_REALTIME			0
+#define	LINUX_CLOCK_MONOTONIC			1
+#define	LINUX_CLOCK_PROCESS_CPUTIME_ID		2
+#define	LINUX_CLOCK_THREAD_CPUTIME_ID		3
+#define	LINUX_CLOCK_MONOTONIC_RAW		4
+#define	LINUX_CLOCK_REALTIME_COARSE		5
+#define	LINUX_CLOCK_MONOTONIC_COARSE		6
+#define	LINUX_CLOCK_BOOTTIME			7
+#define	LINUX_CLOCK_REALTIME_ALARM		8
+#define	LINUX_CLOCK_BOOTTIME_ALARM		9
+#define	LINUX_CLOCK_SGI_CYCLE			10
+#define	LINUX_CLOCK_TAI				11
+
+#define	L_SIGEV_SIGNAL				0
+#define	L_SIGEV_NONE				1
+#define	L_SIGEV_THREAD				2
+#define	L_SIGEV_THREAD_ID			4
+
+#define	TS_CP(src,dst,fld) do {			\
+	CP((src).fld,(dst).fld,tv_sec);		\
+	CP((src).fld,(dst).fld,tv_nsec);	\
+} while (0)
+
+#define	ITS_CP(src, dst) do {			\
+	TS_CP((src), (dst), it_interval);	\
+	TS_CP((src), (dst), it_value);		\
+} while (0)
+
+struct l_sigevent {
+	l_sigval_t sigev_value;
+	l_int sigev_signo;
+	l_int sigev_notify;
+	union {
+		l_int _pad[LINUX_SIGEV_PAD_SIZE];
+		l_int _tid;
+		struct {
+			l_uintptr_t _function;
+			l_uintptr_t _attribute;
+		} _l_sigev_thread;
+	} _l_sigev_un;
+}
+#if defined(__amd64__) && defined(COMPAT_LINUX32)
+__packed
+#endif
+;
+
+struct l_itimerspec {
+	struct l_timespec it_interval;
+	struct l_timespec it_value;
+};
+
+#endif	/* _LINUX_TIMER_H */
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 67db55dd6fa6..08e70f30a502 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -42,11 +42,7 @@ STRIP_FLAGS = -S
 # We don't support gcc's thump interwork stuff, so disable it
 CFLAGS.gcc += -mno-thumb-interwork
 
-.if empty(DDB_ENABLED)
-.if ${MK_ARM_EABI} == "no"
-CFLAGS.gcc += -mno-apcs-frame
-.endif
-.elif ${MK_ARM_EABI} != "no"
+.if !empty(DDB_ENABLED)
 CFLAGS += -funwind-tables
 # clang requires us to tell it to emit assembly with unwind information
 CFLAGS.clang += -mllvm -arm-enable-ehabi
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 62bca5717093..5baa306c99db 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2095,8 +2095,6 @@ device		em		# Intel Pro/1000 Gigabit Ethernet
 device		igb		# Intel Pro/1000 PCIE Gigabit Ethernet
 device		ixgb		# Intel Pro/10Gbe PCI-X Ethernet
 device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
-device		ixl		# Intel XL710 40Gbe PCIE Ethernet
-device		ixlv		# Intel XL710 40Gbe VF PCIE Ethernet
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		mxge		# Myricom Myri-10G 10GbE NIC
 device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter
@@ -2627,9 +2625,8 @@ options 	NSFBUFS=1024
 # Enable extra debugging code for locks.  This stores the filename and
 # line of whatever acquired the lock in the lock itself, and changes a
 # number of function calls to pass around the relevant data.  This is
-# not at all useful unless you are debugging lock code.  Also note
-# that it is likely to break e.g. fstat(1) unless you recompile your
-# userland with -DDEBUG_LOCKS as well.
+# not at all useful unless you are debugging lock code.  Note that
+# modules should be recompiled as this option modifies KBI.
 #
 options 	DEBUG_LOCKS
 
diff --git a/sys/conf/files b/sys/conf/files
index 4038569cf2d0..c885ecac7266 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -111,6 +111,7 @@ cddl/compat/opensolaris/kern/opensolaris_misc.c				optional zfs compile-with "${
 cddl/compat/opensolaris/kern/opensolaris_sunddi.c			optional zfs compile-with "${ZFS_C}"
 # zfs specific
 cddl/compat/opensolaris/kern/opensolaris_acl.c				optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_dtrace.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_kobj.c				optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_kstat.c			optional zfs compile-with "${ZFS_C}"
 cddl/compat/opensolaris/kern/opensolaris_lookup.c			optional zfs compile-with "${ZFS_C}"
@@ -254,6 +255,8 @@ contrib/altq/altq/altq_red.c		optional altq
 contrib/altq/altq/altq_rio.c		optional altq
 contrib/altq/altq/altq_rmclass.c	optional altq
 contrib/altq/altq/altq_subr.c		optional altq
+contrib/dev/acpica/common/ahids.c			optional acpi acpi_debug
+contrib/dev/acpica/common/ahuuids.c			optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbcmds.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbconvert.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbdisply.c	optional acpi acpi_debug
@@ -264,6 +267,7 @@ contrib/dev/acpica/components/debugger/dbinput.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbmethod.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbnames.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbstats.c	optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbtest.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbutils.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbxface.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmbuffer.c	optional acpi acpi_debug
@@ -386,6 +390,7 @@ contrib/dev/acpica/components/resources/rsmisc.c	optional acpi
 contrib/dev/acpica/components/resources/rsserial.c	optional acpi
 contrib/dev/acpica/components/resources/rsutils.c	optional acpi
 contrib/dev/acpica/components/resources/rsxface.c	optional acpi
+contrib/dev/acpica/components/tables/tbdata.c		optional acpi
 contrib/dev/acpica/components/tables/tbfadt.c		optional acpi
 contrib/dev/acpica/components/tables/tbfind.c		optional acpi
 contrib/dev/acpica/components/tables/tbinstal.c		optional acpi
@@ -406,6 +411,7 @@ contrib/dev/acpica/components/utilities/uterror.c	optional acpi
 contrib/dev/acpica/components/utilities/uteval.c	optional acpi
 contrib/dev/acpica/components/utilities/utexcep.c	optional acpi
 contrib/dev/acpica/components/utilities/utglobal.c	optional acpi
+contrib/dev/acpica/components/utilities/uthex.c		optional acpi
 contrib/dev/acpica/components/utilities/utids.c		optional acpi
 contrib/dev/acpica/components/utilities/utinit.c	optional acpi
 contrib/dev/acpica/components/utilities/utlock.c	optional acpi
@@ -419,6 +425,7 @@ contrib/dev/acpica/components/utilities/utpredef.c	optional acpi
 contrib/dev/acpica/components/utilities/utresrc.c	optional acpi
 contrib/dev/acpica/components/utilities/utstate.c	optional acpi
 contrib/dev/acpica/components/utilities/utstring.c	optional acpi
+contrib/dev/acpica/components/utilities/utuuid.c	optional acpi acpi_debug
 contrib/dev/acpica/components/utilities/utxface.c	optional acpi
 contrib/dev/acpica/components/utilities/utxferror.c	optional acpi
 contrib/dev/acpica/components/utilities/utxfinit.c	optional acpi
@@ -645,6 +652,7 @@ dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
 dev/aic7xxx/aic7xxx_reg_print.c	optional ahc ahc_reg_pretty_print
 dev/alc/if_alc.c		optional alc pci
 dev/ale/if_ale.c		optional ale pci
+dev/alpm/alpm.c			optional alpm pci
 dev/altera/avgen/altera_avgen.c		optional altera_avgen
 dev/altera/avgen/altera_avgen_fdt.c	optional altera_avgen fdt
 dev/altera/avgen/altera_avgen_nexus.c	optional altera_avgen
@@ -653,6 +661,8 @@ dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_io.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_fdt.c	optional altera_sdcard fdt
 dev/altera/sdcard/altera_sdcard_nexus.c	optional altera_sdcard
+dev/amdpm/amdpm.c		optional amdpm pci | nfpm pci
+dev/amdsmb/amdsmb.c		optional amdsmb pci
 dev/amr/amr.c			optional amr
 dev/amr/amr_cam.c		optional amrp amr
 dev/amr/amr_disk.c		optional amr
@@ -1377,9 +1387,11 @@ dev/fatm/if_fatm.c		optional fatm pci
 dev/fb/fbd.c			optional fbd | vt
 dev/fb/fb_if.m			standard
 dev/fb/splash.c			optional sc splash
-dev/fdt/fdt_clock.c		optional fdt
-dev/fdt/fdt_clock_if.m		optional fdt
+dev/fdt/fdt_clock.c		optional fdt fdt_clock
+dev/fdt/fdt_clock_if.m		optional fdt fdt_clock
 dev/fdt/fdt_common.c		optional fdt
+dev/fdt/fdt_pinctrl.c		optional fdt fdt_pinctrl
+dev/fdt/fdt_pinctrl_if.m	optional fdt fdt_pinctrl
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt nand
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
 	dependency	"$S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}"
@@ -1427,26 +1439,6 @@ dev/hptiop/hptiop.c		optional hptiop scbus
 dev/hwpmc/hwpmc_logging.c	optional hwpmc
 dev/hwpmc/hwpmc_mod.c		optional hwpmc
 dev/hwpmc/hwpmc_soft.c		optional hwpmc
-dev/ixl/if_ixl.c		optional ixl inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/if_ixlv.c		optional ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixlvc.c			optional ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_txrx.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_osdep.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_lan_hmc.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_hmc.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_common.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_nvm.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_adminq.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ichsmb/ichsmb.c		optional ichsmb
 dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
 dev/ida/ida.c			optional ida
@@ -1480,6 +1472,7 @@ dev/iicbus/s35390a.c		optional s35390a
 dev/iir/iir.c			optional iir
 dev/iir/iir_ctrl.c		optional iir
 dev/iir/iir_pci.c		optional iir pci
+dev/intpm/intpm.c		optional intpm pci
 # XXX Work around clang warning, until maintainer approves fix.
 dev/ips/ips.c			optional ips \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
@@ -1777,7 +1770,7 @@ dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
 dev/ixgbe/ixgbe.c		optional ixgbe inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP -DIXGBE_FDIR"
+	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/ixv.c			optional ixgbe inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_phy.c		optional ixgbe inet \
@@ -1962,6 +1955,7 @@ dev/nand/nandsim_ctrl.c		optional nandsim nand
 dev/nand/nandsim_log.c		optional nandsim nand
 dev/nand/nandsim_swap.c		optional nandsim nand
 dev/nand/nfc_if.m		optional nand
+dev/ncr/ncr.c			optional ncr pci
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
 dev/netmap/netmap.c		optional netmap
@@ -1974,6 +1968,7 @@ dev/netmap/netmap_offloadings.c	optional netmap
 dev/netmap/netmap_pipe.c	optional netmap
 dev/netmap/netmap_vale.c	optional netmap
 # compile-with "${NORMAL_C} -Wconversion -Wextra"
+dev/nfsmb/nfsmb.c		optional nfsmb pci
 dev/nge/if_nge.c		optional nge
 dev/nxge/if_nxge.c		optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
@@ -2149,6 +2144,7 @@ dev/random/hash.c		optional random
 dev/random/rwfile.c		optional random
 dev/rc/rc.c			optional rc
 dev/re/if_re.c			optional re
+dev/rl/if_rl.c			optional rl pci
 dev/rndtest/rndtest.c		optional rndtest
 dev/rp/rp.c			optional rp
 dev/rp/rp_isa.c			optional rp isa
@@ -2188,6 +2184,7 @@ dev/smbus/smbconf.c		optional smbus
 dev/smbus/smbus.c		optional smbus
 dev/smbus/smbus_if.m		optional smbus
 dev/smc/if_smc.c		optional smc
+dev/smc/if_smc_fdt.c		optional smc fdt
 dev/sn/if_sn.c			optional sn
 dev/sn/if_sn_isa.c		optional sn isa
 dev/sn/if_sn_pccard.c		optional sn pccard
@@ -2575,7 +2572,7 @@ dev/utopia/idtphy.c		optional utopia
 dev/utopia/suni.c		optional utopia
 dev/utopia/utopia.c		optional utopia
 dev/vge/if_vge.c		optional vge
-
+dev/viapm/viapm.c		optional viapm pci
 dev/vkbd/vkbd.c			optional vkbd
 dev/vr/if_vr.c			optional vr pci
 dev/vt/colors/vt_termcolors.c	optional vt
@@ -2647,6 +2644,9 @@ dev/xen/netfront/netfront.c	optional xen | xenhvm
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/timer/timer.c		optional xen | xenhvm
 dev/xen/pvcpu/pvcpu.c		optional xen | xenhvm
+dev/xen/xenstore/xenstore.c	optional xen | xenhvm
+dev/xen/xenstore/xenstore_dev.c	optional xen | xenhvm
+dev/xen/xenstore/xenstored_dev.c	optional xen | xenhvm
 dev/xl/if_xl.c			optional xl pci
 dev/xl/xlphy.c			optional xl pci
 fs/autofs/autofs.c		optional autofs
@@ -3176,8 +3176,9 @@ libkern/inet_pton.c		standard
 libkern/jenkins_hash.c		standard
 libkern/mcount.c		optional profiling-routine
 libkern/memcchr.c		standard
-libkern/memchr.c		optional fdt
+libkern/memchr.c		optional fdt | gdb
 libkern/memcmp.c		standard
+libkern/memmem.c		optional gdb
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
 libkern/random.c		standard
@@ -3791,7 +3792,7 @@ ofed/drivers/net/mlx4/sys_tune.c		optional mlx4ib | mlxen	\
 ofed/drivers/net/mlx4/en_cq.c			optional mlxen		\
 	no-depend obj-prefix "mlx4_"					\
 	compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/"
-ofed/drivers/net/mlx4/en_frag.c			optional mlxen		\
+ofed/drivers/net/mlx4/utils.c			optional mlxen		\
 	no-depend obj-prefix "mlx4_"					\
 	compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/"
 ofed/drivers/net/mlx4/en_main.c			optional mlxen		\
@@ -3861,15 +3862,6 @@ opencrypto/cryptodeflate.c	optional crypto
 opencrypto/rmd160.c		optional crypto | ipsec
 opencrypto/skipjack.c		optional crypto
 opencrypto/xform.c		optional crypto
-pci/alpm.c			optional alpm pci
-pci/amdpm.c			optional amdpm pci | nfpm pci
-pci/amdsmb.c			optional amdsmb pci
-pci/if_rl.c			optional rl pci
-pci/intpm.c			optional intpm pci
-pci/ncr.c			optional ncr pci \
-	compile-with "${NORMAL_C} -Wno-unused"
-pci/nfsmb.c			optional nfsmb pci
-pci/viapm.c			optional viapm pci
 rpc/auth_none.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfsclient | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
@@ -3996,8 +3988,6 @@ xen/xenbus/xenbusb_if.m		optional xen | xenhvm
 xen/xenbus/xenbusb.c		optional xen | xenhvm
 xen/xenbus/xenbusb_front.c	optional xen | xenhvm
 xen/xenbus/xenbusb_back.c	optional xen | xenhvm
-xen/xenstore/xenstore.c		optional xen | xenhvm
-xen/xenstore/xenstore_dev.c	optional xen | xenhvm
 xdr/xdr.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 xdr/xdr_array.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 xdr/xdr_mbuf.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index a42e2522e16c..9e5a2ed86bf2 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -192,6 +192,26 @@ dev/ipmi/ipmi_smbios.c		optional	ipmi
 dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
 dev/ipmi/ipmi_pci.c		optional	ipmi pci
 dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
+dev/ixl/if_ixl.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/if_ixlv.c		optional	ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixlvc.c			optional	ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_txrx.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_osdep.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_lan_hmc.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_hmc.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_common.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_nvm.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_adminq.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
@@ -223,6 +243,7 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c		optional	hyperv
 dev/hyperv/netvsc/hv_rndis_filter.c			optional	hyperv
 dev/hyperv/stordisengage/hv_ata_pci_disengage.c		optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
+dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv
@@ -476,6 +497,7 @@ compat/linux/linux_socket.c	optional	compat_linux32
 compat/linux/linux_stats.c	optional	compat_linux32
 compat/linux/linux_sysctl.c	optional	compat_linux32
 compat/linux/linux_time.c	optional	compat_linux32
+compat/linux/linux_timer.c	optional	compat_linux32
 compat/linux/linux_uid16.c	optional	compat_linux32
 compat/linux/linux_util.c	optional	compat_linux32
 dev/amr/amr_linux.c		optional	compat_linux32 amr
@@ -560,3 +582,5 @@ x86/xen/pvcpu_enum.c		optional	xenhvm
 x86/xen/xen_apic.c		optional	xenhvm
 x86/xen/xenpv.c			optional	xenhvm
 x86/xen/xen_nexus.c		optional	xenhvm
+x86/xen/xen_msi.c		optional	xenhvm
+x86/xen/xen_pci.c		optional	xenhvm
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 1f7c71d443d5..f8c5fc4aaab3 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -49,6 +49,7 @@ arm/arm/stdatomic.c		standard \
 arm/arm/support.S		standard
 arm/arm/swtch.S			standard
 arm/arm/sys_machdep.c		standard
+arm/arm/syscall.c		standard
 arm/arm/trap.c			standard
 arm/arm/uio_machdep.c		standard
 arm/arm/undefined.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index a2f3bff45b08..0e4519dc769f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -83,6 +83,7 @@ compat/linux/linux_socket.c	optional compat_linux
 compat/linux/linux_stats.c	optional compat_linux
 compat/linux/linux_sysctl.c	optional compat_linux
 compat/linux/linux_time.c	optional compat_linux
+compat/linux/linux_timer.c	optional compat_linux
 compat/linux/linux_uid16.c	optional compat_linux
 compat/linux/linux_util.c	optional compat_linux
 compat/ndis/kern_ndis.c		optional ndisapi pci
@@ -215,6 +216,7 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c		optional	hyperv
 dev/hyperv/netvsc/hv_rndis_filter.c			optional	hyperv
 dev/hyperv/stordisengage/hv_ata_pci_disengage.c		optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
+dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv
@@ -597,3 +599,4 @@ x86/xen/xen_intr.c		optional xen | xenhvm
 x86/xen/xen_apic.c		optional xenhvm
 x86/xen/xenpv.c			optional xen | xenhvm
 x86/xen/xen_nexus.c		optional xen | xenhvm
+x86/xen/xen_msi.c		optional xen | xenhvm
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index ef7af3fa11ce..be67ce42a261 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -55,6 +55,7 @@ compat/linux/linux_socket.c	optional compat_linux
 compat/linux/linux_stats.c	optional compat_linux
 compat/linux/linux_sysctl.c	optional compat_linux
 compat/linux/linux_time.c	optional compat_linux
+compat/linux/linux_timer.c	optional compat_linux
 compat/linux/linux_uid16.c	optional compat_linux
 compat/linux/linux_util.c	optional compat_linux
 compat/svr4/imgact_svr4.c	optional compat_svr4
@@ -88,7 +89,8 @@ dev/agp/agp_via.c		optional agp
 dev/aic/aic_cbus.c		optional aic isa
 dev/ce/ceddk.c			optional ce
 dev/ce/if_ce.c			optional ce
-dev/ce/tau32-ddk.c		optional ce
+dev/ce/tau32-ddk.c		optional ce \
+	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/cp/cpddk.c			optional cp
 dev/cp/if_cp.c			optional cp
 dev/ct/bshw_machdep.c		optional ct
@@ -97,6 +99,8 @@ dev/ct/ct_isa.c			optional ct isa
 dev/ed/if_ed_cbus.c		optional ed isa
 dev/ed/if_ed_wd80x3.c		optional ed isa
 dev/fb/fb.c			optional fb | gdc
+dev/fdc/fdc.c			optional fdc
+dev/fdc/fdc_cbus.c		optional fdc isa
 dev/fe/if_fe_cbus.c		optional fe isa
 dev/hwpmc/hwpmc_amd.c		optional hwpmc
 dev/hwpmc/hwpmc_intel.c		optional hwpmc
@@ -145,6 +149,7 @@ i386/i386/initcpu.c		standard
 i386/i386/io.c			optional io
 i386/i386/k6_mem.c		optional mem
 i386/i386/locore.s		standard	no-obj
+i386/i386/machdep.c		standard
 i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp
@@ -216,8 +221,6 @@ libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
 pc98/apm/apm_bioscall.S		optional apm
 pc98/cbus/cbus_dma.c		optional isa
-pc98/cbus/fdc.c			optional fdc
-pc98/cbus/fdc_cbus.c		optional fdc isa
 pc98/cbus/gdc.c			optional gdc
 pc98/cbus/nmi.c			standard
 pc98/cbus/olpt.c		optional olpt
@@ -235,12 +238,11 @@ pc98/pc98/busiosubr.c		standard
 pc98/pc98/canbepm.c		optional canbepm
 pc98/pc98/canbus.c		optional canbus
 pc98/pc98/canbus_if.m		optional canbus
-pc98/pc98/machdep.c		standard
 pc98/pc98/pc98_machdep.c	standard
 #
 # x86 shared code between IA32, AMD64 and PC98 architectures
 #
-x86/isa/atpic.c			optional atpic	
+x86/isa/atpic.c			optional atpic
 x86/isa/clock.c			standard
 x86/isa/isa.c			optional isa
 x86/pci/pci_bus.c		optional pci
@@ -258,5 +260,4 @@ x86/x86/mptable_pci.c		optional apic pci
 x86/x86/msi.c			optional apic pci
 x86/x86/nexus.c			standard
 x86/x86/tsc.c			standard
-x86/x86/tsc.c			standard
 x86/x86/delay.c			standard
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 31555cce53c4..8c7a0baac5d4 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -23,7 +23,6 @@
 # src tree.
 
 __DEFAULT_YES_OPTIONS = \
-    ARM_EABI \
     BLUETOOTH \
     CDDL \
     CRYPT \
diff --git a/sys/conf/options b/sys/conf/options
index eff8a120d729..42113c35bd3e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -363,7 +363,7 @@ SYM_SETUP_PCI_PARITY	opt_sym.h	#-PCI parity checking
 SYM_SETUP_MAX_LUN	opt_sym.h	#-Number of LUNs supported
 					# default:8, range:[1..64]
 
-# Options used only in pci/ncr.c
+# Options used only in dev/ncr/*
 SCSI_NCR_DEBUG		opt_ncr.h
 SCSI_NCR_MAX_SYNC	opt_ncr.h
 SCSI_NCR_MAX_WIDE	opt_ncr.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index a10737be7672..a19ebd11271b 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -31,12 +31,6 @@ KVA_PAGES		opt_global.h
 
 TIMER_FREQ			opt_clock.h
 
-# options for serial support
-COM_ESP			opt_sio.h
-COM_MULTIPORT		opt_sio.h
-CONSPEED		opt_sio.h
-GDBSPEED		opt_sio.h
-
 CPU_BLUELIGHTNING_3X		opt_cpu.h
 CPU_BLUELIGHTNING_FPU_OP_CACHE	opt_cpu.h
 CPU_BTB_EN			opt_cpu.h
@@ -67,8 +61,17 @@ I486_CPU		opt_global.h
 I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
+# options for serial support
+COM_ESP			opt_sio.h
+COM_MULTIPORT		opt_sio.h
+CONSPEED		opt_sio.h
+GDBSPEED		opt_sio.h
+
 GDC
 
+# AGP debugging support
+AGP_DEBUG		opt_agp.h
+
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
 
@@ -96,7 +99,6 @@ DEV_NPX			opt_npx.h
 
 # Debugging
 NPX_DEBUG		opt_npx.h
-AGP_DEBUG		opt_agp.h
 
 # BPF just-in-time compiler
 BPF_JITTER		opt_bpf.h
diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/contrib/altq/altq/if_altq.h
index 9524c45177b3..7c4d1c2795cd 100644
--- a/sys/contrib/altq/altq/if_altq.h
+++ b/sys/contrib/altq/altq/if_altq.h
@@ -50,7 +50,6 @@ struct	ifaltq {
 	struct	mbuf *ifq_tail;
 	int	ifq_len;
 	int	ifq_maxlen;
-	int	ifq_drops;
 #ifdef __FreeBSD__
 	struct	mtx ifq_mtx;
 #endif
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index a6802ef325c7..00c5fa43f290 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -19,9 +19,10 @@ fulldirs="common compiler components include os_specific"
 # files to remove
 stripdirs="generate libraries tests tools"
 stripfiles="Makefile README accygwin.h acefi.h achaiku.h acintel.h	\
-	aclinux.h acmacosx.h acmsvc.h acnetbsd.h acos2.h acwin.h	\
-	acwin64.h new_table.txt osfreebsdtbl.c oslinuxtbl.c osunixdir.c	\
-	osunixmap.c oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c"
+	aclinux.h aclinuxex.h acmacosx.h acmsvc.h acnetbsd.h acos2.h	\
+	acwin.h	acwin64.h new_table.txt osefitbl.c osefixf.c		\
+	osfreebsdtbl.c oslinuxtbl.c osunixdir.c osunixmap.c oswindir.c	\
+	oswintbl.c oswinxf.c readme.txt utclib.c"
 
 # include files to canonify
 src_headers="acapps.h acbuffer.h accommon.h acconfig.h acdebug.h	\
@@ -30,8 +31,8 @@ src_headers="acapps.h acbuffer.h accommon.h acconfig.h acdebug.h	\
 	acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h	\
 	acpredef.h acresrc.h acrestyp.h acstruct.h actables.h actbl.h	\
 	actbl1.h actbl2.h actbl3.h actypes.h acutils.h amlcode.h	\
-	amlresrc.h platform/acenv.h platform/acfreebsd.h		\
-	platform/acgcc.h"
+	amlresrc.h platform/acenv.h platform/acenvex.h			\
+	platform/acfreebsd.h platform/acgcc.h"
 comp_headers="aslcompiler.h asldefine.h aslglobal.h aslmessages.h	\
 	aslsupport.l asltypes.h dtcompiler.h dttemplate.h preprocess.h"
 platform_headers="acfreebsd.h acgcc.h"
diff --git a/sys/contrib/dev/acpica/changes.txt b/sys/contrib/dev/acpica/changes.txt
index ab43358d46f5..1c2b1edbae9c 100644
--- a/sys/contrib/dev/acpica/changes.txt
+++ b/sys/contrib/dev/acpica/changes.txt
@@ -1,3 +1,920 @@
+----------------------------------------
+26 September 2014. Summary of changes for version 20140926:
+
+1) ACPICA kernel-resident subsystem:
+
+Updated the GPIO operation region handler interface (GeneralPurposeIo). 
+In order to support GPIO Connection objects with multiple pins, along 
+with the related Field objects, the following changes to the interface 
+have been made: The Address is now defined to be the offset in bits of 
+the field unit from the previous invocation of a Connection. It can be 
+viewed as a "Pin Number Index" into the connection resource descriptor. 
+The BitWidth is the exact bit width of the field. It is usually one bit, 
+but not always. See the ACPICA reference guide (section 8.8.6.2.1) for 
+additional information and examples.
+
+GPE support: During ACPICA/GPE initialization, ensure that all GPEs with 
+corresponding _Lxx/_Exx methods are disabled (they may have been enabled 
+by the firmware), so that they cannot fire until they are enabled via 
+AcpiUpdateAllGpes. Rafael J. Wysocki.
+
+Added a new return flag for the Event/GPE status interfaces -- 
+AcpiGetEventStatus and AcpiGetGpeStatus. The new 
+ACPI_EVENT_FLAGS_HAS_HANDLER flag is used to indicate that the event or 
+GPE currently has a handler associated with it, and can thus actually 
+affect the system. Lv Zheng.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  99.1K Code, 27.3K Data, 126.4K Total
+    Debug Version:     192.8K Code, 79.9K Data, 272.7K Total
+  Previous Release:
+    Non-Debug Version:  98.8K Code, 27.3K Data, 126.1K Total
+    Debug Version:     192.1K Code, 79.8K Data, 271.9K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Fixed a memory allocation/free regression introduced in 20140828 
+that could cause the compiler to crash. This was introduced inadvertently 
+during the effort to eliminate compiler memory leaks. ACPICA BZ 1111, 
+1113.
+
+iASL: Removed two error messages that have been found to create false 
+positives, until they can be fixed and fully validated (ACPICA BZ 1112):
+1) Illegal forward reference within a method
+2) Illegal reference across two methods
+
+iASL: Implemented a new option (-lm) to create a hardware mapping file 
+that summarizes all GPIO, I2C, SPI, and UART connections. This option 
+works for both the compiler and disassembler. See the iASL compiler user 
+guide for additional information and examples (section 6.4.6).
+
+AcpiDump: Added support for the version 1 (ACPI 1.0) RSDP in addition to 
+version 2. This corrects the AE_BAD_HEADER exception seen on systems with 
+a version 1 RSDP. Lv Zheng ACPICA BZ 1097.
+
+AcpiExec: For Unix versions, don't attempt to put STDIN into raw mode 
+unless STDIN is actually a terminal. Assists with batch-mode processing. 
+ACPICA BZ 1114.
+
+Disassembler/AcpiHelp: Added another large group of recognized _HID 
+values.
+
+
+----------------------------------------
+28 August 2014. Summary of changes for version 20140828:
+
+1) ACPICA kernel-resident subsystem:
+
+Fixed a problem related to the internal use of the Timer() operator where 
+a 64-bit divide could cause an attempted link to a double-precision math 
+library. This divide is not actually necessary, so the code was 
+restructured to eliminate it. Lv Zheng.
+
+ACPI 5.1: Added support for the runtime validation of the _DSD package 
+(similar to the iASL support).
+
+ACPI 5.1/Headers: Added support for the GICC affinity subtable to the 
+SRAT table. Hanjun Guo <hanjun.guo@linaro.org>.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  98.8K Code, 27.3K Data, 126.1K Total
+    Debug Version:     192.1K Code, 79.8K Data, 271.9K Total
+  Previous Release:
+    Non-Debug Version:  98.7K Code, 27.3K Data, 126.0K Total1
+    Debug Version:     192.0K Code, 79.7K Data, 271.7K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+AcpiExec: Fixed a problem on unix systems where the original terminal 
+state was not always properly restored upon exit. Seen when using the -v 
+option. ACPICA BZ 1104.
+
+iASL: Fixed a problem with the validation of the ranges/length within the 
+Memory24 resource descriptor. There was a boundary condition when the 
+range was equal to the (length -1) caused by the fact that these values 
+are defined in 256-byte blocks, not bytes. ACPICA BZ 1098
+
+Disassembler: Fixed a problem with the GpioInt descriptor interrupt 
+polarity 
+flags. The flags are actually 2 bits, not 1, and the "ActiveBoth" keyword 
+is 
+now supported properly.
+
+ACPI 5.1: Added the GICC affinity subtable to the SRAT table. Supported 
+in the disassembler, data table compiler, and table template generator.
+
+iASL: Added a requirement for Device() objects that one of either a _HID 
+or _ADR must exist within the scope of a Device, as per the ACPI 
+specification. Remove a similar requirement that was incorrectly in place 
+for the _DSD object.
+
+iASL: Added error detection for illegal named references within control 
+methods that would cause runtime failures. Now trapped as errors are: 1) 
+References to objects within a non-parent control method. 2) Forward 
+references (within a method) -- for control methods, AML interpreters use 
+a one-pass parse of control methods. ACPICA BZ 1008.
+
+iASL: Added error checking for dependencies related to the _PSx power 
+methods. ACPICA BZ 1029.
+1) For _PS0, one of these must exist within the same scope: _PS1, _PS2, 
+_PS3.
+2) For _PS1, _PS2, and PS3: A _PS0 object must exist within the same 
+scope.
+
+iASL and table compiler: Cleanup miscellaneous memory leaks by fully 
+deploying the existing object and string caches and adding new caches for 
+the table compiler.
+
+iASL: Split the huge parser source file into multiple subfiles to improve 
+manageability. Generation now requires the M4 macro preprocessor, which 
+is part of the Bison distribution on both unix and windows platforms.
+
+AcpiSrc: Fixed and removed all extraneous warnings generated during 
+entire ACPICA source code scan and/or conversion.
+
+
+----------------------------------------
+
+24 July 2014. Summary of changes for version 20140724: 
+
+The ACPI 5.1 specification has been released and is available at: 
+http://uefi.org/specs/access
+
+
+0) ACPI 5.1 support in ACPICA:
+
+ACPI 5.1 is fully supported in ACPICA as of this release.
+
+New predefined names. Support includes iASL and runtime ACPICA 
+validation.
+    _CCA (Cache Coherency Attribute).
+    _DSD (Device-Specific Data). David Box.
+
+Modifications to existing ACPI tables. Support includes headers, iASL 
+Data Table compiler, disassembler, and the template generator.
+    FADT - New fields and flags. Graeme Gregory.
+    GTDT - One new subtable and new fields. Tomasz Nowicki.
+    MADT - Two new subtables. Tomasz Nowicki.
+    PCCT - One new subtable.
+
+Miscellaneous.
+    New notification type for System Resource Affinity change events.
+
+
+1) ACPICA kernel-resident subsystem:
+
+Fixed a regression introduced in 20140627 where a fault can happen during 
+the deletion of Alias AML namespace objects. The problem affected both 
+the core ACPICA and the ACPICA tools including iASL and AcpiExec.
+
+Implemented a new GPE public interface, AcpiMarkGpeForWake. Provides a 
+simple mechanism to enable wake GPEs that have no associated handler or 
+control method. Rafael Wysocki.
+
+Updated the AcpiEnableGpe interface to disallow the enable if there is no 
+handler or control method associated with the particular GPE. This will 
+help avoid meaningless GPEs and even GPE floods. Rafael Wysocki.
+
+Updated GPE handling and dispatch by disabling the GPE before clearing 
+the status bit for edge-triggered GPEs. Lv Zheng.
+
+Added Timer() support to the AML Debug object. The current timer value is 
+now displayed with each invocation of (Store to) the debug object to 
+enable simple generation of execution times for AML code (method 
+execution for example.) ACPICA BZ 1093.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  98.7K Code, 27.3K Data, 126.0K Total
+    Debug Version:     192.0K Code, 79.7K Data, 271.7K Total
+  Previous Release:
+    Non-Debug Version:  98.7K Code, 27.2K Data, 125.9K Total
+    Debug Version:     191.7K Code, 79.6K Data, 271.3K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Fixed an issue with the recently added local printf implementation, 
+concerning width/precision specifiers that could cause incorrect output. 
+Lv Zheng. ACPICA BZ 1094.
+
+Disassembler: Added support to detect buffers that contain UUIDs and 
+disassemble them to an invocation of the ToUUID operator. Also emit 
+commented descriptions of known ACPI-related UUIDs.
+
+AcpiHelp: Added support to display known ACPI-related UUIDs. New option, 
+-u. Adds three new files. 
+
+iASL: Update table compiler and disassembler for DMAR table changes that 
+were introduced in September 2013. With assistance by David Woodhouse.
+
+----------------------------------------
+27 June 2014. Summary of changes for version 20140627:
+
+1) ACPICA kernel-resident subsystem:
+
+Formatted Output: Implemented local versions of standard formatted output 
+utilities such as printf, etc. Over time, it has been discovered that 
+there are in fact many portability issues with printf, and the addition 
+of this feature will fix/prevent these issues once and for all. Some 
+known issues are summarized below:
+
+1) Output of 64-bit values is not portable. For example, UINT64 is %ull 
+for the Linux kernel and is %uI64 for some MSVC versions.
+2) Invoking printf consistently in a manner that is portable across both 
+32-bit and 64-bit platforms is difficult at best in many situations.
+3) The output format for pointers varies from system to system (leading 
+zeros especially), and leads to inconsistent output from ACPICA across 
+platforms.
+4) Certain platform-specific printf formats may conflict with ACPICA use.
+5) If there is no local C library available, ACPICA now has local support 
+for printf.
+
+-- To address these printf issues in a complete manner, ACPICA now 
+directly implements a small subset of printf format specifiers, only 
+those that it requires. Adds a new file, utilities/utprint.c. Lv Zheng.
+
+Implemented support for ACPICA generation within the EFI environment. 
+Initially, the AcpiDump utility is supported in the UEFI shell 
+environment. Lv Zheng.
+
+Added a new external interface, AcpiLogError, to improve ACPICA 
+portability. This allows the host to redirect error messages from the 
+ACPICA utilities. Lv Zheng.
+
+Added and deployed new OSL file I/O interfaces to improve ACPICA 
+portability:
+  AcpiOsOpenFile
+  AcpiOsCloseFile
+  AcpiOsReadFile
+  AcpiOsWriteFile
+  AcpiOsGetFileOffset
+  AcpiOsSetFileOffset
+There are C library implementations of these functions in the new file 
+service_layers/oslibcfs.c -- however, the functions can be implemented by 
+the local host in any way necessary. Lv Zheng.
+
+Implemented a mechanism to disable/enable ACPI table checksum validation 
+at runtime. This can be useful when loading tables very early during OS 
+initialization when it may not be possible to map the entire table in 
+order to compute the checksum. Lv Zheng.
+
+Fixed a buffer allocation issue for the Generic Serial Bus support. 
+Originally, a fixed buffer length was used. This change allows for 
+variable-length buffers based upon the protocol indicated by the field 
+access attributes. Reported by Lan Tianyu. Lv Zheng.
+
+Fixed a problem where an object detached from a namespace node was not 
+properly terminated/cleared and could cause a circular list problem if 
+reattached. ACPICA BZ 1063. David Box.
+
+Fixed a possible recursive lock acquisition in hwregs.c. Rakib Mullick.
+
+Fixed a possible memory leak in an error return path within the function 
+AcpiUtCopyIobjectToIobject. ACPICA BZ 1087. Colin Ian King.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  98.7K Code, 27.2K Data, 125.9K Total
+    Debug Version:     191.7K Code, 79.6K Data, 271.3K Total
+  Previous Release:
+    Non-Debug Version:  96.8K Code, 27.2K Data, 124.0K Total
+    Debug Version:     189.5K Code, 79.7K Data, 269.2K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Add dump of ASCII equivalent text within a comment at the 
+end of each line of the output for the Buffer() ASL operator.
+
+AcpiDump: Miscellaneous changes:
+  Fixed repetitive table dump in -n mode.
+  For older EFI platforms, use the ACPI 1.0 GUID during RSDP search if 
+the ACPI 2.0 GUID fails.
+
+iASL: Fixed a problem where the compiler could fault if incorrectly given 
+an acpidump output file as input. ACPICA BZ 1088. David Box.
+
+AcpiExec/AcpiNames: Fixed a problem where these utilities could fault if 
+they are invoked without any arguments.
+
+Debugger: Fixed a possible memory leak in an error return path. ACPICA BZ 
+1086. Colin Ian King.
+
+Disassembler: Cleaned up a block of code that extracts a parent Op 
+object. Added a comment that explains that the parent is guaranteed to be 
+valid in this case. ACPICA BZ 1069.
+
+----------------------------------------
+24 April 2014. Summary of changes for version 20140424:
+
+1) ACPICA kernel-resident subsystem:
+
+Implemented support to skip/ignore NULL address entries in the RSDT/XSDT. 
+Some of these tables are known to contain a trailing NULL entry. Lv 
+Zheng.
+
+Removed an extraneous error message for the case where there are a large 
+number of system GPEs (> 124). This was the "32-bit FADT register is too 
+long to convert to GAS struct" message, which is irrelevant for GPEs 
+since the GPEx_BLK_LEN fields of the FADT are always used instead of the 
+(limited capacity) GAS bit length. Also, several changes to ensure proper 
+support for GPE numbers > 255, where some "GPE number" fields were 8-bits 
+internally.
+
+Implemented and deployed additional configuration support for the public 
+ACPICA external interfaces. Entire classes of interfaces can now be 
+easily modified or configured out, replaced by stubbed inline functions 
+by default. Lv Zheng.
+
+Moved all public ACPICA runtime configuration globals to the public 
+ACPICA external interface file for convenience. Also, removed some 
+obsolete/unused globals. See the file acpixf.h. Lv Zheng.
+
+Documentation: Added a new section to the ACPICA reference describing the 
+maximum number of GPEs that can be supported by the FADT-defined GPEs in 
+block zero and one. About 1200 total. See section 4.4.1 of the ACPICA 
+reference.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  96.8K Code, 27.2K Data, 124.0K Total
+    Debug Version:     189.5K Code, 79.7K Data, 269.2K Total
+  Previous Release:
+    Non-Debug Version:  97.0K Code, 27.2K Data, 124.2K Total
+    Debug Version:     189.7K Code, 79.5K Data, 269.2K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL and disassembler: Add full support for the LPIT table (Low Power 
+Idle Table). Includes support in the disassembler, data table compiler, 
+and template generator.
+
+AcpiDump utility:
+1) Add option to force the use of the RSDT (over the XSDT).
+2) Improve validation of the RSDP signature (use 8 chars instead of 4).
+
+iASL: Add check for predefined packages that are too large.  For 
+predefined names that contain subpackages, check if each subpackage is 
+too large. (Check for too small already exists.)
+
+Debugger: Updated the GPE command (which simulates a GPE by executing the 
+GPE code paths in ACPICA). The GPE device is now optional, and defaults 
+to the GPE 0/1 FADT-defined blocks.
+
+Unix application OSL: Update line-editing support. Add additional error 
+checking and take care not to reset terminal attributes on exit if they 
+were never set. This should help guarantee that the terminal is always 
+left in the previous state on program exit.
+
+----------------------------------------
+25 March 2014. Summary of changes for version 20140325:
+
+1) ACPICA kernel-resident subsystem:
+
+Updated the auto-serialize feature for control methods. This feature 
+automatically serializes all methods that create named objects in order 
+to prevent runtime errors. The update adds support to ignore the 
+currently executing AML SyncLevel when invoking such a method, in order 
+to prevent disruption of any existing SyncLevel priorities that may exist 
+in the AML code. Although the use of SyncLevels is relatively rare, this 
+change fixes a regression where an AE_AML_MUTEX_ORDER exception can 
+appear on some machines starting with the 20140214 release.
+
+Added a new external interface to allow the host to install ACPI tables 
+very early, before the namespace is even created. AcpiInstallTable gives 
+the host additional flexibility for ACPI table management. Tables can be 
+installed directly by the host as if they had originally appeared in the 
+XSDT/RSDT. Installed tables can be SSDTs or other ACPI data tables 
+(anything except the DSDT and FACS). Adds a new file, tbdata.c, along 
+with additional internal restructuring and cleanup. See the ACPICA 
+Reference for interface details. Lv Zheng.
+
+Added validation of the checksum for all incoming dynamically loaded 
+tables (via external interfaces or via AML Load/LoadTable operators). Lv 
+Zheng.
+
+Updated the use of the AcpiOsWaitEventsComplete interface during Notify 
+and GPE handler removal. Restructured calls to eliminate possible race 
+conditions. Lv Zheng.
+
+Added a warning for the use/execution of the ASL/AML Unload (table) 
+operator. This will help detect and identify machines that use this 
+operator if and when it is ever used. This operator has never been seen 
+in the field and the usage model and possible side-effects of the drastic 
+runtime action of a full table removal are unknown.
+
+Reverted the use of #pragma push/pop which was introduced in the 20140214 
+release. It appears that push and pop are not implemented by enough 
+compilers to make the use of this feature feasible for ACPICA at this 
+time. However, these operators may be deployed in a future ACPICA 
+release.
+
+Added the missing EXPORT_SYMBOL macros for the install and remove SCI 
+handler interfaces.
+
+Source code generation:
+1) Disabled the use of the "strchr" macro for the gcc-specific 
+generation. For some versions of gcc, this macro can periodically expose 
+a compiler bug which in turn causes compile-time error(s).
+2) Added support for PPC64 compilation. Colin Ian King.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  97.0K Code, 27.2K Data, 124.2K Total
+    Debug Version:     189.7K Code, 79.5K Data, 269.2K Total
+  Previous Release:
+    Non-Debug Version:  96.5K Code, 27.2K Data, 123.7K Total
+    Debug Version:     188.6K Code, 79.0K Data, 267.6K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Added several new features to improve the readability of 
+the resulting ASL code. Extra information is emitted within comment 
+fields in the ASL code:
+1) Known _HID/_CID values are decoded to descriptive text.
+2) Standard values for the Notify() operator are decoded to descriptive 
+text.
+3) Target operands are expanded to full pathnames (in a comment) when 
+possible.
+
+Disassembler: Miscellaneous updates for extern() handling:
+1) Abort compiler if file specified by -fe option does not exist.
+2) Silence unnecessary warnings about argument count mismatches.
+3) Update warning messages concerning unresolved method externals.
+4) Emit "UnknownObj" keyword for externals whose type cannot be 
+determined.
+
+AcpiHelp utility:
+1) Added the -a option to display both the ASL syntax and the AML 
+encoding for an input ASL operator. This effectively displays all known 
+information about an ASL operator with one AcpiHelp invocation.
+2) Added substring match support (similar to a wildcard) for the -i 
+(_HID/PNP IDs) option.
+
+iASL/Disassembler: Since this tool does not yet support execution on big-
+endian machines, added detection of endianness and an error message if 
+execution is attempted on big-endian. Support for big-endian within iASL 
+is a feature that is on the ACPICA to-be-done list.
+
+AcpiBin utility:
+1) Remove option to extract binary files from an acpidump; this function 
+is made obsolete by the AcpiXtract utility.
+2) General cleanup of open files and allocated buffers.
+
+----------------------------------------
+14 February 2014. Summary of changes for version 20140214:
+
+1) ACPICA kernel-resident subsystem:
+
+Implemented a new mechanism to proactively prevent problems with ill-
+behaved reentrant control methods that create named ACPI objects. This 
+behavior is illegal as per the ACPI specification, but is nonetheless 
+frequently seen in the field. Previously, this could lead to an 
+AE_ALREADY_EXISTS exception if the method was actually entered by more 
+than one thread. This new mechanism detects such methods at table load 
+time and marks them "serialized" to prevent reentrancy. A new global 
+option, AcpiGbl_AutoSerializeMethods, has been added to disable this 
+feature if desired. This mechanism and global option obsoletes and 
+supersedes the previous AcpiGbl_SerializeAllMethods option.
+
+Added the "Windows 2013" string to the _OSI support. ACPICA will now 
+respond TRUE to _OSI queries with this string. It is the stated policy of 
+ACPICA to add new strings to the _OSI support as soon as possible after 
+they are defined. See the full ACPICA _OSI policy which has been added to 
+the utilities/utosi.c file.
+
+Hardened/updated the _PRT return value auto-repair code:
+1) Do not abort the repair on a single subpackage failure, continue to 
+check all subpackages.
+2) Add check for the minimum subpackage length (4).
+3) Properly handle extraneous NULL package elements.
+
+Added support to avoid the possibility of infinite loops when traversing 
+object linked lists. Never allow an infinite loop, even in the face of 
+corrupted object lists.
+
+ACPICA headers: Deployed the use of #pragma pack(push) and #pragma 
+pack(pop) directives to ensure that the ACPICA headers are independent of 
+compiler settings or other host headers.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  96.5K Code, 27.2K Data, 123.7K Total
+    Debug Version:     188.6K Code, 79.0K Data, 267.6K Total
+  Previous Release:
+    Non-Debug Version:  96.2K Code, 27.0K Data, 123.2K Total
+    Debug Version:     187.5K Code, 78.3K Data, 265.8K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL/Table-compiler: Fixed a problem with support for the SPMI table. The 
+first reserved field was incorrectly forced to have a value of zero. This 
+change correctly forces the field to have a value of one. ACPICA BZ 1081.
+
+Debugger: Added missing support for the "Extra" and "Data" subobjects 
+when displaying object data.
+
+Debugger: Added support to display entire object linked lists when 
+displaying object data.
+
+iASL: Removed the obsolete -g option to obtain ACPI tables from the 
+Windows registry. This feature has been superseded by the acpidump 
+utility. 
+
+----------------------------------------
+14 January 2014. Summary of changes for version 20140114:
+
+1) ACPICA kernel-resident subsystem:
+
+Updated all ACPICA copyrights and signons to 2014. Added the 2014 
+copyright to all module headers and signons, including the standard Linux 
+header. This affects virtually every file in the ACPICA core subsystem, 
+iASL compiler, all ACPICA utilities, and the test suites.
+
+Improved parameter validation for AcpiInstallGpeBlock. Added the 
+following checks:
+1) The incoming device handle refers to type ACPI_TYPE_DEVICE.
+2) There is not already a GPE block attached to the device.
+Likewise, with AcpiRemoveGpeBlock, ensure that the incoming object is a 
+device.
+
+Correctly support "references" in the ACPI_OBJECT. This change fixes the 
+support to allow references (namespace nodes) to be passed as arguments 
+to control methods via the evaluate object interface. This is probably 
+most useful for testing purposes, however.
+
+Improved support for 32/64 bit physical addresses in printf()-like 
+output. This change improves the support for physical addresses in printf 
+debug statements and other output on both 32-bit and 64-bit hosts. It 
+consistently outputs the appropriate number of bytes for each host. The 
+%p specifier is unsatisfactory since it does not emit uniform output on 
+all hosts/clib implementations (on some, leading zeros are not supported, 
+leading to difficult-to-read output).
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  96.2K Code, 27.0K Data, 123.2K Total
+    Debug Version:     187.5K Code, 78.3K Data, 265.8K Total
+  Previous Release:
+    Non-Debug Version:  96.1K Code, 27.0K Data, 123.1K Total
+    Debug Version:     185.6K Code, 77.3K Data, 262.9K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Fix a possible fault when using the Connection() operator. Fixes a 
+problem if the parent Field definition for the Connection operator refers 
+to an operation region that does not exist. ACPICA BZ 1064.
+
+AcpiExec: Load of local test tables is now optional. The utility has the 
+capability to load some various tables to test features of ACPICA. 
+However, there are enough of them that the output of the utility became 
+confusing. With this change, only the required local tables are displayed 
+(RSDP, XSDT, etc.) along with the actual tables loaded via the command 
+line specification. This makes the default output simler and easier to 
+understand. The -el command line option restores the original behavior 
+for testing purposes.
+
+AcpiExec: Added support for overlapping operation regions. This change 
+expands the simulation of operation regions by supporting regions that 
+overlap within the given address space. Supports SystemMemory and 
+SystemIO. ASLTS test suite updated also. David Box. ACPICA BZ 1031.
+
+AcpiExec: Added region handler support for PCI_Config and EC spaces. This 
+allows AcpiExec to simulate these address spaces, similar to the current 
+support for SystemMemory and SystemIO.
+
+Debugger: Added new command to read/write/compare all namespace objects. 
+The command "test objects" will exercise the entire namespace by writing 
+new values to each data object, and ensuring that the write was 
+successful. The original value is then restored and verified.
+
+Debugger: Added the "test predefined" command. This change makes this 
+test public and puts it under the new "test" command. The test executes 
+each and every predefined name within the current namespace.
+
+----------------------------------------
+18 December 2013. Summary of changes for version 20131218:
+
+Global note: The ACPI 5.0A specification was released this month. There 
+are no changes needed for ACPICA since this release of ACPI is an 
+errata/clarification release. The specification is available at 
+acpi.info. 
+
+
+1) ACPICA kernel-resident subsystem:
+
+Added validation of the XSDT root table if it is present. Some older 
+platforms contain an XSDT that is ill-formed or otherwise invalid (such 
+as containing some or all entries that are NULL pointers). This change 
+adds a new function to validate the XSDT before actually using it. If the 
+XSDT is found to be invalid, ACPICA will now automatically fall back to 
+using the RSDT instead. Original implementation by Zhao Yakui. Ported to 
+ACPICA and enhanced by Lv Zheng and Bob Moore.
+
+Added a runtime option to ignore the XSDT and force the use of the RSDT. 
+This change adds a runtime option that will force ACPICA to use the RSDT 
+instead of the XSDT (AcpiGbl_DoNotUseXsdt). Although the ACPI spec 
+requires that an XSDT be used instead of the RSDT, the XSDT has been 
+found to be corrupt or ill-formed on some machines. Lv Zheng.
+
+Added a runtime option to favor 32-bit FADT register addresses over the 
+64-bit addresses. This change adds an option to favor 32-bit FADT 
+addresses when there is a conflict between the 32-bit and 64-bit versions 
+of the same register. The default behavior is to use the 64-bit version 
+in accordance with the ACPI specification. This can now be overridden via 
+the AcpiGbl_Use32BitFadtAddresses flag. ACPICA BZ 885. Lv Zheng.
+
+During the change above, the internal "Convert FADT" and "Verify FADT" 
+functions have been merged to simplify the code, making it easier to 
+understand and maintain. ACPICA BZ 933.
+
+Improve exception reporting and handling for GPE block installation. 
+Return an actual status from AcpiEvGetGpeXruptBlock and don't clobber the 
+status when exiting AcpiEvInstallGpeBlock. ACPICA BZ 1019.
+
+Added helper macros to extract bus/segment numbers from the HEST table. 
+This change adds two macros to extract the encoded bus and segment 
+numbers from the HEST Bus field - ACPI_HEST_BUS and ACPI_HEST_SEGMENT. 
+Betty Dall <betty.dall@hp.com>
+
+Removed the unused ACPI_FREE_BUFFER macro. This macro is no longer used 
+by ACPICA. It is not a public macro, so it should have no effect on 
+existing OSV code. Lv Zheng.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  96.1K Code, 27.0K Data, 123.1K Total
+    Debug Version:     185.6K Code, 77.3K Data, 262.9K Total
+  Previous Release:
+    Non-Debug Version:  95.9K Code, 27.0K Data, 122.9K Total
+    Debug Version:     185.1K Code, 77.2K Data, 262.3K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Improved pathname support for emitted External() 
+statements. This change adds full pathname support for external names 
+that have been resolved internally by the inclusion of additional ACPI 
+tables (via the iASL -e option). Without this change, the disassembler 
+can emit multiple externals for the same object, or it become confused 
+when the Scope() operator is used on an external object. Overall, greatly 
+improves the ability to actually recompile the emitted ASL code when 
+objects a referenced across multiple ACPI tables. Reported by Michael 
+Tsirkin (mst@redhat.com).
+
+Tests/ASLTS: Updated functional control suite to execute with no errors. 
+David Box. Fixed several errors related to the testing of the interpreter 
+slack mode. Lv Zheng.
+
+iASL: Added support to detect names that are declared within a control 
+method, but are unused (these are temporary names that are only valid 
+during the time the method is executing). A remark is issued for these 
+cases. ACPICA BZ 1022.
+
+iASL: Added full support for the DBG2 table. Adds full disassembler, 
+table compiler, and template generator support for the DBG2 table (Debug 
+Port 2 table).
+
+iASL: Added full support for the PCCT table, update the table definition. 
+Updates the PCCT table definition in the actbl3.h header and adds table 
+compiler and template generator support.
+
+iASL: Added an option to emit only error messages (no warnings/remarks). 
+The -ve option will enable only error messages, warnings and remarks are 
+suppressed. This can simplify debugging when only the errors are 
+important, such as when an ACPI table is disassembled and there are many 
+warnings and remarks -- but only the actual errors are of real interest.
+
+Example ACPICA code (source/tools/examples): Updated the example code so 
+that it builds to an actual working program, not just example code. Added 
+ACPI tables and execution of an example control method in the DSDT. Added 
+makefile support for Unix generation.
+
+----------------------------------------
+15 November 2013. Summary of changes for version 20131115:
+
+This release is available at https://acpica.org/downloads
+
+
+1) ACPICA kernel-resident subsystem:
+
+Resource Manager: Fixed loop termination for the "get AML length" 
+function. The loop previously had an error termination on a NULL resource 
+pointer, which can never happen since the loop simply increments a valid 
+resource pointer. This fix changes the loop to terminate with an error on 
+an invalid end-of-buffer condition. The problem can be seen as an 
+infinite loop by callers to AcpiSetCurrentResources with an invalid or 
+corrupted resource descriptor, or a resource descriptor that is missing 
+an END_TAG descriptor. Reported by Dan Carpenter 
+<dan.carpenter@oracle.com>. Lv Zheng, Bob Moore.
+
+Table unload and ACPICA termination: Delete all attached data objects 
+during namespace node deletion. This fix updates namespace node deletion 
+to delete the entire list of attached objects (attached via 
+AcpiAttachObject) instead of just one of the attached items. ACPICA BZ 
+1024. Tomasz Nowicki (tomasz.nowicki@linaro.org).
+
+ACPICA termination: Added support to delete all objects attached to the 
+root namespace node. This fix deletes any and all objects that have been 
+attached to the root node via AcpiAttachData. Previously, none of these 
+objects were deleted. Reported by Tomasz Nowicki. ACPICA BZ 1026.
+
+Debug output: Do not emit the function nesting level for the in-kernel 
+build. The nesting level is really only useful during a single-thread 
+execution. Therefore, only enable this output for the AcpiExec utility. 
+Also, only emit the thread ID when executing under AcpiExec (Context 
+switches are still always detected and a message is emitted). ACPICA BZ 
+972.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  95.9K Code, 27.0K Data, 122.9K Total
+    Debug Version:     185.1K Code, 77.2K Data, 262.3K Total
+  Previous Release:
+    Non-Debug Version:  95.8K Code, 27.0K Data, 122.8K Total
+    Debug Version:     185.2K Code, 77.2K Data, 262.4K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+AcpiExec/Unix-OSL: Use <termios.h> instead of <termio.h>. This is the 
+correct portable POSIX header for terminal control functions.
+
+Disassembler: Fixed control method invocation issues related to the use 
+of the CondRefOf() operator. The problem is seen in the disassembly where 
+control method invocations may not be disassembled properly if the 
+control method name has been used previously as an argument to CondRefOf. 
+The solution is to not attempt to emit an external declaration for the 
+CondRefOf target (it is not necessary in the first place). This prevents 
+disassembler object type confusion. ACPICA BZ 988.
+
+Unix Makefiles: Added an option to disable compiler optimizations and the 
+_FORTIFY_SOURCE flag. Some older compilers have problems compiling ACPICA 
+with optimizations (reportedly, gcc 4.4 for example). This change adds a 
+command line option for make (NOOPT) that disables all compiler 
+optimizations and the _FORTIFY_SOURCE compiler flag. The default 
+optimization is -O2 with the _FORTIFY_SOURCE flag specified. ACPICA BZ 
+1034. Lv Zheng, Bob Moore.
+
+Tests/ASLTS: Added options to specify individual test cases and modes. 
+This allows testers running aslts.sh to optionally specify individual 
+test modes and test cases. Also added an option to disable the forced 
+generation of the ACPICA tools from source if desired. Lv Zheng.
+
+----------------------------------------
+27 September 2013. Summary of changes for version 20130927:
+
+This release is available at https://acpica.org/downloads
+
+
+1) ACPICA kernel-resident subsystem:
+
+Fixed a problem with store operations to reference objects. This change 
+fixes a problem where a Store operation to an ArgX object that contained 
+a 
+reference to a field object did not complete the automatic dereference 
+and 
+then write to the actual field object. Instead, the object type of the 
+field object was inadvertently changed to match the type of the source 
+operand. The new behavior will actually write to the field object (buffer 
+field or field unit), thus matching the correct ACPI-defined behavior.
+
+Implemented support to allow the host to redefine individual OSL 
+prototypes. This change enables the host to redefine OSL prototypes found 
+in the acpiosxf.h file. This allows the host to implement OSL interfaces 
+with a macro or inlined function. Further, it allows the host to add any 
+additional required modifiers such as __iomem, __init, __exit, etc., as 
+necessary on a per-interface basis. Enables maximum flexibility for the 
+OSL interfaces. Lv Zheng.
+
+Hardcoded the access width for the FADT-defined reset register. The ACPI 
+specification requires the reset register width to be 8 bits. ACPICA now 
+hardcodes the width to 8 and ignores the FADT width value. This provides 
+compatibility with other ACPI implementations that have allowed BIOS code 
+with bad register width values to go unnoticed. Matthew Garett, Bob 
+Moore, 
+Lv Zheng.
+
+Changed the position/use of the ACPI_PRINTF_LIKE macro. This macro is 
+used 
+in the OSL header (acpiosxf). The change modifies the position of this 
+macro in each instance where it is used (AcpiDebugPrint, etc.) to avoid 
+build issues if the OSL defines the implementation of the interface to be 
+an inline stub function. Lv Zheng.
+
+Deployed a new macro ACPI_EXPORT_SYMBOL_INIT for the main ACPICA 
+initialization interfaces. This change adds a new macro for the main init 
+and terminate external interfaces in order to support hosts that require 
+additional or different processing for these functions. Changed from 
+ACPI_EXPORT_SYMBOL to ACPI_EXPORT_SYMBOL_INIT for these functions. Lv 
+Zheng, Bob Moore.
+
+Cleaned up the memory allocation macros for configurability. In the 
+common 
+case, the ACPI_ALLOCATE and related macros now resolve directly to their 
+respective AcpiOs* OSL interfaces. Two options:
+1) The ACPI_ALLOCATE_ZEROED macro uses a simple local implementation by 
+default, unless overridden by the USE_NATIVE_ALLOCATE_ZEROED define.
+2) For AcpiExec (and for debugging), the macros can optionally be 
+resolved 
+to the local ACPICA interfaces that track each allocation (local tracking 
+is used to immediately detect memory leaks).
+Lv Zheng.
+
+Simplified the configuration for ACPI_REDUCED_HARDWARE. Allows the kernel 
+to predefine this macro to either TRUE or FALSE during the system build.
+
+Replaced __FUNCTION_ with __func__ in the gcc-specific header.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version:  95.8K Code, 27.0K Data, 122.8K Total
+    Debug Version:     185.2K Code, 77.2K Data, 262.4K Total
+  Previous Release:
+    Non-Debug Version:  96.7K Code, 27.1K Data, 123.9K Total
+    Debug Version:     184.4K Code, 76.8K Data, 261.2K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Implemented wildcard support for the -e option. This simplifies use 
+when there are many SSDTs that must be included to resolve external 
+method 
+declarations. ACPICA BZ 1041. Example:
+    iasl -e ssdt*.dat -d dsdt.dat
+
+AcpiExec: Add history/line-editing for Unix/Linux systems. This change 
+adds a portable module that implements full history and limited line 
+editing for Unix and Linux systems. It does not use readline() due to 
+portability issues. Instead it uses the POSIX termio interface to put the 
+terminal in raw input mode so that the various special keys can be 
+trapped 
+(such as up/down-arrow for history support and left/right-arrow for line 
+editing). Uses the existing debugger history mechanism. ACPICA BZ 1036.
+
+AcpiXtract: Add support to handle (ignore) "empty" lines containing only 
+one or more spaces. This provides compatible with early or different 
+versions of the AcpiDump utility. ACPICA BZ 1044.
+
+AcpiDump: Do not ignore tables that contain only an ACPI table header. 
+Apparently, some BIOSs create SSDTs that contain an ACPI table header but 
+no other data. This change adds support to dump these tables. Any tables 
+shorter than the length of an ACPI table header remain in error (an error 
+message is emitted). Reported by Yi Li.
+
+Debugger: Echo actual command along with the "unknown command" message.
+
 ----------------------------------------
 23 August 2013. Summary of changes for version 20130823:
 
diff --git a/sys/contrib/dev/acpica/common/acgetline.c b/sys/contrib/dev/acpica/common/acgetline.c
new file mode 100644
index 000000000000..f0948df7d4cf
--- /dev/null
+++ b/sys/contrib/dev/acpica/common/acgetline.c
@@ -0,0 +1,440 @@
+/******************************************************************************
+ *
+ * Module Name: acgetline - local line editing
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/amlcode.h>
+#include <contrib/dev/acpica/include/acparser.h>
+#include <contrib/dev/acpica/include/acdebug.h>
+
+#include <stdio.h>
+
+/*
+ * This is an os-independent implementation of line-editing services needed
+ * by the AcpiExec utility. It uses getchar() and putchar() and the existing
+ * history support provided by the AML debugger. It assumes that the terminal
+ * is in the correct line-editing mode such as raw and noecho. The OSL
+ * interface AcpiOsInitialize should do this. AcpiOsTerminate should put the
+ * terminal back into the original mode.
+ */
+#define _COMPONENT          ACPI_OS_SERVICES
+        ACPI_MODULE_NAME    ("acgetline")
+
+
+/* Local prototypes */
+
+static void
+AcpiAcClearLine (
+    UINT32                  EndOfLine,
+    UINT32                  CursorPosition);
+
+/* Various ASCII constants */
+
+#define _ASCII_NUL                  0
+#define _ASCII_BACKSPACE            0x08
+#define _ASCII_TAB                  0x09
+#define _ASCII_ESCAPE               0x1B
+#define _ASCII_SPACE                0x20
+#define _ASCII_LEFT_BRACKET         0x5B
+#define _ASCII_DEL                  0x7F
+#define _ASCII_UP_ARROW             'A'
+#define _ASCII_DOWN_ARROW           'B'
+#define _ASCII_RIGHT_ARROW          'C'
+#define _ASCII_LEFT_ARROW           'D'
+#define _ASCII_NEWLINE              '\n'
+
+extern UINT32               AcpiGbl_NextCmdNum;
+
+/* Erase a single character on the input command line */
+
+#define ACPI_CLEAR_CHAR() \
+    putchar (_ASCII_BACKSPACE); \
+    putchar (_ASCII_SPACE); \
+    putchar (_ASCII_BACKSPACE);
+
+/* Backup cursor by Count positions */
+
+#define ACPI_BACKUP_CURSOR(i, Count) \
+    for (i = 0; i < (Count); i++) \
+        {putchar (_ASCII_BACKSPACE);}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiAcClearLine
+ *
+ * PARAMETERS:  EndOfLine           - Current end-of-line index
+ *              CursorPosition      - Current cursor position within line
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Clear the entire command line the hard way, but probably the
+ *              most portable.
+ *
+ *****************************************************************************/
+
+static void
+AcpiAcClearLine (
+    UINT32                  EndOfLine,
+    UINT32                  CursorPosition)
+{
+    UINT32                  i;
+
+
+    if (CursorPosition < EndOfLine)
+    {
+        /* Clear line from current position to end of line */
+
+        for (i = 0; i < (EndOfLine - CursorPosition); i++)
+        {
+            putchar (' ');
+        }
+    }
+
+    /* Clear the entire line */
+
+    for (; EndOfLine > 0; EndOfLine--)
+    {
+        ACPI_CLEAR_CHAR ();
+    }
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiOsGetLine
+ *
+ * PARAMETERS:  Buffer              - Where to return the command line
+ *              BufferLength        - Maximum length of Buffer
+ *              BytesRead           - Where the actual byte count is returned
+ *
+ * RETURN:      Status and actual bytes read
+ *
+ * DESCRIPTION: Get the next input line from the terminal. NOTE: terminal
+ *              is expected to be in a mode that supports line-editing (raw,
+ *              noecho). This function is intended to be very portable. Also,
+ *              it uses the history support implemented in the AML debugger.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+AcpiOsGetLine (
+    char                    *Buffer,
+    UINT32                  BufferLength,
+    UINT32                  *BytesRead)
+{
+    char                    *NextCommand;
+    UINT32                  MaxCommandIndex = AcpiGbl_NextCmdNum - 1;
+    UINT32                  CurrentCommandIndex = MaxCommandIndex;
+    UINT32                  PreviousCommandIndex = MaxCommandIndex;
+    int                     InputChar;
+    UINT32                  CursorPosition = 0;
+    UINT32                  EndOfLine = 0;
+    UINT32                  i;
+
+
+    /* Always clear the line buffer before we read a new line */
+
+    memset (Buffer, 0, BufferLength);
+
+    /*
+     * This loop gets one character at a time (except for esc sequences)
+     * until a newline or error is detected.
+     *
+     * Note: Don't attempt to write terminal control ESC sequences, even
+     * though it makes certain things more difficult.
+     */
+    while (1)
+    {
+        if (EndOfLine >= (BufferLength - 1))
+        {
+            return (AE_BUFFER_OVERFLOW);
+        }
+
+        InputChar = getchar ();
+        switch (InputChar)
+        {
+        default: /* This is the normal character case */
+
+            /* Echo the character (at EOL) and copy it to the line buffer */
+
+            if (EndOfLine == CursorPosition)
+            {
+                putchar (InputChar);
+                Buffer[EndOfLine] = (char) InputChar;
+
+                EndOfLine++;
+                CursorPosition++;
+                Buffer[EndOfLine] = 0;
+                continue;
+            }
+
+            /* Insert character into the middle of the buffer */
+
+            memmove (&Buffer[CursorPosition + 1], &Buffer[CursorPosition],
+                (EndOfLine - CursorPosition + 1));
+
+            Buffer [CursorPosition] = (char) InputChar;
+            Buffer [EndOfLine + 1] = 0;
+
+            /* Display the new part of line starting at the new character */
+
+            fprintf (stdout, "%s", &Buffer[CursorPosition]);
+
+            /* Restore cursor */
+
+            ACPI_BACKUP_CURSOR (i, EndOfLine - CursorPosition);
+            CursorPosition++;
+            EndOfLine++;
+            continue;
+
+        case _ASCII_DEL: /* Backspace key */
+
+            if (!EndOfLine) /* Any characters on the command line? */
+            {
+                continue;
+            }
+
+            if (EndOfLine == CursorPosition) /* Erase the final character */
+            {
+                ACPI_CLEAR_CHAR ();
+                EndOfLine--;
+                CursorPosition--;
+                continue;
+            }
+
+            if (!CursorPosition) /* Do not backup beyond start of line */
+            {
+                continue;
+            }
+
+            /* Remove the character from the line */
+
+            memmove (&Buffer[CursorPosition - 1], &Buffer[CursorPosition],
+                (EndOfLine - CursorPosition + 1));
+
+            /* Display the new part of line starting at the new character */
+
+            putchar (_ASCII_BACKSPACE);
+            fprintf (stdout, "%s ", &Buffer[CursorPosition - 1]);
+
+            /* Restore cursor */
+
+            ACPI_BACKUP_CURSOR (i, EndOfLine - CursorPosition + 1);
+            EndOfLine--;
+            if (CursorPosition > 0)
+            {
+                CursorPosition--;
+            }
+            continue;
+
+        case _ASCII_NEWLINE: /* Normal exit case at end of command line */
+        case _ASCII_NUL:
+
+            /* Return the number of bytes in the command line string */
+
+            if (BytesRead)
+            {
+                *BytesRead = EndOfLine;
+            }
+
+            /* Echo, terminate string buffer, and exit */
+
+            putchar (InputChar);
+            Buffer[EndOfLine] = 0;
+            return (AE_OK);
+
+        case _ASCII_TAB:
+
+            /* Ignore */
+
+            continue;
+
+        case EOF:
+
+            return (AE_ERROR);
+
+        case _ASCII_ESCAPE:
+
+            /* Check for escape sequences of the form "ESC[x" */
+
+            InputChar = getchar ();
+            if (InputChar != _ASCII_LEFT_BRACKET)
+            {
+                continue; /* Ignore this ESC, does not have the '[' */
+            }
+
+            /* Get the code following the ESC [ */
+
+            InputChar = getchar (); /* Backup one character */
+            switch (InputChar)
+            {
+            case _ASCII_LEFT_ARROW:
+
+                if (CursorPosition > 0)
+                {
+                    putchar (_ASCII_BACKSPACE);
+                    CursorPosition--;
+                }
+                continue;
+
+            case _ASCII_RIGHT_ARROW:
+                /*
+                 * Move one character forward. Do this without sending
+                 * ESC sequence to the terminal for max portability.
+                 */
+                if (CursorPosition < EndOfLine)
+                {
+                    /* Backup to start of line and print the entire line */
+
+                    ACPI_BACKUP_CURSOR (i, CursorPosition);
+                    fprintf (stdout, "%s", Buffer);
+
+                    /* Backup to where the cursor should be */
+
+                    CursorPosition++;
+                    ACPI_BACKUP_CURSOR (i, EndOfLine - CursorPosition);
+                }
+                continue;
+
+            case _ASCII_UP_ARROW:
+
+                /* If no commands available or at start of history list, ignore */
+
+                if (!CurrentCommandIndex)
+                {
+                    continue;
+                }
+
+                /* Manage our up/down progress */
+
+                if (CurrentCommandIndex > PreviousCommandIndex)
+                {
+                    CurrentCommandIndex = PreviousCommandIndex;
+                }
+
+                /* Get the historical command from the debugger */
+
+                NextCommand = AcpiDbGetHistoryByIndex (CurrentCommandIndex);
+                if (!NextCommand)
+                {
+                    return (AE_ERROR);
+                }
+
+                /* Make this the active command and echo it */
+
+                AcpiAcClearLine (EndOfLine, CursorPosition);
+                strcpy (Buffer, NextCommand);
+                fprintf (stdout, "%s", Buffer);
+                EndOfLine = CursorPosition = strlen (Buffer);
+
+                PreviousCommandIndex = CurrentCommandIndex;
+                CurrentCommandIndex--;
+                continue;
+
+            case _ASCII_DOWN_ARROW:
+
+                if (!MaxCommandIndex) /* Any commands available? */
+                {
+                    continue;
+                }
+
+                /* Manage our up/down progress */
+
+                if (CurrentCommandIndex < PreviousCommandIndex)
+                {
+                    CurrentCommandIndex = PreviousCommandIndex;
+                }
+
+                /* If we are the end of the history list, output a clear new line */
+
+                if ((CurrentCommandIndex + 1) > MaxCommandIndex)
+                {
+                    AcpiAcClearLine (EndOfLine, CursorPosition);
+                    EndOfLine = CursorPosition = 0;
+                    PreviousCommandIndex = CurrentCommandIndex;
+                    continue;
+                }
+
+                PreviousCommandIndex = CurrentCommandIndex;
+                CurrentCommandIndex++;
+
+                 /* Get the historical command from the debugger */
+
+                NextCommand = AcpiDbGetHistoryByIndex (CurrentCommandIndex);
+                if (!NextCommand)
+                {
+                    return (AE_ERROR);
+                }
+
+                /* Make this the active command and echo it */
+
+                AcpiAcClearLine (EndOfLine, CursorPosition);
+                strcpy (Buffer, NextCommand);
+                fprintf (stdout, "%s", Buffer);
+                EndOfLine = CursorPosition = strlen (Buffer);
+                continue;
+
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+                /*
+                 * Ignore the various keys like insert/delete/home/end, etc.
+                 * But we must eat the final character of the ESC sequence.
+                 */
+                InputChar = getchar ();
+                continue;
+
+            default:
+
+                /* Ignore random escape sequences that we don't care about */
+
+                continue;
+            }
+            continue;
+        }
+    }
+}
diff --git a/sys/contrib/dev/acpica/common/adfile.c b/sys/contrib/dev/acpica/common/adfile.c
index 5cde806b3331..ed5dc99bad3c 100644
--- a/sys/contrib/dev/acpica/common/adfile.c
+++ b/sys/contrib/dev/acpica/common/adfile.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acapps.h>
@@ -199,20 +199,28 @@ FlGenerateFilename (
 {
     char                    *Position;
     char                    *NewFilename;
+    char                    *DirectoryPosition;
 
 
     /*
-     * Copy the original filename to a new buffer. Leave room for the worst case
-     * where we append the suffix, an added dot and the null terminator.
+     * Copy the original filename to a new buffer. Leave room for the worst
+     * case where we append the suffix, an added dot and the null terminator.
      */
-    NewFilename = ACPI_ALLOCATE_ZEROED ((ACPI_SIZE)
+    NewFilename = UtStringCacheCalloc ((ACPI_SIZE)
         strlen (InputFilename) + strlen (Suffix) + 2);
+    if (!NewFilename)
+    {
+        return (NULL);
+    }
+
     strcpy (NewFilename, InputFilename);
 
     /* Try to find the last dot in the filename */
 
+    DirectoryPosition = strrchr (NewFilename, '/');
     Position = strrchr (NewFilename, '.');
-    if (Position)
+
+    if (Position && (Position > DirectoryPosition))
     {
         /* Tack on the new suffix */
 
@@ -247,7 +255,7 @@ FlStrdup (
     char                *NewString;
 
 
-    NewString = ACPI_ALLOCATE ((ACPI_SIZE) strlen (String) + 1);
+    NewString = UtStringCacheCalloc ((ACPI_SIZE) strlen (String) + 1);
     if (!NewString)
     {
         return (NULL);
@@ -288,7 +296,6 @@ FlSplitInputPathname (
 
 
     *OutDirectoryPath = NULL;
-    *OutFilename = NULL;
 
     if (!InputPath)
     {
@@ -334,6 +341,12 @@ FlSplitInputPathname (
     }
 
     *OutDirectoryPath = DirectoryPath;
-    *OutFilename = Filename;
+
+    if (OutFilename)
+    {
+        *OutFilename = Filename;
+        return (AE_OK);
+    }
+
     return (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/common/adisasm.c b/sys/contrib/dev/acpica/common/adisasm.c
index c361a6a65897..dd1a93dc8034 100644
--- a/sys/contrib/dev/acpica/common/adisasm.c
+++ b/sys/contrib/dev/acpica/common/adisasm.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,12 +41,9 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include <contrib/dev/acpica/include/acparser.h>
 #include <contrib/dev/acpica/include/amlcode.h>
-#include <contrib/dev/acpica/include/acdebug.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
 #include <contrib/dev/acpica/include/acdispat.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
@@ -60,29 +57,8 @@
 #define _COMPONENT          ACPI_TOOLS
         ACPI_MODULE_NAME    ("adisasm")
 
-/*
- * Older versions of Bison won't emit this external in the generated header.
- * Newer versions do emit the external, so we don't need to do it.
- */
-#ifndef ASLCOMPILER_ASLCOMPILERPARSE_H
-extern int                  AslCompilerdebug;
-#endif
-
-ACPI_STATUS
-NsDisplayNamespace (
-    void);
-
-void
-NsSetupNamespaceListing (
-    void                    *Handle);
-
-
 /* Local prototypes */
 
-static UINT32
-AdGetFileSize (
-    FILE                    *File);
-
 static void
 AdCreateTableHeader (
     char                    *Filename,
@@ -152,39 +128,7 @@ AcpiDsMethodDataInitArgs (
 
 
 static ACPI_TABLE_DESC      LocalTables[1];
-static ACPI_PARSE_OBJECT    *AcpiGbl_ParseOpRoot;
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AdGetFileSize
- *
- * PARAMETERS:  File                - Open file handle
- *
- * RETURN:      File Size
- *
- * DESCRIPTION: Get current file size. Uses seek-to-EOF. File must be open.
- *
- ******************************************************************************/
-
-static UINT32
-AdGetFileSize (
-    FILE                    *File)
-{
-    UINT32                  FileSize;
-    long                    Offset;
-
-
-    Offset = ftell (File);
-
-    fseek (File, 0, SEEK_END);
-    FileSize = (UINT32) ftell (File);
-
-    /* Restore file pointer */
-
-    fseek (File, Offset, SEEK_SET);
-    return (FileSize);
-}
+ACPI_PARSE_OBJECT    *AcpiGbl_ParseOpRoot;
 
 
 /*******************************************************************************
@@ -206,7 +150,7 @@ AdInitialize (
     ACPI_STATUS             Status;
 
 
-    /* ACPI CA subsystem initialization */
+    /* ACPICA subsystem initialization */
 
     Status = AcpiOsInitialize ();
     if (ACPI_FAILURE (Status))
@@ -250,7 +194,6 @@ AdInitialize (
  *              OutToFile           - TRUE if output should go to a file
  *              Prefix              - Path prefix for output
  *              OutFilename         - where the filename is returned
- *              GetAllTables        - TRUE if all tables are desired
  *
  * RETURN:      Status
  *
@@ -263,8 +206,7 @@ AdAmlDisassemble (
     BOOLEAN                 OutToFile,
     char                    *Filename,
     char                    *Prefix,
-    char                    **OutFilename,
-    BOOLEAN                 GetAllTables)
+    char                    **OutFilename)
 {
     ACPI_STATUS             Status;
     char                    *DisasmFilename = NULL;
@@ -348,7 +290,7 @@ AdAmlDisassemble (
     }
     else
     {
-        Status = AdGetLocalTables (Filename, GetAllTables);
+        Status = AdGetLocalTables ();
         if (ACPI_FAILURE (Status))
         {
             AcpiOsPrintf ("Could not get ACPI tables, %s\n",
@@ -383,7 +325,7 @@ AdAmlDisassemble (
         /* Create/Open a disassembly output file */
 
         DisasmFilename = FlGenerateFilename (Prefix, FILE_SUFFIX_DISASSEMBLY);
-        if (!OutFilename)
+        if (!DisasmFilename)
         {
             fprintf (stderr, "Could not generate output filename\n");
             Status = AE_ERROR;
@@ -395,6 +337,7 @@ AdAmlDisassemble (
         {
             fprintf (stderr, "Could not open output file %s\n", DisasmFilename);
             Status = AE_ERROR;
+            ACPI_FREE (DisasmFilename);
             goto Cleanup;
         }
 
@@ -415,7 +358,7 @@ AdAmlDisassemble (
         fprintf (stderr, "Acpi Data Table [%4.4s] decoded\n",
             Table->Signature);
         fprintf (stderr, "Formatted output:  %s - %u bytes\n",
-            DisasmFilename, AdGetFileSize (File));
+            DisasmFilename, CmGetFileSize (File));
     }
     else
     {
@@ -471,9 +414,10 @@ AdAmlDisassemble (
                 "reparsing with new information\n",
                 AcpiDmGetExternalMethodCount ());
 
-            /* Reparse, rebuild namespace. no need to xref namespace */
+            /* Reparse, rebuild namespace */
 
             AcpiPsDeleteParseTree (AcpiGbl_ParseOpRoot);
+            AcpiGbl_ParseOpRoot = NULL;
             AcpiNsDeleteNamespaceSubtree (AcpiGbl_RootNode);
 
             AcpiGbl_RootNode                    = NULL;
@@ -487,6 +431,9 @@ AdAmlDisassemble (
             AcpiGbl_RootNodeStruct.Flags        = 0;
 
             Status = AcpiNsRootInitialize ();
+
+            /* New namespace, add the external definitions first */
+
             AcpiDmAddExternalsToNamespace ();
 
             /* Parse the table again. No need to reload it, however */
@@ -499,6 +446,14 @@ AdAmlDisassemble (
                 goto Cleanup;
             }
 
+            /* Cross reference the namespace again */
+
+            AcpiDmFinishNamespaceLoad (AcpiGbl_ParseOpRoot,
+                AcpiGbl_RootNode, OwnerId);
+
+            AcpiDmCrossReferenceNamespace (AcpiGbl_ParseOpRoot,
+                AcpiGbl_RootNode, OwnerId);
+
             if (AslCompilerdebug)
             {
                 AcpiOsPrintf ("/**** After second load and resource conversion\n");
@@ -533,7 +488,15 @@ AdAmlDisassemble (
 
             fprintf (stderr, "Disassembly completed\n");
             fprintf (stderr, "ASL Output:    %s - %u bytes\n",
-                DisasmFilename, AdGetFileSize (File));
+                DisasmFilename, CmGetFileSize (File));
+
+            if (Gbl_MapfileFlag)
+            {
+                fprintf (stderr, "%14s %s - %u bytes\n",
+                    Gbl_Files[ASL_FILE_MAP_OUTPUT].ShortDescription,
+                    Gbl_Files[ASL_FILE_MAP_OUTPUT].Filename,
+                    FlGetFileSize (ASL_FILE_MAP_OUTPUT));
+            }
         }
     }
 
@@ -570,7 +533,7 @@ AdAmlDisassemble (
  *
  * RETURN:      None
  *
- * DESCRIPTION: Create the disassembler header, including ACPI CA signon with
+ * DESCRIPTION: Create the disassembler header, including ACPICA signon with
  *              current time and date.
  *
  *****************************************************************************/
@@ -602,7 +565,7 @@ AdDisassemblerHeader (
  *
  * RETURN:      None
  *
- * DESCRIPTION: Create the ASL table header, including ACPI CA signon with
+ * DESCRIPTION: Create the ASL table header, including ACPICA signon with
  *              current time and date.
  *
  *****************************************************************************/
@@ -679,9 +642,18 @@ AdCreateTableHeader (
     }
     else
     {
-        NewFilename = ACPI_ALLOCATE_ZEROED (9);
-        strncat (NewFilename, Table->Signature, 4);
-        strcat (NewFilename, ".aml");
+        NewFilename = UtStringCacheCalloc (9);
+        if (NewFilename)
+        {
+            strncat (NewFilename, Table->Signature, 4);
+            strcat (NewFilename, ".aml");
+        }
+    }
+
+    if (!NewFilename)
+    {
+        AcpiOsPrintf (" **** Could not generate AML output filename\n");
+        return;
     }
 
     /* Open the ASL definition block */
@@ -690,8 +662,6 @@ AdCreateTableHeader (
         "DefinitionBlock (\"%s\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
         NewFilename, Table->Signature, Table->Revision,
         Table->OemId, Table->OemTableId, Table->OemRevision);
-
-    ACPI_FREE (NewFilename);
 }
 
 
@@ -726,6 +696,7 @@ AdDisplayTables (
     }
 
     AcpiDmDisassemble (NULL, AcpiGbl_ParseOpRoot, ACPI_UINT32_MAX);
+    MpEmitMappingInfo ();
 
     if (AcpiGbl_DbOpt_verbose)
     {
@@ -746,8 +717,7 @@ AdDisplayTables (
  *
  * FUNCTION:    AdGetLocalTables
  *
- * PARAMETERS:  Filename            - Not used
- *              GetAllTables        - TRUE if all tables are desired
+ * PARAMETERS:  None
  *
  * RETURN:      Status
  *
@@ -757,105 +727,36 @@ AdDisplayTables (
 
 ACPI_STATUS
 AdGetLocalTables (
-    char                    *Filename,
-    BOOLEAN                 GetAllTables)
+    void)
 {
     ACPI_STATUS             Status;
     ACPI_TABLE_HEADER       TableHeader;
     ACPI_TABLE_HEADER       *NewTable;
-    UINT32                  NumTables;
-    UINT32                  PointerSize;
     UINT32                  TableIndex;
 
 
-    if (GetAllTables)
-    {
-        ACPI_MOVE_32_TO_32 (TableHeader.Signature, ACPI_SIG_RSDT);
-        AcpiOsTableOverride (&TableHeader, &NewTable);
-        if (!NewTable)
-        {
-            fprintf (stderr, "Could not obtain RSDT\n");
-            return (AE_NO_ACPI_TABLES);
-        }
-        else
-        {
-            AdWriteTable (NewTable, NewTable->Length,
-                ACPI_SIG_RSDT, NewTable->OemTableId);
-        }
-
-        if (ACPI_COMPARE_NAME (NewTable->Signature, ACPI_SIG_RSDT))
-        {
-            PointerSize = sizeof (UINT32);
-        }
-        else
-        {
-            PointerSize = sizeof (UINT64);
-        }
-
-        /*
-         * Determine the number of tables pointed to by the RSDT/XSDT.
-         * This is defined by the ACPI Specification to be the number of
-         * pointers contained within the RSDT/XSDT. The size of the pointers
-         * is architecture-dependent.
-         */
-        NumTables = (NewTable->Length - sizeof (ACPI_TABLE_HEADER)) / PointerSize;
-        AcpiOsPrintf ("There are %u tables defined in the %4.4s\n\n",
-            NumTables, NewTable->Signature);
-
-        /* Get the FADT */
-
-        ACPI_MOVE_32_TO_32 (TableHeader.Signature, ACPI_SIG_FADT);
-        AcpiOsTableOverride (&TableHeader, &NewTable);
-        if (NewTable)
-        {
-            AdWriteTable (NewTable, NewTable->Length,
-                ACPI_SIG_FADT, NewTable->OemTableId);
-        }
-        AcpiOsPrintf ("\n");
-
-        /* Don't bother with FACS, it is usually all zeros */
-    }
-
-    /* Always get the DSDT */
+    /* Get the DSDT via table override */
 
     ACPI_MOVE_32_TO_32 (TableHeader.Signature, ACPI_SIG_DSDT);
     AcpiOsTableOverride (&TableHeader, &NewTable);
-    if (NewTable)
-    {
-        AdWriteTable (NewTable, NewTable->Length,
-            ACPI_SIG_DSDT, NewTable->OemTableId);
-
-        /* Store DSDT in the Table Manager */
-
-        Status = AcpiTbStoreTable (0, NewTable, NewTable->Length,
-                    0, &TableIndex);
-        if (ACPI_FAILURE (Status))
-        {
-            fprintf (stderr, "Could not store DSDT\n");
-            return (AE_NO_ACPI_TABLES);
-        }
-    }
-    else
+    if (!NewTable)
     {
         fprintf (stderr, "Could not obtain DSDT\n");
         return (AE_NO_ACPI_TABLES);
     }
 
-#if 0
-    /* TBD: Future implementation */
+    AdWriteTable (NewTable, NewTable->Length,
+        ACPI_SIG_DSDT, NewTable->OemTableId);
 
-    AcpiOsPrintf ("\n");
+    /* Store DSDT in the Table Manager */
 
-    /* Get all SSDTs */
-
-    ACPI_MOVE_32_TO_32 (TableHeader.Signature, ACPI_SIG_SSDT);
-    do
+    Status = AcpiTbStoreTable (0, NewTable, NewTable->Length,
+                0, &TableIndex);
+    if (ACPI_FAILURE (Status))
     {
-        NewTable = NULL;
-        Status = AcpiOsTableOverride (&TableHeader, &NewTable);
-
-    } while (NewTable);
-#endif
+        fprintf (stderr, "Could not store DSDT\n");
+        return (AE_NO_ACPI_TABLES);
+    }
 
     return (AE_OK);
 }
@@ -944,7 +845,8 @@ AdParseTable (
     if (LoadTable)
     {
         Status = AcpiTbStoreTable ((ACPI_PHYSICAL_ADDRESS) Table, Table,
-                    Table->Length, ACPI_TABLE_ORIGIN_ALLOCATED, &TableIndex);
+                    Table->Length, ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+                    &TableIndex);
         if (ACPI_FAILURE (Status))
         {
             return (Status);
@@ -979,9 +881,12 @@ AdParseTable (
         return (AE_OK);
     }
 
-    /* Pass 3: Parse control methods and link their parse trees into the main parse tree */
-
-    fprintf (stderr, "Parsing Deferred Opcodes (Methods/Buffers/Packages/Regions)\n");
+    /*
+     * Pass 3: Parse control methods and link their parse trees
+     * into the main parse tree
+     */
+    fprintf (stderr,
+        "Parsing Deferred Opcodes (Methods/Buffers/Packages/Regions)\n");
     Status = AcpiDmParseDeferredOps (AcpiGbl_ParseOpRoot);
     fprintf (stderr, "\n");
 
diff --git a/sys/contrib/dev/acpica/common/adwalk.c b/sys/contrib/dev/acpica/common/adwalk.c
index 80f6d83d504f..df0222dfc32d 100644
--- a/sys/contrib/dev/acpica/common/adwalk.c
+++ b/sys/contrib/dev/acpica/common/adwalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
@@ -469,8 +468,9 @@ AcpiDmFindOrphanDescending (
             !ChildOp->Common.Node)
         {
             AcpiNsExternalizeName (ACPI_UINT32_MAX, ChildOp->Common.Value.String,
-                            NULL, &Path);
-            AcpiOsPrintf ("/* %-16s A-NAMEPATH: %s  */\n", Op->Common.AmlOpName, Path);
+                NULL, &Path);
+            AcpiOsPrintf ("/* %-16s A-NAMEPATH: %s  */\n",
+                Op->Common.AmlOpName, Path);
             ACPI_FREE (Path);
 
             NextOp = Op->Common.Next;
@@ -478,22 +478,26 @@ AcpiDmFindOrphanDescending (
             {
                 /* This NamePath has no args, assume it is an integer */
 
-                AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0);
+                AcpiDmAddOpToExternalList (ChildOp,
+                    ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0, 0);
                 return (AE_OK);
             }
 
             ArgCount = AcpiDmInspectPossibleArgs (3, 1, NextOp);
-            AcpiOsPrintf ("/* A-CHILDREN: %u Actual %u */\n", ArgCount, AcpiDmCountChildren (Op));
+            AcpiOsPrintf ("/* A-CHILDREN: %u Actual %u */\n",
+                ArgCount, AcpiDmCountChildren (Op));
 
             if (ArgCount < 1)
             {
                 /* One Arg means this is just a Store(Name,Target) */
 
-                AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0);
+                AcpiDmAddOpToExternalList (ChildOp,
+                    ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0, 0);
                 return (AE_OK);
             }
 
-            AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_METHOD, ArgCount);
+            AcpiDmAddOpToExternalList (ChildOp,
+                ChildOp->Common.Value.String, ACPI_TYPE_METHOD, ArgCount, 0);
         }
         break;
 #endif
@@ -509,7 +513,8 @@ AcpiDmFindOrphanDescending (
             {
                 /* This NamePath has no args, assume it is an integer */
 
-                AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0);
+                AcpiDmAddOpToExternalList (ChildOp,
+                    ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0, 0);
                 return (AE_OK);
             }
 
@@ -518,11 +523,13 @@ AcpiDmFindOrphanDescending (
             {
                 /* One Arg means this is just a Store(Name,Target) */
 
-                AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0);
+                AcpiDmAddOpToExternalList (ChildOp,
+                    ChildOp->Common.Value.String, ACPI_TYPE_INTEGER, 0, 0);
                 return (AE_OK);
             }
 
-            AcpiDmAddToExternalList (ChildOp, ChildOp->Common.Value.String, ACPI_TYPE_METHOD, ArgCount);
+            AcpiDmAddOpToExternalList (ChildOp,
+                ChildOp->Common.Value.String, ACPI_TYPE_METHOD, ArgCount, 0);
         }
         break;
 
@@ -554,7 +561,8 @@ AcpiDmFindOrphanDescending (
                      /* And namepath is the first argument */
                      (ParentOp->Common.Value.Arg == Op))
                 {
-                    AcpiDmAddToExternalList (Op, Op->Common.Value.String, ACPI_TYPE_INTEGER, 0);
+                    AcpiDmAddOpToExternalList (Op,
+                        Op->Common.Value.String, ACPI_TYPE_INTEGER, 0, 0);
                     break;
                 }
             }
@@ -564,8 +572,8 @@ AcpiDmFindOrphanDescending (
              * operator) - it *must* be a method invocation, nothing else is
              * grammatically possible.
              */
-            AcpiDmAddToExternalList (Op, Op->Common.Value.String, ACPI_TYPE_METHOD, ArgCount);
-
+            AcpiDmAddOpToExternalList (Op,
+                Op->Common.Value.String, ACPI_TYPE_METHOD, ArgCount, 0);
         }
         break;
 
@@ -741,6 +749,7 @@ AcpiDmXrefDescendingOp (
     ACPI_NAMESPACE_NODE     *Node;
     ACPI_OPERAND_OBJECT     *Object;
     UINT32                  ParamCount = 0;
+    char                    *Pathname;
 
 
     WalkState = Info->WalkState;
@@ -750,11 +759,13 @@ AcpiDmXrefDescendingOp (
 
     if ((!(OpInfo->Flags & AML_NAMED)) &&
         (!(OpInfo->Flags & AML_CREATE)) &&
-        (Op->Common.AmlOpcode != AML_INT_NAMEPATH_OP))
+        (Op->Common.AmlOpcode != AML_INT_NAMEPATH_OP) &&
+        (Op->Common.AmlOpcode != AML_NOTIFY_OP))
     {
         goto Exit;
     }
 
+
     /* Get the NamePath from the appropriate place */
 
     if (OpInfo->Flags & AML_NAMED)
@@ -791,6 +802,10 @@ AcpiDmXrefDescendingOp (
             Path = NextOp->Common.Value.String;
         }
     }
+    else if (Op->Common.AmlOpcode == AML_NOTIFY_OP)
+    {
+        Path = Op->Common.Value.Arg->Asl.Value.String;
+    }
     else
     {
         Path = Op->Common.Value.String;
@@ -808,11 +823,14 @@ AcpiDmXrefDescendingOp (
      * The namespace is also used as a lookup table for references to resource
      * descriptors and the fields within them.
      */
+    Node = NULL;
     Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ACPI_TYPE_ANY,
                 ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
                 WalkState, &Node);
     if (ACPI_SUCCESS (Status) && (Node->Flags & ANOBJ_IS_EXTERNAL))
     {
+        /* Node was created by an External() statement */
+
         Status = AE_NOT_FOUND;
     }
 
@@ -820,25 +838,38 @@ AcpiDmXrefDescendingOp (
     {
         if (Status == AE_NOT_FOUND)
         {
-            AcpiDmAddToExternalList (Op, Path, (UINT8) ObjectType, 0);
-
             /*
-             * We could install this into the namespace, but we catch duplicate
-             * externals when they are added to the list.
+             * Add this symbol as an external declaration, except if the
+             * parent is a CondRefOf operator. For this operator, we do not
+             * need an external, nor do we want one, since this can cause
+             * disassembly problems if the symbol is actually a control
+             * method.
              */
-#if 0
-            Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ACPI_TYPE_ANY,
-                       ACPI_IMODE_LOAD_PASS1, ACPI_NS_DONT_OPEN_SCOPE,
-                       WalkState, &Node);
-#endif
+            if (!(Op->Asl.Parent &&
+                (Op->Asl.Parent->Asl.AmlOpcode == AML_COND_REF_OF_OP)))
+            {
+                if (Node)
+                {
+                    AcpiDmAddNodeToExternalList (Node,
+                        (UINT8) ObjectType, 0, 0);
+                }
+                else
+                {
+                    AcpiDmAddOpToExternalList (Op, Path,
+                        (UINT8) ObjectType, 0, 0);
+                }
+            }
         }
     }
 
     /*
-     * Found the node in external table, add it to external list
-     * Node->OwnerId == 0 indicates built-in ACPI Names, _OS_ etc
+     * Found the node, but check if it came from an external table.
+     * Add it to external list. Note: Node->OwnerId == 0 indicates
+     * one of the built-in ACPI Names (_OS_ etc.) which can safely
+     * be ignored.
      */
-    else if (Node->OwnerId && WalkState->OwnerId != Node->OwnerId)
+    else if (Node->OwnerId &&
+            (WalkState->OwnerId != Node->OwnerId))
     {
         ObjectType2 = ObjectType;
 
@@ -852,7 +883,16 @@ AcpiDmXrefDescendingOp (
             }
         }
 
-        AcpiDmAddToExternalList (Op, Path, (UINT8) ObjectType2, ParamCount | 0x80);
+        Pathname = AcpiNsGetExternalPathname (Node);
+        if (!Pathname)
+        {
+            return (AE_NO_MEMORY);
+        }
+
+        AcpiDmAddNodeToExternalList (Node, (UINT8) ObjectType2,
+            ParamCount, ACPI_EXT_RESOLVED_REFERENCE);
+
+        ACPI_FREE (Pathname);
         Op->Common.Node = Node;
     }
     else
diff --git a/sys/contrib/dev/acpica/common/ahids.c b/sys/contrib/dev/acpica/common/ahids.c
new file mode 100644
index 000000000000..d272fdae8043
--- /dev/null
+++ b/sys/contrib/dev/acpica/common/ahids.c
@@ -0,0 +1,240 @@
+/******************************************************************************
+ *
+ * Module Name: ahids - Table of ACPI/PNP _HID/_CID values
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_UTILITIES
+        ACPI_MODULE_NAME    ("ahids")
+
+
+/*
+ * ACPI/PNP Device IDs with description strings
+ */
+const AH_DEVICE_ID  AslDeviceIds[] =
+{
+    {"10EC5640",    "Realtek I2S Audio Codec"},
+    {"80860F09",    "Intel PWM Controller"},
+    {"80860F0A",    "Intel Atom UART Controller"},
+    {"80860F0E",    "Intel SPI Controller"},
+    {"80860F14",    "Intel Baytrail SDIO/MMC Host Controller"},
+    {"80860F28",    "Intel SST Audio DSP"},
+    {"80860F41",    "Intel Baytrail I2C Host Controller"},
+    {"ACPI0001",    "SMBus 1.0 Host Controller"},
+    {"ACPI0002",    "Smart Battery Subsystem"},
+    {"ACPI0003",    "Power Source Device"},
+    {"ACPI0004",    "Module Device"},
+    {"ACPI0005",    "SMBus 2.0 Host Controller"},
+    {"ACPI0006",    "GPE Block Device"},
+    {"ACPI0007",    "Processor Device"},
+    {"ACPI0008",    "Ambient Light Sensor Device"},
+    {"ACPI0009",    "I/O xAPIC Device"},
+    {"ACPI000A",    "I/O APIC Device"},
+    {"ACPI000B",    "I/O SAPIC Device"},
+    {"ACPI000C",    "Processor Aggregator Device"},
+    {"ACPI000D",    "Power Meter Device"},
+    {"ACPI000E",    "Time and Alarm Device"},
+    {"ACPI000F",    "User Presence Detection Device"},
+    {"ADMA0F28",    "Intel Audio DMA"},
+    {"AMCR0F28",    "Intel Audio Machine Driver"},
+    {"ATK4001",     "Asus Radio Control Button"},
+    {"ATML1000",    "Atmel Touchscreen Controller"},
+    {"AUTH2750",    "AuthenTec AES2750"},
+    {"BCM2E39",     "Broadcom BT Serial Bus Driver over UART Bus Enumerator"},
+    {"BCM4752E",    "Broadcom GPS Controller"},
+    {"BMG0160",     "Bosch Gyro Sensor"},
+    {"CPLM3218",    "Capella Micro CM3218x Ambient Light Sensor"},
+    {"DELLABCE",    "Dell Airplane Mode Switch Driver"},
+    {"DLAC3002",    "Qualcomm Atheros Bluetooth UART Transport"},
+    {"FTTH5506",    "FocalTech 5506 Touch Controller"},
+    {"HAD0F28",     "Intel HDMI Audio Driver"},
+    {"INBC0000",    "GPIO Expander"},
+    {"INT0002",     "Virtual GPIO Controller"},
+    {"INT0800",     "Intel 82802 Firmware Hub Device"},
+    {"INT3394",     "ACPI System Fan"},
+    {"INT3396",     "Standard Power Management Controller"},
+    {"INT33A0",     "Intel Smart Connect Technology Device"},
+    {"INT33A1",     "Intel Power Engine"},
+    {"INT33BB",     "Intel Baytrail SD Host Controller"},
+    {"INT33BD",     "Intel Baytrail Mailbox Device"},
+    {"INT33BE",     "Camera Sensor OV5693"},
+    {"INT33C0",     "Intel Serial I/O SPI Host Controller"},
+    {"INT33C1",     "Intel Serial I/O SPI Host Controller"},
+    {"INT33C2",     "Intel Serial I/O I2C Host Controller"},
+    {"INT33C3",     "Intel Serial I/O I2C Host Controller"},
+    {"INT33C4",     "Intel Serial I/O UART Host Controller"},
+    {"INT33C5",     "Intel Serial I/O UART Host Controller"},
+    {"INT33C6",     "Intel SD Host Controller"},
+    {"INT33C7",     "Intel Serial I/O GPIO Host Controller"},
+    {"INT33C8",     "Intel Smart Sound Technology Host Controller"},
+    {"INT33C9",     "Wolfson Microelectronics Audio WM5102"},
+    {"INT33CA",     "Intel SPB Peripheral"},
+    {"INT33CB",     "Intel Smart Sound Technology Audio Codec"},
+    {"INT33D1",     "Intel GPIO Buttons"},
+    {"INT33D2",     "Intel GPIO Buttons"},
+    {"INT33D3",     "Intel GPIO Buttons"},
+    {"INT33D4",     "Intel GPIO Buttons"},
+    {"INT33D6",     "Intel Virtual Buttons Device"},
+    {"INT33F0",     "Camera Sensor MT9M114"},
+    {"INT33F4",     "XPOWER PMIC Controller"},
+    {"INT33F5",     "TI PMIC Controller"},
+    {"INT33FB",     "MIPI-CSI Camera Sensor OV2722"},
+    {"INT33FC",     "Intel Baytrail GPIO Controller"},
+    {"INT33FD",     "Intel Baytrail Power Management IC"},
+    {"INT33FE",     "XPOWER Battery Device"},
+    {"INT3400",     "Intel Dynamic Power Performance Management"},
+    {"INT3401",     "Intel Extended Thermal Model CPU"},
+    {"INT3403",     "DPTF Temperature Sensor"},
+    {"INT3406",     "Intel Dynamic Platform & Thermal Framework Display Participant"},
+    {"INT3407",     "DPTF Platform Power Meter"},
+    {"INT340E",     "Motherboard Resources"},
+    {"INT3420",     "Intel Bluetooth RF Kill"},
+    {"INT3F0D",     "ACPI Motherboard Resources"},
+    {"INTCF1A",     "Sony IMX175 Camera Sensor"},
+    {"INTCFD9",     "Intel Baytrail SOC GPIO Controller"},
+    {"INTL9C60",    "Intel Baytrail SOC DMA Controller"},
+    {"INVN6500",    "InvenSense MPU-6500 Six Axis Gyroscope and Accelerometer"},
+    {"LNXCPU",      "Linux Logical CPU"},
+    {"LNXPOWER",    "ACPI Power Resource (power gating)"},
+    {"LNXPWRBN",    "System Power Button"},
+    {"LNXSYBUS",    "System Bus"},
+    {"LNXSYSTM",    "ACPI Root Node"},
+    {"LNXTHERM",    "ACPI Thermal Zone"},
+    {"LNXVIDEO",    "ACPI Video Controller"},
+    {"MAX17047",    "Fuel Gauge Controller"},
+    {"MSFT0101",    "TPM 2.0 Security Device"},
+    {"NXP5442",     "NXP 5442 Near Field Communications Controller"},
+    {"NXP5472",     "NXP NFC"},
+    {"PNP0000",     "8259-compatible Programmable Interrupt Controller"},
+    {"PNP0001",     "EISA Interrupt Controller"},
+    {"PNP0002",     "MCA Interrupt Controller"},
+    {"PNP0003",     "IO-APIC Interrupt Controller"},
+    {"PNP0100",     "PC-class System Timer"},
+    {"PNP0103",     "HPET System Timer"},
+    {"PNP0200",     "PC-class DMA Controller"},
+    {"PNP0300",     "IBM PC/XT Keyboard Controller (83 key)"},
+    {"PNP0301",     "IBM PC/XT Keyboard Controller (86 key)"},
+    {"PNP0302",     "IBM PC/XT Keyboard Controller (84 key)"},
+    {"PNP0303",     "IBM Enhanced Keyboard (101/102-key, PS/2 Mouse)"},
+    {"PNP0400",     "Standard LPT Parallel Port"},
+    {"PNP0401",     "ECP Parallel Port"},
+    {"PNP0500",     "Standard PC COM Serial Port"},
+    {"PNP0501",     "16550A-compatible COM Serial Port"},
+    {"PNP0510",     "Generic IRDA-compatible Device"},
+    {"PNP0800",     "Microsoft Sound System Compatible Device"},
+    {"PNP0A03",     "PCI Bus"},
+    {"PNP0A05",     "Generic Container Device"},
+    {"PNP0A06",     "Generic Container Device"},
+    {"PNP0A08",     "PCI Express Bus"},
+    {"PNP0B00",     "AT Real-Time Clock"},
+    {"PNP0B01",     "Intel PIIX4-compatible RTC/CMOS Device"},
+    {"PNP0B02",     "Dallas Semiconductor-compatible RTC/CMOS Device"},
+    {"PNP0C01",     "System Board"},
+    {"PNP0C02",     "PNP Motherboard Resources"},
+    {"PNP0C04",     "x87-compatible Floating Point Processing Unit"},
+    {"PNP0C08",     "ACPI Core Hardware"},
+    {"PNP0C09",     "Embedded Controller Device"},
+    {"PNP0C0A",     "Control Method Battery"},
+    {"PNP0C0B",     "Fan (Thermal Solution)"},
+    {"PNP0C0C",     "Power Button Device"},
+    {"PNP0C0D",     "Lid Device"},
+    {"PNP0C0E",     "Sleep Button Device"},
+    {"PNP0C0F",     "PCI Interrupt Link Device"},
+    {"PNP0C10",     "System Indicator Device"},
+    {"PNP0C11",     "Thermal Zone"},
+    {"PNP0C12",     "Device Bay Controller"},
+    {"PNP0C14",     "Windows Management Instrumentation Device"},
+    {"PNP0C15",     "Docking Station"},
+    {"PNP0C40",     "Standard Button Controller"},
+    {"PNP0C50",     "HID Protocol Device (I2C bus)"},
+    {"PNP0C60",     "Display Sensor Device"},
+    {"PNP0C70",     "Dock Sensor Device"},
+    {"PNP0C80",     "Memory Device"},
+    {"PNP0D10",     "XHCI USB Controller with debug"},
+    {"PNP0D15",     "XHCI USB Controller without debug"},
+    {"PNP0D20",     "EHCI USB Controller without debug"},
+    {"PNP0D25",     "EHCI USB Controller with debug"},
+    {"PNP0D40",     "SDA Standard Compliant SD Host Controller"},
+    {"PNP0D80",     "Windows-compatible System Power Management Controller"},
+    {"PNP0F03",     "Microsoft PS/2-style Mouse"},
+    {"PNP0F13",     "PS/2 Mouse"},
+    {"RTL8723",     "Realtek Wireless Controller"},
+    {"SMB0349",     "Charger"},
+    {"SMO91D0",     "Sensor Hub"},
+    {"SMSC3750",    "SMSC 3750 USB MUX"},
+    {"SSPX0000",    "Intel SSP Device"},
+    {"TBQ24296",    "Charger"},
+
+    {NULL, NULL}
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiAhMatchHardwareId
+ *
+ * PARAMETERS:  HardwareId          - String representation of an _HID or _CID
+ *
+ * RETURN:      ID info struct. NULL if HardwareId is not found
+ *
+ * DESCRIPTION: Lookup an _HID/_CID in the device ID table
+ *
+ ******************************************************************************/
+
+const AH_DEVICE_ID *
+AcpiAhMatchHardwareId (
+    char                    *HardwareId)
+{
+    const AH_DEVICE_ID      *Info;
+
+
+    for (Info = AslDeviceIds; Info->Name; Info++)
+    {
+        if (!ACPI_STRCMP (HardwareId, Info->Name))
+        {
+            return (Info);
+        }
+    }
+
+    return (NULL);
+}
diff --git a/sys/contrib/dev/acpica/common/ahpredef.c b/sys/contrib/dev/acpica/common/ahpredef.c
index de28b40aa5c0..4522ca698afa 100644
--- a/sys/contrib/dev/acpica/common/ahpredef.c
+++ b/sys/contrib/dev/acpica/common/ahpredef.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,9 @@
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 
+#define _COMPONENT          ACPI_UTILITIES
+        ACPI_MODULE_NAME    ("ahpredef")
+
 /*
  * iASL only needs a partial table (short descriptions only).
  * AcpiHelp needs the full table.
@@ -94,6 +97,7 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_BTM",    "Battery Time", "Returns the battery runtime"),
     AH_PREDEF ("_BTP",    "Battery Trip Point", "Sets a Control Method Battery trip point"),
     AH_PREDEF ("_CBA",    "Configuration Base Address", "Sets the base address for a PCI Express host bridge"),
+    AH_PREDEF ("_CCA",    "Cache Coherency Attribute", "Returns a device's support level for cache coherency"),
     AH_PREDEF ("_CDM",    "Clock Domain", "Returns a logical processor's clock domain identifier"),
     AH_PREDEF ("_CID",    "Compatible ID", "Returns a device's Plug and Play Compatible ID list"),
     AH_PREDEF ("_CLS",    "Class Code", "Returns PCI class code and subclass"),
@@ -118,6 +122,7 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_DOS",    "Disable Output Switching", "Sets the display output switching mode"),
     AH_PREDEF ("_DPL",    "Device Selection Polarity", "Polarity of Device Selection signal, Resource Descriptor field"),
     AH_PREDEF ("_DRS",    "Drive Strength", "Drive Strength setting for GPIO connection, Resource Descriptor field"),
+    AH_PREDEF ("_DSD",    "Device-Specific Data", "Returns a list of device property information"),
     AH_PREDEF ("_DSM",    "Device-Specific Method", "Executes device-specific functions"),
     AH_PREDEF ("_DSS",    "Device Set State", "Sets the display device state"),
     AH_PREDEF ("_DSW",    "Device Sleep Wake", "Sets the sleep and wake transition states for a device"),
@@ -169,6 +174,7 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_LID",    "Lid Status", "Returns the open/closed status of the lid on a mobile system"),
     AH_PREDEF ("_LIN",    "Lines In Use", "Handshake lines, Resource Descriptor field"),
     AH_PREDEF ("_LL_",    "Low Level", "Interrupt polarity, Resource Descriptor field"),
+    AH_PREDEF ("_LPD",    "Low Power Dependencies", "Returns a list of dependencies for low power idle entry"),
     AH_PREDEF ("_MAF",    "Maximum Address Fixed", "Resource Descriptor field"),
     AH_PREDEF ("_MAT",    "Multiple APIC Table Entry", "Returns a list of MADT APIC structure entries"),
     AH_PREDEF ("_MAX",    "Maximum Base Address", "Resource Descriptor field"),
@@ -321,3 +327,34 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_Wxx",    "Wake Event", "Method executed as a result of a wake event"),
     AH_PREDEF (NULL,      NULL, NULL)
 };
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiAhMatchPredefinedName
+ *
+ * PARAMETERS:  Nameseg                 - Predefined name string
+ *
+ * RETURN:      ID info struct. NULL if Nameseg not found
+ *
+ * DESCRIPTION: Lookup a predefined name.
+ *
+ ******************************************************************************/
+
+const AH_PREDEFINED_NAME *
+AcpiAhMatchPredefinedName (
+    char                        *Nameseg)
+{
+    const AH_PREDEFINED_NAME    *Info;
+
+
+    for (Info = AslPredefinedInfo; Info->Name; Info++)
+    {
+        if (ACPI_COMPARE_NAME (Nameseg, Info->Name))
+        {
+            return (Info);
+        }
+    }
+
+    return (NULL);
+}
diff --git a/sys/contrib/dev/acpica/common/ahuuids.c b/sys/contrib/dev/acpica/common/ahuuids.c
new file mode 100644
index 000000000000..ef53008d44da
--- /dev/null
+++ b/sys/contrib/dev/acpica/common/ahuuids.c
@@ -0,0 +1,132 @@
+/******************************************************************************
+ *
+ * Module Name: ahuuids - Table of known ACPI-related UUIDs
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_UTILITIES
+        ACPI_MODULE_NAME    ("ahuuids")
+
+/*
+ * Table of "known" (ACPI-related) UUIDs
+ */
+const AH_UUID  AcpiUuids[] =
+{
+    {"PCI Host Bridge Device",
+        "33db4d5b-1ff7-401c-9657-7441c03dd766"},
+
+    {"Platform-wide Capabilities",
+        "0811b06e-4a27-44f9-8d60-3cbbc22e7b48"},
+
+    {"Dynamic Enumeration",
+        "d8c1a3a6-be9b-4c9b-91bf-c3cb81fc5daf"},
+
+    {"GPIO Controller",
+        "4f248f40-d5e2-499f-834c-27758ea1cd3f"},
+
+    {"Battery Thermal Limit",
+        "4c2067e3-887d-475c-9720-4af1d3ed602e"},
+
+    {"Thermal Extensions",
+        "14d399cd-7a27-4b18-8fb4-7cb7b9f4e500"},
+
+    {"USB Controller",
+        "ce2ee385-00e6-48cb-9f05-2edb927c4899"},
+
+    {"HID I2C Device",
+        "3cdff6f7-4267-4555-ad05-b30a3d8938de"},
+
+    {"Power Button Device",
+        "dfbcf3c5-e7a5-44e6-9c1f-29c76f6e059c"},
+
+    {"Device Labeling Interface",
+        "e5c937d0-3553-4d7a-9117-ea4d19c3434d"},
+
+    {"SATA Controller",
+        "e4db149b-fcfe-425b-a6d8-92357d78fc7f"},
+
+    {"Physical Presence Interface",
+        "3dddfaa6-361b-4eb4-a424-8d10089d1653"},
+
+    {"Device Properties for _DSD",
+        "daffd814-6eba-4d8c-8a91-bc9bbf4aa301"},
+
+    {NULL, NULL}
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiAhMatchUuid
+ *
+ * PARAMETERS:  Data                - Data buffer containing a UUID
+ *
+ * RETURN:      ASCII description string for the UUID if it is found.
+ *
+ * DESCRIPTION: Returns a description string for "known" UUIDs, which are
+ *              are UUIDs that are related to ACPI in some way.
+ *
+ ******************************************************************************/
+
+const char *
+AcpiAhMatchUuid (
+    UINT8                   *Data)
+{
+    const AH_UUID           *Info;
+    UINT8                   UuidBuffer[UUID_BUFFER_LENGTH];
+
+
+    /* Walk the table of known ACPI-related UUIDs */
+
+    for (Info = AcpiUuids; Info->Description; Info++)
+    {
+        AcpiUtConvertStringToUuid (Info->String, UuidBuffer);
+
+        if (!ACPI_MEMCMP (Data, UuidBuffer, UUID_BUFFER_LENGTH))
+        {
+            return (Info->Description);
+        }
+    }
+
+    return (NULL);
+}
diff --git a/sys/contrib/dev/acpica/common/cmfsize.c b/sys/contrib/dev/acpica/common/cmfsize.c
new file mode 100644
index 000000000000..0f9b7385cf52
--- /dev/null
+++ b/sys/contrib/dev/acpica/common/cmfsize.c
@@ -0,0 +1,113 @@
+/******************************************************************************
+ *
+ * Module Name: cfsize - Common get file size function
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acapps.h>
+#include <stdio.h>
+
+#define _COMPONENT          ACPI_TOOLS
+        ACPI_MODULE_NAME    ("cmfsize")
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    CmGetFileSize
+ *
+ * PARAMETERS:  File                    - Open file descriptor
+ *
+ * RETURN:      File Size. On error, -1 (ACPI_UINT32_MAX)
+ *
+ * DESCRIPTION: Get the size of a file. Uses seek-to-EOF. File must be open.
+ *              Does not disturb the current file pointer.
+ *
+ ******************************************************************************/
+
+UINT32
+CmGetFileSize (
+    ACPI_FILE               File)
+{
+    long                    FileSize;
+    long                    CurrentOffset;
+    ACPI_STATUS             Status;
+
+
+    /* Save the current file pointer, seek to EOF to obtain file size */
+
+    CurrentOffset = AcpiOsGetFileOffset (File);
+    if (CurrentOffset < 0)
+    {
+        goto OffsetError;
+    }
+
+    Status = AcpiOsSetFileOffset (File, 0, ACPI_FILE_END);
+    if (ACPI_FAILURE (Status))
+    {
+        goto SeekError;
+    }
+
+    FileSize = AcpiOsGetFileOffset (File);
+    if (FileSize < 0)
+    {
+        goto OffsetError;
+    }
+
+    /* Restore original file pointer */
+
+    Status = AcpiOsSetFileOffset (File, CurrentOffset, ACPI_FILE_BEGIN);
+    if (ACPI_FAILURE (Status))
+    {
+        goto SeekError;
+    }
+
+    return ((UINT32) FileSize);
+
+
+OffsetError:
+    AcpiLogError ("Could not get file offset");
+    return (ACPI_UINT32_MAX);
+
+SeekError:
+    AcpiLogError ("Could not set file offset");
+    return (ACPI_UINT32_MAX);
+}
diff --git a/sys/contrib/dev/acpica/common/dmextern.c b/sys/contrib/dev/acpica/common/dmextern.c
index 56e278100b17..f8362e14d4e1 100644
--- a/sys/contrib/dev/acpica/common/dmextern.c
+++ b/sys/contrib/dev/acpica/common/dmextern.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
  */
 static const char           *AcpiGbl_DmTypeNames[] =
 {
-    /* 00 */ "",                    /* Type ANY */
+    /* 00 */ ", UnknownObj",        /* Type ANY */
     /* 01 */ ", IntObj",
     /* 02 */ ", StrObj",
     /* 03 */ ", BuffObj",
@@ -104,10 +104,19 @@ AcpiDmNormalizeParentPrefix (
     char                    *Path);
 
 static void
-AcpiDmAddToExternalListFromFile (
+AcpiDmAddPathToExternalList (
     char                    *Path,
     UINT8                   Type,
-    UINT32                  Value);
+    UINT32                  Value,
+    UINT16                  Flags);
+
+static ACPI_STATUS
+AcpiDmCreateNewExternal (
+    char                    *ExternalPath,
+    char                    *InternalPath,
+    UINT8                   Type,
+    UINT32                  Value,
+    UINT16                  Flags);
 
 
 /*******************************************************************************
@@ -279,48 +288,41 @@ AcpiDmNormalizeParentPrefix (
 
 ACPI_STATUS
 AcpiDmAddToExternalFileList (
-    char                    *PathList)
+    char                    *Pathname)
 {
     ACPI_EXTERNAL_FILE      *ExternalFile;
-    char                    *Path;
-    char                    *TmpPath;
+    char                    *LocalPathname;
 
 
-    if (!PathList)
+    if (!Pathname)
     {
         return (AE_OK);
     }
 
-    Path = strtok (PathList, ",");
-
-    while (Path)
+    LocalPathname = ACPI_ALLOCATE (strlen (Pathname) + 1);
+    if (!LocalPathname)
     {
-        TmpPath = ACPI_ALLOCATE_ZEROED (ACPI_STRLEN (Path) + 1);
-        if (!TmpPath)
-        {
-            return (AE_NO_MEMORY);
-        }
-
-        ACPI_STRCPY (TmpPath, Path);
-
-        ExternalFile = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_EXTERNAL_FILE));
-        if (!ExternalFile)
-        {
-            ACPI_FREE (TmpPath);
-            return (AE_NO_MEMORY);
-        }
-
-        ExternalFile->Path = TmpPath;
-
-        if (AcpiGbl_ExternalFileList)
-        {
-            ExternalFile->Next = AcpiGbl_ExternalFileList;
-        }
-
-        AcpiGbl_ExternalFileList = ExternalFile;
-        Path = strtok (NULL, ",");
+        return (AE_NO_MEMORY);
     }
 
+    ExternalFile = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_EXTERNAL_FILE));
+    if (!ExternalFile)
+    {
+        ACPI_FREE (LocalPathname);
+        return (AE_NO_MEMORY);
+    }
+
+    /* Take a copy of the file pathname */
+
+    strcpy (LocalPathname, Pathname);
+    ExternalFile->Path = LocalPathname;
+
+    if (AcpiGbl_ExternalFileList)
+    {
+        ExternalFile->Next = AcpiGbl_ExternalFileList;
+    }
+
+    AcpiGbl_ExternalFileList = ExternalFile;
     return (AE_OK);
 }
 
@@ -354,196 +356,6 @@ AcpiDmClearExternalFileList (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDmAddToExternalList
- *
- * PARAMETERS:  Op                  - Current parser Op
- *              Path                - Internal (AML) path to the object
- *              Type                - ACPI object type to be added
- *              Value               - Arg count if adding a Method object
- *
- * RETURN:      None
- *
- * DESCRIPTION: Insert a new name into the global list of Externals which
- *              will in turn be later emitted as an External() declaration
- *              in the disassembled output.
- *
- ******************************************************************************/
-
-void
-AcpiDmAddToExternalList (
-    ACPI_PARSE_OBJECT       *Op,
-    char                    *Path,
-    UINT8                   Type,
-    UINT32                  Value)
-{
-    char                    *ExternalPath;
-    char                    *Fullpath = NULL;
-    ACPI_EXTERNAL_LIST      *NewExternal;
-    ACPI_EXTERNAL_LIST      *NextExternal;
-    ACPI_EXTERNAL_LIST      *PrevExternal = NULL;
-    ACPI_STATUS             Status;
-    BOOLEAN                 Resolved = FALSE;
-
-
-    if (!Path)
-    {
-        return;
-    }
-
-    if (Type == ACPI_TYPE_METHOD)
-    {
-        if (Value & 0x80)
-        {
-            Resolved = TRUE;
-        }
-        Value &= 0x07;
-    }
-
-    /*
-     * We don't want External() statements to contain a leading '\'.
-     * This prevents duplicate external statements of the form:
-     *
-     *    External (\ABCD)
-     *    External (ABCD)
-     *
-     * This would cause a compile time error when the disassembled
-     * output file is recompiled.
-     */
-    if ((*Path == AML_ROOT_PREFIX) && (Path[1]))
-    {
-        Path++;
-    }
-
-    /* Externalize the ACPI pathname */
-
-    Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Path,
-                NULL, &ExternalPath);
-    if (ACPI_FAILURE (Status))
-    {
-        return;
-    }
-
-    /*
-     * Get the full pathname from the root if "Path" has one or more
-     * parent prefixes (^). Note: path will not contain a leading '\'.
-     */
-    if (*Path == (UINT8) AML_PARENT_PREFIX)
-    {
-        Fullpath = AcpiDmNormalizeParentPrefix (Op, ExternalPath);
-        if (Fullpath)
-        {
-            /* Set new external path */
-
-            ACPI_FREE (ExternalPath);
-            ExternalPath = Fullpath;
-        }
-    }
-
-    /* Check all existing externals to ensure no duplicates */
-
-    NextExternal = AcpiGbl_ExternalList;
-    while (NextExternal)
-    {
-        if (!ACPI_STRCMP (ExternalPath, NextExternal->Path))
-        {
-            /* Duplicate method, check that the Value (ArgCount) is the same */
-
-            if ((NextExternal->Type == ACPI_TYPE_METHOD) &&
-                (NextExternal->Value != Value))
-            {
-                ACPI_ERROR ((AE_INFO,
-                    "External method arg count mismatch %s: Current %u, attempted %u",
-                    NextExternal->Path, NextExternal->Value, Value));
-            }
-
-            /* Allow upgrade of type from ANY */
-
-            else if (NextExternal->Type == ACPI_TYPE_ANY)
-            {
-                NextExternal->Type = Type;
-                NextExternal->Value = Value;
-            }
-
-            ACPI_FREE (ExternalPath);
-            return;
-        }
-
-        NextExternal = NextExternal->Next;
-    }
-
-    /* Allocate and init a new External() descriptor */
-
-    NewExternal = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_EXTERNAL_LIST));
-    if (!NewExternal)
-    {
-        ACPI_FREE (ExternalPath);
-        return;
-    }
-
-    NewExternal->Path = ExternalPath;
-    NewExternal->Type = Type;
-    NewExternal->Value = Value;
-    NewExternal->Resolved = Resolved;
-    NewExternal->Length = (UINT16) ACPI_STRLEN (ExternalPath);
-
-    /* Was the external path with parent prefix normalized to a fullpath? */
-
-    if (Fullpath == ExternalPath)
-    {
-        /* Get new internal path */
-
-        Status = AcpiNsInternalizeName (ExternalPath, &Path);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_FREE (ExternalPath);
-            ACPI_FREE (NewExternal);
-            return;
-        }
-
-        /* Set flag to indicate External->InternalPath need to be freed */
-
-        NewExternal->Flags |= ACPI_IPATH_ALLOCATED;
-    }
-
-    NewExternal->InternalPath = Path;
-
-    /* Link the new descriptor into the global list, alphabetically ordered */
-
-    NextExternal = AcpiGbl_ExternalList;
-    while (NextExternal)
-    {
-        if (AcpiUtStricmp (NewExternal->Path, NextExternal->Path) < 0)
-        {
-            if (PrevExternal)
-            {
-                PrevExternal->Next = NewExternal;
-            }
-            else
-            {
-                AcpiGbl_ExternalList = NewExternal;
-            }
-
-            NewExternal->Next = NextExternal;
-            return;
-        }
-
-        PrevExternal = NextExternal;
-        NextExternal = NextExternal->Next;
-    }
-
-    if (PrevExternal)
-    {
-        PrevExternal->Next = NewExternal;
-    }
-    else
-    {
-        AcpiGbl_ExternalList = NewExternal;
-    }
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmGetExternalsFromFile
@@ -585,6 +397,7 @@ AcpiDmGetExternalsFromFile (
     {
         fprintf (stderr, "Could not open external reference file \"%s\"\n",
             Gbl_ExternalRefFilename);
+        AslAbort ();
         return;
     }
 
@@ -593,18 +406,37 @@ AcpiDmGetExternalsFromFile (
     while (fgets (StringBuffer, ASL_MSG_BUFFER_SIZE, ExternalRefFile))
     {
         Token = strtok (StringBuffer, METHOD_SEPARATORS);   /* "External" */
-        if (!Token) continue;
-        if (strcmp (Token, "External")) continue;
+        if (!Token)
+        {
+            continue;
+        }
+        if (strcmp (Token, "External"))
+        {
+            continue;
+        }
 
         MethodName = strtok (NULL, METHOD_SEPARATORS);      /* Method namepath */
-        if (!MethodName) continue;
+        if (!MethodName)
+        {
+            continue;
+        }
 
         Token = strtok (NULL, METHOD_SEPARATORS);           /* "MethodObj" */
-        if (!Token) continue;
-        if (strcmp (Token, "MethodObj")) continue;
+        if (!Token)
+        {
+            continue;
+        }
+
+        if (strcmp (Token, "MethodObj"))
+        {
+            continue;
+        }
 
         Token = strtok (NULL, METHOD_SEPARATORS);           /* Arg count */
-        if (!Token) continue;
+        if (!Token)
+        {
+            continue;
+        }
 
         /* Convert arg count string to an integer */
 
@@ -626,7 +458,8 @@ AcpiDmGetExternalsFromFile (
         AcpiOsPrintf ("%s: Importing method external (%u arguments) %s\n",
             Gbl_ExternalRefFilename, ArgCount, MethodName);
 
-        AcpiDmAddToExternalListFromFile (MethodName, ACPI_TYPE_METHOD, ArgCount | 0x80);
+        AcpiDmAddPathToExternalList (MethodName, ACPI_TYPE_METHOD,
+            ArgCount, (ACPI_EXT_RESOLVED_REFERENCE | ACPI_EXT_ORIGIN_FROM_FILE));
         ImportCount++;
     }
 
@@ -651,11 +484,13 @@ AcpiDmGetExternalsFromFile (
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiDmAddToExternalListFromFile
+ * FUNCTION:    AcpiDmAddOpToExternalList
  *
- * PARAMETERS:  Path                - Internal (AML) path to the object
+ * PARAMETERS:  Op                  - Current parser Op
+ *              Path                - Internal (AML) path to the object
  *              Type                - ACPI object type to be added
  *              Value               - Arg count if adding a Method object
+ *              Flags               - To be passed to the external object
  *
  * RETURN:      None
  *
@@ -663,73 +498,325 @@ AcpiDmGetExternalsFromFile (
  *              will in turn be later emitted as an External() declaration
  *              in the disassembled output.
  *
+ *              This function handles the most common case where the referenced
+ *              name is simply not found in the constructed namespace.
+ *
  ******************************************************************************/
 
-static void
-AcpiDmAddToExternalListFromFile (
+void
+AcpiDmAddOpToExternalList (
+    ACPI_PARSE_OBJECT       *Op,
     char                    *Path,
     UINT8                   Type,
-    UINT32                  Value)
+    UINT32                  Value,
+    UINT16                  Flags)
 {
-    char                    *InternalPath;
     char                    *ExternalPath;
-    ACPI_EXTERNAL_LIST      *NewExternal;
-    ACPI_EXTERNAL_LIST      *NextExternal;
-    ACPI_EXTERNAL_LIST      *PrevExternal = NULL;
+    char                    *InternalPath = Path;
+    char                    *Temp;
     ACPI_STATUS             Status;
-    BOOLEAN                 Resolved = FALSE;
+
+
+    ACPI_FUNCTION_TRACE (DmAddOpToExternalList);
 
 
     if (!Path)
     {
-        return;
+        return_VOID;
     }
 
-    /* TBD: Add a flags parameter */
+    /* Remove a root backslash if present */
 
-    if (Type == ACPI_TYPE_METHOD)
-    {
-        if (Value & 0x80)
-        {
-            Resolved = TRUE;
-        }
-        Value &= 0x07;
-    }
-
-    /*
-     * We don't want External() statements to contain a leading '\'.
-     * This prevents duplicate external statements of the form:
-     *
-     *    External (\ABCD)
-     *    External (ABCD)
-     *
-     * This would cause a compile time error when the disassembled
-     * output file is recompiled.
-     */
     if ((*Path == AML_ROOT_PREFIX) && (Path[1]))
     {
         Path++;
     }
 
+    /* Externalize the pathname */
+
+    Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Path,
+        NULL, &ExternalPath);
+    if (ACPI_FAILURE (Status))
+    {
+        return_VOID;
+    }
+
+    /*
+     * Get the full pathname from the root if "Path" has one or more
+     * parent prefixes (^). Note: path will not contain a leading '\'.
+     */
+    if (*Path == (UINT8) AML_PARENT_PREFIX)
+    {
+        Temp = AcpiDmNormalizeParentPrefix (Op, ExternalPath);
+
+        /* Set new external path */
+
+        ACPI_FREE (ExternalPath);
+        ExternalPath = Temp;
+        if (!Temp)
+        {
+            return_VOID;
+        }
+
+        /* Create the new internal pathname */
+
+        Flags |= ACPI_EXT_INTERNAL_PATH_ALLOCATED;
+        Status = AcpiNsInternalizeName (ExternalPath, &InternalPath);
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_FREE (ExternalPath);
+            return_VOID;
+        }
+    }
+
+    /* Create the new External() declaration node */
+
+    Status = AcpiDmCreateNewExternal (ExternalPath, InternalPath,
+        Type, Value, Flags);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (ExternalPath);
+        if (Flags & ACPI_EXT_INTERNAL_PATH_ALLOCATED)
+        {
+            ACPI_FREE (InternalPath);
+        }
+    }
+
+    return_VOID;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmAddNodeToExternalList
+ *
+ * PARAMETERS:  Node                - Namespace node for object to be added
+ *              Type                - ACPI object type to be added
+ *              Value               - Arg count if adding a Method object
+ *              Flags               - To be passed to the external object
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Insert a new name into the global list of Externals which
+ *              will in turn be later emitted as an External() declaration
+ *              in the disassembled output.
+ *
+ *              This function handles the case where the referenced name has
+ *              been found in the namespace, but the name originated in a
+ *              table other than the one that is being disassembled (such
+ *              as a table that is added via the iASL -e option).
+ *
+ ******************************************************************************/
+
+void
+AcpiDmAddNodeToExternalList (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT8                   Type,
+    UINT32                  Value,
+    UINT16                  Flags)
+{
+    char                    *ExternalPath;
+    char                    *InternalPath;
+    char                    *Temp;
+    ACPI_STATUS             Status;
+
+
+    ACPI_FUNCTION_TRACE (DmAddNodeToExternalList);
+
+
+    if (!Node)
+    {
+        return_VOID;
+    }
+
+    /* Get the full external and internal pathnames to the node */
+
+    ExternalPath = AcpiNsGetExternalPathname (Node);
+    if (!ExternalPath)
+    {
+        return_VOID;
+    }
+
+    Status = AcpiNsInternalizeName (ExternalPath, &InternalPath);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (ExternalPath);
+        return_VOID;
+    }
+
+    /* Remove the root backslash */
+
+    if ((*ExternalPath == AML_ROOT_PREFIX) && (ExternalPath[1]))
+    {
+        Temp = ACPI_ALLOCATE_ZEROED (ACPI_STRLEN (ExternalPath) + 1);
+        if (!Temp)
+        {
+            return_VOID;
+        }
+
+        ACPI_STRCPY (Temp, &ExternalPath[1]);
+        ACPI_FREE (ExternalPath);
+        ExternalPath = Temp;
+    }
+
+    /* Create the new External() declaration node */
+
+    Status = AcpiDmCreateNewExternal (ExternalPath, InternalPath, Type,
+        Value, (Flags | ACPI_EXT_INTERNAL_PATH_ALLOCATED));
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (ExternalPath);
+        ACPI_FREE (InternalPath);
+    }
+
+    return_VOID;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmAddPathToExternalList
+ *
+ * PARAMETERS:  Path                - External name of the object to be added
+ *              Type                - ACPI object type to be added
+ *              Value               - Arg count if adding a Method object
+ *              Flags               - To be passed to the external object
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Insert a new name into the global list of Externals which
+ *              will in turn be later emitted as an External() declaration
+ *              in the disassembled output.
+ *
+ *              This function currently is used to add externals via a
+ *              reference file (via the -fe iASL option).
+ *
+ ******************************************************************************/
+
+static void
+AcpiDmAddPathToExternalList (
+    char                    *Path,
+    UINT8                   Type,
+    UINT32                  Value,
+    UINT16                  Flags)
+{
+    char                    *InternalPath;
+    char                    *ExternalPath;
+    ACPI_STATUS             Status;
+
+
+    ACPI_FUNCTION_TRACE (DmAddPathToExternalList);
+
+
+    if (!Path)
+    {
+        return_VOID;
+    }
+
+    /* Remove a root backslash if present */
+
+    if ((*Path == AML_ROOT_PREFIX) && (Path[1]))
+    {
+        Path++;
+    }
+
+    /* Create the internal and external pathnames */
+
+    Status = AcpiNsInternalizeName (Path, &InternalPath);
+    if (ACPI_FAILURE (Status))
+    {
+        return_VOID;
+    }
+
+    Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, InternalPath,
+        NULL, &ExternalPath);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (InternalPath);
+        return_VOID;
+    }
+
+    /* Create the new External() declaration node */
+
+    Status = AcpiDmCreateNewExternal (ExternalPath, InternalPath,
+        Type, Value, (Flags | ACPI_EXT_INTERNAL_PATH_ALLOCATED));
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (ExternalPath);
+        ACPI_FREE (InternalPath);
+    }
+
+    return_VOID;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmCreateNewExternal
+ *
+ * PARAMETERS:  ExternalPath        - External path to the object
+ *              InternalPath        - Internal (AML) path to the object
+ *              Type                - ACPI object type to be added
+ *              Value               - Arg count if adding a Method object
+ *              Flags               - To be passed to the external object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Common low-level function to insert a new name into the global
+ *              list of Externals which will in turn be later emitted as
+ *              External() declarations in the disassembled output.
+ *
+ *              Note: The external name should not include a root prefix
+ *              (backslash). We do not want External() statements to contain
+ *              a leading '\', as this prevents duplicate external statements
+ *              of the form:
+ *
+ *                  External (\ABCD)
+ *                  External (ABCD)
+ *
+ *              This would cause a compile time error when the disassembled
+ *              output file is recompiled.
+ *
+ *              There are two cases that are handled here. For both, we emit
+ *              an External() statement:
+ *              1) The name was simply not found in the namespace.
+ *              2) The name was found, but it originated in a table other than
+ *              the table that is being disassembled.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDmCreateNewExternal (
+    char                    *ExternalPath,
+    char                    *InternalPath,
+    UINT8                   Type,
+    UINT32                  Value,
+    UINT16                  Flags)
+{
+    ACPI_EXTERNAL_LIST      *NewExternal;
+    ACPI_EXTERNAL_LIST      *NextExternal;
+    ACPI_EXTERNAL_LIST      *PrevExternal = NULL;
+
+
+    ACPI_FUNCTION_TRACE (DmCreateNewExternal);
+
+
     /* Check all existing externals to ensure no duplicates */
 
     NextExternal = AcpiGbl_ExternalList;
     while (NextExternal)
     {
-        if (!ACPI_STRCMP (Path, NextExternal->Path))
+        if (!ACPI_STRCMP (ExternalPath, NextExternal->Path))
         {
             /* Duplicate method, check that the Value (ArgCount) is the same */
 
             if ((NextExternal->Type == ACPI_TYPE_METHOD) &&
-                (NextExternal->Value != Value))
+                (NextExternal->Value != Value) &&
+                (Value > 0))
             {
                 ACPI_ERROR ((AE_INFO,
-                    "(File) External method arg count mismatch %s: Current %u, override to %u",
+                    "External method arg count mismatch %s: Current %u, attempted %u",
                     NextExternal->Path, NextExternal->Value, Value));
-
-                /* Override, since new value came from external reference file */
-
-                NextExternal->Value = Value;
             }
 
             /* Allow upgrade of type from ANY */
@@ -740,44 +827,31 @@ AcpiDmAddToExternalListFromFile (
                 NextExternal->Value = Value;
             }
 
-            return;
+            return_ACPI_STATUS (AE_ALREADY_EXISTS);
         }
 
         NextExternal = NextExternal->Next;
     }
 
-    /* Get the internal pathname (AML format) */
-
-    Status = AcpiNsInternalizeName (Path, &InternalPath);
-    if (ACPI_FAILURE (Status))
-    {
-        return;
-    }
-
     /* Allocate and init a new External() descriptor */
 
     NewExternal = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_EXTERNAL_LIST));
     if (!NewExternal)
     {
-        ACPI_FREE (InternalPath);
-        return;
+        return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
-    /* Must copy and normalize the input path */
-
-    AcpiNsExternalizeName (ACPI_UINT32_MAX, InternalPath, NULL, &ExternalPath);
+    ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+        "Adding external reference node (%s) type [%s]\n",
+        ExternalPath, AcpiUtGetTypeName (Type)));
 
+    NewExternal->Flags = Flags;
+    NewExternal->Value = Value;
     NewExternal->Path = ExternalPath;
     NewExternal->Type = Type;
-    NewExternal->Value = Value;
-    NewExternal->Resolved = Resolved;
-    NewExternal->Length = (UINT16) ACPI_STRLEN (Path);
+    NewExternal->Length = (UINT16) ACPI_STRLEN (ExternalPath);
     NewExternal->InternalPath = InternalPath;
 
-    /* Set flag to indicate External->InternalPath needs to be freed */
-
-    NewExternal->Flags |= ACPI_IPATH_ALLOCATED | ACPI_FROM_REFERENCE_FILE;
-
     /* Link the new descriptor into the global list, alphabetically ordered */
 
     NextExternal = AcpiGbl_ExternalList;
@@ -795,7 +869,7 @@ AcpiDmAddToExternalListFromFile (
             }
 
             NewExternal->Next = NextExternal;
-            return;
+            return_ACPI_STATUS (AE_OK);
         }
 
         PrevExternal = NextExternal;
@@ -810,6 +884,8 @@ AcpiDmAddToExternalListFromFile (
     {
         AcpiGbl_ExternalList = NewExternal;
     }
+
+    return_ACPI_STATUS (AE_OK);
 }
 
 
@@ -985,7 +1061,7 @@ AcpiDmEmitExternals (
         if (NextExternal->Type == ACPI_TYPE_METHOD)
         {
             AcpiGbl_NumExternalMethods++;
-            if (NextExternal->Resolved)
+            if (NextExternal->Flags & ACPI_EXT_RESOLVED_REFERENCE)
             {
                 AcpiGbl_ResolvedExternalMethods++;
             }
@@ -1004,18 +1080,17 @@ AcpiDmEmitExternals (
     while (NextExternal)
     {
         if ((NextExternal->Type == ACPI_TYPE_METHOD) &&
-            (!NextExternal->Resolved))
+            (!(NextExternal->Flags & ACPI_EXT_RESOLVED_REFERENCE)))
         {
             AcpiOsPrintf ("    External (%s%s",
                 NextExternal->Path,
                 AcpiDmGetObjectTypeName (NextExternal->Type));
 
-            AcpiOsPrintf (
-                ")    // Warning: Unresolved Method, "
-                "guessing %u arguments (may be incorrect, see warning above)\n",
+            AcpiOsPrintf (")    // Warning: Unresolved method, "
+                "guessing %u arguments\n",
                 NextExternal->Value);
 
-            NextExternal->Emitted = TRUE;
+            NextExternal->Flags |= ACPI_EXT_EXTERNAL_EMITTED;
         }
 
         NextExternal = NextExternal->Next;
@@ -1036,7 +1111,8 @@ AcpiDmEmitExternals (
         NextExternal = AcpiGbl_ExternalList;
         while (NextExternal)
         {
-            if (!NextExternal->Emitted && (NextExternal->Flags & ACPI_FROM_REFERENCE_FILE))
+            if (!(NextExternal->Flags & ACPI_EXT_EXTERNAL_EMITTED) &&
+                (NextExternal->Flags & ACPI_EXT_ORIGIN_FROM_FILE))
             {
                 AcpiOsPrintf ("    External (%s%s",
                     NextExternal->Path,
@@ -1051,7 +1127,7 @@ AcpiDmEmitExternals (
                 {
                     AcpiOsPrintf (")\n");
                 }
-                NextExternal->Emitted = TRUE;
+                NextExternal->Flags |= ACPI_EXT_EXTERNAL_EMITTED;
             }
 
             NextExternal = NextExternal->Next;
@@ -1065,7 +1141,7 @@ AcpiDmEmitExternals (
      */
     while (AcpiGbl_ExternalList)
     {
-        if (!AcpiGbl_ExternalList->Emitted)
+        if (!(AcpiGbl_ExternalList->Flags & ACPI_EXT_EXTERNAL_EMITTED))
         {
             AcpiOsPrintf ("    External (%s%s",
                 AcpiGbl_ExternalList->Path,
@@ -1087,7 +1163,7 @@ AcpiDmEmitExternals (
         /* Free this external info block and move on to next external */
 
         NextExternal = AcpiGbl_ExternalList->Next;
-        if (AcpiGbl_ExternalList->Flags & ACPI_IPATH_ALLOCATED)
+        if (AcpiGbl_ExternalList->Flags & ACPI_EXT_INTERNAL_PATH_ALLOCATED)
         {
             ACPI_FREE (AcpiGbl_ExternalList->InternalPath);
         }
@@ -1209,12 +1285,24 @@ AcpiDmUnresolvedWarning (
                 "     * were not specified. This resulting disassembler output file may not\n"
                 "     * compile because the disassembler did not know how many arguments\n"
                 "     * to assign to these methods. To specify the tables needed to resolve\n"
-                "     * external control method references, use the one of the following\n"
-                "     * example iASL invocations:\n"
-                "     *     iasl -e <ssdt1.aml,ssdt2.aml...> -d <dsdt.aml>\n"
-                "     *     iasl -e <dsdt.aml,ssdt2.aml...> -d <ssdt1.aml>\n"
+                "     * external control method references, the -e option can be used to\n"
+                "     * specify the filenames. Example iASL invocations:\n"
+                "     *     iasl -e ssdt1.aml ssdt2.aml ssdt3.aml -d dsdt.aml\n"
+                "     *     iasl -e dsdt.aml ssdt2.aml -d ssdt1.aml\n"
+                "     *     iasl -e ssdt*.aml -d dsdt.aml\n"
+                "     *\n"
+                "     * In addition, the -fe option can be used to specify a file containing\n"
+                "     * control method external declarations with the associated method\n"
+                "     * argument counts. Each line of the file must be of the form:\n"
+                "     *     External (<method pathname>, MethodObj, <argument count>)\n"
+                "     * Invocation:\n"
+                "     *     iasl -fe refs.txt -d dsdt.aml\n"
+                "     *\n"
+                "     * The following methods were unresolved and many not compile properly\n"
+                "     * because the disassembler had to guess at the number of arguments\n"
+                "     * required for each:\n"
                 "     */\n",
-                AcpiGbl_NumExternalMethods);
+               AcpiGbl_NumExternalMethods);
         }
         else if (AcpiGbl_NumExternalMethods != AcpiGbl_ResolvedExternalMethods)
         {
@@ -1223,10 +1311,21 @@ AcpiDmUnresolvedWarning (
             AcpiOsPrintf ("    /*\n"
                 "     * iASL Warning: There were %u external control methods found during\n"
                 "     * disassembly, but only %u %s resolved (%u unresolved). Additional\n"
-                "     * ACPI tables are required to properly disassemble the code. This\n"
+                "     * ACPI tables may be required to properly disassemble the code. This\n"
                 "     * resulting disassembler output file may not compile because the\n"
                 "     * disassembler did not know how many arguments to assign to the\n"
                 "     * unresolved methods.\n"
+                "     *\n"
+                "     * If necessary, the -fe option can be used to specify a file containing\n"
+                "     * control method external declarations with the associated method\n"
+                "     * argument counts. Each line of the file must be of the form:\n"
+                "     *     External (<method pathname>, MethodObj, <argument count>)\n"
+                "     * Invocation:\n"
+                "     *     iasl -fe refs.txt -d dsdt.aml\n"
+                "     *\n"
+                "     * The following methods were unresolved and many not compile properly\n"
+                "     * because the disassembler had to guess at the number of arguments\n"
+                "     * required for each:\n"
                 "     */\n",
                 AcpiGbl_NumExternalMethods, AcpiGbl_ResolvedExternalMethods,
                 (AcpiGbl_ResolvedExternalMethods > 1 ? "were" : "was"),
@@ -1245,10 +1344,18 @@ AcpiDmUnresolvedWarning (
                 "were not specified. The resulting disassembler output file may not\n"
                 "compile because the disassembler did not know how many arguments\n"
                 "to assign to these methods. To specify the tables needed to resolve\n"
-                "external control method references, use the one of the following\n"
-                "example iASL invocations:\n"
-                "    iasl -e <ssdt1.aml,ssdt2.aml...> -d <dsdt.aml>\n"
-                "    iasl -e <dsdt.aml,ssdt2.aml...> -d <ssdt1.aml>\n",
+                "external control method references, the -e option can be used to\n"
+                "specify the filenames. Example iASL invocations:\n"
+                "    iasl -e ssdt1.aml ssdt2.aml ssdt3.aml -d dsdt.aml\n"
+                "    iasl -e dsdt.aml ssdt2.aml -d ssdt1.aml\n"
+                "    iasl -e ssdt*.aml -d dsdt.aml\n"
+                "\n"
+                "In addition, the -fe option can be used to specify a file containing\n"
+                "control method external declarations with the associated method\n"
+                "argument counts. Each line of the file must be of the form:\n"
+                "    External (<method pathname>, MethodObj, <argument count>)\n"
+                "Invocation:\n"
+                "    iasl -fe refs.txt -d dsdt.aml\n",
                 AcpiGbl_NumExternalMethods);
         }
         else if (AcpiGbl_NumExternalMethods != AcpiGbl_ResolvedExternalMethods)
@@ -1258,10 +1365,17 @@ AcpiDmUnresolvedWarning (
             fprintf (stderr, "\n"
                 "iASL Warning: There were %u external control methods found during\n"
                 "disassembly, but only %u %s resolved (%u unresolved). Additional\n"
-                "ACPI tables are required to properly disassemble the code. The\n"
+                "ACPI tables may be required to properly disassemble the code. The\n"
                 "resulting disassembler output file may not compile because the\n"
                 "disassembler did not know how many arguments to assign to the\n"
-                "unresolved methods.\n",
+                "unresolved methods.\n"
+                "\n"
+                "If necessary, the -fe option can be used to specify a file containing\n"
+                "control method external declarations with the associated method\n"
+                "argument counts. Each line of the file must be of the form:\n"
+                "    External (<method pathname>, MethodObj, <argument count>)\n"
+                "Invocation:\n"
+                "    iasl -fe refs.txt -d dsdt.aml\n",
                 AcpiGbl_NumExternalMethods, AcpiGbl_ResolvedExternalMethods,
                 (AcpiGbl_ResolvedExternalMethods > 1 ? "were" : "was"),
                 (AcpiGbl_NumExternalMethods - AcpiGbl_ResolvedExternalMethods));
diff --git a/sys/contrib/dev/acpica/common/dmrestag.c b/sys/contrib/dev/acpica/common/dmrestag.c
index 9b8549877e5e..e1b435b725b8 100644
--- a/sys/contrib/dev/acpica/common/dmrestag.c
+++ b/sys/contrib/dev/acpica/common/dmrestag.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
diff --git a/sys/contrib/dev/acpica/common/dmtable.c b/sys/contrib/dev/acpica/common/dmtable.c
index e7ce520b4ce8..0b756537cb3f 100644
--- a/sys/contrib/dev/acpica/common/dmtable.c
+++ b/sys/contrib/dev/acpica/common/dmtable.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,9 +87,21 @@ static const char           *AcpiDmDmarSubnames[] =
     "Reserved Memory Region",
     "Root Port ATS Capability",
     "Remapping Hardware Static Affinity",
+    "ACPI Namespace Device Declaration",
     "Unknown SubTable Type"         /* Reserved */
 };
 
+static const char           *AcpiDmDmarScope[] =
+{
+    "Reserved value",
+    "PCI Endpoint Device",
+    "PCI Bridge Device",
+    "IOAPIC Device",
+    "Message-capable HPET Device",
+    "Namespace Device",
+    "Unknown Scope Type"            /* Reserved */
+};
+
 static const char           *AcpiDmEinjActions[] =
 {
     "Begin Operation",
@@ -160,6 +172,13 @@ static const char           *AcpiDmErstInstructions[] =
     "Unknown Instruction"
 };
 
+static const char           *AcpiDmGtdtSubnames[] =
+{
+    "Generic Timer Block",
+    "Generic Watchdog Timer",
+    "Unknown SubTable Type"         /* Reserved */
+};
+
 static const char           *AcpiDmHestSubnames[] =
 {
     "IA-32 Machine Check Exception",
@@ -189,20 +208,29 @@ static const char           *AcpiDmHestNotifySubnames[] =
 
 static const char           *AcpiDmMadtSubnames[] =
 {
-    "Processor Local APIC",         /* ACPI_MADT_TYPE_LOCAL_APIC */
-    "I/O APIC",                     /* ACPI_MADT_TYPE_IO_APIC */
-    "Interrupt Source Override",    /* ACPI_MADT_TYPE_INTERRUPT_OVERRIDE */
-    "NMI Source",                   /* ACPI_MADT_TYPE_NMI_SOURCE */
-    "Local APIC NMI",               /* ACPI_MADT_TYPE_LOCAL_APIC_NMI */
-    "Local APIC Address Override",  /* ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE */
-    "I/O SAPIC",                    /* ACPI_MADT_TYPE_IO_SAPIC */
-    "Local SAPIC",                  /* ACPI_MADT_TYPE_LOCAL_SAPIC */
-    "Platform Interrupt Sources",   /* ACPI_MADT_TYPE_INTERRUPT_SOURCE */
-    "Processor Local x2APIC",       /* ACPI_MADT_TYPE_LOCAL_X2APIC */
-    "Local x2APIC NMI",             /* ACPI_MADT_TYPE_LOCAL_X2APIC_NMI */
-    "Generic Interrupt Controller", /* ACPI_MADT_GENERIC_INTERRUPT */
-    "Generic Interrupt Distributor",/* ACPI_MADT_GENERIC_DISTRIBUTOR */
-    "Unknown SubTable Type"         /* Reserved */
+    "Processor Local APIC",             /* ACPI_MADT_TYPE_LOCAL_APIC */
+    "I/O APIC",                         /* ACPI_MADT_TYPE_IO_APIC */
+    "Interrupt Source Override",        /* ACPI_MADT_TYPE_INTERRUPT_OVERRIDE */
+    "NMI Source",                       /* ACPI_MADT_TYPE_NMI_SOURCE */
+    "Local APIC NMI",                   /* ACPI_MADT_TYPE_LOCAL_APIC_NMI */
+    "Local APIC Address Override",      /* ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE */
+    "I/O SAPIC",                        /* ACPI_MADT_TYPE_IO_SAPIC */
+    "Local SAPIC",                      /* ACPI_MADT_TYPE_LOCAL_SAPIC */
+    "Platform Interrupt Sources",       /* ACPI_MADT_TYPE_INTERRUPT_SOURCE */
+    "Processor Local x2APIC",           /* ACPI_MADT_TYPE_LOCAL_X2APIC */
+    "Local x2APIC NMI",                 /* ACPI_MADT_TYPE_LOCAL_X2APIC_NMI */
+    "Generic Interrupt Controller",     /* ACPI_MADT_GENERIC_INTERRUPT */
+    "Generic Interrupt Distributor",    /* ACPI_MADT_GENERIC_DISTRIBUTOR */
+    "Generic MSI Frame",                /* ACPI_MADT_GENERIC_MSI_FRAME */
+    "Generic Interrupt Redistributor",  /* ACPI_MADT_GENERIC_REDISTRIBUTOR */
+    "Unknown SubTable Type"             /* Reserved */
+};
+
+static const char           *AcpiDmPcctSubnames[] =
+{
+    "Generic Communications Subspace",  /* ACPI_PCCT_TYPE_GENERIC_SUBSPACE */
+    "HW-Reduced Communications Subspace",
+    "Unknown SubTable Type"             /* Reserved */
 };
 
 static const char           *AcpiDmPmttSubnames[] =
@@ -225,6 +253,7 @@ static const char           *AcpiDmSratSubnames[] =
     "Processor Local APIC/SAPIC Affinity",
     "Memory Affinity",
     "Processor Local x2APIC Affinity",
+    "GICC Affinity",
     "Unknown SubTable Type"         /* Reserved */
 };
 
@@ -235,6 +264,12 @@ static const char           *AcpiDmIvrsSubnames[] =
     "Unknown SubTable Type"         /* Reserved */
 };
 
+static const char           *AcpiDmLpitSubnames[] =
+{
+    "Native C-state Idle Structure",
+    "Simple I/O Idle Structure",
+    "Unknown SubTable Type"         /* Reserved */
+};
 
 #define ACPI_FADT_PM_RESERVED       9
 
@@ -286,7 +321,7 @@ ACPI_DMTABLE_DATA    AcpiDmTableData[] =
     {ACPI_SIG_BOOT, AcpiDmTableInfoBoot,    NULL,           NULL,           TemplateBoot,   "Simple Boot Flag Table"},
     {ACPI_SIG_CPEP, NULL,                   AcpiDmDumpCpep, DtCompileCpep,  TemplateCpep,   "Corrected Platform Error Polling table"},
     {ACPI_SIG_CSRT, NULL,                   AcpiDmDumpCsrt, DtCompileCsrt,  TemplateCsrt,   "Core System Resource Table"},
-    {ACPI_SIG_DBG2, NULL,                   AcpiDmDumpDbg2, NULL,           NULL,           "Debug Port table type 2"},
+    {ACPI_SIG_DBG2, AcpiDmTableInfoDbg2,    AcpiDmDumpDbg2, DtCompileDbg2,  TemplateDbg2,   "Debug Port table type 2"},
     {ACPI_SIG_DBGP, AcpiDmTableInfoDbgp,    NULL,           NULL,           TemplateDbgp,   "Debug Port table"},
     {ACPI_SIG_DMAR, NULL,                   AcpiDmDumpDmar, DtCompileDmar,  TemplateDmar,   "DMA Remapping table"},
     {ACPI_SIG_ECDT, AcpiDmTableInfoEcdt,    NULL,           NULL,           TemplateEcdt,   "Embedded Controller Boot Resources Table"},
@@ -294,17 +329,18 @@ ACPI_DMTABLE_DATA    AcpiDmTableData[] =
     {ACPI_SIG_ERST, NULL,                   AcpiDmDumpErst, DtCompileErst,  TemplateErst,   "Error Record Serialization Table"},
     {ACPI_SIG_FADT, NULL,                   AcpiDmDumpFadt, DtCompileFadt,  TemplateFadt,   "Fixed ACPI Description Table (FADT)"},
     {ACPI_SIG_FPDT, NULL,                   AcpiDmDumpFpdt, DtCompileFpdt,  TemplateFpdt,   "Firmware Performance Data Table"},
-    {ACPI_SIG_GTDT, AcpiDmTableInfoGtdt,    NULL,           NULL,           TemplateGtdt,   "Generic Timer Description Table"},
+    {ACPI_SIG_GTDT, NULL,                   AcpiDmDumpGtdt, DtCompileGtdt,  TemplateGtdt,   "Generic Timer Description Table"},
     {ACPI_SIG_HEST, NULL,                   AcpiDmDumpHest, DtCompileHest,  TemplateHest,   "Hardware Error Source Table"},
     {ACPI_SIG_HPET, AcpiDmTableInfoHpet,    NULL,           NULL,           TemplateHpet,   "High Precision Event Timer table"},
     {ACPI_SIG_IVRS, NULL,                   AcpiDmDumpIvrs, DtCompileIvrs,  TemplateIvrs,   "I/O Virtualization Reporting Structure"},
+    {ACPI_SIG_LPIT, NULL,                   AcpiDmDumpLpit, DtCompileLpit,  TemplateLpit,   "Low Power Idle Table"},
     {ACPI_SIG_MADT, NULL,                   AcpiDmDumpMadt, DtCompileMadt,  TemplateMadt,   "Multiple APIC Description Table (MADT)"},
     {ACPI_SIG_MCFG, NULL,                   AcpiDmDumpMcfg, DtCompileMcfg,  TemplateMcfg,   "Memory Mapped Configuration table"},
     {ACPI_SIG_MCHI, AcpiDmTableInfoMchi,    NULL,           NULL,           TemplateMchi,   "Management Controller Host Interface table"},
     {ACPI_SIG_MPST, AcpiDmTableInfoMpst,    AcpiDmDumpMpst, DtCompileMpst,  TemplateMpst,   "Memory Power State Table"},
     {ACPI_SIG_MSCT, NULL,                   AcpiDmDumpMsct, DtCompileMsct,  TemplateMsct,   "Maximum System Characteristics Table"},
     {ACPI_SIG_MTMR, NULL,                   AcpiDmDumpMtmr, DtCompileMtmr,  TemplateMtmr,   "MID Timer Table"},
-    {ACPI_SIG_PCCT, NULL,                   AcpiDmDumpPcct, NULL,           NULL,           "Platform Communications Channel Table"},
+    {ACPI_SIG_PCCT, AcpiDmTableInfoPcct,    AcpiDmDumpPcct, DtCompilePcct,  TemplatePcct,   "Platform Communications Channel Table"},
     {ACPI_SIG_PMTT, NULL,                   AcpiDmDumpPmtt, DtCompilePmtt,  TemplatePmtt,   "Platform Memory Topology Table"},
     {ACPI_SIG_RSDT, NULL,                   AcpiDmDumpRsdt, DtCompileRsdt,  TemplateRsdt,   "Root System Description Table"},
     {ACPI_SIG_S3PT, NULL,                   NULL,           NULL,           TemplateS3pt,   "S3 Performance Table"},
@@ -650,6 +686,7 @@ AcpiDmDumpTable (
     UINT32                  ByteLength;
     UINT8                   Temp8;
     UINT16                  Temp16;
+    UINT64                  Value;
     ACPI_DMTABLE_DATA       *TableData;
     const char              *Name;
     BOOLEAN                 LastOutputBlankLine = FALSE;
@@ -691,7 +728,9 @@ AcpiDmDumpTable (
         case ACPI_DMT_SPACEID:
         case ACPI_DMT_ACCWIDTH:
         case ACPI_DMT_IVRS:
+        case ACPI_DMT_GTDT:
         case ACPI_DMT_MADT:
+        case ACPI_DMT_PCCT:
         case ACPI_DMT_PMTT:
         case ACPI_DMT_SRAT:
         case ACPI_DMT_ASF:
@@ -701,6 +740,7 @@ AcpiDmDumpTable (
         case ACPI_DMT_EINJINST:
         case ACPI_DMT_ERSTACT:
         case ACPI_DMT_ERSTINST:
+        case ACPI_DMT_DMAR_SCOPE:
 
             ByteLength = 1;
             break;
@@ -721,6 +761,7 @@ AcpiDmDumpTable (
         case ACPI_DMT_NAME4:
         case ACPI_DMT_SIG:
         case ACPI_DMT_SLIC:
+        case ACPI_DMT_LPIT:
 
             ByteLength = 4;
             break;
@@ -863,10 +904,19 @@ AcpiDmDumpTable (
              * Dump bytes - high byte first, low byte last.
              * Note: All ACPI tables are little-endian.
              */
+            Value = 0;
             for (Temp8 = (UINT8) ByteLength; Temp8 > 0; Temp8--)
             {
                 AcpiOsPrintf ("%2.2X", Target[Temp8 - 1]);
+                Value |= Target[Temp8 - 1];
+                Value <<= 8;
             }
+
+            if (!Value && (Info->Flags & DT_DESCRIBES_OPTIONAL))
+            {
+                AcpiOsPrintf (" [Optional field not present]");
+            }
+
             AcpiOsPrintf ("\n");
             break;
 
@@ -1022,6 +1072,19 @@ AcpiDmDumpTable (
             AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target), AcpiDmDmarSubnames[Temp16]);
             break;
 
+        case ACPI_DMT_DMAR_SCOPE:
+
+            /* DMAR device scope types */
+
+            Temp8 = *Target;
+            if (Temp8 > ACPI_DMAR_SCOPE_TYPE_RESERVED)
+            {
+                Temp8 = ACPI_DMAR_SCOPE_TYPE_RESERVED;
+            }
+
+            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmDmarScope[Temp8]);
+            break;
+
         case ACPI_DMT_EINJACT:
 
             /* EINJ Action types */
@@ -1074,6 +1137,19 @@ AcpiDmDumpTable (
             AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmErstInstructions[Temp8]);
             break;
 
+        case ACPI_DMT_GTDT:
+
+            /* GTDT subtable types */
+
+            Temp8 = *Target;
+            if (Temp8 > ACPI_GTDT_TYPE_RESERVED)
+            {
+                Temp8 = ACPI_GTDT_TYPE_RESERVED;
+            }
+
+            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmGtdtSubnames[Temp8]);
+            break;
+
         case ACPI_DMT_HEST:
 
             /* HEST subtable types */
@@ -1122,6 +1198,19 @@ AcpiDmDumpTable (
             AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmMadtSubnames[Temp8]);
             break;
 
+        case ACPI_DMT_PCCT:
+
+            /* PCCT subtable types */
+
+            Temp8 = *Target;
+            if (Temp8 > ACPI_PCCT_TYPE_RESERVED)
+            {
+                Temp8 = ACPI_PCCT_TYPE_RESERVED;
+            }
+
+            AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmPcctSubnames[Temp8]);
+            break;
+
         case ACPI_DMT_PMTT:
 
             /* PMTT subtable types */
@@ -1202,6 +1291,32 @@ AcpiDmDumpTable (
             AcpiOsPrintf (UINT8_FORMAT, *Target, Name);
             break;
 
+        case ACPI_DMT_LPIT:
+
+            /* LPIT subtable types */
+
+            Temp8 = *Target;
+            switch (Temp8)
+            {
+            case ACPI_LPIT_TYPE_NATIVE_CSTATE:
+
+                Name = AcpiDmLpitSubnames[0];
+                break;
+
+            case ACPI_LPIT_TYPE_SIMPLE_IO:
+
+                Name = AcpiDmLpitSubnames[1];
+                break;
+
+            default:
+
+                Name = AcpiDmLpitSubnames[2];
+                break;
+            }
+
+            AcpiOsPrintf (UINT32_FORMAT, *Target, Name);
+            break;
+
         case ACPI_DMT_EXIT:
 
             return (AE_OK);
diff --git a/sys/contrib/dev/acpica/common/dmtbdump.c b/sys/contrib/dev/acpica/common/dmtbdump.c
index 89d38e706780..2f88a54e2311 100644
--- a/sys/contrib/dev/acpica/common/dmtbdump.c
+++ b/sys/contrib/dev/acpica/common/dmtbdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -419,12 +419,12 @@ AcpiDmDumpAsf (
     UINT8                   Type;
 
 
-    /* No main table, only sub-tables */
+    /* No main table, only subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
                     SubTable->Header.Length, AcpiDmTableInfoAsfHdr);
@@ -479,7 +479,7 @@ AcpiDmDumpAsf (
 
         default:
 
-            AcpiOsPrintf ("\n**** Unknown ASF sub-table type 0x%X\n", SubTable->Header.Type);
+            AcpiOsPrintf ("\n**** Unknown ASF subtable type 0x%X\n", SubTable->Header.Type);
             return;
         }
 
@@ -541,7 +541,7 @@ AcpiDmDumpAsf (
 
         AcpiOsPrintf ("\n");
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         if (!SubTable->Header.Length)
         {
@@ -586,7 +586,7 @@ AcpiDmDumpCpep (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
     while (Offset < Table->Length)
@@ -599,7 +599,7 @@ AcpiDmDumpCpep (
             return;
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Header.Length;
         SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, SubTable,
@@ -638,7 +638,7 @@ AcpiDmDumpCsrt (
 
     /* The main table only contains the ACPI header, thus already handled */
 
-    /* Sub-tables (Resource Groups) */
+    /* Subtables (Resource Groups) */
 
     SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
     while (Offset < Table->Length)
@@ -702,7 +702,7 @@ AcpiDmDumpCsrt (
                         SubSubTable->Length);
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable,
@@ -746,7 +746,7 @@ AcpiDmDumpDbg2 (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
     while (Offset < Table->Length)
@@ -809,10 +809,13 @@ AcpiDmDumpDbg2 (
 
         /* Dump the OemData (optional) */
 
-        AcpiDmDumpBuffer (SubTable, SubTable->OemDataOffset, SubTable->OemDataLength,
-            Offset + SubTable->OemDataOffset, "OEM Data");
+        if (SubTable->OemDataOffset)
+        {
+            AcpiDmDumpBuffer (SubTable, SubTable->OemDataOffset, SubTable->OemDataLength,
+                Offset + SubTable->OemDataOffset, "OEM Data");
+        }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, SubTable,
@@ -858,12 +861,12 @@ AcpiDmDumpDmar (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Length, Offset, SubTable,
@@ -888,21 +891,27 @@ AcpiDmDumpDmar (
             ScopeOffset = sizeof (ACPI_DMAR_RESERVED_MEMORY);
             break;
 
-        case ACPI_DMAR_TYPE_ATSR:
+        case ACPI_DMAR_TYPE_ROOT_ATS:
 
             InfoTable = AcpiDmTableInfoDmar2;
             ScopeOffset = sizeof (ACPI_DMAR_ATSR);
             break;
 
-        case ACPI_DMAR_HARDWARE_AFFINITY:
+        case ACPI_DMAR_TYPE_HARDWARE_AFFINITY:
 
             InfoTable = AcpiDmTableInfoDmar3;
             ScopeOffset = sizeof (ACPI_DMAR_RHSA);
             break;
 
+        case ACPI_DMAR_TYPE_NAMESPACE:
+
+            InfoTable = AcpiDmTableInfoDmar4;
+            ScopeOffset = sizeof (ACPI_DMAR_ANDD);
+            break;
+
         default:
 
-            AcpiOsPrintf ("\n**** Unknown DMAR sub-table type 0x%X\n\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", SubTable->Type);
             return;
         }
 
@@ -913,7 +922,16 @@ AcpiDmDumpDmar (
             return;
         }
 
-        /* Dump the device scope entries (if any) */
+        /*
+         * Dump the optional device scope entries
+         */
+        if ((SubTable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+            (SubTable->Type == ACPI_DMAR_TYPE_NAMESPACE))
+        {
+            /* These types do not support device scopes */
+
+            goto NextSubtable;
+        }
 
         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset);
         while (ScopeOffset < SubTable->Length)
@@ -953,7 +971,8 @@ AcpiDmDumpDmar (
                 ScopeTable, ScopeTable->Length);
         }
 
-        /* Point to next sub-table */
+NextSubtable:
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable, SubTable->Length);
@@ -992,7 +1011,7 @@ AcpiDmDumpEinj (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
     while (Offset < Table->Length)
@@ -1005,7 +1024,7 @@ AcpiDmDumpEinj (
             return;
         }
 
-        /* Point to next sub-table (each subtable is of fixed length) */
+        /* Point to next subtable (each subtable is of fixed length) */
 
         Offset += sizeof (ACPI_WHEA_HEADER);
         SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, SubTable,
@@ -1045,7 +1064,7 @@ AcpiDmDumpErst (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
     while (Offset < Table->Length)
@@ -1058,7 +1077,7 @@ AcpiDmDumpErst (
             return;
         }
 
-        /* Point to next sub-table (each subtable is of fixed length) */
+        /* Point to next subtable (each subtable is of fixed length) */
 
         Offset += sizeof (ACPI_WHEA_HEADER);
         SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, SubTable,
@@ -1093,12 +1112,12 @@ AcpiDmDumpFpdt (
 
     /* There is no main table (other than the standard ACPI header) */
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Length, Offset, SubTable,
@@ -1122,7 +1141,7 @@ AcpiDmDumpFpdt (
 
         default:
 
-            AcpiOsPrintf ("\n**** Unknown FPDT sub-table type 0x%X\n\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", SubTable->Type);
 
             /* Attempt to continue */
 
@@ -1142,7 +1161,7 @@ AcpiDmDumpFpdt (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, SubTable, SubTable->Length);
@@ -1150,6 +1169,123 @@ AcpiDmDumpFpdt (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmDumpGtdt
+ *
+ * PARAMETERS:  Table               - A GTDT table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Format the contents of a GTDT. This table type consists
+ *              of an open-ended number of subtables.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpGtdt (
+    ACPI_TABLE_HEADER       *Table)
+{
+    ACPI_STATUS             Status;
+    ACPI_GTDT_HEADER        *SubTable;
+    UINT32                  Length = Table->Length;
+    UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
+    ACPI_DMTABLE_INFO       *InfoTable;
+    UINT32                  SubTableLength;
+    UINT32                  GtCount;
+    ACPI_GTDT_TIMER_ENTRY   *GtxTable;
+
+
+    /* Main table */
+
+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
+    if (ACPI_FAILURE (Status))
+    {
+        return;
+    }
+
+    /* Subtables */
+
+    SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
+    while (Offset < Table->Length)
+    {
+        /* Common subtable header */
+
+        AcpiOsPrintf ("\n");
+        Status = AcpiDmDumpTable (Length, Offset, SubTable,
+                    SubTable->Length, AcpiDmTableInfoGtdtHdr);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+
+        GtCount = 0;
+        switch (SubTable->Type)
+        {
+        case ACPI_GTDT_TYPE_TIMER_BLOCK:
+
+            SubTableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
+            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
+                        SubTable))->TimerCount;
+
+            InfoTable = AcpiDmTableInfoGtdt0;
+            break;
+
+        case ACPI_GTDT_TYPE_WATCHDOG:
+
+            SubTableLength = sizeof (ACPI_GTDT_WATCHDOG);
+
+            InfoTable = AcpiDmTableInfoGtdt1;
+            break;
+
+        default:
+
+            /* Cannot continue on unknown type - no length */
+
+            AcpiOsPrintf ("\n**** Unknown GTDT subtable type 0x%X\n", SubTable->Type);
+            return;
+        }
+
+        Status = AcpiDmDumpTable (Length, Offset, SubTable,
+                    SubTable->Length, InfoTable);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+
+        /* Point to end of current subtable (each subtable above is of fixed length) */
+
+        Offset += SubTableLength;
+
+        /* If there are any Gt Timer Blocks from above, dump them now */
+
+        if (GtCount)
+        {
+            GtxTable = ACPI_ADD_PTR (ACPI_GTDT_TIMER_ENTRY, SubTable, SubTableLength);
+            SubTableLength += GtCount * sizeof (ACPI_GTDT_TIMER_ENTRY);
+
+            while (GtCount)
+            {
+                AcpiOsPrintf ("\n");
+                Status = AcpiDmDumpTable (Length, Offset, GtxTable,
+                            sizeof (ACPI_GTDT_TIMER_ENTRY), AcpiDmTableInfoGtdt0a);
+                if (ACPI_FAILURE (Status))
+                {
+                    return;
+                }
+                Offset += sizeof (ACPI_GTDT_TIMER_ENTRY);
+                GtxTable++;
+                GtCount--;
+            }
+        }
+
+        /* Point to next subtable */
+
+        SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, SubTable, SubTableLength);
+    }
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmDumpHest
@@ -1185,7 +1321,7 @@ AcpiDmDumpHest (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
     while (Offset < Table->Length)
@@ -1243,7 +1379,7 @@ AcpiDmDumpHest (
 
             /* Cannot continue on unknown type - no length */
 
-            AcpiOsPrintf ("\n**** Unknown HEST sub-table type 0x%X\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n", SubTable->Type);
             return;
         }
 
@@ -1281,7 +1417,7 @@ AcpiDmDumpHest (
             }
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, SubTable, SubTableLength);
     }
@@ -1324,12 +1460,12 @@ AcpiDmDumpIvrs (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -1355,7 +1491,7 @@ AcpiDmDumpIvrs (
 
         default:
 
-            AcpiOsPrintf ("\n**** Unknown IVRS sub-table type 0x%X\n",
+            AcpiOsPrintf ("\n**** Unknown IVRS subtable type 0x%X\n",
                 SubTable->Type);
 
             /* Attempt to continue */
@@ -1458,7 +1594,7 @@ AcpiDmDumpIvrs (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, SubTable, SubTable->Length);
@@ -1466,6 +1602,85 @@ AcpiDmDumpIvrs (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmDumpLpit
+ *
+ * PARAMETERS:  Table               - A LPIT table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Format the contents of a LPIT. This table type consists
+ *              of an open-ended number of subtables. Note: There are no
+ *              entries in the main table. An LPIT consists of the table
+ *              header and then subtables only.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpLpit (
+    ACPI_TABLE_HEADER       *Table)
+{
+    ACPI_STATUS             Status;
+    ACPI_LPIT_HEADER        *SubTable;
+    UINT32                  Length = Table->Length;
+    UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
+    ACPI_DMTABLE_INFO       *InfoTable;
+    UINT32                  SubTableLength;
+
+
+    /* Subtables */
+
+    SubTable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
+    while (Offset < Table->Length)
+    {
+        /* Common subtable header */
+
+        Status = AcpiDmDumpTable (Length, Offset, SubTable,
+                    sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+
+        switch (SubTable->Type)
+        {
+        case ACPI_LPIT_TYPE_NATIVE_CSTATE:
+
+            InfoTable = AcpiDmTableInfoLpit0;
+            SubTableLength = sizeof (ACPI_LPIT_NATIVE);
+            break;
+
+        case ACPI_LPIT_TYPE_SIMPLE_IO:
+
+            InfoTable = AcpiDmTableInfoLpit1;
+            SubTableLength = sizeof (ACPI_LPIT_IO);
+            break;
+
+        default:
+
+            /* Cannot continue on unknown type - no length */
+
+            AcpiOsPrintf ("\n**** Unknown LPIT subtable type 0x%X\n", SubTable->Type);
+            return;
+        }
+
+        Status = AcpiDmDumpTable (Length, Offset, SubTable,
+                    SubTableLength, InfoTable);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+        AcpiOsPrintf ("\n");
+
+        /* Point to next subtable */
+
+        Offset += SubTableLength;
+        SubTable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, SubTable, SubTableLength);
+    }
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmDumpMadt
@@ -1498,12 +1713,12 @@ AcpiDmDumpMadt (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Length, Offset, SubTable,
@@ -1580,9 +1795,19 @@ AcpiDmDumpMadt (
             InfoTable = AcpiDmTableInfoMadt12;
             break;
 
+        case ACPI_MADT_TYPE_GENERIC_MSI_FRAME:
+
+            InfoTable = AcpiDmTableInfoMadt13;
+            break;
+
+        case ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR:
+
+            InfoTable = AcpiDmTableInfoMadt14;
+            break;
+
         default:
 
-            AcpiOsPrintf ("\n**** Unknown MADT sub-table type 0x%X\n\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n", SubTable->Type);
 
             /* Attempt to continue */
 
@@ -1602,7 +1827,7 @@ AcpiDmDumpMadt (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, SubTable, SubTable->Length);
@@ -1639,7 +1864,7 @@ AcpiDmDumpMcfg (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
     while (Offset < Table->Length)
@@ -1659,7 +1884,7 @@ AcpiDmDumpMcfg (
             return;
         }
 
-        /* Point to next sub-table (each subtable is of fixed length) */
+        /* Point to next subtable (each subtable is of fixed length) */
 
         Offset += sizeof (ACPI_MCFG_ALLOCATION);
         SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, SubTable,
@@ -1841,12 +2066,12 @@ AcpiDmDumpMsct (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -1856,7 +2081,7 @@ AcpiDmDumpMsct (
             return;
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += sizeof (ACPI_MSCT_PROXIMITY);
         SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, SubTable, sizeof (ACPI_MSCT_PROXIMITY));
@@ -1893,12 +2118,12 @@ AcpiDmDumpMtmr (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -1908,7 +2133,7 @@ AcpiDmDumpMtmr (
             return;
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += sizeof (ACPI_MTMR_ENTRY);
         SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, SubTable, sizeof (ACPI_MTMR_ENTRY));
@@ -1935,6 +2160,7 @@ AcpiDmDumpPcct (
 {
     ACPI_STATUS             Status;
     ACPI_PCCT_SUBSPACE      *SubTable;
+    ACPI_DMTABLE_INFO       *InfoTable;
     UINT32                  Length = Table->Length;
     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
 
@@ -1947,20 +2173,50 @@ AcpiDmDumpPcct (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
     while (Offset < Table->Length)
     {
+        /* Common subtable header */
+
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Length, Offset, SubTable,
-                    SubTable->Header.Length, AcpiDmTableInfoPcct0);
+                    SubTable->Header.Length, AcpiDmTableInfoPcctHdr);
         if (ACPI_FAILURE (Status))
         {
             return;
         }
 
-        /* Point to next sub-table */
+        switch (SubTable->Header.Type)
+        {
+        case ACPI_PCCT_TYPE_GENERIC_SUBSPACE:
+
+            InfoTable = AcpiDmTableInfoPcct0;
+            break;
+
+        case ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE:
+
+            InfoTable = AcpiDmTableInfoPcct1;
+            break;
+
+        default:
+
+            AcpiOsPrintf (
+                "\n**** Unexpected or unknown PCCT subtable type 0x%X\n\n",
+                SubTable->Header.Type);
+            return;
+        }
+
+        AcpiOsPrintf ("\n");
+        Status = AcpiDmDumpTable (Length, Offset, SubTable,
+                    SubTable->Header.Length, InfoTable);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+
+        /* Point to next subtable */
 
         Offset += SubTable->Header.Length;
         SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, SubTable,
@@ -2108,8 +2364,7 @@ AcpiDmDumpPmtt (
             if (DomainCount)
             {
                 AcpiOsPrintf (
-                    "\n**** DomainCount exceeds subtable length\n\n",
-                    MemSubTable->Type);
+                    "\n**** DomainCount exceeds subtable length\n\n");
             }
 
             /* Walk the physical component (DIMM) subtables */
@@ -2209,7 +2464,7 @@ AcpiDmDumpS3pt (
     SubTable = ACPI_ADD_PTR (ACPI_S3PT_HEADER, S3ptTable, Offset);
     while (Offset < S3ptTable->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (S3ptTable->Length, Offset, SubTable,
@@ -2233,7 +2488,7 @@ AcpiDmDumpS3pt (
 
         default:
 
-            AcpiOsPrintf ("\n**** Unknown S3PT sub-table type 0x%X\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", SubTable->Type);
 
             /* Attempt to continue */
 
@@ -2254,7 +2509,7 @@ AcpiDmDumpS3pt (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_S3PT_HEADER, SubTable, SubTable->Length);
@@ -2291,7 +2546,7 @@ AcpiDmDumpSlic (
     SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -2315,7 +2570,7 @@ AcpiDmDumpSlic (
 
         default:
 
-            AcpiOsPrintf ("\n**** Unknown SLIC sub-table type 0x%X\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown SLIC subtable type 0x%X\n", SubTable->Type);
 
             /* Attempt to continue */
 
@@ -2336,7 +2591,7 @@ AcpiDmDumpSlic (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, SubTable, SubTable->Length);
@@ -2452,12 +2707,12 @@ AcpiDmDumpSrat (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -2484,8 +2739,13 @@ AcpiDmDumpSrat (
             InfoTable = AcpiDmTableInfoSrat2;
             break;
 
+        case ACPI_SRAT_TYPE_GICC_AFFINITY:
+
+            InfoTable = AcpiDmTableInfoSrat3;
+            break;
+
         default:
-            AcpiOsPrintf ("\n**** Unknown SRAT sub-table type 0x%X\n", SubTable->Type);
+            AcpiOsPrintf ("\n**** Unknown SRAT subtable type 0x%X\n", SubTable->Type);
 
             /* Attempt to continue */
 
@@ -2506,7 +2766,7 @@ AcpiDmDumpSrat (
         }
 
 NextSubTable:
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += SubTable->Length;
         SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, SubTable, SubTable->Length);
@@ -2543,12 +2803,12 @@ AcpiDmDumpVrtc (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -2558,7 +2818,7 @@ AcpiDmDumpVrtc (
             return;
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += sizeof (ACPI_VRTC_ENTRY);
         SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, SubTable, sizeof (ACPI_VRTC_ENTRY));
@@ -2595,12 +2855,12 @@ AcpiDmDumpWdat (
         return;
     }
 
-    /* Sub-tables */
+    /* Subtables */
 
     SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
     while (Offset < Table->Length)
     {
-        /* Common sub-table header */
+        /* Common subtable header */
 
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
@@ -2610,7 +2870,7 @@ AcpiDmDumpWdat (
             return;
         }
 
-        /* Point to next sub-table */
+        /* Point to next subtable */
 
         Offset += sizeof (ACPI_WDAT_ENTRY);
         SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, SubTable, sizeof (ACPI_WDAT_ENTRY));
diff --git a/sys/contrib/dev/acpica/common/dmtbinfo.c b/sys/contrib/dev/acpica/common/dmtbinfo.c
index 4272a33f3614..cadb4c4e2c36 100644
--- a/sys/contrib/dev/acpica/common/dmtbinfo.c
+++ b/sys/contrib/dev/acpica/common/dmtbinfo.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -137,11 +137,16 @@
 #define ACPI_DMAR1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_DMAR_RESERVED_MEMORY,f)
 #define ACPI_DMAR2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_DMAR_ATSR,f)
 #define ACPI_DMAR3_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_DMAR_RHSA,f)
+#define ACPI_DMAR4_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_DMAR_ANDD,f)
 #define ACPI_EINJ0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
 #define ACPI_ERST0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
 #define ACPI_FPDTH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_FPDT_HEADER,f)
 #define ACPI_FPDT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_FPDT_BOOT,f)
 #define ACPI_FPDT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_FPDT_S3PT_PTR,f)
+#define ACPI_GTDT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_GTDT_TIMER_BLOCK,f)
+#define ACPI_GTDT0a_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_GTDT_TIMER_ENTRY,f)
+#define ACPI_GTDT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_GTDT_WATCHDOG,f)
+#define ACPI_GTDTH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_GTDT_HEADER,f)
 #define ACPI_HEST0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_HEST_IA_MACHINE_CHECK,f)
 #define ACPI_HEST1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_HEST_IA_CORRECTED,f)
 #define ACPI_HEST2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_HEST_IA_NMI,f)
@@ -158,6 +163,9 @@
 #define ACPI_IVRS8A_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8A,f)
 #define ACPI_IVRS8B_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8B,f)
 #define ACPI_IVRS8C_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8C,f)
+#define ACPI_LPITH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_LPIT_HEADER,f)
+#define ACPI_LPIT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_LPIT_NATIVE,f)
+#define ACPI_LPIT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_LPIT_IO,f)
 #define ACPI_MADT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MADT_LOCAL_APIC,f)
 #define ACPI_MADT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MADT_IO_APIC,f)
 #define ACPI_MADT2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MADT_INTERRUPT_OVERRIDE,f)
@@ -171,6 +179,8 @@
 #define ACPI_MADT10_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_MADT_LOCAL_X2APIC_NMI,f)
 #define ACPI_MADT11_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_INTERRUPT,f)
 #define ACPI_MADT12_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_DISTRIBUTOR,f)
+#define ACPI_MADT13_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_MSI_FRAME,f)
+#define ACPI_MADT14_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_REDISTRIBUTOR,f)
 #define ACPI_MADTH_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
 #define ACPI_MCFG0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MCFG_ALLOCATION,f)
 #define ACPI_MPST0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MPST_POWER_NODE,f)
@@ -181,6 +191,7 @@
 #define ACPI_MSCT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MSCT_PROXIMITY,f)
 #define ACPI_MTMR0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_MTMR_ENTRY,f)
 #define ACPI_PCCT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_PCCT_SUBSPACE,f)
+#define ACPI_PCCT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_PCCT_HW_REDUCED,f)
 #define ACPI_PMTT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_PMTT_SOCKET,f)
 #define ACPI_PMTT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_PMTT_CONTROLLER,f)
 #define ACPI_PMTT1A_OFFSET(f)           (UINT16) ACPI_OFFSET (ACPI_PMTT_DOMAIN,f)
@@ -196,6 +207,7 @@
 #define ACPI_SRAT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_CPU_AFFINITY,f)
 #define ACPI_SRAT1_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_MEM_AFFINITY,f)
 #define ACPI_SRAT2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f)
+#define ACPI_SRAT3_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_SRAT_GICC_AFFINITY,f)
 #define ACPI_VRTC0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_VRTC_ENTRY,f)
 #define ACPI_WDAT0_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_WDAT_ENTRY,f)
 
@@ -212,7 +224,11 @@
 #define ACPI_SRAT0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_SRAT_CPU_AFFINITY,f,o)
 #define ACPI_SRAT1_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_SRAT_MEM_AFFINITY,f,o)
 #define ACPI_SRAT2_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f,o)
+#define ACPI_SRAT3_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_SRAT_GICC_AFFINITY,f,o)
 #define ACPI_GTDT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (ACPI_TABLE_GTDT,f,o)
+#define ACPI_GTDT0a_FLAG_OFFSET(f,o)    ACPI_FLAG_OFFSET (ACPI_GTDT_TIMER_ENTRY,f,o)
+#define ACPI_GTDT1_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_GTDT_WATCHDOG,f,o)
+#define ACPI_LPITH_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_LPIT_HEADER,f,o)
 #define ACPI_MADT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (ACPI_TABLE_MADT,f,o)
 #define ACPI_MADT0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_APIC,f,o)
 #define ACPI_MADT2_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_MADT_INTERRUPT_OVERRIDE,f,o)
@@ -223,9 +239,11 @@
 #define ACPI_MADT9_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_X2APIC,f,o)
 #define ACPI_MADT10_FLAG_OFFSET(f,o)    ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_X2APIC_NMI,f,o)
 #define ACPI_MADT11_FLAG_OFFSET(f,o)    ACPI_FLAG_OFFSET (ACPI_MADT_GENERIC_INTERRUPT,f,o)
+#define ACPI_MADT13_FLAG_OFFSET(f,o)    ACPI_FLAG_OFFSET (ACPI_MADT_GENERIC_MSI_FRAME,f,o)
 #define ACPI_MPST0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_MPST_POWER_NODE,f,o)
 #define ACPI_MPST2_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_MPST_POWER_DATA,f,o)
 #define ACPI_PCCT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (ACPI_TABLE_PCCT,f,o)
+#define ACPI_PCCT1_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_PCCT_HW_REDUCED,f,o)
 #define ACPI_PMTTH_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_PMTT_HEADER,f,o)
 #define ACPI_WDDT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (ACPI_TABLE_WDDT,f,o)
 #define ACPI_EINJ0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (ACPI_WHEA_HEADER,f,o)
@@ -436,17 +454,22 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt2[] =
 {
     {ACPI_DMT_GAS,      ACPI_FADT_OFFSET (ResetRegister),           "Reset Register", 0},
     {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (ResetValue),              "Value to cause reset", 0},
-    {ACPI_DMT_UINT24,   ACPI_FADT_OFFSET (Reserved4[0]),            "Reserved", 0},
+    {ACPI_DMT_UINT16,   ACPI_FADT_OFFSET (ArmBootFlags),            "Reserved", 0},
+    {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (MinorRevision),           "Reserved", 0},
     ACPI_DMT_TERMINATOR
 };
 
-/* ACPI 2.0+ Extensions (FADT version 3 and 4) */
+/* ACPI 2.0+ Extensions (FADT version 3, 4, and 5) */
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt3[] =
 {
     {ACPI_DMT_GAS,      ACPI_FADT_OFFSET (ResetRegister),           "Reset Register", 0},
     {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (ResetValue),              "Value to cause reset", 0},
-    {ACPI_DMT_UINT24,   ACPI_FADT_OFFSET (Reserved4[0]),            "Reserved", 0},
+    {ACPI_DMT_UINT16,   ACPI_FADT_OFFSET (ArmBootFlags),            "ARM Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_FADT_FLAG_OFFSET(ArmBootFlags,0),      "PSCI Compliant", 0},
+    {ACPI_DMT_FLAG1,    ACPI_FADT_FLAG_OFFSET(ArmBootFlags,0),      "Must use HVC for PSCI", 0},
+    ACPI_DMT_NEW_LINE,
+    {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (MinorRevision),           "FADT Minor Revision", 0},
     {ACPI_DMT_UINT64,   ACPI_FADT_OFFSET (XFacs),                   "FACS Address", 0},
     {ACPI_DMT_UINT64,   ACPI_FADT_OFFSET (XDsdt),                   "DSDT Address", 0},
     {ACPI_DMT_GAS,      ACPI_FADT_OFFSET (XPm1aEventBlock),         "PM1A Event Block", 0},
@@ -720,12 +743,12 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoDbg2[] =
 ACPI_DMTABLE_INFO           AcpiDmTableInfoDbg2Device[] =
 {
     {ACPI_DMT_UINT8,    ACPI_DBG20_OFFSET (Revision),               "Revision", 0},
-    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (Length),                 "Length", 0},
+    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (Length),                 "Length", DT_LENGTH},
     {ACPI_DMT_UINT8,    ACPI_DBG20_OFFSET (RegisterCount),          "Register Count", 0},
     {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (NamepathLength),         "Namepath Length", 0},
     {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (NamepathOffset),         "Namepath Offset", 0},
-    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (OemDataLength),          "OEM Data Length", 0},
-    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (OemDataOffset),          "OEM Data Offset", 0},
+    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (OemDataLength),          "OEM Data Length", DT_DESCRIBES_OPTIONAL},
+    {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (OemDataOffset),          "OEM Data Offset", DT_DESCRIBES_OPTIONAL},
     {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (PortType),               "Port Type", 0},
     {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (PortSubtype),            "Port Subtype", 0},
     {ACPI_DMT_UINT16,   ACPI_DBG20_OFFSET (Reserved),               "Reserved", 0},
@@ -754,6 +777,12 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoDbg2Name[] =
     ACPI_DMT_TERMINATOR
 };
 
+ACPI_DMTABLE_INFO           AcpiDmTableInfoDbg2OemData[] =
+{
+    {ACPI_DMT_BUFFER,   0,                                          "OEM Data", DT_OPTIONAL},
+    ACPI_DMT_TERMINATOR
+};
+
 
 /*******************************************************************************
  *
@@ -797,7 +826,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoDmarHdr[] =
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoDmarScope[] =
 {
-    {ACPI_DMT_UINT8,    ACPI_DMARS_OFFSET (EntryType),              "Device Scope Entry Type", 0},
+    {ACPI_DMT_DMAR_SCOPE, ACPI_DMARS_OFFSET (EntryType),            "Device Scope Type", 0},
     {ACPI_DMT_UINT8,    ACPI_DMARS_OFFSET (Length),                 "Entry Length", DT_LENGTH},
     {ACPI_DMT_UINT16,   ACPI_DMARS_OFFSET (Reserved),               "Reserved", 0},
     {ACPI_DMT_UINT8,    ACPI_DMARS_OFFSET (EnumerationId),          "Enumeration ID", 0},
@@ -849,6 +878,16 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoDmar3[] =
     ACPI_DMT_TERMINATOR
 };
 
+/* 4: ACPI Namespace Device Declaration Structure */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoDmar4[] =
+{
+    {ACPI_DMT_UINT24,   ACPI_DMAR4_OFFSET (Reserved[0]),            "Reserved", 0},
+    {ACPI_DMT_UINT8,    ACPI_DMAR4_OFFSET (DeviceNumber),           "Device Number", 0},
+    {ACPI_DMT_STRING,   ACPI_DMAR4_OFFSET (DeviceName[0]),          "Device Name", 0},
+    ACPI_DMT_TERMINATOR
+};
+
 
 /*******************************************************************************
  *
@@ -988,29 +1027,89 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoFpdt1[] =
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdt[] =
 {
-    {ACPI_DMT_UINT64,   ACPI_GTDT_OFFSET (Address),                 "Timer Address", 0},
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (Flags),                   "Flags (decoded below)", DT_FLAG},
-    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (Flags,0),            "Memory Present", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT_OFFSET (CounterBlockAddresss),    "Counter Block Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (Reserved),                "Reserved", 0},
     ACPI_DMT_NEW_LINE,
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (SecurePl1Interrupt),      "Secure PL1 Interrupt", 0},
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (SecurePl1Flags),          "SPL1 Flags (decoded below)", DT_FLAG},
-    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (SecurePl1Flags,0),   "Trigger Mode", 0},
-    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (SecurePl1Flags,0),   "Polarity", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (SecureEl1Interrupt),      "Secure EL1 Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (SecureEl1Flags),          "EL1 Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0),   "Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0),   "Polarity", 0},
+    {ACPI_DMT_FLAG2,    ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0),   "Always On", 0},
     ACPI_DMT_NEW_LINE,
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecurePl1Interrupt),   "Non-Secure PL1 Interrupt", 0},
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecurePl1Flags),       "NSPL1 Flags (decoded below)", DT_FLAG},
-    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (NonSecurePl1Flags,0),"Trigger Mode", 0},
-    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (NonSecurePl1Flags,0),"Polarity", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecureEl1Interrupt),   "Non-Secure EL1 Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecureEl1Flags),       "NEL1 Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Polarity", 0},
+    {ACPI_DMT_FLAG2,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Always On", 0},
     ACPI_DMT_NEW_LINE,
     {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (VirtualTimerInterrupt),   "Virtual Timer Interrupt", 0},
     {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (VirtualTimerFlags),       "VT Flags (decoded below)", DT_FLAG},
     {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Trigger Mode", 0},
     {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Polarity", 0},
+    {ACPI_DMT_FLAG2,    ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Always On", 0},
     ACPI_DMT_NEW_LINE,
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecurePl2Interrupt),   "Non-Secure PL2 Interrupt", 0},
-    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecurePl2Flags),       "NSPL2 Flags (decoded below)", DT_FLAG},
-    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (NonSecurePl2Flags,0),"Trigger Mode", 0},
-    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (NonSecurePl2Flags,0),"Polarity", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecureEl2Interrupt),   "Non-Secure EL2 Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (NonSecureEl2Flags),       "NEL2 Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Polarity", 0},
+    {ACPI_DMT_FLAG2,    ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Always On", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT_OFFSET (CounterReadBlockAddress), "Counter Read Block Address", 0},
+    ACPI_DMT_NEW_LINE,
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (PlatformTimerCount),      "Platform Timer Count", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_OFFSET (PlatformTimerOffset),     "Platform Timer Offset", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+/* GTDT Subtable header (one per Subtable) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdtHdr[] =
+{
+    {ACPI_DMT_GTDT,     ACPI_GTDTH_OFFSET (Type),                   "Subtable Type", 0},
+    {ACPI_DMT_UINT16,   ACPI_GTDTH_OFFSET (Length),                 "Length", DT_LENGTH},
+    ACPI_DMT_TERMINATOR
+};
+
+/* GTDT Subtables */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdt0[] =
+{
+    {ACPI_DMT_UINT8,    ACPI_GTDT0_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT0_OFFSET (BlockAddress),           "Block Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0_OFFSET (TimerCount),             "Timer Count", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0_OFFSET (TimerOffset),            "Timer Offset", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdt0a[] =
+{
+    {ACPI_DMT_UINT8 ,   ACPI_GTDT0a_OFFSET (FrameNumber),               "Frame Number", 0},
+    {ACPI_DMT_UINT24,   ACPI_GTDT0a_OFFSET (Reserved[0]),               "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT0a_OFFSET (BaseAddress),               "Base Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT0a_OFFSET (El0BaseAddress),            "EL0 Base Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0a_OFFSET (TimerInterrupt),            "Timer Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0a_OFFSET (TimerFlags),                "Timer Flags (decoded below)", 0},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT0a_FLAG_OFFSET (TimerFlags,0),         "Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT0a_FLAG_OFFSET (TimerFlags,0),         "Polarity", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0a_OFFSET (VirtualTimerInterrupt),     "Virtual Timer Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0a_OFFSET (VirtualTimerFlags),         "Virtual Timer Flags (decoded below)", 0},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT0a_FLAG_OFFSET (VirtualTimerFlags,0),  "Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT0a_FLAG_OFFSET (VirtualTimerFlags,0),  "Polarity", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT0a_OFFSET (CommonFlags),               "Common Flags (decoded below)", 0},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT0a_FLAG_OFFSET (CommonFlags,0),        "Secure", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT0a_FLAG_OFFSET (CommonFlags,0),        "Always On", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdt1[] =
+{
+    {ACPI_DMT_UINT8,    ACPI_GTDT1_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT1_OFFSET (RefreshFrameAddress),    "Refresh Frame Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_GTDT1_OFFSET (ControlFrameAddress),    "Control Frame Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT1_OFFSET (TimerInterrupt),         "Timer Interrupt", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT1_OFFSET (TimerFlags),             "Timer Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_GTDT1_FLAG_OFFSET (TimerFlags,0),      "Trigger Mode", 0},
+    {ACPI_DMT_FLAG1,    ACPI_GTDT1_FLAG_OFFSET (TimerFlags,0),      "Polarity", 0},
+    {ACPI_DMT_FLAG2,    ACPI_GTDT1_FLAG_OFFSET (TimerFlags,0),      "Security", 0},
     ACPI_DMT_TERMINATOR
 };
 
@@ -1299,6 +1398,59 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoIvrs8c[] =
 };
 
 
+/*******************************************************************************
+ *
+ * LPIT - Low Power Idle Table
+ *
+ ******************************************************************************/
+
+/* Main table consists only of the standard ACPI table header */
+
+/* Common Subtable header (one per Subtable) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoLpitHdr[] =
+{
+    {ACPI_DMT_LPIT,     ACPI_LPITH_OFFSET (Type),                   "Subtable Type", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPITH_OFFSET (Length),                 "Length", DT_LENGTH},
+    {ACPI_DMT_UINT16,   ACPI_LPITH_OFFSET (UniqueId),               "Unique ID", 0},
+    {ACPI_DMT_UINT16,   ACPI_LPITH_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPITH_OFFSET (Flags),                  "Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_LPITH_FLAG_OFFSET (Flags, 0),          "State Disabled", 0},
+    {ACPI_DMT_FLAG1,    ACPI_LPITH_FLAG_OFFSET (Flags, 0),          "No Counter", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+/* LPIT Subtables */
+
+/* 0: Native C-state */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoLpit0[] =
+{
+    {ACPI_DMT_GAS,      ACPI_LPIT0_OFFSET (EntryTrigger),           "Entry Trigger", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPIT0_OFFSET (Residency),              "Residency", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPIT0_OFFSET (Latency),                "Latency", 0},
+    {ACPI_DMT_GAS,      ACPI_LPIT0_OFFSET (ResidencyCounter),       "Residency Counter", 0},
+    {ACPI_DMT_UINT64,   ACPI_LPIT0_OFFSET (CounterFrequency),       "Counter Frequency", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+/* 1: Simple I/O */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoLpit1[] =
+{
+    {ACPI_DMT_GAS,      ACPI_LPIT1_OFFSET (EntryTrigger),           "Entry Trigger", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPIT1_OFFSET (TriggerAction),          "Trigger Action", 0},
+    {ACPI_DMT_UINT64,   ACPI_LPIT1_OFFSET (TriggerValue),           "Trigger Value", 0},
+    {ACPI_DMT_UINT64,   ACPI_LPIT1_OFFSET (TriggerMask),            "Trigger Mask", 0},
+    {ACPI_DMT_GAS,      ACPI_LPIT1_OFFSET (MinimumIdleState),       "Minimum Idle State", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPIT1_OFFSET (Residency),              "Residency", 0},
+    {ACPI_DMT_UINT32,   ACPI_LPIT1_OFFSET (Latency),                "Latency", 0},
+    {ACPI_DMT_GAS,      ACPI_LPIT1_OFFSET (ResidencyCounter),       "Residency Counter", 0},
+    {ACPI_DMT_UINT64,   ACPI_LPIT1_OFFSET (CounterFrequency),       "Counter Frequency", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+
 /*******************************************************************************
  *
  * MADT - Multiple APIC Description Table and subtables
@@ -1464,14 +1616,21 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoMadt10[] =
 ACPI_DMTABLE_INFO           AcpiDmTableInfoMadt11[] =
 {
     {ACPI_DMT_UINT16,   ACPI_MADT11_OFFSET (Reserved),              "Reserved", 0},
-    {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (GicId),                 "Local GIC Hardware ID", 0},
+    {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (CpuInterfaceNumber),    "CPU Interface Number", 0},
     {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (Uid),                   "Processor UID", 0},
     {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (Flags),                 "Flags (decoded below)", DT_FLAG},
     {ACPI_DMT_FLAG0,    ACPI_MADT11_FLAG_OFFSET (Flags,0),          "Processor Enabled", 0},
+    {ACPI_DMT_FLAG1,    ACPI_MADT11_FLAG_OFFSET (Flags,0),          "Performance Interrupt Trigger Mode", 0},
+    {ACPI_DMT_FLAG2,    ACPI_MADT11_FLAG_OFFSET (Flags,0),          "Virtual GIC Interrupt Trigger Mode", 0},
     {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (ParkingVersion),        "Parking Protocol Version", 0},
     {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (PerformanceInterrupt),  "Performance Interrupt", 0},
     {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (ParkedAddress),         "Parked Address", 0},
     {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (BaseAddress),           "Base Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (GicvBaseAddress),       "Virtual GIC Base Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (GichBaseAddress),       "Hypervisor GIC Base Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_MADT11_OFFSET (VgicInterrupt),         "Virtual GIC Interrupt", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (GicrBaseAddress),       "Redistributor Base Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT11_OFFSET (ArmMpidr),              "ARM MPIDR", 0},
     ACPI_DMT_TERMINATOR
 };
 
@@ -1487,6 +1646,30 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoMadt12[] =
    ACPI_DMT_TERMINATOR
 };
 
+/* 13: Generic MSI Frame (ACPI 5.1) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoMadt13[] =
+{
+    {ACPI_DMT_UINT16,   ACPI_MADT13_OFFSET (Reserved),              "Reserved", 0},
+    {ACPI_DMT_UINT32,   ACPI_MADT13_OFFSET (MsiFrameId),            "MSI Frame ID", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT13_OFFSET (BaseAddress),           "Base Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_MADT13_OFFSET (Flags),                 "Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_MADT13_FLAG_OFFSET (Flags,0),          "Select SPI", 0},
+    {ACPI_DMT_UINT16,   ACPI_MADT13_OFFSET (SpiCount),              "SPI Count", 0},
+    {ACPI_DMT_UINT16,   ACPI_MADT13_OFFSET (SpiBase),               "SPI Base", 0},
+   ACPI_DMT_TERMINATOR
+};
+
+/* 14: Generic Redistributor (ACPI 5.1) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoMadt14[] =
+{
+    {ACPI_DMT_UINT16,   ACPI_MADT14_OFFSET (Reserved),              "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_MADT14_OFFSET (BaseAddress),           "Base Address", 0},
+    {ACPI_DMT_UINT32,   ACPI_MADT14_OFFSET (Length),                "Length", 0},
+   ACPI_DMT_TERMINATOR
+};
+
 
 /*******************************************************************************
  *
@@ -1677,25 +1860,52 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoPcct[] =
 {
     {ACPI_DMT_UINT32,   ACPI_PCCT_OFFSET (Flags),                   "Flags (decoded below)", DT_FLAG},
     {ACPI_DMT_FLAG0,    ACPI_PCCT_FLAG_OFFSET (Flags,0),            "Doorbell", 0},
-    {ACPI_DMT_UINT32,   ACPI_PCCT_OFFSET (Latency),                 "Command Latency", 0},
-    {ACPI_DMT_UINT32,   ACPI_PCCT_OFFSET (Reserved),                "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_PCCT_OFFSET (Reserved),                "Reserved", 0},
     ACPI_DMT_TERMINATOR
 };
 
 /* PCCT subtables */
 
+ACPI_DMTABLE_INFO           AcpiDmTableInfoPcctHdr[] =
+{
+    {ACPI_DMT_PCCT,     ACPI_PCCT0_OFFSET (Header.Type),            "Subtable Type", 0},
+    {ACPI_DMT_UINT8,    ACPI_PCCT0_OFFSET (Header.Length),          "Length", DT_LENGTH},
+    ACPI_DMT_TERMINATOR
+};
+
 /* 0: Generic Communications Subspace */
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoPcct0[] =
 {
-    {ACPI_DMT_UINT8,    ACPI_PCCT0_OFFSET (Header.Type),            "Subtable Type", 0},
-    {ACPI_DMT_UINT8,    ACPI_PCCT0_OFFSET (Header.Length),          "Length", DT_LENGTH},
     {ACPI_DMT_UINT48,   ACPI_PCCT0_OFFSET (Reserved[0]),            "Reserved", 0},
     {ACPI_DMT_UINT64,   ACPI_PCCT0_OFFSET (BaseAddress),            "Base Address", 0},
     {ACPI_DMT_UINT64,   ACPI_PCCT0_OFFSET (Length),                 "Address Length", 0},
     {ACPI_DMT_GAS,      ACPI_PCCT0_OFFSET (DoorbellRegister),       "Doorbell Register", 0},
     {ACPI_DMT_UINT64,   ACPI_PCCT0_OFFSET (PreserveMask),           "Preserve Mask", 0},
     {ACPI_DMT_UINT64,   ACPI_PCCT0_OFFSET (WriteMask),              "Write Mask", 0},
+    {ACPI_DMT_UINT32,   ACPI_PCCT0_OFFSET (Latency),                "Command Latency", 0},
+    {ACPI_DMT_UINT32,   ACPI_PCCT0_OFFSET (MaxAccessRate),          "Maximum Access Rate", 0},
+    {ACPI_DMT_UINT16,   ACPI_PCCT0_OFFSET (MinTurnaroundTime),      "Minimum Turnaround Time", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+/* 1: HW-reduced Communications Subspace (ACPI 5.1) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoPcct1[] =
+{
+    {ACPI_DMT_UINT32,   ACPI_PCCT1_OFFSET (DoorbellInterrupt),      "Doorbell Interrupt", 0},
+    {ACPI_DMT_UINT8,    ACPI_PCCT1_OFFSET (Flags),                  "Flags (Decoded Below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_PCCT1_FLAG_OFFSET (Flags,0),           "Polarity", 0},
+    {ACPI_DMT_FLAG1,    ACPI_PCCT1_FLAG_OFFSET (Flags,0),           "Mode", 0},
+    {ACPI_DMT_UINT8,    ACPI_PCCT1_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT64,   ACPI_PCCT1_OFFSET (BaseAddress),            "Base Address", 0},
+    {ACPI_DMT_UINT64,   ACPI_PCCT1_OFFSET (Length),                 "Address Length", 0},
+    {ACPI_DMT_GAS,      ACPI_PCCT1_OFFSET (DoorbellRegister),       "Doorbell Register", 0},
+    {ACPI_DMT_UINT64,   ACPI_PCCT1_OFFSET (PreserveMask),           "Preserve Mask", 0},
+    {ACPI_DMT_UINT64,   ACPI_PCCT1_OFFSET (WriteMask),              "Write Mask", 0},
+    {ACPI_DMT_UINT32,   ACPI_PCCT1_OFFSET (Latency),                "Command Latency", 0},
+    {ACPI_DMT_UINT32,   ACPI_PCCT1_OFFSET (MaxAccessRate),          "Maximum Access Rate", 0},
+    {ACPI_DMT_UINT16,   ACPI_PCCT1_OFFSET (MinTurnaroundTime),      "Minimum Turnaround Time", 0},
     ACPI_DMT_TERMINATOR
 };
 
@@ -1927,7 +2137,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoSpcr[] =
 ACPI_DMTABLE_INFO           AcpiDmTableInfoSpmi[] =
 {
     {ACPI_DMT_UINT8,    ACPI_SPMI_OFFSET (InterfaceType),           "Interface Type", 0},
-    {ACPI_DMT_UINT8,    ACPI_SPMI_OFFSET (Reserved),                "Reserved", 0},
+    {ACPI_DMT_UINT8,    ACPI_SPMI_OFFSET (Reserved),                "Reserved", DT_NON_ZERO}, /* Value must be 1 */
     {ACPI_DMT_UINT16,   ACPI_SPMI_OFFSET (SpecRevision),            "IPMI Spec Version", 0},
     {ACPI_DMT_UINT8,    ACPI_SPMI_OFFSET (InterruptType),           "Interrupt Type", 0},
     {ACPI_DMT_UINT8,    ACPI_SPMI_OFFSET (GpeNumber),               "GPE Number", 0},
@@ -1978,7 +2188,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoSrat0[] =
     {ACPI_DMT_FLAG0,    ACPI_SRAT0_FLAG_OFFSET (Flags,0),           "Enabled", 0},
     {ACPI_DMT_UINT8,    ACPI_SRAT0_OFFSET (LocalSapicEid),          "Local Sapic EID", 0},
     {ACPI_DMT_UINT24,   ACPI_SRAT0_OFFSET (ProximityDomainHi[0]),   "Proximity Domain High(24)", 0},
-    {ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (ClockDomain),            "Clock Domain", 0},
     ACPI_DMT_TERMINATOR
 };
 
@@ -2013,6 +2223,18 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoSrat2[] =
     ACPI_DMT_TERMINATOR
 };
 
+/* : GICC Affinity (ACPI 5.1) */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoSrat3[] =
+{
+    {ACPI_DMT_UINT32,   ACPI_SRAT3_OFFSET (ProximityDomain),        "Proximity Domain", 0},
+    {ACPI_DMT_UINT32,   ACPI_SRAT3_OFFSET (AcpiProcessorUid),       "Acpi Processor UID", 0},
+    {ACPI_DMT_UINT32,   ACPI_SRAT3_OFFSET (Flags),                  "Flags (decoded below)", DT_FLAG},
+    {ACPI_DMT_FLAG0,    ACPI_SRAT3_FLAG_OFFSET (Flags,0),           "Enabled", 0},
+    {ACPI_DMT_UINT32,   ACPI_SRAT3_OFFSET (ClockDomain),            "Clock Domain", 0},
+    ACPI_DMT_TERMINATOR
+};
+
 
 /*******************************************************************************
  *
diff --git a/sys/contrib/dev/acpica/common/getopt.c b/sys/contrib/dev/acpica/common/getopt.c
index 69f2ed518fdc..cf3eb593c0b7 100644
--- a/sys/contrib/dev/acpica/common/getopt.c
+++ b/sys/contrib/dev/acpica/common/getopt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,14 +51,12 @@
  *    "f|"      - Option has required single-char sub-options
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acapps.h>
 
 #define ACPI_OPTION_ERROR(msg, badchar) \
-    if (AcpiGbl_Opterr) {fprintf (stderr, "%s%c\n", msg, badchar);}
+    if (AcpiGbl_Opterr) {AcpiLogError ("%s%c\n", msg, badchar);}
 
 
 int                 AcpiGbl_Opterr = 1;
@@ -123,7 +121,7 @@ AcpiGetoptArgument (
  * PARAMETERS:  argc, argv          - from main
  *              opts                - options info list
  *
- * RETURN:      Option character or EOF
+ * RETURN:      Option character or ACPI_OPT_END
  *
  * DESCRIPTION: Get the next option
  *
@@ -145,12 +143,12 @@ AcpiGetopt(
             argv[AcpiGbl_Optind][0] != '-' ||
             argv[AcpiGbl_Optind][1] == '\0')
         {
-            return (EOF);
+            return (ACPI_OPT_END);
         }
-        else if (strcmp (argv[AcpiGbl_Optind], "--") == 0)
+        else if (ACPI_STRCMP (argv[AcpiGbl_Optind], "--") == 0)
         {
             AcpiGbl_Optind++;
-            return (EOF);
+            return (ACPI_OPT_END);
         }
     }
 
@@ -161,7 +159,7 @@ AcpiGetopt(
     /* Make sure that the option is legal */
 
     if (CurrentChar == ':' ||
-       (OptsPtr = strchr (opts, CurrentChar)) == NULL)
+       (OptsPtr = ACPI_STRCHR (opts, CurrentChar)) == NULL)
     {
         ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar);
 
diff --git a/sys/contrib/dev/acpica/compiler/aslanalyze.c b/sys/contrib/dev/acpica/compiler/aslanalyze.c
index f5338bc656f9..acd41bedbc9a 100644
--- a/sys/contrib/dev/acpica/compiler/aslanalyze.c
+++ b/sys/contrib/dev/acpica/compiler/aslanalyze.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <string.h>
@@ -569,3 +568,51 @@ ApCheckRegMethod (
 
     AslError (ASL_WARNING, ASL_MSG_NO_REGION, Op, NULL);
 }
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    ApFindNameInScope
+ *
+ * PARAMETERS:  Name                - Name to search for
+ *              Op                  - Current parse op
+ *
+ * RETURN:      TRUE if name found in the same scope as Op.
+ *
+ * DESCRIPTION: Determine if a name appears in the same scope as Op, as either
+ *              a Method() or a Name().
+ *
+ ******************************************************************************/
+
+BOOLEAN
+ApFindNameInScope (
+    char                    *Name,
+    ACPI_PARSE_OBJECT       *Op)
+{
+    ACPI_PARSE_OBJECT       *Next;
+    ACPI_PARSE_OBJECT       *Parent;
+
+
+    /* Get the start of the current scope */
+
+    Parent = Op->Asl.Parent;
+    Next = Parent->Asl.Child;
+
+    /* Search entire scope for a match to the name */
+
+    while (Next)
+    {
+        if ((Next->Asl.ParseOpcode == PARSEOP_METHOD) ||
+            (Next->Asl.ParseOpcode == PARSEOP_NAME))
+        {
+            if (ACPI_COMPARE_NAME (Name, Next->Asl.NameSeg))
+            {
+                return (TRUE);
+            }
+        }
+
+        Next = Next->Asl.Next;
+    }
+
+    return (FALSE);
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslascii.c b/sys/contrib/dev/acpica/compiler/aslascii.c
new file mode 100644
index 000000000000..f8a3980a09bd
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslascii.c
@@ -0,0 +1,349 @@
+/******************************************************************************
+ *
+ * Module Name: aslascii - ASCII detection and support routines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+#include <contrib/dev/acpica/include/acapps.h>
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslascii")
+
+
+/* Local prototypes */
+
+static void
+FlConsumeAnsiComment (
+    FILE                    *Handle,
+    ASL_FILE_STATUS         *Status);
+
+static void
+FlConsumeNewComment (
+    FILE                    *Handle,
+    ASL_FILE_STATUS         *Status);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    FlCheckForAcpiTable
+ *
+ * PARAMETERS:  Handle              - Open input file
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Determine if a file seems to be a binary ACPI table, via the
+ *              following checks on what would be the table header:
+ *              0) File must be at least as long as an ACPI_TABLE_HEADER
+ *              1) The header length field must match the file size
+ *              2) Signature, OemId, OemTableId, AslCompilerId must be ASCII
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+FlCheckForAcpiTable (
+    FILE                    *Handle)
+{
+    ACPI_TABLE_HEADER       Table;
+    UINT32                  FileSize;
+    size_t                  Actual;
+    UINT32                  i;
+
+
+    /* Read a potential table header */
+
+    Actual = fread (&Table, 1, sizeof (ACPI_TABLE_HEADER), Handle);
+    fseek (Handle, 0, SEEK_SET);
+
+    if (Actual < sizeof (ACPI_TABLE_HEADER))
+    {
+        return (AE_ERROR);
+    }
+
+    /* Header length field must match the file size */
+
+    FileSize = CmGetFileSize (Handle);
+    if (Table.Length != FileSize)
+    {
+        return (AE_ERROR);
+    }
+
+    /*
+     * These fields must be ASCII:
+     * Signature, OemId, OemTableId, AslCompilerId.
+     * We allow a NULL terminator in OemId and OemTableId.
+     */
+    for (i = 0; i < ACPI_NAME_SIZE; i++)
+    {
+        if (!ACPI_IS_ASCII ((UINT8) Table.Signature[i]))
+        {
+            return (AE_ERROR);
+        }
+
+        if (!ACPI_IS_ASCII ((UINT8) Table.AslCompilerId[i]))
+        {
+            return (AE_ERROR);
+        }
+    }
+
+    for (i = 0; (i < ACPI_OEM_ID_SIZE) && (Table.OemId[i]); i++)
+    {
+        if (!ACPI_IS_ASCII ((UINT8) Table.OemId[i]))
+        {
+            return (AE_ERROR);
+        }
+    }
+
+    for (i = 0; (i < ACPI_OEM_TABLE_ID_SIZE) && (Table.OemTableId[i]); i++)
+    {
+        if (!ACPI_IS_ASCII ((UINT8) Table.OemTableId[i]))
+        {
+            return (AE_ERROR);
+        }
+    }
+
+    printf ("Binary file appears to be a valid ACPI table, disassembling\n");
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    FlCheckForAscii
+ *
+ * PARAMETERS:  Handle              - Open input file
+ *              Filename            - Input filename
+ *              DisplayErrors       - TRUE if error messages desired
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Verify that the input file is entirely ASCII. Ignores characters
+ *              within comments. Note: does not handle nested comments and does
+ *              not handle comment delimiters within string literals. However,
+ *              on the rare chance this happens and an invalid character is
+ *              missed, the parser will catch the error by failing in some
+ *              spectactular manner.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+FlCheckForAscii (
+    FILE                    *Handle,
+    char                    *Filename,
+    BOOLEAN                 DisplayErrors)
+{
+    UINT8                   Byte;
+    ACPI_SIZE               BadBytes = 0;
+    BOOLEAN                 OpeningComment = FALSE;
+    ASL_FILE_STATUS         Status;
+
+
+    Status.Line = 1;
+    Status.Offset = 0;
+
+    /* Read the entire file */
+
+    while (fread (&Byte, 1, 1, Handle) == 1)
+    {
+        /* Ignore comment fields (allow non-ascii within) */
+
+        if (OpeningComment)
+        {
+            /* Check for second comment open delimiter */
+
+            if (Byte == '*')
+            {
+                FlConsumeAnsiComment (Handle, &Status);
+            }
+
+            if (Byte == '/')
+            {
+                FlConsumeNewComment (Handle, &Status);
+            }
+
+            /* Reset */
+
+            OpeningComment = FALSE;
+        }
+        else if (Byte == '/')
+        {
+            OpeningComment = TRUE;
+        }
+
+        /* Check for an ASCII character */
+
+        if (!ACPI_IS_ASCII (Byte))
+        {
+            if ((BadBytes < 10) && (DisplayErrors))
+            {
+                AcpiOsPrintf (
+                    "Non-ASCII character [0x%2.2X] found in line %u, file offset 0x%.2X\n",
+                    Byte, Status.Line, Status.Offset);
+            }
+
+            BadBytes++;
+        }
+
+        /* Update line counter */
+
+        else if (Byte == 0x0A)
+        {
+            Status.Line++;
+        }
+
+        Status.Offset++;
+    }
+
+    /* Seek back to the beginning of the source file */
+
+    fseek (Handle, 0, SEEK_SET);
+
+    /* Were there any non-ASCII characters in the file? */
+
+    if (BadBytes)
+    {
+        if (DisplayErrors)
+        {
+            AcpiOsPrintf (
+                "%u non-ASCII characters found in input source text, could be a binary file\n",
+                BadBytes);
+            AslError (ASL_ERROR, ASL_MSG_NON_ASCII, NULL, Filename);
+        }
+
+        return (AE_BAD_CHARACTER);
+    }
+
+    /* File is OK (100% ASCII) */
+
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    FlConsumeAnsiComment
+ *
+ * PARAMETERS:  Handle              - Open input file
+ *              Status              - File current status struct
+ *
+ * RETURN:      Number of lines consumed
+ *
+ * DESCRIPTION: Step over a normal slash-star type comment
+ *
+ ******************************************************************************/
+
+static void
+FlConsumeAnsiComment (
+    FILE                    *Handle,
+    ASL_FILE_STATUS         *Status)
+{
+    UINT8                   Byte;
+    BOOLEAN                 ClosingComment = FALSE;
+
+
+    while (fread (&Byte, 1, 1, Handle) == 1)
+    {
+        /* Scan until comment close is found */
+
+        if (ClosingComment)
+        {
+            if (Byte == '/')
+            {
+                return;
+            }
+
+            if (Byte != '*')
+            {
+                /* Reset */
+
+                ClosingComment = FALSE;
+            }
+        }
+        else if (Byte == '*')
+        {
+            ClosingComment = TRUE;
+        }
+
+        /* Maintain line count */
+
+        if (Byte == 0x0A)
+        {
+            Status->Line++;
+        }
+
+        Status->Offset++;
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    FlConsumeNewComment
+ *
+ * PARAMETERS:  Handle              - Open input file
+ *              Status              - File current status struct
+ *
+ * RETURN:      Number of lines consumed
+ *
+ * DESCRIPTION: Step over a slash-slash type of comment
+ *
+ ******************************************************************************/
+
+static void
+FlConsumeNewComment (
+    FILE                    *Handle,
+    ASL_FILE_STATUS         *Status)
+{
+    UINT8                   Byte;
+
+
+    while (fread (&Byte, 1, 1, Handle) == 1)
+    {
+        Status->Offset++;
+
+        /* Comment ends at newline */
+
+        if (Byte == 0x0A)
+        {
+            Status->Line++;
+            return;
+        }
+    }
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslbtypes.c b/sys/contrib/dev/acpica/compiler/aslbtypes.c
index 16f3a0bc529a..0ff8664f6f73 100644
--- a/sys/contrib/dev/acpica/compiler/aslbtypes.c
+++ b/sys/contrib/dev/acpica/compiler/aslbtypes.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -243,7 +242,7 @@ AnMapEtypeToBtype (
 
             return (ACPI_BTYPE_INTEGER | ACPI_BTYPE_DDB_HANDLE);
 
-        case ACPI_BTYPE_DEBUG_OBJECT:
+        case ACPI_TYPE_DEBUG_OBJECT:
 
             /* Cannot be used as a source operand */
 
diff --git a/sys/contrib/dev/acpica/compiler/aslcodegen.c b/sys/contrib/dev/acpica/compiler/aslcodegen.c
index b7d510db3a5b..b462d7beb920 100644
--- a/sys/contrib/dev/acpica/compiler/aslcodegen.c
+++ b/sys/contrib/dev/acpica/compiler/aslcodegen.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
diff --git a/sys/contrib/dev/acpica/compiler/aslcompile.c b/sys/contrib/dev/acpica/compiler/aslcompile.c
index 48ccfa3eefd1..b26c9e890466 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompile.c
+++ b/sys/contrib/dev/acpica/compiler/aslcompile.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include <contrib/dev/acpica/compiler/dtcompiler.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
 
 #include <stdio.h>
 #include <time.h>
@@ -66,21 +67,263 @@ static void
 CmFlushSourceCode (
     void);
 
-static void
-FlConsumeAnsiComment (
-    FILE                    *Handle,
-    ASL_FILE_STATUS         *Status);
-
-static void
-FlConsumeNewComment (
-    FILE                    *Handle,
-    ASL_FILE_STATUS         *Status);
-
 static void
 CmDumpAllEvents (
     void);
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    CmDoCompile
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status (0 = OK)
+ *
+ * DESCRIPTION: This procedure performs the entire compile
+ *
+ ******************************************************************************/
+
+int
+CmDoCompile (
+    void)
+{
+    ACPI_STATUS             Status;
+    UINT8                   FullCompile;
+    UINT8                   Event;
+
+
+    FullCompile = UtBeginEvent ("*** Total Compile time ***");
+    Event = UtBeginEvent ("Open input and output files");
+    UtEndEvent (Event);
+
+    Event = UtBeginEvent ("Preprocess input file");
+    if (Gbl_PreprocessFlag)
+    {
+        /* Preprocessor */
+
+        PrDoPreprocess ();
+        if (Gbl_PreprocessOnly)
+        {
+            UtEndEvent (Event);
+            CmCleanupAndExit ();
+            return (0);
+        }
+    }
+    UtEndEvent (Event);
+
+    /* Build the parse tree */
+
+    Event = UtBeginEvent ("Parse source code and build parse tree");
+    AslCompilerparse();
+    UtEndEvent (Event);
+
+    /* Check for parse errors */
+
+    Status = AslCheckForErrorExit ();
+    if (ACPI_FAILURE (Status))
+    {
+        fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n");
+        LsDumpParseTree ();
+        goto ErrorExit;
+    }
+
+    /* Did the parse tree get successfully constructed? */
+
+    if (!RootNode)
+    {
+        /*
+         * If there are no errors, then we have some sort of
+         * internal problem.
+         */
+        AslError (ASL_ERROR, ASL_MSG_COMPILER_INTERNAL,
+            NULL, "- Could not resolve parse tree root node");
+
+        goto ErrorExit;
+    }
+
+    /* Flush out any remaining source after parse tree is complete */
+
+    Event = UtBeginEvent ("Flush source input");
+    CmFlushSourceCode ();
+
+    /* Optional parse tree dump, compiler debug output only */
+
+    LsDumpParseTree ();
+
+    OpcGetIntegerWidth (RootNode);
+    UtEndEvent (Event);
+
+    /* Pre-process parse tree for any operator transforms */
+
+    Event = UtBeginEvent ("Parse tree transforms");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nParse tree transforms\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+        TrAmlTransformWalk, NULL, NULL);
+    UtEndEvent (Event);
+
+    /* Generate AML opcodes corresponding to the parse tokens */
+
+    Event = UtBeginEvent ("Generate AML opcodes");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating AML opcodes\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
+        OpcAmlOpcodeWalk, NULL);
+    UtEndEvent (Event);
+
+    /*
+     * Now that the input is parsed, we can open the AML output file.
+     * Note: by default, the name of this file comes from the table descriptor
+     * within the input file.
+     */
+    Event = UtBeginEvent ("Open AML output file");
+    Status = FlOpenAmlOutputFile (Gbl_OutputFilenamePrefix);
+    UtEndEvent (Event);
+    if (ACPI_FAILURE (Status))
+    {
+        AePrintErrorLog (ASL_FILE_STDERR);
+        return (-1);
+    }
+
+    /* Interpret and generate all compile-time constants */
+
+    Event = UtBeginEvent ("Constant folding via AML interpreter");
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "\nInterpreting compile-time constant expressions\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+        OpcAmlConstantWalk, NULL, NULL);
+    UtEndEvent (Event);
+
+    /* Update AML opcodes if necessary, after constant folding */
+
+    Event = UtBeginEvent ("Updating AML opcodes after constant folding");
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "\nUpdating AML opcodes after constant folding\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
+        NULL, OpcAmlOpcodeUpdateWalk, NULL);
+    UtEndEvent (Event);
+
+    /* Calculate all AML package lengths */
+
+    Event = UtBeginEvent ("Generate AML package lengths");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating Package lengths\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
+        LnPackageLengthWalk, NULL);
+    UtEndEvent (Event);
+
+    if (Gbl_ParseOnlyFlag)
+    {
+        AePrintErrorLog (ASL_FILE_STDERR);
+        UtDisplaySummary (ASL_FILE_STDERR);
+        if (Gbl_DebugFlag)
+        {
+            /* Print error summary to the stdout also */
+
+            AePrintErrorLog (ASL_FILE_STDOUT);
+            UtDisplaySummary (ASL_FILE_STDOUT);
+        }
+        UtEndEvent (FullCompile);
+        return (0);
+    }
+
+    /*
+     * Create an internal namespace and use it as a symbol table
+     */
+
+    /* Namespace loading */
+
+    Event = UtBeginEvent ("Create ACPI Namespace");
+    Status = LdLoadNamespace (RootNode);
+    UtEndEvent (Event);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    /* Namespace cross-reference */
+
+    AslGbl_NamespaceEvent = UtBeginEvent ("Cross reference parse tree and Namespace");
+    Status = XfCrossReferenceNamespace ();
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    /* Namespace - Check for non-referenced objects */
+
+    LkFindUnreferencedObjects ();
+    UtEndEvent (AslGbl_NamespaceEvent);
+
+    /*
+     * Semantic analysis. This can happen only after the
+     * namespace has been loaded and cross-referenced.
+     *
+     * part one - check control methods
+     */
+    Event = UtBeginEvent ("Analyze control method return types");
+    AnalysisWalkInfo.MethodStack = NULL;
+
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Method analysis\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE,
+        MtMethodAnalysisWalkBegin,
+        MtMethodAnalysisWalkEnd, &AnalysisWalkInfo);
+    UtEndEvent (Event);
+
+    /* Semantic error checking part two - typing of method returns */
+
+    Event = UtBeginEvent ("Determine object types returned by methods");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Method typing\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
+        NULL, AnMethodTypingWalkEnd, NULL);
+    UtEndEvent (Event);
+
+    /* Semantic error checking part three - operand type checking */
+
+    Event = UtBeginEvent ("Analyze AML operand types");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Operand type checking\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
+        NULL, AnOperandTypecheckWalkEnd, &AnalysisWalkInfo);
+    UtEndEvent (Event);
+
+    /* Semantic error checking part four - other miscellaneous checks */
+
+    Event = UtBeginEvent ("Miscellaneous analysis");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - miscellaneous\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+        AnOtherSemanticAnalysisWalkBegin,
+        NULL, &AnalysisWalkInfo);
+    UtEndEvent (Event);
+
+    /* Calculate all AML package lengths */
+
+    Event = UtBeginEvent ("Finish AML package length generation");
+    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating Package lengths\n\n");
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
+        LnInitLengthsWalk, NULL);
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
+        LnPackageLengthWalk, NULL);
+    UtEndEvent (Event);
+
+    /* Code generation - emit the AML */
+
+    Event = UtBeginEvent ("Generate AML code and write output files");
+    CgGenerateAmlOutput ();
+    UtEndEvent (Event);
+
+    Event = UtBeginEvent ("Write optional output files");
+    CmDoOutputFiles ();
+    UtEndEvent (Event);
+
+    UtEndEvent (FullCompile);
+    CmCleanupAndExit ();
+    return (0);
+
+ErrorExit:
+    UtEndEvent (FullCompile);
+    CmCleanupAndExit ();
+    return (-1);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AslCompilerSignon
@@ -272,534 +515,6 @@ CmFlushSourceCode (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    FlConsume*
- *
- * PARAMETERS:  Handle              - Open input file
- *              Status              - File current status struct
- *
- * RETURN:      Number of lines consumed
- *
- * DESCRIPTION: Step over both types of comment during check for ascii chars
- *
- ******************************************************************************/
-
-static void
-FlConsumeAnsiComment (
-    FILE                    *Handle,
-    ASL_FILE_STATUS         *Status)
-{
-    UINT8                   Byte;
-    BOOLEAN                 ClosingComment = FALSE;
-
-
-    while (fread (&Byte, 1, 1, Handle) == 1)
-    {
-        /* Scan until comment close is found */
-
-        if (ClosingComment)
-        {
-            if (Byte == '/')
-            {
-                return;
-            }
-
-            if (Byte != '*')
-            {
-                /* Reset */
-
-                ClosingComment = FALSE;
-            }
-        }
-        else if (Byte == '*')
-        {
-            ClosingComment = TRUE;
-        }
-
-        /* Maintain line count */
-
-        if (Byte == 0x0A)
-        {
-            Status->Line++;
-        }
-
-        Status->Offset++;
-    }
-}
-
-
-static void
-FlConsumeNewComment (
-    FILE                    *Handle,
-    ASL_FILE_STATUS         *Status)
-{
-    UINT8                   Byte;
-
-
-    while (fread (&Byte, 1, 1, Handle) == 1)
-    {
-        Status->Offset++;
-
-        /* Comment ends at newline */
-
-        if (Byte == 0x0A)
-        {
-            Status->Line++;
-            return;
-        }
-    }
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    FlCheckForAcpiTable
- *
- * PARAMETERS:  Handle              - Open input file
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Determine if a file seems to be a binary ACPI table, via the
- *              following checks on what would be the table header:
- *              0) File must be at least as long as an ACPI_TABLE_HEADER
- *              1) The header length field must match the file size
- *              2) Signature, OemId, OemTableId, AslCompilerId must be ASCII
- *
- ******************************************************************************/
-
-ACPI_STATUS
-FlCheckForAcpiTable (
-    FILE                    *Handle)
-{
-    ACPI_TABLE_HEADER       Table;
-    UINT32                  FileSize;
-    size_t                  Actual;
-    UINT32                  i;
-
-
-    /* Read a potential table header */
-
-    Actual = fread (&Table, 1, sizeof (ACPI_TABLE_HEADER), Handle);
-    fseek (Handle, 0, SEEK_SET);
-
-    if (Actual < sizeof (ACPI_TABLE_HEADER))
-    {
-        return (AE_ERROR);
-    }
-
-    /* Header length field must match the file size */
-
-    FileSize = DtGetFileSize (Handle);
-    if (Table.Length != FileSize)
-    {
-        return (AE_ERROR);
-    }
-
-    /*
-     * These fields must be ASCII:
-     * Signature, OemId, OemTableId, AslCompilerId.
-     * We allow a NULL terminator in OemId and OemTableId.
-     */
-    for (i = 0; i < ACPI_NAME_SIZE; i++)
-    {
-        if (!ACPI_IS_ASCII ((UINT8) Table.Signature[i]))
-        {
-            return (AE_ERROR);
-        }
-
-        if (!ACPI_IS_ASCII ((UINT8) Table.AslCompilerId[i]))
-        {
-            return (AE_ERROR);
-        }
-    }
-
-    for (i = 0; (i < ACPI_OEM_ID_SIZE) && (Table.OemId[i]); i++)
-    {
-        if (!ACPI_IS_ASCII ((UINT8) Table.OemId[i]))
-        {
-            return (AE_ERROR);
-        }
-    }
-
-    for (i = 0; (i < ACPI_OEM_TABLE_ID_SIZE) && (Table.OemTableId[i]); i++)
-    {
-        if (!ACPI_IS_ASCII ((UINT8) Table.OemTableId[i]))
-        {
-            return (AE_ERROR);
-        }
-    }
-
-    printf ("Binary file appears to be a valid ACPI table, disassembling\n");
-    return (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    FlCheckForAscii
- *
- * PARAMETERS:  Handle              - Open input file
- *              Filename            - Input filename
- *              DisplayErrors       - TRUE if error messages desired
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Verify that the input file is entirely ASCII. Ignores characters
- *              within comments. Note: does not handle nested comments and does
- *              not handle comment delimiters within string literals. However,
- *              on the rare chance this happens and an invalid character is
- *              missed, the parser will catch the error by failing in some
- *              spectactular manner.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-FlCheckForAscii (
-    FILE                    *Handle,
-    char                    *Filename,
-    BOOLEAN                 DisplayErrors)
-{
-    UINT8                   Byte;
-    ACPI_SIZE               BadBytes = 0;
-    BOOLEAN                 OpeningComment = FALSE;
-    ASL_FILE_STATUS         Status;
-
-
-    Status.Line = 1;
-    Status.Offset = 0;
-
-    /* Read the entire file */
-
-    while (fread (&Byte, 1, 1, Handle) == 1)
-    {
-        /* Ignore comment fields (allow non-ascii within) */
-
-        if (OpeningComment)
-        {
-            /* Check for second comment open delimiter */
-
-            if (Byte == '*')
-            {
-                FlConsumeAnsiComment (Handle, &Status);
-            }
-
-            if (Byte == '/')
-            {
-                FlConsumeNewComment (Handle, &Status);
-            }
-
-            /* Reset */
-
-            OpeningComment = FALSE;
-        }
-        else if (Byte == '/')
-        {
-            OpeningComment = TRUE;
-        }
-
-        /* Check for an ASCII character */
-
-        if (!ACPI_IS_ASCII (Byte))
-        {
-            if ((BadBytes < 10) && (DisplayErrors))
-            {
-                AcpiOsPrintf (
-                    "Non-ASCII character [0x%2.2X] found in line %u, file offset 0x%.2X\n",
-                    Byte, Status.Line, Status.Offset);
-            }
-
-            BadBytes++;
-        }
-
-        /* Update line counter */
-
-        else if (Byte == 0x0A)
-        {
-            Status.Line++;
-        }
-
-        Status.Offset++;
-    }
-
-    /* Seek back to the beginning of the source file */
-
-    fseek (Handle, 0, SEEK_SET);
-
-    /* Were there any non-ASCII characters in the file? */
-
-    if (BadBytes)
-    {
-        if (DisplayErrors)
-        {
-            AcpiOsPrintf (
-                "%u non-ASCII characters found in input source text, could be a binary file\n",
-                BadBytes);
-            AslError (ASL_ERROR, ASL_MSG_NON_ASCII, NULL, Filename);
-        }
-
-        return (AE_BAD_CHARACTER);
-    }
-
-    /* File is OK (100% ASCII) */
-
-    return (AE_OK);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    CmDoCompile
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status (0 = OK)
- *
- * DESCRIPTION: This procedure performs the entire compile
- *
- ******************************************************************************/
-
-int
-CmDoCompile (
-    void)
-{
-    ACPI_STATUS             Status;
-    UINT8                   FullCompile;
-    UINT8                   Event;
-
-
-    FullCompile = UtBeginEvent ("*** Total Compile time ***");
-    Event = UtBeginEvent ("Open input and output files");
-    UtEndEvent (Event);
-
-    Event = UtBeginEvent ("Preprocess input file");
-    if (Gbl_PreprocessFlag)
-    {
-        /* Preprocessor */
-
-        PrDoPreprocess ();
-        if (Gbl_PreprocessOnly)
-        {
-            UtEndEvent (Event);
-            CmCleanupAndExit ();
-            return (0);
-        }
-    }
-    UtEndEvent (Event);
-
-    /* Build the parse tree */
-
-    Event = UtBeginEvent ("Parse source code and build parse tree");
-    AslCompilerparse();
-    UtEndEvent (Event);
-
-    /* Check for parse errors */
-
-    Status = AslCheckForErrorExit ();
-    if (ACPI_FAILURE (Status))
-    {
-        fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n");
-        LsDumpParseTree ();
-        goto ErrorExit;
-    }
-
-    /* Did the parse tree get successfully constructed? */
-
-    if (!RootNode)
-    {
-        /*
-         * If there are no errors, then we have some sort of
-         * internal problem.
-         */
-        AslError (ASL_ERROR, ASL_MSG_COMPILER_INTERNAL,
-            NULL, "- Could not resolve parse tree root node");
-
-        goto ErrorExit;
-    }
-
-
-    /* Flush out any remaining source after parse tree is complete */
-
-    Event = UtBeginEvent ("Flush source input");
-    CmFlushSourceCode ();
-
-    /* Optional parse tree dump, compiler debug output only */
-
-    LsDumpParseTree ();
-
-    OpcGetIntegerWidth (RootNode);
-    UtEndEvent (Event);
-
-    /* Pre-process parse tree for any operator transforms */
-
-    Event = UtBeginEvent ("Parse tree transforms");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nParse tree transforms\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
-        TrAmlTransformWalk, NULL, NULL);
-    UtEndEvent (Event);
-
-    /* Generate AML opcodes corresponding to the parse tokens */
-
-    Event = UtBeginEvent ("Generate AML opcodes");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating AML opcodes\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
-        OpcAmlOpcodeWalk, NULL);
-    UtEndEvent (Event);
-
-    /*
-     * Now that the input is parsed, we can open the AML output file.
-     * Note: by default, the name of this file comes from the table descriptor
-     * within the input file.
-     */
-    Event = UtBeginEvent ("Open AML output file");
-    Status = FlOpenAmlOutputFile (Gbl_OutputFilenamePrefix);
-    UtEndEvent (Event);
-    if (ACPI_FAILURE (Status))
-    {
-        AePrintErrorLog (ASL_FILE_STDERR);
-        return (-1);
-    }
-
-    /* Interpret and generate all compile-time constants */
-
-    Event = UtBeginEvent ("Constant folding via AML interpreter");
-    DbgPrint (ASL_DEBUG_OUTPUT,
-        "\nInterpreting compile-time constant expressions\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
-        OpcAmlConstantWalk, NULL, NULL);
-    UtEndEvent (Event);
-
-    /* Update AML opcodes if necessary, after constant folding */
-
-    Event = UtBeginEvent ("Updating AML opcodes after constant folding");
-    DbgPrint (ASL_DEBUG_OUTPUT,
-        "\nUpdating AML opcodes after constant folding\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
-        NULL, OpcAmlOpcodeUpdateWalk, NULL);
-    UtEndEvent (Event);
-
-    /* Calculate all AML package lengths */
-
-    Event = UtBeginEvent ("Generate AML package lengths");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating Package lengths\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
-        LnPackageLengthWalk, NULL);
-    UtEndEvent (Event);
-
-    if (Gbl_ParseOnlyFlag)
-    {
-        AePrintErrorLog (ASL_FILE_STDERR);
-        UtDisplaySummary (ASL_FILE_STDERR);
-        if (Gbl_DebugFlag)
-        {
-            /* Print error summary to the stdout also */
-
-            AePrintErrorLog (ASL_FILE_STDOUT);
-            UtDisplaySummary (ASL_FILE_STDOUT);
-        }
-        UtEndEvent (FullCompile);
-        return (0);
-    }
-
-    /*
-     * Create an internal namespace and use it as a symbol table
-     */
-
-    /* Namespace loading */
-
-    Event = UtBeginEvent ("Create ACPI Namespace");
-    Status = LdLoadNamespace (RootNode);
-    UtEndEvent (Event);
-    if (ACPI_FAILURE (Status))
-    {
-        goto ErrorExit;
-    }
-
-    /* Namespace cross-reference */
-
-    AslGbl_NamespaceEvent = UtBeginEvent ("Cross reference parse tree and Namespace");
-    Status = XfCrossReferenceNamespace ();
-    if (ACPI_FAILURE (Status))
-    {
-        goto ErrorExit;
-    }
-
-    /* Namespace - Check for non-referenced objects */
-
-    LkFindUnreferencedObjects ();
-    UtEndEvent (AslGbl_NamespaceEvent);
-
-    /*
-     * Semantic analysis. This can happen only after the
-     * namespace has been loaded and cross-referenced.
-     *
-     * part one - check control methods
-     */
-    Event = UtBeginEvent ("Analyze control method return types");
-    AnalysisWalkInfo.MethodStack = NULL;
-
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Method analysis\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE,
-        MtMethodAnalysisWalkBegin,
-        MtMethodAnalysisWalkEnd, &AnalysisWalkInfo);
-    UtEndEvent (Event);
-
-    /* Semantic error checking part two - typing of method returns */
-
-    Event = UtBeginEvent ("Determine object types returned by methods");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Method typing\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
-        NULL, AnMethodTypingWalkEnd, NULL);
-    UtEndEvent (Event);
-
-    /* Semantic error checking part three - operand type checking */
-
-    Event = UtBeginEvent ("Analyze AML operand types");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - Operand type checking\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD,
-        NULL, AnOperandTypecheckWalkEnd, &AnalysisWalkInfo);
-    UtEndEvent (Event);
-
-    /* Semantic error checking part four - other miscellaneous checks */
-
-    Event = UtBeginEvent ("Miscellaneous analysis");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nSemantic analysis - miscellaneous\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
-        AnOtherSemanticAnalysisWalkBegin,
-        NULL, &AnalysisWalkInfo);
-    UtEndEvent (Event);
-
-    /* Calculate all AML package lengths */
-
-    Event = UtBeginEvent ("Finish AML package length generation");
-    DbgPrint (ASL_DEBUG_OUTPUT, "\nGenerating Package lengths\n\n");
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
-        LnInitLengthsWalk, NULL);
-    TrWalkParseTree (RootNode, ASL_WALK_VISIT_UPWARD, NULL,
-        LnPackageLengthWalk, NULL);
-    UtEndEvent (Event);
-
-    /* Code generation - emit the AML */
-
-    Event = UtBeginEvent ("Generate AML code and write output files");
-    CgGenerateAmlOutput ();
-    UtEndEvent (Event);
-
-    Event = UtBeginEvent ("Write optional output files");
-    CmDoOutputFiles ();
-    UtEndEvent (Event);
-
-    UtEndEvent (FullCompile);
-    CmCleanupAndExit ();
-    return (0);
-
-ErrorExit:
-    UtEndEvent (FullCompile);
-    CmCleanupAndExit ();
-    return (-1);
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    CmDoOutputFiles
@@ -825,6 +540,10 @@ CmDoOutputFiles (
     /* Dump the namespace to the .nsp file if requested */
 
     (void) NsDisplayNamespace ();
+
+    /* Dump the device mapping file */
+
+    MpEmitMappingInfo ();
 }
 
 
@@ -965,7 +684,8 @@ CmCleanupAndExit (
      * We will delete the AML file if there are errors and the
      * force AML output option has not been used.
      */
-    if ((Gbl_ExceptionCount[ASL_ERROR] > 0) && (!Gbl_IgnoreErrors) &&
+    if ((Gbl_ExceptionCount[ASL_ERROR] > 0) &&
+        (!Gbl_IgnoreErrors) &&
         Gbl_Files[ASL_FILE_AML_OUTPUT].Handle)
     {
         DeleteAmlFile = TRUE;
@@ -1025,4 +745,71 @@ CmCleanupAndExit (
     {
         FlDeleteFile (ASL_FILE_SOURCE_OUTPUT);
     }
+
+    /* Final cleanup after compiling one file */
+
+    CmDeleteCaches ();
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    CmDeleteCaches
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Delete all local cache buffer blocks
+ *
+ ******************************************************************************/
+
+void
+CmDeleteCaches (
+    void)
+{
+    UINT32                  BufferCount;
+    ASL_CACHE_INFO          *Next;
+
+
+    /* Parse Op cache */
+
+    BufferCount = 0;
+    while (Gbl_ParseOpCacheList)
+    {
+        Next = Gbl_ParseOpCacheList->Next;
+        ACPI_FREE (Gbl_ParseOpCacheList);
+        Gbl_ParseOpCacheList = Next;
+        BufferCount++;
+    }
+
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "%u ParseOps, Buffer size: %u ops (%u bytes), %u Buffers\n",
+        Gbl_ParseOpCount, ASL_PARSEOP_CACHE_SIZE,
+        (sizeof (ACPI_PARSE_OBJECT) * ASL_PARSEOP_CACHE_SIZE), BufferCount);
+
+    Gbl_ParseOpCount = 0;
+    Gbl_ParseOpCacheNext = NULL;
+    Gbl_ParseOpCacheLast = NULL;
+    RootNode = NULL;
+
+    /* Generic string cache */
+
+    BufferCount = 0;
+    while (Gbl_StringCacheList)
+    {
+        Next = Gbl_StringCacheList->Next;
+        ACPI_FREE (Gbl_StringCacheList);
+        Gbl_StringCacheList = Next;
+        BufferCount++;
+    }
+
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "%u Strings (%u bytes), Buffer size: %u bytes, %u Buffers\n",
+        Gbl_StringCount, Gbl_StringSize, ASL_STRING_CACHE_SIZE, BufferCount);
+
+    Gbl_StringSize = 0;
+    Gbl_StringCount = 0;
+    Gbl_StringCacheNext = NULL;
+    Gbl_StringCacheLast = NULL;
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.h b/sys/contrib/dev/acpica/compiler/aslcompiler.h
index 132ae7d5039b..1667d8fedf7c 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompiler.h
+++ b/sys/contrib/dev/acpica/compiler/aslcompiler.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ASLCOMPILER_H
 #define __ASLCOMPILER_H
 
@@ -111,6 +110,11 @@ AslPushInputFileStack (
     FILE                    *InputFile,
     char                    *Filename);
 
+void
+AslParserCleanup (
+    void);
+
+
 /*
  * aslstartup - entered from main()
  */
@@ -122,11 +126,6 @@ typedef
 ACPI_STATUS (*ASL_PATHNAME_CALLBACK) (
     char *);
 
-ACPI_STATUS
-AslDoOnePathname (
-    char                    *Pathname,
-    ASL_PATHNAME_CALLBACK   Callback);
-
 ACPI_STATUS
 AslDoOneFile (
     char                    *Filename);
@@ -159,6 +158,14 @@ void
 CmCleanupAndExit (
     void);
 
+void
+CmDeleteCaches (
+    void);
+
+
+/*
+ * aslascii - ascii support
+ */
 ACPI_STATUS
 FlCheckForAcpiTable (
     FILE                    *Handle);
@@ -280,14 +287,23 @@ void
 ApCheckRegMethod (
     ACPI_PARSE_OBJECT       *Op);
 
+BOOLEAN
+ApFindNameInScope (
+    char                    *Name,
+    ACPI_PARSE_OBJECT       *Op);
+
 
 /*
  * aslerror - error handling/reporting
  */
 void
+AslAbort (
+    void);
+
+void
 AslError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     ACPI_PARSE_OBJECT       *Op,
     char                    *ExtraMessage);
 
@@ -298,7 +314,7 @@ AslDisableException (
 BOOLEAN
 AslIsExceptionDisabled (
     UINT8                   Level,
-    UINT8                   MessageId);
+    UINT16                  MessageId);
 
 void
 AslCoreSubsystemError (
@@ -314,7 +330,7 @@ AslCompilererror(
 void
 AslCommonError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  CurrentLineNumber,
     UINT32                  LogicalLineNumber,
     UINT32                  LogicalByteOffset,
@@ -325,7 +341,7 @@ AslCommonError (
 void
 AslCommonError2 (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  LineNumber,
     UINT32                  Column,
     char                    *SourceLine,
@@ -346,10 +362,6 @@ void
 AeClearErrorLog (
     void);
 
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
-    void);
-
 
 /*
  * asllisting - generate all "listing" type files
@@ -439,6 +451,22 @@ OpcAmlConstantWalk (
     void                    *Context);
 
 
+/*
+ * aslmessages - exception strings
+ */
+const char *
+AeDecodeMessageId (
+    UINT16                  MessageId);
+
+const char *
+AeDecodeExceptionLevel (
+    UINT8                   Level);
+
+UINT16
+AeBuildFullExceptionCode (
+    UINT8                   Level,
+    UINT16                  MessageId);
+
 /*
  * asloffset - generate C offset file for BIOS support
  */
@@ -708,10 +736,6 @@ TrLinkPeerNodes (
  * aslfiles - File I/O support
  */
 void
-AslAbort (
-    void);
-
-void
 FlAddIncludeDirectory (
     char                    *Dir);
 
@@ -784,6 +808,13 @@ ACPI_STATUS
 FlOpenMiscOutputFiles (
     char                    *InputFilename);
 
+/*
+ * aslhwmap - hardware map summary
+ */
+void
+MpEmitMappingInfo (
+    void);
+
 
 /*
  * asload - load namespace in prep for cross reference
@@ -883,10 +914,6 @@ void
 UtDisplaySummary (
     UINT32                  FileId);
 
-UINT8
-UtHexCharToValue (
-    int                     HexChar);
-
 void
 UtConvertByteToHex (
     UINT8                   RawByte,
@@ -906,13 +933,17 @@ UtSetParseOpName (
     ACPI_PARSE_OBJECT       *Op);
 
 char *
-UtGetStringBuffer (
+UtStringCacheCalloc (
     UINT32                  Length);
 
 void
 UtExpandLineBuffers (
     void);
 
+void
+UtFreeLineBuffers (
+    void);
+
 ACPI_STATUS
 UtInternalizeName (
     char                    *ExternalName,
@@ -947,11 +978,6 @@ ACPI_STATUS
 AuValidateUuid (
     char                    *InString);
 
-ACPI_STATUS
-AuConvertStringToUuid (
-    char                    *InString,
-    char                    *UuIdBuffer);
-
 ACPI_STATUS
 AuConvertUuidToString (
     char                    *UuIdBuffer,
@@ -1026,8 +1052,7 @@ RsCheckListForDuplicates (
 
 ASL_RESOURCE_NODE *
 RsDoOneResourceDescriptor (
-    ACPI_PARSE_OBJECT       *DescriptorTypeOp,
-    UINT32                  CurrentByteOffset,
+    ASL_RESOURCE_INFO       *Info,
     UINT8                   *State);
 
 /* Values for State above */
@@ -1051,43 +1076,35 @@ RsDoResourceTemplate (
  */
 ASL_RESOURCE_NODE *
 RsDoEndTagDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoEndDependentDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoMemory24Descriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoMemory32Descriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoMemory32FixedDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoStartDependentDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoStartDependentNoPriDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoVendorSmallDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 
 /*
@@ -1095,33 +1112,27 @@ RsDoVendorSmallDescriptor (
  */
 ASL_RESOURCE_NODE *
 RsDoDmaDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoFixedDmaDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoFixedIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoIrqDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoIrqNoFlagsDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 
 /*
@@ -1129,61 +1140,50 @@ RsDoIrqNoFlagsDescriptor (
  */
 ASL_RESOURCE_NODE *
 RsDoInterruptDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoVendorLargeDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoGeneralRegisterDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoGpioIntDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoGpioIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoI2cSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoSpiSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoUartSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 /*
  * aslrestype2d - DWord address descriptors
  */
 ASL_RESOURCE_NODE *
 RsDoDwordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoDwordMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoDwordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 
 /*
@@ -1191,18 +1191,15 @@ RsDoDwordSpaceDescriptor (
  */
 ASL_RESOURCE_NODE *
 RsDoExtendedIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoExtendedMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoExtendedSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 
 /*
@@ -1210,18 +1207,15 @@ RsDoExtendedSpaceDescriptor (
  */
 ASL_RESOURCE_NODE *
 RsDoQwordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoQwordMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoQwordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 
 /*
@@ -1229,18 +1223,16 @@ RsDoQwordSpaceDescriptor (
  */
 ASL_RESOURCE_NODE *
 RsDoWordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoWordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
 
 ASL_RESOURCE_NODE *
 RsDoWordBusNumberDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset);
+    ASL_RESOURCE_INFO       *Info);
+
 
 /*
  * Entry to data table compiler subsystem
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.l b/sys/contrib/dev/acpica/compiler/aslcompiler.l
index 5b2d9ce3e7f6..bbf41cd693ae 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompiler.l
+++ b/sys/contrib/dev/acpica/compiler/aslcompiler.l
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,10 +110,11 @@ NamePathTail                [.]{NameSeg}
 [ \t]                       { count (0); }
 
 
-"/*"                        { if (!AslDoComment ()) yyterminate (); }
-"//"                        { if (!AslDoCommentType2 ()) yyterminate (); }
+"/*"                        { if (!AslDoComment ()) {yyterminate ();} }
+"//"                        { if (!AslDoCommentType2 ()) {yyterminate ();} }
 
-"\""                        { if (AslDoStringLiteral ()) return (PARSEOP_STRING_LITERAL); else yyterminate (); }
+"\""                        { if (AslDoStringLiteral ()) {return (PARSEOP_STRING_LITERAL);}
+                              else {yyterminate ();} }
 ";"                         { count (0); return(';'); }
 
 
@@ -607,7 +608,7 @@ NamePathTail                [.]{NameSeg}
 
 {NameSeg}                   { char *s;
                                 count (0);
-                                s=malloc (ACPI_NAME_SIZE + 1);
+                                s=UtStringCacheCalloc (ACPI_NAME_SIZE + 1);
                                 if (strcmp (AslCompilertext, "\\"))
                                 {
                                     strcpy (s, "____");
@@ -620,10 +621,9 @@ NamePathTail                [.]{NameSeg}
 
 {NameString}                { char *s;
                                 count (0);
-                                s=malloc (strlen (AslCompilertext)+1);
+                                s=UtStringCacheCalloc (strlen (AslCompilertext)+1);
                                 AcpiUtStrupr (AslCompilertext);
                                 strcpy (s, AslCompilertext);
-                                s[strlen (AslCompilertext)] = 0;
                                 AslCompilerlval.s = s;
                                 DbgPrint (ASL_PARSE_OUTPUT, "NameString: %s\n", s);
                                 return (PARSEOP_NAMESTRING); }
@@ -639,9 +639,9 @@ NamePathTail                [.]{NameSeg}
                                 AslCompilererror (MsgBuffer);}
 
 <<EOF>>                     { if (AslPopInputFileStack ())
-                                yyterminate();
+                                {yyterminate();}
                               else
-                                return (PARSEOP_INCLUDE_END);};
+                                {return (PARSEOP_INCLUDE_END);} };
 
 %%
 
diff --git a/sys/contrib/dev/acpica/compiler/asldefine.h b/sys/contrib/dev/acpica/compiler/asldefine.h
index 76e2e12e7cd7..94002816ebcc 100644
--- a/sys/contrib/dev/acpica/compiler/asldefine.h
+++ b/sys/contrib/dev/acpica/compiler/asldefine.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ASLDEFINE_H
 #define __ASLDEFINE_H
 
@@ -55,14 +54,14 @@
 #define ASL_INVOCATION_NAME         "iasl"
 #define ASL_CREATOR_ID              "INTL"
 
-#define ASL_COMPLIANCE              "Supports ACPI Specification Revision 5.0"
+#define ASL_COMPLIANCE              "Supports ACPI Specification Revision 5.1"
 
 
 /* Configuration constants */
 
 #define ASL_MAX_ERROR_COUNT         200
-#define ASL_NODE_CACHE_SIZE         1024
-#define ASL_STRING_CACHE_SIZE       32768
+#define ASL_PARSEOP_CACHE_SIZE      (1024 * 16)
+#define ASL_STRING_CACHE_SIZE       (1024 * 64)
 
 #define ASL_FIRST_PARSE_OPCODE      PARSEOP_ACCESSAS
 #define ASL_PARSE_OPCODE_BASE       PARSEOP_ACCESSAS        /* First Lex type */
@@ -109,6 +108,7 @@
 
 #define FILE_SUFFIX_PREPROCESSOR    "i"
 #define FILE_SUFFIX_AML_CODE        "aml"
+#define FILE_SUFFIX_MAP             "map"
 #define FILE_SUFFIX_LISTING         "lst"
 #define FILE_SUFFIX_HEX_DUMP        "hex"
 #define FILE_SUFFIX_DEBUG           "txt"
diff --git a/sys/contrib/dev/acpica/compiler/aslerror.c b/sys/contrib/dev/acpica/compiler/aslerror.c
index ff6ec3687139..7f25f9724942 100644
--- a/sys/contrib/dev/acpica/compiler/aslerror.c
+++ b/sys/contrib/dev/acpica/compiler/aslerror.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#define ASL_EXCEPTIONS
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 
 #define _COMPONENT          ACPI_COMPILER
@@ -54,6 +53,36 @@ AeAddToErrorLog (
     ASL_ERROR_MSG           *Enode);
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AslAbort
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Dump the error log and abort the compiler. Used for serious
+ *              I/O errors.
+ *
+ ******************************************************************************/
+
+void
+AslAbort (
+    void)
+{
+
+    AePrintErrorLog (ASL_FILE_STDERR);
+    if (Gbl_DebugFlag)
+    {
+        /* Print error summary to stdout also */
+
+        AePrintErrorLog (ASL_FILE_STDOUT);
+    }
+
+    exit (1);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AeClearErrorLog
@@ -174,7 +203,7 @@ AePrintException (
     int                     Actual;
     size_t                  RActual;
     UINT32                  MsgLength;
-    char                    *MainMessage;
+    const char              *MainMessage;
     char                    *ExtraMessage;
     UINT32                  SourceColumn;
     UINT32                  ErrorColumn;
@@ -200,6 +229,16 @@ AePrintException (
 
         switch (Enode->Level)
         {
+        case ASL_WARNING:
+        case ASL_WARNING2:
+        case ASL_WARNING3:
+
+            if (!Gbl_DisplayWarnings)
+            {
+                return;
+            }
+            break;
+
         case ASL_REMARK:
 
             if (!Gbl_DisplayRemarks)
@@ -222,11 +261,10 @@ AePrintException (
         }
     }
 
-    /* Get the file handles */
+    /* Get the various required file handles */
 
     OutputFile = Gbl_Files[FileId].Handle;
 
-
     if (!Enode->SourceLine)
     {
         /* Use the merged header/source file if present, otherwise use input file */
@@ -360,110 +398,94 @@ AePrintException (
         }
     }
 
-    /* NULL message ID, just print the raw message */
+    /* If a NULL message ID, just print the raw message */
 
     if (Enode->MessageId == 0)
     {
         fprintf (OutputFile, "%s\n", Enode->Message);
+        return;
     }
-    else
+
+    /* Decode the message ID */
+
+    fprintf (OutputFile, "%s %4.4d -",
+        AeDecodeExceptionLevel (Enode->Level),
+        AeBuildFullExceptionCode (Enode->Level, Enode->MessageId));
+
+    MainMessage = AeDecodeMessageId (Enode->MessageId);
+    ExtraMessage = Enode->Message;
+
+    /* If a NULL line number, just print the decoded message */
+
+    if (!Enode->LineNumber)
     {
-        /* Decode the message ID */
+        fprintf (OutputFile, " %s %s\n\n", MainMessage, ExtraMessage);
+        return;
+    }
 
-        if (Gbl_VerboseErrors)
+    MsgLength = strlen (MainMessage);
+    if (MsgLength == 0)
+    {
+        /* Use the secondary/extra message as main message */
+
+        MainMessage = Enode->Message;
+        if (!MainMessage)
         {
-            fprintf (OutputFile, "%s %4.4d -",
-                        AslErrorLevel[Enode->Level],
-                        Enode->MessageId + ((Enode->Level+1) * 1000));
-        }
-        else /* IDE case */
-        {
-            fprintf (OutputFile, "%s %4.4d:",
-                        AslErrorLevelIde[Enode->Level],
-                        Enode->MessageId + ((Enode->Level+1) * 1000));
+            MainMessage = "";
         }
 
-        MainMessage = AslMessages[Enode->MessageId];
-        ExtraMessage = Enode->Message;
+        MsgLength = strlen (MainMessage);
+        ExtraMessage = NULL;
+    }
 
-        if (Enode->LineNumber)
+    if (Gbl_VerboseErrors && !PrematureEOF)
+    {
+        if (Total >= 256)
         {
-            /* Main message: try to use string from AslMessages first */
-
-            if (!MainMessage)
-            {
-                MainMessage = "";
-            }
-
-            MsgLength = strlen (MainMessage);
-            if (MsgLength == 0)
-            {
-                /* Use the secondary/extra message as main message */
-
-                MainMessage = Enode->Message;
-                if (!MainMessage)
-                {
-                    MainMessage = "";
-                }
-
-                MsgLength = strlen (MainMessage);
-                ExtraMessage = NULL;
-            }
-
-            if (Gbl_VerboseErrors && !PrematureEOF)
-            {
-                if (Total >= 256)
-                {
-                    fprintf (OutputFile, "    %s",
-                        MainMessage);
-                }
-                else
-                {
-                    SourceColumn = Enode->Column + Enode->FilenameLength + 6 + 2;
-                    ErrorColumn = ASL_ERROR_LEVEL_LENGTH + 5 + 2 + 1;
-
-                    if ((MsgLength + ErrorColumn) < (SourceColumn - 1))
-                    {
-                        fprintf (OutputFile, "%*s%s",
-                            (int) ((SourceColumn - 1) - ErrorColumn),
-                            MainMessage, " ^ ");
-                    }
-                    else
-                    {
-                        fprintf (OutputFile, "%*s %s",
-                            (int) ((SourceColumn - ErrorColumn) + 1), "^",
-                            MainMessage);
-                    }
-                }
-            }
-            else
-            {
-                fprintf (OutputFile, " %s", MainMessage);
-            }
-
-            /* Print the extra info message if present */
-
-            if (ExtraMessage)
-            {
-                fprintf (OutputFile, " (%s)", ExtraMessage);
-            }
-
-            if (PrematureEOF)
-            {
-                fprintf (OutputFile, " and premature End-Of-File");
-            }
-
-            fprintf (OutputFile, "\n");
-            if (Gbl_VerboseErrors)
-            {
-                fprintf (OutputFile, "\n");
-            }
+            fprintf (OutputFile, "    %s",
+                MainMessage);
         }
         else
         {
-            fprintf (OutputFile, " %s %s\n\n", MainMessage, ExtraMessage);
+            SourceColumn = Enode->Column + Enode->FilenameLength + 6 + 2;
+            ErrorColumn = ASL_ERROR_LEVEL_LENGTH + 5 + 2 + 1;
+
+            if ((MsgLength + ErrorColumn) < (SourceColumn - 1))
+            {
+                fprintf (OutputFile, "%*s%s",
+                    (int) ((SourceColumn - 1) - ErrorColumn),
+                    MainMessage, " ^ ");
+            }
+            else
+            {
+                fprintf (OutputFile, "%*s %s",
+                    (int) ((SourceColumn - ErrorColumn) + 1), "^",
+                    MainMessage);
+            }
         }
     }
+    else
+    {
+        fprintf (OutputFile, " %s", MainMessage);
+    }
+
+    /* Print the extra info message if present */
+
+    if (ExtraMessage)
+    {
+        fprintf (OutputFile, " (%s)", ExtraMessage);
+    }
+
+    if (PrematureEOF)
+    {
+        fprintf (OutputFile, " and premature End-Of-File");
+    }
+
+    fprintf (OutputFile, "\n");
+    if (Gbl_VerboseErrors)
+    {
+        fprintf (OutputFile, "\n");
+    }
 }
 
 
@@ -517,7 +539,7 @@ AePrintErrorLog (
 void
 AslCommonError2 (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  LineNumber,
     UINT32                  Column,
     char                    *SourceLine,
@@ -535,7 +557,7 @@ AslCommonError2 (
     {
         /* Allocate a buffer for the message and a new error node */
 
-        MessageBuffer = UtLocalCalloc (strlen (ExtraMessage) + 1);
+        MessageBuffer = UtStringCacheCalloc (strlen (ExtraMessage) + 1);
 
         /* Keep a copy of the extra message */
 
@@ -549,7 +571,7 @@ AslCommonError2 (
 
     if (Filename)
     {
-        Enode->Filename       = Filename;
+        Enode->Filename = Filename;
         Enode->FilenameLength = strlen (Filename);
         if (Enode->FilenameLength < 6)
         {
@@ -603,7 +625,7 @@ AslCommonError2 (
 void
 AslCommonError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  CurrentLineNumber,
     UINT32                  LogicalLineNumber,
     UINT32                  LogicalByteOffset,
@@ -611,7 +633,6 @@ AslCommonError (
     char                    *Filename,
     char                    *ExtraMessage)
 {
-    UINT32                  MessageSize;
     char                    *MessageBuffer = NULL;
     ASL_ERROR_MSG           *Enode;
 
@@ -622,8 +643,7 @@ AslCommonError (
     {
         /* Allocate a buffer for the message and a new error node */
 
-        MessageSize   = strlen (ExtraMessage) + 1;
-        MessageBuffer = UtLocalCalloc (MessageSize);
+        MessageBuffer = UtStringCacheCalloc (strlen (ExtraMessage) + 1);
 
         /* Keep a copy of the extra message */
 
@@ -634,7 +654,7 @@ AslCommonError (
 
     if (Filename)
     {
-        Enode->Filename       = Filename;
+        Enode->Filename = Filename;
         Enode->FilenameLength = strlen (Filename);
         if (Enode->FilenameLength < 6)
         {
@@ -739,7 +759,7 @@ AslDisableException (
 BOOLEAN
 AslIsExceptionDisabled (
     UINT8                   Level,
-    UINT8                   MessageId)
+    UINT16                  MessageId)
 {
     UINT32                  EncodedMessageId;
     UINT32                  i;
@@ -764,7 +784,7 @@ AslIsExceptionDisabled (
          * Ignore this warning/remark if it has been disabled by
          * the user (-vw option)
          */
-        EncodedMessageId = MessageId + ((Level + 1) * 1000);
+        EncodedMessageId = AeBuildFullExceptionCode (Level, MessageId);
         for (i = 0; i < Gbl_DisabledMessagesIndex; i++)
         {
             /* Simple implementation via fixed array */
@@ -803,14 +823,15 @@ AslIsExceptionDisabled (
 void
 AslError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     ACPI_PARSE_OBJECT       *Op,
     char                    *ExtraMessage)
 {
 
     /* Check if user wants to ignore this exception */
 
-    if (AslIsExceptionDisabled (Level, MessageId))
+    if (Gbl_AllExceptionsDisabled ||
+        AslIsExceptionDisabled (Level, MessageId))
     {
         return;
     }
@@ -836,14 +857,14 @@ AslError (
  * FUNCTION:    AslCoreSubsystemError
  *
  * PARAMETERS:  Op                  - Parse node where error happened
- *              Status              - The ACPI CA Exception
+ *              Status              - The ACPICA Exception
  *              ExtraMessage        - additional error message
  *              Abort               - TRUE -> Abort compilation
  *
  * RETURN:      None
  *
- * DESCRIPTION: Error reporting routine for exceptions returned by the ACPI
- *              CA core subsystem.
+ * DESCRIPTION: Error reporting routine for exceptions returned by the ACPICA
+ *              core subsystem.
  *
  ******************************************************************************/
 
diff --git a/sys/contrib/dev/acpica/compiler/aslfileio.c b/sys/contrib/dev/acpica/compiler/aslfileio.c
index 660b82f6d30b..a4085757f181 100644
--- a/sys/contrib/dev/acpica/compiler/aslfileio.c
+++ b/sys/contrib/dev/acpica/compiler/aslfileio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,41 +42,12 @@
  */
 
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
+#include <contrib/dev/acpica/include/acapps.h>
 
 #define _COMPONENT          ACPI_COMPILER
         ACPI_MODULE_NAME    ("aslfileio")
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AslAbort
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Dump the error log and abort the compiler. Used for serious
- *              I/O errors.
- *
- ******************************************************************************/
-
-void
-AslAbort (
-    void)
-{
-
-    AePrintErrorLog (ASL_FILE_STDERR);
-    if (Gbl_DebugFlag)
-    {
-        /* Print error summary to stdout also */
-
-        AePrintErrorLog (ASL_FILE_STDOUT);
-    }
-
-    exit (1);
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    FlFileError
@@ -147,7 +118,8 @@ FlOpenFile (
  *
  * RETURN:      File Size
  *
- * DESCRIPTION: Get current file size. Uses seek-to-EOF. File must be open.
+ * DESCRIPTION: Get current file size. Uses common seek-to-EOF function.
+ *              File must be open. Aborts compiler on error.
  *
  ******************************************************************************/
 
@@ -155,20 +127,15 @@ UINT32
 FlGetFileSize (
     UINT32                  FileId)
 {
-    FILE                    *fp;
     UINT32                  FileSize;
-    long                    Offset;
 
 
-    fp = Gbl_Files[FileId].Handle;
-    Offset = ftell (fp);
+    FileSize = CmGetFileSize (Gbl_Files[FileId].Handle);
+    if (FileSize == ACPI_UINT32_MAX)
+    {
+        AslAbort();
+    }
 
-    fseek (fp, 0, SEEK_END);
-    FileSize = (UINT32) ftell (fp);
-
-    /* Restore file pointer */
-
-    fseek (fp, Offset, SEEK_SET);
     return (FileSize);
 }
 
@@ -352,6 +319,8 @@ FlCloseFile (
         AslAbort ();
     }
 
+    /* Do not clear/free the filename string */
+
     Gbl_Files[FileId].Handle = NULL;
     return;
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslfiles.c b/sys/contrib/dev/acpica/compiler/aslfiles.c
index 2ed94131fcda..2c84c9e99d9d 100644
--- a/sys/contrib/dev/acpica/compiler/aslfiles.c
+++ b/sys/contrib/dev/acpica/compiler/aslfiles.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,6 +107,8 @@ FlSetFilename (
     DbgPrint (ASL_PARSE_OUTPUT, "\n#line: New filename %s (old %s)\n",
          Filename, Gbl_Files[ASL_FILE_INPUT].Filename);
 
+    /* No need to free any existing filename */
+
     Gbl_Files[ASL_FILE_INPUT].Filename = Filename;
 }
 
@@ -216,14 +218,14 @@ FlMergePathnames (
         (*FilePathname == '/') ||
          (FilePathname[1] == ':'))
     {
-        Pathname = ACPI_ALLOCATE (strlen (FilePathname) + 1);
+        Pathname = UtStringCacheCalloc (strlen (FilePathname) + 1);
         strcpy (Pathname, FilePathname);
         goto ConvertBackslashes;
     }
 
     /* Need a local copy of the prefix directory path */
 
-    CommonPath = ACPI_ALLOCATE (strlen (PrefixDir) + 1);
+    CommonPath = UtStringCacheCalloc (strlen (PrefixDir) + 1);
     strcpy (CommonPath, PrefixDir);
 
     /*
@@ -259,14 +261,13 @@ FlMergePathnames (
     /* Build the final merged pathname */
 
 ConcatenatePaths:
-    Pathname = ACPI_ALLOCATE_ZEROED (strlen (CommonPath) + strlen (FilePathname) + 2);
+    Pathname = UtStringCacheCalloc (strlen (CommonPath) + strlen (FilePathname) + 2);
     if (LastElement && *CommonPath)
     {
         strcpy (Pathname, CommonPath);
         strcat (Pathname, "/");
     }
     strcat (Pathname, FilePathname);
-    ACPI_FREE (CommonPath);
 
     /* Convert all backslashes to normal slashes */
 
@@ -824,6 +825,7 @@ FlParseInputPathname (
         *(Substring+1) = 0;
     }
 
+    UtConvertBackslashes (Gbl_OutputFilenamePrefix);
     return (AE_OK);
 }
 #endif
diff --git a/sys/contrib/dev/acpica/compiler/aslfold.c b/sys/contrib/dev/acpica/compiler/aslfold.c
index 00595af2dce1..88042337cf5e 100644
--- a/sys/contrib/dev/acpica/compiler/aslfold.c
+++ b/sys/contrib/dev/acpica/compiler/aslfold.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
diff --git a/sys/contrib/dev/acpica/compiler/aslglobal.h b/sys/contrib/dev/acpica/compiler/aslglobal.h
index 3f2c401bd8e8..8106824fd8ef 100644
--- a/sys/contrib/dev/acpica/compiler/aslglobal.h
+++ b/sys/contrib/dev/acpica/compiler/aslglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ASLGLOBAL_H
 #define __ASLGLOBAL_H
 
@@ -63,11 +62,6 @@
 
 #ifdef _DECLARE_GLOBALS
 UINT32                              Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS] = {0,0,0,0,0,0};
-char                                AslHexLookup[] =
-{
-    '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
-};
-
 
 /* Table below must match ASL_FILE_TYPES in asltypes.h */
 
@@ -87,12 +81,12 @@ ASL_FILE_INFO                       Gbl_Files [ASL_NUM_FILES] =
     {NULL, NULL, "C Source:     ", "C Code Output"},
     {NULL, NULL, "ASM Include:  ", "Assembly Header Output"},
     {NULL, NULL, "C Include:    ", "C Header Output"},
-    {NULL, NULL, "Offset Table: ", "C Offset Table Output"}
+    {NULL, NULL, "Offset Table: ", "C Offset Table Output"},
+    {NULL, NULL, "Device Map:   ", "Device Map Output"}
 };
 
 #else
 extern UINT32                       Gbl_ExceptionCount[ASL_NUM_REPORT_LEVELS];
-extern char                         AslHexLookup[];
 extern ASL_FILE_INFO                Gbl_Files [ASL_NUM_FILES];
 #endif
 
@@ -102,12 +96,20 @@ extern ASL_FILE_INFO                Gbl_Files [ASL_NUM_FILES];
  */
 extern int                          yydebug;
 extern FILE                         *AslCompilerin;
-extern int                          AslCompilerdebug;
 extern int                          DtParserdebug;
 extern int                          PrParserdebug;
 extern const ASL_MAPPING_ENTRY      AslKeywordMapping[];
 extern char                         *AslCompilertext;
 
+/*
+ * Older versions of Bison won't emit this external in the generated header.
+ * Newer versions do emit the external, so we don't need to do it.
+ */
+#ifndef ASLCOMPILER_ASLCOMPILERPARSE_H
+extern int                  AslCompilerdebug;
+#endif
+
+
 #define ASL_DEFAULT_LINE_BUFFER_SIZE    (1024 * 32) /* 32K */
 #define ASL_MSG_BUFFER_SIZE             4096
 #define ASL_MAX_DISABLED_MESSAGES       32
@@ -140,6 +142,7 @@ ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_PreprocessFlag, TRUE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisassembleAll, FALSE);
 
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_UseDefaultAmlFilename, TRUE);
+ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_MapfileFlag, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_NsOutputFlag, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_PreprocessorOutputFlag, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DebugFlag, FALSE);
@@ -159,16 +162,17 @@ ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_NoErrors, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_WarningsAsErrors, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_NoResourceChecking, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisasmFlag, FALSE);
-ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_GetAllTables, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_IntegerOptimizationFlag, TRUE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_ReferenceOptimizationFlag, TRUE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisplayRemarks, TRUE);
+ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisplayWarnings, TRUE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisplayOptimizations, FALSE);
 ASL_EXTERN UINT8                    ASL_INIT_GLOBAL (Gbl_WarningLevel, ASL_WARNING);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_UseOriginalCompilerId, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_VerboseTemplates, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DoTemplates, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_CompileGeneric, FALSE);
+ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_AllExceptionsDisabled, FALSE);
 
 
 #define HEX_OUTPUT_NONE             0
@@ -206,6 +210,25 @@ ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (TotalAllocated, 0);
 ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (TotalFolds, 0);
 
 
+/* Local caches */
+
+ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_ParseOpCount, 0);
+ASL_EXTERN ASL_CACHE_INFO           ASL_INIT_GLOBAL (*Gbl_ParseOpCacheList, NULL);
+ASL_EXTERN ACPI_PARSE_OBJECT        ASL_INIT_GLOBAL (*Gbl_ParseOpCacheNext, NULL);
+ASL_EXTERN ACPI_PARSE_OBJECT        ASL_INIT_GLOBAL (*Gbl_ParseOpCacheLast, NULL);
+
+ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_StringCount, 0);
+ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_StringSize, 0);
+ASL_EXTERN ASL_CACHE_INFO           ASL_INIT_GLOBAL (*Gbl_StringCacheList, NULL);
+ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_StringCacheNext, NULL);
+ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_StringCacheLast, NULL);
+
+/* Map file */
+
+ASL_EXTERN ACPI_GPIO_INFO           ASL_INIT_GLOBAL (*Gbl_GpioList, NULL);
+ASL_EXTERN ACPI_SERIAL_INFO         ASL_INIT_GLOBAL (*Gbl_SerialList, NULL);
+
+
 /* Misc */
 
 ASL_EXTERN UINT8                    ASL_INIT_GLOBAL (Gbl_RevisionOverride, 0);
@@ -214,10 +237,6 @@ ASL_EXTERN ACPI_PARSE_OBJECT        ASL_INIT_GLOBAL (*RootNode, NULL);
 ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_TableLength, 0);
 ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_SourceLine, 0);
 ASL_EXTERN ASL_LISTING_NODE         ASL_INIT_GLOBAL (*Gbl_ListingNode, NULL);
-ASL_EXTERN ACPI_PARSE_OBJECT        ASL_INIT_GLOBAL (*Gbl_NodeCacheNext, NULL);
-ASL_EXTERN ACPI_PARSE_OBJECT        ASL_INIT_GLOBAL (*Gbl_NodeCacheLast, NULL);
-ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_StringCacheNext, NULL);
-ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_StringCacheLast, NULL);
 ASL_EXTERN ACPI_PARSE_OBJECT        *Gbl_FirstLevelInsertionNode;
 ASL_EXTERN UINT8                    ASL_INIT_GLOBAL (Gbl_FileType, 0);
 ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_Signature, NULL);
@@ -232,7 +251,6 @@ ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_NumNamespaceObjects, 0)
 ASL_EXTERN UINT32                   ASL_INIT_GLOBAL (Gbl_ReservedMethods, 0);
 ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_TableSignature, "NO_SIG");
 ASL_EXTERN char                     ASL_INIT_GLOBAL (*Gbl_TableId, "NO_ID");
-ASL_EXTERN FILE                     *AcpiGbl_DebugFile; /* Placeholder for oswinxf only */
 
 
 /* Static structures */
diff --git a/sys/contrib/dev/acpica/compiler/aslhex.c b/sys/contrib/dev/acpica/compiler/aslhex.c
index 8d69b92726cc..7eb678a9a2de 100644
--- a/sys/contrib/dev/acpica/compiler/aslhex.c
+++ b/sys/contrib/dev/acpica/compiler/aslhex.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 
 #define _COMPONENT          ACPI_COMPILER
diff --git a/sys/contrib/dev/acpica/compiler/asllength.c b/sys/contrib/dev/acpica/compiler/asllength.c
index 53e860cd126a..5b3f8a29c41a 100644
--- a/sys/contrib/dev/acpica/compiler/asllength.c
+++ b/sys/contrib/dev/acpica/compiler/asllength.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
diff --git a/sys/contrib/dev/acpica/compiler/asllisting.c b/sys/contrib/dev/acpica/compiler/asllisting.c
index 2b02541a5655..865d646dda05 100644
--- a/sys/contrib/dev/acpica/compiler/asllisting.c
+++ b/sys/contrib/dev/acpica/compiler/asllisting.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/asllistsup.c b/sys/contrib/dev/acpica/compiler/asllistsup.c
index 795672e180d5..7d121a375da0 100644
--- a/sys/contrib/dev/acpica/compiler/asllistsup.c
+++ b/sys/contrib/dev/acpica/compiler/asllistsup.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/aslload.c b/sys/contrib/dev/acpica/compiler/aslload.c
index bc4d59336a3a..9d5117aa90b3 100644
--- a/sys/contrib/dev/acpica/compiler/aslload.c
+++ b/sys/contrib/dev/acpica/compiler/aslload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -129,6 +129,7 @@ LdLoadNamespace (
     /* Dump the namespace if debug is enabled */
 
     AcpiNsDumpTables (ACPI_NS_ALL, ACPI_UINT32_MAX);
+    ACPI_FREE (WalkState);
     return (AE_OK);
 }
 
@@ -359,7 +360,6 @@ LdNamespace1Begin (
     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op %p [%s]\n",
         Op, Op->Asl.ParseOpName));
 
-
     /*
      * We are only interested in opcodes that have an associated name
      * (or multiple names)
@@ -373,6 +373,34 @@ LdNamespace1Begin (
         Status = LdLoadFieldElements (Op, WalkState);
         return (Status);
 
+    case AML_INT_CONNECTION_OP:
+
+
+        if (Op->Asl.Child->Asl.AmlOpcode != AML_INT_NAMEPATH_OP)
+        {
+            break;
+        }
+        Arg = Op->Asl.Child;
+
+        Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Asl.ExternalName,
+            ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
+            WalkState, &Node);
+        if (ACPI_FAILURE (Status))
+        {
+            break;
+        }
+
+        if (Node->Type == ACPI_TYPE_BUFFER)
+        {
+            Arg->Asl.Node = Node;
+
+            Arg = Node->Op->Asl.Child;  /* Get namepath */
+            Arg = Arg->Asl.Next;        /* Get actual buffer */
+            Arg = Arg->Asl.Child;       /* Buffer length */
+            Arg = Arg->Asl.Next;        /* RAW_DATA buffer */
+        }
+        break;
+
     default:
 
         /* All other opcodes go below */
@@ -466,7 +494,6 @@ LdNamespace1Begin (
         ObjectType = AslMapNamedOpcodeToDataType (Op->Asl.AmlOpcode);
         break;
 
-
     case PARSEOP_SCOPE:
         /*
          * The name referenced by Scope(Name) must already exist at this point.
diff --git a/sys/contrib/dev/acpica/compiler/asllookup.c b/sys/contrib/dev/acpica/compiler/asllookup.c
index 66c09508c85d..6f3f0c275304 100644
--- a/sys/contrib/dev/acpica/compiler/asllookup.c
+++ b/sys/contrib/dev/acpica/compiler/asllookup.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acparser.h>
@@ -105,7 +104,9 @@ LkFindUnreferencedObjects (
  * DESCRIPTION: Check for an unreferenced namespace object and emit a warning.
  *              We have to be careful, because some types and names are
  *              typically or always unreferenced, we don't want to issue
- *              excessive warnings.
+ *              excessive warnings. Note: Names that are declared within a
+ *              control method are temporary, so we always issue a remark
+ *              if they are not referenced.
  *
  ******************************************************************************/
 
@@ -117,6 +118,7 @@ LkIsObjectUsed (
     void                    **ReturnValue)
 {
     ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
+    ACPI_NAMESPACE_NODE     *Next;
 
 
     /* Referenced flag is set during the namespace xref */
@@ -126,23 +128,19 @@ LkIsObjectUsed (
         return (AE_OK);
     }
 
-    /*
-     * Ignore names that start with an underscore,
-     * these are the reserved ACPI names and are typically not referenced,
-     * they are called by the host OS.
-     */
-    if (Node->Name.Ascii[0] == '_')
+    if (!Node->Op)
     {
         return (AE_OK);
     }
 
-    /* There are some types that are typically not referenced, ignore them */
+    /* These types are typically never directly referenced, ignore them */
 
     switch (Node->Type)
     {
     case ACPI_TYPE_DEVICE:
     case ACPI_TYPE_PROCESSOR:
     case ACPI_TYPE_POWER:
+    case ACPI_TYPE_THERMAL:
     case ACPI_TYPE_LOCAL_RESOURCE:
 
         return (AE_OK);
@@ -152,12 +150,47 @@ LkIsObjectUsed (
         break;
     }
 
-    /* All others are valid unreferenced namespace objects */
+    /* Determine if the name is within a control method */
 
-    if (Node->Op)
+    Next = Node->Parent;
+    while (Next)
     {
-        AslError (ASL_WARNING2, ASL_MSG_NOT_REFERENCED, LkGetNameOp (Node->Op), NULL);
+        if (Next->Type == ACPI_TYPE_METHOD)
+        {
+            /*
+             * Name is within a method, therefore it is temporary.
+             * Issue a remark even if it is a reserved name (starts
+             * with an underscore).
+             */
+            sprintf (MsgBuffer, "Name is within method [%4.4s]",
+                Next->Name.Ascii);
+            AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
+                LkGetNameOp (Node->Op), MsgBuffer);
+            return (AE_OK);
+        }
+
+        Next = Next->Parent;
     }
+
+    /* The name is not within a control method */
+
+    /*
+     * Ignore names that start with an underscore. These are the reserved
+     * ACPI names and are typically not referenced since they are meant
+     * to be called by the host OS.
+     */
+    if (Node->Name.Ascii[0] == '_')
+    {
+        return (AE_OK);
+    }
+
+    /*
+     * What remains is an unresolved user name that is not within a method.
+     * However, the object could be referenced via another table, so issue
+     * the warning at level 2.
+     */
+    AslError (ASL_WARNING2, ASL_MSG_NOT_REFERENCED,
+        LkGetNameOp (Node->Op), NULL);
     return (AE_OK);
 }
 
diff --git a/sys/contrib/dev/acpica/compiler/aslmain.c b/sys/contrib/dev/acpica/compiler/aslmain.c
index 67e561acf0aa..8c3d2d296e2d 100644
--- a/sys/contrib/dev/acpica/compiler/aslmain.c
+++ b/sys/contrib/dev/acpica/compiler/aslmain.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,17 @@
 #define _COMPONENT          ACPI_COMPILER
         ACPI_MODULE_NAME    ("aslmain")
 
+/*
+ * Main routine for the iASL compiler.
+ *
+ * Portability note: The compiler depends upon the host for command-line
+ * wildcard support - it is not implemented locally. For example:
+ *
+ * Linux/Unix systems: Shell expands wildcards automatically.
+ *
+ * Windows: The setargv.obj module must be linked in to automatically
+ * expand wildcards.
+ */
 
 /* Local prototypes */
 
@@ -62,6 +73,36 @@ static void
 AslInitialize (
     void);
 
+UINT8
+AcpiIsBigEndianMachine (
+    void);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiIsBigEndianMachine
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      TRUE if machine is big endian
+ *              FALSE if machine is little endian
+ *
+ * DESCRIPTION: Detect whether machine is little endian or big endian.
+ *
+ ******************************************************************************/
+
+UINT8
+AcpiIsBigEndianMachine (
+    void)
+{
+    union {
+        UINT32              Integer;
+        UINT8               Bytes[4];
+    } Overlay = {0xFF000000};
+
+    return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
+}
+
 
 /*******************************************************************************
  *
@@ -83,11 +124,21 @@ Usage (
     printf ("%s\n\n", ASL_COMPLIANCE);
     ACPI_USAGE_HEADER ("iasl [Options] [Files]");
 
-    printf ("\nGlobal:\n");
+    printf ("\nGeneral:\n");
     ACPI_OPTION ("-@ <file>",       "Specify command file");
     ACPI_OPTION ("-I <dir>",        "Specify additional include directory");
     ACPI_OPTION ("-T <sig>|ALL|*",  "Create table template file for ACPI <Sig>");
+    ACPI_OPTION ("-p <prefix>",     "Specify path/filename prefix for all output files");
     ACPI_OPTION ("-v",              "Display compiler version");
+    ACPI_OPTION ("-vo",             "Enable optimization comments");
+    ACPI_OPTION ("-vs",             "Disable signon");
+
+    printf ("\nHelp:\n");
+    ACPI_OPTION ("-h",              "This message");
+    ACPI_OPTION ("-hc",             "Display operators allowed in constant expressions");
+    ACPI_OPTION ("-hf",             "Display help for output filename generation");
+    ACPI_OPTION ("-hr",             "Display ACPI reserved method names");
+    ACPI_OPTION ("-ht",             "Display currently supported ACPI table names");
 
     printf ("\nPreprocessor:\n");
     ACPI_OPTION ("-D <symbol>",     "Define symbol for preprocessor use");
@@ -95,13 +146,11 @@ Usage (
     ACPI_OPTION ("-P",              "Preprocess only and create preprocessor output file (*.i)");
     ACPI_OPTION ("-Pn",             "Disable preprocessor");
 
-    printf ("\nGeneral Processing:\n");
-    ACPI_OPTION ("-p <prefix>",     "Specify path/filename prefix for all output files");
-    ACPI_OPTION ("-va",             "Disable all errors and warnings (summary only)");
+    printf ("\nErrors, Warnings, and Remarks:\n");
+    ACPI_OPTION ("-va",             "Disable all errors/warnings/remarks");
+    ACPI_OPTION ("-ve",             "Report only errors (ignore warnings and remarks)");
     ACPI_OPTION ("-vi",             "Less verbose errors and warnings for use with IDEs");
-    ACPI_OPTION ("-vo",             "Enable optimization comments");
     ACPI_OPTION ("-vr",             "Disable remarks");
-    ACPI_OPTION ("-vs",             "Disable signon");
     ACPI_OPTION ("-vw <messageid>", "Disable specific warning or remark");
     ACPI_OPTION ("-w1 -w2 -w3",     "Set warning reporting level");
     ACPI_OPTION ("-we",             "Report warnings as errors");
@@ -123,6 +172,7 @@ Usage (
 
     printf ("\nOptional Listing Files:\n");
     ACPI_OPTION ("-l",              "Create mixed listing file (ASL source and AML) (*.lst)");
+    ACPI_OPTION ("-lm",             "Create hardware summary map file (*.map)");
     ACPI_OPTION ("-ln",             "Create namespace file (*.nsp)");
     ACPI_OPTION ("-ls",             "Create combined source file (expanded includes) (*.src)");
 
@@ -131,25 +181,17 @@ Usage (
     ACPI_OPTION ("-vt",             "Create verbose template files (full disassembly)");
 
     printf ("\nAML Disassembler:\n");
-    ACPI_OPTION ("-d  <f1,f2>",     "Disassemble or decode binary ACPI tables to file (*.dsl)");
+    ACPI_OPTION ("-d  <f1 f2 ...>", "Disassemble or decode binary ACPI tables to file (*.dsl)");
     ACPI_OPTION ("",                "  (Optional, file type is automatically detected)");
-    ACPI_OPTION ("-da <f1,f2>",     "Disassemble multiple tables from single namespace");
+    ACPI_OPTION ("-da <f1 f2 ...>", "Disassemble multiple tables from single namespace");
     ACPI_OPTION ("-db",             "Do not translate Buffers to Resource Templates");
-    ACPI_OPTION ("-dc <f1,f2>",     "Disassemble AML and immediately compile it");
+    ACPI_OPTION ("-dc <f1 f2 ...>", "Disassemble AML and immediately compile it");
     ACPI_OPTION ("",                "  (Obtain DSDT from current system if no input file)");
-    ACPI_OPTION ("-e  <f1,f2>",     "Include ACPI table(s) for external symbol resolution");
+    ACPI_OPTION ("-e  <f1 f2 ...>", "Include ACPI table(s) for external symbol resolution");
     ACPI_OPTION ("-fe <file>",      "Specify external symbol declaration file");
-    ACPI_OPTION ("-g",              "Get ACPI tables and write to files (*.dat)");
     ACPI_OPTION ("-in",             "Ignore NoOp opcodes");
     ACPI_OPTION ("-vt",             "Dump binary table data in hex format within output file");
 
-    printf ("\nHelp:\n");
-    ACPI_OPTION ("-h",              "This message");
-    ACPI_OPTION ("-hc",             "Display operators allowed in constant expressions");
-    ACPI_OPTION ("-hf",             "Display help for output filename generation");
-    ACPI_OPTION ("-hr",             "Display ACPI reserved method names");
-    ACPI_OPTION ("-ht",             "Display currently supported ACPI table names");
-
     printf ("\nDebug Options:\n");
     ACPI_OPTION ("-bf -bt",         "Create debug file (full or parse tree only) (*.txt)");
     ACPI_OPTION ("-f",              "Ignore errors, force creation of AML output file(s)");
@@ -286,8 +328,22 @@ main (
     ACPI_STATUS             Status;
     int                     Index1;
     int                     Index2;
+    int                     ReturnStatus = 0;
 
 
+    /*
+     * Big-endian machines are not currently supported. ACPI tables must
+     * be little-endian, and support for big-endian machines needs to
+     * be implemented.
+     */
+    if (AcpiIsBigEndianMachine ())
+    {
+        fprintf (stderr,
+            "iASL is not currently supported on big-endian machines.\n");
+        return (-1);
+    }
+
+    AcpiOsInitialize ();
     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
 
     /* Initialize preprocessor and compiler before command line processing */
@@ -307,21 +363,11 @@ main (
 
     /* Perform global actions first/only */
 
-    if (Gbl_GetAllTables)
-    {
-        Status = AslDoOneFile (NULL);
-        if (ACPI_FAILURE (Status))
-        {
-            return (-1);
-        }
-        return (0);
-    }
-
     if (Gbl_DisassembleAll)
     {
         while (argv[Index1])
         {
-            Status = AslDoOnePathname (argv[Index1], AcpiDmAddToExternalFileList);
+            Status = AcpiDmAddToExternalFileList (argv[Index1]);
             if (ACPI_FAILURE (Status))
             {
                 return (-1);
@@ -335,19 +381,36 @@ main (
 
     while (argv[Index2])
     {
-        Status = AslDoOnePathname (argv[Index2], AslDoOneFile);
+        /*
+         * If -p not specified, we will use the input filename as the
+         * output filename prefix
+         */
+        if (Gbl_UseDefaultAmlFilename)
+        {
+            Gbl_OutputFilenamePrefix = argv[Index2];
+            UtConvertBackslashes (Gbl_OutputFilenamePrefix);
+        }
+
+        Status = AslDoOneFile (argv[Index2]);
         if (ACPI_FAILURE (Status))
         {
-            return (-1);
+            ReturnStatus = -1;
+            goto CleanupAndExit;
         }
 
         Index2++;
     }
 
+
+CleanupAndExit:
+
+    UtFreeLineBuffers ();
+    AslParserCleanup ();
+
     if (AcpiGbl_ExternalFileList)
     {
         AcpiDmClearExternalFileList();
     }
 
-    return (0);
+    return (ReturnStatus);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslmap.c b/sys/contrib/dev/acpica/compiler/aslmap.c
index 0d2e636cd186..a4b4e670d2df 100644
--- a/sys/contrib/dev/acpica/compiler/aslmap.c
+++ b/sys/contrib/dev/acpica/compiler/aslmap.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/aslmapenter.c b/sys/contrib/dev/acpica/compiler/aslmapenter.c
new file mode 100644
index 000000000000..5dced39c8244
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslmapenter.c
@@ -0,0 +1,346 @@
+/******************************************************************************
+ *
+ * Module Name: aslmapenter - Build resource descriptor/device maps
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acapps.h>
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+
+/* This module used for application-level code only */
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslmapenter")
+
+/* Local prototypes */
+
+static ACPI_GPIO_INFO *
+MpCreateGpioInfo (
+    UINT16                  PinNumber,
+    char                    *DeviceName);
+
+static ACPI_SERIAL_INFO *
+MpCreateSerialInfo (
+    char                    *DeviceName,
+    UINT16                  Address);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpSaveGpioInfo
+ *
+ * PARAMETERS:  Resource                - GPIO resource descriptor
+ *              PinCount                - From GPIO descriptor
+ *              PinList                 - From GPIO descriptor
+ *              DeviceName              - The "ResourceSource" name
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: External Interface.
+ *              Save GPIO resource descriptor information.
+ *              Creates new GPIO info blocks, one for each pin defined by the
+ *              GPIO descriptor.
+ *
+ ******************************************************************************/
+
+void
+MpSaveGpioInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    AML_RESOURCE            *Resource,
+    UINT32                  PinCount,
+    UINT16                  *PinList,
+    char                    *DeviceName)
+{
+    ACPI_GPIO_INFO          *Info;
+    UINT32                  i;
+
+
+    /* Mapfile option enabled? */
+
+    if (!Gbl_MapfileFlag)
+    {
+        return;
+    }
+
+    /* Create an info block for each pin defined in the descriptor */
+
+    for (i = 0; i < PinCount; i++)
+    {
+        Info = MpCreateGpioInfo (PinList[i], DeviceName);
+
+        Info->Op = Op;
+        Info->DeviceName = DeviceName;
+        Info->PinCount = PinCount;
+        Info->PinIndex = i;
+        Info->PinNumber = PinList[i];
+        Info->Type = Resource->Gpio.ConnectionType;
+        Info->Direction = (UINT8) (Resource->Gpio.IntFlags & 0x0003);       /* _IOR, for IO descriptor */
+        Info->Polarity = (UINT8) ((Resource->Gpio.IntFlags >> 1) & 0x0003); /* _POL, for INT descriptor */
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpSaveSerialInfo
+ *
+ * PARAMETERS:  Resource                - A Serial resource descriptor
+ *              DeviceName              - The "ResourceSource" name.
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: External Interface.
+ *              Save serial resource descriptor information.
+ *              Creates a new serial info block.
+ *
+ ******************************************************************************/
+
+void
+MpSaveSerialInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    AML_RESOURCE            *Resource,
+    char                    *DeviceName)
+{
+    ACPI_SERIAL_INFO        *Info;
+    UINT16                  Address;
+    UINT32                  Speed;
+
+
+    /* Mapfile option enabled? */
+
+    if (!Gbl_MapfileFlag)
+    {
+        return;
+    }
+
+    if (Resource->DescriptorType != ACPI_RESOURCE_NAME_SERIAL_BUS)
+    {
+        return;
+    }
+
+    /* Extract address and speed from the resource descriptor */
+
+    switch (Resource->CommonSerialBus.Type)
+    {
+    case AML_RESOURCE_I2C_SERIALBUSTYPE:
+
+        Address = Resource->I2cSerialBus.SlaveAddress;
+        Speed = Resource->I2cSerialBus.ConnectionSpeed;
+        break;
+
+    case AML_RESOURCE_SPI_SERIALBUSTYPE:
+
+        Address = Resource->SpiSerialBus.DeviceSelection;
+        Speed = Resource->SpiSerialBus.ConnectionSpeed;
+        break;
+
+    case AML_RESOURCE_UART_SERIALBUSTYPE:
+
+        Address = 0;
+        Speed = Resource->UartSerialBus.DefaultBaudRate;
+        break;
+
+    default:    /* Invalid bus subtype */
+        return;
+    }
+
+    Info = MpCreateSerialInfo (DeviceName, Address);
+
+    Info->Op = Op;
+    Info->DeviceName = DeviceName;
+    Info->Resource = Resource;
+    Info->Address = Address;
+    Info->Speed = Speed;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpCreateGpioInfo
+ *
+ * PARAMETERS:  PinNumber               - GPIO pin number
+ *              DeviceName              - The "ResourceSource" name
+ *
+ * RETURN:      New GPIO info block.
+ *
+ * DESCRIPTION: Create a new GPIO info block and place it on the global list.
+ *              The list is sorted by GPIO device names first, and pin numbers
+ *              secondarily.
+ *
+ ******************************************************************************/
+
+static ACPI_GPIO_INFO *
+MpCreateGpioInfo (
+    UINT16                  PinNumber,
+    char                    *DeviceName)
+{
+    ACPI_GPIO_INFO          *Info;
+    ACPI_GPIO_INFO          *NextGpio;
+    ACPI_GPIO_INFO          *PrevGpio;
+
+
+    /*
+     * Allocate a new info block and insert it into the global GPIO list
+     * sorted by both source device name and then the pin number. There is
+     * one block per pin.
+     */
+    Info = ACPI_CAST_PTR (ACPI_GPIO_INFO,
+        UtStringCacheCalloc (sizeof (ACPI_GPIO_INFO)));
+
+    NextGpio = Gbl_GpioList;
+    PrevGpio = NULL;
+    if (!Gbl_GpioList)
+    {
+        Gbl_GpioList = Info;
+        Info->Next = NULL;
+        return (Info);
+    }
+
+    /* Sort on source DeviceName first */
+
+    while (NextGpio &&
+            (ACPI_STRCMP (DeviceName, NextGpio->DeviceName) > 0))
+    {
+        PrevGpio = NextGpio;
+        NextGpio = NextGpio->Next;
+    }
+
+    /* Now sort on the PinNumber */
+
+    while (NextGpio &&
+            (NextGpio->PinNumber < PinNumber) &&
+            !ACPI_STRCMP (DeviceName, NextGpio->DeviceName))
+    {
+        PrevGpio = NextGpio;
+        NextGpio = NextGpio->Next;
+    }
+
+    /* Finish the list insertion */
+
+    if (PrevGpio)
+    {
+        PrevGpio->Next = Info;
+    }
+    else
+    {
+        Gbl_GpioList = Info;
+    }
+
+    Info->Next = NextGpio;
+    return (Info);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpCreateSerialInfo
+ *
+ * PARAMETERS:  DeviceName              - The "ResourceSource" name.
+ *              Address                 - Physical address for the device
+ *
+ * RETURN:      New Serial info block.
+ *
+ * DESCRIPTION: Create a new Serial info block and place it on the global list.
+ *              The list is sorted by Serial device names first, and addresses
+ *              secondarily.
+ *
+ ******************************************************************************/
+
+static ACPI_SERIAL_INFO *
+MpCreateSerialInfo (
+    char                    *DeviceName,
+    UINT16                  Address)
+{
+    ACPI_SERIAL_INFO        *Info;
+    ACPI_SERIAL_INFO        *NextSerial;
+    ACPI_SERIAL_INFO        *PrevSerial;
+
+
+    /*
+     * Allocate a new info block and insert it into the global Serial list
+     * sorted by both source device name and then the address.
+     */
+    Info = ACPI_CAST_PTR (ACPI_SERIAL_INFO,
+        UtStringCacheCalloc (sizeof (ACPI_SERIAL_INFO)));
+
+    NextSerial = Gbl_SerialList;
+    PrevSerial = NULL;
+    if (!Gbl_SerialList)
+    {
+        Gbl_SerialList = Info;
+        Info->Next = NULL;
+        return (Info);
+    }
+
+    /* Sort on source DeviceName */
+
+    while (NextSerial &&
+        (ACPI_STRCMP (DeviceName, NextSerial->DeviceName) > 0))
+    {
+        PrevSerial = NextSerial;
+        NextSerial = NextSerial->Next;
+    }
+
+    /* Now sort on the Address */
+
+    while (NextSerial &&
+        (NextSerial->Address < Address) &&
+        !ACPI_STRCMP (DeviceName, NextSerial->DeviceName))
+    {
+        PrevSerial = NextSerial;
+        NextSerial = NextSerial->Next;
+    }
+
+    /* Finish the list insertion */
+
+    if (PrevSerial)
+    {
+        PrevSerial->Next = Info;
+    }
+    else
+    {
+        Gbl_SerialList = Info;
+    }
+
+    Info->Next = NextSerial;
+    return (Info);
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslmapoutput.c b/sys/contrib/dev/acpica/compiler/aslmapoutput.c
new file mode 100644
index 000000000000..26d4fedfe0c7
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslmapoutput.c
@@ -0,0 +1,661 @@
+/******************************************************************************
+ *
+ * Module Name: aslmapoutput - Output/emit the resource descriptor/device maps
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acapps.h>
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+#include "aslcompiler.y.h"
+#include <contrib/dev/acpica/include/acinterp.h>
+#include <contrib/dev/acpica/include/acparser.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
+#include <contrib/dev/acpica/include/amlcode.h>
+
+/* This module used for application-level code only */
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslmapoutput")
+
+/* Local prototypes */
+
+static void
+MpEmitGpioInfo (
+    void);
+
+static void
+MpEmitSerialInfo (
+    void);
+
+static void
+MpEmitDeviceTree (
+    void);
+
+static ACPI_STATUS
+MpEmitOneDevice (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue);
+
+static void
+MpXrefDevices (
+    ACPI_GPIO_INFO          *Info);
+
+static ACPI_STATUS
+MpNamespaceXrefBegin (
+    ACPI_PARSE_OBJECT       *Op,
+    UINT32                  Level,
+    void                    *Context);
+
+
+/* Strings used to decode flag bits */
+
+const char                  *DirectionDecode[] =
+{
+    "Both I/O   ",
+    "InputOnly  ",
+    "OutputOnly ",
+    "Preserve   "
+};
+
+const char                  *PolarityDecode[] =
+{
+    "ActiveHigh",
+    "ActiveLow ",
+    "ActiveBoth",
+    "Reserved  "
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpEmitMappingInfo
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: External interface.
+ *              Create and open the mapfile and emit all of the collected
+ *              hardware mapping information. Includes: GPIO information,
+ *              Serial information, and a dump of the entire ACPI device tree.
+ *
+ ******************************************************************************/
+
+void
+MpEmitMappingInfo (
+    void)
+{
+    char                    *NewFilename;
+
+
+    /* Mapfile option enabled? */
+
+    if (!Gbl_MapfileFlag)
+    {
+        return;
+    }
+
+    /* Create/Open a map file */
+
+    NewFilename = FlGenerateFilename (Gbl_OutputFilenamePrefix,
+        FILE_SUFFIX_MAP);
+    if (!NewFilename)
+    {
+        AslCommonError (ASL_ERROR, ASL_MSG_LISTING_FILENAME,
+            0, 0, 0, 0, NULL, NULL);
+    }
+
+    /* Open the hex file, text mode (closed at compiler exit) */
+
+    FlOpenFile (ASL_FILE_MAP_OUTPUT, NewFilename, "w+t");
+    AslCompilerSignon (ASL_FILE_MAP_OUTPUT);
+    AslCompilerFileHeader (ASL_FILE_MAP_OUTPUT);
+
+    if (!Gbl_GpioList)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT,
+            "\nNo GPIO devices found\n");
+    }
+
+    if (!Gbl_SerialList)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT,
+            "\nNo Serial devices found (I2C/SPI/UART)\n");
+    }
+
+    if (!Gbl_GpioList && !Gbl_SerialList)
+    {
+        return;
+    }
+
+    /* Headers */
+
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "\nResource Descriptor Connectivity Map\n");
+    FlPrintFile (ASL_FILE_MAP_OUTPUT,   "------------------------------------\n");
+
+    /* Emit GPIO and Serial descriptors, then entire ACPI device tree */
+
+    MpEmitGpioInfo ();
+    MpEmitSerialInfo ();
+    MpEmitDeviceTree ();
+
+    /* Clear the lists - no need to free memory here */
+
+    Gbl_SerialList = NULL;
+    Gbl_GpioList = NULL;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpEmitGpioInfo
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Emit the info about all GPIO devices found during the
+ *              compile or disassembly.
+ *
+ ******************************************************************************/
+
+static void
+MpEmitGpioInfo (
+    void)
+{
+    ACPI_GPIO_INFO          *Info;
+    char                    *Type;
+    char                    *PrevDeviceName = NULL;
+    const char              *Direction;
+    const char              *Polarity;
+    char                    *ParentPathname;
+    const char              *Description;
+    char                    *HidString;
+    const AH_DEVICE_ID      *HidInfo;
+
+
+    /* Walk the GPIO descriptor list */
+
+    Info = Gbl_GpioList;
+    while (Info)
+    {
+        HidString = MpGetHidViaNamestring (Info->DeviceName);
+
+        /* Print header info for the controller itself */
+
+        if (!PrevDeviceName ||
+            ACPI_STRCMP (PrevDeviceName, Info->DeviceName))
+        {
+            FlPrintFile (ASL_FILE_MAP_OUTPUT,
+                "\n\nGPIO Controller:  %-8s  %-28s",
+                HidString, Info->DeviceName);
+
+            HidInfo = AcpiAhMatchHardwareId (HidString);
+            if (HidInfo)
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s",
+                    HidInfo->Description);
+            }
+
+            FlPrintFile (ASL_FILE_MAP_OUTPUT,
+                "\n\nPin   Type     Direction    Polarity"
+                "    Dest _HID  Destination\n");
+        }
+
+        PrevDeviceName = Info->DeviceName;
+
+        /* Setup various strings based upon the type (GpioInt or GpioIo) */
+
+        switch (Info->Type)
+        {
+        case AML_RESOURCE_GPIO_TYPE_INT:
+
+            Type = "GpioInt";
+            Direction = "-Interrupt-";
+            Polarity = PolarityDecode[Info->Polarity];
+            break;
+
+        case AML_RESOURCE_GPIO_TYPE_IO:
+
+            Type = "GpioIo ";
+            Direction = DirectionDecode[Info->Direction];
+            Polarity = "          ";
+            break;
+
+        default:
+            continue;
+        }
+
+        /* Emit the GPIO info */
+
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "%4.4X  %s  %s  %s  ",
+            Info->PinNumber, Type, Direction, Polarity);
+
+        ParentPathname = NULL;
+        HidString = MpGetConnectionInfo (Info->Op, Info->PinIndex,
+            &Info->TargetNode, &ParentPathname);
+        if (HidString)
+        {
+            /*
+             * This is a Connection() field
+             * Attempt to find all references to the field.
+             */
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "%8s   %-28s",
+                HidString, ParentPathname);
+
+            MpXrefDevices (Info);
+        }
+        else
+        {
+            /*
+             * For Devices, attempt to get the _HID description string.
+             * Failing that (many _HIDs are not recognized), attempt to
+             * get the _DDN description string.
+             */
+            HidString = MpGetParentDeviceHid (Info->Op, &Info->TargetNode,
+                &ParentPathname);
+
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "%8s   %-28s",
+                HidString, ParentPathname);
+
+            /* Get the _HID description or _DDN string */
+
+            HidInfo = AcpiAhMatchHardwareId (HidString);
+            if (HidInfo)
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s",
+                    HidInfo->Description);
+            }
+            else if ((Description = MpGetDdnValue (ParentPathname)))
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s (_DDN)",
+                    Description);
+            }
+        }
+
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n");
+        ACPI_FREE (ParentPathname);
+        Info = Info->Next;
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpEmitSerialInfo
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Emit the info about all Serial devices found during the
+ *              compile or disassembly.
+ *
+ ******************************************************************************/
+
+static void
+MpEmitSerialInfo (
+    void)
+{
+    ACPI_SERIAL_INFO        *Info;
+    char                    *Type;
+    char                    *ParentPathname;
+    char                    *PrevDeviceName = NULL;
+    char                    *HidString;
+    const AH_DEVICE_ID      *HidInfo;
+    const char              *Description;
+    AML_RESOURCE            *Resource;
+
+
+    /* Walk the constructed serial descriptor list */
+
+    Info = Gbl_SerialList;
+    while (Info)
+    {
+        Resource = Info->Resource;
+        switch (Resource->CommonSerialBus.Type)
+        {
+        case AML_RESOURCE_I2C_SERIALBUSTYPE:
+            Type = "I2C ";
+            break;
+
+        case AML_RESOURCE_SPI_SERIALBUSTYPE:
+            Type = "SPI ";
+            break;
+
+        case AML_RESOURCE_UART_SERIALBUSTYPE:
+            Type = "UART";
+            break;
+
+        default:
+            Type = "UNKN";
+            break;
+        }
+
+        HidString = MpGetHidViaNamestring (Info->DeviceName);
+
+        /* Print header info for the controller itself */
+
+        if (!PrevDeviceName ||
+            ACPI_STRCMP (PrevDeviceName, Info->DeviceName))
+        {
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n\n%s Controller:  ",
+                Type);
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "%-8s  %-28s",
+                HidString, Info->DeviceName);
+
+            HidInfo = AcpiAhMatchHardwareId (HidString);
+            if (HidInfo)
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s",
+                    HidInfo->Description);
+            }
+
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n\n");
+            FlPrintFile (ASL_FILE_MAP_OUTPUT,
+                "Type  Address   Speed      Dest _HID  Destination\n");
+        }
+
+        PrevDeviceName = Info->DeviceName;
+
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "%s   %4.4X    %8.8X    ",
+            Type, Info->Address, Info->Speed);
+
+        ParentPathname = NULL;
+        HidString = MpGetConnectionInfo (Info->Op, 0, &Info->TargetNode,
+            &ParentPathname);
+        if (HidString)
+        {
+            /*
+             * This is a Connection() field
+             * Attempt to find all references to the field.
+             */
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "%8s   %-28s",
+                HidString, ParentPathname);
+        }
+        else
+        {
+            /* Normal resource template */
+
+            HidString = MpGetParentDeviceHid (Info->Op, &Info->TargetNode,
+                &ParentPathname);
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, "%8s   %-28s",
+                HidString, ParentPathname);
+
+            /* Get the _HID description or _DDN string */
+
+            HidInfo = AcpiAhMatchHardwareId (HidString);
+            if (HidInfo)
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s",
+                    HidInfo->Description);
+            }
+            else if ((Description = MpGetDdnValue (ParentPathname)))
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // %s (_DDN)",
+                    Description);
+            }
+        }
+
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n");
+        ACPI_FREE (ParentPathname);
+        Info = Info->Next;
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpEmitDeviceTree
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Emit information about all devices within the ACPI namespace.
+ *
+ ******************************************************************************/
+
+static void
+MpEmitDeviceTree (
+    void)
+{
+
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n\nACPI Device Tree\n");
+    FlPrintFile (ASL_FILE_MAP_OUTPUT,     "----------------\n\n");
+
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "Device Pathname                   "
+        "_HID      Description\n\n");
+
+    /* Walk the namespace from the root */
+
+    (void) AcpiNsWalkNamespace (ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+            ACPI_UINT32_MAX, FALSE, MpEmitOneDevice, NULL, NULL, NULL);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpEmitOneDevice
+ *
+ * PARAMETERS:  ACPI_NAMESPACE_WALK callback
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Emit information about one ACPI device in the namespace. Used
+ *              during dump of all device objects within the namespace.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+MpEmitOneDevice (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue)
+{
+    char                    *DevicePathname;
+    char                    *DdnString;
+    char                    *HidString;
+    const AH_DEVICE_ID      *HidInfo;
+
+
+    /* Device pathname */
+
+    DevicePathname = AcpiNsGetExternalPathname (
+        ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle));
+
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "%-32s", DevicePathname);
+
+    /* _HID or _DDN */
+
+    HidString = MpGetHidValue (
+        ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle));
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "%8s", HidString);
+
+    HidInfo = AcpiAhMatchHardwareId (HidString);
+    if (HidInfo)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "    // %s",
+            HidInfo->Description);
+    }
+    else if ((DdnString = MpGetDdnValue (DevicePathname)))
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "    // %s (_DDN)", DdnString);
+    }
+
+    FlPrintFile (ASL_FILE_MAP_OUTPUT, "\n");
+    ACPI_FREE (DevicePathname);
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpXrefDevices
+ *
+ * PARAMETERS:  Info                    - A GPIO Info block
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Cross-reference the parse tree and find all references to the
+ *              specified GPIO device.
+ *
+ ******************************************************************************/
+
+static void
+MpXrefDevices (
+    ACPI_GPIO_INFO          *Info)
+{
+
+    /* Walk the entire parse tree */
+
+    TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+        MpNamespaceXrefBegin, NULL, Info);
+
+    if (!Info->References)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // **** No references in table");
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpNamespaceXrefBegin
+ *
+ * PARAMETERS:  WALK_PARSE_TREE callback
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Walk parse tree callback used to cross-reference GPIO pins.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+MpNamespaceXrefBegin (
+    ACPI_PARSE_OBJECT       *Op,
+    UINT32                  Level,
+    void                    *Context)
+{
+    ACPI_GPIO_INFO          *Info = ACPI_CAST_PTR (ACPI_GPIO_INFO, Context);
+    const ACPI_OPCODE_INFO  *OpInfo;
+    char                    *DevicePathname;
+    ACPI_PARSE_OBJECT       *ParentOp;
+    char                    *HidString;
+
+
+    ACPI_FUNCTION_TRACE_PTR (MpNamespaceXrefBegin, Op);
+
+    /*
+     * If this node is the actual declaration of a name
+     * [such as the XXXX name in "Method (XXXX)"],
+     * we are not interested in it here. We only care about names that
+     * are references to other objects within the namespace and the
+     * parent objects of name declarations
+     */
+    if (Op->Asl.CompileFlags & NODE_IS_NAME_DECLARATION)
+    {
+        return (AE_OK);
+    }
+
+    /* We are only interested in opcodes that have an associated name */
+
+    OpInfo = AcpiPsGetOpcodeInfo (Op->Asl.AmlOpcode);
+
+    if ((OpInfo->Flags & AML_NAMED) ||
+        (OpInfo->Flags & AML_CREATE))
+    {
+        return (AE_OK);
+    }
+
+    if ((Op->Asl.ParseOpcode != PARSEOP_NAMESTRING) &&
+        (Op->Asl.ParseOpcode != PARSEOP_NAMESEG)    &&
+        (Op->Asl.ParseOpcode != PARSEOP_METHODCALL))
+    {
+        return (AE_OK);
+    }
+
+    if (!Op->Asl.Node)
+    {
+        return (AE_OK);
+    }
+
+    ParentOp = Op->Asl.Parent;
+    if (ParentOp->Asl.ParseOpcode == PARSEOP_FIELD)
+    {
+        return (AE_OK);
+    }
+
+    if (Op->Asl.Node == Info->TargetNode)
+    {
+        DevicePathname = AcpiNsGetExternalPathname (
+            Info->TargetNode);
+
+        while (ParentOp && (!ParentOp->Asl.Node))
+        {
+            ParentOp = ParentOp->Asl.Parent;
+        }
+
+        if (ParentOp)
+        {
+            DevicePathname = AcpiNsGetExternalPathname (
+                ParentOp->Asl.Node);
+
+            if (!Info->References)
+            {
+                FlPrintFile (ASL_FILE_MAP_OUTPUT, "  // References:");
+            }
+
+            HidString = MpGetHidViaNamestring (DevicePathname);
+
+            FlPrintFile (ASL_FILE_MAP_OUTPUT, " %s [%s]",
+                DevicePathname, HidString);
+
+            Info->References++;
+        }
+    }
+
+    return (AE_OK);
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslmaputils.c b/sys/contrib/dev/acpica/compiler/aslmaputils.c
new file mode 100644
index 000000000000..f50c9ea68b5f
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslmaputils.c
@@ -0,0 +1,402 @@
+/******************************************************************************
+ *
+ * Module Name: aslmaputils - Utilities for the resource descriptor/device maps
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acapps.h>
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+#include "aslcompiler.y.h"
+#include <contrib/dev/acpica/include/acinterp.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
+#include <contrib/dev/acpica/include/amlcode.h>
+
+/* This module used for application-level code only */
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslmaputils")
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetHidFromParseTree
+ *
+ * PARAMETERS:  HidNode             - Node for a _HID object
+ *
+ * RETURN:      An _HID string value. Automatically converts _HID integers
+ *              to strings. Never NULL.
+ *
+ * DESCRIPTION: Extract a _HID value from the parse tree, not the namespace.
+ *              Used when a fully initialized namespace is not available.
+ *
+ ******************************************************************************/
+
+char *
+MpGetHidFromParseTree (
+    ACPI_NAMESPACE_NODE     *HidNode)
+{
+    ACPI_PARSE_OBJECT       *Op;
+    ACPI_PARSE_OBJECT       *Arg;
+    char                    *HidString;
+
+
+    Op = HidNode->Op;
+
+    switch (Op->Asl.ParseOpcode)
+    {
+    case PARSEOP_NAME:
+
+        Arg = Op->Asl.Child;  /* Get the NameSeg/NameString node */
+        Arg = Arg->Asl.Next;  /* First peer is the object to be associated with the name */
+
+        switch (Arg->Asl.ParseOpcode)
+        {
+        case PARSEOP_STRING_LITERAL:
+
+            return (Arg->Asl.Value.String);
+
+        case PARSEOP_INTEGER:
+
+            /* Convert EISAID to a string */
+
+            HidString = UtStringCacheCalloc (ACPI_EISAID_STRING_SIZE);
+            AcpiExEisaIdToString (HidString, Arg->Asl.Value.Integer);
+            return (HidString);
+
+        default:
+
+            return ("UNKNOWN");
+        }
+
+    default:
+        return ("-No HID-");
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetHidValue
+ *
+ * PARAMETERS:  DeviceNode          - Node for parent device
+ *
+ * RETURN:      An _HID string value. Automatically converts _HID integers
+ *              to strings. Never NULL.
+ *
+ * DESCRIPTION: Extract _HID value from within a device scope. Does not
+ *              actually execute a method, just gets the string or integer
+ *              value for the _HID.
+ *
+ ******************************************************************************/
+
+char *
+MpGetHidValue (
+    ACPI_NAMESPACE_NODE     *DeviceNode)
+{
+    ACPI_NAMESPACE_NODE     *HidNode;
+    char                    *HidString;
+    ACPI_STATUS             Status;
+
+
+    Status = AcpiNsGetNode (DeviceNode, METHOD_NAME__HID,
+        ACPI_NS_NO_UPSEARCH, &HidNode);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    /* If only partial namespace, get the _HID from the parse tree */
+
+    if (!HidNode->Object)
+    {
+        return (MpGetHidFromParseTree (HidNode));
+    }
+
+    /* Handle the different _HID flavors */
+
+    switch (HidNode->Type)
+    {
+    case ACPI_TYPE_STRING:
+
+        return (HidNode->Object->String.Pointer);
+
+    case ACPI_TYPE_INTEGER:
+
+        /* Convert EISAID to a string */
+
+        HidString = UtStringCacheCalloc (ACPI_EISAID_STRING_SIZE);
+        AcpiExEisaIdToString (HidString, HidNode->Object->Integer.Value);
+        return (HidString);
+
+    case ACPI_TYPE_METHOD:
+
+        return ("-Method-");
+
+    default:
+
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, "BAD HID TYPE: %u", HidNode->Type);
+        break;
+    }
+
+
+ErrorExit:
+    return ("-No HID-");
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetHidViaNamestring
+ *
+ * PARAMETERS:  DeviceName          - Namepath for parent device
+ *
+ * RETURN:      _HID string. Never NULL.
+ *
+ * DESCRIPTION: Get a _HID value via a device pathname (instead of just simply
+ *              a device node.)
+ *
+ ******************************************************************************/
+
+char *
+MpGetHidViaNamestring (
+    char                    *DeviceName)
+{
+    ACPI_NAMESPACE_NODE     *DeviceNode;
+    ACPI_STATUS             Status;
+
+
+    Status = AcpiNsGetNode (NULL, DeviceName, ACPI_NS_NO_UPSEARCH,
+        &DeviceNode);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    return (MpGetHidValue (DeviceNode));
+
+
+ErrorExit:
+    return ("-No HID-");
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetParentDeviceHid
+ *
+ * PARAMETERS:  Op                      - Parse Op to be examined
+ *              TargetNode              - Where the field node is returned
+ *              ParentDeviceName        - Where the node path is returned
+ *
+ * RETURN:      _HID string. Never NULL.
+ *
+ * DESCRIPTION: Find the parent Device or Scope Op, get the full pathname to
+ *              the parent, and get the _HID associated with the parent.
+ *
+ ******************************************************************************/
+
+char *
+MpGetParentDeviceHid (
+    ACPI_PARSE_OBJECT       *Op,
+    ACPI_NAMESPACE_NODE     **TargetNode,
+    char                    **ParentDeviceName)
+{
+    ACPI_NAMESPACE_NODE     *DeviceNode;
+
+
+    /* Find parent Device() or Scope() Op */
+
+    while (Op &&
+        (Op->Asl.AmlOpcode != AML_DEVICE_OP) &&
+        (Op->Asl.AmlOpcode != AML_SCOPE_OP))
+    {
+        Op = Op->Asl.Parent;
+    }
+
+    if (!Op)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, " No_Parent_Device ");
+        goto ErrorExit;
+    }
+
+    /* Get the full pathname to the device and the _HID */
+
+    DeviceNode = Op->Asl.Node;
+    if (!DeviceNode)
+    {
+        FlPrintFile (ASL_FILE_MAP_OUTPUT, " No_Device_Node ");
+        goto ErrorExit;
+    }
+
+    *ParentDeviceName = AcpiNsGetExternalPathname (DeviceNode);
+    return (MpGetHidValue (DeviceNode));
+
+
+ErrorExit:
+    return ("-No HID-");
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetDdnValue
+ *
+ * PARAMETERS:  DeviceName          - Namepath for parent device
+ *
+ * RETURN:      _DDN description string. NULL on failure.
+ *
+ * DESCRIPTION: Execute the _DDN method for the device.
+ *
+ ******************************************************************************/
+
+char *
+MpGetDdnValue (
+    char                    *DeviceName)
+{
+    ACPI_NAMESPACE_NODE     *DeviceNode;
+    ACPI_NAMESPACE_NODE     *DdnNode;
+    ACPI_STATUS             Status;
+
+
+    Status = AcpiNsGetNode (NULL, DeviceName, ACPI_NS_NO_UPSEARCH,
+        &DeviceNode);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    Status = AcpiNsGetNode (DeviceNode, METHOD_NAME__DDN, ACPI_NS_NO_UPSEARCH,
+        &DdnNode);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ErrorExit;
+    }
+
+    if ((DdnNode->Type != ACPI_TYPE_STRING) ||
+        !DdnNode->Object)
+    {
+        goto ErrorExit;
+    }
+
+    return (DdnNode->Object->String.Pointer);
+
+
+ErrorExit:
+    return (NULL);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    MpGetConnectionInfo
+ *
+ * PARAMETERS:  Op                      - Parse Op to be examined
+ *              PinIndex                - Index into GPIO PinList
+ *              TargetNode              - Where the field node is returned
+ *              TargetName              - Where the node path is returned
+ *
+ * RETURN:      A substitute _HID string, indicating that the name is actually
+ *              a field. NULL if the Op does not refer to a Connection.
+ *
+ * DESCRIPTION: Get the Field Unit that corresponds to the PinIndex after
+ *              a Connection() invocation.
+ *
+ ******************************************************************************/
+
+char *
+MpGetConnectionInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    UINT32                  PinIndex,
+    ACPI_NAMESPACE_NODE     **TargetNode,
+    char                    **TargetName)
+{
+    ACPI_PARSE_OBJECT       *NextOp;
+    UINT32                  i;
+
+
+    /*
+     * Handle Connection() here. Find the next named FieldUnit.
+     * Note: we look at the ParseOpcode for the compiler, look
+     * at the AmlOpcode for the disassembler.
+     */
+    if ((Op->Asl.AmlOpcode == AML_INT_CONNECTION_OP) ||
+        (Op->Asl.ParseOpcode == PARSEOP_CONNECTION))
+    {
+        /* Find the correct field unit definition */
+
+        NextOp = Op;
+        for (i = 0; i <= PinIndex;)
+        {
+            NextOp = NextOp->Asl.Next;
+            while (NextOp &&
+                (NextOp->Asl.ParseOpcode != PARSEOP_NAMESEG) &&
+                (NextOp->Asl.AmlOpcode != AML_INT_NAMEDFIELD_OP))
+            {
+                NextOp = NextOp->Asl.Next;
+            }
+
+            if (!NextOp)
+            {
+                return ("UNKNOWN");
+            }
+
+            /* Add length of this field to the current pin index */
+
+            if (NextOp->Asl.ParseOpcode == PARSEOP_NAMESEG)
+            {
+                i += (UINT32) NextOp->Asl.Child->Asl.Value.Integer;
+            }
+            else /* AML_INT_NAMEDFIELD_OP */
+            {
+                i += (UINT32) NextOp->Asl.Value.Integer;
+            }
+        }
+
+        /* Return the node and pathname for the field unit */
+
+        *TargetNode = NextOp->Asl.Node;
+        *TargetName = AcpiNsGetExternalPathname (*TargetNode);
+        return ("-Field-");
+    }
+
+    return (NULL);
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslmessages.c b/sys/contrib/dev/acpica/compiler/aslmessages.c
new file mode 100644
index 000000000000..da4c7365cbd0
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslmessages.c
@@ -0,0 +1,409 @@
+/******************************************************************************
+ *
+ * Module Name: aslmessages.c - Compiler error/warning message strings
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslmessages")
+
+
+/*
+ * Strings for message reporting levels, must match error
+ * type string tables in aslmessages.c
+ */
+const char              *AslErrorLevel [ASL_NUM_REPORT_LEVELS] = {
+    "Optimize",
+    "Remark  ",
+    "Warning ",
+    "Warning ",
+    "Warning ",
+    "Error   "
+};
+
+/* All lowercase versions for IDEs */
+
+const char              *AslErrorLevelIde [ASL_NUM_REPORT_LEVELS] = {
+    "optimize",
+    "remark  ",
+    "warning ",
+    "warning ",
+    "warning ",
+    "error   "
+};
+
+
+/*
+ * Actual message strings for each compiler message ID. There are currently
+ * three distinct blocks of error messages (so that they can be expanded
+ * individually):
+ *      Main ASL compiler
+ *      Data Table compiler
+ *      Preprocessor
+ *
+ * NOTE1: These tables must match the enum list of message IDs in the file
+ * aslmessages.h exactly.
+ *
+ * NOTE2: With the introduction of the -vw option to disable specific messages,
+ * new messages should only be added to the end of this list, so that values
+ * for existing messages are not disturbed.
+ */
+
+/* ASL compiler */
+
+const char                      *AslCompilerMsgs [] =
+{
+/*    The zeroth message is reserved */    "",
+/*    ASL_MSG_ALIGNMENT */                  "Must be a multiple of alignment/granularity value",
+/*    ASL_MSG_ALPHANUMERIC_STRING */        "String must be entirely alphanumeric",
+/*    ASL_MSG_AML_NOT_IMPLEMENTED */        "Opcode is not implemented in compiler AML code generator",
+/*    ASL_MSG_ARG_COUNT_HI */               "Too many arguments",
+/*    ASL_MSG_ARG_COUNT_LO */               "Too few arguments",
+/*    ASL_MSG_ARG_INIT */                   "Method argument is not initialized",
+/*    ASL_MSG_BACKWARDS_OFFSET */           "Invalid backwards offset",
+/*    ASL_MSG_BUFFER_LENGTH */              "Effective AML buffer length is zero",
+/*    ASL_MSG_CLOSE */                      "Could not close file",
+/*    ASL_MSG_COMPILER_INTERNAL */          "Internal compiler error",
+/*    ASL_MSG_COMPILER_RESERVED */          "Use of compiler reserved name",
+/*    ASL_MSG_CONNECTION_MISSING */         "A Connection operator is required for this field SpaceId",
+/*    ASL_MSG_CONNECTION_INVALID */         "Invalid OpRegion SpaceId for use of Connection operator",
+/*    ASL_MSG_CONSTANT_EVALUATION */        "Could not evaluate constant expression",
+/*    ASL_MSG_CONSTANT_FOLDED */            "Constant expression evaluated and reduced",
+/*    ASL_MSG_CORE_EXCEPTION */             "From ACPICA Subsystem",
+/*    ASL_MSG_DEBUG_FILE_OPEN */            "Could not open debug file",
+/*    ASL_MSG_DEBUG_FILENAME */             "Could not create debug filename",
+/*    ASL_MSG_DEPENDENT_NESTING */          "Dependent function macros cannot be nested",
+/*    ASL_MSG_DMA_CHANNEL */                "Invalid DMA channel (must be 0-7)",
+/*    ASL_MSG_DMA_LIST */                   "Too many DMA channels (8 max)",
+/*    ASL_MSG_DUPLICATE_CASE */             "Case value already specified",
+/*    ASL_MSG_DUPLICATE_ITEM */             "Duplicate value in list",
+/*    ASL_MSG_EARLY_EOF */                  "Premature end-of-file reached",
+/*    ASL_MSG_ENCODING_LENGTH */            "Package length too long to encode",
+/*    ASL_MSG_EX_INTERRUPT_LIST */          "Too many interrupts (255 max)",
+/*    ASL_MSG_EX_INTERRUPT_LIST_MIN */      "Too few interrupts (1 minimum required)",
+/*    ASL_MSG_EX_INTERRUPT_NUMBER */        "Invalid interrupt number (must be 32 bits)",
+/*    ASL_MSG_FIELD_ACCESS_WIDTH */         "Access width is greater than region size",
+/*    ASL_MSG_FIELD_UNIT_ACCESS_WIDTH */    "Access width of Field Unit extends beyond region limit",
+/*    ASL_MSG_FIELD_UNIT_OFFSET */          "Field Unit extends beyond region limit",
+/*    ASL_MSG_GPE_NAME_CONFLICT */          "Name conflicts with a previous GPE method",
+/*    ASL_MSG_HID_LENGTH */                 "_HID string must be exactly 7 or 8 characters",
+/*    ASL_MSG_HID_PREFIX */                 "_HID prefix must be all uppercase or decimal digits",
+/*    ASL_MSG_HID_SUFFIX */                 "_HID suffix must be all hex digits",
+/*    ASL_MSG_INCLUDE_FILE_OPEN */          "Could not open include file",
+/*    ASL_MSG_INPUT_FILE_OPEN */            "Could not open input file",
+/*    ASL_MSG_INTEGER_LENGTH */             "64-bit integer in 32-bit table, truncating (DSDT version < 2)",
+/*    ASL_MSG_INTEGER_OPTIMIZATION */       "Integer optimized to single-byte AML opcode",
+/*    ASL_MSG_INTERRUPT_LIST */             "Too many interrupts (16 max)",
+/*    ASL_MSG_INTERRUPT_NUMBER */           "Invalid interrupt number (must be 0-15)",
+/*    ASL_MSG_INVALID_ACCESS_SIZE */        "Invalid AccessSize (Maximum is 4 - QWord access)",
+/*    ASL_MSG_INVALID_ADDR_FLAGS */         "Invalid combination of Length and Min/Max fixed flags",
+/*    ASL_MSG_INVALID_CONSTANT_OP */        "Invalid operator in constant expression (not type 3/4/5)",
+/*    ASL_MSG_INVALID_EISAID */             "EISAID string must be of the form \"UUUXXXX\" (3 uppercase, 4 hex digits)",
+/*    ASL_MSG_INVALID_ESCAPE */             "Invalid or unknown escape sequence",
+/*    ASL_MSG_INVALID_GRAN_FIXED */         "Granularity must be zero for fixed Min/Max",
+/*    ASL_MSG_INVALID_GRANULARITY */        "Granularity must be zero or a power of two minus one",
+/*    ASL_MSG_INVALID_LENGTH */             "Length is larger than Min/Max window",
+/*    ASL_MSG_INVALID_LENGTH_FIXED */       "Length is not equal to fixed Min/Max window",
+/*    ASL_MSG_INVALID_MIN_MAX */            "Address Min is greater than Address Max",
+/*    ASL_MSG_INVALID_OPERAND */            "Invalid operand",
+/*    ASL_MSG_INVALID_PERFORMANCE */        "Invalid performance/robustness value",
+/*    ASL_MSG_INVALID_PRIORITY */           "Invalid priority value",
+/*    ASL_MSG_INVALID_STRING */             "Invalid Hex/Octal Escape - Non-ASCII or NULL",
+/*    ASL_MSG_INVALID_TARGET */             "Target operand not allowed in constant expression",
+/*    ASL_MSG_INVALID_TIME */               "Time parameter too long (255 max)",
+/*    ASL_MSG_INVALID_TYPE */               "Invalid type",
+/*    ASL_MSG_INVALID_UUID */               "UUID string must be of the form \"aabbccdd-eeff-gghh-iijj-kkllmmnnoopp\"",
+/*    ASL_MSG_ISA_ADDRESS */                "Maximum 10-bit ISA address (0x3FF)",
+/*    ASL_MSG_LEADING_ASTERISK */           "Invalid leading asterisk",
+/*    ASL_MSG_LIST_LENGTH_LONG */           "Initializer list longer than declared package length",
+/*    ASL_MSG_LIST_LENGTH_SHORT */          "Initializer list shorter than declared package length",
+/*    ASL_MSG_LISTING_FILE_OPEN */          "Could not open listing file",
+/*    ASL_MSG_LISTING_FILENAME */           "Could not create listing filename",
+/*    ASL_MSG_LOCAL_INIT */                 "Method local variable is not initialized",
+/*    ASL_MSG_LOCAL_OUTSIDE_METHOD */       "Local or Arg used outside a control method",
+/*    ASL_MSG_LONG_LINE */                  "Splitting long input line",
+/*    ASL_MSG_MEMORY_ALLOCATION */          "Memory allocation failure",
+/*    ASL_MSG_MISSING_ENDDEPENDENT */       "Missing EndDependentFn() macro in dependent resource list",
+/*    ASL_MSG_MISSING_STARTDEPENDENT */     "Missing StartDependentFn() macro in dependent resource list",
+/*    ASL_MSG_MULTIPLE_DEFAULT */           "More than one Default statement within Switch construct",
+/*    ASL_MSG_MULTIPLE_TYPES */             "Multiple types",
+/*    ASL_MSG_NAME_EXISTS */                "Name already exists in scope",
+/*    ASL_MSG_NAME_OPTIMIZATION */          "NamePath optimized",
+/*    ASL_MSG_NAMED_OBJECT_IN_WHILE */      "Creating a named object in a While loop",
+/*    ASL_MSG_NESTED_COMMENT */             "Nested comment found",
+/*    ASL_MSG_NO_CASES */                   "No Case statements under Switch",
+/*    ASL_MSG_NO_REGION */                  "_REG has no corresponding Operation Region",
+/*    ASL_MSG_NO_RETVAL */                  "Called method returns no value",
+/*    ASL_MSG_NO_WHILE */                   "No enclosing While statement",
+/*    ASL_MSG_NON_ASCII */                  "Invalid characters found in file",
+/*    ASL_MSG_NON_ZERO */                   "Operand evaluates to zero",
+/*    ASL_MSG_NOT_EXIST */                  "Object does not exist",
+/*    ASL_MSG_NOT_FOUND */                  "Object not found or not accessible from scope",
+/*    ASL_MSG_NOT_METHOD */                 "Not a control method, cannot invoke",
+/*    ASL_MSG_NOT_PARAMETER */              "Not a parameter, used as local only",
+/*    ASL_MSG_NOT_REACHABLE */              "Object is not accessible from this scope",
+/*    ASL_MSG_NOT_REFERENCED */             "Object is not referenced",
+/*    ASL_MSG_NULL_DESCRIPTOR */            "Min/Max/Length/Gran are all zero, but no resource tag",
+/*    ASL_MSG_NULL_STRING */                "Invalid zero-length (null) string",
+/*    ASL_MSG_OPEN */                       "Could not open file",
+/*    ASL_MSG_OUTPUT_FILE_OPEN */           "Could not open output AML file",
+/*    ASL_MSG_OUTPUT_FILENAME */            "Could not create output filename",
+/*    ASL_MSG_PACKAGE_LENGTH */             "Effective AML package length is zero",
+/*    ASL_MSG_PREPROCESSOR_FILENAME */      "Could not create preprocessor filename",
+/*    ASL_MSG_READ */                       "Could not read file",
+/*    ASL_MSG_RECURSION */                  "Recursive method call",
+/*    ASL_MSG_REGION_BUFFER_ACCESS */       "Host Operation Region requires BufferAcc access",
+/*    ASL_MSG_REGION_BYTE_ACCESS */         "Host Operation Region requires ByteAcc access",
+/*    ASL_MSG_RESERVED_ARG_COUNT_HI */      "Reserved method has too many arguments",
+/*    ASL_MSG_RESERVED_ARG_COUNT_LO */      "Reserved method has too few arguments",
+/*    ASL_MSG_RESERVED_METHOD */            "Reserved name must be a control method",
+/*    ASL_MSG_RESERVED_NO_RETURN_VAL */     "Reserved method should not return a value",
+/*    ASL_MSG_RESERVED_OPERAND_TYPE */      "Invalid object type for reserved name",
+/*    ASL_MSG_RESERVED_PACKAGE_LENGTH */    "Invalid package length for reserved name",
+/*    ASL_MSG_RESERVED_RETURN_VALUE */      "Reserved method must return a value",
+/*    ASL_MSG_RESERVED_USE */               "Invalid use of reserved name",
+/*    ASL_MSG_RESERVED_WORD */              "Use of reserved name",
+/*    ASL_MSG_RESOURCE_FIELD */             "Resource field name cannot be used as a target",
+/*    ASL_MSG_RESOURCE_INDEX */             "Missing ResourceSourceIndex (required)",
+/*    ASL_MSG_RESOURCE_LIST */              "Too many resource items (internal error)",
+/*    ASL_MSG_RESOURCE_SOURCE */            "Missing ResourceSource string (required)",
+/*    ASL_MSG_RESULT_NOT_USED */            "Result is not used, operator has no effect",
+/*    ASL_MSG_RETURN_TYPES */               "Not all control paths return a value",
+/*    ASL_MSG_SCOPE_FWD_REF */              "Forward references from Scope operator not allowed",
+/*    ASL_MSG_SCOPE_TYPE */                 "Existing object has invalid type for Scope operator",
+/*    ASL_MSG_SEEK */                       "Could not seek file",
+/*    ASL_MSG_SERIALIZED */                 "Control Method marked Serialized",
+/*    ASL_MSG_SERIALIZED_REQUIRED */        "Control Method should be made Serialized",
+/*    ASL_MSG_SINGLE_NAME_OPTIMIZATION */   "NamePath optimized to NameSeg (uses run-time search path)",
+/*    ASL_MSG_SOME_NO_RETVAL */             "Called method may not always return a value",
+/*    ASL_MSG_STRING_LENGTH */              "String literal too long",
+/*    ASL_MSG_SWITCH_TYPE */                "Switch expression is not a static Integer/Buffer/String data type, defaulting to Integer",
+/*    ASL_MSG_SYNC_LEVEL */                 "SyncLevel must be in the range 0-15",
+/*    ASL_MSG_SYNTAX */                     "",
+/*    ASL_MSG_TABLE_SIGNATURE */            "Invalid Table Signature",
+/*    ASL_MSG_TAG_LARGER */                 "ResourceTag larger than Field",
+/*    ASL_MSG_TAG_SMALLER */                "ResourceTag smaller than Field",
+/*    ASL_MSG_TIMEOUT */                    "Result is not used, possible operator timeout will be missed",
+/*    ASL_MSG_TOO_MANY_TEMPS */             "Method requires too many temporary variables (_T_x)",
+/*    ASL_MSG_TRUNCATION */                 "64-bit return value will be truncated to 32 bits (DSDT version < 2)",
+/*    ASL_MSG_UNKNOWN_RESERVED_NAME */      "Unknown reserved name",
+/*    ASL_MSG_UNREACHABLE_CODE */           "Statement is unreachable",
+/*    ASL_MSG_UNSUPPORTED */                "Unsupported feature",
+/*    ASL_MSG_UPPER_CASE */                 "Non-hex letters must be upper case",
+/*    ASL_MSG_VENDOR_LIST */                "Too many vendor data bytes (7 max)",
+/*    ASL_MSG_WRITE */                      "Could not write file",
+/*    ASL_MSG_RANGE */                      "Constant out of range",
+/*    ASL_MSG_BUFFER_ALLOCATION */          "Could not allocate line buffer",
+/*    ASL_MSG_MISSING_DEPENDENCY */         "Missing dependency",
+/*    ASL_MSG_ILLEGAL_FORWARD_REF */        "Illegal forward reference within a method",
+/*    ASL_MSG_ILLEGAL_METHOD_REF */         "Illegal reference across two methods"
+};
+
+/* Table compiler */
+
+const char                      *AslTableCompilerMsgs [] =
+{
+/*    ASL_MSG_BUFFER_ELEMENT */             "Invalid element in buffer initializer list",
+/*    ASL_MSG_DIVIDE_BY_ZERO */             "Expression contains divide-by-zero",
+/*    ASL_MSG_FLAG_VALUE */                 "Flag value is too large",
+/*    ASL_MSG_INTEGER_SIZE */               "Integer too large for target",
+/*    ASL_MSG_INVALID_EXPRESSION */         "Invalid expression",
+/*    ASL_MSG_INVALID_FIELD_NAME */         "Invalid Field Name",
+/*    ASL_MSG_INVALID_HEX_INTEGER */        "Invalid hex integer constant",
+/*    ASL_MSG_OEM_TABLE */                  "OEM table - unknown contents",
+/*    ASL_MSG_RESERVED_VALUE */             "Reserved field",
+/*    ASL_MSG_UNKNOWN_LABEL */              "Label is undefined",
+/*    ASL_MSG_UNKNOWN_SUBTABLE */           "Unknown subtable type",
+/*    ASL_MSG_UNKNOWN_TABLE */              "Unknown ACPI table signature",
+/*    ASL_MSG_ZERO_VALUE */                 "Value must be non-zero"
+};
+
+/* Preprocessor */
+
+const char                      *AslPreprocessorMsgs [] =
+{
+/*    ASL_MSG_DIRECTIVE_SYNTAX */           "Invalid directive syntax",
+/*    ASL_MSG_ENDIF_MISMATCH */             "Mismatched #endif",
+/*    ASL_MSG_ERROR_DIRECTIVE */            "#error",
+/*    ASL_MSG_EXISTING_NAME */              "Name is already defined",
+/*    ASL_MSG_INVALID_INVOCATION */         "Invalid macro invocation",
+/*    ASL_MSG_MACRO_SYNTAX */               "Invalid macro syntax",
+/*    ASL_MSG_TOO_MANY_ARGUMENTS */         "Too many macro arguments",
+/*    ASL_MSG_UNKNOWN_DIRECTIVE */          "Unknown directive",
+/*    ASL_MSG_UNKNOWN_PRAGMA */             "Unknown pragma",
+/*    ASL_MSG_WARNING_DIRECTIVE */          "#warning"
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeDecodeMessageId
+ *
+ * PARAMETERS:  MessageId               - ASL message ID (exception code) to be
+ *                                        formatted. Possibly fully encoded.
+ *
+ * RETURN:      A string containing the exception message text.
+ *
+ * DESCRIPTION: This function validates and translates an ASL message ID into
+ *              an ASCII string.
+ *
+ ******************************************************************************/
+
+const char *
+AeDecodeMessageId (
+    UINT16                  MessageId)
+{
+    UINT32                  Index;
+    const char              **MessageTable;
+
+
+    /* Main ASL Compiler messages */
+
+    if (MessageId <= ASL_MSG_MAIN_COMPILER_END)
+    {
+        MessageTable = AslCompilerMsgs;
+        Index = MessageId;
+
+        if (Index >= ACPI_ARRAY_LENGTH (AslCompilerMsgs))
+        {
+            return ("[Unknown ASL Compiler exception ID]");
+        }
+    }
+
+    /* Data Table Compiler messages */
+
+    else if (MessageId <= ASL_MSG_TABLE_COMPILER_END)
+    {
+        MessageTable = AslTableCompilerMsgs;
+        Index = MessageId - ASL_MSG_TABLE_COMPILER;
+
+        if (Index >= ACPI_ARRAY_LENGTH (AslTableCompilerMsgs))
+        {
+            return ("[Unknown Table Compiler exception ID]");
+        }
+    }
+
+    /* Preprocessor messages */
+
+    else if (MessageId <= ASL_MSG_PREPROCESSOR_END)
+    {
+        MessageTable = AslPreprocessorMsgs;
+        Index = MessageId - ASL_MSG_PREPROCESSOR;
+
+        if (Index >= ACPI_ARRAY_LENGTH (AslPreprocessorMsgs))
+        {
+            return ("[Unknown Preprocesor exception ID]");
+        }
+    }
+
+    /* Everything else is unknown */
+
+    else
+    {
+        return ("[Unknown exception/component ID]");
+    }
+
+    return (MessageTable[Index]);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeDecodeExceptionLevel
+ *
+ * PARAMETERS:  Level               - The ASL error level to be decoded
+ *
+ * RETURN:      A string containing the error level text
+ *
+ * DESCRIPTION: This function validates and translates an ASL error level into
+ *              an ASCII string.
+ *
+ ******************************************************************************/
+
+const char *
+AeDecodeExceptionLevel (
+    UINT8                   Level)
+{
+    /* Range check on Level */
+
+    if (Level >= ACPI_ARRAY_LENGTH (AslErrorLevel))
+    {
+        return ("Unknown exception level");
+    }
+
+    /* Differentiate the string type to be used (IDE is all lower case) */
+
+    if (Gbl_VerboseErrors)
+    {
+        return (AslErrorLevel[Level]);
+    }
+
+    return (AslErrorLevelIde[Level]);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeBuildFullExceptionCode
+ *
+ * PARAMETERS:  Level               - ASL error level
+ *              MessageId           - ASL exception code to be formatted
+ *
+ * RETURN:      Fully encoded exception code
+ *
+ * DESCRIPTION: Build the full exception code from the error level and the
+ *              actual message ID.
+ *
+ ******************************************************************************/
+
+UINT16
+AeBuildFullExceptionCode (
+    UINT8                   Level,
+    UINT16                  MessageId)
+{
+
+    /*
+     * Error level is in the thousands slot (error/warning/remark, etc.)
+     * Error codes are 0 - 999
+     */
+    return (((Level + 1) * 1000) + MessageId);
+}
diff --git a/sys/contrib/dev/acpica/compiler/aslmessages.h b/sys/contrib/dev/acpica/compiler/aslmessages.h
index 9fb7229c44e9..ba0c22b1d297 100644
--- a/sys/contrib/dev/acpica/compiler/aslmessages.h
+++ b/sys/contrib/dev/acpica/compiler/aslmessages.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,11 +41,12 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ASLMESSAGES_H
 #define __ASLMESSAGES_H
 
 
+/* These values must match error type string tables in aslmessages.c */
+
 typedef enum
 {
     ASL_OPTIMIZATION = 0,
@@ -58,43 +59,41 @@ typedef enum
 
 } ASL_MESSAGE_TYPES;
 
-#ifdef ASL_EXCEPTIONS
 
-/* Strings for message reporting levels, must match values above */
-
-const char              *AslErrorLevel [ASL_NUM_REPORT_LEVELS] = {
-    "Optimize",
-    "Remark  ",
-    "Warning ",
-    "Warning ",
-    "Warning ",
-    "Error   "
-};
-
-/* All lowercase versions for IDEs */
-
-const char              *AslErrorLevelIde [ASL_NUM_REPORT_LEVELS] = {
-    "optimize",
-    "remark  ",
-    "warning ",
-    "warning ",
-    "warning ",
-    "error   "
-};
-
-#define ASL_ERROR_LEVEL_LENGTH          8       /* Length of strings above */
-#endif
+#define ASL_ERROR_LEVEL_LENGTH          8 /* Length of strings for types above */
 
 /*
- * Values for all compiler messages.
+ * Exception code blocks, 0 - 999
+ * Available for new exception blocks: 600 - 999
+ */
+#define ASL_MSG_MAIN_COMPILER           0       /* 0 - 299 */
+#define ASL_MSG_MAIN_COMPILER_END       299
+
+#define ASL_MSG_TABLE_COMPILER          300     /* 300 - 499 */
+#define ASL_MSG_TABLE_COMPILER_END      499
+
+#define ASL_MSG_PREPROCESSOR            500     /* 500 - 599 */
+#define ASL_MSG_PREPROCESSOR_END        599
+
+
+/*
+ * Values (message IDs) for all compiler messages. There are currently
+ * three distinct blocks of error messages (so that they can be expanded
+ * individually):
+ *      Main ASL compiler
+ *      Data Table compiler
+ *      Preprocessor
  *
- * NOTE: With the introduction of the -vw option to disable specific messages,
- * new messages should only be added to the end of this list, so that values
- * for existing messages are not disturbed.
+ * NOTE1: This list must match the tables of message strings in the file
+ * aslmessages.c exactly.
+ *
+ * NOTE2: With the introduction of the -vw option to disable specific
+ * messages, new messages should only be added to the end of these
+ * lists, so that values for existing messages are not disturbed.
  */
 typedef enum
 {
-    ASL_MSG_RESERVED = 0,
+    ASL_MSG_RESERVED = ASL_MSG_MAIN_COMPILER,
 
     ASL_MSG_ALIGNMENT,
     ASL_MSG_ALPHANUMERIC_STRING,
@@ -236,23 +235,13 @@ typedef enum
     ASL_MSG_WRITE,
     ASL_MSG_RANGE,
     ASL_MSG_BUFFER_ALLOCATION,
+    ASL_MSG_MISSING_DEPENDENCY,
+    ASL_MSG_ILLEGAL_FORWARD_REF,
+    ASL_MSG_ILLEGAL_METHOD_REF,
 
-    /* These messages are used by the Preprocessor only */
+    /* These messages are used by the Data Table compiler only */
 
-    ASL_MSG_DIRECTIVE_SYNTAX,
-    ASL_MSG_ENDIF_MISMATCH,
-    ASL_MSG_ERROR_DIRECTIVE,
-    ASL_MSG_EXISTING_NAME,
-    ASL_MSG_INVALID_INVOCATION,
-    ASL_MSG_MACRO_SYNTAX,
-    ASL_MSG_TOO_MANY_ARGUMENTS,
-    ASL_MSG_UNKNOWN_DIRECTIVE,
-    ASL_MSG_UNKNOWN_PRAGMA,
-    ASL_MSG_WARNING_DIRECTIVE,
-
-    /* These messages are used by the data table compiler only */
-
-    ASL_MSG_BUFFER_ELEMENT,
+    ASL_MSG_BUFFER_ELEMENT = ASL_MSG_TABLE_COMPILER,
     ASL_MSG_DIVIDE_BY_ZERO,
     ASL_MSG_FLAG_VALUE,
     ASL_MSG_INTEGER_SIZE,
@@ -264,194 +253,22 @@ typedef enum
     ASL_MSG_UNKNOWN_LABEL,
     ASL_MSG_UNKNOWN_SUBTABLE,
     ASL_MSG_UNKNOWN_TABLE,
-    ASL_MSG_ZERO_VALUE
+    ASL_MSG_ZERO_VALUE,
+
+    /* These messages are used by the Preprocessor only */
+
+    ASL_MSG_DIRECTIVE_SYNTAX = ASL_MSG_PREPROCESSOR,
+    ASL_MSG_ENDIF_MISMATCH,
+    ASL_MSG_ERROR_DIRECTIVE,
+    ASL_MSG_EXISTING_NAME,
+    ASL_MSG_INVALID_INVOCATION,
+    ASL_MSG_MACRO_SYNTAX,
+    ASL_MSG_TOO_MANY_ARGUMENTS,
+    ASL_MSG_UNKNOWN_DIRECTIVE,
+    ASL_MSG_UNKNOWN_PRAGMA,
+    ASL_MSG_WARNING_DIRECTIVE,
 
 } ASL_MESSAGE_IDS;
 
 
-#ifdef ASL_EXCEPTIONS
-
-/*
- * Actual message strings for each compiler message.
- *
- * NOTE: With the introduction of the -vw option to disable specific messages,
- * new messages should only be added to the end of this list, so that values
- * for existing messages are not disturbed.
- */
-char                        *AslMessages [] =
-{
-/*    The zeroth message is reserved */    "",
-/*    ASL_MSG_ALIGNMENT */                  "Must be a multiple of alignment/granularity value",
-/*    ASL_MSG_ALPHANUMERIC_STRING */        "String must be entirely alphanumeric",
-/*    ASL_MSG_AML_NOT_IMPLEMENTED */        "Opcode is not implemented in compiler AML code generator",
-/*    ASL_MSG_ARG_COUNT_HI */               "Too many arguments",
-/*    ASL_MSG_ARG_COUNT_LO */               "Too few arguments",
-/*    ASL_MSG_ARG_INIT */                   "Method argument is not initialized",
-/*    ASL_MSG_BACKWARDS_OFFSET */           "Invalid backwards offset",
-/*    ASL_MSG_BUFFER_LENGTH */              "Effective AML buffer length is zero",
-/*    ASL_MSG_CLOSE */                      "Could not close file",
-/*    ASL_MSG_COMPILER_INTERNAL */          "Internal compiler error",
-/*    ASL_MSG_COMPILER_RESERVED */          "Use of compiler reserved name",
-/*    ASL_MSG_CONNECTION_MISSING */         "A Connection operator is required for this field SpaceId",
-/*    ASL_MSG_CONNECTION_INVALID */         "Invalid OpRegion SpaceId for use of Connection operator",
-/*    ASL_MSG_CONSTANT_EVALUATION */        "Could not evaluate constant expression",
-/*    ASL_MSG_CONSTANT_FOLDED */            "Constant expression evaluated and reduced",
-/*    ASL_MSG_CORE_EXCEPTION */             "From ACPI CA Subsystem",
-/*    ASL_MSG_DEBUG_FILE_OPEN */            "Could not open debug file",
-/*    ASL_MSG_DEBUG_FILENAME */             "Could not create debug filename",
-/*    ASL_MSG_DEPENDENT_NESTING */          "Dependent function macros cannot be nested",\
-/*    ASL_MSG_DMA_CHANNEL */                "Invalid DMA channel (must be 0-7)",
-/*    ASL_MSG_DMA_LIST */                   "Too many DMA channels (8 max)",
-/*    ASL_MSG_DUPLICATE_CASE */             "Case value already specified",
-/*    ASL_MSG_DUPLICATE_ITEM */             "Duplicate value in list",
-/*    ASL_MSG_EARLY_EOF */                  "Premature end-of-file reached",
-/*    ASL_MSG_ENCODING_LENGTH */            "Package length too long to encode",
-/*    ASL_MSG_EX_INTERRUPT_LIST */          "Too many interrupts (255 max)",
-/*    ASL_MSG_EX_INTERRUPT_LIST_MIN */      "Too few interrupts (1 minimum required)",
-/*    ASL_MSG_EX_INTERRUPT_NUMBER */        "Invalid interrupt number (must be 32 bits)",
-/*    ASL_MSG_FIELD_ACCESS_WIDTH */         "Access width is greater than region size",
-/*    ASL_MSG_FIELD_UNIT_ACCESS_WIDTH */    "Access width of Field Unit extends beyond region limit",
-/*    ASL_MSG_FIELD_UNIT_OFFSET */          "Field Unit extends beyond region limit",
-/*    ASL_MSG_GPE_NAME_CONFLICT */          "Name conflicts with a previous GPE method",
-/*    ASL_MSG_HID_LENGTH */                 "_HID string must be exactly 7 or 8 characters",
-/*    ASL_MSG_HID_PREFIX */                 "_HID prefix must be all uppercase or decimal digits",
-/*    ASL_MSG_HID_SUFFIX */                 "_HID suffix must be all hex digits",
-/*    ASL_MSG_INCLUDE_FILE_OPEN */          "Could not open include file",
-/*    ASL_MSG_INPUT_FILE_OPEN */            "Could not open input file",
-/*    ASL_MSG_INTEGER_LENGTH */             "64-bit integer in 32-bit table, truncating (DSDT version < 2)",
-/*    ASL_MSG_INTEGER_OPTIMIZATION */       "Integer optimized to single-byte AML opcode",
-/*    ASL_MSG_INTERRUPT_LIST */             "Too many interrupts (16 max)",
-/*    ASL_MSG_INTERRUPT_NUMBER */           "Invalid interrupt number (must be 0-15)",
-/*    ASL_MSG_INVALID_ACCESS_SIZE */        "Invalid AccessSize (Maximum is 4 - QWord access)",
-/*    ASL_MSG_INVALID_ADDR_FLAGS */         "Invalid combination of Length and Min/Max fixed flags",
-/*    ASL_MSG_INVALID_CONSTANT_OP */        "Invalid operator in constant expression (not type 3/4/5)",
-/*    ASL_MSG_INVALID_EISAID */             "EISAID string must be of the form \"UUUXXXX\" (3 uppercase, 4 hex digits)",
-/*    ASL_MSG_INVALID_ESCAPE */             "Invalid or unknown escape sequence",
-/*    ASL_MSG_INVALID_GRAN_FIXED */         "Granularity must be zero for fixed Min/Max",
-/*    ASL_MSG_INVALID_GRANULARITY */        "Granularity must be zero or a power of two minus one",
-/*    ASL_MSG_INVALID_LENGTH */             "Length is larger than Min/Max window",
-/*    ASL_MSG_INVALID_LENGTH_FIXED */       "Length is not equal to fixed Min/Max window",
-/*    ASL_MSG_INVALID_MIN_MAX */            "Address Min is greater than Address Max",
-/*    ASL_MSG_INVALID_OPERAND */            "Invalid operand",
-/*    ASL_MSG_INVALID_PERFORMANCE */        "Invalid performance/robustness value",
-/*    ASL_MSG_INVALID_PRIORITY */           "Invalid priority value",
-/*    ASL_MSG_INVALID_STRING */             "Invalid Hex/Octal Escape - Non-ASCII or NULL",
-/*    ASL_MSG_INVALID_TARGET */             "Target operand not allowed in constant expression",
-/*    ASL_MSG_INVALID_TIME */               "Time parameter too long (255 max)",
-/*    ASL_MSG_INVALID_TYPE */               "Invalid type",
-/*    ASL_MSG_INVALID_UUID */               "UUID string must be of the form \"aabbccdd-eeff-gghh-iijj-kkllmmnnoopp\"",
-/*    ASL_MSG_ISA_ADDRESS */                "Maximum 10-bit ISA address (0x3FF)",
-/*    ASL_MSG_LEADING_ASTERISK */           "Invalid leading asterisk",
-/*    ASL_MSG_LIST_LENGTH_LONG */           "Initializer list longer than declared package length",
-/*    ASL_MSG_LIST_LENGTH_SHORT */          "Initializer list shorter than declared package length",
-/*    ASL_MSG_LISTING_FILE_OPEN */          "Could not open listing file",
-/*    ASL_MSG_LISTING_FILENAME */           "Could not create listing filename",
-/*    ASL_MSG_LOCAL_INIT */                 "Method local variable is not initialized",
-/*    ASL_MSG_LOCAL_OUTSIDE_METHOD */       "Local or Arg used outside a control method",
-/*    ASL_MSG_LONG_LINE */                  "Splitting long input line",
-/*    ASL_MSG_MEMORY_ALLOCATION */          "Memory allocation failure",
-/*    ASL_MSG_MISSING_ENDDEPENDENT */       "Missing EndDependentFn() macro in dependent resource list",
-/*    ASL_MSG_MISSING_STARTDEPENDENT */     "Missing StartDependentFn() macro in dependent resource list",
-/*    ASL_MSG_MULTIPLE_DEFAULT */           "More than one Default statement within Switch construct",
-/*    ASL_MSG_MULTIPLE_TYPES */             "Multiple types",
-/*    ASL_MSG_NAME_EXISTS */                "Name already exists in scope",
-/*    ASL_MSG_NAME_OPTIMIZATION */          "NamePath optimized",
-/*    ASL_MSG_NAMED_OBJECT_IN_WHILE */      "Creating a named object in a While loop",
-/*    ASL_MSG_NESTED_COMMENT */             "Nested comment found",
-/*    ASL_MSG_NO_CASES */                   "No Case statements under Switch",
-/*    ASL_MSG_NO_REGION */                  "_REG has no corresponding Operation Region",
-/*    ASL_MSG_NO_RETVAL */                  "Called method returns no value",
-/*    ASL_MSG_NO_WHILE */                   "No enclosing While statement",
-/*    ASL_MSG_NON_ASCII */                  "Invalid characters found in file",
-/*    ASL_MSG_NON_ZERO */                   "Operand evaluates to zero",
-/*    ASL_MSG_NOT_EXIST */                  "Object does not exist",
-/*    ASL_MSG_NOT_FOUND */                  "Object not found or not accessible from scope",
-/*    ASL_MSG_NOT_METHOD */                 "Not a control method, cannot invoke",
-/*    ASL_MSG_NOT_PARAMETER */              "Not a parameter, used as local only",
-/*    ASL_MSG_NOT_REACHABLE */              "Object is not accessible from this scope",
-/*    ASL_MSG_NOT_REFERENCED */             "Namespace object is not referenced",
-/*    ASL_MSG_NULL_DESCRIPTOR */            "Min/Max/Length/Gran are all zero, but no resource tag",
-/*    ASL_MSG_NULL_STRING */                "Invalid zero-length (null) string",
-/*    ASL_MSG_OPEN */                       "Could not open file",
-/*    ASL_MSG_OUTPUT_FILE_OPEN */           "Could not open output AML file",
-/*    ASL_MSG_OUTPUT_FILENAME */            "Could not create output filename",
-/*    ASL_MSG_PACKAGE_LENGTH */             "Effective AML package length is zero",
-/*    ASL_MSG_PREPROCESSOR_FILENAME */      "Could not create preprocessor filename",
-/*    ASL_MSG_READ */                       "Could not read file",
-/*    ASL_MSG_RECURSION */                  "Recursive method call",
-/*    ASL_MSG_REGION_BUFFER_ACCESS */       "Host Operation Region requires BufferAcc access",
-/*    ASL_MSG_REGION_BYTE_ACCESS */         "Host Operation Region requires ByteAcc access",
-/*    ASL_MSG_RESERVED_ARG_COUNT_HI */      "Reserved method has too many arguments",
-/*    ASL_MSG_RESERVED_ARG_COUNT_LO */      "Reserved method has too few arguments",
-/*    ASL_MSG_RESERVED_METHOD */            "Reserved name must be a control method",
-/*    ASL_MSG_RESERVED_NO_RETURN_VAL */     "Reserved method should not return a value",
-/*    ASL_MSG_RESERVED_OPERAND_TYPE */      "Invalid object type for reserved name",
-/*    ASL_MSG_RESERVED_PACKAGE_LENGTH */    "Invalid package length for reserved name",
-/*    ASL_MSG_RESERVED_RETURN_VALUE */      "Reserved method must return a value",
-/*    ASL_MSG_RESERVED_USE */               "Invalid use of reserved name",
-/*    ASL_MSG_RESERVED_WORD */              "Use of reserved name",
-/*    ASL_MSG_RESOURCE_FIELD */             "Resource field name cannot be used as a target",
-/*    ASL_MSG_RESOURCE_INDEX */             "Missing ResourceSourceIndex (required)",
-/*    ASL_MSG_RESOURCE_LIST */              "Too many resource items (internal error)",
-/*    ASL_MSG_RESOURCE_SOURCE */            "Missing ResourceSource string (required)",
-/*    ASL_MSG_RESULT_NOT_USED */            "Result is not used, operator has no effect",
-/*    ASL_MSG_RETURN_TYPES */               "Not all control paths return a value",
-/*    ASL_MSG_SCOPE_FWD_REF */              "Forward references from Scope operator not allowed",
-/*    ASL_MSG_SCOPE_TYPE */                 "Existing object has invalid type for Scope operator",
-/*    ASL_MSG_SEEK */                       "Could not seek file",
-/*    ASL_MSG_SERIALIZED */                 "Control Method marked Serialized",
-/*    ASL_MSG_SERIALIZED_REQUIRED */        "Control Method should be made Serialized",
-/*    ASL_MSG_SINGLE_NAME_OPTIMIZATION */   "NamePath optimized to NameSeg (uses run-time search path)",
-/*    ASL_MSG_SOME_NO_RETVAL */             "Called method may not always return a value",
-/*    ASL_MSG_STRING_LENGTH */              "String literal too long",
-/*    ASL_MSG_SWITCH_TYPE */                "Switch expression is not a static Integer/Buffer/String data type, defaulting to Integer",
-/*    ASL_MSG_SYNC_LEVEL */                 "SyncLevel must be in the range 0-15",
-/*    ASL_MSG_SYNTAX */                     "",
-/*    ASL_MSG_TABLE_SIGNATURE */            "Invalid Table Signature",
-/*    ASL_MSG_TAG_LARGER */                 "ResourceTag larger than Field",
-/*    ASL_MSG_TAG_SMALLER */                "ResourceTag smaller than Field",
-/*    ASL_MSG_TIMEOUT */                    "Result is not used, possible operator timeout will be missed",
-/*    ASL_MSG_TOO_MANY_TEMPS */             "Method requires too many temporary variables (_T_x)",
-/*    ASL_MSG_TRUNCATION */                 "64-bit return value will be truncated to 32 bits (DSDT version < 2)",
-/*    ASL_MSG_UNKNOWN_RESERVED_NAME */      "Unknown reserved name",
-/*    ASL_MSG_UNREACHABLE_CODE */           "Statement is unreachable",
-/*    ASL_MSG_UNSUPPORTED */                "Unsupported feature",
-/*    ASL_MSG_UPPER_CASE */                 "Non-hex letters must be upper case",
-/*    ASL_MSG_VENDOR_LIST */                "Too many vendor data bytes (7 max)",
-/*    ASL_MSG_WRITE */                      "Could not write file",
-/*    ASL_MSG_RANGE */                      "Constant out of range",
-/*    ASL_MSG_BUFFER_ALLOCATION */          "Could not allocate line buffer",
-
-/* Preprocessor */
-
-/*    ASL_MSG_DIRECTIVE_SYNTAX */           "Invalid directive syntax",
-/*    ASL_MSG_ENDIF_MISMATCH */             "Mismatched #endif",
-/*    ASL_MSG_ERROR_DIRECTIVE */            "#error",
-/*    ASL_MSG_EXISTING_NAME */              "Name is already defined",
-/*    ASL_MSG_INVALID_INVOCATION */         "Invalid macro invocation",
-/*    ASL_MSG_MACRO_SYNTAX */               "Invalid macro syntax",
-/*    ASL_MSG_TOO_MANY_ARGUMENTS */         "Too many macro arguments",
-/*    ASL_MSG_UNKNOWN_DIRECTIVE */          "Unknown directive",
-/*    ASL_MSG_UNKNOWN_PRAGMA */             "Unknown pragma",
-/*    ASL_MSG_WARNING_DIRECTIVE */          "#warning",
-
-/* Table compiler */
-
-/*    ASL_MSG_BUFFER_ELEMENT */             "Invalid element in buffer initializer list",
-/*    ASL_MSG_DIVIDE_BY_ZERO */             "Expression contains divide-by-zero",
-/*    ASL_MSG_FLAG_VALUE */                 "Flag value is too large",
-/*    ASL_MSG_INTEGER_SIZE */               "Integer too large for target",
-/*    ASL_MSG_INVALID_EXPRESSION */         "Invalid expression",
-/*    ASL_MSG_INVALID_FIELD_NAME */         "Invalid Field Name",
-/*    ASL_MSG_INVALID_HEX_INTEGER */        "Invalid hex integer constant",
-/*    ASL_MSG_OEM_TABLE */                  "OEM table - unknown contents",
-/*    ASL_MSG_RESERVED_VALUE */             "Reserved field must be zero",
-/*    ASL_MSG_UNKNOWN_LABEL */              "Label is undefined",
-/*    ASL_MSG_UNKNOWN_SUBTABLE */           "Unknown subtable type",
-/*    ASL_MSG_UNKNOWN_TABLE */              "Unknown ACPI table signature",
-/*    ASL_MSG_ZERO_VALUE */                 "Value must be non-zero"
-};
-
-#endif  /* ASL_EXCEPTIONS */
-
 #endif  /* __ASLMESSAGES_H */
diff --git a/sys/contrib/dev/acpica/compiler/aslmethod.c b/sys/contrib/dev/acpica/compiler/aslmethod.c
index 72f76477fc64..4e8535110d95 100644
--- a/sys/contrib/dev/acpica/compiler/aslmethod.c
+++ b/sys/contrib/dev/acpica/compiler/aslmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acparser.h>
@@ -108,7 +107,42 @@ MtMethodAnalysisWalkBegin (
 
         WalkInfo->MethodStack = MethodInfo;
 
-        /* Get the name node, ignored here */
+        /*
+         * Special handling for _PSx methods. Dependency rules (same scope):
+         *
+         * 1) _PS0 - One of these must exist: _PS1, _PS2, _PS3
+         * 2) _PS1/_PS2/_PS3: A _PS0 must exist
+         */
+        if (ACPI_COMPARE_NAME (METHOD_NAME__PS0, Op->Asl.NameSeg))
+        {
+            /* For _PS0, one of _PS1/_PS2/_PS3 must exist */
+
+            if ((!ApFindNameInScope (METHOD_NAME__PS1, Op)) &&
+                (!ApFindNameInScope (METHOD_NAME__PS2, Op)) &&
+                (!ApFindNameInScope (METHOD_NAME__PS3, Op)))
+            {
+                AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
+                    "_PS0 requires one of _PS1/_PS2/_PS3 in same scope");
+            }
+        }
+        else if (
+            ACPI_COMPARE_NAME (METHOD_NAME__PS1, Op->Asl.NameSeg) ||
+            ACPI_COMPARE_NAME (METHOD_NAME__PS2, Op->Asl.NameSeg) ||
+            ACPI_COMPARE_NAME (METHOD_NAME__PS3, Op->Asl.NameSeg))
+        {
+            /* For _PS1/_PS2/_PS3, a _PS0 must exist */
+
+            if (!ApFindNameInScope (METHOD_NAME__PS0, Op))
+            {
+                sprintf (MsgBuffer,
+                    "%4.4s requires _PS0 in same scope", Op->Asl.NameSeg);
+
+                AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
+                    MsgBuffer);
+            }
+        }
+
+        /* Get the name node */
 
         Next = Op->Asl.Child;
 
@@ -359,6 +393,17 @@ MtMethodAnalysisWalkBegin (
         break;
 
     case PARSEOP_DEVICE:
+
+        Next = Op->Asl.Child;
+
+        if (!ApFindNameInScope (METHOD_NAME__HID, Next) &&
+            !ApFindNameInScope (METHOD_NAME__ADR, Next))
+        {
+            AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
+                "Device object requires a _HID or _ADR in same scope");
+        }
+        break;
+
     case PARSEOP_EVENT:
     case PARSEOP_MUTEX:
     case PARSEOP_OPERATIONREGION:
@@ -412,6 +457,7 @@ MtMethodAnalysisWalkBegin (
                 AnCheckId (Next, ASL_TYPE_CID);
             }
         }
+
         break;
 
     default:
diff --git a/sys/contrib/dev/acpica/compiler/aslnamesp.c b/sys/contrib/dev/acpica/compiler/aslnamesp.c
index e7ad672c60cb..550c730bf5d0 100644
--- a/sys/contrib/dev/acpica/compiler/aslnamesp.c
+++ b/sys/contrib/dev/acpica/compiler/aslnamesp.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acnamesp.h>
diff --git a/sys/contrib/dev/acpica/compiler/asloffset.c b/sys/contrib/dev/acpica/compiler/asloffset.c
index 390a118d4661..cbe69b21f306 100644
--- a/sys/contrib/dev/acpica/compiler/asloffset.c
+++ b/sys/contrib/dev/acpica/compiler/asloffset.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/aslopcodes.c b/sys/contrib/dev/acpica/compiler/aslopcodes.c
index 6d39da927f89..76e2b058eeaa 100644
--- a/sys/contrib/dev/acpica/compiler/aslopcodes.c
+++ b/sys/contrib/dev/acpica/compiler/aslopcodes.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -403,6 +402,7 @@ OpcDoConnection (
     ACPI_PARSE_OBJECT       *BufferOp;
     ACPI_PARSE_OBJECT       *BufferLengthOp;
     ACPI_PARSE_OBJECT       *BufferDataOp;
+    ASL_RESOURCE_INFO       Info;
     UINT8                   State;
 
 
@@ -417,8 +417,10 @@ OpcDoConnection (
     BufferLengthOp = BufferOp->Asl.Child;
     BufferDataOp = BufferLengthOp->Asl.Next;
 
+    Info.DescriptorTypeOp = BufferDataOp->Asl.Next;
+    Info.CurrentByteOffset = 0;
     State = ACPI_RSTATE_NORMAL;
-    Rnode = RsDoOneResourceDescriptor (BufferDataOp->Asl.Next, 0, &State);
+    Rnode = RsDoOneResourceDescriptor (&Info, &State);
     if (!Rnode)
     {
         return; /* error */
@@ -623,10 +625,10 @@ OpcDoEisaId (
             (UINT32) ((UINT8) (InString[1] - 0x40)) << 21 |
             (UINT32) ((UINT8) (InString[2] - 0x40)) << 16 |
 
-            (UtHexCharToValue (InString[3])) << 12 |
-            (UtHexCharToValue (InString[4])) << 8  |
-            (UtHexCharToValue (InString[5])) << 4  |
-             UtHexCharToValue (InString[6]);
+            (AcpiUtAsciiCharToHex (InString[3])) << 12 |
+            (AcpiUtAsciiCharToHex (InString[4])) << 8  |
+            (AcpiUtAsciiCharToHex (InString[5])) << 4  |
+             AcpiUtAsciiCharToHex (InString[6]);
 
         /* Swap to little-endian to get final ID (see function header) */
 
@@ -666,7 +668,7 @@ OpcDoUuId (
     ACPI_PARSE_OBJECT       *Op)
 {
     char                    *InString;
-    char                    *Buffer;
+    UINT8                   *Buffer;
     ACPI_STATUS             Status = AE_OK;
     ACPI_PARSE_OBJECT       *NewOp;
 
@@ -681,7 +683,7 @@ OpcDoUuId (
     }
     else
     {
-        (void) AuConvertStringToUuid (InString, Buffer);
+        AcpiUtConvertStringToUuid (InString, Buffer);
     }
 
     /* Change Op to a Buffer */
diff --git a/sys/contrib/dev/acpica/compiler/asloperands.c b/sys/contrib/dev/acpica/compiler/asloperands.c
index 07bf88fa335f..8c6bfbd6f492 100644
--- a/sys/contrib/dev/acpica/compiler/asloperands.c
+++ b/sys/contrib/dev/acpica/compiler/asloperands.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -913,8 +912,8 @@ OpnDoDefinitionBlock (
          * We will use the AML filename that is embedded in the source file
          * for the output filename.
          */
-        Filename = ACPI_ALLOCATE (strlen (Gbl_DirectoryPath) +
-                    strlen ((char *) Child->Asl.Value.Buffer) + 1);
+        Filename = UtStringCacheCalloc (strlen (Gbl_DirectoryPath) +
+            strlen ((char *) Child->Asl.Value.Buffer) + 1);
 
         /* Prepend the current directory path */
 
@@ -922,6 +921,7 @@ OpnDoDefinitionBlock (
         strcat (Filename, (char *) Child->Asl.Value.Buffer);
 
         Gbl_OutputFilenamePrefix = Filename;
+        UtConvertBackslashes (Gbl_OutputFilenamePrefix);
     }
     Child->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG;
 
@@ -968,7 +968,7 @@ OpnDoDefinitionBlock (
     if (Child->Asl.Value.String)
     {
         Length = ACPI_STRLEN (Child->Asl.Value.String);
-        Gbl_TableId = AcpiOsAllocate (Length + 1);
+        Gbl_TableId = UtStringCacheCalloc (Length + 1);
         ACPI_STRCPY (Gbl_TableId, Child->Asl.Value.String);
 
         /*
diff --git a/sys/contrib/dev/acpica/compiler/aslopt.c b/sys/contrib/dev/acpica/compiler/aslopt.c
index 3471006748e5..8e632925b230 100644
--- a/sys/contrib/dev/acpica/compiler/aslopt.c
+++ b/sys/contrib/dev/acpica/compiler/aslopt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -168,7 +167,7 @@ OptSearchToRoot (
 
     /* We must allocate a new string for the name (TargetPath gets deleted) */
 
-    *NewPath = ACPI_ALLOCATE_ZEROED (ACPI_NAME_SIZE + 1);
+    *NewPath = UtStringCacheCalloc (ACPI_NAME_SIZE + 1);
     ACPI_STRCPY (*NewPath, Path);
 
     if (ACPI_STRNCMP (*NewPath, "_T_", 3))
@@ -576,7 +575,8 @@ OptOptimizeNamePath (
         return_VOID;
     }
 
-    ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "%5d [%12.12s] [%12.12s] ",
+    ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
+        "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
         Op->Asl.LogicalLineNumber,
         AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
         AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
@@ -620,7 +620,7 @@ OptOptimizeNamePath (
     {
         /* This is the declaration of a new name */
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "NAME"));
+        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "NAME\n"));
 
         /*
          * The node of interest is the parent of this node (the containing
@@ -646,7 +646,7 @@ OptOptimizeNamePath (
     {
         /* This is a reference to an existing named object */
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "REF "));
+        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "REFERENCE\n"));
     }
 
     /*
@@ -688,9 +688,10 @@ OptOptimizeNamePath (
     }
 
     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
-        "%37s (%2u) ==> %-32s(%2u) %-32s",
-        (char *) CurrentPath.Pointer, (UINT32) CurrentPath.Length,
-        (char *) TargetPath.Pointer, (UINT32) TargetPath.Length, ExternalNameString));
+        "CURRENT SCOPE: (%2u) %-37s FULL PATH TO NAME: (%2u) %-32s ACTUAL AML:%-32s\n",
+        (UINT32) CurrentPath.Length, (char *) CurrentPath.Pointer,
+        (UINT32) TargetPath.Length, (char *) TargetPath.Pointer,
+        ExternalNameString));
 
     ACPI_FREE (ExternalNameString);
 
@@ -747,7 +748,8 @@ OptOptimizeNamePath (
         HowMuchShorter = (AmlNameStringLength - ACPI_STRLEN (NewPath));
         OptTotal += HowMuchShorter;
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, " REDUCED %2u (%u)",
+        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
+            " REDUCED BY %2u (TOTAL SAVED %2u)",
             (UINT32) HowMuchShorter, OptTotal));
 
         if (Flags & AML_NAMED)
diff --git a/sys/contrib/dev/acpica/compiler/asloptions.c b/sys/contrib/dev/acpica/compiler/asloptions.c
index 66a92493397b..9c38371281e9 100644
--- a/sys/contrib/dev/acpica/compiler/asloptions.c
+++ b/sys/contrib/dev/acpica/compiler/asloptions.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -118,8 +118,7 @@ AslCommandLine (
     /* Next parameter must be the input filename */
 
     if (!argv[AcpiGbl_Optind] &&
-        !Gbl_DisasmFlag &&
-        !Gbl_GetAllTables)
+        !Gbl_DisasmFlag)
     {
         printf ("Missing input filename\n");
         BadCommandLine = TRUE;
@@ -169,7 +168,7 @@ AslDoOptions (
 
     /* Get the command line options */
 
-    while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != EOF) switch (j)
+    while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != ACPI_OPT_END) switch (j)
     {
     case '@':   /* Begin a response file */
 
@@ -267,11 +266,22 @@ AslDoOptions (
 
     case 'e':   /* External files for disassembler */
 
-        Status = AcpiDmAddToExternalFileList (AcpiGbl_Optarg);
-        if (ACPI_FAILURE (Status))
+        /* Get entire list of external files */
+
+        AcpiGbl_Optind--;
+        argv[AcpiGbl_Optind] = AcpiGbl_Optarg;
+
+        while (argv[AcpiGbl_Optind] &&
+              (argv[AcpiGbl_Optind][0] != '-'))
         {
-            printf ("Could not add %s to external list\n", AcpiGbl_Optarg);
-            return (-1);
+            Status = AcpiDmAddToExternalFileList (argv[AcpiGbl_Optind]);
+            if (ACPI_FAILURE (Status))
+            {
+                printf ("Could not add %s to external list\n", argv[AcpiGbl_Optind]);
+                return (-1);
+            }
+
+            AcpiGbl_Optind++;
         }
         break;
 
@@ -308,9 +318,8 @@ AslDoOptions (
 
     case 'g':   /* Get all ACPI tables */
 
-        Gbl_GetAllTables = TRUE;
-        Gbl_DoCompile = FALSE;
-        break;
+        printf ("-g option is deprecated, use acpidump utility instead\n");
+        exit (1);
 
     case 'h':
 
@@ -404,6 +413,13 @@ AslDoOptions (
             Gbl_PreprocessorOutputFlag = TRUE;
             break;
 
+        case 'm':
+
+            /* Produce hardware map summary file */
+
+            Gbl_MapfileFlag = TRUE;
+            break;
+
         case 'n':
 
             /* Produce namespace file */
@@ -513,6 +529,8 @@ AslDoOptions (
     case 'p':   /* Override default AML output filename */
 
         Gbl_OutputFilenamePrefix = AcpiGbl_Optarg;
+        UtConvertBackslashes (Gbl_OutputFilenamePrefix);
+
         Gbl_UseDefaultAmlFilename = FALSE;
         break;
 
@@ -596,11 +614,19 @@ AslDoOptions (
 
         case 'a':
 
-            /* Disable All error/warning messages */
+            /* Disable all error/warning/remark messages */
 
             Gbl_NoErrors = TRUE;
             break;
 
+        case 'e':
+
+            /* Disable all warning/remark messages (errors only) */
+
+            Gbl_DisplayRemarks = FALSE;
+            Gbl_DisplayWarnings = FALSE;
+            break;
+
         case 'i':
             /*
              * Support for integrated development environment(s).
diff --git a/sys/contrib/dev/acpica/compiler/aslparser.y b/sys/contrib/dev/acpica/compiler/aslparser.y
new file mode 100644
index 000000000000..b473041ac43b
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslparser.y
@@ -0,0 +1,131 @@
+%{
+/******************************************************************************
+ *
+ * Module Name: aslparser.y - Master Bison/Yacc input file for iASL
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("aslparse")
+
+/*
+ * Global Notes:
+ *
+ * October 2005: The following list terms have been optimized (from the
+ * original ASL grammar in the ACPI specification) to force the immediate
+ * reduction of each list item so that the parse stack use doesn't increase on
+ * each list element and possibly overflow on very large lists (>4000 items).
+ * This dramatically reduces use of the parse stack overall.
+ *
+ *      ArgList, TermList, Objectlist, ByteList, DWordList, PackageList,
+ *      ResourceMacroList, and FieldUnitList
+ */
+
+void *
+AslLocalAllocate (
+    unsigned int            Size);
+
+/* Bison/yacc configuration */
+
+#define static
+#undef malloc
+#define malloc              AslLocalAllocate
+#undef alloca
+#define alloca              AslLocalAllocate
+#define yytname             AslCompilername
+
+#define YYINITDEPTH         600             /* State stack depth */
+#define YYDEBUG             1               /* Enable debug output */
+#define YYERROR_VERBOSE     1               /* Verbose error messages */
+#define YYFLAG              -32768
+
+/* Define YYMALLOC/YYFREE to prevent redefinition errors  */
+
+#define YYMALLOC            AslLocalAllocate
+#define YYFREE              ACPI_FREE
+%}
+
+/*
+ * Declare the type of values in the grammar
+ */
+%union {
+    UINT64              i;
+    char                *s;
+    ACPI_PARSE_OBJECT   *n;
+}
+
+/*
+ * These shift/reduce conflicts are expected. There should be zero
+ * reduce/reduce conflicts.
+ */
+%expect 86
+
+/*! [Begin] no source code translation */
+
+/*
+ * The M4 macro processor is used to bring in the parser items,
+ * in order to keep this master file smaller, and to break up
+ * the various parser items.
+ */
+m4_define(NoEcho)
+
+/* Token types */
+
+m4_include(asltokens.y)
+
+/* Production types/names */
+
+m4_include(asltypes.y)
+%%
+
+/* Production rules */
+
+m4_include(aslrules.y)
+%%
+
+/*! [End] no source code translation !*/
+
+/* Local support functions in C */
+
+m4_include(aslsupport.y)
diff --git a/sys/contrib/dev/acpica/compiler/aslpredef.c b/sys/contrib/dev/acpica/compiler/aslpredef.c
index 7f411fbd7155..e436f8765c88 100644
--- a/sys/contrib/dev/acpica/compiler/aslpredef.c
+++ b/sys/contrib/dev/acpica/compiler/aslpredef.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -251,10 +251,16 @@ ApCheckPredefinedReturnValue (
     const ACPI_PREDEFINED_INFO  *ThisName;
 
 
-    /* Check parent method for a match against the predefined name list */
-
+    /*
+     * Check parent method for a match against the predefined name list.
+     *
+     * Note: Disable compiler errors/warnings because any errors will be
+     * caught when analyzing the parent method. Eliminates duplicate errors.
+     */
+    Gbl_AllExceptionsDisabled = TRUE;
     Index = ApCheckForPredefinedName (MethodInfo->Op,
                 MethodInfo->Op->Asl.NameSeg);
+    Gbl_AllExceptionsDisabled = FALSE;
 
     switch (Index)
     {
diff --git a/sys/contrib/dev/acpica/compiler/aslprepkg.c b/sys/contrib/dev/acpica/compiler/aslprepkg.c
index 9cc67f421b10..174bb823500a 100644
--- a/sys/contrib/dev/acpica/compiler/aslprepkg.c
+++ b/sys/contrib/dev/acpica/compiler/aslprepkg.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,7 @@ ApCheckPackage (
     {
     case ACPI_PTYPE1_FIXED:
         /*
-         * The package count is fixed and there are no sub-packages
+         * The package count is fixed and there are no subpackages
          *
          * If package is too small, exit.
          * If package is larger than expected, issue warning but continue
@@ -194,7 +194,7 @@ ApCheckPackage (
 
     case ACPI_PTYPE1_VAR:
         /*
-         * The package count is variable, there are no sub-packages,
+         * The package count is variable, there are no subpackages,
          * and all elements must be of the same type
          */
         for (i = 0; i < Count; i++)
@@ -207,7 +207,7 @@ ApCheckPackage (
 
     case ACPI_PTYPE1_OPTION:
         /*
-         * The package count is variable, there are no sub-packages.
+         * The package count is variable, there are no subpackages.
          * There are a fixed number of required elements, and a variable
          * number of optional elements.
          *
@@ -251,7 +251,7 @@ ApCheckPackage (
         Op = Op->Asl.Next;
         Count--;
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         ApCheckPackageList (Predefined->Info.Name, Op,
             Package, 1, Count);
@@ -259,7 +259,7 @@ ApCheckPackage (
 
     case ACPI_PTYPE2_PKG_COUNT:
 
-        /* First element is the (Integer) count of sub-packages to follow */
+        /* First element is the (Integer) count of subpackages to follow */
 
         Status = ApCheckObjectType (Predefined->Info.Name, Op,
             ACPI_RTYPE_INTEGER, 0);
@@ -283,12 +283,47 @@ ApCheckPackage (
 
         Op = Op->Asl.Next;
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         ApCheckPackageList (Predefined->Info.Name, Op,
             Package, 1, Count);
         break;
 
+    case ACPI_PTYPE2_UUID_PAIR:
+
+        /* The package contains a variable list of UUID Buffer/Package pairs */
+
+        /* The length of the package must be even */
+
+        if (Count & 1)
+        {
+            sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.",
+                Predefined->Info.Name, Count);
+
+            AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
+                ParentOp->Asl.Child, MsgBuffer);
+        }
+
+        /* Validate the alternating types */
+
+        for (i = 0; i < Count; ++i)
+        {
+            if (i & 1)
+            {
+                ApCheckObjectType (Predefined->Info.Name, Op,
+                    Package->RetInfo.ObjectType2, i);
+            }
+            else
+            {
+                ApCheckObjectType (Predefined->Info.Name, Op,
+                    Package->RetInfo.ObjectType1, i);
+            }
+
+            Op = Op->Asl.Next;
+        }
+
+        break;
+
     case ACPI_PTYPE2:
     case ACPI_PTYPE2_FIXED:
     case ACPI_PTYPE2_MIN:
@@ -296,10 +331,10 @@ ApCheckPackage (
     case ACPI_PTYPE2_FIX_VAR:
         /*
          * These types all return a single Package that consists of a
-         * variable number of sub-Packages.
+         * variable number of subpackages.
          */
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         ApCheckPackageList (Predefined->Info.Name, Op,
             Package, 0, Count);
@@ -467,6 +502,12 @@ ApCheckPackageList (
                     Count, ExpectedCount);
                 break;
             }
+            if (Count > ExpectedCount)
+            {
+                ApPackageTooLarge (PredefinedName, SubPackageOp,
+                    Count, ExpectedCount);
+                break;
+            }
 
             ApCheckPackageElements (PredefinedName, Op,
                 Package->RetInfo.ObjectType1, Package->RetInfo.Count1,
@@ -494,7 +535,7 @@ ApCheckPackageList (
 
         case ACPI_PTYPE2_FIXED:
 
-            /* Each sub-package has a fixed length */
+            /* Each subpackage has a fixed length */
 
             ExpectedCount = Package->RetInfo2.Count;
             if (Count < ExpectedCount)
@@ -503,6 +544,12 @@ ApCheckPackageList (
                     Count, ExpectedCount);
                 break;
             }
+            if (Count > ExpectedCount)
+            {
+                ApPackageTooLarge (PredefinedName, SubPackageOp,
+                    Count, ExpectedCount);
+                break;
+            }
 
             /* Check each object/type combination */
 
@@ -517,7 +564,7 @@ ApCheckPackageList (
 
         case ACPI_PTYPE2_MIN:
 
-            /* Each sub-package has a variable but minimum length */
+            /* Each subpackage has a variable but minimum length */
 
             ExpectedCount = Package->RetInfo.Count1;
             if (Count < ExpectedCount)
@@ -527,7 +574,7 @@ ApCheckPackageList (
                 break;
             }
 
-            /* Check the type of each sub-package element */
+            /* Check the type of each subpackage element */
 
             ApCheckPackageElements (PredefinedName, Op,
                 Package->RetInfo.ObjectType1, Count, 0, 0);
@@ -576,7 +623,7 @@ ApCheckPackageList (
                 Count = ExpectedCount;
             }
 
-            /* Check the type of each sub-package element */
+            /* Check the type of each subpackage element */
 
             Op = Op->Asl.Next;
             ApCheckPackageElements (PredefinedName, Op,
diff --git a/sys/contrib/dev/acpica/compiler/aslresource.c b/sys/contrib/dev/acpica/compiler/aslresource.c
index 0a95a9011c47..3cedeedf061f 100644
--- a/sys/contrib/dev/acpica/compiler/aslresource.c
+++ b/sys/contrib/dev/acpica/compiler/aslresource.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -123,22 +122,10 @@ RsSmallAddressCheck (
         return;
     }
 
-    /* Special case for Memory24, values are compressed */
-
-    if (Type == ACPI_RESOURCE_NAME_MEMORY24)
-    {
-        if (!Alignment) /* Alignment==0 means 64K - no invalid alignment */
-        {
-            Alignment = ACPI_UINT16_MAX + 1;
-        }
-
-        Minimum <<= 8;
-        Maximum <<= 8;
-        Length *= 256;
-    }
-
-    /* IO descriptor has different definition of min/max, don't check */
-
+    /*
+     * Range checks for Memory24 and Memory32.
+     * IO descriptor has different definition of min/max, don't check.
+     */
     if (Type != ACPI_RESOURCE_NAME_IO)
     {
         /* Basic checks on Min/Max/Length */
@@ -151,6 +138,19 @@ RsSmallAddressCheck (
         {
             AslError (ASL_ERROR, ASL_MSG_INVALID_LENGTH, LengthOp, NULL);
         }
+
+        /* Special case for Memory24, min/max values are compressed */
+
+        if (Type == ACPI_RESOURCE_NAME_MEMORY24)
+        {
+            if (!Alignment) /* Alignment==0 means 64K alignment */
+            {
+                Alignment = ACPI_UINT16_MAX + 1;
+            }
+
+            Minimum <<= 8;
+            Maximum <<= 8;
+        }
     }
 
     /* Alignment of zero is not in ACPI spec, but is used to mean byte acc */
@@ -645,8 +645,7 @@ RsCheckListForDuplicates (
 
 ASL_RESOURCE_NODE *
 RsDoOneResourceDescriptor (
-    ACPI_PARSE_OBJECT       *DescriptorTypeOp,
-    UINT32                  CurrentByteOffset,
+    ASL_RESOURCE_INFO       *Info,
     UINT8                   *State)
 {
     ASL_RESOURCE_NODE       *Rnode = NULL;
@@ -654,36 +653,31 @@ RsDoOneResourceDescriptor (
 
     /* Construct the resource */
 
-    switch (DescriptorTypeOp->Asl.ParseOpcode)
+    switch (Info->DescriptorTypeOp->Asl.ParseOpcode)
     {
     case PARSEOP_DMA:
 
-        Rnode = RsDoDmaDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoDmaDescriptor (Info);
         break;
 
     case PARSEOP_FIXEDDMA:
 
-        Rnode = RsDoFixedDmaDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoFixedDmaDescriptor (Info);
         break;
 
     case PARSEOP_DWORDIO:
 
-        Rnode = RsDoDwordIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoDwordIoDescriptor (Info);
         break;
 
     case PARSEOP_DWORDMEMORY:
 
-        Rnode = RsDoDwordMemoryDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoDwordMemoryDescriptor (Info);
         break;
 
     case PARSEOP_DWORDSPACE:
 
-        Rnode = RsDoDwordSpaceDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoDwordSpaceDescriptor (Info);
         break;
 
     case PARSEOP_ENDDEPENDENTFN:
@@ -693,13 +687,13 @@ RsDoOneResourceDescriptor (
         case ACPI_RSTATE_NORMAL:
 
             AslError (ASL_ERROR, ASL_MSG_MISSING_STARTDEPENDENT,
-                DescriptorTypeOp, NULL);
+                Info->DescriptorTypeOp, NULL);
             break;
 
         case ACPI_RSTATE_START_DEPENDENT:
 
             AslError (ASL_ERROR, ASL_MSG_DEPENDENT_NESTING,
-                DescriptorTypeOp, NULL);
+                Info->DescriptorTypeOp, NULL);
             break;
 
         case ACPI_RSTATE_DEPENDENT_LIST:
@@ -709,104 +703,87 @@ RsDoOneResourceDescriptor (
         }
 
         *State = ACPI_RSTATE_NORMAL;
-        Rnode = RsDoEndDependentDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoEndDependentDescriptor (Info);
         break;
 
     case PARSEOP_ENDTAG:
 
-        Rnode = RsDoEndTagDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoEndTagDescriptor (Info);
         break;
 
     case PARSEOP_EXTENDEDIO:
 
-        Rnode = RsDoExtendedIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoExtendedIoDescriptor (Info);
         break;
 
     case PARSEOP_EXTENDEDMEMORY:
 
-        Rnode = RsDoExtendedMemoryDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoExtendedMemoryDescriptor (Info);
         break;
 
     case PARSEOP_EXTENDEDSPACE:
 
-        Rnode = RsDoExtendedSpaceDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoExtendedSpaceDescriptor (Info);
         break;
 
     case PARSEOP_FIXEDIO:
 
-        Rnode = RsDoFixedIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoFixedIoDescriptor (Info);
         break;
 
     case PARSEOP_INTERRUPT:
 
-        Rnode = RsDoInterruptDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoInterruptDescriptor (Info);
         break;
 
     case PARSEOP_IO:
 
-        Rnode = RsDoIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoIoDescriptor (Info);
         break;
 
     case PARSEOP_IRQ:
 
-        Rnode = RsDoIrqDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoIrqDescriptor (Info);
         break;
 
     case PARSEOP_IRQNOFLAGS:
 
-        Rnode = RsDoIrqNoFlagsDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoIrqNoFlagsDescriptor (Info);
         break;
 
     case PARSEOP_MEMORY24:
 
-        Rnode = RsDoMemory24Descriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoMemory24Descriptor (Info);
         break;
 
     case PARSEOP_MEMORY32:
 
-        Rnode = RsDoMemory32Descriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoMemory32Descriptor (Info);
         break;
 
     case PARSEOP_MEMORY32FIXED:
 
-        Rnode = RsDoMemory32FixedDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoMemory32FixedDescriptor (Info);
         break;
 
     case PARSEOP_QWORDIO:
 
-        Rnode = RsDoQwordIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoQwordIoDescriptor (Info);
         break;
 
     case PARSEOP_QWORDMEMORY:
 
-        Rnode = RsDoQwordMemoryDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoQwordMemoryDescriptor (Info);
         break;
 
     case PARSEOP_QWORDSPACE:
 
-        Rnode = RsDoQwordSpaceDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoQwordSpaceDescriptor (Info);
         break;
 
     case PARSEOP_REGISTER:
 
-        Rnode = RsDoGeneralRegisterDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoGeneralRegisterDescriptor (Info);
         break;
 
     case PARSEOP_STARTDEPENDENTFN:
@@ -816,7 +793,7 @@ RsDoOneResourceDescriptor (
         case ACPI_RSTATE_START_DEPENDENT:
 
             AslError (ASL_ERROR, ASL_MSG_DEPENDENT_NESTING,
-                DescriptorTypeOp, NULL);
+                Info->DescriptorTypeOp, NULL);
             break;
 
         case ACPI_RSTATE_NORMAL:
@@ -827,8 +804,7 @@ RsDoOneResourceDescriptor (
         }
 
         *State = ACPI_RSTATE_START_DEPENDENT;
-        Rnode = RsDoStartDependentDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoStartDependentDescriptor (Info);
         *State = ACPI_RSTATE_DEPENDENT_LIST;
         break;
 
@@ -839,7 +815,7 @@ RsDoOneResourceDescriptor (
         case ACPI_RSTATE_START_DEPENDENT:
 
             AslError (ASL_ERROR, ASL_MSG_DEPENDENT_NESTING,
-                DescriptorTypeOp, NULL);
+                Info->DescriptorTypeOp, NULL);
             break;
 
         case ACPI_RSTATE_NORMAL:
@@ -850,69 +826,58 @@ RsDoOneResourceDescriptor (
         }
 
         *State = ACPI_RSTATE_START_DEPENDENT;
-        Rnode = RsDoStartDependentNoPriDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoStartDependentNoPriDescriptor (Info);
         *State = ACPI_RSTATE_DEPENDENT_LIST;
         break;
 
     case PARSEOP_VENDORLONG:
 
-        Rnode = RsDoVendorLargeDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoVendorLargeDescriptor (Info);
         break;
 
     case PARSEOP_VENDORSHORT:
 
-        Rnode = RsDoVendorSmallDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoVendorSmallDescriptor (Info);
         break;
 
     case PARSEOP_WORDBUSNUMBER:
 
-        Rnode = RsDoWordBusNumberDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoWordBusNumberDescriptor (Info);
         break;
 
     case PARSEOP_WORDIO:
 
-        Rnode = RsDoWordIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoWordIoDescriptor (Info);
         break;
 
     case PARSEOP_WORDSPACE:
 
-        Rnode = RsDoWordSpaceDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoWordSpaceDescriptor (Info);
         break;
 
     case PARSEOP_GPIO_INT:
 
-        Rnode = RsDoGpioIntDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoGpioIntDescriptor (Info);
         break;
 
     case PARSEOP_GPIO_IO:
 
-        Rnode = RsDoGpioIoDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoGpioIoDescriptor (Info);
         break;
 
     case PARSEOP_I2C_SERIALBUS:
 
-        Rnode = RsDoI2cSerialBusDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoI2cSerialBusDescriptor (Info);
         break;
 
     case PARSEOP_SPI_SERIALBUS:
 
-        Rnode = RsDoSpiSerialBusDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoSpiSerialBusDescriptor (Info);
         break;
 
     case PARSEOP_UART_SERIALBUS:
 
-        Rnode = RsDoUartSerialBusDescriptor (DescriptorTypeOp,
-                    CurrentByteOffset);
+        Rnode = RsDoUartSerialBusDescriptor (Info);
         break;
 
     case PARSEOP_DEFAULT_ARG:
@@ -923,7 +888,7 @@ RsDoOneResourceDescriptor (
     default:
 
         printf ("Unknown resource descriptor type [%s]\n",
-                    DescriptorTypeOp->Asl.ParseOpName);
+                    Info->DescriptorTypeOp->Asl.ParseOpName);
         break;
     }
 
@@ -932,14 +897,14 @@ RsDoOneResourceDescriptor (
      * This allows the resource to be installed in the namespace so that
      * references to the descriptor can be resolved.
      */
-    DescriptorTypeOp->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG;
-    DescriptorTypeOp->Asl.CompileFlags = NODE_IS_RESOURCE_DESC;
-    DescriptorTypeOp->Asl.Value.Integer = CurrentByteOffset;
+    Info->DescriptorTypeOp->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG;
+    Info->DescriptorTypeOp->Asl.CompileFlags = NODE_IS_RESOURCE_DESC;
+    Info->DescriptorTypeOp->Asl.Value.Integer = Info->CurrentByteOffset;
 
     if (Rnode)
     {
-        DescriptorTypeOp->Asl.FinalAmlLength = Rnode->BufferLength;
-        DescriptorTypeOp->Asl.Extra = ((AML_RESOURCE *) Rnode->Buffer)->DescriptorType;
+        Info->DescriptorTypeOp->Asl.FinalAmlLength = Rnode->BufferLength;
+        Info->DescriptorTypeOp->Asl.Extra = ((AML_RESOURCE *) Rnode->Buffer)->DescriptorType;
     }
 
     return (Rnode);
@@ -1023,6 +988,7 @@ RsDoResourceTemplate (
     ASL_RESOURCE_NODE       HeadRnode;
     ASL_RESOURCE_NODE       *PreviousRnode;
     ASL_RESOURCE_NODE       *Rnode;
+    ASL_RESOURCE_INFO       Info;
     UINT8                   State;
 
 
@@ -1055,9 +1021,22 @@ RsDoResourceTemplate (
     PreviousRnode = &HeadRnode;
     while (DescriptorTypeOp)
     {
+        /* Save information for optional mapfile */
+
+        if (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONNECTION)
+        {
+            Info.MappingOp = Op->Asl.Parent;
+        }
+        else
+        {
+            Info.MappingOp = DescriptorTypeOp;
+        }
+
+        Info.DescriptorTypeOp = DescriptorTypeOp;
+        Info.CurrentByteOffset = CurrentByteOffset;
+
         DescriptorTypeOp->Asl.CompileFlags |= NODE_IS_RESOURCE_DESC;
-        Rnode = RsDoOneResourceDescriptor (DescriptorTypeOp, CurrentByteOffset,
-                    &State);
+        Rnode = RsDoOneResourceDescriptor (&Info, &State);
 
         /*
          * Update current byte offset to indicate the number of bytes from the
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype1.c b/sys/contrib/dev/acpica/compiler/aslrestype1.c
index 21a87050c430..46bb1fa30fb1 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype1.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype1.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -65,9 +64,7 @@
  *
  * FUNCTION:    RsDoEndTagDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -77,8 +74,7 @@
 
 ASL_RESOURCE_NODE *
 RsDoEndTagDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ASL_RESOURCE_NODE       *Rnode;
@@ -99,9 +95,7 @@ RsDoEndTagDescriptor (
  *
  * FUNCTION:    RsDoEndDependentDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -111,8 +105,7 @@ RsDoEndTagDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoEndDependentDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ASL_RESOURCE_NODE       *Rnode;
@@ -131,9 +124,7 @@ RsDoEndDependentDescriptor (
  *
  * FUNCTION:    RsDoMemory24Descriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -143,8 +134,7 @@ RsDoEndDependentDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoMemory24Descriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -152,10 +142,12 @@ RsDoMemory24Descriptor (
     ACPI_PARSE_OBJECT       *MaxOp = NULL;
     ACPI_PARSE_OBJECT       *LengthOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_MEMORY24));
 
     Descriptor = Rnode->Buffer;
@@ -208,7 +200,7 @@ RsDoMemory24Descriptor (
 
         case 5: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -227,7 +219,7 @@ RsDoMemory24Descriptor (
         Descriptor->Memory24.Maximum,
         Descriptor->Memory24.AddressLength,
         Descriptor->Memory24.Alignment,
-        MinOp, MaxOp, LengthOp, NULL, Op);
+        MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
 
     return (Rnode);
 }
@@ -237,9 +229,7 @@ RsDoMemory24Descriptor (
  *
  * FUNCTION:    RsDoMemory32Descriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -249,8 +239,7 @@ RsDoMemory24Descriptor (
 
 ASL_RESOURCE_NODE *
 RsDoMemory32Descriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -259,10 +248,12 @@ RsDoMemory32Descriptor (
     ACPI_PARSE_OBJECT       *LengthOp = NULL;
     ACPI_PARSE_OBJECT       *AlignOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_MEMORY32));
 
     Descriptor = Rnode->Buffer;
@@ -316,7 +307,7 @@ RsDoMemory32Descriptor (
 
         case 5: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -335,7 +326,7 @@ RsDoMemory32Descriptor (
         Descriptor->Memory32.Maximum,
         Descriptor->Memory32.AddressLength,
         Descriptor->Memory32.Alignment,
-        MinOp, MaxOp, LengthOp, AlignOp, Op);
+        MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
 
     return (Rnode);
 }
@@ -345,9 +336,7 @@ RsDoMemory32Descriptor (
  *
  * FUNCTION:    RsDoMemory32FixedDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -357,16 +346,17 @@ RsDoMemory32Descriptor (
 
 ASL_RESOURCE_NODE *
 RsDoMemory32FixedDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_FIXED_MEMORY32));
 
     Descriptor = Rnode->Buffer;
@@ -402,7 +392,7 @@ RsDoMemory32FixedDescriptor (
 
         case 3: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -422,9 +412,7 @@ RsDoMemory32FixedDescriptor (
  *
  * FUNCTION:    RsDoStartDependentDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -434,19 +422,21 @@ RsDoMemory32FixedDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoStartDependentDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
     ASL_RESOURCE_NODE       *PreviousRnode;
     ASL_RESOURCE_NODE       *NextRnode;
+    ASL_RESOURCE_INFO       NextInfo;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     UINT8                   State;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_START_DEPENDENT));
 
     PreviousRnode = Rnode;
@@ -492,8 +482,10 @@ RsDoStartDependentDescriptor (
 
         default:
 
-            NextRnode = RsDoOneResourceDescriptor  (InitializerOp,
-                        CurrentByteOffset, &State);
+            NextInfo.CurrentByteOffset = CurrentByteOffset;
+            NextInfo.DescriptorTypeOp = InitializerOp;
+
+            NextRnode = RsDoOneResourceDescriptor (&NextInfo, &State);
 
             /*
              * Update current byte offset to indicate the number of bytes from the
@@ -517,9 +509,7 @@ RsDoStartDependentDescriptor (
  *
  * FUNCTION:    RsDoStartDependentNoPriDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -529,18 +519,20 @@ RsDoStartDependentDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoStartDependentNoPriDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
     ASL_RESOURCE_NODE       *PreviousRnode;
     ASL_RESOURCE_NODE       *NextRnode;
+    ASL_RESOURCE_INFO       NextInfo;
+    UINT32                  CurrentByteOffset;
     UINT8                   State;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_START_DEPENDENT_NOPRIO));
 
     Descriptor = Rnode->Buffer;
@@ -557,8 +549,10 @@ RsDoStartDependentNoPriDescriptor (
     State = ACPI_RSTATE_START_DEPENDENT;
     while (InitializerOp)
     {
-        NextRnode = RsDoOneResourceDescriptor  (InitializerOp,
-                        CurrentByteOffset, &State);
+        NextInfo.CurrentByteOffset = CurrentByteOffset;
+        NextInfo.DescriptorTypeOp = InitializerOp;
+
+        NextRnode = RsDoOneResourceDescriptor (&NextInfo, &State);
 
         /*
          * Update current byte offset to indicate the number of bytes from the
@@ -579,9 +573,7 @@ RsDoStartDependentNoPriDescriptor (
  *
  * FUNCTION:    RsDoVendorSmallDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -591,8 +583,7 @@ RsDoStartDependentNoPriDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoVendorSmallDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -601,7 +592,7 @@ RsDoVendorSmallDescriptor (
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
 
     /* Allocate worst case - 7 vendor bytes */
 
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype1i.c b/sys/contrib/dev/acpica/compiler/aslrestype1i.c
index 4e78c2c1d8cc..6de7b93b3a78 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype1i.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype1i.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -63,9 +62,7 @@
  *
  * FUNCTION:    RsDoDmaDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -75,18 +72,19 @@
 
 ASL_RESOURCE_NODE *
 RsDoDmaDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     UINT8                   DmaChannelMask = 0;
     UINT8                   DmaChannels = 0;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_DMA));
 
     Descriptor = Rnode->Buffer;
@@ -122,7 +120,7 @@ RsDoDmaDescriptor (
 
         case 3: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -184,9 +182,7 @@ RsDoDmaDescriptor (
  *
  * FUNCTION:    RsDoFixedDmaDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -196,16 +192,17 @@ RsDoDmaDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoFixedDmaDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_FIXED_DMA));
 
     Descriptor = Rnode->Buffer;
@@ -241,7 +238,7 @@ RsDoFixedDmaDescriptor (
 
         case 3: /* Descriptor Name (optional) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:    /* Ignore any extra nodes */
@@ -260,9 +257,7 @@ RsDoFixedDmaDescriptor (
  *
  * FUNCTION:    RsDoFixedIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -272,17 +267,18 @@ RsDoFixedDmaDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoFixedIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ACPI_PARSE_OBJECT       *AddressOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_FIXED_IO));
 
     Descriptor = Rnode->Buffer;
@@ -314,7 +310,7 @@ RsDoFixedIoDescriptor (
 
         case 2: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -341,9 +337,7 @@ RsDoFixedIoDescriptor (
  *
  * FUNCTION:    RsDoIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -353,8 +347,7 @@ RsDoFixedIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -363,10 +356,12 @@ RsDoIoDescriptor (
     ACPI_PARSE_OBJECT       *LengthOp = NULL;
     ACPI_PARSE_OBJECT       *AlignOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_IO));
 
     Descriptor = Rnode->Buffer;
@@ -424,7 +419,7 @@ RsDoIoDescriptor (
 
         case 5: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -443,7 +438,7 @@ RsDoIoDescriptor (
         Descriptor->Io.Maximum,
         Descriptor->Io.AddressLength,
         Descriptor->Io.Alignment,
-        MinOp, MaxOp, LengthOp, AlignOp, Op);
+        MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
 
     return (Rnode);
 }
@@ -453,9 +448,7 @@ RsDoIoDescriptor (
  *
  * FUNCTION:    RsDoIrqDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -465,18 +458,19 @@ RsDoIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoIrqDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
     UINT32                  Interrupts = 0;
     UINT16                  IrqMask = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_IRQ));
 
     /* Length = 3 (with flag byte) */
@@ -514,7 +508,7 @@ RsDoIrqDescriptor (
 
         case 3: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -576,9 +570,7 @@ RsDoIrqDescriptor (
  *
  * FUNCTION:    RsDoIrqNoFlagsDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -588,18 +580,19 @@ RsDoIrqDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoIrqNoFlagsDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
     UINT16                  IrqMask = 0;
     UINT32                  Interrupts = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_IRQ_NOFLAGS));
 
     Descriptor = Rnode->Buffer;
@@ -614,7 +607,7 @@ RsDoIrqNoFlagsDescriptor (
         {
         case 0: /* Name */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2.c b/sys/contrib/dev/acpica/compiler/aslrestype2.c
index 942d45eb56f6..ec6067b2fb49 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -61,9 +60,7 @@
  *
  * FUNCTION:    RsDoGeneralRegisterDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -73,16 +70,17 @@
 
 ASL_RESOURCE_NODE *
 RsDoGeneralRegisterDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
     ASL_RESOURCE_NODE       *Rnode;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_GENERIC_REGISTER));
 
     Descriptor = Rnode->Buffer;
@@ -138,7 +136,7 @@ RsDoGeneralRegisterDescriptor (
 
         case 5: /* ResourceTag (ACPI 3.0b) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -157,9 +155,7 @@ RsDoGeneralRegisterDescriptor (
  *
  * FUNCTION:    RsDoInterruptDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -169,8 +165,7 @@ RsDoGeneralRegisterDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoInterruptDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     AML_RESOURCE            *Rover = NULL;
@@ -178,13 +173,15 @@ RsDoInterruptDescriptor (
     ASL_RESOURCE_NODE       *Rnode;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 HasResSourceIndex = FALSE;
     UINT8                   ResSourceIndex = 0;
     UINT8                   *ResSourceString = NULL;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
     StringLength = RsGetStringDataLength (InitializerOp);
 
     /* Count the interrupt numbers */
@@ -211,9 +208,9 @@ RsDoInterruptDescriptor (
         OptionIndex += 4;
     }
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_EXTENDED_IRQ) +
-                1 + OptionIndex + StringLength);
+        1 + OptionIndex + StringLength);
 
     Descriptor = Rnode->Buffer;
     Descriptor->ExtendedIrq.DescriptorType  = ACPI_RESOURCE_NAME_EXTENDED_IRQ;
@@ -303,7 +300,7 @@ RsDoInterruptDescriptor (
 
         case 6: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -396,9 +393,7 @@ RsDoInterruptDescriptor (
  *
  * FUNCTION:    RsDoVendorLargeDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -408,8 +403,7 @@ RsDoInterruptDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoVendorLargeDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -420,7 +414,7 @@ RsDoVendorLargeDescriptor (
 
     /* Count the number of data bytes */
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
 
     for (i = 0; InitializerOp; i++)
@@ -432,7 +426,7 @@ RsDoVendorLargeDescriptor (
         InitializerOp = InitializerOp->Asl.Next;
     }
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     Rnode = RsAllocateResourceNode (sizeof (AML_RESOURCE_VENDOR_LARGE) + i);
 
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2d.c b/sys/contrib/dev/acpica/compiler/aslrestype2d.c
index 035b6ecde2b6..39b1f6b764a4 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2d.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2d.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -60,9 +59,7 @@
  *
  * FUNCTION:    RsDoDwordIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -72,8 +69,7 @@
 
 ASL_RESOURCE_NODE *
 RsDoDwordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -85,12 +81,14 @@ RsDoDwordIoDescriptor (
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
     UINT8                   *OptionalFields;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS32) + 1 + StringLength);
@@ -245,7 +243,7 @@ RsDoDwordIoDescriptor (
 
         case 12: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 13: /* Type */
@@ -279,10 +277,10 @@ RsDoDwordIoDescriptor (
         (UINT64) Descriptor->Address32.AddressLength,
         (UINT64) Descriptor->Address32.Granularity,
         Descriptor->Address32.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -291,9 +289,7 @@ RsDoDwordIoDescriptor (
  *
  * FUNCTION:    RsDoDwordMemoryDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -303,8 +299,7 @@ RsDoDwordIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoDwordMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -316,12 +311,14 @@ RsDoDwordMemoryDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS32) + 1 + StringLength);
@@ -480,7 +477,7 @@ RsDoDwordMemoryDescriptor (
 
         case 13: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
 
@@ -515,10 +512,10 @@ RsDoDwordMemoryDescriptor (
         (UINT64) Descriptor->Address32.AddressLength,
         (UINT64) Descriptor->Address32.Granularity,
         Descriptor->Address32.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -527,9 +524,7 @@ RsDoDwordMemoryDescriptor (
  *
  * FUNCTION:    RsDoDwordSpaceDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -539,8 +534,7 @@ RsDoDwordMemoryDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoDwordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -552,12 +546,14 @@ RsDoDwordSpaceDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS32) + 1 + StringLength);
@@ -712,7 +708,7 @@ RsDoDwordSpaceDescriptor (
 
         case 13: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -733,9 +729,9 @@ RsDoDwordSpaceDescriptor (
         (UINT64) Descriptor->Address32.AddressLength,
         (UINT64) Descriptor->Address32.Granularity,
         Descriptor->Address32.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2e.c b/sys/contrib/dev/acpica/compiler/aslrestype2e.c
index 5621762a3d3e..b39556342438 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2e.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2e.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 
 #define _COMPONENT          ACPI_COMPILER
@@ -59,9 +58,7 @@
  *
  * FUNCTION:    RsDoExtendedIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -71,8 +68,7 @@
 
 ASL_RESOURCE_NODE *
 RsDoExtendedIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -82,11 +78,13 @@ RsDoExtendedIoDescriptor (
     ACPI_PARSE_OBJECT       *GranOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
     UINT16                  StringLength = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + 1 + StringLength);
@@ -187,7 +185,7 @@ RsDoExtendedIoDescriptor (
 
         case 11: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 12: /* Type */
@@ -221,9 +219,10 @@ RsDoExtendedIoDescriptor (
         Descriptor->ExtAddress64.AddressLength,
         Descriptor->ExtAddress64.Granularity,
         Descriptor->ExtAddress64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
-    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength;
+    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
+        StringLength;
     return (Rnode);
 }
 
@@ -232,9 +231,7 @@ RsDoExtendedIoDescriptor (
  *
  * FUNCTION:    RsDoExtendedMemoryDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -244,8 +241,7 @@ RsDoExtendedIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoExtendedMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -255,11 +251,13 @@ RsDoExtendedMemoryDescriptor (
     ACPI_PARSE_OBJECT       *GranOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
     UINT16                  StringLength = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + 1 + StringLength);
@@ -367,7 +365,7 @@ RsDoExtendedMemoryDescriptor (
 
         case 12: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
 
@@ -402,9 +400,10 @@ RsDoExtendedMemoryDescriptor (
         Descriptor->ExtAddress64.AddressLength,
         Descriptor->ExtAddress64.Granularity,
         Descriptor->ExtAddress64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
-    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength;
+    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
+        StringLength;
     return (Rnode);
 }
 
@@ -413,9 +412,7 @@ RsDoExtendedMemoryDescriptor (
  *
  * FUNCTION:    RsDoExtendedSpaceDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -425,8 +422,7 @@ RsDoExtendedMemoryDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoExtendedSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -436,11 +432,13 @@ RsDoExtendedSpaceDescriptor (
     ACPI_PARSE_OBJECT       *GranOp = NULL;
     ASL_RESOURCE_NODE       *Rnode;
     UINT16                  StringLength = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + 1 + StringLength);
@@ -545,7 +543,7 @@ RsDoExtendedSpaceDescriptor (
 
         case 12: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -565,8 +563,9 @@ RsDoExtendedSpaceDescriptor (
         Descriptor->ExtAddress64.AddressLength,
         Descriptor->ExtAddress64.Granularity,
         Descriptor->ExtAddress64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
-    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength;
+    Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
+        StringLength;
     return (Rnode);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2q.c b/sys/contrib/dev/acpica/compiler/aslrestype2q.c
index 3a002a453b9b..f79680f4a488 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2q.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2q.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -60,9 +59,7 @@
  *
  * FUNCTION:    RsDoQwordIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -72,8 +69,7 @@
 
 ASL_RESOURCE_NODE *
 RsDoQwordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -85,12 +81,14 @@ RsDoQwordIoDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength);
@@ -236,7 +234,7 @@ RsDoQwordIoDescriptor (
 
         case 12: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 13: /* Type */
@@ -270,10 +268,10 @@ RsDoQwordIoDescriptor (
         Descriptor->Address64.AddressLength,
         Descriptor->Address64.Granularity,
         Descriptor->Address64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -282,9 +280,7 @@ RsDoQwordIoDescriptor (
  *
  * FUNCTION:    RsDoQwordMemoryDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -294,8 +290,7 @@ RsDoQwordIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoQwordMemoryDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -307,12 +302,14 @@ RsDoQwordMemoryDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength);
@@ -465,7 +462,7 @@ RsDoQwordMemoryDescriptor (
 
         case 13: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
 
@@ -500,10 +497,10 @@ RsDoQwordMemoryDescriptor (
         Descriptor->Address64.AddressLength,
         Descriptor->Address64.Granularity,
         Descriptor->Address64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -512,9 +509,7 @@ RsDoQwordMemoryDescriptor (
  *
  * FUNCTION:    RsDoQwordSpaceDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -524,8 +519,7 @@ RsDoQwordMemoryDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoQwordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -537,12 +531,14 @@ RsDoQwordSpaceDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength);
@@ -692,7 +688,7 @@ RsDoQwordSpaceDescriptor (
 
         case 13: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -712,9 +708,9 @@ RsDoQwordSpaceDescriptor (
         Descriptor->Address64.AddressLength,
         Descriptor->Address64.Granularity,
         Descriptor->Address64.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2s.c b/sys/contrib/dev/acpica/compiler/aslrestype2s.c
index 96be2ad1842e..2be295b6e4e1 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2s.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2s.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -268,9 +267,7 @@ RsGetVendorData (
  *
  * FUNCTION:    RsDoGpioIntDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -280,8 +277,7 @@ RsGetVendorData (
 
 ASL_RESOURCE_NODE *
 RsDoGpioIntDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -289,14 +285,18 @@ RsDoGpioIntDescriptor (
     char                    *ResourceSource = NULL;
     UINT8                   *VendorData = NULL;
     UINT16                  *InterruptList = NULL;
+    UINT16                  *PinList = NULL;
     UINT16                  ResSourceLength;
     UINT16                  VendorLength;
     UINT16                  InterruptLength;
     UINT16                  DescriptorSize;
+    UINT32                  CurrentByteOffset;
+    UINT32                  PinCount = 0;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     /*
      * Calculate lengths for fields that have variable length:
@@ -324,6 +324,7 @@ RsDoGpioIntDescriptor (
     /* Build pointers to optional areas */
 
     InterruptList = ACPI_ADD_PTR (UINT16, Descriptor, sizeof (AML_RESOURCE_GPIO));
+    PinList = InterruptList;
     ResourceSource = ACPI_ADD_PTR (char, InterruptList, InterruptLength);
     VendorData = ACPI_ADD_PTR (UINT8, ResourceSource, ResSourceLength);
 
@@ -407,7 +408,7 @@ RsDoGpioIntDescriptor (
 
         case 8: /* Resource Tag (Descriptor Name) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 9: /* Vendor Data (Optional - Buffer of BYTEs) (_VEN) */
@@ -438,6 +439,7 @@ RsDoGpioIntDescriptor (
              */
             *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
             InterruptList++;
+            PinCount++;
 
             /* Case 10: First interrupt number in list */
 
@@ -466,6 +468,7 @@ RsDoGpioIntDescriptor (
         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     }
 
+    MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource);
     return (Rnode);
 }
 
@@ -474,9 +477,7 @@ RsDoGpioIntDescriptor (
  *
  * FUNCTION:    RsDoGpioIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -486,8 +487,7 @@ RsDoGpioIntDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoGpioIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -495,14 +495,18 @@ RsDoGpioIoDescriptor (
     char                    *ResourceSource = NULL;
     UINT8                   *VendorData = NULL;
     UINT16                  *InterruptList = NULL;
+    UINT16                  *PinList = NULL;
     UINT16                  ResSourceLength;
     UINT16                  VendorLength;
     UINT16                  InterruptLength;
     UINT16                  DescriptorSize;
+    UINT32                  CurrentByteOffset;
+    UINT32                  PinCount = 0;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     /*
      * Calculate lengths for fields that have variable length:
@@ -513,6 +517,7 @@ RsDoGpioIoDescriptor (
     ResSourceLength = RsGetStringDataLength (InitializerOp);
     VendorLength = RsGetBufferDataLength (InitializerOp);
     InterruptLength = RsGetInterruptDataLength (InitializerOp);
+    PinList = InterruptList;
 
     DescriptorSize = ACPI_AML_SIZE_LARGE (AML_RESOURCE_GPIO) +
         ResSourceLength + VendorLength + InterruptLength;
@@ -530,6 +535,7 @@ RsDoGpioIoDescriptor (
     /* Build pointers to optional areas */
 
     InterruptList = ACPI_ADD_PTR (UINT16, Descriptor, sizeof (AML_RESOURCE_GPIO));
+    PinList = InterruptList;
     ResourceSource = ACPI_ADD_PTR (char, InterruptList, InterruptLength);
     VendorData = ACPI_ADD_PTR (UINT8, ResourceSource, ResSourceLength);
 
@@ -613,7 +619,7 @@ RsDoGpioIoDescriptor (
 
         case 8: /* Resource Tag (Descriptor Name) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 9: /* Vendor Data (Optional - Buffer of BYTEs) (_VEN) */
@@ -643,6 +649,7 @@ RsDoGpioIoDescriptor (
              */
             *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
             InterruptList++;
+            PinCount++;
 
             /* Case 10: First interrupt number in list */
 
@@ -671,6 +678,7 @@ RsDoGpioIoDescriptor (
         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     }
 
+    MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource);
     return (Rnode);
 }
 
@@ -679,9 +687,7 @@ RsDoGpioIoDescriptor (
  *
  * FUNCTION:    RsDoI2cSerialBusDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -691,8 +697,7 @@ RsDoGpioIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoI2cSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -702,10 +707,12 @@ RsDoI2cSerialBusDescriptor (
     UINT16                  ResSourceLength;
     UINT16                  VendorLength;
     UINT16                  DescriptorSize;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     /*
      * Calculate lengths for fields that have variable length:
@@ -801,7 +808,7 @@ RsDoI2cSerialBusDescriptor (
 
         case 7: /* Resource Tag (Descriptor Name) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 8: /* Vendor Data (Optional - Buffer of BYTEs) (_VEN) */
@@ -818,6 +825,7 @@ RsDoI2cSerialBusDescriptor (
         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     }
 
+    MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
     return (Rnode);
 }
 
@@ -826,9 +834,7 @@ RsDoI2cSerialBusDescriptor (
  *
  * FUNCTION:    RsDoSpiSerialBusDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -838,8 +844,7 @@ RsDoI2cSerialBusDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoSpiSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -849,10 +854,12 @@ RsDoSpiSerialBusDescriptor (
     UINT16                  ResSourceLength;
     UINT16                  VendorLength;
     UINT16                  DescriptorSize;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     /*
      * Calculate lengths for fields that have variable length:
@@ -976,7 +983,7 @@ RsDoSpiSerialBusDescriptor (
 
         case 11: /* Resource Tag (Descriptor Name) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 12: /* Vendor Data (Optional - Buffer of BYTEs) (_VEN) */
@@ -993,6 +1000,7 @@ RsDoSpiSerialBusDescriptor (
         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     }
 
+    MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
     return (Rnode);
 }
 
@@ -1001,9 +1009,7 @@ RsDoSpiSerialBusDescriptor (
  *
  * FUNCTION:    RsDoUartSerialBusDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -1013,8 +1019,7 @@ RsDoSpiSerialBusDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoUartSerialBusDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -1024,10 +1029,12 @@ RsDoUartSerialBusDescriptor (
     UINT16                  ResSourceLength;
     UINT16                  VendorLength;
     UINT16                  DescriptorSize;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     /*
      * Calculate lengths for fields that have variable length:
@@ -1168,7 +1175,7 @@ RsDoUartSerialBusDescriptor (
 
         case 12: /* Resource Tag (Descriptor Name) */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 13: /* Vendor Data (Optional - Buffer of BYTEs) (_VEN) */
@@ -1185,5 +1192,6 @@ RsDoUartSerialBusDescriptor (
         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
     }
 
+    MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
     return (Rnode);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2w.c b/sys/contrib/dev/acpica/compiler/aslrestype2w.c
index be388b753bc6..34c3e1e4515a 100644
--- a/sys/contrib/dev/acpica/compiler/aslrestype2w.c
+++ b/sys/contrib/dev/acpica/compiler/aslrestype2w.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -60,9 +59,7 @@
  *
  * FUNCTION:    RsDoWordIoDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -72,8 +69,7 @@
 
 ASL_RESOURCE_NODE *
 RsDoWordIoDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -85,12 +81,14 @@ RsDoWordIoDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS16) + 1 + StringLength);
@@ -236,7 +234,7 @@ RsDoWordIoDescriptor (
 
         case 12: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         case 13: /* Type */
@@ -270,10 +268,10 @@ RsDoWordIoDescriptor (
         (UINT64) Descriptor->Address16.AddressLength,
         (UINT64) Descriptor->Address16.Granularity,
         Descriptor->Address16.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -282,9 +280,7 @@ RsDoWordIoDescriptor (
  *
  * FUNCTION:    RsDoWordBusNumberDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -294,8 +290,7 @@ RsDoWordIoDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoWordBusNumberDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -307,12 +302,14 @@ RsDoWordBusNumberDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS16) + 1 + StringLength);
@@ -456,7 +453,7 @@ RsDoWordBusNumberDescriptor (
 
         case 11: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -476,10 +473,10 @@ RsDoWordBusNumberDescriptor (
         (UINT64) Descriptor->Address16.AddressLength,
         (UINT64) Descriptor->Address16.Granularity,
         Descriptor->Address16.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
 
@@ -488,9 +485,7 @@ RsDoWordBusNumberDescriptor (
  *
  * FUNCTION:    RsDoWordSpaceDescriptor
  *
- * PARAMETERS:  Op                  - Parent resource descriptor parse node
- *              CurrentByteOffset   - Offset into the resource template AML
- *                                    buffer (to track references to the desc)
+ * PARAMETERS:  Info                - Parse Op and resource template offset
  *
  * RETURN:      Completed resource node
  *
@@ -500,8 +495,7 @@ RsDoWordBusNumberDescriptor (
 
 ASL_RESOURCE_NODE *
 RsDoWordSpaceDescriptor (
-    ACPI_PARSE_OBJECT       *Op,
-    UINT32                  CurrentByteOffset)
+    ASL_RESOURCE_INFO       *Info)
 {
     AML_RESOURCE            *Descriptor;
     ACPI_PARSE_OBJECT       *InitializerOp;
@@ -513,12 +507,14 @@ RsDoWordSpaceDescriptor (
     UINT8                   *OptionalFields;
     UINT16                  StringLength = 0;
     UINT32                  OptionIndex = 0;
+    UINT32                  CurrentByteOffset;
     UINT32                  i;
     BOOLEAN                 ResSourceIndex = FALSE;
 
 
-    InitializerOp = Op->Asl.Child;
+    InitializerOp = Info->DescriptorTypeOp->Asl.Child;
     StringLength = RsGetStringDataLength (InitializerOp);
+    CurrentByteOffset = Info->CurrentByteOffset;
 
     Rnode = RsAllocateResourceNode (
                 sizeof (AML_RESOURCE_ADDRESS16) + 1 + StringLength);
@@ -673,7 +669,7 @@ RsDoWordSpaceDescriptor (
 
         case 13: /* ResourceTag */
 
-            UtAttachNamepathToOwner (Op, InitializerOp);
+            UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp);
             break;
 
         default:
@@ -693,9 +689,9 @@ RsDoWordSpaceDescriptor (
         (UINT64) Descriptor->Address16.AddressLength,
         (UINT64) Descriptor->Address16.Granularity,
         Descriptor->Address16.Flags,
-        MinOp, MaxOp, LengthOp, GranOp, Op);
+        MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
 
     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-                            OptionIndex + StringLength;
+        OptionIndex + StringLength;
     return (Rnode);
 }
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.y b/sys/contrib/dev/acpica/compiler/aslrules.y
similarity index 82%
rename from sys/contrib/dev/acpica/compiler/aslcompiler.y
rename to sys/contrib/dev/acpica/compiler/aslrules.y
index 42ff850ff409..2bc48db11f6a 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompiler.y
+++ b/sys/contrib/dev/acpica/compiler/aslrules.y
@@ -1,12 +1,12 @@
-%{
+NoEcho('
 /******************************************************************************
  *
- * Module Name: aslcompiler.y - Bison/Yacc input file (ASL grammar and actions)
+ * Module Name: aslrules.y - Bison/Yacc production rules
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,755 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <contrib/dev/acpica/compiler/aslcompiler.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
+')
 
-#define _COMPONENT          ACPI_COMPILER
-        ACPI_MODULE_NAME    ("aslparse")
-
-/*
- * Global Notes:
- *
- * October 2005: The following list terms have been optimized (from the
- * original ASL grammar in the ACPI specification) to force the immediate
- * reduction of each list item so that the parse stack use doesn't increase on
- * each list element and possibly overflow on very large lists (>4000 items).
- * This dramatically reduces use of the parse stack overall.
- *
- *      ArgList, TermList, Objectlist, ByteList, DWordList, PackageList,
- *      ResourceMacroList, and FieldUnitList
- */
-
-void *                      AslLocalAllocate (unsigned int Size);
-
-/* Bison/yacc configuration */
-
-#define static
-#undef alloca
-#define alloca              AslLocalAllocate
-#define yytname             AslCompilername
-
-#define YYINITDEPTH         600             /* State stack depth */
-#define YYDEBUG             1               /* Enable debug output */
-#define YYERROR_VERBOSE     1               /* Verbose error messages */
-
-/* Define YYMALLOC/YYFREE to prevent redefinition errors  */
-
-#define YYMALLOC            malloc
-#define YYFREE              free
-
-/*
- * The windows version of bison defines this incorrectly as "32768" (Not negative).
- * We use a custom (edited binary) version of bison that defines YYFLAG as YYFBAD
- * instead (#define YYFBAD 32768), so we can define it correctly here.
- *
- * The problem is that if YYFLAG is positive, the extended syntax error messages
- * are disabled.
- */
-#define YYFLAG              -32768
-
-%}
-
-/*
- * Declare the type of values in the grammar
- */
-%union {
-    UINT64              i;
-    char                *s;
-    ACPI_PARSE_OBJECT   *n;
-}
-
-/*! [Begin] no source code translation */
-
-/*
- * These shift/reduce conflicts are expected. There should be zero
- * reduce/reduce conflicts.
- */
-%expect 86
-
-/******************************************************************************
- *
- * Token types: These are returned by the lexer
- *
- * NOTE: This list MUST match the AslKeywordMapping table found
- *       in aslmap.c EXACTLY!  Double check any changes!
- *
- *****************************************************************************/
-
-%token <i> PARSEOP_ACCESSAS
-%token <i> PARSEOP_ACCESSATTRIB_BLOCK
-%token <i> PARSEOP_ACCESSATTRIB_BLOCK_CALL
-%token <i> PARSEOP_ACCESSATTRIB_BYTE
-%token <i> PARSEOP_ACCESSATTRIB_MULTIBYTE
-%token <i> PARSEOP_ACCESSATTRIB_QUICK
-%token <i> PARSEOP_ACCESSATTRIB_RAW_BYTES
-%token <i> PARSEOP_ACCESSATTRIB_RAW_PROCESS
-%token <i> PARSEOP_ACCESSATTRIB_SND_RCV
-%token <i> PARSEOP_ACCESSATTRIB_WORD
-%token <i> PARSEOP_ACCESSATTRIB_WORD_CALL
-%token <i> PARSEOP_ACCESSTYPE_ANY
-%token <i> PARSEOP_ACCESSTYPE_BUF
-%token <i> PARSEOP_ACCESSTYPE_BYTE
-%token <i> PARSEOP_ACCESSTYPE_DWORD
-%token <i> PARSEOP_ACCESSTYPE_QWORD
-%token <i> PARSEOP_ACCESSTYPE_WORD
-%token <i> PARSEOP_ACQUIRE
-%token <i> PARSEOP_ADD
-%token <i> PARSEOP_ADDRESSINGMODE_7BIT
-%token <i> PARSEOP_ADDRESSINGMODE_10BIT
-%token <i> PARSEOP_ADDRESSTYPE_ACPI
-%token <i> PARSEOP_ADDRESSTYPE_MEMORY
-%token <i> PARSEOP_ADDRESSTYPE_NVS
-%token <i> PARSEOP_ADDRESSTYPE_RESERVED
-%token <i> PARSEOP_ALIAS
-%token <i> PARSEOP_AND
-%token <i> PARSEOP_ARG0
-%token <i> PARSEOP_ARG1
-%token <i> PARSEOP_ARG2
-%token <i> PARSEOP_ARG3
-%token <i> PARSEOP_ARG4
-%token <i> PARSEOP_ARG5
-%token <i> PARSEOP_ARG6
-%token <i> PARSEOP_BANKFIELD
-%token <i> PARSEOP_BITSPERBYTE_EIGHT
-%token <i> PARSEOP_BITSPERBYTE_FIVE
-%token <i> PARSEOP_BITSPERBYTE_NINE
-%token <i> PARSEOP_BITSPERBYTE_SEVEN
-%token <i> PARSEOP_BITSPERBYTE_SIX
-%token <i> PARSEOP_BREAK
-%token <i> PARSEOP_BREAKPOINT
-%token <i> PARSEOP_BUFFER
-%token <i> PARSEOP_BUSMASTERTYPE_MASTER
-%token <i> PARSEOP_BUSMASTERTYPE_NOTMASTER
-%token <i> PARSEOP_BYTECONST
-%token <i> PARSEOP_CASE
-%token <i> PARSEOP_CLOCKPHASE_FIRST
-%token <i> PARSEOP_CLOCKPHASE_SECOND
-%token <i> PARSEOP_CLOCKPOLARITY_HIGH
-%token <i> PARSEOP_CLOCKPOLARITY_LOW
-%token <i> PARSEOP_CONCATENATE
-%token <i> PARSEOP_CONCATENATERESTEMPLATE
-%token <i> PARSEOP_CONDREFOF
-%token <i> PARSEOP_CONNECTION
-%token <i> PARSEOP_CONTINUE
-%token <i> PARSEOP_COPYOBJECT
-%token <i> PARSEOP_CREATEBITFIELD
-%token <i> PARSEOP_CREATEBYTEFIELD
-%token <i> PARSEOP_CREATEDWORDFIELD
-%token <i> PARSEOP_CREATEFIELD
-%token <i> PARSEOP_CREATEQWORDFIELD
-%token <i> PARSEOP_CREATEWORDFIELD
-%token <i> PARSEOP_DATABUFFER
-%token <i> PARSEOP_DATATABLEREGION
-%token <i> PARSEOP_DEBUG
-%token <i> PARSEOP_DECODETYPE_POS
-%token <i> PARSEOP_DECODETYPE_SUB
-%token <i> PARSEOP_DECREMENT
-%token <i> PARSEOP_DEFAULT
-%token <i> PARSEOP_DEFAULT_ARG
-%token <i> PARSEOP_DEFINITIONBLOCK
-%token <i> PARSEOP_DEREFOF
-%token <i> PARSEOP_DEVICE
-%token <i> PARSEOP_DEVICEPOLARITY_HIGH
-%token <i> PARSEOP_DEVICEPOLARITY_LOW
-%token <i> PARSEOP_DIVIDE
-%token <i> PARSEOP_DMA
-%token <i> PARSEOP_DMATYPE_A
-%token <i> PARSEOP_DMATYPE_COMPATIBILITY
-%token <i> PARSEOP_DMATYPE_B
-%token <i> PARSEOP_DMATYPE_F
-%token <i> PARSEOP_DWORDCONST
-%token <i> PARSEOP_DWORDIO
-%token <i> PARSEOP_DWORDMEMORY
-%token <i> PARSEOP_DWORDSPACE
-%token <i> PARSEOP_EISAID
-%token <i> PARSEOP_ELSE
-%token <i> PARSEOP_ELSEIF
-%token <i> PARSEOP_ENDDEPENDENTFN
-%token <i> PARSEOP_ENDIAN_BIG
-%token <i> PARSEOP_ENDIAN_LITTLE
-%token <i> PARSEOP_ENDTAG
-%token <i> PARSEOP_ERRORNODE
-%token <i> PARSEOP_EVENT
-%token <i> PARSEOP_EXTENDEDIO
-%token <i> PARSEOP_EXTENDEDMEMORY
-%token <i> PARSEOP_EXTENDEDSPACE
-%token <i> PARSEOP_EXTERNAL
-%token <i> PARSEOP_FATAL
-%token <i> PARSEOP_FIELD
-%token <i> PARSEOP_FINDSETLEFTBIT
-%token <i> PARSEOP_FINDSETRIGHTBIT
-%token <i> PARSEOP_FIXEDDMA
-%token <i> PARSEOP_FIXEDIO
-%token <i> PARSEOP_FLOWCONTROL_HW
-%token <i> PARSEOP_FLOWCONTROL_NONE
-%token <i> PARSEOP_FLOWCONTROL_SW
-%token <i> PARSEOP_FROMBCD
-%token <i> PARSEOP_FUNCTION
-%token <i> PARSEOP_GPIO_INT
-%token <i> PARSEOP_GPIO_IO
-%token <i> PARSEOP_I2C_SERIALBUS
-%token <i> PARSEOP_IF
-%token <i> PARSEOP_INCLUDE
-%token <i> PARSEOP_INCLUDE_END
-%token <i> PARSEOP_INCREMENT
-%token <i> PARSEOP_INDEX
-%token <i> PARSEOP_INDEXFIELD
-%token <i> PARSEOP_INTEGER
-%token <i> PARSEOP_INTERRUPT
-%token <i> PARSEOP_INTLEVEL_ACTIVEBOTH
-%token <i> PARSEOP_INTLEVEL_ACTIVEHIGH
-%token <i> PARSEOP_INTLEVEL_ACTIVELOW
-%token <i> PARSEOP_INTTYPE_EDGE
-%token <i> PARSEOP_INTTYPE_LEVEL
-%token <i> PARSEOP_IO
-%token <i> PARSEOP_IODECODETYPE_10
-%token <i> PARSEOP_IODECODETYPE_16
-%token <i> PARSEOP_IORESTRICT_IN
-%token <i> PARSEOP_IORESTRICT_NONE
-%token <i> PARSEOP_IORESTRICT_OUT
-%token <i> PARSEOP_IORESTRICT_PRESERVE
-%token <i> PARSEOP_IRQ
-%token <i> PARSEOP_IRQNOFLAGS
-%token <i> PARSEOP_LAND
-%token <i> PARSEOP_LEQUAL
-%token <i> PARSEOP_LGREATER
-%token <i> PARSEOP_LGREATEREQUAL
-%token <i> PARSEOP_LLESS
-%token <i> PARSEOP_LLESSEQUAL
-%token <i> PARSEOP_LNOT
-%token <i> PARSEOP_LNOTEQUAL
-%token <i> PARSEOP_LOAD
-%token <i> PARSEOP_LOADTABLE
-%token <i> PARSEOP_LOCAL0
-%token <i> PARSEOP_LOCAL1
-%token <i> PARSEOP_LOCAL2
-%token <i> PARSEOP_LOCAL3
-%token <i> PARSEOP_LOCAL4
-%token <i> PARSEOP_LOCAL5
-%token <i> PARSEOP_LOCAL6
-%token <i> PARSEOP_LOCAL7
-%token <i> PARSEOP_LOCKRULE_LOCK
-%token <i> PARSEOP_LOCKRULE_NOLOCK
-%token <i> PARSEOP_LOR
-%token <i> PARSEOP_MATCH
-%token <i> PARSEOP_MATCHTYPE_MEQ
-%token <i> PARSEOP_MATCHTYPE_MGE
-%token <i> PARSEOP_MATCHTYPE_MGT
-%token <i> PARSEOP_MATCHTYPE_MLE
-%token <i> PARSEOP_MATCHTYPE_MLT
-%token <i> PARSEOP_MATCHTYPE_MTR
-%token <i> PARSEOP_MAXTYPE_FIXED
-%token <i> PARSEOP_MAXTYPE_NOTFIXED
-%token <i> PARSEOP_MEMORY24
-%token <i> PARSEOP_MEMORY32
-%token <i> PARSEOP_MEMORY32FIXED
-%token <i> PARSEOP_MEMTYPE_CACHEABLE
-%token <i> PARSEOP_MEMTYPE_NONCACHEABLE
-%token <i> PARSEOP_MEMTYPE_PREFETCHABLE
-%token <i> PARSEOP_MEMTYPE_WRITECOMBINING
-%token <i> PARSEOP_METHOD
-%token <i> PARSEOP_METHODCALL
-%token <i> PARSEOP_MID
-%token <i> PARSEOP_MINTYPE_FIXED
-%token <i> PARSEOP_MINTYPE_NOTFIXED
-%token <i> PARSEOP_MOD
-%token <i> PARSEOP_MULTIPLY
-%token <i> PARSEOP_MUTEX
-%token <i> PARSEOP_NAME
-%token <s> PARSEOP_NAMESEG
-%token <s> PARSEOP_NAMESTRING
-%token <i> PARSEOP_NAND
-%token <i> PARSEOP_NOOP
-%token <i> PARSEOP_NOR
-%token <i> PARSEOP_NOT
-%token <i> PARSEOP_NOTIFY
-%token <i> PARSEOP_OBJECTTYPE
-%token <i> PARSEOP_OBJECTTYPE_BFF
-%token <i> PARSEOP_OBJECTTYPE_BUF
-%token <i> PARSEOP_OBJECTTYPE_DDB
-%token <i> PARSEOP_OBJECTTYPE_DEV
-%token <i> PARSEOP_OBJECTTYPE_EVT
-%token <i> PARSEOP_OBJECTTYPE_FLD
-%token <i> PARSEOP_OBJECTTYPE_INT
-%token <i> PARSEOP_OBJECTTYPE_MTH
-%token <i> PARSEOP_OBJECTTYPE_MTX
-%token <i> PARSEOP_OBJECTTYPE_OPR
-%token <i> PARSEOP_OBJECTTYPE_PKG
-%token <i> PARSEOP_OBJECTTYPE_POW
-%token <i> PARSEOP_OBJECTTYPE_PRO
-%token <i> PARSEOP_OBJECTTYPE_STR
-%token <i> PARSEOP_OBJECTTYPE_THZ
-%token <i> PARSEOP_OBJECTTYPE_UNK
-%token <i> PARSEOP_OFFSET
-%token <i> PARSEOP_ONE
-%token <i> PARSEOP_ONES
-%token <i> PARSEOP_OPERATIONREGION
-%token <i> PARSEOP_OR
-%token <i> PARSEOP_PACKAGE
-%token <i> PARSEOP_PACKAGE_LENGTH
-%token <i> PARSEOP_PARITYTYPE_EVEN
-%token <i> PARSEOP_PARITYTYPE_MARK
-%token <i> PARSEOP_PARITYTYPE_NONE
-%token <i> PARSEOP_PARITYTYPE_ODD
-%token <i> PARSEOP_PARITYTYPE_SPACE
-%token <i> PARSEOP_PIN_NOPULL
-%token <i> PARSEOP_PIN_PULLDEFAULT
-%token <i> PARSEOP_PIN_PULLDOWN
-%token <i> PARSEOP_PIN_PULLUP
-%token <i> PARSEOP_POWERRESOURCE
-%token <i> PARSEOP_PROCESSOR
-%token <i> PARSEOP_QWORDCONST
-%token <i> PARSEOP_QWORDIO
-%token <i> PARSEOP_QWORDMEMORY
-%token <i> PARSEOP_QWORDSPACE
-%token <i> PARSEOP_RANGETYPE_ENTIRE
-%token <i> PARSEOP_RANGETYPE_ISAONLY
-%token <i> PARSEOP_RANGETYPE_NONISAONLY
-%token <i> PARSEOP_RAW_DATA
-%token <i> PARSEOP_READWRITETYPE_BOTH
-%token <i> PARSEOP_READWRITETYPE_READONLY
-%token <i> PARSEOP_REFOF
-%token <i> PARSEOP_REGIONSPACE_CMOS
-%token <i> PARSEOP_REGIONSPACE_EC
-%token <i> PARSEOP_REGIONSPACE_FFIXEDHW
-%token <i> PARSEOP_REGIONSPACE_GPIO
-%token <i> PARSEOP_REGIONSPACE_GSBUS
-%token <i> PARSEOP_REGIONSPACE_IO
-%token <i> PARSEOP_REGIONSPACE_IPMI
-%token <i> PARSEOP_REGIONSPACE_MEM
-%token <i> PARSEOP_REGIONSPACE_PCC
-%token <i> PARSEOP_REGIONSPACE_PCI
-%token <i> PARSEOP_REGIONSPACE_PCIBAR
-%token <i> PARSEOP_REGIONSPACE_SMBUS
-%token <i> PARSEOP_REGISTER
-%token <i> PARSEOP_RELEASE
-%token <i> PARSEOP_RESERVED_BYTES
-%token <i> PARSEOP_RESET
-%token <i> PARSEOP_RESOURCETEMPLATE
-%token <i> PARSEOP_RESOURCETYPE_CONSUMER
-%token <i> PARSEOP_RESOURCETYPE_PRODUCER
-%token <i> PARSEOP_RETURN
-%token <i> PARSEOP_REVISION
-%token <i> PARSEOP_SCOPE
-%token <i> PARSEOP_SERIALIZERULE_NOTSERIAL
-%token <i> PARSEOP_SERIALIZERULE_SERIAL
-%token <i> PARSEOP_SHARETYPE_EXCLUSIVE
-%token <i> PARSEOP_SHARETYPE_EXCLUSIVEWAKE
-%token <i> PARSEOP_SHARETYPE_SHARED
-%token <i> PARSEOP_SHARETYPE_SHAREDWAKE
-%token <i> PARSEOP_SHIFTLEFT
-%token <i> PARSEOP_SHIFTRIGHT
-%token <i> PARSEOP_SIGNAL
-%token <i> PARSEOP_SIZEOF
-%token <i> PARSEOP_SLAVEMODE_CONTROLLERINIT
-%token <i> PARSEOP_SLAVEMODE_DEVICEINIT
-%token <i> PARSEOP_SLEEP
-%token <i> PARSEOP_SPI_SERIALBUS
-%token <i> PARSEOP_STALL
-%token <i> PARSEOP_STARTDEPENDENTFN
-%token <i> PARSEOP_STARTDEPENDENTFN_NOPRI
-%token <i> PARSEOP_STOPBITS_ONE
-%token <i> PARSEOP_STOPBITS_ONEPLUSHALF
-%token <i> PARSEOP_STOPBITS_TWO
-%token <i> PARSEOP_STOPBITS_ZERO
-%token <i> PARSEOP_STORE
-%token <s> PARSEOP_STRING_LITERAL
-%token <i> PARSEOP_SUBTRACT
-%token <i> PARSEOP_SWITCH
-%token <i> PARSEOP_THERMALZONE
-%token <i> PARSEOP_TIMER
-%token <i> PARSEOP_TOBCD
-%token <i> PARSEOP_TOBUFFER
-%token <i> PARSEOP_TODECIMALSTRING
-%token <i> PARSEOP_TOHEXSTRING
-%token <i> PARSEOP_TOINTEGER
-%token <i> PARSEOP_TOSTRING
-%token <i> PARSEOP_TOUUID
-%token <i> PARSEOP_TRANSLATIONTYPE_DENSE
-%token <i> PARSEOP_TRANSLATIONTYPE_SPARSE
-%token <i> PARSEOP_TYPE_STATIC
-%token <i> PARSEOP_TYPE_TRANSLATION
-%token <i> PARSEOP_UART_SERIALBUS
-%token <i> PARSEOP_UNICODE
-%token <i> PARSEOP_UNLOAD
-%token <i> PARSEOP_UPDATERULE_ONES
-%token <i> PARSEOP_UPDATERULE_PRESERVE
-%token <i> PARSEOP_UPDATERULE_ZEROS
-%token <i> PARSEOP_VAR_PACKAGE
-%token <i> PARSEOP_VENDORLONG
-%token <i> PARSEOP_VENDORSHORT
-%token <i> PARSEOP_WAIT
-%token <i> PARSEOP_WHILE
-%token <i> PARSEOP_WIREMODE_FOUR
-%token <i> PARSEOP_WIREMODE_THREE
-%token <i> PARSEOP_WORDBUSNUMBER
-%token <i> PARSEOP_WORDCONST
-%token <i> PARSEOP_WORDIO
-%token <i> PARSEOP_WORDSPACE
-%token <i> PARSEOP_XFERSIZE_8
-%token <i> PARSEOP_XFERSIZE_16
-%token <i> PARSEOP_XFERSIZE_32
-%token <i> PARSEOP_XFERSIZE_64
-%token <i> PARSEOP_XFERSIZE_128
-%token <i> PARSEOP_XFERSIZE_256
-%token <i> PARSEOP_XFERTYPE_8
-%token <i> PARSEOP_XFERTYPE_8_16
-%token <i> PARSEOP_XFERTYPE_16
-%token <i> PARSEOP_XOR
-%token <i> PARSEOP_ZERO
-
-/*
- * Special functions. These should probably stay at the end of this
- * table.
- */
-%token <i> PARSEOP___DATE__
-%token <i> PARSEOP___FILE__
-%token <i> PARSEOP___LINE__
-%token <i> PARSEOP___PATH__
-
-
-/******************************************************************************
- *
- * Production names
- *
- *****************************************************************************/
-
-%type <n> ArgList
-%type <n> ASLCode
-%type <n> BufferData
-%type <n> BufferTermData
-%type <n> CompilerDirective
-%type <n> DataObject
-%type <n> DefinitionBlockTerm
-%type <n> IntegerData
-%type <n> NamedObject
-%type <n> NameSpaceModifier
-%type <n> Object
-%type <n> ObjectList
-%type <n> PackageData
-%type <n> ParameterTypePackage
-%type <n> ParameterTypePackageList
-%type <n> ParameterTypesPackage
-%type <n> ParameterTypesPackageList
-%type <n> RequiredTarget
-%type <n> SimpleTarget
-%type <n> StringData
-%type <n> Target
-%type <n> Term
-%type <n> TermArg
-%type <n> TermList
-%type <n> UserTerm
-
-/* Type4Opcode is obsolete */
-
-%type <n> Type1Opcode
-%type <n> Type2BufferOpcode
-%type <n> Type2BufferOrStringOpcode
-%type <n> Type2IntegerOpcode
-%type <n> Type2Opcode
-%type <n> Type2StringOpcode
-%type <n> Type3Opcode
-%type <n> Type5Opcode
-%type <n> Type6Opcode
-
-%type <n> AccessAsTerm
-%type <n> ExternalTerm
-%type <n> FieldUnit
-%type <n> FieldUnitEntry
-%type <n> FieldUnitList
-%type <n> IncludeTerm
-%type <n> OffsetTerm
-%type <n> OptionalAccessAttribTerm
-
-/* Named Objects */
-
-%type <n> BankFieldTerm
-%type <n> CreateBitFieldTerm
-%type <n> CreateByteFieldTerm
-%type <n> CreateDWordFieldTerm
-%type <n> CreateFieldTerm
-%type <n> CreateQWordFieldTerm
-%type <n> CreateWordFieldTerm
-%type <n> DataRegionTerm
-%type <n> DeviceTerm
-%type <n> EventTerm
-%type <n> FieldTerm
-%type <n> FunctionTerm
-%type <n> IndexFieldTerm
-%type <n> MethodTerm
-%type <n> MutexTerm
-%type <n> OpRegionTerm
-%type <n> OpRegionSpaceIdTerm
-%type <n> PowerResTerm
-%type <n> ProcessorTerm
-%type <n> ThermalZoneTerm
-
-/* Namespace modifiers */
-
-%type <n> AliasTerm
-%type <n> NameTerm
-%type <n> ScopeTerm
-
-/* Type 1 opcodes */
-
-%type <n> BreakPointTerm
-%type <n> BreakTerm
-%type <n> CaseDefaultTermList
-%type <n> CaseTerm
-%type <n> ContinueTerm
-%type <n> DefaultTerm
-%type <n> ElseTerm
-%type <n> FatalTerm
-%type <n> IfElseTerm
-%type <n> IfTerm
-%type <n> LoadTerm
-%type <n> NoOpTerm
-%type <n> NotifyTerm
-%type <n> ReleaseTerm
-%type <n> ResetTerm
-%type <n> ReturnTerm
-%type <n> SignalTerm
-%type <n> SleepTerm
-%type <n> StallTerm
-%type <n> SwitchTerm
-%type <n> UnloadTerm
-%type <n> WhileTerm
-/* %type <n> CaseTermList */
-
-/* Type 2 opcodes */
-
-%type <n> AcquireTerm
-%type <n> AddTerm
-%type <n> AndTerm
-%type <n> ConcatResTerm
-%type <n> ConcatTerm
-%type <n> CondRefOfTerm
-%type <n> CopyObjectTerm
-%type <n> DecTerm
-%type <n> DerefOfTerm
-%type <n> DivideTerm
-%type <n> FindSetLeftBitTerm
-%type <n> FindSetRightBitTerm
-%type <n> FromBCDTerm
-%type <n> IncTerm
-%type <n> IndexTerm
-%type <n> LAndTerm
-%type <n> LEqualTerm
-%type <n> LGreaterEqualTerm
-%type <n> LGreaterTerm
-%type <n> LLessEqualTerm
-%type <n> LLessTerm
-%type <n> LNotEqualTerm
-%type <n> LNotTerm
-%type <n> LoadTableTerm
-%type <n> LOrTerm
-%type <n> MatchTerm
-%type <n> MidTerm
-%type <n> ModTerm
-%type <n> MultiplyTerm
-%type <n> NAndTerm
-%type <n> NOrTerm
-%type <n> NotTerm
-%type <n> ObjectTypeTerm
-%type <n> OrTerm
-%type <n> RefOfTerm
-%type <n> ShiftLeftTerm
-%type <n> ShiftRightTerm
-%type <n> SizeOfTerm
-%type <n> StoreTerm
-%type <n> SubtractTerm
-%type <n> TimerTerm
-%type <n> ToBCDTerm
-%type <n> ToBufferTerm
-%type <n> ToDecimalStringTerm
-%type <n> ToHexStringTerm
-%type <n> ToIntegerTerm
-%type <n> ToStringTerm
-%type <n> WaitTerm
-%type <n> XOrTerm
-
-/* Keywords */
-
-%type <n> AccessAttribKeyword
-%type <n> AccessTypeKeyword
-%type <n> AddressingModeKeyword
-%type <n> AddressKeyword
-%type <n> AddressSpaceKeyword
-%type <n> BitsPerByteKeyword
-%type <n> ClockPhaseKeyword
-%type <n> ClockPolarityKeyword
-%type <n> DecodeKeyword
-%type <n> DevicePolarityKeyword
-%type <n> DMATypeKeyword
-%type <n> EndianKeyword
-%type <n> FlowControlKeyword
-%type <n> InterruptLevel
-%type <n> InterruptTypeKeyword
-%type <n> IODecodeKeyword
-%type <n> IoRestrictionKeyword
-%type <n> LockRuleKeyword
-%type <n> MatchOpKeyword
-%type <n> MaxKeyword
-%type <n> MemTypeKeyword
-%type <n> MinKeyword
-%type <n> ObjectTypeKeyword
-%type <n> OptionalBusMasterKeyword
-%type <n> OptionalReadWriteKeyword
-%type <n> ParityTypeKeyword
-%type <n> PinConfigByte
-%type <n> PinConfigKeyword
-%type <n> RangeTypeKeyword
-%type <n> RegionSpaceKeyword
-%type <n> ResourceTypeKeyword
-%type <n> SerializeRuleKeyword
-%type <n> ShareTypeKeyword
-%type <n> SlaveModeKeyword
-%type <n> StopBitsKeyword
-%type <n> TranslationKeyword
-%type <n> TypeKeyword
-%type <n> UpdateRuleKeyword
-%type <n> WireModeKeyword
-%type <n> XferSizeKeyword
-%type <n> XferTypeKeyword
-
-/* Types */
-
-%type <n> SuperName
-%type <n> ObjectTypeName
-%type <n> ArgTerm
-%type <n> LocalTerm
-%type <n> DebugTerm
-
-%type <n> Integer
-%type <n> ByteConst
-%type <n> WordConst
-%type <n> DWordConst
-%type <n> QWordConst
-%type <n> String
-
-%type <n> ConstTerm
-%type <n> ConstExprTerm
-%type <n> ByteConstExpr
-%type <n> WordConstExpr
-%type <n> DWordConstExpr
-%type <n> QWordConstExpr
-
-%type <n> DWordList
-%type <n> BufferTerm
-%type <n> ByteList
-
-%type <n> PackageElement
-%type <n> PackageList
-%type <n> PackageTerm
-%type <n> VarPackageLengthTerm
-
-/* Macros */
-
-%type <n> EISAIDTerm
-%type <n> ResourceMacroList
-%type <n> ResourceMacroTerm
-%type <n> ResourceTemplateTerm
-%type <n> ToUUIDTerm
-%type <n> UnicodeTerm
-
-/* Resource Descriptors */
-
-%type <n> ConnectionTerm
-%type <n> DataBufferTerm
-%type <n> DMATerm
-%type <n> DWordIOTerm
-%type <n> DWordMemoryTerm
-%type <n> DWordSpaceTerm
-%type <n> EndDependentFnTerm
-%type <n> ExtendedIOTerm
-%type <n> ExtendedMemoryTerm
-%type <n> ExtendedSpaceTerm
-%type <n> FixedDmaTerm
-%type <n> FixedIOTerm
-%type <n> GpioIntTerm
-%type <n> GpioIoTerm
-%type <n> I2cSerialBusTerm
-%type <n> InterruptTerm
-%type <n> IOTerm
-%type <n> IRQNoFlagsTerm
-%type <n> IRQTerm
-%type <n> Memory24Term
-%type <n> Memory32FixedTerm
-%type <n> Memory32Term
-%type <n> NameSeg
-%type <n> NameString
-%type <n> QWordIOTerm
-%type <n> QWordMemoryTerm
-%type <n> QWordSpaceTerm
-%type <n> RegisterTerm
-%type <n> SpiSerialBusTerm
-%type <n> StartDependentFnNoPriTerm
-%type <n> StartDependentFnTerm
-%type <n> UartSerialBusTerm
-%type <n> VendorLongTerm
-%type <n> VendorShortTerm
-%type <n> WordBusNumberTerm
-%type <n> WordIOTerm
-%type <n> WordSpaceTerm
-
-/* Local types that help construct the AML, not in ACPI spec */
-
-%type <n> AmlPackageLengthTerm
-%type <n> IncludeEndTerm
-%type <n> NameStringItem
-%type <n> TermArgItem
-
-%type <n> OptionalAccessSize
-%type <n> OptionalAddressingMode
-%type <n> OptionalAddressRange
-%type <n> OptionalBitsPerByte
-%type <n> OptionalBuffer_Last
-%type <n> OptionalByteConstExpr
-%type <n> OptionalCount
-%type <n> OptionalDecodeType
-%type <n> OptionalDevicePolarity
-%type <n> OptionalDWordConstExpr
-%type <n> OptionalEndian
-%type <n> OptionalFlowControl
-%type <n> OptionalIoRestriction
-%type <n> OptionalListString
-%type <n> OptionalMaxType
-%type <n> OptionalMemType
-%type <n> OptionalMinType
-%type <n> OptionalNameString
-%type <n> OptionalNameString_First
-%type <n> OptionalNameString_Last
-%type <n> OptionalObjectTypeKeyword
-%type <n> OptionalParameterTypePackage
-%type <n> OptionalParameterTypesPackage
-%type <n> OptionalParityType
-%type <n> OptionalQWordConstExpr
-%type <n> OptionalRangeType
-%type <n> OptionalReference
-%type <n> OptionalResourceType
-%type <n> OptionalResourceType_First
-%type <n> OptionalReturnArg
-%type <n> OptionalSerializeRuleKeyword
-%type <n> OptionalShareType
-%type <n> OptionalShareType_First
-%type <n> OptionalSlaveMode
-%type <n> OptionalStopBits
-%type <n> OptionalStringData
-%type <n> OptionalTermArg
-%type <n> OptionalTranslationType_Last
-%type <n> OptionalType
-%type <n> OptionalType_Last
-%type <n> OptionalWireMode
-%type <n> OptionalWordConst
-%type <n> OptionalWordConstExpr
-%type <n> OptionalXferSize
-
-%%
 /*******************************************************************************
  *
  * Production rules start here
@@ -799,10 +52,7 @@ void *                      AslLocalAllocate (unsigned int Size);
 
 /*
  * ASL Names
- */
-
-
-/*
+ *
  * Root rule. Allow multiple #line directives before the definition block
  * to handle output from preprocessors
  */
@@ -3511,77 +2761,3 @@ OptionalXferSize
     | ','                           {$$ = TrCreateValuedLeafNode (PARSEOP_XFERSIZE_32, 2);}
     | ',' XferSizeKeyword           {$$ = $2;}
     ;
-
-%%
-/******************************************************************************
- *
- * Local support functions
- *
- *****************************************************************************/
-
-int
-AslCompilerwrap(void)
-{
-  return (1);
-}
-
-/*! [End] no source code translation !*/
-
-void *
-AslLocalAllocate (unsigned int Size)
-{
-    void                *Mem;
-
-
-    DbgPrint (ASL_PARSE_OUTPUT, "\nAslLocalAllocate: Expanding Stack to %u\n\n", Size);
-
-    Mem = ACPI_ALLOCATE_ZEROED (Size);
-    if (!Mem)
-    {
-        AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION,
-                        Gbl_CurrentLineNumber, Gbl_LogicalLineNumber,
-                        Gbl_InputByteCount, Gbl_CurrentColumn,
-                        Gbl_Files[ASL_FILE_INPUT].Filename, NULL);
-        exit (1);
-    }
-
-    return (Mem);
-}
-
-ACPI_PARSE_OBJECT *
-AslDoError (void)
-{
-
-
-    return (TrCreateLeafNode (PARSEOP_ERRORNODE));
-
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    UtGetOpName
- *
- * PARAMETERS:  ParseOpcode         - Parser keyword ID
- *
- * RETURN:      Pointer to the opcode name
- *
- * DESCRIPTION: Get the ascii name of the parse opcode
- *
- ******************************************************************************/
-
-char *
-UtGetOpName (
-    UINT32                  ParseOpcode)
-{
-#ifdef ASL_YYTNAME_START
-    /*
-     * First entries (ASL_YYTNAME_START) in yytname are special reserved names.
-     * Ignore first 8 characters of the name
-     */
-    return ((char *) yytname
-        [(ParseOpcode - ASL_FIRST_PARSE_OPCODE) + ASL_YYTNAME_START] + 8);
-#else
-    return ("[Unknown parser generator]");
-#endif
-}
diff --git a/sys/contrib/dev/acpica/compiler/aslstartup.c b/sys/contrib/dev/acpica/compiler/aslstartup.c
index e50b103c7253..56603be4c3cf 100644
--- a/sys/contrib/dev/acpica/compiler/aslstartup.c
+++ b/sys/contrib/dev/acpica/compiler/aslstartup.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include <contrib/dev/acpica/include/actables.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
@@ -51,18 +50,8 @@
         ACPI_MODULE_NAME    ("aslstartup")
 
 
-#define ASL_MAX_FILES   256
-static char             *FileList[ASL_MAX_FILES];
-static BOOLEAN          AslToFile = TRUE;
-
-
 /* Local prototypes */
 
-static char **
-AsDoWildcard (
-    char                    *DirectoryPathname,
-    char                    *FileSpecifier);
-
 static UINT8
 AslDetectSourceFileType (
     ASL_FILE_INFO           *Info);
@@ -72,6 +61,11 @@ AslDoDisassembly (
     void);
 
 
+/* Globals */
+
+static BOOLEAN          AslToFile = TRUE;
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AslInitializeGlobals
@@ -131,82 +125,6 @@ AslInitializeGlobals (
 }
 
 
-/******************************************************************************
- *
- * FUNCTION:    AsDoWildcard
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Process files via wildcards. This function is for the Windows
- *              case only.
- *
- ******************************************************************************/
-
-static char **
-AsDoWildcard (
-    char                    *DirectoryPathname,
-    char                    *FileSpecifier)
-{
-#ifdef WIN32
-    void                    *DirInfo;
-    char                    *Filename;
-    int                     FileCount;
-
-
-    FileCount = 0;
-
-    /* Open parent directory */
-
-    DirInfo = AcpiOsOpenDirectory (DirectoryPathname, FileSpecifier, REQUEST_FILE_ONLY);
-    if (!DirInfo)
-    {
-        /* Either the directory of file does not exist */
-
-        Gbl_Files[ASL_FILE_INPUT].Filename = FileSpecifier;
-        FlFileError (ASL_FILE_INPUT, ASL_MSG_OPEN);
-        AslAbort ();
-    }
-
-    /* Process each file that matches the wildcard specification */
-
-    while ((Filename = AcpiOsGetNextFilename (DirInfo)))
-    {
-        /* Add the filename to the file list */
-
-        FileList[FileCount] = AcpiOsAllocate (strlen (Filename) + 1);
-        strcpy (FileList[FileCount], Filename);
-        FileCount++;
-
-        if (FileCount >= ASL_MAX_FILES)
-        {
-            printf ("Max files reached\n");
-            FileList[0] = NULL;
-            return (FileList);
-        }
-    }
-
-    /* Cleanup */
-
-    AcpiOsCloseDirectory (DirInfo);
-    FileList[FileCount] = NULL;
-    return (FileList);
-
-#else
-    /*
-     * Linux/Unix cases - Wildcards are expanded by the shell automatically.
-     * Just return the filename in a null terminated list
-     */
-    FileList[0] = AcpiOsAllocate (strlen (FileSpecifier) + 1);
-    strcpy (FileList[0], FileSpecifier);
-    FileList[1] = NULL;
-
-    return (FileList);
-#endif
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AslDetectSourceFileType
@@ -332,7 +250,7 @@ AslDoDisassembly (
     AcpiGbl_DbOpt_disasm = TRUE;
     Status = AdAmlDisassemble (AslToFile,
         Gbl_Files[ASL_FILE_INPUT].Filename, Gbl_OutputFilenamePrefix,
-        &Gbl_Files[ASL_FILE_INPUT].Filename, Gbl_GetAllTables);
+        &Gbl_Files[ASL_FILE_INPUT].Filename);
     if (ACPI_FAILURE (Status))
     {
         return (Status);
@@ -365,8 +283,11 @@ AslDoDisassembly (
         return (AE_CTRL_CONTINUE);
     }
 
-    ACPI_FREE (Gbl_Files[ASL_FILE_INPUT].Filename);
+    /* No need to free the filename string */
+
     Gbl_Files[ASL_FILE_INPUT].Filename = NULL;
+
+    CmDeleteCaches ();
     return (AE_OK);
 }
 
@@ -395,12 +316,29 @@ AslDoOneFile (
     AslInitializeGlobals ();
     PrInitializeGlobals ();
 
-    Gbl_Files[ASL_FILE_INPUT].Filename = Filename;
+    /*
+     * Extract the directory path. This path is used for possible include
+     * files and the optional AML filename embedded in the input file
+     * DefinitionBlock declaration.
+     */
+    Status = FlSplitInputPathname (Filename, &Gbl_DirectoryPath, NULL);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    /* Take a copy of the input filename, convert any backslashes */
+
+    Gbl_Files[ASL_FILE_INPUT].Filename =
+        UtStringCacheCalloc (strlen (Filename) + 1);
+
+    strcpy (Gbl_Files[ASL_FILE_INPUT].Filename, Filename);
+    UtConvertBackslashes (Gbl_Files[ASL_FILE_INPUT].Filename);
 
     /*
      * AML Disassembly (Optional)
      */
-    if (Gbl_DisasmFlag || Gbl_GetAllTables)
+    if (Gbl_DisasmFlag)
     {
         Status = AslDoDisassembly ();
         if (Status != AE_CTRL_CONTINUE)
@@ -465,7 +403,6 @@ AslDoOneFile (
 
         if (Gbl_Signature)
         {
-            ACPI_FREE (Gbl_Signature);
             Gbl_Signature = NULL;
         }
 
@@ -541,77 +478,6 @@ AslDoOneFile (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AslDoOnePathname
- *
- * PARAMETERS:  Pathname            - Full pathname, possibly with wildcards
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Process one pathname, possible terminated with a wildcard
- *              specification. If a wildcard, it is expanded and the multiple
- *              files are processed.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AslDoOnePathname (
-    char                    *Pathname,
-    ASL_PATHNAME_CALLBACK   PathCallback)
-{
-    ACPI_STATUS             Status = AE_OK;
-    char                    **WildcardList;
-    char                    *Filename;
-    char                    *FullPathname;
-
-
-    /* Split incoming path into a directory/filename combo */
-
-    Status = FlSplitInputPathname (Pathname, &Gbl_DirectoryPath, &Filename);
-    if (ACPI_FAILURE (Status))
-    {
-        return (Status);
-    }
-
-    /* Expand possible wildcard into a file list (Windows/DOS only) */
-
-    WildcardList = AsDoWildcard (Gbl_DirectoryPath, Filename);
-    while (*WildcardList)
-    {
-        FullPathname = ACPI_ALLOCATE (
-            strlen (Gbl_DirectoryPath) + strlen (*WildcardList) + 1);
-
-        /* Construct a full path to the file */
-
-        strcpy (FullPathname, Gbl_DirectoryPath);
-        strcat (FullPathname, *WildcardList);
-
-        /*
-         * If -p not specified, we will use the input filename as the
-         * output filename prefix
-         */
-        if (Gbl_UseDefaultAmlFilename)
-        {
-            Gbl_OutputFilenamePrefix = FullPathname;
-        }
-
-        /* Save status from all compiles */
-
-        Status |= (*PathCallback) (FullPathname);
-
-        ACPI_FREE (FullPathname);
-        ACPI_FREE (*WildcardList);
-        *WildcardList = NULL;
-        WildcardList++;
-    }
-
-    ACPI_FREE (Gbl_DirectoryPath);
-    ACPI_FREE (Filename);
-    return (Status);
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AslCheckForErrorExit
diff --git a/sys/contrib/dev/acpica/compiler/aslstubs.c b/sys/contrib/dev/acpica/compiler/aslstubs.c
index 9ac96980e795..ff05d9ac064f 100644
--- a/sys/contrib/dev/acpica/compiler/aslstubs.c
+++ b/sys/contrib/dev/acpica/compiler/aslstubs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,17 +53,10 @@
 
 
 /*
- * Stubs to simplify linkage to the ACPI CA core subsystem.
+ * Stubs to simplify linkage to the ACPICA core subsystem.
  * Things like Events, Global Lock, etc. are not used
  * by the compiler, so they are stubbed out here.
  */
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
-    void)
-{
-    return (0);
-}
-
 void
 AcpiNsExecModuleCodeList (
     void)
@@ -232,21 +225,3 @@ AcpiTbFindTable (
 {
     return (AE_SUPPORT);
 }
-
-/* OSL interfaces */
-
-ACPI_THREAD_ID
-AcpiOsGetThreadId (
-    void)
-{
-    return (0xFFFF);
-}
-
-ACPI_STATUS
-AcpiOsExecute (
-    ACPI_EXECUTE_TYPE       Type,
-    ACPI_OSD_EXEC_CALLBACK  Function,
-    void                    *Context)
-{
-    return (AE_SUPPORT);
-}
diff --git a/sys/contrib/dev/acpica/compiler/aslsupport.l b/sys/contrib/dev/acpica/compiler/aslsupport.l
index e7d2b1fac893..7ea43a07dba7 100644
--- a/sys/contrib/dev/acpica/compiler/aslsupport.l
+++ b/sys/contrib/dev/acpica/compiler/aslsupport.l
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 /* Configuration */
 
 #define ASL_SPACES_PER_TAB      4
@@ -70,6 +69,15 @@ typedef struct asl_file_node
 ASL_FILE_NODE               *Gbl_IncludeFileStack = NULL;
 
 
+void
+AslParserCleanup (
+    void)
+{
+
+    yy_delete_buffer (YY_CURRENT_BUFFER);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AslDoLineDirective
@@ -259,7 +267,11 @@ AslPushInputFileStack (
 
     /* Reset the global line count and filename */
 
-    Gbl_Files[ASL_FILE_INPUT].Filename = Filename;
+    Gbl_Files[ASL_FILE_INPUT].Filename =
+        UtStringCacheCalloc (strlen (Filename) + 1);
+
+    strcpy (Gbl_Files[ASL_FILE_INPUT].Filename, Filename);
+
     Gbl_CurrentLineNumber = 1;
     yyin = InputFile;
 }
@@ -797,7 +809,7 @@ CompletedString:
      */
     *StringBuffer = 0;
 
-    CleanString = UtGetStringBuffer (strlen (MsgBuffer) + 1);
+    CleanString = UtStringCacheCalloc (strlen (MsgBuffer) + 1);
     if (!CleanString)
     {
         AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION,
diff --git a/sys/contrib/dev/acpica/compiler/aslsupport.y b/sys/contrib/dev/acpica/compiler/aslsupport.y
new file mode 100644
index 000000000000..dfeca6e9b309
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/aslsupport.y
@@ -0,0 +1,120 @@
+NoEcho('
+/******************************************************************************
+ *
+ * Module Name: aslsupport.y - Bison/Yacc C support functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+')
+
+/******************************************************************************
+ *
+ * Local support functions
+ *
+ *****************************************************************************/
+
+/*! [Begin] no source code translation */
+int
+AslCompilerwrap(void)
+{
+  return (1);
+}
+/*! [End] no source code translation !*/
+
+
+void *
+AslLocalAllocate (
+    unsigned int        Size)
+{
+    void                *Mem;
+
+
+    DbgPrint (ASL_PARSE_OUTPUT,
+        "\nAslLocalAllocate: Expanding Stack to %u\n\n", Size);
+
+    Mem = ACPI_ALLOCATE_ZEROED (Size);
+    if (!Mem)
+    {
+        AslCommonError (ASL_ERROR, ASL_MSG_MEMORY_ALLOCATION,
+            Gbl_CurrentLineNumber, Gbl_LogicalLineNumber,
+            Gbl_InputByteCount, Gbl_CurrentColumn,
+            Gbl_Files[ASL_FILE_INPUT].Filename, NULL);
+        exit (1);
+    }
+
+    return (Mem);
+}
+
+ACPI_PARSE_OBJECT *
+AslDoError (
+    void)
+{
+
+    return (TrCreateLeafNode (PARSEOP_ERRORNODE));
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    UtGetOpName
+ *
+ * PARAMETERS:  ParseOpcode         - Parser keyword ID
+ *
+ * RETURN:      Pointer to the opcode name
+ *
+ * DESCRIPTION: Get the ascii name of the parse opcode
+ *
+ ******************************************************************************/
+
+char *
+UtGetOpName (
+    UINT32                  ParseOpcode)
+{
+#ifdef ASL_YYTNAME_START
+    /*
+     * First entries (ASL_YYTNAME_START) in yytname are special reserved names.
+     * Ignore first 8 characters of the name
+     */
+    return ((char *) yytname
+        [(ParseOpcode - ASL_FIRST_PARSE_OPCODE) + ASL_YYTNAME_START] + 8);
+#else
+    return ("[Unknown parser generator]");
+#endif
+}
diff --git a/sys/contrib/dev/acpica/compiler/asltokens.y b/sys/contrib/dev/acpica/compiler/asltokens.y
new file mode 100644
index 000000000000..c296fea30bec
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/asltokens.y
@@ -0,0 +1,386 @@
+NoEcho('
+/******************************************************************************
+ *
+ * Module Name: asltokens.y - Bison/Yacc token types
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+')
+
+/******************************************************************************
+ *
+ * Token types: These are returned by the lexer
+ *
+ * NOTE: This list MUST match the AslKeywordMapping table found
+ *       in aslmap.c EXACTLY!  Double check any changes!
+ *
+ *****************************************************************************/
+
+%token <i> PARSEOP_ACCESSAS
+%token <i> PARSEOP_ACCESSATTRIB_BLOCK
+%token <i> PARSEOP_ACCESSATTRIB_BLOCK_CALL
+%token <i> PARSEOP_ACCESSATTRIB_BYTE
+%token <i> PARSEOP_ACCESSATTRIB_MULTIBYTE
+%token <i> PARSEOP_ACCESSATTRIB_QUICK
+%token <i> PARSEOP_ACCESSATTRIB_RAW_BYTES
+%token <i> PARSEOP_ACCESSATTRIB_RAW_PROCESS
+%token <i> PARSEOP_ACCESSATTRIB_SND_RCV
+%token <i> PARSEOP_ACCESSATTRIB_WORD
+%token <i> PARSEOP_ACCESSATTRIB_WORD_CALL
+%token <i> PARSEOP_ACCESSTYPE_ANY
+%token <i> PARSEOP_ACCESSTYPE_BUF
+%token <i> PARSEOP_ACCESSTYPE_BYTE
+%token <i> PARSEOP_ACCESSTYPE_DWORD
+%token <i> PARSEOP_ACCESSTYPE_QWORD
+%token <i> PARSEOP_ACCESSTYPE_WORD
+%token <i> PARSEOP_ACQUIRE
+%token <i> PARSEOP_ADD
+%token <i> PARSEOP_ADDRESSINGMODE_7BIT
+%token <i> PARSEOP_ADDRESSINGMODE_10BIT
+%token <i> PARSEOP_ADDRESSTYPE_ACPI
+%token <i> PARSEOP_ADDRESSTYPE_MEMORY
+%token <i> PARSEOP_ADDRESSTYPE_NVS
+%token <i> PARSEOP_ADDRESSTYPE_RESERVED
+%token <i> PARSEOP_ALIAS
+%token <i> PARSEOP_AND
+%token <i> PARSEOP_ARG0
+%token <i> PARSEOP_ARG1
+%token <i> PARSEOP_ARG2
+%token <i> PARSEOP_ARG3
+%token <i> PARSEOP_ARG4
+%token <i> PARSEOP_ARG5
+%token <i> PARSEOP_ARG6
+%token <i> PARSEOP_BANKFIELD
+%token <i> PARSEOP_BITSPERBYTE_EIGHT
+%token <i> PARSEOP_BITSPERBYTE_FIVE
+%token <i> PARSEOP_BITSPERBYTE_NINE
+%token <i> PARSEOP_BITSPERBYTE_SEVEN
+%token <i> PARSEOP_BITSPERBYTE_SIX
+%token <i> PARSEOP_BREAK
+%token <i> PARSEOP_BREAKPOINT
+%token <i> PARSEOP_BUFFER
+%token <i> PARSEOP_BUSMASTERTYPE_MASTER
+%token <i> PARSEOP_BUSMASTERTYPE_NOTMASTER
+%token <i> PARSEOP_BYTECONST
+%token <i> PARSEOP_CASE
+%token <i> PARSEOP_CLOCKPHASE_FIRST
+%token <i> PARSEOP_CLOCKPHASE_SECOND
+%token <i> PARSEOP_CLOCKPOLARITY_HIGH
+%token <i> PARSEOP_CLOCKPOLARITY_LOW
+%token <i> PARSEOP_CONCATENATE
+%token <i> PARSEOP_CONCATENATERESTEMPLATE
+%token <i> PARSEOP_CONDREFOF
+%token <i> PARSEOP_CONNECTION
+%token <i> PARSEOP_CONTINUE
+%token <i> PARSEOP_COPYOBJECT
+%token <i> PARSEOP_CREATEBITFIELD
+%token <i> PARSEOP_CREATEBYTEFIELD
+%token <i> PARSEOP_CREATEDWORDFIELD
+%token <i> PARSEOP_CREATEFIELD
+%token <i> PARSEOP_CREATEQWORDFIELD
+%token <i> PARSEOP_CREATEWORDFIELD
+%token <i> PARSEOP_DATABUFFER
+%token <i> PARSEOP_DATATABLEREGION
+%token <i> PARSEOP_DEBUG
+%token <i> PARSEOP_DECODETYPE_POS
+%token <i> PARSEOP_DECODETYPE_SUB
+%token <i> PARSEOP_DECREMENT
+%token <i> PARSEOP_DEFAULT
+%token <i> PARSEOP_DEFAULT_ARG
+%token <i> PARSEOP_DEFINITIONBLOCK
+%token <i> PARSEOP_DEREFOF
+%token <i> PARSEOP_DEVICE
+%token <i> PARSEOP_DEVICEPOLARITY_HIGH
+%token <i> PARSEOP_DEVICEPOLARITY_LOW
+%token <i> PARSEOP_DIVIDE
+%token <i> PARSEOP_DMA
+%token <i> PARSEOP_DMATYPE_A
+%token <i> PARSEOP_DMATYPE_COMPATIBILITY
+%token <i> PARSEOP_DMATYPE_B
+%token <i> PARSEOP_DMATYPE_F
+%token <i> PARSEOP_DWORDCONST
+%token <i> PARSEOP_DWORDIO
+%token <i> PARSEOP_DWORDMEMORY
+%token <i> PARSEOP_DWORDSPACE
+%token <i> PARSEOP_EISAID
+%token <i> PARSEOP_ELSE
+%token <i> PARSEOP_ELSEIF
+%token <i> PARSEOP_ENDDEPENDENTFN
+%token <i> PARSEOP_ENDIAN_BIG
+%token <i> PARSEOP_ENDIAN_LITTLE
+%token <i> PARSEOP_ENDTAG
+%token <i> PARSEOP_ERRORNODE
+%token <i> PARSEOP_EVENT
+%token <i> PARSEOP_EXTENDEDIO
+%token <i> PARSEOP_EXTENDEDMEMORY
+%token <i> PARSEOP_EXTENDEDSPACE
+%token <i> PARSEOP_EXTERNAL
+%token <i> PARSEOP_FATAL
+%token <i> PARSEOP_FIELD
+%token <i> PARSEOP_FINDSETLEFTBIT
+%token <i> PARSEOP_FINDSETRIGHTBIT
+%token <i> PARSEOP_FIXEDDMA
+%token <i> PARSEOP_FIXEDIO
+%token <i> PARSEOP_FLOWCONTROL_HW
+%token <i> PARSEOP_FLOWCONTROL_NONE
+%token <i> PARSEOP_FLOWCONTROL_SW
+%token <i> PARSEOP_FROMBCD
+%token <i> PARSEOP_FUNCTION
+%token <i> PARSEOP_GPIO_INT
+%token <i> PARSEOP_GPIO_IO
+%token <i> PARSEOP_I2C_SERIALBUS
+%token <i> PARSEOP_IF
+%token <i> PARSEOP_INCLUDE
+%token <i> PARSEOP_INCLUDE_END
+%token <i> PARSEOP_INCREMENT
+%token <i> PARSEOP_INDEX
+%token <i> PARSEOP_INDEXFIELD
+%token <i> PARSEOP_INTEGER
+%token <i> PARSEOP_INTERRUPT
+%token <i> PARSEOP_INTLEVEL_ACTIVEBOTH
+%token <i> PARSEOP_INTLEVEL_ACTIVEHIGH
+%token <i> PARSEOP_INTLEVEL_ACTIVELOW
+%token <i> PARSEOP_INTTYPE_EDGE
+%token <i> PARSEOP_INTTYPE_LEVEL
+%token <i> PARSEOP_IO
+%token <i> PARSEOP_IODECODETYPE_10
+%token <i> PARSEOP_IODECODETYPE_16
+%token <i> PARSEOP_IORESTRICT_IN
+%token <i> PARSEOP_IORESTRICT_NONE
+%token <i> PARSEOP_IORESTRICT_OUT
+%token <i> PARSEOP_IORESTRICT_PRESERVE
+%token <i> PARSEOP_IRQ
+%token <i> PARSEOP_IRQNOFLAGS
+%token <i> PARSEOP_LAND
+%token <i> PARSEOP_LEQUAL
+%token <i> PARSEOP_LGREATER
+%token <i> PARSEOP_LGREATEREQUAL
+%token <i> PARSEOP_LLESS
+%token <i> PARSEOP_LLESSEQUAL
+%token <i> PARSEOP_LNOT
+%token <i> PARSEOP_LNOTEQUAL
+%token <i> PARSEOP_LOAD
+%token <i> PARSEOP_LOADTABLE
+%token <i> PARSEOP_LOCAL0
+%token <i> PARSEOP_LOCAL1
+%token <i> PARSEOP_LOCAL2
+%token <i> PARSEOP_LOCAL3
+%token <i> PARSEOP_LOCAL4
+%token <i> PARSEOP_LOCAL5
+%token <i> PARSEOP_LOCAL6
+%token <i> PARSEOP_LOCAL7
+%token <i> PARSEOP_LOCKRULE_LOCK
+%token <i> PARSEOP_LOCKRULE_NOLOCK
+%token <i> PARSEOP_LOR
+%token <i> PARSEOP_MATCH
+%token <i> PARSEOP_MATCHTYPE_MEQ
+%token <i> PARSEOP_MATCHTYPE_MGE
+%token <i> PARSEOP_MATCHTYPE_MGT
+%token <i> PARSEOP_MATCHTYPE_MLE
+%token <i> PARSEOP_MATCHTYPE_MLT
+%token <i> PARSEOP_MATCHTYPE_MTR
+%token <i> PARSEOP_MAXTYPE_FIXED
+%token <i> PARSEOP_MAXTYPE_NOTFIXED
+%token <i> PARSEOP_MEMORY24
+%token <i> PARSEOP_MEMORY32
+%token <i> PARSEOP_MEMORY32FIXED
+%token <i> PARSEOP_MEMTYPE_CACHEABLE
+%token <i> PARSEOP_MEMTYPE_NONCACHEABLE
+%token <i> PARSEOP_MEMTYPE_PREFETCHABLE
+%token <i> PARSEOP_MEMTYPE_WRITECOMBINING
+%token <i> PARSEOP_METHOD
+%token <i> PARSEOP_METHODCALL
+%token <i> PARSEOP_MID
+%token <i> PARSEOP_MINTYPE_FIXED
+%token <i> PARSEOP_MINTYPE_NOTFIXED
+%token <i> PARSEOP_MOD
+%token <i> PARSEOP_MULTIPLY
+%token <i> PARSEOP_MUTEX
+%token <i> PARSEOP_NAME
+%token <s> PARSEOP_NAMESEG
+%token <s> PARSEOP_NAMESTRING
+%token <i> PARSEOP_NAND
+%token <i> PARSEOP_NOOP
+%token <i> PARSEOP_NOR
+%token <i> PARSEOP_NOT
+%token <i> PARSEOP_NOTIFY
+%token <i> PARSEOP_OBJECTTYPE
+%token <i> PARSEOP_OBJECTTYPE_BFF
+%token <i> PARSEOP_OBJECTTYPE_BUF
+%token <i> PARSEOP_OBJECTTYPE_DDB
+%token <i> PARSEOP_OBJECTTYPE_DEV
+%token <i> PARSEOP_OBJECTTYPE_EVT
+%token <i> PARSEOP_OBJECTTYPE_FLD
+%token <i> PARSEOP_OBJECTTYPE_INT
+%token <i> PARSEOP_OBJECTTYPE_MTH
+%token <i> PARSEOP_OBJECTTYPE_MTX
+%token <i> PARSEOP_OBJECTTYPE_OPR
+%token <i> PARSEOP_OBJECTTYPE_PKG
+%token <i> PARSEOP_OBJECTTYPE_POW
+%token <i> PARSEOP_OBJECTTYPE_PRO
+%token <i> PARSEOP_OBJECTTYPE_STR
+%token <i> PARSEOP_OBJECTTYPE_THZ
+%token <i> PARSEOP_OBJECTTYPE_UNK
+%token <i> PARSEOP_OFFSET
+%token <i> PARSEOP_ONE
+%token <i> PARSEOP_ONES
+%token <i> PARSEOP_OPERATIONREGION
+%token <i> PARSEOP_OR
+%token <i> PARSEOP_PACKAGE
+%token <i> PARSEOP_PACKAGE_LENGTH
+%token <i> PARSEOP_PARITYTYPE_EVEN
+%token <i> PARSEOP_PARITYTYPE_MARK
+%token <i> PARSEOP_PARITYTYPE_NONE
+%token <i> PARSEOP_PARITYTYPE_ODD
+%token <i> PARSEOP_PARITYTYPE_SPACE
+%token <i> PARSEOP_PIN_NOPULL
+%token <i> PARSEOP_PIN_PULLDEFAULT
+%token <i> PARSEOP_PIN_PULLDOWN
+%token <i> PARSEOP_PIN_PULLUP
+%token <i> PARSEOP_POWERRESOURCE
+%token <i> PARSEOP_PROCESSOR
+%token <i> PARSEOP_QWORDCONST
+%token <i> PARSEOP_QWORDIO
+%token <i> PARSEOP_QWORDMEMORY
+%token <i> PARSEOP_QWORDSPACE
+%token <i> PARSEOP_RANGETYPE_ENTIRE
+%token <i> PARSEOP_RANGETYPE_ISAONLY
+%token <i> PARSEOP_RANGETYPE_NONISAONLY
+%token <i> PARSEOP_RAW_DATA
+%token <i> PARSEOP_READWRITETYPE_BOTH
+%token <i> PARSEOP_READWRITETYPE_READONLY
+%token <i> PARSEOP_REFOF
+%token <i> PARSEOP_REGIONSPACE_CMOS
+%token <i> PARSEOP_REGIONSPACE_EC
+%token <i> PARSEOP_REGIONSPACE_FFIXEDHW
+%token <i> PARSEOP_REGIONSPACE_GPIO
+%token <i> PARSEOP_REGIONSPACE_GSBUS
+%token <i> PARSEOP_REGIONSPACE_IO
+%token <i> PARSEOP_REGIONSPACE_IPMI
+%token <i> PARSEOP_REGIONSPACE_MEM
+%token <i> PARSEOP_REGIONSPACE_PCC
+%token <i> PARSEOP_REGIONSPACE_PCI
+%token <i> PARSEOP_REGIONSPACE_PCIBAR
+%token <i> PARSEOP_REGIONSPACE_SMBUS
+%token <i> PARSEOP_REGISTER
+%token <i> PARSEOP_RELEASE
+%token <i> PARSEOP_RESERVED_BYTES
+%token <i> PARSEOP_RESET
+%token <i> PARSEOP_RESOURCETEMPLATE
+%token <i> PARSEOP_RESOURCETYPE_CONSUMER
+%token <i> PARSEOP_RESOURCETYPE_PRODUCER
+%token <i> PARSEOP_RETURN
+%token <i> PARSEOP_REVISION
+%token <i> PARSEOP_SCOPE
+%token <i> PARSEOP_SERIALIZERULE_NOTSERIAL
+%token <i> PARSEOP_SERIALIZERULE_SERIAL
+%token <i> PARSEOP_SHARETYPE_EXCLUSIVE
+%token <i> PARSEOP_SHARETYPE_EXCLUSIVEWAKE
+%token <i> PARSEOP_SHARETYPE_SHARED
+%token <i> PARSEOP_SHARETYPE_SHAREDWAKE
+%token <i> PARSEOP_SHIFTLEFT
+%token <i> PARSEOP_SHIFTRIGHT
+%token <i> PARSEOP_SIGNAL
+%token <i> PARSEOP_SIZEOF
+%token <i> PARSEOP_SLAVEMODE_CONTROLLERINIT
+%token <i> PARSEOP_SLAVEMODE_DEVICEINIT
+%token <i> PARSEOP_SLEEP
+%token <i> PARSEOP_SPI_SERIALBUS
+%token <i> PARSEOP_STALL
+%token <i> PARSEOP_STARTDEPENDENTFN
+%token <i> PARSEOP_STARTDEPENDENTFN_NOPRI
+%token <i> PARSEOP_STOPBITS_ONE
+%token <i> PARSEOP_STOPBITS_ONEPLUSHALF
+%token <i> PARSEOP_STOPBITS_TWO
+%token <i> PARSEOP_STOPBITS_ZERO
+%token <i> PARSEOP_STORE
+%token <s> PARSEOP_STRING_LITERAL
+%token <i> PARSEOP_SUBTRACT
+%token <i> PARSEOP_SWITCH
+%token <i> PARSEOP_THERMALZONE
+%token <i> PARSEOP_TIMER
+%token <i> PARSEOP_TOBCD
+%token <i> PARSEOP_TOBUFFER
+%token <i> PARSEOP_TODECIMALSTRING
+%token <i> PARSEOP_TOHEXSTRING
+%token <i> PARSEOP_TOINTEGER
+%token <i> PARSEOP_TOSTRING
+%token <i> PARSEOP_TOUUID
+%token <i> PARSEOP_TRANSLATIONTYPE_DENSE
+%token <i> PARSEOP_TRANSLATIONTYPE_SPARSE
+%token <i> PARSEOP_TYPE_STATIC
+%token <i> PARSEOP_TYPE_TRANSLATION
+%token <i> PARSEOP_UART_SERIALBUS
+%token <i> PARSEOP_UNICODE
+%token <i> PARSEOP_UNLOAD
+%token <i> PARSEOP_UPDATERULE_ONES
+%token <i> PARSEOP_UPDATERULE_PRESERVE
+%token <i> PARSEOP_UPDATERULE_ZEROS
+%token <i> PARSEOP_VAR_PACKAGE
+%token <i> PARSEOP_VENDORLONG
+%token <i> PARSEOP_VENDORSHORT
+%token <i> PARSEOP_WAIT
+%token <i> PARSEOP_WHILE
+%token <i> PARSEOP_WIREMODE_FOUR
+%token <i> PARSEOP_WIREMODE_THREE
+%token <i> PARSEOP_WORDBUSNUMBER
+%token <i> PARSEOP_WORDCONST
+%token <i> PARSEOP_WORDIO
+%token <i> PARSEOP_WORDSPACE
+%token <i> PARSEOP_XFERSIZE_8
+%token <i> PARSEOP_XFERSIZE_16
+%token <i> PARSEOP_XFERSIZE_32
+%token <i> PARSEOP_XFERSIZE_64
+%token <i> PARSEOP_XFERSIZE_128
+%token <i> PARSEOP_XFERSIZE_256
+%token <i> PARSEOP_XFERTYPE_8
+%token <i> PARSEOP_XFERTYPE_8_16
+%token <i> PARSEOP_XFERTYPE_16
+%token <i> PARSEOP_XOR
+%token <i> PARSEOP_ZERO
+
+/*
+ * Special functions. These should probably stay at the end of this
+ * table.
+ */
+%token <i> PARSEOP___DATE__
+%token <i> PARSEOP___FILE__
+%token <i> PARSEOP___LINE__
+%token <i> PARSEOP___PATH__
diff --git a/sys/contrib/dev/acpica/compiler/asltransform.c b/sys/contrib/dev/acpica/compiler/asltransform.c
index 7e6ad394b2d5..44b9f034025e 100644
--- a/sys/contrib/dev/acpica/compiler/asltransform.c
+++ b/sys/contrib/dev/acpica/compiler/asltransform.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 
@@ -377,7 +376,6 @@ TrDoDefinitionBlock (
  *
  * RETURN:      None
  *
- *
  * DESCRIPTION: Translate ASL SWITCH statement to if/else pairs. There is
  *              no actual AML opcode for SWITCH -- it must be simulated.
  *
@@ -450,10 +448,6 @@ TrDoSwitch (
             {
                 /* Add an ELSE to complete the previous CASE */
 
-                if (!Conditional)
-                {
-                    return;
-                }
                 NewOp             = TrCreateLeafNode (PARSEOP_ELSE);
                 NewOp->Asl.Parent = Conditional->Asl.Parent;
                 TrAmlInitLineNumbers (NewOp, NewOp->Asl.Parent);
@@ -620,11 +614,6 @@ TrDoSwitch (
         {
             /* Convert the DEFAULT node to an ELSE */
 
-            if (!Conditional)
-            {
-                return;
-            }
-
             TrAmlInitNode (DefaultOp, PARSEOP_ELSE);
             DefaultOp->Asl.Parent = Conditional->Asl.Parent;
 
diff --git a/sys/contrib/dev/acpica/compiler/asltree.c b/sys/contrib/dev/acpica/compiler/asltree.c
index b2bbbfd1c805..a6e5f7398748 100644
--- a/sys/contrib/dev/acpica/compiler/asltree.c
+++ b/sys/contrib/dev/acpica/compiler/asltree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acapps.h>
@@ -79,15 +78,29 @@ static ACPI_PARSE_OBJECT *
 TrGetNextNode (
     void)
 {
+    ASL_CACHE_INFO          *Cache;
 
-    if (Gbl_NodeCacheNext >= Gbl_NodeCacheLast)
+
+    if (Gbl_ParseOpCacheNext >= Gbl_ParseOpCacheLast)
     {
-        Gbl_NodeCacheNext = UtLocalCalloc (sizeof (ACPI_PARSE_OBJECT) *
-                                ASL_NODE_CACHE_SIZE);
-        Gbl_NodeCacheLast = Gbl_NodeCacheNext + ASL_NODE_CACHE_SIZE;
+        /* Allocate a new buffer */
+
+        Cache = UtLocalCalloc (sizeof (Cache->Next) +
+            (sizeof (ACPI_PARSE_OBJECT) * ASL_PARSEOP_CACHE_SIZE));
+
+        /* Link new cache buffer to head of list */
+
+        Cache->Next = Gbl_ParseOpCacheList;
+        Gbl_ParseOpCacheList = Cache;
+
+        /* Setup cache management pointers */
+
+        Gbl_ParseOpCacheNext = ACPI_CAST_PTR (ACPI_PARSE_OBJECT, Cache->Buffer);
+        Gbl_ParseOpCacheLast = Gbl_ParseOpCacheNext + ASL_PARSEOP_CACHE_SIZE;
     }
 
-    return (Gbl_NodeCacheNext++);
+    Gbl_ParseOpCount++;
+    return (Gbl_ParseOpCacheNext++);
 }
 
 
@@ -517,7 +530,6 @@ TrCreateConstantLeafNode (
         /* Get the simple filename from the full path */
 
         FlSplitInputPathname (Op->Asl.Filename, &Path, &Filename);
-        ACPI_FREE (Path);
         Op->Asl.Value.String = Filename;
         break;
 
diff --git a/sys/contrib/dev/acpica/compiler/asltypes.h b/sys/contrib/dev/acpica/compiler/asltypes.h
index 5ca17b30d603..5f01c80785b5 100644
--- a/sys/contrib/dev/acpica/compiler/asltypes.h
+++ b/sys/contrib/dev/acpica/compiler/asltypes.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ASLTYPES_H
 #define __ASLTYPES_H
 
@@ -166,15 +165,26 @@ typedef enum
     ASL_FILE_C_SOURCE_OUTPUT,
     ASL_FILE_ASM_INCLUDE_OUTPUT,
     ASL_FILE_C_INCLUDE_OUTPUT,
-    ASL_FILE_C_OFFSET_OUTPUT
+    ASL_FILE_C_OFFSET_OUTPUT,
+    ASL_FILE_MAP_OUTPUT
 
 } ASL_FILE_TYPES;
 
 
-#define ASL_MAX_FILE_TYPE       14
+#define ASL_MAX_FILE_TYPE       15
 #define ASL_NUM_FILES           (ASL_MAX_FILE_TYPE + 1)
 
 
+/* Cache block structure for ParseOps and Strings */
+
+typedef struct asl_cache_info
+{
+    void                            *Next;
+    char                            Buffer[1];
+
+} ASL_CACHE_INFO;
+
+
 typedef struct asl_include_dir
 {
     char                        *Dir;
@@ -196,7 +206,7 @@ typedef struct asl_error_msg
     char                        *Filename;
     char                        *SourceLine;
     UINT32                      FilenameLength;
-    UINT8                       MessageId;
+    UINT16                      MessageId;
     UINT8                       Level;
 
 } ASL_ERROR_MSG;
@@ -238,4 +248,35 @@ typedef struct asl_event_info
 } ASL_EVENT_INFO;
 
 
+/* Hardware mapping file structures */
+
+typedef struct acpi_gpio_info
+{
+    struct acpi_gpio_info   *Next;
+    ACPI_PARSE_OBJECT       *Op;
+    char                    *DeviceName;
+    ACPI_NAMESPACE_NODE     *TargetNode;
+    UINT32                  References;
+    UINT32                  PinCount;
+    UINT32                  PinIndex;
+    UINT16                  PinNumber;
+    UINT8                   Type;
+    UINT8                   Direction;
+    UINT8                   Polarity;
+
+} ACPI_GPIO_INFO;
+
+typedef struct acpi_serial_info
+{
+    struct acpi_serial_info *Next;
+    ACPI_PARSE_OBJECT       *Op;
+    char                    *DeviceName;
+    ACPI_NAMESPACE_NODE     *TargetNode;
+    AML_RESOURCE            *Resource;
+    UINT32                  Speed;
+    UINT16                  Address;
+
+} ACPI_SERIAL_INFO;
+
+
 #endif  /* __ASLTYPES_H */
diff --git a/sys/contrib/dev/acpica/compiler/asltypes.y b/sys/contrib/dev/acpica/compiler/asltypes.y
new file mode 100644
index 000000000000..b9914531b4e3
--- /dev/null
+++ b/sys/contrib/dev/acpica/compiler/asltypes.y
@@ -0,0 +1,381 @@
+NoEcho('
+/******************************************************************************
+ *
+ * Module Name: asltypes.y - Bison/Yacc production types/names
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+')
+
+/******************************************************************************
+ *
+ * Production names
+ *
+ *****************************************************************************/
+
+%type <n> ArgList
+%type <n> ASLCode
+%type <n> BufferData
+%type <n> BufferTermData
+%type <n> CompilerDirective
+%type <n> DataObject
+%type <n> DefinitionBlockTerm
+%type <n> IntegerData
+%type <n> NamedObject
+%type <n> NameSpaceModifier
+%type <n> Object
+%type <n> ObjectList
+%type <n> PackageData
+%type <n> ParameterTypePackage
+%type <n> ParameterTypePackageList
+%type <n> ParameterTypesPackage
+%type <n> ParameterTypesPackageList
+%type <n> RequiredTarget
+%type <n> SimpleTarget
+%type <n> StringData
+%type <n> Target
+%type <n> Term
+%type <n> TermArg
+%type <n> TermList
+%type <n> UserTerm
+
+/* Type4Opcode is obsolete */
+
+%type <n> Type1Opcode
+%type <n> Type2BufferOpcode
+%type <n> Type2BufferOrStringOpcode
+%type <n> Type2IntegerOpcode
+%type <n> Type2Opcode
+%type <n> Type2StringOpcode
+%type <n> Type3Opcode
+%type <n> Type5Opcode
+%type <n> Type6Opcode
+
+%type <n> AccessAsTerm
+%type <n> ExternalTerm
+%type <n> FieldUnit
+%type <n> FieldUnitEntry
+%type <n> FieldUnitList
+%type <n> IncludeTerm
+%type <n> OffsetTerm
+%type <n> OptionalAccessAttribTerm
+
+/* Named Objects */
+
+%type <n> BankFieldTerm
+%type <n> CreateBitFieldTerm
+%type <n> CreateByteFieldTerm
+%type <n> CreateDWordFieldTerm
+%type <n> CreateFieldTerm
+%type <n> CreateQWordFieldTerm
+%type <n> CreateWordFieldTerm
+%type <n> DataRegionTerm
+%type <n> DeviceTerm
+%type <n> EventTerm
+%type <n> FieldTerm
+%type <n> FunctionTerm
+%type <n> IndexFieldTerm
+%type <n> MethodTerm
+%type <n> MutexTerm
+%type <n> OpRegionTerm
+%type <n> OpRegionSpaceIdTerm
+%type <n> PowerResTerm
+%type <n> ProcessorTerm
+%type <n> ThermalZoneTerm
+
+/* Namespace modifiers */
+
+%type <n> AliasTerm
+%type <n> NameTerm
+%type <n> ScopeTerm
+
+/* Type 1 opcodes */
+
+%type <n> BreakPointTerm
+%type <n> BreakTerm
+%type <n> CaseDefaultTermList
+%type <n> CaseTerm
+%type <n> ContinueTerm
+%type <n> DefaultTerm
+%type <n> ElseTerm
+%type <n> FatalTerm
+%type <n> IfElseTerm
+%type <n> IfTerm
+%type <n> LoadTerm
+%type <n> NoOpTerm
+%type <n> NotifyTerm
+%type <n> ReleaseTerm
+%type <n> ResetTerm
+%type <n> ReturnTerm
+%type <n> SignalTerm
+%type <n> SleepTerm
+%type <n> StallTerm
+%type <n> SwitchTerm
+%type <n> UnloadTerm
+%type <n> WhileTerm
+/* %type <n> CaseTermList */
+
+/* Type 2 opcodes */
+
+%type <n> AcquireTerm
+%type <n> AddTerm
+%type <n> AndTerm
+%type <n> ConcatResTerm
+%type <n> ConcatTerm
+%type <n> CondRefOfTerm
+%type <n> CopyObjectTerm
+%type <n> DecTerm
+%type <n> DerefOfTerm
+%type <n> DivideTerm
+%type <n> FindSetLeftBitTerm
+%type <n> FindSetRightBitTerm
+%type <n> FromBCDTerm
+%type <n> IncTerm
+%type <n> IndexTerm
+%type <n> LAndTerm
+%type <n> LEqualTerm
+%type <n> LGreaterEqualTerm
+%type <n> LGreaterTerm
+%type <n> LLessEqualTerm
+%type <n> LLessTerm
+%type <n> LNotEqualTerm
+%type <n> LNotTerm
+%type <n> LoadTableTerm
+%type <n> LOrTerm
+%type <n> MatchTerm
+%type <n> MidTerm
+%type <n> ModTerm
+%type <n> MultiplyTerm
+%type <n> NAndTerm
+%type <n> NOrTerm
+%type <n> NotTerm
+%type <n> ObjectTypeTerm
+%type <n> OrTerm
+%type <n> RefOfTerm
+%type <n> ShiftLeftTerm
+%type <n> ShiftRightTerm
+%type <n> SizeOfTerm
+%type <n> StoreTerm
+%type <n> SubtractTerm
+%type <n> TimerTerm
+%type <n> ToBCDTerm
+%type <n> ToBufferTerm
+%type <n> ToDecimalStringTerm
+%type <n> ToHexStringTerm
+%type <n> ToIntegerTerm
+%type <n> ToStringTerm
+%type <n> WaitTerm
+%type <n> XOrTerm
+
+/* Keywords */
+
+%type <n> AccessAttribKeyword
+%type <n> AccessTypeKeyword
+%type <n> AddressingModeKeyword
+%type <n> AddressKeyword
+%type <n> AddressSpaceKeyword
+%type <n> BitsPerByteKeyword
+%type <n> ClockPhaseKeyword
+%type <n> ClockPolarityKeyword
+%type <n> DecodeKeyword
+%type <n> DevicePolarityKeyword
+%type <n> DMATypeKeyword
+%type <n> EndianKeyword
+%type <n> FlowControlKeyword
+%type <n> InterruptLevel
+%type <n> InterruptTypeKeyword
+%type <n> IODecodeKeyword
+%type <n> IoRestrictionKeyword
+%type <n> LockRuleKeyword
+%type <n> MatchOpKeyword
+%type <n> MaxKeyword
+%type <n> MemTypeKeyword
+%type <n> MinKeyword
+%type <n> ObjectTypeKeyword
+%type <n> OptionalBusMasterKeyword
+%type <n> OptionalReadWriteKeyword
+%type <n> ParityTypeKeyword
+%type <n> PinConfigByte
+%type <n> PinConfigKeyword
+%type <n> RangeTypeKeyword
+%type <n> RegionSpaceKeyword
+%type <n> ResourceTypeKeyword
+%type <n> SerializeRuleKeyword
+%type <n> ShareTypeKeyword
+%type <n> SlaveModeKeyword
+%type <n> StopBitsKeyword
+%type <n> TranslationKeyword
+%type <n> TypeKeyword
+%type <n> UpdateRuleKeyword
+%type <n> WireModeKeyword
+%type <n> XferSizeKeyword
+%type <n> XferTypeKeyword
+
+/* Types */
+
+%type <n> SuperName
+%type <n> ObjectTypeName
+%type <n> ArgTerm
+%type <n> LocalTerm
+%type <n> DebugTerm
+
+%type <n> Integer
+%type <n> ByteConst
+%type <n> WordConst
+%type <n> DWordConst
+%type <n> QWordConst
+%type <n> String
+
+%type <n> ConstTerm
+%type <n> ConstExprTerm
+%type <n> ByteConstExpr
+%type <n> WordConstExpr
+%type <n> DWordConstExpr
+%type <n> QWordConstExpr
+
+%type <n> DWordList
+%type <n> BufferTerm
+%type <n> ByteList
+
+%type <n> PackageElement
+%type <n> PackageList
+%type <n> PackageTerm
+%type <n> VarPackageLengthTerm
+
+/* Macros */
+
+%type <n> EISAIDTerm
+%type <n> ResourceMacroList
+%type <n> ResourceMacroTerm
+%type <n> ResourceTemplateTerm
+%type <n> ToUUIDTerm
+%type <n> UnicodeTerm
+
+/* Resource Descriptors */
+
+%type <n> ConnectionTerm
+%type <n> DataBufferTerm
+%type <n> DMATerm
+%type <n> DWordIOTerm
+%type <n> DWordMemoryTerm
+%type <n> DWordSpaceTerm
+%type <n> EndDependentFnTerm
+%type <n> ExtendedIOTerm
+%type <n> ExtendedMemoryTerm
+%type <n> ExtendedSpaceTerm
+%type <n> FixedDmaTerm
+%type <n> FixedIOTerm
+%type <n> GpioIntTerm
+%type <n> GpioIoTerm
+%type <n> I2cSerialBusTerm
+%type <n> InterruptTerm
+%type <n> IOTerm
+%type <n> IRQNoFlagsTerm
+%type <n> IRQTerm
+%type <n> Memory24Term
+%type <n> Memory32FixedTerm
+%type <n> Memory32Term
+%type <n> NameSeg
+%type <n> NameString
+%type <n> QWordIOTerm
+%type <n> QWordMemoryTerm
+%type <n> QWordSpaceTerm
+%type <n> RegisterTerm
+%type <n> SpiSerialBusTerm
+%type <n> StartDependentFnNoPriTerm
+%type <n> StartDependentFnTerm
+%type <n> UartSerialBusTerm
+%type <n> VendorLongTerm
+%type <n> VendorShortTerm
+%type <n> WordBusNumberTerm
+%type <n> WordIOTerm
+%type <n> WordSpaceTerm
+
+/* Local types that help construct the AML, not in ACPI spec */
+
+%type <n> AmlPackageLengthTerm
+%type <n> IncludeEndTerm
+%type <n> NameStringItem
+%type <n> TermArgItem
+
+%type <n> OptionalAccessSize
+%type <n> OptionalAddressingMode
+%type <n> OptionalAddressRange
+%type <n> OptionalBitsPerByte
+%type <n> OptionalBuffer_Last
+%type <n> OptionalByteConstExpr
+%type <n> OptionalCount
+%type <n> OptionalDecodeType
+%type <n> OptionalDevicePolarity
+%type <n> OptionalDWordConstExpr
+%type <n> OptionalEndian
+%type <n> OptionalFlowControl
+%type <n> OptionalIoRestriction
+%type <n> OptionalListString
+%type <n> OptionalMaxType
+%type <n> OptionalMemType
+%type <n> OptionalMinType
+%type <n> OptionalNameString
+%type <n> OptionalNameString_First
+%type <n> OptionalNameString_Last
+%type <n> OptionalObjectTypeKeyword
+%type <n> OptionalParameterTypePackage
+%type <n> OptionalParameterTypesPackage
+%type <n> OptionalParityType
+%type <n> OptionalQWordConstExpr
+%type <n> OptionalRangeType
+%type <n> OptionalReference
+%type <n> OptionalResourceType
+%type <n> OptionalResourceType_First
+%type <n> OptionalReturnArg
+%type <n> OptionalSerializeRuleKeyword
+%type <n> OptionalShareType
+%type <n> OptionalShareType_First
+%type <n> OptionalSlaveMode
+%type <n> OptionalStopBits
+%type <n> OptionalStringData
+%type <n> OptionalTermArg
+%type <n> OptionalTranslationType_Last
+%type <n> OptionalType
+%type <n> OptionalType_Last
+%type <n> OptionalWireMode
+%type <n> OptionalWordConst
+%type <n> OptionalWordConstExpr
+%type <n> OptionalXferSize
diff --git a/sys/contrib/dev/acpica/compiler/aslutils.c b/sys/contrib/dev/acpica/compiler/aslutils.c
index eea5d6891326..0ec4473c0547 100644
--- a/sys/contrib/dev/acpica/compiler/aslutils.c
+++ b/sys/contrib/dev/acpica/compiler/aslutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acdisasm.h>
@@ -241,37 +240,6 @@ UtEndEvent (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    UtHexCharToValue
- *
- * PARAMETERS:  HexChar             - Hex character in Ascii
- *
- * RETURN:      The binary value of the hex character
- *
- * DESCRIPTION: Perform ascii-to-hex translation
- *
- ******************************************************************************/
-
-UINT8
-UtHexCharToValue (
-    int                     HexChar)
-{
-
-    if (HexChar <= 0x39)
-    {
-        return ((UINT8) (HexChar - 0x30));
-    }
-
-    if (HexChar <= 0x46)
-    {
-        return ((UINT8) (HexChar - 0x37));
-    }
-
-    return ((UINT8) (HexChar - 0x57));
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    UtConvertByteToHex
@@ -296,8 +264,8 @@ UtConvertByteToHex (
     Buffer[0] = '0';
     Buffer[1] = 'x';
 
-    Buffer[2] = (UINT8) AslHexLookup[(RawByte >> 4) & 0xF];
-    Buffer[3] = (UINT8) AslHexLookup[RawByte & 0xF];
+    Buffer[2] = (UINT8) AcpiUtHexToAsciiChar (RawByte, 4);
+    Buffer[3] = (UINT8) AcpiUtHexToAsciiChar (RawByte, 0);
 }
 
 
@@ -312,7 +280,7 @@ UtConvertByteToHex (
  * RETURN:      Ascii hex byte is stored in Buffer.
  *
  * DESCRIPTION: Perform hex-to-ascii translation. The return data is prefixed
- *              with "0x"
+ *              with '0', and a trailing 'h' is added.
  *
  ******************************************************************************/
 
@@ -323,8 +291,8 @@ UtConvertByteToAsmHex (
 {
 
     Buffer[0] = '0';
-    Buffer[1] = (UINT8) AslHexLookup[(RawByte >> 4) & 0xF];
-    Buffer[2] = (UINT8) AslHexLookup[RawByte & 0xF];
+    Buffer[1] = (UINT8) AcpiUtHexToAsciiChar (RawByte, 4);
+    Buffer[2] = (UINT8) AcpiUtHexToAsciiChar (RawByte, 0);
     Buffer[3] = 'h';
 }
 
@@ -585,7 +553,7 @@ UtCheckIntegerRange (
 
 /*******************************************************************************
  *
- * FUNCTION:    UtGetStringBuffer
+ * FUNCTION:    UtStringCacheCalloc
  *
  * PARAMETERS:  Length              - Size of buffer requested
  *
@@ -598,22 +566,42 @@ UtCheckIntegerRange (
  ******************************************************************************/
 
 char *
-UtGetStringBuffer (
+UtStringCacheCalloc (
     UINT32                  Length)
 {
     char                    *Buffer;
+    ASL_CACHE_INFO          *Cache;
 
 
+    if (Length > ASL_STRING_CACHE_SIZE)
+    {
+        Buffer = UtLocalCalloc (Length);
+        return (Buffer);
+    }
+
     if ((Gbl_StringCacheNext + Length) >= Gbl_StringCacheLast)
     {
-        Gbl_StringCacheNext = UtLocalCalloc (ASL_STRING_CACHE_SIZE + Length);
-        Gbl_StringCacheLast = Gbl_StringCacheNext + ASL_STRING_CACHE_SIZE +
-                                Length;
+        /* Allocate a new buffer */
+
+        Cache = UtLocalCalloc (sizeof (Cache->Next) +
+            ASL_STRING_CACHE_SIZE);
+
+        /* Link new cache buffer to head of list */
+
+        Cache->Next = Gbl_StringCacheList;
+        Gbl_StringCacheList = Cache;
+
+        /* Setup cache management pointers */
+
+        Gbl_StringCacheNext = Cache->Buffer;
+        Gbl_StringCacheLast = Gbl_StringCacheNext + ASL_STRING_CACHE_SIZE;
     }
 
+    Gbl_StringCount++;
+    Gbl_StringSize += Length;
+
     Buffer = Gbl_StringCacheNext;
     Gbl_StringCacheNext += Length;
-
     return (Buffer);
 }
 
@@ -646,7 +634,8 @@ UtExpandLineBuffers (
     NewSize = Gbl_LineBufferSize * 2;
     if (Gbl_CurrentLineBuffer)
     {
-        DbgPrint (ASL_DEBUG_OUTPUT,"Increasing line buffer size from %u to %u\n",
+        DbgPrint (ASL_DEBUG_OUTPUT,
+            "Increasing line buffer size from %u to %u\n",
             Gbl_LineBufferSize, NewSize);
     }
 
@@ -691,6 +680,30 @@ UtExpandLineBuffers (
 }
 
 
+/******************************************************************************
+ *
+ * FUNCTION:    UtFreeLineBuffers
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Free all line buffers
+ *
+ *****************************************************************************/
+
+void
+UtFreeLineBuffers (
+    void)
+{
+
+    free (Gbl_CurrentLineBuffer);
+    free (Gbl_MainTokenBuffer);
+    free (Gbl_MacroTokenBuffer);
+    free (Gbl_ExpressionTokenBuffer);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    UtInternalizeName
@@ -723,9 +736,9 @@ UtInternalizeName (
     Info.ExternalName = ExternalName;
     AcpiNsGetInternalNameLength (&Info);
 
-    /* We need a segment to store the internal  name */
+    /* We need a segment to store the internal name */
 
-    Info.InternalName = UtGetStringBuffer (Info.Length);
+    Info.InternalName = UtStringCacheCalloc (Info.Length);
     if (!Info.InternalName)
     {
         return (AE_NO_MEMORY);
@@ -918,7 +931,7 @@ UtDoConstant (
 }
 
 
-/* TBD: use version in ACPI CA main code base? */
+/* TBD: use version in ACPICA main code base? */
 
 /*******************************************************************************
  *
diff --git a/sys/contrib/dev/acpica/compiler/asluuid.c b/sys/contrib/dev/acpica/compiler/asluuid.c
index ed884dc02f4b..8ba9dd9cbbe6 100644
--- a/sys/contrib/dev/acpica/compiler/asluuid.c
+++ b/sys/contrib/dev/acpica/compiler/asluuid.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,42 +41,13 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 
 #define _COMPONENT          ACPI_COMPILER
         ACPI_MODULE_NAME    ("asluuid")
 
 
-/*
- * UUID support functions.
- *
- * This table is used to convert an input UUID ascii string to a 16 byte
- * buffer and the reverse. The table maps a UUID buffer index 0-15 to
- * the index within the 36-byte UUID string where the associated 2-byte
- * hex value can be found.
- *
- * 36-byte UUID strings are of the form:
- *     aabbccdd-eeff-gghh-iijj-kkllmmnnoopp
- * Where aa-pp are one byte hex numbers, made up of two hex digits
- *
- * Note: This table is basically the inverse of the string-to-offset table
- * found in the ACPI spec in the description of the ToUUID macro.
- */
-static UINT8    Gbl_MapToUuidOffset[16] =
-{
-    6,4,2,0,11,9,16,14,19,21,24,26,28,30,32,34
-};
-
-#define UUID_BUFFER_LENGTH          16
-#define UUID_STRING_LENGTH          36
-
-/* Positions for required hyphens (dashes) in UUID strings */
-
-#define UUID_HYPHEN1_OFFSET         8
-#define UUID_HYPHEN2_OFFSET         13
-#define UUID_HYPHEN3_OFFSET         18
-#define UUID_HYPHEN4_OFFSET         23
+extern UINT8    AcpiGbl_MapToUuidOffset[UUID_BUFFER_LENGTH];
 
 
 /*******************************************************************************
@@ -135,42 +106,6 @@ AuValidateUuid (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AuConvertStringToUuid
- *
- * PARAMETERS:  InString            - 36-byte formatted UUID string
- *              UuidBuffer          - 16-byte UUID buffer
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Convert 36-byte formatted UUID string to 16-byte UUID buffer
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AuConvertStringToUuid (
-    char                    *InString,
-    char                    *UuidBuffer)
-{
-    UINT32                  i;
-
-
-    if (!InString || !UuidBuffer)
-    {
-        return (AE_BAD_PARAMETER);
-    }
-
-    for (i = 0; i < UUID_BUFFER_LENGTH; i++)
-    {
-        UuidBuffer[i]  = (char) (UtHexCharToValue (InString[Gbl_MapToUuidOffset[i]]) << 4);
-        UuidBuffer[i] |= (char)  UtHexCharToValue (InString[Gbl_MapToUuidOffset[i] + 1]);
-    }
-
-    return (AE_OK);
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AuConvertUuidToString
@@ -200,8 +135,11 @@ AuConvertUuidToString (
 
     for (i = 0; i < UUID_BUFFER_LENGTH; i++)
     {
-        OutString[Gbl_MapToUuidOffset[i]] =     (UINT8) AslHexLookup[(UuidBuffer[i] >> 4) & 0xF];
-        OutString[Gbl_MapToUuidOffset[i] + 1] = (UINT8) AslHexLookup[UuidBuffer[i] & 0xF];
+        OutString[AcpiGbl_MapToUuidOffset[i]] =
+            AcpiUtHexToAsciiChar (UuidBuffer[i], 4);
+
+        OutString[AcpiGbl_MapToUuidOffset[i] + 1] =
+            AcpiUtHexToAsciiChar (UuidBuffer[i], 0);
     }
 
     /* Insert required hyphens (dashes) */
diff --git a/sys/contrib/dev/acpica/compiler/aslwalks.c b/sys/contrib/dev/acpica/compiler/aslwalks.c
index 7dfa7af7e667..1ce5918faba7 100644
--- a/sys/contrib/dev/acpica/compiler/aslwalks.c
+++ b/sys/contrib/dev/acpica/compiler/aslwalks.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acparser.h>
@@ -605,6 +604,10 @@ AnOtherSemanticAnalysisWalkBegin (
         ArgNode = Op->Asl.Parent;       /* Field definition */
         ArgNode = ArgNode->Asl.Child;   /* First child is the OpRegion Name */
         Node = ArgNode->Asl.Node;       /* OpRegion namespace node */
+        if (!Node)
+        {
+            break;
+        }
 
         ArgNode = Node->Op;             /* OpRegion definition */
         ArgNode = ArgNode->Asl.Child;   /* First child is the OpRegion Name */
diff --git a/sys/contrib/dev/acpica/compiler/aslxref.c b/sys/contrib/dev/acpica/compiler/aslxref.c
index 51addc3b3a0e..3d73d27d6b03 100644
--- a/sys/contrib/dev/acpica/compiler/aslxref.c
+++ b/sys/contrib/dev/acpica/compiler/aslxref.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
 #include <contrib/dev/acpica/include/acparser.h>
@@ -86,6 +85,22 @@ XfCheckFieldRange (
     UINT32                  FieldBitLength,
     UINT32                  AccessBitWidth);
 
+#ifdef __UNDER_DEVELOPMENT
+static ACPI_PARSE_OBJECT *
+XfGetParentMethod (
+    ACPI_PARSE_OBJECT       *Op);
+
+static void
+XfCheckIllegalReference (
+    ACPI_PARSE_OBJECT       *Op,
+    ACPI_NAMESPACE_NODE     *Node);
+
+static BOOLEAN
+XfIsObjectParental (
+    ACPI_PARSE_OBJECT       *MethodOp1,
+    ACPI_PARSE_OBJECT       *MethodOp2);
+#endif
+
 
 /*******************************************************************************
  *
@@ -130,6 +145,8 @@ XfCrossReferenceNamespace (
 
     TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE, XfNamespaceLocateBegin,
                         XfNamespaceLocateEnd, WalkState);
+
+    ACPI_FREE (WalkState);
     return (AE_OK);
 }
 
@@ -262,6 +279,182 @@ XfCheckFieldRange (
     }
 }
 
+
+#ifdef __UNDER_DEVELOPMENT
+/*******************************************************************************
+ *
+ * FUNCTION:    XfIsObjectParental
+ *
+ * PARAMETERS:  ChildOp                 - Op to be checked
+ *              PossibleParentOp        - Determine if this op is in the family
+ *
+ * RETURN:      TRUE if ChildOp is a descendent of PossibleParentOp
+ *
+ * DESCRIPTION: Determine if an Op is a descendent of another Op. Used to
+ *              detect if a method is declared within another method.
+ *
+ ******************************************************************************/
+
+static BOOLEAN
+XfIsObjectParental (
+    ACPI_PARSE_OBJECT       *ChildOp,
+    ACPI_PARSE_OBJECT       *PossibleParentOp)
+{
+    ACPI_PARSE_OBJECT       *ParentOp;
+
+
+    /* Search upwards through the tree for possible parent */
+
+    ParentOp = ChildOp;
+    while (ParentOp)
+    {
+        if (ParentOp == PossibleParentOp)
+        {
+            return (TRUE);
+        }
+
+        ParentOp = ParentOp->Asl.Parent;
+    }
+
+    return (FALSE);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    XfGetParentMethod
+ *
+ * PARAMETERS:  Op                      - Op to be checked
+ *
+ * RETURN:      Op for parent method. NULL if object is not within a method.
+ *
+ * DESCRIPTION: Determine if an object is within a control method. Used to
+ *              implement special rules for named references from within a
+ *              control method.
+ *
+ * NOTE: It would be better to have the parser set a flag in the Op if possible.
+ *
+ ******************************************************************************/
+
+static ACPI_PARSE_OBJECT *
+XfGetParentMethod (
+    ACPI_PARSE_OBJECT       *Op)
+{
+    ACPI_PARSE_OBJECT       *ParentOp;
+
+
+    if (!Op)
+    {
+        return (NULL);
+    }
+
+    if (Op->Asl.ParseOpcode == PARSEOP_METHOD)
+    {
+        return (NULL);
+    }
+
+    /* Walk upwards through the parse tree, up to the root if necessary */
+
+    ParentOp = Op;
+    while (ParentOp)
+    {
+        if (ParentOp->Asl.ParseOpcode == PARSEOP_METHOD)
+        {
+            return (ParentOp);
+        }
+
+        ParentOp = ParentOp->Asl.Parent;
+    }
+
+    /* Object is not within a method */
+
+    return (NULL);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    XfCheckIllegalReference
+ *
+ * PARAMETERS:  Op                      - Op referring to the target
+ *              TargetNode              - Target of the reference
+ *
+ * RETURN:      None. Emits error message for an illegal reference
+ *
+ * DESCRIPTION: Determine if a named reference is legal. A "named" reference
+ *              is something like: Store(ABCD, ...), where ABCD is an AML
+ *              Nameseg or Namepath.
+ *
+ * NOTE: Caller must ensure that the name Op is in fact a reference, and not
+ *       an actual name declaration (creation of a named object).
+ *
+ ******************************************************************************/
+
+static void
+XfCheckIllegalReference (
+    ACPI_PARSE_OBJECT       *Op,
+    ACPI_NAMESPACE_NODE     *TargetNode)
+{
+    ACPI_PARSE_OBJECT       *MethodOp1;
+    ACPI_PARSE_OBJECT       *MethodOp2;
+    ACPI_PARSE_OBJECT       *TargetOp;
+
+
+    /*
+     * Check for an illegal reference to a named object:
+     *
+     * 1) References from one control method to another, non-parent
+     *    method are not allowed, they will fail at runtime.
+     *
+     * 2) Forward references within a control method are not allowed.
+     *    AML interpreters use a one-pass parse of control methods
+     *    so these forward references will fail at runtime.
+     */
+    TargetOp = TargetNode->Op;
+
+    MethodOp1 = XfGetParentMethod (Op);
+    MethodOp2 = XfGetParentMethod (TargetOp);
+
+    /* Are both objects within control method(s)? */
+
+    if (!MethodOp1 || !MethodOp2)
+    {
+        return;
+    }
+
+    /* Objects not in the same method? */
+
+    if (MethodOp1 != MethodOp2)
+    {
+        /*
+         * 1) Cross-method named reference
+         *
+         * This is OK if and only if the target reference is within in a
+         * method that is a parent of current method
+         */
+        if (!XfIsObjectParental (MethodOp1, MethodOp2))
+        {
+            AslError (ASL_ERROR, ASL_MSG_ILLEGAL_METHOD_REF, Op,
+                Op->Asl.ExternalName);
+        }
+    }
+
+    /*
+     * 2) Both reference and target are in the same method. Check if this is
+     * an (illegal) forward reference by examining the exact source code
+     * location of each (the referenced object and the object declaration).
+     * This is a bit nasty, yet effective.
+     */
+    else if (Op->Asl.LogicalByteOffset < TargetOp->Asl.LogicalByteOffset)
+    {
+        AslError (ASL_ERROR, ASL_MSG_ILLEGAL_FORWARD_REF, Op,
+            Op->Asl.ExternalName);
+    }
+
+}
+#endif
+
+
 /*******************************************************************************
  *
  * FUNCTION:    XfNamespaceLocateBegin
@@ -316,7 +509,7 @@ XfNamespaceLocateBegin (
      */
     if (Op->Asl.CompileFlags & NODE_IS_NAME_DECLARATION)
     {
-        return (AE_OK);
+        return_ACPI_STATUS (AE_OK);
     }
 
     /* We are only interested in opcodes that have an associated name */
@@ -329,7 +522,7 @@ XfNamespaceLocateBegin (
         (Op->Asl.ParseOpcode != PARSEOP_NAMESEG)    &&
         (Op->Asl.ParseOpcode != PARSEOP_METHODCALL))
     {
-        return (AE_OK);
+        return_ACPI_STATUS (AE_OK);
     }
 
     /*
@@ -340,7 +533,7 @@ XfNamespaceLocateBegin (
     if ((Op->Asl.Parent) &&
         (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONDREFOF))
     {
-        return (AE_OK);
+        return_ACPI_STATUS (AE_OK);
     }
 
     /*
@@ -459,7 +652,8 @@ XfNamespaceLocateBegin (
 
             Status = AE_OK;
         }
-        return (Status);
+
+        return_ACPI_STATUS (Status);
     }
 
     /* Check for a reference vs. name declaration */
@@ -470,6 +664,13 @@ XfNamespaceLocateBegin (
         /* This node has been referenced, mark it for reference check */
 
         Node->Flags |= ANOBJ_IS_REFERENCED;
+
+#ifdef __UNDER_DEVELOPMENT
+
+        /* Check for an illegal reference */
+
+        XfCheckIllegalReference (Op, Node);
+#endif
     }
 
     /* Attempt to optimize the NamePath */
@@ -624,7 +825,6 @@ XfNamespaceLocateBegin (
 
                 (Op->Asl.ParseOpcode == PARSEOP_METHODCALL))
     {
-
         /*
          * A reference to a method within one of these opcodes is not an
          * invocation of the method, it is simply a reference to the method.
@@ -634,7 +834,7 @@ XfNamespaceLocateBegin (
             (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_DEREFOF)    ||
             (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE)))
         {
-            return (AE_OK);
+            return_ACPI_STATUS (AE_OK);
         }
         /*
          * There are two types of method invocation:
@@ -650,7 +850,7 @@ XfNamespaceLocateBegin (
                     Op->Asl.ExternalName, AcpiUtGetTypeName (Node->Type));
 
             AslError (ASL_ERROR, ASL_MSG_NOT_METHOD, Op, MsgBuffer);
-            return (AE_OK);
+            return_ACPI_STATUS (AE_OK);
         }
 
         /* Save the method node in the caller's op */
@@ -658,7 +858,7 @@ XfNamespaceLocateBegin (
         Op->Asl.Node = Node;
         if (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONDREFOF)
         {
-            return (AE_OK);
+            return_ACPI_STATUS (AE_OK);
         }
 
         /*
@@ -822,8 +1022,16 @@ XfNamespaceLocateBegin (
         }
     }
 
+    /* 5) Check for a connection object */
+#if 0
+    else if (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_CONNECTION)
+    {
+        return_ACPI_STATUS (Status);
+    }
+#endif
+
     Op->Asl.Node = Node;
-    return (Status);
+    return_ACPI_STATUS (Status);
 }
 
 
@@ -858,7 +1066,7 @@ XfNamespaceLocateEnd (
     OpInfo = AcpiPsGetOpcodeInfo (Op->Asl.AmlOpcode);
     if (!(OpInfo->Flags & AML_NAMED))
     {
-        return (AE_OK);
+        return_ACPI_STATUS (AE_OK);
     }
 
     /* Not interested in name references, we did not open a scope for them */
@@ -867,7 +1075,7 @@ XfNamespaceLocateEnd (
         (Op->Asl.ParseOpcode == PARSEOP_NAMESEG)    ||
         (Op->Asl.ParseOpcode == PARSEOP_METHODCALL))
     {
-        return (AE_OK);
+        return_ACPI_STATUS (AE_OK);
     }
 
     /* Pop the scope stack if necessary */
@@ -882,5 +1090,5 @@ XfNamespaceLocateEnd (
         (void) AcpiDsScopeStackPop (WalkState);
     }
 
-    return (AE_OK);
+    return_ACPI_STATUS (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/compiler/dtcompile.c b/sys/contrib/dev/acpica/compiler/dtcompile.c
index 3407e1ddc355..69344b1d3f79 100644
--- a/sys/contrib/dev/acpica/compiler/dtcompile.c
+++ b/sys/contrib/dev/acpica/compiler/dtcompile.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -141,8 +141,6 @@ DtDoCompile (
     Status = DtCompileDataTable (&FieldList);
     UtEndEvent (Event);
 
-    DtFreeFieldList ();
-
     if (ACPI_FAILURE (Status))
     {
         /* TBD: temporary error message. Msgs should come from function above */
@@ -170,6 +168,8 @@ DtDoCompile (
 
 CleanupAndExit:
 
+    AcpiUtDeleteCaches ();
+    DtDeleteCaches ();
     CmCleanupAndExit ();
     return (Status);
 }
@@ -298,7 +298,7 @@ DtCompileDataTable (
         return (AE_ERROR);
     }
 
-    Gbl_Signature = UtLocalCalloc (ACPI_STRLEN (Signature) + 1);
+    Gbl_Signature = UtStringCacheCalloc (ACPI_STRLEN (Signature) + 1);
     strcpy (Gbl_Signature, Signature);
 
     /*
@@ -437,6 +437,7 @@ DtCompileTable (
     UINT8                   FieldType;
     UINT8                   *Buffer;
     UINT8                   *FlagBuffer = NULL;
+    char                    *String;
     UINT32                  CurrentFlagByteOffset = 0;
     ACPI_STATUS             Status;
 
@@ -446,18 +447,29 @@ DtCompileTable (
         return (AE_BAD_PARAMETER);
     }
 
+    /* Ignore optional subtable if name does not match */
+
+    if ((Info->Flags & DT_OPTIONAL) &&
+        ACPI_STRCMP ((*Field)->Name, Info->Name))
+    {
+        *RetSubtable = NULL;
+        return (AE_OK);
+    }
+
     Length = DtGetSubtableLength (*Field, Info);
     if (Length == ASL_EOF)
     {
         return (AE_ERROR);
     }
 
-    Subtable = UtLocalCalloc (sizeof (DT_SUBTABLE));
+    Subtable = UtSubtableCacheCalloc ();
 
     if (Length > 0)
     {
-        Subtable->Buffer = UtLocalCalloc (Length);
+        String = UtStringCacheCalloc (Length);
+        Subtable->Buffer = ACPI_CAST_PTR (UINT8, String);
     }
+
     Subtable->Length = Length;
     Subtable->TotalLength = Length;
     Buffer = Subtable->Buffer;
@@ -558,8 +570,6 @@ DtCompileTable (
             DtSetSubtableLength (InlineSubtable);
 
             ACPI_MEMCPY (Buffer, InlineSubtable->Buffer, FieldLength);
-            ACPI_FREE (InlineSubtable->Buffer);
-            ACPI_FREE (InlineSubtable);
             LocalField = *Field;
             break;
 
diff --git a/sys/contrib/dev/acpica/compiler/dtcompiler.h b/sys/contrib/dev/acpica/compiler/dtcompiler.h
index 51fec6d5a05b..dbf112593da6 100644
--- a/sys/contrib/dev/acpica/compiler/dtcompiler.h
+++ b/sys/contrib/dev/acpica/compiler/dtcompiler.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,10 @@
 #include <contrib/dev/acpica/include/acdisasm.h>
 
 
+#define ASL_FIELD_CACHE_SIZE            512
+#define ASL_SUBTABLE_CACHE_SIZE         128
+
+
 #undef DT_EXTERN
 
 #ifdef _DECLARE_DT_GLOBALS
@@ -143,6 +147,18 @@ DT_EXTERN DT_FIELD          DT_INIT_GLOBAL (*Gbl_LabelList, NULL);
 
 DT_EXTERN UINT32            DT_INIT_GLOBAL (Gbl_CurrentTableOffset, 0);
 
+/* Local caches */
+
+DT_EXTERN UINT32            DT_INIT_GLOBAL (Gbl_SubtableCount, 0);
+DT_EXTERN ASL_CACHE_INFO    DT_INIT_GLOBAL (*Gbl_SubtableCacheList, NULL);
+DT_EXTERN DT_SUBTABLE       DT_INIT_GLOBAL (*Gbl_SubtableCacheNext, NULL);
+DT_EXTERN DT_SUBTABLE       DT_INIT_GLOBAL (*Gbl_SubtableCacheLast, NULL);
+
+DT_EXTERN UINT32            DT_INIT_GLOBAL (Gbl_FieldCount, 0);
+DT_EXTERN ASL_CACHE_INFO    DT_INIT_GLOBAL (*Gbl_FieldCacheList, NULL);
+DT_EXTERN DT_FIELD          DT_INIT_GLOBAL (*Gbl_FieldCacheNext, NULL);
+DT_EXTERN DT_FIELD          DT_INIT_GLOBAL (*Gbl_FieldCacheLast, NULL);
+
 
 /* dtcompiler - main module */
 
@@ -321,20 +337,20 @@ DtWalkTableTree (
 void
 DtError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage);
 
 void
 DtNameError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage);
 
 void
 DtFatal (
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage);
 
@@ -343,10 +359,6 @@ DtStrtoul64 (
     char                    *String,
     UINT64                  *ReturnInteger);
 
-UINT32
-DtGetFileSize (
-    FILE                    *Handle);
-
 char*
 DtGetFieldValue (
     DT_FIELD                *Field);
@@ -372,8 +384,16 @@ void
 DtSetTableLength(
     void);
 
+DT_SUBTABLE *
+UtSubtableCacheCalloc (
+    void);
+
+DT_FIELD *
+UtFieldCacheCalloc (
+    void);
+
 void
-DtFreeFieldList (
+DtDeleteCaches (
     void);
 
 
@@ -399,6 +419,10 @@ ACPI_STATUS
 DtCompileCsrt (
     void                    **PFieldList);
 
+ACPI_STATUS
+DtCompileDbg2 (
+    void                    **PFieldList);
+
 ACPI_STATUS
 DtCompileDmar (
     void                    **PFieldList);
@@ -419,6 +443,10 @@ ACPI_STATUS
 DtCompileFpdt (
     void                    **PFieldList);
 
+ACPI_STATUS
+DtCompileGtdt (
+    void                    **PFieldList);
+
 ACPI_STATUS
 DtCompileHest (
     void                    **PFieldList);
@@ -427,6 +455,10 @@ ACPI_STATUS
 DtCompileIvrs (
     void                    **PFieldList);
 
+ACPI_STATUS
+DtCompileLpit (
+    void                    **PFieldList);
+
 ACPI_STATUS
 DtCompileMadt (
     void                    **PFieldList);
@@ -451,6 +483,10 @@ ACPI_STATUS
 DtCompilePmtt (
     void                    **PFieldList);
 
+ACPI_STATUS
+DtCompilePcct (
+    void                    **PFieldList);
+
 ACPI_STATUS
 DtCompileRsdt (
     void                    **PFieldList);
@@ -503,6 +539,7 @@ extern const unsigned char  TemplateBert[];
 extern const unsigned char  TemplateBgrt[];
 extern const unsigned char  TemplateCpep[];
 extern const unsigned char  TemplateCsrt[];
+extern const unsigned char  TemplateDbg2[];
 extern const unsigned char  TemplateDbgp[];
 extern const unsigned char  TemplateDmar[];
 extern const unsigned char  TemplateEcdt[];
@@ -514,12 +551,14 @@ extern const unsigned char  TemplateGtdt[];
 extern const unsigned char  TemplateHest[];
 extern const unsigned char  TemplateHpet[];
 extern const unsigned char  TemplateIvrs[];
+extern const unsigned char  TemplateLpit[];
 extern const unsigned char  TemplateMadt[];
 extern const unsigned char  TemplateMcfg[];
 extern const unsigned char  TemplateMchi[];
 extern const unsigned char  TemplateMpst[];
 extern const unsigned char  TemplateMsct[];
 extern const unsigned char  TemplateMtmr[];
+extern const unsigned char  TemplatePcct[];
 extern const unsigned char  TemplatePmtt[];
 extern const unsigned char  TemplateRsdt[];
 extern const unsigned char  TemplateS3pt[];
diff --git a/sys/contrib/dev/acpica/compiler/dtexpress.c b/sys/contrib/dev/acpica/compiler/dtexpress.c
index 9689ef6ffc77..59181f3308e8 100644
--- a/sys/contrib/dev/acpica/compiler/dtexpress.c
+++ b/sys/contrib/dev/acpica/compiler/dtexpress.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/dtfield.c b/sys/contrib/dev/acpica/compiler/dtfield.c
index 1f273d953389..a19b985fe1f5 100644
--- a/sys/contrib/dev/acpica/compiler/dtfield.c
+++ b/sys/contrib/dev/acpica/compiler/dtfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -259,7 +259,7 @@ DtCompileUuid (
     }
     else
     {
-        Status = AuConvertStringToUuid (InString, (char *) Buffer);
+        AcpiUtConvertStringToUuid (InString, Buffer);
     }
 
     return (Status);
@@ -311,21 +311,37 @@ DtCompileInteger (
         return;
     }
 
-    /* Ensure that reserved fields are set to zero */
-    /* TBD: should we set to zero, or just make this an ERROR? */
-    /* TBD: Probably better to use a flag */
+    /*
+     * Ensure that reserved fields are set properly. Note: uses
+     * the DT_NON_ZERO flag to indicate that the reserved value
+     * must be exactly one. Otherwise, the value must be zero.
+     * This is sufficient for now.
+     */
 
-    if (!ACPI_STRCMP (Field->Name, "Reserved") &&
-        (Value != 0))
+    /* TBD: Should use a flag rather than compare "Reserved" */
+
+    if (!ACPI_STRCMP (Field->Name, "Reserved"))
     {
-        DtError (ASL_WARNING, ASL_MSG_RESERVED_VALUE, Field,
-            "Setting to zero");
-        Value = 0;
+        if (Flags & DT_NON_ZERO)
+        {
+            if (Value != 1)
+            {
+                DtError (ASL_WARNING, ASL_MSG_RESERVED_VALUE, Field,
+                    "Must be one, setting to one");
+                Value = 1;
+            }
+        }
+        else if (Value != 0)
+        {
+            DtError (ASL_WARNING, ASL_MSG_RESERVED_VALUE, Field,
+                "Must be zero, setting to zero");
+            Value = 0;
+        }
     }
 
     /* Check if the value must be non-zero */
 
-    if ((Value == 0) && (Flags & DT_NON_ZERO))
+    else if ((Flags & DT_NON_ZERO) && (Value == 0))
     {
         DtError (ASL_ERROR, ASL_MSG_ZERO_VALUE, Field, NULL);
     }
@@ -340,7 +356,8 @@ DtCompileInteger (
 
     if (Value > MaxValue)
     {
-        sprintf (MsgBuffer, "%8.8X%8.8X", ACPI_FORMAT_UINT64 (Value));
+        sprintf (MsgBuffer, "%8.8X%8.8X - max %u bytes",
+            ACPI_FORMAT_UINT64 (Value), ByteLength);
         DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
     }
 
diff --git a/sys/contrib/dev/acpica/compiler/dtio.c b/sys/contrib/dev/acpica/compiler/dtio.c
index 39fb9da3da04..1f5b62034e65 100644
--- a/sys/contrib/dev/acpica/compiler/dtio.c
+++ b/sys/contrib/dev/acpica/compiler/dtio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include <contrib/dev/acpica/compiler/dtcompiler.h>
+#include <contrib/dev/acpica/include/acapps.h>
 
 #define _COMPONENT          DT_COMPILER
         ACPI_MODULE_NAME    ("dtio")
@@ -132,7 +133,7 @@ DtTrim (
 
     if (!ACPI_STRCMP (String, " "))
     {
-        ReturnString = UtLocalCalloc (1);
+        ReturnString = UtStringCacheCalloc (1);
         return (ReturnString);
     }
 
@@ -180,7 +181,7 @@ DtTrim (
     /* Create the trimmed return string */
 
     Length = ACPI_PTR_DIFF (End, Start) + 1;
-    ReturnString = UtLocalCalloc (Length + 1);
+    ReturnString = UtStringCacheCalloc (Length + 1);
     if (ACPI_STRLEN (Start))
     {
         ACPI_STRNCPY (ReturnString, Start, Length);
@@ -369,7 +370,7 @@ DtParseLine (
 
     if ((Value && *Value) || IsNullString)
     {
-        Field = UtLocalCalloc (sizeof (DT_FIELD));
+        Field = UtFieldCacheCalloc ();
         Field->Name = Name;
         Field->Value = Value;
         Field->Line = Line;
@@ -379,11 +380,7 @@ DtParseLine (
 
         DtLinkField (Field);
     }
-    else /* Ignore this field, it has no valid data */
-    {
-        ACPI_FREE (Name);
-        ACPI_FREE (Value);
-    }
+    /* Else -- Ignore this field, it has no valid data */
 
     return (AE_OK);
 }
@@ -737,7 +734,11 @@ DtScanFile (
 
     /* Get the file size */
 
-    Gbl_InputByteCount = DtGetFileSize (Handle);
+    Gbl_InputByteCount = CmGetFileSize (Handle);
+    if (Gbl_InputByteCount == ACPI_UINT32_MAX)
+    {
+        AslAbort ();
+    }
 
     Gbl_CurrentLineNumber = 0;
     Gbl_CurrentLineOffset = 0;
@@ -816,7 +817,12 @@ DtOutputBinary (
     /* Walk the entire parse tree, emitting the binary data */
 
     DtWalkTableTree (RootTable, DtWriteBinary, NULL, NULL);
-    Gbl_TableLength = DtGetFileSize (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle);
+
+    Gbl_TableLength = CmGetFileSize (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle);
+    if (Gbl_TableLength == ACPI_UINT32_MAX)
+    {
+        AslAbort ();
+    }
 }
 
 
@@ -1025,6 +1031,8 @@ DtDumpSubtableList (
     DbgPrint (ASL_DEBUG_OUTPUT,
         "\nSubtable Tree: (Depth, Subtable, Length, TotalLength)\n\n");
     DtWalkTableTree (Gbl_RootTable, DtDumpSubtableTree, NULL, NULL);
+
+    DbgPrint (ASL_DEBUG_OUTPUT, "\n");
 }
 
 
diff --git a/sys/contrib/dev/acpica/compiler/dtparser.l b/sys/contrib/dev/acpica/compiler/dtparser.l
index b0f6d6c978d5..c6578ef91fa7 100644
--- a/sys/contrib/dev/acpica/compiler/dtparser.l
+++ b/sys/contrib/dev/acpica/compiler/dtparser.l
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/dtparser.y b/sys/contrib/dev/acpica/compiler/dtparser.y
index 47e74bddbae6..135eaae411b6 100644
--- a/sys/contrib/dev/acpica/compiler/dtparser.y
+++ b/sys/contrib/dev/acpica/compiler/dtparser.y
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/dtsubtable.c b/sys/contrib/dev/acpica/compiler/dtsubtable.c
index 67fcb9d22656..fc700cd77703 100644
--- a/sys/contrib/dev/acpica/compiler/dtsubtable.c
+++ b/sys/contrib/dev/acpica/compiler/dtsubtable.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,13 +73,15 @@ DtCreateSubtable (
     DT_SUBTABLE             **RetSubtable)
 {
     DT_SUBTABLE             *Subtable;
+    char                    *String;
 
 
-    Subtable = UtLocalCalloc (sizeof (DT_SUBTABLE));
+    Subtable = UtSubtableCacheCalloc ();
 
     /* Create a new buffer for the subtable data */
 
-    Subtable->Buffer = UtLocalCalloc (Length);
+    String = UtStringCacheCalloc (Length);
+    Subtable->Buffer = ACPI_CAST_PTR (UINT8, String);
     ACPI_MEMCPY (Subtable->Buffer, Buffer, Length);
 
     Subtable->Length = Length;
diff --git a/sys/contrib/dev/acpica/compiler/dttable.c b/sys/contrib/dev/acpica/compiler/dttable.c
index bb6c7cbdcae3..56eb92299745 100644
--- a/sys/contrib/dev/acpica/compiler/dttable.c
+++ b/sys/contrib/dev/acpica/compiler/dttable.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -454,7 +454,7 @@ DtCompileCsrt (
     UINT32                  GroupLength;
 
 
-    /* Sub-tables (Resource Groups) */
+    /* Subtables (Resource Groups) */
 
     while (*PFieldList)
     {
@@ -518,6 +518,156 @@ DtCompileCsrt (
 }
 
 
+/******************************************************************************
+ *
+ * FUNCTION:    DtCompileDbg2
+ *
+ * PARAMETERS:  List                - Current field list pointer
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Compile DBG2.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+DtCompileDbg2 (
+    void                    **List)
+{
+    ACPI_STATUS             Status;
+    DT_SUBTABLE             *Subtable;
+    DT_SUBTABLE             *ParentTable;
+    DT_FIELD                **PFieldList = (DT_FIELD **) List;
+    UINT32                  SubtableCount;
+    ACPI_DBG2_HEADER        *Dbg2Header;
+    ACPI_DBG2_DEVICE        *DeviceInfo;
+    UINT16                  CurrentOffset;
+    UINT32                  i;
+
+
+    /* Main table */
+
+    Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2, &Subtable, TRUE);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    ParentTable = DtPeekSubtable ();
+    DtInsertSubtable (ParentTable, Subtable);
+
+    /* Main table fields */
+
+    Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
+    Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
+        ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
+
+    SubtableCount = Dbg2Header->InfoCount;
+    DtPushSubtable (Subtable);
+
+    /* Process all Device Information subtables (Count = InfoCount) */
+
+    while (*PFieldList && SubtableCount)
+    {
+        /* Subtable: Debug Device Information */
+
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Device,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        DeviceInfo = ACPI_CAST_PTR (ACPI_DBG2_DEVICE, Subtable->Buffer);
+        CurrentOffset = (UINT16) sizeof (ACPI_DBG2_DEVICE);
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPushSubtable (Subtable);
+
+        ParentTable = DtPeekSubtable ();
+
+        /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
+
+        DeviceInfo->BaseAddressOffset = CurrentOffset;
+        for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
+        {
+            Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
+                        &Subtable, TRUE);
+            if (ACPI_FAILURE (Status))
+            {
+                return (Status);
+            }
+
+            CurrentOffset += (UINT16) sizeof (ACPI_GENERIC_ADDRESS);
+            DtInsertSubtable (ParentTable, Subtable);
+        }
+
+        /* AddressSize array (Required, size = RegisterCount) */
+
+        DeviceInfo->AddressSizeOffset = CurrentOffset;
+        for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
+        {
+            Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
+                        &Subtable, TRUE);
+            if (ACPI_FAILURE (Status))
+            {
+                return (Status);
+            }
+
+            CurrentOffset += (UINT16) sizeof (UINT32);
+            DtInsertSubtable (ParentTable, Subtable);
+        }
+
+        /* NamespaceString device identifier (Required, size = NamePathLength) */
+
+        DeviceInfo->NamepathOffset = CurrentOffset;
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        /* Update the device info header */
+
+        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
+        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
+        DtInsertSubtable (ParentTable, Subtable);
+
+        /* OemData - Variable-length data (Optional, size = OemDataLength) */
+
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2OemData,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        /* Update the device info header (zeros if no OEM data present) */
+
+        DeviceInfo->OemDataOffset = 0;
+        DeviceInfo->OemDataLength = 0;
+
+        /* Optional subtable (OemData) */
+
+        if (Subtable && Subtable->Length)
+        {
+            DeviceInfo->OemDataOffset = CurrentOffset;
+            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
+
+            DtInsertSubtable (ParentTable, Subtable);
+        }
+
+        SubtableCount--;
+        DtPopSubtable (); /* Get next Device Information subtable */
+    }
+
+    DtPopSubtable ();
+    return (AE_OK);
+}
+
+
 /******************************************************************************
  *
  * FUNCTION:    DtCompileDmar
@@ -586,16 +736,21 @@ DtCompileDmar (
             InfoTable = AcpiDmTableInfoDmar1;
             break;
 
-        case ACPI_DMAR_TYPE_ATSR:
+        case ACPI_DMAR_TYPE_ROOT_ATS:
 
             InfoTable = AcpiDmTableInfoDmar2;
             break;
 
-        case ACPI_DMAR_HARDWARE_AFFINITY:
+        case ACPI_DMAR_TYPE_HARDWARE_AFFINITY:
 
             InfoTable = AcpiDmTableInfoDmar3;
             break;
 
+        case ACPI_DMAR_TYPE_NAMESPACE:
+
+            InfoTable = AcpiDmTableInfoDmar4;
+            break;
+
         default:
 
             DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "DMAR");
@@ -612,10 +767,20 @@ DtCompileDmar (
 
         ParentTable = DtPeekSubtable ();
         DtInsertSubtable (ParentTable, Subtable);
+
+        /*
+         * Optional Device Scope subtables
+         */
+        if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+            (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
+        {
+            /* These types do not support device scopes */
+
+            DtPopSubtable ();
+            continue;
+        }
+
         DtPushSubtable (Subtable);
-
-        /* Optional Device Scope subtables */
-
         DeviceScopeLength = DmarHeader->Length - Subtable->Length -
             ParentTable->Length;
         while (DeviceScopeLength)
@@ -788,6 +953,125 @@ DtCompileFadt (
     return (AE_OK);
 }
 
+/******************************************************************************
+ *
+ * FUNCTION:    DtCompileGtdt
+ *
+ * PARAMETERS:  List                - Current field list pointer
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Compile GTDT.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+DtCompileGtdt (
+    void                    **List)
+{
+    ACPI_STATUS             Status;
+    DT_SUBTABLE             *Subtable;
+    DT_SUBTABLE             *ParentTable;
+    DT_FIELD                **PFieldList = (DT_FIELD **) List;
+    DT_FIELD                *SubtableStart;
+    ACPI_SUBTABLE_HEADER    *GtdtHeader;
+    ACPI_DMTABLE_INFO       *InfoTable;
+    UINT32                  GtCount;
+
+
+    Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt,
+                &Subtable, TRUE);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    ParentTable = DtPeekSubtable ();
+    DtInsertSubtable (ParentTable, Subtable);
+
+    while (*PFieldList)
+    {
+        SubtableStart = *PFieldList;
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdtHdr,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPushSubtable (Subtable);
+
+        GtdtHeader = ACPI_CAST_PTR (ACPI_SUBTABLE_HEADER, Subtable->Buffer);
+
+        switch (GtdtHeader->Type)
+        {
+        case ACPI_GTDT_TYPE_TIMER_BLOCK:
+
+            InfoTable = AcpiDmTableInfoGtdt0;
+            break;
+
+        case ACPI_GTDT_TYPE_WATCHDOG:
+
+            InfoTable = AcpiDmTableInfoGtdt1;
+            break;
+
+        default:
+
+            DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "GTDT");
+            return (AE_ERROR);
+        }
+
+        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+
+        /*
+         * Additional GT block subtable data
+         */
+
+        switch (GtdtHeader->Type)
+        {
+        case ACPI_GTDT_TYPE_TIMER_BLOCK:
+
+            DtPushSubtable (Subtable);
+            ParentTable = DtPeekSubtable ();
+
+            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
+                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
+            while (GtCount)
+            {
+                Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt0a,
+                            &Subtable, TRUE);
+                if (ACPI_FAILURE (Status))
+                {
+                    return (Status);
+                }
+
+
+                DtInsertSubtable (ParentTable, Subtable);
+                GtCount--;
+            }
+            DtPopSubtable ();
+            break;
+
+        default:
+
+            break;
+        }
+
+        DtPopSubtable ();
+    }
+
+    return (AE_OK);
+}
+
 
 /******************************************************************************
  *
@@ -1152,6 +1436,87 @@ DtCompileIvrs (
 }
 
 
+/******************************************************************************
+ *
+ * FUNCTION:    DtCompileLpit
+ *
+ * PARAMETERS:  List                - Current field list pointer
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Compile LPIT.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+DtCompileLpit (
+    void                    **List)
+{
+    ACPI_STATUS             Status;
+    DT_SUBTABLE             *Subtable;
+    DT_SUBTABLE             *ParentTable;
+    DT_FIELD                **PFieldList = (DT_FIELD **) List;
+    DT_FIELD                *SubtableStart;
+    ACPI_DMTABLE_INFO       *InfoTable;
+    ACPI_LPIT_HEADER        *LpitHeader;
+
+
+    /* Note: Main table consists only of the standard ACPI table header */
+
+    while (*PFieldList)
+    {
+        SubtableStart = *PFieldList;
+
+        /* LPIT Subtable header */
+
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoLpitHdr,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPushSubtable (Subtable);
+
+        LpitHeader = ACPI_CAST_PTR (ACPI_LPIT_HEADER, Subtable->Buffer);
+
+        switch (LpitHeader->Type)
+        {
+        case ACPI_LPIT_TYPE_NATIVE_CSTATE:
+
+            InfoTable = AcpiDmTableInfoLpit0;
+            break;
+
+        case ACPI_LPIT_TYPE_SIMPLE_IO:
+
+            InfoTable = AcpiDmTableInfoLpit1;
+            break;
+
+        default:
+
+            DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "LPIT");
+            return (AE_ERROR);
+        }
+
+        /* LPIT Subtable */
+
+        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPopSubtable ();
+    }
+
+    return (AE_OK);
+}
+
+
 /******************************************************************************
  *
  * FUNCTION:    DtCompileMadt
@@ -1270,6 +1635,16 @@ DtCompileMadt (
             InfoTable = AcpiDmTableInfoMadt12;
             break;
 
+        case ACPI_MADT_TYPE_GENERIC_MSI_FRAME:
+
+            InfoTable = AcpiDmTableInfoMadt13;
+            break;
+
+        case ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR:
+
+            InfoTable = AcpiDmTableInfoMadt14;
+            break;
+
         default:
 
             DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "MADT");
@@ -1503,6 +1878,90 @@ DtCompileMtmr (
 }
 
 
+/******************************************************************************
+ *
+ * FUNCTION:    DtCompilePcct
+ *
+ * PARAMETERS:  List                - Current field list pointer
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Compile PCCT.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+DtCompilePcct (
+    void                    **List)
+{
+    ACPI_STATUS             Status;
+    DT_SUBTABLE             *Subtable;
+    DT_SUBTABLE             *ParentTable;
+    DT_FIELD                **PFieldList = (DT_FIELD **) List;
+    DT_FIELD                *SubtableStart;
+    ACPI_SUBTABLE_HEADER    *PcctHeader;
+    ACPI_DMTABLE_INFO       *InfoTable;
+
+
+    Status = DtCompileTable (PFieldList, AcpiDmTableInfoPcct,
+                &Subtable, TRUE);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    ParentTable = DtPeekSubtable ();
+    DtInsertSubtable (ParentTable, Subtable);
+
+    while (*PFieldList)
+    {
+        SubtableStart = *PFieldList;
+        Status = DtCompileTable (PFieldList, AcpiDmTableInfoPcctHdr,
+                    &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPushSubtable (Subtable);
+
+        PcctHeader = ACPI_CAST_PTR (ACPI_SUBTABLE_HEADER, Subtable->Buffer);
+
+        switch (PcctHeader->Type)
+        {
+        case ACPI_PCCT_TYPE_GENERIC_SUBSPACE:
+
+            InfoTable = AcpiDmTableInfoPcct0;
+            break;
+
+        case ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE:
+
+            InfoTable = AcpiDmTableInfoPcct1;
+            break;
+
+        default:
+
+            DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "PCCT");
+            return (AE_ERROR);
+        }
+
+        Status = DtCompileTable (PFieldList, InfoTable, &Subtable, TRUE);
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+
+        ParentTable = DtPeekSubtable ();
+        DtInsertSubtable (ParentTable, Subtable);
+        DtPopSubtable ();
+    }
+
+    return (AE_OK);
+}
+
+
 /******************************************************************************
  *
  * FUNCTION:    DtCompilePmtt
@@ -1961,6 +2420,11 @@ DtCompileSrat (
             InfoTable = AcpiDmTableInfoSrat2;
             break;
 
+        case ACPI_SRAT_TYPE_GICC_AFFINITY:
+
+            InfoTable = AcpiDmTableInfoSrat3;
+            break;
+
         default:
 
             DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "SRAT");
diff --git a/sys/contrib/dev/acpica/compiler/dttemplate.c b/sys/contrib/dev/acpica/compiler/dttemplate.c
index ca66d16daa1b..cb3cafde7f7b 100644
--- a/sys/contrib/dev/acpica/compiler/dttemplate.c
+++ b/sys/contrib/dev/acpica/compiler/dttemplate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -187,6 +187,12 @@ DtCreateTemplates (
     }
 
     Status = DtCreateOneTemplate (Signature, TableData);
+
+
+    /* Shutdown ACPICA subsystem */
+
+    (void) AcpiTerminate ();
+    CmDeleteCaches ();
     return (Status);
 }
 
@@ -397,6 +403,5 @@ DtCreateOneTemplate (
 Cleanup:
     fclose (File);
     AcpiOsRedirectOutput (stdout);
-    ACPI_FREE (DisasmFilename);
     return (Status);
 }
diff --git a/sys/contrib/dev/acpica/compiler/dttemplate.h b/sys/contrib/dev/acpica/compiler/dttemplate.h
index f620abd21dee..4011f087287b 100644
--- a/sys/contrib/dev/acpica/compiler/dttemplate.h
+++ b/sys/contrib/dev/acpica/compiler/dttemplate.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -174,6 +174,33 @@ const unsigned char TemplateCsrt[] =
     0x43,0x48,0x41,0x37                       /* 00000148    "CHA7"     */
 };
 
+const unsigned char TemplateDbg2[] =
+{
+    0x44,0x42,0x47,0x32,0xB2,0x00,0x00,0x00,  /* 00000000    "DBG2...." */
+    0x01,0xBA,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
+    0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
+    0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
+    0x15,0x11,0x13,0x20,0x2C,0x00,0x00,0x00,  /* 00000020    "... ,..." */
+    0x02,0x00,0x00,0x00,0xEE,0x3F,0x00,0x02,  /* 00000028    ".....?.." */
+    0x09,0x00,0x36,0x00,0x00,0x00,0x00,0x00,  /* 00000030    "..6....." */
+    0x00,0x80,0x00,0x00,0x00,0x00,0x16,0x00,  /* 00000038    "........" */
+    0x2E,0x00,0x01,0x32,0x00,0x03,0x88,0x77,  /* 00000040    "...2...w" */
+    0x66,0x55,0x44,0x33,0x22,0x11,0x01,0x64,  /* 00000048    "fUD3"..d" */
+    0x00,0x04,0x11,0x00,0xFF,0xEE,0xDD,0xCC,  /* 00000050    "........" */
+    0xBB,0xAA,0x10,0x32,0x54,0x76,0x98,0xBA,  /* 00000058    "...2Tv.." */
+    0xDC,0xFE,0x4D,0x79,0x44,0x65,0x76,0x69,  /* 00000060    "..MyDevi" */
+    0x63,0x65,0x00,0xEE,0x47,0x00,0x01,0x11,  /* 00000068    "ce..G..." */
+    0x00,0x26,0x00,0x10,0x00,0x37,0x00,0x00,  /* 00000070    ".&...7.." */
+    0x80,0x00,0x00,0x00,0x00,0x16,0x00,0x22,  /* 00000078    "......."" */
+    0x00,0x01,0x64,0x00,0x04,0x11,0x00,0xFF,  /* 00000080    "..d....." */
+    0xEE,0xDD,0xCC,0xBB,0xAA,0x98,0xBA,0xDC,  /* 00000088    "........" */
+    0xFE,0x5C,0x5C,0x5F,0x53,0x42,0x5F,0x2E,  /* 00000090    ".\\_SB_." */
+    0x50,0x43,0x49,0x30,0x2E,0x44,0x42,0x47,  /* 00000098    "PCI0.DBG" */
+    0x50,0x00,0x41,0x42,0x43,0x44,0x45,0x46,  /* 000000A0    "P.ABCDEF" */
+    0x47,0x48,0x49,0x50,0x51,0x52,0x53,0x54,  /* 000000A8    "GHIPQRST" */
+    0x55,0x56                                 /* 000000B0    "UV"       */
+};
+
 const unsigned char TemplateDbgp[] =
 {
     0x44,0x42,0x47,0x50,0x34,0x00,0x00,0x00,  /* 00000000    "DBGP4..." */
@@ -353,10 +380,10 @@ const unsigned char TemplateFacs[] =
 const unsigned char TemplateFadt[] =
 {
     0x46,0x41,0x43,0x50,0x0C,0x01,0x00,0x00,  /* 00000000    "FACP...." */
-    0x05,0x18,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
+    0x05,0x64,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    ".dINTEL " */
     0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
     0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x23,0x11,0x11,0x20,0x01,0x00,0x00,0x00,  /* 00000020    "#.. ...." */
+    0x15,0x11,0x13,0x20,0x01,0x00,0x00,0x00,  /* 00000020    "... ...." */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000030    "........" */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
@@ -368,7 +395,7 @@ const unsigned char TemplateFadt[] =
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000068    "........" */
     0x00,0x00,0x00,0x00,0x01,0x08,0x00,0x01,  /* 00000070    "........" */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000078    "........" */
-    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000080    "........" */
+    0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,  /* 00000080    "........" */
     0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000088    "........" */
     0x00,0x00,0x00,0x00,0x01,0x20,0x00,0x02,  /* 00000090    "..... .." */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000098    "........" */
@@ -379,7 +406,7 @@ const unsigned char TemplateFadt[] =
     0x00,0x00,0x00,0x00,0x01,0x08,0x00,0x00,  /* 000000C0    "........" */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000C8    "........" */
     0x01,0x20,0x00,0x03,0x01,0x00,0x00,0x00,  /* 000000D0    ". ......" */
-    0x00,0x00,0x00,0x00,0x01,0x80,0x00,0x01,  /* 000000D8    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x40,0x00,0x01,  /* 000000D8    ".....@.." */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000E0    "........" */
     0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000E8    "........" */
     0x00,0x00,0x00,0x00,0x01,0x08,0x00,0x01,  /* 000000F0    "........" */
@@ -407,16 +434,34 @@ const unsigned char TemplateFpdt[] =
 
 const unsigned char TemplateGtdt[] =
 {
-    0x47,0x54,0x44,0x54,0x50,0x00,0x00,0x00,  /* 00000000    "GTDTP..." */
-    0x01,0xF1,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
-    0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
-    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x23,0x06,0x11,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "#.. ...." */
-    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000028    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000030    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000040    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00   /* 00000048    "........" */
+    0x47,0x54,0x44,0x54,0xe0,0x00,0x00,0x00,  /* 00000000    "GTDT...." */
+    0x02,0xb0,0x4c,0x49,0x4e,0x41,0x52,0x4f,  /* 00000008    "..LINARO" */
+    0x52,0x54,0x53,0x4d,0x56,0x45,0x56,0x38,  /* 00000010    "RTSMVEV8" */
+    0x01,0x00,0x00,0x00,0x49,0x4e,0x54,0x4c,  /* 00000018    "....INTL" */
+    0x24,0x04,0x14,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "$.. ...." */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "........" */
+    0x1d,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000030    "........" */
+    0x1e,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000038    "........" */
+    0x1b,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000040    "........" */
+    0x1a,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000048    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000050    "........" */
+    0x02,0x00,0x00,0x00,0x60,0x00,0x00,0x00,  /* 00000058    "....`..." */
+    0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000060    ".d......" */
+    0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,  /* 00000068    "........" */
+    0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000070    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000078    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000080    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000088    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000090    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000098    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000a0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000a8    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000b0    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000b8    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x1c,0x00,0x00,  /* 000000c0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000c8    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000d0    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000d8    "........" */
 };
 
 const unsigned char TemplateHest[] =
@@ -521,41 +566,75 @@ const unsigned char TemplateIvrs[] =
     0x00,0x00,0x00,0x00                       /* 000000B8    "...."     */
 };
 
-/* MADT with ACPI 5.0 subtables */
+const unsigned char TemplateLpit[] =
+{
+    0x4C,0x50,0x49,0x54,0xB4,0x00,0x00,0x00,  /* 00000000    "LPIT...." */
+    0x01,0x20,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    ". INTEL " */
+    0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
+    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
+    0x25,0x03,0x14,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "%.. ...." */
+    0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "8......." */
+    0x00,0x00,0x00,0x00,0x7F,0x01,0x02,0x00,  /* 00000030    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000040    "........" */
+    0x00,0x20,0x00,0x03,0x00,0x00,0x00,0x00,  /* 00000048    ". ......" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000050    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000058    "........" */
+    0x58,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000060    "X......." */
+    0x00,0x00,0x00,0x00,0x01,0x10,0x00,0x02,  /* 00000068    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000070    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000078    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000080    "........" */
+    0x00,0x00,0x00,0x00,0x01,0x10,0x00,0x02,  /* 00000088    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000090    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000098    "........" */
+    0x00,0x08,0x00,0x01,0x00,0x00,0x00,0x00,  /* 000000A0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000A8    "........" */
+    0x00,0x00,0x00,0x00                       /* 000000B0    "...."     */
+};
+
+/* MADT with ACPI 5.1 subtables */
 
 const unsigned char TemplateMadt[] =
 {
-    0x41,0x50,0x49,0x43,0xF6,0x00,0x00,0x00,  /* 00000000    "APIC...." */
-    0x01,0xB0,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
-    0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
-    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x23,0x06,0x11,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "#.. ...." */
+    0x41,0x50,0x49,0x43,0x2a,0x01,0x00,0x00,  /* 00000000    "APIC*..." */
+    0x04,0x34,0x49,0x4e,0x54,0x45,0x4c,0x20,  /* 00000008    ".4INTEL " */
+    0x54,0x45,0x4d,0x50,0x4c,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
+    0x01,0x00,0x00,0x00,0x49,0x4e,0x54,0x4c,  /* 00000018    "....INTL" */
+    0x24,0x04,0x14,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "$.. ...." */
     0x01,0x00,0x00,0x00,0x00,0x08,0x00,0x00,  /* 00000028    "........" */
-    0x01,0x00,0x00,0x00,0x01,0x0C,0x01,0x00,  /* 00000030    "........" */
+    0x01,0x00,0x00,0x00,0x01,0x0c,0x01,0x00,  /* 00000030    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
-    0x02,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000040    "........" */
-    0x00,0x00,0x03,0x08,0x0D,0x00,0x01,0x00,  /* 00000048    "........" */
+    0x02,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000040    "........" */
+    0x00,0x00,0x03,0x08,0x0d,0x00,0x01,0x00,  /* 00000048    "........" */
     0x00,0x00,0x04,0x06,0x00,0x05,0x00,0x01,  /* 00000050    "........" */
-    0x05,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000058    "........" */
+    0x05,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000058    "........" */
     0x00,0x00,0x00,0x00,0x06,0x10,0x00,0x00,  /* 00000060    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000068    "........" */
     0x00,0x00,0x00,0x00,0x07,0x16,0x00,0x00,  /* 00000070    "........" */
     0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000078    "........" */
-    0x00,0x00,0x00,0x00,0x5C,0x43,0x50,0x55,  /* 00000080    "....\CPU" */
+    0x00,0x00,0x00,0x00,0x5c,0x43,0x50,0x55,  /* 00000080    "....\CPU" */
     0x30,0x00,0x08,0x10,0x05,0x00,0x00,0x00,  /* 00000088    "0......." */
     0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,  /* 00000090    "........" */
     0x00,0x00,0x09,0x10,0x00,0x00,0x00,0x00,  /* 00000098    "........" */
-    0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000A0    "........" */
-    0x00,0x00,0x0A,0x0C,0x05,0x00,0x00,0x00,  /* 000000A8    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x28,  /* 000000B0    ".......(" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000B8    "........" */
-    0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000C0    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000C8    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000D0    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x18,  /* 000000D8    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000E0    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000E8    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00             /* 000000F0    "......"   */
+    0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000a0    "........" */
+    0x00,0x00,0x0a,0x0c,0x05,0x00,0x00,0x00,  /* 000000a8    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x0b,0x4c,  /* 000000b0    ".......L" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000b8    "........" */
+    0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000c0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000c8    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000d0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000d8    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000e0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000e8    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000f0    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000f8    "........" */
+    0x00,0x00,0x0e,0x10,0x00,0x00,0x00,0x00,  /* 00000100    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000108    "........" */
+    0x00,0x00,0x0c,0x18,0x00,0x00,0x00,0x00,  /* 00000110    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000118    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000120    "........" */
+    0x00,0x00                                 /* 00000128    "..      " */
 };
 
 const unsigned char TemplateMcfg[] =
@@ -646,6 +725,32 @@ const unsigned char TemplateMtmr[] =
     0x00,0x00,0x00,0x00                       /* 00000048    "...."     */
 };
 
+const unsigned char TemplatePcct[] =
+{
+    0x50,0x43,0x43,0x54,0xAC,0x00,0x00,0x00,  /* 00000000    "PCCT...." */
+    0x01,0xCF,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
+    0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65,  /* 00000010    "Template" */
+    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
+    0x27,0x06,0x14,0x20,0x01,0x00,0x00,0x00,  /* 00000020    "'.. ...." */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "........" */
+    0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000030    ".>......" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
+    0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000040    "........" */
+    0x01,0x32,0x00,0x03,0x00,0x00,0x00,0x00,  /* 00000048    ".2......" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000050    "........" */
+    0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,  /* 00000058    "........" */
+    0xFF,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x00,  /* 00000060    "........" */
+    0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x3E,  /* 00000068    ".......>" */
+    0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000070    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,  /* 00000078    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x32,  /* 00000080    ".......2" */
+    0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000088    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000090    "........" */
+    0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,  /* 00000098    "........" */
+    0xFF,0xFF,0x01,0x00,0x00,0x00,0x01,0x00,  /* 000000A0    "........" */
+    0x00,0x00,0x01,0x00                       /* 000000A8    "...."     */
+};
+
 const unsigned char TemplatePmtt[] =
 {
     0x50,0x4D,0x54,0x54,0xB4,0x00,0x00,0x00,  /* 00000000    "PMTT...." */
@@ -844,10 +949,10 @@ const unsigned char TemplateSpcr[] =
 const unsigned char TemplateSpmi[] =
 {
     0x53,0x50,0x4D,0x49,0x41,0x00,0x00,0x00,  /* 00000000    "SPMIA..." */
-    0x04,0xED,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
+    0x04,0x00,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    "..INTEL " */
     0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
     0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x28,0x05,0x10,0x20,0x00,0x00,0x00,0x00,  /* 00000020    "(.. ...." */
+    0x14,0x01,0x14,0x20,0x00,0x01,0x00,0x00,  /* 00000020    "... ...." */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "........" */
     0x00,0x08,0x00,0x01,0x00,0x00,0x00,0x00,  /* 00000030    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
@@ -856,11 +961,11 @@ const unsigned char TemplateSpmi[] =
 
 const unsigned char TemplateSrat[] =
 {
-    0x53,0x52,0x41,0x54,0x80,0x00,0x00,0x00,  /* 00000000    "SRAT...." */
-    0x03,0x5A,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    ".ZINTEL " */
-    0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45,  /* 00000010    "TEMPLATE" */
+    0x53,0x52,0x41,0x54,0x92,0x00,0x00,0x00,  /* 00000000    "SRAT...." */
+    0x03,0x50,0x49,0x4E,0x54,0x45,0x4C,0x20,  /* 00000008    ".PINTEL " */
+    0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65,  /* 00000010    "Template" */
     0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
-    0x28,0x05,0x10,0x20,0x01,0x00,0x00,0x00,  /* 00000020    "(.. ...." */
+    0x24,0x07,0x14,0x20,0x01,0x00,0x00,0x00,  /* 00000020    "$.. ...." */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028    "........" */
     0x00,0x10,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000030    "........" */
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038    "........" */
@@ -871,7 +976,10 @@ const unsigned char TemplateSrat[] =
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000060    "........" */
     0x02,0x18,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000068    "........" */
     0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000070    "........" */
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00   /* 00000078    "........" */
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000078    "........" */
+    0x03,0x12,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000080    "........" */
+    0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,  /* 00000088    "........" */
+    0x00,0x00                                 /* 00000090    ".."       */
 };
 
 const unsigned char TemplateTcpa[] =
diff --git a/sys/contrib/dev/acpica/compiler/dtutils.c b/sys/contrib/dev/acpica/compiler/dtutils.c
index d7ef56eff1b5..1cd281a86141 100644
--- a/sys/contrib/dev/acpica/compiler/dtutils.c
+++ b/sys/contrib/dev/acpica/compiler/dtutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ DtSum (
 void
 DtError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage)
 {
@@ -124,7 +124,7 @@ DtError (
 void
 DtNameError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage)
 {
@@ -177,7 +177,7 @@ DtNameError (
 
 void
 DtFatal (
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     DT_FIELD                *FieldObject,
     char                    *ExtraMessage)
 {
@@ -284,36 +284,6 @@ DtStrtoul64 (
 }
 
 
-/******************************************************************************
- *
- * FUNCTION:    DtGetFileSize
- *
- * PARAMETERS:  Handle              - Open file handler
- *
- * RETURN:      Current file size
- *
- * DESCRIPTION: Get the current size of a file. Seek to the EOF and get the
- *              offset. Seek back to the original location.
- *
- *****************************************************************************/
-
-UINT32
-DtGetFileSize (
-    FILE                    *Handle)
-{
-    int                     CurrentOffset;
-    int                     LastOffset;
-
-
-    CurrentOffset = ftell (Handle);
-    fseek (Handle, 0, SEEK_END);
-    LastOffset = ftell (Handle);
-    fseek (Handle, CurrentOffset, SEEK_SET);
-
-    return ((UINT32) LastOffset);
-}
-
-
 /******************************************************************************
  *
  * FUNCTION:    DtGetFieldValue
@@ -531,7 +501,9 @@ DtGetFieldLength (
     case ACPI_DMT_SPACEID:
     case ACPI_DMT_ACCWIDTH:
     case ACPI_DMT_IVRS:
+    case ACPI_DMT_GTDT:
     case ACPI_DMT_MADT:
+    case ACPI_DMT_PCCT:
     case ACPI_DMT_PMTT:
     case ACPI_DMT_SRAT:
     case ACPI_DMT_ASF:
@@ -541,6 +513,7 @@ DtGetFieldLength (
     case ACPI_DMT_EINJINST:
     case ACPI_DMT_ERSTACT:
     case ACPI_DMT_ERSTINST:
+    case ACPI_DMT_DMAR_SCOPE:
 
         ByteLength = 1;
         break;
@@ -562,6 +535,7 @@ DtGetFieldLength (
     case ACPI_DMT_NAME4:
     case ACPI_DMT_SLIC:
     case ACPI_DMT_SIG:
+    case ACPI_DMT_LPIT:
 
         ByteLength = 4;
         break;
@@ -871,39 +845,151 @@ DtWalkTableTree (
 }
 
 
-/******************************************************************************
+/*******************************************************************************
  *
- * FUNCTION:    DtFreeFieldList
+ * FUNCTION:    UtSubtableCacheCalloc
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Pointer to the buffer. Aborts on allocation failure
+ *
+ * DESCRIPTION: Allocate a subtable object buffer. Bypass the local
+ *              dynamic memory manager for performance reasons (This has a
+ *              major impact on the speed of the compiler.)
+ *
+ ******************************************************************************/
+
+DT_SUBTABLE *
+UtSubtableCacheCalloc (
+    void)
+{
+    ASL_CACHE_INFO          *Cache;
+
+
+    if (Gbl_SubtableCacheNext >= Gbl_SubtableCacheLast)
+    {
+        /* Allocate a new buffer */
+
+        Cache = UtLocalCalloc (sizeof (Cache->Next) +
+            (sizeof (DT_SUBTABLE) * ASL_SUBTABLE_CACHE_SIZE));
+
+        /* Link new cache buffer to head of list */
+
+        Cache->Next = Gbl_SubtableCacheList;
+        Gbl_SubtableCacheList = Cache;
+
+        /* Setup cache management pointers */
+
+        Gbl_SubtableCacheNext = ACPI_CAST_PTR (DT_SUBTABLE, Cache->Buffer);
+        Gbl_SubtableCacheLast = Gbl_SubtableCacheNext + ASL_SUBTABLE_CACHE_SIZE;
+    }
+
+    Gbl_SubtableCount++;
+    return (Gbl_SubtableCacheNext++);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    UtFieldCacheCalloc
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Pointer to the buffer. Aborts on allocation failure
+ *
+ * DESCRIPTION: Allocate a field object buffer. Bypass the local
+ *              dynamic memory manager for performance reasons (This has a
+ *              major impact on the speed of the compiler.)
+ *
+ ******************************************************************************/
+
+DT_FIELD *
+UtFieldCacheCalloc (
+    void)
+{
+    ASL_CACHE_INFO          *Cache;
+
+
+    if (Gbl_FieldCacheNext >= Gbl_FieldCacheLast)
+    {
+        /* Allocate a new buffer */
+
+        Cache = UtLocalCalloc (sizeof (Cache->Next) +
+            (sizeof (DT_FIELD) * ASL_FIELD_CACHE_SIZE));
+
+        /* Link new cache buffer to head of list */
+
+        Cache->Next = Gbl_FieldCacheList;
+        Gbl_FieldCacheList = Cache;
+
+        /* Setup cache management pointers */
+
+        Gbl_FieldCacheNext = ACPI_CAST_PTR (DT_FIELD, Cache->Buffer);
+        Gbl_FieldCacheLast = Gbl_FieldCacheNext + ASL_FIELD_CACHE_SIZE;
+    }
+
+    Gbl_FieldCount++;
+    return (Gbl_FieldCacheNext++);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    DtDeleteCaches
  *
  * PARAMETERS:  None
  *
  * RETURN:      None
  *
- * DESCRIPTION: Free the field list
+ * DESCRIPTION: Delete all local cache buffer blocks
  *
- *****************************************************************************/
+ ******************************************************************************/
 
 void
-DtFreeFieldList (
+DtDeleteCaches (
     void)
 {
-    DT_FIELD                *Field = Gbl_FieldList;
-    DT_FIELD                *NextField;
+    UINT32                  BufferCount;
+    ASL_CACHE_INFO          *Next;
 
 
-    /* Walk and free entire field list */
+    /* Field cache */
 
-    while (Field)
+    BufferCount = 0;
+    while (Gbl_FieldCacheList)
     {
-        NextField = Field->Next; /* Save link */
-
-        if (!(Field->Flags & DT_FIELD_NOT_ALLOCATED))
-        {
-            ACPI_FREE (Field->Name);
-            ACPI_FREE (Field->Value);
-        }
-
-        ACPI_FREE (Field);
-        Field = NextField;
+        Next = Gbl_FieldCacheList->Next;
+        ACPI_FREE (Gbl_FieldCacheList);
+        Gbl_FieldCacheList = Next;
+        BufferCount++;
     }
+
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "%u Fields, Buffer size: %u fields (%u bytes), %u Buffers\n",
+        Gbl_FieldCount, ASL_FIELD_CACHE_SIZE,
+        (sizeof (DT_FIELD) * ASL_FIELD_CACHE_SIZE), BufferCount);
+
+    Gbl_FieldCount = 0;
+    Gbl_FieldCacheNext = NULL;
+    Gbl_FieldCacheLast = NULL;
+
+    /* Subtable cache */
+
+    BufferCount = 0;
+    while (Gbl_SubtableCacheList)
+    {
+        Next = Gbl_SubtableCacheList->Next;
+        ACPI_FREE (Gbl_SubtableCacheList);
+        Gbl_SubtableCacheList = Next;
+        BufferCount++;
+    }
+
+    DbgPrint (ASL_DEBUG_OUTPUT,
+        "%u Subtables, Buffer size: %u subtables (%u bytes), %u Buffers\n",
+        Gbl_SubtableCount, ASL_SUBTABLE_CACHE_SIZE,
+        (sizeof (DT_SUBTABLE) * ASL_SUBTABLE_CACHE_SIZE), BufferCount);
+
+    Gbl_SubtableCount = 0;
+    Gbl_SubtableCacheNext = NULL;
+    Gbl_SubtableCacheLast = NULL;
 }
diff --git a/sys/contrib/dev/acpica/compiler/preprocess.h b/sys/contrib/dev/acpica/compiler/preprocess.h
index ae32a8c47f71..532203474af4 100644
--- a/sys/contrib/dev/acpica/compiler/preprocess.h
+++ b/sys/contrib/dev/acpica/compiler/preprocess.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -257,7 +257,7 @@ PrGetNextToken (
 void
 PrError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  Column);
 
 void
diff --git a/sys/contrib/dev/acpica/compiler/prexpress.c b/sys/contrib/dev/acpica/compiler/prexpress.c
index c0aa565b4e57..886da89c477e 100644
--- a/sys/contrib/dev/acpica/compiler/prexpress.c
+++ b/sys/contrib/dev/acpica/compiler/prexpress.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/prmacros.c b/sys/contrib/dev/acpica/compiler/prmacros.c
index d76de8b845ac..ad7dfa0a9930 100644
--- a/sys/contrib/dev/acpica/compiler/prmacros.c
+++ b/sys/contrib/dev/acpica/compiler/prmacros.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -360,7 +360,7 @@ PrAddMacro (
         if (ArgCount >= PR_MAX_MACRO_ARGS)
         {
             PrError (ASL_ERROR, ASL_MSG_TOO_MANY_ARGUMENTS, TokenOffset);
-            return;
+            goto ErrorExit;
         }
     }
 
@@ -400,7 +400,7 @@ PrAddMacro (
                     PrError (ASL_ERROR, ASL_MSG_TOO_MANY_ARGUMENTS,
                         THIS_TOKEN_OFFSET (Token));
 
-                    return;
+                    goto ErrorExit;
                 }
                 break;
             }
@@ -432,7 +432,7 @@ PrAddMacro (
                 THIS_TOKEN_OFFSET (Name));
         }
 
-        return;
+        goto ErrorExit;
     }
 
     DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID
@@ -451,6 +451,13 @@ PrAddMacro (
         DefineInfo->Args = Args;
         DefineInfo->ArgCount = ArgCount;
     }
+
+    return;
+
+
+ErrorExit:
+    ACPI_FREE (Args);
+    return;
 }
 
 
diff --git a/sys/contrib/dev/acpica/compiler/prparser.l b/sys/contrib/dev/acpica/compiler/prparser.l
index b580d5771ddc..4fc45127aa6b 100644
--- a/sys/contrib/dev/acpica/compiler/prparser.l
+++ b/sys/contrib/dev/acpica/compiler/prparser.l
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/prparser.y b/sys/contrib/dev/acpica/compiler/prparser.y
index 391ad3fdd214..c7c1123852b9 100644
--- a/sys/contrib/dev/acpica/compiler/prparser.y
+++ b/sys/contrib/dev/acpica/compiler/prparser.y
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/prscan.c b/sys/contrib/dev/acpica/compiler/prscan.c
index a3ac0c283a57..ef5d52f65492 100644
--- a/sys/contrib/dev/acpica/compiler/prscan.c
+++ b/sys/contrib/dev/acpica/compiler/prscan.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/compiler/prutils.c b/sys/contrib/dev/acpica/compiler/prutils.c
index 0dbf307f0db7..92d810f6bddf 100644
--- a/sys/contrib/dev/acpica/compiler/prutils.c
+++ b/sys/contrib/dev/acpica/compiler/prutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -149,7 +149,7 @@ PrGetNextToken (
 void
 PrError (
     UINT8                   Level,
-    UINT8                   MessageId,
+    UINT16                  MessageId,
     UINT32                  Column)
 {
 #if 0
@@ -340,7 +340,6 @@ PrOpenIncludeWithPrefix (
     if (!IncludeFile)
     {
         fprintf (stderr, "Could not open include file %s\n", Pathname);
-        ACPI_FREE (Pathname);
         return (NULL);
     }
 
@@ -393,15 +392,17 @@ PrPushInputFileStack (
 
     /* Reset the global line count and filename */
 
-    Gbl_Files[ASL_FILE_INPUT].Filename = Filename;
+    Gbl_Files[ASL_FILE_INPUT].Filename =
+        UtStringCacheCalloc (strlen (Filename) + 1);
+    strcpy (Gbl_Files[ASL_FILE_INPUT].Filename, Filename);
+
     Gbl_Files[ASL_FILE_INPUT].Handle = InputFile;
     Gbl_PreviousLineNumber = 0;
     Gbl_CurrentLineNumber = 0;
 
     /* Emit a new #line directive for the include file */
 
-    FlPrintFile (ASL_FILE_PREPROCESSOR, "#line %u \"%s\"\n",
-        1, Filename);
+    FlPrintFile (ASL_FILE_PREPROCESSOR, "#line %u \"%s\"\n", 1, Filename);
 }
 
 
diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c
index 921f4289e56c..f28ed2f54e00 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acevents.h>
@@ -116,7 +115,7 @@ AcpiDbConvertToNode (
         Node = ACPI_TO_POINTER (Address);
         if (!AcpiOsReadable (Node, sizeof (ACPI_NAMESPACE_NODE)))
         {
-            AcpiOsPrintf ("Address %p is invalid in this address space\n",
+            AcpiOsPrintf ("Address %p is invalid",
                 Node);
             return (NULL);
         }
@@ -125,7 +124,7 @@ AcpiDbConvertToNode (
 
         if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED)
         {
-            AcpiOsPrintf ("Address %p is not a valid NS node [%s]\n",
+            AcpiOsPrintf ("Address %p is not a valid namespace node [%s]\n",
                     Node, AcpiUtGetDescriptorName (Node));
             return (NULL);
         }
@@ -139,6 +138,8 @@ AcpiDbConvertToNode (
         Node = AcpiDbLocalNsLookup (InString);
         if (!Node)
         {
+            AcpiOsPrintf ("Could not find [%s] in namespace, defaulting to root node\n",
+                InString);
             Node = AcpiGbl_RootNode;
         }
     }
@@ -337,7 +338,7 @@ AcpiDbDisplayTableInfo (
 
     /* Header */
 
-    AcpiOsPrintf ("Idx ID Status    Type            Sig  Address  Len   Header\n");
+    AcpiOsPrintf ("Idx ID    Status Type              TableHeader (Sig, Address, Length)\n");
 
     /* Walk the entire root table list */
 
@@ -362,35 +363,30 @@ AcpiDbDisplayTableInfo (
 
         switch (TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK)
         {
-        case ACPI_TABLE_ORIGIN_UNKNOWN:
+        case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
 
-            AcpiOsPrintf ("Unknown   ");
+            AcpiOsPrintf ("External/virtual  ");
             break;
 
-        case ACPI_TABLE_ORIGIN_MAPPED:
+        case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
 
-            AcpiOsPrintf ("Mapped    ");
+            AcpiOsPrintf ("Internal/physical ");
             break;
 
-        case ACPI_TABLE_ORIGIN_ALLOCATED:
+        case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
 
-            AcpiOsPrintf ("Allocated ");
-            break;
-
-        case ACPI_TABLE_ORIGIN_OVERRIDE:
-
-            AcpiOsPrintf ("Override  ");
+            AcpiOsPrintf ("Internal/virtual  ");
             break;
 
         default:
 
-            AcpiOsPrintf ("INVALID   ");
+            AcpiOsPrintf ("INVALID TYPE      ");
             break;
         }
 
         /* Make sure that the table is mapped */
 
-        Status = AcpiTbVerifyTable (TableDesc);
+        Status = AcpiTbValidateTable (TableDesc);
         if (ACPI_FAILURE (Status))
         {
             return;
@@ -440,8 +436,6 @@ AcpiDbUnloadAcpiTable (
     Node = AcpiDbConvertToNode (ObjectName);
     if (!Node)
     {
-        AcpiOsPrintf ("Could not find [%s] in namespace\n",
-            ObjectName);
         return;
     }
 
@@ -830,7 +824,7 @@ AcpiDmTestResourceConversion (
 
     /* Convert internal resource list to external AML resource template */
 
-    Status = AcpiRsCreateAmlResources (ResourceBuffer.Pointer, &NewAml);
+    Status = AcpiRsCreateAmlResources (&ResourceBuffer, &NewAml);
     if (ACPI_FAILURE (Status))
     {
         AcpiOsPrintf ("AcpiRsCreateAmlResources failed: %s\n",
@@ -842,8 +836,8 @@ AcpiDmTestResourceConversion (
 
     OriginalAml = ReturnBuffer.Pointer;
 
-    AcpiDmCompareAmlResources (
-        OriginalAml->Buffer.Pointer, (ACPI_RSDESC_SIZE) OriginalAml->Buffer.Length,
+    AcpiDmCompareAmlResources (OriginalAml->Buffer.Pointer,
+        (ACPI_RSDESC_SIZE) OriginalAml->Buffer.Length,
         NewAml.Pointer, (ACPI_RSDESC_SIZE) NewAml.Length);
 
     /* Cleanup and exit */
@@ -1042,7 +1036,7 @@ AcpiDbDeviceResources (
         }
 
 EndCrs:
-        ACPI_FREE_BUFFER (ReturnBuffer);
+        ACPI_FREE (ReturnBuffer.Pointer);
     }
 
 
@@ -1192,14 +1186,25 @@ AcpiDbGenerateGpe (
     char                    *GpeArg,
     char                    *BlockArg)
 {
-    UINT32                  BlockNumber;
+    UINT32                  BlockNumber = 0;
     UINT32                  GpeNumber;
     ACPI_GPE_EVENT_INFO     *GpeEventInfo;
 
 
-    GpeNumber   = ACPI_STRTOUL (GpeArg, NULL, 0);
-    BlockNumber = ACPI_STRTOUL (BlockArg, NULL, 0);
+    GpeNumber = ACPI_STRTOUL (GpeArg, NULL, 0);
 
+    /*
+     * If no block arg, or block arg == 0 or 1, use the FADT-defined
+     * GPE blocks.
+     */
+    if (BlockArg)
+    {
+        BlockNumber = ACPI_STRTOUL (BlockArg, NULL, 0);
+        if (BlockNumber == 1)
+        {
+            BlockNumber = 0;
+        }
+    }
 
     GpeEventInfo = AcpiEvGetGpeEventInfo (ACPI_TO_POINTER (BlockNumber),
         GpeNumber);
diff --git a/sys/contrib/dev/acpica/components/debugger/dbconvert.c b/sys/contrib/dev/acpica/components/debugger/dbconvert.c
index 6daa753a7835..1b23002428fd 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbconvert.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbconvert.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
diff --git a/sys/contrib/dev/acpica/components/debugger/dbdisply.c b/sys/contrib/dev/acpica/components/debugger/dbdisply.c
index 62edea0e4d67..988ab83d3de0 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbdisply.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbdisply.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -303,6 +302,10 @@ AcpiDbDecodeAndDisplayObject (
 
             /* Is not a recognizeable object */
 
+            AcpiOsPrintf (
+                "Not a known ACPI internal object, descriptor type %2.2X\n",
+                ACPI_GET_DESCRIPTOR_TYPE (ObjPtr));
+
             Size = 16;
             if (AcpiOsReadable (ObjPtr, 64))
             {
diff --git a/sys/contrib/dev/acpica/components/debugger/dbexec.c b/sys/contrib/dev/acpica/components/debugger/dbexec.c
index 2566e2dbcc64..da907842e062 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbexec.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbexec.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
@@ -62,7 +61,7 @@ AcpiDbExecuteMethod (
     ACPI_DB_METHOD_INFO     *Info,
     ACPI_BUFFER             *ReturnObj);
 
-static void
+static ACPI_STATUS
 AcpiDbExecuteSetup (
     ACPI_DB_METHOD_INFO     *Info);
 
@@ -237,10 +236,15 @@ AcpiDbExecuteMethod (
  *
  ******************************************************************************/
 
-static void
+static ACPI_STATUS
 AcpiDbExecuteSetup (
     ACPI_DB_METHOD_INFO     *Info)
 {
+    ACPI_STATUS             Status;
+
+
+    ACPI_FUNCTION_NAME (DbExecuteSetup);
+
 
     /* Catenate the current scope to the supplied name */
 
@@ -248,10 +252,21 @@ AcpiDbExecuteSetup (
     if ((Info->Name[0] != '\\') &&
         (Info->Name[0] != '/'))
     {
-        ACPI_STRCAT (Info->Pathname, AcpiGbl_DbScopeBuf);
+        if (AcpiUtSafeStrcat (Info->Pathname, sizeof (Info->Pathname),
+            AcpiGbl_DbScopeBuf))
+        {
+            Status = AE_BUFFER_OVERFLOW;
+            goto ErrorExit;
+        }
+    }
+
+    if (AcpiUtSafeStrcat (Info->Pathname, sizeof (Info->Pathname),
+        Info->Name))
+    {
+        Status = AE_BUFFER_OVERFLOW;
+        goto ErrorExit;
     }
 
-    ACPI_STRCAT (Info->Pathname, Info->Name);
     AcpiDbPrepNamestring (Info->Pathname);
 
     AcpiDbSetOutputDestination (ACPI_DB_DUPLICATE_OUTPUT);
@@ -269,6 +284,13 @@ AcpiDbExecuteSetup (
 
         AcpiDbSetOutputDestination (ACPI_DB_REDIRECTABLE_OUTPUT);
     }
+
+    return (AE_OK);
+
+ErrorExit:
+
+    ACPI_EXCEPTION ((AE_INFO, Status, "During setup for method execution"));
+    return (Status);
 }
 
 
@@ -429,7 +451,12 @@ AcpiDbExecute (
         ReturnObj.Pointer = NULL;
         ReturnObj.Length = ACPI_ALLOCATE_BUFFER;
 
-        AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo);
+        Status = AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo);
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_FREE (NameString);
+            return;
+        }
 
         /* Get the NS node, determines existence also */
 
@@ -729,7 +756,11 @@ AcpiDbCreateExecutionThreads (
 
     AcpiDbUint32ToHexString (NumThreads, AcpiGbl_DbMethodInfo.NumThreadsStr);
 
-    AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo);
+    Status = AcpiDbExecuteSetup (&AcpiGbl_DbMethodInfo);
+    if (ACPI_FAILURE (Status))
+    {
+        goto CleanupAndExit;
+    }
 
     /* Get the NS node, determines existence also */
 
diff --git a/sys/contrib/dev/acpica/components/debugger/dbfileio.c b/sys/contrib/dev/acpica/components/debugger/dbfileio.c
index 05fa4e7c9e2e..579d2acd5dd7 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbfileio.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbfileio.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,48 +42,18 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
-
-#ifdef ACPI_APPLICATION
 #include <contrib/dev/acpica/include/actables.h>
-#endif
-
-#ifdef ACPI_ASL_COMPILER
-#include <contrib/dev/acpica/compiler/aslcompiler.h>
-#endif
 
 #if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER)
 
 #define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dbfileio")
 
-/*
- * NOTE: this is here for lack of a better place. It is used in all
- * flavors of the debugger, need LCD file
- */
-#ifdef ACPI_APPLICATION
-#include <stdio.h>
-FILE                        *AcpiGbl_DebugFile = NULL;
-#endif
-
-
 #ifdef ACPI_DEBUGGER
 
-/* Local prototypes */
-
-#ifdef ACPI_APPLICATION
-
-static ACPI_STATUS
-AcpiDbCheckTextModeCorruption (
-    UINT8                   *Table,
-    UINT32                  TableLength,
-    UINT32                  FileLength);
-
-#endif
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDbCloseDebugFile
@@ -152,242 +122,7 @@ AcpiDbOpenDebugFile (
 
 
 #ifdef ACPI_APPLICATION
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDbCheckTextModeCorruption
- *
- * PARAMETERS:  Table           - Table buffer
- *              TableLength     - Length of table from the table header
- *              FileLength      - Length of the file that contains the table
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Check table for text mode file corruption where all linefeed
- *              characters (LF) have been replaced by carriage return linefeed
- *              pairs (CR/LF).
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiDbCheckTextModeCorruption (
-    UINT8                   *Table,
-    UINT32                  TableLength,
-    UINT32                  FileLength)
-{
-    UINT32                  i;
-    UINT32                  Pairs = 0;
-
-
-    if (TableLength != FileLength)
-    {
-        ACPI_WARNING ((AE_INFO,
-            "File length (0x%X) is not the same as the table length (0x%X)",
-            FileLength, TableLength));
-    }
-
-    /* Scan entire table to determine if each LF has been prefixed with a CR */
-
-    for (i = 1; i < FileLength; i++)
-    {
-        if (Table[i] == 0x0A)
-        {
-            if (Table[i - 1] != 0x0D)
-            {
-                /* The LF does not have a preceding CR, table not corrupted */
-
-                return (AE_OK);
-            }
-            else
-            {
-                /* Found a CR/LF pair */
-
-                Pairs++;
-            }
-            i++;
-        }
-    }
-
-    if (!Pairs)
-    {
-        return (AE_OK);
-    }
-
-    /*
-     * Entire table scanned, each CR is part of a CR/LF pair --
-     * meaning that the table was treated as a text file somewhere.
-     *
-     * NOTE: We can't "fix" the table, because any existing CR/LF pairs in the
-     * original table are left untouched by the text conversion process --
-     * meaning that we cannot simply replace CR/LF pairs with LFs.
-     */
-    AcpiOsPrintf ("Table has been corrupted by text mode conversion\n");
-    AcpiOsPrintf ("All LFs (%u) were changed to CR/LF pairs\n", Pairs);
-    AcpiOsPrintf ("Table cannot be repaired!\n");
-    return (AE_BAD_VALUE);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDbReadTable
- *
- * PARAMETERS:  fp              - File that contains table
- *              Table           - Return value, buffer with table
- *              TableLength     - Return value, length of table
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Load the DSDT from the file pointer
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiDbReadTable (
-    FILE                    *fp,
-    ACPI_TABLE_HEADER       **Table,
-    UINT32                  *TableLength)
-{
-    ACPI_TABLE_HEADER       TableHeader;
-    UINT32                  Actual;
-    ACPI_STATUS             Status;
-    UINT32                  FileSize;
-    BOOLEAN                 StandardHeader = TRUE;
-
-
-    /* Get the file size */
-
-    fseek (fp, 0, SEEK_END);
-    FileSize = (UINT32) ftell (fp);
-    fseek (fp, 0, SEEK_SET);
-
-    if (FileSize < 4)
-    {
-        return (AE_BAD_HEADER);
-    }
-
-    /* Read the signature */
-
-    if (fread (&TableHeader, 1, 4, fp) != 4)
-    {
-        AcpiOsPrintf ("Could not read the table signature\n");
-        return (AE_BAD_HEADER);
-    }
-
-    fseek (fp, 0, SEEK_SET);
-
-    /* The RSDP table does not have standard ACPI header */
-
-    if (ACPI_COMPARE_NAME (TableHeader.Signature, "RSD "))
-    {
-        *TableLength = FileSize;
-        StandardHeader = FALSE;
-    }
-    else
-    {
-        /* Read the table header */
-
-        if (fread (&TableHeader, 1, sizeof (ACPI_TABLE_HEADER), fp) !=
-                sizeof (ACPI_TABLE_HEADER))
-        {
-            AcpiOsPrintf ("Could not read the table header\n");
-            return (AE_BAD_HEADER);
-        }
-
-#if 0
-        /* Validate the table header/length */
-
-        Status = AcpiTbValidateTableHeader (&TableHeader);
-        if (ACPI_FAILURE (Status))
-        {
-            AcpiOsPrintf ("Table header is invalid!\n");
-            return (Status);
-        }
-#endif
-
-        /* File size must be at least as long as the Header-specified length */
-
-        if (TableHeader.Length > FileSize)
-        {
-            AcpiOsPrintf (
-                "TableHeader length [0x%X] greater than the input file size [0x%X]\n",
-                TableHeader.Length, FileSize);
-
-#ifdef ACPI_ASL_COMPILER
-            Status = FlCheckForAscii (fp, NULL, FALSE);
-            if (ACPI_SUCCESS (Status))
-            {
-                AcpiOsPrintf ("File appears to be ASCII only, must be binary\n",
-                    TableHeader.Length, FileSize);
-            }
-#endif
-            return (AE_BAD_HEADER);
-        }
-
-#ifdef ACPI_OBSOLETE_CODE
-        /* We only support a limited number of table types */
-
-        if (!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_DSDT) &&
-            !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_PSDT) &&
-            !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_SSDT))
-        {
-            AcpiOsPrintf ("Table signature [%4.4s] is invalid or not supported\n",
-                (char *) TableHeader.Signature);
-            ACPI_DUMP_BUFFER (&TableHeader, sizeof (ACPI_TABLE_HEADER));
-            return (AE_ERROR);
-        }
-#endif
-
-        *TableLength = TableHeader.Length;
-    }
-
-    /* Allocate a buffer for the table */
-
-    *Table = AcpiOsAllocate ((size_t) FileSize);
-    if (!*Table)
-    {
-        AcpiOsPrintf (
-            "Could not allocate memory for ACPI table %4.4s (size=0x%X)\n",
-            TableHeader.Signature, *TableLength);
-        return (AE_NO_MEMORY);
-    }
-
-    /* Get the rest of the table */
-
-    fseek (fp, 0, SEEK_SET);
-    Actual = fread (*Table, 1, (size_t) FileSize, fp);
-    if (Actual == FileSize)
-    {
-        if (StandardHeader)
-        {
-            /* Now validate the checksum */
-
-            Status = AcpiTbVerifyChecksum ((void *) *Table,
-                        ACPI_CAST_PTR (ACPI_TABLE_HEADER, *Table)->Length);
-
-            if (Status == AE_BAD_CHECKSUM)
-            {
-                Status = AcpiDbCheckTextModeCorruption ((UINT8 *) *Table,
-                            FileSize, (*Table)->Length);
-                return (Status);
-            }
-        }
-        return (AE_OK);
-    }
-
-    if (Actual > 0)
-    {
-        AcpiOsPrintf ("Warning - reading table, asked for %X got %X\n",
-            FileSize, Actual);
-        return (AE_OK);
-    }
-
-    AcpiOsPrintf ("Error - could not read the table file\n");
-    AcpiOsFree (*Table);
-    *Table = NULL;
-    *TableLength = 0;
-    return (AE_ERROR);
-}
-
+#include <contrib/dev/acpica/include/acapps.h>
 
 /*******************************************************************************
  *
@@ -431,7 +166,7 @@ AeLocalLoadTable (
 
     /* Install the new table into the local data structures */
 
-    Status = AcpiTbInstallTable (&TableInfo);
+    Status = AcpiTbInitTableDescriptor (&TableInfo);
     if (ACPI_FAILURE (Status))
     {
         if (Status == AE_ALREADY_EXISTS)
@@ -462,54 +197,6 @@ AeLocalLoadTable (
 
     return_ACPI_STATUS (Status);
 }
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDbReadTableFromFile
- *
- * PARAMETERS:  Filename         - File where table is located
- *              Table            - Where a pointer to the table is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get an ACPI table from a file
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiDbReadTableFromFile (
-    char                    *Filename,
-    ACPI_TABLE_HEADER       **Table)
-{
-    FILE                    *File;
-    UINT32                  TableLength;
-    ACPI_STATUS             Status;
-
-
-    /* Open the file */
-
-    File = fopen (Filename, "rb");
-    if (!File)
-    {
-        AcpiOsPrintf ("Could not open input file %s\n", Filename);
-        return (AE_ERROR);
-    }
-
-    /* Get the entire file */
-
-    fprintf (stderr, "Loading Acpi table from file %s\n", Filename);
-    Status = AcpiDbReadTable (File, Table, &TableLength);
-    fclose(File);
-
-    if (ACPI_FAILURE (Status))
-    {
-        AcpiOsPrintf ("Could not get table from the file\n");
-        return (Status);
-    }
-
-    return (AE_OK);
- }
 #endif
 
 
@@ -537,7 +224,7 @@ AcpiDbGetTableFromFile (
     BOOLEAN                 IsAmlTable = TRUE;
 
 
-    Status = AcpiDbReadTableFromFile (Filename, &Table);
+    Status = AcpiUtReadTableFromFile (Filename, &Table);
     if (ACPI_FAILURE (Status))
     {
         return (Status);
@@ -568,6 +255,8 @@ AcpiDbGetTableFromFile (
             return (Status);
         }
 
+        AcpiTbPrintTableHeader (0, Table);
+
         fprintf (stderr,
             "Acpi table [%4.4s] successfully installed and loaded\n",
             Table->Signature);
diff --git a/sys/contrib/dev/acpica/components/debugger/dbhistry.c b/sys/contrib/dev/acpica/components/debugger/dbhistry.c
index 4a97ba4acac7..4a6935bd67d9 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbhistry.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbhistry.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
@@ -69,7 +68,7 @@ static HISTORY_INFO         AcpiGbl_HistoryBuffer[HISTORY_SIZE];
 static UINT16               AcpiGbl_LoHistory = 0;
 static UINT16               AcpiGbl_NumHistory = 0;
 static UINT16               AcpiGbl_NextHistoryIndex = 0;
-static UINT32               AcpiGbl_NextCmdNum = 1;
+UINT32                      AcpiGbl_NextCmdNum = 1;
 
 
 /*******************************************************************************
@@ -94,6 +93,11 @@ AcpiDbAddToHistory (
     /* Put command into the next available slot */
 
     CmdLen = (UINT16) ACPI_STRLEN (CommandLine);
+    if (!CmdLen)
+    {
+        return;
+    }
+
     if (AcpiGbl_HistoryBuffer[AcpiGbl_NextHistoryIndex].Command != NULL)
     {
         BufferLen = (UINT16) ACPI_STRLEN (
@@ -203,8 +207,6 @@ char *
 AcpiDbGetFromHistory (
     char                    *CommandNumArg)
 {
-    UINT32                  i;
-    UINT16                  HistoryIndex;
     UINT32                  CmdNum;
 
 
@@ -218,6 +220,31 @@ AcpiDbGetFromHistory (
         CmdNum = ACPI_STRTOUL (CommandNumArg, NULL, 0);
     }
 
+    return (AcpiDbGetHistoryByIndex (CmdNum));
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbGetHistoryByIndex
+ *
+ * PARAMETERS:  CmdNum              - Index of the desired history entry.
+ *                                    Values are 0...(AcpiGbl_NextCmdNum - 1)
+ *
+ * RETURN:      Pointer to the retrieved command. Null on error.
+ *
+ * DESCRIPTION: Get a command from the history buffer
+ *
+ ******************************************************************************/
+
+char *
+AcpiDbGetHistoryByIndex (
+    UINT32                  CmdNum)
+{
+    UINT32                  i;
+    UINT16                  HistoryIndex;
+
+
     /* Search history buffer */
 
     HistoryIndex = AcpiGbl_LoHistory;
@@ -230,6 +257,7 @@ AcpiDbGetFromHistory (
             return (AcpiGbl_HistoryBuffer[HistoryIndex].Command);
         }
 
+        /* History buffer is circular */
 
         HistoryIndex++;
         if (HistoryIndex >= HISTORY_SIZE)
diff --git a/sys/contrib/dev/acpica/components/debugger/dbinput.c b/sys/contrib/dev/acpica/components/debugger/dbinput.c
index c1a51f89c66d..309bcc351fc6 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbinput.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbinput.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
@@ -93,7 +92,6 @@ enum AcpiExDebuggerCommands
     CMD_ALLOCATIONS,
     CMD_ARGS,
     CMD_ARGUMENTS,
-    CMD_BATCH,
     CMD_BREAKPOINT,
     CMD_BUSINFO,
     CMD_CALL,
@@ -128,7 +126,7 @@ enum AcpiExDebuggerCommands
     CMD_METHODS,
     CMD_NAMESPACE,
     CMD_NOTIFY,
-    CMD_OBJECT,
+    CMD_OBJECTS,
     CMD_OPEN,
     CMD_OSI,
     CMD_OWNER,
@@ -147,6 +145,7 @@ enum AcpiExDebuggerCommands
     CMD_TABLES,
     CMD_TEMPLATE,
     CMD_TERMINATE,
+    CMD_TEST,
     CMD_THREADS,
     CMD_TRACE,
     CMD_TREE,
@@ -166,7 +165,6 @@ static const ACPI_DB_COMMAND_INFO   AcpiGbl_DbCommands[] =
     {"ALLOCATIONS",  0},
     {"ARGS",         0},
     {"ARGUMENTS",    0},
-    {"BATCH",        0},
     {"BREAKPOINT",   1},
     {"BUSINFO",      0},
     {"CALL",         0},
@@ -182,7 +180,7 @@ static const ACPI_DB_COMMAND_INFO   AcpiGbl_DbCommands[] =
     {"EXIT",         0},
     {"FIND",         1},
     {"GO",           0},
-    {"GPE",          2},
+    {"GPE",          1},
     {"GPES",         0},
     {"HANDLERS",     0},
     {"HELP",         0},
@@ -201,7 +199,7 @@ static const ACPI_DB_COMMAND_INFO   AcpiGbl_DbCommands[] =
     {"METHODS",      0},
     {"NAMESPACE",    0},
     {"NOTIFY",       2},
-    {"OBJECT",       1},
+    {"OBJECTS",      1},
     {"OPEN",         1},
     {"OSI",          0},
     {"OWNER",        1},
@@ -220,6 +218,7 @@ static const ACPI_DB_COMMAND_INFO   AcpiGbl_DbCommands[] =
     {"TABLES",       0},
     {"TEMPLATE",     1},
     {"TERMINATE",    0},
+    {"TEST",        1},
     {"THREADS",      3},
     {"TRACE",        1},
     {"TREE",         0},
@@ -246,8 +245,7 @@ static const ACPI_DB_COMMAND_HELP   AcpiGbl_DbCommandHelp[] =
     {1, "  Locks",                             "Current status of internal mutexes\n"},
     {1, "  Osi [Install|Remove <name>]",       "Display or modify global _OSI list\n"},
     {1, "  Quit or Exit",                      "Exit this command\n"},
-    {9, "  Stats [Allocations|Memory|Misc|",   "\n"},
-    {1, "      Objects|Sizes|Stack|Tables]",   "Display namespace and memory statistics\n"},
+    {8, "  Stats <SubCommand>",                "Display namespace and memory statistics\n"},
     {1, "     Allocations",                    "Display list of current memory allocations\n"},
     {1, "     Memory",                         "Dump internal memory lists\n"},
     {1, "     Misc",                           "Namespace search and mutex stats\n"},
@@ -306,7 +304,7 @@ static const ACPI_DB_COMMAND_HELP   AcpiGbl_DbCommandHelp[] =
 
     {0, "\nHardware Related Commands:",         "\n"},
     {1, "  Event <F|G> <Value>",               "Generate AcpiEvent (Fixed/GPE)\n"},
-    {1, "  Gpe <GpeNum> <GpeBlock>",           "Simulate a GPE\n"},
+    {1, "  Gpe <GpeNum> [GpeBlockDevice]",     "Simulate a GPE\n"},
     {1, "  Gpes",                              "Display info on all GPEs\n"},
     {1, "  Sci",                               "Generate an SCI\n"},
     {1, "  Sleep [SleepState]",                "Simulate sleep/wake sequence(s) (0-5)\n"},
@@ -315,6 +313,11 @@ static const ACPI_DB_COMMAND_HELP   AcpiGbl_DbCommandHelp[] =
     {1, "  Close",                             "Close debug output file\n"},
     {1, "  Load <Input Filename>",             "Load ACPI table from a file\n"},
     {1, "  Open <Output Filename>",            "Open a file for debug output\n"},
+
+    {0, "\nDebug Test Commands:",              "\n"},
+    {3, "  Test <TestName>",                   "Invoke a debug test\n"},
+    {1, "     Objects",                        "Read/write/compare all namespace data objects\n"},
+    {1, "     Predefined",                     "Execute all ACPI predefined names (_STA, etc.)\n"},
     {0, NULL, NULL}
 };
 
@@ -635,7 +638,13 @@ AcpiDbGetLine (
     char                    *This;
 
 
-    ACPI_STRCPY (AcpiGbl_DbParsedBuf, InputBuffer);
+    if (AcpiUtSafeStrcpy (AcpiGbl_DbParsedBuf, sizeof (AcpiGbl_DbParsedBuf),
+        InputBuffer))
+    {
+        AcpiOsPrintf ("Buffer overflow while parsing input line (max %u characters)\n",
+            sizeof (AcpiGbl_DbParsedBuf));
+        return (0);
+    }
 
     This = AcpiGbl_DbParsedBuf;
     for (i = 0; i < ACPI_DEBUGGER_MAX_ARGS; i++)
@@ -740,6 +749,11 @@ AcpiDbCommandDispatch (
         return (AE_CTRL_TERMINATE);
     }
 
+
+    /* Add all commands that come here to the history buffer */
+
+    AcpiDbAddToHistory (InputBuffer);
+
     ParamCount = AcpiDbGetLine (InputBuffer);
     CommandIndex = AcpiDbMatchCommand (AcpiGbl_DbArgs[0]);
     Temp = 0;
@@ -781,11 +795,6 @@ AcpiDbCommandDispatch (
         AcpiDbDisplayArguments ();
         break;
 
-    case CMD_BATCH:
-
-        AcpiDbBatchExecute (AcpiGbl_DbArgs[1]);
-        break;
-
     case CMD_BREAKPOINT:
 
         AcpiDbSetMethodBreakpoint (AcpiGbl_DbArgs[1], WalkState, Op);
@@ -989,7 +998,7 @@ AcpiDbCommandDispatch (
         AcpiDbSendNotify (AcpiGbl_DbArgs[1], Temp);
         break;
 
-    case CMD_OBJECT:
+    case CMD_OBJECTS:
 
         AcpiUtStrupr (AcpiGbl_DbArgs[1]);
         Status = AcpiDbDisplayObjects (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
@@ -1088,6 +1097,11 @@ AcpiDbCommandDispatch (
         /*  AcpiInitialize (NULL);  */
         break;
 
+    case CMD_TEST:
+
+        AcpiDbExecuteTest (AcpiGbl_DbArgs[1]);
+        break;
+
     case CMD_THREADS:
 
         AcpiDbCreateExecutionThreads (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2],
@@ -1135,7 +1149,7 @@ AcpiDbCommandDispatch (
     case CMD_NOT_FOUND:
     default:
 
-        AcpiOsPrintf ("Unknown Command\n");
+        AcpiOsPrintf ("%s: unknown command\n", AcpiGbl_DbArgs[0]);
         return (AE_CTRL_TRUE);
     }
 
@@ -1144,9 +1158,6 @@ AcpiDbCommandDispatch (
         Status = AE_CTRL_TRUE;
     }
 
-    /* Add all commands that come here to the history buffer */
-
-    AcpiDbAddToHistory (InputBuffer);
     return (Status);
 }
 
diff --git a/sys/contrib/dev/acpica/components/debugger/dbmethod.c b/sys/contrib/dev/acpica/components/debugger/dbmethod.c
index ca2d92bc4272..dc8a09a29a23 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbmethod.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbmethod.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdispat.h>
@@ -58,16 +57,6 @@
         ACPI_MODULE_NAME    ("dbmethod")
 
 
-/* Local prototypes */
-
-static ACPI_STATUS
-AcpiDbWalkForExecute (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  NestingLevel,
-    void                    *Context,
-    void                    **ReturnValue);
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDbSetMethodBreakpoint
@@ -190,6 +179,11 @@ AcpiDbSetMethodData (
     if (Type == 'N')
     {
         Node = AcpiDbConvertToNode (IndexArg);
+        if (!Node)
+        {
+            return;
+        }
+
         if (Node->Type != ACPI_TYPE_INTEGER)
         {
             AcpiOsPrintf ("Can only set Integer nodes\n");
@@ -418,195 +412,4 @@ AcpiDbDisassembleMethod (
     return (AE_OK);
 }
 
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDbWalkForExecute
- *
- * PARAMETERS:  Callback from WalkNamespace
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Batch execution module. Currently only executes predefined
- *              ACPI names.
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AcpiDbWalkForExecute (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  NestingLevel,
-    void                    *Context,
-    void                    **ReturnValue)
-{
-    ACPI_NAMESPACE_NODE         *Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
-    ACPI_DB_EXECUTE_WALK        *Info = (ACPI_DB_EXECUTE_WALK *) Context;
-    char                        *Pathname;
-    const ACPI_PREDEFINED_INFO  *Predefined;
-    ACPI_DEVICE_INFO            *ObjInfo;
-    ACPI_OBJECT_LIST            ParamObjects;
-    ACPI_OBJECT                 Params[ACPI_METHOD_NUM_ARGS];
-    ACPI_OBJECT                 *ThisParam;
-    ACPI_BUFFER                 ReturnObj;
-    ACPI_STATUS                 Status;
-    UINT16                      ArgTypeList;
-    UINT8                       ArgCount;
-    UINT8                       ArgType;
-    UINT32                      i;
-
-
-    /* The name must be a predefined ACPI name */
-
-    Predefined = AcpiUtMatchPredefinedMethod (Node->Name.Ascii);
-    if (!Predefined)
-    {
-        return (AE_OK);
-    }
-
-    if (Node->Type == ACPI_TYPE_LOCAL_SCOPE)
-    {
-        return (AE_OK);
-    }
-
-    Pathname = AcpiNsGetExternalPathname (Node);
-    if (!Pathname)
-    {
-        return (AE_OK);
-    }
-
-    /* Get the object info for number of method parameters */
-
-    Status = AcpiGetObjectInfo (ObjHandle, &ObjInfo);
-    if (ACPI_FAILURE (Status))
-    {
-        return (Status);
-    }
-
-    ParamObjects.Count = 0;
-    ParamObjects.Pointer = NULL;
-
-    if (ObjInfo->Type == ACPI_TYPE_METHOD)
-    {
-        /* Setup default parameters (with proper types) */
-
-        ArgTypeList = Predefined->Info.ArgumentList;
-        ArgCount = METHOD_GET_ARG_COUNT (ArgTypeList);
-
-        /*
-         * Setup the ACPI-required number of arguments, regardless of what
-         * the actual method defines. If there is a difference, then the
-         * method is wrong and a warning will be issued during execution.
-         */
-        ThisParam = Params;
-        for (i = 0; i < ArgCount; i++)
-        {
-            ArgType = METHOD_GET_NEXT_TYPE (ArgTypeList);
-            ThisParam->Type = ArgType;
-
-            switch (ArgType)
-            {
-            case ACPI_TYPE_INTEGER:
-
-                ThisParam->Integer.Value = 1;
-                break;
-
-            case ACPI_TYPE_STRING:
-
-                ThisParam->String.Pointer = "This is the default argument string";
-                ThisParam->String.Length = ACPI_STRLEN (ThisParam->String.Pointer);
-                break;
-
-            case ACPI_TYPE_BUFFER:
-
-                ThisParam->Buffer.Pointer = (UINT8 *) Params; /* just a garbage buffer */
-                ThisParam->Buffer.Length = 48;
-                break;
-
-             case ACPI_TYPE_PACKAGE:
-
-                ThisParam->Package.Elements = NULL;
-                ThisParam->Package.Count = 0;
-                break;
-
-           default:
-
-                AcpiOsPrintf ("%s: Unsupported argument type: %u\n",
-                    Pathname, ArgType);
-                break;
-            }
-
-            ThisParam++;
-        }
-
-        ParamObjects.Count = ArgCount;
-        ParamObjects.Pointer = Params;
-    }
-
-    ACPI_FREE (ObjInfo);
-    ReturnObj.Pointer = NULL;
-    ReturnObj.Length = ACPI_ALLOCATE_BUFFER;
-
-    /* Do the actual method execution */
-
-    AcpiGbl_MethodExecuting = TRUE;
-
-    Status = AcpiEvaluateObject (Node, NULL, &ParamObjects, &ReturnObj);
-
-    AcpiOsPrintf ("%-32s returned %s\n", Pathname, AcpiFormatException (Status));
-    AcpiGbl_MethodExecuting = FALSE;
-    ACPI_FREE (Pathname);
-
-    /* Ignore status from method execution */
-
-    Status = AE_OK;
-
-    /* Update count, check if we have executed enough methods */
-
-    Info->Count++;
-    if (Info->Count >= Info->MaxCount)
-    {
-        Status = AE_CTRL_TERMINATE;
-    }
-
-    return (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiDbBatchExecute
- *
- * PARAMETERS:  CountArg            - Max number of methods to execute
- *
- * RETURN:      None
- *
- * DESCRIPTION: Namespace batch execution. Execute predefined names in the
- *              namespace, up to the max count, if specified.
- *
- ******************************************************************************/
-
-void
-AcpiDbBatchExecute (
-    char                    *CountArg)
-{
-    ACPI_DB_EXECUTE_WALK    Info;
-
-
-    Info.Count = 0;
-    Info.MaxCount = ACPI_UINT32_MAX;
-
-    if (CountArg)
-    {
-        Info.MaxCount = ACPI_STRTOUL (CountArg, NULL, 0);
-    }
-
-
-    /* Search all nodes in namespace */
-
-    (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                AcpiDbWalkForExecute, NULL, (void *) &Info, NULL);
-
-    AcpiOsPrintf ("Evaluated %u predefined names in the namespace\n", Info.Count);
-}
-
 #endif /* ACPI_DEBUGGER */
diff --git a/sys/contrib/dev/acpica/components/debugger/dbnames.c b/sys/contrib/dev/acpica/components/debugger/dbnames.c
index 5ac39fd4546a..4345f3a153cf 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbnames.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
@@ -171,8 +170,7 @@ AcpiDbSetScope (
             goto ErrorExit;
         }
 
-        ACPI_STRCPY (AcpiGbl_DbScopeBuf, Name);
-        ACPI_STRCAT (AcpiGbl_DbScopeBuf, "\\");
+        AcpiGbl_DbScopeBuf[0] = 0;
     }
     else
     {
@@ -184,9 +182,22 @@ AcpiDbSetScope (
         {
             goto ErrorExit;
         }
+    }
 
-        ACPI_STRCAT (AcpiGbl_DbScopeBuf, Name);
-        ACPI_STRCAT (AcpiGbl_DbScopeBuf, "\\");
+    /* Build the final pathname */
+
+    if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf),
+        Name))
+    {
+        Status = AE_BUFFER_OVERFLOW;
+        goto ErrorExit;
+    }
+
+    if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf),
+        "\\"))
+    {
+        Status = AE_BUFFER_OVERFLOW;
+        goto ErrorExit;
     }
 
     AcpiGbl_DbScopeNode = Node;
diff --git a/sys/contrib/dev/acpica/components/debugger/dbstats.c b/sys/contrib/dev/acpica/components/debugger/dbstats.c
index ef236346ed10..9430854200d2 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbstats.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbstats.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
@@ -401,7 +400,7 @@ AcpiDbDisplayStatistics (
 
     AcpiUtStrupr (TypeArg);
     Temp = AcpiDbMatchArgument (TypeArg, AcpiDbStatTypes);
-    if (Temp == (UINT32) -1)
+    if (Temp == ACPI_TYPE_NOT_FOUND)
     {
         AcpiOsPrintf ("Invalid or unsupported argument\n");
         return (AE_OK);
diff --git a/sys/contrib/dev/acpica/components/debugger/dbtest.c b/sys/contrib/dev/acpica/components/debugger/dbtest.c
new file mode 100644
index 000000000000..fe7a33f76aaa
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/debugger/dbtest.c
@@ -0,0 +1,1138 @@
+/*******************************************************************************
+ *
+ * Module Name: dbtest - Various debug-related tests
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acdebug.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
+#include <contrib/dev/acpica/include/acpredef.h>
+
+#ifdef ACPI_DEBUGGER
+
+#define _COMPONENT          ACPI_CA_DEBUGGER
+        ACPI_MODULE_NAME    ("dbtest")
+
+
+/* Local prototypes */
+
+static void
+AcpiDbTestAllObjects (
+    void);
+
+static ACPI_STATUS
+AcpiDbTestOneObject (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue);
+
+static ACPI_STATUS
+AcpiDbTestIntegerType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  BitLength);
+
+static ACPI_STATUS
+AcpiDbTestBufferType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  BitLength);
+
+static ACPI_STATUS
+AcpiDbTestStringType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  ByteLength);
+
+static ACPI_STATUS
+AcpiDbReadFromObject (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OBJECT_TYPE        ExpectedType,
+    ACPI_OBJECT             **Value);
+
+static ACPI_STATUS
+AcpiDbWriteToObject (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OBJECT             *Value);
+
+static void
+AcpiDbEvaluateAllPredefinedNames (
+    char                    *CountArg);
+
+static ACPI_STATUS
+AcpiDbEvaluateOnePredefinedName (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue);
+
+/*
+ * Test subcommands
+ */
+static ACPI_DB_ARGUMENT_INFO    AcpiDbTestTypes [] =
+{
+    {"OBJECTS"},
+    {"PREDEFINED"},
+    {NULL}           /* Must be null terminated */
+};
+
+#define CMD_TEST_OBJECTS        0
+#define CMD_TEST_PREDEFINED     1
+
+#define BUFFER_FILL_VALUE       0xFF
+
+/*
+ * Support for the special debugger read/write control methods.
+ * These methods are installed into the current namespace and are
+ * used to read and write the various namespace objects. The point
+ * is to force the AML interpreter do all of the work.
+ */
+#define                     ACPI_DB_READ_METHOD     "\\_T98"
+#define                     ACPI_DB_WRITE_METHOD    "\\_T99"
+
+static ACPI_HANDLE          ReadHandle = NULL;
+static ACPI_HANDLE          WriteHandle = NULL;
+
+/* ASL Definitions of the debugger read/write control methods */
+
+#if 0
+DefinitionBlock ("ssdt.aml", "SSDT", 2, "Intel", "DEBUG", 0x00000001)
+{
+    Method (_T98, 1, NotSerialized)     /* Read */
+    {
+        Return (DeRefOf (Arg0))
+    }
+}
+DefinitionBlock ("ssdt2.aml", "SSDT", 2, "Intel", "DEBUG", 0x00000001)
+{
+    Method (_T99, 2, NotSerialized)     /* Write */
+    {
+        Store (Arg1, Arg0)
+    }
+}
+#endif
+
+static unsigned char ReadMethodCode[] =
+{
+    0x53,0x53,0x44,0x54,0x2E,0x00,0x00,0x00,  /* 00000000    "SSDT...." */
+    0x02,0xC9,0x49,0x6E,0x74,0x65,0x6C,0x00,  /* 00000008    "..Intel." */
+    0x44,0x45,0x42,0x55,0x47,0x00,0x00,0x00,  /* 00000010    "DEBUG..." */
+    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
+    0x18,0x12,0x13,0x20,0x14,0x09,0x5F,0x54,  /* 00000020    "... .._T" */
+    0x39,0x38,0x01,0xA4,0x83,0x68             /* 00000028    "98...h"   */
+};
+
+static unsigned char WriteMethodCode[] =
+{
+    0x53,0x53,0x44,0x54,0x2E,0x00,0x00,0x00,  /* 00000000    "SSDT...." */
+    0x02,0x15,0x49,0x6E,0x74,0x65,0x6C,0x00,  /* 00000008    "..Intel." */
+    0x44,0x45,0x42,0x55,0x47,0x00,0x00,0x00,  /* 00000010    "DEBUG..." */
+    0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C,  /* 00000018    "....INTL" */
+    0x18,0x12,0x13,0x20,0x14,0x09,0x5F,0x54,  /* 00000020    "... .._T" */
+    0x39,0x39,0x02,0x70,0x69,0x68             /* 00000028    "99.pih"   */
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbExecuteTest
+ *
+ * PARAMETERS:  TypeArg         - Subcommand
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Execute various debug tests.
+ *
+ * Note: Code is prepared for future expansion of the TEST command.
+ *
+ ******************************************************************************/
+
+void
+AcpiDbExecuteTest (
+    char                    *TypeArg)
+{
+    UINT32                  Temp;
+
+
+    AcpiUtStrupr (TypeArg);
+    Temp = AcpiDbMatchArgument (TypeArg, AcpiDbTestTypes);
+    if (Temp == ACPI_TYPE_NOT_FOUND)
+    {
+        AcpiOsPrintf ("Invalid or unsupported argument\n");
+        return;
+    }
+
+    switch (Temp)
+    {
+    case CMD_TEST_OBJECTS:
+
+        AcpiDbTestAllObjects ();
+        break;
+
+    case CMD_TEST_PREDEFINED:
+
+        AcpiDbEvaluateAllPredefinedNames (NULL);
+        break;
+
+    default:
+        break;
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbTestAllObjects
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: This test implements the OBJECTS subcommand. It exercises the
+ *              namespace by reading/writing/comparing all data objects such
+ *              as integers, strings, buffers, fields, buffer fields, etc.
+ *
+ ******************************************************************************/
+
+static void
+AcpiDbTestAllObjects (
+    void)
+{
+    ACPI_STATUS             Status;
+
+
+    /* Install the debugger read-object control method if necessary */
+
+    if (!ReadHandle)
+    {
+        Status = AcpiInstallMethod (ReadMethodCode);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiOsPrintf ("%s, Could not install debugger read method\n",
+                AcpiFormatException (Status));
+            return;
+        }
+
+        Status = AcpiGetHandle (NULL, ACPI_DB_READ_METHOD, &ReadHandle);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiOsPrintf ("Could not obtain handle for debug method %s\n",
+                ACPI_DB_READ_METHOD);
+            return;
+        }
+    }
+
+    /* Install the debugger write-object control method if necessary */
+
+    if (!WriteHandle)
+    {
+        Status = AcpiInstallMethod (WriteMethodCode);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiOsPrintf ("%s, Could not install debugger write method\n",
+                AcpiFormatException (Status));
+            return;
+        }
+
+        Status = AcpiGetHandle (NULL, ACPI_DB_WRITE_METHOD, &WriteHandle);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiOsPrintf ("Could not obtain handle for debug method %s\n",
+                ACPI_DB_WRITE_METHOD);
+            return;
+        }
+    }
+
+    /* Walk the entire namespace, testing each supported named data object */
+
+    (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
+                ACPI_UINT32_MAX, AcpiDbTestOneObject, NULL, NULL, NULL);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbTestOneObject
+ *
+ * PARAMETERS:  ACPI_WALK_CALLBACK
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Test one namespace object. Supported types are Integer,
+ *              String, Buffer, BufferField, and FieldUnit. All other object
+ *              types are simply ignored.
+ *
+ *              Note: Support for Packages is not implemented.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbTestOneObject (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue)
+{
+    ACPI_NAMESPACE_NODE     *Node;
+    ACPI_OPERAND_OBJECT     *ObjDesc;
+    ACPI_OPERAND_OBJECT     *RegionObj;
+    ACPI_OBJECT_TYPE        LocalType;
+    UINT32                  BitLength = 0;
+    UINT32                  ByteLength = 0;
+    ACPI_STATUS             Status = AE_OK;
+
+
+    Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
+    ObjDesc = Node->Object;
+
+    /*
+     * For the supported types, get the actual bit length or
+     * byte length. Map the type to one of Integer/String/Buffer.
+     */
+    switch (Node->Type)
+    {
+    case ACPI_TYPE_INTEGER:
+
+        /* Integer width is either 32 or 64 */
+
+        LocalType = ACPI_TYPE_INTEGER;
+        BitLength = AcpiGbl_IntegerBitWidth;
+        break;
+
+    case ACPI_TYPE_STRING:
+
+        LocalType = ACPI_TYPE_STRING;
+        ByteLength = ObjDesc->String.Length;
+        break;
+
+    case ACPI_TYPE_BUFFER:
+
+        LocalType = ACPI_TYPE_BUFFER;
+        ByteLength = ObjDesc->Buffer.Length;
+        BitLength = ByteLength * 8;
+        break;
+
+    case ACPI_TYPE_FIELD_UNIT:
+    case ACPI_TYPE_BUFFER_FIELD:
+    case ACPI_TYPE_LOCAL_REGION_FIELD:
+    case ACPI_TYPE_LOCAL_INDEX_FIELD:
+    case ACPI_TYPE_LOCAL_BANK_FIELD:
+
+        LocalType = ACPI_TYPE_INTEGER;
+        if (ObjDesc)
+        {
+            /*
+             * Returned object will be a Buffer if the field length
+             * is larger than the size of an Integer (32 or 64 bits
+             * depending on the DSDT version).
+             */
+            BitLength = ObjDesc->CommonField.BitLength;
+            ByteLength = ACPI_ROUND_BITS_UP_TO_BYTES (BitLength);
+            if (BitLength > AcpiGbl_IntegerBitWidth)
+            {
+                LocalType = ACPI_TYPE_BUFFER;
+            }
+        }
+        break;
+
+    default:
+
+        /* Ignore all other types */
+
+        return (AE_OK);
+    }
+
+    /* Emit the common prefix: Type:Name */
+
+    AcpiOsPrintf ("%14s: %4.4s",
+        AcpiUtGetTypeName (Node->Type), Node->Name.Ascii);
+    if (!ObjDesc)
+    {
+        AcpiOsPrintf (" Ignoring, no attached object\n");
+        return (AE_OK);
+    }
+
+    /*
+     * Check for unsupported region types. Note: AcpiExec simulates
+     * access to SystemMemory, SystemIO, PCI_Config, and EC.
+     */
+    switch (Node->Type)
+    {
+    case ACPI_TYPE_LOCAL_REGION_FIELD:
+
+        RegionObj = ObjDesc->Field.RegionObj;
+        switch (RegionObj->Region.SpaceId)
+        {
+        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+        case ACPI_ADR_SPACE_PCI_CONFIG:
+        case ACPI_ADR_SPACE_EC:
+
+            break;
+
+        default:
+
+            AcpiOsPrintf ("      %s space is not supported [%4.4s]\n",
+                AcpiUtGetRegionName (RegionObj->Region.SpaceId),
+                RegionObj->Region.Node->Name.Ascii);
+            return (AE_OK);
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    /* At this point, we have resolved the object to one of the major types */
+
+    switch (LocalType)
+    {
+    case ACPI_TYPE_INTEGER:
+
+        Status = AcpiDbTestIntegerType (Node, BitLength);
+        break;
+
+    case ACPI_TYPE_STRING:
+
+        Status = AcpiDbTestStringType (Node, ByteLength);
+        break;
+
+    case ACPI_TYPE_BUFFER:
+
+        Status = AcpiDbTestBufferType (Node, BitLength);
+        break;
+
+    default:
+
+        AcpiOsPrintf (" Ignoring, type not implemented (%2.2X)",
+            LocalType);
+        break;
+    }
+
+    switch (Node->Type)
+    {
+    case ACPI_TYPE_LOCAL_REGION_FIELD:
+
+        RegionObj = ObjDesc->Field.RegionObj;
+        AcpiOsPrintf (" (%s)",
+            AcpiUtGetRegionName (RegionObj->Region.SpaceId));
+        break;
+
+    default:
+        break;
+    }
+
+    AcpiOsPrintf ("\n");
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbTestIntegerType
+ *
+ * PARAMETERS:  Node                - Parent NS node for the object
+ *              BitLength           - Actual length of the object. Used for
+ *                                    support of arbitrary length FieldUnit
+ *                                    and BufferField objects.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Test read/write for an Integer-valued object. Performs a
+ *              write/read/compare of an arbitrary new value, then performs
+ *              a write/read/compare of the original value.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbTestIntegerType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  BitLength)
+{
+    ACPI_OBJECT             *Temp1 = NULL;
+    ACPI_OBJECT             *Temp2 = NULL;
+    ACPI_OBJECT             *Temp3 = NULL;
+    ACPI_OBJECT             WriteValue;
+    UINT64                  ValueToWrite;
+    ACPI_STATUS             Status;
+
+
+    if (BitLength > 64)
+    {
+        AcpiOsPrintf (" Invalid length for an Integer: %u", BitLength);
+        return (AE_OK);
+    }
+
+    /* Read the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_INTEGER, &Temp1);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    AcpiOsPrintf (" (%4.4X/%3.3X) %8.8X%8.8X",
+        BitLength, ACPI_ROUND_BITS_UP_TO_BYTES (BitLength),
+        ACPI_FORMAT_UINT64 (Temp1->Integer.Value));
+
+    ValueToWrite = ACPI_UINT64_MAX >> (64 - BitLength);
+    if (Temp1->Integer.Value == ValueToWrite)
+    {
+        ValueToWrite = 0;
+    }
+
+    /* Write a new value */
+
+    WriteValue.Type = ACPI_TYPE_INTEGER;
+    WriteValue.Integer.Value = ValueToWrite;
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the new value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_INTEGER, &Temp2);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (Temp2->Integer.Value != ValueToWrite)
+    {
+        AcpiOsPrintf (" MISMATCH 2: %8.8X%8.8X, expecting %8.8X%8.8X",
+            ACPI_FORMAT_UINT64 (Temp2->Integer.Value),
+            ACPI_FORMAT_UINT64 (ValueToWrite));
+    }
+
+    /* Write back the original value */
+
+    WriteValue.Integer.Value = Temp1->Integer.Value;
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_INTEGER, &Temp3);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (Temp3->Integer.Value != Temp1->Integer.Value)
+    {
+        AcpiOsPrintf (" MISMATCH 3: %8.8X%8.8X, expecting %8.8X%8.8X",
+            ACPI_FORMAT_UINT64 (Temp3->Integer.Value),
+            ACPI_FORMAT_UINT64 (Temp1->Integer.Value));
+    }
+
+Exit:
+    if (Temp1) {AcpiOsFree (Temp1);}
+    if (Temp2) {AcpiOsFree (Temp2);}
+    if (Temp3) {AcpiOsFree (Temp3);}
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbTestBufferType
+ *
+ * PARAMETERS:  Node                - Parent NS node for the object
+ *              BitLength           - Actual length of the object.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Test read/write for an Buffer-valued object. Performs a
+ *              write/read/compare of an arbitrary new value, then performs
+ *              a write/read/compare of the original value.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbTestBufferType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  BitLength)
+{
+    ACPI_OBJECT             *Temp1 = NULL;
+    ACPI_OBJECT             *Temp2 = NULL;
+    ACPI_OBJECT             *Temp3 = NULL;
+    UINT8                   *Buffer;
+    ACPI_OBJECT             WriteValue;
+    ACPI_STATUS             Status;
+    UINT32                  ByteLength;
+    UINT32                  i;
+    UINT8                   ExtraBits;
+
+
+    ByteLength = ACPI_ROUND_BITS_UP_TO_BYTES (BitLength);
+    if (ByteLength == 0)
+    {
+        AcpiOsPrintf (" Ignoring zero length buffer");
+        return (AE_OK);
+    }
+
+    /* Allocate a local buffer */
+
+    Buffer = ACPI_ALLOCATE_ZEROED (ByteLength);
+    if (!Buffer)
+    {
+        return (AE_NO_MEMORY);
+    }
+
+    /* Read the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_BUFFER, &Temp1);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Emit a few bytes of the buffer */
+
+    AcpiOsPrintf (" (%4.4X/%3.3X)", BitLength, Temp1->Buffer.Length);
+    for (i = 0; ((i < 4) && (i < ByteLength)); i++)
+    {
+        AcpiOsPrintf (" %2.2X", Temp1->Buffer.Pointer[i]);
+    }
+    AcpiOsPrintf ("...  ");
+
+    /*
+     * Write a new value.
+     *
+     * Handle possible extra bits at the end of the buffer. Can
+     * happen for FieldUnits larger than an integer, but the bit
+     * count is not an integral number of bytes. Zero out the
+     * unused bits.
+     */
+    ACPI_MEMSET (Buffer, BUFFER_FILL_VALUE, ByteLength);
+    ExtraBits = BitLength % 8;
+    if (ExtraBits)
+    {
+        Buffer [ByteLength - 1] = ACPI_MASK_BITS_ABOVE (ExtraBits);
+    }
+
+    WriteValue.Type = ACPI_TYPE_BUFFER;
+    WriteValue.Buffer.Length = ByteLength;
+    WriteValue.Buffer.Pointer = Buffer;
+
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the new value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_BUFFER, &Temp2);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (ACPI_MEMCMP (Temp2->Buffer.Pointer, Buffer, ByteLength))
+    {
+        AcpiOsPrintf (" MISMATCH 2: New buffer value");
+    }
+
+    /* Write back the original value */
+
+    WriteValue.Buffer.Length = ByteLength;
+    WriteValue.Buffer.Pointer = Temp1->Buffer.Pointer;
+
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_BUFFER, &Temp3);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (ACPI_MEMCMP (Temp1->Buffer.Pointer, Temp3->Buffer.Pointer, ByteLength))
+    {
+        AcpiOsPrintf (" MISMATCH 3: While restoring original buffer");
+    }
+
+Exit:
+    ACPI_FREE (Buffer);
+    if (Temp1) {AcpiOsFree (Temp1);}
+    if (Temp2) {AcpiOsFree (Temp2);}
+    if (Temp3) {AcpiOsFree (Temp3);}
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbTestStringType
+ *
+ * PARAMETERS:  Node                - Parent NS node for the object
+ *              ByteLength          - Actual length of the object.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Test read/write for an String-valued object. Performs a
+ *              write/read/compare of an arbitrary new value, then performs
+ *              a write/read/compare of the original value.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbTestStringType (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT32                  ByteLength)
+{
+    ACPI_OBJECT             *Temp1 = NULL;
+    ACPI_OBJECT             *Temp2 = NULL;
+    ACPI_OBJECT             *Temp3 = NULL;
+    char                    *ValueToWrite = "Test String from AML Debugger";
+    ACPI_OBJECT             WriteValue;
+    ACPI_STATUS             Status;
+
+
+    /* Read the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_STRING, &Temp1);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
+    AcpiOsPrintf (" (%4.4X/%3.3X) \"%s\"", (Temp1->String.Length * 8),
+        Temp1->String.Length, Temp1->String.Pointer);
+
+    /* Write a new value */
+
+    WriteValue.Type = ACPI_TYPE_STRING;
+    WriteValue.String.Length = ACPI_STRLEN (ValueToWrite);
+    WriteValue.String.Pointer = ValueToWrite;
+
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the new value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_STRING, &Temp2);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (ACPI_STRCMP (Temp2->String.Pointer, ValueToWrite))
+    {
+        AcpiOsPrintf (" MISMATCH 2: %s, expecting %s",
+            Temp2->String.Pointer, ValueToWrite);
+    }
+
+    /* Write back the original value */
+
+    WriteValue.String.Length = ACPI_STRLEN (Temp1->String.Pointer);
+    WriteValue.String.Pointer = Temp1->String.Pointer;
+
+    Status = AcpiDbWriteToObject (Node, &WriteValue);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    /* Ensure that we can read back the original value */
+
+    Status = AcpiDbReadFromObject (Node, ACPI_TYPE_STRING, &Temp3);
+    if (ACPI_FAILURE (Status))
+    {
+        goto Exit;
+    }
+
+    if (ACPI_STRCMP (Temp1->String.Pointer, Temp3->String.Pointer))
+    {
+        AcpiOsPrintf (" MISMATCH 3: %s, expecting %s",
+            Temp3->String.Pointer, Temp1->String.Pointer);
+    }
+
+Exit:
+    if (Temp1) {AcpiOsFree (Temp1);}
+    if (Temp2) {AcpiOsFree (Temp2);}
+    if (Temp3) {AcpiOsFree (Temp3);}
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbReadFromObject
+ *
+ * PARAMETERS:  Node                - Parent NS node for the object
+ *              ExpectedType        - Object type expected from the read
+ *              Value               - Where the value read is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Performs a read from the specified object by invoking the
+ *              special debugger control method that reads the object. Thus,
+ *              the AML interpreter is doing all of the work, increasing the
+ *              validity of the test.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbReadFromObject (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OBJECT_TYPE        ExpectedType,
+    ACPI_OBJECT             **Value)
+{
+    ACPI_OBJECT             *RetValue;
+    ACPI_OBJECT_LIST        ParamObjects;
+    ACPI_OBJECT             Params[2];
+    ACPI_BUFFER             ReturnObj;
+    ACPI_STATUS             Status;
+
+
+    Params[0].Type = ACPI_TYPE_LOCAL_REFERENCE;
+    Params[0].Reference.ActualType = Node->Type;
+    Params[0].Reference.Handle = ACPI_CAST_PTR (ACPI_HANDLE, Node);
+
+    ParamObjects.Count = 1;
+    ParamObjects.Pointer = Params;
+
+    ReturnObj.Length  = ACPI_ALLOCATE_BUFFER;
+
+    AcpiGbl_MethodExecuting = TRUE;
+    Status = AcpiEvaluateObject (ReadHandle, NULL, &ParamObjects, &ReturnObj);
+    AcpiGbl_MethodExecuting = FALSE;
+
+    if (ACPI_FAILURE (Status))
+    {
+        AcpiOsPrintf ("Could not read from object, %s",
+            AcpiFormatException (Status));
+        return (Status);
+    }
+
+    RetValue = (ACPI_OBJECT *) ReturnObj.Pointer;
+
+    switch (RetValue->Type)
+    {
+    case ACPI_TYPE_INTEGER:
+    case ACPI_TYPE_BUFFER:
+    case ACPI_TYPE_STRING:
+        /*
+         * Did we receive the type we wanted? Most important for the
+         * Integer/Buffer case (when a field is larger than an Integer,
+         * it should return a Buffer).
+         */
+        if (RetValue->Type != ExpectedType)
+        {
+            AcpiOsPrintf (" Type mismatch:  Expected %s, Received %s",
+                AcpiUtGetTypeName (ExpectedType),
+                AcpiUtGetTypeName (RetValue->Type));
+
+            return (AE_TYPE);
+        }
+
+        *Value = RetValue;
+        break;
+
+    default:
+
+        AcpiOsPrintf (" Unsupported return object type, %s",
+            AcpiUtGetTypeName (RetValue->Type));
+        AcpiOsFree (ReturnObj.Pointer);
+
+        return (AE_TYPE);
+    }
+
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbWriteToObject
+ *
+ * PARAMETERS:  Node                - Parent NS node for the object
+ *              Value               - Value to be written
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Performs a write to the specified object by invoking the
+ *              special debugger control method that writes the object. Thus,
+ *              the AML interpreter is doing all of the work, increasing the
+ *              validity of the test.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbWriteToObject (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OBJECT             *Value)
+{
+    ACPI_OBJECT_LIST        ParamObjects;
+    ACPI_OBJECT             Params[2];
+    ACPI_STATUS             Status;
+
+
+    Params[0].Type = ACPI_TYPE_LOCAL_REFERENCE;
+    Params[0].Reference.ActualType = Node->Type;
+    Params[0].Reference.Handle = ACPI_CAST_PTR (ACPI_HANDLE, Node);
+
+    /* Copy the incoming user parameter */
+
+    ACPI_MEMCPY (&Params[1], Value, sizeof (ACPI_OBJECT));
+
+    ParamObjects.Count = 2;
+    ParamObjects.Pointer = Params;
+
+    AcpiGbl_MethodExecuting = TRUE;
+    Status = AcpiEvaluateObject (WriteHandle, NULL, &ParamObjects, NULL);
+    AcpiGbl_MethodExecuting = FALSE;
+
+    if (ACPI_FAILURE (Status))
+    {
+        AcpiOsPrintf ("Could not write to object, %s",
+            AcpiFormatException (Status));
+    }
+
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbEvaluateAllPredefinedNames
+ *
+ * PARAMETERS:  CountArg            - Max number of methods to execute
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Namespace batch execution. Execute predefined names in the
+ *              namespace, up to the max count, if specified.
+ *
+ ******************************************************************************/
+
+static void
+AcpiDbEvaluateAllPredefinedNames (
+    char                    *CountArg)
+{
+    ACPI_DB_EXECUTE_WALK    Info;
+
+
+    Info.Count = 0;
+    Info.MaxCount = ACPI_UINT32_MAX;
+
+    if (CountArg)
+    {
+        Info.MaxCount = ACPI_STRTOUL (CountArg, NULL, 0);
+    }
+
+    /* Search all nodes in namespace */
+
+    (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
+                AcpiDbEvaluateOnePredefinedName, NULL, (void *) &Info, NULL);
+
+    AcpiOsPrintf ("Evaluated %u predefined names in the namespace\n", Info.Count);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDbEvaluateOnePredefinedName
+ *
+ * PARAMETERS:  Callback from WalkNamespace
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Batch execution module. Currently only executes predefined
+ *              ACPI names.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDbEvaluateOnePredefinedName (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue)
+{
+    ACPI_NAMESPACE_NODE         *Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
+    ACPI_DB_EXECUTE_WALK        *Info = (ACPI_DB_EXECUTE_WALK *) Context;
+    char                        *Pathname;
+    const ACPI_PREDEFINED_INFO  *Predefined;
+    ACPI_DEVICE_INFO            *ObjInfo;
+    ACPI_OBJECT_LIST            ParamObjects;
+    ACPI_OBJECT                 Params[ACPI_METHOD_NUM_ARGS];
+    ACPI_OBJECT                 *ThisParam;
+    ACPI_BUFFER                 ReturnObj;
+    ACPI_STATUS                 Status;
+    UINT16                      ArgTypeList;
+    UINT8                       ArgCount;
+    UINT8                       ArgType;
+    UINT32                      i;
+
+
+    /* The name must be a predefined ACPI name */
+
+    Predefined = AcpiUtMatchPredefinedMethod (Node->Name.Ascii);
+    if (!Predefined)
+    {
+        return (AE_OK);
+    }
+
+    if (Node->Type == ACPI_TYPE_LOCAL_SCOPE)
+    {
+        return (AE_OK);
+    }
+
+    Pathname = AcpiNsGetExternalPathname (Node);
+    if (!Pathname)
+    {
+        return (AE_OK);
+    }
+
+    /* Get the object info for number of method parameters */
+
+    Status = AcpiGetObjectInfo (ObjHandle, &ObjInfo);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_FREE (Pathname);
+        return (Status);
+    }
+
+    ParamObjects.Count = 0;
+    ParamObjects.Pointer = NULL;
+
+    if (ObjInfo->Type == ACPI_TYPE_METHOD)
+    {
+        /* Setup default parameters (with proper types) */
+
+        ArgTypeList = Predefined->Info.ArgumentList;
+        ArgCount = METHOD_GET_ARG_COUNT (ArgTypeList);
+
+        /*
+         * Setup the ACPI-required number of arguments, regardless of what
+         * the actual method defines. If there is a difference, then the
+         * method is wrong and a warning will be issued during execution.
+         */
+        ThisParam = Params;
+        for (i = 0; i < ArgCount; i++)
+        {
+            ArgType = METHOD_GET_NEXT_TYPE (ArgTypeList);
+            ThisParam->Type = ArgType;
+
+            switch (ArgType)
+            {
+            case ACPI_TYPE_INTEGER:
+
+                ThisParam->Integer.Value = 1;
+                break;
+
+            case ACPI_TYPE_STRING:
+
+                ThisParam->String.Pointer = "This is the default argument string";
+                ThisParam->String.Length = ACPI_STRLEN (ThisParam->String.Pointer);
+                break;
+
+            case ACPI_TYPE_BUFFER:
+
+                ThisParam->Buffer.Pointer = (UINT8 *) Params; /* just a garbage buffer */
+                ThisParam->Buffer.Length = 48;
+                break;
+
+             case ACPI_TYPE_PACKAGE:
+
+                ThisParam->Package.Elements = NULL;
+                ThisParam->Package.Count = 0;
+                break;
+
+           default:
+
+                AcpiOsPrintf ("%s: Unsupported argument type: %u\n",
+                    Pathname, ArgType);
+                break;
+            }
+
+            ThisParam++;
+        }
+
+        ParamObjects.Count = ArgCount;
+        ParamObjects.Pointer = Params;
+    }
+
+    ACPI_FREE (ObjInfo);
+    ReturnObj.Pointer = NULL;
+    ReturnObj.Length = ACPI_ALLOCATE_BUFFER;
+
+    /* Do the actual method execution */
+
+    AcpiGbl_MethodExecuting = TRUE;
+
+    Status = AcpiEvaluateObject (Node, NULL, &ParamObjects, &ReturnObj);
+
+    AcpiOsPrintf ("%-32s returned %s\n", Pathname, AcpiFormatException (Status));
+    AcpiGbl_MethodExecuting = FALSE;
+    ACPI_FREE (Pathname);
+
+    /* Ignore status from method execution */
+
+    Status = AE_OK;
+
+    /* Update count, check if we have executed enough methods */
+
+    Info->Count++;
+    if (Info->Count >= Info->MaxCount)
+    {
+        Status = AE_CTRL_TERMINATE;
+    }
+
+    return (Status);
+}
+
+#endif /* ACPI_DEBUGGER */
diff --git a/sys/contrib/dev/acpica/components/debugger/dbutils.c b/sys/contrib/dev/acpica/components/debugger/dbutils.c
index 43036fd02bfb..f321608cea64 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbutils.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
diff --git a/sys/contrib/dev/acpica/components/debugger/dbxface.c b/sys/contrib/dev/acpica/components/debugger/dbxface.c
index c154c450c323..b58ef4ecb6d8 100644
--- a/sys/contrib/dev/acpica/components/debugger/dbxface.c
+++ b/sys/contrib/dev/acpica/components/debugger/dbxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -513,6 +512,10 @@ AcpiDbTerminate (
         AcpiOsFree (AcpiGbl_DbBuffer);
         AcpiGbl_DbBuffer = NULL;
     }
+
+    /* Ensure that debug output is now disabled */
+
+    AcpiGbl_DbOutputFlags = ACPI_DB_DISABLE_OUTPUT;
 }
 
 
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c b/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
index 32a7ddf21b9f..9e479fb8ad72 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,12 +41,13 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acutils.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
 #include <contrib/dev/acpica/include/acparser.h>
 #include <contrib/dev/acpica/include/amlcode.h>
+#include <contrib/dev/acpica/include/acinterp.h>
 
 
 #ifdef ACPI_DISASSEMBLER
@@ -56,12 +57,16 @@
 
 /* Local prototypes */
 
+static void
+AcpiDmUuid (
+    ACPI_PARSE_OBJECT       *Op);
+
 static void
 AcpiDmUnicode (
     ACPI_PARSE_OBJECT       *Op);
 
 static void
-AcpiDmIsEisaIdElement (
+AcpiDmGetHardwareIdType (
     ACPI_PARSE_OBJECT       *Op);
 
 static void
@@ -71,6 +76,9 @@ AcpiDmPldBuffer (
     UINT32                  ByteCount);
 
 
+#define ACPI_BUFFER_BYTES_PER_LINE      8
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmDisasmByteList
@@ -93,6 +101,9 @@ AcpiDmDisasmByteList (
     UINT32                  ByteCount)
 {
     UINT32                  i;
+    UINT32                  j;
+    UINT32                  CurrentIndex;
+    UINT8                   BufChar;
 
 
     if (!ByteCount)
@@ -100,39 +111,68 @@ AcpiDmDisasmByteList (
         return;
     }
 
-    /* Dump the byte list */
-
-    for (i = 0; i < ByteCount; i++)
+    for (i = 0; i < ByteCount; i += ACPI_BUFFER_BYTES_PER_LINE)
     {
-        /* New line every 8 bytes */
+        /* Line indent and offset prefix for each new line */
 
-        if (((i % 8) == 0) && (i < ByteCount))
+        AcpiDmIndent (Level);
+        if (ByteCount > ACPI_BUFFER_BYTES_PER_LINE)
         {
-            if (i > 0)
+            AcpiOsPrintf ("/* %04X */ ", i);
+        }
+
+        /* Dump the actual hex values */
+
+        for (j = 0; j < ACPI_BUFFER_BYTES_PER_LINE; j++)
+        {
+            CurrentIndex = i + j;
+            if (CurrentIndex >= ByteCount)
             {
-                AcpiOsPrintf ("\n");
+                /* Dump fill spaces */
+
+                AcpiOsPrintf ("      ");
+                continue;
             }
 
-            AcpiDmIndent (Level);
-            if (ByteCount > 8)
+            AcpiOsPrintf (" 0x%2.2X", ByteData[CurrentIndex]);
+
+            /* Add comma if there are more bytes to display */
+
+            if (CurrentIndex < (ByteCount - 1))
             {
-                AcpiOsPrintf ("/* %04X */  ", i);
+                AcpiOsPrintf (",");
+            }
+            else
+            {
+                AcpiOsPrintf (" ");
             }
         }
 
-        AcpiOsPrintf (" 0x%2.2X", (UINT32) ByteData[i]);
+        /* Dump the ASCII equivalents within a comment */
 
-        /* Add comma if there are more bytes to display */
-
-        if (i < (ByteCount -1))
+        AcpiOsPrintf ("  /* ");
+        for (j = 0; j < ACPI_BUFFER_BYTES_PER_LINE; j++)
         {
-            AcpiOsPrintf (",");
-        }
-    }
+            CurrentIndex = i + j;
+            if (CurrentIndex >= ByteCount)
+            {
+                break;
+            }
 
-    if (Level)
-    {
-        AcpiOsPrintf ("\n");
+            BufChar = ByteData[CurrentIndex];
+            if (ACPI_IS_PRINT (BufChar))
+            {
+                AcpiOsPrintf ("%c", BufChar);
+            }
+            else
+            {
+                AcpiOsPrintf (".");
+            }
+        }
+
+        /* Finished with this line */
+
+        AcpiOsPrintf (" */\n");
     }
 }
 
@@ -181,6 +221,11 @@ AcpiDmByteList (
         AcpiOsPrintf ("\n");
         break;
 
+    case ACPI_DASM_UUID:
+
+        AcpiDmUuid (Op);
+        break;
+
     case ACPI_DASM_UNICODE:
 
         AcpiDmUnicode (Op);
@@ -204,6 +249,137 @@ AcpiDmByteList (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmIsUuidBuffer
+ *
+ * PARAMETERS:  Op              - Buffer Object to be examined
+ *
+ * RETURN:      TRUE if buffer contains a UUID
+ *
+ * DESCRIPTION: Determine if a buffer Op contains a UUID
+ *
+ * To help determine whether the buffer is a UUID versus a raw data buffer,
+ * there a are a couple bytes we can look at:
+ *
+ *    xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
+ *
+ * The variant covered by the UUID specification is indicated by the two most
+ * significant bits of N being 1 0 (i.e., the hexadecimal N will always be
+ * 8, 9, A, or B).
+ *
+ * The variant covered by the UUID specification has five versions. For this
+ * variant, the four bits of M indicates the UUID version (i.e., the
+ * hexadecimal M will be either 1, 2, 3, 4, or 5).
+ *
+ ******************************************************************************/
+
+BOOLEAN
+AcpiDmIsUuidBuffer (
+    ACPI_PARSE_OBJECT       *Op)
+{
+    UINT8                   *ByteData;
+    UINT32                  ByteCount;
+    ACPI_PARSE_OBJECT       *SizeOp;
+    ACPI_PARSE_OBJECT       *NextOp;
+
+
+    /* Buffer size is the buffer argument */
+
+    SizeOp = Op->Common.Value.Arg;
+
+    /* Next, the initializer byte list to examine */
+
+    NextOp = SizeOp->Common.Next;
+    if (!NextOp)
+    {
+        return (FALSE);
+    }
+
+    /* Extract the byte list info */
+
+    ByteData = NextOp->Named.Data;
+    ByteCount = (UINT32) NextOp->Common.Value.Integer;
+
+    /* Byte count must be exactly 16 */
+
+    if (ByteCount != UUID_BUFFER_LENGTH)
+    {
+        return (FALSE);
+    }
+
+    /* Check for valid "M" and "N" values (see function header above) */
+
+    if (((ByteData[7] & 0xF0) == 0x00) || /* M={1,2,3,4,5} */
+        ((ByteData[7] & 0xF0) > 0x50)  ||
+        ((ByteData[8] & 0xF0) < 0x80)  || /* N={8,9,A,B} */
+        ((ByteData[8] & 0xF0) > 0xB0))
+    {
+        return (FALSE);
+    }
+
+    /* Ignore the Size argument in the disassembly of this buffer op */
+
+    SizeOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE;
+    return (TRUE);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmUuid
+ *
+ * PARAMETERS:  Op              - Byte List op containing a UUID
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Dump a buffer containing a UUID as a standard ASCII string.
+ *
+ * Output Format:
+ * In its canonical form, the UUID is represented by a string containing 32
+ * lowercase hexadecimal digits, displayed in 5 groups separated by hyphens.
+ * The complete form is 8-4-4-4-12 for a total of 36 characters (32
+ * alphanumeric characters representing hex digits and 4 hyphens). In bytes,
+ * 4-2-2-2-6. Example:
+ *
+ *    ToUUID ("107ededd-d381-4fd7-8da9-08e9a6c79644")
+ *
+ ******************************************************************************/
+
+static void
+AcpiDmUuid (
+    ACPI_PARSE_OBJECT       *Op)
+{
+    UINT8                   *Data;
+    const char              *Description;
+
+
+    Data = ACPI_CAST_PTR (UINT8, Op->Named.Data);
+
+    /* Emit the 36-byte UUID string in the proper format/order */
+
+    AcpiOsPrintf (
+        "\"%2.2x%2.2x%2.2x%2.2x-"
+        "%2.2x%2.2x-"
+        "%2.2x%2.2x-"
+        "%2.2x%2.2x-"
+        "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\")",
+        Data[3], Data[2], Data[1], Data[0],
+        Data[5], Data[4],
+        Data[7], Data[6],
+        Data[8], Data[9],
+        Data[10], Data[11], Data[12], Data[13], Data[14], Data[15]);
+
+    /* Dump the UUID description string if available */
+
+    Description = AcpiAhMatchUuid (Data);
+    if (Description)
+    {
+        AcpiOsPrintf (" /* %s */", Description);
+    }
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmIsUnicodeBuffer
@@ -537,19 +713,20 @@ AcpiDmUnicode (
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiDmIsEisaIdElement
+ * FUNCTION:    AcpiDmGetHardwareIdType
  *
  * PARAMETERS:  Op              - Op to be examined
  *
  * RETURN:      None
  *
- * DESCRIPTION: Determine if an Op (argument to _HID or _CID) can be converted
- *              to an EISA ID.
+ * DESCRIPTION: Determine the type of the argument to a _HID or _CID
+ *              1) Strings are allowed
+ *              2) If Integer, determine if it is a valid EISAID
  *
  ******************************************************************************/
 
 static void
-AcpiDmIsEisaIdElement (
+AcpiDmGetHardwareIdType (
     ACPI_PARSE_OBJECT       *Op)
 {
     UINT32                  BigEndianId;
@@ -557,55 +734,66 @@ AcpiDmIsEisaIdElement (
     UINT32                  i;
 
 
-    /* The parameter must be either a word or a dword */
-
-    if ((Op->Common.AmlOpcode != AML_DWORD_OP) &&
-        (Op->Common.AmlOpcode != AML_WORD_OP))
+    switch (Op->Common.AmlOpcode)
     {
-        return;
-    }
+    case AML_STRING_OP:
 
-    /* Swap from little-endian to big-endian to simplify conversion */
+        /* Mark this string as an _HID/_CID string */
 
-    BigEndianId = AcpiUtDwordByteSwap ((UINT32) Op->Common.Value.Integer);
+        Op->Common.DisasmOpcode = ACPI_DASM_HID_STRING;
+        break;
 
-    /* Create the 3 leading ASCII letters */
+    case AML_WORD_OP:
+    case AML_DWORD_OP:
 
-    Prefix[0] = ((BigEndianId >> 26) & 0x1F) + 0x40;
-    Prefix[1] = ((BigEndianId >> 21) & 0x1F) + 0x40;
-    Prefix[2] = ((BigEndianId >> 16) & 0x1F) + 0x40;
+        /* Determine if a Word/Dword is a valid encoded EISAID */
 
-    /* Verify that all 3 are ascii and alpha */
+        /* Swap from little-endian to big-endian to simplify conversion */
 
-    for (i = 0; i < 3; i++)
-    {
-        if (!ACPI_IS_ASCII (Prefix[i]) ||
-            !ACPI_IS_ALPHA (Prefix[i]))
+        BigEndianId = AcpiUtDwordByteSwap ((UINT32) Op->Common.Value.Integer);
+
+        /* Create the 3 leading ASCII letters */
+
+        Prefix[0] = ((BigEndianId >> 26) & 0x1F) + 0x40;
+        Prefix[1] = ((BigEndianId >> 21) & 0x1F) + 0x40;
+        Prefix[2] = ((BigEndianId >> 16) & 0x1F) + 0x40;
+
+        /* Verify that all 3 are ascii and alpha */
+
+        for (i = 0; i < 3; i++)
         {
-            return;
+            if (!ACPI_IS_ASCII (Prefix[i]) ||
+                !ACPI_IS_ALPHA (Prefix[i]))
+            {
+                return;
+            }
         }
+
+        /* Mark this node as convertable to an EISA ID string */
+
+        Op->Common.DisasmOpcode = ACPI_DASM_EISAID;
+        break;
+
+    default:
+        break;
     }
-
-    /* OK - mark this node as convertable to an EISA ID */
-
-    Op->Common.DisasmOpcode = ACPI_DASM_EISAID;
 }
 
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiDmIsEisaId
+ * FUNCTION:    AcpiDmCheckForHardwareId
  *
  * PARAMETERS:  Op              - Op to be examined
  *
  * RETURN:      None
  *
- * DESCRIPTION: Determine if a Name() Op can be converted to an EisaId.
+ * DESCRIPTION: Determine if a Name() Op is a _HID/_CID.
  *
  ******************************************************************************/
 
 void
-AcpiDmIsEisaId (
+AcpiDmCheckForHardwareId (
     ACPI_PARSE_OBJECT       *Op)
 {
     UINT32                  Name;
@@ -630,7 +818,7 @@ AcpiDmIsEisaId (
 
     if (ACPI_COMPARE_NAME (&Name, METHOD_NAME__HID))
     {
-        AcpiDmIsEisaIdElement (NextOp);
+        AcpiDmGetHardwareIdType (NextOp);
         return;
     }
 
@@ -645,20 +833,24 @@ AcpiDmIsEisaId (
 
     if (NextOp->Common.AmlOpcode != AML_PACKAGE_OP)
     {
-        AcpiDmIsEisaIdElement (NextOp);
+        AcpiDmGetHardwareIdType (NextOp);
         return;
     }
 
-    /* _CID with Package: get the package length */
+    /* _CID with Package: get the package length, check all elements */
 
     NextOp = AcpiPsGetDepthNext (NULL, NextOp);
+    if (!NextOp)
+    {
+        return;
+    }
 
     /* Don't need to use the length, just walk the peer list */
 
     NextOp = NextOp->Common.Next;
     while (NextOp)
     {
-        AcpiDmIsEisaIdElement (NextOp);
+        AcpiDmGetHardwareIdType (NextOp);
         NextOp = NextOp->Common.Next;
     }
 }
@@ -666,41 +858,38 @@ AcpiDmIsEisaId (
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiDmEisaId
+ * FUNCTION:    AcpiDmDecompressEisaId
  *
  * PARAMETERS:  EncodedId       - Raw encoded EISA ID.
  *
  * RETURN:      None
  *
- * DESCRIPTION: Convert an encoded EISAID back to the original ASCII String.
+ * DESCRIPTION: Convert an encoded EISAID back to the original ASCII String
+ *              and emit the correct ASL statement. If the ID is known, emit
+ *              a description of the ID as a comment.
  *
  ******************************************************************************/
 
 void
-AcpiDmEisaId (
+AcpiDmDecompressEisaId (
     UINT32                  EncodedId)
 {
-    UINT32                  BigEndianId;
+    char                    IdBuffer[ACPI_EISAID_STRING_SIZE];
+    const AH_DEVICE_ID      *Info;
 
 
-    /* Swap from little-endian to big-endian to simplify conversion */
+    /* Convert EISAID to a string an emit the statement */
 
-    BigEndianId = AcpiUtDwordByteSwap (EncodedId);
+    AcpiExEisaIdToString (IdBuffer, EncodedId);
+    AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
 
+    /* If we know about the ID, emit the description */
 
-    /* Split to form "AAANNNN" string */
-
-    AcpiOsPrintf ("EisaId (\"%c%c%c%4.4X\")",
-
-        /* Three Alpha characters (AAA), 5 bits each */
-
-        (int) ((BigEndianId >> 26) & 0x1F) + 0x40,
-        (int) ((BigEndianId >> 21) & 0x1F) + 0x40,
-        (int) ((BigEndianId >> 16) & 0x1F) + 0x40,
-
-        /* Numeric part (NNNN) is simply the lower 16 bits */
-
-        (UINT32) (BigEndianId & 0xFFFF));
+    Info = AcpiAhMatchHardwareId (IdBuffer);
+    if (Info)
+    {
+        AcpiOsPrintf (" /* %s */", Info->Description);
+    }
 }
 
 #endif
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c b/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
index b047a6033cc0..9fa82b098a2b 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdispat.h>
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmnames.c b/sys/contrib/dev/acpica/components/disassembler/dmnames.c
index db7434d8b2f2..e0b8545d7334 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmnames.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/amlcode.h>
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmobject.c b/sys/contrib/dev/acpica/components/disassembler/dmobject.c
index 5541e5aa8f89..6df0ff51eef7 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmobject.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmobject.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmopcode.c b/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
index 5435e136df15..e8f2c9752fdc 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,8 @@
 #include <contrib/dev/acpica/include/acparser.h>
 #include <contrib/dev/acpica/include/amlcode.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
+#include <contrib/dev/acpica/include/acinterp.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
 
 #ifdef ACPI_DISASSEMBLER
 
@@ -59,6 +61,159 @@ AcpiDmMatchKeyword (
     ACPI_PARSE_OBJECT       *Op);
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmDisplayTargetPathname
+ *
+ * PARAMETERS:  Op              - Parse object
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: For AML opcodes that have a target operand, display the full
+ *              pathname for the target, in a comment field. Handles Return()
+ *              statements also.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDisplayTargetPathname (
+    ACPI_PARSE_OBJECT       *Op)
+{
+    ACPI_PARSE_OBJECT       *NextOp;
+    ACPI_PARSE_OBJECT       *PrevOp = NULL;
+    char                    *Pathname;
+    const ACPI_OPCODE_INFO  *OpInfo;
+
+
+    if (Op->Common.AmlOpcode == AML_RETURN_OP)
+    {
+        PrevOp = Op->Asl.Value.Arg;
+    }
+    else
+    {
+        OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
+        if (!(OpInfo->Flags & AML_HAS_TARGET))
+        {
+            return;
+        }
+
+        /* Target is the last Op in the arg list */
+
+        NextOp = Op->Asl.Value.Arg;
+        while (NextOp)
+        {
+            PrevOp = NextOp;
+            NextOp = PrevOp->Asl.Next;
+        }
+    }
+
+    if (!PrevOp)
+    {
+        return;
+    }
+
+    /* We must have a namepath AML opcode */
+
+    if (PrevOp->Asl.AmlOpcode != AML_INT_NAMEPATH_OP)
+    {
+        return;
+    }
+
+    /* A null string is the "no target specified" case */
+
+    if (!PrevOp->Asl.Value.String)
+    {
+        return;
+    }
+
+    /* No node means "unresolved external reference" */
+
+    if (!PrevOp->Asl.Node)
+    {
+        AcpiOsPrintf (" /* External reference */");
+        return;
+    }
+
+    /* Ignore if path is already from the root */
+
+    if (*PrevOp->Asl.Value.String == '\\')
+    {
+        return;
+    }
+
+    /* Now: we can get the full pathname */
+
+    Pathname = AcpiNsGetExternalPathname (PrevOp->Asl.Node);
+    if (!Pathname)
+    {
+        return;
+    }
+
+    AcpiOsPrintf (" /* %s */", Pathname);
+    ACPI_FREE (Pathname);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmNotifyDescription
+ *
+ * PARAMETERS:  Op              - Name() parse object
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Emit a description comment for the value associated with a
+ *              Notify() operator.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmNotifyDescription (
+    ACPI_PARSE_OBJECT       *Op)
+{
+    ACPI_PARSE_OBJECT       *NextOp;
+    ACPI_NAMESPACE_NODE     *Node;
+    UINT8                   NotifyValue;
+    UINT8                   Type = ACPI_TYPE_ANY;
+
+
+    /* The notify value is the second argument */
+
+    NextOp = Op->Asl.Value.Arg;
+    NextOp = NextOp->Asl.Next;
+
+    switch (NextOp->Common.AmlOpcode)
+    {
+    case AML_ZERO_OP:
+    case AML_ONE_OP:
+
+        NotifyValue = (UINT8) NextOp->Common.AmlOpcode;
+        break;
+
+    case AML_BYTE_OP:
+
+        NotifyValue = (UINT8) NextOp->Asl.Value.Integer;
+        break;
+
+    default:
+        return;
+    }
+
+    /*
+     * Attempt to get the namespace node so we can determine the object type.
+     * Some notify values are dependent on the object type (Device, Thermal,
+     * or Processor).
+     */
+    Node = Op->Asl.Node;
+    if (Node)
+    {
+        Type = Node->Type;
+    }
+
+    AcpiOsPrintf (" // %s", AcpiUtGetNotifyName (NotifyValue, Type));
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDmPredefinedDescription
@@ -183,14 +338,11 @@ AcpiDmPredefinedDescription (
 
     /* Match the name in the info table */
 
-    for (Info = AslPredefinedInfo; Info->Name; Info++)
+    Info = AcpiAhMatchPredefinedName (NameString);
+    if (Info)
     {
-        if (ACPI_COMPARE_NAME (NameString, Info->Name))
-        {
-            AcpiOsPrintf ("  // %4.4s: %s",
-                NameString, ACPI_CAST_PTR (char, Info->Description));
-            return;
-        }
+        AcpiOsPrintf ("  // %4.4s: %s",
+            NameString, ACPI_CAST_PTR (char, Info->Description));
     }
 
 #endif
@@ -267,14 +419,11 @@ AcpiDmFieldPredefinedDescription (
 
     /* Match the name in the info table */
 
-    for (Info = AslPredefinedInfo; Info->Name; Info++)
+    Info = AcpiAhMatchPredefinedName (Tag);
+    if (Info)
     {
-        if (ACPI_COMPARE_NAME (Tag, Info->Name))
-        {
-            AcpiOsPrintf ("  // %4.4s: %s", Tag,
-                ACPI_CAST_PTR (char, Info->Description));
-            return;
-        }
+        AcpiOsPrintf ("  // %4.4s: %s", Tag,
+            ACPI_CAST_PTR (char, Info->Description));
     }
 
 #endif
@@ -527,6 +676,7 @@ AcpiDmDisassembleOneOp (
     ACPI_PARSE_OBJECT       *Child;
     ACPI_STATUS             Status;
     UINT8                   *Aml;
+    const AH_DEVICE_ID      *IdInfo;
 
 
     if (!Op)
@@ -605,7 +755,7 @@ AcpiDmDisassembleOneOp (
 
         if (Op->Common.DisasmOpcode == ACPI_DASM_EISAID)
         {
-            AcpiDmEisaId ((UINT32) Op->Common.Value.Integer);
+            AcpiDmDecompressEisaId ((UINT32) Op->Common.Value.Integer);
         }
         else
         {
@@ -617,7 +767,7 @@ AcpiDmDisassembleOneOp (
 
         if (Op->Common.DisasmOpcode == ACPI_DASM_EISAID)
         {
-            AcpiDmEisaId ((UINT32) Op->Common.Value.Integer);
+            AcpiDmDecompressEisaId ((UINT32) Op->Common.Value.Integer);
         }
         else
         {
@@ -634,6 +784,19 @@ AcpiDmDisassembleOneOp (
     case AML_STRING_OP:
 
         AcpiUtPrintString (Op->Common.Value.String, ACPI_UINT16_MAX);
+
+        /* For _HID/_CID strings, attempt to output a descriptive comment */
+
+        if (Op->Common.DisasmOpcode == ACPI_DASM_HID_STRING)
+        {
+            /* If we know about the ID, emit the description */
+
+            IdInfo = AcpiAhMatchHardwareId (Op->Common.Value.String);
+            if (IdInfo)
+            {
+                AcpiOsPrintf (" /* %s */", IdInfo->Description);
+            }
+        }
         break;
 
     case AML_BUFFER_OP:
@@ -664,7 +827,12 @@ AcpiDmDisassembleOneOp (
             }
         }
 
-        if (AcpiDmIsUnicodeBuffer (Op))
+        if (AcpiDmIsUuidBuffer (Op))
+        {
+            Op->Common.DisasmOpcode = ACPI_DASM_UUID;
+            AcpiOsPrintf ("ToUUID (");
+        }
+        else if (AcpiDmIsUnicodeBuffer (Op))
         {
             Op->Common.DisasmOpcode = ACPI_DASM_UNICODE;
             AcpiOsPrintf ("Unicode (");
@@ -765,7 +933,9 @@ AcpiDmDisassembleOneOp (
             Length = (UINT32) Child->Common.Value.Integer;
 
             Info->Level += 1;
+            Info->MappingOp = Op;
             Op->Common.DisasmOpcode = ACPI_DASM_RESOURCE;
+
             AcpiDmResourceTemplate (Info, Op->Common.Parent, Aml, Length);
 
             Info->Level -= 1;
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrc.c b/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
index 6cdd07b1b771..04a6fbb02a5d 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/amlcode.h>
@@ -260,6 +259,11 @@ AcpiDmResourceTemplate (
     ACPI_NAMESPACE_NODE     *Node;
 
 
+    if (Op->Asl.AmlOpcode != AML_FIELD_OP)
+    {
+        Info->MappingOp = Op;
+    }
+
     Level = Info->Level;
     ResourceName = ACPI_DEFAULT_RESNAME;
     Node = Op->Common.Node;
@@ -328,7 +332,7 @@ AcpiDmResourceTemplate (
 
                 /* Go ahead and insert EndDependentFn() */
 
-                AcpiDmEndDependentDescriptor (Aml, ResourceLength, Level);
+                AcpiDmEndDependentDescriptor (Info, Aml, ResourceLength, Level);
 
                 AcpiDmIndent (Level);
                 AcpiOsPrintf (
@@ -350,7 +354,7 @@ AcpiDmResourceTemplate (
         }
 
         AcpiGbl_DmResourceDispatch [ResourceIndex] (
-            Aml, ResourceLength, Level);
+            Info, Aml, ResourceLength, Level);
 
         /* Descriptor post-processing */
 
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
index 792ae808d710..a6c38a8d169a 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
@@ -576,7 +575,8 @@ AcpiDmResourceSource (
  *
  * FUNCTION:    AcpiDmWordDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -588,6 +588,7 @@ AcpiDmResourceSource (
 
 void
 AcpiDmWordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -621,7 +622,8 @@ AcpiDmWordDescriptor (
  *
  * FUNCTION:    AcpiDmDwordDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -633,6 +635,7 @@ AcpiDmWordDescriptor (
 
 void
 AcpiDmDwordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -666,7 +669,8 @@ AcpiDmDwordDescriptor (
  *
  * FUNCTION:    AcpiDmQwordDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -678,6 +682,7 @@ AcpiDmDwordDescriptor (
 
 void
 AcpiDmQwordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -711,7 +716,8 @@ AcpiDmQwordDescriptor (
  *
  * FUNCTION:    AcpiDmExtendedDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -723,6 +729,7 @@ AcpiDmQwordDescriptor (
 
 void
 AcpiDmExtendedDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -758,7 +765,8 @@ AcpiDmExtendedDescriptor (
  *
  * FUNCTION:    AcpiDmMemory24Descriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -770,6 +778,7 @@ AcpiDmExtendedDescriptor (
 
 void
 AcpiDmMemory24Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -797,7 +806,8 @@ AcpiDmMemory24Descriptor (
  *
  * FUNCTION:    AcpiDmMemory32Descriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -809,6 +819,7 @@ AcpiDmMemory24Descriptor (
 
 void
 AcpiDmMemory32Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -836,7 +847,8 @@ AcpiDmMemory32Descriptor (
  *
  * FUNCTION:    AcpiDmFixedMemory32Descriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -848,6 +860,7 @@ AcpiDmMemory32Descriptor (
 
 void
 AcpiDmFixedMemory32Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -877,7 +890,8 @@ AcpiDmFixedMemory32Descriptor (
  *
  * FUNCTION:    AcpiDmGenericRegisterDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -889,6 +903,7 @@ AcpiDmFixedMemory32Descriptor (
 
 void
 AcpiDmGenericRegisterDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -933,7 +948,8 @@ AcpiDmGenericRegisterDescriptor (
  *
  * FUNCTION:    AcpiDmInterruptDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -945,6 +961,7 @@ AcpiDmGenericRegisterDescriptor (
 
 void
 AcpiDmInterruptDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -1039,7 +1056,8 @@ AcpiDmVendorCommon (
  *
  * FUNCTION:    AcpiDmVendorLargeDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -1051,6 +1069,7 @@ AcpiDmVendorCommon (
 
 void
 AcpiDmVendorLargeDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c b/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
index f938f93070d9..452cde04b7be 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
@@ -56,24 +55,28 @@
 
 static void
 AcpiDmI2cSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 static void
 AcpiDmSpiSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 static void
 AcpiDmUartSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 static void
 AcpiDmGpioCommon (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Level);
 
@@ -168,7 +171,8 @@ AcpiDmDumpRawDataBuffer (
  *
  * FUNCTION:    AcpiDmGpioCommon
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Level               - Current source code indentation level
  *
  * RETURN:      None
@@ -179,12 +183,14 @@ AcpiDmDumpRawDataBuffer (
 
 static void
 AcpiDmGpioCommon (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Level)
 {
-    UINT32                  PinCount;
     UINT16                  *PinList;
     UINT8                   *VendorData;
+    char                    *DeviceName = NULL;
+    UINT32                  PinCount;
     UINT32                  i;
 
 
@@ -193,9 +199,8 @@ AcpiDmGpioCommon (
     AcpiDmIndent (Level + 1);
     if (Resource->Gpio.ResSourceOffset)
     {
-        AcpiUtPrintString (
-            ACPI_ADD_PTR (char, Resource, Resource->Gpio.ResSourceOffset),
-            ACPI_UINT16_MAX);
+        DeviceName = ACPI_ADD_PTR (char, Resource, Resource->Gpio.ResSourceOffset),
+        AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
     }
 
     AcpiOsPrintf (", ");
@@ -243,6 +248,10 @@ AcpiDmGpioCommon (
 
     AcpiDmIndent (Level + 1);
     AcpiOsPrintf ("}\n");
+
+#ifndef _KERNEL
+    MpSaveGpioInfo (Info->MappingOp, Resource, PinCount, PinList, DeviceName);
+#endif
 }
 
 
@@ -250,7 +259,8 @@ AcpiDmGpioCommon (
  *
  * FUNCTION:    AcpiDmGpioIntDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -262,6 +272,7 @@ AcpiDmGpioCommon (
 
 static void
 AcpiDmGpioIntDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -274,7 +285,7 @@ AcpiDmGpioIntDescriptor (
     AcpiDmIndent (Level);
     AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
         AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
-        AcpiGbl_LlDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->Gpio.IntFlags, 1)],
+        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
         AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
 
     /* PinConfig, DebounceTimeout */
@@ -292,7 +303,7 @@ AcpiDmGpioIntDescriptor (
 
     /* Dump the GpioInt/GpioIo common portion of the descriptor */
 
-    AcpiDmGpioCommon (Resource, Level);
+    AcpiDmGpioCommon (Info, Resource, Level);
 }
 
 
@@ -300,7 +311,8 @@ AcpiDmGpioIntDescriptor (
  *
  * FUNCTION:    AcpiDmGpioIoDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -312,6 +324,7 @@ AcpiDmGpioIntDescriptor (
 
 static void
 AcpiDmGpioIoDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -344,7 +357,7 @@ AcpiDmGpioIoDescriptor (
 
     /* Dump the GpioInt/GpioIo common portion of the descriptor */
 
-    AcpiDmGpioCommon (Resource, Level);
+    AcpiDmGpioCommon (Info, Resource, Level);
 }
 
 
@@ -352,7 +365,8 @@ AcpiDmGpioIoDescriptor (
  *
  * FUNCTION:    AcpiDmGpioDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -364,6 +378,7 @@ AcpiDmGpioIoDescriptor (
 
 void
 AcpiDmGpioDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -377,12 +392,12 @@ AcpiDmGpioDescriptor (
     {
     case AML_RESOURCE_GPIO_TYPE_INT:
 
-        AcpiDmGpioIntDescriptor (Resource, Length, Level);
+        AcpiDmGpioIntDescriptor (Info, Resource, Length, Level);
         break;
 
     case AML_RESOURCE_GPIO_TYPE_IO:
 
-        AcpiDmGpioIoDescriptor (Resource, Length, Level);
+        AcpiDmGpioIoDescriptor (Info, Resource, Length, Level);
         break;
 
     default:
@@ -460,7 +475,8 @@ AcpiDmDumpSerialBusVendorData (
  *
  * FUNCTION:    AcpiDmI2cSerialBusDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -472,11 +488,13 @@ AcpiDmDumpSerialBusVendorData (
 
 static void
 AcpiDmI2cSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
 {
     UINT32                  ResourceSourceOffset;
+    char                    *DeviceName;
 
 
     /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
@@ -496,9 +514,8 @@ AcpiDmI2cSerialBusDescriptor (
     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
         Resource->CommonSerialBus.TypeDataLength;
 
-    AcpiUtPrintString (
-        ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
-        ACPI_UINT16_MAX);
+    DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
+    AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
 
     /* ResourceSourceIndex, ResourceUsage */
 
@@ -519,6 +536,10 @@ AcpiDmI2cSerialBusDescriptor (
     AcpiDmIndent (Level + 1);
     AcpiDmDumpSerialBusVendorData (Resource, Level);
     AcpiOsPrintf (")\n");
+
+#ifndef _KERNEL
+    MpSaveSerialInfo (Info->MappingOp, Resource, DeviceName);
+#endif
 }
 
 
@@ -526,7 +547,8 @@ AcpiDmI2cSerialBusDescriptor (
  *
  * FUNCTION:    AcpiDmSpiSerialBusDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -538,11 +560,13 @@ AcpiDmI2cSerialBusDescriptor (
 
 static void
 AcpiDmSpiSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
 {
     UINT32                  ResourceSourceOffset;
+    char                    *DeviceName;
 
 
     /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
@@ -571,9 +595,8 @@ AcpiDmSpiSerialBusDescriptor (
     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
         Resource->CommonSerialBus.TypeDataLength;
 
-    AcpiUtPrintString (
-        ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
-        ACPI_UINT16_MAX);
+    DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
+    AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
 
     /* ResourceSourceIndex, ResourceUsage */
 
@@ -594,6 +617,10 @@ AcpiDmSpiSerialBusDescriptor (
     AcpiDmIndent (Level + 1);
     AcpiDmDumpSerialBusVendorData (Resource, Level);
     AcpiOsPrintf (")\n");
+
+#ifndef _KERNEL
+    MpSaveSerialInfo (Info->MappingOp, Resource, DeviceName);
+#endif
 }
 
 
@@ -601,7 +628,8 @@ AcpiDmSpiSerialBusDescriptor (
  *
  * FUNCTION:    AcpiDmUartSerialBusDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -613,11 +641,13 @@ AcpiDmSpiSerialBusDescriptor (
 
 static void
 AcpiDmUartSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
 {
     UINT32                  ResourceSourceOffset;
+    char                    *DeviceName;
 
 
     /* ConnectionSpeed, BitsPerByte, StopBits */
@@ -649,9 +679,8 @@ AcpiDmUartSerialBusDescriptor (
     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
         Resource->CommonSerialBus.TypeDataLength;
 
-    AcpiUtPrintString (
-        ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
-        ACPI_UINT16_MAX);
+    DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
+    AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
 
     /* ResourceSourceIndex, ResourceUsage */
 
@@ -672,6 +701,10 @@ AcpiDmUartSerialBusDescriptor (
     AcpiDmIndent (Level + 1);
     AcpiDmDumpSerialBusVendorData (Resource, Level);
     AcpiOsPrintf (")\n");
+
+#ifndef _KERNEL
+    MpSaveSerialInfo (Info->MappingOp, Resource, DeviceName);
+#endif
 }
 
 
@@ -679,7 +712,8 @@ AcpiDmUartSerialBusDescriptor (
  *
  * FUNCTION:    AcpiDmSerialBusDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -691,13 +725,14 @@ AcpiDmUartSerialBusDescriptor (
 
 void
 AcpiDmSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
 {
 
     SerialBusResourceDispatch [Resource->CommonSerialBus.Type] (
-        Resource, Length, Level);
+        Info, Resource, Length, Level);
 }
 
 #endif
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c b/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
index 778d6638bba6..549c3d6b33da 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
@@ -57,7 +56,8 @@
  *
  * FUNCTION:    AcpiDmIrqDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -69,6 +69,7 @@
 
 void
 AcpiDmIrqDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -102,7 +103,8 @@ AcpiDmIrqDescriptor (
  *
  * FUNCTION:    AcpiDmDmaDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -114,6 +116,7 @@ AcpiDmIrqDescriptor (
 
 void
 AcpiDmDmaDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -139,7 +142,8 @@ AcpiDmDmaDescriptor (
  *
  * FUNCTION:    AcpiDmFixedDmaDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -151,6 +155,7 @@ AcpiDmDmaDescriptor (
 
 void
 AcpiDmFixedDmaDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -182,7 +187,8 @@ AcpiDmFixedDmaDescriptor (
  *
  * FUNCTION:    AcpiDmIoDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -194,6 +200,7 @@ AcpiDmFixedDmaDescriptor (
 
 void
 AcpiDmIoDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -227,7 +234,8 @@ AcpiDmIoDescriptor (
  *
  * FUNCTION:    AcpiDmFixedIoDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -239,6 +247,7 @@ AcpiDmIoDescriptor (
 
 void
 AcpiDmFixedIoDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -265,7 +274,8 @@ AcpiDmFixedIoDescriptor (
  *
  * FUNCTION:    AcpiDmStartDependentDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -277,6 +287,7 @@ AcpiDmFixedIoDescriptor (
 
 void
 AcpiDmStartDependentDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -304,7 +315,8 @@ AcpiDmStartDependentDescriptor (
  *
  * FUNCTION:    AcpiDmEndDependentDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -316,6 +328,7 @@ AcpiDmStartDependentDescriptor (
 
 void
 AcpiDmEndDependentDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
@@ -332,7 +345,8 @@ AcpiDmEndDependentDescriptor (
  *
  * FUNCTION:    AcpiDmVendorSmallDescriptor
  *
- * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ * PARAMETERS:  Info                - Extra resource info
+ *              Resource            - Pointer to the resource descriptor
  *              Length              - Length of the descriptor in bytes
  *              Level               - Current source code indentation level
  *
@@ -344,6 +358,7 @@ AcpiDmEndDependentDescriptor (
 
 void
 AcpiDmVendorSmallDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level)
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmutils.c b/sys/contrib/dev/acpica/components/disassembler/dmutils.c
index 5d35d8359865..bb9ef73c917f 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmutils.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/amlcode.h>
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmwalk.c b/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
index 5a3fbc65658c..8021a9731864 100644
--- a/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
+++ b/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
@@ -285,7 +284,8 @@ AcpiDmBlockType (
 
     case AML_BUFFER_OP:
 
-        if (Op->Common.DisasmOpcode == ACPI_DASM_UNICODE)
+        if ((Op->Common.DisasmOpcode == ACPI_DASM_UNICODE) ||
+            (Op->Common.DisasmOpcode == ACPI_DASM_UUID))
         {
             return (BLOCK_NONE);
         }
@@ -568,7 +568,7 @@ AcpiDmDescendingOp (
 
                 /* Check for _HID and related EISAID() */
 
-                AcpiDmIsEisaId (Op);
+                AcpiDmCheckForHardwareId (Op);
                 AcpiOsPrintf (", ");
                 break;
 
@@ -842,6 +842,15 @@ AcpiDmAscendingOp (
             AcpiDmFieldPredefinedDescription (Op);
         }
 
+        /* Decode Notify() values */
+
+        if (Op->Common.AmlOpcode == AML_NOTIFY_OP)
+        {
+            AcpiDmNotifyDescription (Op);
+        }
+
+        AcpiDmDisplayTargetPathname (Op);
+
         /* Could be a nested operator, check if comma required */
 
         if (!AcpiDmCommaIfListMember (Op))
@@ -948,6 +957,13 @@ AcpiDmAscendingOp (
             return (AE_OK);
         }
 
+        /*
+         * The parent Op is guaranteed to be valid because of the flag
+         * ACPI_PARSEOP_PARAMLIST -- which means that this op is part of
+         * a parameter list and thus has a valid parent.
+         */
+        ParentOp = Op->Common.Parent;
+
         /*
          * Just completed a parameter node for something like "Buffer (param)".
          * Close the paren and open up the term list block with a brace
@@ -956,25 +972,24 @@ AcpiDmAscendingOp (
         {
             AcpiOsPrintf (")");
 
-            /* Emit description comment for Name() with a predefined ACPI name */
-
-            ParentOp = Op->Common.Parent;
-            if (ParentOp)
+            /*
+             * Emit a description comment for a Name() operator that is a
+             * predefined ACPI name. Must check the grandparent.
+             */
+            ParentOp = ParentOp->Common.Parent;
+            if (ParentOp &&
+                (ParentOp->Asl.AmlOpcode == AML_NAME_OP))
             {
-                ParentOp = ParentOp->Common.Parent;
-                if (ParentOp && ParentOp->Asl.AmlOpcode == AML_NAME_OP)
-                {
-                    AcpiDmPredefinedDescription (ParentOp);
-                }
+                AcpiDmPredefinedDescription (ParentOp);
             }
+
             AcpiOsPrintf ("\n");
             AcpiDmIndent (Level - 1);
             AcpiOsPrintf ("{\n");
         }
         else
         {
-            Op->Common.Parent->Common.DisasmFlags |=
-                                    ACPI_PARSEOP_EMPTY_TERMLIST;
+            ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
             AcpiOsPrintf (") {");
         }
     }
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsargs.c b/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
index 2c574ca10a60..fd7c7958b27e 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c b/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
index 3d256ea0b4e6..c2fac77b8821 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsfield.c b/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
index ab4f5b94f7f2..262b63a4459a 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,7 +116,7 @@ AcpiDsCreateExternalRegion (
      * OperationRegion not found. Generate an External for it, and
      * insert the name into the namespace.
      */
-    AcpiDmAddToExternalList (Op, Path, ACPI_TYPE_REGION, 0);
+    AcpiDmAddOpToExternalList (Op, Path, ACPI_TYPE_REGION, 0, 0);
     Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ACPI_TYPE_REGION,
        ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT, WalkState, Node);
     if (ACPI_FAILURE (Status))
@@ -391,6 +391,7 @@ AcpiDsGetFieldNames (
              */
             Info->ResourceBuffer = NULL;
             Info->ConnectionNode = NULL;
+            Info->PinNumberIndex = 0;
 
             /*
              * A Connection() is either an actual resource descriptor (buffer)
@@ -466,6 +467,7 @@ AcpiDsGetFieldNames (
             }
 
             Info->FieldBitPosition += Info->FieldBitLength;
+            Info->PinNumberIndex++; /* Index relative to previous Connection() */
             break;
 
         default:
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsinit.c b/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
index 5ab1f502863a..6789fe413d6d 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@
 #define _COMPONENT          ACPI_DISPATCHER
         ACPI_MODULE_NAME    ("dsinit")
 
+
 /* Local prototypes */
 
 static ACPI_STATUS
@@ -91,8 +92,8 @@ AcpiDsInitOneObject (
 {
     ACPI_INIT_WALK_INFO     *Info = (ACPI_INIT_WALK_INFO *) Context;
     ACPI_NAMESPACE_NODE     *Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
-    ACPI_OBJECT_TYPE        Type;
     ACPI_STATUS             Status;
+    ACPI_OPERAND_OBJECT     *ObjDesc;
 
 
     ACPI_FUNCTION_ENTRY ();
@@ -111,9 +112,7 @@ AcpiDsInitOneObject (
 
     /* And even then, we are only interested in a few object types */
 
-    Type = AcpiNsGetType (ObjHandle);
-
-    switch (Type)
+    switch (AcpiNsGetType (ObjHandle))
     {
     case ACPI_TYPE_REGION:
 
@@ -129,8 +128,45 @@ AcpiDsInitOneObject (
         break;
 
     case ACPI_TYPE_METHOD:
-
+        /*
+         * Auto-serialization support. We will examine each method that is
+         * NotSerialized to determine if it creates any Named objects. If
+         * it does, it will be marked serialized to prevent problems if
+         * the method is entered by two or more threads and an attempt is
+         * made to create the same named object twice -- which results in
+         * an AE_ALREADY_EXISTS exception and method abort.
+         */
         Info->MethodCount++;
+        ObjDesc = AcpiNsGetAttachedObject (Node);
+        if (!ObjDesc)
+        {
+            break;
+        }
+
+        /* Ignore if already serialized */
+
+        if (ObjDesc->Method.InfoFlags & ACPI_METHOD_SERIALIZED)
+        {
+            Info->SerialMethodCount++;
+            break;
+        }
+
+        if (AcpiGbl_AutoSerializeMethods)
+        {
+            /* Parse/scan method and serialize it if necessary */
+
+            AcpiDsAutoSerializeMethod (Node, ObjDesc);
+            if (ObjDesc->Method.InfoFlags & ACPI_METHOD_SERIALIZED)
+            {
+                /* Method was just converted to Serialized */
+
+                Info->SerialMethodCount++;
+                Info->SerializedMethodCount++;
+                break;
+            }
+        }
+
+        Info->NonSerialMethodCount++;
         break;
 
     case ACPI_TYPE_DEVICE:
@@ -187,7 +223,6 @@ AcpiDsInitializeObjects (
 
     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
         "**** Starting initialization of namespace objects ****\n"));
-    ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "Parsing all Control Methods:"));
 
     /* Set all init info to zero */
 
@@ -223,12 +258,14 @@ AcpiDsInitializeObjects (
     }
 
     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-        "\nTable [%4.4s](id %4.4X) - %u Objects with %u Devices %u Methods %u Regions\n",
-        Table->Signature, OwnerId, Info.ObjectCount,
-        Info.DeviceCount, Info.MethodCount, Info.OpRegionCount));
+        "Table [%4.4s] (id %4.4X) - %4u Objects with %3u Devices, "
+        "%3u Regions, %3u Methods (%u/%u/%u Serial/Non/Cvt)\n",
+        Table->Signature, OwnerId, Info.ObjectCount, Info.DeviceCount,
+        Info.OpRegionCount, Info.MethodCount, Info.SerialMethodCount,
+        Info.NonSerialMethodCount, Info.SerializedMethodCount));
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-        "%u Methods, %u Regions\n", Info.MethodCount, Info.OpRegionCount));
+    ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "%u Methods, %u Regions\n",
+        Info.MethodCount, Info.OpRegionCount));
 
     return_ACPI_STATUS (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c b/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
index d2dccaf26904..1fd81738bc25 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,8 @@
 #include <contrib/dev/acpica/include/acinterp.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
 #include <contrib/dev/acpica/include/acdisasm.h>
+#include <contrib/dev/acpica/include/acparser.h>
+#include <contrib/dev/acpica/include/amlcode.h>
 
 
 #define _COMPONENT          ACPI_DISPATCHER
@@ -56,11 +58,155 @@
 
 /* Local prototypes */
 
+static ACPI_STATUS
+AcpiDsDetectNamedOpcodes (
+    ACPI_WALK_STATE         *WalkState,
+    ACPI_PARSE_OBJECT       **OutOp);
+
 static ACPI_STATUS
 AcpiDsCreateMethodMutex (
     ACPI_OPERAND_OBJECT     *MethodDesc);
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDsAutoSerializeMethod
+ *
+ * PARAMETERS:  Node                        - Namespace Node of the method
+ *              ObjDesc                     - Method object attached to node
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Parse a control method AML to scan for control methods that
+ *              need serialization due to the creation of named objects.
+ *
+ * NOTE: It is a bit of overkill to mark all such methods serialized, since
+ * there is only a problem if the method actually blocks during execution.
+ * A blocking operation is, for example, a Sleep() operation, or any access
+ * to an operation region. However, it is probably not possible to easily
+ * detect whether a method will block or not, so we simply mark all suspicious
+ * methods as serialized.
+ *
+ * NOTE2: This code is essentially a generic routine for parsing a single
+ * control method.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiDsAutoSerializeMethod (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OPERAND_OBJECT     *ObjDesc)
+{
+    ACPI_STATUS             Status;
+    ACPI_PARSE_OBJECT       *Op = NULL;
+    ACPI_WALK_STATE         *WalkState;
+
+
+    ACPI_FUNCTION_TRACE_PTR (DsAutoSerializeMethod, Node);
+
+
+    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+        "Method auto-serialization parse [%4.4s] %p\n",
+        AcpiUtGetNodeName (Node), Node));
+
+    /* Create/Init a root op for the method parse tree */
+
+    Op = AcpiPsAllocOp (AML_METHOD_OP);
+    if (!Op)
+    {
+        return_ACPI_STATUS (AE_NO_MEMORY);
+    }
+
+    AcpiPsSetName (Op, Node->Name.Integer);
+    Op->Common.Node = Node;
+
+    /* Create and initialize a new walk state */
+
+    WalkState = AcpiDsCreateWalkState (Node->OwnerId, NULL, NULL, NULL);
+    if (!WalkState)
+    {
+        return_ACPI_STATUS (AE_NO_MEMORY);
+    }
+
+    Status = AcpiDsInitAmlWalk (WalkState, Op, Node, ObjDesc->Method.AmlStart,
+                ObjDesc->Method.AmlLength, NULL, 0);
+    if (ACPI_FAILURE (Status))
+    {
+        AcpiDsDeleteWalkState (WalkState);
+        return_ACPI_STATUS (Status);
+    }
+
+    WalkState->DescendingCallback = AcpiDsDetectNamedOpcodes;
+
+    /* Parse the method, scan for creation of named objects */
+
+    Status = AcpiPsParseAml (WalkState);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    AcpiPsDeleteParseTree (Op);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDsDetectNamedOpcodes
+ *
+ * PARAMETERS:  WalkState       - Current state of the parse tree walk
+ *              OutOp           - Unused, required for parser interface
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Descending callback used during the loading of ACPI tables.
+ *              Currently used to detect methods that must be marked serialized
+ *              in order to avoid problems with the creation of named objects.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiDsDetectNamedOpcodes (
+    ACPI_WALK_STATE         *WalkState,
+    ACPI_PARSE_OBJECT       **OutOp)
+{
+
+    ACPI_FUNCTION_NAME (AcpiDsDetectNamedOpcodes);
+
+
+    /* We are only interested in opcodes that create a new name */
+
+    if (!(WalkState->OpInfo->Flags & (AML_NAMED | AML_CREATE | AML_FIELD)))
+    {
+        return (AE_OK);
+    }
+
+    /*
+     * At this point, we know we have a Named object opcode.
+     * Mark the method as serialized. Later code will create a mutex for
+     * this method to enforce serialization.
+     *
+     * Note, ACPI_METHOD_IGNORE_SYNC_LEVEL flag means that we will ignore the
+     * Sync Level mechanism for this method, even though it is now serialized.
+     * Otherwise, there can be conflicts with existing ASL code that actually
+     * uses sync levels.
+     */
+    WalkState->MethodDesc->Method.SyncLevel = 0;
+    WalkState->MethodDesc->Method.InfoFlags |=
+        (ACPI_METHOD_SERIALIZED | ACPI_METHOD_IGNORE_SYNC_LEVEL);
+
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+        "Method serialized [%4.4s] %p - [%s] (%4.4X)\n",
+        WalkState->MethodNode->Name.Ascii, WalkState->MethodNode,
+        WalkState->OpInfo->Name, WalkState->Opcode));
+
+    /* Abort the parse, no need to examine this method any further */
+
+    return (AE_CTRL_TERMINATE);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiDsMethodError
@@ -238,11 +384,16 @@ AcpiDsBeginMethodExecution (
         /*
          * The CurrentSyncLevel (per-thread) must be less than or equal to
          * the sync level of the method. This mechanism provides some
-         * deadlock prevention
+         * deadlock prevention.
+         *
+         * If the method was auto-serialized, we just ignore the sync level
+         * mechanism, because auto-serialization of methods can interfere
+         * with ASL code that actually uses sync levels.
          *
          * Top-level method invocation has no walk state at this point
          */
         if (WalkState &&
+            (!(ObjDesc->Method.InfoFlags & ACPI_METHOD_IGNORE_SYNC_LEVEL)) &&
             (WalkState->Thread->CurrentSyncLevel > ObjDesc->Method.Mutex->Mutex.SyncLevel))
         {
             ACPI_ERROR ((AE_INFO,
@@ -710,7 +861,8 @@ AcpiDsTerminateControlMethod (
              * thread exits here.
              */
             MethodDesc->Method.InfoFlags &= ~ACPI_METHOD_SERIALIZED_PENDING;
-            MethodDesc->Method.InfoFlags |= ACPI_METHOD_SERIALIZED;
+            MethodDesc->Method.InfoFlags |=
+                (ACPI_METHOD_SERIALIZED | ACPI_METHOD_IGNORE_SYNC_LEVEL);
             MethodDesc->Method.SyncLevel = 0;
         }
 
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c b/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
index 76157f5678c7..8e4555c2a9f2 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsobject.c b/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
index a853d3d88cad..04515fde6a58 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c b/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
index b7ff59060512..fa225ce1d1bd 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dsutils.c b/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
index 0a386cc0ec9e..cb1c84603fb6 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -779,16 +779,16 @@ AcpiDsCreateOperands (
         Index++;
     }
 
+    ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+        "NumOperands %d, ArgCount %d, Index %d\n",
+        WalkState->NumOperands, ArgCount, Index));
+
+    /* Create the interpreter arguments, in reverse order */
+
     Index--;
-
-    /* It is the appropriate order to get objects from the Result stack */
-
     for (i = 0; i < ArgCount; i++)
     {
         Arg = Arguments[Index];
-
-        /* Force the filling of the operand stack in inverse order */
-
         WalkState->OperandIndex = (UINT8) Index;
 
         Status = AcpiDsCreateOperand (WalkState, Arg, Index);
@@ -797,10 +797,10 @@ AcpiDsCreateOperands (
             goto Cleanup;
         }
 
+        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+            "Created Arg #%u (%p) %u args total\n",
+            Index, Arg, ArgCount));
         Index--;
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Arg #%u (%p) done, Arg1=%p\n",
-            Index, Arg, FirstArg));
     }
 
     return_ACPI_STATUS (Status);
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswexec.c b/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
index 6955f3c00028..c6009fb159fb 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -541,7 +541,8 @@ AcpiDsExecEndOp (
                 return_ACPI_STATUS (AE_OK);
             }
 
-            ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Method invocation, Op=%p\n", Op));
+            ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+                "Method invocation, Op=%p\n", Op));
 
             /*
              * (AML_METHODCALL) Op->Asl.Value.Arg->Asl.Node contains
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswload.c b/sys/contrib/dev/acpica/components/dispatcher/dswload.c
index 1cc8d4f2ece2..eca145e384d3 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dswload.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80,8 +80,21 @@ AcpiDsInitCallbacks (
 
     switch (PassNumber)
     {
+    case 0:
+
+        /* Parse only - caller will setup callbacks */
+
+        WalkState->ParseFlags         = ACPI_PARSE_LOAD_PASS1 |
+                                        ACPI_PARSE_DELETE_TREE |
+                                        ACPI_PARSE_DISASSEMBLE;
+        WalkState->DescendingCallback = NULL;
+        WalkState->AscendingCallback  = NULL;
+        break;
+
     case 1:
 
+        /* Load pass 1 */
+
         WalkState->ParseFlags         = ACPI_PARSE_LOAD_PASS1 |
                                         ACPI_PARSE_DELETE_TREE;
         WalkState->DescendingCallback = AcpiDsLoad1BeginOp;
@@ -90,6 +103,8 @@ AcpiDsInitCallbacks (
 
     case 2:
 
+        /* Load pass 2 */
+
         WalkState->ParseFlags         = ACPI_PARSE_LOAD_PASS1 |
                                         ACPI_PARSE_DELETE_TREE;
         WalkState->DescendingCallback = AcpiDsLoad2BeginOp;
@@ -98,6 +113,8 @@ AcpiDsInitCallbacks (
 
     case 3:
 
+        /* Execution pass */
+
 #ifndef ACPI_NO_METHOD_EXECUTION
         WalkState->ParseFlags        |= ACPI_PARSE_EXECUTE  |
                                         ACPI_PARSE_DELETE_TREE;
@@ -193,7 +210,7 @@ AcpiDsLoad1BeginOp (
              * Target of Scope() not found. Generate an External for it, and
              * insert the name into the namespace.
              */
-            AcpiDmAddToExternalList (Op, Path, ACPI_TYPE_DEVICE, 0);
+            AcpiDmAddOpToExternalList (Op, Path, ACPI_TYPE_DEVICE, 0, 0);
             Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType,
                        ACPI_IMODE_LOAD_PASS1, ACPI_NS_SEARCH_PARENT,
                        WalkState, &Node);
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswload2.c b/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
index 2b854133c555..abcc1c3e74d7 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswscope.c b/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
index 8530b5de6ec2..5d2152b2fb4b 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
index 8fd36bf66356..4071d5f8226d 100644
--- a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
+++ b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __DSWSTATE_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/events/evevent.c b/sys/contrib/dev/acpica/components/events/evevent.c
index dc8457cb461d..3116ac61a7c6 100644
--- a/sys/contrib/dev/acpica/components/events/evevent.c
+++ b/sys/contrib/dev/acpica/components/events/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/events/evglock.c b/sys/contrib/dev/acpica/components/events/evglock.c
index 9c5ade03f56e..44c768a753b1 100644
--- a/sys/contrib/dev/acpica/components/events/evglock.c
+++ b/sys/contrib/dev/acpica/components/events/evglock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/events/evgpe.c b/sys/contrib/dev/acpica/components/events/evgpe.c
index f4d12144ec25..7d4a5d03d8ec 100644
--- a/sys/contrib/dev/acpica/components/events/evgpe.c
+++ b/sys/contrib/dev/acpica/components/events/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -432,7 +432,7 @@ AcpiEvGpeDetect (
                   GpeRegisterInfo->EnableForWake))
             {
                 ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
-                    "Ignore disabled registers for GPE%02X-GPE%02X: "
+                    "Ignore disabled registers for GPE %02X-%02X: "
                     "RunEnable=%02X, WakeEnable=%02X\n",
                     GpeRegisterInfo->BaseGpeNumber,
                     GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
@@ -458,7 +458,7 @@ AcpiEvGpeDetect (
             }
 
             ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
-                "Read registers for GPE%02X-GPE%02X: Status=%02X, Enable=%02X, "
+                "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
                 "RunEnable=%02X, WakeEnable=%02X\n",
                 GpeRegisterInfo->BaseGpeNumber,
                 GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
@@ -549,6 +549,7 @@ AcpiEvAsynchExecuteGpeMethod (
     Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
     if (ACPI_FAILURE (Status))
     {
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
@@ -557,6 +558,7 @@ AcpiEvAsynchExecuteGpeMethod (
     if (!AcpiEvValidGpeEvent (GpeEventInfo))
     {
         Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
@@ -570,6 +572,7 @@ AcpiEvAsynchExecuteGpeMethod (
     Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
     if (ACPI_FAILURE (Status))
     {
+        ACPI_FREE (LocalGpeEventInfo);
         return_VOID;
     }
 
@@ -757,22 +760,6 @@ AcpiEvGpeDispatch (
              GpeNumber, AcpiGbl_GlobalEventHandlerContext);
     }
 
-    /*
-     * If edge-triggered, clear the GPE status bit now. Note that
-     * level-triggered events are cleared after the GPE is serviced.
-     */
-    if ((GpeEventInfo->Flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
-            ACPI_GPE_EDGE_TRIGGERED)
-    {
-        Status = AcpiHwClearGpe (GpeEventInfo);
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_EXCEPTION ((AE_INFO, Status,
-                "Unable to clear GPE%02X", GpeNumber));
-            return_UINT32 (ACPI_INTERRUPT_NOT_HANDLED);
-        }
-    }
-
     /*
      * Always disable the GPE so that it does not keep firing before
      * any asynchronous activity completes (either from the execution
@@ -786,10 +773,28 @@ AcpiEvGpeDispatch (
     if (ACPI_FAILURE (Status))
     {
         ACPI_EXCEPTION ((AE_INFO, Status,
-            "Unable to disable GPE%02X", GpeNumber));
+            "Unable to disable GPE %02X", GpeNumber));
         return_UINT32 (ACPI_INTERRUPT_NOT_HANDLED);
     }
 
+    /*
+     * If edge-triggered, clear the GPE status bit now. Note that
+     * level-triggered events are cleared after the GPE is serviced.
+     */
+    if ((GpeEventInfo->Flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
+            ACPI_GPE_EDGE_TRIGGERED)
+    {
+        Status = AcpiHwClearGpe (GpeEventInfo);
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_EXCEPTION ((AE_INFO, Status,
+                "Unable to clear GPE %02X", GpeNumber));
+            (void) AcpiHwLowSetGpe (GpeEventInfo,
+                    ACPI_GPE_CONDITIONAL_ENABLE);
+            return_UINT32 (ACPI_INTERRUPT_NOT_HANDLED);
+        }
+    }
+
     /*
      * Dispatch the GPE to either an installed handler or the control
      * method associated with this GPE (_Lxx or _Exx). If a handler
@@ -826,7 +831,7 @@ AcpiEvGpeDispatch (
         if (ACPI_FAILURE (Status))
         {
             ACPI_EXCEPTION ((AE_INFO, Status,
-                "Unable to queue handler for GPE%02X - event disabled",
+                "Unable to queue handler for GPE %02X - event disabled",
                 GpeNumber));
         }
         break;
@@ -838,7 +843,7 @@ AcpiEvGpeDispatch (
          * a GPE to be enabled if it has no handler or method.
          */
         ACPI_ERROR ((AE_INFO,
-            "No handler or method for GPE%02X, disabling event",
+            "No handler or method for GPE %02X, disabling event",
             GpeNumber));
         break;
     }
diff --git a/sys/contrib/dev/acpica/components/events/evgpeblk.c b/sys/contrib/dev/acpica/components/events/evgpeblk.c
index f0d53a3a21be..e8f0d637f1c9 100644
--- a/sys/contrib/dev/acpica/components/events/evgpeblk.c
+++ b/sys/contrib/dev/acpica/components/events/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,10 +97,9 @@ AcpiEvInstallGpeBlock (
         return_ACPI_STATUS (Status);
     }
 
-    GpeXruptBlock = AcpiEvGetGpeXruptBlock (InterruptNumber);
-    if (!GpeXruptBlock)
+    Status = AcpiEvGetGpeXruptBlock (InterruptNumber, &GpeXruptBlock);
+    if (ACPI_FAILURE (Status))
     {
-        Status = AE_NO_MEMORY;
         goto UnlockAndExit;
     }
 
@@ -128,7 +127,7 @@ AcpiEvInstallGpeBlock (
 
 
 UnlockAndExit:
-    Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
+    (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
     return_ACPI_STATUS (Status);
 }
 
@@ -283,17 +282,17 @@ AcpiEvCreateGpeInfoBlocks (
     {
         /* Init the RegisterInfo for this GPE register (8 GPEs) */
 
-        ThisRegister->BaseGpeNumber = (UINT8) (GpeBlock->BlockBaseNumber +
-                                             (i * ACPI_GPE_REGISTER_WIDTH));
+        ThisRegister->BaseGpeNumber = (UINT16)
+            (GpeBlock->BlockBaseNumber + (i * ACPI_GPE_REGISTER_WIDTH));
 
         ThisRegister->StatusAddress.Address =
-            GpeBlock->BlockAddress.Address + i;
+            GpeBlock->Address + i;
 
         ThisRegister->EnableAddress.Address =
-            GpeBlock->BlockAddress.Address + i + GpeBlock->RegisterCount;
+            GpeBlock->Address + i + GpeBlock->RegisterCount;
 
-        ThisRegister->StatusAddress.SpaceId   = GpeBlock->BlockAddress.SpaceId;
-        ThisRegister->EnableAddress.SpaceId   = GpeBlock->BlockAddress.SpaceId;
+        ThisRegister->StatusAddress.SpaceId   = GpeBlock->SpaceId;
+        ThisRegister->EnableAddress.SpaceId   = GpeBlock->SpaceId;
         ThisRegister->StatusAddress.BitWidth  = ACPI_GPE_REGISTER_WIDTH;
         ThisRegister->EnableAddress.BitWidth  = ACPI_GPE_REGISTER_WIDTH;
         ThisRegister->StatusAddress.BitOffset = 0;
@@ -366,9 +365,10 @@ AcpiEvCreateGpeInfoBlocks (
 ACPI_STATUS
 AcpiEvCreateGpeBlock (
     ACPI_NAMESPACE_NODE     *GpeDevice,
-    ACPI_GENERIC_ADDRESS    *GpeBlockAddress,
+    UINT64                  Address,
+    UINT8                   SpaceId,
     UINT32                  RegisterCount,
-    UINT8                   GpeBlockBaseNumber,
+    UINT16                  GpeBlockBaseNumber,
     UINT32                  InterruptNumber,
     ACPI_GPE_BLOCK_INFO     **ReturnGpeBlock)
 {
@@ -395,15 +395,14 @@ AcpiEvCreateGpeBlock (
 
     /* Initialize the new GPE block */
 
+    GpeBlock->Address = Address;
+    GpeBlock->SpaceId = SpaceId;
     GpeBlock->Node = GpeDevice;
     GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
     GpeBlock->Initialized = FALSE;
     GpeBlock->RegisterCount = RegisterCount;
     GpeBlock->BlockBaseNumber = GpeBlockBaseNumber;
 
-    ACPI_MEMCPY (&GpeBlock->BlockAddress, GpeBlockAddress,
-        sizeof (ACPI_GENERIC_ADDRESS));
-
     /*
      * Create the RegisterInfo and EventInfo sub-structures
      * Note: disables and clears all GPEs in the block
@@ -446,11 +445,11 @@ AcpiEvCreateGpeBlock (
     }
 
     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-        "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X\n",
+        "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
         (UINT32) GpeBlock->BlockBaseNumber,
         (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
-        GpeDevice->Name.Ascii, GpeBlock->RegisterCount,
-        InterruptNumber));
+        GpeDevice->Name.Ascii, GpeBlock->RegisterCount, InterruptNumber,
+        InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
 
     /* Update global count of currently available GPEs */
 
diff --git a/sys/contrib/dev/acpica/components/events/evgpeinit.c b/sys/contrib/dev/acpica/components/events/evgpeinit.c
index 8c74149f1173..d5e00e380bf8 100644
--- a/sys/contrib/dev/acpica/components/events/evgpeinit.c
+++ b/sys/contrib/dev/acpica/components/events/evgpeinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acevents.h>
@@ -139,7 +138,9 @@ AcpiEvGpeInitialize (
         /* Install GPE Block 0 */
 
         Status = AcpiEvCreateGpeBlock (AcpiGbl_FadtGpeDevice,
-                    &AcpiGbl_FADT.XGpe0Block, RegisterCount0, 0,
+                    AcpiGbl_FADT.XGpe0Block.Address,
+                    AcpiGbl_FADT.XGpe0Block.SpaceId,
+                    RegisterCount0, 0,
                     AcpiGbl_FADT.SciInterrupt, &AcpiGbl_GpeFadtBlocks[0]);
 
         if (ACPI_FAILURE (Status))
@@ -177,7 +178,9 @@ AcpiEvGpeInitialize (
             /* Install GPE Block 1 */
 
             Status = AcpiEvCreateGpeBlock (AcpiGbl_FadtGpeDevice,
-                        &AcpiGbl_FADT.XGpe1Block, RegisterCount1,
+                        AcpiGbl_FADT.XGpe1Block.Address,
+                        AcpiGbl_FADT.XGpe1Block.SpaceId,
+                        RegisterCount1,
                         AcpiGbl_FADT.Gpe1Base,
                         AcpiGbl_FADT.SciInterrupt, &AcpiGbl_GpeFadtBlocks[1]);
 
@@ -440,6 +443,10 @@ AcpiEvMatchGpeMethod (
         return_ACPI_STATUS (AE_OK);
     }
 
+    /* Disable the GPE in case it's been enabled already. */
+
+    (void) AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_DISABLE);
+
     /*
      * Add the GPE information from above to the GpeEventInfo block for
      * use during dispatch of this GPE.
diff --git a/sys/contrib/dev/acpica/components/events/evgpeutil.c b/sys/contrib/dev/acpica/components/events/evgpeutil.c
index 35caa5a18f6f..e2a44bc91b9d 100644
--- a/sys/contrib/dev/acpica/components/events/evgpeutil.c
+++ b/sys/contrib/dev/acpica/components/events/evgpeutil.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,8 +217,9 @@ AcpiEvGetGpeDevice (
  * FUNCTION:    AcpiEvGetGpeXruptBlock
  *
  * PARAMETERS:  InterruptNumber             - Interrupt for a GPE block
+ *              GpeXruptBlock               - Where the block is returned
  *
- * RETURN:      A GPE interrupt block
+ * RETURN:      Status
  *
  * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
  *              block per unique interrupt level used for GPEs. Should be
@@ -227,9 +228,10 @@ AcpiEvGetGpeDevice (
  *
  ******************************************************************************/
 
-ACPI_GPE_XRUPT_INFO *
+ACPI_STATUS
 AcpiEvGetGpeXruptBlock (
-    UINT32                  InterruptNumber)
+    UINT32                  InterruptNumber,
+    ACPI_GPE_XRUPT_INFO     **GpeXruptBlock)
 {
     ACPI_GPE_XRUPT_INFO     *NextGpeXrupt;
     ACPI_GPE_XRUPT_INFO     *GpeXrupt;
@@ -247,7 +249,8 @@ AcpiEvGetGpeXruptBlock (
     {
         if (NextGpeXrupt->InterruptNumber == InterruptNumber)
         {
-            return_PTR (NextGpeXrupt);
+            *GpeXruptBlock = NextGpeXrupt;
+            return_ACPI_STATUS (AE_OK);
         }
 
         NextGpeXrupt = NextGpeXrupt->Next;
@@ -258,7 +261,7 @@ AcpiEvGetGpeXruptBlock (
     GpeXrupt = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_XRUPT_INFO));
     if (!GpeXrupt)
     {
-        return_PTR (NULL);
+        return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
     GpeXrupt->InterruptNumber = InterruptNumber;
@@ -281,6 +284,7 @@ AcpiEvGetGpeXruptBlock (
     {
         AcpiGbl_GpeXruptListHead = GpeXrupt;
     }
+
     AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
 
     /* Install new interrupt handler if not SCI_INT */
@@ -291,14 +295,15 @@ AcpiEvGetGpeXruptBlock (
                     AcpiEvGpeXruptHandler, GpeXrupt);
         if (ACPI_FAILURE (Status))
         {
-            ACPI_ERROR ((AE_INFO,
+            ACPI_EXCEPTION ((AE_INFO, Status,
                 "Could not install GPE interrupt handler at level 0x%X",
                 InterruptNumber));
-            return_PTR (NULL);
+            return_ACPI_STATUS (Status);
         }
     }
 
-    return_PTR (GpeXrupt);
+    *GpeXruptBlock = GpeXrupt;
+    return_ACPI_STATUS (AE_OK);
 }
 
 
diff --git a/sys/contrib/dev/acpica/components/events/evhandler.c b/sys/contrib/dev/acpica/components/events/evhandler.c
index cb03bc93d0bd..73a2df284858 100644
--- a/sys/contrib/dev/acpica/components/events/evhandler.c
+++ b/sys/contrib/dev/acpica/components/events/evhandler.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVHANDLER_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/events/evmisc.c b/sys/contrib/dev/acpica/components/events/evmisc.c
index 547534bd5b23..a710b569f7ed 100644
--- a/sys/contrib/dev/acpica/components/events/evmisc.c
+++ b/sys/contrib/dev/acpica/components/events/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -181,7 +181,7 @@ AcpiEvQueueNotifyRequest (
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
         "Dispatching Notify on [%4.4s] (%s) Value 0x%2.2X (%s) Node %p\n",
         AcpiUtGetNodeName (Node), AcpiUtGetTypeName (Node->Type),
-        NotifyValue, AcpiUtGetNotifyName (NotifyValue), Node));
+        NotifyValue, AcpiUtGetNotifyName (NotifyValue, ACPI_TYPE_ANY), Node));
 
     Status = AcpiOsExecute (OSL_NOTIFY_HANDLER, AcpiEvNotifyDispatch,
         Info);
diff --git a/sys/contrib/dev/acpica/components/events/evregion.c b/sys/contrib/dev/acpica/components/events/evregion.c
index d469d6ef675b..8078bf92c49c 100644
--- a/sys/contrib/dev/acpica/components/events/evregion.c
+++ b/sys/contrib/dev/acpica/components/events/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVREGION_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -159,6 +158,7 @@ AcpiEvAddressSpaceDispatch (
     ACPI_OPERAND_OBJECT     *RegionObj2;
     void                    *RegionContext = NULL;
     ACPI_CONNECTION_INFO    *Context;
+    ACPI_PHYSICAL_ADDRESS   Address;
 
 
     ACPI_FUNCTION_TRACE (EvAddressSpaceDispatch);
@@ -248,23 +248,23 @@ AcpiEvAddressSpaceDispatch (
     /* We have everything we need, we can invoke the address space handler */
 
     Handler = HandlerDesc->AddressSpace.Handler;
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
-        "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
-        &RegionObj->Region.Handler->AddressSpace, Handler,
-        ACPI_FORMAT_NATIVE_UINT (RegionObj->Region.Address + RegionOffset),
-        AcpiUtGetRegionName (RegionObj->Region.SpaceId)));
+    Address = (RegionObj->Region.Address + RegionOffset);
 
     /*
      * Special handling for GenericSerialBus and GeneralPurposeIo:
      * There are three extra parameters that must be passed to the
      * handler via the context:
-     *   1) Connection buffer, a resource template from Connection() op.
-     *   2) Length of the above buffer.
-     *   3) Actual access length from the AccessAs() op.
+     *   1) Connection buffer, a resource template from Connection() op
+     *   2) Length of the above buffer
+     *   3) Actual access length from the AccessAs() op
+     *
+     * In addition, for GeneralPurposeIo, the Address and BitWidth fields
+     * are defined as follows:
+     *   1) Address is the pin number index of the field (bit offset from
+     *      the previous Connection)
+     *   2) BitWidth is the actual bit length of the field (number of pins)
      */
-    if (((RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GSBUS) ||
-            (RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GPIO)) &&
+    if ((RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GSBUS) &&
         Context &&
         FieldObj)
     {
@@ -274,6 +274,24 @@ AcpiEvAddressSpaceDispatch (
         Context->Length = FieldObj->Field.ResourceLength;
         Context->AccessLength = FieldObj->Field.AccessLength;
     }
+    if ((RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GPIO) &&
+        Context &&
+        FieldObj)
+    {
+        /* Get the Connection (ResourceTemplate) buffer */
+
+        Context->Connection = FieldObj->Field.ResourceBuffer;
+        Context->Length = FieldObj->Field.ResourceLength;
+        Context->AccessLength = FieldObj->Field.AccessLength;
+        Address = FieldObj->Field.PinNumberIndex;
+        BitWidth = FieldObj->Field.BitLength;
+    }
+
+    ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
+        "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
+        &RegionObj->Region.Handler->AddressSpace, Handler,
+        ACPI_FORMAT_NATIVE_UINT (Address),
+        AcpiUtGetRegionName (RegionObj->Region.SpaceId)));
 
     if (!(HandlerDesc->AddressSpace.HandlerFlags &
             ACPI_ADDR_HANDLER_DEFAULT_INSTALLED))
@@ -288,9 +306,8 @@ AcpiEvAddressSpaceDispatch (
 
     /* Call the handler */
 
-    Status = Handler (Function,
-        (RegionObj->Region.Address + RegionOffset), BitWidth, Value,
-        Context, RegionObj2->Extra.RegionContext);
+    Status = Handler (Function, Address, BitWidth, Value, Context,
+        RegionObj2->Extra.RegionContext);
 
     if (ACPI_FAILURE (Status))
     {
@@ -333,6 +350,7 @@ AcpiEvDetachRegion(
 {
     ACPI_OPERAND_OBJECT     *HandlerObj;
     ACPI_OPERAND_OBJECT     *ObjDesc;
+    ACPI_OPERAND_OBJECT     *StartDesc;
     ACPI_OPERAND_OBJECT     **LastObjPtr;
     ACPI_ADR_SPACE_SETUP    RegionSetup;
     void                    **RegionContext;
@@ -363,6 +381,7 @@ AcpiEvDetachRegion(
     /* Find this region in the handler's list */
 
     ObjDesc = HandlerObj->AddressSpace.RegionList;
+    StartDesc = ObjDesc;
     LastObjPtr = &HandlerObj->AddressSpace.RegionList;
 
     while (ObjDesc)
@@ -457,6 +476,16 @@ AcpiEvDetachRegion(
 
         LastObjPtr = &ObjDesc->Region.Next;
         ObjDesc = ObjDesc->Region.Next;
+
+        /* Prevent infinite loop if list is corrupted */
+
+        if (ObjDesc == StartDesc)
+        {
+            ACPI_ERROR ((AE_INFO,
+                "Circular handler list in region object %p",
+                RegionObj));
+            return_VOID;
+        }
     }
 
     /* If we get here, the region was not in the handler's region list */
diff --git a/sys/contrib/dev/acpica/components/events/evrgnini.c b/sys/contrib/dev/acpica/components/events/evrgnini.c
index 5a9e9e814c1e..14fea69261cd 100644
--- a/sys/contrib/dev/acpica/components/events/evrgnini.c
+++ b/sys/contrib/dev/acpica/components/events/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVRGNINI_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/events/evsci.c b/sys/contrib/dev/acpica/components/events/evsci.c
index 4fa84f3a45e6..8688a31adf1a 100644
--- a/sys/contrib/dev/acpica/components/events/evsci.c
+++ b/sys/contrib/dev/acpica/components/events/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -135,7 +135,7 @@ AcpiEvSciXruptHandler (
 
 
     /*
-     * We are guaranteed by the ACPI CA initialization/shutdown code that
+     * We are guaranteed by the ACPICA initialization/shutdown code that
      * if this interrupt handler is installed, ACPI is enabled.
      */
 
diff --git a/sys/contrib/dev/acpica/components/events/evxface.c b/sys/contrib/dev/acpica/components/events/evxface.c
index 4ed32474928c..cdb6fce2753d 100644
--- a/sys/contrib/dev/acpica/components/events/evxface.c
+++ b/sys/contrib/dev/acpica/components/events/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVXFACE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -265,7 +265,7 @@ AcpiRemoveNotifyHandler (
     ACPI_OPERAND_OBJECT     *ObjDesc;
     ACPI_OPERAND_OBJECT     *HandlerObj;
     ACPI_OPERAND_OBJECT     *PreviousHandlerObj;
-    ACPI_STATUS             Status;
+    ACPI_STATUS             Status = AE_OK;
     UINT32                  i;
 
 
@@ -280,16 +280,6 @@ AcpiRemoveNotifyHandler (
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
 
-    /* Make sure all deferred notify tasks are completed */
-
-    AcpiOsWaitEventsComplete ();
-
-    Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
     /* Root Object. Global handlers are removed here */
 
     if (Device == ACPI_ROOT_OBJECT)
@@ -298,6 +288,12 @@ AcpiRemoveNotifyHandler (
         {
             if (HandlerType & (i+1))
             {
+                Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
+                if (ACPI_FAILURE (Status))
+                {
+                    return_ACPI_STATUS (Status);
+                }
+
                 if (!AcpiGbl_GlobalNotify[i].Handler ||
                     (AcpiGbl_GlobalNotify[i].Handler != Handler))
                 {
@@ -310,18 +306,23 @@ AcpiRemoveNotifyHandler (
 
                 AcpiGbl_GlobalNotify[i].Handler = NULL;
                 AcpiGbl_GlobalNotify[i].Context = NULL;
+
+                (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
+
+                /* Make sure all deferred notify tasks are completed */
+
+                AcpiOsWaitEventsComplete ();
             }
         }
 
-        goto UnlockAndExit;
+        return_ACPI_STATUS (AE_OK);
     }
 
     /* All other objects: Are Notifies allowed on this object? */
 
     if (!AcpiEvIsNotifyObject (Node))
     {
-        Status = AE_TYPE;
-        goto UnlockAndExit;
+        return_ACPI_STATUS (AE_TYPE);
     }
 
     /* Must have an existing internal object */
@@ -329,8 +330,7 @@ AcpiRemoveNotifyHandler (
     ObjDesc = AcpiNsGetAttachedObject (Node);
     if (!ObjDesc)
     {
-        Status = AE_NOT_EXIST;
-        goto UnlockAndExit;
+        return_ACPI_STATUS (AE_NOT_EXIST);
     }
 
     /* Internal object exists. Find the handler and remove it */
@@ -339,6 +339,12 @@ AcpiRemoveNotifyHandler (
     {
         if (HandlerType & (i+1))
         {
+            Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
+            if (ACPI_FAILURE (Status))
+            {
+                return_ACPI_STATUS (Status);
+            }
+
             HandlerObj = ObjDesc->CommonNotify.NotifyList[i];
             PreviousHandlerObj = NULL;
 
@@ -370,10 +376,17 @@ AcpiRemoveNotifyHandler (
                     HandlerObj->Notify.Next[i];
             }
 
+            (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
+
+            /* Make sure all deferred notify tasks are completed */
+
+            AcpiOsWaitEventsComplete ();
             AcpiUtRemoveReference (HandlerObj);
         }
     }
 
+    return_ACPI_STATUS (Status);
+
 
 UnlockAndExit:
     (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
@@ -519,6 +532,8 @@ AcpiInstallSciHandler (
     return_ACPI_STATUS (Status);
 }
 
+ACPI_EXPORT_SYMBOL (AcpiInstallSciHandler)
+
 
 /*******************************************************************************
  *
@@ -595,6 +610,8 @@ AcpiRemoveSciHandler (
     return_ACPI_STATUS (Status);
 }
 
+ACPI_EXPORT_SYMBOL (AcpiRemoveSciHandler)
+
 
 /*******************************************************************************
  *
@@ -969,10 +986,6 @@ AcpiRemoveGpeHandler (
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
 
-    /* Make sure all deferred GPE tasks are completed */
-
-    AcpiOsWaitEventsComplete ();
-
     Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
     if (ACPI_FAILURE (Status))
     {
@@ -1023,16 +1036,24 @@ AcpiRemoveGpeHandler (
      * enabled, it should be enabled at this point to restore the
      * post-initialization configuration.
      */
-    if ((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) &&
+    if (((Handler->OriginalFlags & ACPI_GPE_DISPATCH_METHOD) ||
+         (Handler->OriginalFlags & ACPI_GPE_DISPATCH_NOTIFY)) &&
         Handler->OriginallyEnabled)
     {
         (void) AcpiEvAddGpeReference (GpeEventInfo);
     }
 
+    AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
+    (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
+
+    /* Make sure all deferred GPE tasks are completed */
+
+    AcpiOsWaitEventsComplete ();
+
     /* Now we can free the handler object */
 
     ACPI_FREE (Handler);
-
+    return_ACPI_STATUS (Status);
 
 UnlockAndExit:
     AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
diff --git a/sys/contrib/dev/acpica/components/events/evxfevnt.c b/sys/contrib/dev/acpica/components/events/evxfevnt.c
index eb17a3f88ba3..abb0c0e4e48c 100644
--- a/sys/contrib/dev/acpica/components/events/evxfevnt.c
+++ b/sys/contrib/dev/acpica/components/events/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVXFEVNT_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -364,7 +364,9 @@ AcpiGetEventStatus (
     UINT32                  Event,
     ACPI_EVENT_STATUS       *EventStatus)
 {
-    ACPI_STATUS             Status = AE_OK;
+    ACPI_STATUS             Status;
+    ACPI_EVENT_STATUS       LocalEventStatus = 0;
+    UINT32                  InByte;
 
 
     ACPI_FUNCTION_TRACE (AcpiGetEventStatus);
@@ -382,12 +384,43 @@ AcpiGetEventStatus (
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
 
-    /* Get the status of the requested fixed event */
+    /* Fixed event currently can be dispatched? */
+
+    if (AcpiGbl_FixedEventHandlers[Event].Handler)
+    {
+        LocalEventStatus |= ACPI_EVENT_FLAG_HAS_HANDLER;
+    }
+
+    /* Fixed event currently enabled? */
 
     Status = AcpiReadBitRegister (
-                AcpiGbl_FixedEventInfo[Event].StatusRegisterId, EventStatus);
+                AcpiGbl_FixedEventInfo[Event].EnableRegisterId, &InByte);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
 
-    return_ACPI_STATUS (Status);
+    if (InByte)
+    {
+        LocalEventStatus |= ACPI_EVENT_FLAG_ENABLED;
+    }
+
+    /* Fixed event currently active? */
+
+    Status = AcpiReadBitRegister (
+                AcpiGbl_FixedEventInfo[Event].StatusRegisterId, &InByte);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    if (InByte)
+    {
+        LocalEventStatus |= ACPI_EVENT_FLAG_SET;
+    }
+
+    (*EventStatus) = LocalEventStatus;
+    return_ACPI_STATUS (AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL (AcpiGetEventStatus)
diff --git a/sys/contrib/dev/acpica/components/events/evxfgpe.c b/sys/contrib/dev/acpica/components/events/evxfgpe.c
index 0a40bd9d8f42..c03f5c07d391 100644
--- a/sys/contrib/dev/acpica/components/events/evxfgpe.c
+++ b/sys/contrib/dev/acpica/components/events/evxfgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EVXFGPE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -140,12 +140,23 @@ AcpiEnableGpe (
 
     Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock);
 
-    /* Ensure that we have a valid GPE number */
-
+    /*
+     * Ensure that we have a valid GPE number and that there is some way
+     * of handling the GPE (handler or a GPE method). In other words, we
+     * won't allow a valid GPE to be enabled if there is no way to handle it.
+     */
     GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber);
     if (GpeEventInfo)
     {
-        Status = AcpiEvAddGpeReference (GpeEventInfo);
+        if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) !=
+            ACPI_GPE_DISPATCH_NONE)
+        {
+            Status = AcpiEvAddGpeReference (GpeEventInfo);
+        }
+        else
+        {
+            Status = AE_NO_HANDLER;
+        }
     }
 
     AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
@@ -273,6 +284,60 @@ AcpiSetGpe (
 ACPI_EXPORT_SYMBOL (AcpiSetGpe)
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiMarkGpeForWake
+ *
+ * PARAMETERS:  GpeDevice           - Parent GPE Device. NULL for GPE0/GPE1
+ *              GpeNumber           - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Mark a GPE as having the ability to wake the system. Simply
+ *              sets the ACPI_GPE_CAN_WAKE flag.
+ *
+ * Some potential callers of AcpiSetupGpeForWake may know in advance that
+ * there won't be any notify handlers installed for device wake notifications
+ * from the given GPE (one example is a button GPE in Linux). For these cases,
+ * AcpiMarkGpeForWake should be used instead of AcpiSetupGpeForWake.
+ * This will set the ACPI_GPE_CAN_WAKE flag for the GPE without trying to
+ * setup implicit wake notification for it (since there's no handler method).
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiMarkGpeForWake (
+    ACPI_HANDLE             GpeDevice,
+    UINT32                  GpeNumber)
+{
+    ACPI_GPE_EVENT_INFO     *GpeEventInfo;
+    ACPI_STATUS             Status = AE_BAD_PARAMETER;
+    ACPI_CPU_FLAGS          Flags;
+
+
+    ACPI_FUNCTION_TRACE (AcpiMarkGpeForWake);
+
+
+    Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock);
+
+    /* Ensure that we have a valid GPE number */
+
+    GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber);
+    if (GpeEventInfo)
+    {
+        /* Mark the GPE as a possible wake event */
+
+        GpeEventInfo->Flags |= ACPI_GPE_CAN_WAKE;
+        Status = AE_OK;
+    }
+
+    AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
+    return_ACPI_STATUS (Status);
+}
+
+ACPI_EXPORT_SYMBOL (AcpiMarkGpeForWake)
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiSetupGpeForWake
@@ -790,11 +855,26 @@ AcpiInstallGpeBlock (
         goto UnlockAndExit;
     }
 
+    /* Validate the parent device */
+
+    if (Node->Type != ACPI_TYPE_DEVICE)
+    {
+        Status = AE_TYPE;
+        goto UnlockAndExit;
+    }
+
+    if (Node->Object)
+    {
+        Status = AE_ALREADY_EXISTS;
+        goto UnlockAndExit;
+    }
+
     /*
      * For user-installed GPE Block Devices, the GpeBlockBaseNumber
      * is always zero
      */
-    Status = AcpiEvCreateGpeBlock (Node, GpeBlockAddress, RegisterCount,
+    Status = AcpiEvCreateGpeBlock (Node, GpeBlockAddress->Address,
+                GpeBlockAddress->SpaceId, RegisterCount,
                 0, InterruptNumber, &GpeBlock);
     if (ACPI_FAILURE (Status))
     {
@@ -883,6 +963,14 @@ AcpiRemoveGpeBlock (
         goto UnlockAndExit;
     }
 
+    /* Validate the parent device */
+
+    if (Node->Type != ACPI_TYPE_DEVICE)
+    {
+        Status = AE_TYPE;
+        goto UnlockAndExit;
+    }
+
     /* Get the DeviceObject attached to the node */
 
     ObjDesc = AcpiNsGetAttachedObject (Node);
diff --git a/sys/contrib/dev/acpica/components/events/evxfregn.c b/sys/contrib/dev/acpica/components/events/evxfregn.c
index 432657d89a07..eb53c0d852ff 100644
--- a/sys/contrib/dev/acpica/components/events/evxfregn.c
+++ b/sys/contrib/dev/acpica/components/events/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
  */
 
 #define __EVXFREGN_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
diff --git a/sys/contrib/dev/acpica/components/executer/exconfig.c b/sys/contrib/dev/acpica/components/executer/exconfig.c
index 2306e8397e7c..c3bb563fbf78 100644
--- a/sys/contrib/dev/acpica/components/executer/exconfig.c
+++ b/sys/contrib/dev/acpica/components/executer/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -380,8 +380,8 @@ AcpiExLoadOp (
     ACPI_WALK_STATE         *WalkState)
 {
     ACPI_OPERAND_OBJECT     *DdbHandle;
+    ACPI_TABLE_HEADER       *TableHeader;
     ACPI_TABLE_HEADER       *Table;
-    ACPI_TABLE_DESC         TableDesc;
     UINT32                  TableIndex;
     ACPI_STATUS             Status;
     UINT32                  Length;
@@ -390,8 +390,6 @@ AcpiExLoadOp (
     ACPI_FUNCTION_TRACE (ExLoadOp);
 
 
-    ACPI_MEMSET (&TableDesc, 0, sizeof (ACPI_TABLE_DESC));
-
     /* Source Object can be either an OpRegion or a Buffer/Field */
 
     switch (ObjDesc->Common.Type)
@@ -423,16 +421,16 @@ AcpiExLoadOp (
 
         /* Get the table header first so we can get the table length */
 
-        Table = ACPI_ALLOCATE (sizeof (ACPI_TABLE_HEADER));
-        if (!Table)
+        TableHeader = ACPI_ALLOCATE (sizeof (ACPI_TABLE_HEADER));
+        if (!TableHeader)
         {
             return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
         Status = AcpiExRegionRead (ObjDesc, sizeof (ACPI_TABLE_HEADER),
-                    ACPI_CAST_PTR (UINT8, Table));
-        Length = Table->Length;
-        ACPI_FREE (Table);
+                    ACPI_CAST_PTR (UINT8, TableHeader));
+        Length = TableHeader->Length;
+        ACPI_FREE (TableHeader);
 
         if (ACPI_FAILURE (Status))
         {
@@ -464,8 +462,8 @@ AcpiExLoadOp (
 
         /* Allocate a buffer for the table */
 
-        TableDesc.Pointer = ACPI_ALLOCATE (Length);
-        if (!TableDesc.Pointer)
+        Table = ACPI_ALLOCATE (Length);
+        if (!Table)
         {
             return_ACPI_STATUS (AE_NO_MEMORY);
         }
@@ -473,14 +471,12 @@ AcpiExLoadOp (
         /* Read the entire table */
 
         Status = AcpiExRegionRead (ObjDesc, Length,
-                    ACPI_CAST_PTR (UINT8, TableDesc.Pointer));
+                    ACPI_CAST_PTR (UINT8, Table));
         if (ACPI_FAILURE (Status))
         {
-            ACPI_FREE (TableDesc.Pointer);
+            ACPI_FREE (Table);
             return_ACPI_STATUS (Status);
         }
-
-        TableDesc.Address = ObjDesc->Region.Address;
         break;
 
     case ACPI_TYPE_BUFFER: /* Buffer or resolved RegionField */
@@ -497,8 +493,8 @@ AcpiExLoadOp (
 
         /* Get the actual table length from the table header */
 
-        Table = ACPI_CAST_PTR (ACPI_TABLE_HEADER, ObjDesc->Buffer.Pointer);
-        Length = Table->Length;
+        TableHeader = ACPI_CAST_PTR (ACPI_TABLE_HEADER, ObjDesc->Buffer.Pointer);
+        Length = TableHeader->Length;
 
         /* Table cannot extend beyond the buffer */
 
@@ -515,14 +511,13 @@ AcpiExLoadOp (
          * Copy the table from the buffer because the buffer could be modified
          * or even deleted in the future
          */
-        TableDesc.Pointer = ACPI_ALLOCATE (Length);
-        if (!TableDesc.Pointer)
+        Table = ACPI_ALLOCATE (Length);
+        if (!Table)
         {
             return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
-        ACPI_MEMCPY (TableDesc.Pointer, Table, Length);
-        TableDesc.Address = ACPI_TO_INTEGER (TableDesc.Pointer);
+        ACPI_MEMCPY (Table, TableHeader, Length);
         break;
 
     default:
@@ -530,28 +525,31 @@ AcpiExLoadOp (
         return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
     }
 
-    /* Validate table checksum (will not get validated in TbAddTable) */
-
-    Status = AcpiTbVerifyChecksum (TableDesc.Pointer, Length);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_FREE (TableDesc.Pointer);
-        return_ACPI_STATUS (Status);
-    }
-
-    /* Complete the table descriptor */
-
-    TableDesc.Length = Length;
-    TableDesc.Flags = ACPI_TABLE_ORIGIN_ALLOCATED;
-
     /* Install the new table into the local data structures */
 
-    Status = AcpiTbAddTable (&TableDesc, &TableIndex);
+    ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+
+    Status = AcpiTbInstallStandardTable (ACPI_PTR_TO_PHYSADDR (Table),
+                ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL, TRUE, TRUE,
+                &TableIndex);
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
     if (ACPI_FAILURE (Status))
     {
         /* Delete allocated table buffer */
 
-        AcpiTbDeleteTable (&TableDesc);
+        ACPI_FREE (Table);
+        return_ACPI_STATUS (Status);
+    }
+
+    /*
+     * Note: Now table is "INSTALLED", it must be validated before
+     * loading.
+     */
+    Status = AcpiTbValidateTable (&AcpiGbl_RootTableList.Tables[TableIndex]);
+    if (ACPI_FAILURE (Status))
+    {
         return_ACPI_STATUS (Status);
     }
 
@@ -583,9 +581,6 @@ AcpiExLoadOp (
         return_ACPI_STATUS (Status);
     }
 
-    ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
-    AcpiTbPrintTableHeader (0, TableDesc.Pointer);
-
     /* Remove the reference by added by AcpiExStore above */
 
     AcpiUtRemoveReference (DdbHandle);
@@ -594,7 +589,7 @@ AcpiExLoadOp (
 
     if (AcpiGbl_TableHandler)
     {
-        (void) AcpiGbl_TableHandler (ACPI_TABLE_EVENT_LOAD, TableDesc.Pointer,
+        (void) AcpiGbl_TableHandler (ACPI_TABLE_EVENT_LOAD, Table,
                     AcpiGbl_TableHandlerContext);
     }
 
@@ -627,6 +622,14 @@ AcpiExUnloadTable (
     ACPI_FUNCTION_TRACE (ExUnloadTable);
 
 
+    /*
+     * Temporarily emit a warning so that the ASL for the machine can be
+     * hopefully obtained. This is to say that the Unload() operator is
+     * extremely rare if not completely unused.
+     */
+    ACPI_WARNING ((AE_INFO,
+        "Received request to unload an ACPI table"));
+
     /*
      * Validate the handle
      * Although the handle is partially validated in AcpiExReconfiguration()
diff --git a/sys/contrib/dev/acpica/components/executer/exconvrt.c b/sys/contrib/dev/acpica/components/executer/exconvrt.c
index f6113a59d8f6..f2557c0239ff 100644
--- a/sys/contrib/dev/acpica/components/executer/exconvrt.c
+++ b/sys/contrib/dev/acpica/components/executer/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXCONVRT_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/executer/excreate.c b/sys/contrib/dev/acpica/components/executer/excreate.c
index 55715c2e5b42..224249dea1a1 100644
--- a/sys/contrib/dev/acpica/components/executer/excreate.c
+++ b/sys/contrib/dev/acpica/components/executer/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exdebug.c b/sys/contrib/dev/acpica/components/executer/exdebug.c
index 06f35b815d91..ec8b5a00f5e6 100644
--- a/sys/contrib/dev/acpica/components/executer/exdebug.c
+++ b/sys/contrib/dev/acpica/components/executer/exdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,7 @@ AcpiExDoDebugObject (
     UINT32                  Index)
 {
     UINT32                  i;
+    UINT32                  Timer;
 
 
     ACPI_FUNCTION_TRACE_PTR (ExDoDebugObject, SourceDesc);
@@ -95,13 +96,21 @@ AcpiExDoDebugObject (
         return_VOID;
     }
 
+    /*
+     * We will emit the current timer value (in microseconds) with each
+     * debug output. Only need the lower 26 bits. This allows for 67
+     * million microseconds or 67 seconds before rollover.
+     */
+    Timer = ((UINT32) AcpiOsGetTimer () / 10); /* (100 nanoseconds to microseconds) */
+    Timer &= 0x03FFFFFF;
+
     /*
      * Print line header as long as we are not in the middle of an
      * object display
      */
     if (!((Level > 0) && Index == 0))
     {
-        AcpiOsPrintf ("[ACPI Debug] %*s", Level, " ");
+        AcpiOsPrintf ("[ACPI Debug %.8u] %*s", Timer, Level, " ");
     }
 
     /* Display the index for package output only */
diff --git a/sys/contrib/dev/acpica/components/executer/exdump.c b/sys/contrib/dev/acpica/components/executer/exdump.c
index c37f9ae7995a..153b2c12fbed 100644
--- a/sys/contrib/dev/acpica/components/executer/exdump.c
+++ b/sys/contrib/dev/acpica/components/executer/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -114,13 +114,14 @@ static ACPI_EXDUMP_INFO     AcpiExDumpBuffer[5] =
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpBuffer),         NULL},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Buffer.Length),                "Length"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Buffer.Pointer),               "Pointer"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Buffer.Node),                  "Parent Node"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Buffer.Node),                  "Parent Node"},
     {ACPI_EXD_BUFFER,   0,                                              NULL}
 };
 
-static ACPI_EXDUMP_INFO     AcpiExDumpPackage[5] =
+static ACPI_EXDUMP_INFO     AcpiExDumpPackage[6] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpPackage),        NULL},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Package.Node),                 "Parent Node"},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Package.Flags),                "Flags"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Package.Count),                "Elements"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Package.Elements),             "Element List"},
@@ -130,9 +131,9 @@ static ACPI_EXDUMP_INFO     AcpiExDumpPackage[5] =
 static ACPI_EXDUMP_INFO     AcpiExDumpDevice[4] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpDevice),         NULL},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Device.Handler),               "Handler"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Device.NotifyList[0]),         "System Notify"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Device.NotifyList[1]),         "Device Notify"}
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Device.NotifyList[1]),         "Device Notify"},
+    {ACPI_EXD_HDLR_LIST,ACPI_EXD_OFFSET (Device.Handler),               "Handler"}
 };
 
 static ACPI_EXDUMP_INFO     AcpiExDumpEvent[2] =
@@ -154,33 +155,36 @@ static ACPI_EXDUMP_INFO     AcpiExDumpMethod[9] =
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Method.AmlStart),              "Aml Start"}
 };
 
-static ACPI_EXDUMP_INFO     AcpiExDumpMutex[5] =
+static ACPI_EXDUMP_INFO     AcpiExDumpMutex[6] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpMutex),          NULL},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Mutex.SyncLevel),              "Sync Level"},
+    {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Mutex.OriginalSyncLevel),      "Original Sync Level"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Mutex.OwnerThread),            "Owner Thread"},
     {ACPI_EXD_UINT16,   ACPI_EXD_OFFSET (Mutex.AcquisitionDepth),       "Acquire Depth"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Mutex.OsMutex),                "OsMutex"}
 };
 
-static ACPI_EXDUMP_INFO     AcpiExDumpRegion[7] =
+static ACPI_EXDUMP_INFO     AcpiExDumpRegion[8] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpRegion),         NULL},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Region.SpaceId),               "Space Id"},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Region.Flags),                 "Flags"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Region.Node),                  "Parent Node"},
     {ACPI_EXD_ADDRESS,  ACPI_EXD_OFFSET (Region.Address),               "Address"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Region.Length),                "Length"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Region.Handler),               "Handler"},
+    {ACPI_EXD_HDLR_LIST,ACPI_EXD_OFFSET (Region.Handler),               "Handler"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Region.Next),                  "Next"}
 };
 
-static ACPI_EXDUMP_INFO     AcpiExDumpPower[5] =
+static ACPI_EXDUMP_INFO     AcpiExDumpPower[6] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpPower),          NULL},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (PowerResource.SystemLevel),    "System Level"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (PowerResource.ResourceOrder),  "Resource Order"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (PowerResource.NotifyList[0]),  "System Notify"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (PowerResource.NotifyList[1]),  "Device Notify"}
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (PowerResource.NotifyList[1]),  "Device Notify"},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (PowerResource.Handler),        "Handler"}
 };
 
 static ACPI_EXDUMP_INFO     AcpiExDumpProcessor[7] =
@@ -243,7 +247,7 @@ static ACPI_EXDUMP_INFO     AcpiExDumpReference[8] =
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Reference.TargetType),         "Target Type"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Reference.Value),              "Value"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Reference.Object),             "Object Desc"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Reference.Node),               "Node"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Reference.Node),               "Node"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Reference.Where),              "Where"},
     {ACPI_EXD_REFERENCE,0,                                              NULL}
 };
@@ -252,16 +256,16 @@ static ACPI_EXDUMP_INFO     AcpiExDumpAddressHandler[6] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpAddressHandler), NULL},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (AddressSpace.SpaceId),         "Space Id"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (AddressSpace.Next),            "Next"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (AddressSpace.RegionList),      "Region List"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (AddressSpace.Node),            "Node"},
+    {ACPI_EXD_HDLR_LIST,ACPI_EXD_OFFSET (AddressSpace.Next),            "Next"},
+    {ACPI_EXD_RGN_LIST, ACPI_EXD_OFFSET (AddressSpace.RegionList),      "Region List"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (AddressSpace.Node),            "Node"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (AddressSpace.Context),         "Context"}
 };
 
 static ACPI_EXDUMP_INFO     AcpiExDumpNotify[7] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpNotify),         NULL},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Notify.Node),                  "Node"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Notify.Node),                  "Node"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Notify.HandlerType),           "Handler Type"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Notify.Handler),               "Handler"},
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Notify.Context),               "Context"},
@@ -269,15 +273,32 @@ static ACPI_EXDUMP_INFO     AcpiExDumpNotify[7] =
     {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Notify.Next[1]),               "Next Device Notify"}
 };
 
+static ACPI_EXDUMP_INFO     AcpiExDumpExtra[6] =
+{
+    {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpExtra),          NULL},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Extra.Method_REG),             "_REG Method"},
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (Extra.ScopeNode),              "Scope Node"},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Extra.RegionContext),          "Region Context"},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Extra.AmlStart),               "Aml Start"},
+    {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (Extra.AmlLength),              "Aml Length"}
+};
+
+static ACPI_EXDUMP_INFO     AcpiExDumpData[3] =
+{
+    {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpData),           NULL},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Data.Handler),                 "Handler"},
+    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (Data.Pointer),                 "Raw Data"}
+};
 
 /* Miscellaneous tables */
 
-static ACPI_EXDUMP_INFO     AcpiExDumpCommon[4] =
+static ACPI_EXDUMP_INFO     AcpiExDumpCommon[5] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpCommon),         NULL},
     {ACPI_EXD_TYPE ,    0,                                              NULL},
     {ACPI_EXD_UINT16,   ACPI_EXD_OFFSET (Common.ReferenceCount),        "Reference Count"},
-    {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Common.Flags),                 "Flags"}
+    {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (Common.Flags),                 "Flags"},
+    {ACPI_EXD_LIST,     ACPI_EXD_OFFSET (Common.NextObject),            "Object List"}
 };
 
 static ACPI_EXDUMP_INFO     AcpiExDumpFieldCommon[7] =
@@ -288,16 +309,18 @@ static ACPI_EXDUMP_INFO     AcpiExDumpFieldCommon[7] =
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (CommonField.BitLength),        "Bit Length"},
     {ACPI_EXD_UINT8,    ACPI_EXD_OFFSET (CommonField.StartFieldBitOffset),"Field Bit Offset"},
     {ACPI_EXD_UINT32,   ACPI_EXD_OFFSET (CommonField.BaseByteOffset),   "Base Byte Offset"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_OFFSET (CommonField.Node),             "Parent Node"}
+    {ACPI_EXD_NODE,     ACPI_EXD_OFFSET (CommonField.Node),             "Parent Node"}
 };
 
-static ACPI_EXDUMP_INFO     AcpiExDumpNode[5] =
+static ACPI_EXDUMP_INFO     AcpiExDumpNode[7] =
 {
     {ACPI_EXD_INIT,     ACPI_EXD_TABLE_SIZE (AcpiExDumpNode),           NULL},
     {ACPI_EXD_UINT8,    ACPI_EXD_NSOFFSET (Flags),                      "Flags"},
     {ACPI_EXD_UINT8,    ACPI_EXD_NSOFFSET (OwnerId),                    "Owner Id"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_NSOFFSET (Child),                      "Child List"},
-    {ACPI_EXD_POINTER,  ACPI_EXD_NSOFFSET (Peer),                       "Next Peer"}
+    {ACPI_EXD_LIST,     ACPI_EXD_NSOFFSET (Object),                     "Object List"},
+    {ACPI_EXD_NODE,     ACPI_EXD_NSOFFSET (Parent),                     "Parent"},
+    {ACPI_EXD_NODE,     ACPI_EXD_NSOFFSET (Child),                      "Child"},
+    {ACPI_EXD_NODE,     ACPI_EXD_NSOFFSET (Peer),                       "Peer"}
 };
 
 
@@ -332,7 +355,9 @@ static ACPI_EXDUMP_INFO     *AcpiExDumpInfo[] =
     AcpiExDumpAddressHandler,
     NULL,
     NULL,
-    NULL
+    NULL,
+    AcpiExDumpExtra,
+    AcpiExDumpData
 };
 
 
@@ -359,6 +384,10 @@ AcpiExDumpObject (
     char                    *Name;
     const char              *ReferenceName;
     UINT8                   Count;
+    ACPI_OPERAND_OBJECT     *Start;
+    ACPI_OPERAND_OBJECT     *Data = NULL;
+    ACPI_OPERAND_OBJECT     *Next;
+    ACPI_NAMESPACE_NODE     *Node;
 
 
     if (!Info)
@@ -386,7 +415,8 @@ AcpiExDumpObject (
 
         case ACPI_EXD_TYPE:
 
-            AcpiExOutString  ("Type", AcpiUtGetObjectTypeName (ObjDesc));
+            AcpiOsPrintf ("%20s : %2.2X [%s]\n", "Type",
+                ObjDesc->Common.Type, AcpiUtGetObjectTypeName (ObjDesc));
             break;
 
         case ACPI_EXD_UINT8:
@@ -447,6 +477,120 @@ AcpiExDumpObject (
             AcpiExDumpReferenceObj (ObjDesc);
             break;
 
+        case ACPI_EXD_LIST:
+
+            Start = *ACPI_CAST_PTR (void *, Target);
+            Next = Start;
+
+            AcpiOsPrintf ("%20s : %p", Name, Next);
+            if (Next)
+            {
+                AcpiOsPrintf ("(%s %2.2X)",
+                    AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                while (Next->Common.NextObject)
+                {
+                    if ((Next->Common.Type == ACPI_TYPE_LOCAL_DATA) &&
+                        !Data)
+                    {
+                        Data = Next;
+                    }
+
+                    Next = Next->Common.NextObject;
+                    AcpiOsPrintf ("->%p(%s %2.2X)", Next,
+                        AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                    if ((Next == Start) || (Next == Data))
+                    {
+                        AcpiOsPrintf ("\n**** Error: Object list appears to be circular linked");
+                        break;
+                    }
+                }
+            }
+
+            AcpiOsPrintf ("\n");
+            break;
+
+        case ACPI_EXD_HDLR_LIST:
+
+            Start = *ACPI_CAST_PTR (void *, Target);
+            Next = Start;
+
+            AcpiOsPrintf ("%20s : %p", Name, Next);
+            if (Next)
+            {
+                AcpiOsPrintf ("(%s %2.2X)",
+                    AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                while (Next->AddressSpace.Next)
+                {
+                    if ((Next->Common.Type == ACPI_TYPE_LOCAL_DATA) &&
+                        !Data)
+                    {
+                        Data = Next;
+                    }
+
+                    Next = Next->AddressSpace.Next;
+                    AcpiOsPrintf ("->%p(%s %2.2X)", Next,
+                        AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                    if ((Next == Start) || (Next == Data))
+                    {
+                        AcpiOsPrintf ("\n**** Error: Handler list appears to be circular linked");
+                        break;
+                    }
+                }
+            }
+
+            AcpiOsPrintf ("\n");
+            break;
+
+        case ACPI_EXD_RGN_LIST:
+
+            Start = *ACPI_CAST_PTR (void *, Target);
+            Next = Start;
+
+            AcpiOsPrintf ("%20s : %p", Name, Next);
+            if (Next)
+            {
+                AcpiOsPrintf ("(%s %2.2X)",
+                    AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                while (Next->Region.Next)
+                {
+                    if ((Next->Common.Type == ACPI_TYPE_LOCAL_DATA) &&
+                        !Data)
+                    {
+                        Data = Next;
+                    }
+
+                    Next = Next->Region.Next;
+                    AcpiOsPrintf ("->%p(%s %2.2X)", Next,
+                        AcpiUtGetObjectTypeName (Next), Next->Common.Type);
+
+                    if ((Next == Start) || (Next == Data))
+                    {
+                        AcpiOsPrintf ("\n**** Error: Region list appears to be circular linked");
+                        break;
+                    }
+                }
+            }
+
+            AcpiOsPrintf ("\n");
+            break;
+
+        case ACPI_EXD_NODE:
+
+            Node = *ACPI_CAST_PTR (ACPI_NAMESPACE_NODE *, Target);
+
+            AcpiOsPrintf ("%20s : %p", Name, Node);
+            if (Node)
+            {
+                AcpiOsPrintf (" [%4.4s]", Node->Name.Ascii);
+            }
+            AcpiOsPrintf ("\n");
+            break;
+
         default:
 
             AcpiOsPrintf ("**** Invalid table opcode [%X] ****\n",
@@ -864,9 +1008,8 @@ AcpiExDumpNamespaceNode (
     }
 
     AcpiOsPrintf ("%20s : %4.4s\n", "Name", AcpiUtGetNodeName (Node));
-    AcpiExOutString  ("Type", AcpiUtGetTypeName (Node->Type));
-    AcpiExOutPointer ("Attached Object", AcpiNsGetAttachedObject (Node));
-    AcpiExOutPointer ("Parent", Node->Parent);
+    AcpiOsPrintf ("%20s : %2.2X [%s]\n", "Type",
+        Node->Type, AcpiUtGetTypeName (Node->Type));
 
     AcpiExDumpObject (ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Node),
         AcpiExDumpNode);
@@ -1074,24 +1217,30 @@ AcpiExDumpObjectDescriptor (
         AcpiOsPrintf ("\nAttached Object (%p):\n",
             ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object);
 
-        AcpiExDumpObjectDescriptor (
-            ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object, Flags);
-        return_VOID;
+        ObjDesc = ((ACPI_NAMESPACE_NODE *) ObjDesc)->Object;
+        goto DumpObject;
     }
 
     if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) != ACPI_DESC_TYPE_OPERAND)
     {
         AcpiOsPrintf (
-            "ExDumpObjectDescriptor: %p is not an ACPI operand object: [%s]\n",
+            "%p is not an ACPI operand object: [%s]\n",
             ObjDesc, AcpiUtGetDescriptorName (ObjDesc));
         return_VOID;
     }
 
-    if (ObjDesc->Common.Type > ACPI_TYPE_NS_NODE_MAX)
+    /* Validate the object type */
+
+    if (ObjDesc->Common.Type > ACPI_TYPE_LOCAL_MAX)
     {
+        AcpiOsPrintf ("Not a known object type: %2.2X\n",
+            ObjDesc->Common.Type);
         return_VOID;
     }
 
+
+DumpObject:
+
     /* Common Fields */
 
     AcpiExDumpObject (ObjDesc, AcpiExDumpCommon);
@@ -1099,6 +1248,22 @@ AcpiExDumpObjectDescriptor (
     /* Object-specific fields */
 
     AcpiExDumpObject (ObjDesc, AcpiExDumpInfo[ObjDesc->Common.Type]);
+
+    if (ObjDesc->Common.Type == ACPI_TYPE_REGION)
+    {
+        ObjDesc = ObjDesc->Common.NextObject;
+        if (ObjDesc->Common.Type > ACPI_TYPE_LOCAL_MAX)
+        {
+            AcpiOsPrintf ("Secondary object is not a known object type: %2.2X\n",
+                ObjDesc->Common.Type);
+
+            return_VOID;
+        }
+
+        AcpiOsPrintf ("\nExtra attached Object (%p):\n", ObjDesc);
+        AcpiExDumpObject (ObjDesc, AcpiExDumpInfo[ObjDesc->Common.Type]);
+    }
+
     return_VOID;
 }
 
diff --git a/sys/contrib/dev/acpica/components/executer/exfield.c b/sys/contrib/dev/acpica/components/executer/exfield.c
index 9cab258266d1..2b61790c0a9a 100644
--- a/sys/contrib/dev/acpica/components/executer/exfield.c
+++ b/sys/contrib/dev/acpica/components/executer/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,18 +41,86 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXFIELD_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdispat.h>
 #include <contrib/dev/acpica/include/acinterp.h>
+#include <contrib/dev/acpica/include/amlcode.h>
 
 
 #define _COMPONENT          ACPI_EXECUTER
         ACPI_MODULE_NAME    ("exfield")
 
+/* Local prototypes */
+
+static UINT32
+AcpiExGetSerialAccessLength (
+    UINT32                  AccessorType,
+    UINT32                  AccessLength);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiExGetSerialAccessLength
+ *
+ * PARAMETERS:  AccessorType    - The type of the protocol indicated by region
+ *                                field access attributes
+ *              AccessLength    - The access length of the region field
+ *
+ * RETURN:      Decoded access length
+ *
+ * DESCRIPTION: This routine returns the length of the GenericSerialBus
+ *              protocol bytes
+ *
+ ******************************************************************************/
+
+static UINT32
+AcpiExGetSerialAccessLength (
+    UINT32                  AccessorType,
+    UINT32                  AccessLength)
+{
+    UINT32                  Length;
+
+
+    switch (AccessorType)
+    {
+    case AML_FIELD_ATTRIB_QUICK:
+
+        Length = 0;
+        break;
+
+    case AML_FIELD_ATTRIB_SEND_RCV:
+    case AML_FIELD_ATTRIB_BYTE:
+
+        Length = 1;
+        break;
+
+    case AML_FIELD_ATTRIB_WORD:
+    case AML_FIELD_ATTRIB_WORD_CALL:
+
+        Length = 2;
+        break;
+
+    case AML_FIELD_ATTRIB_MULTIBYTE:
+    case AML_FIELD_ATTRIB_RAW_BYTES:
+    case AML_FIELD_ATTRIB_RAW_PROCESS:
+
+        Length = AccessLength;
+        break;
+
+    case AML_FIELD_ATTRIB_BLOCK:
+    case AML_FIELD_ATTRIB_BLOCK_CALL:
+    default:
+
+        Length = ACPI_GSBUS_BUFFER_SIZE - 2;
+        break;
+    }
+
+    return (Length);
+}
+
 
 /*******************************************************************************
  *
@@ -80,6 +148,7 @@ AcpiExReadDataFromField (
     ACPI_SIZE               Length;
     void                    *Buffer;
     UINT32                  Function;
+    UINT16                  AccessorType;
 
 
     ACPI_FUNCTION_TRACE_PTR (ExReadDataFromField, ObjDesc);
@@ -129,8 +198,19 @@ AcpiExReadDataFromField (
         }
         else if (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GSBUS)
         {
-            Length = ACPI_GSBUS_BUFFER_SIZE;
-            Function = ACPI_READ | (ObjDesc->Field.Attribute << 16);
+            AccessorType = ObjDesc->Field.Attribute;
+            Length = AcpiExGetSerialAccessLength (AccessorType,
+                ObjDesc->Field.AccessLength);
+
+            /*
+             * Add additional 2 bytes for the GenericSerialBus data buffer:
+             *
+             *     Status;      (Byte 0 of the data buffer)
+             *     Length;      (Byte 1 of the data buffer)
+             *     Data[x-1];   (Bytes 2-x of the arbitrary length data buffer)
+             */
+            Length += 2;
+            Function = ACPI_READ | (AccessorType << 16);
         }
         else /* IPMI */
         {
@@ -193,6 +273,39 @@ AcpiExReadDataFromField (
         Buffer = &BufferDesc->Integer.Value;
     }
 
+    if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
+        (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GPIO))
+    {
+        /*
+         * For GPIO (GeneralPurposeIo), the Address will be the bit offset
+         * from the previous Connection() operator, making it effectively a
+         * pin number index. The BitLength is the length of the field, which
+         * is thus the number of pins.
+         */
+        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
+            "GPIO FieldRead [FROM]:  Pin %u Bits %u\n",
+            ObjDesc->Field.PinNumberIndex, ObjDesc->Field.BitLength));
+
+        /* Lock entire transaction if requested */
+
+        AcpiExAcquireGlobalLock (ObjDesc->CommonField.FieldFlags);
+
+        /* Perform the write */
+
+        Status = AcpiExAccessRegion (ObjDesc, 0,
+                    (UINT64 *) Buffer, ACPI_READ);
+        AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiUtRemoveReference (BufferDesc);
+        }
+        else
+        {
+            *RetBufferDesc = BufferDesc;
+        }
+        return_ACPI_STATUS (Status);
+    }
+
     ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
         "FieldRead [TO]:   Obj %p, Type %X, Buf %p, ByteLen %X\n",
         ObjDesc, ObjDesc->Common.Type, Buffer, (UINT32) Length));
@@ -251,6 +364,7 @@ AcpiExWriteDataToField (
     void                    *Buffer;
     ACPI_OPERAND_OBJECT     *BufferDesc;
     UINT32                  Function;
+    UINT16                  AccessorType;
 
 
     ACPI_FUNCTION_TRACE_PTR (ExWriteDataToField, ObjDesc);
@@ -310,8 +424,19 @@ AcpiExWriteDataToField (
         }
         else if (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GSBUS)
         {
-            Length = ACPI_GSBUS_BUFFER_SIZE;
-            Function = ACPI_WRITE | (ObjDesc->Field.Attribute << 16);
+            AccessorType = ObjDesc->Field.Attribute;
+            Length = AcpiExGetSerialAccessLength (AccessorType,
+                ObjDesc->Field.AccessLength);
+
+            /*
+             * Add additional 2 bytes for the GenericSerialBus data buffer:
+             *
+             *     Status;      (Byte 0 of the data buffer)
+             *     Length;      (Byte 1 of the data buffer)
+             *     Data[x-1];   (Bytes 2-x of the arbitrary length data buffer)
+             */
+            Length += 2;
+            Function = ACPI_WRITE | (AccessorType << 16);
         }
         else /* IPMI */
         {
@@ -354,6 +479,41 @@ AcpiExWriteDataToField (
         *ResultDesc = BufferDesc;
         return_ACPI_STATUS (Status);
     }
+    else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) &&
+             (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_GPIO))
+    {
+        /*
+         * For GPIO (GeneralPurposeIo), we will bypass the entire field
+         * mechanism and handoff the bit address and bit width directly to
+         * the handler. The Address will be the bit offset
+         * from the previous Connection() operator, making it effectively a
+         * pin number index. The BitLength is the length of the field, which
+         * is thus the number of pins.
+         */
+        if (SourceDesc->Common.Type != ACPI_TYPE_INTEGER)
+        {
+            return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+        }
+
+        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
+            "GPIO FieldWrite [FROM]: (%s:%X), Val %.8X  [TO]:  Pin %u Bits %u\n",
+            AcpiUtGetTypeName (SourceDesc->Common.Type),
+            SourceDesc->Common.Type, (UINT32) SourceDesc->Integer.Value,
+            ObjDesc->Field.PinNumberIndex, ObjDesc->Field.BitLength));
+
+        Buffer = &SourceDesc->Integer.Value;
+
+        /* Lock entire transaction if requested */
+
+        AcpiExAcquireGlobalLock (ObjDesc->CommonField.FieldFlags);
+
+        /* Perform the write */
+
+        Status = AcpiExAccessRegion (ObjDesc, 0,
+                    (UINT64 *) Buffer, ACPI_WRITE);
+        AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags);
+        return_ACPI_STATUS (Status);
+    }
 
     /* Get a pointer to the data to be written */
 
diff --git a/sys/contrib/dev/acpica/components/executer/exfldio.c b/sys/contrib/dev/acpica/components/executer/exfldio.c
index c355b7406d9b..5586cad20080 100644
--- a/sys/contrib/dev/acpica/components/executer/exfldio.c
+++ b/sys/contrib/dev/acpica/components/executer/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXFLDIO_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/executer/exmisc.c b/sys/contrib/dev/acpica/components/executer/exmisc.c
index 2abbe2986f2e..b9b331d10d72 100644
--- a/sys/contrib/dev/acpica/components/executer/exmisc.c
+++ b/sys/contrib/dev/acpica/components/executer/exmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exmutex.c b/sys/contrib/dev/acpica/components/executer/exmutex.c
index a6e5e14f03ed..c14d3c049798 100644
--- a/sys/contrib/dev/acpica/components/executer/exmutex.c
+++ b/sys/contrib/dev/acpica/components/executer/exmutex.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exnames.c b/sys/contrib/dev/acpica/components/executer/exnames.c
index 9c11e7f951f3..af5aa7ec0d74 100644
--- a/sys/contrib/dev/acpica/components/executer/exnames.c
+++ b/sys/contrib/dev/acpica/components/executer/exnames.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg1.c b/sys/contrib/dev/acpica/components/executer/exoparg1.c
index cd917ef5371c..849c442ed15f 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg1.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg1.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg2.c b/sys/contrib/dev/acpica/components/executer/exoparg2.c
index 6f987533e1cb..b11035596bc0 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg2.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXOPARG2_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg3.c b/sys/contrib/dev/acpica/components/executer/exoparg3.c
index b9c1c1a221bf..79deb8757923 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg3.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg3.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg6.c b/sys/contrib/dev/acpica/components/executer/exoparg6.c
index ae675d398a6b..3191f66da912 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg6.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg6.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exprep.c b/sys/contrib/dev/acpica/components/executer/exprep.c
index 33c2049ef1fd..bc270b8b6bc1 100644
--- a/sys/contrib/dev/acpica/components/executer/exprep.c
+++ b/sys/contrib/dev/acpica/components/executer/exprep.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -515,6 +515,8 @@ AcpiExPrepFieldValue (
             ObjDesc->Field.ResourceLength = Info->ResourceLength;
         }
 
+        ObjDesc->Field.PinNumberIndex = Info->PinNumberIndex;
+
         /* Allow full data read from EC address space */
 
         if ((ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_EC) &&
diff --git a/sys/contrib/dev/acpica/components/executer/exregion.c b/sys/contrib/dev/acpica/components/executer/exregion.c
index 753cba6858a1..0b5c6fc56121 100644
--- a/sys/contrib/dev/acpica/components/executer/exregion.c
+++ b/sys/contrib/dev/acpica/components/executer/exregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXREGION_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/executer/exresnte.c b/sys/contrib/dev/acpica/components/executer/exresnte.c
index 267801c5c942..2aeac6cfcf6f 100644
--- a/sys/contrib/dev/acpica/components/executer/exresnte.c
+++ b/sys/contrib/dev/acpica/components/executer/exresnte.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -134,8 +134,8 @@ AcpiExResolveNodeToValue (
 
     if (!SourceDesc)
     {
-        ACPI_ERROR ((AE_INFO, "No object attached to node %p",
-            Node));
+        ACPI_ERROR ((AE_INFO, "No object attached to node [%4.4s] %p",
+            Node->Name.Ascii, Node));
         return_ACPI_STATUS (AE_AML_NO_OPERAND);
     }
 
diff --git a/sys/contrib/dev/acpica/components/executer/exresolv.c b/sys/contrib/dev/acpica/components/executer/exresolv.c
index 837ba872609b..b2aa570b2869 100644
--- a/sys/contrib/dev/acpica/components/executer/exresolv.c
+++ b/sys/contrib/dev/acpica/components/executer/exresolv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exresop.c b/sys/contrib/dev/acpica/components/executer/exresop.c
index 24df299c7cb2..e861c26f5060 100644
--- a/sys/contrib/dev/acpica/components/executer/exresop.c
+++ b/sys/contrib/dev/acpica/components/executer/exresop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exstore.c b/sys/contrib/dev/acpica/components/executer/exstore.c
index 894af0bc7643..fe0cde83a907 100644
--- a/sys/contrib/dev/acpica/components/executer/exstore.c
+++ b/sys/contrib/dev/acpica/components/executer/exstore.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,12 @@ AcpiExStoreObjectToIndex (
     ACPI_OPERAND_OBJECT     *DestDesc,
     ACPI_WALK_STATE         *WalkState);
 
+static ACPI_STATUS
+AcpiExStoreDirectToNode (
+    ACPI_OPERAND_OBJECT     *SourceDesc,
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_WALK_STATE         *WalkState);
+
 
 /*******************************************************************************
  *
@@ -393,7 +399,11 @@ AcpiExStoreObjectToIndex (
  *              When storing into an object the data is converted to the
  *              target object type then stored in the object. This means
  *              that the target object type (for an initialized target) will
- *              not be changed by a store operation.
+ *              not be changed by a store operation. A CopyObject can change
+ *              the target type, however.
+ *
+ *              The ImplicitConversion flag is set to NO/FALSE only when
+ *              storing to an ArgX -- as per the rules of the ACPI spec.
  *
  *              Assumes parameters are already validated.
  *
@@ -420,7 +430,7 @@ AcpiExStoreObjectToNode (
     TargetType = AcpiNsGetType (Node);
     TargetDesc = AcpiNsGetAttachedObject (Node);
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Storing %p(%s) into node %p(%s)\n",
+    ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Storing %p (%s) to node %p (%s)\n",
         SourceDesc, AcpiUtGetObjectTypeName (SourceDesc),
               Node, AcpiUtGetTypeName (TargetType)));
 
@@ -434,49 +444,35 @@ AcpiExStoreObjectToNode (
         return_ACPI_STATUS (Status);
     }
 
-    /* If no implicit conversion, drop into the default case below */
-
-    if ((!ImplicitConversion) ||
-          ((WalkState->Opcode == AML_COPY_OP) &&
-           (TargetType != ACPI_TYPE_LOCAL_REGION_FIELD) &&
-           (TargetType != ACPI_TYPE_LOCAL_BANK_FIELD) &&
-           (TargetType != ACPI_TYPE_LOCAL_INDEX_FIELD)))
-    {
-        /*
-         * Force execution of default (no implicit conversion). Note:
-         * CopyObject does not perform an implicit conversion, as per the ACPI
-         * spec -- except in case of region/bank/index fields -- because these
-         * objects must retain their original type permanently.
-         */
-        TargetType = ACPI_TYPE_ANY;
-    }
-
     /* Do the actual store operation */
 
     switch (TargetType)
     {
-    case ACPI_TYPE_BUFFER_FIELD:
-    case ACPI_TYPE_LOCAL_REGION_FIELD:
-    case ACPI_TYPE_LOCAL_BANK_FIELD:
-    case ACPI_TYPE_LOCAL_INDEX_FIELD:
-
-        /* For fields, copy the source data to the target field. */
-
-        Status = AcpiExWriteDataToField (SourceDesc, TargetDesc,
-                    &WalkState->ResultObj);
-        break;
-
     case ACPI_TYPE_INTEGER:
     case ACPI_TYPE_STRING:
     case ACPI_TYPE_BUFFER:
         /*
-         * These target types are all of type Integer/String/Buffer, and
-         * therefore support implicit conversion before the store.
-         *
-         * Copy and/or convert the source object to a new target object
+         * The simple data types all support implicit source operand
+         * conversion before the store.
          */
+
+        if ((WalkState->Opcode == AML_COPY_OP) ||
+            !ImplicitConversion)
+        {
+            /*
+             * However, CopyObject and Stores to ArgX do not perform
+             * an implicit conversion, as per the ACPI specification.
+             * A direct store is performed instead.
+             */
+            Status = AcpiExStoreDirectToNode (SourceDesc, Node,
+                WalkState);
+            break;
+        }
+
+        /* Store with implicit source operand conversion support */
+
         Status = AcpiExStoreObjectToObject (SourceDesc, TargetDesc,
-                    &NewDesc, WalkState);
+            &NewDesc, WalkState);
         if (ACPI_FAILURE (Status))
         {
             return_ACPI_STATUS (Status);
@@ -489,11 +485,12 @@ AcpiExStoreObjectToNode (
              * the Name's type to that of the value being stored in it.
              * SourceDesc reference count is incremented by AttachObject.
              *
-             * Note: This may change the type of the node if an explicit store
-             * has been performed such that the node/object type has been
-             * changed.
+             * Note: This may change the type of the node if an explicit
+             * store has been performed such that the node/object type
+             * has been changed.
              */
-            Status = AcpiNsAttachObject (Node, NewDesc, NewDesc->Common.Type);
+            Status = AcpiNsAttachObject (Node, NewDesc,
+                NewDesc->Common.Type);
 
             ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                 "Store %s into %s via Convert/Attach\n",
@@ -502,33 +499,86 @@ AcpiExStoreObjectToNode (
         }
         break;
 
+    case ACPI_TYPE_BUFFER_FIELD:
+    case ACPI_TYPE_LOCAL_REGION_FIELD:
+    case ACPI_TYPE_LOCAL_BANK_FIELD:
+    case ACPI_TYPE_LOCAL_INDEX_FIELD:
+        /*
+         * For all fields, always write the source data to the target
+         * field. Any required implicit source operand conversion is
+         * performed in the function below as necessary. Note, field
+         * objects must retain their original type permanently.
+         */
+        Status = AcpiExWriteDataToField (SourceDesc, TargetDesc,
+            &WalkState->ResultObj);
+        break;
+
     default:
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-            "Storing [%s] (%p) directly into node [%s] (%p)"
-            " with no implicit conversion\n",
-            AcpiUtGetObjectTypeName (SourceDesc), SourceDesc,
-            AcpiUtGetObjectTypeName (TargetDesc), Node));
-
         /*
          * No conversions for all other types. Directly store a copy of
-         * the source object. NOTE: This is a departure from the ACPI
-         * spec, which states "If conversion is impossible, abort the
-         * running control method".
+         * the source object. This is the ACPI spec-defined behavior for
+         * the CopyObject operator.
          *
-         * This code implements "If conversion is impossible, treat the
-         * Store operation as a CopyObject".
+         * NOTE: For the Store operator, this is a departure from the
+         * ACPI spec, which states "If conversion is impossible, abort
+         * the running control method". Instead, this code implements
+         * "If conversion is impossible, treat the Store operation as
+         * a CopyObject".
          */
-        Status = AcpiUtCopyIobjectToIobject (SourceDesc, &NewDesc, WalkState);
-        if (ACPI_FAILURE (Status))
-        {
-            return_ACPI_STATUS (Status);
-        }
-
-        Status = AcpiNsAttachObject (Node, NewDesc, NewDesc->Common.Type);
-        AcpiUtRemoveReference (NewDesc);
+        Status = AcpiExStoreDirectToNode (SourceDesc, Node,
+            WalkState);
         break;
     }
 
     return_ACPI_STATUS (Status);
 }
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiExStoreDirectToNode
+ *
+ * PARAMETERS:  SourceDesc              - Value to be stored
+ *              Node                    - Named object to receive the value
+ *              WalkState               - Current walk state
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: "Store" an object directly to a node. This involves a copy
+ *              and an attach.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiExStoreDirectToNode (
+    ACPI_OPERAND_OBJECT     *SourceDesc,
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_WALK_STATE         *WalkState)
+{
+    ACPI_STATUS             Status;
+    ACPI_OPERAND_OBJECT     *NewDesc;
+
+
+    ACPI_FUNCTION_TRACE (ExStoreDirectToNode);
+
+
+    ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+        "Storing [%s] (%p) directly into node [%s] (%p)"
+        " with no implicit conversion\n",
+        AcpiUtGetObjectTypeName (SourceDesc), SourceDesc,
+        AcpiUtGetTypeName (Node->Type), Node));
+
+    /* Copy the source object to a new object */
+
+    Status = AcpiUtCopyIobjectToIobject (SourceDesc, &NewDesc, WalkState);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    /* Attach the new object to the node */
+
+    Status = AcpiNsAttachObject (Node, NewDesc, NewDesc->Common.Type);
+    AcpiUtRemoveReference (NewDesc);
+    return_ACPI_STATUS (Status);
+}
diff --git a/sys/contrib/dev/acpica/components/executer/exstoren.c b/sys/contrib/dev/acpica/components/executer/exstoren.c
index c0302c1b7c02..803b2b68853b 100644
--- a/sys/contrib/dev/acpica/components/executer/exstoren.c
+++ b/sys/contrib/dev/acpica/components/executer/exstoren.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exstorob.c b/sys/contrib/dev/acpica/components/executer/exstorob.c
index c68263c60190..560a634869a9 100644
--- a/sys/contrib/dev/acpica/components/executer/exstorob.c
+++ b/sys/contrib/dev/acpica/components/executer/exstorob.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/executer/exsystem.c b/sys/contrib/dev/acpica/components/executer/exsystem.c
index cc18d805ca06..790813c842af 100644
--- a/sys/contrib/dev/acpica/components/executer/exsystem.c
+++ b/sys/contrib/dev/acpica/components/executer/exsystem.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@ AcpiExSystemWaitSemaphore (
     {
         /* We must wait, so unlock the interpreter */
 
-        AcpiExRelinquishInterpreter ();
+        AcpiExExitInterpreter ();
 
         Status = AcpiOsWaitSemaphore (Semaphore, 1, Timeout);
 
@@ -97,7 +97,7 @@ AcpiExSystemWaitSemaphore (
 
         /* Reacquire the interpreter */
 
-       AcpiExReacquireInterpreter ();
+       AcpiExEnterInterpreter ();
     }
 
     return_ACPI_STATUS (Status);
@@ -140,7 +140,7 @@ AcpiExSystemWaitMutex (
     {
         /* We must wait, so unlock the interpreter */
 
-        AcpiExRelinquishInterpreter ();
+        AcpiExExitInterpreter ();
 
         Status = AcpiOsAcquireMutex (Mutex, Timeout);
 
@@ -150,7 +150,7 @@ AcpiExSystemWaitMutex (
 
         /* Reacquire the interpreter */
 
-        AcpiExReacquireInterpreter ();
+        AcpiExEnterInterpreter ();
     }
 
     return_ACPI_STATUS (Status);
@@ -227,7 +227,7 @@ AcpiExSystemDoSleep (
 
     /* Since this thread will sleep, we must release the interpreter */
 
-    AcpiExRelinquishInterpreter ();
+    AcpiExExitInterpreter ();
 
     /*
      * For compatibility with other ACPI implementations and to prevent
@@ -242,7 +242,7 @@ AcpiExSystemDoSleep (
 
     /* And now we must get the interpreter again */
 
-    AcpiExReacquireInterpreter ();
+    AcpiExEnterInterpreter ();
     return (AE_OK);
 }
 
diff --git a/sys/contrib/dev/acpica/components/executer/exutils.c b/sys/contrib/dev/acpica/components/executer/exutils.c
index 29abfd1d618b..1958c19f53ef 100644
--- a/sys/contrib/dev/acpica/components/executer/exutils.c
+++ b/sys/contrib/dev/acpica/components/executer/exutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,42 +110,6 @@ AcpiExEnterInterpreter (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExReacquireInterpreter
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Reacquire the interpreter execution region from within the
- *              interpreter code. Failure to enter the interpreter region is a
- *              fatal system error. Used in conjunction with
- *              RelinquishInterpreter
- *
- ******************************************************************************/
-
-void
-AcpiExReacquireInterpreter (
-    void)
-{
-    ACPI_FUNCTION_TRACE (ExReacquireInterpreter);
-
-
-    /*
-     * If the global serialized flag is set, do not release the interpreter,
-     * since it was not actually released by AcpiExRelinquishInterpreter.
-     * This forces the interpreter to be single threaded.
-     */
-    if (!AcpiGbl_AllMethodsSerialized)
-    {
-        AcpiExEnterInterpreter ();
-    }
-
-    return_VOID;
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiExExitInterpreter
@@ -156,7 +120,16 @@ AcpiExReacquireInterpreter (
  *
  * DESCRIPTION: Exit the interpreter execution region. This is the top level
  *              routine used to exit the interpreter when all processing has
- *              been completed.
+ *              been completed, or when the method blocks.
+ *
+ * Cases where the interpreter is unlocked internally:
+ *      1) Method will be blocked on a Sleep() AML opcode
+ *      2) Method will be blocked on an Acquire() AML opcode
+ *      3) Method will be blocked on a Wait() AML opcode
+ *      4) Method will be blocked to acquire the global lock
+ *      5) Method will be blocked waiting to execute a serialized control
+ *          method that is currently executing
+ *      6) About to invoke a user-installed opregion handler
  *
  ******************************************************************************/
 
@@ -180,49 +153,6 @@ AcpiExExitInterpreter (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AcpiExRelinquishInterpreter
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Exit the interpreter execution region, from within the
- *              interpreter - before attempting an operation that will possibly
- *              block the running thread.
- *
- * Cases where the interpreter is unlocked internally
- *      1) Method to be blocked on a Sleep() AML opcode
- *      2) Method to be blocked on an Acquire() AML opcode
- *      3) Method to be blocked on a Wait() AML opcode
- *      4) Method to be blocked to acquire the global lock
- *      5) Method to be blocked waiting to execute a serialized control method
- *          that is currently executing
- *      6) About to invoke a user-installed opregion handler
- *
- ******************************************************************************/
-
-void
-AcpiExRelinquishInterpreter (
-    void)
-{
-    ACPI_FUNCTION_TRACE (ExRelinquishInterpreter);
-
-
-    /*
-     * If the global serialized flag is set, do not release the interpreter.
-     * This forces the interpreter to be single threaded.
-     */
-    if (!AcpiGbl_AllMethodsSerialized)
-    {
-        AcpiExExitInterpreter ();
-    }
-
-    return_VOID;
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiExTruncateFor32bitTable
diff --git a/sys/contrib/dev/acpica/components/hardware/hwacpi.c b/sys/contrib/dev/acpica/components/hardware/hwacpi.c
index 3cd3a446b177..947679589636 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwacpi.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwacpi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/hardware/hwesleep.c b/sys/contrib/dev/acpica/components/hardware/hwesleep.c
index 671780113e23..d125bccb372c 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwesleep.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwesleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/hardware/hwgpe.c b/sys/contrib/dev/acpica/components/hardware/hwgpe.c
index 99c0de6a21d0..e00aeb24d761 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwgpe.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -241,6 +241,14 @@ AcpiHwGetGpeStatus (
         return (AE_BAD_PARAMETER);
     }
 
+    /* GPE currently handled? */
+
+    if ((GpeEventInfo->Flags & ACPI_GPE_DISPATCH_MASK) !=
+            ACPI_GPE_DISPATCH_NONE)
+    {
+        LocalEventStatus |= ACPI_EVENT_FLAG_HAS_HANDLER;
+    }
+
     /* Get the info block for the entire GPE register */
 
     GpeRegisterInfo = GpeEventInfo->RegisterInfo;
diff --git a/sys/contrib/dev/acpica/components/hardware/hwpci.c b/sys/contrib/dev/acpica/components/hardware/hwpci.c
index a89a3dd831e9..d14bf755987b 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwpci.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwpci.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -161,11 +161,12 @@ AcpiHwDerivePciId (
         /* Walk the list, updating the PCI device/function/bus numbers */
 
         Status = AcpiHwProcessPciList (PciId, ListHead);
+
+        /* Delete the list */
+
+        AcpiHwDeletePciList (ListHead);
     }
 
-    /* Always delete the list */
-
-    AcpiHwDeletePciList (ListHead);
     return_ACPI_STATUS (Status);
 }
 
@@ -213,6 +214,9 @@ AcpiHwBuildPciList (
         Status = AcpiGetParent (CurrentDevice, &ParentDevice);
         if (ACPI_FAILURE (Status))
         {
+            /* Must delete the list before exit */
+
+            AcpiHwDeletePciList (*ReturnListHead);
             return (Status);
         }
 
@@ -227,6 +231,9 @@ AcpiHwBuildPciList (
         ListElement = ACPI_ALLOCATE (sizeof (ACPI_PCI_DEVICE));
         if (!ListElement)
         {
+            /* Must delete the list before exit */
+
+            AcpiHwDeletePciList (*ReturnListHead);
             return (AE_NO_MEMORY);
         }
 
diff --git a/sys/contrib/dev/acpica/components/hardware/hwregs.c b/sys/contrib/dev/acpica/components/hardware/hwregs.c
index 9c3f2a95159b..155cb4936352 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwregs.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwregs.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -310,17 +310,19 @@ AcpiHwClearAcpiStatus (
 
     Status = AcpiHwRegisterWrite (ACPI_REGISTER_PM1_STATUS,
                 ACPI_BITMASK_ALL_FIXED_STATUS);
+
+    AcpiOsReleaseLock (AcpiGbl_HardwareLock, LockFlags);
+
     if (ACPI_FAILURE (Status))
     {
-        goto UnlockAndExit;
+        goto Exit;
     }
 
     /* Clear the GPE Bits in all GPE registers in all GPE blocks */
 
     Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock, NULL);
 
-UnlockAndExit:
-    AcpiOsReleaseLock (AcpiGbl_HardwareLock, LockFlags);
+Exit:
     return_ACPI_STATUS (Status);
 }
 
diff --git a/sys/contrib/dev/acpica/components/hardware/hwsleep.c b/sys/contrib/dev/acpica/components/hardware/hwsleep.c
index 0e6691a31aea..d4b346b06a83 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwsleep.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,6 @@ AcpiHwLegacySleep (
     UINT32                  Pm1aControl;
     UINT32                  Pm1bControl;
     UINT32                  InValue;
-    UINT32                  Retry;
     ACPI_STATUS             Status;
 
 
@@ -192,7 +191,6 @@ AcpiHwLegacySleep (
 
     /* Wait for transition back to Working State */
 
-    Retry = 1000;
     do
     {
         Status = AcpiReadBitRegister (ACPI_BITREG_WAKE_STATUS, &InValue);
@@ -201,18 +199,6 @@ AcpiHwLegacySleep (
             return_ACPI_STATUS (Status);
         }
 
-        if (AcpiGbl_EnableInterpreterSlack)
-        {
-            /*
-             * Some BIOSs don't set WAK_STS at all.  Give up waiting after
-             * 1000 retries if it still isn't set.
-             */
-            if (Retry-- == 0)
-            {
-                break;
-            }
-        }
-
     } while (!InValue);
 
     return_ACPI_STATUS (AE_OK);
diff --git a/sys/contrib/dev/acpica/components/hardware/hwtimer.c b/sys/contrib/dev/acpica/components/hardware/hwtimer.c
index e1030143020f..643cc6771b1a 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwtimer.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwtimer.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#define EXPORT_ACPI_INTERFACES
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 
diff --git a/sys/contrib/dev/acpica/components/hardware/hwvalid.c b/sys/contrib/dev/acpica/components/hardware/hwvalid.c
index 85a87d176ca9..c8046cd0c2ac 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwvalid.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwvalid.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/hardware/hwxface.c b/sys/contrib/dev/acpica/components/hardware/hwxface.c
index 8e0e5be0bbc3..0ec2f5c96eef 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwxface.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#define EXPORT_ACPI_INTERFACES
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acnamesp.h>
@@ -90,9 +92,15 @@ AcpiReset (
          * For I/O space, write directly to the OSL. This bypasses the port
          * validation mechanism, which may block a valid write to the reset
          * register.
+         *
+         * NOTE:
+         * The ACPI spec requires the reset register width to be 8, so we
+         * hardcode it here and ignore the FADT value. This maintains
+         * compatibility with other ACPI implementations that have allowed
+         * BIOS code with bad register width values to go unnoticed.
          */
         Status = AcpiOsWritePort ((ACPI_IO_ADDRESS) ResetReg->Address,
-                    AcpiGbl_FADT.ResetValue, ResetReg->BitWidth);
+            AcpiGbl_FADT.ResetValue, ACPI_RESET_REGISTER_WIDTH);
     }
     else
     {
diff --git a/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c b/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
index 8c3ec4111466..dfc712b34871 100644
--- a/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
+++ b/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#define EXPORT_ACPI_INTERFACES
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 
diff --git a/sys/contrib/dev/acpica/components/namespace/nsaccess.c b/sys/contrib/dev/acpica/components/namespace/nsaccess.c
index 523e0920b655..d6f1800fe3ef 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsaccess.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsalloc.c b/sys/contrib/dev/acpica/components/namespace/nsalloc.c
index ecec172ab1b5..a107f7796ba0 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsalloc.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSALLOC_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -121,6 +120,7 @@ AcpiNsDeleteNode (
     ACPI_NAMESPACE_NODE     *Node)
 {
     ACPI_OPERAND_OBJECT     *ObjDesc;
+    ACPI_OPERAND_OBJECT     *NextDesc;
 
 
     ACPI_FUNCTION_NAME (NsDeleteNode);
@@ -131,12 +131,13 @@ AcpiNsDeleteNode (
     AcpiNsDetachObject (Node);
 
     /*
-     * Delete an attached data object if present (an object that was created
-     * and attached via AcpiAttachData). Note: After any normal object is
-     * detached above, the only possible remaining object is a data object.
+     * Delete an attached data object list if present (objects that were
+     * attached via AcpiAttachData). Note: After any normal object is
+     * detached above, the only possible remaining object(s) are data
+     * objects, in a linked list.
      */
     ObjDesc = Node->Object;
-    if (ObjDesc &&
+    while (ObjDesc &&
         (ObjDesc->Common.Type == ACPI_TYPE_LOCAL_DATA))
     {
         /* Invoke the attached data deletion handler if present */
@@ -146,7 +147,16 @@ AcpiNsDeleteNode (
             ObjDesc->Data.Handler (Node, ObjDesc->Data.Pointer);
         }
 
+        NextDesc = ObjDesc->Common.NextObject;
         AcpiUtRemoveReference (ObjDesc);
+        ObjDesc = NextDesc;
+    }
+
+    /* Special case for the statically allocated root node */
+
+    if (Node == AcpiGbl_RootNode)
+    {
+        return;
     }
 
     /* Now we can delete the node */
diff --git a/sys/contrib/dev/acpica/components/namespace/nsarguments.c b/sys/contrib/dev/acpica/components/namespace/nsarguments.c
index 52ab8a99122f..98e831d7bf08 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsarguments.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsarguments.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsconvert.c b/sys/contrib/dev/acpica/components/namespace/nsconvert.c
index 4b12d3db9359..2b39776d650e 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsconvert.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsconvert.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsdump.c b/sys/contrib/dev/acpica/components/namespace/nsdump.c
index 0ec564273225..ff1f10f94ebc 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsdump.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -748,6 +748,13 @@ AcpiNsDumpOneObjectPath (
     }
 
     Node = AcpiNsValidateHandle (ObjHandle);
+    if (!Node)
+    {
+        /* Ignore bad node during namespace walk */
+
+        return (AE_OK);
+    }
+
     Pathname = AcpiNsGetExternalPathname (Node);
 
     PathIndent = 1;
diff --git a/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c b/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
index 868b104ca995..a130a03f75eb 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nseval.c b/sys/contrib/dev/acpica/components/namespace/nseval.c
index 57098f41e502..fa4465ba6941 100644
--- a/sys/contrib/dev/acpica/components/namespace/nseval.c
+++ b/sys/contrib/dev/acpica/components/namespace/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsinit.c b/sys/contrib/dev/acpica/components/namespace/nsinit.c
index cd5044783be6..f40ff58341d8 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsinit.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSXFINIT_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -129,9 +128,8 @@ AcpiNsInitializeObjects (
         Info.PackageInit,   Info.PackageCount, Info.ObjectCount));
 
     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-        "%u Control Methods found\n", Info.MethodCount));
-    ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-        "%u Op Regions found\n", Info.OpRegionCount));
+        "%u Control Methods found\n%u Op Regions found\n",
+        Info.MethodCount, Info.OpRegionCount));
 
     return_ACPI_STATUS (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/components/namespace/nsload.c b/sys/contrib/dev/acpica/components/namespace/nsload.c
index d29a89148bc9..71c3cfc66a70 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsload.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -148,12 +148,12 @@ AcpiNsLoadTable (
      * parse trees.
      */
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-        "**** Begin Table Method Parsing and Object Initialization\n"));
+        "**** Begin Table Object Initialization\n"));
 
     Status = AcpiDsInitializeObjects (TableIndex, Node);
 
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-        "**** Completed Table Method Parsing and Object Initialization\n"));
+        "**** Completed Table Object Initialization\n"));
 
     return_ACPI_STATUS (Status);
 }
diff --git a/sys/contrib/dev/acpica/components/namespace/nsnames.c b/sys/contrib/dev/acpica/components/namespace/nsnames.c
index cd4d4404433e..2b1057ddf54d 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsnames.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsobject.c b/sys/contrib/dev/acpica/components/namespace/nsobject.c
index b1d1f01220ed..24d546727f90 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsobject.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSOBJECT_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -247,17 +246,32 @@ AcpiNsDetachObject (
         }
     }
 
-    /* Clear the entry in all cases */
+    /* Clear the Node entry in all cases */
 
     Node->Object = NULL;
     if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) == ACPI_DESC_TYPE_OPERAND)
     {
+        /* Unlink object from front of possible object list */
+
         Node->Object = ObjDesc->Common.NextObject;
+
+        /* Handle possible 2-descriptor object */
+
         if (Node->Object &&
-           ((Node->Object)->Common.Type != ACPI_TYPE_LOCAL_DATA))
+           (Node->Object->Common.Type != ACPI_TYPE_LOCAL_DATA))
         {
             Node->Object = Node->Object->Common.NextObject;
         }
+
+        /*
+         * Detach the object from any data objects (which are still held by
+         * the namespace node)
+         */
+        if (ObjDesc->Common.NextObject &&
+           ((ObjDesc->Common.NextObject)->Common.Type == ACPI_TYPE_LOCAL_DATA))
+        {
+           ObjDesc->Common.NextObject = NULL;
+        }
     }
 
     /* Reset the node type to untyped */
diff --git a/sys/contrib/dev/acpica/components/namespace/nsparse.c b/sys/contrib/dev/acpica/components/namespace/nsparse.c
index f327f2605db6..8e6bd0abb031 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsparse.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nspredef.c b/sys/contrib/dev/acpica/components/namespace/nspredef.c
index 74ed8f7b82e1..66708709bfd0 100644
--- a/sys/contrib/dev/acpica/components/namespace/nspredef.c
+++ b/sys/contrib/dev/acpica/components/namespace/nspredef.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsprepkg.c b/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
index cccd2c10772a..62c3847be88e 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -144,13 +144,13 @@ AcpiNsCheckPackage (
      * Decode the type of the expected package contents
      *
      * PTYPE1 packages contain no subpackages
-     * PTYPE2 packages contain sub-packages
+     * PTYPE2 packages contain subpackages
      */
     switch (Package->RetInfo.Type)
     {
     case ACPI_PTYPE1_FIXED:
         /*
-         * The package count is fixed and there are no sub-packages
+         * The package count is fixed and there are no subpackages
          *
          * If package is too small, exit.
          * If package is larger than expected, issue warning but continue
@@ -177,7 +177,7 @@ AcpiNsCheckPackage (
 
     case ACPI_PTYPE1_VAR:
         /*
-         * The package count is variable, there are no sub-packages, and all
+         * The package count is variable, there are no subpackages, and all
          * elements must be of the same type
          */
         for (i = 0; i < Count; i++)
@@ -194,7 +194,7 @@ AcpiNsCheckPackage (
 
     case ACPI_PTYPE1_OPTION:
         /*
-         * The package count is variable, there are no sub-packages. There are
+         * The package count is variable, there are no subpackages. There are
          * a fixed number of required elements, and a variable number of
          * optional elements.
          *
@@ -250,14 +250,14 @@ AcpiNsCheckPackage (
         Elements++;
         Count--;
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         Status = AcpiNsCheckPackageList (Info, Package, Elements, Count);
         break;
 
     case ACPI_PTYPE2_PKG_COUNT:
 
-        /* First element is the (Integer) count of sub-packages to follow */
+        /* First element is the (Integer) count of subpackages to follow */
 
         Status = AcpiNsCheckObjectType (Info, Elements,
                     ACPI_RTYPE_INTEGER, 0);
@@ -279,7 +279,7 @@ AcpiNsCheckPackage (
         Count = ExpectedCount;
         Elements++;
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         Status = AcpiNsCheckPackageList (Info, Package, Elements, Count);
         break;
@@ -291,9 +291,9 @@ AcpiNsCheckPackage (
     case ACPI_PTYPE2_FIX_VAR:
         /*
          * These types all return a single Package that consists of a
-         * variable number of sub-Packages.
+         * variable number of subpackages.
          *
-         * First, ensure that the first element is a sub-Package. If not,
+         * First, ensure that the first element is a subpackage. If not,
          * the BIOS may have incorrectly returned the object as a single
          * package instead of a Package of Packages (a common error if
          * there is only one entry). We may be able to repair this by
@@ -316,11 +316,51 @@ AcpiNsCheckPackage (
             Count = 1;
         }
 
-        /* Examine the sub-packages */
+        /* Examine the subpackages */
 
         Status = AcpiNsCheckPackageList (Info, Package, Elements, Count);
         break;
 
+    case ACPI_PTYPE2_UUID_PAIR:
+
+        /* The package must contain pairs of (UUID + type) */
+
+        if (Count & 1)
+        {
+            ExpectedCount = Count + 1;
+            goto PackageTooSmall;
+        }
+
+        while (Count > 0)
+        {
+            Status = AcpiNsCheckObjectType(Info, Elements,
+                        Package->RetInfo.ObjectType1, 0);
+            if (ACPI_FAILURE(Status))
+            {
+                return (Status);
+            }
+
+            /* Validate length of the UUID buffer */
+
+            if ((*Elements)->Buffer.Length != 16)
+            {
+                ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
+                    Info->NodeFlags, "Invalid length for UUID Buffer"));
+                return (AE_AML_OPERAND_VALUE);
+            }
+
+            Status = AcpiNsCheckObjectType(Info, Elements + 1,
+                        Package->RetInfo.ObjectType2, 0);
+            if (ACPI_FAILURE(Status))
+            {
+                return (Status);
+            }
+
+            Elements += 2;
+            Count -= 2;
+         }
+         break;
+
     default:
 
         /* Should not get here if predefined info table is correct */
@@ -379,9 +419,9 @@ AcpiNsCheckPackageList (
 
 
     /*
-     * Validate each sub-Package in the parent Package
+     * Validate each subpackage in the parent Package
      *
-     * NOTE: assumes list of sub-packages contains no NULL elements.
+     * NOTE: assumes list of subpackages contains no NULL elements.
      * Any NULL elements should have been removed by earlier call
      * to AcpiNsRemoveNullElements.
      */
@@ -400,7 +440,7 @@ AcpiNsCheckPackageList (
             return (Status);
         }
 
-        /* Examine the different types of expected sub-packages */
+        /* Examine the different types of expected subpackages */
 
         Info->ParentPackage = SubPackage;
         switch (Package->RetInfo.Type)
@@ -452,7 +492,7 @@ AcpiNsCheckPackageList (
 
         case ACPI_PTYPE2_FIXED:
 
-            /* Each sub-package has a fixed length */
+            /* Each subpackage has a fixed length */
 
             ExpectedCount = Package->RetInfo2.Count;
             if (SubPackage->Package.Count < ExpectedCount)
@@ -460,7 +500,7 @@ AcpiNsCheckPackageList (
                 goto PackageTooSmall;
             }
 
-            /* Check the type of each sub-package element */
+            /* Check the type of each subpackage element */
 
             for (j = 0; j < ExpectedCount; j++)
             {
@@ -475,7 +515,7 @@ AcpiNsCheckPackageList (
 
         case ACPI_PTYPE2_MIN:
 
-            /* Each sub-package has a variable but minimum length */
+            /* Each subpackage has a variable but minimum length */
 
             ExpectedCount = Package->RetInfo.Count1;
             if (SubPackage->Package.Count < ExpectedCount)
@@ -483,7 +523,7 @@ AcpiNsCheckPackageList (
                 goto PackageTooSmall;
             }
 
-            /* Check the type of each sub-package element */
+            /* Check the type of each subpackage element */
 
             Status = AcpiNsCheckPackageElements (Info, SubElements,
                         Package->RetInfo.ObjectType1,
@@ -532,7 +572,7 @@ AcpiNsCheckPackageList (
                 (*SubElements)->Integer.Value = ExpectedCount;
             }
 
-            /* Check the type of each sub-package element */
+            /* Check the type of each subpackage element */
 
             Status = AcpiNsCheckPackageElements (Info, (SubElements + 1),
                         Package->RetInfo.ObjectType1,
@@ -556,10 +596,10 @@ AcpiNsCheckPackageList (
 
 PackageTooSmall:
 
-    /* The sub-package count was smaller than required */
+    /* The subpackage count was smaller than required */
 
     ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags,
-        "Return Sub-Package[%u] is too small - found %u elements, expected %u",
+        "Return SubPackage[%u] is too small - found %u elements, expected %u",
         i, SubPackage->Package.Count, ExpectedCount));
 
     return (AE_AML_OPERAND_VALUE);
diff --git a/sys/contrib/dev/acpica/components/namespace/nsrepair.c b/sys/contrib/dev/acpica/components/namespace/nsrepair.c
index 879c95a84033..f26497cbc1e0 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsrepair.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsrepair.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -212,14 +212,29 @@ AcpiNsSimpleRepair (
      * this predefined name. Either one return value is expected, or none,
      * for both methods and other objects.
      *
-     * Exit now if there is no return object. Warning if one was expected.
+     * Try to fix if there was no return object. Warning if failed to fix.
      */
     if (!ReturnObject)
     {
         if (ExpectedBtypes && (!(ExpectedBtypes & ACPI_RTYPE_NONE)))
         {
-            ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
-                ACPI_WARN_ALWAYS, "Missing expected return value"));
+            if (PackageIndex != ACPI_NOT_PACKAGE_ELEMENT)
+            {
+                ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
+                    ACPI_WARN_ALWAYS, "Found unexpected NULL package element"));
+
+                Status = AcpiNsRepairNullElement (Info, ExpectedBtypes,
+                            PackageIndex, ReturnObjectPtr);
+                if (ACPI_SUCCESS (Status))
+                {
+                    return (AE_OK); /* Repair was successful */
+                }
+            }
+            else
+            {
+                ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname,
+                    ACPI_WARN_ALWAYS, "Missing expected return value"));
+            }
 
             return (AE_AML_NO_RETURN_VALUE);
         }
@@ -474,7 +489,7 @@ AcpiNsRepairNullElement (
  * RETURN:      None.
  *
  * DESCRIPTION: Remove all NULL package elements from packages that contain
- *              a variable number of sub-packages. For these types of
+ *              a variable number of subpackages. For these types of
  *              packages, NULL elements can be safely removed.
  *
  *****************************************************************************/
@@ -498,7 +513,7 @@ AcpiNsRemoveNullElements (
     /*
      * We can safely remove all NULL elements from these package types:
      * PTYPE1_VAR packages contain a variable number of simple data types.
-     * PTYPE2 packages contain a variable number of sub-packages.
+     * PTYPE2 packages contain a variable number of subpackages.
      */
     switch (PackageType)
     {
diff --git a/sys/contrib/dev/acpica/components/namespace/nsrepair2.c b/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
index 6bfd17a5666f..664e2810d4d2 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -478,8 +478,8 @@ AcpiNsRepair_CID (
  * DESCRIPTION: Repair for the _CST object:
  *              1. Sort the list ascending by C state type
  *              2. Ensure type cannot be zero
- *              3. A sub-package count of zero means _CST is meaningless
- *              4. Count must match the number of C state sub-packages
+ *              3. A subpackage count of zero means _CST is meaningless
+ *              4. Count must match the number of C state subpackages
  *
  *****************************************************************************/
 
@@ -672,6 +672,7 @@ AcpiNsRepair_PRT (
     ACPI_OPERAND_OBJECT     **TopObjectList;
     ACPI_OPERAND_OBJECT     **SubObjectList;
     ACPI_OPERAND_OBJECT     *ObjDesc;
+    ACPI_OPERAND_OBJECT     *SubPackage;
     UINT32                  ElementCount;
     UINT32                  Index;
 
@@ -681,9 +682,19 @@ AcpiNsRepair_PRT (
     TopObjectList = PackageObject->Package.Elements;
     ElementCount = PackageObject->Package.Count;
 
-    for (Index = 0; Index < ElementCount; Index++)
+    /* Examine each subpackage */
+
+    for (Index = 0; Index < ElementCount; Index++, TopObjectList++)
     {
-        SubObjectList = (*TopObjectList)->Package.Elements;
+        SubPackage = *TopObjectList;
+        SubObjectList = SubPackage->Package.Elements;
+
+        /* Check for minimum required element count */
+
+        if (SubPackage->Package.Count < 4)
+        {
+            continue;
+        }
 
         /*
          * If the BIOS has erroneously reversed the _PRT SourceName (index 2)
@@ -698,14 +709,11 @@ AcpiNsRepair_PRT (
             SubObjectList[2] = ObjDesc;
             Info->ReturnFlags |= ACPI_OBJECT_REPAIRED;
 
-            ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags,
+            ACPI_WARN_PREDEFINED ((AE_INFO,
+                Info->FullPathname, Info->NodeFlags,
                 "PRT[%X]: Fixed reversed SourceName and SourceIndex",
                 Index));
         }
-
-        /* Point to the next ACPI_OPERAND_OBJECT in the top level package */
-
-        TopObjectList++;
     }
 
     return (AE_OK);
@@ -745,7 +753,7 @@ AcpiNsRepair_PSS (
 
 
     /*
-     * Entries (sub-packages) in the _PSS Package must be sorted by power
+     * Entries (subpackages) in the _PSS Package must be sorted by power
      * dissipation, in descending order. If it appears that the list is
      * incorrectly sorted, sort it. We sort by CpuFrequency, since this
      * should be proportional to the power.
@@ -838,9 +846,9 @@ AcpiNsRepair_TSS (
  *
  * PARAMETERS:  Info                - Method execution information block
  *              ReturnObject        - Pointer to the top-level returned object
- *              StartIndex          - Index of the first sub-package
- *              ExpectedCount       - Minimum length of each sub-package
- *              SortIndex           - Sub-package entry to sort on
+ *              StartIndex          - Index of the first subpackage
+ *              ExpectedCount       - Minimum length of each subpackage
+ *              SortIndex           - Subpackage entry to sort on
  *              SortDirection       - Ascending or descending
  *              SortKeyName         - Name of the SortIndex field
  *
@@ -881,7 +889,7 @@ AcpiNsCheckSortedList (
     }
 
     /*
-     * NOTE: assumes list of sub-packages contains no NULL elements.
+     * NOTE: assumes list of subpackages contains no NULL elements.
      * Any NULL elements should have been removed by earlier call
      * to AcpiNsRemoveNullElements.
      */
@@ -911,7 +919,7 @@ AcpiNsCheckSortedList (
             return (AE_AML_OPERAND_TYPE);
         }
 
-        /* Each sub-package must have the minimum length */
+        /* Each subpackage must have the minimum length */
 
         if ((*OuterElements)->Package.Count < ExpectedCount)
         {
diff --git a/sys/contrib/dev/acpica/components/namespace/nssearch.c b/sys/contrib/dev/acpica/components/namespace/nssearch.c
index 255956f90999..e46403c54385 100644
--- a/sys/contrib/dev/acpica/components/namespace/nssearch.c
+++ b/sys/contrib/dev/acpica/components/namespace/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/namespace/nsutils.c b/sys/contrib/dev/acpica/components/namespace/nsutils.c
index fdde368e4f05..7cb91b84ba87 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsutils.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -693,27 +693,29 @@ void
 AcpiNsTerminate (
     void)
 {
-    ACPI_OPERAND_OBJECT     *ObjDesc;
+    ACPI_STATUS             Status;
 
 
     ACPI_FUNCTION_TRACE (NsTerminate);
 
 
     /*
-     * 1) Free the entire namespace -- all nodes and objects
-     *
-     * Delete all object descriptors attached to namepsace nodes
+     * Free the entire namespace -- all nodes and all objects
+     * attached to the nodes
      */
     AcpiNsDeleteNamespaceSubtree (AcpiGbl_RootNode);
 
-    /* Detach any objects attached to the root */
+    /* Delete any objects attached to the root node */
 
-    ObjDesc = AcpiNsGetAttachedObject (AcpiGbl_RootNode);
-    if (ObjDesc)
+    Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
+    if (ACPI_FAILURE (Status))
     {
-        AcpiNsDetachObject (AcpiGbl_RootNode);
+        return_VOID;
     }
 
+    AcpiNsDeleteNode (AcpiGbl_RootNode);
+    (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
+
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Namespace freed\n"));
     return_VOID;
 }
diff --git a/sys/contrib/dev/acpica/components/namespace/nswalk.c b/sys/contrib/dev/acpica/components/namespace/nswalk.c
index bba76ce656d9..ce5ac9eddc5c 100644
--- a/sys/contrib/dev/acpica/components/namespace/nswalk.c
+++ b/sys/contrib/dev/acpica/components/namespace/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSWALK_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/namespace/nsxfeval.c b/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
index 984ee64b0121..85749d66d32d 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,8 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSXFEVAL_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -91,7 +91,7 @@ AcpiEvaluateObjectTyped (
     ACPI_OBJECT_TYPE        ReturnType)
 {
     ACPI_STATUS             Status;
-    BOOLEAN                 MustFree = FALSE;
+    BOOLEAN                 FreeBufferOnError = FALSE;
 
 
     ACPI_FUNCTION_TRACE (AcpiEvaluateObjectTyped);
@@ -106,12 +106,13 @@ AcpiEvaluateObjectTyped (
 
     if (ReturnBuffer->Length == ACPI_ALLOCATE_BUFFER)
     {
-        MustFree = TRUE;
+        FreeBufferOnError = TRUE;
     }
 
     /* Evaluate the object */
 
-    Status = AcpiEvaluateObject (Handle, Pathname, ExternalParams, ReturnBuffer);
+    Status = AcpiEvaluateObject (Handle, Pathname,
+        ExternalParams, ReturnBuffer);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -146,10 +147,15 @@ AcpiEvaluateObjectTyped (
         AcpiUtGetTypeName (((ACPI_OBJECT *) ReturnBuffer->Pointer)->Type),
         AcpiUtGetTypeName (ReturnType)));
 
-    if (MustFree)
+    if (FreeBufferOnError)
     {
-        /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
-
+        /*
+         * Free a buffer created via ACPI_ALLOCATE_BUFFER.
+         * Note: We use AcpiOsFree here because AcpiOsAllocate was used
+         * to allocate the buffer. This purposefully bypasses the
+         * (optionally enabled) allocation tracking mechanism since we
+         * only want to track internal allocations.
+         */
         AcpiOsFree (ReturnBuffer->Pointer);
         ReturnBuffer->Pointer = NULL;
     }
diff --git a/sys/contrib/dev/acpica/components/namespace/nsxfname.c b/sys/contrib/dev/acpica/components/namespace/nsxfname.c
index 9a7642e1e6f4..d9595f1f7018 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsxfname.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
  */
 
 #define __NSXFNAME_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
diff --git a/sys/contrib/dev/acpica/components/namespace/nsxfobj.c b/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
index 153dfaa33c14..545ee17b74bc 100644
--- a/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
+++ b/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,8 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __NSXFOBJ_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
diff --git a/sys/contrib/dev/acpica/components/parser/psargs.c b/sys/contrib/dev/acpica/components/parser/psargs.c
index f61d4e146059..8f1089fb8f24 100644
--- a/sys/contrib/dev/acpica/components/parser/psargs.c
+++ b/sys/contrib/dev/acpica/components/parser/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/parser/psloop.c b/sys/contrib/dev/acpica/components/parser/psloop.c
index 6a88f4ef3df9..4a3ab9077be6 100644
--- a/sys/contrib/dev/acpica/components/parser/psloop.c
+++ b/sys/contrib/dev/acpica/components/parser/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 /*
  * Parse the AML and build an operation tree as most interpreters, (such as
  * Perl) do. Parsing is done by hand rather than with a YACC generated parser
@@ -489,6 +488,11 @@ AcpiPsParseLoop (
                     Status = AE_OK;
                 }
 
+                if (Status == AE_CTRL_TERMINATE)
+                {
+                    return_ACPI_STATUS (Status);
+                }
+
                 Status = AcpiPsCompleteOp (WalkState, &Op, Status);
                 if (ACPI_FAILURE (Status))
                 {
diff --git a/sys/contrib/dev/acpica/components/parser/psobject.c b/sys/contrib/dev/acpica/components/parser/psobject.c
index 4bdb6dcf4423..11cf35a515e5 100644
--- a/sys/contrib/dev/acpica/components/parser/psobject.c
+++ b/sys/contrib/dev/acpica/components/parser/psobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
@@ -229,7 +228,10 @@ AcpiPsBuildNamedOp (
     Status = WalkState->DescendingCallback (WalkState, Op);
     if (ACPI_FAILURE (Status))
     {
-        ACPI_EXCEPTION ((AE_INFO, Status, "During name lookup/catalog"));
+        if (Status != AE_CTRL_TERMINATE)
+        {
+            ACPI_EXCEPTION ((AE_INFO, Status, "During name lookup/catalog"));
+        }
         return_ACPI_STATUS (Status);
     }
 
@@ -243,7 +245,7 @@ AcpiPsBuildNamedOp (
     {
         if (Status == AE_CTRL_PENDING)
         {
-            return_ACPI_STATUS (AE_CTRL_PARSE_PENDING);
+            Status = AE_CTRL_PARSE_PENDING;
         }
         return_ACPI_STATUS (Status);
     }
diff --git a/sys/contrib/dev/acpica/components/parser/psopcode.c b/sys/contrib/dev/acpica/components/parser/psopcode.c
index 8ae0c800418d..85cb31d36f69 100644
--- a/sys/contrib/dev/acpica/components/parser/psopcode.c
+++ b/sys/contrib/dev/acpica/components/parser/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acopcode.h>
diff --git a/sys/contrib/dev/acpica/components/parser/psopinfo.c b/sys/contrib/dev/acpica/components/parser/psopinfo.c
index 3c6e4a58beb4..6dbdfb619c23 100644
--- a/sys/contrib/dev/acpica/components/parser/psopinfo.c
+++ b/sys/contrib/dev/acpica/components/parser/psopinfo.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
@@ -76,6 +75,10 @@ const ACPI_OPCODE_INFO *
 AcpiPsGetOpcodeInfo (
     UINT16                  Opcode)
 {
+#ifdef ACPI_DEBUG_OUTPUT
+    const char              *OpcodeName = "Unknown AML opcode";
+#endif
+
     ACPI_FUNCTION_NAME (PsGetOpcodeInfo);
 
 
@@ -97,10 +100,56 @@ AcpiPsGetOpcodeInfo (
         return (&AcpiGbl_AmlOpInfo [AcpiGbl_LongOpIndex [(UINT8) Opcode]]);
     }
 
+#if defined ACPI_ASL_COMPILER && defined ACPI_DEBUG_OUTPUT
+#include <contrib/dev/acpica/compiler/asldefine.h>
+
+    switch (Opcode)
+    {
+    case AML_RAW_DATA_BYTE:
+        OpcodeName = "-Raw Data Byte-";
+        break;
+
+    case AML_RAW_DATA_WORD:
+        OpcodeName = "-Raw Data Word-";
+        break;
+
+    case AML_RAW_DATA_DWORD:
+        OpcodeName = "-Raw Data Dword-";
+        break;
+
+    case AML_RAW_DATA_QWORD:
+        OpcodeName = "-Raw Data Qword-";
+        break;
+
+    case AML_RAW_DATA_BUFFER:
+        OpcodeName = "-Raw Data Buffer-";
+        break;
+
+    case AML_RAW_DATA_CHAIN:
+        OpcodeName = "-Raw Data Buffer Chain-";
+        break;
+
+    case AML_PACKAGE_LENGTH:
+        OpcodeName = "-Package Length-";
+        break;
+
+    case AML_UNASSIGNED_OPCODE:
+        OpcodeName = "-Unassigned Opcode-";
+        break;
+
+    case AML_DEFAULT_ARG_OP:
+        OpcodeName = "-Default Arg-";
+        break;
+
+    default:
+        break;
+    }
+#endif
+
     /* Unknown AML opcode */
 
     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-        "Unknown AML opcode [%4.4X]\n", Opcode));
+        "%s [%4.4X]\n", OpcodeName, Opcode));
 
     return (&AcpiGbl_AmlOpInfo [_UNK]);
 }
diff --git a/sys/contrib/dev/acpica/components/parser/psparse.c b/sys/contrib/dev/acpica/components/parser/psparse.c
index 989abdfef380..52ccdec35f2a 100644
--- a/sys/contrib/dev/acpica/components/parser/psparse.c
+++ b/sys/contrib/dev/acpica/components/parser/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 /*
  * Parse the AML and build an operation tree as most interpreters,
  * like Perl, do. Parsing is done by hand rather than with a YACC
diff --git a/sys/contrib/dev/acpica/components/parser/psscope.c b/sys/contrib/dev/acpica/components/parser/psscope.c
index 3aa102bdd5ec..c396422a6738 100644
--- a/sys/contrib/dev/acpica/components/parser/psscope.c
+++ b/sys/contrib/dev/acpica/components/parser/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
diff --git a/sys/contrib/dev/acpica/components/parser/pstree.c b/sys/contrib/dev/acpica/components/parser/pstree.c
index c0eeaf623c67..4dd99794fa7a 100644
--- a/sys/contrib/dev/acpica/components/parser/pstree.c
+++ b/sys/contrib/dev/acpica/components/parser/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __PSTREE_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/parser/psutils.c b/sys/contrib/dev/acpica/components/parser/psutils.c
index 4b555cccf79b..1ef18bc6eab1 100644
--- a/sys/contrib/dev/acpica/components/parser/psutils.c
+++ b/sys/contrib/dev/acpica/components/parser/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
diff --git a/sys/contrib/dev/acpica/components/parser/pswalk.c b/sys/contrib/dev/acpica/components/parser/pswalk.c
index 6b6e289b72fd..20f32d6ed6a5 100644
--- a/sys/contrib/dev/acpica/components/parser/pswalk.c
+++ b/sys/contrib/dev/acpica/components/parser/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acparser.h>
diff --git a/sys/contrib/dev/acpica/components/parser/psxface.c b/sys/contrib/dev/acpica/components/parser/psxface.c
index 6235e197b604..d0922eee7d20 100644
--- a/sys/contrib/dev/acpica/components/parser/psxface.c
+++ b/sys/contrib/dev/acpica/components/parser/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsaddr.c b/sys/contrib/dev/acpica/components/resources/rsaddr.c
index a8fa79d20f1c..bcf76f54afed 100644
--- a/sys/contrib/dev/acpica/components/resources/rsaddr.c
+++ b/sys/contrib/dev/acpica/components/resources/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rscalc.c b/sys/contrib/dev/acpica/components/resources/rscalc.c
index 7fadb416ebbe..dfeff39e87d8 100644
--- a/sys/contrib/dev/acpica/components/resources/rscalc.c
+++ b/sys/contrib/dev/acpica/components/resources/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -197,6 +197,7 @@ AcpiRsStreamOptionLength (
  * FUNCTION:    AcpiRsGetAmlLength
  *
  * PARAMETERS:  Resource            - Pointer to the resource linked list
+ *              ResourceListSize    - Size of the resource linked list
  *              SizeNeeded          - Where the required size is returned
  *
  * RETURN:      Status
@@ -210,9 +211,11 @@ AcpiRsStreamOptionLength (
 ACPI_STATUS
 AcpiRsGetAmlLength (
     ACPI_RESOURCE           *Resource,
+    ACPI_SIZE               ResourceListSize,
     ACPI_SIZE               *SizeNeeded)
 {
     ACPI_SIZE               AmlSizeNeeded = 0;
+    ACPI_RESOURCE           *ResourceEnd;
     ACPI_RS_LENGTH          TotalSize;
 
 
@@ -221,7 +224,8 @@ AcpiRsGetAmlLength (
 
     /* Traverse entire list of internal resource descriptors */
 
-    while (Resource)
+    ResourceEnd = ACPI_ADD_PTR (ACPI_RESOURCE, Resource, ResourceListSize);
+    while (Resource < ResourceEnd)
     {
         /* Validate the descriptor type */
 
@@ -655,7 +659,7 @@ AcpiRsGetPciRoutingTableLength (
 
     for (Index = 0; Index < NumberOfElements; Index++)
     {
-        /* Dereference the sub-package */
+        /* Dereference the subpackage */
 
         PackageElement = *TopObjectList;
 
diff --git a/sys/contrib/dev/acpica/components/resources/rscreate.c b/sys/contrib/dev/acpica/components/resources/rscreate.c
index b59966683e7f..38472725f617 100644
--- a/sys/contrib/dev/acpica/components/resources/rscreate.c
+++ b/sys/contrib/dev/acpica/components/resources/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@ AcpiBufferToResource (
     void                    *Resource;
     void                    *CurrentResourcePtr;
 
+
+    ACPI_FUNCTION_TRACE (AcpiBufferToResource);
+
+
     /*
      * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag
      * is not required here.
@@ -92,7 +96,7 @@ AcpiBufferToResource (
     }
     if (ACPI_FAILURE (Status))
     {
-        return (Status);
+        return_ACPI_STATUS (Status);
     }
 
     /* Allocate a buffer for the converted resource */
@@ -101,7 +105,7 @@ AcpiBufferToResource (
     CurrentResourcePtr = Resource;
     if (!Resource)
     {
-        return (AE_NO_MEMORY);
+        return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
     /* Perform the AML-to-Resource conversion */
@@ -121,9 +125,11 @@ AcpiBufferToResource (
         *ResourcePtr = Resource;
     }
 
-    return (Status);
+    return_ACPI_STATUS (Status);
 }
 
+ACPI_EXPORT_SYMBOL (AcpiBufferToResource)
+
 
 /*******************************************************************************
  *
@@ -297,7 +303,7 @@ AcpiRsCreatePciRoutingTable (
          */
         UserPrt->Length = (sizeof (ACPI_PCI_ROUTING_TABLE) - 4);
 
-        /* Each sub-package must be of length 4 */
+        /* Each subpackage must be of length 4 */
 
         if ((*TopObjectList)->Package.Count != 4)
         {
@@ -308,7 +314,7 @@ AcpiRsCreatePciRoutingTable (
         }
 
         /*
-         * Dereference the sub-package.
+         * Dereference the subpackage.
          * The SubObjectList will now point to an array of the four IRQ
          * elements: [Address, Pin, Source, SourceIndex]
          */
@@ -317,7 +323,7 @@ AcpiRsCreatePciRoutingTable (
         /* 1) First subobject: Dereference the PRT.Address */
 
         ObjDesc = SubObjectList[0];
-        if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
+        if (!ObjDesc || ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
         {
             ACPI_ERROR ((AE_INFO, "(PRT[%u].Address) Need Integer, found %s",
                 Index, AcpiUtGetObjectTypeName (ObjDesc)));
@@ -329,7 +335,7 @@ AcpiRsCreatePciRoutingTable (
         /* 2) Second subobject: Dereference the PRT.Pin */
 
         ObjDesc = SubObjectList[1];
-        if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
+        if (!ObjDesc || ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
         {
             ACPI_ERROR ((AE_INFO, "(PRT[%u].Pin) Need Integer, found %s",
                 Index, AcpiUtGetObjectTypeName (ObjDesc)));
@@ -410,7 +416,7 @@ AcpiRsCreatePciRoutingTable (
         /* 4) Fourth subobject: Dereference the PRT.SourceIndex */
 
         ObjDesc = SubObjectList[3];
-        if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
+        if (!ObjDesc || ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
         {
             ACPI_ERROR ((AE_INFO,
                 "(PRT[%u].SourceIndex) Need Integer, found %s",
@@ -435,23 +441,22 @@ AcpiRsCreatePciRoutingTable (
  *
  * FUNCTION:    AcpiRsCreateAmlResources
  *
- * PARAMETERS:  LinkedListBuffer        - Pointer to the resource linked list
- *              OutputBuffer            - Pointer to the user's buffer
+ * PARAMETERS:  ResourceList            - Pointer to the resource list buffer
+ *              OutputBuffer            - Where the AML buffer is returned
  *
  * RETURN:      Status  AE_OK if okay, else a valid ACPI_STATUS code.
  *              If the OutputBuffer is too small, the error will be
  *              AE_BUFFER_OVERFLOW and OutputBuffer->Length will point
  *              to the size buffer needed.
  *
- * DESCRIPTION: Takes the linked list of device resources and
- *              creates a bytestream to be used as input for the
- *              _SRS control method.
+ * DESCRIPTION: Converts a list of device resources to an AML bytestream
+ *              to be used as input for the _SRS control method.
  *
  ******************************************************************************/
 
 ACPI_STATUS
 AcpiRsCreateAmlResources (
-    ACPI_RESOURCE           *LinkedListBuffer,
+    ACPI_BUFFER             *ResourceList,
     ACPI_BUFFER             *OutputBuffer)
 {
     ACPI_STATUS             Status;
@@ -461,17 +466,15 @@ AcpiRsCreateAmlResources (
     ACPI_FUNCTION_TRACE (RsCreateAmlResources);
 
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "LinkedListBuffer = %p\n",
-        LinkedListBuffer));
+    /* Params already validated, no need to re-validate here */
 
-    /*
-     * Params already validated, so we don't re-validate here
-     *
-     * Pass the LinkedListBuffer into a module that calculates
-     * the buffer size needed for the byte stream.
-     */
-    Status = AcpiRsGetAmlLength (LinkedListBuffer,
-                &AmlSizeNeeded);
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ResourceList Buffer = %p\n",
+        ResourceList->Pointer));
+
+    /* Get the buffer size needed for the AML byte stream */
+
+    Status = AcpiRsGetAmlLength (ResourceList->Pointer,
+                ResourceList->Length, &AmlSizeNeeded);
 
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "AmlSizeNeeded=%X, %s\n",
         (UINT32) AmlSizeNeeded, AcpiFormatException (Status)));
@@ -490,14 +493,14 @@ AcpiRsCreateAmlResources (
 
     /* Do the conversion */
 
-    Status = AcpiRsConvertResourcesToAml (LinkedListBuffer, AmlSizeNeeded,
-                    OutputBuffer->Pointer);
+    Status = AcpiRsConvertResourcesToAml (ResourceList->Pointer,
+                AmlSizeNeeded, OutputBuffer->Pointer);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
     }
 
     ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",
-            OutputBuffer->Pointer, (UINT32) OutputBuffer->Length));
+        OutputBuffer->Pointer, (UINT32) OutputBuffer->Length));
     return_ACPI_STATUS (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/components/resources/rsdump.c b/sys/contrib/dev/acpica/components/resources/rsdump.c
index d72979513e66..253347b85cde 100644
--- a/sys/contrib/dev/acpica/components/resources/rsdump.c
+++ b/sys/contrib/dev/acpica/components/resources/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __RSDUMP_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -52,7 +51,7 @@
         ACPI_MODULE_NAME    ("rsdump")
 
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
 
 /* Local prototypes */
 
diff --git a/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c b/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
index 865209baea34..6fa5cef3f50a 100644
--- a/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
+++ b/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __RSDUMPINFO_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -52,7 +51,7 @@
         ACPI_MODULE_NAME    ("rsdumpinfo")
 
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
 
 
 #define ACPI_RSD_OFFSET(f)          (UINT8) ACPI_OFFSET (ACPI_RESOURCE_DATA,f)
diff --git a/sys/contrib/dev/acpica/components/resources/rsinfo.c b/sys/contrib/dev/acpica/components/resources/rsinfo.c
index cb7233279b59..fb60bfdc8a8e 100644
--- a/sys/contrib/dev/acpica/components/resources/rsinfo.c
+++ b/sys/contrib/dev/acpica/components/resources/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -141,7 +141,7 @@ ACPI_RSCONVERT_INFO         *AcpiGbl_ConvertResourceSerialBusDispatch[] =
 };
 
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
 
 /* Dispatch table for resource dump functions */
 
diff --git a/sys/contrib/dev/acpica/components/resources/rsio.c b/sys/contrib/dev/acpica/components/resources/rsio.c
index 1a41fb960a4d..008f50423712 100644
--- a/sys/contrib/dev/acpica/components/resources/rsio.c
+++ b/sys/contrib/dev/acpica/components/resources/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsirq.c b/sys/contrib/dev/acpica/components/resources/rsirq.c
index b3b5ee57b1ef..8a2223ff1dbd 100644
--- a/sys/contrib/dev/acpica/components/resources/rsirq.c
+++ b/sys/contrib/dev/acpica/components/resources/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rslist.c b/sys/contrib/dev/acpica/components/resources/rslist.c
index 81e729243a6a..6934ad1e0114 100644
--- a/sys/contrib/dev/acpica/components/resources/rslist.c
+++ b/sys/contrib/dev/acpica/components/resources/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsmemory.c b/sys/contrib/dev/acpica/components/resources/rsmemory.c
index 049a7b13f2bd..01089eea42b4 100644
--- a/sys/contrib/dev/acpica/components/resources/rsmemory.c
+++ b/sys/contrib/dev/acpica/components/resources/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsmisc.c b/sys/contrib/dev/acpica/components/resources/rsmisc.c
index e895addb4599..8194faf8e5bc 100644
--- a/sys/contrib/dev/acpica/components/resources/rsmisc.c
+++ b/sys/contrib/dev/acpica/components/resources/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsserial.c b/sys/contrib/dev/acpica/components/resources/rsserial.c
index 69e225938606..dc3ffc251d79 100644
--- a/sys/contrib/dev/acpica/components/resources/rsserial.c
+++ b/sys/contrib/dev/acpica/components/resources/rsserial.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/resources/rsutils.c b/sys/contrib/dev/acpica/components/resources/rsutils.c
index 499efb9bed1a..c53a9643b072 100644
--- a/sys/contrib/dev/acpica/components/resources/rsutils.c
+++ b/sys/contrib/dev/acpica/components/resources/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __RSUTILS_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -827,7 +826,7 @@ AcpiRsSetSrsMethodData (
      * Convert the linked list into a byte stream
      */
     Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
-    Status = AcpiRsCreateAmlResources (InBuffer->Pointer, &Buffer);
+    Status = AcpiRsCreateAmlResources (InBuffer, &Buffer);
     if (ACPI_FAILURE (Status))
     {
         goto Cleanup;
diff --git a/sys/contrib/dev/acpica/components/resources/rsxface.c b/sys/contrib/dev/acpica/components/resources/rsxface.c
index b2ff3816d76f..d2138927a9d3 100644
--- a/sys/contrib/dev/acpica/components/resources/rsxface.c
+++ b/sys/contrib/dev/acpica/components/resources/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __RSXFACE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
diff --git a/sys/contrib/dev/acpica/components/tables/tbdata.c b/sys/contrib/dev/acpica/components/tables/tbdata.c
new file mode 100644
index 000000000000..19991ce196cb
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/tables/tbdata.c
@@ -0,0 +1,855 @@
+/******************************************************************************
+ *
+ * Module Name: tbdata - Table manager data structure functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#define __TBDATA_C__
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/acnamesp.h>
+#include <contrib/dev/acpica/include/actables.h>
+
+#define _COMPONENT          ACPI_TABLES
+        ACPI_MODULE_NAME    ("tbdata")
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbInitTableDescriptor
+ *
+ * PARAMETERS:  TableDesc               - Table descriptor
+ *              Address                 - Physical address of the table
+ *              Flags                   - Allocation flags of the table
+ *              Table                   - Pointer to the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Initialize a new table descriptor
+ *
+ ******************************************************************************/
+
+void
+AcpiTbInitTableDescriptor (
+    ACPI_TABLE_DESC         *TableDesc,
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags,
+    ACPI_TABLE_HEADER       *Table)
+{
+
+    /*
+     * Initialize the table descriptor. Set the pointer to NULL, since the
+     * table is not fully mapped at this time.
+     */
+    ACPI_MEMSET (TableDesc, 0, sizeof (ACPI_TABLE_DESC));
+    TableDesc->Address = Address;
+    TableDesc->Length = Table->Length;
+    TableDesc->Flags = Flags;
+    ACPI_MOVE_32_TO_32 (TableDesc->Signature.Ascii, Table->Signature);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbAcquireTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor
+ *              TablePtr            - Where table is returned
+ *              TableLength         - Where table length is returned
+ *              TableFlags          - Where table allocation flags are returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Acquire an ACPI table. It can be used for tables not
+ *              maintained in the AcpiGbl_RootTableList.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbAcquireTable (
+    ACPI_TABLE_DESC         *TableDesc,
+    ACPI_TABLE_HEADER       **TablePtr,
+    UINT32                  *TableLength,
+    UINT8                   *TableFlags)
+{
+    ACPI_TABLE_HEADER       *Table = NULL;
+
+
+    switch (TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK)
+    {
+    case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+        Table = AcpiOsMapMemory (TableDesc->Address, TableDesc->Length);
+        break;
+
+    case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+    case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+
+        Table = ACPI_CAST_PTR (ACPI_TABLE_HEADER, TableDesc->Address);
+        break;
+
+    default:
+
+        break;
+    }
+
+    /* Table is not valid yet */
+
+    if (!Table)
+    {
+        return (AE_NO_MEMORY);
+    }
+
+    /* Fill the return values */
+
+    *TablePtr = Table;
+    *TableLength = TableDesc->Length;
+    *TableFlags = TableDesc->Flags;
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbReleaseTable
+ *
+ * PARAMETERS:  Table               - Pointer for the table
+ *              TableLength         - Length for the table
+ *              TableFlags          - Allocation flags for the table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Release a table. The inverse of AcpiTbAcquireTable().
+ *
+ ******************************************************************************/
+
+void
+AcpiTbReleaseTable (
+    ACPI_TABLE_HEADER       *Table,
+    UINT32                  TableLength,
+    UINT8                   TableFlags)
+{
+
+    switch (TableFlags & ACPI_TABLE_ORIGIN_MASK)
+    {
+    case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+        AcpiOsUnmapMemory (Table, TableLength);
+        break;
+
+    case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+    case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+    default:
+
+        break;
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbAcquireTempTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor to be acquired
+ *              Address             - Address of the table
+ *              Flags               - Allocation flags of the table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function validates the table header to obtain the length
+ *              of a table and fills the table descriptor to make its state as
+ *              "INSTALLED". Such a table descriptor is only used for verified
+ *              installation.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbAcquireTempTable (
+    ACPI_TABLE_DESC         *TableDesc,
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags)
+{
+    ACPI_TABLE_HEADER       *TableHeader;
+
+
+    switch (Flags & ACPI_TABLE_ORIGIN_MASK)
+    {
+    case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL:
+
+        /* Get the length of the full table from the header */
+
+        TableHeader = AcpiOsMapMemory (Address, sizeof (ACPI_TABLE_HEADER));
+        if (!TableHeader)
+        {
+            return (AE_NO_MEMORY);
+        }
+
+        AcpiTbInitTableDescriptor (TableDesc, Address, Flags, TableHeader);
+        AcpiOsUnmapMemory (TableHeader, sizeof (ACPI_TABLE_HEADER));
+        return (AE_OK);
+
+    case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL:
+    case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL:
+
+        TableHeader = ACPI_CAST_PTR (ACPI_TABLE_HEADER, Address);
+        if (!TableHeader)
+        {
+            return (AE_NO_MEMORY);
+        }
+
+        AcpiTbInitTableDescriptor (TableDesc, Address, Flags, TableHeader);
+        return (AE_OK);
+
+    default:
+
+        break;
+    }
+
+    /* Table is not valid yet */
+
+    return (AE_NO_MEMORY);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbReleaseTempTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor to be released
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: The inverse of AcpiTbAcquireTempTable().
+ *
+ *****************************************************************************/
+
+void
+AcpiTbReleaseTempTable (
+    ACPI_TABLE_DESC         *TableDesc)
+{
+
+    /*
+     * Note that the .Address is maintained by the callers of
+     * AcpiTbAcquireTempTable(), thus do not invoke AcpiTbUninstallTable()
+     * where .Address will be freed.
+     */
+    AcpiTbInvalidateTable (TableDesc);
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiTbValidateTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate the table, the returned
+ *              table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+AcpiTbValidateTable (
+    ACPI_TABLE_DESC         *TableDesc)
+{
+    ACPI_STATUS             Status = AE_OK;
+
+
+    ACPI_FUNCTION_TRACE (TbValidateTable);
+
+
+    /* Validate the table if necessary */
+
+    if (!TableDesc->Pointer)
+    {
+        Status = AcpiTbAcquireTable (TableDesc, &TableDesc->Pointer,
+                    &TableDesc->Length, &TableDesc->Flags);
+        if (!TableDesc->Pointer)
+        {
+            Status = AE_NO_MEMORY;
+        }
+    }
+
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbInvalidateTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Invalidate one internal ACPI table, this is the inverse of
+ *              AcpiTbValidateTable().
+ *
+ ******************************************************************************/
+
+void
+AcpiTbInvalidateTable (
+    ACPI_TABLE_DESC         *TableDesc)
+{
+
+    ACPI_FUNCTION_TRACE (TbInvalidateTable);
+
+
+    /* Table must be validated */
+
+    if (!TableDesc->Pointer)
+    {
+        return_VOID;
+    }
+
+    AcpiTbReleaseTable (TableDesc->Pointer, TableDesc->Length,
+        TableDesc->Flags);
+    TableDesc->Pointer = NULL;
+
+    return_VOID;
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiTbValidateTempTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate the table, the returned
+ *              table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+AcpiTbValidateTempTable (
+    ACPI_TABLE_DESC         *TableDesc)
+{
+
+    if (!TableDesc->Pointer && !AcpiGbl_VerifyTableChecksum)
+    {
+        /*
+         * Only validates the header of the table.
+         * Note that Length contains the size of the mapping after invoking
+         * this work around, this value is required by
+         * AcpiTbReleaseTempTable().
+         * We can do this because in AcpiInitTableDescriptor(), the Length
+         * field of the installed descriptor is filled with the actual
+         * table length obtaining from the table header.
+         */
+        TableDesc->Length = sizeof (ACPI_TABLE_HEADER);
+    }
+
+    return (AcpiTbValidateTable (TableDesc));
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiTbVerifyTempTable
+ *
+ * PARAMETERS:  TableDesc           - Table descriptor
+ *              Signature           - Table signature to verify
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This function is called to validate and verify the table, the
+ *              returned table descriptor is in "VALIDATED" state.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
+AcpiTbVerifyTempTable (
+    ACPI_TABLE_DESC         *TableDesc,
+    char                    *Signature)
+{
+    ACPI_STATUS             Status = AE_OK;
+
+
+    ACPI_FUNCTION_TRACE (TbVerifyTempTable);
+
+
+    /* Validate the table */
+
+    Status = AcpiTbValidateTempTable (TableDesc);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (AE_NO_MEMORY);
+    }
+
+    /* If a particular signature is expected (DSDT/FACS), it must match */
+
+    if (Signature &&
+        !ACPI_COMPARE_NAME (&TableDesc->Signature, Signature))
+    {
+        ACPI_BIOS_ERROR ((AE_INFO,
+            "Invalid signature 0x%X for ACPI table, expected [%s]",
+            TableDesc->Signature.Integer, Signature));
+        Status = AE_BAD_SIGNATURE;
+        goto InvalidateAndExit;
+    }
+
+    /* Verify the checksum */
+
+    if (AcpiGbl_VerifyTableChecksum)
+    {
+        Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
+                "%4.4s " ACPI_PRINTF_UINT
+                " Attempted table install failed",
+                AcpiUtValidAcpiName (TableDesc->Signature.Ascii) ?
+                    TableDesc->Signature.Ascii : "????",
+                ACPI_FORMAT_TO_UINT (TableDesc->Address)));
+            goto InvalidateAndExit;
+        }
+    }
+
+    return_ACPI_STATUS (AE_OK);
+
+InvalidateAndExit:
+    AcpiTbInvalidateTable (TableDesc);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbResizeRootTableList
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Expand the size of global table array
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbResizeRootTableList (
+    void)
+{
+    ACPI_TABLE_DESC         *Tables;
+    UINT32                  TableCount;
+
+
+    ACPI_FUNCTION_TRACE (TbResizeRootTableList);
+
+
+    /* AllowResize flag is a parameter to AcpiInitializeTables */
+
+    if (!(AcpiGbl_RootTableList.Flags & ACPI_ROOT_ALLOW_RESIZE))
+    {
+        ACPI_ERROR ((AE_INFO, "Resize of Root Table Array is not allowed"));
+        return_ACPI_STATUS (AE_SUPPORT);
+    }
+
+    /* Increase the Table Array size */
+
+    if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
+    {
+        TableCount = AcpiGbl_RootTableList.MaxTableCount;
+    }
+    else
+    {
+        TableCount = AcpiGbl_RootTableList.CurrentTableCount;
+    }
+
+    Tables = ACPI_ALLOCATE_ZEROED (
+        ((ACPI_SIZE) TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT) *
+        sizeof (ACPI_TABLE_DESC));
+    if (!Tables)
+    {
+        ACPI_ERROR ((AE_INFO, "Could not allocate new root table array"));
+        return_ACPI_STATUS (AE_NO_MEMORY);
+    }
+
+    /* Copy and free the previous table array */
+
+    if (AcpiGbl_RootTableList.Tables)
+    {
+        ACPI_MEMCPY (Tables, AcpiGbl_RootTableList.Tables,
+            (ACPI_SIZE) TableCount * sizeof (ACPI_TABLE_DESC));
+
+        if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
+        {
+            ACPI_FREE (AcpiGbl_RootTableList.Tables);
+        }
+    }
+
+    AcpiGbl_RootTableList.Tables = Tables;
+    AcpiGbl_RootTableList.MaxTableCount =
+        TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT;
+    AcpiGbl_RootTableList.Flags |= ACPI_ROOT_ORIGIN_ALLOCATED;
+
+    return_ACPI_STATUS (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbGetNextRootIndex
+ *
+ * PARAMETERS:  TableIndex          - Where table index is returned
+ *
+ * RETURN:      Status and table index.
+ *
+ * DESCRIPTION: Allocate a new ACPI table entry to the global table list
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbGetNextRootIndex (
+    UINT32                  *TableIndex)
+{
+    ACPI_STATUS             Status;
+
+
+    /* Ensure that there is room for the table in the Root Table List */
+
+    if (AcpiGbl_RootTableList.CurrentTableCount >=
+        AcpiGbl_RootTableList.MaxTableCount)
+    {
+        Status = AcpiTbResizeRootTableList();
+        if (ACPI_FAILURE (Status))
+        {
+            return (Status);
+        }
+    }
+
+    *TableIndex = AcpiGbl_RootTableList.CurrentTableCount;
+    AcpiGbl_RootTableList.CurrentTableCount++;
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbTerminate
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Delete all internal ACPI tables
+ *
+ ******************************************************************************/
+
+void
+AcpiTbTerminate (
+    void)
+{
+    UINT32                  i;
+
+
+    ACPI_FUNCTION_TRACE (TbTerminate);
+
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+
+    /* Delete the individual tables */
+
+    for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
+    {
+        AcpiTbUninstallTable (&AcpiGbl_RootTableList.Tables[i]);
+    }
+
+    /*
+     * Delete the root table array if allocated locally. Array cannot be
+     * mapped, so we don't need to check for that flag.
+     */
+    if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
+    {
+        ACPI_FREE (AcpiGbl_RootTableList.Tables);
+    }
+
+    AcpiGbl_RootTableList.Tables = NULL;
+    AcpiGbl_RootTableList.Flags = 0;
+    AcpiGbl_RootTableList.CurrentTableCount = 0;
+
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ACPI Tables freed\n"));
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    return_VOID;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbDeleteNamespaceByOwner
+ *
+ * PARAMETERS:  TableIndex          - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Delete all namespace objects created when this table was loaded.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbDeleteNamespaceByOwner (
+    UINT32                  TableIndex)
+{
+    ACPI_OWNER_ID           OwnerId;
+    ACPI_STATUS             Status;
+
+
+    ACPI_FUNCTION_TRACE (TbDeleteNamespaceByOwner);
+
+
+    Status = AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    if (TableIndex >= AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        /* The table index does not exist */
+
+        (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+        return_ACPI_STATUS (AE_NOT_EXIST);
+    }
+
+    /* Get the owner ID for this table, used to delete namespace nodes */
+
+    OwnerId = AcpiGbl_RootTableList.Tables[TableIndex].OwnerId;
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+
+    /*
+     * Need to acquire the namespace writer lock to prevent interference
+     * with any concurrent namespace walks. The interpreter must be
+     * released during the deletion since the acquisition of the deletion
+     * lock may block, and also since the execution of a namespace walk
+     * must be allowed to use the interpreter.
+     */
+    (void) AcpiUtReleaseMutex (ACPI_MTX_INTERPRETER);
+    Status = AcpiUtAcquireWriteLock (&AcpiGbl_NamespaceRwLock);
+
+    AcpiNsDeleteNamespaceByOwner (OwnerId);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    AcpiUtReleaseWriteLock (&AcpiGbl_NamespaceRwLock);
+
+    Status = AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbAllocateOwnerId
+ *
+ * PARAMETERS:  TableIndex          - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Allocates OwnerId in TableDesc
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbAllocateOwnerId (
+    UINT32                  TableIndex)
+{
+    ACPI_STATUS             Status = AE_BAD_PARAMETER;
+
+
+    ACPI_FUNCTION_TRACE (TbAllocateOwnerId);
+
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        Status = AcpiUtAllocateOwnerId (
+                    &(AcpiGbl_RootTableList.Tables[TableIndex].OwnerId));
+    }
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbReleaseOwnerId
+ *
+ * PARAMETERS:  TableIndex          - Table index
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Releases OwnerId in TableDesc
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbReleaseOwnerId (
+    UINT32                  TableIndex)
+{
+    ACPI_STATUS             Status = AE_BAD_PARAMETER;
+
+
+    ACPI_FUNCTION_TRACE (TbReleaseOwnerId);
+
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        AcpiUtReleaseOwnerId (
+            &(AcpiGbl_RootTableList.Tables[TableIndex].OwnerId));
+        Status = AE_OK;
+    }
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbGetOwnerId
+ *
+ * PARAMETERS:  TableIndex          - Table index
+ *              OwnerId             - Where the table OwnerId is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: returns OwnerId for the ACPI table
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbGetOwnerId (
+    UINT32                  TableIndex,
+    ACPI_OWNER_ID           *OwnerId)
+{
+    ACPI_STATUS             Status = AE_BAD_PARAMETER;
+
+
+    ACPI_FUNCTION_TRACE (TbGetOwnerId);
+
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        *OwnerId = AcpiGbl_RootTableList.Tables[TableIndex].OwnerId;
+        Status = AE_OK;
+    }
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbIsTableLoaded
+ *
+ * PARAMETERS:  TableIndex          - Index into the root table
+ *
+ * RETURN:      Table Loaded Flag
+ *
+ ******************************************************************************/
+
+BOOLEAN
+AcpiTbIsTableLoaded (
+    UINT32                  TableIndex)
+{
+    BOOLEAN                 IsLoaded = FALSE;
+
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        IsLoaded = (BOOLEAN)
+            (AcpiGbl_RootTableList.Tables[TableIndex].Flags &
+            ACPI_TABLE_IS_LOADED);
+    }
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    return (IsLoaded);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbSetTableLoadedFlag
+ *
+ * PARAMETERS:  TableIndex          - Table index
+ *              IsLoaded            - TRUE if table is loaded, FALSE otherwise
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Sets the table loaded flag to either TRUE or FALSE.
+ *
+ ******************************************************************************/
+
+void
+AcpiTbSetTableLoadedFlag (
+    UINT32                  TableIndex,
+    BOOLEAN                 IsLoaded)
+{
+
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
+    {
+        if (IsLoaded)
+        {
+            AcpiGbl_RootTableList.Tables[TableIndex].Flags |=
+                ACPI_TABLE_IS_LOADED;
+        }
+        else
+        {
+            AcpiGbl_RootTableList.Tables[TableIndex].Flags &=
+                ~ACPI_TABLE_IS_LOADED;
+        }
+    }
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+}
diff --git a/sys/contrib/dev/acpica/components/tables/tbfadt.c b/sys/contrib/dev/acpica/components/tables/tbfadt.c
index 4a27520d97ed..56a3fbae325d 100644
--- a/sys/contrib/dev/acpica/components/tables/tbfadt.c
+++ b/sys/contrib/dev/acpica/components/tables/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,20 +58,23 @@ AcpiTbInitGenericAddress (
     UINT8                   SpaceId,
     UINT8                   ByteWidth,
     UINT64                  Address,
-    char                    *RegisterName);
+    char                    *RegisterName,
+    UINT8                   Flags);
 
 static void
 AcpiTbConvertFadt (
     void);
 
-static void
-AcpiTbValidateFadt (
-    void);
-
 static void
 AcpiTbSetupFadtRegisters (
     void);
 
+static UINT64
+AcpiTbSelectAddress (
+    char                    *RegisterName,
+    UINT32                  Address32,
+    UINT64                  Address64);
+
 
 /* Table for conversion of FADT to common internal format and FADT validation */
 
@@ -82,13 +85,14 @@ typedef struct acpi_fadt_info
     UINT16                  Address32;
     UINT16                  Length;
     UINT8                   DefaultLength;
-    UINT8                   Type;
+    UINT8                   Flags;
 
 } ACPI_FADT_INFO;
 
 #define ACPI_FADT_OPTIONAL          0
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
+#define ACPI_FADT_GPE_REGISTER      4
 
 static ACPI_FADT_INFO     FadtInfoTable[] =
 {
@@ -139,14 +143,14 @@ static ACPI_FADT_INFO     FadtInfoTable[] =
         ACPI_FADT_OFFSET (Gpe0Block),
         ACPI_FADT_OFFSET (Gpe0BlockLength),
         0,
-        ACPI_FADT_SEPARATE_LENGTH},
+        ACPI_FADT_SEPARATE_LENGTH | ACPI_FADT_GPE_REGISTER},
 
     {"Gpe1Block",
         ACPI_FADT_OFFSET (XGpe1Block),
         ACPI_FADT_OFFSET (Gpe1Block),
         ACPI_FADT_OFFSET (Gpe1BlockLength),
         0,
-        ACPI_FADT_SEPARATE_LENGTH}
+        ACPI_FADT_SEPARATE_LENGTH | ACPI_FADT_GPE_REGISTER}
 };
 
 #define ACPI_FADT_INFO_ENTRIES \
@@ -194,6 +198,7 @@ static ACPI_FADT_PM_INFO    FadtPmInfoTable[] =
  *              SpaceId             - ACPI Space ID for this register
  *              ByteWidth           - Width of this register
  *              Address             - Address of the register
+ *              RegisterName        - ASCII name of the ACPI register
  *
  * RETURN:      None
  *
@@ -209,21 +214,31 @@ AcpiTbInitGenericAddress (
     UINT8                   SpaceId,
     UINT8                   ByteWidth,
     UINT64                  Address,
-    char                    *RegisterName)
+    char                    *RegisterName,
+    UINT8                   Flags)
 {
     UINT8                   BitWidth;
 
 
-    /* Bit width field in the GAS is only one byte long, 255 max */
-
+    /*
+     * Bit width field in the GAS is only one byte long, 255 max.
+     * Check for BitWidth overflow in GAS.
+     */
     BitWidth = (UINT8) (ByteWidth * 8);
-
-    if (ByteWidth > 31) /* (31*8)=248 */
+    if (ByteWidth > 31)     /* (31*8)=248, (32*8)=256 */
     {
-        ACPI_ERROR ((AE_INFO,
-            "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-            "to convert to GAS struct - 255 bits max, truncating",
-            RegisterName, ByteWidth, (ByteWidth * 8)));
+        /*
+         * No error for GPE blocks, because we do not use the BitWidth
+         * for GPEs, the legacy length (ByteWidth) is used instead to
+         * allow for a large number of GPEs.
+         */
+        if (!(Flags & ACPI_FADT_GPE_REGISTER))
+        {
+            ACPI_ERROR ((AE_INFO,
+                "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
+                "to convert to GAS struct - 255 bits max, truncating",
+                RegisterName, ByteWidth, (ByteWidth * 8)));
+        }
 
         BitWidth = 255;
     }
@@ -243,6 +258,72 @@ AcpiTbInitGenericAddress (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbSelectAddress
+ *
+ * PARAMETERS:  RegisterName        - ASCII name of the ACPI register
+ *              Address32           - 32-bit address of the register
+ *              Address64           - 64-bit address of the register
+ *
+ * RETURN:      The resolved 64-bit address
+ *
+ * DESCRIPTION: Select between 32-bit and 64-bit versions of addresses within
+ *              the FADT. Used for the FACS and DSDT addresses.
+ *
+ * NOTES:
+ *
+ * Check for FACS and DSDT address mismatches. An address mismatch between
+ * the 32-bit and 64-bit address fields (FIRMWARE_CTRL/X_FIRMWARE_CTRL and
+ * DSDT/X_DSDT) could be a corrupted address field or it might indicate
+ * the presence of two FACS or two DSDT tables.
+ *
+ * November 2013:
+ * By default, as per the ACPICA specification, a valid 64-bit address is
+ * used regardless of the value of the 32-bit address. However, this
+ * behavior can be overridden via the AcpiGbl_Use32BitFadtAddresses flag.
+ *
+ ******************************************************************************/
+
+static UINT64
+AcpiTbSelectAddress (
+    char                    *RegisterName,
+    UINT32                  Address32,
+    UINT64                  Address64)
+{
+
+    if (!Address64)
+    {
+        /* 64-bit address is zero, use 32-bit address */
+
+        return ((UINT64) Address32);
+    }
+
+    if (Address32 &&
+       (Address64 != (UINT64) Address32))
+    {
+        /* Address mismatch between 32-bit and 64-bit versions */
+
+        ACPI_BIOS_WARNING ((AE_INFO,
+            "32/64X %s address mismatch in FADT: "
+            "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
+            RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
+            AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
+
+        /* 32-bit address override */
+
+        if (AcpiGbl_Use32BitFadtAddresses)
+        {
+            return ((UINT64) Address32);
+        }
+    }
+
+    /* Default is to use the 64-bit address */
+
+    return (Address64);
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiTbParseFadt
@@ -296,14 +377,14 @@ AcpiTbParseFadt (
 
     /* Obtain the DSDT and FACS tables via their addresses within the FADT */
 
-    AcpiTbInstallTable ((ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XDsdt,
+    AcpiTbInstallFixedTable ((ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XDsdt,
         ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
 
     /* If Hardware Reduced flag is set, there is no FACS */
 
     if (!AcpiGbl_ReducedHardware)
     {
-        AcpiTbInstallTable ((ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XFacs,
+        AcpiTbInstallFixedTable ((ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XFacs,
             ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);
     }
 }
@@ -365,10 +446,6 @@ AcpiTbCreateLocalFadt (
 
     AcpiTbConvertFadt ();
 
-    /* Validate FADT values now, before we make any changes */
-
-    AcpiTbValidateFadt ();
-
     /* Initialize the global ACPI register structures */
 
     AcpiTbSetupFadtRegisters ();
@@ -379,33 +456,43 @@ AcpiTbCreateLocalFadt (
  *
  * FUNCTION:    AcpiTbConvertFadt
  *
- * PARAMETERS:  None, uses AcpiGbl_FADT
+ * PARAMETERS:  None - AcpiGbl_FADT is used.
  *
  * RETURN:      None
  *
  * DESCRIPTION: Converts all versions of the FADT to a common internal format.
- *              Expand 32-bit addresses to 64-bit as necessary.
+ *              Expand 32-bit addresses to 64-bit as necessary. Also validate
+ *              important fields within the FADT.
  *
- * NOTE:        AcpiGbl_FADT must be of size (ACPI_TABLE_FADT),
- *              and must contain a copy of the actual FADT.
+ * NOTE:        AcpiGbl_FADT must be of size (ACPI_TABLE_FADT), and must
+ *              contain a copy of the actual BIOS-provided FADT.
  *
  * Notes on 64-bit register addresses:
  *
  * After this FADT conversion, later ACPICA code will only use the 64-bit "X"
  * fields of the FADT for all ACPI register addresses.
  *
- * The 64-bit "X" fields are optional extensions to the original 32-bit FADT
+ * The 64-bit X fields are optional extensions to the original 32-bit FADT
  * V1.0 fields. Even if they are present in the FADT, they are optional and
  * are unused if the BIOS sets them to zero. Therefore, we must copy/expand
- * 32-bit V1.0 fields if the corresponding X field is zero.
+ * 32-bit V1.0 fields to the 64-bit X fields if the the 64-bit X field is
+ * originally zero.
  *
- * For ACPI 1.0 FADTs, all 32-bit address fields are expanded to the
- * corresponding "X" fields in the internal FADT.
+ * For ACPI 1.0 FADTs (that contain no 64-bit addresses), all 32-bit address
+ * fields are expanded to the corresponding 64-bit X fields in the internal
+ * common FADT.
  *
  * For ACPI 2.0+ FADTs, all valid (non-zero) 32-bit address fields are expanded
- * to the corresponding 64-bit X fields. For compatibility with other ACPI
- * implementations, we ignore the 64-bit field if the 32-bit field is valid,
- * regardless of whether the host OS is 32-bit or 64-bit.
+ * to the corresponding 64-bit X fields, if the 64-bit field is originally
+ * zero. Adhering to the ACPI specification, we completely ignore the 32-bit
+ * field if the 64-bit field is valid, regardless of whether the host OS is
+ * 32-bit or 64-bit.
+ *
+ * Possible additional checks:
+ *  (AcpiGbl_FADT.Pm1EventLength >= 4)
+ *  (AcpiGbl_FADT.Pm1ControlLength >= 2)
+ *  (AcpiGbl_FADT.PmTimerLength >= 4)
+ *  Gpe block lengths must be multiple of 2
  *
  ******************************************************************************/
 
@@ -413,24 +500,14 @@ static void
 AcpiTbConvertFadt (
     void)
 {
+    char                    *Name;
     ACPI_GENERIC_ADDRESS    *Address64;
     UINT32                  Address32;
+    UINT8                   Length;
+    UINT8                   Flags;
     UINT32                  i;
 
 
-    /*
-     * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
-     * Later code will always use the X 64-bit field.
-     */
-    if (!AcpiGbl_FADT.XFacs)
-    {
-        AcpiGbl_FADT.XFacs = (UINT64) AcpiGbl_FADT.Facs;
-    }
-    if (!AcpiGbl_FADT.XDsdt)
-    {
-        AcpiGbl_FADT.XDsdt = (UINT64) AcpiGbl_FADT.Dsdt;
-    }
-
     /*
      * For ACPI 1.0 FADTs (revision 1 or 2), ensure that reserved fields which
      * should be zero are indeed zero. This will workaround BIOSs that
@@ -458,113 +535,14 @@ AcpiTbConvertFadt (
     AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
 
     /*
-     * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
-     * generic address structures as necessary. Later code will always use
-     * the 64-bit address structures.
-     *
-     * March 2009:
-     * We now always use the 32-bit address if it is valid (non-null). This
-     * is not in accordance with the ACPI specification which states that
-     * the 64-bit address supersedes the 32-bit version, but we do this for
-     * compatibility with other ACPI implementations. Most notably, in the
-     * case where both the 32 and 64 versions are non-null, we use the 32-bit
-     * version. This is the only address that is guaranteed to have been
-     * tested by the BIOS manufacturer.
+     * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
+     * Later ACPICA code will always use the X 64-bit field.
      */
-    for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++)
-    {
-        Address32 = *ACPI_ADD_PTR (UINT32,
-            &AcpiGbl_FADT, FadtInfoTable[i].Address32);
+    AcpiGbl_FADT.XFacs = AcpiTbSelectAddress ("FACS",
+        AcpiGbl_FADT.Facs, AcpiGbl_FADT.XFacs);
 
-        Address64 = ACPI_ADD_PTR (ACPI_GENERIC_ADDRESS,
-            &AcpiGbl_FADT, FadtInfoTable[i].Address64);
-
-        /*
-         * If both 32- and 64-bit addresses are valid (non-zero),
-         * they must match.
-         */
-        if (Address64->Address && Address32 &&
-           (Address64->Address != (UINT64) Address32))
-        {
-            ACPI_BIOS_ERROR ((AE_INFO,
-                "32/64X address mismatch in FADT/%s: "
-                "0x%8.8X/0x%8.8X%8.8X, using 32",
-                FadtInfoTable[i].Name, Address32,
-                ACPI_FORMAT_UINT64 (Address64->Address)));
-        }
-
-        /* Always use 32-bit address if it is valid (non-null) */
-
-        if (Address32)
-        {
-            /*
-             * Copy the 32-bit address to the 64-bit GAS structure. The
-             * Space ID is always I/O for 32-bit legacy address fields
-             */
-            AcpiTbInitGenericAddress (Address64, ACPI_ADR_SPACE_SYSTEM_IO,
-                *ACPI_ADD_PTR (UINT8, &AcpiGbl_FADT, FadtInfoTable[i].Length),
-                (UINT64) Address32, FadtInfoTable[i].Name);
-        }
-    }
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbValidateFadt
- *
- * PARAMETERS:  Table           - Pointer to the FADT to be validated
- *
- * RETURN:      None
- *
- * DESCRIPTION: Validate various important fields within the FADT. If a problem
- *              is found, issue a message, but no status is returned.
- *              Used by both the table manager and the disassembler.
- *
- * Possible additional checks:
- * (AcpiGbl_FADT.Pm1EventLength >= 4)
- * (AcpiGbl_FADT.Pm1ControlLength >= 2)
- * (AcpiGbl_FADT.PmTimerLength >= 4)
- * Gpe block lengths must be multiple of 2
- *
- ******************************************************************************/
-
-static void
-AcpiTbValidateFadt (
-    void)
-{
-    char                    *Name;
-    ACPI_GENERIC_ADDRESS    *Address64;
-    UINT8                   Length;
-    UINT32                  i;
-
-
-    /*
-     * Check for FACS and DSDT address mismatches. An address mismatch between
-     * the 32-bit and 64-bit address fields (FIRMWARE_CTRL/X_FIRMWARE_CTRL and
-     * DSDT/X_DSDT) would indicate the presence of two FACS or two DSDT tables.
-     */
-    if (AcpiGbl_FADT.Facs &&
-        (AcpiGbl_FADT.XFacs != (UINT64) AcpiGbl_FADT.Facs))
-    {
-        ACPI_BIOS_WARNING ((AE_INFO,
-            "32/64X FACS address mismatch in FADT - "
-            "0x%8.8X/0x%8.8X%8.8X, using 32",
-            AcpiGbl_FADT.Facs, ACPI_FORMAT_UINT64 (AcpiGbl_FADT.XFacs)));
-
-        AcpiGbl_FADT.XFacs = (UINT64) AcpiGbl_FADT.Facs;
-    }
-
-    if (AcpiGbl_FADT.Dsdt &&
-        (AcpiGbl_FADT.XDsdt != (UINT64) AcpiGbl_FADT.Dsdt))
-    {
-        ACPI_BIOS_WARNING ((AE_INFO,
-            "32/64X DSDT address mismatch in FADT - "
-            "0x%8.8X/0x%8.8X%8.8X, using 32",
-            AcpiGbl_FADT.Dsdt, ACPI_FORMAT_UINT64 (AcpiGbl_FADT.XDsdt)));
-
-        AcpiGbl_FADT.XDsdt = (UINT64) AcpiGbl_FADT.Dsdt;
-    }
+    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
+        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
 
     /* If Hardware Reduced flag is set, we are all done */
 
@@ -578,14 +556,81 @@ AcpiTbValidateFadt (
     for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++)
     {
         /*
-         * Generate pointer to the 64-bit address, get the register
-         * length (width) and the register name
+         * Get the 32-bit and 64-bit addresses, as well as the register
+         * length and register name.
          */
+        Address32 = *ACPI_ADD_PTR (UINT32,
+            &AcpiGbl_FADT, FadtInfoTable[i].Address32);
+
         Address64 = ACPI_ADD_PTR (ACPI_GENERIC_ADDRESS,
-                        &AcpiGbl_FADT, FadtInfoTable[i].Address64);
+            &AcpiGbl_FADT, FadtInfoTable[i].Address64);
+
         Length = *ACPI_ADD_PTR (UINT8,
-                        &AcpiGbl_FADT, FadtInfoTable[i].Length);
+            &AcpiGbl_FADT, FadtInfoTable[i].Length);
+
         Name = FadtInfoTable[i].Name;
+        Flags = FadtInfoTable[i].Flags;
+
+        /*
+         * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X"
+         * generic address structures as necessary. Later code will always use
+         * the 64-bit address structures.
+         *
+         * November 2013:
+         * Now always use the 64-bit address if it is valid (non-zero), in
+         * accordance with the ACPI specification which states that a 64-bit
+         * address supersedes the 32-bit version. This behavior can be
+         * overridden by the AcpiGbl_Use32BitFadtAddresses flag.
+         *
+         * During 64-bit address construction and verification,
+         * these cases are handled:
+         *
+         * Address32 zero, Address64 [don't care]   - Use Address64
+         *
+         * Address32 non-zero, Address64 zero       - Copy/use Address32
+         * Address32 non-zero == Address64 non-zero - Use Address64
+         * Address32 non-zero != Address64 non-zero - Warning, use Address64
+         *
+         * Override: if AcpiGbl_Use32BitFadtAddresses is TRUE, and:
+         * Address32 non-zero != Address64 non-zero - Warning, copy/use Address32
+         *
+         * Note: SpaceId is always I/O for 32-bit legacy address fields
+         */
+        if (Address32)
+        {
+            if (!Address64->Address)
+            {
+                /* 64-bit address is zero, use 32-bit address */
+
+                AcpiTbInitGenericAddress (Address64,
+                    ACPI_ADR_SPACE_SYSTEM_IO,
+                    *ACPI_ADD_PTR (UINT8, &AcpiGbl_FADT,
+                        FadtInfoTable[i].Length),
+                    (UINT64) Address32, Name, Flags);
+            }
+            else if (Address64->Address != (UINT64) Address32)
+            {
+                /* Address mismatch */
+
+                ACPI_BIOS_WARNING ((AE_INFO,
+                    "32/64X address mismatch in FADT/%s: "
+                    "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
+                    Name, Address32,
+                    ACPI_FORMAT_UINT64 (Address64->Address),
+                    AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
+
+                if (AcpiGbl_Use32BitFadtAddresses)
+                {
+                    /* 32-bit address override */
+
+                    AcpiTbInitGenericAddress (Address64,
+                        ACPI_ADR_SPACE_SYSTEM_IO,
+                        *ACPI_ADD_PTR (UINT8, &AcpiGbl_FADT,
+                            FadtInfoTable[i].Length),
+                        (UINT64) Address32, Name, Flags);
+                }
+            }
+        }
 
         /*
          * For each extended field, check for length mismatch between the
@@ -603,7 +648,7 @@ AcpiTbValidateFadt (
                 Name, ACPI_MUL_8 (Length), Address64->BitWidth));
         }
 
-        if (FadtInfoTable[i].Type & ACPI_FADT_REQUIRED)
+        if (FadtInfoTable[i].Flags & ACPI_FADT_REQUIRED)
         {
             /*
              * Field is required (PM1aEvent, PM1aControl).
@@ -617,7 +662,7 @@ AcpiTbValidateFadt (
                     Name, ACPI_FORMAT_UINT64 (Address64->Address), Length));
             }
         }
-        else if (FadtInfoTable[i].Type & ACPI_FADT_SEPARATE_LENGTH)
+        else if (FadtInfoTable[i].Flags & ACPI_FADT_SEPARATE_LENGTH)
         {
             /*
              * Field is optional (PM2Control, GPE0, GPE1) AND has its own
@@ -724,7 +769,7 @@ AcpiTbSetupFadtRegisters (
                 Source64->SpaceId, Pm1RegisterByteWidth,
                 Source64->Address +
                     (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-                "PmRegisters");
+                "PmRegisters", 0);
         }
     }
 }
diff --git a/sys/contrib/dev/acpica/components/tables/tbfind.c b/sys/contrib/dev/acpica/components/tables/tbfind.c
index 6cd30e852c99..b59a6c2ecd0c 100644
--- a/sys/contrib/dev/acpica/components/tables/tbfind.c
+++ b/sys/contrib/dev/acpica/components/tables/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,7 +108,7 @@ AcpiTbFindTable (
         {
             /* Table is not currently mapped, map it */
 
-            Status = AcpiTbVerifyTable (&AcpiGbl_RootTableList.Tables[i]);
+            Status = AcpiTbValidateTable (&AcpiGbl_RootTableList.Tables[i]);
             if (ACPI_FAILURE (Status))
             {
                 return_ACPI_STATUS (Status);
diff --git a/sys/contrib/dev/acpica/components/tables/tbinstal.c b/sys/contrib/dev/acpica/components/tables/tbinstal.c
index 0652b1623118..b62e0e0531cd 100644
--- a/sys/contrib/dev/acpica/components/tables/tbinstal.c
+++ b/sys/contrib/dev/acpica/components/tables/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,387 +41,447 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __TBINSTAL_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
-#include <contrib/dev/acpica/include/acnamesp.h>
 #include <contrib/dev/acpica/include/actables.h>
 
-
 #define _COMPONENT          ACPI_TABLES
         ACPI_MODULE_NAME    ("tbinstal")
 
+/* Local prototypes */
 
-/******************************************************************************
- *
- * FUNCTION:    AcpiTbVerifyTable
- *
- * PARAMETERS:  TableDesc           - table
- *
- * RETURN:      Status
- *
- * DESCRIPTION: this function is called to verify and map table
- *
- *****************************************************************************/
+static BOOLEAN
+AcpiTbCompareTables (
+    ACPI_TABLE_DESC         *TableDesc,
+    UINT32                  TableIndex);
 
-ACPI_STATUS
-AcpiTbVerifyTable (
-    ACPI_TABLE_DESC         *TableDesc)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbCompareTables
+ *
+ * PARAMETERS:  TableDesc           - Table 1 descriptor to be compared
+ *              TableIndex          - Index of table 2 to be compared
+ *
+ * RETURN:      TRUE if both tables are identical.
+ *
+ * DESCRIPTION: This function compares a table with another table that has
+ *              already been installed in the root table list.
+ *
+ ******************************************************************************/
+
+static BOOLEAN
+AcpiTbCompareTables (
+    ACPI_TABLE_DESC         *TableDesc,
+    UINT32                  TableIndex)
 {
     ACPI_STATUS             Status = AE_OK;
+    BOOLEAN                 IsIdentical;
+    ACPI_TABLE_HEADER       *Table;
+    UINT32                  TableLength;
+    UINT8                   TableFlags;
 
 
-    ACPI_FUNCTION_TRACE (TbVerifyTable);
-
-
-    /* Map the table if necessary */
-
-    if (!TableDesc->Pointer)
+    Status = AcpiTbAcquireTable (&AcpiGbl_RootTableList.Tables[TableIndex],
+                &Table, &TableLength, &TableFlags);
+    if (ACPI_FAILURE (Status))
     {
-        if ((TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK) ==
-            ACPI_TABLE_ORIGIN_MAPPED)
-        {
-            TableDesc->Pointer = AcpiOsMapMemory (
-                TableDesc->Address, TableDesc->Length);
-        }
-
-        if (!TableDesc->Pointer)
-        {
-            return_ACPI_STATUS (AE_NO_MEMORY);
-        }
+        return (FALSE);
     }
 
-    /* Always calculate checksum, ignore bad checksum if requested */
+    /*
+     * Check for a table match on the entire table length,
+     * not just the header.
+     */
+    IsIdentical = (BOOLEAN)((TableDesc->Length != TableLength ||
+        ACPI_MEMCMP (TableDesc->Pointer, Table, TableLength)) ?
+        FALSE : TRUE);
 
-    Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
+    /* Release the acquired table */
 
-    return_ACPI_STATUS (Status);
+    AcpiTbReleaseTable (Table, TableLength, TableFlags);
+    return (IsIdentical);
 }
 
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiTbAddTable
+ * FUNCTION:    AcpiTbInstallTableWithOverride
  *
- * PARAMETERS:  TableDesc           - Table descriptor
- *              TableIndex          - Where the table index is returned
+ * PARAMETERS:  TableIndex              - Index into root table array
+ *              NewTableDesc            - New table descriptor to install
+ *              Override                - Whether override should be performed
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: This function is called to add an ACPI table. It is used to
- *              dynamically load tables via the Load and LoadTable AML
- *              operators.
+ * DESCRIPTION: Install an ACPI table into the global data structure. The
+ *              table override mechanism is called to allow the host
+ *              OS to replace any table before it is installed in the root
+ *              table array.
  *
  ******************************************************************************/
 
-ACPI_STATUS
-AcpiTbAddTable (
-    ACPI_TABLE_DESC         *TableDesc,
-    UINT32                  *TableIndex)
+void
+AcpiTbInstallTableWithOverride (
+    UINT32                  TableIndex,
+    ACPI_TABLE_DESC         *NewTableDesc,
+    BOOLEAN                 Override)
 {
-    UINT32                  i;
-    ACPI_STATUS             Status = AE_OK;
 
-
-    ACPI_FUNCTION_TRACE (TbAddTable);
-
-
-    if (!TableDesc->Pointer)
+    if (TableIndex >= AcpiGbl_RootTableList.CurrentTableCount)
     {
-        Status = AcpiTbVerifyTable (TableDesc);
-        if (ACPI_FAILURE (Status) || !TableDesc->Pointer)
-        {
-            return_ACPI_STATUS (Status);
-        }
-    }
-
-    /*
-     * Validate the incoming table signature.
-     *
-     * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
-     * 2) We added support for OEMx tables, signature "OEM".
-     * 3) Valid tables were encountered with a null signature, so we just
-     *    gave up on validating the signature, (05/2008).
-     * 4) We encountered non-AML tables such as the MADT, which caused
-     *    interpreter errors and kernel faults. So now, we once again allow
-     *    only "SSDT", "OEMx", and now, also a null signature. (05/2011).
-     */
-    if ((TableDesc->Pointer->Signature[0] != 0x00) &&
-       (!ACPI_COMPARE_NAME (TableDesc->Pointer->Signature, ACPI_SIG_SSDT)) &&
-       (ACPI_STRNCMP (TableDesc->Pointer->Signature, "OEM", 3)))
-    {
-        ACPI_BIOS_ERROR ((AE_INFO,
-            "Table has invalid signature [%4.4s] (0x%8.8X), "
-            "must be SSDT or OEMx",
-            AcpiUtValidAcpiName (TableDesc->Pointer->Signature) ?
-                TableDesc->Pointer->Signature : "????",
-            *(UINT32 *) TableDesc->Pointer->Signature));
-
-        return_ACPI_STATUS (AE_BAD_SIGNATURE);
-    }
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-
-    /* Check if table is already registered */
-
-    for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
-    {
-        if (!AcpiGbl_RootTableList.Tables[i].Pointer)
-        {
-            Status = AcpiTbVerifyTable (&AcpiGbl_RootTableList.Tables[i]);
-            if (ACPI_FAILURE (Status) ||
-                !AcpiGbl_RootTableList.Tables[i].Pointer)
-            {
-                continue;
-            }
-        }
-
-        /*
-         * Check for a table match on the entire table length,
-         * not just the header.
-         */
-        if (TableDesc->Length != AcpiGbl_RootTableList.Tables[i].Length)
-        {
-            continue;
-        }
-
-        if (ACPI_MEMCMP (TableDesc->Pointer,
-                AcpiGbl_RootTableList.Tables[i].Pointer,
-                AcpiGbl_RootTableList.Tables[i].Length))
-        {
-            continue;
-        }
-
-        /*
-         * Note: the current mechanism does not unregister a table if it is
-         * dynamically unloaded. The related namespace entries are deleted,
-         * but the table remains in the root table list.
-         *
-         * The assumption here is that the number of different tables that
-         * will be loaded is actually small, and there is minimal overhead
-         * in just keeping the table in case it is needed again.
-         *
-         * If this assumption changes in the future (perhaps on large
-         * machines with many table load/unload operations), tables will
-         * need to be unregistered when they are unloaded, and slots in the
-         * root table list should be reused when empty.
-         */
-
-        /*
-         * Table is already registered.
-         * We can delete the table that was passed as a parameter.
-         */
-        AcpiTbDeleteTable (TableDesc);
-        *TableIndex = i;
-
-        if (AcpiGbl_RootTableList.Tables[i].Flags & ACPI_TABLE_IS_LOADED)
-        {
-            /* Table is still loaded, this is an error */
-
-            Status = AE_ALREADY_EXISTS;
-            goto Release;
-        }
-        else
-        {
-            /* Table was unloaded, allow it to be reloaded */
-
-            TableDesc->Pointer = AcpiGbl_RootTableList.Tables[i].Pointer;
-            TableDesc->Address = AcpiGbl_RootTableList.Tables[i].Address;
-            Status = AE_OK;
-            goto PrintHeader;
-        }
+        return;
     }
 
     /*
      * ACPI Table Override:
-     * Allow the host to override dynamically loaded tables.
-     * NOTE: the table is fully mapped at this point, and the mapping will
-     * be deleted by TbTableOverride if the table is actually overridden.
+     *
+     * Before we install the table, let the host OS override it with a new
+     * one if desired. Any table within the RSDT/XSDT can be replaced,
+     * including the DSDT which is pointed to by the FADT.
      */
-    (void) AcpiTbTableOverride (TableDesc->Pointer, TableDesc);
-
-    /* Add the table to the global root table list */
-
-    Status = AcpiTbStoreTable (TableDesc->Address, TableDesc->Pointer,
-                TableDesc->Length, TableDesc->Flags, TableIndex);
-    if (ACPI_FAILURE (Status))
+    if (Override)
     {
-        goto Release;
+        AcpiTbOverrideTable (NewTableDesc);
     }
 
-PrintHeader:
-    AcpiTbPrintTableHeader (TableDesc->Address, TableDesc->Pointer);
+    AcpiTbInitTableDescriptor (&AcpiGbl_RootTableList.Tables[TableIndex],
+        NewTableDesc->Address, NewTableDesc->Flags, NewTableDesc->Pointer);
 
-Release:
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    AcpiTbPrintTableHeader (NewTableDesc->Address, NewTableDesc->Pointer);
+
+    /* Set the global integer width (based upon revision of the DSDT) */
+
+    if (TableIndex == ACPI_TABLE_INDEX_DSDT)
+    {
+        AcpiUtSetIntegerWidth (NewTableDesc->Pointer->Revision);
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbInstallFixedTable
+ *
+ * PARAMETERS:  Address                 - Physical address of DSDT or FACS
+ *              Signature               - Table signature, NULL if no need to
+ *                                        match
+ *              TableIndex              - Index into root table array
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Install a fixed ACPI table (DSDT/FACS) into the global data
+ *              structure.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiTbInstallFixedTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    char                    *Signature,
+    UINT32                  TableIndex)
+{
+    ACPI_TABLE_DESC         NewTableDesc;
+    ACPI_STATUS             Status;
+
+
+    ACPI_FUNCTION_TRACE (TbInstallFixedTable);
+
+
+    if (!Address)
+    {
+        ACPI_ERROR ((AE_INFO, "Null physical address for ACPI table [%s]",
+            Signature));
+        return (AE_NO_MEMORY);
+    }
+
+    /* Fill a table descriptor for validation */
+
+    Status = AcpiTbAcquireTempTable (&NewTableDesc, Address,
+                ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_ERROR ((AE_INFO, "Could not acquire table length at %p",
+            ACPI_CAST_PTR (void, Address)));
+        return_ACPI_STATUS (Status);
+    }
+
+    /* Validate and verify a table before installation */
+
+    Status = AcpiTbVerifyTempTable (&NewTableDesc, Signature);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ReleaseAndExit;
+    }
+
+    AcpiTbInstallTableWithOverride (TableIndex, &NewTableDesc, TRUE);
+
+ReleaseAndExit:
+
+    /* Release the temporary table descriptor */
+
+    AcpiTbReleaseTempTable (&NewTableDesc);
     return_ACPI_STATUS (Status);
 }
 
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiTbTableOverride
+ * FUNCTION:    AcpiTbInstallStandardTable
  *
- * PARAMETERS:  TableHeader         - Header for the original table
- *              TableDesc           - Table descriptor initialized for the
- *                                    original table. May or may not be mapped.
+ * PARAMETERS:  Address             - Address of the table (might be a virtual
+ *                                    address depending on the TableFlags)
+ *              Flags               - Flags for the table
+ *              Reload              - Whether reload should be performed
+ *              Override            - Whether override should be performed
+ *              TableIndex          - Where the table index is returned
  *
- * RETURN:      Pointer to the entire new table. NULL if table not overridden.
- *              If overridden, installs the new table within the input table
- *              descriptor.
+ * RETURN:      Status
  *
- * DESCRIPTION: Attempt table override by calling the OSL override functions.
- *              Note: If the table is overridden, then the entire new table
- *              is mapped and returned by this function.
+ * DESCRIPTION: This function is called to install an ACPI table that is
+ *              neither DSDT nor FACS (a "standard" table.)
+ *              When this function is called by "Load" or "LoadTable" opcodes,
+ *              or by AcpiLoadTable() API, the "Reload" parameter is set.
+ *              After sucessfully returning from this function, table is
+ *              "INSTALLED" but not "VALIDATED".
  *
  ******************************************************************************/
 
-ACPI_TABLE_HEADER *
-AcpiTbTableOverride (
-    ACPI_TABLE_HEADER       *TableHeader,
-    ACPI_TABLE_DESC         *TableDesc)
+ACPI_STATUS
+AcpiTbInstallStandardTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags,
+    BOOLEAN                 Reload,
+    BOOLEAN                 Override,
+    UINT32                  *TableIndex)
+{
+    UINT32                  i;
+    ACPI_STATUS             Status = AE_OK;
+    ACPI_TABLE_DESC         NewTableDesc;
+
+
+    ACPI_FUNCTION_TRACE (TbInstallStandardTable);
+
+
+    /* Acquire a temporary table descriptor for validation */
+
+    Status = AcpiTbAcquireTempTable (&NewTableDesc, Address, Flags);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_ERROR ((AE_INFO, "Could not acquire table length at %p",
+            ACPI_CAST_PTR (void, Address)));
+        return_ACPI_STATUS (Status);
+    }
+
+    /*
+     * Optionally do not load any SSDTs from the RSDT/XSDT. This can
+     * be useful for debugging ACPI problems on some machines.
+     */
+    if (!Reload &&
+        AcpiGbl_DisableSsdtTableInstall &&
+        ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT))
+    {
+        ACPI_INFO ((AE_INFO, "Ignoring installation of %4.4s at %p",
+            NewTableDesc.Signature.Ascii, ACPI_CAST_PTR (void, Address)));
+        goto ReleaseAndExit;
+    }
+
+    /* Validate and verify a table before installation */
+
+    Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ReleaseAndExit;
+    }
+
+    if (Reload)
+    {
+        /*
+         * Validate the incoming table signature.
+         *
+         * 1) Originally, we checked the table signature for "SSDT" or "PSDT".
+         * 2) We added support for OEMx tables, signature "OEM".
+         * 3) Valid tables were encountered with a null signature, so we just
+         *    gave up on validating the signature, (05/2008).
+         * 4) We encountered non-AML tables such as the MADT, which caused
+         *    interpreter errors and kernel faults. So now, we once again allow
+         *    only "SSDT", "OEMx", and now, also a null signature. (05/2011).
+         */
+        if ((NewTableDesc.Signature.Ascii[0] != 0x00) &&
+           (!ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT)) &&
+           (ACPI_STRNCMP (NewTableDesc.Signature.Ascii, "OEM", 3)))
+        {
+            ACPI_BIOS_ERROR ((AE_INFO,
+                "Table has invalid signature [%4.4s] (0x%8.8X), "
+                "must be SSDT or OEMx",
+                AcpiUtValidAcpiName (NewTableDesc.Signature.Ascii) ?
+                    NewTableDesc.Signature.Ascii : "????",
+                NewTableDesc.Signature.Integer));
+
+            Status = AE_BAD_SIGNATURE;
+            goto ReleaseAndExit;
+        }
+
+        /* Check if table is already registered */
+
+        for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
+        {
+            /*
+             * Check for a table match on the entire table length,
+             * not just the header.
+             */
+            if (!AcpiTbCompareTables (&NewTableDesc, i))
+            {
+                continue;
+            }
+
+            /*
+             * Note: the current mechanism does not unregister a table if it is
+             * dynamically unloaded. The related namespace entries are deleted,
+             * but the table remains in the root table list.
+             *
+             * The assumption here is that the number of different tables that
+             * will be loaded is actually small, and there is minimal overhead
+             * in just keeping the table in case it is needed again.
+             *
+             * If this assumption changes in the future (perhaps on large
+             * machines with many table load/unload operations), tables will
+             * need to be unregistered when they are unloaded, and slots in the
+             * root table list should be reused when empty.
+             */
+            if (AcpiGbl_RootTableList.Tables[i].Flags & ACPI_TABLE_IS_LOADED)
+            {
+                /* Table is still loaded, this is an error */
+
+                Status = AE_ALREADY_EXISTS;
+                goto ReleaseAndExit;
+            }
+            else
+            {
+                /*
+                 * Table was unloaded, allow it to be reloaded.
+                 * As we are going to return AE_OK to the caller, we should
+                 * take the responsibility of freeing the input descriptor.
+                 * Refill the input descriptor to ensure
+                 * AcpiTbInstallTableWithOverride() can be called again to
+                 * indicate the re-installation.
+                 */
+                AcpiTbUninstallTable (&NewTableDesc);
+                *TableIndex = i;
+               (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+                return_ACPI_STATUS (AE_OK);
+            }
+        }
+    }
+
+    /* Add the table to the global root table list */
+
+    Status = AcpiTbGetNextRootIndex (&i);
+    if (ACPI_FAILURE (Status))
+    {
+        goto ReleaseAndExit;
+    }
+
+    *TableIndex = i;
+    AcpiTbInstallTableWithOverride (i, &NewTableDesc, Override);
+
+ReleaseAndExit:
+
+    /* Release the temporary table descriptor */
+
+    AcpiTbReleaseTempTable (&NewTableDesc);
+    return_ACPI_STATUS (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbOverrideTable
+ *
+ * PARAMETERS:  OldTableDesc        - Validated table descriptor to be
+ *                                    overridden
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Attempt table override by calling the OSL override functions.
+ *              Note: If the table is overridden, then the entire new table
+ *              is acquired and returned by this function.
+ *              Before/after invocation, the table descriptor is in a state
+ *              that is "VALIDATED".
+ *
+ ******************************************************************************/
+
+void
+AcpiTbOverrideTable (
+    ACPI_TABLE_DESC         *OldTableDesc)
 {
     ACPI_STATUS             Status;
-    ACPI_TABLE_HEADER       *NewTable = NULL;
-    ACPI_PHYSICAL_ADDRESS   NewAddress = 0;
-    UINT32                  NewTableLength = 0;
-    UINT8                   NewFlags;
     char                    *OverrideType;
+    ACPI_TABLE_DESC         NewTableDesc;
+    ACPI_TABLE_HEADER       *Table;
+    ACPI_PHYSICAL_ADDRESS   Address;
+    UINT32                  Length;
 
 
     /* (1) Attempt logical override (returns a logical address) */
 
-    Status = AcpiOsTableOverride (TableHeader, &NewTable);
-    if (ACPI_SUCCESS (Status) && NewTable)
+    Status = AcpiOsTableOverride (OldTableDesc->Pointer, &Table);
+    if (ACPI_SUCCESS (Status) && Table)
     {
-        NewAddress = ACPI_PTR_TO_PHYSADDR (NewTable);
-        NewTableLength = NewTable->Length;
-        NewFlags = ACPI_TABLE_ORIGIN_OVERRIDE;
+        AcpiTbAcquireTempTable (&NewTableDesc, ACPI_PTR_TO_PHYSADDR (Table),
+            ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL);
         OverrideType = "Logical";
         goto FinishOverride;
     }
 
     /* (2) Attempt physical override (returns a physical address) */
 
-    Status = AcpiOsPhysicalTableOverride (TableHeader,
-        &NewAddress, &NewTableLength);
-    if (ACPI_SUCCESS (Status) && NewAddress && NewTableLength)
+    Status = AcpiOsPhysicalTableOverride (OldTableDesc->Pointer,
+        &Address, &Length);
+    if (ACPI_SUCCESS (Status) && Address && Length)
     {
-        /* Map the entire new table */
-
-        NewTable = AcpiOsMapMemory (NewAddress, NewTableLength);
-        if (!NewTable)
-        {
-            ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-                "%4.4s %p Attempted physical table override failed",
-                TableHeader->Signature,
-                ACPI_CAST_PTR (void, TableDesc->Address)));
-            return (NULL);
-        }
-
+        AcpiTbAcquireTempTable (&NewTableDesc, Address,
+            ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);
         OverrideType = "Physical";
-        NewFlags = ACPI_TABLE_ORIGIN_MAPPED;
         goto FinishOverride;
     }
 
-    return (NULL); /* There was no override */
+    return; /* There was no override */
 
 
 FinishOverride:
 
-    ACPI_INFO ((AE_INFO,
-        "%4.4s %p %s table override, new table: %p",
-        TableHeader->Signature,
-        ACPI_CAST_PTR (void, TableDesc->Address),
-        OverrideType, NewTable));
+    /* Validate and verify a table before overriding */
 
-    /* We can now unmap/delete the original table (if fully mapped) */
-
-    AcpiTbDeleteTable (TableDesc);
-
-    /* Setup descriptor for the new table */
-
-    TableDesc->Address = NewAddress;
-    TableDesc->Pointer = NewTable;
-    TableDesc->Length = NewTableLength;
-    TableDesc->Flags = NewFlags;
-
-    return (NewTable);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbResizeRootTableList
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Expand the size of global table array
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbResizeRootTableList (
-    void)
-{
-    ACPI_TABLE_DESC         *Tables;
-    UINT32                  TableCount;
-
-
-    ACPI_FUNCTION_TRACE (TbResizeRootTableList);
-
-
-    /* AllowResize flag is a parameter to AcpiInitializeTables */
-
-    if (!(AcpiGbl_RootTableList.Flags & ACPI_ROOT_ALLOW_RESIZE))
+    Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL);
+    if (ACPI_FAILURE (Status))
     {
-        ACPI_ERROR ((AE_INFO, "Resize of Root Table Array is not allowed"));
-        return_ACPI_STATUS (AE_SUPPORT);
+        return;
     }
 
-    /* Increase the Table Array size */
+    ACPI_INFO ((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
+        " %s table override, new table: " ACPI_PRINTF_UINT,
+        OldTableDesc->Signature.Ascii,
+        ACPI_FORMAT_TO_UINT (OldTableDesc->Address),
+        OverrideType, ACPI_FORMAT_TO_UINT (NewTableDesc.Address)));
 
-    if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
-    {
-        TableCount = AcpiGbl_RootTableList.MaxTableCount;
-    }
-    else
-    {
-        TableCount = AcpiGbl_RootTableList.CurrentTableCount;
-    }
+    /* We can now uninstall the original table */
 
-    Tables = ACPI_ALLOCATE_ZEROED (
-        ((ACPI_SIZE) TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT) *
-        sizeof (ACPI_TABLE_DESC));
-    if (!Tables)
-    {
-        ACPI_ERROR ((AE_INFO, "Could not allocate new root table array"));
-        return_ACPI_STATUS (AE_NO_MEMORY);
-    }
+    AcpiTbUninstallTable (OldTableDesc);
 
-    /* Copy and free the previous table array */
+    /*
+     * Replace the original table descriptor and keep its state as
+     * "VALIDATED".
+     */
+    AcpiTbInitTableDescriptor (OldTableDesc, NewTableDesc.Address,
+        NewTableDesc.Flags, NewTableDesc.Pointer);
+    AcpiTbValidateTempTable (OldTableDesc);
 
-    if (AcpiGbl_RootTableList.Tables)
-    {
-        ACPI_MEMCPY (Tables, AcpiGbl_RootTableList.Tables,
-            (ACPI_SIZE) TableCount * sizeof (ACPI_TABLE_DESC));
+    /* Release the temporary table descriptor */
 
-        if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
-        {
-            ACPI_FREE (AcpiGbl_RootTableList.Tables);
-        }
-    }
-
-    AcpiGbl_RootTableList.Tables = Tables;
-    AcpiGbl_RootTableList.MaxTableCount =
-        TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT;
-    AcpiGbl_RootTableList.Flags |= ACPI_ROOT_ORIGIN_ALLOCATED;
-
-    return_ACPI_STATUS (AE_OK);
+    AcpiTbReleaseTempTable (&NewTableDesc);
 }
 
 
@@ -432,7 +492,8 @@ AcpiTbResizeRootTableList (
  * PARAMETERS:  Address             - Table address
  *              Table               - Table header
  *              Length              - Table length
- *              Flags               - flags
+ *              Flags               - Install flags
+ *              TableIndex          - Where the table index is returned
  *
  * RETURN:      Status and table index.
  *
@@ -449,44 +510,29 @@ AcpiTbStoreTable (
     UINT32                  *TableIndex)
 {
     ACPI_STATUS             Status;
-    ACPI_TABLE_DESC         *NewTable;
+    ACPI_TABLE_DESC         *TableDesc;
 
 
-    /* Ensure that there is room for the table in the Root Table List */
-
-    if (AcpiGbl_RootTableList.CurrentTableCount >=
-        AcpiGbl_RootTableList.MaxTableCount)
+    Status = AcpiTbGetNextRootIndex (TableIndex);
+    if (ACPI_FAILURE (Status))
     {
-        Status = AcpiTbResizeRootTableList();
-        if (ACPI_FAILURE (Status))
-        {
-            return (Status);
-        }
+        return (Status);
     }
 
-    NewTable = &AcpiGbl_RootTableList.Tables[AcpiGbl_RootTableList.CurrentTableCount];
-
     /* Initialize added table */
 
-    NewTable->Address = Address;
-    NewTable->Pointer = Table;
-    NewTable->Length = Length;
-    NewTable->OwnerId = 0;
-    NewTable->Flags = Flags;
-
-    ACPI_MOVE_32_TO_32 (&NewTable->Signature, Table->Signature);
-
-    *TableIndex = AcpiGbl_RootTableList.CurrentTableCount;
-    AcpiGbl_RootTableList.CurrentTableCount++;
+    TableDesc = &AcpiGbl_RootTableList.Tables[*TableIndex];
+    AcpiTbInitTableDescriptor (TableDesc, Address, Flags, Table);
+    TableDesc->Pointer = Table;
     return (AE_OK);
 }
 
 
 /*******************************************************************************
  *
- * FUNCTION:    AcpiTbDeleteTable
+ * FUNCTION:    AcpiTbUninstallTable
  *
- * PARAMETERS:  TableIndex          - Table index
+ * PARAMETERS:  TableDesc           - Table descriptor
  *
  * RETURN:      None
  *
@@ -495,324 +541,28 @@ AcpiTbStoreTable (
  ******************************************************************************/
 
 void
-AcpiTbDeleteTable (
+AcpiTbUninstallTable (
     ACPI_TABLE_DESC         *TableDesc)
 {
 
-    /* Table must be mapped or allocated */
+    ACPI_FUNCTION_TRACE (TbUninstallTable);
 
-    if (!TableDesc->Pointer)
+
+    /* Table must be installed */
+
+    if (!TableDesc->Address)
     {
-        return;
+        return_VOID;
     }
 
-    switch (TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK)
+    AcpiTbInvalidateTable (TableDesc);
+
+    if ((TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK) ==
+        ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL)
     {
-    case ACPI_TABLE_ORIGIN_MAPPED:
-
-        AcpiOsUnmapMemory (TableDesc->Pointer, TableDesc->Length);
-        break;
-
-    case ACPI_TABLE_ORIGIN_ALLOCATED:
-
-        ACPI_FREE (TableDesc->Pointer);
-        break;
-
-    /* Not mapped or allocated, there is nothing we can do */
-
-    default:
-
-        return;
+        ACPI_FREE (ACPI_CAST_PTR (void, TableDesc->Address));
     }
 
-    TableDesc->Pointer = NULL;
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbTerminate
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Delete all internal ACPI tables
- *
- ******************************************************************************/
-
-void
-AcpiTbTerminate (
-    void)
-{
-    UINT32                  i;
-
-
-    ACPI_FUNCTION_TRACE (TbTerminate);
-
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-
-    /* Delete the individual tables */
-
-    for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
-    {
-        AcpiTbDeleteTable (&AcpiGbl_RootTableList.Tables[i]);
-    }
-
-    /*
-     * Delete the root table array if allocated locally. Array cannot be
-     * mapped, so we don't need to check for that flag.
-     */
-    if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED)
-    {
-        ACPI_FREE (AcpiGbl_RootTableList.Tables);
-    }
-
-    AcpiGbl_RootTableList.Tables = NULL;
-    AcpiGbl_RootTableList.Flags = 0;
-    AcpiGbl_RootTableList.CurrentTableCount = 0;
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ACPI Tables freed\n"));
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-
+    TableDesc->Address = ACPI_PTR_TO_PHYSADDR (NULL);
     return_VOID;
 }
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbDeleteNamespaceByOwner
- *
- * PARAMETERS:  TableIndex          - Table index
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Delete all namespace objects created when this table was loaded.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbDeleteNamespaceByOwner (
-    UINT32                  TableIndex)
-{
-    ACPI_OWNER_ID           OwnerId;
-    ACPI_STATUS             Status;
-
-
-    ACPI_FUNCTION_TRACE (TbDeleteNamespaceByOwner);
-
-
-    Status = AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    if (TableIndex >= AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        /* The table index does not exist */
-
-        (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-        return_ACPI_STATUS (AE_NOT_EXIST);
-    }
-
-    /* Get the owner ID for this table, used to delete namespace nodes */
-
-    OwnerId = AcpiGbl_RootTableList.Tables[TableIndex].OwnerId;
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-
-    /*
-     * Need to acquire the namespace writer lock to prevent interference
-     * with any concurrent namespace walks. The interpreter must be
-     * released during the deletion since the acquisition of the deletion
-     * lock may block, and also since the execution of a namespace walk
-     * must be allowed to use the interpreter.
-     */
-    (void) AcpiUtReleaseMutex (ACPI_MTX_INTERPRETER);
-    Status = AcpiUtAcquireWriteLock (&AcpiGbl_NamespaceRwLock);
-
-    AcpiNsDeleteNamespaceByOwner (OwnerId);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    AcpiUtReleaseWriteLock (&AcpiGbl_NamespaceRwLock);
-
-    Status = AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbAllocateOwnerId
- *
- * PARAMETERS:  TableIndex          - Table index
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Allocates OwnerId in TableDesc
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbAllocateOwnerId (
-    UINT32                  TableIndex)
-{
-    ACPI_STATUS             Status = AE_BAD_PARAMETER;
-
-
-    ACPI_FUNCTION_TRACE (TbAllocateOwnerId);
-
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        Status = AcpiUtAllocateOwnerId
-                    (&(AcpiGbl_RootTableList.Tables[TableIndex].OwnerId));
-    }
-
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbReleaseOwnerId
- *
- * PARAMETERS:  TableIndex          - Table index
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Releases OwnerId in TableDesc
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbReleaseOwnerId (
-    UINT32                  TableIndex)
-{
-    ACPI_STATUS             Status = AE_BAD_PARAMETER;
-
-
-    ACPI_FUNCTION_TRACE (TbReleaseOwnerId);
-
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        AcpiUtReleaseOwnerId (
-            &(AcpiGbl_RootTableList.Tables[TableIndex].OwnerId));
-        Status = AE_OK;
-    }
-
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbGetOwnerId
- *
- * PARAMETERS:  TableIndex          - Table index
- *              OwnerId             - Where the table OwnerId is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: returns OwnerId for the ACPI table
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiTbGetOwnerId (
-    UINT32                  TableIndex,
-    ACPI_OWNER_ID           *OwnerId)
-{
-    ACPI_STATUS             Status = AE_BAD_PARAMETER;
-
-
-    ACPI_FUNCTION_TRACE (TbGetOwnerId);
-
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        *OwnerId = AcpiGbl_RootTableList.Tables[TableIndex].OwnerId;
-        Status = AE_OK;
-    }
-
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-    return_ACPI_STATUS (Status);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbIsTableLoaded
- *
- * PARAMETERS:  TableIndex          - Table index
- *
- * RETURN:      Table Loaded Flag
- *
- ******************************************************************************/
-
-BOOLEAN
-AcpiTbIsTableLoaded (
-    UINT32                  TableIndex)
-{
-    BOOLEAN                 IsLoaded = FALSE;
-
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        IsLoaded = (BOOLEAN)
-            (AcpiGbl_RootTableList.Tables[TableIndex].Flags &
-            ACPI_TABLE_IS_LOADED);
-    }
-
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-    return (IsLoaded);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbSetTableLoadedFlag
- *
- * PARAMETERS:  TableIndex          - Table index
- *              IsLoaded            - TRUE if table is loaded, FALSE otherwise
- *
- * RETURN:      None
- *
- * DESCRIPTION: Sets the table loaded flag to either TRUE or FALSE.
- *
- ******************************************************************************/
-
-void
-AcpiTbSetTableLoadedFlag (
-    UINT32                  TableIndex,
-    BOOLEAN                 IsLoaded)
-{
-
-    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-    if (TableIndex < AcpiGbl_RootTableList.CurrentTableCount)
-    {
-        if (IsLoaded)
-        {
-            AcpiGbl_RootTableList.Tables[TableIndex].Flags |=
-                ACPI_TABLE_IS_LOADED;
-        }
-        else
-        {
-            AcpiGbl_RootTableList.Tables[TableIndex].Flags &=
-                ~ACPI_TABLE_IS_LOADED;
-        }
-    }
-
-    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-}
diff --git a/sys/contrib/dev/acpica/components/tables/tbprint.c b/sys/contrib/dev/acpica/components/tables/tbprint.c
index e85acce243b3..00b6f1aee1ac 100644
--- a/sys/contrib/dev/acpica/components/tables/tbprint.c
+++ b/sys/contrib/dev/acpica/components/tables/tbprint.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -147,15 +147,17 @@ AcpiTbPrintTableHeader (
 
 
     /*
-     * The reason that the Address is cast to a void pointer is so that we
-     * can use %p which will work properly on both 32-bit and 64-bit hosts.
+     * The reason that we use ACPI_PRINTF_UINT and ACPI_FORMAT_TO_UINT is to
+     * support both 32-bit and 64-bit hosts/addresses in a consistent manner.
+     * The %p specifier does not emit uniform output on all hosts. On some,
+     * leading zeros are not supported.
      */
     if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS))
     {
         /* FACS only has signature and length fields */
 
-        ACPI_INFO ((AE_INFO, "%4.4s %p %05X",
-            Header->Signature, ACPI_CAST_PTR (void, Address),
+        ACPI_INFO ((AE_INFO, "%-4.4s " ACPI_PRINTF_UINT " %06X",
+            Header->Signature, ACPI_FORMAT_TO_UINT (Address),
             Header->Length));
     }
     else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
@@ -166,8 +168,8 @@ AcpiTbPrintTableHeader (
             ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->OemId, ACPI_OEM_ID_SIZE);
         AcpiTbFixString (LocalHeader.OemId, ACPI_OEM_ID_SIZE);
 
-        ACPI_INFO ((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
-            ACPI_CAST_PTR (void, Address),
+        ACPI_INFO ((AE_INFO, "RSDP " ACPI_PRINTF_UINT " %06X (v%.2d %-6.6s)",
+            ACPI_FORMAT_TO_UINT (Address),
             (ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->Revision > 0) ?
                 ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->Length : 20,
             ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->Revision,
@@ -180,8 +182,9 @@ AcpiTbPrintTableHeader (
         AcpiTbCleanupTableHeader (&LocalHeader, Header);
 
         ACPI_INFO ((AE_INFO,
-            "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
-            LocalHeader.Signature, ACPI_CAST_PTR (void, Address),
+            "%-4.4s " ACPI_PRINTF_UINT
+            " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
+            LocalHeader.Signature, ACPI_FORMAT_TO_UINT (Address),
             LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
             LocalHeader.OemTableId, LocalHeader.OemRevision,
             LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
diff --git a/sys/contrib/dev/acpica/components/tables/tbutils.c b/sys/contrib/dev/acpica/components/tables/tbutils.c
index 5cc157d271d5..e86e1d1f3cf3 100644
--- a/sys/contrib/dev/acpica/components/tables/tbutils.c
+++ b/sys/contrib/dev/acpica/components/tables/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -193,9 +193,12 @@ AcpiTbCopyDsdt (
     }
 
     ACPI_MEMCPY (NewTable, TableDesc->Pointer, TableDesc->Length);
-    AcpiTbDeleteTable (TableDesc);
-    TableDesc->Pointer = NewTable;
-    TableDesc->Flags = ACPI_TABLE_ORIGIN_ALLOCATED;
+    AcpiTbUninstallTable (TableDesc);
+
+    AcpiTbInitTableDescriptor (
+        &AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT],
+        ACPI_PTR_TO_PHYSADDR (NewTable), ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL,
+        NewTable);
 
     ACPI_INFO ((AE_INFO,
         "Forced DSDT copy: length 0x%05X copied locally, original unmapped",
@@ -205,125 +208,6 @@ AcpiTbCopyDsdt (
 }
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AcpiTbInstallTable
- *
- * PARAMETERS:  Address                 - Physical address of DSDT or FACS
- *              Signature               - Table signature, NULL if no need to
- *                                        match
- *              TableIndex              - Index into root table array
- *
- * RETURN:      None
- *
- * DESCRIPTION: Install an ACPI table into the global data structure. The
- *              table override mechanism is called to allow the host
- *              OS to replace any table before it is installed in the root
- *              table array.
- *
- ******************************************************************************/
-
-void
-AcpiTbInstallTable (
-    ACPI_PHYSICAL_ADDRESS   Address,
-    char                    *Signature,
-    UINT32                  TableIndex)
-{
-    ACPI_TABLE_HEADER       *Table;
-    ACPI_TABLE_HEADER       *FinalTable;
-    ACPI_TABLE_DESC         *TableDesc;
-
-
-    if (!Address)
-    {
-        ACPI_ERROR ((AE_INFO, "Null physical address for ACPI table [%s]",
-            Signature));
-        return;
-    }
-
-    /* Map just the table header */
-
-    Table = AcpiOsMapMemory (Address, sizeof (ACPI_TABLE_HEADER));
-    if (!Table)
-    {
-        ACPI_ERROR ((AE_INFO, "Could not map memory for table [%s] at %p",
-            Signature, ACPI_CAST_PTR (void, Address)));
-        return;
-    }
-
-    /* If a particular signature is expected (DSDT/FACS), it must match */
-
-    if (Signature &&
-        !ACPI_COMPARE_NAME (Table->Signature, Signature))
-    {
-        ACPI_BIOS_ERROR ((AE_INFO,
-            "Invalid signature 0x%X for ACPI table, expected [%s]",
-            *ACPI_CAST_PTR (UINT32, Table->Signature), Signature));
-        goto UnmapAndExit;
-    }
-
-    /*
-     * Initialize the table entry. Set the pointer to NULL, since the
-     * table is not fully mapped at this time.
-     */
-    TableDesc = &AcpiGbl_RootTableList.Tables[TableIndex];
-
-    TableDesc->Address = Address;
-    TableDesc->Pointer = NULL;
-    TableDesc->Length = Table->Length;
-    TableDesc->Flags = ACPI_TABLE_ORIGIN_MAPPED;
-    ACPI_MOVE_32_TO_32 (TableDesc->Signature.Ascii, Table->Signature);
-
-    /*
-     * ACPI Table Override:
-     *
-     * Before we install the table, let the host OS override it with a new
-     * one if desired. Any table within the RSDT/XSDT can be replaced,
-     * including the DSDT which is pointed to by the FADT.
-     *
-     * NOTE: If the table is overridden, then FinalTable will contain a
-     * mapped pointer to the full new table. If the table is not overridden,
-     * or if there has been a physical override, then the table will be
-     * fully mapped later (in verify table). In any case, we must
-     * unmap the header that was mapped above.
-     */
-    FinalTable = AcpiTbTableOverride (Table, TableDesc);
-    if (!FinalTable)
-    {
-        FinalTable = Table; /* There was no override */
-    }
-
-    AcpiTbPrintTableHeader (TableDesc->Address, FinalTable);
-
-    /* Set the global integer width (based upon revision of the DSDT) */
-
-    if (TableIndex == ACPI_TABLE_INDEX_DSDT)
-    {
-        AcpiUtSetIntegerWidth (FinalTable->Revision);
-    }
-
-    /*
-     * If we have a physical override during this early loading of the ACPI
-     * tables, unmap the table for now. It will be mapped again later when
-     * it is actually used. This supports very early loading of ACPI tables,
-     * before virtual memory is fully initialized and running within the
-     * host OS. Note: A logical override has the ACPI_TABLE_ORIGIN_OVERRIDE
-     * flag set and will not be deleted below.
-     */
-    if (FinalTable != Table)
-    {
-        AcpiTbDeleteTable (TableDesc);
-    }
-
-
-UnmapAndExit:
-
-    /* Always unmap the table header that we mapped above */
-
-    AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiTbGetRootTableEntry
@@ -353,7 +237,7 @@ AcpiTbGetRootTableEntry (
      * Get the table physical address (32-bit for RSDT, 64-bit for XSDT):
      * Note: Addresses are 32-bit aligned (not 64) in both RSDT and XSDT
      */
-    if (TableEntrySize == sizeof (UINT32))
+    if (TableEntrySize == ACPI_RSDT_ENTRY_SIZE)
     {
         /*
          * 32-bit platform, RSDT: Return 32-bit table entry
@@ -416,14 +300,14 @@ AcpiTbParseRootTable (
     UINT32                  Length;
     UINT8                   *TableEntry;
     ACPI_STATUS             Status;
+    UINT32                  TableIndex;
 
 
     ACPI_FUNCTION_TRACE (TbParseRootTable);
 
 
-    /*
-     * Map the entire RSDP and extract the address of the RSDT or XSDT
-     */
+    /* Map the entire RSDP and extract the address of the RSDT or XSDT */
+
     Rsdp = AcpiOsMapMemory (RsdpAddress, sizeof (ACPI_TABLE_RSDP));
     if (!Rsdp)
     {
@@ -433,24 +317,26 @@ AcpiTbParseRootTable (
     AcpiTbPrintTableHeader (RsdpAddress,
         ACPI_CAST_PTR (ACPI_TABLE_HEADER, Rsdp));
 
-    /* Differentiate between RSDT and XSDT root tables */
+    /* Use XSDT if present and not overridden. Otherwise, use RSDT */
 
-    if (Rsdp->Revision > 1 && Rsdp->XsdtPhysicalAddress)
+    if ((Rsdp->Revision > 1) &&
+        Rsdp->XsdtPhysicalAddress &&
+        !AcpiGbl_DoNotUseXsdt)
     {
         /*
-         * Root table is an XSDT (64-bit physical addresses). We must use the
-         * XSDT if the revision is > 1 and the XSDT pointer is present, as per
-         * the ACPI specification.
+         * RSDP contains an XSDT (64-bit physical addresses). We must use
+         * the XSDT if the revision is > 1 and the XSDT pointer is present,
+         * as per the ACPI specification.
          */
         Address = (ACPI_PHYSICAL_ADDRESS) Rsdp->XsdtPhysicalAddress;
-        TableEntrySize = sizeof (UINT64);
+        TableEntrySize = ACPI_XSDT_ENTRY_SIZE;
     }
     else
     {
         /* Root table is an RSDT (32-bit physical addresses) */
 
         Address = (ACPI_PHYSICAL_ADDRESS) Rsdp->RsdtPhysicalAddress;
-        TableEntrySize = sizeof (UINT32);
+        TableEntrySize = ACPI_RSDT_ENTRY_SIZE;
     }
 
     /*
@@ -459,7 +345,6 @@ AcpiTbParseRootTable (
      */
     AcpiOsUnmapMemory (Rsdp, sizeof (ACPI_TABLE_RSDP));
 
-
     /* Map the RSDT/XSDT table header to get the full table length */
 
     Table = AcpiOsMapMemory (Address, sizeof (ACPI_TABLE_HEADER));
@@ -470,12 +355,14 @@ AcpiTbParseRootTable (
 
     AcpiTbPrintTableHeader (Address, Table);
 
-    /* Get the length of the full table, verify length and map entire table */
-
+    /*
+     * Validate length of the table, and map entire table.
+     * Minimum length table must contain at least one entry.
+     */
     Length = Table->Length;
     AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
 
-    if (Length < sizeof (ACPI_TABLE_HEADER))
+    if (Length < (sizeof (ACPI_TABLE_HEADER) + TableEntrySize))
     {
         ACPI_BIOS_ERROR ((AE_INFO,
             "Invalid table length 0x%X in RSDT/XSDT", Length));
@@ -497,71 +384,50 @@ AcpiTbParseRootTable (
         return_ACPI_STATUS (Status);
     }
 
-    /* Calculate the number of tables described in the root table */
+    /* Get the number of entries and pointer to first entry */
 
     TableCount = (UINT32) ((Table->Length - sizeof (ACPI_TABLE_HEADER)) /
         TableEntrySize);
+    TableEntry = ACPI_ADD_PTR (UINT8, Table, sizeof (ACPI_TABLE_HEADER));
 
     /*
      * First two entries in the table array are reserved for the DSDT
      * and FACS, which are not actually present in the RSDT/XSDT - they
      * come from the FADT
      */
-    TableEntry = ACPI_CAST_PTR (UINT8, Table) + sizeof (ACPI_TABLE_HEADER);
     AcpiGbl_RootTableList.CurrentTableCount = 2;
 
-    /*
-     * Initialize the root table array from the RSDT/XSDT
-     */
+    /* Initialize the root table array from the RSDT/XSDT */
+
     for (i = 0; i < TableCount; i++)
     {
-        if (AcpiGbl_RootTableList.CurrentTableCount >=
-            AcpiGbl_RootTableList.MaxTableCount)
-        {
-            /* There is no more room in the root table array, attempt resize */
-
-            Status = AcpiTbResizeRootTableList ();
-            if (ACPI_FAILURE (Status))
-            {
-                ACPI_WARNING ((AE_INFO, "Truncating %u table entries!",
-                    (unsigned) (TableCount -
-                    (AcpiGbl_RootTableList.CurrentTableCount - 2))));
-                break;
-            }
-        }
-
         /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
 
-        AcpiGbl_RootTableList.Tables[AcpiGbl_RootTableList.CurrentTableCount].Address =
-            AcpiTbGetRootTableEntry (TableEntry, TableEntrySize);
+        Address = AcpiTbGetRootTableEntry (TableEntry, TableEntrySize);
+
+        /* Skip NULL entries in RSDT/XSDT */
+
+        if (!Address)
+        {
+            goto NextTable;
+        }
+
+        Status = AcpiTbInstallStandardTable (Address,
+            ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
+
+        if (ACPI_SUCCESS (Status) &&
+            ACPI_COMPARE_NAME (&AcpiGbl_RootTableList.Tables[TableIndex].Signature,
+                ACPI_SIG_FADT))
+        {
+            AcpiTbParseFadt (TableIndex);
+        }
+
+NextTable:
 
         TableEntry += TableEntrySize;
-        AcpiGbl_RootTableList.CurrentTableCount++;
     }
 
-    /*
-     * It is not possible to map more than one entry in some environments,
-     * so unmap the root table here before mapping other tables
-     */
     AcpiOsUnmapMemory (Table, Length);
 
-    /*
-     * Complete the initialization of the root table array by examining
-     * the header of each table
-     */
-    for (i = 2; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
-    {
-        AcpiTbInstallTable (AcpiGbl_RootTableList.Tables[i].Address,
-            NULL, i);
-
-        /* Special case for FADT - get the DSDT and FACS */
-
-        if (ACPI_COMPARE_NAME (
-                &AcpiGbl_RootTableList.Tables[i].Signature, ACPI_SIG_FADT))
-        {
-            AcpiTbParseFadt (i);
-        }
-    }
-
     return_ACPI_STATUS (AE_OK);
 }
diff --git a/sys/contrib/dev/acpica/components/tables/tbxface.c b/sys/contrib/dev/acpica/components/tables/tbxface.c
index 80381aa8d38c..126d9ca3c2aa 100644
--- a/sys/contrib/dev/acpica/components/tables/tbxface.c
+++ b/sys/contrib/dev/acpica/components/tables/tbxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #define __TBXFACE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -161,7 +162,7 @@ AcpiInitializeTables (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiInitializeTables)
+ACPI_EXPORT_SYMBOL_INIT (AcpiInitializeTables)
 
 
 /*******************************************************************************
@@ -204,7 +205,7 @@ AcpiReallocateRootTable (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiReallocateRootTable)
+ACPI_EXPORT_SYMBOL_INIT (AcpiReallocateRootTable)
 
 
 /*******************************************************************************
@@ -261,7 +262,7 @@ AcpiGetTableHeader (
         {
             if ((AcpiGbl_RootTableList.Tables[i].Flags &
                     ACPI_TABLE_ORIGIN_MASK) ==
-                ACPI_TABLE_ORIGIN_MAPPED)
+                ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL)
             {
                 Header = AcpiOsMapMemory (
                             AcpiGbl_RootTableList.Tables[i].Address,
@@ -344,7 +345,7 @@ AcpiGetTable (
             continue;
         }
 
-        Status = AcpiTbVerifyTable (&AcpiGbl_RootTableList.Tables[i]);
+        Status = AcpiTbValidateTable (&AcpiGbl_RootTableList.Tables[i]);
         if (ACPI_SUCCESS (Status))
         {
             *OutTable = AcpiGbl_RootTableList.Tables[i].Pointer;
@@ -405,7 +406,7 @@ AcpiGetTableByIndex (
     {
         /* Table is not mapped, map it */
 
-        Status = AcpiTbVerifyTable (&AcpiGbl_RootTableList.Tables[TableIndex]);
+        Status = AcpiTbValidateTable (&AcpiGbl_RootTableList.Tables[TableIndex]);
         if (ACPI_FAILURE (Status))
         {
             (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
diff --git a/sys/contrib/dev/acpica/components/tables/tbxfload.c b/sys/contrib/dev/acpica/components/tables/tbxfload.c
index 171f74c0fc70..da34e3d55a20 100644
--- a/sys/contrib/dev/acpica/components/tables/tbxfload.c
+++ b/sys/contrib/dev/acpica/components/tables/tbxfload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #define __TBXFLOAD_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -92,7 +93,7 @@ AcpiLoadTables (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiLoadTables)
+ACPI_EXPORT_SYMBOL_INIT (AcpiLoadTables)
 
 
 /*******************************************************************************
@@ -130,7 +131,7 @@ AcpiTbLoadNamespace (
         !ACPI_COMPARE_NAME (
             &(AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Signature),
             ACPI_SIG_DSDT) ||
-         ACPI_FAILURE (AcpiTbVerifyTable (
+         ACPI_FAILURE (AcpiTbValidateTable (
             &AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT])))
     {
         Status = AE_NO_ACPI_TABLES;
@@ -141,7 +142,7 @@ AcpiTbLoadNamespace (
      * Save the DSDT pointer for simple access. This is the mapped memory
      * address. We must take care here because the address of the .Tables
      * array can change dynamically as tables are loaded at run-time. Note:
-     * .Pointer field is not validated until after call to AcpiTbVerifyTable.
+     * .Pointer field is not validated until after call to AcpiTbValidateTable.
      */
     AcpiGbl_DSDT = AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Pointer;
 
@@ -186,24 +187,12 @@ AcpiTbLoadNamespace (
                     ACPI_SIG_SSDT) &&
              !ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
                     ACPI_SIG_PSDT)) ||
-             ACPI_FAILURE (AcpiTbVerifyTable (
+             ACPI_FAILURE (AcpiTbValidateTable (
                 &AcpiGbl_RootTableList.Tables[i])))
         {
             continue;
         }
 
-        /*
-         * Optionally do not load any SSDTs from the RSDT/XSDT. This can
-         * be useful for debugging ACPI problems on some machines.
-         */
-        if (AcpiGbl_DisableSsdtTableLoad)
-        {
-            ACPI_INFO ((AE_INFO, "Ignoring %4.4s at %p",
-                AcpiGbl_RootTableList.Tables[i].Signature.Ascii,
-                ACPI_CAST_PTR (void, AcpiGbl_RootTableList.Tables[i].Address)));
-            continue;
-        }
-
         /* Ignore errors while loading tables, get as many as possible */
 
         (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
@@ -219,6 +208,53 @@ AcpiTbLoadNamespace (
 }
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiInstallTable
+ *
+ * PARAMETERS:  Address             - Address of the ACPI table to be installed.
+ *              Physical            - Whether the address is a physical table
+ *                                    address or not
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Dynamically install an ACPI table.
+ *              Note: This function should only be invoked after
+ *                    AcpiInitializeTables() and before AcpiLoadTables().
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiInstallTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    BOOLEAN                 Physical)
+{
+    ACPI_STATUS             Status;
+    UINT8                   Flags;
+    UINT32                  TableIndex;
+
+
+    ACPI_FUNCTION_TRACE (AcpiInstallTable);
+
+
+    if (Physical)
+    {
+        Flags = ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL;
+    }
+    else
+    {
+        Flags = ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL;
+    }
+
+    Status = AcpiTbInstallStandardTable (Address, Flags,
+        FALSE, FALSE, &TableIndex);
+
+    return_ACPI_STATUS (Status);
+}
+
+ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable)
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiLoadTable
@@ -241,7 +277,6 @@ AcpiLoadTable (
     ACPI_TABLE_HEADER       *Table)
 {
     ACPI_STATUS             Status;
-    ACPI_TABLE_DESC         TableDesc;
     UINT32                  TableIndex;
 
 
@@ -255,14 +290,6 @@ AcpiLoadTable (
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
 
-    /* Init local table descriptor */
-
-    ACPI_MEMSET (&TableDesc, 0, sizeof (ACPI_TABLE_DESC));
-    TableDesc.Address = ACPI_PTR_TO_PHYSADDR (Table);
-    TableDesc.Pointer = Table;
-    TableDesc.Length = Table->Length;
-    TableDesc.Flags = ACPI_TABLE_ORIGIN_UNKNOWN;
-
     /* Must acquire the interpreter lock during this operation */
 
     Status = AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER);
@@ -274,7 +301,23 @@ AcpiLoadTable (
     /* Install the table and load it into the namespace */
 
     ACPI_INFO ((AE_INFO, "Host-directed Dynamic ACPI Table Load:"));
-    Status = AcpiTbAddTable (&TableDesc, &TableIndex);
+    (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+
+    Status = AcpiTbInstallStandardTable (ACPI_PTR_TO_PHYSADDR (Table),
+                ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, TRUE, FALSE,
+                &TableIndex);
+
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
+    if (ACPI_FAILURE (Status))
+    {
+        goto UnlockAndExit;
+    }
+
+    /*
+     * Note: Now table is "INSTALLED", it must be validated before
+     * using.
+     */
+    Status = AcpiTbValidateTable (&AcpiGbl_RootTableList.Tables[TableIndex]);
     if (ACPI_FAILURE (Status))
     {
         goto UnlockAndExit;
diff --git a/sys/contrib/dev/acpica/components/tables/tbxfroot.c b/sys/contrib/dev/acpica/components/tables/tbxfroot.c
index 0b9fe7228127..885350ea2ef5 100644
--- a/sys/contrib/dev/acpica/components/tables/tbxfroot.c
+++ b/sys/contrib/dev/acpica/components/tables/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,43 @@
         ACPI_MODULE_NAME    ("tbxfroot")
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiTbGetRsdpLength
+ *
+ * PARAMETERS:  Rsdp                - Pointer to RSDP
+ *
+ * RETURN:      Table length
+ *
+ * DESCRIPTION: Get the length of the RSDP
+ *
+ ******************************************************************************/
+
+UINT32
+AcpiTbGetRsdpLength (
+    ACPI_TABLE_RSDP         *Rsdp)
+{
+
+    if (!ACPI_VALIDATE_RSDP_SIG (Rsdp->Signature))
+    {
+        /* BAD Signature */
+
+        return (0);
+    }
+
+    /* "Length" field is available if table version >= 2 */
+
+    if (Rsdp->Revision >= 2)
+    {
+        return (Rsdp->Length);
+    }
+    else
+    {
+        return (ACPI_RSDP_CHECKSUM_LENGTH);
+    }
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiTbValidateRsdp
diff --git a/sys/contrib/dev/acpica/components/utilities/utaddress.c b/sys/contrib/dev/acpica/components/utilities/utaddress.c
index da8b0465d1ff..77d3ecea5291 100644
--- a/sys/contrib/dev/acpica/components/utilities/utaddress.c
+++ b/sys/contrib/dev/acpica/components/utilities/utaddress.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -248,10 +248,11 @@ AcpiUtCheckAddressRange (
     while (RangeInfo)
     {
         /*
-         * Check if the requested Address/Length overlaps this AddressRange.
-         * Four cases to consider:
+         * Check if the requested address/length overlaps this
+         * address range. There are four cases to consider:
          *
-         * 1) Input address/length is contained completely in the address range
+         * 1) Input address/length is contained completely in the
+         *    address range
          * 2) Input address/length overlaps range at the range start
          * 3) Input address/length overlaps range at the range end
          * 4) Input address/length completely encompasses the range
@@ -267,10 +268,13 @@ AcpiUtCheckAddressRange (
                 Pathname = AcpiNsGetExternalPathname (RangeInfo->RegionNode);
 
                 ACPI_WARNING ((AE_INFO,
-                    "0x%p-0x%p %s conflicts with Region %s %d",
+                    "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)",
+                    AcpiUtGetRegionName (SpaceId),
                     ACPI_CAST_PTR (void, Address),
                     ACPI_CAST_PTR (void, EndAddress),
-                    AcpiUtGetRegionName (SpaceId), Pathname, OverlapCount));
+                    ACPI_CAST_PTR (void, RangeInfo->StartAddress),
+                    ACPI_CAST_PTR (void, RangeInfo->EndAddress),
+                    Pathname));
                 ACPI_FREE (Pathname);
             }
         }
diff --git a/sys/contrib/dev/acpica/components/utilities/utalloc.c b/sys/contrib/dev/acpica/components/utilities/utalloc.c
index 0bdb2ffac55a..70a813117851 100644
--- a/sys/contrib/dev/acpica/components/utilities/utalloc.c
+++ b/sys/contrib/dev/acpica/components/utilities/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,45 @@
         ACPI_MODULE_NAME    ("utalloc")
 
 
+#if !defined (USE_NATIVE_ALLOCATE_ZEROED)
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsAllocateZeroed
+ *
+ * PARAMETERS:  Size                - Size of the allocation
+ *
+ * RETURN:      Address of the allocated memory on success, NULL on failure.
+ *
+ * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.
+ *              This is the default implementation. Can be overridden via the
+ *              USE_NATIVE_ALLOCATE_ZEROED flag.
+ *
+ ******************************************************************************/
+
+void *
+AcpiOsAllocateZeroed (
+    ACPI_SIZE               Size)
+{
+    void                    *Allocation;
+
+
+    ACPI_FUNCTION_ENTRY ();
+
+
+    Allocation = AcpiOsAllocate (Size);
+    if (Allocation)
+    {
+        /* Clear the memory block */
+
+        ACPI_MEMSET (Allocation, 0, Size);
+    }
+
+    return (Allocation);
+}
+
+#endif /* !USE_NATIVE_ALLOCATE_ZEROED */
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiUtCreateCaches
@@ -285,9 +324,13 @@ AcpiUtInitializeBuffer (
         return (AE_BUFFER_OVERFLOW);
 
     case ACPI_ALLOCATE_BUFFER:
-
-        /* Allocate a new buffer */
-
+        /*
+         * Allocate a new buffer. We directectly call AcpiOsAllocate here to
+         * purposefully bypass the (optionally enabled) internal allocation
+         * tracking mechanism since we only want to track internal
+         * allocations. Note: The caller should use AcpiOsFree to free this
+         * buffer created via ACPI_ALLOCATE_BUFFER.
+         */
         Buffer->Pointer = AcpiOsAllocate (RequiredLength);
         break;
 
@@ -321,95 +364,3 @@ AcpiUtInitializeBuffer (
     ACPI_MEMSET (Buffer->Pointer, 0, RequiredLength);
     return (AE_OK);
 }
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiUtAllocate
- *
- * PARAMETERS:  Size                - Size of the allocation
- *              Component           - Component type of caller
- *              Module              - Source file name of caller
- *              Line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: Subsystem equivalent of malloc.
- *
- ******************************************************************************/
-
-void *
-AcpiUtAllocate (
-    ACPI_SIZE               Size,
-    UINT32                  Component,
-    const char              *Module,
-    UINT32                  Line)
-{
-    void                    *Allocation;
-
-
-    ACPI_FUNCTION_TRACE_U32 (UtAllocate, Size);
-
-
-    /* Check for an inadvertent size of zero bytes */
-
-    if (!Size)
-    {
-        ACPI_WARNING ((Module, Line,
-            "Attempt to allocate zero bytes, allocating 1 byte"));
-        Size = 1;
-    }
-
-    Allocation = AcpiOsAllocate (Size);
-    if (!Allocation)
-    {
-        /* Report allocation error */
-
-        ACPI_WARNING ((Module, Line,
-            "Could not allocate size %u", (UINT32) Size));
-
-        return_PTR (NULL);
-    }
-
-    return_PTR (Allocation);
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiUtAllocateZeroed
- *
- * PARAMETERS:  Size                - Size of the allocation
- *              Component           - Component type of caller
- *              Module              - Source file name of caller
- *              Line                - Line number of caller
- *
- * RETURN:      Address of the allocated memory on success, NULL on failure.
- *
- * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.
- *
- ******************************************************************************/
-
-void *
-AcpiUtAllocateZeroed (
-    ACPI_SIZE               Size,
-    UINT32                  Component,
-    const char              *Module,
-    UINT32                  Line)
-{
-    void                    *Allocation;
-
-
-    ACPI_FUNCTION_ENTRY ();
-
-
-    Allocation = AcpiUtAllocate (Size, Component, Module, Line);
-    if (Allocation)
-    {
-        /* Clear the memory block */
-
-        ACPI_MEMSET (Allocation, 0, Size);
-    }
-
-    return (Allocation);
-}
diff --git a/sys/contrib/dev/acpica/components/utilities/utbuffer.c b/sys/contrib/dev/acpica/components/utilities/utbuffer.c
index 508a940ca5a0..ee7f9e5a8315 100644
--- a/sys/contrib/dev/acpica/components/utilities/utbuffer.c
+++ b/sys/contrib/dev/acpica/components/utilities/utbuffer.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -218,3 +218,138 @@ AcpiUtDebugDumpBuffer (
 
     AcpiUtDumpBuffer (Buffer, Count, Display, 0);
 }
+
+
+#ifdef ACPI_APPLICATION
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtDumpBufferToFile
+ *
+ * PARAMETERS:  File                - File descriptor
+ *              Buffer              - Buffer to dump
+ *              Count               - Amount to dump, in bytes
+ *              Display             - BYTE, WORD, DWORD, or QWORD display:
+ *                                      DB_BYTE_DISPLAY
+ *                                      DB_WORD_DISPLAY
+ *                                      DB_DWORD_DISPLAY
+ *                                      DB_QWORD_DISPLAY
+ *              BaseOffset          - Beginning buffer offset (display only)
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Generic dump buffer in both hex and ascii to a file.
+ *
+ ******************************************************************************/
+
+void
+AcpiUtDumpBufferToFile (
+    ACPI_FILE               File,
+    UINT8                   *Buffer,
+    UINT32                  Count,
+    UINT32                  Display,
+    UINT32                  BaseOffset)
+{
+    UINT32                  i = 0;
+    UINT32                  j;
+    UINT32                  Temp32;
+    UINT8                   BufChar;
+
+
+    if (!Buffer)
+    {
+        AcpiUtFilePrintf (File, "Null Buffer Pointer in DumpBuffer!\n");
+        return;
+    }
+
+    if ((Count < 4) || (Count & 0x01))
+    {
+        Display = DB_BYTE_DISPLAY;
+    }
+
+    /* Nasty little dump buffer routine! */
+
+    while (i < Count)
+    {
+        /* Print current offset */
+
+        AcpiUtFilePrintf (File, "%6.4X: ", (BaseOffset + i));
+
+        /* Print 16 hex chars */
+
+        for (j = 0; j < 16;)
+        {
+            if (i + j >= Count)
+            {
+                /* Dump fill spaces */
+
+                AcpiUtFilePrintf (File, "%*s", ((Display * 2) + 1), " ");
+                j += Display;
+                continue;
+            }
+
+            switch (Display)
+            {
+            case DB_BYTE_DISPLAY:
+            default:    /* Default is BYTE display */
+
+                AcpiUtFilePrintf (File, "%02X ", Buffer[(ACPI_SIZE) i + j]);
+                break;
+
+            case DB_WORD_DISPLAY:
+
+                ACPI_MOVE_16_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]);
+                AcpiUtFilePrintf (File, "%04X ", Temp32);
+                break;
+
+            case DB_DWORD_DISPLAY:
+
+                ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]);
+                AcpiUtFilePrintf (File, "%08X ", Temp32);
+                break;
+
+            case DB_QWORD_DISPLAY:
+
+                ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j]);
+                AcpiUtFilePrintf (File, "%08X", Temp32);
+
+                ACPI_MOVE_32_TO_32 (&Temp32, &Buffer[(ACPI_SIZE) i + j + 4]);
+                AcpiUtFilePrintf (File, "%08X ", Temp32);
+                break;
+            }
+
+            j += Display;
+        }
+
+        /*
+         * Print the ASCII equivalent characters but watch out for the bad
+         * unprintable ones (printable chars are 0x20 through 0x7E)
+         */
+        AcpiUtFilePrintf (File, " ");
+        for (j = 0; j < 16; j++)
+        {
+            if (i + j >= Count)
+            {
+                AcpiUtFilePrintf (File, "\n");
+                return;
+            }
+
+            BufChar = Buffer[(ACPI_SIZE) i + j];
+            if (ACPI_IS_PRINT (BufChar))
+            {
+                AcpiUtFilePrintf (File, "%c", BufChar);
+            }
+            else
+            {
+                AcpiUtFilePrintf (File, ".");
+            }
+        }
+
+        /* Done with that line. */
+
+        AcpiUtFilePrintf (File, "\n");
+        i += 16;
+    }
+
+    return;
+}
+#endif
diff --git a/sys/contrib/dev/acpica/components/utilities/utcache.c b/sys/contrib/dev/acpica/components/utilities/utcache.c
index 2aa3e5bbdbae..f6c2d02a24ba 100644
--- a/sys/contrib/dev/acpica/components/utilities/utcache.c
+++ b/sys/contrib/dev/acpica/components/utilities/utcache.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286,13 +286,13 @@ AcpiOsAcquireObject (
 
     if (!Cache)
     {
-        return (NULL);
+        return_PTR (NULL);
     }
 
     Status = AcpiUtAcquireMutex (ACPI_MTX_CACHES);
     if (ACPI_FAILURE (Status))
     {
-        return (NULL);
+        return_PTR (NULL);
     }
 
     ACPI_MEM_TRACKING (Cache->Requests++);
@@ -315,7 +315,7 @@ AcpiOsAcquireObject (
         Status = AcpiUtReleaseMutex (ACPI_MTX_CACHES);
         if (ACPI_FAILURE (Status))
         {
-            return (NULL);
+            return_PTR (NULL);
         }
 
         /* Clear (zero) the previously used Object */
@@ -340,16 +340,16 @@ AcpiOsAcquireObject (
         Status = AcpiUtReleaseMutex (ACPI_MTX_CACHES);
         if (ACPI_FAILURE (Status))
         {
-            return (NULL);
+            return_PTR (NULL);
         }
 
         Object = ACPI_ALLOCATE_ZEROED (Cache->ObjectSize);
         if (!Object)
         {
-            return (NULL);
+            return_PTR (NULL);
         }
     }
 
-    return (Object);
+    return_PTR (Object);
 }
 #endif /* ACPI_USE_LOCAL_CACHE */
diff --git a/sys/contrib/dev/acpica/components/utilities/utcopy.c b/sys/contrib/dev/acpica/components/utilities/utcopy.c
index dacbc5cc79d9..68e58ddc04fb 100644
--- a/sys/contrib/dev/acpica/components/utilities/utcopy.c
+++ b/sys/contrib/dev/acpica/components/utilities/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -564,10 +564,10 @@ AcpiUtCopyEsimpleToIsimple (
 
     case ACPI_TYPE_LOCAL_REFERENCE:
 
-        /* TBD: should validate incoming handle */
+        /* An incoming reference is defined to be a namespace node */
 
-        InternalObject->Reference.Class = ACPI_REFCLASS_NAME;
-        InternalObject->Reference.Node = ExternalObject->Reference.Handle;
+        InternalObject->Reference.Class = ACPI_REFCLASS_REFOF;
+        InternalObject->Reference.Object = ExternalObject->Reference.Handle;
         break;
 
     default:
@@ -1063,5 +1063,12 @@ AcpiUtCopyIobjectToIobject (
         Status = AcpiUtCopySimpleObject (SourceDesc, *DestDesc);
     }
 
+    /* Delete the allocated object if copy failed */
+
+    if (ACPI_FAILURE (Status))
+    {
+        AcpiUtRemoveReference(*DestDesc);
+    }
+
     return_ACPI_STATUS (Status);
 }
diff --git a/sys/contrib/dev/acpica/components/utilities/utdebug.c b/sys/contrib/dev/acpica/components/utilities/utdebug.c
index 93c036104788..33350ca92382 100644
--- a/sys/contrib/dev/acpica/components/utilities/utdebug.c
+++ b/sys/contrib/dev/acpica/components/utilities/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #define __UTDEBUG_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -210,6 +211,7 @@ AcpiDebugPrint (
         }
 
         AcpiGbl_PrevThreadId = ThreadId;
+        AcpiGbl_NestingLevel = 0;
     }
 
     /*
@@ -218,13 +220,22 @@ AcpiDebugPrint (
      */
     AcpiOsPrintf ("%9s-%04ld ", ModuleName, LineNumber);
 
+#ifdef ACPI_APPLICATION
+    /*
+     * For AcpiExec/iASL only, emit the thread ID and nesting level.
+     * Note: nesting level is really only useful during a single-thread
+     * execution. Otherwise, multiple threads will keep resetting the
+     * level.
+     */
     if (ACPI_LV_THREADS & AcpiDbgLevel)
     {
         AcpiOsPrintf ("[%u] ", (UINT32) ThreadId);
     }
 
-    AcpiOsPrintf ("[%02ld] %-22.22s: ",
-        AcpiGbl_NestingLevel, AcpiUtTrimFunctionName (FunctionName));
+    AcpiOsPrintf ("[%02ld] ", AcpiGbl_NestingLevel);
+#endif
+
+    AcpiOsPrintf ("%-22.22s: ", AcpiUtTrimFunctionName (FunctionName));
 
     va_start (args, Format);
     AcpiOsVprintf (Format, args);
@@ -474,7 +485,10 @@ AcpiUtExit (
             "%s\n", AcpiGbl_FnExitStr);
     }
 
-    AcpiGbl_NestingLevel--;
+    if (AcpiGbl_NestingLevel)
+    {
+        AcpiGbl_NestingLevel--;
+    }
 }
 
 ACPI_EXPORT_SYMBOL (AcpiUtExit)
@@ -526,7 +540,10 @@ AcpiUtStatusExit (
         }
     }
 
-    AcpiGbl_NestingLevel--;
+    if (AcpiGbl_NestingLevel)
+    {
+        AcpiGbl_NestingLevel--;
+    }
 }
 
 ACPI_EXPORT_SYMBOL (AcpiUtStatusExit)
@@ -568,7 +585,10 @@ AcpiUtValueExit (
             ACPI_FORMAT_UINT64 (Value));
     }
 
-    AcpiGbl_NestingLevel--;
+    if (AcpiGbl_NestingLevel)
+    {
+        AcpiGbl_NestingLevel--;
+    }
 }
 
 ACPI_EXPORT_SYMBOL (AcpiUtValueExit)
@@ -609,7 +629,40 @@ AcpiUtPtrExit (
             "%s %p\n", AcpiGbl_FnExitStr, Ptr);
     }
 
-    AcpiGbl_NestingLevel--;
+    if (AcpiGbl_NestingLevel)
+    {
+        AcpiGbl_NestingLevel--;
+    }
 }
 
 #endif
+
+
+#ifdef ACPI_APPLICATION
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiLogError
+ *
+ * PARAMETERS:  Format              - Printf format field
+ *              ...                 - Optional printf arguments
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print error message to the console, used by applications.
+ *
+ ******************************************************************************/
+
+void  ACPI_INTERNAL_VAR_XFACE
+AcpiLogError (
+    const char              *Format,
+    ...)
+{
+    va_list                 Args;
+
+    va_start (Args, Format);
+    (void) AcpiUtFileVprintf (ACPI_FILE_ERR, Format, Args);
+    va_end (Args);
+}
+
+ACPI_EXPORT_SYMBOL (AcpiLogError)
+#endif
diff --git a/sys/contrib/dev/acpica/components/utilities/utdecode.c b/sys/contrib/dev/acpica/components/utilities/utdecode.c
index 3075479a6102..9fd52077cd61 100644
--- a/sys/contrib/dev/acpica/components/utilities/utdecode.c
+++ b/sys/contrib/dev/acpica/components/utilities/utdecode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,38 +91,6 @@ const UINT8                     AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] =
 };
 
 
-/*******************************************************************************
- *
- * FUNCTION:    AcpiUtHexToAsciiChar
- *
- * PARAMETERS:  Integer             - Contains the hex digit
- *              Position            - bit position of the digit within the
- *                                    integer (multiple of 4)
- *
- * RETURN:      The converted Ascii character
- *
- * DESCRIPTION: Convert a hex digit to an Ascii character
- *
- ******************************************************************************/
-
-/* Hex to ASCII conversion table */
-
-static const char           AcpiGbl_HexToAscii[] =
-{
-    '0','1','2','3','4','5','6','7',
-    '8','9','A','B','C','D','E','F'
-};
-
-char
-AcpiUtHexToAsciiChar (
-    UINT64                  Integer,
-    UINT32                  Position)
-{
-
-    return (AcpiGbl_HexToAscii[(Integer >> Position) & 0xF]);
-}
-
-
 /*******************************************************************************
  *
  * FUNCTION:    AcpiUtGetRegionName
@@ -527,7 +495,7 @@ AcpiUtGetMutexName (
 
 /* Names for Notify() values, used for debug output */
 
-static const char           *AcpiGbl_NotifyValueNames[ACPI_NOTIFY_MAX + 1] =
+static const char           *AcpiGbl_GenericNotify[ACPI_NOTIFY_MAX + 1] =
 {
     /* 00 */ "Bus Check",
     /* 01 */ "Device Check",
@@ -539,32 +507,88 @@ static const char           *AcpiGbl_NotifyValueNames[ACPI_NOTIFY_MAX + 1] =
     /* 07 */ "Power Fault",
     /* 08 */ "Capabilities Check",
     /* 09 */ "Device PLD Check",
-    /* 10 */ "Reserved",
-    /* 11 */ "System Locality Update",
-    /* 12 */ "Shutdown Request"
+    /* 0A */ "Reserved",
+    /* 0B */ "System Locality Update",
+    /* 0C */ "Shutdown Request",
+    /* 0D */ "System Resource Affinity Update"
 };
 
+static const char           *AcpiGbl_DeviceNotify[4] =
+{
+    /* 80 */ "Status Change",
+    /* 81 */ "Information Change",
+    /* 82 */ "Device-Specific Change",
+    /* 83 */ "Device-Specific Change"
+};
+
+static const char           *AcpiGbl_ProcessorNotify[4] =
+{
+    /* 80 */ "Performance Capability Change",
+    /* 81 */ "C-State Change",
+    /* 82 */ "Throttling Capability Change",
+    /* 83 */ "Device-Specific Change"
+};
+
+static const char           *AcpiGbl_ThermalNotify[4] =
+{
+    /* 80 */ "Thermal Status Change",
+    /* 81 */ "Thermal Trip Point Change",
+    /* 82 */ "Thermal Device List Change",
+    /* 83 */ "Thermal Relationship Change"
+};
+
+
 const char *
 AcpiUtGetNotifyName (
-    UINT32                  NotifyValue)
+    UINT32                  NotifyValue,
+    ACPI_OBJECT_TYPE        Type)
 {
 
+    /* 00 - 0D are common to all object types */
+
     if (NotifyValue <= ACPI_NOTIFY_MAX)
     {
-        return (AcpiGbl_NotifyValueNames[NotifyValue]);
+        return (AcpiGbl_GenericNotify[NotifyValue]);
     }
-    else if (NotifyValue <= ACPI_MAX_SYS_NOTIFY)
+
+    /* 0D - 7F are reserved */
+
+    if (NotifyValue <= ACPI_MAX_SYS_NOTIFY)
     {
         return ("Reserved");
     }
-    else if (NotifyValue <= ACPI_MAX_DEVICE_SPECIFIC_NOTIFY)
+
+    /* 80 - 83 are per-object-type */
+
+    if (NotifyValue <= 0x83)
     {
-        return ("Device Specific");
+        switch (Type)
+        {
+        case ACPI_TYPE_ANY:
+        case ACPI_TYPE_DEVICE:
+            return (AcpiGbl_DeviceNotify [NotifyValue - 0x80]);
+
+        case ACPI_TYPE_PROCESSOR:
+            return (AcpiGbl_ProcessorNotify [NotifyValue - 0x80]);
+
+        case ACPI_TYPE_THERMAL:
+            return (AcpiGbl_ThermalNotify [NotifyValue - 0x80]);
+
+        default:
+            return ("Target object type does not support notifies");
+        }
     }
-    else
+
+    /* 84 - BF are device-specific */
+
+    if (NotifyValue <= ACPI_MAX_DEVICE_SPECIFIC_NOTIFY)
     {
-        return ("Hardware Specific");
+        return ("Device-Specific");
     }
+
+    /* C0 and above are hardware-specific */
+
+    return ("Hardware-Specific");
 }
 #endif
 
diff --git a/sys/contrib/dev/acpica/components/utilities/utdelete.c b/sys/contrib/dev/acpica/components/utilities/utdelete.c
index 6f1f89b310d1..60b456fa3bec 100644
--- a/sys/contrib/dev/acpica/components/utilities/utdelete.c
+++ b/sys/contrib/dev/acpica/components/utilities/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,6 +86,7 @@ AcpiUtDeleteInternalObj (
     ACPI_OPERAND_OBJECT     *HandlerDesc;
     ACPI_OPERAND_OBJECT     *SecondDesc;
     ACPI_OPERAND_OBJECT     *NextDesc;
+    ACPI_OPERAND_OBJECT     *StartDesc;
     ACPI_OPERAND_OBJECT     **LastObjPtr;
 
 
@@ -250,9 +251,10 @@ AcpiUtDeleteInternalObj (
             if (HandlerDesc)
             {
                 NextDesc = HandlerDesc->AddressSpace.RegionList;
+                StartDesc = NextDesc;
                 LastObjPtr = &HandlerDesc->AddressSpace.RegionList;
 
-                /* Remove the region object from the handler's list */
+                /* Remove the region object from the handler list */
 
                 while (NextDesc)
                 {
@@ -262,10 +264,20 @@ AcpiUtDeleteInternalObj (
                         break;
                     }
 
-                    /* Walk the linked list of handler */
+                    /* Walk the linked list of handlers */
 
                     LastObjPtr = &NextDesc->Region.Next;
                     NextDesc = NextDesc->Region.Next;
+
+                    /* Prevent infinite loop if list is corrupted */
+
+                    if (NextDesc == StartDesc)
+                    {
+                        ACPI_ERROR ((AE_INFO,
+                            "Circular region list in address handler object %p",
+                            HandlerDesc));
+                        return_VOID;
+                    }
                 }
 
                 if (HandlerDesc->AddressSpace.HandlerFlags &
diff --git a/sys/contrib/dev/acpica/components/utilities/uterror.c b/sys/contrib/dev/acpica/components/utilities/uterror.c
index b7aef1840c43..3c62b6201c91 100644
--- a/sys/contrib/dev/acpica/components/utilities/uterror.c
+++ b/sys/contrib/dev/acpica/components/utilities/uterror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/utilities/uteval.c b/sys/contrib/dev/acpica/components/utilities/uteval.c
index ba4d6eef88da..a693c84f4a1f 100644
--- a/sys/contrib/dev/acpica/components/utilities/uteval.c
+++ b/sys/contrib/dev/acpica/components/utilities/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/utilities/utexcep.c b/sys/contrib/dev/acpica/components/utilities/utexcep.c
index d69dbf035e25..c7f7b9c21521 100644
--- a/sys/contrib/dev/acpica/components/utilities/utexcep.c
+++ b/sys/contrib/dev/acpica/components/utilities/utexcep.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTEXCEP_C__
+#define EXPORT_ACPI_INTERFACES
 
 #define ACPI_DEFINE_EXCEPTION_TABLE
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utfileio.c b/sys/contrib/dev/acpica/components/utilities/utfileio.c
new file mode 100644
index 000000000000..936fa6fd01b9
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/utilities/utfileio.c
@@ -0,0 +1,361 @@
+/*******************************************************************************
+ *
+ * Module Name: utfileio - simple file I/O routines
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <contrib/dev/acpica/include/actables.h>
+#include <contrib/dev/acpica/include/acapps.h>
+
+#ifdef ACPI_ASL_COMPILER
+#include <contrib/dev/acpica/compiler/aslcompiler.h>
+#endif
+
+
+#define _COMPONENT          ACPI_CA_DEBUGGER
+        ACPI_MODULE_NAME    ("utfileio")
+
+
+#ifdef ACPI_APPLICATION
+
+/* Local prototypes */
+
+static ACPI_STATUS
+AcpiUtCheckTextModeCorruption (
+    UINT8                   *Table,
+    UINT32                  TableLength,
+    UINT32                  FileLength);
+
+static ACPI_STATUS
+AcpiUtReadTable (
+    FILE                    *fp,
+    ACPI_TABLE_HEADER       **Table,
+    UINT32                  *TableLength);
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtCheckTextModeCorruption
+ *
+ * PARAMETERS:  Table           - Table buffer
+ *              TableLength     - Length of table from the table header
+ *              FileLength      - Length of the file that contains the table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Check table for text mode file corruption where all linefeed
+ *              characters (LF) have been replaced by carriage return linefeed
+ *              pairs (CR/LF).
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiUtCheckTextModeCorruption (
+    UINT8                   *Table,
+    UINT32                  TableLength,
+    UINT32                  FileLength)
+{
+    UINT32                  i;
+    UINT32                  Pairs = 0;
+
+
+    if (TableLength != FileLength)
+    {
+        ACPI_WARNING ((AE_INFO,
+            "File length (0x%X) is not the same as the table length (0x%X)",
+            FileLength, TableLength));
+    }
+
+    /* Scan entire table to determine if each LF has been prefixed with a CR */
+
+    for (i = 1; i < FileLength; i++)
+    {
+        if (Table[i] == 0x0A)
+        {
+            if (Table[i - 1] != 0x0D)
+            {
+                /* The LF does not have a preceding CR, table not corrupted */
+
+                return (AE_OK);
+            }
+            else
+            {
+                /* Found a CR/LF pair */
+
+                Pairs++;
+            }
+            i++;
+        }
+    }
+
+    if (!Pairs)
+    {
+        return (AE_OK);
+    }
+
+    /*
+     * Entire table scanned, each CR is part of a CR/LF pair --
+     * meaning that the table was treated as a text file somewhere.
+     *
+     * NOTE: We can't "fix" the table, because any existing CR/LF pairs in the
+     * original table are left untouched by the text conversion process --
+     * meaning that we cannot simply replace CR/LF pairs with LFs.
+     */
+    AcpiOsPrintf ("Table has been corrupted by text mode conversion\n");
+    AcpiOsPrintf ("All LFs (%u) were changed to CR/LF pairs\n", Pairs);
+    AcpiOsPrintf ("Table cannot be repaired!\n");
+    return (AE_BAD_VALUE);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtReadTable
+ *
+ * PARAMETERS:  fp              - File that contains table
+ *              Table           - Return value, buffer with table
+ *              TableLength     - Return value, length of table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the DSDT from the file pointer
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AcpiUtReadTable (
+    FILE                    *fp,
+    ACPI_TABLE_HEADER       **Table,
+    UINT32                  *TableLength)
+{
+    ACPI_TABLE_HEADER       TableHeader;
+    UINT32                  Actual;
+    ACPI_STATUS             Status;
+    UINT32                  FileSize;
+    BOOLEAN                 StandardHeader = TRUE;
+    INT32                   Count;
+
+    /* Get the file size */
+
+    FileSize = CmGetFileSize (fp);
+    if (FileSize == ACPI_UINT32_MAX)
+    {
+        return (AE_ERROR);
+    }
+
+    if (FileSize < 4)
+    {
+        return (AE_BAD_HEADER);
+    }
+
+    /* Read the signature */
+
+    fseek (fp, 0, SEEK_SET);
+
+    Count = fread (&TableHeader, 1, sizeof (ACPI_TABLE_HEADER), fp);
+    if (Count != sizeof (ACPI_TABLE_HEADER))
+    {
+        AcpiOsPrintf ("Could not read the table header\n");
+        return (AE_BAD_HEADER);
+    }
+
+    /* The RSDP table does not have standard ACPI header */
+
+    if (ACPI_VALIDATE_RSDP_SIG (TableHeader.Signature))
+    {
+        *TableLength = FileSize;
+        StandardHeader = FALSE;
+    }
+    else
+    {
+
+#if 0
+        /* Validate the table header/length */
+
+        Status = AcpiTbValidateTableHeader (&TableHeader);
+        if (ACPI_FAILURE (Status))
+        {
+            AcpiOsPrintf ("Table header is invalid!\n");
+            return (Status);
+        }
+#endif
+
+        /* File size must be at least as long as the Header-specified length */
+
+        if (TableHeader.Length > FileSize)
+        {
+            AcpiOsPrintf (
+                "TableHeader length [0x%X] greater than the input file size [0x%X]\n",
+                TableHeader.Length, FileSize);
+
+#ifdef ACPI_ASL_COMPILER
+            Status = FlCheckForAscii (fp, NULL, FALSE);
+            if (ACPI_SUCCESS (Status))
+            {
+                AcpiOsPrintf ("File appears to be ASCII only, must be binary\n");
+            }
+#endif
+            return (AE_BAD_HEADER);
+        }
+
+#ifdef ACPI_OBSOLETE_CODE
+        /* We only support a limited number of table types */
+
+        if (!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_DSDT) &&
+            !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_PSDT) &&
+            !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_SSDT))
+        {
+            AcpiOsPrintf ("Table signature [%4.4s] is invalid or not supported\n",
+                (char *) TableHeader.Signature);
+            ACPI_DUMP_BUFFER (&TableHeader, sizeof (ACPI_TABLE_HEADER));
+            return (AE_ERROR);
+        }
+#endif
+
+        *TableLength = TableHeader.Length;
+    }
+
+    /* Allocate a buffer for the table */
+
+    *Table = AcpiOsAllocate ((size_t) FileSize);
+    if (!*Table)
+    {
+        AcpiOsPrintf (
+            "Could not allocate memory for ACPI table %4.4s (size=0x%X)\n",
+            TableHeader.Signature, *TableLength);
+        return (AE_NO_MEMORY);
+    }
+
+    /* Get the rest of the table */
+
+    fseek (fp, 0, SEEK_SET);
+    Actual = fread (*Table, 1, (size_t) FileSize, fp);
+    if (Actual == FileSize)
+    {
+        if (StandardHeader)
+        {
+            /* Now validate the checksum */
+
+            Status = AcpiTbVerifyChecksum ((void *) *Table,
+                        ACPI_CAST_PTR (ACPI_TABLE_HEADER, *Table)->Length);
+
+            if (Status == AE_BAD_CHECKSUM)
+            {
+                Status = AcpiUtCheckTextModeCorruption ((UINT8 *) *Table,
+                            FileSize, (*Table)->Length);
+                return (Status);
+            }
+        }
+        return (AE_OK);
+    }
+
+    if (Actual > 0)
+    {
+        AcpiOsPrintf ("Warning - reading table, asked for %X got %X\n",
+            FileSize, Actual);
+        return (AE_OK);
+    }
+
+    AcpiOsPrintf ("Error - could not read the table file\n");
+    AcpiOsFree (*Table);
+    *Table = NULL;
+    *TableLength = 0;
+    return (AE_ERROR);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtReadTableFromFile
+ *
+ * PARAMETERS:  Filename         - File where table is located
+ *              Table            - Where a pointer to the table is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get an ACPI table from a file
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiUtReadTableFromFile (
+    char                    *Filename,
+    ACPI_TABLE_HEADER       **Table)
+{
+    FILE                    *File;
+    UINT32                  FileSize;
+    UINT32                  TableLength;
+    ACPI_STATUS             Status = AE_ERROR;
+
+
+    /* Open the file, get current size */
+
+    File = fopen (Filename, "rb");
+    if (!File)
+    {
+        perror ("Could not open input file");
+        return (Status);
+    }
+
+    FileSize = CmGetFileSize (File);
+    if (FileSize == ACPI_UINT32_MAX)
+    {
+        goto Exit;
+    }
+
+    /* Get the entire file */
+
+    fprintf (stderr, "Loading Acpi table from file %10s - Length %.8u (%06X)\n",
+        Filename, FileSize, FileSize);
+
+    Status = AcpiUtReadTable (File, Table, &TableLength);
+    if (ACPI_FAILURE (Status))
+    {
+        AcpiOsPrintf ("Could not get table from the file\n");
+    }
+
+Exit:
+    fclose(File);
+    return (Status);
+}
+
+#endif
diff --git a/sys/contrib/dev/acpica/components/utilities/utglobal.c b/sys/contrib/dev/acpica/components/utilities/utglobal.c
index 6233a4ae4cf2..00aa77786310 100644
--- a/sys/contrib/dev/acpica/components/utilities/utglobal.c
+++ b/sys/contrib/dev/acpica/components/utilities/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #define __UTGLOBAL_C__
+#define EXPORT_ACPI_INTERFACES
 #define DEFINE_ACPI_GLOBALS
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -57,37 +58,7 @@
  *
  ******************************************************************************/
 
-/*
- * We want the debug switches statically initialized so they
- * are already set when the debugger is entered.
- */
-
-/* Debug switch - level and trace mask */
-
-#ifdef ACPI_DEBUG_OUTPUT
-UINT32                      AcpiDbgLevel = ACPI_DEBUG_DEFAULT;
-#else
-UINT32                      AcpiDbgLevel = ACPI_NORMAL_DEFAULT;
-#endif
-
-/* Debug switch - layer (component) mask */
-
-UINT32                      AcpiDbgLayer = ACPI_COMPONENT_DEFAULT;
-UINT32                      AcpiGbl_NestingLevel = 0;
-
-/* Debugger globals */
-
-BOOLEAN                     AcpiGbl_DbTerminateThreads = FALSE;
-BOOLEAN                     AcpiGbl_AbortMethod = FALSE;
-BOOLEAN                     AcpiGbl_MethodExecuting = FALSE;
-
-/* System flags */
-
-UINT32                      AcpiGbl_StartupFlags = 0;
-
-/* System starts uninitialized */
-
-BOOLEAN                     AcpiGbl_Shutdown = TRUE;
+/* Various state name strings */
 
 const char                  *AcpiGbl_SleepStateNames[ACPI_S_STATE_COUNT] =
 {
@@ -202,163 +173,6 @@ ACPI_FIXED_EVENT_INFO       AcpiGbl_FixedEventInfo[ACPI_NUM_FIXED_EVENTS] =
 };
 #endif /* !ACPI_REDUCED_HARDWARE */
 
-
-/*******************************************************************************
- *
- * FUNCTION:    AcpiUtInitGlobals
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Initialize ACPICA globals. All globals that require specific
- *              initialization should be initialized here. This allows for
- *              a warm restart.
- *
- ******************************************************************************/
-
-ACPI_STATUS
-AcpiUtInitGlobals (
-    void)
-{
-    ACPI_STATUS             Status;
-    UINT32                  i;
-
-
-    ACPI_FUNCTION_TRACE (UtInitGlobals);
-
-
-    /* Create all memory caches */
-
-    Status = AcpiUtCreateCaches ();
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
-
-    /* Address Range lists */
-
-    for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++)
-    {
-        AcpiGbl_AddressRangeList[i] = NULL;
-    }
-
-    /* Mutex locked flags */
-
-    for (i = 0; i < ACPI_NUM_MUTEX; i++)
-    {
-        AcpiGbl_MutexInfo[i].Mutex          = NULL;
-        AcpiGbl_MutexInfo[i].ThreadId       = ACPI_MUTEX_NOT_ACQUIRED;
-        AcpiGbl_MutexInfo[i].UseCount       = 0;
-    }
-
-    for (i = 0; i < ACPI_NUM_OWNERID_MASKS; i++)
-    {
-        AcpiGbl_OwnerIdMask[i]              = 0;
-    }
-
-    /* Last OwnerID is never valid */
-
-    AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;
-
-    /* Event counters */
-
-    AcpiMethodCount                     = 0;
-    AcpiSciCount                        = 0;
-    AcpiGpeCount                        = 0;
-
-    for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++)
-    {
-        AcpiFixedEventCount[i]              = 0;
-    }
-
-#if (!ACPI_REDUCED_HARDWARE)
-
-    /* GPE/SCI support */
-
-    AcpiGbl_AllGpesInitialized          = FALSE;
-    AcpiGbl_GpeXruptListHead            = NULL;
-    AcpiGbl_GpeFadtBlocks[0]            = NULL;
-    AcpiGbl_GpeFadtBlocks[1]            = NULL;
-    AcpiCurrentGpeCount                 = 0;
-
-    AcpiGbl_GlobalEventHandler          = NULL;
-    AcpiGbl_SciHandlerList              = NULL;
-
-#endif /* !ACPI_REDUCED_HARDWARE */
-
-    /* Global handlers */
-
-    AcpiGbl_GlobalNotify[0].Handler     = NULL;
-    AcpiGbl_GlobalNotify[1].Handler     = NULL;
-    AcpiGbl_ExceptionHandler            = NULL;
-    AcpiGbl_InitHandler                 = NULL;
-    AcpiGbl_TableHandler                = NULL;
-    AcpiGbl_InterfaceHandler            = NULL;
-
-    /* Global Lock support */
-
-    AcpiGbl_GlobalLockSemaphore         = NULL;
-    AcpiGbl_GlobalLockMutex             = NULL;
-    AcpiGbl_GlobalLockAcquired          = FALSE;
-    AcpiGbl_GlobalLockHandle            = 0;
-    AcpiGbl_GlobalLockPresent           = FALSE;
-
-    /* Miscellaneous variables */
-
-    AcpiGbl_DSDT                        = NULL;
-    AcpiGbl_CmSingleStep                = FALSE;
-    AcpiGbl_DbTerminateThreads          = FALSE;
-    AcpiGbl_Shutdown                    = FALSE;
-    AcpiGbl_NsLookupCount               = 0;
-    AcpiGbl_PsFindCount                 = 0;
-    AcpiGbl_AcpiHardwarePresent         = TRUE;
-    AcpiGbl_LastOwnerIdIndex            = 0;
-    AcpiGbl_NextOwnerIdOffset           = 0;
-    AcpiGbl_TraceMethodName             = 0;
-    AcpiGbl_TraceDbgLevel               = 0;
-    AcpiGbl_TraceDbgLayer               = 0;
-    AcpiGbl_DebuggerConfiguration       = DEBUGGER_THREADING;
-    AcpiGbl_DbOutputFlags               = ACPI_DB_CONSOLE_OUTPUT;
-    AcpiGbl_OsiMutex                    = NULL;
-    AcpiGbl_RegMethodsExecuted          = FALSE;
-
-    /* Hardware oriented */
-
-    AcpiGbl_EventsInitialized           = FALSE;
-    AcpiGbl_SystemAwakeAndRunning       = TRUE;
-
-    /* Namespace */
-
-    AcpiGbl_ModuleCodeList              = NULL;
-    AcpiGbl_RootNode                    = NULL;
-    AcpiGbl_RootNodeStruct.Name.Integer = ACPI_ROOT_NAME;
-    AcpiGbl_RootNodeStruct.DescriptorType = ACPI_DESC_TYPE_NAMED;
-    AcpiGbl_RootNodeStruct.Type         = ACPI_TYPE_DEVICE;
-    AcpiGbl_RootNodeStruct.Parent       = NULL;
-    AcpiGbl_RootNodeStruct.Child        = NULL;
-    AcpiGbl_RootNodeStruct.Peer         = NULL;
-    AcpiGbl_RootNodeStruct.Object       = NULL;
-
-
-#ifdef ACPI_DISASSEMBLER
-    AcpiGbl_ExternalList                = NULL;
-    AcpiGbl_NumExternalMethods          = 0;
-    AcpiGbl_ResolvedExternalMethods     = 0;
-#endif
-
-#ifdef ACPI_DEBUG_OUTPUT
-    AcpiGbl_LowestStackPointer          = ACPI_CAST_PTR (ACPI_SIZE, ACPI_SIZE_MAX);
-#endif
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-    AcpiGbl_DisplayFinalMemStats        = FALSE;
-    AcpiGbl_DisableMemTracking          = FALSE;
-#endif
-
-    return_ACPI_STATUS (AE_OK);
-}
-
 /* Public globals */
 
 ACPI_EXPORT_SYMBOL (AcpiGbl_FADT)
diff --git a/sys/contrib/dev/acpica/components/utilities/uthex.c b/sys/contrib/dev/acpica/components/utilities/uthex.c
new file mode 100644
index 000000000000..80032317f28f
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/utilities/uthex.c
@@ -0,0 +1,113 @@
+/******************************************************************************
+ *
+ * Module Name: uthex -- Hex/ASCII support functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#define __UTHEX_C__
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("uthex")
+
+
+/* Hex to ASCII conversion table */
+
+static char                 AcpiGbl_HexToAscii[] =
+{
+    '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtHexToAsciiChar
+ *
+ * PARAMETERS:  Integer             - Contains the hex digit
+ *              Position            - bit position of the digit within the
+ *                                    integer (multiple of 4)
+ *
+ * RETURN:      The converted Ascii character
+ *
+ * DESCRIPTION: Convert a hex digit to an Ascii character
+ *
+ ******************************************************************************/
+
+char
+AcpiUtHexToAsciiChar (
+    UINT64                  Integer,
+    UINT32                  Position)
+{
+
+    return (AcpiGbl_HexToAscii[(Integer >> Position) & 0xF]);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtHexCharToValue
+ *
+ * PARAMETERS:  AsciiChar             - Hex character in Ascii
+ *
+ * RETURN:      The binary value of the ascii/hex character
+ *
+ * DESCRIPTION: Perform ascii-to-hex translation
+ *
+ ******************************************************************************/
+
+UINT8
+AcpiUtAsciiCharToHex (
+    int                     HexChar)
+{
+
+    if (HexChar <= 0x39)
+    {
+        return ((UINT8) (HexChar - 0x30));
+    }
+
+    if (HexChar <= 0x46)
+    {
+        return ((UINT8) (HexChar - 0x37));
+    }
+
+    return ((UINT8) (HexChar - 0x57));
+}
diff --git a/sys/contrib/dev/acpica/components/utilities/utids.c b/sys/contrib/dev/acpica/components/utilities/utids.c
index b0017678b804..ca2a372b8510 100644
--- a/sys/contrib/dev/acpica/components/utilities/utids.c
+++ b/sys/contrib/dev/acpica/components/utilities/utids.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/utilities/utinit.c b/sys/contrib/dev/acpica/components/utilities/utinit.c
index 760d7895407f..6a07ef6ae895 100644
--- a/sys/contrib/dev/acpica/components/utilities/utinit.c
+++ b/sys/contrib/dev/acpica/components/utilities/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTINIT_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -116,6 +115,162 @@ AcpiUtFreeGpeLists (
 #endif /* !ACPI_REDUCED_HARDWARE */
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtInitGlobals
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initialize ACPICA globals. All globals that require specific
+ *              initialization should be initialized here. This allows for
+ *              a warm restart.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiUtInitGlobals (
+    void)
+{
+    ACPI_STATUS             Status;
+    UINT32                  i;
+
+
+    ACPI_FUNCTION_TRACE (UtInitGlobals);
+
+
+    /* Create all memory caches */
+
+    Status = AcpiUtCreateCaches ();
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
+
+    /* Address Range lists */
+
+    for (i = 0; i < ACPI_ADDRESS_RANGE_MAX; i++)
+    {
+        AcpiGbl_AddressRangeList[i] = NULL;
+    }
+
+    /* Mutex locked flags */
+
+    for (i = 0; i < ACPI_NUM_MUTEX; i++)
+    {
+        AcpiGbl_MutexInfo[i].Mutex          = NULL;
+        AcpiGbl_MutexInfo[i].ThreadId       = ACPI_MUTEX_NOT_ACQUIRED;
+        AcpiGbl_MutexInfo[i].UseCount       = 0;
+    }
+
+    for (i = 0; i < ACPI_NUM_OWNERID_MASKS; i++)
+    {
+        AcpiGbl_OwnerIdMask[i]              = 0;
+    }
+
+    /* Last OwnerID is never valid */
+
+    AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;
+
+    /* Event counters */
+
+    AcpiMethodCount                     = 0;
+    AcpiSciCount                        = 0;
+    AcpiGpeCount                        = 0;
+
+    for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++)
+    {
+        AcpiFixedEventCount[i]              = 0;
+    }
+
+#if (!ACPI_REDUCED_HARDWARE)
+
+    /* GPE/SCI support */
+
+    AcpiGbl_AllGpesInitialized          = FALSE;
+    AcpiGbl_GpeXruptListHead            = NULL;
+    AcpiGbl_GpeFadtBlocks[0]            = NULL;
+    AcpiGbl_GpeFadtBlocks[1]            = NULL;
+    AcpiCurrentGpeCount                 = 0;
+
+    AcpiGbl_GlobalEventHandler          = NULL;
+    AcpiGbl_SciHandlerList              = NULL;
+
+#endif /* !ACPI_REDUCED_HARDWARE */
+
+    /* Global handlers */
+
+    AcpiGbl_GlobalNotify[0].Handler     = NULL;
+    AcpiGbl_GlobalNotify[1].Handler     = NULL;
+    AcpiGbl_ExceptionHandler            = NULL;
+    AcpiGbl_InitHandler                 = NULL;
+    AcpiGbl_TableHandler                = NULL;
+    AcpiGbl_InterfaceHandler            = NULL;
+
+    /* Global Lock support */
+
+    AcpiGbl_GlobalLockSemaphore         = NULL;
+    AcpiGbl_GlobalLockMutex             = NULL;
+    AcpiGbl_GlobalLockAcquired          = FALSE;
+    AcpiGbl_GlobalLockHandle            = 0;
+    AcpiGbl_GlobalLockPresent           = FALSE;
+
+    /* Miscellaneous variables */
+
+    AcpiGbl_DSDT                        = NULL;
+    AcpiGbl_CmSingleStep                = FALSE;
+    AcpiGbl_Shutdown                    = FALSE;
+    AcpiGbl_NsLookupCount               = 0;
+    AcpiGbl_PsFindCount                 = 0;
+    AcpiGbl_AcpiHardwarePresent         = TRUE;
+    AcpiGbl_LastOwnerIdIndex            = 0;
+    AcpiGbl_NextOwnerIdOffset           = 0;
+    AcpiGbl_TraceDbgLevel               = 0;
+    AcpiGbl_TraceDbgLayer               = 0;
+    AcpiGbl_DebuggerConfiguration       = DEBUGGER_THREADING;
+    AcpiGbl_OsiMutex                    = NULL;
+    AcpiGbl_RegMethodsExecuted          = FALSE;
+
+    /* Hardware oriented */
+
+    AcpiGbl_EventsInitialized           = FALSE;
+    AcpiGbl_SystemAwakeAndRunning       = TRUE;
+
+    /* Namespace */
+
+    AcpiGbl_ModuleCodeList              = NULL;
+    AcpiGbl_RootNode                    = NULL;
+    AcpiGbl_RootNodeStruct.Name.Integer = ACPI_ROOT_NAME;
+    AcpiGbl_RootNodeStruct.DescriptorType = ACPI_DESC_TYPE_NAMED;
+    AcpiGbl_RootNodeStruct.Type         = ACPI_TYPE_DEVICE;
+    AcpiGbl_RootNodeStruct.Parent       = NULL;
+    AcpiGbl_RootNodeStruct.Child        = NULL;
+    AcpiGbl_RootNodeStruct.Peer         = NULL;
+    AcpiGbl_RootNodeStruct.Object       = NULL;
+
+
+#ifdef ACPI_DISASSEMBLER
+    AcpiGbl_ExternalList                = NULL;
+    AcpiGbl_NumExternalMethods          = 0;
+    AcpiGbl_ResolvedExternalMethods     = 0;
+#endif
+
+#ifdef ACPI_DEBUG_OUTPUT
+    AcpiGbl_LowestStackPointer          = ACPI_CAST_PTR (ACPI_SIZE, ACPI_SIZE_MAX);
+#endif
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+    AcpiGbl_DisplayFinalMemStats        = FALSE;
+    AcpiGbl_DisableMemTracking          = FALSE;
+#endif
+
+    ACPI_DEBUGGER_EXEC (AcpiGbl_DbTerminateThreads = FALSE);
+
+    return_ACPI_STATUS (AE_OK);
+}
+
+
 /******************************************************************************
  *
  * FUNCTION:    AcpiUtTerminate
diff --git a/sys/contrib/dev/acpica/components/utilities/utlock.c b/sys/contrib/dev/acpica/components/utilities/utlock.c
index da933c284e3e..626a46f50d96 100644
--- a/sys/contrib/dev/acpica/components/utilities/utlock.c
+++ b/sys/contrib/dev/acpica/components/utilities/utlock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/utilities/utmath.c b/sys/contrib/dev/acpica/components/utilities/utmath.c
index b535ffc7275f..c65317937f62 100644
--- a/sys/contrib/dev/acpica/components/utilities/utmath.c
+++ b/sys/contrib/dev/acpica/components/utilities/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTMATH_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utmisc.c b/sys/contrib/dev/acpica/components/utilities/utmisc.c
index 6ff6b2ada6b0..356b0ce877bb 100644
--- a/sys/contrib/dev/acpica/components/utilities/utmisc.c
+++ b/sys/contrib/dev/acpica/components/utilities/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTMISC_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utmutex.c b/sys/contrib/dev/acpica/components/utilities/utmutex.c
index 260f2b53bad4..546adab4bec8 100644
--- a/sys/contrib/dev/acpica/components/utilities/utmutex.c
+++ b/sys/contrib/dev/acpica/components/utilities/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTMUTEX_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utobject.c b/sys/contrib/dev/acpica/components/utilities/utobject.c
index 46c3514c0147..398fae52e9fb 100644
--- a/sys/contrib/dev/acpica/components/utilities/utobject.c
+++ b/sys/contrib/dev/acpica/components/utilities/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -400,7 +400,7 @@ AcpiUtValidInternalObject (
     default:
 
         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                "%p is not not an ACPI operand obj [%s]\n",
+                "%p is not an ACPI operand obj [%s]\n",
                 Object, AcpiUtGetDescriptorName (Object)));
         break;
     }
diff --git a/sys/contrib/dev/acpica/components/utilities/utosi.c b/sys/contrib/dev/acpica/components/utilities/utosi.c
index 9cf57653cd07..6b618713da8e 100644
--- a/sys/contrib/dev/acpica/components/utilities/utosi.c
+++ b/sys/contrib/dev/acpica/components/utilities/utosi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,34 @@
 #define _COMPONENT          ACPI_UTILITIES
         ACPI_MODULE_NAME    ("utosi")
 
+
+/******************************************************************************
+ *
+ * ACPICA policy for new _OSI strings:
+ *
+ * It is the stated policy of ACPICA that new _OSI strings will be integrated
+ * into this module as soon as possible after they are defined. It is strongly
+ * recommended that all ACPICA hosts mirror this policy and integrate any
+ * changes to this module as soon as possible. There are several historical
+ * reasons behind this policy:
+ *
+ * 1) New BIOSs tend to test only the case where the host responds TRUE to
+ *    the latest version of Windows, which would respond to the latest/newest
+ *    _OSI string. Not responding TRUE to the latest version of Windows will
+ *    risk executing untested code paths throughout the DSDT and SSDTs.
+ *
+ * 2) If a new _OSI string is recognized only after a significant delay, this
+ *    has the potential to cause problems on existing working machines because
+ *    of the possibility that a new and different path through the ASL code
+ *    will be executed.
+ *
+ * 3) New _OSI strings are tending to come out about once per year. A delay
+ *    in recognizing a new string for a significant amount of time risks the
+ *    release of another string which only compounds the initial problem.
+ *
+ *****************************************************************************/
+
+
 /*
  * Strings supported by the _OSI predefined control method (which is
  * implemented internally within this module.)
@@ -78,6 +106,7 @@ static ACPI_INTERFACE_INFO    AcpiDefaultSupportedInterfaces[] =
     {"Windows 2006 SP2",    NULL, 0, ACPI_OSI_WIN_VISTA_SP2},    /* Windows Vista SP2 - Added 09/2010 */
     {"Windows 2009",        NULL, 0, ACPI_OSI_WIN_7},            /* Windows 7 and Server 2008 R2 - Added 09/2009 */
     {"Windows 2012",        NULL, 0, ACPI_OSI_WIN_8},            /* Windows 8 and Server 2012 - Added 08/2012 */
+    {"Windows 2013",        NULL, 0, ACPI_OSI_WIN_8},            /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
 
     /* Feature Group Strings */
 
diff --git a/sys/contrib/dev/acpica/components/utilities/utownerid.c b/sys/contrib/dev/acpica/components/utilities/utownerid.c
index 74f4d83c9a76..70919fb61668 100644
--- a/sys/contrib/dev/acpica/components/utilities/utownerid.c
+++ b/sys/contrib/dev/acpica/components/utilities/utownerid.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTOWNERID_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utpredef.c b/sys/contrib/dev/acpica/components/utilities/utpredef.c
index 886412068d81..9dcbd546b294 100644
--- a/sys/contrib/dev/acpica/components/utilities/utpredef.c
+++ b/sys/contrib/dev/acpica/components/utilities/utpredef.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/components/utilities/utprint.c b/sys/contrib/dev/acpica/components/utilities/utprint.c
new file mode 100644
index 000000000000..0c99079fc0dd
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/utilities/utprint.c
@@ -0,0 +1,811 @@
+/******************************************************************************
+ *
+ * Module Name: utprint - Formatted printing routines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_UTILITIES
+        ACPI_MODULE_NAME    ("utprint")
+
+
+#define ACPI_FORMAT_SIGN            0x01
+#define ACPI_FORMAT_SIGN_PLUS       0x02
+#define ACPI_FORMAT_SIGN_PLUS_SPACE 0x04
+#define ACPI_FORMAT_ZERO            0x08
+#define ACPI_FORMAT_LEFT            0x10
+#define ACPI_FORMAT_UPPER           0x20
+#define ACPI_FORMAT_PREFIX          0x40
+
+
+/* Local prototypes */
+
+static ACPI_SIZE
+AcpiUtBoundStringLength (
+    const char              *String,
+    ACPI_SIZE               Count);
+
+static char *
+AcpiUtBoundStringOutput (
+    char                    *String,
+    const char              *End,
+    char                    c);
+
+static char *
+AcpiUtFormatNumber (
+    char                    *String,
+    char                    *End,
+    UINT64                  Number,
+    UINT8                   Base,
+    INT32                   Width,
+    INT32                   Precision,
+    UINT8                   Type);
+
+static char *
+AcpiUtPutNumber (
+    char                    *String,
+    UINT64                  Number,
+    UINT8                   Base,
+    BOOLEAN                 Upper);
+
+
+/* Module globals */
+
+static const char           AcpiGbl_LowerHexDigits[] = "0123456789abcdef";
+static const char           AcpiGbl_UpperHexDigits[] = "0123456789ABCDEF";
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtBoundStringLength
+ *
+ * PARAMETERS:  String              - String with boundary
+ *              Count               - Boundary of the string
+ *
+ * RETURN:      Length of the string. Less than or equal to Count.
+ *
+ * DESCRIPTION: Calculate the length of a string with boundary.
+ *
+ ******************************************************************************/
+
+static ACPI_SIZE
+AcpiUtBoundStringLength (
+    const char              *String,
+    ACPI_SIZE               Count)
+{
+    UINT32                  Length = 0;
+
+
+    while (*String && Count)
+    {
+        Length++;
+        String++;
+        Count--;
+    }
+
+    return (Length);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtBoundStringOutput
+ *
+ * PARAMETERS:  String              - String with boundary
+ *              End                 - Boundary of the string
+ *              c                   - Character to be output to the string
+ *
+ * RETURN:      Updated position for next valid character
+ *
+ * DESCRIPTION: Output a character into a string with boundary check.
+ *
+ ******************************************************************************/
+
+static char *
+AcpiUtBoundStringOutput (
+    char                    *String,
+    const char              *End,
+    char                    c)
+{
+
+    if (String < End)
+    {
+        *String = c;
+    }
+
+    ++String;
+    return (String);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtPutNumber
+ *
+ * PARAMETERS:  String              - Buffer to hold reverse-ordered string
+ *              Number              - Integer to be converted
+ *              Base                - Base of the integer
+ *              Upper               - Whether or not using upper cased digits
+ *
+ * RETURN:      Updated position for next valid character
+ *
+ * DESCRIPTION: Convert an integer into a string, note that, the string holds a
+ *              reversed ordered number without the trailing zero.
+ *
+ ******************************************************************************/
+
+static char *
+AcpiUtPutNumber (
+    char                    *String,
+    UINT64                  Number,
+    UINT8                   Base,
+    BOOLEAN                 Upper)
+{
+    const char              *Digits;
+    UINT64                  DigitIndex;
+    char                    *Pos;
+
+
+    Pos = String;
+    Digits = Upper ? AcpiGbl_UpperHexDigits : AcpiGbl_LowerHexDigits;
+
+    if (Number == 0)
+    {
+        *(Pos++) = '0';
+    }
+    else
+    {
+        while (Number)
+        {
+            (void) AcpiUtDivide (Number, Base, &Number, &DigitIndex);
+            *(Pos++) = Digits[DigitIndex];
+        }
+    }
+
+    /* *(Pos++) = '0'; */
+    return (Pos);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtScanNumber
+ *
+ * PARAMETERS:  String              - String buffer
+ *              NumberPtr           - Where the number is returned
+ *
+ * RETURN:      Updated position for next valid character
+ *
+ * DESCRIPTION: Scan a string for a decimal integer.
+ *
+ ******************************************************************************/
+
+const char *
+AcpiUtScanNumber (
+    const char              *String,
+    UINT64                  *NumberPtr)
+{
+    UINT64                  Number = 0;
+
+
+    while (ACPI_IS_DIGIT (*String))
+    {
+        Number *= 10;
+        Number += *(String++) - '0';
+    }
+
+    *NumberPtr = Number;
+    return (String);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtPrintNumber
+ *
+ * PARAMETERS:  String              - String buffer
+ *              Number              - The number to be converted
+ *
+ * RETURN:      Updated position for next valid character
+ *
+ * DESCRIPTION: Print a decimal integer into a string.
+ *
+ ******************************************************************************/
+
+const char *
+AcpiUtPrintNumber (
+    char                    *String,
+    UINT64                  Number)
+{
+    char                    AsciiString[20];
+    const char              *Pos1;
+    char                    *Pos2;
+
+
+    Pos1 = AcpiUtPutNumber (AsciiString, Number, 10, FALSE);
+    Pos2 = String;
+
+    while (Pos1 != AsciiString)
+    {
+        *(Pos2++) = *(--Pos1);
+    }
+
+    *Pos2 = 0;
+    return (String);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtFormatNumber
+ *
+ * PARAMETERS:  String              - String buffer with boundary
+ *              End                 - Boundary of the string
+ *              Number              - The number to be converted
+ *              Base                - Base of the integer
+ *              Width               - Field width
+ *              Precision           - Precision of the integer
+ *              Type                - Special printing flags
+ *
+ * RETURN:      Updated position for next valid character
+ *
+ * DESCRIPTION: Print an integer into a string with any base and any precision.
+ *
+ ******************************************************************************/
+
+static char *
+AcpiUtFormatNumber (
+    char                    *String,
+    char                    *End,
+    UINT64                  Number,
+    UINT8                   Base,
+    INT32                   Width,
+    INT32                   Precision,
+    UINT8                   Type)
+{
+    char                    *Pos;
+    char                    Sign;
+    char                    Zero;
+    BOOLEAN                 NeedPrefix;
+    BOOLEAN                 Upper;
+    INT32                   i;
+    char                    ReversedString[66];
+
+
+    /* Parameter validation */
+
+    if (Base < 2 || Base > 16)
+    {
+        return (NULL);
+    }
+
+    if (Type & ACPI_FORMAT_LEFT)
+    {
+        Type &= ~ACPI_FORMAT_ZERO;
+    }
+
+    NeedPrefix = ((Type & ACPI_FORMAT_PREFIX) && Base != 10) ? TRUE : FALSE;
+    Upper = (Type & ACPI_FORMAT_UPPER) ? TRUE : FALSE;
+    Zero = (Type & ACPI_FORMAT_ZERO) ? '0' : ' ';
+
+    /* Calculate size according to sign and prefix */
+
+    Sign = '\0';
+    if (Type & ACPI_FORMAT_SIGN)
+    {
+        if ((INT64) Number < 0)
+        {
+            Sign = '-';
+            Number = - (INT64) Number;
+            Width--;
+        }
+        else if (Type & ACPI_FORMAT_SIGN_PLUS)
+        {
+            Sign = '+';
+            Width--;
+        }
+        else if (Type & ACPI_FORMAT_SIGN_PLUS_SPACE)
+        {
+            Sign = ' ';
+            Width--;
+        }
+    }
+    if (NeedPrefix)
+    {
+        Width--;
+        if (Base == 16)
+        {
+            Width--;
+        }
+    }
+
+    /* Generate full string in reverse order */
+
+    Pos = AcpiUtPutNumber (ReversedString, Number, Base, Upper);
+    i = ACPI_PTR_DIFF (Pos, ReversedString);
+
+    /* Printing 100 using %2d gives "100", not "00" */
+
+    if (i > Precision)
+    {
+        Precision = i;
+    }
+
+    Width -= Precision;
+
+    /* Output the string */
+
+    if (!(Type & (ACPI_FORMAT_ZERO | ACPI_FORMAT_LEFT)))
+    {
+        while (--Width >= 0)
+        {
+            String = AcpiUtBoundStringOutput (String, End, ' ');
+        }
+    }
+    if (Sign)
+    {
+        String = AcpiUtBoundStringOutput (String, End, Sign);
+    }
+    if (NeedPrefix)
+    {
+        String = AcpiUtBoundStringOutput (String, End, '0');
+        if (Base == 16)
+        {
+            String = AcpiUtBoundStringOutput (String, End,
+                        Upper ? 'X' : 'x');
+        }
+    }
+    if (!(Type & ACPI_FORMAT_LEFT))
+    {
+        while (--Width >= 0)
+        {
+            String = AcpiUtBoundStringOutput (String, End, Zero);
+        }
+    }
+
+    while (i <= --Precision)
+    {
+        String = AcpiUtBoundStringOutput (String, End, '0');
+    }
+    while (--i >= 0)
+    {
+        String = AcpiUtBoundStringOutput (String, End,
+                    ReversedString[i]);
+    }
+    while (--Width >= 0)
+    {
+        String = AcpiUtBoundStringOutput (String, End, ' ');
+    }
+
+    return (String);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtVsnprintf
+ *
+ * PARAMETERS:  String              - String with boundary
+ *              Size                - Boundary of the string
+ *              Format              - Standard printf format
+ *              Args                - Argument list
+ *
+ * RETURN:      Number of bytes actually written.
+ *
+ * DESCRIPTION: Formatted output to a string using argument list pointer.
+ *
+ ******************************************************************************/
+
+int
+AcpiUtVsnprintf (
+    char                    *String,
+    ACPI_SIZE               Size,
+    const char              *Format,
+    va_list                 Args)
+{
+    UINT8                   Base = 10;
+    UINT8                   Type = 0;
+    INT32                   Width = -1;
+    INT32                   Precision = -1;
+    char                    Qualifier = 0;
+    UINT64                  Number;
+    char                    *Pos;
+    char                    *End;
+    char                    c;
+    const char              *s;
+    const void              *p;
+    INT32                   Length;
+    int                     i;
+
+
+    Pos = String;
+    End = String + Size;
+
+    for (; *Format; ++Format)
+    {
+        if (*Format != '%')
+        {
+            Pos = AcpiUtBoundStringOutput (Pos, End, *Format);
+            continue;
+        }
+
+        /* Process sign */
+
+        do
+        {
+            ++Format;
+            if (*Format == '#')
+            {
+                Type |= ACPI_FORMAT_PREFIX;
+            }
+            else if (*Format == '0')
+            {
+                Type |= ACPI_FORMAT_ZERO;
+            }
+            else if (*Format == '+')
+            {
+                Type |= ACPI_FORMAT_SIGN_PLUS;
+            }
+            else if (*Format == ' ')
+            {
+                Type |= ACPI_FORMAT_SIGN_PLUS_SPACE;
+            }
+            else if (*Format == '-')
+            {
+                Type |= ACPI_FORMAT_LEFT;
+            }
+            else
+            {
+                break;
+            }
+        } while (1);
+
+        /* Process width */
+
+        Width = -1;
+        if (ACPI_IS_DIGIT (*Format))
+        {
+            Format = AcpiUtScanNumber (Format, &Number);
+            Width = (INT32) Number;
+        }
+        else if (*Format == '*')
+        {
+            ++Format;
+            Width = va_arg (Args, int);
+            if (Width < 0)
+            {
+                Width = -Width;
+                Type |= ACPI_FORMAT_LEFT;
+            }
+        }
+
+        /* Process precision */
+
+        Precision = -1;
+        if (*Format == '.')
+        {
+            ++Format;
+            if (ACPI_IS_DIGIT(*Format))
+            {
+                Format = AcpiUtScanNumber (Format, &Number);
+                Precision = (INT32) Number;
+            }
+            else if (*Format == '*')
+            {
+                ++Format;
+                Precision = va_arg (Args, int);
+            }
+            if (Precision < 0)
+            {
+                Precision = 0;
+            }
+        }
+
+        /* Process qualifier */
+
+        Qualifier = -1;
+        if (*Format == 'h' || *Format == 'l' || *Format == 'L')
+        {
+            Qualifier = *Format;
+            ++Format;
+
+            if (Qualifier == 'l' && *Format == 'l')
+            {
+                Qualifier = 'L';
+                ++Format;
+            }
+        }
+
+        switch (*Format)
+        {
+        case '%':
+
+            Pos = AcpiUtBoundStringOutput (Pos, End, '%');
+            continue;
+
+        case 'c':
+
+            if (!(Type & ACPI_FORMAT_LEFT))
+            {
+                while (--Width > 0)
+                {
+                    Pos = AcpiUtBoundStringOutput (Pos, End, ' ');
+                }
+            }
+
+            c = (char) va_arg (Args, int);
+            Pos = AcpiUtBoundStringOutput (Pos, End, c);
+
+            while (--Width > 0)
+            {
+                Pos = AcpiUtBoundStringOutput (Pos, End, ' ');
+            }
+            continue;
+
+        case 's':
+
+            s = va_arg (Args, char *);
+            if (!s)
+            {
+                s = "<NULL>";
+            }
+            Length = AcpiUtBoundStringLength (s, Precision);
+            if (!(Type & ACPI_FORMAT_LEFT))
+            {
+                while (Length < Width--)
+                {
+                    Pos = AcpiUtBoundStringOutput (Pos, End, ' ');
+                }
+            }
+            for (i = 0; i < Length; ++i)
+            {
+                Pos = AcpiUtBoundStringOutput (Pos, End, *s);
+                ++s;
+            }
+            while (Length < Width--)
+            {
+                Pos = AcpiUtBoundStringOutput (Pos, End, ' ');
+            }
+            continue;
+
+        case 'o':
+
+            Base = 8;
+            break;
+
+        case 'X':
+
+            Type |= ACPI_FORMAT_UPPER;
+
+        case 'x':
+
+            Base = 16;
+            break;
+
+        case 'd':
+        case 'i':
+
+            Type |= ACPI_FORMAT_SIGN;
+
+        case 'u':
+
+            break;
+
+        case 'p':
+
+            if (Width == -1)
+            {
+                Width = 2 * sizeof (void *);
+                Type |= ACPI_FORMAT_ZERO;
+            }
+
+            p = va_arg (Args, void *);
+            Pos = AcpiUtFormatNumber (Pos, End,
+                    ACPI_TO_INTEGER (p), 16, Width, Precision, Type);
+            continue;
+
+        default:
+
+            Pos = AcpiUtBoundStringOutput (Pos, End, '%');
+            if (*Format)
+            {
+                Pos = AcpiUtBoundStringOutput (Pos, End, *Format);
+            }
+            else
+            {
+                --Format;
+            }
+            continue;
+        }
+
+        if (Qualifier == 'L')
+        {
+            Number = va_arg (Args, UINT64);
+            if (Type & ACPI_FORMAT_SIGN)
+            {
+                Number = (INT64) Number;
+            }
+        }
+        else if (Qualifier == 'l')
+        {
+            Number = va_arg (Args, unsigned long);
+            if (Type & ACPI_FORMAT_SIGN)
+            {
+                Number = (INT32) Number;
+            }
+        }
+        else if (Qualifier == 'h')
+        {
+            Number = (UINT16) va_arg (Args, int);
+            if (Type & ACPI_FORMAT_SIGN)
+            {
+                Number = (INT16) Number;
+            }
+        }
+        else
+        {
+            Number = va_arg (Args, unsigned int);
+            if (Type & ACPI_FORMAT_SIGN)
+            {
+                Number = (signed int) Number;
+            }
+        }
+
+        Pos = AcpiUtFormatNumber (Pos, End, Number, Base,
+                Width, Precision, Type);
+    }
+
+    if (Size > 0)
+    {
+        if (Pos < End)
+        {
+            *Pos = '\0';
+        }
+        else
+        {
+            End[-1] = '\0';
+        }
+    }
+
+    return (ACPI_PTR_DIFF (Pos, String));
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtSnprintf
+ *
+ * PARAMETERS:  String              - String with boundary
+ *              Size                - Boundary of the string
+ *              Format, ...         - Standard printf format
+ *
+ * RETURN:      Number of bytes actually written.
+ *
+ * DESCRIPTION: Formatted output to a string.
+ *
+ ******************************************************************************/
+
+int
+AcpiUtSnprintf (
+    char                    *String,
+    ACPI_SIZE               Size,
+    const char              *Format,
+    ...)
+{
+    va_list                 Args;
+    int                     Length;
+
+
+    va_start (Args, Format);
+    Length = AcpiUtVsnprintf (String, Size, Format, Args);
+    va_end (Args);
+
+    return (Length);
+}
+
+
+#ifdef ACPI_APPLICATION
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtFileVprintf
+ *
+ * PARAMETERS:  File                - File descriptor
+ *              Format              - Standard printf format
+ *              Args                - Argument list
+ *
+ * RETURN:      Number of bytes actually written.
+ *
+ * DESCRIPTION: Formatted output to a file using argument list pointer.
+ *
+ ******************************************************************************/
+
+int
+AcpiUtFileVprintf (
+    ACPI_FILE               File,
+    const char              *Format,
+    va_list                 Args)
+{
+    ACPI_CPU_FLAGS          Flags;
+    int                     Length;
+
+
+    Flags = AcpiOsAcquireLock (AcpiGbl_PrintLock);
+    Length = AcpiUtVsnprintf (AcpiGbl_PrintBuffer,
+                sizeof (AcpiGbl_PrintBuffer), Format, Args);
+
+    (void) AcpiOsWriteFile (File, AcpiGbl_PrintBuffer, Length, 1);
+    AcpiOsReleaseLock (AcpiGbl_PrintLock, Flags);
+
+    return (Length);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtFilePrintf
+ *
+ * PARAMETERS:  File                - File descriptor
+ *              Format, ...         - Standard printf format
+ *
+ * RETURN:      Number of bytes actually written.
+ *
+ * DESCRIPTION: Formatted output to a file.
+ *
+ ******************************************************************************/
+
+int
+AcpiUtFilePrintf (
+    ACPI_FILE               File,
+    const char              *Format,
+    ...)
+{
+    va_list                 Args;
+    int                     Length;
+
+
+    va_start (Args, Format);
+    Length = AcpiUtFileVprintf (File, Format, Args);
+    va_end (Args);
+
+    return (Length);
+}
+#endif
diff --git a/sys/contrib/dev/acpica/components/utilities/utresrc.c b/sys/contrib/dev/acpica/components/utilities/utresrc.c
index 3a47a0cf20c1..3b549fea8438 100644
--- a/sys/contrib/dev/acpica/components/utilities/utresrc.c
+++ b/sys/contrib/dev/acpica/components/utilities/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTRESRC_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -53,7 +52,7 @@
         ACPI_MODULE_NAME    ("utresrc")
 
 
-#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
+#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
 
 /*
  * Strings used to decode resource descriptors.
@@ -100,7 +99,9 @@ const char                      *AcpiGbl_IoDecode[] =
 const char                      *AcpiGbl_LlDecode[] =
 {
     "ActiveHigh",
-    "ActiveLow"
+    "ActiveLow",
+    "ActiveBoth",
+    "Reserved"
 };
 
 const char                      *AcpiGbl_MaxDecode[] =
diff --git a/sys/contrib/dev/acpica/components/utilities/utstate.c b/sys/contrib/dev/acpica/components/utilities/utstate.c
index e0e5cce67390..2fa8fd663129 100644
--- a/sys/contrib/dev/acpica/components/utilities/utstate.c
+++ b/sys/contrib/dev/acpica/components/utilities/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTSTATE_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/contrib/dev/acpica/components/utilities/utstring.c b/sys/contrib/dev/acpica/components/utilities/utstring.c
index 79b5452df4e2..2e3ea03efd61 100644
--- a/sys/contrib/dev/acpica/components/utilities/utstring.c
+++ b/sys/contrib/dev/acpica/components/utilities/utstring.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTSTRING_C__
 
 #include <contrib/dev/acpica/include/acpi.h>
@@ -420,7 +419,7 @@ AcpiUtPrintString (
     }
 
     AcpiOsPrintf ("\"");
-    for (i = 0; String[i] && (i < MaxLength); i++)
+    for (i = 0; (i < MaxLength) && String[i]; i++)
     {
         /* Escape sequences */
 
@@ -685,3 +684,81 @@ UtConvertBackslashes (
     }
 }
 #endif
+
+#if defined (ACPI_DEBUGGER) || defined (ACPI_APPLICATION)
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtSafeStrcpy, AcpiUtSafeStrcat, AcpiUtSafeStrncat
+ *
+ * PARAMETERS:  Adds a "DestSize" parameter to each of the standard string
+ *              functions. This is the size of the Destination buffer.
+ *
+ * RETURN:      TRUE if the operation would overflow the destination buffer.
+ *
+ * DESCRIPTION: Safe versions of standard Clib string functions. Ensure that
+ *              the result of the operation will not overflow the output string
+ *              buffer.
+ *
+ * NOTE:        These functions are typically only helpful for processing
+ *              user input and command lines. For most ACPICA code, the
+ *              required buffer length is precisely calculated before buffer
+ *              allocation, so the use of these functions is unnecessary.
+ *
+ ******************************************************************************/
+
+BOOLEAN
+AcpiUtSafeStrcpy (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source)
+{
+
+    if (ACPI_STRLEN (Source) >= DestSize)
+    {
+        return (TRUE);
+    }
+
+    ACPI_STRCPY (Dest, Source);
+    return (FALSE);
+}
+
+BOOLEAN
+AcpiUtSafeStrcat (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source)
+{
+
+    if ((ACPI_STRLEN (Dest) + ACPI_STRLEN (Source)) >= DestSize)
+    {
+        return (TRUE);
+    }
+
+    ACPI_STRCAT (Dest, Source);
+    return (FALSE);
+}
+
+#ifndef _KERNEL
+BOOLEAN
+AcpiUtSafeStrncat (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source,
+    ACPI_SIZE               MaxTransferLength)
+{
+    ACPI_SIZE               ActualTransferLength;
+
+
+    ActualTransferLength = ACPI_MIN (MaxTransferLength, ACPI_STRLEN (Source));
+
+    if ((ACPI_STRLEN (Dest) + ActualTransferLength) >= DestSize)
+    {
+        return (TRUE);
+    }
+
+    ACPI_STRNCAT (Dest, Source, MaxTransferLength);
+    return (FALSE);
+}
+#endif
+
+#endif
diff --git a/sys/contrib/dev/acpica/components/utilities/uttrack.c b/sys/contrib/dev/acpica/components/utilities/uttrack.c
index 5c381f0b2bef..1447bc3c9770 100644
--- a/sys/contrib/dev/acpica/components/utilities/uttrack.c
+++ b/sys/contrib/dev/acpica/components/utilities/uttrack.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -151,10 +151,23 @@ AcpiUtAllocateAndTrack (
     ACPI_STATUS             Status;
 
 
-    Allocation = AcpiUtAllocate (Size + sizeof (ACPI_DEBUG_MEM_HEADER),
-                    Component, Module, Line);
+    /* Check for an inadvertent size of zero bytes */
+
+    if (!Size)
+    {
+        ACPI_WARNING ((Module, Line,
+            "Attempt to allocate zero bytes, allocating 1 byte"));
+        Size = 1;
+    }
+
+    Allocation = AcpiOsAllocate (Size + sizeof (ACPI_DEBUG_MEM_HEADER));
     if (!Allocation)
     {
+        /* Report allocation error */
+
+        ACPI_WARNING ((Module, Line,
+            "Could not allocate size %u", (UINT32) Size));
+
         return (NULL);
     }
 
@@ -204,8 +217,16 @@ AcpiUtAllocateZeroedAndTrack (
     ACPI_STATUS             Status;
 
 
-    Allocation = AcpiUtAllocateZeroed (Size + sizeof (ACPI_DEBUG_MEM_HEADER),
-                    Component, Module, Line);
+    /* Check for an inadvertent size of zero bytes */
+
+    if (!Size)
+    {
+        ACPI_WARNING ((Module, Line,
+            "Attempt to allocate zero bytes, allocating 1 byte"));
+        Size = 1;
+    }
+
+    Allocation = AcpiOsAllocateZeroed (Size + sizeof (ACPI_DEBUG_MEM_HEADER));
     if (!Allocation)
     {
         /* Report allocation error */
@@ -286,7 +307,8 @@ AcpiUtFreeAndTrack (
     }
 
     AcpiOsFree (DebugBlock);
-    ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "%p freed\n", Allocation));
+    ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "%p freed (block %p)\n",
+        Allocation, DebugBlock));
     return_VOID;
 }
 
diff --git a/sys/contrib/dev/acpica/components/utilities/utuuid.c b/sys/contrib/dev/acpica/components/utilities/utuuid.c
new file mode 100644
index 000000000000..b9c6a0947f58
--- /dev/null
+++ b/sys/contrib/dev/acpica/components/utilities/utuuid.c
@@ -0,0 +1,103 @@
+/******************************************************************************
+ *
+ * Module Name: utuuid -- UUID support functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#define __UTUUID_C__
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#define _COMPONENT          ACPI_COMPILER
+        ACPI_MODULE_NAME    ("utuuid")
+
+
+/*
+ * UUID support functions.
+ *
+ * This table is used to convert an input UUID ascii string to a 16 byte
+ * buffer and the reverse. The table maps a UUID buffer index 0-15 to
+ * the index within the 36-byte UUID string where the associated 2-byte
+ * hex value can be found.
+ *
+ * 36-byte UUID strings are of the form:
+ *     aabbccdd-eeff-gghh-iijj-kkllmmnnoopp
+ * Where aa-pp are one byte hex numbers, made up of two hex digits
+ *
+ * Note: This table is basically the inverse of the string-to-offset table
+ * found in the ACPI spec in the description of the ToUUID macro.
+ */
+const UINT8    AcpiGbl_MapToUuidOffset[UUID_BUFFER_LENGTH] =
+{
+    6,4,2,0,11,9,16,14,19,21,24,26,28,30,32,34
+};
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiUtConvertStringToUuid
+ *
+ * PARAMETERS:  InString            - 36-byte formatted UUID string
+ *              UuidBuffer          - Where the 16-byte UUID buffer is returned
+ *
+ * RETURN:      None. Output data is returned in the UuidBuffer
+ *
+ * DESCRIPTION: Convert a 36-byte formatted UUID string to 16-byte UUID buffer
+ *
+ ******************************************************************************/
+
+void
+AcpiUtConvertStringToUuid (
+    char                    *InString,
+    UINT8                   *UuidBuffer)
+{
+    UINT32                  i;
+
+
+    for (i = 0; i < UUID_BUFFER_LENGTH; i++)
+    {
+        UuidBuffer[i] =
+            (AcpiUtAsciiCharToHex (InString[AcpiGbl_MapToUuidOffset[i]]) << 4);
+
+        UuidBuffer[i] |=
+            AcpiUtAsciiCharToHex (InString[AcpiGbl_MapToUuidOffset[i] + 1]);
+    }
+}
diff --git a/sys/contrib/dev/acpica/components/utilities/utxface.c b/sys/contrib/dev/acpica/components/utilities/utxface.c
index b6003e6772e7..7ce79c080d92 100644
--- a/sys/contrib/dev/acpica/components/utilities/utxface.c
+++ b/sys/contrib/dev/acpica/components/utilities/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTXFACE_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -114,7 +114,7 @@ AcpiTerminate (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiTerminate)
+ACPI_EXPORT_SYMBOL_INIT (AcpiTerminate)
 
 
 #ifndef ACPI_ASL_COMPILER
diff --git a/sys/contrib/dev/acpica/components/utilities/utxferror.c b/sys/contrib/dev/acpica/components/utilities/utxferror.c
index 8f11b297877a..e5d308300ad0 100644
--- a/sys/contrib/dev/acpica/components/utilities/utxferror.c
+++ b/sys/contrib/dev/acpica/components/utilities/utxferror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
  */
 
 #define __UTXFERROR_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -55,6 +56,8 @@
  * tools/applications.
  */
 
+#ifndef ACPI_NO_ERROR_MESSAGES /* Entire module */
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiError
@@ -294,3 +297,5 @@ AcpiBiosWarning (
 }
 
 ACPI_EXPORT_SYMBOL (AcpiBiosWarning)
+
+#endif /* ACPI_NO_ERROR_MESSAGES */
diff --git a/sys/contrib/dev/acpica/components/utilities/utxfinit.c b/sys/contrib/dev/acpica/components/utilities/utxfinit.c
index c828a710e0f3..061ca19c0abe 100644
--- a/sys/contrib/dev/acpica/components/utilities/utxfinit.c
+++ b/sys/contrib/dev/acpica/components/utilities/utxfinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __UTXFINIT_C__
+#define EXPORT_ACPI_INTERFACES
 
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
@@ -130,11 +130,19 @@ AcpiInitializeSubsystem (
 
     /* If configured, initialize the AML debugger */
 
-    ACPI_DEBUGGER_EXEC (Status = AcpiDbInitialize ());
-    return_ACPI_STATUS (Status);
+#ifdef ACPI_DEBUGGER
+    Status = AcpiDbInitialize ();
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_EXCEPTION ((AE_INFO, Status, "During Debugger initialization"));
+        return_ACPI_STATUS (Status);
+    }
+#endif
+
+    return_ACPI_STATUS (AE_OK);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiInitializeSubsystem)
+ACPI_EXPORT_SYMBOL_INIT (AcpiInitializeSubsystem)
 
 
 /*******************************************************************************
@@ -256,7 +264,7 @@ AcpiEnableSubsystem (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiEnableSubsystem)
+ACPI_EXPORT_SYMBOL_INIT (AcpiEnableSubsystem)
 
 
 /*******************************************************************************
@@ -355,4 +363,4 @@ AcpiInitializeObjects (
     return_ACPI_STATUS (Status);
 }
 
-ACPI_EXPORT_SYMBOL (AcpiInitializeObjects)
+ACPI_EXPORT_SYMBOL_INIT (AcpiInitializeObjects)
diff --git a/sys/contrib/dev/acpica/components/utilities/utxfmutex.c b/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
index ae5a345e93aa..dfa5225213de 100644
--- a/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
+++ b/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acapps.h b/sys/contrib/dev/acpica/include/acapps.h
index fc9542358be1..5d46ff479e9d 100644
--- a/sys/contrib/dev/acpica/include/acapps.h
+++ b/sys/contrib/dev/acpica/include/acapps.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 /* Common info for tool signons */
 
 #define ACPICA_NAME                 "Intel ACPI Component Architecture"
-#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2013 Intel Corporation"
+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2014 Intel Corporation"
 
 #if ACPI_MACHINE_WIDTH == 64
 #define ACPI_WIDTH          "-64"
@@ -84,10 +84,13 @@
 /* Macros for usage messages */
 
 #define ACPI_USAGE_HEADER(Usage) \
-    printf ("Usage: %s\nOptions:\n", Usage);
+    AcpiOsPrintf ("Usage: %s\nOptions:\n", Usage);
+
+#define ACPI_USAGE_TEXT(Description) \
+    AcpiOsPrintf (Description);
 
 #define ACPI_OPTION(Name, Description) \
-    printf ("  %-18s%s\n", Name, Description);
+    AcpiOsPrintf ("  %-18s%s\n", Name, Description);
 
 
 #define FILE_SUFFIX_DISASSEMBLY     "dsl"
@@ -114,6 +117,14 @@ extern int                  AcpiGbl_SubOptChar;
 extern char                 *AcpiGbl_Optarg;
 
 
+/*
+ * cmfsize - Common get file size function
+ */
+UINT32
+CmGetFileSize (
+    ACPI_FILE               File);
+
+
 #ifndef ACPI_DUMP_APP
 /*
  * adisasm
@@ -123,8 +134,7 @@ AdAmlDisassemble (
     BOOLEAN                 OutToFile,
     char                    *Filename,
     char                    *Prefix,
-    char                    **OutFilename,
-    BOOLEAN                 GetAllTables);
+    char                    **OutFilename);
 
 void
 AdPrintStatistics (
@@ -141,8 +151,7 @@ AdDumpTables (
 
 ACPI_STATUS
 AdGetLocalTables (
-    char                    *Filename,
-    BOOLEAN                 GetAllTables);
+    void);
 
 ACPI_STATUS
 AdParseTable (
diff --git a/sys/contrib/dev/acpica/include/acbuffer.h b/sys/contrib/dev/acpica/include/acbuffer.h
index 965102472af1..a36a980aa954 100644
--- a/sys/contrib/dev/acpica/include/acbuffer.h
+++ b/sys/contrib/dev/acpica/include/acbuffer.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/accommon.h b/sys/contrib/dev/acpica/include/accommon.h
index 074b6c19c488..dc6a9b41c1ae 100644
--- a/sys/contrib/dev/acpica/include/accommon.h
+++ b/sys/contrib/dev/acpica/include/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acconfig.h b/sys/contrib/dev/acpica/include/acconfig.h
index 6a267fecf413..69242ee61c12 100644
--- a/sys/contrib/dev/acpica/include/acconfig.h
+++ b/sys/contrib/dev/acpica/include/acconfig.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,9 @@
  * Should the subsystem abort the loading of an ACPI table if the
  * table checksum is incorrect?
  */
+#ifndef ACPI_CHECKSUM_ABORT
 #define ACPI_CHECKSUM_ABORT             FALSE
+#endif
 
 /*
  * Generate a version of ACPICA that only supports "reduced hardware"
@@ -101,7 +103,9 @@
  *      ACPI PM timer
  *      FACS table (Waking vectors and Global Lock)
  */
+#ifndef ACPI_REDUCED_HARDWARE
 #define ACPI_REDUCED_HARDWARE           FALSE
+#endif
 
 
 /******************************************************************************
@@ -217,6 +221,25 @@
 #define ACPI_NUM_SxW_METHODS            5
 
 
+/******************************************************************************
+ *
+ * Miscellaneous constants
+ *
+ *****************************************************************************/
+
+/* UUID constants */
+
+#define UUID_BUFFER_LENGTH          16 /* Length of UUID in memory */
+#define UUID_STRING_LENGTH          36 /* Total length of a UUID string */
+
+/* Positions for required hyphens (dashes) in UUID strings */
+
+#define UUID_HYPHEN1_OFFSET         8
+#define UUID_HYPHEN2_OFFSET         13
+#define UUID_HYPHEN3_OFFSET         18
+#define UUID_HYPHEN4_OFFSET         23
+
+
 /******************************************************************************
  *
  * ACPI AML Debugger
diff --git a/sys/contrib/dev/acpica/include/acdebug.h b/sys/contrib/dev/acpica/include/acdebug.h
index 37d41d32190f..a85625731b08 100644
--- a/sys/contrib/dev/acpica/include/acdebug.h
+++ b/sys/contrib/dev/acpica/include/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -164,6 +164,11 @@ void
 AcpiDbGenerateSci (
     void))
 
+void
+AcpiDbExecuteTest (
+    char                    *TypeArg);
+
+
 /*
  * dbconvert - miscellaneous conversion routines
  */
@@ -372,11 +377,6 @@ AcpiDbGetTableFromFile (
     char                    *Filename,
     ACPI_TABLE_HEADER       **Table);
 
-ACPI_STATUS
-AcpiDbReadTableFromFile (
-    char                    *Filename,
-    ACPI_TABLE_HEADER       **Table);
-
 
 /*
  * dbhistry - debugger HISTORY command
@@ -393,6 +393,10 @@ char *
 AcpiDbGetFromHistory (
     char                    *CommandNumArg);
 
+char *
+AcpiDbGetHistoryByIndex (
+    UINT32                  CommanddNum);
+
 
 /*
  * dbinput - user front-end to the AML debugger
diff --git a/sys/contrib/dev/acpica/include/acdisasm.h b/sys/contrib/dev/acpica/include/acdisasm.h
index 4fadd407109c..687991ed419a 100644
--- a/sys/contrib/dev/acpica/include/acdisasm.h
+++ b/sys/contrib/dev/acpica/include/acdisasm.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,14 +69,14 @@ typedef const struct acpi_dmtable_info
 
 } ACPI_DMTABLE_INFO;
 
+/* Values for Flags field above */
+
 #define DT_LENGTH                       0x01    /* Field is a subtable length */
 #define DT_FLAG                         0x02    /* Field is a flag value */
 #define DT_NON_ZERO                     0x04    /* Field must be non-zero */
-
-/* TBD: Not used at this time */
-
-#define DT_OPTIONAL                     0x08
-#define DT_COUNT                        0x10
+#define DT_OPTIONAL                     0x08    /* Field is optional */
+#define DT_DESCRIBES_OPTIONAL           0x10    /* Field describes an optional field (length, etc.) */
+#define DT_COUNT                        0x20    /* Currently not used */
 
 /*
  * Values for Opcode above.
@@ -137,16 +137,20 @@ typedef enum
 
     ACPI_DMT_ASF,
     ACPI_DMT_DMAR,
+    ACPI_DMT_DMAR_SCOPE,
     ACPI_DMT_EINJACT,
     ACPI_DMT_EINJINST,
     ACPI_DMT_ERSTACT,
     ACPI_DMT_ERSTINST,
     ACPI_DMT_FADTPM,
+    ACPI_DMT_GTDT,
     ACPI_DMT_HEST,
     ACPI_DMT_HESTNTFY,
     ACPI_DMT_HESTNTYP,
     ACPI_DMT_IVRS,
+    ACPI_DMT_LPIT,
     ACPI_DMT_MADT,
+    ACPI_DMT_PCCT,
     ACPI_DMT_PMTT,
     ACPI_DMT_SLIC,
     ACPI_DMT_SRAT,
@@ -186,6 +190,7 @@ typedef struct acpi_op_walk_info
     UINT32                  BitOffset;
     UINT32                  Flags;
     ACPI_WALK_STATE         *WalkState;
+    ACPI_PARSE_OBJECT       *MappingOp;
 
 } ACPI_OP_WALK_INFO;
 
@@ -203,6 +208,7 @@ ACPI_STATUS (*ASL_WALK_CALLBACK) (
 
 typedef
 void (*ACPI_RESOURCE_HANDLER) (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
@@ -244,6 +250,7 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbg2Device[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbg2Addr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbg2Size[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbg2Name[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbg2OemData[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDbgp[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmarHdr[];
@@ -252,6 +259,7 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar2[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar3[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDmar4[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoDrtm[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoEcdt[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoEinj[];
@@ -269,6 +277,10 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoFpdt0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoFpdt1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGas[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGtdt[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGtdtHdr[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGtdt0[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGtdt0a[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoGtdt1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHeader[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHest[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHest0[];
@@ -281,6 +293,9 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHest9[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHestNotify[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHestBank[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoHpet[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoLpitHdr[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoLpit0[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoLpit1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoIvrs[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoIvrs0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoIvrs1[];
@@ -303,6 +318,8 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt9[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt10[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt11[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt12[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt13[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadt14[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMadtHdr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMcfg[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoMcfg0[];
@@ -324,7 +341,9 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPmtt1a[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPmtt2[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPmttHdr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcctHdr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct0[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoRsdp1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoRsdp2[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoS3pt[];
@@ -343,6 +362,7 @@ extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSratHdr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat2[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat3[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoTcpa[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoTpm2[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoUefi[];
@@ -437,6 +457,10 @@ void
 AcpiDmDumpFpdt (
     ACPI_TABLE_HEADER       *Table);
 
+void
+AcpiDmDumpGtdt (
+    ACPI_TABLE_HEADER       *Table);
+
 void
 AcpiDmDumpHest (
     ACPI_TABLE_HEADER       *Table);
@@ -445,6 +469,10 @@ void
 AcpiDmDumpIvrs (
     ACPI_TABLE_HEADER       *Table);
 
+void
+AcpiDmDumpLpit (
+    ACPI_TABLE_HEADER       *Table);
+
 void
 AcpiDmDumpMadt (
     ACPI_TABLE_HEADER       *Table);
@@ -548,6 +576,14 @@ void
 AcpiDmMethodFlags (
     ACPI_PARSE_OBJECT       *Op);
 
+void
+AcpiDmDisplayTargetPathname (
+    ACPI_PARSE_OBJECT       *Op);
+
+void
+AcpiDmNotifyDescription (
+    ACPI_PARSE_OBJECT       *Op);
+
 void
 AcpiDmPredefinedDescription (
     ACPI_PARSE_OBJECT       *Op);
@@ -628,13 +664,17 @@ AcpiDmByteList (
     ACPI_PARSE_OBJECT       *Op);
 
 void
-AcpiDmIsEisaId (
+AcpiDmCheckForHardwareId (
     ACPI_PARSE_OBJECT       *Op);
 
 void
-AcpiDmEisaId (
+AcpiDmDecompressEisaId (
     UINT32                  EncodedId);
 
+BOOLEAN
+AcpiDmIsUuidBuffer (
+    ACPI_PARSE_OBJECT       *Op);
+
 BOOLEAN
 AcpiDmIsUnicodeBuffer (
     ACPI_PARSE_OBJECT       *Op);
@@ -668,11 +708,19 @@ AcpiDmClearExternalFileList (
     void);
 
 void
-AcpiDmAddToExternalList (
+AcpiDmAddOpToExternalList (
     ACPI_PARSE_OBJECT       *Op,
     char                    *Path,
     UINT8                   Type,
-    UINT32                  Value);
+    UINT32                  Value,
+    UINT16                  Flags);
+
+void
+AcpiDmAddNodeToExternalList (
+    ACPI_NAMESPACE_NODE     *Node,
+    UINT8                   Type,
+    UINT32                  Value,
+    UINT16                  Flags);
 
 void
 AcpiDmAddExternalsToNamespace (
@@ -747,72 +795,84 @@ AcpiDmDescriptorName (
  */
 void
 AcpiDmWordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmDwordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmExtendedDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmQwordDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmMemory24Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmMemory32Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmFixedMemory32Descriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmGenericRegisterDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmInterruptDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmVendorLargeDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmGpioDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmSerialBusDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
@@ -830,48 +890,56 @@ AcpiDmVendorCommon (
  */
 void
 AcpiDmIrqDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmDmaDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmFixedDmaDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmIoDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmFixedIoDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmStartDependentDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmEndDependentDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
 
 void
 AcpiDmVendorSmallDescriptor (
+    ACPI_OP_WALK_INFO       *Info,
     AML_RESOURCE            *Resource,
     UINT32                  Length,
     UINT32                  Level);
diff --git a/sys/contrib/dev/acpica/include/acdispat.h b/sys/contrib/dev/acpica/include/acdispat.h
index fc747f1998cf..c4abebb55e8c 100644
--- a/sys/contrib/dev/acpica/include/acdispat.h
+++ b/sys/contrib/dev/acpica/include/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef _ACDISPAT_H_
 #define _ACDISPAT_H_
 
@@ -173,13 +172,15 @@ AcpiDsInitFieldObjects (
 
 
 /*
- * dsload - Parser/Interpreter interface, pass 1 namespace load callbacks
+ * dsload - Parser/Interpreter interface
  */
 ACPI_STATUS
 AcpiDsInitCallbacks (
     ACPI_WALK_STATE         *WalkState,
     UINT32                  PassNumber);
 
+/* dsload - pass 1 namespace load callbacks */
+
 ACPI_STATUS
 AcpiDsLoad1BeginOp (
     ACPI_WALK_STATE         *WalkState,
@@ -190,9 +191,8 @@ AcpiDsLoad1EndOp (
     ACPI_WALK_STATE         *WalkState);
 
 
-/*
- * dsload - Parser/Interpreter interface, pass 2 namespace load callbacks
- */
+/* dsload - pass 2 namespace load callbacks */
+
 ACPI_STATUS
 AcpiDsLoad2BeginOp (
     ACPI_WALK_STATE         *WalkState,
@@ -257,8 +257,9 @@ AcpiDsMethodDataInit (
  * dsmethod - Parser/Interpreter interface - control method parsing
  */
 ACPI_STATUS
-AcpiDsParseMethod (
-    ACPI_NAMESPACE_NODE     *Node);
+AcpiDsAutoSerializeMethod (
+    ACPI_NAMESPACE_NODE     *Node,
+    ACPI_OPERAND_OBJECT     *ObjDesc);
 
 ACPI_STATUS
 AcpiDsCallControlMethod (
diff --git a/sys/contrib/dev/acpica/include/acevents.h b/sys/contrib/dev/acpica/include/acevents.h
index 67095aa0e3dd..43c1d7cc5fd6 100644
--- a/sys/contrib/dev/acpica/include/acevents.h
+++ b/sys/contrib/dev/acpica/include/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -144,9 +144,10 @@ AcpiEvFinishGpe (
 ACPI_STATUS
 AcpiEvCreateGpeBlock (
     ACPI_NAMESPACE_NODE     *GpeDevice,
-    ACPI_GENERIC_ADDRESS    *GpeBlockAddress,
+    UINT64                  Address,
+    UINT8                   SpaceId,
     UINT32                  RegisterCount,
-    UINT8                   GpeBlockBaseNumber,
+    UINT16                  GpeBlockBaseNumber,
     UINT32                  InterruptNumber,
     ACPI_GPE_BLOCK_INFO     **ReturnGpeBlock);
 
@@ -206,9 +207,10 @@ AcpiEvGetGpeDevice (
     ACPI_GPE_BLOCK_INFO     *GpeBlock,
     void                    *Context);
 
-ACPI_GPE_XRUPT_INFO *
+ACPI_STATUS
 AcpiEvGetGpeXruptBlock (
-    UINT32                  InterruptNumber);
+    UINT32                  InterruptNumber,
+    ACPI_GPE_XRUPT_INFO     **GpeXruptBlock);
 
 ACPI_STATUS
 AcpiEvDeleteGpeXrupt (
diff --git a/sys/contrib/dev/acpica/include/acexcep.h b/sys/contrib/dev/acpica/include/acexcep.h
index 7bcfe1d66708..aab6941a3c7e 100644
--- a/sys/contrib/dev/acpica/include/acexcep.h
+++ b/sys/contrib/dev/acpica/include/acexcep.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acglobal.h b/sys/contrib/dev/acpica/include/acglobal.h
index cb76f653b368..a83f8c34b0eb 100644
--- a/sys/contrib/dev/acpica/include/acglobal.h
+++ b/sys/contrib/dev/acpica/include/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,167 +45,42 @@
 #define __ACGLOBAL_H__
 
 
-/*
- * Ensure that the globals are actually defined and initialized only once.
- *
- * The use of these macros allows a single list of globals (here) in order
- * to simplify maintenance of the code.
- */
-#ifdef DEFINE_ACPI_GLOBALS
-#define ACPI_EXTERN
-#define ACPI_INIT_GLOBAL(a,b) a=b
-#else
-#define ACPI_EXTERN extern
-#define ACPI_INIT_GLOBAL(a,b) a
-#endif
-
-
-#ifdef DEFINE_ACPI_GLOBALS
-
-/* Public globals, available from outside ACPICA subsystem */
-
 /*****************************************************************************
  *
- * Runtime configuration (static defaults that can be overriden at runtime)
+ * Globals related to the ACPI tables
  *
  ****************************************************************************/
 
-/*
- * Enable "slack" in the AML interpreter?  Default is FALSE, and the
- * interpreter strictly follows the ACPI specification. Setting to TRUE
- * allows the interpreter to ignore certain errors and/or bad AML constructs.
- *
- * Currently, these features are enabled by this flag:
- *
- * 1) Allow "implicit return" of last value in a control method
- * 2) Allow access beyond the end of an operation region
- * 3) Allow access to uninitialized locals/args (auto-init to integer 0)
- * 4) Allow ANY object type to be a source operand for the Store() operator
- * 5) Allow unresolved references (invalid target name) in package objects
- * 6) Enable warning messages for behavior that is not ACPI spec compliant
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_EnableInterpreterSlack, FALSE);
+/* Master list of all ACPI tables that were found in the RSDT/XSDT */
 
-/*
- * Automatically serialize ALL control methods? Default is FALSE, meaning
- * to use the Serialized/NotSerialized method flags on a per method basis.
- * Only change this if the ASL code is poorly written and cannot handle
- * reentrancy even though methods are marked "NotSerialized".
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_AllMethodsSerialized, FALSE);
+ACPI_GLOBAL (ACPI_TABLE_LIST,           AcpiGbl_RootTableList);
 
-/*
- * Create the predefined _OSI method in the namespace? Default is TRUE
- * because ACPI CA is fully compatible with other ACPI implementations.
- * Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_CreateOsiMethod, TRUE);
+/* DSDT information. Used to check for DSDT corruption */
 
-/*
- * Optionally use default values for the ACPI register widths. Set this to
- * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_UseDefaultRegisterWidths, TRUE);
-
-/*
- * Optionally enable output from the AML Debug Object.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_EnableAmlDebugObject, FALSE);
-
-/*
- * Optionally copy the entire DSDT to local memory (instead of simply
- * mapping it.) There are some BIOSs that corrupt or replace the original
- * DSDT, creating the need for this option. Default is FALSE, do not copy
- * the DSDT.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_CopyDsdtLocally, FALSE);
-
-/*
- * Optionally truncate I/O addresses to 16 bits. Provides compatibility
- * with other ACPI implementations. NOTE: During ACPICA initialization,
- * this value is set to TRUE if any Windows OSI strings have been
- * requested by the BIOS.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_TruncateIoAddresses, FALSE);
-
-/*
- * Disable runtime checking and repair of values returned by control methods.
- * Use only if the repair is causing a problem on a particular machine.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_DisableAutoRepair, FALSE);
-
-/*
- * Optionally do not load any SSDTs from the RSDT/XSDT during initialization.
- * This can be useful for debugging ACPI problems on some machines.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_DisableSsdtTableLoad, FALSE);
-
-/*
- * We keep track of the latest version of Windows that has been requested by
- * the BIOS.
- */
-UINT8       ACPI_INIT_GLOBAL (AcpiGbl_OsiData, 0);
-
-
-/* AcpiGbl_FADT is a local copy of the FADT, converted to a common format. */
-
-ACPI_TABLE_FADT             AcpiGbl_FADT;
-UINT32                      AcpiCurrentGpeCount;
-UINT32                      AcpiGbl_TraceFlags;
-ACPI_NAME                   AcpiGbl_TraceMethodName;
-BOOLEAN                     AcpiGbl_SystemAwakeAndRunning;
-
-/*
- * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
- * that the ACPI hardware is no longer required. A flag in the FADT indicates
- * a reduced HW machine, and that flag is duplicated here for convenience.
- */
-BOOLEAN                     AcpiGbl_ReducedHardware;
-
-#endif /* DEFINE_ACPI_GLOBALS */
-
-/* Do not disassemble buffers to resource descriptors */
-
-ACPI_EXTERN UINT8       ACPI_INIT_GLOBAL (AcpiGbl_NoResourceDisassembly, FALSE);
-
-/*****************************************************************************
- *
- * ACPI Table globals
- *
- ****************************************************************************/
-
-/*
- * AcpiGbl_RootTableList is the master list of ACPI tables that were
- * found in the RSDT/XSDT.
- */
-ACPI_EXTERN ACPI_TABLE_LIST             AcpiGbl_RootTableList;
+ACPI_GLOBAL (ACPI_TABLE_HEADER *,       AcpiGbl_DSDT);
+ACPI_GLOBAL (ACPI_TABLE_HEADER,         AcpiGbl_OriginalDsdtHeader);
 
 #if (!ACPI_REDUCED_HARDWARE)
-ACPI_EXTERN ACPI_TABLE_FACS            *AcpiGbl_FACS;
+ACPI_GLOBAL (ACPI_TABLE_FACS *,         AcpiGbl_FACS);
 
 #endif /* !ACPI_REDUCED_HARDWARE */
 
 /* These addresses are calculated from the FADT Event Block addresses */
 
-ACPI_EXTERN ACPI_GENERIC_ADDRESS        AcpiGbl_XPm1aStatus;
-ACPI_EXTERN ACPI_GENERIC_ADDRESS        AcpiGbl_XPm1aEnable;
+ACPI_GLOBAL (ACPI_GENERIC_ADDRESS,      AcpiGbl_XPm1aStatus);
+ACPI_GLOBAL (ACPI_GENERIC_ADDRESS,      AcpiGbl_XPm1aEnable);
 
-ACPI_EXTERN ACPI_GENERIC_ADDRESS        AcpiGbl_XPm1bStatus;
-ACPI_EXTERN ACPI_GENERIC_ADDRESS        AcpiGbl_XPm1bEnable;
-
-/* DSDT information. Used to check for DSDT corruption */
-
-ACPI_EXTERN ACPI_TABLE_HEADER          *AcpiGbl_DSDT;
-ACPI_EXTERN ACPI_TABLE_HEADER           AcpiGbl_OriginalDsdtHeader;
+ACPI_GLOBAL (ACPI_GENERIC_ADDRESS,      AcpiGbl_XPm1bStatus);
+ACPI_GLOBAL (ACPI_GENERIC_ADDRESS,      AcpiGbl_XPm1bEnable);
 
 /*
- * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is
+ * Handle both ACPI 1.0 and ACPI 2.0+ Integer widths. The integer width is
  * determined by the revision of the DSDT: If the DSDT revision is less than
  * 2, use only the lower 32 bits of the internal 64-bit Integer.
  */
-ACPI_EXTERN UINT8                       AcpiGbl_IntegerBitWidth;
-ACPI_EXTERN UINT8                       AcpiGbl_IntegerByteWidth;
-ACPI_EXTERN UINT8                       AcpiGbl_IntegerNybbleWidth;
+ACPI_GLOBAL (UINT8,                     AcpiGbl_IntegerBitWidth);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_IntegerByteWidth);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_IntegerNybbleWidth);
 
 
 /*****************************************************************************
@@ -219,36 +94,36 @@ ACPI_EXTERN UINT8                       AcpiGbl_IntegerNybbleWidth;
  * actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.
  * (The table maps local handles to the real OS handles)
  */
-ACPI_EXTERN ACPI_MUTEX_INFO             AcpiGbl_MutexInfo[ACPI_NUM_MUTEX];
+ACPI_GLOBAL (ACPI_MUTEX_INFO,           AcpiGbl_MutexInfo[ACPI_NUM_MUTEX]);
 
 /*
  * Global lock mutex is an actual AML mutex object
  * Global lock semaphore works in conjunction with the actual global lock
  * Global lock spinlock is used for "pending" handshake
  */
-ACPI_EXTERN ACPI_OPERAND_OBJECT        *AcpiGbl_GlobalLockMutex;
-ACPI_EXTERN ACPI_SEMAPHORE              AcpiGbl_GlobalLockSemaphore;
-ACPI_EXTERN ACPI_SPINLOCK               AcpiGbl_GlobalLockPendingLock;
-ACPI_EXTERN UINT16                      AcpiGbl_GlobalLockHandle;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_GlobalLockAcquired;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_GlobalLockPresent;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_GlobalLockPending;
+ACPI_GLOBAL (ACPI_OPERAND_OBJECT *,     AcpiGbl_GlobalLockMutex);
+ACPI_GLOBAL (ACPI_SEMAPHORE,            AcpiGbl_GlobalLockSemaphore);
+ACPI_GLOBAL (ACPI_SPINLOCK,             AcpiGbl_GlobalLockPendingLock);
+ACPI_GLOBAL (UINT16,                    AcpiGbl_GlobalLockHandle);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_GlobalLockAcquired);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_GlobalLockPresent);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_GlobalLockPending);
 
 /*
  * Spinlocks are used for interfaces that can be possibly called at
  * interrupt level
  */
-ACPI_EXTERN ACPI_SPINLOCK               AcpiGbl_GpeLock;      /* For GPE data structs and registers */
-ACPI_EXTERN ACPI_SPINLOCK               AcpiGbl_HardwareLock; /* For ACPI H/W except GPE registers */
-ACPI_EXTERN ACPI_SPINLOCK               AcpiGbl_ReferenceCountLock;
+ACPI_GLOBAL (ACPI_SPINLOCK,             AcpiGbl_GpeLock);       /* For GPE data structs and registers */
+ACPI_GLOBAL (ACPI_SPINLOCK,             AcpiGbl_HardwareLock);  /* For ACPI H/W except GPE registers */
+ACPI_GLOBAL (ACPI_SPINLOCK,             AcpiGbl_ReferenceCountLock);
 
 /* Mutex for _OSI support */
 
-ACPI_EXTERN ACPI_MUTEX                  AcpiGbl_OsiMutex;
+ACPI_GLOBAL (ACPI_MUTEX,                AcpiGbl_OsiMutex);
 
 /* Reader/Writer lock is used for namespace walk and dynamic table unload */
 
-ACPI_EXTERN ACPI_RW_LOCK                AcpiGbl_NamespaceRwLock;
+ACPI_GLOBAL (ACPI_RW_LOCK,              AcpiGbl_NamespaceRwLock);
 
 
 /*****************************************************************************
@@ -259,69 +134,67 @@ ACPI_EXTERN ACPI_RW_LOCK                AcpiGbl_NamespaceRwLock;
 
 /* Object caches */
 
-ACPI_EXTERN ACPI_CACHE_T               *AcpiGbl_NamespaceCache;
-ACPI_EXTERN ACPI_CACHE_T               *AcpiGbl_StateCache;
-ACPI_EXTERN ACPI_CACHE_T               *AcpiGbl_PsNodeCache;
-ACPI_EXTERN ACPI_CACHE_T               *AcpiGbl_PsNodeExtCache;
-ACPI_EXTERN ACPI_CACHE_T               *AcpiGbl_OperandCache;
+ACPI_GLOBAL (ACPI_CACHE_T *,            AcpiGbl_NamespaceCache);
+ACPI_GLOBAL (ACPI_CACHE_T *,            AcpiGbl_StateCache);
+ACPI_GLOBAL (ACPI_CACHE_T *,            AcpiGbl_PsNodeCache);
+ACPI_GLOBAL (ACPI_CACHE_T *,            AcpiGbl_PsNodeExtCache);
+ACPI_GLOBAL (ACPI_CACHE_T *,            AcpiGbl_OperandCache);
+
+/* System */
+
+ACPI_INIT_GLOBAL (UINT32,               AcpiGbl_StartupFlags, 0);
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_Shutdown, TRUE);
 
 /* Global handlers */
 
-ACPI_EXTERN ACPI_GLOBAL_NOTIFY_HANDLER  AcpiGbl_GlobalNotify[2];
-ACPI_EXTERN ACPI_EXCEPTION_HANDLER      AcpiGbl_ExceptionHandler;
-ACPI_EXTERN ACPI_INIT_HANDLER           AcpiGbl_InitHandler;
-ACPI_EXTERN ACPI_TABLE_HANDLER          AcpiGbl_TableHandler;
-ACPI_EXTERN void                       *AcpiGbl_TableHandlerContext;
-ACPI_EXTERN ACPI_WALK_STATE            *AcpiGbl_BreakpointWalk;
-ACPI_EXTERN ACPI_INTERFACE_HANDLER      AcpiGbl_InterfaceHandler;
-ACPI_EXTERN ACPI_SCI_HANDLER_INFO      *AcpiGbl_SciHandlerList;
+ACPI_GLOBAL (ACPI_GLOBAL_NOTIFY_HANDLER,AcpiGbl_GlobalNotify[2]);
+ACPI_GLOBAL (ACPI_EXCEPTION_HANDLER,    AcpiGbl_ExceptionHandler);
+ACPI_GLOBAL (ACPI_INIT_HANDLER,         AcpiGbl_InitHandler);
+ACPI_GLOBAL (ACPI_TABLE_HANDLER,        AcpiGbl_TableHandler);
+ACPI_GLOBAL (void *,                    AcpiGbl_TableHandlerContext);
+ACPI_GLOBAL (ACPI_INTERFACE_HANDLER,    AcpiGbl_InterfaceHandler);
+ACPI_GLOBAL (ACPI_SCI_HANDLER_INFO *,   AcpiGbl_SciHandlerList);
 
 /* Owner ID support */
 
-ACPI_EXTERN UINT32                      AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS];
-ACPI_EXTERN UINT8                       AcpiGbl_LastOwnerIdIndex;
-ACPI_EXTERN UINT8                       AcpiGbl_NextOwnerIdOffset;
+ACPI_GLOBAL (UINT32,                    AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS]);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_LastOwnerIdIndex);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_NextOwnerIdOffset);
 
 /* Initialization sequencing */
 
-ACPI_EXTERN BOOLEAN                     AcpiGbl_RegMethodsExecuted;
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_RegMethodsExecuted);
 
 /* Misc */
 
-ACPI_EXTERN UINT32                      AcpiGbl_OriginalMode;
-ACPI_EXTERN UINT32                      AcpiGbl_RsdpOriginalLocation;
-ACPI_EXTERN UINT32                      AcpiGbl_NsLookupCount;
-ACPI_EXTERN UINT32                      AcpiGbl_PsFindCount;
-ACPI_EXTERN UINT16                      AcpiGbl_Pm1EnableRegisterSave;
-ACPI_EXTERN UINT8                       AcpiGbl_DebuggerConfiguration;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_StepToNextCall;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_AcpiHardwarePresent;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_EventsInitialized;
-ACPI_EXTERN ACPI_INTERFACE_INFO        *AcpiGbl_SupportedInterfaces;
-ACPI_EXTERN ACPI_ADDRESS_RANGE         *AcpiGbl_AddressRangeList[ACPI_ADDRESS_RANGE_MAX];
+ACPI_GLOBAL (UINT32,                    AcpiGbl_OriginalMode);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_NsLookupCount);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_PsFindCount);
+ACPI_GLOBAL (UINT16,                    AcpiGbl_Pm1EnableRegisterSave);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_DebuggerConfiguration);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_StepToNextCall);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_AcpiHardwarePresent);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_EventsInitialized);
+ACPI_GLOBAL (ACPI_INTERFACE_INFO *,     AcpiGbl_SupportedInterfaces);
+ACPI_GLOBAL (ACPI_ADDRESS_RANGE *,      AcpiGbl_AddressRangeList[ACPI_ADDRESS_RANGE_MAX]);
 
-#ifndef DEFINE_ACPI_GLOBALS
+/* Other miscellaneous, declared and initialized in utglobal */
 
-/* Other miscellaneous */
-
-extern BOOLEAN                          AcpiGbl_Shutdown;
-extern UINT32                           AcpiGbl_StartupFlags;
 extern const char                      *AcpiGbl_SleepStateNames[ACPI_S_STATE_COUNT];
 extern const char                      *AcpiGbl_LowestDstateNames[ACPI_NUM_SxW_METHODS];
 extern const char                      *AcpiGbl_HighestDstateNames[ACPI_NUM_SxD_METHODS];
-extern const ACPI_OPCODE_INFO           AcpiGbl_AmlOpInfo[AML_NUM_OPCODES];
 extern const char                      *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS];
-#endif
+extern const ACPI_OPCODE_INFO           AcpiGbl_AmlOpInfo[AML_NUM_OPCODES];
 
 
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
-/* Lists for tracking memory allocations */
+/* Lists for tracking memory allocations (debug only) */
 
-ACPI_EXTERN ACPI_MEMORY_LIST           *AcpiGbl_GlobalList;
-ACPI_EXTERN ACPI_MEMORY_LIST           *AcpiGbl_NsNodeList;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DisplayFinalMemStats;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DisableMemTracking;
+ACPI_GLOBAL (ACPI_MEMORY_LIST *,        AcpiGbl_GlobalList);
+ACPI_GLOBAL (ACPI_MEMORY_LIST *,        AcpiGbl_NsNodeList);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DisplayFinalMemStats);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DisableMemTracking);
 #endif
 
 
@@ -337,22 +210,23 @@ ACPI_EXTERN BOOLEAN                     AcpiGbl_DisableMemTracking;
 #define NUM_PREDEFINED_NAMES            9
 #endif
 
-ACPI_EXTERN ACPI_NAMESPACE_NODE         AcpiGbl_RootNodeStruct;
-ACPI_EXTERN ACPI_NAMESPACE_NODE        *AcpiGbl_RootNode;
-ACPI_EXTERN ACPI_NAMESPACE_NODE        *AcpiGbl_FadtGpeDevice;
-ACPI_EXTERN ACPI_OPERAND_OBJECT        *AcpiGbl_ModuleCodeList;
+ACPI_GLOBAL (ACPI_NAMESPACE_NODE,       AcpiGbl_RootNodeStruct);
+ACPI_GLOBAL (ACPI_NAMESPACE_NODE *,     AcpiGbl_RootNode);
+ACPI_GLOBAL (ACPI_NAMESPACE_NODE *,     AcpiGbl_FadtGpeDevice);
+ACPI_GLOBAL (ACPI_OPERAND_OBJECT *,     AcpiGbl_ModuleCodeList);
 
 
 extern const UINT8                      AcpiGbl_NsProperties [ACPI_NUM_NS_TYPES];
 extern const ACPI_PREDEFINED_NAMES      AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES];
 
 #ifdef ACPI_DEBUG_OUTPUT
-ACPI_EXTERN UINT32                      AcpiGbl_CurrentNodeCount;
-ACPI_EXTERN UINT32                      AcpiGbl_CurrentNodeSize;
-ACPI_EXTERN UINT32                      AcpiGbl_MaxConcurrentNodeCount;
-ACPI_EXTERN ACPI_SIZE                  *AcpiGbl_EntryStackPointer;
-ACPI_EXTERN ACPI_SIZE                  *AcpiGbl_LowestStackPointer;
-ACPI_EXTERN UINT32                      AcpiGbl_DeepestNesting;
+ACPI_GLOBAL (UINT32,                    AcpiGbl_CurrentNodeCount);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_CurrentNodeSize);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_MaxConcurrentNodeCount);
+ACPI_GLOBAL (ACPI_SIZE *,               AcpiGbl_EntryStackPointer);
+ACPI_GLOBAL (ACPI_SIZE *,               AcpiGbl_LowestStackPointer);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_DeepestNesting);
+ACPI_INIT_GLOBAL (UINT32,               AcpiGbl_NestingLevel, 0);
 #endif
 
 
@@ -362,11 +236,11 @@ ACPI_EXTERN UINT32                      AcpiGbl_DeepestNesting;
  *
  ****************************************************************************/
 
-ACPI_EXTERN ACPI_THREAD_STATE          *AcpiGbl_CurrentWalkList;
+ACPI_GLOBAL (ACPI_THREAD_STATE *,       AcpiGbl_CurrentWalkList);
 
 /* Control method single step flag */
 
-ACPI_EXTERN UINT8                       AcpiGbl_CmSingleStep;
+ACPI_GLOBAL (UINT8,                     AcpiGbl_CmSingleStep);
 
 
 /*****************************************************************************
@@ -375,9 +249,10 @@ ACPI_EXTERN UINT8                       AcpiGbl_CmSingleStep;
  *
  ****************************************************************************/
 
-extern      ACPI_BIT_REGISTER_INFO      AcpiGbl_BitRegisterInfo[ACPI_NUM_BITREG];
-ACPI_EXTERN UINT8                       AcpiGbl_SleepTypeA;
-ACPI_EXTERN UINT8                       AcpiGbl_SleepTypeB;
+extern ACPI_BIT_REGISTER_INFO           AcpiGbl_BitRegisterInfo[ACPI_NUM_BITREG];
+
+ACPI_GLOBAL (UINT8,                     AcpiGbl_SleepTypeA);
+ACPI_GLOBAL (UINT8,                     AcpiGbl_SleepTypeB);
 
 
 /*****************************************************************************
@@ -388,13 +263,14 @@ ACPI_EXTERN UINT8                       AcpiGbl_SleepTypeB;
 
 #if (!ACPI_REDUCED_HARDWARE)
 
-ACPI_EXTERN UINT8                       AcpiGbl_AllGpesInitialized;
-ACPI_EXTERN ACPI_GPE_XRUPT_INFO        *AcpiGbl_GpeXruptListHead;
-ACPI_EXTERN ACPI_GPE_BLOCK_INFO        *AcpiGbl_GpeFadtBlocks[ACPI_MAX_GPE_BLOCKS];
-ACPI_EXTERN ACPI_GBL_EVENT_HANDLER      AcpiGbl_GlobalEventHandler;
-ACPI_EXTERN void                       *AcpiGbl_GlobalEventHandlerContext;
-ACPI_EXTERN ACPI_FIXED_EVENT_HANDLER    AcpiGbl_FixedEventHandlers[ACPI_NUM_FIXED_EVENTS];
-extern      ACPI_FIXED_EVENT_INFO       AcpiGbl_FixedEventInfo[ACPI_NUM_FIXED_EVENTS];
+ACPI_GLOBAL (UINT8,                     AcpiGbl_AllGpesInitialized);
+ACPI_GLOBAL (ACPI_GPE_XRUPT_INFO *,     AcpiGbl_GpeXruptListHead);
+ACPI_GLOBAL (ACPI_GPE_BLOCK_INFO *,     AcpiGbl_GpeFadtBlocks[ACPI_MAX_GPE_BLOCKS]);
+ACPI_GLOBAL (ACPI_GBL_EVENT_HANDLER,    AcpiGbl_GlobalEventHandler);
+ACPI_GLOBAL (void *,                    AcpiGbl_GlobalEventHandlerContext);
+ACPI_GLOBAL (ACPI_FIXED_EVENT_HANDLER,  AcpiGbl_FixedEventHandlers[ACPI_NUM_FIXED_EVENTS]);
+
+extern ACPI_FIXED_EVENT_INFO            AcpiGbl_FixedEventInfo[ACPI_NUM_FIXED_EVENTS];
 
 #endif /* !ACPI_REDUCED_HARDWARE */
 
@@ -404,23 +280,19 @@ extern      ACPI_FIXED_EVENT_INFO       AcpiGbl_FixedEventInfo[ACPI_NUM_FIXED_EV
  *
  ****************************************************************************/
 
-/* Procedure nesting level for debug output */
-
-extern      UINT32                      AcpiGbl_NestingLevel;
-
 /* Event counters */
 
-ACPI_EXTERN UINT32                      AcpiMethodCount;
-ACPI_EXTERN UINT32                      AcpiGpeCount;
-ACPI_EXTERN UINT32                      AcpiSciCount;
-ACPI_EXTERN UINT32                      AcpiFixedEventCount[ACPI_NUM_FIXED_EVENTS];
+ACPI_GLOBAL (UINT32,                    AcpiMethodCount);
+ACPI_GLOBAL (UINT32,                    AcpiGpeCount);
+ACPI_GLOBAL (UINT32,                    AcpiSciCount);
+ACPI_GLOBAL (UINT32,                    AcpiFixedEventCount[ACPI_NUM_FIXED_EVENTS]);
 
 /* Support for dynamic control method tracing mechanism */
 
-ACPI_EXTERN UINT32                      AcpiGbl_OriginalDbgLevel;
-ACPI_EXTERN UINT32                      AcpiGbl_OriginalDbgLayer;
-ACPI_EXTERN UINT32                      AcpiGbl_TraceDbgLevel;
-ACPI_EXTERN UINT32                      AcpiGbl_TraceDbgLayer;
+ACPI_GLOBAL (UINT32,                    AcpiGbl_OriginalDbgLevel);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_OriginalDbgLayer);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_TraceDbgLevel);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_TraceDbgLayer);
 
 
 /*****************************************************************************
@@ -429,74 +301,90 @@ ACPI_EXTERN UINT32                      AcpiGbl_TraceDbgLayer;
  *
  ****************************************************************************/
 
-ACPI_EXTERN UINT8                       AcpiGbl_DbOutputFlags;
+ACPI_INIT_GLOBAL (UINT8,                AcpiGbl_DbOutputFlags, ACPI_DB_CONSOLE_OUTPUT);
 
 #ifdef ACPI_DISASSEMBLER
 
-ACPI_EXTERN BOOLEAN                     ACPI_INIT_GLOBAL (AcpiGbl_IgnoreNoopOperator, FALSE);
+/* Do not disassemble buffers to resource descriptors */
 
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_disasm;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_verbose;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_NumExternalMethods;
-ACPI_EXTERN UINT32                      AcpiGbl_ResolvedExternalMethods;
-ACPI_EXTERN ACPI_EXTERNAL_LIST         *AcpiGbl_ExternalList;
-ACPI_EXTERN ACPI_EXTERNAL_FILE         *AcpiGbl_ExternalFileList;
+ACPI_INIT_GLOBAL (UINT8,                AcpiGbl_NoResourceDisassembly, FALSE);
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_IgnoreNoopOperator, FALSE);
+
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_disasm);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_verbose);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_NumExternalMethods);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_ResolvedExternalMethods);
+ACPI_GLOBAL (ACPI_EXTERNAL_LIST *,      AcpiGbl_ExternalList);
+ACPI_GLOBAL (ACPI_EXTERNAL_FILE *,      AcpiGbl_ExternalFileList);
 #endif
 
-
 #ifdef ACPI_DEBUGGER
 
-extern      BOOLEAN                     AcpiGbl_MethodExecuting;
-extern      BOOLEAN                     AcpiGbl_AbortMethod;
-extern      BOOLEAN                     AcpiGbl_DbTerminateThreads;
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_DbTerminateThreads, FALSE);
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_AbortMethod, FALSE);
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_MethodExecuting, FALSE);
 
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_tables;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_stats;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_ini_methods;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport;
-ACPI_EXTERN BOOLEAN                     AcpiGbl_DbOutputToFile;
-ACPI_EXTERN char                       *AcpiGbl_DbBuffer;
-ACPI_EXTERN char                       *AcpiGbl_DbFilename;
-ACPI_EXTERN UINT32                      AcpiGbl_DbDebugLevel;
-ACPI_EXTERN UINT32                      AcpiGbl_DbConsoleDebugLevel;
-ACPI_EXTERN ACPI_NAMESPACE_NODE        *AcpiGbl_DbScopeNode;
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_tables);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_stats);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_ini_methods);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_NoRegionSupport);
+ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOutputToFile);
+ACPI_GLOBAL (char *,                    AcpiGbl_DbBuffer);
+ACPI_GLOBAL (char *,                    AcpiGbl_DbFilename);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_DbDebugLevel);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_DbConsoleDebugLevel);
+ACPI_GLOBAL (ACPI_NAMESPACE_NODE *,     AcpiGbl_DbScopeNode);
 
-ACPI_EXTERN char                       *AcpiGbl_DbArgs[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN ACPI_OBJECT_TYPE            AcpiGbl_DbArgTypes[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_GLOBAL (char *,                    AcpiGbl_DbArgs[ACPI_DEBUGGER_MAX_ARGS]);
+ACPI_GLOBAL (ACPI_OBJECT_TYPE,          AcpiGbl_DbArgTypes[ACPI_DEBUGGER_MAX_ARGS]);
 
 /* These buffers should all be the same size */
 
-ACPI_EXTERN char                        AcpiGbl_DbLineBuf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char                        AcpiGbl_DbParsedBuf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char                        AcpiGbl_DbScopeBuf[ACPI_DB_LINE_BUFFER_SIZE];
-ACPI_EXTERN char                        AcpiGbl_DbDebugFilename[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_GLOBAL (char,                      AcpiGbl_DbLineBuf[ACPI_DB_LINE_BUFFER_SIZE]);
+ACPI_GLOBAL (char,                      AcpiGbl_DbParsedBuf[ACPI_DB_LINE_BUFFER_SIZE]);
+ACPI_GLOBAL (char,                      AcpiGbl_DbScopeBuf[ACPI_DB_LINE_BUFFER_SIZE]);
+ACPI_GLOBAL (char,                      AcpiGbl_DbDebugFilename[ACPI_DB_LINE_BUFFER_SIZE]);
 
 /*
  * Statistic globals
  */
-ACPI_EXTERN UINT16                      AcpiGbl_ObjTypeCount[ACPI_TYPE_NS_NODE_MAX+1];
-ACPI_EXTERN UINT16                      AcpiGbl_NodeTypeCount[ACPI_TYPE_NS_NODE_MAX+1];
-ACPI_EXTERN UINT16                      AcpiGbl_ObjTypeCountMisc;
-ACPI_EXTERN UINT16                      AcpiGbl_NodeTypeCountMisc;
-ACPI_EXTERN UINT32                      AcpiGbl_NumNodes;
-ACPI_EXTERN UINT32                      AcpiGbl_NumObjects;
-
-
-ACPI_EXTERN UINT32                      AcpiGbl_SizeOfParseTree;
-ACPI_EXTERN UINT32                      AcpiGbl_SizeOfMethodTrees;
-ACPI_EXTERN UINT32                      AcpiGbl_SizeOfNodeEntries;
-ACPI_EXTERN UINT32                      AcpiGbl_SizeOfAcpiObjects;
+ACPI_GLOBAL (UINT16,                    AcpiGbl_ObjTypeCount[ACPI_TYPE_NS_NODE_MAX+1]);
+ACPI_GLOBAL (UINT16,                    AcpiGbl_NodeTypeCount[ACPI_TYPE_NS_NODE_MAX+1]);
+ACPI_GLOBAL (UINT16,                    AcpiGbl_ObjTypeCountMisc);
+ACPI_GLOBAL (UINT16,                    AcpiGbl_NodeTypeCountMisc);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_NumNodes);
+ACPI_GLOBAL (UINT32,                    AcpiGbl_NumObjects);
 
 #endif /* ACPI_DEBUGGER */
 
 
+/*****************************************************************************
+ *
+ * Application globals
+ *
+ ****************************************************************************/
+
+#ifdef ACPI_APPLICATION
+
+ACPI_INIT_GLOBAL (ACPI_FILE,            AcpiGbl_DebugFile, NULL);
+ACPI_INIT_GLOBAL (ACPI_FILE,            AcpiGbl_OutputFile, NULL);
+
+/* Print buffer */
+
+ACPI_GLOBAL (ACPI_SPINLOCK,             AcpiGbl_PrintLock);     /* For print buffer */
+ACPI_GLOBAL (char,                      AcpiGbl_PrintBuffer[1024]);
+
+#endif /* ACPI_APPLICATION */
+
+
 /*****************************************************************************
  *
  * Info/help support
  *
  ****************************************************************************/
 
-extern const AH_PREDEFINED_NAME     AslPredefinedInfo[];
+extern const AH_PREDEFINED_NAME         AslPredefinedInfo[];
+extern const AH_DEVICE_ID               AslDeviceIds[];
 
 
 #endif /* __ACGLOBAL_H__ */
diff --git a/sys/contrib/dev/acpica/include/achware.h b/sys/contrib/dev/acpica/include/achware.h
index 9577fd1685d3..1b1331879983 100644
--- a/sys/contrib/dev/acpica/include/achware.h
+++ b/sys/contrib/dev/acpica/include/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acinterp.h b/sys/contrib/dev/acpica/include/acinterp.h
index ebf4c9882e53..b77864034b72 100644
--- a/sys/contrib/dev/acpica/include/acinterp.h
+++ b/sys/contrib/dev/acpica/include/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,6 +89,10 @@ typedef const struct acpi_exdump_info
 #define ACPI_EXD_PACKAGE                11
 #define ACPI_EXD_FIELD                  12
 #define ACPI_EXD_REFERENCE              13
+#define ACPI_EXD_LIST                   14 /* Operand object list */
+#define ACPI_EXD_HDLR_LIST              15 /* Address Handler list */
+#define ACPI_EXD_RGN_LIST               16 /* Region list */
+#define ACPI_EXD_NODE                   17 /* Namespace Node */
 
 /* restore default alignment */
 
@@ -612,14 +616,6 @@ void
 AcpiExExitInterpreter (
     void);
 
-void
-AcpiExReacquireInterpreter (
-    void);
-
-void
-AcpiExRelinquishInterpreter (
-    void);
-
 BOOLEAN
 AcpiExTruncateFor32bitTable (
     ACPI_OPERAND_OBJECT     *ObjDesc);
diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h
index 5ee1430132c5..d911985ed160 100644
--- a/sys/contrib/dev/acpica/include/aclocal.h
+++ b/sys/contrib/dev/acpica/include/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -291,6 +291,7 @@ typedef struct acpi_create_field_info
     UINT32                          FieldBitPosition;
     UINT32                          FieldBitLength;
     UINT16                          ResourceLength;
+    UINT16                          PinNumberIndex;
     UINT8                           FieldFlags;
     UINT8                           Attribute;
     UINT8                           FieldType;
@@ -516,9 +517,9 @@ typedef struct acpi_gpe_register_info
 {
     ACPI_GENERIC_ADDRESS            StatusAddress;  /* Address of status reg */
     ACPI_GENERIC_ADDRESS            EnableAddress;  /* Address of enable reg */
+    UINT16                          BaseGpeNumber;  /* Base GPE number for this register */
     UINT8                           EnableForWake;  /* GPEs to keep enabled when sleeping */
     UINT8                           EnableForRun;   /* GPEs to keep enabled when running */
-    UINT8                           BaseGpeNumber;  /* Base GPE number for this register */
 
 } ACPI_GPE_REGISTER_INFO;
 
@@ -534,10 +535,11 @@ typedef struct acpi_gpe_block_info
     struct acpi_gpe_xrupt_info      *XruptBlock;    /* Backpointer to interrupt block */
     ACPI_GPE_REGISTER_INFO          *RegisterInfo;  /* One per GPE register pair */
     ACPI_GPE_EVENT_INFO             *EventInfo;     /* One for each GPE */
-    ACPI_GENERIC_ADDRESS            BlockAddress;   /* Base address of the block */
+    UINT64                          Address;        /* Base address of the block */
     UINT32                          RegisterCount;  /* Number of register pairs in block */
     UINT16                          GpeCount;       /* Number of individual GPEs in block */
-    UINT8                           BlockBaseNumber;/* Base GPE number for this block */
+    UINT16                          BlockBaseNumber;/* Base GPE number for this block */
+    UINT8                           SpaceId;
     BOOLEAN                         Initialized;    /* TRUE if this block is initialized */
 
 } ACPI_GPE_BLOCK_INFO;
@@ -877,11 +879,13 @@ typedef union acpi_parse_value
 #define ACPI_DASM_STRING                0x02        /* Buffer is a ASCII string */
 #define ACPI_DASM_UNICODE               0x03        /* Buffer is a Unicode string */
 #define ACPI_DASM_PLD_METHOD            0x04        /* Buffer is a _PLD method bit-packed buffer */
-#define ACPI_DASM_EISAID                0x05        /* Integer is an EISAID */
-#define ACPI_DASM_MATCHOP               0x06        /* Parent opcode is a Match() operator */
-#define ACPI_DASM_LNOT_PREFIX           0x07        /* Start of a LNotEqual (etc.) pair of opcodes */
-#define ACPI_DASM_LNOT_SUFFIX           0x08        /* End  of a LNotEqual (etc.) pair of opcodes */
-#define ACPI_DASM_IGNORE                0x09        /* Not used at this time */
+#define ACPI_DASM_UUID                  0x05        /* Buffer is a UUID/GUID */
+#define ACPI_DASM_EISAID                0x06        /* Integer is an EISAID */
+#define ACPI_DASM_MATCHOP               0x07        /* Parent opcode is a Match() operator */
+#define ACPI_DASM_LNOT_PREFIX           0x08        /* Start of a LNotEqual (etc.) pair of opcodes */
+#define ACPI_DASM_LNOT_SUFFIX           0x09        /* End  of a LNotEqual (etc.) pair of opcodes */
+#define ACPI_DASM_HID_STRING            0x0A        /* String is a _HID or _CID */
+#define ACPI_DASM_IGNORE                0x0B        /* Not used at this time */
 
 /*
  * Generic operation (for example:  If, While, Store)
@@ -1218,17 +1222,17 @@ typedef struct acpi_external_list
     struct acpi_external_list   *Next;
     UINT32                      Value;
     UINT16                      Length;
+    UINT16                      Flags;
     UINT8                       Type;
-    UINT8                       Flags;
-    BOOLEAN                     Resolved;
-    BOOLEAN                     Emitted;
 
 } ACPI_EXTERNAL_LIST;
 
 /* Values for Flags field above */
 
-#define ACPI_IPATH_ALLOCATED        0x01
-#define ACPI_FROM_REFERENCE_FILE    0x02
+#define ACPI_EXT_RESOLVED_REFERENCE         0x01    /* Object was resolved during cross ref */
+#define ACPI_EXT_ORIGIN_FROM_FILE           0x02    /* External came from a file */
+#define ACPI_EXT_INTERNAL_PATH_ALLOCATED    0x04    /* Deallocate internal path on completion */
+#define ACPI_EXT_EXTERNAL_EMITTED           0x08    /* External() statement has been emitted */
 
 
 typedef struct acpi_external_file
@@ -1259,7 +1263,7 @@ typedef struct acpi_db_method_info
     char                            *Name;
     UINT32                          Flags;
     UINT32                          NumLoops;
-    char                            Pathname[128];
+    char                            Pathname[ACPI_DB_LINE_BUFFER_SIZE];
     char                            **Args;
     ACPI_OBJECT_TYPE                *Types;
 
@@ -1286,6 +1290,7 @@ typedef struct acpi_integrity_info
 } ACPI_INTEGRITY_INFO;
 
 
+#define ACPI_DB_DISABLE_OUTPUT          0x00
 #define ACPI_DB_REDIRECTABLE_OUTPUT     0x01
 #define ACPI_DB_CONSOLE_OUTPUT          0x02
 #define ACPI_DB_DUPLICATE_OUTPUT        0x03
@@ -1348,4 +1353,18 @@ typedef struct ah_predefined_name
 
 } AH_PREDEFINED_NAME;
 
+typedef struct ah_device_id
+{
+    char            *Name;
+    char            *Description;
+
+} AH_DEVICE_ID;
+
+typedef struct ah_uuid
+{
+    char            *Description;
+    char            *String;
+
+} AH_UUID;
+
 #endif /* __ACLOCAL_H__ */
diff --git a/sys/contrib/dev/acpica/include/acmacros.h b/sys/contrib/dev/acpica/include/acmacros.h
index 28bd2afea2db..19a3e8e23542 100644
--- a/sys/contrib/dev/acpica/include/acmacros.h
+++ b/sys/contrib/dev/acpica/include/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64,17 +64,21 @@
 #define ACPI_SET64(ptr, val)            (*ACPI_CAST64 (ptr) = (UINT64) (val))
 
 /*
- * printf() format helpers
+ * printf() format helpers. These macros are workarounds for the difficulties
+ * with emitting 64-bit integers and 64-bit pointers with the same code
+ * for both 32-bit and 64-bit hosts.
  */
-
-/* Split 64-bit integer into two 32-bit values. Use with %8.8X%8.8X */
-
 #define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)
 
 #if ACPI_MACHINE_WIDTH == 64
 #define ACPI_FORMAT_NATIVE_UINT(i)      ACPI_FORMAT_UINT64(i)
+#define ACPI_FORMAT_TO_UINT(i)          ACPI_FORMAT_UINT64(i)
+#define ACPI_PRINTF_UINT                 "0x%8.8X%8.8X"
+
 #else
-#define ACPI_FORMAT_NATIVE_UINT(i)      0, (i)
+#define ACPI_FORMAT_NATIVE_UINT(i)      0, (UINT32) (i)
+#define ACPI_FORMAT_TO_UINT(i)          (UINT32) (i)
+#define ACPI_PRINTF_UINT                 "0x%8.8X"
 #endif
 
 
@@ -414,32 +418,6 @@
 #endif
 
 
-/*
- * Memory allocation tracking (DEBUG ONLY)
- */
-#define ACPI_MEM_PARAMETERS         _COMPONENT, _AcpiModuleName, __LINE__
-
-#ifndef ACPI_DBG_TRACK_ALLOCATIONS
-
-/* Memory allocation */
-
-#define ACPI_ALLOCATE(a)            AcpiUtAllocate((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_ALLOCATE_ZEROED(a)     AcpiUtAllocateZeroed((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_FREE(a)                AcpiOsFree(a)
-#define ACPI_MEM_TRACKING(a)
-
-#else
-
-/* Memory allocation */
-
-#define ACPI_ALLOCATE(a)            AcpiUtAllocateAndTrack((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_ALLOCATE_ZEROED(a)     AcpiUtAllocateZeroedAndTrack((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
-#define ACPI_FREE(a)                AcpiUtFreeAndTrack(a, ACPI_MEM_PARAMETERS)
-#define ACPI_MEM_TRACKING(a)        a
-
-#endif /* ACPI_DBG_TRACK_ALLOCATIONS */
-
-
 /*
  * Macros used for ACPICA utilities only
  */
diff --git a/sys/contrib/dev/acpica/include/acnames.h b/sys/contrib/dev/acpica/include/acnames.h
index d6fdaa6f5774..3297a732f200 100644
--- a/sys/contrib/dev/acpica/include/acnames.h
+++ b/sys/contrib/dev/acpica/include/acnames.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,24 +46,31 @@
 
 /* Method names - these methods can appear anywhere in the namespace */
 
-#define METHOD_NAME__SB_        "_SB_"
-#define METHOD_NAME__HID        "_HID"
-#define METHOD_NAME__CID        "_CID"
-#define METHOD_NAME__UID        "_UID"
-#define METHOD_NAME__SUB        "_SUB"
 #define METHOD_NAME__ADR        "_ADR"
-#define METHOD_NAME__INI        "_INI"
-#define METHOD_NAME__STA        "_STA"
-#define METHOD_NAME__REG        "_REG"
-#define METHOD_NAME__SEG        "_SEG"
-#define METHOD_NAME__BBN        "_BBN"
-#define METHOD_NAME__PRT        "_PRT"
-#define METHOD_NAME__CRS        "_CRS"
-#define METHOD_NAME__PRS        "_PRS"
 #define METHOD_NAME__AEI        "_AEI"
-#define METHOD_NAME__PRW        "_PRW"
-#define METHOD_NAME__SRS        "_SRS"
+#define METHOD_NAME__BBN        "_BBN"
+#define METHOD_NAME__CBA        "_CBA"
+#define METHOD_NAME__CID        "_CID"
+#define METHOD_NAME__CRS        "_CRS"
+#define METHOD_NAME__DDN        "_DDN"
+#define METHOD_NAME__HID        "_HID"
+#define METHOD_NAME__INI        "_INI"
 #define METHOD_NAME__PLD        "_PLD"
+#define METHOD_NAME__DSD        "_DSD"
+#define METHOD_NAME__PRS        "_PRS"
+#define METHOD_NAME__PRT        "_PRT"
+#define METHOD_NAME__PRW        "_PRW"
+#define METHOD_NAME__PS0        "_PS0"
+#define METHOD_NAME__PS1        "_PS1"
+#define METHOD_NAME__PS2        "_PS2"
+#define METHOD_NAME__PS3        "_PS3"
+#define METHOD_NAME__REG        "_REG"
+#define METHOD_NAME__SB_        "_SB_"
+#define METHOD_NAME__SEG        "_SEG"
+#define METHOD_NAME__SRS        "_SRS"
+#define METHOD_NAME__STA        "_STA"
+#define METHOD_NAME__SUB        "_SUB"
+#define METHOD_NAME__UID        "_UID"
 
 /* Method names - these methods must appear at the namespace root */
 
diff --git a/sys/contrib/dev/acpica/include/acnamesp.h b/sys/contrib/dev/acpica/include/acnamesp.h
index 2dba62907129..9fd3841c6c72 100644
--- a/sys/contrib/dev/acpica/include/acnamesp.h
+++ b/sys/contrib/dev/acpica/include/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acobject.h b/sys/contrib/dev/acpica/include/acobject.h
index e755daa61dc7..c08c8272b0b8 100644
--- a/sys/contrib/dev/acpica/include/acobject.h
+++ b/sys/contrib/dev/acpica/include/acobject.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -232,7 +232,8 @@ typedef struct acpi_object_method
 #define ACPI_METHOD_INTERNAL_ONLY       0x02    /* Method is implemented internally (_OSI) */
 #define ACPI_METHOD_SERIALIZED          0x04    /* Method is serialized */
 #define ACPI_METHOD_SERIALIZED_PENDING  0x08    /* Method is to be marked serialized */
-#define ACPI_METHOD_MODIFIED_NAMESPACE  0x10    /* Method modified the namespace */
+#define ACPI_METHOD_IGNORE_SYNC_LEVEL   0x10    /* Method was auto-serialized at table load time */
+#define ACPI_METHOD_MODIFIED_NAMESPACE  0x20    /* Method modified the namespace */
 
 
 /******************************************************************************
@@ -337,6 +338,7 @@ typedef struct acpi_object_region_field
     UINT16                          ResourceLength;
     union acpi_operand_object       *RegionObj;         /* Containing OpRegion object */
     UINT8                           *ResourceBuffer;    /* ResourceTemplate for serial regions/fields */
+    UINT16                          PinNumberIndex;     /* Index relative to previous Connection/Template */
 
 } ACPI_OBJECT_REGION_FIELD;
 
diff --git a/sys/contrib/dev/acpica/include/acopcode.h b/sys/contrib/dev/acpica/include/acopcode.h
index ba37842fa233..b968fc62a772 100644
--- a/sys/contrib/dev/acpica/include/acopcode.h
+++ b/sys/contrib/dev/acpica/include/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acoutput.h b/sys/contrib/dev/acpica/include/acoutput.h
index e7b1248b0142..8f054ae11929 100644
--- a/sys/contrib/dev/acpica/include/acoutput.h
+++ b/sys/contrib/dev/acpica/include/acoutput.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acparser.h b/sys/contrib/dev/acpica/include/acparser.h
index 7f236d8605f1..8d8adba1fcfd 100644
--- a/sys/contrib/dev/acpica/include/acparser.h
+++ b/sys/contrib/dev/acpica/include/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ACPARSER_H__
 #define __ACPARSER_H__
 
diff --git a/sys/contrib/dev/acpica/include/acpi.h b/sys/contrib/dev/acpica/include/acpi.h
index 5450ad40f386..aab3dd3f125b 100644
--- a/sys/contrib/dev/acpica/include/acpi.h
+++ b/sys/contrib/dev/acpica/include/acpi.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,5 +62,6 @@
 #include <contrib/dev/acpica/include/acrestyp.h>           /* Resource Descriptor structs */
 #include <contrib/dev/acpica/include/acpiosxf.h>           /* OSL interfaces (ACPICA-to-OS) */
 #include <contrib/dev/acpica/include/acpixf.h>             /* ACPI core subsystem external interfaces */
+#include <contrib/dev/acpica/include/platform/acenvex.h>   /* Extra environment-specific items */
 
 #endif /* __ACPI_H__ */
diff --git a/sys/contrib/dev/acpica/include/acpiosxf.h b/sys/contrib/dev/acpica/include/acpiosxf.h
index c948d3f367d6..1a1aa1b0076f 100644
--- a/sys/contrib/dev/acpica/include/acpiosxf.h
+++ b/sys/contrib/dev/acpica/include/acpiosxf.h
@@ -6,9 +6,8 @@
  *
  *****************************************************************************/
 
-
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,85 +84,111 @@ typedef struct acpi_signal_fatal_info
 /*
  * OSL Initialization and shutdown primitives
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsInitialize
 ACPI_STATUS
 AcpiOsInitialize (
     void);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsTerminate
 ACPI_STATUS
 AcpiOsTerminate (
     void);
+#endif
 
 
 /*
  * ACPI Table interfaces
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetRootPointer
 ACPI_PHYSICAL_ADDRESS
 AcpiOsGetRootPointer (
     void);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPredefinedOverride
 ACPI_STATUS
 AcpiOsPredefinedOverride (
     const ACPI_PREDEFINED_NAMES *InitVal,
     ACPI_STRING                 *NewVal);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsTableOverride
 ACPI_STATUS
 AcpiOsTableOverride (
     ACPI_TABLE_HEADER       *ExistingTable,
     ACPI_TABLE_HEADER       **NewTable);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPhysicalTableOverride
 ACPI_STATUS
 AcpiOsPhysicalTableOverride (
     ACPI_TABLE_HEADER       *ExistingTable,
     ACPI_PHYSICAL_ADDRESS   *NewAddress,
     UINT32                  *NewTableLength);
+#endif
 
 
 /*
  * Spinlock primitives
  */
-#ifndef AcpiOsCreateLock
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCreateLock
 ACPI_STATUS
 AcpiOsCreateLock (
     ACPI_SPINLOCK           *OutHandle);
 #endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsDeleteLock
 void
 AcpiOsDeleteLock (
     ACPI_SPINLOCK           Handle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsAcquireLock
 ACPI_CPU_FLAGS
 AcpiOsAcquireLock (
     ACPI_SPINLOCK           Handle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReleaseLock
 void
 AcpiOsReleaseLock (
     ACPI_SPINLOCK           Handle,
     ACPI_CPU_FLAGS          Flags);
+#endif
 
 
 /*
  * Semaphore primitives
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCreateSemaphore
 ACPI_STATUS
 AcpiOsCreateSemaphore (
     UINT32                  MaxUnits,
     UINT32                  InitialUnits,
     ACPI_SEMAPHORE          *OutHandle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsDeleteSemaphore
 ACPI_STATUS
 AcpiOsDeleteSemaphore (
     ACPI_SEMAPHORE          Handle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWaitSemaphore
 ACPI_STATUS
 AcpiOsWaitSemaphore (
     ACPI_SEMAPHORE          Handle,
     UINT32                  Units,
     UINT16                  Timeout);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsSignalSemaphore
 ACPI_STATUS
 AcpiOsSignalSemaphore (
     ACPI_SEMAPHORE          Handle,
     UINT32                  Units);
+#endif
 
 
 /*
@@ -172,151 +197,208 @@ AcpiOsSignalSemaphore (
  */
 #if (ACPI_MUTEX_TYPE != ACPI_BINARY_SEMAPHORE)
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCreateMutex
 ACPI_STATUS
 AcpiOsCreateMutex (
     ACPI_MUTEX              *OutHandle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsDeleteMutex
 void
 AcpiOsDeleteMutex (
     ACPI_MUTEX              Handle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsAcquireMutex
 ACPI_STATUS
 AcpiOsAcquireMutex (
     ACPI_MUTEX              Handle,
     UINT16                  Timeout);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReleaseMutex
 void
 AcpiOsReleaseMutex (
     ACPI_MUTEX              Handle);
 #endif
 
+#endif
+
 
 /*
  * Memory allocation and mapping
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsAllocate
 void *
 AcpiOsAllocate (
     ACPI_SIZE               Size);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsAllocateZeroed
+void *
+AcpiOsAllocateZeroed (
+    ACPI_SIZE               Size);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsFree
 void
 AcpiOsFree (
     void *                  Memory);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsMapMemory
 void *
 AcpiOsMapMemory (
     ACPI_PHYSICAL_ADDRESS   Where,
     ACPI_SIZE               Length);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsUnmapMemory
 void
 AcpiOsUnmapMemory (
     void                    *LogicalAddress,
     ACPI_SIZE               Size);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetPhysicalAddress
 ACPI_STATUS
 AcpiOsGetPhysicalAddress (
     void                    *LogicalAddress,
     ACPI_PHYSICAL_ADDRESS   *PhysicalAddress);
+#endif
 
 
 /*
  * Memory/Object Cache
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCreateCache
 ACPI_STATUS
 AcpiOsCreateCache (
     char                    *CacheName,
     UINT16                  ObjectSize,
     UINT16                  MaxDepth,
     ACPI_CACHE_T            **ReturnCache);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsDeleteCache
 ACPI_STATUS
 AcpiOsDeleteCache (
     ACPI_CACHE_T            *Cache);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPurgeCache
 ACPI_STATUS
 AcpiOsPurgeCache (
     ACPI_CACHE_T            *Cache);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsAcquireObject
 void *
 AcpiOsAcquireObject (
     ACPI_CACHE_T            *Cache);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReleaseObject
 ACPI_STATUS
 AcpiOsReleaseObject (
     ACPI_CACHE_T            *Cache,
     void                    *Object);
+#endif
 
 
 /*
  * Interrupt handlers
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsInstallInterruptHandler
 ACPI_STATUS
 AcpiOsInstallInterruptHandler (
     UINT32                  InterruptNumber,
     ACPI_OSD_HANDLER        ServiceRoutine,
     void                    *Context);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsRemoveInterruptHandler
 ACPI_STATUS
 AcpiOsRemoveInterruptHandler (
     UINT32                  InterruptNumber,
     ACPI_OSD_HANDLER        ServiceRoutine);
+#endif
 
 
 /*
  * Threads and Scheduling
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetThreadId
 ACPI_THREAD_ID
 AcpiOsGetThreadId (
     void);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsExecute
 ACPI_STATUS
 AcpiOsExecute (
     ACPI_EXECUTE_TYPE       Type,
     ACPI_OSD_EXEC_CALLBACK  Function,
     void                    *Context);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWaitEventsComplete
 void
 AcpiOsWaitEventsComplete (
     void);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsSleep
 void
 AcpiOsSleep (
     UINT64                  Milliseconds);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsStall
 void
 AcpiOsStall (
     UINT32                  Microseconds);
+#endif
 
 
 /*
  * Platform and hardware-independent I/O interfaces
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReadPort
 ACPI_STATUS
 AcpiOsReadPort (
     ACPI_IO_ADDRESS         Address,
     UINT32                  *Value,
     UINT32                  Width);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWritePort
 ACPI_STATUS
 AcpiOsWritePort (
     ACPI_IO_ADDRESS         Address,
     UINT32                  Value,
     UINT32                  Width);
+#endif
 
 
 /*
  * Platform and hardware-independent physical memory interfaces
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReadMemory
 ACPI_STATUS
 AcpiOsReadMemory (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT64                  *Value,
     UINT32                  Width);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWriteMemory
 ACPI_STATUS
 AcpiOsWriteMemory (
     ACPI_PHYSICAL_ADDRESS   Address,
     UINT64                  Value,
     UINT32                  Width);
+#endif
 
 
 /*
@@ -324,103 +406,131 @@ AcpiOsWriteMemory (
  * Note: Can't use "Register" as a parameter, changed to "Reg" --
  * certain compilers complain.
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReadPciConfiguration
 ACPI_STATUS
 AcpiOsReadPciConfiguration (
     ACPI_PCI_ID             *PciId,
     UINT32                  Reg,
     UINT64                  *Value,
     UINT32                  Width);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWritePciConfiguration
 ACPI_STATUS
 AcpiOsWritePciConfiguration (
     ACPI_PCI_ID             *PciId,
     UINT32                  Reg,
     UINT64                  Value,
     UINT32                  Width);
+#endif
 
 
 /*
  * Miscellaneous
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReadable
 BOOLEAN
 AcpiOsReadable (
     void                    *Pointer,
     ACPI_SIZE               Length);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWritable
 BOOLEAN
 AcpiOsWritable (
     void                    *Pointer,
     ACPI_SIZE               Length);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetTimer
 UINT64
 AcpiOsGetTimer (
     void);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsSignal
 ACPI_STATUS
 AcpiOsSignal (
     UINT32                  Function,
     void                    *Info);
+#endif
 
 
 /*
  * Debug print routines
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPrintf
 void ACPI_INTERNAL_VAR_XFACE
 AcpiOsPrintf (
     const char              *Format,
     ...);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsVprintf
 void
 AcpiOsVprintf (
     const char              *Format,
     va_list                 Args);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsRedirectOutput
 void
 AcpiOsRedirectOutput (
     void                    *Destination);
+#endif
 
 
 /*
  * Debug input
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetLine
 ACPI_STATUS
 AcpiOsGetLine (
     char                    *Buffer,
     UINT32                  BufferLength,
     UINT32                  *BytesRead);
+#endif
 
 
 /*
  * Obtain ACPI table(s)
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetTableByName
 ACPI_STATUS
 AcpiOsGetTableByName (
     char                    *Signature,
     UINT32                  Instance,
     ACPI_TABLE_HEADER       **Table,
     ACPI_PHYSICAL_ADDRESS   *Address);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetTableByIndex
 ACPI_STATUS
 AcpiOsGetTableByIndex (
     UINT32                  Index,
     ACPI_TABLE_HEADER       **Table,
     UINT32                  *Instance,
     ACPI_PHYSICAL_ADDRESS   *Address);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetTableByAddress
 ACPI_STATUS
 AcpiOsGetTableByAddress (
     ACPI_PHYSICAL_ADDRESS   Address,
     ACPI_TABLE_HEADER       **Table);
+#endif
 
 
 /*
  * Directory manipulation
  */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsOpenDirectory
 void *
 AcpiOsOpenDirectory (
     char                    *Pathname,
     char                    *WildcardSpec,
     char                    RequestedFileType);
+#endif
 
 /* RequesteFileType values */
 
@@ -428,13 +538,66 @@ AcpiOsOpenDirectory (
 #define REQUEST_DIR_ONLY                    1
 
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetNextFilename
 char *
 AcpiOsGetNextFilename (
     void                    *DirHandle);
+#endif
 
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCloseDirectory
 void
 AcpiOsCloseDirectory (
     void                    *DirHandle);
+#endif
+
+
+/*
+ * File I/O and related support
+ */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsOpenFile
+ACPI_FILE
+AcpiOsOpenFile (
+    const char              *Path,
+    UINT8                   Modes);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCloseFile
+void
+AcpiOsCloseFile (
+    ACPI_FILE               File);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReadFile
+int
+AcpiOsReadFile (
+    ACPI_FILE               File,
+    void                    *Buffer,
+    ACPI_SIZE               Size,
+    ACPI_SIZE               Count);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsWriteFile
+int
+AcpiOsWriteFile (
+    ACPI_FILE               File,
+    void                    *Buffer,
+    ACPI_SIZE               Size,
+    ACPI_SIZE               Count);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetFileOffset
+long
+AcpiOsGetFileOffset (
+    ACPI_FILE               File);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsSetFileOffset
+ACPI_STATUS
+AcpiOsSetFileOffset (
+    ACPI_FILE               File,
+    long                    Offset,
+    UINT8                   From);
+#endif
 
 
 #endif /* __ACPIOSXF_H__ */
diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h
index 80f724a6f97f..93e9c1454174 100644
--- a/sys/contrib/dev/acpica/include/acpixf.h
+++ b/sys/contrib/dev/acpica/include/acpixf.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,62 +41,258 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #ifndef __ACXFACE_H__
 #define __ACXFACE_H__
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20130823
+#define ACPI_CA_VERSION                 0x20140926
 
 #include <contrib/dev/acpica/include/acconfig.h>
 #include <contrib/dev/acpica/include/actypes.h>
 #include <contrib/dev/acpica/include/actbl.h>
 #include <contrib/dev/acpica/include/acbuffer.h>
 
+
+/*****************************************************************************
+ *
+ * Macros used for ACPICA globals and configuration
+ *
+ ****************************************************************************/
+
 /*
- * Globals that are publically available
+ * Ensure that global variables are defined and initialized only once.
+ *
+ * The use of these macros allows for a single list of globals (here)
+ * in order to simplify maintenance of the code.
  */
-extern UINT32               AcpiCurrentGpeCount;
-extern ACPI_TABLE_FADT      AcpiGbl_FADT;
-extern BOOLEAN              AcpiGbl_SystemAwakeAndRunning;
-extern BOOLEAN              AcpiGbl_ReducedHardware;        /* ACPI 5.0 */
-extern UINT8                AcpiGbl_OsiData;
+#ifdef DEFINE_ACPI_GLOBALS
+#define ACPI_GLOBAL(type,name) \
+    extern type name; \
+    type name
 
-/* Runtime configuration of debug print levels */
+#define ACPI_INIT_GLOBAL(type,name,value) \
+    type name=value
 
-extern UINT32               AcpiDbgLevel;
-extern UINT32               AcpiDbgLayer;
-
-/* ACPICA runtime options */
-
-extern UINT8                AcpiGbl_EnableInterpreterSlack;
-extern UINT8                AcpiGbl_AllMethodsSerialized;
-extern UINT8                AcpiGbl_CreateOsiMethod;
-extern UINT8                AcpiGbl_UseDefaultRegisterWidths;
-extern ACPI_NAME            AcpiGbl_TraceMethodName;
-extern UINT32               AcpiGbl_TraceFlags;
-extern UINT8                AcpiGbl_EnableAmlDebugObject;
-extern UINT8                AcpiGbl_CopyDsdtLocally;
-extern UINT8                AcpiGbl_TruncateIoAddresses;
-extern UINT8                AcpiGbl_DisableAutoRepair;
-extern UINT8                AcpiGbl_DisableSsdtTableLoad;
+#else
+#ifndef ACPI_GLOBAL
+#define ACPI_GLOBAL(type,name) \
+    extern type name
+#endif
 
+#ifndef ACPI_INIT_GLOBAL
+#define ACPI_INIT_GLOBAL(type,name,value) \
+    extern type name
+#endif
+#endif
 
 /*
- * Hardware-reduced prototypes. All interfaces that use these macros will
- * be configured out of the ACPICA build if the ACPI_REDUCED_HARDWARE flag
+ * These macros configure the various ACPICA interfaces. They are
+ * useful for generating stub inline functions for features that are
+ * configured out of the current kernel or ACPICA application.
+ */
+#ifndef ACPI_EXTERNAL_RETURN_STATUS
+#define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \
+    Prototype;
+#endif
+
+#ifndef ACPI_EXTERNAL_RETURN_OK
+#define ACPI_EXTERNAL_RETURN_OK(Prototype) \
+    Prototype;
+#endif
+
+#ifndef ACPI_EXTERNAL_RETURN_VOID
+#define ACPI_EXTERNAL_RETURN_VOID(Prototype) \
+    Prototype;
+#endif
+
+#ifndef ACPI_EXTERNAL_RETURN_UINT32
+#define ACPI_EXTERNAL_RETURN_UINT32(Prototype) \
+    Prototype;
+#endif
+
+#ifndef ACPI_EXTERNAL_RETURN_PTR
+#define ACPI_EXTERNAL_RETURN_PTR(Prototype) \
+    Prototype;
+#endif
+
+
+/*****************************************************************************
+ *
+ * Public globals and runtime configuration options
+ *
+ ****************************************************************************/
+
+/*
+ * Enable "slack mode" of the AML interpreter?  Default is FALSE, and the
+ * interpreter strictly follows the ACPI specification. Setting to TRUE
+ * allows the interpreter to ignore certain errors and/or bad AML constructs.
+ *
+ * Currently, these features are enabled by this flag:
+ *
+ * 1) Allow "implicit return" of last value in a control method
+ * 2) Allow access beyond the end of an operation region
+ * 3) Allow access to uninitialized locals/args (auto-init to integer 0)
+ * 4) Allow ANY object type to be a source operand for the Store() operator
+ * 5) Allow unresolved references (invalid target name) in package objects
+ * 6) Enable warning messages for behavior that is not ACPI spec compliant
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_EnableInterpreterSlack, FALSE);
+
+/*
+ * Automatically serialize all methods that create named objects? Default
+ * is TRUE, meaning that all NonSerialized methods are scanned once at
+ * table load time to determine those that create named objects. Methods
+ * that create named objects are marked Serialized in order to prevent
+ * possible run-time problems if they are entered by more than one thread.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_AutoSerializeMethods, TRUE);
+
+/*
+ * Create the predefined _OSI method in the namespace? Default is TRUE
+ * because ACPICA is fully compatible with other ACPI implementations.
+ * Changing this will revert ACPICA (and machine ASL) to pre-OSI behavior.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_CreateOsiMethod, TRUE);
+
+/*
+ * Optionally use default values for the ACPI register widths. Set this to
+ * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_UseDefaultRegisterWidths, TRUE);
+
+/*
+ * Whether or not to verify the table checksum before installation. Set
+ * this to TRUE to verify the table checksum before install it to the table
+ * manager. Note that enabling this option causes errors to happen in some
+ * OSPMs during early initialization stages. Default behavior is to do such
+ * verification.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_VerifyTableChecksum, TRUE);
+
+/*
+ * Optionally enable output from the AML Debug Object.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_EnableAmlDebugObject, FALSE);
+
+/*
+ * Optionally copy the entire DSDT to local memory (instead of simply
+ * mapping it.) There are some BIOSs that corrupt or replace the original
+ * DSDT, creating the need for this option. Default is FALSE, do not copy
+ * the DSDT.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_CopyDsdtLocally, FALSE);
+
+/*
+ * Optionally ignore an XSDT if present and use the RSDT instead.
+ * Although the ACPI specification requires that an XSDT be used instead
+ * of the RSDT, the XSDT has been found to be corrupt or ill-formed on
+ * some machines. Default behavior is to use the XSDT if present.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_DoNotUseXsdt, FALSE);
+
+/*
+ * Optionally use 32-bit FADT addresses if and when there is a conflict
+ * (address mismatch) between the 32-bit and 64-bit versions of the
+ * address. Although ACPICA adheres to the ACPI specification which
+ * requires the use of the corresponding 64-bit address if it is non-zero,
+ * some machines have been found to have a corrupted non-zero 64-bit
+ * address. Default is FALSE, do not favor the 32-bit addresses.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_Use32BitFadtAddresses, FALSE);
+
+/*
+ * Optionally truncate I/O addresses to 16 bits. Provides compatibility
+ * with other ACPI implementations. NOTE: During ACPICA initialization,
+ * this value is set to TRUE if any Windows OSI strings have been
+ * requested by the BIOS.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_TruncateIoAddresses, FALSE);
+
+/*
+ * Disable runtime checking and repair of values returned by control methods.
+ * Use only if the repair is causing a problem on a particular machine.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_DisableAutoRepair, FALSE);
+
+/*
+ * Optionally do not install any SSDTs from the RSDT/XSDT during initialization.
+ * This can be useful for debugging ACPI problems on some machines.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_DisableSsdtTableInstall, FALSE);
+
+/*
+ * We keep track of the latest version of Windows that has been requested by
+ * the BIOS. ACPI 5.0.
+ */
+ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_OsiData, 0);
+
+/*
+ * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
+ * that the ACPI hardware is no longer required. A flag in the FADT indicates
+ * a reduced HW machine, and that flag is duplicated here for convenience.
+ */
+ACPI_INIT_GLOBAL (BOOLEAN,          AcpiGbl_ReducedHardware, FALSE);
+
+/*
+ * This mechanism is used to trace a specified AML method. The method is
+ * traced each time it is executed.
+ */
+ACPI_INIT_GLOBAL (UINT32,           AcpiGbl_TraceFlags, 0);
+ACPI_INIT_GLOBAL (ACPI_NAME,        AcpiGbl_TraceMethodName, 0);
+
+/*
+ * Runtime configuration of debug output control masks. We want the debug
+ * switches statically initialized so they are already set when the debugger
+ * is entered.
+ */
+#ifdef ACPI_DEBUG_OUTPUT
+ACPI_INIT_GLOBAL (UINT32,           AcpiDbgLevel, ACPI_DEBUG_DEFAULT);
+#else
+ACPI_INIT_GLOBAL (UINT32,           AcpiDbgLevel, ACPI_NORMAL_DEFAULT);
+#endif
+ACPI_INIT_GLOBAL (UINT32,           AcpiDbgLayer, ACPI_COMPONENT_DEFAULT);
+
+/*
+ * Other miscellaneous globals
+ */
+ACPI_GLOBAL (ACPI_TABLE_FADT,       AcpiGbl_FADT);
+ACPI_GLOBAL (UINT32,                AcpiCurrentGpeCount);
+ACPI_GLOBAL (BOOLEAN,               AcpiGbl_SystemAwakeAndRunning);
+
+
+/*****************************************************************************
+ *
+ * ACPICA public interface configuration.
+ *
+ * Interfaces that are configured out of the ACPICA build are replaced
+ * by inlined stubs by default.
+ *
+ ****************************************************************************/
+
+/*
+ * Hardware-reduced prototypes (default: Not hardware reduced).
+ *
+ * All ACPICA hardware-related interfaces that use these macros will be
+ * configured out of the ACPICA build if the ACPI_REDUCED_HARDWARE flag
  * is set to TRUE.
+ *
+ * Note: This static build option for reduced hardware is intended to
+ * reduce ACPICA code size if desired or necessary. However, even if this
+ * option is not specified, the runtime behavior of ACPICA is dependent
+ * on the actual FADT reduced hardware flag (HW_REDUCED_ACPI). If set,
+ * the flag will enable similar behavior -- ACPICA will not attempt
+ * to access any ACPI-relate hardware (SCI, GPEs, Fixed Events, etc.)
  */
 #if (!ACPI_REDUCED_HARDWARE)
 #define ACPI_HW_DEPENDENT_RETURN_STATUS(Prototype) \
-    Prototype;
+    ACPI_EXTERNAL_RETURN_STATUS(Prototype)
 
 #define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \
-    Prototype;
+    ACPI_EXTERNAL_RETURN_OK(Prototype)
 
 #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \
-    Prototype;
+    ACPI_EXTERNAL_RETURN_VOID(Prototype)
 
 #else
 #define ACPI_HW_DEPENDENT_RETURN_STATUS(Prototype) \
@@ -106,35 +302,100 @@ extern UINT8                AcpiGbl_DisableSsdtTableLoad;
     static ACPI_INLINE Prototype {return(AE_OK);}
 
 #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \
-    static ACPI_INLINE Prototype {}
+    static ACPI_INLINE Prototype {return;}
 
 #endif /* !ACPI_REDUCED_HARDWARE */
 
 
+/*
+ * Error message prototypes (default: error messages enabled).
+ *
+ * All interfaces related to error and warning messages
+ * will be configured out of the ACPICA build if the
+ * ACPI_NO_ERROR_MESSAGE flag is defined.
+ */
+#ifndef ACPI_NO_ERROR_MESSAGES
+#define ACPI_MSG_DEPENDENT_RETURN_VOID(Prototype) \
+    Prototype;
+
+#else
+#define ACPI_MSG_DEPENDENT_RETURN_VOID(Prototype) \
+    static ACPI_INLINE Prototype {return;}
+
+#endif /* ACPI_NO_ERROR_MESSAGES */
+
+
+/*
+ * Debugging output prototypes (default: no debug output).
+ *
+ * All interfaces related to debug output messages
+ * will be configured out of the ACPICA build unless the
+ * ACPI_DEBUG_OUTPUT flag is defined.
+ */
+#ifdef ACPI_DEBUG_OUTPUT
+#define ACPI_DBG_DEPENDENT_RETURN_VOID(Prototype) \
+    Prototype;
+
+#else
+#define ACPI_DBG_DEPENDENT_RETURN_VOID(Prototype) \
+    static ACPI_INLINE Prototype {return;}
+
+#endif /* ACPI_DEBUG_OUTPUT */
+
+
+/*
+ * Application prototypes
+ *
+ * All interfaces used by application will be configured
+ * out of the ACPICA build unless the ACPI_APPLICATION
+ * flag is defined.
+ */
+#ifdef ACPI_APPLICATION
+#define ACPI_APP_DEPENDENT_RETURN_VOID(Prototype) \
+    Prototype;
+
+#else
+#define ACPI_APP_DEPENDENT_RETURN_VOID(Prototype) \
+    static ACPI_INLINE Prototype {return;}
+
+#endif /* ACPI_APPLICATION */
+
+
+/*****************************************************************************
+ *
+ * ACPICA public interface prototypes
+ *
+ ****************************************************************************/
+
 /*
  * Initialization
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInitializeTables (
     ACPI_TABLE_DESC         *InitialStorage,
     UINT32                  InitialTableCount,
-    BOOLEAN                 AllowResize);
+    BOOLEAN                 AllowResize))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInitializeSubsystem (
-    void);
+    void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiEnableSubsystem (
-    UINT32                  Flags);
+    UINT32                  Flags))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInitializeObjects (
-    UINT32                  Flags);
+    UINT32                  Flags))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiTerminate (
-    void);
+    void))
 
 
 /*
@@ -150,124 +411,136 @@ ACPI_STATUS
 AcpiDisable (
     void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiSubsystemStatus (
-    void);
+    void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetSystemInfo (
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetStatistics (
-    ACPI_STATISTICS         *Stats);
+    ACPI_STATISTICS         *Stats))
 
+ACPI_EXTERNAL_RETURN_PTR (
 const char *
 AcpiFormatException (
-    ACPI_STATUS             Exception);
+    ACPI_STATUS             Exception))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiPurgeCachedObjects (
-    void);
+    void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallInterface (
-    ACPI_STRING             InterfaceName);
+    ACPI_STRING             InterfaceName))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiRemoveInterface (
-    ACPI_STRING             InterfaceName);
+    ACPI_STRING             InterfaceName))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiUpdateInterfaces (
-    UINT8                   Action);
+    UINT8                   Action))
 
+ACPI_EXTERNAL_RETURN_UINT32 (
 UINT32
 AcpiCheckAddressRange (
     ACPI_ADR_SPACE_TYPE     SpaceId,
     ACPI_PHYSICAL_ADDRESS   Address,
     ACPI_SIZE               Length,
-    BOOLEAN                 Warn);
+    BOOLEAN                 Warn))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiDecodePldBuffer (
     UINT8                   *InBuffer,
     ACPI_SIZE               Length,
-    ACPI_PLD_INFO           **ReturnBuffer);
-
-/*
- * ACPI Memory management
- */
-void *
-AcpiAllocate (
-    UINT32                  Size);
-
-void *
-AcpiCallocate (
-    UINT32                  Size);
-
-void
-AcpiFree (
-    void                    *Address);
+    ACPI_PLD_INFO           **ReturnBuffer))
 
 
 /*
  * ACPI table load/unload interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
+ACPI_STATUS
+AcpiInstallTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    BOOLEAN                 Physical))
+
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiLoadTable (
-    ACPI_TABLE_HEADER       *Table);
+    ACPI_TABLE_HEADER       *Table))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiUnloadParentTable (
-    ACPI_HANDLE             Object);
+    ACPI_HANDLE             Object))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiLoadTables (
-    void);
+    void))
 
 
 /*
  * ACPI table manipulation interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiReallocateRootTable (
-    void);
+    void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiFindRootPointer (
-    ACPI_SIZE               *RsdpAddress);
+    ACPI_SIZE               *RsdpAddress))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetTableHeader (
     ACPI_STRING             Signature,
     UINT32                  Instance,
-    ACPI_TABLE_HEADER       *OutTableHeader);
+    ACPI_TABLE_HEADER       *OutTableHeader))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetTable (
     ACPI_STRING             Signature,
     UINT32                  Instance,
-    ACPI_TABLE_HEADER       **OutTable);
+    ACPI_TABLE_HEADER       **OutTable))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetTableByIndex (
     UINT32                  TableIndex,
-    ACPI_TABLE_HEADER       **OutTable);
+    ACPI_TABLE_HEADER       **OutTable))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallTableHandler (
     ACPI_TABLE_HANDLER      Handler,
-    void                    *Context);
+    void                    *Context))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiRemoveTableHandler (
-    ACPI_TABLE_HANDLER      Handler);
+    ACPI_TABLE_HANDLER      Handler))
 
 
 /*
  * Namespace and name interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiWalkNamespace (
     ACPI_OBJECT_TYPE        Type,
@@ -276,104 +549,119 @@ AcpiWalkNamespace (
     ACPI_WALK_CALLBACK      DescendingCallback,
     ACPI_WALK_CALLBACK      AscendingCallback,
     void                    *Context,
-    void                    **ReturnValue);
+    void                    **ReturnValue))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetDevices (
     char                    *HID,
     ACPI_WALK_CALLBACK      UserFunction,
     void                    *Context,
-    void                    **ReturnValue);
+    void                    **ReturnValue))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetName (
     ACPI_HANDLE             Object,
     UINT32                  NameType,
-    ACPI_BUFFER             *RetPathPtr);
+    ACPI_BUFFER             *RetPathPtr))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetHandle (
     ACPI_HANDLE             Parent,
     ACPI_STRING             Pathname,
-    ACPI_HANDLE             *RetHandle);
+    ACPI_HANDLE             *RetHandle))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiAttachData (
     ACPI_HANDLE             Object,
     ACPI_OBJECT_HANDLER     Handler,
-    void                    *Data);
+    void                    *Data))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiDetachData (
     ACPI_HANDLE             Object,
-    ACPI_OBJECT_HANDLER     Handler);
+    ACPI_OBJECT_HANDLER     Handler))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetData (
     ACPI_HANDLE             Object,
     ACPI_OBJECT_HANDLER     Handler,
-    void                    **Data);
+    void                    **Data))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiDebugTrace (
     char                    *Name,
     UINT32                  DebugLevel,
     UINT32                  DebugLayer,
-    UINT32                  Flags);
+    UINT32                  Flags))
 
 
 /*
  * Object manipulation and enumeration
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiEvaluateObject (
     ACPI_HANDLE             Object,
     ACPI_STRING             Pathname,
     ACPI_OBJECT_LIST        *ParameterObjects,
-    ACPI_BUFFER             *ReturnObjectBuffer);
+    ACPI_BUFFER             *ReturnObjectBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiEvaluateObjectTyped (
     ACPI_HANDLE             Object,
     ACPI_STRING             Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer,
-    ACPI_OBJECT_TYPE        ReturnType);
+    ACPI_OBJECT_TYPE        ReturnType))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetObjectInfo (
     ACPI_HANDLE             Object,
-    ACPI_DEVICE_INFO        **ReturnBuffer);
+    ACPI_DEVICE_INFO        **ReturnBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallMethod (
-    UINT8                   *Buffer);
+    UINT8                   *Buffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetNextObject (
     ACPI_OBJECT_TYPE        Type,
     ACPI_HANDLE             Parent,
     ACPI_HANDLE             Child,
-    ACPI_HANDLE             *OutHandle);
+    ACPI_HANDLE             *OutHandle))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetType (
     ACPI_HANDLE             Object,
-    ACPI_OBJECT_TYPE        *OutType);
+    ACPI_OBJECT_TYPE        *OutType))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetParent (
     ACPI_HANDLE             Object,
-    ACPI_HANDLE             *OutHandle);
+    ACPI_HANDLE             *OutHandle))
 
 
 /*
  * Handler interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallInitializationHandler (
     ACPI_INIT_HANDLER       Handler,
-    UINT32                  Function);
+    UINT32                  Function))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS (
 ACPI_STATUS
@@ -421,40 +709,46 @@ AcpiRemoveGpeHandler (
     UINT32                  GpeNumber,
     ACPI_GPE_HANDLER        Address))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallNotifyHandler (
     ACPI_HANDLE             Device,
     UINT32                  HandlerType,
     ACPI_NOTIFY_HANDLER     Handler,
-    void                    *Context);
+    void                    *Context))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiRemoveNotifyHandler (
     ACPI_HANDLE             Device,
     UINT32                  HandlerType,
-    ACPI_NOTIFY_HANDLER     Handler);
+    ACPI_NOTIFY_HANDLER     Handler))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallAddressSpaceHandler (
     ACPI_HANDLE             Device,
     ACPI_ADR_SPACE_TYPE     SpaceId,
     ACPI_ADR_SPACE_HANDLER  Handler,
     ACPI_ADR_SPACE_SETUP    Setup,
-    void                    *Context);
+    void                    *Context))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiRemoveAddressSpaceHandler (
     ACPI_HANDLE             Device,
     ACPI_ADR_SPACE_TYPE     SpaceId,
-    ACPI_ADR_SPACE_HANDLER  Handler);
+    ACPI_ADR_SPACE_HANDLER  Handler))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallExceptionHandler (
-    ACPI_EXCEPTION_HANDLER  Handler);
+    ACPI_EXCEPTION_HANDLER  Handler))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiInstallInterfaceHandler (
-    ACPI_INTERFACE_HANDLER  Handler);
+    ACPI_INTERFACE_HANDLER  Handler))
 
 
 /*
@@ -475,16 +769,18 @@ AcpiReleaseGlobalLock (
 /*
  * Interfaces to AML mutex objects
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiAcquireMutex (
     ACPI_HANDLE             Handle,
     ACPI_STRING             Pathname,
-    UINT16                  Timeout);
+    UINT16                  Timeout))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiReleaseMutex (
     ACPI_HANDLE             Handle,
-    ACPI_STRING             Pathname);
+    ACPI_STRING             Pathname))
 
 
 /*
@@ -553,6 +849,12 @@ AcpiFinishGpe (
     ACPI_HANDLE             GpeDevice,
     UINT32                  GpeNumber))
 
+ACPI_HW_DEPENDENT_RETURN_STATUS (
+ACPI_STATUS
+AcpiMarkGpeForWake (
+    ACPI_HANDLE             GpeDevice,
+    UINT32                  GpeNumber))
+
 ACPI_HW_DEPENDENT_RETURN_STATUS (
 ACPI_STATUS
 AcpiSetupGpeForWake (
@@ -612,79 +914,92 @@ ACPI_STATUS (*ACPI_WALK_RESOURCE_CALLBACK) (
     ACPI_RESOURCE           *Resource,
     void                    *Context);
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetVendorResource (
     ACPI_HANDLE             Device,
     char                    *Name,
     ACPI_VENDOR_UUID        *Uuid,
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetCurrentResources (
     ACPI_HANDLE             Device,
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetPossibleResources (
     ACPI_HANDLE             Device,
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetEventResources (
     ACPI_HANDLE             DeviceHandle,
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiWalkResourceBuffer (
     ACPI_BUFFER                 *Buffer,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
-    void                        *Context);
+    void                        *Context))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiWalkResources (
     ACPI_HANDLE                 Device,
     char                        *Name,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
-    void                        *Context);
+    void                        *Context))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiSetCurrentResources (
     ACPI_HANDLE             Device,
-    ACPI_BUFFER             *InBuffer);
+    ACPI_BUFFER             *InBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetIrqRoutingTable (
     ACPI_HANDLE             Device,
-    ACPI_BUFFER             *RetBuffer);
+    ACPI_BUFFER             *RetBuffer))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiResourceToAddress64 (
     ACPI_RESOURCE           *Resource,
-    ACPI_RESOURCE_ADDRESS64 *Out);
+    ACPI_RESOURCE_ADDRESS64 *Out))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiBufferToResource (
     UINT8                   *AmlBuffer,
     UINT16                  AmlBufferLength,
-    ACPI_RESOURCE           **ResourcePtr);
+    ACPI_RESOURCE           **ResourcePtr))
 
 
 /*
  * Hardware (ACPI device) interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiReset (
-    void);
+    void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiRead (
     UINT64                  *Value,
-    ACPI_GENERIC_ADDRESS    *Reg);
+    ACPI_GENERIC_ADDRESS    *Reg))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiWrite (
     UINT64                  Value,
-    ACPI_GENERIC_ADDRESS    *Reg);
+    ACPI_GENERIC_ADDRESS    *Reg))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS (
 ACPI_STATUS
@@ -702,32 +1017,37 @@ AcpiWriteBitRegister (
 /*
  * Sleep/Wake interfaces
  */
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiGetSleepTypeData (
     UINT8                   SleepState,
     UINT8                   *Slp_TypA,
-    UINT8                   *Slp_TypB);
+    UINT8                   *Slp_TypB))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiEnterSleepStatePrep (
-    UINT8                   SleepState);
+    UINT8                   SleepState))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiEnterSleepState (
-    UINT8                   SleepState);
+    UINT8                   SleepState))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS (
 ACPI_STATUS
 AcpiEnterSleepStateS4bios (
     void))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiLeaveSleepStatePrep (
-    UINT8                   SleepState);
+    UINT8                   SleepState))
 
+ACPI_EXTERNAL_RETURN_STATUS (
 ACPI_STATUS
 AcpiLeaveSleepState (
-    UINT8                   SleepState);
+    UINT8                   SleepState))
 
 ACPI_HW_DEPENDENT_RETURN_STATUS (
 ACPI_STATUS
@@ -766,55 +1086,67 @@ AcpiGetTimerDuration (
 /*
  * Error/Warning output
  */
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(3)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiError (
     const char              *ModuleName,
     UINT32                  LineNumber,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(3);
+    ...))
 
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(4)
 void  ACPI_INTERNAL_VAR_XFACE
 AcpiException (
     const char              *ModuleName,
     UINT32                  LineNumber,
     ACPI_STATUS             Status,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(4);
+    ...))
 
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(3)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiWarning (
     const char              *ModuleName,
     UINT32                  LineNumber,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(3);
+    ...))
 
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(3)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiInfo (
     const char              *ModuleName,
     UINT32                  LineNumber,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(3);
+    ...))
 
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(3)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiBiosError (
     const char              *ModuleName,
     UINT32                  LineNumber,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(3);
+    ...))
 
+ACPI_MSG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(3)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiBiosWarning (
     const char              *ModuleName,
     UINT32                  LineNumber,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(3);
+    ...))
 
 
 /*
  * Debug output
  */
-#ifdef ACPI_DEBUG_OUTPUT
-
+ACPI_DBG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(6)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiDebugPrint (
     UINT32                  RequestedDebugLevel,
@@ -823,8 +1155,10 @@ AcpiDebugPrint (
     const char              *ModuleName,
     UINT32                  ComponentId,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(6);
+    ...))
 
+ACPI_DBG_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(6)
 void ACPI_INTERNAL_VAR_XFACE
 AcpiDebugPrintRaw (
     UINT32                  RequestedDebugLevel,
@@ -833,7 +1167,13 @@ AcpiDebugPrintRaw (
     const char              *ModuleName,
     UINT32                  ComponentId,
     const char              *Format,
-    ...) ACPI_PRINTF_LIKE(6);
-#endif
+    ...))
+
+ACPI_APP_DEPENDENT_RETURN_VOID (
+ACPI_PRINTF_LIKE(1)
+void ACPI_INTERNAL_VAR_XFACE
+AcpiLogError (
+    const char              *Format,
+    ...))
 
 #endif /* __ACXFACE_H__ */
diff --git a/sys/contrib/dev/acpica/include/acpredef.h b/sys/contrib/dev/acpica/include/acpredef.h
index 46f3d695ef1c..c41ab03b5440 100644
--- a/sys/contrib/dev/acpica/include/acpredef.h
+++ b/sys/contrib/dev/acpica/include/acpredef.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
  *
  * Return Package types
  *
- * 1) PTYPE1 packages do not contain sub-packages.
+ * 1) PTYPE1 packages do not contain subpackages.
  *
  * ACPI_PTYPE1_FIXED: Fixed-length length, 1 or 2 object types:
  *      object type
@@ -64,8 +64,8 @@
  *      (Used for _PRW)
  *
  *
- * 2) PTYPE2 packages contain a Variable-length number of sub-packages. Each
- *    of the different types describe the contents of each of the sub-packages.
+ * 2) PTYPE2 packages contain a Variable-length number of subpackages. Each
+ *    of the different types describe the contents of each of the subpackages.
  *
  * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types. Zero-length
  *      parent package is allowed:
@@ -106,6 +106,11 @@
  *      count = 0 (optional)
  *      (Used for _DLM)
  *
+ * ACPI_PTYPE2_UUID_PAIR: Each subpackage is preceded by a UUID Buffer. The UUID
+ *      defines the format of the package. Zero-length parent package is
+ *      allowed.
+ *      (Used for _DSD)
+ *
  *****************************************************************************/
 
 enum AcpiReturnPackageTypes
@@ -119,7 +124,8 @@ enum AcpiReturnPackageTypes
     ACPI_PTYPE2_FIXED       = 7,
     ACPI_PTYPE2_MIN         = 8,
     ACPI_PTYPE2_REV_FIXED   = 9,
-    ACPI_PTYPE2_FIX_VAR     = 10
+    ACPI_PTYPE2_FIX_VAR     = 10,
+    ACPI_PTYPE2_UUID_PAIR   = 11
 };
 
 
@@ -366,6 +372,9 @@ const ACPI_PREDEFINED_INFO          AcpiGbl_PredefinedMethods[] =
     {{"_CBA",   METHOD_0ARGS,
                 METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, /* See PCI firmware spec 3.0 */
 
+    {{"_CCA",   METHOD_0ARGS,
+                METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, /* ACPI 5.1 */
+
     {{"_CDM",   METHOD_0ARGS,
                 METHOD_RETURNS (ACPI_RTYPE_INTEGER)}},
 
@@ -434,6 +443,10 @@ const ACPI_PREDEFINED_INFO          AcpiGbl_PredefinedMethods[] =
     {{"_DOS",   METHOD_1ARGS (ACPI_TYPE_INTEGER),
                 METHOD_NO_RETURN_VALUE}},
 
+    {{"_DSD",   METHOD_0ARGS,
+                METHOD_RETURNS (ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each: 1 Buf, 1 Pkg */
+                    PACKAGE_INFO (ACPI_PTYPE2_UUID_PAIR, ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_PACKAGE, 1,0),
+
     {{"_DSM",   METHOD_4ARGS (ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_PACKAGE),
                 METHOD_RETURNS (ACPI_RTYPE_ALL)}}, /* Must return a value, but it can be of any type */
 
@@ -554,7 +567,7 @@ const ACPI_PREDEFINED_INFO          AcpiGbl_PredefinedMethods[] =
 
     /*
      * For _HPX, a single package is returned, containing a variable-length number
-     * of sub-packages. Each sub-package contains a PCI record setting.
+     * of subpackages. Each subpackage contains a PCI record setting.
      * There are several different type of record settings, of different
      * lengths, but all elements of all settings are Integers.
      */
@@ -580,6 +593,10 @@ const ACPI_PREDEFINED_INFO          AcpiGbl_PredefinedMethods[] =
     {{"_LID",   METHOD_0ARGS,
                 METHOD_RETURNS (ACPI_RTYPE_INTEGER)}},
 
+    {{"_LPD",   METHOD_0ARGS,
+                METHOD_RETURNS (ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (2 Int) */
+                    PACKAGE_INFO (ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 2,0,0,0),
+
     {{"_MAT",   METHOD_0ARGS,
                 METHOD_RETURNS (ACPI_RTYPE_BUFFER)}},
 
diff --git a/sys/contrib/dev/acpica/include/acresrc.h b/sys/contrib/dev/acpica/include/acresrc.h
index b894e2f63776..5f7927450683 100644
--- a/sys/contrib/dev/acpica/include/acresrc.h
+++ b/sys/contrib/dev/acpica/include/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -197,7 +197,7 @@ AcpiRsCreateResourceList (
 
 ACPI_STATUS
 AcpiRsCreateAmlResources (
-    ACPI_RESOURCE           *LinkedListBuffer,
+    ACPI_BUFFER             *ResourceList,
     ACPI_BUFFER             *OutputBuffer);
 
 ACPI_STATUS
@@ -251,7 +251,8 @@ AcpiRsGetListLength (
 
 ACPI_STATUS
 AcpiRsGetAmlLength (
-    ACPI_RESOURCE           *LinkedListBuffer,
+    ACPI_RESOURCE           *ResourceList,
+    ACPI_SIZE               ResourceListSize,
     ACPI_SIZE               *SizeNeeded);
 
 ACPI_STATUS
diff --git a/sys/contrib/dev/acpica/include/acrestyp.h b/sys/contrib/dev/acpica/include/acrestyp.h
index 9d6982526b50..b0412aa63cca 100644
--- a/sys/contrib/dev/acpica/include/acrestyp.h
+++ b/sys/contrib/dev/acpica/include/acrestyp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/acstruct.h b/sys/contrib/dev/acpica/include/acstruct.h
index a6ba5eac4433..5a0baf4001b0 100644
--- a/sys/contrib/dev/acpica/include/acstruct.h
+++ b/sys/contrib/dev/acpica/include/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -139,6 +139,9 @@ typedef struct acpi_init_walk_info
     UINT32                          TableIndex;
     UINT32                          ObjectCount;
     UINT32                          MethodCount;
+    UINT32                          SerialMethodCount;
+    UINT32                          NonSerialMethodCount;
+    UINT32                          SerializedMethodCount;
     UINT32                          DeviceCount;
     UINT32                          OpRegionCount;
     UINT32                          FieldCount;
diff --git a/sys/contrib/dev/acpica/include/actables.h b/sys/contrib/dev/acpica/include/actables.h
index 42958945bca4..2e3065865753 100644
--- a/sys/contrib/dev/acpica/include/actables.h
+++ b/sys/contrib/dev/acpica/include/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,10 @@ AcpiAllocateRootTable (
 /*
  * tbxfroot - Root pointer utilities
  */
+UINT32
+AcpiTbGetRsdpLength (
+    ACPI_TABLE_RSDP         *Rsdp);
+
 ACPI_STATUS
 AcpiTbValidateRsdp (
     ACPI_TABLE_RSDP         *Rsdp);
@@ -62,6 +66,49 @@ AcpiTbScanMemoryForRsdp (
     UINT32                  Length);
 
 
+/*
+ * tbdata - table data structure management
+ */
+ACPI_STATUS
+AcpiTbGetNextRootIndex (
+    UINT32                  *TableIndex);
+
+void
+AcpiTbInitTableDescriptor (
+    ACPI_TABLE_DESC         *TableDesc,
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags,
+    ACPI_TABLE_HEADER       *Table);
+
+ACPI_STATUS
+AcpiTbAcquireTempTable (
+    ACPI_TABLE_DESC         *TableDesc,
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags);
+
+void
+AcpiTbReleaseTempTable (
+    ACPI_TABLE_DESC         *TableDesc);
+
+ACPI_STATUS
+AcpiTbValidateTempTable (
+    ACPI_TABLE_DESC         *TableDesc);
+
+ACPI_STATUS
+AcpiTbVerifyTempTable (
+    ACPI_TABLE_DESC         *TableDesc,
+    char                    *Signature);
+
+BOOLEAN
+AcpiTbIsTableLoaded (
+    UINT32                  TableIndex);
+
+void
+AcpiTbSetTableLoadedFlag (
+    UINT32                  TableIndex,
+    BOOLEAN                 IsLoaded);
+
+
 /*
  * tbfadt - FADT parse/convert/validate
  */
@@ -94,17 +141,36 @@ AcpiTbResizeRootTableList (
     void);
 
 ACPI_STATUS
-AcpiTbVerifyTable (
+AcpiTbValidateTable (
     ACPI_TABLE_DESC         *TableDesc);
 
-ACPI_TABLE_HEADER *
-AcpiTbTableOverride (
-    ACPI_TABLE_HEADER       *TableHeader,
+void
+AcpiTbInvalidateTable (
     ACPI_TABLE_DESC         *TableDesc);
 
+void
+AcpiTbOverrideTable (
+    ACPI_TABLE_DESC         *OldTableDesc);
+
 ACPI_STATUS
-AcpiTbAddTable (
+AcpiTbAcquireTable (
     ACPI_TABLE_DESC         *TableDesc,
+    ACPI_TABLE_HEADER       **TablePtr,
+    UINT32                  *TableLength,
+    UINT8                   *TableFlags);
+
+void
+AcpiTbReleaseTable (
+    ACPI_TABLE_HEADER       *Table,
+    UINT32                  TableLength,
+    UINT8                   TableFlags);
+
+ACPI_STATUS
+AcpiTbInstallStandardTable (
+    ACPI_PHYSICAL_ADDRESS   Address,
+    UINT8                   Flags,
+    BOOLEAN                 Reload,
+    BOOLEAN                 Override,
     UINT32                  *TableIndex);
 
 ACPI_STATUS
@@ -116,7 +182,7 @@ AcpiTbStoreTable (
     UINT32                  *TableIndex);
 
 void
-AcpiTbDeleteTable (
+AcpiTbUninstallTable (
     ACPI_TABLE_DESC        *TableDesc);
 
 void
@@ -140,15 +206,6 @@ AcpiTbGetOwnerId (
     UINT32                  TableIndex,
     ACPI_OWNER_ID           *OwnerId);
 
-BOOLEAN
-AcpiTbIsTableLoaded (
-    UINT32                  TableIndex);
-
-void
-AcpiTbSetTableLoadedFlag (
-    UINT32                  TableIndex,
-    BOOLEAN                 IsLoaded);
-
 
 /*
  * tbutils - table manager utilities
@@ -185,7 +242,13 @@ AcpiTbCopyDsdt (
     UINT32                  TableIndex);
 
 void
-AcpiTbInstallTable (
+AcpiTbInstallTableWithOverride (
+    UINT32                  TableIndex,
+    ACPI_TABLE_DESC         *NewTableDesc,
+    BOOLEAN                 Override);
+
+ACPI_STATUS
+AcpiTbInstallFixedTable (
     ACPI_PHYSICAL_ADDRESS   Address,
     char                    *Signature,
     UINT32                  TableIndex);
diff --git a/sys/contrib/dev/acpica/include/actbl.h b/sys/contrib/dev/acpica/include/actbl.h
index d77d6c4b3199..707511dc0093 100644
--- a/sys/contrib/dev/acpica/include/actbl.h
+++ b/sys/contrib/dev/acpica/include/actbl.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -203,6 +203,9 @@ typedef struct acpi_table_xsdt
 
 } ACPI_TABLE_XSDT;
 
+#define ACPI_RSDT_ENTRY_SIZE        (sizeof (UINT32))
+#define ACPI_XSDT_ENTRY_SIZE        (sizeof (UINT64))
+
 
 /*******************************************************************************
  *
@@ -293,7 +296,8 @@ typedef struct acpi_table_fadt
     UINT32                  Flags;              /* Miscellaneous flag bits (see below for individual flags) */
     ACPI_GENERIC_ADDRESS    ResetRegister;      /* 64-bit address of the Reset register */
     UINT8                   ResetValue;         /* Value to write to the ResetRegister port to reset the system */
-    UINT8                   Reserved4[3];       /* Reserved, must be zero */
+    UINT16                  ArmBootFlags;       /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */
+    UINT8                   MinorRevision;      /* FADT Minor Revision (ACPI 5.1) */
     UINT64                  XFacs;              /* 64-bit physical address of FACS */
     UINT64                  XDsdt;              /* 64-bit physical address of DSDT */
     ACPI_GENERIC_ADDRESS    XPm1aEventBlock;    /* 64-bit Extended Power Mgt 1a Event Reg Blk address */
@@ -310,7 +314,7 @@ typedef struct acpi_table_fadt
 } ACPI_TABLE_FADT;
 
 
-/* Masks for FADT Boot Architecture Flags (BootFlags) [Vx]=Introduced in this FADT revision */
+/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
 
 #define ACPI_FADT_LEGACY_DEVICES    (1)         /* 00: [V2] System has LPC or ISA bus devices */
 #define ACPI_FADT_8042              (1<<1)      /* 01: [V3] System has an 8042 controller on port 60/64 */
@@ -319,6 +323,11 @@ typedef struct acpi_table_fadt
 #define ACPI_FADT_NO_ASPM           (1<<4)      /* 04: [V4] PCIe ASPM control must not be enabled */
 #define ACPI_FADT_NO_CMOS_RTC       (1<<5)      /* 05: [V5] No CMOS real-time clock present */
 
+/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */
+
+#define ACPI_FADT_PSCI_COMPLIANT    (1)         /* 00: [V5+] PSCI 0.2+ is implemented */
+#define ACPI_FADT_PSCI_USE_HVC      (1<<1)      /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */
+
 /* Masks for FADT flags */
 
 #define ACPI_FADT_WBINVD            (1)         /* 00: [V1] The WBINVD instruction works properly */
@@ -399,12 +408,11 @@ typedef struct acpi_table_desc
 
 /* Masks for Flags field above */
 
-#define ACPI_TABLE_ORIGIN_UNKNOWN       (0)
-#define ACPI_TABLE_ORIGIN_MAPPED        (1)
-#define ACPI_TABLE_ORIGIN_ALLOCATED     (2)
-#define ACPI_TABLE_ORIGIN_OVERRIDE      (4)
-#define ACPI_TABLE_ORIGIN_MASK          (7)
-#define ACPI_TABLE_IS_LOADED            (8)
+#define ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL  (0) /* Virtual address, external maintained */
+#define ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL (1) /* Physical address, internally mapped */
+#define ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL  (2) /* Virtual address, internallly allocated */
+#define ACPI_TABLE_ORIGIN_MASK              (3)
+#define ACPI_TABLE_IS_LOADED                (8)
 
 
 /*
@@ -433,7 +441,7 @@ typedef struct acpi_table_desc
  *     FADT V5  size: 0x10C
  */
 #define ACPI_FADT_V1_SIZE       (UINT32) (ACPI_FADT_OFFSET (Flags) + 4)
-#define ACPI_FADT_V2_SIZE       (UINT32) (ACPI_FADT_OFFSET (Reserved4[0]) + 3)
+#define ACPI_FADT_V2_SIZE       (UINT32) (ACPI_FADT_OFFSET (MinorRevision) + 1)
 #define ACPI_FADT_V3_SIZE       (UINT32) (ACPI_FADT_OFFSET (SleepControl))
 #define ACPI_FADT_V5_SIZE       (UINT32) (sizeof (ACPI_TABLE_FADT))
 
diff --git a/sys/contrib/dev/acpica/include/actbl1.h b/sys/contrib/dev/acpica/include/actbl1.h
index 67579da49b83..a781056e1d54 100644
--- a/sys/contrib/dev/acpica/include/actbl1.h
+++ b/sys/contrib/dev/acpica/include/actbl1.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -524,7 +524,7 @@ typedef struct acpi_hest_aer_common
     UINT8                   Enabled;
     UINT32                  RecordsToPreallocate;
     UINT32                  MaxSectionsPerRecord;
-    UINT32                  Bus;
+    UINT32                  Bus;                    /* Bus and Segment numbers */
     UINT16                  Device;
     UINT16                  Function;
     UINT16                  DeviceControl;
@@ -541,6 +541,14 @@ typedef struct acpi_hest_aer_common
 #define ACPI_HEST_FIRMWARE_FIRST        (1)
 #define ACPI_HEST_GLOBAL                (1<<1)
 
+/*
+ * Macros to access the bus/segment numbers in Bus field above:
+ *  Bus number is encoded in bits 7:0
+ *  Segment number is encoded in bits 23:8
+ */
+#define ACPI_HEST_BUS(Bus)              ((Bus) & 0xFF)
+#define ACPI_HEST_SEGMENT(Bus)          (((Bus) >> 8) & 0xFFFF)
+
 
 /* Hardware Error Notification */
 
@@ -754,25 +762,27 @@ typedef struct acpi_table_madt
 
 enum AcpiMadtType
 {
-    ACPI_MADT_TYPE_LOCAL_APIC           = 0,
-    ACPI_MADT_TYPE_IO_APIC              = 1,
-    ACPI_MADT_TYPE_INTERRUPT_OVERRIDE   = 2,
-    ACPI_MADT_TYPE_NMI_SOURCE           = 3,
-    ACPI_MADT_TYPE_LOCAL_APIC_NMI       = 4,
-    ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE  = 5,
-    ACPI_MADT_TYPE_IO_SAPIC             = 6,
-    ACPI_MADT_TYPE_LOCAL_SAPIC          = 7,
-    ACPI_MADT_TYPE_INTERRUPT_SOURCE     = 8,
-    ACPI_MADT_TYPE_LOCAL_X2APIC         = 9,
-    ACPI_MADT_TYPE_LOCAL_X2APIC_NMI     = 10,
-    ACPI_MADT_TYPE_GENERIC_INTERRUPT    = 11,
-    ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR  = 12,
-    ACPI_MADT_TYPE_RESERVED             = 13    /* 13 and greater are reserved */
+    ACPI_MADT_TYPE_LOCAL_APIC               = 0,
+    ACPI_MADT_TYPE_IO_APIC                  = 1,
+    ACPI_MADT_TYPE_INTERRUPT_OVERRIDE       = 2,
+    ACPI_MADT_TYPE_NMI_SOURCE               = 3,
+    ACPI_MADT_TYPE_LOCAL_APIC_NMI           = 4,
+    ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE      = 5,
+    ACPI_MADT_TYPE_IO_SAPIC                 = 6,
+    ACPI_MADT_TYPE_LOCAL_SAPIC              = 7,
+    ACPI_MADT_TYPE_INTERRUPT_SOURCE         = 8,
+    ACPI_MADT_TYPE_LOCAL_X2APIC             = 9,
+    ACPI_MADT_TYPE_LOCAL_X2APIC_NMI         = 10,
+    ACPI_MADT_TYPE_GENERIC_INTERRUPT        = 11,
+    ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR      = 12,
+    ACPI_MADT_TYPE_GENERIC_MSI_FRAME        = 13,
+    ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR    = 14,
+    ACPI_MADT_TYPE_RESERVED                 = 15    /* 15 and greater are reserved */
 };
 
 
 /*
- * MADT Sub-tables, correspond to Type in ACPI_SUBTABLE_HEADER
+ * MADT Subtables, correspond to Type in ACPI_SUBTABLE_HEADER
  */
 
 /* 0: Processor Local APIC */
@@ -928,16 +938,27 @@ typedef struct acpi_madt_generic_interrupt
 {
     ACPI_SUBTABLE_HEADER    Header;
     UINT16                  Reserved;           /* Reserved - must be zero */
-    UINT32                  GicId;
+    UINT32                  CpuInterfaceNumber;
     UINT32                  Uid;
     UINT32                  Flags;
     UINT32                  ParkingVersion;
     UINT32                  PerformanceInterrupt;
     UINT64                  ParkedAddress;
     UINT64                  BaseAddress;
+    UINT64                  GicvBaseAddress;
+    UINT64                  GichBaseAddress;
+    UINT32                  VgicInterrupt;
+    UINT64                  GicrBaseAddress;
+    UINT64                  ArmMpidr;
 
 } ACPI_MADT_GENERIC_INTERRUPT;
 
+/* Masks for Flags field above */
+
+/* ACPI_MADT_ENABLED                    (1)      Processor is usable if set */
+#define ACPI_MADT_PERFORMANCE_IRQ_MODE  (1<<1)  /* 01: Performance Interrupt Mode */
+#define ACPI_MADT_VGIC_IRQ_MODE         (1<<2)  /* 02: VGIC Maintenance Interrupt mode */
+
 
 /* 12: Generic Distributor (ACPI 5.0) */
 
@@ -953,11 +974,42 @@ typedef struct acpi_madt_generic_distributor
 } ACPI_MADT_GENERIC_DISTRIBUTOR;
 
 
+/* 13: Generic MSI Frame (ACPI 5.1) */
+
+typedef struct acpi_madt_generic_msi_frame
+{
+    ACPI_SUBTABLE_HEADER    Header;
+    UINT16                  Reserved;           /* Reserved - must be zero */
+    UINT32                  MsiFrameId;
+    UINT64                  BaseAddress;
+    UINT32                  Flags;
+    UINT16                  SpiCount;
+    UINT16                  SpiBase;
+
+} ACPI_MADT_GENERIC_MSI_FRAME;
+
+/* Masks for Flags field above */
+
+#define ACPI_MADT_OVERRIDE_SPI_VALUES   (1)
+
+
+/* 14: Generic Redistributor (ACPI 5.1) */
+
+typedef struct acpi_madt_generic_redistributor
+{
+    ACPI_SUBTABLE_HEADER    Header;
+    UINT16                  Reserved;           /* reserved - must be zero */
+    UINT64                  BaseAddress;
+    UINT32                  Length;
+
+} ACPI_MADT_GENERIC_REDISTRIBUTOR;
+
+
 /*
  * Common flags fields for MADT subtables
  */
 
-/* MADT Local APIC flags (LapicFlags) and GIC flags */
+/* MADT Local APIC flags */
 
 #define ACPI_MADT_ENABLED           (1)         /* 00: Processor is usable if set */
 
@@ -1066,11 +1118,12 @@ enum AcpiSratType
     ACPI_SRAT_TYPE_CPU_AFFINITY         = 0,
     ACPI_SRAT_TYPE_MEMORY_AFFINITY      = 1,
     ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY  = 2,
-    ACPI_SRAT_TYPE_RESERVED             = 3     /* 3 and greater are reserved */
+    ACPI_SRAT_TYPE_GICC_AFFINITY        = 3,
+    ACPI_SRAT_TYPE_RESERVED             = 4     /* 4 and greater are reserved */
 };
 
 /*
- * SRAT Sub-tables, correspond to Type in ACPI_SUBTABLE_HEADER
+ * SRAT Subtables, correspond to Type in ACPI_SUBTABLE_HEADER
  */
 
 /* 0: Processor Local APIC/SAPIC Affinity */
@@ -1083,7 +1136,7 @@ typedef struct acpi_srat_cpu_affinity
     UINT32                  Flags;
     UINT8                   LocalSapicEid;
     UINT8                   ProximityDomainHi[3];
-    UINT32                  Reserved;           /* Reserved, must be zero */
+    UINT32                  ClockDomain;
 
 } ACPI_SRAT_CPU_AFFINITY;
 
@@ -1133,6 +1186,22 @@ typedef struct acpi_srat_x2apic_cpu_affinity
 #define ACPI_SRAT_CPU_ENABLED       (1)         /* 00: Use affinity structure */
 
 
+/* 3: GICC Affinity (ACPI 5.1) */
+
+typedef struct acpi_srat_gicc_affinity
+{
+    ACPI_SUBTABLE_HEADER    Header;
+    UINT32                  ProximityDomain;
+    UINT32                  AcpiProcessorUid;
+    UINT32                  Flags;
+    UINT32                  ClockDomain;
+
+} ACPI_SRAT_GICC_AFFINITY;
+
+/* Flags for ACPI_SRAT_GICC_AFFINITY */
+
+#define ACPI_SRAT_GICC_ENABLED     (1)         /* 00: Use affinity structure */
+
 /* Reset to default packing */
 
 #pragma pack()
diff --git a/sys/contrib/dev/acpica/include/actbl2.h b/sys/contrib/dev/acpica/include/actbl2.h
index 327a8105e6cb..a6f2f2081f64 100644
--- a/sys/contrib/dev/acpica/include/actbl2.h
+++ b/sys/contrib/dev/acpica/include/actbl2.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,7 @@
 #define ACPI_SIG_HPET           "HPET"      /* High Precision Event Timer table */
 #define ACPI_SIG_IBFT           "IBFT"      /* iSCSI Boot Firmware Table */
 #define ACPI_SIG_IVRS           "IVRS"      /* I/O Virtualization Reporting Structure */
+#define ACPI_SIG_LPIT           "LPIT"      /* Low Power Idle Table */
 #define ACPI_SIG_MCFG           "MCFG"      /* PCI Memory Mapped Configuration table */
 #define ACPI_SIG_MCHI           "MCHI"      /* Management Controller Host Interface table */
 #define ACPI_SIG_MTMR           "MTMR"      /* MID Timer table */
@@ -373,6 +374,14 @@ typedef struct acpi_table_dbg2
 } ACPI_TABLE_DBG2;
 
 
+typedef struct acpi_dbg2_header
+{
+    UINT32                  InfoOffset;
+    UINT32                  InfoCount;
+
+} ACPI_DBG2_HEADER;
+
+
 /* Debug Device Information Subtable */
 
 typedef struct acpi_dbg2_device
@@ -441,7 +450,7 @@ typedef struct acpi_table_dbgp
  *        Version 1
  *
  * Conforms to "Intel Virtualization Technology for Directed I/O",
- * Version 1.2, Sept. 2008
+ * Version 2.2, Sept. 2013
  *
  ******************************************************************************/
 
@@ -474,9 +483,10 @@ enum AcpiDmarType
 {
     ACPI_DMAR_TYPE_HARDWARE_UNIT        = 0,
     ACPI_DMAR_TYPE_RESERVED_MEMORY      = 1,
-    ACPI_DMAR_TYPE_ATSR                 = 2,
-    ACPI_DMAR_HARDWARE_AFFINITY         = 3,
-    ACPI_DMAR_TYPE_RESERVED             = 4     /* 4 and greater are reserved */
+    ACPI_DMAR_TYPE_ROOT_ATS             = 2,
+    ACPI_DMAR_TYPE_HARDWARE_AFFINITY    = 3,
+    ACPI_DMAR_TYPE_NAMESPACE            = 4,
+    ACPI_DMAR_TYPE_RESERVED             = 5     /* 5 and greater are reserved */
 };
 
 
@@ -492,7 +502,7 @@ typedef struct acpi_dmar_device_scope
 
 } ACPI_DMAR_DEVICE_SCOPE;
 
-/* Values for EntryType in ACPI_DMAR_DEVICE_SCOPE */
+/* Values for EntryType in ACPI_DMAR_DEVICE_SCOPE - device types */
 
 enum AcpiDmarScopeType
 {
@@ -501,7 +511,8 @@ enum AcpiDmarScopeType
     ACPI_DMAR_SCOPE_TYPE_BRIDGE         = 2,
     ACPI_DMAR_SCOPE_TYPE_IOAPIC         = 3,
     ACPI_DMAR_SCOPE_TYPE_HPET           = 4,
-    ACPI_DMAR_SCOPE_TYPE_RESERVED       = 5     /* 5 and greater are reserved */
+    ACPI_DMAR_SCOPE_TYPE_NAMESPACE      = 5,
+    ACPI_DMAR_SCOPE_TYPE_RESERVED       = 6     /* 6 and greater are reserved */
 };
 
 typedef struct acpi_dmar_pci_path
@@ -513,7 +524,7 @@ typedef struct acpi_dmar_pci_path
 
 
 /*
- * DMAR Sub-tables, correspond to Type in ACPI_DMAR_HEADER
+ * DMAR Subtables, correspond to Type in ACPI_DMAR_HEADER
  */
 
 /* 0: Hardware Unit Definition */
@@ -578,6 +589,18 @@ typedef struct acpi_dmar_rhsa
 } ACPI_DMAR_RHSA;
 
 
+/* 4: ACPI Namespace Device Declaration Structure */
+
+typedef struct acpi_dmar_andd
+{
+    ACPI_DMAR_HEADER        Header;
+    UINT8                   Reserved[3];
+    UINT8                   DeviceNumber;
+    char                    DeviceName[1];
+
+} ACPI_DMAR_ANDD;
+
+
 /*******************************************************************************
  *
  * HPET - High Precision Event Timer table
@@ -926,7 +949,83 @@ typedef struct acpi_ivrs_memory
 
 /*******************************************************************************
  *
- * MCFG - PCI Memory Mapped Configuration table and sub-table
+ * LPIT - Low Power Idle Table
+ *
+ * Conforms to "ACPI Low Power Idle Table (LPIT) and _LPD Proposal (DRAFT)"
+ *
+ ******************************************************************************/
+
+typedef struct acpi_table_lpit
+{
+    ACPI_TABLE_HEADER       Header;             /* Common ACPI table header */
+
+} ACPI_TABLE_LPIT;
+
+
+/* LPIT subtable header */
+
+typedef struct acpi_lpit_header
+{
+    UINT32                  Type;               /* Subtable type */
+    UINT32                  Length;             /* Subtable length */
+    UINT16                  UniqueId;
+    UINT16                  Reserved;
+    UINT32                  Flags;
+
+} ACPI_LPIT_HEADER;
+
+/* Values for subtable Type above */
+
+enum AcpiLpitType
+{
+    ACPI_LPIT_TYPE_NATIVE_CSTATE    = 0x00,
+    ACPI_LPIT_TYPE_SIMPLE_IO        = 0x01
+};
+
+/* Masks for Flags field above  */
+
+#define ACPI_LPIT_STATE_DISABLED    (1)
+#define ACPI_LPIT_NO_COUNTER        (1<<1)
+
+/*
+ * LPIT subtables, correspond to Type in ACPI_LPIT_HEADER
+ */
+
+/* 0x00: Native C-state instruction based LPI structure */
+
+typedef struct acpi_lpit_native
+{
+    ACPI_LPIT_HEADER        Header;
+    ACPI_GENERIC_ADDRESS    EntryTrigger;
+    UINT32                  Residency;
+    UINT32                  Latency;
+    ACPI_GENERIC_ADDRESS    ResidencyCounter;
+    UINT64                  CounterFrequency;
+
+} ACPI_LPIT_NATIVE;
+
+
+/* 0x01: Simple I/O based LPI structure */
+
+typedef struct acpi_lpit_io
+{
+    ACPI_LPIT_HEADER        Header;
+    ACPI_GENERIC_ADDRESS    EntryTrigger;
+    UINT32                  TriggerAction;
+    UINT64                  TriggerValue;
+    UINT64                  TriggerMask;
+    ACPI_GENERIC_ADDRESS    MinimumIdleState;
+    UINT32                  Residency;
+    UINT32                  Latency;
+    ACPI_GENERIC_ADDRESS    ResidencyCounter;
+    UINT64                  CounterFrequency;
+
+} ACPI_LPIT_IO;
+
+
+/*******************************************************************************
+ *
+ * MCFG - PCI Memory Mapped Configuration table and subtable
  *        Version 1
  *
  * Conforms to "PCI Firmware Specification", Revision 3.0, June 20, 2005
@@ -1050,7 +1149,7 @@ enum AcpiSlicType
 
 
 /*
- * SLIC Sub-tables, correspond to Type in ACPI_SLIC_HEADER
+ * SLIC Subtables, correspond to Type in ACPI_SLIC_HEADER
  */
 
 /* 0: Public Key Structure */
diff --git a/sys/contrib/dev/acpica/include/actbl3.h b/sys/contrib/dev/acpica/include/actbl3.h
index acf2e13560d0..2f98b37203a9 100644
--- a/sys/contrib/dev/acpica/include/actbl3.h
+++ b/sys/contrib/dev/acpica/include/actbl3.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -280,35 +280,115 @@ typedef struct acpi_s3pt_suspend
 
 /*******************************************************************************
  *
- * GTDT - Generic Timer Description Table (ACPI 5.0)
- *        Version 1
+ * GTDT - Generic Timer Description Table (ACPI 5.1)
+ *        Version 2
  *
  ******************************************************************************/
 
 typedef struct acpi_table_gtdt
 {
     ACPI_TABLE_HEADER       Header;             /* Common ACPI table header */
-    UINT64                  Address;
-    UINT32                  Flags;
-    UINT32                  SecurePl1Interrupt;
-    UINT32                  SecurePl1Flags;
-    UINT32                  NonSecurePl1Interrupt;
-    UINT32                  NonSecurePl1Flags;
+    UINT64                  CounterBlockAddresss;
+    UINT32                  Reserved;
+    UINT32                  SecureEl1Interrupt;
+    UINT32                  SecureEl1Flags;
+    UINT32                  NonSecureEl1Interrupt;
+    UINT32                  NonSecureEl1Flags;
     UINT32                  VirtualTimerInterrupt;
     UINT32                  VirtualTimerFlags;
-    UINT32                  NonSecurePl2Interrupt;
-    UINT32                  NonSecurePl2Flags;
+    UINT32                  NonSecureEl2Interrupt;
+    UINT32                  NonSecureEl2Flags;
+    UINT64                  CounterReadBlockAddress;
+    UINT32                  PlatformTimerCount;
+    UINT32                  PlatformTimerOffset;
 
 } ACPI_TABLE_GTDT;
 
-/* Values for Flags field above */
+/* Flag Definitions: Timer Block Physical Timers and Virtual timers */
 
-#define ACPI_GTDT_MAPPED_BLOCK_PRESENT      1
+#define ACPI_GTDT_INTERRUPT_MODE        (1)
+#define ACPI_GTDT_INTERRUPT_POLARITY    (1<<1)
+#define ACPI_GTDT_ALWAYS_ON             (1<<2)
 
-/* Values for all "TimerFlags" fields above */
 
-#define ACPI_GTDT_INTERRUPT_MODE            1
-#define ACPI_GTDT_INTERRUPT_POLARITY        2
+/* Common GTDT subtable header */
+
+typedef struct acpi_gtdt_header
+{
+    UINT8                   Type;
+    UINT16                  Length;
+
+} ACPI_GTDT_HEADER;
+
+/* Values for GTDT subtable type above */
+
+enum AcpiGtdtType
+{
+    ACPI_GTDT_TYPE_TIMER_BLOCK      = 0,
+    ACPI_GTDT_TYPE_WATCHDOG         = 1,
+    ACPI_GTDT_TYPE_RESERVED         = 2    /* 2 and greater are reserved */
+};
+
+
+/* GTDT Subtables, correspond to Type in acpi_gtdt_header */
+
+/* 0: Generic Timer Block */
+
+typedef struct acpi_gtdt_timer_block
+{
+    ACPI_GTDT_HEADER        Header;
+    UINT8                   Reserved;
+    UINT64                  BlockAddress;
+    UINT32                  TimerCount;
+    UINT32                  TimerOffset;
+
+} ACPI_GTDT_TIMER_BLOCK;
+
+/* Timer Sub-Structure, one per timer */
+
+typedef struct acpi_gtdt_timer_entry
+{
+    UINT8                   FrameNumber;
+    UINT8                   Reserved[3];
+    UINT64                  BaseAddress;
+    UINT64                  El0BaseAddress;
+    UINT32                  TimerInterrupt;
+    UINT32                  TimerFlags;
+    UINT32                  VirtualTimerInterrupt;
+    UINT32                  VirtualTimerFlags;
+    UINT32                  CommonFlags;
+
+} ACPI_GTDT_TIMER_ENTRY;
+
+/* Flag Definitions: TimerFlags and VirtualTimerFlags above */
+
+#define ACPI_GTDT_GT_IRQ_MODE               (1)
+#define ACPI_GTDT_GT_IRQ_POLARITY           (1<<1)
+
+/* Flag Definitions: CommonFlags above */
+
+#define ACPI_GTDT_GT_IS_SECURE_TIMER        (1)
+#define ACPI_GTDT_GT_ALWAYS_ON              (1<<1)
+
+
+/* 1: SBSA Generic Watchdog Structure */
+
+typedef struct acpi_gtdt_watchdog
+{
+    ACPI_GTDT_HEADER        Header;
+    UINT8                   Reserved;
+    UINT64                  RefreshFrameAddress;
+    UINT64                  ControlFrameAddress;
+    UINT32                  TimerInterrupt;
+    UINT32                  TimerFlags;
+
+} ACPI_GTDT_WATCHDOG;
+
+/* Flag Definitions: TimerFlags above */
+
+#define ACPI_GTDT_WATCHDOG_IRQ_MODE         (1)
+#define ACPI_GTDT_WATCHDOG_IRQ_POLARITY     (1<<1)
+#define ACPI_GTDT_WATCHDOG_SECURE           (1<<2)
 
 
 /*******************************************************************************
@@ -440,8 +520,7 @@ typedef struct acpi_table_pcct
 {
     ACPI_TABLE_HEADER       Header;             /* Common ACPI table header */
     UINT32                  Flags;
-    UINT32                  Latency;
-    UINT32                  Reserved;
+    UINT64                  Reserved;
 
 } ACPI_TABLE_PCCT;
 
@@ -449,8 +528,17 @@ typedef struct acpi_table_pcct
 
 #define ACPI_PCCT_DOORBELL              1
 
+/* Values for subtable type in ACPI_SUBTABLE_HEADER */
+
+enum AcpiPcctType
+{
+    ACPI_PCCT_TYPE_GENERIC_SUBSPACE     = 0,
+    ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE  = 1,
+    ACPI_PCCT_TYPE_RESERVED             = 2     /* 2 and greater are reserved */
+};
+
 /*
- * PCCT subtables
+ * PCCT Subtables, correspond to Type in ACPI_SUBTABLE_HEADER
  */
 
 /* 0: Generic Communications Subspace */
@@ -464,10 +552,38 @@ typedef struct acpi_pcct_subspace
     ACPI_GENERIC_ADDRESS    DoorbellRegister;
     UINT64                  PreserveMask;
     UINT64                  WriteMask;
+    UINT32                  Latency;
+    UINT32                  MaxAccessRate;
+    UINT16                  MinTurnaroundTime;
 
 } ACPI_PCCT_SUBSPACE;
 
 
+/* 1: HW-reduced Communications Subspace (ACPI 5.1) */
+
+typedef struct acpi_pcct_hw_reduced
+{
+    ACPI_SUBTABLE_HEADER    Header;
+    UINT32                  DoorbellInterrupt;
+    UINT8                   Flags;
+    UINT8                   Reserved;
+    UINT64                  BaseAddress;
+    UINT64                  Length;
+    ACPI_GENERIC_ADDRESS    DoorbellRegister;
+    UINT64                  PreserveMask;
+    UINT64                  WriteMask;
+    UINT32                  Latency;
+    UINT32                  MaxAccessRate;
+    UINT16                  MinTurnaroundTime;
+
+} ACPI_PCCT_HW_REDUCED;
+
+/* Values for doorbell flags above */
+
+#define ACPI_PCCT_INTERRUPT_POLARITY    (1)
+#define ACPI_PCCT_INTERRUPT_MODE        (1<<1)
+
+
 /*
  * PCC memory structures (not part of the ACPI table)
  */
diff --git a/sys/contrib/dev/acpica/include/actypes.h b/sys/contrib/dev/acpica/include/actypes.h
index dafbfd53a62b..0444f5e14e12 100644
--- a/sys/contrib/dev/acpica/include/actypes.h
+++ b/sys/contrib/dev/acpica/include/actypes.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,8 +55,6 @@
 #error ACPI_MACHINE_WIDTH not defined
 #endif
 
-/*! [Begin] no source code translation */
-
 /*
  * Data type ranges
  * Note: These macros are designed to be compiler independent as well as
@@ -124,13 +122,16 @@
  *
  ******************************************************************************/
 
+#ifndef ACPI_USE_SYSTEM_INTTYPES
+
 typedef unsigned char                   BOOLEAN;
 typedef unsigned char                   UINT8;
 typedef unsigned short                  UINT16;
+typedef short                           INT16;
 typedef COMPILER_DEPENDENT_UINT64       UINT64;
 typedef COMPILER_DEPENDENT_INT64        INT64;
 
-/*! [End] no source code translation !*/
+#endif /* ACPI_USE_SYSTEM_INTTYPES */
 
 /*
  * Value returned by AcpiOsGetThreadId. There is no standard "thread_id"
@@ -151,12 +152,12 @@ typedef COMPILER_DEPENDENT_INT64        INT64;
 
 #if ACPI_MACHINE_WIDTH == 64
 
-/*! [Begin] no source code translation (keep the typedefs as-is) */
+#ifndef ACPI_USE_SYSTEM_INTTYPES
 
 typedef unsigned int                    UINT32;
 typedef int                             INT32;
 
-/*! [End] no source code translation !*/
+#endif /* ACPI_USE_SYSTEM_INTTYPES */
 
 
 typedef INT64                           ACPI_NATIVE_INT;
@@ -190,12 +191,12 @@ typedef UINT64                          ACPI_PHYSICAL_ADDRESS;
 
 #elif ACPI_MACHINE_WIDTH == 32
 
-/*! [Begin] no source code translation (keep the typedefs as-is) */
+#ifndef ACPI_USE_SYSTEM_INTTYPES
 
 typedef unsigned int                    UINT32;
 typedef int                             INT32;
 
-/*! [End] no source code translation !*/
+#endif /* ACPI_USE_SYSTEM_INTTYPES */
 
 
 typedef INT32                           ACPI_NATIVE_INT;
@@ -303,9 +304,18 @@ typedef UINT32                          ACPI_PHYSICAL_ADDRESS;
 #endif
 
 /*
- * All ACPICA functions that are available to the rest of the kernel are
- * tagged with this macro which can be defined as appropriate for the host.
+ * All ACPICA external functions that are available to the rest of the kernel
+ * are tagged with thes macros which can be defined as appropriate for the host.
+ *
+ * Notes:
+ * ACPI_EXPORT_SYMBOL_INIT is used for initialization and termination
+ * interfaces that may need special processing.
+ * ACPI_EXPORT_SYMBOL is used for all other public external functions.
  */
+#ifndef ACPI_EXPORT_SYMBOL_INIT
+#define ACPI_EXPORT_SYMBOL_INIT(Symbol)
+#endif
+
 #ifndef ACPI_EXPORT_SYMBOL
 #define ACPI_EXPORT_SYMBOL(Symbol)
 #endif
@@ -319,6 +329,45 @@ typedef UINT32                          ACPI_PHYSICAL_ADDRESS;
 #endif
 
 
+/*******************************************************************************
+ *
+ * Configuration
+ *
+ ******************************************************************************/
+
+#ifdef ACPI_NO_MEM_ALLOCATIONS
+
+#define ACPI_ALLOCATE(a)                NULL
+#define ACPI_ALLOCATE_ZEROED(a)         NULL
+#define ACPI_FREE(a)
+#define ACPI_MEM_TRACKING(a)
+
+#else /* ACPI_NO_MEM_ALLOCATIONS */
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+/*
+ * Memory allocation tracking (used by AcpiExec to detect memory leaks)
+ */
+#define ACPI_MEM_PARAMETERS             _COMPONENT, _AcpiModuleName, __LINE__
+#define ACPI_ALLOCATE(a)                AcpiUtAllocateAndTrack ((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)         AcpiUtAllocateZeroedAndTrack ((ACPI_SIZE) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_FREE(a)                    AcpiUtFreeAndTrack (a, ACPI_MEM_PARAMETERS)
+#define ACPI_MEM_TRACKING(a)            a
+
+#else
+/*
+ * Normal memory allocation directly via the OS services layer
+ */
+#define ACPI_ALLOCATE(a)                AcpiOsAllocate ((ACPI_SIZE) (a))
+#define ACPI_ALLOCATE_ZEROED(a)         AcpiOsAllocateZeroed ((ACPI_SIZE) (a))
+#define ACPI_FREE(a)                    AcpiOsFree (a)
+#define ACPI_MEM_TRACKING(a)
+
+#endif /* ACPI_DBG_TRACK_ALLOCATIONS */
+
+#endif /* ACPI_NO_MEM_ALLOCATIONS */
+
+
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
@@ -335,6 +384,7 @@ typedef UINT32                          ACPI_PHYSICAL_ADDRESS;
 #define ACPI_PM1_REGISTER_WIDTH         16
 #define ACPI_PM2_REGISTER_WIDTH         8
 #define ACPI_PM_TIMER_WIDTH             32
+#define ACPI_RESET_REGISTER_WIDTH       8
 
 /* Names within the namespace are 4 bytes long */
 
@@ -474,7 +524,7 @@ typedef UINT64                          ACPI_INTEGER;
 
 #define ACPI_TO_POINTER(i)              ACPI_ADD_PTR (void, (void *) NULL,(ACPI_SIZE) i)
 #define ACPI_TO_INTEGER(p)              ACPI_PTR_DIFF (p, (void *) NULL)
-#define ACPI_OFFSET(d, f)               (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL)
+#define ACPI_OFFSET(d, f)               ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
 #define ACPI_PHYSADDR_TO_PTR(i)         ACPI_TO_POINTER(i)
 #define ACPI_PTR_TO_PHYSADDR(i)         ACPI_TO_INTEGER(i)
 
@@ -568,8 +618,9 @@ typedef UINT64                          ACPI_INTEGER;
 #define ACPI_NOTIFY_RESERVED            (UINT8) 0x0A
 #define ACPI_NOTIFY_LOCALITY_UPDATE     (UINT8) 0x0B
 #define ACPI_NOTIFY_SHUTDOWN_REQUEST    (UINT8) 0x0C
+#define ACPI_NOTIFY_AFFINITY_UPDATE     (UINT8) 0x0D
 
-#define ACPI_NOTIFY_MAX                 0x0C
+#define ACPI_NOTIFY_MAX                 0x0D
 
 /*
  * Types associated with ACPI names and objects. The first group of
@@ -669,14 +720,15 @@ typedef UINT32                          ACPI_EVENT_TYPE;
  * The encoding of ACPI_EVENT_STATUS is illustrated below.
  * Note that a set bit (1) indicates the property is TRUE
  * (e.g. if bit 0 is set then the event is enabled).
- * +-------------+-+-+-+
- * |   Bits 31:3 |2|1|0|
- * +-------------+-+-+-+
- *          |     | | |
- *          |     | | +- Enabled?
- *          |     | +--- Enabled for wake?
- *          |     +----- Set?
- *          +----------- <Reserved>
+ * +-------------+-+-+-+-+
+ * |   Bits 31:4 |3|2|1|0|
+ * +-------------+-+-+-+-+
+ *          |     | | | |
+ *          |     | | | +- Enabled?
+ *          |     | | +--- Enabled for wake?
+ *          |     | +----- Set?
+ *          |     +------- Has a handler?
+ *          +------------- <Reserved>
  */
 typedef UINT32                          ACPI_EVENT_STATUS;
 
@@ -684,6 +736,7 @@ typedef UINT32                          ACPI_EVENT_STATUS;
 #define ACPI_EVENT_FLAG_ENABLED         (ACPI_EVENT_STATUS) 0x01
 #define ACPI_EVENT_FLAG_WAKE_ENABLED    (ACPI_EVENT_STATUS) 0x02
 #define ACPI_EVENT_FLAG_SET             (ACPI_EVENT_STATUS) 0x04
+#define ACPI_EVENT_FLAG_HAS_HANDLER     (ACPI_EVENT_STATUS) 0x08
 
 /* Actions for AcpiSetGpe, AcpiGpeWakeup, AcpiHwLowSetGpe */
 
@@ -916,8 +969,18 @@ typedef struct acpi_object_list
  * Miscellaneous common Data Structures used by the interfaces
  */
 #define ACPI_NO_BUFFER              0
-#define ACPI_ALLOCATE_BUFFER        (ACPI_SIZE) (-1)
-#define ACPI_ALLOCATE_LOCAL_BUFFER  (ACPI_SIZE) (-2)
+
+#ifdef ACPI_NO_MEM_ALLOCATIONS
+
+#define ACPI_ALLOCATE_BUFFER        (ACPI_SIZE) (0)
+#define ACPI_ALLOCATE_LOCAL_BUFFER  (ACPI_SIZE) (0)
+
+#else /* ACPI_NO_MEM_ALLOCATIONS */
+
+#define ACPI_ALLOCATE_BUFFER        (ACPI_SIZE) (-1)    /* Let ACPICA allocate buffer */
+#define ACPI_ALLOCATE_LOCAL_BUFFER  (ACPI_SIZE) (-2)    /* For internal use only (enables tracking) */
+
+#endif /* ACPI_NO_MEM_ALLOCATIONS */
 
 typedef struct acpi_buffer
 {
@@ -926,10 +989,6 @@ typedef struct acpi_buffer
 
 } ACPI_BUFFER;
 
-/* Free a buffer created in an ACPI_BUFFER via ACPI_ALLOCATE_LOCAL_BUFFER */
-
-#define ACPI_FREE_BUFFER(b)         ACPI_FREE(b.Pointer)
-
 
 /*
  * NameType for AcpiGetName
@@ -1281,4 +1340,19 @@ typedef struct acpi_memory_list
 #define ACPI_OSI_WIN_8                  0x0C
 
 
+/* Definitions of file IO */
+
+#define ACPI_FILE_READING               0x01
+#define ACPI_FILE_WRITING               0x02
+#define ACPI_FILE_BINARY                0x04
+
+#define ACPI_FILE_BEGIN                 0x01
+#define ACPI_FILE_END                   0x02
+
+
+/* Definitions of getopt */
+
+#define ACPI_OPT_END                    -1
+
+
 #endif /* __ACTYPES_H__ */
diff --git a/sys/contrib/dev/acpica/include/acutils.h b/sys/contrib/dev/acpica/include/acutils.h
index c80dd36ca4f6..8031fd3734de 100644
--- a/sys/contrib/dev/acpica/include/acutils.h
+++ b/sys/contrib/dev/acpica/include/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ extern const UINT8                      AcpiGbl_ResourceAmlSerialBusSizes[];
 
 /* Strings used by the disassembler and debugger resource dump routines */
 
-#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
+#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
 
 extern const char                       *AcpiGbl_BmDecode[];
 extern const char                       *AcpiGbl_ConfigDecode[];
@@ -96,7 +96,6 @@ extern const char                       *AcpiGbl_PtDecode[];
 #ifdef ACPI_ASL_COMPILER
 
 #include <stdio.h>
-extern FILE                 *AcpiGbl_OutputFile;
 
 #define ACPI_MSG_REDIRECT_BEGIN \
     FILE                    *OutputFile = AcpiGbl_OutputFile; \
@@ -189,8 +188,8 @@ AcpiUtGetMutexName (
 
 const char *
 AcpiUtGetNotifyName (
-    UINT32                  NotifyValue);
-
+    UINT32                  NotifyValue,
+    ACPI_OBJECT_TYPE        Type);
 #endif
 
 char *
@@ -226,6 +225,10 @@ AcpiUtHexToAsciiChar (
     UINT64                  Integer,
     UINT32                  Position);
 
+UINT8
+AcpiUtAsciiCharToHex (
+    int                     HexChar);
+
 BOOLEAN
 AcpiUtValidObjectType (
     ACPI_OBJECT_TYPE        Type);
@@ -252,6 +255,11 @@ ACPI_SIZE
 AcpiUtStrlen (
     const char              *String);
 
+char *
+AcpiUtStrchr (
+    const char              *String,
+    int                     ch);
+
 char *
 AcpiUtStrcpy (
     char                    *DstString,
@@ -340,7 +348,7 @@ extern const UINT8 _acpi_ctype[];
 #define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD))
 #define ACPI_IS_UPPER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
 #define ACPI_IS_LOWER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
-#define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU))
+#define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_XS | _ACPI_PU))
 #define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
 
 #endif /* !ACPI_USE_SYSTEM_CLIBRARY */
@@ -482,6 +490,16 @@ AcpiUtDumpBuffer (
     UINT32                  Display,
     UINT32                  Offset);
 
+#ifdef ACPI_APPLICATION
+void
+AcpiUtDumpBufferToFile (
+    ACPI_FILE               File,
+    UINT8                   *Buffer,
+    UINT32                  Count,
+    UINT32                  Display,
+    UINT32                  BaseOffset);
+#endif
+
 void
 AcpiUtReportError (
     char                    *ModuleName,
@@ -550,6 +568,17 @@ AcpiUtExecutePowerMethods (
     UINT8                   *OutValues);
 
 
+/*
+ * utfileio - file operations
+ */
+#ifdef ACPI_APPLICATION
+ACPI_STATUS
+AcpiUtReadTableFromFile (
+    char                    *Filename,
+    ACPI_TABLE_HEADER       **Table);
+#endif
+
+
 /*
  * utids - device ID support
  */
@@ -926,6 +955,29 @@ void
 AcpiUtRepairName (
     char                    *Name);
 
+#if defined (ACPI_DEBUGGER) || defined (ACPI_APPLICATION)
+BOOLEAN
+AcpiUtSafeStrcpy (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source);
+
+BOOLEAN
+AcpiUtSafeStrcat (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source);
+
+#ifndef _KERNEL
+BOOLEAN
+AcpiUtSafeStrncat (
+    char                    *Dest,
+    ACPI_SIZE               DestSize,
+    char                    *Source,
+    ACPI_SIZE               MaxTransferLength);
+#endif
+#endif
+
 
 /*
  * utmutex - mutex support
@@ -967,20 +1019,6 @@ AcpiUtInitializeBuffer (
     ACPI_BUFFER             *Buffer,
     ACPI_SIZE               RequiredLength);
 
-void *
-AcpiUtAllocate (
-    ACPI_SIZE               Size,
-    UINT32                  Component,
-    const char              *Module,
-    UINT32                  Line);
-
-void *
-AcpiUtAllocateZeroed (
-    ACPI_SIZE               Size,
-    UINT32                  Component,
-    const char              *Module,
-    UINT32                  Line);
-
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 void *
 AcpiUtAllocateAndTrack (
@@ -1092,4 +1130,68 @@ AcpiUtMethodError (
     const char              *Path,
     ACPI_STATUS             LookupStatus);
 
+/*
+ * Utility functions for ACPI names and IDs
+ */
+const AH_PREDEFINED_NAME *
+AcpiAhMatchPredefinedName (
+    char                    *Nameseg);
+
+const AH_DEVICE_ID *
+AcpiAhMatchHardwareId (
+    char                    *Hid);
+
+const char *
+AcpiAhMatchUuid (
+    UINT8                   *Data);
+
+/*
+ * utprint - printf/vprintf output functions
+ */
+const char *
+AcpiUtScanNumber (
+    const char              *String,
+    UINT64                  *NumberPtr);
+
+const char *
+AcpiUtPrintNumber (
+    char                    *String,
+    UINT64                  Number);
+
+int
+AcpiUtVsnprintf (
+    char                    *String,
+    ACPI_SIZE               Size,
+    const char              *Format,
+    va_list                 Args);
+
+int
+AcpiUtSnprintf (
+    char                    *String,
+    ACPI_SIZE               Size,
+    const char              *Format,
+    ...);
+
+#ifdef ACPI_APPLICATION
+int
+AcpiUtFileVprintf (
+    ACPI_FILE               File,
+    const char              *Format,
+    va_list                 Args);
+
+int
+AcpiUtFilePrintf (
+    ACPI_FILE               File,
+    const char              *Format,
+    ...);
+#endif
+
+/*
+ * utuuid -- UUID support functions
+ */
+void
+AcpiUtConvertStringToUuid (
+    char                    *InString,
+    UINT8                   *UuidBuffer);
+
 #endif /* _ACUTILS_H */
diff --git a/sys/contrib/dev/acpica/include/amlcode.h b/sys/contrib/dev/acpica/include/amlcode.h
index 66af4c2507d5..bc8c0b0d3dd0 100644
--- a/sys/contrib/dev/acpica/include/amlcode.h
+++ b/sys/contrib/dev/acpica/include/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/amlresrc.h b/sys/contrib/dev/acpica/include/amlresrc.h
index 8e68559064f2..cd8b3b638c9e 100644
--- a/sys/contrib/dev/acpica/include/amlresrc.h
+++ b/sys/contrib/dev/acpica/include/amlresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -122,6 +122,14 @@ typedef struct asl_resource_node
 
 } ASL_RESOURCE_NODE;
 
+typedef struct asl_resource_info
+{
+    ACPI_PARSE_OBJECT               *DescriptorTypeOp;  /* Resource descriptor parse node */
+    ACPI_PARSE_OBJECT               *MappingOp;         /* Used for mapfile support */
+    UINT32                          CurrentByteOffset;  /* Offset in resource template */
+
+} ASL_RESOURCE_INFO;
+
 
 /* Macros used to generate AML resource length fields */
 
@@ -574,4 +582,50 @@ typedef union aml_resource
 
 } AML_RESOURCE;
 
+
+/* Interfaces used by both the disassembler and compiler */
+
+void
+MpSaveGpioInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    AML_RESOURCE            *Resource,
+    UINT32                  PinCount,
+    UINT16                  *PinList,
+    char                    *DeviceName);
+
+void
+MpSaveSerialInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    AML_RESOURCE            *Resource,
+    char                    *DeviceName);
+
+char *
+MpGetHidFromParseTree (
+    ACPI_NAMESPACE_NODE     *HidNode);
+
+char *
+MpGetHidViaNamestring (
+    char                    *DeviceName);
+
+char *
+MpGetConnectionInfo (
+    ACPI_PARSE_OBJECT       *Op,
+    UINT32                  PinIndex,
+    ACPI_NAMESPACE_NODE     **TargetNode,
+    char                    **TargetName);
+
+char *
+MpGetParentDeviceHid (
+    ACPI_PARSE_OBJECT       *Op,
+    ACPI_NAMESPACE_NODE     **TargetNode,
+    char                    **ParentDeviceName);
+
+char *
+MpGetDdnValue (
+    char                    *DeviceName);
+
+char *
+MpGetHidValue (
+    ACPI_NAMESPACE_NODE     *DeviceNode);
+
 #endif
diff --git a/sys/contrib/dev/acpica/include/platform/acenv.h b/sys/contrib/dev/acpica/include/platform/acenv.h
index 6866de26d9f8..8b8e890d0bcb 100644
--- a/sys/contrib/dev/acpica/include/platform/acenv.h
+++ b/sys/contrib/dev/acpica/include/platform/acenv.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,32 +88,55 @@
 #define ACPI_DBG_TRACK_ALLOCATIONS
 #endif
 
-/* AcpiNames configuration. Single threaded with debugger output enabled. */
-
-#ifdef ACPI_NAMES_APP
-#define ACPI_DEBUGGER
-#define ACPI_APPLICATION
-#define ACPI_SINGLE_THREADED
-#endif
-
 /*
- * AcpiBin/AcpiDump/AcpiSrc/AcpiXtract configuration. All single
- * threaded, with no debug output.
+ * AcpiBin/AcpiDump/AcpiHelp/AcpiNames/AcpiSrc/AcpiXtract/Example configuration.
+ * All single threaded.
  */
-#if (defined ACPI_BIN_APP)   || \
-    (defined ACPI_DUMP_APP)  || \
-    (defined ACPI_SRC_APP)   || \
-    (defined ACPI_XTRACT_APP)
+#if (defined ACPI_BIN_APP)      || \
+    (defined ACPI_DUMP_APP)     || \
+    (defined ACPI_HELP_APP)     || \
+    (defined ACPI_NAMES_APP)    || \
+    (defined ACPI_SRC_APP)      || \
+    (defined ACPI_XTRACT_APP)   || \
+    (defined ACPI_EXAMPLE_APP)
 #define ACPI_APPLICATION
 #define ACPI_SINGLE_THREADED
 #endif
 
+/* AcpiHelp configuration. Error messages disabled. */
+
 #ifdef ACPI_HELP_APP
-#define ACPI_APPLICATION
-#define ACPI_SINGLE_THREADED
 #define ACPI_NO_ERROR_MESSAGES
 #endif
 
+/* AcpiNames configuration. Debug output enabled. */
+
+#ifdef ACPI_NAMES_APP
+#define ACPI_DEBUG_OUTPUT
+#endif
+
+/* AcpiExec/AcpiNames/Example configuration. Native RSDP used. */
+
+#if (defined ACPI_EXEC_APP)     || \
+    (defined ACPI_EXAMPLE_APP)  || \
+    (defined ACPI_NAMES_APP)
+#define ACPI_USE_NATIVE_RSDP_POINTER
+#endif
+
+/* AcpiDump configuration. Native mapping used if provied by OSPMs */
+
+#ifdef ACPI_DUMP_APP
+#define ACPI_USE_NATIVE_MEMORY_MAPPING
+#define USE_NATIVE_ALLOCATE_ZEROED
+#endif
+
+/* AcpiNames/Example configuration. Hardware disabled */
+
+#if (defined ACPI_EXAMPLE_APP)  || \
+    (defined ACPI_NAMES_APP)
+#define ACPI_REDUCED_HARDWARE 1
+#endif
+
 /* Linkable ACPICA library */
 
 #ifdef ACPI_LIBRARY
@@ -184,6 +207,9 @@
 #elif defined(_AED_EFI)
 #include "acefi.h"
 
+#elif defined(_GNU_EFI)
+#include "acefi.h"
+
 #elif defined(__HAIKU__)
 #include "achaiku.h"
 
@@ -396,4 +422,17 @@ typedef char *va_list;
 
 #endif /* ACPI_USE_SYSTEM_CLIBRARY */
 
+#ifndef ACPI_FILE
+#ifdef ACPI_APPLICATION
+#include <stdio.h>
+#define ACPI_FILE              FILE *
+#define ACPI_FILE_OUT          stdout
+#define ACPI_FILE_ERR          stderr
+#else
+#define ACPI_FILE              void *
+#define ACPI_FILE_OUT          NULL
+#define ACPI_FILE_ERR          NULL
+#endif /* ACPI_APPLICATION */
+#endif /* ACPI_FILE */
+
 #endif /* __ACENV_H__ */
diff --git a/sys/contrib/dev/acpica/include/platform/acenvex.h b/sys/contrib/dev/acpica/include/platform/acenvex.h
new file mode 100644
index 000000000000..a1de87ffee25
--- /dev/null
+++ b/sys/contrib/dev/acpica/include/platform/acenvex.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ * Name: acenvex.h - Extra host and compiler configuration
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#ifndef __ACENVEX_H__
+#define __ACENVEX_H__
+
+/*! [Begin] no source code translation */
+
+/******************************************************************************
+ *
+ * Extra host configuration files. All ACPICA headers are included before
+ * including these files.
+ *
+ *****************************************************************************/
+
+#if defined(_LINUX) || defined(__linux__)
+#include "aclinuxex.h"
+
+#endif
+
+/*! [End] no source code translation !*/
+
+#endif /* __ACENVEX_H__ */
diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h
index 34786c32e235..ab4dc9830fcd 100644
--- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h
+++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/contrib/dev/acpica/include/platform/acgcc.h b/sys/contrib/dev/acpica/include/platform/acgcc.h
index 1662a9bb81c7..23db3248f520 100644
--- a/sys/contrib/dev/acpica/include/platform/acgcc.h
+++ b/sys/contrib/dev/acpica/include/platform/acgcc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 /* Function name is used for debug output. Non-ANSI, compiler-dependent */
 
-#define ACPI_GET_FUNCTION_NAME          __FUNCTION__
+#define ACPI_GET_FUNCTION_NAME          __func__
 
 /*
  * This macro is used to tag functions as "printf-like" because
@@ -64,4 +64,15 @@
  */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
 
+/*
+ * Some versions of gcc implement strchr() with a buggy macro. So,
+ * undef it here. Prevents error messages of this form (usually from the
+ * file getopt.c):
+ *
+ * error: logical '&&' with non-zero constant will always evaluate as true
+ */
+#ifdef strchr
+#undef strchr
+#endif
+
 #endif /* __ACGCC_H__ */
diff --git a/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c b/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
new file mode 100644
index 000000000000..9f55cc7d9009
--- /dev/null
+++ b/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
@@ -0,0 +1,255 @@
+/******************************************************************************
+ *
+ * Module Name: oslibcfs - C library OSL for file I/O
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ */
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#define _COMPONENT          ACPI_OS_SERVICES
+        ACPI_MODULE_NAME    ("oslibcfs")
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsOpenFile
+ *
+ * PARAMETERS:  Path                - File path
+ *              Modes               - File operation type
+ *
+ * RETURN:      File descriptor.
+ *
+ * DESCRIPTION: Open a file for reading (ACPI_FILE_READING) or/and writing
+ *              (ACPI_FILE_WRITING).
+ *
+ ******************************************************************************/
+
+ACPI_FILE
+AcpiOsOpenFile (
+    const char              *Path,
+    UINT8                   Modes)
+{
+    ACPI_FILE               File;
+    UINT32                  i = 0;
+    char                    ModesStr[4];
+
+
+    if (Modes & ACPI_FILE_READING)
+    {
+        ModesStr[i++] = 'r';
+    }
+    if (Modes & ACPI_FILE_WRITING)
+    {
+        ModesStr[i++] = 'w';
+    }
+    if (Modes & ACPI_FILE_BINARY)
+    {
+        ModesStr[i++] = 'b';
+    }
+
+    ModesStr[i++] = '\0';
+
+    File = fopen (Path, ModesStr);
+    if (!File)
+    {
+        perror ("Could not open file");
+    }
+
+    return (File);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsCloseFile
+ *
+ * PARAMETERS:  File                - An open file descriptor
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Close a file opened via AcpiOsOpenFile.
+ *
+ ******************************************************************************/
+
+void
+AcpiOsCloseFile (
+    ACPI_FILE               File)
+{
+    fclose (File);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsReadFile
+ *
+ * PARAMETERS:  File                - An open file descriptor
+ *              Buffer              - Data buffer
+ *              Size                - Data block size
+ *              Count               - Number of data blocks
+ *
+ * RETURN:      Number of bytes actually read.
+ *
+ * DESCRIPTION: Read from a file.
+ *
+ ******************************************************************************/
+
+int
+AcpiOsReadFile (
+    ACPI_FILE               File,
+    void                    *Buffer,
+    ACPI_SIZE               Size,
+    ACPI_SIZE               Count)
+{
+    int                     Length;
+
+
+    Length = fread (Buffer, Size, Count, File);
+    if (Length < 0)
+    {
+        perror ("Error reading file");
+    }
+
+    return (Length);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsWriteFile
+ *
+ * PARAMETERS:  File                - An open file descriptor
+ *              Buffer              - Data buffer
+ *              Size                - Data block size
+ *              Count               - Number of data blocks
+ *
+ * RETURN:      Number of bytes actually written.
+ *
+ * DESCRIPTION: Write to a file.
+ *
+ ******************************************************************************/
+
+int
+AcpiOsWriteFile (
+    ACPI_FILE               File,
+    void                    *Buffer,
+    ACPI_SIZE               Size,
+    ACPI_SIZE               Count)
+{
+    int                     Length;
+
+
+    Length = fwrite (Buffer, Size, Count, File);
+    if (Length < 0)
+    {
+        perror ("Error writing file");
+    }
+
+    return (Length);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsGetFileOffset
+ *
+ * PARAMETERS:  File                - An open file descriptor
+ *
+ * RETURN:      Current file pointer position.
+ *
+ * DESCRIPTION: Get current file offset.
+ *
+ ******************************************************************************/
+
+long
+AcpiOsGetFileOffset (
+    ACPI_FILE               File)
+{
+    long                    Offset;
+
+
+    Offset = ftell (File);
+    return (Offset);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiOsSetFileOffset
+ *
+ * PARAMETERS:  File                - An open file descriptor
+ *              Offset              - New file offset
+ *              From                - From begin/end of file
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Set current file offset.
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AcpiOsSetFileOffset (
+    ACPI_FILE               File,
+    long                    Offset,
+    UINT8                   From)
+{
+    int                     Ret = 0;
+
+
+    if (From == ACPI_FILE_BEGIN)
+    {
+        Ret = fseek (File, Offset, SEEK_SET);
+    }
+    if (From == ACPI_FILE_END)
+    {
+        Ret = fseek (File, Offset, SEEK_END);
+    }
+
+    if (Ret < 0)
+    {
+        return (AE_ERROR);
+    }
+    else
+    {
+        return (AE_OK);
+    }
+}
diff --git a/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c b/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
index 31bb471bb7b0..d4febe283b2c 100644
--- a/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
+++ b/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 /*
  * These interfaces are required in order to compile the ASL compiler and the
  * various ACPICA tools under Linux or other Unix-like system.
@@ -65,16 +64,11 @@
         ACPI_MODULE_NAME    ("osunixxf")
 
 
-extern FILE                    *AcpiGbl_DebugFile;
-FILE                           *AcpiGbl_OutputFile;
+BOOLEAN                        AcpiGbl_DebugTimeout = FALSE;
 
 
 /* Upcalls to AcpiExec */
 
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
-    void);
-
 void
 AeTableOverride (
     ACPI_TABLE_HEADER       *ExistingTable,
@@ -84,7 +78,127 @@ typedef void* (*PTHREAD_CALLBACK) (void *);
 
 /* Buffer used by AcpiOsVprintf */
 
-#define ACPI_VPRINTF_BUFFER_SIZE        512
+#define ACPI_VPRINTF_BUFFER_SIZE    512
+#define _ASCII_NEWLINE              '\n'
+
+/* Terminal support for AcpiExec only */
+
+#ifdef ACPI_EXEC_APP
+#include <termios.h>
+
+struct termios              OriginalTermAttributes;
+int                         TermAttributesWereSet = 0;
+
+ACPI_STATUS
+AcpiUtReadLine (
+    char                    *Buffer,
+    UINT32                  BufferLength,
+    UINT32                  *BytesRead);
+
+static void
+OsEnterLineEditMode (
+    void);
+
+static void
+OsExitLineEditMode (
+    void);
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    OsEnterLineEditMode, OsExitLineEditMode
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Enter/Exit the raw character input mode for the terminal.
+ *
+ * Interactive line-editing support for the AML debugger. Used with the
+ * common/acgetline module.
+ *
+ * readline() is not used because of non-portability. It is not available
+ * on all systems, and if it is, often the package must be manually installed.
+ *
+ * Therefore, we use the POSIX tcgetattr/tcsetattr and do the minimal line
+ * editing that we need in AcpiOsGetLine.
+ *
+ * If the POSIX tcgetattr/tcsetattr interfaces are unavailable, these
+ * calls will also work:
+ *     For OsEnterLineEditMode: system ("stty cbreak -echo")
+ *     For OsExitLineEditMode:  system ("stty cooked echo")
+ *
+ *****************************************************************************/
+
+static void
+OsEnterLineEditMode (
+    void)
+{
+    struct termios          LocalTermAttributes;
+
+
+    TermAttributesWereSet = 0;
+
+    /* STDIN must be a terminal */
+
+    if (!isatty (STDIN_FILENO))
+    {
+        return;
+    }
+
+    /* Get and keep the original attributes */
+
+    if (tcgetattr (STDIN_FILENO, &OriginalTermAttributes))
+    {
+        fprintf (stderr, "Could not get terminal attributes!\n");
+        return;
+    }
+
+    /* Set the new attributes to enable raw character input */
+
+    memcpy (&LocalTermAttributes, &OriginalTermAttributes,
+        sizeof (struct termios));
+
+    LocalTermAttributes.c_lflag &= ~(ICANON | ECHO);
+    LocalTermAttributes.c_cc[VMIN] = 1;
+    LocalTermAttributes.c_cc[VTIME] = 0;
+
+    if (tcsetattr (STDIN_FILENO, TCSANOW, &LocalTermAttributes))
+    {
+        fprintf (stderr, "Could not set terminal attributes!\n");
+        return;
+    }
+
+    TermAttributesWereSet = 1;
+}
+
+
+static void
+OsExitLineEditMode (
+    void)
+{
+
+    if (!TermAttributesWereSet)
+    {
+        return;
+    }
+
+    /* Set terminal attributes back to the original values */
+
+    if (tcsetattr (STDIN_FILENO, TCSANOW, &OriginalTermAttributes))
+    {
+        fprintf (stderr, "Could not restore terminal attributes!\n");
+    }
+}
+
+
+#else
+
+/* These functions are not needed for other ACPICA utilities */
+
+#define OsEnterLineEditMode()
+#define OsExitLineEditMode()
+#endif
 
 
 /******************************************************************************
@@ -95,7 +209,7 @@ typedef void* (*PTHREAD_CALLBACK) (void *);
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Init and terminate. Nothing to do.
+ * DESCRIPTION: Initialize and terminate this module.
  *
  *****************************************************************************/
 
@@ -103,21 +217,33 @@ ACPI_STATUS
 AcpiOsInitialize (
     void)
 {
+    ACPI_STATUS            Status;
+
 
     AcpiGbl_OutputFile = stdout;
+
+    OsEnterLineEditMode ();
+
+    Status = AcpiOsCreateLock (&AcpiGbl_PrintLock);
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+
     return (AE_OK);
 }
 
-
 ACPI_STATUS
 AcpiOsTerminate (
     void)
 {
 
+    OsExitLineEditMode ();
     return (AE_OK);
 }
 
 
+#ifndef ACPI_USE_NATIVE_RSDP_POINTER
 /******************************************************************************
  *
  * FUNCTION:    AcpiOsGetRootPointer
@@ -135,8 +261,9 @@ AcpiOsGetRootPointer (
     void)
 {
 
-    return (AeLocalGetRootPointer ());
+    return (0);
 }
+#endif
 
 
 /******************************************************************************
@@ -370,6 +497,7 @@ AcpiOsVprintf (
 }
 
 
+#ifndef ACPI_EXEC_APP
 /******************************************************************************
  *
  * FUNCTION:    AcpiOsGetLine
@@ -380,7 +508,9 @@ AcpiOsVprintf (
  *
  * RETURN:      Status and actual bytes read
  *
- * DESCRIPTION: Formatted input with argument list pointer
+ * DESCRIPTION: Get the next input line from the terminal. NOTE: For the
+ *              AcpiExec utility, we use the acgetline module instead to
+ *              provide line-editing and history support.
  *
  *****************************************************************************/
 
@@ -390,44 +520,49 @@ AcpiOsGetLine (
     UINT32                  BufferLength,
     UINT32                  *BytesRead)
 {
-    int                     Temp;
-    UINT32                  i;
+    int                     InputChar;
+    UINT32                  EndOfLine;
 
 
-    for (i = 0; ; i++)
+    /* Standard AcpiOsGetLine for all utilities except AcpiExec */
+
+    for (EndOfLine = 0; ; EndOfLine++)
     {
-        if (i >= BufferLength)
+        if (EndOfLine >= BufferLength)
         {
             return (AE_BUFFER_OVERFLOW);
         }
 
-        if ((Temp = getchar ()) == EOF)
+        if ((InputChar = getchar ()) == EOF)
         {
             return (AE_ERROR);
         }
 
-        if (!Temp || Temp == '\n')
+        if (!InputChar || InputChar == _ASCII_NEWLINE)
         {
             break;
         }
 
-        Buffer [i] = (char) Temp;
+        Buffer[EndOfLine] = (char) InputChar;
     }
 
     /* Null terminate the buffer */
 
-    Buffer [i] = 0;
+    Buffer[EndOfLine] = 0;
 
     /* Return the number of bytes in the string */
 
     if (BytesRead)
     {
-        *BytesRead = i;
+        *BytesRead = EndOfLine;
     }
+
     return (AE_OK);
 }
+#endif
 
 
+#ifndef ACPI_USE_NATIVE_MEMORY_MAPPING
 /******************************************************************************
  *
  * FUNCTION:    AcpiOsMapMemory
@@ -473,6 +608,7 @@ AcpiOsUnmapMemory (
 
     return;
 }
+#endif
 
 
 /******************************************************************************
@@ -499,6 +635,32 @@ AcpiOsAllocate (
 }
 
 
+#ifdef USE_NATIVE_ALLOCATE_ZEROED
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiOsAllocateZeroed
+ *
+ * PARAMETERS:  Size                - Amount to allocate, in bytes
+ *
+ * RETURN:      Pointer to the new allocation. Null on error.
+ *
+ * DESCRIPTION: Allocate and zero memory. Algorithm is dependent on the OS.
+ *
+ *****************************************************************************/
+
+void *
+AcpiOsAllocateZeroed (
+    ACPI_SIZE               size)
+{
+    void                    *Mem;
+
+
+    Mem = (void *) calloc (1, (size_t) size);
+    return (Mem);
+}
+#endif
+
+
 /******************************************************************************
  *
  * FUNCTION:    AcpiOsFree
@@ -1005,7 +1167,7 @@ AcpiOsGetTimer (
  * FUNCTION:    AcpiOsReadPciConfiguration
  *
  * PARAMETERS:  PciId               - Seg/Bus/Dev
- *              Register            - Device Register
+ *              PciRegister         - Device Register
  *              Value               - Buffer where value is placed
  *              Width               - Number of bits
  *
@@ -1018,7 +1180,7 @@ AcpiOsGetTimer (
 ACPI_STATUS
 AcpiOsReadPciConfiguration (
     ACPI_PCI_ID             *PciId,
-    UINT32                  Register,
+    UINT32                  PciRegister,
     UINT64                  *Value,
     UINT32                  Width)
 {
@@ -1033,7 +1195,7 @@ AcpiOsReadPciConfiguration (
  * FUNCTION:    AcpiOsWritePciConfiguration
  *
  * PARAMETERS:  PciId               - Seg/Bus/Dev
- *              Register            - Device Register
+ *              PciRegister         - Device Register
  *              Value               - Value to be written
  *              Width               - Number of bits
  *
@@ -1046,7 +1208,7 @@ AcpiOsReadPciConfiguration (
 ACPI_STATUS
 AcpiOsWritePciConfiguration (
     ACPI_PCI_ID             *PciId,
-    UINT32                  Register,
+    UINT32                  PciRegister,
     UINT64                  Value,
     UINT32                  Width)
 {
@@ -1242,7 +1404,7 @@ AcpiOsWritable (
  *
  * FUNCTION:    AcpiOsSignal
  *
- * PARAMETERS:  Function            - ACPI CA signal function code
+ * PARAMETERS:  Function            - ACPI A signal function code
  *              Info                - Pointer to function-dependent structure
  *
  * RETURN:      Status
@@ -1334,6 +1496,26 @@ AcpiOsExecute (
     return (0);
 }
 
+#else /* ACPI_SINGLE_THREADED */
+ACPI_THREAD_ID
+AcpiOsGetThreadId (
+    void)
+{
+    return (1);
+}
+
+ACPI_STATUS
+AcpiOsExecute (
+    ACPI_EXECUTE_TYPE       Type,
+    ACPI_OSD_EXEC_CALLBACK  Function,
+    void                    *Context)
+{
+
+    Function (Context);
+
+    return (AE_OK);
+}
+
 #endif /* ACPI_SINGLE_THREADED */
 
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
index 73b902f1b299..30c55a077ffe 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
@@ -1181,10 +1181,11 @@ struct ath_hal;
 
 extern  struct ath_hal_9300 * ar9300_new_state(u_int16_t devid,
         HAL_SOFTC sc, HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+        HAL_OPS_CONFIG *ah_config,
         HAL_STATUS *status);
 extern  struct ath_hal * ar9300_attach(u_int16_t devid,
         HAL_SOFTC sc, HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
-        HAL_STATUS *status);
+        HAL_OPS_CONFIG *ah_config, HAL_STATUS *status);
 extern  void ar9300_detach(struct ath_hal *ah);
 extern void ar9300_read_revisions(struct ath_hal *ah);
 extern  HAL_BOOL ar9300_chip_test(struct ath_hal *ah);
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
index 9cc99ec701f0..80dc2a3b3068 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
@@ -618,7 +618,8 @@ ar9300_read_revisions(struct ath_hal *ah)
  */
 struct ath_hal *
 ar9300_attach(u_int16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st,
-  HAL_BUS_HANDLE sh, uint16_t *eepromdata, HAL_STATUS *status)
+  HAL_BUS_HANDLE sh, uint16_t *eepromdata, HAL_OPS_CONFIG *ah_config,
+  HAL_STATUS *status)
 {
     struct ath_hal_9300     *ahp;
     struct ath_hal          *ah;
@@ -628,7 +629,7 @@ ar9300_attach(u_int16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st,
     HAL_NO_INTERSPERSED_READS;
 
     /* NB: memory is returned zero'd */
-    ahp = ar9300_new_state(devid, sc, st, sh, eepromdata, status);
+    ahp = ar9300_new_state(devid, sc, st, sh, eepromdata, ah_config, status);
     if (ahp == AH_NULL) {
         return AH_NULL;
     }
@@ -654,12 +655,6 @@ ar9300_attach(u_int16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st,
     /* XXX FreeBSD: enable RX mitigation */
     ah->ah_config.ath_hal_intr_mitigation_rx = 1;
 
-    /*
-     * XXX what's this do? Check in the qcamain driver code
-     * as to what it does.
-     */
-    ah->ah_config.ath_hal_ext_atten_margin_cfg = 0;
-
     /* interrupt mitigation */
 #ifdef AR5416_INT_MITIGATION
     if (ah->ah_config.ath_hal_intr_mitigation_rx != 0) {
@@ -2378,7 +2373,9 @@ ar9300_detach(struct ath_hal *ah)
 struct ath_hal_9300 *
 ar9300_new_state(u_int16_t devid, HAL_SOFTC sc,
     HAL_BUS_TAG st, HAL_BUS_HANDLE sh,
-    uint16_t *eepromdata, HAL_STATUS *status)
+    uint16_t *eepromdata,
+    HAL_OPS_CONFIG *ah_config,
+    HAL_STATUS *status)
 {
     static const u_int8_t defbssidmask[IEEE80211_ADDR_LEN] =
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -2430,7 +2427,7 @@ ar9300_new_state(u_int16_t devid, HAL_SOFTC sc,
     ** Initialize factory defaults in the private space
     */
 //    ath_hal_factory_defaults(AH_PRIVATE(ah), hal_conf_parm);
-    ar9300_config_defaults_freebsd(ah);
+    ar9300_config_defaults_freebsd(ah, ah_config);
 
     /* XXX FreeBSD: cal is always in EEPROM */
 #if 0
@@ -2456,6 +2453,7 @@ ar9300_new_state(u_int16_t devid, HAL_SOFTC sc,
     AH_PRIVATE(ah)->ah_tpScale = HAL_TP_SCALE_MAX;  /* no scaling */
 
     ahp->ah_atim_window = 0;         /* [0..1000] */
+
     ahp->ah_diversity_control =
         ah->ah_config.ath_hal_diversity_control;
     ahp->ah_antenna_switch_swap =
@@ -3835,6 +3833,11 @@ ar9300_ant_div_comb_get_config(struct ath_hal *ah,
     } else {
         div_comb_conf->antdiv_configgroup = DEFAULT_ANTDIV_CONFIG_GROUP;
     }
+
+    /*
+     * XXX TODO: allow the HAL to override the rssithres and fast_div_bias
+     * values (eg CUS198.)
+     */
 }
 
 void
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
index ba7777e3079b..669104a00c55 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
@@ -1606,6 +1606,7 @@ HAL_BOOL ar9300_ant_ctrl_apply(struct ath_hal *ah, HAL_BOOL is_2ghz)
     if ( AR_SREV_POSEIDON(ah) && (ahp->ah_lna_div_use_bt_ant_enable == TRUE) ) {
         value &= ~AR_SWITCH_TABLE_COM2_ALL;
         value |= ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable;
+	HALDEBUG(ah, HAL_DEBUG_RESET, "%s: com2=0x%08x\n", __func__, value)
     }
 #endif  /* ATH_ANT_DIV_COMB */
     OS_REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, value);
@@ -1711,6 +1712,8 @@ HAL_BOOL ar9300_ant_ctrl_apply(struct ath_hal *ah, HAL_BOOL is_2ghz)
             /* For WB225, need to swith ANT2 from BT to Wifi
              * This will not affect HB125 LNA diversity feature.
              */
+	     HALDEBUG(ah, HAL_DEBUG_RESET, "%s: com2=0x%08x\n", __func__,
+	         ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable)
             OS_REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, 
                 ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable);
             break;
@@ -1776,6 +1779,7 @@ ar9300_attenuation_margin_chain_get(struct ath_hal *ah, int chain,
     return 0;
 }
 
+#if 0
 HAL_BOOL ar9300_attenuation_apply(struct ath_hal *ah, u_int16_t channel)
 {
     u_int32_t value;
@@ -1814,6 +1818,75 @@ HAL_BOOL ar9300_attenuation_apply(struct ath_hal *ah, u_int16_t channel)
     }
     return 0;
 }
+#endif
+HAL_BOOL
+ar9300_attenuation_apply(struct ath_hal *ah, u_int16_t channel)
+{
+	int i;
+	uint32_t value;
+	uint32_t ext_atten_reg[3] = {
+	    AR_PHY_EXT_ATTEN_CTL_0,
+	    AR_PHY_EXT_ATTEN_CTL_1,
+	    AR_PHY_EXT_ATTEN_CTL_2
+	};
+
+	/*
+	 * If it's an AR9462 and we're receiving on the second
+	 * chain only, set the chain 0 details from chain 1
+	 * calibration.
+	 *
+	 * This is from ath9k.
+	 */
+	if (AR_SREV_JUPITER(ah) && (AH9300(ah)->ah_rx_chainmask == 0x2)) {
+		value = ar9300_attenuation_chain_get(ah, 1, channel);
+		OS_REG_RMW_FIELD(ah, ext_atten_reg[0],
+		    AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB, value);
+		value = ar9300_attenuation_margin_chain_get(ah, 1, channel);
+		OS_REG_RMW_FIELD(ah, ext_atten_reg[0],
+		    AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN, value);
+	}
+
+	/*
+	 * Now, loop over the configured transmit chains and
+	 * load in the attenuation/margin settings as appropriate.
+	 */
+	for (i = 0; i < 3; i++) {
+		if ((AH9300(ah)->ah_tx_chainmask & (1 << i)) == 0)
+			continue;
+
+		value = ar9300_attenuation_chain_get(ah, i, channel);
+		OS_REG_RMW_FIELD(ah, ext_atten_reg[i],
+		    AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB,
+		    value);
+
+		if (AR_SREV_POSEIDON(ah) &&
+		    (ar9300_rx_gain_index_get(ah) == 0) &&
+		    ah->ah_config.ath_hal_ext_atten_margin_cfg) {
+			value = 5;
+		} else {
+			value = ar9300_attenuation_margin_chain_get(ah, 0,
+			    channel);
+		}
+
+		/*
+		 * I'm not sure why it's loading in this setting into
+		 * the chain 0 margin regardless of the current chain.
+		 */
+		if (ah->ah_config.ath_hal_min_gainidx)
+			OS_REG_RMW_FIELD(ah,
+			    AR_PHY_EXT_ATTEN_CTL_0,
+			    AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
+			    value);
+
+		OS_REG_RMW_FIELD(ah,
+		    ext_atten_reg[i],
+		    AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
+		    value);
+	}
+
+	return (0);
+}
+
 
 static u_int16_t ar9300_quick_drop_get(struct ath_hal *ah, 
 								int chain, u_int16_t channel)
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
index a2cc25d741ea..a6968c173484 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
@@ -70,9 +70,6 @@ void
 ar9300_attach_freebsd_ops(struct ath_hal *ah)
 {
 
-	/* stub everything first */
-	ar9300_set_stub_functions(ah);
-
 	/* Global functions */
 	ah->ah_detach		= ar9300_detach;
 	ah->ah_getRateTable		= ar9300_get_rate_table;
@@ -255,9 +252,6 @@ ar9300_attach_freebsd_ops(struct ath_hal *ah)
 	/* LNA diversity functions */
 	ah->ah_divLnaConfGet = ar9300_ant_div_comb_get_config;
 	ah->ah_divLnaConfSet = ar9300_ant_div_comb_set_config;
-
-	/* Setup HAL configuration defaults */
-	ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable = 0x000bbb88;
 }
 
 HAL_BOOL
@@ -341,9 +335,11 @@ ar9300_ani_poll_freebsd(struct ath_hal *ah,
  * wants.
  */
 void
-ar9300_config_defaults_freebsd(struct ath_hal *ah)
+ar9300_config_defaults_freebsd(struct ath_hal *ah, HAL_OPS_CONFIG *ah_config)
 {
 
+	/* Until FreeBSD's HAL does this by default - just copy */
+	OS_MEMCPY(&ah->ah_config, ah_config, sizeof(HAL_OPS_CONFIG));
 	ah->ah_config.ath_hal_enable_ani = AH_TRUE;
 }
 
@@ -471,11 +467,13 @@ ar9300_freebsd_setup_x_tx_desc(struct ath_hal *ah, struct ath_desc *ds,
     u_int txRate3, u_int txTries3)
 {
 
+#if 0
 	ath_hal_printf(ah, "%s: called, 0x%x/%d, 0x%x/%d, 0x%x/%d\n",
 	    __func__,
 	    txRate1, txTries1,
 	    txRate2, txTries2,
 	    txRate3, txTries3);
+#endif
 
 	/* XXX should only be called during probe */
 	return (AH_TRUE);
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h
index c07c32fa01b1..524c3f3fce5d 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h
@@ -11,7 +11,8 @@ extern	HAL_STATUS ar9300_eeprom_get_freebsd(struct ath_hal *, int param,
 extern	HAL_BOOL ar9300_stop_tx_dma_freebsd(struct ath_hal *ah, u_int q);
 extern	void ar9300_ani_poll_freebsd(struct ath_hal *ah,
 	    const struct ieee80211_channel *chan);
-extern	void ar9300_config_defaults_freebsd(struct ath_hal *ah);
+extern	void ar9300_config_defaults_freebsd(struct ath_hal *ah,
+	    HAL_OPS_CONFIG *ah_config);
 extern	HAL_BOOL ar9300_stop_dma_receive_freebsd(struct ath_hal *ah);
 extern	HAL_BOOL ar9300_get_pending_interrupts_freebsd(struct ath_hal *ah,
 	    HAL_INT *masked);
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
index 1090c9c59ab7..51ce195ff56c 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
@@ -6151,6 +6151,7 @@ ar9300_ant_ctrl_set_lna_div_use_bt_ant(struct ath_hal *ah, HAL_BOOL enable, cons
             value &= ~AR_SWITCH_TABLE_COM2_ALL;
             value |= ah->ah_config.ath_hal_ant_ctrl_comm2g_switch_enable;
         }
+	HALDEBUG(ah, HAL_DEBUG_RESET, "%s: com2=0x%08x\n", __func__, value);
         OS_REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, value);
 
         value = ar9300_eeprom_get(ahp, EEP_ANTDIV_control);
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c
index 2dd9472df269..211e201a1df7 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c
@@ -33,7 +33,7 @@ void
 ar9300_set_stub_functions(struct ath_hal *ah)
 {
 
-	ath_hal_printf(ah, "%s: setting stub functions\n", __func__);
+//	ath_hal_printf(ah, "%s: setting stub functions\n", __func__);
 
 	ah->ah_getRateTable		= ar9300_Stub_GetRateTable;
 //	ah->ah_detach			= ar9300_Stub_detach;
diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.c b/sys/contrib/ipfilter/netinet/ip_dstlist.c
index ce2e72e8130f..d516556c39cc 100644
--- a/sys/contrib/ipfilter/netinet/ip_dstlist.c
+++ b/sys/contrib/ipfilter/netinet/ip_dstlist.c
@@ -1134,7 +1134,7 @@ ipf_dstlist_select(fin, d)
 	int family;
 	int x;
 
-	if (d->ipld_dests == NULL || *d->ipld_dests == NULL)
+	if (d == NULL || d->ipld_dests == NULL || *d->ipld_dests == NULL)
 		return NULL;
 
 	family = fin->fin_family;
@@ -1222,7 +1222,7 @@ ipf_dstlist_select(fin, d)
 		break;
 	}
 
-	if (sel->ipfd_dest.fd_addr.adf_family != family)
+	if (sel && sel->ipfd_dest.fd_addr.adf_family != family)
 		sel = NULL;
 	d->ipld_selected = sel;
 
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index fd4ff2449abf..831326c2978a 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -930,7 +930,8 @@ ipf_frag_known(fin, passp)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_natforget                                          */
 /* Returns:     Nil                                                         */
-/* Parameters:  ptr(I) - pointer to data structure                          */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              ptr(I) - pointer to data structure                          */
 /*                                                                          */
 /* Search through all of the fragment cache entries for NAT and wherever a  */
 /* pointer  is found to match ptr, reset it to NULL.                        */
@@ -954,7 +955,8 @@ ipf_frag_natforget(softc, ptr)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_delete                                             */
 /* Returns:     Nil                                                         */
-/* Parameters:  fra(I)   - pointer to fragment structure to delete          */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              fra(I)   - pointer to fragment structure to delete          */
 /*              tail(IO) - pointer to the pointer to the tail of the frag   */
 /*                         list                                             */
 /*                                                                          */
@@ -991,7 +993,10 @@ ipf_frag_delete(softc, fra, tail)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_free                                               */
 /* Returns:     Nil                                                         */
+/* Parameters:  softf(I) - pointer to fragment context information          */
+/*              fra(I)   - pointer to fragment structure to free            */
 /*                                                                          */
+/* Free up a fragment cache entry and bump relevent statistics.             */
 /* ------------------------------------------------------------------------ */
 static void
 ipf_frag_free(softf, fra)
@@ -1007,7 +1012,7 @@ ipf_frag_free(softf, fra)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_clear                                              */
 /* Returns:     Nil                                                         */
-/* Parameters:  Nil                                                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
 /*                                                                          */
 /* Free memory in use by fragment state information kept.  Do the normal    */
 /* fragment state stuff first and then the NAT-fragment table.              */
@@ -1048,7 +1053,7 @@ ipf_frag_clear(softc)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_expire                                             */
 /* Returns:     Nil                                                         */
-/* Parameters:  Nil                                                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
 /*                                                                          */
 /* Expire entries in the fragment cache table that have been there too long */
 /* ------------------------------------------------------------------------ */
@@ -1120,6 +1125,13 @@ ipf_frag_expire(softc)
 
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_pkt_next                                           */
+/* Returns:     int      - 0 == success, else error                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              token(I) - pointer to token information for this caller     */
+/*              itp(I)   - pointer to generic iterator from caller          */
+/*                                                                          */
+/* This function is used to step through the fragment cache list used for   */
+/* filter rules. The hard work is done by the more generic ipf_frag_next.   */
 /* ------------------------------------------------------------------------ */
 int
 ipf_frag_pkt_next(softc, token, itp)
@@ -1140,6 +1152,13 @@ ipf_frag_pkt_next(softc, token, itp)
 
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_nat_next                                           */
+/* Returns:     int      - 0 == success, else error                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              token(I) - pointer to token information for this caller     */
+/*              itp(I)   - pointer to generic iterator from caller          */
+/*                                                                          */
+/* This function is used to step through the fragment cache list used for   */
+/* NAT. The hard work is done by the more generic ipf_frag_next.            */
 /* ------------------------------------------------------------------------ */
 int
 ipf_frag_nat_next(softc, token, itp)
@@ -1160,7 +1179,8 @@ ipf_frag_nat_next(softc, token, itp)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_next                                               */
 /* Returns:     int      - 0 == success, else error                         */
-/* Parameters:  token(I) - pointer to token information for this caller     */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              token(I) - pointer to token information for this caller     */
 /*              itp(I)   - pointer to generic iterator from caller          */
 /*              top(I)   - top of the fragment list                         */
 /*              lock(I)  - fragment cache lock                              */
@@ -1239,7 +1259,11 @@ ipf_frag_next(softc, token, itp, top
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_pkt_deref                                          */
 /* Returns:     Nil                                                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              data(I)  - pointer to frag cache pointer                    */
 /*                                                                          */
+/* This function is the external interface for dropping a reference to a    */
+/* fragment cache entry used by filter rules.                               */
 /* ------------------------------------------------------------------------ */
 void
 ipf_frag_pkt_deref(softc, data)
@@ -1261,7 +1285,11 @@ ipf_frag_pkt_deref(softc, data)
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_frag_nat_deref                                          */
 /* Returns:     Nil                                                         */
+/* Parameters:  softc(I) - pointer to soft context main structure           */
+/*              data(I)  - pointer to frag cache pointer                    */
 /*                                                                          */
+/* This function is the external interface for dropping a reference to a    */
+/* fragment cache entry used by NAT table entries.                          */
 /* ------------------------------------------------------------------------ */
 void
 ipf_frag_nat_deref(softc, data)
diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c
index 6e9286cbc1c1..bee321cc34ed 100644
--- a/sys/ddb/db_main.c
+++ b/sys/ddb/db_main.c
@@ -56,7 +56,12 @@ static dbbe_trace_thread_f db_trace_thread_wrapper;
 KDB_BACKEND(ddb, db_init, db_trace_self_wrapper, db_trace_thread_wrapper,
     db_trap);
 
-vm_offset_t ksym_start, ksym_end;
+/*
+ * Symbols can be loaded by specifying the exact addresses of
+ * the symtab and strtab in memory. This is used when loaded from
+ * boot loaders different than the native one (like Xen).
+ */
+vm_offset_t ksymtab, kstrtab, ksymtab_size;
 
 boolean_t
 X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t sym, char **file, int *line,
@@ -168,24 +173,39 @@ X_db_symbol_values(db_symtab_t *symtab, c_db_sym_t sym, const char **namep,
 	}
 }
 
+int
+db_fetch_ksymtab(vm_offset_t ksym_start, vm_offset_t ksym_end)
+{
+	Elf_Size strsz;
+
+	if (ksym_end > ksym_start && ksym_start != 0) {
+		ksymtab = ksym_start;
+		ksymtab_size = *(Elf_Size*)ksymtab;
+		ksymtab += sizeof(Elf_Size);
+		kstrtab = ksymtab + ksymtab_size;
+		strsz = *(Elf_Size*)kstrtab;
+		kstrtab += sizeof(Elf_Size);
+		if (kstrtab + strsz > ksym_end) {
+			/* Sizes doesn't match, unset everything. */
+			ksymtab = ksymtab_size = kstrtab = 0;
+		}
+	}
+
+	if (ksymtab == 0 || ksymtab_size == 0 || kstrtab == 0)
+		return (-1);
+
+	return (0);
+}
+
 static int
 db_init(void)
 {
-	uintptr_t symtab, strtab;
-	Elf_Size tabsz, strsz;
 
 	db_command_init();
-	if (ksym_end > ksym_start && ksym_start != 0) {
-		symtab = ksym_start;
-		tabsz = *((Elf_Size*)symtab);
-		symtab += sizeof(Elf_Size);
-		strtab = symtab + tabsz;
-		strsz = *((Elf_Size*)strtab);
-		strtab += sizeof(Elf_Size);
-		if (strtab + strsz <= ksym_end) {
-			db_add_symbol_table((char *)symtab,
-			    (char *)(symtab + tabsz), "elf", (char *)strtab);
-		}
+
+	if (ksymtab != 0 && kstrtab != 0 && ksymtab_size != 0) {
+		db_add_symbol_table((char *)ksymtab,
+		    (char *)(ksymtab + ksymtab_size), "elf", (char *)kstrtab);
 	}
 	db_add_symbol_table(NULL, NULL, "kld", NULL);
 	return (1);	/* We're the default debugger. */
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 42fc9025954f..5aa646b3302a 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -76,6 +76,13 @@ SYSCTL_DECL(_debug_ddb);
 int	DB_CALL(db_expr_t, db_expr_t *, int, db_expr_t[]);
 #endif
 
+/*
+ * Extern variables to set the address and size of the symtab and strtab.
+ * Most users should use db_fetch_symtab in order to set them from the
+ * boot loader provided values.
+ */
+extern vm_offset_t ksymtab, kstrtab, ksymtab_size;
+
 /*
  * There are three "command tables":
  * - One for simple commands; a list of these is displayed
@@ -218,6 +225,7 @@ int		db_value_of_name_vnet(const char *name, db_expr_t *valuep);
 int		db_write_bytes(vm_offset_t addr, size_t size, char *data);
 void		db_command_register(struct command_table *, struct command *);
 void		db_command_unregister(struct command_table *, struct command *);
+int		db_fetch_ksymtab(vm_offset_t ksym_start, vm_offset_t ksym_end);
 
 db_cmdfcn_t	db_breakpoint_cmd;
 db_cmdfcn_t	db_capture_cmd;
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index d49f886c9b8b..e998fee7860c 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -59,6 +59,13 @@ static int acpi_max_tasks = ACPI_MAX_TASKS;
 SYSCTL_INT(_debug_acpi, OID_AUTO, max_tasks, CTLFLAG_RDTUN, &acpi_max_tasks,
     0, "Maximum acpi tasks");
 
+/*
+ * Track and report the system's demand for task slots.
+ */
+static int acpi_tasks_hiwater;
+SYSCTL_INT(_debug_acpi, OID_AUTO, tasks_hiwater, CTLFLAG_RD,
+    &acpi_tasks_hiwater, 1, "Peak demand for ACPI event task slots.");
+
 /*
  * Allow the user to tune the number of task threads we start.  It seems
  * some systems have problems with increased parallelism.
@@ -151,6 +158,10 @@ acpi_task_enqueue(int priority, ACPI_OSD_EXEC_CALLBACK Function, void *Context)
 	    acpi_task_count++;
 	    break;
 	}
+
+    if (i > acpi_tasks_hiwater)
+	atomic_cmpset_int(&acpi_tasks_hiwater, acpi_tasks_hiwater, i);
+
     if (at == NULL) {
 	printf("AcpiOsExecute: failed to enqueue task, consider increasing "
 	    "the debug.acpi.max_tasks tunable\n");
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
index 1e738f8d7f82..006b2ce0268a 100644
--- a/sys/dev/acpica/Osd/OsdTable.c
+++ b/sys/dev/acpica/Osd/OsdTable.c
@@ -91,8 +91,8 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
 	if (hdr == NULL || sz == 0)
 		return (AE_ERROR);
 #ifndef notyet
-	/* Assume SSDT is loaded with DSDT. */
-	AcpiGbl_DisableSsdtTableLoad = TRUE;
+	/* Assume SSDT is installed with DSDT. */
+	AcpiGbl_DisableSsdtTableInstall = TRUE;
 #endif
 	*NewTable = hdr;
 	return (AE_OK);
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index b37e252f2138..37c79a5d4359 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -93,6 +93,7 @@ struct acpi_interface {
 
 /* Global mutex for locking access to the ACPI subsystem. */
 struct mtx	acpi_mutex;
+struct callout	acpi_sleep_timer;
 
 /* Bitmap of device quirks. */
 int		acpi_quirks;
@@ -255,16 +256,6 @@ static char acpi_remove_interface[256];
 TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface,
     sizeof(acpi_remove_interface));
 
-/*
- * Allow override of whether methods execute in parallel or not.
- * Enable this for serial behavior, which fixes "AE_ALREADY_EXISTS"
- * errors for AML that really can't handle parallel method execution.
- * It is off by default since this breaks recursive methods and
- * some IBMs use such code.
- */
-static int acpi_serialize_methods;
-TUNABLE_INT("hw.acpi.serialize_methods", &acpi_serialize_methods);
-
 /* Allow users to dump Debug objects without ACPI debugger. */
 static int acpi_debug_objects;
 TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects);
@@ -278,6 +269,12 @@ TUNABLE_INT("debug.acpi.interpreter_slack", &acpi_interpreter_slack);
 SYSCTL_INT(_debug_acpi, OID_AUTO, interpreter_slack, CTLFLAG_RDTUN,
     &acpi_interpreter_slack, 1, "Turn on interpreter slack mode.");
 
+/* Ignore register widths set by FADT and use default widths instead. */
+static int acpi_ignore_reg_width = 1;
+TUNABLE_INT("debug.acpi.default_register_width", &acpi_ignore_reg_width);
+SYSCTL_INT(_debug_acpi, OID_AUTO, default_register_width, CTLFLAG_RDTUN,
+    &acpi_ignore_reg_width, 1, "Ignore register widths set by FADT");
+
 #ifdef __amd64__
 /* Reset system clock while resuming.  XXX Remove once tested. */
 static int acpi_reset_clock = 1;
@@ -473,9 +470,9 @@ acpi_attach(device_t dev)
      * Set the globals from our tunables.  This is needed because ACPI-CA
      * uses UINT8 for some values and we have no tunable_byte.
      */
-    AcpiGbl_AllMethodsSerialized = acpi_serialize_methods ? TRUE : FALSE;
     AcpiGbl_EnableInterpreterSlack = acpi_interpreter_slack ? TRUE : FALSE;
     AcpiGbl_EnableAmlDebugObject = acpi_debug_objects ? TRUE : FALSE;
+    AcpiGbl_UseDefaultRegisterWidths = acpi_ignore_reg_width ? TRUE : FALSE;
 
 #ifndef ACPI_DEBUG
     /*
@@ -683,7 +680,9 @@ acpi_attach(device_t dev)
 	    AcpiFormatException(status));
 
     /* Allow sleep request after a while. */
-    timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME);
+    callout_init_mtx(&acpi_sleep_timer, &acpi_mutex, 0);
+    callout_reset(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME,
+	acpi_sleep_enable, sc);
 
     error = 0;
 
@@ -851,11 +850,18 @@ acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
     size_t buflen)
 {
     struct acpi_device *dinfo = device_get_ivars(child);
+    char buf2[32];
+    int pxm;
 
-    if (dinfo->ad_handle)
-	snprintf(buf, buflen, "handle=%s", acpi_name(dinfo->ad_handle));
-    else
-	snprintf(buf, buflen, "unknown");
+    if (dinfo->ad_handle) {
+        snprintf(buf, buflen, "handle=%s", acpi_name(dinfo->ad_handle));
+        if (ACPI_SUCCESS(acpi_GetInteger(dinfo->ad_handle, "_PXM", &pxm))) {
+                snprintf(buf2, 32, " _PXM=%d", pxm);
+                strlcat(buf, buf2, buflen);
+        }
+    } else {
+        snprintf(buf, buflen, "unknown");
+    }
     return (0);
 }
 
@@ -2483,8 +2489,8 @@ acpi_sleep_force(void *arg)
     device_printf(sc->acpi_dev,
 	"suspend request timed out, forcing sleep now\n");
     /*
-     * XXX Suspending from callout cause the freeze in DEVICE_SUSPEND().
-     * Suspend from acpi_task thread in stead.
+     * XXX Suspending from callout causes freezes in DEVICE_SUSPEND().
+     * Suspend from acpi_task thread instead.
      */
     if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER,
 	acpi_sleep_force_task, sc)))
@@ -2636,15 +2642,15 @@ acpi_sleep_enable(void *arg)
 {
     struct acpi_softc	*sc = (struct acpi_softc *)arg;
 
+    ACPI_LOCK_ASSERT(acpi);
+
     /* Reschedule if the system is not fully up and running. */
     if (!AcpiGbl_SystemAwakeAndRunning) {
-	timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME);
+	callout_schedule(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME);
 	return;
     }
 
-    ACPI_LOCK(acpi);
     sc->acpi_sleep_disabled = FALSE;
-    ACPI_UNLOCK(acpi);
 }
 
 static ACPI_STATUS
@@ -2859,7 +2865,7 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state)
     EVENTHANDLER_INVOKE(power_resume);
 
     /* Allow another sleep request after a while. */
-    timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME);
+    callout_schedule(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME);
 
     /* Run /etc/rc.resume after we are back. */
     if (devctl_process_running())
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 78d8639fd651..d94b6f0095f4 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -149,12 +149,19 @@ acpi_pci_child_location_str_method(device_t cbdev, device_t child, char *buf,
     size_t buflen)
 {
     struct acpi_pci_devinfo *dinfo = device_get_ivars(child);
+    int pxm;
+    char buf2[32];
 
     pci_child_location_str_method(cbdev, child, buf, buflen);
-    
+
     if (dinfo->ap_handle) {
-	strlcat(buf, " handle=", buflen);
-	strlcat(buf, acpi_name(dinfo->ap_handle), buflen);
+        strlcat(buf, " handle=", buflen);
+        strlcat(buf, acpi_name(dinfo->ap_handle), buflen);
+
+        if (ACPI_SUCCESS(acpi_GetInteger(dinfo->ap_handle, "_PXM", &pxm))) {
+                snprintf(buf2, 32, " _PXM=%d", pxm);
+                strlcat(buf, buf2, buflen);
+        }
     }
     return (0);
 }
@@ -275,7 +282,7 @@ acpi_pci_probe(device_t dev)
 	if (acpi_get_handle(dev) == NULL)
 		return (ENXIO);
 	device_set_desc(dev, "ACPI PCI bus");
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index ec174091cd70..6108f8192b7b 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -1852,9 +1852,9 @@ ae_tx_intr(ae_softc_t *sc)
 		    sizeof(ae_txs_t) + 3) & ~3) % AE_TXD_BUFSIZE_DEFAULT;
 
 		if ((flags & AE_TXS_SUCCESS) != 0)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		else
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		sc->tx_inproc--;
 	}
@@ -1897,13 +1897,13 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
 	size = le16toh(rxd->len) - ETHER_CRC_LEN;
 	if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) {
 		if_printf(ifp, "Runt frame received.");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
 	m = m_devget(&rxd->data[0], size, ETHER_ALIGN, ifp, NULL);
 	if (m == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		return;
 	}
 
@@ -1913,7 +1913,7 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
 		m->m_flags |= M_VLANTAG;
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	/*
 	 * Pass it through.
 	 */
@@ -1959,7 +1959,7 @@ ae_rx_intr(ae_softc_t *sc)
 		if ((flags & AE_RXD_SUCCESS) != 0)
 			ae_rxeof(sc, rxd);
 		else
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	if (count > 0) {
@@ -1989,7 +1989,7 @@ ae_watchdog(ae_softc_t *sc)
 	else
 		if_printf(ifp, "watchdog timeout - resetting.\n");
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	ae_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index d5f387cafda0..c3a896203c1f 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -1792,7 +1792,7 @@ age_watchdog(struct age_softc *sc)
 	ifp = sc->age_ifp;
 	if ((sc->age_flags & AGE_FLAG_LINK) == 0) {
 		if_printf(sc->age_ifp, "watchdog timeout (missed link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		age_init_locked(sc);
 		return;
@@ -1805,7 +1805,7 @@ age_watchdog(struct age_softc *sc)
 		return;
 	}
 	if_printf(sc->age_ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	age_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -2087,22 +2087,22 @@ age_stats_update(struct age_softc *sc)
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, smb->tx_frames);
 
-	ifp->if_collisions += smb->tx_single_colls +
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, smb->tx_single_colls +
 	    smb->tx_multi_colls + smb->tx_late_colls +
-	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT);
 
-	ifp->if_oerrors += smb->tx_excess_colls +
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, smb->tx_excess_colls +
 	    smb->tx_late_colls + smb->tx_underrun +
-	    smb->tx_pkts_truncated;
+	    smb->tx_pkts_truncated);
 
-	ifp->if_ipackets += smb->rx_frames;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, smb->rx_frames);
 
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
-	    smb->rx_runts + smb->rx_pkts_truncated +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, smb->rx_crcerrs +
+	    smb->rx_lenerrs + smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_desc_oflows +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 
 	/* Update done, clear. */
 	smb->updated = 0;
@@ -2291,7 +2291,7 @@ age_fixup_rx(struct ifnet *ifp, struct mbuf *m)
 	 */
 	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (n == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		m_freem(m);
 		return (NULL);
 	}
@@ -2347,7 +2347,7 @@ age_rxeof(struct age_softc *sc, struct rx_rdesc *rxrd)
 		mp = rxd->rx_m;
 		/* Add a new receive buffer to the ring. */
 		if (age_newbuf(sc, rxd) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* Reuse Rx buffers. */
 			if (sc->age_cdata.age_rxhead != NULL)
 				m_freem(sc->age_cdata.age_rxhead);
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index b81440aff0d3..69fa76bfab42 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -61,31 +61,31 @@ static void ahci_ch_pm(void *arg);
 static void ahci_ch_intr(void *arg);
 static void ahci_ch_intr_direct(void *arg);
 static void ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus);
-static void ahci_begin_transaction(device_t dev, union ccb *ccb);
+static void ahci_begin_transaction(struct ahci_channel *ch, union ccb *ccb);
 static void ahci_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error);
 static void ahci_execute_transaction(struct ahci_slot *slot);
 static void ahci_timeout(struct ahci_slot *slot);
 static void ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et);
-static int ahci_setup_fis(device_t dev, struct ahci_cmd_tab *ctp, union ccb *ccb, int tag);
+static int ahci_setup_fis(struct ahci_channel *ch, struct ahci_cmd_tab *ctp, union ccb *ccb, int tag);
 static void ahci_dmainit(device_t dev);
 static void ahci_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int error);
 static void ahci_dmafini(device_t dev);
 static void ahci_slotsalloc(device_t dev);
 static void ahci_slotsfree(device_t dev);
-static void ahci_reset(device_t dev);
-static void ahci_start(device_t dev, int fbs);
-static void ahci_stop(device_t dev);
-static void ahci_clo(device_t dev);
-static void ahci_start_fr(device_t dev);
-static void ahci_stop_fr(device_t dev);
+static void ahci_reset(struct ahci_channel *ch);
+static void ahci_start(struct ahci_channel *ch, int fbs);
+static void ahci_stop(struct ahci_channel *ch);
+static void ahci_clo(struct ahci_channel *ch);
+static void ahci_start_fr(struct ahci_channel *ch);
+static void ahci_stop_fr(struct ahci_channel *ch);
 
 static int ahci_sata_connect(struct ahci_channel *ch);
-static int ahci_sata_phy_reset(device_t dev);
-static int ahci_wait_ready(device_t dev, int t, int t0);
+static int ahci_sata_phy_reset(struct ahci_channel *ch);
+static int ahci_wait_ready(struct ahci_channel *ch, int t, int t0);
 
-static void ahci_issue_recovery(device_t dev);
-static void ahci_process_read_log(device_t dev, union ccb *ccb);
-static void ahci_process_request_sense(device_t dev, union ccb *ccb);
+static void ahci_issue_recovery(struct ahci_channel *ch);
+static void ahci_process_read_log(struct ahci_channel *ch, union ccb *ccb);
+static void ahci_process_request_sense(struct ahci_channel *ch, union ccb *ccb);
 
 static void ahciaction(struct cam_sim *sim, union ccb *ccb);
 static void ahcipoll(struct cam_sim *sim);
@@ -159,6 +159,7 @@ ahci_attach(device_t dev)
 	device_t child;
 
 	ctlr->dev = dev;
+	ctlr->ccc = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "ccc", &ctlr->ccc);
 
@@ -187,10 +188,9 @@ ahci_attach(device_t dev)
 	ctlr->ichannels = ATA_INL(ctlr->r_mem, AHCI_PI);
 
 	/* Identify and set separate quirks for HBA and RAID f/w Marvells. */
-	if ((ctlr->quirks & AHCI_Q_NOBSYRES) &&
-	    (ctlr->quirks & AHCI_Q_ALTSIG) &&
+	if ((ctlr->quirks & AHCI_Q_ALTSIG) &&
 	    (ctlr->caps & AHCI_CAP_SPM) == 0)
-		ctlr->quirks &= ~AHCI_Q_NOBSYRES;
+		ctlr->quirks |= AHCI_Q_NOBSYRES;
 
 	if (ctlr->quirks & AHCI_Q_1CH) {
 		ctlr->caps &= ~AHCI_CAP_NPMASK;
@@ -230,6 +230,15 @@ ahci_attach(device_t dev)
 
 	ahci_ctlr_setup(dev);
 
+	/* Setup interrupts. */
+	if (ahci_setup_interrupt(dev)) {
+		bus_dma_tag_destroy(ctlr->dma_tag);
+		bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
+		    ctlr->r_mem);
+		rman_fini(&ctlr->sc_iomem);
+		return ENXIO;
+	}
+
 	i = 0;
 	for (u = ctlr->ichannels; u != 0; u >>= 1)
 		i += (u & 1);
@@ -351,7 +360,9 @@ ahci_setup_interrupt(device_t dev)
 	for (i = 0; i < ctlr->numirqs; i++) {
 		ctlr->irqs[i].ctlr = ctlr;
 		ctlr->irqs[i].r_irq_rid = i + (ctlr->msi ? 1 : 0);
-		if (ctlr->numirqs == 1 || i >= ctlr->channels ||
+		if (ctlr->channels == 1 && !ctlr->ccc)
+			ctlr->irqs[i].mode = AHCI_IRQ_MODE_ONE;
+		else if (ctlr->numirqs == 1 || i >= ctlr->channels ||
 		    (ctlr->ccc && i == ctlr->cccv))
 			ctlr->irqs[i].mode = AHCI_IRQ_MODE_ALL;
 		else if (i == ctlr->numirqs - 1)
@@ -614,6 +625,7 @@ ahci_ch_attach(device_t dev)
 	ch->subdeviceid = ctlr->subdeviceid;
 	ch->numslots = ((ch->caps & AHCI_CAP_NCS) >> AHCI_CAP_NCS_SHIFT) + 1;
 	mtx_init(&ch->mtx, "AHCI channel lock", NULL, MTX_DEF);
+	ch->pm_level = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "pm_level", &ch->pm_level);
 	STAILQ_INIT(&ch->doneq);
@@ -659,7 +671,7 @@ ahci_ch_attach(device_t dev)
 	}
 	if ((bus_setup_intr(dev, ch->r_irq, ATA_INTR_FLAGS, NULL,
 	    ctlr->direct ? ahci_ch_intr_direct : ahci_ch_intr,
-	    dev, &ch->ih))) {
+	    ch, &ch->ih))) {
 		device_printf(dev, "Unable to setup interrupt\n");
 		error = ENXIO;
 		goto err1;
@@ -688,7 +700,7 @@ ahci_ch_attach(device_t dev)
 	}
 	/* Construct SIM entry */
 	ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch,
-	    device_get_unit(dev), &ch->mtx,
+	    device_get_unit(dev), (struct mtx *)&ch->mtx,
 	    min(2, ch->numslots),
 	    (ch->caps & AHCI_CAP_SNCQ) ? ch->numslots : 0,
 	    devq);
@@ -712,7 +724,7 @@ ahci_ch_attach(device_t dev)
 	if (ch->pm_level > 3) {
 		callout_reset(&ch->pm_timer,
 		    (ch->pm_level == 4) ? hz / 1000 : hz / 8,
-		    ahci_ch_pm, dev);
+		    ahci_ch_pm, ch);
 	}
 	mtx_unlock(&ch->mtx);
 	return (0);
@@ -782,8 +794,8 @@ ahci_ch_init(device_t dev)
 	     (AHCI_P_CMD_ACTIVE | AHCI_P_CMD_POD | AHCI_P_CMD_SUD |
 	     ((ch->pm_level == 2 || ch->pm_level == 3) ? AHCI_P_CMD_ALPE : 0) |
 	     ((ch->pm_level > 2) ? AHCI_P_CMD_ASP : 0 )));
-	ahci_start_fr(dev);
-	ahci_start(dev, 1);
+	ahci_start_fr(ch);
+	ahci_start(ch, 1);
 	return (0);
 }
 
@@ -795,8 +807,8 @@ ahci_ch_deinit(device_t dev)
 	/* Disable port interrupts. */
 	ATA_OUTL(ch->r_mem, AHCI_P_IE, 0);
 	/* Reset command register. */
-	ahci_stop(dev);
-	ahci_stop_fr(dev);
+	ahci_stop(ch);
+	ahci_stop_fr(ch);
 	ATA_OUTL(ch->r_mem, AHCI_P_CMD, 0);
 	/* Allow everything, including partial and slumber modes. */
 	ATA_OUTL(ch->r_mem, AHCI_P_SCTL, 0);
@@ -835,7 +847,7 @@ ahci_ch_resume(device_t dev)
 
 	mtx_lock(&ch->mtx);
 	ahci_ch_init(dev);
-	ahci_reset(dev);
+	ahci_reset(ch);
 	xpt_release_simq(ch->sim, TRUE);
 	mtx_unlock(&ch->mtx);
 	return (0);
@@ -966,7 +978,7 @@ ahci_slotsalloc(device_t dev)
 	for (i = 0; i < ch->numslots; i++) {
 		struct ahci_slot *slot = &ch->slot[i];
 
-		slot->dev = dev;
+		slot->ch = ch;
 		slot->slot = i;
 		slot->state = AHCI_SLOT_EMPTY;
 		slot->ccb = NULL;
@@ -996,9 +1008,8 @@ ahci_slotsfree(device_t dev)
 }
 
 static int
-ahci_phy_check_events(device_t dev, u_int32_t serr)
+ahci_phy_check_events(struct ahci_channel *ch, u_int32_t serr)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 
 	if (((ch->pm_level == 0) && (serr & ATA_SE_PHY_CHANGED)) ||
 	    ((ch->pm_level != 0 || ch->listening) && (serr & ATA_SE_EXCHANGED))) {
@@ -1007,11 +1018,11 @@ ahci_phy_check_events(device_t dev, u_int32_t serr)
 
 		if (bootverbose) {
 			if ((status & ATA_SS_DET_MASK) != ATA_SS_DET_NO_DEVICE)
-				device_printf(dev, "CONNECT requested\n");
+				device_printf(ch->dev, "CONNECT requested\n");
 			else
-				device_printf(dev, "DISCONNECT requested\n");
+				device_printf(ch->dev, "DISCONNECT requested\n");
 		}
-		ahci_reset(dev);
+		ahci_reset(ch);
 		if ((ccb = xpt_alloc_ccb_nowait()) == NULL)
 			return (0);
 		if (xpt_create_path(&ccb->ccb_h.path, NULL,
@@ -1027,11 +1038,11 @@ ahci_phy_check_events(device_t dev, u_int32_t serr)
 }
 
 static void
-ahci_cpd_check_events(device_t dev)
+ahci_cpd_check_events(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t status;
 	union ccb *ccb;
+	device_t dev;
 
 	if (ch->pm_level == 0)
 		return;
@@ -1041,12 +1052,13 @@ ahci_cpd_check_events(device_t dev)
 		return;
 
 	if (bootverbose) {
+		dev = ch->dev;
 		if (status & AHCI_P_CMD_CPS) {
 			device_printf(dev, "COLD CONNECT requested\n");
 		} else
 			device_printf(dev, "COLD DISCONNECT requested\n");
 	}
-	ahci_reset(dev);
+	ahci_reset(ch);
 	if ((ccb = xpt_alloc_ccb_nowait()) == NULL)
 		return;
 	if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(ch->sim),
@@ -1058,16 +1070,15 @@ ahci_cpd_check_events(device_t dev)
 }
 
 static void
-ahci_notify_events(device_t dev, u_int32_t status)
+ahci_notify_events(struct ahci_channel *ch, u_int32_t status)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	struct cam_path *dpath;
 	int i;
 
 	if (ch->caps & AHCI_CAP_SSNTF)
 		ATA_OUTL(ch->r_mem, AHCI_P_SNTF, status);
 	if (bootverbose)
-		device_printf(dev, "SNTF 0x%04x\n", status);
+		device_printf(ch->dev, "SNTF 0x%04x\n", status);
 	for (i = 0; i < 16; i++) {
 		if ((status & (1 << i)) == 0)
 			continue;
@@ -1096,8 +1107,7 @@ ahci_done(struct ahci_channel *ch, union ccb *ccb)
 static void
 ahci_ch_intr(void *arg)
 {
-	device_t dev = (device_t)arg;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = (struct ahci_channel *)arg;
 	uint32_t istatus;
 
 	/* Read interrupt statuses. */
@@ -1113,10 +1123,10 @@ ahci_ch_intr(void *arg)
 static void
 ahci_ch_intr_direct(void *arg)
 {
-	device_t dev = (device_t)arg;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = (struct ahci_channel *)arg;
 	struct ccb_hdr *ccb_h;
 	uint32_t istatus;
+	STAILQ_HEAD(, ccb_hdr) tmp_doneq = STAILQ_HEAD_INITIALIZER(tmp_doneq);
 
 	/* Read interrupt statuses. */
 	istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
@@ -1127,9 +1137,14 @@ ahci_ch_intr_direct(void *arg)
 	ch->batch = 1;
 	ahci_ch_intr_main(ch, istatus);
 	ch->batch = 0;
+	/*
+	 * Prevent the possibility of issues caused by processing the queue
+	 * while unlocked below by moving the contents to a local queue.
+	 */
+	STAILQ_CONCAT(&tmp_doneq, &ch->doneq);
 	mtx_unlock(&ch->mtx);
-	while ((ccb_h = STAILQ_FIRST(&ch->doneq)) != NULL) {
-		STAILQ_REMOVE_HEAD(&ch->doneq, sim_links.stqe);
+	while ((ccb_h = STAILQ_FIRST(&tmp_doneq)) != NULL) {
+		STAILQ_REMOVE_HEAD(&tmp_doneq, sim_links.stqe);
 		xpt_done_direct((union ccb *)ccb_h);
 	}
 }
@@ -1137,8 +1152,7 @@ ahci_ch_intr_direct(void *arg)
 static void
 ahci_ch_pm(void *arg)
 {
-	device_t dev = (device_t)arg;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = (struct ahci_channel *)arg;
 	uint32_t work;
 
 	if (ch->numrslots != 0)
@@ -1154,7 +1168,6 @@ ahci_ch_pm(void *arg)
 static void
 ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus)
 {
-	device_t dev = ch->dev;
 	uint32_t cstatus, serr = 0, sntf = 0, ok, err;
 	enum ahci_err_type et;
 	int i, ccs, port, reset = 0;
@@ -1196,12 +1209,12 @@ ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus)
 		serr = ATA_INL(ch->r_mem, AHCI_P_SERR);
 		if (serr) {
 			ATA_OUTL(ch->r_mem, AHCI_P_SERR, serr);
-			reset = ahci_phy_check_events(dev, serr);
+			reset = ahci_phy_check_events(ch, serr);
 		}
 	}
 	/* Process cold presence detection events */
 	if ((istatus & AHCI_P_IX_CPD) && !reset)
-		ahci_cpd_check_events(dev);
+		ahci_cpd_check_events(ch);
 	/* Process command errors */
 	if (istatus & (AHCI_P_IX_OF | AHCI_P_IX_IF |
 	    AHCI_P_IX_HBD | AHCI_P_IX_HBF | AHCI_P_IX_TFE)) {
@@ -1296,14 +1309,13 @@ ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus)
 	}
 	/* Process NOTIFY events */
 	if (sntf)
-		ahci_notify_events(dev, sntf);
+		ahci_notify_events(ch, sntf);
 }
 
 /* Must be called with channel locked. */
 static int
-ahci_check_collision(device_t dev, union ccb *ccb)
+ahci_check_collision(struct ahci_channel *ch, union ccb *ccb)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int t = ccb->ccb_h.target_id;
 
 	if ((ccb->ccb_h.func_code == XPT_ATA_IO) &&
@@ -1352,9 +1364,8 @@ ahci_check_collision(device_t dev, union ccb *ccb)
 
 /* Must be called with channel locked. */
 static void
-ahci_begin_transaction(device_t dev, union ccb *ccb)
+ahci_begin_transaction(struct ahci_channel *ch, union ccb *ccb)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	struct ahci_slot *slot;
 	int tag, tags;
 
@@ -1363,14 +1374,14 @@ ahci_begin_transaction(device_t dev, union ccb *ccb)
 	if ((ccb->ccb_h.func_code == XPT_ATA_IO) &&
 	    (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA))
 		tags = ch->curr[ccb->ccb_h.target_id].tags;
-	tag = ch->lastslot;
-	while (1) {
-		if (tag >= tags)
-			tag = 0;
-		if (ch->slot[tag].state == AHCI_SLOT_EMPTY)
-			break;
-		tag++;
-	};
+	if (ch->lastslot + 1 < tags)
+		tag = ffs(~(ch->oslots >> (ch->lastslot + 1)));
+	else
+		tag = 0;
+	if (tag == 0 || tag + ch->lastslot >= tags)
+		tag = ffs(~ch->oslots) - 1;
+	else
+		tag += ch->lastslot;
 	ch->lastslot = tag;
 	/* Occupy chosen slot. */
 	slot = &ch->slot[tag];
@@ -1379,7 +1390,7 @@ ahci_begin_transaction(device_t dev, union ccb *ccb)
 	if (ch->numrslots == 0 && ch->pm_level > 3)
 		callout_stop(&ch->pm_timer);
 	/* Update channel stats. */
-	ch->oslots |= (1 << slot->slot);
+	ch->oslots |= (1 << tag);
 	ch->numrslots++;
 	ch->numrslotspd[ccb->ccb_h.target_id]++;
 	if ((ccb->ccb_h.func_code == XPT_ATA_IO) &&
@@ -1390,14 +1401,15 @@ ahci_begin_transaction(device_t dev, union ccb *ccb)
 	}
 	if ((ccb->ccb_h.func_code == XPT_ATA_IO) &&
 	    (ccb->ataio.cmd.flags & (CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT)))
-		ch->aslots |= (1 << slot->slot);
-	slot->dma.nsegs = 0;
+		ch->aslots |= (1 << tag);
 	if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
 		slot->state = AHCI_SLOT_LOADING;
 		bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, ccb,
 		    ahci_dmasetprd, slot, 0);
-	} else
+	} else {
+		slot->dma.nsegs = 0;
 		ahci_execute_transaction(slot);
+	}
 }
 
 /* Locked by busdma engine. */
@@ -1405,13 +1417,13 @@ static void
 ahci_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {    
 	struct ahci_slot *slot = arg;
-	struct ahci_channel *ch = device_get_softc(slot->dev);
+	struct ahci_channel *ch = slot->ch;
 	struct ahci_cmd_tab *ctp;
 	struct ahci_dma_prd *prd;
 	int i;
 
 	if (error) {
-		device_printf(slot->dev, "DMA load error\n");
+		device_printf(ch->dev, "DMA load error\n");
 		ahci_end_transaction(slot, AHCI_ERR_INVALID);
 		return;
 	}
@@ -1436,8 +1448,7 @@ ahci_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 static void
 ahci_execute_transaction(struct ahci_slot *slot)
 {
-	device_t dev = slot->dev;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = slot->ch;
 	struct ahci_cmd_tab *ctp;
 	struct ahci_cmd_list *clp;
 	union ccb *ccb = slot->ccb;
@@ -1450,7 +1461,7 @@ ahci_execute_transaction(struct ahci_slot *slot)
 	ctp = (struct ahci_cmd_tab *)
 		(ch->dma.work + AHCI_CT_OFFSET + (AHCI_CT_SIZE * slot->slot));
 	/* Setup the FIS for this request */
-	if (!(fis_size = ahci_setup_fis(dev, ctp, ccb, slot->slot))) {
+	if (!(fis_size = ahci_setup_fis(ch, ctp, ccb, slot->slot))) {
 		device_printf(ch->dev, "Setting up SATA FIS failed\n");
 		ahci_end_transaction(slot, AHCI_ERR_INVALID);
 		return;
@@ -1471,9 +1482,9 @@ ahci_execute_transaction(struct ahci_slot *slot)
 		if (ccb->ataio.cmd.control & ATA_A_RESET) {
 			softreset = 1;
 			/* Kick controller into sane state */
-			ahci_stop(dev);
-			ahci_clo(dev);
-			ahci_start(dev, 0);
+			ahci_stop(ch);
+			ahci_clo(ch);
+			ahci_start(ch, 0);
 			clp->cmd_flags |= AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY;
 		} else {
 			softreset = 2;
@@ -1533,9 +1544,16 @@ ahci_execute_transaction(struct ahci_slot *slot)
 			}
 		}
 
-		/* Marvell controllers do not wait for readyness. */
-		if ((ch->quirks & AHCI_Q_NOBSYRES) && softreset == 2 &&
-		    et == AHCI_ERR_NONE) {
+		/*
+		 * Marvell HBAs with non-RAID firmware do not wait for
+		 * readiness after soft reset, so we have to wait here.
+		 * Marvell RAIDs do not have this problem, but instead
+		 * sometimes forget to update FIS receive area, breaking
+		 * this wait.
+		 */
+		if ((ch->quirks & AHCI_Q_NOBSYRES) == 0 &&
+		    (ch->quirks & AHCI_Q_ATI_PMP_BUG) == 0 &&
+		    softreset == 2 && et == AHCI_ERR_NONE) {
 			while ((val = fis[2]) & ATA_S_BUSY) {
 				DELAY(10);
 				if (count++ >= timeout)
@@ -1544,9 +1562,9 @@ ahci_execute_transaction(struct ahci_slot *slot)
 		}
 
 		if (timeout && (count >= timeout)) {
-			device_printf(dev, "Poll timeout on slot %d port %d\n",
+			device_printf(ch->dev, "Poll timeout on slot %d port %d\n",
 			    slot->slot, port);
-			device_printf(dev, "is %08x cs %08x ss %08x "
+			device_printf(ch->dev, "is %08x cs %08x ss %08x "
 			    "rs %08x tfd %02x serr %08x cmd %08x\n",
 			    ATA_INL(ch->r_mem, AHCI_P_IS),
 			    ATA_INL(ch->r_mem, AHCI_P_CI),
@@ -1571,9 +1589,8 @@ ahci_execute_transaction(struct ahci_slot *slot)
 
 /* Must be called with channel locked. */
 static void
-ahci_process_timeout(device_t dev)
+ahci_process_timeout(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int i;
 
 	mtx_assert(&ch->mtx, MA_OWNED);
@@ -1588,9 +1605,8 @@ ahci_process_timeout(device_t dev)
 
 /* Must be called with channel locked. */
 static void
-ahci_rearm_timeout(device_t dev)
+ahci_rearm_timeout(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int i;
 
 	mtx_assert(&ch->mtx, MA_OWNED);
@@ -1612,8 +1628,8 @@ ahci_rearm_timeout(device_t dev)
 static void
 ahci_timeout(struct ahci_slot *slot)
 {
-	device_t dev = slot->dev;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = slot->ch;
+	device_t dev = ch->dev;
 	uint32_t sstatus;
 	int ccs;
 	int i;
@@ -1680,7 +1696,7 @@ ahci_timeout(struct ahci_slot *slot)
 			xpt_freeze_simq(ch->sim, 1);
 		ch->toslots |= (1 << slot->slot);
 		if ((ch->rslots & ~ch->toslots) == 0)
-			ahci_process_timeout(dev);
+			ahci_process_timeout(ch);
 		else
 			device_printf(dev, " ... waiting for slots %08x\n",
 			    ch->rslots & ~ch->toslots);
@@ -1691,8 +1707,7 @@ ahci_timeout(struct ahci_slot *slot)
 static void
 ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et)
 {
-	device_t dev = slot->dev;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = slot->ch;
 	union ccb *ccb = slot->ccb;
 	struct ahci_cmd_list *clp;
 	int lastto;
@@ -1850,15 +1865,15 @@ ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et)
 	    (ccb->ataio.cmd.control & ATA_A_RESET) &&
 	    et == AHCI_ERR_NONE) {
 		ccb->ataio.cmd.control &= ~ATA_A_RESET;
-		ahci_begin_transaction(dev, ccb);
+		ahci_begin_transaction(ch, ccb);
 		return;
 	}
 	/* If it was our READ LOG command - process it. */
 	if (ccb->ccb_h.recovery_type == RECOVERY_READ_LOG) {
-		ahci_process_read_log(dev, ccb);
+		ahci_process_read_log(ch, ccb);
 	/* If it was our REQUEST SENSE command - process it. */
 	} else if (ccb->ccb_h.recovery_type == RECOVERY_REQUEST_SENSE) {
-		ahci_process_request_sense(dev, ccb);
+		ahci_process_request_sense(ch, ccb);
 	/* If it was NCQ or ATAPI command error, put result on hold. */
 	} else if (et == AHCI_ERR_NCQ ||
 	    ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR &&
@@ -1871,27 +1886,27 @@ ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et)
 	if (ch->rslots == 0) {
 		/* if there was fatal error - reset port. */
 		if (ch->toslots != 0 || ch->fatalerr) {
-			ahci_reset(dev);
+			ahci_reset(ch);
 		} else {
 			/* if we have slots in error, we can reinit port. */
 			if (ch->eslots != 0) {
-				ahci_stop(dev);
-				ahci_clo(dev);
-				ahci_start(dev, 1);
+				ahci_stop(ch);
+				ahci_clo(ch);
+				ahci_start(ch, 1);
 			}
 			/* if there commands on hold, we can do READ LOG. */
 			if (!ch->recoverycmd && ch->numhslots)
-				ahci_issue_recovery(dev);
+				ahci_issue_recovery(ch);
 		}
 	/* If all the rest of commands are in timeout - give them chance. */
 	} else if ((ch->rslots & ~ch->toslots) == 0 &&
 	    et != AHCI_ERR_TIMEOUT)
-		ahci_rearm_timeout(dev);
+		ahci_rearm_timeout(ch);
 	/* Unfreeze frozen command. */
-	if (ch->frozen && !ahci_check_collision(dev, ch->frozen)) {
+	if (ch->frozen && !ahci_check_collision(ch, ch->frozen)) {
 		union ccb *fccb = ch->frozen;
 		ch->frozen = NULL;
-		ahci_begin_transaction(dev, fccb);
+		ahci_begin_transaction(ch, fccb);
 		xpt_release_simq(ch->sim, TRUE);
 	}
 	/* Start PM timer. */
@@ -1903,9 +1918,8 @@ ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et)
 }
 
 static void
-ahci_issue_recovery(device_t dev)
+ahci_issue_recovery(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	union ccb *ccb;
 	struct ccb_ataio *ataio;
 	struct ccb_scsiio *csio;
@@ -1918,7 +1932,7 @@ ahci_issue_recovery(device_t dev)
 	}
 	ccb = xpt_alloc_ccb_nowait();
 	if (ccb == NULL) {
-		device_printf(dev, "Unable to allocate recovery command\n");
+		device_printf(ch->dev, "Unable to allocate recovery command\n");
 completeall:
 		/* We can't do anything -- complete held commands. */
 		for (i = 0; i < ch->numslots; i++) {
@@ -1930,7 +1944,7 @@ ahci_issue_recovery(device_t dev)
 			ch->hold[i] = NULL;
 			ch->numhslots--;
 		}
-		ahci_reset(dev);
+		ahci_reset(ch);
 		return;
 	}
 	ccb->ccb_h = ch->hold[i]->ccb_h;	/* Reuse old header. */
@@ -1944,7 +1958,7 @@ ahci_issue_recovery(device_t dev)
 		ataio->data_ptr = malloc(512, M_AHCI, M_NOWAIT);
 		if (ataio->data_ptr == NULL) {
 			xpt_free_ccb(ccb);
-			device_printf(dev,
+			device_printf(ch->dev,
 			    "Unable to allocate memory for READ LOG command\n");
 			goto completeall;
 		}
@@ -1976,13 +1990,12 @@ ahci_issue_recovery(device_t dev)
 	/* Freeze SIM while doing recovery. */
 	ch->recoverycmd = 1;
 	xpt_freeze_simq(ch->sim, 1);
-	ahci_begin_transaction(dev, ccb);
+	ahci_begin_transaction(ch, ccb);
 }
 
 static void
-ahci_process_read_log(device_t dev, union ccb *ccb)
+ahci_process_read_log(struct ahci_channel *ch, union ccb *ccb)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	uint8_t *data;
 	struct ata_res *res;
 	int i;
@@ -2020,9 +2033,9 @@ ahci_process_read_log(device_t dev, union ccb *ccb)
 		}
 	} else {
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
-			device_printf(dev, "Error while READ LOG EXT\n");
+			device_printf(ch->dev, "Error while READ LOG EXT\n");
 		else if ((data[0] & 0x80) == 0) {
-			device_printf(dev, "Non-queued command error in READ LOG EXT\n");
+			device_printf(ch->dev, "Non-queued command error in READ LOG EXT\n");
 		}
 		for (i = 0; i < ch->numslots; i++) {
 			if (!ch->hold[i])
@@ -2040,9 +2053,8 @@ ahci_process_read_log(device_t dev, union ccb *ccb)
 }
 
 static void
-ahci_process_request_sense(device_t dev, union ccb *ccb)
+ahci_process_request_sense(struct ahci_channel *ch, union ccb *ccb)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int i;
 
 	ch->recoverycmd = 0;
@@ -2062,9 +2074,8 @@ ahci_process_request_sense(device_t dev, union ccb *ccb)
 }
 
 static void
-ahci_start(device_t dev, int fbs)
+ahci_start(struct ahci_channel *ch, int fbs)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t cmd;
 
 	/* Clear SATA error register */
@@ -2085,9 +2096,8 @@ ahci_start(device_t dev, int fbs)
 }
 
 static void
-ahci_stop(device_t dev)
+ahci_stop(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t cmd;
 	int timeout;
 
@@ -2099,7 +2109,7 @@ ahci_stop(device_t dev)
 	do {
 		DELAY(10);
 		if (timeout++ > 50000) {
-			device_printf(dev, "stopping AHCI engine failed\n");
+			device_printf(ch->dev, "stopping AHCI engine failed\n");
 			break;
 		}
 	} while (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CR);
@@ -2107,9 +2117,8 @@ ahci_stop(device_t dev)
 }
 
 static void
-ahci_clo(device_t dev)
+ahci_clo(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t cmd;
 	int timeout;
 
@@ -2122,7 +2131,7 @@ ahci_clo(device_t dev)
 		do {
 			DELAY(10);
 			if (timeout++ > 50000) {
-			    device_printf(dev, "executing CLO failed\n");
+			    device_printf(ch->dev, "executing CLO failed\n");
 			    break;
 			}
 		} while (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CLO);
@@ -2130,9 +2139,8 @@ ahci_clo(device_t dev)
 }
 
 static void
-ahci_stop_fr(device_t dev)
+ahci_stop_fr(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t cmd;
 	int timeout;
 
@@ -2144,16 +2152,15 @@ ahci_stop_fr(device_t dev)
 	do {
 		DELAY(10);
 		if (timeout++ > 50000) {
-			device_printf(dev, "stopping AHCI FR engine failed\n");
+			device_printf(ch->dev, "stopping AHCI FR engine failed\n");
 			break;
 		}
 	} while (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_FR);
 }
 
 static void
-ahci_start_fr(device_t dev)
+ahci_start_fr(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int32_t cmd;
 
 	/* Start FIS reception on this channel */
@@ -2162,9 +2169,8 @@ ahci_start_fr(device_t dev)
 }
 
 static int
-ahci_wait_ready(device_t dev, int t, int t0)
+ahci_wait_ready(struct ahci_channel *ch, int t, int t0)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int timeout = 0;
 	uint32_t val;
 
@@ -2172,7 +2178,7 @@ ahci_wait_ready(device_t dev, int t, int t0)
 	    (ATA_S_BUSY | ATA_S_DRQ)) {
 		if (timeout > t) {
 			if (t != 0) {
-				device_printf(dev,
+				device_printf(ch->dev,
 				    "AHCI reset: device not ready after %dms "
 				    "(tfd = %08x)\n",
 				    MAX(t, 0) + t0, val);
@@ -2183,7 +2189,7 @@ ahci_wait_ready(device_t dev, int t, int t0)
 		timeout++;
 	}
 	if (bootverbose)
-		device_printf(dev, "AHCI reset: device ready after %dms\n",
+		device_printf(ch->dev, "AHCI reset: device ready after %dms\n",
 		    timeout + t0);
 	return (0);
 }
@@ -2191,22 +2197,21 @@ ahci_wait_ready(device_t dev, int t, int t0)
 static void
 ahci_reset_to(void *arg)
 {
-	device_t dev = arg;
-	struct ahci_channel *ch = device_get_softc(dev);
+	struct ahci_channel *ch = arg;
 
 	if (ch->resetting == 0)
 		return;
 	ch->resetting--;
-	if (ahci_wait_ready(dev, ch->resetting == 0 ? -1 : 0,
+	if (ahci_wait_ready(ch, ch->resetting == 0 ? -1 : 0,
 	    (310 - ch->resetting) * 100) == 0) {
 		ch->resetting = 0;
-		ahci_start(dev, 1);
+		ahci_start(ch, 1);
 		xpt_release_simq(ch->sim, TRUE);
 		return;
 	}
 	if (ch->resetting == 0) {
-		ahci_clo(dev);
-		ahci_start(dev, 1);
+		ahci_clo(ch);
+		ahci_start(ch, 1);
 		xpt_release_simq(ch->sim, TRUE);
 		return;
 	}
@@ -2214,15 +2219,14 @@ ahci_reset_to(void *arg)
 }
 
 static void
-ahci_reset(device_t dev)
+ahci_reset(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
-	struct ahci_controller *ctlr = device_get_softc(device_get_parent(dev));
+	struct ahci_controller *ctlr = device_get_softc(device_get_parent(ch->dev));
 	int i;
 
 	xpt_freeze_simq(ch->sim, 1);
 	if (bootverbose)
-		device_printf(dev, "AHCI reset...\n");
+		device_printf(ch->dev, "AHCI reset...\n");
 	/* Forget about previous reset. */
 	if (ch->resetting) {
 		ch->resetting = 0;
@@ -2241,7 +2245,7 @@ ahci_reset(device_t dev)
 		ahci_done(ch, fccb);
 	}
 	/* Kill the engine and requeue all running commands. */
-	ahci_stop(dev);
+	ahci_stop(ch);
 	for (i = 0; i < ch->numslots; i++) {
 		/* Do we have a running request on slot? */
 		if (ch->slot[i].state < AHCI_SLOT_RUNNING)
@@ -2267,9 +2271,9 @@ ahci_reset(device_t dev)
 	/* Disable port interrupts */
 	ATA_OUTL(ch->r_mem, AHCI_P_IE, 0);
 	/* Reset and reconnect PHY, */
-	if (!ahci_sata_phy_reset(dev)) {
+	if (!ahci_sata_phy_reset(ch)) {
 		if (bootverbose)
-			device_printf(dev,
+			device_printf(ch->dev,
 			    "AHCI reset: device not found\n");
 		ch->devices = 0;
 		/* Enable wanted port interrupts */
@@ -2280,11 +2284,11 @@ ahci_reset(device_t dev)
 		return;
 	}
 	if (bootverbose)
-		device_printf(dev, "AHCI reset: device found\n");
+		device_printf(ch->dev, "AHCI reset: device found\n");
 	/* Wait for clearing busy status. */
-	if (ahci_wait_ready(dev, dumping ? 31000 : 0, 0)) {
+	if (ahci_wait_ready(ch, dumping ? 31000 : 0, 0)) {
 		if (dumping)
-			ahci_clo(dev);
+			ahci_clo(ch);
 		else
 			ch->resetting = 310;
 	}
@@ -2298,17 +2302,16 @@ ahci_reset(device_t dev)
 	      AHCI_P_IX_DP | AHCI_P_IX_UF | (ctlr->ccc ? 0 : AHCI_P_IX_SDB) |
 	      AHCI_P_IX_DS | AHCI_P_IX_PS | (ctlr->ccc ? 0 : AHCI_P_IX_DHR)));
 	if (ch->resetting)
-		callout_reset(&ch->reset_timer, hz / 10, ahci_reset_to, dev);
+		callout_reset(&ch->reset_timer, hz / 10, ahci_reset_to, ch);
 	else {
-		ahci_start(dev, 1);
+		ahci_start(ch, 1);
 		xpt_release_simq(ch->sim, TRUE);
 	}
 }
 
 static int
-ahci_setup_fis(device_t dev, struct ahci_cmd_tab *ctp, union ccb *ccb, int tag)
+ahci_setup_fis(struct ahci_channel *ch, struct ahci_cmd_tab *ctp, union ccb *ccb, int tag)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	u_int8_t *fis = &ctp->cfis[0];
 
 	bzero(fis, 20);
@@ -2400,9 +2403,8 @@ ahci_sata_connect(struct ahci_channel *ch)
 }
 
 static int
-ahci_sata_phy_reset(device_t dev)
+ahci_sata_phy_reset(struct ahci_channel *ch)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 	int sata_rev;
 	uint32_t val;
 
@@ -2442,9 +2444,8 @@ ahci_sata_phy_reset(device_t dev)
 }
 
 static int
-ahci_check_ids(device_t dev, union ccb *ccb)
+ahci_check_ids(struct ahci_channel *ch, union ccb *ccb)
 {
-	struct ahci_channel *ch = device_get_softc(dev);
 
 	if (ccb->ccb_h.target_id > ((ch->caps & AHCI_CAP_SPM) ? 15 : 0)) {
 		ccb->ccb_h.status = CAM_TID_INVALID;
@@ -2462,19 +2463,17 @@ ahci_check_ids(device_t dev, union ccb *ccb)
 static void
 ahciaction(struct cam_sim *sim, union ccb *ccb)
 {
-	device_t dev, parent;
 	struct ahci_channel *ch;
 
 	CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("ahciaction func_code=%x\n",
 	    ccb->ccb_h.func_code));
 
 	ch = (struct ahci_channel *)cam_sim_softc(sim);
-	dev = ch->dev;
 	switch (ccb->ccb_h.func_code) {
 	/* Common cases first */
 	case XPT_ATA_IO:	/* Execute the requested I/O operation */
 	case XPT_SCSI_IO:
-		if (ahci_check_ids(dev, ccb))
+		if (ahci_check_ids(ch, ccb))
 			return;
 		if (ch->devices == 0 ||
 		    (ch->pm_present == 0 &&
@@ -2484,14 +2483,14 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 		}
 		ccb->ccb_h.recovery_type = RECOVERY_NONE;
 		/* Check for command collision. */
-		if (ahci_check_collision(dev, ccb)) {
+		if (ahci_check_collision(ch, ccb)) {
 			/* Freeze command. */
 			ch->frozen = ccb;
 			/* We have only one frozen slot, so freeze simq also. */
 			xpt_freeze_simq(ch->sim, 1);
 			return;
 		}
-		ahci_begin_transaction(dev, ccb);
+		ahci_begin_transaction(ch, ccb);
 		return;
 	case XPT_EN_LUN:		/* Enable LUN as a target */
 	case XPT_TARGET_IO:		/* Execute target I/O request */
@@ -2506,7 +2505,7 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 		struct	ccb_trans_settings *cts = &ccb->cts;
 		struct	ahci_device *d; 
 
-		if (ahci_check_ids(dev, ccb))
+		if (ahci_check_ids(ch, ccb))
 			return;
 		if (cts->type == CTS_TYPE_CURRENT_SETTINGS)
 			d = &ch->curr[ccb->ccb_h.target_id];
@@ -2536,7 +2535,7 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 		struct  ahci_device *d;
 		uint32_t status;
 
-		if (ahci_check_ids(dev, ccb))
+		if (ahci_check_ids(ch, ccb))
 			return;
 		if (cts->type == CTS_TYPE_CURRENT_SETTINGS)
 			d = &ch->curr[ccb->ccb_h.target_id];
@@ -2593,7 +2592,7 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 	}
 	case XPT_RESET_BUS:		/* Reset the specified SCSI bus */
 	case XPT_RESET_DEV:	/* Bus Device Reset the specified SCSI device */
-		ahci_reset(dev);
+		ahci_reset(ch);
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	case XPT_TERM_IO:		/* Terminate the I/O process */
@@ -2604,7 +2603,6 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 	{
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
-		parent = device_get_parent(dev);
 		cpi->version_num = 1; /* XXX??? */
 		cpi->hba_inquiry = PI_SDTR_ABLE;
 		if (ch->caps & AHCI_CAP_SNCQ)
@@ -2661,7 +2659,7 @@ ahcipoll(struct cam_sim *sim)
 	if (ch->resetting != 0 &&
 	    (--ch->resetpolldiv <= 0 || !callout_pending(&ch->reset_timer))) {
 		ch->resetpolldiv = 1000;
-		ahci_reset_to(ch->dev);
+		ahci_reset_to(ch);
 	}
 }
 MODULE_VERSION(ahci, 1);
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index 15d87a2d47ee..f5a3ca8cd98d 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -375,7 +375,7 @@ enum ahci_slot_states {
 };
 
 struct ahci_slot {
-    device_t                    dev;            /* Device handle */
+    struct ahci_channel		*ch;		/* Channel */
     u_int8_t			slot;           /* Number of this slot */
     enum ahci_slot_states	state;          /* Slot state */
     union ccb			*ccb;		/* CCB occupying slot */
@@ -422,20 +422,19 @@ struct ahci_channel {
 	int			quirks;
 	int			numslots;	/* Number of present slots */
 	int			pm_level;	/* power management level */
-
-	struct ahci_slot	slot[AHCI_MAX_SLOTS];
-	union ccb		*hold[AHCI_MAX_SLOTS];
-	struct mtx		mtx;		/* state lock */
-	STAILQ_HEAD(, ccb_hdr)	doneq;		/* queue of completed CCBs */
-	int			batch;		/* doneq is in use */
 	int			devices;        /* What is present */
 	int			pm_present;	/* PM presence reported */
 	int			fbs_enabled;	/* FIS-based switching enabled */
+
+	union ccb		*hold[AHCI_MAX_SLOTS];
+	struct ahci_slot	slot[AHCI_MAX_SLOTS];
 	uint32_t		oslots;		/* Occupied slots */
 	uint32_t		rslots;		/* Running slots */
 	uint32_t		aslots;		/* Slots with atomic commands  */
 	uint32_t		eslots;		/* Slots in error */
 	uint32_t		toslots;	/* Slots in timeout */
+	int			lastslot;	/* Last used slot */
+	int			taggedtarget;	/* Last tagged target */
 	int			numrslots;	/* Number of running slots */
 	int			numrslotspd[16];/* Number of running slots per dev */
 	int			numtslots;	/* Number of tagged slots */
@@ -443,8 +442,6 @@ struct ahci_channel {
 	int			numhslots;	/* Number of held slots */
 	int			recoverycmd;	/* Our READ LOG active */
 	int			fatalerr;	/* Fatal error happend */
-	int			lastslot;	/* Last used slot */
-	int			taggedtarget;	/* Last tagged target */
 	int			resetting;	/* Hard-reset in progress. */
 	int			resetpolldiv;	/* Hard-reset poll divider. */
 	int			listening;	/* SUD bit is cleared. */
@@ -455,6 +452,10 @@ struct ahci_channel {
 
 	struct ahci_device	user[16];	/* User-specified settings */
 	struct ahci_device	curr[16];	/* Current settings */
+
+	struct mtx_padalign	mtx;		/* state lock */
+	STAILQ_HEAD(, ccb_hdr)	doneq;		/* queue of completed CCBs */
+	int			batch;		/* doneq is in use */
 };
 
 struct ahci_enclosure {
diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
index 1c01a1e469a4..7b05d8406f63 100644
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@@ -179,31 +179,31 @@ static struct {
 	    AHCI_Q_EDGEIS | AHCI_Q_NONCQ | AHCI_Q_NOCOUNT},
 	{0x614511ab, 0x00, "Marvell 88SE6145",	AHCI_Q_NOFORCE | AHCI_Q_4CH |
 	    AHCI_Q_EDGEIS | AHCI_Q_NONCQ | AHCI_Q_NOCOUNT},
-	{0x91201b4b, 0x00, "Marvell 88SE912x",	AHCI_Q_EDGEIS|AHCI_Q_NOBSYRES},
-	{0x91231b4b, 0x11, "Marvell 88SE912x",	AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
-	{0x91231b4b, 0x00, "Marvell 88SE912x",	AHCI_Q_EDGEIS|AHCI_Q_SATA2|AHCI_Q_NOBSYRES},
-	{0x91251b4b, 0x00, "Marvell 88SE9125",	AHCI_Q_NOBSYRES},
-	{0x91281b4b, 0x00, "Marvell 88SE9128",	AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
-	{0x91301b4b, 0x00, "Marvell 88SE9130",  AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
-	{0x91721b4b, 0x00, "Marvell 88SE9172",	AHCI_Q_NOBSYRES},
-	{0x91821b4b, 0x00, "Marvell 88SE9182",	AHCI_Q_NOBSYRES},
-	{0x91831b4b, 0x00, "Marvell 88SS9183",	AHCI_Q_NOBSYRES},
-	{0x91a01b4b, 0x00, "Marvell 88SE91Ax",	AHCI_Q_NOBSYRES},
-	{0x92151b4b, 0x00, "Marvell 88SE9215",  AHCI_Q_NOBSYRES},
-	{0x92201b4b, 0x00, "Marvell 88SE9220",  AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
-	{0x92301b4b, 0x00, "Marvell 88SE9230",  AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
-	{0x92351b4b, 0x00, "Marvell 88SE9235",  AHCI_Q_NOBSYRES},
-	{0x06201103, 0x00, "HighPoint RocketRAID 620",	AHCI_Q_NOBSYRES},
-	{0x06201b4b, 0x00, "HighPoint RocketRAID 620",	AHCI_Q_NOBSYRES},
-	{0x06221103, 0x00, "HighPoint RocketRAID 622",	AHCI_Q_NOBSYRES},
-	{0x06221b4b, 0x00, "HighPoint RocketRAID 622",	AHCI_Q_NOBSYRES},
-	{0x06401103, 0x00, "HighPoint RocketRAID 640",	AHCI_Q_NOBSYRES},
-	{0x06401b4b, 0x00, "HighPoint RocketRAID 640",	AHCI_Q_NOBSYRES},
-	{0x06441103, 0x00, "HighPoint RocketRAID 644",	AHCI_Q_NOBSYRES},
-	{0x06441b4b, 0x00, "HighPoint RocketRAID 644",	AHCI_Q_NOBSYRES},
-	{0x06411103, 0x00, "HighPoint RocketRAID 640L",	AHCI_Q_NOBSYRES},
-	{0x06421103, 0x00, "HighPoint RocketRAID 642L",	AHCI_Q_NOBSYRES},
-	{0x06451103, 0x00, "HighPoint RocketRAID 644L",	AHCI_Q_NOBSYRES},
+	{0x91201b4b, 0x00, "Marvell 88SE912x",	AHCI_Q_EDGEIS},
+	{0x91231b4b, 0x11, "Marvell 88SE912x",	AHCI_Q_ALTSIG},
+	{0x91231b4b, 0x00, "Marvell 88SE912x",	AHCI_Q_EDGEIS|AHCI_Q_SATA2},
+	{0x91251b4b, 0x00, "Marvell 88SE9125",	0},
+	{0x91281b4b, 0x00, "Marvell 88SE9128",	AHCI_Q_ALTSIG},
+	{0x91301b4b, 0x00, "Marvell 88SE9130",  AHCI_Q_ALTSIG},
+	{0x91721b4b, 0x00, "Marvell 88SE9172",	0},
+	{0x91821b4b, 0x00, "Marvell 88SE9182",	0},
+	{0x91831b4b, 0x00, "Marvell 88SS9183",	0},
+	{0x91a01b4b, 0x00, "Marvell 88SE91Ax",	0},
+	{0x92151b4b, 0x00, "Marvell 88SE9215",  0},
+	{0x92201b4b, 0x00, "Marvell 88SE9220",  AHCI_Q_ALTSIG},
+	{0x92301b4b, 0x00, "Marvell 88SE9230",  AHCI_Q_ALTSIG},
+	{0x92351b4b, 0x00, "Marvell 88SE9235",  0},
+	{0x06201103, 0x00, "HighPoint RocketRAID 620",	0},
+	{0x06201b4b, 0x00, "HighPoint RocketRAID 620",	0},
+	{0x06221103, 0x00, "HighPoint RocketRAID 622",	0},
+	{0x06221b4b, 0x00, "HighPoint RocketRAID 622",	0},
+	{0x06401103, 0x00, "HighPoint RocketRAID 640",	0},
+	{0x06401b4b, 0x00, "HighPoint RocketRAID 640",	0},
+	{0x06441103, 0x00, "HighPoint RocketRAID 644",	0},
+	{0x06441b4b, 0x00, "HighPoint RocketRAID 644",	0},
+	{0x06411103, 0x00, "HighPoint RocketRAID 640L",	0},
+	{0x06421103, 0x00, "HighPoint RocketRAID 642L",	0},
+	{0x06451103, 0x00, "HighPoint RocketRAID 644L",	0},
 	{0x044c10de, 0x00, "NVIDIA MCP65",	AHCI_Q_NOAA},
 	{0x044d10de, 0x00, "NVIDIA MCP65",	AHCI_Q_NOAA},
 	{0x044e10de, 0x00, "NVIDIA MCP65",	AHCI_Q_NOAA},
@@ -273,6 +273,7 @@ static struct {
 	{0x0d8d10de, 0x00, "NVIDIA MCP89",	AHCI_Q_NOAA},
 	{0x0d8e10de, 0x00, "NVIDIA MCP89",	AHCI_Q_NOAA},
 	{0x0d8f10de, 0x00, "NVIDIA MCP89",	AHCI_Q_NOAA},
+	{0x3781105a, 0x00, "Promise TX8660",	0},
 	{0x33491106, 0x00, "VIA VT8251",	AHCI_Q_NOPMP|AHCI_Q_NONCQ},
 	{0x62871106, 0x00, "VIA VT8251",	AHCI_Q_NOPMP|AHCI_Q_NONCQ},
 	{0x11841039, 0x00, "SiS 966",		0},
@@ -417,13 +418,6 @@ ahci_pci_attach(device_t dev)
 		ctlr->numirqs = 1;
 	}
 
-	if (ahci_setup_interrupt(dev)) {
-		if (ctlr->msi)
-			pci_release_msi(dev);
-		bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);
-		return ENXIO;
-	}
-
 	error = ahci_attach(dev);
 	if (error != 0)
 		if (ctlr->msi)
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c
index 8785a7800e40..94185eed253e 100644
--- a/sys/dev/ahci/ahciem.c
+++ b/sys/dev/ahci/ahciem.c
@@ -344,7 +344,7 @@ ahci_em_led(void *priv, int onoff)
 }
 
 static int
-ahci_check_ids(device_t dev, union ccb *ccb)
+ahci_check_ids(union ccb *ccb)
 {
 
 	if (ccb->ccb_h.target_id != 0) {
@@ -554,7 +554,7 @@ ahciemaction(struct cam_sim *sim, union ccb *ccb)
 	dev = enc->dev;
 	switch (ccb->ccb_h.func_code) {
 	case XPT_ATA_IO:	/* Execute the requested I/O operation */
-		if (ahci_check_ids(dev, ccb))
+		if (ahci_check_ids(ccb))
 			return;
 		ahci_em_begin_transaction(dev, ccb);
 		return;
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index 3f661fdefb7b..ecb3b47d11c8 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -2323,13 +2323,13 @@ alc_watchdog(struct alc_softc *sc)
 	ifp = sc->alc_ifp;
 	if ((sc->alc_flags & ALC_FLAG_LINK) == 0) {
 		if_printf(sc->alc_ifp, "watchdog timeout (lost link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		alc_init_locked(sc);
 		return;
 	}
 	if_printf(sc->alc_ifp, "watchdog timeout -- resetting\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	alc_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -2608,11 +2608,11 @@ alc_stats_update(struct alc_softc *sc)
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, smb->tx_frames);
 
-	ifp->if_collisions += smb->tx_single_colls +
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, smb->tx_single_colls +
 	    smb->tx_multi_colls * 2 + smb->tx_late_colls +
-	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT);
 
 	/*
 	 * XXX
@@ -2621,15 +2621,16 @@ alc_stats_update(struct alc_softc *sc)
 	 * the counter name is not correct one so I've removed the
 	 * counter in output errors.
 	 */
-	ifp->if_oerrors += smb->tx_abort + smb->tx_late_colls +
-	    smb->tx_underrun;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    smb->tx_abort + smb->tx_late_colls + smb->tx_underrun);
 
-	ifp->if_ipackets += smb->rx_frames;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, smb->rx_frames);
 
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 
 	if ((sc->alc_flags & ALC_FLAG_SMB_BUG) == 0) {
 		/* Update done, clear. */
@@ -2921,7 +2922,7 @@ alc_fixup_rx(struct ifnet *ifp, struct mbuf *m)
 	 */
 	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (n == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		m_freem(m);
 		return (NULL);
 	}
@@ -2977,7 +2978,7 @@ alc_rxeof(struct alc_softc *sc, struct rx_rdesc *rrd)
 		mp = rxd->rx_m;
 		/* Add a new receive buffer to the ring. */
 		if (alc_newbuf(sc, rxd) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* Reuse Rx buffers. */
 			if (sc->alc_cdata.alc_rxhead != NULL)
 				m_freem(sc->alc_cdata.alc_rxhead);
diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
index 0b21cf595af7..78dfa0e40b2e 100644
--- a/sys/dev/ale/if_ale.c
+++ b/sys/dev/ale/if_ale.c
@@ -1953,13 +1953,13 @@ ale_watchdog(struct ale_softc *sc)
 	ifp = sc->ale_ifp;
 	if ((sc->ale_flags & ALE_FLAG_LINK) == 0) {
 		if_printf(sc->ale_ifp, "watchdog timeout (lost link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		ale_init_locked(sc);
 		return;
 	}
 	if_printf(sc->ale_ifp, "watchdog timeout -- resetting\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	ale_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -2206,11 +2206,11 @@ ale_stats_update(struct ale_softc *sc)
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, smb->tx_frames);
 
-	ifp->if_collisions += smb->tx_single_colls +
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, smb->tx_single_colls +
 	    smb->tx_multi_colls * 2 + smb->tx_late_colls +
-	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT);
 
 	/*
 	 * XXX
@@ -2219,15 +2219,16 @@ ale_stats_update(struct ale_softc *sc)
 	 * the counter name is not correct one so I've removed the
 	 * counter in output errors.
 	 */
-	ifp->if_oerrors += smb->tx_abort + smb->tx_late_colls +
-	    smb->tx_underrun;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    smb->tx_abort + smb->tx_late_colls + smb->tx_underrun);
 
-	ifp->if_ipackets += smb->rx_frames;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, smb->rx_frames);
 
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 }
 
 static int
@@ -2549,7 +2550,7 @@ ale_rxeof(struct ale_softc *sc, int count)
 		m = m_devget((char *)(rs + 1), length - ETHER_CRC_LEN,
 		    ETHER_ALIGN, ifp, NULL);
 		if (m == NULL) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			ale_rx_update_page(sc, &rx_page, length, &prod);
 			continue;
 		}
diff --git a/sys/pci/alpm.c b/sys/dev/alpm/alpm.c
similarity index 100%
rename from sys/pci/alpm.c
rename to sys/dev/alpm/alpm.c
diff --git a/sys/dev/altera/atse/a_api.h b/sys/dev/altera/atse/a_api.h
index ad34e9ed7a7b..4bd380df6377 100644
--- a/sys/dev/altera/atse/a_api.h
+++ b/sys/dev/altera/atse/a_api.h
@@ -69,20 +69,20 @@
 #define	A_ONCHIP_FIFO_MEM_CORE_STATUS_UNDERFLOW		(1<<5)
 
 /* Table 16-6. Event Bit Field Descriptions. */
-/* XXX Datasheet has weird bit fields. Validate. */
-#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY		(1<<0)
-#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_FULL		(1<<1)
-#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTEMPTY	(1<<2)
-#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTFULL		(1<<3)
+/* XXX Datasheet has incorrect bit fields. Validate. */
+#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_FULL		(1<<0)
+#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY		(1<<1)
+#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTFULL		(1<<2)
+#define	A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTEMPTY	(1<<3)
 #define	A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW		(1<<4)
 #define	A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW		(1<<5)
 
 /* Table 16-7. InterruptEnable Bit Field Descriptions. */
-/* XXX Datasheet has weird bit fields. Validate. */
-#define	A_ONCHIP_FIFO_MEM_CORE_INTR_EMPTY		(1<<0)
-#define	A_ONCHIP_FIFO_MEM_CORE_INTR_FULL		(1<<1)
-#define	A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTEMPTY		(1<<2)
-#define	A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTFULL		(1<<3)
+/* XXX Datasheet has incorrect bit fields. Validate. */
+#define	A_ONCHIP_FIFO_MEM_CORE_INTR_FULL		(1<<0)
+#define	A_ONCHIP_FIFO_MEM_CORE_INTR_EMPTY		(1<<1)
+#define	A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTFULL		(1<<2)
+#define	A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTEMPTY		(1<<3)
 #define	A_ONCHIP_FIFO_MEM_CORE_INTR_OVERFLOW		(1<<4)
 #define	A_ONCHIP_FIFO_MEM_CORE_INTR_UNDERFLOW		(1<<5)
 #define	A_ONCHIP_FIFO_MEM_CORE_INTR_ALL			\
diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
index 64eae9f2d8ab..1c55fbc9666b 100644
--- a/sys/dev/altera/atse/if_atse.c
+++ b/sys/dev/altera/atse/if_atse.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2012,2013 Bjoern A. Zeeb
+ * Copyright (c) 2014 Robert N. M. Watson
  * All rights reserved.
  *
  * This software was developed by SRI International and the University of
@@ -103,6 +104,11 @@ static poll_handler_t atse_poll;
 static int atse_ethernet_option_bits_flag = ATSE_ETHERNET_OPTION_BITS_UNDEF;
 static uint8_t atse_ethernet_option_bits[ALTERA_ETHERNET_OPTION_BITS_LEN];
 
+static int	atse_intr_debug_enable = 0;
+SYSCTL_INT(_debug, OID_AUTO, atse_intr_debug_enable, CTLFLAG_RW,
+    &atse_intr_debug_enable, 0,
+   "Extra debugging output for atse interrupts");
+
 /*
  * Softc and critical resource locking.
  */
@@ -110,6 +116,9 @@ static uint8_t atse_ethernet_option_bits[ALTERA_ETHERNET_OPTION_BITS_LEN];
 #define	ATSE_UNLOCK(_sc)	mtx_unlock(&(_sc)->atse_mtx)
 #define	ATSE_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->atse_mtx, MA_OWNED)
 
+#define	ATSE_TX_PENDING(sc)	(sc->atse_tx_m != NULL ||		\
+				    !IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+
 #ifdef DEBUG
 #define	DPRINTF(format, ...)	printf(format, __VA_ARGS__)
 #else
@@ -169,6 +178,16 @@ a_onchip_fifo_mem_core_read(struct resource *res, uint32_t off,
 	    A_ONCHIP_FIFO_MEM_CORE_METADATA,				\
 	    "RXM", __func__, __LINE__)
 
+#define	ATSE_RX_STATUS_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_rxc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_I_STATUS,			\
+	    "RX_EVENT", __func__, __LINE__)
+
+#define	ATSE_TX_STATUS_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_txc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_I_STATUS,			\
+	    "TX_EVENT", __func__, __LINE__)
+
 #define	ATSE_RX_EVENT_READ(sc)						\
 	a_onchip_fifo_mem_core_read((sc)->atse_rxc_mem_res,		\
 	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,			\
@@ -208,24 +227,41 @@ a_onchip_fifo_mem_core_read(struct resource *res, uint32_t off,
 			    val4, "TX_EVENT", __func__, __LINE__);	\
 	} while(0)
 
+#define	ATSE_RX_EVENTS	(A_ONCHIP_FIFO_MEM_CORE_INTR_FULL |	\
+			    A_ONCHIP_FIFO_MEM_CORE_INTR_OVERFLOW |	\
+			    A_ONCHIP_FIFO_MEM_CORE_INTR_UNDERFLOW)
 #define	ATSE_RX_INTR_ENABLE(sc)						\
 	a_onchip_fifo_mem_core_write((sc)->atse_rxc_mem_res,		\
 	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE,		\
-	    A_ONCHIP_FIFO_MEM_CORE_INTR_ALL,				\
+	    ATSE_RX_EVENTS,						\
 	    "RX_INTR", __func__, __LINE__)	/* XXX-BZ review later. */
 #define	ATSE_RX_INTR_DISABLE(sc)					\
 	a_onchip_fifo_mem_core_write((sc)->atse_rxc_mem_res,		\
 	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE, 0,		\
 	    "RX_INTR", __func__, __LINE__)
+#define	ATSE_RX_INTR_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_rxc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE,		\
+	    "RX_INTR", __func__, __LINE__)
+
+#define	ATSE_TX_EVENTS	(A_ONCHIP_FIFO_MEM_CORE_INTR_EMPTY |		\
+			    A_ONCHIP_FIFO_MEM_CORE_INTR_OVERFLOW |	\
+			    A_ONCHIP_FIFO_MEM_CORE_INTR_UNDERFLOW)
 #define	ATSE_TX_INTR_ENABLE(sc)						\
 	a_onchip_fifo_mem_core_write((sc)->atse_txc_mem_res,		\
 	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE,		\
-	    A_ONCHIP_FIFO_MEM_CORE_INTR_ALL,				\
+	    ATSE_TX_EVENTS,						\
 	    "TX_INTR", __func__, __LINE__)	/* XXX-BZ review later. */
 #define	ATSE_TX_INTR_DISABLE(sc)					\
 	a_onchip_fifo_mem_core_write((sc)->atse_txc_mem_res,		\
 	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE, 0,		\
 	    "TX_INTR", __func__, __LINE__)
+#define	ATSE_TX_INTR_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_txc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE,		\
+	    "TX_INTR", __func__, __LINE__)
+
+static int	atse_rx_locked(struct atse_softc *sc);
 
 /*
  * Register space access macros.
@@ -985,6 +1021,11 @@ atse_init(void *xsc)
 {
 	struct atse_softc *sc;
 
+	/*
+	 * XXXRW: There is some argument that we should immediately do RX
+	 * processing after enabling interrupts, or one may not fire if there
+	 * are buffered packets.
+	 */
 	sc = (struct atse_softc *)xsc;
 	ATSE_LOCK(sc);
 	atse_init_locked(sc);
@@ -1081,6 +1122,33 @@ atse_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	return (error);
 }
 
+static void
+atse_intr_debug(struct atse_softc *sc, const char *intrname)
+{
+	uint32_t rxs, rxe, rxi, rxf, txs, txe, txi, txf;
+
+	if (!atse_intr_debug_enable)
+		return;
+
+	rxs = ATSE_RX_STATUS_READ(sc);
+	rxe = ATSE_RX_EVENT_READ(sc);
+	rxi = ATSE_RX_INTR_READ(sc);
+	rxf = ATSE_RX_READ_FILL_LEVEL(sc);
+
+	txs = ATSE_TX_STATUS_READ(sc);
+	txe = ATSE_TX_EVENT_READ(sc);
+	txi = ATSE_TX_INTR_READ(sc);
+	txf = ATSE_TX_READ_FILL_LEVEL(sc);
+
+	printf(
+	    "%s - %s: "
+	    "rxs 0x%x rxe 0x%x rxi 0x%x rxf 0x%x "
+	    "txs 0x%x txe 0x%x txi 0x%x txf 0x%x\n",
+	    __func__, intrname,
+	    rxs, rxe, rxi, rxf,
+	    txs, txe, txi, txf);
+}
+
 static void
 atse_watchdog(struct atse_softc *sc)
 {
@@ -1091,11 +1159,14 @@ atse_watchdog(struct atse_softc *sc)
 		return;
 
 	device_printf(sc->atse_dev, "watchdog timeout\n");
-	sc->atse_ifp->if_oerrors++;
+	if_inc_counter(sc->atse_ifp, IFCOUNTER_OERRORS, 1);
+
+	atse_intr_debug(sc, "poll");
 
 	sc->atse_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	atse_init_locked(sc);
 
+	atse_rx_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&sc->atse_ifp->if_snd))
 		atse_start_locked(sc->atse_ifp);
 }
@@ -1169,10 +1240,6 @@ atse_rx_locked(struct atse_softc *sc)
 	meta = 0;
 	do {
 outer:
-		if (sc->atse_rx_cycles <= 0)
-			return (rx_npkts);
-		sc->atse_rx_cycles--;
-
 		if (sc->atse_rx_m == NULL) {
 			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			if (m == NULL)
@@ -1196,7 +1263,7 @@ atse_rx_locked(struct atse_softc *sc)
 				atse_update_rx_err(sc, ((meta &
 				    A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >>
 				    A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				sc->atse_rx_buf_len = 0;
 				/*
 				 * Should still read till EOP or next SOP.
@@ -1225,7 +1292,7 @@ atse_rx_locked(struct atse_softc *sc)
 					    "without empty buffer: %u\n",
 					    __func__, sc->atse_rx_buf_len);
 					/* XXX-BZ any better counter? */
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				}
 				
 				if ((sc->atse_flags & ATSE_FLAGS_SOP_SEEN) == 0)
@@ -1238,12 +1305,13 @@ atse_rx_locked(struct atse_softc *sc)
 			data = ATSE_RX_DATA_READ(sc);
 #endif
 			/* Make sure to not overflow the mbuf data size. */
-			if (sc->atse_rx_buf_len >= sc->atse_rx_m->m_len - 4) {
+			if (sc->atse_rx_buf_len >= sc->atse_rx_m->m_len -
+			    sizeof(data)) {
 				/*
 				 * XXX-BZ Error.  We need more mbufs and are
 				 * not setup for this yet.
 				 */
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				sc->atse_flags |= ATSE_FLAGS_ERROR;
 			}
 			if ((sc->atse_flags & ATSE_FLAGS_ERROR) == 0)
@@ -1262,7 +1330,7 @@ atse_rx_locked(struct atse_softc *sc)
 				    A_ONCHIP_FIFO_MEM_CORE_EMPTY_SHIFT;
 				sc->atse_rx_buf_len += (4 - empty);
 
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 				rx_npkts++;
 
 				m = sc->atse_rx_m;
@@ -1275,15 +1343,19 @@ atse_rx_locked(struct atse_softc *sc)
 				if (sc->atse_flags & ATSE_FLAGS_ERROR) {
 					sc->atse_flags &= ~ATSE_FLAGS_ERROR;
 					m_freem(m);
-					/* Need to start with a new packet. */
-					goto outer;
+				} else {
+					m->m_pkthdr.rcvif = ifp;
+					ATSE_UNLOCK(sc);
+					(*ifp->if_input)(ifp, m);
+					ATSE_LOCK(sc);
 				}
-
-				m->m_pkthdr.rcvif = ifp;
-
-				ATSE_UNLOCK(sc);
-				(*ifp->if_input)(ifp, m);
-				ATSE_LOCK(sc);
+#ifdef DEVICE_POLLING
+				if (ifp->if_capenable & IFCAP_POLLING) {
+					if (sc->atse_rx_cycles <= 0)
+						return (rx_npkts);
+					sc->atse_rx_cycles--;
+				}
+#endif
 				goto outer;	/* Need a new mbuf. */
 			} else {
 				sc->atse_rx_buf_len += sizeof(data);
@@ -1291,7 +1363,7 @@ atse_rx_locked(struct atse_softc *sc)
 		} /* for */
 
 	/* XXX-BZ could optimize in case of another packet waiting. */
-	} while ((meta & A_ONCHIP_FIFO_MEM_CORE_EOP) == 0 || fill > 0);
+	} while (fill > 0);
 
 	return (rx_npkts);
 }
@@ -1317,11 +1389,11 @@ atse_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 }
 
 static void
-atse_intr(void *arg)
+atse_rx_intr(void *arg)
 {
 	struct atse_softc *sc;
 	struct ifnet *ifp;
-	uint32_t rx, tx;
+	uint32_t rxe;
 
 	sc = (struct atse_softc *)arg;
 	ifp = sc->atse_ifp;
@@ -1334,54 +1406,94 @@ atse_intr(void *arg)
 	}  
 #endif
 
-	ATSE_RX_INTR_DISABLE(sc);
-	ATSE_TX_INTR_DISABLE(sc);
-
-	rx = ATSE_RX_EVENT_READ(sc);
-	tx = ATSE_TX_EVENT_READ(sc);
-	if (rx != 0) {
-		if (rx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
-		    A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
-			/* XXX-BZ ERROR HANDLING. */
-			atse_update_rx_err(sc, ((rx &
-			    A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >>
-			    A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff);
-			ifp->if_ierrors++;
-		}
-		if ((rx & A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY) != 0) {
-			sc->atse_rx_cycles = RX_CYCLES_IN_INTR;
-			atse_rx_locked(sc);
-		}
+	atse_intr_debug(sc, "rx");
+	rxe = ATSE_RX_EVENT_READ(sc);
+	if (rxe & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
+	    A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
+		/* XXX-BZ ERROR HANDLING. */
+		atse_update_rx_err(sc, ((rxe &
+		    A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >>
+		    A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff);
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
-	if (tx != 0) {
-		/* XXX-BZ build histogram. */
-		if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
-		    A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
-			/* XXX-BZ ERROR HANDLING. */
-			ifp->if_oerrors++;
-		}
-		if (tx & A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY)
-			sc->atse_watchdog_timer = 0;
+
+	/*
+	 * There is considerable subtlety in the race-free handling of rx
+	 * interrupts: we must disable interrupts whenever we manipulate the
+	 * FIFO to prevent further interrupts from firing before we are done;
+	 * we must clear the event after processing to prevent the event from
+	 * being immediately reposted due to data remaining; we must clear the
+	 * event mask before reenabling interrupts or risk missing a positive
+	 * edge; and we must recheck everything after completing in case the
+	 * event posted between clearing events and reenabling interrupts.  If
+	 * a race is experienced, we must restart the whole mechanism.
+	 */
+	do {
+		ATSE_RX_INTR_DISABLE(sc);
 #if 0
-		if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY|
-		    A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTEMPTY))
-			atse_start_locked(ifp);
+		sc->atse_rx_cycles = RX_CYCLES_IN_INTR;
 #endif
+		atse_rx_locked(sc);
+		ATSE_RX_EVENT_CLEAR(sc);
+
+		/* Disable interrupts if interface is down. */
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+			ATSE_RX_INTR_ENABLE(sc);
+	} while (!(ATSE_RX_STATUS_READ(sc) &
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_EMPTY));
+	ATSE_UNLOCK(sc);
+
+}
+
+static void
+atse_tx_intr(void *arg)
+{
+	struct atse_softc *sc;
+	struct ifnet *ifp;
+	uint32_t txe;
+
+	sc = (struct atse_softc *)arg;
+	ifp = sc->atse_ifp;
+
+	ATSE_LOCK(sc);
+#ifdef DEVICE_POLLING
+	if (ifp->if_capenable & IFCAP_POLLING) {
+		ATSE_UNLOCK(sc);
+		return;
+	}  
+#endif
+
+	/* XXX-BZ build histogram. */
+	atse_intr_debug(sc, "tx");
+	txe = ATSE_TX_EVENT_READ(sc);
+	if (txe & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
+	    A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
+		/* XXX-BZ ERROR HANDLING. */
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 
-	/* Clear events before re-enabling intrs. */
-	ATSE_TX_EVENT_CLEAR(sc);
-	ATSE_RX_EVENT_CLEAR(sc);
-
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-		/* Re-enable interrupts. */
-		ATSE_RX_INTR_ENABLE(sc);
-		ATSE_TX_INTR_ENABLE(sc);
-
-		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
-			atse_start_locked(ifp);
-	}
+	/*
+	 * There is also considerable subtlety in the race-free handling of
+	 * tx interrupts: all processing occurs with interrupts disabled to
+	 * prevent spurious refiring while transmit is in progress (which
+	 * could occur if the FIFO drains while sending -- quite likely); we
+	 * must not clear the event mask until after we've sent, also to
+	 * prevent spurious refiring; once we've cleared the event mask we can
+	 * reenable interrupts, but there is a possible race between clear and
+	 * enable, so we must recheck and potentially repeat the whole process
+	 * if it is detected.
+	 */
+	do {
+		ATSE_TX_INTR_DISABLE(sc);
+		sc->atse_watchdog_timer = 0;
+		atse_start_locked(ifp);
+		ATSE_TX_EVENT_CLEAR(sc);
 
+		/* Disable interrupts if interface is down. */
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+			ATSE_TX_INTR_ENABLE(sc);
+	} while (ATSE_TX_PENDING(sc) &&
+	    !(ATSE_TX_STATUS_READ(sc) & A_ONCHIP_FIFO_MEM_CORE_STATUS_FULL));
 	ATSE_UNLOCK(sc);
 }
 
@@ -1415,14 +1527,14 @@ atse_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 			atse_update_rx_err(sc, ((rx &
 			    A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >>
 			    A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
 		    A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
 			/* XXX-BZ ERROR HANDLING. */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
-		if (tx & A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY)
+		if (ATSE_TX_READ_FILL_LEVEL(sc) == 0)
 			sc->atse_watchdog_timer = 0;
 
 #if 0
@@ -1719,7 +1831,7 @@ atse_attach(device_t dev)
 	/* Hook up interrupts. */
 	if (sc->atse_rx_irq_res != NULL) {
 		error = bus_setup_intr(dev, sc->atse_rx_irq_res, INTR_TYPE_NET |
-		    INTR_MPSAFE, NULL, atse_intr, sc, &sc->atse_rx_intrhand);
+		    INTR_MPSAFE, NULL, atse_rx_intr, sc, &sc->atse_rx_intrhand);
 		if (error != 0) {
 			device_printf(dev, "enabling RX IRQ failed\n");
 			ether_ifdetach(ifp);
@@ -1729,7 +1841,7 @@ atse_attach(device_t dev)
 
 	if (sc->atse_tx_irq_res != NULL) {
 		error = bus_setup_intr(dev, sc->atse_tx_irq_res, INTR_TYPE_NET |
-		    INTR_MPSAFE, NULL, atse_intr, sc, &sc->atse_tx_intrhand);
+		    INTR_MPSAFE, NULL, atse_tx_intr, sc, &sc->atse_tx_intrhand);
 		if (error != 0) {
 			bus_teardown_intr(dev, sc->atse_rx_irq_res,
 			    sc->atse_rx_intrhand);
diff --git a/sys/pci/amdpm.c b/sys/dev/amdpm/amdpm.c
similarity index 100%
rename from sys/pci/amdpm.c
rename to sys/dev/amdpm/amdpm.c
diff --git a/sys/pci/amdsmb.c b/sys/dev/amdsmb/amdsmb.c
similarity index 100%
rename from sys/pci/amdsmb.c
rename to sys/dev/amdsmb/amdsmb.c
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 7067520a8398..bee2a0cf5790 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -872,7 +872,7 @@ an_rxeof(struct an_softc *sc)
 			/* read header */
 			if (an_read_data(sc, id, 0x0, (caddr_t)&rx_frame,
 					 sizeof(rx_frame))) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 
@@ -895,7 +895,7 @@ an_rxeof(struct an_softc *sc)
 					if_printf(ifp, "oversized packet "
 					       "received (%d, %d)\n",
 					       len, MCLBYTES);
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					return;
 				}
 
@@ -921,7 +921,7 @@ an_rxeof(struct an_softc *sc)
 					if_printf(ifp, "oversized packet "
 					       "received (%d, %d)\n",
 					       len, MCLBYTES);
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					return;
 				}
 
@@ -940,13 +940,13 @@ an_rxeof(struct an_softc *sc)
 		} else {
 			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 			MCLGET(m, M_NOWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 			m->m_pkthdr.rcvif = ifp;
@@ -957,7 +957,7 @@ an_rxeof(struct an_softc *sc)
 			if (an_read_data(sc, id, 0, (caddr_t)&rx_frame,
 					 sizeof(rx_frame))) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 #endif
@@ -966,12 +966,12 @@ an_rxeof(struct an_softc *sc)
 					 (caddr_t)&rx_frame_802_3,
 					 sizeof(rx_frame_802_3))) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 			if (rx_frame_802_3.an_rx_802_3_status != 0) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 			/* Check for insane frame length */
@@ -981,7 +981,7 @@ an_rxeof(struct an_softc *sc)
 				if_printf(ifp, "oversized packet "
 				       "received (%d, %d)\n",
 				       len, MCLBYTES);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 			m->m_pkthdr.len = m->m_len =
@@ -1001,10 +1001,10 @@ an_rxeof(struct an_softc *sc)
 
 			if (error) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 			/* Receive packet. */
 #ifdef ANCACHE
@@ -1031,13 +1031,13 @@ an_rxeof(struct an_softc *sc)
 
 				MGETHDR(m, M_NOWAIT, MT_DATA);
 				if (m == NULL) {
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					return;
 				}
 				MCLGET(m, M_NOWAIT);
 				if (!(m->m_flags & M_EXT)) {
 					m_freem(m);
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					return;
 				}
 				m->m_pkthdr.rcvif = ifp;
@@ -1061,7 +1061,7 @@ an_rxeof(struct an_softc *sc)
 					if_printf(ifp, "oversized packet "
 					       "received (%d, %d)\n",
 					       len, MCLBYTES);
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 					return;
 				}
 
@@ -1073,7 +1073,7 @@ an_rxeof(struct an_softc *sc)
 				bcopy(buf, (char *)eh,
 				      m->m_pkthdr.len);
 
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 				/* Receive packet. */
 #if 0
@@ -1126,9 +1126,9 @@ an_txeof(struct an_softc *sc, int status)
 		id = CSR_READ_2(sc, AN_TX_CMP_FID(sc->mpi350));
 
 		if (status & AN_EV_TX_EXC) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		for (i = 0; i < AN_TX_RING_CNT; i++) {
 			if (id == sc->an_rdata.an_tx_ring[i]) {
@@ -1142,9 +1142,9 @@ an_txeof(struct an_softc *sc, int status)
 		id = CSR_READ_2(sc, AN_TX_CMP_FID(sc->mpi350));
 		if (!sc->an_rdata.an_tx_empty){
 			if (status & AN_EV_TX_EXC) {
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			AN_INC(sc->an_rdata.an_tx_cons, AN_MAX_TX_DESC);
 			if (sc->an_rdata.an_tx_prod ==
 			    sc->an_rdata.an_tx_cons)
@@ -2962,7 +2962,7 @@ an_watchdog(struct an_softc *sc)
 		an_init_mpi350_desc(sc);
 	an_init_locked(sc);
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 int
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index 099e7f17a988..5933307f3e9c 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -77,6 +77,7 @@ static int 	asmc_key_read(device_t dev, const char *key, uint8_t *buf,
     uint8_t);
 static int 	asmc_fan_count(device_t dev);
 static int 	asmc_fan_getvalue(device_t dev, const char *key, int fan);
+static int 	asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed);
 static int 	asmc_temp_getvalue(device_t dev, const char *key);
 static int 	asmc_sms_read(device_t, const char *key, int16_t *val);
 static void 	asmc_sms_calibrate(device_t dev);
@@ -94,6 +95,7 @@ static int	asmc_key_dump(device_t, int);
 /*
  * Model functions.
  */
+static int 	asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS);
 static int 	asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS);
 static int 	asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS);
 static int 	asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS);
@@ -115,6 +117,7 @@ struct asmc_model {
 	int (*smc_sms_x)(SYSCTL_HANDLER_ARGS);
 	int (*smc_sms_y)(SYSCTL_HANDLER_ARGS);
 	int (*smc_sms_z)(SYSCTL_HANDLER_ARGS);
+	int (*smc_fan_id)(SYSCTL_HANDLER_ARGS);
 	int (*smc_fan_speed)(SYSCTL_HANDLER_ARGS);
 	int (*smc_fan_safespeed)(SYSCTL_HANDLER_ARGS);
 	int (*smc_fan_minspeed)(SYSCTL_HANDLER_ARGS);
@@ -134,7 +137,7 @@ static struct asmc_model *asmc_match(device_t dev);
 #define ASMC_SMS_FUNCS	asmc_mb_sysctl_sms_x, asmc_mb_sysctl_sms_y, \
 			asmc_mb_sysctl_sms_z
 
-#define ASMC_FAN_FUNCS	asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \
+#define ASMC_FAN_FUNCS	asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \
 			asmc_mb_sysctl_fanminspeed, \
 			asmc_mb_sysctl_fanmaxspeed, \
 			asmc_mb_sysctl_fantargetspeed
@@ -196,6 +199,18 @@ struct asmc_model asmc_models[] = {
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
 	  ASMC_MBP4_TEMPS, ASMC_MBP4_TEMPNAMES, ASMC_MBP4_TEMPDESCS
 	},
+
+	{ 
+	  "MacBookPro8,2", "Apple SMC MacBook Pro (early 2011)",
+	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
+	  ASMC_MBP8_TEMPS, ASMC_MBP8_TEMPNAMES, ASMC_MBP8_TEMPDESCS
+	},
+
+	{ 
+	  "MacBookPro11,3", "Apple SMC MacBook Pro Retina Core i7 (2013/2014)",
+	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
+	  ASMC_MBP11_TEMPS, ASMC_MBP11_TEMPNAMES, ASMC_MBP11_TEMPDESCS
+	},
 	
 	/* The Mac Mini has no SMS */
 	{ 
@@ -224,12 +239,27 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS
 	},
 
+	/* Idem for the MacPro  2010*/
+	{
+	  "MacPro5,1", "Apple SMC MacPro (2010)",
+	  NULL, NULL, NULL,
+	  ASMC_FAN_FUNCS,
+	  NULL, NULL, NULL,
+	  ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS
+	},
+
 	{
 	  "MacBookAir1,1", "Apple SMC MacBook Air",
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL,
 	  ASMC_MBA_TEMPS, ASMC_MBA_TEMPNAMES, ASMC_MBA_TEMPDESCS
 	},	
 
+	{
+	  "MacBookAir3,1", "Apple SMC MacBook Air Core 2 Duo (Late 2010)",
+	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, NULL,
+	  ASMC_MBA3_TEMPS, ASMC_MBA3_TEMPNAMES, ASMC_MBA3_TEMPDESCS
+	},	
+
 	
 	{ NULL, NULL }
 };
@@ -359,6 +389,12 @@ asmc_attach(device_t dev)
 		    OID_AUTO, name, CTLFLAG_RD, 0,
 		    "Fan Subtree");
 
+		SYSCTL_ADD_PROC(sysctlctx,
+		    SYSCTL_CHILDREN(sc->sc_fan_tree[i]),
+		    OID_AUTO, "id", CTLTYPE_STRING | CTLFLAG_RD,
+		    dev, j, model->smc_fan_id, "I",
+		    "Fan ID");
+
 		SYSCTL_ADD_PROC(sysctlctx,
 		    SYSCTL_CHILDREN(sc->sc_fan_tree[i]),
 		    OID_AUTO, "speed", CTLTYPE_INT | CTLFLAG_RD,
@@ -375,21 +411,21 @@ asmc_attach(device_t dev)
 		SYSCTL_ADD_PROC(sysctlctx,
 		    SYSCTL_CHILDREN(sc->sc_fan_tree[i]),
 		    OID_AUTO, "minspeed",
-		    CTLTYPE_INT | CTLFLAG_RD,
+		    CTLTYPE_INT | CTLFLAG_RW,
 		    dev, j, model->smc_fan_minspeed, "I",
 		    "Fan minimum speed in RPM");
 
 		SYSCTL_ADD_PROC(sysctlctx,
 		    SYSCTL_CHILDREN(sc->sc_fan_tree[i]),
 		    OID_AUTO, "maxspeed",
-		    CTLTYPE_INT | CTLFLAG_RD,
+		    CTLTYPE_INT | CTLFLAG_RW,
 		    dev, j, model->smc_fan_maxspeed, "I",
 		    "Fan maximum speed in RPM");
 
 		SYSCTL_ADD_PROC(sysctlctx,
 		    SYSCTL_CHILDREN(sc->sc_fan_tree[i]),
 		    OID_AUTO, "targetspeed",
-		    CTLTYPE_INT | CTLFLAG_RD,
+		    CTLTYPE_INT | CTLFLAG_RW,
 		    dev, j, model->smc_fan_targetspeed, "I",
 		    "Fan target speed in RPM");
 	}
@@ -641,11 +677,10 @@ asmc_init(device_t dev)
 
 	if (bootverbose) {
 		/*
-		 * XXX: The number of keys is a 32 bit buffer, but
-		 * right now Apple only uses the last 8 bit.
+		 * The number of keys is a 32 bit buffer
 		 */
 		asmc_key_read(dev, ASMC_NKEYS, buf, 4);
-		device_printf(dev, "number of keys: %d\n", buf[3]);
+		device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf));
 	}	      
 
 #ifdef DEBUG
@@ -906,7 +941,7 @@ asmc_fan_count(device_t dev)
 {
 	uint8_t buf[1];
 
-	if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, 1) < 0)
+	if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, sizeof buf) < 0)
 		return (-1);
 
 	return (buf[0]);
@@ -920,13 +955,46 @@ asmc_fan_getvalue(device_t dev, const char *key, int fan)
 	char fankey[5];
 
 	snprintf(fankey, sizeof(fankey), key, fan);
-	if (asmc_key_read(dev, fankey, buf, 2) < 0)
+	if (asmc_key_read(dev, fankey, buf, sizeof buf) < 0)
 		return (-1);
 	speed = (buf[0] << 6) | (buf[1] >> 2);
 
 	return (speed);
 }
 
+static char*
+asmc_fan_getstring(device_t dev, const char *key, int fan)
+{
+	uint8_t buf[16];
+	char fankey[5];
+	char* desc;
+
+	snprintf(fankey, sizeof(fankey), key, fan);
+	if (asmc_key_read(dev, fankey, buf, sizeof buf) < 0)
+		return (NULL);
+	desc = buf+4;
+
+	return (desc);
+}
+
+static int
+asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed)
+{
+	uint8_t buf[2];
+	char fankey[5];
+
+	speed *= 4;
+
+	buf[0] = speed>>8;
+	buf[1] = speed;
+
+	snprintf(fankey, sizeof(fankey), key, fan);
+	if (asmc_key_write(dev, fankey, buf, sizeof buf) < 0)
+		return (-1);
+
+	return (0);
+}
+
 static int
 asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS)
 {
@@ -941,6 +1009,22 @@ asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
+static int
+asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS)
+{
+	device_t dev = (device_t) arg1;
+	int fan = arg2;
+	int error = true;
+	char* desc;
+
+	desc = asmc_fan_getstring(dev, ASMC_KEY_FANID, fan);
+
+	if (desc != NULL)
+		error = sysctl_handle_string(oidp, desc, 0, req);
+
+	return (error);
+}
+
 static int
 asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS)
 {
@@ -967,6 +1051,11 @@ asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS)
 	v = asmc_fan_getvalue(dev, ASMC_KEY_FANMINSPEED, fan);
 	error = sysctl_handle_int(oidp, &v, 0, req);
 
+	if (error == 0 && req->newptr != NULL) {
+		unsigned int newspeed = *(unsigned int *)req->newptr;
+		asmc_fan_setvalue(dev, ASMC_KEY_FANMINSPEED, fan, newspeed);
+	}
+
 	return (error);
 }
 
@@ -981,6 +1070,11 @@ asmc_mb_sysctl_fanmaxspeed(SYSCTL_HANDLER_ARGS)
 	v = asmc_fan_getvalue(dev, ASMC_KEY_FANMAXSPEED, fan);
 	error = sysctl_handle_int(oidp, &v, 0, req);
 
+	if (error == 0 && req->newptr != NULL) {
+		unsigned int newspeed = *(unsigned int *)req->newptr;
+		asmc_fan_setvalue(dev, ASMC_KEY_FANMAXSPEED, fan, newspeed);
+	}
+
 	return (error);
 }
 
@@ -995,6 +1089,11 @@ asmc_mb_sysctl_fantargetspeed(SYSCTL_HANDLER_ARGS)
 	v = asmc_fan_getvalue(dev, ASMC_KEY_FANTARGETSPEED, fan);
 	error = sysctl_handle_int(oidp, &v, 0, req);
 
+	if (error == 0 && req->newptr != NULL) {
+		unsigned int newspeed = *(unsigned int *)req->newptr;
+		asmc_fan_setvalue(dev, ASMC_KEY_FANTARGETSPEED, fan, newspeed);
+	}
+
 	return (error);
 }
 
@@ -1009,7 +1108,7 @@ asmc_temp_getvalue(device_t dev, const char *key)
 	/*
 	 * Check for invalid temperatures.
 	 */
-	if (asmc_key_read(dev, key, buf, 2) < 0)
+	if (asmc_key_read(dev, key, buf, sizeof buf) < 0)
 		return (-1);
 
 	return (buf[0]);
@@ -1042,7 +1141,7 @@ asmc_sms_read(device_t dev, const char *key, int16_t *val)
 	case 'X':
 	case 'Y':
 	case 'Z':
-		error =	asmc_key_read(dev, key, buf, 2);
+		error =	asmc_key_read(dev, key, buf, sizeof buf);
 		break;
 	default:
 		device_printf(dev, "%s called with invalid argument %s\n",
@@ -1197,7 +1296,7 @@ asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS)
 	int error;
 	int32_t v;
 
-	asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, 6);
+	asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof buf);
 	v = buf[2];
 	error = sysctl_handle_int(oidp, &v, sizeof(v), req);
 
@@ -1212,7 +1311,7 @@ asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS)
 	int error;
 	int32_t v;
 	
-	asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, 6);
+	asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, sizeof buf);
 	v = buf[2];
 	error = sysctl_handle_int(oidp, &v, sizeof(v), req);
 	
@@ -1236,7 +1335,7 @@ asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS)
 		v = level;
 		buf[0] = level;
 		buf[1] = 0x00;
-		asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, 2);
+		asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf);
 	}
 	
 	return (error);
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
index 67e7f3b1ded2..368575babe7f 100644
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -27,7 +27,7 @@
  *
  */
 
-#define ASMC_MAXFANS	2
+#define ASMC_MAXFANS	6
 
 struct asmc_softc {
 	device_t 		sc_dev;
@@ -83,6 +83,7 @@ struct asmc_softc {
  */
 #define ASMC_KEY_FANCOUNT	"FNum"	/* RO; 1 byte */
 #define ASMC_KEY_FANMANUAL	"FS! "	/* RW; 2 bytes */
+#define ASMC_KEY_FANID		"F%dID"	/* RO; 16 bytes */
 #define ASMC_KEY_FANSPEED	"F%dAc"	/* RO; 2 bytes */
 #define ASMC_KEY_FANMINSPEED	"F%dMn"	/* RO; 2 bytes */
 #define ASMC_KEY_FANMAXSPEED	"F%dMx"	/* RO; 2 bytes */
@@ -132,7 +133,7 @@ struct asmc_softc {
  *
  */
 /* maximum array size for temperatures including the last NULL */
-#define ASMC_TEMP_MAX		36
+#define ASMC_TEMP_MAX		80
 #define ASMC_MB_TEMPS		{ "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \
 				  "TM0P", NULL }
 #define ASMC_MB_TEMPNAMES	{ "enclosure", "northbridge1", \
@@ -175,6 +176,57 @@ struct asmc_softc {
 				  "Unknown", "Unknown", \
 				  "Wireless Module", } 
 
+#define ASMC_MBP8_TEMPS		{ "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \
+				  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+				  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
+				  "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
+				  "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
+				  "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL } 
+
+#define ASMC_MBP8_TEMPNAMES	{ "enclosure", "TB1T", "TB2T", "TC0C", "TC0D", \
+				  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+				  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
+				  "TCTD", "graphics", "TG0P", "THSP", "TM0S", \
+				  "TMBS", "TP0P", "TPCD", "wireless", "Th1H", \
+				  "Th2H", "memory", "Ts0P", "Ts0S" } 
+
+#define ASMC_MBP8_TEMPDESCS	{ "Enclosure Bottomside", "TB1T", "TB2T", "TC0C", "TC0D", \
+				  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+				  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
+				  "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
+				  "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
+				  "Th2H", "Tm0P", "Ts0P", "Ts0S" } 
+
+#define ASMC_MBP11_TEMPS	{ "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
+				  "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
+				  "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
+				  "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
+				  "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
+				  "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
+				  "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
+				  "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
+				  "Ts1S", NULL } 
+
+#define ASMC_MBP11_TEMPNAMES	{ "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
+				  "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
+				  "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
+				  "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
+				  "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
+				  "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
+				  "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
+				  "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
+				  "Ts1S" } 
+
+#define ASMC_MBP11_TEMPDESCS	{ "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
+				  "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
+				  "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
+				  "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
+				  "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
+				  "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
+				  "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
+				  "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
+				  "Ts1S" } 
+
 #define ASMC_MM_TEMPS		{ "TN0P", "TN1P", NULL }
 #define ASMC_MM_TEMPNAMES	{ "northbridge1", "northbridge2" }
 #define ASMC_MM_TEMPDESCS	{ "Northbridge Point 1", \
@@ -214,8 +266,7 @@ struct asmc_softc {
 				  "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
 				  "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
 				  "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
-				  "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \
-				  NULL }
+				  "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", }
 
 #define ASMC_MP_TEMPDESCS	{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
 				  "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
@@ -223,9 +274,66 @@ struct asmc_softc {
 				  "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
 				  "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
 				  "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
-				  "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \
+				  "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", }
+
+#define ASMC_MP5_TEMPS		{ "TA0P", "TCAC", "TCAD", "TCAG", "TCAH", \
+				  "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
+				  "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
+				  "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
+				  "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
+				  "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
+				  "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
+				  "TM7V", "TM8P", "TM8V", "TM9V", "TMA1", \
+				  "TMA2", "TMA3", "TMA4", "TMB1", "TMB2", \
+				  "TMB3", "TMB4", "TMHS", "TMLS", "TMPS", \
+				  "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
+				  "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
+				  "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
+				  "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
+				  "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", \
 				  NULL }
 
+#define ASMC_MP5_TEMPNAMES	{ "ambient", "TCAC", "TCAD", "TCAG", "TCAH", \
+				  "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
+				  "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
+				  "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
+				  "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
+				  "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
+				  "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
+				  "TM7V", "TM8P", "TM8V", "TM9V", "ram_a1", \
+				  "ram_a2", "ram_a3", "ram_a4", "ram_b1", "ram_b2", \
+				  "ram_b3", "ram_b4", "TMHS", "TMLS", "TMPS", \
+				  "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
+				  "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
+				  "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
+				  "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
+				  "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", }
+
+#define ASMC_MP5_TEMPDESCS	{ "TA0P", "TCAC", "TCAD", "TCAG", "TCAH", \
+				  "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
+				  "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
+				  "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
+				  "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
+				  "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
+				  "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
+				  "TM7V", "TM8P", "TM8V", "TM9V", "TMA1", \
+				  "TMA2", "TMA3", "TMA4", "TMB1", "TMB2", \
+				  "TMB3", "TMB4", "TMHS", "TMLS", "TMPS", \
+				  "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
+				  "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
+				  "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
+				  "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
+				  "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", }
+
 #define	ASMC_MBA_TEMPS		{ "TB0T", NULL }
 #define	ASMC_MBA_TEMPNAMES	{ "enclosure" }
 #define	ASMC_MBA_TEMPDESCS	{ "Enclosure Bottom" }
+
+#define	ASMC_MBA3_TEMPS		{ "TB0T", "TB1T", "TB2T", \
+				  "TC0D", "TC0E", "TC0P", NULL }
+
+#define	ASMC_MBA3_TEMPNAMES	{ "enclosure", "TB1T", "TB2T", \
+				  "TC0D", "TC0E", "TC0P" }
+
+#define	ASMC_MBA3_TEMPDESCS	{ "Enclosure Bottom", "TB1T", "TB2T", \
+				  "TC0D", "TC0E", "TC0P" }
diff --git a/sys/dev/ath/ath_hal/ah.c b/sys/dev/ath/ath_hal/ah.c
index 750248e1e0a1..2aefc8971e72 100644
--- a/sys/dev/ath/ath_hal/ah.c
+++ b/sys/dev/ath/ath_hal/ah.c
@@ -55,7 +55,9 @@ ath_hal_probe(uint16_t vendorid, uint16_t devid)
  */
 struct ath_hal*
 ath_hal_attach(uint16_t devid, HAL_SOFTC sc,
-	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata, HAL_STATUS *error)
+	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
+	HAL_STATUS *error)
 {
 	struct ath_hal_chip * const *pchip;
 
@@ -66,7 +68,8 @@ ath_hal_attach(uint16_t devid, HAL_SOFTC sc,
 		/* XXX don't have vendorid, assume atheros one works */
 		if (chip->probe(ATHEROS_VENDOR_ID, devid) == AH_NULL)
 			continue;
-		ah = chip->attach(devid, sc, st, sh, eepromdata, error);
+		ah = chip->attach(devid, sc, st, sh, eepromdata, ah_config,
+		    error);
 		if (ah != AH_NULL) {
 			/* copy back private state to public area */
 			ah->ah_devid = AH_PRIVATE(ah)->ah_devid;
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index 4f2d3e9a0ba7..239ebc89a41d 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -1264,6 +1264,7 @@ typedef struct
 	int ath_hal_show_bb_panic;
 	int ath_hal_ant_ctrl_comm2g_switch_enable;
 	int ath_hal_ext_atten_margin_cfg;
+	int ath_hal_min_gainidx;
 	int ath_hal_war70c;
 	uint32_t ath_hal_mci_config;
 } HAL_OPS_CONFIG;
@@ -1616,7 +1617,8 @@ extern	const char *__ahdecl ath_hal_probe(uint16_t vendorid, uint16_t devid);
  * be returned if the status parameter is non-zero.
  */
 extern	struct ath_hal * __ahdecl ath_hal_attach(uint16_t devid, HAL_SOFTC,
-		HAL_BUS_TAG, HAL_BUS_HANDLE, uint16_t *eepromdata, HAL_STATUS* status);
+		HAL_BUS_TAG, HAL_BUS_HANDLE, uint16_t *eepromdata,
+		HAL_OPS_CONFIG *ah_config, HAL_STATUS* status);
 
 extern	const char *ath_hal_mac_name(struct ath_hal *);
 extern	const char *ath_hal_rf_name(struct ath_hal *);
diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h
index 2e35148636b4..0892a428895a 100644
--- a/sys/dev/ath/ath_hal/ah_internal.h
+++ b/sys/dev/ath/ath_hal/ah_internal.h
@@ -91,6 +91,7 @@ struct ath_hal_chip {
 	const char	*(*probe)(uint16_t vendorid, uint16_t devid);
 	struct ath_hal	*(*attach)(uint16_t devid, HAL_SOFTC,
 			    HAL_BUS_TAG, HAL_BUS_HANDLE, uint16_t *eepromdata,
+			    HAL_OPS_CONFIG *ah,
 			    HAL_STATUS *error);
 };
 #ifndef AH_CHIP
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
index ee11ce9e6847..ceafa99f2963 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
@@ -183,7 +183,7 @@ static HAL_BOOL ar5210FillCapabilityInfo(struct ath_hal *ah);
  */
 static struct ath_hal *
 ar5210Attach(uint16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st, HAL_BUS_HANDLE sh,
-	uint16_t *eepromdata, HAL_STATUS *status)
+	uint16_t *eepromdata, HAL_OPS_CONFIG *ah_config, HAL_STATUS *status)
 {
 #define	N(a)	(sizeof(a)/sizeof(a[0]))
 	struct ath_hal_5210 *ahp;
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
index 454929523d5f..3416dc0e8809 100644
--- a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
+++ b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
@@ -203,7 +203,7 @@ ar5211GetRadioRev(struct ath_hal *ah)
 static struct ath_hal *
 ar5211Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
-	HAL_STATUS *status)
+	HAL_OPS_CONFIG *ah_config, HAL_STATUS *status)
 {
 #define	N(a)	(sizeof(a)/sizeof(a[0]))
 	struct ath_hal_5211 *ahp;
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
index e0af27c4b42e..a95f24491f0a 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
@@ -317,7 +317,7 @@ ar5212IsMacSupported(uint8_t macVersion, uint8_t macRev)
 static struct ath_hal *
 ar5212Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
-	HAL_STATUS *status)
+	HAL_OPS_CONFIG *ah_config, HAL_STATUS *status)
 {
 #define	AH_EEPROM_PROTECT(ah) \
 	(AH_PRIVATE(ah)->ah_ispcie)? AR_EEPROM_PROTECT_PCIE : AR_EEPROM_PROTECT)
diff --git a/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c b/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
index 4ca1a4d0b7df..5c84eb87eb0c 100644
--- a/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
+++ b/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
@@ -62,7 +62,7 @@ ar5312AniSetup(struct ath_hal *ah)
 static struct ath_hal *
 ar5312Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
-	HAL_STATUS *status)
+	HAL_OPS_CONFIG *ah_config, HAL_STATUS *status)
 {
 	struct ath_hal_5212 *ahp = AH_NULL;
 	struct ath_hal *ah;
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
index bdc61118b9cb..a20499a3c025 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
@@ -297,7 +297,7 @@ ar5416GetRadioRev(struct ath_hal *ah)
 static struct ath_hal *
 ar5416Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
-	HAL_STATUS *status)
+	HAL_OPS_CONFIG *ah_config, HAL_STATUS *status)
 {
 	struct ath_hal_5416 *ahp5416;
 	struct ath_hal_5212 *ahp;
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
index 4f478c06872e..c270babf330c 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
@@ -69,7 +69,9 @@ static HAL_BOOL ar9130FillCapabilityInfo(struct ath_hal *ah);
  */
 static struct ath_hal *
 ar9130Attach(uint16_t devid, HAL_SOFTC sc,
-	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata, HAL_STATUS *status)
+	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
+	HAL_STATUS *status)
 {
 	struct ath_hal_5416 *ahp5416;
 	struct ath_hal_5212 *ahp;
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
index 979ba1a294c7..5bda519e3b5c 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
@@ -114,6 +114,7 @@ ar9160InitPLL(struct ath_hal *ah, const struct ieee80211_channel *chan)
 static struct ath_hal *
 ar9160Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
 	HAL_STATUS *status)
 {
 	struct ath_hal_5416 *ahp5416;
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
index 2a67fe56e270..3be3e3539a55 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
@@ -148,6 +148,7 @@ ar9280InitPLL(struct ath_hal *ah, const struct ieee80211_channel *chan)
 static struct ath_hal *
 ar9280Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
 	HAL_STATUS *status)
 {
 	struct ath_hal_9280 *ahp9280;
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
index edb6f267d42b..eb3490a61ae3 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
@@ -133,6 +133,7 @@ ar9285_eeprom_print_diversity_settings(struct ath_hal *ah)
 static struct ath_hal *
 ar9285Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
 	HAL_STATUS *status)
 {
 	struct ath_hal_9285 *ahp9285;
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
index 010e2c34b065..0ea565c271c1 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
@@ -111,6 +111,7 @@ ar9287AniSetup(struct ath_hal *ah)
 static struct ath_hal *
 ar9287Attach(uint16_t devid, HAL_SOFTC sc,
 	HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
+	HAL_OPS_CONFIG *ah_config,
 	HAL_STATUS *status)
 {
 	struct ath_hal_9287 *ahp9287;
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 3a5ae32969ff..af686f038b97 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -435,6 +435,81 @@ _ath_power_restore_power_state(struct ath_softc *sc, const char *file, int line)
 
 }
 
+/*
+ * Configure the initial HAL configuration values based on bus
+ * specific parameters.
+ *
+ * Some PCI IDs and other information may need tweaking.
+ *
+ * XXX TODO: ath9k and the Atheros HAL only program comm2g_switch_enable
+ * if BT antenna diversity isn't enabled.
+ *
+ * So, let's also figure out how to enable BT diversity for AR9485.
+ */
+static void
+ath_setup_hal_config(struct ath_softc *sc, HAL_OPS_CONFIG *ah_config)
+{
+	/* XXX TODO: only for PCI devices? */
+
+	if (sc->sc_pci_devinfo & (ATH_PCI_CUS198 | ATH_PCI_CUS230)) {
+		ah_config->ath_hal_ext_lna_ctl_gpio = 0x200; /* bit 9 */
+		ah_config->ath_hal_ext_atten_margin_cfg = AH_TRUE;
+		ah_config->ath_hal_min_gainidx = AH_TRUE;
+		ah_config->ath_hal_ant_ctrl_comm2g_switch_enable = 0x000bbb88;
+		/* XXX low_rssi_thresh */
+		/* XXX fast_div_bias */
+		device_printf(sc->sc_dev, "configuring for %s\n",
+		    (sc->sc_pci_devinfo & ATH_PCI_CUS198) ?
+		    "CUS198" : "CUS230");
+	}
+
+	if (sc->sc_pci_devinfo & ATH_PCI_CUS217)
+		device_printf(sc->sc_dev, "CUS217 card detected\n");
+
+	if (sc->sc_pci_devinfo & ATH_PCI_CUS252)
+		device_printf(sc->sc_dev, "CUS252 card detected\n");
+
+	if (sc->sc_pci_devinfo & ATH_PCI_AR9565_1ANT)
+		device_printf(sc->sc_dev, "WB335 1-ANT card detected\n");
+
+	if (sc->sc_pci_devinfo & ATH_PCI_AR9565_2ANT)
+		device_printf(sc->sc_dev, "WB335 2-ANT card detected\n");
+
+	if (sc->sc_pci_devinfo & ATH_PCI_KILLER)
+		device_printf(sc->sc_dev, "Killer Wireless card detected\n");
+
+#if 0
+        /*
+         * Some WB335 cards do not support antenna diversity. Since
+         * we use a hardcoded value for AR9565 instead of using the
+         * EEPROM/OTP data, remove the combining feature from
+         * the HW capabilities bitmap.
+         */
+        if (sc->sc_pci_devinfo & (ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_AR9565_2ANT)) {
+                if (!(sc->sc_pci_devinfo & ATH9K_PCI_BT_ANT_DIV))
+                        pCap->hw_caps &= ~ATH9K_HW_CAP_ANT_DIV_COMB;
+        }
+
+        if (sc->sc_pci_devinfo & ATH9K_PCI_BT_ANT_DIV) {
+                pCap->hw_caps |= ATH9K_HW_CAP_BT_ANT_DIV;
+                device_printf(sc->sc_dev, "Set BT/WLAN RX diversity capability\n");
+        }
+#endif
+
+        if (sc->sc_pci_devinfo & ATH_PCI_D3_L1_WAR) {
+                ah_config->ath_hal_pcie_waen = 0x0040473b;
+                device_printf(sc->sc_dev, "Enable WAR for ASPM D3/L1\n");
+        }
+
+#if 0
+        if (sc->sc_pci_devinfo & ATH9K_PCI_NO_PLL_PWRSAVE) {
+                ah->config.no_pll_pwrsave = true;
+                device_printf(sc->sc_dev, "Disable PLL PowerSave\n");
+        }
+#endif
+
+}
+
 #define	HAL_MODE_HT20 (HAL_MODE_11NG_HT20 | HAL_MODE_11NA_HT20)
 #define	HAL_MODE_HT40 \
 	(HAL_MODE_11NG_HT40PLUS | HAL_MODE_11NG_HT40MINUS | \
@@ -450,6 +525,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 	u_int wmodes;
 	uint8_t macaddr[IEEE80211_ADDR_LEN];
 	int rx_chainmask, tx_chainmask;
+	HAL_OPS_CONFIG ah_config;
 
 	DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid);
 
@@ -468,8 +544,17 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 		device_get_unit(sc->sc_dev));
 	CURVNET_RESTORE();
 
+	/*
+	 * Configure the initial configuration data.
+	 *
+	 * This is stuff that may be needed early during attach
+	 * rather than done via configuration calls later.
+	 */
+	bzero(&ah_config, sizeof(ah_config));
+	ath_setup_hal_config(sc, &ah_config);
+
 	ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh,
-	    sc->sc_eepromdata, &status);
+	    sc->sc_eepromdata, &ah_config, &status);
 	if (ah == NULL) {
 		if_printf(ifp, "unable to attach hardware; HAL status %u\n",
 			status);
@@ -1715,12 +1800,22 @@ ath_suspend(struct ath_softc *sc)
 	 * NB: don't worry about putting the chip in low power
 	 * mode; pci will power off our socket on suspend and
 	 * CardBus detaches the device.
+	 *
+	 * XXX TODO: well, that's great, except for non-cardbus
+	 * devices!
 	 */
 
 	/*
-	 * XXX ensure none of the taskqueues are running
+	 * XXX This doesn't wait until all pending taskqueue
+	 * items and parallel transmit/receive/other threads
+	 * are running!
+	 */
+	ath_hal_intrset(sc->sc_ah, 0);
+	taskqueue_block(sc->sc_tq);
+	callout_drain(&sc->sc_cal_ch);
+
+	/*
 	 * XXX ensure sc_invalid is 1
-	 * XXX ensure the calibration callout is disabled
 	 */
 
 	/* Disable the PCIe PHY, complete with workarounds */
@@ -1811,6 +1906,11 @@ ath_resume(struct ath_softc *sc)
 	    AH_FALSE, &status);
 	ath_reset_keycache(sc);
 
+	ATH_RX_LOCK(sc);
+	sc->sc_rx_stopped = 1;
+	sc->sc_rx_resetted = 1;
+	ATH_RX_UNLOCK(sc);
+
 	/* Let DFS at it in case it's a DFS channel */
 	ath_dfs_radar_enable(sc, ic->ic_curchan);
 
@@ -2015,44 +2115,46 @@ ath_intr(void *arg)
 		if (status & HAL_INT_RXEOL) {
 			int imask;
 			ATH_KTR(sc, ATH_KTR_ERROR, 0, "ath_intr: RXEOL");
-			ATH_PCU_LOCK(sc);
+			if (! sc->sc_isedma) {
+				ATH_PCU_LOCK(sc);
+				/*
+				 * NB: the hardware should re-read the link when
+				 *     RXE bit is written, but it doesn't work at
+				 *     least on older hardware revs.
+				 */
+				sc->sc_stats.ast_rxeol++;
+				/*
+				 * Disable RXEOL/RXORN - prevent an interrupt
+				 * storm until the PCU logic can be reset.
+				 * In case the interface is reset some other
+				 * way before "sc_kickpcu" is called, don't
+				 * modify sc_imask - that way if it is reset
+				 * by a call to ath_reset() somehow, the
+				 * interrupt mask will be correctly reprogrammed.
+				 */
+				imask = sc->sc_imask;
+				imask &= ~(HAL_INT_RXEOL | HAL_INT_RXORN);
+				ath_hal_intrset(ah, imask);
+				/*
+				 * Only blank sc_rxlink if we've not yet kicked
+				 * the PCU.
+				 *
+				 * This isn't entirely correct - the correct solution
+				 * would be to have a PCU lock and engage that for
+				 * the duration of the PCU fiddling; which would include
+				 * running the RX process. Otherwise we could end up
+				 * messing up the RX descriptor chain and making the
+				 * RX desc list much shorter.
+				 */
+				if (! sc->sc_kickpcu)
+					sc->sc_rxlink = NULL;
+				sc->sc_kickpcu = 1;
+				ATH_PCU_UNLOCK(sc);
+			}
 			/*
-			 * NB: the hardware should re-read the link when
-			 *     RXE bit is written, but it doesn't work at
-			 *     least on older hardware revs.
-			 */
-			sc->sc_stats.ast_rxeol++;
-			/*
-			 * Disable RXEOL/RXORN - prevent an interrupt
-			 * storm until the PCU logic can be reset.
-			 * In case the interface is reset some other
-			 * way before "sc_kickpcu" is called, don't
-			 * modify sc_imask - that way if it is reset
-			 * by a call to ath_reset() somehow, the
-			 * interrupt mask will be correctly reprogrammed.
-			 */
-			imask = sc->sc_imask;
-			imask &= ~(HAL_INT_RXEOL | HAL_INT_RXORN);
-			ath_hal_intrset(ah, imask);
-			/*
-			 * Only blank sc_rxlink if we've not yet kicked
-			 * the PCU.
-			 *
-			 * This isn't entirely correct - the correct solution
-			 * would be to have a PCU lock and engage that for
-			 * the duration of the PCU fiddling; which would include
-			 * running the RX process. Otherwise we could end up
-			 * messing up the RX descriptor chain and making the
-			 * RX desc list much shorter.
-			 */
-			if (! sc->sc_kickpcu)
-				sc->sc_rxlink = NULL;
-			sc->sc_kickpcu = 1;
-			ATH_PCU_UNLOCK(sc);
-			/*
-			 * Enqueue an RX proc, to handled whatever
+			 * Enqueue an RX proc to handle whatever
 			 * is in the RX queue.
-			 * This will then kick the PCU.
+			 * This will then kick the PCU if required.
 			 */
 			sc->sc_rx.recv_sched(sc, 1);
 		}
@@ -2348,6 +2450,12 @@ ath_init(void *arg)
 		ATH_UNLOCK(sc);
 		return;
 	}
+
+	ATH_RX_LOCK(sc);
+	sc->sc_rx_stopped = 1;
+	sc->sc_rx_resetted = 1;
+	ATH_RX_UNLOCK(sc);
+
 	ath_chan_change(sc, ic->ic_curchan);
 
 	/* Let DFS at it in case it's a DFS channel */
@@ -2406,8 +2514,7 @@ ath_init(void *arg)
 	 * Enable interrupts.
 	 */
 	sc->sc_imask = HAL_INT_RX | HAL_INT_TX
-		  | HAL_INT_RXEOL | HAL_INT_RXORN
-		  | HAL_INT_TXURN
+		  | HAL_INT_RXORN | HAL_INT_TXURN
 		  | HAL_INT_FATAL | HAL_INT_GLOBAL;
 
 	/*
@@ -2417,6 +2524,14 @@ ath_init(void *arg)
 	if (sc->sc_isedma)
 		sc->sc_imask |= (HAL_INT_RXHP | HAL_INT_RXLP);
 
+	/*
+	 * If we're an EDMA NIC, we don't care about RXEOL.
+	 * Writing a new descriptor in will simply restart
+	 * RX DMA.
+	 */
+	if (! sc->sc_isedma)
+		sc->sc_imask |= HAL_INT_RXEOL;
+
 	/*
 	 * Enable MIB interrupts when there are hardware phy counters.
 	 * Note we only do this (at the moment) for station mode.
@@ -2735,6 +2850,11 @@ ath_reset(struct ifnet *ifp, ATH_RESET_TYPE reset_type)
 			__func__, status);
 	sc->sc_diversity = ath_hal_getdiversity(ah);
 
+	ATH_RX_LOCK(sc);
+	sc->sc_rx_stopped = 1;
+	sc->sc_rx_resetted = 1;
+	ATH_RX_UNLOCK(sc);
+
 	/* Let DFS at it in case it's a DFS channel */
 	ath_dfs_radar_enable(sc, ic->ic_curchan);
 
@@ -3192,7 +3312,7 @@ ath_transmit(struct ifnet *ifp, struct mbuf *m)
 		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: out of txfrag buffers\n", __func__);
 		sc->sc_stats.ast_tx_nofrag++;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ath_freetx(m);
 		goto bad;
 	}
@@ -3240,7 +3360,7 @@ ath_transmit(struct ifnet *ifp, struct mbuf *m)
 	 *
 	 * XXX should use atomics?
 	 */
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 nextfrag:
 	/*
 	 * Pass the frame to the h/w for transmission.
@@ -3260,7 +3380,7 @@ ath_transmit(struct ifnet *ifp, struct mbuf *m)
 	next = m->m_nextpkt;
 	if (ath_tx_start(sc, ni, bf, m)) {
 bad:
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 reclaim:
 		bf->bf_m = NULL;
 		bf->bf_node = NULL;
@@ -5333,14 +5453,15 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
 
 	ATH_PCU_LOCK(sc);
 
+	/* Disable interrupts */
+	ath_hal_intrset(ah, 0);
+
 	/* Stop new RX/TX/interrupt completion */
 	if (ath_reset_grablock(sc, 1) == 0) {
 		device_printf(sc->sc_dev, "%s: concurrent reset! Danger!\n",
 		    __func__);
 	}
 
-	ath_hal_intrset(ah, 0);
-
 	/* Stop pending RX/TX completion */
 	ath_txrx_stop_locked(sc);
 
@@ -5384,6 +5505,11 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
 		}
 		sc->sc_diversity = ath_hal_getdiversity(ah);
 
+		ATH_RX_LOCK(sc);
+		sc->sc_rx_stopped = 1;
+		sc->sc_rx_resetted = 1;
+		ATH_RX_UNLOCK(sc);
+
 		/* Let DFS at it in case it's a DFS channel */
 		ath_dfs_radar_enable(sc, chan);
 
@@ -6346,7 +6472,7 @@ ath_watchdog(void *arg)
 		} else
 			if_printf(ifp, "device timeout\n");
 		do_reset = 1;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		sc->sc_stats.ast_watchdog++;
 
 		ATH_LOCK(sc);
@@ -6530,8 +6656,10 @@ ath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		break;
 	case SIOCGATHSTATS:
 		/* NB: embed these numbers to get a consistent view */
-		sc->sc_stats.ast_tx_packets = ifp->if_opackets;
-		sc->sc_stats.ast_rx_packets = ifp->if_ipackets;
+		sc->sc_stats.ast_tx_packets = ifp->if_get_counter(ifp,
+		    IFCOUNTER_OPACKETS);
+		sc->sc_stats.ast_rx_packets = ifp->if_get_counter(ifp,
+		    IFCOUNTER_IPACKETS);
 		sc->sc_stats.ast_tx_rssi = ATH_RSSI(sc->sc_halstats.ns_avgtxrssi);
 		sc->sc_stats.ast_rx_rssi = ATH_RSSI(sc->sc_halstats.ns_avgrssi);
 #ifdef IEEE80211_SUPPORT_TDMA
@@ -7058,6 +7186,6 @@ ath_node_recv_pspoll(struct ieee80211_node *ni, struct mbuf *m)
 
 MODULE_VERSION(if_ath, 1);
 MODULE_DEPEND(if_ath, wlan, 1, 1, 1);          /* 802.11 media layer */
-#if	defined(IEEE80211_ALQ) || defined(AH_DEBUG_ALQ)
+#if	defined(IEEE80211_ALQ) || defined(AH_DEBUG_ALQ) || defined(ATH_DEBUG_ALQ)
 MODULE_DEPEND(if_ath, alq, 1, 1, 1);
 #endif
diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c
index 961b83429c1f..f0a33a5036ef 100644
--- a/sys/dev/ath/if_ath_lna_div.c
+++ b/sys/dev/ath/if_ath_lna_div.c
@@ -209,6 +209,10 @@ ath_lna_div_ioctl(struct ath_softc *sc, struct ath_diag *ad)
 	return (error);
 }
 
+/*
+ * XXX need to low_rssi_thresh config from ath9k, to support CUS198
+ * antenna diversity correctly.
+ */
 static HAL_BOOL
 ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta, int mindelta,
     int main_rssi_avg, int alt_rssi_avg, int pkt_count)
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index dbbc411cdeaf..057ec2c66b1b 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -80,6 +80,98 @@ struct ath_pci_softc {
 	void			*sc_ih;		/* interrupt handler */
 };
 
+/*
+ * XXX eventually this should be some system level definition
+ * so modules will hvae probe/attach information like USB.
+ * But for now..
+ */
+struct pci_device_id {
+	int vendor_id;
+	int device_id;
+
+	int sub_vendor_id;
+	int sub_device_id;
+
+	int driver_data;
+
+	int match_populated:1;
+	int match_vendor_id:1;
+	int match_device_id:1;
+	int match_sub_vendor_id:1;
+	int match_sub_device_id:1;
+};
+
+#define	PCI_VDEVICE(v, s) \
+	.vendor_id = (v), \
+	.device_id = (s), \
+	.match_populated = 1, \
+	.match_vendor_id = 1, \
+	.match_device_id = 1
+
+#define	PCI_DEVICE_SUB(v, d, dv, ds) \
+	.match_populated = 1, \
+	.vendor_id = (v), .match_vendor_id = 1, \
+	.device_id = (d), .match_device_id = 1, \
+	.sub_vendor_id = (dv), .match_sub_vendor_id = 1, \
+	.sub_device_id = (ds), .match_sub_device_id = 1
+
+#define	PCI_VENDOR_ID_ATHEROS		0x168c
+#define	PCI_VENDOR_ID_SAMSUNG		0x144d
+#define	PCI_VENDOR_ID_AZWAVE		0x1a3b
+#define	PCI_VENDOR_ID_FOXCONN		0x105b
+#define	PCI_VENDOR_ID_ATTANSIC		0x1969
+#define	PCI_VENDOR_ID_ASUSTEK		0x1043
+#define	PCI_VENDOR_ID_DELL		0x1028
+#define	PCI_VENDOR_ID_QMI		0x1a32
+#define	PCI_VENDOR_ID_LENOVO		0x17aa
+#define	PCI_VENDOR_ID_HP		0x103c
+
+#include "if_ath_pci_devlist.h"
+
+/*
+ * Attempt to find a match for the given device in
+ * the given device table.
+ *
+ * Returns the device structure or NULL if no matching
+ * PCI device is found.
+ */
+static const struct pci_device_id *
+ath_pci_probe_device(device_t dev, const struct pci_device_id *dev_table, int nentries)
+{
+	int i;
+	int vendor_id, device_id;
+	int sub_vendor_id, sub_device_id;
+
+	vendor_id = pci_get_vendor(dev);
+	device_id = pci_get_device(dev);
+	sub_vendor_id = pci_get_subvendor(dev);
+	sub_device_id = pci_get_subdevice(dev);
+
+	for (i = 0; i < nentries; i++) {
+		/* Don't match on non-populated (eg empty) entries */
+		if (! dev_table[i].match_populated)
+			continue;
+
+		if (dev_table[i].match_vendor_id &&
+		    (dev_table[i].vendor_id != vendor_id))
+			continue;
+		if (dev_table[i].match_device_id &&
+		    (dev_table[i].device_id != device_id))
+			continue;
+		if (dev_table[i].match_sub_vendor_id &&
+		    (dev_table[i].sub_vendor_id != sub_vendor_id))
+			continue;
+		if (dev_table[i].match_sub_device_id &&
+		    (dev_table[i].sub_device_id != sub_device_id))
+			continue;
+
+		/* Match */
+		return (&dev_table[i]);
+	}
+
+	return (NULL);
+}
+
 #define	BS_BAR	0x10
 #define	PCIR_RETRY_TIMEOUT	0x41
 #define	PCIR_CFG_PMCSR		0x48
@@ -150,9 +242,15 @@ ath_pci_attach(device_t dev)
 	const struct firmware *fw = NULL;
 	const char *buf;
 #endif
+	const struct pci_device_id *pd;
 
 	sc->sc_dev = dev;
 
+	/* Do this lookup anyway; figure out what to do with it later */
+	pd = ath_pci_probe_device(dev, ath_pci_id_table, nitems(ath_pci_id_table));
+	if (pd)
+		sc->sc_pci_devinfo = pd->driver_data;
+
 	/*
 	 * Enable bus mastering.
 	 */
diff --git a/sys/dev/ath/if_ath_pci_devlist.h b/sys/dev/ath/if_ath_pci_devlist.h
new file mode 100644
index 000000000000..ae65909b3364
--- /dev/null
+++ b/sys/dev/ath/if_ath_pci_devlist.h
@@ -0,0 +1,669 @@
+/*-
+ * Copyright (c) 2014 Qualcomm Atheros.
+ * All rights reserved.
+ *
+ * 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ *
+ * $FreeBSD$
+ */
+
+static const struct pci_device_id ath_pci_id_table[] = {
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0023) }, /* PCI   */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0024) }, /* PCI-E */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0027) }, /* PCI   */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0029) }, /* PCI   */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x002A) }, /* PCI-E */
+
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1C71),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE01F),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x11AD, /* LITEON */
+			 0x6632),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x11AD, /* LITEON */
+			 0x6642),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 PCI_VENDOR_ID_QMI,
+			 0x0306),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x185F, /* WNC */
+			 0x309D),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x10CF, /* Fujitsu */
+			 0x147C),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x10CF, /* Fujitsu */
+			 0x147D),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002A,
+			 0x10CF, /* Fujitsu */
+			 0x1536),
+	  .driver_data = ATH_PCI_D3_L1_WAR },
+
+	/* AR9285 card for Asus */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x002B,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2C37),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x002B) }, /* PCI-E */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x002D) }, /* PCI   */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x002E) }, /* PCI-E */
+
+	/* Killer Wireless (3x3) */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0030,
+			 0x1A56,
+			 0x2000),
+	  .driver_data = ATH_PCI_KILLER },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0030,
+			 0x1A56,
+			 0x2001),
+	  .driver_data = ATH_PCI_KILLER },
+
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
+
+	/* PCI-E CUS198 */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2086),
+	  .driver_data = ATH_PCI_CUS198 | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1237),
+	  .driver_data = ATH_PCI_CUS198 | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2126),
+	  .driver_data = ATH_PCI_CUS198 | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x126A),
+	  .driver_data = ATH_PCI_CUS198 | ATH_PCI_BT_ANT_DIV },
+
+	/* PCI-E CUS230 */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2152),
+	  .driver_data = ATH_PCI_CUS230 | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE075),
+	  .driver_data = ATH_PCI_CUS230 | ATH_PCI_BT_ANT_DIV },
+
+	/* WB225 */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3119),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3122),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x185F, /* WNC */
+			 0x3119),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x185F, /* WNC */
+			 0x3027),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x4105),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x4106),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x410D),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x410E),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x410F),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0xC706),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0xC680),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0xC708),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_LENOVO,
+			 0x3218),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_LENOVO,
+			 0x3219),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+
+	/* AR9485 cards with PLL power-save disabled by default. */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2C97),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2100),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x1C56, /* ASKEY */
+			 0x4001),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x11AD, /* LITEON */
+			 0x6627),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x11AD, /* LITEON */
+			 0x6628),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE04E),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE04F),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x144F, /* ASKEY */
+			 0x7197),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x1B9A, /* XAVI */
+			 0x2000),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x1B9A, /* XAVI */
+			 0x2001),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1186),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1F86),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1195),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x1F95),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x1B9A, /* XAVI */
+			 0x1C00),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 0x1B9A, /* XAVI */
+			 0x1C01),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0032,
+			 PCI_VENDOR_ID_ASUSTEK,
+			 0x850D),
+	  .driver_data = ATH_PCI_NO_PLL_PWRSAVE },
+
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0032) }, /* PCI-E  AR9485 */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0033) }, /* PCI-E  AR9580 */
+
+	/* PCI-E CUS217 */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2116),
+	  .driver_data = ATH_PCI_CUS217 },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x11AD, /* LITEON */
+			 0x6661),
+	  .driver_data = ATH_PCI_CUS217 },
+
+	/* AR9462 with WoW support */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3117),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_LENOVO,
+			 0x3214),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_ATTANSIC,
+			 0x0091),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2110),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_ASUSTEK,
+			 0x850E),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x11AD, /* LITEON */
+			 0x6631),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x11AD, /* LITEON */
+			 0x6641),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 PCI_VENDOR_ID_HP,
+			 0x1864),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x14CD, /* USI */
+			 0x0063),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x14CD, /* USI */
+			 0x0064),
+	  .driver_data = ATH_PCI_WOW },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0034,
+			 0x10CF, /* Fujitsu */
+			 0x1783),
+	  .driver_data = ATH_PCI_WOW },
+
+	/* Killer Wireless (2x2) */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0030,
+			 0x1A56,
+			 0x2003),
+	  .driver_data = ATH_PCI_KILLER },
+
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0034) }, /* PCI-E  AR9462 */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0037) }, /* PCI-E  AR1111/AR9485 */
+
+	/* CUS252 */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3028),
+	  .driver_data = ATH_PCI_CUS252 |
+			 ATH_PCI_AR9565_2ANT |
+			 ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2176),
+	  .driver_data = ATH_PCI_CUS252 |
+			 ATH_PCI_AR9565_2ANT |
+			 ATH_PCI_BT_ANT_DIV },
+
+	/* WB335 1-ANT */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE068),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x185F, /* WNC */
+			 0xA119),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0632),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x06B2),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0842),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x6671),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x1B9A, /* XAVI */
+			 0x2811),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x1B9A, /* XAVI */
+			 0x2812),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x1B9A, /* XAVI */
+			 0x28A1),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x218A),
+	  .driver_data = ATH_PCI_AR9565_1ANT },
+
+	/* WB335 1-ANT / Antenna Diversity */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3025),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3026),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x302B),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE069),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x185F, /* WNC */
+			 0x3028),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0622),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0672),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0662),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x06A2),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0682),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x213A),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_HP,
+			 0x18E3),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_HP,
+			 0x217F),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_HP,
+			 0x2005),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_DELL,
+			 0x020C),
+	  .driver_data = ATH_PCI_AR9565_1ANT | ATH_PCI_BT_ANT_DIV },
+
+	/* WB335 2-ANT / Antenna-Diversity */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x411A),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x411B),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x411C),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x411D),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_SAMSUNG,
+			 0x411E),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x3027),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ATHEROS,
+			 0x302C),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0642),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0652),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0612),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0832),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x11AD, /* LITEON */
+			 0x0692),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2130),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x213B),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_AZWAVE,
+			 0x2182),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x144F, /* ASKEY */
+			 0x7202),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x1B9A, /* XAVI */
+			 0x2810),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x1B9A, /* XAVI */
+			 0x28A2),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x185F, /* WNC */
+			 0x3027),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 0x185F, /* WNC */
+			 0xA120),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE07F),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_FOXCONN,
+			 0xE081),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_LENOVO,
+			 0x3026),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_LENOVO,
+			 0x4026),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_ASUSTEK,
+			 0x85F2),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+			 0x0036,
+			 PCI_VENDOR_ID_DELL,
+			 0x020E),
+	  .driver_data = ATH_PCI_AR9565_2ANT | ATH_PCI_BT_ANT_DIV },
+
+	/* PCI-E AR9565 (WB335) */
+	{ PCI_VDEVICE(PCI_VENDOR_ID_ATHEROS, 0x0036),
+	  .driver_data = ATH_PCI_BT_ANT_DIV },
+
+	{ 0 }
+};
+
diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c
index 2f6cb58487d5..bed94887c988 100644
--- a/sys/dev/ath/if_ath_rx.c
+++ b/sys/dev/ath/if_ath_rx.c
@@ -704,7 +704,7 @@ ath_rx_pkt(struct ath_softc *sc, struct ath_rx_status *rs, HAL_STATUS status,
 					rs->rs_keyix-32 : rs->rs_keyix);
 			}
 		}
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 rx_error:
 		/*
 		 * Cleanup any pending partial frame.
@@ -830,7 +830,7 @@ ath_rx_pkt(struct ath_softc *sc, struct ath_rx_status *rs, HAL_STATUS status,
 			rs->rs_antenna |= 0x4;
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	sc->sc_stats.ast_ant_rx[rs->rs_antenna]++;
 
 	/*
diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c
index a8758cfa268b..7aa818fe02aa 100644
--- a/sys/dev/ath/if_ath_rx_edma.c
+++ b/sys/dev/ath/if_ath_rx_edma.c
@@ -160,10 +160,20 @@ ath_edma_stoprecv(struct ath_softc *sc, int dodelay)
 	struct ath_hal *ah = sc->sc_ah;
 
 	ATH_RX_LOCK(sc);
+
 	ath_hal_stoppcurecv(ah);
 	ath_hal_setrxfilter(ah, 0);
-	ath_hal_stopdmarecv(ah);
 
+	/*
+	 * 
+	 */
+	if (ath_hal_stopdmarecv(ah) == AH_TRUE)
+		sc->sc_rx_stopped = 1;
+
+	/*
+	 * Give the various bus FIFOs (not EDMA descriptor FIFO)
+	 * time to finish flushing out data.
+	 */
 	DELAY(3000);
 
 	/* Flush RX pending for each queue */
@@ -218,10 +228,6 @@ ath_edma_reinit_fifo(struct ath_softc *sc, HAL_RX_QUEUE qtype)
 
 /*
  * Start receive.
- *
- * XXX TODO: this needs to reallocate the FIFO entries when a reset
- * occurs, in case the FIFO is filled up and no new descriptors get
- * thrown into the FIFO.
  */
 static int
 ath_edma_startrecv(struct ath_softc *sc)
@@ -230,35 +236,31 @@ ath_edma_startrecv(struct ath_softc *sc)
 
 	ATH_RX_LOCK(sc);
 
+	/*
+	 * Sanity check - are we being called whilst RX
+	 * isn't stopped?  If so, we may end up pushing
+	 * too many entries into the RX FIFO and
+	 * badness occurs.
+	 */
+
 	/* Enable RX FIFO */
 	ath_hal_rxena(ah);
 
 	/*
-	 * Entries should only be written out if the
-	 * FIFO is empty.
-	 *
-	 * XXX This isn't correct. I should be looking
-	 * at the value of AR_RXDP_SIZE (0x0070) to determine
-	 * how many entries are in here.
-	 *
-	 * A warm reset will clear the registers but not the FIFO.
-	 *
-	 * And I believe this is actually the address of the last
-	 * handled buffer rather than the current FIFO pointer.
-	 * So if no frames have been (yet) seen, we'll reinit the
-	 * FIFO.
-	 *
-	 * I'll chase that up at some point.
+	 * In theory the hardware has been initialised, right?
 	 */
-	if (ath_hal_getrxbuf(sc->sc_ah, HAL_RX_QUEUE_HP) == 0) {
+	if (sc->sc_rx_resetted == 1) {
 		DPRINTF(sc, ATH_DEBUG_EDMA_RX,
 		    "%s: Re-initing HP FIFO\n", __func__);
 		ath_edma_reinit_fifo(sc, HAL_RX_QUEUE_HP);
-	}
-	if (ath_hal_getrxbuf(sc->sc_ah, HAL_RX_QUEUE_LP) == 0) {
 		DPRINTF(sc, ATH_DEBUG_EDMA_RX,
 		    "%s: Re-initing LP FIFO\n", __func__);
 		ath_edma_reinit_fifo(sc, HAL_RX_QUEUE_LP);
+		sc->sc_rx_resetted = 0;
+	} else {
+		device_printf(sc->sc_dev,
+		    "%s: called without resetting chip?\n",
+		    __func__);
 	}
 
 	/* Add up to m_fifolen entries in each queue */
@@ -266,6 +268,9 @@ ath_edma_startrecv(struct ath_softc *sc)
 	 * These must occur after the above write so the FIFO buffers
 	 * are pushed/tracked in the same order as the hardware will
 	 * process them.
+	 *
+	 * XXX TODO: is this really necessary? We should've stopped
+	 * the hardware already and reinitialised it, so it's a no-op.
 	 */
 	ath_edma_rxfifo_alloc(sc, HAL_RX_QUEUE_HP,
 	    sc->sc_rxedma[HAL_RX_QUEUE_HP].m_fifolen);
@@ -276,6 +281,11 @@ ath_edma_startrecv(struct ath_softc *sc)
 	ath_mode_init(sc);
 	ath_hal_startpcurecv(ah);
 
+	/*
+	 * We're now doing RX DMA!
+	 */
+	sc->sc_rx_stopped = 0;
+
 	ATH_RX_UNLOCK(sc);
 
 	return (0);
@@ -380,6 +390,21 @@ ath_edma_recv_proc_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype,
 
 	ATH_RX_LOCK(sc);
 
+#if 1
+	if (sc->sc_rx_resetted == 1) {
+		/*
+		 * XXX We shouldn't ever be scheduled if
+		 * receive has been stopped - so complain
+		 * loudly!
+		 */
+		device_printf(sc->sc_dev,
+		    "%s: sc_rx_resetted=1! Bad!\n",
+		    __func__);
+		ATH_RX_UNLOCK(sc);
+		return;
+	}
+#endif
+
 	do {
 		bf = re->m_fifo[re->m_fifo_head];
 		/* This shouldn't occur! */
@@ -451,24 +476,6 @@ ath_edma_recv_proc_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype,
 	    "ath edma rx proc: npkts=%d\n",
 	    npkts);
 
-	/* Handle resched and kickpcu appropriately */
-	ATH_PCU_LOCK(sc);
-	if (dosched && sc->sc_kickpcu) {
-		ATH_KTR(sc, ATH_KTR_ERROR, 0,
-		    "ath_edma_recv_proc_queue(): kickpcu");
-		if (npkts > 0)
-			device_printf(sc->sc_dev,
-			    "%s: handled npkts %d\n",
-			    __func__, npkts);
-
-		/*
-		 * XXX TODO: what should occur here? Just re-poke and
-		 * re-enable the RX FIFO?
-		 */
-		sc->sc_kickpcu = 0;
-	}
-	ATH_PCU_UNLOCK(sc);
-
 	return;
 }
 
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 1b140da6b077..096278eb4519 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -2424,7 +2424,7 @@ ath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		}
 	}
 	sc->sc_wd_timer = 5;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	sc->sc_stats.ast_tx_raw++;
 
 	/*
@@ -2473,7 +2473,7 @@ ath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 badbad:
 	ATH_KTR(sc, ATH_KTR_TX, 2, "ath_raw_xmit: bad0: m=%p, params=%p",
 	    m, params);
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	sc->sc_stats.ast_tx_raw_fail++;
 	ieee80211_free_node(ni);
 
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index d1ae089f49b8..e888ca2ee9ed 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -81,6 +81,25 @@
 #define	ATH_BEACON_CWMIN_DEFAULT 0	/* default cwmin for ap beacon q */
 #define	ATH_BEACON_CWMAX_DEFAULT 0	/* default cwmax for ap beacon q */
 
+/*
+ * The following bits can be set during the PCI (and perhaps non-PCI
+ * later) device probe path.
+ *
+ * It controls some of the driver and HAL behaviour.
+ */
+
+#define	ATH_PCI_CUS198		0x0001
+#define	ATH_PCI_CUS230		0x0002
+#define	ATH_PCI_CUS217		0x0004
+#define	ATH_PCI_CUS252		0x0008
+#define	ATH_PCI_WOW		0x0010
+#define	ATH_PCI_BT_ANT_DIV	0x0020
+#define	ATH_PCI_D3_L1_WAR	0x0040
+#define	ATH_PCI_AR9565_1ANT	0x0080
+#define	ATH_PCI_AR9565_2ANT	0x0100
+#define	ATH_PCI_NO_PLL_PWRSAVE	0x0200
+#define	ATH_PCI_KILLER		0x0400
+
 /*
  * The key cache is used for h/w cipher state and also for
  * tracking station state such as the current tx antenna.
@@ -566,6 +585,8 @@ struct ath_softc {
 	int			sc_tx_statuslen;
 	int			sc_tx_nmaps;	/* Number of TX maps */
 	int			sc_edma_bufsize;
+	int			sc_rx_stopped;	/* XXX only for EDMA */
+	int			sc_rx_resetted;	/* XXX only for EDMA */
 
 	void 			(*sc_node_cleanup)(struct ieee80211_node *);
 	void 			(*sc_node_free)(struct ieee80211_node *);
@@ -882,6 +903,9 @@ struct ath_softc {
 	HAL_POWER_MODE		sc_cur_powerstate;
 
 	int			sc_powersave_refcnt;
+
+	/* ATH_PCI_* flags */
+	uint32_t		sc_pci_devinfo;
 };
 
 #define	ATH_LOCK_INIT(_sc) \
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 199fcb1ed696..0d2b44ba5182 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -62,7 +62,20 @@ __FBSDID("$FreeBSD$");
 #include <dev/atkbdc/atkbdreg.h>
 #include <dev/atkbdc/atkbdcreg.h>
 
-static timeout_t	atkbd_timeout;
+typedef struct atkbd_state {
+	KBDC		kbdc;		/* keyboard controller */
+	int		ks_mode;	/* input mode (K_XLATE,K_RAW,K_CODE) */
+	int		ks_flags;	/* flags */
+#define COMPOSE		(1 << 0)
+	int		ks_polling;
+	int		ks_state;	/* shift/lock key state */
+	int		ks_accents;	/* accent key index (> 0) */
+	u_int		ks_composed_char; /* composed char code (> 0) */
+	u_char		ks_prefix;	/* AT scan code prefix */
+	struct callout	ks_timer;
+} atkbd_state_t;
+
+static void		atkbd_timeout(void *arg);
 static void		atkbd_shutdown_final(void *v);
 
 int
@@ -88,6 +101,7 @@ int
 atkbd_attach_unit(device_t dev, keyboard_t **kbd, int irq, int flags)
 {
 	keyboard_switch_t *sw;
+	atkbd_state_t *state;
 	int args[2];
 	int error;
 	int unit;
@@ -120,6 +134,8 @@ atkbd_attach_unit(device_t dev, keyboard_t **kbd, int irq, int flags)
 	 * This is a kludge to compensate for lost keyboard interrupts.
 	 * A similar code used to be in syscons. See below. XXX
 	 */
+	state = (atkbd_state_t *)(*kbd)->kb_data;
+	callout_init(&state->ks_timer, 0);
 	atkbd_timeout(*kbd);
 
 	if (bootverbose)
@@ -134,6 +150,7 @@ atkbd_attach_unit(device_t dev, keyboard_t **kbd, int irq, int flags)
 static void
 atkbd_timeout(void *arg)
 {
+	atkbd_state_t *state;
 	keyboard_t *kbd;
 	int s;
 
@@ -175,25 +192,14 @@ atkbd_timeout(void *arg)
 			kbdd_intr(kbd, NULL);
 	}
 	splx(s);
-	timeout(atkbd_timeout, arg, hz/10);
+	state = (atkbd_state_t *)kbd->kb_data;
+	callout_reset(&state->ks_timer, hz / 10, atkbd_timeout, arg);
 }
 
 /* LOW-LEVEL */
 
 #define ATKBD_DEFAULT	0
 
-typedef struct atkbd_state {
-	KBDC		kbdc;		/* keyboard controller */
-	int		ks_mode;	/* input mode (K_XLATE,K_RAW,K_CODE) */
-	int		ks_flags;	/* flags */
-#define COMPOSE		(1 << 0)
-	int		ks_polling;
-	int		ks_state;	/* shift/lock key state */
-	int		ks_accents;	/* accent key index (> 0) */
-	u_int		ks_composed_char; /* composed char code (> 0) */
-	u_char		ks_prefix;	/* AT scan code prefix */
-} atkbd_state_t;
-
 /* keyboard driver declaration */
 static int		atkbd_configure(int flags);
 static kbd_probe_t	atkbd_probe;
@@ -470,7 +476,10 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 static int
 atkbd_term(keyboard_t *kbd)
 {
+	atkbd_state_t *state = (atkbd_state_t *)kbd->kb_data;
+
 	kbd_unregister(kbd);
+	callout_drain(&state->ks_timer);
 	return 0;
 }
 
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index 0f6d68b31ec9..2f9f4595a9f5 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -457,9 +457,10 @@ static struct mbuf *bce_tso_setup	(struct bce_softc *,
     struct mbuf **, u16 *);
 static int  bce_tx_encap			(struct bce_softc *, struct mbuf **);
 static void bce_start_locked		(struct ifnet *);
-static void bce_start				(struct ifnet *);
-static int  bce_ioctl				(struct ifnet *, u_long, caddr_t);
-static void bce_watchdog			(struct bce_softc *);
+static void bce_start			(struct ifnet *);
+static int  bce_ioctl			(struct ifnet *, u_long, caddr_t);
+static uint64_t bce_get_counter		(struct ifnet *, ift_counter);
+static void bce_watchdog		(struct bce_softc *);
 static int  bce_ifmedia_upd		(struct ifnet *);
 static int  bce_ifmedia_upd_locked	(struct ifnet *);
 static void bce_ifmedia_sts		(struct ifnet *, struct ifmediareq *);
@@ -1389,6 +1390,7 @@ bce_attach(device_t dev)
 	ifp->if_flags	= IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl	= bce_ioctl;
 	ifp->if_start	= bce_start;
+	ifp->if_get_counter = bce_get_counter;
 	ifp->if_init	= bce_init;
 	ifp->if_mtu	= ETHERMTU;
 
@@ -6747,9 +6749,7 @@ bce_rx_intr(struct bce_softc *sc)
 		    L2_FHDR_ERRORS_TOO_SHORT  | L2_FHDR_ERRORS_GIANT_FRAME)) {
 
 			/* Log the error and release the mbuf. */
-			ifp->if_ierrors++;
 			sc->l2fhdr_error_count++;
-
 			m_freem(m0);
 			m0 = NULL;
 			goto bce_rx_intr_next_rx;
@@ -6830,7 +6830,7 @@ bce_rx_intr(struct bce_softc *sc)
 		}
 
 		/* Increment received packet statistics. */
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 bce_rx_intr_next_rx:
 		sw_rx_cons = NEXT_RX_BD(sw_rx_cons);
@@ -6988,7 +6988,7 @@ bce_tx_intr(struct bce_softc *sc)
 			sc->tx_mbuf_ptr[sw_tx_chain_cons] = NULL;
 			DBRUN(sc->debug_tx_mbuf_alloc--);
 
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		sc->used_tx_bd--;
@@ -7901,7 +7901,7 @@ bce_watchdog(struct bce_softc *sc)
 	sc->bce_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 
 	bce_init_locked(sc);
-	sc->bce_ifp->if_oerrors++;
+	sc->watchdog_timeouts++;
 
 bce_watchdog_exit:
 	REG_WR(sc, BCE_EMAC_RX_STATUS, status);
@@ -8157,27 +8157,14 @@ bce_set_rx_mode(struct bce_softc *sc)
 static void
 bce_stats_update(struct bce_softc *sc)
 {
-	struct ifnet *ifp;
 	struct statistics_block *stats;
 
 	DBENTER(BCE_EXTREME_MISC);
 
-	ifp = sc->bce_ifp;
-
 	bus_dmamap_sync(sc->stats_tag, sc->stats_map, BUS_DMASYNC_POSTREAD);
 
 	stats = (struct statistics_block *) sc->stats_block;
 
-	/*
-	 * Certain controllers don't report
-	 * carrier sense errors correctly.
-	 * See errata E11_5708CA0_1165.
-	 */
-	if (!(BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5706) &&
-	    !(BCE_CHIP_ID(sc) == BCE_CHIP_ID_5708_A0))
-		ifp->if_oerrors +=
-		    (u_long) stats->stat_Dot3StatsCarrierSenseErrors;
-
 	/*
 	 * Update the sysctl statistics from the
 	 * hardware statistics.
@@ -8359,35 +8346,51 @@ bce_stats_update(struct bce_softc *sc)
 
 	sc->com_no_buffers = REG_RD_IND(sc, 0x120084);
 
-	/*
-	 * Update the interface statistics from the
-	 * hardware statistics.
-	 */
-	ifp->if_collisions =
-	    (u_long) sc->stat_EtherStatsCollisions;
-
-	/* ToDo: This method loses soft errors. */
-	ifp->if_ierrors =
-	    (u_long) sc->stat_EtherStatsUndersizePkts +
-	    (u_long) sc->stat_EtherStatsOversizePkts +
-	    (u_long) sc->stat_IfInMBUFDiscards +
-	    (u_long) sc->stat_Dot3StatsAlignmentErrors +
-	    (u_long) sc->stat_Dot3StatsFCSErrors +
-	    (u_long) sc->stat_IfInRuleCheckerDiscards +
-	    (u_long) sc->stat_IfInFTQDiscards +
-	    (u_long) sc->com_no_buffers;
-
-	/* ToDo: This method loses soft errors. */
-	ifp->if_oerrors =
-	    (u_long) sc->stat_emac_tx_stat_dot3statsinternalmactransmiterrors +
-	    (u_long) sc->stat_Dot3StatsExcessiveCollisions +
-	    (u_long) sc->stat_Dot3StatsLateCollisions;
-
 	/* ToDo: Add additional statistics? */
 
 	DBEXIT(BCE_EXTREME_MISC);
 }
 
+static uint64_t
+bce_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct bce_softc *sc;
+	uint64_t rv;
+
+	sc = if_getsoftc(ifp);
+
+	switch (cnt) {
+	case IFCOUNTER_COLLISIONS:
+		return (sc->stat_EtherStatsCollisions);
+	case IFCOUNTER_IERRORS:
+		return (sc->stat_EtherStatsUndersizePkts +
+		    sc->stat_EtherStatsOversizePkts +
+		    sc->stat_IfInMBUFDiscards +
+		    sc->stat_Dot3StatsAlignmentErrors +
+		    sc->stat_Dot3StatsFCSErrors +
+		    sc->stat_IfInRuleCheckerDiscards +
+		    sc->stat_IfInFTQDiscards +
+		    sc->l2fhdr_error_count +
+		    sc->com_no_buffers);
+	case IFCOUNTER_OERRORS:
+		rv = sc->stat_Dot3StatsExcessiveCollisions +
+		    sc->stat_emac_tx_stat_dot3statsinternalmactransmiterrors +
+		    sc->stat_Dot3StatsLateCollisions +
+		    sc->watchdog_timeouts;
+		/*
+		 * Certain controllers don't report
+		 * carrier sense errors correctly.
+		 * See errata E11_5708CA0_1165.
+		 */
+		if (!(BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5706) &&
+		    !(BCE_CHIP_ID(sc) == BCE_CHIP_ID_5708_A0))
+			rv += sc->stat_Dot3StatsCarrierSenseErrors;
+		return (rv);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
+
 
 /****************************************************************************/
 /* Periodic function to notify the bootcode that the driver is still        */
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index 16f99ccdf55e..d9df1fa1b513 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -6692,6 +6692,7 @@ struct bce_softc
 	u32			l2fhdr_error_count;
 	u32			dma_map_addr_tx_failed_count;
 	u32			dma_map_addr_rx_failed_count;
+	u32			watchdog_timeouts;
 
 	/* Host coalescing block command register */
 	u32			hc_command;
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index c4055bb3f360..eaad8f0b5981 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -1310,22 +1310,22 @@ bfe_stats_update(struct bfe_softc *sc)
 	stats->rx_control_frames += mib[MIB_RX_NPAUSE];
 
 	/* Update counters in ifnet. */
-	ifp->if_opackets += (u_long)mib[MIB_TX_GOOD_P];
-	ifp->if_collisions += (u_long)mib[MIB_TX_TCOLS];
-	ifp->if_oerrors += (u_long)mib[MIB_TX_URUNS] +
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, (u_long)mib[MIB_TX_GOOD_P]);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (u_long)mib[MIB_TX_TCOLS]);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, (u_long)mib[MIB_TX_URUNS] +
 	    (u_long)mib[MIB_TX_ECOLS] +
 	    (u_long)mib[MIB_TX_DEFERED] +
-	    (u_long)mib[MIB_TX_CLOST];
+	    (u_long)mib[MIB_TX_CLOST]);
 
-	ifp->if_ipackets += (u_long)mib[MIB_RX_GOOD_P];
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, (u_long)mib[MIB_RX_GOOD_P]);
 
-	ifp->if_ierrors += mib[MIB_RX_JABBER] +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, mib[MIB_RX_JABBER] +
 	    mib[MIB_RX_MISS] +
 	    mib[MIB_RX_CRCA] +
 	    mib[MIB_RX_USIZE] +
 	    mib[MIB_RX_CRC] +
 	    mib[MIB_RX_ALIGN] +
-	    mib[MIB_RX_SYM];
+	    mib[MIB_RX_SYM]);
 }
 
 static void
@@ -1403,7 +1403,7 @@ bfe_rxeof(struct bfe_softc *sc)
 		 * reuse mapped buffer from errored frame. 
 		 */
 		if (bfe_list_newbuf(sc, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			bfe_discard_buf(sc, cons);
 			continue;
 		}
@@ -1818,7 +1818,7 @@ bfe_watchdog(struct bfe_softc *sc)
 
 	device_printf(sc->bfe_dev, "watchdog timeout -- resetting\n");
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	bfe_init_locked(sc);
 
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 384c8f40f1c5..838be4fdd80a 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -434,6 +434,7 @@ static int bge_shutdown(device_t);
 static int bge_ifmedia_upd_locked(if_t);
 static int bge_ifmedia_upd(if_t);
 static void bge_ifmedia_sts(if_t, struct ifmediareq *);
+static uint64_t bge_get_counter(if_t, ift_counter);
 
 static uint8_t bge_nvram_getbyte(struct bge_softc *, int, uint8_t *);
 static int bge_read_nvram(struct bge_softc *, caddr_t, int, int);
@@ -3738,6 +3739,7 @@ bge_attach(device_t dev)
 	if_setioctlfn(ifp, bge_ioctl);
 	if_setstartfn(ifp, bge_start);
 	if_setinitfn(ifp, bge_init);
+	if_setgetcounterfn(ifp, bge_get_counter);
 	if_setsendqlen(ifp, BGE_TX_RING_CNT - 1);
 	if_setsendqready(ifp);
 	if_sethwassist(ifp, sc->bge_csum_features);
@@ -4364,7 +4366,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 			}
 			if (bge_newbuf_jumbo(sc, rxidx) != 0) {
 				bge_rxreuse_jumbo(sc, rxidx);
-				if_inciqdrops(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 			BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT);
@@ -4377,13 +4379,13 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 			}
 			if (bge_newbuf_std(sc, rxidx) != 0) {
 				bge_rxreuse_std(sc, rxidx);
-				if_inciqdrops(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 			BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT);
 		}
 
-		if_incipackets(ifp, 1);
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 #ifndef __NO_STRICT_ALIGNMENT
 		/*
 		 * For architectures with strict alignment we must make sure
@@ -4512,7 +4514,7 @@ bge_txeof(struct bge_softc *sc, uint16_t tx_cons)
 		idx = sc->bge_tx_saved_considx;
 		cur_tx = &sc->bge_ldata.bge_tx_ring[idx];
 		if (cur_tx->bge_flags & BGE_TXBDFLAG_END)
-			if_incopackets(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if (sc->bge_cdata.bge_tx_chain[idx] != NULL) {
 			bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag,
 			    sc->bge_cdata.bge_tx_dmamap[idx],
@@ -4917,10 +4919,6 @@ bge_stats_update_regs(struct bge_softc *sc)
 	stats->RecvThresholdHit +=
 	    CSR_READ_4(sc, BGE_RXLP_LOCSTAT_RXTHRESH_HIT);
 
-	if_setcollisions(ifp, (u_long)stats->etherStatsCollisions);
-	if_setierrors(ifp, (u_long)(stats->NoMoreRxBDs + stats->InputDiscards +
-	    stats->InputErrors));
-
 	if (sc->bge_flags & BGE_FLAG_RDMA_BUG) {
 		/*
 		 * If controller transmitted more than BGE_NUM_RDMA_CHANNELS
@@ -4997,21 +4995,21 @@ bge_stats_update(struct bge_softc *sc)
 	CSR_READ_4(sc, stats + offsetof(struct bge_stats, stat))
 
 	cnt = READ_STAT(sc, stats, txstats.etherStatsCollisions.bge_addr_lo);
-	if_inccollisions(ifp, (uint32_t)(cnt - sc->bge_tx_collisions));
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, cnt - sc->bge_tx_collisions);
 	sc->bge_tx_collisions = cnt;
 
 	cnt = READ_STAT(sc, stats, nicNoMoreRxBDs.bge_addr_lo);
-	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_nobds));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, cnt - sc->bge_rx_nobds);
 	sc->bge_rx_nobds = cnt;
 	cnt = READ_STAT(sc, stats, ifInErrors.bge_addr_lo);
-	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_inerrs));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, cnt - sc->bge_rx_inerrs);
 	sc->bge_rx_inerrs = cnt;
 	cnt = READ_STAT(sc, stats, ifInDiscards.bge_addr_lo);
-	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_discards));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, cnt - sc->bge_rx_discards);
 	sc->bge_rx_discards = cnt;
 
 	cnt = READ_STAT(sc, stats, txstats.ifOutDiscards.bge_addr_lo);
-	if_incoerrors(ifp, (uint32_t)(cnt - sc->bge_tx_discards));
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, cnt - sc->bge_tx_discards);
 	sc->bge_tx_discards = cnt;
 
 #undef	READ_STAT
@@ -5830,7 +5828,7 @@ bge_ioctl(if_t ifp, u_long command, caddr_t data)
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
-				error = ether_poll_register_drv(bge_poll, ifp);
+				error = ether_poll_register(bge_poll, ifp);
 				if (error)
 					return (error);
 				BGE_LOCK(sc);
@@ -5950,7 +5948,7 @@ bge_watchdog(struct bge_softc *sc)
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	bge_init_locked(sc);
 
-	if_incoerrors(ifp, 1);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 static void
@@ -6770,3 +6768,25 @@ bge_get_eaddr(struct bge_softc *sc, uint8_t eaddr[])
 	}
 	return (*func == NULL ? ENXIO : 0);
 }
+
+static uint64_t
+bge_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct bge_softc *sc;
+	struct bge_mac_stats *stats;
+
+	sc = if_getsoftc(ifp);
+	if (!BGE_IS_5705_PLUS(sc))
+		return (if_get_counter_default(ifp, cnt));
+	stats = &sc->bge_mac_stats;
+
+	switch (cnt) {
+	case IFCOUNTER_IERRORS:
+		return (stats->NoMoreRxBDs + stats->InputDiscards +
+		    stats->InputErrors);
+	case IFCOUNTER_COLLISIONS:
+		return (stats->etherStatsCollisions);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c
index 8db158343176..860e1771a9b1 100644
--- a/sys/dev/bm/if_bm.c
+++ b/sys/dev/bm/if_bm.c
@@ -608,7 +608,7 @@ bm_rxintr(void *xsc)
 		m = sc->sc_rxsoft[i].rxs_mbuf;
 
 		if (bm_add_rxbuf(sc, i)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m = NULL;
 			continue;
 		}
@@ -616,7 +616,7 @@ bm_rxintr(void *xsc)
 		if (m == NULL)
 			continue;
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 		m->m_len -= (dbdma_get_residuals(sc->sc_rxdma, i) + 2);
 		m->m_pkthdr.len = m->m_len;
@@ -678,7 +678,7 @@ bm_txintr(void *xsc)
 
 		STAILQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		progress = 1;
 	}
 
@@ -1196,12 +1196,13 @@ bm_tick(void *arg)
 	struct bm_softc *sc = arg;
 
 	/* Read error counters */
-	sc->sc_ifp->if_collisions += CSR_READ_2(sc, BM_TX_NCCNT) +
-	    CSR_READ_2(sc, BM_TX_FCCNT) + CSR_READ_2(sc, BM_TX_EXCNT) +
-	    CSR_READ_2(sc, BM_TX_LTCNT);
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_COLLISIONS,
+	    CSR_READ_2(sc, BM_TX_NCCNT) + CSR_READ_2(sc, BM_TX_FCCNT) +
+	    CSR_READ_2(sc, BM_TX_EXCNT) + CSR_READ_2(sc, BM_TX_LTCNT));
 
-	sc->sc_ifp->if_ierrors += CSR_READ_2(sc, BM_RX_LECNT) +
-	    CSR_READ_2(sc, BM_RX_AECNT) + CSR_READ_2(sc, BM_RX_FECNT);
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS,
+	    CSR_READ_2(sc, BM_RX_LECNT) + CSR_READ_2(sc, BM_RX_AECNT) +
+	    CSR_READ_2(sc, BM_RX_FECNT));
 
 	/* Zero collision counters */
 	CSR_WRITE_2(sc, BM_TX_NCCNT, 0);
diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c
index ca9612e93436..9e915aac669e 100644
--- a/sys/dev/bwi/if_bwi.c
+++ b/sys/dev/bwi/if_bwi.c
@@ -1401,7 +1401,7 @@ bwi_start_locked(struct ifnet *ifp)
 			if (k == NULL) {
 				ieee80211_free_node(ni);
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		}
@@ -1411,7 +1411,7 @@ bwi_start_locked(struct ifnet *ifp)
 			/* 'm' is freed in bwi_encap() if we reach here */
 			if (ni != NULL)
 				ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
@@ -1419,7 +1419,7 @@ bwi_start_locked(struct ifnet *ifp)
 		tbd->tbd_used++;
 		idx = (idx + 1) % BWI_TX_NDESC;
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		if (tbd->tbd_used + BWI_TX_NSPRDESC >= BWI_TX_NDESC) {
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
@@ -1466,7 +1466,7 @@ bwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		error = bwi_encap_raw(sc, idx, m, ni, params);
 	}
 	if (error == 0) {
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if (++tbd->tbd_used + BWI_TX_NSPRDESC >= BWI_TX_NDESC)
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 		tbd->tbd_idx = (idx + 1) % BWI_TX_NDESC;
@@ -1474,7 +1474,7 @@ bwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	} else {
 		/* NB: m is reclaimed on encap failure */
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	BWI_UNLOCK(sc);
 	return error;
@@ -1491,7 +1491,7 @@ bwi_watchdog(void *arg)
 	BWI_ASSERT_LOCKED(sc);
 	if (sc->sc_tx_timer != 0 && --sc->sc_tx_timer == 0) {
 		if_printf(ifp, "watchdog timeout\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		taskqueue_enqueue(sc->sc_tq, &sc->sc_restart_task);
 	}
 	callout_reset(&sc->sc_watchdog_timer, hz, bwi_watchdog, sc);
@@ -2639,7 +2639,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_idx)
 				BUS_DMASYNC_POSTREAD);
 
 		if (bwi_newbuf(sc, idx, 0)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto next;
 		}
 
@@ -2655,7 +2655,7 @@ bwi_rxeof(struct bwi_softc *sc, int end_idx)
 		if (buflen < BWI_FRAME_MIN_LEN(wh_ofs)) {
 			if_printf(ifp, "%s: zero length data, hdr_extra %d\n",
 				  __func__, hdr_extra);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m_freem(m);
 			goto next;
 		}
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 4e9a8d9ba36c..6c5b8fd70d96 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -1311,7 +1311,7 @@ bwn_start_locked(struct ifnet *ifp)
 		if (ni == NULL) {
 			device_printf(sc->sc_dev, "unexpected NULL ni\n");
 			m_freem(m);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		KASSERT(ni != NULL, ("%s:%d: fail", __func__, __LINE__));
@@ -1321,7 +1321,7 @@ bwn_start_locked(struct ifnet *ifp)
 			if (k == NULL) {
 				ieee80211_free_node(ni);
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		}
@@ -1330,7 +1330,7 @@ bwn_start_locked(struct ifnet *ifp)
 		if (bwn_tx_start(sc, ni, m) != 0) {
 			if (ni != NULL)
 				ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
@@ -1587,7 +1587,7 @@ bwn_watchdog(void *arg)
 
 	if (sc->sc_watchdog_timer != 0 && --sc->sc_watchdog_timer == 0) {
 		if_printf(ifp, "device timeout\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	callout_schedule(&sc->sc_watchdog_ch, hz);
 }
@@ -2748,7 +2748,7 @@ bwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	if (bwn_tx_isfull(sc, m)) {
 		ieee80211_free_node(ni);
 		m_freem(m);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		BWN_UNLOCK(sc);
 		return (ENOBUFS);
 	}
@@ -2756,7 +2756,7 @@ bwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	if (bwn_tx_start(sc, ni, m) != 0) {
 		if (ni != NULL)
 			ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	sc->sc_watchdog_timer = 5;
 	BWN_UNLOCK(sc);
@@ -8929,14 +8929,14 @@ bwn_dma_rxeof(struct bwn_dma_ring *dr, int *slot)
 	m = meta->mt_m;
 
 	if (bwn_dma_newbuf(dr, desc, meta, 0)) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
 	rxhdr = mtod(m, struct bwn_rxhdr4 *);
 	len = le16toh(rxhdr->frame_len);
 	if (len <= 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	if (bwn_dma_check_redzone(dr, m)) {
@@ -9366,7 +9366,7 @@ bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const void *_rxhdr)
 	rssi = rxhdr->phy.abg.rssi;	/* XXX incorrect RSSI calculation? */
 	noise = mac->mac_stats.link_noise;
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	BWN_UNLOCK(sc);
 
@@ -9441,7 +9441,7 @@ bwn_dma_handle_txeof(struct bwn_mac *mac,
 
 		dr->dr_usedslot--;
 		if (meta->mt_islast) {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			break;
 		}
 		slot = bwn_dma_nextslot(dr, slot);
@@ -9487,7 +9487,7 @@ bwn_pio_handle_txeof(struct bwn_mac *mac,
 	tp->tp_m = NULL;
 	TAILQ_INSERT_TAIL(&tq->tq_pktlist, tp, tp_list);
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	sc->sc_watchdog_timer = 0;
 	if (tq->tq_stop) {
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 50106bf71e20..ac20d781f608 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -3222,7 +3222,7 @@ bxe_tpa_stop(struct bxe_softc          *sc,
         m->m_flags |= M_FLOWID;
 #endif
 
-        if_incipackets(ifp, 1);
+        if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
         fp->eth_q_stats.rx_tpa_pkts++;
 
         /* pass the frame to the stack */
@@ -3465,7 +3465,7 @@ bxe_rxeof(struct bxe_softc    *sc,
 
         /* pass the frame to the stack */
         if (__predict_true(m != NULL)) {
-            if_incipackets(ifp, 1);
+            if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
             rx_pkts++;
             if_input(ifp, m);
         }
@@ -13279,6 +13279,7 @@ bxe_init_ifnet(struct bxe_softc *sc)
     if_setflags(ifp, (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST));
     if_setioctlfn(ifp, bxe_ioctl);
     if_setstartfn(ifp, bxe_tx_start);
+    if_setgetcounterfn(ifp, bxe_get_counter);
 #if __FreeBSD_version >= 800000
     if_settransmitfn(ifp, bxe_tx_mq_start);
     if_setqflushfn(ifp, bxe_mq_flush);
diff --git a/sys/dev/bxe/bxe_stats.c b/sys/dev/bxe/bxe_stats.c
index f6b23975cfed..3d33fb7d8d76 100644
--- a/sys/dev/bxe/bxe_stats.c
+++ b/sys/dev/bxe/bxe_stats.c
@@ -1164,50 +1164,54 @@ bxe_storm_stats_update(struct bxe_softc *sc)
 static void
 bxe_net_stats_update(struct bxe_softc *sc)
 {
-    struct bxe_eth_stats *estats = &sc->eth_stats;
-    if_t ifnet = sc->ifp;
-    int i;
 
-    if_setipackets(ifnet,
-        bxe_hilo(&estats->total_unicast_packets_received_hi) +
-        bxe_hilo(&estats->total_multicast_packets_received_hi) +
-        bxe_hilo(&estats->total_broadcast_packets_received_hi));
+    for (int i = 0; i < sc->num_queues; i++)
+        if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS,
+	    le32toh(sc->fp[i].old_tclient.checksum_discard));
+}
 
-    if_setopackets(ifnet,
-        bxe_hilo(&estats->total_unicast_packets_transmitted_hi) +
-        bxe_hilo(&estats->total_multicast_packets_transmitted_hi) +
-        bxe_hilo(&estats->total_broadcast_packets_transmitted_hi));
+uint64_t
+bxe_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct bxe_softc *sc;
+	struct bxe_eth_stats *estats;
 
-    if_setibytes(ifnet, bxe_hilo(&estats->total_bytes_received_hi));
+	sc = if_getsoftc(ifp);
+	estats = &sc->eth_stats;
 
-    if_setobytes(ifnet, bxe_hilo(&estats->total_bytes_transmitted_hi));
-
-    for (i = 0; i < sc->num_queues; i++) {
-        struct tstorm_per_queue_stats *old_tclient =
-            &sc->fp[i].old_tclient;
-        if_inciqdrops(ifnet, le32toh(old_tclient->checksum_discard));
-    }
-
-    if_setierrors(ifnet,
-        bxe_hilo(&estats->rx_stat_etherstatsundersizepkts_hi) +
-        bxe_hilo(&estats->etherstatsoverrsizepkts_hi) +
-        bxe_hilo(&estats->brb_drop_hi) +
-        bxe_hilo(&estats->brb_truncate_hi) +
-        bxe_hilo(&estats->rx_stat_dot3statsfcserrors_hi) +
-        bxe_hilo(&estats->rx_stat_dot3statsalignmenterrors_hi) +
-        bxe_hilo(&estats->no_buff_discard_hi));
-
-    if_setoerrors(ifnet, 
-        bxe_hilo(&estats->rx_stat_dot3statscarriersenseerrors_hi) +
-        bxe_hilo(&estats->tx_stat_dot3statsinternalmactransmiterrors_hi));
-
-    if_setimcasts(ifnet, 
-        bxe_hilo(&estats->total_multicast_packets_received_hi));
-
-    if_setcollisions(ifnet, 
-        bxe_hilo(&estats->tx_stat_etherstatscollisions_hi) +
-        bxe_hilo(&estats->tx_stat_dot3statslatecollisions_hi) +
-        bxe_hilo(&estats->tx_stat_dot3statsexcessivecollisions_hi));
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (bxe_hilo(&estats->total_unicast_packets_received_hi) +
+		    bxe_hilo(&estats->total_multicast_packets_received_hi) +
+		    bxe_hilo(&estats->total_broadcast_packets_received_hi));
+	case IFCOUNTER_OPACKETS:
+		return (bxe_hilo(&estats->total_unicast_packets_transmitted_hi) +
+		    bxe_hilo(&estats->total_multicast_packets_transmitted_hi) +
+		    bxe_hilo(&estats->total_broadcast_packets_transmitted_hi));
+	case IFCOUNTER_IBYTES:
+		return (bxe_hilo(&estats->total_bytes_received_hi));
+	case IFCOUNTER_OBYTES:
+		return (bxe_hilo(&estats->total_bytes_transmitted_hi));
+	case IFCOUNTER_IERRORS:
+		return (bxe_hilo(&estats->rx_stat_etherstatsundersizepkts_hi) +
+		    bxe_hilo(&estats->etherstatsoverrsizepkts_hi) +
+		    bxe_hilo(&estats->brb_drop_hi) +
+		    bxe_hilo(&estats->brb_truncate_hi) +
+		    bxe_hilo(&estats->rx_stat_dot3statsfcserrors_hi) +
+		    bxe_hilo(&estats->rx_stat_dot3statsalignmenterrors_hi) +
+		    bxe_hilo(&estats->no_buff_discard_hi));
+	case IFCOUNTER_OERRORS:
+		return (bxe_hilo(&estats->rx_stat_dot3statscarriersenseerrors_hi) +
+		    bxe_hilo(&estats->tx_stat_dot3statsinternalmactransmiterrors_hi));
+	case IFCOUNTER_IMCASTS:
+		return (bxe_hilo(&estats->total_multicast_packets_received_hi));
+	case IFCOUNTER_COLLISIONS:
+		return (bxe_hilo(&estats->tx_stat_etherstatscollisions_hi) +
+		    bxe_hilo(&estats->tx_stat_dot3statslatecollisions_hi) +
+		    bxe_hilo(&estats->tx_stat_dot3statsexcessivecollisions_hi));
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 static void
@@ -1669,15 +1673,6 @@ bxe_stats_init(struct bxe_softc *sc)
     /* prepare statistics ramrod data */
     bxe_prep_fw_stats_req(sc);
 
-    if_setipackets(sc->ifp, 0);
-    if_setopackets(sc->ifp, 0);
-    if_setibytes(sc->ifp, 0);
-    if_setobytes(sc->ifp, 0);
-    if_setierrors(sc->ifp, 0);
-    if_setoerrors(sc->ifp, 0);
-    if_setimcasts(sc->ifp, 0);
-    if_setcollisions(sc->ifp, 0);
-
     if (sc->stats_init) {
         memset(&sc->net_stats_old, 0, sizeof(sc->net_stats_old));
         memset(&sc->fw_stats_old, 0, sizeof(sc->fw_stats_old));
@@ -1731,9 +1726,6 @@ bxe_save_statistics(struct bxe_softc *sc)
         UPDATE_QSTAT_OLD(total_tpa_bytes_lo);
     }
 
-    /* save net_device_stats statistics */
-    sc->net_stats_old.rx_dropped = if_getiqdrops(sc->ifp);
-
     /* store port firmware statistics */
     if (sc->port.pmf) {
         struct bxe_eth_stats *estats = &sc->eth_stats;
diff --git a/sys/dev/bxe/bxe_stats.h b/sys/dev/bxe/bxe_stats.h
index cb98201abb13..ed37f55c452d 100644
--- a/sys/dev/bxe/bxe_stats.h
+++ b/sys/dev/bxe/bxe_stats.h
@@ -675,6 +675,7 @@ void bxe_stats_init(struct bxe_softc *sc);
 void bxe_stats_handle(struct bxe_softc *sc, enum bxe_stats_event event);
 void bxe_save_statistics(struct bxe_softc *sc);
 void bxe_afex_collect_stats(struct bxe_softc *sc, void *void_afex_stats, uint32_t stats_type);
+uint64_t bxe_get_counter(if_t, ift_counter);
 
 #endif /* BXE_STATS_H */
 
diff --git a/sys/dev/bxe/ecore_sp.h b/sys/dev/bxe/ecore_sp.h
index f07921e20481..c5a9222534dd 100644
--- a/sys/dev/bxe/ecore_sp.h
+++ b/sys/dev/bxe/ecore_sp.h
@@ -246,14 +246,23 @@ ECORE_CRC32_LE(uint32_t seed, uint8_t *mac, uint32_t len)
 
 #else
 
+extern unsigned long bxe_debug;
+
+#define BXE_DEBUG_ECORE_DBG_BREAK_IF   0x01
+#define BXE_DEBUG_ECORE_BUG            0x02
+#define BXE_DEBUG_ECORE_BUG_ON         0x04
+
 #define ECORE_DBG_BREAK_IF(exp)     \
-    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+    if (bxe_debug & BXE_DEBUG_ECORE_DBG_BREAK_IF) \
+        printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
 
 #define ECORE_BUG(exp)     \
-    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+    if (bxe_debug & BXE_DEBUG_ECORE_BUG) \
+        printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
 
 #define ECORE_BUG_ON(exp)     \
-    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+    if (bxe_debug & BXE_DEBUG_ECORE_BUG_ON) \
+        printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
 
 
 #endif /* #ifdef ECORE_STOP_ON_ERROR */
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index 9837e7e92e3b..84b947dfba1f 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -558,7 +558,7 @@ cgem_recv(struct cgem_softc *sc)
 		           (CGEM_RXDESC_SOF | CGEM_RXDESC_EOF)) {
 			/* discard. */
 			m_free(m);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 
@@ -604,7 +604,7 @@ cgem_recv(struct cgem_softc *sc)
 		m = m_hd;
 		m_hd = m_hd->m_next;
 		m->m_next = NULL;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		(*ifp->if_input)(ifp, m);
 	}
 	CGEM_LOCK(sc);
@@ -646,9 +646,9 @@ cgem_clean_tx(struct cgem_softc *sc)
 				   sc->txring[sc->txring_tl_ptr].addr);
 		} else if ((ctl & (CGEM_TXDESC_RETRY_ERR |
 				   CGEM_TXDESC_LATE_COLL)) != 0) {
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		} else
-			sc->ifp->if_opackets++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* If the packet spanned more than one tx descriptor,
 		 * skip descriptors until we find the end so that only
@@ -821,16 +821,16 @@ cgem_poll_hw_stats(struct cgem_softc *sc)
 
 	n = RD4(sc, CGEM_SINGLE_COLL_FRAMES);
 	sc->stats.tx_single_collisn += n;
-	sc->ifp->if_collisions += n;
+	if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, n);
 	n = RD4(sc, CGEM_MULTI_COLL_FRAMES);
 	sc->stats.tx_multi_collisn += n;
-	sc->ifp->if_collisions += n;
+	if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, n);
 	n = RD4(sc, CGEM_EXCESSIVE_COLL_FRAMES);
 	sc->stats.tx_excsv_collisn += n;
-	sc->ifp->if_collisions += n;
+	if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, n);
 	n = RD4(sc, CGEM_LATE_COLL);
 	sc->stats.tx_late_collisn += n;
-	sc->ifp->if_collisions += n;
+	if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, n);
 
 	sc->stats.tx_deferred_frames += RD4(sc, CGEM_DEFERRED_TX_FRAMES);
 	sc->stats.tx_carrier_sense_errs += RD4(sc, CGEM_CARRIER_SENSE_ERRS);
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 4b4ea1f01505..554b245260f5 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -642,18 +642,18 @@ cas_tick(void *arg)
 	/*
 	 * Unload collision and error counters.
 	 */
-	ifp->if_collisions +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
 	    CAS_READ_4(sc, CAS_MAC_NORM_COLL_CNT) +
-	    CAS_READ_4(sc, CAS_MAC_FIRST_COLL_CNT);
+	    CAS_READ_4(sc, CAS_MAC_FIRST_COLL_CNT));
 	v = CAS_READ_4(sc, CAS_MAC_EXCESS_COLL_CNT) +
 	    CAS_READ_4(sc, CAS_MAC_LATE_COLL_CNT);
-	ifp->if_collisions += v;
-	ifp->if_oerrors += v;
-	ifp->if_ierrors +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, v);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, v);
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
 	    CAS_READ_4(sc, CAS_MAC_RX_LEN_ERR_CNT) +
 	    CAS_READ_4(sc, CAS_MAC_RX_ALIGN_ERR) +
 	    CAS_READ_4(sc, CAS_MAC_RX_CRC_ERR_CNT) +
-	    CAS_READ_4(sc, CAS_MAC_RX_CODE_VIOL);
+	    CAS_READ_4(sc, CAS_MAC_RX_CODE_VIOL));
 
 	/*
 	 * Then clear the hardware counters.
@@ -1581,7 +1581,7 @@ cas_tint(struct cas_softc *sc)
 
 		STAILQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		progress = 1;
 	}
 
@@ -1700,7 +1700,7 @@ cas_rint(struct cas_softc *sc)
 
 		if (__predict_false(
 		    (word4 & (CAS_RC4_BAD | CAS_RC4_LEN_MMATCH)) != 0)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			device_printf(sc->sc_dev,
 			    "receive error: CRC error\n");
 			continue;
@@ -1750,7 +1750,7 @@ cas_rint(struct cas_softc *sc)
 			if (m != NULL) {
 				m->m_pkthdr.rcvif = ifp;
 				m->m_pkthdr.len = m->m_len = len;
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 				if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 					cas_rxcksum(m, CAS_GET(word4,
 					    CAS_RC4_TCP_CSUM));
@@ -1759,7 +1759,7 @@ cas_rint(struct cas_softc *sc)
 				(*ifp->if_input)(ifp, m);
 				CAS_LOCK(sc);
 			} else
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 
 			if ((word1 & CAS_RC1_RELEASE_HDR) != 0 &&
 			    refcount_release(&rxds->rxds_refcount) != 0)
@@ -1848,7 +1848,7 @@ cas_rint(struct cas_softc *sc)
 			if (m != NULL) {
 				m->m_pkthdr.rcvif = ifp;
 				m->m_pkthdr.len = len;
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 				if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 					cas_rxcksum(m, CAS_GET(word4,
 					    CAS_RC4_TCP_CSUM));
@@ -1857,7 +1857,7 @@ cas_rint(struct cas_softc *sc)
 				(*ifp->if_input)(ifp, m);
 				CAS_LOCK(sc);
 			} else
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 
 			if ((word1 & CAS_RC1_RELEASE_DATA) != 0 &&
 			    refcount_release(&rxds->rxds_refcount) != 0)
@@ -1949,7 +1949,7 @@ cas_eint(struct cas_softc *sc, u_int status)
 
 	CAS_LOCK_ASSERT(sc, MA_OWNED);
 
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 	device_printf(sc->sc_dev, "%s: status 0x%x", __func__, status);
 	if ((status & CAS_INTR_PCI_ERROR_INT) != 0) {
@@ -2049,7 +2049,7 @@ cas_intr_task(void *arg, int pending __unused)
 		status2 = CAS_READ_4(sc, CAS_MAC_TX_STATUS);
 		if ((status2 &
 		    (CAS_MAC_TX_UNDERRUN | CAS_MAC_TX_MAX_PKT_ERR)) != 0)
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		else if ((status2 & ~CAS_MAC_TX_FRAME_XMTD) != 0)
 			device_printf(sc->sc_dev,
 			    "MAC TX fault, status %x\n", status2);
@@ -2058,7 +2058,7 @@ cas_intr_task(void *arg, int pending __unused)
 	if (__predict_false(status & CAS_INTR_RX_MAC_INT)) {
 		status2 = CAS_READ_4(sc, CAS_MAC_RX_STATUS);
 		if ((status2 & CAS_MAC_RX_OVERFLOW) != 0)
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		else if ((status2 & ~CAS_MAC_RX_FRAME_RCVD) != 0)
 			device_printf(sc->sc_dev,
 			    "MAC RX fault, status %x\n", status2);
@@ -2135,7 +2135,7 @@ cas_watchdog(struct cas_softc *sc)
 		device_printf(sc->sc_dev, "device timeout\n");
 	else if (bootverbose)
 		device_printf(sc->sc_dev, "device timeout (no link)\n");
-	++ifp->if_oerrors;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	/* Try to get more packets going. */
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 899f33f38dc5..d0dd0c7cc414 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -297,22 +297,6 @@ static struct cdevsw ce_cdevsw = {
 };
 #endif
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1113,7 +1097,7 @@ static void ce_transmit (ce_chan_t *c, void *attachment, int len)
 
 	d->timeout = 0;
 #ifndef NETGRAPH
-	++d->ifp->if_opackets;
+	if_inc_counter(d->ifp, IFCOUNTER_OPACKETS, 1);
 #if __FreeBSD_version >=  600034
 	d->ifp->if_flags &= ~IFF_DRV_OACTIVE;
 #else
@@ -1135,26 +1119,21 @@ static void ce_receive (ce_chan_t *c, unsigned char *data, int len)
 	if (! m) {
 		CE_DEBUG (d, ("no memory for packet\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_iqdrops;
+		if_inc_counter(d->ifp, IFCOUNTER_IQDROPS, 1);
 #endif
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	IF_ENQUEUE(&d->rqueue, m);
 #else
-	++d->ifp->if_ipackets;
+	if_inc_counter(d->ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = d->ifp;
 	/* Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf. */
-#if __FreeBSD_version >= 500000
-	BPF_TAP (d->ifp, data, len);
-#else
-	if (d->ifp->if_bpf)
-		bpf_tap (d->ifp, data, len);
-#endif
+	BPF_MTAP(d->ifp, m);
 	IF_ENQUEUE(&d->rqueue, m);
 #endif
 }
@@ -1167,33 +1146,33 @@ static void ce_error (ce_chan_t *c, int data)
 	case CE_FRAME:
 		CE_DEBUG (d, ("frame error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CE_CRC:
 		CE_DEBUG (d, ("crc error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CE_OVERRUN:
 		CE_DEBUG (d, ("overrun error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_collisions;
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_COLLISIONS, 1);
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CE_OVERFLOW:
 		CE_DEBUG (d, ("overflow error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CE_UNDERRUN:
 		CE_DEBUG (d, ("underrun error\n"));
 		d->timeout = 0;
 #ifndef NETGRAPH
-		++d->ifp->if_oerrors;
+		if_inc_counter(d->ifp, IFCOUNTER_OERRORS, 1);
 #if __FreeBSD_version >= 600034
 		d->ifp->if_flags &= ~IFF_DRV_OACTIVE;
 #else
@@ -2424,7 +2403,6 @@ static int ng_ce_rcvdata (hook_p hook, struct mbuf *m, meta_p meta)
 #if __FreeBSD_version >= 500000
 	IF_LOCK (q);
 	if (_IF_QFULL (q)) {
-		_IF_DROP (q);
 		IF_UNLOCK (q);
 		CE_UNLOCK (bd);
 		splx (s);
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index e0e8e42fa2b1..a1932ad54ddb 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -512,7 +512,7 @@ cm_srint_locked(vsc)
 		 * count it as input error (we dont have any other
 		 * detectable)
 		 */
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto cleanup;
 	}
 
@@ -544,13 +544,13 @@ cm_srint_locked(vsc)
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto cleanup;
 		}
 	}
 
 	if (m == 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto cleanup;
 	}
 
@@ -572,7 +572,7 @@ cm_srint_locked(vsc)
 	CM_LOCK(sc);
 
 	m = NULL;
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 cleanup:
 
@@ -620,7 +620,7 @@ cm_tint_locked(sc, isr)
 	 */
 
 	if (isr & CM_TMA || sc->sc_broadcast[buffer])
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 #ifdef CMRETRANSMIT
 	else if (ifp->if_flags & IFF_LINK2 && sc->sc_timer > 0
 	    && --sc->sc_retransmits[buffer] > 0) {
@@ -630,7 +630,7 @@ cm_tint_locked(sc, isr)
 	}
 #endif
 	else
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 
 	/* We know we can accept another buffer at this point. */
@@ -730,7 +730,7 @@ cmintr(arg)
 			 * PUTREG(CMCMD, CM_CONF(CONF_LONG));
 			 */
 			PUTREG(CMCMD, CM_CLR(CLR_RECONFIG));
-			ifp->if_collisions++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 
 			/*
 			 * If less than 2 seconds per reconfig:
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index ec5f04212804..4e70838fcd9d 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -181,22 +181,6 @@ static struct cdevsw cp_cdevsw = {
 	.d_name     = "cp",
 };
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -883,7 +867,7 @@ static void cp_transmit (cp_chan_t *c, void *attachment, int len)
 
 	d->timeout = 0;
 #ifndef NETGRAPH
-	++d->ifp->if_opackets;
+	if_inc_counter(d->ifp, IFCOUNTER_OPACKETS, 1);
 	d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 	cp_start (d);
@@ -904,21 +888,21 @@ static void cp_receive (cp_chan_t *c, unsigned char *data, int len)
 	if (! m) {
 		CP_DEBUG (d, ("no memory for packet\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_iqdrops;
+		if_inc_counter(d->ifp, IFCOUNTER_IQDROPS, 1);
 #endif
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);
 #else
-	++d->ifp->if_ipackets;
+	if_inc_counter(d->ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = d->ifp;
 	/* Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf. */
-	BPF_TAP (d->ifp, data, len);
+	BPF_MTAP(d->ifp, m);
 	IF_ENQUEUE (&d->queue, m);
 #endif
 }
@@ -931,33 +915,33 @@ static void cp_error (cp_chan_t *c, int data)
 	case CP_FRAME:
 		CP_DEBUG (d, ("frame error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CP_CRC:
 		CP_DEBUG (d, ("crc error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CP_OVERRUN:
 		CP_DEBUG (d, ("overrun error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_collisions;
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_COLLISIONS, 1);
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CP_OVERFLOW:
 		CP_DEBUG (d, ("overflow error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CP_UNDERRUN:
 		CP_DEBUG (d, ("underrun error\n"));
 		d->timeout = 0;
 #ifndef NETGRAPH
-		++d->ifp->if_oerrors;
+		if_inc_counter(d->ifp, IFCOUNTER_OERRORS, 1);
 		d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 		cp_start (d);
@@ -2157,7 +2141,6 @@ static int ng_cp_rcvdata (hook_p hook, item_p item)
 	CP_LOCK (bd);
 	IF_LOCK (q);
 	if (_IF_QFULL (q)) {
-		_IF_DROP (q);
 		IF_UNLOCK (q);
 		CP_UNLOCK (bd);
 		splx (s);
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index e247fe2adbba..8ad50eb23de4 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -707,7 +707,7 @@ cs_get_packet(struct cs_softc *sc)
 #ifdef CS_DEBUG
 		device_printf(sc->dev, "bad pkt stat %x\n", status);
 #endif
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (-1);
 	}
 
@@ -742,7 +742,7 @@ cs_get_packet(struct cs_softc *sc)
 	    (ifp->if_flags & IFF_MULTICAST && status & RX_HASHED)) {
 		/* Feed the packet to the upper layer */
 		(*ifp->if_input)(ifp, m);
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		if (length == ETHER_MAX_LEN-ETHER_CRC_LEN)
 			DELAY(cs_recv_delay);
 	} else {
@@ -780,9 +780,9 @@ csintr(void *arg)
 
 		case ISQ_TRANSMITTER_EVENT:
 			if (status & TX_OK)
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			else
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 			sc->tx_timeout = 0;
 			break;
@@ -796,16 +796,16 @@ csintr(void *arg)
 			if (status & TX_UNDERRUN) {
 				ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 				sc->tx_timeout = 0;
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			}
 			break;
 
 		case ISQ_RX_MISS_EVENT:
-			ifp->if_ierrors+=(status>>6);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, status >> 6);
 			break;
 
 		case ISQ_TX_COL_EVENT:
-			ifp->if_collisions+=(status>>6);
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, status >> 6);
 			break;
 		}
 	}
@@ -1114,7 +1114,7 @@ cs_watchdog(void *arg)
 
 	CS_ASSERT_LOCKED(sc);
 	if (sc->tx_timeout && --sc->tx_timeout == 0) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		log(LOG_ERR, "%s: device timeout\n", ifp->if_xname);
 
 		/* Reset the interface */
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 958faa54de84..397c3ac49b25 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -184,22 +184,6 @@ static struct cdevsw ct_cdevsw = {
 	.d_name     = "ct",
 };
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1098,7 +1082,7 @@ static void ct_transmit (ct_chan_t *c, void *attachment, int len)
 		return;
 	d->timeout = 0;
 #ifndef NETGRAPH
-	++d->ifp->if_opackets;
+	if_inc_counter(d->ifp, IFCOUNTER_OPACKETS, 1);
 	d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 	ct_start (d);
@@ -1122,21 +1106,21 @@ static void ct_receive (ct_chan_t *c, char *data, int len)
 	if (! m) {
 		CT_DEBUG (d, ("no memory for packet\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_iqdrops;
+		if_inc_counter(d->ifp, IFCOUNTER_IQDROPS, 1);
 #endif
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);
 #else
-	++d->ifp->if_ipackets;
+	if_inc_counter(d->ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = d->ifp;
 	/* Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf. */
-	BPF_TAP (d->ifp, data, len);
+	BPF_MTAP(d->ifp, m);
 	IF_ENQUEUE (&d->queue, m);
 #endif
 }
@@ -1155,33 +1139,33 @@ static void ct_error (ct_chan_t *c, int data)
 	case CT_FRAME:
 		CT_DEBUG (d, ("frame error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CT_CRC:
 		CT_DEBUG (d, ("crc error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CT_OVERRUN:
 		CT_DEBUG (d, ("overrun error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_collisions;
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_COLLISIONS, 1);
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CT_OVERFLOW:
 		CT_DEBUG (d, ("overflow error\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_ierrors;
+		if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CT_UNDERRUN:
 		CT_DEBUG (d, ("underrun error\n"));
 		d->timeout = 0;
 #ifndef NETGRAPH
-		++d->ifp->if_oerrors;
+		if_inc_counter(d->ifp, IFCOUNTER_OERRORS, 1);
 		d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 		ct_start (d);
@@ -2099,7 +2083,6 @@ static int ng_ct_rcvdata (hook_p hook, item_p item)
 	CT_LOCK (bd);
 	IF_LOCK (q);
 	if (_IF_QFULL (q)) {
-		_IF_DROP (q);
 		IF_UNLOCK (q);
 		CT_UNLOCK (bd);
 		splx (s);
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 27112d5032fe..360e1f689fa9 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -231,22 +231,6 @@ static struct cdevsw cx_cdevsw = {
 
 static int MY_SOFT_INTR;
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1267,7 +1251,7 @@ static void cx_transmit (cx_chan_t *c, void *attachment, int len)
 	}
 	d->timeout = 0;
 #ifndef NETGRAPH
-	++d->ifp->if_opackets;
+	if_inc_counter(d->ifp, IFCOUNTER_OPACKETS, 1);
 	d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 	cx_start (d);
@@ -1320,21 +1304,21 @@ static void cx_receive (cx_chan_t *c, char *data, int len)
 	if (! m) {
 		CX_DEBUG (d, ("no memory for packet\n"));
 #ifndef NETGRAPH
-		++d->ifp->if_iqdrops;
+		if_inc_counter(d->ifp, IFCOUNTER_IQDROPS, 1);
 #endif
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);
 #else
-	++d->ifp->if_ipackets;
+	if_inc_counter(d->ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = d->ifp;
 	/* Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf. */
-	BPF_TAP (d->ifp, data, len);
+	BPF_MTAP(d->ifp, m);
 	IF_ENQUEUE (&d->queue, m);
 #endif
 }
@@ -1373,7 +1357,7 @@ static void cx_error (cx_chan_t *c, int data)
 		}
 #ifndef NETGRAPH
 		else
-			++d->ifp->if_ierrors;
+			if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CX_CRC:
@@ -1390,7 +1374,7 @@ static void cx_error (cx_chan_t *c, int data)
 		}
 #ifndef NETGRAPH
 		else
-			++d->ifp->if_ierrors;
+			if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CX_OVERRUN:
@@ -1407,8 +1391,8 @@ static void cx_error (cx_chan_t *c, int data)
 #endif
 #ifndef NETGRAPH
 		else {
-			++d->ifp->if_collisions;
-			++d->ifp->if_ierrors;
+			if_inc_counter(d->ifp, IFCOUNTER_COLLISIONS, 1);
+			if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 		}
 #endif
 		break;
@@ -1416,7 +1400,7 @@ static void cx_error (cx_chan_t *c, int data)
 		CX_DEBUG (d, ("overflow error\n"));
 #ifndef NETGRAPH
 		if (c->mode != M_ASYNC)
-			++d->ifp->if_ierrors;
+			if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	case CX_UNDERRUN:
@@ -1424,7 +1408,7 @@ static void cx_error (cx_chan_t *c, int data)
 		if (c->mode != M_ASYNC) {
 			d->timeout = 0;
 #ifndef NETGRAPH
-			++d->ifp->if_oerrors;
+			if_inc_counter(d->ifp, IFCOUNTER_OERRORS, 1);
 			d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 #endif
 			cx_start (d);
@@ -1443,7 +1427,7 @@ static void cx_error (cx_chan_t *c, int data)
 		}
 #ifndef NETGRAPH
 		else
-			++d->ifp->if_ierrors;
+			if_inc_counter(d->ifp, IFCOUNTER_IERRORS, 1);
 #endif
 		break;
 	default:
@@ -2437,7 +2421,6 @@ static int ng_cx_rcvdata (hook_p hook, item_p item)
 	CX_LOCK (bd);
 	IF_LOCK (q);
 	if (_IF_QFULL (q)) {
-		_IF_DROP (q);
 		IF_UNLOCK (q);
 		CX_UNLOCK (bd);
 		splx (s);
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index 6aaacd365533..6f3abe7ee2eb 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -97,6 +97,7 @@ struct port_info {
 	const struct port_type_info *port_type;
 	struct cphy	phy;
 	struct cmac	mac;
+	struct timeval	last_refreshed;
 	struct link_config link_config;
 	struct ifmedia	media;
 	struct mtx	lock;
@@ -575,4 +576,5 @@ void cxgb_tx_watchdog(void *arg);
 int cxgb_transmit(struct ifnet *ifp, struct mbuf *m);
 void cxgb_qflush(struct ifnet *ifp);
 void t3_iterate(void (*)(struct adapter *, void *), void *);
+void cxgb_refresh_stats(struct port_info *);
 #endif
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 30001293b2bb..b4bacc66c46a 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -96,6 +96,7 @@ static int cxgb_media_change(struct ifnet *);
 static int cxgb_ifm_type(int);
 static void cxgb_build_medialist(struct port_info *);
 static void cxgb_media_status(struct ifnet *, struct ifmediareq *);
+static uint64_t cxgb_get_counter(struct ifnet *, ift_counter);
 static int setup_sge_qsets(adapter_t *);
 static void cxgb_async_intr(void *);
 static void cxgb_tick_handler(void *, int);
@@ -1022,6 +1023,7 @@ cxgb_port_attach(device_t dev)
 	ifp->if_ioctl = cxgb_ioctl;
 	ifp->if_transmit = cxgb_transmit;
 	ifp->if_qflush = cxgb_qflush;
+	ifp->if_get_counter = cxgb_get_counter;
 
 	ifp->if_capabilities = CXGB_CAP;
 #ifdef TCP_OFFLOAD
@@ -2189,6 +2191,71 @@ cxgb_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
 			    speed));
 }
 
+static uint64_t
+cxgb_get_counter(struct ifnet *ifp, ift_counter c)
+{
+	struct port_info *pi = ifp->if_softc;
+	struct adapter *sc = pi->adapter;
+	struct cmac *mac = &pi->mac;
+	struct mac_stats *mstats = &mac->stats;
+
+	cxgb_refresh_stats(pi);
+
+	switch (c) {
+	case IFCOUNTER_IPACKETS:
+		return (mstats->rx_frames);
+
+	case IFCOUNTER_IERRORS:
+		return (mstats->rx_jabber + mstats->rx_data_errs +
+		    mstats->rx_sequence_errs + mstats->rx_runt +
+		    mstats->rx_too_long + mstats->rx_mac_internal_errs +
+		    mstats->rx_short + mstats->rx_fcs_errs);
+
+	case IFCOUNTER_OPACKETS:
+		return (mstats->tx_frames);
+
+	case IFCOUNTER_OERRORS:
+		return (mstats->tx_excess_collisions + mstats->tx_underrun +
+		    mstats->tx_len_errs + mstats->tx_mac_internal_errs +
+		    mstats->tx_excess_deferral + mstats->tx_fcs_errs);
+
+	case IFCOUNTER_COLLISIONS:
+		return (mstats->tx_total_collisions);
+
+	case IFCOUNTER_IBYTES:
+		return (mstats->rx_octets);
+
+	case IFCOUNTER_OBYTES:
+		return (mstats->tx_octets);
+
+	case IFCOUNTER_IMCASTS:
+		return (mstats->rx_mcast_frames);
+
+	case IFCOUNTER_OMCASTS:
+		return (mstats->tx_mcast_frames);
+
+	case IFCOUNTER_IQDROPS:
+		return (mstats->rx_cong_drops);
+
+	case IFCOUNTER_OQDROPS: {
+		int i;
+		uint64_t drops;
+
+		drops = 0;
+		if (sc->flags & FULL_INIT_DONE) {
+			for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
+				drops += sc->sge.qs[i].txq[TXQ_ETH].txq_mr->br_drops;
+		}
+
+		return (drops);
+
+	}
+
+	default:
+		return (if_get_counter_default(ifp, c));
+	}
+}
+
 static void
 cxgb_async_intr(void *data)
 {
@@ -2289,6 +2356,23 @@ cxgb_tick(void *arg)
 	callout_reset(&sc->cxgb_tick_ch, hz, cxgb_tick, sc);
 }
 
+void
+cxgb_refresh_stats(struct port_info *pi)
+{
+	struct timeval tv;
+	const struct timeval interval = {0, 250000};    /* 250ms */
+
+	getmicrotime(&tv);
+	timevalsub(&tv, &interval);
+	if (timevalcmp(&tv, &pi->last_refreshed, <))
+		return;
+
+	PORT_LOCK(pi);
+	t3_mac_update_stats(&pi->mac);
+	PORT_UNLOCK(pi);
+	getmicrotime(&pi->last_refreshed);
+}
+
 static void
 cxgb_tick_handler(void *arg, int count)
 {
@@ -2333,48 +2417,12 @@ cxgb_tick_handler(void *arg, int count)
 
 	for (i = 0; i < sc->params.nports; i++) {
 		struct port_info *pi = &sc->port[i];
-		struct ifnet *ifp = pi->ifp;
 		struct cmac *mac = &pi->mac;
-		struct mac_stats *mstats = &mac->stats;
-		int drops, j;
 
 		if (!isset(&sc->open_device_map, pi->port_id))
 			continue;
 
-		PORT_LOCK(pi);
-		t3_mac_update_stats(mac);
-		PORT_UNLOCK(pi);
-
-		ifp->if_opackets = mstats->tx_frames;
-		ifp->if_ipackets = mstats->rx_frames;
-		ifp->if_obytes = mstats->tx_octets;
-		ifp->if_ibytes = mstats->rx_octets;
-		ifp->if_omcasts = mstats->tx_mcast_frames;
-		ifp->if_imcasts = mstats->rx_mcast_frames;
-		ifp->if_collisions = mstats->tx_total_collisions;
-		ifp->if_iqdrops = mstats->rx_cong_drops;
-
-		drops = 0;
-		for (j = pi->first_qset; j < pi->first_qset + pi->nqsets; j++)
-			drops += sc->sge.qs[j].txq[TXQ_ETH].txq_mr->br_drops;
-		ifp->if_snd.ifq_drops = drops;
-
-		ifp->if_oerrors =
-		    mstats->tx_excess_collisions +
-		    mstats->tx_underrun +
-		    mstats->tx_len_errs +
-		    mstats->tx_mac_internal_errs +
-		    mstats->tx_excess_deferral +
-		    mstats->tx_fcs_errs;
-		ifp->if_ierrors =
-		    mstats->rx_jabber +
-		    mstats->rx_data_errs +
-		    mstats->rx_sequence_errs +
-		    mstats->rx_runt + 
-		    mstats->rx_too_long +
-		    mstats->rx_mac_internal_errs +
-		    mstats->rx_short +
-		    mstats->rx_fcs_errs;
+		cxgb_refresh_stats(pi);
 
 		if (mac->multiport)
 			continue;
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index fcc0376fab76..88ee7ccd4920 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -3410,10 +3410,8 @@ sysctl_handle_macstat(SYSCTL_HANDLER_ARGS)
 	if (!p)
 		return (EINVAL);
 
+	cxgb_refresh_stats(p);
 	parg = (uint64_t *) ((uint8_t *)&p->mac.stats + arg2);
-	PORT_LOCK(p);
-	t3_mac_update_stats(&p->mac);
-	PORT_UNLOCK(p);
 
 	return (sysctl_handle_64(oidp, parg, 0, req));
 }
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 316852b65e6e..8cebdaa7d8ae 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -268,7 +268,10 @@ struct port_info {
 
 	int linkdnrc;
 	struct link_config link_cfg;
-	struct port_stats stats;
+
+	struct timeval last_refreshed;
+ 	struct port_stats stats;
+	u_int tnl_cong_drops;
 
 	eventhandler_tag vlan_c;
 
@@ -790,6 +793,8 @@ struct adapter {
 	TAILQ_HEAD(, sge_fl) sfl;
 	struct callout sfl_callout;
 
+	struct mtx regwin_lock;	/* for indirect reads and memory windows */
+
 	an_handler_t an_handler __aligned(CACHE_LINE_SIZE);
 	fw_msg_handler_t fw_msg_handler[5];	/* NUM_FW6_TYPES */
 	cpl_handler_t cpl_handler[0xef];	/* NUM_CPL_CMDS */
diff --git a/sys/dev/cxgbe/common/t4_regs.h b/sys/dev/cxgbe/common/t4_regs.h
index f205298841fd..1ea909eb1a3e 100644
--- a/sys/dev/cxgbe/common/t4_regs.h
+++ b/sys/dev/cxgbe/common/t4_regs.h
@@ -1073,9 +1073,9 @@
 #define A_SGE_FL_BUFFER_SIZE0 0x1044
 
 #define S_SIZE    4
-#define M_SIZE    0xfffffffU
+#define CXGBE_M_SIZE    0xfffffffU
 #define V_SIZE(x) ((x) << S_SIZE)
-#define G_SIZE(x) (((x) >> S_SIZE) & M_SIZE)
+#define G_SIZE(x) (((x) >> S_SIZE) & CXGBE_M_SIZE)
 
 #define A_SGE_FL_BUFFER_SIZE1 0x1048
 #define A_SGE_FL_BUFFER_SIZE2 0x104c
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 437b2a4dd3b2..77c99b238fae 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -151,6 +151,7 @@ static void cxgbe_init(void *);
 static int cxgbe_ioctl(struct ifnet *, unsigned long, caddr_t);
 static int cxgbe_transmit(struct ifnet *, struct mbuf *);
 static void cxgbe_qflush(struct ifnet *);
+static uint64_t cxgbe_get_counter(struct ifnet *, ift_counter);
 static int cxgbe_media_change(struct ifnet *);
 static void cxgbe_media_status(struct ifnet *, struct ifmediareq *);
 
@@ -280,6 +281,15 @@ TUNABLE_INT("hw.cxgbe.interrupt_types", &t4_intr_types);
 static char t4_cfg_file[32] = DEFAULT_CF;
 TUNABLE_STR("hw.cxgbe.config_file", t4_cfg_file, sizeof(t4_cfg_file));
 
+/*
+ * PAUSE settings (bit 0, 1 = rx_pause, tx_pause respectively).
+ * rx_pause = 1 to heed incoming PAUSE frames, 0 to ignore them.
+ * tx_pause = 1 to emit PAUSE frames when the rx FIFO reaches its high water
+ *            mark or when signalled to do so, 0 to never emit PAUSE.
+ */
+static int t4_pause_settings = PAUSE_TX | PAUSE_RX;
+TUNABLE_INT("hw.cxgbe.pause_settings", &t4_pause_settings);
+
 /*
  * Firmware auto-install by driver during attach (0, 1, 2 = prohibited, allowed,
  * encouraged respectively).
@@ -377,6 +387,7 @@ static int t4_free_irq(struct adapter *, struct irq *);
 static void reg_block_dump(struct adapter *, uint8_t *, unsigned int,
     unsigned int);
 static void t4_get_regs(struct adapter *, struct t4_regdump *, uint8_t *);
+static void cxgbe_refresh_stats(struct adapter *, struct port_info *);
 static void cxgbe_tick(void *);
 static void cxgbe_vlan_config(void *, struct ifnet *, uint16_t);
 static int cpl_not_handled(struct sge_iq *, const struct rss_header *,
@@ -393,6 +404,7 @@ static int sysctl_holdoff_tmr_idx(SYSCTL_HANDLER_ARGS);
 static int sysctl_holdoff_pktc_idx(SYSCTL_HANDLER_ARGS);
 static int sysctl_qsize_rxq(SYSCTL_HANDLER_ARGS);
 static int sysctl_qsize_txq(SYSCTL_HANDLER_ARGS);
+static int sysctl_pause_settings(SYSCTL_HANDLER_ARGS);
 static int sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS);
 static int sysctl_temperature(SYSCTL_HANDLER_ARGS);
 #ifdef SBUF_DRAIN
@@ -599,6 +611,8 @@ t4_attach(device_t dev)
 	TAILQ_INIT(&sc->sfl);
 	callout_init(&sc->sfl_callout, CALLOUT_MPSAFE);
 
+	mtx_init(&sc->regwin_lock, "register and memory window", 0, MTX_DEF);
+
 	rc = map_bars_0_and_4(sc);
 	if (rc != 0)
 		goto done; /* error message displayed already */
@@ -697,6 +711,12 @@ t4_attach(device_t dev)
 			sc->port[i] = NULL;
 			goto done;
 		}
+
+		pi->link_cfg.requested_fc &= ~(PAUSE_TX | PAUSE_RX);
+		pi->link_cfg.requested_fc |= t4_pause_settings;
+		pi->link_cfg.fc &= ~(PAUSE_TX | PAUSE_RX);
+		pi->link_cfg.fc |= t4_pause_settings;
+
 		rc = -t4_link_start(sc, sc->mbox, pi->tx_chan, &pi->link_cfg);
 		if (rc != 0) {
 			device_printf(dev, "port %d l1cfg failed: %d\n", i, rc);
@@ -1008,6 +1028,8 @@ t4_detach(device_t dev)
 		mtx_destroy(&sc->sfl_lock);
 	if (mtx_initialized(&sc->ifp_lock))
 		mtx_destroy(&sc->ifp_lock);
+	if (mtx_initialized(&sc->regwin_lock))
+		mtx_destroy(&sc->regwin_lock);
 
 	bzero(sc, sizeof(*sc));
 
@@ -1057,6 +1079,7 @@ cxgbe_attach(device_t dev)
 	ifp->if_ioctl = cxgbe_ioctl;
 	ifp->if_transmit = cxgbe_transmit;
 	ifp->if_qflush = cxgbe_qflush;
+	ifp->if_get_counter = cxgbe_get_counter;
 
 	ifp->if_capabilities = T4_CAP;
 #ifdef TCP_OFFLOAD
@@ -1067,6 +1090,10 @@ cxgbe_attach(device_t dev)
 	ifp->if_hwassist = CSUM_TCP | CSUM_UDP | CSUM_IP | CSUM_TSO |
 	    CSUM_UDP_IPV6 | CSUM_TCP_IPV6;
 
+	ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
+	ifp->if_hw_tsomaxsegcount = TX_SGL_SEGS;
+	ifp->if_hw_tsomaxsegsize = 65536;
+
 	/* Initialize ifmedia for this port */
 	ifmedia_init(&pi->media, IFM_IMASK, cxgbe_media_change,
 	    cxgbe_media_status);
@@ -1362,6 +1389,31 @@ cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
 		ifmedia_ioctl(ifp, ifr, &pi->media, cmd);
 		break;
 
+	case SIOCGI2C: {
+		struct ifi2creq i2c;
+
+		rc = copyin(ifr->ifr_data, &i2c, sizeof(i2c));
+		if (rc != 0)
+			break;
+		if (i2c.dev_addr != 0xA0 && i2c.dev_addr != 0xA2) {
+			rc = EPERM;
+			break;
+		}
+		if (i2c.len > sizeof(i2c.data)) {
+			rc = EINVAL;
+			break;
+		}
+		rc = begin_synchronized_op(sc, pi, SLEEP_OK | INTR_OK, "t4i2c");
+		if (rc)
+			return (rc);
+		rc = -t4_i2c_rd(sc, sc->mbox, pi->port_id, i2c.dev_addr,
+		    i2c.offset, i2c.len, &i2c.data[0]);
+		end_synchronized_op(sc, 0);
+		if (rc == 0)
+			rc = copyout(&i2c, ifr->ifr_data, sizeof(i2c));
+		break;
+	}
+
 	default:
 		rc = ether_ioctl(ifp, cmd, data);
 	}
@@ -1459,6 +1511,67 @@ cxgbe_qflush(struct ifnet *ifp)
 	if_qflush(ifp);
 }
 
+static uint64_t
+cxgbe_get_counter(struct ifnet *ifp, ift_counter c)
+{
+	struct port_info *pi = ifp->if_softc;
+	struct adapter *sc = pi->adapter;
+	struct port_stats *s = &pi->stats;
+
+	cxgbe_refresh_stats(sc, pi);
+
+	switch (c) {
+	case IFCOUNTER_IPACKETS:
+		return (s->rx_frames - s->rx_pause);
+
+	case IFCOUNTER_IERRORS:
+		return (s->rx_jabber + s->rx_runt + s->rx_too_long +
+		    s->rx_fcs_err + s->rx_len_err);
+
+	case IFCOUNTER_OPACKETS:
+		return (s->tx_frames - s->tx_pause);
+
+	case IFCOUNTER_OERRORS:
+		return (s->tx_error_frames);
+
+	case IFCOUNTER_IBYTES:
+		return (s->rx_octets - s->rx_pause * 64);
+
+	case IFCOUNTER_OBYTES:
+		return (s->tx_octets - s->tx_pause * 64);
+
+	case IFCOUNTER_IMCASTS:
+		return (s->rx_mcast_frames - s->rx_pause);
+
+	case IFCOUNTER_OMCASTS:
+		return (s->tx_mcast_frames - s->tx_pause);
+
+	case IFCOUNTER_IQDROPS:
+		return (s->rx_ovflow0 + s->rx_ovflow1 + s->rx_ovflow2 +
+		    s->rx_ovflow3 + s->rx_trunc0 + s->rx_trunc1 + s->rx_trunc2 +
+		    s->rx_trunc3 + pi->tnl_cong_drops);
+
+	case IFCOUNTER_OQDROPS: {
+		uint64_t drops;
+
+		drops = s->tx_drop;
+		if (pi->flags & PORT_INIT_DONE) {
+			int i;
+			struct sge_txq *txq;
+
+			for_each_txq(pi, i, txq)
+				drops += txq->br->br_drops;
+		}
+
+		return (drops);
+
+	}
+
+	default:
+		return (if_get_counter_default(ifp, c));
+	}
+}
+
 static int
 cxgbe_media_change(struct ifnet *ifp)
 {
@@ -2990,8 +3103,10 @@ update_mac_settings(struct ifnet *ifp, int flags)
 		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			if (ifma->ifma_addr->sa_family != AF_LINK)
 				continue;
-			mcaddr[i++] =
+			mcaddr[i] =
 			    LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
+			MPASS(ETHER_IS_MULTICAST(mcaddr[i]));
+			i++;
 
 			if (i == FW_MAC_EXACT_CHUNK) {
 				rc = t4_alloc_mac_filt(sc, sc->mbox, viid, del,
@@ -4229,15 +4344,40 @@ t4_get_regs(struct adapter *sc, struct t4_regdump *regs, uint8_t *buf)
 		reg_block_dump(sc, buf, reg_ranges[i], reg_ranges[i + 1]);
 }
 
+static void
+cxgbe_refresh_stats(struct adapter *sc, struct port_info *pi)
+{
+	int i;
+	u_int v, tnl_cong_drops;
+	struct timeval tv;
+	const struct timeval interval = {0, 250000};	/* 250ms */
+
+	getmicrotime(&tv);
+	timevalsub(&tv, &interval);
+	if (timevalcmp(&tv, &pi->last_refreshed, <))
+		return;
+
+	tnl_cong_drops = 0;
+	t4_get_port_stats(sc, pi->tx_chan, &pi->stats);
+	for (i = 0; i < NCHAN; i++) {
+		if (pi->rx_chan_map & (1 << i)) {
+			mtx_lock(&sc->regwin_lock);
+			t4_read_indirect(sc, A_TP_MIB_INDEX, A_TP_MIB_DATA, &v,
+			    1, A_TP_MIB_TNL_CNG_DROP_0 + i);
+			mtx_unlock(&sc->regwin_lock);
+			tnl_cong_drops += v;
+		}
+	}
+	pi->tnl_cong_drops = tnl_cong_drops;
+	getmicrotime(&pi->last_refreshed);
+}
+
 static void
 cxgbe_tick(void *arg)
 {
 	struct port_info *pi = arg;
 	struct adapter *sc = pi->adapter;
 	struct ifnet *ifp = pi->ifp;
-	struct sge_txq *txq;
-	int i, drops;
-	struct port_stats *s = &pi->stats;
 
 	PORT_LOCK(pi);
 	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
@@ -4245,39 +4385,7 @@ cxgbe_tick(void *arg)
 		return;	/* without scheduling another callout */
 	}
 
-	t4_get_port_stats(sc, pi->tx_chan, s);
-
-	ifp->if_opackets = s->tx_frames - s->tx_pause;
-	ifp->if_ipackets = s->rx_frames - s->rx_pause;
-	ifp->if_obytes = s->tx_octets - s->tx_pause * 64;
-	ifp->if_ibytes = s->rx_octets - s->rx_pause * 64;
-	ifp->if_omcasts = s->tx_mcast_frames - s->tx_pause;
-	ifp->if_imcasts = s->rx_mcast_frames - s->rx_pause;
-	ifp->if_iqdrops = s->rx_ovflow0 + s->rx_ovflow1 + s->rx_ovflow2 +
-	    s->rx_ovflow3 + s->rx_trunc0 + s->rx_trunc1 + s->rx_trunc2 +
-	    s->rx_trunc3;
-	for (i = 0; i < 4; i++) {
-		if (pi->rx_chan_map & (1 << i)) {
-			uint32_t v;
-
-			/*
-			 * XXX: indirect reads from the same ADDR/DATA pair can
-			 * race with each other.
-			 */
-			t4_read_indirect(sc, A_TP_MIB_INDEX, A_TP_MIB_DATA, &v,
-			    1, A_TP_MIB_TNL_CNG_DROP_0 + i);
-			ifp->if_iqdrops += v;
-		}
-	}
-
-	drops = s->tx_drop;
-	for_each_txq(pi, i, txq)
-		drops += txq->br->br_drops;
-	ifp->if_oqdrops = drops;
-
-	ifp->if_oerrors = s->tx_error_frames;
-	ifp->if_ierrors = s->rx_jabber + s->rx_runt + s->rx_too_long +
-	    s->rx_fcs_err + s->rx_len_err;
+	cxgbe_refresh_stats(sc, pi);
 
 	callout_schedule(&pi->tick, hz);
 	PORT_UNLOCK(pi);
@@ -4771,6 +4879,10 @@ cxgbe_sysctls(struct port_info *pi)
 	    CTLTYPE_INT | CTLFLAG_RW, pi, 0, sysctl_qsize_txq, "I",
 	    "tx queue size");
 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "pause_settings",
+	    CTLTYPE_STRING | CTLFLAG_RW, pi, PAUSE_TX, sysctl_pause_settings,
+	    "A", "PAUSE settings (bit 0 = rx_pause, bit 1 = tx_pause)");
+
 	/*
 	 * dev.cxgbe.X.stats.
 	 */
@@ -5151,6 +5263,65 @@ sysctl_qsize_txq(SYSCTL_HANDLER_ARGS)
 	return (rc);
 }
 
+static int
+sysctl_pause_settings(SYSCTL_HANDLER_ARGS)
+{
+	struct port_info *pi = arg1;
+	struct adapter *sc = pi->adapter;
+	struct link_config *lc = &pi->link_cfg;
+	int rc;
+
+	if (req->newptr == NULL) {
+		struct sbuf *sb;
+		static char *bits = "\20\1PAUSE_RX\2PAUSE_TX";
+
+		rc = sysctl_wire_old_buffer(req, 0);
+		if (rc != 0)
+			return(rc);
+
+		sb = sbuf_new_for_sysctl(NULL, NULL, 128, req);
+		if (sb == NULL)
+			return (ENOMEM);
+
+		sbuf_printf(sb, "%b", lc->fc & (PAUSE_TX | PAUSE_RX), bits);
+		rc = sbuf_finish(sb);
+		sbuf_delete(sb);
+	} else {
+		char s[2];
+		int n;
+
+		s[0] = '0' + (lc->requested_fc & (PAUSE_TX | PAUSE_RX));
+		s[1] = 0;
+
+		rc = sysctl_handle_string(oidp, s, sizeof(s), req);
+		if (rc != 0)
+			return(rc);
+
+		if (s[1] != 0)
+			return (EINVAL);
+		if (s[0] < '0' || s[0] > '9')
+			return (EINVAL);	/* not a number */
+		n = s[0] - '0';
+		if (n & ~(PAUSE_TX | PAUSE_RX))
+			return (EINVAL);	/* some other bit is set too */
+
+		rc = begin_synchronized_op(sc, pi, SLEEP_OK | INTR_OK, "t4PAUSE");
+		if (rc)
+			return (rc);
+		if ((lc->requested_fc & (PAUSE_TX | PAUSE_RX)) != n) {
+			int link_ok = lc->link_ok;
+
+			lc->requested_fc &= ~(PAUSE_TX | PAUSE_RX);
+			lc->requested_fc |= n;
+			rc = -t4_link_start(sc, sc->mbox, pi->tx_chan, lc);
+			lc->link_ok = link_ok;	/* restore */
+		}
+		end_synchronized_op(sc, 0);
+	}
+
+	return (rc);
+}
+
 static int
 sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS)
 {
@@ -8177,6 +8348,12 @@ t4_activate_uld(struct adapter *sc, int id)
 
 	SLIST_FOREACH(ui, &t4_uld_list, link) {
 		if (ui->uld_id == id) {
+			if (!(sc->flags & FULL_INIT_DONE)) {
+				rc = adapter_full_init(sc);
+				if (rc != 0)
+					goto done;
+			}
+
 			rc = ui->activate(sc);
 			if (rc == 0)
 				ui->refcount++;
diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c
index 89aef324006e..a0742d0c7d24 100644
--- a/sys/dev/cxgbe/t4_netmap.c
+++ b/sys/dev/cxgbe/t4_netmap.c
@@ -377,7 +377,7 @@ alloc_nm_txq_hwq(struct port_info *pi, struct sge_nm_txq *nm_txq)
 
 	nm_txq->pidx = nm_txq->cidx = 0;
 	MPASS(nm_txq->sidx == na->num_tx_desc);
-	nm_txq->equiqidx = nm_txq-> equeqidx = nm_txq->dbidx = 0;
+	nm_txq->equiqidx = nm_txq->equeqidx = nm_txq->dbidx = 0;
 
 	nm_txq->doorbells = sc->doorbells;
 	if (isset(&nm_txq->doorbells, DOORBELL_UDB) ||
diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c
index 1c25bafd3de4..4380c9ee92ac 100644
--- a/sys/dev/cxgbe/tom/t4_listen.c
+++ b/sys/dev/cxgbe/tom/t4_listen.c
@@ -1311,7 +1311,7 @@ do_pass_accept_req(struct sge_iq *iq, const struct rss_header *rss,
 		REJECT_PASS_ACCEPT();
 	rpl = wrtod(wr);
 
-	INP_INFO_WLOCK(&V_tcbinfo);	/* for 4-tuple check, syncache_add */
+	INP_INFO_WLOCK(&V_tcbinfo);	/* for 4-tuple check */
 
 	/* Don't offload if the 4-tuple is already in use */
 	if (toe_4tuple_check(&inc, &th, ifp) != 0) {
@@ -1319,6 +1319,7 @@ do_pass_accept_req(struct sge_iq *iq, const struct rss_header *rss,
 		free(wr, M_CXGBE);
 		REJECT_PASS_ACCEPT();
 	}
+	INP_INFO_WUNLOCK(&V_tcbinfo);
 
 	inp = lctx->inp;		/* listening socket, not owned by TOE */
 	INP_WLOCK(inp);
@@ -1331,7 +1332,6 @@ do_pass_accept_req(struct sge_iq *iq, const struct rss_header *rss,
 		 * resources tied to this listen context.
 		 */
 		INP_WUNLOCK(inp);
-		INP_INFO_WUNLOCK(&V_tcbinfo);
 		free(wr, M_CXGBE);
 		REJECT_PASS_ACCEPT();
 	}
@@ -1378,12 +1378,10 @@ do_pass_accept_req(struct sge_iq *iq, const struct rss_header *rss,
 
 	/*
 	 * If all goes well t4_syncache_respond will get called during
-	 * syncache_add.  Also note that syncache_add releases both pcbinfo and
-	 * pcb locks.
+	 * syncache_add.  Note that syncache_add releases the pcb lock.
 	 */
 	toe_syncache_add(&inc, &to, &th, inp, tod, synqe);
 	INP_UNLOCK_ASSERT(inp);	/* ok to assert, we have a ref on the inp */
-	INP_INFO_UNLOCK_ASSERT(&V_tcbinfo);
 
 	/*
 	 * If we replied during syncache_add (synqe->wr has been consumed),
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index e3ce9daf2745..9458a4444307 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2915,9 +2915,9 @@ dc_rxeof(struct dc_softc *sc)
 			    (rxstat & (DC_RXSTAT_CRCERR | DC_RXSTAT_DRIBBLE |
 				       DC_RXSTAT_MIIERE | DC_RXSTAT_COLLSEEN |
 				       DC_RXSTAT_RUNT   | DC_RXSTAT_DE))) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				if (rxstat & DC_RXSTAT_COLLSEEN)
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 				dc_discard_rxbuf(sc, i);
 				if (rxstat & DC_RXSTAT_CRCERR)
 					continue;
@@ -2943,7 +2943,7 @@ dc_rxeof(struct dc_softc *sc)
 		 */
 		if (dc_newbuf(sc, i) != 0) {
 			dc_discard_rxbuf(sc, i);
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			continue;
 		}
 		m->m_pkthdr.rcvif = ifp;
@@ -2956,14 +2956,14 @@ dc_rxeof(struct dc_softc *sc)
 				ETHER_ALIGN, ifp, NULL);
 			dc_discard_rxbuf(sc, i);
 			if (m0 == NULL) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 			m = m0;
 		}
 #endif
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		DC_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		DC_LOCK(sc);
@@ -3054,19 +3054,19 @@ dc_txeof(struct dc_softc *sc)
 		}
 
 		if (txstat & DC_TXSTAT_ERRSUM) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (txstat & DC_TXSTAT_EXCESSCOLL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (txstat & DC_TXSTAT_LATECOLL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (!(txstat & DC_TXSTAT_UNDERRUN)) {
 				ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 				dc_init_locked(sc);
 				return;
 			}
 		} else
-			ifp->if_opackets++;
-		ifp->if_collisions += (txstat & DC_TXSTAT_COLLCNT) >> 3;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & DC_TXSTAT_COLLCNT) >> 3);
 
 		bus_dmamap_sync(sc->dc_tx_mtag, sc->dc_cdata.dc_tx_map[idx],
 		    BUS_DMASYNC_POSTWRITE);
@@ -3261,7 +3261,7 @@ dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 
 		if (status & (DC_ISR_RX_WATDOGTIMEO | DC_ISR_RX_NOBUF)) {
 			uint32_t r = CSR_READ_4(sc, DC_FRAMESDISCARDED);
-			ifp->if_ierrors += (r & 0xffff) + ((r >> 17) & 0x7ff);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, (r & 0xffff) + ((r >> 17) & 0x7ff));
 
 			if (dc_rx_resync(sc))
 				dc_rxeof(sc);
@@ -3343,7 +3343,7 @@ dc_intr(void *arg)
 		if ((status & DC_ISR_RX_WATDOGTIMEO)
 		    || (status & DC_ISR_RX_NOBUF)) {
 			r = CSR_READ_4(sc, DC_FRAMESDISCARDED);
-			ifp->if_ierrors += (r & 0xffff) + ((r >> 17) & 0x7ff);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, (r & 0xffff) + ((r >> 17) & 0x7ff));
 			if (dc_rxeof(sc) == 0) {
 				while (dc_rx_resync(sc))
 					dc_rxeof(sc);
@@ -3941,7 +3941,7 @@ dc_watchdog(void *xsc)
 	}
 
 	ifp = sc->dc_ifp;
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	device_printf(sc->dc_dev, "watchdog timeout\n");
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 147b404fc9f2..6700fabd1efd 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -3439,7 +3439,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
 	} else {
 	    CTR1(KTR_TULIP, "tulip_rx_intr: bad packet; status %08x",
 		DESC_STATUS(eop));
-	    ifp->if_ierrors++;
+	    if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	    if (DESC_STATUS(eop) & (TULIP_DSTS_RxBADLENGTH|TULIP_DSTS_RxOVERFLOW|TULIP_DSTS_RxWATCHDOG)) {
 		sc->tulip_dot3stats.dot3StatsInternalMacReceiveErrors++;
 	    } else {
@@ -3479,7 +3479,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
 #if defined(TULIP_DEBUG)
 	cnt++;
 #endif
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	if (++eop == ri->ri_last)
 	    eop = ri->ri_first;
 	ri->ri_nextin = eop;
@@ -3501,7 +3501,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
 	     */
 	    m0 = m_devget(mtod(ms, caddr_t), total_len, ETHER_ALIGN, ifp, NULL);
 	    if (m0 == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto skip_input;
 	    }
 #else
@@ -3675,7 +3675,7 @@ tulip_tx_intr(tulip_softc_t * const sc)
 		    if (d_status & TULIP_DSTS_ERRSUM) {
 			CTR1(KTR_TULIP, "tulip_tx_intr: output error: %08x",
 			    d_status);
-			sc->tulip_ifp->if_oerrors++;
+			if_inc_counter(sc->tulip_ifp, IFCOUNTER_OERRORS, 1);
 			if (d_status & TULIP_DSTS_TxEXCCOLL)
 			    sc->tulip_dot3stats.dot3StatsExcessiveCollisions++;
 			if (d_status & TULIP_DSTS_TxLATECOLL)
@@ -3696,7 +3696,7 @@ tulip_tx_intr(tulip_softc_t * const sc)
 			CTR2(KTR_TULIP,
 		    "tulip_tx_intr: output ok, collisions %d, status %08x",
 			    collisions, d_status);
-			sc->tulip_ifp->if_collisions += collisions;
+			if_inc_counter(sc->tulip_ifp, IFCOUNTER_COLLISIONS, collisions);
 			if (collisions == 1)
 			    sc->tulip_dot3stats.dot3StatsSingleCollisionFrames++;
 			else if (collisions > 1)
@@ -3730,7 +3730,7 @@ tulip_tx_intr(tulip_softc_t * const sc)
 	sc->tulip_txtimer = 0;
     else if (xmits > 0)
 	sc->tulip_txtimer = TULIP_TXTIMER;
-    sc->tulip_ifp->if_opackets += xmits;
+    if_inc_counter(sc->tulip_ifp, IFCOUNTER_OPACKETS, xmits);
     TULIP_PERFEND(txintr);
     return descs;
 }
diff --git a/sys/dev/drm2/drm_gem_names.c b/sys/dev/drm2/drm_gem_names.c
index 084d50f04784..03ef2c807183 100644
--- a/sys/dev/drm2/drm_gem_names.c
+++ b/sys/dev/drm2/drm_gem_names.c
@@ -127,6 +127,24 @@ drm_gem_find_name(struct drm_gem_names *names, void *ptr)
 	return (arg.res);
 }
 
+void *
+drm_gem_find_ptr(struct drm_gem_names *names, uint32_t name)
+{
+	struct drm_gem_name *n;
+	void *res;
+
+	mtx_lock(&names->lock);
+	LIST_FOREACH(n, gem_name_hash_index(names, name), link) {
+		if (n->name == name) {
+			res = n->ptr;
+			mtx_unlock(&names->lock);
+			return (res);
+		}
+	}
+	mtx_unlock(&names->lock);
+	return (NULL);
+}
+
 int
 drm_gem_name_create(struct drm_gem_names *names, void *p, uint32_t *name)
 {
diff --git a/sys/dev/drm2/drm_gem_names.h b/sys/dev/drm2/drm_gem_names.h
index 0fe4edd99212..08f6fa470786 100644
--- a/sys/dev/drm2/drm_gem_names.h
+++ b/sys/dev/drm2/drm_gem_names.h
@@ -54,6 +54,7 @@ struct drm_gem_names {
 void drm_gem_names_init(struct drm_gem_names *names);
 void drm_gem_names_fini(struct drm_gem_names *names);
 uint32_t drm_gem_find_name(struct drm_gem_names *names, void *ptr);
+void *drm_gem_find_ptr(struct drm_gem_names *names, uint32_t name);
 void *drm_gem_name_ref(struct drm_gem_names *names, uint32_t name,
     void (*ref)(void *));
 int drm_gem_name_create(struct drm_gem_names *names, void *obj, uint32_t *name);
diff --git a/sys/dev/drm2/i915/i915_dma.c b/sys/dev/drm2/i915/i915_dma.c
index 24cd2cd18346..3fceaadb433d 100644
--- a/sys/dev/drm2/i915/i915_dma.c
+++ b/sys/dev/drm2/i915/i915_dma.c
@@ -1357,6 +1357,7 @@ i915_driver_unload_int(struct drm_device *dev, bool locked)
 			DRM_LOCK(dev);
 		i915_gem_free_all_phys_object(dev);
 		i915_gem_cleanup_ringbuffer(dev);
+		i915_gem_context_fini(dev);
 		if (!locked)
 			DRM_UNLOCK(dev);
 		i915_gem_cleanup_aliasing_ppgtt(dev);
@@ -1413,6 +1414,8 @@ i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
 	INIT_LIST_HEAD(&i915_file_priv->mm.request_list);
 	file_priv->driver_priv = i915_file_priv;
 
+	drm_gem_names_init(&i915_file_priv->context_idr);
+
 	return (0);
 }
 
@@ -1437,6 +1440,7 @@ i915_driver_lastclose(struct drm_device * dev)
 void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
 {
 
+	i915_gem_context_close(dev, file_priv);
 	i915_gem_release(dev, file_priv);
 }
 
@@ -1491,6 +1495,8 @@ struct drm_ioctl_desc i915_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_I915_OVERLAY_ATTRS, intel_overlay_attrs, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
 	DRM_IOCTL_DEF(DRM_I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
 	DRM_IOCTL_DEF(DRM_I915_GET_SPRITE_COLORKEY, intel_sprite_get_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+	DRM_IOCTL_DEF(DRM_I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_UNLOCKED),
+	DRM_IOCTL_DEF(DRM_I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_UNLOCKED),
 };
 
 #ifdef COMPAT_FREEBSD32
diff --git a/sys/dev/drm2/i915/i915_drm.h b/sys/dev/drm2/i915/i915_drm.h
index d4b0ae8386d9..cf5227f20be2 100644
--- a/sys/dev/drm2/i915/i915_drm.h
+++ b/sys/dev/drm2/i915/i915_drm.h
@@ -204,6 +204,8 @@ typedef struct drm_i915_sarea {
 #define DRM_I915_GEM_EXECBUFFER2	0x29
 #define DRM_I915_GET_SPRITE_COLORKEY 0x2a
 #define DRM_I915_SET_SPRITE_COLORKEY 0x2b
+#define DRM_I915_GEM_CONTEXT_CREATE	0x2d
+#define DRM_I915_GEM_CONTEXT_DESTROY	0x2e
 
 #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -248,6 +250,8 @@ typedef struct drm_i915_sarea {
 #define DRM_IOCTL_I915_OVERLAY_ATTRS	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
 #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
 #define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
+#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
 
 /* Asynchronous page flipping:
  */
@@ -702,7 +706,7 @@ struct drm_i915_gem_exec_object2 {
 
 #define EXEC_OBJECT_NEEDS_FENCE (1<<0)
 	uint64_t flags;
-	uint64_t rsvd1;
+	uint64_t rsvd1; /* now used for context info */
 	uint64_t rsvd2;
 };
 
@@ -746,6 +750,12 @@ struct drm_i915_gem_execbuffer2 {
 /** Resets the SO write offset registers for transform feedback on gen7. */
 #define I915_EXEC_GEN7_SOL_RESET	(1<<8)
 
+#define I915_EXEC_CONTEXT_ID_MASK	(0xffffffff)
+#define i915_execbuffer2_set_context_id(eb2, context) \
+	(eb2).rsvd1 = context & I915_EXEC_CONTEXT_ID_MASK
+#define i915_execbuffer2_get_context_id(eb2) \
+	((eb2).rsvd1 & I915_EXEC_CONTEXT_ID_MASK)
+
 struct drm_i915_gem_pin {
 	/** Handle of the buffer to be pinned. */
 	uint32_t handle;
@@ -968,4 +978,15 @@ struct drm_intel_sprite_colorkey {
 	uint32_t flags;
 };
 
+struct drm_i915_gem_context_create {
+	/*  output: id of new context*/
+	uint32_t ctx_id;
+	uint32_t pad;
+};
+
+struct drm_i915_gem_context_destroy {
+	uint32_t ctx_id;
+	uint32_t pad;
+};
+
 #endif				/* _I915_DRM_H_ */
diff --git a/sys/dev/drm2/i915/i915_drv.c b/sys/dev/drm2/i915/i915_drv.c
index 85ac10e0f97c..2380d237f0fa 100644
--- a/sys/dev/drm2/i915/i915_drv.c
+++ b/sys/dev/drm2/i915/i915_drv.c
@@ -612,7 +612,7 @@ __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
 }
 
 static int
-i8xx_do_reset(struct drm_device *dev, u8 flags)
+i8xx_do_reset(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int onems;
@@ -657,7 +657,7 @@ i965_reset_complete(struct drm_device *dev)
 }
 
 static int
-i965_do_reset(struct drm_device *dev, u8 flags)
+i965_do_reset(struct drm_device *dev)
 {
 	u8 gdrst;
 
@@ -667,28 +667,30 @@ i965_do_reset(struct drm_device *dev, u8 flags)
 	 * triggers the reset; when done, the hardware will clear it.
 	 */
 	gdrst = pci_read_config(dev->device, I965_GDRST, 1);
-	pci_write_config(dev->device, I965_GDRST, gdrst | flags | 0x1, 1);
+	pci_write_config(dev->device, I965_GDRST,
+	    gdrst | GRDOM_RENDER | GRDOM_RESET_ENABLE, 1);
 
 	return (_intel_wait_for(dev, i965_reset_complete(dev), 500, 1,
 	    "915rst"));
 }
 
 static int
-ironlake_do_reset(struct drm_device *dev, u8 flags)
+ironlake_do_reset(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv;
 	u32 gdrst;
 
 	dev_priv = dev->dev_private;
 	gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
-	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, gdrst | flags | 0x1);
+	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,
+	    gdrst | GRDOM_RENDER | GRDOM_RESET_ENABLE);
 	return (_intel_wait_for(dev,
 	    (I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & 0x1) != 0,
 	    500, 1, "915rst"));
 }
 
 static int
-gen6_do_reset(struct drm_device *dev, u8 flags)
+gen6_do_reset(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv;
 	int ret;
@@ -726,8 +728,43 @@ gen6_do_reset(struct drm_device *dev, u8 flags)
 	return (ret);
 }
 
+int intel_gpu_reset(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	int ret = -ENODEV;
+
+	switch (INTEL_INFO(dev)->gen) {
+	case 7:
+	case 6:
+		ret = gen6_do_reset(dev);
+		break;
+	case 5:
+		ret = ironlake_do_reset(dev);
+		break;
+	case 4:
+		ret = i965_do_reset(dev);
+		break;
+	case 2:
+		ret = i8xx_do_reset(dev);
+		break;
+	}
+
+	/* Also reset the gpu hangman. */
+	if (dev_priv->stop_rings) {
+		DRM_DEBUG("Simulated gpu hang, resetting stop_rings\n");
+		dev_priv->stop_rings = 0;
+		if (ret == -ENODEV) {
+			DRM_ERROR("Reset not implemented, but ignoring "
+				  "error for simulated gpu hangs\n");
+			ret = 0;
+		}
+	}
+
+	return ret;
+}
+
 int
-i915_reset(struct drm_device *dev, u8 flags)
+i915_reset(struct drm_device *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	/*
@@ -748,23 +785,9 @@ i915_reset(struct drm_device *dev, u8 flags)
 	ret = -ENODEV;
 	if (time_second - dev_priv->last_gpu_reset < 5) {
 		DRM_ERROR("GPU hanging too fast, declaring wedged!\n");
-	} else {
-		switch (INTEL_INFO(dev)->gen) {
-		case 7:
-		case 6:
-		ret = gen6_do_reset(dev, flags);
-		break;
-	case 5:
-		ret = ironlake_do_reset(dev, flags);
-			break;
-		case 4:
-			ret = i965_do_reset(dev, flags);
-			break;
-		case 2:
-			ret = i8xx_do_reset(dev, flags);
-			break;
-		}
-	}
+	} else
+		ret = intel_gpu_reset(dev);
+
 	dev_priv->last_gpu_reset = time_second;
 	if (ret) {
 		DRM_ERROR("Failed to reset chip.\n");
@@ -784,6 +807,7 @@ i915_reset(struct drm_device *dev, u8 flags)
 		if (HAS_BLT(dev))
 			dev_priv->rings[BCS].init(&dev_priv->rings[BCS]);
 
+		i915_gem_context_init(dev);
 		i915_gem_init_ppgtt(dev);
 
 		drm_irq_uninstall(dev);
diff --git a/sys/dev/drm2/i915/i915_drv.h b/sys/dev/drm2/i915/i915_drv.h
index c332f838804d..b84f4f39a74d 100644
--- a/sys/dev/drm2/i915/i915_drv.h
+++ b/sys/dev/drm2/i915/i915_drv.h
@@ -174,6 +174,17 @@ struct i915_hw_ppgtt {
 	vm_paddr_t scratch_page_dma_addr;
 };
 
+
+/* This must match up with the value previously used for execbuf2.rsvd1. */
+#define DEFAULT_CONTEXT_ID 0
+struct i915_hw_context {
+	uint32_t id;
+	bool is_initialized;
+	struct drm_i915_file_private *file_priv;
+	struct intel_ring_buffer *ring;
+	struct drm_i915_gem_object *obj;
+};
+
 enum no_fbc_reason {
 	FBC_NO_OUTPUT, /* no outputs enabled to compress */
 	FBC_STOLEN_TOO_SMALL, /* not enough space to hold compressed buffers */
@@ -700,6 +711,8 @@ typedef struct drm_i915_private {
 
 	enum no_fbc_reason no_fbc_reason;
 
+	unsigned int stop_rings;
+
 	unsigned long cfb_size;
 	unsigned int cfb_fb;
 	int cfb_plane;
@@ -723,8 +736,16 @@ typedef struct drm_i915_private {
 
 	struct drm_property *broadcast_rgb_property;
 	struct drm_property *force_audio_property;
+
+	bool hw_contexts_disabled;
+	uint32_t hw_context_size;
 } drm_i915_private_t;
 
+/* Iterate over initialised rings */
+#define for_each_ring(ring__, dev_priv__, i__) \
+	for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \
+		if (((ring__) = &(dev_priv__)->rings[(i__)]), intel_ring_initialized((ring__)))
+
 enum hdmi_force_audio {
 	HDMI_AUDIO_OFF_DVI = -2,	/* no aux data for HDMI-DVI converter */
 	HDMI_AUDIO_OFF,			/* force turn off HDMI audio */
@@ -832,6 +853,7 @@ struct drm_i915_gem_object {
 	unsigned int cache_level:2;
 
 	unsigned int has_aliasing_ppgtt_mapping:1;
+	unsigned int has_global_gtt_mapping:1;
 
 	vm_page_t *pages;
 
@@ -927,6 +949,7 @@ struct drm_i915_file_private {
 		struct list_head request_list;
 		struct mtx lck;
 	} mm;
+	struct drm_gem_names context_idr;
 };
 
 struct drm_i915_error_state {
@@ -1026,7 +1049,8 @@ extern int i915_enable_hangcheck;
 
 const struct intel_device_info *i915_get_device_id(int device);
 
-int i915_reset(struct drm_device *dev, u8 flags);
+extern int intel_gpu_reset(struct drm_device *dev);
+int i915_reset(struct drm_device *dev);
 
 /* i915_debug.c */
 int i915_sysctl_init(struct drm_device *dev, struct sysctl_ctx_list *ctx,
@@ -1205,6 +1229,17 @@ void i915_gem_release(struct drm_device *dev, struct drm_file *file);
 int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
     enum i915_cache_level cache_level);
 
+/* i915_gem_context.c */
+void i915_gem_context_init(struct drm_device *dev);
+void i915_gem_context_fini(struct drm_device *dev);
+void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);
+int i915_switch_context(struct intel_ring_buffer *ring,
+			struct drm_file *file, int to_id);
+int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
+				  struct drm_file *file);
+int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
+				   struct drm_file *file);
+
 void i915_gem_free_all_phys_object(struct drm_device *dev);
 void i915_gem_detach_phys_object(struct drm_device *dev,
     struct drm_i915_gem_object *obj);
@@ -1444,6 +1479,7 @@ __i915_write(64, 64)
 #define HAS_LLC(dev)            (INTEL_INFO(dev)->has_llc)
 #define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)
 
+#define HAS_HW_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 6)
 #define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >=6)
 
 #define HAS_OVERLAY(dev)		(INTEL_INFO(dev)->has_overlay)
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c
index 6d462071d7b9..45e770d30f3e 100644
--- a/sys/dev/drm2/i915/i915_gem.c
+++ b/sys/dev/drm2/i915/i915_gem.c
@@ -477,6 +477,7 @@ i915_gem_init_hw(struct drm_device *dev)
 	}
 
 	dev_priv->next_seqno = 1;
+	i915_gem_context_init(dev);
 	i915_gem_init_ppgtt(dev);
 	return (0);
 
@@ -2586,11 +2587,16 @@ int
 i915_gpu_idle(struct drm_device *dev, bool do_retire)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct intel_ring_buffer *ring;
 	int ret, i;
 
 	/* Flush everything onto the inactive list. */
-	for (i = 0; i < I915_NUM_RINGS; i++) {
-		ret = i915_ring_idle(&dev_priv->rings[i], do_retire);
+	for_each_ring(ring, dev_priv, i) {
+		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+		if (ret)
+			return ret;
+
+		ret = i915_ring_idle(ring, do_retire);
 		if (ret)
 			return ret;
 	}
diff --git a/sys/dev/drm2/i915/i915_gem_context.c b/sys/dev/drm2/i915/i915_gem_context.c
new file mode 100644
index 000000000000..07d7a66d09e2
--- /dev/null
+++ b/sys/dev/drm2/i915/i915_gem_context.c
@@ -0,0 +1,549 @@
+/*
+ * Copyright © 2011-2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ben Widawsky <ben@bwidawsk.net>
+ *
+ */
+
+/*
+ * This file implements HW context support. On gen5+ a HW context consists of an
+ * opaque GPU object which is referenced at times of context saves and restores.
+ * With RC6 enabled, the context is also referenced as the GPU enters and exists
+ * from RC6 (GPU has it's own internal power context, except on gen5). Though
+ * something like a context does exist for the media ring, the code only
+ * supports contexts for the render ring.
+ *
+ * In software, there is a distinction between contexts created by the user,
+ * and the default HW context. The default HW context is used by GPU clients
+ * that do not request setup of their own hardware context. The default
+ * context's state is never restored to help prevent programming errors. This
+ * would happen if a client ran and piggy-backed off another clients GPU state.
+ * The default context only exists to give the GPU some offset to load as the
+ * current to invoke a save of the context we actually care about. In fact, the
+ * code could likely be constructed, albeit in a more complicated fashion, to
+ * never use the default context, though that limits the driver's ability to
+ * swap out, and/or destroy other contexts.
+ *
+ * All other contexts are created as a request by the GPU client. These contexts
+ * store GPU state, and thus allow GPU clients to not re-emit state (and
+ * potentially query certain state) at any time. The kernel driver makes
+ * certain that the appropriate commands are inserted.
+ *
+ * The context life cycle is semi-complicated in that context BOs may live
+ * longer than the context itself because of the way the hardware, and object
+ * tracking works. Below is a very crude representation of the state machine
+ * describing the context life.
+ *                                         refcount     pincount     active
+ * S0: initial state                          0            0           0
+ * S1: context created                        1            0           0
+ * S2: context is currently running           2            1           X
+ * S3: GPU referenced, but not current        2            0           1
+ * S4: context is current, but destroyed      1            1           0
+ * S5: like S3, but destroyed                 1            0           1
+ *
+ * The most common (but not all) transitions:
+ * S0->S1: client creates a context
+ * S1->S2: client submits execbuf with context
+ * S2->S3: other clients submits execbuf with context
+ * S3->S1: context object was retired
+ * S3->S2: clients submits another execbuf
+ * S2->S4: context destroy called with current context
+ * S3->S5->S0: destroy path
+ * S4->S5->S0: destroy path on current context
+ *
+ * There are two confusing terms used above:
+ *  The "current context" means the context which is currently running on the
+ *  GPU. The GPU has loaded it's state already and has stored away the gtt
+ *  offset of the BO. The GPU is not actively referencing the data at this
+ *  offset, but it will on the next context switch. The only way to avoid this
+ *  is to do a GPU reset.
+ *
+ *  An "active context' is one which was previously the "current context" and is
+ *  on the active list waiting for the next context switch to occur. Until this
+ *  happens, the object must remain at the same gtt offset. It is therefore
+ *  possible to destroy a context, but it is still active.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <dev/drm2/drmP.h>
+#include <dev/drm2/i915/i915_drm.h>
+#include "i915_drv.h"
+
+/* This is a HW constraint. The value below is the largest known requirement
+ * I've seen in a spec to date, and that was a workaround for a non-shipping
+ * part. It should be safe to decrease this, but it's more future proof as is.
+ */
+#define CONTEXT_ALIGN (64<<10)
+
+static struct i915_hw_context *
+i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id);
+static int do_switch(struct i915_hw_context *to);
+
+static int get_context_size(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	int ret;
+	u32 reg;
+
+	switch (INTEL_INFO(dev)->gen) {
+	case 6:
+		reg = I915_READ(CXT_SIZE);
+		ret = GEN6_CXT_TOTAL_SIZE(reg) * 64;
+		break;
+	case 7:
+		reg = I915_READ(GEN7_CXT_SIZE);
+#ifdef FREEBSD_WIP
+		if (IS_HASWELL(dev))
+			ret = HSW_CXT_TOTAL_SIZE(reg) * 64;
+		else
+#endif
+			ret = GEN7_CXT_TOTAL_SIZE(reg) * 64;
+		break;
+	default:
+		panic("i915_gem_context: Unsupported Intel GPU generation %d",
+		    INTEL_INFO(dev)->gen);
+	}
+
+	return ret;
+}
+
+static void do_destroy(struct i915_hw_context *ctx)
+{
+#if defined(INVARIANTS)
+	struct drm_device *dev = ctx->obj->base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+#endif
+
+	if (ctx->file_priv)
+		drm_gem_names_remove(&ctx->file_priv->context_idr, ctx->id);
+	else
+		KASSERT(ctx == dev_priv->rings[RCS].default_context,
+		    ("i915_gem_context: ctx != default_context"));
+
+	drm_gem_object_unreference(&ctx->obj->base);
+	free(ctx, DRM_I915_GEM);
+}
+
+static int
+create_hw_context(struct drm_device *dev,
+		  struct drm_i915_file_private *file_priv,
+		  struct i915_hw_context **ret_ctx)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct i915_hw_context *ctx;
+	int ret, id;
+
+	ctx = malloc(sizeof(*ctx), DRM_I915_GEM, M_NOWAIT | M_ZERO);
+	if (ctx == NULL)
+		return (-ENOMEM);
+
+	ctx->obj = i915_gem_alloc_object(dev, dev_priv->hw_context_size);
+	if (ctx->obj == NULL) {
+		free(ctx, DRM_I915_GEM);
+		DRM_DEBUG_DRIVER("Context object allocated failed\n");
+		return (-ENOMEM);
+	}
+
+	if (INTEL_INFO(dev)->gen >= 7) {
+		ret = i915_gem_object_set_cache_level(ctx->obj,
+						      I915_CACHE_LLC_MLC);
+		if (ret)
+			goto err_out;
+	}
+
+	/* The ring associated with the context object is handled by the normal
+	 * object tracking code. We give an initial ring value simple to pass an
+	 * assertion in the context switch code.
+	 */
+	ctx->ring = &dev_priv->rings[RCS];
+
+	/* Default context will never have a file_priv */
+	if (file_priv == NULL) {
+		*ret_ctx = ctx;
+		return (0);
+	}
+
+	ctx->file_priv = file_priv;
+
+again:
+	id = 0;
+	ret = drm_gem_name_create(&file_priv->context_idr, ctx, &id);
+	if (ret == 0)
+		ctx->id = id;
+
+	if (ret == -EAGAIN)
+		goto again;
+	else if (ret)
+		goto err_out;
+
+	*ret_ctx = ctx;
+	return (0);
+
+err_out:
+	do_destroy(ctx);
+	return (ret);
+}
+
+static inline bool is_default_context(struct i915_hw_context *ctx)
+{
+	return (ctx == ctx->ring->default_context);
+}
+
+/**
+ * The default context needs to exist per ring that uses contexts. It stores the
+ * context state of the GPU for applications that don't utilize HW contexts, as
+ * well as an idle case.
+ */
+static int create_default_context(struct drm_i915_private *dev_priv)
+{
+	struct i915_hw_context *ctx;
+	int ret;
+
+	DRM_LOCK_ASSERT(dev_priv->dev);
+
+	ret = create_hw_context(dev_priv->dev, NULL, &ctx);
+	if (ret != 0)
+		return (ret);
+
+	/* We may need to do things with the shrinker which require us to
+	 * immediately switch back to the default context. This can cause a
+	 * problem as pinning the default context also requires GTT space which
+	 * may not be available. To avoid this we always pin the
+	 * default context.
+	 */
+	dev_priv->rings[RCS].default_context = ctx;
+	ret = i915_gem_object_pin(ctx->obj, CONTEXT_ALIGN, false);
+	if (ret)
+		goto err_destroy;
+
+	ret = do_switch(ctx);
+	if (ret)
+		goto err_unpin;
+
+	DRM_DEBUG_DRIVER("Default HW context loaded\n");
+	return 0;
+
+err_unpin:
+	i915_gem_object_unpin(ctx->obj);
+err_destroy:
+	do_destroy(ctx);
+	return ret;
+}
+
+void i915_gem_context_init(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	uint32_t ctx_size;
+
+	if (!HAS_HW_CONTEXTS(dev)) {
+		dev_priv->hw_contexts_disabled = true;
+		return;
+	}
+
+	/* If called from reset, or thaw... we've been here already */
+	if (dev_priv->hw_contexts_disabled ||
+	    dev_priv->rings[RCS].default_context)
+		return;
+
+	ctx_size = get_context_size(dev);
+	dev_priv->hw_context_size = get_context_size(dev);
+	dev_priv->hw_context_size = roundup(dev_priv->hw_context_size, 4096);
+
+	if (ctx_size <= 0 || ctx_size > (1<<20)) {
+		dev_priv->hw_contexts_disabled = true;
+		return;
+	}
+
+	if (create_default_context(dev_priv)) {
+		dev_priv->hw_contexts_disabled = true;
+		return;
+	}
+
+	DRM_DEBUG_DRIVER("HW context support initialized\n");
+}
+
+void i915_gem_context_fini(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	if (dev_priv->hw_contexts_disabled)
+		return;
+
+	/* The only known way to stop the gpu from accessing the hw context is
+	 * to reset it. Do this as the very last operation to avoid confusing
+	 * other code, leading to spurious errors. */
+	intel_gpu_reset(dev);
+
+	i915_gem_object_unpin(dev_priv->rings[RCS].default_context->obj);
+
+	do_destroy(dev_priv->rings[RCS].default_context);
+}
+
+static int context_idr_cleanup(uint32_t id, void *p, void *data)
+{
+	struct i915_hw_context *ctx = p;
+
+	KASSERT(id != DEFAULT_CONTEXT_ID, ("i915_gem_context: id == DEFAULT_CONTEXT_ID in cleanup"));
+
+	do_destroy(ctx);
+
+	return 0;
+}
+
+void i915_gem_context_close(struct drm_device *dev, struct drm_file *file)
+{
+	struct drm_i915_file_private *file_priv = file->driver_priv;
+
+	//DRM_LOCK(dev); /* Called from preclose(), the lock is already owned. */
+	drm_gem_names_foreach(&file_priv->context_idr, context_idr_cleanup, NULL);
+	drm_gem_names_fini(&file_priv->context_idr);
+	//DRM_UNLOCK(dev);
+}
+
+static struct i915_hw_context *
+i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)
+{
+	return (struct i915_hw_context *)drm_gem_find_ptr(&file_priv->context_idr, id);
+}
+
+static inline int
+mi_set_context(struct intel_ring_buffer *ring,
+	       struct i915_hw_context *new_context,
+	       u32 hw_flags)
+{
+	int ret;
+
+	/* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB
+	 * invalidation prior to MI_SET_CONTEXT. On GEN6 we don't set the value
+	 * explicitly, so we rely on the value at ring init, stored in
+	 * itlb_before_ctx_switch.
+	 */
+	if (IS_GEN6(ring->dev) && ring->itlb_before_ctx_switch) {
+		ret = ring->flush(ring, I915_GEM_GPU_DOMAINS, 0);
+		if (ret)
+			return ret;
+	}
+
+	ret = intel_ring_begin(ring, 6);
+	if (ret)
+		return ret;
+
+	if (IS_GEN7(ring->dev))
+		intel_ring_emit(ring, MI_ARB_ON_OFF | MI_ARB_DISABLE);
+	else
+		intel_ring_emit(ring, MI_NOOP);
+
+	intel_ring_emit(ring, MI_NOOP);
+	intel_ring_emit(ring, MI_SET_CONTEXT);
+	intel_ring_emit(ring, new_context->obj->gtt_offset |
+			MI_MM_SPACE_GTT |
+			MI_SAVE_EXT_STATE_EN |
+			MI_RESTORE_EXT_STATE_EN |
+			hw_flags);
+	/* w/a: MI_SET_CONTEXT must always be followed by MI_NOOP */
+	intel_ring_emit(ring, MI_NOOP);
+
+	if (IS_GEN7(ring->dev))
+		intel_ring_emit(ring, MI_ARB_ON_OFF | MI_ARB_ENABLE);
+	else
+		intel_ring_emit(ring, MI_NOOP);
+
+	intel_ring_advance(ring);
+
+	return ret;
+}
+
+static int do_switch(struct i915_hw_context *to)
+{
+	struct intel_ring_buffer *ring = to->ring;
+	struct drm_i915_gem_object *from_obj = ring->last_context_obj;
+	u32 hw_flags = 0;
+	int ret;
+
+	KASSERT(!(from_obj != NULL && from_obj->pin_count == 0),
+	    ("i915_gem_context: invalid \"from\" context"));
+
+	if (from_obj == to->obj)
+		return 0;
+
+	ret = i915_gem_object_pin(to->obj, CONTEXT_ALIGN, false);
+	if (ret)
+		return ret;
+
+	/* Clear this page out of any CPU caches for coherent swap-in/out. Note
+	 * that thanks to write = false in this call and us not setting any gpu
+	 * write domains when putting a context object onto the active list
+	 * (when switching away from it), this won't block.
+	 * XXX: We need a real interface to do this instead of trickery. */
+	ret = i915_gem_object_set_to_gtt_domain(to->obj, false);
+	if (ret) {
+		i915_gem_object_unpin(to->obj);
+		return ret;
+	}
+
+	if (!to->obj->has_global_gtt_mapping)
+		i915_gem_gtt_bind_object(to->obj);
+
+	if (!to->is_initialized || is_default_context(to))
+		hw_flags |= MI_RESTORE_INHIBIT;
+	else if (from_obj == to->obj) /* not yet expected */
+		hw_flags |= MI_FORCE_RESTORE;
+
+	ret = mi_set_context(ring, to, hw_flags);
+	if (ret) {
+		i915_gem_object_unpin(to->obj);
+		return ret;
+	}
+
+	/* The backing object for the context is done after switching to the
+	 * *next* context. Therefore we cannot retire the previous context until
+	 * the next context has already started running. In fact, the below code
+	 * is a bit suboptimal because the retiring can occur simply after the
+	 * MI_SET_CONTEXT instead of when the next seqno has completed.
+	 */
+	if (from_obj != NULL) {
+		from_obj->base.read_domains = I915_GEM_DOMAIN_INSTRUCTION;
+		i915_gem_object_move_to_active(from_obj, ring,
+		    i915_gem_next_request_seqno(ring));
+		/* As long as MI_SET_CONTEXT is serializing, ie. it flushes the
+		 * whole damn pipeline, we don't need to explicitly mark the
+		 * object dirty. The only exception is that the context must be
+		 * correct in case the object gets swapped out. Ideally we'd be
+		 * able to defer doing this until we know the object would be
+		 * swapped, but there is no way to do that yet.
+		 */
+		from_obj->dirty = 1;
+		KASSERT(from_obj->ring == ring, ("i915_gem_context: from_ring != ring"));
+		i915_gem_object_unpin(from_obj);
+
+		drm_gem_object_unreference(&from_obj->base);
+	}
+
+	drm_gem_object_reference(&to->obj->base);
+	ring->last_context_obj = to->obj;
+	to->is_initialized = true;
+
+	return 0;
+}
+
+/**
+ * i915_switch_context() - perform a GPU context switch.
+ * @ring: ring for which we'll execute the context switch
+ * @file_priv: file_priv associated with the context, may be NULL
+ * @id: context id number
+ * @seqno: sequence number by which the new context will be switched to
+ * @flags:
+ *
+ * The context life cycle is simple. The context refcount is incremented and
+ * decremented by 1 and create and destroy. If the context is in use by the GPU,
+ * it will have a refoucnt > 1. This allows us to destroy the context abstract
+ * object while letting the normal object tracking destroy the backing BO.
+ */
+int i915_switch_context(struct intel_ring_buffer *ring,
+			struct drm_file *file,
+			int to_id)
+{
+	struct drm_i915_private *dev_priv = ring->dev->dev_private;
+	struct i915_hw_context *to;
+
+	if (dev_priv->hw_contexts_disabled)
+		return 0;
+
+	if (ring != &dev_priv->rings[RCS])
+		return 0;
+
+	if (to_id == DEFAULT_CONTEXT_ID) {
+		to = ring->default_context;
+	} else {
+		if (file == NULL)
+			return -EINVAL;
+
+		to = i915_gem_context_get(file->driver_priv, to_id);
+		if (to == NULL)
+			return -ENOENT;
+	}
+
+	return do_switch(to);
+}
+
+int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
+				  struct drm_file *file)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_i915_gem_context_create *args = data;
+	struct drm_i915_file_private *file_priv = file->driver_priv;
+	struct i915_hw_context *ctx;
+	int ret;
+
+	if (!(dev->driver->driver_features & DRIVER_GEM))
+		return -ENODEV;
+
+	if (dev_priv->hw_contexts_disabled)
+		return -ENODEV;
+
+	ret = i915_mutex_lock_interruptible(dev);
+	if (ret)
+		return ret;
+
+	ret = create_hw_context(dev, file_priv, &ctx);
+	DRM_UNLOCK(dev);
+	if (ret != 0)
+		return (ret);
+
+	args->ctx_id = ctx->id;
+	DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id);
+
+	return 0;
+}
+
+int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
+				   struct drm_file *file)
+{
+	struct drm_i915_gem_context_destroy *args = data;
+	struct drm_i915_file_private *file_priv = file->driver_priv;
+	struct i915_hw_context *ctx;
+	int ret;
+
+	if (!(dev->driver->driver_features & DRIVER_GEM))
+		return -ENODEV;
+
+	ret = i915_mutex_lock_interruptible(dev);
+	if (ret)
+		return ret;
+
+	ctx = i915_gem_context_get(file_priv, args->ctx_id);
+	if (!ctx) {
+		DRM_UNLOCK(dev);
+		return -ENOENT;
+	}
+
+	do_destroy(ctx);
+
+	DRM_UNLOCK(dev);
+
+	DRM_DEBUG_DRIVER("HW context %d destroyed\n", args->ctx_id);
+	return 0;
+}
diff --git a/sys/dev/drm2/i915/i915_gem_execbuffer.c b/sys/dev/drm2/i915/i915_gem_execbuffer.c
index 21e331f1b9f1..e47141a29aa0 100644
--- a/sys/dev/drm2/i915/i915_gem_execbuffer.c
+++ b/sys/dev/drm2/i915/i915_gem_execbuffer.c
@@ -1130,6 +1130,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	struct drm_clip_rect *cliprects = NULL;
 	struct intel_ring_buffer *ring;
 	vm_page_t **relocs_ma;
+	u32 ctx_id = i915_execbuffer2_get_context_id(*args);
 	u32 exec_start, exec_len;
 	u32 seqno;
 	u32 mask;
@@ -1158,6 +1159,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 			return -EINVAL;
 		}
 		ring = &dev_priv->rings[VCS];
+		if (ctx_id != 0) {
+			DRM_DEBUG("Ring %s doesn't support contexts\n",
+				  ring->name);
+			return -EPERM;
+		}
 		break;
 	case I915_EXEC_BLT:
 		if (!HAS_BLT(dev)) {
@@ -1165,6 +1171,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 			return -EINVAL;
 		}
 		ring = &dev_priv->rings[BCS];
+		if (ctx_id != 0) {
+			DRM_DEBUG("Ring %s doesn't support contexts\n",
+				  ring->name);
+			return -EPERM;
+		}
 		break;
 	default:
 		DRM_DEBUG("execbuf with unknown ring: %d\n",
@@ -1306,6 +1317,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	if (ret)
 		goto err;
 
+	ret = i915_switch_context(ring, file, ctx_id);
+	if (ret)
+		goto err;
+
 	seqno = i915_gem_next_request_seqno(ring);
 	for (i = 0; i < I915_NUM_RINGS - 1; i++) {
 		if (seqno < ring->sync_seqno[i]) {
@@ -1461,6 +1476,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 	exec2.num_cliprects = args->num_cliprects;
 	exec2.cliprects_ptr = args->cliprects_ptr;
 	exec2.flags = I915_EXEC_RENDER;
+	i915_execbuffer2_set_context_id(exec2, 0);
 
 	ret = i915_gem_do_execbuffer(dev, data, file, &exec2, exec2_list);
 	if (!ret) {
diff --git a/sys/dev/drm2/i915/i915_gem_gtt.c b/sys/dev/drm2/i915/i915_gem_gtt.c
index a4ca76fce7ee..6204c06349cb 100644
--- a/sys/dev/drm2/i915/i915_gem_gtt.c
+++ b/sys/dev/drm2/i915/i915_gem_gtt.c
@@ -291,6 +291,9 @@ i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj)
 	agp_type = cache_level_to_agp_type(obj->base.dev, obj->cache_level);
 	intel_gtt_insert_pages(obj->gtt_space->start >> PAGE_SHIFT,
 	    obj->base.size >> PAGE_SHIFT, obj->pages, agp_type);
+
+	obj->has_global_gtt_mapping = 1;
+
 	return (0);
 }
 
@@ -308,6 +311,8 @@ i915_gem_gtt_rebind_object(struct drm_i915_gem_object *obj,
 
 	intel_gtt_insert_pages(obj->gtt_space->start >> PAGE_SHIFT,
 	    obj->base.size >> PAGE_SHIFT, obj->pages, agp_type);
+
+	obj->has_global_gtt_mapping = 0;
 }
 
 void
diff --git a/sys/dev/drm2/i915/i915_irq.c b/sys/dev/drm2/i915/i915_irq.c
index 16afb25ca6c7..15d0a613d101 100644
--- a/sys/dev/drm2/i915/i915_irq.c
+++ b/sys/dev/drm2/i915/i915_irq.c
@@ -717,7 +717,7 @@ i915_error_work_func(void *context, int pending)
 	if (atomic_load_acq_int(&dev_priv->mm.wedged)) {
 		DRM_DEBUG("i915: resetting chip\n");
 		/* kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event); */
-		if (!i915_reset(dev, GRDOM_RENDER)) {
+		if (!i915_reset(dev)) {
 			atomic_store_rel_int(&dev_priv->mm.wedged, 0);
 			/* kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_done_event); */
 		}
diff --git a/sys/dev/drm2/i915/i915_reg.h b/sys/dev/drm2/i915/i915_reg.h
index 754e535f78fc..492fac480429 100644
--- a/sys/dev/drm2/i915/i915_reg.h
+++ b/sys/dev/drm2/i915/i915_reg.h
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #define  GRDOM_FULL	(0<<2)
 #define  GRDOM_RENDER	(1<<2)
 #define  GRDOM_MEDIA	(3<<2)
+#define  GRDOM_RESET_ENABLE (1<<0)
 
 #define GEN6_MBCUNIT_SNPCR	0x900c /* for LLC config */
 #define   GEN6_MBC_SNPCR_SHIFT	21
@@ -200,6 +201,10 @@ __FBSDID("$FreeBSD$");
 #define MI_DISPLAY_FLIP		MI_INSTR(0x14, 2)
 #define MI_DISPLAY_FLIP_I915	MI_INSTR(0x14, 1)
 #define   MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
+#define MI_ARB_ON_OFF		MI_INSTR(0x08, 0)
+#define   MI_ARB_ENABLE			(1<<0)
+#define   MI_ARB_DISABLE		(0<<0)
+
 #define MI_SET_CONTEXT		MI_INSTR(0x18, 0)
 #define   MI_MM_SPACE_GTT		(1<<8)
 #define   MI_MM_SPACE_PHYSICAL		(0<<8)
@@ -1361,6 +1366,31 @@ __FBSDID("$FreeBSD$");
  */
 #define CCID			0x2180
 #define   CCID_EN		(1<<0)
+#define CXT_SIZE		0x21a0
+#define GEN6_CXT_POWER_SIZE(cxt_reg)	((cxt_reg >> 24) & 0x3f)
+#define GEN6_CXT_RING_SIZE(cxt_reg)	((cxt_reg >> 18) & 0x3f)
+#define GEN6_CXT_RENDER_SIZE(cxt_reg)	((cxt_reg >> 12) & 0x3f)
+#define GEN6_CXT_EXTENDED_SIZE(cxt_reg)	((cxt_reg >> 6) & 0x3f)
+#define GEN6_CXT_PIPELINE_SIZE(cxt_reg)	((cxt_reg >> 0) & 0x3f)
+#define GEN6_CXT_TOTAL_SIZE(cxt_reg)	(GEN6_CXT_POWER_SIZE(cxt_reg) + \
+					GEN6_CXT_RING_SIZE(cxt_reg) + \
+					GEN6_CXT_RENDER_SIZE(cxt_reg) + \
+					GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \
+					GEN6_CXT_PIPELINE_SIZE(cxt_reg))
+#define GEN7_CXT_SIZE		0x21a8
+#define GEN7_CXT_POWER_SIZE(ctx_reg)	((ctx_reg >> 25) & 0x7f)
+#define GEN7_CXT_RING_SIZE(ctx_reg)	((ctx_reg >> 22) & 0x7)
+#define GEN7_CXT_RENDER_SIZE(ctx_reg)	((ctx_reg >> 16) & 0x3f)
+#define GEN7_CXT_EXTENDED_SIZE(ctx_reg)	((ctx_reg >> 9) & 0x7f)
+#define GEN7_CXT_GT1_SIZE(ctx_reg)	((ctx_reg >> 6) & 0x7)
+#define GEN7_CXT_VFSTATE_SIZE(ctx_reg)	((ctx_reg >> 0) & 0x3f)
+#define GEN7_CXT_TOTAL_SIZE(ctx_reg)	(GEN7_CXT_POWER_SIZE(ctx_reg) + \
+					 GEN7_CXT_RING_SIZE(ctx_reg) + \
+					 GEN7_CXT_RENDER_SIZE(ctx_reg) + \
+					 GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \
+					 GEN7_CXT_GT1_SIZE(ctx_reg) + \
+					 GEN7_CXT_VFSTATE_SIZE(ctx_reg))
+
 /*
  * Overlay regs
  */
diff --git a/sys/dev/drm2/i915/intel_ringbuffer.c b/sys/dev/drm2/i915/intel_ringbuffer.c
index 7d6bd947b906..26bc6957c412 100644
--- a/sys/dev/drm2/i915/intel_ringbuffer.c
+++ b/sys/dev/drm2/i915/intel_ringbuffer.c
@@ -430,6 +430,13 @@ static int init_render_ring(struct intel_ring_buffer *ring)
 		 */
 		I915_WRITE(CACHE_MODE_0,
 			   CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);
+
+		/* This is not explicitly set for GEN6, so read the register.
+		 * see intel_ring_mi_set_context() for why we care.
+		 * TODO: consider explicitly setting the bit for GEN5
+		 */
+		ring->itlb_before_ctx_switch =
+			!!(I915_READ(GFX_MODE) & GFX_TLB_INVALIDATE_ALWAYS);
 	}
 
 	if (INTEL_INFO(dev)->gen >= 6) {
diff --git a/sys/dev/drm2/i915/intel_ringbuffer.h b/sys/dev/drm2/i915/intel_ringbuffer.h
index c20777fc9869..c391b12c9f9f 100644
--- a/sys/dev/drm2/i915/intel_ringbuffer.h
+++ b/sys/dev/drm2/i915/intel_ringbuffer.h
@@ -122,11 +122,24 @@ struct  intel_ring_buffer {
 	 */
 	uint32_t outstanding_lazy_request;
 
+	/**
+	 * Do an explicit TLB flush before MI_SET_CONTEXT
+	 */
+	bool itlb_before_ctx_switch;
+	struct i915_hw_context *default_context;
+	struct drm_i915_gem_object *last_context_obj;
+
 	drm_local_map_t map;
 
 	void *private;
 };
 
+static inline bool
+intel_ring_initialized(struct intel_ring_buffer *ring)
+{
+	return ring->obj != NULL;
+}
+
 static inline unsigned
 intel_ring_flag(struct intel_ring_buffer *ring)
 {
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
new file mode 100644
index 000000000000..aeb98e9fed65
--- /dev/null
+++ b/sys/dev/dwc/if_dwc.c
@@ -0,0 +1,1324 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+/*
+ * Ethernet media access controller (EMAC)
+ * Chapter 17, Altera Cyclone V Device Handbook (CV-5V2 2014.07.22)
+ *
+ * EMAC is an instance of the Synopsys DesignWare 3504-0
+ * Universal 10/100/1000 Ethernet MAC (DWC_gmac).
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/timeet.h>
+#include <sys/timetc.h>
+#include <sys/endian.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/mutex.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_var.h>
+#include <net/if_vlan_var.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include "miibus_if.h"
+
+#define	READ4(_sc, _reg) \
+	bus_read_4((_sc)->res[0], _reg)
+#define	WRITE4(_sc, _reg, _val) \
+	bus_write_4((_sc)->res[0], _reg, _val)
+
+#define	WATCHDOG_TIMEOUT_SECS	5
+#define	STATS_HARVEST_INTERVAL	2
+#define	MII_CLK_VAL		2
+
+#include <dev/dwc/if_dwc.h>
+
+#define	DWC_LOCK(sc)			mtx_lock(&(sc)->mtx)
+#define	DWC_UNLOCK(sc)			mtx_unlock(&(sc)->mtx)
+#define	DWC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED);
+#define	DWC_ASSERT_UNLOCKED(sc)		mtx_assert(&(sc)->mtx, MA_NOTOWNED);
+
+#define	DDESC_TDES0_OWN			(1 << 31)
+#define	DDESC_TDES0_TXINT		(1 << 30)
+#define	DDESC_TDES0_TXLAST		(1 << 29)
+#define	DDESC_TDES0_TXFIRST		(1 << 28)
+#define	DDESC_TDES0_TXCRCDIS		(1 << 27)
+#define	DDESC_TDES0_TXRINGEND		(1 << 21)
+#define	DDESC_TDES0_TXCHAIN		(1 << 20)
+
+#define	DDESC_RDES0_OWN			(1 << 31)
+#define	DDESC_RDES0_FL_MASK		0x3fff
+#define	DDESC_RDES0_FL_SHIFT		16	/* Frame Length */
+#define	DDESC_RDES1_CHAINED		(1 << 14)
+
+struct dwc_bufmap {
+	bus_dmamap_t	map;
+	struct mbuf	*mbuf;
+};
+
+/*
+ * A hardware buffer descriptor.  Rx and Tx buffers have the same descriptor
+ * layout, but the bits in the flags field have different meanings.
+ */
+struct dwc_hwdesc
+{
+	uint32_t tdes0;
+	uint32_t tdes1;
+	uint32_t addr;		/* pointer to buffer data */
+	uint32_t addr_next;	/* link to next descriptor */
+};
+
+/*
+ * Driver data and defines.
+ */
+#define	RX_DESC_COUNT	1024
+#define	RX_DESC_SIZE	(sizeof(struct dwc_hwdesc) * RX_DESC_COUNT)
+#define	TX_DESC_COUNT	1024
+#define	TX_DESC_SIZE	(sizeof(struct dwc_hwdesc) * TX_DESC_COUNT)
+
+/*
+ * The hardware imposes alignment restrictions on various objects involved in
+ * DMA transfers.  These values are expressed in bytes (not bits).
+ */
+#define	DWC_DESC_RING_ALIGN		2048
+
+struct dwc_softc {
+	struct resource		*res[2];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+	int			mii_clk;
+	device_t		miibus;
+	struct mii_data *	mii_softc;
+	struct ifnet		*ifp;
+	int			if_flags;
+	struct mtx		mtx;
+	void *			intr_cookie;
+	struct callout		dwc_callout;
+	uint8_t			phy_conn_type;
+	uint8_t			mactype;
+	boolean_t		link_is_up;
+	boolean_t		is_attached;
+	boolean_t		is_detaching;
+	int			tx_watchdog_count;
+	int			stats_harvest_count;
+
+	/* RX */
+	bus_dma_tag_t		rxdesc_tag;
+	bus_dmamap_t		rxdesc_map;
+	struct dwc_hwdesc	*rxdesc_ring;
+	bus_addr_t		rxdesc_ring_paddr;
+	bus_dma_tag_t		rxbuf_tag;
+	struct dwc_bufmap	rxbuf_map[RX_DESC_COUNT];
+	uint32_t		rx_idx;
+
+	/* TX */
+	bus_dma_tag_t		txdesc_tag;
+	bus_dmamap_t		txdesc_map;
+	struct dwc_hwdesc	*txdesc_ring;
+	bus_addr_t		txdesc_ring_paddr;
+	bus_dma_tag_t		txbuf_tag;
+	struct dwc_bufmap	txbuf_map[RX_DESC_COUNT];
+	uint32_t		tx_idx_head;
+	uint32_t		tx_idx_tail;
+	int			txcount;
+};
+
+static struct resource_spec dwc_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static void dwc_txfinish_locked(struct dwc_softc *sc);
+static void dwc_rxfinish_locked(struct dwc_softc *sc);
+static void dwc_stop_locked(struct dwc_softc *sc);
+static void dwc_setup_rxfilter(struct dwc_softc *sc);
+
+static inline uint32_t
+next_rxidx(struct dwc_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx + 1) % RX_DESC_COUNT);
+}
+
+static inline uint32_t
+next_txidx(struct dwc_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx + 1) % TX_DESC_COUNT);
+}
+
+static void
+dwc_get1paddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
+{
+
+	if (error != 0)
+		return;
+	*(bus_addr_t *)arg = segs[0].ds_addr;
+}
+
+inline static uint32_t
+dwc_setup_txdesc(struct dwc_softc *sc, int idx, bus_addr_t paddr,
+    uint32_t len)
+{
+	uint32_t flags;
+	uint32_t nidx;
+
+	nidx = next_txidx(sc, idx);
+
+	/* Addr/len 0 means we're clearing the descriptor after xmit done. */
+	if (paddr == 0 || len == 0) {
+		flags = 0;
+		--sc->txcount;
+	} else {
+		flags = DDESC_TDES0_TXCHAIN | DDESC_TDES0_TXFIRST
+		    | DDESC_TDES0_TXLAST | DDESC_TDES0_TXINT;
+		++sc->txcount;
+	}
+
+	sc->txdesc_ring[idx].addr = (uint32_t)(paddr);
+	sc->txdesc_ring[idx].tdes0 = flags;
+	sc->txdesc_ring[idx].tdes1 = len;
+
+	if (paddr && len) {
+		wmb();
+		sc->txdesc_ring[idx].tdes0 |= DDESC_TDES0_OWN;
+		wmb();
+	}
+
+	return (nidx);
+}
+
+static int
+dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp)
+{
+	struct bus_dma_segment seg;
+	int error, nsegs;
+	struct mbuf * m;
+
+	if ((m = m_defrag(*mp, M_NOWAIT)) == NULL)
+		return (ENOMEM);
+	*mp = m;
+
+	error = bus_dmamap_load_mbuf_sg(sc->txbuf_tag, sc->txbuf_map[idx].map,
+	    m, &seg, &nsegs, 0);
+	if (error != 0) {
+		return (ENOMEM);
+	}
+
+	KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs));
+
+	bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map,
+	    BUS_DMASYNC_PREWRITE);
+
+	sc->txbuf_map[idx].mbuf = m;
+
+	dwc_setup_txdesc(sc, idx, seg.ds_addr, seg.ds_len);
+
+	return (0);
+}
+
+static void
+dwc_txstart_locked(struct dwc_softc *sc)
+{
+	struct ifnet *ifp;
+	struct mbuf *m;
+	int enqueued;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	if (!sc->link_is_up)
+		return;
+
+	ifp = sc->ifp;
+
+	if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
+		return;
+	}
+
+	enqueued = 0;
+
+	for (;;) {
+		if (sc->txcount == (TX_DESC_COUNT-1)) {
+			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			break;
+		}
+
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
+		if (m == NULL)
+			break;
+		if (dwc_setup_txbuf(sc, sc->tx_idx_head, &m) != 0) {
+			IFQ_DRV_PREPEND(&ifp->if_snd, m);
+			break;
+		}
+		BPF_MTAP(ifp, m);
+		sc->tx_idx_head = next_txidx(sc, sc->tx_idx_head);
+		++enqueued;
+	}
+
+	if (enqueued != 0) {
+		WRITE4(sc, TRANSMIT_POLL_DEMAND, 0x1);
+		sc->tx_watchdog_count = WATCHDOG_TIMEOUT_SECS;
+	}
+}
+
+static void
+dwc_txstart(struct ifnet *ifp)
+{
+	struct dwc_softc *sc = ifp->if_softc;
+
+	DWC_LOCK(sc);
+	dwc_txstart_locked(sc);
+	DWC_UNLOCK(sc);
+}
+
+static void
+dwc_stop_locked(struct dwc_softc *sc)
+{
+	struct ifnet *ifp;
+	int reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	sc->tx_watchdog_count = 0;
+	sc->stats_harvest_count = 0;
+
+	callout_stop(&sc->dwc_callout);
+
+	/* Stop DMA TX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_ST);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/* Flush TX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_FTF);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/* Stop transmitters */
+	reg = READ4(sc, MAC_CONFIGURATION);
+	reg &= ~(CONF_TE | CONF_RE);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+
+	/* Stop DMA RX */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+}
+
+static void dwc_clear_stats(struct dwc_softc *sc)
+{
+	int reg;
+
+	reg = READ4(sc, MMC_CONTROL);
+	reg |= (MMC_CONTROL_CNTRST);
+	WRITE4(sc, MMC_CONTROL, reg);
+}
+
+static void
+dwc_harvest_stats(struct dwc_softc *sc)
+{
+	struct ifnet *ifp;
+
+	/* We don't need to harvest too often. */
+	if (++sc->stats_harvest_count < STATS_HARVEST_INTERVAL)
+		return;
+
+	sc->stats_harvest_count = 0;
+	ifp = sc->ifp;
+
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, READ4(sc, RXFRAMECOUNT_GB));
+	if_inc_counter(ifp, IFCOUNTER_IMCASTS, READ4(sc, RXMULTICASTFRAMES_G));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    READ4(sc, RXOVERSIZE_G) + READ4(sc, RXUNDERSIZE_G) +
+	    READ4(sc, RXCRCERROR) + READ4(sc, RXALIGNMENTERROR) +
+	    READ4(sc, RXRUNTERROR) + READ4(sc, RXJABBERERROR) +
+	    READ4(sc, RXLENGTHERROR));
+
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, READ4(sc, TXFRAMECOUNT_G));
+	if_inc_counter(ifp, IFCOUNTER_OMCASTS, READ4(sc, TXMULTICASTFRAMES_G));
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    READ4(sc, TXOVERSIZE_G) + READ4(sc, TXEXCESSDEF) +
+	    READ4(sc, TXCARRIERERR) + READ4(sc, TXUNDERFLOWERROR));
+
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    READ4(sc, TXEXESSCOL) + READ4(sc, TXLATECOL));
+
+	dwc_clear_stats(sc);
+}
+
+static void
+dwc_tick(void *arg)
+{
+	struct dwc_softc *sc;
+	struct ifnet *ifp;
+	int link_was_up;
+
+	sc = arg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+
+	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+	    return;
+
+	/*
+	 * Typical tx watchdog.  If this fires it indicates that we enqueued
+	 * packets for output and never got a txdone interrupt for them.  Maybe
+	 * it's a missed interrupt somehow, just pretend we got one.
+	 */
+	if (sc->tx_watchdog_count > 0) {
+		if (--sc->tx_watchdog_count == 0) {
+			dwc_txfinish_locked(sc);
+		}
+	}
+
+	/* Gather stats from hardware counters. */
+	dwc_harvest_stats(sc);
+
+	/* Check the media status. */
+	link_was_up = sc->link_is_up;
+	mii_tick(sc->mii_softc);
+	if (sc->link_is_up && !link_was_up)
+		dwc_txstart_locked(sc);
+
+	/* Schedule another check one second from now. */
+	callout_reset(&sc->dwc_callout, hz, dwc_tick, sc);
+}
+
+static void
+dwc_init_locked(struct dwc_softc *sc)
+{
+	struct ifnet *ifp = sc->ifp;
+	int reg;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		return;
+
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+
+	dwc_setup_rxfilter(sc);
+
+	/* Initializa DMA and enable transmitters */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_TSF | MODE_OSF | MODE_FUF);
+	reg &= ~(MODE_RSF);
+	reg |= (MODE_RTC_LEV32 << MODE_RTC_SHIFT);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	WRITE4(sc, INTERRUPT_ENABLE, INT_EN_DEFAULT);
+
+	/* Start DMA */
+	reg = READ4(sc, OPERATION_MODE);
+	reg |= (MODE_ST | MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	/* Enable transmitters */
+	reg = READ4(sc, MAC_CONFIGURATION);
+	reg |= (CONF_JD | CONF_ACS | CONF_BE);
+	reg |= (CONF_TE | CONF_RE);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+
+	/*
+	 * Call mii_mediachg() which will call back into dwc_miibus_statchg()
+	 * to set up the remaining config registers based on current media.
+	 */
+	mii_mediachg(sc->mii_softc);
+	callout_reset(&sc->dwc_callout, hz, dwc_tick, sc);
+}
+
+static void
+dwc_init(void *if_softc)
+{
+	struct dwc_softc *sc = if_softc;
+
+	DWC_LOCK(sc);
+	dwc_init_locked(sc);
+	DWC_UNLOCK(sc);
+}
+
+inline static uint32_t
+dwc_setup_rxdesc(struct dwc_softc *sc, int idx, bus_addr_t paddr)
+{
+	uint32_t nidx;
+
+	sc->rxdesc_ring[idx].addr = (uint32_t)paddr;
+	nidx = next_rxidx(sc, idx);
+	sc->rxdesc_ring[idx].addr_next = sc->rxdesc_ring_paddr +	\
+	    (nidx * sizeof(struct dwc_hwdesc));
+	sc->rxdesc_ring[idx].tdes1 = DDESC_RDES1_CHAINED | MCLBYTES;
+
+	wmb();
+	sc->rxdesc_ring[idx].tdes0 = DDESC_RDES0_OWN;
+	wmb();
+
+	return (nidx);
+}
+
+static int
+dwc_setup_rxbuf(struct dwc_softc *sc, int idx, struct mbuf *m)
+{
+	struct bus_dma_segment seg;
+	int error, nsegs;
+
+	m_adj(m, ETHER_ALIGN);
+
+	error = bus_dmamap_load_mbuf_sg(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+	    m, &seg, &nsegs, 0);
+	if (error != 0) {
+		return (error);
+	}
+
+	KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs));
+
+	bus_dmamap_sync(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+	    BUS_DMASYNC_PREREAD);
+
+	sc->rxbuf_map[idx].mbuf = m;
+	dwc_setup_rxdesc(sc, idx, seg.ds_addr);
+
+	return (0);
+}
+
+static struct mbuf *
+dwc_alloc_mbufcl(struct dwc_softc *sc)
+{
+	struct mbuf *m;
+
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	m->m_pkthdr.len = m->m_len = m->m_ext.ext_size;
+
+	return (m);
+}
+
+static void
+dwc_media_status(struct ifnet * ifp, struct ifmediareq *ifmr)
+{
+	struct dwc_softc *sc;
+	struct mii_data *mii;
+
+	sc = ifp->if_softc;
+	mii = sc->mii_softc;
+	DWC_LOCK(sc);
+	mii_pollstat(mii);
+	ifmr->ifm_active = mii->mii_media_active;
+	ifmr->ifm_status = mii->mii_media_status;
+	DWC_UNLOCK(sc);
+}
+
+static int
+dwc_media_change_locked(struct dwc_softc *sc)
+{
+
+	return (mii_mediachg(sc->mii_softc));
+}
+
+static int
+dwc_media_change(struct ifnet * ifp)
+{
+	struct dwc_softc *sc;
+	int error;
+
+	sc = ifp->if_softc;
+
+	DWC_LOCK(sc);
+	error = dwc_media_change_locked(sc);
+	DWC_UNLOCK(sc);
+	return (error);
+}
+
+static const uint8_t nibbletab[] = {
+	/* 0x0 0000 -> 0000 */  0x0,
+	/* 0x1 0001 -> 1000 */  0x8,
+	/* 0x2 0010 -> 0100 */  0x4,
+	/* 0x3 0011 -> 1100 */  0xc,
+	/* 0x4 0100 -> 0010 */  0x2,
+	/* 0x5 0101 -> 1010 */  0xa,
+	/* 0x6 0110 -> 0110 */  0x6,
+	/* 0x7 0111 -> 1110 */  0xe,
+	/* 0x8 1000 -> 0001 */  0x1,
+	/* 0x9 1001 -> 1001 */  0x9,
+	/* 0xa 1010 -> 0101 */  0x5,
+	/* 0xb 1011 -> 1101 */  0xd,
+	/* 0xc 1100 -> 0011 */  0x3,
+	/* 0xd 1101 -> 1011 */  0xb,
+	/* 0xe 1110 -> 0111 */  0x7,
+	/* 0xf 1111 -> 1111 */  0xf, };
+
+static uint8_t
+bitreverse(uint8_t x)
+{
+
+	return (nibbletab[x & 0xf] << 4) | nibbletab[x >> 4];
+}
+
+static void
+dwc_setup_rxfilter(struct dwc_softc *sc)
+{
+	struct ifmultiaddr *ifma;
+	struct ifnet *ifp;
+	uint8_t *eaddr;
+	uint32_t crc;
+	uint8_t val;
+	int hashbit;
+	int hashreg;
+	int ffval;
+	int reg;
+	int lo;
+	int hi;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+
+	/*
+	 * Set the multicast (group) filter hash.
+	 */
+	if ((ifp->if_flags & IFF_ALLMULTI))
+		ffval = (FRAME_FILTER_PM);
+	else {
+		ffval = (FRAME_FILTER_HMC);
+		if_maddr_rlock(ifp);
+		TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) {
+			if (ifma->ifma_addr->sa_family != AF_LINK)
+				continue;
+			crc = ether_crc32_le(LLADDR((struct sockaddr_dl *)
+				ifma->ifma_addr), ETHER_ADDR_LEN);
+
+			/* Take lower 8 bits and reverse it */
+			val = bitreverse(~crc & 0xff);
+			hashreg = (val >> 5);
+			hashbit = (val & 31);
+
+			reg = READ4(sc, HASH_TABLE_REG(hashreg));
+			reg |= (1 << hashbit);
+			WRITE4(sc, HASH_TABLE_REG(hashreg), reg);
+		}
+		if_maddr_runlock(ifp);
+	}
+
+	/*
+	 * Set the individual address filter hash.
+	 */
+	if (ifp->if_flags & IFF_PROMISC)
+		ffval |= (FRAME_FILTER_PR);
+
+	/*
+	 * Set the primary address.
+	 */
+	eaddr = IF_LLADDR(ifp);
+	lo = eaddr[0] | (eaddr[1] << 8) | (eaddr[2] << 16) |
+	    (eaddr[3] << 24);
+	hi = eaddr[4] | (eaddr[5] << 8);
+	WRITE4(sc, MAC_ADDRESS_LOW(0), lo);
+	WRITE4(sc, MAC_ADDRESS_HIGH(0), hi);
+	WRITE4(sc, MAC_FRAME_FILTER, ffval);
+}
+
+static int
+dwc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+{
+	struct dwc_softc *sc;
+	struct mii_data *mii;
+	struct ifreq *ifr;
+	int mask, error;
+
+	sc = ifp->if_softc;
+	ifr = (struct ifreq *)data;
+
+	error = 0;
+	switch (cmd) {
+	case SIOCSIFFLAGS:
+		DWC_LOCK(sc);
+		if (ifp->if_flags & IFF_UP) {
+			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+				if ((ifp->if_flags ^ sc->if_flags) &
+				    (IFF_PROMISC | IFF_ALLMULTI))
+					dwc_setup_rxfilter(sc);
+			} else {
+				if (!sc->is_detaching)
+					dwc_init_locked(sc);
+			}
+		} else {
+			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+				dwc_stop_locked(sc);
+		}
+		sc->if_flags = ifp->if_flags;
+		DWC_UNLOCK(sc);
+		break;
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			DWC_LOCK(sc);
+			dwc_setup_rxfilter(sc);
+			DWC_UNLOCK(sc);
+		}
+		break;
+	case SIOCSIFMEDIA:
+	case SIOCGIFMEDIA:
+		mii = sc->mii_softc;
+		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd);
+		break;
+	case SIOCSIFCAP:
+		mask = ifp->if_capenable ^ ifr->ifr_reqcap;
+		if (mask & IFCAP_VLAN_MTU) {
+			/* No work to do except acknowledge the change took */
+			ifp->if_capenable ^= IFCAP_VLAN_MTU;
+		}
+		break;
+
+	default:
+		error = ether_ioctl(ifp, cmd, data);
+		break;
+	}
+
+	return (error);
+}
+
+static void
+dwc_txfinish_locked(struct dwc_softc *sc)
+{
+	struct dwc_bufmap *bmap;
+	struct dwc_hwdesc *desc;
+	struct ifnet *ifp;
+
+	DWC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+
+	while (sc->tx_idx_tail != sc->tx_idx_head) {
+		desc = &sc->txdesc_ring[sc->tx_idx_tail];
+		if ((desc->tdes0 & DDESC_TDES0_OWN) != 0)
+			break;
+		bmap = &sc->txbuf_map[sc->tx_idx_tail];
+		bus_dmamap_sync(sc->txbuf_tag, bmap->map,
+		    BUS_DMASYNC_POSTWRITE);
+		bus_dmamap_unload(sc->txbuf_tag, bmap->map);
+		m_freem(bmap->mbuf);
+		bmap->mbuf = NULL;
+		dwc_setup_txdesc(sc, sc->tx_idx_tail, 0, 0);
+		sc->tx_idx_tail = next_txidx(sc, sc->tx_idx_tail);
+	}
+
+	/* If there are no buffers outstanding, muzzle the watchdog. */
+	if (sc->tx_idx_tail == sc->tx_idx_head) {
+		sc->tx_watchdog_count = 0;
+	}
+}
+
+static void
+dwc_rxfinish_locked(struct dwc_softc *sc)
+{
+	struct ifnet *ifp;
+	struct mbuf *m0;
+	struct mbuf *m;
+	int error;
+	int rdes0;
+	int idx;
+	int len;
+
+	ifp = sc->ifp;
+
+	for (;;) {
+		idx = sc->rx_idx;
+
+		rdes0 = sc->rxdesc_ring[idx].tdes0;
+		if ((rdes0 & DDESC_RDES0_OWN) != 0)
+			break;
+
+		bus_dmamap_sync(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+		    BUS_DMASYNC_POSTREAD);
+		bus_dmamap_unload(sc->rxbuf_tag, sc->rxbuf_map[idx].map);
+
+		len = (rdes0 >> DDESC_RDES0_FL_SHIFT) & DDESC_RDES0_FL_MASK;
+		if (len != 0) {
+			m = sc->rxbuf_map[idx].mbuf;
+			m->m_pkthdr.rcvif = ifp;
+			m->m_pkthdr.len = len;
+			m->m_len = len;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+
+			DWC_UNLOCK(sc);
+			(*ifp->if_input)(ifp, m);
+			DWC_LOCK(sc);
+		} else {
+			/* XXX Zero-length packet ? */
+		}
+
+		if ((m0 = dwc_alloc_mbufcl(sc)) != NULL) {
+			if ((error = dwc_setup_rxbuf(sc, idx, m0)) != 0) {
+				/*
+				 * XXX Now what?
+				 * We've got a hole in the rx ring.
+				 */
+			}
+		} else
+			if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1);
+
+		sc->rx_idx = next_rxidx(sc, sc->rx_idx);
+	}
+}
+
+static void
+dwc_intr(void *arg)
+{
+	struct dwc_softc *sc;
+	uint32_t reg;
+
+	sc = arg;
+
+	DWC_LOCK(sc);
+
+	reg = READ4(sc, INTERRUPT_STATUS);
+	if (reg) {
+		mii_mediachg(sc->mii_softc);
+		READ4(sc, SGMII_RGMII_SMII_CTRL_STATUS);
+	}
+
+	reg = READ4(sc, DMA_STATUS);
+	if (reg & DMA_STATUS_NIS) {
+		if (reg & DMA_STATUS_RI)
+			dwc_rxfinish_locked(sc);
+
+		if (reg & DMA_STATUS_TI)
+			dwc_txfinish_locked(sc);
+	}
+
+	if (reg & DMA_STATUS_AIS) {
+		if (reg & DMA_STATUS_FBI) {
+			/* Fatal bus error */
+			device_printf(sc->dev,
+			    "Ethernet DMA error, restarting controller.\n");
+			dwc_stop_locked(sc);
+			dwc_init_locked(sc);
+		}
+	}
+
+	WRITE4(sc, DMA_STATUS, reg & DMA_STATUS_INTR_MASK);
+	DWC_UNLOCK(sc);
+}
+
+static int
+setup_dma(struct dwc_softc *sc)
+{
+	struct mbuf *m;
+	int error;
+	int nidx;
+	int idx;
+
+	/*
+	 * Set up TX descriptor ring, descriptors, and dma maps.
+	 */
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    TX_DESC_SIZE, 1, 		/* maxsize, nsegments */
+	    TX_DESC_SIZE,		/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->txdesc_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create TX ring DMA tag.\n");
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->txdesc_tag, (void**)&sc->txdesc_ring,
+	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
+	    &sc->txdesc_map);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not allocate TX descriptor ring.\n");
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->txdesc_tag, sc->txdesc_map,
+	    sc->txdesc_ring, TX_DESC_SIZE, dwc_get1paddr,
+	    &sc->txdesc_ring_paddr, 0);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not load TX descriptor ring map.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < TX_DESC_COUNT; idx++) {
+		sc->txdesc_ring[idx].tdes0 = DDESC_TDES0_TXCHAIN;
+		sc->txdesc_ring[idx].tdes1 = 0;
+		nidx = next_txidx(sc, idx);
+		sc->txdesc_ring[idx].addr_next = sc->txdesc_ring_paddr + \
+		    (nidx * sizeof(struct dwc_hwdesc));
+	}
+
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    1, 0,			/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    MCLBYTES, 1, 		/* maxsize, nsegments */
+	    MCLBYTES,			/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->txbuf_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create TX ring DMA tag.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < TX_DESC_COUNT; idx++) {
+		error = bus_dmamap_create(sc->txbuf_tag, BUS_DMA_COHERENT,
+		    &sc->txbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create TX buffer DMA map.\n");
+			goto out;
+		}
+		dwc_setup_txdesc(sc, idx, 0, 0);
+	}
+
+	/*
+	 * Set up RX descriptor ring, descriptors, dma maps, and mbufs.
+	 */
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    DWC_DESC_RING_ALIGN, 0,	/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    RX_DESC_SIZE, 1, 		/* maxsize, nsegments */
+	    RX_DESC_SIZE,		/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->rxdesc_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create RX ring DMA tag.\n");
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->rxdesc_tag, (void **)&sc->rxdesc_ring,
+	    BUS_DMA_COHERENT | BUS_DMA_WAITOK | BUS_DMA_ZERO,
+	    &sc->rxdesc_map);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not allocate RX descriptor ring.\n");
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->rxdesc_tag, sc->rxdesc_map,
+	    sc->rxdesc_ring, RX_DESC_SIZE, dwc_get1paddr,
+	    &sc->rxdesc_ring_paddr, 0);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not load RX descriptor ring map.\n");
+		goto out;
+	}
+
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(sc->dev),	/* Parent tag. */
+	    1, 0,			/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    MCLBYTES, 1, 		/* maxsize, nsegments */
+	    MCLBYTES,			/* maxsegsize */
+	    0,				/* flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->rxbuf_tag);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not create RX buf DMA tag.\n");
+		goto out;
+	}
+
+	for (idx = 0; idx < RX_DESC_COUNT; idx++) {
+		error = bus_dmamap_create(sc->rxbuf_tag, BUS_DMA_COHERENT,
+		    &sc->rxbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create RX buffer DMA map.\n");
+			goto out;
+		}
+		if ((m = dwc_alloc_mbufcl(sc)) == NULL) {
+			device_printf(sc->dev, "Could not alloc mbuf\n");
+			error = ENOMEM;
+			goto out;
+		}
+		if ((error = dwc_setup_rxbuf(sc, idx, m)) != 0) {
+			device_printf(sc->dev,
+			    "could not create new RX buffer.\n");
+			goto out;
+		}
+	}
+
+out:
+	if (error != 0)
+		return (ENXIO);
+
+	return (0);
+}
+
+static int
+dwc_get_hwaddr(struct dwc_softc *sc, uint8_t *hwaddr)
+{
+	int rnd;
+	int lo;
+	int hi;
+
+	/*
+	 * Try to recover a MAC address from the running hardware. If there's
+	 * something non-zero there, assume the bootloader did the right thing
+	 * and just use it.
+	 *
+	 * Otherwise, set the address to a convenient locally assigned address,
+	 * 'bsd' + random 24 low-order bits.  'b' is 0x62, which has the locally
+	 * assigned bit set, and the broadcast/multicast bit clear.
+	 */
+	lo = READ4(sc, MAC_ADDRESS_LOW(0));
+	hi = READ4(sc, MAC_ADDRESS_HIGH(0)) & 0xffff;
+	if ((lo != 0xffffffff) || (hi != 0xffff)) {
+		hwaddr[0] = (lo >>  0) & 0xff;
+		hwaddr[1] = (lo >>  8) & 0xff;
+		hwaddr[2] = (lo >> 16) & 0xff;
+		hwaddr[3] = (lo >> 24) & 0xff;
+		hwaddr[4] = (hi >>  0) & 0xff;
+		hwaddr[5] = (hi >>  8) & 0xff;
+	} else {
+		rnd = arc4random() & 0x00ffffff;
+		hwaddr[0] = 'b';
+		hwaddr[1] = 's';
+		hwaddr[2] = 'd';
+		hwaddr[3] = rnd >> 16;
+		hwaddr[4] = rnd >>  8;
+		hwaddr[5] = rnd >>  0;
+	}
+
+	return (0);
+}
+
+static int
+dwc_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "snps,dwmac"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Gigabit Ethernet Controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+dwc_attach(device_t dev)
+{
+	uint8_t macaddr[ETHER_ADDR_LEN];
+	struct dwc_softc *sc;
+	struct ifnet *ifp;
+	int error;
+	int reg;
+	int i;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+	sc->mii_clk = MII_CLK_VAL;
+	sc->rx_idx = 0;
+
+	sc->txcount = TX_DESC_COUNT;
+
+	if (bus_alloc_resources(dev, dwc_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	mtx_init(&sc->mtx, device_get_nameunit(sc->dev),
+	    MTX_NETWORK_LOCK, MTX_DEF);
+
+	callout_init_mtx(&sc->dwc_callout, &sc->mtx, 0);
+
+	/* Setup interrupt handler. */
+	error = bus_setup_intr(dev, sc->res[1], INTR_TYPE_NET | INTR_MPSAFE,
+	    NULL, dwc_intr, sc, &sc->intr_cookie);
+	if (error != 0) {
+		device_printf(dev, "could not setup interrupt handler.\n");
+		return (ENXIO);
+	}
+
+	/* Read MAC before reset */
+	if (dwc_get_hwaddr(sc, macaddr)) {
+		device_printf(sc->dev, "can't get mac\n");
+		return (ENXIO);
+	}
+
+	/* Reset */
+	reg = READ4(sc, BUS_MODE);
+	reg |= (BUS_MODE_SWR);
+	WRITE4(sc, BUS_MODE, reg);
+
+	for (i = 0; i < 100; i++) {
+		if ((READ4(sc, BUS_MODE) & BUS_MODE_SWR) == 0)
+			break;
+		DELAY(10);
+	}
+	if (i == 0) {
+		device_printf(sc->dev, "Can't reset DWC.\n");
+		return (ENXIO);
+	}
+
+	reg = READ4(sc, BUS_MODE);
+	reg |= (BUS_MODE_EIGHTXPBL);
+	reg |= (BUS_MODE_PBL_BEATS_8 << BUS_MODE_PBL_SHIFT);
+	WRITE4(sc, BUS_MODE, reg);
+
+	/*
+	 * DMA must be stop while changing descriptor list addresses.
+	 */
+	reg = READ4(sc, OPERATION_MODE);
+	reg &= ~(MODE_ST | MODE_SR);
+	WRITE4(sc, OPERATION_MODE, reg);
+
+	if (setup_dma(sc))
+	        return (ENXIO);
+
+	/* Setup addresses */
+	WRITE4(sc, RX_DESCR_LIST_ADDR, sc->rxdesc_ring_paddr);
+	WRITE4(sc, TX_DESCR_LIST_ADDR, sc->txdesc_ring_paddr);
+
+	/* Set up the ethernet interface. */
+	sc->ifp = ifp = if_alloc(IFT_ETHER);
+
+	ifp->if_softc = sc;
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
+	ifp->if_capenable = ifp->if_capabilities;
+	ifp->if_start = dwc_txstart;
+	ifp->if_ioctl = dwc_ioctl;
+	ifp->if_init = dwc_init;
+	IFQ_SET_MAXLEN(&ifp->if_snd, TX_DESC_COUNT - 1);
+	ifp->if_snd.ifq_drv_maxlen = TX_DESC_COUNT - 1;
+	IFQ_SET_READY(&ifp->if_snd);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
+
+	/* Attach the mii driver. */
+	error = mii_attach(dev, &sc->miibus, ifp, dwc_media_change,
+	    dwc_media_status, BMSR_DEFCAPMASK, MII_PHY_ANY,
+	    MII_OFFSET_ANY, 0);
+
+	if (error != 0) {
+		device_printf(dev, "PHY attach failed\n");
+		return (ENXIO);
+	}
+	sc->mii_softc = device_get_softc(sc->miibus);
+
+	/* All ready to run, attach the ethernet interface. */
+	ether_ifattach(ifp, macaddr);
+	sc->is_attached = true;
+
+	return (0);
+}
+
+static int
+dwc_miibus_read_reg(device_t dev, int phy, int reg)
+{
+	struct dwc_softc *sc;
+	uint16_t mii;
+	size_t cnt;
+	int rv = 0;
+
+	sc = device_get_softc(dev);
+
+	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
+	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
+	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
+	    | GMII_ADDRESS_GB; /* Busy flag */
+
+	WRITE4(sc, GMII_ADDRESS, mii);
+
+	for (cnt = 0; cnt < 1000; cnt++) {
+		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
+			rv = READ4(sc, GMII_DATA);
+			break;
+		}
+		DELAY(10);
+	}
+
+	return rv;
+}
+
+static int
+dwc_miibus_write_reg(device_t dev, int phy, int reg, int val)
+{
+	struct dwc_softc *sc;
+	uint16_t mii;
+	size_t cnt;
+
+	sc = device_get_softc(dev);
+
+	mii = ((phy & GMII_ADDRESS_PA_MASK) << GMII_ADDRESS_PA_SHIFT)
+	    | ((reg & GMII_ADDRESS_GR_MASK) << GMII_ADDRESS_GR_SHIFT)
+	    | (sc->mii_clk << GMII_ADDRESS_CR_SHIFT)
+	    | GMII_ADDRESS_GB | GMII_ADDRESS_GW;
+
+	WRITE4(sc, GMII_DATA, val);
+	WRITE4(sc, GMII_ADDRESS, mii);
+
+	for (cnt = 0; cnt < 1000; cnt++) {
+		if (!(READ4(sc, GMII_ADDRESS) & GMII_ADDRESS_GB)) {
+			break;
+                }
+		DELAY(10);
+	}
+
+	return (0);
+}
+
+static void
+dwc_miibus_statchg(device_t dev)
+{
+	struct dwc_softc *sc;
+	struct mii_data *mii;
+	int reg;
+
+	/*
+	 * Called by the MII bus driver when the PHY establishes
+	 * link to set the MAC interface registers.
+	 */
+
+	sc = device_get_softc(dev);
+
+	DWC_ASSERT_LOCKED(sc);
+
+	mii = sc->mii_softc;
+
+	if (mii->mii_media_status & IFM_ACTIVE)
+		sc->link_is_up = true;
+	else
+		sc->link_is_up = false;
+
+	reg = READ4(sc, MAC_CONFIGURATION);
+	switch (IFM_SUBTYPE(mii->mii_media_active)) {
+	case IFM_1000_T:
+	case IFM_1000_SX:
+		reg &= ~(CONF_FES | CONF_PS);
+		break;
+	case IFM_100_TX:
+		reg |= (CONF_FES | CONF_PS);
+		break;
+	case IFM_10_T:
+		reg &= ~(CONF_FES);
+		reg |= (CONF_PS);
+		break;
+	case IFM_NONE:
+		sc->link_is_up = false;
+		return;
+	default:
+		sc->link_is_up = false;
+		device_printf(dev, "Unsupported media %u\n",
+		    IFM_SUBTYPE(mii->mii_media_active));
+		return;
+	}
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
+		reg |= (CONF_DM);
+	else
+		reg &= ~(CONF_DM);
+	WRITE4(sc, MAC_CONFIGURATION, reg);
+}
+
+static device_method_t dwc_methods[] = {
+	DEVMETHOD(device_probe,		dwc_probe),
+	DEVMETHOD(device_attach,	dwc_attach),
+
+	/* MII Interface */
+	DEVMETHOD(miibus_readreg,	dwc_miibus_read_reg),
+	DEVMETHOD(miibus_writereg,	dwc_miibus_write_reg),
+	DEVMETHOD(miibus_statchg,	dwc_miibus_statchg),
+
+	{ 0, 0 }
+};
+
+static driver_t dwc_driver = {
+	"dwc",
+	dwc_methods,
+	sizeof(struct dwc_softc),
+};
+
+static devclass_t dwc_devclass;
+
+DRIVER_MODULE(dwc, simplebus, dwc_driver, dwc_devclass, 0, 0);
+DRIVER_MODULE(miibus, dwc, miibus_driver, miibus_devclass, 0, 0);
+
+MODULE_DEPEND(dwc, ether, 1, 1, 1);
+MODULE_DEPEND(dwc, miibus, 1, 1, 1);
diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/if_dwc.h
new file mode 100644
index 000000000000..918ef0085edf
--- /dev/null
+++ b/sys/dev/dwc/if_dwc.h
@@ -0,0 +1,262 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Register names were taken almost as is from the documentation.
+ */
+
+#define	MAC_CONFIGURATION	0x0
+#define	 CONF_JD		(1 << 22)	/* jabber timer disable */
+#define	 CONF_BE		(1 << 21)	/* Frame Burst Enable */
+#define	 CONF_PS		(1 << 15)	/* GMII/MII */
+#define	 CONF_FES		(1 << 14)	/* MII speed select */
+#define	 CONF_DM		(1 << 11)	/* Full Duplex Enable */
+#define	 CONF_ACS		(1 << 7)
+#define	 CONF_TE		(1 << 3)
+#define	 CONF_RE		(1 << 2)
+#define	MAC_FRAME_FILTER	0x4
+#define	 FRAME_FILTER_RA	(1 << 31)	/* Receive All */
+#define	 FRAME_FILTER_HPF	(1 << 10)	/* Hash or Perfect Filter */
+#define	 FRAME_FILTER_PM	(1 << 4)	/* Pass multicast */
+#define	 FRAME_FILTER_HMC	(1 << 2)
+#define	 FRAME_FILTER_HUC	(1 << 1)
+#define	 FRAME_FILTER_PR	(1 << 0)	/* All Incoming Frames */
+#define	GMII_ADDRESS		0x10
+#define	 GMII_ADDRESS_PA_MASK	0x1f		/* Phy device */
+#define	 GMII_ADDRESS_PA_SHIFT	11
+#define	 GMII_ADDRESS_GR_MASK	0x1f		/* Phy register */
+#define	 GMII_ADDRESS_GR_SHIFT	6
+#define	 GMII_ADDRESS_CR_MASK	0xf
+#define	 GMII_ADDRESS_CR_SHIFT	2		/* Clock */
+#define	 GMII_ADDRESS_GW	(1 << 1)	/* Write operation */
+#define	 GMII_ADDRESS_GB	(1 << 0)	/* Busy */
+#define	GMII_DATA		0x14
+#define	FLOW_CONTROL		0x18
+#define	GMAC_VLAN_TAG		0x1C
+#define	VERSION			0x20
+#define	DEBUG			0x24
+#define	LPI_CONTROL_STATUS	0x30
+#define	LPI_TIMERS_CONTROL	0x34
+#define	INTERRUPT_STATUS	0x38
+#define	INTERRUPT_MASK		0x3C
+#define	MAC_ADDRESS_HIGH(n)	((n > 15 ? 0x800 : 0x40) + 0x8 * n)
+#define	MAC_ADDRESS_LOW(n)	((n > 15 ? 0x804 : 0x44) + 0x8 * n)
+
+#define	SGMII_RGMII_SMII_CTRL_STATUS	0xD8
+#define	MMC_CONTROL			0x100
+#define	 MMC_CONTROL_CNTRST		(1 << 0)
+#define	MMC_RECEIVE_INTERRUPT		0x104
+#define	MMC_TRANSMIT_INTERRUPT		0x108
+#define	MMC_RECEIVE_INTERRUPT_MASK	0x10C
+#define	MMC_TRANSMIT_INTERRUPT_MASK	0x110
+#define	TXOCTETCOUNT_GB			0x114
+#define	TXFRAMECOUNT_GB			0x118
+#define	TXBROADCASTFRAMES_G		0x11C
+#define	TXMULTICASTFRAMES_G		0x120
+#define	TX64OCTETS_GB			0x124
+#define	TX65TO127OCTETS_GB		0x128
+#define	TX128TO255OCTETS_GB		0x12C
+#define	TX256TO511OCTETS_GB		0x130
+#define	TX512TO1023OCTETS_GB		0x134
+#define	TX1024TOMAXOCTETS_GB		0x138
+#define	TXUNICASTFRAMES_GB		0x13C
+#define	TXMULTICASTFRAMES_GB		0x140
+#define	TXBROADCASTFRAMES_GB		0x144
+#define	TXUNDERFLOWERROR		0x148
+#define	TXSINGLECOL_G			0x14C
+#define	TXMULTICOL_G			0x150
+#define	TXDEFERRED			0x154
+#define	TXLATECOL			0x158
+#define	TXEXESSCOL			0x15C
+#define	TXCARRIERERR			0x160
+#define	TXOCTETCNT			0x164
+#define	TXFRAMECOUNT_G			0x168
+#define	TXEXCESSDEF			0x16C
+#define	TXPAUSEFRAMES			0x170
+#define	TXVLANFRAMES_G			0x174
+#define	TXOVERSIZE_G			0x178
+#define	RXFRAMECOUNT_GB			0x180
+#define	RXOCTETCOUNT_GB			0x184
+#define	RXOCTETCOUNT_G			0x188
+#define	RXBROADCASTFRAMES_G		0x18C
+#define	RXMULTICASTFRAMES_G		0x190
+#define	RXCRCERROR			0x194
+#define	RXALIGNMENTERROR		0x198
+#define	RXRUNTERROR			0x19C
+#define	RXJABBERERROR			0x1A0
+#define	RXUNDERSIZE_G			0x1A4
+#define	RXOVERSIZE_G			0x1A8
+#define	RX64OCTETS_GB			0x1AC
+#define	RX65TO127OCTETS_GB		0x1B0
+#define	RX128TO255OCTETS_GB		0x1B4
+#define	RX256TO511OCTETS_GB		0x1B8
+#define	RX512TO1023OCTETS_GB		0x1BC
+#define	RX1024TOMAXOCTETS_GB		0x1C0
+#define	RXUNICASTFRAMES_G		0x1C4
+#define	RXLENGTHERROR			0x1C8
+#define	RXOUTOFRANGETYPE		0x1CC
+#define	RXPAUSEFRAMES			0x1D0
+#define	RXFIFOOVERFLOW			0x1D4
+#define	RXVLANFRAMES_GB			0x1D8
+#define	RXWATCHDOGERROR			0x1DC
+#define	RXRCVERROR			0x1E0
+#define	RXCTRLFRAMES_G			0x1E4
+#define	MMC_IPC_RECEIVE_INT_MASK	0x200
+#define	MMC_IPC_RECEIVE_INT		0x208
+#define	RXIPV4_GD_FRMS			0x210
+#define	RXIPV4_HDRERR_FRMS		0x214
+#define	RXIPV4_NOPAY_FRMS		0x218
+#define	RXIPV4_FRAG_FRMS		0x21C
+#define	RXIPV4_UDSBL_FRMS		0x220
+#define	RXIPV6_GD_FRMS			0x224
+#define	RXIPV6_HDRERR_FRMS		0x228
+#define	RXIPV6_NOPAY_FRMS		0x22C
+#define	RXUDP_GD_FRMS			0x230
+#define	RXUDP_ERR_FRMS			0x234
+#define	RXTCP_GD_FRMS			0x238
+#define	RXTCP_ERR_FRMS			0x23C
+#define	RXICMP_GD_FRMS			0x240
+#define	RXICMP_ERR_FRMS			0x244
+#define	RXIPV4_GD_OCTETS		0x250
+#define	RXIPV4_HDRERR_OCTETS		0x254
+#define	RXIPV4_NOPAY_OCTETS		0x258
+#define	RXIPV4_FRAG_OCTETS		0x25C
+#define	RXIPV4_UDSBL_OCTETS		0x260
+#define	RXIPV6_GD_OCTETS		0x264
+#define	RXIPV6_HDRERR_OCTETS		0x268
+#define	RXIPV6_NOPAY_OCTETS		0x26C
+#define	RXUDP_GD_OCTETS			0x270
+#define	RXUDP_ERR_OCTETS		0x274
+#define	RXTCP_GD_OCTETS			0x278
+#define	RXTCPERROCTETS			0x27C
+#define	RXICMP_GD_OCTETS		0x280
+#define	RXICMP_ERR_OCTETS		0x284
+#define	L3_L4_CONTROL0			0x400
+#define	LAYER4_ADDRESS0			0x404
+#define	LAYER3_ADDR0_REG0		0x410
+#define	LAYER3_ADDR1_REG0		0x414
+#define	LAYER3_ADDR2_REG0		0x418
+#define	LAYER3_ADDR3_REG0		0x41C
+#define	L3_L4_CONTROL1			0x430
+#define	LAYER4_ADDRESS1			0x434
+#define	LAYER3_ADDR0_REG1		0x440
+#define	LAYER3_ADDR1_REG1		0x444
+#define	LAYER3_ADDR2_REG1		0x448
+#define	LAYER3_ADDR3_REG1		0x44C
+#define	L3_L4_CONTROL2			0x460
+#define	LAYER4_ADDRESS2			0x464
+#define	LAYER3_ADDR0_REG2		0x470
+#define	LAYER3_ADDR1_REG2		0x474
+#define	LAYER3_ADDR2_REG2		0x478
+#define	LAYER3_ADDR3_REG2		0x47C
+#define	L3_L4_CONTROL3			0x490
+#define	LAYER4_ADDRESS3			0x494
+#define	LAYER3_ADDR0_REG3		0x4A0
+#define	LAYER3_ADDR1_REG3		0x4A4
+#define	LAYER3_ADDR2_REG3		0x4A8
+#define	LAYER3_ADDR3_REG3		0x4AC
+#define	HASH_TABLE_REG(n)		0x500 + (0x4 * n)
+#define	VLAN_INCL_REG			0x584
+#define	VLAN_HASH_TABLE_REG		0x588
+#define	TIMESTAMP_CONTROL		0x700
+#define	SUB_SECOND_INCREMENT		0x704
+#define	SYSTEM_TIME_SECONDS		0x708
+#define	SYSTEM_TIME_NANOSECONDS		0x70C
+#define	SYSTEM_TIME_SECONDS_UPDATE	0x710
+#define	SYSTEM_TIME_NANOSECONDS_UPDATE	0x714
+#define	TIMESTAMP_ADDEND		0x718
+#define	TARGET_TIME_SECONDS		0x71C
+#define	TARGET_TIME_NANOSECONDS		0x720
+#define	SYSTEM_TIME_HIGHER_WORD_SECONDS	0x724
+#define	TIMESTAMP_STATUS		0x728
+#define	PPS_CONTROL			0x72C
+#define	AUXILIARY_TIMESTAMP_NANOSECONDS	0x730
+#define	AUXILIARY_TIMESTAMP_SECONDS	0x734
+#define	PPS0_INTERVAL			0x760
+#define	PPS0_WIDTH			0x764
+
+/* DMA */
+#define	BUS_MODE		0x1000
+#define	 BUS_MODE_EIGHTXPBL	(1 << 24) /* Multiplies PBL by 8 */
+#define	 BUS_MODE_PBL_SHIFT	8 /* Single block transfer size */
+#define	 BUS_MODE_PBL_BEATS_8	8
+#define	 BUS_MODE_SWR		(1 << 0) /* Reset */
+#define	TRANSMIT_POLL_DEMAND	0x1004
+#define	RECEIVE_POLL_DEMAND	0x1008
+#define	RX_DESCR_LIST_ADDR	0x100C
+#define	TX_DESCR_LIST_ADDR	0x1010
+#define	DMA_STATUS		0x1014
+#define	 DMA_STATUS_NIS		(1 << 16)
+#define	 DMA_STATUS_AIS		(1 << 15)
+#define	 DMA_STATUS_FBI		(1 << 13)
+#define	 DMA_STATUS_RI		(1 << 6)
+#define	 DMA_STATUS_TI		(1 << 0)
+#define	 DMA_STATUS_INTR_MASK	0x1ffff
+#define	OPERATION_MODE		0x1018
+#define	 MODE_RSF		(1 << 25) /* RX Full Frame */
+#define	 MODE_TSF		(1 << 21) /* TX Full Frame */
+#define	 MODE_FTF		(1 << 20) /* Flush TX FIFO */
+#define	 MODE_ST		(1 << 13) /* Start DMA TX */
+#define	 MODE_FUF		(1 << 6)  /* TX frames < 64bytes */
+#define	 MODE_RTC_LEV32		0x1
+#define	 MODE_RTC_SHIFT		3
+#define	 MODE_OSF		(1 << 2) /* Process Second frame */
+#define	 MODE_SR		(1 << 1) /* Start DMA RX */
+#define	INTERRUPT_ENABLE	0x101C
+#define	 INT_EN_NIE		(1 << 16) /* Normal/Summary */
+#define	 INT_EN_AIE		(1 << 15) /* Abnormal/Summary */
+#define	 INT_EN_ERE		(1 << 14) /* Early receive */
+#define	 INT_EN_FBE		(1 << 13) /* Fatal bus error */
+#define	 INT_EN_ETE		(1 << 10) /* Early transmit */
+#define	 INT_EN_RWE		(1 << 9)  /* Receive watchdog */
+#define	 INT_EN_RSE		(1 << 8)  /* Receive stopped */
+#define	 INT_EN_RUE		(1 << 7)  /* Recv buf unavailable */
+#define	 INT_EN_RIE		(1 << 6)  /* Receive interrupt */
+#define	 INT_EN_UNE		(1 << 5)  /* Tx underflow */
+#define	 INT_EN_OVE		(1 << 4)  /* Receive overflow */
+#define	 INT_EN_TJE		(1 << 3)  /* Transmit jabber */
+#define	 INT_EN_TUE		(1 << 2)  /* Tx. buf unavailable */
+#define	 INT_EN_TSE		(1 << 1)  /* Transmit stopped */
+#define	 INT_EN_TIE		(1 << 0)  /* Transmit interrupt */
+#define	 INT_EN_DEFAULT		(INT_EN_TIE|INT_EN_RIE|	\
+	    INT_EN_NIE|INT_EN_AIE|			\
+	    INT_EN_FBE|INT_EN_UNE)
+
+#define	MISSED_FRAMEBUF_OVERFLOW_CNTR	0x1020
+#define	RECEIVE_INT_WATCHDOG_TMR	0x1024
+#define	AXI_BUS_MODE			0x1028
+#define	AHB_OR_AXI_STATUS		0x102C
+#define	CURRENT_HOST_TRANSMIT_DESCR	0x1048
+#define	CURRENT_HOST_RECEIVE_DESCR	0x104C
+#define	CURRENT_HOST_TRANSMIT_BUF_ADDR	0x1050
+#define	CURRENT_HOST_RECEIVE_BUF_ADDR	0x1054
+#define	HW_FEATURE			0x1058
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 99ecbf359aa0..070bb5b2f3ea 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -215,6 +215,7 @@ static void	em_start(if_t);
 static void	em_start_locked(if_t, struct tx_ring *);
 #endif
 static int	em_ioctl(if_t, u_long, caddr_t);
+static uint64_t	em_get_counter(if_t, ift_counter);
 static void	em_init(void *);
 static void	em_init_locked(struct adapter *);
 static void	em_stop(void *);
@@ -306,7 +307,7 @@ static int	em_sysctl_eee(SYSCTL_HANDLER_ARGS);
 static __inline void em_rx_discard(struct rx_ring *, int);
 
 #ifdef DEVICE_POLLING
-static poll_handler_drv_t em_poll;
+static poll_handler_t em_poll;
 #endif /* POLLING */
 
 /*********************************************************************
@@ -786,7 +787,7 @@ em_detach(device_t dev)
 
 #ifdef DEVICE_POLLING
 	if (if_getcapenable(ifp) & IFCAP_POLLING)
-		ether_poll_deregister_drv(ifp);
+		ether_poll_deregister(ifp);
 #endif
 
 	if (adapter->led_dev != NULL)
@@ -934,9 +935,9 @@ em_mq_start_locked(if_t ifp, struct tx_ring *txr, struct mbuf *m)
 		}
 		drbr_advance(ifp, txr->br);
 		enq++;
-		if_incobytes(ifp,  next->m_pkthdr.len);
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, next->m_pkthdr.len);
 		if (next->m_flags & M_MCAST)
-			if_incomcasts(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		if_etherbpfmtap(ifp, next);
 		if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
                         break;
@@ -1207,7 +1208,7 @@ em_ioctl(if_t ifp, u_long command, caddr_t data)
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
-				error = ether_poll_register_drv(em_poll, ifp);
+				error = ether_poll_register(em_poll, ifp);
 				if (error)
 					return (error);
 				EM_CORE_LOCK(adapter);
@@ -1215,7 +1216,7 @@ em_ioctl(if_t ifp, u_long command, caddr_t data)
 				if_setcapenablebit(ifp, IFCAP_POLLING, 0);
 				EM_CORE_UNLOCK(adapter);
 			} else {
-				error = ether_poll_deregister_drv(ifp);
+				error = ether_poll_deregister(ifp);
 				/* Enable interrupt even in error case */
 				EM_CORE_LOCK(adapter);
 				em_enable_intr(adapter);
@@ -2940,6 +2941,7 @@ em_setup_interface(device_t dev, struct adapter *adapter)
 	if_setsoftc(ifp, adapter);
 	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	if_setioctlfn(ifp, em_ioctl);
+	if_setgetcounterfn(ifp, em_get_counter);
 #ifdef EM_MULTIQUEUE
 	/* Multiqueue stack interface */
 	if_settransmitfn(ifp, em_mq_start);
@@ -3850,7 +3852,7 @@ em_txeof(struct tx_ring *txr)
 	                tx_buffer = &txr->tx_buffers[first];
 			tx_desc = &txr->tx_base[first];
 		}
-		if_incopackets(ifp, 1);
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		/* See if we can continue to the next packet */
 		last = tx_buffer->next_eop;
 		if (last != -1) {
@@ -4450,7 +4452,7 @@ em_rxeof(struct rx_ring *rxr, int count, int *done)
 			--count;
 			sendmp = rxr->fmp;
 			if_setrcvif(sendmp, ifp);
-			if_incipackets(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			em_receive_checksum(cur, sendmp);
 #ifndef __NO_STRICT_ALIGNMENT
 			if (adapter->hw.mac.max_frame_size >
@@ -5107,7 +5109,6 @@ em_disable_aspm(struct adapter *adapter)
 static void
 em_update_stats_counters(struct adapter *adapter)
 {
-	if_t ifp;
 
 	if(adapter->hw.phy.media_type == e1000_media_type_copper ||
 	   (E1000_READ_REG(&adapter->hw, E1000_STATUS) & E1000_STATUS_LU)) {
@@ -5199,19 +5200,29 @@ em_update_stats_counters(struct adapter *adapter)
 		adapter->stats.tsctfc += 
 		E1000_READ_REG(&adapter->hw, E1000_TSCTFC);
 	}
-	ifp = adapter->ifp;
+}
 
-	if_setcollisions(ifp, adapter->stats.colc);
+static uint64_t
+em_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct adapter *adapter;
 
-	/* Rx Errors */
-	if_setierrors(ifp, adapter->dropped_pkts + adapter->stats.rxerrc +
-	    adapter->stats.crcerrs + adapter->stats.algnerrc +
-	    adapter->stats.ruc + adapter->stats.roc +
-	    adapter->stats.mpc + adapter->stats.cexterr);
+	adapter = if_getsoftc(ifp);
 
-	/* Tx Errors */
-	if_setoerrors(ifp, adapter->stats.ecol + adapter->stats.latecol +
-	    adapter->watchdog_events);
+	switch (cnt) {
+	case IFCOUNTER_COLLISIONS:
+		return (adapter->stats.colc);
+	case IFCOUNTER_IERRORS:
+		return (adapter->dropped_pkts + adapter->stats.rxerrc +
+		    adapter->stats.crcerrs + adapter->stats.algnerrc +
+		    adapter->stats.ruc + adapter->stats.roc +
+		    adapter->stats.mpc + adapter->stats.cexterr);
+	case IFCOUNTER_OERRORS:
+		return (adapter->stats.ecol + adapter->stats.latecol +
+		    adapter->watchdog_events);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 /* Export a single 32-bit register via a read-only sysctl. */
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index 5f0557833a3f..c8cb5d4ea8e2 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -204,6 +204,7 @@ static void	igb_start(struct ifnet *);
 static void	igb_start_locked(struct tx_ring *, struct ifnet *ifp);
 #endif
 static int	igb_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t	igb_get_counter(if_t, ift_counter);
 static void	igb_init(void *);
 static void	igb_init_locked(struct adapter *);
 static void	igb_stop(void *);
@@ -1045,9 +1046,9 @@ igb_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr)
 		}
 		drbr_advance(ifp, txr->br);
 		enq++;
-		ifp->if_obytes += next->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, next->m_pkthdr.len);
 		if (next->m_flags & M_MCAST)
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		ETHER_BPF_MTAP(ifp, next);
 		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
 			break;
@@ -3211,6 +3212,7 @@ igb_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = igb_ioctl;
+	ifp->if_get_counter = igb_get_counter;
 #ifndef IGB_LEGACY_TX
 	ifp->if_transmit = igb_mq_start;
 	ifp->if_qflush = igb_qflush;
@@ -4127,7 +4129,7 @@ igb_txeof(struct tx_ring *txr)
 		}
 		++txr->packets;
 		++processed;
-		++ifp->if_opackets;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		txr->watchdog_time = ticks;
 
 		/* Try the next packet */
@@ -4495,7 +4497,6 @@ igb_setup_receive_ring(struct rx_ring *rxr)
 
 	rxr->fmp = NULL;
 	rxr->lmp = NULL;
-	rxr->discard = FALSE;
 
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -4712,6 +4713,18 @@ igb_initialize_receive_units(struct adapter *adapter)
 		rctl |= E1000_RCTL_SZ_2048;
 	}
 
+	/*
+	 * If TX flow control is disabled and there's >1 queue defined,
+	 * enable DROP.
+	 *
+	 * This drops frames rather than hanging the RX MAC for all queues.
+	 */
+	if ((adapter->num_queues > 1) &&
+	    (adapter->fc == e1000_fc_none ||
+	     adapter->fc == e1000_fc_rx_pause)) {
+		srrctl |= E1000_SRRCTL_DROP_EN;
+	}
+
 	/* Setup the Base and Length of the Rx Descriptor Rings */
 	for (int i = 0; i < adapter->num_queues; i++, rxr++) {
 		u64 bus_addr = rxr->rxdma.dma_paddr;
@@ -5027,15 +5040,16 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 		pkt_info = le16toh(cur->wb.lower.lo_dword.hs_rss.pkt_info);
 		eop = ((staterr & E1000_RXD_STAT_EOP) == E1000_RXD_STAT_EOP);
 
-		/* Make sure all segments of a bad packet are discarded */
-		if (((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) != 0) ||
-		    (rxr->discard)) {
+		/*
+		 * Free the frame (all segments) if we're at EOP and
+		 * it's an error.
+		 *
+		 * The datasheet states that EOP + status is only valid for
+		 * the final segment in a multi-segment frame.
+		 */
+		if (eop && ((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) != 0)) {
 			adapter->dropped_pkts++;
 			++rxr->rx_discarded;
-			if (!eop) /* Catch subsequent segs */
-				rxr->discard = TRUE;
-			else
-				rxr->discard = FALSE;
 			igb_rx_discard(rxr, i);
 			goto next_desc;
 		}
@@ -5109,7 +5123,7 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 
 		if (eop) {
 			rxr->fmp->m_pkthdr.rcvif = ifp;
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			rxr->rx_packets++;
 			/* capture data for AIM */
 			rxr->packets++;
@@ -5536,6 +5550,30 @@ igb_led_func(void *arg, int onoff)
 	IGB_CORE_UNLOCK(adapter);
 }
 
+static uint64_t
+igb_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct adapter *adapter;
+	struct e1000_hw_stats *stats;
+
+	adapter = if_getsoftc(ifp);
+	stats = (struct e1000_hw_stats *)adapter->stats;
+
+	switch (cnt) {
+	case IFCOUNTER_IERRORS:
+		return (adapter->dropped_pkts + stats->rxerrc +
+		    stats->crcerrs + stats->algnerrc +
+		    stats->ruc + stats->roc + stats->mpc + stats->cexterr);
+	case IFCOUNTER_OERRORS:
+		return (stats->ecol + stats->latecol +
+		    adapter->watchdog_events);
+	case IFCOUNTER_COLLISIONS:
+		return (stats->colc);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
+
 /**********************************************************************
  *
  *  Update the board statistics counters.
@@ -5544,7 +5582,6 @@ igb_led_func(void *arg, int onoff)
 static void
 igb_update_stats_counters(struct adapter *adapter)
 {
-	struct ifnet		*ifp;
         struct e1000_hw		*hw = &adapter->hw;
 	struct e1000_hw_stats	*stats;
 
@@ -5662,18 +5699,6 @@ igb_update_stats_counters(struct adapter *adapter)
 	stats->tsctc += E1000_READ_REG(hw, E1000_TSCTC);
 	stats->tsctfc += E1000_READ_REG(hw, E1000_TSCTFC);
 
-	ifp = adapter->ifp;
-	ifp->if_collisions = stats->colc;
-
-	/* Rx Errors */
-	ifp->if_ierrors = adapter->dropped_pkts + stats->rxerrc +
-	    stats->crcerrs + stats->algnerrc +
-	    stats->ruc + stats->roc + stats->mpc + stats->cexterr;
-
-	/* Tx Errors */
-	ifp->if_oerrors = stats->ecol +
-	    stats->latecol + adapter->watchdog_events;
-
 	/* Driver specific counters */
 	adapter->device_control = E1000_READ_REG(hw, E1000_CTRL);
 	adapter->rx_control = E1000_READ_REG(hw, E1000_RCTL);
@@ -6255,6 +6280,7 @@ igb_set_flowcntl(SYSCTL_HANDLER_ARGS)
 
 	adapter->hw.fc.current_mode = adapter->hw.fc.requested_mode;
 	e1000_force_mac_fc(&adapter->hw);
+	/* XXX TODO: update DROP_EN on each RX queue if appropriate */
 	return (error);
 }
 
diff --git a/sys/dev/e1000/if_igb.h b/sys/dev/e1000/if_igb.h
index 0c4474126f70..f2d0926cab30 100644
--- a/sys/dev/e1000/if_igb.h
+++ b/sys/dev/e1000/if_igb.h
@@ -336,7 +336,6 @@ struct rx_ring {
 	struct lro_ctrl		lro;
 	bool			lro_enabled;
 	bool			hdr_split;
-	bool			discard;
 	struct mtx		rx_mtx;
 	char			mtx_name[16];
 	u32			next_to_refresh;
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index 8424870c7570..d29c7f1e8d66 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -180,6 +180,7 @@ static int	lem_resume(device_t);
 static void	lem_start(if_t);
 static void	lem_start_locked(if_t ifp);
 static int	lem_ioctl(if_t, u_long, caddr_t);
+static uint64_t	lem_get_counter(if_t, ift_counter);
 static void	lem_init(void *);
 static void	lem_init_locked(struct adapter *);
 static void	lem_stop(void *);
@@ -259,7 +260,7 @@ static void	lem_add_rx_process_limit(struct adapter *, const char *,
 		    const char *, int *, int);
 
 #ifdef DEVICE_POLLING
-static poll_handler_drv_t lem_poll;
+static poll_handler_t lem_poll;
 #endif /* POLLING */
 
 /*********************************************************************
@@ -788,7 +789,7 @@ lem_detach(device_t dev)
 
 #ifdef DEVICE_POLLING
 	if (if_getcapenable(ifp) & IFCAP_POLLING)
-		ether_poll_deregister_drv(ifp);
+		ether_poll_deregister(ifp);
 #endif
 
 	if (adapter->led_dev != NULL)
@@ -1118,7 +1119,7 @@ lem_ioctl(if_t ifp, u_long command, caddr_t data)
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
-				error = ether_poll_register_drv(lem_poll, ifp);
+				error = ether_poll_register(lem_poll, ifp);
 				if (error)
 					return (error);
 				EM_CORE_LOCK(adapter);
@@ -1126,7 +1127,7 @@ lem_ioctl(if_t ifp, u_long command, caddr_t data)
 				if_setcapenablebit(ifp, IFCAP_POLLING, 0);
 				EM_CORE_UNLOCK(adapter);
 			} else {
-				error = ether_poll_deregister_drv(ifp);
+				error = ether_poll_deregister(ifp);
 				/* Enable interrupt even in error case */
 				EM_CORE_LOCK(adapter);
 				lem_enable_intr(adapter);
@@ -2464,6 +2465,7 @@ lem_setup_interface(device_t dev, struct adapter *adapter)
 	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	if_setioctlfn(ifp, lem_ioctl);
 	if_setstartfn(ifp, lem_start);
+	if_setgetcounterfn(ifp, lem_get_counter);
 	if_setsendqlen(ifp, adapter->num_tx_desc - 1);
 	if_setsendqready(ifp);
 
@@ -3122,7 +3124,7 @@ lem_txeof(struct adapter *adapter)
                 	++num_avail;
 
 			if (tx_buffer->m_head) {
-				if_incopackets(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 				bus_dmamap_sync(adapter->txtag,
 				    tx_buffer->map,
 				    BUS_DMASYNC_POSTWRITE);
@@ -3681,7 +3683,7 @@ lem_rxeof(struct adapter *adapter, int count, int *done)
 
 		if (accept_frame) {
 			if (lem_get_buf(adapter, i) != 0) {
-				if_inciqdrops(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				goto discard;
 			}
 
@@ -3712,7 +3714,7 @@ lem_rxeof(struct adapter *adapter, int count, int *done)
 
 			if (eop) {
 				if_setrcvif(adapter->fmp, ifp);
-				if_incipackets(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 				lem_receive_checksum(adapter, current_desc,
 				    adapter->fmp);
 #ifndef __NO_STRICT_ALIGNMENT
@@ -4397,7 +4399,6 @@ lem_fill_descriptors (bus_addr_t address, u32 length,
 static void
 lem_update_stats_counters(struct adapter *adapter)
 {
-	if_t ifp;
 
 	if(adapter->hw.phy.media_type == e1000_media_type_copper ||
 	   (E1000_READ_REG(&adapter->hw, E1000_STATUS) & E1000_STATUS_LU)) {
@@ -4472,19 +4473,29 @@ lem_update_stats_counters(struct adapter *adapter)
 		adapter->stats.tsctfc += 
 		E1000_READ_REG(&adapter->hw, E1000_TSCTFC);
 	}
-	ifp = adapter->ifp;
+}
 
-	if_setcollisions(ifp, adapter->stats.colc);
+static uint64_t
+lem_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct adapter *adapter;
 
-	/* Rx Errors */
-	if_setierrors(ifp, adapter->dropped_pkts + adapter->stats.rxerrc +
-	    adapter->stats.crcerrs + adapter->stats.algnerrc +
-	    adapter->stats.ruc + adapter->stats.roc +
-	    adapter->stats.mpc + adapter->stats.cexterr);
+	adapter = if_getsoftc(ifp);
 
-	/* Tx Errors */
-	if_setoerrors(ifp, adapter->stats.ecol + adapter->stats.latecol +
-	    adapter->watchdog_events);
+	switch (cnt) {
+	case IFCOUNTER_COLLISIONS:
+		return (adapter->stats.colc);
+	case IFCOUNTER_IERRORS:
+		return (adapter->dropped_pkts + adapter->stats.rxerrc +
+		    adapter->stats.crcerrs + adapter->stats.algnerrc +
+		    adapter->stats.ruc + adapter->stats.roc +
+		    adapter->stats.mpc + adapter->stats.cexterr);
+	case IFCOUNTER_OERRORS:
+		return (adapter->stats.ecol + adapter->stats.latecol +
+		    adapter->watchdog_events);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 /* Export a single 32-bit register via a read-only sysctl. */
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index eec895488843..46524dd9d6b8 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -485,7 +485,7 @@ ed_watchdog(struct ed_softc *sc)
 
 	ifp = sc->ifp;
 	log(LOG_ERR, "%s: device timeout\n", ifp->if_xname);
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	ed_reset(ifp);
 }
@@ -900,7 +900,7 @@ ed_rint(struct ed_softc *sc)
 			 */
 			ed_get_packet(sc, packet_ptr + sizeof(struct ed_ring),
 				      len - sizeof(struct ed_ring));
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		} else {
 			/*
 			 * Really BAD. The ring pointers are corrupted.
@@ -908,7 +908,7 @@ ed_rint(struct ed_softc *sc)
 			log(LOG_ERR,
 			    "%s: NIC memory corrupt - invalid packet length %d\n",
 			    ifp->if_xname, len);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			ed_reset(ifp);
 			return;
 		}
@@ -1055,14 +1055,14 @@ edintr(void *arg)
 				/*
 				 * update output errors counter
 				 */
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else {
 
 				/*
 				 * Update total number of successfully
 				 * transmitted packets.
 				 */
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			}
 
 			/*
@@ -1080,7 +1080,7 @@ edintr(void *arg)
 			 * Add in total number of collisions on last
 			 * transmission.
 			 */
-			ifp->if_collisions += collisions;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, collisions);
 			switch(collisions) {
 			case 0:
 			case 16:
@@ -1123,7 +1123,7 @@ edintr(void *arg)
 			 * fixed in later revs. -DG
 			 */
 			if (isr & ED_ISR_OVW) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #ifdef DIAGNOSTIC
 				log(LOG_WARNING,
 				    "%s: warning - receiver ring buffer overrun\n",
@@ -1150,7 +1150,7 @@ edintr(void *arg)
 						sc->mibdata.dot3StatsAlignmentErrors++;
 					if (rsr & ED_RSR_FO)
 						sc->mibdata.dot3StatsInternalMacReceiveErrors++;
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #ifdef ED_DEBUG
 					if_printf(ifp, "receive error %x\n",
 					       ed_nic_inb(sc, ED_P0_RSR));
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index a2aed43e0a1f..3175d61477dd 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -774,7 +774,7 @@ en_txdma(struct en_softc *sc, struct en_txslot *slot)
 	}
 
 	EN_COUNT(sc->stats.launch);
-	sc->ifp->if_opackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 
 	sc->vccs[tx.vci]->opackets++;
 	sc->vccs[tx.vci]->obytes += tx.datalen;
@@ -1851,7 +1851,7 @@ en_rx_drain(struct en_softc *sc, u_int drq)
 		    EN_DQ_LEN(drq), vc->rxhand));
 
 		m->m_pkthdr.rcvif = sc->ifp;
-		sc->ifp->if_ipackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 
 		vc->ipackets++;
 		vc->ibytes += m->m_pkthdr.len;
@@ -2249,13 +2249,13 @@ en_service(struct en_softc *sc)
 			device_printf(sc->dev, "invalid AAL5 length\n");
 			rx.post_skip = MID_RBD_CNT(rbd) * MID_ATMDATASZ;
 			mlen = 0;
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 
 		} else if (rbd & MID_RBD_CRCERR) {
 			device_printf(sc->dev, "CRC error\n");
 			rx.post_skip = MID_RBD_CNT(rbd) * MID_ATMDATASZ;
 			mlen = 0;
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 
 		} else {
 			mlen = MID_PDU_LEN(pdu);
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 74c6a865b0ab..cd7afb530a46 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -512,7 +512,7 @@ epstart_locked(struct ifnet *ifp)
 	 */
 	if (len + pad > ETHER_MAX_LEN) {
 		/* packet is obviously too large: toss it */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m0);
 		goto readcheck;
 	}
@@ -564,7 +564,7 @@ epstart_locked(struct ifnet *ifp)
 	BPF_MTAP(ifp, m0);
 
 	sc->tx_timer = 2;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	m_freem(m0);
 
 	/*
@@ -640,7 +640,8 @@ ep_intr_locked(struct ep_softc *sc)
 			    CSR_READ_2(sc, EP_W4_FIFO_DIAG));
 			printf("\tStat: %x\n", sc->stat);
 			printf("\tIpackets=%d, Opackets=%d\n",
-			    ifp->if_ipackets, ifp->if_opackets);
+			    ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS),
+			    ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS));
 			printf("\tNOF=%d, NOMB=%d, RXOF=%d, RXOL=%d, TXU=%d\n",
 			    sc->rx_no_first, sc->rx_no_mbuf, sc->rx_overrunf,
 			    sc->rx_overrunl, sc->tx_underrun);
@@ -650,7 +651,7 @@ ep_intr_locked(struct ep_softc *sc)
 			device_printf(sc->dev,
 			    "Status: %x (input buffer overflow)\n", status);
 #else
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #endif
 
 #endif
@@ -683,9 +684,9 @@ ep_intr_locked(struct ep_softc *sc)
 						 * TXS_MAX_COLLISION we
 						 * shouldn't get here
 						 */
-						++ifp->if_collisions;
+						if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 					}
-					++ifp->if_oerrors;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE);
 					/*
 				         * To have a tx_avail_int but giving
@@ -731,7 +732,7 @@ epread(struct ep_softc *sc)
 read_again:
 
 	if (status & ERR_RX) {
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		if (status & ERR_RX_OVERRUN) {
 			/*
 		         * We can think the rx latency is actually
@@ -829,7 +830,7 @@ epread(struct ep_softc *sc)
 		return;
 	}
 	CSR_WRITE_2(sc, EP_COMMAND, RX_DISCARD_TOP_PACK);
-	++ifp->if_ipackets;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	EP_FSET(sc, F_RX_FIRST);
 	top->m_pkthdr.rcvif = sc->ifp;
 	top->m_pkthdr.len = sc->cur_len;
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
index cd714b08ea77..97fbdcf19495 100644
--- a/sys/dev/et/if_et.c
+++ b/sys/dev/et/if_et.c
@@ -104,6 +104,7 @@ static int	et_watchdog(struct et_softc *);
 static int	et_ifmedia_upd_locked(struct ifnet *);
 static int	et_ifmedia_upd(struct ifnet *);
 static void	et_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static uint64_t	et_get_counter(struct ifnet *, ift_counter);
 
 static void	et_add_sysctls(struct et_softc *);
 static int	et_sysctl_rx_intr_npkts(SYSCTL_HANDLER_ARGS);
@@ -324,6 +325,7 @@ et_attach(device_t dev)
 	ifp->if_init = et_init;
 	ifp->if_ioctl = et_ioctl;
 	ifp->if_start = et_start;
+	ifp->if_get_counter = et_get_counter;
 	ifp->if_capabilities = IFCAP_TXCSUM | IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 	ifp->if_snd.ifq_drv_maxlen = ET_TX_NDESC - 1;
@@ -1413,7 +1415,7 @@ et_start_locked(struct ifnet *ifp)
 
 		if (et_encap(sc, &m_head)) {
 			if (m_head == NULL) {
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				break;
 			}
 			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
@@ -1465,7 +1467,7 @@ et_watchdog(struct et_softc *sc)
 	if_printf(sc->ifp, "watchdog timed out (0x%08x) -- resetting\n",
 	    status);
 
-	sc->ifp->if_oerrors++;
+	if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 	sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	et_init_locked(sc);
 	return (EJUSTRETURN);
@@ -2093,12 +2095,12 @@ et_rxeof(struct et_softc *sc)
 		CSR_WRITE_4(sc, ET_RXSTAT_POS, rxstat_pos);
 
 		if (ring_idx >= ET_RX_NRING) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			if_printf(ifp, "invalid ring index %d\n", ring_idx);
 			continue;
 		}
 		if (buf_idx >= ET_RX_NDESC) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			if_printf(ifp, "invalid buf index %d\n", buf_idx);
 			continue;
 		}
@@ -2110,13 +2112,13 @@ et_rxeof(struct et_softc *sc)
 			rbd->rbd_discard(rbd, buf_idx);
 		} else if (rbd->rbd_newbuf(rbd, buf_idx) != 0) {
 			/* No available mbufs, discard it. */
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			rbd->rbd_discard(rbd, buf_idx);
 		} else {
 			buflen -= ETHER_CRC_LEN;
 			if (buflen < ETHER_HDR_LEN) {
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			} else {
 				m->m_pkthdr.len = m->m_len = buflen;
 				m->m_pkthdr.rcvif = ifp;
@@ -2625,7 +2627,6 @@ et_sysctl_rx_intr_delay(SYSCTL_HANDLER_ARGS)
 static void
 et_stats_update(struct et_softc *sc)
 {
-	struct ifnet *ifp;
 	struct et_hw_stats *stats;
 
 	stats = &sc->sc_stats;
@@ -2675,18 +2676,35 @@ et_stats_update(struct et_softc *sc)
 	stats->tx_oversize += CSR_READ_4(sc, ET_STAT_TX_OVERSIZE);
 	stats->tx_undersize += CSR_READ_4(sc, ET_STAT_TX_UNDERSIZE);
 	stats->tx_fragments += CSR_READ_4(sc, ET_STAT_TX_FRAG);
+}
 
-	/* Update ifnet counters. */
-	ifp = sc->ifp;
-	ifp->if_opackets = (u_long)stats->tx_frames;
-	ifp->if_collisions = stats->tx_total_colls;
-	ifp->if_oerrors = stats->tx_drop + stats->tx_jabbers +
-	    stats->tx_crcerrs + stats->tx_excess_deferred +
-	    stats->tx_late_colls;
-	ifp->if_ipackets = (u_long)stats->rx_frames;
-	ifp->if_ierrors = stats->rx_crcerrs + stats->rx_alignerrs +
-	    stats->rx_lenerrs + stats->rx_codeerrs + stats->rx_cserrs +
-	    stats->rx_runts + stats->rx_jabbers + stats->rx_drop;
+static uint64_t
+et_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct et_softc *sc;
+	struct et_hw_stats *stats;
+
+	sc = if_getsoftc(ifp);
+	stats = &sc->sc_stats;
+
+	switch (cnt) {
+	case IFCOUNTER_OPACKETS:
+		return (stats->tx_frames);
+	case IFCOUNTER_COLLISIONS:
+		return (stats->tx_total_colls);
+	case IFCOUNTER_OERRORS:
+		return (stats->tx_drop + stats->tx_jabbers +
+		    stats->tx_crcerrs + stats->tx_excess_deferred +
+		    stats->tx_late_colls);
+	case IFCOUNTER_IPACKETS:
+		return (stats->rx_frames);
+	case IFCOUNTER_IERRORS:
+		return (stats->rx_crcerrs + stats->rx_alignerrs +
+		    stats->rx_lenerrs + stats->rx_codeerrs + stats->rx_cserrs +
+		    stats->rx_runts + stats->rx_jabbers + stats->rx_drop);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 static int
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index e85ee5f580c0..40723512cc0c 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -571,7 +571,7 @@ ex_start_locked(struct ifnet *ifp)
 			BPF_MTAP(ifp, opkt);
 
 			sc->tx_timeout = 2;
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			m_freem(opkt);
 		} else {
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
@@ -684,12 +684,12 @@ ex_tx_intr(struct ex_softc *sc)
 		sc->tx_head = CSR_READ_2(sc, IO_PORT_REG);
 
 		if (tx_status & TX_OK_bit) {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		} else {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 
-		ifp->if_collisions += tx_status & No_Collisions_bits;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, tx_status & No_Collisions_bits);
 	}
 
 	/*
@@ -737,7 +737,7 @@ ex_rx_intr(struct ex_softc *sc)
 			MGETHDR(m, M_NOWAIT, MT_DATA);
 			ipkt = m;
 			if (ipkt == NULL) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			} else {
 				ipkt->m_pkthdr.rcvif = ifp;
 				ipkt->m_pkthdr.len = pkt_len;
@@ -750,7 +750,7 @@ ex_rx_intr(struct ex_softc *sc)
 							m->m_len = MCLBYTES;
 						} else {
 							m_freem(ipkt);
-							ifp->if_iqdrops++;
+							if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 							goto rx_another;
 						}
 					}
@@ -773,7 +773,7 @@ ex_rx_intr(struct ex_softc *sc)
 						MGET(m->m_next, M_NOWAIT, MT_DATA);
 						if (m->m_next == NULL) {
 							m_freem(ipkt);
-							ifp->if_iqdrops++;
+							if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 							goto rx_another;
 						}
 						m = m->m_next;
@@ -792,10 +792,10 @@ ex_rx_intr(struct ex_softc *sc)
 				EX_UNLOCK(sc);
 				(*ifp->if_input)(ifp, ipkt);
 				EX_LOCK(sc);
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			}
 		} else {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		CSR_WRITE_2(sc, HOST_ADDR_REG, sc->rx_head);
 rx_another: ;
@@ -983,7 +983,7 @@ ex_watchdog(void *arg)
 
 		DODEBUG(Status, printf("OIDLE watchdog\n"););
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ex_reset(sc);
 		ex_start_locked(ifp);
 
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index b6b4e13db2a3..b3281fe1a47f 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -1564,7 +1564,7 @@ fatm_intr_drain_rx(struct fatm_softc *sc)
 			ATM_PH_SETVCI(&aph, vci);
 
 			ifp = sc->ifp;
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 			vc->ipackets++;
 			vc->ibytes += m0->m_pkthdr.len;
@@ -1974,7 +1974,7 @@ fatm_tx(struct fatm_softc *sc, struct mbuf *m, struct card_vcc *vc, u_int mlen)
 	error = bus_dmamap_load_mbuf(sc->tx_tag, q->map, m,
 	    fatm_tpd_load, tpd, BUS_DMA_NOWAIT);
 	if(error) {
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		if_printf(sc->ifp, "mbuf loaded error=%d\n", error);
 		m_freem(m);
 		return (0);
@@ -2025,7 +2025,7 @@ fatm_tx(struct fatm_softc *sc, struct mbuf *m, struct card_vcc *vc, u_int mlen)
 	BARRIER_W(sc);
 
 	sc->txcnt++;
-	sc->ifp->if_opackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 	vc->obytes += m->m_pkthdr.len;
 	vc->opackets++;
 
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 9fe1e7ef8bd4..5c5ffbec2a34 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -82,9 +82,13 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 
 #include <isa/isavar.h>
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#else
 #include <isa/isareg.h>
-#include <dev/fdc/fdcvar.h>
 #include <isa/rtc.h>
+#endif
+#include <dev/fdc/fdcvar.h>
 
 #include <dev/ic/nec765.h>
 
@@ -136,33 +140,56 @@ __FBSDID("$FreeBSD$");
  */
 
 static struct fd_type fd_searchlist_360k[] = {
+#ifndef PC98
 	{ FDF_5_360 },
+#endif
 	{ 0 }
 };
 
 static struct fd_type fd_searchlist_12m[] = {
+#ifdef PC98
+	{ FDF_5_1200 | FL_AUTO },
+	{ FDF_5_720 | FL_AUTO },
+	{ FDF_5_360 | FL_AUTO },
+	{ FDF_5_640 | FL_AUTO },
+	{ FDF_5_1230 | FL_AUTO },
+#else
 	{ FDF_5_1200 | FL_AUTO },
 	{ FDF_5_360 | FL_2STEP | FL_AUTO},
+#endif
 	{ 0 }
 };
 
 static struct fd_type fd_searchlist_720k[] = {
+#ifndef PC98
 	{ FDF_3_720 },
+#endif
 	{ 0 }
 };
 
 static struct fd_type fd_searchlist_144m[] = {
+#ifdef PC98
+	{ FDF_3_1440 | FL_AUTO},
+	{ FDF_3_1200 | FL_AUTO},
+	{ FDF_3_720 | FL_AUTO},
+	{ FDF_3_360 | FL_AUTO},
+	{ FDF_3_640 | FL_AUTO},
+	{ FDF_3_1230 | FL_AUTO},
+#else
 	{ FDF_3_1440 | FL_AUTO},
 	{ FDF_3_720 | FL_AUTO},
+#endif
 	{ 0 }
 };
 
 static struct fd_type fd_searchlist_288m[] = {
+#ifndef PC98
 	{ FDF_3_1440 | FL_AUTO },
 #if 0
 	{ FDF_3_2880 | FL_AUTO }, /* XXX: probably doesn't work */
 #endif
 	{ FDF_3_720 | FL_AUTO},
+#endif
 	{ 0 }
 };
 
@@ -183,6 +210,26 @@ static struct fd_type *fd_native_types[] = {
  * Internals start here
  */
 
+#ifdef PC98
+/* registers */
+#define	FDSTS	0	/* NEC 765 Main Status Register (R) */
+#define	FDDATA	1	/* NEC 765 Data Register (R/W) */
+#define	FDCTL	2	/* FD Control Register */
+#define	FDC_RST		0x80	/*  FDC RESET */
+#define	FDC_RDY		0x40	/*  force READY */
+#define	FDC_DD		0x20	/*  FDD Mode Exchange 0:1M 1:640K */
+#define	FDC_DMAE	0x10	/*  enable floppy DMA */
+#define	FDC_MTON	0x08	/*  MOTOR ON (when EMTON=1)*/
+#define	FDC_TMSK	0x04	/*  TIMER MASK */
+#define	FDC_TTRG	0x01	/*  TIMER TRIGER */
+
+#define	FDP	3
+#define	FDP_EMTON	0x04	/*  enable MTON */
+#define	FDP_FDDEXC	0x02	/*  FDD Mode Exchange 1:1M 0:640K */
+#define	FDP_PORTEXC	0x01	/*  PORT Exchane 1:1M 0:640K */
+
+#define	FDEM	4
+#else
 /* registers */
 #define	FDOUT	2	/* Digital Output Register (W) */
 #define	FDO_FDSEL	0x03	/*  floppy device select */
@@ -197,6 +244,7 @@ static struct fd_type *fd_native_types[] = {
 #define FDDSR	4	/* Data Rate Select Register (W) */
 #define	FDDATA	5	/* NEC 765 Data Register (R/W) */
 #define	FDCTL	7	/* Control Register (W) */
+#endif /* PC98 */
 
 /*
  * The YE-DATA PC Card floppies use PIO to read in the data rather
@@ -219,9 +267,11 @@ static struct fd_type *fd_native_types[] = {
 #define FDBCDR		0	/* And 1 */
 #define FD_YE_DATAPORT	6	/* Drive Data port */
 
+#ifndef PC98
 #define	FDI_DCHG	0x80	/* diskette has been changed */
 				/* requires drive and motor being selected */
 				/* is cleared by any step pulse to drive */
+#endif
 
 /*
  * We have three private BIO commands.
@@ -258,6 +308,9 @@ struct fd_data {
 	struct g_provider *fd_provider;
 	device_t dev;
 	struct bio_queue_head fd_bq;
+#ifdef PC98
+	int	pc98_trans;
+#endif
 };
 
 #define FD_NOT_VALID -2
@@ -281,11 +334,19 @@ static int retries = 10;
 SYSCTL_INT(_debug_fdc, OID_AUTO, retries, CTLFLAG_RW, &retries, 0,
 	"Number of retries to attempt");
 
-static int spec1 = 0xaf;
+#ifdef PC98
+static int spec1 = NE7_SPEC_1(4, 240);
+#else
+static int spec1 = NE7_SPEC_1(6, 240);
+#endif
 SYSCTL_INT(_debug_fdc, OID_AUTO, spec1, CTLFLAG_RW, &spec1, 0,
 	"Specification byte one (step-rate + head unload)");
 
-static int spec2 = 0x10;
+#ifdef PC98
+static int spec2 = NE7_SPEC_2(2, 0);
+#else
+static int spec2 = NE7_SPEC_2(16, 0);
+#endif
 SYSCTL_INT(_debug_fdc, OID_AUTO, spec2, CTLFLAG_RW, &spec2, 0,
 	"Specification byte two (head load time + no-dma)");
 
@@ -335,12 +396,14 @@ fdctl_wr(struct fdc_data *fdc, u_int8_t v)
 	fdregwr(fdc, FDCTL, v);
 }
 
+#ifndef PC98
 static void
 fdout_wr(struct fdc_data *fdc, u_int8_t v)
 {
 
 	fdregwr(fdc, FDOUT, v);
 }
+#endif
 
 static u_int8_t
 fdsts_rd(struct fdc_data *fdc)
@@ -349,12 +412,14 @@ fdsts_rd(struct fdc_data *fdc)
 	return fdregrd(fdc, FDSTS);
 }
 
+#ifndef PC98
 static void
 fddsr_wr(struct fdc_data *fdc, u_int8_t v)
 {
 
 	fdregwr(fdc, FDDSR, v);
 }
+#endif
 
 static void
 fddata_wr(struct fdc_data *fdc, u_int8_t v)
@@ -370,12 +435,14 @@ fddata_rd(struct fdc_data *fdc)
 	return fdregrd(fdc, FDDATA);
 }
 
+#ifndef PC98
 static u_int8_t
 fdin_rd(struct fdc_data *fdc)
 {
 
 	return fdregrd(fdc, FDCTL);
 }
+#endif
 
 /*
  * Magic pseudo-DMA initialization for YE FDC. Sets count and
@@ -502,11 +569,90 @@ fdc_cmd(struct fdc_data *fdc, int n_out, ...)
 	return (0);
 }
 
+#ifdef PC98
+static void	fd_motor(struct fd_data *fd, int turnon);
+
+static int pc98_trans = 0; /* 0 : HD , 1 : DD , 2 : 1.44 */
+static int pc98_trans_prev = -1;
+
+static void
+set_density(struct fdc_data *fdc)
+{
+	/* always motor on */
+	fdregwr(fdc, FDP, (pc98_trans != 1 ? FDP_FDDEXC : 0) | FDP_PORTEXC);
+	DELAY(100);
+	fdctl_wr(fdc, FDC_RST | FDC_DMAE);
+	/* in the case of note W, always inhibit 100ms timer */
+}
+
+static int
+pc98_fd_check_ready(struct fd_data *fd)
+{
+	struct fdc_data *fdc = fd->fdc;
+	int retry = 0, status;
+	int fdu = device_get_unit(fd->dev);
+
+	while (retry++ < 30000) {
+		fd_motor(fd, 1);
+		fdc_out(fdc, NE7CMD_SENSED); /* Sense Drive Status */
+		DELAY(100);
+		fdc_out(fdc, fdu); /* Drive number */
+		DELAY(100);
+		if ((fdc_in(fdc, &status) == 0) && (status & NE7_ST3_RD)) {
+			fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
+			DELAY(10);
+			return (0);
+		}
+	}
+	return (-1);
+}
+
+static void
+pc98_fd_check_type(struct fd_data *fd, int unit)
+{
+	struct fdc_data *fdc;
+
+	if (fd->type != FDT_NONE || unit < 0 || unit > 3)
+		return;
+
+	fdc = fd->fdc;
+
+	/* Look up what the BIOS thinks we have. */
+	if (!((PC98_SYSTEM_PARAMETER(0x55c) >> unit) & 0x01)) {
+		fd->type = FDT_NONE;
+		return;
+	}
+	if ((PC98_SYSTEM_PARAMETER(0x5ae) >> unit) & 0x01) {
+		/* Check 3mode I/F */
+		fd->pc98_trans = 0;
+		fdregwr(fdc, FDEM, (unit << 5) | 0x10);
+		if (!(fdregrd(fdc, FDEM) & 0x01)) {
+			fd->type = FDT_144M;
+			return;
+		}
+		device_printf(fd->dev,
+		    "Warning: can't control 3mode I/F, fallback to 2mode.\n");
+	}
+
+	fd->type = FDT_12M;
+}
+#endif /* PC98 */
+
 static void
 fdc_reset(struct fdc_data *fdc)
 {
 	int i, r[10];
 
+#ifdef PC98
+	set_density(fdc);
+	if (pc98_machine_type & M_EPSON_PC98)
+		fdctl_wr(fdc, FDC_RST | FDC_RDY | FDC_DD | FDC_MTON);
+	else
+		fdctl_wr(fdc, FDC_RST | FDC_RDY | FDC_DMAE | FDC_MTON);
+	DELAY(200);
+	fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
+	DELAY(10);
+#else
 	if (fdc->fdct == FDC_ENHANCED) {
 		/* Try a software reset, default precomp, and 500 kb/s */
 		fddsr_wr(fdc, I8207X_DSR_SR);
@@ -519,6 +665,7 @@ fdc_reset(struct fdc_data *fdc)
 	}
 	DELAY(100);
 	fdout_wr(fdc, fdc->fdout);
+#endif
 
 	/* XXX after a reset, silently believe the FDC will accept commands */
 	if (fdc_cmd(fdc, 3, NE7CMD_SPECIFY, spec1, spec2, 0))
@@ -612,6 +759,7 @@ fdc_read_status(struct fdc_data *fdc)
 	return ret;
 }
 
+#ifndef PC98
 /*
  * Select this drive
  */
@@ -649,6 +797,7 @@ fd_turnon(void *arg)
 	if (once)
 		wakeup(&fd->fdc->head);
 }
+#endif
 
 static void
 fd_motor(struct fd_data *fd, int turnon)
@@ -659,6 +808,11 @@ fd_motor(struct fd_data *fd, int turnon)
 /*
 	mtx_assert(&fdc->fdc_mtx, MA_OWNED);
 */
+#ifdef PC98
+	fdregwr(fdc, FDP, (pc98_trans != 1 ? FDP_FDDEXC : 0) | FDP_PORTEXC);
+	DELAY(10);
+	fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
+#else
 	if (turnon) {
 		fd->flags |= FD_MOTORWAIT;
 		fdc->fdout |= (FDO_MOEN0 << fd->fdsu);
@@ -669,6 +823,7 @@ fd_motor(struct fd_data *fd, int turnon)
 		fdc->fdout &= ~(FDO_MOEN0 << fd->fdsu);
 	}
 	fdout_wr(fdc, fdc->fdout);
+#endif
 }
 
 static void
@@ -836,15 +991,41 @@ fdc_worker(struct fdc_data *fdc)
 	}
 
 	/* Select drive, setup params */
+#ifdef PC98
+	pc98_trans = fd->ft->trans;
+	if (pc98_trans_prev != pc98_trans) {
+		int i;
+
+		set_density(fdc);
+		for (i = 0; i < 10; i++) {
+			outb(0x5f, 0);
+			outb(0x5f, 0);
+		}
+		pc98_trans_prev = pc98_trans;
+	}
+	if (pc98_trans != fd->pc98_trans) {
+		if (fd->type == FDT_144M) {
+			fdregwr(fdc, FDEM,
+			    (device_get_unit(fd->dev) << 5) | 0x10 |
+			    (pc98_trans >> 1));
+			outb(0x5f, 0);
+			outb(0x5f, 0);
+		}
+		fd->pc98_trans = pc98_trans;
+	}
+#else
 	fd_select(fd);
 	if (fdc->fdct == FDC_ENHANCED)
 		fddsr_wr(fdc, fd->ft->trans);
 	else
 		fdctl_wr(fdc, fd->ft->trans);
+#endif
 
 	if (bp->bio_cmd & BIO_PROBE) {
 		if ((!(device_get_flags(fd->dev) & FD_NO_CHLINE) &&
+#ifndef PC98
 		    !(fdin_rd(fdc) & FDI_DCHG) &&
+#endif
 		    !(fd->flags & FD_EMPTY)) ||
 		    fd_probe_disk(fd, &need_recal) == 0)
 			return (fdc_biodone(fdc, 0));
@@ -857,6 +1038,7 @@ fdc_worker(struct fdc_data *fdc)
 	if (fd->flags & FD_EMPTY)
 		return (fdc_biodone(fdc, ENXIO));
 
+#ifndef PC98
 	/* Check if we lost our media */
 	if (fdin_rd(fdc) & FDI_DCHG) {
 		if (debugflags & 0x40)
@@ -874,9 +1056,10 @@ fdc_worker(struct fdc_data *fdc)
 		g_topology_unlock();
 		return (fdc_biodone(fdc, ENXIO));
 	}
+#endif
 
 	/* Check if the floppy is write-protected */
-	if(bp->bio_cmd & (BIO_FMT | BIO_WRITE)) {
+	if (bp->bio_cmd & (BIO_FMT | BIO_WRITE)) {
 		retry_line = __LINE__;
 		if(fdc_sense_drive(fdc, &st3) != 0)
 			return (1);
@@ -907,6 +1090,9 @@ fdc_worker(struct fdc_data *fdc)
 	if ((need_recal & (1 << fd->fdsu)) ||
 	    (cylinder == 0 && fd->track != 0) ||
 	    fdc->retry > 2) {
+#ifdef PC98
+		pc98_fd_check_ready(fd);
+#endif
 		retry_line = __LINE__;
 		if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0))
 			return (1);
@@ -928,6 +1114,9 @@ fdc_worker(struct fdc_data *fdc)
 	 * SEEK to where we want to be
 	 */
 	if (cylinder != fd->track) {
+#ifdef PC98
+		pc98_fd_check_ready(fd);
+#endif		
 		retry_line = __LINE__;
 		if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, descyl, 0))
 			return (1);
@@ -1230,6 +1419,7 @@ fd_probe_disk(struct fd_data *fd, int *recal)
 	if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID)
 		goto done;	/* XXX */
 	*recal |= (1 << fd->fdsu);
+#ifndef PC98
 	if (fdin_rd(fdc) & FDI_DCHG) {
 		if (debugflags & 0x40)
 			printf("Empty in probe\n");
@@ -1237,6 +1427,9 @@ fd_probe_disk(struct fd_data *fd, int *recal)
 		fd->flags |= FD_EMPTY;
 		mtx_unlock(&fdc->fdc_mtx);
 	} else {
+#else
+	{
+#endif
 		if (fdc_sense_drive(fdc, &st3) != 0)
 			goto done;
 		if (debugflags & 0x40)
@@ -1372,7 +1565,12 @@ fdautoselect(struct fd_data *fd)
 	} else {
 		if (debugflags & 0x40) {
 			device_printf(fd->dev,
-			    "autoselected %d KB medium\n", fd->ft->size / 2);
+			    "autoselected %d KB medium\n",
+#ifdef PC98
+			    (128 << (fd->ft->secsize)) * fd->ft->size / 1024);
+#else
+			    fd->ft->size / 2);
+#endif
 			fdprinttype(fd->ft);
 		}
 		return (0);
@@ -1425,6 +1623,10 @@ fd_access(struct g_provider *pp, int r, int w, int e)
 
 	busy = 0;
 	if (pp->acr == 0 && pp->acw == 0 && pp->ace == 0) {
+#ifdef PC98
+		if (pc98_fd_check_ready(fd) == -1)
+			return (ENXIO);
+#endif
 		if (fdmisccmd(fd, BIO_PROBE, NULL))
 			return (ENXIO);
 		if (fd->flags & FD_EMPTY)
@@ -1494,6 +1696,10 @@ fd_ioctl(struct g_provider *pp, u_long cmd, void *data, int fflag, struct thread
 
 	fd = pp->geom->softc;
 
+#ifdef PC98
+	pc98_fd_check_ready(fd);
+#endif	
+
 	switch (cmd) {
 	case FD_GTYPE:                  /* get drive type */
 		*(struct fd_type *)data = *fd->ft;
@@ -1661,6 +1867,12 @@ fdc_initial_reset(device_t dev, struct fdc_data *fdc)
 {
 	int ic_type, part_id;
 
+#ifdef PC98
+	/* See if it can handle a command. */
+	if (fdc_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(4, 240),
+	    NE7_SPEC_2(2, 0), 0))
+		return (ENXIO);
+#else
 	/*
 	 * A status value of 0xff is very unlikely, but not theoretically
 	 * impossible, but it is far more likely to indicate an empty bus.
@@ -1686,8 +1898,10 @@ fdc_initial_reset(device_t dev, struct fdc_data *fdc)
 		return (ENXIO);
 
 	/* Then, see if it can handle a command. */
-	if (fdc_cmd(fdc, 3, NE7CMD_SPECIFY, 0xaf, 0x1e, 0))
+	if (fdc_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(6, 240),
+	    NE7_SPEC_2(31, 0), 0))
 		return (ENXIO);
+#endif
 
 	/*
 	 * Try to identify the chip.
@@ -1749,7 +1963,11 @@ fdc_detach(device_t dev)
 	mtx_unlock(&fdc->fdc_mtx);
 
 	/* reset controller, turn motor off */
+#ifdef PC98
+	fdc_reset(fdc);
+#else
 	fdout_wr(fdc, 0);
+#endif
 
 	if (!(fdc->flags & FDC_NODMA))
 		isa_dma_release(fdc->dmachan);
@@ -1823,7 +2041,11 @@ fdc_attach(device_t dev)
 	mtx_init(&fdc->fdc_mtx, "fdc lock", NULL, MTX_DEF);
 
 	/* reset controller, turn motor off, clear fdout mirror reg */
+#ifdef PC98
+	fdc_reset(fdc);
+#else
 	fdout_wr(fdc, fdc->fdout = 0);
+#endif
 	bioq_init(&fdc->head);
 
 	kproc_create(fdc_thread, fdc, &fdc->fdc_thread, 0, 0,
@@ -1877,8 +2099,11 @@ fdc_print_child(device_t me, device_t child)
 static int
 fd_probe(device_t dev)
 {
-	int	i, unit;
+	int	unit;
+#ifndef PC98
+	int	i;
 	u_int	st0, st3;
+#endif
 	struct	fd_data *fd;
 	struct	fdc_data *fdc;
 	int	fdsu;
@@ -1905,7 +2130,9 @@ fd_probe(device_t dev)
 		fd->type = type;
 	}
 
-#if (defined(__i386__) && !defined(PC98)) || defined(__amd64__)
+#ifdef PC98
+	pc98_fd_check_type(fd, unit);
+#elif defined(__i386__) || defined(__amd64__)
 	if (fd->type == FDT_NONE && (unit == 0 || unit == 1)) {
 		/* Look up what the BIOS thinks we have. */
 		if (unit == 0)
@@ -1920,6 +2147,7 @@ fd_probe(device_t dev)
 	if (fd->type == FDT_NONE)
 		return (ENXIO);
 
+#ifndef PC98
 /*
 	mtx_lock(&fdc->fdc_mtx);
 */
@@ -1972,10 +2200,19 @@ fd_probe(device_t dev)
 	if ((flags & FD_NO_PROBE) == 0 &&
 	    (st0 & NE7_ST0_EC) != 0) /* no track 0 -> no drive present */
 		return (ENXIO);
+#endif /* PC98 */
 
 done:
 
 	switch (fd->type) {
+#ifdef PC98
+	case FDT_144M:
+		device_set_desc(dev, "1.44M FDD");
+		break;
+	case FDT_12M:
+		device_set_desc(dev, "1M/640K FDD");
+		break;
+#else
 	case FDT_12M:
 		device_set_desc(dev, "1200-KB 5.25\" drive");
 		break;
@@ -1991,6 +2228,7 @@ fd_probe(device_t dev)
 	case FDT_720K:
 		device_set_desc(dev, "720-KB 3.5\" drive");
 		break;
+#endif
 	default:
 		return (ENXIO);
 	}
@@ -1998,6 +2236,9 @@ fd_probe(device_t dev)
 	fd->fdc = fdc;
 	fd->fdsu = fdsu;
 	fd->options = 0;
+#ifdef PC98
+	fd->pc98_trans = 0;
+#endif
 	callout_init_mtx(&fd->toffhandle, &fd->fdc->fdc_mtx, 0);
 
 	/* initialize densities for subdevices */
diff --git a/sys/pc98/cbus/fdc_cbus.c b/sys/dev/fdc/fdc_cbus.c
similarity index 71%
rename from sys/pc98/cbus/fdc_cbus.c
rename to sys/dev/fdc/fdc_cbus.c
index 098ee5daefe2..ee1598dccb07 100644
--- a/sys/pc98/cbus/fdc_cbus.c
+++ b/sys/dev/fdc/fdc_cbus.c
@@ -33,15 +33,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/systm.h>
 
 #include <machine/bus.h>
 
 #include <pc98/cbus/cbus.h>
-#include <pc98/cbus/fdcreg.h>
-#include <pc98/cbus/fdcvar.h>
+#include <dev/fdc/fdcvar.h>
 
 #include <isa/isavar.h>
 
@@ -50,62 +51,70 @@ static bus_addr_t fdc_iat[] = {0, 2, 4};
 static int
 fdc_cbus_alloc_resources(device_t dev, struct fdc_data *fdc)
 {
-	int rid;
+	struct resource *res;
+	int i, rid;
 
 	fdc->fdc_dev = dev;
-	fdc->rid_ioport = 0;
-	fdc->rid_irq = 0;
-	fdc->rid_drq = 0;
-	fdc->res_irq = 0;
-	fdc->res_drq = 0;
-
-	fdc->res_ioport = isa_alloc_resourcev(dev, SYS_RES_IOPORT,
-					      &fdc->rid_ioport, fdc_iat,
-					      3, RF_ACTIVE);
-	if (fdc->res_ioport == 0) {
+	rid = 0;
+	res = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, fdc_iat, 3,
+	    RF_ACTIVE);
+	if (res == NULL) {
 		device_printf(dev, "cannot reserve I/O port range\n");
-		return ENXIO;
+		return (ENXIO);
 	}
-	isa_load_resourcev(fdc->res_ioport, fdc_iat, 3);
-	fdc->portt = rman_get_bustag(fdc->res_ioport);
-	fdc->porth = rman_get_bushandle(fdc->res_ioport);
-
+	isa_load_resourcev(res, fdc_iat, 3);
+	for (i = 0; i < 3; i++) {
+		fdc->resio[i] = res;
+		fdc->ridio[i] = rid;
+		fdc->ioff[i] = i;
+		fdc->ioh[i] = rman_get_bushandle(res);
+	}
+	fdc->iot = rman_get_bustag(res);
+		
 	rid = 3;
 	bus_set_resource(dev, SYS_RES_IOPORT, rid, IO_FDPORT, 1);
-	fdc->res_fdsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
-						RF_ACTIVE);
-	if (fdc->res_fdsio == 0)
-		return ENXIO;
-	fdc->sc_fdsiot = rman_get_bustag(fdc->res_fdsio);
-	fdc->sc_fdsioh = rman_get_bushandle(fdc->res_fdsio);
+	res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
+	if (res == NULL) {
+		device_printf(dev, "cannot reserve I/O port range\n");
+		return (ENXIO);
+	}
+	fdc->resio[3] = res;
+	fdc->ridio[3] = rid;
+	fdc->ioff[3] = 0;
+	fdc->ioh[3] = rman_get_bushandle(res);
+	/* XXX: Reuses fdc->iot */
 
 	rid = 4;
 	bus_set_resource(dev, SYS_RES_IOPORT, rid, 0x4be, 1);
-	fdc->res_fdemsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
-						  RF_ACTIVE);
-	if (fdc->res_fdemsio == 0)
-		return ENXIO;
-	fdc->sc_fdemsiot = rman_get_bustag(fdc->res_fdemsio);
-	fdc->sc_fdemsioh = rman_get_bushandle(fdc->res_fdemsio);
+	res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
+	if (res == NULL) {
+		device_printf(dev, "cannot reserve I/O port range\n");
+		return (ENXIO);
+	}
+	fdc->resio[4] = res;
+	fdc->ridio[4] = rid;
+	fdc->ioff[4] = 0;
+	fdc->ioh[4] = rman_get_bushandle(res);
+	/* XXX: Reuses fdc->iot */
 
 	fdc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &fdc->rid_irq,
-					      RF_ACTIVE);
-	if (fdc->res_irq == 0) {
+	    RF_ACTIVE);
+	if (fdc->res_irq == NULL) {
 		device_printf(dev, "cannot reserve interrupt line\n");
-		return ENXIO;
+		return (ENXIO);
 	}
 
 	if ((fdc->flags & FDC_NODMA) == 0) {
 		fdc->res_drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
-						      &fdc->rid_drq, RF_ACTIVE);
-		if (fdc->res_drq == 0) {
+		    &fdc->rid_drq, RF_ACTIVE);
+		if (fdc->res_drq == NULL) {
 			device_printf(dev, "cannot reserve DMA request line\n");
-			return ENXIO;
+			return (ENXIO);
 		}
 		fdc->dmachan = rman_get_start(fdc->res_drq);
 	}
 
-	return 0;
+	return (0);
 }
 
 static int
@@ -122,8 +131,8 @@ fdc_cbus_probe(device_t dev)
 
 	/* Attempt to allocate our resources for the duration of the probe */
 	error = fdc_cbus_alloc_resources(dev, fdc);
-	if (!error)
-		error = fdc_initial_reset(fdc);
+	if (error == 0)
+		error = fdc_initial_reset(dev, fdc);
 
 	fdc_release_resources(fdc);
 	return (error);
@@ -136,15 +145,14 @@ fdc_cbus_attach(device_t dev)
 	int error;
 
 	fdc = device_get_softc(dev);
-
-	if ((error = fdc_cbus_alloc_resources(dev, fdc)) != 0 ||
-	    (error = fdc_attach(dev)) != 0 ||
-	    (error = fdc_hints_probe(dev)) != 0) {
+	error = fdc_cbus_alloc_resources(dev, fdc);
+	if (error == 0)
+		error = fdc_attach(dev);
+	if (error == 0)
+		error = fdc_hints_probe(dev);
+	if (error)
 		fdc_release_resources(fdc);
-		return (error);
-	}
-
-	return (0);
+	return (error);
 }
 
 static device_method_t fdc_methods[] = {
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 5ab60a6a6443..b09bfa19c405 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -49,7 +49,9 @@ struct fdc_data {
 #define FDC_KTHREAD_ALIVE	0x2000 /* worker thread is alive */
 	struct	fd_data *fd;	/* The active drive */
 	int	retry;
+#ifndef PC98
 	int	fdout;		/* mirror of the w/o digital output reg */
+#endif
 	u_int	status[7];	/* copy of the registers */
 	enum	fdc_type fdct;	/* chip version of FDC */
 	int	fdc_errs;	/* number of logged errors */
diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c
index 77cf8baeba33..9d0c0f038ba7 100644
--- a/sys/dev/fdt/fdt_common.c
+++ b/sys/dev/fdt/fdt_common.c
@@ -493,46 +493,6 @@ fdt_reg_to_rl(phandle_t node, struct resource_list *rl)
 	return (rv);
 }
 
-int
-fdt_intr_to_rl(device_t dev, phandle_t node, struct resource_list *rl,
-    struct fdt_sense_level *intr_sl)
-{
-	phandle_t iparent;
-	uint32_t *intr, icells;
-	int nintr, i, k;
-
-	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
-	    (void **)&intr);
-	if (nintr > 0) {
-		if (OF_searchencprop(node, "interrupt-parent", &iparent,
-		    sizeof(iparent)) == -1) {
-			device_printf(dev, "No interrupt-parent found, "
-			    "assuming direct parent\n");
-			iparent = OF_parent(node);
-		}
-		if (OF_searchencprop(OF_node_from_xref(iparent), 
-		    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
-			device_printf(dev, "Missing #interrupt-cells property, "
-			    "assuming <1>\n");
-			icells = 1;
-		}
-		if (icells < 1 || icells > nintr) {
-			device_printf(dev, "Invalid #interrupt-cells property "
-			    "value <%d>, assuming <1>\n", icells);
-			icells = 1;
-		}
-		for (i = 0, k = 0; i < nintr; i += icells, k++) {
-			intr[i] = ofw_bus_map_intr(dev, iparent, icells,
-			    &intr[i]);
-			resource_list_add(rl, SYS_RES_IRQ, k, intr[i], intr[i],
-			    1);
-		}
-		free(intr, M_OFWPROP);
-	}
-
-	return (0);
-}
-
 int
 fdt_get_phyaddr(phandle_t node, device_t dev, int *phy_addr, void **phy_sc)
 {
diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h
index d306f65b83ad..0a79ce03baf8 100644
--- a/sys/dev/fdt/fdt_common.h
+++ b/sys/dev/fdt/fdt_common.h
@@ -88,7 +88,6 @@ int fdt_get_phyaddr(phandle_t, device_t, int *, void **);
 int fdt_get_range(phandle_t, int, u_long *, u_long *);
 int fdt_immr_addr(vm_offset_t);
 int fdt_regsize(phandle_t, u_long *, u_long *);
-int fdt_intr_to_rl(device_t, phandle_t, struct resource_list *, struct fdt_sense_level *);
 int fdt_is_compatible(phandle_t, const char *);
 int fdt_is_compatible_strict(phandle_t, const char *);
 int fdt_is_enabled(phandle_t);
diff --git a/sys/dev/fdt/fdt_pinctrl.c b/sys/dev/fdt/fdt_pinctrl.c
new file mode 100644
index 000000000000..474fb00e22a9
--- /dev/null
+++ b/sys/dev/fdt/fdt_pinctrl.c
@@ -0,0 +1,151 @@
+/*-
+ * Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include "fdt_pinctrl_if.h"
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/fdt/fdt_pinctrl.h>
+
+int
+fdt_pinctrl_configure(device_t client, u_int index)
+{
+	device_t pinctrl;
+	phandle_t *configs;
+	int i, nconfigs;
+	char name[16];
+
+	snprintf(name, sizeof(name), "pinctrl-%u", index);
+	nconfigs = OF_getprop_alloc(ofw_bus_get_node(client), name,
+	    sizeof(*configs), (void **)&configs);
+	if (nconfigs < 0)
+		return (ENOENT);
+	if (nconfigs == 0)
+		return (0); /* Empty property is documented as valid. */
+	for (i = 0; i < nconfigs; i++) {
+		if ((pinctrl = OF_device_from_xref(configs[i])) != NULL)
+			FDT_PINCTRL_CONFIGURE(pinctrl, configs[i]);
+	}
+	free(configs, M_OFWPROP);
+	return (0);
+}
+
+int
+fdt_pinctrl_configure_by_name(device_t client, const char * name)
+{
+	char * names;
+	int i, offset, nameslen;
+
+	nameslen = OF_getprop_alloc(ofw_bus_get_node(client), "pinctrl-names",
+	    sizeof(*names), (void **)&names);
+	if (nameslen <= 0)
+		return (ENOENT);
+	for (i = 0, offset = 0; offset < nameslen; i++) {
+		if (strcmp(name, &names[offset]) == 0)
+			break;
+		offset += strlen(&names[offset]) + 1;
+	}
+	free(names, M_OFWPROP);
+	if (offset < nameslen)
+		return (fdt_pinctrl_configure(client, i));
+	else
+		return (ENOENT);
+}
+
+static int
+pinctrl_register_children(device_t pinctrl, phandle_t parent,
+    const char *pinprop)
+{
+	phandle_t node;
+
+	/*
+	 * Recursively descend from parent, looking for nodes that have the
+	 * given property, and associate the pinctrl device_t with each one.
+	 */
+	for (node = OF_child(parent); node != 0; node = OF_peer(node)) {
+		pinctrl_register_children(pinctrl, node, pinprop);
+		if (pinprop == NULL || OF_hasprop(node, pinprop)) {
+			OF_device_register_xref(OF_xref_from_node(node),
+			    pinctrl);
+		}
+	}
+	return (0);
+}
+
+int
+fdt_pinctrl_register(device_t pinctrl, const char *pinprop)
+{
+	phandle_t node;
+
+	node = ofw_bus_get_node(pinctrl);
+	OF_device_register_xref(OF_xref_from_node(node), pinctrl);
+	return (pinctrl_register_children(pinctrl, node, pinprop));
+}
+
+static int
+pinctrl_configure_children(device_t pinctrl, phandle_t parent)
+{
+	phandle_t node, *configs;
+	int i, nconfigs;
+
+	for (node = OF_child(parent); node != 0; node = OF_peer(node)) {
+		if (!fdt_is_enabled(node))
+			continue;
+		pinctrl_configure_children(pinctrl, node);
+		nconfigs = OF_getencprop_alloc(node, "pinctrl-0", 
+		    sizeof(*configs), (void **)&configs);
+#ifdef DEBUG
+		{
+			char name[32]; 
+			OF_getprop(node, "name", &name, sizeof(name));
+			printf("%d items in pinctrl-0 for %s\n", nconfigs, name);
+		}
+#endif
+		if (nconfigs <= 0)
+			continue;
+		for (i = 0; i < nconfigs; i++) {
+			if (OF_device_from_xref(configs[i]) == pinctrl)
+				FDT_PINCTRL_CONFIGURE(pinctrl, configs[i]);
+		}
+		free(configs, M_OFWPROP);
+	}
+	return (0);
+}
+
+int
+fdt_pinctrl_configure_tree(device_t pinctrl)
+{
+
+	return (pinctrl_configure_children(pinctrl, OF_peer(0)));
+}
+
diff --git a/sys/dev/fdt/fdt_pinctrl.h b/sys/dev/fdt/fdt_pinctrl.h
new file mode 100644
index 000000000000..6ac7d60a52eb
--- /dev/null
+++ b/sys/dev/fdt/fdt_pinctrl.h
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef DEV_FDT_PINCTRL_H
+#define DEV_FDT_PINCTRL_H
+
+#include "fdt_pinctrl_if.h"
+
+/*
+ * Configure pins by name or index.  This looks up the pinctrl-N property in
+ * client's fdt data by index or name, and passes each handle in it to the
+ * pinctrl driver for configuration.
+ */
+int fdt_pinctrl_configure(device_t client, u_int index);
+int fdt_pinctrl_configure_by_name(device_t client, const char * name);
+
+/*
+ * Register a pinctrl driver so that it can be used by other devices which call
+ * fdt_pinctrl_configure().  The pinprop argument is the name of a property that
+ * identifies each descendent of the pinctrl node which is a pin configuration
+ * node whose xref phandle can be passed to FDT_PINCTRL_CONFIGURE().  If this is
+ * NULL, every descendant node is registered.
+ */
+int fdt_pinctrl_register(device_t pinctrl, const char *pinprop);
+
+/*
+ * Walk the device tree and configure pins for each enabled device whose
+ * pinctrl-0 property contains references to nodes which are children of the
+ * given pinctrl device.  This helper routine is for use by pinctrl drivers.
+ */
+int fdt_pinctrl_configure_tree(device_t pinctrl);
+
+#endif /* DEV_FDT_PINCTRL_H */
+
diff --git a/sys/dev/fdt/fdt_pinctrl_if.m b/sys/dev/fdt/fdt_pinctrl_if.m
new file mode 100644
index 000000000000..c499cdf3cb81
--- /dev/null
+++ b/sys/dev/fdt/fdt_pinctrl_if.m
@@ -0,0 +1,47 @@
+#-
+# Copyright (c) 2014 Ian Lepore
+# All rights reserved.
+#
+# 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+#include <sys/types.h>
+#include <dev/ofw/openfirm.h>
+
+#
+# This is the interface that fdt_pinctrl drivers provide to other drivers.
+#
+
+INTERFACE fdt_pinctrl;
+
+#
+# Set pins to the specified configuration.  The cfgxref arg is an xref phandle
+# to a descendent node (child, grandchild, ...) of the pinctrl device node.
+# Returns 0 on success or a standard errno value.
+#
+METHOD int configure {
+	device_t	pinctrl;
+	phandle_t	cfgxref;
+};
+
diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index e21b913d8634..41597837bd6b 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -247,11 +247,9 @@ simplebus_setup_dinfo(device_t dev, phandle_t node)
 {
 	struct simplebus_softc *sc;
 	struct simplebus_devinfo *ndi;
-	uint32_t *reg, *intr, icells;
+	uint32_t *reg;
 	uint64_t phys, size;
-	phandle_t iparent;
 	int i, j, k;
-	int nintr;
 	int nreg;
 
 	sc = device_get_softc(dev);
@@ -289,34 +287,7 @@ simplebus_setup_dinfo(device_t dev, phandle_t node)
 	}
 	free(reg, M_OFWPROP);
 
-	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
-	    (void **)&intr);
-	if (nintr > 0) {
-		if (OF_searchencprop(node, "interrupt-parent", &iparent,
-		    sizeof(iparent)) == -1) {
-			device_printf(dev, "No interrupt-parent found, "
-			    "assuming direct parent\n");
-			iparent = OF_parent(node);
-		}
-		if (OF_searchencprop(OF_node_from_xref(iparent), 
-		    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
-			device_printf(dev, "Missing #interrupt-cells property, "
-			    "assuming <1>\n");
-			icells = 1;
-		}
-		if (icells < 1 || icells > nintr) {
-			device_printf(dev, "Invalid #interrupt-cells property "
-			    "value <%d>, assuming <1>\n", icells);
-			icells = 1;
-		}
-		for (i = 0, k = 0; i < nintr; i += icells, k++) {
-			intr[i] = ofw_bus_map_intr(dev, iparent, icells,
-			    &intr[i]);
-			resource_list_add(&ndi->rl, SYS_RES_IRQ, k, intr[i],
-			    intr[i], 1);
-		}
-		free(intr, M_OFWPROP);
-	}
+	ofw_bus_intr_to_rl(dev, node, &ndi->rl);
 
 	return (ndi);
 }
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index e7d6fa63c30c..2123dfc08263 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -930,7 +930,7 @@ static void
 fe_reset (struct fe_softc *sc)
 {
 	/* Record how many packets are lost by this accident.  */
-	sc->ifp->if_oerrors += sc->txb_sched + sc->txb_count;
+	if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, sc->txb_sched + sc->txb_count);
 	sc->mibdata.dot3StatsInternalMacTransmitErrors++;
 
 	/* Put the interface into known initial state.  */
@@ -997,12 +997,15 @@ fe_watchdog (void *arg)
 	FE_ASSERT_LOCKED(sc);
 
 	if (sc->tx_timeout && --sc->tx_timeout == 0) {
+		struct ifnet *ifp = sc->ifp;
+
 		/* A "debug" message.  */
-		if_printf(sc->ifp, "transmission timeout (%d+%d)%s\n",
+		if_printf(ifp, "transmission timeout (%d+%d)%s\n",
 		    sc->txb_sched, sc->txb_count,
-		    (sc->ifp->if_flags & IFF_UP) ? "" : " when down");
-		if (sc->ifp->if_opackets == 0 && sc->ifp->if_ipackets == 0)
-			if_printf(sc->ifp, "wrong IRQ setting in config?\n");
+		    (ifp->if_flags & IFF_UP) ? "" : " when down");
+		if (ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS) == 0 &&
+		    ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS) == 0)
+			if_printf(ifp, "wrong IRQ setting in config?\n");
 		fe_reset(sc);
 	}
 	callout_reset(&sc->timer, hz, fe_watchdog, sc);
@@ -1519,7 +1522,7 @@ fe_tint (struct fe_softc * sc, u_char tstat)
 				 */
 				col = 1;
 			}
-			sc->ifp->if_collisions += col;
+			if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, col);
 			if (col == 1)
 				sc->mibdata.dot3StatsSingleCollisionFrames++;
 			else
@@ -1532,9 +1535,9 @@ fe_tint (struct fe_softc * sc, u_char tstat)
 		 * Be sure to reflect number of excessive collisions.
 		 */
 		col = sc->tx_excolls;
-		sc->ifp->if_opackets += sc->txb_sched - col;
-		sc->ifp->if_oerrors += col;
-		sc->ifp->if_collisions += col * 16;
+		if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, sc->txb_sched - col);
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, col);
+		if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, col * 16);
 		sc->mibdata.dot3StatsExcessiveCollisions += col;
 		sc->mibdata.dot3StatsCollFrequencies[15] += col;
 		sc->txb_sched = 0;
@@ -1591,7 +1594,7 @@ fe_rint (struct fe_softc * sc, u_char rstat)
 		if (rstat & FE_D1_SRTPKT)
 			sc->mibdata.dot3StatsFrameTooShorts++; /* :-) */
 #endif
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	/*
@@ -1651,7 +1654,7 @@ fe_rint (struct fe_softc * sc, u_char rstat)
 		    len < ETHER_MIN_LEN - ETHER_CRC_LEN) {
 			if_printf(sc->ifp,
 			    "RX buffer out-of-sync\n");
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			sc->mibdata.dot3StatsInternalMacReceiveErrors++;
 			fe_reset(sc);
 			return;
@@ -1668,14 +1671,14 @@ fe_rint (struct fe_softc * sc, u_char rstat)
 			 * in the buffer.  We hope we can get more
 			 * mbuf next time.
 			 */
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			sc->mibdata.dot3StatsMissedFrames++;
 			fe_droppacket(sc, len);
 			return;
 		}
 
 		/* Successfully received a packet.  Update stat.  */
-		sc->ifp->if_ipackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	}
 
 	/* Maximum number of frames has been received.  Something
@@ -1961,7 +1964,7 @@ fe_write_mbufs (struct fe_softc *sc, struct mbuf *m)
 	    length > ETHER_MAX_LEN - ETHER_CRC_LEN) {
 		if_printf(sc->ifp,
 		    "got an out-of-spec packet (%u bytes) to send\n", length);
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		sc->mibdata.dot3StatsInternalMacTransmitErrors++;
 		return;
 	}
diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c
index ce8b43537b13..b8230164367d 100644
--- a/sys/dev/ffec/if_ffec.c
+++ b/sys/dev/ffec/if_ffec.c
@@ -499,23 +499,21 @@ ffec_harvest_stats(struct ffec_softc *sc)
 	sc->stats_harvest_count = 0;
 	ifp = sc->ifp;
 
-	ifp->if_ipackets   += RD4(sc, FEC_RMON_R_PACKETS);
-	ifp->if_imcasts    += RD4(sc, FEC_RMON_R_MC_PKT);
-	ifp->if_ierrors    += RD4(sc, FEC_RMON_R_CRC_ALIGN);
-	ifp->if_ierrors    += RD4(sc, FEC_RMON_R_UNDERSIZE);
-	ifp->if_ierrors    += RD4(sc, FEC_RMON_R_OVERSIZE);
-	ifp->if_ierrors    += RD4(sc, FEC_RMON_R_FRAG);
-	ifp->if_ierrors    += RD4(sc, FEC_RMON_R_JAB);
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, RD4(sc, FEC_RMON_R_PACKETS));
+	if_inc_counter(ifp, IFCOUNTER_IMCASTS, RD4(sc, FEC_RMON_R_MC_PKT));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    RD4(sc, FEC_RMON_R_CRC_ALIGN) + RD4(sc, FEC_RMON_R_UNDERSIZE) +
+	    RD4(sc, FEC_RMON_R_OVERSIZE) + RD4(sc, FEC_RMON_R_FRAG) +
+	    RD4(sc, FEC_RMON_R_JAB));
 
-	ifp->if_opackets   += RD4(sc, FEC_RMON_T_PACKETS);
-	ifp->if_omcasts    += RD4(sc, FEC_RMON_T_MC_PKT);
-	ifp->if_oerrors    += RD4(sc, FEC_RMON_T_CRC_ALIGN);
-	ifp->if_oerrors    += RD4(sc, FEC_RMON_T_UNDERSIZE);
-	ifp->if_oerrors    += RD4(sc, FEC_RMON_T_OVERSIZE );
-	ifp->if_oerrors    += RD4(sc, FEC_RMON_T_FRAG);
-	ifp->if_oerrors    += RD4(sc, FEC_RMON_T_JAB);
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, RD4(sc, FEC_RMON_T_PACKETS));
+	if_inc_counter(ifp, IFCOUNTER_OMCASTS, RD4(sc, FEC_RMON_T_MC_PKT));
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    RD4(sc, FEC_RMON_T_CRC_ALIGN) + RD4(sc, FEC_RMON_T_UNDERSIZE) +
+	    RD4(sc, FEC_RMON_T_OVERSIZE) + RD4(sc, FEC_RMON_T_FRAG) +
+	    RD4(sc, FEC_RMON_T_JAB));
 
-	ifp->if_collisions += RD4(sc, FEC_RMON_T_COL);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, RD4(sc, FEC_RMON_T_COL));
 
 	ffec_clear_stats(sc);
 }
@@ -784,7 +782,7 @@ ffec_rxfinish_onebuf(struct ffec_softc *sc, int len)
 	 *  mbuf, which is still mapped and loaded.
 	 */
 	if ((newmbuf = ffec_alloc_mbufcl(sc)) == NULL) {
-		++sc->ifp->if_iqdrops;
+		if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1);
 		ffec_setup_rxdesc(sc, sc->rx_idx, 
 		    sc->rxdesc_ring[sc->rx_idx].buf_paddr);
 		return;
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 0a6180a7a7ae..c5f5dbac1a7a 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -48,27 +48,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/kthread.h>
 
 #include <sys/kdb.h>
-
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#include <machine/clock.h>	/* for DELAY() */
-#endif
-
 #include <sys/bus.h>		/* used by smbus and newbus */
 #include <machine/bus.h>
 
-#ifdef __DragonFly__
-#include "firewire.h"
-#include "firewirereg.h"
-#include "fwmem.h"
-#include "iec13213.h"
-#include "iec68113.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwmem.h>
 #include <dev/firewire/iec13213.h>
 #include <dev/firewire/iec68113.h>
-#endif
 
 struct crom_src_buf {
 	struct crom_src	src;
@@ -77,7 +64,7 @@ struct crom_src_buf {
 	struct crom_chunk hw;
 };
 
-int firewire_debug=0, try_bmr=1, hold_count=0;
+int firewire_debug = 0, try_bmr = 1, hold_count = 0;
 SYSCTL_INT(_debug, OID_AUTO, firewire_debug, CTLFLAG_RW, &firewire_debug, 0,
 	"FireWire driver debug flag");
 SYSCTL_NODE(_hw, OID_AUTO, firewire, CTLFLAG_RD, 0, "FireWire Subsystem");
@@ -93,22 +80,19 @@ MALLOC_DEFINE(M_FWXFER, "fw_xfer", "XFER/FireWire");
 
 devclass_t firewire_devclass;
 
-static void firewire_identify	(driver_t *, device_t);
-static int firewire_probe	(device_t);
-static int firewire_attach      (device_t);
-static int firewire_detach      (device_t);
-static int firewire_resume      (device_t);
+static void firewire_identify(driver_t *, device_t);
+static int firewire_probe(device_t);
+static int firewire_attach(device_t);
+static int firewire_detach(device_t);
+static int firewire_resume(device_t);
 static void firewire_xfer_timeout(void *, int);
-#if 0
-static int firewire_shutdown    (device_t);
-#endif
 static device_t firewire_add_child(device_t, u_int, const char *, int);
-static void fw_try_bmr (void *);
-static void fw_try_bmr_callback (struct fw_xfer *);
-static void fw_asystart (struct fw_xfer *);
-static int fw_get_tlabel (struct firewire_comm *, struct fw_xfer *);
-static void fw_bus_probe (struct firewire_comm *);
-static void fw_attach_dev (struct firewire_comm *);
+static void fw_try_bmr(void *);
+static void fw_try_bmr_callback(struct fw_xfer *);
+static void fw_asystart(struct fw_xfer *);
+static int fw_get_tlabel(struct firewire_comm *, struct fw_xfer *);
+static void fw_bus_probe(void *);
+static void fw_attach_dev(struct firewire_comm *);
 static void fw_bus_probe_thread(void *);
 #ifdef FW_VMACCESS
 static void fw_vmaccess (struct fw_xfer *);
@@ -131,6 +115,7 @@ static device_method_t firewire_methods[] = {
 
 	DEVMETHOD_END
 };
+
 char *linkspeed[] = {
 	"S100", "S200", "S400", "S800",
 	"S1600", "S3200", "undef", "undef"
@@ -189,8 +174,10 @@ fw_noderesolve_eui64(struct firewire_comm *fc, struct fw_eui64 *eui)
 	FW_GUNLOCK(fc);
 	splx(s);
 
-	if(fwdev == NULL) return NULL;
-	if(fwdev->status == FWDEVINVAL) return NULL;
+	if (fwdev == NULL)
+		return NULL;
+	if (fwdev->status == FWDEVINVAL)
+		return NULL;
 	return fwdev;
 }
 
@@ -207,8 +194,9 @@ fw_asyreq(struct firewire_comm *fc, int sub, struct fw_xfer *xfer)
 	int tcode;
 	struct tcode_info *info;
 
-	if(xfer == NULL) return EINVAL;
-	if(xfer->hand == NULL){
+	if (xfer == NULL)
+		return EINVAL;
+	if (xfer->hand == NULL) {
 		printf("hand == NULL\n");
 		return EINVAL;
 	}
@@ -246,17 +234,17 @@ fw_asyreq(struct firewire_comm *fc, int sub, struct fw_xfer *xfer)
 		len = fp->mode.rresb.len;
 	else
 		len = 0;
-	if (len != xfer->send.pay_len){
+	if (len != xfer->send.pay_len) {
 		printf("len(%d) != send.pay_len(%d) %s(%x)\n",
 		    len, xfer->send.pay_len, tcode_str[tcode], tcode);
-		return EINVAL; 
+		return EINVAL;
 	}
 
-	if(xferq->start == NULL){
+	if (xferq->start == NULL) {
 		printf("xferq->start == NULL\n");
 		return EINVAL;
 	}
-	if(!(xferq->queued < xferq->maxq)){
+	if (!(xferq->queued < xferq->maxq)) {
 		device_printf(fc->bdev, "Discard a packet (queued=%d)\n",
 			xferq->queued);
 		return EAGAIN;
@@ -275,6 +263,7 @@ fw_asyreq(struct firewire_comm *fc, int sub, struct fw_xfer *xfer)
 	fw_asystart(xfer);
 	return err;
 }
+
 /*
  * Wakeup blocked process.
  */
@@ -298,8 +287,8 @@ fw_xferwait(struct fw_xfer *xfer)
 	int err = 0;
 
 	mtx_lock(lock);
-	if ((xfer->flag & FWXF_WAKE) == 0)
-		err = msleep((void *)xfer, lock, PWAIT|PCATCH, "fw_xferwait", 0);
+	while ((xfer->flag & FWXF_WAKE) == 0)
+		err = msleep(xfer, lock, PWAIT|PCATCH, "fw_xferwait", 0);
 	mtx_unlock(lock);
 
 	return (err);
@@ -313,13 +302,14 @@ fw_asystart(struct fw_xfer *xfer)
 {
 	struct firewire_comm *fc = xfer->fc;
 	int s;
+
 	s = splfw();
 	/* Protect from interrupt/timeout */
 	FW_GLOCK(fc);
 	xfer->flag = FWXF_INQ;
 	STAILQ_INSERT_TAIL(&xfer->q->q, xfer, link);
 #if 0
-	xfer->q->queued ++;
+	xfer->q->queued++;
 #endif
 	FW_GUNLOCK(fc);
 	splx(s);
@@ -361,7 +351,7 @@ firewire_xfer_timeout(void *arg, int pending)
 
 	s = splfw();
 	mtx_lock(&fc->tlabel_lock);
-	for (i = 0; i < 0x40; i ++) {
+	for (i = 0; i < 0x40; i++) {
 		while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) {
 			if ((xfer->flag & FWXF_SENT) == 0)
 				/* not sent yet */
@@ -370,8 +360,8 @@ firewire_xfer_timeout(void *arg, int pending)
 				/* the rests are newer than this */
 				break;
 			device_printf(fc->bdev,
-				"split transaction timeout: "
-				"tl=0x%x flag=0x%02x\n", i, xfer->flag);
+			    "split transaction timeout: tl=0x%x flag=0x%02x\n",
+			    i, xfer->flag);
 			fw_dump_hdr(&xfer->send.hdr, "send");
 			xfer->resp = ETIMEDOUT;
 			xfer->tl = -1;
@@ -384,7 +374,7 @@ firewire_xfer_timeout(void *arg, int pending)
 	fc->timeout(fc);
 
 	STAILQ_FOREACH_SAFE(xfer, &xfer_timeout, tlabel, txfer)
-		xfer->hand(xfer);	
+		xfer->hand(xfer);
 }
 
 #define WATCHDOG_HZ 10
@@ -394,7 +384,7 @@ firewire_watchdog(void *arg)
 	struct firewire_comm *fc;
 	static int watchdog_clock = 0;
 
-	fc = (struct firewire_comm *)arg;
+	fc = arg;
 
 	/*
 	 * At boot stage, the device interrupt is disabled and
@@ -404,10 +394,10 @@ firewire_watchdog(void *arg)
 	if (watchdog_clock > WATCHDOG_HZ * 15)
 		taskqueue_enqueue(fc->taskqueue, &fc->task_timeout);
 	else
-		watchdog_clock ++;
+		watchdog_clock++;
 
 	callout_reset(&fc->timeout_callout, hz / WATCHDOG_HZ,
-			(void *)firewire_watchdog, (void *)fc);
+	    firewire_watchdog, fc);
 }
 
 /*
@@ -421,35 +411,36 @@ firewire_attach(device_t dev)
 	device_t pa = device_get_parent(dev);
 	struct firewire_comm *fc;
 
-	fc = (struct firewire_comm *)device_get_softc(pa);
+	fc = device_get_softc(pa);
 	sc->fc = fc;
 	fc->status = FWBUSNOTREADY;
 
 	unit = device_get_unit(dev);
-	if( fc->nisodma > FWMAXNDMA) fc->nisodma = FWMAXNDMA;
+	if (fc->nisodma > FWMAXNDMA)
+		fc->nisodma = FWMAXNDMA;
 
 	fwdev_makedev(sc);
 
-	fc->crom_src_buf = (struct crom_src_buf *)malloc(
-				sizeof(struct crom_src_buf),
-				M_FW, M_NOWAIT | M_ZERO);
+	fc->crom_src_buf = malloc(sizeof(struct crom_src_buf),
+	    M_FW, M_NOWAIT | M_ZERO);
 	if (fc->crom_src_buf == NULL) {
-		device_printf(fc->dev, "%s: Malloc Failure crom src buff\n", __func__);
+		device_printf(fc->dev,
+		    "%s: unable to allocate crom src buffer\n", __func__);
 		return ENOMEM;
 	}
-	fc->topology_map = (struct fw_topology_map *)malloc(
-				sizeof(struct fw_topology_map),
-				M_FW, M_NOWAIT | M_ZERO);
+	fc->topology_map = malloc(sizeof(struct fw_topology_map),
+	    M_FW, M_NOWAIT | M_ZERO);
 	if (fc->topology_map == NULL) {
-		device_printf(fc->dev, "%s: Malloc Failure topology map\n", __func__);
+		device_printf(fc->dev, "%s: unable to allocate topology map\n",
+		    __func__);
 		free(fc->crom_src_buf, M_FW);
 		return ENOMEM;
 	}
-	fc->speed_map = (struct fw_speed_map *)malloc(
-				sizeof(struct fw_speed_map),
-				M_FW, M_NOWAIT | M_ZERO);
+	fc->speed_map = malloc(sizeof(struct fw_speed_map),
+	    M_FW, M_NOWAIT | M_ZERO);
 	if (fc->speed_map == NULL) {
-		device_printf(fc->dev, "%s: Malloc Failure speed map\n", __func__);
+		device_printf(fc->dev, "%s: unable to allocate speed map\n",
+		    __func__);
 		free(fc->crom_src_buf, M_FW);
 		free(fc->topology_map, M_FW);
 		return ENOMEM;
@@ -460,14 +451,14 @@ firewire_attach(device_t dev)
 	CALLOUT_INIT(&fc->timeout_callout);
 	CALLOUT_INIT(&fc->bmr_callout);
 	CALLOUT_INIT(&fc->busprobe_callout);
-	TASK_INIT(&fc->task_timeout, 0, firewire_xfer_timeout, (void *)fc);
+	TASK_INIT(&fc->task_timeout, 0, firewire_xfer_timeout, fc);
 
 	callout_reset(&sc->fc->timeout_callout, hz,
-			(void *)firewire_watchdog, (void *)sc->fc);
+	    firewire_watchdog, sc->fc);
 
 	/* create thread */
-	kproc_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread,
-		0, 0, "fw%d_probe", unit);
+	kproc_create(fw_bus_probe_thread, fc, &fc->probe_thread,
+	    0, 0, "fw%d_probe", unit);
 
 	/* Locate our children */
 	bus_generic_probe(dev);
@@ -490,10 +481,10 @@ firewire_attach(device_t dev)
 static device_t
 firewire_add_child(device_t dev, u_int order, const char *name, int unit)
 {
-        device_t child;
+	device_t child;
 	struct firewire_softc *sc;
 
-	sc = (struct firewire_softc *)device_get_softc(dev);
+	sc = device_get_softc(dev);
 	child = device_add_child(dev, name, unit);
 	if (child) {
 		device_set_ivars(child, sc->fc);
@@ -508,16 +499,16 @@ firewire_resume(device_t dev)
 {
 	struct firewire_softc *sc;
 
-	sc = (struct firewire_softc *)device_get_softc(dev);
+	sc = device_get_softc(dev);
 	sc->fc->status = FWBUSNOTREADY;
-	
+
 	bus_generic_resume(dev);
 
-	return(0);
+	return (0);
 }
 
 /*
- * Dettach it.
+ * Detach it.
  */
 static int
 firewire_detach(device_t dev)
@@ -527,7 +518,7 @@ firewire_detach(device_t dev)
 	struct fw_device *fwdev, *fwdev_next;
 	int err;
 
-	sc = (struct firewire_softc *)device_get_softc(dev);
+	sc = device_get_softc(dev);
 	fc = sc->fc;
 	mtx_lock(&fc->wait_lock);
 	fc->status = FWBUSDETACH;
@@ -536,7 +527,7 @@ firewire_detach(device_t dev)
 		printf("firewire probe thread didn't die\n");
 	mtx_unlock(&fc->wait_lock);
 
-	if (fc->arq !=0 && fc->arq->maxq > 0)
+	if (fc->arq != 0 && fc->arq->maxq > 0)
 		fw_drain_txq(fc);
 
 	if ((err = fwdev_destroydev(sc)) != 0)
@@ -551,7 +542,7 @@ firewire_detach(device_t dev)
 
 	/* XXX xfer_free and untimeout on all xfers */
 	for (fwdev = STAILQ_FIRST(&fc->devices); fwdev != NULL;
-							fwdev = fwdev_next) {
+	     fwdev = fwdev_next) {
 		fwdev_next = STAILQ_NEXT(fwdev, link);
 		free(fwdev, M_FW);
 	}
@@ -561,16 +552,8 @@ firewire_detach(device_t dev)
 
 	mtx_destroy(&fc->tlabel_lock);
 	mtx_destroy(&fc->wait_lock);
-	return(0);
+	return (0);
 }
-#if 0
-static int
-firewire_shutdown( device_t dev )
-{
-	return 0;
-}
-#endif
-
 
 static void
 fw_xferq_drain(struct fw_xferq *xferq)
@@ -580,7 +563,7 @@ fw_xferq_drain(struct fw_xferq *xferq)
 	while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) {
 		STAILQ_REMOVE_HEAD(&xferq->q, link);
 #if 0
-		xferq->queued --;
+		xferq->queued--;
 #endif
 		xfer->resp = EAGAIN;
 		xfer->flag = FWXF_SENTERR;
@@ -600,12 +583,12 @@ fw_drain_txq(struct firewire_comm *fc)
 	FW_GLOCK(fc);
 	fw_xferq_drain(fc->atq);
 	fw_xferq_drain(fc->ats);
-	for(i = 0; i < fc->nisodma; i++)
+	for (i = 0; i < fc->nisodma; i++)
 		fw_xferq_drain(fc->it[i]);
 	FW_GUNLOCK(fc);
 
 	mtx_lock(&fc->tlabel_lock);
-	for (i = 0; i < 0x40; i ++)
+	for (i = 0; i < 0x40; i++)
 		while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) {
 			if (firewire_debug)
 				printf("tl=%d flag=%d\n", i, xfer->flag);
@@ -617,7 +600,7 @@ fw_drain_txq(struct firewire_comm *fc)
 	mtx_unlock(&fc->tlabel_lock);
 
 	STAILQ_FOREACH_SAFE(xfer, &xfer_drain, tlabel, txfer)
-		xfer->hand(xfer);	
+		xfer->hand(xfer);
 }
 
 static void
@@ -626,7 +609,7 @@ fw_reset_csr(struct firewire_comm *fc)
 	int i;
 
 	CSRARC(fc, STATE_CLEAR)
-			= 1 << 23 | 0 << 17 | 1 << 16 | 1 << 15 | 1 << 14 ;
+			= 1 << 23 | 0 << 17 | 1 << 16 | 1 << 15 | 1 << 14;
 	CSRARC(fc, STATE_SET) = CSRARC(fc, STATE_CLEAR);
 	CSRARC(fc, NODE_IDS) = 0x3f;
 
@@ -635,10 +618,10 @@ fw_reset_csr(struct firewire_comm *fc)
 
 	fc->max_node = -1;
 
-	for(i = 2; i < 0x100/4 - 2 ; i++){
+	for (i = 2; i < 0x100 / 4 - 2; i++) {
 		CSRARC(fc, SPED_MAP + i * 4) = 0;
 	}
-	CSRARC(fc, STATE_CLEAR) = 1 << 23 | 0 << 17 | 1 << 16 | 1 << 15 | 1 << 14 ;
+	CSRARC(fc, STATE_CLEAR) = 1 << 23 | 0 << 17 | 1 << 16 | 1 << 15 | 1 << 14;
 	CSRARC(fc, STATE_SET) = CSRARC(fc, STATE_CLEAR);
 	CSRARC(fc, RESET_START) = 0;
 	CSRARC(fc, SPLIT_TIMEOUT_HI) = 0;
@@ -654,14 +637,14 @@ fw_reset_csr(struct firewire_comm *fc)
 	CSRARC(fc, CONF_ROM) = 0x04 << 24;
 	CSRARC(fc, CONF_ROM + 4) = 0x31333934; /* means strings 1394 */
 	CSRARC(fc, CONF_ROM + 8) = 1 << 31 | 1 << 30 | 1 << 29 |
-				1 << 28 | 0xff << 16 | 0x09 << 8;
+	    1 << 28 | 0xff << 16 | 0x09 << 8;
 	CSRARC(fc, CONF_ROM + 0xc) = 0;
 
-/* DV depend CSRs see blue book */
-	CSRARC(fc, oPCR) &= ~DV_BROADCAST_ON; 
-	CSRARC(fc, iPCR) &= ~DV_BROADCAST_ON; 
+	/* DV depend CSRs see blue book */
+	CSRARC(fc, oPCR) &= ~DV_BROADCAST_ON;
+	CSRARC(fc, iPCR) &= ~DV_BROADCAST_ON;
 
-	CSRARC(fc, STATE_CLEAR) &= ~(1 << 23 | 1 << 15 | 1 << 14 );
+	CSRARC(fc, STATE_CLEAR) &= ~(1 << 23 | 1 << 15 | 1 << 14);
 	CSRARC(fc, STATE_SET) = CSRARC(fc, STATE_CLEAR);
 }
 
@@ -717,13 +700,8 @@ fw_reset_crom(struct firewire_comm *fc)
 	crom_add_entry(root, CSRKEY_NCAP, 0x0083c0); /* XXX */
 	/* private company_id */
 	crom_add_entry(root, CSRKEY_VENDOR, CSRVAL_VENDOR_PRIVATE);
-#ifdef __DragonFly__
-	crom_add_simple_text(src, root, &buf->vendor, "DragonFly Project");
-	crom_add_entry(root, CSRKEY_HW, __DragonFly_cc_version);
-#else
 	crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project");
 	crom_add_entry(root, CSRKEY_HW, __FreeBSD_version);
-#endif
 	mtx_lock(&prison0.pr_mtx);
 	crom_add_simple_text(src, root, &buf->hw, prison0.pr_hostname);
 	mtx_unlock(&prison0.pr_mtx);
@@ -754,8 +732,8 @@ fw_busreset(struct firewire_comm *fc, uint32_t new_status)
 	fw_reset_crom(fc);
 
 	if (device_get_children(fc->bdev, &devlistp, &devcnt) == 0) {
-		for( i = 0 ; i < devcnt ; i++)
-			if (device_get_state(devlistp[i]) >= DS_ATTACHED)  {
+		for (i = 0; i < devcnt; i++)
+			if (device_get_state(devlistp[i]) >= DS_ATTACHED) {
 				fdc = device_get_softc(devlistp[i]);
 				if (fdc->post_busreset != NULL)
 					fdc->post_busreset(fdc);
@@ -764,31 +742,30 @@ fw_busreset(struct firewire_comm *fc, uint32_t new_status)
 	}
 
 	src = &fc->crom_src_buf->src;
-        /*
-         * If the old config rom needs to be overwritten,
-         * bump the businfo.generation indicator to 
-         * indicate that we need to be reprobed
-         * See 1394a-2000 8.3.2.5.4 for more details.
-         * generation starts at 2 and rolls over at 0xF
-         * back to 2.
-         * 
-         * A generation of 0 indicates a device
-         * that is not 1394a-2000 compliant.
-         * A generation of 1 indicates a device that
-         * does not change it's Bus Info Block or 
-         * Configuration ROM.
-         */
+	/*
+	 * If the old config rom needs to be overwritten,
+	 * bump the businfo.generation indicator to
+	 * indicate that we need to be reprobed
+	 * See 1394a-2000 8.3.2.5.4 for more details.
+	 * generation starts at 2 and rolls over at 0xF
+	 * back to 2.
+	 *
+	 * A generation of 0 indicates a device
+	 * that is not 1394a-2000 compliant.
+	 * A generation of 1 indicates a device that
+	 * does not change it's Bus Info Block or
+	 * Configuration ROM.
+	 */
 #define FW_MAX_GENERATION 0xF
 	newrom = malloc(CROMSIZE, M_FW, M_NOWAIT | M_ZERO);
 	src = &fc->crom_src_buf->src;
 	crom_load(src, newrom, CROMSIZE);
 	if (bcmp(newrom, fc->config_rom, CROMSIZE) != 0) {
-		if ( src->businfo.generation++ > FW_MAX_GENERATION )
+		if (src->businfo.generation++ > FW_MAX_GENERATION)
 			src->businfo.generation = FW_GENERATION_CHANGEABLE;
-		bcopy(newrom, (void *)fc->config_rom, CROMSIZE);
+		bcopy(newrom, fc->config_rom, CROMSIZE);
 	}
 	free(newrom, M_FW);
-
 }
 
 /* Call once after reboot */
@@ -818,7 +795,7 @@ void fw_init(struct firewire_comm *fc)
 	STAILQ_INIT(&fc->atq->q);
 	STAILQ_INIT(&fc->ats->q);
 
-	for( i = 0 ; i < fc->nisodma ; i ++ ){
+	for (i = 0; i < fc->nisodma; i++) {
 		fc->it[i]->queued = 0;
 		fc->ir[i]->queued = 0;
 
@@ -840,7 +817,7 @@ void fw_init(struct firewire_comm *fc)
 	fc->atq->maxq = FWMAXQUEUE;
 	fc->ats->maxq = FWMAXQUEUE;
 
-	for( i = 0 ; i < fc->nisodma ; i++){
+	for (i = 0; i < fc->nisodma; i++) {
 		fc->ir[i]->maxq = FWMAXQUEUE;
 		fc->it[i]->maxq = FWMAXQUEUE;
 	}
@@ -852,9 +829,9 @@ void fw_init(struct firewire_comm *fc)
 
 	STAILQ_INIT(&fc->devices);
 
-/* Initialize Async handlers */
+	/* Initialize Async handlers */
 	STAILQ_INIT(&fc->binds);
-	for( i = 0 ; i < 0x40 ; i++){
+	for (i = 0; i < 0x40; i++) {
 		STAILQ_INIT(&fc->tlabels[i]);
 	}
 
@@ -862,14 +839,14 @@ void fw_init(struct firewire_comm *fc)
 #if 0
 	CSRARC(fc, oMPR) = 0x3fff0001; /* # output channel = 1 */
 	CSRARC(fc, oPCR) = 0x8000007a;
-	for(i = 4 ; i < 0x7c/4 ; i+=4){
-		CSRARC(fc, i + oPCR) = 0x8000007a; 
+	for (i = 4; i < 0x7c/4; i += 4) {
+		CSRARC(fc, i + oPCR) = 0x8000007a;
 	}
- 
+
 	CSRARC(fc, iMPR) = 0x00ff0001; /* # input channel = 1 */
 	CSRARC(fc, iPCR) = 0x803f0000;
-	for(i = 4 ; i < 0x7c/4 ; i+=4){
-		CSRARC(fc, i + iPCR) = 0x0; 
+	for (i = 4; i < 0x7c/4; i += 4) {
+		CSRARC(fc, i + iPCR) = 0x0;
 	}
 #endif
 
@@ -877,10 +854,11 @@ void fw_init(struct firewire_comm *fc)
 
 #ifdef FW_VMACCESS
 	xfer = fw_xfer_alloc();
-	if(xfer == NULL) return;
+	if (xfer == NULL)
+		return;
 
-	fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_FW, M_NOWAIT);
-	if(fwb == NULL){
+	fwb = malloc(sizeof(struct fw_bind), M_FW, M_NOWAIT);
+	if (fwb == NULL) {
 		fw_xfer_free(xfer);
 		return;
 	}
@@ -896,8 +874,8 @@ void fw_init(struct firewire_comm *fc)
 #endif
 }
 
-#define BIND_CMP(addr, fwb) (((addr) < (fwb)->start)?-1:\
-    ((fwb)->end < (addr))?1:0)
+#define BIND_CMP(addr, fwb) (((addr) < (fwb)->start)? -1 : \
+    ((fwb)->end < (addr)) ? 1 : 0)
 
 /*
  * To lookup bound process from IEEE1394 address.
@@ -916,7 +894,7 @@ fw_bindlookup(struct firewire_comm *fc, uint16_t dest_hi, uint32_t dest_lo)
 			break;
 		}
 	FW_GUNLOCK(fc);
-	return(r);
+	return (r);
 }
 
 /*
@@ -1001,7 +979,7 @@ fw_xferlist_add(struct fw_xferlist *q, struct malloc_type *type,
 	for (i = 0; i < n; i++) {
 		xfer = fw_xfer_alloc_buf(type, slen, rlen);
 		if (xfer == NULL)
-			return (n);
+			return (i);
 		xfer->fc = fc;
 		xfer->sc = sc;
 		xfer->hand = hand;
@@ -1018,10 +996,10 @@ fw_xferlist_remove(struct fw_xferlist *q)
 	struct fw_xfer *xfer, *next;
 
 	for (xfer = STAILQ_FIRST(q); xfer != NULL; xfer = next) {
-                next = STAILQ_NEXT(xfer, link);
-                fw_xfer_free_buf(xfer);
-        }
-        STAILQ_INIT(q);
+		next = STAILQ_NEXT(xfer, link);
+		fw_xfer_free_buf(xfer);
+	}
+	STAILQ_INIT(q);
 }
 /*
  * dump packet header
@@ -1052,9 +1030,9 @@ fw_tl_free(struct firewire_comm *fc, struct fw_xfer *xfer)
 		mtx_unlock(&fc->tlabel_lock);
 		return;
 	}
-#if 1	/* make sure the label is allocated */
+	/* make sure the label is allocated */
 	STAILQ_FOREACH(txfer, &fc->tlabels[xfer->tl], tlabel)
-		if(txfer == xfer)
+		if (txfer == xfer)
 			break;
 	if (txfer == NULL) {
 		printf("%s: the xfer is not in the queue "
@@ -1067,7 +1045,6 @@ fw_tl_free(struct firewire_comm *fc, struct fw_xfer *xfer)
 		splx(s);
 		return;
 	}
-#endif
 
 	STAILQ_REMOVE(&fc->tlabels[xfer->tl], xfer, fw_xfer, tlabel);
 	xfer->tl = -1;
@@ -1088,7 +1065,7 @@ fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel, int tcode)
 
 	mtx_lock(&fc->tlabel_lock);
 	STAILQ_FOREACH(xfer, &fc->tlabels[tlabel], tlabel)
-		if(xfer->send.hdr.mode.hdr.dst == node) {
+		if (xfer->send.hdr.mode.hdr.dst == node) {
 			mtx_unlock(&fc->tlabel_lock);
 			splx(s);
 			KASSERT(xfer->tl == tlabel,
@@ -1099,18 +1076,18 @@ fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel, int tcode)
 				printf("%s: invalid response tcode "
 				    "(0x%x for 0x%x)\n", __FUNCTION__,
 				    tcode, req);
-				return(NULL);
+				return (NULL);
 			}
-			
+
 			if (firewire_debug > 2)
 				printf("fw_tl2xfer: found tl=%d\n", tlabel);
-			return(xfer);
+			return (xfer);
 		}
 	mtx_unlock(&fc->tlabel_lock);
 	if (firewire_debug > 1)
 		printf("fw_tl2xfer: not found tl=%d\n", tlabel);
 	splx(s);
-	return(NULL);
+	return (NULL);
 }
 
 /*
@@ -1137,14 +1114,14 @@ fw_xfer_alloc_buf(struct malloc_type *type, int send_len, int recv_len)
 
 	xfer = fw_xfer_alloc(type);
 	if (xfer == NULL)
-		return(NULL);
+		return (NULL);
 	xfer->send.pay_len = send_len;
 	xfer->recv.pay_len = recv_len;
 	if (send_len > 0) {
 		xfer->send.payload = malloc(send_len, type, M_NOWAIT | M_ZERO);
 		if (xfer->send.payload == NULL) {
 			fw_xfer_free(xfer);
-			return(NULL);
+			return (NULL);
 		}
 	}
 	if (recv_len > 0) {
@@ -1153,10 +1130,10 @@ fw_xfer_alloc_buf(struct malloc_type *type, int send_len, int recv_len)
 			if (xfer->send.payload != NULL)
 				free(xfer->send.payload, type);
 			fw_xfer_free(xfer);
-			return(NULL);
+			return (NULL);
 		}
 	}
-	return(xfer);
+	return (xfer);
 }
 
 /*
@@ -1178,18 +1155,19 @@ fw_xfer_done(struct fw_xfer *xfer)
 }
 
 void
-fw_xfer_unload(struct fw_xfer* xfer)
+fw_xfer_unload(struct fw_xfer *xfer)
 {
 	int s;
 
-	if(xfer == NULL ) return;
-	if(xfer->flag & FWXF_INQ){
+	if (xfer == NULL)
+		return;
+	if (xfer->flag & FWXF_INQ) {
 		printf("fw_xfer_free FWXF_INQ\n");
 		s = splfw();
 		FW_GLOCK(xfer->fc);
 		STAILQ_REMOVE(&xfer->q->q, xfer, fw_xfer, link);
 #if 0
-		xfer->q->queued --;
+		xfer->q->queued--;
 #endif
 		FW_GUNLOCK(xfer->fc);
 		splx(s);
@@ -1201,7 +1179,7 @@ fw_xfer_unload(struct fw_xfer* xfer)
 		 */
 		fw_tl_free(xfer->fc, xfer);
 #if 1
-		if(xfer->flag & FWXF_START)
+		if (xfer->flag & FWXF_START)
 			/*
 			 * This could happen if:
 			 *  1. We call fwohci_arcv() before fwohci_txd().
@@ -1213,28 +1191,27 @@ fw_xfer_unload(struct fw_xfer* xfer)
 	xfer->flag = FWXF_INIT;
 	xfer->resp = 0;
 }
+
 /*
- * To free IEEE1394 XFER structure. 
+ * To free IEEE1394 XFER structure.
  */
 void
-fw_xfer_free_buf( struct fw_xfer* xfer)
+fw_xfer_free_buf(struct fw_xfer *xfer)
 {
 	if (xfer == NULL) {
 		printf("%s: xfer == NULL\n", __func__);
 		return;
 	}
 	fw_xfer_unload(xfer);
-	if(xfer->send.payload != NULL){
+	if (xfer->send.payload != NULL)
 		free(xfer->send.payload, xfer->malloc);
-	}
-	if(xfer->recv.payload != NULL){
+	if (xfer->recv.payload != NULL)
 		free(xfer->recv.payload, xfer->malloc);
-	}
 	free(xfer, xfer->malloc);
 }
 
 void
-fw_xfer_free( struct fw_xfer* xfer)
+fw_xfer_free(struct fw_xfer *xfer)
 {
 	if (xfer == NULL) {
 		printf("%s: xfer == NULL\n", __func__);
@@ -1255,7 +1232,7 @@ fw_asy_callback_free(struct fw_xfer *xfer)
 }
 
 /*
- * To configure PHY. 
+ * To configure PHY.
  */
 static void
 fw_phy_config(struct firewire_comm *fc, int root_node, int gap_count)
@@ -1274,9 +1251,9 @@ fw_phy_config(struct firewire_comm *fc, int root_node, int gap_count)
 	fp = &xfer->send.hdr;
 	fp->mode.ld[1] = 0;
 	if (root_node >= 0)
-		fp->mode.ld[1] |= (root_node & 0x3f) << 24 | 1 << 23;
+		fp->mode.ld[1] |= (1 << 23) | (root_node & 0x3f) << 24;
 	if (gap_count >= 0)
-		fp->mode.ld[1] |= 1 << 22 | (gap_count & 0x3f) << 16;
+		fp->mode.ld[1] |= (1 << 22) | (gap_count & 0x3f) << 16;
 	fp->mode.ld[2] = ~fp->mode.ld[1];
 /* XXX Dangerous, how to pass PHY packet to device driver */
 	fp->mode.common.tcode |= FWTCODE_PHY;
@@ -1288,113 +1265,107 @@ fw_phy_config(struct firewire_comm *fc, int root_node, int gap_count)
 }
 
 /*
- * Dump self ID. 
+ * Dump self ID.
  */
 static void
 fw_print_sid(uint32_t sid)
 {
 	union fw_self_id *s;
 	s = (union fw_self_id *) &sid;
-	if ( s->p0.sequel ) {
-		if ( s->p1.sequence_num == FW_SELF_ID_PAGE0 ) {
+	if (s->p0.sequel) {
+		if (s->p1.sequence_num == FW_SELF_ID_PAGE0) {
 			printf("node:%d p3:%d p4:%d p5:%d p6:%d p7:%d"
-				"p8:%d p9:%d p10:%d\n",
-				s->p1.phy_id, s->p1.port3, s->p1.port4,
-				s->p1.port5, s->p1.port6, s->p1.port7,
-				s->p1.port8, s->p1.port9, s->p1.port10);
-		} else if (s->p2.sequence_num == FW_SELF_ID_PAGE1 ){
+			    "p8:%d p9:%d p10:%d\n",
+			    s->p1.phy_id, s->p1.port3, s->p1.port4,
+			    s->p1.port5, s->p1.port6, s->p1.port7,
+			    s->p1.port8, s->p1.port9, s->p1.port10);
+		} else if (s->p2.sequence_num == FW_SELF_ID_PAGE1) {
 			printf("node:%d p11:%d p12:%d p13:%d p14:%d p15:%d\n",
-				s->p2.phy_id, s->p2.port11, s->p2.port12,
-				s->p2.port13, s->p2.port14, s->p2.port15);
+			    s->p2.phy_id, s->p2.port11, s->p2.port12,
+			    s->p2.port13, s->p2.port14, s->p2.port15);
 		} else {
 			printf("node:%d Unknown Self ID Page number %d\n",
-				s->p1.phy_id, s->p1.sequence_num);
+			    s->p1.phy_id, s->p1.sequence_num);
 		}
 	} else {
 		printf("node:%d link:%d gap:%d spd:%d con:%d pwr:%d"
-			" p0:%d p1:%d p2:%d i:%d m:%d\n",
-			s->p0.phy_id, s->p0.link_active, s->p0.gap_count,
-			s->p0.phy_speed, s->p0.contender,
-			s->p0.power_class, s->p0.port0, s->p0.port1,
-			s->p0.port2, s->p0.initiated_reset, s->p0.more_packets);
+		    " p0:%d p1:%d p2:%d i:%d m:%d\n",
+		    s->p0.phy_id, s->p0.link_active, s->p0.gap_count,
+		    s->p0.phy_speed, s->p0.contender,
+		    s->p0.power_class, s->p0.port0, s->p0.port1,
+		    s->p0.port2, s->p0.initiated_reset, s->p0.more_packets);
 	}
 }
 
 /*
- * To receive self ID. 
+ * To receive self ID.
  */
-void fw_sidrcv(struct firewire_comm* fc, uint32_t *sid, u_int len)
+void fw_sidrcv(struct firewire_comm *fc, uint32_t *sid, u_int len)
 {
 	uint32_t *p;
 	union fw_self_id *self_id;
 	u_int i, j, node, c_port = 0, i_branch = 0;
 
-	fc->sid_cnt = len /(sizeof(uint32_t) * 2);
+	fc->sid_cnt = len / (sizeof(uint32_t) * 2);
 	fc->max_node = fc->nodeid & 0x3f;
 	CSRARC(fc, NODE_IDS) = ((uint32_t)fc->nodeid) << 16;
 	fc->status = FWBUSCYMELECT;
 	fc->topology_map->crc_len = 2;
-	fc->topology_map->generation ++;
+	fc->topology_map->generation++;
 	fc->topology_map->self_id_count = 0;
-	fc->topology_map->node_count = 0;
-	fc->speed_map->generation ++;
-	fc->speed_map->crc_len = 1 + (64*64 + 3) / 4;
+	fc->topology_map->node_count= 0;
+	fc->speed_map->generation++;
+	fc->speed_map->crc_len = 1 + (64 * 64 + 3) / 4;
 	self_id = &fc->topology_map->self_id[0];
-	for(i = 0; i < fc->sid_cnt; i ++){
+	for (i = 0; i < fc->sid_cnt; i++) {
 		if (sid[1] != ~sid[0]) {
-			device_printf(fc->bdev, "%s: ERROR invalid self-id packet\n",
-						__func__);
+			device_printf(fc->bdev,
+			    "%s: ERROR invalid self-id packet\n", __func__);
 			sid += 2;
 			continue;
 		}
 		*self_id = *((union fw_self_id *)sid);
 		fc->topology_map->crc_len++;
-		if(self_id->p0.sequel == 0){
-			fc->topology_map->node_count ++;
+		if (self_id->p0.sequel == 0) {
+			fc->topology_map->node_count++;
 			c_port = 0;
 			if (firewire_debug)
 				fw_print_sid(sid[0]);
 			node = self_id->p0.phy_id;
-			if(fc->max_node < node){
+			if (fc->max_node < node)
 				fc->max_node = self_id->p0.phy_id;
-			}
 			/* XXX I'm not sure this is the right speed_map */
-			fc->speed_map->speed[node][node]
-					= self_id->p0.phy_speed;
-			for (j = 0; j < node; j ++) {
-				fc->speed_map->speed[j][node]
-					= fc->speed_map->speed[node][j]
-					= min(fc->speed_map->speed[j][j],
-							self_id->p0.phy_speed);
+			fc->speed_map->speed[node][node] =
+			    self_id->p0.phy_speed;
+			for (j = 0; j < node; j++) {
+				fc->speed_map->speed[j][node] =
+				    fc->speed_map->speed[node][j] =
+				    min(fc->speed_map->speed[j][j],
+					self_id->p0.phy_speed);
 			}
 			if ((fc->irm == -1 || self_id->p0.phy_id > fc->irm) &&
-			  (self_id->p0.link_active && self_id->p0.contender)) {
+			  (self_id->p0.link_active && self_id->p0.contender))
 				fc->irm = self_id->p0.phy_id;
-			}
-			if(self_id->p0.port0 >= 0x2){
+			if (self_id->p0.port0 >= 0x2)
 				c_port++;
-			}
-			if(self_id->p0.port1 >= 0x2){
+			if (self_id->p0.port1 >= 0x2)
 				c_port++;
-			}
-			if(self_id->p0.port2 >= 0x2){
+			if (self_id->p0.port2 >= 0x2)
 				c_port++;
-			}
 		}
-		if(c_port > 2){
+		if (c_port > 2)
 			i_branch += (c_port - 2);
-		}
 		sid += 2;
 		self_id++;
-		fc->topology_map->self_id_count ++;
+		fc->topology_map->self_id_count++;
 	}
 	/* CRC */
 	fc->topology_map->crc = fw_crc16(
-			(uint32_t *)&fc->topology_map->generation,
-			fc->topology_map->crc_len * 4);
+	    (uint32_t *)&fc->topology_map->generation,
+	    fc->topology_map->crc_len * 4);
 	fc->speed_map->crc = fw_crc16(
-			(uint32_t *)&fc->speed_map->generation,
-			fc->speed_map->crc_len * 4);
+	    (uint32_t *)&fc->speed_map->generation,
+	    fc->speed_map->crc_len * 4);
 	/* byteswap and copy to CSR */
 	p = (uint32_t *)fc->topology_map;
 	for (i = 0; i <= fc->topology_map->crc_len; i++)
@@ -1403,14 +1374,13 @@ void fw_sidrcv(struct firewire_comm* fc, uint32_t *sid, u_int len)
 	CSRARC(fc, SPED_MAP) = htonl(*p++);
 	CSRARC(fc, SPED_MAP + 4) = htonl(*p++);
 	/* don't byte-swap uint8_t array */
-	bcopy(p, &CSRARC(fc, SPED_MAP + 8), (fc->speed_map->crc_len - 1)*4);
+	bcopy(p, &CSRARC(fc, SPED_MAP + 8), (fc->speed_map->crc_len - 1) * 4);
 
 	fc->max_hop = fc->max_node - i_branch;
 	device_printf(fc->bdev, "%d nodes, maxhop <= %d %s irm(%d) %s\n",
-			fc->max_node + 1, fc->max_hop,
-			(fc->irm == -1) ? "Not IRM capable" : "cable IRM",
-			fc->irm,
-			(fc->irm == fc->nodeid) ? " (me) " : "");
+	    fc->max_node + 1, fc->max_hop,
+	    (fc->irm == -1) ? "Not IRM capable" : "cable IRM",
+	    fc->irm, (fc->irm == fc->nodeid) ? " (me) " : "");
 
 	if (try_bmr && (fc->irm != -1) && (CSRARC(fc, BUS_MGR_ID) == 0x3f)) {
 		if (fc->irm == fc->nodeid) {
@@ -1419,26 +1389,27 @@ void fw_sidrcv(struct firewire_comm* fc, uint32_t *sid, u_int len)
 			fw_bmr(fc);
 		} else {
 			fc->status = FWBUSMGRELECT;
-			callout_reset(&fc->bmr_callout, hz/8,
-				(void *)fw_try_bmr, (void *)fc);
+			callout_reset(&fc->bmr_callout, hz / 8,
+			    fw_try_bmr, fc);
 		}
 	} else
 		fc->status = FWBUSMGRDONE;
 
-	callout_reset(&fc->busprobe_callout, hz/4,
-			(void *)fw_bus_probe, (void *)fc);
+	callout_reset(&fc->busprobe_callout, hz / 4, fw_bus_probe, fc);
 }
 
 /*
- * To probe devices on the IEEE1394 bus. 
+ * To probe devices on the IEEE1394 bus.
  */
 static void
-fw_bus_probe(struct firewire_comm *fc)
+fw_bus_probe(void *arg)
 {
-	int s;
+	struct firewire_comm *fc;
 	struct fw_device *fwdev;
+	int s;
 
 	s = splfw();
+	fc = arg;
 	fc->status = FWBUSEXPLORE;
 
 	/* Invalidate all devices, just after bus reset. */
@@ -1462,7 +1433,7 @@ fw_bus_probe(struct firewire_comm *fc)
 		}
 	splx(s);
 
-	wakeup((void *)fc);
+	wakeup(fc);
 }
 
 static int
@@ -1473,10 +1444,9 @@ fw_explore_read_quads(struct fw_device *fwdev, int offset,
 	uint32_t tmp;
 	int i, error;
 
-	for (i = 0; i < length; i ++, offset += sizeof(uint32_t)) {
-		xfer = fwmem_read_quad(fwdev, NULL, -1,
-		    0xffff, 0xf0000000 | offset, (void *)&tmp,
-		    fw_xferwake);
+	for (i = 0; i < length; i++, offset += sizeof(uint32_t)) {
+		xfer = fwmem_read_quad(fwdev, NULL, -1, 0xffff,
+		    0xf0000000 | offset, &tmp, fw_xferwake);
 		if (xfer == NULL)
 			return (-1);
 		fw_xferwait(xfer);
@@ -1500,14 +1470,14 @@ fw_explore_csrblock(struct fw_device *fwdev, int offset, int recur)
 	struct csrdirectory *dir;
 	struct csrreg *reg;
 
-	dir = (struct csrdirectory *)&fwdev->csrrom[offset/sizeof(uint32_t)];
+	dir = (struct csrdirectory *)&fwdev->csrrom[offset / sizeof(uint32_t)];
 	err = fw_explore_read_quads(fwdev, CSRROMOFF + offset,
 	    (uint32_t *)dir, 1);
 	if (err)
 		return (-1);
 
 	offset += sizeof(uint32_t);
-	reg = (struct csrreg *)&fwdev->csrrom[offset/sizeof(uint32_t)];
+	reg = (struct csrreg *)&fwdev->csrrom[offset / sizeof(uint32_t)];
 	err = fw_explore_read_quads(fwdev, CSRROMOFF + offset,
 	    (uint32_t *)reg, dir->crc_len);
 	if (err)
@@ -1522,7 +1492,7 @@ fw_explore_csrblock(struct fw_device *fwdev, int offset, int recur)
 	if (recur == 0)
 		return (0);
 
-	for (i = 0; i < dir->crc_len; i ++, offset += sizeof(uint32_t)) {
+	for (i = 0; i < dir->crc_len; i++, offset += sizeof(uint32_t)) {
 		if ((reg[i].key & CSRTYPE_MASK) == CSRTYPE_D)
 			recur = 1;
 		else if ((reg[i].key & CSRTYPE_MASK) == CSRTYPE_L)
@@ -1533,7 +1503,7 @@ fw_explore_csrblock(struct fw_device *fwdev, int offset, int recur)
 		off = offset + reg[i].val * sizeof(uint32_t);
 		if (off > CROMSIZE) {
 			printf("%s: invalid offset %d\n", __FUNCTION__, off);
-			return(-1);
+			return (-1);
 		}
 		err = fw_explore_csrblock(fwdev, off, recur);
 		if (err)
@@ -1560,15 +1530,14 @@ fw_explore_node(struct fw_device *dfwdev)
 	/* First quad */
 	err = fw_explore_read_quads(dfwdev, CSRROMOFF, &csr[0], 1);
 	if (err) {
-		device_printf(fc->bdev, "%s: node%d: explore_read_quads failure\n",
-		    __func__, node);
 		dfwdev->status = FWDEVINVAL;
 		return (-1);
 	}
 	hdr = (struct csrhdr *)&csr[0];
 	if (hdr->info_len != 4) {
 		if (firewire_debug)
-			device_printf(fc->bdev, "%s: node%d: wrong bus info len(%d)\n",
+			device_printf(fc->bdev,
+			    "%s: node%d: wrong bus info len(%d)\n",
 			    __func__, node, hdr->info_len);
 		dfwdev->status = FWDEVINVAL;
 		return (-1);
@@ -1577,29 +1546,25 @@ fw_explore_node(struct fw_device *dfwdev)
 	/* bus info */
 	err = fw_explore_read_quads(dfwdev, CSRROMOFF + 0x04, &csr[1], 4);
 	if (err) {
-		device_printf(fc->bdev, "%s: node%d: error reading 0x04\n",
-		    __func__, node);
 		dfwdev->status = FWDEVINVAL;
 		return (-1);
 	}
 	binfo = (struct bus_info *)&csr[1];
 	if (binfo->bus_name != CSR_BUS_NAME_IEEE1394) {
-		device_printf(fc->bdev, "%s: node%d: invalid bus name 0x%08x\n",
-		    __func__, node, binfo->bus_name);
 		dfwdev->status = FWDEVINVAL;
 		return (-1);
 	}
 
 	if (firewire_debug)
 		device_printf(fc->bdev, "%s: node(%d) BUS INFO BLOCK:\n"
-					"irmc(%d) cmc(%d) isc(%d) bmc(%d) pmc(%d) "
-					"cyc_clk_acc(%d) max_rec(%d) max_rom(%d) "
-					"generation(%d) link_spd(%d)\n",
-					__func__, node,
-					binfo->irmc, binfo->cmc, binfo->isc,
-					binfo->bmc, binfo->pmc, binfo->cyc_clk_acc,
-					binfo->max_rec, binfo->max_rom,
-					binfo->generation, binfo->link_spd);
+		    "irmc(%d) cmc(%d) isc(%d) bmc(%d) pmc(%d) "
+		    "cyc_clk_acc(%d) max_rec(%d) max_rom(%d) "
+		    "generation(%d) link_spd(%d)\n",
+		    __func__, node,
+		    binfo->irmc, binfo->cmc, binfo->isc,
+		    binfo->bmc, binfo->pmc, binfo->cyc_clk_acc,
+		    binfo->max_rec, binfo->max_rom,
+		    binfo->generation, binfo->link_spd);
 
 	STAILQ_FOREACH(fwdev, &fc->devices, link)
 		if (FW_EUI64_EQUAL(fwdev->eui, binfo->eui64))
@@ -1607,7 +1572,7 @@ fw_explore_node(struct fw_device *dfwdev)
 	if (fwdev == NULL) {
 		/* new device */
 		fwdev = malloc(sizeof(struct fw_device), M_FW,
-						M_NOWAIT | M_ZERO);
+		    M_NOWAIT | M_ZERO);
 		if (fwdev == NULL) {
 			device_printf(fc->bdev, "%s: node%d: no memory\n",
 					__func__, node);
@@ -1621,16 +1586,15 @@ fw_explore_node(struct fw_device *dfwdev)
 
 		/*
 		 * Pre-1394a-2000 didn't have link_spd in
-		 * the Bus Info block, so try and use the 
+		 * the Bus Info block, so try and use the
 		 * speed map value.
 		 * 1394a-2000 compliant devices only use
 		 * the Bus Info Block link spd value, so
 		 * ignore the speed map alltogether. SWB
 		 */
-		if ( binfo->link_spd == FWSPD_S100 /* 0 */) {
+		if (binfo->link_spd == FWSPD_S100 /* 0 */) {
 			device_printf(fc->bdev, "%s: "
-				"Pre 1394a-2000 detected\n",
-				__func__);
+			    "Pre 1394a-2000 detected\n", __func__);
 			fwdev->speed = fc->speed_map->speed[fc->nodeid][node];
 		} else
 			fwdev->speed = binfo->link_spd;
@@ -1640,20 +1604,19 @@ fw_explore_node(struct fw_device *dfwdev)
 		 */
 		while (fwdev->speed > FWSPD_S100 /* 0 */) {
 			err = fw_explore_read_quads(fwdev, CSRROMOFF,
-            				&speed_test, 1);
+			    &speed_test, 1);
 			if (err) {
-				device_printf(fc->bdev, "%s: fwdev->speed(%s)"
-						" decremented due to negotiation\n",
-						__func__,
-						linkspeed[fwdev->speed]);
+				device_printf(fc->bdev,
+				    "%s: fwdev->speed(%s) decremented due to negotiation\n",
+				    __func__, linkspeed[fwdev->speed]);
 				fwdev->speed--;
 			} else
 				break;
-				
+
 		}
 
 		/*
-		 * If the fwdev is not found in the 
+		 * If the fwdev is not found in the
 		 * fc->devices TAILQ, then we will add it.
 		 */
 		pfwdev = NULL;
@@ -1668,17 +1631,14 @@ fw_explore_node(struct fw_device *dfwdev)
 			STAILQ_INSERT_HEAD(&fc->devices, fwdev, link);
 		else
 			STAILQ_INSERT_AFTER(&fc->devices, pfwdev, fwdev, link);
-
-		device_printf(fc->bdev, "New %s device ID:%08x%08x\n",
-		    linkspeed[fwdev->speed],
-		    fwdev->eui.hi, fwdev->eui.lo);
 	} else {
 		fwdev->dst = node;
 		fwdev->status = FWDEVINIT;
 		/* unchanged ? */
 		if (bcmp(&csr[0], &fwdev->csrrom[0], sizeof(uint32_t) * 5) == 0) {
 			if (firewire_debug)
-				device_printf(fc->dev, "node%d: crom unchanged\n", node);
+				device_printf(fc->dev,
+				    "node%d: crom unchanged\n", node);
 			return (0);
 		}
 	}
@@ -1736,53 +1696,54 @@ fw_explore(struct firewire_comm *fc)
 	dfwdev.maxrec = 8; /* 512 */
 	dfwdev.status = FWDEVINIT;
 
-	for (node = 0; node <= fc->max_node; node ++) {
+	for (node = 0; node <= fc->max_node; node++) {
 		/* We don't probe myself and linkdown nodes */
 		if (node == fc->nodeid) {
 			if (firewire_debug)
 				device_printf(fc->bdev, "%s:"
-					"found myself node(%d) fc->nodeid(%d) fc->max_node(%d)\n",
-					__func__, node, fc->nodeid, fc->max_node);
+				    "found myself node(%d) fc->nodeid(%d) fc->max_node(%d)\n",
+				    __func__, node, fc->nodeid, fc->max_node);
 			continue;
 		} else if (firewire_debug) {
 			device_printf(fc->bdev, "%s:"
-				"node(%d) fc->max_node(%d) found\n",
-				__func__, node, fc->max_node);
+			    "node(%d) fc->max_node(%d) found\n",
+			    __func__, node, fc->max_node);
 		}
 		fwsid = fw_find_self_id(fc, node);
 		if (!fwsid || !fwsid->p0.link_active) {
 			if (firewire_debug)
-				device_printf(fc->bdev, "%s: node%d: link down\n",
-							__func__, node);
+				device_printf(fc->bdev,
+				    "%s: node%d: link down\n",
+				    __func__, node);
 			continue;
 		}
 		nodes[todo++] = node;
 	}
 
 	s = splfw();
-	for (trys = 0; todo > 0 && trys < 3; trys ++) {
+	for (trys = 0; todo > 0 && trys < 3; trys++) {
 		todo2 = 0;
-		for (i = 0; i < todo; i ++) {
+		for (i = 0; i < todo; i++) {
 			dfwdev.dst = nodes[i];
 			err = fw_explore_node(&dfwdev);
 			if (err)
 				nodes[todo2++] = nodes[i];
 			if (firewire_debug)
-				device_printf(fc->bdev, "%s: node %d, err = %d\n",
-					__func__, node, err);
+				device_printf(fc->bdev,
+				    "%s: node %d, err = %d\n",
+				    __func__, node, err);
 		}
 		todo = todo2;
 	}
 	splx(s);
 }
 
-
 static void
 fw_bus_probe_thread(void *arg)
 {
 	struct firewire_comm *fc;
 
-	fc = (struct firewire_comm *)arg;
+	fc = arg;
 
 	mtx_lock(&fc->wait_lock);
 	while (fc->status != FWBUSDETACH) {
@@ -1818,19 +1779,16 @@ fw_attach_dev(struct firewire_comm *fc)
 		if (fwdev->status == FWDEVINIT) {
 			fwdev->status = FWDEVATTACHED;
 		} else if (fwdev->status == FWDEVINVAL) {
-			fwdev->rcnt ++;
+			fwdev->rcnt++;
 			if (firewire_debug)
 				device_printf(fc->bdev, "%s:"
-					"fwdev->rcnt(%d), hold_count(%d)\n",
-					__func__, fwdev->rcnt, hold_count);
+				    "fwdev->rcnt(%d), hold_count(%d)\n",
+				    __func__, fwdev->rcnt, hold_count);
 			if (fwdev->rcnt > hold_count) {
 				/*
 				 * Remove devices which have not been seen
 				 * for a while.
 				 */
-				device_printf(fc->bdev, "%s:"
-					"Removing missing device ID:%08x%08x\n",
-					__func__, fwdev->eui.hi, fwdev->eui.lo);
 				STAILQ_REMOVE(&fc->devices, fwdev, fw_device,
 				    link);
 				free(fwdev, M_FW);
@@ -1839,9 +1797,9 @@ fw_attach_dev(struct firewire_comm *fc)
 	}
 
 	err = device_get_children(fc->bdev, &devlistp, &devcnt);
-	if( err == 0 ) {
-		for( i = 0 ; i < devcnt ; i++){
-			if (device_get_state(devlistp[i]) >= DS_ATTACHED)  {
+	if (err == 0) {
+		for (i = 0; i < devcnt; i++) {
+			if (device_get_state(devlistp[i]) >= DS_ATTACHED) {
 				fdc = device_get_softc(devlistp[i]);
 				if (fdc->post_explore != NULL)
 					fdc->post_explore(fdc);
@@ -1869,8 +1827,8 @@ fw_get_tlabel(struct firewire_comm *fc, struct fw_xfer *xfer)
 	new_tlabel = (fc->last_tlabel[dst] + 1) & 0x3f;
 	STAILQ_FOREACH(txfer, &fc->tlabels[new_tlabel], tlabel)
 		if ((txfer->send.hdr.mode.hdr.dst & 0x3f) == dst)
-				break;
-	if(txfer == NULL) {
+			break;
+	if (txfer == NULL) {
 		fc->last_tlabel[dst] = new_tlabel;
 		STAILQ_INSERT_TAIL(&fc->tlabels[new_tlabel], xfer, tlabel);
 		mtx_unlock(&fc->tlabel_lock);
@@ -1902,7 +1860,7 @@ fw_rcv_copy(struct fw_rcv_buf *rb)
 	pkt = (struct fw_pkt *)rb->vec->iov_base;
 	tinfo = &rb->fc->tcode[pkt->mode.hdr.tcode];
 
-	/* Copy header */ 
+	/* Copy header */
 	p = (u_char *)&rb->xfer->recv.hdr;
 	bcopy(rb->vec->iov_base, p, tinfo->hdr_len);
 	rb->vec->iov_base = (u_char *)rb->vec->iov_base + tinfo->hdr_len;
@@ -1941,7 +1899,6 @@ fw_rcv_copy(struct fw_rcv_buf *rb)
 			break;
 	}
 	rb->xfer->recv.pay_len -= res;
-
 }
 
 /*
@@ -1960,11 +1917,11 @@ fw_rcv(struct fw_rcv_buf *rb)
 		int i;
 		qld = (uint32_t *)buf;
 		printf("spd %d len:%d\n", spd, len);
-		for( i = 0 ; i <= len && i < 32; i+= 4){
+		for (i = 0; i <= len && i < 32; i+= 4) {
 			printf("0x%08x ", ntohl(qld[i/4]));
-			if((i % 16) == 15) printf("\n");
+			if ((i % 16) == 15) printf("\n");
 		}
-		if((i % 16) != 15) printf("\n");
+		if ((i % 16) != 15) printf("\n");
 	}
 #endif
 	fp = (struct fw_pkt *)rb->vec[0].iov_base;
@@ -1976,20 +1933,19 @@ fw_rcv(struct fw_rcv_buf *rb)
 	case FWTCODE_LRES:
 		rb->xfer = fw_tl2xfer(rb->fc, fp->mode.hdr.src,
 				fp->mode.hdr.tlrt >> 2, fp->mode.hdr.tcode);
-		if(rb->xfer == NULL) {
-			device_printf(rb->fc->bdev, "%s: "
-				"unknown response "
-			    	"%s(%x) src=0x%x tl=0x%x rt=%d data=0x%x\n",
-				__func__,
-			    	tcode_str[tcode], tcode,
-				fp->mode.hdr.src,
-				fp->mode.hdr.tlrt >> 2,
-				fp->mode.hdr.tlrt & 3,
-				fp->mode.rresq.data);
+		if (rb->xfer == NULL) {
+			device_printf(rb->fc->bdev, "%s: unknown response "
+			    "%s(%x) src=0x%x tl=0x%x rt=%d data=0x%x\n",
+			    __func__,
+			    tcode_str[tcode], tcode,
+			    fp->mode.hdr.src,
+			    fp->mode.hdr.tlrt >> 2,
+			    fp->mode.hdr.tlrt & 3,
+			    fp->mode.rresq.data);
 #if 0
 			printf("try ad-hoc work around!!\n");
 			rb->xfer = fw_tl2xfer(rb->fc, fp->mode.hdr.src,
-					(fp->mode.hdr.tlrt >> 2)^3);
+			    (fp->mode.hdr.tlrt >> 2)^3);
 			if (rb->xfer == NULL) {
 				printf("no use...\n");
 				return;
@@ -2018,7 +1974,8 @@ fw_rcv(struct fw_rcv_buf *rb)
 			break;
 		default:
 			device_printf(rb->fc->bdev, "%s: "
-				"unexpected flag 0x%02x\n", __func__, rb->xfer->flag);
+			    "unexpected flag 0x%02x\n", __func__,
+			    rb->xfer->flag);
 		}
 		return;
 	case FWTCODE_WREQQ:
@@ -2027,29 +1984,26 @@ fw_rcv(struct fw_rcv_buf *rb)
 	case FWTCODE_RREQB:
 	case FWTCODE_LREQ:
 		bind = fw_bindlookup(rb->fc, fp->mode.rreqq.dest_hi,
-			fp->mode.rreqq.dest_lo);
-		if(bind == NULL){
+		    fp->mode.rreqq.dest_lo);
+		if (bind == NULL) {
 			device_printf(rb->fc->bdev, "%s: "
-				"Unknown service addr 0x%04x:0x%08x %s(%x)"
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-				" src=0x%x data=%lx\n",
-#else
-				" src=0x%x data=%x\n",
-#endif
-				__func__,
-				fp->mode.wreqq.dest_hi,
-				fp->mode.wreqq.dest_lo,
-				tcode_str[tcode], tcode,
-				fp->mode.hdr.src,
-				ntohl(fp->mode.wreqq.data));
+			    "Unknown service addr 0x%04x:0x%08x %s(%x)"
+			    " src=0x%x data=%x\n",
+			    __func__,
+			    fp->mode.wreqq.dest_hi,
+			    fp->mode.wreqq.dest_lo,
+			    tcode_str[tcode], tcode,
+			    fp->mode.hdr.src,
+			    ntohl(fp->mode.wreqq.data));
 
 			if (rb->fc->status == FWBUSINIT) {
-				device_printf(rb->fc->bdev, "%s: cannot respond(bus reset)!\n",
-						__func__);
+				device_printf(rb->fc->bdev,
+				    "%s: cannot respond(bus reset)!\n",
+				    __func__);
 				return;
 			}
 			rb->xfer = fw_xfer_alloc(M_FWXFER);
-			if(rb->xfer == NULL){
+			if (rb->xfer == NULL) {
 				return;
 			}
 			rb->xfer->send.spd = rb->spd;
@@ -2080,20 +2034,16 @@ fw_rcv(struct fw_rcv_buf *rb)
 			rb->xfer->hand = fw_xferwake;
 */
 			rb->xfer->hand = fw_xfer_free;
-			if(fw_asyreq(rb->fc, -1, rb->xfer)){
+			if (fw_asyreq(rb->fc, -1, rb->xfer))
 				fw_xfer_free(rb->xfer);
-				return;
-			}
-			return;
 		}
 		len = 0;
-		for (i = 0; i < rb->nvec; i ++)
+		for (i = 0; i < rb->nvec; i++)
 			len += rb->vec[i].iov_len;
 		rb->xfer = STAILQ_FIRST(&bind->xferlist);
 		if (rb->xfer == NULL) {
 			device_printf(rb->fc->bdev, "%s: "
-				"Discard a packet for this bind.\n",
-				__func__);
+			    "Discard a packet for this bind.\n", __func__);
 			return;
 		}
 		STAILQ_REMOVE_HEAD(&bind->xferlist, link);
@@ -2110,11 +2060,11 @@ fw_rcv(struct fw_rcv_buf *rb)
 		printf("stream rcv dma %d len %d off %d spd %d\n",
 			sub, len, off, spd);
 #endif
-		if(xferq->queued >= xferq->maxq) {
+		if (xferq->queued >= xferq->maxq) {
 			printf("receive queue is full\n");
 			return;
 		}
-		/* XXX get xfer from xfer queue, we don't need copy for 
+		/* XXX get xfer from xfer queue, we don't need copy for
 			per packet mode */
 		rb->xfer = fw_xfer_alloc_buf(M_FWXFER, 0, /* XXX */
 						vec[0].iov_len);
@@ -2126,11 +2076,7 @@ fw_rcv(struct fw_rcv_buf *rb)
 		STAILQ_INSERT_TAIL(&xferq->q, rb->xfer, link);
 		splx(s);
 		sc = device_get_softc(rb->fc->bdev);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		if (&xferq->rsel.si_pid != 0)
-#else
 		if (SEL_WAITING(&xferq->rsel))
-#endif
 			selwakeuppri(&xferq->rsel, FWPRI);
 		if (xferq->flag & FWXFERQ_WAKEUP) {
 			xferq->flag &= ~FWXFERQ_WAKEUP;
@@ -2145,7 +2091,7 @@ fw_rcv(struct fw_rcv_buf *rb)
 #endif
 	default:
 		device_printf(rb->fc->bdev,"%s: unknown tcode %d\n",
-				__func__, tcode);
+		    __func__, tcode);
 		break;
 	}
 }
@@ -2191,14 +2137,13 @@ static void
 fw_try_bmr(void *arg)
 {
 	struct fw_xfer *xfer;
-	struct firewire_comm *fc = (struct firewire_comm *)arg;
+	struct firewire_comm *fc = arg;
 	struct fw_pkt *fp;
 	int err = 0;
 
 	xfer = fw_xfer_alloc_buf(M_FWXFER, 8, 4);
-	if(xfer == NULL){
+	if (xfer == NULL)
 		return;
-	}
 	xfer->send.spd = 0;
 	fc->status = FWBUSMGRELECT;
 
@@ -2217,7 +2162,7 @@ fw_try_bmr(void *arg)
 	xfer->hand = fw_try_bmr_callback;
 
 	err = fw_asyreq(fc, -1, xfer);
-	if(err){
+	if (err) {
 		fw_xfer_free_buf(xfer);
 		return;
 	}
@@ -2227,33 +2172,37 @@ fw_try_bmr(void *arg)
 #ifdef FW_VMACCESS
 /*
  * Software implementation for physical memory block access.
- * XXX:Too slow, usef for debug purpose only.
+ * XXX:Too slow, useful for debug purpose only.
  */
 static void
-fw_vmaccess(struct fw_xfer *xfer){
+fw_vmaccess(struct fw_xfer *xfer)
+{
 	struct fw_pkt *rfp, *sfp = NULL;
 	uint32_t *ld = (uint32_t *)xfer->recv.buf;
 
 	printf("vmaccess spd:%2x len:%03x data:%08x %08x %08x %08x\n",
-			xfer->spd, xfer->recv.len, ntohl(ld[0]), ntohl(ld[1]), ntohl(ld[2]), ntohl(ld[3]));
-	printf("vmaccess          data:%08x %08x %08x %08x\n", ntohl(ld[4]), ntohl(ld[5]), ntohl(ld[6]), ntohl(ld[7]));
-	if(xfer->resp != 0){
-		fw_xfer_free( xfer);
+	    xfer->spd, xfer->recv.len, ntohl(ld[0]), ntohl(ld[1]), ntohl(ld[2]),
+	    ntohl(ld[3]));
+	printf("vmaccess          data:%08x %08x %08x %08x\n", ntohl(ld[4]),
+	    ntohl(ld[5]), ntohl(ld[6]), ntohl(ld[7]));
+	if (xfer->resp != 0) {
+		fw_xfer_free(xfer);
 		return;
 	}
-	if(xfer->recv.buf == NULL){
-		fw_xfer_free( xfer);
+	if (xfer->recv.buf == NULL) {
+		fw_xfer_free(xfer);
 		return;
 	}
 	rfp = (struct fw_pkt *)xfer->recv.buf;
-	switch(rfp->mode.hdr.tcode){
+	switch (rfp->mode.hdr.tcode) {
 		/* XXX need fix for 64bit arch */
 		case FWTCODE_WREQB:
 			xfer->send.buf = malloc(12, M_FW, M_NOWAIT);
 			xfer->send.len = 12;
 			sfp = (struct fw_pkt *)xfer->send.buf;
 			bcopy(rfp->mode.wreqb.payload,
-				(caddr_t)ntohl(rfp->mode.wreqb.dest_lo), ntohs(rfp->mode.wreqb.len));
+			    (caddr_t)ntohl(rfp->mode.wreqb.dest_lo),s
+			    ntohs(rfp->mode.wreqb.len));
 			sfp->mode.wres.tcode = FWTCODE_WRES;
 			sfp->mode.wres.rtcode = 0;
 			break;
@@ -2261,15 +2210,18 @@ fw_vmaccess(struct fw_xfer *xfer){
 			xfer->send.buf = malloc(12, M_FW, M_NOWAIT);
 			xfer->send.len = 12;
 			sfp->mode.wres.tcode = FWTCODE_WRES;
-			*((uint32_t *)(ntohl(rfp->mode.wreqb.dest_lo))) = rfp->mode.wreqq.data;
+			*((uint32_t *)(ntohl(rfp->mode.wreqb.dest_lo))) =
+			    rfp->mode.wreqq.data;
 			sfp->mode.wres.rtcode = 0;
 			break;
 		case FWTCODE_RREQB:
-			xfer->send.buf = malloc(16 + rfp->mode.rreqb.len, M_FW, M_NOWAIT);
+			xfer->send.buf = malloc(16 + rfp->mode.rreqb.len,
+			    M_FW, M_NOWAIT);
 			xfer->send.len = 16 + ntohs(rfp->mode.rreqb.len);
 			sfp = (struct fw_pkt *)xfer->send.buf;
 			bcopy((caddr_t)ntohl(rfp->mode.rreqb.dest_lo),
-				sfp->mode.rresb.payload, (uint16_t)ntohs(rfp->mode.rreqb.len));
+			    sfp->mode.rresb.payload,
+			    ntohs(rfp->mode.rreqb.len));
 			sfp->mode.rresb.tcode = FWTCODE_RRESB;
 			sfp->mode.rresb.len = rfp->mode.rreqb.len;
 			sfp->mode.rresb.rtcode = 0;
@@ -2279,12 +2231,13 @@ fw_vmaccess(struct fw_xfer *xfer){
 			xfer->send.buf = malloc(16, M_FW, M_NOWAIT);
 			xfer->send.len = 16;
 			sfp = (struct fw_pkt *)xfer->send.buf;
-			sfp->mode.rresq.data = *(uint32_t *)(ntohl(rfp->mode.rreqq.dest_lo));
+			sfp->mode.rresq.data =
+			    *(uint32_t *)(ntohl(rfp->mode.rreqq.dest_lo));
 			sfp->mode.wres.tcode = FWTCODE_RRESQ;
 			sfp->mode.rresb.rtcode = 0;
 			break;
 		default:
-			fw_xfer_free( xfer);
+			fw_xfer_free(xfer);
 			return;
 	}
 	sfp->mode.hdr.dst = rfp->mode.hdr.src;
@@ -2298,24 +2251,25 @@ fw_vmaccess(struct fw_xfer *xfer){
 /**/
 	return;
 }
-#endif 
+#endif
 
 /*
  * CRC16 check-sum for IEEE1394 register blocks.
  */
 uint16_t
-fw_crc16(uint32_t *ptr, uint32_t len){
+fw_crc16(uint32_t *ptr, uint32_t len)
+{
 	uint32_t i, sum, crc = 0;
 	int shift;
 	len = (len + 3) & ~3;
-	for(i = 0 ; i < len ; i+= 4){
-		for( shift = 28 ; shift >= 0 ; shift -= 4){
+	for (i = 0; i < len; i += 4) {
+		for (shift = 28; shift >= 0; shift -= 4) {
 			sum = ((crc >> 12) ^ (ptr[i/4] >> shift)) & 0xf;
-			crc = (crc << 4) ^ ( sum << 12 ) ^ ( sum << 5) ^ sum;
+			crc = (crc << 4) ^ (sum << 12) ^ (sum << 5) ^ sum;
 		}
 		crc &= 0xffff;
 	}
-	return((uint16_t) crc);
+	return ((uint16_t) crc);
 }
 
 /*
@@ -2340,7 +2294,7 @@ fw_bmr(struct firewire_comm *fc)
 			cmstr = fc->max_node;
 		else {
 			device_printf(fc->bdev,
-				"root node is not cycle master capable\n");
+			    "root node is not cycle master capable\n");
 			/* XXX shall we be the cycle master? */
 			cmstr = fc->nodeid;
 			/* XXX need bus reset */
@@ -2351,13 +2305,13 @@ fw_bmr(struct firewire_comm *fc)
 	device_printf(fc->bdev, "bus manager %d %s\n",
 		CSRARC(fc, BUS_MGR_ID),
 		(CSRARC(fc, BUS_MGR_ID) != fc->nodeid) ? "(me)" : "");
-	if(CSRARC(fc, BUS_MGR_ID) != fc->nodeid) {
+	if (CSRARC(fc, BUS_MGR_ID) != fc->nodeid) {
 		/* We are not the bus manager */
-		return(0);
+		return (0);
 	}
 
 	/* Optimize gapcount */
-	if(fc->max_hop <= MAX_GAPHOP )
+	if (fc->max_hop <= MAX_GAPHOP)
 		fw_phy_config(fc, cmstr, gap_cnt[fc->max_hop]);
 	/* If we are the cycle master, nothing to do */
 	if (cmstr == fc->nodeid || cmstr == -1)
@@ -2372,7 +2326,7 @@ fw_bmr(struct firewire_comm *fc)
 	/* Set cmstr bit on the cycle master */
 	quad = htonl(1 << 8);
 	fwmem_write_quad(&fwdev, NULL, 0/*spd*/,
-		0xffff, 0xf0000000 | STATE_SET, &quad, fw_asy_callback_free);
+	    0xffff, 0xf0000000 | STATE_SET, &quad, fw_asy_callback_free);
 
 	return 0;
 }
@@ -2390,7 +2344,7 @@ fw_open_isodma(struct firewire_comm *fc, int tx)
 		xferqa = &fc->ir[0];
 
 	FW_GLOCK(fc);
-	for (i = 0; i < fc->nisodma; i ++) {
+	for (i = 0; i < fc->nisodma; i++) {
 		xferq = xferqa[i];
 		if ((xferq->flag & FWXFERQ_OPEN) == 0) {
 			xferq->flag |= FWXFERQ_OPEN;
@@ -2409,22 +2363,16 @@ static int
 fw_modevent(module_t mode, int type, void *data)
 {
 	int err = 0;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	static eventhandler_tag fwdev_ehtag = NULL;
-#endif
 
 	switch (type) {
 	case MOD_LOAD:
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		fwdev_ehtag = EVENTHANDLER_REGISTER(dev_clone,
-						fwdev_clone, 0, 1000);
-#endif
+		    fwdev_clone, 0, 1000);
 		break;
 	case MOD_UNLOAD:
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		if (fwdev_ehtag != NULL)
 			EVENTHANDLER_DEREGISTER(dev_clone, fwdev_ehtag);
-#endif
 		break;
 	case MOD_SHUTDOWN:
 		break;
@@ -2435,8 +2383,6 @@ fw_modevent(module_t mode, int type, void *data)
 }
 
 
-#ifdef __DragonFly__
-DECLARE_DUMMY_MODULE(firewire);
-#endif
-DRIVER_MODULE(firewire,fwohci,firewire_driver,firewire_devclass,fw_modevent,0);
+DRIVER_MODULE(firewire, fwohci, firewire_driver, firewire_devclass,
+    fw_modevent,0);
 MODULE_VERSION(firewire, 1);
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index f147f6104036..442fd6f624fb 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
@@ -42,8 +42,8 @@
 #define	DEV_DV   2
 
 struct fw_isochreq {
-	unsigned char	ch:6,
-			tag:2;
+	unsigned char ch:6;
+	unsigned char tag:2;
 };
 
 struct fw_isobufreq {
@@ -247,15 +247,15 @@ struct fw_eui64 {
 	uint32_t hi, lo;
 };
 #define FW_EUI64_BYTE(eui, x) \
-	((((x)<4)?				\
-		((eui)->hi >> (8*(3-(x)))): 	\
-		((eui)->lo >> (8*(7-(x))))	\
+	((((x) < 4)?				\
+		((eui)->hi >> (8 * (3 - (x)))): \
+		((eui)->lo >> (8 * (7 - (x))))	\
 	) & 0xff)
 #define FW_EUI64_EQUAL(x, y) \
 	((x).hi == (y).hi && (x).lo == (y).lo)
 
 struct fw_asyreq {
-	struct fw_asyreq_t{
+	struct fw_asyreq_t {
 		unsigned char sped;
 		unsigned int type;
 #define FWASREQNODE	0
@@ -265,8 +265,8 @@ struct fw_asyreq {
 		unsigned short len;
 		union {
 			struct fw_eui64 eui;
-		}dst;
-	}req;
+		} dst;
+	} req;
 	struct fw_pkt pkt;
 	uint32_t data[512];
 };
@@ -406,7 +406,7 @@ struct fw_topology_map {
 	uint32_t generation;
 	uint32_t self_id_count:16,
 		 node_count:16;
-	union fw_self_id self_id[4*64];
+	union fw_self_id self_id[4 * 64];
 };
 
 struct fw_speed_map {
@@ -454,11 +454,6 @@ struct fw_crom_buf {
 
 #define FWMAXNDMA 0x100 /* 8 bits DMA channel id. in device No. */
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#define dev2unit(x)	((minor(x) & 0xff) | (minor(x) >> 8))
-#define unit2minor(x)	(((x) & 0xff) | (((x) << 8) & ~0xffff))
-#endif
-
 #define MAKEMINOR(f, u, s)	\
 	((f) | (((u) & 0xff) << 8) | (s & 0xff))
 #define DEV2UNIT(x)	((dev2unit(x) & 0xff00) >> 8)
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 42feff2d27c8..a420a4a9f04e 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.h
@@ -29,7 +29,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 73445e023d43..e9a86060b45c 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -30,21 +30,13 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
 
-#ifdef __DragonFly__
-typedef	d_thread_t fw_proc;
-#include <sys/select.h>
-#elif __FreeBSD_version >= 500000
 typedef	struct thread fw_proc;
 #include <sys/selinfo.h>
-#else
-typedef	struct proc fw_proc;
-#include <sys/select.h>
-#endif
 
 #include <sys/uio.h>
 #include <sys/mutex.h>
@@ -54,7 +46,7 @@ typedef	struct proc fw_proc;
 
 STAILQ_HEAD(fw_xferlist, fw_xfer);
 
-struct fw_device{
+struct fw_device {
 	uint16_t dst;
 	struct fw_eui64 eui;
 	uint8_t speed;
@@ -64,7 +56,7 @@ struct fw_device{
 #define CSRROMOFF 0x400
 #define CSRROMSIZE 0x400
 	int rommax;	/* offset from 0xffff f000 0000 */
-	uint32_t csrrom[CSRROMSIZE/4];
+	uint32_t csrrom[CSRROMSIZE / 4];
 	int rcnt;
 	struct firewire_comm *fc;
 	uint32_t status;
@@ -75,9 +67,7 @@ struct fw_device{
 };
 
 struct firewire_softc {
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	struct cdev *dev;
-#endif
 	struct firewire_comm *fc;
 };
 
@@ -103,11 +93,11 @@ struct tcode_info {
 	u_char valid_res;
 };
 
-struct firewire_comm{
+struct firewire_comm {
 	device_t dev;
 	device_t bdev;
 	uint16_t busid:10,
-		  nodeid:6;
+		 nodeid:6;
 	u_int mode;
 	u_int nport;
 	u_int speed;
@@ -139,7 +129,7 @@ struct firewire_comm{
 	STAILQ_HEAD(, fw_device) devices;
 	u_int  sid_cnt;
 #define CSRSIZE 0x4000
-	uint32_t csr_arc[CSRSIZE/4];
+	uint32_t csr_arc[CSRSIZE / 4];
 #define CROMSIZE 0x400
 	uint32_t *config_rom;
 	struct crom_src_buf *crom_src_buf;
@@ -151,7 +141,7 @@ struct firewire_comm{
 	struct callout bmr_callout;
 	struct callout timeout_callout;
 	struct task task_timeout;
-	uint32_t (*cyctimer) (struct  firewire_comm *);
+	uint32_t (*cyctimer) (struct firewire_comm *);
 	void (*ibr) (struct firewire_comm *);
 	uint32_t (*set_bmr) (struct firewire_comm *, uint32_t);
 	int (*ioctl) (struct cdev *, u_long, caddr_t, int, fw_proc *);
@@ -171,7 +161,7 @@ struct firewire_comm{
 	struct taskqueue *taskqueue;
 	struct proc *probe_thread;
 };
-#define CSRARC(sc, offset) ((sc)->csr_arc[(offset)/4])
+#define CSRARC(sc, offset) ((sc)->csr_arc[(offset) / 4])
 
 #define FW_GMTX(fc)		(&(fc)->mtx)
 #define FW_GLOCK(fc)		mtx_lock(FW_GMTX(fc))
@@ -192,7 +182,7 @@ struct fw_xferq {
 
 #define FWXFERQ_HANDLER (1 << 16)
 #define FWXFERQ_WAKEUP (1 << 17)
-	void (*start) (struct firewire_comm*);
+	void (*start) (struct firewire_comm *);
 	int dmach;
 	struct fw_xferlist q;
 	u_int queued;
@@ -211,7 +201,7 @@ struct fw_xferq {
 	void (*hand) (struct fw_xferq *);
 };
 
-struct fw_bulkxfer{
+struct fw_bulkxfer {
 	int poffset;
 	struct mbuf *mbuf;
 	STAILQ_ENTRY(fw_bulkxfer) link;
@@ -220,7 +210,7 @@ struct fw_bulkxfer{
 	int resp;
 };
 
-struct fw_bind{
+struct fw_bind {
 	u_int64_t start;
 	u_int64_t end;
 	struct fw_xferlist xferlist;
@@ -229,7 +219,7 @@ struct fw_bind{
 	void *sc;
 };
 
-struct fw_xfer{
+struct fw_xfer {
 	caddr_t sc;
 	struct firewire_comm *fc;
 	struct fw_xferq *q;
@@ -269,9 +259,9 @@ struct fw_rcv_buf {
 
 void fw_sidrcv (struct firewire_comm *, uint32_t *, u_int);
 void fw_rcv (struct fw_rcv_buf *);
-void fw_xfer_unload ( struct fw_xfer*);
-void fw_xfer_free_buf ( struct fw_xfer*);
-void fw_xfer_free ( struct fw_xfer*);
+void fw_xfer_unload (struct fw_xfer *);
+void fw_xfer_free_buf (struct fw_xfer *);
+void fw_xfer_free (struct fw_xfer*);
 struct fw_xfer *fw_xfer_alloc (struct malloc_type *);
 struct fw_xfer *fw_xfer_alloc_buf (struct malloc_type *, int, int);
 void fw_init (struct firewire_comm *);
@@ -282,7 +272,7 @@ int fw_bindremove (struct firewire_comm *, struct fw_bind *);
 int fw_xferlist_add (struct fw_xferlist *, struct malloc_type *, int, int, int,
     struct firewire_comm *, void *, void (*)(struct fw_xfer *));
 void fw_xferlist_remove (struct fw_xferlist *);
-int fw_asyreq (struct firewire_comm *, int, struct fw_xfer*);
+int fw_asyreq (struct firewire_comm *, int, struct fw_xfer *);
 void fw_busreset (struct firewire_comm *, uint32_t);
 uint16_t fw_crc16 (uint32_t *, uint32_t);
 void fw_xfer_timeout (void *);
@@ -303,36 +293,9 @@ extern int firewire_debug;
 extern devclass_t firewire_devclass;
 extern int firewire_phydma_enable;
 
-#ifdef __DragonFly__
-#define		FWPRI		PCATCH
-#else
-#define		FWPRI		((PZERO+8)|PCATCH)
-#endif
+#define	FWPRI		((PZERO + 8) | PCATCH)
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#define CALLOUT_INIT(x) callout_init(x)
-#else
 #define CALLOUT_INIT(x) callout_init(x, 1 /* mpsafe */)
-#endif
-
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-/* compatibility shim for 4.X */
-#define bio buf
-#define bio_bcount b_bcount
-#define bio_cmd b_flags
-#define bio_count b_count
-#define bio_data b_data
-#define bio_dev b_dev
-#define bio_error b_error
-#define bio_flags b_flags
-#define bio_offset b_offset
-#define bio_resid b_resid
-#define BIO_ERROR B_ERROR
-#define BIO_READ B_READ
-#define BIO_WRITE B_WRITE
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
 
 MALLOC_DECLARE(M_FW);
 MALLOC_DECLARE(M_FWXFER);
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 8a53bc7fae71..e53d3b678cd6 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -59,13 +59,8 @@ __FBSDID("$FreeBSD$");
 #endif
 #endif
 
-#ifdef __DragonFly__
-#include "firewire.h"
-#include "iec13213.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/iec13213.h>
-#endif
 
 #define MAX_ROM (1024 - sizeof(uint32_t) * 5)
 #define CROM_END(cc) ((vm_offset_t)(cc)->stack[0].dir + MAX_ROM - 1)
@@ -116,7 +111,7 @@ crom_next(struct crom_context *cc)
 			printf("crom_next: too deep\n");
 			goto again;
 		}
-		cc->depth ++;
+		cc->depth++;
 
 		ptr = &cc->stack[cc->depth];
 		ptr->dir = (struct csrdirectory *) (reg + reg->val);
@@ -125,10 +120,10 @@ crom_next(struct crom_context *cc)
 	}
 again:
 	ptr = &cc->stack[cc->depth];
-	ptr->index ++;
+	ptr->index++;
 check:
 	if (ptr->index < ptr->dir->crc_len &&
-			(vm_offset_t)crom_get(cc) <= CROM_END(cc))
+	    (vm_offset_t)crom_get(cc) <= CROM_END(cc))
 		return;
 
 	if (ptr->index < ptr->dir->crc_len)
@@ -148,7 +143,7 @@ crom_search_key(struct crom_context *cc, uint8_t key)
 {
 	struct csrreg *reg;
 
-	while(cc->depth >= 0) {
+	while (cc->depth >= 0) {
 		reg = crom_get(cc);
 		if (reg->key == key)
 			return reg;
@@ -166,7 +161,7 @@ crom_has_specver(uint32_t *p, uint32_t spec, uint32_t ver)
 
 	cc = &c;
 	crom_init_context(cc, p);
-	while(cc->depth >= 0) {
+	while (cc->depth >= 0) {
 		reg = crom_get(cc);
 		if (state == 0) {
 			if (reg->key == CSRKEY_SPEC && reg->val == spec)
@@ -198,7 +193,7 @@ crom_parse_text(struct crom_context *cc, char *buf, int len)
 
 	reg = crom_get(cc);
 	if (reg->key != CROM_TEXTLEAF ||
-			(vm_offset_t)(reg + reg->val) > CROM_END(cc)) {
+	    (vm_offset_t)(reg + reg->val) > CROM_END(cc)) {
 		strncpy(buf, nullstr, len);
 		return;
 	}
@@ -215,7 +210,7 @@ crom_parse_text(struct crom_context *cc, char *buf, int len)
 	qlen = textleaf->crc_len - 2;
 	if (len < qlen * 4)
 		qlen = len/4;
-	for (i = 0; i < qlen; i ++)
+	for (i = 0; i < qlen; i++)
 		*bp++ = ntohl(textleaf->text[i]);
 	/* make sure to terminate the string */
 	if (len <= qlen * 4)
@@ -238,7 +233,7 @@ crom_crc(uint32_t *ptr, int len)
 		}
 		crc &= 0xffff;
 	}
-	return((uint16_t) crc);
+	return ((uint16_t) crc);
 }
 
 #if !defined(_KERNEL) && !defined(_BOOT)
@@ -315,17 +310,17 @@ crom_desc(struct crom_context *cc, char *buf, int len)
 		break;
 	case CSRTYPE_C:
 		len -= snprintf(buf, len, "offset=0x%04x(%d)",
-						reg->val, reg->val);
+		    reg->val, reg->val);
 		buf += strlen(buf);
 		break;
 	case CSRTYPE_L:
 		/* XXX fall through */
 	case CSRTYPE_D:
-		dir = (struct csrdirectory *) (reg + reg->val);
+		dir = (struct csrdirectory *)(reg + reg->val);
 		crc = crom_crc((uint32_t *)&dir->entry[0], dir->crc_len);
 		len -= snprintf(buf, len, "len=%d crc=0x%04x(%s) ",
-			dir->crc_len, dir->crc,
-			(crc == dir->crc) ? "OK" : "NG");
+		    dir->crc_len, dir->crc,
+		    (crc == dir->crc) ? "OK" : "NG");
 		buf += strlen(buf);
 	}
 	switch (reg->key) {
@@ -399,11 +394,11 @@ crom_add_quad(struct crom_chunk *chunk, uint32_t entry)
 	index = chunk->data.crc_len;
 	if (index >= CROM_MAX_CHUNK_LEN - 1) {
 		printf("too large chunk %d\n", index);
-		return(-1);
+		return (-1);
 	}
 	chunk->data.buf[index] = entry;
 	chunk->data.crc_len++;
-	return(index);
+	return (index);
 }
 
 int
@@ -414,7 +409,7 @@ crom_add_entry(struct crom_chunk *chunk, int key, int val)
 		struct csrreg reg;
 		uint32_t i;
 	} foo;
-	
+
 	foo.reg.key = key;
 	foo.reg.val = val;
 	return (crom_add_quad(chunk, foo.i));
@@ -422,29 +417,29 @@ crom_add_entry(struct crom_chunk *chunk, int key, int val)
 
 int
 crom_add_chunk(struct crom_src *src, struct crom_chunk *parent,
-				struct crom_chunk *child, int key)
+    struct crom_chunk *child, int key)
 {
 	int index;
 
 	if (parent == NULL) {
 		STAILQ_INSERT_TAIL(&src->chunk_list, child, link);
-		return(0);
+		return (0);
 	}
 
 	index = crom_add_entry(parent, key, 0);
 	if (index < 0) {
-		return(-1);
+		return (-1);
 	}
 	child->ref_chunk = parent;
 	child->ref_index = index;
 	STAILQ_INSERT_TAIL(&src->chunk_list, child, link);
-	return(index);
+	return (index);
 }
 
 #define MAX_TEXT ((CROM_MAX_CHUNK_LEN + 1) * 4 - sizeof(struct csrtext))
 int
 crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent,
-				struct crom_chunk *chunk, char *buf)
+    struct crom_chunk *chunk, char *buf)
 {
 	struct csrtext *tl;
 	uint32_t *p;
@@ -453,11 +448,7 @@ crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent,
 
 	len = strlen(buf);
 	if (len > MAX_TEXT) {
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		printf("text(%d) trancated to %d.\n", len, MAX_TEXT);
-#else
-		printf("text(%d) trancated to %td.\n", len, MAX_TEXT);
-#endif
+		printf("text(%d) truncated to %td.\n", len, MAX_TEXT);
 		len = MAX_TEXT;
 	}
 
@@ -469,7 +460,7 @@ crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent,
 	bzero(&t[0], roundup2(len, sizeof(uint32_t)));
 	bcopy(buf, &t[0], len);
 	p = (uint32_t *)&t[0];
-	for (i = 0; i < howmany(len, sizeof(uint32_t)); i ++)
+	for (i = 0; i < howmany(len, sizeof(uint32_t)); i++)
 		tl->text[i] = ntohl(*p++);
 	return (crom_add_chunk(src, parent, chunk, CROM_TEXTLEAF));
 }
@@ -479,11 +470,11 @@ crom_copy(uint32_t *src, uint32_t *dst, int *offset, int len, int maxlen)
 {
 	if (*offset + len > maxlen) {
 		printf("Config. ROM is too large for the buffer\n");
-		return(-1);
+		return (-1);
 	}
 	bcopy(src, (char *)(dst + *offset), len * sizeof(uint32_t));
 	*offset += len;
-	return(0);
+	return (0);
 }
 
 int
@@ -507,9 +498,9 @@ crom_load(struct crom_src *src, uint32_t *buf, int maxlen)
 		if (parent != NULL) {
 			struct csrreg *reg;
 			reg = (struct csrreg *)
-				&parent->data.buf[chunk->ref_index];
+			    &parent->data.buf[chunk->ref_index];
 			reg->val = offset -
-				(parent->offset + 1 + chunk->ref_index);
+			    (parent->offset + 1 + chunk->ref_index);
 		}
 		offset += 1 + chunk->data.crc_len;
 	}
@@ -518,15 +509,15 @@ crom_load(struct crom_src *src, uint32_t *buf, int maxlen)
 	len = 1 + src->hdr.info_len;
 	count = 0;
 	if (crom_copy((uint32_t *)&src->hdr, buf, &count, len, maxlen) < 0)
-		return(-1);
+		return (-1);
 	STAILQ_FOREACH(chunk, &src->chunk_list, link) {
 		chunk->data.crc =
-			crom_crc(&chunk->data.buf[0], chunk->data.crc_len);
+		    crom_crc(&chunk->data.buf[0], chunk->data.crc_len);
 
 		len = 1 + chunk->data.crc_len;
 		if (crom_copy((uint32_t *)&chunk->data, buf,
-					&count, len, maxlen) < 0)
-			return(-1);
+		    &count, len, maxlen) < 0)
+			return (-1);
 	}
 	hdr = (struct csrhdr *)buf;
 	hdr->crc_len = count - 1;
@@ -535,19 +526,20 @@ crom_load(struct crom_src *src, uint32_t *buf, int maxlen)
 #if defined(_KERNEL) || defined(_BOOT)
 	/* byte swap */
 	ptr = buf;
-	for (i = 0; i < count; i ++) {
+	for (i = 0; i < count; i++) {
 		*ptr = htonl(*ptr);
 		ptr++;
 	}
 #endif
 
-	return(count);
+	return (count);
 }
 #endif
 
 #ifdef TEST
 int
-main () {
+main()
+{
 	struct crom_src src;
 	struct crom_chunk root,unit1,unit2,unit3;
 	struct crom_chunk text1,text2,text3,text4,text5,text6,text7;
@@ -591,15 +583,9 @@ main () {
 	/* private company_id */
 	crom_add_entry(&root, CSRKEY_VENDOR, 0xacde48);
 
-#ifdef __DragonFly__
-	crom_add_simple_text(&src, &root, &text1, "DragonFly");
-	crom_add_entry(&root, CSRKEY_HW, __DragonFly_cc_version);
-	crom_add_simple_text(&src, &root, &text2, "DragonFly-1");
-#else
 	crom_add_simple_text(&src, &root, &text1, "FreeBSD");
 	crom_add_entry(&root, CSRKEY_HW, __FreeBSD_version);
 	crom_add_simple_text(&src, &root, &text2, "FreeBSD-5");
-#endif
 
 	/* SBP unit directory */
 	crom_add_chunk(&src, &root, &unit1, CROM_UDIR);
@@ -632,11 +618,11 @@ main () {
 	crom_load(&src, buf, 256);
 	p = buf;
 #define DUMP_FORMAT     "%08x %08x %08x %08x %08x %08x %08x %08x\n"
-	for (i = 0; i < 256/8; i ++) {
+	for (i = 0; i < 256/8; i++) {
 		printf(DUMP_FORMAT,
 			p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
 		p += 8;
 	}
-	return(0);
+	return (0);
 }
 #endif
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index d26810d30545..e09ce2c947bf 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
@@ -39,11 +39,7 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/mbuf.h>
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#include <sys/buf.h>
-#else
 #include <sys/bio.h>
-#endif
 
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -56,19 +52,11 @@
 
 #include <sys/ioccom.h>
 
-#ifdef __DragonFly__
-#include "firewire.h"
-#include "firewirereg.h"
-#include "fwdma.h"
-#include "fwmem.h"
-#include "iec68113.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwdma.h>
 #include <dev/firewire/fwmem.h>
 #include <dev/firewire/iec68113.h>
-#endif
 
 #define	FWNODE_INVAL 0xffff
 
@@ -82,12 +70,6 @@ static	d_mmap_t	fw_mmap;
 static	d_strategy_t	fw_strategy;
 
 struct cdevsw firewire_cdevsw = {
-#ifdef __DragonFly__
-#define CDEV_MAJOR 127
-	"fw", CDEV_MAJOR, D_MEM, NULL, 0,
-	fw_open, fw_close, fw_read, fw_write, fw_ioctl,
-	fw_poll, fw_mmap, fw_strategy, nodump, nopsize,
-#elif __FreeBSD_version >= 500104
 	.d_version =	D_VERSION,
 	.d_open =	fw_open,
 	.d_close =	fw_close,
@@ -99,12 +81,6 @@ struct cdevsw firewire_cdevsw = {
 	.d_strategy =	fw_strategy,
 	.d_name =	"fw",
 	.d_flags =	D_MEM
-#else
-#define CDEV_MAJOR 127
-	fw_open, fw_close, fw_read, fw_write, fw_ioctl,
-	fw_poll, fw_mmap, fw_strategy, "fw", CDEV_MAJOR,
-	nodump, nopsize, D_MEM, -1
-#endif
 };
 
 struct fw_drv1 {
@@ -123,22 +99,21 @@ fwdev_allocbuf(struct firewire_comm *fc, struct fw_xferq *q,
 	int i;
 
 	if (q->flag & (FWXFERQ_RUNNING | FWXFERQ_EXTBUF))
-		return(EBUSY);
+		return (EBUSY);
 
-	q->bulkxfer = (struct fw_bulkxfer *) malloc(
-		sizeof(struct fw_bulkxfer) * b->nchunk,
-		M_FW, M_WAITOK);
+	q->bulkxfer = malloc(sizeof(struct fw_bulkxfer) * b->nchunk,
+	    M_FW, M_WAITOK);
 	if (q->bulkxfer == NULL)
-		return(ENOMEM);
+		return (ENOMEM);
 
 	b->psize = roundup2(b->psize, sizeof(uint32_t));
 	q->buf = fwdma_malloc_multiseg(fc, sizeof(uint32_t),
-			b->psize, b->nchunk * b->npacket, BUS_DMA_WAITOK);
+	    b->psize, b->nchunk * b->npacket, BUS_DMA_WAITOK);
 
 	if (q->buf == NULL) {
 		free(q->bulkxfer, M_FW);
 		q->bulkxfer = NULL;
-		return(ENOMEM);
+		return (ENOMEM);
 	}
 	q->bnchunk = b->nchunk;
 	q->bnpacket = b->npacket;
@@ -150,7 +125,7 @@ fwdev_allocbuf(struct firewire_comm *fc, struct fw_xferq *q,
 	STAILQ_INIT(&q->stdma);
 	q->stproc = NULL;
 
-	for(i = 0 ; i < q->bnchunk; i++){
+	for (i = 0; i < q->bnchunk; i++) {
 		q->bulkxfer[i].poffset = i * q->bnpacket;
 		q->bulkxfer[i].mbuf = NULL;
 		STAILQ_INSERT_TAIL(&q->stfree, &q->bulkxfer[i], link);
@@ -181,7 +156,7 @@ fwdev_freebuf(struct fw_xferq *q)
 
 
 static int
-fw_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
+fw_open(struct cdev *dev, int flags, int fmt, fw_proc *td)
 {
 	int err = 0;
 	int unit = DEV2UNIT(dev);
@@ -208,17 +183,15 @@ fw_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
 	if (dev->si_drv1 == NULL)
 		return (ENOMEM);
 
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	if ((dev->si_flags & SI_NAMED) == 0) {
 		int unit = DEV2UNIT(dev);
 		int sub = DEV2SUB(dev);
 
 		make_dev(&firewire_cdevsw, dev2unit(dev),
-			UID_ROOT, GID_OPERATOR, 0660,
-			"fw%d.%d", unit, sub);
+		    UID_ROOT, GID_OPERATOR, 0660, "fw%d.%d", unit, sub);
 	}
-#endif
-	d = (struct fw_drv1 *)dev->si_drv1;
+
+	d = dev->si_drv1;
 	d->fc = sc->fc;
 	STAILQ_INIT(&d->binds);
 	STAILQ_INIT(&d->rq);
@@ -227,7 +200,7 @@ fw_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
 }
 
 static int
-fw_close (struct cdev *dev, int flags, int fmt, fw_proc *td)
+fw_close(struct cdev *dev, int flags, int fmt, fw_proc *td)
 {
 	struct firewire_comm *fc;
 	struct fw_drv1 *d;
@@ -238,12 +211,12 @@ fw_close (struct cdev *dev, int flags, int fmt, fw_proc *td)
 	if (DEV_FWMEM(dev))
 		return fwmem_close(dev, flags, fmt, td);
 
-	d = (struct fw_drv1 *)dev->si_drv1;
+	d = dev->si_drv1;
 	fc = d->fc;
 
 	/* remove binding */
 	for (fwb = STAILQ_FIRST(&d->binds); fwb != NULL;
-			fwb = STAILQ_FIRST(&d->binds)) {
+	    fwb = STAILQ_FIRST(&d->binds)) {
 		fw_bindremove(fc, fwb);
 		STAILQ_REMOVE_HEAD(&d->binds, chlist);
 		fw_xferlist_remove(&fwb->xferlist);
@@ -262,15 +235,15 @@ fw_close (struct cdev *dev, int flags, int fmt, fw_proc *td)
 		fwdev_freebuf(ir);
 		/* drain receiving buffer */
 		for (xfer = STAILQ_FIRST(&ir->q);
-			xfer != NULL; xfer = STAILQ_FIRST(&ir->q)) {
-			ir->queued --;
+		    xfer != NULL; xfer = STAILQ_FIRST(&ir->q)) {
+			ir->queued--;
 			STAILQ_REMOVE_HEAD(&ir->q, link);
 
 			xfer->resp = 0;
 			fw_xfer_done(xfer);
 		}
-		ir->flag &= ~(FWXFERQ_OPEN |
-			FWXFERQ_MODEMASK | FWXFERQ_CHTAGMASK);
+		ir->flag &= ~(FWXFERQ_OPEN | FWXFERQ_MODEMASK |
+		    FWXFERQ_CHTAGMASK);
 		d->ir = NULL;
 
 	}
@@ -286,7 +259,7 @@ fw_close (struct cdev *dev, int flags, int fmt, fw_proc *td)
 		/* free extbuf */
 		fwdev_freebuf(it);
 		it->flag &= ~(FWXFERQ_OPEN |
-			FWXFERQ_MODEMASK | FWXFERQ_CHTAGMASK);
+		    FWXFERQ_MODEMASK | FWXFERQ_CHTAGMASK);
 		d->it = NULL;
 	}
 	free(dev->si_drv1, M_FW);
@@ -323,10 +296,10 @@ fw_read_async(struct fw_drv1 *d, struct uio *uio, int ioflag)
 		fc->irx_post(fc, fp->mode.ld);
 #endif
 	tinfo = &xfer->fc->tcode[fp->mode.hdr.tcode];
-	err = uiomove((void *)fp, tinfo->hdr_len, uio);
+	err = uiomove(fp, tinfo->hdr_len, uio);
 	if (err)
 		goto out;
-	err = uiomove((void *)xfer->recv.payload, xfer->recv.pay_len, uio);
+	err = uiomove(xfer->recv.payload, xfer->recv.pay_len, uio);
 
 out:
 	/* recycle this xfer */
@@ -343,7 +316,7 @@ fw_read_async(struct fw_drv1 *d, struct uio *uio, int ioflag)
  * read request.
  */
 static int
-fw_read (struct cdev *dev, struct uio *uio, int ioflag)
+fw_read(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	struct fw_drv1 *d;
 	struct fw_xferq *ir;
@@ -354,7 +327,7 @@ fw_read (struct cdev *dev, struct uio *uio, int ioflag)
 	if (DEV_FWMEM(dev))
 		return (physio(dev, uio, ioflag));
 
-	d = (struct fw_drv1 *)dev->si_drv1;
+	d = dev->si_drv1;
 	fc = d->fc;
 	ir = d->ir;
 
@@ -389,21 +362,21 @@ fw_read (struct cdev *dev, struct uio *uio, int ioflag)
 			err = EIO;
 		FW_GUNLOCK(fc);
 		return err;
-	} else if(ir->stproc != NULL) {
+	} else if (ir->stproc != NULL) {
 		/* iso bulkxfer */
 		FW_GUNLOCK(fc);
-		fp = (struct fw_pkt *)fwdma_v_addr(ir->buf, 
-				ir->stproc->poffset + ir->queued);
-		if(fc->irx_post != NULL)
+		fp = (struct fw_pkt *)fwdma_v_addr(ir->buf,
+		    ir->stproc->poffset + ir->queued);
+		if (fc->irx_post != NULL)
 			fc->irx_post(fc, fp->mode.ld);
-		if(fp->mode.stream.len == 0){
+		if (fp->mode.stream.len == 0) {
 			err = EIO;
 			return err;
 		}
 		err = uiomove((caddr_t)fp,
 			fp->mode.stream.len + sizeof(uint32_t), uio);
-		ir->queued ++;
-		if(ir->queued >= ir->bnpacket){
+		ir->queued++;
+		if (ir->queued >= ir->bnpacket) {
 			s = splfw();
 			STAILQ_INSERT_TAIL(&ir->stfree, ir->stproc, link);
 			splx(s);
@@ -476,7 +449,7 @@ fw_write_async(struct fw_drv1 *d, struct uio *uio, int ioflag)
 }
 
 static int
-fw_write (struct cdev *dev, struct uio *uio, int ioflag)
+fw_write(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	int err = 0;
 	int s, slept = 0;
@@ -488,7 +461,7 @@ fw_write (struct cdev *dev, struct uio *uio, int ioflag)
 	if (DEV_FWMEM(dev))
 		return (physio(dev, uio, ioflag));
 
-	d = (struct fw_drv1 *)dev->si_drv1;
+	d = dev->si_drv1;
 	fc = d->fc;
 	it = d->it;
 
@@ -529,7 +502,7 @@ fw_write (struct cdev *dev, struct uio *uio, int ioflag)
 	err = uiomove((caddr_t)fp, sizeof(struct fw_isohdr), uio);
 	err = uiomove((caddr_t)fp->mode.stream.payload,
 				fp->mode.stream.len, uio);
-	it->queued ++;
+	it->queued++;
 	if (it->queued >= it->bnpacket) {
 		s = splfw();
 		STAILQ_INSERT_TAIL(&it->stvalid, it->stproc, link);
@@ -556,7 +529,7 @@ fw_hand(struct fw_xfer *xfer)
 	struct fw_drv1 *d;
 
 	fwb = (struct fw_bind *)xfer->sc;
-	d = (struct fw_drv1 *)fwb->sc;
+	d = fwb->sc;
 	FW_GLOCK(xfer->fc);
 	STAILQ_INSERT_TAIL(&d->rq, xfer, link);
 	FW_GUNLOCK(xfer->fc);
@@ -567,7 +540,7 @@ fw_hand(struct fw_xfer *xfer)
  * ioctl support.
  */
 int
-fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
+fw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 {
 	struct firewire_comm *fc;
 	struct fw_drv1 *d;
@@ -591,9 +564,9 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		return fwmem_ioctl(dev, cmd, data, flag, td);
 
 	if (!data)
-		return(EINVAL);
+		return (EINVAL);
 
-	d = (struct fw_drv1 *)dev->si_drv1;
+	d = dev->si_drv1;
 	fc = d->fc;
 	ir = d->ir;
 	it = d->it;
@@ -709,7 +682,7 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		bcopy(fp, (void *)&xfer->send.hdr, tinfo->hdr_len);
 		if (pay_len > 0)
 			bcopy((char *)fp + tinfo->hdr_len,
-			    (void *)xfer->send.payload, pay_len);
+			    xfer->send.payload, pay_len);
 		xfer->send.spd = asyreq->req.sped;
 		xfer->hand = fw_xferwake;
 
@@ -731,7 +704,7 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 			pay_len = xfer->recv.pay_len;
 			if (asyreq->req.len >= xfer->recv.pay_len + tinfo->hdr_len) {
 				asyreq->req.len = xfer->recv.pay_len +
-					tinfo->hdr_len;
+				    tinfo->hdr_len;
 			} else {
 				err = EINVAL;
 				pay_len = 0;
@@ -751,7 +724,7 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 	case FW_CBINDADDR:
 		fwb = fw_bindlookup(fc,
 				bindreq->start.hi, bindreq->start.lo);
-		if(fwb == NULL){
+		if (fwb == NULL) {
 			err = EINVAL;
 			break;
 		}
@@ -761,30 +734,30 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		free(fwb, M_FW);
 		break;
 	case FW_SBINDADDR:
-		if(bindreq->len <= 0 ){
+		if (bindreq->len <= 0) {
 			err = EINVAL;
 			break;
 		}
-		if(bindreq->start.hi > 0xffff ){
+		if (bindreq->start.hi > 0xffff) {
 			err = EINVAL;
 			break;
 		}
-		fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_FW, M_WAITOK);
-		if(fwb == NULL){
+		fwb = malloc(sizeof(struct fw_bind), M_FW, M_WAITOK);
+		if (fwb == NULL) {
 			err = ENOMEM;
 			break;
 		}
 		fwb->start = ((u_int64_t)bindreq->start.hi << 32) |
 		    bindreq->start.lo;
 		fwb->end = fwb->start +  bindreq->len;
-		fwb->sc = (void *)d;
+		fwb->sc = d;
 		STAILQ_INIT(&fwb->xferlist);
 		err = fw_bindadd(fc, fwb);
 		if (err == 0) {
 			fw_xferlist_add(&fwb->xferlist, M_FWXFER,
 			    /* XXX */
 			    PAGE_SIZE, PAGE_SIZE, 5,
-			    fc, (void *)fwb, fw_hand);
+			    fc, fwb, fw_hand);
 			STAILQ_INSERT_TAIL(&d->binds, fwb, chlist);
 		}
 		break;
@@ -797,11 +770,11 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		devinfo->eui.hi = fc->eui.hi;
 		devinfo->eui.lo = fc->eui.lo;
 		STAILQ_FOREACH(fwdev, &fc->devices, link) {
-			if(len < FW_MAX_DEVLST){
+			if (len < FW_MAX_DEVLST) {
 				devinfo = &fwdevlst->dev[len++];
 				devinfo->dst = fwdev->dst;
-				devinfo->status = 
-					(fwdev->status == FWDEVINVAL)?0:1;
+				devinfo->status =
+					(fwdev->status == FWDEVINVAL) ? 0 : 1;
 				devinfo->eui.hi = fwdev->eui.hi;
 				devinfo->eui.lo = fwdev->eui.lo;
 			}
@@ -812,7 +785,7 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		break;
 	case FW_GTPMAP:
 		bcopy(fc->topology_map, data,
-				(fc->topology_map->crc_len + 1) * 4);
+		    (fc->topology_map->crc_len + 1) * 4);
 		break;
 	case FW_GCROM:
 		STAILQ_FOREACH(fwdev, &fc->devices, link)
@@ -847,7 +820,7 @@ fw_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 			free(ptr, M_FW);
 		break;
 	default:
-		fc->ioctl (dev, cmd, data, flag, td);
+		fc->ioctl(dev, cmd, data, flag, td);
 		break;
 	}
 	return err;
@@ -873,7 +846,7 @@ fw_poll(struct cdev *dev, int events, fw_proc *td)
 	}
 	tmp = POLLOUT | POLLWRNORM;
 	if (events & tmp) {
-		/* XXX should be fixed */	
+		/* XXX should be fixed */
 		revents |= tmp;
 	}
 
@@ -881,20 +854,12 @@ fw_poll(struct cdev *dev, int events, fw_proc *td)
 }
 
 static int
-#if defined(__DragonFly__) || __FreeBSD_version < 500102
-fw_mmap (struct cdev *dev, vm_offset_t offset, int nproto)
-#else
 fw_mmap (struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
     int nproto, vm_memattr_t *memattr)
-#endif
-{  
+{
 
 	if (DEV_FWMEM(dev))
-#if defined(__DragonFly__) || __FreeBSD_version < 500102
-		return fwmem_mmap(dev, offset, nproto);
-#else
 		return fwmem_mmap(dev, offset, paddr, nproto, memattr);
-#endif
 
 	return EINVAL;
 }
@@ -921,24 +886,17 @@ fwdev_makedev(struct firewire_softc *sc)
 {
 	int err = 0;
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	cdevsw_add(&firewire_cdevsw);
-#else
 	struct cdev *d;
 	int unit;
 
 	unit = device_get_unit(sc->fc->bdev);
 	sc->dev = make_dev(&firewire_cdevsw, MAKEMINOR(0, unit, 0),
-			UID_ROOT, GID_OPERATOR, 0660,
-			"fw%d.%d", unit, 0);
-	d = make_dev(&firewire_cdevsw,
-			MAKEMINOR(FWMEM_FLAG, unit, 0),
-			UID_ROOT, GID_OPERATOR, 0660,
-			"fwmem%d.%d", unit, 0);
+	    UID_ROOT, GID_OPERATOR, 0660, "fw%d.%d", unit, 0);
+	d = make_dev(&firewire_cdevsw, MAKEMINOR(FWMEM_FLAG, unit, 0),
+	    UID_ROOT, GID_OPERATOR, 0660, "fwmem%d.%d", unit, 0);
 	dev_depends(sc->dev, d);
 	make_dev_alias(sc->dev, "fw%d", unit);
 	make_dev_alias(d, "fwmem%d", unit);
-#endif
 
 	return (err);
 }
@@ -948,15 +906,10 @@ fwdev_destroydev(struct firewire_softc *sc)
 {
 	int err = 0;
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	cdevsw_remove(&firewire_cdevsw);
-#else
 	destroy_dev(sc->dev);
-#endif
 	return (err);
 }
 
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 #define NDEVTYPE 2
 void
 fwdev_clone(void *arg, struct ucred *cred, char *name, int namelen,
@@ -998,4 +951,3 @@ fwdev_clone(void *arg, struct ucred *cred, char *name, int namelen,
 	dev_depends(sc->dev, *dev);
 	return;
 }
-#endif
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index bf3bb6f5fcf6..c8378f0fc091 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2003
  * 	Hidetoshi Shimokawa. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -18,7 +18,7 @@
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  */
 
 #ifdef __FreeBSD__
@@ -43,23 +43,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#endif
 
 #include <sys/bus.h>
 #include <machine/bus.h>
 
-#ifdef __DragonFly__
-#include <bus/firewire/firewire.h>
-#include <bus/firewire/firewirereg.h>
-#include <bus/firewire/fwdma.h>
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwdma.h>
-#endif
 
 static void
 fwdma_map_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
@@ -90,14 +82,12 @@ fwdma_malloc(struct firewire_comm *fc, int alignment, bus_size_t size,
 		/*nsegments*/ 1,
 		/*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
 		/*flags*/ BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 
 		/*lockfunc*/busdma_lock_mutex,
 		/*lockarg*/FW_GMTX(fc),
-#endif
 		&dma->dma_tag);
 	if (err) {
 		printf("fwdma_malloc: failed(1)\n");
-		return(NULL);
+		return (NULL);
 	}
 
 	err = bus_dmamem_alloc(dma->dma_tag, &dma->v_addr,
@@ -105,13 +95,13 @@ fwdma_malloc(struct firewire_comm *fc, int alignment, bus_size_t size,
 	if (err) {
 		printf("fwdma_malloc: failed(2)\n");
 		/* XXX destroy tag */
-		return(NULL);
+		return (NULL);
 	}
 
 	bus_dmamap_load(dma->dma_tag, dma->dma_map, dma->v_addr,
 		size, fwdma_map_cb, &dma->bus_addr, /*flags*/0);
 
-	return(dma->v_addr);
+	return (dma->v_addr);
 }
 
 void
@@ -131,11 +121,11 @@ fwdma_malloc_size(bus_dma_tag_t dmat, bus_dmamap_t *dmamap,
 
 	if (bus_dmamem_alloc(dmat, &v_addr, flag, dmamap)) {
 		printf("fwdma_malloc_size: failed(1)\n");
-		return(NULL);
+		return (NULL);
 	}
 	bus_dmamap_load(dmat, *dmamap, v_addr, size,
 			fwdma_map_cb, bus_addr, /*flags*/0);
-	return(v_addr);
+	return (v_addr);
 }
 
 void
@@ -144,7 +134,7 @@ fwdma_free_size(bus_dma_tag_t dmat, bus_dmamap_t dmamap,
 {
 	bus_dmamap_unload(dmat, dmamap);
 	bus_dmamem_free(dmat, vaddr, dmamap);
-} 
+}
 
 /*
  * Allocate multisegment dma buffers
@@ -172,7 +162,7 @@ fwdma_malloc_multiseg(struct firewire_comm *fc, int alignment,
 			+ sizeof(struct fwdma_seg)*nseg, M_FW, M_WAITOK);
 	if (am == NULL) {
 		printf("fwdma_malloc_multiseg: malloc failed\n");
-		return(NULL);
+		return (NULL);
 	}
 	am->ssize = ssize;
 	am->esize = esize;
@@ -188,35 +178,26 @@ fwdma_malloc_multiseg(struct firewire_comm *fc, int alignment,
 			/*nsegments*/ 1,
 			/*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
 			/*flags*/ BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 			/*lockfunc*/busdma_lock_mutex,
 			/*lockarg*/FW_GMTX(fc),
-#endif
 			&am->dma_tag)) {
 		printf("fwdma_malloc_multiseg: tag_create failed\n");
 		free(am, M_FW);
-		return(NULL);
+		return (NULL);
 	}
 
-#if 0
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	printf("malloc_multi: ssize=%d nseg=%d\n", ssize, nseg);
-#else
-	printf("malloc_multi: ssize=%td nseg=%d\n", ssize, nseg);
-#endif
-#endif
-	for (seg = &am->seg[0]; nseg --; seg ++) {
+	for (seg = &am->seg[0]; nseg--; seg++) {
 		seg->v_addr = fwdma_malloc_size(am->dma_tag, &seg->dma_map,
 			ssize, &seg->bus_addr, flag);
 		if (seg->v_addr == NULL) {
 			printf("fwdma_malloc_multi: malloc_size failed %d\n",
 				am->nseg);
 			fwdma_free_multiseg(am);
-			return(NULL);
+			return (NULL);
 		}
 		am->nseg++;
 	}
-	return(am);
+	return (am);
 }
 
 void
@@ -224,7 +205,7 @@ fwdma_free_multiseg(struct fwdma_alloc_multi *am)
 {
 	struct fwdma_seg *seg;
 
-	for (seg = &am->seg[0]; am->nseg --; seg ++) {
+	for (seg = &am->seg[0]; am->nseg--; seg++) {
 		fwdma_free_size(am->dma_tag, seg->dma_map,
 			seg->v_addr, am->ssize);
 	}
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 3a8278c1c709..ec67971ad229 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -1,7 +1,7 @@
 /*-
  * Copyright (C) 2003
  * 	Hidetoshi Shimokawa. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -18,7 +18,7 @@
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -30,20 +30,20 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  */
 
 struct fwdma_alloc {
 	bus_dma_tag_t	dma_tag;
 	bus_dmamap_t	dma_map;
-	void *		v_addr;
+	void 		*v_addr;
 	bus_addr_t	bus_addr;
 };
 
 struct fwdma_seg {
 	bus_dmamap_t	dma_map;
-	void *		v_addr;
+	void 		*v_addr;
 	bus_addr_t	bus_addr;
 };
 
@@ -74,20 +74,20 @@ fwdma_bus_addr(struct fwdma_alloc_multi *am, int index)
 }
 
 static __inline void
-fwdma_sync(struct fwdma_alloc *dma, bus_dmasync_op_t op)  
+fwdma_sync(struct fwdma_alloc *dma, bus_dmasync_op_t op)
 {
 	bus_dmamap_sync(dma->dma_tag, dma->dma_map, op);
 }
 
 static __inline void
 fwdma_sync_multiseg(struct fwdma_alloc_multi *am,
-			int start, int end, bus_dmasync_op_t op)
+    int start, int end, bus_dmasync_op_t op)
 {
 	struct fwdma_seg *seg, *eseg;
 
 	seg = &am->seg[am->esize * start / am->ssize];
 	eseg = &am->seg[am->esize * end / am->ssize];
-	for (; seg <= eseg; seg ++)
+	for (; seg <= eseg; seg++)
 		bus_dmamap_sync(am->dma_tag, seg->dma_map, op);
 }
 
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index a342d1428ded..182fc8aba51a 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2002-2003
  * 	Hidetoshi Shimokawa. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -18,7 +18,7 @@
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  */
 
 #ifdef __FreeBSD__
@@ -46,11 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#include <sys/buf.h>
-#else
 #include <sys/bio.h>
-#endif
 
 #include <sys/bus.h>
 #include <machine/bus.h>
@@ -60,17 +56,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 
-#ifdef __DragonFly__
-#include "firewire.h"
-#include "firewirereg.h"
-#include "fwmem.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwmem.h>
-#endif
 
-static int fwmem_speed=2, fwmem_debug=0;
+static int fwmem_speed = 2, fwmem_debug = 0;
 static struct fw_eui64 fwmem_eui64;
 SYSCTL_DECL(_hw_firewire);
 static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwmem, CTLFLAG_RD, 0,
@@ -136,7 +126,7 @@ fwmem_read_quad(
 	struct fw_xfer *xfer;
 	struct fw_pkt *fp;
 
-	xfer = fwmem_xfer_req(fwdev, (void *)sc, spd, 0, 4, hand);
+	xfer = fwmem_xfer_req(fwdev, sc, spd, 0, 4, hand);
 	if (xfer == NULL) {
 		return NULL;
 	}
@@ -151,7 +141,7 @@ fwmem_read_quad(
 
 	if (fwmem_debug)
 		printf("fwmem_read_quad: %d %04x:%08x\n", fwdev->dst,
-				dst_hi, dst_lo);
+		    dst_hi, dst_lo);
 
 	if (fw_asyreq(xfer->fc, -1, xfer) == 0)
 		return xfer;
@@ -187,7 +177,7 @@ fwmem_write_quad(
 
 	if (fwmem_debug)
 		printf("fwmem_write_quad: %d %04x:%08x %08x\n", fwdev->dst,
-			dst_hi, dst_lo, *(uint32_t *)data);
+		    dst_hi, dst_lo, *(uint32_t *)data);
 
 	if (fw_asyreq(xfer->fc, -1, xfer) == 0)
 		return xfer;
@@ -209,7 +199,7 @@ fwmem_read_block(
 {
 	struct fw_xfer *xfer;
 	struct fw_pkt *fp;
-	
+
 	xfer = fwmem_xfer_req(fwdev, sc, spd, 0, roundup2(len, 4), hand);
 	if (xfer == NULL)
 		return NULL;
@@ -226,7 +216,7 @@ fwmem_read_block(
 
 	if (fwmem_debug)
 		printf("fwmem_read_block: %d %04x:%08x %d\n", fwdev->dst,
-				dst_hi, dst_lo, len);
+		    dst_hi, dst_lo, len);
 	if (fw_asyreq(xfer->fc, -1, xfer) == 0)
 		return xfer;
 
@@ -272,9 +262,8 @@ fwmem_write_block(
 	return NULL;
 }
 
-
 int
-fwmem_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
+fwmem_open(struct cdev *dev, int flags, int fmt, fw_proc *td)
 {
 	struct fwmem_softc *fms;
 	struct firewire_softc *sc;
@@ -288,20 +277,20 @@ fwmem_open (struct cdev *dev, int flags, int fmt, fw_proc *td)
 	if (dev->si_drv1 != NULL) {
 		if ((flags & FWRITE) != 0) {
 			FW_GUNLOCK(sc->fc);
-			return(EBUSY);
+			return (EBUSY);
 		}
 		FW_GUNLOCK(sc->fc);
-		fms = (struct fwmem_softc *)dev->si_drv1;
-		fms->refcount ++;
+		fms = dev->si_drv1;
+		fms->refcount++;
 	} else {
 		dev->si_drv1 = (void *)-1;
 		FW_GUNLOCK(sc->fc);
 		dev->si_drv1 = malloc(sizeof(struct fwmem_softc),
-						 M_FWMEM, M_WAITOK);
+		    M_FWMEM, M_WAITOK);
 		if (dev->si_drv1 == NULL)
-			return(ENOMEM);
+			return (ENOMEM);
 		dev->si_iosize_max = DFLTPHYS;
-		fms = (struct fwmem_softc *)dev->si_drv1;
+		fms = dev->si_drv1;
 		bcopy(&fwmem_eui64, &fms->eui, sizeof(struct fw_eui64));
 		fms->sc = sc;
 		fms->refcount = 1;
@@ -317,10 +306,10 @@ fwmem_close (struct cdev *dev, int flags, int fmt, fw_proc *td)
 {
 	struct fwmem_softc *fms;
 
-	fms = (struct fwmem_softc *)dev->si_drv1;
+	fms = dev->si_drv1;
 
 	FW_GLOCK(fms->sc->fc);
-	fms->refcount --;
+	fms->refcount--;
 	FW_GUNLOCK(fms->sc->fc);
 	if (fwmem_debug)
 		printf("%s: refcount=%d\n", __func__, fms->refcount);
@@ -359,18 +348,18 @@ fwmem_strategy(struct bio *bp)
 	struct fw_device *fwdev;
 	struct fw_xfer *xfer;
 	struct cdev *dev;
-	int err=0, s, iolen;
+	int err = 0, s, iolen;
 
 	dev = bp->bio_dev;
 	/* XXX check request length */
 
 	s = splfw();
-	fms = (struct fwmem_softc *)dev->si_drv1;
+	fms = dev->si_drv1;
 	fwdev = fw_noderesolve_eui64(fms->sc->fc, &fms->eui);
 	if (fwdev == NULL) {
 		if (fwmem_debug)
 			printf("fwmem: no such device ID:%08x%08x\n",
-					fms->eui.hi, fms->eui.lo);
+			    fms->eui.hi, fms->eui.lo);
 		err = EINVAL;
 		goto error;
 	}
@@ -379,12 +368,12 @@ fwmem_strategy(struct bio *bp)
 	if ((bp->bio_cmd & BIO_READ) == BIO_READ) {
 		if (iolen == 4 && (bp->bio_offset & 3) == 0)
 			xfer = fwmem_read_quad(fwdev,
-			    (void *) bp, fwmem_speed,
+			    (void *)bp, fwmem_speed,
 			    bp->bio_offset >> 32, bp->bio_offset & 0xffffffff,
 			    bp->bio_data, fwmem_biodone);
 		else
 			xfer = fwmem_read_block(fwdev,
-			    (void *) bp, fwmem_speed,
+			    (void *)bp, fwmem_speed,
 			    bp->bio_offset >> 32, bp->bio_offset & 0xffffffff,
 			    iolen, bp->bio_data, fwmem_biodone);
 	} else {
@@ -418,12 +407,12 @@ fwmem_strategy(struct bio *bp)
 }
 
 int
-fwmem_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
+fwmem_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 {
 	struct fwmem_softc *fms;
 	int err = 0;
 
-	fms = (struct fwmem_softc *)dev->si_drv1;
+	fms = dev->si_drv1;
 	switch (cmd) {
 	case FW_SDEUI64:
 		bcopy(data, &fms->eui, sizeof(struct fw_eui64));
@@ -434,20 +423,18 @@ fwmem_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 	default:
 		err = EINVAL;
 	}
-	return(err);
+	return (err);
 }
+
 int
-fwmem_poll (struct cdev *dev, int events, fw_proc *td)
-{  
+fwmem_poll(struct cdev *dev, int events, fw_proc *td)
+{
 	return EINVAL;
 }
+
 int
-#if defined(__DragonFly__) || __FreeBSD_version < 500102
-fwmem_mmap (struct cdev *dev, vm_offset_t offset, int nproto)
-#else
-fwmem_mmap (struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+fwmem_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
     int nproto, vm_memattr_t *memattr)
-#endif
-{  
+{
 	return EINVAL;
 }
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 4ac43027bd40..00a54e28da6d 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -30,18 +30,11 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
 
-#define ATRQ_CH 0
-#define ATRS_CH 1
-#define ARRQ_CH 2
-#define ARRS_CH 3
-#define ITX_CH 4
-#define IRX_CH 0x24
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -56,25 +49,12 @@
 
 #include <machine/bus.h>
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#include <machine/clock.h>		/* for DELAY() */
-#endif
-
-#ifdef __DragonFly__
-#include "firewire.h"
-#include "firewirereg.h"
-#include "fwdma.h"
-#include "fwohcireg.h"
-#include "fwohcivar.h"
-#include "firewire_phy.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwdma.h>
 #include <dev/firewire/fwohcireg.h>
 #include <dev/firewire/fwohcivar.h>
 #include <dev/firewire/firewire_phy.h>
-#endif
 
 #undef OHCI_DEBUG
 
@@ -86,25 +66,25 @@ SYSCTL_INT(_hw_firewire, OID_AUTO, nocyclemaster, CTLFLAG_RWTUN,
 SYSCTL_INT(_hw_firewire, OID_AUTO, phydma_enable, CTLFLAG_RWTUN,
 	&firewire_phydma_enable, 0, "Allow physical request DMA from firewire");
 
-static char dbcode[16][0x10]={"OUTM", "OUTL","INPM","INPL",
-		"STOR","LOAD","NOP ","STOP",};
+static char dbcode[16][0x10] = {"OUTM", "OUTL", "INPM", "INPL",
+				"STOR", "LOAD", "NOP ", "STOP",};
 
-static char dbkey[8][0x10]={"ST0", "ST1","ST2","ST3",
-		"UNDEF","REG","SYS","DEV"};
-static char dbcond[4][0x10]={"NEV","C=1", "C=0", "ALL"};
-char fwohcicode[32][0x20]={
-	"No stat","Undef","long","miss Ack err",
-	"FIFO underrun","FIFO overrun","desc err", "data read err",
-	"data write err","bus reset","timeout","tcode err",
-	"Undef","Undef","unknown event","flushed",
-	"Undef","ack complete","ack pend","Undef",
-	"ack busy_X","ack busy_A","ack busy_B","Undef",
-	"Undef","Undef","Undef","ack tardy",
-	"Undef","ack data_err","ack type_err",""};
+static char dbkey[8][0x10] = {"ST0", "ST1", "ST2", "ST3",
+			      "UNDEF", "REG", "SYS", "DEV"};
+static char dbcond[4][0x10] = {"NEV", "C=1", "C=0", "ALL"};
+char fwohcicode[32][0x20]= {
+	"No stat", "Undef", "long", "miss Ack err",
+	"FIFO underrun", "FIFO overrun", "desc err", "data read err",
+	"data write err", "bus reset", "timeout", "tcode err",
+	"Undef", "Undef", "unknown event", "flushed",
+	"Undef" ,"ack complete", "ack pend", "Undef",
+	"ack busy_X", "ack busy_A", "ack busy_B", "Undef",
+	"Undef", "Undef", "Undef", "ack tardy",
+	"Undef", "ack data_err", "ack type_err", ""};
 
 #define MAX_SPEED 3
 extern char *linkspeed[];
-uint32_t tagbit[4] = { 1 << 28, 1 << 29, 1 << 30, 1 << 31};
+uint32_t tagbit[4] = {1 << 28, 1 << 29, 1 << 30, 1 << 31};
 
 static struct tcode_info tinfo[] = {
 /*		hdr_len block 	flag	valid_response */
@@ -126,6 +106,13 @@ static struct tcode_info tinfo[] = {
 /* f XXX    */ { 0,	0, 0xff}
 };
 
+#define ATRQ_CH 0
+#define ATRS_CH 1
+#define ARRQ_CH 2
+#define ARRS_CH 3
+#define ITX_CH 4
+#define IRX_CH 0x24
+
 #define OHCI_WRITE_SIGMASK 0xffff0000
 #define OHCI_READ_SIGMASK 0xffff0000
 
@@ -140,8 +127,8 @@ static void fwohci_txd (struct fwohci_softc *, struct fwohci_dbch *);
 static void fwohci_start_atq (struct firewire_comm *);
 static void fwohci_start_ats (struct firewire_comm *);
 static void fwohci_start (struct fwohci_softc *, struct fwohci_dbch *);
-static uint32_t fwphy_wrdata ( struct fwohci_softc *, uint32_t, uint32_t);
-static uint32_t fwphy_rddata ( struct fwohci_softc *, uint32_t);
+static uint32_t fwphy_wrdata (struct fwohci_softc *, uint32_t, uint32_t);
+static uint32_t fwphy_rddata (struct fwohci_softc *, uint32_t);
 static int fwohci_rx_enable (struct fwohci_softc *, struct fwohci_dbch *);
 static int fwohci_tx_enable (struct fwohci_softc *, struct fwohci_dbch *);
 static int fwohci_irx_enable (struct firewire_comm *, int);
@@ -156,9 +143,9 @@ static void fwohci_set_intr (struct firewire_comm *, int);
 
 static int fwohci_add_rx_buf (struct fwohci_dbch *, struct fwohcidb_tr *, int, struct fwdma_alloc *);
 static int fwohci_add_tx_buf (struct fwohci_dbch *, struct fwohcidb_tr *, int);
-static void	dump_db (struct fwohci_softc *, uint32_t);
-static void 	print_db (struct fwohcidb_tr *, struct fwohcidb *, uint32_t , uint32_t);
-static void	dump_dma (struct fwohci_softc *, uint32_t);
+static void dump_db (struct fwohci_softc *, uint32_t);
+static void print_db (struct fwohcidb_tr *, struct fwohcidb *, uint32_t , uint32_t);
+static void dump_dma (struct fwohci_softc *, uint32_t);
 static uint32_t fwohci_cyctimer (struct firewire_comm *);
 static void fwohci_rbuf_update (struct fwohci_softc *, int);
 static void fwohci_tbuf_update (struct fwohci_softc *, int);
@@ -270,18 +257,19 @@ d_ioctl_t fwohci_ioctl;
  */
 /* XXX need lock for phy access */
 static uint32_t
-fwphy_wrdata( struct fwohci_softc *sc, uint32_t addr, uint32_t data)
+fwphy_wrdata(struct fwohci_softc *sc, uint32_t addr, uint32_t data)
 {
 	uint32_t fun;
 
 	addr &= 0xf;
 	data &= 0xff;
 
-	fun = (PHYDEV_WRCMD | (addr << PHYDEV_REGADDR) | (data << PHYDEV_WRDATA));
+	fun = (PHYDEV_WRCMD | (addr << PHYDEV_REGADDR) |
+	      (data << PHYDEV_WRDATA));
 	OWRITE(sc, OHCI_PHYACCESS, fun);
 	DELAY(100);
 
-	return(fwphy_rddata( sc, addr));
+	return (fwphy_rddata(sc, addr));
 }
 
 static uint32_t
@@ -302,17 +290,16 @@ fwohci_set_bus_manager(struct firewire_comm *fc, u_int node)
  	for (i = 0; !(OREAD(sc, OHCI_CSR_CONT) & (1<<31)) && (i < 1000); i++)
 		DELAY(10);
 	bm = OREAD(sc, OHCI_CSR_DATA);
-	if((bm & 0x3f) == 0x3f)
+	if ((bm & 0x3f) == 0x3f)
 		bm = node;
 	if (firewire_debug)
 		device_printf(sc->fc.dev, "%s: %d->%d (loop=%d)\n",
 				__func__, bm, node, i);
-
-	return(bm);
+	return (bm);
 }
 
 static uint32_t
-fwphy_rddata(struct fwohci_softc *sc,  u_int addr)
+fwphy_rddata(struct fwohci_softc *sc, u_int addr)
 {
 	uint32_t fun, stat;
 	u_int i, retry = 0;
@@ -323,13 +310,13 @@ fwphy_rddata(struct fwohci_softc *sc,  u_int addr)
 	OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_REG_FAIL);
 	fun = PHYDEV_RDCMD | (addr << PHYDEV_REGADDR);
 	OWRITE(sc, OHCI_PHYACCESS, fun);
-	for ( i = 0 ; i < MAX_RETRY ; i ++ ){
+	for (i = 0; i < MAX_RETRY; i++) {
 		fun = OREAD(sc, OHCI_PHYACCESS);
 		if ((fun & PHYDEV_RDCMD) == 0 && (fun & PHYDEV_RDDONE) != 0)
 			break;
 		DELAY(100);
 	}
-	if(i >= MAX_RETRY) {
+	if (i >= MAX_RETRY) {
 		if (firewire_debug)
 			device_printf(sc->fc.dev, "%s: failed(1).\n", __func__);
 		if (++retry < MAX_RETRY) {
@@ -349,12 +336,13 @@ fwphy_rddata(struct fwohci_softc *sc,  u_int addr)
 		}
 	}
 	if (firewire_debug > 1 || retry >= MAX_RETRY)
-		device_printf(sc->fc.dev, 
+		device_printf(sc->fc.dev,
 		    "%s:: 0x%x loop=%d, retry=%d\n",
 			__func__, addr, i, retry);
 #undef MAX_RETRY
-	return((fun >> PHYDEV_RDDATA )& 0xff);
+	return ((fun >> PHYDEV_RDDATA) & 0xff);
 }
+
 /* Device specific ioctl. */
 int
 fwohci_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
@@ -363,41 +351,41 @@ fwohci_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 	struct fwohci_softc *fc;
 	int unit = DEV2UNIT(dev);
 	int err = 0;
-	struct fw_reg_req_t *reg  = (struct fw_reg_req_t *) data;
+	struct fw_reg_req_t *reg = (struct fw_reg_req_t *) data;
 	uint32_t *dmach = (uint32_t *) data;
 
 	sc = devclass_get_softc(firewire_devclass, unit);
-	if(sc == NULL){
-		return(EINVAL);
-	}
+	if (sc == NULL)
+		return (EINVAL);
+
 	fc = (struct fwohci_softc *)sc->fc;
 
 	if (!data)
-		return(EINVAL);
+		return (EINVAL);
 
 	switch (cmd) {
 	case FWOHCI_WRREG:
 #define OHCI_MAX_REG 0x800
-		if(reg->addr <= OHCI_MAX_REG){
+		if (reg->addr <= OHCI_MAX_REG) {
 			OWRITE(fc, reg->addr, reg->data);
 			reg->data = OREAD(fc, reg->addr);
-		}else{
+		} else {
 			err = EINVAL;
 		}
 		break;
 	case FWOHCI_RDREG:
-		if(reg->addr <= OHCI_MAX_REG){
+		if (reg->addr <= OHCI_MAX_REG) {
 			reg->data = OREAD(fc, reg->addr);
-		}else{
+		} else {
 			err = EINVAL;
 		}
 		break;
 /* Read DMA descriptors for debug  */
 	case DUMPDMA:
-		if(*dmach <= OHCI_MAX_DMA_CH ){
+		if (*dmach <= OHCI_MAX_DMA_CH) {
 			dump_dma(fc, *dmach);
 			dump_db(fc, *dmach);
-		}else{
+		} else {
 			err = EINVAL;
 		}
 		break;
@@ -427,19 +415,20 @@ fwohci_probe_phy(struct fwohci_softc *sc, device_t dev)
 {
 	uint32_t reg, reg2;
 	int e1394a = 1;
-/*
- * probe PHY parameters
- * 0. to prove PHY version, whether compliance of 1394a.
- * 1. to probe maximum speed supported by the PHY and 
- *    number of port supported by core-logic.
- *    It is not actually available port on your PC .
- */
+
+	/*
+	 * probe PHY parameters
+	 * 0. to prove PHY version, whether compliance of 1394a.
+	 * 1. to probe maximum speed supported by the PHY and
+	 *    number of port supported by core-logic.
+	 *    It is not actually available port on your PC .
+	 */
 	OWRITE(sc, OHCI_HCCCTL, OHCI_HCC_LPS);
 	DELAY(500);
 
 	reg = fwphy_rddata(sc, FW_PHY_SPD_REG);
 
-	if((reg >> 5) != 7 ){
+	if ((reg >> 5) != 7) {
 		sc->fc.mode &= ~FWPHYASYST;
 		sc->fc.nport = reg & FW_PHY_NP;
 		sc->fc.speed = reg & FW_PHY_SPD >> 6;
@@ -451,7 +440,7 @@ fwohci_probe_phy(struct fwohci_softc *sc, device_t dev)
 		device_printf(dev,
 			"Phy 1394 only %s, %d ports.\n",
 			linkspeed[sc->fc.speed], sc->fc.nport);
-	}else{
+	} else {
 		reg2 = fwphy_rddata(sc, FW_PHY_ESPD_REG);
 		sc->fc.mode |= FWPHYASYST;
 		sc->fc.nport = reg & FW_PHY_NP;
@@ -488,7 +477,7 @@ fwohci_probe_phy(struct fwohci_softc *sc, device_t dev)
 	}
 
 	reg = fwphy_rddata(sc, FW_PHY_SPD_REG);
-	if((reg >> 5) == 7 ){
+	if ((reg >> 5) == 7) {
 		reg = fwphy_rddata(sc, 4);
 		reg |= 1 << 6;
 		fwphy_wrdata(sc, 4, reg);
@@ -505,19 +494,19 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev)
 	uint32_t reg, reg2;
 	struct fwohcidb_tr *db_tr;
 
-	/* Disable interrupts */ 
+	/* Disable interrupts */
 	OWRITE(sc, FWOHCI_INTMASKCLR, ~0);
 
 	/* Now stopping all DMA channels */
-	OWRITE(sc,  OHCI_ARQCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ARSCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ARQCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ARSCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
 
-	OWRITE(sc,  OHCI_IR_MASKCLR, ~0);
-	for( i = 0 ; i < sc->fc.nisodma ; i ++ ){
-		OWRITE(sc,  OHCI_IRCTLCLR(i), OHCI_CNTL_DMA_RUN);
-		OWRITE(sc,  OHCI_ITCTLCLR(i), OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_IR_MASKCLR, ~0);
+	for (i = 0; i < sc->fc.nisodma; i++) {
+		OWRITE(sc, OHCI_IRCTLCLR(i), OHCI_CNTL_DMA_RUN);
+		OWRITE(sc, OHCI_ITCTLCLR(i), OHCI_CNTL_DMA_RUN);
 	}
 
 	/* FLUSH FIFO and reset Transmitter/Reciever */
@@ -525,7 +514,7 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev)
 	if (firewire_debug)
 		device_printf(dev, "resetting OHCI...");
 	i = 0;
-	while(OREAD(sc, OHCI_HCCCTL) & OHCI_HCC_RESET) {
+	while (OREAD(sc, OHCI_HCCCTL) & OHCI_HCC_RESET) {
 		if (i++ > 100) break;
 		DELAY(1000);
 	}
@@ -536,7 +525,7 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev)
 	fwohci_probe_phy(sc, dev);
 
 	/* Probe link */
-	reg = OREAD(sc,  OHCI_BUS_OPT);
+	reg = OREAD(sc, OHCI_BUS_OPT);
 	reg2 = reg | OHCI_BUSFNC;
 	max_rec = (reg & 0x0000f000) >> 12;
 	speed = (reg & 0x00000007);
@@ -551,7 +540,7 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev)
 	}
 	if (firewire_debug)
 		device_printf(dev, "BUS_OPT 0x%x -> 0x%x\n", reg, reg2);
-	OWRITE(sc,  OHCI_BUS_OPT, reg2);
+	OWRITE(sc, OHCI_BUS_OPT, reg2);
 
 	/* Initialize registers */
 	OWRITE(sc, OHCI_CROMHDR, sc->fc.config_rom[0]);
@@ -577,33 +566,31 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev)
 	/* AT Retries */
 	OWRITE(sc, FWOHCI_RETRY,
 		/* CycleLimit   PhyRespRetries ATRespRetries ATReqRetries */
-		(0xffff << 16 ) | (0x0f << 8) | (0x0f << 4) | 0x0f) ;
+		(0xffff << 16) | (0x0f << 8) | (0x0f << 4) | 0x0f);
 
 	sc->atrq.top = STAILQ_FIRST(&sc->atrq.db_trq);
 	sc->atrs.top = STAILQ_FIRST(&sc->atrs.db_trq);
 	sc->atrq.bottom = sc->atrq.top;
 	sc->atrs.bottom = sc->atrs.top;
 
-	for( i = 0, db_tr = sc->atrq.top; i < sc->atrq.ndb ;
-				i ++, db_tr = STAILQ_NEXT(db_tr, link)){
+	for (i = 0, db_tr = sc->atrq.top; i < sc->atrq.ndb;
+	    i++, db_tr = STAILQ_NEXT(db_tr, link)) {
 		db_tr->xfer = NULL;
 	}
-	for( i = 0, db_tr = sc->atrs.top; i < sc->atrs.ndb ;
-				i ++, db_tr = STAILQ_NEXT(db_tr, link)){
+	for (i = 0, db_tr = sc->atrs.top; i < sc->atrs.ndb;
+	    i++, db_tr = STAILQ_NEXT(db_tr, link)) {
 		db_tr->xfer = NULL;
 	}
 
-
 	/* Enable interrupts */
 	sc->intmask =  (OHCI_INT_ERR  | OHCI_INT_PHY_SID
-			| OHCI_INT_DMA_ATRQ | OHCI_INT_DMA_ATRS 
+			| OHCI_INT_DMA_ATRQ | OHCI_INT_DMA_ATRS
 			| OHCI_INT_DMA_PRRQ | OHCI_INT_DMA_PRRS
 			| OHCI_INT_PHY_BUS_R | OHCI_INT_PW_ERR);
 	sc->intmask |=  OHCI_INT_DMA_IR | OHCI_INT_DMA_IT;
 	sc->intmask |=	OHCI_INT_CYC_LOST | OHCI_INT_PHY_INT;
 	OWRITE(sc, FWOHCI_INTMASK, sc->intmask);
 	fwohci_set_intr(&sc->fc, 1);
-
 }
 
 int
@@ -617,7 +604,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 	reg = OREAD(sc, OHCI_VERSION);
 	mver = (reg >> 16) & 0xff;
 	device_printf(dev, "OHCI version %x.%x (ROM=%d)\n",
-			mver, reg & 0xff, (reg>>24) & 1);
+			mver, reg & 0xff, (reg >> 24) & 1);
 	if (mver < 1 || mver > 9) {
 		device_printf(dev, "invalid OHCI version\n");
 		return (ENXIO);
@@ -672,7 +659,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 	sc->atrq.ndb = NDB;
 	sc->atrs.ndb = NDB / 2;
 
-	for( i = 0 ; i < sc->fc.nisodma ; i ++ ){
+	for (i = 0; i < sc->fc.nisodma; i++) {
 		sc->fc.it[i] = &sc->it[i].xferq;
 		sc->fc.ir[i] = &sc->ir[i].xferq;
 		sc->it[i].xferq.dmach = i;
@@ -686,7 +673,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 
 	sc->fc.config_rom = fwdma_malloc(&sc->fc, CROMSIZE, CROMSIZE,
 	    &sc->crom_dma, BUS_DMA_WAITOK | BUS_DMA_COHERENT);
-	if(sc->fc.config_rom == NULL){
+	if (sc->fc.config_rom == NULL) {
 		device_printf(dev, "config_rom alloc failed.");
 		return ENOMEM;
 	}
@@ -703,7 +690,6 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 	sc->fc.config_rom[0] |= fw_crc16(&sc->fc.config_rom[1], 5*4);
 #endif
 
-
 /* SID recieve buffer must align 2^11 */
 #define	OHCI_SIDSIZE	(1 << 11)
 	sc->sid_buf = fwdma_malloc(&sc->fc, OHCI_SIDSIZE, OHCI_SIDSIZE,
@@ -714,7 +700,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 	}
 
 	fwdma_malloc(&sc->fc, sizeof(uint32_t), sizeof(uint32_t),
-					&sc->dummy_dma, BUS_DMA_WAITOK);
+	    &sc->dummy_dma, BUS_DMA_WAITOK);
 
 	if (sc->dummy_dma.v_addr == NULL) {
 		device_printf(dev, "dummy_dma alloc failed.");
@@ -739,7 +725,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 
 	sc->fc.eui.hi = OREAD(sc, FWOHCIGUID_H);
 	sc->fc.eui.lo = OREAD(sc, FWOHCIGUID_L);
-	for( i = 0 ; i < 8 ; i ++)
+	for (i = 0; i < 8; i++)
 		ui[i] = FW_EUI64_BYTE(&sc->fc.eui,i);
 	device_printf(dev, "EUI64 %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
 		ui[0], ui[1], ui[2], ui[3], ui[4], ui[5], ui[6], ui[7]);
@@ -769,7 +755,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev)
 	sc->fc.taskqueue = taskqueue_create_fast("fw_taskq", M_WAITOK,
 		taskqueue_thread_enqueue, &sc->fc.taskqueue);
 	taskqueue_start_threads(&sc->fc.taskqueue, 1, PI_NET, "fw%d_taskq",
-					device_get_unit(dev));
+		device_get_unit(dev));
 	TASK_INIT(&sc->fwohci_task_busreset, 2, fwohci_task_busreset, sc);
 	TASK_INIT(&sc->fwohci_task_sid, 1, fwohci_task_sid, sc);
 	TASK_INIT(&sc->fwohci_task_dma, 0, fwohci_task_dma, sc);
@@ -792,7 +778,7 @@ uint32_t
 fwohci_cyctimer(struct firewire_comm *fc)
 {
 	struct fwohci_softc *sc = (struct fwohci_softc *)fc;
-	return(OREAD(sc, OHCI_CYCLETIMER));
+	return (OREAD(sc, OHCI_CYCLETIMER));
 }
 
 int
@@ -811,7 +797,7 @@ fwohci_detach(struct fwohci_softc *sc, device_t dev)
 	fwohci_db_free(&sc->atrq);
 	fwohci_db_free(&sc->atrs);
 
-	for( i = 0 ; i < sc->fc.nisodma ; i ++ ){
+	for (i = 0; i < sc->fc.nisodma; i++) {
 		fwohci_db_free(&sc->it[i]);
 		fwohci_db_free(&sc->ir[i]);
 	}
@@ -832,7 +818,7 @@ fwohci_detach(struct fwohci_softc *sc, device_t dev)
 	int _cnt = _dbtr->dbcnt;					\
 	db = &_dbtr->db[ (_cnt > 2) ? (_cnt -1) : 0];			\
 } while (0)
-	
+
 static void
 fwohci_execute_db(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 {
@@ -860,7 +846,7 @@ fwohci_execute_db(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 
 static void
 fwohci_execute_db2(void *arg, bus_dma_segment_t *segs, int nseg,
-						bus_size_t size, int error)
+    bus_size_t size, int error)
 {
 	fwohci_execute_db(arg, segs, nseg, error);
 }
@@ -883,11 +869,11 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 
 	FW_GLOCK_ASSERT(&sc->fc);
 
-	if(&sc->atrq == dbch){
+	if (&sc->atrq == dbch) {
 		off = OHCI_ATQOFF;
-	}else if(&sc->atrs == dbch){
+	} else if (&sc->atrs == dbch) {
 		off = OHCI_ATSOFF;
-	}else{
+	} else {
 		return;
 	}
 
@@ -898,11 +884,11 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	db_tr = dbch->top;
 txloop:
 	xfer = STAILQ_FIRST(&dbch->xferq.q);
-	if(xfer == NULL){
+	if (xfer == NULL) {
 		goto kick;
 	}
 #if 0
-	if(dbch->xferq.queued == 0 ){
+	if (dbch->xferq.queued == 0) {
 		device_printf(sc->fc.dev, "TX queue empty\n");
 	}
 #endif
@@ -919,11 +905,11 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 
 	ld = &ohcifp->mode.ld[0];
 	ld[0] = ld[1] = ld[2] = ld[3] = 0;
-	for( i = 0 ; i < pl_off ; i+= 4)
+	for (i = 0; i < pl_off; i+= 4)
 		ld[i/4] = fp->mode.ld[i/4];
 
 	ohcifp->mode.common.spd = xfer->send.spd & 0x7;
-	if (tcode == FWTCODE_STREAM ){
+	if (tcode == FWTCODE_STREAM) {
 		hdr_len = 8;
 		ohcifp->mode.stream.len = fp->mode.stream.len;
 	} else if (tcode == FWTCODE_PHY) {
@@ -943,14 +929,14 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
  	FWOHCI_DMA_WRITE(db->db.desc.addr, 0);
  	FWOHCI_DMA_WRITE(db->db.desc.res, 0);
 /* Specify bound timer of asy. responce */
-	if(&sc->atrs == dbch){
+	if (&sc->atrs == dbch) {
  		FWOHCI_DMA_WRITE(db->db.desc.res,
 			 (OREAD(sc, OHCI_CYCLETIMER) >> 12) + (1 << 13));
 	}
 #if BYTE_ORDER == BIG_ENDIAN
 	if (tcode == FWTCODE_WREQQ || tcode == FWTCODE_RRESQ)
 		hdr_len = 12;
-	for (i = 0; i < hdr_len/4; i ++)
+	for (i = 0; i < hdr_len/4; i++)
 		FWOHCI_DMA_WRITE(ld[i], ld[i]);
 #endif
 
@@ -981,7 +967,7 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 					m_copydata(xfer->mbuf, 0,
 						xfer->mbuf->m_pkthdr.len,
 						mtod(m0, caddr_t));
-					m0->m_len = m0->m_pkthdr.len = 
+					m0->m_len = m0->m_pkthdr.len =
 						xfer->mbuf->m_pkthdr.len;
 					m_freem(xfer->mbuf);
 					xfer->mbuf = m0;
@@ -1012,16 +998,16 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
  	FWOHCI_DMA_WRITE(db->db.desc.depend,
 			STAILQ_NEXT(db_tr, link)->bus_addr);
 
-	if(fsegment == -1 )
+	if (fsegment == -1)
 		fsegment = db_tr->dbcnt;
 	if (dbch->pdb_tr != NULL) {
 		LAST_DB(dbch->pdb_tr, db);
  		FWOHCI_DMA_SET(db->db.desc.depend, db_tr->dbcnt);
 	}
-	dbch->xferq.queued ++;
+	dbch->xferq.queued++;
 	dbch->pdb_tr = db_tr;
 	db_tr = STAILQ_NEXT(db_tr, link);
-	if(db_tr != dbch->bottom){
+	if (db_tr != dbch->bottom) {
 		goto txloop;
 	} else {
 		device_printf(sc->fc.dev, "fwohci_start: lack of db_trq\n");
@@ -1032,7 +1018,7 @@ fwohci_start(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_PREREAD);
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_PREWRITE);
 
-	if(dbch->xferq.flag & FWXFERQ_RUNNING) {
+	if (dbch->xferq.flag & FWXFERQ_RUNNING) {
 		OWRITE(sc, OHCI_DMACTL(off), OHCI_CNTL_DMA_WAKE);
 	} else {
 		if (firewire_debug)
@@ -1053,7 +1039,7 @@ fwohci_start_atq(struct firewire_comm *fc)
 {
 	struct fwohci_softc *sc = (struct fwohci_softc *)fc;
 	FW_GLOCK(&sc->fc);
-	fwohci_start( sc, &(sc->atrq));
+	fwohci_start(sc, &(sc->atrq));
 	FW_GUNLOCK(&sc->fc);
 	return;
 }
@@ -1063,7 +1049,7 @@ fwohci_start_ats(struct firewire_comm *fc)
 {
 	struct fwohci_softc *sc = (struct fwohci_softc *)fc;
 	FW_GLOCK(&sc->fc);
-	fwohci_start( sc, &(sc->atrs));
+	fwohci_start(sc, &(sc->atrs));
 	FW_GUNLOCK(&sc->fc);
 	return;
 }
@@ -1080,13 +1066,13 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	int	packets;
 	struct firewire_comm *fc = (struct firewire_comm *)sc;
 
-	if(&sc->atrq == dbch){
+	if (&sc->atrq == dbch) {
 		off = OHCI_ATQOFF;
 		ch = ATRQ_CH;
-	}else if(&sc->atrs == dbch){
+	} else if (&sc->atrs == dbch) {
 		off = OHCI_ATSOFF;
 		ch = ATRS_CH;
-	}else{
+	} else {
 		return;
 	}
 	s = splfw();
@@ -1094,11 +1080,11 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	packets = 0;
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_POSTREAD);
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_POSTWRITE);
-	while(dbch->xferq.queued > 0){
+	while (dbch->xferq.queued > 0) {
 		LAST_DB(tr, db);
 		status = FWOHCI_DMA_READ(db->db.desc.res) >> OHCI_STATUS_SHIFT;
-		if(!(status & OHCI_CNTL_DMA_ACTIVE)){
-			if (fc->status != FWBUSINIT) 
+		if (!(status & OHCI_CNTL_DMA_ACTIVE)) {
+			if (fc->status != FWBUSINIT)
 				/* maybe out of order?? */
 				goto out;
 		}
@@ -1109,7 +1095,7 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		if (firewire_debug > 1)
 			dump_db(sc, ch);
 #endif
-		if(status & OHCI_CNTL_DMA_DEAD) {
+		if (status & OHCI_CNTL_DMA_DEAD) {
 			/* Stop DMA */
 			OWRITE(sc, OHCI_DMACTLCLR(off), OHCI_CNTL_DMA_RUN);
 			device_printf(sc->fc.dev, "force reset AT FIFO\n");
@@ -1118,7 +1104,7 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 			OWRITE(sc, OHCI_DMACTLCLR(off), OHCI_CNTL_DMA_RUN);
 		}
 		stat = status & FWOHCIEV_MASK;
-		switch(stat){
+		switch (stat) {
 		case FWOHCIEV_ACKPEND:
 		case FWOHCIEV_ACKCOMPL:
 			err = 0;
@@ -1126,12 +1112,10 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		case FWOHCIEV_ACKBSA:
 		case FWOHCIEV_ACKBSB:
 		case FWOHCIEV_ACKBSX:
-			device_printf(sc->fc.dev, "txd err=%2x %s\n", stat, fwohcicode[stat]);
 			err = EBUSY;
 			break;
 		case FWOHCIEV_FLUSHED:
 		case FWOHCIEV_ACKTARD:
-			device_printf(sc->fc.dev, "txd err=%2x %s\n", stat, fwohcicode[stat]);
 			err = EAGAIN;
 			break;
 		case FWOHCIEV_MISSACK:
@@ -1145,8 +1129,6 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		case FWOHCIEV_ACKDERR:
 		case FWOHCIEV_ACKTERR:
 		default:
-			device_printf(sc->fc.dev, "txd err=%2x %s\n",
-							stat, fwohcicode[stat]);
 			err = EINVAL;
 			break;
 		}
@@ -1176,17 +1158,17 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 			}
 			/*
 			 * The watchdog timer takes care of split
-			 * transcation timeout for ACKPEND case.
+			 * transaction timeout for ACKPEND case.
 			 */
 		} else {
 			printf("this shouldn't happen\n");
 		}
 		FW_GLOCK(fc);
-		dbch->xferq.queued --;
+		dbch->xferq.queued--;
 		FW_GUNLOCK(fc);
 		tr->xfer = NULL;
 
-		packets ++;
+		packets++;
 		tr = STAILQ_NEXT(tr, link);
 		dbch->bottom = tr;
 		if (dbch->bottom == dbch->top) {
@@ -1216,10 +1198,10 @@ fwohci_db_free(struct fwohci_dbch *dbch)
 	if ((dbch->flags & FWOHCI_DBCH_INIT) == 0)
 		return;
 
-	for(db_tr = STAILQ_FIRST(&dbch->db_trq), idb = 0; idb < dbch->ndb;
-			db_tr = STAILQ_NEXT(db_tr, link), idb++){
+	for (db_tr = STAILQ_FIRST(&dbch->db_trq), idb = 0; idb < dbch->ndb;
+	    db_tr = STAILQ_NEXT(db_tr, link), idb++) {
 		if ((dbch->xferq.flag & FWXFERQ_EXTBUF) == 0 &&
-					db_tr->buf != NULL) {
+		    db_tr->buf != NULL) {
 			fwdma_free_size(dbch->dmat, db_tr->dma_map,
 					db_tr->buf, dbch->xferq.psize);
 			db_tr->buf = NULL;
@@ -1254,10 +1236,8 @@ fwohci_db_init(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 			/*nsegments*/ dbch->ndesc > 3 ? dbch->ndesc - 2 : 1,
 			/*maxsegsz*/ MAX_REQCOUNT,
 			/*flags*/ 0,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 			/*lockfunc*/busdma_lock_mutex,
 			/*lockarg*/FW_GMTX(&sc->fc),
-#endif
 			&dbch->dmat))
 		return;
 
@@ -1267,13 +1247,13 @@ fwohci_db_init(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	db_tr = (struct fwohcidb_tr *)
 		malloc(sizeof(struct fwohcidb_tr) * dbch->ndb,
 		M_FW, M_WAITOK | M_ZERO);
-	if(db_tr == NULL){
+	if (db_tr == NULL) {
 		printf("fwohci_db_init: malloc(1) failed\n");
 		return;
 	}
 
 #define DB_SIZE(x) (sizeof(struct fwohcidb) * (x)->ndesc)
-	dbch->am = fwdma_malloc_multiseg(&sc->fc, DB_SIZE(dbch),
+	dbch->am = fwdma_malloc_multiseg(&sc->fc, sizeof(struct fwohcidb),
 		DB_SIZE(dbch), dbch->ndb, BUS_DMA_WAITOK);
 	if (dbch->am == NULL) {
 		printf("fwohci_db_init: fwdma_malloc_multiseg failed\n");
@@ -1281,7 +1261,7 @@ fwohci_db_init(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		return;
 	}
 	/* Attach DB to DMA ch. */
-	for(idb = 0 ; idb < dbch->ndb ; idb++){
+	for (idb = 0; idb < dbch->ndb; idb++) {
 		db_tr->dbcnt = 0;
 		db_tr->db = (struct fwohcidb *)fwdma_v_addr(dbch->am, idb);
 		db_tr->bus_addr = fwdma_bus_addr(dbch->am, idb);
@@ -1320,7 +1300,7 @@ fwohci_itx_disable(struct firewire_comm *fc, int dmach)
 {
 	struct fwohci_softc *sc = (struct fwohci_softc *)fc;
 
-	OWRITE(sc, OHCI_ITCTLCLR(dmach), 
+	OWRITE(sc, OHCI_ITCTLCLR(dmach),
 			OHCI_CNTL_DMA_RUN | OHCI_CNTL_CYCMATCH_S);
 	OWRITE(sc, OHCI_IT_MASKCLR, 1 << dmach);
 	OWRITE(sc, OHCI_IT_STATCLR, 1 << dmach);
@@ -1364,31 +1344,31 @@ fwohci_tx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	struct fwohcidb_tr *db_tr;
 	struct fwohcidb *db;
 
-	if(!(dbch->xferq.flag & FWXFERQ_EXTBUF)){
+	if (!(dbch->xferq.flag & FWXFERQ_EXTBUF)) {
 		err = EINVAL;
 		return err;
 	}
 	z = dbch->ndesc;
-	for(dmach = 0 ; dmach < sc->fc.nisodma ; dmach++){
-		if( &sc->it[dmach] == dbch){
+	for (dmach = 0; dmach < sc->fc.nisodma; dmach++) {
+		if (&sc->it[dmach] == dbch) {
 			off = OHCI_ITOFF(dmach);
 			break;
 		}
 	}
-	if(off == 0){
+	if (off == 0) {
 		err = EINVAL;
 		return err;
 	}
-	if(dbch->xferq.flag & FWXFERQ_RUNNING)
+	if (dbch->xferq.flag & FWXFERQ_RUNNING)
 		return err;
 	dbch->xferq.flag |= FWXFERQ_RUNNING;
-	for( i = 0, dbch->bottom = dbch->top; i < (dbch->ndb - 1); i++){
+	for (i = 0, dbch->bottom = dbch->top; i < (dbch->ndb - 1); i++) {
 		dbch->bottom = STAILQ_NEXT(dbch->bottom, link);
 	}
 	db_tr = dbch->top;
-	for (idb = 0; idb < dbch->ndb; idb ++) {
+	for (idb = 0; idb < dbch->ndb; idb++) {
 		fwohci_add_tx_buf(dbch, db_tr, idb);
-		if(STAILQ_NEXT(db_tr, link) == NULL){
+		if (STAILQ_NEXT(db_tr, link) == NULL) {
 			break;
 		}
 		db = db_tr->db;
@@ -1396,8 +1376,8 @@ fwohci_tx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		FWOHCI_DMA_WRITE(db[0].db.desc.depend,
 				STAILQ_NEXT(db_tr, link)->bus_addr | z);
 		db[ldesc].db.desc.depend = db[0].db.desc.depend;
-		if(dbch->xferq.flag & FWXFERQ_EXTBUF){
-			if(((idb + 1 ) % dbch->xferq.bnpacket) == 0){
+		if (dbch->xferq.flag & FWXFERQ_EXTBUF) {
+			if (((idb + 1) % dbch->xferq.bnpacket) == 0) {
 				FWOHCI_DMA_SET(
 					db[ldesc].db.desc.cmd,
 					OHCI_INTERRUPT_ALWAYS);
@@ -1424,38 +1404,38 @@ fwohci_rx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	struct fwohcidb *db;
 
 	z = dbch->ndesc;
-	if(&sc->arrq == dbch){
+	if (&sc->arrq == dbch) {
 		off = OHCI_ARQOFF;
-	}else if(&sc->arrs == dbch){
+	} else if (&sc->arrs == dbch) {
 		off = OHCI_ARSOFF;
-	}else{
-		for(dmach = 0 ; dmach < sc->fc.nisodma ; dmach++){
-			if( &sc->ir[dmach] == dbch){
+	} else {
+		for (dmach = 0; dmach < sc->fc.nisodma; dmach++) {
+			if (&sc->ir[dmach] == dbch) {
 				off = OHCI_IROFF(dmach);
 				break;
 			}
 		}
 	}
-	if(off == 0){
+	if (off == 0) {
 		err = EINVAL;
 		return err;
 	}
-	if(dbch->xferq.flag & FWXFERQ_STREAM){
-		if(dbch->xferq.flag & FWXFERQ_RUNNING)
+	if (dbch->xferq.flag & FWXFERQ_STREAM) {
+		if (dbch->xferq.flag & FWXFERQ_RUNNING)
 			return err;
-	}else{
-		if(dbch->xferq.flag & FWXFERQ_RUNNING){
+	} else {
+		if (dbch->xferq.flag & FWXFERQ_RUNNING) {
 			err = EBUSY;
 			return err;
 		}
 	}
 	dbch->xferq.flag |= FWXFERQ_RUNNING;
 	dbch->top = STAILQ_FIRST(&dbch->db_trq);
-	for( i = 0, dbch->bottom = dbch->top; i < (dbch->ndb - 1); i++){
+	for (i = 0, dbch->bottom = dbch->top; i < (dbch->ndb - 1); i++) {
 		dbch->bottom = STAILQ_NEXT(dbch->bottom, link);
 	}
 	db_tr = dbch->top;
-	for (idb = 0; idb < dbch->ndb; idb ++) {
+	for (idb = 0; idb < dbch->ndb; idb++) {
 		fwohci_add_rx_buf(dbch, db_tr, idb, &sc->dummy_dma);
 		if (STAILQ_NEXT(db_tr, link) == NULL)
 			break;
@@ -1463,8 +1443,8 @@ fwohci_rx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 		ldesc = db_tr->dbcnt - 1;
 		FWOHCI_DMA_WRITE(db[ldesc].db.desc.depend,
 			STAILQ_NEXT(db_tr, link)->bus_addr | z);
-		if(dbch->xferq.flag & FWXFERQ_EXTBUF){
-			if(((idb + 1 ) % dbch->xferq.bnpacket) == 0){
+		if (dbch->xferq.flag & FWXFERQ_EXTBUF) {
+			if (((idb + 1) % dbch->xferq.bnpacket) == 0) {
 				FWOHCI_DMA_SET(
 					db[ldesc].db.desc.cmd,
 					OHCI_INTERRUPT_ALWAYS);
@@ -1480,9 +1460,9 @@ fwohci_rx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
 	dbch->buf_offset = 0;
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_PREREAD);
 	fwdma_sync_multiseg_all(dbch->am, BUS_DMASYNC_PREWRITE);
-	if(dbch->xferq.flag & FWXFERQ_STREAM){
+	if (dbch->xferq.flag & FWXFERQ_STREAM) {
 		return err;
-	}else{
+	} else {
 		OWRITE(sc, OHCI_DMACMD(off), dbch->top->bus_addr | z);
 	}
 	OWRITE(sc, OHCI_DMACTL(off), OHCI_CNTL_DMA_RUN);
@@ -1504,12 +1484,12 @@ fwohci_next_cycle(struct firewire_comm *fc, int cycle_now)
 #endif
 	cycle = cycle + CYCLE_DELAY;
 	if (cycle >= 8000) {
-		sec ++;
+		sec++;
 		cycle -= 8000;
 	}
 	cycle = roundup2(cycle, CYCLE_MOD);
 	if (cycle >= 8000) {
-		sec ++;
+		sec++;
 		if (cycle == 8000)
 			cycle = 0;
 		else
@@ -1517,7 +1497,7 @@ fwohci_next_cycle(struct firewire_comm *fc, int cycle_now)
 	}
 	cycle_match = ((sec << 13) | cycle) & 0x7ffff;
 
-	return(cycle_match);
+	return (cycle_match);
 }
 
 static int
@@ -1546,7 +1526,7 @@ fwohci_itxbuf_enable(struct firewire_comm *fc, int dmach)
 
 		err = fwohci_tx_enable(sc, dbch);
 	}
-	if(err)
+	if (err)
 		return err;
 
 	ldesc = dbch->ndesc - 1;
@@ -1566,7 +1546,7 @@ fwohci_itxbuf_enable(struct firewire_comm *fc, int dmach)
 						OHCI_BRANCH_ALWAYS);
 #endif
 #if 0 /* if bulkxfer->npacket changes */
-			db[ldesc].db.desc.depend = db[0].db.desc.depend = 
+			db[ldesc].db.desc.depend = db[0].db.desc.depend =
 				((struct fwohcidb_tr *)
 				(chunk->start))->bus_addr | dbch->ndesc;
 #else
@@ -1669,7 +1649,7 @@ fwohci_irx_enable(struct firewire_comm *fc, int dmach)
 			return ENOMEM;
 		err = fwohci_rx_enable(sc, dbch);
 	}
-	if(err)
+	if (err)
 		return err;
 
 	first = STAILQ_FIRST(&ir->stfree);
@@ -1748,28 +1728,28 @@ fwohci_stop(struct fwohci_softc *sc, device_t dev)
 	fwohci_set_intr(&sc->fc, 0);
 
 /* Now stopping all DMA channel */
-	OWRITE(sc,  OHCI_ARQCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ARSCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
-	OWRITE(sc,  OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ARQCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ARSCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
+	OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
 
-	for( i = 0 ; i < sc->fc.nisodma ; i ++ ){
-		OWRITE(sc,  OHCI_IRCTLCLR(i), OHCI_CNTL_DMA_RUN);
-		OWRITE(sc,  OHCI_ITCTLCLR(i), OHCI_CNTL_DMA_RUN);
+	for (i = 0; i < sc->fc.nisodma; i++) {
+		OWRITE(sc, OHCI_IRCTLCLR(i), OHCI_CNTL_DMA_RUN);
+		OWRITE(sc, OHCI_ITCTLCLR(i), OHCI_CNTL_DMA_RUN);
 	}
 
-#if 0 /* Let dcons(4) be accessed */  
+#if 0 /* Let dcons(4) be accessed */
 /* Stop interrupt */
 	OWRITE(sc, FWOHCI_INTMASKCLR,
 			OHCI_INT_EN | OHCI_INT_ERR | OHCI_INT_PHY_SID
 			| OHCI_INT_PHY_INT
-			| OHCI_INT_DMA_ATRQ | OHCI_INT_DMA_ATRS 
+			| OHCI_INT_DMA_ATRQ | OHCI_INT_DMA_ATRS
 			| OHCI_INT_DMA_PRRQ | OHCI_INT_DMA_PRRS
-			| OHCI_INT_DMA_ARRQ | OHCI_INT_DMA_ARRS 
+			| OHCI_INT_DMA_ARRQ | OHCI_INT_DMA_ARRS
 			| OHCI_INT_PHY_BUS_R);
 
 /* FLUSH FIFO and reset Transmitter/Reciever */
-	OWRITE(sc,  OHCI_HCCCTL, OHCI_HCC_RESET);
+	OWRITE(sc, OHCI_HCCCTL, OHCI_HCC_RESET);
 #endif
 
 /* XXX Link down?  Bus reset? */
@@ -1785,14 +1765,14 @@ fwohci_resume(struct fwohci_softc *sc, device_t dev)
 
 	fwohci_reset(sc, dev);
 	/* XXX resume isochronous receive automatically. (how about TX?) */
-	for(i = 0; i < sc->fc.nisodma; i ++) {
+	for (i = 0; i < sc->fc.nisodma; i++) {
 		ir = &sc->ir[i].xferq;
-		if((ir->flag & FWXFERQ_RUNNING) != 0) {
+		if ((ir->flag & FWXFERQ_RUNNING) != 0) {
 			device_printf(sc->fc.dev,
 				"resume iso receive ch: %d\n", i);
 			ir->flag &= ~FWXFERQ_RUNNING;
 			/* requeue stdma to stfree */
-			while((chunk = STAILQ_FIRST(&ir->stdma)) != NULL) {
+			while ((chunk = STAILQ_FIRST(&ir->stdma)) != NULL) {
 				STAILQ_REMOVE_HEAD(&ir->stdma, link);
 				STAILQ_INSERT_TAIL(&ir->stfree, chunk, link);
 			}
@@ -1809,7 +1789,7 @@ fwohci_resume(struct fwohci_softc *sc, device_t dev)
 static void
 fwohci_dump_intr(struct fwohci_softc *sc, uint32_t stat)
 {
-	if(stat & OREAD(sc, FWOHCI_INTMASK))
+	if (stat & OREAD(sc, FWOHCI_INTMASK))
 		device_printf(fc->dev, "INTERRUPT < %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s> 0x%08x, 0x%08x\n",
 			stat & OHCI_INT_EN ? "DMA_EN ":"",
 			stat & OHCI_INT_PHY_REG ? "PHY_REG ":"",
@@ -1832,10 +1812,11 @@ fwohci_dump_intr(struct fwohci_softc *sc, uint32_t stat)
 			stat & OHCI_INT_DMA_ARRQ  ? "DMA_ARRQ " :"",
 			stat & OHCI_INT_DMA_ATRS  ? "DMA_ATRS " :"",
 			stat & OHCI_INT_DMA_ATRQ  ? "DMA_ATRQ " :"",
-			stat, OREAD(sc, FWOHCI_INTMASK) 
+			stat, OREAD(sc, FWOHCI_INTMASK)
 		);
 }
 #endif
+
 static void
 fwohci_intr_core(struct fwohci_softc *sc, uint32_t stat, int count)
 {
@@ -1846,15 +1827,15 @@ fwohci_intr_core(struct fwohci_softc *sc, uint32_t stat, int count)
 	if ((stat & OHCI_INT_PHY_BUS_R) && (fc->status != FWBUSRESET)) {
 		fc->status = FWBUSRESET;
 		/* Disable bus reset interrupt until sid recv. */
-		OWRITE(sc, FWOHCI_INTMASKCLR,  OHCI_INT_PHY_BUS_R);
-	
+		OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_PHY_BUS_R);
+
 		device_printf(fc->dev, "%s: BUS reset\n", __func__);
-		OWRITE(sc, FWOHCI_INTMASKCLR,  OHCI_INT_CYC_LOST);
+		OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_CYC_LOST);
 		OWRITE(sc, OHCI_LNKCTLCLR, OHCI_CNTL_CYCSRC);
 
-		OWRITE(sc,  OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
+		OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
 		sc->atrq.xferq.flag &= ~FWXFERQ_RUNNING;
-		OWRITE(sc,  OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
+		OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
 		sc->atrs.xferq.flag &= ~FWXFERQ_RUNNING;
 
 		if (!kdb_active)
@@ -1875,10 +1856,10 @@ fwohci_intr_core(struct fwohci_softc *sc, uint32_t stat, int count)
 			OWRITE(sc, OHCI_PREQUPPER, 0x10000);
 		}
 		/* Set ATRetries register */
-		OWRITE(sc, OHCI_ATRETRY, 1<<(13+16) | 0xfff);
+		OWRITE(sc, OHCI_ATRETRY, 1<<(13 + 16) | 0xfff);
 
 		/*
-		 * Checking whether the node is root or not. If root, turn on 
+		 * Checking whether the node is root or not. If root, turn on
 		 * cycle master.
 		 */
 		node_id = OREAD(sc, FWOHCI_NODEID);
@@ -1895,7 +1876,7 @@ fwohci_intr_core(struct fwohci_softc *sc, uint32_t stat, int count)
 
 		/* cycle timer */
 		sc->cycle_lost = 0;
-		OWRITE(sc, FWOHCI_INTMASK,  OHCI_INT_CYC_LOST);
+		OWRITE(sc, FWOHCI_INTMASK, OHCI_INT_CYC_LOST);
 		if ((node_id & OHCI_NODE_ROOT) && !nocyclemaster) {
 			printf("CYCLEMASTER mode\n");
 			OWRITE(sc, OHCI_LNKCTL,
@@ -1925,10 +1906,10 @@ fwohci_intr_dma(struct fwohci_softc *sc, uint32_t stat, int count)
 
 	if (stat & OHCI_INT_DMA_IR) {
 		irstat = atomic_readandclear_int(&sc->irstat);
-		for(i = 0; i < fc->nisodma ; i++){
+		for (i = 0; i < fc->nisodma; i++) {
 			struct fwohci_dbch *dbch;
 
-			if((irstat & (1 << i)) != 0){
+			if ((irstat & (1 << i)) != 0) {
 				dbch = &sc->ir[i];
 				if ((dbch->xferq.flag & FWXFERQ_OPEN) == 0) {
 					device_printf(sc->fc.dev,
@@ -1941,8 +1922,8 @@ fwohci_intr_dma(struct fwohci_softc *sc, uint32_t stat, int count)
 	}
 	if (stat & OHCI_INT_DMA_IT) {
 		itstat = atomic_readandclear_int(&sc->itstat);
-		for(i = 0; i < fc->nisodma ; i++){
-			if((itstat & (1 << i)) != 0){
+		for (i = 0; i < fc->nisodma; i++) {
+			if ((itstat & (1 << i)) != 0) {
 				fwohci_tbuf_update(sc, i);
 			}
 		}
@@ -1963,13 +1944,13 @@ fwohci_intr_dma(struct fwohci_softc *sc, uint32_t stat, int count)
 	}
 	if (stat & OHCI_INT_CYC_LOST) {
 		if (sc->cycle_lost >= 0)
-			sc->cycle_lost ++;
+			sc->cycle_lost++;
 		if (sc->cycle_lost > 10) {
 			sc->cycle_lost = -1;
 #if 0
 			OWRITE(sc, OHCI_LNKCTLCLR, OHCI_CNTL_CYCTIMER);
 #endif
-			OWRITE(sc, FWOHCI_INTMASKCLR,  OHCI_INT_CYC_LOST);
+			OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_CYC_LOST);
 			device_printf(fc->dev, "too many cycles lost, "
 			 "no cycle master present?\n");
 		}
@@ -1989,8 +1970,6 @@ fwohci_intr_dma(struct fwohci_softc *sc, uint32_t stat, int count)
 	if (stat & OHCI_INT_PHY_INT) {
 		device_printf(fc->dev, "phy int\n");
 	}
-
-	return;
 }
 
 static void
@@ -2035,8 +2014,8 @@ fwohci_task_sid(void *arg, int pending)
 		device_printf(fc->dev, "malloc failed\n");
 		return;
 	}
-	for (i = 0; i < plen / 4; i ++)
-		buf[i] = FWOHCI_DMA_READ(sc->sid_buf[i+1]);
+	for (i = 0; i < plen / 4; i++)
+		buf[i] = FWOHCI_DMA_READ(sc->sid_buf[i + 1]);
 
 	/* pending all pre-bus_reset packets */
 	fwohci_txd(sc, &sc->atrq);
@@ -2155,7 +2134,7 @@ fwohci_tbuf_update(struct fwohci_softc *sc, int dmach)
 		dump_db(sc, ITX_CH + dmach);
 	while ((chunk = STAILQ_FIRST(&it->stdma)) != NULL) {
 		db = ((struct fwohcidb_tr *)(chunk->end))->db;
-		stat = FWOHCI_DMA_READ(db[ldesc].db.desc.res) 
+		stat = FWOHCI_DMA_READ(db[ldesc].db.desc.res)
 				>> OHCI_STATUS_SHIFT;
 		db = ((struct fwohcidb_tr *)(chunk->start))->db;
 		/* timestamp */
@@ -2164,7 +2143,7 @@ fwohci_tbuf_update(struct fwohci_softc *sc, int dmach)
 		if (stat == 0)
 			break;
 		STAILQ_REMOVE_HEAD(&it->stdma, link);
-		switch (stat & FWOHCIEV_MASK){
+		switch (stat & FWOHCIEV_MASK) {
 		case FWOHCIEV_ACKCOMPL:
 #if 0
 			device_printf(fc->dev, "0x%08x\n", count);
@@ -2243,7 +2222,7 @@ fwohci_rbuf_update(struct fwohci_softc *sc, int dmach)
 	if (w == 0)
 		return;
 
-	if (ir->flag & FWXFERQ_HANDLER) 
+	if (ir->flag & FWXFERQ_HANDLER)
 		ir->hand(ir);
 	else
 		wakeup(ir);
@@ -2254,17 +2233,17 @@ dump_dma(struct fwohci_softc *sc, uint32_t ch)
 {
 	uint32_t off, cntl, stat, cmd, match;
 
-	if(ch == 0){
+	if (ch == 0) {
 		off = OHCI_ATQOFF;
-	}else if(ch == 1){
+	} else if (ch == 1) {
 		off = OHCI_ATSOFF;
-	}else if(ch == 2){
+	} else if (ch == 2) {
 		off = OHCI_ARQOFF;
-	}else if(ch == 3){
+	} else if (ch == 3) {
 		off = OHCI_ARSOFF;
-	}else if(ch < IRX_CH){
+	} else if (ch < IRX_CH) {
 		off = OHCI_ITCTL(ch - ITX_CH);
-	}else{
+	} else {
 		off = OHCI_IRCTL(ch - IRX_CH);
 	}
 	cntl = stat = OREAD(sc, off);
@@ -2273,10 +2252,10 @@ dump_dma(struct fwohci_softc *sc, uint32_t ch)
 
 	device_printf(sc->fc.dev, "ch %1x cntl:0x%08x cmd:0x%08x match:0x%08x\n",
 		ch,
-		cntl, 
-		cmd, 
+		cntl,
+		cmd,
 		match);
-	stat &= 0xffff ;
+	stat &= 0xffff;
 	if (stat) {
 		device_printf(sc->fc.dev, "dma %d ch:%s%s%s%s%s%s %s(%x)\n",
 			ch,
@@ -2289,7 +2268,7 @@ dump_dma(struct fwohci_softc *sc, uint32_t ch)
 			fwohcicode[stat & 0x1f],
 			stat & 0x1f
 		);
-	}else{
+	} else {
 		device_printf(sc->fc.dev, "dma %d ch: Nostat\n", ch);
 	}
 }
@@ -2302,60 +2281,61 @@ dump_db(struct fwohci_softc *sc, uint32_t ch)
 	struct fwohcidb *curr = NULL, *prev, *next = NULL;
 	int idb, jdb;
 	uint32_t cmd, off;
-	if(ch == 0){
+
+	if (ch == 0) {
 		off = OHCI_ATQOFF;
 		dbch = &sc->atrq;
-	}else if(ch == 1){
+	} else if (ch == 1) {
 		off = OHCI_ATSOFF;
 		dbch = &sc->atrs;
-	}else if(ch == 2){
+	} else if (ch == 2) {
 		off = OHCI_ARQOFF;
 		dbch = &sc->arrq;
-	}else if(ch == 3){
+	} else if (ch == 3) {
 		off = OHCI_ARSOFF;
 		dbch = &sc->arrs;
-	}else if(ch < IRX_CH){
+	} else if (ch < IRX_CH) {
 		off = OHCI_ITCTL(ch - ITX_CH);
 		dbch = &sc->it[ch - ITX_CH];
-	}else {
+	} else {
 		off = OHCI_IRCTL(ch - IRX_CH);
 		dbch = &sc->ir[ch - IRX_CH];
 	}
 	cmd = OREAD(sc, off + 0xc);
 
-	if( dbch->ndb == 0 ){
+	if (dbch->ndb == 0) {
 		device_printf(sc->fc.dev, "No DB is attached ch=%d\n", ch);
 		return;
 	}
 	pp = dbch->top;
 	prev = pp->db;
-	for(idb = 0 ; idb < dbch->ndb ; idb ++ ){
+	for (idb = 0; idb < dbch->ndb; idb++) {
 		cp = STAILQ_NEXT(pp, link);
-		if(cp == NULL){
+		if (cp == NULL) {
 			curr = NULL;
 			goto outdb;
 		}
 		np = STAILQ_NEXT(cp, link);
-		for(jdb = 0 ; jdb < dbch->ndesc ; jdb ++ ){
+		for (jdb = 0; jdb < dbch->ndesc; jdb++) {
 			if ((cmd  & 0xfffffff0) == cp->bus_addr) {
 				curr = cp->db;
-				if(np != NULL){
+				if (np != NULL) {
 					next = np->db;
-				}else{
+				} else {
 					next = NULL;
 				}
 				goto outdb;
 			}
 		}
 		pp = STAILQ_NEXT(pp, link);
-		if(pp == NULL){
+		if (pp == NULL) {
 			curr = NULL;
 			goto outdb;
 		}
 		prev = pp->db;
 	}
 outdb:
-	if( curr != NULL){
+	if (curr != NULL) {
 #if 0
 		printf("Prev DB %d\n", ch);
 		print_db(pp, prev, ch, dbch->ndesc);
@@ -2366,7 +2346,7 @@ dump_db(struct fwohci_softc *sc, uint32_t ch)
 		printf("Next DB %d\n", ch);
 		print_db(np, next, ch, dbch->ndesc);
 #endif
-	}else{
+	} else {
 		printf("dbdump err ch = %d cmd = 0x%08x\n", ch, cmd);
 	}
 	return;
@@ -2380,7 +2360,7 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db,
 	int i, key;
 	uint32_t cmd, res;
 
-	if(db == NULL){
+	if (db == NULL) {
 		printf("No Descriptor is found\n");
 		return;
 	}
@@ -2397,18 +2377,13 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db,
 		"Depend",
 		"Stat",
 		"Cnt");
-	for( i = 0 ; i <= max ; i ++){
+	for (i = 0; i <= max; i++) {
 		cmd = FWOHCI_DMA_READ(db[i].db.desc.cmd);
 		res = FWOHCI_DMA_READ(db[i].db.desc.res);
 		key = cmd & OHCI_KEY_MASK;
 		stat = res >> OHCI_STATUS_SHIFT;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		printf("%08x %s %s %s %s %5d %08x %08x %04x:%04x",
-				db_tr->bus_addr,
-#else
 		printf("%08jx %s %s %s %s %5d %08x %08x %04x:%04x",
 				(uintmax_t)db_tr->bus_addr,
-#endif
 				dbcode[(cmd >> 28) & 0xf],
 				dbkey[(cmd >> 24) & 0x7],
 				dbcond[(cmd >> 20) & 0x3],
@@ -2418,7 +2393,7 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db,
 				FWOHCI_DMA_READ(db[i].db.desc.depend),
 				stat,
 				res & OHCI_COUNT_MASK);
-		if(stat & 0xff00){
+		if (stat & 0xff00) {
 			printf(" %s%s%s%s%s%s %s(%x)\n",
 				stat & OHCI_CNTL_DMA_RUN ? "RUN," : "",
 				stat & OHCI_CNTL_DMA_WAKE ? "WAKE," : "",
@@ -2429,32 +2404,32 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db,
 				fwohcicode[stat & 0x1f],
 				stat & 0x1f
 			);
-		}else{
+		} else {
 			printf(" Nostat\n");
 		}
-		if(key == OHCI_KEY_ST2 ){
-			printf("0x%08x 0x%08x 0x%08x 0x%08x\n", 
-				FWOHCI_DMA_READ(db[i+1].db.immed[0]),
-				FWOHCI_DMA_READ(db[i+1].db.immed[1]),
-				FWOHCI_DMA_READ(db[i+1].db.immed[2]),
-				FWOHCI_DMA_READ(db[i+1].db.immed[3]));
+		if (key == OHCI_KEY_ST2) {
+			printf("0x%08x 0x%08x 0x%08x 0x%08x\n",
+				FWOHCI_DMA_READ(db[i + 1].db.immed[0]),
+				FWOHCI_DMA_READ(db[i + 1].db.immed[1]),
+				FWOHCI_DMA_READ(db[i + 1].db.immed[2]),
+				FWOHCI_DMA_READ(db[i + 1].db.immed[3]));
 		}
-		if(key == OHCI_KEY_DEVICE){
+		if (key == OHCI_KEY_DEVICE) {
 			return;
 		}
-		if((cmd & OHCI_BRANCH_MASK) 
-				== OHCI_BRANCH_ALWAYS){
+		if ((cmd & OHCI_BRANCH_MASK)
+				== OHCI_BRANCH_ALWAYS) {
 			return;
 		}
-		if((cmd & OHCI_CMD_MASK) 
-				== OHCI_OUTPUT_LAST){
+		if ((cmd & OHCI_CMD_MASK)
+				== OHCI_OUTPUT_LAST) {
 			return;
 		}
-		if((cmd & OHCI_CMD_MASK) 
-				== OHCI_INPUT_LAST){
+		if ((cmd & OHCI_CMD_MASK)
+				== OHCI_INPUT_LAST) {
 			return;
 		}
-		if(key == OHCI_KEY_ST2 ){
+		if (key == OHCI_KEY_ST2) {
 			i++;
 		}
 	}
@@ -2515,7 +2490,7 @@ fwohci_txbufdb(struct fwohci_softc *sc, int dmach, struct fw_bulkxfer *bulkxfer)
 /*
 device_printf(sc->fc.dev, "DB %08x %08x %08x\n", bulkxfer, db_tr->bus_addr, fdb_tr->bus_addr);
 */
-	for (idb = 0; idb < dbch->xferq.bnpacket; idb ++) {
+	for (idb = 0; idb < dbch->xferq.bnpacket; idb++) {
 		db = db_tr->db;
 		fp = (struct fw_pkt *)db_tr->buf;
 		ohcifp = (struct fwohci_txpkthdr *) db[1].db.immed;
@@ -2525,8 +2500,8 @@ device_printf(sc->fc.dev, "DB %08x %08x %08x\n", bulkxfer, db_tr->bus_addr, fdb_
 		ohcifp->mode.stream.chtag = chtag;
 		ohcifp->mode.stream.tcode = 0xa;
 #if BYTE_ORDER == BIG_ENDIAN
-		FWOHCI_DMA_WRITE(db[1].db.immed[0], db[1].db.immed[0]); 
-		FWOHCI_DMA_WRITE(db[1].db.immed[1], db[1].db.immed[1]); 
+		FWOHCI_DMA_WRITE(db[1].db.immed[0], db[1].db.immed[0]);
+		FWOHCI_DMA_WRITE(db[1].db.immed[1], db[1].db.immed[1]);
 #endif
 
 		FWOHCI_DMA_CLEAR(db[2].db.desc.cmd, OHCI_COUNT_MASK);
@@ -2571,7 +2546,7 @@ fwohci_add_tx_buf(struct fwohci_dbch *dbch, struct fwohcidb_tr *db_tr,
 	int err = 0;
 
 	it = &dbch->xferq;
-	if(it->buf == 0){
+	if (it->buf == 0) {
 		err = EINVAL;
 		return err;
 	}
@@ -2611,7 +2586,7 @@ fwohci_add_rx_buf(struct fwohci_dbch *dbch, struct fwohcidb_tr *db_tr,
 			    &db_tr->dma_map, ir->psize, &dbuf[0],
 			    BUS_DMA_NOWAIT);
 			if (db_tr->buf == NULL)
-				return(ENOMEM);
+				return (ENOMEM);
 		}
 		db_tr->dbcnt = 1;
 		dsiz[0] = ir->psize;
@@ -2626,11 +2601,11 @@ fwohci_add_rx_buf(struct fwohci_dbch *dbch, struct fwohcidb_tr *db_tr,
 		dsiz[db_tr->dbcnt] = ir->psize;
 		if (ir->buf != NULL) {
 			db_tr->buf = fwdma_v_addr(ir->buf, poffset);
-			dbuf[db_tr->dbcnt] = fwdma_bus_addr( ir->buf, poffset);
+			dbuf[db_tr->dbcnt] = fwdma_bus_addr(ir->buf, poffset);
 		}
 		db_tr->dbcnt++;
 	}
-	for(i = 0 ; i < db_tr->dbcnt ; i++){
+	for (i = 0; i < db_tr->dbcnt; i++) {
 		FWOHCI_DMA_WRITE(db[i].db.desc.addr, dbuf[i]);
 		FWOHCI_DMA_WRITE(db[i].db.desc.cmd, OHCI_INPUT_MORE | dsiz[i]);
 		if (ir->flag & FWXFERQ_STREAM) {
@@ -2680,19 +2655,19 @@ fwohci_arcv_swap(struct fw_pkt *fp, int len)
 		break;
 	default:
 		printf("Unknown tcode %d\n", fp0->mode.common.tcode);
-		return(0);
+		return (0);
 	}
 	hlen = tinfo[fp0->mode.common.tcode].hdr_len;
 	if (hlen > len) {
 		if (firewire_debug)
 			printf("splitted header\n");
-		return(-hlen);
+		return (-hlen);
 	}
 #if BYTE_ORDER == BIG_ENDIAN
-	for(i = 0; i < slen/4; i ++)
+	for (i = 0; i < slen/4; i++)
 		fp->mode.ld[i] = FWOHCI_DMA_READ(fp->mode.ld[i]);
 #endif
-	return(hlen);
+	return (hlen);
 }
 
 static int
@@ -2754,11 +2729,11 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 	caddr_t buf;
 	int resCount;
 
-	if(&sc->arrq == dbch){
+	if (&sc->arrq == dbch) {
 		off = OHCI_ARQOFF;
-	}else if(&sc->arrs == dbch){
+	} else if (&sc->arrs == dbch) {
 		off = OHCI_ARSOFF;
-	}else{
+	} else {
 		return;
 	}
 
@@ -2786,10 +2761,10 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 		if (len > 0)
 			bus_dmamap_sync(dbch->dmat, db_tr->dma_map,
 					BUS_DMASYNC_POSTREAD);
-		while (len > 0 ) {
+		while (len > 0) {
 			if (count >= 0 && count-- == 0)
 				goto out;
-			if(dbch->pdb_tr != NULL){
+			if (dbch->pdb_tr != NULL) {
 				/* we have a fragment in previous buffer */
 				int rlen;
 
@@ -2841,7 +2816,7 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 					dbch->pdb_tr = db_tr;
 					dbch->buf_offset = - dbch->buf_offset;
 					/* sanity check */
-					if (resCount != 0)  {
+					if (resCount != 0) {
 						printf("resCount=%d hlen=%d\n",
 						    resCount, hlen);
 						    goto err;
@@ -2866,7 +2841,7 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 					if (firewire_debug)
 						printf("splitted payload\n");
 					/* sanity check */
-					if (resCount != 0)  {
+					if (resCount != 0) {
 						printf("resCount=%d plen=%d"
 						    " len=%d\n",
 						    resCount, plen, len);
@@ -2876,7 +2851,7 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 				}
 				vec[nvec].iov_base = ld;
 				vec[nvec].iov_len = plen;
-				nvec ++;
+				nvec++;
 				ld += plen;
 			}
 			dbch->buf_offset = ld - (uint8_t *)db_tr->buf;
@@ -2903,7 +2878,7 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 
 				if ((vec[nvec-1].iov_len -=
 					sizeof(struct fwohci_trailer)) == 0)
-					nvec--; 
+					nvec--;
 				rb.fc = &sc->fc;
 				rb.vec = vec;
 				rb.nvec = nvec;
@@ -2930,7 +2905,7 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count)
 #endif
 				break;
 			}
-			pcnt ++;
+			pcnt++;
 			if (dbch->pdb_tr != NULL) {
 				fwohci_arcv_free_buf(sc, dbch, dbch->pdb_tr,
 				    off, 1);
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index e1e20b5da95a..7523f2cbc54f 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -46,34 +46,12 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#endif
 #include <machine/resource.h>
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#include <machine/clock.h>		/* for DELAY() */
-#endif
-
-#ifdef __DragonFly__
-#include <bus/pci/pcivar.h>
-#include <bus/pci/pcireg.h>
-
-#include "firewire.h"
-#include "firewirereg.h"
-
-#include "fwdma.h"
-#include "fwohcireg.h"
-#include "fwohcivar.h"
-#else
-#if __FreeBSD_version < 500000
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#else
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#endif
 
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
@@ -81,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/firewire/fwdma.h>
 #include <dev/firewire/fwohcireg.h>
 #include <dev/firewire/fwohcivar.h>
-#endif
 
 static int fwohci_pci_attach(device_t self);
 static int fwohci_pci_detach(device_t self);
@@ -90,9 +67,8 @@ static int fwohci_pci_detach(device_t self);
  * The probe routine.
  */
 static int
-fwohci_pci_probe( device_t dev )
+fwohci_pci_probe(device_t dev)
 {
-#if 1
 	uint32_t id;
 
 	id = pci_get_devid(dev);
@@ -213,7 +189,6 @@ fwohci_pci_probe( device_t dev )
 		device_set_desc(dev, "Sun PCIO-2");
 		return BUS_PROBE_DEFAULT;
 	}
-#endif
 	if (pci_get_class(dev) == PCIC_SERIALBUS
 			&& pci_get_subclass(dev) == PCIS_SERIALBUS_FW
 			&& pci_get_progif(dev) == PCI_INTERFACE_OHCI) {
@@ -227,14 +202,6 @@ fwohci_pci_probe( device_t dev )
 	return ENXIO;
 }
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-static void
-fwohci_dummy_intr(void *arg)
-{
-	/* XXX do nothing */
-}
-#endif
-
 static int
 fwohci_pci_init(device_t self)
 {
@@ -244,7 +211,7 @@ fwohci_pci_init(device_t self)
 	cmd = pci_read_config(self, PCIR_COMMAND, 2);
 	cmd |= PCIM_CMD_BUSMASTEREN | PCIM_CMD_MWRICEN;
 #if 1  /* for broken hardware */
-	cmd &= ~PCIM_CMD_MWRICEN; 
+	cmd &= ~PCIM_CMD_MWRICEN;
 #endif
 	pci_write_config(self, PCIR_COMMAND, cmd, 2);
 
@@ -286,17 +253,6 @@ fwohci_pci_attach(device_t self)
 	fwohci_softc_t *sc = device_get_softc(self);
 	int err;
 	int rid;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	int intr;
-	/* For the moment, put in a message stating what is wrong */
-	intr = pci_read_config(self, PCIR_INTLINE, 1);
-	if (intr == 0 || intr == 255) {
-		device_printf(self, "Invalid irq %d\n", intr);
-#ifdef __i386__
-		device_printf(self, "Please switch PNP-OS to 'No' in BIOS\n");
-#endif
-	}
-#endif
 
 #if 0
 	if (bootverbose)
@@ -307,12 +263,7 @@ fwohci_pci_attach(device_t self)
 	fwohci_pci_init(self);
 
 	rid = PCI_CBMEM;
-#if __FreeBSD_version >= 502109
 	sc->bsr = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
-#else
-	sc->bsr = bus_alloc_resource(self, SYS_RES_MEMORY, &rid,
-	    0, ~0, 1, RF_ACTIVE);
-#endif
 	if (!sc->bsr) {
 		device_printf(self, "Could not map memory\n");
 		return ENXIO;
@@ -322,13 +273,8 @@ fwohci_pci_attach(device_t self)
 	sc->bsh = rman_get_bushandle(sc->bsr);
 
 	rid = 0;
-#if __FreeBSD_version >= 502109
 	sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
 				     RF_SHAREABLE | RF_ACTIVE);
-#else
-	sc->irq_res = bus_alloc_resource(self, SYS_RES_IRQ, &rid, 0, ~0, 1,
-				     RF_SHAREABLE | RF_ACTIVE);
-#endif
 	if (sc->irq_res == NULL) {
 		device_printf(self, "Could not allocate irq\n");
 		fwohci_pci_detach(self);
@@ -340,14 +286,6 @@ fwohci_pci_attach(device_t self)
 				NULL, (driver_intr_t *) fwohci_intr,
 				sc, &sc->ih);
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	/* XXX splcam() should mask this irq for sbp.c*/
-	err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_CAM,
-		     (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_cam);
-	/* XXX splbio() should mask this irq for physio()/fwmem_strategy() */
-	err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO,
-		     (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
-#endif
 	if (err) {
 		device_printf(self, "Could not setup irq, %d\n", err);
 		fwohci_pci_detach(self);
@@ -355,11 +293,7 @@ fwohci_pci_attach(device_t self)
 	}
 
 	err = bus_dma_tag_create(
-#if defined(__FreeBSD__) && __FreeBSD_version >= 700020
 				/*parent*/bus_get_dma_tag(self),
-#else
-				/*parent*/NULL,
-#endif
 				/*alignment*/1,
 				/*boundary*/0,
 #if BOUNCE_BUFFER_TEST
@@ -373,20 +307,19 @@ fwohci_pci_attach(device_t self)
 				/*nsegments*/0x20,
 				/*maxsegsz*/0x8000,
 				/*flags*/BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 				/*lockfunc*/busdma_lock_mutex,
 				/*lockarg*/FW_GMTX(&sc->fc),
-#endif
 				&sc->fc.dmat);
 	if (err != 0) {
-		printf("fwohci_pci_attach: Could not allocate DMA tag "
-			"- error %d\n", err);
-			return (ENOMEM);
+		device_printf(self, "fwohci_pci_attach: Could not allocate DMA "
+		    "tag - error %d\n", err);
+		fwohci_pci_detach(self);
+		return (ENOMEM);
 	}
 
 	err = fwohci_init(sc, self);
 
-	if (err) {
+	if (err != 0) {
 		device_printf(self, "fwohci_init failed with err=%d\n", err);
 		fwohci_pci_detach(self);
 		return EIO;
@@ -405,13 +338,13 @@ fwohci_pci_detach(device_t self)
 	fwohci_softc_t *sc = device_get_softc(self);
 	int s;
 
-
 	s = splfw();
 
 	if (sc->bsr)
 		fwohci_stop(sc, self);
 
 	bus_generic_detach(self);
+
 	if (sc->fc.bdev) {
 		device_delete_child(self, sc->fc.bdev);
 		sc->fc.bdev = NULL;
@@ -429,10 +362,6 @@ fwohci_pci_detach(device_t self)
 			if (err)
 				device_printf(self,
 					 "Could not tear down irq, %d\n", err);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-			bus_teardown_intr(self, sc->irq_res, sc->ih_cam);
-			bus_teardown_intr(self, sc->irq_res, sc->ih_bio);
-#endif
 			sc->ih = NULL;
 		}
 		bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res);
@@ -440,7 +369,7 @@ fwohci_pci_detach(device_t self)
 	}
 
 	if (sc->bsr) {
-		bus_release_resource(self, SYS_RES_MEMORY,PCI_CBMEM,sc->bsr);
+		bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, sc->bsr);
 		sc->bsr = NULL;
 		sc->bst = 0;
 		sc->bsh = 0;
@@ -500,7 +429,7 @@ fwohci_pci_add_child(device_t dev, u_int order, const char *name, int unit)
 		return (child);
 
 	sc->fc.bdev = child;
-	device_set_ivars(child, (void *)&sc->fc);
+	device_set_ivars(child, &sc->fc);
 
 	err = device_probe_and_attach(child);
 	if (err) {
@@ -519,7 +448,7 @@ fwohci_pci_add_child(device_t dev, u_int order, const char *name, int unit)
 		int s;
 		DELAY(250); /* 2 cycles */
 		s = splfw();
-		fwohci_poll((void *)sc, 0, -1);
+		fwohci_poll(&sc->fc, 0, -1);
 		splx(s);
 	}
 
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index d8deca8f3214..95fe26ed2b22 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -184,7 +184,7 @@ struct fwohcidb {
 
 #define FWOHCIEV_MASK 0x1f
 
-struct ohci_dma{
+struct ohci_dma {
 	fwohcireg_t	cntl;
 
 #define	OHCI_CNTL_CYCMATCH_S	(0x1 << 31)
@@ -211,7 +211,7 @@ struct ohci_dma{
 	fwohcireg_t	dummy3;
 };
 
-struct ohci_itdma{
+struct ohci_itdma {
 	fwohcireg_t	cntl;
 	fwohcireg_t	cntl_clr;
 	fwohcireg_t	dummy0;
@@ -237,7 +237,7 @@ struct ohci_registers {
 	fwohcireg_t	config_rom;	/* config ROM map 0x34 */
 	fwohcireg_t	post_wr_lo;	/* post write addr lo 0x38 */
 	fwohcireg_t	post_wr_hi;	/* post write addr hi 0x3c */
-	fwohcireg_t	vender;		/* vender ID 0x40 */
+	fwohcireg_t	vendor;		/* vendor ID 0x40 */
 	fwohcireg_t	dummy1[3];	/* dummy 0x44-0x4c */
 	fwohcireg_t	hcc_cntl_set;	/* HCC control set 0x50 */
 	fwohcireg_t	hcc_cntl_clr;	/* HCC control clr 0x54 */
@@ -308,7 +308,7 @@ struct ohci_registers {
 	fwohcireg_t	pys_upper;	/* Physical Upper bound 0x120 */
 
 	fwohcireg_t	dummy7[23];	/* dummy 0x124-0x17c */
-	
+
 	/*       0x180, 0x184, 0x188, 0x18c */
 	/*       0x190, 0x194, 0x198, 0x19c */
 	/*       0x1a0, 0x1a4, 0x1a8, 0x1ac */
@@ -328,7 +328,7 @@ struct ohci_registers {
 	struct ohci_dma dma_irch[0x20];
 };
 
-struct fwohcidb_tr{
+struct fwohcidb_tr {
 	STAILQ_ENTRY(fwohcidb_tr) link;
 	struct fw_xfer *xfer;
 	struct fwohcidb *db;
@@ -341,8 +341,8 @@ struct fwohcidb_tr{
 /*
  * OHCI info structure.
  */
-struct fwohci_txpkthdr{
-	union{
+struct fwohci_txpkthdr {
+	union {
 		uint32_t ld[4];
 		struct {
 #if BYTE_ORDER == BIG_ENDIAN
@@ -376,7 +376,7 @@ struct fwohci_txpkthdr{
 				 :8;
 #endif
 			BIT16x2(dst, );
-		}asycomm;
+		} asycomm;
 		struct {
 #if BYTE_ORDER == BIG_ENDIAN
 			uint32_t :13,
@@ -392,16 +392,17 @@ struct fwohci_txpkthdr{
 				 :13;
 #endif
 			BIT16x2(len, );
-		}stream;
-	}mode;
+		} stream;
+	} mode;
 };
-struct fwohci_trailer{
+
+struct fwohci_trailer {
 #if BYTE_ORDER == BIG_ENDIAN
 	uint32_t stat:16,
-		  time:16;
+		 time:16;
 #else
 	uint32_t time:16,
-		  stat:16;
+		 stat:16;
 #endif
 };
 
@@ -412,7 +413,7 @@ struct fwohci_trailer{
 #define	OHCI_CNTL_SID		(0x1 << 9)
 
 /*
- * defined in OHCI 1.1 
+ * defined in OHCI 1.1
  * chapter 6.1
  */
 #define OHCI_INT_DMA_ATRQ	(0x1 << 0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 6f9729096023..985bc6aff5ee 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -42,13 +42,9 @@ typedef struct fwohci_softc {
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
 	void *ih;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	void *ih_cam;
-	void *ih_bio;
-#endif
 	struct resource *bsr;
 	struct resource *irq_res;
-	struct fwohci_dbch{
+	struct fwohci_dbch {
 		u_int ndb;
 		u_int ndesc;
 		STAILQ_HEAD(, fwohcidb_tr) db_trq;
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 11f3042ff9b0..393d93156b7d 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -97,7 +97,7 @@ struct ciphdr {
 	} fdf;
 
 };
-struct dvdbc{
+struct dvdbc {
 #if BYTE_ORDER == BIG_ENDIAN
 	uint8_t sct:3,		/* Section type */
 		:1,		/* Reserved */
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 5797cc795704..5d15ead0db54 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2002-2003
  * 	Hidetoshi Shimokawa. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -18,7 +18,7 @@
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  */
 
@@ -57,18 +57,11 @@
 #include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_types.h>
-#ifdef __DragonFly__
-#include <net/vlan/if_vlan_var.h>
-#include <bus/firewire/firewire.h>
-#include <bus/firewire/firewirereg.h>
-#include "if_fwevar.h"
-#else
 #include <net/if_vlan_var.h>
 
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/if_fwevar.h>
-#endif
 
 #define FWEDEBUG	if (fwedebug) if_printf
 #define TX_MAX_QUEUE	(FWMAXQUEUE - 1)
@@ -130,8 +123,8 @@ fwe_probe(device_t dev)
 	device_t pa;
 
 	pa = device_get_parent(dev);
-	if(device_get_unit(dev) != device_get_unit(pa)){
-		return(ENXIO);
+	if (device_get_unit(dev) != device_get_unit(pa)) {
+		return (ENXIO);
 	}
 
 	device_set_desc(dev, "Ethernet over FireWire");
@@ -144,11 +137,7 @@ fwe_attach(device_t dev)
 	struct fwe_softc *fwe;
 	struct ifnet *ifp;
 	int unit, s;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	u_char *eaddr;
-#else
 	u_char eaddr[6];
-#endif
 	struct fw_eui64 *eui;
 
 	fwe = ((struct fwe_softc *)device_get_softc(dev));
@@ -175,10 +164,6 @@ fwe_attach(device_t dev)
 	/* generate fake MAC address: first and last 3bytes from eui64 */
 #define LOCAL (0x02)
 #define GROUP (0x01)
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	eaddr = &IFP2ENADDR(fwe->eth_softc.ifp)[0];
-#endif
-
 
 	eui = &fwe->fd.fc->eui;
 	eaddr[0] = (FW_EUI64_BYTE(eui, 0) | LOCAL) & ~GROUP;
@@ -191,7 +176,7 @@ fwe_attach(device_t dev)
 		"%02x:%02x:%02x:%02x:%02x:%02x\n", unit,
 		eaddr[0], eaddr[1], eaddr[2], eaddr[3], eaddr[4], eaddr[5]);
 
-	/* fill the rest and attach interface */	
+	/* fill the rest and attach interface */
 	ifp = fwe->eth_softc.ifp = if_alloc(IFT_ETHER);
 	if (ifp == NULL) {
 		device_printf(dev, "can not if_alloc()\n");
@@ -199,36 +184,21 @@ fwe_attach(device_t dev)
 	}
 	ifp->if_softc = &fwe->eth_softc;
 
-#if __FreeBSD_version >= 501113 || defined(__DragonFly__)
 	if_initname(ifp, device_get_name(dev), unit);
-#else
-	ifp->if_unit = unit;
-	ifp->if_name = "fwe";
-#endif
 	ifp->if_init = fwe_init;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	ifp->if_output = ether_output;
-#endif
 	ifp->if_start = fwe_start;
 	ifp->if_ioctl = fwe_ioctl;
 	ifp->if_flags = (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST);
 	ifp->if_snd.ifq_maxlen = TX_MAX_QUEUE;
 
 	s = splimp();
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	ether_ifattach(ifp, 1);
-#else
 	ether_ifattach(ifp, eaddr);
-#endif
 	splx(s);
 
         /* Tell the upper layer(s) we support long frames. */
 	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_POLLING;
 	ifp->if_capenable |= IFCAP_VLAN_MTU;
-#endif
-
 
 	FWEDEBUG(ifp, "interface created\n");
 	return 0;
@@ -250,12 +220,12 @@ fwe_stop(struct fwe_softc *fwe)
 
 		if (xferq->flag & FWXFERQ_RUNNING)
 			fc->irx_disable(fc, fwe->dma_ch);
-		xferq->flag &= 
+		xferq->flag &=
 			~(FWXFERQ_MODEMASK | FWXFERQ_OPEN | FWXFERQ_STREAM |
 			FWXFERQ_EXTBUF | FWXFERQ_HANDLER | FWXFERQ_CHTAGMASK);
 		xferq->hand =  NULL;
 
-		for (i = 0; i < xferq->bnchunk; i ++)
+		for (i = 0; i < xferq->bnchunk; i++)
 			m_freem(xferq->bulkxfer[i].mbuf);
 		free(xferq->bulkxfer, M_FWE);
 
@@ -270,11 +240,7 @@ fwe_stop(struct fwe_softc *fwe)
 		fwe->dma_ch = -1;
 	}
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-#else
-	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
-#endif
 }
 
 static int
@@ -294,12 +260,8 @@ fwe_detach(device_t dev)
 	s = splimp();
 
 	fwe_stop(fwe);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	ether_ifdetach(ifp, 1);
-#else
 	ether_ifdetach(ifp);
 	if_free(ifp);
-#endif
 
 	splx(s);
 	mtx_destroy(&fwe->mtx);
@@ -353,7 +315,7 @@ fwe_init(void *arg)
 		STAILQ_INIT(&xferq->stfree);
 		STAILQ_INIT(&xferq->stdma);
 		xferq->stproc = NULL;
-		for (i = 0; i < xferq->bnchunk; i ++) {
+		for (i = 0; i < xferq->bnchunk; i++) {
 			m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
 			xferq->bulkxfer[i].mbuf = m;
 			m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
@@ -379,13 +341,8 @@ fwe_init(void *arg)
 	if ((xferq->flag & FWXFERQ_RUNNING) == 0)
 		fc->irx_enable(fc, fwe->dma_ch);
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
-#endif
 
 #if 0
 	/* attempt to start output */
@@ -405,18 +362,10 @@ fwe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		case SIOCSIFFLAGS:
 			s = splimp();
 			if (ifp->if_flags & IFF_UP) {
-#if defined(__FreeBSD__)
 				if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-#else
-				if (!(ifp->if_flags & IFF_RUNNING))
-#endif
 					fwe_init(&fwe->eth_softc);
 			} else {
-#if defined(__FreeBSD__)
 				if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-#else
-				if (ifp->if_flags & IFF_RUNNING)
-#endif
 					fwe_stop(fwe);
 			}
 			/* XXX keep promiscoud mode */
@@ -444,7 +393,7 @@ fwe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			    !(ifp->if_capenable & IFCAP_POLLING)) {
 				error = ether_poll_register(fwe_poll, ifp);
 				if (error)
-					return(error);
+					return (error);
 				/* Disable interrupts */
 				fc->set_intr(fc, 0);
 				ifp->if_capenable |= IFCAP_POLLING;
@@ -463,21 +412,11 @@ fwe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		    }
 #endif /* DEVICE_POLLING */
 			break;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		default:
-#else
-		case SIOCSIFADDR:
-		case SIOCGIFADDR:
-		case SIOCSIFMTU:
-#endif
 			s = splimp();
 			error = ether_ioctl(ifp, cmd, data);
 			splx(s);
 			return (error);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		default:
-			return (EINVAL);
-#endif
 	}
 
 	return (0);
@@ -495,8 +434,7 @@ fwe_output_callback(struct fw_xfer *xfer)
 	/* XXX error check */
 	FWEDEBUG(ifp, "resp = %d\n", xfer->resp);
 	if (xfer->resp != 0)
-		ifp->if_oerrors ++;
-		
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	m_freem(xfer->mbuf);
 	fw_xfer_unload(xfer);
 
@@ -529,7 +467,7 @@ fwe_start(struct ifnet *ifp)
 			IF_DEQUEUE(&ifp->if_snd, m);
 			if (m != NULL)
 				m_freem(m);
-			ifp->if_oerrors ++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} while (m != NULL);
 		splx(s);
 
@@ -537,20 +475,12 @@ fwe_start(struct ifnet *ifp)
 	}
 
 	s = splimp();
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags |= IFF_OACTIVE;
-#endif
 
 	if (ifp->if_snd.ifq_len != 0)
 		fwe_as_output(fwe, ifp);
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags &= ~IFF_OACTIVE;
-#endif
 	splx(s);
 }
 
@@ -591,12 +521,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
 			FWE_UNLOCK(fwe);
 			break;
 		}
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		if (ifp->if_bpf != NULL)
-			bpf_mtap(ifp, m);
-#else
 		BPF_MTAP(ifp, m);
-#endif
 
 		/* keep ip packet alignment for alpha */
 		M_PREPEND(m, ETHER_ALIGN, M_NOWAIT);
@@ -608,11 +533,11 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
 
 		if (fw_asyreq(fwe->fd.fc, -1, xfer) != 0) {
 			/* error */
-			ifp->if_oerrors ++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* XXX set error code */
 			fwe_output_callback(xfer);
 		} else {
-			ifp->if_opackets ++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			i++;
 		}
 	}
@@ -634,9 +559,6 @@ fwe_as_input(struct fw_xferq *xferq)
 	struct fw_bulkxfer *sxfer;
 	struct fw_pkt *fp;
 	u_char *c;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	struct ether_header *eh;
-#endif
 
 	fwe = (struct fwe_softc *)xferq->sc;
 	ifp = fwe->eth_softc.ifp;
@@ -660,20 +582,13 @@ fwe_as_input(struct fw_xferq *xferq)
 		if (sxfer->resp != 0 || fp->mode.stream.len <
 		    ETHER_ALIGN + sizeof(struct ether_header)) {
 			m_freem(m);
-			ifp->if_ierrors ++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 
 		m->m_data += HDR_LEN + ETHER_ALIGN;
 		c = mtod(m, u_char *);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		eh = (struct ether_header *)c;
-		m->m_data += sizeof(struct ether_header);
-		m->m_len = m->m_pkthdr.len = fp->mode.stream.len - ETHER_ALIGN
-		    - sizeof(struct ether_header);
-#else
 		m->m_len = m->m_pkthdr.len = fp->mode.stream.len - ETHER_ALIGN;
-#endif
 		m->m_pkthdr.rcvif = ifp;
 #if 0
 		FWEDEBUG(ifp, "%02x %02x %02x %02x %02x %02x\n"
@@ -688,14 +603,10 @@ fwe_as_input(struct fw_xferq *xferq)
 			 c[16], c[17], c[18], c[19],
 			 c[20], c[21], c[22], c[23],
 			 c[20], c[21], c[22], c[23]
-		 );
+		);
 #endif
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		ether_input(ifp, eh, m);
-#else
 		(*ifp->if_input)(ifp, m);
-#endif
-		ifp->if_ipackets ++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	}
 	if (STAILQ_FIRST(&xferq->stfree) != NULL)
 		fwe->fd.fc->irx_enable(fwe->fd.fc, fwe->dma_ch);
@@ -720,9 +631,6 @@ static driver_t fwe_driver = {
 };
 
 
-#ifdef __DragonFly__
-DECLARE_DUMMY_MODULE(fwe);
-#endif
 DRIVER_MODULE(fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
 MODULE_VERSION(fwe, 1);
 MODULE_DEPEND(fwe, firewire, 1, 1, 1);
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index df3e1f6446d3..0617a9c1cc07 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -60,16 +60,10 @@
 #include <net/firewire.h>
 #include <net/if_arp.h>
 #include <net/if_types.h>
-#ifdef __DragonFly__
-#include <bus/firewire/firewire.h>
-#include <bus/firewire/firewirereg.h>
-#include "if_fwipvar.h"
-#else
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/iec13213.h>
 #include <dev/firewire/if_fwipvar.h>
-#endif
 
 /*
  * We really need a mechanism for allocating regions in the FIFO
@@ -139,8 +133,8 @@ fwip_probe(device_t dev)
 	device_t pa;
 
 	pa = device_get_parent(dev);
-	if(device_get_unit(dev) != device_get_unit(pa)){
-		return(ENXIO);
+	if (device_get_unit(dev) != device_get_unit(pa)) {
+		return (ENXIO);
 	}
 
 	device_set_desc(dev, "IP over FireWire");
@@ -189,12 +183,7 @@ fwip_attach(device_t dev)
 	/* fill the rest and attach interface */	
 	ifp->if_softc = &fwip->fw_softc;
 
-#if __FreeBSD_version >= 501113 || defined(__DragonFly__)
 	if_initname(ifp, device_get_name(dev), unit);
-#else
-	ifp->if_unit = unit;
-	ifp->if_name = "fwip";
-#endif
 	ifp->if_init = fwip_init;
 	ifp->if_start = fwip_start;
 	ifp->if_ioctl = fwip_ioctl;
@@ -233,7 +222,7 @@ fwip_stop(struct fwip_softc *fwip)
 			FWXFERQ_EXTBUF | FWXFERQ_HANDLER | FWXFERQ_CHTAGMASK);
 		xferq->hand =  NULL;
 
-		for (i = 0; i < xferq->bnchunk; i ++)
+		for (i = 0; i < xferq->bnchunk; i++)
 			m_freem(xferq->bulkxfer[i].mbuf);
 		free(xferq->bulkxfer, M_FWIP);
 
@@ -255,11 +244,7 @@ fwip_stop(struct fwip_softc *fwip)
 		fwip->dma_ch = -1;
 	}
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-#else
-	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
-#endif
 }
 
 static int
@@ -331,7 +316,7 @@ fwip_init(void *arg)
 		STAILQ_INIT(&xferq->stfree);
 		STAILQ_INIT(&xferq->stdma);
 		xferq->stproc = NULL;
-		for (i = 0; i < xferq->bnchunk; i ++) {
+		for (i = 0; i < xferq->bnchunk; i++) {
 			m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
 			xferq->bulkxfer[i].mbuf = m;
 			m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
@@ -344,7 +329,7 @@ fwip_init(void *arg)
 
 		/* pre-allocate xfer */
 		STAILQ_INIT(&fwip->fwb.xferlist);
-		for (i = 0; i < rx_queue_len; i ++) {
+		for (i = 0; i < rx_queue_len; i++) {
 			xfer = fw_xfer_alloc(M_FWIP);
 			if (xfer == NULL)
 				break;
@@ -380,13 +365,8 @@ fwip_init(void *arg)
 	if ((xferq->flag & FWXFERQ_RUNNING) == 0)
 		fc->irx_enable(fc, fwip->dma_ch);
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
-#endif
 
 #if 0
 	/* attempt to start output */
@@ -404,18 +384,10 @@ fwip_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFFLAGS:
 		s = splimp();
 		if (ifp->if_flags & IFF_UP) {
-#if defined(__FreeBSD__)
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-#else
-			if (!(ifp->if_flags & IFF_RUNNING))
-#endif
 				fwip_init(&fwip->fw_softc);
 		} else {
-#if defined(__FreeBSD__)
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-#else
-			if (ifp->if_flags & IFF_RUNNING)
-#endif
 				fwip_stop(fwip);
 		}
 		splx(s);
@@ -433,13 +405,12 @@ fwip_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		    !(ifp->if_capenable & IFCAP_POLLING)) {
 			error = ether_poll_register(fwip_poll, ifp);
 			if (error)
-				return(error);
+				return (error);
 			/* Disable interrupts */
 			fc->set_intr(fc, 0);
 			ifp->if_capenable |= IFCAP_POLLING |
 			    IFCAP_POLLING_NOCOUNT;
 			return (error);
-			
 		}
 		if (!(ifr->ifr_reqcap & IFCAP_POLLING) &&
 		    ifp->if_capenable & IFCAP_POLLING) {
@@ -453,21 +424,11 @@ fwip_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	    }
 #endif /* DEVICE_POLLING */
 		break;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	default:
-#else
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-#endif
 		s = splimp();
 		error = firewire_ioctl(ifp, cmd, data);
 		splx(s);
 		return (error);
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	default:
-		return (EINVAL);
-#endif
 	}
 
 	return (0);
@@ -516,8 +477,7 @@ fwip_output_callback(struct fw_xfer *xfer)
 	/* XXX error check */
 	FWIPDEBUG(ifp, "resp = %d\n", xfer->resp);
 	if (xfer->resp != 0)
-		ifp->if_oerrors ++;
-		
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	m_freem(xfer->mbuf);
 	fw_xfer_unload(xfer);
 
@@ -551,7 +511,7 @@ fwip_start(struct ifnet *ifp)
 			IF_DEQUEUE(&ifp->if_snd, m);
 			if (m != NULL)
 				m_freem(m);
-			ifp->if_oerrors ++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} while (m != NULL);
 		splx(s);
 
@@ -559,20 +519,12 @@ fwip_start(struct ifnet *ifp)
 	}
 
 	s = splimp();
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags |= IFF_OACTIVE;
-#endif
 
 	if (ifp->if_snd.ifq_len != 0)
 		fwip_async_output(fwip, ifp);
 
-#if defined(__FreeBSD__)
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-#else
-	ifp->if_flags &= ~IFF_OACTIVE;
-#endif
 	splx(s);
 }
 
@@ -686,7 +638,7 @@ fwip_async_output(struct fwip_softc *fwip, struct ifnet *ifp)
 				fd = fw_noderesolve_eui64(fc, &eui);
 				if (!fd) {
 					/* error */
-					ifp->if_oerrors ++;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					/* XXX set error code */
 					fwip_output_callback(xfer);
 					continue;
@@ -727,12 +679,12 @@ fwip_async_output(struct fwip_softc *fwip, struct ifnet *ifp)
 		}
 		if (error) {
 			/* error */
-			ifp->if_oerrors ++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* XXX set error code */
 			fwip_output_callback(xfer);
 			continue;
 		} else {
-			ifp->if_opackets ++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			i++;
 		}
 	}
@@ -794,7 +746,7 @@ fwip_stream_input(struct fw_xferq *xferq)
 		if (sxfer->resp != 0 || fp->mode.stream.len <
 		    2*sizeof(uint32_t)) {
 			m_freem(m);
-			ifp->if_ierrors ++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 		m->m_len = m->m_pkthdr.len = fp->mode.stream.len
@@ -820,7 +772,7 @@ fwip_stream_input(struct fw_xferq *xferq)
 			FWIPDEBUG(ifp, "Unrecognised GASP header %#08x %#08x\n",
 			    ntohl(p[1]), ntohl(p[2]));
 			m_freem(m);
-			ifp->if_ierrors ++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 
@@ -855,7 +807,7 @@ fwip_stream_input(struct fw_xferq *xferq)
 		m_adj(m, 3*sizeof(uint32_t));
 		m->m_pkthdr.rcvif = ifp;
 		firewire_input(ifp, m, src);
-		ifp->if_ipackets ++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	}
 	if (STAILQ_FIRST(&xferq->stfree) != NULL)
 		fwip->fd.fc->irx_enable(fwip->fd.fc, fwip->dma_ch);
@@ -921,7 +873,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
 	 */
 	if (rtcode != FWRCODE_COMPLETE) {
 		m_freem(m);
-		ifp->if_ierrors ++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -956,7 +908,7 @@ fwip_unicast_input(struct fw_xfer *xfer)
 	m->m_len = m->m_pkthdr.len = fp->mode.wreqb.len;
 	m->m_pkthdr.rcvif = ifp;
 	firewire_input(ifp, m, fp->mode.wreqb.src);
-	ifp->if_ipackets ++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 }
 
 static devclass_t fwip_devclass;
@@ -977,9 +929,6 @@ static driver_t fwip_driver = {
 };
 
 
-#ifdef __DragonFly__
-DECLARE_DUMMY_MODULE(fwip);
-#endif
 DRIVER_MODULE(fwip, firewire, fwip_driver, fwip_devclass, 0, 0);
 MODULE_VERSION(fwip, 1);
 MODULE_DEPEND(fwip, firewire, 1, 1, 1);
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index eeca4c77b4e7..69e83c4690d5 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  *
  */
@@ -43,30 +43,9 @@
 #include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#endif
 
-#if defined(__DragonFly__) || __FreeBSD_version < 500106
-#include <sys/devicestat.h>	/* for struct devstat */
-#endif
-
-#ifdef __DragonFly__
-#include <bus/cam/cam.h>
-#include <bus/cam/cam_ccb.h>
-#include <bus/cam/cam_sim.h>
-#include <bus/cam/cam_xpt_sim.h>
-#include <bus/cam/cam_debug.h>
-#include <bus/cam/cam_periph.h>
-#include <bus/cam/scsi/scsi_all.h>
-
-#include <bus/firewire/firewire.h>
-#include <bus/firewire/firewirereg.h>
-#include <bus/firewire/fwdma.h>
-#include <bus/firewire/iec13213.h>
-#include "sbp.h"
-#else
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_sim.h>
@@ -80,7 +59,6 @@
 #include <dev/firewire/fwdma.h>
 #include <dev/firewire/iec13213.h>
 #include <dev/firewire/sbp.h>
-#endif
 
 #define ccb_sdev_ptr	spriv_ptr0
 #define ccb_sbp_ptr	spriv_ptr1
@@ -97,16 +75,16 @@
 #define SBP_QUEUE_LEN ((SBP_DMA_SIZE - SBP_LOGIN_SIZE) / sizeof(struct sbp_ocb))
 #define SBP_NUM_OCB (SBP_QUEUE_LEN * SBP_NUM_TARGETS)
 
-/* 
+/*
  * STATUS FIFO addressing
  *   bit
- * -----------------------
+ *-----------------------
  *  0- 1( 2): 0 (alignment)
  *  2- 7( 6): target
  *  8-15( 8): lun
  * 16-31( 8): reserved
- * 32-47(16): SBP_BIND_HI 
- * 48-64(16): bus_id, node_id 
+ * 32-47(16): SBP_BIND_HI
+ * 48-64(16): bus_id, node_id
  */
 #define SBP_BIND_HI 0x1
 #define SBP_DEV2ADDR(t, l) \
@@ -176,7 +154,7 @@ struct sbp_ocb {
 #define OCB_ACT_CMD 1
 #define OCB_MATCH(o,s)	((o)->bus_addr == ntohl((s)->orb_lo))
 
-struct sbp_dev{
+struct sbp_dev {
 #define SBP_DEV_RESET		0	/* accept login */
 #define SBP_DEV_LOGIN		1	/* to login */
 #if 0
@@ -254,7 +232,7 @@ static void sbp_cmd_callback (struct fw_xfer *);
 #endif
 static void sbp_orb_pointer (struct sbp_dev *, struct sbp_ocb *);
 static void sbp_doorbell(struct sbp_dev *);
-static void sbp_execute_ocb (void *,  bus_dma_segment_t *, int, int);
+static void sbp_execute_ocb (void *, bus_dma_segment_t *, int, int);
 static void sbp_free_ocb (struct sbp_dev *, struct sbp_ocb *);
 static void sbp_abort_ocb (struct sbp_ocb *, int);
 static void sbp_abort_all_ocbs (struct sbp_dev *, int);
@@ -410,7 +388,7 @@ sbp_new_target(struct sbp_softc *sbp, struct fw_device *fwdev)
 
 	/* XXX wired-down configuration should be gotten from
 					tunable or device hint */
-	for (i = 0; wired[i].bus >= 0; i ++) {
+	for (i = 0; wired[i].bus >= 0; i++) {
 		if (wired[i].bus == bus) {
 			w[wired[i].target] = 1;
 			if (wired[i].eui.hi == fwdev->eui.hi &&
@@ -419,16 +397,16 @@ sbp_new_target(struct sbp_softc *sbp, struct fw_device *fwdev)
 		}
 	}
 	if (target >= 0) {
-		if(target < SBP_NUM_TARGETS &&
+		if (target < SBP_NUM_TARGETS &&
 				sbp->targets[target].fwdev == NULL)
-			return(target);
+			return (target);
 		device_printf(sbp->fd.dev,
-			"target %d is not free for %08x:%08x\n", 
+			"target %d is not free for %08x:%08x\n",
 			target, fwdev->eui.hi, fwdev->eui.lo);
 		target = -1;
 	}
 	/* non-wired target */
-	for (i = 0; i < SBP_NUM_TARGETS; i ++)
+	for (i = 0; i < SBP_NUM_TARGETS; i++)
 		if (sbp->targets[i].fwdev == NULL && w[i] == 0) {
 			target = i;
 			break;
@@ -467,12 +445,12 @@ END_DEBUG
 		device_printf(target->sbp->fd.dev, "%d no LUN found\n",
 		    target->target_id);
 
-	maxlun ++;
+	maxlun++;
 	if (maxlun >= SBP_NUM_LUNS)
 		maxlun = SBP_NUM_LUNS;
 
 	/* Invalidiate stale devices */
-	for (lun = 0; lun < target->num_lun; lun ++) {
+	for (lun = 0; lun < target->num_lun; lun++) {
 		sdev = target->luns[lun];
 		if (sdev == NULL)
 			continue;
@@ -490,7 +468,7 @@ END_DEBUG
 		newluns = (struct sbp_dev **) realloc(target->luns,
 		    sizeof(struct sbp_dev *) * maxlun,
 		    M_SBP, M_NOWAIT | M_ZERO);
-		
+
 		if (newluns == NULL) {
 			printf("%s: realloc failed\n", __func__);
 			newluns = target->luns;
@@ -549,7 +527,7 @@ END_DEBUG
 		if (new == 0)
 			goto next;
 
-		fwdma_malloc(sbp->fd.fc, 
+		fwdma_malloc(sbp->fd.fc,
 			/* alignment */ sizeof(uint32_t),
 			SBP_DMA_SIZE, &sdev->dma, BUS_DMA_NOWAIT |
 			BUS_DMA_COHERENT);
@@ -564,7 +542,7 @@ END_DEBUG
 		sdev->ocb = (struct sbp_ocb *)
 				((char *)sdev->dma.v_addr + SBP_LOGIN_SIZE);
 		bzero((char *)sdev->ocb,
-			sizeof (struct sbp_ocb) * SBP_QUEUE_LEN);
+			sizeof(struct sbp_ocb) * SBP_QUEUE_LEN);
 
 		STAILQ_INIT(&sdev->free_ocbs);
 		for (i = 0; i < SBP_QUEUE_LEN; i++) {
@@ -586,7 +564,7 @@ END_DEBUG
 		crom_next(&cc);
 	}
 
-	for (lun = 0; lun < target->num_lun; lun ++) {
+	for (lun = 0; lun < target->num_lun; lun++) {
 		sdev = target->luns[lun];
 		if (sdev != NULL && (sdev->flags & VALID_LUN) == 0) {
 			sbp_cam_detach_sdev(sdev);
@@ -735,7 +713,7 @@ END_DEBUG
 		if (alive && (sdev->status != SBP_DEV_DEAD)) {
 			if (sdev->path != NULL) {
 				xpt_freeze_devq(sdev->path, 1);
-				sdev->freeze ++;
+				sdev->freeze++;
 			}
 			sbp_probe_lun(sdev);
 			sbp_show_sdev_info(sdev);
@@ -765,7 +743,7 @@ SBP_DEBUG(0)
 END_DEBUG
 				if (sdev->path) {
 					xpt_freeze_devq(sdev->path, 1);
-					sdev->freeze ++;
+					sdev->freeze++;
 				}
 				sdev->status = SBP_DEV_RETRY;
 				sbp_cam_detach_sdev(sdev);
@@ -819,7 +797,7 @@ END_DEBUG
 		return;
 
 	if (sbp_cold > 0)
-		sbp_cold --;
+		sbp_cold--;
 
 	SBP_LOCK(sbp);
 #if 0
@@ -831,7 +809,7 @@ END_DEBUG
 #endif
 
 	/* Garbage Collection */
-	for(i = 0 ; i < SBP_NUM_TARGETS ; i ++){
+	for (i = 0; i < SBP_NUM_TARGETS; i++) {
 		target = &sbp->targets[i];
 		STAILQ_FOREACH(fwdev, &sbp->fd.fc->devices, link)
 			if (target->fwdev == NULL || target->fwdev == fwdev)
@@ -851,14 +829,14 @@ SBP_DEBUG(0)
 				fwdev->status);
 END_DEBUG
 		alive = SBP_FWDEV_ALIVE(fwdev);
-		for(i = 0 ; i < SBP_NUM_TARGETS ; i ++){
+		for (i = 0; i < SBP_NUM_TARGETS; i++) {
 			target = &sbp->targets[i];
-			if(target->fwdev == fwdev ) {
+			if (target->fwdev == fwdev) {
 				/* known target */
 				break;
 			}
 		}
-		if(i == SBP_NUM_TARGETS){
+		if (i == SBP_NUM_TARGETS) {
 			if (alive) {
 				/* new target */
 				target = sbp_alloc_target(sbp, fwdev);
@@ -879,7 +857,8 @@ END_DEBUG
 
 #if NEED_RESPONSE
 static void
-sbp_loginres_callback(struct fw_xfer *xfer){
+sbp_loginres_callback(struct fw_xfer *xfer)
+{
 	struct sbp_dev *sdev;
 	sdev = (struct sbp_dev *)xfer->sc;
 SBP_DEBUG(1)
@@ -972,8 +951,8 @@ sbp_next_dev(struct sbp_target *target, int lun)
 	for (i = lun, sdevp = &target->luns[lun]; i < target->num_lun;
 	    i++, sdevp++)
 		if (*sdevp != NULL && (*sdevp)->status == SBP_DEV_PROBE)
-			return(*sdevp);
-	return(NULL);
+			return (*sdevp);
+	return (NULL);
 }
 
 #define SCAN_PRI 1
@@ -1169,7 +1148,7 @@ END_DEBUG
 	fp = &xfer->send.hdr;
 	fp->mode.wreqq.dest_hi = 0xffff;
 	fp->mode.wreqq.dest_lo = 0xf0000000 | BUSY_TIMEOUT;
-	fp->mode.wreqq.data = htonl((1 << (13+12)) | 0xf);
+	fp->mode.wreqq.data = htonl((1 << (13 + 12)) | 0xf);
 	fw_asyreq(xfer->fc, -1, xfer);
 }
 
@@ -1235,8 +1214,8 @@ END_DEBUG
 	fp = &xfer->send.hdr;
 	fp->mode.wreqb.len = 8;
 	fp->mode.wreqb.extcode = 0;
-	xfer->send.payload[0] = 
-		htonl(((sdev->target->sbp->fd.fc->nodeid | FWLOCALBUS )<< 16));
+	xfer->send.payload[0] =
+		htonl(((sdev->target->sbp->fd.fc->nodeid | FWLOCALBUS) << 16));
 	xfer->send.payload[1] = htonl((uint32_t)ocb->bus_addr);
 
 	if (fw_asyreq(xfer->fc, -1, xfer) != 0) {
@@ -1310,14 +1289,14 @@ sbp_write_cmd(struct sbp_dev *sdev, int tcode, int offset)
 	if (xfer == NULL) {
 		if (target->n_xfer > 5 /* XXX */) {
 			printf("sbp: no more xfer for this target\n");
-			return(NULL);
+			return (NULL);
 		}
 		xfer = fw_xfer_alloc_buf(M_SBP, 8, 0);
-		if(xfer == NULL){
+		if (xfer == NULL) {
 			printf("sbp: fw_xfer_alloc_buf failed\n");
 			return NULL;
 		}
-		target->n_xfer ++;
+		target->n_xfer++;
 		if (debug)
 			printf("sbp: alloc %d xfer\n", target->n_xfer);
 		new = 1;
@@ -1384,7 +1363,7 @@ SBP_DEBUG(0)
 	device_printf(sdev->target->sbp->fd.dev,
 		 "%s:%s %s\n",
 		 __func__,sdev->bustgtlun,
-		 orb_fun_name[(func>>16)&0xf]);
+		 orb_fun_name[(func >> 16) & 0xf]);
 END_DEBUG
 	switch (func) {
 	case ORB_FUN_LGI:
@@ -1421,7 +1400,7 @@ END_DEBUG
 	callout_reset(&target->mgm_ocb_timeout, 5*hz,
 				sbp_mgm_timeout, (caddr_t)ocb);
 	xfer = sbp_write_cmd(sdev, FWTCODE_WREQB, 0);
-	if(xfer == NULL){
+	if (xfer == NULL) {
 		return;
 	}
 	xfer->hand = sbp_mgm_callback;
@@ -1492,25 +1471,25 @@ END_DEBUG
 	case SCSI_STATUS_CHECK_COND:
 	case SCSI_STATUS_BUSY:
 	case SCSI_STATUS_CMD_TERMINATED:
-		if(sbp_cmd_status->sfmt == SBP_SFMT_CURR){
+		if (sbp_cmd_status->sfmt == SBP_SFMT_CURR) {
 			sense->error_code = SSD_CURRENT_ERROR;
-		}else{
+		} else {
 			sense->error_code = SSD_DEFERRED_ERROR;
 		}
-		if(sbp_cmd_status->valid)
+		if (sbp_cmd_status->valid)
 			sense->error_code |= SSD_ERRCODE_VALID;
 		sense->flags = sbp_cmd_status->s_key;
-		if(sbp_cmd_status->mark)
+		if (sbp_cmd_status->mark)
 			sense->flags |= SSD_FILEMARK;
-		if(sbp_cmd_status->eom)
+		if (sbp_cmd_status->eom)
 			sense->flags |= SSD_EOM;
-		if(sbp_cmd_status->ill_len)
+		if (sbp_cmd_status->ill_len)
 			sense->flags |= SSD_ILI;
 
 		bcopy(&sbp_cmd_status->info, &sense->info[0], 4);
 
 		if (sbp_status->len <= 1)
-			/* XXX not scsi status. shouldn't be happened */ 
+			/* XXX not scsi status. shouldn't be happened */
 			sense->extra_len = 0;
 		else if (sbp_status->len <= 4)
 			/* add_sense_code(_qual), info, cmd_spec_info */
@@ -1535,10 +1514,10 @@ END_DEBUG
 {
 		uint8_t j, *tmp;
 		tmp = sense;
-		for( j = 0 ; j < 32 ; j+=8){
-			printf("sense %02x%02x %02x%02x %02x%02x %02x%02x\n", 
-				tmp[j], tmp[j+1], tmp[j+2], tmp[j+3],
-				tmp[j+4], tmp[j+5], tmp[j+6], tmp[j+7]);
+		for (j = 0; j < 32; j += 8) {
+			printf("sense %02x%02x %02x%02x %02x%02x %02x%02x\n",
+				tmp[j], tmp[j + 1], tmp[j + 2], tmp[j + 3],
+				tmp[j + 4], tmp[j + 5], tmp[j + 6], tmp[j + 7]);
 		}
 
 }
@@ -1572,7 +1551,7 @@ END_DEBUG
 	switch (SID_TYPE(inq)) {
 	case T_DIRECT:
 #if 0
-		/* 
+		/*
 		 * XXX Convert Direct Access device to RBC.
 		 * I've never seen FireWire DA devices which support READ_6.
 		 */
@@ -1588,7 +1567,7 @@ END_DEBUG
 #if 1
 		bcopy(sdev->vendor, inq->vendor, sizeof(inq->vendor));
 		bcopy(sdev->product, inq->product, sizeof(inq->product));
-		bcopy(sdev->revision+2, inq->revision, sizeof(inq->revision));
+		bcopy(sdev->revision + 2, inq->revision, sizeof(inq->revision));
 #endif
 		break;
 	}
@@ -1628,16 +1607,16 @@ printf("sbp %08x %08x %08x %08x\n", ntohl(ld[8]), ntohl(ld[9]), ntohl(ld[10]), n
 */
 	sbp = (struct sbp_softc *)xfer->sc;
 	SBP_LOCK_ASSERT(sbp);
-	if (xfer->resp != 0){
+	if (xfer->resp != 0) {
 		printf("sbp_recv: xfer->resp = %d\n", xfer->resp);
 		goto done0;
 	}
-	if (xfer->recv.payload == NULL){
+	if (xfer->recv.payload == NULL) {
 		printf("sbp_recv: xfer->recv.payload == NULL\n");
 		goto done0;
 	}
 	rfp = &xfer->recv.hdr;
-	if(rfp->mode.wreqb.tcode != FWTCODE_WREQB){
+	if (rfp->mode.wreqb.tcode != FWTCODE_WREQB) {
 		printf("sbp_recv: tcode = %d\n", rfp->mode.wreqb.tcode);
 		goto done0;
 	}
@@ -1677,11 +1656,7 @@ END_DEBUG
 		ocb = sbp_dequeue_ocb(sdev, sbp_status);
 		if (ocb == NULL) {
 			device_printf(sdev->target->sbp->fd.dev,
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-				"%s:%s No ocb(%lx) on the queue\n",
-#else
 				"%s:%s No ocb(%x) on the queue\n",
-#endif
 				__func__,sdev->bustgtlun,
 				ntohl(sbp_status->orb_lo));
 		}
@@ -1703,16 +1678,12 @@ END_DEBUG
 			&& sbp_status->dead == 0);
 	status_valid = (status_valid0 && sbp_status->status == 0);
 
-	if (!status_valid0 || debug > 2){
+	if (!status_valid0 || debug > 2) {
 		int status;
 SBP_DEBUG(0)
 		device_printf(sdev->target->sbp->fd.dev,
 			"%s:%s ORB status src:%x resp:%x dead:%x"
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-				" len:%x stat:%x orb:%x%08lx\n",
-#else
 				" len:%x stat:%x orb:%x%08x\n",
-#endif
 			__func__, sdev->bustgtlun,
 			sbp_status->src, sbp_status->resp, sbp_status->dead,
 			sbp_status->len, sbp_status->status,
@@ -1721,7 +1692,7 @@ END_DEBUG
 		device_printf(sdev->target->sbp->fd.dev,
 				"%s\n", sdev->bustgtlun);
 		status = sbp_status->status;
-		switch(sbp_status->resp) {
+		switch (sbp_status->resp) {
 		case 0:
 			if (status > MAX_ORB_STATUS0)
 				printf("%s\n", orb_status0[MAX_ORB_STATUS0]);
@@ -1730,7 +1701,7 @@ END_DEBUG
 			break;
 		case 1:
 			printf("Obj: %s, Error: %s\n",
-				orb_status1_object[(status>>6) & 3],
+				orb_status1_object[(status >> 6) & 3],
 				orb_status1_serial_bus_error[status & 0xf]);
 			break;
 		case 2:
@@ -1748,7 +1719,7 @@ END_DEBUG
 	if (sbp_status->dead) {
 		if (sdev->path) {
 			xpt_freeze_devq(sdev->path, 1);
-			sdev->freeze ++;
+			sdev->freeze++;
 		}
 		reset_agent = 1;
 	}
@@ -1756,17 +1727,17 @@ END_DEBUG
 	if (ocb == NULL)
 		goto done;
 
-	switch(ntohl(ocb->orb[4]) & ORB_FMT_MSK){
+	switch (ntohl(ocb->orb[4]) & ORB_FMT_MSK) {
 	case ORB_FMT_NOP:
 		break;
 	case ORB_FMT_VED:
 		break;
 	case ORB_FMT_STD:
-		switch(ocb->flags) {
+		switch (ocb->flags) {
 		case OCB_ACT_MGM:
 			orb_fun = ntohl(ocb->orb[4]) & ORB_FUN_MSK;
 			reset_agent = 0;
-			switch(orb_fun) {
+			switch (orb_fun) {
 			case ORB_FUN_LGI:
 				fwdma_sync(&sdev->dma, BUS_DMASYNC_POSTREAD);
 				login_res = sdev->login;
@@ -1837,16 +1808,16 @@ END_DEBUG
 			break;
 		case OCB_ACT_CMD:
 			sdev->timeout = 0;
-			if(ocb->ccb != NULL){
+			if (ocb->ccb != NULL) {
 				union ccb *ccb;
 
 				ccb = ocb->ccb;
-				if(sbp_status->len > 1){
+				if (sbp_status->len > 1) {
 					sbp_scsi_status(sbp_status, ocb);
-				}else{
-					if(sbp_status->resp != ORB_RES_CMPL){
+				} else {
+					if (sbp_status->resp != ORB_RES_CMPL) {
 						ccb->ccb_h.status = CAM_REQ_CMP_ERR;
-					}else{
+					} else {
 						ccb->ccb_h.status = CAM_REQ_CMP;
 					}
 				}
@@ -1873,7 +1844,7 @@ END_DEBUG
  * the buffer. In that case, the controller return ack_complete and
  * no respose is necessary.
  *
- * XXX fwohci.c and firewire.c should inform event_code such as 
+ * XXX fwohci.c and firewire.c should inform event_code such as
  * ack_complete or ack_pending to upper driver.
  */
 #if NEED_RESPONSE
@@ -1930,7 +1901,7 @@ SBP_DEBUG(0)
 END_DEBUG
 
 	if (cold)
-		sbp_cold ++;
+		sbp_cold++;
 	sbp = device_get_softc(dev);
 	sbp->fd.dev = dev;
 	sbp->fd.fc = fc = device_get_ivars(dev);
@@ -1949,10 +1920,8 @@ END_DEBUG
 				/*maxsize*/0x100000, /*nsegments*/SBP_IND_MAX,
 				/*maxsegsz*/SBP_SEG_MAX,
 				/*flags*/BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
 				/*lockfunc*/busdma_lock_mutex,
 				/*lockarg*/&sbp->mtx,
-#endif
 				&sbp->dmat);
 	if (error != 0) {
 		printf("sbp_attach: Could not allocate DMA tag "
@@ -1964,7 +1933,7 @@ END_DEBUG
 	if (devq == NULL)
 		return (ENXIO);
 
-	for( i = 0 ; i < SBP_NUM_TARGETS ; i++){
+	for (i = 0; i < SBP_NUM_TARGETS; i++) {
 		sbp->targets[i].fwdev = NULL;
 		sbp->targets[i].luns = NULL;
 		sbp->targets[i].sbp = sbp;
@@ -2033,7 +2002,7 @@ SBP_DEBUG(0)
 	printf("sbp_logout_all\n");
 END_DEBUG
 	SBP_LOCK_ASSERT(sbp);
-	for (i = 0 ; i < SBP_NUM_TARGETS ; i ++) {
+	for (i = 0; i < SBP_NUM_TARGETS; i++) {
 		target = &sbp->targets[i];
 		if (target->luns == NULL)
 			continue;
@@ -2122,7 +2091,7 @@ SBP_DEBUG(0)
 END_DEBUG
 
 	SBP_LOCK(sbp);
-	for (i = 0; i < SBP_NUM_TARGETS; i ++) 
+	for (i = 0; i < SBP_NUM_TARGETS; i++)
 		sbp_cam_detach_target(&sbp->targets[i]);
 
 	xpt_async(AC_LOST_DEVICE, sbp->path, NULL);
@@ -2137,7 +2106,7 @@ END_DEBUG
 	pause("sbpdtc", hz/2);
 
 	SBP_LOCK(sbp);
-	for (i = 0 ; i < SBP_NUM_TARGETS ; i ++)
+	for (i = 0; i < SBP_NUM_TARGETS; i++)
 		sbp_free_target(&sbp->targets[i]);
 	SBP_UNLOCK(sbp);
 
@@ -2204,12 +2173,12 @@ sbp_target_reset(struct sbp_dev *sdev, int method)
 		if (tsdev->status == SBP_DEV_RESET)
 			continue;
 		xpt_freeze_devq(tsdev->path, 1);
-		tsdev->freeze ++;
+		tsdev->freeze++;
 		sbp_abort_all_ocbs(tsdev, CAM_CMD_TIMEOUT);
 		if (method == 2)
 			tsdev->status = SBP_DEV_LOGIN;
 	}
-	switch(method) {
+	switch (method) {
 	case 1:
 		printf("target reset\n");
 		sbp_mgm_orb(sdev, ORB_FUN_RST, NULL);
@@ -2219,7 +2188,7 @@ sbp_target_reset(struct sbp_dev *sdev, int method)
 		sbp_reset_start(sdev);
 		break;
 	}
-			
+
 }
 
 static void
@@ -2257,12 +2226,12 @@ sbp_timeout(void *arg)
 		__func__, sdev->bustgtlun, (uint32_t)ocb->bus_addr);
 
 	SBP_LOCK_ASSERT(sdev->target->sbp);
-	sdev->timeout ++;
-	switch(sdev->timeout) {
+	sdev->timeout++;
+	switch (sdev->timeout) {
 	case 1:
 		printf("agent reset\n");
 		xpt_freeze_devq(sdev->path, 1);
-		sdev->freeze ++;
+		sdev->freeze++;
 		sbp_abort_all_ocbs(sdev, CAM_CMD_TIMEOUT);
 		sbp_agent_reset(sdev);
 		break;
@@ -2341,7 +2310,7 @@ END_DEBUG
 		 * sometimes aimed at the SIM (sc is invalid and target is
 		 * CAM_TARGET_WILDCARD)
 		 */
-		if (sbp == NULL && 
+		if (sbp == NULL &&
 			ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
 SBP_DEBUG(0)
 			printf("%s:%d:%jx func_code 0x%04x: "
@@ -2393,7 +2362,7 @@ SBP_DEBUG(2)
 			csio->cdb_len, csio->dxfer_len,
 			csio->sense_len);
 END_DEBUG
-		if(sdev == NULL){
+		if (sdev == NULL) {
 			ccb->ccb_h.status = CAM_DEV_NOT_THERE;
 			xpt_done(ccb);
 			return;
@@ -2415,7 +2384,7 @@ END_DEBUG
 			ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			if (sdev->freeze == 0) {
 				xpt_freeze_devq(sdev->path, 1);
-				sdev->freeze ++;
+				sdev->freeze++;
 			}
 			xpt_done(ccb);
 			return;
@@ -2427,12 +2396,12 @@ END_DEBUG
 		ccb->ccb_h.ccb_sdev_ptr = sdev;
 		ocb->orb[0] = htonl(1U << 31);
 		ocb->orb[1] = 0;
-		ocb->orb[2] = htonl(((sbp->fd.fc->nodeid | FWLOCALBUS )<< 16) );
+		ocb->orb[2] = htonl(((sbp->fd.fc->nodeid | FWLOCALBUS) << 16));
 		ocb->orb[3] = htonl(ocb->bus_addr + IND_PTR_OFFSET);
 		speed = min(target->fwdev->speed, max_speed);
 		ocb->orb[4] = htonl(ORB_NOTIFY | ORB_CMD_SPD(speed)
 						| ORB_CMD_MAXP(speed + 7));
-		if((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN){
+		if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
 			ocb->orb[4] |= htonl(ORB_CMD_IN);
 		}
 
@@ -2463,11 +2432,6 @@ printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[4]), ntohl(ocb->orb[5]), ntoh
 	case XPT_CALC_GEOMETRY:
 	{
 		struct ccb_calc_geometry *ccg;
-#if defined(__DragonFly__) || __FreeBSD_version < 501100
-		uint32_t size_mb;
-		uint32_t secs_per_cylinder;
-		int extended = 1;
-#endif
 
 		ccg = &ccb->ccg;
 		if (ccg->block_size == 0) {
@@ -2478,37 +2442,14 @@ printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[4]), ntohl(ocb->orb[5]), ntoh
 		}
 SBP_DEBUG(1)
 		printf("%s:%d:%d:%jx:XPT_CALC_GEOMETRY: "
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-			"Volume size = %d\n",
-#else
 			"Volume size = %jd\n",
-#endif
 			device_get_nameunit(sbp->fd.dev),
 			cam_sim_path(sbp->sim),
 			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
-			(uintmax_t)
-#endif
-				ccg->volume_size);
+			(uintmax_t)ccg->volume_size);
 END_DEBUG
 
-#if defined(__DragonFly__) || __FreeBSD_version < 501100
-		size_mb = ccg->volume_size
-			/ ((1024L * 1024L) / ccg->block_size);
-
-		if (size_mb > 1024 && extended) {
-			ccg->heads = 255;
-			ccg->secs_per_track = 63;
-		} else {
-			ccg->heads = 64;
-			ccg->secs_per_track = 32;
-		}
-		secs_per_cylinder = ccg->heads * ccg->secs_per_track;
-		ccg->cylinders = ccg->volume_size / secs_per_cylinder;
-		ccb->ccb_h.status = CAM_REQ_CMP;
-#else
 		cam_calc_geometry(ccg, /*extended*/1);
-#endif
 		xpt_done(ccb);
 		break;
 	}
@@ -2527,7 +2468,7 @@ END_DEBUG
 	case XPT_PATH_INQ:		/* Path routing inquiry */
 	{
 		struct ccb_pathinq *cpi = &ccb->cpi;
-		
+
 SBP_DEBUG(1)
 		printf("%s:%d:%jx XPT_PATH_INQ:.\n",
 			device_get_nameunit(sbp->fd.dev),
@@ -2596,7 +2537,7 @@ END_DEBUG
 }
 
 static void
-sbp_execute_ocb(void *arg,  bus_dma_segment_t *segments, int seg, int error)
+sbp_execute_ocb(void *arg, bus_dma_segment_t *segments, int seg, int error)
 {
 	int i;
 	struct sbp_ocb *ocb;
@@ -2611,12 +2552,8 @@ sbp_execute_ocb(void *arg,  bus_dma_segment_t *segments, int seg, int error)
 SBP_DEBUG(2)
 	printf("sbp_execute_ocb: seg %d", seg);
 	for (i = 0; i < seg; i++)
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		printf(", %x:%d", segments[i].ds_addr, segments[i].ds_len);
-#else
 		printf(", %jx:%jd", (uintmax_t)segments[i].ds_addr,
 					(uintmax_t)segments[i].ds_len);
-#endif
 	printf("\n");
 END_DEBUG
 
@@ -2627,7 +2564,7 @@ END_DEBUG
 			panic("ds_len > SBP_SEG_MAX, fix busdma code");
 		ocb->orb[3] = htonl(s->ds_addr);
 		ocb->orb[4] |= htonl(s->ds_len);
-	} else if(seg > 1) {
+	} else if (seg > 1) {
 		/* page table */
 		for (i = 0; i < seg; i++) {
 			s = &segments[i];
@@ -2635,12 +2572,8 @@ SBP_DEBUG(0)
 			/* XXX LSI Logic "< 16 byte" bug might be hit */
 			if (s->ds_len < 16)
 				printf("sbp_execute_ocb: warning, "
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-					"segment length(%d) is less than 16."
-#else
 					"segment length(%zd) is less than 16."
-#endif
-					"(seg=%d/%d)\n", (size_t)s->ds_len, i+1, seg);
+					"(seg=%d/%d)\n", (size_t)s->ds_len, i + 1, seg);
 END_DEBUG
 			if (s->ds_len > SBP_SEG_MAX)
 				panic("ds_len > SBP_SEG_MAX, fix busdma code");
@@ -2649,7 +2582,7 @@ END_DEBUG
 		}
 		ocb->orb[4] |= htonl(ORB_CMD_PTBL | seg);
 	}
-	
+
 	if (seg > 0)
 		bus_dmamap_sync(ocb->sdev->target->sbp->dmat, ocb->dmamap,
 			(ntohl(ocb->orb[4]) & ORB_CMD_IN) ?
@@ -2661,19 +2594,19 @@ END_DEBUG
 			if (ocb->sdev->last_ocb != NULL)
 				sbp_doorbell(ocb->sdev);
 			else
-				sbp_orb_pointer(ocb->sdev, ocb); 
+				sbp_orb_pointer(ocb->sdev, ocb);
 		}
 	} else {
 		if (prev == NULL || (ocb->sdev->flags & ORB_LINK_DEAD) != 0) {
 			ocb->sdev->flags &= ~ORB_LINK_DEAD;
-			sbp_orb_pointer(ocb->sdev, ocb); 
+			sbp_orb_pointer(ocb->sdev, ocb);
 		}
 	}
 }
 
 static void
 sbp_poll(struct cam_sim *sim)
-{       
+{
 	struct sbp_softc *sbp;
 	struct firewire_comm *fc;
 
@@ -2694,11 +2627,7 @@ sbp_dequeue_ocb(struct sbp_dev *sdev, struct sbp_status *sbp_status)
 
 SBP_DEBUG(1)
 	device_printf(sdev->target->sbp->fd.dev,
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	"%s:%s 0x%08lx src %d\n",
-#else
 	"%s:%s 0x%08x src %d\n",
-#endif
 	    __func__, sdev->bustgtlun, ntohl(sbp_status->orb_lo), sbp_status->src);
 END_DEBUG
 	SBP_LOCK_ASSERT(sdev->target->sbp);
@@ -2720,7 +2649,7 @@ END_DEBUG
 			if (!use_doorbell) {
 				if (sbp_status->src == SRC_NO_NEXT) {
 					if (next != NULL)
-						sbp_orb_pointer(sdev, next); 
+						sbp_orb_pointer(sdev, next);
 					else if (order > 0) {
 						/*
 						 * Unordered execution
@@ -2733,7 +2662,7 @@ END_DEBUG
 			} else {
 				/*
 				 * XXX this is not correct for unordered
-				 * execution. 
+				 * execution.
 				 */
 				if (sdev->last_ocb != NULL) {
 					sbp_free_ocb(sdev, sdev->last_ocb);
@@ -2745,7 +2674,7 @@ END_DEBUG
 			}
 			break;
 		} else
-			order ++;
+			order++;
 	}
 SBP_DEBUG(0)
 	if (ocb && order > 0) {
@@ -2765,11 +2694,7 @@ sbp_enqueue_ocb(struct sbp_dev *sdev, struct sbp_ocb *ocb)
 	SBP_LOCK_ASSERT(sdev->target->sbp);
 SBP_DEBUG(1)
 	device_printf(sdev->target->sbp->fd.dev,
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	"%s:%s 0x%08x\n", __func__, sdev->bustgtlun, ocb->bus_addr);
-#else
 	"%s:%s 0x%08jx\n", __func__, sdev->bustgtlun, (uintmax_t)ocb->bus_addr);
-#endif
 END_DEBUG
 	prev2 = prev = STAILQ_LAST(&sdev->ocbs, sbp_ocb, ocb);
 	STAILQ_INSERT_TAIL(&sdev->ocbs, ocb, ocb);
@@ -2783,13 +2708,8 @@ END_DEBUG
 
 	if (prev2 != NULL && (ocb->sdev->flags & ORB_LINK_DEAD) == 0) {
 SBP_DEBUG(1)
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-		printf("linking chain 0x%x -> 0x%x\n",
-		    prev2->bus_addr, ocb->bus_addr);
-#else
 		printf("linking chain 0x%jx -> 0x%jx\n",
 		    (uintmax_t)prev2->bus_addr, (uintmax_t)ocb->bus_addr);
-#endif
 END_DEBUG
 		/*
 		 * Suppress compiler optimization so that orb[1] must be written first.
@@ -2847,11 +2767,7 @@ sbp_abort_ocb(struct sbp_ocb *ocb, int status)
 	SBP_LOCK_ASSERT(sdev->target->sbp);
 SBP_DEBUG(0)
 	device_printf(sdev->target->sbp->fd.dev,
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	"%s:%s 0x%x\n", __func__, sdev->bustgtlun, ocb->bus_addr);
-#else
 	"%s:%s 0x%jx\n", __func__, sdev->bustgtlun, (uintmax_t)ocb->bus_addr);
-#endif
 END_DEBUG
 SBP_DEBUG(1)
 	if (ocb->ccb != NULL)
@@ -2909,9 +2825,6 @@ static driver_t sbp_driver = {
 	sbp_methods,
 	sizeof(struct sbp_softc),
 };
-#ifdef __DragonFly__
-DECLARE_DUMMY_MODULE(sbp);
-#endif
 DRIVER_MODULE(sbp, firewire, sbp_driver, sbp_devclass, 0, 0);
 MODULE_VERSION(sbp, 1);
 MODULE_DEPEND(sbp, firewire, 1, 1, 1);
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 84d522afba24..79f2e2840eb8 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -76,7 +76,7 @@ struct ind_ptr {
 
 #define SBP_RECV_LEN 32
 
-struct sbp_login_res{
+struct sbp_login_res {
 	uint16_t	len;
 	uint16_t	id;
 	uint16_t	res0;
@@ -86,7 +86,7 @@ struct sbp_login_res{
 	uint16_t	recon_hold;
 };
 
-struct sbp_status{
+struct sbp_status {
 #if BYTE_ORDER == BIG_ENDIAN
 	uint8_t		src:2,
 			resp:2,
@@ -155,7 +155,7 @@ struct sbp_status{
 /* F: Address error */
 
 
-struct sbp_cmd_status{
+struct sbp_cmd_status {
 #define SBP_SFMT_CURR 0
 #define SBP_SFMT_DEFER 1
 #if BYTE_ORDER == BIG_ENDIAN
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 8026b79dcb6a..0d78e9f1e8b3 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (C) 2003
  * 	Hidetoshi Shimokawa. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -18,7 +18,7 @@
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * $FreeBSD$
  */
 
@@ -42,9 +42,6 @@
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/endian.h>
-#if __FreeBSD_version < 500000
-#include <sys/devicestat.h>
-#endif
 
 #include <sys/bus.h>
 #include <machine/bus.h>
@@ -107,16 +104,16 @@ struct sbp_targ_login {
 	struct sbp_targ_lstate *lstate;
 	struct fw_device *fwdev;
 	struct sbp_login_res loginres;
-	uint16_t fifo_hi; 
+	uint16_t fifo_hi;
 	uint16_t last_hi;
-	uint32_t fifo_lo; 
+	uint32_t fifo_lo;
 	uint32_t last_lo;
 	STAILQ_HEAD(, orb_info) orbs;
 	STAILQ_ENTRY(sbp_targ_login) link;
 	uint16_t hold_sec;
 	uint16_t id;
-	uint8_t flags; 
-	uint8_t spd; 
+	uint8_t flags;
+	uint8_t spd;
 	struct callout hold_callout;
 };
 
@@ -127,7 +124,7 @@ struct sbp_targ_lstate {
 	struct ccb_hdr_slist accept_tios;
 	struct ccb_hdr_slist immed_notifies;
 	struct crom_chunk model;
-	uint32_t flags; 
+	uint32_t flags;
 	STAILQ_HEAD(, sbp_targ_login) logins;
 };
 
@@ -208,7 +205,7 @@ struct orb_info {
 	struct sbp_targ_login *login;
 	union ccb *ccb;
 	struct ccb_accept_tio *atio;
-	uint8_t state; 
+	uint8_t state;
 #define ORBI_STATUS_NONE	0
 #define ORBI_STATUS_FETCH	1
 #define ORBI_STATUS_ATIO	2
@@ -216,7 +213,7 @@ struct orb_info {
 #define ORBI_STATUS_STATUS	4
 #define ORBI_STATUS_POINTER	5
 #define ORBI_STATUS_ABORTED	7
-	uint8_t refcount; 
+	uint8_t refcount;
 	uint16_t orb_hi;
 	uint32_t orb_lo;
 	uint32_t data_hi;
@@ -253,8 +250,8 @@ sbp_targ_probe(device_t dev)
 	device_t pa;
 
 	pa = device_get_parent(dev);
-	if(device_get_unit(dev) != device_get_unit(pa)){
-		return(ENXIO);
+	if (device_get_unit(dev) != device_get_unit(pa)) {
+		return (ENXIO);
 	}
 
 	device_set_desc(dev, "SBP-2/SCSI over FireWire target mode");
@@ -339,7 +336,7 @@ sbp_targ_post_busreset(void *arg)
 	crom_add_entry(unit, CROM_MGM, SBP_TARG_MGM >> 2);
 	crom_add_entry(unit, CSRKEY_UNIT_CH, (10<<8) | 8);
 
-	for (i = 0; i < MAX_LUN; i ++) {
+	for (i = 0; i < MAX_LUN; i++) {
 		lstate = sc->lstate[i];
 		if (lstate == NULL)
 			continue;
@@ -350,7 +347,7 @@ sbp_targ_post_busreset(void *arg)
 	}
 
 	/* Process for reconnection hold time */
-	for (i = 0; i < MAX_LOGINS; i ++) {
+	for (i = 0; i < MAX_LOGINS; i++) {
 		login = sc->logins[i];
 		if (login == NULL)
 			continue;
@@ -358,7 +355,7 @@ sbp_targ_post_busreset(void *arg)
 		if (login->flags & F_LOGIN) {
 			login->flags |= F_HOLD;
 			callout_reset(&login->hold_callout,
-			    hz * login->hold_sec, 
+			    hz * login->hold_sec,
 			    sbp_targ_hold_expire, (void *)login);
 		}
 	}
@@ -395,7 +392,7 @@ sbp_targ_find_devs(struct sbp_targ_softc *sc, union ccb *ccb,
 	lun = ccb->ccb_h.target_lun;
 	if (lun >= MAX_LUN)
 		return (CAM_LUN_INVALID);
-	
+
 	*lstate = sc->lstate[lun];
 
 	if (notfound_failure != 0 && *lstate == NULL) {
@@ -843,7 +840,7 @@ sbp_targ_cam_done(struct fw_xfer *xfer)
 		sbp_targ_abort(orbi->sc, STAILQ_NEXT(orbi, link));
 	}
 
-	orbi->refcount --;
+	orbi->refcount--;
 
 	ccb = orbi->ccb;
 	if (orbi->refcount == 0) {
@@ -919,7 +916,7 @@ sbp_targ_abort_ccb(struct sbp_targ_softc *sc, union ccb *ccb)
 		found = 1;
 		SLIST_REMOVE_HEAD(list, sim_links.sle);
 	} else {
-		while(curelm != NULL) {
+		while (curelm != NULL) {
 			struct ccb_hdr *nextelm;
 
 			nextelm = SLIST_NEXT(curelm, sim_links.sle);
@@ -985,7 +982,7 @@ sbp_targ_xfer_buf(struct orb_info *orbi, u_int offset,
 		if (xfer == NULL) {
 			printf("%s: xfer == NULL", __func__);
 			/* XXX what should we do?? */
-			orbi->refcount --;
+			orbi->refcount--;
 		}
 		off += len;
 	}
@@ -1357,7 +1354,7 @@ sbp_targ_action1(struct cam_sim *sim, union ccb *ccb)
 			ccb->ccb_h.status = CAM_UA_ABORT;
 			break;
 		default:
-			printf("%s: aborting unknown function %d\n", 
+			printf("%s: aborting unknown function %d\n",
 				__func__, accb->ccb_h.func_code);
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
@@ -1467,7 +1464,7 @@ sbp_targ_cmd_handler(struct fw_xfer *xfer)
 
 	orb = orbi->orb;
 	/* swap payload except SCSI command */
-	for (i = 0; i < 5; i ++)
+	for (i = 0; i < 5; i++)
 		orb[i] = ntohl(orb[i]);
 
 	orb4 = (struct corb4 *)&orb[4];
@@ -1548,12 +1545,12 @@ sbp_targ_get_login(struct sbp_targ_softc *sc, struct fw_device *fwdev, int lun)
 	int i;
 
 	lstate = sc->lstate[lun];
-	
+
 	STAILQ_FOREACH(login, &lstate->logins, link)
 		if (login->fwdev == fwdev)
 			return (login);
 
-	for (i = 0; i < MAX_LOGINS; i ++)
+	for (i = 0; i < MAX_LOGINS; i++)
 		if (sc->logins[i] == NULL)
 			goto found;
 
@@ -1610,7 +1607,7 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
 
 	orb = orbi->orb;
 	/* swap payload */
-	for (i = 0; i < 8; i ++) {
+	for (i = 0; i < 8; i++) {
 		orb[i] = ntohl(orb[i]);
 	}
 	orb4 = (struct morb4 *)&orb[4];
@@ -1631,10 +1628,10 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
 		lstate = orbi->sc->lstate[lun];
 
 		if (lun >= MAX_LUN || lstate == NULL ||
-		    (exclusive && 
+		    (exclusive &&
 		    STAILQ_FIRST(&lstate->logins) != NULL &&
 		    STAILQ_FIRST(&lstate->logins)->fwdev != orbi->fwdev)
-		    ) {
+		   ) {
 			/* error */
 			orbi->status.dead = 1;
 			orbi->status.status = STATUS_ACCESS_DENY;
@@ -1822,16 +1819,16 @@ sbp_targ_cmd(struct fw_xfer *xfer, struct fw_device *fwdev, int login_id,
 	int rtcode = 0;
 
 	if (login_id < 0 || login_id >= MAX_LOGINS)
-		return(RESP_ADDRESS_ERROR);
+		return (RESP_ADDRESS_ERROR);
 
 	sc = (struct sbp_targ_softc *)xfer->sc;
 	login = sc->logins[login_id];
 	if (login == NULL)
-		return(RESP_ADDRESS_ERROR);
+		return (RESP_ADDRESS_ERROR);
 
 	if (login->fwdev != fwdev) {
 		/* XXX */
-		return(RESP_ADDRESS_ERROR);
+		return (RESP_ADDRESS_ERROR);
 	}
 
 	switch (reg) {
@@ -1898,17 +1895,17 @@ sbp_targ_mgm(struct fw_xfer *xfer, struct fw_device *fwdev)
 	sc = (struct sbp_targ_softc *)xfer->sc;
 
 	fp = &xfer->recv.hdr;
-	if (fp->mode.wreqb.tcode != FWTCODE_WREQB){
+	if (fp->mode.wreqb.tcode != FWTCODE_WREQB) {
 		printf("%s: tcode = %d\n", __func__, fp->mode.wreqb.tcode);
-		return(RESP_TYPE_ERROR);
+		return (RESP_TYPE_ERROR);
         }
 
 	sbp_targ_fetch_orb(sc, fwdev,
 	    ntohl(xfer->recv.payload[0]),
 	    ntohl(xfer->recv.payload[1]),
 	    NULL, FETCH_MGM);
-	
-	return(0);
+
+	return (0);
 }
 
 static void
@@ -2026,9 +2023,9 @@ sbp_targ_detach(device_t dev)
 	xpt_free_path(sc->path);
 	xpt_bus_deregister(cam_sim_path(sc->sim));
 	SBP_UNLOCK(sc);
-	cam_sim_free(sc->sim, /*free_devq*/TRUE); 
+	cam_sim_free(sc->sim, /*free_devq*/TRUE);
 
-	for (i = 0; i < MAX_LUN; i ++) {
+	for (i = 0; i < MAX_LUN; i++) {
 		lstate = sc->lstate[i];
 		if (lstate != NULL) {
 			xpt_free_path(lstate->path);
@@ -2039,7 +2036,7 @@ sbp_targ_detach(device_t dev)
 		xpt_free_path(sc->black_hole->path);
 		free(sc->black_hole, M_SBP_TARG);
 	}
-			
+
 	fw_bindremove(sc->fd.fc, &sc->fwb);
 	fw_xferlist_remove(&sc->fwb.xferlist);
 
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 4b288bc9c707..947f057365d5 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1008,7 +1008,7 @@ fxp_detach(device_t dev)
 
 #ifdef DEVICE_POLLING
 	if (if_getcapenable(sc->ifp) & IFCAP_POLLING)
-		ether_poll_deregister_drv(sc->ifp);
+		ether_poll_deregister(sc->ifp);
 #endif
 
 	FXP_LOCK(sc);
@@ -1670,7 +1670,7 @@ fxp_encap(struct fxp_softc *sc, struct mbuf **m_head)
 }
 
 #ifdef DEVICE_POLLING
-static poll_handler_drv_t fxp_poll;
+static poll_handler_t fxp_poll;
 
 static int
 fxp_poll(if_t ifp, enum poll_cmd cmd, int count)
@@ -2012,7 +2012,7 @@ fxp_intr_body(struct fxp_softc *sc, if_t ifp, uint8_t statack,
 				return (rx_npkts);
 		} else {
 			/* Reuse RFA and loaded DMA map. */
-			if_inciqdrops(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			fxp_discard_rfabuf(sc, rxp);
 		}
 		fxp_add_rfabuf(sc, rxp);
@@ -2070,10 +2070,12 @@ fxp_update_stats(struct fxp_softc *sc)
 		hsp->tx_tco += le16toh(sp->tx_tco);
 		hsp->rx_tco += le16toh(sp->rx_tco);
 
-		if_incopackets(ifp, le32toh(sp->tx_good));
-		if_inccollisions(ifp, le32toh(sp->tx_total_collisions));
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, le32toh(sp->tx_good));
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+		    le32toh(sp->tx_total_collisions));
 		if (sp->rx_good) {
-			if_incipackets(ifp, le32toh(sp->rx_good));
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS,
+			    le32toh(sp->rx_good));
 			sc->rx_idle_secs = 0;
 		} else if (sc->flags & FXP_FLAG_RXBUG) {
 			/*
@@ -2081,7 +2083,7 @@ fxp_update_stats(struct fxp_softc *sc)
 			 */
 			sc->rx_idle_secs++;
 		}
-		if_incierrors(ifp,
+		if_inc_counter(ifp, IFCOUNTER_IERRORS,
 		    le32toh(sp->rx_crc_errors) +
 		    le32toh(sp->rx_alignment_errors) +
 		    le32toh(sp->rx_rnr_errors) +
@@ -2091,7 +2093,8 @@ fxp_update_stats(struct fxp_softc *sc)
 		 * threshold by another 512 bytes (64 * 8).
 		 */
 		if (sp->tx_underruns) {
-			if_incoerrors(ifp, le32toh(sp->tx_underruns));
+			if_inc_counter(ifp, IFCOUNTER_OERRORS,
+			    le32toh(sp->tx_underruns));
 			if (tx_threshold < 192)
 				tx_threshold += 64;
 		}
@@ -2244,7 +2247,7 @@ fxp_watchdog(struct fxp_softc *sc)
 		return;
 
 	device_printf(sc->dev, "device timeout\n");
-	if_incoerrors(ifp, 1);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	fxp_init_body(sc, 1);
@@ -2887,7 +2890,7 @@ fxp_ioctl(if_t ifp, u_long command, caddr_t data)
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
-				error = ether_poll_register_drv(fxp_poll, ifp);
+				error = ether_poll_register(fxp_poll, ifp);
 				if (error)
 					return(error);
 				FXP_LOCK(sc);
@@ -2896,7 +2899,7 @@ fxp_ioctl(if_t ifp, u_long command, caddr_t data)
 				if_setcapenablebit(ifp, IFCAP_POLLING, 0);
 				FXP_UNLOCK(sc);
 			} else {
-				error = ether_poll_deregister_drv(ifp);
+				error = ether_poll_deregister(ifp);
 				/* Enable interrupts in any case */
 				FXP_LOCK(sc);
 				CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, 0);
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index ce83f2ff7315..b2a828dbbd54 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -568,18 +568,18 @@ gem_tick(void *arg)
 	/*
 	 * Unload collision and error counters.
 	 */
-	ifp->if_collisions +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
 	    GEM_BANK1_READ_4(sc, GEM_MAC_NORM_COLL_CNT) +
-	    GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT);
+	    GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT));
 	v = GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) +
 	    GEM_BANK1_READ_4(sc, GEM_MAC_LATE_COLL_CNT);
-	ifp->if_collisions += v;
-	ifp->if_oerrors += v;
-	ifp->if_ierrors +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, v);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, v);
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
 	    GEM_BANK1_READ_4(sc, GEM_MAC_RX_LEN_ERR_CNT) +
 	    GEM_BANK1_READ_4(sc, GEM_MAC_RX_ALIGN_ERR) +
 	    GEM_BANK1_READ_4(sc, GEM_MAC_RX_CRC_ERR_CNT) +
-	    GEM_BANK1_READ_4(sc, GEM_MAC_RX_CODE_VIOL);
+	    GEM_BANK1_READ_4(sc, GEM_MAC_RX_CODE_VIOL));
 
 	/*
 	 * Then clear the hardware counters.
@@ -1485,7 +1485,7 @@ gem_tint(struct gem_softc *sc)
 
 		STAILQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		progress = 1;
 	}
 
@@ -1580,7 +1580,7 @@ gem_rint(struct gem_softc *sc)
 		}
 
 		if (rxstat & GEM_RD_BAD_CRC) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			device_printf(sc->sc_dev, "receive error: CRC error\n");
 			GEM_INIT_RXDESC(sc, sc->sc_rxptr);
 			m = NULL;
@@ -1606,7 +1606,7 @@ gem_rint(struct gem_softc *sc)
 		 * the buffer that's already attached to this descriptor.
 		 */
 		if (gem_add_rxbuf(sc, sc->sc_rxptr) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			GEM_INIT_RXDESC(sc, sc->sc_rxptr);
 			m = NULL;
 		}
@@ -1634,7 +1634,7 @@ gem_rint(struct gem_softc *sc)
 			continue;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_data += ETHER_ALIGN; /* first byte offset */
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = GEM_RD_BUFLEN(rxstat);
@@ -1706,7 +1706,7 @@ static void
 gem_eint(struct gem_softc *sc, u_int status)
 {
 
-	sc->sc_ifp->if_ierrors++;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 	if ((status & GEM_INTR_RX_TAG_ERR) != 0) {
 		gem_reset_rxdma(sc);
 		return;
@@ -1784,7 +1784,7 @@ gem_intr(void *v)
 			    "MAC TX fault, status %x\n", status2);
 		if ((status2 &
 		    (GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) != 0) {
-			sc->sc_ifp->if_oerrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 			sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 			gem_init_locked(sc);
 		}
@@ -1798,7 +1798,7 @@ gem_intr(void *v)
 		 * likely that the receiver has hung so we reset it.
 		 */
 		if ((status2 & GEM_MAC_RX_OVERFLOW) != 0) {
-			sc->sc_ifp->if_ierrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 			gem_reset_rxdma(sc);
 		} else if ((status2 &
 		    ~(GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT)) != 0)
@@ -1835,7 +1835,7 @@ gem_watchdog(struct gem_softc *sc)
 		device_printf(sc->sc_dev, "device timeout\n");
 	else if (bootverbose)
 		device_printf(sc->sc_dev, "device timeout (no link)\n");
-	++ifp->if_oerrors;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	/* Try to get more packets going. */
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/dev/gxemul/ether/if_gx.c b/sys/dev/gxemul/ether/if_gx.c
index 63483f8a52c6..886fb590441b 100644
--- a/sys/dev/gxemul/ether/if_gx.c
+++ b/sys/dev/gxemul/ether/if_gx.c
@@ -248,8 +248,8 @@ gx_transmit(struct ifnet *ifp, struct mbuf *m)
 
 	ETHER_BPF_MTAP(ifp, m);
 
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	m_freem(m);
 
@@ -366,14 +366,14 @@ gx_rx_intr(void *arg)
 			break;
 		length = GXEMUL_ETHER_DEV_READ(GXEMUL_ETHER_DEV_LENGTH);
 		if (length > MCLBYTES - ETHER_ALIGN) {
-			sc->sc_ifp->if_ierrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 
 		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL) {
 			device_printf(sc->sc_dev, "no memory for receive mbuf.\n");
-			sc->sc_ifp->if_iqdrops++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_IQDROPS, 1);
 			GXEMUL_ETHER_UNLOCK(sc);
 			return;
 		}
@@ -386,7 +386,7 @@ gx_rx_intr(void *arg)
 		m->m_pkthdr.rcvif = sc->sc_ifp;
 		m->m_pkthdr.len = m->m_len = length;
 
-		sc->sc_ifp->if_ipackets++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
 
 		GXEMUL_ETHER_UNLOCK(sc);
 
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index bf17294df211..af0b925410ff 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -149,7 +149,7 @@ hatm_rx(struct hatm_softc *sc, u_int cid, u_int flags, struct mbuf *m0,
 			m_freem(vcc->chain);
 		vcc->chain = vcc->last = NULL;
 		sc->istats.crc_error++;
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	if (flags & HE_REGM_RBRQ_LEN_ERROR) {
@@ -157,7 +157,7 @@ hatm_rx(struct hatm_softc *sc, u_int cid, u_int flags, struct mbuf *m0,
 			m_freem(vcc->chain);
 		vcc->chain = vcc->last = NULL;
 		sc->istats.len_error++;
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -240,9 +240,9 @@ hatm_rx(struct hatm_softc *sc, u_int cid, u_int flags, struct mbuf *m0,
 	ATM_PH_VPI(&aph) = vpi;
 	ATM_PH_SETVCI(&aph, vci);
 
-	sc->ifp->if_ipackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	/* this is in if_atmsubr.c */
-	/* sc->ifp->if_ibytes += len; */
+	/* if_inc_counter(sc->ifp, IFCOUNTER_IBYTES, len); */
 
 	vcc->ibytes += len;
 	vcc->ipackets++;
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index 8e03e9d55cb6..d0a28bad679a 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -452,7 +452,7 @@ hatm_start(struct ifnet *ifp)
 		if ((tpd = hatm_alloc_tpd(sc, M_NOWAIT)) == NULL) {
 			hatm_free_txmbuf(sc);
 			m_freem(m);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		tpd->cid = cid;
@@ -472,7 +472,7 @@ hatm_start(struct ifnet *ifp)
 				tpd->mbuf = NULL;
 				hatm_free_txmbuf(sc);
 				hatm_free_tpd(sc, tpd);
-				sc->ifp->if_oerrors++;
+				if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 			arg.mbuf = m;
@@ -484,17 +484,17 @@ hatm_start(struct ifnet *ifp)
 			if_printf(sc->ifp, "mbuf loaded error=%d\n",
 			    error);
 			hatm_free_tpd(sc, tpd);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		if (arg.error) {
 			hatm_free_tpd(sc, tpd);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		arg.vcc->opackets++;
 		arg.vcc->obytes += len;
-		sc->ifp->if_opackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 	}
 	mtx_unlock(&sc->mtx);
 }
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index e5ad831cc896..5645c147452b 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -477,11 +477,11 @@ hme_tick(void *arg)
 	/*
 	 * Unload collision counters
 	 */
-	ifp->if_collisions +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
 		HME_MAC_READ_4(sc, HME_MACI_NCCNT) +
 		HME_MAC_READ_4(sc, HME_MACI_FCCNT) +
 		HME_MAC_READ_4(sc, HME_MACI_EXCNT) +
-		HME_MAC_READ_4(sc, HME_MACI_LTCNT);
+		HME_MAC_READ_4(sc, HME_MACI_LTCNT));
 
 	/*
 	 * then clear the hardware counters.
@@ -1072,7 +1072,7 @@ hme_read(struct hme_softc *sc, int ix, int len, u_int32_t flags)
 		HME_WHINE(sc->sc_dev, "invalid packet size %d; dropping\n",
 		    len);
 #endif
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		hme_discard_rxbuf(sc, ix);
 		return;
 	}
@@ -1086,12 +1086,12 @@ hme_read(struct hme_softc *sc, int ix, int len, u_int32_t flags)
 		 * it is sure that a new buffer can be mapped. If it can not,
 		 * drop the packet, but leave the interface up.
 		 */
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		hme_discard_rxbuf(sc, ix);
 		return;
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	m->m_pkthdr.rcvif = ifp;
 	m->m_pkthdr.len = m->m_len = len + HME_RXOFFS;
@@ -1193,7 +1193,7 @@ hme_tint(struct hme_softc *sc)
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_tdmatag, htx->htx_dmamap);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		m_freem(htx->htx_m);
 		htx->htx_m = NULL;
 		STAILQ_REMOVE_HEAD(&sc->sc_rb.rb_txbusyq, htx_q);
@@ -1299,7 +1299,7 @@ hme_rint(struct hme_softc *sc)
 		if ((flags & HME_XD_OFL) != 0) {
 			device_printf(sc->sc_dev, "buffer overflow, ri=%d; "
 			    "flags=0x%x\n", ri, flags);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			hme_discard_rxbuf(sc, ri);
 		} else {
 			len = HME_XD_DECODE_RSIZE(flags);
@@ -1374,7 +1374,7 @@ hme_watchdog(struct hme_softc *sc)
 		device_printf(sc->sc_dev, "device timeout\n");
 	else if (bootverbose)
 		device_printf(sc->sc_dev, "device timeout (no link)\n");
-	++ifp->if_oerrors;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	hme_init_locked(sc);
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index 462805935c4b..ad251d3a42b3 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -40,14 +40,15 @@ __FBSDID("$FreeBSD$");
 #include <machine/pte.h>
 #include <machine/sr.h>
 #include <machine/cpu.h>
-#include <machine/vmparam.h> /* For VM_MIN_KERNEL_ADDRESS/VM_MAX_KERNEL_ADDRESS */
+#include <machine/stack.h>
 
 #include "hwpmc_powerpc.h"
 
-#define INKERNEL(x)	(((vm_offset_t)(x)) <= VM_MAX_KERNEL_ADDRESS && \
-		((vm_offset_t)(x)) >= VM_MIN_KERNEL_ADDRESS)
-#define INUSER(x)	(((vm_offset_t)(x)) <= VM_MAXUSER_ADDRESS && \
-		((vm_offset_t)(x)) >= VM_MIN_ADDRESS)
+#ifdef __powerpc64__
+#define OFFSET 4 /* Account for the TOC reload slot */
+#else
+#define OFFSET 0
+#endif
 
 struct powerpc_cpu **powerpc_pcpu;
 
@@ -56,20 +57,33 @@ pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples,
     struct trapframe *tf)
 {
 	uintptr_t *osp, *sp;
+	uintptr_t pc;
 	int frames = 0;
 
 	cc[frames++] = PMC_TRAPFRAME_TO_PC(tf);
 	sp = (uintptr_t *)PMC_TRAPFRAME_TO_FP(tf);
-	osp = NULL;
+	osp = (uintptr_t *)PAGE_SIZE;
 
 	for (; frames < maxsamples; frames++) {
-		if (!INKERNEL(sp) || sp <= osp)
+		if (sp <= osp)
 			break;
-#ifdef __powerpc64__
-		cc[frames] = sp[2];
-#else
-		cc[frames] = sp[1];
-#endif
+	    #ifdef __powerpc64__
+		pc = sp[2];
+	    #else
+		pc = sp[1];
+	    #endif
+		if ((pc & 3) || (pc < 0x100))
+			break;
+
+		/*
+		 * trapexit() and asttrapexit() are sentinels
+		 * for kernel stack tracing.
+		 * */
+		if (pc + OFFSET == (uintptr_t) &trapexit ||
+		    pc + OFFSET == (uintptr_t) &asttrapexit)
+			break;
+
+		cc[frames] = pc;
 		osp = sp;
 		sp = (uintptr_t *)*sp;
 	}
@@ -194,7 +208,7 @@ pmc_save_user_callchain(uintptr_t *cc, int maxsamples,
 	osp = NULL;
 
 	for (; frames < maxsamples; frames++) {
-		if (!INUSER(sp) || sp <= osp)
+		if (sp <= osp)
 			break;
 		osp = sp;
 #ifdef __powerpc64__
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 4257b371c717..8a45d89cd063 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -795,5 +795,34 @@ hv_get_phys_addr(void *virt)
 	return (ret);
 }
 
+
+/**
+ * KVP related structures
+ * 
+ */
+typedef struct hv_vmbus_service {
+        hv_guid       guid;             /* Hyper-V GUID */
+        char          *name;            /* name of service */
+        boolean_t     enabled;          /* service enabled */
+        hv_work_queue *work_queue;      /* background work queue */
+
+        /*
+         * function to initialize service
+         */
+        int (*init)(struct hv_vmbus_service *);
+
+        /*
+         * function to process Hyper-V messages
+         */
+        void (*callback)(void *);
+} hv_vmbus_service;
+
+extern uint8_t* receive_buffer[];
+extern hv_vmbus_service service_table[];
+
+void hv_kvp_callback(void *context);
+int hv_kvp_init(hv_vmbus_service *serv);
+void hv_kvp_deinit(void);
+
 #endif  /* __HYPERV_H__ */
 
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index 3b60c3fd0574..41d869fe87b8 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -500,7 +500,7 @@ hn_start_locked(struct ifnet *ifp)
 		ret = hv_rf_on_send(device_ctx, packet);
 
 		if (ret == 0) {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			/* if bpf && mc_head, call bpf_mtap code */
 			if (mc_head) {
 				ETHER_BPF_MTAP(ifp, mc_head);
@@ -702,7 +702,7 @@ netvsc_recv(struct hv_device *device_ctx, netvsc_packet *packet)
 	 * messages (not just data messages) will trigger a response.
 	 */
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	/* We're not holding the lock here, so don't release it */
 	(*ifp->if_input)(ifp, m_new);
@@ -988,7 +988,7 @@ hn_watchdog(struct ifnet *ifp)
 
 	printf("hn%d: watchdog timeout -- resetting\n", sc->hn_unit);
 	hn_ifinit(sc);    /*???*/
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 #endif
 
diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c
new file mode 100644
index 000000000000..848d364a4b33
--- /dev/null
+++ b/sys/dev/hyperv/utilities/hv_kvp.c
@@ -0,0 +1,1001 @@
+/*-
+ * Copyright (c) 2014 Microsoft Corp.
+ * All rights reserved.
+ *
+ * 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 unmodified, 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ *	Author:	Sainath Varanasi.
+ *	Date:	4/2012
+ *	Email:	bsdic@microsoft.com
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/conf.h>
+#include <sys/uio.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/reboot.h>
+#include <sys/lock.h>
+#include <sys/taskqueue.h>
+#include <sys/sysctl.h>
+#include <sys/poll.h>
+#include <sys/proc.h>
+#include <sys/kthread.h>
+#include <sys/syscallsubr.h>
+#include <sys/sysproto.h>
+#include <sys/un.h>
+#include <sys/endian.h>
+#include <sys/_null.h>
+#include <sys/signal.h>
+#include <sys/syslog.h>
+#include <sys/mutex.h>
+#include <net/if_arp.h>
+
+#include <dev/hyperv/include/hyperv.h>
+#include <dev/hyperv/netvsc/hv_net_vsc.h>
+
+#include "unicode.h"
+#include "hv_kvp.h"
+
+/* hv_kvp defines */
+#define BUFFERSIZE	sizeof(struct hv_kvp_msg)
+#define KVP_SUCCESS	0
+#define KVP_ERROR	1
+#define kvp_hdr		hdr.kvp_hdr
+
+/* hv_kvp debug control */
+static int hv_kvp_log = 0;
+SYSCTL_INT(_dev, OID_AUTO, hv_kvp_log, CTLFLAG_RW, &hv_kvp_log, 0,
+	"hv_kvp log");
+
+#define	hv_kvp_log_error(...)	do {				\
+	if (hv_kvp_log > 0)				\
+		log(LOG_ERR, "hv_kvp: " __VA_ARGS__);	\
+} while (0)
+
+#define	hv_kvp_log_info(...) do {				\
+	if (hv_kvp_log > 1)				\
+		log(LOG_INFO, "hv_kvp: " __VA_ARGS__);		\
+} while (0)
+
+/* character device prototypes */
+static d_open_t		hv_kvp_dev_open;
+static d_close_t	hv_kvp_dev_close;
+static d_read_t		hv_kvp_dev_daemon_read;
+static d_write_t	hv_kvp_dev_daemon_write;
+static d_poll_t		hv_kvp_dev_daemon_poll;
+
+/* hv_kvp prototypes */
+static int	hv_kvp_req_in_progress(void);
+static void	hv_kvp_transaction_init(uint32_t, hv_vmbus_channel *, uint64_t, uint8_t *);
+static void	hv_kvp_send_msg_to_daemon(void);
+static void	hv_kvp_process_request(void *context);
+
+/* hv_kvp character device structure */
+static struct cdevsw hv_kvp_cdevsw =
+{
+	.d_version	= D_VERSION,
+	.d_open		= hv_kvp_dev_open,
+	.d_close	= hv_kvp_dev_close,
+	.d_read		= hv_kvp_dev_daemon_read,
+	.d_write	= hv_kvp_dev_daemon_write,
+	.d_poll		= hv_kvp_dev_daemon_poll,
+	.d_name		= "hv_kvp_dev",
+};
+static struct cdev *hv_kvp_dev;
+static struct hv_kvp_msg *hv_kvp_dev_buf;
+struct proc *daemon_task;
+
+/*
+ * Global state to track and synchronize multiple
+ * KVP transaction requests from the host.
+ */
+static struct {
+
+	/* Pre-allocated work item for queue */
+	hv_work_item		work_item;	
+
+	/* Unless specified the pending mutex should be 
+	 * used to alter the values of the following paramters:
+	 * 1. req_in_progress
+	 * 2. req_timed_out
+	 * 3. pending_reqs.
+	 */
+	struct mtx		pending_mutex;	  
+	
+	/* To track if transaction is active or not */
+	boolean_t		req_in_progress;    
+	/* Tracks if daemon did not reply back in time */
+	boolean_t		req_timed_out;	  
+	/* Tracks if daemon is serving a request currently */
+	boolean_t		daemon_busy;
+	/* Count of KVP requests from Hyper-V. */
+	uint64_t		pending_reqs;       
+	
+	
+	/* Length of host message */
+	uint32_t		host_msg_len;	    
+
+	/* Pointer to channel */
+	hv_vmbus_channel	*channelp;	    
+
+	/* Host message id */
+	uint64_t		host_msg_id;	   
+	
+	/* Current kvp message from the host */
+	struct hv_kvp_msg	*host_kvp_msg;      
+	
+	 /* Current kvp message for daemon */
+	struct hv_kvp_msg	daemon_kvp_msg;    
+	
+	/* Rcv buffer for communicating with the host*/
+	uint8_t			*rcv_buf;	    
+	
+	/* Device semaphore to control communication */
+	struct sema		dev_sema;	   
+	
+	/* Indicates if daemon registered with driver */
+	boolean_t		register_done;      
+	
+	/* Character device status */
+	boolean_t		dev_accessed;	    
+} kvp_globals;
+
+/* global vars */
+MALLOC_DECLARE(M_HV_KVP_DEV_BUF);
+MALLOC_DEFINE(M_HV_KVP_DEV_BUF, "hv_kvp_dev buffer", "buffer for hv_kvp_dev module");
+
+/*
+ * hv_kvp low level functions
+ */
+
+/*
+ * Check if kvp transaction is in progres
+ */
+static int
+hv_kvp_req_in_progress(void)
+{
+
+	return (kvp_globals.req_in_progress);
+}
+
+
+/*
+ * This routine is called whenever a message is received from the host
+ */
+static void
+hv_kvp_transaction_init(uint32_t rcv_len, hv_vmbus_channel *rcv_channel,
+			uint64_t request_id, uint8_t *rcv_buf)
+{
+	
+	/* Store all the relevant message details in the global structure */
+	/* Do not need to use mutex for req_in_progress here */
+	kvp_globals.req_in_progress = true;
+	kvp_globals.host_msg_len = rcv_len;
+	kvp_globals.channelp = rcv_channel;
+	kvp_globals.host_msg_id = request_id;
+	kvp_globals.rcv_buf = rcv_buf;
+	kvp_globals.host_kvp_msg = (struct hv_kvp_msg *)&rcv_buf[
+		sizeof(struct hv_vmbus_pipe_hdr) +
+		sizeof(struct hv_vmbus_icmsg_hdr)];
+}
+
+
+/*
+ * hv_kvp - version neogtiation function
+ */
+static void
+hv_kvp_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp,
+			 struct hv_vmbus_icmsg_negotiate *negop,
+			 uint8_t *buf)
+{
+	int icframe_vercnt;
+	int icmsg_vercnt;
+
+	icmsghdrp->icmsgsize = 0x10;
+
+	negop = (struct hv_vmbus_icmsg_negotiate *)&buf[
+		sizeof(struct hv_vmbus_pipe_hdr) +
+		sizeof(struct hv_vmbus_icmsg_hdr)];
+	icframe_vercnt = negop->icframe_vercnt;
+	icmsg_vercnt = negop->icmsg_vercnt;
+
+	/*
+	 * Select the framework version number we will support
+	 */
+	if ((icframe_vercnt >= 2) && (negop->icversion_data[1].major == 3)) {
+		icframe_vercnt = 3;
+		if (icmsg_vercnt >= 2)
+			icmsg_vercnt = 4;
+		else
+			icmsg_vercnt = 3;
+	} else {
+		icframe_vercnt = 1;
+		icmsg_vercnt = 1;
+	}
+
+	negop->icframe_vercnt = 1;
+	negop->icmsg_vercnt = 1;
+	negop->icversion_data[0].major = icframe_vercnt;
+	negop->icversion_data[0].minor = 0;
+	negop->icversion_data[1].major = icmsg_vercnt;
+	negop->icversion_data[1].minor = 0;
+}
+
+
+/*
+ * Convert ip related info in umsg from utf8 to utf16 and store in hmsg
+ */
+static int
+hv_kvp_convert_utf8_ipinfo_to_utf16(struct hv_kvp_msg *umsg, 
+				    struct hv_kvp_ip_msg *host_ip_msg)
+{
+	int err_ip, err_subnet, err_gway, err_dns, err_adap;
+	int UNUSED_FLAG = 1;
+ 		
+	utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.ip_addr,
+	    MAX_IP_ADDR_SIZE,
+	    (char *)umsg->body.kvp_ip_val.ip_addr,
+	    strlen((char *)umsg->body.kvp_ip_val.ip_addr),
+	    UNUSED_FLAG,
+	    &err_ip);
+	utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.sub_net,
+	    MAX_IP_ADDR_SIZE,
+	    (char *)umsg->body.kvp_ip_val.sub_net,
+	    strlen((char *)umsg->body.kvp_ip_val.sub_net),
+	    UNUSED_FLAG,
+	    &err_subnet);
+	utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.gate_way,
+	    MAX_GATEWAY_SIZE,
+	    (char *)umsg->body.kvp_ip_val.gate_way,
+	    strlen((char *)umsg->body.kvp_ip_val.gate_way),
+	    UNUSED_FLAG,
+	    &err_gway);
+	utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.dns_addr,
+	    MAX_IP_ADDR_SIZE,
+	    (char *)umsg->body.kvp_ip_val.dns_addr,
+	    strlen((char *)umsg->body.kvp_ip_val.dns_addr),
+	    UNUSED_FLAG,
+	    &err_dns);
+	utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
+	    MAX_IP_ADDR_SIZE,
+	    (char *)umsg->body.kvp_ip_val.adapter_id,
+	    strlen((char *)umsg->body.kvp_ip_val.adapter_id),
+	    UNUSED_FLAG,
+	    &err_adap);
+	
+	host_ip_msg->kvp_ip_val.dhcp_enabled = umsg->body.kvp_ip_val.dhcp_enabled;
+	host_ip_msg->kvp_ip_val.addr_family = umsg->body.kvp_ip_val.addr_family;
+
+	return (err_ip | err_subnet | err_gway | err_dns | err_adap);
+}
+
+
+/*
+ * Convert ip related info in hmsg from utf16 to utf8 and store in umsg
+ */
+static int
+hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_msg *host_ip_msg,
+				    struct hv_kvp_msg *umsg)
+{
+	int err_ip, err_subnet, err_gway, err_dns, err_adap;
+	int UNUSED_FLAG = 1;
+	int guid_index;
+	struct hv_device *hv_dev;       /* GUID Data Structure */
+	hn_softc_t *sc;                 /* hn softc structure  */
+	char if_name[4];
+	unsigned char guid_instance[40];
+	char *guid_data = NULL;
+	char buf[39];
+
+	struct guid_extract {
+		char	a1[2];
+		char	a2[2];
+		char	a3[2];
+		char	a4[2];
+		char	b1[2];
+		char	b2[2];
+		char	c1[2];
+		char	c2[2];
+		char	d[4];
+		char	e[12];
+	};
+
+	struct guid_extract *id;
+	device_t *devs;
+	int devcnt;
+
+	/* IP Address */
+	utf16_to_utf8((char *)umsg->body.kvp_ip_val.ip_addr,
+	    MAX_IP_ADDR_SIZE,
+	    (uint16_t *)host_ip_msg->kvp_ip_val.ip_addr,
+	    MAX_IP_ADDR_SIZE,
+	    UNUSED_FLAG,
+	    &err_ip);
+
+	/* Adapter ID : GUID */
+	utf16_to_utf8((char *)umsg->body.kvp_ip_val.adapter_id,
+	    MAX_ADAPTER_ID_SIZE,
+	    (uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
+	    MAX_ADAPTER_ID_SIZE,
+	    UNUSED_FLAG,
+	    &err_adap);
+
+	if (devclass_get_devices(devclass_find("hn"), &devs, &devcnt) == 0) {
+		for (devcnt = devcnt - 1; devcnt >= 0; devcnt--) {
+			sc = device_get_softc(devs[devcnt]);
+
+			/* Trying to find GUID of Network Device */
+			hv_dev = sc->hn_dev_obj;
+
+			for (guid_index = 0; guid_index < 16; guid_index++) {
+				sprintf(&guid_instance[guid_index * 2], "%02x",
+				    hv_dev->device_id.data[guid_index]);
+			}
+
+			guid_data = (char *)guid_instance;
+			id = (struct guid_extract *)guid_data;
+			snprintf(buf, sizeof(buf), "{%.2s%.2s%.2s%.2s-%.2s%.2s-%.2s%.2s-%.4s-%s}",
+			    id->a4, id->a3, id->a2, id->a1,
+			    id->b2, id->b1, id->c2, id->c1, id->d, id->e);
+			guid_data = NULL;
+			sprintf(if_name, "%s%d", "hn", device_get_unit(devs[devcnt]));
+
+			if (strncmp(buf, (char *)umsg->body.kvp_ip_val.adapter_id, 39) == 0) {
+				strcpy((char *)umsg->body.kvp_ip_val.adapter_id, if_name);
+				break;
+			}
+		}
+		free(devs, M_TEMP);
+	}
+
+	/* Address Family , DHCP , SUBNET, Gateway, DNS */
+	umsg->kvp_hdr.operation = host_ip_msg->operation;
+	umsg->body.kvp_ip_val.addr_family = host_ip_msg->kvp_ip_val.addr_family;
+	umsg->body.kvp_ip_val.dhcp_enabled = host_ip_msg->kvp_ip_val.dhcp_enabled;
+	utf16_to_utf8((char *)umsg->body.kvp_ip_val.sub_net, MAX_IP_ADDR_SIZE,
+	    (uint16_t *)host_ip_msg->kvp_ip_val.sub_net,
+	    MAX_IP_ADDR_SIZE,
+	    UNUSED_FLAG,
+	    &err_subnet);
+	
+	utf16_to_utf8((char *)umsg->body.kvp_ip_val.gate_way, MAX_GATEWAY_SIZE,
+	    (uint16_t *)host_ip_msg->kvp_ip_val.gate_way,
+	    MAX_GATEWAY_SIZE,
+	    UNUSED_FLAG,
+	    &err_gway);
+
+	utf16_to_utf8((char *)umsg->body.kvp_ip_val.dns_addr, MAX_IP_ADDR_SIZE,
+	    (uint16_t *)host_ip_msg->kvp_ip_val.dns_addr,
+	    MAX_IP_ADDR_SIZE,
+	    UNUSED_FLAG,
+	    &err_dns);
+
+	return (err_ip | err_subnet | err_gway | err_dns | err_adap);
+}
+
+
+/*
+ * Prepare a user kvp msg based on host kvp msg (utf16 to utf8)
+ * Ensure utf16_utf8 takes care of the additional string terminating char!!
+ */
+static void
+hv_kvp_convert_hostmsg_to_usermsg(void)
+{
+	int utf_err = 0;
+	uint32_t value_type;
+	struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)
+		kvp_globals.host_kvp_msg;
+
+	struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
+	struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
+
+	memset(umsg, 0, sizeof(struct hv_kvp_msg));
+
+	umsg->kvp_hdr.operation = hmsg->kvp_hdr.operation;
+	umsg->kvp_hdr.pool = hmsg->kvp_hdr.pool;
+
+	switch (umsg->kvp_hdr.operation) {
+	case HV_KVP_OP_SET_IP_INFO:
+		hv_kvp_convert_utf16_ipinfo_to_utf8(host_ip_msg, umsg);
+		break;
+
+	case HV_KVP_OP_GET_IP_INFO:
+		utf16_to_utf8((char *)umsg->body.kvp_ip_val.adapter_id,
+		    MAX_ADAPTER_ID_SIZE,
+		    (uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
+		    MAX_ADAPTER_ID_SIZE, 1, &utf_err);
+
+		umsg->body.kvp_ip_val.addr_family =
+		    host_ip_msg->kvp_ip_val.addr_family;
+		break;
+
+	case HV_KVP_OP_SET:
+		value_type = hmsg->body.kvp_set.data.value_type;
+
+		switch (value_type) {
+		case HV_REG_SZ:
+			umsg->body.kvp_set.data.value_size =
+			    utf16_to_utf8(
+				(char *)umsg->body.kvp_set.data.msg_value.value,
+				HV_KVP_EXCHANGE_MAX_VALUE_SIZE - 1,
+				(uint16_t *)hmsg->body.kvp_set.data.msg_value.value,
+				hmsg->body.kvp_set.data.value_size,
+				1, &utf_err);
+			/* utf8 encoding */
+			umsg->body.kvp_set.data.value_size =
+			    umsg->body.kvp_set.data.value_size / 2;
+			break;
+
+		case HV_REG_U32:
+			umsg->body.kvp_set.data.value_size =
+			    sprintf(umsg->body.kvp_set.data.msg_value.value, "%d",
+				hmsg->body.kvp_set.data.msg_value.value_u32) + 1;
+			break;
+
+		case HV_REG_U64:
+			umsg->body.kvp_set.data.value_size =
+			    sprintf(umsg->body.kvp_set.data.msg_value.value, "%llu",
+				(unsigned long long)
+				hmsg->body.kvp_set.data.msg_value.value_u64) + 1;
+			break;
+		}
+
+		umsg->body.kvp_set.data.key_size =
+		    utf16_to_utf8(
+			umsg->body.kvp_set.data.key,
+			HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
+			(uint16_t *)hmsg->body.kvp_set.data.key,
+			hmsg->body.kvp_set.data.key_size,
+			1, &utf_err);
+
+		/* utf8 encoding */
+		umsg->body.kvp_set.data.key_size =
+		    umsg->body.kvp_set.data.key_size / 2;
+		break;
+
+	case HV_KVP_OP_GET:
+		umsg->body.kvp_get.data.key_size =
+		    utf16_to_utf8(umsg->body.kvp_get.data.key,
+			HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
+			(uint16_t *)hmsg->body.kvp_get.data.key,
+			hmsg->body.kvp_get.data.key_size,
+			1, &utf_err);
+		/* utf8 encoding */
+		umsg->body.kvp_get.data.key_size =
+		    umsg->body.kvp_get.data.key_size / 2;
+		break;
+
+	case HV_KVP_OP_DELETE:
+		umsg->body.kvp_delete.key_size =
+		    utf16_to_utf8(umsg->body.kvp_delete.key,
+			HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
+			(uint16_t *)hmsg->body.kvp_delete.key,
+			hmsg->body.kvp_delete.key_size,
+			1, &utf_err);
+		/* utf8 encoding */
+		umsg->body.kvp_delete.key_size =
+		    umsg->body.kvp_delete.key_size / 2;
+		break;
+
+	case HV_KVP_OP_ENUMERATE:
+		umsg->body.kvp_enum_data.index =
+		    hmsg->body.kvp_enum_data.index;
+		break;
+
+	default:
+		hv_kvp_log_info("%s: daemon_kvp_msg: Invalid operation : %d\n",
+		    __func__, umsg->kvp_hdr.operation);
+	}
+}
+
+
+/*
+ * Prepare a host kvp msg based on user kvp msg (utf8 to utf16)
+ */
+static int
+hv_kvp_convert_usermsg_to_hostmsg(void)
+{
+	int hkey_len = 0, hvalue_len = 0, utf_err = 0;
+	struct hv_kvp_exchg_msg_value *host_exchg_data;
+	char *key_name, *value;
+
+	struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
+	struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
+	struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)hmsg;
+
+	switch (hmsg->kvp_hdr.operation) {
+	case HV_KVP_OP_GET_IP_INFO:
+		return (hv_kvp_convert_utf8_ipinfo_to_utf16(umsg, host_ip_msg));
+
+	case HV_KVP_OP_SET_IP_INFO:
+	case HV_KVP_OP_SET:
+	case HV_KVP_OP_DELETE:
+		return (KVP_SUCCESS);
+
+	case HV_KVP_OP_ENUMERATE:
+		host_exchg_data = &hmsg->body.kvp_enum_data.data;
+		key_name = umsg->body.kvp_enum_data.data.key;
+		hkey_len = utf8_to_utf16((uint16_t *)host_exchg_data->key,
+				((HV_KVP_EXCHANGE_MAX_KEY_SIZE / 2) - 2),
+				key_name, strlen(key_name),
+				1, &utf_err);
+		/* utf16 encoding */
+		host_exchg_data->key_size = 2 * (hkey_len + 1);
+		value = umsg->body.kvp_enum_data.data.msg_value.value;
+		hvalue_len = utf8_to_utf16(
+				(uint16_t *)host_exchg_data->msg_value.value,
+				((HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2) - 2),
+				value, strlen(value),
+				1, &utf_err);
+		host_exchg_data->value_size = 2 * (hvalue_len + 1);
+		host_exchg_data->value_type = HV_REG_SZ;
+
+		if ((hkey_len < 0) || (hvalue_len < 0))
+			return (HV_KVP_E_FAIL);
+			
+		return (KVP_SUCCESS);
+
+	case HV_KVP_OP_GET:
+		host_exchg_data = &hmsg->body.kvp_get.data;
+		value = umsg->body.kvp_get.data.msg_value.value;
+		hvalue_len = utf8_to_utf16(
+				(uint16_t *)host_exchg_data->msg_value.value,
+				((HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2) - 2),
+				value, strlen(value),
+				1, &utf_err);
+		/* Convert value size to uft16 */
+		host_exchg_data->value_size = 2 * (hvalue_len + 1);
+		/* Use values by string */
+		host_exchg_data->value_type = HV_REG_SZ;
+
+		if ((hkey_len < 0) || (hvalue_len < 0)) 
+			return (HV_KVP_E_FAIL);
+			
+		return (KVP_SUCCESS);
+
+	default:
+		return (HV_KVP_E_FAIL);
+	}
+}
+
+
+/*
+ * Send the response back to the host.
+ */
+static void
+hv_kvp_respond_host(int error)
+{
+	struct hv_vmbus_icmsg_hdr *hv_icmsg_hdrp;
+
+	hv_icmsg_hdrp = (struct hv_vmbus_icmsg_hdr *)
+	    &kvp_globals.rcv_buf[sizeof(struct hv_vmbus_pipe_hdr)];
+
+	if (error)
+		error = HV_KVP_E_FAIL;
+
+	hv_icmsg_hdrp->status = error;
+	hv_icmsg_hdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION | HV_ICMSGHDRFLAG_RESPONSE;
+	
+	error = hv_vmbus_channel_send_packet(kvp_globals.channelp,
+			kvp_globals.rcv_buf,
+			kvp_globals.host_msg_len, kvp_globals.host_msg_id,
+			HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
+
+	if (error)
+		hv_kvp_log_info("%s: hv_kvp_respond_host: sendpacket error:%d\n",
+			__func__, error);
+}
+
+
+/*
+ * This is the main kvp kernel process that interacts with both user daemon
+ * and the host
+ */
+static void
+hv_kvp_send_msg_to_daemon(void)
+{
+	/* Prepare kvp_msg to be sent to user */
+	hv_kvp_convert_hostmsg_to_usermsg();
+
+	/* Send the msg to user via function deamon_read - setting sema */
+	sema_post(&kvp_globals.dev_sema);
+}
+
+
+/*
+ * Function to read the kvp request buffer from host
+ * and interact with daemon
+ */
+static void
+hv_kvp_process_request(void *context)
+{
+	uint8_t *kvp_buf;
+	hv_vmbus_channel *channel = context;
+	uint32_t recvlen = 0;
+	uint64_t requestid;
+	struct hv_vmbus_icmsg_hdr *icmsghdrp;
+	int ret = 0;
+	uint64_t pending_cnt = 1;
+	
+	hv_kvp_log_info("%s: entering hv_kvp_process_request\n", __func__);
+	kvp_buf = receive_buffer[HV_KVP];
+	ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
+		&recvlen, &requestid);
+
+	/*
+	 * We start counting only after the daemon registers
+	 * and therefore there could be requests pending in 
+	 * the VMBus that are not reflected in pending_cnt.
+	 * Therefore we continue reading as long as either of
+	 * the below conditions is true.
+	 */
+
+	while ((pending_cnt>0) || ((ret == 0) && (recvlen > 0))) {
+
+		if ((ret == 0) && (recvlen>0)) {
+			
+			icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
+					&kvp_buf[sizeof(struct hv_vmbus_pipe_hdr)];
+	
+			hv_kvp_transaction_init(recvlen, channel, requestid, kvp_buf);
+			if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
+				hv_kvp_negotiate_version(icmsghdrp, NULL, kvp_buf);
+				hv_kvp_respond_host(ret);
+					
+				/*
+				 * It is ok to not acquire the mutex before setting 
+				 * req_in_progress here because negotiation is the
+				 * first thing that happens and hence there is no
+				 * chance of a race condition.
+				 */
+				
+				kvp_globals.req_in_progress = false;
+				hv_kvp_log_info("%s :version negotiated\n", __func__);
+
+			} else {
+				if (!kvp_globals.daemon_busy) {
+
+					hv_kvp_log_info("%s: issuing qury to daemon\n", __func__);
+					mtx_lock(&kvp_globals.pending_mutex);
+					kvp_globals.req_timed_out = false;
+					kvp_globals.daemon_busy = true;
+					mtx_unlock(&kvp_globals.pending_mutex);
+
+					hv_kvp_send_msg_to_daemon();
+					hv_kvp_log_info("%s: waiting for daemon\n", __func__);
+				}
+				
+				/* Wait 5 seconds for daemon to respond back */
+				tsleep(&kvp_globals, 0, "kvpworkitem", 5 * hz);
+				hv_kvp_log_info("%s: came out of wait\n", __func__);
+			}
+		}
+
+		mtx_lock(&kvp_globals.pending_mutex);
+		
+		/* Notice that once req_timed_out is set to true
+		 * it will remain true until the next request is
+		 * sent to the daemon. The response from daemon
+		 * is forwarded to host only when this flag is 
+		 * false. 
+		 */
+		kvp_globals.req_timed_out = true;
+
+		/*
+		 * Cancel request if so need be.
+		 */
+		if (hv_kvp_req_in_progress()) {
+			hv_kvp_log_info("%s: request was still active after wait so failing\n", __func__);
+			hv_kvp_respond_host(HV_KVP_E_FAIL);
+			kvp_globals.req_in_progress = false;	
+		}
+	
+		/*
+		* Decrement pending request count and
+		*/
+		if (kvp_globals.pending_reqs>0) {
+			kvp_globals.pending_reqs = kvp_globals.pending_reqs - 1;
+		}
+		pending_cnt = kvp_globals.pending_reqs;
+		
+		mtx_unlock(&kvp_globals.pending_mutex);
+
+		/*
+		 * Try reading next buffer
+		 */
+		recvlen = 0;
+		ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
+			&recvlen, &requestid);
+		hv_kvp_log_info("%s: read: context %p, pending_cnt %ju ret =%d, recvlen=%d\n",
+			__func__, context, pending_cnt, ret, recvlen);
+	} 
+}
+
+
+/*
+ * Callback routine that gets called whenever there is a message from host
+ */
+void
+hv_kvp_callback(void *context)
+{
+	uint64_t pending_cnt = 0;
+
+	if (kvp_globals.register_done == false) {
+		
+		kvp_globals.channelp = context;
+	} else {
+		
+		mtx_lock(&kvp_globals.pending_mutex);
+		kvp_globals.pending_reqs = kvp_globals.pending_reqs + 1;
+		pending_cnt = kvp_globals.pending_reqs;
+		mtx_unlock(&kvp_globals.pending_mutex);
+		if (pending_cnt == 1) {
+			hv_kvp_log_info("%s: Queuing work item\n", __func__);
+			hv_queue_work_item(
+					service_table[HV_KVP].work_queue,
+					hv_kvp_process_request,
+					context
+					);
+		}
+	}	
+}
+
+
+/*
+ * This function is called by the hv_kvp_init -
+ * creates character device hv_kvp_dev 
+ * allocates memory to hv_kvp_dev_buf
+ *
+ */
+static int
+hv_kvp_dev_init(void)
+{
+	int error = 0;
+
+	/* initialize semaphore */
+	sema_init(&kvp_globals.dev_sema, 0, "hv_kvp device semaphore");
+	/* create character device */
+	error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK,
+			&hv_kvp_dev,
+			&hv_kvp_cdevsw,
+			0,
+			UID_ROOT,
+			GID_WHEEL,
+			0640,
+			"hv_kvp_dev");
+					   
+	if (error != 0)
+		return (error);
+
+	/*
+	 * Malloc with M_WAITOK flag will never fail.
+	 */
+	hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf), M_HV_KVP_DEV_BUF, M_WAITOK |
+				M_ZERO);
+
+	return (0);
+}
+
+
+/*
+ * This function is called by the hv_kvp_deinit -
+ * destroy character device
+ */
+static void
+hv_kvp_dev_destroy(void)
+{
+
+        if (daemon_task != NULL) {
+		PROC_LOCK(daemon_task);
+        	kern_psignal(daemon_task, SIGKILL);
+		PROC_UNLOCK(daemon_task);
+	}
+	
+	destroy_dev(hv_kvp_dev);
+	free(hv_kvp_dev_buf, M_HV_KVP_DEV_BUF);
+	return;
+}
+
+
+static int
+hv_kvp_dev_open(struct cdev *dev, int oflags, int devtype,
+				struct thread *td)
+{
+	
+	hv_kvp_log_info("%s: Opened device \"hv_kvp_device\" successfully.\n", __func__);
+	if (kvp_globals.dev_accessed)
+		return (-EBUSY);
+	
+	daemon_task = curproc;
+	kvp_globals.dev_accessed = true;
+	kvp_globals.daemon_busy = false;
+	return (0);
+}
+
+
+static int
+hv_kvp_dev_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused,
+				 struct thread *td __unused)
+{
+
+	hv_kvp_log_info("%s: Closing device \"hv_kvp_device\".\n", __func__);
+	kvp_globals.dev_accessed = false;
+	kvp_globals.register_done = false;
+	return (0);
+}
+
+
+/*
+ * hv_kvp_daemon read invokes this function
+ * acts as a send to daemon
+ */
+static int
+hv_kvp_dev_daemon_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
+{
+	size_t amt;
+	int error = 0;
+
+	/* Check hv_kvp daemon registration status*/
+	if (!kvp_globals.register_done)
+		return (KVP_ERROR);
+
+	sema_wait(&kvp_globals.dev_sema);
+
+	memcpy(hv_kvp_dev_buf, &kvp_globals.daemon_kvp_msg, sizeof(struct hv_kvp_msg));
+
+	amt = MIN(uio->uio_resid, uio->uio_offset >= BUFFERSIZE + 1 ? 0 :
+		BUFFERSIZE + 1 - uio->uio_offset);
+
+	if ((error = uiomove(hv_kvp_dev_buf, amt, uio)) != 0)
+		hv_kvp_log_info("%s: hv_kvp uiomove read failed!\n", __func__);
+
+	return (error);
+}
+
+
+/*
+ * hv_kvp_daemon write invokes this function
+ * acts as a recieve from daemon
+ */
+static int
+hv_kvp_dev_daemon_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
+{
+	size_t amt;
+	int error = 0;
+
+	uio->uio_offset = 0;
+
+	amt = MIN(uio->uio_resid, BUFFERSIZE);
+	error = uiomove(hv_kvp_dev_buf, amt, uio);
+
+	if (error != 0)
+		return (error);
+
+	memcpy(&kvp_globals.daemon_kvp_msg, hv_kvp_dev_buf, sizeof(struct hv_kvp_msg));
+
+	if (kvp_globals.register_done == false) {
+		if (kvp_globals.daemon_kvp_msg.kvp_hdr.operation == HV_KVP_OP_REGISTER) {
+
+			kvp_globals.register_done = true;
+			if (kvp_globals.channelp) {
+			
+				hv_kvp_callback(kvp_globals.channelp);
+			}
+		}
+		else {
+			hv_kvp_log_info("%s, KVP Registration Failed\n", __func__);
+			return (KVP_ERROR);
+		}
+	} else {
+
+		mtx_lock(&kvp_globals.pending_mutex);
+
+		if(!kvp_globals.req_timed_out) {
+
+			hv_kvp_convert_usermsg_to_hostmsg();
+			hv_kvp_respond_host(KVP_SUCCESS);
+			wakeup(&kvp_globals);
+			kvp_globals.req_in_progress = false;
+		}
+
+		kvp_globals.daemon_busy = false;
+		mtx_unlock(&kvp_globals.pending_mutex);
+	}
+
+	return (error);
+}
+
+
+/*
+ * hv_kvp_daemon poll invokes this function to check if data is available
+ * for daemon to read.
+ */
+static int
+hv_kvp_dev_daemon_poll(struct cdev *dev __unused, int events, struct thread *td  __unused)
+{
+	int revents = 0;
+
+	mtx_lock(&kvp_globals.pending_mutex);
+	/*
+	 * We check global flag daemon_busy for the data availiability for
+	 * userland to read. Deamon_busy is set to true before driver has data
+	 * for daemon to read. It is set to false after daemon sends
+	 * then response back to driver.
+	 */
+	if (kvp_globals.daemon_busy == true)
+		revents = POLLIN;
+	mtx_unlock(&kvp_globals.pending_mutex);
+
+	return (revents);
+}
+
+
+/* 
+ * hv_kvp initialization function 
+ * called from hv_util service.
+ *
+ */
+int
+hv_kvp_init(hv_vmbus_service *srv)
+{
+	int error = 0;
+	hv_work_queue *work_queue = NULL;
+	
+	memset(&kvp_globals, 0, sizeof(kvp_globals));
+
+	work_queue = hv_work_queue_create("KVP Service");
+	if (work_queue == NULL) {
+		hv_kvp_log_info("%s: Work queue alloc failed\n", __func__);
+		error = ENOMEM;
+		hv_kvp_log_error("%s: ENOMEM\n", __func__);
+		goto Finish;
+	}
+	srv->work_queue = work_queue;
+
+	error = hv_kvp_dev_init();
+	mtx_init(&kvp_globals.pending_mutex, "hv-kvp pending mutex",
+		       	NULL, MTX_DEF);	
+	kvp_globals.pending_reqs = 0;
+
+
+Finish:
+	return (error);
+}
+
+
+void
+hv_kvp_deinit(void)
+{
+	hv_kvp_dev_destroy();
+	mtx_destroy(&kvp_globals.pending_mutex);
+
+	return;
+}
diff --git a/sys/dev/hyperv/utilities/hv_kvp.h b/sys/dev/hyperv/utilities/hv_kvp.h
index f7dccf77df29..b67373fa7aa5 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.h
+++ b/sys/dev/hyperv/utilities/hv_kvp.h
@@ -1,7 +1,5 @@
 /*-
- * Copyright (c) 2009-2012 Microsoft Corp.
- * Copyright (c) 2012 NetApp Inc.
- * Copyright (c) 2012 Citrix Inc.
+ * Copyright (c) 2014 Microsoft Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,13 +22,15 @@
  * 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.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _KVP_H
 #define _KVP_H
 
 /*
- * An implementation of HyperV key value pair (KVP) functionality for FreeBSD 
+ * An implementation of HyperV key value pair (KVP) functionality for FreeBSD
  *
  */
 
@@ -53,15 +53,15 @@
 /*
  * bytes, including any null terminators
  */
-#define HV_KVP_EXCHANGE_MAX_VALUE_SIZE          (2048)
+#define HV_KVP_EXCHANGE_MAX_VALUE_SIZE    (2048)
 
 
 /*
  * Maximum key size - the registry limit for the length of an entry name
  * is 256 characters, including the null terminator
  */
+#define HV_KVP_EXCHANGE_MAX_KEY_SIZE    (512)
 
-#define HV_KVP_EXCHANGE_MAX_KEY_SIZE            (512)
 
 /*
  * In FreeBSD, we implement the KVP functionality in two components:
@@ -111,30 +111,20 @@
  * (not supported), a NULL key string is returned.
  */
 
-
+ 
 /*
  * Registry value types.
  */
+#define HV_REG_SZ     1
+#define HV_REG_U32    4
+#define HV_REG_U64    8
 
-#define HV_REG_SZ  1
-#define HV_REG_U32 4
-#define HV_REG_U64 8
-
-
-/*
- * Daemon code not supporting IP injection (legacy daemon).
- */
-
-#define HV_KVP_OP_REGISTER	4
 
 /*
  * Daemon code supporting IP injection.
- * The KVP opcode field is used to communicate the
- * registration information; so define a namespace that
- * will be distinct from the host defined KVP opcode.
  */
+#define HV_KVP_OP_REGISTER    4
 
-#define KVP_OP_REGISTER1 100
 
 enum hv_kvp_exchg_op {
 	HV_KVP_OP_GET = 0,
@@ -155,41 +145,41 @@ enum hv_kvp_exchg_pool {
 	HV_KVP_POOL_COUNT /* Number of pools, must be last. */
 };
 
+
 /*
  * Some Hyper-V status codes.
  */
-#define HV_KVP_S_OK				0x00000000
-#define HV_KVP_E_FAIL			0x80004005
-#define HV_KVP_S_CONT			0x80070103
-#define HV_ERROR_NOT_SUPPORTED		0x80070032
-#define HV_ERROR_MACHINE_LOCKED		0x800704F7
-#define HV_ERROR_DEVICE_NOT_CONNECTED	0x8007048F
-#define HV_INVALIDARG			0x80070057
-#define HV_KVP_GUID_NOTFOUND		0x80041002
+#define HV_KVP_S_OK                      0x00000000
+#define HV_KVP_E_FAIL                    0x80004005
+#define HV_KVP_S_CONT                    0x80070103
+#define HV_ERROR_NOT_SUPPORTED           0x80070032
+#define HV_ERROR_MACHINE_LOCKED          0x800704F7
+#define HV_ERROR_DEVICE_NOT_CONNECTED    0x8007048F
+#define HV_INVALIDARG                    0x80070057
+#define HV_KVP_GUID_NOTFOUND             0x80041002
 
-#define ADDR_FAMILY_NONE	0x00
-#define ADDR_FAMILY_IPV4	0x01
-#define ADDR_FAMILY_IPV6	0x02
+#define ADDR_FAMILY_NONE                 0x00
+#define ADDR_FAMILY_IPV4                 0x01
+#define ADDR_FAMILY_IPV6                 0x02
 
-#define MAX_ADAPTER_ID_SIZE	128
-#define MAX_IP_ADDR_SIZE	1024
-#define MAX_GATEWAY_SIZE	512
+#define MAX_ADAPTER_ID_SIZE              128
+#define MAX_IP_ADDR_SIZE                 1024
+#define MAX_GATEWAY_SIZE                 512
 
 
 struct hv_kvp_ipaddr_value {
-	uint16_t	adapter_id[MAX_ADAPTER_ID_SIZE];
-	uint8_t	addr_family;
-	uint8_t	dhcp_enabled;
-	uint16_t	ip_addr[MAX_IP_ADDR_SIZE];
-	uint16_t	sub_net[MAX_IP_ADDR_SIZE];
-	uint16_t	gate_way[MAX_GATEWAY_SIZE];
-	uint16_t	dns_addr[MAX_IP_ADDR_SIZE];
-} __attribute__((packed));
-
+	uint16_t adapter_id[MAX_ADAPTER_ID_SIZE];
+	uint8_t  addr_family;
+	uint8_t  dhcp_enabled;
+	uint16_t ip_addr[MAX_IP_ADDR_SIZE];
+	uint16_t sub_net[MAX_IP_ADDR_SIZE];
+	uint16_t gate_way[MAX_GATEWAY_SIZE];
+	uint16_t dns_addr[MAX_IP_ADDR_SIZE];
+}__attribute__((packed));
 
 struct hv_kvp_hdr {
-	uint8_t operation;
-	uint8_t pool;
+	uint8_t  operation;
+	uint8_t  pool;
 	uint16_t pad;
 } __attribute__((packed));
 
@@ -197,9 +187,9 @@ struct hv_kvp_exchg_msg_value {
 	uint32_t value_type;
 	uint32_t key_size;
 	uint32_t value_size;
-	uint8_t key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
+	uint8_t  key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
 	union {
-		uint8_t value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
+		uint8_t  value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
 		uint32_t value_u32;
 		uint64_t value_u64;
 	} msg_value;
@@ -229,16 +219,16 @@ struct hv_kvp_register {
 
 struct hv_kvp_msg {
 	union {
-		struct hv_kvp_hdr	kvp_hdr;
-		int error;
+		struct hv_kvp_hdr kvp_hdr;
+		uint32_t error;
 	} hdr;
 	union {
-		struct hv_kvp_msg_get	kvp_get;
-		struct hv_kvp_msg_set	kvp_set;
+		struct hv_kvp_msg_get		kvp_get;
+		struct hv_kvp_msg_set		kvp_set;
 		struct hv_kvp_msg_delete	kvp_delete;
 		struct hv_kvp_msg_enumerate	kvp_enum_data;
-		struct hv_kvp_ipaddr_value  kvp_ip_val;
-		struct hv_kvp_register	kvp_register;
+		struct hv_kvp_ipaddr_value	kvp_ip_val;
+		struct hv_kvp_register		kvp_register;
 	} body;
 } __attribute__((packed));
 
@@ -248,38 +238,17 @@ struct hv_kvp_ip_msg {
 	struct hv_kvp_ipaddr_value      kvp_ip_val;
 } __attribute__((packed));
 
-#define BSD_SOC_PATH "/etc/hyperv/socket" 
 
-#define HV_SHUT_DOWN		0
-#define HV_TIME_SYNCH	 	1
-#define HV_HEART_BEAT	 	2
-#define HV_KVP		 	3
-#define HV_MAX_UTIL_SERVICES 	4
+#define HV_SHUT_DOWN                0
+#define HV_TIME_SYNCH               1
+#define HV_HEART_BEAT               2
+#define HV_KVP                      3
+#define HV_MAX_UTIL_SERVICES        4
 
-#define HV_WLTIMEDELTA			116444736000000000L /* in 100ns unit */
-#define HV_ICTIMESYNCFLAG_PROBE		0
-#define HV_ICTIMESYNCFLAG_SYNC		1
-#define HV_ICTIMESYNCFLAG_SAMPLE	2
-#define HV_NANO_SEC_PER_SEC 		1000000000
-
-typedef struct hv_vmbus_service {
-	hv_guid		guid;		/* Hyper-V GUID */
-       char*			name;		/* name of service */
-       boolean_t		enabled;	/* service enabled */
-       hv_work_queue*	work_queue;	/* background work queue */
-	
-	//
-	// function to initialize service
-	//
-       int (*init)(struct hv_vmbus_service *);
-	
-	//
-	// function to process Hyper-V messages 
-	//
-       void (*callback)(void *);
-} hv_vmbus_service;
-
-extern uint8_t* receive_buffer[];
-extern hv_vmbus_service service_table[];
+#define HV_WLTIMEDELTA              116444736000000000L     /* in 100ns unit */
+#define HV_ICTIMESYNCFLAG_PROBE     0
+#define HV_ICTIMESYNCFLAG_SYNC      1
+#define HV_ICTIMESYNCFLAG_SAMPLE    2
+#define HV_NANO_SEC_PER_SEC         1000000000
 
 #endif /* _KVP_H */
diff --git a/sys/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c
index e86cbd78498a..91bbc5345ad5 100644
--- a/sys/dev/hyperv/utilities/hv_util.c
+++ b/sys/dev/hyperv/utilities/hv_util.c
@@ -1,7 +1,5 @@
 /*-
- * Copyright (c) 2009-2012 Microsoft Corp.
- * Copyright (c) 2012 NetApp Inc.
- * Copyright (c) 2012 Citrix Inc.
+ * Copyright (c) 2014 Microsoft Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,9 +22,11 @@
  * 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.
+ *
+ * $FreeBSD$
  */
 
-/**
+/*
  * A common driver for all hyper-V util services.
  */
 
@@ -53,7 +53,7 @@ static void hv_timesync_cb(void *context);
 
 static int hv_timesync_init(hv_vmbus_service *serv);
 
-/**
+/*
  * Note: GUID codes below are predefined by the host hypervisor
  * (Hyper-V and Azure)interface and required for correct operation.
  */
@@ -80,7 +80,16 @@ hv_vmbus_service service_table[] = {
 			0xab, 0x55, 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d},
 	  .name = "Hyper-V Heartbeat Service\n",
 	  .enabled = TRUE,
-          .callback = hv_heartbeat_cb,
+  	  .callback = hv_heartbeat_cb,
+	},
+
+        /* KVP (Key Value Pair) Service */
+        { .guid.data = {0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d,
+			0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3,  0xe6},
+	  .name = "Hyper-V KVP Service\n",
+	  .enabled = TRUE,
+	  .init = hv_kvp_init,
+	  .callback = hv_kvp_callback,
 	},
 };
 
@@ -90,6 +99,8 @@ hv_vmbus_service service_table[] = {
  */
 uint8_t *receive_buffer[HV_MAX_UTIL_SERVICES];
 
+static boolean_t destroyed_kvp = FALSE;
+
 struct hv_ictimesync_data {
 	uint64_t    parenttime;
 	uint64_t    childtime;
@@ -143,7 +154,7 @@ hv_negotiate_version(
 static void
 hv_set_host_time(void *context)
 {
- 	time_sync_data *time_msg = context;	
+ 	time_sync_data* time_msg = (time_sync_data*) context;	
 	uint64_t hosttime = time_msg->data;
 	struct timespec guest_ts, host_ts;
 	uint64_t host_tns;
@@ -253,12 +264,12 @@ hv_timesync_cb(void *context)
 static void
 hv_shutdown_cb(void *context)
 {
-	uint8_t*			buf;
+	uint8_t*		buf;
 	hv_vmbus_channel*		channel = context;
-	uint8_t				execute_shutdown = 0;
+	uint8_t			execute_shutdown = 0;
 	hv_vmbus_icmsg_hdr*		icmsghdrp;
-	uint32_t			recv_len;
-	uint64_t			request_id;
+	uint32_t		recv_len;
+	uint64_t		request_id;
 	int				ret;
 	hv_vmbus_shutdown_msg_data*	shutdown_msg;
 
@@ -421,6 +432,11 @@ hv_util_detach(device_t dev)
 	struct hv_vmbus_service*	service;
 	size_t				receive_buffer_offset;
 
+	if (!destroyed_kvp) {
+		hv_kvp_deinit();
+		destroyed_kvp = TRUE;
+	}
+
 	hv_dev = vmbus_get_devctx(dev);
 
 	hv_vmbus_channel_close(hv_dev->channel);
@@ -432,21 +448,22 @@ hv_util_detach(device_t dev)
 
 	free(receive_buffer[receive_buffer_offset], M_DEVBUF);
 	receive_buffer[receive_buffer_offset] = NULL;
-
 	return (0);
 }
 
-static void hv_util_init(void)
+static void
+hv_util_init(void)
 {
 }
 
-static int hv_util_modevent(module_t mod, int event, void *arg)
+static int
+hv_util_modevent(module_t mod, int event, void *arg)
 {
 	switch (event) {
         case MOD_LOAD:
                 break;
         case MOD_UNLOAD:
-                break;
+		break;
 	default:
 		break;
         }
diff --git a/sys/dev/hyperv/utilities/unicode.h b/sys/dev/hyperv/utilities/unicode.h
new file mode 100644
index 000000000000..696777cbbf26
--- /dev/null
+++ b/sys/dev/hyperv/utilities/unicode.h
@@ -0,0 +1,201 @@
+/* $NetBSD: unicode.h,v 1.1.1.1 2007/03/06 00:10:39 dillo Exp $ */
+
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron.
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+
+#define UNICODE_DECOMPOSE		0x01
+#define UNICODE_PRECOMPOSE		0x02
+#define UNICODE_UTF8_LATIN1_FALLBACK	0x03
+
+size_t utf8_to_utf16(uint16_t *, size_t, const char *, size_t, int, int *);
+size_t utf16_to_utf8(char *, size_t, const uint16_t *, size_t, int, int *);
+
+size_t
+utf8_to_utf16(uint16_t *dst, size_t dst_len,
+	      const char *src, size_t src_len,
+	      int flags, int *errp)
+{
+    const unsigned char *s;
+    size_t spos, dpos;
+    int error;
+    uint16_t c;
+
+#define IS_CONT(c)	(((c)&0xc0) == 0x80)
+
+    error = 0;
+    s = (const unsigned char *)src;
+    spos = dpos = 0;
+    while (spos<src_len) {
+	if (s[spos] < 0x80)
+	    c = s[spos++];
+	else if ((flags & UNICODE_UTF8_LATIN1_FALLBACK)
+		 && (spos >= src_len || !IS_CONT(s[spos+1]))
+		 && s[spos]>=0xa0) {
+	    /* not valid UTF-8, assume ISO 8859-1 */
+	    c = s[spos++];
+	}
+	else if (s[spos] < 0xc0 || s[spos] >= 0xf5) {
+	    /* continuation byte without lead byte
+	       or lead byte for codepoint above 0x10ffff */
+	    error++;
+	    spos++;
+	    continue;
+	}
+	else if (s[spos] < 0xe0) {
+	    if (spos >= src_len || !IS_CONT(s[spos+1])) {
+		spos++;
+		error++;
+		continue;
+	    }
+	    c = ((s[spos] & 0x3f) << 6) | (s[spos+1] & 0x3f);
+	    spos += 2;
+	    if (c < 0x80) {
+		/* overlong encoding */
+		error++;
+		continue;
+	    }
+	}
+	else if (s[spos] < 0xf0) {
+	    if (spos >= src_len-2
+		|| !IS_CONT(s[spos+1]) || !IS_CONT(s[spos+2])) {
+		spos++;
+		error++;
+		continue;
+	    }
+	    c = ((s[spos] & 0x0f) << 12) | ((s[spos+1] & 0x3f) << 6)
+		| (s[spos+2] & 0x3f);
+	    spos += 3;
+	    if (c < 0x800 || (c & 0xdf00) == 0xd800 ) {
+		/* overlong encoding or encoded surrogate */
+		error++;
+		continue;
+	    }
+	}
+	else {
+	    uint32_t cc;
+	    /* UTF-16 surrogate pair */
+
+	    if (spos >= src_len-3 || !IS_CONT(s[spos+1])
+		|| !IS_CONT(s[spos+2]) || !IS_CONT(s[spos+3])) {
+		spos++;
+		error++;
+		
+		continue;
+	    }
+	    cc = ((s[spos] & 0x03) << 18) | ((s[spos+1] & 0x3f) << 12)
+		 | ((s[spos+2] & 0x3f) << 6) | (s[spos+3] & 0x3f);
+	    spos += 4;
+	    if (cc < 0x10000) {
+		/* overlong encoding */
+		error++;
+		continue;
+	    }
+	    if (dst && dpos < dst_len)
+		dst[dpos] = (0xd800 | ((cc-0x10000)>>10));
+	    dpos++;
+	    c = 0xdc00 | ((cc-0x10000) & 0x3ffff);
+	}
+
+	if (dst && dpos < dst_len)
+	    dst[dpos] = c;
+	dpos++;
+    }
+    
+    if (errp)
+	*errp = error;
+
+    return dpos;
+
+#undef IS_CONT
+}
+
+
+size_t
+utf16_to_utf8(char *dst, size_t dst_len,
+	      const uint16_t *src, size_t src_len,
+	      int flags, int *errp)
+{
+    uint16_t spos, dpos;
+    int error;
+
+#define CHECK_LENGTH(l)	(dpos > dst_len-(l) ? dst=NULL : NULL)
+#define ADD_BYTE(b)	(dst ? dst[dpos] = (b) : 0, dpos++)
+
+    error = 0;
+    dpos = 0;
+    for (spos=0; spos<src_len; spos++) {
+	if (src[spos] < 0x80) {
+	    CHECK_LENGTH(1);
+	    ADD_BYTE(src[spos]);
+	}
+	else if (src[spos] < 0x800) {
+	    CHECK_LENGTH(2);
+	    ADD_BYTE(0xc0 | (src[spos]>>6));
+	    ADD_BYTE(0x80 | (src[spos] & 0x3f));
+	}
+	else if ((src[spos] & 0xdc00) == 0xd800) {
+	    uint32_t c;
+	    /* first surrogate */
+	    if (spos == src_len - 1 || (src[spos] & 0xdc00) != 0xdc00) {
+		/* no second surrogate present */
+		error++;
+		continue;
+	    }
+	    spos++;
+	    CHECK_LENGTH(4);
+	    c = (((src[spos]&0x3ff) << 10) | (src[spos+1]&0x3ff)) + 0x10000;
+	    ADD_BYTE(0xf0 | (c>>18));
+	    ADD_BYTE(0x80 | ((c>>12) & 0x3f));
+	    ADD_BYTE(0x80 | ((c>>6) & 0x3f));
+	    ADD_BYTE(0x80 | (c & 0x3f));
+	}
+	else if ((src[spos] & 0xdc00) == 0xdc00) {
+	    /* second surrogate without preceding first surrogate */
+	    error++;
+	}
+	else {
+	    CHECK_LENGTH(3);
+	    ADD_BYTE(0xe0 | src[spos]>>12);
+	    ADD_BYTE(0x80 | ((src[spos]>>6) & 0x3f));
+	    ADD_BYTE(0x80 | (src[spos] & 0x3f));
+	}
+    }
+
+    if (errp)
+	*errp = error;
+
+    return dpos;
+
+#undef ADD_BYTE
+#undef CHECK_LENGTH
+}
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 82c5dfcc8106..72e2559cdb0c 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -427,13 +427,13 @@ ierint(struct ie_softc *sc)
 		status = sc->rframes[i]->ie_fd_status;
 
 		if ((status & IE_FD_COMPLETE) && (status & IE_FD_OK)) {
-			sc->ifp->if_ipackets++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 			if (!--timesthru) {
-				sc->ifp->if_ierrors +=
+				if_inc_counter(sc->ifp, IFCOUNTER_IERRORS,
 				    sc->scb->ie_err_crc +
 				    sc->scb->ie_err_align +
 				    sc->scb->ie_err_resource +
-				    sc->scb->ie_err_overrun;
+				    sc->scb->ie_err_overrun);
 				sc->scb->ie_err_crc = 0;
 				sc->scb->ie_err_align = 0;
 				sc->scb->ie_err_resource = 0;
@@ -477,24 +477,24 @@ ietint(struct ie_softc *sc)
 
 		if (status & IE_XS_LATECOLL) {
 			if_printf(ifp, "late collision\n");
-			ifp->if_collisions++;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else if (status & IE_XS_NOCARRIER) {
 			if_printf(ifp, "no carrier\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else if (status & IE_XS_LOSTCTS) {
 			if_printf(ifp, "lost CTS\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else if (status & IE_XS_UNDERRUN) {
 			if_printf(ifp, "DMA underrun\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else if (status & IE_XS_EXCMAX) {
 			if_printf(ifp, "too many collisions\n");
-			ifp->if_collisions += 16;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 16);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else {
-			ifp->if_opackets++;
-			ifp->if_collisions += status & IE_XS_MAXCOLL;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, status & IE_XS_MAXCOLL);
 		}
 	}
 	sc->xmit_count = 0;
@@ -539,7 +539,7 @@ iernr(struct ie_softc *sc)
 #endif
 	ie_ack(sc, IE_ST_WHENCE);
 
-	sc->ifp->if_ierrors++;
+	if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	return (0);
 }
 
@@ -688,16 +688,12 @@ ieget(struct ie_softc *sc, struct mbuf **mp)
 	 */
 	if (!check_eh(sc, &eh)) {
 		ie_drop_packet_buffer(sc);
-		sc->ifp->if_ierrors--;	/* just this case, it's not an
-						 * error
-						 */
 		return (-1);
 	}
 
 	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m) {
 		ie_drop_packet_buffer(sc);
-		/* XXXX if_ierrors++; */
 		return (-1);
 	}
 
@@ -859,7 +855,7 @@ ie_readframe(struct ie_softc *sc, int	num/* frame number to read */)
 
 	if (rfd.ie_fd_status & IE_FD_OK) {
 		if (ieget(sc, &m)) {
-			sc->ifp->if_ierrors++;	/* this counts as an
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);	/* this counts as an
 							 * error */
 			return;
 		}
@@ -953,6 +949,8 @@ iestart_locked(struct ifnet *ifp)
 		if (!m)
 			break;
 
+		BPF_MTAP(ifp, m); 
+
 		buffer = sc->xmit_cbuffs[sc->xmit_count];
 		len = 0;
 
@@ -965,13 +963,6 @@ iestart_locked(struct ifnet *ifp)
 		m_freem(m0);
 		len = max(len, ETHER_MIN_LEN);
 
-		/*
-		 * See if bpf is listening on this interface, let it see the
-		 * packet before we commit it to the wire.
-		 */
-		BPF_TAP(sc->ifp,
-			(void *)sc->xmit_cbuffs[sc->xmit_count], len);
-
 		sc->xmit_buffs[sc->xmit_count]->ie_xmit_flags =
 		    IE_XMIT_LAST|len;
 		sc->xmit_buffs[sc->xmit_count]->ie_xmit_next = 0xffff;
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index f9ed3d08fe5b..8f235274409a 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -1431,7 +1431,7 @@ ndis_rxeof(adapter, packets, pktcnt)
 				p->np_refcnt++;
 				m_freem(m0);
 				if (m == NULL)
-					ifp->if_ierrors++;
+					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				else
 					m0 = m;
 			} else
@@ -1444,7 +1444,7 @@ ndis_rxeof(adapter, packets, pktcnt)
 				p->np_oob.npo_status = NDIS_STATUS_PENDING;
 			m_freem(m0);
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				continue;
 			}
 			m0 = m;
@@ -1554,9 +1554,9 @@ ndis_txeof(adapter, packet, status)
 	sc->ndis_txpending++;
 
 	if (status == NDIS_STATUS_SUCCESS)
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	else
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	sc->ndis_tx_timer = 0;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -1659,7 +1659,7 @@ ndis_tick(xsc)
 	}
 
 	if (sc->ndis_tx_timer && --sc->ndis_tx_timer == 0) {
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		device_printf(sc->ndis_dev, "watchdog timeout\n");
 
 		IoQueueWorkItem(sc->ndis_resetitem,
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 644a12ced820..7a4e2b12e3da 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -302,8 +302,8 @@ icintr(device_t dev, int event, char *ptr)
 		if (len <= ICHDRLEN)
 			goto err;
 		len -= ICHDRLEN;
-		sc->ic_ifp->if_ipackets++;
-		sc->ic_ifp->if_ibytes += len;
+		if_inc_counter(sc->ic_ifp, IFCOUNTER_IPACKETS, 1);
+		if_inc_counter(sc->ic_ifp, IFCOUNTER_IBYTES, len);
 		BPF_TAP(sc->ic_ifp, sc->ic_ifbuf, len + ICHDRLEN);
 		top = m_devget(sc->ic_ifbuf + ICHDRLEN, len, 0, sc->ic_ifp, 0);
 		if (top) {
@@ -316,7 +316,7 @@ icintr(device_t dev, int event, char *ptr)
 	err:
 		if_printf(sc->ic_ifp, "errors (%d)!\n", sc->ic_iferrs);
 		sc->ic_iferrs = 0;			/* reset error count */
-		sc->ic_ifp->if_ierrors++;
+		if_inc_counter(sc->ic_ifp, IFCOUNTER_IERRORS, 1);
 		break;
 
 	case INTR_RECEIVE:
@@ -373,7 +373,7 @@ icoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 	/* already sending? */
 	if (sc->ic_flags & IC_SENDING) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		goto error;
 	}
 		
@@ -386,7 +386,7 @@ icoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	do {
 		if (len + mm->m_len > sc->ic_ifp->if_mtu) {
 			/* packet too large */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			goto error;
 		}
 			
@@ -407,10 +407,10 @@ icoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	if (iicbus_block_write(parent, sc->ic_addr, sc->ic_obuf,
 				len + ICHDRLEN, &sent))
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	else {
-		ifp->if_opackets++;
-		ifp->if_obytes += len;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
 	}	
 
 	mtx_lock(&sc->ic_lock);
diff --git a/sys/pci/intpm.c b/sys/dev/intpm/intpm.c
similarity index 99%
rename from sys/pci/intpm.c
rename to sys/dev/intpm/intpm.c
index 48ff26e6adcd..60ad17f98d53 100644
--- a/sys/pci/intpm.c
+++ b/sys/dev/intpm/intpm.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <pci/intpmreg.h>
+#include <dev/intpm/intpmreg.h>
 
 #include "opt_intpm.h"
 
diff --git a/sys/pci/intpmreg.h b/sys/dev/intpm/intpmreg.h
similarity index 100%
rename from sys/pci/intpmreg.h
rename to sys/dev/intpm/intpmreg.h
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index fe693eb78998..04c33639f59b 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1202,7 +1202,7 @@ ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status,
 	 */
 	mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (mnew == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1223,7 +1223,7 @@ ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status,
 			panic("%s: could not load old rx mbuf",
 			    device_get_name(sc->sc_dev));
 		}
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1378,7 +1378,7 @@ ipw_tx_intr(struct ipw_softc *sc)
 		sbd = &sc->stbd_list[i];
 
 		if (sbd->type == IPW_SBD_TYPE_DATA)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		ipw_release_sbd(sc, sbd);
 		sc->txfree++;
@@ -1768,7 +1768,7 @@ ipw_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (ipw_tx_start(ifp, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 		/* start watchdog timer */
@@ -1788,7 +1788,7 @@ ipw_watchdog(void *arg)
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			if_printf(ifp, "device timeout\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			taskqueue_enqueue(taskqueue_swi, &sc->sc_init_task);
 		}
 	}
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index c08abf948433..e11b2b64beda 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -538,7 +538,7 @@ iscsi_callout(void *context)
 	is->is_timeout++;
 
 	if (is->is_waiting_for_iscsid) {
-		if (is->is_timeout > iscsid_timeout) {
+		if (iscsid_timeout > 0 && is->is_timeout > iscsid_timeout) {
 			ISCSI_SESSION_WARN(is, "timed out waiting for iscsid(8) "
 			    "for %d seconds; reconnecting",
 			    is->is_timeout);
@@ -548,7 +548,7 @@ iscsi_callout(void *context)
 	}
 
 	if (is->is_login_phase) {
-		if (is->is_timeout > login_timeout) {
+		if (login_timeout > 0 && is->is_timeout > login_timeout) {
 			ISCSI_SESSION_WARN(is, "login timed out after %d seconds; "
 			    "reconnecting", is->is_timeout);
 			reconnect_needed = true;
@@ -556,6 +556,16 @@ iscsi_callout(void *context)
 		goto out;
 	}
 
+	if (ping_timeout <= 0) {
+		/*
+		 * Pings are disabled.  Don't send NOP-Out in this case.
+		 * Reset the timeout, to avoid triggering reconnection,
+		 * should the user decide to reenable them.
+		 */
+		is->is_timeout = 0;
+		goto out;
+	}
+
 	if (is->is_timeout >= ping_timeout) {
 		ISCSI_SESSION_WARN(is, "no ping reply (NOP-In) after %d seconds; "
 		    "reconnecting", ping_timeout);
@@ -2169,7 +2179,12 @@ iscsi_action(struct cam_sim *sim, union ccb *ccb)
 		cpi->hba_misc = PIM_EXTLUNS;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = 0;
-		cpi->max_lun = 0;
+		/*
+		 * Note that the variable below is only relevant for targets
+		 * that don't claim compliance with anything above SPC2, which
+		 * means they don't support REPORT_LUNS.
+		 */
+		cpi->max_lun = 255;
 		cpi->initiator_id = ~0;
 		strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strlcpy(cpi->hba_vid, "iSCSI", HBA_IDLEN);
diff --git a/sys/dev/iscsi_initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c
index 8f8bd6443b2e..6089694364c6 100644
--- a/sys/dev/iscsi_initiator/isc_cam.c
+++ b/sys/dev/iscsi_initiator/isc_cam.c
@@ -125,7 +125,7 @@ scan_callback(struct cam_periph *periph, union ccb *ccb)
 
      debug_called(8);
 
-     free(ccb, M_TEMP);
+     xpt_free_ccb(ccb);
 
      if(sp->flags & ISC_SCANWAIT) {
 	  sp->flags &= ~ISC_SCANWAIT;
@@ -141,30 +141,15 @@ ic_scan(isc_session_t *sp)
      debug_called(8);
      sdebug(2, "scanning sid=%d", sp->sid);
 
-     if((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO)) == NULL) {
-	  xdebug("scan failed (can't allocate CCB)");
-	  return ENOMEM; // XXX
-     }
-
      sp->flags &= ~ISC_CAMDEVS;
      sp->flags |= ISC_SCANWAIT;
 
-     CAM_LOCK(sp);
-     if(xpt_create_path(&sp->cam_path, NULL, cam_sim_path(sp->cam_sim),
-			0, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
-	  xdebug("can't create cam path");
-	  CAM_UNLOCK(sp);
-	  free(ccb, M_TEMP);
-	  return ENODEV; // XXX
-     }
-     xpt_setup_ccb(&ccb->ccb_h, sp->cam_path, 5/*priority (low)*/);
-     ccb->ccb_h.func_code	= XPT_SCAN_BUS;
+     ccb = xpt_alloc_ccb();
+     ccb->ccb_h.path		= sp->cam_path;
      ccb->ccb_h.cbfcnp		= scan_callback;
-     ccb->crcn.flags		= CAM_FLAG_NONE;
      ccb->ccb_h.spriv_ptr0	= sp;
 
-     xpt_action(ccb);
-     CAM_UNLOCK(sp);
+     xpt_rescan(ccb);
 
      while(sp->flags & ISC_SCANWAIT)
 	  tsleep(sp, PRIBIO, "ffp", 5*hz); // the timeout time should
@@ -374,6 +359,16 @@ ic_init(isc_session_t *sp)
 	  return ENXIO;
      }
      sp->cam_sim = sim;
+     if(xpt_create_path(&sp->cam_path, NULL, cam_sim_path(sp->cam_sim),
+	    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+	  xpt_bus_deregister(cam_sim_path(sp->cam_sim));
+	  cam_sim_free(sim, /*free_devq*/TRUE);
+	  CAM_UNLOCK(sp);
+#if __FreeBSD_version >= 700000
+	  mtx_destroy(&sp->cam_mtx);
+#endif
+	  return ENXIO;
+     }
      CAM_UNLOCK(sp);
 
      sdebug(1, "cam subsystem initialized");
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 06b4d7ef42b6..979426084dda 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -132,6 +132,7 @@ isp_attach_chan(ispsoftc_t *isp, struct cam_devq *devq, int chan)
 			ISP_SET_PC(isp, chan, proc_active, 0);
 			isp_prt(isp, ISP_LOGERR, "cannot create test target thread");
 		}
+		ISP_SPI_PC(isp, chan)->num_threads += 1;
 #endif
 	} else {
 		fcparam *fcp = FCPARAM(isp, chan);
@@ -167,12 +168,14 @@ isp_attach_chan(ispsoftc_t *isp, struct cam_devq *devq, int chan)
 			cam_sim_free(fc->sim, FALSE);
 			return (ENOMEM);
 		}
+		ISP_FC_PC(isp, chan)->num_threads += 1;
 #ifdef	ISP_INTERNAL_TARGET
 		ISP_SET_PC(isp, chan, proc_active, 1);
 		if (THREAD_CREATE(isp_target_thread_fc, fc, &fc->target_proc, 0, 0, "%s: isp_test_tgt%d", device_get_nameunit(isp->isp_osinfo.dev), chan)) {
 			ISP_SET_PC(isp, chan, proc_active, 0);
 			isp_prt(isp, ISP_LOGERR, "cannot create test target thread");
 		}
+		ISP_FC_PC(isp, chan)->num_threads += 1;
 #endif
 		if (chan == 0) {
 			struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(isp->isp_osinfo.dev);
@@ -189,6 +192,47 @@ isp_attach_chan(ispsoftc_t *isp, struct cam_devq *devq, int chan)
 	return (0);
 }
 
+static void
+isp_detach_internal_target(ispsoftc_t *isp, int chan)
+{
+#ifdef ISP_INTERNAL_TARGET
+	void *wchan;
+
+	ISP_GET_PC(isp, chan, target_proc, wchan);
+	ISP_SET_PC(isp, chan, proc_active, 0);
+	wakeup(wchan);
+#endif
+}
+
+static void
+isp_detach_chan(ispsoftc_t *isp, int chan)
+{
+	struct cam_sim *sim;
+	struct cam_path *path;
+	struct ccb_setasync csa;
+	int *num_threads;
+
+	ISP_GET_PC(isp, chan, sim, sim);
+	ISP_GET_PC(isp, chan, path, path);
+	ISP_GET_PC_ADDR(isp, chan, num_threads, num_threads);
+
+	xpt_setup_ccb(&csa.ccb_h, path, 5);
+	csa.ccb_h.func_code = XPT_SASYNC_CB;
+	csa.event_enable = 0;
+	csa.callback = isp_cam_async;
+	csa.callback_arg = sim;
+	xpt_action((union ccb *)&csa);
+	xpt_free_path(path);
+	xpt_bus_deregister(cam_sim_path(sim));
+	cam_sim_free(sim, FALSE);
+
+	/* Wait for the channel's spawned threads to exit. */
+	wakeup(isp->isp_osinfo.pc.ptr);
+	isp_detach_internal_target(isp, chan);
+	while (*num_threads != 0)
+		mtx_sleep(isp, &isp->isp_osinfo.lock, PRIBIO, "isp_reap", 100);
+}
+
 int
 isp_attach(ispsoftc_t *isp)
 {
@@ -239,13 +283,9 @@ isp_attach(ispsoftc_t *isp)
 	while (--chan >= 0) {
 		struct cam_sim *sim;
 		struct cam_path *path;
-		if (IS_FC(isp)) {
-			sim = ISP_FC_PC(isp, chan)->sim;
-			path = ISP_FC_PC(isp, chan)->path;
-		} else {
-			sim = ISP_SPI_PC(isp, chan)->sim;
-			path = ISP_SPI_PC(isp, chan)->path;
-		}
+
+		ISP_GET_PC(isp, chan, sim, sim);
+		ISP_GET_PC(isp, chan, path, path);
 		xpt_free_path(path);
 		ISP_LOCK(isp);
 		xpt_bus_deregister(cam_sim_path(sim));
@@ -269,49 +309,26 @@ int
 isp_detach(ispsoftc_t *isp)
 {
 	struct cam_sim *sim;
-	struct cam_path *path;
-	struct ccb_setasync csa;
 	int chan;
 
 	ISP_LOCK(isp);
 	for (chan = isp->isp_nchan - 1; chan >= 0; chan -= 1) {
-		if (IS_FC(isp)) {
-			sim = ISP_FC_PC(isp, chan)->sim;
-			path = ISP_FC_PC(isp, chan)->path;
-		} else {
-			sim = ISP_SPI_PC(isp, chan)->sim;
-			path = ISP_SPI_PC(isp, chan)->path;
-		}
+		ISP_GET_PC(isp, chan, sim, sim);
 		if (sim->refcount > 2) {
 			ISP_UNLOCK(isp);
 			return (EBUSY);
 		}
 	}
+	/* Tell spawned threads that we're exiting. */
+	isp->isp_osinfo.is_exiting = 1;
 	if (isp->isp_osinfo.timer_active) {
 		callout_stop(&isp->isp_osinfo.tmo);
 		isp->isp_osinfo.timer_active = 0;
 	}
-	for (chan = isp->isp_nchan - 1; chan >= 0; chan -= 1) {
-		if (IS_FC(isp)) {
-			sim = ISP_FC_PC(isp, chan)->sim;
-			path = ISP_FC_PC(isp, chan)->path;
-		} else {
-			sim = ISP_SPI_PC(isp, chan)->sim;
-			path = ISP_SPI_PC(isp, chan)->path;
-		}
-		xpt_setup_ccb(&csa.ccb_h, path, 5);
-		csa.ccb_h.func_code = XPT_SASYNC_CB;
-		csa.event_enable = 0;
-		csa.callback = isp_cam_async;
-		csa.callback_arg = sim;
-		ISP_LOCK(isp);
-		xpt_action((union ccb *)&csa);
-		ISP_UNLOCK(isp);
-		xpt_free_path(path);
-		xpt_bus_deregister(cam_sim_path(sim));
-		cam_sim_free(sim, FALSE);
-	}
+	for (chan = isp->isp_nchan - 1; chan >= 0; chan -= 1)
+		isp_detach_chan(isp, chan);
 	ISP_UNLOCK(isp);
+
 	if (isp->isp_osinfo.cdev) {
 		destroy_dev(isp->isp_osinfo.cdev);
 		isp->isp_osinfo.cdev = NULL;
@@ -4225,7 +4242,7 @@ isp_target_thread(ispsoftc_t *isp, int chan)
 	/*
 	 * Add resources
 	 */
-	ISP_GET_PC_ADDR(isp, chan, target_proc, wchan);
+	ISP_GET_PC(isp, chan, target_proc, wchan);
 	for (i = 0; i < 4; i++) {
 		ccb = malloc(sizeof (*ccb), M_ISPTARG, M_WAITOK | M_ZERO);
 		xpt_setup_ccb(&ccb->ccb_h, wperiph->path, 1);
@@ -4313,14 +4330,24 @@ static void
 isp_target_thread_pi(void *arg)
 {
 	struct isp_spi *pi = arg;
-	isp_target_thread(cam_sim_softc(pi->sim), cam_sim_bus(pi->sim));
+	ispsoftc_t *isp = cam_sim_softc(pi->sim);
+	int chan = cam_sim_bus(pi->sim);
+
+	isp_target_thread(isp, chan);
+	ISP_SPI_PC(isp, chan)->num_threads -= 1;
+	kthread_exit();
 }
 
 static void
 isp_target_thread_fc(void *arg)
 {
 	struct isp_fc *fc = arg;
-	isp_target_thread(cam_sim_softc(fc->sim), cam_sim_bus(fc->sim));
+	ispsoftc_t *isp = cam_sim_softc(pi->sim);
+	int chan = cam_sim_bus(pi->sim);
+
+	isp_target_thread(isp, chan);
+	ISP_FC_PC(isp, chan)->num_threads -= 1;
+	kthread_exit();
 }
 
 static int
@@ -4748,7 +4775,7 @@ isp_kthread(void *arg)
 
 	mtx_lock(&isp->isp_osinfo.lock);
 
-	for (;;) {
+	while (isp->isp_osinfo.is_exiting == 0) {
 		int lb, lim;
 
 		isp_prt(isp, ISP_LOG_SANCFG|ISP_LOGDEBUG0, "%s: Chan %d checking FC state", __func__, chan);
@@ -4844,7 +4871,9 @@ isp_kthread(void *arg)
 			mtx_lock(&isp->isp_osinfo.lock);
 		}
 	}
+	fc->num_threads -= 1;
 	mtx_unlock(&isp->isp_osinfo.lock);
+	kthread_exit();
 }
 
 static void
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 70061ef7b5b4..81dcd8d09193 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -268,6 +268,7 @@ struct isp_fc {
 	unsigned int inject_lost_data_frame;
 #endif
 #endif
+	int			num_threads;
 };
 
 struct isp_spi {
@@ -291,6 +292,7 @@ struct isp_spi {
 	struct proc *		target_proc;
 #endif
 #endif
+	int			num_threads;
 };
 
 struct isposinfo {
@@ -365,6 +367,8 @@ struct isposinfo {
 		struct isp_spi *spi;
 		void *ptr;
 	} pc;
+
+	int			is_exiting;
 };
 #define	ISP_FC_PC(isp, chan)	(&(isp)->isp_osinfo.pc.fc[(chan)])
 #define	ISP_SPI_PC(isp, chan)	(&(isp)->isp_osinfo.pc.spi[(chan)])
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index 412d7099a548..b6de4b69e7af 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -1235,7 +1235,7 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, int i,
 	 */
 	mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (mnew == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1256,7 +1256,7 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, int i,
 			panic("%s: could not load old rx mbuf",
 			    device_get_name(sc->sc_dev));
 		}
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1651,7 +1651,7 @@ iwi_tx_intr(struct iwi_softc *sc, struct iwi_tx_ring *txq)
 
 		DPRINTFN(15, ("tx done idx=%u\n", txq->next));
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		txq->queued--;
 		txq->next = (txq->next + 1) % IWI_TX_RING_COUNT;
@@ -1852,7 +1852,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni,
 					/* h/w table is full */
 					m_freem(m0);
 					ieee80211_free_node(ni);
-					ifp->if_oerrors++;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					return 0;
 				}
 				iwi_write_ibssnode(sc,
@@ -2007,7 +2007,7 @@ iwi_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (iwi_tx_start(ifp, m, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 
@@ -2038,7 +2038,7 @@ iwi_watchdog(void *arg)
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			if_printf(ifp, "device timeout\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			ieee80211_runtask(ic, &sc->sc_restarttask);
 		}
 	}
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index 34a432109749..bf8c98d96f85 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -2966,14 +2966,14 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 	if ((flags & IWN_RX_NOERROR) != IWN_RX_NOERROR) {
 		DPRINTF(sc, IWN_DEBUG_RECV, "%s: RX flags error %x\n",
 		    __func__, flags);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	/* Discard frames that are too short. */
 	if (len < sizeof (*wh)) {
 		DPRINTF(sc, IWN_DEBUG_RECV, "%s: frame too short: %d\n",
 		    __func__, len);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -2981,7 +2981,7 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 	if (m1 == NULL) {
 		DPRINTF(sc, IWN_DEBUG_ANY, "%s: no mbuf to restock ring\n",
 		    __func__);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	bus_dmamap_unload(ring->data_dmat, data->map);
@@ -3004,7 +3004,7 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		ring->desc[ring->cur] = htole32(paddr >> 8);
 		bus_dmamap_sync(ring->data_dmat, ring->desc_dma.map,
 		    BUS_DMASYNC_PREWRITE);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -3125,6 +3125,7 @@ iwn_rx_compressed_ba(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		KASSERT(ni != NULL, ("no node"));
 		KASSERT(m != NULL, ("no mbuf"));
 
+		DPRINTF(sc, IWN_DEBUG_XMIT, "%s: freeing m=%p\n", __func__, m);
 		ieee80211_tx_complete(ni, m, 1);
 
 		txq->queued--;
@@ -3151,20 +3152,22 @@ iwn_rx_compressed_ba(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		return;
 
 	/*
-	 * XXX does this correctly process an almost empty bitmap?
-	 * (since it bails out when it sees an empty bitmap, but there
-	 * may be failed bits there..)
+	 * Walk the bitmap and calculate how many successful and failed
+	 * attempts are made.
+	 *
+	 * Yes, the rate control code doesn't know these are A-MPDU
+	 * subframes and that it's okay to fail some of these.
 	 */
 	ni = tap->txa_ni;
 	bitmap = (le64toh(ba->bitmap) >> shift) & wn->agg[tid].bitmap;
 	for (i = 0; bitmap; i++) {
 		if ((bitmap & 1) == 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			tx_err ++;
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &ackfailcnt, NULL);
 		} else {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			tx_ok ++;
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_SUCCESS, &ackfailcnt, NULL);
@@ -3172,7 +3175,8 @@ iwn_rx_compressed_ba(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		bitmap >>= 1;
 	}
 
-	DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT, "->%s: end; %d ok; %d err\n",__func__, tx_ok, tx_err);
+	DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT,
+	    "->%s: end; %d ok; %d err\n",__func__, tx_ok, tx_err);
 
 }
 
@@ -3423,9 +3427,12 @@ iwn4965_tx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 	ring = &sc->txq[qid];
 
 	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: "
-	    "qid %d idx %d retries %d nkill %d rate %x duration %d status %x\n",
-	    __func__, desc->qid, desc->idx, stat->ackfailcnt,
-	    stat->btkillcnt, stat->rate, le16toh(stat->duration),
+	    "qid %d idx %d RTS retries %d ACK retries %d nkill %d rate %x duration %d status %x\n",
+	    __func__, desc->qid, desc->idx,
+	    stat->rtsfailcnt,
+	    stat->ackfailcnt,
+	    stat->btkillcnt,
+	    stat->rate, le16toh(stat->duration),
 	    le32toh(stat->status));
 
 	bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_POSTREAD);
@@ -3450,9 +3457,12 @@ iwn5000_tx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 	ring = &sc->txq[qid];
 
 	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: "
-	    "qid %d idx %d retries %d nkill %d rate %x duration %d status %x\n",
-	    __func__, desc->qid, desc->idx, stat->ackfailcnt,
-	    stat->btkillcnt, stat->rate, le16toh(stat->duration),
+	    "qid %d idx %d RTS retries %d ACK retries %d nkill %d rate %x duration %d status %x\n",
+	    __func__, desc->qid, desc->idx,
+	    stat->rtsfailcnt,
+	    stat->ackfailcnt,
+	    stat->btkillcnt,
+	    stat->rate, le16toh(stat->duration),
 	    le32toh(stat->status));
 
 #ifdef notyet
@@ -3499,11 +3509,11 @@ iwn_tx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, int ackfailcnt,
 	 * Update rate control statistics for the node.
 	 */
 	if (status & IWN_TX_FAIL) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ieee80211_ratectl_tx_complete(vap, ni,
 		    IEEE80211_RATECTL_TX_FAILURE, &ackfailcnt, NULL);
 	} else {
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ieee80211_ratectl_tx_complete(vap, ni,
 		    IEEE80211_RATECTL_TX_SUCCESS, &ackfailcnt, NULL);
 	}
@@ -3595,6 +3605,8 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 	uint8_t tid;
 	int bit, i, lastidx, *res, seqno, shift, start;
 
+	/* XXX TODO: status is le16 field! Grr */
+
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: nframes=%d, status=0x%08x\n",
 	    __func__,
@@ -3606,6 +3618,18 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 	wn = (void *)tap->txa_ni;
 	ni = tap->txa_ni;
 
+	/*
+	 * XXX TODO: ACK and RTS failures would be nice here!
+	 */
+
+	/*
+	 * A-MPDU single frame status - if we failed to transmit it
+	 * in A-MPDU, then it may be a permanent failure.
+	 *
+	 * XXX TODO: check what the Linux iwlwifi driver does here;
+	 * there's some permanent and temporary failures that may be
+	 * handled differently.
+	 */
 	if (nframes == 1) {
 		if ((*status & 0xff) != 1 && (*status & 0xff) != 2) {
 #ifdef	NOT_YET
@@ -3616,24 +3640,26 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 			 * notification is pushed up to the rate control
 			 * layer.
 			 */
-			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
-			    IEEE80211_RATECTL_TX_FAILURE, &nframes, NULL);
+			ieee80211_ratectl_tx_complete(ni->ni_vap,
+			    ni,
+			    IEEE80211_RATECTL_TX_FAILURE,
+			    &ackfailcnt,
+			    NULL);
+		} else {
+			/*
+			 * If nframes=1, then we won't be getting a BA for
+			 * this frame.  Ensure that we correctly update the
+			 * rate control code with how many retries were
+			 * needed to send it.
+			 */
+			ieee80211_ratectl_tx_complete(ni->ni_vap,
+			    ni,
+			    IEEE80211_RATECTL_TX_SUCCESS,
+			    &ackfailcnt,
+			    NULL);
 		}
 	}
 
-	/*
-	 * We succeeded with some frames, so let's update how many
-	 * retries were needed for this frame.
-	 *
-	 * XXX we can't yet pass tx_complete tx_cnt and success_cnt,
-	 * le sigh.
-	 */
-	ieee80211_ratectl_tx_complete(ni->ni_vap,
-	    ni,
-	    IEEE80211_RATECTL_TX_SUCCESS,
-	    &ackfailcnt,
-	    NULL);
-
 	bitmap = 0;
 	start = idx;
 	for (i = 0; i < nframes; i++) {
@@ -3671,6 +3697,7 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 		ssn = tap->txa_start & 0xfff;
 	}
 
+	/* This is going nframes DWORDS into the descriptor? */
 	seqno = le32toh(*(status + nframes)) & 0xfff;
 	for (lastidx = (seqno & 0xff); ring->read != lastidx;) {
 		data = &ring->data[ring->read];
@@ -3684,7 +3711,7 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 
 		KASSERT(ni != NULL, ("no node"));
 		KASSERT(m != NULL, ("no mbuf"));
-
+		DPRINTF(sc, IWN_DEBUG_XMIT, "%s: freeing m=%p\n", __func__, m);
 		ieee80211_tx_complete(ni, m, 1);
 
 		ring->queued--;
@@ -4179,11 +4206,11 @@ iwn_check_rate_needs_protection(struct iwn_softc *sc,
 		return (0);
 
 	/*
-	 * If it's an 11n rate, then for now we enable
-	 * protection.
+	 * If it's an 11n rate - no protection.
+	 * We'll do it via a specific 11n check.
 	 */
 	if (rate & IEEE80211_RATE_MCS) {
-		return (1);
+		return (0);
 	}
 
 	/*
@@ -4413,6 +4440,9 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 				flags |= IWN_TX_NEED_CTS;
 			else if (ic->ic_protmode == IEEE80211_PROT_RTSCTS)
 				flags |= IWN_TX_NEED_RTS;
+		} else if ((rate & IEEE80211_RATE_MCS) &&
+			(ic->ic_htprotmode == IEEE80211_PROT_RTSCTS)) {
+			flags |= IWN_TX_NEED_RTS;
 		}
 
 		/* XXX HT protection? */
@@ -4795,7 +4825,7 @@ iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	if (error != 0) {
 		/* NB: m is reclaimed on tx failure */
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	sc->sc_tx_timer = 5;
 
@@ -4842,7 +4872,7 @@ iwn_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
 		if (iwn_tx_data(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		sc->sc_tx_timer = 5;
diff --git a/sys/dev/iwn/if_iwnreg.h b/sys/dev/iwn/if_iwnreg.h
index 496e837e0f0e..ed65c0bf0c7a 100644
--- a/sys/dev/iwn/if_iwnreg.h
+++ b/sys/dev/iwn/if_iwnreg.h
@@ -1267,18 +1267,91 @@ struct iwn_ucode_info {
 } __packed;
 
 /* Structures for IWN_TX_DONE notification. */
-#define	IWN_TX_STATUS_MSK		0xff
-#define	TX_STATUS_SUCCESS		0x01
-#define	TX_STATUS_DIRECT_DONE		0x02
 
-#define IWN_TX_SUCCESS			0x00
-#define IWN_TX_FAIL			0x80	/* all failures have 0x80 set */
-#define IWN_TX_FAIL_SHORT_LIMIT		0x82	/* too many RTS retries */
-#define IWN_TX_FAIL_LONG_LIMIT		0x83	/* too many retries */
-#define IWN_TX_FAIL_FIFO_UNDERRRUN	0x84	/* tx fifo not kept running */
-#define IWN_TX_FAIL_DEST_IN_PS		0x88	/* sta found in power save */
-#define IWN_TX_FAIL_TX_LOCKED		0x90	/* waiting to see traffic */
-#define IWN_TX_FAIL_STA_INVALID		0x8b	/* XXX STA invalid (???) */
+/*
+ * TX command response is sent after *agn* transmission attempts.
+ *
+ * both postpone and abort status are expected behavior from uCode. there is
+ * no special operation required from driver; except for RFKILL_FLUSH,
+ * which required tx flush host command to flush all the tx frames in queues
+ */
+#define	IWN_TX_STATUS_MSK		0x000000ff
+#define	IWN_TX_STATUS_DELAY_MSK		0x00000040
+#define	IWN_TX_STATUS_ABORT_MSK		0x00000080
+#define	IWN_TX_PACKET_MODE_MSK		0x0000ff00
+#define	IWN_TX_FIFO_NUMBER_MSK		0x00070000
+#define	IWN_TX_RESERVED			0x00780000
+#define	IWN_TX_POWER_PA_DETECT_MSK	0x7f800000
+#define	IWN_TX_ABORT_REQUIRED_MSK	0x80000000
+
+/* Success status */
+#define	IWN_TX_STATUS_SUCCESS		0x01
+#define	IWN_TX_STATUS_DIRECT_DONE	0x02
+
+/* postpone TX */
+#define	IWN_TX_STATUS_POSTPONE_DELAY		0x40
+#define	IWN_TX_STATUS_POSTPONE_FEW_BYTES	0x41
+#define	IWN_TX_STATUS_POSTPONE_BT_PRIO		0x42
+#define	IWN_TX_STATUS_POSTPONE_QUIET_PERIOD	0x43
+#define	IWN_TX_STATUS_POSTPONE_CALC_TTAK	0x44
+
+/* Failures */
+#define	IWN_TX_FAIL			0x80	/* all failures have 0x80 set */
+#define	IWN_TX_STATUS_FAIL_INTERNAL_CROSSED_RETRY	0x81
+#define	IWN_TX_FAIL_SHORT_LIMIT		0x82	/* too many RTS retries */
+#define	IWN_TX_FAIL_LONG_LIMIT		0x83	/* too many retries */
+#define	IWN_TX_FAIL_FIFO_UNDERRRUN	0x84	/* tx fifo not kept running */
+#define	IWN_TX_STATUS_FAIL_DRAIN_FLOW	0x85
+#define	IWN_TX_STATUS_FAIL_RFKILL_FLUSH	0x86
+#define	IWN_TX_STATUS_FAIL_LIFE_EXPIRE	0x87
+#define	IWN_TX_FAIL_DEST_IN_PS		0x88	/* sta found in power save */
+#define	IWN_TX_STATUS_FAIL_HOST_ABORTED	0x89
+#define	IWN_TX_STATUS_FAIL_BT_RETRY	0x8a
+#define	IWN_TX_FAIL_STA_INVALID		0x8b	/* XXX STA invalid (???) */
+#define	IWN_TX_STATUS_FAIL_FRAG_DROPPED	0x8c
+#define	IWN_TX_STATUS_FAIL_TID_DISABLE	0x8d
+#define	IWN_TX_STATUS_FAIL_FIFO_FLUSHED	0x8e
+#define	IWN_TX_STATUS_FAIL_INSUFFICIENT_CF_POLL	0x8f
+#define	IWN_TX_FAIL_TX_LOCKED		0x90	/* waiting to see traffic */
+#define	IWN_TX_STATUS_FAIL_NO_BEACON_ON_RADAR	0x91
+
+/*
+ * TX command response for A-MPDU packet responses.
+ *
+ * The status response is different to the non A-MPDU responses.
+ * In addition, the sequence number is treated as the sequence
+ * number of the TX command, NOT the 802.11 sequence number!
+ */
+#define	IWN_AGG_TX_STATE_TRANSMITTED		0x00
+#define	IWN_AGG_TX_STATE_UNDERRUN_MSK		0x01
+#define	IWN_AGG_TX_STATE_FEW_BYTES_MSK		0x04
+#define	IWN_AGG_TX_STATE_ABORT_MSK		0x08
+
+#define	IWN_AGG_TX_STATE_LAST_SENT_TTL_MSK	0x10
+#define	IWN_AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK	0x20
+
+#define	IWN_AGG_TX_STATE_SCD_QUERY_MSK		0x80
+
+#define	IWN_AGG_TX_STATE_TEST_BAD_CRC32_MSK	0x100
+
+#define	IWN_AGG_TX_STATE_RESPONSE_MSK		0x1ff
+#define	IWN_AGG_TX_STATE_DUMP_TX_MSK		0x200
+#define	IWN_AGG_TX_STATE_DELAY_TX_MSK		0x400
+
+#define	IWN_AGG_TX_STATUS_MSK		0x00000fff
+#define	IWN_AGG_TX_TRY_MSK		0x0000f000
+
+#define	IWN_AGG_TX_STATE_LAST_SENT_MSK		\
+	    (IWN_AGG_TX_STATE_LAST_SENT_TTL_MSK | \
+	     IWN_AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK)
+
+/* # tx attempts for first frame in aggregation */
+#define	IWN_AGG_TX_STATE_TRY_CNT_POS	12
+#define	IWN_AGG_TX_STATE_TRY_CNT_MSK	0xf000
+
+/* Command ID and sequence number of Tx command for this frame */
+#define	IWN_AGG_TX_STATE_SEQ_NUM_POS	16
+#define	IWN_AGG_TX_STATE_SEQ_NUM_MSK	0xffff0000
 
 struct iwn4965_tx_stat {
 	uint8_t		nframes;
@@ -1405,6 +1478,12 @@ struct iwn_compressed_ba {
 	uint64_t	bitmap;
 	uint16_t	qid;
 	uint16_t	ssn;
+	/* extra fields starting with iwn5000 */
+#if 0
+	uint8_t		txed;		/* number of frames sent */
+	uint8_t		txed_2_done;	/* number of frames acked */
+	uint16_t	reserved1;
+#endif
 } __packed;
 
 /* Structure for IWN_START_SCAN notification. */
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 9b4555dfb21d..6f25c0ae44d2 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -97,6 +97,7 @@ static void     ixgb_intr(void *);
 static void     ixgb_start(struct ifnet *);
 static void     ixgb_start_locked(struct ifnet *);
 static int      ixgb_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t);
+static uint64_t	ixgb_get_counter(struct ifnet *, ift_counter);
 static void     ixgb_watchdog(struct adapter *);
 static void     ixgb_init(void *);
 static void     ixgb_init_locked(struct adapter *);
@@ -643,7 +644,7 @@ ixgb_watchdog(struct adapter *adapter)
 	ixgb_init_locked(adapter);
 
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	return;
 }
@@ -1355,6 +1356,7 @@ ixgb_setup_interface(device_t dev, struct adapter * adapter)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = ixgb_ioctl;
 	ifp->if_start = ixgb_start;
+	ifp->if_get_counter = ixgb_get_counter;
 	ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 1;
 
 #if __FreeBSD_version < 500000
@@ -2326,7 +2328,6 @@ ixgb_write_pci_cfg(struct ixgb_hw * hw,
 static void
 ixgb_update_stats_counters(struct adapter * adapter)
 {
-	struct ifnet   *ifp;
 
 	adapter->stats.crcerrs += IXGB_READ_REG(&adapter->hw, CRCERRS);
 	adapter->stats.gprcl += IXGB_READ_REG(&adapter->hw, GPRCL);
@@ -2389,28 +2390,36 @@ ixgb_update_stats_counters(struct adapter * adapter)
 	adapter->stats.pfrc += IXGB_READ_REG(&adapter->hw, PFRC);
 	adapter->stats.pftc += IXGB_READ_REG(&adapter->hw, PFTC);
 	adapter->stats.mcfrc += IXGB_READ_REG(&adapter->hw, MCFRC);
-
-	ifp = adapter->ifp;
-
-	/* Fill out the OS statistics structure */
-	ifp->if_ipackets = adapter->stats.gprcl;
-	ifp->if_opackets = adapter->stats.gptcl;
-	ifp->if_ibytes = adapter->stats.gorcl;
-	ifp->if_obytes = adapter->stats.gotcl;
-	ifp->if_imcasts = adapter->stats.mprcl;
-	ifp->if_collisions = 0;
-
-	/* Rx Errors */
-	ifp->if_ierrors =
-		adapter->dropped_pkts +
-		adapter->stats.crcerrs +
-		adapter->stats.rnbc +
-		adapter->stats.mpc +
-		adapter->stats.rlec;
-
-
 }
 
+static uint64_t
+ixgb_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct adapter *adapter;
+
+	adapter = if_getsoftc(ifp);
+
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (adapter->stats.gprcl);
+	case IFCOUNTER_OPACKETS:
+		return ( adapter->stats.gptcl);
+	case IFCOUNTER_IBYTES:
+		return (adapter->stats.gorcl);
+	case IFCOUNTER_OBYTES:
+		return (adapter->stats.gotcl);
+	case IFCOUNTER_IMCASTS:
+		return ( adapter->stats.mprcl);
+	case IFCOUNTER_COLLISIONS:
+		return (0);
+	case IFCOUNTER_IERRORS:
+		return (adapter->dropped_pkts + adapter->stats.crcerrs +
+		    adapter->stats.rnbc + adapter->stats.mpc +
+		    adapter->stats.rlec);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
 
 /**********************************************************************
  *
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index 359279d17e79..d7371a861c33 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -120,6 +120,7 @@ static int      ixgbe_ioctl(struct ifnet *, u_long, caddr_t);
 static void	ixgbe_init(void *);
 static void	ixgbe_init_locked(struct adapter *);
 static void     ixgbe_stop(void *);
+static uint64_t	ixgbe_get_counter(struct ifnet *, ift_counter);
 static void     ixgbe_media_status(struct ifnet *, struct ifmediareq *);
 static int      ixgbe_media_change(struct ifnet *);
 static void     ixgbe_identify_hardware(struct adapter *);
@@ -514,7 +515,7 @@ ixgbe_attach(device_t dev)
 	}
 
 	if (((ixgbe_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
-	    ixgbe_rxd < MIN_TXD || ixgbe_rxd > MAX_TXD) {
+	    ixgbe_rxd < MIN_RXD || ixgbe_rxd > MAX_RXD) {
 		device_printf(dev, "RXD config issue, using default!\n");
 		adapter->num_rx_desc = DEFAULT_RXD;
 	} else
@@ -2721,6 +2722,7 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = ixgbe_ioctl;
+	ifp->if_get_counter = ixgbe_get_counter;
 #ifndef IXGBE_LEGACY_TX
 	ifp->if_transmit = ixgbe_mq_start;
 	ifp->if_qflush = ixgbe_qflush;
@@ -4142,7 +4144,6 @@ ixgbe_setup_receive_ring(struct rx_ring *rxr)
 	rxr->lro_enabled = FALSE;
 	rxr->rx_copies = 0;
 	rxr->rx_bytes = 0;
-	rxr->discard = FALSE;
 	rxr->vtag_strip = FALSE;
 
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
@@ -4523,11 +4524,6 @@ ixgbe_rx_discard(struct rx_ring *rxr, int i)
 
 	rbuf = &rxr->rx_buffers[i];
 
-        if (rbuf->fmp != NULL) {/* Partial chain ? */
-		rbuf->fmp->m_flags |= M_PKTHDR;
-                m_freem(rbuf->fmp);
-                rbuf->fmp = NULL;
-	}
 
 	/*
 	** With advanced descriptors the writeback
@@ -4536,7 +4532,13 @@ ixgbe_rx_discard(struct rx_ring *rxr, int i)
 	** the normal refresh path to get new buffers
 	** and mapping.
 	*/
-	if (rbuf->buf) {
+
+	if (rbuf->fmp != NULL) {/* Partial chain ? */
+		rbuf->fmp->m_flags |= M_PKTHDR;
+		m_freem(rbuf->fmp);
+		rbuf->fmp = NULL;
+		rbuf->buf = NULL; /* rbuf->buf is part of fmp's chain */
+	} else if (rbuf->buf) {
 		m_free(rbuf->buf);
 		rbuf->buf = NULL;
 	}
@@ -4617,13 +4619,8 @@ ixgbe_rxeof(struct ix_queue *que)
 		eop = ((staterr & IXGBE_RXD_STAT_EOP) != 0);
 
 		/* Make sure bad packets are discarded */
-		if (((staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) ||
-		    (rxr->discard)) {
+		if (eop && (staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) {
 			rxr->rx_discarded++;
-			if (eop)
-				rxr->discard = FALSE;
-			else
-				rxr->discard = TRUE;
 			ixgbe_rx_discard(rxr, i);
 			goto next_desc;
 		}
@@ -5369,10 +5366,8 @@ ixgbe_reinit_fdir(void *context, int pending)
 static void
 ixgbe_update_stats_counters(struct adapter *adapter)
 {
-	struct ifnet   *ifp = adapter->ifp;
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32  missed_rx = 0, bprc, lxon, lxoff, total;
-	u64  total_missed_rx = 0;
 
 	adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
 	adapter->stats.illerrc += IXGBE_READ_REG(hw, IXGBE_ILLERRC);
@@ -5391,8 +5386,6 @@ ixgbe_update_stats_counters(struct adapter *adapter)
 		missed_rx += mp;
 		/* global total per queue */
         	adapter->stats.mpc[i] += mp;
-		/* Running comprehensive total for stats display */
-		total_missed_rx += adapter->stats.mpc[i];
 		if (hw->mac.type == ixgbe_mac_82598EB) {
 			adapter->stats.rnbc[i] +=
 			    IXGBE_READ_REG(hw, IXGBE_RNBC(i));
@@ -5502,19 +5495,41 @@ ixgbe_update_stats_counters(struct adapter *adapter)
 		adapter->stats.fcoedwrc += IXGBE_READ_REG(hw, IXGBE_FCOEDWRC);
 		adapter->stats.fcoedwtc += IXGBE_READ_REG(hw, IXGBE_FCOEDWTC);
 	}
+}
 
-	/* Fill out the OS statistics structure */
-	ifp->if_ipackets = adapter->stats.gprc;
-	ifp->if_opackets = adapter->stats.gptc;
-	ifp->if_ibytes = adapter->stats.gorc;
-	ifp->if_obytes = adapter->stats.gotc;
-	ifp->if_imcasts = adapter->stats.mprc;
-	ifp->if_omcasts = adapter->stats.mptc;
-	ifp->if_collisions = 0;
+static uint64_t
+ixgbe_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct adapter *adapter;
+	uint64_t rv;
 
-	/* Rx Errors */
-	ifp->if_iqdrops = total_missed_rx;
-	ifp->if_ierrors = adapter->stats.crcerrs + adapter->stats.rlec;
+	adapter = if_getsoftc(ifp);
+
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (adapter->stats.gprc);
+	case IFCOUNTER_OPACKETS:
+		return (adapter->stats.gptc);
+	case IFCOUNTER_IBYTES:
+		return (adapter->stats.gorc);
+	case IFCOUNTER_OBYTES:
+		return (adapter->stats.gotc);
+	case IFCOUNTER_IMCASTS:
+		return (adapter->stats.mprc);
+	case IFCOUNTER_OMCASTS:
+		return (adapter->stats.mptc);
+	case IFCOUNTER_COLLISIONS:
+		return (0);
+	case IFCOUNTER_IQDROPS:
+		rv = 0;
+		for (int i = 0; i < 8; i++)
+			rv += adapter->stats.mpc[i];
+		return (rv);
+	case IFCOUNTER_IERRORS:
+		return (adapter->stats.crcerrs + adapter->stats.rlec);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 /** ixgbe_sysctl_tdh_handler - Handler function
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 70f1f873fff6..f7e9efa7b398 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -331,7 +331,6 @@ struct rx_ring {
 	struct lro_ctrl		lro;
 	bool			lro_enabled;
 	bool			hw_rsc;
-	bool			discard;
 	bool			vtag_strip;
         u16			next_to_refresh;
         u16 			next_to_check;
diff --git a/sys/dev/ixgbe/ixv.c b/sys/dev/ixgbe/ixv.c
index eee1c383ac53..296138ed2469 100644
--- a/sys/dev/ixgbe/ixv.c
+++ b/sys/dev/ixgbe/ixv.c
@@ -347,7 +347,7 @@ ixv_attach(device_t dev)
 		adapter->num_tx_desc = ixv_txd;
 
 	if (((ixv_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
-	    ixv_rxd < MIN_TXD || ixv_rxd > MAX_TXD) {
+	    ixv_rxd < MIN_RXD || ixv_rxd > MAX_RXD) {
 		device_printf(dev, "RXD config issue, using default!\n");
 		adapter->num_rx_desc = DEFAULT_RXD;
 	} else
@@ -634,9 +634,9 @@ ixv_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr, struct mbuf *m)
 		}
 		drbr_advance(ifp, txr->br);
 		enqueued++;
-		ifp->if_obytes += next->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, next->m_pkthdr.len);
 		if (next->m_flags & M_MCAST)
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		/* Send a copy of the frame to the BPF listener */
 		ETHER_BPF_MTAP(ifp, next);
 		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
@@ -2651,7 +2651,7 @@ ixv_txeof(struct tx_ring *txr)
 			tx_desc =
 			    (struct ixgbe_legacy_tx_desc *)&txr->tx_base[first];
 		}
-		++ifp->if_opackets;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		/* See if there is more work now */
 		last = tx_buffer->eop_index;
 		if (last != -1) {
@@ -3341,7 +3341,7 @@ ixv_rxeof(struct ix_queue *que, int count)
 		/* Make sure all parts of a bad packet are discarded */
 		if (((staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) ||
 		    (rxr->discard)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			rxr->rx_discarded++;
 			if (!eop)
 				rxr->discard = TRUE;
@@ -3455,7 +3455,7 @@ ixv_rxeof(struct ix_queue *que, int count)
 		/* Sending this frame? */
 		if (eop) {
 			sendmp->m_pkthdr.rcvif = ifp;
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			rxr->rx_packets++;
 			/* capture data for AIM */
 			rxr->bytes += sendmp->m_pkthdr.len;
diff --git a/sys/dev/ixl/i40e_alloc.h b/sys/dev/ixl/i40e_alloc.h
index 94673572bfb9..dc6fadd188f3 100755
--- a/sys/dev/ixl/i40e_alloc.h
+++ b/sys/dev/ixl/i40e_alloc.h
@@ -51,15 +51,16 @@ enum i40e_memory_type {
 };
 
 /* prototype for functions used for dynamic memory allocation */
-enum i40e_status_code i40e_allocate_dma(struct i40e_hw *hw,
+enum i40e_status_code i40e_allocate_dma_mem(struct i40e_hw *hw,
 					    struct i40e_dma_mem *mem,
-					    bus_size_t size, u32 alignment);
-enum i40e_status_code i40e_free_dma(struct i40e_hw *hw,
+					    enum i40e_memory_type type,
+					    u64 size, u32 alignment);
+enum i40e_status_code i40e_free_dma_mem(struct i40e_hw *hw,
 					struct i40e_dma_mem *mem);
-enum i40e_status_code i40e_allocate_virt(struct i40e_hw *hw,
+enum i40e_status_code i40e_allocate_virt_mem(struct i40e_hw *hw,
 					     struct i40e_virt_mem *mem,
 					     u32 size);
-enum i40e_status_code i40e_free_virt(struct i40e_hw *hw,
+enum i40e_status_code i40e_free_virt_mem(struct i40e_hw *hw,
 					 struct i40e_virt_mem *mem);
 
 #endif /* _I40E_ALLOC_H_ */
diff --git a/sys/dev/ixl/i40e_common.c b/sys/dev/ixl/i40e_common.c
index 143eeb757d9e..ad1f9457c98e 100755
--- a/sys/dev/ixl/i40e_common.c
+++ b/sys/dev/ixl/i40e_common.c
@@ -4375,8 +4375,8 @@ enum i40e_status_code i40e_aq_alternate_write_indirect(struct i40e_hw *hw,
 
 	cmd_resp->address = CPU_TO_LE32(addr);
 	cmd_resp->length = CPU_TO_LE32(dw_count);
-	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_WORD((u64)(uintptr_t)buffer));
-	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)(uintptr_t)buffer));
+	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_WORD((u64)buffer));
+	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)buffer));
 
 	status = i40e_asq_send_command(hw, &desc, buffer,
 				       I40E_LO_DWORD(4*dw_count), NULL);
@@ -4458,8 +4458,8 @@ enum i40e_status_code i40e_aq_alternate_read_indirect(struct i40e_hw *hw,
 
 	cmd_resp->address = CPU_TO_LE32(addr);
 	cmd_resp->length = CPU_TO_LE32(dw_count);
-	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_DWORD((u64)(uintptr_t)buffer));
-	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)(uintptr_t)buffer));
+	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_DWORD((u64)buffer));
+	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)buffer));
 
 	status = i40e_asq_send_command(hw, &desc, buffer,
 				       I40E_LO_DWORD(4*dw_count), NULL);
diff --git a/sys/dev/ixl/i40e_osdep.c b/sys/dev/ixl/i40e_osdep.c
index 30e2e57fcef3..214dbfc925dc 100755
--- a/sys/dev/ixl/i40e_osdep.c
+++ b/sys/dev/ixl/i40e_osdep.c
@@ -49,22 +49,22 @@ i40e_dmamap_cb(void *arg, bus_dma_segment_t * segs, int nseg, int error)
 }
 
 i40e_status
-i40e_allocate_virt(struct i40e_hw *hw, struct i40e_virt_mem *m, u32 size)
+i40e_allocate_virt_mem(struct i40e_hw *hw, struct i40e_virt_mem *mem, u32 size)
 {
-	m->va = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
-	return(m->va == NULL);
+	mem->va = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
+	return(mem->va == NULL);
 }
 
 i40e_status
-i40e_free_virt(struct i40e_hw *hw, struct i40e_virt_mem *m)
+i40e_free_virt_mem(struct i40e_hw *hw, struct i40e_virt_mem *mem)
 {
-	free(m->va, M_DEVBUF);
+	free(mem->va, M_DEVBUF);
 	return(0);
 }
 
 i40e_status
-i40e_allocate_dma(struct i40e_hw *hw, struct i40e_dma_mem *dma,
-	bus_size_t size, u32 alignment)
+i40e_allocate_dma_mem(struct i40e_hw *hw, struct i40e_dma_mem *mem,
+	enum i40e_memory_type type __unused, u64 size, u32 alignment)
 {
 	device_t	dev = ((struct i40e_osdep *)hw->back)->dev;
 	int		err;
@@ -81,25 +81,25 @@ i40e_allocate_dma(struct i40e_hw *hw, struct i40e_dma_mem *dma,
 			       BUS_DMA_ALLOCNOW, /* flags */
 			       NULL,	/* lockfunc */
 			       NULL,	/* lockfuncarg */
-			       &dma->tag);
+			       &mem->tag);
 	if (err != 0) {
 		device_printf(dev,
 		    "i40e_allocate_dma: bus_dma_tag_create failed, "
 		    "error %u\n", err);
 		goto fail_0;
 	}
-	err = bus_dmamem_alloc(dma->tag, (void **)&dma->va,
-			     BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dma->map);
+	err = bus_dmamem_alloc(mem->tag, (void **)&mem->va,
+			     BUS_DMA_NOWAIT | BUS_DMA_ZERO, &mem->map);
 	if (err != 0) {
 		device_printf(dev,
 		    "i40e_allocate_dma: bus_dmamem_alloc failed, "
 		    "error %u\n", err);
 		goto fail_1;
 	}
-	err = bus_dmamap_load(dma->tag, dma->map, dma->va,
+	err = bus_dmamap_load(mem->tag, mem->map, mem->va,
 			    size,
 			    i40e_dmamap_cb,
-			    &dma->pa,
+			    &mem->pa,
 			    BUS_DMA_NOWAIT);
 	if (err != 0) {
 		device_printf(dev,
@@ -107,28 +107,28 @@ i40e_allocate_dma(struct i40e_hw *hw, struct i40e_dma_mem *dma,
 		    "error %u\n", err);
 		goto fail_2;
 	}
-	dma->size = size;
-	bus_dmamap_sync(dma->tag, dma->map,
+	mem->size = size;
+	bus_dmamap_sync(mem->tag, mem->map,
 	    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 	return (0);
 fail_2:
-	bus_dmamem_free(dma->tag, dma->va, dma->map);
+	bus_dmamem_free(mem->tag, mem->va, mem->map);
 fail_1:
-	bus_dma_tag_destroy(dma->tag);
+	bus_dma_tag_destroy(mem->tag);
 fail_0:
-	dma->map = NULL;
-	dma->tag = NULL;
+	mem->map = NULL;
+	mem->tag = NULL;
 	return (err);
 }
 
 i40e_status
-i40e_free_dma(struct i40e_hw *hw, struct i40e_dma_mem *dma)
+i40e_free_dma_mem(struct i40e_hw *hw, struct i40e_dma_mem *mem)
 {
-	bus_dmamap_sync(dma->tag, dma->map,
+	bus_dmamap_sync(mem->tag, mem->map,
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-	bus_dmamap_unload(dma->tag, dma->map);
-	bus_dmamem_free(dma->tag, dma->va, dma->map);
-	bus_dma_tag_destroy(dma->tag);
+	bus_dmamap_unload(mem->tag, mem->map);
+	bus_dmamem_free(mem->tag, mem->va, mem->map);
+	bus_dma_tag_destroy(mem->tag);
 	return (0);
 }
 
diff --git a/sys/dev/ixl/i40e_osdep.h b/sys/dev/ixl/i40e_osdep.h
index 3bae1672d8ee..895bf83cd686 100755
--- a/sys/dev/ixl/i40e_osdep.h
+++ b/sys/dev/ixl/i40e_osdep.h
@@ -152,6 +152,7 @@ struct i40e_osdep
 	bus_space_tag_t		mem_bus_space_tag;
 	bus_space_handle_t	mem_bus_space_handle;
 	bus_size_t		mem_bus_space_size;
+	uint32_t		flush_reg;
 	struct device		*dev;
 };
 
@@ -170,9 +171,6 @@ struct i40e_hw; /* forward decl */
 u16	i40e_read_pci_cfg(struct i40e_hw *, u32);
 void	i40e_write_pci_cfg(struct i40e_hw *, u32, u16);
 
-#define i40e_allocate_dma_mem(h, m, unused, s, a) i40e_allocate_dma(h, m, s, a)
-#define i40e_free_dma_mem(h, m) i40e_free_dma(h, m)
-
 #define i40e_debug(h, m, s, ...)  i40e_debug_d(h, m, s, ##__VA_ARGS__)
 extern void i40e_debug_d(void *hw, u32 mask, char *fmt_str, ...);
 
@@ -180,8 +178,6 @@ struct i40e_virt_mem {
 	void *va;
 	u32 size;
 };
-#define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt(h, m, s)
-#define i40e_free_virt_mem(h, m) i40e_free_virt(h, m)
 
 /*
 ** This hardware supports either 16 or 32 byte rx descriptors
@@ -213,6 +209,13 @@ wr32_osdep(struct i40e_osdep *osdep, uint32_t reg, uint32_t value)
 	    osdep->mem_bus_space_handle, reg, value);
 }
 
+static __inline void
+ixl_flush_osdep(struct i40e_osdep *osdep)
+{
+
+	rd32_osdep(osdep, osdep->flush_reg);
+}
+
 #define rd32(a, reg)		rd32_osdep((a)->back, (reg))
 #define wr32(a, reg, value)	wr32_osdep((a)->back, (reg), (value))
 
@@ -226,9 +229,6 @@ wr32_osdep(struct i40e_osdep *osdep, uint32_t reg, uint32_t value)
                      ((struct i40e_osdep *)(a)->back)->mem_bus_space_handle, \
                      reg, value))
 
-#define ixl_flush(a) (\
-   bus_space_read_4( ((struct i40e_osdep *)(a)->back)->mem_bus_space_tag, \
-                     ((struct i40e_osdep *)(a)->back)->mem_bus_space_handle, \
-                     I40E_GLGEN_STAT))
+#define ixl_flush(a)		ixl_flush_osdep((a)->back)
 
 #endif /* _I40E_OSDEP_H_ */
diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c
index e381f4e4f529..8d1100c55f45 100755
--- a/sys/dev/ixl/if_ixl.c
+++ b/sys/dev/ixl/if_ixl.c
@@ -921,8 +921,10 @@ ixl_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
 			ifp->if_flags |= IFF_UP;
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
 				ixl_init(pf);
+#ifdef INET
 			if (!(ifp->if_flags & IFF_NOARP))
 				arp_ifinit(ifp, ifa);
+#endif
 		} else
 			error = ether_ioctl(ifp, command, data);
 		break;
@@ -2175,6 +2177,7 @@ ixl_allocate_pci_resources(struct ixl_pf *pf)
 	pf->osdep.mem_bus_space_handle =
 		rman_get_bushandle(pf->pci_mem);
 	pf->osdep.mem_bus_space_size = rman_get_size(pf->pci_mem);
+	pf->osdep.flush_reg = I40E_GLGEN_STAT;
 	pf->hw.hw_addr = (u8 *) &pf->osdep.mem_bus_space_handle;
 
 	pf->hw.back = &pf->osdep;
@@ -2273,6 +2276,10 @@ ixl_setup_interface(device_t dev, struct ixl_vsi *vsi)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = ixl_ioctl;
 
+#if __FreeBSD_version >= 1100000
+	if_setgetcounterfn(ifp, ixl_get_counter);
+#endif
+
 	ifp->if_transmit = ixl_mq_start;
 
 	ifp->if_qflush = ixl_qflush;
@@ -2591,7 +2598,7 @@ ixl_free_vsi(struct ixl_vsi *vsi)
 		IXL_TX_LOCK(txr);
 		ixl_free_que_tx(que);
 		if (txr->base)
-			i40e_free_dma(&pf->hw, &txr->dma);
+			i40e_free_dma_mem(&pf->hw, &txr->dma);
 		IXL_TX_UNLOCK(txr);
 		IXL_TX_LOCK_DESTROY(txr);
 
@@ -2600,7 +2607,7 @@ ixl_free_vsi(struct ixl_vsi *vsi)
 		IXL_RX_LOCK(rxr);
 		ixl_free_que_rx(que);
 		if (rxr->base)
-			i40e_free_dma(&pf->hw, &rxr->dma);
+			i40e_free_dma_mem(&pf->hw, &rxr->dma);
 		IXL_RX_UNLOCK(rxr);
 		IXL_RX_LOCK_DESTROY(rxr);
 		
@@ -2668,8 +2675,8 @@ ixl_setup_stations(struct ixl_pf *pf)
 		tsize = roundup2((que->num_desc *
 		    sizeof(struct i40e_tx_desc)) +
 		    sizeof(u32), DBA_ALIGN);
-		if (i40e_allocate_dma(&pf->hw,
-		    &txr->dma, tsize, DBA_ALIGN)) {
+		if (i40e_allocate_dma_mem(&pf->hw,
+		    &txr->dma, i40e_mem_reserved, tsize, DBA_ALIGN)) {
 			device_printf(dev,
 			    "Unable to allocate TX Descriptor memory\n");
 			error = ENOMEM;
@@ -2708,8 +2715,8 @@ ixl_setup_stations(struct ixl_pf *pf)
 		    device_get_nameunit(dev), que->me);
 		mtx_init(&rxr->mtx, rxr->mtx_name, NULL, MTX_DEF);
 
-		if (i40e_allocate_dma(&pf->hw,
-		    &rxr->dma, rsize, 4096)) {
+		if (i40e_allocate_dma_mem(&pf->hw,
+		    &rxr->dma, i40e_mem_reserved, rsize, 4096)) {
 			device_printf(dev,
 			    "Unable to allocate RX Descriptor memory\n");
 			error = ENOMEM;
@@ -2735,9 +2742,9 @@ ixl_setup_stations(struct ixl_pf *pf)
 		rxr = &que->rxr;
 		txr = &que->txr;
 		if (rxr->base)
-			i40e_free_dma(&pf->hw, &rxr->dma);
+			i40e_free_dma_mem(&pf->hw, &rxr->dma);
 		if (txr->base)
-			i40e_free_dma(&pf->hw, &txr->dma);
+			i40e_free_dma_mem(&pf->hw, &txr->dma);
 	}
 
 early:
@@ -3698,7 +3705,6 @@ ixl_update_stats_counters(struct ixl_pf *pf)
 {
 	struct i40e_hw	*hw = &pf->hw;
 	struct ixl_vsi *vsi = &pf->vsi;
-	struct ifnet	*ifp = vsi->ifp;
 
 	struct i40e_hw_port_stats *nsd = &pf->stats;
 	struct i40e_hw_port_stats *osd = &pf->stats_offsets;
@@ -3891,7 +3897,7 @@ ixl_update_stats_counters(struct ixl_pf *pf)
 
 	/* OS statistics */
 	// ERJ - these are per-port, update all vsis?
-	ifp->if_ierrors = nsd->crc_errors + nsd->illegal_bytes;
+	IXL_SET_IERRORS(vsi, nsd->crc_errors + nsd->illegal_bytes);
 }
 
 /*
@@ -4025,13 +4031,16 @@ void ixl_update_eth_stats(struct ixl_vsi *vsi)
 {
 	struct ixl_pf *pf = (struct ixl_pf *)vsi->back;
 	struct i40e_hw *hw = &pf->hw;
-	struct ifnet *ifp = vsi->ifp;
 	struct i40e_eth_stats *es;
 	struct i40e_eth_stats *oes;
+	int i;
+	uint64_t tx_discards;
+	struct i40e_hw_port_stats *nsd;
 	u16 stat_idx = vsi->info.stat_counter_idx;
 
 	es = &vsi->eth_stats;
 	oes = &vsi->eth_stats_offsets;
+	nsd = &pf->stats;
 
 	/* Gather up the stats that the hw collects */
 	ixl_stat_update32(hw, I40E_GLV_TEPC(stat_idx),
@@ -4076,22 +4085,27 @@ void ixl_update_eth_stats(struct ixl_vsi *vsi)
 			   &oes->tx_broadcast, &es->tx_broadcast);
 	vsi->stat_offsets_loaded = true;
 
-	/* Update ifnet stats */
-	ifp->if_ipackets = es->rx_unicast +
-	                   es->rx_multicast +
-			   es->rx_broadcast;
-	ifp->if_opackets = es->tx_unicast +
-	                   es->tx_multicast +
-			   es->tx_broadcast;
-	ifp->if_ibytes = es->rx_bytes;
-	ifp->if_obytes = es->tx_bytes;
-	ifp->if_imcasts = es->rx_multicast;
-	ifp->if_omcasts = es->tx_multicast;
+	tx_discards = es->tx_discards + nsd->tx_dropped_link_down;
+	for (i = 0; i < vsi->num_queues; i++)
+		tx_discards += vsi->queues[i].txr.br->br_drops;
 
-	ifp->if_oerrors = es->tx_errors;
-	ifp->if_iqdrops = es->rx_discards;
-	ifp->if_noproto = es->rx_unknown_protocol;
-	ifp->if_collisions = 0;
+	/* Update ifnet stats */
+	IXL_SET_IPACKETS(vsi, es->rx_unicast +
+	                   es->rx_multicast +
+			   es->rx_broadcast);
+	IXL_SET_OPACKETS(vsi, es->tx_unicast +
+	                   es->tx_multicast +
+			   es->tx_broadcast);
+	IXL_SET_IBYTES(vsi, es->rx_bytes);
+	IXL_SET_OBYTES(vsi, es->tx_bytes);
+	IXL_SET_IMCASTS(vsi, es->rx_multicast);
+	IXL_SET_OMCASTS(vsi, es->tx_multicast);
+
+	IXL_SET_OERRORS(vsi, es->tx_errors);
+	IXL_SET_IQDROPS(vsi, es->rx_discards + nsd->eth.rx_discards);
+	IXL_SET_OQDROPS(vsi, tx_discards);
+	IXL_SET_NOPROTO(vsi, es->rx_unknown_protocol);
+	IXL_SET_COLLISIONS(vsi, 0);
 }
 
 /**
diff --git a/sys/dev/ixl/if_ixlv.c b/sys/dev/ixl/if_ixlv.c
index 2a63387c802e..bd3c202dd814 100644
--- a/sys/dev/ixl/if_ixlv.c
+++ b/sys/dev/ixl/if_ixlv.c
@@ -755,8 +755,10 @@ ixlv_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			ifp->if_flags |= IFF_UP;
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
 				ixlv_init(sc);
+#ifdef INET
 			if (!(ifp->if_flags & IFF_NOARP))
 				arp_ifinit(ifp, ifa);
+#endif
 		} else
 			error = ether_ioctl(ifp, command, data);
 		break;
@@ -1135,6 +1137,7 @@ ixlv_allocate_pci_resources(struct ixlv_sc *sc)
 	sc->osdep.mem_bus_space_handle =
 		rman_get_bushandle(sc->pci_mem);
 	sc->osdep.mem_bus_space_size = rman_get_size(sc->pci_mem);
+	sc->osdep.flush_reg = I40E_VFGEN_RSTAT;
 	sc->hw.hw_addr = (u8 *) &sc->osdep.mem_bus_space_handle;
 
 	sc->hw.back = &sc->osdep;
@@ -1353,6 +1356,10 @@ ixlv_setup_interface(device_t dev, struct ixlv_sc *sc)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = ixlv_ioctl;
 
+#if __FreeBSD_version >= 1100000
+	if_setgetcounterfn(ifp, ixl_get_counter);
+#endif
+
 	ifp->if_transmit = ixl_mq_start;
 
 	ifp->if_qflush = ixl_qflush;
@@ -1457,8 +1464,8 @@ ixlv_setup_queues(struct ixlv_sc *sc)
 		tsize = roundup2((que->num_desc *
 		    sizeof(struct i40e_tx_desc)) +
 		    sizeof(u32), DBA_ALIGN);
-		if (i40e_allocate_dma(&sc->hw,
-		    &txr->dma, tsize, DBA_ALIGN)) {
+		if (i40e_allocate_dma_mem(&sc->hw,
+		    &txr->dma, i40e_mem_reserved, tsize, DBA_ALIGN)) {
 			device_printf(dev,
 			    "Unable to allocate TX Descriptor memory\n");
 			error = ENOMEM;
@@ -1497,8 +1504,8 @@ ixlv_setup_queues(struct ixlv_sc *sc)
 		    device_get_nameunit(dev), que->me);
 		mtx_init(&rxr->mtx, rxr->mtx_name, NULL, MTX_DEF);
 
-		if (i40e_allocate_dma(&sc->hw,
-		    &rxr->dma, rsize, 4096)) { //JFV - should this be DBA?
+		if (i40e_allocate_dma_mem(&sc->hw,
+		    &rxr->dma, i40e_mem_reserved, rsize, 4096)) { //JFV - should this be DBA?
 			device_printf(dev,
 			    "Unable to allocate RX Descriptor memory\n");
 			error = ENOMEM;
@@ -1525,9 +1532,9 @@ ixlv_setup_queues(struct ixlv_sc *sc)
 		rxr = &que->rxr;
 		txr = &que->txr;
 		if (rxr->base)
-			i40e_free_dma(&sc->hw, &rxr->dma);
+			i40e_free_dma_mem(&sc->hw, &rxr->dma);
 		if (txr->base)
-			i40e_free_dma(&sc->hw, &txr->dma);
+			i40e_free_dma_mem(&sc->hw, &txr->dma);
 	}
 
 early:
@@ -2346,7 +2353,7 @@ ixlv_free_queues(struct ixl_vsi *vsi)
 		IXL_TX_LOCK(txr);
 		ixl_free_que_tx(que);
 		if (txr->base)
-			i40e_free_dma(&sc->hw, &txr->dma);
+			i40e_free_dma_mem(&sc->hw, &txr->dma);
 		IXL_TX_UNLOCK(txr);
 		IXL_TX_LOCK_DESTROY(txr);
 
@@ -2355,7 +2362,7 @@ ixlv_free_queues(struct ixl_vsi *vsi)
 		IXL_RX_LOCK(rxr);
 		ixl_free_que_rx(que);
 		if (rxr->base)
-			i40e_free_dma(&sc->hw, &rxr->dma);
+			i40e_free_dma_mem(&sc->hw, &rxr->dma);
 		IXL_RX_UNLOCK(rxr);
 		IXL_RX_LOCK_DESTROY(rxr);
 		
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index 69be0085f07b..c240b026e355 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -264,6 +264,35 @@
 #define IXL_RX_UNLOCK(_sc)              mtx_unlock(&(_sc)->mtx)
 #define IXL_RX_LOCK_DESTROY(_sc)        mtx_destroy(&(_sc)->mtx)
 
+#if __FreeBSD_version >= 1100000
+#define IXL_SET_IPACKETS(vsi, count)	(vsi)->ipackets = (count)
+#define IXL_SET_IERRORS(vsi, count)	(vsi)->ierrors = (count)
+#define IXL_SET_OPACKETS(vsi, count)	(vsi)->opackets = (count)
+#define IXL_SET_OERRORS(vsi, count)	(vsi)->oerrors = (count)
+#define IXL_SET_COLLISIONS(vsi, count)	/* Do nothing; collisions is always 0. */
+#define IXL_SET_IBYTES(vsi, count)	(vsi)->ibytes = (count)
+#define IXL_SET_OBYTES(vsi, count)	(vsi)->obytes = (count)
+#define IXL_SET_IMCASTS(vsi, count)	(vsi)->imcasts = (count)
+#define IXL_SET_OMCASTS(vsi, count)	(vsi)->omcasts = (count)
+#define IXL_SET_IQDROPS(vsi, count)	(vsi)->iqdrops = (count)
+#define IXL_SET_OQDROPS(vsi, count)	(vsi)->iqdrops = (count)
+#define IXL_SET_NOPROTO(vsi, count)	(vsi)->noproto = (count)
+#else
+#define IXL_SET_IPACKETS(vsi, count)	(vsi)->ifp->if_ipackets = (count)
+#define IXL_SET_IERRORS(vsi, count)	(vsi)->ifp->if_ierrors = (count)
+#define IXL_SET_OPACKETS(vsi, count)	(vsi)->ifp->if_opackets = (count)
+#define IXL_SET_OERRORS(vsi, count)	(vsi)->ifp->if_oerrors = (count)
+#define IXL_SET_COLLISIONS(vsi, count)	(vsi)->ifp->if_collisions = (count)
+#define IXL_SET_IBYTES(vsi, count)	(vsi)->ifp->if_ibytes = (count)
+#define IXL_SET_OBYTES(vsi, count)	(vsi)->ifp->if_obytes = (count)
+#define IXL_SET_IMCASTS(vsi, count)	(vsi)->ifp->if_imcasts = (count)
+#define IXL_SET_OMCASTS(vsi, count)	(vsi)->ifp->if_omcasts = (count)
+#define IXL_SET_IQDROPS(vsi, count)	(vsi)->ifp->if_iqdrops = (count)
+#define IXL_SET_OQDROPS(vsi, odrops)	(vsi)->ifp->if_snd.ifq_drops = (odrops)
+#define IXL_SET_NOPROTO(vsi, count)	(vsi)->noproto = (count)
+#endif
+
+
 /*
  *****************************************************************************
  * vendor_info_array
@@ -447,6 +476,17 @@ struct ixl_vsi {
 	struct i40e_eth_stats	eth_stats;
 	struct i40e_eth_stats	eth_stats_offsets;
 	bool 			stat_offsets_loaded;
+	u64			ipackets;
+	u64			ierrors;
+	u64			opackets;
+	u64			oerrors;
+	u64			ibytes;
+	u64			obytes;
+	u64			imcasts;
+	u64			omcasts;
+	u64			iqdrops;
+	u64			oqdrops;
+	u64			noproto;
 
 	/* Driver statistics */
 	u64			hw_filters_del;
@@ -554,5 +594,8 @@ void	ixl_free_que_rx(struct ixl_queue *);
 #ifdef IXL_FDIR
 void	ixl_atr(struct ixl_queue *, struct tcphdr *, int);
 #endif
+#if __FreeBSD_version >= 1100000
+uint64_t ixl_get_counter(if_t ifp, ift_counter cnt);
+#endif
 
 #endif /* _IXL_H_ */
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index 12e09f776423..b804c76f9840 100755
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -783,8 +783,6 @@ ixl_get_tx_head(struct ixl_queue *que)
 bool
 ixl_txeof(struct ixl_queue *que)
 {
-	struct ixl_vsi		*vsi = que->vsi;
-	struct ifnet		*ifp = vsi->ifp;
 	struct tx_ring		*txr = &que->txr;
 	u32			first, last, head, done, processed;
 	struct ixl_tx_buf	*buf;
@@ -857,7 +855,6 @@ ixl_txeof(struct ixl_queue *que)
 			tx_desc = &txr->base[first];
 		}
 		++txr->packets;
-		++ifp->if_opackets;
 		/* See if there is more work now */
 		last = buf->eop_index;
 		if (last != -1) {
@@ -1085,10 +1082,12 @@ ixl_allocate_rx_data(struct ixl_queue *que)
 int
 ixl_init_rx_ring(struct ixl_queue *que)
 {
+	struct	rx_ring 	*rxr = &que->rxr;
+#if defined(INET6) || defined(INET)
 	struct ixl_vsi		*vsi = que->vsi;
 	struct ifnet		*ifp = vsi->ifp;
-	struct	rx_ring 	*rxr = &que->rxr;
 	struct lro_ctrl		*lro = &rxr->lro;
+#endif
 	struct ixl_rx_buf	*buf;
 	bus_dma_segment_t	pseg[1], hseg[1];
 	int			rsize, nsegs, error = 0;
@@ -1187,6 +1186,7 @@ ixl_init_rx_ring(struct ixl_queue *que)
 	rxr->bytes = 0;
 	rxr->discard = FALSE;
 
+#if defined(INET6) || defined(INET)
 	/*
 	** Now set up the LRO interface:
 	*/
@@ -1200,6 +1200,7 @@ ixl_init_rx_ring(struct ixl_queue *que)
 		rxr->lro_enabled = TRUE;
 		lro->ifp = vsi->ifp;
 	}
+#endif
 
 	bus_dmamap_sync(rxr->dma.tag, rxr->dma.map,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -1274,6 +1275,8 @@ ixl_free_que_rx(struct ixl_queue *que)
 static __inline void
 ixl_rx_input(struct rx_ring *rxr, struct ifnet *ifp, struct mbuf *m, u8 ptype)
 {
+
+#if defined(INET6) || defined(INET)
         /*
          * ATM LRO is only for IPv4/TCP packets and TCP checksum of the packet
          * should be computed by hardware. Also it should not have VLAN tag in
@@ -1293,6 +1296,7 @@ ixl_rx_input(struct rx_ring *rxr, struct ifnet *ifp, struct mbuf *m, u8 ptype)
                         if (tcp_lro_rx(&rxr->lro, m, 0) == 0)
                                 return;
         }
+#endif
 	IXL_RX_UNLOCK(rxr);
         (*ifp->if_input)(ifp, m);
 	IXL_RX_LOCK(rxr);
@@ -1350,8 +1354,10 @@ ixl_rxeof(struct ixl_queue *que, int count)
 	struct ixl_vsi		*vsi = que->vsi;
 	struct rx_ring		*rxr = &que->rxr;
 	struct ifnet		*ifp = vsi->ifp;
+#if defined(INET6) || defined(INET)
 	struct lro_ctrl		*lro = &rxr->lro;
 	struct lro_entry	*queued;
+#endif
 	int			i, nextp, processed = 0;
 	union i40e_rx_desc	*cur;
 	struct ixl_rx_buf	*rbuf, *nbuf;
@@ -1411,7 +1417,6 @@ ixl_rxeof(struct ixl_queue *que, int count)
 		** error results.
 		*/
                 if (eop && (error & (1 << I40E_RX_DESC_ERROR_RXE_SHIFT))) {
-			ifp->if_ierrors++;
 			rxr->discarded++;
 			ixl_rx_discard(rxr, i);
 			goto next_desc;
@@ -1520,7 +1525,6 @@ ixl_rxeof(struct ixl_queue *que, int count)
 		if (eop) {
 			sendmp->m_pkthdr.rcvif = ifp;
 			/* gather stats */
-			ifp->if_ipackets++;
 			rxr->rx_packets++;
 			rxr->rx_bytes += sendmp->m_pkthdr.len;
 			/* capture data for dynamic ITR adjustment */
@@ -1559,6 +1563,7 @@ ixl_rxeof(struct ixl_queue *que, int count)
 
 	rxr->next_check = i;
 
+#if defined(INET6) || defined(INET)
 	/*
 	 * Flush any outstanding LRO work
 	 */
@@ -1566,6 +1571,7 @@ ixl_rxeof(struct ixl_queue *que, int count)
 		SLIST_REMOVE_HEAD(&lro->lro_active, next);
 		tcp_lro_flush(lro, queued);
 	}
+#endif
 
 	IXL_RX_UNLOCK(rxr);
 	return (FALSE);
@@ -1614,3 +1620,43 @@ ixl_rx_checksum(struct mbuf * mp, u32 status, u32 error, u8 ptype)
 	}
 	return;
 }
+
+#if __FreeBSD_version >= 1100000
+uint64_t
+ixl_get_counter(if_t ifp, ift_counter cnt)
+{
+	struct ixl_vsi *vsi;
+
+	vsi = if_getsoftc(ifp);
+
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (vsi->ipackets);
+	case IFCOUNTER_IERRORS:
+		return (vsi->ierrors);
+	case IFCOUNTER_OPACKETS:
+		return (vsi->opackets);
+	case IFCOUNTER_OERRORS:
+		return (vsi->oerrors);
+	case IFCOUNTER_COLLISIONS:
+		/* Collisions are by standard impossible in 40G/10G Ethernet */
+		return (0);
+	case IFCOUNTER_IBYTES:
+		return (vsi->ibytes);
+	case IFCOUNTER_OBYTES:
+		return (vsi->obytes);
+	case IFCOUNTER_IMCASTS:
+		return (vsi->imcasts);
+	case IFCOUNTER_OMCASTS:
+		return (vsi->omcasts);
+	case IFCOUNTER_IQDROPS:
+		return (vsi->iqdrops);
+	case IFCOUNTER_OQDROPS:
+		return (vsi->oqdrops);
+	case IFCOUNTER_NOPROTO:
+		return (vsi->noproto);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
+#endif
diff --git a/sys/dev/ixl/ixlvc.c b/sys/dev/ixl/ixlvc.c
index 1f912b5db46c..ef69a82f610b 100644
--- a/sys/dev/ixl/ixlvc.c
+++ b/sys/dev/ixl/ixlvc.c
@@ -837,22 +837,33 @@ ixlv_request_stats(struct ixlv_sc *sc)
 void
 ixlv_update_stats_counters(struct ixlv_sc *sc, struct i40e_eth_stats *es)
 {
-	struct ifnet *ifp = sc->vsi.ifp;
+	struct ixl_vsi *vsi;
+	uint64_t tx_discards;
+	int i;
 
-	ifp->if_ipackets = es->rx_unicast +
+	vsi = &sc->vsi;
+
+	tx_discards = es->tx_discards;
+	for (i = 0; i < sc->vsi.num_queues; i++)
+		tx_discards += sc->vsi.queues[i].txr.br->br_drops;
+
+	/* Update ifnet stats */
+	IXL_SET_IPACKETS(vsi, es->rx_unicast +
 	                   es->rx_multicast +
-			   es->rx_broadcast;
-	ifp->if_opackets = es->tx_unicast +
+			   es->rx_broadcast);
+	IXL_SET_OPACKETS(vsi, es->tx_unicast +
 	                   es->tx_multicast +
-			   es->tx_broadcast;
-	ifp->if_ibytes = es->rx_bytes;
-	ifp->if_obytes = es->tx_bytes;
-	ifp->if_imcasts = es->rx_multicast;
-	ifp->if_omcasts = es->tx_multicast;
+			   es->tx_broadcast);
+	IXL_SET_IBYTES(vsi, es->rx_bytes);
+	IXL_SET_OBYTES(vsi, es->tx_bytes);
+	IXL_SET_IMCASTS(vsi, es->rx_multicast);
+	IXL_SET_OMCASTS(vsi, es->tx_multicast);
 
-	ifp->if_oerrors = es->tx_errors;
-	ifp->if_iqdrops = es->rx_discards;
-	ifp->if_noproto = es->rx_unknown_protocol;
+	IXL_SET_OERRORS(vsi, es->tx_errors);
+	IXL_SET_IQDROPS(vsi, es->rx_discards);
+	IXL_SET_OQDROPS(vsi, tx_discards);
+	IXL_SET_NOPROTO(vsi, es->rx_unknown_protocol);
+	IXL_SET_COLLISIONS(vsi, 0);
 
 	sc->vsi.eth_stats = *es;
 }
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
index 6300df6ef290..35b25265c979 100644
--- a/sys/dev/jme/if_jme.c
+++ b/sys/dev/jme/if_jme.c
@@ -1947,7 +1947,7 @@ jme_watchdog(struct jme_softc *sc)
 	ifp = sc->jme_ifp;
 	if ((sc->jme_flags & JME_FLAG_LINK) == 0) {
 		if_printf(sc->jme_ifp, "watchdog timeout (missed link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		jme_init_locked(sc);
 		return;
@@ -1962,7 +1962,7 @@ jme_watchdog(struct jme_softc *sc)
 	}
 
 	if_printf(sc->jme_ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	jme_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -2281,7 +2281,7 @@ jme_link_task(void *arg, int pending)
 				m_freem(txd->tx_m);
 				txd->tx_m = NULL;
 				txd->tx_ndesc = 0;
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			}
 		}
 	}
@@ -2449,13 +2449,13 @@ jme_txeof(struct jme_softc *sc)
 			break;
 
 		if ((status & (JME_TD_TMOUT | JME_TD_RETRY_EXP)) != 0)
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		else {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			if ((status & JME_TD_COLLISION) != 0)
-				ifp->if_collisions +=
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
 				    le32toh(txd->tx_desc->buflen) &
-				    JME_TD_BUF_LEN_MASK;
+				    JME_TD_BUF_LEN_MASK);
 		}
 		/*
 		 * Only the first descriptor of multi-descriptor
@@ -2526,7 +2526,7 @@ jme_rxeof(struct jme_softc *sc)
 	nsegs = JME_RX_NSEGS(status);
 	sc->jme_cdata.jme_rxlen = JME_RX_BYTES(status) - JME_RX_PAD_BYTES;
 	if ((status & JME_RX_ERR_STAT) != 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		jme_discard_rxbuf(sc, sc->jme_cdata.jme_rx_cons);
 #ifdef JME_SHOW_ERRORS
 		device_printf(sc->jme_dev, "%s : receive error = 0x%b\n",
@@ -2543,7 +2543,7 @@ jme_rxeof(struct jme_softc *sc)
 		mp = rxd->rx_m;
 		/* Add a new receive buffer to the ring. */
 		if (jme_newbuf(sc, rxd) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* Reuse buffer. */
 			for (; count < nsegs; count++) {
 				jme_discard_rxbuf(sc, cons);
@@ -2626,7 +2626,7 @@ jme_rxeof(struct jme_softc *sc)
 				m->m_flags |= M_VLANTAG;
 			}
 
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			/* Pass it on. */
 			JME_UNLOCK(sc);
 			(*ifp->if_input)(ifp, m);
diff --git a/sys/dev/le/am7990.c b/sys/dev/le/am7990.c
index d74d3b836264..a21be28a4c13 100644
--- a/sys/dev/le/am7990.c
+++ b/sys/dev/le/am7990.c
@@ -272,7 +272,7 @@ am7990_rint(struct lance_softc *sc)
 			bix = 0;
 
 		if (m != NULL) {
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 #ifdef LANCE_REVC_BUG
 			/*
@@ -296,7 +296,7 @@ am7990_rint(struct lance_softc *sc)
 			(*ifp->if_input)(ifp, m);
 			LE_LOCK(sc);
 		} else
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	sc->sc_last_rd = bix;
@@ -352,22 +352,22 @@ am7990_tint(struct lance_softc *sc)
 					if_printf(ifp, "lost carrier\n");
 			}
 			if (tmd.tmd3 & LE_T3_LCOL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (tmd.tmd3 & LE_T3_RTRY) {
 #ifdef LEDEBUG
 				if_printf(ifp, "excessive collisions, tdr %d\n",
 				    tmd.tmd3 & LE_T3_TDR_MASK);
 #endif
-				ifp->if_collisions += 16;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 16);
 			}
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else {
 			if (tmd.tmd1_bits & LE_T1_ONE)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			else if (tmd.tmd1_bits & LE_T1_MORE)
 				/* Real number is unknown. */
-				ifp->if_collisions += 2;
-			ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 2);
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		if (++bix == sc->sc_ntbuf)
@@ -394,7 +394,7 @@ am7990_intr(void *arg)
 	LE_LOCK(sc);
 
 	if (sc->sc_hwintr && (*sc->sc_hwintr)(sc) == -1) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
@@ -426,19 +426,19 @@ am7990_intr(void *arg)
 #ifdef LEDEBUG
 			if_printf(ifp, "babble\n");
 #endif
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 #if 0
 		if (isr & LE_C0_CERR) {
 			if_printf(ifp, "collision error\n");
-			ifp->if_collisions++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 #endif
 		if (isr & LE_C0_MISS) {
 #ifdef LEDEBUG
 			if_printf(ifp, "missed packet\n");
 #endif
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		if (isr & LE_C0_MERR) {
 			if_printf(ifp, "memory error\n");
@@ -450,14 +450,14 @@ am7990_intr(void *arg)
 
 	if ((isr & LE_C0_RXON) == 0) {
 		if_printf(ifp, "receiver disabled\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
 	}
 	if ((isr & LE_C0_TXON) == 0) {
 		if_printf(ifp, "transmitter disabled\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
diff --git a/sys/dev/le/am79900.c b/sys/dev/le/am79900.c
index 08449e5991c9..5ea82284535c 100644
--- a/sys/dev/le/am79900.c
+++ b/sys/dev/le/am79900.c
@@ -313,7 +313,7 @@ am79900_rint(struct lance_softc *sc)
 			bix = 0;
 
 		if (m != NULL) {
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 #if defined(__i386__) && !defined(PC98)
 			/*
@@ -333,7 +333,7 @@ am79900_rint(struct lance_softc *sc)
 			(*ifp->if_input)(ifp, m);
 			LE_LOCK(sc);
 		} else
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	sc->sc_last_rd = bix;
@@ -391,21 +391,21 @@ am79900_tint(struct lance_softc *sc)
 					if_printf(ifp, "lost carrier\n");
 			}
 			if (tmd2 & LE_T2_LCOL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (tmd2 & LE_T2_RTRY) {
 #ifdef LEDEBUG
 				if_printf(ifp, "excessive collisions\n");
 #endif
-				ifp->if_collisions += 16;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 16);
 			}
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else {
 			if (tmd1 & LE_T1_ONE)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			else if (tmd1 & LE_T1_MORE)
 				/* Real number is unknown. */
-				ifp->if_collisions += 2;
-			ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 2);
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		if (++bix == sc->sc_ntbuf)
@@ -432,7 +432,7 @@ am79900_intr(void *arg)
 	LE_LOCK(sc);
 
 	if (sc->sc_hwintr && (*sc->sc_hwintr)(sc) == -1) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
@@ -464,19 +464,19 @@ am79900_intr(void *arg)
 #ifdef LEDEBUG
 			if_printf(ifp, "babble\n");
 #endif
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 #if 0
 		if (isr & LE_C0_CERR) {
 			if_printf(ifp, "collision error\n");
-			ifp->if_collisions++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 #endif
 		if (isr & LE_C0_MISS) {
 #ifdef LEDEBUG
 			if_printf(ifp, "missed packet\n");
 #endif
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		if (isr & LE_C0_MERR) {
 			if_printf(ifp, "memory error\n");
@@ -488,14 +488,14 @@ am79900_intr(void *arg)
 
 	if ((isr & LE_C0_RXON) == 0) {
 		if_printf(ifp, "receiver disabled\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
 	}
 	if ((isr & LE_C0_TXON) == 0) {
 		if_printf(ifp, "transmitter disabled\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		lance_init_locked(sc);
 		LE_UNLOCK(sc);
 		return;
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index 2a2b0e0fa956..38be317aa577 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -446,7 +446,7 @@ lance_watchdog(void *xsc)
 	}
 
 	if_printf(ifp, "device timeout\n");
-	++ifp->if_oerrors;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	lance_init_locked(sc);
 }
 
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 94f326f8de2a..9aef1313c598 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -916,7 +916,7 @@ lge_rxeof(sc, cnt)
 	 	 * comes up in the ring.
 		 */
 		if (rxctl & LGE_RXCTL_ERRMASK) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			lge_newbuf(sc, &LGE_RXTAIL(sc), m);
 			continue;
 		}
@@ -928,7 +928,7 @@ lge_rxeof(sc, cnt)
 			if (m0 == NULL) {
 				device_printf(sc->lge_dev, "no receive buffers "
 				    "available -- packet dropped!\n");
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				continue;
 			}
 			m = m0;
@@ -937,7 +937,7 @@ lge_rxeof(sc, cnt)
 			m->m_pkthdr.len = m->m_len = total_len;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		/* Do IP checksum checking. */
 		if (rxsts & LGE_RXSTS_ISIP)
@@ -1003,7 +1003,7 @@ lge_txeof(sc)
 	while (idx != sc->lge_cdata.lge_tx_prod && txdone) {
 		cur_tx = &sc->lge_ldata->lge_tx_list[idx];
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if (cur_tx->lge_mbuf != NULL) {
 			m_freem(cur_tx->lge_mbuf);
 			cur_tx->lge_mbuf = NULL;
@@ -1036,9 +1036,9 @@ lge_tick(xsc)
 	LGE_LOCK_ASSERT(sc);
 
 	CSR_WRITE_4(sc, LGE_STATSIDX, LGE_STATS_SINGLE_COLL_PKTS);
-	ifp->if_collisions += CSR_READ_4(sc, LGE_STATSVAL);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, CSR_READ_4(sc, LGE_STATSVAL));
 	CSR_WRITE_4(sc, LGE_STATSIDX, LGE_STATS_MULTI_COLL_PKTS);
-	ifp->if_collisions += CSR_READ_4(sc, LGE_STATSVAL);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, CSR_READ_4(sc, LGE_STATSVAL));
 
 	if (!sc->lge_link) {
 		mii = device_get_softc(sc->lge_miibus);
@@ -1504,7 +1504,7 @@ lge_watchdog(sc)
 	LGE_LOCK_ASSERT(sc);
 	ifp = sc->lge_ifp;
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	lge_stop(sc);
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 766fdae392ab..9e1463b0c56a 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -71,7 +71,6 @@
  *
  * Send bug reports and improvements to <boggs@boggs.palo-alto.ca.us>.
  */
-#ifdef __FreeBSD__
 # include <sys/param.h>	/* OS version */
 # define  IFNET 1
 # include "opt_inet.h"	/* INET */
@@ -90,15 +89,9 @@
 #  define NETGRAPH 0
 # endif
 # define  P2P 0		/* not in FreeBSD */
-# if (__FreeBSD_version >= 500000)
-#  define NSPPP 1	/* No count devices in FreeBSD 5 */
-#  include "opt_bpf.h"	/* DEV_BPF */
-#  define NBPFILTER DEV_BPF
-# else  /* FreeBSD-4 */
-# include "sppp.h"	/* NSPPP */
-#  include "bpf.h"	/* NBPF */
-#  define NBPFILTER NBPF
-# endif
+# define NSPPP 1	/* No count devices in FreeBSD 5 */
+# include "opt_bpf.h"	/* DEV_BPF */
+# define NBPFILTER DEV_BPF
 # define  GEN_HDLC 0	/* not in FreeBSD */
 #
 # include <sys/systm.h>
@@ -121,16 +114,9 @@
 # include <sys/rman.h>
 # include <vm/vm.h>
 # include <vm/pmap.h>
-# if (__FreeBSD_version >= 700000)
-#  include <sys/priv.h>
-# endif
-# if (__FreeBSD_version >= 500000)
+# include <sys/priv.h>
 #  include <sys/mutex.h>
 #  include <dev/pci/pcivar.h>
-# else /* FreeBSD-4 */
-#  include <sys/proc.h>
-#  include <pci/pcivar.h>
-# endif
 # if NETGRAPH
 #  include <netgraph/ng_message.h>
 #  include <netgraph/netgraph.h>
@@ -147,180 +133,10 @@
 # endif
 /* and finally... */
 # include <dev/lmc/if_lmc.h>
-#endif /*__FreeBSD__*/
 
-#ifdef __NetBSD__
-# include <sys/param.h>	/* OS version */
-# define  IFNET 1
-# include "opt_inet.h"	/* INET6, INET */
-# define  NETGRAPH 0	/* not in NetBSD */
-# include "sppp.h"	/* NSPPP */
-# define  P2P 0		/* not in NetBSD */
-# include "opt_altq_enabled.h" /* ALTQ */
-# include "bpfilter.h"	/* NBPFILTER */
-# define  GEN_HDLC 0	/* not in NetBSD */
-#
-# include <sys/systm.h>
-# include <sys/kernel.h>
-# include <sys/lkm.h>
-# include <sys/mbuf.h>
-# include <sys/socket.h>
-# include <sys/sockio.h>
-# include <sys/device.h>
-# include <sys/lock.h>
-# include <net/if.h>
-# include <net/if_var.h>
-# include <net/if_types.h>
-# include <net/if_media.h>
-# include <net/netisr.h>
-# include <machine/bus.h>
-# include <machine/intr.h>
-# include <dev/pci/pcivar.h>
-# if (__NetBSD_Version__ >= 106000000)
-#  include <uvm/uvm_extern.h>
-# else
-#  include <vm/vm.h>
-# endif
-# if (INET || INET6)
-#  include <netinet/in.h>
-#  include <netinet/in_var.h>
-# endif
-# if NSPPP
-#  if (__NetBSD_Version__ >= 106000000)
-#   include <net/if_spppvar.h>
-#  else
-#   include <net/if_sppp.h>
-#  endif
-# endif
-# if NBPFILTER
-#  include <net/bpf.h>
-# endif
-/* and finally... */
-# include "if_lmc.h"
-#endif /*__NetBSD__*/
 
-#ifdef __OpenBSD__
-# include <sys/param.h>	/* OS version */
-# define  IFNET 1
-/* -DINET  is passed on the compiler command line */
-/* -DINET6 is passed on the compiler command line */
-# define  NETGRAPH 0	/* not in OpenBSD */
-# include "sppp.h"	/* NSPPP */
-# define  P2P 0		/* not in OpenBSD */
-/* -DALTQ  is passed on the compiler command line */
-# include "bpfilter.h"	/* NBPFILTER */
-# define  GEN_HDLC 0	/* not in OpenBSD */
-#
-# include <sys/systm.h>
-# include <sys/kernel.h>
-# include <sys/conf.h>
-# include <sys/exec.h>
-# include <sys/lkm.h>
-# include <sys/mbuf.h>
-# include <sys/socket.h>
-# include <sys/sockio.h>
-# include <sys/device.h>
-# include <sys/lock.h>
-# include <net/if.h>
-# include <net/if_types.h>
-# include <net/if_media.h>
-# include <net/netisr.h>
-# include <machine/bus.h>
-# include <machine/intr.h>
-# include <dev/pci/pcivar.h>
-# if (OpenBSD >= 200206)
-#  include <uvm/uvm_extern.h>
-# else
-#  include <vm/vm.h>
-# endif
-# if (INET || INET6)
-#  include <netinet/in.h>
-#  include <netinet/in_var.h>
-# endif
-# if NSPPP
-#  include <net/if_sppp.h>
-# endif
-# if NBPFILTER
-#  include <net/bpf.h>
-# endif
-/* and finally... */
-# include "if_lmc.h"
-#endif /*__OpenBSD__*/
 
-#ifdef __bsdi__
-# include <sys/param.h>	/* OS version */
-# define  IFNET 1
-/* -DINET  is passed on the compiler command line */
-/* -DINET6 is passed on the compiler command line */
-# define  NETGRAPH 0	/* not in BSD/OS */
-# define  NSPPP 0	/* not in BSD/OS */
-/* -DPPP   is passed on the compiler command line */
-/* -DCISCO_HDLC is passed on the compiler command line */
-/* -DFR    is passed on the compiler command line */
-# if (PPP || CISCO_HDLC || FR)
-#  define P2P 1
-# else
-#  define P2P 0
-# endif
-# define  ALTQ 0	/* not in BSD/OS */
-# include "bpfilter.h"	/* NBPFILTER */
-# define  GEN_HDLC 0	/* not in BSD/OS */
-#
-# include <sys/kernel.h>
-# include <sys/malloc.h>
-# include <sys/mbuf.h>
-# include <sys/socket.h>
-# include <sys/sockio.h>
-# include <sys/device.h>
-# include <sys/lock.h>
-# include <net/if.h>
-# include <net/if_types.h>
-# include <net/if_media.h>
-# include <net/netisr.h>
-# include <vm/vm.h>
-# include <i386/isa/dma.h>
-# include <i386/isa/isavar.h>
-# include <i386/include/cpu.h>
-# include <i386/pci/pci.h>
-# if (INET || INET6)
-#  include <netinet/in.h>
-#  include <netinet/in_var.h>
-# endif
-# if P2P
-#  include <net/if_p2p.h>
-#  include <sys/ttycom.h>
-# endif
-# if NBPFILTER
-#  include <net/bpf.h>
-# endif
-/* and finally... */
-# include "if_lmc.h"
-#endif /*__bsdi__*/
 
-#ifdef __linux__
-# include <linux/config.h>
-# if (CONFIG_HDLC || CONFIG_HDLC_MODULE)
-#  define GEN_HDLC 1
-# else
-#  define GEN_HDLC 0
-# endif
-# define IFNET 0	/* different in Linux */
-# define NETGRAPH 0	/* not in Linux */
-# define NSPPP 0	/* different in Linux */
-# define P2P 0		/* not in Linux */
-# define ALTQ 0		/* different in Linux */
-# define NBPFILTER 0	/* different in Linux */
-#
-# include <linux/pci.h>
-# include <linux/delay.h>
-# include <linux/netdevice.h>
-# include <linux/if_arp.h>
-# if GEN_HDLC
-#  include <linux/hdlc.h>
-# endif
-/* and finally... */
-# include "if_lmc.h"
-#endif /* __linux__ */
 
 /* The SROM is a generic 93C46 serial EEPROM (64 words by 16 bits). */
 /* Data is set up before the RISING edge of CLK; CLK is parked low. */
@@ -2484,44 +2300,6 @@ struct card t1_card =
 
 /* RAWIP is raw IP packets (v4 or v6) in HDLC frames with NO HEADERS. */
 /* No HDLC Address/Control fields!  No line control protocol at all!  */
-/* This code is BSD/ifnet-specific; Linux and Netgraph also do RAWIP. */
-
-#if IFNET
-
-# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\
-        defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__))
-static void
-netisr_dispatch(int isr, struct mbuf *mbuf)
-  {
-  struct ifqueue *intrq = NULL;
-  int qfull = 0;
-
-#if INET
-  if (isr == NETISR_IP)   intrq = &ipintrq;
-#endif
-#if INET6
-  if (isr == NETISR_IPV6) intrq = &ip6intrq;
-#endif
-
-  if ((intrq != NULL) && ((qfull = IF_QFULL(intrq)) == 0))
-    {
-    /* rxintr_cleanup() ENQUEUES in a hard interrupt. */
-    /* networking code DEQUEUES in a soft interrupt. */
-    /* Some BSD QUEUE routines are not interrupt-safe. */
-    DISABLE_INTR; /* noop in FreeBSD */
-    IF_ENQUEUE(intrq, mbuf);
-    ENABLE_INTR;
-    schednetisr(isr); /* schedule a soft interrupt */
-    }
-  else
-    {
-    m_freem(mbuf);
-    if ((intrq != NULL) && (qfull != 0))
-      IF_DROP(intrq);
-    }
-  }
-# endif /* ((__FreeBSD__ && (__FreeBSD_version < 500000)) || */
-           /* __NetBSD__ || __OpenBSD__ || __bsdi__) */
 
 /* rxintr_cleanup calls this to give a newly arrived pkt to higher levels. */
 static void
@@ -2549,20 +2327,12 @@ lmc_raw_input(struct ifnet *ifp, struct mbuf *mbuf)
     }
   }
 
-#endif /* IFNET */
-
-/* There are TWO VERSIONS of interrupt/DMA code: Linux & BSD.
- * Handling Linux and the BSDs with CPP directives would
- *  make the code unreadable, so there are two versions.
- * Conceptually, the two versions do the same thing and
- *  core_interrupt() doesn't know they are different.
- *
+/*
  * We are "standing on the head of a pin" in these routines.
  * Tulip CSRs can be accessed, but nothing else is interrupt-safe!
  * Do NOT access: MII, GPIO, SROM, BIOSROM, XILINX, SYNTH, or DAC.
  */
 
-#if BSD /* BSD version of interrupt/DMA code */
 
 /* Singly-linked tail-queues hold mbufs with active DMA.
  * For RX, single mbuf clusters; for TX, mbuf chains are queued.
@@ -2593,7 +2363,6 @@ mbuf_dequeue(struct desc_ring *ring)
   return m;
   }
 
-# ifdef __FreeBSD__
 static void /* *** FreeBSD ONLY *** Callout from bus_dmamap_load() */
 fbsd_dmamap_load(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
   {
@@ -2602,7 +2371,6 @@ fbsd_dmamap_load(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
   ring->segs[0] = segs[0];
   ring->segs[1] = segs[1];
   }
-# endif
 
 /* Initialize a DMA descriptor ring. */
 static int  /* BSD version */
@@ -2620,15 +2388,12 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs)
     return EINVAL;
     }
 
-#ifdef __FreeBSD__
 
   /* Create a DMA tag for descriptors and buffers. */
   if ((error = bus_dma_tag_create(bus_get_dma_tag(sc->dev),
    4, 0, BUS_SPACE_MAXADDR_32BIT,
    BUS_SPACE_MAXADDR, NULL, NULL, PAGE_SIZE, 2, PAGE_SIZE, BUS_DMA_ALLOCNOW,
-# if (__FreeBSD_version >= 502000)
    NULL, NULL,
-# endif
    &ring->tag)))
     {
     printf("%s: bus_dma_tag_create() failed: error %d\n", NAME_UNIT, error);
@@ -2662,70 +2427,6 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs)
       return error;
       }
 
-#elif (defined(__NetBSD__) || defined(__OpenBSD__))
-
-  /* Use the DMA tag passed to attach() for descriptors and buffers. */
-  ring->tag = sc->pa_dmat;
-
-  /* Allocate wired physical memory for DMA descriptor array. */
-  if ((error = bus_dmamem_alloc(ring->tag, size_descs, PAGE_SIZE, 0,
-   ring->segs, 1, &ring->nsegs, BUS_DMA_NOWAIT)))
-    {
-    printf("%s: bus_dmamem_alloc() failed; error %d\n", NAME_UNIT, error);
-    return error;
-    }
-
-  /* Map physical address to kernel virtual address. */
-  if ((error = bus_dmamem_map(ring->tag, ring->segs, ring->nsegs,
-   size_descs, (caddr_t *)&ring->first, BUS_DMA_NOWAIT | BUS_DMA_COHERENT)))
-    {
-    printf("%s: bus_dmamem_map() failed; error %d\n", NAME_UNIT, error);
-    return error;
-    }
-  descs = ring->first; /* suppress compiler warning about aliasing */
-  memset(descs, 0, size_descs);
-
-  /* Allocate dmamap for PCI access to DMA descriptor array. */
-  if ((error = bus_dmamap_create(ring->tag, size_descs, 1,
-   size_descs, 0, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &ring->map)))
-    {
-    printf("%s: bus_dmamap_create() failed; error %d\n", NAME_UNIT, error);
-    return error;
-    }
-
-  /* Map kernel virtual address to PCI address for DMA descriptor array. */
-  if ((error = bus_dmamap_load(ring->tag, ring->map, descs, size_descs,
-   0, BUS_DMA_NOWAIT)))
-    {
-    printf("%s: bus_dmamap_load() failed; error %d\n", NAME_UNIT, error);
-    return error;
-    }
-  ring->dma_addr = ring->map->dm_segs[0].ds_addr;
-
-  /* Allocate dmamaps for each DMA descriptor. */
-  for (i=0; i<num_descs; i++)
-    if ((error = bus_dmamap_create(ring->tag, MAX_DESC_LEN, 2,
-     MAX_CHUNK_LEN, 0, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &descs[i].map)))
-      {
-      printf("%s: bus_dmamap_create() failed; error %d\n", NAME_UNIT, error);
-      return error;
-      }
-
-#elif defined(__bsdi__)
-
-  /* Allocate wired physical memory for DMA descriptor array. */
-  if ((ring->first = malloc(size_descs, M_DEVBUF, M_NOWAIT)) == NULL)
-    {
-    printf("%s: malloc() failed for DMA descriptor array\n", NAME_UNIT);
-    return ENOMEM;
-    }
-  descs = ring->first;
-  memset(descs, 0, size_descs);
-
-  /* Map kernel virtual address to PCI address for DMA descriptor array. */
-  ring->dma_addr = vtophys(descs); /* Relax! BSD/OS only. */
-
-#endif
 
   ring->read  = descs;
   ring->write = descs;
@@ -2765,7 +2466,6 @@ destroy_ring(softc_t *sc, struct desc_ring *ring)
     if (ring->read++ == ring->last) ring->read = ring->first;
     }
 
-#ifdef __FreeBSD__
 
   /* Free the dmamaps of all DMA descriptors. */
   for (desc=ring->first; desc!=ring->last+1; desc++)
@@ -2782,33 +2482,6 @@ destroy_ring(softc_t *sc, struct desc_ring *ring)
   if (ring->tag != NULL)
     bus_dma_tag_destroy(ring->tag);
 
-#elif (defined(__NetBSD__) || defined(__OpenBSD__))
-
-  /* Free the dmamaps of all DMA descriptors. */
-  for (desc=ring->first; desc!=ring->last+1; desc++)
-    if (desc->map != NULL)
-      bus_dmamap_destroy(ring->tag, desc->map);
-
-  /* Unmap PCI address for DMA descriptor array. */
-  if (ring->dma_addr != 0)
-    bus_dmamap_unload(ring->tag, ring->map);
-  /* Free dmamap for DMA descriptor array. */
-  if (ring->map != NULL)
-    bus_dmamap_destroy(ring->tag, ring->map);
-  /* Unmap kernel address for DMA descriptor array. */
-  if (ring->first != NULL)
-    bus_dmamem_unmap(ring->tag, (caddr_t)ring->first, ring->size_descs);
-  /* Free kernel memory for DMA descriptor array. */
-  if (ring->segs[0].ds_addr != 0)
-    bus_dmamem_free(ring->tag, ring->segs, ring->nsegs);
-
-#elif defined(__bsdi__)
-
-  /* Free kernel memory for DMA descriptor array. */
-  if (ring->first != NULL)
-    free(ring->first, M_DEVBUF);
-
-#endif
   }
 
 /* Clean up after a packet has been received. */
@@ -2821,7 +2494,7 @@ rxintr_cleanup(softc_t *sc)
   struct mbuf *new_mbuf;
   int pkt_len, desc_len;
 
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if defined(DEVICE_POLLING)
   /* Input packet flow control (livelock prevention): */
   /* Give pkts to higher levels only if quota is > 0. */
   if (sc->quota <= 0) return 0;
@@ -2890,11 +2563,7 @@ rxintr_cleanup(softc_t *sc)
       {
       first_mbuf = new_mbuf;
       first_mbuf->m_pkthdr.len   = pkt_len; /* total pkt length */
-#if IFNET
       first_mbuf->m_pkthdr.rcvif = sc->ifp; /* how it got here */
-#else
-      first_mbuf->m_pkthdr.rcvif = NULL;
-#endif
       }
     else /* 2) link mbufs. */
       {
@@ -2933,11 +2602,9 @@ rxintr_cleanup(softc_t *sc)
     /* Include CRC and one flag byte in input byte count. */
     sc->status.cntrs.ibytes += first_mbuf->m_pkthdr.len + sc->config.crc_len +1;
     sc->status.cntrs.ipackets++;
-#if IFNET
-    sc->ifp->if_ipackets++;
+    if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
     LMC_BPF_MTAP(first_mbuf);
-#endif
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if defined(DEVICE_POLLING)
     sc->quota--;
 #endif
 
@@ -2945,12 +2612,8 @@ rxintr_cleanup(softc_t *sc)
 #if NETGRAPH
     if (sc->ng_hook != NULL) /* is hook connected? */
       {
-# if (__FreeBSD_version >= 500000)
       int error;  /* ignore error */
       NG_SEND_DATA_ONLY(error, sc->ng_hook, first_mbuf);
-# else /* FreeBSD-4 */
-      ng_queue_data(sc->ng_hook, first_mbuf, NULL);
-# endif
       return 1;  /* did something */
       }
 #endif /* NETGRAPH */
@@ -3053,13 +2716,7 @@ rxintr_setup(softc_t *sc)
   DMA_SYNC(desc->map, desc_len, BUS_DMASYNC_PREREAD);
 
   /* Set up the DMA descriptor. */
-#ifdef __FreeBSD__
   desc->address1 = ring->segs[0].ds_addr;
-#elif (defined(__NetBSD__) || defined(__OpenBSD__))
-  desc->address1 = desc->map->dm_segs[0].ds_addr;
-#elif defined(__bsdi__)
-  desc->address1 = vtophys(m->m_data); /* Relax! BSD/OS only. */
-#endif
   desc->length1  = desc_len>>1;
   desc->address2 = desc->address1 + desc->length1;
   desc->length2  = desc_len>>1;
@@ -3108,10 +2765,8 @@ txintr_cleanup(softc_t *sc)
       /* Include CRC and one flag byte in output byte count. */
       sc->status.cntrs.obytes += m->m_pkthdr.len + sc->config.crc_len +1;
       sc->status.cntrs.opackets++;
-#if IFNET
-      sc->ifp->if_opackets++;
+      if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
       LMC_BPF_MTAP(m);
-#endif
       /* The only bad TX status is fifo underrun. */
       if ((desc->status & TLP_DSTS_TX_UNDERRUN) != 0)
         sc->status.cntrs.fifo_under++;
@@ -3181,15 +2836,9 @@ txintr_setup_mbuf(softc_t *sc, struct mbuf *m)
       /* Prevent wild fetches if mapping fails (nsegs==0). */
       desc->length1  = desc->length2  = 0;
       desc->address1 = desc->address2 = 0;
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
         {
-# ifdef __FreeBSD__
         bus_dma_segment_t *segs = ring->segs;
         int nsegs = ring->nsegs;
-# elif (defined(__NetBSD__) || defined(__OpenBSD__))
-        bus_dma_segment_t *segs = desc->map->dm_segs;
-        int nsegs = desc->map->dm_nsegs;
-# endif
         if (nsegs >= 1)
           {
           desc->address1 = segs[0].ds_addr;
@@ -3201,10 +2850,6 @@ txintr_setup_mbuf(softc_t *sc, struct mbuf *m)
           desc->length2  = segs[1].ds_len;
           }
         }
-#elif defined(__bsdi__)
-      desc->address1 = vtophys(data); /* Relax! BSD/OS only. */
-      desc->length1  = desc_len;
-#endif
 
       data   += desc_len;
       length -= desc_len;
@@ -3296,523 +2941,7 @@ txintr_setup(softc_t *sc)
   return 1; /* did something */
   }
 
-#endif /* BSD */
 
-#ifdef __linux__
-/* NOTE: this is the LINUX version of the interrupt/DMA code, */
-
-/* Singly-linked tail-queues hold sk_buffs with active DMA.
- * skbuffs are linked through their sk_buff.next field.
- * Callers must hold sc->bottom_lock; not otherwise locked.
- */
-
-/* Put an skbuff on the tail of the descriptor ring queue. */
-static void  /* Linux version */
-skbuff_enqueue(struct desc_ring *ring, struct sk_buff *skb)
-  {
-  skb->next = NULL;
-  if (ring->tail == NULL)
-    ring->head = skb;
-  else
-    ring->tail->next = skb;
-  ring->tail = skb;
-  }
-
-/* Get an skbuff from the head of the descriptor ring queue. */
-static struct sk_buff*  /* Linux version */
-skbuff_dequeue(struct desc_ring *ring)
-  {
-  struct sk_buff *skb = ring->head;
-  if (skb != NULL)
-    if ((ring->head = skb->next) == NULL)
-      ring->tail = NULL;
-  return skb;
-  }
-
-/* Initialize a DMA descriptor ring. */
-static int  /* Linux version */
-create_ring(softc_t *sc, struct desc_ring *ring, int num_descs)
-  {
-  struct dma_desc *descs;
-  int size_descs = sizeof(struct dma_desc)*num_descs;
-
-  /* Allocate and map memory for DMA descriptor array. */
-  if ((descs = pci_alloc_consistent(sc->pci_dev, size_descs,
-   &ring->dma_addr)) == NULL)
-    {
-    printk("%s: pci_alloc_consistent() failed\n", NAME_UNIT);
-    return ENOMEM;
-    }
-  memset(descs, 0, size_descs);
-
-  ring->read  = descs;
-  ring->write = descs;
-  ring->first = descs;
-  ring->last  = descs + num_descs -1;
-  ring->last->control = TLP_DCTL_END_RING;
-  ring->num_descs = num_descs;
-  ring->size_descs = size_descs;
-  ring->head = NULL;
-  ring->tail = NULL;
-
-  return 0;
-  }
-
-/* Destroy a DMA descriptor ring */
-static void  /* Linux version */
-destroy_ring(softc_t *sc, struct desc_ring *ring)
-  {
-  struct sk_buff *skb;
-
-  /* Free queued skbuffs. */
-  while ((skb = skbuff_dequeue(ring)) != NULL)
-    dev_kfree_skb(skb);
-
-  /* TX may have one pkt that is not on any queue. */
-  if (sc->tx_skb != NULL)
-    {
-    dev_kfree_skb(sc->tx_skb);
-    sc->tx_skb = NULL;
-    }
-
-  if (ring->first != NULL)
-    {
-    /* Unmap active DMA descriptors. */
-    while (ring->read != ring->write)
-      {
-      pci_unmap_single(sc->pci_dev, ring->read->address1,
-       ring->read->length1 + ring->read->length2, PCI_DMA_BIDIRECTIONAL);
-      if (ring->read++ == ring->last) ring->read = ring->first;
-      }
-
-    /* Unmap and free memory for DMA descriptor array. */
-    pci_free_consistent(sc->pci_dev, ring->size_descs, ring->first,
-     ring->dma_addr);
-    }
-  }
-
-static int  /* Linux version */
-rxintr_cleanup(softc_t *sc)
-  {
-  struct desc_ring *ring = &sc->rxring;
-  struct dma_desc *first_desc, *last_desc;
-  struct sk_buff *first_skb=NULL, *last_skb=NULL;
-  struct sk_buff *new_skb;
-  int pkt_len, desc_len;
-
-  /* Input packet flow control (livelock prevention): */
-  /* Give pkts to higher levels only if quota is > 0. */
-  if (sc->quota <= 0) return 0;
-
-  /* This looks complicated, but remember: packets up to 4032 */
-  /*  bytes long fit in one skbuff and use one DMA descriptor. */
-
-  first_desc = last_desc = ring->read;
-
-  /* ASSERTION: If there is a descriptor in the ring and the hardware has */
-  /*  finished with it, then that descriptor will have RX_FIRST_DESC set. */
-  if ((ring->read != ring->write) && /* descriptor ring not empty */
-     ((ring->read->status & TLP_DSTS_OWNER) == 0) && /* hardware done */
-     ((ring->read->status & TLP_DSTS_RX_FIRST_DESC) == 0)) /* should be set */
-    panic("%s: rxintr_cleanup: rx-first-descriptor not set.\n", NAME_UNIT);
-
-  /* First decide if a complete packet has arrived. */
-  /* Run down DMA descriptors looking for one marked "last". */
-  /* Bail out if an active descriptor is encountered. */
-  /* Accumulate most significant bits of packet length. */
-  pkt_len = 0;
-  for (;;)
-    {
-    if (last_desc == ring->write) return 0;  /* no more descs */
-    if (last_desc->status & TLP_DSTS_OWNER) return 0; /* still active */
-    if (last_desc->status & TLP_DSTS_RX_LAST_DESC) break; /* end of packet */
-    pkt_len += last_desc->length1 + last_desc->length2; /* entire desc filled */
-    if (last_desc++->control & TLP_DCTL_END_RING) last_desc = ring->first; /* ring wrap */
-    }
-
-  /* A complete packet has arrived; how long is it? */
-  /* H/w ref man shows RX pkt length as a 14-bit field. */
-  /* An experiment found that only the 12 LSBs work. */
-  if (((last_desc->status>>16)&0xFFF) == 0) pkt_len += 4096; /* carry-bit */
-  pkt_len = (pkt_len & 0xF000) + ((last_desc->status>>16) & 0x0FFF);
-  /* Subtract the CRC length unless doing so would underflow. */
-  if (pkt_len >= sc->config.crc_len) pkt_len -= sc->config.crc_len;
-
-  /* Run down DMA descriptors again doing the following:
-   *  1) put pkt info in hdr of first skbuff.
-   *  2) put additional skbuffs on frag_list.
-   *  3) set skbuff lengths.
-   */
-  first_desc = ring->read;
-  do
-    {
-    /* Read a DMA descriptor from the ring. */
-    last_desc = ring->read;
-    /* Advance the ring read pointer. */
-    if (ring->read++ == ring->last) ring->read = ring->first;
-
-    /* Dequeue the corresponding skbuff. */
-    new_skb = skbuff_dequeue(ring);
-    if (new_skb == NULL)
-      panic("%s: rxintr_cleanup: expected an skbuff\n", NAME_UNIT);
-
-    desc_len = last_desc->length1 + last_desc->length2;
-    /* Unmap kernel virtual addresss to PCI address. */
-    pci_unmap_single(sc->pci_dev, last_desc->address1,
-     desc_len, PCI_DMA_FROMDEVICE);
-
-    /* Set skbuff length. */
-    skb_put(new_skb, (pkt_len >= desc_len) ? desc_len : pkt_len);
-    pkt_len -= new_skb->len;
-
-    /* 1) Put pkt info in hdr of first skbuff. */
-    if (last_desc == first_desc)
-      {
-      first_skb = new_skb;
-      if (sc->config.line_pkg == PKG_RAWIP)
-        {
-        if      (first_skb->data[0]>>4 == 4)
-          first_skb->protocol = htons(ETH_P_IP);
-        else if (first_skb->data[0]>>4 == 6)
-          first_skb->protocol = htons(ETH_P_IPV6);
-	}
-      else
-#if GEN_HDLC
-        first_skb->protocol = hdlc_type_trans(first_skb, sc->net_dev);
-#else
-        first_skb->protocol = htons(ETH_P_HDLC);
-#endif
-      first_skb->mac.raw = first_skb->data;
-      first_skb->dev = sc->net_dev;
-      do_gettimeofday(&first_skb->stamp);
-      sc->net_dev->last_rx = jiffies;
-      }
-    else /* 2) link skbuffs. */
-      {
-      /* Put this skbuff on the frag_list of the first skbuff. */
-      new_skb->next = NULL;
-      if (skb_shinfo(first_skb)->frag_list == NULL)
-        skb_shinfo(first_skb)->frag_list = new_skb;
-      else
-        last_skb->next = new_skb;
-      /* 3) set skbuff lengths. */
-      first_skb->len      += new_skb->len;
-      first_skb->data_len += new_skb->len;
-      }
-    last_skb = new_skb;
-    } while ((last_desc->status & TLP_DSTS_RX_LAST_DESC) == 0);
-
-  /* Decide whether to accept or to discard this packet. */
-  /* RxHDLC sets MIIERR for bad CRC, abort and partial byte at pkt end. */
-  if (((last_desc->status & TLP_DSTS_RX_BAD) == 0) &&
-   (sc->status.oper_status == STATUS_UP) &&
-   (first_skb->len > 0))
-    {
-    /* Optimization: copy a small pkt into a small skbuff. */
-    if (first_skb->len <= COPY_BREAK)
-      if ((new_skb = skb_copy(first_skb, GFP_ATOMIC)) != NULL)
-        {
-        dev_kfree_skb_any(first_skb);
-        first_skb = new_skb;
-	}
-
-    /* Include CRC and one flag byte in input byte count. */
-    sc->status.cntrs.ibytes += first_skb->len + sc->config.crc_len +1;
-    sc->status.cntrs.ipackets++;
-
-    /* Give this good packet to the network stacks. */
-    netif_receive_skb(first_skb);  /* NAPI */
-    sc->quota--;
-    }
-  else if (sc->status.oper_status != STATUS_UP)
-    {
-    /* If the link is down, this packet is probably noise. */
-    sc->status.cntrs.idiscards++;
-    dev_kfree_skb_any(first_skb);
-    if (DRIVER_DEBUG)
-      printk("%s: rxintr_cleanup: rx pkt discarded: link down\n", NAME_UNIT);
-    }
-  else /* Log and discard this bad packet. */
-    {
-    if (DRIVER_DEBUG)
-      printk("%s: RX bad pkt; len=%d %s%s%s%s\n",
-       NAME_UNIT, first_skb->len,
-       (last_desc->status & TLP_DSTS_RX_MII_ERR)  ? " miierr"  : "",
-       (last_desc->status & TLP_DSTS_RX_DRIBBLE)  ? " dribble" : "",
-       (last_desc->status & TLP_DSTS_RX_DESC_ERR) ? " descerr" : "",
-       (last_desc->status & TLP_DSTS_RX_OVERRUN)  ? " overrun" : "");
-    if (last_desc->status & TLP_DSTS_RX_OVERRUN)
-      sc->status.cntrs.fifo_over++;
-    else
-      sc->status.cntrs.ierrors++;
-    dev_kfree_skb_any(first_skb);
-    }
-
-  return 1; /* did something */
-  }
-
-/* Setup (prepare) to receive a packet. */
-/* Try to keep the RX descriptor ring full of empty buffers. */
-static int  /* Linux version */
-rxintr_setup(softc_t *sc)
-  {
-  struct desc_ring *ring = &sc->rxring;
-  struct dma_desc *desc;
-  struct sk_buff *skb;
-  u_int32_t dma_addr;
-
-  /* Ring is full if (wrap(write+1)==read) */
-  if (((ring->write == ring->last) ? ring->first : ring->write+1) == ring->read)
-    return 0;  /* ring is full; nothing to do */
-
-  /* Allocate an skbuff. */
-  if ((skb = dev_alloc_skb(MAX_DESC_LEN)) == NULL)
-    {
-    sc->status.cntrs.rxdma++;
-    if (DRIVER_DEBUG)
-      printk("%s: rxintr_setup: dev_alloc_skb() failed\n", NAME_UNIT);
-    return 0;
-    }
-  skb->dev = sc->net_dev;
-
-  /* Queue the skbuff for later processing by rxintr_cleanup. */
-  skbuff_enqueue(ring, skb);
-
-  /* Write a DMA descriptor into the ring. */
-  /* Hardware won't see it until the OWNER bit is set. */
-  desc = ring->write;
-  /* Advance the ring write pointer. */
-  if (ring->write++ == ring->last) ring->write = ring->first;
-
-  /* Map kernel virtual addresses to PCI addresses. */
-  dma_addr = pci_map_single(sc->pci_dev, skb->data,
-   MAX_DESC_LEN, PCI_DMA_FROMDEVICE);
-  /* Set up the DMA descriptor. */
-  desc->address1 = dma_addr;
-  desc->length1  = MAX_CHUNK_LEN;
-  desc->address2 = desc->address1 + desc->length1;
-  desc->length2  = MAX_CHUNK_LEN;
-
-  /* Before setting the OWNER bit, flush the cache (memory barrier). */
-  wmb(); /* write memory barrier */
-
-  /* Commit the DMA descriptor to the hardware. */
-  desc->status = TLP_DSTS_OWNER;
-
-  /* Notify the receiver that there is another buffer available. */
-  WRITE_CSR(TLP_RX_POLL, 1);
-
-  return 1; /* did something */
-  }
-
-/* Clean up after a packet has been transmitted. */
-/* Free the sk_buff and update the DMA descriptor ring. */
-static int  /* Linux version */
-txintr_cleanup(softc_t *sc)
-  {
-  struct desc_ring *ring = &sc->txring;
-  struct dma_desc *desc;
-
-  while ((ring->read != ring->write) && /* ring is not empty */
-        ((ring->read->status & TLP_DSTS_OWNER) == 0))
-    {
-    /* Read a DMA descriptor from the ring. */
-    desc = ring->read;
-    /* Advance the ring read pointer. */
-    if (ring->read++ == ring->last) ring->read = ring->first;
-    /* Unmap kernel virtual address to PCI address. */
-    pci_unmap_single(sc->pci_dev, desc->address1,
-     desc->length1 + desc->length2, PCI_DMA_TODEVICE);
-
-    /* If this descriptor is the last segment of a packet, */
-    /*  then dequeue and free the corresponding skbuff. */
-    if ((desc->control & TLP_DCTL_TX_LAST_SEG) != 0)
-      {
-      struct sk_buff *skb;
-      if ((skb = skbuff_dequeue(ring)) == NULL)
-        panic("%s: txintr_cleanup: expected an sk_buff\n", NAME_UNIT);
-
-      /* Include CRC and one flag byte in output byte count. */
-      sc->status.cntrs.obytes += skb->len + sc->config.crc_len +1;
-      sc->status.cntrs.opackets++;
-
-      /* The only bad TX status is fifo underrun. */
-      if ((desc->status & TLP_DSTS_TX_UNDERRUN) != 0)
-        {
-        sc->status.cntrs.fifo_under++; /* also increment oerrors? */
-        if (DRIVER_DEBUG)
-          printk("%s: txintr_cleanup: tx fifo underrun\n", NAME_UNIT);
-	}
-
-      dev_kfree_skb_any(skb);
-      return 1;  /* did something */
-      }
-    }
-
-  return 0;
-  }
-
-/* Build DMA descriptors for a tranmit packet fragment, */
-/* Assertion: fragment is contiguous in physical memory. */
-static int /* 0=success; 1=error */ /* linux version */
-txintr_setup_frag(softc_t *sc, char *data, int length)
-  {
-  struct desc_ring *ring = &sc->txring;
-  struct dma_desc *desc;
-  unsigned int desc_len;
-  u_int32_t dma_addr;
-
-  while (length > 0)
-    {
-    /* Ring is full if (wrap(write+1)==read) */
-    if (((ring->temp==ring->last) ? ring->first : ring->temp+1) == ring->read)
-      { /* Not enough DMA descriptors; try later. */
-      for (; ring->temp!=ring->write;
-       ring->temp = (ring->temp==ring->first)? ring->last : ring->temp-1)
-        pci_unmap_single(sc->pci_dev, ring->temp->address1,
-         ring->temp->length1 + ring->temp->length2, PCI_DMA_FROMDEVICE);
-      sc->status.cntrs.txdma++;
-      return 1;
-      }
-
-    /* Provisionally, write a DMA descriptor into the ring. */
-    /* But don't change the REAL ring write pointer. */
-    /* Hardware won't see it until the OWNER bit is set. */
-    desc = ring->temp;
-    /* Advance the temporary ring write pointer. */
-    if (ring->temp++ == ring->last) ring->temp = ring->first;
-
-    /* Clear all control bits except the END_RING bit. */
-    desc->control &= TLP_DCTL_END_RING;
-    /* Don't pad short packets up to 64 bytes */
-    desc->control |= TLP_DCTL_TX_NO_PAD;
-    /* Use Tulip's CRC-32 generator, if appropriate. */
-    if (sc->config.crc_len != CFG_CRC_32)
-      desc->control |= TLP_DCTL_TX_NO_CRC;
-    /* Set the OWNER bit, except in the first descriptor. */
-    if (desc != ring->write)
-      desc->status = TLP_DSTS_OWNER;
-
-    desc_len = (length >= MAX_DESC_LEN) ? MAX_DESC_LEN : length;
-    /* Map kernel virtual address to PCI address. */
-    dma_addr = pci_map_single(sc->pci_dev, data, desc_len, PCI_DMA_TODEVICE);
-    /* If it will fit in one chunk, do so, otherwise split it. */
-    if (desc_len <= MAX_CHUNK_LEN)
-      {
-      desc->address1 = dma_addr;
-      desc->length1  = desc_len;
-      desc->address2 = 0;
-      desc->length2  = 0;
-      }
-    else
-      {
-      desc->address1 = dma_addr;
-      desc->length1  = desc_len>>1;
-      desc->address2 = desc->address1 + desc->length1;
-      desc->length2  = desc_len>>1;
-      if (desc_len & 1) desc->length2++;
-      }
-
-    data   += desc_len;
-    length -= desc_len;
-    } /* while (length > 0) */
-
-  return 0; /* success */
-  }
-
-/* NB: this procedure is recursive! */
-static int /* 0=success; 1=error */
-txintr_setup_skb(softc_t *sc, struct sk_buff *skb)
-  {
-  struct sk_buff *list;
-  int i;
-
-  /* First, handle the data in the skbuff itself. */
-  if (txintr_setup_frag(sc, skb->data, skb_headlen(skb)))
-    return 1;
-
-  /* Next, handle the VM pages in the Scatter/Gather list. */
-  if (skb_shinfo(skb)->nr_frags != 0)
-    for (i=0; i<skb_shinfo(skb)->nr_frags; i++)
-      {
-      skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-      if (txintr_setup_frag(sc, page_address(frag->page) +
-       frag->page_offset, frag->size))
-        return 1;
-      }
-
-  /* Finally, handle the skbuffs in the frag_list. */
-  if ((list = skb_shinfo(skb)->frag_list) != NULL)
-    for (; list; list=list->next)
-      if (txintr_setup_skb(sc, list)) /* recursive! */
-        return 1;
-
-  return 0;
-  }
-
-/* Setup (prepare) to transmit a packet. */
-/* Select a packet, build DMA descriptors and give packet to hardware. */
-/* If DMA descriptors run out, abandon the attempt and return 0. */
-static int  /* Linux version */
-txintr_setup(softc_t *sc)
-  {
-  struct desc_ring *ring = &sc->txring;
-  struct dma_desc *first_desc, *last_desc;
-
-  /* Protect against half-up links: Don't transmit */
-  /*  if the receiver can't hear the far end. */
-  if (sc->status.oper_status != STATUS_UP) return 0;
-
-  /* Pick a packet to transmit. */
-  /* linux_start() puts packets in sc->tx_skb. */
-  if (sc->tx_skb == NULL)
-    {
-    if (netif_queue_stopped(sc->net_dev) != 0)
-      netif_wake_queue(sc->net_dev);
-    return 0; /* no pkt to transmit */
-    }
-
-  /* Build DMA descriptors for an outgoing skbuff. */
-  ring->temp = ring->write; /* temporary ring write pointer */
-  if (txintr_setup_skb(sc, sc->tx_skb) != 0) return 0;
-
-  /* Enqueue the skbuff; txintr_cleanup will free it. */
-  skbuff_enqueue(ring, sc->tx_skb);
-
-  /* The transmitter has room for another packet. */
-  sc->tx_skb = NULL;
-
-  /* Set first & last segment bits. */
-  /* last_desc is the desc BEFORE the one pointed to by ring->temp. */
-  first_desc = ring->write;
-  first_desc->control |= TLP_DCTL_TX_FIRST_SEG;
-  last_desc = (ring->temp==ring->first)? ring->last : ring->temp-1;
-   last_desc->control |= TLP_DCTL_TX_LAST_SEG;
-  /* Interrupt at end-of-transmission?  Why bother the poor computer! */
-/* last_desc->control |= TLP_DCTL_TX_INTERRUPT; */
-
-  /* Make sure the OWNER bit is not set in the next descriptor. */
-  /* The OWNER bit may have been set if a previous call aborted. */
-  ring->temp->status = 0;
-
-  /* Commit the DMA descriptors to the software. */
-  ring->write = ring->temp;
-
-  /* Before setting the OWNER bit, flush the cache (memory barrier). */
-  wmb(); /* write memory barrier */
-
-  /* Commit the DMA descriptors to the hardware. */
-  first_desc->status = TLP_DSTS_OWNER;
-
-  /* Notify the transmitter that there is another packet to send. */
-  WRITE_CSR(TLP_TX_POLL, 1);
-
-  sc->net_dev->trans_start = jiffies;
-
-  return 1; /* did something */
-  }
-
-#endif /* __linux__ */
 
 static void
 check_intr_status(softc_t *sc)
@@ -3914,7 +3043,6 @@ core_interrupt(void *arg, int check_status)
 
   /* In Linux, pci_alloc_consistent() means DMA descriptors */
   /*  don't need explicit syncing. */
-#if BSD
   {
   struct desc_ring *ring = &sc->txring;
   DMA_SYNC(sc->txring.map, sc->txring.size_descs,
@@ -3923,7 +3051,6 @@ core_interrupt(void *arg, int check_status)
   DMA_SYNC(sc->rxring.map, sc->rxring.size_descs,
    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
   }
-#endif
 
   do  /* This is the main loop for interrupt processing. */
     {
@@ -3933,7 +3060,6 @@ core_interrupt(void *arg, int check_status)
     activity += rxintr_setup(sc);
     } while (activity);
 
-#if BSD
   {
   struct desc_ring *ring = &sc->txring;
   DMA_SYNC(sc->txring.map, sc->txring.size_descs,
@@ -3942,7 +3068,6 @@ core_interrupt(void *arg, int check_status)
   DMA_SYNC(sc->rxring.map, sc->rxring.size_descs,
    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
   }
-#endif
 
   /* As the interrupt is dismissed, check for four unusual events. */
   if (check_status) check_intr_status(sc);
@@ -3959,9 +3084,8 @@ user_interrupt(softc_t *sc, int check_status)
   ENABLE_INTR;  /* noop on FreeBSD-5 and Linux */
   }
 
-#if BSD
 
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if defined(DEVICE_POLLING)
 
 /* Service the card from the kernel idle loop without interrupts. */
 static int
@@ -3969,27 +3093,13 @@ fbsd_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
   {
   softc_t *sc = IFP2SC(ifp);
 
-#if (__FreeBSD_version < 700000)
-  if ((ifp->if_capenable & IFCAP_POLLING) == 0)
-    {
-    ether_poll_deregister(ifp);
-    cmd = POLL_DEREGISTER;
-    }
-
-  if (cmd == POLL_DEREGISTER)
-    {
-    /* Last call -- reenable card interrupts. */
-    WRITE_CSR(TLP_INT_ENBL, TLP_INT_TXRX);
-    return 0;
-    }
-#endif
 
   sc->quota = count;
   core_interrupt(sc, (cmd==POLL_AND_CHECK_STATUS));
   return 0;
   }
 
-# endif  /* (__FreeBSD__ && DEVICE_POLLING) */
+# endif  /* DEVICE_POLLING */
 
 /* BSD kernels call this procedure when an interrupt happens. */
 static intr_return_t
@@ -4001,7 +3111,7 @@ bsd_interrupt(void *arg)
   if ((READ_CSR(TLP_STATUS) & TLP_INT_TXRX) == 0)
     return IRQ_NONE;
 
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if defined(DEVICE_POLLING)
   if (sc->ifp->if_capenable & IFCAP_POLLING)
     return IRQ_NONE;
 
@@ -4013,7 +3123,7 @@ bsd_interrupt(void *arg)
     }
   else
     sc->quota = sc->rxring.num_descs; /* input flow control */
-# endif  /* (__FreeBSD__ && DEVICE_POLLING) */
+# endif  /* DEVICE_POLLING */
 
   /* Disable card interrupts. */
   WRITE_CSR(TLP_INT_ENBL, TLP_INT_DISABLE);
@@ -4026,7 +3136,6 @@ bsd_interrupt(void *arg)
   return IRQ_HANDLED;
   }
 
-#endif /* BSD */
 
 /* Administrative status of the driver (UP or DOWN) has changed. */
 /* A card-specific action may be required: T1 and T3 cards: no-op. */
@@ -4081,12 +3190,8 @@ p2p_mdmctl(struct p2pcom *p2p, int flag)
 static void
 sppp_tls(struct sppp *sppp)
   {
-# ifdef __FreeBSD__
   if (!(sppp->pp_mode  & IFF_LINK2) &&
       !(sppp->pp_flags & PP_FR))
-# elif defined(__NetBSD__) || defined(__OpenBSD__)
-  if (!(sppp->pp_flags & PP_CISCO))
-# endif
     sppp->pp_up(sppp);
   }
 
@@ -4094,12 +3199,8 @@ sppp_tls(struct sppp *sppp)
 static void
 sppp_tlf(struct sppp *sppp)
   {
-# ifdef __FreeBSD__
   if (!(sppp->pp_mode  & IFF_LINK2) &&
       !(sppp->pp_flags & PP_FR))
-# elif defined(__NetBSD__) || defined(__OpenBSD__)
-  if (!(sppp->pp_flags & PP_CISCO))
-# endif
     sppp->pp_down(sppp);
   }
 
@@ -4193,12 +3294,8 @@ config_proto(softc_t *sc, struct config *config)
            (config->line_prot == PROT_PPP))
       {
       LMC_BPF_DETACH;
-# if (defined(__NetBSD__) || defined(__OpenBSD__))
-      sc->sppp->pp_flags &= ~PP_CISCO;
-# elif defined(__FreeBSD__)
       sc->ifp->if_flags  &= ~IFF_LINK2;
       sc->sppp->pp_flags &= ~PP_FR;
-# endif
       LMC_BPF_ATTACH(DLT_PPP, 4);
       sppp_ioctl(sc->ifp, SIOCSIFFLAGS, NULL);
       }
@@ -4212,12 +3309,8 @@ config_proto(softc_t *sc, struct config *config)
            (config->line_prot == PROT_C_HDLC))
       {
       LMC_BPF_DETACH;
-# if (defined(__NetBSD__) || defined(__OpenBSD__))
-      sc->sppp->pp_flags |=  PP_CISCO;
-# elif defined(__FreeBSD__)
       sc->ifp->if_flags  |=  IFF_LINK2;
       sc->sppp->pp_flags &= ~PP_FR;
-# endif
       LMC_BPF_ATTACH(DLT_C_HDLC, 4);
       sppp_ioctl(sc->ifp, SIOCSIFFLAGS, NULL);
       }
@@ -4227,12 +3320,8 @@ config_proto(softc_t *sc, struct config *config)
            (config->line_prot == PROT_FRM_RLY))
       {
       LMC_BPF_DETACH;
-# if (defined(__NetBSD__) || defined(__OpenBSD__))
-      sc->sppp->pp_flags &= ~PP_CISCO;
-# elif defined(__FreeBSD__)
       sc->ifp->if_flags  &= ~IFF_LINK2;
       sc->sppp->pp_flags |= PP_FR;
-# endif
       LMC_BPF_ATTACH(DLT_FRELAY, 4);
       sppp_ioctl(sc->ifp, SIOCSIFFLAGS, NULL);
       }
@@ -4468,7 +3557,6 @@ core_watchdog(softc_t *sc)
   user_interrupt(sc, 1);
   }
 
-#if IFNET
 
 /* Called from a syscall (user context; no spinlocks). */
 static int
@@ -4479,16 +3567,8 @@ lmc_raw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
   switch (cmd)
     {
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))  /* XXX necessary? */
-    case SIOCSIFCAP:
-# endif
     case SIOCAIFADDR:
     case SIOCSIFFLAGS:
-#if 0
-    case SIOCADDMULTI:
-    case SIOCDELMULTI:
-      break;
-#endif
     case SIOCSIFADDR:
       ifp->if_flags |= IFF_UP;	/* a Unix tradition */
       break;
@@ -4507,9 +3587,6 @@ static int
 lmc_ifnet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
   {
   softc_t *sc = IFP2SC(ifp);
-# ifdef __OpenBSD__
-  struct ifreq *ifr = (struct ifreq *) data;
-# endif
   int error = 0;
 
   switch (cmd)
@@ -4523,34 +3600,6 @@ lmc_ifnet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
     case LMCIOCTL:
       error = core_ioctl(sc, cmd, data);
       break;
-# ifdef __OpenBSD__
-    /* Catch the IOCTLs used by ifconfig. */
-    case SIOCSIFMEDIA:
-      if ((error = CHECK_CAP)) break;
-    case SIOCGIFMEDIA:
-      error = ifmedia_ioctl(ifp, ifr, &sc->ifm, cmd);
-      break;
-    case SIOCSIFTIMESLOT:
-      if ((error = CHECK_CAP)) break;
-      if (sc->status.card_type == TLP_CSID_T1E1)
-        {
-        struct config config = sc->config;
-        if ((error = copyin(ifr->ifr_data, &config.time_slots,
-         sizeof config.time_slots))) break;
-        config.iohdr.cookie = NGM_LMC_COOKIE;
-        error = core_ioctl(sc, LMCIOCSCFG, (caddr_t)&config);
-	}
-      else
-        error = EINVAL;
-      break;
-    case SIOCGIFTIMESLOT:
-      if (sc->status.card_type == TLP_CSID_T1E1)
-        error = copyout(&sc->config.time_slots, ifr->ifr_data,
-         sizeof sc->config.time_slots);
-      else
-        error = EINVAL;
-      break;
-# endif
     /* Pass the rest to the line protocol. */
     default:
       if (sc->config.line_pkg == PKG_RAWIP)
@@ -4621,11 +3670,7 @@ lmc_raw_output(struct ifnet *ifp, struct mbuf *m,
   /* Some BSD QUEUE routines are not interrupt-safe. */
   {
   DISABLE_INTR;
-# if (__FreeBSD_version >= 503000)
   IFQ_ENQUEUE(&ifp->if_snd, m, error);
-# else
-  IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
-# endif
   ENABLE_INTR;
   }
 
@@ -4635,6 +3680,7 @@ lmc_raw_output(struct ifnet *ifp, struct mbuf *m,
     {
     m_freem(m);
     sc->status.cntrs.odiscards++;
+    if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
     if (DRIVER_DEBUG)
       printf("%s: lmc_raw_output: IFQ_ENQUEUE() failed; error %d\n",
        NAME_UNIT, error);
@@ -4646,11 +3692,10 @@ lmc_raw_output(struct ifnet *ifp, struct mbuf *m,
 /* Called from a softirq once a second. */
 static void
 lmc_watchdog(void *arg)
-  {
+{
   struct ifnet *ifp = arg;
   softc_t *sc = IFP2SC(ifp);
   u_int8_t old_oper_status = sc->status.oper_status;
-  struct event_cntrs *cntrs = &sc->status.cntrs;
 
   core_watchdog(sc); /* updates oper_status */
 
@@ -4703,13 +3748,9 @@ lmc_watchdog(void *arg)
 
     /* Notice change in line protocol. */
     sc->status.line_pkg = PKG_SPPP;
-#  ifdef __FreeBSD__
     if (sc->sppp->pp_flags & PP_FR)
       sc->status.line_prot = PROT_FRM_RLY;
     else if (sc->ifp->if_flags  & IFF_LINK2)
-#  elif (defined(__NetBSD__) || defined(__OpenBSD__))
-    if (sc->sppp->pp_flags & PP_CISCO)
-#  endif
       sc->status.line_prot = PROT_C_HDLC;
     else
       sc->status.line_prot = PROT_PPP;
@@ -4720,98 +3761,44 @@ lmc_watchdog(void *arg)
 # endif
     }
 
-  /* Copy statistics from sc to ifp. */
   ifp->if_baudrate = sc->status.tx_speed;
-  ifp->if_ipackets = cntrs->ipackets;
-  ifp->if_opackets = cntrs->opackets;
-  ifp->if_ibytes   = cntrs->ibytes;
-  ifp->if_obytes   = cntrs->obytes;
-  ifp->if_ierrors  = cntrs->ierrors;
-  ifp->if_oerrors  = cntrs->oerrors;
-  ifp->if_iqdrops  = cntrs->idiscards;
-
-# if ((__FreeBSD_version >= 500000) || defined(__OpenBSD__) || defined(__NetBSD__))
   if (sc->status.oper_status == STATUS_UP)
     ifp->if_link_state = LINK_STATE_UP;
   else
     ifp->if_link_state = LINK_STATE_DOWN;
-# endif
 
   /* Call this procedure again after one second. */
   callout_reset(&sc->callout, hz, lmc_watchdog, ifp);
-  }
+}
 
-# ifdef __OpenBSD__
+static uint64_t
+lmc_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	softc_t *sc;
+	struct event_cntrs *cntrs;
 
-/* Callback from ifmedia. */
-static int
-ifmedia_change(struct ifnet *ifp)
-  {
-  softc_t *sc = IFP2SC(ifp);
-  struct config config = sc->config;
-  int media = sc->ifm.ifm_media;
-  int error;
+	sc = if_getsoftc(ifp);
+	cntrs = &sc->status.cntrs;
 
-  /* ifconfig lmc0 media t1 */
-  if      (sc->status.card_type == TLP_CSID_T3)
-    {
-    if      ((media & IFM_TMASK) == IFM_TDM_T3)
-      config.format = CFG_FORMAT_T3CPAR;
-    else if ((media & IFM_TMASK) == IFM_TDM_T3_M13)
-      config.format = CFG_FORMAT_T3M13;
-    }
-  else if (sc->status.card_type == TLP_CSID_T1E1)
-    {
-    if      ((media & IFM_TMASK) == IFM_TDM_T1)
-      config.format = CFG_FORMAT_T1ESF;
-    else if ((media & IFM_TMASK) == IFM_TDM_T1_AMI)
-      config.format = CFG_FORMAT_T1SF;
-    else if ((media & IFM_TMASK) == IFM_TDM_E1)
-      config.format = CFG_FORMAT_E1NONE;
-    else if ((media & IFM_TMASK) == IFM_TDM_E1_G704)
-      config.format = CFG_FORMAT_E1FASCRC;
-    }
-
-  /* ifconfig lmc0 mediaopt loopback */
-  if (media & IFM_LOOP)
-    config.loop_back = CFG_LOOP_TULIP;
-  else
-    config.loop_back = CFG_LOOP_NONE;
-
-  /* ifconfig lmc0 mediaopt crc16 */
-  if (media & IFM_TDM_HDLC_CRC16)
-    config.crc_len = CFG_CRC_16;
-  else
-    config.crc_len = CFG_CRC_32;
-
-  /* Set ConFiGuration. */
-  config.iohdr.cookie = NGM_LMC_COOKIE;
-  error = core_ioctl(sc, LMCIOCSCFG, (caddr_t)&config);
-
-  return error;
-  }
-
-/* Callback from ifmedia. */
-static void
-ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
-  {
-  softc_t *sc = IFP2SC(ifp);
-
-  /* ifconfig wants to know if the hardware link is up. */
-  ifmr->ifm_status = IFM_AVALID;
-  if (sc->status.oper_status == STATUS_UP)
-    ifmr->ifm_status |= IFM_ACTIVE;
-
-  ifmr->ifm_active = sc->ifm.ifm_cur->ifm_media;
-
-  if (sc->config.loop_back != CFG_LOOP_NONE)
-    ifmr->ifm_active |= IFM_LOOP;
-
-  if (sc->config.crc_len == CFG_CRC_16)
-    ifmr->ifm_active |= IFM_TDM_HDLC_CRC16;
-  }
-
-# endif  /* __OpenBSD__ */
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (cntrs->ipackets);
+	case IFCOUNTER_OPACKETS:
+		return (cntrs->opackets);
+	case IFCOUNTER_IBYTES:
+		return (cntrs->ibytes);
+	case IFCOUNTER_OBYTES:
+		return (cntrs->obytes);
+	case IFCOUNTER_IERRORS:
+		return (cntrs->ierrors);
+	case IFCOUNTER_OERRORS:
+		return (cntrs->oerrors);
+	case IFCOUNTER_IQDROPS:
+		return (cntrs->idiscards);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
 
 static void
 setup_ifnet(struct ifnet *ifp)
@@ -4819,59 +3806,34 @@ setup_ifnet(struct ifnet *ifp)
   softc_t *sc = ifp->if_softc;
 
   /* Initialize the generic network interface. */
-  /* Note similarity to linux's setup_netdev(). */
   ifp->if_flags    = IFF_POINTOPOINT;
   ifp->if_flags   |= IFF_RUNNING;
   ifp->if_ioctl    = lmc_ifnet_ioctl;
   ifp->if_start    = lmc_ifnet_start;	/* sppp changes this */
   ifp->if_output   = lmc_raw_output;	/* sppp & p2p change this */
   ifp->if_input    = lmc_raw_input;
+  ifp->if_get_counter = lmc_get_counter;
   ifp->if_mtu      = MAX_DESC_LEN;	/* sppp & p2p change this */
   ifp->if_type     = IFT_PTPSERIAL;	/* p2p changes this */
 
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if defined(DEVICE_POLLING)
   ifp->if_capabilities |= IFCAP_POLLING;
   ifp->if_capenable    |= IFCAP_POLLING_NOCOUNT;
-# if (__FreeBSD_version < 500000)
-  ifp->if_capenable    |= IFCAP_POLLING;
-# endif
 # endif
 
-  /* Every OS does it differently! */
-# if (defined(__FreeBSD__) && (__FreeBSD_version < 502000))
-  (const char *)ifp->if_name = device_get_name(sc->dev);
-  ifp->if_unit  = device_get_unit(sc->dev);
-# elif (__FreeBSD_version >= 502000)
   if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev));
-# elif defined(__NetBSD__)
-  strcpy(ifp->if_xname, sc->dev.dv_xname);
-# elif defined(__OpenBSD__)
-  bcopy(sc->dev.dv_xname, ifp->if_xname, IFNAMSIZ);
-# elif defined(__bsdi__)
-  ifp->if_name  = sc->dev.dv_cfdata->cf_driver->cd_name;
-  ifp->if_unit  = sc->dev.dv_unit;
-# endif
   }
 
 static int
 lmc_ifnet_attach(softc_t *sc)
   {
-# if (__FreeBSD_version >= 600000)
   sc->ifp  = if_alloc(NSPPP ? IFT_PPP : IFT_OTHER);
   if (sc->ifp == NULL) return ENOMEM;
-# endif
 # if NSPPP
-#  if (__FreeBSD_version >= 600000)
   sc->sppp = sc->ifp->if_l2com;
-#  else
-  sc->ifp  = &sc->spppcom.pp_if;
-  sc->sppp = &sc->spppcom;
-#  endif
 # elif P2P
   sc->ifp  = &sc->p2pcom.p2p_if;
   sc->p2p  = &sc->p2pcom;
-# elif (__FreeBSD_version < 600000)
-  sc->ifp  = &sc->ifnet;
 # endif
 
   /* Initialize the network interface struct. */
@@ -4885,40 +3847,9 @@ lmc_ifnet_attach(softc_t *sc)
   /* Attach to the ifnet kernel interface. */
   if_attach(sc->ifp);
 
-# if ((defined(__NetBSD__) && __NetBSD_Version__ >= 106000000) || \
-     (defined(__OpenBSD__) && OpenBSD >= 200211))
-  if_alloc_sadl(sc->ifp);
-# endif
-
   /* Attach Berkeley Packet Filter. */
   LMC_BPF_ATTACH(DLT_RAW, 0);
 
-# ifdef __OpenBSD__
-  /* Initialize ifmedia mechanism. */
-  ifmedia_init(&sc->ifm, IFM_OMASK | IFM_GMASK | IFM_IMASK,
-   ifmedia_change, ifmedia_status);
-  if       (sc->status.card_type == TLP_CSID_T3)
-    {
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_T3, 0, NULL);
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_T3_M13, 0, NULL);
-    ifmedia_set(&sc->ifm, IFM_TDM | IFM_TDM_T3);
-    }
-  else if  (sc->status.card_type == TLP_CSID_T1E1)
-    {
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_T1, 0, NULL);
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_T1_AMI, 0, NULL);
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_E1, 0, NULL);
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_TDM_E1_G704, 0, NULL);
-    ifmedia_set(&sc->ifm, IFM_TDM | IFM_TDM_T1);
-    }
-  else if ((sc->status.card_type == TLP_CSID_HSSI) ||
-           (sc->status.card_type == TLP_CSID_SSI))
-    {
-    ifmedia_add(&sc->ifm, IFM_TDM | IFM_NONE, 0, NULL);
-    ifmedia_set(&sc->ifm, IFM_TDM | IFM_NONE);
-    }
-# endif  /* __OpenBSD__ */
-
   callout_reset(&sc->callout, hz, lmc_watchdog, sc);
 
   return 0;
@@ -4927,11 +3858,8 @@ lmc_ifnet_attach(softc_t *sc)
 static void
 lmc_ifnet_detach(softc_t *sc)
   {
-# ifdef __OpenBSD__
-  ifmedia_delete_instance(&sc->ifm, IFM_INST_ANY);
-# endif
 
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if defined(DEVICE_POLLING)
   if (sc->ifp->if_capenable & IFCAP_POLLING)
     ether_poll_deregister(sc->ifp);
 # endif
@@ -4939,28 +3867,15 @@ lmc_ifnet_detach(softc_t *sc)
   /* Detach Berkeley Packet Filter. */
   LMC_BPF_DETACH;
 
-# if ((defined(__NetBSD__) && __NetBSD_Version__ >= 106000000) || \
-     (defined(__OpenBSD__) && OpenBSD >= 200211))
-  if_free_sadl(sc->ifp);
-# endif
-
   /* Detach from the ifnet kernel interface. */
   if_detach(sc->ifp);
 
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 800082)
   if_free(sc->ifp);
-# elif (defined(__FreeBSD__) && __FreeBSD_version >= 600000)
-  if_free_type(sc->ifp, NSPPP ? IFT_PPP : IFT_OTHER);
-# endif
   }
 
-#endif  /* IFNET */
 
 #if NETGRAPH
 
-/* Netgraph changed significantly between FreeBSD-4 and -5. */
-/* These are backward compatibility hacks for FreeBSD-4. */
-# if (__FreeBSD_version >= 500000)
 /* These next two macros should be added to netgraph */
 #  define NG_TYPE_REF(type) atomic_add_int(&(type)->refs, 1)
 #  define NG_TYPE_UNREF(type)	\
@@ -4970,39 +3885,16 @@ do {				\
   else				\
     atomic_subtract_int(&(type)->refs, 1); \
    } while (0)
-# else /* FreeBSD-4 */
-#  define NGI_GET_MSG(item, msg)	/* nothing */
-#  define NG_HOOK_FORCE_QUEUE(hook)	/* nothing */
-#  define NG_TYPE_REF(type) atomic_add_int(&(type)->refs, 1)
-#  define NG_TYPE_UNREF(type)	\
-do {				\
-  if ((type)->refs == 1)	\
-    LIST_REMOVE(type, types);	\
-  else				\
-    atomic_subtract_int(&(type)->refs, 1); \
-   } while (0)
-# endif
 
 /* It is an error to construct new copies of this Netgraph node. */
 /* All instances are constructed by ng_attach and are persistent. */
-# if (__FreeBSD_version >= 500000)
 static int ng_constructor(node_p  node) { return EINVAL; }
-# else /* FreeBSD-4 */
-static int ng_constructor(node_p *node) { return EINVAL; }
-# endif
 
 /* Incoming Netgraph control message. */
-# if (__FreeBSD_version >= 500000)
 static int
 ng_rcvmsg(node_p node, item_p item, hook_p lasthook)
   {
   struct ng_mesg *msg;
-# else /* FreeBSD-4 */
-static int
-ng_rcvmsg(node_p node, struct ng_mesg *msg,
- const char *retaddr,  struct ng_mesg **rptr)
-  {
-# endif
   struct ng_mesg *resp = NULL;
   softc_t *sc = NG_NODE_PRIVATE(node);
   int error = 0;
@@ -5072,16 +3964,8 @@ ng_rcvmsg(node_p node, struct ng_mesg *msg,
     error = EINVAL;
 
   /* Handle synchronous response. */
-# if (__FreeBSD_version >= 500000)
   NG_RESPOND_MSG(error, node, item, resp);
   NG_FREE_MSG(msg);
-# else /* FreeBSD-4 */
-  if (rptr != NULL)
-    *rptr = resp;
-  else if (resp != NULL)
-    free(resp, M_NETGRAPH);
-  free(msg, M_NETGRAPH);
-# endif
 
   return error;
   }
@@ -5090,14 +3974,9 @@ ng_rcvmsg(node_p node, struct ng_mesg *msg,
 static int
 ng_shutdown(node_p node)
   {
-# if (__FreeBSD_version >= 500000)
   /* unless told to really die, bounce back to life */
   if ((node->nd_flags & NG_REALLY_DIE)==0)
     node->nd_flags &= ~NG_INVALID; /* bounce back to life */
-# else /* FreeBSD-4 */
-  ng_cutlinks(node);
-  node->flags &= ~NG_INVALID;  /* bounce back to life */
-# endif
 
   return 0;
   }
@@ -5134,7 +4013,6 @@ ng_connect(hook_p hook)
 /* Transmit an mbuf-chain on the communication link. */
 /* This procedure is very similar to lmc_raw_output(). */
 /* Called from a syscall (user context; no spinlocks). */
-# if (__FreeBSD_version >= 500000)
 static int
 ng_rcvdata(hook_p hook, item_p item)
   {
@@ -5146,13 +4024,6 @@ ng_rcvdata(hook_p hook, item_p item)
   NGI_GET_M(item, m);
   NGI_GET_META(item, meta);
   NG_FREE_ITEM(item);
-# else /* FreeBSD-4 */
-static int
-ng_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
-  {
-  softc_t *sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-  int error = 0;
-# endif
 
   /* This macro must not store into meta! */
   NG_FREE_META(meta);
@@ -5172,17 +4043,10 @@ ng_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
   /* Some BSD QUEUE routines are not interrupt-safe. */
   {
   DISABLE_INTR;
-# if (__FreeBSD_version >= 503000)
   if (meta==NULL)
     IFQ_ENQUEUE(&sc->ng_sndq, m, error);
   else
     IFQ_ENQUEUE(&sc->ng_fastq, m, error);
-# else
-  if (meta==NULL)
-    IFQ_ENQUEUE(&sc->ng_sndq, m, NULL, error);
-  else
-    IFQ_ENQUEUE(&sc->ng_fastq, m, NULL, error);
-# endif
   ENABLE_INTR;
   }
 
@@ -5221,38 +4085,15 @@ struct ng_type ng_type =
   .mod_event	= NULL,
   .constructor	= ng_constructor,
   .rcvmsg	= ng_rcvmsg,
-# if (__FreeBSD_version >=503000)
   .close	= NULL,
-# endif
   .shutdown	= ng_shutdown,
   .newhook	= ng_newhook,
   .findhook	= NULL,
   .connect	= ng_connect,
   .rcvdata	= ng_rcvdata,
-# if (defined(__FreeBSD__) && (__FreeBSD_version < 500000))
-  .rcvdataq	= ng_rcvdata,
-# endif
   .disconnect	= ng_disconnect,
   };
 
-# if (IFNET == 0)
-/* Called from a softirq once a second. */
-static void
-ng_watchdog(void *arg)
-  {
-  softc_t *sc = arg;
-
-  /* Call the core watchdog procedure. */
-  core_watchdog(sc);
-
-  /* Set line protocol and package status. */
-  sc->status.line_pkg  = PKG_NG;
-  sc->status.line_prot = 0;
-
-  /* Call this procedure again after one second. */
-  callout_reset(&sc->callout, hz, ng_watchdog, sc);
-  }
-# endif
 
 /* Attach to the Netgraph kernel interface (/sys/netgraph).
  * It is called once for each physical card during device attach.
@@ -5292,11 +4133,9 @@ ng_attach(softc_t *sc)
     return error;
     }
 
-# if (__FreeBSD_version >= 500000)
   /* Initialize the send queue mutexes. */
   mtx_init(&sc->ng_sndq.ifq_mtx,  NAME_UNIT, "sndq",  MTX_DEF);
   mtx_init(&sc->ng_fastq.ifq_mtx, NAME_UNIT, "fastq", MTX_DEF);
-# endif
 
   /* Put a backpointer to the softc in the netgraph node. */
   NG_NODE_SET_PRIVATE(sc->ng_node, sc);
@@ -5307,10 +4146,6 @@ ng_attach(softc_t *sc)
   IFQ_SET_MAXLEN(&sc->ng_sndq,  SNDQ_MAXLEN);
   IFQ_SET_READY(&sc->ng_sndq);
 
-# if (IFNET == 0)
-  /* Arrange to call ng_watchdog() once a second. */
-  callout_reset(&sc->callout, hz, ng_watchdog, sc);
-# endif
 
   return 0;
   }
@@ -5319,18 +4154,11 @@ static void
 ng_detach(softc_t *sc)
   {
   callout_drain(&sc->callout);
-# if (__FreeBSD_version >= 500000)
   mtx_destroy(&sc->ng_sndq.ifq_mtx);
   mtx_destroy(&sc->ng_fastq.ifq_mtx);
   ng_rmnode_self(sc->ng_node); /* free hook */
   NG_NODE_UNREF(sc->ng_node);  /* free node */
   NG_TYPE_UNREF(&ng_type);
-# else /* FreeBSD-4 */
-  ng_unname(sc->ng_node);      /* free name */
-  ng_cutlinks(sc->ng_node);    /* free hook */
-  NG_NODE_UNREF(sc->ng_node);  /* free node */
-  NG_TYPE_UNREF(&ng_type);
-# endif
   }
 
 #endif /* NETGRAPH */
@@ -5490,21 +4318,15 @@ attach_card(softc_t *sc, const char *intrstr)
   /* Start the card. */
   if ((error = startup_card(sc))) return error;
 
-#  if (__FreeBSD_version >= 500000)
   callout_init(&sc->callout, 0);
-#  else  /* FreeBSD-4 */
-  callout_init(&sc->callout);
-#  endif
 
   /* Attach a kernel interface. */
 #if NETGRAPH
   if ((error = ng_attach(sc))) return error;
   sc->flags |= FLAG_NETGRAPH;
 #endif
-#if IFNET
   if ((error = lmc_ifnet_attach(sc))) return error;
   sc->flags |= FLAG_IFNET;
-#endif
 
   /* Attach a line protocol stack. */
   sc->config.line_pkg = PKG_RAWIP;
@@ -5571,14 +4393,12 @@ detach_card(softc_t *sc)
     sc->flags &= ~FLAG_NETGRAPH;
     }
 #endif
-#if IFNET
   if (sc->flags & FLAG_IFNET)
     {
     IFQ_PURGE(&sc->ifp->if_snd);
     lmc_ifnet_detach(sc);
     sc->flags &= ~FLAG_IFNET;
     }
-#endif
 
   /* Reset the Tulip chip; stops DMA and Interrupts. */
   shutdown_card(sc);
@@ -5586,7 +4406,6 @@ detach_card(softc_t *sc)
 
 /* This is the I/O configuration interface for FreeBSD */
 
-#ifdef __FreeBSD__
 
 static int
 fbsd_probe(device_t dev)
@@ -5642,10 +4461,8 @@ fbsd_detach(device_t dev)
     sc->csr_res = NULL;
     }
 
-# if (__FreeBSD_version >= 500000)
   mtx_destroy(&sc->top_mtx);
   mtx_destroy(&sc->bottom_mtx);
-# endif
   return 0; /* no error */
   }
 
@@ -5722,11 +4539,9 @@ fbsd_attach(device_t dev)
     return error;
     }
 
-# if (__FreeBSD_version >= 500000)
   /* Initialize the top-half and bottom-half locks. */
   mtx_init(&sc->top_mtx,    NAME_UNIT, "top half lock",    MTX_DEF);
   mtx_init(&sc->bottom_mtx, NAME_UNIT, "bottom half lock", MTX_DEF);
-# endif
 
   /* Start the card and attach a kernel interface and line protocol. */
   if ((error = attach_card(sc, ""))) detach_card(sc);
@@ -5747,11 +4562,7 @@ static driver_t driver =
   {
   .name    = DEVICE_NAME,
   .methods = methods,
-# if (__FreeBSD_version >= 500000)
   .size    = sizeof(softc_t),
-# else /* FreeBSD-4 */
-  .softc   = sizeof(softc_t),
-# endif
   };
 
 static devclass_t devclass;
@@ -5766,1281 +4577,13 @@ MODULE_DEPEND(lmc, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
 MODULE_DEPEND(lmc, sppp, 1, 1, 1);
 # endif
 
-#endif  /* __FreeBSD__ */
 
 /* This is the I/O configuration interface for NetBSD. */
 
-#ifdef __NetBSD__
-
-static int
-nbsd_match(struct device *parent, struct cfdata *match, void *aux)
-  {
-  struct pci_attach_args *pa = aux;
-  u_int32_t cfid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CFID);
-  u_int32_t csid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CSID);	
-
-  /* Looking for a DEC 21140A chip on any Lan Media Corp card. */
-  if (cfid != TLP_CFID_TULIP) return 0;
-  switch (csid)
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-    case TLP_CSID_T3:
-    case TLP_CSID_SSI:
-    case TLP_CSID_T1E1:
-      return 100;
-    default:
-      return 0;
-    }
-  }
-
-static int
-nbsd_detach(struct device *self, int flags)
-  {
-  softc_t *sc = (softc_t *)self; /* device is first in softc */
-
-  /* Stop the card and detach from the kernel. */
-  detach_card(sc);
-
-  /* Release resources. */
-  if (sc->sdh_cookie != NULL)
-    {
-    shutdownhook_disestablish(sc->sdh_cookie);
-    sc->sdh_cookie = NULL;
-    }
-  if (sc->irq_cookie != NULL)
-    {
-    pci_intr_disestablish(sc->pa_pc, sc->irq_cookie);
-    sc->irq_cookie = NULL;
-    }
-  if (sc->csr_handle)
-    {
-    bus_space_unmap(sc->csr_tag, sc->csr_handle, TLP_CSR_SIZE);
-    sc->csr_handle = 0;
-    }
-
-  return 0; /* no error */
-  }
-
-static void
-nbsd_attach(struct device *parent, struct device *self, void *aux)
-  {
-  softc_t *sc = (softc_t *)self; /* device is first in softc */
-  struct pci_attach_args *pa = aux;
-  const char *intrstr;
-  bus_addr_t csr_addr;
-  int error;
-
-  /* READ/WRITE_PCI_CFG need these. */
-  sc->pa_pc   = pa->pa_pc;
-  sc->pa_tag  = pa->pa_tag;
-  /* bus_dma needs this. */
-  sc->pa_dmat = pa->pa_dmat;
-
-  /* What kind of card are we driving? */
-  switch (READ_PCI_CFG(sc, TLP_CSID))
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-      sc->dev_desc =  HSSI_DESC;
-      sc->card     = &hssi_card;
-      break;
-    case TLP_CSID_T3:
-      sc->dev_desc =    T3_DESC;
-      sc->card     =   &t3_card;
-      break;
-    case TLP_CSID_SSI:
-      sc->dev_desc =   SSI_DESC;
-      sc->card     =  &ssi_card;
-      break;
-    case TLP_CSID_T1E1:
-      sc->dev_desc =  T1E1_DESC;
-      sc->card     =   &t1_card;
-      break;
-    default:
-      return;
-    }
-  printf(": %s\n", sc->dev_desc);
-
-  /* Allocate PCI resources to access the Tulip chip CSRs. */
-# if IOREF_CSR
-  csr_addr = (bus_addr_t)READ_PCI_CFG(sc, TLP_CBIO) & -2;
-  sc->csr_tag = pa->pa_iot;	/* bus_space tag for IO refs */
-# else
-  csr_addr = (bus_addr_t)READ_PCI_CFG(sc, TLP_CBMA);
-  sc->csr_tag = pa->pa_memt;	/* bus_space tag for MEM refs */
-# endif
-  if ((error = bus_space_map(sc->csr_tag, csr_addr,
-   TLP_CSR_SIZE, 0, &sc->csr_handle)))
-    {
-    printf("%s: bus_space_map() failed; error %d\n", NAME_UNIT, error);
-    return;
-    }
-
-  /* Allocate PCI interrupt resources. */
-  if ((error = pci_intr_map(pa, &sc->intr_handle)))
-    {
-    printf("%s: pci_intr_map() failed; error %d\n", NAME_UNIT, error);
-    nbsd_detach(self, 0);
-    return;
-    }
-  sc->irq_cookie = pci_intr_establish(pa->pa_pc, sc->intr_handle,
-   IPL_NET, bsd_interrupt, sc);
-  if (sc->irq_cookie == NULL)
-    {
-    printf("%s: pci_intr_establish() failed\n", NAME_UNIT);
-    nbsd_detach(self, 0);
-    return;
-    }
-  intrstr = pci_intr_string(pa->pa_pc, sc->intr_handle);
-
-  /* Install a shutdown hook. */
-  sc->sdh_cookie = shutdownhook_establish(shutdown_card, sc);
-  if (sc->sdh_cookie == NULL)
-    {
-    printf("%s: shutdown_hook_establish() failed\n", NAME_UNIT);
-    nbsd_detach(self, 0);
-    return;
-    }
-
-  /* Initialize the top-half and bottom-half locks. */
-  simple_lock_init(&sc->top_lock);
-  simple_lock_init(&sc->bottom_lock);
-
-  /* Start the card and attach a kernel interface and line protocol. */
-  if ((error = attach_card(sc, intrstr))) detach_card(sc);
-  }
-
-# if (__NetBSD_Version__ >= 106080000) /* 1.6H */
-CFATTACH_DECL(lmc, sizeof(softc_t),
- nbsd_match, nbsd_attach, nbsd_detach, NULL);
-# else
-struct cfattach lmc_ca =
-  {
-/*.ca_name	= DEVICE_NAME, */
-  .ca_devsize	= sizeof(softc_t),
-  .ca_match	= nbsd_match,
-  .ca_attach	= nbsd_attach,
-  .ca_detach	= nbsd_detach,
-  .ca_activate	= NULL,
-  };
-# endif
-
-# if (__NetBSD_Version__ >= 106080000)
-CFDRIVER_DECL(lmc, DV_IFNET, NULL);
-# else
-static struct cfdriver lmc_cd =
-  {
-  .cd_name	= DEVICE_NAME,
-  .cd_class	= DV_IFNET,
-  .cd_ndevs	= 0,
-  .cd_devs	= NULL,
-  };
-# endif
-
-/* cfdata is declared static, unseen outside this module. */
-/* It is used for LKM; config builds its own in ioconf.c. */
-static struct cfdata lmc_cf =
-  {
-# if (__NetBSD_Version__ >= 106080000)
-  .cf_name	= DEVICE_NAME,
-  .cf_atname    = DEVICE_NAME,
-# else
-  .cf_driver	= &lmc_cd,
-  .cf_attach	= &lmc_ca,
-# endif
-  .cf_unit	= 0,
-  .cf_fstate	= FSTATE_STAR,
-  };
-
-# if (__NetBSD_Version__ >= 106080000)
-MOD_MISC(DEVICE_NAME)
-# else
-static struct lkm_misc _module =
-  {
-  .lkm_name	= DEVICE_NAME,
-  .lkm_type	= LM_MISC,
-  .lkm_offset	= 0,
-  .lkm_ver	= LKM_VERSION,
-  };
-# endif
-
-/* From /sys/dev/pci/pci.c (no public prototype). */
-int pciprint(void *, const char *);
-
-static int lkm_nbsd_match(struct pci_attach_args *pa)
-  { return nbsd_match(0, 0, pa); }
-
-/* LKM loader finds this by appending "_lkmentry" to filename "if_lmc". */
-int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
-  {
-  int i, error = 0;
-
-  if (ver != LKM_VERSION) return EINVAL;
-  switch (cmd)
-    {
-    case LKM_E_LOAD:
-      {
-      struct cfdriver* pcicd;
-
-      lkmtp->private.lkm_misc = &_module;
-      if ((pcicd = config_cfdriver_lookup("pci")) == NULL)
-        {
-        printf("%s: config_cfdriver_lookup(pci) failed; error %d\n",
-         lmc_cd.cd_name, error);
-        return error;
-	}
-# if (__NetBSD_Version__ >= 106080000)
-      if ((error = config_cfdriver_attach(&lmc_cd)))
-        {
-        printf("%s: config_cfdriver_attach() failed; error %d\n",
-         lmc_cd.cd_name, error);
-        return error;
-        }
-      if ((error = config_cfattach_attach(lmc_cd.cd_name, &lmc_ca)))
-        {
-        printf("%s: config_cfattach_attach() failed; error %d\n",
-         lmc_cd.cd_name, error);
-        config_cfdriver_detach(&lmc_cd);
-        return error;
-        }
-# endif
-      for (i=0; i<pcicd->cd_ndevs; i++)
-        {
-        int dev;
-        /* A pointer to a device is a pointer to its softc. */
-        struct pci_softc *sc = pcicd->cd_devs[i];
-        if (sc == NULL) continue;
-        for (dev=0; dev<sc->sc_maxndevs; dev++)
-          {
-          struct pci_attach_args pa;
-          pcitag_t tag = pci_make_tag(sc->sc_pc, sc->sc_bus, dev, 0);
-          if (pci_probe_device(sc, tag, lkm_nbsd_match, &pa) != 0)
-            config_attach(pcicd->cd_devs[i], &lmc_cf, &pa, pciprint);
-            /* config_attach doesn't return on failure; it calls panic. */
-          }
-	}
-      break;
-      }
-    case LKM_E_UNLOAD:
-      {
-      for (i=lmc_cd.cd_ndevs-1; i>=0; i--)
-        {
-        struct device *dev = lmc_cd.cd_devs[i];
-        if (dev == NULL) continue;
-        if ((error = config_detach(dev, 0)))
-          {
-          printf("%s: config_detach() failed; error %d\n",
-           dev->dv_xname, error);
-          return error;
-	  }
-	}
-# if (__NetBSD_Version__ >= 106080000)
-      if ((error = config_cfattach_detach(lmc_cd.cd_name, &lmc_ca)))
-        {
-        printf("%s: config_cfattach_detach() failed; error %d\n",
-         lmc_cd.cd_name, error);
-        return error;
-        }
-      if ((error = config_cfdriver_detach(&lmc_cd)))
-        {
-        printf("%s: config_cfdriver_detach() failed; error %d\n",
-         lmc_cd.cd_name, error);
-        return error;
-        }
-# endif
-      break;
-      }
-    case LKM_E_STAT:
-      break;
-    }
-
-  return error;
-  }
-
-#endif  /* __NetBSD__ */
 
 /* This is the I/O configuration interface for OpenBSD. */
 
-#ifdef __OpenBSD__
-
-static int
-obsd_match(struct device *parent, void *match, void *aux)
-  {
-  struct pci_attach_args *pa = aux;
-  u_int32_t cfid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CFID);
-  u_int32_t csid = pci_conf_read(pa->pa_pc, pa->pa_tag, TLP_CSID);	
-
-  /* Looking for a DEC 21140A chip on any Lan Media Corp card. */
-  if (cfid != TLP_CFID_TULIP) return 0;
-  switch (csid)
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-    case TLP_CSID_T3:
-    case TLP_CSID_SSI:
-    case TLP_CSID_T1E1:
-      return 100; /* match better than other 21140 drivers */
-    default:
-      return 0;
-    }
-  }
-
-static int
-obsd_detach(struct device *self, int flags)
-  {
-  softc_t *sc = (softc_t *)self; /* device is first in softc */
-
-  /* Stop the card and detach from the kernel. */
-  detach_card(sc);
-
-  /* Release resources. */
-  if (sc->sdh_cookie != NULL)
-    {
-    shutdownhook_disestablish(sc->sdh_cookie);
-    sc->sdh_cookie = NULL;
-    }
-  if (sc->irq_cookie != NULL)
-    {
-    pci_intr_disestablish(sc->pa_pc, sc->irq_cookie);
-    sc->irq_cookie = NULL;
-    }
-  if (sc->csr_handle)
-    {
-    bus_space_unmap(sc->csr_tag, sc->csr_handle, TLP_CSR_SIZE);
-    sc->csr_handle = 0;
-    }
-
-  return 0; /* no error */
-  }
-
-static void
-obsd_attach(struct device *parent, struct device *self, void *aux)
-  {
-  softc_t *sc = (softc_t *)self; /* device is first in softc */
-  struct pci_attach_args *pa = aux;
-  const char *intrstr;
-  bus_addr_t csr_addr;
-  int error;
-
-  /* READ/WRITE_PCI_CFG need these. */
-  sc->pa_pc   = pa->pa_pc;
-  sc->pa_tag  = pa->pa_tag;
-  /* bus_dma needs this. */
-  sc->pa_dmat = pa->pa_dmat;
-
-  /* What kind of card are we driving? */
-  switch (READ_PCI_CFG(sc, TLP_CSID))
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-      sc->dev_desc =  HSSI_DESC;
-      sc->card     = &hssi_card;
-      break;
-    case TLP_CSID_T3:
-      sc->dev_desc =    T3_DESC;
-      sc->card     =   &t3_card;
-      break;
-    case TLP_CSID_SSI:
-      sc->dev_desc =   SSI_DESC;
-      sc->card     =  &ssi_card;
-      break;
-    case TLP_CSID_T1E1:
-      sc->dev_desc =  T1E1_DESC;
-      sc->card     =   &t1_card;
-      break;
-    default:
-      return;
-    }
-  printf(": %s\n", sc->dev_desc);
-
-  /* Allocate PCI resources to access the Tulip chip CSRs. */
-# if IOREF_CSR
-  csr_addr = (bus_addr_t)READ_PCI_CFG(sc, TLP_CBIO) & -2;
-  sc->csr_tag = pa->pa_iot;	/* bus_space tag for IO refs */
-# else
-  csr_addr = (bus_addr_t)READ_PCI_CFG(sc, TLP_CBMA);
-  sc->csr_tag = pa->pa_memt;	/* bus_space tag for MEM refs */
-# endif
-  if ((error = bus_space_map(sc->csr_tag, csr_addr,
-   TLP_CSR_SIZE, 0, &sc->csr_handle)))
-    {
-    printf("%s: bus_space_map() failed; error %d\n", NAME_UNIT, error);
-    return;
-    }
-
-  /* Allocate PCI interrupt resources. */
-  if ((error = pci_intr_map(pa, &sc->intr_handle)))
-    {
-    printf("%s: pci_intr_map() failed; error %d\n", NAME_UNIT, error);
-    obsd_detach(self, 0);
-    return;
-    }
-  sc->irq_cookie = pci_intr_establish(pa->pa_pc, sc->intr_handle,
-   IPL_NET, bsd_interrupt, sc, self->dv_xname);
-  if (sc->irq_cookie == NULL)
-    {
-    printf("%s: pci_intr_establish() failed\n", NAME_UNIT);
-    obsd_detach(self, 0);
-    return;
-    }
-  intrstr = pci_intr_string(pa->pa_pc, sc->intr_handle);
-
-  /* Install a shutdown hook. */
-  sc->sdh_cookie = shutdownhook_establish(shutdown_card, sc);
-  if (sc->sdh_cookie == NULL)
-    {
-    printf("%s: shutdown_hook_establish() failed\n", NAME_UNIT);
-    obsd_detach(self, 0);
-    return;
-    }
-
-  /* Initialize the top-half and bottom-half locks. */
-  simple_lock_init(&sc->top_lock);
-  simple_lock_init(&sc->bottom_lock);
-
-  /* Start the card and attach a kernel interface and line protocol. */
-  if ((error = attach_card(sc, intrstr))) detach_card(sc);
-  }
-
-struct cfattach lmc_ca =
-  {
-  .ca_devsize	= sizeof(softc_t),
-  .ca_match	= obsd_match,
-  .ca_attach	= obsd_attach,
-  .ca_detach	= obsd_detach,
-  .ca_activate	= NULL,
-  };
-
-struct cfdriver lmc_cd =
-  {
-  .cd_name	= DEVICE_NAME,
-  .cd_devs	= NULL,
-  .cd_class	= DV_IFNET,
-  .cd_indirect	= 0,
-  .cd_ndevs	= 0,
-  };
-
-/* cfdata is declared static, unseen outside this module. */
-/* It is used for LKM; config builds its own in ioconf.c. */
-static struct cfdata lmc_cfdata =
-  {
-  .cf_attach	= &lmc_ca,
-  .cf_driver	= &lmc_cd,
-  .cf_unit	= 0,
-  .cf_fstate	= FSTATE_STAR,
-  };
-
-static struct lkm_any _module =
-  {
-  .lkm_name	= DEVICE_NAME,
-  .lkm_type	= LM_MISC,
-  .lkm_offset	= 0,
-  .lkm_ver	= LKM_VERSION,
-  };
-
-/* From /sys/dev/pci/pci.c (no public prototype). */
-int pciprint(void *, const char *);
-
-extern struct cfdriver pci_cd;
-
-/* LKM loader finds this by appending "_lkmentry" to filename "if_lmc". */
-int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
-  {
-  int i, error = 0;
-
-  if (ver != LKM_VERSION) return EINVAL;
-  switch (cmd)
-    {
-    case LKM_E_LOAD:
-      {  /* XXX This works for ONE card on pci0 of a i386 machine! XXX */
-      lkmtp->private.lkm_any = &_module;
-      for (i=0; i<pci_cd.cd_ndevs; i++)
-        {
-        struct pci_attach_args pa;
-        struct device *parent = pci_cd.cd_devs[i];
-        if (parent == NULL) continue; /* dead clone? */
-        if ((parent->dv_unit)!=0) continue; /* only bus zero */
-        /* XXX For machine independence, need: pcibus_attach_args. XXX */
-        /* XXX See NetBSD's sys/dev/pci/pci.c/pci_probe_device.    XXX */
-        /* XXX Why isn't there an LKM network interface module?    XXX */
-        pa.pa_pc    = NULL;					/* XXX */
-        pa.pa_bus   = 0;					/* XXX */
-        pa.pa_iot   = X86_BUS_SPACE_IO;				/* XXX */
-        pa.pa_memt  = X86_BUS_SPACE_MEM;			/* XXX */
-        pa.pa_dmat  = &pci_bus_dma_tag;				/* XXX */
-        for (pa.pa_device=0; pa.pa_device<32; pa.pa_device++)	/* XXX */
-          {
-          int intr;
-          pa.pa_function = 0; /* DEC-21140A has function 0 only    XXX */
-          pa.pa_tag = pci_make_tag(pa.pa_pc, pa.pa_bus, pa.pa_device, 0);
-          pa.pa_id = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_ID_REG);
-          if ((pa.pa_id & 0xFFFF) == 0xFFFF) continue;
-          if ((pa.pa_id & 0xFFFF) == 0) continue;
-          /* XXX this only works for pci0 -- no swizzelling        XXX */
-          pa.pa_intrswiz = 0;
-          pa.pa_intrtag = pa.pa_tag;
-          intr = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_INTERRUPT_REG);
-          pa.pa_intrline = PCI_INTERRUPT_LINE(intr);
-          pa.pa_intrpin = ((PCI_INTERRUPT_PIN(intr) -1) % 4) +1;
-          if (obsd_match(parent, &lmc_cfdata, &pa))
-            config_attach(parent, &lmc_cfdata, &pa, pciprint);
-          /* config_attach doesn't return on failure; it calls panic. */
-          }
-	}
-      break;
-      }
-    case LKM_E_UNLOAD:
-      {
-      for (i=lmc_cd.cd_ndevs-1; i>=0; i--)
-        {
-        struct device *dev = lmc_cd.cd_devs[i];
-        if (dev == NULL) continue;
-        if ((error = config_detach(dev, 0)))
-          printf("%s: config_detach() failed; error %d\n", dev->dv_xname, error);
-        }
-      break;
-      }
-    case LKM_E_STAT:
-      break;
-    }
-
-  return error;
-  }
-
-#endif  /* __OpenBSD__ */
 
 /* This is the I/O configuration interface for BSD/OS. */
 
-#ifdef __bsdi__
 
-static int
-bsdi_match(pci_devaddr_t *pa)
-  {
-  u_int32_t cfid = pci_inl(pa, TLP_CFID);
-  u_int32_t csid = pci_inl(pa, TLP_CSID);
-
-  /* Looking for a DEC 21140A chip on any Lan Media Corp card. */
-  if (cfid != TLP_CFID_TULIP) return 0;
-  switch (csid)
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-    case TLP_CSID_T3:
-    case TLP_CSID_SSI:
-    case TLP_CSID_T1E1:
-      return 1;
-    default:
-      return 0;
-    }
-  }
-
-static int
-bsdi_probe(struct device *parent, struct cfdata *cf, void *aux)
-  {
-  struct isa_attach_args *ia = aux;
-  pci_devaddr_t *pa = NULL;
-  pci_devres_t res;
-
-  /* This must be a PCI bus. */
-  if (ia->ia_bustype != BUS_PCI) return 0;
-
-  /* Scan PCI bus for our boards. */
-  if ((pa = pci_scan(bsdi_match)) == 0) return 0;
-
-  /* Scan config space for IO and MEM base registers and IRQ info. */
-  pci_getres(pa, &res, 1, ia);
-
-  /* Crucial: pass pci_devaddr to bsdi_attach in ia_aux. */
-  ia->ia_aux = (void *)pa;
-
-  return 1;
-  }
-
-static void
-bsdi_attach(struct device *parent, struct device *self, void *aux)
-  {
-  softc_t *sc = (softc_t *)self; /* device is first in softc */
-  struct isa_attach_args *ia = aux;
-  pci_devaddr_t *pa = ia->ia_aux; /* this is crucial! */
-  int error;
-
-  /* READ/WRITE_PCI_CFG need this. */
-  sc->cfgbase = *pa;
-
-  /* What kind of card are we driving? */
-  switch (READ_PCI_CFG(sc, TLP_CSID))
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-      sc->dev_desc =  HSSI_DESC;
-      sc->card     = &hssi_card;
-      break;
-    case TLP_CSID_T3:
-      sc->dev_desc =    T3_DESC;
-      sc->card     =   &t3_card;
-      break;
-    case TLP_CSID_SSI:
-      sc->dev_desc =   SSI_DESC;
-      sc->card     =  &ssi_card;
-      break;
-    case TLP_CSID_T1E1:
-      sc->dev_desc =  T1E1_DESC;
-      sc->card     =   &t1_card;
-      break;
-    default:
-      return;
-    }
-  printf(": %s\n", sc->dev_desc);
-
-  /* Allocate PCI memory or IO resources to access the Tulip chip CSRs. */
-  sc->csr_iobase  = ia->ia_iobase;
-  sc->csr_membase = (u_int32_t *)mapphys((vm_offset_t)ia->ia_maddr, TLP_CSR_SIZE);
-
-  /* Attach to the PCI bus. */
-  isa_establish(&sc->id, &sc->dev);
-
-  /* Allocate PCI interrupt resources for the card. */
-  sc->ih.ih_fun = bsd_interrupt;
-  sc->ih.ih_arg = sc;
-  intr_establish(ia->ia_irq, &sc->ih, DV_NET);
-
-  /* Install a shutdown hook. */
-  sc->ats.func = shutdown_card;
-  sc->ats.arg = sc;
-  atshutdown(&sc->ats, ATSH_ADD);
-
-  /* Initialize the top-half and bottom-half locks. */
-  simple_lock_init(&sc->top_lock);
-  simple_lock_init(&sc->bottom_lock);
-
-  /* Start the card and attach a kernel interface and line protocol. */
-  if ((error = attach_card(sc, ""))) detach_card(sc);
-  }
-
-struct cfdriver lmccd =
-  {
-  .cd_devs	= NULL,
-  .cd_name	= DEVICE_NAME,
-  .cd_match	= bsdi_probe,
-  .cd_attach	= bsdi_attach,
-  .cd_class	= DV_IFNET,
-  .cd_devsize	= sizeof(softc_t),
-  };
-#endif  /* __bsdi__ */
-
-#ifdef __linux__
-
-/* The kernel calls this procedure when an interrupt happens. */
-static irqreturn_t
-linux_interrupt(int irq, void *dev, struct pt_regs *regs)
-  {
-  struct net_device *net_dev = dev;
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-
-  /* Cut losses early if this is not our interrupt. */
-  if ((READ_CSR(TLP_STATUS) & TLP_INT_TXRX) == 0)
-    return IRQ_NONE;
-
-  /* Disable card interrupts. */
-  WRITE_CSR(TLP_INT_ENBL, TLP_INT_DISABLE);
-
-  /* Handle the card interrupt with the dev->poll method. */
-  if (netif_rx_schedule_prep(net_dev))
-    __netif_rx_schedule(net_dev);  /* NAPI - add to poll list */
-  else
-    printk("%s: interrupt while on poll list\n", NAME_UNIT);
-
-  return IRQ_HANDLED;
-  }
-
-/* This net_device method services interrupts in a softirq. */
-/* With rxintr_cleanup(), it implements input flow control. */
-static int
-linux_poll(struct net_device *net_dev, int *budget)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-  int received;
-
-  /* Yes, we do NAPI. */
-  /* Allow processing up to net_dev->quota incoming packets. */
-  /* This is the ONLY time core_interrupt() may process rx pkts. */
-  /* Otherwise (sc->quota == 0) and rxintr_cleanup() is a NOOP. */
-  sc->quota = net_dev->quota;
-
-  /* Handle the card interrupt with kernel ints enabled. */
-  /* Process rx pkts (and tx pkts, too). */
-  /* Card interrupts are disabled. */
-  core_interrupt(sc, 0);
-
-  /* Report number of rx packets processed. */
-  received = net_dev->quota - sc->quota;
-  net_dev->quota -= received;
-  *budget        -= received;
-
-  /* if quota prevented processing all rx pkts, leave rx ints disabled */
-  if (sc->quota == 0)  /* this is off by one...but harmless */
-    {
-    WRITE_CSR(TLP_INT_ENBL, TLP_INT_TX);
-    return 1; /* more pkts to handle -- reschedule */
-    }
-
-  sc->quota = 0;  /* disable rx pkt processing by rxintr_cleanup() */
-  netif_rx_complete(net_dev); /* NAPI - remove from poll list */
-
-  /* Enable card interrupts. */
-  WRITE_CSR(TLP_INT_ENBL, TLP_INT_TXRX);
-  return 0;
-  }
-
-/* These next routines are similar to BSD's ifnet kernel/driver interface. */
-
-/* This net_device method hands outgoing packets to the transmitter. */
-/* With txintr_setup(), it implements output flow control. */
-/* Called from a syscall (user context; no spinlocks). */
-static int
-linux_start(struct sk_buff *skb, struct net_device *net_dev)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-
-  if (sc->tx_skb == NULL)
-    {
-    /* Put this skb where the transmitter will see it. */
-    sc->tx_skb = skb;
-
-    /* Start the transmitter; incoming pkts are NOT processed. */
-    user_interrupt(sc, 0);
-
-    /* If the tx didn't take the skb then stop the queue. */
-    /* This can happen if another CPU is in core_interrupt(). */
-    if (sc->tx_skb != NULL) netif_stop_queue(net_dev);
-
-    return 0;
-    }
-
-  /* This shouldn't happen; skb is NOT consumed. */
-  if (netif_queue_stopped(net_dev))
-    printk("%s: dev->start() called with queue stopped\n", NAME_UNIT);
-  else
-    netif_stop_queue(net_dev);
-
-  return 1;
-  }
-
-/* This net_device method restarts the transmitter if it hangs. */
-/* Called from a softirq. */
-static void
-linux_timeout(struct net_device *net_dev)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-
-  /* Start the transmitter; incoming packets are NOT processed. */
-  user_interrupt(sc, 1);
-  }
-
-/* This net_device method handles IOCTL syscalls. */
-/* Called from a syscall (user context; no spinlocks; can sleep). */
-static int
-linux_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-  int error = 0;
-
-  if ((cmd >= SIOCDEVPRIVATE) && (cmd <= SIOCDEVPRIVATE+15))
-    {
-    struct iohdr *iohdr = (struct iohdr *)ifr;
-    u_int16_t direction = iohdr->direction;
-    u_int16_t length = iohdr->length;
-    char *user_addr = (char *)iohdr->iohdr;
-    char *kern_addr;
-
-    if (iohdr->cookie != NGM_LMC_COOKIE) return -EINVAL;
-
-    /* Emulate a BSD-style IOCTL syscall. */
-    kern_addr = kmalloc(length, GFP_KERNEL);
-    if (kern_addr == NULL)
-      error = -ENOMEM;
-    if ((error == 0) && ((direction & DIR_IOW) != 0))
-      error = copy_from_user(kern_addr, user_addr, length);
-    if (error == 0)
-      error = -core_ioctl(sc, (unsigned long)cmd, kern_addr);
-    if ((error == 0) && ((direction & DIR_IOR) != 0))
-      error = copy_to_user(user_addr, kern_addr, length);
-    kfree(kern_addr);
-    }
-# if GEN_HDLC
-  else if (cmd == SIOCWANDEV)
-    {
-    const size_t size = sizeof(sync_serial_settings);
-
-    switch (ifr->ifr_settings.type)
-      {
-      case IF_GET_IFACE: /* get interface config */
-        {
-        ifr->ifr_settings.type = IF_IFACE_SYNC_SERIAL;
-        if (ifr->ifr_settings.size < size)
-          {
-          ifr->ifr_settings.size = size;
-          error = -ENOBUFS;
-	  }
-        else
-          {
-          if (sc->config.tx_clk_src == CFG_CLKMUX_ST)
-            sc->hdlc_settings.clock_type = CLOCK_EXT;
-          if (sc->config.tx_clk_src == CFG_CLKMUX_INT)
-            sc->hdlc_settings.clock_type = CLOCK_TXINT;
-          if (sc->config.tx_clk_src == CFG_CLKMUX_RT)
-            sc->hdlc_settings.clock_type = CLOCK_TXFROMRX;
-          sc->hdlc_settings.loopback = (sc->config.loop_back != CFG_LOOP_NONE) ? 1:0;
-          sc->hdlc_settings.clock_rate = sc->status.tx_speed;
-          error = copy_to_user(ifr->ifr_settings.ifs_ifsu.sync,
-           &sc->hdlc_settings, size);
-	  }
-        break;
-	}
-      case IF_IFACE_SYNC_SERIAL: /* set interface config */
-        {
-        if (!capable(CAP_NET_ADMIN))
-          error = -EPERM;
-        if (error == 0) 
-          error = copy_from_user(&sc->hdlc_settings,
-          ifr->ifr_settings.ifs_ifsu.sync, size);
-        /* hdlc_settings are currently ignored. */
-        break;
-	}
-      default:  /* Pass the rest to the line protocol code. */
-        {
-        error = hdlc_ioctl(net_dev, ifr, cmd);
-        break;
-	}
-      }
-    }
-# endif /* GEN_HDLC */
-  else /* unknown IOCTL command */
-    error = -EINVAL;
-
-  if (DRIVER_DEBUG)
-    printk("%s: linux_ioctl; cmd=0x%08x error=%d\n",
-     NAME_UNIT, cmd, error);
-
-  return error;
-  }
-
-/* This net_device method returns a pointer to device statistics. */
-static struct net_device_stats *
-linux_stats(struct net_device *net_dev)
-  {
-# if GEN_HDLC
-  return &dev_to_hdlc(net_dev)->stats;
-# else
-  softc_t *sc = net_dev->priv;
-  return &sc->net_stats;
-# endif
-  }
-
-/* Called from a softirq once a second. */
-static void
-linux_watchdog(unsigned long softc)
-  {
-  softc_t *sc = (softc_t *)softc;
-  u_int8_t old_oper_status = sc->status.oper_status;
-  struct event_cntrs *cntrs = &sc->status.cntrs;
-  struct net_device_stats *stats = linux_stats(sc->net_dev);
-
-  core_watchdog(sc); /* updates oper_status */
-
-  /* Notice change in link status. */
-  if     ((old_oper_status != STATUS_UP) &&
-   (sc->status.oper_status == STATUS_UP))  /* link came up */
-    {
-    hdlc_set_carrier(1, sc->net_dev);
-    netif_wake_queue(sc->net_dev);
-    }
-  if     ((old_oper_status == STATUS_UP) &&
-   (sc->status.oper_status != STATUS_UP))  /* link went down */
-    {
-    hdlc_set_carrier(0, sc->net_dev);
-    netif_stop_queue(sc->net_dev);
-    }
-
-  /* Notice change in line protocol. */
-  if (sc->config.line_pkg == PKG_RAWIP)
-    {
-    sc->status.line_pkg  = PKG_RAWIP;
-    sc->status.line_prot = PROT_IP_HDLC;
-    }
-# if GEN_HDLC
-  else
-    {
-    sc->status.line_pkg  = PKG_GEN_HDLC;
-    switch (sc->hdlc_dev->proto.id)
-      {
-      case IF_PROTO_PPP:
-        sc->status.line_prot = PROT_PPP;
-        break;
-      case IF_PROTO_CISCO:
-        sc->status.line_prot = PROT_C_HDLC;
-        break;
-      case IF_PROTO_FR:
-        sc->status.line_prot = PROT_FRM_RLY;
-        break;
-      case IF_PROTO_HDLC:
-        sc->status.line_prot = PROT_IP_HDLC;
-        break;
-      case IF_PROTO_X25:
-        sc->status.line_prot = PROT_X25;
-        break;
-      case IF_PROTO_HDLC_ETH:
-        sc->status.line_prot = PROT_ETH_HDLC;
-        break;
-      default:
-        sc->status.line_prot = 0;
-        break;
-      }
-    }
-# endif /* GEN_HDLC */
-
-  /* Copy statistics from sc to net_dev for get_stats(). */
-  stats->rx_packets       = cntrs->ipackets;
-  stats->tx_packets       = cntrs->opackets;
-  stats->rx_bytes         = cntrs->ibytes;
-  stats->tx_bytes         = cntrs->obytes;
-  stats->rx_errors        = cntrs->ierrors;
-  stats->tx_errors        = cntrs->oerrors;
-  stats->rx_dropped       = cntrs->idiscards;
-  stats->tx_dropped       = cntrs->odiscards;
-  stats->rx_fifo_errors   = cntrs->fifo_over;
-  stats->tx_fifo_errors   = cntrs->fifo_under;
-  stats->rx_missed_errors = cntrs->missed;
-  stats->rx_over_errors   = cntrs->overruns;
-
-  /* Call this procedure again after one second. */
-  sc->wd_timer.expires = jiffies + HZ; /* now plus one second */
-  add_timer(&sc->wd_timer);
-  }
-
-/* This is the I/O configuration interface for Linux. */
-
-/* This net_device method is called when IFF_UP goes false. */
-static int
-linux_stop(struct net_device *net_dev)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-
-  /* Stop the card and detach from the kernel. */
-  detach_card(sc);  /* doesn't fail */
-
-  free_irq(net_dev->irq, net_dev); /* doesn't fail */
-
-  del_timer(&sc->wd_timer); /* return value ignored */
-
-  return 0;
-  }
-
-/* This net_device method is called when IFF_UP goes true. */
-static int
-linux_open(struct net_device *net_dev)
-  {
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-  int error;
-
-  /* Allocate PCI interrupt resources for the card. */
-  if ((error = request_irq(net_dev->irq, &linux_interrupt, SA_SHIRQ,
-   NAME_UNIT, net_dev)))
-    {
-    printk("%s: request_irq() failed; error %d\n", NAME_UNIT, error);
-    return error;
-    }
-
-  /* Arrange to call linux_watchdog() once a second. */
-  init_timer(&sc->wd_timer);
-  sc->wd_timer.expires  = jiffies + HZ; /* now plus one second */
-  sc->wd_timer.function = &linux_watchdog;
-  sc->wd_timer.data     = (unsigned long) sc;
-  add_timer(&sc->wd_timer);
-
-  /* Start the card and attach a kernel interface and line protocol. */
-  if ((error = -attach_card(sc, "")))
-    linux_stop(net_dev);
-  else
-    {
-    net_dev->weight = sc->rxring.num_descs; /* input flow control */
-    netif_start_queue(net_dev);            /* output flow control */
-    }
-
-  return error;
-  }
-
-# if GEN_HDLC
-static int
-hdlc_attach(struct net_device *net_dev,
- unsigned short encoding, unsigned short parity)
-  { return 0; }
-# endif
-
-/* This pci_driver method is called during shutdown or module-unload. */
-/* This is called from user context; can sleep; no spinlocks! */
-static void __exit
-linux_remove(struct pci_dev *pci_dev)
-  {
-  struct net_device *net_dev = (struct net_device *)pci_get_drvdata(pci_dev);
-  softc_t *sc = dev_to_hdlc(net_dev)->priv;
-
-  if (net_dev == NULL) return;
-
-  /* Assume that linux_stop() has already been called. */
-  if (sc->flags & FLAG_NETDEV)
-# if GEN_HDLC
-    unregister_hdlc_device(net_dev);
-# else
-    unregister_netdev(net_dev);
-# endif
-
-# if (IOREF_CSR == 0)
-  if (sc->csr_membase != NULL)
-    iounmap(sc->csr_membase);
-# endif
-
-  pci_disable_device(pci_dev);
-
-  if (sc->csr_iobase != 0)
-    pci_release_regions(pci_dev);
-
-  pci_set_drvdata(pci_dev, NULL);
-
-  kfree(sc);
-  free_netdev(net_dev);
-  }
-
-static void
-setup_netdev(struct net_device *net_dev)
-  {
-  /* Initialize the generic network device. */
-  /* Note similarity to BSD's lmc_ifnet_attach(). */
-  net_dev->flags           = IFF_POINTOPOINT;
-  net_dev->flags          |= IFF_RUNNING;
-  net_dev->open            = linux_open;
-  net_dev->stop            = linux_stop;
-  net_dev->hard_start_xmit = linux_start;
-  net_dev->do_ioctl        = linux_ioctl;
-  net_dev->get_stats       = linux_stats;
-  net_dev->tx_timeout      = linux_timeout;
-  net_dev->poll            = linux_poll;
-  net_dev->watchdog_timeo  = 1 * HZ;
-  net_dev->tx_queue_len    = SNDQ_MAXLEN;
-  net_dev->mtu             = MAX_DESC_LEN;
-  net_dev->type            = ARPHRD_RAWHDLC;
-/* The receiver generates frag-lists for packets >4032 bytes.   */
-/* The transmitter accepts scatter/gather lists and frag-lists. */
-/* However Linux linearizes outgoing packets since our hardware */
-/*  doesn't compute soft checksums.  All that work for nothing! */
-/*net_dev->features       |= NETIF_F_SG; */
-/*net_dev->features       |= NETIF_F_FRAGLIST; */
-  }
-
-/* This pci_driver method is called during boot or module-load. */
-/* This is called from user context; can sleep; no spinlocks! */
-static int __init
-linux_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
-  {
-  u_int32_t cfid, csid;
-  struct net_device *net_dev;
-  softc_t *sc;
-  int error;
-
-  /* Looking for a DEC 21140A chip on any Lan Media Corp card. */
-  pci_read_config_dword(pci_dev, TLP_CFID, &cfid);
-  if (cfid != TLP_CFID_TULIP) return -ENXIO;
-  pci_read_config_dword(pci_dev, TLP_CSID, &csid);
-  switch (csid)
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-    case TLP_CSID_T3:
-    case TLP_CSID_SSI:
-    case TLP_CSID_T1E1:
-      break;
-    default:
-      return -ENXIO;
-    }
-
-  /* Declare that these cards use 32-bit single-address PCI cycles. */
-  if ((error = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)))
-    {
-    printk("%s: pci_set_dma_mask() failed; error %d\n", DEVICE_NAME, error);
-    return error;
-    }
-  pci_set_consistent_dma_mask(pci_dev, DMA_32BIT_MASK); /* can't fail */
-
-# if GEN_HDLC /* generic-hdlc line protocols */
-
-  /* device driver instance data, aka Soft Context or sc */
-  if ((sc = kmalloc(sizeof(softc_t), GFP_KERNEL)) == NULL)
-    {
-    printk("%s: kmalloc() failed\n", DEVICE_NAME);
-    return -ENOMEM;
-    }
-  memset(sc, 0, sizeof(softc_t));
-
-  /* Allocate space for the HDLC network device struct. */
-  if ((net_dev = alloc_hdlcdev(sc)) == NULL)
-    {
-    printk("%s: alloc_hdlcdev() failed\n", DEVICE_NAME);
-    kfree(sc);
-    return -ENOMEM;
-    }
-
-  /* Initialize the network device struct. */
-  setup_netdev(net_dev);
-
-  /* Initialize the HDLC extension to the network device. */
-  sc->hdlc_dev         = dev_to_hdlc(net_dev);
-  sc->hdlc_dev->attach = hdlc_attach; /* noop for this driver */
-  sc->hdlc_dev->xmit   = linux_start; /* the REAL hard_start_xmit() */
-
-# else /* GEN_HDLC */ /* no line protocol. */
-
-  /* Allocate space for the bare network device struct. */
-  net_dev = alloc_netdev(sizeof(softc_t), DEVICE_NAME"%d", setup_netdev);
-  if (net_dev == NULL)
-    {
-    printk("%s: alloc_netdev() failed\n", DEVICE_NAME);
-    return -ENOMEM;
-    }
-  /* device driver instance data, aka Soft Context or sc */
-  sc = net_dev->priv;
-
-# endif /* GEN_HDLC */
-
-  sc->net_dev = net_dev;  /* NAME_UNIT macro needs this */
-  sc->pci_dev = pci_dev;  /* READ/WRITE_PCI_CFG macros need this */
-
-  /* Cross-link pci_dev and net_dev. */
-  pci_set_drvdata(pci_dev, net_dev);      /* pci_dev->driver_data = net_dev */
-  SET_NETDEV_DEV(net_dev, &pci_dev->dev); /* net_dev->class_dev.dev = &pci_dev->dev */
-  SET_MODULE_OWNER(net_dev);              /* ??? NOOP in linux-2.6.3. ??? */
-
-  /* Sets cfcs.io and cfcs.mem; sets pci_dev->irq based on cfit.int */
-  if ((error = pci_enable_device(pci_dev)))
-    {
-    printk("%s: pci_enable_device() failed; error %d\n", DEVICE_NAME, error);
-    linux_remove(pci_dev);
-    return error;
-    }
-  net_dev->irq = pci_dev->irq; /* linux_open/stop need this */
-
-  /* Allocate PCI memory and IO resources to access the Tulip chip CSRs. */
-  if ((error = pci_request_regions(pci_dev, DEVICE_NAME)))
-    {
-    printk("%s: pci_request_regions() failed; error %d\n", DEVICE_NAME, error);
-    linux_remove(pci_dev);
-    return error;
-    }
-  net_dev->base_addr = pci_resource_start(pci_dev, 0);
-  net_dev->mem_start = pci_resource_start(pci_dev, 1);
-  net_dev->mem_end   = pci_resource_end(pci_dev, 1);
-  sc->csr_iobase     = net_dev->base_addr;
-
-# if (IOREF_CSR == 0)
-  sc->csr_membase = ioremap_nocache(net_dev->mem_start, TLP_CSR_SIZE);
-  if (sc->csr_membase == NULL)
-    {
-    printk("%s: ioremap_nocache() failed\n", DEVICE_NAME);
-    linux_remove(pci_dev);
-    return -EFAULT;
-    }
-# endif
-
-  /* Sets cfcs.master, enabling PCI DMA; checks latency timer value. */
-  pci_set_master(pci_dev); /* Later, attach_card() does this too. */
-
-  /* Initialize the top-half and bottom-half locks. */
-  /* Top_lock must be initialized before net_dev is registered. */
-  init_MUTEX(&sc->top_lock);
-  spin_lock_init(&sc->bottom_lock);
-
-# if GEN_HDLC
-  if ((error = register_hdlc_device(net_dev)))
-    {
-    printk("%s: register_hdlc_device() failed; error %d\n", DEVICE_NAME, error);
-    linux_remove(pci_dev);
-    return error;
-    }
-# else
-  if ((error = register_netdev(net_dev)))
-    {
-    printk("%s: register_netdev() failed; error %d\n", DEVICE_NAME, error);
-    linux_remove(pci_dev);
-    return error;
-    }
-# endif
-  /* The NAME_UNIT macro now works.  Use DEVICE_NAME before this. */
-  sc->flags |= FLAG_NETDEV;
-
-  /* What kind of card are we driving? */
-  switch (READ_PCI_CFG(sc, TLP_CSID))
-    {
-    case TLP_CSID_HSSI:
-    case TLP_CSID_HSSIc:
-      sc->dev_desc =  HSSI_DESC;
-      sc->card     = &hssi_card;
-      break;
-    case TLP_CSID_T3:
-      sc->dev_desc =    T3_DESC;
-      sc->card     =   &t3_card;
-      break;
-    case TLP_CSID_SSI:
-      sc->dev_desc =   SSI_DESC;
-      sc->card     =  &ssi_card;
-      break;
-    case TLP_CSID_T1E1:
-      sc->dev_desc =  T1E1_DESC;
-      sc->card     =   &t1_card;
-      break;
-    default: /* shouldn't happen! */
-      linux_remove(pci_dev);
-      return -ENXIO;
-    }
-
-  /* Announce the hardware on the console. */
-  printk("%s: <%s> io 0x%04lx/9 mem 0x%08lx/25 rom 0x%08lx/14 irq %d pci %s\n",
-   NAME_UNIT, sc->dev_desc, pci_resource_start(pci_dev, 0),
-   pci_resource_start(pci_dev, 1), pci_resource_start(pci_dev, 6),
-   pci_dev->irq, pci_name(pci_dev));
-
-  return 0;
-  }
-
-/* This pci driver knows how to drive these devices: */
-static __initdata struct pci_device_id pci_device_id_tbl[] =
-  {
-  /* Looking for a DEC 21140A chip on any Lan Media Corp card. */
-    { 0x1011, 0x0009, 0x1376, PCI_ANY_ID, 0, 0, 0 },
-    {      0,      0,      0,          0, 0, 0, 0 }
-  };
-MODULE_DEVICE_TABLE(pci, pci_device_id_tbl);
-
-static struct pci_driver pci_driver =
-  {
-  .name	    = DEVICE_NAME,
-  .id_table = pci_device_id_tbl,
-  .probe    = linux_probe,
-  .remove   = __devexit_p(linux_remove),
-  /* This driver does not suspend and resume. */
-  };
-
-/* This ultimately calls our pci_driver.probe() method. */
-static int  __init linux_modload(void)
-  { return pci_module_init(&pci_driver); }
-module_init(linux_modload);
-
-/* This ultimately calls our pci_driver.remove() method. */
-static void __exit linux_modunload(void)
-  { pci_unregister_driver(&pci_driver); }
-module_exit(linux_modunload);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION("Device driver for SBE/LMC Wide-Area Network cards");
-MODULE_AUTHOR("David Boggs <boggs@boggs.palo-alto.ca.us>");
-
-#endif /* __linux__ */
diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h
index e89c739d46f1..fe4e7d010c57 100644
--- a/sys/dev/lmc/if_lmc.h
+++ b/sys/dev/lmc/if_lmc.h
@@ -620,13 +620,6 @@
 # define LMCIOCREAD		_IOWR('i', 243, struct ioctl)
 # define LMCIOCWRITE		 _IOW('i', 244, struct ioctl)
 # define LMCIOCTL		_IOWR('i', 245, struct ioctl)
-#elif defined(__linux__)  /* sigh */
-# define LMCIOCGSTAT		SIOCDEVPRIVATE+0
-# define LMCIOCGCFG		SIOCDEVPRIVATE+1
-# define LMCIOCSCFG		SIOCDEVPRIVATE+2
-# define LMCIOCREAD		SIOCDEVPRIVATE+3
-# define LMCIOCWRITE		SIOCDEVPRIVATE+4
-# define LMCIOCTL		SIOCDEVPRIVATE+5
 #endif
 
 struct iohdr				/* all LMCIOCs begin with this     */
@@ -984,12 +977,8 @@ struct dma_desc
 #endif
   u_int32_t address1;		/* buffer1 bus address */
   u_int32_t address2;		/* buffer2 bus address */
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
   bus_dmamap_t map;		/* bus dmamap for this descriptor */
 # define TLP_BUS_DSL_VAL	(sizeof(bus_dmamap_t) & TLP_BUS_DSL)
-#else
-# define TLP_BUS_DSL_VAL	0
-#endif
   } __attribute__ ((packed));
 
 /* Tulip DMA descriptor status bits */
@@ -1029,18 +1018,13 @@ struct desc_ring
   u_int32_t dma_addr;		/* bus address for desc array */
   int size_descs;		/* bus_dmamap_sync needs this */
   int num_descs;		/* used to set rx quota */
-#ifdef __linux__
-  struct sk_buff *head;		/* tail-queue of skbuffs */
-  struct sk_buff *tail;
-#elif BSD
+#if   BSD
   struct mbuf *head;		/* tail-queue of mbufs */
   struct mbuf *tail;
-# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
   bus_dma_tag_t tag;		/* bus_dma tag for desc array */
   bus_dmamap_t map;		/* bus_dma map for desc array */
   bus_dma_segment_t segs[2];	/* bus_dmamap_load() or bus_dmamem_alloc() */
   int nsegs;			/* bus_dmamap_load() or bus_dmamem_alloc() */
-# endif
 #endif
   };
 
@@ -1085,33 +1069,7 @@ struct card
 /* FreeBSD wants struct ifnet first in the softc. */
 struct softc
   {
-#if (defined(__NetBSD__) || defined(__OpenBSD__))
-  struct device	dev;		/* base device -- must be first in softc   */
-  pcitag_t	pa_tag;		/* pci_conf_read/write need this           */
-  pci_chipset_tag_t pa_pc;	/* pci_conf_read/write need this           */
-  bus_dma_tag_t	pa_dmat;	/* bus_dma needs this                      */
-  bus_space_tag_t csr_tag;	/* bus_space needs this                    */
-  bus_space_handle_t csr_handle;/* bus_space needs this                    */
-  pci_intr_handle_t intr_handle;/* interrupt handle                        */
-  void		*irq_cookie;	/* pci_intr_disestablish needs this        */
-  void		*sdh_cookie;	/* shutdownhook_disestablish needs this    */
-  struct simplelock top_lock;	/* lock card->watchdog vs core_ioctl       */
-  struct simplelock bottom_lock;/* lock for buf queues & descriptor rings  */
-  struct mbuf	*tx_mbuf;	/* hang mbuf here while building dma descs */
-#endif  /* __NetBSD__ || __OpenBSD__ */
 
-#ifdef __bsdi__
-  struct device	dev;		/* base device -- must be first in softc   */
-  struct isadev	id;		/* bus resource                            */
-  struct intrhand ih;		/* interrupt vectoring                     */
-  struct atshutdown ats;	/* shutdown hook                           */
-  pci_devaddr_t	cfgbase;	/* base address of PCI config regs         */
-  u_int16_t	 csr_iobase;	/*     io base address of Tulip CSRs       */
-  u_int32_t	*csr_membase;	/* kv mem base address of Tulip CSRs       */
-  struct simplelock top_lock;	/* lock card->watchdog vs core_ioctl       */
-  struct simplelock bottom_lock;/* lock for buf queues & descriptor rings  */
-  struct mbuf	*tx_mbuf;	/* hang mbuf here while building dma descs */
-#endif /* __bsdi__ */
 
   /* State for kernel-resident Line Protocols */
 #if IFNET
@@ -1130,14 +1088,6 @@ struct softc
 # endif
 #endif
 
-#ifdef __linux__
-# if GEN_HDLC
-  hdlc_device	*hdlc_dev;	/* state for HDLC code                     */
-  sync_serial_settings hdlc_settings; /* state set by sethdlc program      */
-# else
-  struct net_device_stats net_stats; /* linux_stats storage                */
-# endif
-#endif
 
 #if NETGRAPH
   node_p	ng_node;	/* pointer to our node struct              */
@@ -1151,7 +1101,6 @@ struct softc
 # endif
 #endif
 
-#ifdef __FreeBSD__
   struct callout callout;	/* watchdog needs this                  */
   struct device	*dev;		/* base device pointer                     */
   bus_space_tag_t csr_tag;	/* bus_space needs this                    */
@@ -1173,19 +1122,7 @@ struct softc
   int		top_spl;	/* lock card->watchdog vs core_ioctl       */
   int		bottom_spl;	/* lock for buf queues & descriptor rings  */
 # endif
-#endif /* __FreeBSD__ */
 
-#ifdef __linux__
-  struct pci_dev    *pci_dev;	/* READ/WRITE_PCI_CFG macros need this     */
-  struct net_device *net_dev;	/* NAME_UNIT macro needs this              */
-  struct timer_list wd_timer;	/* timer calls watchdog() once a second    */
-  u_int32_t	 csr_iobase;	/*     io base address of Tulip CSRs       */
-  void		*csr_membase;	/* kv mem base address of Tulip CSRs       */
-  struct sk_buff *tx_skb;	/* hang skb here while building dma descs  */
-  int		quota;		/* used for incoming packet flow control   */
-  struct semaphore top_lock;	/* lock card->watchdog vs core_ioctl       */
-  spinlock_t	bottom_lock;	/* lock for buf queues & descriptor rings  */
-#endif  /* __linux__ */
 
   /* Top-half state used by all card types; lock with top_lock,            */
   const char	*dev_desc;	/* string describing type of board         */
@@ -1210,7 +1147,6 @@ struct softc
 
 /* Hide the minor differences between OS versions */
 
-#ifdef __FreeBSD__
   typedef void intr_return_t;
 # define  READ_PCI_CFG(sc, addr)       pci_read_config ((sc)->dev, addr, 4)
 # define WRITE_PCI_CFG(sc, addr, data) pci_write_config((sc)->dev, addr, data, 4)
@@ -1264,162 +1200,10 @@ struct softc
 # if (__FreeBSD_version >= 600000)
 #  define IFF_RUNNING		IFF_DRV_RUNNING
 # endif
-#endif  /* __FreeBSD__ */
 
-#ifdef __NetBSD__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)       pci_conf_read ((sc)->pa_pc, (sc)->pa_tag, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_conf_write((sc)->pa_pc, (sc)->pa_tag, addr, data)
-# define  READ_CSR(csr)		bus_space_read_4 (sc->csr_tag, sc->csr_handle, csr)
-# define WRITE_CSR(csr, val)	bus_space_write_4(sc->csr_tag, sc->csr_handle, csr, val)
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(curproc->p_ucred, &curproc->p_acflag)
-# define DISABLE_INTR		int spl = splnet()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		0
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags) bus_dmamap_sync(ring->tag, map, 0, size, flags)
-# define DMA_LOAD(map, addr, size)  bus_dmamap_load(ring->tag, map, addr, size, 0, BUS_DMA_NOWAIT)
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	   bpfdetach(sc->ifp)
-# endif
-#endif /* __NetBSD__ */
 
-#ifdef __OpenBSD__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)       pci_conf_read ((sc)->pa_pc, (sc)->pa_tag, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_conf_write((sc)->pa_pc, (sc)->pa_tag, addr, data)
-# define  READ_CSR(csr)		bus_space_read_4 (sc->csr_tag, sc->csr_handle, csr)
-# define WRITE_CSR(csr, val)	bus_space_write_4(sc->csr_tag, sc->csr_handle, csr, val)
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(curproc, 0)
-# define DISABLE_INTR		int spl = splnet()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		0
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags) bus_dmamap_sync(ring->tag, map, 0, size, flags)
-# define DMA_LOAD(map, addr, size)  bus_dmamap_load(ring->tag, map, addr, size, 0, BUS_DMA_NOWAIT)
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(&sc->ifp->if_bpf, sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	   bpfdetach(sc->ifp)
-# endif
-#endif /* __OpenBSD__ */
 
-#ifdef __bsdi__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)        pci_inl(&(sc)->cfgbase, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_outl(&(sc)->cfgbase, addr, data)
-# if IOREF_CSR
-#  define  READ_CSR(csr)	 inl(sc->csr_iobase+(csr))
-#  define WRITE_CSR(csr, val)	outl(sc->csr_iobase+(csr), (val))
-# else
-# error Memory refs to Tulip CSRs cause page faults in BSD/OS
-#  define  READ_CSR(csr)	   (0 + *(sc->csr_membase+(csr)))
-#  define WRITE_CSR(csr, val)	((void)(*(sc->csr_membase+(csr)) = (val)))
-# endif
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(PCPU(curproc)->p_ucred, &PCPU(curproc)->p_acflag)
-# define DISABLE_INTR		int spl = splimp()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		1 /* XXX 0 */
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags)   /* nothing */
-# define DMA_LOAD(map, addr, size)    0
-# define bus_dmamap_unload(tag, map)  /* nothing */
-# define bus_dmamap_destroy(tag, map) /* nothing */
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(&sc->ifp->if_bpf, sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	/* bpfdetach(sc->ifp) */
-# endif
-# define memcpy(dst, src, len)  bcopy(src, dst, len)
-# define if_detach(ifp)		/* nothing */
 
-/*  BSD/OS-4.1 doesn't have a back pointer to softc in struct ifnet, */
-/*  and it passes a unit number not a struct ifnet* to watchdog. */
-# if (_BSDI_VERSION <= 199910)
-   extern struct cfdriver	lmccd;
-#  undef  IFP2SC
-#  define UNIT2SC(unit)		((softc_t *)lmccd.cd_devs[unit])
-#  define IFP2SC(ifp)		(UNIT2SC((ifp)->if_unit))
-# endif
-#endif /* __bsdi__ */
-
-#ifdef __linux__
-static u_int32_t /* inline? so rare it doesn't matter */
-READ_PCI_CFG(softc_t *sc, u_int32_t addr)
-  {
-  u_int32_t data;
-  pci_read_config_dword(sc->pci_dev, addr, &data);
-  return data;
-  }
-# define WRITE_PCI_CFG(sc, addr, data) pci_write_config_dword(sc->pci_dev, addr, data)
-# if IOREF_CSR
-#  define  READ_CSR(csr)	       inl((sc->csr_iobase+(csr)))
-#  define WRITE_CSR(csr, val)	outl((val),(sc->csr_iobase+(csr)))
-# else
-#  define  READ_CSR(csr)	       readl((sc->csr_membase+(csr)))
-#  define WRITE_CSR(csr, val)	writel((val),(sc->csr_membase+(csr)))
-# endif
-# define NAME_UNIT		sc->net_dev->name
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->net_dev->flags & IFF_DEBUG))
-# define TOP_TRYLOCK		((down_trylock(&sc->top_lock)==0) ? 1:0)
-# define TOP_UNLOCK		up(&sc->top_lock)
-# define BOTTOM_TRYLOCK		spin_trylock_bh(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		spin_unlock_bh(&sc->bottom_lock)
-# define CHECK_CAP		capable(CAP_NET_ADMIN)? 0 : -EPERM
-# define DISABLE_INTR		/* nothing */
-# define ENABLE_INTR		/* nothing */
-# define COPY_BREAK		200
-# define DELAY(usecs)		udelay(usecs)
-# define SLEEP(usecs)		do { set_current_state(TASK_INTERRUPTIBLE);\
-				schedule_timeout(1+(usecs*HZ)/1000000UL); } while (0)
-# define printf			printk
-# define copyin(u, k, len)	copy_from_user(k, u, len)
-# define microtime(time)	do_gettimeofday(time)
-# define malloc(len, t, f)	kmalloc(len, GFP_KERNEL)
-# define free(addr, t)		kfree(addr)
-# define LITTLE_ENDIAN		4321
-# define BIG_ENDIAN		1234
-# if defined(__LITTLE_ENDIAN)
-#  define BYTE_ORDER LITTLE_ENDIAN
-# elif defined(__BIG_ENDIAN)
-#  define BYTE_ORDER BIG_ENDIAN
-# else
-#  error "asm/byteorder.h is wrong"
-# endif
-# if (GEN_HDLC == 0)
-#  define dev_to_hdlc(net_dev) net_dev
-#  define hdlc_set_carrier(val, net_dev) /* nothing */
-# endif
-#endif /* __linux__ */
 
 #if (NBPFILTER == 0)
 # define LMC_BPF_MTAP(mbuf)		/* nothing */
@@ -1541,9 +1325,7 @@ static void lmc_raw_input(struct ifnet *, struct mbuf *);
 #if BSD
 static void mbuf_enqueue(struct desc_ring *, struct mbuf *);
 static struct mbuf* mbuf_dequeue(struct desc_ring *);
-# ifdef __FreeBSD__
 static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int);
-# endif
 static int create_ring(softc_t *, struct desc_ring *, int);
 static void destroy_ring(softc_t *, struct desc_ring *);
 static int rxintr_cleanup(softc_t *);
@@ -1553,18 +1335,6 @@ static int txintr_setup_mbuf(softc_t *, struct mbuf *);
 static int txintr_setup(softc_t *);
 #endif /* BSD */
 
-#ifdef __linux__
-static void skbuff_enqueue(struct desc_ring *, struct sk_buff *);
-static struct sk_buff* skbuff_dequeue(struct desc_ring *);
-static int create_ring(softc_t *, struct desc_ring *, int);
-static void destroy_ring(softc_t *, struct desc_ring *);
-static int rxintr_cleanup(softc_t *);
-static int rxintr_setup(softc_t *);
-static int txintr_cleanup(softc_t *sc);
-static int txintr_setup_frag(softc_t *, char *, int);
-static int txintr_setup_skb(softc_t *, struct sk_buff *);
-static int txintr_setup(softc_t *);
-#endif /* __linux__ */
 
 static void check_intr_status(softc_t *);
 static void core_interrupt(void *, int);
@@ -1596,10 +1366,6 @@ static int lmc_ifnet_ioctl(struct ifnet *, u_long, caddr_t);
 static void lmc_ifnet_start(struct ifnet *);
 static int lmc_raw_output(struct ifnet *, struct mbuf *,
  const struct sockaddr *, struct route *);
-# ifdef __OpenBSD__
-static int ifmedia_change(struct ifnet *);
-static void ifmedia_status(struct ifnet *, struct ifmediareq *);
-# endif /* __OpenBSD__ */
 static void setup_ifnet(struct ifnet *);
 static int lmc_ifnet_attach(softc_t *);
 static void lmc_ifnet_detach(softc_t *);
@@ -1638,52 +1404,14 @@ static void shutdown_card(void *);
 static int attach_card(softc_t *, const char *);
 static void detach_card(softc_t *);
 
-#ifdef __FreeBSD__
 static int fbsd_probe(device_t);
 static int fbsd_detach(device_t);
 static int fbsd_shutdown(device_t);
 static int fbsd_attach(device_t);
-#endif /* __FreeBSD__ */
 
-#ifdef __NetBSD__
-static int nbsd_match(struct device *t, struct cfdata *, void *);
-static int nbsd_detach(struct device *, int);
-static void nbsd_attach(struct device *, struct device *, void *);
-static int lkm_nbsd_match(struct pci_attach_args *);
-int if_lmc_lkmentry(struct lkm_table *, int, int);
-#endif  /* __NetBSD__ */
 
-#ifdef __OpenBSD__
-static int obsd_match(struct device *, void *, void *);
-static int obsd_detach(struct device *, int);
-static void obsd_attach(struct device *, struct device *, void *);
-int if_lmc_lkmentry(struct lkm_table *, int, int);
-#endif  /* __OpenBSD__ */
 
-#ifdef __bsdi__
-static int bsdi_match(pci_devaddr_t *);
-static int bsdi_probe(struct device *, struct cfdata *, void *);
-static void bsdi_attach(struct device *, struct device *, void *);
-#endif  /* __bsdi__ */
 
-#ifdef __linux__
-static irqreturn_t linux_interrupt(int, void *, struct pt_regs *);
-static int linux_poll(struct net_device *, int *);
-static int linux_start(struct sk_buff *, struct net_device *);
-static void linux_timeout(struct net_device *);
-static int linux_ioctl(struct net_device *, struct ifreq *, int);
-static struct net_device_stats * linux_stats(struct net_device *);
-static void linux_watchdog(unsigned long);
-static int linux_stop(struct net_device *);
-static int linux_open(struct net_device *);
-# if GEN_HDLC
-static int hdlc_attach(struct net_device *,
- unsigned short, unsigned short);
-# endif
-static void __exit linux_remove(struct pci_dev *);
-static void setup_netdev(struct net_device *);
-static int __init linux_probe(struct pci_dev *, const struct pci_device_id *);
-#endif /* __linux__ */
 
 #endif /* KERNEL */
 
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index 1e879ba9459f..b7e90e9da4ba 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -1245,7 +1245,7 @@ malo_tx_start(struct malo_softc *sc, struct ieee80211_node *ni,
 	STAILQ_INSERT_TAIL(&txq->active, bf, bf_list);
 	MALO_TXDESC_SYNC(txq, ds, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	sc->malo_timer = 5;
 	MALO_TXQ_UNLOCK(txq);
 	return 0;
@@ -1283,7 +1283,7 @@ malo_start(struct ifnet *ifp)
 		 * Pass the frame to the h/w for transmission.
 		 */
 		if (malo_tx_start(sc, ni, bf, m)) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (bf != NULL) {
 				bf->bf_m = NULL;
 				bf->bf_node = NULL;
@@ -1341,7 +1341,7 @@ malo_watchdog(void *arg)
 
 		/* XXX no way to reset h/w. now  */
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		sc->malo_stats.mst_watchdog++;
 	}
 }
@@ -1870,7 +1870,7 @@ malo_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	 * Pass the frame to the h/w for transmission.
 	 */
 	if (malo_tx_start(sc, ni, bf, m) != 0) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		bf->bf_m = NULL;
 		bf->bf_node = NULL;
 		MALO_TXQ_LOCK(txq);
@@ -2078,7 +2078,7 @@ malo_rx_proc(void *arg, int npending)
 #endif
 		status = ds->status;
 		if (status & MALO_RXD_STATUS_DECRYPT_ERR_MASK) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto rx_next;
 		}
 		/*
@@ -2117,7 +2117,7 @@ malo_rx_proc(void *arg, int npending)
 		/* XXX don't need mbuf, just dma buffer */
 		mnew = malo_getrxmbuf(sc, bf);
 		if (mnew == NULL) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto rx_next;
 		}
 		/*
@@ -2158,7 +2158,7 @@ malo_rx_proc(void *arg, int npending)
 			    len, ds->rate, rssi);
 		}
 #endif
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		
 		/* dispatch */
 		ni = ieee80211_find_rxnode(ic,
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index d479aa243722..c35dd04dcbf6 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -1161,7 +1161,7 @@ mge_intr_rx_locked(struct mge_softc *sc, int count)
 			count -= 1;
 	}
 
-	ifp->if_ipackets += rx_npkts;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, rx_npkts);
 
 	return (rx_npkts);
 }
@@ -1236,9 +1236,9 @@ mge_intr_tx_locked(struct mge_softc *sc)
 		/* Update collision statistics */
 		if (status & MGE_ERR_SUMMARY) {
 			if ((status & MGE_ERR_MASK) == MGE_TX_ERROR_LC)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if ((status & MGE_ERR_MASK) == MGE_TX_ERROR_RL)
-				ifp->if_collisions += 16;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 16);
 		}
 
 		bus_dmamap_sync(sc->mge_tx_dtag, dw->buffer_dmap,
@@ -1248,7 +1248,7 @@ mge_intr_tx_locked(struct mge_softc *sc)
 		dw->buffer = (struct mbuf*)NULL;
 		send++;
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 
 	if (send) {
@@ -1516,7 +1516,7 @@ mge_watchdog(struct mge_softc *sc)
 		return;
 	}
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	mge_stop(sc);
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 2d0e60728985..381ca47452c2 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include "miibus_if.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 static int rgephy_probe(device_t);
 static int rgephy_attach(device_t);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index b98c0403ba42..21c9a66f6cf4 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include "miidevs.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 #include "miibus_if.h"
 
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 5082e7ccb060..d3e3c938df7e 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include "miidevs.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 #include "miibus_if.h"
 
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 2ed9d6c8f171..16e7485a911f 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -2987,14 +2987,14 @@ msk_watchdog(struct msk_if_softc *sc_if)
 		if (bootverbose)
 			if_printf(sc_if->msk_ifp, "watchdog timeout "
 			   "(missed link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		msk_init_locked(sc_if);
 		return;
 	}
 
 	if_printf(ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	msk_init_locked(sc_if);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -3216,7 +3216,7 @@ msk_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 			 * handle this frame.
 			 */
 			if (len > MSK_MAX_FRAMELEN || len < ETHER_HDR_LEN) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				msk_discard_rxbuf(sc_if, cons);
 				break;
 			}
@@ -3225,7 +3225,7 @@ msk_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 		    ((status & GMR_FS_RX_OK) == 0) || (rxlen != len)) {
 			/* Don't count flow-control packet as errors. */
 			if ((status & GMR_FS_GOOD_FC) == 0)
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			msk_discard_rxbuf(sc_if, cons);
 			break;
 		}
@@ -3237,7 +3237,7 @@ msk_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 #endif
 		m = rxd->rx_m;
 		if (msk_newbuf(sc_if, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* Reuse old buffer. */
 			msk_discard_rxbuf(sc_if, cons);
 			break;
@@ -3248,7 +3248,7 @@ msk_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 		if ((sc_if->msk_flags & MSK_FLAG_RAMBUF) != 0)
 			msk_fixup_rx(m);
 #endif
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 			msk_rxcsum(sc_if, control, m);
 		/* Check for VLAN tagged packets. */
@@ -3290,7 +3290,7 @@ msk_jumbo_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 		    ((status & GMR_FS_RX_OK) == 0) || (rxlen != len)) {
 			/* Don't count flow-control packet as errors. */
 			if ((status & GMR_FS_GOOD_FC) == 0)
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			msk_discard_jumbo_rxbuf(sc_if, cons);
 			break;
 		}
@@ -3302,7 +3302,7 @@ msk_jumbo_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 #endif
 		m = jrxd->rx_m;
 		if (msk_jumbo_newbuf(sc_if, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* Reuse old buffer. */
 			msk_discard_jumbo_rxbuf(sc_if, cons);
 			break;
@@ -3313,7 +3313,7 @@ msk_jumbo_rxeof(struct msk_if_softc *sc_if, uint32_t status, uint32_t control,
 		if ((sc_if->msk_flags & MSK_FLAG_RAMBUF) != 0)
 			msk_fixup_rx(m);
 #endif
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 			msk_rxcsum(sc_if, control, m);
 		/* Check for VLAN tagged packets. */
@@ -3368,7 +3368,7 @@ msk_txeof(struct msk_if_softc *sc_if, int idx)
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc_if->msk_cdata.msk_tx_tag, txd->tx_dmamap);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		KASSERT(txd->tx_m != NULL, ("%s: freeing NULL mbuf!",
 		    __func__));
 		m_freem(txd->tx_m);
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index dd5bb32cf34f..8118aa7370ca 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -122,6 +122,7 @@ mvs_ch_attach(device_t dev)
 	ch->unit = (intptr_t)device_get_ivars(dev);
 	ch->quirks = ctlr->quirks;
 	mtx_init(&ch->mtx, "MVS channel lock", NULL, MTX_DEF);
+	ch->pm_level = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "pm_level", &ch->pm_level);
 	if (ch->pm_level > 3)
diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c
index b2b9944adfe8..bdfccfbb871b 100644
--- a/sys/dev/mvs/mvs_pci.c
+++ b/sys/dev/mvs/mvs_pci.c
@@ -111,6 +111,7 @@ mvs_attach(device_t dev)
 		i++;
 	ctlr->channels = mvs_ids[i].ports;
 	ctlr->quirks = mvs_ids[i].quirks;
+	ctlr->ccc = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "ccc", &ctlr->ccc);
 	ctlr->cccc = 8;
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 14579d0c3640..c68b324e04b2 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -114,6 +114,7 @@ mvs_attach(device_t dev)
 		i++;
 	ctlr->channels = mvs_ids[i].ports;
 	ctlr->quirks = mvs_ids[i].quirks;
+	ctlr->ccc = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "ccc", &ctlr->ccc);
 	ctlr->cccc = 8;
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index 7b3308848b61..3ea24749421b 100644
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -1434,7 +1434,7 @@ mwl_start(struct ifnet *ifp)
 		 * Pass the frame to the h/w for transmission.
 		 */
 		if (mwl_tx_start(sc, ni, bf, m)) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			mwl_puttxbuf_head(txq, bf);
 			ieee80211_free_node(ni);
 			continue;
@@ -1504,7 +1504,7 @@ mwl_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	 * Pass the frame to the h/w for transmission.
 	 */
 	if (mwl_tx_start(sc, ni, bf, m)) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		mwl_puttxbuf_head(txq, bf);
 
 		ieee80211_free_node(ni);
@@ -2741,7 +2741,7 @@ mwl_rx_proc(void *arg, int npending)
 #endif
 		status = ds->Status;
 		if (status & EAGLE_RXD_STATUS_DECRYPT_ERR_MASK) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			sc->sc_stats.mst_rx_crypto++;
 			/*
 			 * NB: Check EAGLE_RXD_STATUS_GENERAL_DECRYPT_ERR
@@ -2887,7 +2887,7 @@ mwl_rx_proc(void *arg, int npending)
 			ieee80211_dump_pkt(ic, mtod(m, caddr_t),
 			    len, ds->Rate, rssi);
 		}
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		/* dispatch */
 		ni = ieee80211_find_rxnode(ic,
@@ -3405,7 +3405,7 @@ mwl_tx_start(struct mwl_softc *sc, struct ieee80211_node *ni, struct mwl_txbuf *
 	STAILQ_INSERT_TAIL(&txq->active, bf, bf_list);
 	MWL_TXDESC_SYNC(txq, ds, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	sc->sc_tx_timer = 5;
 	MWL_TXQ_UNLOCK(txq);
 
@@ -4785,7 +4785,7 @@ mwl_watchdog(void *arg)
 		mwl_reset(ifp);
 mwl_txq_dump(&sc->sc_txq[0]);/*XXX*/
 #endif
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		sc->sc_stats.mst_watchdog++;
 	}
 }
@@ -4928,8 +4928,10 @@ mwl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCGMVSTATS:
 		mwl_hal_gethwstats(sc->sc_mh, &sc->sc_stats.hw_stats);
 		/* NB: embed these numbers to get a consistent view */
-		sc->sc_stats.mst_tx_packets = ifp->if_opackets;
-		sc->sc_stats.mst_rx_packets = ifp->if_ipackets;
+		sc->sc_stats.mst_tx_packets =
+		    ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS);
+		sc->sc_stats.mst_rx_packets =
+		    ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS);
 		/*
 		 * NB: Drop the softc lock in case of a page fault;
 		 * we'll accept any potential inconsisentcy in the
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index e6cdf234407b..8de14857c517 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -211,7 +211,7 @@ mxge_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs,
 }
 
 static int
-mxge_dma_alloc(mxge_softc_t *sc, mxge_dma_t *dma, size_t bytes, 
+mxge_dma_alloc(mxge_softc_t *sc, mxge_dma_t *dma, size_t bytes,
 		   bus_size_t alignment)
 {
 	int err;
@@ -245,8 +245,8 @@ mxge_dma_alloc(mxge_softc_t *sc, mxge_dma_t *dma, size_t bytes,
 	}
 
 	/* allocate DMAable memory & map */
-	err = bus_dmamem_alloc(dma->dmat, &dma->addr, 
-			       (BUS_DMA_WAITOK | BUS_DMA_COHERENT 
+	err = bus_dmamem_alloc(dma->dmat, &dma->addr,
+			       (BUS_DMA_WAITOK | BUS_DMA_COHERENT
 				| BUS_DMA_ZERO),  &dma->map);
 	if (err != 0) {
 		device_printf(dev, "couldn't alloc mem (err = %d)\n", err);
@@ -385,7 +385,7 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
 	/* XXXX
 	   Test below is commented because it is believed that doing
 	   config read/write beyond 0xff will access the config space
-	   for the next larger function.  Uncomment this and remove 
+	   for the next larger function.  Uncomment this and remove
 	   the hacky pmap_mapdev() way of accessing config space when
 	   FreeBSD grows support for extended pcie config space access
 	*/
@@ -454,7 +454,7 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
 	}
 	*ptr32 = val | 0x40;
 	pmap_unmapdev((vm_offset_t)va, PAGE_SIZE);
-	if (mxge_verbose) 
+	if (mxge_verbose)
 		device_printf(sc->dev,
 			      "Enabled ECRC on upstream Nvidia bridge "
 			      "at %d:%d:%d\n",
@@ -573,7 +573,7 @@ mxge_firmware_probe(mxge_softc_t *sc)
 		}
 	}
 
-	/* 
+	/*
 	 * load the optimized firmware (which assumes aligned PCIe
 	 * completions) in order to see if it works on this host.
 	 */
@@ -583,12 +583,12 @@ mxge_firmware_probe(mxge_softc_t *sc)
 		return status;
 	}
 
-	/* 
+	/*
 	 * Enable ECRC if possible
 	 */
 	mxge_enable_nvidia_ecrc(sc);
 
-	/* 
+	/*
 	 * Run a DMA test which watches for unaligned completions and
 	 * aborts on the first one seen.  Not required on Z8ES or newer.
 	 */
@@ -657,7 +657,7 @@ mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr)
 
 
 	if (be32toh(hdr->mcp_type) != MCP_TYPE_ETH) {
-		device_printf(sc->dev, "Bad firmware type: 0x%x\n", 
+		device_printf(sc->dev, "Bad firmware type: 0x%x\n",
 			      be32toh(hdr->mcp_type));
 		return EIO;
 	}
@@ -685,16 +685,16 @@ mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr)
 static void *
 z_alloc(void *nil, u_int items, u_int size)
 {
-        void *ptr;
+	void *ptr;
 
-        ptr = malloc(items * size, M_TEMP, M_NOWAIT);
-        return ptr;
+	ptr = malloc(items * size, M_TEMP, M_NOWAIT);
+	return ptr;
 }
 
 static void
 z_free(void *nil, void *ptr)
 {
-        free(ptr, M_TEMP);
+	free(ptr, M_TEMP);
 }
 
 
@@ -732,7 +732,7 @@ mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t *limit)
 
 	/* the uncompressed size is stored as the firmware version,
 	   which would otherwise go unused */
-	fw_len = (size_t) fw->version; 
+	fw_len = (size_t) fw->version;
 	inflate_buffer = malloc(fw_len, M_TEMP, M_NOWAIT);
 	if (inflate_buffer == NULL)
 		goto abort_with_zs;
@@ -755,7 +755,7 @@ mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t *limit)
 		status = EIO;
 		goto abort_with_buffer;
 	}
-	hdr = (const void*)(inflate_buffer + hdr_offset); 
+	hdr = (const void*)(inflate_buffer + hdr_offset);
 
 	status = mxge_validate_firmware(sc, hdr);
 	if (status != 0)
@@ -832,14 +832,14 @@ mxge_dummy_rdma(mxge_softc_t *sc, int enable)
 		i++;
 	}
 	if (*confirm != 0xffffffff) {
-		device_printf(sc->dev, "dummy rdma %s failed (%p = 0x%x)", 
-			      (enable ? "enable" : "disable"), confirm, 
+		device_printf(sc->dev, "dummy rdma %s failed (%p = 0x%x)",
+			      (enable ? "enable" : "disable"), confirm,
 			      *confirm);
 	}
 	return;
 }
 
-static int 
+static int
 mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data)
 {
 	mcp_cmd_t *buf;
@@ -869,7 +869,7 @@ mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data)
 	/* wait up to 20ms */
 	err = EAGAIN;
 	for (sleep_total = 0; sleep_total <  20; sleep_total++) {
-		bus_dmamap_sync(sc->cmd_dma.dmat, 
+		bus_dmamap_sync(sc->cmd_dma.dmat,
 				sc->cmd_dma.map, BUS_DMASYNC_POSTREAD);
 		wmb();
 		switch (be32toh(response->result)) {
@@ -893,7 +893,7 @@ mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data)
 			err = ENXIO;
 			break;
 		default:
-			device_printf(sc->dev, 
+			device_printf(sc->dev,
 				      "mxge: command %d "
 				      "failed, result = %d\n",
 				      cmd, be32toh(response->result));
@@ -924,7 +924,7 @@ mxge_adopt_running_firmware(mxge_softc_t *sc)
 			     (sc->sram + MCP_HEADER_PTR_OFFSET));
 
 	if ((hdr_offset & 3) || hdr_offset + sizeof(*hdr) > sc->sram_size) {
-		device_printf(sc->dev, 
+		device_printf(sc->dev,
 			      "Running firmware has bad header offset (%d)\n",
 			      (int)hdr_offset);
 		return EIO;
@@ -943,7 +943,7 @@ mxge_adopt_running_firmware(mxge_softc_t *sc)
 	status = mxge_validate_firmware(sc, hdr);
 	free(hdr, M_DEVBUF);
 
-	/* 
+	/*
 	 * check to see if adopted firmware has bug where adopting
 	 * it will cause broadcasts to be filtered unless the NIC
 	 * is kept in ALLMULTI mode
@@ -1034,11 +1034,11 @@ mxge_load_firmware(mxge_softc_t *sc, int adopt)
 	while (*confirm != 0xffffffff && i < 20) {
 		DELAY(1000*10);
 		i++;
-		bus_dmamap_sync(sc->cmd_dma.dmat, 
+		bus_dmamap_sync(sc->cmd_dma.dmat,
 				sc->cmd_dma.map, BUS_DMASYNC_POSTREAD);
 	}
 	if (*confirm != 0xffffffff) {
-		device_printf(sc->dev,"handoff failed (%p = 0x%x)", 
+		device_printf(sc->dev,"handoff failed (%p = 0x%x)",
 			confirm, *confirm);
 		
 		return ENXIO;
@@ -1054,7 +1054,7 @@ mxge_update_mac_address(mxge_softc_t *sc)
 	int status;
 
 	
-	cmd.data0 = ((addr[0] << 24) | (addr[1] << 16) 
+	cmd.data0 = ((addr[0] << 24) | (addr[1] << 16)
 		     | (addr[2] << 8) | addr[3]);
 
 	cmd.data1 = ((addr[4] << 8) | (addr[5]));
@@ -1136,7 +1136,7 @@ mxge_set_multicast_list(mxge_softc_t *sc)
 
 	err = mxge_send_cmd(sc, MXGEFW_LEAVE_ALL_MULTICAST_GROUPS, &cmd);
 	if (err != 0) {
-		device_printf(sc->dev, 
+		device_printf(sc->dev,
 			      "Failed MXGEFW_LEAVE_ALL_MULTICAST_GROUPS"
 			      ", error status: %d\n", err);
 		return;
@@ -1219,7 +1219,7 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
 	cmd.data0 = sc->rx_ring_size;
 	status = mxge_send_cmd(sc, MXGEFW_CMD_SET_INTRQ_SIZE, &cmd);
 
-	/* 
+	/*
 	 * Even though we already know how many slices are supported
 	 * via mxge_slice_probe(), MXGEFW_CMD_GET_MAX_RSS_QUEUES
 	 * has magic side effects, and must be called after a reset.
@@ -1229,17 +1229,17 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
 	 * MXGEFW_CMD_SET_INTRQ_SIZE, since the intrq size is used by
 	 * the firmware to compute offsets.
 	 */
-	 
+	
 	if (sc->num_slices > 1) {
 		/* ask the maximum number of slices it supports */
 		status = mxge_send_cmd(sc, MXGEFW_CMD_GET_MAX_RSS_QUEUES,
 					   &cmd);
 		if (status != 0) {
-			device_printf(sc->dev, 
+			device_printf(sc->dev,
 				      "failed to get number of slices\n");
 			return status;
 		}
-		/* 
+		/*
 		 * MXGEFW_CMD_ENABLE_RSS_QUEUES must be called prior
 		 * to setting up the interrupt queue DMA
 		 */
@@ -1272,7 +1272,7 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
 		}
 	}
 
-	status |= mxge_send_cmd(sc, 
+	status |= mxge_send_cmd(sc,
 				MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, &cmd);
 	
 
@@ -1282,7 +1282,7 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
 	irq_claim = (volatile uint32_t *)(sc->sram + cmd.data0);
 
 
-	status |= mxge_send_cmd(sc,  MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET, 
+	status |= mxge_send_cmd(sc,  MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET,
 				&cmd);
 	sc->irq_deassert = (volatile uint32_t *)(sc->sram + cmd.data0);
 	if (status != 0) {
@@ -1349,15 +1349,15 @@ mxge_change_throttle(SYSCTL_HANDLER_ARGS)
 	sc = arg1;
 	throttle = sc->throttle;
 	err = sysctl_handle_int(oidp, &throttle, arg2, req);
-        if (err != 0) {
-                return err;
-        }
+	if (err != 0) {
+		return err;
+	}
 
 	if (throttle == sc->throttle)
 		return 0;
 
-        if (throttle < MXGE_MIN_THROTTLE || throttle > MXGE_MAX_THROTTLE)
-                return EINVAL;
+	if (throttle < MXGE_MIN_THROTTLE || throttle > MXGE_MAX_THROTTLE)
+		return EINVAL;
 	
 	mtx_lock(&sc->driver_mtx);
 	cmd.data0 = throttle;
@@ -1371,64 +1371,64 @@ mxge_change_throttle(SYSCTL_HANDLER_ARGS)
 static int
 mxge_change_intr_coal(SYSCTL_HANDLER_ARGS)
 {
-        mxge_softc_t *sc;
-        unsigned int intr_coal_delay;
-        int err;
+	mxge_softc_t *sc;
+	unsigned int intr_coal_delay;
+	int err;
 
-        sc = arg1;
-        intr_coal_delay = sc->intr_coal_delay;
-        err = sysctl_handle_int(oidp, &intr_coal_delay, arg2, req);
-        if (err != 0) {
-                return err;
-        }
-        if (intr_coal_delay == sc->intr_coal_delay)
-                return 0;
+	sc = arg1;
+	intr_coal_delay = sc->intr_coal_delay;
+	err = sysctl_handle_int(oidp, &intr_coal_delay, arg2, req);
+	if (err != 0) {
+		return err;
+	}
+	if (intr_coal_delay == sc->intr_coal_delay)
+		return 0;
 
-        if (intr_coal_delay == 0 || intr_coal_delay > 1000*1000)
-                return EINVAL;
+	if (intr_coal_delay == 0 || intr_coal_delay > 1000*1000)
+		return EINVAL;
 
 	mtx_lock(&sc->driver_mtx);
 	*sc->intr_coal_delay_ptr = htobe32(intr_coal_delay);
 	sc->intr_coal_delay = intr_coal_delay;
 	
 	mtx_unlock(&sc->driver_mtx);
-        return err;
+	return err;
 }
 
 static int
 mxge_change_flow_control(SYSCTL_HANDLER_ARGS)
 {
-        mxge_softc_t *sc;
-        unsigned int enabled;
-        int err;
+	mxge_softc_t *sc;
+	unsigned int enabled;
+	int err;
 
-        sc = arg1;
-        enabled = sc->pause;
-        err = sysctl_handle_int(oidp, &enabled, arg2, req);
-        if (err != 0) {
-                return err;
-        }
-        if (enabled == sc->pause)
-                return 0;
+	sc = arg1;
+	enabled = sc->pause;
+	err = sysctl_handle_int(oidp, &enabled, arg2, req);
+	if (err != 0) {
+		return err;
+	}
+	if (enabled == sc->pause)
+		return 0;
 
 	mtx_lock(&sc->driver_mtx);
 	err = mxge_change_pause(sc, enabled);
 	mtx_unlock(&sc->driver_mtx);
-        return err;
+	return err;
 }
 
 static int
 mxge_handle_be32(SYSCTL_HANDLER_ARGS)
 {
-        int err;
+	int err;
 
-        if (arg1 == NULL)
-                return EFAULT;
-        arg2 = be32toh(*(int *)arg1);
-        arg1 = NULL;
-        err = sysctl_handle_int(oidp, arg1, arg2, req);
+	if (arg1 == NULL)
+		return EFAULT;
+	arg2 = be32toh(*(int *)arg1);
+	arg1 = NULL;
+	err = sysctl_handle_int(oidp, arg1, arg2, req);
 
-        return err;
+	return err;
 }
 
 static void
@@ -1466,156 +1466,156 @@ mxge_add_sysctls(mxge_softc_t *sc)
 	fw = sc->ss[0].fw_stats;
 
 	/* random information */
-	SYSCTL_ADD_STRING(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
 		       "firmware_version",
 		       CTLFLAG_RD, &sc->fw_version,
 		       0, "firmware version");
-	SYSCTL_ADD_STRING(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
 		       "serial_number",
 		       CTLFLAG_RD, &sc->serial_number_string,
 		       0, "serial number");
-	SYSCTL_ADD_STRING(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
 		       "product_code",
 		       CTLFLAG_RD, &sc->product_code_string,
 		       0, "product_code");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "pcie_link_width",
 		       CTLFLAG_RD, &sc->link_width,
 		       0, "tx_boundary");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "tx_boundary",
 		       CTLFLAG_RD, &sc->tx_boundary,
 		       0, "tx_boundary");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "write_combine",
 		       CTLFLAG_RD, &sc->wc,
 		       0, "write combining PIO?");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "read_dma_MBs",
 		       CTLFLAG_RD, &sc->read_dma,
 		       0, "DMA Read speed in MB/s");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "write_dma_MBs",
 		       CTLFLAG_RD, &sc->write_dma,
 		       0, "DMA Write speed in MB/s");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "read_write_dma_MBs",
 		       CTLFLAG_RD, &sc->read_write_dma,
 		       0, "DMA concurrent Read/Write speed in MB/s");
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "watchdog_resets",
 		       CTLFLAG_RD, &sc->watchdog_resets,
 		       0, "Number of times NIC was reset");
 
 
 	/* performance related tunables */
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"intr_coal_delay",
 			CTLTYPE_INT|CTLFLAG_RW, sc,
-			0, mxge_change_intr_coal, 
+			0, mxge_change_intr_coal,
 			"I", "interrupt coalescing delay in usecs");
 
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"throttle",
 			CTLTYPE_INT|CTLFLAG_RW, sc,
-			0, mxge_change_throttle, 
+			0, mxge_change_throttle,
 			"I", "transmit throttling");
 
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"flow_control_enabled",
 			CTLTYPE_INT|CTLFLAG_RW, sc,
 			0, mxge_change_flow_control,
 			"I", "interrupt coalescing delay in usecs");
 
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "deassert_wait",
 		       CTLFLAG_RW, &mxge_deassert_wait,
 		       0, "Wait for IRQ line to go low in ihandler");
 
-	/* stats block from firmware is in network byte order.  
+	/* stats block from firmware is in network byte order.
 	   Need to swap it */
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"link_up",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->link_up,
 			0, mxge_handle_be32,
 			"I", "link up");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"rdma_tags_available",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->rdma_tags_available,
 			0, mxge_handle_be32,
 			"I", "rdma_tags_available");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_bad_crc32",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_bad_crc32,
 			0, mxge_handle_be32,
 			"I", "dropped_bad_crc32");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_bad_phy",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_bad_phy,
 			0, mxge_handle_be32,
 			"I", "dropped_bad_phy");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_link_error_or_filtered",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_link_error_or_filtered,
 			0, mxge_handle_be32,
 			"I", "dropped_link_error_or_filtered");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_link_overflow",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->dropped_link_overflow,
 			0, mxge_handle_be32,
 			"I", "dropped_link_overflow");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_multicast_filtered",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_multicast_filtered,
 			0, mxge_handle_be32,
 			"I", "dropped_multicast_filtered");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_no_big_buffer",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->dropped_no_big_buffer,
 			0, mxge_handle_be32,
 			"I", "dropped_no_big_buffer");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_no_small_buffer",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_no_small_buffer,
 			0, mxge_handle_be32,
 			"I", "dropped_no_small_buffer");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_overrun",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->dropped_overrun,
 			0, mxge_handle_be32,
 			"I", "dropped_overrun");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_pause",
-			CTLTYPE_INT|CTLFLAG_RD, 
+			CTLTYPE_INT|CTLFLAG_RD,
 			&fw->dropped_pause,
 			0, mxge_handle_be32,
 			"I", "dropped_pause");
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_runt",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->dropped_runt,
 			0, mxge_handle_be32,
 			"I", "dropped_runt");
 
-	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
 			"dropped_unicast_filtered",
 			CTLTYPE_INT|CTLFLAG_RD, &fw->dropped_unicast_filtered,
 			0, mxge_handle_be32,
 			"I", "dropped_unicast_filtered");
 
 	/* verbose printing? */
-	SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+	SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 		       "verbose",
 		       CTLFLAG_RW, &mxge_verbose,
 		       0, "verbose printing");
 
 	/* add counters exported for debugging from all slices */
 	sysctl_ctx_init(&sc->slice_sysctl_ctx);
-	sc->slice_sysctl_tree = 
+	sc->slice_sysctl_tree =
 		SYSCTL_ADD_NODE(&sc->slice_sysctl_ctx, children, OID_AUTO,
 				"slice", CTLFLAG_RD, 0, "");
 
@@ -1625,15 +1625,15 @@ mxge_add_sysctls(mxge_softc_t *sc)
 		ctx = &ss->sysctl_ctx;
 		children = SYSCTL_CHILDREN(sc->slice_sysctl_tree);
 		sprintf(slice_num, "%d", slice);
-		ss->sysctl_tree = 
+		ss->sysctl_tree =
 			SYSCTL_ADD_NODE(ctx, children, OID_AUTO, slice_num,
 					CTLFLAG_RD, 0, "");
 		children = SYSCTL_CHILDREN(ss->sysctl_tree);
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "rx_small_cnt",
 			       CTLFLAG_RD, &ss->rx_small.cnt,
 			       0, "rx_small_cnt");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "rx_big_cnt",
 			       CTLFLAG_RD, &ss->rx_big.cnt,
 			       0, "rx_small_cnt");
@@ -1655,118 +1655,118 @@ mxge_add_sysctls(mxge_softc_t *sc)
 		if (slice > 0)
 			continue;
 #endif
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_req",
 			       CTLFLAG_RD, &ss->tx.req,
 			       0, "tx_req");
 
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_done",
 			       CTLFLAG_RD, &ss->tx.done,
 			       0, "tx_done");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_pkt_done",
 			       CTLFLAG_RD, &ss->tx.pkt_done,
 			       0, "tx_done");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_stall",
 			       CTLFLAG_RD, &ss->tx.stall,
 			       0, "tx_stall");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_wake",
 			       CTLFLAG_RD, &ss->tx.wake,
 			       0, "tx_wake");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_defrag",
 			       CTLFLAG_RD, &ss->tx.defrag,
 			       0, "tx_defrag");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_queue_active",
 			       CTLFLAG_RD, &ss->tx.queue_active,
 			       0, "tx_queue_active");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_activate",
 			       CTLFLAG_RD, &ss->tx.activate,
 			       0, "tx_activate");
-		SYSCTL_ADD_INT(ctx, children, OID_AUTO, 
+		SYSCTL_ADD_INT(ctx, children, OID_AUTO,
 			       "tx_deactivate",
 			       CTLFLAG_RD, &ss->tx.deactivate,
 			       0, "tx_deactivate");
 	}
 }
 
-/* copy an array of mcp_kreq_ether_send_t's to the mcp.  Copy 
+/* copy an array of mcp_kreq_ether_send_t's to the mcp.  Copy
    backwards one at a time and handle ring wraps */
 
-static inline void 
-mxge_submit_req_backwards(mxge_tx_ring_t *tx, 
+static inline void
+mxge_submit_req_backwards(mxge_tx_ring_t *tx,
 			    mcp_kreq_ether_send_t *src, int cnt)
 {
-        int idx, starting_slot;
-        starting_slot = tx->req;
-        while (cnt > 1) {
-                cnt--;
-                idx = (starting_slot + cnt) & tx->mask;
-                mxge_pio_copy(&tx->lanai[idx],
+	int idx, starting_slot;
+	starting_slot = tx->req;
+	while (cnt > 1) {
+		cnt--;
+		idx = (starting_slot + cnt) & tx->mask;
+		mxge_pio_copy(&tx->lanai[idx],
 			      &src[cnt], sizeof(*src));
-                wmb();
-        }
+		wmb();
+	}
 }
 
 /*
  * copy an array of mcp_kreq_ether_send_t's to the mcp.  Copy
  * at most 32 bytes at a time, so as to avoid involving the software
  * pio handler in the nic.   We re-write the first segment's flags
- * to mark them valid only after writing the entire chain 
+ * to mark them valid only after writing the entire chain
  */
 
-static inline void 
-mxge_submit_req(mxge_tx_ring_t *tx, mcp_kreq_ether_send_t *src, 
-                  int cnt)
+static inline void
+mxge_submit_req(mxge_tx_ring_t *tx, mcp_kreq_ether_send_t *src,
+		  int cnt)
 {
-        int idx, i;
-        uint32_t *src_ints;
+	int idx, i;
+	uint32_t *src_ints;
 	volatile uint32_t *dst_ints;
-        mcp_kreq_ether_send_t *srcp;
+	mcp_kreq_ether_send_t *srcp;
 	volatile mcp_kreq_ether_send_t *dstp, *dst;
 	uint8_t last_flags;
-        
-        idx = tx->req & tx->mask;
+	
+	idx = tx->req & tx->mask;
 
 	last_flags = src->flags;
 	src->flags = 0;
-        wmb();
-        dst = dstp = &tx->lanai[idx];
-        srcp = src;
+	wmb();
+	dst = dstp = &tx->lanai[idx];
+	srcp = src;
 
-        if ((idx + cnt) < tx->mask) {
-                for (i = 0; i < (cnt - 1); i += 2) {
-                        mxge_pio_copy(dstp, srcp, 2 * sizeof(*src));
-                        wmb(); /* force write every 32 bytes */
-                        srcp += 2;
-                        dstp += 2;
-                }
-        } else {
-                /* submit all but the first request, and ensure 
-                   that it is submitted below */
-                mxge_submit_req_backwards(tx, src, cnt);
-                i = 0;
-        }
-        if (i < cnt) {
-                /* submit the first request */
-                mxge_pio_copy(dstp, srcp, sizeof(*src));
-                wmb(); /* barrier before setting valid flag */
-        }
+	if ((idx + cnt) < tx->mask) {
+		for (i = 0; i < (cnt - 1); i += 2) {
+			mxge_pio_copy(dstp, srcp, 2 * sizeof(*src));
+			wmb(); /* force write every 32 bytes */
+			srcp += 2;
+			dstp += 2;
+		}
+	} else {
+		/* submit all but the first request, and ensure
+		   that it is submitted below */
+		mxge_submit_req_backwards(tx, src, cnt);
+		i = 0;
+	}
+	if (i < cnt) {
+		/* submit the first request */
+		mxge_pio_copy(dstp, srcp, sizeof(*src));
+		wmb(); /* barrier before setting valid flag */
+	}
 
-        /* re-write the last 32-bits with the valid flags */
-        src->flags = last_flags;
-        src_ints = (uint32_t *)src;
-        src_ints+=3;
-        dst_ints = (volatile uint32_t *)dst;
-        dst_ints+=3;
-        *dst_ints =  *src_ints;
-        tx->req += cnt;
-        wmb();
+	/* re-write the last 32-bits with the valid flags */
+	src->flags = last_flags;
+	src_ints = (uint32_t *)src;
+	src_ints+=3;
+	dst_ints = (volatile uint32_t *)dst;
+	dst_ints+=3;
+	*dst_ints =  *src_ints;
+	tx->req += cnt;
+	wmb();
 }
 
 static int
@@ -1969,7 +1969,7 @@ mxge_encap_tso(struct mxge_slice_state *ss, struct mbuf *m,
 				seglen = -cum_len;
 				small = (mss <= MXGEFW_SEND_SMALL_SIZE);
 				flags_next = MXGEFW_FLAGS_TSO_PLD |
-					MXGEFW_FLAGS_FIRST | 
+					MXGEFW_FLAGS_FIRST |
 					(small * MXGEFW_FLAGS_SMALL);
 			    }
 			
@@ -2038,7 +2038,7 @@ mxge_encap_tso(struct mxge_slice_state *ss, struct mbuf *m,
 #endif /* IFCAP_TSO4 */
 
 #ifdef MXGE_NEW_VLAN_API
-/* 
+/*
  * We reproduce the software vlan tag insertion from
  * net/if_vlan.c:vlan_start() here so that we can advertise "hardware"
  * vlan tag insertion. We need to advertise this in order to have the
@@ -2083,7 +2083,7 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m)
 	mxge_tx_ring_t *tx;
 	int cnt, cum_len, err, i, idx, odd_flag;
 	uint16_t pseudo_hdr_offset;
-        uint8_t flags, cksum_offset;
+	uint8_t flags, cksum_offset;
 
 
 	sc = ss->sc;
@@ -2106,7 +2106,7 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m)
 	/* (try to) map the frame for DMA */
 	idx = tx->req & tx->mask;
 	err = bus_dmamap_load_mbuf_sg(tx->dmat, tx->info[idx].map,
-				      m, tx->seg_list, &cnt, 
+				      m, tx->seg_list, &cnt,
 				      BUS_DMA_NOWAIT);
 	if (__predict_false(err == EFBIG)) {
 		/* Too many segments in the chain.  Try
@@ -2117,9 +2117,9 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m)
 		}
 		ss->tx.defrag++;
 		m = m_tmp;
-		err = bus_dmamap_load_mbuf_sg(tx->dmat, 
+		err = bus_dmamap_load_mbuf_sg(tx->dmat,
 					      tx->info[idx].map,
-					      m, tx->seg_list, &cnt, 
+					      m, tx->seg_list, &cnt,
 					      BUS_DMA_NOWAIT);
 	}
 	if (__predict_false(err != 0)) {
@@ -2166,9 +2166,9 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m)
 	seg = tx->seg_list;
 	req->flags = MXGEFW_FLAGS_FIRST;
 	for (i = 0; i < cnt; i++) {
-		req->addr_low = 
+		req->addr_low =
 			htobe32(MXGE_LOWPART_TO_U32(seg->ds_addr));
-		req->addr_high = 
+		req->addr_high =
 			htobe32(MXGE_HIGHPART_TO_U32(seg->ds_addr));
 		req->length = htobe16(seg->ds_len);
 		req->cksum_offset = cksum_offset;
@@ -2189,9 +2189,9 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m)
 	/* pad runts to 60 bytes */
 	if (cum_len < 60) {
 		req++;
-		req->addr_low = 
+		req->addr_low =
 			htobe32(MXGE_LOWPART_TO_U32(sc->zeropad_dma.bus_addr));
-		req->addr_high = 
+		req->addr_high =
 			htobe32(MXGE_HIGHPART_TO_U32(sc->zeropad_dma.bus_addr));
 		req->length = htobe16(60 - cum_len);
 		req->cksum_offset = 0;
@@ -2427,16 +2427,16 @@ mxge_get_buf_small(struct mxge_slice_state *ss, bus_dmamap_t map, int idx)
 		goto done;
 	}
 	m->m_len = MHLEN;
-	err = bus_dmamap_load_mbuf_sg(rx->dmat, map, m, 
+	err = bus_dmamap_load_mbuf_sg(rx->dmat, map, m,
 				      &seg, &cnt, BUS_DMA_NOWAIT);
 	if (err != 0) {
 		m_free(m);
 		goto done;
 	}
 	rx->info[idx].m = m;
-	rx->shadow[idx].addr_low = 
+	rx->shadow[idx].addr_low =
 		htobe32(MXGE_LOWPART_TO_U32(seg.ds_addr));
-	rx->shadow[idx].addr_high = 
+	rx->shadow[idx].addr_high =
 		htobe32(MXGE_HIGHPART_TO_U32(seg.ds_addr));
 
 done:
@@ -2460,23 +2460,23 @@ mxge_get_buf_big(struct mxge_slice_state *ss, bus_dmamap_t map, int idx)
 		goto done;
 	}
 	m->m_len = rx->mlen;
-	err = bus_dmamap_load_mbuf_sg(rx->dmat, map, m, 
+	err = bus_dmamap_load_mbuf_sg(rx->dmat, map, m,
 				      seg, &cnt, BUS_DMA_NOWAIT);
 	if (err != 0) {
 		m_free(m);
 		goto done;
 	}
 	rx->info[idx].m = m;
-	rx->shadow[idx].addr_low = 
+	rx->shadow[idx].addr_low =
 		htobe32(MXGE_LOWPART_TO_U32(seg->ds_addr));
-	rx->shadow[idx].addr_high = 
+	rx->shadow[idx].addr_high =
 		htobe32(MXGE_HIGHPART_TO_U32(seg->ds_addr));
 
 #if MXGE_VIRT_JUMBOS
 	for (i = 1; i < cnt; i++) {
-		rx->shadow[idx + i].addr_low = 
+		rx->shadow[idx + i].addr_low =
 			htobe32(MXGE_LOWPART_TO_U32(seg[i].ds_addr));
-		rx->shadow[idx + i].addr_high = 
+		rx->shadow[idx + i].addr_high =
 			htobe32(MXGE_HIGHPART_TO_U32(seg[i].ds_addr));
        }
 #endif
@@ -2548,7 +2548,7 @@ mxge_rx_csum6(void *p, struct mbuf *m, uint32_t csum)
 	return (c);
 }
 #endif /* INET6 */
-/* 
+/*
  *  Myri10GE hardware checksums are not valid if the sender
  *  padded the frame with non-zero padding.  This is because
  *  the firmware just does a simple 16-bit 1s complement
@@ -2616,14 +2616,14 @@ mxge_vlan_tag_remove(struct mbuf *m, uint32_t *csum)
 	 */
 
 	/* put checksum into host byte order */
-	*csum = ntohs(*csum); 
+	*csum = ntohs(*csum);
 	partial = ntohl(*(uint32_t *)(mtod(m, char *) + ETHER_HDR_LEN));
 	(*csum) += ~partial;
 	(*csum) +=  ((*csum) < ~partial);
 	(*csum) = ((*csum) >> 16) + ((*csum) & 0xFFFF);
 	(*csum) = ((*csum) >> 16) + ((*csum) & 0xFFFF);
 
-	/* restore checksum to network byte order; 
+	/* restore checksum to network byte order;
 	   later consumers expect this */
 	*csum = htons(*csum);
 
@@ -2678,7 +2678,7 @@ mxge_rx_done_big(struct mxge_slice_state *ss, uint32_t len,
 	/* try to replace the received mbuf */
 	if (mxge_get_buf_big(ss, rx->extra_map, idx)) {
 		/* drop the frame -- the old mbuf is re-cycled */
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -2747,7 +2747,7 @@ mxge_rx_done_small(struct mxge_slice_state *ss, uint32_t len,
 	/* try to replace the received mbuf */
 	if (mxge_get_buf_small(ss, rx->extra_map, idx)) {
 		/* drop the frame -- the old mbuf is re-cycled */
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -2863,7 +2863,7 @@ mxge_tx_done(struct mxge_slice_state *ss, uint32_t mcp_idx)
 	}
 	
 	/* If we have space, clear IFF_OACTIVE to tell the stack that
-           its OK to send packets */
+	   its OK to send packets */
 #ifdef IFNET_BUF_RING
 	flags = &ss->if_drv_flags;
 #else
@@ -2919,7 +2919,7 @@ mxge_media_set(mxge_softc_t *sc, int media_type)
 {
 
 	
-	ifmedia_add(&sc->media, IFM_ETHER | IFM_FDX | media_type, 
+	ifmedia_add(&sc->media, IFM_ETHER | IFM_FDX | media_type,
 		    0, NULL);
 	ifmedia_set(&sc->media, IFM_ETHER | IFM_FDX | media_type);
 	sc->current_media = media_type;
@@ -2935,7 +2935,7 @@ mxge_media_init(mxge_softc_t *sc)
 	ifmedia_removeall(&sc->media);
 	mxge_media_set(sc, IFM_AUTO);
 
-	/* 
+	/*
 	 * parse the product code to deterimine the interface type
 	 * (CX4, XFP, Quad Ribbon Fiber) by looking at the character
 	 * after the 3rd dash in the driver's cached copy of the
@@ -2980,7 +2980,7 @@ mxge_media_init(mxge_softc_t *sc)
  * themselves only when their link is up, so this is initiated via a
  * link up interrupt.  However, this can potentially take up to
  * several milliseconds, so it is run via the watchdog routine, rather
- * than in the interrupt handler itself. 
+ * than in the interrupt handler itself.
  */
 static void
 mxge_media_probe(mxge_softc_t *sc)
@@ -2997,7 +2997,7 @@ mxge_media_probe(mxge_softc_t *sc)
 	if (sc->connector == MXGE_XFP) {
 		/* -R is XFP */
 		mxge_media_types = mxge_xfp_media_types;
-		mxge_media_type_entries = 
+		mxge_media_type_entries =
 			sizeof (mxge_xfp_media_types) /
 			sizeof (mxge_xfp_media_types[0]);
 		byte = MXGE_XFP_COMPLIANCE_BYTE;
@@ -3005,7 +3005,7 @@ mxge_media_probe(mxge_softc_t *sc)
 	} else 	if (sc->connector == MXGE_SFP) {
 		/* -S or -2S is SFP+ */
 		mxge_media_types = mxge_sfp_media_types;
-		mxge_media_type_entries = 
+		mxge_media_type_entries =
 			sizeof (mxge_sfp_media_types) /
 			sizeof (mxge_sfp_media_types[0]);
 		cage_type = "SFP+";
@@ -3151,7 +3151,7 @@ mxge_intr(void *arg)
 		}
 		if (sc->rdma_tags_available !=
 		    be32toh(stats->rdma_tags_available)) {
-			sc->rdma_tags_available = 
+			sc->rdma_tags_available =
 				be32toh(stats->rdma_tags_available);
 			device_printf(sc->dev, "RDMA timed out! %d tags "
 				      "left\n", sc->rdma_tags_available);
@@ -3384,7 +3384,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 		return err;
 	}
 	for (i = 0; i <= ss->rx_small.mask; i++) {
-		err = bus_dmamap_create(ss->rx_small.dmat, 0, 
+		err = bus_dmamap_create(ss->rx_small.dmat, 0,
 					&ss->rx_small.info[i].map);
 		if (err != 0) {
 			device_printf(sc->dev, "Err %d  rx_small dmamap\n",
@@ -3392,7 +3392,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 			return err;
 		}
 	}
-	err = bus_dmamap_create(ss->rx_small.dmat, 0, 
+	err = bus_dmamap_create(ss->rx_small.dmat, 0,
 				&ss->rx_small.extra_map);
 	if (err != 0) {
 		device_printf(sc->dev, "Err %d extra rx_small dmamap\n",
@@ -3401,7 +3401,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 	}
 
 	for (i = 0; i <= ss->rx_big.mask; i++) {
-		err = bus_dmamap_create(ss->rx_big.dmat, 0, 
+		err = bus_dmamap_create(ss->rx_big.dmat, 0,
 					&ss->rx_big.info[i].map);
 		if (err != 0) {
 			device_printf(sc->dev, "Err %d  rx_big dmamap\n",
@@ -3409,7 +3409,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 			return err;
 		}
 	}
-	err = bus_dmamap_create(ss->rx_big.dmat, 0, 
+	err = bus_dmamap_create(ss->rx_big.dmat, 0,
 				&ss->rx_big.extra_map);
 	if (err != 0) {
 		device_printf(sc->dev, "Err %d extra rx_big dmamap\n",
@@ -3430,7 +3430,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 
 	
 	/* allocate the tx request copy block */
-	bytes = 8 + 
+	bytes = 8 +
 		sizeof (*ss->tx.req_list) * (ss->tx.max_desc + 4);
 	ss->tx.req_bytes = malloc(bytes, M_DEVBUF, M_WAITOK);
 	/* ensure req_list entries are aligned to 8 bytes */
@@ -3439,7 +3439,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 
 	/* allocate the tx busdma segment list */
 	bytes = sizeof (*ss->tx.seg_list) * ss->tx.max_desc;
-	ss->tx.seg_list = (bus_dma_segment_t *) 
+	ss->tx.seg_list = (bus_dma_segment_t *)
 		malloc(bytes, M_DEVBUF, M_WAITOK);
 
 	/* allocate the tx host info ring */
@@ -3469,7 +3469,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries,
 	/* now use these tags to setup dmamaps for each slot
 	   in the ring */
 	for (i = 0; i <= ss->tx.mask; i++) {
-		err = bus_dmamap_create(ss->tx.dmat, 0, 
+		err = bus_dmamap_create(ss->tx.dmat, 0,
 					&ss->tx.info[i].map);
 		if (err != 0) {
 			device_printf(sc->dev, "Err %d  tx dmamap\n",
@@ -3580,7 +3580,7 @@ mxge_slice_open(struct mxge_slice_state *ss, int nbufs, int cl_size)
 #endif
 		cmd.data0 = slice;
 		err = mxge_send_cmd(sc, MXGEFW_CMD_GET_SEND_OFFSET, &cmd);
-		ss->tx.lanai = 
+		ss->tx.lanai =
 			(volatile mcp_kreq_ether_send_t *)(sc->sram + cmd.data0);
 		ss->tx.send_go = (volatile uint32_t *)
 			(sc->sram + MXGEFW_ETH_SEND_GO + 64 * slice);
@@ -3590,17 +3590,17 @@ mxge_slice_open(struct mxge_slice_state *ss, int nbufs, int cl_size)
 	}
 #endif
 	cmd.data0 = slice;
-	err |= mxge_send_cmd(sc, 
+	err |= mxge_send_cmd(sc,
 			     MXGEFW_CMD_GET_SMALL_RX_OFFSET, &cmd);
-	ss->rx_small.lanai = 
+	ss->rx_small.lanai =
 		(volatile mcp_kreq_ether_recv_t *)(sc->sram + cmd.data0);
 	cmd.data0 = slice;
 	err |= mxge_send_cmd(sc, MXGEFW_CMD_GET_BIG_RX_OFFSET, &cmd);
-	ss->rx_big.lanai = 
+	ss->rx_big.lanai =
 		(volatile mcp_kreq_ether_recv_t *)(sc->sram + cmd.data0);
 
 	if (err != 0) {
-		device_printf(sc->dev, 
+		device_printf(sc->dev,
 			      "failed to get ring sizes or locations\n");
 		return EIO;
 	}
@@ -3635,7 +3635,7 @@ mxge_slice_open(struct mxge_slice_state *ss, int nbufs, int cl_size)
 	return 0;
 }
 
-static int 
+static int
 mxge_open(mxge_softc_t *sc)
 {
 	mxge_cmd_t cmd;
@@ -3687,7 +3687,7 @@ mxge_open(mxge_softc_t *sc)
 	cmd.data0 = nbufs;
 	err = mxge_send_cmd(sc, MXGEFW_CMD_ALWAYS_USE_N_BIG_BUFFERS,
 			    &cmd);
-	/* error is only meaningful if we're trying to set 
+	/* error is only meaningful if we're trying to set
 	   MXGEFW_CMD_ALWAYS_USE_N_BIG_BUFFERS > 1 */
 	if (err && nbufs > 1) {
 		device_printf(sc->dev,
@@ -3712,7 +3712,7 @@ mxge_open(mxge_softc_t *sc)
 	}
 
 	/* Now give him the pointer to the stats block */
-	for (slice = 0; 
+	for (slice = 0;
 #ifdef IFNET_BUF_RING
 	     slice < sc->num_slices;
 #else
@@ -3880,7 +3880,7 @@ mxge_watchdog_reset(mxge_softc_t *sc)
 
 	device_printf(sc->dev, "Watchdog reset!\n");
 
-	/* 
+	/*
 	 * check to see if the NIC rebooted.  If it did, then all of
 	 * PCI config space has been reset, and things like the
 	 * busmaster bit will be zero.  If this is the case, then we
@@ -3889,10 +3889,10 @@ mxge_watchdog_reset(mxge_softc_t *sc)
 	 */
 	cmd = pci_read_config(sc->dev, PCIR_COMMAND, 2);
 	if (cmd == 0xffff) {
-		/* 
+		/*
 		 * maybe the watchdog caught the NIC rebooting; wait
 		 * up to 100ms for it to finish.  If it does not come
-		 * back, then give up 
+		 * back, then give up
 		 */
 		DELAY(1000*100);
 		cmd = pci_read_config(sc->dev, PCIR_COMMAND, 2);
@@ -3908,7 +3908,7 @@ mxge_watchdog_reset(mxge_softc_t *sc)
 		running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING;
 		if (running) {
 
-			/* 
+			/*
 			 * quiesce NIC so that TX routines will not try to
 			 * xmit after restoration of BAR
 			 */
@@ -4004,7 +4004,7 @@ mxge_watchdog(mxge_softc_t *sc)
 
 	/* see if we have outstanding transmits, which
 	   have been pending for more than mxge_ticks */
-	for (i = 0; 
+	for (i = 0;
 #ifdef IFNET_BUF_RING
 	     (i < sc->num_slices) && (err == 0);
 #else
@@ -4036,43 +4036,45 @@ mxge_watchdog(mxge_softc_t *sc)
 	return (err);
 }
 
-static u_long
-mxge_update_stats(mxge_softc_t *sc)
+static uint64_t
+mxge_get_counter(struct ifnet *ifp, ift_counter cnt)
 {
-	struct mxge_slice_state *ss;
-	u_long pkts = 0;
-	u_long ipackets = 0;
-	u_long opackets = 0;
-#ifdef IFNET_BUF_RING
-	u_long obytes = 0;
-	u_long omcasts = 0;
-	u_long odrops = 0;
-#endif
-	u_long oerrors = 0;
-	int slice;
+	struct mxge_softc *sc;
+	uint64_t rv;
 
-	for (slice = 0; slice < sc->num_slices; slice++) {
-		ss = &sc->ss[slice];
-		ipackets += ss->ipackets;
-		opackets += ss->opackets;
+	sc = if_getsoftc(ifp);
+	rv = 0;
+
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].ipackets;
+		return (rv);
+	case IFCOUNTER_OPACKETS:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].opackets;
+		return (rv);
+	case IFCOUNTER_OERRORS:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].oerrors;
+		return (rv);
 #ifdef IFNET_BUF_RING
-		obytes += ss->obytes;
-		omcasts += ss->omcasts;
-		odrops += ss->tx.br->br_drops;
+	case IFCOUNTER_OBYTES:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].obytes;
+		return (rv);
+	case IFCOUNTER_OMCASTS:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].omcasts;
+		return (rv);
+	case IFCOUNTER_OQDROPS:
+		for (int s = 0; s < sc->num_slices; s++)
+			rv += sc->ss[s].tx.br->br_drops;
+		return (rv);
 #endif
-		oerrors += ss->oerrors;
+	default:
+		return (if_get_counter_default(ifp, cnt));
 	}
-	pkts = (ipackets - sc->ifp->if_ipackets);
-	pkts += (opackets - sc->ifp->if_opackets);
-	sc->ifp->if_ipackets = ipackets;
-	sc->ifp->if_opackets = opackets;
-#ifdef IFNET_BUF_RING
-	sc->ifp->if_obytes = obytes;
-	sc->ifp->if_omcasts = omcasts;
-	sc->ifp->if_snd.ifq_drops = odrops;
-#endif
-	sc->ifp->if_oerrors = oerrors;
-	return pkts;
 }
 
 static void
@@ -4087,8 +4089,6 @@ mxge_tick(void *arg)
 	ticks = mxge_ticks;
 	running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING;
 	if (running) {
-		/* aggregate stats from different slices */
-		pkts = mxge_update_stats(sc);
 		if (!sc->watchdog_countdown) {
 			err = mxge_watchdog(sc);
 			sc->watchdog_countdown = 4;
@@ -4189,7 +4189,7 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			} else {
 				/* take care of promis can allmulti
 				   flag chages */
-				mxge_change_promisc(sc, 
+				mxge_change_promisc(sc,
 						    ifp->if_flags & IFF_PROMISC);
 				mxge_set_multicast_list(sc);
 			}
@@ -4291,13 +4291,13 @@ mxge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		mtx_lock(&sc->driver_mtx);
 		mxge_media_probe(sc);
 		mtx_unlock(&sc->driver_mtx);
-		err = ifmedia_ioctl(ifp, (struct ifreq *)data, 
+		err = ifmedia_ioctl(ifp, (struct ifreq *)data,
 				    &sc->media, command);
-                break;
+		break;
 
 	default:
 		err = ENOTTY;
-        }
+	}
 	return err;
 }
 
@@ -4306,17 +4306,17 @@ mxge_fetch_tunables(mxge_softc_t *sc)
 {
 
 	TUNABLE_INT_FETCH("hw.mxge.max_slices", &mxge_max_slices);
-	TUNABLE_INT_FETCH("hw.mxge.flow_control_enabled", 
+	TUNABLE_INT_FETCH("hw.mxge.flow_control_enabled",
 			  &mxge_flow_control);
-	TUNABLE_INT_FETCH("hw.mxge.intr_coal_delay", 
+	TUNABLE_INT_FETCH("hw.mxge.intr_coal_delay",
 			  &mxge_intr_coal_delay);	
-	TUNABLE_INT_FETCH("hw.mxge.nvidia_ecrc_enable", 
+	TUNABLE_INT_FETCH("hw.mxge.nvidia_ecrc_enable",
 			  &mxge_nvidia_ecrc_enable);	
-	TUNABLE_INT_FETCH("hw.mxge.force_firmware", 
+	TUNABLE_INT_FETCH("hw.mxge.force_firmware",
 			  &mxge_force_firmware);	
-	TUNABLE_INT_FETCH("hw.mxge.deassert_wait", 
+	TUNABLE_INT_FETCH("hw.mxge.deassert_wait",
 			  &mxge_deassert_wait);	
-	TUNABLE_INT_FETCH("hw.mxge.verbose", 
+	TUNABLE_INT_FETCH("hw.mxge.verbose",
 			  &mxge_verbose);	
 	TUNABLE_INT_FETCH("hw.mxge.ticks", &mxge_ticks);
 	TUNABLE_INT_FETCH("hw.mxge.always_promisc", &mxge_always_promisc);
@@ -4332,7 +4332,7 @@ mxge_fetch_tunables(mxge_softc_t *sc)
 	if (mxge_ticks == 0)
 		mxge_ticks = hz / 2;
 	sc->pause = mxge_flow_control;
-	if (mxge_rss_hash_type < MXGEFW_RSS_HASH_TYPE_IPV4 
+	if (mxge_rss_hash_type < MXGEFW_RSS_HASH_TYPE_IPV4
 	    || mxge_rss_hash_type > MXGEFW_RSS_HASH_TYPE_MAX) {
 		mxge_rss_hash_type = MXGEFW_RSS_HASH_TYPE_SRC_DST_PORT;
 	}
@@ -4414,7 +4414,7 @@ mxge_alloc_slices(mxge_softc_t *sc)
 		ss->rx_done.entry = ss->rx_done.dma.addr;
 		bzero(ss->rx_done.entry, bytes);
 
-		/* 
+		/*
 		 * allocate the per-slice firmware stats; stats
 		 * (including tx) are used used only on the first
 		 * slice for now
@@ -4425,7 +4425,7 @@ mxge_alloc_slices(mxge_softc_t *sc)
 #endif
 
 		bytes = sizeof (*ss->fw_stats);
-		err = mxge_dma_alloc(sc, &ss->fw_stats_dma, 
+		err = mxge_dma_alloc(sc, &ss->fw_stats_dma,
 				     sizeof (*ss->fw_stats), 64);
 		if (err != 0)
 			goto abort;
@@ -4454,9 +4454,9 @@ mxge_slice_probe(mxge_softc_t *sc)
 	int msix_cnt, status, max_intr_slots;
 
 	sc->num_slices = 1;
-	/* 
+	/*
 	 *  don't enable multiple slices if they are not enabled,
-	 *  or if this is not an SMP system 
+	 *  or if this is not an SMP system
 	 */
 	
 	if (mxge_max_slices == 0 || mxge_max_slices == 1 || mp_ncpus < 2)
@@ -4593,7 +4593,7 @@ mxge_add_msix_irqs(mxge_softc_t *sc)
 	sc->msix_ih =  malloc(bytes, M_DEVBUF, M_NOWAIT|M_ZERO);
 
 	for (i = 0; i < sc->num_slices; i++) {
-		err = bus_setup_intr(sc->dev, sc->msix_irq_res[i], 
+		err = bus_setup_intr(sc->dev, sc->msix_irq_res[i],
 				     INTR_TYPE_NET | INTR_MPSAFE,
 #if __FreeBSD_version > 700030
 				     NULL,
@@ -4671,7 +4671,7 @@ mxge_add_single_irq(mxge_softc_t *sc)
 		device_printf(sc->dev, "using %s irq %ld\n",
 			      sc->legacy_irq ? "INTx" : "MSI",
 			      rman_get_start(sc->irq_res));
-	err = bus_setup_intr(sc->dev, sc->irq_res, 
+	err = bus_setup_intr(sc->dev, sc->irq_res,
 			     INTR_TYPE_NET | INTR_MPSAFE,
 #if __FreeBSD_version > 700030
 			     NULL,
@@ -4753,7 +4753,7 @@ mxge_add_irq(mxge_softc_t *sc)
 }
 
 
-static int 
+static int
 mxge_attach(device_t dev)
 {
 	mxge_cmd_t cmd;
@@ -4835,7 +4835,7 @@ mxge_attach(device_t dev)
 	bus_space_read_region_1(rman_get_bustag(sc->mem_res),
 				rman_get_bushandle(sc->mem_res),
 				sc->sram_size - MXGE_EEPROM_STRINGS_SIZE,
-				sc->eeprom_strings, 
+				sc->eeprom_strings,
 				MXGE_EEPROM_STRINGS_SIZE - 2);
 	err = mxge_parse_strings(sc);
 	if (err != 0)
@@ -4845,13 +4845,13 @@ mxge_attach(device_t dev)
 	mxge_enable_wc(sc);
 
 	/* Allocate the out of band dma memory */
-	err = mxge_dma_alloc(sc, &sc->cmd_dma, 
+	err = mxge_dma_alloc(sc, &sc->cmd_dma,
 			     sizeof (mxge_cmd_t), 64);
-	if (err != 0) 
+	if (err != 0)
 		goto abort_with_mem_res;
 	sc->cmd = (mcp_cmd_response_t *) sc->cmd_dma.addr;
 	err = mxge_dma_alloc(sc, &sc->zeropad_dma, 64, 64);
-	if (err != 0) 
+	if (err != 0)
 		goto abort_with_cmd_dma;
 
 	err = mxge_dma_alloc(sc, &sc->dmabench_dma, 4096, 4096);
@@ -4920,13 +4920,14 @@ mxge_attach(device_t dev)
 	ifp->if_capenable = ifp->if_capabilities;
 	if (sc->lro_cnt == 0)
 		ifp->if_capenable &= ~IFCAP_LRO;
-        ifp->if_init = mxge_init;
-        ifp->if_softc = sc;
-        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-        ifp->if_ioctl = mxge_ioctl;
-        ifp->if_start = mxge_start;
+	ifp->if_init = mxge_init;
+	ifp->if_softc = sc;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_ioctl = mxge_ioctl;
+	ifp->if_start = mxge_start;
+	ifp->if_get_counter = mxge_get_counter;
 	/* Initialise the ifmedia structure */
-	ifmedia_init(&sc->media, 0, mxge_media_change, 
+	ifmedia_init(&sc->media, 0, mxge_media_change,
 		     mxge_media_status);
 	mxge_media_init(sc);
 	mxge_media_probe(sc);
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index f8df05998d24..e94e9aba300c 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1121,7 +1121,7 @@ my_rxeof(struct my_softc * sc)
 		sc->my_cdata.my_rx_head = cur_rx->my_nextdesc;
 
 		if (rxstat & MY_ES) {	/* error summary: give up this rx pkt */
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->my_ptr->my_status = MY_OWNByNIC;
 			continue;
 		}
@@ -1134,7 +1134,7 @@ my_rxeof(struct my_softc * sc)
 			    total_len, 0, ifp, NULL);
 			cur_rx->my_ptr->my_status = MY_OWNByNIC;
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				continue;
 			}
 		} else {
@@ -1147,14 +1147,14 @@ my_rxeof(struct my_softc * sc)
 			 * little else we can do in this situation.
 			 */
 			if (my_newbuf(sc, cur_rx) == ENOBUFS) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				cur_rx->my_ptr->my_status = MY_OWNByNIC;
 				continue;
 			}
 			m->m_pkthdr.rcvif = ifp;
 			m->m_pkthdr.len = m->m_len = total_len;
 		}
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		eh = mtod(m, struct ether_header *);
 #if NBPFILTER > 0
 		/*
@@ -1212,16 +1212,16 @@ my_txeof(struct my_softc * sc)
 			break;
 		if (!(CSR_READ_4(sc, MY_TCRRCR) & MY_Enhanced)) {
 			if (txstat & MY_TXERR) {
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				if (txstat & MY_EC) /* excessive collision */
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 				if (txstat & MY_LC)	/* late collision */
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			}
-			ifp->if_collisions += (txstat & MY_NCRMASK) >>
-			    MY_NCRShift;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+			    (txstat & MY_NCRMASK) >> MY_NCRShift);
 		}
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		m_freem(cur_tx->my_mbuf);
 		cur_tx->my_mbuf = NULL;
 		if (sc->my_cdata.my_tx_head == sc->my_cdata.my_tx_tail) {
@@ -1232,7 +1232,7 @@ my_txeof(struct my_softc * sc)
 		sc->my_cdata.my_tx_head = cur_tx->my_nextdesc;
 	}
 	if (CSR_READ_4(sc, MY_TCRRCR) & MY_Enhanced) {
-		ifp->if_collisions += (CSR_READ_4(sc, MY_TSR) & MY_NCRMask);
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (CSR_READ_4(sc, MY_TSR) & MY_NCRMask));
 	}
 	return;
 }
@@ -1293,7 +1293,7 @@ my_intr(void *arg)
 
 		if ((status & MY_RBU) || (status & MY_RxErr)) {
 			/* rx buffer unavailable or rx error */
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #ifdef foo
 			my_stop(sc);
 			my_reset(sc);
@@ -1701,7 +1701,7 @@ my_watchdog(void *arg)
 		return;
 
 	ifp = sc->my_ifp;
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 	if (!(my_phy_readreg(sc, PHY_BMSR) & PHY_BMSR_LINKSTAT))
 		if_printf(ifp, "no carrier - transceiver cable problem?\n");
diff --git a/sys/pci/locate.pl b/sys/dev/ncr/locate.pl
similarity index 100%
rename from sys/pci/locate.pl
rename to sys/dev/ncr/locate.pl
diff --git a/sys/pci/ncr.c b/sys/dev/ncr/ncr.c
similarity index 97%
rename from sys/pci/ncr.c
rename to sys/dev/ncr/ncr.c
index d13769cc6313..6c941e1fcd7d 100644
--- a/sys/pci/ncr.c
+++ b/sys/dev/ncr/ncr.c
@@ -43,11 +43,6 @@
 __FBSDID("$FreeBSD$");
 
 
-#define NCR_DATE "pl30 98/1/1"
-
-#define NCR_VERSION	(2)
-#define	MAX_UNITS	(16)
-
 #define NCR_GETCC_WITHMSG
 
 #if defined (__FreeBSD__) && defined(_KERNEL)
@@ -197,7 +192,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <pci/ncrreg.h>
+#include <dev/ncr/ncrreg.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
@@ -274,25 +269,22 @@ __FBSDID("$FreeBSD$");
 **==========================================================
 */
 
-#define	INB(r) bus_space_read_1(np->bst, np->bsh, offsetof(struct ncr_reg, r))
-#define	INW(r) bus_space_read_2(np->bst, np->bsh, offsetof(struct ncr_reg, r))
-#define	INL(r) bus_space_read_4(np->bst, np->bsh, offsetof(struct ncr_reg, r))
+#define	INB(r) bus_read_1(np->reg_res, offsetof(struct ncr_reg, r))
+#define	INW(r) bus_read_2(np->reg_res, offsetof(struct ncr_reg, r))
+#define	INL(r) bus_read_4(np->reg_res, offsetof(struct ncr_reg, r))
 
-#define	OUTB(r, val) bus_space_write_1(np->bst, np->bsh, \
-				       offsetof(struct ncr_reg, r), val)
-#define	OUTW(r, val) bus_space_write_2(np->bst, np->bsh, \
-				       offsetof(struct ncr_reg, r), val)
-#define	OUTL(r, val) bus_space_write_4(np->bst, np->bsh, \
-				       offsetof(struct ncr_reg, r), val)
-#define	OUTL_OFF(o, val) bus_space_write_4(np->bst, np->bsh, o, val)
+#define	OUTB(r, val) bus_write_1(np->reg_res, offsetof(struct ncr_reg, r), val)
+#define	OUTW(r, val) bus_write_2(np->reg_res, offsetof(struct ncr_reg, r), val)
+#define	OUTL(r, val) bus_write_4(np->reg_res, offsetof(struct ncr_reg, r), val)
+#define	OUTL_OFF(o, val) bus_write_4(np->reg_res, o, val)
 
-#define	INB_OFF(o) bus_space_read_1(np->bst, np->bsh, o)
-#define	INW_OFF(o) bus_space_read_2(np->bst, np->bsh, o)
-#define	INL_OFF(o) bus_space_read_4(np->bst, np->bsh, o)
+#define	INB_OFF(o) bus_read_1(np->reg_res, o)
+#define	INW_OFF(o) bus_read_2(np->reg_res, o)
+#define	INL_OFF(o) bus_read_4(np->reg_res, o)
 
 #define	READSCRIPT_OFF(base, off)					\
     (base ? *((volatile u_int32_t *)((volatile char *)base + (off))) :	\
-    bus_space_read_4(np->bst2, np->bsh2, off))
+    bus_read_4(np->sram_res, off))
 
 #define	WRITESCRIPT_OFF(base, off, val)					\
     do {								\
@@ -300,7 +292,7 @@ __FBSDID("$FreeBSD$");
     		*((volatile u_int32_t *)				\
 			((volatile char *)base + (off))) = (val);	\
     	else								\
-		bus_space_write_4(np->bst2, np->bsh2, off, val);	\
+		bus_write_4(np->sram_res, off, val);			\
     } while (0)
 
 #define	READSCRIPT(r) \
@@ -974,7 +966,7 @@ struct ncb {
 	*/
 	struct head     header;
 
-	int	unit;
+	device_t dev;
 
 	/*-----------------------------------------------
 	**	Scripts ..
@@ -999,13 +991,9 @@ struct ncb {
 	*/
 	int		reg_rid;
 	struct resource *reg_res;
-	bus_space_tag_t	bst;
-	bus_space_handle_t bsh;
 
 	int		sram_rid;
 	struct resource *sram_res;
-	bus_space_tag_t	bst2;
-	bus_space_handle_t bsh2;
 
 	struct resource *irq_res;
 	void		*irq_handle;
@@ -1086,7 +1074,7 @@ struct ncb {
 	u_short		ticks;
 	u_short		latetime;
 	time_t		lasttime;
-	struct		callout_handle timeout_ch;
+	struct		callout timer;
 
 	/*-----------------------------------------------
 	**	Debug and profiling
@@ -1129,6 +1117,7 @@ struct ncb {
 	*/
 	u_char		maxwide;
 
+	struct mtx	lock;
 #ifdef NCR_IOMAPPED
 	/*
 	**	address of the ncr control registers in io space
@@ -1261,6 +1250,7 @@ static  u_int32_t ncr_info(int unit);
 #endif
 static	void	ncr_init(ncb_p np, char * msg, u_long code);
 static	void	ncr_intr(void *vnp);
+static	void	ncr_intr_locked(ncb_p np);
 static	void	ncr_int_ma(ncb_p np, u_char dstat);
 static	void	ncr_int_sir(ncb_p np);
 static  void    ncr_int_sto(ncb_p np);
@@ -1299,12 +1289,6 @@ static	int	ncr_attach(device_t dev);
 **==========================================================
 */
 
-static const u_long	ncr_version = NCR_VERSION	* 11
-	+ (u_long) sizeof (struct ncb)	*  7
-	+ (u_long) sizeof (struct nccb)	*  5
-	+ (u_long) sizeof (struct lcb)	*  3
-	+ (u_long) sizeof (struct tcb)	*  2;
-
 #ifdef _KERNEL
 
 static int ncr_debug = SCSI_NCR_DEBUG;
@@ -1335,13 +1319,6 @@ static int ncr_cache; /* to be aligned _NOT_ static */
 #define	NCR_1510D_ID	(0x000a1000ul)
 
 
-static char *ncr_name (ncb_p np)
-{
-	static char name[10];
-	snprintf(name, sizeof(name), "ncr%d", np->unit);
-	return (name);
-}
-
 /*==========================================================
 **
 **
@@ -3017,8 +2994,8 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
 		*/
 
 		if (opcode == 0) {
-			printf ("%s: ERROR0 IN SCRIPT at %d.\n",
-				ncr_name(np), (int) (src-start-1));
+			device_printf(np->dev, "ERROR0 IN SCRIPT at %d.\n",
+			    (int)(src - start - 1));
 			DELAY (1000000);
 		};
 
@@ -3043,8 +3020,9 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
 			if ((tmp2 & RELOC_MASK) == RELOC_KVAR)
 				tmp2 = 0;
 			if ((tmp1 ^ tmp2) & 3) {
-				printf ("%s: ERROR1 IN SCRIPT at %d.\n",
-					ncr_name(np), (int) (src-start-1));
+				device_printf(np->dev,
+				    "ERROR1 IN SCRIPT at %d.\n",
+				    (int)(src - start - 1));
 				DELAY (1000000);
 			}
 			/*
@@ -3368,14 +3346,16 @@ ncr_attach (device_t dev)
 	**	allocate and initialize structures.
 	*/
 
-	np->unit = device_get_unit(dev);
+	np->dev = dev;
+	mtx_init(&np->lock, "ncr", NULL, MTX_DEF);
+	callout_init_mtx(&np->timer, &np->lock, 0);
 
 	/*
 	**	Try to map the controller chip to
 	**	virtual and physical memory.
 	*/
 
-	np->reg_rid = 0x14;
+	np->reg_rid = PCIR_BAR(1);
 	np->reg_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
 					     &np->reg_rid, RF_ACTIVE);
 	if (!np->reg_res) {
@@ -3384,15 +3364,10 @@ ncr_attach (device_t dev)
 	}
 
 	/*
-	**	Make the controller's registers available.
 	**	Now the INB INW INL OUTB OUTW OUTL macros
 	**	can be used safely.
 	*/
 
-	np->bst = rman_get_bustag(np->reg_res);
-	np->bsh = rman_get_bushandle(np->reg_res);
-
-
 #ifdef NCR_IOMAPPED
 	/*
 	**	Try to map the controller chip into iospace.
@@ -3463,8 +3438,7 @@ ncr_attach (device_t dev)
 
 #ifdef NCR_TEKRAM_EEPROM
 	if (bootverbose) {
-		printf ("%s: Tekram EEPROM read %s\n",
-			ncr_name(np),
+		device_printf(dev, "Tekram EEPROM read %s\n",
 			read_tekram_eeprom (np, NULL) ?
 			"succeeded" : "failed");
 	}
@@ -3572,7 +3546,7 @@ ncr_attach (device_t dev)
 	**	Get on-chip SRAM address, if supported
 	*/
 	if ((np->features & FE_RAM) && sizeof(struct script) <= 4096) {
-		np->sram_rid = 0x18;
+		np->sram_rid = PCIR_BAR(2);
 		np->sram_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
 						      &np->sram_rid,
 						      RF_ACTIVE);
@@ -3584,8 +3558,6 @@ ncr_attach (device_t dev)
 	if (np->sram_res != NULL) {
 		np->script = NULL;
 		np->p_script = rman_get_start(np->sram_res);
-		np->bst2 = rman_get_bustag(np->sram_res);
-		np->bsh2 = rman_get_bushandle(np->sram_res);
 	} else if (sizeof (struct script) > PAGE_SIZE) {
 		np->script  = (struct script*) contigmalloc 
 			(round_page(sizeof (struct script)), M_DEVBUF, M_WAITOK,
@@ -3617,15 +3589,16 @@ ncr_attach (device_t dev)
 
 		if (!cachelnsz) {
 			cachelnsz = 8;
-			printf("%s: setting PCI cache line size register to %d.\n",
-				ncr_name(np), (int)cachelnsz);
+			device_printf(dev,
+			    "setting PCI cache line size register to %d.\n",
+			    (int)cachelnsz);
 			pci_write_config(dev, PCIR_CACHELNSZ, cachelnsz, 1);
 		}
 
 		if (!(command & PCIM_CMD_MWRICEN)) {
 			command |= PCIM_CMD_MWRICEN;
-			printf("%s: setting PCI command write and invalidate.\n",
-				ncr_name(np));
+			device_printf(dev,
+			    "setting PCI command write and invalidate.\n");
 			pci_write_config(dev, PCIR_COMMAND, command, 2);
 		}
 	}
@@ -3662,8 +3635,9 @@ ncr_attach (device_t dev)
 	**	Bells and whistles   ;-)
 	*/
 	if (bootverbose)
-		printf("%s: minsync=%d, maxsync=%d, maxoffs=%d, %d dwords burst, %s dma fifo\n",
-		ncr_name(np), np->minsync, np->maxsync, np->maxoffs,
+		device_printf(dev,
+	    "minsync=%d, maxsync=%d, maxoffs=%d, %d dwords burst, %s dma fifo\n",
+		np->minsync, np->maxsync, np->maxoffs,
 		burst_length(np->maxburst),
 		(np->rv_ctest5 & DFS) ? "large" : "normal");
 
@@ -3671,8 +3645,7 @@ ncr_attach (device_t dev)
 	**	Print some complementary information that can be helpfull.
 	*/
 	if (bootverbose)
-		printf("%s: %s, %s IRQ driver%s\n",
-			ncr_name(np),
+		device_printf(dev, "%s, %s IRQ driver%s\n",
 			np->rv_stest2 & 0x20 ? "differential" : "single-ended",
 			np->rv_dcntl & IRQM ? "totem pole" : "open drain",
 			np->sram_res ? ", using on-chip SRAM" : "");
@@ -3759,8 +3732,8 @@ ncr_attach (device_t dev)
 		device_printf(dev,
 			      "interruptless mode: reduced performance.\n");
 	} else {
-		bus_setup_intr(dev, np->irq_res, INTR_TYPE_CAM | INTR_ENTROPY,
-			       NULL, ncr_intr, np, &np->irq_handle);
+		bus_setup_intr(dev, np->irq_res, INTR_TYPE_CAM | INTR_ENTROPY |
+		    INTR_MPSAFE, NULL, ncr_intr, np, &np->irq_handle);
 	}
 
 	/*
@@ -3776,16 +3749,17 @@ ncr_attach (device_t dev)
 	**	Now tell the generic SCSI layer
 	**	about our bus.
 	*/
-	np->sim = cam_sim_alloc(ncr_action, ncr_poll, "ncr", np, np->unit,
-				&Giant, 1, MAX_TAGS, devq);
+	np->sim = cam_sim_alloc(ncr_action, ncr_poll, "ncr", np,
+	    device_get_unit(dev), &np->lock, 1, MAX_TAGS, devq);
 	if (np->sim == NULL) {
 		cam_simq_free(devq);
 		return ENOMEM;
 	}
 
-	
+	mtx_lock(&np->lock);
 	if (xpt_bus_register(np->sim, dev, 0) != CAM_SUCCESS) {
 		cam_sim_free(np->sim, /*free_devq*/ TRUE);
+		mtx_unlock(&np->lock);
 		return ENOMEM;
 	}
 	
@@ -3794,6 +3768,7 @@ ncr_attach (device_t dev)
 			    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 		xpt_bus_deregister(cam_sim_path(np->sim));
 		cam_sim_free(np->sim, /*free_devq*/TRUE);
+		mtx_unlock(&np->lock);
 		return ENOMEM;
 	}
 
@@ -3802,6 +3777,7 @@ ncr_attach (device_t dev)
 	*/
 	ncr_timeout (np);
 	np->lasttime=0;
+	mtx_unlock(&np->lock);
 
 	return 0;
 }
@@ -3820,7 +3796,15 @@ ncr_intr(vnp)
 	void *vnp;
 {
 	ncb_p np = vnp;
-	int oldspl = splcam();
+
+	mtx_lock(&np->lock);
+	ncr_intr_locked(np);
+	mtx_unlock(&np->lock);
+}
+
+static void
+ncr_intr_locked(ncb_p np)
+{
 
 	if (DEBUG_FLAGS & DEBUG_TINY) printf ("[");
 
@@ -3836,8 +3820,6 @@ ncr_intr(vnp)
 	};
 
 	if (DEBUG_FLAGS & DEBUG_TINY) printf ("]\n");
-
-	splx (oldspl);
 }
 
 /*==========================================================
@@ -3856,6 +3838,7 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 	ncb_p np;
 
 	np = (ncb_p) cam_sim_softc(sim);
+	mtx_assert(&np->lock, MA_OWNED);
 
 	switch (ccb->ccb_h.func_code) {
 	/* Common cases first */
@@ -3864,7 +3847,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		nccb_p cp;
 		lcb_p lp;
 		tcb_p tp;
-		int oldspl;
 		struct ccb_scsiio *csio;
 		u_int8_t *msgptr;
 		u_int msglen;
@@ -3877,15 +3859,12 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		tp = &np->target[ccb->ccb_h.target_id];
 		csio = &ccb->csio;
 
-		oldspl = splcam();
-
 		/*
 		 * Last time we need to check if this CCB needs to
 		 * be aborted.
 		 */
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) {
 			xpt_done(ccb);
-			splx(oldspl);
 			return;
 		}
 		ccb->ccb_h.status |= CAM_SIM_QUEUED;
@@ -4040,7 +4019,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 			if (segments < 0) {
 				ccb->ccb_h.status = CAM_REQ_TOO_BIG;
 				ncr_free_nccb(np, cp);
-				splx(oldspl);
 				xpt_done(ccb);
 				return;
 			}
@@ -4153,8 +4131,8 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		np->squeueput = qidx;
 
 		if(DEBUG_FLAGS & DEBUG_QUEUE)
-			printf("%s: queuepos=%d tryoffset=%d.\n",
-			       ncr_name (np), np->squeueput,
+			device_printf(np->dev, "queuepos=%d tryoffset=%d.\n",
+			       np->squeueput,
 			       (unsigned)(READSCRIPT(startpos[0]) - 
 			       (NCB_SCRIPTH_PHYS (np, tryloop))));
 
@@ -4163,11 +4141,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		**	Wake it up.
 		*/
 		OUTB (nc_istat, SIGP);
-
-		/*
-		**	and reenable interrupts
-		*/
-		splx (oldspl);
 		break;
 	}
 	case XPT_RESET_DEV:	/* Bus Device Reset the specified SCSI device */
@@ -4185,7 +4158,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		struct	ccb_trans_settings *cts = &ccb->cts;
 		tcb_p	tp;
 		u_int	update_type;
-		int	s;
 		struct ccb_trans_settings_scsi *scsi =
 		    &cts->proto_specific.scsi;
 		struct ccb_trans_settings_spi *spi =
@@ -4197,7 +4169,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		if (cts->type == CTS_TYPE_USER_SETTINGS)
 			update_type |= NCR_TRANS_USER;
 
-		s = splcam();
 		tp = &np->target[ccb->ccb_h.target_id];
 		/* Tag and disc enables */
 		if ((spi->valid & CTS_SPI_VALID_DISC) != 0) {
@@ -4271,7 +4242,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 			if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0)
 				tp->tinfo.goal.width = spi->bus_width;
 		}
-		splx(s);
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
@@ -4282,7 +4252,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		struct	ccb_trans_settings *cts = &ccb->cts;
 		struct	ncr_transinfo *tinfo;
 		tcb_p	tp = &np->target[ccb->ccb_h.target_id];
-		int	s;
 		struct ccb_trans_settings_scsi *scsi =
 		    &cts->proto_specific.scsi;
 		struct ccb_trans_settings_spi *spi =
@@ -4293,7 +4262,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		cts->transport = XPORT_SPI;
 		cts->transport_version = 2;
 
-		s = splcam();
 		if (cts->type == CTS_TYPE_CURRENT_SETTINGS) {
 			tinfo = &tp->tinfo.current;
 			if (tp->tinfo.disc_tag & NCR_CUR_DISCENB)
@@ -4322,7 +4290,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
 		spi->sync_offset = tinfo->offset;
 		spi->bus_width = tinfo->width;
 
-		splx(s);
 		spi->valid = CTS_SPI_VALID_SYNC_RATE
 			   | CTS_SPI_VALID_SYNC_OFFSET
 			   | CTS_SPI_VALID_BUS_WIDTH
@@ -4718,7 +4685,8 @@ ncr_init(ncb_p np, char * msg, u_long code)
 	**	Message.
 	*/
 
-	if (msg) printf ("%s: restart (%s).\n", ncr_name (np), msg);
+	if (msg)
+		device_printf(np->dev, "restart (%s).\n", msg);
 
 	/*
 	**	Clear Start Queue
@@ -4813,7 +4781,7 @@ ncr_init(ncb_p np, char * msg, u_long code)
 static void
 ncr_poll(struct cam_sim *sim)
 {       
-	ncr_intr(cam_sim_softc(sim));  
+	ncr_intr_locked(cam_sim_softc(sim));  
 }
 
 
@@ -5089,11 +5057,8 @@ ncr_timeout (void *arg)
 	long signed   t;
 	nccb_p cp;
 
+	mtx_assert(&np->lock, MA_OWNED);
 	if (np->lasttime != thistime) {
-		/*
-		**	block ncr interrupts
-		*/
-		int oldspl = splcam();
 		np->lasttime = thistime;
 
 		/*----------------------------------------------------
@@ -5143,8 +5108,8 @@ ncr_timeout (void *arg)
 			cp->jump_nccb.l_cmd = (SCR_JUMP);
 			if (cp->phys.header.launch.l_paddr ==
 				NCB_SCRIPT_PHYS (np, select)) {
-				printf ("%s: timeout nccb=%p (skip)\n",
-					ncr_name (np), cp);
+				device_printf(np->dev,
+				    "timeout nccb=%p (skip)\n", cp);
 				cp->phys.header.launch.l_paddr
 				= NCB_SCRIPT_PHYS (np, skip);
 			};
@@ -5164,11 +5129,9 @@ ncr_timeout (void *arg)
 			*/
 			ncr_complete (np, cp);
 		};
-		splx (oldspl);
 	}
 
-	np->timeout_ch =
-		timeout (ncr_timeout, (caddr_t) np, step ? step : 1);
+	callout_reset(&np->timer, step ? step : 1, ncr_timeout, np);
 
 	if (INB(nc_istat) & (INTF|SIP|DIP)) {
 
@@ -5176,11 +5139,9 @@ ncr_timeout (void *arg)
 		**	Process pending interrupts.
 		*/
 
-		int	oldspl	= splcam();
 		if (DEBUG_FLAGS & DEBUG_TINY) printf ("{");
 		ncr_exception (np);
 		if (DEBUG_FLAGS & DEBUG_TINY) printf ("}");
-		splx (oldspl);
 	};
 }
 
@@ -5245,19 +5206,20 @@ static void ncr_log_hard_error(ncb_p np, u_short sist, u_char dstat)
 		script_name	= "mem";
 	}
 
-	printf ("%s:%d: ERROR (%x:%x) (%x-%x-%x) (%x/%x) @ (%s %x:%08x).\n",
-		ncr_name (np), (unsigned)INB (nc_sdid)&0x0f, dstat, sist,
+	device_printf(np->dev,
+		"%d: ERROR (%x:%x) (%x-%x-%x) (%x/%x) @ (%s %x:%08x).\n",
+		(unsigned)INB (nc_sdid)&0x0f, dstat, sist,
 		(unsigned)INB (nc_socl), (unsigned)INB (nc_sbcl), (unsigned)INB (nc_sbdl),
 		(unsigned)INB (nc_sxfer),(unsigned)INB (nc_scntl3), script_name, script_ofs,
 		(unsigned)INL (nc_dbc));
 
 	if (((script_ofs & 3) == 0) &&
 	    (unsigned)script_ofs < script_size) {
-		printf ("%s: script cmd = %08x\n", ncr_name(np),
+		device_printf(np->dev, "script cmd = %08x\n",
 			(int)READSCRIPT_OFF(script_base, script_ofs));
 	}
 
-        printf ("%s: regdump:", ncr_name(np));
+        device_printf(np->dev, "regdump:");
         for (i=0; i<16;i++)
             printf (" %02x", (unsigned)INB_OFF(i));
         printf (".\n");
@@ -5411,7 +5373,7 @@ static void ncr_exception (ncb_p np)
 	     (INB(nc_sstat1) & (FF3210)	) ||
 	     (INB(nc_sstat2) & (ILF1|ORF1|OLF1)) ||	/* wide .. */
 	     !(dstat & DFE)) {
-		printf ("%s: have to clear fifos.\n", ncr_name (np));
+		device_printf(np->dev, "have to clear fifos.\n");
 		OUTB (nc_stest3, TE|CSF);	/* clear scsi fifo */
 		OUTB (nc_ctest3, np->rv_ctest3 | CLF);
 						/* clear dma fifo  */
@@ -5423,7 +5385,7 @@ static void ncr_exception (ncb_p np)
 	*/
 
 	if (sist & HTH) {
-		printf ("%s: handshake timeout\n", ncr_name(np));
+		device_printf(np->dev, "handshake timeout\n");
 		OUTB (nc_scntl1, CRST);
 		DELAY (1000);
 		OUTB (nc_scntl1, 0x00);
@@ -5466,12 +5428,11 @@ static void ncr_exception (ncb_p np)
 			/*
 			**	info message
 			*/
-			printf ("%s: INFO: LDSC while IID.\n",
-				ncr_name (np));
+			device_printf(np->dev, "INFO: LDSC while IID.\n");
 			return;
 		};
-		printf ("%s: target %d doesn't release the bus.\n",
-			ncr_name (np), INB (nc_sdid)&0x0f);
+		device_printf(np->dev, "target %d doesn't release the bus.\n",
+			INB (nc_sdid)&0x0f);
 		/*
 		**	return without restarting the NCR.
 		**	timeout will do the real work.
@@ -5515,8 +5476,7 @@ static void ncr_exception (ncb_p np)
 			switch (i%16) {
 
 			case 0:
-				printf ("%s: reg[%d0]: ",
-					ncr_name(np),i/16);
+				device_printf(np->dev, "reg[%d0]: ", i / 16);
 				break;
 			case 4:
 			case 8:
@@ -5524,14 +5484,14 @@ static void ncr_exception (ncb_p np)
 				printf (" ");
 				break;
 			};
-			val = bus_space_read_1(np->bst, np->bsh, i);
+			val = bus_read_1(np->reg_res, i);
 			printf (" %x%x", val/16, val%16);
 			if (i%16==15) printf (".\n");
 		};
 
-		untimeout (ncr_timeout, (caddr_t) np, np->timeout_ch);
+		callout_stop(&np->timer);
 
-		printf ("%s: halted!\n", ncr_name(np));
+		device_printf(np->dev, "halted!\n");
 		/*
 		**	don't restart controller ...
 		*/
@@ -5678,14 +5638,16 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 		cp = cp->link_nccb;
 
 	if (!cp) {
-	    printf ("%s: SCSI phase error fixup: CCB already dequeued (%p)\n", 
-		    ncr_name (np), (void *) np->header.cp);
-	    return;
+		device_printf(np->dev,
+		    "SCSI phase error fixup: CCB already dequeued (%p)\n", 
+		    (void *)np->header.cp);
+		return;
 	}
 	if (cp != np->header.cp) {
-	    printf ("%s: SCSI phase error fixup: CCB address mismatch "
+		device_printf(np->dev,
+		    "SCSI phase error fixup: CCB address mismatch "
 		    "(%p != %p) np->nccb = %p\n", 
-		    ncr_name (np), (void *)cp, (void *)np->header.cp,
+		    (void *)cp, (void *)np->header.cp,
 		    (void *)np->link_nccb);
 /*	    return;*/
 	}
@@ -5889,7 +5851,7 @@ static void ncr_int_sir (ncb_p np)
 		*/
 
 		if (DEBUG_FLAGS & DEBUG_RESTART)
-			printf ("%s: int#%d",ncr_name (np),num);
+			device_printf(np->dev, "int#%d", num);
 		cp = (nccb_p) 0;
 		for (i=0; i<MAX_TARGET; i++) {
 			if (DEBUG_FLAGS & DEBUG_RESTART) printf (" t%d", i);
@@ -6374,7 +6336,7 @@ static void ncr_int_sir (ncb_p np)
 		**	else remove the interrupt.
 		*/
 
-		printf ("%s: queue empty.\n", ncr_name (np));
+		device_printf(np->dev, "queue empty.\n");
 		WRITESCRIPT(start1[0], SCR_INT ^ IFFALSE (0));
 		break;
 	};
@@ -6424,7 +6386,7 @@ static	nccb_p ncr_get_nccb
 
 	if (cp != NULL) {
 		if (cp->magic) {
-			printf("%s: Bogus free cp found\n", ncr_name(np));
+			device_printf(np->dev, "Bogus free cp found\n");
 			return (NULL);
 		}
 		cp->magic = 1;
@@ -6913,7 +6875,7 @@ static void ncr_selectclock(ncb_p np, u_char scntl3)
 	}
 
 	if (bootverbose >= 2)
-		printf ("%s: enabling clock multiplier\n", ncr_name(np));
+		device_printf(np->dev, "enabling clock multiplier\n");
 
 	OUTB(nc_stest1, DBLEN);	   /* Enable clock multiplier		  */
 	if (np->multiplier > 2) {  /* Poll bit 5 of stest4 for quadrupler */
@@ -6921,7 +6883,8 @@ static void ncr_selectclock(ncb_p np, u_char scntl3)
 		while (!(INB(nc_stest4) & LCKFRQ) && --i > 0)
 			DELAY(20);
 		if (!i)
-			printf("%s: the chip cannot lock the frequency\n", ncr_name(np));
+			device_printf(np->dev,
+			    "the chip cannot lock the frequency\n");
 	} else			/* Wait 20 micro-seconds for doubler	*/
 		DELAY(20);
 	OUTB(nc_stest3, HSC);		/* Halt the scsi clock		*/
diff --git a/sys/pci/ncrreg.h b/sys/dev/ncr/ncrreg.h
similarity index 100%
rename from sys/pci/ncrreg.h
rename to sys/dev/ncr/ncrreg.h
diff --git a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
index e8e877788687..2f864ab2e2c8 100644
--- a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
+++ b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
@@ -414,7 +414,7 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 			 * packet on the floor and count the error.
 			 */
 			nf10bmac_eat_packet_munch_munch(sc);		
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m_freem(m);
 			return (0);
 		} else if ((len - l) <= sizeof(val)) {
@@ -445,14 +445,14 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 	if ((md & NF10BMAC_DATA_LAST) == 0 || (md & NF10BMAC_DATA_STRB) == 0) {
 		device_printf(sc->nf10bmac_dev, "Unexpected rx loop end state: "
 		    "md=0x%08jx len=%d l=%d\n", (uintmax_t)md, len, l);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return (0);
 	}
 
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.rcvif = ifp;
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	NF10BMAC_UNLOCK(sc);
 	(*ifp->if_input)(ifp, m);
@@ -584,7 +584,7 @@ nf10bmac_watchdog(struct nf10bmac_softc *sc)
 		return;
 
 	device_printf(sc->nf10bmac_dev, "watchdog timeout\n");
-	sc->nf10bmac_ifp->if_oerrors++;
+	sc->nf10if_inc_counter(bmac_ifp, IFCOUNTER_OERRORS, 1);
 
 	sc->nf10bmac_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	nf10bmac_init_locked(sc);
diff --git a/sys/dev/netmap/if_lem_netmap.h b/sys/dev/netmap/if_lem_netmap.h
index 272f02c7b9d0..50eb1f719929 100644
--- a/sys/dev/netmap/if_lem_netmap.h
+++ b/sys/dev/netmap/if_lem_netmap.h
@@ -410,7 +410,7 @@ lem_netmap_rxsync(struct netmap_kring *kring, int flags)
 				netmap_idx_n2k(kring, adapter->next_rx_desc_to_check),
 				kring->nr_hwtail);
 			adapter->next_rx_desc_to_check = nic_i;
-			// ifp->if_ipackets += n;
+			// if_inc_counter(ifp, IFCOUNTER_IPACKETS, n);
 			kring->nr_hwtail = nm_i;
 		}
 		kring->nr_kflags &= ~NKR_PENDINTR;
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index 98f61432ad7c..354f14df1c58 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -222,7 +222,7 @@ re_netmap_rxsync(struct netmap_kring *kring, int flags)
 			/*  sync was in re_newbuf() */
 			bus_dmamap_sync(sc->rl_ldata.rl_rx_mtag,
 			    rxd[nic_i].rx_dmamap, BUS_DMASYNC_POSTREAD);
-			// sc->rl_ifp->if_ipackets++;
+			// if_inc_counter(sc->rl_ifp, IFCOUNTER_IPACKETS, 1);
 			nm_i = nm_next(nm_i, lim);
 			nic_i = nm_next(nic_i, lim);
 		}
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 0fd362fe086f..f37bf9e81c45 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -2222,23 +2222,18 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 
 	default:	/* allow device-specific ioctls */
 	    {
-		struct socket so;
-		struct ifnet *ifp;
+		struct ifnet *ifp = ifunit_ref(nmr->nr_name);
+		if (ifp == NULL) {
+			error = ENXIO;
+		} else {
+			struct socket so;
 
-		bzero(&so, sizeof(so));
-		NMG_LOCK();
-		error = netmap_get_na(nmr, &na, 0 /* don't create */); /* keep reference */
-		if (error) {
-			netmap_adapter_put(na);
-			NMG_UNLOCK();
-			break;
+			bzero(&so, sizeof(so));
+			so.so_vnet = ifp->if_vnet;
+			// so->so_proto not null.
+			error = ifioctl(&so, cmd, data, td);
+			if_rele(ifp);
 		}
-		ifp = na->ifp;
-		so.so_vnet = ifp->if_vnet;
-		// so->so_proto not null.
-		error = ifioctl(&so, cmd, data, td);
-		netmap_adapter_put(na);
-		NMG_UNLOCK();
 		break;
 	    }
 
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index e97d5b570db6..76d893588e34 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -63,6 +63,12 @@
 #define NM_ATOMIC_TEST_AND_SET(p)       (!atomic_cmpset_acq_int((p), 0, 1))
 #define NM_ATOMIC_CLEAR(p)              atomic_store_rel_int((p), 0)
 
+#if __FreeBSD_version >= 1100030
+#define	WNA(_ifp)	(_ifp)->if_netmap
+#else /* older FreeBSD */
+#define	WNA(_ifp)	(_ifp)->if_pspare[0]
+#endif /* older FreeBSD */
+
 #if __FreeBSD_version >= 1100005
 struct netmap_adapter *netmap_getna(if_t ifp);
 #endif
@@ -1186,9 +1192,6 @@ extern int netmap_generic_rings;
  * NA returns a pointer to the struct netmap adapter from the ifp,
  * WNA is used to write it.
  */
-#ifndef WNA
-#define	WNA(_ifp)	(_ifp)->if_netmap
-#endif
 #define	NA(_ifp)	((struct netmap_adapter *)WNA(_ifp))
 
 /*
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index 0c0ae5cf60f4..1675f032bddc 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -1630,7 +1630,7 @@ nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
 }
 
 #ifdef DEVICE_POLLING
-static poll_handler_drv_t nfe_poll;
+static poll_handler_t nfe_poll;
 
 
 static int
@@ -1782,7 +1782,7 @@ nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
 #ifdef DEVICE_POLLING
 		if ((mask & IFCAP_POLLING) != 0) {
 			if ((ifr->ifr_reqcap & IFCAP_POLLING) != 0) {
-				error = ether_poll_register_drv(nfe_poll, ifp);
+				error = ether_poll_register(nfe_poll, ifp);
 				if (error)
 					break;
 				NFE_LOCK(sc);
@@ -2149,7 +2149,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		prog++;
 		if ((sc->nfe_flags & (NFE_JUMBO_SUP | NFE_40BIT_ADDR)) == 0) {
 			if (!(flags & NFE_RX_VALID_V1)) {
-				if_incierrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				nfe_discard_rxbuf(sc, sc->rxq.cur);
 				continue;
 			}
@@ -2159,7 +2159,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		} else {
 			if (!(flags & NFE_RX_VALID_V2)) {
-				if_incierrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				nfe_discard_rxbuf(sc, sc->rxq.cur);
 				continue;
 			}
@@ -2171,14 +2171,14 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		}
 
 		if (flags & NFE_RX_ERROR) {
-			if_incierrors(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			nfe_discard_rxbuf(sc, sc->rxq.cur);
 			continue;
 		}
 
 		m = data->m;
 		if (nfe_newbuf(sc, sc->rxq.cur) != 0) {
-			if_inciqdrops(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			nfe_discard_rxbuf(sc, sc->rxq.cur);
 			continue;
 		}
@@ -2205,7 +2205,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		}
 
-		if_incipackets(ifp, 1);
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		NFE_UNLOCK(sc);
 		if_input(ifp, m);
@@ -2265,7 +2265,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		prog++;
 		if ((sc->nfe_flags & (NFE_JUMBO_SUP | NFE_40BIT_ADDR)) == 0) {
 			if (!(flags & NFE_RX_VALID_V1)) {
-				if_incierrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 				continue;
 			}
@@ -2275,7 +2275,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		} else {
 			if (!(flags & NFE_RX_VALID_V2)) {
-				if_incierrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 				continue;
 			}
@@ -2287,14 +2287,14 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		}
 
 		if (flags & NFE_RX_ERROR) {
-			if_incierrors(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 			continue;
 		}
 
 		m = data->m;
 		if (nfe_jnewbuf(sc, sc->jrxq.jcur) != 0) {
-			if_inciqdrops(ifp, 1);
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 			continue;
 		}
@@ -2321,7 +2321,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		}
 
-		if_incipackets(ifp, 1);
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		NFE_UNLOCK(sc);
 		if_input(ifp, m);
@@ -2379,18 +2379,18 @@ nfe_txeof(struct nfe_softc *sc)
 				device_printf(sc->nfe_dev,
 				    "tx v1 error 0x%4b\n", flags, NFE_V1_TXERR);
 
-				if_incoerrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else
-				if_incopackets(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		} else {
 			if ((flags & NFE_TX_LASTFRAG_V2) == 0)
 				continue;
 			if ((flags & NFE_TX_ERROR_V2) != 0) {
 				device_printf(sc->nfe_dev,
 				    "tx v2 error 0x%4b\n", flags, NFE_V2_TXERR);
-				if_incoerrors(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else
-				if_incopackets(ifp, 1);
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		/* last fragment of the mbuf chain transmitted */
@@ -2723,7 +2723,7 @@ nfe_watchdog(if_t ifp)
 	if_printf(ifp, "watchdog timeout\n");
 
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
-	if_incoerrors(ifp, 1);
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	nfe_init_locked(sc);
 }
 
diff --git a/sys/pci/nfsmb.c b/sys/dev/nfsmb/nfsmb.c
similarity index 100%
rename from sys/pci/nfsmb.c
rename to sys/dev/nfsmb/nfsmb.c
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 2d28883cba73..007a1139ec89 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1476,7 +1476,7 @@ nge_rxeof(struct nge_softc *sc)
 
 		if ((cmdsts & NGE_CMDSTS_MORE) != 0) {
 			if (nge_newbuf(sc, cons) != 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				if (sc->nge_head != NULL) {
 					m_freem(sc->nge_head);
 					sc->nge_head = sc->nge_tail = NULL;
@@ -1526,7 +1526,7 @@ nge_rxeof(struct nge_softc *sc)
 		/* Try conjure up a replacement mbuf. */
 
 		if (nge_newbuf(sc, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			if (sc->nge_head != NULL) {
 				m_freem(sc->nge_head);
 				sc->nge_head = sc->nge_tail = NULL;
@@ -1563,7 +1563,7 @@ nge_rxeof(struct nge_softc *sc)
 		nge_fixup_rx(m);
 #endif
 		m->m_pkthdr.rcvif = ifp;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) {
 			/* Do IP checksum checking. */
@@ -1650,15 +1650,15 @@ nge_txeof(struct nge_softc *sc)
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->nge_cdata.nge_tx_tag, txd->tx_dmamap);
 		if ((cmdsts & NGE_CMDSTS_PKT_OK) == 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if ((cmdsts & NGE_TXSTAT_EXCESSCOLLS) != 0)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if ((cmdsts & NGE_TXSTAT_OUTOFWINCOLL) != 0)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		} else
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
-		ifp->if_collisions += (cmdsts & NGE_TXSTAT_COLLCNT) >> 16;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (cmdsts & NGE_TXSTAT_COLLCNT) >> 16);
 		KASSERT(txd->tx_m != NULL, ("%s: freeing NULL mbuf!\n",
 		    __func__));
 		m_freem(txd->tx_m);
@@ -1730,8 +1730,9 @@ nge_stats_update(struct nge_softc *sc)
 	/*
 	 * Since we've accept errored frames exclude Rx length errors.
 	 */
-	ifp->if_ierrors += stats->rx_pkts_errs + stats->rx_crc_errs +
-	    stats->rx_fifo_oflows + stats->rx_sym_errs;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    stats->rx_pkts_errs + stats->rx_crc_errs +
+	    stats->rx_fifo_oflows + stats->rx_sym_errs);
 
 	nstats = &sc->nge_stats;
 	nstats->rx_pkts_errs += stats->rx_pkts_errs;
@@ -2435,7 +2436,7 @@ nge_watchdog(struct nge_softc *sc)
 		return;
 
 	ifp = sc->nge_ifp;
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 04a0b160c127..dbe24cb5191b 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -157,21 +157,21 @@ nmdm_clone(void *arg, struct ucred *cred, char *name, int nameen,
 {
 	struct nmdmsoftc *ns;
 	struct tty *tp;
-	unsigned long unit;
 	char *end;
 	int error;
+	char endc;
 
 	if (*dev != NULL)
 		return;
 	if (strncmp(name, "nmdm", 4) != 0)
 		return;
-
-	/* Device name must be "nmdm%lu%c", where %c is 'A' or 'B'. */
-	name += 4;
-	unit = strtoul(name, &end, 10);
-	if (unit == ULONG_MAX || name == end)
+	if (strlen(name) <= strlen("nmdmX"))
 		return;
-	if ((end[0] != 'A' && end[0] != 'B') || end[1] != '\0')
+
+	/* Device name must be "nmdm%s%c", where %c is 'A' or 'B'. */
+	end = name + strlen(name) - 1;
+	endc = *end;
+	if (endc != 'A' && endc != 'B')
 		return;
 
 	ns = malloc(sizeof(*ns), M_NMDM, M_WAITOK | M_ZERO);
@@ -191,9 +191,11 @@ nmdm_clone(void *arg, struct ucred *cred, char *name, int nameen,
 	/* Create device nodes. */
 	tp = ns->ns_part1.np_tty = tty_alloc_mutex(&nmdm_class, &ns->ns_part1,
 	    &ns->ns_mtx);
-	error = tty_makedevf(tp, NULL, end[0] == 'A' ? TTYMK_CLONING : 0,
-	    "nmdm%luA", unit);
+	*end = 'A';
+	error = tty_makedevf(tp, NULL, endc == 'A' ? TTYMK_CLONING : 0,
+	    "%s", name);
 	if (error) {
+		*end = endc;
 		mtx_destroy(&ns->ns_mtx);
 		free(ns, M_NMDM);
 		return;
@@ -201,9 +203,11 @@ nmdm_clone(void *arg, struct ucred *cred, char *name, int nameen,
 
 	tp = ns->ns_part2.np_tty = tty_alloc_mutex(&nmdm_class, &ns->ns_part2,
 	    &ns->ns_mtx);
-	error = tty_makedevf(tp, NULL, end[0] == 'B' ? TTYMK_CLONING : 0,
-	    "nmdm%luB", unit);
+	*end = 'B';
+	error = tty_makedevf(tp, NULL, endc == 'B' ? TTYMK_CLONING : 0,
+	    "%s", name);
 	if (error) {
+		*end = endc;
 		mtx_lock(&ns->ns_mtx);
 		/* see nmdm_free() */
 		ns->ns_part1.np_other = NULL;
@@ -212,11 +216,12 @@ nmdm_clone(void *arg, struct ucred *cred, char *name, int nameen,
 		return;
 	}
 
-	if (end[0] == 'A')
+	if (endc == 'A')
 		*dev = ns->ns_part1.np_tty->t_dev;
 	else
 		*dev = ns->ns_part2.np_tty->t_dev;
 
+	*end = endc;
 	atomic_add_int(&nmdm_count, 1);
 }
 
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index af57491e1fa2..fe48007e8973 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -989,7 +989,7 @@ oce_tx(POCE_SOFTC sc, struct mbuf **mpp, int wq_index)
 			pd->nsegs++;
 		}
 
-		sc->ifp->if_opackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 		wq->tx_stats.tx_reqs++;
 		wq->tx_stats.tx_wrbs += num_wqes;
 		wq->tx_stats.tx_bytes += m->m_pkthdr.len;
@@ -1275,9 +1275,9 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
 			break;
 		}
 		drbr_advance(ifp, br);
-		ifp->if_obytes += next->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, next->m_pkthdr.len);
 		if (next->m_flags & M_MCAST)
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		ETHER_BPF_MTAP(ifp, next);
 	}
 
@@ -1394,7 +1394,7 @@ oce_rx(struct oce_rq *rq, uint32_t rqe_idx, struct oce_nic_rx_cqe *cqe)
 			}
 		}
 
-		sc->ifp->if_ipackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 #if defined(INET6) || defined(INET)
 		/* Try to queue to LRO */
 		if (IF_LRO_ENABLED(sc) &&
@@ -1637,7 +1637,7 @@ oce_rq_handler(void *arg)
 			oce_rx(rq, cqe->u0.s.frag_index, cqe);
 		} else {
 			rq->rx_stats.rxcp_err++;
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			/* Post L3/L4 errors to stack.*/
 			oce_rx(rq, cqe->u0.s.frag_index, cqe);
 		}
@@ -1731,7 +1731,9 @@ oce_attach_ifp(POCE_SOFTC sc)
 	sc->ifp->if_baudrate = IF_Gbps(10);
 
 #if __FreeBSD_version >= 1000000
-	sc->ifp->if_hw_tsomax = OCE_MAX_TSO_SIZE;
+	sc->ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
+	sc->ifp->if_hw_tsomaxsegcount = OCE_MAX_TX_ELEMENTS;
+	sc->ifp->if_hw_tsomaxsegsize = 4096;
 #endif
 
 	ether_ifattach(sc->ifp, sc->macaddr.mac_addr);
diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h
index b6db402e7766..bb788413faa0 100644
--- a/sys/dev/oce/oce_if.h
+++ b/sys/dev/oce/oce_if.h
@@ -152,7 +152,6 @@ extern int mp_ncpus;			/* system's total active cpu cores */
 #define OCE_MAX_TX_ELEMENTS		29
 #define OCE_MAX_TX_DESC			1024
 #define OCE_MAX_TX_SIZE			65535
-#define OCE_MAX_TSO_SIZE		(65535 - ETHER_HDR_LEN)
 #define OCE_MAX_RX_SIZE			4096
 #define OCE_MAX_RQ_POSTS		255
 #define OCE_DEFAULT_PROMISCUOUS		0
diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c
index 7ddb5e6ab9d1..cd1169365d68 100644
--- a/sys/dev/ofw/ofw_bus_subr.c
+++ b/sys/dev/ofw/ofw_bus_subr.c
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <sys/libkern.h>
 
+#include <machine/resource.h>
+
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
@@ -367,3 +369,64 @@ ofw_bus_search_intrmap(void *intr, int intrsz, void *regs, int physsz,
 	return (0);
 }
 
+int
+ofw_bus_intr_to_rl(device_t dev, phandle_t node, struct resource_list *rl)
+{
+	phandle_t iparent;
+	uint32_t icells, *intr;
+	int err, i, irqnum, nintr, rid;
+	boolean_t extended;
+
+	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
+	    (void **)&intr);
+	if (nintr > 0) {
+		if (OF_searchencprop(node, "interrupt-parent", &iparent,
+		    sizeof(iparent)) == -1) {
+			device_printf(dev, "No interrupt-parent found, "
+			    "assuming direct parent\n");
+			iparent = OF_parent(node);
+		}
+		if (OF_searchencprop(OF_node_from_xref(iparent), 
+		    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
+			device_printf(dev, "Missing #interrupt-cells "
+			    "property, assuming <1>\n");
+			icells = 1;
+		}
+		if (icells < 1 || icells > nintr) {
+			device_printf(dev, "Invalid #interrupt-cells property "
+			    "value <%d>, assuming <1>\n", icells);
+			icells = 1;
+		}
+		extended = false;
+	} else {
+		nintr = OF_getencprop_alloc(node, "interrupts-extended",
+		    sizeof(*intr), (void **)&intr);
+		if (nintr <= 0)
+			return (0);
+		extended = true;
+	}
+	err = 0;
+	rid = 0;
+	for (i = 0; i < nintr; i += icells) {
+		if (extended) {
+			iparent = intr[i++];
+			if (OF_searchencprop(OF_node_from_xref(iparent), 
+			    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
+				device_printf(dev, "Missing #interrupt-cells "
+				    "property\n");
+				err = ENOENT;
+				break;
+			}
+			if (icells < 1 || (i + icells) > nintr) {
+				device_printf(dev, "Invalid #interrupt-cells "
+				    "property value <%d>\n", icells);
+				err = ERANGE;
+				break;
+			}
+		}
+		irqnum = ofw_bus_map_intr(dev, iparent, icells, &intr[i]);
+		resource_list_add(rl, SYS_RES_IRQ, rid++, irqnum, irqnum, 1);
+	}
+	free(intr, M_OFWPROP);
+	return (err);
+}
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index a4d8b920291f..59f83fca3c3c 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -72,6 +72,9 @@ int	ofw_bus_lookup_imap(phandle_t, struct ofw_bus_iinfo *, void *, int,
 int	ofw_bus_search_intrmap(void *, int, void *, int, void *, int, void *,
 	    void *, void *, int, phandle_t *);
 
+/* Routines for parsing device-tree data into resource lists. */
+int ofw_bus_intr_to_rl(device_t, phandle_t, struct resource_list *);
+
 /* Helper to get device status property */
 const char *ofw_bus_get_status(device_t dev);
 int ofw_bus_status_okay(device_t dev);
diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c
index 11a6a645ab48..2b975ac1aa11 100644
--- a/sys/dev/ofw/ofwbus.c
+++ b/sys/dev/ofw/ofwbus.c
@@ -436,11 +436,9 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 	struct ofwbus_softc *sc;
 	struct ofwbus_devinfo *ndi;
 	const char *nodename;
-	uint32_t *reg, *intr, icells;
+	uint32_t *reg;
 	uint64_t phys, size;
-	phandle_t iparent;
 	int i, j, rid;
-	int nintr;
 	int nreg;
 
 	sc = device_get_softc(dev);
@@ -485,35 +483,7 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 	}
 	free(reg, M_OFWPROP);
 
-	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
-	    (void **)&intr);
-	if (nintr > 0) {
-		if (OF_searchencprop(node, "interrupt-parent", &iparent,
-		    sizeof(iparent)) == -1) {
-			device_printf(dev, "No interrupt-parent found, "
-			    "assuming nexus on <%s>\n", nodename);
-			iparent = 0xffffffff;
-		}
-		if (OF_searchencprop(OF_node_from_xref(iparent), 
-		    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
-			device_printf(dev, "Missing #interrupt-cells property, "
-			    "assuming <1> on <%s>\n", nodename);
-			icells = 1;
-		}
-		if (icells < 1 || icells > nintr) {
-			device_printf(dev, "Invalid #interrupt-cells property "
-			    "value <%d>, assuming <1> on <%s>\n", icells, 
-			    nodename);
-			icells = 1;
-		}
-		for (i = 0, rid = 0; i < nintr; i += icells, rid++) {
-			intr[i] = ofw_bus_map_intr(dev, iparent, icells,
-			    &intr[i]);
-			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, rid, intr[i],
-			    intr[i], 1);
-		}
-		free(intr, M_OFWPROP);
-	}
+	ofw_bus_intr_to_rl(dev, node, &ndi->ndi_rl);
 
 	return (ndi);
 }
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index cc997d90f210..5bcf3d1a69d2 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -62,7 +62,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
 
@@ -92,6 +95,7 @@ struct xrefinfo {
 };
 
 static SLIST_HEAD(, xrefinfo) xreflist = SLIST_HEAD_INITIALIZER(xreflist);
+static struct mtx xreflist_lock;
 static boolean_t xref_init_done;
 
 #define	FIND_BY_XREF	0
@@ -138,6 +142,12 @@ static void
 xrefinfo_init(void *unsed)
 {
 
+	/*
+	 * There is no locking during this init because it runs much earlier
+	 * than any of the clients/consumers of the xref list data, but we do
+	 * initialize the mutex that will be used for access later.
+	 */
+	mtx_init(&xreflist_lock, "OF xreflist lock", NULL, MTX_DEF);
 	xrefinfo_create(OF_peer(0));
 	xref_init_done = true;
 }
@@ -146,17 +156,35 @@ SYSINIT(xrefinfo, SI_SUB_KMEM, SI_ORDER_ANY, xrefinfo_init, NULL);
 static struct xrefinfo *
 xrefinfo_find(phandle_t phandle, int find_by)
 {
-	struct xrefinfo * xi;
+	struct xrefinfo *rv, *xi;
 
+	rv = NULL;
+	mtx_lock(&xreflist_lock);
 	SLIST_FOREACH(xi, &xreflist, next_entry) {
-		if (find_by == FIND_BY_XREF && phandle == xi->xref)
-			return (xi);
-		else if (find_by == FIND_BY_NODE && phandle == xi->node)
-			return (xi);
-		else if (find_by == FIND_BY_DEV && phandle == (uintptr_t)xi->dev)
-			return (xi);
+		if ((find_by == FIND_BY_XREF && phandle == xi->xref) ||
+		    (find_by == FIND_BY_NODE && phandle == xi->node) ||
+		    (find_by == FIND_BY_DEV && phandle == (uintptr_t)xi->dev)) {
+			rv = xi;
+			break;
+		}
 	}
-	return (NULL);
+	mtx_unlock(&xreflist_lock);
+	return (rv);
+}
+
+static struct xrefinfo *
+xrefinfo_add(phandle_t node, phandle_t xref, device_t dev)
+{
+	struct xrefinfo *xi;
+
+	xi = malloc(sizeof(*xi), M_OFWPROP, M_WAITOK);
+	xi->node = node;
+	xi->xref = xref;
+	xi->dev  = dev;
+	mtx_lock(&xreflist_lock);
+	SLIST_INSERT_HEAD(&xreflist, xi, next_entry);
+	mtx_unlock(&xreflist_lock);
+	return (xi);
 }
 
 /*
@@ -605,10 +633,17 @@ OF_device_register_xref(phandle_t xref, device_t dev)
 {
 	struct xrefinfo *xi;
 
+	/*
+	 * If the given xref handle doesn't already exist in the list then we
+	 * add a list entry.  In theory this can only happen on a system where
+	 * nodes don't contain phandle properties and xref and node handles are
+	 * synonymous, so the xref handle is added as the node handle as well.
+	 */
 	if (xref_init_done) {
 		if ((xi = xrefinfo_find(xref, FIND_BY_XREF)) == NULL)
-			return (ENXIO);
-		xi->dev = dev;
+			xrefinfo_add(xref, xref, dev);
+		else 
+			xi->dev = dev;
 		return (0);
 	}
 	panic("Attempt to register device before xreflist_init");
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index 06a58c34b1c8..3df4d6a29b8d 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -254,7 +254,7 @@ patm_rx(struct patm_softc *sc, struct idt_rsqe *rsqe)
 
 	} else if (vcc->vcc.aal == ATMIO_AAL_5) {
 		if (stat & IDT_RSQE_CRC) {
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			if (vcc->chain != NULL) {
 				m_freem(vcc->chain);
 				vcc->chain = vcc->last = NULL;
@@ -312,9 +312,9 @@ patm_rx(struct patm_softc *sc, struct idt_rsqe *rsqe)
 	}
 #endif
 
-	sc->ifp->if_ipackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	/* this is in if_atmsubr.c */
-	/* sc->ifp->if_ibytes += m->m_pkthdr.len; */
+	/* if_inc_counter(sc->ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); */
 
 	vcc->ibytes += m->m_pkthdr.len;
 	vcc->ipackets++;
@@ -511,9 +511,9 @@ patm_rx_raw(struct patm_softc *sc, u_char *cell)
 		break;
 	}
 
-	sc->ifp->if_ipackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	/* this is in if_atmsubr.c */
-	/* sc->ifp->if_ibytes += m->m_pkthdr.len; */
+	/* if_inc_counter(sc->ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); */
 
 	vcc->ibytes += m->m_pkthdr.len;
 	vcc->ipackets++;
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index 1b4384496b9e..d38d07895d0d 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -304,7 +304,7 @@ patm_start(struct ifnet *ifp)
 		/* split of pseudo header */
 		if (m->m_len < sizeof(*aph) &&
 		    (m = m_pullup(m, sizeof(*aph))) == NULL) {
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
@@ -316,21 +316,21 @@ patm_start(struct ifnet *ifp)
 		/* reject empty packets */
 		if (m->m_pkthdr.len == 0) {
 			m_freem(m);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
 		/* check whether this is a legal vcc */
 		if (!LEGAL_VPI(sc, vpi) || !LEGAL_VCI(sc, vci) || vci == 0) {
 			m_freem(m);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		cid = PATM_CID(sc, vpi, vci);
 		vcc = sc->vccs[cid];
 		if (vcc == NULL) {
 			m_freem(m);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
@@ -340,7 +340,7 @@ patm_start(struct ifnet *ifp)
 			/* XXX AAL3/4 format? */
 			if (m->m_pkthdr.len % 48 != 0 &&
 			    (m = patm_tx_pad(sc, m)) == NULL) {
-				sc->ifp->if_oerrors++;
+				if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		} else if (vcc->vcc.aal == ATMIO_AAL_RAW) {
@@ -349,7 +349,7 @@ patm_start(struct ifnet *ifp)
 			  default:
 			  case PATM_RAW_CELL:
 				if (m->m_pkthdr.len != 53) {
-					sc->ifp->if_oerrors++;
+					if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 					m_freem(m);
 					continue;
 				}
@@ -357,7 +357,7 @@ patm_start(struct ifnet *ifp)
 
 			  case PATM_RAW_NOHEC:
 				if (m->m_pkthdr.len != 52) {
-					sc->ifp->if_oerrors++;
+					if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 					m_freem(m);
 					continue;
 				}
@@ -365,7 +365,7 @@ patm_start(struct ifnet *ifp)
 
 			  case PATM_RAW_CS:
 				if (m->m_pkthdr.len != 64) {
-					sc->ifp->if_oerrors++;
+					if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 					m_freem(m);
 					continue;
 				}
@@ -378,7 +378,7 @@ patm_start(struct ifnet *ifp)
 
 		/* try to put it on the channels queue */
 		if (_IF_QFULL(&vcc->scd->q)) {
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			sc->stats.tx_qfull++;
 			m_freem(m);
 			continue;
@@ -416,7 +416,7 @@ patm_tx_pad(struct patm_softc *sc, struct mbuf *m0)
 		m0->m_pkthdr.len = plen;
 		if (plen == 0) {
 			m_freem(m0);
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			return (NULL);
 		}
 		if (plen % 48 == 0)
@@ -442,7 +442,7 @@ patm_tx_pad(struct patm_softc *sc, struct mbuf *m0)
 	MGET(m, M_NOWAIT, MT_DATA);
 	if (m == 0) {
 		m_freem(m0);
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		return (NULL);
 	}
 	bzero(mtod(m, u_char *), pad);
@@ -534,7 +534,7 @@ patm_launch(struct patm_softc *sc, struct patm_scd *scd)
 		    patm_load_txbuf, &a, BUS_DMA_NOWAIT);
 		if (error == EFBIG) {
 			if ((m = m_defrag(m, M_NOWAIT)) == NULL) {
-				sc->ifp->if_oerrors++;
+				if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 			error = bus_dmamap_load_mbuf(sc->tx_tag, map->map, m,
@@ -542,13 +542,13 @@ patm_launch(struct patm_softc *sc, struct patm_scd *scd)
 		}
 		if (error != 0) {
 			sc->stats.tx_load_err++;
-			sc->ifp->if_oerrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 			SLIST_INSERT_HEAD(&sc->tx_maps_free, map, link);
 			m_freem(m);
 			continue;
 		}
 
-		sc->ifp->if_opackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 	}
 }
 
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 0526e8d08c8f..1bb31724c126 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -131,7 +131,7 @@ static device_method_t pci_methods[] = {
 	DEVMETHOD(device_detach,	bus_generic_detach),
 #endif
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	pci_suspend),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	pci_resume),
 
 	/* Bus interface */
@@ -157,6 +157,8 @@ static device_method_t pci_methods[] = {
 	DEVMETHOD(bus_child_pnpinfo_str, pci_child_pnpinfo_str_method),
 	DEVMETHOD(bus_child_location_str, pci_child_location_str_method),
 	DEVMETHOD(bus_remap_intr,	pci_remap_intr_method),
+	DEVMETHOD(bus_suspend_child,	pci_suspend_child),
+	DEVMETHOD(bus_resume_child,	pci_resume_child),
 
 	/* PCI interface */
 	DEVMETHOD(pci_read_config,	pci_read_config_method),
@@ -3622,12 +3624,11 @@ pci_detach(device_t dev)
 #endif
 
 static void
-pci_set_power_children(device_t dev, device_t *devlist, int numdevs,
-    int state)
+pci_set_power_child(device_t dev, device_t child, int state)
 {
-	device_t child, pcib;
 	struct pci_devinfo *dinfo;
-	int dstate, i;
+	device_t pcib;
+	int dstate;
 
 	/*
 	 * Set the device to the given state.  If the firmware suggests
@@ -3637,45 +3638,54 @@ pci_set_power_children(device_t dev, device_t *devlist, int numdevs,
 	 * are handled separately.
 	 */
 	pcib = device_get_parent(dev);
-	for (i = 0; i < numdevs; i++) {
-		child = devlist[i];
-		dinfo = device_get_ivars(child);
-		dstate = state;
-		if (device_is_attached(child) &&
-		    PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0)
-			pci_set_powerstate(child, dstate);
-	}
+	dinfo = device_get_ivars(child);
+	dstate = state;
+	if (device_is_attached(child) &&
+	    PCIB_POWER_FOR_SLEEP(pcib, dev, &dstate) == 0)
+		pci_set_powerstate(child, dstate);
 }
 
 int
-pci_suspend(device_t dev)
+pci_suspend_child(device_t dev, device_t child)
 {
-	device_t child, *devlist;
 	struct pci_devinfo *dinfo;
-	int error, i, numdevs;
+	int error;
+
+	dinfo = device_get_ivars(child);
 
 	/*
-	 * Save the PCI configuration space for each child and set the
+	 * Save the PCI configuration space for the child and set the
 	 * device in the appropriate power state for this sleep state.
 	 */
-	if ((error = device_get_children(dev, &devlist, &numdevs)) != 0)
-		return (error);
-	for (i = 0; i < numdevs; i++) {
-		child = devlist[i];
-		dinfo = device_get_ivars(child);
-		pci_cfg_save(child, dinfo, 0);
-	}
+	pci_cfg_save(child, dinfo, 0);
 
 	/* Suspend devices before potentially powering them down. */
-	error = bus_generic_suspend(dev);
-	if (error) {
-		free(devlist, M_TEMP);
+	error = bus_generic_suspend_child(dev, child);
+
+	if (error)
 		return (error);
-	}
+
 	if (pci_do_power_suspend)
-		pci_set_power_children(dev, devlist, numdevs,
-		    PCI_POWERSTATE_D3);
-	free(devlist, M_TEMP);
+		pci_set_power_child(dev, child, PCI_POWERSTATE_D3);
+
+	return (0);
+}
+
+int
+pci_resume_child(device_t dev, device_t child)
+{
+	struct pci_devinfo *dinfo;
+
+	if (pci_do_power_resume)
+		pci_set_power_child(dev, child, PCI_POWERSTATE_D0);
+
+	dinfo = device_get_ivars(child);
+	pci_cfg_restore(child, dinfo);
+	if (!device_is_attached(child))
+		pci_cfg_save(child, dinfo, 1);
+
+	bus_generic_resume_child(dev, child);
+
 	return (0);
 }
 
@@ -3683,27 +3693,10 @@ int
 pci_resume(device_t dev)
 {
 	device_t child, *devlist;
-	struct pci_devinfo *dinfo;
 	int error, i, numdevs;
 
-	/*
-	 * Set each child to D0 and restore its PCI configuration space.
-	 */
 	if ((error = device_get_children(dev, &devlist, &numdevs)) != 0)
 		return (error);
-	if (pci_do_power_resume)
-		pci_set_power_children(dev, devlist, numdevs,
-		    PCI_POWERSTATE_D0);
-
-	/* Now the device is powered up, restore its config space. */
-	for (i = 0; i < numdevs; i++) {
-		child = devlist[i];
-		dinfo = device_get_ivars(child);
-
-		pci_cfg_restore(child, dinfo);
-		if (!device_is_attached(child))
-			pci_cfg_save(child, dinfo, 1);
-	}
 
 	/*
 	 * Resume critical devices first, then everything else later.
@@ -3715,7 +3708,7 @@ pci_resume(device_t dev)
 		case PCIC_MEMORY:
 		case PCIC_BRIDGE:
 		case PCIC_BASEPERIPH:
-			DEVICE_RESUME(child);
+			BUS_RESUME_CHILD(dev, child);
 			break;
 		}
 	}
@@ -3728,7 +3721,7 @@ pci_resume(device_t dev)
 		case PCIC_BASEPERIPH:
 			break;
 		default:
-			DEVICE_RESUME(child);
+			BUS_RESUME_CHILD(dev, child);
 		}
 	}
 	free(devlist, M_TEMP);
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index 5a90ce98d8ba..c10701d2afca 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -123,7 +123,8 @@ int		pci_child_pnpinfo_str_method(device_t cbdev, device_t child,
 		    char *buf, size_t buflen);
 int		pci_assign_interrupt_method(device_t dev, device_t child);
 int		pci_resume(device_t dev);
-int		pci_suspend(device_t dev);
+int		pci_resume_child(device_t dev, device_t child);
+int		pci_suspend_child(device_t dev, device_t child);
 bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev);
 void		pci_child_added_method(device_t dev, device_t child);
 
diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c
index cd04b38899d3..d3121a13ea3d 100644
--- a/sys/dev/pcn/if_pcn.c
+++ b/sys/dev/pcn/if_pcn.c
@@ -856,7 +856,7 @@ pcn_rxeof(sc)
 	 	 * comes up in the ring.
 		 */
 		if (cur_rx->pcn_rxstat & PCN_RXSTAT_ERR) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			pcn_newbuf(sc, i, m);
 			PCN_INC(i, PCN_RX_LIST_CNT);
 			continue;
@@ -865,7 +865,7 @@ pcn_rxeof(sc)
 		if (pcn_newbuf(sc, i, NULL)) {
 			/* Ran out of mbufs; recycle this one. */
 			pcn_newbuf(sc, i, m);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			PCN_INC(i, PCN_RX_LIST_CNT);
 			continue;
 		}
@@ -873,7 +873,7 @@ pcn_rxeof(sc)
 		PCN_INC(i, PCN_RX_LIST_CNT);
 
 		/* No errors; receive the packet. */
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_len = m->m_pkthdr.len =
 		    cur_rx->pcn_rxlen - ETHER_CRC_LEN;
 		m->m_pkthdr.rcvif = ifp;
@@ -921,17 +921,17 @@ pcn_txeof(sc)
 		}
 
 		if (cur_tx->pcn_txctl & PCN_TXCTL_ERR) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (cur_tx->pcn_txstat & PCN_TXSTAT_EXDEF)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (cur_tx->pcn_txstat & PCN_TXSTAT_RTRY)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 
-		ifp->if_collisions +=
-		    cur_tx->pcn_txstat & PCN_TXSTAT_TRC;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+		    cur_tx->pcn_txstat & PCN_TXSTAT_TRC);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if (sc->pcn_cdata.pcn_tx_chain[idx] != NULL) {
 			m_freem(sc->pcn_cdata.pcn_tx_chain[idx]);
 			sc->pcn_cdata.pcn_tx_chain[idx] = NULL;
@@ -1436,7 +1436,7 @@ pcn_watchdog(struct pcn_softc *sc)
 	PCN_LOCK_ASSERT(sc);
 	ifp = sc->pcn_ifp;
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	pcn_stop(sc);
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index b359b5253456..50619cbe0242 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -229,7 +229,7 @@ pdq_os_receive_pdu(
     struct ifnet *ifp = PDQ_IFNET(sc);
     struct fddi_header *fh;
 
-    ifp->if_ipackets++;
+    if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 #if defined(PDQ_BUS_DMA)
     {
 	/*
@@ -251,8 +251,8 @@ pdq_os_receive_pdu(
     m->m_pkthdr.len = pktlen;
     fh = mtod(m, struct fddi_header *);
     if (drop || (fh->fddi_fc & (FDDIFC_L|FDDIFC_F)) != FDDIFC_LLC_ASYNC) {
-	ifp->if_iqdrops++;
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	PDQ_OS_DATABUF_FREE(pdq, m);
 	return;
     }
@@ -289,7 +289,7 @@ pdq_os_transmit_done(
 	PDQ_BPF_MTAP(sc, m);
 #endif
     PDQ_OS_DATABUF_FREE(pdq, m);
-    PDQ_IFNET(sc)->if_opackets++;
+    if_inc_counter(PDQ_IFNET(sc), IFCOUNTER_OPACKETS, 1);
 }
 
 void
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index dbc5183fe894..93a0da17307a 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -576,8 +576,8 @@ lp_intr(void *arg)
 		sc->sc_iferrs = 0;
 
 		len -= CLPIPHDRLEN;
-		sc->sc_ifp->if_ipackets++;
-		sc->sc_ifp->if_ibytes += len;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IBYTES, len);
 		top = m_devget(sc->sc_ifbuf + CLPIPHDRLEN, len, 0, sc->sc_ifp,
 		    0);
 		if (top) {
@@ -630,8 +630,8 @@ lp_intr(void *arg)
 		sc->sc_iferrs = 0;
 
 		len -= LPIPHDRLEN;
-		sc->sc_ifp->if_ipackets++;
-		sc->sc_ifp->if_ibytes += len;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IBYTES, len);
 		top = m_devget(sc->sc_ifbuf + LPIPHDRLEN, len, 0, sc->sc_ifp,
 		    0);
 		if (top) {
@@ -651,7 +651,7 @@ lp_intr(void *arg)
 err:
 	ppb_wdtr(ppbus, 0);
 	lprintf("R");
-	sc->sc_ifp->if_ierrors++;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 	sc->sc_iferrs++;
 
 	/*
@@ -768,11 +768,11 @@ lpoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	nend:
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 		if (err)  {			/* if we didn't timeout... */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			lprintf("X");
 		} else {
-			ifp->if_opackets++;
-			ifp->if_obytes += m->m_pkthdr.len;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+			if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 			if (bpf_peers_present(ifp->if_bpf))
 				lptap(ifp, m);
 		}
@@ -814,11 +814,11 @@ lpoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	if (err)  {			/* if we didn't timeout... */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		lprintf("X");
 	} else {
-		ifp->if_opackets++;
-		ifp->if_obytes += m->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 		if (bpf_peers_present(ifp->if_bpf))
 			lptap(ifp, m);
 	}
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 1d1e3f145b32..f28215999a12 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -2566,7 +2566,7 @@ qla_hw_tx_done_locked(qla_host_t *ha, uint32_t txr_idx)
 		comp_count++;
 
 		if (txb->m_head) {
-			ha->ifp->if_opackets++;
+			if_inc_counter(ha->ifp, IFCOUNTER_OPACKETS, 1);
 
 			bus_dmamap_sync(ha->tx_tag, txb->map,
 				BUS_DMASYNC_POSTWRITE);
diff --git a/sys/dev/qlxgbe/ql_isr.c b/sys/dev/qlxgbe/ql_isr.c
index c11e9866626f..db0029822927 100644
--- a/sys/dev/qlxgbe/ql_isr.c
+++ b/sys/dev/qlxgbe/ql_isr.c
@@ -156,7 +156,7 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_t *sgc, uint32_t sds_idx)
 		mpf->m_pkthdr.csum_flags = 0;
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	mpf->m_pkthdr.flowid = sgc->rss_hash;
 	mpf->m_flags |= M_FLOWID;
@@ -326,7 +326,7 @@ qla_lro_intr(qla_host_t *ha, qla_sgl_lro_t *sgc, uint32_t sds_idx)
 	mpf->m_pkthdr.flowid = sgc->rss_hash;
 	mpf->m_flags |= M_FLOWID;
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	(*ifp->if_input)(ifp, mpf);
 
diff --git a/sys/dev/qlxge/qls_isr.c b/sys/dev/qlxge/qls_isr.c
index 26e431e628db..14b4839be913 100644
--- a/sys/dev/qlxge/qls_isr.c
+++ b/sys/dev/qlxge/qls_isr.c
@@ -57,7 +57,7 @@ qls_tx_comp(qla_host_t *ha, uint32_t txr_idx, q81_tx_mac_comp_t *tx_comp)
 	txb = &ha->tx_ring[txr_idx].tx_buf[tx_idx];
 
 	if (txb->m_head) {
-		ha->ifp->if_opackets++;
+		if_inc_counter(ha->ifp, IFCOUNTER_OPACKETS, 1);
 		bus_dmamap_sync(ha->tx_tag, txb->map,
 		        BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(ha->tx_tag, txb->map);
@@ -201,7 +201,7 @@ qls_rx_comp(qla_host_t *ha, uint32_t rxr_idx, uint32_t cq_idx, q81_rx_t *cq_e)
 					CSUM_PSEUDO_HDR;
 				mp->m_pkthdr.csum_data = 0xFFFF;
 			}
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 			if (lro->lro_cnt && (tcp_lro_rx(lro, mp, 0) == 0)) {
 				/* LRO packet has been successfuly queued */
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index 475544d23d6d..02c93103245b 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -959,7 +959,7 @@ rt2560_tx_intr(struct rt2560_softc *sc)
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			break;
 
 		case RT2560_TX_SUCCESS_RETRY:
@@ -971,7 +971,7 @@ rt2560_tx_intr(struct rt2560_softc *sc)
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			break;
 
 		case RT2560_TX_FAIL_RETRY:
@@ -983,7 +983,7 @@ rt2560_tx_intr(struct rt2560_softc *sc)
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_FAILURE,
 				    &retrycnt, NULL);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 
 		case RT2560_TX_FAIL_INVALID:
@@ -991,7 +991,7 @@ rt2560_tx_intr(struct rt2560_softc *sc)
 		default:
 			device_printf(sc->sc_dev, "sending data frame failed "
 			    "0x%08x\n", flags);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 
 		bus_dmamap_sync(sc->txq.data_dmat, data->map,
@@ -1144,13 +1144,13 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
 			break;
 
 		if (data->drop) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
 		if ((le32toh(desc->flags) & RT2560_RX_CIPHER_MASK) != 0 &&
 		    (le32toh(desc->flags) & RT2560_RX_ICV_ERROR)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1163,7 +1163,7 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
 		 */
 		mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (mnew == NULL) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1186,7 +1186,7 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
 				panic("%s: could not load old rx mbuf",
 				    device_get_name(sc->sc_dev));
 			}
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1936,7 +1936,7 @@ rt2560_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (rt2560_tx_data(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 
@@ -1973,7 +1973,7 @@ rt2560_watchdog(void *arg)
 	if (sc->sc_tx_timer > 0 && --sc->sc_tx_timer == 0) {
 		if_printf(ifp, "device timeout\n");
 		rt2560_init_locked(sc);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		/* NB: callout is reset in rt2560_init() */
 		return;
 	}
@@ -2796,7 +2796,7 @@ rt2560_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return ENOBUFS;		/* XXX */
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	if (params == NULL) {
 		/*
@@ -2819,7 +2819,7 @@ rt2560_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
 	return 0;
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ieee80211_free_node(ni);
 	RAL_UNLOCK(sc);
 	return EIO;		/* XXX */
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 7b621d7e7ae4..448ba5746bd2 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -909,7 +909,7 @@ rt2661_tx_intr(struct rt2661_softc *sc)
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			break;
 
 		case RT2661_TX_RETRY_FAIL:
@@ -921,14 +921,14 @@ rt2661_tx_intr(struct rt2661_softc *sc)
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_FAILURE,
 				    &retrycnt, NULL);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 
 		default:
 			/* other failure */
 			device_printf(sc->sc_dev,
 			    "sending data frame failed 0x%08x\n", val);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 
 		DPRINTFN(sc, 15, "tx done q=%d idx=%u\n", qid, txq->stat);
@@ -1015,12 +1015,12 @@ rt2661_rx_intr(struct rt2661_softc *sc)
 			 */
 			DPRINTFN(sc, 5, "PHY or CRC error flags 0x%08x\n",
 			    le32toh(desc->flags));
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
 		if ((le32toh(desc->flags) & RT2661_RX_CIPHER_MASK) != 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1033,7 +1033,7 @@ rt2661_rx_intr(struct rt2661_softc *sc)
 		 */
 		mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (mnew == NULL) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1056,7 +1056,7 @@ rt2661_rx_intr(struct rt2661_softc *sc)
 				panic("%s: could not load old rx mbuf",
 				    device_get_name(sc->sc_dev));
 			}
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1631,7 +1631,7 @@ rt2661_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (rt2661_tx_data(sc, m, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 
@@ -1674,7 +1674,7 @@ rt2661_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return ENOBUFS;		/* XXX */
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	/*
 	 * Legacy path; interpret frame contents to decide
@@ -1689,7 +1689,7 @@ rt2661_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
 	return 0;
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ieee80211_free_node(ni);
 	RAL_UNLOCK(sc);
 	return EIO;		/* XXX */
@@ -1711,7 +1711,7 @@ rt2661_watchdog(void *arg)
 	if (sc->sc_tx_timer > 0 && --sc->sc_tx_timer == 0) {
 		if_printf(ifp, "device timeout\n");
 		rt2661_init_locked(sc);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		/* NB: callout is reset in rt2661_init() */
 		return;
 	}
diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c
index e37f820d27f3..2e68c2e505ad 100644
--- a/sys/dev/ral/rt2860.c
+++ b/sys/dev/ral/rt2860.c
@@ -1127,7 +1127,7 @@ rt2860_drain_stats_fifo(struct rt2860_softc *sc)
 		} else {
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &retrycnt, NULL);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 	}
 }
@@ -1161,7 +1161,7 @@ rt2860_tx_intr(struct rt2860_softc *sc, int qid)
 			SLIST_INSERT_HEAD(&sc->data_pool, data, next);
 			ring->data[ring->next] = NULL;
 
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 		ring->queued--;
 		ring->next = (ring->next + 1) % RT2860_TX_RING_COUNT;
@@ -1224,7 +1224,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 
 		if (__predict_false(rxd->flags &
 		    htole32(RT2860_RX_CRCERR | RT2860_RX_ICVERR))) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1233,14 +1233,14 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 			/* report MIC failures to net80211 for TKIP */
 			ic->ic_stats.is_rx_locmicfail++;
 			ieee80211_michael_mic_failure(ic, 0/* XXX */);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 #endif
 
 		m1 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (__predict_false(m1 == NULL)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1264,7 +1264,7 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 			}
 			/* physical address may have changed */
 			rxd->sdp0 = htole32(physaddr);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1744,7 +1744,7 @@ rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	if (error != 0) {
 		/* NB: m is reclaimed on tx failure */
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	sc->sc_tx_timer = 5;
 	RAL_UNLOCK(sc);
@@ -1997,7 +1997,7 @@ rt2860_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
 		if (rt2860_tx(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		sc->sc_tx_timer = 5;
@@ -2021,7 +2021,7 @@ rt2860_watchdog(void *arg)
 		if_printf(ifp, "device timeout\n");
 		rt2860_stop_locked(sc);
 		rt2860_init_locked(sc);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return;
 	}
 	callout_reset(&sc->watchdog_ch, hz, rt2860_watchdog, sc);
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index e7f1361b4967..bb4e6727c9c5 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -148,7 +148,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 MODULE_DEPEND(re, pci, 1, 1, 1);
 MODULE_DEPEND(re, ether, 1, 1, 1);
@@ -2241,7 +2241,7 @@ re_rxeof(struct rl_softc *sc, int *rx_npktsp)
 			    (rxstat & RL_RDESC_STAT_ERRS) == RL_RDESC_STAT_GIANT)
 				rxerr = 0;
 			if (rxerr != 0) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				/*
 				 * If this is part of a multi-fragment packet,
 				 * discard all the pieces.
@@ -2264,7 +2264,7 @@ re_rxeof(struct rl_softc *sc, int *rx_npktsp)
 		else
 			rxerr = re_newbuf(sc, i);
 		if (rxerr != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			if (sc->rl_head != NULL) {
 				m_freem(sc->rl_head);
 				sc->rl_head = sc->rl_tail = NULL;
@@ -2306,7 +2306,7 @@ re_rxeof(struct rl_softc *sc, int *rx_npktsp)
 #ifdef RE_FIXUP_RX
 		re_fixup_rx(m);
 #endif
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 
 		/* Do RX checksumming if enabled */
@@ -2425,11 +2425,11 @@ re_txeof(struct rl_softc *sc)
 			txd->tx_m = NULL;
 			if (txstat & (RL_TDESC_STAT_EXCESSCOL|
 			    RL_TDESC_STAT_COLCNT))
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (txstat & RL_TDESC_STAT_TXERRSUM)
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			else
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 		sc->rl_ldata.rl_tx_free++;
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -3539,7 +3539,7 @@ re_watchdog(struct rl_softc *sc)
 	}
 
 	if_printf(ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	re_rxeof(sc, NULL);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/pci/if_rl.c b/sys/dev/rl/if_rl.c
similarity index 99%
rename from sys/pci/if_rl.c
rename to sys/dev/rl/if_rl.c
index f69866353f2b..9d0d7aa31d94 100644
--- a/sys/pci/if_rl.c
+++ b/sys/dev/rl/if_rl.c
@@ -127,7 +127,7 @@ MODULE_DEPEND(rl, miibus, 1, 1, 1);
 /* "device miibus" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 /*
  * Various supported device vendors/types and their names.
@@ -1166,7 +1166,7 @@ rl_rxeof(struct rl_softc *sc)
 		if (!(rxstat & RL_RXSTAT_RXOK) ||
 		    total_len < ETHER_MIN_LEN ||
 		    total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 			rl_init_locked(sc);
 			return (rx_npkts);
@@ -1215,11 +1215,11 @@ rl_rxeof(struct rl_softc *sc)
 		CSR_WRITE_2(sc, RL_CURRXADDR, cur_rx - 16);
 
 		if (m == NULL) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			continue;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		RL_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		RL_LOCK(sc);
@@ -1254,7 +1254,7 @@ rl_txeof(struct rl_softc *sc)
 		    RL_TXSTAT_TX_UNDERRUN|RL_TXSTAT_TXABRT)))
 			break;
 
-		ifp->if_collisions += (txstat & RL_TXSTAT_COLLCNT) >> 24;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & RL_TXSTAT_COLLCNT) >> 24);
 
 		bus_dmamap_sync(sc->rl_cdata.rl_tx_tag, RL_LAST_DMAMAP(sc),
 		    BUS_DMASYNC_POSTWRITE);
@@ -1270,10 +1270,10 @@ rl_txeof(struct rl_softc *sc)
 		    (sc->rl_txthresh < 2016))
 			sc->rl_txthresh += 32;
 		if (txstat & RL_TXSTAT_TX_OK)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		else {
 			int			oldthresh;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if ((txstat & RL_TXSTAT_TXABRT) ||
 			    (txstat & RL_TXSTAT_OUTOFWIN))
 				CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG);
@@ -1897,7 +1897,7 @@ rl_watchdog(struct rl_softc *sc)
 		return;
 
 	device_printf(sc->rl_dev, "watchdog timeout\n");
-	sc->rl_ifp->if_oerrors++;
+	if_inc_counter(sc->rl_ifp, IFCOUNTER_OERRORS, 1);
 
 	rl_txeof(sc);
 	rl_rxeof(sc);
diff --git a/sys/pci/if_rlreg.h b/sys/dev/rl/if_rlreg.h
similarity index 100%
rename from sys/pci/if_rlreg.h
rename to sys/dev/rl/if_rlreg.h
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index 3d936b58240f..910276fdc719 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -1025,7 +1025,7 @@ rt_start(struct ifnet *ifp)
 			m_freem(m);
 
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 			sc->tx_data_queue_full[qid]++;
 
@@ -1035,7 +1035,7 @@ rt_start(struct ifnet *ifp)
 		if (rt_tx_data(sc, m, qid) != 0) {
 			RT_SOFTC_TX_RING_UNLOCK(&sc->tx_ring[qid]);
 
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 			break;
 		}
@@ -1152,7 +1152,7 @@ rt_tx_watchdog(void *arg)
 		rt_stop_locked(sc);
 		rt_init_locked(sc);
 #endif
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		sc->tx_watchdog_timeouts++;
 	}
 	callout_reset(&sc->tx_watchdog_ch, hz, rt_tx_watchdog, sc);
@@ -1637,7 +1637,7 @@ rt_rx_eof(struct rt_softc *sc, int limit)
 		    MJUMPAGESIZE);
 		if (mnew == NULL) {
 			sc->rx_mbuf_alloc_errors++;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto skip;
 		}
 
@@ -1654,7 +1654,7 @@ rt_rx_eof(struct rt_softc *sc, int limit)
 			m_freem(mnew);
 
 			sc->rx_mbuf_dmamap_errors++;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 			goto skip;
 		}
@@ -1700,7 +1700,7 @@ rt_rx_eof(struct rt_softc *sc, int limit)
 				RT_DPRINTF(sc, RT_DEBUG_RX,
 				    "rxdesc: crc error\n");
 
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 				if (!(ifp->if_flags & IFF_PROMISC)) {
 				    m_freem(m);
@@ -1785,7 +1785,7 @@ rt_tx_eof(struct rt_softc *sc, struct rt_softc_tx_ring *ring)
 
 			data->m = NULL;
 
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 			RT_SOFTC_TX_RING_LOCK(ring);
 			ring->data_queued--;
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index 8a4ce2ea55ef..c459dedcc7ce 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -612,7 +612,7 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_int frameno,
 		} else if ((frame_ok = skip_tail(sc, framelen, crc)) != 0) {
 			sc->wait_frameno = 0;
 			sc->inppos = 0;
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			/* now skip all frames until is_first != 0 */
 		}
 	} else
@@ -624,7 +624,7 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_int frameno,
 		 * is_first already... Drop entire packet.
 		 */
 		sc->wait_frameno = 0;
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	return (frame_ok);
@@ -638,7 +638,7 @@ send_complete(struct sbni_softc *sc)
 {
 	m_freem(sc->tx_buf_p);
 	sc->tx_buf_p = NULL;
-	sc->ifp->if_opackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 }
 
 
@@ -689,7 +689,7 @@ append_frame_to_pkt(struct sbni_softc *sc, u_int framelen, u_int32_t crc)
 	sc->inppos += framelen - 4;
 	if (--sc->wait_frameno == 0) {		/* last frame received */
 		indicate_pkt(sc);
-		sc->ifp->if_ipackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	}
 
 	return (1);
@@ -755,7 +755,7 @@ drop_xmit_queue(struct sbni_softc *sc)
 	if (sc->tx_buf_p) {
 		m_freem(sc->tx_buf_p);
 		sc->tx_buf_p = NULL;
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 	}
 
 	for (;;) {
@@ -763,7 +763,7 @@ drop_xmit_queue(struct sbni_softc *sc)
 		if (m == NULL)
 			break;
 		m_freem(m);
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 	}
 
 	sc->tx_frameno	= 0;
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 304813a59db1..d2c43945233b 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -1566,7 +1566,7 @@ sf_rxeof(struct sf_softc *sc)
 		m = rxd->rx_m;
 
 		/*
-		 * Note, if_ipackets and if_ierrors counters
+		 * Note, IFCOUNTER_IPACKETS and IFCOUNTER_IERRORS
 		 * are handled in sf_stats_update().
 		 */
 		if ((status & SF_RXSTAT1_OK) == 0) {
@@ -1575,7 +1575,7 @@ sf_rxeof(struct sf_softc *sc)
 		}
 
 		if (sf_newbuf(sc, eidx) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			cur_cmp->sf_rx_status1 = 0;
 			continue;
 		}
@@ -1720,8 +1720,9 @@ sf_txeof(struct sf_softc *sc)
 			/*
 			 * We don't need to check Tx status here.
 			 * SF_ISR_TX_LOFIFO intr would handle this.
-			 * Note, if_opackets, if_collisions and if_oerrors
-			 * counters are handled in sf_stats_update().
+			 * Note, IFCOUNTER_OPACKETS, IFCOUNTER_COLLISIONS
+			 * and IFCOUNTER_OERROR are handled in
+			 * sf_stats_update().
 			 */
 			txd = &sc->sf_cdata.sf_txdesc[idx];
 			if (txd->tx_m != NULL) {
@@ -2479,23 +2480,26 @@ sf_stats_update(struct sf_softc *sc)
 	for (i = SF_STATS_BASE; i < (SF_STATS_END + 1); i += sizeof(uint32_t))
 		csr_write_4(sc, i, 0);
 
-	ifp->if_opackets += (u_long)stats->sf_tx_frames;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, (u_long)stats->sf_tx_frames);
 
-	ifp->if_collisions += (u_long)stats->sf_tx_single_colls +
-	    (u_long)stats->sf_tx_multi_colls;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    (u_long)stats->sf_tx_single_colls +
+	    (u_long)stats->sf_tx_multi_colls);
 
-	ifp->if_oerrors += (u_long)stats->sf_tx_excess_colls +
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    (u_long)stats->sf_tx_excess_colls +
 	    (u_long)stats->sf_tx_excess_defer +
-	    (u_long)stats->sf_tx_frames_lost;
+	    (u_long)stats->sf_tx_frames_lost);
 
-	ifp->if_ipackets += (u_long)stats->sf_rx_frames;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, (u_long)stats->sf_rx_frames);
 
-	ifp->if_ierrors += (u_long)stats->sf_rx_crcerrs +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    (u_long)stats->sf_rx_crcerrs +
 	    (u_long)stats->sf_rx_alignerrs +
 	    (u_long)stats->sf_rx_giants +
 	    (u_long)stats->sf_rx_runts +
 	    (u_long)stats->sf_rx_jabbererrs +
-	    (u_long)stats->sf_rx_frames_lost;
+	    (u_long)stats->sf_rx_frames_lost);
 
 	nstats = &sc->sf_statistics;
 
@@ -2546,7 +2550,7 @@ sf_watchdog(struct sf_softc *sc)
 
 	ifp = sc->sf_ifp;
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if (sc->sf_link == 0) {
 		if (bootverbose)
 			if_printf(sc->sf_ifp, "watchdog timeout "
diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h
index 8fd126735b9e..433c40bf91eb 100644
--- a/sys/dev/sfxge/common/efsys.h
+++ b/sys/dev/sfxge/common/efsys.h
@@ -53,44 +53,44 @@ extern "C" {
 #define	EFSYS_HAS_UINT64 1
 #define	EFSYS_USE_UINT64 0
 #if _BYTE_ORDER == _BIG_ENDIAN
-#define EFSYS_IS_BIG_ENDIAN 1
-#define EFSYS_IS_LITTLE_ENDIAN 0
+#define	EFSYS_IS_BIG_ENDIAN 1
+#define	EFSYS_IS_LITTLE_ENDIAN 0
 #elif _BYTE_ORDER == _LITTLE_ENDIAN
-#define EFSYS_IS_BIG_ENDIAN 0
-#define EFSYS_IS_LITTLE_ENDIAN 1
+#define	EFSYS_IS_BIG_ENDIAN 0
+#define	EFSYS_IS_LITTLE_ENDIAN 1
 #endif
 #include "efx_types.h"
 
 /* Common code requires this */
 #if __FreeBSD_version < 800068
-#define memmove(d, s, l) bcopy(s, d, l)
+#define	memmove(d, s, l) bcopy(s, d, l)
 #endif
-	
+
 /* FreeBSD equivalents of Solaris things */
 #ifndef _NOTE
-#define _NOTE(s)
+#define	_NOTE(s)
 #endif
 
 #ifndef B_FALSE
-#define B_FALSE FALSE
+#define	B_FALSE	FALSE
 #endif
 #ifndef B_TRUE
-#define B_TRUE TRUE
+#define	B_TRUE	TRUE
 #endif
 
 #ifndef IS_P2ALIGNED
-#define	IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0)
+#define	IS_P2ALIGNED(v, a)	((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0)
 #endif
 
 #ifndef P2ROUNDUP
-#define P2ROUNDUP(x, align)             (-(-(x) & -(align)))
+#define	P2ROUNDUP(x, align)	(-(-(x) & -(align)))
 #endif
 
 #ifndef IS2P
-#define ISP2(x)         (((x) & ((x) - 1)) == 0)
+#define	ISP2(x)			(((x) & ((x) - 1)) == 0)
 #endif
 
-#define ENOTACTIVE EINVAL
+#define	ENOTACTIVE EINVAL
 
 /* Memory type to use on FreeBSD */
 MALLOC_DECLARE(M_SFXGE);
@@ -242,7 +242,7 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t map,
 #define	EFSYS_OPT_PHY_PROPS 0
 #define	EFSYS_OPT_PHY_BIST 1
 #define	EFSYS_OPT_PHY_LED_CONTROL 1
-#define EFSYS_OPT_PHY_FLAGS 0
+#define	EFSYS_OPT_PHY_FLAGS 0
 
 #define	EFSYS_OPT_VPD 1
 #define	EFSYS_OPT_NVRAM 1
@@ -256,8 +256,8 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t map,
 #define	EFSYS_OPT_WOL 1
 #define	EFSYS_OPT_RX_SCALE 1
 #define	EFSYS_OPT_QSTATS 1
-#define EFSYS_OPT_FILTER 0
-#define EFSYS_OPT_RX_SCATTER 0
+#define	EFSYS_OPT_FILTER 0
+#define	EFSYS_OPT_RX_SCATTER 0
 #define	EFSYS_OPT_RX_HDR_SPLIT 0
 
 #define	EFSYS_OPT_EV_PREFETCH 0
@@ -272,7 +272,7 @@ typedef struct __efsys_identifier_s	efsys_identifier_t;
 
 #ifndef DTRACE_PROBE
 
-#define EFSYS_PROBE(_name)
+#define	EFSYS_PROBE(_name)
 
 #define	EFSYS_PROBE1(_name, _type1, _arg1)
 
@@ -815,16 +815,16 @@ extern void	sfxge_err(efsys_identifier_t *, unsigned int,
 		panic(#_exp);						\
 	} while (0)
 
-#define EFSYS_ASSERT3(_x, _op, _y, _t) do {				\
+#define	EFSYS_ASSERT3(_x, _op, _y, _t) do {				\
 	const _t __x = (_t)(_x);					\
 	const _t __y = (_t)(_y);					\
 	if (!(__x _op __y))						\
-	        panic("assertion failed at %s:%u", __FILE__, __LINE__);	\
+		panic("assertion failed at %s:%u", __FILE__, __LINE__);	\
 	} while(0)
 
-#define EFSYS_ASSERT3U(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, uint64_t)
-#define EFSYS_ASSERT3S(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, int64_t)
-#define EFSYS_ASSERT3P(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, uintptr_t)
+#define	EFSYS_ASSERT3U(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, uint64_t)
+#define	EFSYS_ASSERT3S(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, int64_t)
+#define	EFSYS_ASSERT3P(_x, _op, _y)	EFSYS_ASSERT3(_x, _op, _y, uintptr_t)
 
 #ifdef	__cplusplus
 }
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 8f2c7bbc299a..c0850ec40f23 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
+#include <sys/syslog.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
@@ -57,16 +58,35 @@ __FBSDID("$FreeBSD$");
 #include "sfxge.h"
 #include "sfxge_rx.h"
 
-#define SFXGE_CAP (IFCAP_VLAN_MTU | \
+#define	SFXGE_CAP (IFCAP_VLAN_MTU | \
 		   IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | IFCAP_TSO |	\
 		   IFCAP_JUMBO_MTU | IFCAP_LRO |			\
 		   IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE)
-#define SFXGE_CAP_ENABLE SFXGE_CAP
-#define SFXGE_CAP_FIXED (IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | \
+#define	SFXGE_CAP_ENABLE SFXGE_CAP
+#define	SFXGE_CAP_FIXED (IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | \
 			 IFCAP_JUMBO_MTU | IFCAP_LINKSTATE)
 
 MALLOC_DEFINE(M_SFXGE, "sfxge", "Solarflare 10GigE driver");
 
+
+SYSCTL_NODE(_hw, OID_AUTO, sfxge, CTLFLAG_RD, 0,
+	    "SFXGE driver parameters");
+
+#define	SFXGE_PARAM_RX_RING	SFXGE_PARAM(rx_ring)
+static int sfxge_rx_ring_entries = SFXGE_NDESCS;
+TUNABLE_INT(SFXGE_PARAM_RX_RING, &sfxge_rx_ring_entries);
+SYSCTL_INT(_hw_sfxge, OID_AUTO, rx_ring, CTLFLAG_RDTUN,
+	   &sfxge_rx_ring_entries, 0,
+	   "Maximum number of descriptors in a receive ring");
+
+#define	SFXGE_PARAM_TX_RING	SFXGE_PARAM(tx_ring)
+static int sfxge_tx_ring_entries = SFXGE_NDESCS;
+TUNABLE_INT(SFXGE_PARAM_TX_RING, &sfxge_tx_ring_entries);
+SYSCTL_INT(_hw_sfxge, OID_AUTO, tx_ring, CTLFLAG_RDTUN,
+	   &sfxge_tx_ring_entries, 0,
+	   "Maximum number of descriptors in a transmit ring");
+
+
 static void
 sfxge_reset(void *arg, int npending);
 
@@ -78,7 +98,7 @@ sfxge_start(struct sfxge_softc *sc)
 	sx_assert(&sc->softc_lock, LA_XLOCKED);
 
 	if (sc->init_state == SFXGE_STARTED)
-		return 0;
+		return (0);
 
 	if (sc->init_state != SFXGE_REGISTERED) {
 		rc = EINVAL;
@@ -223,7 +243,7 @@ sfxge_if_ioctl(struct ifnet *ifp, unsigned long command, caddr_t data)
 			ifp->if_mtu = ifr->ifr_mtu;
 			error = sfxge_start(sc);
 			sx_xunlock(&sc->softc_lock);
-			if (error) {
+			if (error != 0) {
 				ifp->if_flags &= ~IFF_UP;
 				ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 				if_down(ifp);
@@ -287,7 +307,7 @@ sfxge_ifnet_fini(struct ifnet *ifp)
 	if_free(ifp);
 }
 
-static int 
+static int
 sfxge_ifnet_init(struct ifnet *ifp, struct sfxge_softc *sc)
 {
 	const efx_nic_cfg_t *encp = efx_nic_cfg_get(sc->enp);
@@ -314,8 +334,8 @@ sfxge_ifnet_init(struct ifnet *ifp, struct sfxge_softc *sc)
 	ifp->if_qflush = sfxge_if_qflush;
 #else
 	ifp->if_start = sfxge_if_start;
-	IFQ_SET_MAXLEN(&ifp->if_snd, SFXGE_NDESCS - 1);
-	ifp->if_snd.ifq_drv_maxlen = SFXGE_NDESCS - 1;
+	IFQ_SET_MAXLEN(&ifp->if_snd, sc->txq_entries - 1);
+	ifp->if_snd.ifq_drv_maxlen = sc->txq_entries - 1;
 	IFQ_SET_READY(&ifp->if_snd);
 
 	mtx_init(&sc->tx_lock, "txq", NULL, MTX_DEF);
@@ -324,11 +344,11 @@ sfxge_ifnet_init(struct ifnet *ifp, struct sfxge_softc *sc)
 	if ((rc = sfxge_port_ifmedia_init(sc)) != 0)
 		goto fail;
 
-	return 0;
+	return (0);
 
 fail:
 	ether_ifdetach(sc->ifnet);
-	return rc;
+	return (rc);
 }
 
 void
@@ -347,7 +367,7 @@ sfxge_bar_init(struct sfxge_softc *sc)
 {
 	efsys_bar_t *esbp = &sc->bar;
 
-	esbp->esb_rid = PCIR_BAR(EFX_MEM_BAR);	
+	esbp->esb_rid = PCIR_BAR(EFX_MEM_BAR);
 	if ((esbp->esb_res = bus_alloc_resource_any(sc->dev, SYS_RES_MEMORY,
 	    &esbp->esb_rid, RF_ACTIVE)) == NULL) {
 		device_printf(sc->dev, "Cannot allocate BAR region %d\n",
@@ -386,7 +406,7 @@ sfxge_create(struct sfxge_softc *sc)
 		device_get_sysctl_ctx(dev),
 		SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 		OID_AUTO, "stats", CTLFLAG_RD, NULL, "Statistics");
-	if (!sc->stats_node) {
+	if (sc->stats_node == NULL) {
 		error = ENOMEM;
 		goto fail;
 	}
@@ -414,6 +434,26 @@ sfxge_create(struct sfxge_softc *sc)
 		goto fail3;
 	sc->enp = enp;
 
+	if (!ISP2(sfxge_rx_ring_entries) ||
+	    !(sfxge_rx_ring_entries & EFX_RXQ_NDESCS_MASK)) {
+		log(LOG_ERR, "%s=%d must be power of 2 from %u to %u",
+		    SFXGE_PARAM_RX_RING, sfxge_rx_ring_entries,
+		    EFX_RXQ_MINNDESCS, EFX_RXQ_MAXNDESCS);
+		error = EINVAL;
+		goto fail_rx_ring_entries;
+	}
+	sc->rxq_entries = sfxge_rx_ring_entries;
+
+	if (!ISP2(sfxge_tx_ring_entries) ||
+	    !(sfxge_tx_ring_entries & EFX_TXQ_NDESCS_MASK)) {
+		log(LOG_ERR, "%s=%d must be power of 2 from %u to %u",
+		    SFXGE_PARAM_TX_RING, sfxge_tx_ring_entries,
+		    EFX_TXQ_MINNDESCS, EFX_TXQ_MAXNDESCS);
+		error = EINVAL;
+		goto fail_tx_ring_entries;
+	}
+	sc->txq_entries = sfxge_tx_ring_entries;
+
 	/* Initialize MCDI to talk to the microcontroller. */
 	if ((error = sfxge_mcdi_init(sc)) != 0)
 		goto fail4;
@@ -486,6 +526,8 @@ sfxge_create(struct sfxge_softc *sc)
 	sfxge_mcdi_fini(sc);
 
 fail4:
+fail_tx_ring_entries:
+fail_rx_ring_entries:
 	sc->enp = NULL;
 	efx_nic_destroy(enp);
 	mtx_destroy(&sc->enp_lock);
@@ -554,14 +596,14 @@ sfxge_vpd_handler(SYSCTL_HANDLER_ARGS)
 	struct sfxge_softc *sc = arg1;
 	efx_vpd_value_t value;
 	int rc;
-	
+
 	value.evv_tag = arg2 >> 16;
 	value.evv_keyword = arg2 & 0xffff;
 	if ((rc = efx_vpd_get(sc->enp, sc->vpd_data, sc->vpd_size, &value))
 	    != 0)
-		return rc;
+		return (rc);
 
-	return SYSCTL_OUT(req, value.evv_value, value.evv_length);
+	return (SYSCTL_OUT(req, value.evv_value, value.evv_length));
 }
 
 static void
@@ -623,12 +665,12 @@ sfxge_vpd_init(struct sfxge_softc *sc)
 	for (keyword[1] = 'A'; keyword[1] <= 'Z'; keyword[1]++)
 		sfxge_vpd_try_add(sc, vpd_list, EFX_VPD_RO, keyword);
 
-	return 0;
-	
+	return (0);
+
 fail2:
 	free(sc->vpd_data, M_SFXGE);
 fail:
-	return rc;
+	return (rc);
 }
 
 static void
@@ -745,12 +787,12 @@ sfxge_probe(device_t dev)
 	pci_device_id = pci_get_device(dev);
 
 	rc = efx_family(pci_vendor_id, pci_device_id, &family);
-	if (rc)
-		return ENXIO;
+	if (rc != 0)
+		return (ENXIO);
 
 	KASSERT(family == EFX_FAMILY_SIENA, ("impossible controller family"));
 	device_set_desc(dev, "Solarflare SFC9000 family");
-	return 0;
+	return (0);
 }
 
 static device_method_t sfxge_methods[] = {
diff --git a/sys/dev/sfxge/sfxge.h b/sys/dev/sfxge/sfxge.h
index d73d15019bf8..69b062ab817d 100644
--- a/sys/dev/sfxge/sfxge.h
+++ b/sys/dev/sfxge/sfxge.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _SFXGE_H
-#define _SFXGE_H
+#define	_SFXGE_H
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -53,43 +53,45 @@
 /* This should be right on most machines the driver will be used on, and
  * we needn't care too much about wasting a few KB per interface.
  */
-#define CACHE_LINE_SIZE 128
+#define	CACHE_LINE_SIZE 128
 #endif
 #ifndef IFCAP_LINKSTATE
-#define IFCAP_LINKSTATE 0
+#define	IFCAP_LINKSTATE 0
 #endif
 #ifndef IFCAP_VLAN_HWTSO
-#define IFCAP_VLAN_HWTSO 0
+#define	IFCAP_VLAN_HWTSO 0
 #endif
 #ifndef IFM_10G_T
-#define IFM_10G_T IFM_UNKNOWN
+#define	IFM_10G_T IFM_UNKNOWN
 #endif
 #ifndef IFM_10G_KX4
-#define IFM_10G_KX4 IFM_10G_CX4
+#define	IFM_10G_KX4 IFM_10G_CX4
 #endif
 #if __FreeBSD_version >= 800054
 /* Networking core is multiqueue aware. We can manage our own TX
  * queues and use m_pkthdr.flowid.
  */
-#define SFXGE_HAVE_MQ
+#define	SFXGE_HAVE_MQ
 #endif
 #if (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || \
 	__FreeBSD_version >= 900003
-#define SFXGE_HAVE_DESCRIBE_INTR
+#define	SFXGE_HAVE_DESCRIBE_INTR
 #endif
 #ifdef IFM_ETH_RXPAUSE
-#define SFXGE_HAVE_PAUSE_MEDIAOPTS
+#define	SFXGE_HAVE_PAUSE_MEDIAOPTS
 #endif
 #ifndef CTLTYPE_U64
-#define CTLTYPE_U64 CTLTYPE_QUAD
+#define	CTLTYPE_U64 CTLTYPE_QUAD
 #endif
 
 #include "sfxge_rx.h"
 #include "sfxge_tx.h"
 
-#define SFXGE_IP_ALIGN 2
+#define	ROUNDUP_POW_OF_TWO(_n)	(1ULL << flsl((_n) - 1))
 
-#define SFXGE_ETHERTYPE_LOOPBACK        0x9000  /* Xerox loopback */
+#define	SFXGE_IP_ALIGN	2
+
+#define	SFXGE_ETHERTYPE_LOOPBACK	0x9000	/* Xerox loopback */
 
 enum sfxge_evq_state {
 	SFXGE_EVQ_UNINITIALIZED = 0,
@@ -106,6 +108,7 @@ struct sfxge_evq {
 
 	enum sfxge_evq_state	init_state;
 	unsigned int		index;
+	unsigned int		entries;
 	efsys_mem_t		mem;
 	unsigned int		buf_base_id;
 
@@ -121,7 +124,6 @@ struct sfxge_evq {
 	struct sfxge_txq	**txqs;
 };
 
-#define	SFXGE_NEVS	4096
 #define	SFXGE_NDESCS	1024
 #define	SFXGE_MODERATION	30
 
@@ -133,9 +135,9 @@ enum sfxge_intr_state {
 };
 
 struct sfxge_intr_hdl {
-	int                eih_rid;
-	void               *eih_tag;
-	struct resource    *eih_res;
+	int			eih_rid;
+	void			*eih_tag;
+	struct resource		*eih_res;
 };
 
 struct sfxge_intr {
@@ -197,9 +199,10 @@ struct sfxge_softc {
 	device_t			dev;
 	struct sx			softc_lock;
 	enum sfxge_softc_state		init_state;
-	struct ifnet                    *ifnet;
+	struct ifnet			*ifnet;
 	unsigned int			if_flags;
 	struct sysctl_oid		*stats_node;
+	struct sysctl_oid		*txqs_node;
 
 	struct task			task_reset;
 
@@ -209,7 +212,10 @@ struct sfxge_softc {
 	efx_nic_t			*enp;
 	struct mtx			enp_lock;
 
-	bus_dma_tag_t                   parent_dma_tag;
+	unsigned int			rxq_entries;
+	unsigned int			txq_entries;
+
+	bus_dma_tag_t			parent_dma_tag;
 	efsys_bar_t			bar;
 
 	struct sfxge_intr		intr;
@@ -243,8 +249,12 @@ struct sfxge_softc {
 #endif
 };
 
-#define SFXGE_LINK_UP(sc) ((sc)->port.link_mode != EFX_LINK_DOWN)
-#define SFXGE_RUNNING(sc) ((sc)->ifnet->if_drv_flags & IFF_DRV_RUNNING)
+#define	SFXGE_LINK_UP(sc) ((sc)->port.link_mode != EFX_LINK_DOWN)
+#define	SFXGE_RUNNING(sc) ((sc)->ifnet->if_drv_flags & IFF_DRV_RUNNING)
+
+#define	SFXGE_PARAM(_name)	"hw.sfxge." #_name
+
+SYSCTL_DECL(_hw_sfxge);
 
 /*
  * From sfxge.c.
@@ -299,6 +309,6 @@ extern void sfxge_mac_link_update(struct sfxge_softc *sc,
 extern int sfxge_mac_filter_set(struct sfxge_softc *sc);
 extern int sfxge_port_ifmedia_init(struct sfxge_softc *sc);
 
-#define SFXGE_MAX_MTU (9 * 1024)
+#define	SFXGE_MAX_MTU (9 * 1024)
 
 #endif /* _SFXGE_H */
diff --git a/sys/dev/sfxge/sfxge_dma.c b/sys/dev/sfxge/sfxge_dma.c
index 48d02d56192e..e2bf171e35d8 100644
--- a/sys/dev/sfxge/sfxge_dma.c
+++ b/sys/dev/sfxge/sfxge_dma.c
@@ -50,7 +50,7 @@ sfxge_dma_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 
 	addr = arg;
 
-	if (error) {
+	if (error != 0) {
 		*addr = 0;
 		return;
 	}
@@ -82,7 +82,7 @@ sfxge_dma_map_sg_collapse(bus_dma_tag_t tag, bus_dmamap_t map,
 		return (0);
 	}
 #if defined(__i386__) || defined(__amd64__)
-	while (m && seg_count < maxsegs) {
+	while (m != NULL && seg_count < maxsegs) {
 		/*
 		 * firmware doesn't like empty segments
 		 */
@@ -164,11 +164,14 @@ sfxge_dma_alloc(struct sfxge_softc *sc, bus_size_t len, efsys_mem_t *esmp)
 
 	/*
 	 * The callback gets error information about the mapping
-	 * and will have set our vaddr to NULL if something went
+	 * and will have set esm_addr to 0 if something went
 	 * wrong.
 	 */
-	if (vaddr == NULL)
+	if (esmp->esm_addr == 0) {
+		bus_dmamem_free(esmp->esm_tag, esmp->esm_base, esmp->esm_map);
+		bus_dma_tag_destroy(esmp->esm_tag);		
 		return (ENOMEM);
+	}
 
 	esmp->esm_base = vaddr;
 
@@ -197,7 +200,7 @@ sfxge_dma_init(struct sfxge_softc *sc)
 	    BUS_SPACE_MAXSIZE_32BIT,	/* maxsegsize */
 	    0,				/* flags */
 	    NULL, NULL,			/* lock, lockarg */
-	    &sc->parent_dma_tag)) {
+	    &sc->parent_dma_tag) != 0) {
 		device_printf(sc->dev, "Cannot allocate parent DMA tag\n");
 		return (ENOMEM);
 	}
diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c
index 77f0a7460c5b..7c0aa7fdf61d 100644
--- a/sys/dev/sfxge/sfxge_ev.c
+++ b/sys/dev/sfxge/sfxge_ev.c
@@ -102,7 +102,7 @@ sfxge_ev_rx(void *arg, uint32_t label, uint32_t id, uint32_t size,
 	if (rxq->init_state != SFXGE_RXQ_STARTED)
 		goto done;
 
-	expected = rxq->pending++ & (SFXGE_NDESCS - 1);
+	expected = rxq->pending++ & rxq->ptr_mask;
 	if (id != expected) {
 		evq->exception = B_TRUE;
 
@@ -226,7 +226,7 @@ sfxge_get_txq_by_label(struct sfxge_evq *evq, enum sfxge_txq_type label)
 	KASSERT((evq->index == 0 && label < SFXGE_TXQ_NTYPES) ||
 	    (label == SFXGE_TXQ_IP_TCP_UDP_CKSUM), ("unexpected txq label"));
 	index = (evq->index == 0) ? label : (evq->index - 1 + SFXGE_TXQ_NTYPES);
-	return evq->sc->txq[index];
+	return (evq->sc->txq[index]);
 }
 
 static boolean_t
@@ -247,10 +247,10 @@ sfxge_ev_tx(void *arg, uint32_t label, uint32_t id)
 	if (txq->init_state != SFXGE_TXQ_STARTED)
 		goto done;
 
-	stop = (id + 1) & (SFXGE_NDESCS - 1);
-	id = txq->pending & (SFXGE_NDESCS - 1);
+	stop = (id + 1) & txq->ptr_mask;
+	id = txq->pending & txq->ptr_mask;
 
-	delta = (stop >= id) ? (stop - id) : (SFXGE_NDESCS - id + stop);
+	delta = (stop >= id) ? (stop - id) : (txq->entries - id + stop);
 	txq->pending += delta;
 
 	evq->tx_done++;
@@ -443,7 +443,7 @@ sfxge_ev_stat_handler(SYSCTL_HANDLER_ARGS)
 
 	sfxge_ev_stat_update(sc);
 
-	return SYSCTL_OUT(req, &sc->ev_stats[id], sizeof(sc->ev_stats[id]));
+	return (SYSCTL_OUT(req, &sc->ev_stats[id], sizeof(sc->ev_stats[id])));
 }
 
 static void
@@ -493,7 +493,7 @@ sfxge_int_mod_handler(SYSCTL_HANDLER_ARGS)
 
 	sx_xlock(&sc->softc_lock);
 
-	if (req->newptr) {
+	if (req->newptr != NULL) {
 		if ((error = SYSCTL_IN(req, &moderation, sizeof(moderation)))
 		    != 0)
 			goto out;
@@ -520,14 +520,14 @@ sfxge_int_mod_handler(SYSCTL_HANDLER_ARGS)
 out:
 	sx_xunlock(&sc->softc_lock);
 
-	return error;
+	return (error);
 }
 
 static boolean_t
 sfxge_ev_initialized(void *arg)
 {
 	struct sfxge_evq *evq;
-	
+
 	evq = (struct sfxge_evq *)arg;
 
 	KASSERT(evq->init_state == SFXGE_EVQ_STARTING,
@@ -635,7 +635,7 @@ sfxge_ev_qstop(struct sfxge_softc *sc, unsigned int index)
 
 	efx_ev_qdestroy(evq->common);
 	efx_sram_buf_tbl_clear(sc->enp, evq->buf_base_id,
-	    EFX_EVQ_NBUFS(SFXGE_NEVS));
+	    EFX_EVQ_NBUFS(evq->entries));
 	mtx_unlock(&evq->lock);
 }
 
@@ -654,15 +654,15 @@ sfxge_ev_qstart(struct sfxge_softc *sc, unsigned int index)
 	    ("evq->init_state != SFXGE_EVQ_INITIALIZED"));
 
 	/* Clear all events. */
-	(void)memset(esmp->esm_base, 0xff, EFX_EVQ_SIZE(SFXGE_NEVS));
+	(void)memset(esmp->esm_base, 0xff, EFX_EVQ_SIZE(evq->entries));
 
 	/* Program the buffer table. */
 	if ((rc = efx_sram_buf_tbl_set(sc->enp, evq->buf_base_id, esmp,
-	    EFX_EVQ_NBUFS(SFXGE_NEVS))) != 0)
-		return rc;
+	    EFX_EVQ_NBUFS(evq->entries))) != 0)
+		return (rc);
 
 	/* Create the common code event queue. */
-	if ((rc = efx_ev_qcreate(sc->enp, index, esmp, SFXGE_NEVS,
+	if ((rc = efx_ev_qcreate(sc->enp, index, esmp, evq->entries,
 	    evq->buf_base_id, &evq->common)) != 0)
 		goto fail;
 
@@ -705,7 +705,7 @@ sfxge_ev_qstart(struct sfxge_softc *sc, unsigned int index)
 	efx_ev_qdestroy(evq->common);
 fail:
 	efx_sram_buf_tbl_clear(sc->enp, evq->buf_base_id,
-	    EFX_EVQ_NBUFS(SFXGE_NEVS));
+	    EFX_EVQ_NBUFS(evq->entries));
 
 	return (rc);
 }
@@ -746,7 +746,7 @@ sfxge_ev_start(struct sfxge_softc *sc)
 
 	/* Initialize the event module */
 	if ((rc = efx_ev_init(sc->enp)) != 0)
-		return rc;
+		return (rc);
 
 	/* Start the event queues */
 	for (index = 0; index < intr->n_alloc; index++) {
@@ -802,15 +802,31 @@ sfxge_ev_qinit(struct sfxge_softc *sc, unsigned int index)
 	sc->evq[index] = evq;
 	esmp = &evq->mem;
 
+	/* Build an event queue with room for one event per tx and rx buffer,
+	 * plus some extra for link state events and MCDI completions.
+	 * There are three tx queues in the first event queue and one in
+	 * other.
+	 */
+	if (index == 0)
+		evq->entries =
+			ROUNDUP_POW_OF_TWO(sc->rxq_entries +
+					   3 * sc->txq_entries +
+					   128);
+	else
+		evq->entries =
+			ROUNDUP_POW_OF_TWO(sc->rxq_entries +
+					   sc->txq_entries +
+					   128);
+
 	/* Initialise TX completion list */
 	evq->txqs = &evq->txq;
 
 	/* Allocate DMA space. */
-	if ((rc = sfxge_dma_alloc(sc, EFX_EVQ_SIZE(SFXGE_NEVS), esmp)) != 0)
+	if ((rc = sfxge_dma_alloc(sc, EFX_EVQ_SIZE(evq->entries), esmp)) != 0)
 		return (rc);
 
 	/* Allocate buffer table entries. */
-	sfxge_sram_buf_tbl_alloc(sc, EFX_EVQ_NBUFS(SFXGE_NEVS),
+	sfxge_sram_buf_tbl_alloc(sc, EFX_EVQ_NBUFS(evq->entries),
 				 &evq->buf_base_id);
 
 	mtx_init(&evq->lock, "evq", NULL, MTX_DEF);
diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c
index 17f5fcd47dbf..2f40603b1d0e 100644
--- a/sys/dev/sfxge/sfxge_intr.c
+++ b/sys/dev/sfxge/sfxge_intr.c
@@ -70,19 +70,19 @@ sfxge_intr_line_filter(void *arg)
 	    ("intr->type != EFX_INTR_LINE"));
 
 	if (intr->state != SFXGE_INTR_STARTED)
-		return FILTER_STRAY;
+		return (FILTER_STRAY);
 
 	(void)efx_intr_status_line(enp, &fatal, &qmask);
 
 	if (fatal) {
 		(void) efx_intr_disable(enp);
 		(void) efx_intr_fatal(enp);
-		return FILTER_HANDLED;
+		return (FILTER_HANDLED);
 	}
 
 	if (qmask != 0) {
 		intr->zero_count = 0;
-		return FILTER_SCHEDULE_THREAD;
+		return (FILTER_SCHEDULE_THREAD);
 	}
 
 	/* SF bug 15783: If the function is not asserting its IRQ and
@@ -97,13 +97,13 @@ sfxge_intr_line_filter(void *arg)
 	if (intr->zero_count++ == 0) {
 		if (evq->init_state == SFXGE_EVQ_STARTED) {
 			if (efx_ev_qpending(evq->common, evq->read_ptr))
-				return FILTER_SCHEDULE_THREAD;
+				return (FILTER_SCHEDULE_THREAD);
 			efx_ev_qprime(evq->common, evq->read_ptr);
-			return FILTER_HANDLED;
+			return (FILTER_HANDLED);
 		}
 	}
 
-	return FILTER_STRAY;
+	return (FILTER_STRAY);
 }
 
 static void
@@ -175,7 +175,7 @@ sfxge_intr_bus_enable(struct sfxge_softc *sc)
 
 	default:
 		KASSERT(0, ("Invalid interrupt type"));
-		return EINVAL;
+		return (EINVAL);
 	}
 
 	/* Try to add the handlers */
@@ -254,7 +254,7 @@ sfxge_intr_alloc(struct sfxge_softc *sc, int count)
 		table[i].eih_res = res;
 	}
 
-	if (error) {
+	if (error != 0) {
 		count = i - 1;
 		for (i = 0; i < count; i++)
 			bus_release_resource(dev, SYS_RES_IRQ,
@@ -349,7 +349,7 @@ sfxge_intr_setup_msi(struct sfxge_softc *sc)
 	if (count == 0)
 		return (EINVAL);
 
-	if ((error = pci_alloc_msi(dev, &count)) != 0) 
+	if ((error = pci_alloc_msi(dev, &count)) != 0)
 		return (ENOMEM);
 
 	/* Allocate interrupt handler. */
@@ -424,7 +424,7 @@ void
 sfxge_intr_stop(struct sfxge_softc *sc)
 {
 	struct sfxge_intr *intr;
-	
+
 	intr = &sc->intr;
 
 	KASSERT(intr->state == SFXGE_INTR_STARTED,
diff --git a/sys/dev/sfxge/sfxge_port.c b/sys/dev/sfxge/sfxge_port.c
index abd2924f2cd4..6e28d7cac13c 100644
--- a/sys/dev/sfxge/sfxge_port.c
+++ b/sys/dev/sfxge/sfxge_port.c
@@ -74,7 +74,7 @@ sfxge_mac_stat_update(struct sfxge_softc *sc)
 
 		/* Try to update the cached counters */
 		if ((rc = efx_mac_stats_update(sc->enp, esmp,
-                    port->mac_stats.decode_buf, NULL)) != EAGAIN)
+		    port->mac_stats.decode_buf, NULL)) != EAGAIN)
 			goto out;
 
 		DELAY(100);
@@ -83,7 +83,7 @@ sfxge_mac_stat_update(struct sfxge_softc *sc)
 	rc = ETIMEDOUT;
 out:
 	mtx_unlock(&port->lock);
-	return rc;
+	return (rc);
 }
 
 static int
@@ -94,11 +94,11 @@ sfxge_mac_stat_handler(SYSCTL_HANDLER_ARGS)
 	int rc;
 
 	if ((rc = sfxge_mac_stat_update(sc)) != 0)
-		return rc;
+		return (rc);
 
-	return SYSCTL_OUT(req,
+	return (SYSCTL_OUT(req,
 			  (uint64_t *)sc->port.mac_stats.decode_buf + id,
-			  sizeof(uint64_t));
+			  sizeof(uint64_t)));
 }
 
 static void
@@ -130,9 +130,9 @@ sfxge_port_wanted_fc(struct sfxge_softc *sc)
 	struct ifmedia_entry *ifm = sc->media.ifm_cur;
 
 	if (ifm->ifm_media == (IFM_ETHER | IFM_AUTO))
-		return EFX_FCNTL_RESPOND | EFX_FCNTL_GENERATE;
-	return ((ifm->ifm_media & IFM_ETH_RXPAUSE) ? EFX_FCNTL_RESPOND : 0) |
-		((ifm->ifm_media & IFM_ETH_TXPAUSE) ? EFX_FCNTL_GENERATE : 0);
+		return (EFX_FCNTL_RESPOND | EFX_FCNTL_GENERATE);
+	return (((ifm->ifm_media & IFM_ETH_RXPAUSE) ? EFX_FCNTL_RESPOND : 0) |
+		((ifm->ifm_media & IFM_ETH_TXPAUSE) ? EFX_FCNTL_GENERATE : 0));
 }
 
 static unsigned int
@@ -150,13 +150,13 @@ sfxge_port_link_fc_ifm(struct sfxge_softc *sc)
 static unsigned int
 sfxge_port_wanted_fc(struct sfxge_softc *sc)
 {
-	return sc->port.wanted_fc;
+	return (sc->port.wanted_fc);
 }
 
 static unsigned int
 sfxge_port_link_fc_ifm(struct sfxge_softc *sc)
 {
-	return 0;
+	return (0);
 }
 
 static int
@@ -172,7 +172,7 @@ sfxge_port_wanted_fc_handler(SYSCTL_HANDLER_ARGS)
 
 	mtx_lock(&port->lock);
 
-	if (req->newptr) {
+	if (req->newptr != NULL) {
 		if ((error = SYSCTL_IN(req, &fcntl, sizeof(fcntl))) != 0)
 			goto out;
 
@@ -220,14 +220,14 @@ sfxge_port_link_fc_handler(SYSCTL_HANDLER_ARGS)
 
 #endif /* SFXGE_HAVE_PAUSE_MEDIAOPTS */
 
-static const u_long sfxge_link_baudrate[EFX_LINK_NMODES] = {
+static const uint64_t sfxge_link_baudrate[EFX_LINK_NMODES] = {
 	[EFX_LINK_10HDX]	= IF_Mbps(10),
 	[EFX_LINK_10FDX]	= IF_Mbps(10),
 	[EFX_LINK_100HDX]	= IF_Mbps(100),
 	[EFX_LINK_100FDX]	= IF_Mbps(100),
 	[EFX_LINK_1000HDX]	= IF_Gbps(1),
 	[EFX_LINK_1000FDX]	= IF_Gbps(1),
-	[EFX_LINK_10000FDX]	= MIN(IF_Gbps(10ULL), ULONG_MAX),
+	[EFX_LINK_10000FDX]     = IF_Gbps(10),
 };
 
 void
@@ -235,7 +235,7 @@ sfxge_mac_link_update(struct sfxge_softc *sc, efx_link_mode_t mode)
 {
 	struct sfxge_port *port;
 	int link_state;
-	
+
 	port = &sc->port;
 
 	if (port->link_mode == mode)
@@ -289,7 +289,7 @@ sfxge_mac_filter_set_locked(struct sfxge_softc *sc)
 	/* Set promisc-unicast and broadcast filter bits */
 	if ((rc = efx_mac_filter_set(enp, !!(ifp->if_flags & IFF_PROMISC),
 				     B_TRUE)) != 0)
-		return rc;
+		return (rc);
 
 	/* Set multicast hash filter */
 	if (ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) {
@@ -311,7 +311,7 @@ sfxge_mac_filter_set_locked(struct sfxge_softc *sc)
 		}
 		if_maddr_runlock(ifp);
 	}
-	return efx_mac_hash_set(enp, bucket);
+	return (efx_mac_hash_set(enp, bucket));
 }
 
 int
@@ -336,7 +336,7 @@ sfxge_mac_filter_set(struct sfxge_softc *sc)
 	else
 		rc = 0;
 	mtx_unlock(&port->lock);
-	return rc;
+	return (rc);
 }
 
 void
@@ -413,7 +413,7 @@ sfxge_port_start(struct sfxge_softc *sc)
 
 	/* Update MAC stats by DMA every second */
 	if ((rc = efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf,
-            1000, B_FALSE)) != 0)
+	    1000, B_FALSE)) != 0)
 		goto fail2;
 
 	if ((rc = efx_mac_drain(enp, B_FALSE)) != 0)
@@ -435,7 +435,7 @@ sfxge_port_start(struct sfxge_softc *sc)
 	(void)efx_mac_drain(enp, B_TRUE);
 fail3:
 	(void)efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf,
-            0, B_FALSE);
+	    0, B_FALSE);
 fail2:
 	efx_port_fini(sc->enp);
 fail:
@@ -488,7 +488,7 @@ sfxge_phy_stat_update(struct sfxge_softc *sc)
 	rc = ETIMEDOUT;
 out:
 	mtx_unlock(&port->lock);
-	return rc;
+	return (rc);
 }
 
 static int
@@ -499,11 +499,11 @@ sfxge_phy_stat_handler(SYSCTL_HANDLER_ARGS)
 	int rc;
 
 	if ((rc = sfxge_phy_stat_update(sc)) != 0)
-		return rc;
+		return (rc);
 
-	return SYSCTL_OUT(req,
+	return (SYSCTL_OUT(req,
 			  (uint32_t *)sc->port.phy_stats.decode_buf + id,
-			  sizeof(uint32_t));
+			  sizeof(uint32_t)));
 }
 
 static void
@@ -619,7 +619,7 @@ sfxge_port_init(struct sfxge_softc *sc)
 	free(port->phy_stats.decode_buf, M_SFXGE);
 	(void)mtx_destroy(&port->lock);
 	port->sc = NULL;
-	return rc;
+	return (rc);
 }
 
 static int sfxge_link_mode[EFX_PHY_MEDIA_NTYPES][EFX_LINK_NMODES] = {
@@ -697,9 +697,9 @@ sfxge_media_change(struct ifnet *ifp)
 
 	rc = efx_phy_adv_cap_set(sc->enp, ifm->ifm_data);
 out:
-	sx_xunlock(&sc->softc_lock);	
+	sx_xunlock(&sc->softc_lock);
 
-	return rc;
+	return (rc);
 }
 
 int sfxge_port_ifmedia_init(struct sfxge_softc *sc)
@@ -788,7 +788,7 @@ int sfxge_port_ifmedia_init(struct sfxge_softc *sc)
 		best_mode_ifm = mode_ifm;
 	}
 
-	if (best_mode_ifm)
+	if (best_mode_ifm != 0)
 		ifmedia_set(&sc->media, best_mode_ifm);
 
 	/* Now discard port state until interface is started. */
@@ -796,5 +796,5 @@ int sfxge_port_ifmedia_init(struct sfxge_softc *sc)
 out2:
 	efx_nic_fini(sc->enp);
 out:
-	return rc;
+	return (rc);
 }
diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c
index 7209c382edea..66083d832857 100644
--- a/sys/dev/sfxge/sfxge_rx.c
+++ b/sys/dev/sfxge/sfxge_rx.c
@@ -54,8 +54,7 @@ __FBSDID("$FreeBSD$");
 #include "sfxge.h"
 #include "sfxge_rx.h"
 
-#define RX_REFILL_THRESHOLD (EFX_RXQ_LIMIT(SFXGE_NDESCS) * 9 / 10)
-#define RX_REFILL_THRESHOLD_2 (RX_REFILL_THRESHOLD / 2)
+#define	RX_REFILL_THRESHOLD(_entries)	(EFX_RXQ_LIMIT(_entries) * 9 / 10)
 
 /* Size of the LRO hash table.  Must be a power of 2.  A larger table
  * means we can accelerate a larger number of streams.
@@ -87,10 +86,10 @@ static int lro_slow_start_packets = 2000;
 static int lro_loss_packets = 20;
 
 /* Flags for sfxge_lro_conn::l2_id; must not collide with EVL_VLID_MASK */
-#define SFXGE_LRO_L2_ID_VLAN 0x4000
-#define SFXGE_LRO_L2_ID_IPV6 0x8000
-#define SFXGE_LRO_CONN_IS_VLAN_ENCAP(c) ((c)->l2_id & SFXGE_LRO_L2_ID_VLAN)
-#define SFXGE_LRO_CONN_IS_TCPIPV4(c) (!((c)->l2_id & SFXGE_LRO_L2_ID_IPV6))
+#define	SFXGE_LRO_L2_ID_VLAN 0x4000
+#define	SFXGE_LRO_L2_ID_IPV6 0x8000
+#define	SFXGE_LRO_CONN_IS_VLAN_ENCAP(c) ((c)->l2_id & SFXGE_LRO_L2_ID_VLAN)
+#define	SFXGE_LRO_CONN_IS_TCPIPV4(c) (!((c)->l2_id & SFXGE_LRO_L2_ID_IPV6))
 
 /* Compare IPv6 addresses, avoiding conditional branches */
 static __inline unsigned long ipv6_addr_cmp(const struct in6_addr *left,
@@ -179,12 +178,12 @@ static inline struct mbuf *sfxge_rx_alloc_mbuf(struct sfxge_softc *sc)
 	m = (struct mbuf *)uma_zalloc_arg(zone_mbuf, &args, M_NOWAIT);
 
 	/* Allocate (and attach) packet buffer */
-	if (m && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_NOWAIT)) {
+	if (m != NULL && !uma_zalloc_arg(sc->rx_buffer_zone, m, M_NOWAIT)) {
 		uma_zfree(zone_mbuf, m);
 		m = NULL;
 	}
 
-	return m;
+	return (m);
 }
 
 #define	SFXGE_REFILL_BATCH  64
@@ -214,11 +213,11 @@ sfxge_rx_qfill(struct sfxge_rxq *rxq, unsigned int target, boolean_t retrying)
 		return;
 
 	rxfill = rxq->added - rxq->completed;
-	KASSERT(rxfill <= EFX_RXQ_LIMIT(SFXGE_NDESCS),
-	    ("rxfill > EFX_RXQ_LIMIT(SFXGE_NDESCS)"));
-	ntodo = min(EFX_RXQ_LIMIT(SFXGE_NDESCS) - rxfill, target);
-	KASSERT(ntodo <= EFX_RXQ_LIMIT(SFXGE_NDESCS),
-	    ("ntodo > EFX_RQX_LIMIT(SFXGE_NDESCS)"));
+	KASSERT(rxfill <= EFX_RXQ_LIMIT(rxq->entries),
+	    ("rxfill > EFX_RXQ_LIMIT(rxq->entries)"));
+	ntodo = min(EFX_RXQ_LIMIT(rxq->entries) - rxfill, target);
+	KASSERT(ntodo <= EFX_RXQ_LIMIT(rxq->entries),
+	    ("ntodo > EFX_RQX_LIMIT(rxq->entries)"));
 
 	if (ntodo == 0)
 		return;
@@ -231,7 +230,7 @@ sfxge_rx_qfill(struct sfxge_rxq *rxq, unsigned int target, boolean_t retrying)
 		bus_dma_segment_t seg;
 		struct mbuf *m;
 
-		id = (rxq->added + batch) & (SFXGE_NDESCS - 1);
+		id = (rxq->added + batch) & rxq->ptr_mask;
 		rx_desc = &rxq->queue[id];
 		KASSERT(rx_desc->mbuf == NULL, ("rx_desc->mbuf != NULL"));
 
@@ -274,7 +273,7 @@ sfxge_rx_qrefill(struct sfxge_rxq *rxq)
 		return;
 
 	/* Make sure the queue is full */
-	sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(SFXGE_NDESCS), B_TRUE);
+	sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(rxq->entries), B_TRUE);
 }
 
 static void __sfxge_rx_deliver(struct sfxge_softc *sc, struct mbuf *m)
@@ -370,7 +369,7 @@ static void sfxge_lro_drop(struct sfxge_rxq *rxq, struct sfxge_lro_conn *c)
 
 	KASSERT(!c->mbuf, ("found orphaned mbuf"));
 
-	if (c->next_buf.mbuf) {
+	if (c->next_buf.mbuf != NULL) {
 		sfxge_rx_deliver(rxq->sc, &c->next_buf);
 		LIST_REMOVE(c, active_link);
 	}
@@ -510,7 +509,7 @@ sfxge_lro_try_merge(struct sfxge_rxq *rxq, struct sfxge_lro_conn *c)
 
 	if (__predict_false(th_seq != c->next_seq)) {
 		/* Out-of-order, so start counting again. */
-		if (c->mbuf)
+		if (c->mbuf != NULL)
 			sfxge_lro_deliver(&rxq->lro, c);
 		c->n_in_order_pkts -= lro_loss_packets;
 		c->next_seq = th_seq + data_length;
@@ -522,10 +521,10 @@ sfxge_lro_try_merge(struct sfxge_rxq *rxq, struct sfxge_lro_conn *c)
 	now = ticks;
 	if (now - c->last_pkt_ticks > lro_idle_ticks) {
 		++rxq->lro.n_drop_idle;
-		if (c->mbuf)
+		if (c->mbuf != NULL)
 			sfxge_lro_deliver(&rxq->lro, c);
 		sfxge_lro_drop(rxq, c);
-		return 0;
+		return (0);
 	}
 	c->last_pkt_ticks = ticks;
 
@@ -537,12 +536,12 @@ sfxge_lro_try_merge(struct sfxge_rxq *rxq, struct sfxge_lro_conn *c)
 	}
 
 	if (__predict_false(dont_merge)) {
-		if (c->mbuf)
+		if (c->mbuf != NULL)
 			sfxge_lro_deliver(&rxq->lro, c);
 		if (th->th_flags & (TH_FIN | TH_RST)) {
 			++rxq->lro.n_drop_closed;
 			sfxge_lro_drop(rxq, c);
-			return 0;
+			return (0);
 		}
 		goto deliver_buf_out;
 	}
@@ -563,11 +562,11 @@ sfxge_lro_try_merge(struct sfxge_rxq *rxq, struct sfxge_lro_conn *c)
 	}
 
 	rx_buf->mbuf = NULL;
-	return 1;
+	return (1);
 
  deliver_buf_out:
 	sfxge_rx_deliver(rxq->sc, rx_buf);
-	return 1;
+	return (1);
 }
 
 static void sfxge_lro_new_conn(struct sfxge_lro_state *st, uint32_t conn_hash,
@@ -621,7 +620,7 @@ sfxge_lro(struct sfxge_rxq *rxq, struct sfxge_rx_sw_desc *rx_buf)
 	struct sfxge_lro_conn *c;
 	uint16_t l2_id;
 	uint16_t l3_proto;
-        void *nh;
+	void *nh;
 	struct tcphdr *th;
 	uint32_t conn_hash;
 	unsigned bucket;
@@ -671,7 +670,7 @@ sfxge_lro(struct sfxge_rxq *rxq, struct sfxge_rx_sw_desc *rx_buf)
 			continue;
 		if ((c->source - th->th_sport) | (c->dest - th->th_dport))
 			continue;
-		if (c->mbuf) {
+		if (c->mbuf != NULL) {
 			if (SFXGE_LRO_CONN_IS_TCPIPV4(c)) {
 				struct ip *c_iph, *iph = nh;
 				c_iph = c->nh;
@@ -691,7 +690,7 @@ sfxge_lro(struct sfxge_rxq *rxq, struct sfxge_rx_sw_desc *rx_buf)
 		TAILQ_REMOVE(&rxq->lro.conns[bucket], c, link);
 		TAILQ_INSERT_HEAD(&rxq->lro.conns[bucket], c, link);
 
-		if (c->next_buf.mbuf) {
+		if (c->next_buf.mbuf != NULL) {
 			if (!sfxge_lro_try_merge(rxq, c))
 				goto deliver_now;
 		} else {
@@ -720,10 +719,10 @@ static void sfxge_lro_end_of_burst(struct sfxge_rxq *rxq)
 
 	while (!LIST_EMPTY(&st->active_conns)) {
 		c = LIST_FIRST(&st->active_conns);
-		if (!c->delivered && c->mbuf)
+		if (!c->delivered && c->mbuf != NULL)
 			sfxge_lro_deliver(st, c);
 		if (sfxge_lro_try_merge(rxq, c)) {
-			if (c->mbuf)
+			if (c->mbuf != NULL)
 				sfxge_lro_deliver(st, c);
 			LIST_REMOVE(c, active_link);
 		}
@@ -757,7 +756,7 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq, boolean_t eop)
 		unsigned int id;
 		struct sfxge_rx_sw_desc *rx_desc;
 
-		id = completed++ & (SFXGE_NDESCS - 1);
+		id = completed++ & rxq->ptr_mask;
 		rx_desc = &rxq->queue[id];
 		m = rx_desc->mbuf;
 
@@ -821,8 +820,8 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq, boolean_t eop)
 		sfxge_lro_end_of_burst(rxq);
 
 	/* Top up the queue if necessary */
-	if (level < RX_REFILL_THRESHOLD)
-		sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(SFXGE_NDESCS), B_FALSE);
+	if (level < rxq->refill_threshold)
+		sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(rxq->entries), B_FALSE);
 }
 
 static void
@@ -836,7 +835,7 @@ sfxge_rx_qstop(struct sfxge_softc *sc, unsigned int index)
 	evq = sc->evq[index];
 
 	mtx_lock(&evq->lock);
-	
+
 	KASSERT(rxq->init_state == SFXGE_RXQ_STARTED,
 	    ("rxq not started"));
 
@@ -881,10 +880,10 @@ sfxge_rx_qstop(struct sfxge_softc *sc, unsigned int index)
 	rxq->loopback = 0;
 
 	/* Destroy the common code receive queue. */
-	efx_rx_qdestroy(rxq->common);	
+	efx_rx_qdestroy(rxq->common);
 
 	efx_sram_buf_tbl_clear(sc->enp, rxq->buf_base_id,
-	    EFX_RXQ_NBUFS(SFXGE_NDESCS));
+	    EFX_RXQ_NBUFS(sc->rxq_entries));
 
 	mtx_unlock(&evq->lock);
 }
@@ -908,12 +907,12 @@ sfxge_rx_qstart(struct sfxge_softc *sc, unsigned int index)
 
 	/* Program the buffer table. */
 	if ((rc = efx_sram_buf_tbl_set(sc->enp, rxq->buf_base_id, esmp,
-	    EFX_RXQ_NBUFS(SFXGE_NDESCS))) != 0)
-		return rc;
+	    EFX_RXQ_NBUFS(sc->rxq_entries))) != 0)
+		return (rc);
 
 	/* Create the common code receive queue. */
 	if ((rc = efx_rx_qcreate(sc->enp, index, index, EFX_RXQ_TYPE_DEFAULT,
-	    esmp, SFXGE_NDESCS, rxq->buf_base_id, evq->common,
+	    esmp, sc->rxq_entries, rxq->buf_base_id, evq->common,
 	    &rxq->common)) != 0)
 		goto fail;
 
@@ -925,7 +924,7 @@ sfxge_rx_qstart(struct sfxge_softc *sc, unsigned int index)
 	rxq->init_state = SFXGE_RXQ_STARTED;
 
 	/* Try to fill the queue from the pool. */
-	sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(SFXGE_NDESCS), B_FALSE);
+	sfxge_rx_qfill(rxq, EFX_RXQ_LIMIT(sc->rxq_entries), B_FALSE);
 
 	mtx_unlock(&evq->lock);
 
@@ -933,8 +932,8 @@ sfxge_rx_qstart(struct sfxge_softc *sc, unsigned int index)
 
 fail:
 	efx_sram_buf_tbl_clear(sc->enp, rxq->buf_base_id,
-	    EFX_RXQ_NBUFS(SFXGE_NDESCS));
-	return rc;
+	    EFX_RXQ_NBUFS(sc->rxq_entries));
+	return (rc);
 }
 
 void
@@ -1105,6 +1104,9 @@ sfxge_rx_qinit(struct sfxge_softc *sc, unsigned int index)
 	rxq = malloc(sizeof(struct sfxge_rxq), M_SFXGE, M_ZERO | M_WAITOK);
 	rxq->sc = sc;
 	rxq->index = index;
+	rxq->entries = sc->rxq_entries;
+	rxq->ptr_mask = rxq->entries - 1;
+	rxq->refill_threshold = RX_REFILL_THRESHOLD(rxq->entries);
 
 	sc->rxq[index] = rxq;
 	esmp = &rxq->mem;
@@ -1112,16 +1114,16 @@ sfxge_rx_qinit(struct sfxge_softc *sc, unsigned int index)
 	evq = sc->evq[index];
 
 	/* Allocate and zero DMA space. */
-	if ((rc = sfxge_dma_alloc(sc, EFX_RXQ_SIZE(SFXGE_NDESCS), esmp)) != 0)
+	if ((rc = sfxge_dma_alloc(sc, EFX_RXQ_SIZE(sc->rxq_entries), esmp)) != 0)
 		return (rc);
-	(void)memset(esmp->esm_base, 0, EFX_RXQ_SIZE(SFXGE_NDESCS));
+	(void)memset(esmp->esm_base, 0, EFX_RXQ_SIZE(sc->rxq_entries));
 
 	/* Allocate buffer table entries. */
-	sfxge_sram_buf_tbl_alloc(sc, EFX_RXQ_NBUFS(SFXGE_NDESCS),
+	sfxge_sram_buf_tbl_alloc(sc, EFX_RXQ_NBUFS(sc->rxq_entries),
 				 &rxq->buf_base_id);
 
 	/* Allocate the context array and the flow table. */
-	rxq->queue = malloc(sizeof(struct sfxge_rx_sw_desc) * SFXGE_NDESCS,
+	rxq->queue = malloc(sizeof(struct sfxge_rx_sw_desc) * sc->rxq_entries,
 	    M_SFXGE, M_WAITOK | M_ZERO);
 	sfxge_lro_init(rxq);
 
@@ -1136,7 +1138,7 @@ static const struct {
 	const char *name;
 	size_t offset;
 } sfxge_rx_stats[] = {
-#define SFXGE_RX_STAT(name, member) \
+#define	SFXGE_RX_STAT(name, member) \
 	{ #name, offsetof(struct sfxge_rxq, member) }
 	SFXGE_RX_STAT(lro_merges, lro.n_merges),
 	SFXGE_RX_STAT(lro_bursts, lro.n_bursts),
@@ -1161,7 +1163,7 @@ sfxge_rx_stat_handler(SYSCTL_HANDLER_ARGS)
 		sum += *(unsigned int *)((caddr_t)sc->rxq[index] +
 					 sfxge_rx_stats[id].offset);
 
-	return SYSCTL_OUT(req, &sum, sizeof(sum));
+	return (SYSCTL_OUT(req, &sum, sizeof(sum)));
 }
 
 static void
diff --git a/sys/dev/sfxge/sfxge_rx.h b/sys/dev/sfxge/sfxge_rx.h
index 5a80fdbc054c..4b3e73a97d20 100644
--- a/sys/dev/sfxge/sfxge_rx.h
+++ b/sys/dev/sfxge/sfxge_rx.h
@@ -30,25 +30,25 @@
  */
 
 #ifndef _SFXGE_RX_H
-#define _SFXGE_RX_H
+#define	_SFXGE_RX_H
 
-#define SFXGE_MAGIC_RESERVED    0x8000
+#define	SFXGE_MAGIC_RESERVED	0x8000
 
-#define SFXGE_MAGIC_DMAQ_LABEL_WIDTH  6
-#define SFXGE_MAGIC_DMAQ_LABEL_MASK   \
-        ((1 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH) - 1)
+#define	SFXGE_MAGIC_DMAQ_LABEL_WIDTH	6
+#define	SFXGE_MAGIC_DMAQ_LABEL_MASK					\
+	((1 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH) - 1)
 
-#define SFXGE_MAGIC_RX_QFLUSH_DONE                                      \
-        (SFXGE_MAGIC_RESERVED | (1 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
+#define	SFXGE_MAGIC_RX_QFLUSH_DONE					\
+	(SFXGE_MAGIC_RESERVED | (1 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
 
-#define SFXGE_MAGIC_RX_QFLUSH_FAILED                                    \
-        (SFXGE_MAGIC_RESERVED | (2 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
+#define	SFXGE_MAGIC_RX_QFLUSH_FAILED					\
+	(SFXGE_MAGIC_RESERVED | (2 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
 
-#define SFXGE_MAGIC_RX_QREFILL                                          \
-        (SFXGE_MAGIC_RESERVED | (3 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
+#define	SFXGE_MAGIC_RX_QREFILL						\
+	(SFXGE_MAGIC_RESERVED | (3 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
 
-#define SFXGE_MAGIC_TX_QFLUSH_DONE                                      \
-        (SFXGE_MAGIC_RESERVED | (4 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
+#define	SFXGE_MAGIC_TX_QFLUSH_DONE					\
+	(SFXGE_MAGIC_RESERVED | (4 << SFXGE_MAGIC_DMAQ_LABEL_WIDTH))
 
 #define	SFXGE_RX_SCALE_MAX	EFX_MAXRSS
 
@@ -159,6 +159,8 @@ struct sfxge_rxq {
 	efsys_mem_t			mem;
 	unsigned int			buf_base_id;
 	enum sfxge_rxq_state		init_state;
+	unsigned int			entries;
+	unsigned int			ptr_mask;
 
 	struct sfxge_rx_sw_desc		*queue __aligned(CACHE_LINE_SIZE);
 	unsigned int			added;
@@ -166,6 +168,7 @@ struct sfxge_rxq {
 	unsigned int			completed;
 	unsigned int			loopback;
 	struct sfxge_lro_state		lro;
+	unsigned int			refill_threshold;
 	struct callout			refill_callout;
 	unsigned int			refill_delay;
 
diff --git a/sys/dev/sfxge/sfxge_tx.c b/sys/dev/sfxge/sfxge_tx.c
index 20f6f87dc28b..a12c74756ea5 100644
--- a/sys/dev/sfxge/sfxge_tx.c
+++ b/sys/dev/sfxge/sfxge_tx.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/smp.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
+#include <sys/syslog.h>
 
 #include <net/bpf.h>
 #include <net/ethernet.h>
@@ -74,8 +75,27 @@ __FBSDID("$FreeBSD$");
  * the output at a packet boundary.  Allow for a reasonable
  * minimum MSS of 512.
  */
-#define SFXGE_TSO_MAX_DESC ((65535 / 512) * 2 + SFXGE_TX_MAPPING_MAX_SEG - 1)
-#define SFXGE_TXQ_BLOCK_LEVEL (SFXGE_NDESCS - SFXGE_TSO_MAX_DESC)
+#define	SFXGE_TSO_MAX_DESC ((65535 / 512) * 2 + SFXGE_TX_MAPPING_MAX_SEG - 1)
+#define	SFXGE_TXQ_BLOCK_LEVEL(_entries)	((_entries) - SFXGE_TSO_MAX_DESC)
+
+#ifdef SFXGE_HAVE_MQ
+
+#define	SFXGE_PARAM_TX_DPL_GET_MAX	SFXGE_PARAM(tx_dpl_get_max)
+static int sfxge_tx_dpl_get_max = SFXGE_TX_DPL_GET_PKT_LIMIT_DEFAULT;
+TUNABLE_INT(SFXGE_PARAM_TX_DPL_GET_MAX, &sfxge_tx_dpl_get_max);
+SYSCTL_INT(_hw_sfxge, OID_AUTO, tx_dpl_get_max, CTLFLAG_RDTUN,
+	   &sfxge_tx_dpl_get_max, 0,
+	   "Maximum number of packets in deferred packet get-list");
+
+#define	SFXGE_PARAM_TX_DPL_PUT_MAX	SFXGE_PARAM(tx_dpl_put_max)
+static int sfxge_tx_dpl_put_max = SFXGE_TX_DPL_PUT_PKT_LIMIT_DEFAULT;
+TUNABLE_INT(SFXGE_PARAM_TX_DPL_PUT_MAX, &sfxge_tx_dpl_put_max);
+SYSCTL_INT(_hw_sfxge, OID_AUTO, tx_dpl_put_max, CTLFLAG_RDTUN,
+	   &sfxge_tx_dpl_put_max, 0,
+	   "Maximum number of packets in deferred packet put-list");
+
+#endif
+
 
 /* Forward declarations. */
 static inline void sfxge_tx_qdpl_service(struct sfxge_txq *txq);
@@ -101,7 +121,7 @@ sfxge_tx_qcomplete(struct sfxge_txq *txq)
 		struct sfxge_tx_mapping *stmp;
 		unsigned int id;
 
-		id = completed++ & (SFXGE_NDESCS - 1);
+		id = completed++ & txq->ptr_mask;
 
 		stmp = &txq->stmp[id];
 		if (stmp->flags & TX_BUF_UNMAP) {
@@ -125,7 +145,7 @@ sfxge_tx_qcomplete(struct sfxge_txq *txq)
 		unsigned int level;
 
 		level = txq->added - txq->completed;
-		if (level <= SFXGE_TXQ_UNBLOCK_LEVEL)
+		if (level <= SFXGE_TXQ_UNBLOCK_LEVEL(txq->entries))
 			sfxge_tx_qunblock(txq);
 	}
 }
@@ -176,7 +196,7 @@ sfxge_tx_qdpl_swizzle(struct sfxge_txq *txq)
 	KASSERT(*get_tailp == NULL, ("*get_tailp != NULL"));
 	*stdp->std_getp = get_next;
 	stdp->std_getp = get_tailp;
-	stdp->std_count += count;
+	stdp->std_get_count += count;
 }
 
 #endif /* SFXGE_HAVE_MQ */
@@ -218,19 +238,19 @@ sfxge_tx_qlist_post(struct sfxge_txq *txq)
 		("efx_tx_qpost() refragmented descriptors"));
 
 	level = txq->added - txq->reaped;
-	KASSERT(level <= SFXGE_NDESCS, ("overfilled TX queue"));
+	KASSERT(level <= txq->entries, ("overfilled TX queue"));
 
 	/* Clear the fragment list. */
 	txq->n_pend_desc = 0;
 
 	/* Have we reached the block level? */
-	if (level < SFXGE_TXQ_BLOCK_LEVEL)
+	if (level < SFXGE_TXQ_BLOCK_LEVEL(txq->entries))
 		return;
 
 	/* Reap, and check again */
 	sfxge_tx_qreap(txq);
 	level = txq->added - txq->reaped;
-	if (level < SFXGE_TXQ_BLOCK_LEVEL)
+	if (level < SFXGE_TXQ_BLOCK_LEVEL(txq->entries))
 		return;
 
 	txq->blocked = 1;
@@ -242,7 +262,7 @@ sfxge_tx_qlist_post(struct sfxge_txq *txq)
 	mb();
 	sfxge_tx_qreap(txq);
 	level = txq->added - txq->reaped;
-	if (level < SFXGE_TXQ_BLOCK_LEVEL) {
+	if (level < SFXGE_TXQ_BLOCK_LEVEL(txq->entries)) {
 		mb();
 		txq->blocked = 0;
 	}
@@ -271,7 +291,7 @@ static int sfxge_tx_queue_mbuf(struct sfxge_txq *txq, struct mbuf *mbuf)
 	}
 
 	/* Load the packet for DMA. */
-	id = txq->added & (SFXGE_NDESCS - 1);
+	id = txq->added & txq->ptr_mask;
 	stmp = &txq->stmp[id];
 	rc = bus_dmamap_load_mbuf_sg(txq->packet_dma_tag, stmp->map,
 				     mbuf, dma_seg, &n_dma_seg, 0);
@@ -318,7 +338,7 @@ static int sfxge_tx_queue_mbuf(struct sfxge_txq *txq, struct mbuf *mbuf)
 
 			stmp->flags = 0;
 			if (__predict_false(stmp ==
-					    &txq->stmp[SFXGE_NDESCS - 1]))
+					    &txq->stmp[txq->ptr_mask]))
 				stmp = &txq->stmp[0];
 			else
 				stmp++;
@@ -343,7 +363,7 @@ static int sfxge_tx_queue_mbuf(struct sfxge_txq *txq, struct mbuf *mbuf)
 	/* Post the fragment list. */
 	sfxge_tx_qlist_post(txq);
 
-	return 0;
+	return (0);
 
 reject_mapped:
 	bus_dmamap_unload(txq->packet_dma_tag, *used_map);
@@ -352,7 +372,7 @@ static int sfxge_tx_queue_mbuf(struct sfxge_txq *txq, struct mbuf *mbuf)
 	m_freem(mbuf);
 	++txq->drops;
 
-	return rc;
+	return (rc);
 }
 
 #ifdef SFXGE_HAVE_MQ
@@ -380,7 +400,7 @@ sfxge_tx_qdpl_drain(struct sfxge_txq *txq)
 	prefetch_read_many(txq->common);
 
 	mbuf = stdp->std_get;
-	count = stdp->std_count;
+	count = stdp->std_get_count;
 
 	while (count != 0) {
 		KASSERT(mbuf != NULL, ("mbuf == NULL"));
@@ -412,22 +432,22 @@ sfxge_tx_qdpl_drain(struct sfxge_txq *txq)
 	if (count == 0) {
 		KASSERT(mbuf == NULL, ("mbuf != NULL"));
 		stdp->std_get = NULL;
-		stdp->std_count = 0;
+		stdp->std_get_count = 0;
 		stdp->std_getp = &stdp->std_get;
 	} else {
 		stdp->std_get = mbuf;
-		stdp->std_count = count;
+		stdp->std_get_count = count;
 	}
 
 	if (txq->added != pushed)
 		efx_tx_qpush(txq->common, txq->added);
 
-	KASSERT(txq->blocked || stdp->std_count == 0,
+	KASSERT(txq->blocked || stdp->std_get_count == 0,
 		("queue unblocked but count is non-zero"));
 }
 
-#define SFXGE_TX_QDPL_PENDING(_txq)					\
-    ((_txq)->dpl.std_put != 0)
+#define	SFXGE_TX_QDPL_PENDING(_txq)					\
+	((_txq)->dpl.std_put != 0)
 
 /*
  * Service the deferred packet list.
@@ -476,12 +496,12 @@ sfxge_tx_qdpl_put(struct sfxge_txq *txq, struct mbuf *mbuf, int locked)
 
 		sfxge_tx_qdpl_swizzle(txq);
 
-		if (stdp->std_count >= SFXGE_TX_DPL_GET_PKT_LIMIT_DEFAULT)
+		if (stdp->std_get_count >= stdp->std_get_max)
 			return (ENOBUFS);
 
 		*(stdp->std_getp) = mbuf;
 		stdp->std_getp = &mbuf->m_nextpkt;
-		stdp->std_count++;
+		stdp->std_get_count++;
 	} else {
 		volatile uintptr_t *putp;
 		uintptr_t old;
@@ -493,12 +513,12 @@ sfxge_tx_qdpl_put(struct sfxge_txq *txq, struct mbuf *mbuf, int locked)
 
 		do {
 			old = *putp;
-			if (old) {
+			if (old != 0) {
 				struct mbuf *mp = (struct mbuf *)old;
 				old_len = mp->m_pkthdr.csum_data;
 			} else
 				old_len = 0;
-			if (old_len >= SFXGE_TX_DPL_PUT_PKT_LIMIT_DEFAULT)
+			if (old_len >= stdp->std_put_max)
 				return (ENOBUFS);
 			mbuf->m_pkthdr.csum_data = old_len + 1;
 			mbuf->m_nextpkt = (void *)old;
@@ -559,7 +579,6 @@ sfxge_tx_packet_add(struct sfxge_txq *txq, struct mbuf *m)
 	m_freem(m);
 	atomic_add_long(&txq->early_drops, 1);
 	return (rc);
-	
 }
 
 static void
@@ -576,8 +595,8 @@ sfxge_tx_qdpl_flush(struct sfxge_txq *txq)
 		m_freem(mbuf);
 	}
 	stdp->std_get = NULL;
-	stdp->std_count = 0;
-	stdp->std_getp = &stdp->std_get;	
+	stdp->std_get_count = 0;
+	stdp->std_getp = &stdp->std_get;
 
 	mtx_unlock(&txq->lock);
 }
@@ -599,7 +618,7 @@ sfxge_if_qflush(struct ifnet *ifp)
  */
 int
 sfxge_if_transmit(struct ifnet *ifp, struct mbuf *m)
-{	
+{
 	struct sfxge_softc *sc;
 	struct sfxge_txq *txq;
 	int rc;
@@ -652,7 +671,7 @@ static void sfxge_if_start_locked(struct ifnet *ifp)
 	}
 
 	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
-                IFQ_DRV_DEQUEUE(&ifp->if_snd, mbuf);
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, mbuf);
 		if (mbuf == NULL)
 			break;
 
@@ -757,47 +776,49 @@ static inline const struct tcphdr *tso_tcph(const struct sfxge_tso_state *tso)
 /* Size of preallocated TSO header buffers.  Larger blocks must be
  * allocated from the heap.
  */
-#define TSOH_STD_SIZE	128
+#define	TSOH_STD_SIZE	128
 
 /* At most half the descriptors in the queue at any time will refer to
  * a TSO header buffer, since they must always be followed by a
  * payload descriptor referring to an mbuf.
  */
-#define TSOH_COUNT	(SFXGE_NDESCS / 2u)
-#define TSOH_PER_PAGE	(PAGE_SIZE / TSOH_STD_SIZE)
-#define TSOH_PAGE_COUNT	((TSOH_COUNT + TSOH_PER_PAGE - 1) / TSOH_PER_PAGE)
+#define	TSOH_COUNT(_txq_entries)	((_txq_entries) / 2u)
+#define	TSOH_PER_PAGE	(PAGE_SIZE / TSOH_STD_SIZE)
+#define	TSOH_PAGE_COUNT(_txq_entries)	\
+	((TSOH_COUNT(_txq_entries) + TSOH_PER_PAGE - 1) / TSOH_PER_PAGE)
 
 static int tso_init(struct sfxge_txq *txq)
 {
 	struct sfxge_softc *sc = txq->sc;
+	unsigned int tsoh_page_count = TSOH_PAGE_COUNT(sc->txq_entries);
 	int i, rc;
 
 	/* Allocate TSO header buffers */
-	txq->tsoh_buffer = malloc(TSOH_PAGE_COUNT * sizeof(txq->tsoh_buffer[0]),
+	txq->tsoh_buffer = malloc(tsoh_page_count * sizeof(txq->tsoh_buffer[0]),
 				  M_SFXGE, M_WAITOK);
 
-	for (i = 0; i < TSOH_PAGE_COUNT; i++) {
+	for (i = 0; i < tsoh_page_count; i++) {
 		rc = sfxge_dma_alloc(sc, PAGE_SIZE, &txq->tsoh_buffer[i]);
-		if (rc)
+		if (rc != 0)
 			goto fail;
 	}
 
-	return 0;
+	return (0);
 
 fail:
 	while (i-- > 0)
 		sfxge_dma_free(&txq->tsoh_buffer[i]);
 	free(txq->tsoh_buffer, M_SFXGE);
 	txq->tsoh_buffer = NULL;
-	return rc;
+	return (rc);
 }
 
 static void tso_fini(struct sfxge_txq *txq)
 {
 	int i;
 
-	if (txq->tsoh_buffer) {
-		for (i = 0; i < TSOH_PAGE_COUNT; i++)
+	if (txq->tsoh_buffer != NULL) {
+		for (i = 0; i < TSOH_PAGE_COUNT(txq->sc->txq_entries); i++)
 			sfxge_dma_free(&txq->tsoh_buffer[i]);
 		free(txq->tsoh_buffer, M_SFXGE);
 	}
@@ -925,7 +946,7 @@ static int tso_start_new_packet(struct sfxge_txq *txq,
 		/* We cannot use bus_dmamem_alloc() as that may sleep */
 		header = malloc(tso->header_len, M_SFXGE, M_NOWAIT);
 		if (__predict_false(!header))
-			return ENOMEM;     
+			return (ENOMEM);
 		rc = bus_dmamap_load(txq->packet_dma_tag, stmp->map,
 				     header, tso->header_len,
 				     tso_map_long_header, &dma_addr,
@@ -938,7 +959,7 @@ static int tso_start_new_packet(struct sfxge_txq *txq,
 				rc = EINVAL;
 			}
 			free(header, M_SFXGE);
-			return rc;
+			return (rc);
 		}
 		map = stmp->map;
 
@@ -987,7 +1008,7 @@ static int tso_start_new_packet(struct sfxge_txq *txq,
 	desc->eb_size = tso->header_len;
 	desc->eb_eop = 0;
 
-	return 0;
+	return (0);
 }
 
 static int
@@ -1011,12 +1032,12 @@ sfxge_tx_queue_tso(struct sfxge_txq *txq, struct mbuf *mbuf,
 		tso.dma_addr = dma_seg->ds_addr + tso.header_len;
 	}
 
-	id = txq->added & (SFXGE_NDESCS - 1);
+	id = txq->added & txq->ptr_mask;
 	if (__predict_false(tso_start_new_packet(txq, &tso, id)))
-		return -1;
+		return (-1);
 
 	while (1) {
-		id = (id + 1) & (SFXGE_NDESCS - 1);
+		id = (id + 1) & txq->ptr_mask;
 		tso_fill_packet_with_fragment(txq, &tso);
 
 		/* Move onto the next fragment? */
@@ -1039,7 +1060,7 @@ sfxge_tx_queue_tso(struct sfxge_txq *txq, struct mbuf *mbuf,
 			if (txq->n_pend_desc >
 			    SFXGE_TSO_MAX_DESC - (1 + SFXGE_TX_MAPPING_MAX_SEG))
 				break;
-			next_id = (id + 1) & (SFXGE_NDESCS - 1);
+			next_id = (id + 1) & txq->ptr_mask;
 			if (__predict_false(tso_start_new_packet(txq, &tso,
 								 next_id)))
 				break;
@@ -1048,7 +1069,7 @@ sfxge_tx_queue_tso(struct sfxge_txq *txq, struct mbuf *mbuf,
 	}
 
 	txq->tso_bursts++;
-	return id;
+	return (id);
 }
 
 static void
@@ -1071,7 +1092,7 @@ sfxge_tx_qunblock(struct sfxge_txq *txq)
 		unsigned int level;
 
 		level = txq->added - txq->completed;
-		if (level <= SFXGE_TXQ_UNBLOCK_LEVEL)
+		if (level <= SFXGE_TXQ_UNBLOCK_LEVEL(txq->entries))
 			txq->blocked = 0;
 	}
 
@@ -1147,7 +1168,7 @@ sfxge_tx_qstop(struct sfxge_softc *sc, unsigned int index)
 	txq->common = NULL;
 
 	efx_sram_buf_tbl_clear(sc->enp, txq->buf_base_id,
-	    EFX_TXQ_NBUFS(SFXGE_NDESCS));
+	    EFX_TXQ_NBUFS(sc->txq_entries));
 
 	mtx_unlock(&evq->lock);
 	mtx_unlock(SFXGE_TXQ_LOCK(txq));
@@ -1173,8 +1194,8 @@ sfxge_tx_qstart(struct sfxge_softc *sc, unsigned int index)
 
 	/* Program the buffer table. */
 	if ((rc = efx_sram_buf_tbl_set(sc->enp, txq->buf_base_id, esmp,
-	    EFX_TXQ_NBUFS(SFXGE_NDESCS))) != 0)
-		return rc;
+	    EFX_TXQ_NBUFS(sc->txq_entries))) != 0)
+		return (rc);
 
 	/* Determine the kind of queue we are creating. */
 	switch (txq->type) {
@@ -1195,12 +1216,12 @@ sfxge_tx_qstart(struct sfxge_softc *sc, unsigned int index)
 
 	/* Create the common code transmit queue. */
 	if ((rc = efx_tx_qcreate(sc->enp, index, txq->type, esmp,
-	    SFXGE_NDESCS, txq->buf_base_id, flags, evq->common,
+	    sc->txq_entries, txq->buf_base_id, flags, evq->common,
 	    &txq->common)) != 0)
 		goto fail;
 
 	mtx_lock(SFXGE_TXQ_LOCK(txq));
-	
+
 	/* Enable the transmit queue. */
 	efx_tx_qenable(txq->common);
 
@@ -1212,8 +1233,8 @@ sfxge_tx_qstart(struct sfxge_softc *sc, unsigned int index)
 
 fail:
 	efx_sram_buf_tbl_clear(sc->enp, txq->buf_base_id,
-	    EFX_TXQ_NBUFS(SFXGE_NDESCS));
-	return rc;
+	    EFX_TXQ_NBUFS(sc->txq_entries));
+	return (rc);
 }
 
 void
@@ -1229,7 +1250,7 @@ sfxge_tx_stop(struct sfxge_softc *sc)
 	sfxge_tx_qstop(sc, SFXGE_TXQ_IP_CKSUM);
 
 	encp = efx_nic_cfg_get(sc->enp);
-        sfxge_tx_qstop(sc, SFXGE_TXQ_NON_CKSUM);
+	sfxge_tx_qstop(sc, SFXGE_TXQ_NON_CKSUM);
 
 	/* Tear down the transmit module */
 	efx_tx_fini(sc->enp);
@@ -1266,7 +1287,7 @@ sfxge_tx_start(struct sfxge_softc *sc)
 	sfxge_tx_qstop(sc, SFXGE_TXQ_IP_CKSUM);
 
 fail2:
-        sfxge_tx_qstop(sc, SFXGE_TXQ_NON_CKSUM);
+	sfxge_tx_qstop(sc, SFXGE_TXQ_NON_CKSUM);
 
 fail:
 	efx_tx_fini(sc->enp);
@@ -1281,7 +1302,7 @@ static void
 sfxge_tx_qfini(struct sfxge_softc *sc, unsigned int index)
 {
 	struct sfxge_txq *txq;
-	unsigned int nmaps = SFXGE_NDESCS;
+	unsigned int nmaps;
 
 	txq = sc->txq[index];
 
@@ -1293,7 +1314,8 @@ sfxge_tx_qfini(struct sfxge_softc *sc, unsigned int index)
 
 	/* Free the context arrays. */
 	free(txq->pend_desc, M_SFXGE);
-	while (nmaps--)
+	nmaps = sc->txq_entries;
+	while (nmaps-- != 0)
 		bus_dmamap_destroy(txq->packet_dma_tag, txq->stmp[nmaps].map);
 	free(txq->stmp, M_SFXGE);
 
@@ -1313,6 +1335,8 @@ static int
 sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index,
     enum sfxge_txq_type type, unsigned int evq_index)
 {
+	char name[16];
+	struct sysctl_oid *txq_node;
 	struct sfxge_txq *txq;
 	struct sfxge_evq *evq;
 #ifdef SFXGE_HAVE_MQ
@@ -1324,6 +1348,8 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index,
 
 	txq = malloc(sizeof(struct sfxge_txq), M_SFXGE, M_ZERO | M_WAITOK);
 	txq->sc = sc;
+	txq->entries = sc->txq_entries;
+	txq->ptr_mask = txq->entries - 1;
 
 	sc->txq[txq_index] = txq;
 	esmp = &txq->mem;
@@ -1331,12 +1357,12 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index,
 	evq = sc->evq[evq_index];
 
 	/* Allocate and zero DMA space for the descriptor ring. */
-	if ((rc = sfxge_dma_alloc(sc, EFX_TXQ_SIZE(SFXGE_NDESCS), esmp)) != 0)
+	if ((rc = sfxge_dma_alloc(sc, EFX_TXQ_SIZE(sc->txq_entries), esmp)) != 0)
 		return (rc);
-	(void)memset(esmp->esm_base, 0, EFX_TXQ_SIZE(SFXGE_NDESCS));
+	(void)memset(esmp->esm_base, 0, EFX_TXQ_SIZE(sc->txq_entries));
 
 	/* Allocate buffer table entries. */
-	sfxge_sram_buf_tbl_alloc(sc, EFX_TXQ_NBUFS(SFXGE_NDESCS),
+	sfxge_sram_buf_tbl_alloc(sc, EFX_TXQ_NBUFS(sc->txq_entries),
 				 &txq->buf_base_id);
 
 	/* Create a DMA tag for packet mappings. */
@@ -1350,29 +1376,59 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index,
 	}
 
 	/* Allocate pending descriptor array for batching writes. */
-	txq->pend_desc = malloc(sizeof(efx_buffer_t) * SFXGE_NDESCS,
+	txq->pend_desc = malloc(sizeof(efx_buffer_t) * sc->txq_entries,
 				M_SFXGE, M_ZERO | M_WAITOK);
 
 	/* Allocate and initialise mbuf DMA mapping array. */
-	txq->stmp = malloc(sizeof(struct sfxge_tx_mapping) * SFXGE_NDESCS,
+	txq->stmp = malloc(sizeof(struct sfxge_tx_mapping) * sc->txq_entries,
 	    M_SFXGE, M_ZERO | M_WAITOK);
-	for (nmaps = 0; nmaps < SFXGE_NDESCS; nmaps++) {
+	for (nmaps = 0; nmaps < sc->txq_entries; nmaps++) {
 		rc = bus_dmamap_create(txq->packet_dma_tag, 0,
 				       &txq->stmp[nmaps].map);
 		if (rc != 0)
 			goto fail2;
 	}
 
+	snprintf(name, sizeof(name), "%u", txq_index);
+	txq_node = SYSCTL_ADD_NODE(
+		device_get_sysctl_ctx(sc->dev),
+		SYSCTL_CHILDREN(sc->txqs_node),
+		OID_AUTO, name, CTLFLAG_RD, NULL, "");
+	if (txq_node == NULL) {
+		rc = ENOMEM;
+		goto fail_txq_node;
+	}
+
 	if (type == SFXGE_TXQ_IP_TCP_UDP_CKSUM &&
 	    (rc = tso_init(txq)) != 0)
 		goto fail3;
 
 #ifdef SFXGE_HAVE_MQ
+	if (sfxge_tx_dpl_get_max <= 0) {
+		log(LOG_ERR, "%s=%d must be greater than 0",
+		    SFXGE_PARAM_TX_DPL_GET_MAX, sfxge_tx_dpl_get_max);
+		rc = EINVAL;
+		goto fail_tx_dpl_get_max;
+	}
+	if (sfxge_tx_dpl_put_max < 0) {
+		log(LOG_ERR, "%s=%d must be greater or equal to 0",
+		    SFXGE_PARAM_TX_DPL_PUT_MAX, sfxge_tx_dpl_put_max);
+		rc = EINVAL;
+		goto fail_tx_dpl_put_max;
+	}
+
 	/* Initialize the deferred packet list. */
 	stdp = &txq->dpl;
+	stdp->std_put_max = sfxge_tx_dpl_put_max;
+	stdp->std_get_max = sfxge_tx_dpl_get_max;
 	stdp->std_getp = &stdp->std_get;
 
 	mtx_init(&txq->lock, "txq", NULL, MTX_DEF);
+
+	SYSCTL_ADD_UINT(device_get_sysctl_ctx(sc->dev),
+			SYSCTL_CHILDREN(txq_node), OID_AUTO,
+			"dpl_get_count", CTLFLAG_RD | CTLFLAG_STATS,
+			&stdp->std_get_count, 0, "");
 #endif
 
 	txq->type = type;
@@ -1382,10 +1438,13 @@ sfxge_tx_qinit(struct sfxge_softc *sc, unsigned int txq_index,
 
 	return (0);
 
+fail_tx_dpl_put_max:
+fail_tx_dpl_get_max:
 fail3:
+fail_txq_node:
 	free(txq->pend_desc, M_SFXGE);
 fail2:
-	while (nmaps--)
+	while (nmaps-- != 0)
 		bus_dmamap_destroy(txq->packet_dma_tag, txq->stmp[nmaps].map);
 	free(txq->stmp, M_SFXGE);
 	bus_dma_tag_destroy(txq->packet_dma_tag);
@@ -1400,7 +1459,7 @@ static const struct {
 	const char *name;
 	size_t offset;
 } sfxge_tx_stats[] = {
-#define SFXGE_TX_STAT(name, member) \
+#define	SFXGE_TX_STAT(name, member) \
 	{ #name, offsetof(struct sfxge_txq, member) }
 	SFXGE_TX_STAT(tso_bursts, tso_bursts),
 	SFXGE_TX_STAT(tso_packets, tso_packets),
@@ -1426,7 +1485,7 @@ sfxge_tx_stat_handler(SYSCTL_HANDLER_ARGS)
 		sum += *(unsigned long *)((caddr_t)sc->txq[index] +
 					  sfxge_tx_stats[id].offset);
 
-	return SYSCTL_OUT(req, &sum, sizeof(sum));
+	return (SYSCTL_OUT(req, &sum, sizeof(sum)));
 }
 
 static void
@@ -1460,7 +1519,7 @@ sfxge_tx_fini(struct sfxge_softc *sc)
 		sfxge_tx_qfini(sc, SFXGE_TXQ_IP_TCP_UDP_CKSUM + index);
 
 	sfxge_tx_qfini(sc, SFXGE_TXQ_IP_CKSUM);
-        sfxge_tx_qfini(sc, SFXGE_TXQ_NON_CKSUM);
+	sfxge_tx_qfini(sc, SFXGE_TXQ_NON_CKSUM);
 }
 
 
@@ -1476,6 +1535,15 @@ sfxge_tx_init(struct sfxge_softc *sc)
 	KASSERT(intr->state == SFXGE_INTR_INITIALIZED,
 	    ("intr->state != SFXGE_INTR_INITIALIZED"));
 
+	sc->txqs_node = SYSCTL_ADD_NODE(
+		device_get_sysctl_ctx(sc->dev),
+		SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)),
+		OID_AUTO, "txq", CTLFLAG_RD, NULL, "Tx queues");
+	if (sc->txqs_node == NULL) {
+		rc = ENOMEM;
+		goto fail_txq_node;
+	}
+
 	/* Initialize the transmit queues */
 	if ((rc = sfxge_tx_qinit(sc, SFXGE_TXQ_NON_CKSUM,
 	    SFXGE_TXQ_NON_CKSUM, 0)) != 0)
@@ -1505,5 +1573,6 @@ sfxge_tx_init(struct sfxge_softc *sc)
 	sfxge_tx_qfini(sc, SFXGE_TXQ_NON_CKSUM);
 
 fail:
+fail_txq_node:
 	return (rc);
 }
diff --git a/sys/dev/sfxge/sfxge_tx.h b/sys/dev/sfxge/sfxge_tx.h
index 33ce8b9126f9..67dea0c74d5f 100644
--- a/sys/dev/sfxge/sfxge_tx.h
+++ b/sys/dev/sfxge/sfxge_tx.h
@@ -30,7 +30,7 @@
  */
 
 #ifndef _SFXGE_TX_H
-#define _SFXGE_TX_H
+#define	_SFXGE_TX_H
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -47,7 +47,7 @@
  * could overlap all mbufs in the chain and also require an extra
  * segment for a TSO header.
  */
-#define SFXGE_TX_PACKET_MAX_SEG (SFXGE_TX_MAPPING_MAX_SEG + 1)
+#define	SFXGE_TX_PACKET_MAX_SEG (SFXGE_TX_MAPPING_MAX_SEG + 1)
 
 /*
  * Buffer mapping flags.
@@ -75,17 +75,21 @@ struct sfxge_tx_mapping {
 	enum sfxge_tx_buf_flags	flags;
 };
 
-#define	SFXGE_TX_DPL_GET_PKT_LIMIT_DEFAULT	64
+#define	SFXGE_TX_DPL_GET_PKT_LIMIT_DEFAULT	1024
 #define	SFXGE_TX_DPL_PUT_PKT_LIMIT_DEFAULT	64
 
 /*
  * Deferred packet list.
  */
 struct sfxge_tx_dpl {
-	uintptr_t		std_put;    /* Head of put list. */
-	struct mbuf		*std_get;   /* Head of get list. */
-	struct mbuf		**std_getp; /* Tail of get list. */
-	unsigned int		std_count;  /* Count of packets. */
+	unsigned int		std_get_max;	/* Maximum number of packets
+						 * in get list */
+	unsigned int		std_put_max;	/* Maximum number of packets
+						 * in put list */
+	uintptr_t		std_put;	/* Head of put list. */
+	struct mbuf		*std_get;	/* Head of get list. */
+	struct mbuf		**std_getp;	/* Tail of get list. */
+	unsigned int		std_get_count;	/* Packets in get list. */
 };
 
 
@@ -106,16 +110,16 @@ enum sfxge_txq_type {
 	SFXGE_TXQ_NTYPES
 };
 
-#define	SFXGE_TXQ_UNBLOCK_LEVEL		(EFX_TXQ_LIMIT(SFXGE_NDESCS) / 4)
+#define	SFXGE_TXQ_UNBLOCK_LEVEL(_entries)	(EFX_TXQ_LIMIT(_entries) / 4)
 
 #define	SFXGE_TX_BATCH	64
 
 #ifdef SFXGE_HAVE_MQ
-#define SFXGE_TXQ_LOCK(txq)		(&(txq)->lock)
-#define SFXGE_TX_SCALE(sc)		((sc)->intr.n_alloc)
+#define	SFXGE_TXQ_LOCK(txq)		(&(txq)->lock)
+#define	SFXGE_TX_SCALE(sc)		((sc)->intr.n_alloc)
 #else
-#define SFXGE_TXQ_LOCK(txq)		(&(txq)->sc->tx_lock)
-#define SFXGE_TX_SCALE(sc)		1
+#define	SFXGE_TXQ_LOCK(txq)		(&(txq)->sc->tx_lock)
+#define	SFXGE_TX_SCALE(sc)		1
 #endif
 
 struct sfxge_txq {
@@ -128,6 +132,8 @@ struct sfxge_txq {
 	unsigned int			evq_index;
 	efsys_mem_t			mem;
 	unsigned int			buf_base_id;
+	unsigned int			entries;
+	unsigned int			ptr_mask;
 
 	struct sfxge_tx_mapping		*stmp;	/* Packets in flight. */
 	bus_dma_tag_t			packet_dma_tag;
diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
index 32773fd786b6..f0ef07fcb52c 100644
--- a/sys/dev/sge/if_sge.c
+++ b/sys/dev/sge/if_sge.c
@@ -1171,13 +1171,13 @@ sge_rxeof(struct sge_softc *sc)
 			    RX_ERR_BITS);
 #endif
 			sge_discard_rxbuf(sc, cons);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 		m = cd->sge_rxdesc[cons].rx_m;
 		if (sge_newbuf(sc, cons) != 0) {
 			sge_discard_rxbuf(sc, cons);
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			continue;
 		}
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) {
@@ -1210,7 +1210,7 @@ sge_rxeof(struct sge_softc *sc)
 		m->m_pkthdr.len = m->m_len = SGE_RX_BYTES(rxstat) -
 		    SGE_RX_PAD_BYTES;
 		m->m_pkthdr.rcvif = ifp;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		SGE_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		SGE_LOCK(sc);
@@ -1265,12 +1265,12 @@ sge_txeof(struct sge_softc *sc)
 			device_printf(sc->sge_dev, "Tx error : 0x%b\n",
 			    txstat, TX_ERR_BITS);
 #endif
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		} else {
 #ifdef notyet
-			ifp->if_collisions += (txstat & 0xFFFF) - 1;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & 0xFFFF) - 1);
 #endif
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 		txd = &cd->sge_txdesc[cons];
 		for (nsegs = 0; nsegs < txd->tx_ndesc; nsegs++) {
@@ -1856,13 +1856,13 @@ sge_watchdog(struct sge_softc *sc)
 		if (1 || bootverbose)
 			device_printf(sc->sge_dev,
 			    "watchdog timeout (lost link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		sge_init_locked(sc);
 		return;
 	}
 	device_printf(sc->sge_dev, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	sge_init_locked(sc);
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index dd2bd70a656c..b617689918fc 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -465,6 +465,7 @@ siis_ch_attach(device_t dev)
 	ch->dev = dev;
 	ch->unit = (intptr_t)device_get_ivars(dev);
 	ch->quirks = ctlr->quirks;
+	ch->pm_level = 0;
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "pm_level", &ch->pm_level);
 	resource_int_value(device_get_name(dev),
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index c32aa14a416f..f7e6f3ba4442 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -1509,9 +1509,9 @@ sis_rxeof(struct sis_softc *sc)
 		    ETHER_CRC_LEN))
 			rxstat &= ~SIS_RXSTAT_GIANT;
 		if (SIS_RXSTAT_ERROR(rxstat) != 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			if (rxstat & SIS_RXSTAT_COLL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			sis_discard_rxbuf(rxd);
 			continue;
 		}
@@ -1519,7 +1519,7 @@ sis_rxeof(struct sis_softc *sc)
 		/* Add a new receive buffer to the ring. */
 		m = rxd->rx_m;
 		if (sis_newbuf(sc, rxd) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			sis_discard_rxbuf(rxd);
 			continue;
 		}
@@ -1535,7 +1535,7 @@ sis_rxeof(struct sis_softc *sc)
 		 */
 		sis_fixup_rx(m);
 #endif
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 
 		SIS_UNLOCK(sc);
@@ -1593,15 +1593,15 @@ sis_txeof(struct sis_softc *sc)
 			m_freem(txd->tx_m);
 			txd->tx_m = NULL;
 			if ((txstat & SIS_CMDSTS_PKT_OK) != 0) {
-				ifp->if_opackets++;
-				ifp->if_collisions +=
-				    (txstat & SIS_TXSTAT_COLLCNT) >> 16;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+				    (txstat & SIS_TXSTAT_COLLCNT) >> 16);
 			} else {
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				if (txstat & SIS_TXSTAT_EXCESSCOLLS)
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 				if (txstat & SIS_TXSTAT_OUTOFWINCOLL)
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			}
 		}
 		sc->sis_tx_cnt--;
@@ -1664,7 +1664,7 @@ sis_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 		status = CSR_READ_4(sc, SIS_ISR);
 
 		if (status & (SIS_ISR_RX_ERR|SIS_ISR_RX_OFLOW))
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 		if (status & (SIS_ISR_RX_IDLE))
 			SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RX_ENABLE);
@@ -1722,7 +1722,7 @@ sis_intr(void *arg)
 			sis_rxeof(sc);
 
 		if (status & SIS_ISR_RX_OFLOW)
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 		if (status & (SIS_ISR_RX_IDLE))
 			SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RX_ENABLE);
@@ -2197,7 +2197,7 @@ sis_watchdog(struct sis_softc *sc)
 		return;
 
 	device_printf(sc->sis_dev, "watchdog timeout\n");
-	sc->sis_ifp->if_oerrors++;
+	if_inc_counter(sc->sis_ifp, IFCOUNTER_OERRORS, 1);
 
 	sc->sis_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	sis_initl(sc);
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index c4eb2d6c57ac..9898370ad62d 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -2556,7 +2556,7 @@ sk_watchdog(arg)
 	sk_txeof(sc_if);
 	if (sc_if->sk_cdata.sk_tx_cnt != 0) {
 		if_printf(sc_if->sk_ifp, "watchdog timeout\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		sk_init_locked(sc_if);
 	}
@@ -2771,7 +2771,7 @@ sk_rxeof(sc_if)
 		    SK_RXBYTES(sk_ctl) < SK_MIN_FRAMELEN ||
 		    SK_RXBYTES(sk_ctl) > SK_MAX_FRAMELEN ||
 		    sk_rxvalid(sc, rxstat, SK_RXBYTES(sk_ctl)) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			sk_discard_rxbuf(sc_if, cons);
 			continue;
 		}
@@ -2779,14 +2779,14 @@ sk_rxeof(sc_if)
 		m = rxd->rx_m;
 		csum = le32toh(cur_rx->sk_csum);
 		if (sk_newbuf(sc_if, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* reuse old buffer */
 			sk_discard_rxbuf(sc_if, cons);
 			continue;
 		}
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = SK_RXBYTES(sk_ctl);
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 			sk_rxcksum(ifp, m, csum);
 		SK_IF_UNLOCK(sc_if);
@@ -2839,7 +2839,7 @@ sk_jumbo_rxeof(sc_if)
 		    SK_RXBYTES(sk_ctl) < SK_MIN_FRAMELEN ||
 		    SK_RXBYTES(sk_ctl) > SK_JUMBO_FRAMELEN ||
 		    sk_rxvalid(sc, rxstat, SK_RXBYTES(sk_ctl)) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			sk_discard_jumbo_rxbuf(sc_if, cons);
 			continue;
 		}
@@ -2847,14 +2847,14 @@ sk_jumbo_rxeof(sc_if)
 		m = jrxd->rx_m;
 		csum = le32toh(cur_rx->sk_csum);
 		if (sk_jumbo_newbuf(sc_if, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			/* reuse old buffer */
 			sk_discard_jumbo_rxbuf(sc_if, cons);
 			continue;
 		}
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = SK_RXBYTES(sk_ctl);
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 			sk_rxcksum(ifp, m, csum);
 		SK_IF_UNLOCK(sc_if);
@@ -2905,7 +2905,7 @@ sk_txeof(sc_if)
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc_if->sk_cdata.sk_tx_tag, txd->tx_dmamap);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		m_freem(txd->tx_m);
 		txd->tx_m = NULL;
 		STAILQ_REMOVE_HEAD(&sc_if->sk_cdata.sk_txbusyq, tx_q);
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
index 0ce595f67a60..8ba7210d5796 100644
--- a/sys/dev/smc/if_smc.c
+++ b/sys/dev/smc/if_smc.c
@@ -512,7 +512,7 @@ smc_start_locked(struct ifnet *ifp)
 	len += (len & 1);
 	if (len > ETHER_MAX_LEN - ETHER_CRC_LEN) {
 		if_printf(ifp, "large packet discarded\n");
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		return; /* XXX readcheck? */
 	}
@@ -598,7 +598,7 @@ smc_task_tx(void *context, int pending)
 	 */
 	if (packet & ARR_FAILED) {
 		IFQ_DRV_PREPEND(&ifp->if_snd, m);
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 		smc_start_locked(ifp);
 		SMC_UNLOCK(sc);
@@ -655,7 +655,7 @@ smc_task_tx(void *context, int pending)
 	/*
 	 * Finish up.
 	 */
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	SMC_UNLOCK(sc);
 	BPF_MTAP(ifp, m0);
@@ -721,7 +721,7 @@ smc_task_rx(void *context, int pending)
 		if (status & (RX_TOOSHORT | RX_TOOLNG | RX_BADCRC | RX_ALGNERR)) {
 			smc_mmu_wait(sc);
 			smc_write_2(sc, MMUCR, MMUCR_CMD_RELEASE);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m_freem(m);
 			break;
 		}
@@ -777,7 +777,7 @@ smc_task_rx(void *context, int pending)
 		m = mhead;
 		mhead = mhead->m_next;
 		m->m_next = NULL;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		(*ifp->if_input)(ifp, m);
 	}
 }
@@ -892,7 +892,7 @@ smc_task_intr(void *context, int pending)
 	 */
 	if (status & RX_OVRN_INT) {
 		smc_write_1(sc, ACK, RX_OVRN_INT);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	/*
@@ -909,10 +909,9 @@ smc_task_intr(void *context, int pending)
 		smc_select_bank(sc, 0);
 		counter = smc_read_2(sc, ECR);
 		smc_select_bank(sc, 2);
-		ifp->if_collisions +=
-		    (counter & ECR_SNGLCOL_MASK) >> ECR_SNGLCOL_SHIFT;
-		ifp->if_collisions +=
-		    (counter & ECR_MULCOL_MASK) >> ECR_MULCOL_SHIFT;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+		    ((counter & ECR_SNGLCOL_MASK) >> ECR_SNGLCOL_SHIFT) +
+		    ((counter & ECR_MULCOL_MASK) >> ECR_MULCOL_SHIFT));
 
 		/*
 		 * See if there are any packets to transmit.
diff --git a/sys/arm/versatile/if_smc_fdt.c b/sys/dev/smc/if_smc_fdt.c
similarity index 100%
rename from sys/arm/versatile/if_smc_fdt.c
rename to sys/dev/smc/if_smc_fdt.c
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 7cc856439c73..7350537935e0 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -409,7 +409,7 @@ snstart_locked(struct ifnet *ifp)
 	 */
 	if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
 		if_printf(ifp, "large packet discarded (A)\n");
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
 		m_freem(m);
 		goto readcheck;
@@ -556,7 +556,7 @@ snstart_locked(struct ifnet *ifp)
 
 	BPF_MTAP(ifp, top);
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	m_freem(top);
 
 
@@ -625,7 +625,7 @@ snresume(struct ifnet *ifp)
 	 */
 	if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
 		if_printf(ifp, "large packet discarded (B)\n");
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
 		m_freem(m);
 		return;
@@ -750,7 +750,7 @@ snresume(struct ifnet *ifp)
 
 	BPF_MTAP(ifp, top);
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	m_freem(top);
 
 try_start:
@@ -830,7 +830,7 @@ snintr_locked(struct sn_softc *sc)
 		SMC_SELECT_BANK(sc, 2);
 		CSR_WRITE_1(sc, INTR_ACK_REG_B, IM_RX_OVRN_INT);
 
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 	/*
 	 * Got a packet.
@@ -896,11 +896,11 @@ snintr_locked(struct sn_softc *sc)
 			device_printf(sc->dev, 
 			    "Successful packet caused interrupt\n");
 		} else {
-			++ifp->if_oerrors;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 
 		if (tx_status & EPHSR_LATCOL)
-			++ifp->if_collisions;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 
 		/*
 		 * Some of these errors will have disabled transmit.
@@ -951,12 +951,12 @@ snintr_locked(struct sn_softc *sc)
 		/*
 		 * Single collisions
 		 */
-		ifp->if_collisions += card_stats & ECR_COLN_MASK;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, card_stats & ECR_COLN_MASK);
 
 		/*
 		 * Multiple collisions
 		 */
-		ifp->if_collisions += (card_stats & ECR_MCOLN_MASK) >> 4;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (card_stats & ECR_MCOLN_MASK) >> 4);
 
 		SMC_SELECT_BANK(sc, 2);
 
@@ -1041,7 +1041,7 @@ snread(struct ifnet *ifp)
 	 * Account for receive errors and discard.
 	 */
 	if (status & RS_ERRORS) {
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto out;
 	}
 	/*
@@ -1074,7 +1074,7 @@ snread(struct ifnet *ifp)
 	 */
 	if ((m->m_flags & M_EXT) == 0) {
 		m_freem(m);
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		printf("sn: snread() kernel memory allocation problem\n");
 		goto out;
 	}
@@ -1089,7 +1089,7 @@ snread(struct ifnet *ifp)
 		data += packet_length & ~1;
 		*data = CSR_READ_1(sc, DATA_REG_B);
 	}
-	++ifp->if_ipackets;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	/*
 	 * Remove link layer addresses and whatnot.
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 617897780ccd..d4e062ac1f2f 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -369,7 +369,7 @@ sncstart_locked(struct ifnet *ifp)
 	sc->mtd_prev = sc->mtd_free;
 	sc->mtd_free = mtd_next;
 
-	ifp->if_opackets++;		/* # of pkts */
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);		/* # of pkts */
 
 	/* Jump back for possibly more punishment. */
 	goto outloop;
@@ -935,11 +935,12 @@ sonictxint(struct snc_softc *sc)
 
 		txp_status = SRO(sc, txp, TXP_STATUS);
 
-		ifp->if_collisions += (txp_status & TCR_EXC) ? 16 :
-			((txp_status & TCR_NC) >> 12);
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+		    (txp_status & TCR_EXC) ? 16 :
+		    ((txp_status & TCR_NC) >> 12));
 
 		if ((txp_status & TCR_PTX) == 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			device_printf(sc->sc_dev, "Tx packet status=0x%x\n",
 				      txp_status);
 			
@@ -989,11 +990,11 @@ sonicrxint(struct snc_softc *sc)
 			u_int32_t pkt =
 			    sc->rbuf[orra & RBAMASK] + (rxpkt_ptr & PAGE_MASK);
 			if (sonic_read(sc, pkt, len))
-				sc->sc_ifp->if_ipackets++;
+				if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
 			else
-				sc->sc_ifp->if_ierrors++;
+				if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 		} else
-			sc->sc_ifp->if_ierrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 
 		/*
 		 * give receive buffer area back to chip.
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 9d98a78bccb5..3d48abca05c6 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -232,7 +232,7 @@ struct uaudio_chan {
 #define	UAUDIO_SYNC_LESS 2
 };
 
-#define	UMIDI_CABLES_MAX   16		/* units */
+#define	UMIDI_EMB_JACK_MAX   16		/* units */
 #define	UMIDI_TX_FRAMES	   256		/* units */
 #define	UMIDI_TX_BUFFER    (UMIDI_TX_FRAMES * 4)	/* bytes */
 
@@ -263,7 +263,7 @@ struct umidi_sub_chan {
 
 struct umidi_chan {
 
-	struct umidi_sub_chan sub[UMIDI_CABLES_MAX];
+	struct umidi_sub_chan sub[UMIDI_EMB_JACK_MAX];
 	struct mtx mtx;
 
 	struct usb_xfer *xfer[UMIDI_N_TRANSFER];
@@ -275,7 +275,7 @@ struct umidi_chan {
 	uint8_t	write_open_refcount;
 
 	uint8_t	curr_cable;
-	uint8_t	max_cable;
+	uint8_t	max_emb_jack;
 	uint8_t	valid;
 	uint8_t single_command;
 };
@@ -1481,6 +1481,7 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 	union uaudio_asid asid = { NULL };
 	union uaudio_asf1d asf1d = { NULL };
 	union uaudio_sed sed = { NULL };
+	struct usb_midi_streaming_endpoint_descriptor *msid = NULL;
 	usb_endpoint_descriptor_audio_t *ed1 = NULL;
 	const struct usb_audio_control_descriptor *acdp = NULL;
 	struct usb_config_descriptor *cd = usbd_get_config_descriptor(udev);
@@ -1498,6 +1499,7 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 	uint8_t bChannels;
 	uint8_t bBitResolution;
 	uint8_t audio_if = 0;
+	uint8_t midi_if = 0;
 	uint8_t uma_if_class;
 
 	while ((desc = usb_desc_foreach(cd, desc))) {
@@ -1533,7 +1535,8 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 			    ((id->bInterfaceClass == UICLASS_VENDOR) &&
 			    (sc->sc_uq_au_vendor_class != 0)));
 
-			if ((uma_if_class != 0) && (id->bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM)) {
+			if ((uma_if_class != 0) &&
+			    (id->bInterfaceSubClass == UISUBCLASS_AUDIOSTREAM)) {
 				audio_if = 1;
 			} else {
 				audio_if = 0;
@@ -1545,13 +1548,16 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 				/*
 				 * XXX could allow multiple MIDI interfaces
 				 */
+				midi_if = 1;
 
 				if ((sc->sc_midi_chan.valid == 0) &&
-				    usbd_get_iface(udev, curidx)) {
+				    (usbd_get_iface(udev, curidx) != NULL)) {
 					sc->sc_midi_chan.iface_index = curidx;
 					sc->sc_midi_chan.iface_alt_index = alt_index;
 					sc->sc_midi_chan.valid = 1;
 				}
+			} else {
+				midi_if = 0;
 			}
 			asid.v1 = NULL;
 			asf1d.v1 = NULL;
@@ -1560,14 +1566,25 @@ uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
 		}
 
 		if (audio_if == 0) {
-			if ((acdp == NULL) &&
-			    (desc->bDescriptorType == UDESC_CS_INTERFACE) &&
-			    (desc->bDescriptorSubtype == UDESCSUB_AC_HEADER) &&
-			    (desc->bLength >= sizeof(*acdp))) {
-				acdp = (void *)desc;
-				audio_rev = UGETW(acdp->bcdADC);
-			}
+			if (midi_if == 0) {
+				if ((acdp == NULL) &&
+				    (desc->bDescriptorType == UDESC_CS_INTERFACE) &&
+				    (desc->bDescriptorSubtype == UDESCSUB_AC_HEADER) &&
+				    (desc->bLength >= sizeof(*acdp))) {
+					acdp = (void *)desc;
+					audio_rev = UGETW(acdp->bcdADC);
+				}
+			} else {
+				msid = (void *)desc;
 
+				/* get the maximum number of embedded jacks in use, if any */
+				if (msid->bLength >= sizeof(*msid) &&
+				    msid->bDescriptorType == UDESC_CS_ENDPOINT &&
+				    msid->bDescriptorSubtype == MS_GENERAL &&
+				    msid->bNumEmbMIDIJack > sc->sc_midi_chan.max_emb_jack) {
+					sc->sc_midi_chan.max_emb_jack = msid->bNumEmbMIDIJack;
+				}
+			}
 			/*
 			 * Don't collect any USB audio descriptors if
 			 * this is not an USB audio stream interface.
@@ -2724,14 +2741,14 @@ uaudio_mixer_controls_create_ftu(struct uaudio_softc *sc)
 
 		uaudio_mixer_add_ctl(sc, &MIX(sc));
 
-		MIX(sc).wValue[0] = MAKE_WORD(9, chy + 1);
+		MIX(sc).wValue[0] = MAKE_WORD(9, chy + 1 + 8);
 		MIX(sc).type = MIX_SIGNED_16;
 		MIX(sc).ctl = SOUND_MIXER_NRDEVICES;
 		MIX(sc).name = "effect_send";
 		MIX(sc).nchan = 1;
 		MIX(sc).update[0] = 1;
 		snprintf(MIX(sc).desc, sizeof(MIX(sc).desc),
-		    "Effect Send DIn%d Volume", chy + 1 + 8);
+		    "Effect Send DIn%d Volume", chy + 1);
 
 		uaudio_mixer_add_ctl(sc, &MIX(sc));
 	}
@@ -5219,8 +5236,7 @@ umidi_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 			 */
 			sub = &chan->sub[cn];
 
-			if ((cmd_len != 0) &&
-			    (cn < chan->max_cable) &&
+			if ((cmd_len != 0) && (cn < chan->max_emb_jack) &&
 			    (sub->read_open != 0)) {
 
 				/* Send data to the application */
@@ -5456,7 +5472,7 @@ umidi_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 			}
 
 			chan->curr_cable++;
-			if (chan->curr_cable >= chan->max_cable)
+			if (chan->curr_cable >= chan->max_emb_jack)
 				chan->curr_cable = 0;
 
 			if (chan->curr_cable == start_cable) {
@@ -5493,7 +5509,7 @@ umidi_sub_by_fifo(struct usb_fifo *fifo)
 	struct umidi_sub_chan *sub;
 	uint32_t n;
 
-	for (n = 0; n < UMIDI_CABLES_MAX; n++) {
+	for (n = 0; n < UMIDI_EMB_JACK_MAX; n++) {
 		sub = &chan->sub[n];
 		if ((sub->fifo.fp[USB_FIFO_RX] == fifo) ||
 		    (sub->fifo.fp[USB_FIFO_TX] == fifo)) {
@@ -5676,12 +5692,12 @@ umidi_probe(device_t dev)
 	if (chan->single_command != 0)
 		device_printf(dev, "Single command MIDI quirk enabled\n");
 
-	if ((chan->max_cable > UMIDI_CABLES_MAX) ||
-	    (chan->max_cable == 0)) {
-		chan->max_cable = UMIDI_CABLES_MAX;
+	if ((chan->max_emb_jack == 0) ||
+	    (chan->max_emb_jack > UMIDI_EMB_JACK_MAX)) {
+		chan->max_emb_jack = UMIDI_EMB_JACK_MAX;
 	}
 
-	for (n = 0; n < chan->max_cable; n++) {
+	for (n = 0; n < chan->max_emb_jack; n++) {
 
 		sub = &chan->sub[n];
 
@@ -5719,9 +5735,8 @@ umidi_detach(device_t dev)
 	struct umidi_chan *chan = &sc->sc_midi_chan;
 	uint32_t n;
 
-	for (n = 0; n < UMIDI_CABLES_MAX; n++) {
+	for (n = 0; n < UMIDI_EMB_JACK_MAX; n++)
 		usb_fifo_detach(&chan->sub[n].fifo);
-	}
 
 	mtx_lock(&chan->mtx);
 
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index c2c1ad4b077f..637b5b1c0f23 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -119,6 +119,13 @@ struct usb_audio_streaming_endpoint_descriptor {
 	uWord	wLockDelay;
 } __packed;
 
+struct usb_midi_streaming_endpoint_descriptor {
+	uByte	bLength;
+	uByte	bDescriptorType;
+	uByte	bDescriptorSubtype;
+	uByte	bNumEmbMIDIJack;
+} __packed;
+
 struct usb_audio_streaming_type1_descriptor {
 	uByte	bLength;
 	uByte	bDescriptorType;
@@ -378,6 +385,7 @@ struct usb_audio_extension_unit_1 {
 
 #define	MASTER_CHAN	0
 
+#define	MS_GENERAL	1
 #define	AS_GENERAL	1
 #define	FORMAT_TYPE	2
 #define	FORMAT_SPECIFIC 3
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
index edc173b96fea..e6cffb3d23b2 100644
--- a/sys/dev/ste/if_ste.c
+++ b/sys/dev/ste/if_ste.c
@@ -622,7 +622,7 @@ ste_rxeof(struct ste_softc *sc, int count)
 	 	 * comes up in the ring.
 		 */
 		if (rxstat & STE_RXSTAT_FRAME_ERR) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->ste_ptr->ste_status = 0;
 			continue;
 		}
@@ -639,7 +639,7 @@ ste_rxeof(struct ste_softc *sc, int count)
 		 * can do in this situation.
 		 */
 		if (ste_newbuf(sc, cur_rx) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			cur_rx->ste_ptr->ste_status = 0;
 			continue;
 		}
@@ -647,7 +647,7 @@ ste_rxeof(struct ste_softc *sc, int count)
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = total_len;
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		STE_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		STE_LOCK(sc);
@@ -690,7 +690,7 @@ ste_txeoc(struct ste_softc *sc)
 		if ((txstat & (STE_TXSTATUS_UNDERRUN |
 		    STE_TXSTATUS_EXCESSCOLLS | STE_TXSTATUS_RECLAIMERR |
 		    STE_TXSTATUS_STATSOFLOW)) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 #ifdef	STE_SHOW_TXERRORS
 			device_printf(sc->ste_dev, "TX error : 0x%b\n",
 			    txstat & 0xFF, STE_ERR_BITS);
@@ -791,7 +791,7 @@ ste_txeof(struct ste_softc *sc)
 		m_freem(cur_tx->ste_mbuf);
 		cur_tx->ste_mbuf = NULL;
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		sc->ste_cdata.ste_tx_cnt--;
 		STE_INC(idx, STE_TX_LIST_CNT);
 	}
@@ -860,13 +860,13 @@ ste_stats_update(struct ste_softc *sc)
 	stats->tx_carrsense_errs += CSR_READ_1(sc, STE_STAT_CARRIER_ERR);
 	val = CSR_READ_1(sc, STE_STAT_SINGLE_COLLS);
 	stats->tx_single_colls += val;
-	ifp->if_collisions += val;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, val);
 	val = CSR_READ_1(sc, STE_STAT_MULTI_COLLS);
 	stats->tx_multi_colls += val;
-	ifp->if_collisions += val;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, val);
 	val += CSR_READ_1(sc, STE_STAT_LATE_COLLS);
 	stats->tx_late_colls += val;
-	ifp->if_collisions += val;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, val);
 	stats->tx_frames_defered += CSR_READ_1(sc, STE_STAT_TX_DEFER);
 	stats->tx_excess_defers += CSR_READ_1(sc, STE_STAT_TX_EXDEFER);
 	stats->tx_abort += CSR_READ_1(sc, STE_STAT_TX_ABORT);
@@ -1960,7 +1960,7 @@ ste_watchdog(struct ste_softc *sc)
 	if (sc->ste_timer == 0 || --sc->ste_timer)
 		return;
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	ste_txeof(sc);
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index 16eccf5846c7..a93dda7b0e8b 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -1236,7 +1236,7 @@ stge_watchdog(struct stge_softc *sc)
 
 	ifp = sc->sc_ifp;
 	if_printf(sc->sc_ifp, "device timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	stge_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -1684,7 +1684,7 @@ stge_rxeof(struct stge_softc *sc)
 		 * Add a new receive buffer to the ring.
 		 */
 		if (stge_newbuf(sc, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			stge_discard_rxbuf(sc, cons);
 			if (sc->sc_cdata.stge_rxhead != NULL) {
 				m_freem(sc->sc_cdata.stge_rxhead);
@@ -1874,22 +1874,22 @@ stge_stats_update(struct stge_softc *sc)
 
 	CSR_READ_4(sc,STGE_OctetRcvOk);
 
-	ifp->if_ipackets += CSR_READ_4(sc, STGE_FramesRcvdOk);
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, CSR_READ_4(sc, STGE_FramesRcvdOk));
 
-	ifp->if_ierrors += CSR_READ_2(sc, STGE_FramesLostRxErrors);
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, CSR_READ_2(sc, STGE_FramesLostRxErrors));
 
 	CSR_READ_4(sc, STGE_OctetXmtdOk);
 
-	ifp->if_opackets += CSR_READ_4(sc, STGE_FramesXmtdOk);
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, CSR_READ_4(sc, STGE_FramesXmtdOk));
 
-	ifp->if_collisions +=
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
 	    CSR_READ_4(sc, STGE_LateCollisions) +
 	    CSR_READ_4(sc, STGE_MultiColFrames) +
-	    CSR_READ_4(sc, STGE_SingleColFrames);
+	    CSR_READ_4(sc, STGE_SingleColFrames));
 
-	ifp->if_oerrors +=
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
 	    CSR_READ_2(sc, STGE_FramesAbortXSColls) +
-	    CSR_READ_2(sc, STGE_FramesWEXDeferal);
+	    CSR_READ_2(sc, STGE_FramesWEXDeferal));
 }
 
 /*
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index fa63aa9543bb..7d0fc9d318f5 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -184,13 +184,13 @@ static int ti_detach(device_t);
 static void ti_txeof(struct ti_softc *);
 static void ti_rxeof(struct ti_softc *);
 
-static void ti_stats_update(struct ti_softc *);
 static int ti_encap(struct ti_softc *, struct mbuf **);
 
 static void ti_intr(void *);
 static void ti_start(struct ifnet *);
 static void ti_start_locked(struct ifnet *);
 static int ti_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t ti_get_counter(struct ifnet *, ift_counter);
 static void ti_init(void *);
 static void ti_init_locked(void *);
 static void ti_init2(struct ti_softc *);
@@ -959,8 +959,6 @@ ti_handle_events(struct ti_softc *sc)
 			ti_init2(sc);
 			break;
 		case TI_EV_STATS_UPDATED:
-			ti_stats_update(sc);
-			break;
 		case TI_EV_RESET_JUMBO_RING:
 		case TI_EV_MCAST_UPDATED:
 			/* Who cares. */
@@ -2505,6 +2503,7 @@ ti_attach(device_t dev)
 	ifp->if_ioctl = ti_ioctl;
 	ifp->if_start = ti_start;
 	ifp->if_init = ti_init;
+	ifp->if_get_counter = ti_get_counter;
 	ifp->if_baudrate = IF_Gbps(1UL);
 	ifp->if_snd.ifq_drv_maxlen = TI_TX_RING_CNT - 1;
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
@@ -2803,12 +2802,12 @@ ti_rxeof(struct ti_softc *sc)
 			m = sc->ti_cdata.ti_rx_jumbo_chain[rxidx];
 #ifndef TI_SF_BUF_JUMBO
 			if (cur_rx->ti_flags & TI_BDFLAG_ERROR) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				ti_discard_jumbo(sc, rxidx);
 				continue;
 			}
 			if (ti_newbuf_jumbo(sc, rxidx, NULL) != 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				ti_discard_jumbo(sc, rxidx);
 				continue;
 			}
@@ -2820,12 +2819,12 @@ ti_rxeof(struct ti_softc *sc)
 			    BUS_DMASYNC_POSTREAD);
 			bus_dmamap_unload(sc->ti_cdata.ti_rx_jumbo_tag, map);
 			if (cur_rx->ti_flags & TI_BDFLAG_ERROR) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				ti_newbuf_jumbo(sc, sc->ti_jumbo, m);
 				continue;
 			}
 			if (ti_newbuf_jumbo(sc, sc->ti_jumbo, NULL) == ENOBUFS) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				ti_newbuf_jumbo(sc, sc->ti_jumbo, m);
 				continue;
 			}
@@ -2842,12 +2841,12 @@ ti_rxeof(struct ti_softc *sc)
 			TI_INC(sc->ti_mini, TI_MINI_RX_RING_CNT);
 			m = sc->ti_cdata.ti_rx_mini_chain[rxidx];
 			if (cur_rx->ti_flags & TI_BDFLAG_ERROR) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				ti_discard_mini(sc, rxidx);
 				continue;
 			}
 			if (ti_newbuf_mini(sc, rxidx) != 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				ti_discard_mini(sc, rxidx);
 				continue;
 			}
@@ -2857,12 +2856,12 @@ ti_rxeof(struct ti_softc *sc)
 			TI_INC(sc->ti_std, TI_STD_RX_RING_CNT);
 			m = sc->ti_cdata.ti_rx_std_chain[rxidx];
 			if (cur_rx->ti_flags & TI_BDFLAG_ERROR) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				ti_discard_std(sc, rxidx);
 				continue;
 			}
 			if (ti_newbuf_std(sc, rxidx) != 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				ti_discard_std(sc, rxidx);
 				continue;
 			}
@@ -2870,7 +2869,7 @@ ti_rxeof(struct ti_softc *sc)
 		}
 
 		m->m_pkthdr.len = ti_len;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 
 		if (ifp->if_capenable & IFCAP_RXCSUM) {
@@ -2961,7 +2960,7 @@ ti_txeof(struct ti_softc *sc)
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->ti_cdata.ti_tx_tag, txd->tx_dmamap);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		m_freem(txd->tx_m);
 		txd->tx_m = NULL;
 		STAILQ_REMOVE_HEAD(&sc->ti_cdata.ti_txbusyq, tx_q);
@@ -3016,27 +3015,35 @@ ti_intr(void *xsc)
 	TI_UNLOCK(sc);
 }
 
-static void
-ti_stats_update(struct ti_softc *sc)
+static uint64_t
+ti_get_counter(struct ifnet *ifp, ift_counter cnt)
 {
-	struct ifnet *ifp;
-	struct ti_stats *s;
 
-	ifp = sc->ti_ifp;
+	switch (cnt) {
+	case IFCOUNTER_COLLISIONS:
+	    {
+		struct ti_softc *sc;
+		struct ti_stats *s;
+		uint64_t rv;
 
-	if (sc->ti_stat_ticks == 0)
-		return;
-	bus_dmamap_sync(sc->ti_cdata.ti_gib_tag, sc->ti_cdata.ti_gib_map,
-	    BUS_DMASYNC_POSTREAD);
+		sc = if_getsoftc(ifp);
+		s = &sc->ti_rdata.ti_info->ti_stats;
 
-	s = &sc->ti_rdata.ti_info->ti_stats;
-	ifp->if_collisions += (s->dot3StatsSingleCollisionFrames +
-	   s->dot3StatsMultipleCollisionFrames +
-	   s->dot3StatsExcessiveCollisions + s->dot3StatsLateCollisions) -
-	    ifp->if_collisions;
-
-	bus_dmamap_sync(sc->ti_cdata.ti_gib_tag, sc->ti_cdata.ti_gib_map,
-	    BUS_DMASYNC_PREREAD);
+		TI_LOCK(sc);
+		bus_dmamap_sync(sc->ti_cdata.ti_gib_tag,
+		    sc->ti_cdata.ti_gib_map, BUS_DMASYNC_POSTREAD);
+		rv = s->dot3StatsSingleCollisionFrames +
+		    s->dot3StatsMultipleCollisionFrames +
+		    s->dot3StatsExcessiveCollisions +
+		    s->dot3StatsLateCollisions;
+		bus_dmamap_sync(sc->ti_cdata.ti_gib_tag,
+		    sc->ti_cdata.ti_gib_map, BUS_DMASYNC_PREREAD);
+		TI_UNLOCK(sc);
+		return (rv);
+	    }
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 /*
@@ -3662,6 +3669,8 @@ ti_ioctl2(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		    sc->ti_cdata.ti_gib_map, BUS_DMASYNC_POSTREAD);
 		bcopy(&sc->ti_rdata.ti_info->ti_stats, outstats,
 		    sizeof(struct ti_stats));
+		bus_dmamap_sync(sc->ti_cdata.ti_gib_tag,
+		    sc->ti_cdata.ti_gib_map, BUS_DMASYNC_PREREAD);
 		TI_UNLOCK(sc);
 		break;
 	}
@@ -3917,7 +3926,7 @@ ti_watchdog(void *arg)
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	ti_init_locked(sc);
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c
index 754c9455a820..8535b046565f 100644
--- a/sys/dev/tl/if_tl.c
+++ b/sys/dev/tl/if_tl.c
@@ -1430,7 +1430,7 @@ tl_intvec_rxeof(xsc, type)
 		total_len = cur_rx->tl_ptr->tlist_frsize;
 
 		if (tl_newbuf(sc, cur_rx) == ENOBUFS) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->tl_ptr->tlist_frsize = MCLBYTES;
 			cur_rx->tl_ptr->tlist_cstat = TL_CSTAT_READY;
 			cur_rx->tl_ptr->tl_frag.tlist_dcnt = MCLBYTES;
@@ -1726,13 +1726,13 @@ tl_stats_update(xsc)
 	*p++ = CSR_READ_4(sc, TL_DIO_DATA);
 	*p++ = CSR_READ_4(sc, TL_DIO_DATA);
 
-	ifp->if_opackets += tl_tx_goodframes(tl_stats);
-	ifp->if_collisions += tl_stats.tl_tx_single_collision +
-				tl_stats.tl_tx_multi_collision;
-	ifp->if_ipackets += tl_rx_goodframes(tl_stats);
-	ifp->if_ierrors += tl_stats.tl_crc_errors + tl_stats.tl_code_errors +
-			    tl_rx_overrun(tl_stats);
-	ifp->if_oerrors += tl_tx_underrun(tl_stats);
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, tl_tx_goodframes(tl_stats));
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    tl_stats.tl_tx_single_collision + tl_stats.tl_tx_multi_collision);
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, tl_rx_goodframes(tl_stats));
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, tl_stats.tl_crc_errors +
+	    tl_stats.tl_code_errors + tl_rx_overrun(tl_stats));
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, tl_tx_underrun(tl_stats));
 
 	if (tl_tx_underrun(tl_stats)) {
 		u_int8_t		tx_thresh;
@@ -2186,7 +2186,7 @@ tl_watchdog(sc)
 
 	if_printf(ifp, "device timeout\n");
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	tl_softreset(sc, 1);
 	tl_init_locked(sc);
diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
index c6e57e954426..7ec2f986ef65 100644
--- a/sys/dev/tsec/if_tsec.c
+++ b/sys/dev/tsec/if_tsec.c
@@ -687,7 +687,7 @@ tsec_watchdog(struct tsec_softc *sc)
 		return;
 
 	ifp = sc->tsec_ifp;
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	tsec_stop(sc);
@@ -1349,7 +1349,7 @@ tsec_receive_intr_locked(struct tsec_softc *sc, int count)
 
 		if (tsec_new_rxbuf(sc->tsec_rx_mtag, rx_data[i].map,
 		    &rx_data[i].mbuf, &rx_data[i].paddr)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			/*
 			 * We ran out of mbufs; didn't consume current
 			 * descriptor and have to return it to the queue.
@@ -1430,7 +1430,7 @@ tsec_transmit_intr_locked(struct tsec_softc *sc)
 	ifp = sc->tsec_ifp;
 
 	/* Update collision statistics */
-	ifp->if_collisions += TSEC_READ(sc, TSEC_REG_MON_TNCL);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, TSEC_READ(sc, TSEC_REG_MON_TNCL));
 
 	/* Reset collision counters in hardware */
 	TSEC_WRITE(sc, TSEC_REG_MON_TSCL, 0);
@@ -1465,7 +1465,7 @@ tsec_transmit_intr_locked(struct tsec_softc *sc)
 		TSEC_FREE_TX_MAP(sc, mapp);
 		m_freem(m0);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		send = 1;
 	}
 	bus_dmamap_sync(sc->tsec_tx_dtag, sc->tsec_tx_dmap,
@@ -1522,18 +1522,18 @@ tsec_error_intr_locked(struct tsec_softc *sc, int count)
 
 	/* Check transmitter errors */
 	if (eflags & TSEC_IEVENT_TXE) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (eflags & TSEC_IEVENT_LC)
-			ifp->if_collisions++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 
 		TSEC_WRITE(sc, TSEC_REG_TSTAT, TSEC_TSTAT_THLT);
 	}
 
 	/* Check receiver errors */
 	if (eflags & TSEC_IEVENT_BSY) {
-		ifp->if_ierrors++;
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 
 		/* Get data from RX buffers */
 		tsec_receive_intr_locked(sc, count);
@@ -1550,10 +1550,10 @@ tsec_error_intr_locked(struct tsec_softc *sc, int count)
 	}
 
 	if (eflags & TSEC_IEVENT_BABT)
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	if (eflags & TSEC_IEVENT_BABR)
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 }
 
 void
diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c
index 11013cbc2b55..a94ac25e948a 100644
--- a/sys/dev/tws/tws.c
+++ b/sys/dev/tws/tws.c
@@ -198,6 +198,7 @@ tws_attach(device_t dev)
     mtx_init( &sc->sim_lock,  "tws_sim_lock", NULL, MTX_DEF);
     mtx_init( &sc->gen_lock,  "tws_gen_lock", NULL, MTX_DEF);
     mtx_init( &sc->io_lock,  "tws_io_lock", NULL, MTX_DEF | MTX_RECURSE);
+    callout_init(&sc->stats_timer, CALLOUT_MPSAFE);
 
     if ( tws_init_trace_q(sc) == FAILURE )
         printf("trace init failure\n");
@@ -408,11 +409,20 @@ tws_detach(device_t dev)
             TWS_TRACE(sc, "bus release mem resource", 0, sc->reg_res_id);
     }
 
+    for ( i=0; i< tws_queue_depth; i++) {
+	    if (sc->reqs[i].dma_map)
+		    bus_dmamap_destroy(sc->data_tag, sc->reqs[i].dma_map);
+	    callout_drain(&sc->reqs[i].timeout);
+    }
+
+    callout_drain(&sc->stats_timer);
     free(sc->reqs, M_TWS);
     free(sc->sense_bufs, M_TWS);
     free(sc->scan_ccb, M_TWS);
     if (sc->ioctl_data_mem)
             bus_dmamem_free(sc->data_tag, sc->ioctl_data_mem, sc->ioctl_data_map);
+    if (sc->data_tag)
+	    bus_dma_tag_destroy(sc->data_tag);
     free(sc->aen_q.q, M_TWS);
     free(sc->trace_q.q, M_TWS);
     mtx_destroy(&sc->q_lock);
@@ -709,7 +719,7 @@ tws_init_reqs(struct tws_softc *sc, u_int32_t dma_mem_size)
 
         sc->reqs[i].cmd_pkt->hdr.header_desc.size_header = 128;
 
-	callout_handle_init(&sc->reqs[i].thandle);
+	callout_init(&sc->reqs[i].timeout, CALLOUT_MPSAFE);
         sc->reqs[i].state = TWS_REQ_STATE_FREE;
         if ( i >= TWS_RESERVED_REQS )
             tws_q_insert_tail(sc, &sc->reqs[i], TWS_FREE_Q);
@@ -859,7 +869,7 @@ tws_get_request(struct tws_softc *sc, u_int16_t type)
         r->error_code = TWS_REQ_RET_INVALID;
         r->cb = NULL;
         r->ccb_ptr = NULL;
-        r->thandle.callout = NULL;
+	callout_stop(&r->timeout);
         r->next = r->prev = NULL;
 
         r->state = ((type == TWS_REQ_TYPE_SCSI_IO) ? TWS_REQ_STATE_TRAN : TWS_REQ_STATE_BUSY);
diff --git a/sys/dev/tws/tws.h b/sys/dev/tws/tws.h
index 11017300acc0..8cb9791c0ad8 100644
--- a/sys/dev/tws/tws.h
+++ b/sys/dev/tws/tws.h
@@ -268,4 +268,5 @@ struct tws_softc {
     union ccb *scan_ccb;                  /* pointer to a ccb */
     struct tws_request *q_head[TWS_MAX_QS]; /* head pointers to q's */
     struct tws_request *q_tail[TWS_MAX_QS]; /* tail pointers to q's */
+    struct callout stats_timer;
 };
diff --git a/sys/dev/tws/tws_cam.c b/sys/dev/tws/tws_cam.c
index cb94fee5f246..9b429d2542ed 100644
--- a/sys/dev/tws/tws_cam.c
+++ b/sys/dev/tws/tws_cam.c
@@ -341,7 +341,7 @@ tws_scsi_complete(struct tws_request *req)
     tws_q_remove_request(sc, req, TWS_BUSY_Q);
     mtx_unlock(&sc->q_lock);
 
-    untimeout(tws_timeout, req, req->thandle);
+    callout_stop(&req->timeout);
     tws_unmap_request(req->sc, req);
 
 
@@ -362,7 +362,7 @@ tws_getset_param_complete(struct tws_request *req)
 
     TWS_TRACE_DEBUG(sc, "getset complete", req, req->request_id);
 
-    untimeout(tws_timeout, req, req->thandle);
+    callout_stop(&req->timeout);
     tws_unmap_request(sc, req);
 
     free(req->data, M_TWS);
@@ -380,7 +380,7 @@ tws_aen_complete(struct tws_request *req)
 
     TWS_TRACE_DEBUG(sc, "aen complete", 0, req->request_id);
 
-    untimeout(tws_timeout, req, req->thandle);
+    callout_stop(&req->timeout);
     tws_unmap_request(sc, req);
 
     sense = (struct tws_command_header *)req->data;
@@ -454,7 +454,7 @@ tws_cmd_complete(struct tws_request *req)
 {
     struct tws_softc *sc = req->sc;
 
-    untimeout(tws_timeout, req, req->thandle);
+    callout_stop(&req->timeout);
     tws_unmap_request(sc, req);
 }
                                    
@@ -561,7 +561,7 @@ tws_scsi_err_complete(struct tws_request *req, struct tws_command_header *hdr)
     xpt_done(ccb);
     mtx_unlock(&sc->sim_lock);
 
-    untimeout(tws_timeout, req, req->thandle);
+    callout_stop(&req->timeout);
     tws_unmap_request(req->sc, req);
     mtx_lock(&sc->q_lock);
     tws_q_remove_request(sc, req, TWS_BUSY_Q);
@@ -591,7 +591,7 @@ tws_drain_busy_queue(struct tws_softc *sc)
     mtx_unlock(&sc->q_lock);
     while ( req ) {
         TWS_TRACE_DEBUG(sc, "moved to TWS_COMPLETE_Q", 0, req->request_id);
-        untimeout(tws_timeout, req, req->thandle);
+	callout_stop(&req->timeout);
 
         req->error_code = TWS_REQ_RET_RESET;
         ccb = (union ccb *)(req->ccb_ptr);
@@ -622,7 +622,7 @@ tws_drain_reserved_reqs(struct tws_softc *sc)
     r = &sc->reqs[TWS_REQ_TYPE_AEN_FETCH];
     if ( r->state != TWS_REQ_STATE_FREE ) {
         TWS_TRACE_DEBUG(sc, "reset aen req", 0, 0);
-        untimeout(tws_timeout, r, r->thandle);
+	callout_stop(&r->timeout);
         tws_unmap_request(sc, r);
         free(r->data, M_TWS);
         r->state = TWS_REQ_STATE_FREE;
@@ -638,7 +638,7 @@ tws_drain_reserved_reqs(struct tws_softc *sc)
     r = &sc->reqs[TWS_REQ_TYPE_GETSET_PARAM];
     if ( r->state != TWS_REQ_STATE_FREE ) {
         TWS_TRACE_DEBUG(sc, "reset setparam req", 0, 0);
-        untimeout(tws_timeout, r, r->thandle);
+	callout_stop(&r->timeout);
         tws_unmap_request(sc, r);
         free(r->data, M_TWS);
         r->state = TWS_REQ_STATE_FREE;
@@ -747,7 +747,7 @@ tws_execute_scsi(struct tws_softc *sc, union ccb *ccb)
      * and submit the I/O.
      */
     sc->stats.scsi_ios++;
-    req->thandle = timeout(tws_timeout, req, (ccb_h->timeout * hz)/1000);
+    callout_reset(&req->timeout, (ccb_h->timeout * hz) / 1000, tws_timeout, req);
     error = tws_map_request(sc, req);
     return(error);
 }
@@ -785,7 +785,7 @@ tws_send_scsi_cmd(struct tws_softc *sc, int cmd)
     bzero(req->data, TWS_SECTOR_SIZE);
     req->flags = TWS_DIR_IN;
 
-    req->thandle = timeout(tws_timeout, req, (TWS_IO_TIMEOUT * hz));
+    callout_reset(&req->timeout, (TWS_IO_TIMEOUT * hz), tws_timeout, req);
     error = tws_map_request(sc, req);
     return(error);
 
@@ -832,7 +832,7 @@ tws_set_param(struct tws_softc *sc, u_int32_t table_id, u_int32_t param_id,
     param->parameter_size_bytes = (u_int16_t)param_size;
     memcpy(param->data, data, param_size);
 
-    req->thandle = timeout(tws_timeout, req, (TWS_IOCTL_TIMEOUT * hz));
+    callout_reset(&req->timeout, (TWS_IOCTL_TIMEOUT * hz), tws_timeout, req);
     error = tws_map_request(sc, req);
     return(error);
 
@@ -1168,7 +1168,6 @@ tws_timeout(void *arg)
         return;
     }
 
-    tws_teardown_intr(sc);
     xpt_freeze_simq(sc->sim, 1);
 
     tws_send_event(sc, TWS_RESET_START);
@@ -1191,7 +1190,6 @@ tws_timeout(void *arg)
     mtx_unlock(&sc->gen_lock);
 
     xpt_release_simq(sc->sim, 1);
-    tws_setup_intr(sc, sc->irqs);
 }
 
 void
@@ -1205,7 +1203,6 @@ tws_reset(void *arg)
         return;
     }
 
-    tws_teardown_intr(sc);
     xpt_freeze_simq(sc->sim, 1);
 
     tws_send_event(sc, TWS_RESET_START);
@@ -1222,7 +1219,6 @@ tws_reset(void *arg)
     mtx_unlock(&sc->gen_lock);
 
     xpt_release_simq(sc->sim, 1);
-    tws_setup_intr(sc, sc->irqs);
 }
 
 static void
diff --git a/sys/dev/tws/tws_hdm.c b/sys/dev/tws/tws_hdm.c
index f5bb3f16a636..2e568c8653fc 100644
--- a/sys/dev/tws/tws_hdm.c
+++ b/sys/dev/tws/tws_hdm.c
@@ -161,7 +161,7 @@ tws_init_connect(struct tws_softc *sc, u_int16_t mcreadits )
     req->error_code = TWS_REQ_RET_INVALID;
     req->cb = NULL;
     req->ccb_ptr = NULL;
-    req->thandle.callout = NULL;
+    callout_stop(&req->timeout);
     req->next = req->prev = NULL;
     req->state = TWS_REQ_STATE_BUSY;
 #endif // 0
diff --git a/sys/dev/tws/tws_hdm.h b/sys/dev/tws/tws_hdm.h
index 58feeeecf5bb..5cacf19b9326 100644
--- a/sys/dev/tws/tws_hdm.h
+++ b/sys/dev/tws/tws_hdm.h
@@ -410,7 +410,7 @@ struct tws_request {
     void         (*cb)(struct tws_request *);      /* callback func */
     bus_dmamap_t dma_map;        /* dma map */
     union ccb    *ccb_ptr;       /* pointer to ccb */
-    struct callout_handle thandle; /* handle to req timeout */
+    struct callout timeout;	 /* request timeout timer */
     struct tws_softc *sc;        /* pointer back to ctlr softc */
 
     struct tws_request *next;    /* pointer to next request */
diff --git a/sys/dev/tws/tws_services.c b/sys/dev/tws/tws_services.c
index d2a52cd5ff3f..243585b6b223 100644
--- a/sys/dev/tws/tws_services.c
+++ b/sys/dev/tws/tws_services.c
@@ -395,7 +395,6 @@ tws_print_stats(void *arg)
                                       , sc->stats.num_intrs);
     TWS_TRACE(sc, "reqs(ioctls, scsi)", sc->stats.ioctls
                                       , sc->stats.scsi_ios);
-    timeout(tws_print_stats, sc, 300*hz);
-
+    callout_reset(&sc->stats_timer, 300 * hz, tws_print_stats, sc);
 }
 /* --------------------- misc service end --------------------- */
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 7a965588d908..7a12aee288d1 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -671,7 +671,7 @@ epic_ifstart_locked(struct ifnet * ifp)
 
 		if (error && error != EFBIG) {
 			m_freem(m0);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
@@ -683,7 +683,7 @@ epic_ifstart_locked(struct ifnet * ifp)
 			m = m_defrag(m0, M_NOWAIT);
 			if (m == NULL) {
 				m_freem(m0);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 			m_freem(m0);
@@ -693,7 +693,7 @@ epic_ifstart_locked(struct ifnet * ifp)
 			    epic_dma_map_txbuf, flist, 0);
 			if (error) {
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		}
@@ -748,7 +748,7 @@ epic_rx_done(epic_softc_t *sc)
 		 * RXE interrupt usually.
 		 */
 		if ((desc->status & 1) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			desc->status = 0x8000;
 			continue;
 		}
@@ -763,7 +763,7 @@ epic_rx_done(epic_softc_t *sc)
 		if (buf->mbuf == NULL) {
 			buf->mbuf = m;
 			desc->status = 0x8000;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 		buf->mbuf->m_len = buf->mbuf->m_pkthdr.len = MCLBYTES;
@@ -775,7 +775,7 @@ epic_rx_done(epic_softc_t *sc)
 		if (error) {
 			buf->mbuf = m;
 			desc->status = 0x8000;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			continue;
 		}
 
@@ -796,7 +796,7 @@ epic_rx_done(epic_softc_t *sc)
 		EPIC_LOCK(sc);
 
 		/* Successfuly received frame */
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
         }
 	bus_dmamap_sync(sc->rtag, sc->rmap,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -838,10 +838,10 @@ epic_tx_done(epic_softc_t *sc)
 
 		/* Check for errors and collisions. */
 		if (status & 0x0001)
-			sc->ifp->if_opackets++;
+			if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 		else
-			sc->ifp->if_oerrors++;
-		sc->ifp->if_collisions += (status >> 8) & 0x1F;
+			if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
+		if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, (status >> 8) & 0x1F);
 #ifdef EPIC_DIAG
 		if ((status & 0x1001) == 0x1001)
 			device_printf(sc->dev,
@@ -881,7 +881,7 @@ epic_intr(void *arg)
 #endif
 		if ((CSR_READ_4(sc, COMMAND) & COMMAND_RXQUEUED) == 0)
 		    CSR_WRITE_4(sc, COMMAND, COMMAND_RXQUEUED);
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	    }
 	}
 
@@ -911,12 +911,12 @@ epic_intr(void *arg)
 #ifdef EPIC_DIAG
 		device_printf(sc->dev, "CRC/Alignment error\n");
 #endif
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	    }
 
 	    if (status & INTSTAT_TXU) {
 		epic_tx_underrun(sc);
-		sc->ifp->if_oerrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 	    }
 	}
     }
@@ -981,7 +981,7 @@ epic_timer(void *arg)
 
 		/* If not successful. */
 		if (sc->pending_txs > 0) {
-			ifp->if_oerrors += sc->pending_txs;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, sc->pending_txs);
 
 			/* Reinitialize board. */
 			device_printf(sc->dev, "reinitialization\n");
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index d000db43a895..8e0b91cf915a 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -149,6 +149,7 @@ static int txp_intr(void *);
 static void txp_int_task(void *, int);
 static void txp_tick(void *);
 static int txp_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t txp_get_counter(struct ifnet *, ift_counter);
 static void txp_start(struct ifnet *);
 static void txp_start_locked(struct ifnet *);
 static int txp_encap(struct txp_softc *, struct txp_tx_ring *, struct mbuf **);
@@ -413,6 +414,7 @@ txp_attach(device_t dev)
 	ifp->if_ioctl = txp_ioctl;
 	ifp->if_start = txp_start;
 	ifp->if_init = txp_init;
+	ifp->if_get_counter = txp_get_counter;
 	ifp->if_snd.ifq_drv_maxlen = TX_ENTRIES - 1;
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
 	IFQ_SET_READY(&ifp->if_snd);
@@ -2540,7 +2542,7 @@ txp_watchdog(struct txp_softc *sc)
 
 	ifp = sc->sc_ifp;
 	if_printf(ifp, "watchdog timeout -- resetting\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	txp_stop(sc);
 	txp_init_locked(sc);
 }
@@ -2816,13 +2818,11 @@ txp_stats_save(struct txp_softc *sc)
 static void
 txp_stats_update(struct txp_softc *sc, struct txp_rsp_desc *rsp)
 {
-	struct ifnet *ifp;
 	struct txp_hw_stats *ostats, *stats;
 	struct txp_ext_desc *ext;
 
 	TXP_LOCK_ASSERT(sc);
 
-	ifp = sc->sc_ifp;
 	ext = (struct txp_ext_desc *)(rsp + 1);
 	ostats = &sc->sc_ostats;
 	stats = &sc->sc_stats;
@@ -2856,15 +2856,34 @@ txp_stats_update(struct txp_softc *sc, struct txp_rsp_desc *rsp)
 	    le32toh(ext[4].ext_3);
 	stats->rx_oflows = ostats->rx_oflows + le32toh(ext[4].ext_4);
 	stats->rx_filtered = ostats->rx_filtered + le32toh(ext[5].ext_1);
+}
 
-	ifp->if_ierrors = stats->rx_fifo_oflows + stats->rx_badssd +
-	    stats->rx_crcerrs + stats->rx_lenerrs + stats->rx_oflows;
-	ifp->if_oerrors = stats->tx_deferred + stats->tx_carrier_lost +
-	    stats->tx_fifo_underruns + stats->tx_mcast_oflows;
-	ifp->if_collisions = stats->tx_late_colls + stats->tx_multi_colls +
-	    stats->tx_excess_colls;
-	ifp->if_opackets = stats->tx_frames;
-	ifp->if_ipackets = stats->rx_frames;
+static uint64_t
+txp_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct txp_softc *sc;
+	struct txp_hw_stats *stats;
+
+	sc = if_getsoftc(ifp);
+	stats = &sc->sc_stats;
+
+	switch (cnt) {
+	case IFCOUNTER_IERRORS:
+		return (stats->rx_fifo_oflows + stats->rx_badssd +
+		    stats->rx_crcerrs + stats->rx_lenerrs + stats->rx_oflows);
+	case IFCOUNTER_OERRORS:
+		return (stats->tx_deferred + stats->tx_carrier_lost +
+		    stats->tx_fifo_underruns + stats->tx_mcast_oflows);
+	case IFCOUNTER_COLLISIONS:
+		return (stats->tx_late_colls + stats->tx_multi_colls +
+		    stats->tx_excess_colls);
+	case IFCOUNTER_OPACKETS:
+		return (stats->tx_frames);
+	case IFCOUNTER_IPACKETS:
+		return (stats->rx_frames);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 #define	TXP_SYSCTL_STAT_ADD32(c, h, n, p, d)	\
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 0bceddeabe35..8ab50224a7c9 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -65,6 +65,7 @@ struct uart_bas {
 struct uart_class;
 
 extern struct uart_class uart_imx_class __attribute__((weak));
+extern struct uart_class uart_msm_class __attribute__((weak));
 extern struct uart_class uart_ns8250_class __attribute__((weak));
 extern struct uart_class uart_quicc_class __attribute__((weak));
 extern struct uart_class uart_s3c2410_class __attribute__((weak));
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index 92e155b34a7a..f52fec1e5936 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -84,6 +84,7 @@ static struct ofw_compat_data compat_data[] = {
 	{"fsl,imx21-uart",	(uintptr_t)&uart_imx_class},
 	{"fsl,mvf600-uart",	(uintptr_t)&uart_vybrid_class},
 	{"lpc,uart",		(uintptr_t)&uart_lpc_class},
+        {"qcom,uart-dm",        (uintptr_t)&uart_msm_class},
 	{"ti,ns16550",		(uintptr_t)&uart_ti8250_class},
 	{"ns16550",		(uintptr_t)&uart_ns8250_class},
 	{NULL,			(uintptr_t)NULL},
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index 43338febb6c6..2def18cbdbd1 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -90,6 +90,45 @@ imx_uart_probe(struct uart_bas *bas)
 	return (0);
 }
 
+static u_int
+imx_uart_getbaud(struct uart_bas *bas)
+{
+	uint32_t rate, ubir, ubmr;
+	u_int baud, blo, bhi, i;
+	static const u_int predivs[] = {6, 5, 4, 3, 2, 1, 7, 1};
+	static const u_int std_rates[] = {
+		9600, 14400, 19200, 38400, 57600, 115200, 230400, 460800, 921600
+	};
+
+	/*
+	 * Get the baud rate the hardware is programmed for, then search the
+	 * table of standard baud rates for a number that's within 3% of the
+	 * actual rate the hardware is programmed for.  It's more comforting to
+	 * see that your console is running at 115200 than 114942.  Note that
+	 * here we cannot make a simplifying assumption that the predivider and
+	 * numerator are 1 (like we do when setting the baud rate), because we
+	 * don't know what u-boot might have set up.
+	 */
+	i = (GETREG(bas, REG(UFCR)) & IMXUART_UFCR_RFDIV_MASK) >>
+	    IMXUART_UFCR_RFDIV_SHIFT;
+	rate = imx_ccm_uart_hz() / predivs[i];
+	ubir = GETREG(bas, REG(UBIR)) + 1;
+	ubmr = GETREG(bas, REG(UBMR)) + 1;
+	baud = ((rate / 16 ) * ubir) / ubmr;
+
+	blo = (baud * 100) / 103;
+	bhi = (baud * 100) / 97;
+	for (i = 0; i < nitems(std_rates); i++) {
+		rate = std_rates[i];
+		if (rate >= blo && rate <= bhi) {
+			baud = rate;
+			break;
+		}
+	}
+
+	return (baud);
+}
+
 static void
 imx_uart_init(struct uart_bas *bas, int baudrate, int databits, 
     int stopbits, int parity)
@@ -348,8 +387,7 @@ imx_uart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
 		/* TODO */
 		break;
 	case UART_IOCTL_BAUD:
-		/* TODO */
-		*(int*)data = 115200;
+		*(u_int*)data = imx_uart_getbaud(bas);
 		break;
 	default:
 		error = EINVAL;
diff --git a/sys/dev/uart/uart_dev_msm.c b/sys/dev/uart/uart_dev_msm.c
new file mode 100644
index 000000000000..12dc8a7b63cd
--- /dev/null
+++ b/sys/dev/uart/uart_dev_msm.c
@@ -0,0 +1,568 @@
+/*-
+ * Copyright (c) 2014 Ganbold Tsagaankhuu <ganbold@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/* Qualcomm MSM7K/8K uart driver */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_ddb.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kdb.h>
+#include <machine/bus.h>
+#include <machine/fdt.h>
+
+#include <dev/uart/uart.h>
+#include <dev/uart/uart_cpu.h>
+#include <dev/uart/uart_bus.h>
+#include <dev/uart/uart_dev_msm.h>
+
+#include "uart_if.h"
+
+#define	DEF_CLK		7372800
+
+#define	GETREG(bas, reg)	\
+    bus_space_read_4((bas)->bst, (bas)->bsh, (reg))
+#define	SETREG(bas, reg, value)	\
+    bus_space_write_4((bas)->bst, (bas)->bsh, (reg), (value))
+
+static int msm_uart_param(struct uart_bas *, int, int, int, int);
+
+/*
+ * Low-level UART interface.
+ */
+static int	msm_probe(struct uart_bas *bas);
+static void	msm_init(struct uart_bas *bas, int, int, int, int);
+static void	msm_term(struct uart_bas *bas);
+static void	msm_putc(struct uart_bas *bas, int);
+static int	msm_rxready(struct uart_bas *bas);
+static int	msm_getc(struct uart_bas *bas, struct mtx *mtx);
+
+extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
+
+static int
+msm_uart_param(struct uart_bas *bas, int baudrate, int databits,
+    int stopbits, int parity)
+{
+	int ulcon;
+
+	ulcon = 0;
+
+	switch (databits) {
+	case 5:
+		ulcon |= (UART_DM_5_BPS << 4);
+		break;
+	case 6:
+		ulcon |= (UART_DM_6_BPS << 4);
+		break;
+	case 7:
+		ulcon |= (UART_DM_7_BPS << 4);
+		break;
+	case 8:
+		ulcon |= (UART_DM_8_BPS << 4);
+		break;
+	default:
+		return (EINVAL);
+	}
+
+	switch (parity) {
+	case UART_PARITY_NONE:
+		ulcon |= UART_DM_NO_PARITY;
+		break;
+	case UART_PARITY_ODD:
+		ulcon |= UART_DM_ODD_PARITY;
+		break;
+	case UART_PARITY_EVEN:
+		ulcon |= UART_DM_EVEN_PARITY;
+		break;
+	case UART_PARITY_SPACE:
+		ulcon |= UART_DM_SPACE_PARITY;
+		break;
+	case UART_PARITY_MARK:
+	default:
+		return (EINVAL);
+	}
+
+	switch (stopbits) {
+	case 1:
+		ulcon |= (UART_DM_SBL_1 << 2);
+		break;
+	case 2:
+		ulcon |= (UART_DM_SBL_2 << 2);
+		break;
+	default:
+		return (EINVAL);
+	}
+	uart_setreg(bas, UART_DM_MR2, ulcon);
+
+	/* Set 115200 for both TX and RX. */;
+	uart_setreg(bas, UART_DM_CSR, UART_DM_CSR_115200);
+	uart_barrier(bas);
+
+	return (0);
+}
+
+struct uart_ops uart_msm_ops = {
+	.probe = msm_probe,
+	.init = msm_init,
+	.term = msm_term,
+	.putc = msm_putc,
+	.rxready = msm_rxready,
+	.getc = msm_getc,
+};
+
+static int
+msm_probe(struct uart_bas *bas)
+{
+
+	return (0);
+}
+
+static void
+msm_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
+    int parity)
+{
+
+	if (bas->rclk == 0)
+		bas->rclk = DEF_CLK;
+
+	KASSERT(bas->rclk != 0, ("msm_init: Invalid rclk"));
+
+	/* Set default parameters */
+	msm_uart_param(bas, baudrate, databits, stopbits, parity);
+
+	/*
+	 * Configure UART mode registers MR1 and MR2.
+	 * Hardware flow control isn't supported.
+	 */
+	uart_setreg(bas, UART_DM_MR1, 0x0);
+
+	/* Reset interrupt mask register. */
+	uart_setreg(bas, UART_DM_IMR, 0);
+
+	/*
+	 * Configure Tx and Rx watermarks configuration registers.
+	 * TX watermark value is set to 0 - interrupt is generated when
+	 * FIFO level is less than or equal to 0.
+	 */
+	uart_setreg(bas, UART_DM_TFWR, UART_DM_TFW_VALUE);
+
+	/* Set RX watermark value */
+	uart_setreg(bas, UART_DM_RFWR, UART_DM_RFW_VALUE);
+
+	/*
+	 * Configure Interrupt Programming Register.
+	 * Set initial Stale timeout value.
+	 */
+	uart_setreg(bas, UART_DM_IPR, UART_DM_STALE_TIMEOUT_LSB);
+
+	/* Disable IRDA mode */
+	uart_setreg(bas, UART_DM_IRDA, 0x0);
+
+	/*
+	 * Configure and enable sim interface if required.
+	 * Configure hunt character value in HCR register.
+	 * Keep it in reset state.
+	 */
+	uart_setreg(bas, UART_DM_HCR, 0x0);
+
+	/* Issue soft reset command */
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_TX);
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_RX);
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_ERROR_STATUS);
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_BREAK_INT);
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_STALE_INT);
+
+	/* Enable/Disable Rx/Tx DM interfaces */
+	/* Disable Data Mover for now. */
+	uart_setreg(bas, UART_DM_DMEN, 0x0);
+
+	/* Enable transmitter and receiver */
+	uart_setreg(bas, UART_DM_CR, UART_DM_CR_RX_ENABLE);
+	uart_setreg(bas, UART_DM_CR, UART_DM_CR_TX_ENABLE);
+
+	uart_barrier(bas);
+}
+
+static void
+msm_term(struct uart_bas *bas)
+{
+
+	/* XXX */
+}
+
+static void
+msm_putc(struct uart_bas *bas, int c)
+{
+	int limit;
+
+	/*
+	 * Write to NO_CHARS_FOR_TX register the number of characters
+	 * to be transmitted. However, before writing TX_FIFO must
+	 * be empty as indicated by TX_READY interrupt in IMR register
+	 */
+
+	/*
+	 * Check if transmit FIFO is empty.
+	 * If not wait for TX_READY interrupt.
+	 */
+	limit = 1000;
+	if (!(uart_getreg(bas, UART_DM_SR) & UART_DM_SR_TXEMT)) {
+		while ((uart_getreg(bas, UART_DM_ISR) & UART_DM_TX_READY) == 0
+		    && --limit)
+			DELAY(4);
+	}
+	/* FIFO is ready, write number of characters to be written */
+	uart_setreg(bas, UART_DM_NO_CHARS_FOR_TX, 1);
+
+	/* Wait till TX FIFO has space */
+	while ((uart_getreg(bas, UART_DM_SR) & UART_DM_SR_TXRDY) == 0)
+		DELAY(4);
+
+	/* TX FIFO has space. Write char */
+	SETREG(bas, UART_DM_TF(0), (c & 0xff));
+}
+
+static int
+msm_rxready(struct uart_bas *bas)
+{
+
+	/* Wait for a character to come ready */
+	return ((uart_getreg(bas, UART_DM_SR) & UART_DM_SR_RXRDY) ==
+	    UART_DM_SR_RXRDY);
+}
+
+static int
+msm_getc(struct uart_bas *bas, struct mtx *mtx)
+{
+	int c;
+
+	uart_lock(mtx);
+
+	/* Wait for a character to come ready */
+	while ((uart_getreg(bas, UART_DM_SR) & UART_DM_SR_RXRDY) !=
+	    UART_DM_SR_RXRDY)
+		DELAY(4);
+
+	/* Check for Overrun error. If so reset Error Status */
+	if (uart_getreg(bas, UART_DM_SR) & UART_DM_SR_UART_OVERRUN)
+		uart_setreg(bas, UART_DM_CR, UART_DM_RESET_ERROR_STATUS);
+
+	/* Read char */
+	c = uart_getreg(bas, UART_DM_RF(0));
+
+	uart_unlock(mtx);
+
+	return (c);
+}
+
+/*
+ * High-level UART interface.
+ */
+struct msm_uart_softc {
+	struct uart_softc base;
+	uint32_t ier;
+};
+
+static int	msm_bus_probe(struct uart_softc *sc);
+static int	msm_bus_attach(struct uart_softc *sc);
+static int	msm_bus_flush(struct uart_softc *, int);
+static int	msm_bus_getsig(struct uart_softc *);
+static int	msm_bus_ioctl(struct uart_softc *, int, intptr_t);
+static int	msm_bus_ipend(struct uart_softc *);
+static int	msm_bus_param(struct uart_softc *, int, int, int, int);
+static int	msm_bus_receive(struct uart_softc *);
+static int	msm_bus_setsig(struct uart_softc *, int);
+static int	msm_bus_transmit(struct uart_softc *);
+static void	msm_bus_grab(struct uart_softc *);
+static void	msm_bus_ungrab(struct uart_softc *);
+
+static kobj_method_t msm_methods[] = {
+	KOBJMETHOD(uart_probe,		msm_bus_probe),
+	KOBJMETHOD(uart_attach, 	msm_bus_attach),
+	KOBJMETHOD(uart_flush,		msm_bus_flush),
+	KOBJMETHOD(uart_getsig,		msm_bus_getsig),
+	KOBJMETHOD(uart_ioctl,		msm_bus_ioctl),
+	KOBJMETHOD(uart_ipend,		msm_bus_ipend),
+	KOBJMETHOD(uart_param,		msm_bus_param),
+	KOBJMETHOD(uart_receive,	msm_bus_receive),
+	KOBJMETHOD(uart_setsig,		msm_bus_setsig),
+	KOBJMETHOD(uart_transmit,	msm_bus_transmit),
+	KOBJMETHOD(uart_grab,		msm_bus_grab),
+	KOBJMETHOD(uart_ungrab,		msm_bus_ungrab),
+	{0, 0 }
+};
+
+int
+msm_bus_probe(struct uart_softc *sc)
+{
+
+	sc->sc_txfifosz = 64;
+	sc->sc_rxfifosz = 64;
+
+	device_set_desc(sc->sc_dev, "Qualcomm HSUART");
+
+	return (0);
+}
+
+static int
+msm_bus_attach(struct uart_softc *sc)
+{
+	struct msm_uart_softc *u = (struct msm_uart_softc *)sc;
+	struct uart_bas *bas = &sc->sc_bas;
+
+	sc->sc_hwiflow = 0;
+	sc->sc_hwoflow = 0;
+
+	/* Set TX_READY, TXLEV, RXLEV, RXSTALE */
+	u->ier = UART_DM_IMR_ENABLED;
+
+	/* Configure Interrupt Mask register IMR */
+	uart_setreg(bas, UART_DM_IMR, u->ier);
+
+	return (0);
+}
+
+/*
+ * Write the current transmit buffer to the TX FIFO. 
+ */
+static int
+msm_bus_transmit(struct uart_softc *sc)
+{
+	struct msm_uart_softc *u = (struct msm_uart_softc *)sc;
+	struct uart_bas *bas = &sc->sc_bas;
+	int i;
+
+	uart_lock(sc->sc_hwmtx);
+
+	/* Write some data */
+	for (i = 0; i < sc->sc_txdatasz; i++) {
+		/* Write TX data */
+		msm_putc(bas, sc->sc_txbuf[i]);
+		uart_barrier(bas);
+	}
+
+	/* TX FIFO is empty now, enable TX_READY interrupt */
+	u->ier |= UART_DM_TX_READY;
+	SETREG(bas, UART_DM_IMR, u->ier);
+	uart_barrier(bas);
+
+	/*
+	 * Inform upper layer that it is transmitting data to hardware,
+	 * this will be cleared when TXIDLE interrupt occurs.
+	 */
+	sc->sc_txbusy = 1;
+	uart_unlock(sc->sc_hwmtx);
+
+	return (0);
+}
+
+static int
+msm_bus_setsig(struct uart_softc *sc, int sig)
+{
+
+	return (0);
+}
+
+static int
+msm_bus_receive(struct uart_softc *sc)
+{
+	struct msm_uart_softc *u = (struct msm_uart_softc *)sc;
+	struct uart_bas *bas;
+	int c;
+
+	bas = &sc->sc_bas;
+	uart_lock(sc->sc_hwmtx);
+
+	/* Initialize Receive Path and interrupt */
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_STALE_INT);
+	SETREG(bas, UART_DM_CR, UART_DM_STALE_EVENT_ENABLE);
+	u->ier |= UART_DM_RXLEV;
+	SETREG(bas, UART_DM_IMR, u->ier);
+
+	/* Loop over until we are full, or no data is available */
+	while (uart_getreg(bas, UART_DM_SR) & UART_DM_SR_RXRDY) {
+		if (uart_rx_full(sc)) {
+			/* No space left in input buffer */
+			sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN;
+			break;
+		}
+
+		/* Read RX FIFO */
+		c = uart_getreg(bas, UART_DM_RF(0));
+		uart_barrier(bas);
+
+		uart_rx_put(sc, c);
+	}
+
+	uart_unlock(sc->sc_hwmtx);
+
+	return (0);
+}
+
+static int
+msm_bus_param(struct uart_softc *sc, int baudrate, int databits,
+    int stopbits, int parity)
+{
+	int error;
+
+	if (sc->sc_bas.rclk == 0)
+		sc->sc_bas.rclk = DEF_CLK;
+
+	KASSERT(sc->sc_bas.rclk != 0, ("msm_init: Invalid rclk"));
+
+	uart_lock(sc->sc_hwmtx);
+	error = msm_uart_param(&sc->sc_bas, baudrate, databits, stopbits,
+	    parity);
+	uart_unlock(sc->sc_hwmtx);
+
+	return (error);
+}
+
+static int
+msm_bus_ipend(struct uart_softc *sc)
+{
+	struct msm_uart_softc *u = (struct msm_uart_softc *)sc;
+	struct uart_bas *bas = &sc->sc_bas;
+	uint32_t isr;
+	int ipend;
+
+	uart_lock(sc->sc_hwmtx);
+
+	/* Get ISR status */
+	isr = GETREG(bas, UART_DM_MISR);
+
+	ipend = 0;
+
+	/* Uart RX starting, notify upper layer */
+	if (isr & UART_DM_RXLEV) {
+		u->ier &= ~UART_DM_RXLEV;
+		SETREG(bas, UART_DM_IMR, u->ier);
+		uart_barrier(bas);
+		ipend |= SER_INT_RXREADY;
+	}
+
+	/* Stale RX interrupt */
+	if (isr & UART_DM_RXSTALE) {
+		/* Disable and reset it */
+		SETREG(bas, UART_DM_CR, UART_DM_STALE_EVENT_DISABLE);
+		SETREG(bas, UART_DM_CR, UART_DM_RESET_STALE_INT);
+		uart_barrier(bas);
+		ipend |= SER_INT_RXREADY;
+	}
+
+	/* TX READY interrupt */
+	if (isr & UART_DM_TX_READY) {
+		/* Clear  TX Ready */
+		SETREG(bas, UART_DM_CR, UART_DM_CLEAR_TX_READY);
+
+		/* Disable TX_READY */
+		u->ier &= ~UART_DM_TX_READY;
+		SETREG(bas, UART_DM_IMR, u->ier);
+		uart_barrier(bas);
+
+		if (sc->sc_txbusy != 0)
+			ipend |= SER_INT_TXIDLE;
+	}
+
+	if (isr & UART_DM_TXLEV) {
+		/* TX FIFO is empty */
+		u->ier &= ~UART_DM_TXLEV;
+		SETREG(bas, UART_DM_IMR, u->ier);
+		uart_barrier(bas);
+
+		if (sc->sc_txbusy != 0)
+			ipend |= SER_INT_TXIDLE;
+	}
+
+	uart_unlock(sc->sc_hwmtx);
+	return (ipend);
+}
+
+static int
+msm_bus_flush(struct uart_softc *sc, int what)
+{
+
+	return (0);
+}
+
+static int
+msm_bus_getsig(struct uart_softc *sc)
+{
+
+	return (0);
+}
+
+static int
+msm_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
+{
+
+	return (EINVAL);
+}
+
+static void
+msm_bus_grab(struct uart_softc *sc)
+{
+	struct uart_bas *bas = &sc->sc_bas;
+
+	/*
+	 * XXX: Turn off all interrupts to enter polling mode. Leave the
+	 * saved mask alone. We'll restore whatever it was in ungrab.
+	 */
+	uart_lock(sc->sc_hwmtx);
+	SETREG(bas, UART_DM_CR, UART_DM_RESET_STALE_INT);
+	SETREG(bas, UART_DM_IMR, 0);
+	uart_barrier(bas);
+	uart_unlock(sc->sc_hwmtx);
+}
+
+static void
+msm_bus_ungrab(struct uart_softc *sc)
+{
+	struct msm_uart_softc *u = (struct msm_uart_softc *)sc;
+	struct uart_bas *bas = &sc->sc_bas;
+
+	/*
+	 * Restore previous interrupt mask
+	 */
+	uart_lock(sc->sc_hwmtx);
+	SETREG(bas, UART_DM_IMR, u->ier);
+	uart_barrier(bas);
+	uart_unlock(sc->sc_hwmtx);
+}
+
+struct uart_class uart_msm_class = {
+	"msm",
+	msm_methods,
+	sizeof(struct msm_uart_softc),
+	.uc_ops = &uart_msm_ops,
+	.uc_range = 8,
+	.uc_rclk = DEF_CLK,
+};
diff --git a/sys/dev/uart/uart_dev_msm.h b/sys/dev/uart/uart_dev_msm.h
new file mode 100644
index 000000000000..89a7f191b245
--- /dev/null
+++ b/sys/dev/uart/uart_dev_msm.h
@@ -0,0 +1,229 @@
+/*-
+ * Copyright (c) 2014 Ganbold Tsagaankhuu <ganbold@freebsd.org>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_UART_DM_H_
+#define	_UART_DM_H_
+
+#define	UART_DM_EXTR_BITS(value, start_pos, end_pos) \
+	    ((value << (32 - end_pos)) >> (32 - (end_pos - start_pos)))
+
+/* UART Parity Mode */
+enum UART_DM_PARITY_MODE {
+	UART_DM_NO_PARITY,
+	UART_DM_ODD_PARITY,
+	UART_DM_EVEN_PARITY,
+	UART_DM_SPACE_PARITY
+};
+
+/* UART Stop Bit Length */
+enum UART_DM_STOP_BIT_LEN {
+	UART_DM_SBL_9_16,
+	UART_DM_SBL_1,
+	UART_DM_SBL_1_9_16,
+	UART_DM_SBL_2
+};
+
+/* UART Bits per Char */
+enum UART_DM_BITS_PER_CHAR {
+	UART_DM_5_BPS,
+	UART_DM_6_BPS,
+	UART_DM_7_BPS,
+	UART_DM_8_BPS
+};
+
+/* 8-N-1 Configuration */
+#define	UART_DM_8_N_1_MODE			(UART_DM_NO_PARITY | \
+						(UART_DM_SBL_1 << 2) | \
+						(UART_DM_8_BPS << 4))
+
+/* UART_DM Registers */
+
+/* UART Operational Mode Registers (HSUART) */
+#define	UART_DM_MR1				0x00
+#define	 UART_DM_MR1_AUTO_RFR_LEVEL1_BMSK	0xffffff00
+#define	 UART_DM_MR1_AUTO_RFR_LEVEL0_BMSK	0x3f
+#define	 UART_DM_MR1_CTS_CTL_BMSK		0x40
+#define	 UART_DM_MR1_RX_RDY_CTL_BMSK		0x80
+
+#define	UART_DM_MR2				0x04
+#define	 UART_DM_MR2_ERROR_MODE_BMSK		0x40
+#define	 UART_DM_MR2_BITS_PER_CHAR_BMSK		0x30
+#define	 UART_DM_MR2_STOP_BIT_LEN_BMSK		0x0c
+#define	 UART_DM_MR2_PARITY_MODE_BMSK		0x03
+#define	 UART_DM_RXBRK_ZERO_CHAR_OFF		(1 << 8)
+#define	 UART_DM_LOOPBACK			(1 << 7)
+
+/* UART Clock Selection Register, write only */
+#define	UART_DM_CSR				0x08
+#define	 UART_DM_CSR_115200			0xff
+#define	 UART_DM_CSR_57600			0xee
+#define	 UART_DM_CSR_38400			0xdd
+#define	 UART_DM_CSR_28800			0xcc
+#define	 UART_DM_CSR_19200			0xbb
+#define	 UART_DM_CSR_14400			0xaa
+#define	 UART_DM_CSR_9600			0x99
+#define	 UART_DM_CSR_7200			0x88
+#define	 UART_DM_CSR_4800			0x77
+#define	 UART_DM_CSR_3600			0x66
+#define	 UART_DM_CSR_2400			0x55
+#define	 UART_DM_CSR_1200			0x44
+#define	 UART_DM_CSR_600			0x33
+#define	 UART_DM_CSR_300			0x22
+#define	 UART_DM_CSR_150			0x11
+#define	 UART_DM_CSR_75				0x00
+
+/* UART DM TX FIFO Registers - 4, write only */
+#define	UART_DM_TF(x)				(0x70 + (4 * (x)))
+
+/* UART Command Register, write only */
+#define	UART_DM_CR				0x10
+#define	 UART_DM_CR_RX_ENABLE			(1 << 0)
+#define	 UART_DM_CR_RX_DISABLE			(1 << 1)
+#define	 UART_DM_CR_TX_ENABLE			(1 << 2)
+#define	 UART_DM_CR_TX_DISABLE			(1 << 3)
+
+/* UART_DM_CR channel command bit value (register field is bits 8:4) */
+#define	UART_DM_RESET_RX			0x10
+#define	UART_DM_RESET_TX			0x20
+#define	UART_DM_RESET_ERROR_STATUS		0x30
+#define	UART_DM_RESET_BREAK_INT			0x40
+#define	UART_DM_START_BREAK			0x50
+#define	UART_DM_STOP_BREAK			0x60
+#define	UART_DM_RESET_CTS			0x70
+#define	UART_DM_RESET_STALE_INT			0x80
+#define	UART_DM_RFR_LOW				0xD0
+#define	UART_DM_RFR_HIGH			0xE0
+#define	UART_DM_CR_PROTECTION_EN		0x100
+#define	UART_DM_STALE_EVENT_ENABLE		0x500
+#define	UART_DM_STALE_EVENT_DISABLE		0x600
+#define	UART_DM_FORCE_STALE_EVENT		0x400
+#define	UART_DM_CLEAR_TX_READY			0x300
+#define	UART_DM_RESET_TX_ERROR			0x800
+#define	UART_DM_RESET_TX_DONE			0x810
+
+/* UART Interrupt Mask Register */
+#define	UART_DM_IMR				0x14
+/* these can be used for both ISR and IMR registers */
+#define	UART_DM_TXLEV				(1 << 0)
+#define	UART_DM_RXHUNT				(1 << 1)
+#define	UART_DM_RXBRK_CHNG			(1 << 2)
+#define	UART_DM_RXSTALE				(1 << 3)
+#define	UART_DM_RXLEV				(1 << 4)
+#define	UART_DM_DELTA_CTS			(1 << 5)
+#define	UART_DM_CURRENT_CTS			(1 << 6)
+#define	UART_DM_TX_READY			(1 << 7)
+#define	UART_DM_TX_ERROR			(1 << 8)
+#define	UART_DM_TX_DONE				(1 << 9)
+#define	UART_DM_RXBREAK_START			(1 << 10)
+#define	UART_DM_RXBREAK_END			(1 << 11)
+#define	UART_DM_PAR_FRAME_ERR_IRQ		(1 << 12)
+
+#define	UART_DM_IMR_ENABLED			(UART_DM_TX_READY | \
+						UART_DM_TXLEV | \
+						UART_DM_RXLEV | \
+						UART_DM_RXSTALE)
+
+/* UART Interrupt Programming Register */
+#define	UART_DM_IPR				0x18
+#define	UART_DM_STALE_TIMEOUT_LSB		0x0f
+#define	UART_DM_STALE_TIMEOUT_MSB		0x00
+#define	UART_DM_IPR_STALE_TIMEOUT_MSB_BMSK	0xffffff80
+#define	UART_DM_IPR_STALE_LSB_BMSK		0x1f
+
+/* UART Transmit/Receive FIFO Watermark Register */
+#define	UART_DM_TFWR				0x1c
+/* Interrupt is generated when FIFO level is less than or equal to this value */
+#define	UART_DM_TFW_VALUE			0
+
+#define	UART_DM_RFWR				0x20
+/* Interrupt generated when no of words in RX FIFO is greater than this value */
+#define	UART_DM_RFW_VALUE			0
+
+/* UART Hunt Character Register */
+#define	UART_DM_HCR				0x24
+
+/* Used for RX transfer initialization */
+#define	UART_DM_DMRX				0x34
+/* Default DMRX value - any value bigger than FIFO size would be fine */
+#define	UART_DM_DMRX_DEF_VALUE			0x220
+
+/* Register to enable IRDA function */
+#define	UART_DM_IRDA				0x38
+
+/* UART Data Mover Enable Register */
+#define	UART_DM_DMEN				0x3c
+
+/* Number of characters for Transmission */
+#define	UART_DM_NO_CHARS_FOR_TX			0x40
+
+/* UART RX FIFO Base Address */
+#define	UART_DM_BADR				0x44
+
+#define	UART_DM_SIM_CFG_ADDR			0x80
+
+/* Read only registers */
+/* UART Status Register */
+#define	UART_DM_SR				0x08
+/* register field mask mapping */
+#define	 UART_DM_SR_RXRDY			(1 << 0)
+#define	 UART_DM_SR_RXFULL			(1 << 1)
+#define	 UART_DM_SR_TXRDY			(1 << 2)
+#define	 UART_DM_SR_TXEMT			(1 << 3)
+#define	 UART_DM_SR_UART_OVERRUN		(1 << 4)
+#define	 UART_DM_SR_PAR_FRAME_ERR		(1 << 5)
+#define	 UART_DM_RX_BREAK			(1 << 6)
+#define	 UART_DM_HUNT_CHAR			(1 << 7)
+#define	 UART_DM_RX_BRK_START_LAST		(1 << 8)
+
+/* UART Receive FIFO Registers - 4 in numbers */
+#define	UART_DM_RF(x)				(0x70 + (4 * (x)))
+
+/* UART Masked Interrupt Status Register */
+#define	UART_DM_MISR				0x10
+
+/* UART Interrupt Status Register */
+#define	UART_DM_ISR				0x14
+
+/* Number of characters received since the end of last RX transfer */
+#define	UART_DM_RX_TOTAL_SNAP			0x38
+
+/* UART TX FIFO Status Register */
+#define	UART_DM_TXFS				0x4c
+#define	 UART_DM_TXFS_STATE_LSB(x)		UART_DM_EXTR_BITS(x,0,6)
+#define	 UART_DM_TXFS_STATE_MSB(x)		UART_DM_EXTR_BITS(x,14,31)
+#define	 UART_DM_TXFS_BUF_STATE(x)		UART_DM_EXTR_BITS(x,7,9)
+#define	 UART_DM_TXFS_ASYNC_STATE(x)		UART_DM_EXTR_BITS(x,10,13)
+
+/* UART RX FIFO Status Register */
+#define	UART_DM_RXFS				0x50
+#define	 UART_DM_RXFS_STATE_LSB(x)		UART_DM_EXTR_BITS(x,0,6)
+#define	 UART_DM_RXFS_STATE_MSB(x)		UART_DM_EXTR_BITS(x,14,31)
+#define	 UART_DM_RXFS_BUF_STATE(x)		UART_DM_EXTR_BITS(x,7,9)
+#define	 UART_DM_RXFS_ASYNC_STATE(x)		UART_DM_EXTR_BITS(x,10,13)
+
+#endif	/* _UART_DM_H_ */
diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c
index 225a2d201e33..08624d23f35d 100644
--- a/sys/dev/usb/controller/ohci_s3c24x0.c
+++ b/sys/dev/usb/controller/ohci_s3c24x0.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 static device_probe_t ohci_s3c24x0_probe;
 static device_attach_t ohci_s3c24x0_attach;
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index 5e9029c5abe9..8676c0f73d54 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -614,6 +614,10 @@ xhci_init(struct xhci_softc *sc, device_t self)
 	sc->sc_bus.devices = sc->sc_devices;
 	sc->sc_bus.devices_max = XHCI_MAX_DEVICES;
 
+	/* set default cycle state in case of early interrupts */
+	sc->sc_event_ccs = 1;
+	sc->sc_command_ccs = 1;
+
 	/* setup command queue mutex and condition varible */
 	cv_init(&sc->sc_cmd_cv, "CMDQ");
 	sx_init(&sc->sc_cmd_sx, "CMDQ lock");
@@ -2248,7 +2252,14 @@ xhci_configure_mask(struct usb_device *udev, uint32_t mask, uint8_t drop)
 		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx0, mask);
 		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx1, 0);
 	} else {
-		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx0, 0);
+		/*
+		 * Some hardware requires that we drop the endpoint
+		 * context before adding it again:
+		 */
+		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx0,
+		    mask & XHCI_INCTX_NON_CTRL_MASK);
+
+		/* Add new endpoint context */
 		xhci_ctx_set_le32(sc, &pinp->ctx_input.dwInCtx1, mask);
 
 		/* find most significant set bit */
@@ -2260,14 +2271,17 @@ xhci_configure_mask(struct usb_device *udev, uint32_t mask, uint8_t drop)
 		/* adjust */
 		x--;
 
-		/* figure out maximum */
-		if (x > sc->sc_hw.devs[index].context_num) {
+		/* figure out the maximum number of contexts */
+		if (x > sc->sc_hw.devs[index].context_num)
 			sc->sc_hw.devs[index].context_num = x;
-			temp = xhci_ctx_get_le32(sc, &pinp->ctx_slot.dwSctx0);
-			temp &= ~XHCI_SCTX_0_CTX_NUM_SET(31);
-			temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1);
-			xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp);
-		}
+		else
+			x = sc->sc_hw.devs[index].context_num;
+
+		/* update number of contexts */
+		temp = xhci_ctx_get_le32(sc, &pinp->ctx_slot.dwSctx0);
+		temp &= ~XHCI_SCTX_0_CTX_NUM_SET(31);
+		temp |= XHCI_SCTX_0_CTX_NUM_SET(x + 1);
+		xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx0, temp);
 	}
 	return (0);
 }
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index 408b429dff0a..7352e9c84ea7 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -493,7 +493,8 @@ struct xhci_softc {
 	uint8_t			sc_noscratch;
 	/* root HUB device configuration */
 	uint8_t			sc_conf;
-	uint8_t			sc_hub_idata[2];
+	/* root HUB port event bitmap, max 256 ports */
+	uint8_t			sc_hub_idata[32];
 
 	/* size of context */
 	uint8_t			sc_ctx_is_64_byte;
diff --git a/sys/dev/usb/misc/uled.c b/sys/dev/usb/misc/uled.c
index 9053067806e8..efe6d9cd7c3d 100644
--- a/sys/dev/usb/misc/uled.c
+++ b/sys/dev/usb/misc/uled.c
@@ -231,7 +231,7 @@ uled_close(struct usb_fifo *fifo, int fflags)
 		sc->sc_state &= ~ULED_ENABLED;
 	}
 }
-			
+
 static int
 uled_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr, int fflags)
 {
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index dbd7b9b3f1fd..d07392728202 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -748,10 +748,10 @@ aue_intr_callback(struct usb_xfer *xfer, usb_error_t error)
 			usbd_copy_out(pc, 0, &pkt, sizeof(pkt));
 
 			if (pkt.aue_txstat0)
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (pkt.aue_txstat0 & (AUE_TXSTAT0_LATECOLL |
 			    AUE_TXSTAT0_EXCESSCOLL))
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -790,13 +790,13 @@ aue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (sc->sc_flags & AUE_FLAG_VER_2) {
 
 			if (actlen == 0) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				goto tr_setup;
 			}
 		} else {
 
 			if (actlen <= (int)(sizeof(stat) + ETHER_CRC_LEN)) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				goto tr_setup;
 			}
 			usbd_copy_out(pc, actlen - sizeof(stat), &stat,
@@ -808,7 +808,7 @@ aue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 			 */
 			stat.aue_rxstat &= AUE_RXSTAT_MASK;
 			if (stat.aue_rxstat) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				goto tr_setup;
 			}
 			/* No errors; receive the packet. */
@@ -853,7 +853,7 @@ aue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer of %d bytes complete\n", actlen);
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -910,7 +910,7 @@ aue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index e4f3153c82fb..52bd5f53c190 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -1097,7 +1097,7 @@ axe_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen)
 		axe_rxeof(ue, pc, 0, actlen, NULL);
 
 	if (error != 0)
-		ue->ue_ifp->if_ierrors++;
+		if_inc_counter(ue->ue_ifp, IFCOUNTER_IERRORS, 1);
 	return (error);
 }
 
@@ -1109,13 +1109,13 @@ axe_rxeof(struct usb_ether *ue, struct usb_page_cache *pc, unsigned int offset,
 	struct mbuf *m;
 
 	if (len < ETHER_HDR_LEN || len > MCLBYTES - ETHER_ALIGN) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (EINVAL);
 	}
 
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		return (ENOMEM);
 	}
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
@@ -1123,7 +1123,7 @@ axe_rxeof(struct usb_ether *ue, struct usb_page_cache *pc, unsigned int offset,
 
 	usbd_copy_out(pc, offset, mtod(m, uint8_t *), len);
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = ifp;
 	m->m_pkthdr.len = m->m_len = len;
 
@@ -1229,7 +1229,7 @@ axe_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 			 * multiple writes into single one if there is
 			 * room in TX buffer of controller.
 			 */
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 			/*
 			 * if there's a BPF listener, bounce a copy
@@ -1253,7 +1253,7 @@ axe_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		if (error != USB_ERR_CANCELLED) {
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index 17fd4d81a4bc..e262a5dc378d 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -681,7 +681,7 @@ axge_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 			 * multiple writes into single one if there is
 			 * room in TX buffer of controller.
 			 */
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 			/*
 			 * if there's a BPF listener, bounce a copy
@@ -702,7 +702,7 @@ axge_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		return;
 		/* NOTREACHED */
 	default:
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		if (error != USB_ERR_CANCELLED) {
@@ -962,7 +962,7 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen)
 		pktlen = (pkt_hdr >> 16) & 0x1fff;
 		if (pkt_hdr & (AXGE_RXHDR_CRC_ERR | AXGE_RXHDR_DROP_ERR)) {
 			DPRINTF("Dropped a packet\n");
-			ue->ue_ifp->if_ierrors++;
+			if_inc_counter(ue->ue_ifp, IFCOUNTER_IERRORS, 1);
 		}
 		if (pktlen >= 6 && (int)(pos + pktlen) <= actlen) {
 			axge_rxeof(ue, pc, pos + 2, pktlen - 6, pkt_hdr);
@@ -984,13 +984,13 @@ axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc,
 
 	ifp = ue->ue_ifp;
 	if (len < ETHER_HDR_LEN || len > MCLBYTES - ETHER_ALIGN) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		return;
 	}
 	m->m_pkthdr.rcvif = ifp;
@@ -999,7 +999,7 @@ axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc,
 
 	usbd_copy_out(pc, offset, mtod(m, uint8_t *), len);
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	if ((pkt_hdr & (AXGE_RXHDR_L4CSUM_ERR | AXGE_RXHDR_L3CSUM_ERR)) == 0) {
 		if ((pkt_hdr & AXGE_RXHDR_L4_TYPE_MASK) ==
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 4f475ec8338d..b03bf6383703 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -788,7 +788,7 @@ cdce_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer complete: %u bytes in %u frames\n",
 		    actlen, aframes);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* free all previous TX buffers */
 		cdce_free_queue(sc->sc_tx_buf, CDCE_FRAMES_MAX);
@@ -814,7 +814,7 @@ cdce_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 
 				if (!m_append(m, 4, (void *)&crc)) {
 					m_freem(m);
-					ifp->if_oerrors++;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					continue;
 				}
 			}
@@ -822,7 +822,7 @@ cdce_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 				mt = m_defrag(m, M_NOWAIT);
 				if (mt == NULL) {
 					m_freem(m);
-					ifp->if_oerrors++;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					continue;
 				}
 				m = mt;
@@ -854,7 +854,7 @@ cdce_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		cdce_free_queue(sc->sc_tx_buf, CDCE_FRAMES_MAX);
 
 		/* count output errors */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
@@ -1169,7 +1169,7 @@ cdce_ncm_fill_tx_frames(struct usb_xfer *xfer, uint8_t index)
 				/* The frame won't fit in our buffer */
 				DPRINTFN(1, "Frame too big to be transmitted!\n");
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				n--;
 				continue;
 			}
@@ -1207,7 +1207,7 @@ cdce_ncm_fill_tx_frames(struct usb_xfer *xfer, uint8_t index)
 
 		/* Pre-increment interface counter */
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 
 	if (n == 0)
@@ -1310,7 +1310,7 @@ cdce_ncm_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		    usbd_errstr(error));
 
 		/* update error counter */
-		ifp->if_oerrors += 1;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
@@ -1454,7 +1454,7 @@ cdce_ncm_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 
 				sumdata += temp;
 			} else {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			}
 		}
 
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 5b06bc4c2a5d..850ad0e7d6db 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -462,7 +462,7 @@ cue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 
 		if (actlen <= (int)(2 + sizeof(struct ether_header))) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		pc = usbd_xfer_get_frame(xfer, 0);
@@ -506,7 +506,7 @@ cue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer complete\n");
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -544,7 +544,7 @@ cue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
@@ -563,12 +563,12 @@ cue_tick(struct usb_ether *ue)
 
 	CUE_LOCK_ASSERT(sc, MA_OWNED);
 
-	ifp->if_collisions += cue_csr_read_2(sc, CUE_TX_SINGLECOLL);
-	ifp->if_collisions += cue_csr_read_2(sc, CUE_TX_MULTICOLL);
-	ifp->if_collisions += cue_csr_read_2(sc, CUE_TX_EXCESSCOLL);
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, cue_csr_read_2(sc, CUE_TX_SINGLECOLL));
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, cue_csr_read_2(sc, CUE_TX_MULTICOLL));
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, cue_csr_read_2(sc, CUE_TX_EXCESSCOLL));
 
 	if (cue_csr_read_2(sc, CUE_RX_FRAMEERR))
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 }
 
 static void
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index 056d364dccde..5bbf11b190d4 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -400,7 +400,7 @@ ipheth_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer complete: %u bytes in %u frames\n",
 		    actlen, aframes);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* free all previous TX buffers */
 		ipheth_free_queue(sc->sc_tx_buf, IPHETH_TX_FRAMES_MAX);
@@ -455,7 +455,7 @@ ipheth_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		ipheth_free_queue(sc->sc_tx_buf, IPHETH_TX_FRAMES_MAX);
 
 		/* count output errors */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 7410dbea76e4..ea88ed9bcc15 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -550,7 +550,7 @@ kue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 
 		if (actlen <= (int)(2 + sizeof(struct ether_header))) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		pc = usbd_xfer_get_frame(xfer, 0);
@@ -596,7 +596,7 @@ kue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer complete\n");
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -638,7 +638,7 @@ kue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index b3e541370a80..8d0642a6921c 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -792,7 +792,7 @@ mos_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 		MOS_DPRINTFN("actlen : %d", actlen);
 		if (actlen <= 1) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		/* evaluate status byte at the end */
@@ -811,7 +811,7 @@ mos_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 				MOS_DPRINTFN("CRC error");
 			if (rxstat & MOS_RXSTS_ALIGN_ERROR)
 				MOS_DPRINTFN("alignment error");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		/* Remember the last byte was used for the status fields */
@@ -820,7 +820,7 @@ mos_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 			MOS_DPRINTFN("error: pktlen %d is smaller "
 			    "than ether_header %zd", pktlen,
 			    sizeof(struct ether_header));
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		uether_rxbuf(ue, pc, 0, actlen);
@@ -859,7 +859,7 @@ mos_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		MOS_DPRINTFN("transfer of complete");
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
 tr_setup:
@@ -886,11 +886,11 @@ mos_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 
 		usbd_transfer_submit(xfer);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		return;
 	default:
 		MOS_DPRINTFN("usb error on tx: %s\n", usbd_errstr(error));
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
@@ -981,7 +981,7 @@ mos_intr_callback(struct usb_xfer *xfer, usb_error_t error)
 	uint32_t pkt;
 	int actlen;
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 	MOS_DPRINTFN("actlen %i", actlen);
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index f37ae1c6a028..d4e71479f3e8 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -648,9 +648,9 @@ rue_intr_callback(struct usb_xfer *xfer, usb_error_t error)
 			pc = usbd_xfer_get_frame(xfer, 0);
 			usbd_copy_out(pc, 0, &pkt, sizeof(pkt));
 
-			ifp->if_ierrors += pkt.rue_rxlost_cnt;
-			ifp->if_ierrors += pkt.rue_crcerr_cnt;
-			ifp->if_collisions += pkt.rue_col_cnt;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, pkt.rue_rxlost_cnt);
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, pkt.rue_crcerr_cnt);
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, pkt.rue_col_cnt);
 		}
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -685,7 +685,7 @@ rue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 
 		if (actlen < 4) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		pc = usbd_xfer_get_frame(xfer, 0);
@@ -695,7 +695,7 @@ rue_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		/* check recieve packet was valid or not */
 		status = le16toh(status);
 		if ((status & RUE_RXSTAT_VALID) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		uether_rxbuf(ue, pc, 0, actlen);
@@ -732,7 +732,7 @@ rue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer complete\n");
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -782,7 +782,7 @@ rue_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 55d3560759b1..bd2e75141e1e 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -123,7 +123,24 @@ SYSCTL_INT(_hw_usb_smsc, OID_AUTO, debug, CTLFLAG_RW, &smsc_debug, 0,
  */
 static const struct usb_device_id smsc_devs[] = {
 #define	SMSC_DEV(p,i) { USB_VPI(USB_VENDOR_SMC2, USB_PRODUCT_SMC2_##p, i) }
+	SMSC_DEV(LAN89530_ETH, 0),
+	SMSC_DEV(LAN9500_ETH, 0),
+	SMSC_DEV(LAN9500_ETH_2, 0),
+	SMSC_DEV(LAN9500A_ETH, 0),
+	SMSC_DEV(LAN9500A_ETH_2, 0),
+	SMSC_DEV(LAN9505_ETH, 0),
+	SMSC_DEV(LAN9505A_ETH, 0),
 	SMSC_DEV(LAN9514_ETH, 0),
+	SMSC_DEV(LAN9514_ETH_2, 0),
+	SMSC_DEV(LAN9530_ETH, 0),
+	SMSC_DEV(LAN9730_ETH, 0),
+	SMSC_DEV(LAN9500_SAL10, 0),
+	SMSC_DEV(LAN9505_SAL10, 0),
+	SMSC_DEV(LAN9500A_SAL10, 0),
+	SMSC_DEV(LAN9505A_SAL10, 0),
+	SMSC_DEV(LAN9514_SAL10, 0),
+	SMSC_DEV(LAN9500A_HAL, 0),
+	SMSC_DEV(LAN9505A_HAL, 0),
 #undef SMSC_DEV
 };
 
@@ -989,9 +1006,9 @@ smsc_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 			
 			if (rxhdr & SMSC_RX_STAT_ERROR) {
 				smsc_dbg_printf(sc, "rx error (hdr 0x%08x)\n", rxhdr);
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				if (rxhdr & SMSC_RX_STAT_COLLISION)
-					ifp->if_collisions++;
+					if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			} else {
 
 				/* Check if the ethernet frame is too big or too small */
@@ -1002,7 +1019,7 @@ smsc_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 				m = uether_newbuf();
 				if (m == NULL) {
 					smsc_warn_printf(sc, "failed to create new mbuf\n");
-					ifp->if_iqdrops++;
+					if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 					goto tr_setup;
 				}
 				
@@ -1158,7 +1175,7 @@ smsc_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 			usbd_m_copy_in(pc, frm_len, m, 0, m->m_pkthdr.len);
 			frm_len += m->m_pkthdr.len;
 
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 			/* If there's a BPF listener, bounce a copy of this frame to him */
 			BPF_MTAP(ifp, m);
@@ -1176,7 +1193,7 @@ smsc_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		return;
 
 	default:
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 		
 		if (error != USB_ERR_CANCELLED) {
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 418776030daa..66d684453a40 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -582,7 +582,7 @@ udav_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer complete\n");
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -638,7 +638,7 @@ udav_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
@@ -666,7 +666,7 @@ udav_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 
 		if (actlen < (int)(sizeof(stat) + ETHER_CRC_LEN)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		pc = usbd_xfer_get_frame(xfer, 0);
@@ -676,11 +676,11 @@ udav_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		len -= ETHER_CRC_LEN;
 
 		if (stat.rxstat & UDAV_RSR_LCS) {
-			ifp->if_collisions++;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			goto tr_setup;
 		}
 		if (stat.rxstat & UDAV_RSR_ERR) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		uether_rxbuf(ue, pc, sizeof(stat), len);
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 5b4f8ac046b1..5d45395d46c6 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -844,12 +844,12 @@ urndis_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 				    rm_dataoffset), actlen);
 				goto tr_setup;
 			} else if (msg.rm_datalen < (uint32_t)sizeof(struct ether_header)) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				DPRINTF("invalid ethernet size "
 				    "%u < %u\n", msg.rm_datalen, (unsigned)sizeof(struct ether_header));
 				goto tr_setup;
 			} else if (msg.rm_datalen > (uint32_t)MCLBYTES) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				DPRINTF("invalid ethernet size "
 				    "%u > %u\n",
 				    msg.rm_datalen, (unsigned)MCLBYTES);
@@ -871,7 +871,7 @@ urndis_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 				/* enqueue */
 				uether_rxmbuf(&sc->sc_ue, m, msg.rm_datalen);
 			} else {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			}
 			offset += msg.rm_len;
 			actlen -= msg.rm_len;
@@ -917,7 +917,7 @@ urndis_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "%u bytes in %u frames\n", actlen, aframes);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -937,7 +937,7 @@ urndis_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 
 			if ((m->m_pkthdr.len + sizeof(msg)) > RNDIS_TX_MAXLEN) {
 				DPRINTF("Too big packet\n");
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 				/* Free buffer */
 				m_freem(m);
@@ -973,7 +973,7 @@ urndis_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n", usbd_errstr(error));
 
 		/* count output errors */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 19093184c68c..b71b8256f221 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -806,7 +806,7 @@ usie_if_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (sc->sc_rxm == NULL) {
 			DPRINTF("could not allocate Rx mbuf\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			usbd_xfer_set_stall(xfer);
 			usbd_xfer_set_frames(xfer, 0);
 		} else {
@@ -828,7 +828,7 @@ usie_if_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		if (sc->sc_rxm != NULL) {
@@ -917,8 +917,8 @@ usie_if_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 
 	mtx_lock(&sc->sc_mtx);
 
-	ifp->if_ierrors += err;
-	ifp->if_ipackets += pkt;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, err);
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, pkt);
 }
 
 static void
@@ -934,7 +934,7 @@ usie_if_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "transfer complete\n");
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* fall though */
 	case USB_ST_SETUP:
@@ -974,11 +974,11 @@ usie_if_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 	default:			/* Error */
 		DPRINTF("USB transfer error, %s\n",
 		    usbd_errstr(error));
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		break;
@@ -1214,10 +1214,10 @@ usie_if_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 	err = (ifp->if_transmit)(ifp, m);
 	if (err) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return (ENOBUFS);
 	}
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	return (0);
 }
@@ -1395,7 +1395,7 @@ usie_cns_req(struct usie_softc *sc, uint32_t id, uint16_t obj)
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (__predict_false(m == NULL)) {
 		DPRINTF("could not allocate mbuf\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	/* to align usie_hip{} on 32 bit */
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index ba6236c6b263..e39f0937176c 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -1694,7 +1694,7 @@ uhso_if_rxflush(void *arg)
 
 			m = m_pullup(m0, sizeof(struct ip));
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				UHSO_DPRINTF(0, "m_pullup failed\n");
 				mtx_lock(&sc->sc_mtx);
 				continue;
@@ -1724,7 +1724,7 @@ uhso_if_rxflush(void *arg)
 		else {
 			UHSO_DPRINTF(0, "got unexpected ip version %d, "
 			    "m=%p, len=%d\n", (*cp & 0xf0) >> 4, m, m->m_len);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			UHSO_HEXDUMP(cp, 4);
 			m_freem(m);
 			m = NULL;
@@ -1734,7 +1734,7 @@ uhso_if_rxflush(void *arg)
 
 		if (iplen == 0) {
 			UHSO_DPRINTF(0, "Zero IP length\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m_freem(m);
 			m = NULL;
 			mtx_lock(&sc->sc_mtx);
@@ -1775,7 +1775,7 @@ uhso_if_rxflush(void *arg)
 			continue;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 
 		/* Dispatch to IP layer */
@@ -1803,7 +1803,7 @@ uhso_ifnet_write_callback(struct usb_xfer *xfer, usb_error_t error)
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	case USB_ST_SETUP:
 tr_setup:
@@ -1898,10 +1898,10 @@ uhso_if_output(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
 
 	error = (ifp->if_transmit)(ifp, m0);
 	if (error) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return (ENOBUFS);
 	}
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	return (0);
 }
 
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index d2b7f20ab50d..58b83ff94a03 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -580,7 +580,7 @@ uether_rxmbuf(struct usb_ether *ue, struct mbuf *m,
 	UE_LOCK_ASSERT(ue, MA_OWNED);
 
 	/* finalize mbuf */
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = ifp;
 	m->m_pkthdr.len = m->m_len = len;
 
@@ -603,14 +603,14 @@ uether_rxbuf(struct usb_ether *ue, struct usb_page_cache *pc,
 
 	m = uether_newbuf();
 	if (m == NULL) {
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		return (ENOMEM);
 	}
 
 	usbd_copy_out(pc, offset, mtod(m, uint8_t *), len);
 
 	/* finalize mbuf */
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	m->m_pkthdr.rcvif = ifp;
 	m->m_pkthdr.len = m->m_len = len;
 
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index bbf535126442..b39607c2533b 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -75,6 +75,8 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW,
 #define	U3G_MAXPORTS		12
 #define	U3G_CONFIG_INDEX	0
 #define	U3G_BSIZE		2048
+#define	U3G_TXSIZE		(U3G_BSIZE / U3G_TXFRAMES)
+#define	U3G_TXFRAMES		4
 
 /* Eject methods; See also usb_quirks.h:UQ_MSC_EJECT_* */
 #define	U3GINIT_HUAWEI		1	/* Requires Huawei init command */
@@ -145,6 +147,7 @@ static const struct usb_config u3g_config[U3G_N_TRANSFER] = {
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = U3G_BSIZE,/* bytes */
+		.frames = U3G_TXFRAMES,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
 		.callback = &u3g_write_callback,
 	},
@@ -239,6 +242,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
 	U3G_DEV(DLINK3, DWM652, 0),
 	U3G_DEV(HP, EV2200, 0),
 	U3G_DEV(HP, HS2300, 0),
+	U3G_DEV(HP, UN2420_QDL, 0),
+	U3G_DEV(HP, UN2420, 0),
 	U3G_DEV(HUAWEI, E1401, U3GINIT_HUAWEI),
 	U3G_DEV(HUAWEI, E1402, U3GINIT_HUAWEI),
 	U3G_DEV(HUAWEI, E1403, U3GINIT_HUAWEI),
@@ -1011,14 +1016,22 @@ u3g_write_callback(struct usb_xfer *xfer, usb_error_t error)
 	struct ucom_softc *ucom = usbd_xfer_softc(xfer);
 	struct usb_page_cache *pc;
 	uint32_t actlen;
+	uint32_t frame;
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 	case USB_ST_SETUP:
 tr_setup:
-		pc = usbd_xfer_get_frame(xfer, 0);
-		if (ucom_get_data(ucom, pc, 0, U3G_BSIZE, &actlen)) {
-			usbd_xfer_set_frame_len(xfer, 0, actlen);
+		for (frame = 0; frame != U3G_TXFRAMES; frame++) {
+			usbd_xfer_set_frame_offset(xfer, frame * U3G_TXSIZE, frame);
+
+			pc = usbd_xfer_get_frame(xfer, frame);
+			if (ucom_get_data(ucom, pc, 0, U3G_TXSIZE, &actlen) == 0)
+				break;
+			usbd_xfer_set_frame_len(xfer, frame, actlen);
+		}
+		if (frame != 0) {
+			usbd_xfer_set_frames(xfer, frame);
 			usbd_transfer_submit(xfer);
 		}
 		break;
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 396067309ac4..2dad2bdf455c 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -298,6 +298,10 @@ usb_ref_device(struct usb_cdev_privdata *cpd,
 	}
 	mtx_unlock(&usb_ref_lock);
 	DPRINTFN(2, "fail\n");
+
+	/* clear all refs */
+	memset(crd, 0, sizeof(*crd));
+
 	return (USB_ERR_INVAL);
 }
 
@@ -1093,8 +1097,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread*
 		goto done;
 
 	if (usb_usb_ref_device(cpd, &refs)) {
-		err = ENXIO;
-		goto done;
+		/* we lost the reference */
+		return (ENXIO);
 	}
 
 	err = (f->methods->f_ioctl_post) (f, cmd, addr, fflags);
@@ -1117,9 +1121,8 @@ usb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread*
 
 		while (usb_ref_device(cpd, &refs, 1 /* need uref */)) {
 			if (usb_ref_device(cpd, &refs, 0)) {
-				/* device no longer exits */
-				err = ENXIO;
-				goto done;
+				/* device no longer exists */
+				return (ENXIO);
 			}
 			usb_unref_device(cpd, &refs);
 			usb_pause_mtx(NULL, hz / 128);
@@ -1411,9 +1414,9 @@ usb_read(struct cdev *dev, struct uio *uio, int ioflag)
 		return (err);
 
 	err = usb_ref_device(cpd, &refs, 0 /* no uref */ );
-	if (err) {
+	if (err)
 		return (ENXIO);
-	}
+
 	fflags = cpd->fflags;
 
 	f = refs.rxfifo;
@@ -1537,9 +1540,9 @@ usb_write(struct cdev *dev, struct uio *uio, int ioflag)
 		return (err);
 
 	err = usb_ref_device(cpd, &refs, 0 /* no uref */ );
-	if (err) {
+	if (err)
 		return (ENXIO);
-	}
+
 	fflags = cpd->fflags;
 
 	f = refs.txfifo;
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index a64093ea9b20..17a880637e0c 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -2229,6 +2229,8 @@ product HP 3300C		0x0205	ScanJet 3300C
 product HP CDW8200		0x0207	CD-Writer Plus 8200e
 product HP MMKEYB		0x020c	Multimedia keyboard
 product HP 1220C		0x0212	DeskJet 1220C
+product HP UN2420_QDL		0x241d	UN2420 QDL Firmware Loader
+product HP UN2420		0x251d	UN2420 WWAN/GPS Module
 product HP 810C			0x0304	DeskJet 810C/812C
 product HP 4300C		0x0305	Scanjet 4300C
 product HP CDW4E		0x0307	CD-Writer+ CD-4e
@@ -3715,6 +3717,7 @@ product REALTEK RTL8191CU	0x8177	RTL8191CU
 product REALTEK RTL8192CU	0x8178	RTL8192CU
 product REALTEK RTL8192CE	0x817c	RTL8192CE
 product REALTEK RTL8188RU_1	0x817d	RTL8188RU
+product REALTEK RTL8188RU_3	0x817f	RTL8188RU
 product REALTEK RTL8712		0x8712	RTL8712
 product REALTEK RTL8713		0x8712	RTL8713
 product REALTEK RTL8188RU_2	0x317f	RTL8188RU
@@ -4133,6 +4136,23 @@ product SMC 2862WG		0xee13	EZ Connect Wireless Adapter
 product SMC2 2020HUB		0x2020	USB Hub
 product SMC2 2514HUB		0x2514	USB Hub
 product SMC3 2662WUSB		0xa002	2662W-AR Wireless
+product SMC2 LAN9500_ETH	0x9500	USB/Ethernet
+product SMC2 LAN9505_ETH	0x9505	USB/Ethernet
+product SMC2 LAN9530_ETH	0x9530	USB/Ethernet
+product SMC2 LAN9730_ETH	0x9730	USB/Ethernet
+product SMC2 LAN9500_SAL10	0x9900	USB/Ethernet
+product SMC2 LAN9505_SAL10	0x9901	USB/Ethernet
+product SMC2 LAN9500A_SAL10	0x9902	USB/Ethernet
+product SMC2 LAN9505A_SAL10	0x9903	USB/Ethernet
+product SMC2 LAN9514_SAL10	0x9904	USB/Ethernet
+product SMC2 LAN9500A_HAL	0x9905	USB/Ethernet
+product SMC2 LAN9505A_HAL	0x9906	USB/Ethernet
+product SMC2 LAN9500_ETH_2	0x9907	USB/Ethernet
+product SMC2 LAN9500A_ETH_2	0x9908	USB/Ethernet
+product SMC2 LAN9514_ETH_2	0x9909	USB/Ethernet
+product SMC2 LAN9500A_ETH	0x9e00	USB/Ethernet
+product SMC2 LAN9505A_ETH	0x9e01	USB/Ethernet
+product SMC2 LAN89530_ETH	0x9e08	USB/Ethernet
 product SMC2 LAN9514_ETH	0xec00	USB/Ethernet
 
 /* SOHOware products */
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 7fcd429017e1..4808c0f9f290 100644
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -1352,11 +1352,11 @@ rsu_rx_frame(struct rsu_softc *sc, uint8_t *buf, int pktlen, int *rssi)
 	rxdw3 = le32toh(stat->rxdw3);
 
 	if (__predict_false(rxdw0 & R92S_RXDW0_CRCERR)) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return NULL;
 	}
 	if (__predict_false(pktlen < sizeof(*wh) || pktlen > MCLBYTES)) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return NULL;
 	}
 
@@ -1374,7 +1374,7 @@ rsu_rx_frame(struct rsu_softc *sc, uint8_t *buf, int pktlen, int *rssi)
 
 	m = m_get2(pktlen, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (__predict_false(m == NULL)) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return NULL;
 	}
 	/* Finalize mbuf. */
@@ -1483,7 +1483,7 @@ rsu_rxeof(struct usb_xfer *xfer, struct rsu_data *data, int *rssi)
 
 	if (__predict_false(len < sizeof(*stat))) {
 		DPRINTF("xfer too short %d\n", len);
-		sc->sc_ifp->if_ierrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 	/* Determine if it is a firmware C2H event or an 802.11 frame. */
@@ -1561,7 +1561,7 @@ rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		break;
@@ -1596,7 +1596,7 @@ rsu_txeof(struct usb_xfer *xfer, struct rsu_data *data)
 		ieee80211_free_node(data->ni);
 		data->ni = NULL;
 	}
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }
 
@@ -1640,7 +1640,7 @@ rsu_bulk_tx_callback_sub(struct usb_xfer *xfer, usb_error_t error,
 			rsu_txeof(xfer, data);
 			STAILQ_INSERT_TAIL(&sc->sc_tx_inactive, data, next);
 		}
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
@@ -1801,11 +1801,11 @@ rsu_start_locked(struct ifnet *ifp)
 
 		bf = rsu_getbuf(sc);
 		if (bf == NULL) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			m_freem(m);
 			ieee80211_free_node(ni);
 		} else if (rsu_tx_start(sc, ni, m, bf) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 			ieee80211_free_node(ni);
 		}
@@ -2311,10 +2311,10 @@ rsu_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		RSU_UNLOCK(sc);
 		return (ENOBUFS);
 	}
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	if (rsu_tx_start(sc, ni, m, bf) != 0) {
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 		RSU_UNLOCK(sc);
 		return (EIO);
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 700f72afac53..6efea79ba098 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -797,7 +797,7 @@ rum_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		rum_tx_free(data, 0);
 		usbd_xfer_set_priv(xfer, NULL);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		/* FALLTHROUGH */
@@ -851,7 +851,7 @@ rum_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		data = usbd_xfer_get_priv(xfer);
 		if (data != NULL) {
 			rum_tx_free(data, error);
@@ -897,7 +897,7 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (len < (int)(RT2573_RX_DESC_SIZE + IEEE80211_MIN_LEN)) {
 			DPRINTF("%s: xfer too short %d\n",
 			    device_get_nameunit(sc->sc_dev), len);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 
@@ -914,14 +914,14 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		         * filled RUM_TXRX_CSR2:
 		         */
 			DPRINTFN(5, "PHY or CRC error\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 
 		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL) {
 			DPRINTF("could not allocate mbuf\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		usbd_copy_out(pc, RT2573_RX_DESC_SIZE,
@@ -1321,7 +1321,7 @@ rum_start(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (rum_tx_data(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 	}
@@ -2205,7 +2205,7 @@ rum_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return EIO;
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	if (params == NULL) {
 		/*
@@ -2226,7 +2226,7 @@ rum_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
 	return 0;
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	RUM_UNLOCK(sc);
 	ieee80211_free_node(ni);
 	return EIO;
@@ -2281,7 +2281,7 @@ rum_ratectl_task(void *arg, int pending)
 	(void) ieee80211_ratectl_rate(ni, NULL, 0);
 	ieee80211_free_node(ni);
 
-	ifp->if_oerrors += fail;	/* count TX retry-fail as Tx errors */
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, fail);	/* count TX retry-fail as Tx errors */
 
 	usb_callout_reset(&rvp->ratectl_ch, hz, rum_ratectl_timeout, rvp);
 	RUM_UNLOCK(sc);
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index 8f46d1b91741..1451225353b1 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -2574,7 +2574,7 @@ run_drain_fifo(void *arg)
 		if (stat & RT2860_TXQ_OK)
 			(*wstat)[RUN_SUCCESS]++;
 		else
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		/*
 		 * Check if there were retries, ie if the Tx success rate is
 		 * different from the requested rate. Note that it works only
@@ -2620,7 +2620,7 @@ run_iter_func(void *arg, struct ieee80211_node *ni)
 			goto fail;
 
 		/* count failed TX as errors */
-		ifp->if_oerrors += le16toh(sta[0].error.fail);
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, le16toh(sta[0].error.fail));
 
 		retrycnt = le16toh(sta[1].tx.retry);
 		success = le16toh(sta[1].tx.success);
@@ -2786,7 +2786,7 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 		rxwisize += sizeof(uint32_t);
 	if (__predict_false(len > dmalen)) {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF("bad RXWI length %u > %u\n", len, dmalen);
 		return;
 	}
@@ -2796,7 +2796,7 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 
 	if (__predict_false(flags & (RT2860_RX_CRCERR | RT2860_RX_ICVERR))) {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF("%s error.\n", (flags & RT2860_RX_CRCERR)?"CRC":"ICV");
 		return;
 	}
@@ -2825,7 +2825,7 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 			ieee80211_notify_michael_failure(ni->ni_vap, wh,
 			    rxwi->keyidx);
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF("MIC error. Someone is lying.\n");
 		return;
 	}
@@ -2925,7 +2925,7 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (sc->rx_m == NULL) {
 			DPRINTF("could not allocate mbuf - idle with stall\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			usbd_xfer_set_stall(xfer);
 			usbd_xfer_set_frames(xfer, 0);
 		} else {
@@ -2949,7 +2949,7 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 			if (error == USB_ERR_TIMEOUT)
 				device_printf(sc->sc_dev, "device timeout\n");
 
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 
 			goto tr_setup;
 		}
@@ -2998,7 +2998,7 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (__predict_false(m0 == NULL)) {
 			DPRINTF("could not allocate mbuf\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		m_copydata(m, 4 /* skip 32-bit DMA-len header */,
@@ -3070,7 +3070,7 @@ run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index)
 
 		usbd_xfer_set_priv(xfer, NULL);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -3089,7 +3089,7 @@ run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index)
 			DPRINTF("data overflow, %u bytes\n",
 			    m->m_pkthdr.len);
 
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 			run_tx_free(pq, data, 1);
 
@@ -3144,7 +3144,7 @@ run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index)
 
 		data = usbd_xfer_get_priv(xfer);
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 		if (data != NULL) {
 			if(data->ni != NULL)
@@ -3567,7 +3567,7 @@ run_sendprot(struct run_softc *sc,
 		mprot = ieee80211_alloc_cts(ic, ni->ni_vap->iv_myaddr, dur);
 	}
 	if (mprot == NULL) {
-		sc->sc_ifp->if_oerrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 		DPRINTF("could not allocate mbuf\n");
 		return (ENOBUFS);
 	}
@@ -3703,20 +3703,20 @@ run_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	if (params == NULL) {
 		/* tx mgt packet */
 		if ((error = run_tx_mgt(sc, m, ni)) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			DPRINTF("mgt tx failed\n");
 			goto done;
 		}
 	} else {
 		/* tx raw packet with param */
 		if ((error = run_tx_param(sc, m, ni, params)) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			DPRINTF("tx with param failed\n");
 			goto done;
 		}
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 done:
 	RUN_UNLOCK(sc);
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index b8e886388f72..0796fbe76316 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -1333,7 +1333,7 @@ uath_watchdog(void *arg)
 		if (--sc->sc_tx_timer == 0) {
 			device_printf(sc->sc_dev, "device timeout\n");
 			/*uath_init(ifp); XXX needs a process context! */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
 		callout_reset(&sc->watchdog_ch, hz, uath_watchdog, sc);
@@ -1814,7 +1814,7 @@ uath_start(struct ifnet *ifp)
 		next = m->m_nextpkt;
 		if (uath_tx_start(sc, m, ni, bf) != 0) {
 	bad:
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	reclaim:
 			STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 			UATH_STAT_INC(sc, st_tx_inactive);
@@ -1878,7 +1878,7 @@ uath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	sc->sc_seqnum = 0;
 	if (uath_tx_start(sc, m, ni, bf) != 0) {
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 		UATH_STAT_INC(sc, st_tx_inactive);
 		UATH_UNLOCK(sc);
@@ -2553,14 +2553,14 @@ uath_data_rxeof(struct usb_xfer *xfer, struct uath_data *data,
 	if (actlen < (int)UATH_MIN_RXBUFSZ) {
 		DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL,
 		    "%s: wrong xfer size (len=%d)\n", __func__, actlen);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 
 	chunk = (struct uath_chunk *)data->buf;
 	if (chunk->seqnum == 0 && chunk->flags == 0 && chunk->length == 0) {
 		device_printf(sc->sc_dev, "%s: strange response\n", __func__);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		UATH_RESET_INTRX(sc);
 		return (NULL);
 	}
@@ -2593,7 +2593,7 @@ uath_data_rxeof(struct usb_xfer *xfer, struct uath_data *data,
 		if ((sc->sc_intrx_len + sizeof(struct uath_rx_desc) +
 		    chunklen) > UATH_MAX_INTRX_SIZE) {
 			UATH_STAT_INC(sc, st_invalidlen);
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			if (sc->sc_intrx_head != NULL)
 				m_freem(sc->sc_intrx_head);
 			UATH_RESET_INTRX(sc);
@@ -2618,7 +2618,7 @@ uath_data_rxeof(struct usb_xfer *xfer, struct uath_data *data,
 	if (mnew == NULL) {
 		DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL,
 		    "%s: can't get new mbuf, drop frame\n", __func__);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		if (sc->sc_intrx_head != NULL)
 			m_freem(sc->sc_intrx_head);
 		UATH_RESET_INTRX(sc);
@@ -2659,7 +2659,7 @@ uath_data_rxeof(struct usb_xfer *xfer, struct uath_data *data,
 		DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL,
 		    "%s: bad descriptor (len=%d)\n", __func__,
 		    be32toh(desc->len));
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		UATH_STAT_INC(sc, st_toobigrxpkt);
 		if (sc->sc_intrx_head != NULL)
 			m_freem(sc->sc_intrx_head);
@@ -2703,7 +2703,7 @@ uath_data_rxeof(struct usb_xfer *xfer, struct uath_data *data,
 		tap->wr_antnoise = -95;
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	UATH_RESET_INTRX(sc);
 
 	return (m);
@@ -2790,7 +2790,7 @@ uath_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto setup;
 		}
 		break;
@@ -2826,7 +2826,7 @@ uath_data_txeof(struct usb_xfer *xfer, struct uath_data *data)
 		data->ni = NULL;
 	}
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }
 
@@ -2878,7 +2878,7 @@ uath_bulk_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 			if ((sc->sc_flags & UATH_FLAG_INVALID) == 0)
 				ieee80211_free_node(data->ni);
 			data->ni = NULL;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index a84644d6e921..6b24524b10a5 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -416,7 +416,7 @@ upgt_txeof(struct usb_xfer *xfer, struct upgt_data *data)
 		ieee80211_free_node(data->ni);
 		data->ni = NULL;
 	}
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 }
 
 static void
@@ -854,7 +854,7 @@ upgt_start(struct ifnet *ifp)
 			STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, data_tx, next);
 			UPGT_STAT_INC(sc, st_tx_inactive);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 		sc->sc_tx_timer = 5;
@@ -891,7 +891,7 @@ upgt_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, data_tx, next);
 		UPGT_STAT_INC(sc, st_tx_inactive);
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		UPGT_UNLOCK(sc);
 		return (EIO);
 	}
@@ -911,7 +911,7 @@ upgt_watchdog(void *arg)
 		if (--sc->sc_tx_timer == 0) {
 			device_printf(sc->sc_dev, "watchdog timeout\n");
 			/* upgt_init(ifp); XXX needs a process context ? */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
 		callout_reset(&sc->sc_watchdog_ch, hz, upgt_watchdog, sc);
@@ -1552,7 +1552,7 @@ upgt_rx(struct upgt_softc *sc, uint8_t *data, int pkglen, int *rssi)
 		tap->wr_rate = upgt_rx_rate(sc, rxdesc->rate);
 		tap->wr_antsignal = rxdesc->rssi;
 	}
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	DPRINTF(sc, UPGT_DEBUG_RX_PROC, "%s: RX done\n", __func__);
 	*rssi = rxdesc->rssi;
@@ -2293,7 +2293,8 @@ upgt_tx_start(struct upgt_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
 	 * will stall.  It's strange, but it works, so we keep reading
 	 * the statistics here.  *shrug*
 	 */
-	if (!(ifp->if_opackets % UPGT_TX_STAT_INTERVAL))
+	if (!(ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS) %
+	    UPGT_TX_STAT_INTERVAL))
 		upgt_get_stats(sc);
 
 	return (error);
@@ -2366,7 +2367,7 @@ upgt_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto setup;
 		}
 		break;
@@ -2418,7 +2419,7 @@ upgt_bulk_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (data->ni != NULL) {
 			ieee80211_free_node(data->ni);
 			data->ni = NULL;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index 6145ff86c26d..959bec5e43e5 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -805,7 +805,7 @@ ural_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		ural_tx_free(data, 0);
 		usbd_xfer_set_priv(xfer, NULL);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		/* FALLTHROUGH */
@@ -859,7 +859,7 @@ ural_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTFN(11, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		data = usbd_xfer_get_priv(xfer);
 		if (data != NULL) {
 			ural_tx_free(data, error);
@@ -900,7 +900,7 @@ ural_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (len < (int)(RAL_RX_DESC_SIZE + IEEE80211_MIN_LEN)) {
 			DPRINTF("%s: xfer too short %d\n",
 			    device_get_nameunit(sc->sc_dev), len);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 
@@ -919,14 +919,14 @@ ural_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		         * filled RAL_TXRX_CSR2:
 		         */
 			DPRINTFN(5, "PHY or CRC error\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 
 		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL) {
 			DPRINTF("could not allocate mbuf\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		usbd_copy_out(pc, 0, mtod(m, uint8_t *), len);
@@ -1370,7 +1370,7 @@ ural_start(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (ural_tx_data(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 	}
@@ -2210,7 +2210,7 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return EIO;
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	if (params == NULL) {
 		/*
@@ -2230,7 +2230,7 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	RAL_UNLOCK(sc);
 	return 0;
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	RAL_UNLOCK(sc);
 	ieee80211_free_node(ni);
 	return EIO;		/* XXX */
@@ -2284,7 +2284,7 @@ ural_ratectl_task(void *arg, int pending)
 	ieee80211_ratectl_tx_update(vap, ni, &sum, &ok, &retrycnt);
 	(void) ieee80211_ratectl_rate(ni, NULL, 0);
 
-	ifp->if_oerrors += fail;	/* count TX retry-fail as Tx errors */
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, fail);	/* count TX retry-fail as Tx errors */
 
 	usb_callout_reset(&uvp->ratectl_ch, hz, ural_ratectl_timeout, uvp);
 	RAL_UNLOCK(sc);
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index d2837324b63f..d2c6ef975a9f 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -1472,7 +1472,7 @@ urtw_start(struct ifnet *ifp)
 		m->m_pkthdr.rcvif = NULL;
 
 		if (urtw_tx_start(sc, ni, m, bf, URTW_PRIORITY_NORMAL) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 			ieee80211_free_node(ni);
 			break;
@@ -1582,10 +1582,10 @@ urtw_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return (ENOBUFS);		/* XXX */
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	if (urtw_tx_start(sc, ni, m, bf, URTW_PRIORITY_LOW) != 0) {
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 		URTW_UNLOCK(sc);
 		return (EIO);
@@ -1918,7 +1918,7 @@ urtw_watchdog(void *arg)
 	if (sc->sc_txtimer > 0) {
 		if (--sc->sc_txtimer == 0) {
 			device_printf(sc->sc_dev, "device timeout\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
 		callout_reset(&sc->sc_watchdog_ch, hz, urtw_watchdog, sc);
@@ -3993,7 +3993,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *data, int *rssi_p,
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 
 	if (actlen < (int)URTW_MIN_RXBUFSZ) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 
@@ -4004,7 +4004,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *data, int *rssi_p,
 		    (actlen - (sizeof(struct urtw_8187b_rxhdr))));
 		flen = le32toh(rx->flag) & 0xfff;
 		if (flen > actlen) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			return (NULL);
 		}
 		rate = (le32toh(rx->flag) >> URTW_RX_FLAG_RXRATE_SHIFT) & 0xf;
@@ -4018,7 +4018,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *data, int *rssi_p,
 		    (actlen - (sizeof(struct urtw_8187l_rxhdr))));
 		flen = le32toh(rx->flag) & 0xfff;
 		if (flen > actlen) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			return (NULL);
 		}
 
@@ -4030,7 +4030,7 @@ urtw_rxeof(struct usb_xfer *xfer, struct urtw_data *data, int *rssi_p,
 
 	mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (mnew == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 
@@ -4127,7 +4127,7 @@ urtw_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto setup;
 		}
 		break;
@@ -4156,7 +4156,7 @@ urtw_txstatus_eof(struct usb_xfer *xfer)
 		pktretry = val & 0xff;
 		seq = (val >> 16) & 0xff;
 		if (pktretry == URTW_TX_MAXRETRY)
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		DPRINTF(sc, URTW_DEBUG_TXSTATUS, "pktretry %d seq %#x\n",
 		    pktretry, seq);
 	}
@@ -4184,7 +4184,7 @@ urtw_bulk_tx_status_callback(struct usb_xfer *xfer, usb_error_t error)
 	default:
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto setup;
 		}
 		break;
@@ -4218,7 +4218,7 @@ urtw_txeof(struct usb_xfer *xfer, struct urtw_data *data)
 		data->ni = NULL;
 	}
 	sc->sc_txtimer = 0;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }
 
@@ -4265,7 +4265,7 @@ urtw_bulk_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (data->ni != NULL) {
 			ieee80211_free_node(data->ni);
 			data->ni = NULL;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index 1f1446cdfcd7..1f728d40c85d 100644
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -141,6 +141,7 @@ static const STRUCT_USB_HOST_ID urtwn_devs[] = {
 	URTWN_DEV(REALTEK,	RTL8188CUS),
 	URTWN_DEV(REALTEK,	RTL8188RU_1),
 	URTWN_DEV(REALTEK,	RTL8188RU_2),
+	URTWN_DEV(REALTEK,	RTL8188RU_3),
 	URTWN_DEV(REALTEK,	RTL8191CU),
 	URTWN_DEV(REALTEK,	RTL8192CE),
 	URTWN_DEV(REALTEK,	RTL8192CU),
@@ -657,7 +658,11 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen, int *rssi_p)
 		 * This should not happen since we setup our Rx filter
 		 * to not receive these frames.
 		 */
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+		return (NULL);
+	}
+	if (pktlen < sizeof(*wh) || pktlen > MCLBYTES) {
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 
@@ -742,7 +747,7 @@ urtwn_rxeof(struct usb_xfer *xfer, struct urtwn_data *data, int *rssi,
 	usbd_xfer_status(xfer, &len, NULL, NULL, NULL);
 
 	if (len < sizeof(*stat)) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (NULL);
 	}
 
@@ -857,7 +862,7 @@ urtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto tr_setup;
 		}
 		break;
@@ -891,7 +896,7 @@ urtwn_txeof(struct usb_xfer *xfer, struct urtwn_data *data)
 		data->ni = NULL;
 	}
 	sc->sc_txtimer = 0;
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }
 
@@ -933,7 +938,7 @@ urtwn_bulk_tx_callback(struct usb_xfer *xfer, usb_error_t error)
 		if (data->ni != NULL) {
 			ieee80211_free_node(data->ni);
 			data->ni = NULL;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
@@ -1664,7 +1669,7 @@ urtwn_watchdog(void *arg)
 	if (sc->sc_txtimer > 0) {
 		if (--sc->sc_txtimer == 0) {
 			device_printf(sc->sc_dev, "device timeout\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
 		callout_reset(&sc->sc_watchdog_ch, hz, urtwn_watchdog, sc);
@@ -1968,7 +1973,7 @@ urtwn_start_locked(struct ifnet *ifp, struct urtwn_softc *sc)
 		m->m_pkthdr.rcvif = NULL;
 
 		if (urtwn_tx_start(sc, ni, m, bf) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 			ieee80211_free_node(ni);
 			break;
@@ -3524,10 +3529,10 @@ urtwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return (ENOBUFS);
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	if (urtwn_tx_start(sc, ni, m, bf) != 0) {
 		ieee80211_free_node(ni);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
 		URTWN_UNLOCK(sc);
 		return (EIO);
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 1e06d1512d18..2db22f531cde 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -679,7 +679,7 @@ zyd_intr_read_callback(struct usb_xfer *xfer, usb_error_t error)
 				ieee80211_free_node(ni);
 			}
 			if (le16toh(retry->count) & 0x100)
-				ifp->if_oerrors++;	/* too many retries */
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);	/* too many retries */
 			break;
 		}
 		case ZYD_NOTIF_IORD:
@@ -2188,7 +2188,7 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len)
 	if (len < ZYD_MIN_FRAGSZ) {
 		DPRINTF(sc, ZYD_DEBUG_RECV, "%s: frame too short (length=%d)\n",
 		    device_get_nameunit(sc->sc_dev), len);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	pc = usbd_xfer_get_frame(xfer, 0);
@@ -2199,7 +2199,7 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len)
 		DPRINTF(sc, ZYD_DEBUG_RECV,
 		    "%s: RX status indicated error (%x)\n",
 		    device_get_nameunit(sc->sc_dev), stat.flags);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -2211,7 +2211,7 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len)
 	if (rlen > (int)MCLBYTES) {
 		DPRINTF(sc, ZYD_DEBUG_RECV, "%s: frame too long (length=%d)\n",
 		    device_get_nameunit(sc->sc_dev), rlen);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	} else if (rlen > (int)MHLEN)
 		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
@@ -2220,7 +2220,7 @@ zyd_rx_data(struct usb_xfer *xfer, int offset, uint16_t len)
 	if (m == NULL) {
 		DPRINTF(sc, ZYD_DEBUG_RECV, "%s: could not allocate rx mbuf\n",
 		    device_get_nameunit(sc->sc_dev));
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	m->m_pkthdr.rcvif = ifp;
@@ -2403,7 +2403,7 @@ zyd_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		zyd_tx_free(data, 0);
 		usbd_xfer_set_priv(xfer, NULL);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		/* FALLTHROUGH */
@@ -2447,7 +2447,7 @@ zyd_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 		DPRINTF(sc, ZYD_DEBUG_ANY, "transfer error, %s\n",
 		    usbd_errstr(error));
 
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		data = usbd_xfer_get_priv(xfer);
 		usbd_xfer_set_priv(xfer, NULL);
 		if (data != NULL)
@@ -2608,7 +2608,7 @@ zyd_start(struct ifnet *ifp)
 		ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
 		if (zyd_tx_start(sc, m, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 	}
@@ -2646,7 +2646,7 @@ zyd_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	 */
 	if (zyd_tx_start(sc, m, ni) != 0) {
 		ZYD_UNLOCK(sc);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ieee80211_free_node(ni);
 		return (EIO);
 	}
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 13276d95bfa6..315f273eef9d 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1400,7 +1400,7 @@ vge_freebufs(struct vge_softc *sc)
 			    txd->tx_dmamap);
 			m_freem(txd->tx_m);
 			txd->tx_m = NULL;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 	}
 }
@@ -1467,7 +1467,7 @@ vge_rxeof(struct vge_softc *sc, int count)
 		 */
 		if ((rxstat & VGE_RXPKT_SOF) != 0) {
 			if (vge_newbuf(sc, prod) != 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				VGE_CHAIN_RESET(sc);
 				vge_discard_rxbuf(sc, prod);
 				continue;
@@ -1498,7 +1498,7 @@ vge_rxeof(struct vge_softc *sc, int count)
 		if ((rxstat & VGE_RDSTS_RXOK) == 0 &&
 		    (rxstat & (VGE_RDSTS_VIDM | VGE_RDSTS_RLERR |
 		    VGE_RDSTS_CSUMERR)) == 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			/*
 			 * If this is part of a multi-fragment packet,
 			 * discard all the pieces.
@@ -1509,7 +1509,7 @@ vge_rxeof(struct vge_softc *sc, int count)
 		}
 
 		if (vge_newbuf(sc, prod) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			VGE_CHAIN_RESET(sc);
 			vge_discard_rxbuf(sc, prod);
 			continue;
@@ -2380,7 +2380,7 @@ vge_watchdog(void *arg)
 
 	ifp = sc->vge_ifp;
 	if_printf(ifp, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	vge_txeof(sc);
 	vge_rxeof(sc, VGE_RX_DESC_CNT);
@@ -2706,24 +2706,25 @@ vge_stats_update(struct vge_softc *sc)
 	stats->tx_latecolls += mib[VGE_MIB_TX_LATECOLLS];
 
 	/* Update counters in ifnet. */
-	ifp->if_opackets += mib[VGE_MIB_TX_GOOD_FRAMES];
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, mib[VGE_MIB_TX_GOOD_FRAMES]);
 
-	ifp->if_collisions += mib[VGE_MIB_TX_COLLS] +
-	    mib[VGE_MIB_TX_LATECOLLS];
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    mib[VGE_MIB_TX_COLLS] + mib[VGE_MIB_TX_LATECOLLS]);
 
-	ifp->if_oerrors += mib[VGE_MIB_TX_COLLS] +
-	    mib[VGE_MIB_TX_LATECOLLS];
+	if_inc_counter(ifp, IFCOUNTER_OERRORS,
+	    mib[VGE_MIB_TX_COLLS] + mib[VGE_MIB_TX_LATECOLLS]);
 
-	ifp->if_ipackets += mib[VGE_MIB_RX_GOOD_FRAMES];
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, mib[VGE_MIB_RX_GOOD_FRAMES]);
 
-	ifp->if_ierrors += mib[VGE_MIB_RX_FIFO_OVERRUNS] +
+	if_inc_counter(ifp, IFCOUNTER_IERRORS,
+	    mib[VGE_MIB_RX_FIFO_OVERRUNS] +
 	    mib[VGE_MIB_RX_RUNTS] +
 	    mib[VGE_MIB_RX_RUNTS_ERRS] +
 	    mib[VGE_MIB_RX_CRCERRS] +
 	    mib[VGE_MIB_RX_ALIGNERRS] +
 	    mib[VGE_MIB_RX_NOBUFS] +
 	    mib[VGE_MIB_RX_SYMERRS] +
-	    mib[VGE_MIB_RX_LENERRS];
+	    mib[VGE_MIB_RX_LENERRS]);
 }
 
 static void
diff --git a/sys/pci/viapm.c b/sys/dev/viapm/viapm.c
similarity index 100%
rename from sys/pci/viapm.c
rename to sys/dev/viapm/viapm.c
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 38de48e37bef..1310f30bc239 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -107,6 +107,7 @@ static int	vtnet_alloc_virtqueues(struct vtnet_softc *);
 static int	vtnet_setup_interface(struct vtnet_softc *);
 static int	vtnet_change_mtu(struct vtnet_softc *, int);
 static int	vtnet_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t	vtnet_get_counter(struct ifnet *, ift_counter);
 
 static int	vtnet_rxq_populate(struct vtnet_rxq *);
 static void	vtnet_rxq_free_mbufs(struct vtnet_rxq *);
@@ -160,11 +161,8 @@ static void	vtnet_qflush(struct ifnet *);
 #endif
 
 static int	vtnet_watchdog(struct vtnet_txq *);
-static void	vtnet_rxq_accum_stats(struct vtnet_rxq *,
-		    struct vtnet_rxq_stats *);
-static void	vtnet_txq_accum_stats(struct vtnet_txq *,
-		    struct vtnet_txq_stats *);
-static void	vtnet_accumulate_stats(struct vtnet_softc *);
+static void	vtnet_accum_stats(struct vtnet_softc *,
+		    struct vtnet_rxq_stats *, struct vtnet_txq_stats *);
 static void	vtnet_tick(void *);
 
 static void	vtnet_start_taskqueues(struct vtnet_softc *);
@@ -921,7 +919,7 @@ vtnet_setup_interface(struct vtnet_softc *sc)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_init = vtnet_init;
 	ifp->if_ioctl = vtnet_ioctl;
-
+	ifp->if_get_counter = vtnet_get_counter;
 #ifndef VTNET_LEGACY_TX
 	ifp->if_transmit = vtnet_txq_mq_start;
 	ifp->if_qflush = vtnet_qflush;
@@ -2573,74 +2571,62 @@ vtnet_watchdog(struct vtnet_txq *txq)
 }
 
 static void
-vtnet_rxq_accum_stats(struct vtnet_rxq *rxq, struct vtnet_rxq_stats *accum)
+vtnet_accum_stats(struct vtnet_softc *sc, struct vtnet_rxq_stats *rxacc,
+    struct vtnet_txq_stats *txacc)
 {
-	struct vtnet_rxq_stats *st;
 
-	st = &rxq->vtnrx_stats;
+	bzero(rxacc, sizeof(struct vtnet_rxq_stats));
+	bzero(txacc, sizeof(struct vtnet_txq_stats));
 
-	accum->vrxs_ipackets += st->vrxs_ipackets;
-	accum->vrxs_ibytes += st->vrxs_ibytes;
-	accum->vrxs_iqdrops += st->vrxs_iqdrops;
-	accum->vrxs_csum += st->vrxs_csum;
-	accum->vrxs_csum_failed += st->vrxs_csum_failed;
-	accum->vrxs_rescheduled += st->vrxs_rescheduled;
+	for (int i = 0; i < sc->vtnet_max_vq_pairs; i++) {
+		struct vtnet_rxq_stats *rxst;
+		struct vtnet_txq_stats *txst;
+
+		rxst = &sc->vtnet_rxqs[i].vtnrx_stats;
+		rxacc->vrxs_ipackets += rxst->vrxs_ipackets;
+		rxacc->vrxs_ibytes += rxst->vrxs_ibytes;
+		rxacc->vrxs_iqdrops += rxst->vrxs_iqdrops;
+		rxacc->vrxs_csum += rxst->vrxs_csum;
+		rxacc->vrxs_csum_failed += rxst->vrxs_csum_failed;
+		rxacc->vrxs_rescheduled += rxst->vrxs_rescheduled;
+
+		txst = &sc->vtnet_txqs[i].vtntx_stats;
+		txacc->vtxs_opackets += txst->vtxs_opackets;
+		txacc->vtxs_obytes += txst->vtxs_obytes;
+		txacc->vtxs_csum += txst->vtxs_csum;
+		txacc->vtxs_tso += txst->vtxs_tso;
+		txacc->vtxs_rescheduled += txst->vtxs_rescheduled;
+	}
 }
 
-static void
-vtnet_txq_accum_stats(struct vtnet_txq *txq, struct vtnet_txq_stats *accum)
+static uint64_t
+vtnet_get_counter(if_t ifp, ift_counter cnt)
 {
-	struct vtnet_txq_stats *st;
-
-	st = &txq->vtntx_stats;
-
-	accum->vtxs_opackets += st->vtxs_opackets;
-	accum->vtxs_obytes += st->vtxs_obytes;
-	accum->vtxs_csum += st->vtxs_csum;
-	accum->vtxs_tso += st->vtxs_tso;
-	accum->vtxs_rescheduled += st->vtxs_rescheduled;
-}
-
-static void
-vtnet_accumulate_stats(struct vtnet_softc *sc)
-{
-	struct ifnet *ifp;
-	struct vtnet_statistics *st;
+	struct vtnet_softc *sc;
 	struct vtnet_rxq_stats rxaccum;
 	struct vtnet_txq_stats txaccum;
-	int i;
 
-	ifp = sc->vtnet_ifp;
-	st = &sc->vtnet_stats;
-	bzero(&rxaccum, sizeof(struct vtnet_rxq_stats));
-	bzero(&txaccum, sizeof(struct vtnet_txq_stats));
+	sc = if_getsoftc(ifp);
+	vtnet_accum_stats(sc, &rxaccum, &txaccum);
 
-	for (i = 0; i < sc->vtnet_max_vq_pairs; i++) {
-		vtnet_rxq_accum_stats(&sc->vtnet_rxqs[i], &rxaccum);
-		vtnet_txq_accum_stats(&sc->vtnet_txqs[i], &txaccum);
-	}
-
-	st->rx_csum_offloaded = rxaccum.vrxs_csum;
-	st->rx_csum_failed = rxaccum.vrxs_csum_failed;
-	st->rx_task_rescheduled = rxaccum.vrxs_rescheduled;
-	st->tx_csum_offloaded = txaccum.vtxs_csum;
-	st->tx_tso_offloaded = txaccum.vtxs_tso;
-	st->tx_task_rescheduled = txaccum.vtxs_rescheduled;
-
-	/*
-	 * With the exception of if_ierrors, these ifnet statistics are
-	 * only updated in the driver, so just set them to our accumulated
-	 * values. if_ierrors is updated in ether_input() for malformed
-	 * frames that we should have already discarded.
-	 */
-	ifp->if_ipackets = rxaccum.vrxs_ipackets;
-	ifp->if_iqdrops = rxaccum.vrxs_iqdrops;
-	ifp->if_ierrors = rxaccum.vrxs_ierrors;
-	ifp->if_opackets = txaccum.vtxs_opackets;
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		return (rxaccum.vrxs_ipackets);
+	case IFCOUNTER_IQDROPS:
+		return (rxaccum.vrxs_iqdrops);
+	case IFCOUNTER_IERRORS:
+		return (rxaccum.vrxs_ierrors);
+	case IFCOUNTER_OPACKETS:
+		return (txaccum.vtxs_opackets);
 #ifndef VTNET_LEGACY_TX
-	ifp->if_obytes = txaccum.vtxs_obytes;
-	ifp->if_omcasts = txaccum.vtxs_omcasts;
+	case IFCOUNTER_OBYTES:
+		return (txaccum.vtxs_obytes);
+	case IFCOUNTER_OMCASTS:
+		return (txaccum.vtxs_omcasts);
 #endif
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 static void
@@ -2655,7 +2641,6 @@ vtnet_tick(void *xsc)
 	timedout = 0;
 
 	VTNET_CORE_LOCK_ASSERT(sc);
-	vtnet_accumulate_stats(sc);
 
 	for (i = 0; i < sc->vtnet_act_vq_pairs; i++)
 		timedout |= vtnet_watchdog(&sc->vtnet_txqs[i]);
@@ -3762,8 +3747,18 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx,
     struct sysctl_oid_list *child, struct vtnet_softc *sc)
 {
 	struct vtnet_statistics *stats;
+	struct vtnet_rxq_stats rxaccum;
+	struct vtnet_txq_stats txaccum;
+
+	vtnet_accum_stats(sc, &rxaccum, &txaccum);
 
 	stats = &sc->vtnet_stats;
+	stats->rx_csum_offloaded = rxaccum.vrxs_csum;
+	stats->rx_csum_failed = rxaccum.vrxs_csum_failed;
+	stats->rx_task_rescheduled = rxaccum.vrxs_rescheduled;
+	stats->tx_csum_offloaded = txaccum.vtxs_csum;
+	stats->tx_tso_offloaded = txaccum.vtxs_tso;
+	stats->tx_task_rescheduled = txaccum.vtxs_rescheduled;
 
 	SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "mbuf_alloc_failed",
 	    CTLFLAG_RD, &stats->mbuf_alloc_failed,
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c
index f3fde92e3f7a..1d8c12e2fc9b 100644
--- a/sys/dev/vmware/vmxnet3/if_vmx.c
+++ b/sys/dev/vmware/vmxnet3/if_vmx.c
@@ -187,6 +187,7 @@ static void	vmxnet3_unregister_vlan(void *, struct ifnet *, uint16_t);
 static void	vmxnet3_set_rxfilter(struct vmxnet3_softc *);
 static int	vmxnet3_change_mtu(struct vmxnet3_softc *, int);
 static int	vmxnet3_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t	vmxnet3_get_counter(struct ifnet *, ift_counter);
 
 #ifndef VMXNET3_LEGACY_TX
 static void	vmxnet3_qflush(struct ifnet *);
@@ -194,10 +195,6 @@ static void	vmxnet3_qflush(struct ifnet *);
 
 static int	vmxnet3_watchdog(struct vmxnet3_txqueue *);
 static void	vmxnet3_refresh_host_stats(struct vmxnet3_softc *);
-static void	vmxnet3_txq_accum_stats(struct vmxnet3_txqueue *,
-		    struct vmxnet3_txq_stats *);
-static void	vmxnet3_rxq_accum_stats(struct vmxnet3_rxqueue *,
-		    struct vmxnet3_rxq_stats *);
 static void	vmxnet3_tick(void *);
 static void	vmxnet3_link_status(struct vmxnet3_softc *);
 static void	vmxnet3_media_status(struct ifnet *, struct ifmediareq *);
@@ -1722,7 +1719,10 @@ vmxnet3_setup_interface(struct vmxnet3_softc *sc)
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_init = vmxnet3_init;
 	ifp->if_ioctl = vmxnet3_ioctl;
-	ifp->if_hw_tsomax = VMXNET3_TSO_MAXSIZE;
+	ifp->if_get_counter = vmxnet3_get_counter;
+	ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
+	ifp->if_hw_tsomaxsegcount = VMXNET3_TX_MAXSEGS;
+	ifp->if_hw_tsomaxsegsize = VMXNET3_TX_MAXSEGSIZE;
 
 #ifdef VMXNET3_LEGACY_TX
 	ifp->if_start = vmxnet3_start;
@@ -3342,56 +3342,14 @@ vmxnet3_refresh_host_stats(struct vmxnet3_softc *sc)
 	vmxnet3_write_cmd(sc, VMXNET3_CMD_GET_STATS);
 }
 
-static void
-vmxnet3_txq_accum_stats(struct vmxnet3_txqueue *txq,
-    struct vmxnet3_txq_stats *accum)
+static uint64_t
+vmxnet3_get_counter(struct ifnet *ifp, ift_counter cnt)
 {
-	struct vmxnet3_txq_stats *st;
+	struct vmxnet3_softc *sc;
+	uint64_t rv;
 
-	st = &txq->vxtxq_stats;
-
-	accum->vmtxs_opackets += st->vmtxs_opackets;
-	accum->vmtxs_obytes += st->vmtxs_obytes;
-	accum->vmtxs_omcasts += st->vmtxs_omcasts;
-	accum->vmtxs_csum += st->vmtxs_csum;
-	accum->vmtxs_tso += st->vmtxs_tso;
-	accum->vmtxs_full += st->vmtxs_full;
-	accum->vmtxs_offload_failed += st->vmtxs_offload_failed;
-}
-
-static void
-vmxnet3_rxq_accum_stats(struct vmxnet3_rxqueue *rxq,
-    struct vmxnet3_rxq_stats *accum)
-{
-	struct vmxnet3_rxq_stats *st;
-
-	st = &rxq->vxrxq_stats;
-
-	accum->vmrxs_ipackets += st->vmrxs_ipackets;
-	accum->vmrxs_ibytes += st->vmrxs_ibytes;
-	accum->vmrxs_iqdrops += st->vmrxs_iqdrops;
-	accum->vmrxs_ierrors += st->vmrxs_ierrors;
-}
-
-static void
-vmxnet3_accumulate_stats(struct vmxnet3_softc *sc)
-{
-	struct ifnet *ifp;
-	struct vmxnet3_statistics *st;
-	struct vmxnet3_txq_stats txaccum;
-	struct vmxnet3_rxq_stats rxaccum;
-	int i;
-
-	ifp = sc->vmx_ifp;
-	st = &sc->vmx_stats;
-
-	bzero(&txaccum, sizeof(struct vmxnet3_txq_stats));
-	bzero(&rxaccum, sizeof(struct vmxnet3_rxq_stats));
-
-	for (i = 0; i < sc->vmx_ntxqueues; i++)
-		vmxnet3_txq_accum_stats(&sc->vmx_txq[i], &txaccum);
-	for (i = 0; i < sc->vmx_nrxqueues; i++)
-		vmxnet3_rxq_accum_stats(&sc->vmx_rxq[i], &rxaccum);
+	sc = if_getsoftc(ifp);
+	rv = 0;
 
 	/*
 	 * With the exception of if_ierrors, these ifnet statistics are
@@ -3399,14 +3357,36 @@ vmxnet3_accumulate_stats(struct vmxnet3_softc *sc)
 	 * values. if_ierrors is updated in ether_input() for malformed
 	 * frames that we should have already discarded.
 	 */
-	ifp->if_ipackets = rxaccum.vmrxs_ipackets;
-	ifp->if_iqdrops = rxaccum.vmrxs_iqdrops;
-	ifp->if_ierrors = rxaccum.vmrxs_ierrors;
-	ifp->if_opackets = txaccum.vmtxs_opackets;
+	switch (cnt) {
+	case IFCOUNTER_IPACKETS:
+		for (int i = 0; i < sc->vmx_nrxqueues; i++)
+			rv += sc->vmx_rxq[i].vxrxq_stats.vmrxs_ipackets;
+		return (rv);
+	case IFCOUNTER_IQDROPS:
+		for (int i = 0; i < sc->vmx_nrxqueues; i++)
+			rv += sc->vmx_rxq[i].vxrxq_stats.vmrxs_iqdrops;
+		return (rv);
+	case IFCOUNTER_IERRORS:
+		for (int i = 0; i < sc->vmx_nrxqueues; i++)
+			rv += sc->vmx_rxq[i].vxrxq_stats.vmrxs_ierrors;
+		return (rv);
+	case IFCOUNTER_OPACKETS:
+		for (int i = 0; i < sc->vmx_ntxqueues; i++)
+			rv += sc->vmx_txq[i].vxtxq_stats.vmtxs_opackets;
+		return (rv);
 #ifndef VMXNET3_LEGACY_TX
-	ifp->if_obytes = txaccum.vmtxs_obytes;
-	ifp->if_omcasts = txaccum.vmtxs_omcasts;
+	case IFCOUNTER_OBYTES:
+		for (int i = 0; i < sc->vmx_ntxqueues; i++)
+			rv += sc->vmx_txq[i].vxtxq_stats.vmtxs_obytes;
+		return (rv);
+	case IFCOUNTER_OMCASTS:
+		for (int i = 0; i < sc->vmx_ntxqueues; i++)
+			rv += sc->vmx_txq[i].vxtxq_stats.vmtxs_omcasts;
+		return (rv);
 #endif
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 static void
@@ -3422,7 +3402,6 @@ vmxnet3_tick(void *xsc)
 
 	VMXNET3_CORE_LOCK_ASSERT(sc);
 
-	vmxnet3_accumulate_stats(sc);
 	vmxnet3_refresh_host_stats(sc);
 
 	for (i = 0; i < sc->vmx_ntxqueues; i++)
diff --git a/sys/dev/vmware/vmxnet3/if_vmxvar.h b/sys/dev/vmware/vmxnet3/if_vmxvar.h
index 6c797214b2ee..861351603e2b 100644
--- a/sys/dev/vmware/vmxnet3/if_vmxvar.h
+++ b/sys/dev/vmware/vmxnet3/if_vmxvar.h
@@ -277,8 +277,6 @@ struct vmxnet3_softc {
  */
 #define VMXNET3_TX_MAXSEGS		32
 #define VMXNET3_TX_MAXSIZE		(VMXNET3_TX_MAXSEGS * MCLBYTES)
-#define VMXNET3_TSO_MAXSIZE \
-    (VMXNET3_TX_MAXSIZE - sizeof(struct ether_vlan_header))
 
 /*
  * Maximum support Tx segments size. The length field in the
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 104687231533..fdf82a588f17 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -1325,7 +1325,7 @@ vr_rxeof(struct vr_softc *sc)
 		if ((rxstat & VR_RXSTAT_RX_OK) == 0 ||
 		    (rxstat & (VR_RXSTAT_FIRSTFRAG | VR_RXSTAT_LASTFRAG)) !=
 		    (VR_RXSTAT_FIRSTFRAG | VR_RXSTAT_LASTFRAG)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			sc->vr_stat.rx_errors++;
 			if (rxstat & VR_RXSTAT_CRCERR)
 				sc->vr_stat.rx_crc_errors++;
@@ -1348,7 +1348,7 @@ vr_rxeof(struct vr_softc *sc)
 		}
 
 		if (vr_newbuf(sc, cons) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			sc->vr_stat.rx_errors++;
 			sc->vr_stat.rx_no_mbufs++;
 			vr_discard_rxbuf(rxd);
@@ -1376,7 +1376,7 @@ vr_rxeof(struct vr_softc *sc)
 		vr_fixup_rx(m);
 #endif
 		m->m_pkthdr.rcvif = ifp;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		sc->vr_stat.rx_ok++;
 		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0 &&
 		    (rxstat & VR_RXSTAT_FRAG) == 0 &&
@@ -1466,7 +1466,7 @@ vr_txeof(struct vr_softc *sc)
 		    __func__));
 
 		if ((txstat & VR_TXSTAT_ERRSUM) != 0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			sc->vr_stat.tx_errors++;
 			if ((txstat & VR_TXSTAT_ABRT) != 0) {
 				/* Give up and restart Tx. */
@@ -1504,28 +1504,28 @@ vr_txeof(struct vr_softc *sc)
 				return;
 			}
 			if ((txstat & VR_TXSTAT_DEFER) != 0) {
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 				sc->vr_stat.tx_collisions++;
 			}
 			if ((txstat & VR_TXSTAT_LATECOLL) != 0) {
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 				sc->vr_stat.tx_late_collisions++;
 			}
 		} else {
 			sc->vr_stat.tx_ok++;
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 
 		bus_dmamap_sync(sc->vr_cdata.vr_tx_tag, txd->tx_dmamap,
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->vr_cdata.vr_tx_tag, txd->tx_dmamap);
 		if (sc->vr_revid < REV_ID_VT3071_A) {
-			ifp->if_collisions +=
-			    (txstat & VR_TXSTAT_COLLCNT) >> 3;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+			    (txstat & VR_TXSTAT_COLLCNT) >> 3);
 			sc->vr_stat.tx_collisions +=
 			    (txstat & VR_TXSTAT_COLLCNT) >> 3;
 		} else {
-			ifp->if_collisions += (txstat & 0x0f);
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & 0x0f));
 			sc->vr_stat.tx_collisions += (txstat & 0x0f);
 		}
 		m_freem(txd->tx_m);
@@ -2318,13 +2318,13 @@ vr_watchdog(struct vr_softc *sc)
 		if (bootverbose)
 			if_printf(sc->vr_ifp, "watchdog timeout "
 			   "(missed link)\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		vr_init_locked(sc);
 		return;
 	}
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index ff95391a6ce7..05b2d795228a 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -62,6 +62,8 @@ static struct vt_driver vt_efifb_driver = {
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_fb_ioctl = vt_fb_ioctl,
 	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
index ff50a9ccda55..187f7f72dd93 100644
--- a/sys/dev/vt/hw/fb/vt_early_fb.c
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -61,6 +61,8 @@ static struct vt_driver vt_fb_early_driver = {
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_priority = VD_PRIORITY_GENERIC,
 };
 
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
index ddec76d1cc69..422bb034bf16 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/vt/hw/fb/vt_fb.h>
 #include <dev/vt/colors/vt_termcolors.h>
 
-static vd_drawrect_t	vt_fb_drawrect;
-static vd_setpixel_t	vt_fb_setpixel;
-
 static struct vt_driver vt_fb_driver = {
 	.vd_name = "fb",
 	.vd_init = vt_fb_init,
@@ -146,7 +143,7 @@ vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset, vm_paddr_t *paddr,
 	return (EINVAL);
 }
 
-static void
+void
 vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 {
 	struct fb_info *info;
@@ -181,7 +178,7 @@ vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 
 }
 
-static void
+void
 vt_fb_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2, int fill,
     term_color_t color)
 {
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
index 9a0da6ebbc3b..43ce2b7b4c64 100644
--- a/sys/dev/vt/hw/fb/vt_fb.h
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -40,6 +40,8 @@ vd_init_t		vt_fb_init;
 vd_blank_t		vt_fb_blank;
 vd_bitblt_text_t	vt_fb_bitblt_text;
 vd_bitblt_bmp_t		vt_fb_bitblt_bitmap;
+vd_drawrect_t		vt_fb_drawrect;
+vd_setpixel_t		vt_fb_setpixel;
 vd_postswitch_t		vt_fb_postswitch;
 vd_fb_ioctl_t		vt_fb_ioctl;
 vd_fb_mmap_t		vt_fb_mmap;
diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c
index 75d42b583d89..ad5b664a9d71 100644
--- a/sys/dev/vt/hw/ofwfb/ofwfb.c
+++ b/sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -53,7 +53,7 @@ struct ofwfb_softc {
 
 	phandle_t	sc_node;
 	ihandle_t	sc_handle;
-	bus_space_tag_t	sc_memt; 
+	bus_space_tag_t	sc_memt;
 };
 
 static vd_probe_t	ofwfb_probe;
diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c
index 487ed4fb633b..abddbf50ce10 100644
--- a/sys/dev/vt/hw/vga/vt_vga.c
+++ b/sys/dev/vt/hw/vga/vt_vga.c
@@ -352,6 +352,9 @@ static void
 vga_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 {
 
+	if (vd->vd_flags & VDF_TEXTMODE)
+		return;
+
 	vga_bitblt_put(vd, (y * VT_VGA_WIDTH / 8) + (x / 8), color,
 	    0x80 >> (x % 8));
 }
@@ -362,6 +365,9 @@ vga_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2, int fill,
 {
 	int x, y;
 
+	if (vd->vd_flags & VDF_TEXTMODE)
+		return;
+
 	for (y = y1; y <= y2; y++) {
 		if (fill || (y == y1) || (y == y2)) {
 			for (x = x1; x <= x2; x++)
diff --git a/sys/dev/vt/logo/logo_freebsd.c b/sys/dev/vt/logo/logo_freebsd.c
index fc70570876ae..beb3f0c4990b 100644
--- a/sys/dev/vt/logo/logo_freebsd.c
+++ b/sys/dev/vt/logo/logo_freebsd.c
@@ -637,5 +637,5 @@ unsigned char vt_logo_image[] = {
 	0x1f, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x0e, 0x00, 0x00,
 	0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xc0, 0x00, 0x00,
 	0x3f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00,
 };
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index b9303bae3274..578f1a8ff09e 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -87,12 +87,6 @@ static int vt_##_name = _default;					\
 SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RWTUN, &vt_##_name, _default,\
 		_descr);
 
-/* Allow to disable some special keys by users. */
-#define	VT_DEBUG_KEY_ENABLED	(1 << 0)
-#define	VT_REBOOT_KEY_ENABLED	(1 << 1)
-#define	VT_HALT_KEY_ENABLED	(1 << 2)
-#define	VT_POWEROFF_KEY_ENABLED	(1 << 3)
-
 struct vt_driver;
 
 void vt_allocate(struct vt_driver *, void *);
@@ -119,11 +113,17 @@ typedef unsigned int 	vt_axis_t;
 struct vt_mouse_cursor;
 #endif
 
+struct vt_pastebuf {
+	term_char_t		*vpb_buf;	/* Copy-paste buffer. */
+	unsigned int		 vpb_bufsz;	/* Buffer size. */
+	unsigned int		 vpb_len;	/* Length of a last selection. */
+};
+
 struct vt_device {
 	struct vt_window	*vd_windows[VT_MAXWINDOWS]; /* (c) Windows. */
 	struct vt_window	*vd_curwindow;	/* (d) Current window. */
 	struct vt_window	*vd_savedwindow;/* (?) Saved for suspend. */
-	struct vt_window	*vd_markedwin;	/* (?) Copy/paste buf owner. */
+	struct vt_pastebuf	 vd_pastebuf;	/* (?) Copy/paste buf. */
 	const struct vt_driver	*vd_driver;	/* (c) Graphics driver. */
 	void			*vd_softc;	/* (u) Driver data. */
 #ifndef SC_NO_CUTPASTE
@@ -157,6 +157,10 @@ struct vt_device {
 	unsigned int		 vd_unit;	/* (c) Device unit. */
 };
 
+#define	VD_PASTEBUF(vd)	((vd)->vd_pastebuf.vpb_buf)
+#define	VD_PASTEBUFSZ(vd)	((vd)->vd_pastebuf.vpb_bufsz)
+#define	VD_PASTEBUFLEN(vd)	((vd)->vd_pastebuf.vpb_len)
+
 /*
  * Per-window terminal screen buffer.
  *
@@ -168,11 +172,6 @@ struct vt_device {
  * been modified.
  */
 
-struct vt_bufmask {
-	uint64_t		 vbm_row, vbm_col;
-#define	VBM_DIRTY		UINT64_MAX
-};
-
 struct vt_buf {
 	struct mtx		 vb_lock;	/* Buffer lock. */
 	term_pos_t		 vb_scr_size;	/* (b) Screen dimensions. */
@@ -191,7 +190,6 @@ struct vt_buf {
 	term_pos_t		 vb_mark_end;	/* (b) Copy region end. */
 	int			 vb_mark_last;	/* Last mouse event. */
 	term_rect_t		 vb_dirtyrect;	/* (b) Dirty rectangle. */
-	struct vt_bufmask	 vb_dirtymask;	/* (b) Dirty bitmasks. */
 	term_char_t		*vb_buffer;	/* (u) Data buffer. */
 	term_char_t		**vb_rows;	/* (u) Array of rows */
 };
@@ -205,7 +203,7 @@ void vtbuf_putchar(struct vt_buf *, const term_pos_t *, term_char_t);
 void vtbuf_cursor_position(struct vt_buf *, const term_pos_t *);
 void vtbuf_scroll_mode(struct vt_buf *vb, int yes);
 void vtbuf_dirty(struct vt_buf *vb, const term_rect_t *area);
-void vtbuf_undirty(struct vt_buf *, term_rect_t *, struct vt_bufmask *);
+void vtbuf_undirty(struct vt_buf *, term_rect_t *);
 void vtbuf_sethistory_size(struct vt_buf *, int);
 int vtbuf_iscursor(const struct vt_buf *vb, int row, int col);
 void vtbuf_cursor_visibility(struct vt_buf *, int);
@@ -262,6 +260,7 @@ struct vt_window {
 	unsigned int		 vw_number;	/* (c) Window number. */
 	int			 vw_kbdmode;	/* (?) Keyboard mode. */
 	int			 vw_prev_kbdmode;/* (?) Previous mode. */
+	int			 vw_kbdstate;	/* (?) Keyboard state. */
 	int			 vw_grabbed;	/* (?) Grab count. */
 	char			*vw_kbdsq;	/* Escape sequence queue*/
 	unsigned int		 vw_flags;	/* (d) Per-window flags. */
diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
index d468173605e6..cc23b3b6c99b 100644
--- a/sys/dev/vt/vt_buf.c
+++ b/sys/dev/vt/vt_buf.c
@@ -76,44 +76,47 @@ vthistory_seek(struct vt_buf *vb, int offset, int whence)
 		}
 		return (0); /* No changes */
 	}
-	top = (vb->vb_flags & VBF_HISTORY_FULL)?
-	    (vb->vb_curroffset + vb->vb_scr_size.tp_row):vb->vb_history_size;
-	bottom = vb->vb_curroffset + vb->vb_history_size;
 
-	/*
-	 * Operate on copy of offset value, since it temporary can be bigger
-	 * than amount of rows in buffer.
-	 */
-	roffset = vb->vb_roffset + vb->vb_history_size;
+	/* "top" may be a negative integer. */
+	bottom = vb->vb_curroffset;
+	top = (vb->vb_flags & VBF_HISTORY_FULL) ?
+	    bottom + vb->vb_scr_size.tp_row - vb->vb_history_size :
+	    0;
+
+	roffset = 0; /* Make gcc happy. */
 	switch (whence) {
 	case VHS_SET:
-		roffset = offset + vb->vb_history_size;
+		if (offset < 0)
+			offset = 0;
+		roffset = top + offset;
 		break;
 	case VHS_CUR:
+		/*
+		 * Operate on copy of offset value, since it temporary
+		 * can be bigger than amount of rows in buffer.
+		 */
+		roffset = vb->vb_roffset;
+		if (roffset >= bottom + vb->vb_scr_size.tp_row)
+			roffset -= vb->vb_history_size;
+
 		roffset += offset;
+		roffset = MAX(roffset, top);
+		roffset = MIN(roffset, bottom);
+
+		if (roffset < 0)
+			roffset = vb->vb_history_size + roffset;
+
 		break;
 	case VHS_END:
 		/* Go to current offset. */
-		roffset = vb->vb_curroffset + vb->vb_history_size;
+		roffset = vb->vb_curroffset;
 		break;
 	}
 
-	roffset = (roffset < top)?top:roffset;
-	roffset = (roffset > bottom)?bottom:roffset;
+	diff = vb->vb_roffset != roffset;
+	vb->vb_roffset = roffset;
 
-	roffset %= vb->vb_history_size;
-
-	if (vb->vb_roffset != roffset) {
-		diff = vb->vb_roffset - roffset;
-		vb->vb_roffset = roffset;
-		/*
-		 * Offset changed, please update Nth lines on sceen.
-		 * +N - Nth lines at top;
-		 * -N - Nth lines at bottom.
-		 */
-		return (diff);
-	}
-	return (0); /* No changes */
+	return (diff);
 }
 
 void
@@ -123,6 +126,8 @@ vthistory_addlines(struct vt_buf *vb, int offset)
 	vb->vb_curroffset += offset;
 	if (vb->vb_curroffset < 0)
 		vb->vb_curroffset = 0;
+	if (vb->vb_curroffset + vb->vb_scr_size.tp_row >= vb->vb_history_size)
+		vb->vb_flags |= VBF_HISTORY_FULL;
 	vb->vb_curroffset %= vb->vb_history_size;
 	if ((vb->vb_flags & VBF_SCROLL) == 0) {
 		vb->vb_roffset = vb->vb_curroffset;
@@ -195,39 +200,6 @@ vtbuf_iscursor(const struct vt_buf *vb, int row, int col)
 	return (0);
 }
 
-static inline uint64_t
-vtbuf_dirty_axis(unsigned int begin, unsigned int end)
-{
-	uint64_t left, right, mask;
-
-	/*
-	 * Mark all bits between begin % 64 and end % 64 dirty.
-	 * This code is functionally equivalent to:
-	 *
-	 * 	for (i = begin; i < end; i++)
-	 * 		mask |= (uint64_t)1 << (i % 64);
-	 */
-
-	/* Obvious case. Mark everything dirty. */
-	if (end - begin >= 64)
-		return (VBM_DIRTY);
-
-	/* 1....0; used bits on the left. */
-	left = VBM_DIRTY << begin % 64;
-	/* 0....1; used bits on the right. */
-	right = VBM_DIRTY >> -end % 64;
-
-	/*
-	 * Only take the intersection.  If the result of that is 0, it
-	 * means that the selection crossed a 64 bit boundary along the
-	 * way, which means we have to take the complement.
-	 */
-	mask = left & right;
-	if (mask == 0)
-		mask = left | right;
-	return (mask);
-}
-
 static inline void
 vtbuf_dirty_locked(struct vt_buf *vb, const term_rect_t *area)
 {
@@ -240,10 +212,6 @@ vtbuf_dirty_locked(struct vt_buf *vb, const term_rect_t *area)
 		vb->vb_dirtyrect.tr_end.tp_row = area->tr_end.tp_row;
 	if (vb->vb_dirtyrect.tr_end.tp_col < area->tr_end.tp_col)
 		vb->vb_dirtyrect.tr_end.tp_col = area->tr_end.tp_col;
-	vb->vb_dirtymask.vbm_row |=
-	    vtbuf_dirty_axis(area->tr_begin.tp_row, area->tr_end.tp_row);
-	vb->vb_dirtymask.vbm_col |=
-	    vtbuf_dirty_axis(area->tr_begin.tp_col, area->tr_end.tp_col);
 }
 
 void
@@ -272,16 +240,14 @@ vtbuf_make_undirty(struct vt_buf *vb)
 
 	vb->vb_dirtyrect.tr_begin = vb->vb_scr_size;
 	vb->vb_dirtyrect.tr_end.tp_row = vb->vb_dirtyrect.tr_end.tp_col = 0;
-	vb->vb_dirtymask.vbm_row = vb->vb_dirtymask.vbm_col = 0;
 }
 
 void
-vtbuf_undirty(struct vt_buf *vb, term_rect_t *r, struct vt_bufmask *m)
+vtbuf_undirty(struct vt_buf *vb, term_rect_t *r)
 {
 
 	VTBUF_LOCK(vb);
 	*r = vb->vb_dirtyrect;
-	*m = vb->vb_dirtymask;
 	vtbuf_make_undirty(vb);
 	VTBUF_UNLOCK(vb);
 }
@@ -321,7 +287,7 @@ vtbuf_copy(struct vt_buf *vb, const term_rect_t *r, const term_pos_t *p2)
 	if (r->tr_begin.tp_row > p2->tp_row && r->tr_begin.tp_col == 0 &&
 	    r->tr_end.tp_col == vb->vb_scr_size.tp_col && /* Full row. */
 	    (rows + rdiff) == vb->vb_scr_size.tp_row && /* Whole screen. */
-	    rdiff > 0) { /* Only forward dirrection. Do not eat history. */
+	    rdiff > 0) { /* Only forward direction. Do not eat history. */
 		vthistory_addlines(vb, rdiff);
 	} else if (p2->tp_row < p1->tp_row) {
 		/* Handle overlapping copies of line segments. */
@@ -453,71 +419,155 @@ vtbuf_sethistory_size(struct vt_buf *vb, int size)
 void
 vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, unsigned int history_size)
 {
-	term_char_t *old, *new, **rows, **oldrows, **copyrows, *row;
-	int bufsize, rowssize, w, h, c, r;
+	term_char_t *old, *new, **rows, **oldrows, **copyrows, *row, *oldrow;
+	int bufsize, rowssize, w, h, c, r, history_was_full;
+	unsigned int old_history_size;
 	term_rect_t rect;
 
 	history_size = MAX(history_size, p->tp_row);
 
-	/* If new screen/history size bigger or buffer is VBF_STATIC. */
-	if ((history_size > vb->vb_history_size) || (p->tp_col >
-	    vb->vb_scr_size.tp_col) || (vb->vb_flags & VBF_STATIC)) {
-		/* Allocate new buffer. */
-		bufsize = history_size * p->tp_col * sizeof(term_char_t);
-		new = malloc(bufsize, M_VTBUF, M_WAITOK | M_ZERO);
-		rowssize = history_size * sizeof(term_pos_t *);
-		rows = malloc(rowssize, M_VTBUF, M_WAITOK | M_ZERO);
+	/* Allocate new buffer. */
+	bufsize = history_size * p->tp_col * sizeof(term_char_t);
+	new = malloc(bufsize, M_VTBUF, M_WAITOK | M_ZERO);
+	rowssize = history_size * sizeof(term_pos_t *);
+	rows = malloc(rowssize, M_VTBUF, M_WAITOK | M_ZERO);
 
-		/* Toggle it. */
-		VTBUF_LOCK(vb);
-		old = vb->vb_flags & VBF_STATIC ? NULL : vb->vb_buffer;
-		oldrows = vb->vb_flags & VBF_STATIC ? NULL : vb->vb_rows;
-		copyrows = vb->vb_rows;
-		w = vb->vb_scr_size.tp_col;
-		h = vb->vb_history_size;
+	/* Toggle it. */
+	VTBUF_LOCK(vb);
+	old = vb->vb_flags & VBF_STATIC ? NULL : vb->vb_buffer;
+	oldrows = vb->vb_flags & VBF_STATIC ? NULL : vb->vb_rows;
+	copyrows = vb->vb_rows;
 
-		vb->vb_history_size = history_size;
-		vb->vb_buffer = new;
-		vb->vb_rows = rows;
-		vb->vb_flags &= ~VBF_STATIC;
-		vb->vb_scr_size = *p;
-		vtbuf_init_rows(vb);
+	w = vb->vb_scr_size.tp_col;
+	h = vb->vb_scr_size.tp_row;
+	old_history_size = vb->vb_history_size;
+	history_was_full = vb->vb_flags & VBF_HISTORY_FULL;
+
+	vb->vb_history_size = history_size;
+	vb->vb_buffer = new;
+	vb->vb_rows = rows;
+	vb->vb_flags &= ~VBF_STATIC;
+	vb->vb_scr_size = *p;
+	vtbuf_init_rows(vb);
+
+	/* Copy history and fill extra space if needed. */
+	if (history_size > old_history_size) {
+		/*
+		 * Copy rows to the new buffer. The first row in the history
+		 * is back to index 0, ie. the new buffer doesn't cycle.
+		 *
+		 * The rest of the new buffer is initialized with blank
+		 * content.
+		 */
+		for (r = 0; r < old_history_size; r ++) {
+			row = rows[r];
+
+			/* Compute the corresponding row in the old buffer. */
+			if (history_was_full)
+				/*
+				 * The buffer is full, the "top" row is
+				 * the one just after the viewable area
+				 * (curroffset + viewable height) in the
+				 * cycling buffer. The corresponding row
+				 * is computed from this top row.
+				 */
+				oldrow = copyrows[
+				    (vb->vb_curroffset + h + r) %
+				    old_history_size];
+			else
+				/*
+				 * The buffer is not full, therefore,
+				 * we didn't cycle already. The
+				 * corresponding rows are the same in
+				 * both buffers.
+				 */
+				oldrow = copyrows[r];
+
+			memmove(row, oldrow,
+			    MIN(p->tp_col, w) * sizeof(term_char_t));
 
-		/* Copy history and fill extra space. */
-		for (r = 0; r < history_size; r ++) {
 			/*
 			 * XXX VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR) will
 			 * extended lines of kernel text using the wrong
 			 * background color.
 			 */
-			row = rows[r];
-			if (r < h) { /* Copy. */
-				memmove(rows[r], copyrows[r],
-				    MIN(p->tp_col, w) * sizeof(term_char_t));
-				for (c = MIN(p->tp_col, w); c < p->tp_col;
-				    c++) {
-					row[c] = VTBUF_SPACE_CHAR(
-					    TERMINAL_NORM_ATTR);
-				}
-			} else { /* Just fill. */
-				rect.tr_begin.tp_col = 0;
-				rect.tr_begin.tp_row = r;
-				rect.tr_end.tp_col = p->tp_col;
-				rect.tr_end.tp_row = p->tp_row;
-				vtbuf_fill(vb, &rect,
-				    VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR));
-				break;
+			for (c = MIN(p->tp_col, w); c < p->tp_col; c++) {
+				row[c] = VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR);
 			}
 		}
-		vtbuf_make_undirty(vb);
-		VTBUF_UNLOCK(vb);
-		/* Deallocate old buffer. */
-		free(old, M_VTBUF);
-		free(oldrows, M_VTBUF);
+
+		/* Fill remaining rows. */
+		rect.tr_begin.tp_col = 0;
+		rect.tr_begin.tp_row = old_history_size;
+		rect.tr_end.tp_col = p->tp_col;
+		rect.tr_end.tp_row = p->tp_row;
+		vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR));
+
+		vb->vb_flags &= ~VBF_HISTORY_FULL;
 	} else {
-		/* Just update the size. */
-		vb->vb_scr_size = *p;
+		/*
+		 * Copy rows to the new buffer. The first row in the history
+		 * is back to index 0, ie. the new buffer doesn't cycle.
+		 *
+		 * (old_history_size - history_size) lines of history are
+		 * dropped.
+		 */
+		for (r = 0; r < history_size; r ++) {
+			row = rows[r];
+
+			/*
+			 * Compute the corresponding row in the old buffer.
+			 *
+			 * See the equivalent if{} block above for an
+			 * explanation.
+			 */
+			if (history_was_full)
+				oldrow = copyrows[
+				    (vb->vb_curroffset + h + r +
+				     (old_history_size - history_size)) %
+				    old_history_size];
+			else
+				oldrow = copyrows[
+				    (r + (old_history_size - history_size)) %
+				    old_history_size];
+
+			memmove(row, oldrow,
+			    MIN(p->tp_col, w) * sizeof(term_char_t));
+
+			/*
+			 * XXX VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR) will
+			 * extended lines of kernel text using the wrong
+			 * background color.
+			 */
+			for (c = MIN(p->tp_col, w); c < p->tp_col; c++) {
+				row[c] = VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR);
+			}
+		}
+
+		if (!history_was_full &&
+		    (vb->vb_curroffset + h) >= history_size)
+			vb->vb_flags |= VBF_HISTORY_FULL;
 	}
+
+	/*
+	 * If the screen is already filled (there are non-visible lines
+	 * above the current viewable area), adjust curroffset to the
+	 * new viewable area.
+	 */
+	if (!history_was_full && vb->vb_curroffset > 0) {
+		vb->vb_curroffset = vb->vb_curroffset + h - p->tp_row;
+		if (vb->vb_curroffset < 0)
+			vb->vb_curroffset += vb->vb_history_size;
+		vb->vb_curroffset %= vb->vb_history_size;
+		vb->vb_roffset = vb->vb_curroffset;
+	}
+
+	vtbuf_make_undirty(vb);
+	VTBUF_UNLOCK(vb);
+
+	/* Deallocate old buffer. */
+	free(old, M_VTBUF);
+	free(oldrows, M_VTBUF);
 }
 
 void
@@ -603,7 +653,7 @@ vtbuf_get_marked_len(struct vt_buf *vb)
 	ei = e.tp_row * vb->vb_scr_size.tp_col + e.tp_col;
 
 	/* Number symbols and number of rows to inject \n */
-	sz = ei - si + ((e.tp_row - s.tp_row) * 2) + 1;
+	sz = ei - si + ((e.tp_row - s.tp_row) * 2);
 
 	return (sz * sizeof(term_char_t));
 }
diff --git a/sys/dev/vt/vt_consolectl.c b/sys/dev/vt/vt_consolectl.c
index 32e3ba6a9ce5..a7042fd14706 100644
--- a/sys/dev/vt/vt_consolectl.c
+++ b/sys/dev/vt/vt_consolectl.c
@@ -51,7 +51,7 @@ consolectl_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag,
 {
 
 	switch (cmd) {
-	case CONS_GETVERS: 
+	case CONS_GETVERS:
 		*(int*)data = 0x200;
 		return 0;
 	case CONS_MOUSECTL: {
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 2f5e9c99cb22..2dd7e3f134bd 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/power.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
@@ -122,9 +123,18 @@ VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)");
 VT_SYSCTL_INT(debug, 0, "vt(9) debug level");
 VT_SYSCTL_INT(deadtimer, 15, "Time to wait busy process in VT_PROCESS mode");
 VT_SYSCTL_INT(suspendswitch, 1, "Switch to VT0 before suspend");
-VT_SYSCTL_INT(spclkeys, (VT_DEBUG_KEY_ENABLED|VT_REBOOT_KEY_ENABLED|
-    VT_HALT_KEY_ENABLED|VT_POWEROFF_KEY_ENABLED), "Enabled special keys "
-    "handled by vt(4)");
+
+/* Allow to disable some keyboard combinations. */
+VT_SYSCTL_INT(kbd_halt, 1, "Enable halt keyboard combination.  "
+    "See kbdmap(5) to configure.");
+VT_SYSCTL_INT(kbd_poweroff, 1, "Enable Power Off keyboard combination.  "
+    "See kbdmap(5) to configure.");
+VT_SYSCTL_INT(kbd_reboot, 1, "Enable reboot keyboard combination.  "
+    "See kbdmap(5) to configure (typically Ctrl-Alt-Delete).");
+VT_SYSCTL_INT(kbd_debug, 1, "Enable key combination to enter debugger.  "
+    "See kbdmap(5) to configure (typically Ctrl-Alt-Esc).");
+VT_SYSCTL_INT(kbd_panic, 0, "Enable request to panic.  "
+    "See kbdmap(5) to configure.");
 
 static struct vt_device	vt_consdev;
 static unsigned int vt_unit = 0;
@@ -152,6 +162,9 @@ static int vt_late_window_switch(struct vt_window *);
 static int vt_proc_alive(struct vt_window *);
 static void vt_resize(struct vt_device *);
 static void vt_update_static(void *);
+#ifndef SC_NO_CUTPASTE
+static void vt_mouse_paste(void);
+#endif
 
 SET_DECLARE(vt_drv_set, struct vt_driver);
 
@@ -166,10 +179,14 @@ static struct vt_device	vt_consdev = {
 	.vd_flags = VDF_INVALID,
 	.vd_windows = { [VT_CONSWINDOW] =  &vt_conswindow, },
 	.vd_curwindow = &vt_conswindow,
-	.vd_markedwin = NULL,
 	.vd_kbstate = 0,
 
 #ifndef SC_NO_CUTPASTE
+	.vd_pastebuf = {
+		.vpb_buf = NULL,
+		.vpb_bufsz = 0,
+		.vpb_len = 0
+	},
 	.vd_mcursor = &vt_default_mouse_pointer,
 	.vd_mcursor_fg = TC_WHITE,
 	.vd_mcursor_bg = TC_BLACK,
@@ -280,6 +297,97 @@ vt_switch_timer(void *arg)
 	vt_late_window_switch((struct vt_window *)arg);
 }
 
+static int
+vt_save_kbd_mode(struct vt_window *vw, keyboard_t *kbd)
+{
+	int mode, ret;
+
+	mode = 0;
+	ret = kbdd_ioctl(kbd, KDGKBMODE, (caddr_t)&mode);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+	if (ret != 0)
+		return (ret);
+
+	vw->vw_kbdmode = mode;
+
+	return (0);
+}
+
+static int
+vt_update_kbd_mode(struct vt_window *vw, keyboard_t *kbd)
+{
+	int ret;
+
+	ret = kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)&vw->vw_kbdmode);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+
+	return (ret);
+}
+
+static int
+vt_save_kbd_state(struct vt_window *vw, keyboard_t *kbd)
+{
+	int state, ret;
+
+	state = 0;
+	ret = kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+	if (ret != 0)
+		return (ret);
+
+	vw->vw_kbdstate &= ~LOCK_MASK;
+	vw->vw_kbdstate |= state & LOCK_MASK;
+
+	return (0);
+}
+
+static int
+vt_update_kbd_state(struct vt_window *vw, keyboard_t *kbd)
+{
+	int state, ret;
+
+	state = vw->vw_kbdstate & LOCK_MASK;
+	ret = kbdd_ioctl(kbd, KDSKBSTATE, (caddr_t)&state);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+
+	return (ret);
+}
+
+static int
+vt_save_kbd_leds(struct vt_window *vw, keyboard_t *kbd)
+{
+	int leds, ret;
+
+	leds = 0;
+	ret = kbdd_ioctl(kbd, KDGETLED, (caddr_t)&leds);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+	if (ret != 0)
+		return (ret);
+
+	vw->vw_kbdstate &= ~LED_MASK;
+	vw->vw_kbdstate |= leds & LED_MASK;
+
+	return (0);
+}
+
+static int
+vt_update_kbd_leds(struct vt_window *vw, keyboard_t *kbd)
+{
+	int leds, ret;
+
+	leds = vw->vw_kbdstate & LED_MASK;
+	ret = kbdd_ioctl(kbd, KDSETLED, (caddr_t)&leds);
+	if (ret == ENOIOCTL)
+		ret = ENODEV;
+
+	return (ret);
+}
+
 static int
 vt_window_preswitch(struct vt_window *vw, struct vt_window *curvw)
 {
@@ -337,7 +445,7 @@ vt_proc_window_switch(struct vt_window *vw)
 	if (curvw->vw_flags & VWF_VTYLOCK)
 		return (EBUSY);
 
-	/* Ask current process permitions to switch away. */
+	/* Ask current process permission to switch away. */
 	if (curvw->vw_smode.mode == VT_PROCESS) {
 		DPRINTF(30, "%s: VT_PROCESS ", __func__);
 		if (vt_proc_alive(curvw) == FALSE) {
@@ -392,7 +500,11 @@ vt_window_switch(struct vt_window *vw)
 	mtx_lock(&Giant);
 	kbd = kbd_get_keyboard(vd->vd_keyboard);
 	if (kbd != NULL) {
-		kbdd_ioctl(kbd, KDSKBMODE, (void *)&vw->vw_kbdmode);
+		if (curvw->vw_kbdmode == K_XLATE)
+			vt_save_kbd_state(curvw, kbd);
+
+		vt_update_kbd_mode(vw, kbd);
+		vt_update_kbd_state(vw, kbd);
 	}
 	mtx_unlock(&Giant);
 	DPRINTF(10, "%s(ttyv%d) done\n", __func__, vw->vw_number);
@@ -430,10 +542,16 @@ vt_compute_drawable_area(struct vt_window *vw)
 	struct vt_device *vd;
 	struct vt_font *vf;
 
-	if (vw->vw_font == NULL)
-		return;
-
 	vd = vw->vw_device;
+
+	if (vw->vw_font == NULL) {
+		vw->vw_draw_area.tr_begin.tp_col = 0;
+		vw->vw_draw_area.tr_begin.tp_row = 0;
+		vw->vw_draw_area.tr_end.tp_col = vd->vd_width;
+		vw->vw_draw_area.tr_end.tp_row = vd->vd_height;
+		return;
+	}
+
 	vf = vw->vw_font;
 
 	/*
@@ -461,18 +579,8 @@ vt_scroll(struct vt_window *vw, int offset, int whence)
 	vt_termsize(vw->vw_device, vw->vw_font, &size);
 
 	diff = vthistory_seek(&vw->vw_buf, offset, whence);
-	/*
-	 * Offset changed, please update Nth lines on screen.
-	 * +N - Nth lines at top;
-	 * -N - Nth lines at bottom.
-	 */
-
-	if (diff < -size.tp_row || diff > size.tp_row) {
+	if (diff)
 		vw->vw_device->vd_flags |= VDF_INVALID;
-		vt_resume_flush_timer(vw->vw_device, 0);
-		return;
-	}
-	vw->vw_device->vd_flags |= VDF_INVALID; /*XXX*/
 	vt_resume_flush_timer(vw->vw_device, 0);
 }
 
@@ -481,23 +589,48 @@ vt_machine_kbdevent(int c)
 {
 
 	switch (c) {
-	case SPCLKEY | DBG:
-		if (vt_spclkeys & VT_DEBUG_KEY_ENABLED)
+	case SPCLKEY | DBG: /* kbdmap(5) keyword `debug`. */
+		if (vt_kbd_debug)
 			kdb_enter(KDB_WHY_BREAK, "manual escape to debugger");
 		return (1);
-	case SPCLKEY | RBT:
-		if (vt_spclkeys & VT_REBOOT_KEY_ENABLED)
-			/* XXX: Make this configurable! */
-			shutdown_nice(0);
-		return (1);
-	case SPCLKEY | HALT:
-		if (vt_spclkeys & VT_HALT_KEY_ENABLED)
+	case SPCLKEY | HALT: /* kbdmap(5) keyword `halt`. */
+		if (vt_kbd_halt)
 			shutdown_nice(RB_HALT);
 		return (1);
-	case SPCLKEY | PDWN:
-		if (vt_spclkeys & VT_POWEROFF_KEY_ENABLED)
+	case SPCLKEY | PASTE: /* kbdmap(5) keyword `paste`. */
+#ifndef SC_NO_CUTPASTE
+		/* Insert text from cut-paste buffer. */
+		vt_mouse_paste();
+#endif
+		break;
+	case SPCLKEY | PDWN: /* kbdmap(5) keyword `pdwn`. */
+		if (vt_kbd_poweroff)
 			shutdown_nice(RB_HALT|RB_POWEROFF);
 		return (1);
+	case SPCLKEY | PNC: /* kbdmap(5) keyword `panic`. */
+		/*
+		 * Request to immediate panic if sysctl
+		 * kern.vt.enable_panic_key allow it.
+		 */
+		if (vt_kbd_panic)
+			panic("Forced by the panic key");
+		return (1);
+	case SPCLKEY | RBT: /* kbdmap(5) keyword `boot`. */
+		if (vt_kbd_reboot)
+			shutdown_nice(RB_AUTOBOOT);
+		return (1);
+	case SPCLKEY | SPSC: /* kbdmap(5) keyword `spsc`. */
+		/* Force activatation/deactivation of the screen saver. */
+		/* TODO */
+		return (1);
+	case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */
+		/* Put machine into Stand-By mode. */
+		power_pm_suspend(POWER_SLEEP_STATE_STANDBY);
+		return (1);
+	case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */
+		/* Suspend machine. */
+		power_pm_suspend(POWER_SLEEP_STATE_SUSPEND);
+		return (1);
 	};
 
 	return (0);
@@ -564,7 +697,6 @@ static int
 vt_processkey(keyboard_t *kbd, struct vt_device *vd, int c)
 {
 	struct vt_window *vw = vd->vd_curwindow;
-	int state = 0;
 
 #if VT_ALT_TO_ESC_HACK
 	if (c & RELKEY) {
@@ -612,11 +744,24 @@ vt_processkey(keyboard_t *kbd, struct vt_device *vd, int c)
 		}
 
 		switch (c) {
+		case NEXT:
+			/* Switch to next VT. */
+			c = (vw->vw_number + 1) % VT_MAXWINDOWS;
+			vw = vd->vd_windows[c];
+			if (vw != NULL)
+				vt_proc_window_switch(vw);
+			return (0);
+		case PREV:
+			/* Switch to previous VT. */
+			c = (vw->vw_number - 1) % VT_MAXWINDOWS;
+			vw = vd->vd_windows[c];
+			if (vw != NULL)
+				vt_proc_window_switch(vw);
+			return (0);
 		case SLK: {
-
-			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+			vt_save_kbd_state(vw, kbd);
 			VT_LOCK(vd);
-			if (state & SLKED) {
+			if (vw->vw_kbdstate & SLKED) {
 				/* Turn scrolling on. */
 				vw->vw_flags |= VWF_SCROLL;
 				VTBUF_SLCK_ENABLE(&vw->vw_buf);
@@ -734,7 +879,8 @@ vt_allocate_keyboard(struct vt_device *vd)
 				continue;
 
 			bzero(&ki, sizeof(ki));
-			strcpy(ki.kb_name, k->kb_name);
+			strncpy(ki.kb_name, k->kb_name, sizeof(ki.kb_name));
+			ki.kb_name[sizeof(ki.kb_name) - 1] = '\0';
 			ki.kb_unit = k->kb_unit;
 
 			kbdd_ioctl(k0, KBADDKBD, (caddr_t) &ki);
@@ -929,7 +1075,6 @@ vt_flush(struct vt_device *vd)
 {
 	struct vt_window *vw;
 	struct vt_font *vf;
-	struct vt_bufmask tmask;
 	term_rect_t tarea;
 	term_pos_t size;
 #ifndef SC_NO_CUTPASTE
@@ -985,14 +1130,13 @@ vt_flush(struct vt_device *vd)
 		vt_mark_mouse_position_as_dirty(vd);
 #endif
 
-	vtbuf_undirty(&vw->vw_buf, &tarea, &tmask);
+	vtbuf_undirty(&vw->vw_buf, &tarea);
 	vt_termsize(vd, vf, &size);
 
 	/* Force a full redraw when the screen contents are invalid. */
 	if (vd->vd_flags & VDF_INVALID) {
 		tarea.tr_begin.tp_row = tarea.tr_begin.tp_col = 0;
 		tarea.tr_end = size;
-		tmask.vbm_row = tmask.vbm_col = VBM_DIRTY;
 
 		vd->vd_flags &= ~VDF_INVALID;
 	}
@@ -1120,6 +1264,13 @@ vtterm_cnprobe(struct terminal *tm, struct consdev *cp)
 		vt_compute_drawable_area(vw);
 	}
 
+	/*
+	 * The original screen size was faked (_VTDEFW x _VTDEFH). Now
+	 * that we have the real viewable size, fix it in the static
+	 * buffer.
+	 */
+	vt_termsize(vd, vw->vw_font, &vw->vw_buf.vb_scr_size);
+
 	vtbuf_init_early(&vw->vw_buf);
 	vt_winsize(vd, vw->vw_font, &wsz);
 	c = (boothowto & RB_MUTE) == 0 ? TERMINAL_KERN_ATTR :
@@ -1143,13 +1294,11 @@ vtterm_cngetc(struct terminal *tm)
 	struct vt_window *vw = tm->tm_softc;
 	struct vt_device *vd = vw->vw_device;
 	keyboard_t *kbd;
-	int state;
 	u_int c;
 
 	if (vw->vw_kbdsq && *vw->vw_kbdsq)
 		return (*vw->vw_kbdsq++);
 
-	state = 0;
 	/* Make sure the splash screen is not there. */
 	if (vd->vd_flags & VDF_SPLASH) {
 		/* Remove splash */
@@ -1165,8 +1314,8 @@ vtterm_cngetc(struct terminal *tm)
 		return (-1);
 
 	/* Force keyboard input mode to K_XLATE */
-	c = K_XLATE;
-	kbdd_ioctl(kbd, KDSKBMODE, (void *)&c);
+	vw->vw_kbdmode = K_XLATE;
+	vt_update_kbd_mode(vw, kbd);
 
 	/* Switch the keyboard to polling to make it work here. */
 	kbdd_poll(kbd, TRUE);
@@ -1185,8 +1334,8 @@ vtterm_cngetc(struct terminal *tm)
 	if (c & SPCLKEY) {
 		switch (c) {
 		case SPCLKEY | SLK:
-			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
-			if (state & SLKED) {
+			vt_save_kbd_state(vw, kbd);
+			if (vw->vw_kbdstate & SLKED) {
 				/* Turn scrolling on. */
 				vw->vw_flags |= VWF_SCROLL;
 				VTBUF_SLCK_ENABLE(&vw->vw_buf);
@@ -1253,7 +1402,7 @@ vtterm_cngrab(struct terminal *tm)
 	/* We shall always use the keyboard in the XLATE mode here. */
 	vw->vw_prev_kbdmode = vw->vw_kbdmode;
 	vw->vw_kbdmode = K_XLATE;
-	(void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)&vw->vw_kbdmode);
+	vt_update_kbd_mode(vw, kbd);
 
 	kbdd_poll(kbd, TRUE);
 }
@@ -1278,7 +1427,7 @@ vtterm_cnungrab(struct terminal *tm)
 	kbdd_poll(kbd, FALSE);
 
 	vw->vw_kbdmode = vw->vw_prev_kbdmode;
-	(void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)&vw->vw_kbdmode);
+	vt_update_kbd_mode(vw, kbd);
 	kbdd_disable(kbd);
 }
 
@@ -1300,30 +1449,40 @@ vtterm_opened(struct terminal *tm, int opened)
 }
 
 static int
-vt_set_border(struct vt_window *vw, struct vt_font *vf, term_color_t c)
+vt_set_border(struct vt_window *vw, term_color_t c)
 {
 	struct vt_device *vd = vw->vw_device;
-	int x, y, off_x, off_y;
 
 	if (vd->vd_driver->vd_drawrect == NULL)
 		return (ENOTSUP);
 
-	x = vd->vd_width - 1;
-	y = vd->vd_height - 1;
-	off_x = vw->vw_draw_area.tr_begin.tp_col;
-	off_y = vw->vw_draw_area.tr_begin.tp_row;
-
 	/* Top bar. */
-	if (off_y > 0)
-		vd->vd_driver->vd_drawrect(vd, 0, 0, x, off_y - 1, 1, c);
-	/* Left bar. */
-	if (off_x > 0)
-		vd->vd_driver->vd_drawrect(vd, 0, off_y, off_x - 1, y - off_y,
+	if (vw->vw_draw_area.tr_begin.tp_row > 0)
+		vd->vd_driver->vd_drawrect(vd,
+		    0, 0,
+		    vd->vd_width - 1, vw->vw_draw_area.tr_begin.tp_row - 1,
+		    1, c);
+
+	/* Left bar. */
+	if (vw->vw_draw_area.tr_begin.tp_col > 0)
+		vd->vd_driver->vd_drawrect(vd,
+		    0, 0,
+		    vw->vw_draw_area.tr_begin.tp_col - 1, vd->vd_height - 1,
+		    1, c);
+
+	/* Right bar. */
+	if (vw->vw_draw_area.tr_end.tp_col < vd->vd_width)
+		vd->vd_driver->vd_drawrect(vd,
+		    vw->vw_draw_area.tr_end.tp_col - 1, 0,
+		    vd->vd_width - 1, vd->vd_height - 1,
+		    1, c);
+
+	/* Bottom bar. */
+	if (vw->vw_draw_area.tr_end.tp_row < vd->vd_height)
+		vd->vd_driver->vd_drawrect(vd,
+		    0, vw->vw_draw_area.tr_end.tp_row - 1,
+		    vd->vd_width - 1, vd->vd_height - 1,
 		    1, c);
-	/* Right bar.  May be 1 pixel wider than necessary due to rounding. */
-	vd->vd_driver->vd_drawrect(vd, x - off_x, off_y, x, y - off_y, 1, c);
-	/* Bottom bar.  May be 1 mixel taller than necessary due to rounding. */
-	vd->vd_driver->vd_drawrect(vd, 0, y - off_y, x, y, 1, c);
 
 	return (0);
 }
@@ -1355,11 +1514,6 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
 		VT_UNLOCK(vd);
 		return (EBUSY);
 	}
-	if (vd->vd_flags & VDF_TEXTMODE) {
-		/* Our device doesn't need fonts. */
-		VT_UNLOCK(vd);
-		return (ENOTTY);
-	}
 	vw->vw_flags |= VWF_BUSY;
 	VT_UNLOCK(vd);
 
@@ -1374,7 +1528,7 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
 
 	/* Actually apply the font to the current window. */
 	VT_LOCK(vd);
-	if (vw->vw_font != vf) {
+	if (vw->vw_font != vf && vw->vw_font != NULL && vf != NULL) {
 		/*
 		 * In case vt_change_font called to update size we don't need
 		 * to update font link.
@@ -1397,7 +1551,7 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
 
 	/* Force a full redraw the next timer tick. */
 	if (vd->vd_curwindow == vw) {
-		vt_set_border(vw, vf, TC_BLACK);
+		vt_set_border(vw, TC_BLACK);
 		vd->vd_flags |= VDF_INVALID;
 		vt_resume_flush_timer(vw->vw_device, 0);
 	}
@@ -1516,7 +1670,7 @@ vt_mouse_terminput_button(struct vt_device *vd, int button)
 	mouseb[4] = '!' + x;
 	mouseb[5] = '!' + y;
 
-	for (i = 0; i < sizeof(mouseb); i++ )
+	for (i = 0; i < sizeof(mouseb); i++)
 		terminal_input_char(vw->vw_terminal, mouseb[i]);
 }
 
@@ -1554,6 +1708,23 @@ vt_mouse_terminput(struct vt_device *vd, int type, int x, int y, int event,
 	}
 }
 
+static void
+vt_mouse_paste()
+{
+	term_char_t *buf;
+	int i, len;
+
+	len = VD_PASTEBUFLEN(main_vd);
+	buf = VD_PASTEBUF(main_vd);
+	len /= sizeof(term_char_t);
+	for (i = 0; i < len; i++) {
+		if (buf[i] == '\0')
+			continue;
+		terminal_input_char(main_vd->vd_curwindow->vw_terminal,
+		    buf[i]);
+	}
+}
+
 void
 vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel)
 {
@@ -1561,8 +1732,7 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel)
 	struct vt_window *vw;
 	struct vt_font *vf;
 	term_pos_t size;
-	term_char_t *buf;
-	int i, len, mark;
+	int len, mark;
 
 	vd = main_vd;
 	vw = vd->vd_curwindow;
@@ -1605,17 +1775,10 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel)
 
 		vd->vd_mx = x;
 		vd->vd_my = y;
-		if ((vd->vd_mstate & MOUSE_BUTTON1DOWN) &&
-		    (vtbuf_set_mark(&vw->vw_buf, VTB_MARK_MOVE,
-			vd->vd_mx / vf->vf_width,
-			vd->vd_my / vf->vf_height) == 1)) {
-
-			/*
-			 * We have something marked to copy, so update pointer
-			 * to window with selection.
-			 */
-			vd->vd_markedwin = vw;
-		}
+		if (vd->vd_mstate & MOUSE_BUTTON1DOWN)
+			vtbuf_set_mark(&vw->vw_buf, VTB_MARK_MOVE,
+			    vd->vd_mx / vf->vf_width,
+			    vd->vd_my / vf->vf_height);
 
 		vt_resume_flush_timer(vw->vw_device, 0);
 		return; /* Done */
@@ -1648,27 +1811,7 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel)
 		case 0:	/* up */
 			break;
 		default:
-			if (vd->vd_markedwin == NULL)
-				return;
-			/* Get current selecton size in bytes. */
-			len = vtbuf_get_marked_len(&vd->vd_markedwin->vw_buf);
-			if (len <= 0)
-				return;
-
-			buf = malloc(len, M_VT, M_WAITOK | M_ZERO);
-			/* Request cupy/paste buffer data, no more than `len' */
-			vtbuf_extract_marked(&vd->vd_markedwin->vw_buf, buf,
-			    len);
-
-			len /= sizeof(term_char_t);
-			for (i = 0; i < len; i++ ) {
-				if (buf[i] == '\0')
-					continue;
-				terminal_input_char(vw->vw_terminal, buf[i]);
-			}
-
-			/* Done, so cleanup. */
-			free(buf, M_VT);
+			vt_mouse_paste();
 			break;
 		}
 		return; /* Done */
@@ -1701,8 +1844,38 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel)
 		 * We have something marked to copy, so update pointer to
 		 * window with selection.
 		 */
-		vd->vd_markedwin = vw;
 		vt_resume_flush_timer(vw->vw_device, 0);
+
+		switch (mark) {
+		case VTB_MARK_END:
+		case VTB_MARK_WORD:
+		case VTB_MARK_ROW:
+		case VTB_MARK_EXTEND:
+			break;
+		default:
+			/* Other types of mark do not require to copy data. */
+			return;
+		}
+
+		/* Get current selection size in bytes. */
+		len = vtbuf_get_marked_len(&vw->vw_buf);
+		if (len <= 0)
+			return;
+
+		/* Reallocate buffer only if old one is too small. */
+		if (len > VD_PASTEBUFSZ(vd)) {
+			VD_PASTEBUF(vd) = realloc(VD_PASTEBUF(vd), len, M_VT,
+			    M_WAITOK | M_ZERO);
+			/* Update buffer size. */
+			VD_PASTEBUFSZ(vd) = len;
+		}
+		/* Request copy/paste buffer data, no more than `len' */
+		vtbuf_extract_marked(&vw->vw_buf, VD_PASTEBUF(vd),
+		    VD_PASTEBUFSZ(vd));
+
+		VD_PASTEBUFLEN(vd) = len;
+
+		/* XXX VD_PASTEBUF(vd) have to be freed on shutdown/unload. */
 	}
 }
 
@@ -1808,12 +1981,8 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 	case SETFKEY:
 	case KDGKBINFO:
 	case KDGKBTYPE:
-	case KDSKBSTATE:	/* set keyboard state (locks) */
-	case KDGKBSTATE:	/* get keyboard state (locks) */
 	case KDGETREPEAT:	/* get keyboard repeat & delay rates */
 	case KDSETREPEAT:	/* set keyboard repeat & delay rates (new) */
-	case KDSETLED:		/* set keyboard LED status */
-	case KDGETLED:		/* get keyboard LED status */
 	case KBADDKBD:		/* add/remove keyboard to/from mux */
 	case KBRELKBD: {
 		error = 0;
@@ -1833,18 +2002,101 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 		}
 		return (error);
 	}
-	case KDGKBMODE: {
-		int mode = -1;
+	case KDGKBSTATE: {	/* get keyboard state (locks) */
+		error = 0;
 
-		mtx_lock(&Giant);
-		kbd = kbd_get_keyboard(vd->vd_keyboard);
-		if (kbd != NULL) {
-			kbdd_ioctl(kbd, KDGKBMODE, (void *)&mode);
+		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				error = vt_save_kbd_state(vw, kbd);
+			mtx_unlock(&Giant);
+
+			if (error != 0)
+				return (error);
 		}
-		mtx_unlock(&Giant);
-		DPRINTF(20, "mode %d, vw_kbdmode %d\n", mode, vw->vw_kbdmode);
-		*(int *)data = mode;
-		return (0);
+
+		*(int *)data = vw->vw_kbdstate & LOCK_MASK;
+
+		return (error);
+	}
+	case KDSKBSTATE: {	/* set keyboard state (locks) */
+		int state;
+
+		state = *(int *)data;
+		if (state & ~LOCK_MASK)
+			return (EINVAL);
+
+		vw->vw_kbdstate &= ~LOCK_MASK;
+		vw->vw_kbdstate |= state;
+
+		error = 0;
+		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				error = vt_update_kbd_state(vw, kbd);
+			mtx_unlock(&Giant);
+		}
+
+		return (error);
+	}
+	case KDGETLED: {	/* get keyboard LED status */
+		error = 0;
+
+		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				error = vt_save_kbd_leds(vw, kbd);
+			mtx_unlock(&Giant);
+
+			if (error != 0)
+				return (error);
+		}
+
+		*(int *)data = vw->vw_kbdstate & LED_MASK;
+
+		return (error);
+	}
+	case KDSETLED: {	/* set keyboard LED status */
+		int leds;
+
+		leds = *(int *)data;
+		if (leds & ~LED_MASK)
+			return (EINVAL);
+
+		vw->vw_kbdstate &= ~LED_MASK;
+		vw->vw_kbdstate |= leds;
+
+		error = 0;
+		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				error = vt_update_kbd_leds(vw, kbd);
+			mtx_unlock(&Giant);
+		}
+
+		return (error);
+	}
+	case KDGKBMODE: {
+		error = 0;
+
+		if (vw == vd->vd_curwindow) {
+			mtx_lock(&Giant);
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				error = vt_save_kbd_mode(vw, kbd);
+			mtx_unlock(&Giant);
+
+			if (error != 0)
+				return (error);
+		}
+
+		*(int *)data = vw->vw_kbdmode;
+
+		return (error);
 	}
 	case KDSKBMODE: {
 		int mode;
@@ -1855,19 +2107,17 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 		case K_RAW:
 		case K_CODE:
 			vw->vw_kbdmode = mode;
-			if (vw == vd->vd_curwindow) {
-				keyboard_t *kbd;
-				error = 0;
 
+			error = 0;
+			if (vw == vd->vd_curwindow) {
 				mtx_lock(&Giant);
 				kbd = kbd_get_keyboard(vd->vd_keyboard);
-				if (kbd != NULL) {
-					error = kbdd_ioctl(kbd, KDSKBMODE,
-					    (void *)&mode);
-				}
+				if (kbd != NULL)
+					error = vt_update_kbd_mode(vw, kbd);
 				mtx_unlock(&Giant);
 			}
-			return (0);
+
+			return (error);
 		default:
 			return (EINVAL);
 		}
@@ -1895,8 +2145,17 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 		return (0);
 	case CONS_GETINFO: {
 		vid_info_t *vi = (vid_info_t *)data;
+		if (vi->size != sizeof(struct vid_info))
+			return (EINVAL);
+
+		if (vw == vd->vd_curwindow) {
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd != NULL)
+				vt_save_kbd_state(vw, kbd);
+		}
 
 		vi->m_num = vd->vd_curwindow->vw_number + 1;
+		vi->mk_keylock = vw->vw_kbdstate & LOCK_MASK;
 		/* XXX: other fields! */
 		return (0);
 	}
@@ -2011,13 +2270,14 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 			    (void *)vd, vt_kbdevent, vd);
 			if (i >= 0) {
 				if (vd->vd_keyboard != -1) {
+					vt_save_kbd_state(vd->vd_curwindow, kbd);
 					kbd_release(kbd, (void *)vd);
 				}
 				kbd = kbd_get_keyboard(i);
 				vd->vd_keyboard = i;
 
-				(void)kbdd_ioctl(kbd, KDSKBMODE,
-				    (caddr_t)&vd->vd_curwindow->vw_kbdmode);
+				vt_update_kbd_mode(vd->vd_curwindow, kbd);
+				vt_update_kbd_state(vd->vd_curwindow, kbd);
 			} else {
 				error = EPERM;	/* XXX */
 			}
@@ -2033,6 +2293,7 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 				mtx_unlock(&Giant);
 				return (EINVAL);
 			}
+			vt_save_kbd_state(vd->vd_curwindow, kbd);
 			error = kbd_release(kbd, (void *)vd);
 			if (error == 0) {
 				vd->vd_keyboard = -1;
@@ -2045,7 +2306,7 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 		win = *(int *)data - 1;
 		DPRINTF(5, "%s%d: VT_ACTIVATE ttyv%d ", SC_DRIVER_NAME,
 		    VT_UNIT(vw), win);
-		if ((win > VT_MAXWINDOWS) || (win < 0))
+		if ((win >= VT_MAXWINDOWS) || (win < 0))
 			return (EINVAL);
 		return (vt_proc_window_switch(vd->vd_windows[win]));
 	}
@@ -2319,7 +2580,6 @@ vt_allocate(struct vt_driver *drv, void *softc)
 		    main_vd->vd_driver->vd_name, drv->vd_name);
 	}
 	vd = main_vd;
-	VT_LOCK(vd);
 
 	if (vd->vd_flags & VDF_ASYNC) {
 		/* Stop vt_flush periodic task. */
@@ -2335,6 +2595,7 @@ vt_allocate(struct vt_driver *drv, void *softc)
 	 * Reset VDF_TEXTMODE flag, driver who require that flag (vt_vga) will
 	 * set it.
 	 */
+	VT_LOCK(vd);
 	vd->vd_flags &= ~VDF_TEXTMODE;
 
 	vd->vd_driver = drv;
diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
index 79dd1fb360d1..e10b98829144 100644
--- a/sys/dev/vte/if_vte.c
+++ b/sys/dev/vte/if_vte.c
@@ -109,6 +109,7 @@ static int	vte_init_rx_ring(struct vte_softc *);
 static int	vte_init_tx_ring(struct vte_softc *);
 static void	vte_intr(void *);
 static int	vte_ioctl(struct ifnet *, u_long, caddr_t);
+static uint64_t	vte_get_counter(struct ifnet *, ift_counter);
 static void	vte_mac_config(struct vte_softc *);
 static int	vte_miibus_readreg(device_t, int, int);
 static void	vte_miibus_statchg(device_t);
@@ -449,6 +450,7 @@ vte_attach(device_t dev)
 	ifp->if_ioctl = vte_ioctl;
 	ifp->if_start = vte_start;
 	ifp->if_init = vte_init;
+	ifp->if_get_counter = vte_get_counter;
 	ifp->if_snd.ifq_drv_maxlen = VTE_TX_RING_CNT - 1;
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
 	IFQ_SET_READY(&ifp->if_snd);
@@ -1171,7 +1173,7 @@ vte_watchdog(struct vte_softc *sc)
 
 	ifp = sc->vte_ifp;
 	if_printf(sc->vte_ifp, "watchdog timeout -- resetting\n");
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	vte_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -1272,12 +1274,10 @@ static void
 vte_stats_update(struct vte_softc *sc)
 {
 	struct vte_hw_stats *stat;
-	struct ifnet *ifp;
 	uint16_t value;
 
 	VTE_LOCK_ASSERT(sc);
 
-	ifp = sc->vte_ifp;
 	stat = &sc->vte_stats;
 
 	CSR_READ_2(sc, VTE_MECISR);
@@ -1304,14 +1304,32 @@ vte_stats_update(struct vte_softc *sc)
 	value = CSR_READ_2(sc, VTE_CNT_PAUSE);
 	stat->tx_pause_frames += (value >> 8);
 	stat->rx_pause_frames += (value & 0xFF);
+}
 
-	/* Update ifp counters. */
-	ifp->if_opackets = stat->tx_frames;
-	ifp->if_collisions = stat->tx_late_colls;
-	ifp->if_oerrors = stat->tx_late_colls + stat->tx_underruns;
-	ifp->if_ipackets = stat->rx_frames;
-	ifp->if_ierrors = stat->rx_crcerrs + stat->rx_runts +
-	    stat->rx_long_frames + stat->rx_fifo_full;
+static uint64_t
+vte_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct vte_softc *sc;
+	struct vte_hw_stats *stat;
+
+	sc = if_getsoftc(ifp);
+	stat = &sc->vte_stats;
+
+	switch (cnt) {
+	case IFCOUNTER_OPACKETS:
+		return (stat->tx_frames);
+	case IFCOUNTER_COLLISIONS:
+		return (stat->tx_late_colls);
+	case IFCOUNTER_OERRORS:
+		return (stat->tx_late_colls + stat->tx_underruns);
+	case IFCOUNTER_IPACKETS:
+		return (stat->rx_frames);
+	case IFCOUNTER_IERRORS:
+		return (stat->rx_crcerrs + stat->rx_runts +
+		    stat->rx_long_frames + stat->rx_fifo_full);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
 }
 
 static void
@@ -1503,7 +1521,7 @@ vte_rxeof(struct vte_softc *sc)
 			continue;
 		}
 		if (vte_newbuf(sc, rxd) != 0) {
-			ifp->if_iqdrops++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 			rxd->rx_desc->drlen =
 			    htole16(MCLBYTES - sizeof(uint32_t));
 			rxd->rx_desc->drst = htole16(VTE_DRST_RX_OWN);
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index afbaee781837..7d852e9a839f 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -463,7 +463,7 @@ vx_start_locked(struct ifnet *ifp)
          */
 	if (len + pad > ETHER_MAX_LEN) {
 		/* packet is obviously too large: toss it */
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		IF_DEQUEUE(&ifp->if_snd, m);
 		m_freem(m);
 		goto readcheck;
@@ -513,7 +513,7 @@ vx_start_locked(struct ifnet *ifp)
 	while (pad--)
 		CSR_WRITE_1(sc, VX_W1_TX_PIO_WR_1, 0);	/* Padding */
 
-	++ifp->if_opackets;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	sc->vx_timer = 1;
 
 readcheck:
@@ -610,12 +610,12 @@ vx_txstat(struct vx_softc *sc)
 		CSR_WRITE_1(sc, VX_W1_TX_STATUS, 0x0);
 
 		if (i & TXS_JABBER) {
-			++ifp->if_oerrors;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (ifp->if_flags & IFF_DEBUG)
 				if_printf(ifp, "jabber (%x)\n", i);
 			vx_reset(sc);
 		} else if (i & TXS_UNDERRUN) {
-			++ifp->if_oerrors;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (ifp->if_flags & IFF_DEBUG)
 				if_printf(ifp, "fifo underrun (%x) @%d\n", i,
 				    sc->vx_tx_start_thresh);
@@ -626,7 +626,7 @@ vx_txstat(struct vx_softc *sc)
 			sc->vx_tx_succ_ok = 0;
 			vx_reset(sc);
 		} else if (i & TXS_MAX_COLLISION) {
-			++ifp->if_collisions;
+			if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			CSR_WRITE_2(sc, VX_COMMAND, TX_ENABLE);
 			ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 		} else
@@ -722,7 +722,7 @@ vx_read(struct vx_softc *sc)
 		return;
 
 	if (len & ERR_RX) {
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto abort;
 	}
 	len &= RX_BYTES_MASK;	/* Lower 11 bits = RX bytes. */
@@ -730,10 +730,10 @@ vx_read(struct vx_softc *sc)
 	/* Pull packet off interface. */
 	m = vx_get(sc, len);
 	if (m == 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto abort;
 	}
-	++ifp->if_ipackets;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	{
 		struct mbuf *m0;
@@ -741,7 +741,7 @@ vx_read(struct vx_softc *sc)
 		m0 = m_devget(mtod(m, char *), m->m_pkthdr.len, ETHER_ALIGN,
 		    ifp, NULL);
 		if (m0 == NULL) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto abort;
 		}
 		m_freem(m);
diff --git a/sys/dev/vxge/vxge.c b/sys/dev/vxge/vxge.c
index 037b481a0fb0..e23e701567aa 100644
--- a/sys/dev/vxge/vxge.c
+++ b/sys/dev/vxge/vxge.c
@@ -709,9 +709,9 @@ vxge_mq_send_locked(ifnet_t ifp, vxge_vpath_t *vpath, mbuf_t m_head)
 			VXGE_DRV_STATS(vpath, tx_again);
 			break;
 		}
-		ifp->if_obytes += next->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, next->m_pkthdr.len);
 		if (next->m_flags & M_MCAST)
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 
 		/* Send a copy of the frame to the BPF listener */
 		ETHER_BPF_MTAP(ifp, next);
@@ -904,11 +904,11 @@ vxge_tx_compl(vxge_hal_vpath_h vpath_handle, vxge_hal_txdl_h txdlh,
 			device_printf(vdev->ndev, "tx transfer code %d\n",
 			    t_code);
 
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			VXGE_DRV_STATS(vpath, tx_tcode);
 			vxge_hal_fifo_handle_tcode(vpath_handle, txdlh, t_code);
 		}
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		txdl_priv = (vxge_txdl_priv_t *) dtr_priv;
 
 		bus_dmamap_unload(vpath->dma_tag_tx, txdl_priv->dma_map);
@@ -1024,7 +1024,7 @@ vxge_rx_compl(vxge_hal_vpath_h vpath_handle, vxge_hal_rxd_h rxdh,
 		mbuf_up = rxd_priv->mbuf_pkt;
 		if (t_code != VXGE_HAL_RING_RXD_T_CODE_OK) {
 
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			VXGE_DRV_STATS(vpath, rx_tcode);
 			status = vxge_hal_ring_handle_tcode(vpath_handle,
 			    rxdh, t_code);
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index dd087a9d5eac..01090aacde66 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -895,7 +895,7 @@ wb_rxeof(sc)
 		    (WB_RXBYTES(cur_rx->wb_ptr->wb_status) > 1536) ||
 		    !(rxstat & WB_RXSTAT_LASTFRAG) ||
 		    !(rxstat & WB_RXSTAT_RXCMP)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			wb_newbuf(sc, cur_rx, m);
 			device_printf(sc->wb_dev,
 			    "receiver babbling: possible chip bug,"
@@ -907,7 +907,7 @@ wb_rxeof(sc)
 		}
 
 		if (rxstat & WB_RXSTAT_RXERR) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			wb_newbuf(sc, cur_rx, m);
 			break;
 		}
@@ -928,12 +928,12 @@ wb_rxeof(sc)
 		    NULL);
 		wb_newbuf(sc, cur_rx, m);
 		if (m0 == NULL) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		m = m0;
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		WB_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		WB_LOCK(sc);
@@ -986,16 +986,16 @@ wb_txeof(sc)
 			break;
 
 		if (txstat & WB_TXSTAT_TXERR) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			if (txstat & WB_TXSTAT_ABORT)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 			if (txstat & WB_TXSTAT_LATECOLL)
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 
-		ifp->if_collisions += (txstat & WB_TXSTAT_COLLCNT) >> 3;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, (txstat & WB_TXSTAT_COLLCNT) >> 3);
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		m_freem(cur_tx->wb_mbuf);
 		cur_tx->wb_mbuf = NULL;
 
@@ -1064,7 +1064,7 @@ wb_intr(arg)
 			break;
 
 		if ((status & WB_ISR_RX_NOBUF) || (status & WB_ISR_RX_ERR)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			wb_reset(sc);
 			if (status & WB_ISR_RX_ERR)
 				wb_fixmedia(sc);
@@ -1093,7 +1093,7 @@ wb_intr(arg)
 		}
 
 		if (status & WB_ISR_TX_UNDERRUN) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			wb_txeof(sc);
 			WB_CLRBIT(sc, WB_NETCFG, WB_NETCFG_TX_ON);
 			/* Jack up TX threshold */
@@ -1553,7 +1553,7 @@ wb_watchdog(sc)
 
 	WB_LOCK_ASSERT(sc);
 	ifp = sc->wb_ifp;
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 #ifdef foo
 	if (!(wb_phy_readreg(sc, PHY_BMSR) & PHY_BMSR_LINKSTAT))
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index d713c97eb6a7..68018239d736 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -132,6 +132,7 @@ static int  wi_reset(struct wi_softc *);
 static void wi_watchdog(void *);
 static int  wi_ioctl(struct ifnet *, u_long, caddr_t);
 static void wi_media_status(struct ifnet *, struct ifmediareq *);
+static uint64_t wi_get_counter(struct ifnet *, ift_counter);
 
 static void wi_rx_intr(struct wi_softc *);
 static void wi_tx_intr(struct wi_softc *);
@@ -337,6 +338,7 @@ wi_attach(device_t dev)
 	ifp->if_ioctl = wi_ioctl;
 	ifp->if_start = wi_start;
 	ifp->if_init = wi_init;
+	ifp->if_get_counter = wi_get_counter;
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
 	ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
 	IFQ_SET_READY(&ifp->if_snd);
@@ -1028,7 +1030,7 @@ wi_start_locked(struct ifnet *ifp)
 			continue;
 
 		sc->sc_txnext = cur = (cur + 1) % sc->sc_ntxbuf;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 }
 
@@ -1055,7 +1057,7 @@ wi_start_tx(struct ifnet *ifp, struct wi_frame *frmhdr, struct mbuf *m0)
 	     || wi_mwrite_bap(sc, fid, off, m0, m0->m_pkthdr.len) != 0;
 	m_freem(m0);
 	if (error) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return -1;
 	}
 	sc->sc_txd[cur].d_len = off;
@@ -1182,7 +1184,7 @@ wi_watchdog(void *arg)
 
 	if (sc->sc_tx_timer && --sc->sc_tx_timer == 0) {
 		if_printf(ifp, "device timeout\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		wi_init_locked(ifp->if_softc);
 		return;
 	}
@@ -1327,7 +1329,7 @@ wi_rx_intr(struct wi_softc *sc)
 	/* First read in the frame header */
 	if (wi_read_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr))) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF(("wi_rx_intr: read fid %x failed\n", fid));
 		return;
 	}
@@ -1338,7 +1340,7 @@ wi_rx_intr(struct wi_softc *sc)
 	status = le16toh(frmhdr.wi_status);
 	if (status & WI_STAT_ERRSTAT) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF(("wi_rx_intr: fid %x error status %x\n", fid, status));
 		return;
 	}
@@ -1353,7 +1355,7 @@ wi_rx_intr(struct wi_softc *sc)
 	if (off + len > MCLBYTES) {
 		if (ic->ic_opmode != IEEE80211_M_MONITOR) {
 			CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			DPRINTF(("wi_rx_intr: oversized packet\n"));
 			return;
 		} else
@@ -1366,7 +1368,7 @@ wi_rx_intr(struct wi_softc *sc)
 		m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		DPRINTF(("wi_rx_intr: MGET failed\n"));
 		return;
 	}
@@ -1450,11 +1452,9 @@ wi_tx_ex_intr(struct wi_softc *sc)
 					printf(", status=0x%x", status);
 				printf("\n");
 			}
-			ifp->if_oerrors++;
-		} else {
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
+		} else
 			DPRINTF(("port disconnected\n"));
-			ifp->if_collisions++;	/* XXX */
-		}
 	} else
 		DPRINTF(("wi_tx_ex_intr: read fid %x failed\n", fid));
 	CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_TX_EXC);
@@ -1497,8 +1497,7 @@ wi_tx_intr(struct wi_softc *sc)
 static __noinline void
 wi_info_intr(struct wi_softc *sc)
 {
-	struct ifnet *ifp = sc->sc_ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
+	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 	int i, fid, len, off;
 	u_int16_t ltbuf[2];
@@ -1562,9 +1561,6 @@ wi_info_intr(struct wi_softc *sc)
 #endif
 			*ptr += stat;
 		}
-		ifp->if_collisions = sc->sc_stats.wi_tx_single_retries +
-		    sc->sc_stats.wi_tx_multi_retries +
-		    sc->sc_stats.wi_tx_retry_limit;
 		break;
 	default:
 		DPRINTF(("wi_info_intr: got fid %x type %x len %d\n", fid,
@@ -1575,6 +1571,23 @@ wi_info_intr(struct wi_softc *sc)
 	CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_INFO);
 }
 
+static uint64_t
+wi_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct wi_softc *sc;
+
+	sc = if_getsoftc(ifp);
+
+	switch (cnt) {
+	case IFCOUNTER_COLLISIONS:
+		return (sc->sc_stats.wi_tx_single_retries +
+		    sc->sc_stats.wi_tx_multi_retries +
+		    sc->sc_stats.wi_tx_retry_limit);
+	default:
+		return (if_get_counter_default(ifp, cnt));
+	}
+}
+
 static int
 wi_write_multi(struct wi_softc *sc)
 {
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 303e57fb4846..978000710573 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1022,7 +1022,7 @@ wlstart(struct ifnet *ifp)
 	/* try 10 ticks, not very long */
 	sc->watchdog_ch = timeout(wlwatchdog, sc, 10);
 	sc->ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-	sc->ifp->if_opackets++;
+	if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
 	wlxmt(sc, m);
     } else {
 	sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -1478,7 +1478,7 @@ wlwatchdog(void *vsc)
 
     log(LOG_ERR, "wl%d: wavelan device timeout on xmit\n", unit);
     WL_LOCK(sc);
-    sc->ifp->if_oerrors++;
+    if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
     wlinit(sc);
     WL_UNLOCK(sc);
 }
@@ -1542,14 +1542,14 @@ wlintr(void *arg)
 	 * incoming packet
 	 */
 	if (int_type & SCB_SW_FR) {
-	    sc->ifp->if_ipackets++;
+	    if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 	    wlrcv(sc);
 	}
 	/*
 	 * receiver not ready
 	 */
 	if (int_type & SCB_SW_RNR) {
-	    sc->ifp->if_ierrors++;
+	    if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 #ifdef	WLDEBUG
 	    if (sc->ifp->if_flags & IFF_DEBUG)
 		printf("wl%d intr(): receiver overrun! begin_fd = %x\n",
@@ -1610,13 +1610,13 @@ wlintr(void *arg)
 	    /* if the transmit actually failed, or returned some status */
 	    if ((!(ac_status & AC_SW_OK)) || (ac_status & 0xfff)) {
 		if (ac_status & (TC_COLLISION | TC_CLS | TC_DMA)) {
-		    sc->ifp->if_oerrors++;
+		    if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
 		}
 		/* count collisions */
-		sc->ifp->if_collisions += (ac_status & 0xf);
+		if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, (ac_status & 0xf));
 		/* if TC_COLLISION set and collision count zero, 16 collisions */
 		if ((ac_status & 0x20) == 0x20) {
-		    sc->ifp->if_collisions += 0x10;
+		    if_inc_counter(sc->ifp, IFCOUNTER_COLLISIONS, 0x10);
 		}
 	    }
 	    sc->tbusy = 0;
@@ -1671,13 +1671,13 @@ wlrcv(struct wl_softc *sc)
 		if (sc->ifp->if_flags & IFF_DEBUG)
 		    printf("wl%d RCV: RSC %x\n", sc->unit, status);
 #endif
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	    } else if (!(status & RFD_OK)) {
 		printf("wl%d RCV: !OK %x\n", sc->unit, status);
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	    } else if (status & 0xfff) {	/* can't happen */
 		printf("wl%d RCV: ERRs %x\n", sc->unit, status);
-		sc->ifp->if_ierrors++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 	    } else if (!wlread(sc, fd_p))
 		return;
 
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 6e4428bef516..e94fa7404243 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -1460,7 +1460,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
 
 	if (stat->len > WPI_STAT_MAXLEN) {
 		device_printf(sc->sc_dev, "invalid rx statistic header\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1477,13 +1477,13 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
 	if ((le32toh(tail->flags) & WPI_RX_NOERROR) != WPI_RX_NOERROR) {
 		DPRINTFN(WPI_DEBUG_RX, ("%s: rx flags error %x\n", __func__,
 		    le32toh(tail->flags)));
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	if (le16toh(head->len) < sizeof (struct ieee80211_frame)) {
 		DPRINTFN(WPI_DEBUG_RX, ("%s: frame too short: %d\n", __func__,
 		    le16toh(head->len)));
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 
@@ -1492,7 +1492,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
 	if (mnew == NULL) {
 		DPRINTFN(WPI_DEBUG_RX, ("%s: no mbuf to restock ring\n",
 		    __func__));
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	bus_dmamap_unload(ring->data_dmat, data->map);
@@ -1504,7 +1504,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
 		device_printf(sc->sc_dev,
 		    "%s: bus_dmamap_load failed, error %d\n", __func__, error);
 		m_freem(mnew);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return;
 	}
 	bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_PREWRITE);
@@ -1596,9 +1596,9 @@ wpi_tx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc)
 
 	/* XXX oerrors should only count errors !maxtries */
 	if ((le32toh(stat->status) & 0xff) != 1)
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	else
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	bus_dmamap_sync(ring->data_dmat, txdata->map, BUS_DMASYNC_POSTWRITE);
 	bus_dmamap_unload(ring->data_dmat, txdata->map);
@@ -2059,7 +2059,7 @@ wpi_start_locked(struct ifnet *ifp)
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (wpi_tx_data(sc, m, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 		sc->sc_tx_timer = 5;
@@ -2091,7 +2091,7 @@ wpi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 		return ENOBUFS;		/* XXX */
 	}
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	if (wpi_tx_data(sc, m, ni, 0) != 0)
 		goto bad;
 	sc->sc_tx_timer = 5;
@@ -2100,7 +2100,7 @@ wpi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	WPI_UNLOCK(sc);
 	return 0;
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	WPI_UNLOCK(sc);
 	ieee80211_free_node(ni);
 	return EIO;		/* XXX */
@@ -3667,7 +3667,7 @@ wpi_watchdog(void *arg)
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			device_printf(sc->sc_dev,"device timeout\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			ieee80211_runtask(ic, &sc->sc_restarttask);
 		}
 	}
diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index 6bc8e6b6f28e..3c6408543364 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -421,13 +421,13 @@ wtap_start(struct ifnet *ifp)
 #endif
 		if ((m->m_flags & M_FRAG)){
 			printf("dont support frags\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if(wtap_raw_xmit(ni, m, NULL) < 0){
 			printf("error raw_xmiting\n");
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return;
 		}
 	}
@@ -594,7 +594,7 @@ wtap_rx_deliver(struct wtap_softc *sc, struct mbuf *m)
 		if_printf(ifp, "%s: no mbuf!\n", __func__);
 	}
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	ieee80211_dump_pkt(ic, mtod(m, caddr_t), 0,0,0);
 
@@ -649,7 +649,7 @@ wtap_rx_proc(void *arg, int npending)
 			return;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 #if 0
 		ieee80211_dump_pkt(ic, mtod(m, caddr_t), 0,0,0);
 #endif
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 5399d28c07ac..bcde27f31ee6 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -614,8 +614,8 @@ xe_txintr(struct xe_softc *scp, uint8_t txst1)
 		coll = txst1 & XE_TXST1_RETRY_COUNT;
 		scp->tx_tpr = tpr;
 		scp->tx_queued -= sent;
-		ifp->if_opackets += sent;
-		ifp->if_collisions += coll;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, sent);
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, coll);
 
 		/*
 		 * According to the Xircom manual, Dingo will
@@ -656,14 +656,14 @@ xe_macintr(struct xe_softc *scp, uint8_t rst0, uint8_t txst0, uint8_t txst1)
 	if (txst0 & XE_TXST0_NO_CARRIER || !(txst1 & XE_TXST1_LINK_STATUS)) {
 		/* XXX - Need to update media status here */
 		device_printf(scp->dev, "no carrier\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		scp->mibdata.dot3StatsCarrierSenseErrors++;
 	}
 #endif
 	/* Excessive collisions -- try sending again */
 	if (txst0 & XE_TXST0_16_COLLISIONS) {
-		ifp->if_collisions += 16;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 16);
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		scp->mibdata.dot3StatsExcessiveCollisions++;
 		scp->mibdata.dot3StatsMultipleCollisionFrames++;
 		scp->mibdata.dot3StatsCollFrequencies[15]++;
@@ -683,35 +683,35 @@ xe_macintr(struct xe_softc *scp, uint8_t rst0, uint8_t txst0, uint8_t txst1)
 			XE_SELECT_PAGE(0x0);
 		}
 		DPRINTF(1, ("\n"));
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		scp->mibdata.dot3StatsInternalMacTransmitErrors++;
 	}
 
 	/* Late collision -- just complain about it */
 	if (txst0 & XE_TXST0_LATE_COLLISION) {
 		device_printf(scp->dev, "late collision\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		scp->mibdata.dot3StatsLateCollisions++;
 	}
 
 	/* SQE test failure -- just complain about it */
 	if (txst0 & XE_TXST0_SQE_FAIL) {
 		device_printf(scp->dev, "SQE test failure\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		scp->mibdata.dot3StatsSQETestErrors++;
 	}
 
 	/* Packet too long -- what happens to these */
 	if (rst0 & XE_RST0_LONG_PACKET) {
 		device_printf(scp->dev, "received giant packet\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		scp->mibdata.dot3StatsFrameTooLongs++;
 	}
 
 	/* CRC error -- packet dropped */
 	if (rst0 & XE_RST0_CRC_ERROR) {
 		device_printf(scp->dev, "CRC error\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		scp->mibdata.dot3StatsFCSErrors++;
 	}
 }
@@ -743,7 +743,7 @@ xe_rxintr(struct xe_softc *scp, uint8_t rst0)
 			    len));
 
 			if (len == 0) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 
@@ -760,7 +760,7 @@ xe_rxintr(struct xe_softc *scp, uint8_t rst0)
 			 */
 			MGETHDR(mbp, M_NOWAIT, MT_DATA);
 			if (mbp == NULL) {
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 				continue;
 			}
 
@@ -768,7 +768,7 @@ xe_rxintr(struct xe_softc *scp, uint8_t rst0)
 				MCLGET(mbp, M_NOWAIT);
 				if ((mbp->m_flags & M_EXT) == 0) {
 					m_freem(mbp);
-					ifp->if_iqdrops++;
+					if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 					continue;
 				}
 			}
@@ -826,13 +826,13 @@ xe_rxintr(struct xe_softc *scp, uint8_t rst0)
 			XE_UNLOCK(scp);
 			(*ifp->if_input)(ifp, mbp);
 			XE_LOCK(scp);
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		} else if (rsr & XE_RSR_ALIGN_ERROR) {
 			/* Packet alignment error -- drop packet */
 			device_printf(scp->dev, "alignment error\n");
 			scp->mibdata.dot3StatsAlignmentErrors++;
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 
 		/* Skip to next packet, if there is one */
@@ -842,7 +842,7 @@ xe_rxintr(struct xe_softc *scp, uint8_t rst0)
 	/* Clear receiver overruns now we have some free buffer space */
 	if (rst0 & XE_RST0_RX_OVERRUN) {
 		DEVPRINTF(1, (scp->dev, "receive overrun\n"));
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		scp->mibdata.dot3StatsInternalMacReceiveErrors++;
 		XE_OUTB(XE_CR, XE_CR_CLEAR_OVERRUN);
 	}
@@ -923,7 +923,7 @@ xe_watchdog(void *arg)
 	if (scp->tx_timeout && --scp->tx_timeout == 0) {
    		device_printf(scp->dev, "watchdog timeout: resetting card\n");
 		scp->tx_timeouts++;
-		scp->ifp->if_oerrors += scp->tx_queued;
+		if_inc_counter(scp->ifp, IFCOUNTER_OERRORS, scp->tx_queued);
 		xe_stop(scp);
 		xe_reset(scp);
 		xe_init_locked(scp);
diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c
index 6503a0060fa7..e113e2ce9256 100644
--- a/sys/dev/xen/balloon/balloon.c
+++ b/sys/dev/xen/balloon/balloon.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
+#include <sys/module.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
@@ -348,25 +349,50 @@ watch_target(struct xs_watch *watch,
 	set_new_target(new_target >> KB_TO_PAGE_SHIFT);
 }
 
-static void 
-balloon_init_watcher(void *arg)
+/*------------------ Private Device Attachment Functions  --------------------*/
+/**
+ * \brief Identify instances of this device type in the system.
+ *
+ * \param driver  The driver performing this identify action.
+ * \param parent  The NewBus parent device for any devices this method adds.
+ */
+static void
+xenballoon_identify(driver_t *driver __unused, device_t parent)
+{
+	/*
+	 * A single device instance for our driver is always present
+	 * in a system operating under Xen.
+	 */
+	BUS_ADD_CHILD(parent, 0, driver->name, 0);
+}
+
+/**
+ * \brief Probe for the existance of the Xen Balloon device
+ *
+ * \param dev  NewBus device_t for this Xen control instance.
+ *
+ * \return  Always returns 0 indicating success.
+ */
+static int 
+xenballoon_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xen Balloon Device");
+	return (0);
+}
+
+/**
+ * \brief Attach the Xen Balloon device.
+ *
+ * \param dev  NewBus device_t for this Xen control instance.
+ *
+ * \return  On success, 0. Otherwise an errno value indicating the
+ *          type of failure.
+ */
+static int
+xenballoon_attach(device_t dev)
 {
 	int err;
-
-	if (!is_running_on_xen())
-		return;
-
-	err = xs_register_watch(&target_watch);
-	if (err)
-		printf("Failed to set balloon watcher\n");
-
-}
-SYSINIT(balloon_init_watcher, SI_SUB_PSEUDO, SI_ORDER_ANY,
-    balloon_init_watcher, NULL);
-
-static void 
-balloon_init(void *arg)
-{
 #ifndef XENHVM
 	vm_page_t page;
 	unsigned long pfn;
@@ -374,15 +400,13 @@ balloon_init(void *arg)
 #define max_pfn HYPERVISOR_shared_info->arch.max_pfn
 #endif
 
-	if (!is_running_on_xen())
-		return;
-
 	mtx_init(&balloon_mutex, "balloon_mutex", NULL, MTX_DEF);
 
 #ifndef XENHVM
 	bs.current_pages = min(xen_start_info->nr_pages, max_pfn);
 #else
-	bs.current_pages = realmem;
+	bs.current_pages = xen_pv_domain() ?
+	    HYPERVISOR_start_info->nr_pages : realmem;
 #endif
 	bs.target_pages  = bs.current_pages;
 	bs.balloon_low   = 0;
@@ -403,17 +427,27 @@ balloon_init(void *arg)
 #endif
 
 	target_watch.callback = watch_target;
-    
-	return;
-}
-SYSINIT(balloon_init, SI_SUB_PSEUDO, SI_ORDER_ANY, balloon_init, NULL);
 
-void balloon_update_driver_allowance(long delta);
+	err = xs_register_watch(&target_watch);
+	if (err)
+		device_printf(dev,
+		    "xenballon: failed to set balloon watcher\n");
 
-void 
-balloon_update_driver_allowance(long delta)
-{
-	mtx_lock(&balloon_mutex);
-	bs.driver_pages += delta;
-	mtx_unlock(&balloon_mutex);
+	return (err);
 }
+
+/*-------------------- Private Device Attachment Data  -----------------------*/
+static device_method_t xenballoon_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,	xenballoon_identify),
+	DEVMETHOD(device_probe,         xenballoon_probe),
+	DEVMETHOD(device_attach,        xenballoon_attach),
+
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(xenballoon, xenballoon_driver, xenballoon_methods, 0);
+devclass_t xenballoon_devclass;
+
+DRIVER_MODULE(xenballoon, xenstore, xenballoon_driver, xenballoon_devclass,
+    NULL, NULL);
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index 654f307cbb6d..1273961a3ca8 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009-2011 Spectra Logic Corporation
+ * Copyright (c) 2009-2012 Spectra Logic Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -784,6 +784,12 @@ struct xbb_softc {
 	/** Number of requests we have completed*/
 	uint64_t		  reqs_completed;
 
+	/** Number of requests we queued but not pushed*/
+	uint64_t		  reqs_queued_for_completion;
+
+	/** Number of requests we completed with an error status*/
+	uint64_t		  reqs_completed_with_error;
+
 	/** How many forced dispatches (i.e. without coalescing) have happend */
 	uint64_t		  forced_dispatch;
 
@@ -1143,7 +1149,7 @@ xbb_release_reqlist(struct xbb_softc *xbb, struct xbb_xen_reqlist *reqlist,
 		    int wakeup)
 {
 
-	mtx_lock(&xbb->lock);
+	mtx_assert(&xbb->lock, MA_OWNED);
 
 	if (wakeup) {
 		wakeup = xbb->flags & XBBF_RESOURCE_SHORTAGE;
@@ -1167,8 +1173,6 @@ xbb_release_reqlist(struct xbb_softc *xbb, struct xbb_xen_reqlist *reqlist,
 		xbb_shutdown(xbb);
 	}
 
-	mtx_unlock(&xbb->lock);
-
 	if (wakeup != 0)
 		taskqueue_enqueue(xbb->io_taskqueue, &xbb->io_task); 
 }
@@ -1261,16 +1265,16 @@ xbb_get_resources(struct xbb_softc *xbb, struct xbb_xen_reqlist **reqlist,
 	if (nreq != NULL)
 		xbb_release_req(xbb, nreq);
 
-	mtx_unlock(&xbb->lock);
-
 	if (nreqlist != NULL)
 		xbb_release_reqlist(xbb, nreqlist, /*wakeup*/ 0);
 
+	mtx_unlock(&xbb->lock);
+
 	return (1);
 }
 
 /**
- * Create and transmit a response to a blkif request.
+ * Create and queue a response to a blkif request.
  * 
  * \param xbb     Per-instance xbb configuration structure.
  * \param req     The request structure to which to respond.
@@ -1278,20 +1282,28 @@ xbb_get_resources(struct xbb_softc *xbb, struct xbb_xen_reqlist **reqlist,
  *                in sys/xen/interface/io/blkif.h.
  */
 static void
-xbb_send_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)
+xbb_queue_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)
 {
 	blkif_response_t *resp;
-	int		  more_to_do;
-	int		  notify;
 
-	more_to_do = 0;
+	/*
+	 * The mutex is required here, and should be held across this call
+	 * until after the subsequent call to xbb_push_responses().  This
+	 * is to guarantee that another context won't queue responses and
+	 * push them while we're active.
+	 *
+	 * That could lead to the other end being notified of responses
+	 * before the resources have been freed on this end.  The other end
+	 * would then be able to queue additional I/O, and we may run out
+ 	 * of resources because we haven't freed them all yet.
+	 */
+	mtx_assert(&xbb->lock, MA_OWNED);
 
 	/*
 	 * Place on the response ring for the relevant domain.
 	 * For now, only the spacing between entries is different
 	 * in the different ABIs, not the response entry layout.
 	 */
-	mtx_lock(&xbb->lock);
 	switch (xbb->abi) {
 	case BLKIF_PROTOCOL_NATIVE:
 		resp = RING_GET_RESPONSE(&xbb->rings.native,
@@ -1315,8 +1327,38 @@ xbb_send_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)
 	resp->operation = req->operation;
 	resp->status    = status;
 
+	if (status != BLKIF_RSP_OKAY)
+		xbb->reqs_completed_with_error++;
+
 	xbb->rings.common.rsp_prod_pvt += BLKIF_SEGS_TO_BLOCKS(req->nr_pages);
-	RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&xbb->rings.common, notify);
+
+	xbb->reqs_queued_for_completion++;
+
+}
+
+/**
+ * Send queued responses to blkif requests.
+ * 
+ * \param xbb            Per-instance xbb configuration structure.
+ * \param run_taskqueue  Flag that is set to 1 if the taskqueue
+ *			 should be run, 0 if it does not need to be run.
+ * \param notify	 Flag that is set to 1 if the other end should be
+ * 			 notified via irq, 0 if the other end should not be
+ *			 notified.
+ */
+static void
+xbb_push_responses(struct xbb_softc *xbb, int *run_taskqueue, int *notify)
+{
+	int more_to_do;
+
+	/*
+	 * The mutex is required here.
+	 */
+	mtx_assert(&xbb->lock, MA_OWNED);
+
+	more_to_do = 0;
+
+	RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&xbb->rings.common, *notify);
 
 	if (xbb->rings.common.rsp_prod_pvt == xbb->rings.common.req_cons) {
 
@@ -1331,15 +1373,10 @@ xbb_send_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)
 		more_to_do = 1;
 	}
 
-	xbb->reqs_completed++;
+	xbb->reqs_completed += xbb->reqs_queued_for_completion;
+	xbb->reqs_queued_for_completion = 0;
 
-	mtx_unlock(&xbb->lock);
-
-	if (more_to_do)
-		taskqueue_enqueue(xbb->io_taskqueue, &xbb->io_task); 
-
-	if (notify)
-		xen_intr_signal(xbb->xen_intr_handle);
+	*run_taskqueue = more_to_do;
 }
 
 /**
@@ -1353,23 +1390,29 @@ xbb_complete_reqlist(struct xbb_softc *xbb, struct xbb_xen_reqlist *reqlist)
 {
 	struct xbb_xen_req *nreq;
 	off_t		    sectors_sent;
+	int		    notify, run_taskqueue;
 
 	sectors_sent = 0;
 
 	if (reqlist->flags & XBB_REQLIST_MAPPED)
 		xbb_unmap_reqlist(reqlist);
 
+	mtx_lock(&xbb->lock);
+
 	/*
-	 * All I/O is done, send the response.  A lock should not be
-	 * necessary here because the request list is complete, and
-	 * therefore this is the only context accessing this request
-	 * right now.  The functions we call do their own locking if
-	 * necessary.
+	 * All I/O is done, send the response. A lock is not necessary
+	 * to protect the request list, because all requests have
+	 * completed.  Therefore this is the only context accessing this
+	 * reqlist right now.  However, in order to make sure that no one
+	 * else queues responses onto the queue or pushes them to the other
+	 * side while we're active, we need to hold the lock across the
+	 * calls to xbb_queue_response() and xbb_push_responses().
 	 */
 	STAILQ_FOREACH(nreq, &reqlist->contig_req_list, links) {
 		off_t cur_sectors_sent;
 
-		xbb_send_response(xbb, nreq, reqlist->status);
+		/* Put this response on the ring, but don't push yet */
+		xbb_queue_response(xbb, nreq, reqlist->status);
 
 		/* We don't report bytes sent if there is an error. */
 		if (reqlist->status == BLKIF_RSP_OKAY)
@@ -1404,6 +1447,16 @@ xbb_complete_reqlist(struct xbb_softc *xbb, struct xbb_xen_reqlist *reqlist)
 				/*then*/&reqlist->ds_t0);
 
 	xbb_release_reqlist(xbb, reqlist, /*wakeup*/ 1);
+
+	xbb_push_responses(xbb, &run_taskqueue, &notify);
+
+	mtx_unlock(&xbb->lock);
+
+	if (run_taskqueue)
+		taskqueue_enqueue(xbb->io_taskqueue, &xbb->io_task); 
+
+	if (notify)
+		xen_intr_signal(xbb->xen_intr_handle);
 }
 
 /**
@@ -3588,6 +3641,16 @@ xbb_setup_sysctl(struct xbb_softc *xbb)
 			 "reqs_completed", CTLFLAG_RW, &xbb->reqs_completed,
 			 "how many I/O requests have been completed");
 
+	SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
+			 "reqs_queued_for_completion", CTLFLAG_RW,
+			 &xbb->reqs_queued_for_completion,
+			 "how many I/O requests queued but not yet pushed");
+
+	SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
+			 "reqs_completed_with_error", CTLFLAG_RW,
+			 &xbb->reqs_completed_with_error,
+			 "how many I/O requests completed with error status");
+
 	SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
 			 "forced_dispatch", CTLFLAG_RW, &xbb->forced_dispatch,
 			 "how many I/O dispatches were forced");
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index b0f206ed57cb..e9d3dc1286f4 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -1829,7 +1829,7 @@ xnb_recv(netif_tx_back_ring_t *txb, domid_t otherend, struct mbuf **mbufc,
 		return 0;	/* Nothing to receive */
 
 	/* update statistics independent of errors */
-	ifnet->if_ipackets++;
+	if_inc_counter(ifnet, IFCOUNTER_IPACKETS, 1);
 
 	/*
 	 * if we got here, then 1 or more requests was consumed, but the packet
@@ -1841,7 +1841,7 @@ xnb_recv(netif_tx_back_ring_t *txb, domid_t otherend, struct mbuf **mbufc,
 		txb->req_cons += num_consumed;
 		DPRINTF("xnb_intr: garbage packet, num_consumed=%d\n",
 				num_consumed);
-		ifnet->if_ierrors++;
+		if_inc_counter(ifnet, IFCOUNTER_IERRORS, 1);
 		return EINVAL;
 	}
 
@@ -1855,7 +1855,7 @@ xnb_recv(netif_tx_back_ring_t *txb, domid_t otherend, struct mbuf **mbufc,
 		xnb_txpkt2rsp(&pkt, txb, 1);
 		DPRINTF("xnb_intr: Couldn't allocate mbufs, num_consumed=%d\n",
 		    num_consumed);
-		ifnet->if_iqdrops++;
+		if_inc_counter(ifnet, IFCOUNTER_IQDROPS, 1);
 		return ENOMEM;
 	}
 
@@ -2364,12 +2364,12 @@ xnb_start_locked(struct ifnet *ifp)
 
 				case EINVAL:
 					/* OS gave a corrupt packet.  Drop it.*/
-					ifp->if_oerrors++;
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					/* FALLTHROUGH */
 				default:
 					/* Send succeeded, or packet had error.
 					 * Free the packet */
-					ifp->if_opackets++;
+					if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 					if (mbufc)
 						m_freem(mbufc);
 					break;
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index 9ff872cdc745..a652c75f0174 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -134,7 +134,6 @@ static const int MODPARM_rx_flip = 0;
  * to mirror the Linux MAX_SKB_FRAGS constant.
  */
 #define	MAX_TX_REQ_FRAGS (65536 / PAGE_SIZE + 2)
-#define	NF_TSO_MAXBURST ((IP_MAXPACKET / PAGE_SIZE) * MCLBYTES)
 
 #define RX_COPY_THRESHOLD 256
 
@@ -1056,7 +1055,7 @@ xn_rxeof(struct netfront_info *np)
 		 * Break the mbuf chain first though.
 		 */
 		while ((m = mbufq_dequeue(&rxq)) != NULL) {
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			
 			/*
 			 * Do we really need to drop the rx lock?
@@ -1147,7 +1146,7 @@ xn_txeof(struct netfront_info *np)
 			 * mbuf of the chain.
 			 */
 			if (!m->m_next)
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			if (__predict_false(gnttab_query_foreign_access(
 			    np->grant_tx_ref[id]) != 0)) {
 				panic("%s: grant id %u still in use by the "
@@ -2102,7 +2101,9 @@ create_netdev(device_t dev)
 	
     	ifp->if_hwassist = XN_CSUM_FEATURES;
     	ifp->if_capabilities = IFCAP_HWCSUM;
-	ifp->if_hw_tsomax = NF_TSO_MAXBURST;
+	ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
+	ifp->if_hw_tsomaxsegcount = MAX_TX_REQ_FRAGS;
+	ifp->if_hw_tsomaxsegsize = PAGE_SIZE;
 	
     	ether_ifattach(ifp, np->mac);
     	callout_init(&np->xn_stat_ch, CALLOUT_MPSAFE);
diff --git a/sys/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c
similarity index 95%
rename from sys/xen/xenstore/xenstore.c
rename to sys/dev/xen/xenstore/xenstore.c
index f7425da7b98f..4cf985a04430 100644
--- a/sys/xen/xenstore/xenstore.c
+++ b/sys/dev/xen/xenstore/xenstore.c
@@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/unistd.h>
+#include <sys/queue.h>
+#include <sys/taskqueue.h>
 
 #include <machine/stdarg.h>
 
@@ -249,6 +251,20 @@ struct xs_softc {
 	 * with the XenStore service) are available.
 	 */
 	struct intr_config_hook xs_attachcb;
+
+	/**
+	 * Xenstore is a user-space process that usually runs in Dom0,
+	 * so if this domain is booting as Dom0, xenstore wont we accessible,
+	 * and we have to defer the initialization of xenstore related
+	 * devices to later (when xenstore is started).
+	 */
+	bool initialized;
+
+	/**
+	 * Task to run when xenstore is initialized (Dom0 only), will
+	 * take care of attaching xenstore related devices.
+	 */
+	struct task xs_late_init;
 };
 
 /*-------------------------------- Global Data ------------------------------*/
@@ -352,6 +368,16 @@ static void
 xs_intr(void * arg __unused /*__attribute__((unused))*/)
 {
 
+	/* If xenstore has not been initialized, initialize it now */
+	if (!xs.initialized) {
+		xs.initialized = true;
+		/*
+		 * Since this task is probing and attaching devices we
+		 * have to hold the Giant lock.
+		 */
+		taskqueue_enqueue(taskqueue_swi_giant, &xs.xs_late_init);
+	}
+
 	/*
 	 * Hold ring lock across wakeup so that clients
 	 * cannot miss a wakeup.
@@ -1104,7 +1130,6 @@ xs_probe(device_t dev)
 static void
 xs_attach_deferred(void *arg)
 {
-	xs_dev_init();
 
 	bus_generic_probe(xs.xs_dev);
 	bus_generic_attach(xs.xs_dev);
@@ -1112,6 +1137,15 @@ xs_attach_deferred(void *arg)
 	config_intrhook_disestablish(&xs.xs_attachcb);
 }
 
+static void
+xs_attach_late(void *arg, int pending)
+{
+
+	KASSERT((pending == 1), ("xs late attach queued several times"));
+	bus_generic_probe(xs.xs_dev);
+	bus_generic_attach(xs.xs_dev);
+}
+
 /**
  * Attach to the XenStore.
  *
@@ -1130,12 +1164,37 @@ xs_attach(device_t dev)
 	/* Initialize the interface to xenstore. */
 	struct proc *p;
 
+	xs.initialized = false;
 	if (xen_hvm_domain()) {
 		xs.evtchn = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN);
 		xs.gpfn = hvm_get_parameter(HVM_PARAM_STORE_PFN);
 		xen_store = pmap_mapdev(xs.gpfn * PAGE_SIZE, PAGE_SIZE);
+		xs.initialized = true;
 	} else if (xen_pv_domain()) {
-		xs.evtchn = HYPERVISOR_start_info->store_evtchn;
+		if (HYPERVISOR_start_info->store_evtchn == 0) {
+			struct evtchn_alloc_unbound alloc_unbound;
+
+			/* Allocate a local event channel for xenstore */
+			alloc_unbound.dom = DOMID_SELF;
+			alloc_unbound.remote_dom = DOMID_SELF;
+			error = HYPERVISOR_event_channel_op(
+			    EVTCHNOP_alloc_unbound, &alloc_unbound);
+			if (error != 0)
+				panic(
+				   "unable to alloc event channel for Dom0: %d",
+				    error);
+
+			HYPERVISOR_start_info->store_evtchn =
+			    alloc_unbound.port;
+			xs.evtchn = alloc_unbound.port;
+
+			/* Allocate memory for the xs shared ring */
+			xen_store = malloc(PAGE_SIZE, M_XENSTORE,
+			    M_WAITOK | M_ZERO);
+		} else {
+			xs.evtchn = HYPERVISOR_start_info->store_evtchn;
+			xs.initialized = true;
+		}
 	} else {
 		panic("Unknown domain type, cannot initialize xenstore.");
 	}
@@ -1167,7 +1226,11 @@ xs_attach(device_t dev)
 
 	xs.xs_attachcb.ich_func = xs_attach_deferred;
 	xs.xs_attachcb.ich_arg = NULL;
-	config_intrhook_establish(&xs.xs_attachcb);
+	if (xs.initialized) {
+		config_intrhook_establish(&xs.xs_attachcb);
+	} else {
+		TASK_INIT(&xs.xs_late_init, 0, xs_attach_late, NULL);
+	}
 
 	return (error);
 }
diff --git a/sys/xen/xenstore/xenstore_dev.c b/sys/dev/xen/xenstore/xenstore_dev.c
similarity index 76%
rename from sys/xen/xenstore/xenstore_dev.c
rename to sys/dev/xen/xenstore/xenstore_dev.c
index e1b4091447ab..54b5e82f75fb 100644
--- a/sys/xen/xenstore/xenstore_dev.c
+++ b/sys/dev/xen/xenstore/xenstore_dev.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
+#include <sys/module.h>
 
 #include <xen/xen-os.h>
 
@@ -216,9 +217,71 @@ static struct cdevsw xs_dev_cdevsw = {
 	.d_name = "xs_dev",
 };
 
-void
-xs_dev_init()
+/*------------------ Private Device Attachment Functions  --------------------*/
+/**
+ * \brief Identify instances of this device type in the system.
+ *
+ * \param driver  The driver performing this identify action.
+ * \param parent  The NewBus parent device for any devices this method adds.
+ */
+static void
+xs_dev_identify(driver_t *driver __unused, device_t parent)
 {
-	make_dev(&xs_dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0400,
-	    "xen/xenstore");
+	/*
+	 * A single device instance for our driver is always present
+	 * in a system operating under Xen.
+	 */
+	BUS_ADD_CHILD(parent, 0, driver->name, 0);
 }
+
+/**
+ * \brief Probe for the existance of the Xenstore device
+ *
+ * \param dev  NewBus device_t for this instance.
+ *
+ * \return  Always returns 0 indicating success.
+ */
+static int 
+xs_dev_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xenstore user-space device");
+	return (0);
+}
+
+/**
+ * \brief Attach the Xenstore device.
+ *
+ * \param dev  NewBus device_t for this instance.
+ *
+ * \return  On success, 0. Otherwise an errno value indicating the
+ *          type of failure.
+ */
+static int
+xs_dev_attach(device_t dev)
+{
+	struct cdev *xs_cdev;
+
+	xs_cdev = make_dev(&xs_dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0400,
+	    "xen/xenstore");
+	if (xs_cdev == NULL)
+		return (EINVAL);
+
+	return (0);
+}
+
+/*-------------------- Private Device Attachment Data  -----------------------*/
+static device_method_t xs_dev_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,	xs_dev_identify),
+	DEVMETHOD(device_probe,         xs_dev_probe),
+	DEVMETHOD(device_attach,        xs_dev_attach),
+
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(xs_dev, xs_dev_driver, xs_dev_methods, 0);
+devclass_t xs_dev_devclass;
+
+DRIVER_MODULE(xs_dev, xenstore, xs_dev_driver, xs_dev_devclass,
+    NULL, NULL);
diff --git a/sys/dev/xen/xenstore/xenstored_dev.c b/sys/dev/xen/xenstore/xenstored_dev.c
new file mode 100644
index 000000000000..ae24085dc809
--- /dev/null
+++ b/sys/dev/xen/xenstore/xenstored_dev.c
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <sys/errno.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/conf.h>
+#include <sys/module.h>
+
+#include <xen/xen-os.h>
+
+#include <xen/hypervisor.h>
+#include <xen/xenstore/xenstorevar.h>
+#include <xen/xenstore/xenstore_internal.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#define XSD_READ_SIZE		20
+
+static int xsd_dev_read(struct cdev *dev, struct uio *uio, int ioflag);
+static int xsd_dev_mmap(struct cdev *dev, vm_ooffset_t offset,
+    vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr);
+
+
+static struct cdevsw xsd_dev_cdevsw = {
+	.d_version = D_VERSION,
+	.d_read = xsd_dev_read,
+	.d_mmap = xsd_dev_mmap,
+	.d_name = "xsd_dev",
+};
+
+static int
+xsd_dev_read(struct cdev *dev, struct uio *uio, int ioflag)
+{
+	char evtchn[XSD_READ_SIZE];
+	int error, len;
+
+	len = snprintf(evtchn, sizeof(evtchn), "%u",
+	    HYPERVISOR_start_info->store_evtchn);
+	if (len < 0 || len > uio->uio_resid)
+		return (EINVAL);
+
+	error = uiomove(evtchn, len, uio);
+	if (error)
+		return (error);
+
+	return (0);
+}
+
+static int
+xsd_dev_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int nprot, vm_memattr_t *memattr)
+{
+
+	if (offset != 0)
+		return (EINVAL);
+
+	*paddr = pmap_kextract((vm_offset_t)xen_store);
+
+	return (0);
+}
+
+/*------------------ Private Device Attachment Functions  --------------------*/
+/**
+ * \brief Identify instances of this device type in the system.
+ *
+ * \param driver  The driver performing this identify action.
+ * \param parent  The NewBus parent device for any devices this method adds.
+ */
+static void
+xsd_dev_identify(driver_t *driver __unused, device_t parent)
+{
+
+	if (!xen_pv_domain())
+		return;
+	if (HYPERVISOR_start_info->store_mfn != 0)
+		return;
+
+	/*
+	 * Only attach if xenstore is not available, because we are the
+	 * domain that's supposed to run it.
+	 */
+	BUS_ADD_CHILD(parent, 0, driver->name, 0);
+}
+
+/**
+ * \brief Probe for the existence of the Xenstored device
+ *
+ * \param dev  NewBus device_t for this instance.
+ *
+ * \return  Always returns 0 indicating success.
+ */
+static int 
+xsd_dev_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xenstored user-space device");
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+/**
+ * \brief Attach the Xenstored device.
+ *
+ * \param dev  NewBus device_t for this instance.
+ *
+ * \return  On success, 0. Otherwise an errno value indicating the
+ *          type of failure.
+ */
+static int
+xsd_dev_attach(device_t dev)
+{
+	struct cdev *xsd_cdev;
+
+	xsd_cdev = make_dev(&xsd_dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0400,
+	    "xen/xenstored");
+	if (xsd_cdev == NULL)
+		return (EINVAL);
+
+	return (0);
+}
+
+/*-------------------- Private Device Attachment Data  -----------------------*/
+static device_method_t xsd_dev_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,	xsd_dev_identify),
+	DEVMETHOD(device_probe,         xsd_dev_probe),
+	DEVMETHOD(device_attach,        xsd_dev_attach),
+
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(xsd_dev, xsd_dev_driver, xsd_dev_methods, 0);
+devclass_t xsd_dev_devclass;
+
+DRIVER_MODULE(xsd_dev, xenpv, xsd_dev_driver, xsd_dev_devclass,
+    NULL, NULL);
diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
index 8c3846091a39..f7bd599a04ed 100644
--- a/sys/dev/xl/if_xl.c
+++ b/sys/dev/xl/if_xl.c
@@ -1866,7 +1866,7 @@ xl_rxeof(struct xl_softc *sc)
 		 * comes up in the ring.
 		 */
 		if (rxstat & XL_RXSTAT_UP_ERROR) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->xl_ptr->xl_status = 0;
 			bus_dmamap_sync(sc->xl_ldata.xl_rx_tag,
 			    sc->xl_ldata.xl_rx_dmamap, BUS_DMASYNC_PREWRITE);
@@ -1881,7 +1881,7 @@ xl_rxeof(struct xl_softc *sc)
 		if (!(rxstat & XL_RXSTAT_UP_CMPLT)) {
 			device_printf(sc->xl_dev,
 			    "bad receive status -- packet dropped\n");
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->xl_ptr->xl_status = 0;
 			bus_dmamap_sync(sc->xl_ldata.xl_rx_tag,
 			    sc->xl_ldata.xl_rx_dmamap, BUS_DMASYNC_PREWRITE);
@@ -1901,7 +1901,7 @@ xl_rxeof(struct xl_softc *sc)
 		 * can do in this situation.
 		 */
 		if (xl_newbuf(sc, cur_rx)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			cur_rx->xl_ptr->xl_status = 0;
 			bus_dmamap_sync(sc->xl_ldata.xl_rx_tag,
 			    sc->xl_ldata.xl_rx_dmamap, BUS_DMASYNC_PREWRITE);
@@ -1910,7 +1910,7 @@ xl_rxeof(struct xl_softc *sc)
 		bus_dmamap_sync(sc->xl_ldata.xl_rx_tag,
 		    sc->xl_ldata.xl_rx_dmamap, BUS_DMASYNC_PREWRITE);
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = total_len;
 
@@ -2014,7 +2014,7 @@ xl_txeof(struct xl_softc *sc)
 		bus_dmamap_unload(sc->xl_mtag, cur_tx->xl_map);
 		m_freem(cur_tx->xl_mbuf);
 		cur_tx->xl_mbuf = NULL;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 		cur_tx->xl_next = sc->xl_cdata.xl_tx_free;
@@ -2061,7 +2061,7 @@ xl_txeof_90xB(struct xl_softc *sc)
 			cur_tx->xl_mbuf = NULL;
 		}
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		sc->xl_cdata.xl_tx_cnt--;
 		XL_INC(idx, XL_TX_LIST_CNT);
@@ -2185,7 +2185,7 @@ xl_intr(void *arg)
 		}
 
 		if (status & XL_STAT_TX_COMPLETE) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			xl_txeoc(sc);
 		}
 
@@ -2255,7 +2255,7 @@ xl_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count)
 			    XL_CMD_INTR_ACK|(status & XL_INTRS));
 
 			if (status & XL_STAT_TX_COMPLETE) {
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				xl_txeoc(sc);
 			}
 
@@ -2312,10 +2312,12 @@ xl_stats_update(struct xl_softc *sc)
 	for (i = 0; i < 16; i++)
 		*p++ = CSR_READ_1(sc, XL_W6_CARRIER_LOST + i);
 
-	ifp->if_ierrors += xl_stats.xl_rx_overrun;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, xl_stats.xl_rx_overrun);
 
-	ifp->if_collisions += xl_stats.xl_tx_multi_collision +
-	    xl_stats.xl_tx_single_collision + xl_stats.xl_tx_late_collision;
+	if_inc_counter(ifp, IFCOUNTER_COLLISIONS,
+	    xl_stats.xl_tx_multi_collision +
+	    xl_stats.xl_tx_single_collision +
+	    xl_stats.xl_tx_late_collision);
 
 	/*
 	 * Boomerang and cyclone chips have an extra stats counter
@@ -3121,7 +3123,7 @@ xl_watchdog(struct xl_softc *sc)
 		return (0);
 	}
 
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	XL_SEL_WIN(4);
 	status = CSR_READ_2(sc, XL_W4_MEDIA_STATUS);
 	device_printf(sc->xl_dev, "watchdog timeout\n");
diff --git a/sys/fs/autofs/autofs.c b/sys/fs/autofs/autofs.c
index eeaf705f5b92..719a2c57dc62 100644
--- a/sys/fs/autofs/autofs.c
+++ b/sys/fs/autofs/autofs.c
@@ -76,6 +76,7 @@
 #include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/syscallsubr.h>
+#include <sys/taskqueue.h>
 #include <sys/vnode.h>
 #include <machine/atomic.h>
 #include <vm/uma.h>
@@ -260,7 +261,7 @@ autofs_path(struct autofs_node *anp)
 }
 
 static void
-autofs_callout(void *context)
+autofs_task(void *context, int pending)
 {
 	struct autofs_request *ar;
 
@@ -296,9 +297,9 @@ autofs_cached(struct autofs_node *anp, const char *component, int componentlen)
 	 * is necessary for wildcard indirect map keys to work.
 	 */
 	if (anp->an_parent == NULL && componentlen != 0) {
-		AUTOFS_LOCK(amp);
+		AUTOFS_SLOCK(amp);
 		error = autofs_node_find(anp, component, componentlen, NULL);
-		AUTOFS_UNLOCK(amp);
+		AUTOFS_SUNLOCK(amp);
 		if (error != 0)
 			return (false);
 	}
@@ -414,9 +415,14 @@ autofs_trigger_one(struct autofs_node *anp,
 		strlcpy(ar->ar_options,
 		    amp->am_options, sizeof(ar->ar_options));
 
-		callout_init(&ar->ar_callout, 1);
-		callout_reset(&ar->ar_callout,
-		    autofs_timeout * hz, autofs_callout, ar);
+		TIMEOUT_TASK_INIT(taskqueue_thread, &ar->ar_task, 0,
+		    autofs_task, ar);
+		error = taskqueue_enqueue_timeout(taskqueue_thread,
+		    &ar->ar_task, autofs_timeout * hz);
+		if (error != 0) {
+			AUTOFS_WARN("taskqueue_enqueue_timeout() failed "
+			    "with error %d", error);
+		}
 		refcount_init(&ar->ar_refcount, 1);
 		TAILQ_INSERT_TAIL(&autofs_softc->sc_requests, ar, ar_next);
 	}
@@ -429,11 +435,6 @@ autofs_trigger_one(struct autofs_node *anp,
 			    &autofs_softc->sc_lock);
 			autofs_restore_sigmask(&oldset);
 			if (error != 0) {
-				/*
-				 * XXX: For some reson this returns -1
-				 *	instead of EINTR, wtf?!
-				 */
-				error = EINTR;
 				AUTOFS_WARN("cv_wait_sig for %s failed "
 				    "with error %d", ar->ar_path, error);
 				break;
@@ -453,12 +454,13 @@ autofs_trigger_one(struct autofs_node *anp,
 	if (last) {
 		TAILQ_REMOVE(&autofs_softc->sc_requests, ar, ar_next);
 		/*
-		 * XXX: Is it safe?
+		 * Unlock the sc_lock, so that autofs_task() can complete.
 		 */
 		sx_xunlock(&autofs_softc->sc_lock);
-		callout_drain(&ar->ar_callout);
-		sx_xlock(&autofs_softc->sc_lock);
+		taskqueue_cancel_timeout(taskqueue_thread, &ar->ar_task, NULL);
+		taskqueue_drain_timeout(taskqueue_thread, &ar->ar_task);
 		uma_zfree(autofs_request_zone, ar);
+		sx_xlock(&autofs_softc->sc_lock);
 	}
 
 	/*
@@ -495,7 +497,7 @@ autofs_trigger(struct autofs_node *anp,
 			anp->an_retries = 0;
 			return (0);
 		}
-		if (error == EINTR) {
+		if (error == EINTR || error == ERESTART) {
 			AUTOFS_DEBUG("trigger interrupted by signal, "
 			    "not retrying");
 			anp->an_retries = 0;
@@ -541,11 +543,6 @@ autofs_ioctl_request(struct autofs_daemon_request *adr)
 		error = cv_wait_sig(&autofs_softc->sc_cv,
 		    &autofs_softc->sc_lock);
 		if (error != 0) {
-			/*
-			 * XXX: For some reson this returns -1 instead
-			 * 	of EINTR, wtf?!
-			 */
-			error = EINTR;
 			sx_xunlock(&autofs_softc->sc_lock);
 			AUTOFS_DEBUG("failed with error %d", error);
 			return (error);
diff --git a/sys/fs/autofs/autofs.h b/sys/fs/autofs/autofs.h
index 2c72645792b3..dc33eeff54e6 100644
--- a/sys/fs/autofs/autofs.h
+++ b/sys/fs/autofs/autofs.h
@@ -42,20 +42,26 @@ extern uma_zone_t autofs_node_zone;
 extern int autofs_debug;
 extern int autofs_mount_on_stat;
 
-#define	AUTOFS_DEBUG(X, ...)					\
-	if (autofs_debug > 1) {					\
-		printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
+#define	AUTOFS_DEBUG(X, ...)						\
+	do {								\
+		if (autofs_debug > 1)					\
+			printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
 	} while (0)
 
-#define	AUTOFS_WARN(X, ...)					\
-	if (autofs_debug > 0) {					\
-		printf("WARNING: %s: " X "\n",			\
-		    __func__, ## __VA_ARGS__);			\
+#define	AUTOFS_WARN(X, ...)						\
+	do {								\
+		if (autofs_debug > 0) {					\
+			printf("WARNING: %s: " X "\n",			\
+		    	    __func__, ## __VA_ARGS__);			\
+		}							\
 	} while (0)
 
-#define AUTOFS_LOCK(X)		sx_xlock(&X->am_lock)
-#define AUTOFS_UNLOCK(X)	sx_xunlock(&X->am_lock)
-#define AUTOFS_ASSERT_LOCKED(X)	sx_assert(&X->am_lock, SA_XLOCKED)
+#define AUTOFS_SLOCK(X)		sx_slock(&X->am_lock)
+#define AUTOFS_XLOCK(X)		sx_xlock(&X->am_lock)
+#define AUTOFS_SUNLOCK(X)	sx_sunlock(&X->am_lock)
+#define AUTOFS_XUNLOCK(X)	sx_xunlock(&X->am_lock)
+#define AUTOFS_ASSERT_LOCKED(X)		sx_assert(&X->am_lock, SA_LOCKED)
+#define AUTOFS_ASSERT_XLOCKED(X)	sx_assert(&X->am_lock, SA_XLOCKED)
 #define AUTOFS_ASSERT_UNLOCKED(X)	sx_assert(&X->am_lock, SA_UNLOCKED)
 
 struct autofs_node {
@@ -97,7 +103,7 @@ struct autofs_request {
 	char				ar_prefix[MAXPATHLEN];
 	char				ar_key[MAXPATHLEN];
 	char				ar_options[MAXPATHLEN];
-	struct callout			ar_callout;
+	struct timeout_task		ar_task;
 	volatile u_int			ar_refcount;
 };
 
@@ -132,6 +138,6 @@ int	autofs_node_find(struct autofs_node *parent,
 	    const char *name, int namelen, struct autofs_node **anpp);
 void	autofs_node_delete(struct autofs_node *anp);
 int	autofs_node_vn(struct autofs_node *anp, struct mount *mp,
-	    struct vnode **vpp);
+	    int flags, struct vnode **vpp);
 
 #endif /* !AUTOFS_H */
diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c
index b289cadd4bac..13a5a89b81c7 100644
--- a/sys/fs/autofs/autofs_vfsops.c
+++ b/sys/fs/autofs/autofs_vfsops.c
@@ -40,6 +40,7 @@
 #include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/sx.h>
+#include <sys/taskqueue.h>
 #include <sys/vnode.h>
 
 #include <fs/autofs/autofs.h>
@@ -87,14 +88,18 @@ autofs_mount(struct mount *mp)
 
 	vfs_getnewfsid(mp);
 
-	AUTOFS_LOCK(amp);
+	MNT_ILOCK(mp);
+	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED;
+	MNT_IUNLOCK(mp);
+
+	AUTOFS_XLOCK(amp);
 	error = autofs_node_new(NULL, amp, ".", -1, &amp->am_root);
 	if (error != 0) {
-		AUTOFS_UNLOCK(amp);
+		AUTOFS_XUNLOCK(amp);
 		free(amp, M_AUTOFS);
 		return (error);
 	}
-	AUTOFS_UNLOCK(amp);
+	AUTOFS_XUNLOCK(amp);
 
 	vfs_mountedfrom(mp, from);
 
@@ -145,7 +150,7 @@ autofs_unmount(struct mount *mp, int mntflags)
 		pause("autofs_umount", 1);
 	}
 
-	AUTOFS_LOCK(amp);
+	AUTOFS_XLOCK(amp);
 
 	/*
 	 * Not terribly efficient, but at least not recursive.
@@ -159,7 +164,7 @@ autofs_unmount(struct mount *mp, int mntflags)
 	autofs_node_delete(amp->am_root);
 
 	mp->mnt_data = NULL;
-	AUTOFS_UNLOCK(amp);
+	AUTOFS_XUNLOCK(amp);
 
 	sx_destroy(&amp->am_lock);
 
@@ -176,7 +181,7 @@ autofs_root(struct mount *mp, int flags, struct vnode **vpp)
 
 	amp = VFSTOAUTOFS(mp);
 
-	error = autofs_node_vn(amp->am_root, mp, vpp);
+	error = autofs_node_vn(amp->am_root, mp, flags, vpp);
 
 	return (error);
 }
diff --git a/sys/fs/autofs/autofs_vnops.c b/sys/fs/autofs/autofs_vnops.c
index e0a75fa62ad6..72d6bfff842c 100644
--- a/sys/fs/autofs/autofs_vnops.c
+++ b/sys/fs/autofs/autofs_vnops.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/namei.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
+#include <sys/taskqueue.h>
 #include <sys/vnode.h>
 #include <machine/atomic.h>
 #include <vm/uma.h>
@@ -197,12 +198,12 @@ autofs_trigger_vn(struct vnode *vp, const char *path, int pathlen,
 }
 
 static int
-autofs_vget_callback(struct mount *mp, void *arg, int lkflags __unused,
+autofs_vget_callback(struct mount *mp, void *arg, int flags,
     struct vnode **vpp)
 {
 
 
-	return (autofs_node_vn(arg, mp, vpp));
+	return (autofs_node_vn(arg, mp, flags, vpp));
 }
 
 static int
@@ -232,7 +233,7 @@ autofs_lookup(struct vop_lookup_args *ap)
 		 * use vn_vget_ino_gen() which takes care of all that.
 		 */
 		error = vn_vget_ino_gen(dvp, autofs_vget_callback,
-		    anp->an_parent, 0, vpp);
+		    anp->an_parent, cnp->cn_lkflags, vpp);
 		if (error != 0) {
 			AUTOFS_WARN("vn_vget_ino_gen() failed with error %d",
 			    error);
@@ -276,24 +277,24 @@ autofs_lookup(struct vop_lookup_args *ap)
 		}
 	}
 
-	AUTOFS_LOCK(amp);
+	AUTOFS_SLOCK(amp);
 	error = autofs_node_find(anp, cnp->cn_nameptr, cnp->cn_namelen, &child);
 	if (error != 0) {
 		if ((cnp->cn_flags & ISLASTCN) && cnp->cn_nameiop == CREATE) {
-			AUTOFS_UNLOCK(amp);
+			AUTOFS_SUNLOCK(amp);
 			return (EJUSTRETURN);
 		}
 
-		AUTOFS_UNLOCK(amp);
+		AUTOFS_SUNLOCK(amp);
 		return (ENOENT);
 	}
 
 	/*
 	 * XXX: Dropping the node here is ok, because we never remove nodes.
 	 */
-	AUTOFS_UNLOCK(amp);
+	AUTOFS_SUNLOCK(amp);
 
-	error = autofs_node_vn(child, mp, vpp);
+	error = autofs_node_vn(child, mp, cnp->cn_lkflags, vpp);
 	if (error != 0) {
 		if ((cnp->cn_flags & ISLASTCN) && cnp->cn_nameiop == CREATE)
 			return (EJUSTRETURN);
@@ -324,16 +325,16 @@ autofs_mkdir(struct vop_mkdir_args *ap)
 	if (autofs_ignore_thread(curthread) == false)
 		return (EPERM);
 
-	AUTOFS_LOCK(amp);
+	AUTOFS_XLOCK(amp);
 	error = autofs_node_new(anp, amp, ap->a_cnp->cn_nameptr,
 	    ap->a_cnp->cn_namelen, &child);
 	if (error != 0) {
-		AUTOFS_UNLOCK(amp);
+		AUTOFS_XUNLOCK(amp);
 		return (error);
 	}
-	AUTOFS_UNLOCK(amp);
+	AUTOFS_XUNLOCK(amp);
 
-	error = autofs_node_vn(child, vp->v_mount, ap->a_vpp);
+	error = autofs_node_vn(child, vp->v_mount, LK_EXCLUSIVE, ap->a_vpp);
 
 	return (error);
 }
@@ -426,7 +427,7 @@ autofs_readdir(struct vop_readdir_args *ap)
 	}
 
 	i = 2; /* Account for "." and "..". */
-	AUTOFS_LOCK(amp);
+	AUTOFS_SLOCK(amp);
 	TAILQ_FOREACH(child, &anp->an_children, an_next) {
 		if (resid < AUTOFS_DELEN) {
 			if (ap->a_eofflag != NULL)
@@ -444,14 +445,14 @@ autofs_readdir(struct vop_readdir_args *ap)
 		error = autofs_readdir_one(uio, child->an_name,
 		    child->an_fileno);
 		if (error != 0) {
-			AUTOFS_UNLOCK(amp);
+			AUTOFS_SUNLOCK(amp);
 			return (error);
 		}
 		offset += AUTOFS_DELEN;
 		resid -= AUTOFS_DELEN;
 	}
 
-	AUTOFS_UNLOCK(amp);
+	AUTOFS_SUNLOCK(amp);
 	return (0);
 }
 
@@ -504,7 +505,7 @@ autofs_node_new(struct autofs_node *parent, struct autofs_mount *amp,
 	struct autofs_node *anp;
 
 	if (parent != NULL)
-		AUTOFS_ASSERT_LOCKED(parent->an_mount);
+		AUTOFS_ASSERT_XLOCKED(parent->an_mount);
 
 	anp = uma_zalloc(autofs_node_zone, M_WAITOK | M_ZERO);
 	if (namelen >= 0)
@@ -544,6 +545,8 @@ autofs_node_find(struct autofs_node *parent, const char *name,
 
 	TAILQ_FOREACH(anp, &parent->an_children, an_next) {
 		if (namelen >= 0) {
+			if (strlen(anp->an_name) != namelen)
+				continue;
 			if (strncmp(anp->an_name, name, namelen) != 0)
 				continue;
 		} else {
@@ -564,7 +567,7 @@ autofs_node_delete(struct autofs_node *anp)
 {
 	struct autofs_node *parent;
 
-	AUTOFS_ASSERT_LOCKED(anp->an_mount);
+	AUTOFS_ASSERT_XLOCKED(anp->an_mount);
 	KASSERT(TAILQ_EMPTY(&anp->an_children), ("have children"));
 
 	callout_drain(&anp->an_callout);
@@ -578,7 +581,8 @@ autofs_node_delete(struct autofs_node *anp)
 }
 
 int
-autofs_node_vn(struct autofs_node *anp, struct mount *mp, struct vnode **vpp)
+autofs_node_vn(struct autofs_node *anp, struct mount *mp, int flags,
+    struct vnode **vpp)
 {
 	struct vnode *vp;
 	int error;
@@ -589,7 +593,7 @@ autofs_node_vn(struct autofs_node *anp, struct mount *mp, struct vnode **vpp)
 
 	vp = anp->an_vnode;
 	if (vp != NULL) {
-		error = vget(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		error = vget(vp, flags | LK_RETRY, curthread);
 		if (error != 0) {
 			AUTOFS_WARN("vget failed with error %d", error);
 			sx_xunlock(&anp->an_vnode_lock);
@@ -629,6 +633,8 @@ autofs_node_vn(struct autofs_node *anp, struct mount *mp, struct vnode **vpp)
 		vp->v_vflag |= VV_ROOT;
 	vp->v_data = anp;
 
+	VN_LOCK_ASHARE(vp);
+
 	error = insmntque(vp, mp);
 	if (error != 0) {
 		AUTOFS_WARN("insmntque() failed with error %d", error);
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 1e3f5e844864..d0aabefe80a9 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1700,6 +1700,7 @@ static struct fileops devfs_ops_f = {
 	.fo_chown =	vn_chown,
 	.fo_sendfile =	vn_sendfile,
 	.fo_seek =	vn_seek,
+	.fo_fill_kinfo = vn_fill_kinfo,
 	.fo_flags =	DFLAG_PASSABLE | DFLAG_SEEKABLE
 };
 
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 2046e33a5d39..0972ec7400d6 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -54,6 +54,7 @@
 #include <sys/buf.h>
 #include <sys/endian.h>
 #include <sys/priv.h>
+#include <sys/rwlock.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/time.h>
@@ -65,9 +66,11 @@
 #include <sys/file.h>
 
 #include <vm/vm.h>
-#include <vm/vm_page.h>
-#include <vm/vm_object.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 
 #include "opt_directio.h"
@@ -124,6 +127,7 @@ struct vop_vector ext2_vnodeops = {
 	.vop_close =		ext2_close,
 	.vop_create =		ext2_create,
 	.vop_fsync =		ext2_fsync,
+	.vop_getpages =		vnode_pager_local_getpages,
 	.vop_getattr =		ext2_getattr,
 	.vop_inactive =		ext2_inactive,
 	.vop_ioctl =		ext2_ioctl,
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 690d8d09d92e..54f659fe70c8 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -1721,7 +1721,6 @@ fuse_vnop_write(struct vop_write_args *ap)
         vm_page_t *a_m;
         int a_count;
         int a_reqpage;
-        vm_ooffset_t a_offset;
     };
 */
 static int
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index b94091c62e45..d9f843611b31 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -820,7 +820,6 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 	struct dqblk dqb;
 	uid_t savuid;
 #endif
-
 	if (compare) {
 		retnotsup = 0;
 		error = nfsrv_getattrbits(nd, &attrbits, NULL, &retnotsup);
@@ -902,6 +901,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 			    goto nfsmout;
 			if (compare && !(*retcmpp)) {
 			   NFSSETSUPP_ATTRBIT(&checkattrbits);
+
+			   /* Some filesystem do not support NFSv4ACL   */
+			   if (nfsrv_useacl == 0 || nfs_supportsnfsv4acls(vp) == 0) {
+				NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_ACL);
+				NFSCLRBIT_ATTRBIT(&checkattrbits, NFSATTRBIT_ACLSUPPORT);
+		   	   }
 			   if (!NFSEQUAL_ATTRBIT(&retattrbits, &checkattrbits)
 			       || retnotsup)
 				*retcmpp = NFSERR_NOTSAME;
@@ -1052,7 +1057,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 		case NFSATTRBIT_ACL:
 			if (compare) {
 			  if (!(*retcmpp)) {
-			    if (nfsrv_useacl) {
+			    if (nfsrv_useacl && nfs_supportsnfsv4acls(vp)) {
 				NFSACL_T *naclp;
 
 				naclp = acl_alloc(M_WAITOK);
@@ -1073,21 +1078,22 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 			    }
 			  }
 			} else {
-			    if (vp != NULL && aclp != NULL)
-				error = nfsrv_dissectacl(nd, aclp, &aceerr,
-				    &cnt, p);
-			    else
-				error = nfsrv_dissectacl(nd, NULL, &aceerr,
-				    &cnt, p);
-			    if (error)
-				goto nfsmout;
+				if (vp != NULL && aclp != NULL)
+				    error = nfsrv_dissectacl(nd, aclp, &aceerr,
+					&cnt, p);
+				else
+				    error = nfsrv_dissectacl(nd, NULL, &aceerr,
+					&cnt, p);
+				if (error)
+				    goto nfsmout;
 			}
+			
 			attrsum += cnt;
 			break;
 		case NFSATTRBIT_ACLSUPPORT:
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 			if (compare && !(*retcmpp)) {
-				if (nfsrv_useacl) {
+				if (nfsrv_useacl && nfs_supportsnfsv4acls(vp)) {
 					if (fxdr_unsigned(u_int32_t, *tl) !=
 					    NFSV4ACE_SUPTYPES)
 						*retcmpp = NFSERR_NOTSAME;
@@ -2090,6 +2096,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
 			}
 		}
 	}
+
 	/*
 	 * Put out the attribute bitmap for the ones being filled in
 	 * and get the field for the number of attributes returned.
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index 2abd7e4dc880..ef15a1d686f2 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -644,9 +644,9 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *,
 int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t,
     struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *,
     struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t);
-int nfsrv_sattr(struct nfsrv_descript *, struct nfsvattr *, nfsattrbit_t *,
+int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *,
     NFSACL_T *, NFSPROC_T *);
-int nfsv4_sattr(struct nfsrv_descript *, struct nfsvattr *, nfsattrbit_t *,
+int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *,
     NFSACL_T *, NFSPROC_T *);
 int nfsvno_checkexp(mount_t, NFSSOCKADDR_T, struct nfsexstuff *,
     struct ucred **);
diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h
index ebdfbc7b834c..0c31f56a32c3 100644
--- a/sys/fs/nfs/nfsm_subs.h
+++ b/sys/fs/nfs/nfsm_subs.h
@@ -47,13 +47,6 @@
  * First define what the actual subs. return
  */
 #define	M_HASCL(m)	((m)->m_flags & M_EXT)
-#define	NFSMINOFF(m) 							\
-		if (M_HASCL(m)) 					\
-			(m)->m_data = (m)->m_ext.ext_buf; 		\
-		else if ((m)->m_flags & M_PKTHDR) 			\
-			(m)->m_data = (m)->m_pktdat; 			\
-				else 					\
-			(m)->m_data = (m)->m_dat
 #define	NFSMSIZ(m)	((M_HASCL(m))?MCLBYTES: 			\
 				(((m)->m_flags & M_PKTHDR)?MHLEN:MLEN))
 #define	NFSM_DATAP(m, s)	(m)->m_data += (s)
diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 731be0777c15..768dfcbbc9af 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -996,7 +996,11 @@ struct nfsv3_sattr {
  	NFSATTRBM_TIMEDELTA |						\
  	NFSATTRBM_TIMEMETADATA |					\
  	NFSATTRBM_TIMEMODIFY |						\
- 	NFSATTRBM_MOUNTEDONFILEID)
+ 	NFSATTRBM_MOUNTEDONFILEID |					\
+	NFSATTRBM_QUOTAHARD |                        			\
+    	NFSATTRBM_QUOTASOFT |                        			\
+    	NFSATTRBM_QUOTAUSED)
+
 
 #ifdef QUOTA
 /*
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c
index dc106ee53707..4c8c2dc62322 100644
--- a/sys/fs/nfsclient/nfs_clbio.c
+++ b/sys/fs/nfsclient/nfs_clbio.c
@@ -128,24 +128,21 @@ ncl_getpages(struct vop_getpages_args *ap)
 
 	npages = btoc(count);
 
+	/*
+	 * Since the caller has busied the requested page, that page's valid
+	 * field will not be changed by other threads.
+	 */
+	vm_page_assert_xbusied(pages[ap->a_reqpage]);
+
 	/*
 	 * If the requested page is partially valid, just return it and
 	 * allow the pager to zero-out the blanks.  Partially valid pages
 	 * can only occur at the file EOF.
 	 */
-	VM_OBJECT_WLOCK(object);
 	if (pages[ap->a_reqpage]->valid != 0) {
-		for (i = 0; i < npages; ++i) {
-			if (i != ap->a_reqpage) {
-				vm_page_lock(pages[i]);
-				vm_page_free(pages[i]);
-				vm_page_unlock(pages[i]);
-			}
-		}
-		VM_OBJECT_WUNLOCK(object);
-		return (0);
+		vm_pager_free_nonreq(object, pages, ap->a_reqpage, npages);
+		return (VM_PAGER_OK);
 	}
-	VM_OBJECT_WUNLOCK(object);
 
 	/*
 	 * We use only the kva address for the buffer, but this is extremely
@@ -175,15 +172,7 @@ ncl_getpages(struct vop_getpages_args *ap)
 
 	if (error && (uio.uio_resid == count)) {
 		ncl_printf("nfs_getpages: error %d\n", error);
-		VM_OBJECT_WLOCK(object);
-		for (i = 0; i < npages; ++i) {
-			if (i != ap->a_reqpage) {
-				vm_page_lock(pages[i]);
-				vm_page_free(pages[i]);
-				vm_page_unlock(pages[i]);
-			}
-		}
-		VM_OBJECT_WUNLOCK(object);
+		vm_pager_free_nonreq(object, pages, ap->a_reqpage, npages);
 		return (VM_PAGER_ERROR);
 	}
 
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index 1973c14f41b4..5bd4538f073c 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -1008,7 +1008,7 @@ nfsvno_getsymlink(struct nfsrv_descript *nd, struct nfsvattr *nvap,
 	*pathcpp = NULL;
 	*lenp = 0;
 	if ((nd->nd_flag & ND_NFSV3) &&
-	    (error = nfsrv_sattr(nd, nvap, NULL, NULL, p)))
+	    (error = nfsrv_sattr(nd, NULL, nvap, NULL, NULL, p)))
 		goto nfsmout;
 	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 	len = fxdr_unsigned(int, *tl);
@@ -2298,7 +2298,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
  * (Return 0 or EBADRPC)
  */
 int
-nfsrv_sattr(struct nfsrv_descript *nd, struct nfsvattr *nvap,
+nfsrv_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap,
     nfsattrbit_t *attrbitp, NFSACL_T *aclp, struct thread *p)
 {
 	u_int32_t *tl;
@@ -2380,7 +2380,7 @@ nfsrv_sattr(struct nfsrv_descript *nd, struct nfsvattr *nvap,
 		};
 		break;
 	case ND_NFSV4:
-		error = nfsv4_sattr(nd, nvap, attrbitp, aclp, p);
+		error = nfsv4_sattr(nd, vp, nvap, attrbitp, aclp, p);
 	};
 nfsmout:
 	NFSEXITCODE2(error, nd);
@@ -2392,7 +2392,7 @@ nfsrv_sattr(struct nfsrv_descript *nd, struct nfsvattr *nvap,
  * Returns NFSERR_BADXDR if it can't be parsed, 0 otherwise.
  */
 int
-nfsv4_sattr(struct nfsrv_descript *nd, struct nfsvattr *nvap,
+nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap,
     nfsattrbit_t *attrbitp, NFSACL_T *aclp, struct thread *p)
 {
 	u_int32_t *tl;
@@ -2429,6 +2429,11 @@ nfsv4_sattr(struct nfsrv_descript *nd, struct nfsvattr *nvap,
 		switch (bitpos) {
 		case NFSATTRBIT_SIZE:
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
+                     if (vp != NULL && vp->v_type != VREG) {
+                            error = (vp->v_type == VDIR) ? NFSERR_ISDIR :
+                                NFSERR_INVAL;
+                            goto nfsmout;
+			}
 			nvap->na_size = fxdr_hyper(tl);
 			attrsum += NFSX_HYPER;
 			break;
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 0d3ff7658ec6..9bf43c37b10a 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -210,6 +210,17 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram,
 		if (nd->nd_repstat == 0) {
 			accmode = 0;
 			NFSSET_ATTRBIT(&tmpbits, &attrbits);
+	
+			/*
+			 * GETATTR with write-only attr time_access_set and time_modify_set
+			 * should return NFS4ERR_INVAL.
+			 */
+			if (NFSISSET_ATTRBIT(&tmpbits, NFSATTRBIT_TIMEACCESSSET) ||
+					NFSISSET_ATTRBIT(&tmpbits, NFSATTRBIT_TIMEMODIFYSET)){
+				error = NFSERR_INVAL;
+				vput(vp);
+				goto out;
+			}
 			if (NFSISSET_ATTRBIT(&tmpbits, NFSATTRBIT_ACL)) {
 				NFSCLRBIT_ATTRBIT(&tmpbits, NFSATTRBIT_ACL);
 				accmode |= VREAD_ACL;
@@ -315,7 +326,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram,
 		stateid.seqid = fxdr_unsigned(u_int32_t, *tl++);
 		NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER);
 	}
-	error = nfsrv_sattr(nd, &nva, &attrbits, aclp, p);
+	error = nfsrv_sattr(nd, vp, &nva, &attrbits, aclp, p);
 	if (error)
 		goto nfsmout;
 	preat_ret = nfsvno_getattr(vp, &nva2, nd->nd_cred, p, 1);
@@ -1019,7 +1030,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram,
 			switch (how) {
 			case NFSCREATE_GUARDED:
 			case NFSCREATE_UNCHECKED:
-				error = nfsrv_sattr(nd, &nva, NULL, NULL, p);
+				error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, p);
 				if (error)
 					goto nfsmout;
 				break;
@@ -1204,7 +1215,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram,
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 			vtyp = nfsv34tov_type(*tl);
 		}
-		error = nfsrv_sattr(nd, &nva, &attrbits, aclp, p);
+		error = nfsrv_sattr(nd, NULL, &nva, &attrbits, aclp, p);
 		if (error)
 			goto nfsmout;
 		nva.na_type = vtyp;
@@ -1850,7 +1861,7 @@ nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram,
 	if (!nd->nd_repstat) {
 		NFSVNO_ATTRINIT(&nva);
 		if (nd->nd_flag & ND_NFSV3) {
-			error = nfsrv_sattr(nd, &nva, NULL, NULL, p);
+			error = nfsrv_sattr(nd, NULL, &nva, NULL, NULL, p);
 			if (error)
 				goto nfsmout;
 		} else {
@@ -1967,11 +1978,21 @@ nfsrvd_commit(struct nfsrv_descript *nd, __unused int isdgram,
 	int error = 0, for_ret = 1, aft_ret = 1, cnt;
 	u_int64_t off;
 
-	if (nd->nd_repstat) {
+       if (nd->nd_repstat) {
 		nfsrv_wcc(nd, for_ret, &bfor, aft_ret, &aft);
 		goto out;
 	}
+
+	/* Return NFSERR_ISDIR in NFSv4 when commit on a directory. */
+	if (vp->v_type != VREG) {
+		if (nd->nd_flag & ND_NFSV3)
+			error = NFSERR_NOTSUPP;
+		else
+			error = (vp->v_type == VDIR) ? NFSERR_ISDIR : NFSERR_INVAL;
+		goto nfsmout;
+	}
 	NFSM_DISSECT(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
+
 	/*
 	 * XXX At this time VOP_FSYNC() does not accept offset and byte
 	 * count parameters, so these arguments are useless (someday maybe).
@@ -2683,7 +2704,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 		switch (how) {
 		case NFSCREATE_UNCHECKED:
 		case NFSCREATE_GUARDED:
-			error = nfsv4_sattr(nd, &nva, &attrbits, aclp, p);
+			error = nfsv4_sattr(nd, NULL, &nva, &attrbits, aclp, p);
 			if (error)
 				goto nfsmout;
 			/*
@@ -2707,7 +2728,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF);
 			cverf[0] = *tl++;
 			cverf[1] = *tl;
-			error = nfsv4_sattr(nd, &nva, &attrbits, aclp, p);
+			error = nfsv4_sattr(nd, vp, &nva, &attrbits, aclp, p);
 			if (error != 0)
 				goto nfsmout;
 			if (NFSISSET_ATTRBIT(&attrbits,
@@ -2858,7 +2879,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 		 * The IETF working group decided that this is the correct
 		 * error return for all non-regular files.
 		 */
-		nd->nd_repstat = NFSERR_SYMLINK;
+		nd->nd_repstat = (vp->v_type == VDIR) ? NFSERR_ISDIR : NFSERR_SYMLINK;
 	}
 	if (!nd->nd_repstat && (stp->ls_flags & NFSLCK_WRITEACCESS))
 	    nd->nd_repstat = nfsvno_accchk(vp, VWRITE, nd->nd_cred,
@@ -3197,6 +3218,11 @@ nfsrvd_opendowngrade(struct nfsrv_descript *nd, __unused int isdgram,
 	nfsv4stateid_t stateid;
 	nfsquad_t clientid;
 
+	/* opendowngrade can only work on a file object.*/
+	if (vp->v_type != VREG) {
+		error = NFSERR_INVAL;
+		goto nfsmout;
+	}
 	NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID + 3 * NFSX_UNSIGNED);
 	stp->ls_ownerlen = 0;
 	stp->ls_op = nd->nd_rp;
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 2faf064d7567..97f8fffd622b 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -1628,9 +1628,17 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 	       */
 	      if (error == 0 && (stp->ls_flags & NFSLCK_OPEN) &&
 		  ((stp->ls_openowner->ls_flags & NFSLCK_NEEDSCONFIRM) ||
-		   (getlckret == 0 && stp->ls_lfp != lfp)))
-			error = NFSERR_BADSTATEID;
-	      if (error == 0 &&
+		   (getlckret == 0 && stp->ls_lfp != lfp))){
+		      /*
+		       * NFSLCK_SETATTR should return OK rather than NFSERR_BADSTATEID
+		       * The only exception is using SETATTR with SIZE.
+		       * */
+                    if ((new_stp->ls_flags &
+                         (NFSLCK_SETATTR | NFSLCK_CHECK)) != NFSLCK_SETATTR)
+			     error = NFSERR_BADSTATEID;
+	      }
+	      
+		if (error == 0 &&
 		  (stp->ls_flags & (NFSLCK_DELEGREAD | NFSLCK_DELEGWRITE)) &&
 		  getlckret == 0 && stp->ls_lfp != lfp)
 			error = NFSERR_BADSTATEID;
@@ -4909,12 +4917,17 @@ nfsrv_checkremove(vnode_t vp, int remove, NFSPROC_T *p)
 	 * Now, look for a conflicting open share.
 	 */
 	if (remove) {
-		LIST_FOREACH(stp, &lfp->lf_open, ls_file) {
-			if (stp->ls_flags & NFSLCK_WRITEDENY) {
-				error = NFSERR_FILEOPEN;
-				break;
+		/*
+		 * If the entry in the directory was the last reference to the
+		 * corresponding filesystem object, the object can be destroyed
+		 * */
+		if(lfp->lf_usecount>1)
+			LIST_FOREACH(stp, &lfp->lf_open, ls_file) {
+				if (stp->ls_flags & NFSLCK_WRITEDENY) {
+					error = NFSERR_FILEOPEN;
+					break;
+				}
 			}
-		}
 	}
 
 	NFSUNLOCKSTATE();
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 0ffb50391c95..a567ce6bf19c 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -419,7 +419,6 @@ smbfs_getpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 #ifdef SMBFS_RWGENERIC
@@ -568,7 +567,6 @@ smbfs_putpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 	int error;
diff --git a/sys/gdb/gdb_int.h b/sys/gdb/gdb_int.h
index d06943a2a002..aa8940257a69 100644
--- a/sys/gdb/gdb_int.h
+++ b/sys/gdb/gdb_int.h
@@ -60,6 +60,9 @@ void gdb_tx_begin(char);
 int gdb_tx_end(void);
 int gdb_tx_mem(const unsigned char *, size_t);
 void gdb_tx_reg(int);
+int gdb_rx_bindata(unsigned char *data, size_t datalen, size_t *amt);
+int gdb_search_mem(const unsigned char *addr, size_t size,
+    const unsigned char *pat, size_t patlen, const unsigned char **found);
 
 static __inline void
 gdb_tx_char(char c)
diff --git a/sys/gdb/gdb_main.c b/sys/gdb/gdb_main.c
index 4ed3272108e5..f8f3836f66eb 100644
--- a/sys/gdb/gdb_main.c
+++ b/sys/gdb/gdb_main.c
@@ -53,6 +53,8 @@ SET_DECLARE(gdb_dbgport_set, struct gdb_dbgport);
 struct gdb_dbgport *gdb_cur = NULL;
 int gdb_listening = 0;
 
+static unsigned char gdb_bindata[64];
+
 static int
 gdb_init(void)
 {
@@ -254,6 +256,28 @@ gdb_trap(int type, int code)
 					gdb_tx_begin('l');
 					gdb_tx_end();
 				}
+			} else if (gdb_rx_equal("Search:memory:")) {
+				size_t patlen;
+				intmax_t addr, size;
+				const unsigned char *found;
+				if (gdb_rx_varhex(&addr) || gdb_rx_char() != ';' ||
+				    gdb_rx_varhex(&size) || gdb_rx_char() != ';' ||
+				    gdb_rx_bindata(gdb_bindata, sizeof(gdb_bindata), &patlen)) {
+					gdb_tx_err(EINVAL);
+					break;
+				}
+				if (gdb_search_mem((char *)(uintptr_t)addr, size, gdb_bindata, patlen, &found)) {
+					if (found == 0ULL)
+						gdb_tx_begin('0');
+					else {
+						gdb_tx_begin('1');
+						gdb_tx_char(',');
+						gdb_tx_hex((intmax_t)(uintptr_t)found, 8);
+					}
+					gdb_tx_end();
+				} else
+					gdb_tx_err(EIO);
+				break;
 			} else if (!gdb_cpu_query())
 				gdb_tx_empty();
 			break;
diff --git a/sys/gdb/gdb_packet.c b/sys/gdb/gdb_packet.c
index a62cc8d16b36..73ee74f34bd0 100644
--- a/sys/gdb/gdb_packet.c
+++ b/sys/gdb/gdb_packet.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/ctype.h>
 #include <sys/kdb.h>
+#include <sys/libkern.h>
 #include <sys/ttydefaults.h>
 
 #include <machine/gdb_machdep.h>
@@ -320,3 +321,46 @@ gdb_tx_reg(int regnum)
 	} else
 		gdb_tx_mem(regp, regsz);
 }
+
+/* Read binary data up until the end of the packet or until we have datalen decoded bytes */
+int
+gdb_rx_bindata(unsigned char *data, size_t datalen, size_t *amt)
+{
+	int c;
+
+	*amt = 0;
+
+	while (*amt < datalen) {
+		c = gdb_rx_char();
+		/* End of packet? */
+		if (c == -1)
+			break;
+		/* Escaped character up next */
+		if (c == '}') {
+			/* Truncated packet? Bail out */
+			if ((c = gdb_rx_char()) == -1)
+				return (1);
+			c ^= 0x20;
+		}
+		*(data++) = c & 0xff;
+		(*amt)++;
+	}
+
+	return (0);
+}
+
+int
+gdb_search_mem(const unsigned char *addr, size_t size, const unsigned char *pat, size_t patlen, const unsigned char **found)
+{
+	void *prev;
+	jmp_buf jb;
+	int ret;
+
+	prev = kdb_jmpbuf(jb);
+	ret = setjmp(jb);
+	if (ret == 0)
+		*found = memmem(addr, size, pat, patlen);
+
+	(void)kdb_jmpbuf(prev);
+	return ((ret == 0) ? 1 : 0);
+}
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 2c4dc2c41ae5..f545b75bfd0e 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -82,6 +82,24 @@ u_int g_eli_batch = 0;
 SYSCTL_UINT(_kern_geom_eli, OID_AUTO, batch, CTLFLAG_RWTUN, &g_eli_batch, 0,
     "Use crypto operations batching");
 
+/*
+ * Passphrase cached during boot, in order to be more user-friendly if
+ * there are multiple providers using the same passphrase.
+ */
+static char cached_passphrase[256];
+static u_int g_eli_boot_passcache = 1;
+TUNABLE_INT("kern.geom.eli.boot_passcache", &g_eli_boot_passcache);
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, boot_passcache, CTLFLAG_RD,
+    &g_eli_boot_passcache, 0,
+    "Passphrases are cached during boot process for possible reuse");
+static void
+zero_boot_passcache(void * dummy)
+{
+
+	memset(cached_passphrase, 0, sizeof(cached_passphrase));
+}
+EVENTHANDLER_DEFINE(mountroot, zero_boot_passcache, NULL, 0);
+
 static eventhandler_tag g_eli_pre_sync = NULL;
 
 static int g_eli_destroy_geom(struct gctl_req *req, struct g_class *mp,
@@ -1059,7 +1077,7 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 		tries = g_eli_tries;
 	}
 
-	for (i = 0; i < tries; i++) {
+	for (i = 0; i <= tries; i++) {
 		g_eli_crypto_hmac_init(&ctx, NULL, 0);
 
 		/*
@@ -1083,9 +1101,19 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 
 		/* Ask for the passphrase if defined. */
 		if (md.md_iterations >= 0) {
-			printf("Enter passphrase for %s: ", pp->name);
-			cngets(passphrase, sizeof(passphrase),
-			    g_eli_visible_passphrase);
+			/* Try first with cached passphrase. */
+			if (i == 0) {
+				if (!g_eli_boot_passcache)
+					continue;
+				memcpy(passphrase, cached_passphrase,
+				    sizeof(passphrase));
+			} else {
+				printf("Enter passphrase for %s: ", pp->name);
+				cngets(passphrase, sizeof(passphrase),
+				    g_eli_visible_passphrase);
+				memcpy(cached_passphrase, passphrase,
+				    sizeof(passphrase));
+			}
 		}
 
 		/*
@@ -1115,15 +1143,18 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 		error = g_eli_mkey_decrypt(&md, key, mkey, &nkey);
 		bzero(key, sizeof(key));
 		if (error == -1) {
-			if (i == tries - 1) {
+			if (i == tries) {
 				G_ELI_DEBUG(0,
 				    "Wrong key for %s. No tries left.",
 				    pp->name);
 				g_eli_keyfiles_clear(pp->name);
 				return (NULL);
 			}
-			G_ELI_DEBUG(0, "Wrong key for %s. Tries left: %u.",
-			    pp->name, tries - i - 1);
+			if (i > 0) {
+				G_ELI_DEBUG(0,
+				    "Wrong key for %s. Tries left: %u.",
+				    pp->name, tries - i);
+			}
 			/* Try again. */
 			continue;
 		} else if (error > 0) {
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index a2034d379c8c..c7104d85375e 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -281,7 +281,7 @@ g_dev_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 
 	cp = dev->si_drv2;
 	if (cp == NULL)
-		return(ENXIO);		/* g_dev_taste() not done yet */
+		return (ENXIO);		/* g_dev_taste() not done yet */
 	g_trace(G_T_ACCESS, "g_dev_open(%s, %d, %d, %p)",
 	    cp->geom->name, flags, fmt, td);
 
@@ -312,7 +312,7 @@ g_dev_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 		sc->sc_open += r + w + e;
 		mtx_unlock(&sc->sc_mtx);
 	}
-	return(error);
+	return (error);
 }
 
 static int
@@ -324,10 +324,10 @@ g_dev_close(struct cdev *dev, int flags, int fmt, struct thread *td)
 
 	cp = dev->si_drv2;
 	if (cp == NULL)
-		return(ENXIO);
+		return (ENXIO);
 	g_trace(G_T_ACCESS, "g_dev_close(%s, %d, %d, %p)",
 	    cp->geom->name, flags, fmt, td);
-	
+
 	r = flags & FREAD ? -1 : 0;
 	w = flags & FWRITE ? -1 : 0;
 #ifdef notyet
@@ -361,7 +361,6 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread
 	struct g_kerneldump kd;
 	off_t offset, length, chunk;
 	int i, error;
-	u_int u;
 
 	cp = dev->si_drv2;
 	pp = cp->provider;
@@ -396,19 +395,17 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread
 		error = g_io_getattr("GEOM::frontstuff", cp, &i, data);
 		break;
 	case DIOCSKERNELDUMP:
-		u = *((u_int *)data);
-		if (!u) {
-			set_dumper(NULL, NULL);
-			error = 0;
+		if (*(u_int *)data == 0) {
+			error = set_dumper(NULL, NULL);
 			break;
 		}
 		kd.offset = 0;
 		kd.length = OFF_MAX;
 		i = sizeof kd;
 		error = g_io_getattr("GEOM::kerneldump", cp, &i, &kd);
-		if (!error) {
+		if (error == 0) {
 			error = set_dumper(&kd.di, devtoname(dev));
-			if (!error)
+			if (error == 0)
 				dev->si_flags |= SI_DUMPDEV;
 		}
 		break;
@@ -425,7 +422,7 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread
 			error = EINVAL;
 			break;
 		}
-		while (length > 0) { 
+		while (length > 0) {
 			chunk = length;
 			if (g_dev_del_max_sectors != 0 && chunk >
 			    g_dev_del_max_sectors * cp->provider->sectorsize) {
@@ -618,7 +615,7 @@ g_dev_orphan(struct g_consumer *cp)
 
 	/* Reset any dump-area set on this device */
 	if (dev->si_flags & SI_DUMPDEV)
-		set_dumper(NULL, NULL);
+		(void)set_dumper(NULL, NULL);
 
 	/* Destroy the struct cdev *so we get no more requests */
 	destroy_dev_sched_cb(dev, g_dev_callback, cp);
diff --git a/sys/geom/geom_map.c b/sys/geom/geom_map.c
index afc26b66633c..a5db2a55b3df 100644
--- a/sys/geom/geom_map.c
+++ b/sys/geom/geom_map.c
@@ -153,8 +153,8 @@ find_marker(struct g_consumer *cp, const char *line, off_t *offset)
 		return (1);
 
 	if (bootverbose) {
-		printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n",
-		    search_key, (intmax_t)search_start, (intmax_t)search_step);
+		printf("MAP: search %s for key \"%s\" from 0x%jx, step 0x%jx\n",
+		    cp->geom->name, search_key, (intmax_t)search_start, (intmax_t)search_step);
 	}
 
 	/* error if search_key is empty */
@@ -321,9 +321,9 @@ g_map_parse_part(struct g_class *mp, struct g_provider *pp,
 	}
 
 	if (bootverbose) {
-		printf("MAP: %jxx%jx, data=%jxx%jx "
+		printf("MAP: %s: %jxx%jx, data=%jxx%jx "
 		    "\"/dev/map/%s\"\n",
-		    (intmax_t)start, (intmax_t)size, (intmax_t)offset,
+		    cp->geom->name, (intmax_t)start, (intmax_t)size, (intmax_t)offset,
 		    (intmax_t)dsize, name);
 	}
 
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
index d9e358ec8370..e269d9210925 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
@@ -59,7 +59,7 @@ struct reiserfs_node {
 						 flags read from sd_attrs. */
 
 	uint16_t	 i_mode;              /* IFMT, permissions. */
-	uint16_t	 i_nlink;             /* File link count. */
+	int16_t		 i_nlink;             /* File link count. */
 	uint64_t	 i_size;              /* File byte count. */
 	uint32_t	 i_bytes;
 	uid_t		 i_uid;               /* File owner. */
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index f93ea13cb546..6872aecf47a9 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -59,6 +59,12 @@ static void init_i486_on_386(void);
 static void init_6x86(void);
 #endif /* I486_CPU */
 
+#if defined(I586_CPU) && defined(CPU_WT_ALLOC)
+static void	enable_K5_wt_alloc(void);
+static void	enable_K6_wt_alloc(void);
+static void	enable_K6_2_wt_alloc(void);
+#endif
+
 #ifdef I686_CPU
 static void	init_6x86MX(void);
 static void	init_ppro(void);
@@ -451,7 +457,7 @@ init_winchip(void)
 	fcr &= ~(1ULL << 11);
 
 	/*
-	 * Additioanlly, set EBRPRED, E2MMX and EAMD3D for WinChip 2 and 3.
+	 * Additionally, set EBRPRED, E2MMX and EAMD3D for WinChip 2 and 3.
 	 */
 	if (CPUID_TO_MODEL(cpu_id) >= 8)
 		fcr |= (1 << 12) | (1 << 19) | (1 << 20);
@@ -527,6 +533,8 @@ init_6x86MX(void)
 	intr_restore(saveintr);
 }
 
+static int ppro_apic_used = -1;
+
 static void
 init_ppro(void)
 {
@@ -535,9 +543,29 @@ init_ppro(void)
 	/*
 	 * Local APIC should be disabled if it is not going to be used.
 	 */
-	apicbase = rdmsr(MSR_APICBASE);
-	apicbase &= ~APICBASE_ENABLED;
-	wrmsr(MSR_APICBASE, apicbase);
+	if (ppro_apic_used != 1) {
+		apicbase = rdmsr(MSR_APICBASE);
+		apicbase &= ~APICBASE_ENABLED;
+		wrmsr(MSR_APICBASE, apicbase);
+		ppro_apic_used = 0;
+	}
+}
+
+/*
+ * If the local APIC is going to be used after being disabled above,
+ * re-enable it and don't disable it in the future.
+ */
+void
+ppro_reenable_apic(void)
+{
+	u_int64_t	apicbase;
+
+	if (ppro_apic_used == 0) {
+		apicbase = rdmsr(MSR_APICBASE);
+		apicbase |= APICBASE_ENABLED;
+		wrmsr(MSR_APICBASE, apicbase);
+		ppro_apic_used = 1;
+	}
 }
 
 /*
@@ -646,20 +674,6 @@ init_transmeta(void)
 }
 #endif
 
-/*
- * Initialize CR4 (Control register 4) to enable SSE instructions.
- */
-void
-enable_sse(void)
-{
-#if defined(CPU_ENABLE_SSE)
-	if ((cpu_feature & CPUID_XMM) && (cpu_feature & CPUID_FXSR)) {
-		load_cr4(rcr4() | CR4_FXSR | CR4_XMM);
-		cpu_fxsr = hw_instruction_sse = 1;
-	}
-#endif
-}
-
 extern int elf32_nxstack;
 
 void
@@ -692,6 +706,27 @@ initializecpu(void)
 #ifdef I586_CPU
 	case CPU_586:
 		switch (cpu_vendor_id) {
+		case CPU_VENDOR_AMD:
+#ifdef CPU_WT_ALLOC
+			if (((cpu_id & 0x0f0) > 0) &&
+			    ((cpu_id & 0x0f0) < 0x60) &&
+			    ((cpu_id & 0x00f) > 3))
+				enable_K5_wt_alloc();
+			else if (((cpu_id & 0x0f0) > 0x80) ||
+			    (((cpu_id & 0x0f0) == 0x80) &&
+				(cpu_id & 0x00f) > 0x07))
+				enable_K6_2_wt_alloc();
+			else if ((cpu_id & 0x0f0) > 0x50)
+				enable_K6_wt_alloc();
+#endif
+			if ((cpu_id & 0xf0) == 0xa0)
+				/*
+				 * Make sure the TSC runs through
+				 * suspension, otherwise we can't use
+				 * it as timecounter
+				 */
+				wrmsr(0x1900, rdmsr(0x1900) | 0x20ULL);
+			break;
 		case CPU_VENDOR_CENTAUR:
 			init_winchip();
 			break;
@@ -762,7 +797,17 @@ initializecpu(void)
 	default:
 		break;
 	}
-	enable_sse();
+#if defined(CPU_ENABLE_SSE)
+	if ((cpu_feature & CPUID_XMM) && (cpu_feature & CPUID_FXSR)) {
+		load_cr4(rcr4() | CR4_FXSR | CR4_XMM);
+		cpu_fxsr = hw_instruction_sse = 1;
+	}
+#endif
+}
+
+void
+initializecpucache(void)
+{
 
 	/*
 	 * CPUID with %eax = 1, %ebx returns
@@ -839,7 +884,7 @@ initializecpu(void)
  * Enable write allocate feature of AMD processors.
  * Following two functions require the Maxmem variable being set.
  */
-void
+static void
 enable_K5_wt_alloc(void)
 {
 	u_int64_t	msr;
@@ -885,7 +930,7 @@ enable_K5_wt_alloc(void)
 	}
 }
 
-void
+static void
 enable_K6_wt_alloc(void)
 {
 	quad_t	size;
@@ -945,7 +990,7 @@ enable_K6_wt_alloc(void)
 	intr_restore(saveintr);
 }
 
-void
+static void
 enable_K6_2_wt_alloc(void)
 {
 	quad_t	size;
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ed7b072c7839..34b147dcc5fd 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -109,7 +109,11 @@ __FBSDID("$FreeBSD$");
 #include <ddb/db_sym.h>
 #endif
 
+#ifdef PC98
+#include <pc98/pc98/pc98_machdep.h>
+#else
 #include <isa/rtc.h>
+#endif
 
 #include <net/netisr.h>
 
@@ -197,10 +201,6 @@ static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
 #endif /* CPU_ENABLE_SSE */
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
 
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
 /* Intel ICH registers */
 #define ICH_PMBASE	0x400
 #define ICH_SMI_EN	ICH_PMBASE + 0x30
@@ -208,6 +208,14 @@ extern vm_offset_t ksym_start, ksym_end;
 int	_udatasel, _ucodesel;
 u_int	basemem;
 
+#ifdef PC98
+int	need_pre_dma_flush;	/* If 1, use wbinvd befor DMA transfer. */
+int	need_post_dma_flush;	/* If 1, use invd after DMA transfer. */
+
+static int	ispc98 = 1;
+SYSCTL_INT(_machdep, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, "");
+#endif
+
 int cold = 1;
 
 #ifdef COMPAT_43
@@ -252,6 +260,9 @@ struct mem_range_softc mem_range_softc;
  struct init_ops init_ops = {
 	.early_clock_source_init =	i8254_init,
 	.early_delay =			i8254_delay,
+#ifdef DEV_APIC
+	.msi_init =			msi_init,
+#endif
  };
 
 static void
@@ -260,7 +271,8 @@ cpu_startup(dummy)
 {
 	uintmax_t memsize;
 	char *sysenv;
-	
+
+#ifndef PC98
 	/*
 	 * On MacBooks, we need to disallow the legacy USB circuit to
 	 * generate an SMI# because this can cause several problems,
@@ -286,6 +298,7 @@ cpu_startup(dummy)
 		}
 		freeenv(sysenv);
 	}
+#endif /* !PC98 */
 
 	/*
 	 * Good {morning,afternoon,evening,night}.
@@ -1236,6 +1249,7 @@ SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
 #define	STATE_MWAIT	0x1
 #define	STATE_SLEEPING	0x2
 
+#ifndef PC98
 static void
 cpu_idle_acpi(sbintime_t sbt)
 {
@@ -1254,6 +1268,7 @@ cpu_idle_acpi(sbintime_t sbt)
 		__asm __volatile("sti; hlt");
 	*state = STATE_RUNNING;
 }
+#endif /* !PC98 */
 
 #ifndef XEN
 static void
@@ -1371,7 +1386,7 @@ cpu_probe_amdc1e(void)
 	}
 }
 
-#ifdef XEN
+#if defined(PC98) || defined(XEN)
 void (*cpu_idle_fn)(sbintime_t) = cpu_idle_hlt;
 #else
 void (*cpu_idle_fn)(sbintime_t) = cpu_idle_acpi;
@@ -1459,7 +1474,9 @@ struct {
 	{ cpu_idle_spin, "spin" },
 	{ cpu_idle_mwait, "mwait" },
 	{ cpu_idle_hlt, "hlt" },
+#ifndef PC98
 	{ cpu_idle_acpi, "acpi" },
+#endif
 	{ NULL, NULL }
 };
 
@@ -1476,9 +1493,11 @@ idle_sysctl_available(SYSCTL_HANDLER_ARGS)
 		if (strstr(idle_tbl[i].id_name, "mwait") &&
 		    (cpu_feature2 & CPUID2_MON) == 0)
 			continue;
+#ifndef PC98
 		if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
 		    cpu_idle_hook == NULL)
 			continue;
+#endif
 		p += sprintf(p, "%s%s", p != avail ? ", " : "",
 		    idle_tbl[i].id_name);
 	}
@@ -1513,9 +1532,11 @@ idle_sysctl(SYSCTL_HANDLER_ARGS)
 		if (strstr(idle_tbl[i].id_name, "mwait") &&
 		    (cpu_feature2 & CPUID2_MON) == 0)
 			continue;
+#ifndef PC98
 		if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
 		    cpu_idle_hook == NULL)
 			continue;
+#endif
 		if (strcmp(idle_tbl[i].id_name, buf))
 			continue;
 		cpu_idle_fn = idle_tbl[i].id_fn;
@@ -2001,7 +2022,7 @@ sdtossd(sd, ssd)
 	ssd->ssd_gran  = sd->sd_gran;
 }
 
-#ifndef XEN
+#if !defined(PC98) && !defined(XEN)
 static int
 add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap,
     int *physmap_idxp)
@@ -2108,7 +2129,9 @@ add_smap_entries(struct bios_smap *smapbase, vm_paddr_t *physmap,
 		if (!add_smap_entry(smap, physmap, physmap_idxp))
 			break;
 }
+#endif /* !PC98 && !XEN */
 
+#ifndef XEN
 static void
 basemem_setup(void)
 {
@@ -2156,7 +2179,7 @@ basemem_setup(void)
 	for (i = basemem / 4; i < 160; i++)
 		pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U;
 }
-#endif
+#endif /* !XEN */
 
 /*
  * Populate the (physmap) array with base/bound pairs describing the
@@ -2171,6 +2194,271 @@ basemem_setup(void)
  *
  * XXX first should be vm_paddr_t.
  */
+#ifdef PC98
+static void
+getmemsize(int first)
+{
+	int off, physmap_idx, pa_indx, da_indx;
+	u_long physmem_tunable, memtest;
+	vm_paddr_t physmap[PHYSMAP_SIZE];
+	pt_entry_t *pte;
+	quad_t dcons_addr, dcons_size;
+	int i;
+	int pg_n;
+	u_int extmem;
+	u_int under16;
+	vm_paddr_t pa;
+
+	bzero(physmap, sizeof(physmap));
+
+	/* XXX - some of EPSON machines can't use PG_N */
+	pg_n = PG_N;
+	if (pc98_machine_type & M_EPSON_PC98) {
+		switch (epson_machine_id) {
+#ifdef WB_CACHE
+		default:
+#endif
+		case EPSON_PC486_HX:
+		case EPSON_PC486_HG:
+		case EPSON_PC486_HA:
+			pg_n = 0;
+			break;
+		}
+	}
+
+	under16 = pc98_getmemsize(&basemem, &extmem);
+	basemem_setup();
+
+	physmap[0] = 0;
+	physmap[1] = basemem * 1024;
+	physmap_idx = 2;
+	physmap[physmap_idx] = 0x100000;
+	physmap[physmap_idx + 1] = physmap[physmap_idx] + extmem * 1024;
+
+	/*
+	 * Now, physmap contains a map of physical memory.
+	 */
+
+#ifdef SMP
+	/* make hole for AP bootstrap code */
+	physmap[1] = mp_bootaddress(physmap[1]);
+#endif
+
+	/*
+	 * Maxmem isn't the "maximum memory", it's one larger than the
+	 * highest page of the physical address space.  It should be
+	 * called something like "Maxphyspage".  We may adjust this 
+	 * based on ``hw.physmem'' and the results of the memory test.
+	 */
+	Maxmem = atop(physmap[physmap_idx + 1]);
+
+#ifdef MAXMEM
+	Maxmem = MAXMEM / 4;
+#endif
+
+	if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable))
+		Maxmem = atop(physmem_tunable);
+
+	/*
+	 * By default keep the memtest enabled.  Use a general name so that
+	 * one could eventually do more with the code than just disable it.
+	 */
+	memtest = 1;
+	TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest);
+
+	if (atop(physmap[physmap_idx + 1]) != Maxmem &&
+	    (boothowto & RB_VERBOSE))
+		printf("Physical memory use set to %ldK\n", Maxmem * 4);
+
+	/*
+	 * If Maxmem has been increased beyond what the system has detected,
+	 * extend the last memory segment to the new limit.
+	 */ 
+	if (atop(physmap[physmap_idx + 1]) < Maxmem)
+		physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem);
+
+	/*
+	 * We need to divide chunk if Maxmem is larger than 16MB and
+	 * under 16MB area is not full of memory.
+	 * (1) system area (15-16MB region) is cut off
+	 * (2) extended memory is only over 16MB area (ex. Melco "HYPERMEMORY")
+	 */
+	if ((under16 != 16 * 1024) && (extmem > 15 * 1024)) {
+		/* 15M - 16M region is cut off, so need to divide chunk */
+		physmap[physmap_idx + 1] = under16 * 1024;
+		physmap_idx += 2;
+		physmap[physmap_idx] = 0x1000000;
+		physmap[physmap_idx + 1] = physmap[2] + extmem * 1024;
+	}
+
+	/* call pmap initialization to make new kernel address space */
+	pmap_bootstrap(first);
+
+	/*
+	 * Size up each available chunk of physical memory.
+	 */
+	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
+	pa_indx = 0;
+	da_indx = 1;
+	phys_avail[pa_indx++] = physmap[0];
+	phys_avail[pa_indx] = physmap[0];
+	dump_avail[da_indx] = physmap[0];
+	pte = CMAP3;
+
+	/*
+	 * Get dcons buffer address
+	 */
+	if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
+	    getenv_quad("dcons.size", &dcons_size) == 0)
+		dcons_addr = 0;
+
+	/*
+	 * physmap is in bytes, so when converting to page boundaries,
+	 * round up the start address and round down the end address.
+	 */
+	for (i = 0; i <= physmap_idx; i += 2) {
+		vm_paddr_t end;
+
+		end = ptoa((vm_paddr_t)Maxmem);
+		if (physmap[i + 1] < end)
+			end = trunc_page(physmap[i + 1]);
+		for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
+			int tmp, page_bad, full;
+			int *ptr = (int *)CADDR3;
+
+			full = FALSE;
+			/*
+			 * block out kernel memory as not available.
+			 */
+			if (pa >= KERNLOAD && pa < first)
+				goto do_dump_avail;
+
+			/*
+			 * block out dcons buffer
+			 */
+			if (dcons_addr > 0
+			    && pa >= trunc_page(dcons_addr)
+			    && pa < dcons_addr + dcons_size)
+				goto do_dump_avail;
+
+			page_bad = FALSE;
+			if (memtest == 0)
+				goto skip_memtest;
+
+			/*
+			 * map page into kernel: valid, read/write,non-cacheable
+			 */
+			*pte = pa | PG_V | PG_RW | pg_n;
+			invltlb();
+
+			tmp = *(int *)ptr;
+			/*
+			 * Test for alternating 1's and 0's
+			 */
+			*(volatile int *)ptr = 0xaaaaaaaa;
+			if (*(volatile int *)ptr != 0xaaaaaaaa)
+				page_bad = TRUE;
+			/*
+			 * Test for alternating 0's and 1's
+			 */
+			*(volatile int *)ptr = 0x55555555;
+			if (*(volatile int *)ptr != 0x55555555)
+				page_bad = TRUE;
+			/*
+			 * Test for all 1's
+			 */
+			*(volatile int *)ptr = 0xffffffff;
+			if (*(volatile int *)ptr != 0xffffffff)
+				page_bad = TRUE;
+			/*
+			 * Test for all 0's
+			 */
+			*(volatile int *)ptr = 0x0;
+			if (*(volatile int *)ptr != 0x0)
+				page_bad = TRUE;
+			/*
+			 * Restore original value.
+			 */
+			*(int *)ptr = tmp;
+
+skip_memtest:
+			/*
+			 * Adjust array of valid/good pages.
+			 */
+			if (page_bad == TRUE)
+				continue;
+			/*
+			 * If this good page is a continuation of the
+			 * previous set of good pages, then just increase
+			 * the end pointer. Otherwise start a new chunk.
+			 * Note that "end" points one higher than end,
+			 * making the range >= start and < end.
+			 * If we're also doing a speculative memory
+			 * test and we at or past the end, bump up Maxmem
+			 * so that we keep going. The first bad page
+			 * will terminate the loop.
+			 */
+			if (phys_avail[pa_indx] == pa) {
+				phys_avail[pa_indx] += PAGE_SIZE;
+			} else {
+				pa_indx++;
+				if (pa_indx == PHYS_AVAIL_ARRAY_END) {
+					printf(
+		"Too many holes in the physical address space, giving up\n");
+					pa_indx--;
+					full = TRUE;
+					goto do_dump_avail;
+				}
+				phys_avail[pa_indx++] = pa;	/* start */
+				phys_avail[pa_indx] = pa + PAGE_SIZE; /* end */
+			}
+			physmem++;
+do_dump_avail:
+			if (dump_avail[da_indx] == pa) {
+				dump_avail[da_indx] += PAGE_SIZE;
+			} else {
+				da_indx++;
+				if (da_indx == DUMP_AVAIL_ARRAY_END) {
+					da_indx--;
+					goto do_next;
+				}
+				dump_avail[da_indx++] = pa;	/* start */
+				dump_avail[da_indx] = pa + PAGE_SIZE; /* end */
+			}
+do_next:
+			if (full)
+				break;
+		}
+	}
+	*pte = 0;
+	invltlb();
+	
+	/*
+	 * XXX
+	 * The last chunk must contain at least one page plus the message
+	 * buffer to avoid complicating other code (message buffer address
+	 * calculation, etc.).
+	 */
+	while (phys_avail[pa_indx - 1] + PAGE_SIZE +
+	    round_page(msgbufsize) >= phys_avail[pa_indx]) {
+		physmem -= atop(phys_avail[pa_indx] - phys_avail[pa_indx - 1]);
+		phys_avail[pa_indx--] = 0;
+		phys_avail[pa_indx--] = 0;
+	}
+
+	Maxmem = atop(phys_avail[pa_indx]);
+
+	/* Trim off space for the message buffer. */
+	phys_avail[pa_indx] -= round_page(msgbufsize);
+
+	/* Map the message buffer. */
+	for (off = 0; off < round_page(msgbufsize); off += PAGE_SIZE)
+		pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] +
+		    off);
+
+	PT_UPDATES_FLUSH();
+}
+#else /* PC98 */
 static void
 getmemsize(int first)
 {
@@ -2568,6 +2856,7 @@ getmemsize(int first)
 
 	PT_UPDATES_FLUSH();
 }
+#endif /* PC98 */
 
 #ifdef XEN
 #define MTOPSIZE (1<<(14 + PAGE_SHIFT))
@@ -2736,8 +3025,7 @@ init386(first)
 #endif
 
 #ifdef DDB
-	ksym_start = bootinfo.bi_symtab;
-	ksym_end = bootinfo.bi_esymtab;
+	db_fetch_ksymtab(bootinfo.bi_symtab, bootinfo.bi_esymtab);
 #endif
 
 	kdb_init();
@@ -2753,6 +3041,7 @@ init386(first)
 	setidt(IDT_GP, &IDTVEC(prot),  SDT_SYS386TGT, SEL_KPL,
 	    GSEL(GCODE_SEL, SEL_KPL));
 	initializecpu();	/* Initialize CPU registers */
+	initializecpucache();
 
 	/* make an initial tss so cpu can get interrupt stack on syscall! */
 	/* Note: -16 is so we can grow the trapframe if we came from vm86 */
@@ -2831,6 +3120,13 @@ init386(first)
 	 */
 	proc_linkup0(&proc0, &thread0);
 
+#ifdef PC98
+	/*
+	 * Initialize DMAC
+	 */
+	pc98_init_dmac();
+#endif
+
 	metadata_missing = 0;
 	if (bootinfo.bi_modulep) {
 		preload_metadata = (caddr_t)bootinfo.bi_modulep + KERNBASE;
@@ -2994,7 +3290,9 @@ init386(first)
 
 #ifdef DEV_ISA
 #ifdef DEV_ATPIC
+#ifndef PC98
 	elcr_probe();
+#endif
 	atpic_startup();
 #else
 	/* Reset and mask the atpics and leave them shut down. */
@@ -3012,8 +3310,7 @@ init386(first)
 #endif
 
 #ifdef DDB
-	ksym_start = bootinfo.bi_symtab;
-	ksym_end = bootinfo.bi_esymtab;
+	db_fetch_ksymtab(bootinfo.bi_symtab, bootinfo.bi_esymtab);
 #endif
 
 	kdb_init();
@@ -3029,6 +3326,9 @@ init386(first)
 	setidt(IDT_GP, &IDTVEC(prot),  SDT_SYS386TGT, SEL_KPL,
 	    GSEL(GCODE_SEL, SEL_KPL));
 	initializecpu();	/* Initialize CPU registers */
+#ifdef PC98
+	initializecpucache();
+#endif
 
 	/* make an initial tss so cpu can get interrupt stack on syscall! */
 	/* Note: -16 is so we can grow the trapframe if we came from vm86 */
@@ -3116,6 +3416,7 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size)
 	pcpu->pc_acpi_id = 0xffffffff;
 }
 
+#ifndef PC98
 static int
 smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
 {
@@ -3151,6 +3452,7 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
 }
 SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
     smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data");
+#endif /* !PC98 */
 
 void
 spinlock_enter(void)
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 1ea8f9572d6a..3b112aa168db 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -147,7 +147,7 @@ void *bootstacks[MAXCPU];
 static void *dpcpu;
 
 struct pcb stoppcbs[MAXCPU];
-struct pcb **susppcbs = NULL;
+struct susppcb **susppcbs;
 
 /* Variables needed for SMP tlb shootdown. */
 vm_offset_t smp_tlb_addr1;
@@ -745,25 +745,15 @@ init_secondary(void)
 	/* set up CPU registers and state */
 	cpu_setregs();
 
+	/* set up SSE/NX */
+	initializecpu();
+
 	/* set up FPU state on the AP */
 	npxinit();
 
-	/* set up SSE registers */
-	enable_sse();
-
 	if (cpu_ops.cpu_init)
 		cpu_ops.cpu_init();
 
-#ifdef PAE
-	/* Enable the PTE no-execute bit. */
-	if ((amd_feature & AMDID_NX) != 0) {
-		uint64_t msr;
-
-		msr = rdmsr(MSR_EFER) | EFER_NXE;
-		wrmsr(MSR_EFER, msr);
-	}
-#endif
-
 	/* A quick check from sanity claus */
 	cpuid = PCPU_GET(cpuid);
 	if (PCPU_GET(apic_id) != lapic_id()) {
@@ -1521,13 +1511,14 @@ cpususpend_handler(void)
 	mtx_assert(&smp_ipi_mtx, MA_NOTOWNED);
 
 	cpu = PCPU_GET(cpuid);
-	if (savectx(susppcbs[cpu])) {
-		npxsuspend(&susppcbs[cpu]->pcb_fpususpend);
+	if (savectx(&susppcbs[cpu]->sp_pcb)) {
+		npxsuspend(&susppcbs[cpu]->sp_fpususpend);
 		wbinvd();
 		CPU_SET_ATOMIC(cpu, &suspended_cpus);
 	} else {
-		npxresume(&susppcbs[cpu]->pcb_fpususpend);
+		npxresume(&susppcbs[cpu]->sp_fpususpend);
 		pmap_init_pat();
+		initializecpu();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 2859b84b4582..37e14e9d62cf 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -3161,7 +3161,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 	pt_entry_t *pte;
 	boolean_t anychanged, pv_lists_locked;
 
-	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
+	KASSERT((prot & ~VM_PROT_ALL) == 0, ("invalid prot %x", prot));
+	if (prot == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
 		return;
 	}
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index c2c8c6c64ac0..950fa1f0556c 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -99,14 +99,9 @@ void	doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault));
 void	dump_add_page(vm_paddr_t);
 void	dump_drop_page(vm_paddr_t);
 void	finishidentcpu(void);
-#if defined(I586_CPU) && defined(CPU_WT_ALLOC)
-void	enable_K5_wt_alloc(void);
-void	enable_K6_wt_alloc(void);
-void	enable_K6_2_wt_alloc(void);
-#endif
-void	enable_sse(void);
 void	fillw(int /*u_short*/ pat, void *base, size_t cnt);
 void	initializecpu(void);
+void	initializecpucache(void);
 void	i686_pagezero(void *addr);
 void	sse2_pagezero(void *addr);
 void	init_AMD_Elan_sc520(void);
@@ -114,6 +109,7 @@ int	is_physical_memory(vm_paddr_t addr);
 int	isa_nmi(int cd);
 vm_paddr_t kvtop(void *addr);
 void	panicifcpuunsupported(void);
+void	ppro_reenable_apic(void);
 void	printcpuinfo(void);
 void	setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec);
 int     user_dbreg_trap(void);
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index a654ad3e6c39..01ace723e501 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -90,8 +90,11 @@ struct pcb {
 	struct region_descriptor pcb_idt;
 	uint16_t	pcb_ldt;
 	uint16_t	pcb_tr;
+};
 
-	union	savefpu pcb_fpususpend;
+struct susppcb {
+	struct pcb	sp_pcb;
+	union savefpu	sp_fpususpend;
 };
 
 #ifdef _KERNEL
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 87d419f76dcc..27eff3255c15 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -54,6 +54,11 @@ MALLOC_DECLARE(M_LINUX);
 #define	PTRIN(v)	(void *)(v)
 #define	PTROUT(v)	(l_uintptr_t)(v)
 
+#define	CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0)
+#define	CP2(src,dst,sfld,dfld) do { (dst).dfld = (src).sfld; } while (0)
+#define	PTRIN_CP(src,dst,fld) \
+	do { (dst).fld = PTRIN((src).fld); } while (0)
+
 /*
  * Provide a separate set of types for the Linux types.
  */
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 5d6972906336..d9c28d9483da 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -980,37 +980,6 @@ linux_get_thread_area(struct thread *td, struct linux_get_thread_area_args *args
 	return (0);
 }
 
-/* copied from kern/kern_time.c */
-int
-linux_timer_create(struct thread *td, struct linux_timer_create_args *args)
-{
-   	return sys_ktimer_create(td, (struct ktimer_create_args *) args);
-}
-
-int
-linux_timer_settime(struct thread *td, struct linux_timer_settime_args *args)
-{
-   	return sys_ktimer_settime(td, (struct ktimer_settime_args *) args);
-}
-
-int
-linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *args)
-{
-   	return sys_ktimer_gettime(td, (struct ktimer_gettime_args *) args);
-}
-
-int
-linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *args)
-{
-   	return sys_ktimer_getoverrun(td, (struct ktimer_getoverrun_args *) args);
-}
-
-int
-linux_timer_delete(struct thread *td, struct linux_timer_delete_args *args)
-{
-   	return sys_ktimer_delete(td, (struct ktimer_delete_args *) args);
-}
-
 /* XXX: this wont work with module - convert it */
 int
 linux_mq_open(struct thread *td, struct linux_mq_open_args *args)
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 912c60dfb941..1f75c5f340e0 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -787,6 +787,7 @@ struct linux_timer_create_args {
 };
 struct linux_timer_settime_args {
 	char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)];
+	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 	char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)];
 	char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)];
 };
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index bb76143f1c58..7c2362c073c1 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #define	LINUX_SYS_exit	1
diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c
index 38642f4ddb01..87601d8ac197 100644
--- a/sys/i386/linux/linux_syscalls.c
+++ b/sys/i386/linux/linux_syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 0d9168aad061..640c531f90c7 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky 
+ * created from FreeBSD: head/sys/i386/linux/syscalls.master 271743 2014-09-18 08:36:45Z bz 
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index dfdd43085f86..20bf94a03abf 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -1781,9 +1781,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 260: {
 		struct linux_timer_settime_args *p = params;
 		iarg[0] = p->timerid; /* l_timer_t */
-		uarg[1] = (intptr_t) p->new; /* const struct itimerspec * */
-		uarg[2] = (intptr_t) p->old; /* struct itimerspec * */
-		*n_args = 3;
+		iarg[1] = p->flags; /* l_int */
+		uarg[2] = (intptr_t) p->new; /* const struct itimerspec * */
+		uarg[3] = (intptr_t) p->old; /* struct itimerspec * */
+		*n_args = 4;
 		break;
 	}
 	/* linux_timer_gettime */
@@ -5012,9 +5013,12 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "l_timer_t";
 			break;
 		case 1:
-			p = "const struct itimerspec *";
+			p = "l_int";
 			break;
 		case 2:
+			p = "const struct itimerspec *";
+			break;
+		case 3:
 			p = "struct itimerspec *";
 			break;
 		default:
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index bb1716638639..0b119bf5620b 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -439,7 +439,7 @@
 258	AUE_NULL	STD	{ int linux_set_tid_address(int *tidptr); }
 259	AUE_NULL	STD	{ int linux_timer_create(clockid_t clock_id, \
 					struct sigevent *evp, l_timer_t *timerid); }
-260	AUE_NULL	STD	{ int linux_timer_settime(l_timer_t timerid, \
+260	AUE_NULL	STD	{ int linux_timer_settime(l_timer_t timerid, l_int flags, \
 					const struct itimerspec *new, struct itimerspec *old); }
 261	AUE_NULL	STD	{ int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); }
 262	AUE_NULL	STD	{ int linux_timer_getoverrun(l_timer_t timerid); }
diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c
index 165b319bd6ae..3502151e3239 100644
--- a/sys/i386/xen/mp_machdep.c
+++ b/sys/i386/xen/mp_machdep.c
@@ -598,22 +598,13 @@ init_secondary(void)
 	for (addr = 0; addr < NKPT * NBPDR - 1; addr += PAGE_SIZE)
 		invlpg(addr);
 
+#if 0
+	/* set up SSE/NX */
+	initializecpu();
+#endif
+
 	/* set up FPU state on the AP */
 	npxinit();
-#if 0
-	
-	/* set up SSE registers */
-	enable_sse();
-#endif
-#if 0 && defined(PAE)
-	/* Enable the PTE no-execute bit. */
-	if ((amd_feature & AMDID_NX) != 0) {
-		uint64_t msr;
-
-		msr = rdmsr(MSR_EFER) | EFER_NXE;
-		wrmsr(MSR_EFER, msr);
-	}
-#endif
 #if 0
 	/* A quick check from sanity claus */
 	if (PCPU_GET(apic_id) != lapic_id()) {
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index b0ad6110c6f7..ccc854c0f2d9 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -670,3 +670,25 @@ METHOD int remap_intr {
 	device_t	_child;
 	u_int		_irq;
 } DEFAULT null_remap_intr;
+
+/**
+ * @brief Suspend a given child
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to suspend
+ */
+METHOD int suspend_child {
+	device_t	_dev;
+	device_t	_child;
+} DEFAULT bus_generic_suspend_child;
+
+/**
+ * @brief Resume a given child
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _child	the device to resume
+ */
+METHOD int resume_child {
+	device_t	_dev;
+	device_t	_child;
+} DEFAULT bus_generic_resume_child;
diff --git a/sys/kern/kern_cons.c b/sys/kern/kern_cons.c
index da157ecccfa9..a6ccf626803d 100644
--- a/sys/kern/kern_cons.c
+++ b/sys/kern/kern_cons.c
@@ -607,6 +607,7 @@ SYSINIT(cndev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, cn_drvinit, NULL);
 #ifdef HAS_TIMER_SPKR
 
 static int beeping;
+static struct callout beeping_timer;
 
 static void
 sysbeepstop(void *chan)
@@ -629,11 +630,18 @@ sysbeep(int pitch, int period)
 	timer_spkr_setfreq(pitch);
 	if (!beeping) {
 		beeping = period;
-		timeout(sysbeepstop, (void *)NULL, period);
+		callout_reset(&beeping_timer, period, sysbeepstop, NULL);
 	}
 	return (0);
 }
 
+static void
+sysbeep_init(void *unused)
+{
+
+	callout_init(&beeping_timer, CALLOUT_MPSAFE);
+}
+SYSINIT(sysbeep, SI_SUB_SOFTINTR, SI_ORDER_ANY, sysbeep_init, NULL);
 #else
 
 /*
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index aca26efc50b5..341f998f9292 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -719,7 +719,7 @@ cpuset_setthread(lwpid_t id, cpuset_t *mask)
  * Apply new cpumask to the ithread.
  */
 int
-cpuset_setithread(lwpid_t id, u_char cpu)
+cpuset_setithread(lwpid_t id, int cpu)
 {
 	struct cpuset *nset, *rset;
 	struct cpuset *parent, *old_set;
@@ -731,6 +731,7 @@ cpuset_setithread(lwpid_t id, u_char cpu)
 
 	nset = uma_zalloc(cpuset_zone, M_WAITOK);
 	rset = uma_zalloc(cpuset_zone, M_WAITOK);
+	cs_id = CPUSET_INVALID;
 
 	CPU_ZERO(&mask);
 	if (cpu == NOCPU)
@@ -739,13 +740,14 @@ cpuset_setithread(lwpid_t id, u_char cpu)
 		CPU_SET(cpu, &mask);
 
 	error = cpuset_which(CPU_WHICH_TID, id, &p, &td, &old_set);
-	if (((cs_id = alloc_unr(cpuset_unr)) == CPUSET_INVALID) || error != 0)
+	if (error != 0 || ((cs_id = alloc_unr(cpuset_unr)) == CPUSET_INVALID))
 		goto out;
 
-	thread_lock(td);
+	/* cpuset_which() returns with PROC_LOCK held. */
 	old_set = td->td_cpuset;
 
 	if (cpu == NOCPU) {
+
 		/*
 		 * roll back to default set. We're not using cpuset_shadow()
 		 * here because we can fail CPU_SUBSET() check. This can happen
@@ -759,7 +761,14 @@ cpuset_setithread(lwpid_t id, u_char cpu)
 
 	if (old_set->cs_id == 1 || (old_set->cs_id == CPUSET_INVALID &&
 	    old_set->cs_parent->cs_id == 1)) {
-		/* Default mask, we need to use new root set */
+
+		/*
+		 * Current set is either default (1) or
+		 * shadowed version of default set.
+		 *
+		 * Allocate new root set to be able to shadow it
+		 * with any mask.
+		 */
 		error = _cpuset_create(rset, cpuset_zero,
 		    &cpuset_zero->cs_mask, cs_id);
 		if (error != 0) {
@@ -772,18 +781,20 @@ cpuset_setithread(lwpid_t id, u_char cpu)
 		cs_id = CPUSET_INVALID;
 	} else {
 		/* Assume existing set was already allocated by previous call */
-		parent = td->td_cpuset;
+		parent = old_set;
 		old_set = NULL;
 	}
 
 	error = cpuset_shadow(parent, nset, &mask);
 applyset:
 	if (error == 0) {
+		thread_lock(td);
 		td->td_cpuset = nset;
 		sched_affinity(td);
+		thread_unlock(td);
 		nset = NULL;
-	}
-	thread_unlock(td);
+	} else
+		old_set = NULL;
 	PROC_UNLOCK(p);
 	if (old_set != NULL)
 		cpuset_rel(old_set);
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index ec750a09f1d7..5f6aa6fc0696 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -47,27 +47,21 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/capsicum.h>
 #include <sys/conf.h>
-#include <sys/domain.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
-#include <sys/ksem.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mman.h>
 #include <sys/mount.h>
-#include <sys/mqueue.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/selinfo.h>
-#include <sys/pipe.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
-#include <sys/procdesc.h>
 #include <sys/protosw.h>
 #include <sys/racct.h>
 #include <sys/resourcevar.h>
@@ -79,10 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
-#include <sys/tty.h>
 #include <sys/unistd.h>
-#include <sys/un.h>
-#include <sys/unpcb.h>
 #include <sys/user.h>
 #include <sys/vnode.h>
 #ifdef KTRACE
@@ -91,9 +82,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/vnet.h>
 
-#include <netinet/in.h>
-#include <netinet/in_pcb.h>
-
 #include <security/audit/audit.h>
 
 #include <vm/uma.h>
@@ -111,26 +99,23 @@ MALLOC_DECLARE(M_FADVISE);
 
 static uma_zone_t file_zone;
 
-void	(*ksem_info)(struct ksem *ks, char *path, size_t size, uint32_t *value);
-
 static int	closefp(struct filedesc *fdp, int fd, struct file *fp,
 		    struct thread *td, int holdleaders);
+static int	do_dup(struct thread *td, int flags, int old, int new,
+		    register_t *retval);
 static int	fd_first_free(struct filedesc *fdp, int low, int size);
 static int	fd_last_used(struct filedesc *fdp, int size);
 static void	fdgrowtable(struct filedesc *fdp, int nfd);
 static void	fdgrowtable_exp(struct filedesc *fdp, int nfd);
 static void	fdunused(struct filedesc *fdp, int fd);
 static void	fdused(struct filedesc *fdp, int fd);
-static int	fill_pipe_info(struct pipe *pi, struct kinfo_file *kif);
-static int	fill_procdesc_info(struct procdesc *pdp,
-		    struct kinfo_file *kif);
-static int	fill_pts_info(struct tty *tp, struct kinfo_file *kif);
-static int	fill_sem_info(struct file *fp, struct kinfo_file *kif);
-static int	fill_shm_info(struct file *fp, struct kinfo_file *kif);
-static int	fill_socket_info(struct socket *so, struct kinfo_file *kif);
-static int	fill_vnode_info(struct vnode *vp, struct kinfo_file *kif);
 static int	getmaxfd(struct proc *p);
 
+/* Flags for do_dup() */
+#define	DUP_FIXED	0x1	/* Force fixed allocation. */
+#define	DUP_FCNTL	0x2	/* fcntl()-style errors. */
+#define	DUP_CLOEXEC	0x4	/* Atomically set FD_CLOEXEC. */
+
 /*
  * Each process has:
  *
@@ -303,11 +288,18 @@ _fdfree(struct filedesc *fdp, int fd, int last)
 	struct filedescent *fde;
 
 	fde = &fdp->fd_ofiles[fd];
+#ifdef CAPABILITIES
+	if (!last)
+		seq_write_begin(&fde->fde_seq);
+#endif
 	filecaps_free(&fde->fde_caps);
 	if (last)
 		return;
-	bzero(fde, sizeof(*fde));
+	bzero(fde_change(fde), fde_change_size);
 	fdunused(fdp, fd);
+#ifdef CAPABILITIES
+	seq_write_end(&fde->fde_seq);
+#endif
 }
 
 static inline void
@@ -399,23 +391,28 @@ struct fcntl_args {
 /* ARGSUSED */
 int
 sys_fcntl(struct thread *td, struct fcntl_args *uap)
+{
+
+	return (kern_fcntl_freebsd(td, uap->fd, uap->cmd, uap->arg));
+}
+
+int
+kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg)
 {
 	struct flock fl;
 	struct __oflock ofl;
-	intptr_t arg;
+	intptr_t arg1;
 	int error;
-	int cmd;
 
 	error = 0;
-	cmd = uap->cmd;
-	switch (uap->cmd) {
+	switch (cmd) {
 	case F_OGETLK:
 	case F_OSETLK:
 	case F_OSETLKW:
 		/*
 		 * Convert old flock structure to new.
 		 */
-		error = copyin((void *)(intptr_t)uap->arg, &ofl, sizeof(ofl));
+		error = copyin((void *)(intptr_t)arg, &ofl, sizeof(ofl));
 		fl.l_start = ofl.l_start;
 		fl.l_len = ofl.l_len;
 		fl.l_pid = ofl.l_pid;
@@ -423,7 +420,7 @@ sys_fcntl(struct thread *td, struct fcntl_args *uap)
 		fl.l_whence = ofl.l_whence;
 		fl.l_sysid = 0;
 
-		switch (uap->cmd) {
+		switch (cmd) {
 		case F_OGETLK:
 		    cmd = F_GETLK;
 		    break;
@@ -434,33 +431,33 @@ sys_fcntl(struct thread *td, struct fcntl_args *uap)
 		    cmd = F_SETLKW;
 		    break;
 		}
-		arg = (intptr_t)&fl;
+		arg1 = (intptr_t)&fl;
 		break;
         case F_GETLK:
         case F_SETLK:
         case F_SETLKW:
 	case F_SETLK_REMOTE:
-                error = copyin((void *)(intptr_t)uap->arg, &fl, sizeof(fl));
-                arg = (intptr_t)&fl;
+                error = copyin((void *)(intptr_t)arg, &fl, sizeof(fl));
+                arg1 = (intptr_t)&fl;
                 break;
 	default:
-		arg = uap->arg;
+		arg1 = arg;
 		break;
 	}
 	if (error)
 		return (error);
-	error = kern_fcntl(td, uap->fd, cmd, arg);
+	error = kern_fcntl(td, fd, cmd, arg1);
 	if (error)
 		return (error);
-	if (uap->cmd == F_OGETLK) {
+	if (cmd == F_OGETLK) {
 		ofl.l_start = fl.l_start;
 		ofl.l_len = fl.l_len;
 		ofl.l_pid = fl.l_pid;
 		ofl.l_type = fl.l_type;
 		ofl.l_whence = fl.l_whence;
-		error = copyout(&ofl, (void *)(intptr_t)uap->arg, sizeof(ofl));
-	} else if (uap->cmd == F_GETLK) {
-		error = copyout(&fl, (void *)(intptr_t)uap->arg, sizeof(fl));
+		error = copyout(&ofl, (void *)(intptr_t)arg, sizeof(ofl));
+	} else if (cmd == F_GETLK) {
+		error = copyout(&fl, (void *)(intptr_t)arg, sizeof(fl));
 	}
 	return (error);
 }
@@ -509,7 +506,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg)
 
 	case F_GETFD:
 		FILEDESC_SLOCK(fdp);
-		if ((fp = fget_locked(fdp, fd)) == NULL) {
+		if (fget_locked(fdp, fd) == NULL) {
 			FILEDESC_SUNLOCK(fdp);
 			error = EBADF;
 			break;
@@ -522,7 +519,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg)
 
 	case F_SETFD:
 		FILEDESC_XLOCK(fdp);
-		if ((fp = fget_locked(fdp, fd)) == NULL) {
+		if (fget_locked(fdp, fd) == NULL) {
 			FILEDESC_XUNLOCK(fdp);
 			error = EBADF;
 			break;
@@ -802,7 +799,7 @@ getmaxfd(struct proc *p)
 /*
  * Common code for dup, dup2, fcntl(F_DUPFD) and fcntl(F_DUP2FD).
  */
-int
+static int
 do_dup(struct thread *td, int flags, int old, int new,
     register_t *retval)
 {
@@ -893,13 +890,19 @@ do_dup(struct thread *td, int flags, int old, int new,
 	/*
 	 * Duplicate the source descriptor.
 	 */
+#ifdef CAPABILITIES
+	seq_write_begin(&newfde->fde_seq);
+#endif
 	filecaps_free(&newfde->fde_caps);
-	*newfde = *oldfde;
+	memcpy(fde_change(newfde), fde_change(oldfde), fde_change_size);
 	filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps);
 	if ((flags & DUP_CLOEXEC) != 0)
 		newfde->fde_flags = oldfde->fde_flags | UF_EXCLOSE;
 	else
 		newfde->fde_flags = oldfde->fde_flags & ~UF_EXCLOSE;
+#ifdef CAPABILITIES
+	seq_write_end(&newfde->fde_seq);
+#endif
 	*retval = new;
 
 	if (delfp != NULL) {
@@ -1766,6 +1769,9 @@ finstall(struct thread *td, struct file *fp, int *fd, int flags,
 	}
 	fhold(fp);
 	fde = &fdp->fd_ofiles[*fd];
+#ifdef CAPABILITIES
+	seq_write_begin(&fde->fde_seq);
+#endif
 	fde->fde_file = fp;
 	if ((flags & O_CLOEXEC) != 0)
 		fde->fde_flags |= UF_EXCLOSE;
@@ -1773,6 +1779,9 @@ finstall(struct thread *td, struct file *fp, int *fd, int flags,
 		filecaps_move(fcaps, &fde->fde_caps);
 	else
 		filecaps_fill(&fde->fde_caps);
+#ifdef CAPABILITIES
+	seq_write_end(&fde->fde_seq);
+#endif
 	FILEDESC_XUNLOCK(fdp);
 	return (0);
 }
@@ -2304,6 +2313,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
 	struct file *fp;
 	u_int count;
 #ifdef CAPABILITIES
+	seq_t seq;
 	cap_rights_t haverights;
 	int error;
 #endif
@@ -2324,7 +2334,12 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
 	 */
 	for (;;) {
 #ifdef CAPABILITIES
+		seq = seq_read(fd_seq(fdp, fd));
 		fde = fdp->fd_ofiles[fd];
+		if (!seq_consistent(fd_seq(fdp, fd), seq)) {
+			cpu_spinwait();
+			continue;
+		}
 		fp = fde.fde_file;
 #else
 		fp = fdp->fd_ofiles[fd].fde_file;
@@ -2353,7 +2368,11 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
 		 */
 		if (atomic_cmpset_acq_int(&fp->f_count, count, count + 1) != 1)
 			continue;
+#ifdef	CAPABILITIES
+		if (seq_consistent_nomb(fd_seq(fdp, fd), seq))
+#else
 		if (fp == fdp->fd_ofiles[fd].fde_file)
+#endif
 			break;
 		fdrop(fp, curthread);
 	}
@@ -2710,6 +2729,7 @@ int
 dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode,
     int openerror, int *indxp)
 {
+	struct filedescent *newfde, *oldfde;
 	struct file *fp;
 	int error, indx;
 
@@ -2753,17 +2773,32 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode,
 			return (EACCES);
 		}
 		fhold(fp);
-		fdp->fd_ofiles[indx] = fdp->fd_ofiles[dfd];
-		filecaps_copy(&fdp->fd_ofiles[dfd].fde_caps,
-		    &fdp->fd_ofiles[indx].fde_caps);
+		newfde = &fdp->fd_ofiles[indx];
+		oldfde = &fdp->fd_ofiles[dfd];
+#ifdef CAPABILITIES
+		seq_write_begin(&newfde->fde_seq);
+#endif
+		memcpy(fde_change(newfde), fde_change(oldfde), fde_change_size);
+		filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps);
+#ifdef CAPABILITIES
+		seq_write_end(&newfde->fde_seq);
+#endif
 		break;
 	case ENXIO:
 		/*
 		 * Steal away the file pointer from dfd and stuff it into indx.
 		 */
-		fdp->fd_ofiles[indx] = fdp->fd_ofiles[dfd];
-		bzero(&fdp->fd_ofiles[dfd], sizeof(fdp->fd_ofiles[dfd]));
+		newfde = &fdp->fd_ofiles[indx];
+		oldfde = &fdp->fd_ofiles[dfd];
+#ifdef CAPABILITIES
+		seq_write_begin(&newfde->fde_seq);
+#endif
+		memcpy(fde_change(newfde), fde_change(oldfde), fde_change_size);
+		bzero(fde_change(oldfde), fde_change_size);
 		fdunused(fdp, dfd);
+#ifdef CAPABILITIES
+		seq_write_end(&newfde->fde_seq);
+#endif
 		break;
 	}
 	FILEDESC_XUNLOCK(fdp);
@@ -2945,280 +2980,14 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_MPSAFE,
     0, 0, sysctl_kern_file, "S,xfile", "Entire file table");
 
-#ifdef KINFO_OFILE_SIZE
-CTASSERT(sizeof(struct kinfo_ofile) == KINFO_OFILE_SIZE);
-#endif
-
-#ifdef COMPAT_FREEBSD7
-static int
-export_vnode_for_osysctl(struct vnode *vp, int type,
-    struct kinfo_ofile *kif, struct filedesc *fdp, struct sysctl_req *req)
-{
-	int error;
-	char *fullpath, *freepath;
-
-	bzero(kif, sizeof(*kif));
-	kif->kf_structsize = sizeof(*kif);
-
-	vref(vp);
-	kif->kf_fd = type;
-	kif->kf_type = KF_TYPE_VNODE;
-	/* This function only handles directories. */
-	if (vp->v_type != VDIR) {
-		vrele(vp);
-		return (ENOTDIR);
-	}
-	kif->kf_vnode_type = KF_VTYPE_VDIR;
-
-	/*
-	 * This is not a true file descriptor, so we set a bogus refcount
-	 * and offset to indicate these fields should be ignored.
-	 */
-	kif->kf_ref_count = -1;
-	kif->kf_offset = -1;
-
-	freepath = NULL;
-	fullpath = "-";
-	FILEDESC_SUNLOCK(fdp);
-	vn_fullpath(curthread, vp, &fullpath, &freepath);
-	vrele(vp);
-	strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
-	if (freepath != NULL)
-		free(freepath, M_TEMP);
-	error = SYSCTL_OUT(req, kif, sizeof(*kif));
-	FILEDESC_SLOCK(fdp);
-	return (error);
-}
-
-/*
- * Get per-process file descriptors for use by procstat(1), et al.
- */
-static int
-sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
-{
-	char *fullpath, *freepath;
-	struct kinfo_ofile *kif;
-	struct filedesc *fdp;
-	int error, i, *name;
-	struct shmfd *shmfd;
-	struct socket *so;
-	struct vnode *vp;
-	struct ksem *ks;
-	struct file *fp;
-	struct proc *p;
-	struct tty *tp;
-
-	name = (int *)arg1;
-	error = pget((pid_t)name[0], PGET_CANDEBUG | PGET_NOTWEXIT, &p);
-	if (error != 0)
-		return (error);
-	fdp = fdhold(p);
-	PROC_UNLOCK(p);
-	if (fdp == NULL)
-		return (ENOENT);
-	kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK);
-	FILEDESC_SLOCK(fdp);
-	if (fdp->fd_cdir != NULL)
-		export_vnode_for_osysctl(fdp->fd_cdir, KF_FD_TYPE_CWD, kif,
-				fdp, req);
-	if (fdp->fd_rdir != NULL)
-		export_vnode_for_osysctl(fdp->fd_rdir, KF_FD_TYPE_ROOT, kif,
-				fdp, req);
-	if (fdp->fd_jdir != NULL)
-		export_vnode_for_osysctl(fdp->fd_jdir, KF_FD_TYPE_JAIL, kif,
-				fdp, req);
-	for (i = 0; fdp->fd_refcnt > 0 && i <= fdp->fd_lastfile; i++) {
-		if ((fp = fdp->fd_ofiles[i].fde_file) == NULL)
-			continue;
-		bzero(kif, sizeof(*kif));
-		kif->kf_structsize = sizeof(*kif);
-		ks = NULL;
-		vp = NULL;
-		so = NULL;
-		tp = NULL;
-		shmfd = NULL;
-		kif->kf_fd = i;
-
-		switch (fp->f_type) {
-		case DTYPE_VNODE:
-			kif->kf_type = KF_TYPE_VNODE;
-			vp = fp->f_vnode;
-			break;
-
-		case DTYPE_SOCKET:
-			kif->kf_type = KF_TYPE_SOCKET;
-			so = fp->f_data;
-			break;
-
-		case DTYPE_PIPE:
-			kif->kf_type = KF_TYPE_PIPE;
-			break;
-
-		case DTYPE_FIFO:
-			kif->kf_type = KF_TYPE_FIFO;
-			vp = fp->f_vnode;
-			break;
-
-		case DTYPE_KQUEUE:
-			kif->kf_type = KF_TYPE_KQUEUE;
-			break;
-
-		case DTYPE_CRYPTO:
-			kif->kf_type = KF_TYPE_CRYPTO;
-			break;
-
-		case DTYPE_MQUEUE:
-			kif->kf_type = KF_TYPE_MQUEUE;
-			break;
-
-		case DTYPE_SHM:
-			kif->kf_type = KF_TYPE_SHM;
-			shmfd = fp->f_data;
-			break;
-
-		case DTYPE_SEM:
-			kif->kf_type = KF_TYPE_SEM;
-			ks = fp->f_data;
-			break;
-
-		case DTYPE_PTS:
-			kif->kf_type = KF_TYPE_PTS;
-			tp = fp->f_data;
-			break;
-
-		case DTYPE_PROCDESC:
-			kif->kf_type = KF_TYPE_PROCDESC;
-			break;
-
-		default:
-			kif->kf_type = KF_TYPE_UNKNOWN;
-			break;
-		}
-		kif->kf_ref_count = fp->f_count;
-		if (fp->f_flag & FREAD)
-			kif->kf_flags |= KF_FLAG_READ;
-		if (fp->f_flag & FWRITE)
-			kif->kf_flags |= KF_FLAG_WRITE;
-		if (fp->f_flag & FAPPEND)
-			kif->kf_flags |= KF_FLAG_APPEND;
-		if (fp->f_flag & FASYNC)
-			kif->kf_flags |= KF_FLAG_ASYNC;
-		if (fp->f_flag & FFSYNC)
-			kif->kf_flags |= KF_FLAG_FSYNC;
-		if (fp->f_flag & FNONBLOCK)
-			kif->kf_flags |= KF_FLAG_NONBLOCK;
-		if (fp->f_flag & O_DIRECT)
-			kif->kf_flags |= KF_FLAG_DIRECT;
-		if (fp->f_flag & FHASLOCK)
-			kif->kf_flags |= KF_FLAG_HASLOCK;
-		kif->kf_offset = foffset_get(fp);
-		if (vp != NULL) {
-			vref(vp);
-			switch (vp->v_type) {
-			case VNON:
-				kif->kf_vnode_type = KF_VTYPE_VNON;
-				break;
-			case VREG:
-				kif->kf_vnode_type = KF_VTYPE_VREG;
-				break;
-			case VDIR:
-				kif->kf_vnode_type = KF_VTYPE_VDIR;
-				break;
-			case VBLK:
-				kif->kf_vnode_type = KF_VTYPE_VBLK;
-				break;
-			case VCHR:
-				kif->kf_vnode_type = KF_VTYPE_VCHR;
-				break;
-			case VLNK:
-				kif->kf_vnode_type = KF_VTYPE_VLNK;
-				break;
-			case VSOCK:
-				kif->kf_vnode_type = KF_VTYPE_VSOCK;
-				break;
-			case VFIFO:
-				kif->kf_vnode_type = KF_VTYPE_VFIFO;
-				break;
-			case VBAD:
-				kif->kf_vnode_type = KF_VTYPE_VBAD;
-				break;
-			default:
-				kif->kf_vnode_type = KF_VTYPE_UNKNOWN;
-				break;
-			}
-			/*
-			 * It is OK to drop the filedesc lock here as we will
-			 * re-validate and re-evaluate its properties when
-			 * the loop continues.
-			 */
-			freepath = NULL;
-			fullpath = "-";
-			FILEDESC_SUNLOCK(fdp);
-			vn_fullpath(curthread, vp, &fullpath, &freepath);
-			vrele(vp);
-			strlcpy(kif->kf_path, fullpath,
-			    sizeof(kif->kf_path));
-			if (freepath != NULL)
-				free(freepath, M_TEMP);
-			FILEDESC_SLOCK(fdp);
-		}
-		if (so != NULL) {
-			struct sockaddr *sa;
-
-			if (so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa)
-			    == 0 && sa->sa_len <= sizeof(kif->kf_sa_local)) {
-				bcopy(sa, &kif->kf_sa_local, sa->sa_len);
-				free(sa, M_SONAME);
-			}
-			if (so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa)
-			    == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) {
-				bcopy(sa, &kif->kf_sa_peer, sa->sa_len);
-				free(sa, M_SONAME);
-			}
-			kif->kf_sock_domain =
-			    so->so_proto->pr_domain->dom_family;
-			kif->kf_sock_type = so->so_type;
-			kif->kf_sock_protocol = so->so_proto->pr_protocol;
-		}
-		if (tp != NULL) {
-			strlcpy(kif->kf_path, tty_devname(tp),
-			    sizeof(kif->kf_path));
-		}
-		if (shmfd != NULL)
-			shm_path(shmfd, kif->kf_path, sizeof(kif->kf_path));
-		if (ks != NULL && ksem_info != NULL)
-			ksem_info(ks, kif->kf_path, sizeof(kif->kf_path), NULL);
-		error = SYSCTL_OUT(req, kif, sizeof(*kif));
-		if (error)
-			break;
-	}
-	FILEDESC_SUNLOCK(fdp);
-	fddrop(fdp);
-	free(kif, M_TEMP);
-	return (0);
-}
-
-static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc,
-    CTLFLAG_RD||CTLFLAG_MPSAFE, sysctl_kern_proc_ofiledesc,
-    "Process ofiledesc entries");
-#endif	/* COMPAT_FREEBSD7 */
-
 #ifdef KINFO_FILE_SIZE
 CTASSERT(sizeof(struct kinfo_file) == KINFO_FILE_SIZE);
 #endif
 
-struct export_fd_buf {
-	struct filedesc		*fdp;
-	struct sbuf 		*sb;
-	ssize_t			remainder;
-	struct kinfo_file	kif;
-};
-
 static int
-export_fd_to_sb(void *data, int type, int fd, int fflags, int refcnt,
-    int64_t offset, cap_rights_t *rightsp, struct export_fd_buf *efbuf)
+xlate_fflags(int fflags)
 {
-	struct {
+	static const struct {
 		int	fflag;
 		int	kf_fflag;
 	} fflags_table[] = {
@@ -3238,83 +3007,126 @@ export_fd_to_sb(void *data, int type, int fd, int fflags, int refcnt,
 		{ O_SHLOCK, KF_FLAG_SHLOCK },
 		{ O_TRUNC, KF_FLAG_TRUNC }
 	};
-#define	NFFLAGS	(sizeof(fflags_table) / sizeof(*fflags_table))
-	struct kinfo_file *kif;
-	struct vnode *vp;
-	int error, locked;
 	unsigned int i;
+	int kflags;
 
-	if (efbuf->remainder == 0)
-		return (0);
-	kif = &efbuf->kif;
-	bzero(kif, sizeof(*kif));
-	locked = efbuf->fdp != NULL;
-	switch (type) {
-	case KF_TYPE_FIFO:
-	case KF_TYPE_VNODE:
-		if (locked) {
-			FILEDESC_SUNLOCK(efbuf->fdp);
-			locked = 0;
-		}
-		vp = (struct vnode *)data;
-		error = fill_vnode_info(vp, kif);
-		vrele(vp);
-		break;
-	case KF_TYPE_SOCKET:
-		error = fill_socket_info((struct socket *)data, kif);
-		break;
-	case KF_TYPE_PIPE:
-		error = fill_pipe_info((struct pipe *)data, kif);
-		break;
-	case KF_TYPE_PTS:
-		error = fill_pts_info((struct tty *)data, kif);
-		break;
-	case KF_TYPE_PROCDESC:
-		error = fill_procdesc_info((struct procdesc *)data, kif);
-		break;
-	case KF_TYPE_SEM:
-		error = fill_sem_info((struct file *)data, kif);
-		break;
-	case KF_TYPE_SHM:
-		error = fill_shm_info((struct file *)data, kif);
-		break;
-	default:
-		error = 0;
-	}
-	if (error == 0)
-		kif->kf_status |= KF_ATTR_VALID;
-
-	/*
-	 * Translate file access flags.
-	 */
-	for (i = 0; i < NFFLAGS; i++)
+	kflags = 0;
+	for (i = 0; i < nitems(fflags_table); i++)
 		if (fflags & fflags_table[i].fflag)
-			kif->kf_flags |=  fflags_table[i].kf_fflag;
+			kflags |=  fflags_table[i].kf_fflag;
+	return (kflags);
+}
+
+/* Trim unused data from kf_path by truncating the structure size. */
+static void
+pack_kinfo(struct kinfo_file *kif)
+{
+
+	kif->kf_structsize = offsetof(struct kinfo_file, kf_path) +
+	    strlen(kif->kf_path) + 1;
+	kif->kf_structsize = roundup(kif->kf_structsize, sizeof(uint64_t));
+}
+
+static void
+export_file_to_kinfo(struct file *fp, int fd, cap_rights_t *rightsp,
+    struct kinfo_file *kif, struct filedesc *fdp)
+{
+	int error;
+
+	bzero(kif, sizeof(*kif));
+
+	/* Set a default type to allow for empty fill_kinfo() methods. */
+	kif->kf_type = KF_TYPE_UNKNOWN;
+	kif->kf_flags = xlate_fflags(fp->f_flag);
 	if (rightsp != NULL)
 		kif->kf_cap_rights = *rightsp;
 	else
 		cap_rights_init(&kif->kf_cap_rights);
 	kif->kf_fd = fd;
-	kif->kf_type = type;
-	kif->kf_ref_count = refcnt;
-	kif->kf_offset = offset;
-	/* Pack record size down */
-	kif->kf_structsize = offsetof(struct kinfo_file, kf_path) +
-	    strlen(kif->kf_path) + 1;
-	kif->kf_structsize = roundup(kif->kf_structsize, sizeof(uint64_t));
+	kif->kf_ref_count = fp->f_count;
+	kif->kf_offset = foffset_get(fp);
+
+	/*
+	 * This may drop the filedesc lock, so the 'fp' cannot be
+	 * accessed after this call.
+	 */
+	error = fo_fill_kinfo(fp, kif, fdp);
+	if (error == 0)
+		kif->kf_status |= KF_ATTR_VALID;
+	pack_kinfo(kif);
+}
+
+static void
+export_vnode_to_kinfo(struct vnode *vp, int fd, int fflags,
+    struct kinfo_file *kif)
+{
+	int error;
+
+	bzero(kif, sizeof(*kif));
+
+	kif->kf_type = KF_TYPE_VNODE;
+	error = vn_fill_kinfo_vnode(vp, kif);
+	if (error == 0)
+		kif->kf_status |= KF_ATTR_VALID;
+	kif->kf_flags = xlate_fflags(fflags);
+	kif->kf_fd = fd;
+	kif->kf_ref_count = -1;
+	kif->kf_offset = -1;
+	pack_kinfo(kif);
+	vrele(vp);
+}
+
+struct export_fd_buf {
+	struct filedesc		*fdp;
+	struct sbuf 		*sb;
+	ssize_t			remainder;
+	struct kinfo_file	kif;
+};
+
+static int
+export_kinfo_to_sb(struct export_fd_buf *efbuf)
+{
+	struct kinfo_file *kif;
+
+	kif = &efbuf->kif;
 	if (efbuf->remainder != -1) {
 		if (efbuf->remainder < kif->kf_structsize) {
 			/* Terminate export. */
 			efbuf->remainder = 0;
-			if (efbuf->fdp != NULL && !locked)
-				FILEDESC_SLOCK(efbuf->fdp);
 			return (0);
 		}
 		efbuf->remainder -= kif->kf_structsize;
 	}
-	if (locked)
+	return (sbuf_bcat(efbuf->sb, kif, kif->kf_structsize));
+}
+
+static int
+export_file_to_sb(struct file *fp, int fd, cap_rights_t *rightsp,
+    struct export_fd_buf *efbuf)
+{
+	int error;
+
+	if (efbuf->remainder == 0)
+		return (0);
+	export_file_to_kinfo(fp, fd, rightsp, &efbuf->kif, efbuf->fdp);
+	FILEDESC_SUNLOCK(efbuf->fdp);
+	error = export_kinfo_to_sb(efbuf);
+	FILEDESC_SLOCK(efbuf->fdp);
+	return (error);
+}
+
+static int
+export_vnode_to_sb(struct vnode *vp, int fd, int fflags,
+    struct export_fd_buf *efbuf)
+{
+	int error;
+
+	if (efbuf->remainder == 0)
+		return (0);
+	if (efbuf->fdp != NULL)
 		FILEDESC_SUNLOCK(efbuf->fdp);
-	error = sbuf_bcat(efbuf->sb, kif, kif->kf_structsize);
+	export_vnode_to_kinfo(vp, fd, fflags, &efbuf->kif);
+	error = export_kinfo_to_sb(efbuf);
 	if (efbuf->fdp != NULL)
 		FILEDESC_SLOCK(efbuf->fdp);
 	return (error);
@@ -3328,16 +3140,15 @@ export_fd_to_sb(void *data, int type, int fd, int fflags, int refcnt,
 int
 kern_proc_filedesc_out(struct proc *p,  struct sbuf *sb, ssize_t maxlen)
 {
+	struct thread *td;
 	struct file *fp;
 	struct filedesc *fdp;
 	struct export_fd_buf *efbuf;
 	struct vnode *cttyvp, *textvp, *tracevp;
-	int64_t offset;
-	void *data;
 	int error, i;
-	int type, refcnt, fflags;
 	cap_rights_t rights;
 
+	td = curthread;
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 
 	/* ktrace vnode */
@@ -3362,14 +3173,13 @@ kern_proc_filedesc_out(struct proc *p,  struct sbuf *sb, ssize_t maxlen)
 	efbuf->sb = sb;
 	efbuf->remainder = maxlen;
 	if (tracevp != NULL)
-		export_fd_to_sb(tracevp, KF_TYPE_VNODE, KF_FD_TYPE_TRACE,
-		    FREAD | FWRITE, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(tracevp, KF_FD_TYPE_TRACE, FREAD | FWRITE,
+		    efbuf);
 	if (textvp != NULL)
-		export_fd_to_sb(textvp, KF_TYPE_VNODE, KF_FD_TYPE_TEXT,
-		    FREAD, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(textvp, KF_FD_TYPE_TEXT, FREAD, efbuf);
 	if (cttyvp != NULL)
-		export_fd_to_sb(cttyvp, KF_TYPE_VNODE, KF_FD_TYPE_CTTY,
-		    FREAD | FWRITE, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(cttyvp, KF_FD_TYPE_CTTY, FREAD | FWRITE,
+		    efbuf);
 	error = 0;
 	if (fdp == NULL)
 		goto fail;
@@ -3378,105 +3188,34 @@ kern_proc_filedesc_out(struct proc *p,  struct sbuf *sb, ssize_t maxlen)
 	/* working directory */
 	if (fdp->fd_cdir != NULL) {
 		vref(fdp->fd_cdir);
-		data = fdp->fd_cdir;
-		export_fd_to_sb(data, KF_TYPE_VNODE, KF_FD_TYPE_CWD,
-		    FREAD, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(fdp->fd_cdir, KF_FD_TYPE_CWD, FREAD, efbuf);
 	}
 	/* root directory */
 	if (fdp->fd_rdir != NULL) {
 		vref(fdp->fd_rdir);
-		data = fdp->fd_rdir;
-		export_fd_to_sb(data, KF_TYPE_VNODE, KF_FD_TYPE_ROOT,
-		    FREAD, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(fdp->fd_rdir, KF_FD_TYPE_ROOT, FREAD, efbuf);
 	}
 	/* jail directory */
 	if (fdp->fd_jdir != NULL) {
 		vref(fdp->fd_jdir);
-		data = fdp->fd_jdir;
-		export_fd_to_sb(data, KF_TYPE_VNODE, KF_FD_TYPE_JAIL,
-		    FREAD, -1, -1, NULL, efbuf);
+		export_vnode_to_sb(fdp->fd_jdir, KF_FD_TYPE_JAIL, FREAD, efbuf);
 	}
 	for (i = 0; fdp->fd_refcnt > 0 && i <= fdp->fd_lastfile; i++) {
 		if ((fp = fdp->fd_ofiles[i].fde_file) == NULL)
 			continue;
-		data = NULL;
 #ifdef CAPABILITIES
 		rights = *cap_rights(fdp, i);
 #else /* !CAPABILITIES */
 		cap_rights_init(&rights);
 #endif
-		switch (fp->f_type) {
-		case DTYPE_VNODE:
-			type = KF_TYPE_VNODE;
-			vref(fp->f_vnode);
-			data = fp->f_vnode;
-			break;
-
-		case DTYPE_SOCKET:
-			type = KF_TYPE_SOCKET;
-			data = fp->f_data;
-			break;
-
-		case DTYPE_PIPE:
-			type = KF_TYPE_PIPE;
-			data = fp->f_data;
-			break;
-
-		case DTYPE_FIFO:
-			type = KF_TYPE_FIFO;
-			vref(fp->f_vnode);
-			data = fp->f_vnode;
-			break;
-
-		case DTYPE_KQUEUE:
-			type = KF_TYPE_KQUEUE;
-			break;
-
-		case DTYPE_CRYPTO:
-			type = KF_TYPE_CRYPTO;
-			break;
-
-		case DTYPE_MQUEUE:
-			type = KF_TYPE_MQUEUE;
-			break;
-
-		case DTYPE_SHM:
-			type = KF_TYPE_SHM;
-			data = fp;
-			break;
-
-		case DTYPE_SEM:
-			type = KF_TYPE_SEM;
-			data = fp;
-			break;
-
-		case DTYPE_PTS:
-			type = KF_TYPE_PTS;
-			data = fp->f_data;
-			break;
-
-		case DTYPE_PROCDESC:
-			type = KF_TYPE_PROCDESC;
-			data = fp->f_data;
-			break;
-
-		default:
-			type = KF_TYPE_UNKNOWN;
-			break;
-		}
-		refcnt = fp->f_count;
-		fflags = fp->f_flag;
-		offset = foffset_get(fp);
-
 		/*
-		 * Create sysctl entry.
-		 * It is OK to drop the filedesc lock here as we will
-		 * re-validate and re-evaluate its properties when
-		 * the loop continues.
+		 * Create sysctl entry.  It is OK to drop the filedesc
+		 * lock inside of export_file_to_sb() as we will
+		 * re-validate and re-evaluate its properties when the
+		 * loop continues.
 		 */
-		error = export_fd_to_sb(data, type, i, fflags, refcnt,
-		    offset, &rights, efbuf);
-		if (error != 0)
+		error = export_file_to_sb(fp, i, &rights, efbuf);
+		if (error != 0 || efbuf->remainder == 0)
 			break;
 	}
 	FILEDESC_SUNLOCK(fdp);
@@ -3514,6 +3253,105 @@ sysctl_kern_proc_filedesc(SYSCTL_HANDLER_ARGS)
 	return (error != 0 ? error : error2);
 }
 
+#ifdef KINFO_OFILE_SIZE
+CTASSERT(sizeof(struct kinfo_ofile) == KINFO_OFILE_SIZE);
+#endif
+
+#ifdef COMPAT_FREEBSD7
+static void
+kinfo_to_okinfo(struct kinfo_file *kif, struct kinfo_ofile *okif)
+{
+
+	okif->kf_structsize = sizeof(*okif);
+	okif->kf_type = kif->kf_type;
+	okif->kf_fd = kif->kf_fd;
+	okif->kf_ref_count = kif->kf_ref_count;
+	okif->kf_flags = kif->kf_flags & (KF_FLAG_READ | KF_FLAG_WRITE |
+	    KF_FLAG_APPEND | KF_FLAG_ASYNC | KF_FLAG_FSYNC | KF_FLAG_NONBLOCK |
+	    KF_FLAG_DIRECT | KF_FLAG_HASLOCK);
+	okif->kf_offset = kif->kf_offset;
+	okif->kf_vnode_type = kif->kf_vnode_type;
+	okif->kf_sock_domain = kif->kf_sock_domain;
+	okif->kf_sock_type = kif->kf_sock_type;
+	okif->kf_sock_protocol = kif->kf_sock_protocol;
+	strlcpy(okif->kf_path, kif->kf_path, sizeof(okif->kf_path));
+	okif->kf_sa_local = kif->kf_sa_local;
+	okif->kf_sa_peer = kif->kf_sa_peer;
+}
+
+static int
+export_vnode_for_osysctl(struct vnode *vp, int type, struct kinfo_file *kif,
+    struct kinfo_ofile *okif, struct filedesc *fdp, struct sysctl_req *req)
+{
+	int error;
+
+	vref(vp);
+	FILEDESC_SUNLOCK(fdp);
+	export_vnode_to_kinfo(vp, type, 0, kif);
+	kinfo_to_okinfo(kif, okif);
+	error = SYSCTL_OUT(req, okif, sizeof(*okif));
+	FILEDESC_SLOCK(fdp);
+	return (error);
+}
+
+/*
+ * Get per-process file descriptors for use by procstat(1), et al.
+ */
+static int
+sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
+{
+	struct kinfo_ofile *okif;
+	struct kinfo_file *kif;
+	struct filedesc *fdp;
+	struct thread *td;
+	int error, i, *name;
+	struct file *fp;
+	struct proc *p;
+
+	td = curthread;
+	name = (int *)arg1;
+	error = pget((pid_t)name[0], PGET_CANDEBUG | PGET_NOTWEXIT, &p);
+	if (error != 0)
+		return (error);
+	fdp = fdhold(p);
+	PROC_UNLOCK(p);
+	if (fdp == NULL)
+		return (ENOENT);
+	kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK);
+	okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK);
+	FILEDESC_SLOCK(fdp);
+	if (fdp->fd_cdir != NULL)
+		export_vnode_for_osysctl(fdp->fd_cdir, KF_FD_TYPE_CWD, kif,
+		    okif, fdp, req);
+	if (fdp->fd_rdir != NULL)
+		export_vnode_for_osysctl(fdp->fd_rdir, KF_FD_TYPE_ROOT, kif,
+		    okif, fdp, req);
+	if (fdp->fd_jdir != NULL)
+		export_vnode_for_osysctl(fdp->fd_jdir, KF_FD_TYPE_JAIL, kif,
+		    okif, fdp, req);
+	for (i = 0; fdp->fd_refcnt > 0 && i <= fdp->fd_lastfile; i++) {
+		if ((fp = fdp->fd_ofiles[i].fde_file) == NULL)
+			continue;
+		export_file_to_kinfo(fp, i, NULL, kif, fdp);
+		FILEDESC_SUNLOCK(fdp);
+		kinfo_to_okinfo(kif, okif);
+		error = SYSCTL_OUT(req, okif, sizeof(*okif));
+		FILEDESC_SLOCK(fdp);
+		if (error)
+			break;
+	}
+	FILEDESC_SUNLOCK(fdp);
+	fddrop(fdp);
+	free(kif, M_TEMP);
+	free(okif, M_TEMP);
+	return (0);
+}
+
+static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc,
+    CTLFLAG_RD||CTLFLAG_MPSAFE, sysctl_kern_proc_ofiledesc,
+    "Process ofiledesc entries");
+#endif	/* COMPAT_FREEBSD7 */
+
 int
 vntype_to_kinfo(int vtype)
 {
@@ -3531,185 +3369,18 @@ vntype_to_kinfo(int vtype)
 		{ VREG, KF_VTYPE_VREG },
 		{ VSOCK, KF_VTYPE_VSOCK }
 	};
-#define	NVTYPES	(sizeof(vtypes_table) / sizeof(*vtypes_table))
 	unsigned int i;
 
 	/*
 	 * Perform vtype translation.
 	 */
-	for (i = 0; i < NVTYPES; i++)
+	for (i = 0; i < nitems(vtypes_table); i++)
 		if (vtypes_table[i].vtype == vtype)
-			break;
-	if (i < NVTYPES)
-		return (vtypes_table[i].kf_vtype);
+			return (vtypes_table[i].kf_vtype);
 
 	return (KF_VTYPE_UNKNOWN);
 }
 
-static int
-fill_vnode_info(struct vnode *vp, struct kinfo_file *kif)
-{
-	struct vattr va;
-	char *fullpath, *freepath;
-	int error;
-
-	if (vp == NULL)
-		return (1);
-	kif->kf_vnode_type = vntype_to_kinfo(vp->v_type);
-	freepath = NULL;
-	fullpath = "-";
-	error = vn_fullpath(curthread, vp, &fullpath, &freepath);
-	if (error == 0) {
-		strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
-	}
-	if (freepath != NULL)
-		free(freepath, M_TEMP);
-
-	/*
-	 * Retrieve vnode attributes.
-	 */
-	va.va_fsid = VNOVAL;
-	va.va_rdev = NODEV;
-	vn_lock(vp, LK_SHARED | LK_RETRY);
-	error = VOP_GETATTR(vp, &va, curthread->td_ucred);
-	VOP_UNLOCK(vp, 0);
-	if (error != 0)
-		return (error);
-	if (va.va_fsid != VNOVAL)
-		kif->kf_un.kf_file.kf_file_fsid = va.va_fsid;
-	else
-		kif->kf_un.kf_file.kf_file_fsid =
-		    vp->v_mount->mnt_stat.f_fsid.val[0];
-	kif->kf_un.kf_file.kf_file_fileid = va.va_fileid;
-	kif->kf_un.kf_file.kf_file_mode = MAKEIMODE(va.va_type, va.va_mode);
-	kif->kf_un.kf_file.kf_file_size = va.va_size;
-	kif->kf_un.kf_file.kf_file_rdev = va.va_rdev;
-	return (0);
-}
-
-static int
-fill_socket_info(struct socket *so, struct kinfo_file *kif)
-{
-	struct sockaddr *sa;
-	struct inpcb *inpcb;
-	struct unpcb *unpcb;
-	int error;
-
-	if (so == NULL)
-		return (1);
-	kif->kf_sock_domain = so->so_proto->pr_domain->dom_family;
-	kif->kf_sock_type = so->so_type;
-	kif->kf_sock_protocol = so->so_proto->pr_protocol;
-	kif->kf_un.kf_sock.kf_sock_pcb = (uintptr_t)so->so_pcb;
-	switch(kif->kf_sock_domain) {
-	case AF_INET:
-	case AF_INET6:
-		if (kif->kf_sock_protocol == IPPROTO_TCP) {
-			if (so->so_pcb != NULL) {
-				inpcb = (struct inpcb *)(so->so_pcb);
-				kif->kf_un.kf_sock.kf_sock_inpcb =
-				    (uintptr_t)inpcb->inp_ppcb;
-			}
-		}
-		break;
-	case AF_UNIX:
-		if (so->so_pcb != NULL) {
-			unpcb = (struct unpcb *)(so->so_pcb);
-			if (unpcb->unp_conn) {
-				kif->kf_un.kf_sock.kf_sock_unpconn =
-				    (uintptr_t)unpcb->unp_conn;
-				kif->kf_un.kf_sock.kf_sock_rcv_sb_state =
-				    so->so_rcv.sb_state;
-				kif->kf_un.kf_sock.kf_sock_snd_sb_state =
-				    so->so_snd.sb_state;
-			}
-		}
-		break;
-	}
-	error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa);
-	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_local)) {
-		bcopy(sa, &kif->kf_sa_local, sa->sa_len);
-		free(sa, M_SONAME);
-	}
-	error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
-	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) {
-		bcopy(sa, &kif->kf_sa_peer, sa->sa_len);
-		free(sa, M_SONAME);
-	}
-	strncpy(kif->kf_path, so->so_proto->pr_domain->dom_name,
-	    sizeof(kif->kf_path));
-	return (0);
-}
-
-static int
-fill_pts_info(struct tty *tp, struct kinfo_file *kif)
-{
-
-	if (tp == NULL)
-		return (1);
-	kif->kf_un.kf_pts.kf_pts_dev = tty_udev(tp);
-	strlcpy(kif->kf_path, tty_devname(tp), sizeof(kif->kf_path));
-	return (0);
-}
-
-static int
-fill_pipe_info(struct pipe *pi, struct kinfo_file *kif)
-{
-
-	if (pi == NULL)
-		return (1);
-	kif->kf_un.kf_pipe.kf_pipe_addr = (uintptr_t)pi;
-	kif->kf_un.kf_pipe.kf_pipe_peer = (uintptr_t)pi->pipe_peer;
-	kif->kf_un.kf_pipe.kf_pipe_buffer_cnt = pi->pipe_buffer.cnt;
-	return (0);
-}
-
-static int
-fill_procdesc_info(struct procdesc *pdp, struct kinfo_file *kif)
-{
-
-	if (pdp == NULL)
-		return (1);
-	kif->kf_un.kf_proc.kf_pid = pdp->pd_pid;
-	return (0);
-}
-
-static int
-fill_sem_info(struct file *fp, struct kinfo_file *kif)
-{
-	struct thread *td;
-	struct stat sb;
-
-	td = curthread;
-	if (fp->f_data == NULL)
-		return (1);
-	if (fo_stat(fp, &sb, td->td_ucred, td) != 0)
-		return (1);
-	if (ksem_info == NULL)
-		return (1);
-	ksem_info(fp->f_data, kif->kf_path, sizeof(kif->kf_path),
-	    &kif->kf_un.kf_sem.kf_sem_value);
-	kif->kf_un.kf_sem.kf_sem_mode = sb.st_mode;
-	return (0);
-}
-
-static int
-fill_shm_info(struct file *fp, struct kinfo_file *kif)
-{
-	struct thread *td;
-	struct stat sb;
-
-	td = curthread;
-	if (fp->f_data == NULL)
-		return (1);
-	if (fo_stat(fp, &sb, td->td_ucred, td) != 0)
-		return (1);
-	shm_path(fp->f_data, kif->kf_path, sizeof(kif->kf_path));
-	kif->kf_un.kf_file.kf_file_mode = sb.st_mode;
-	kif->kf_un.kf_file.kf_file_size = sb.st_size;
-	return (0);
-}
-
 static SYSCTL_NODE(_kern_proc, KERN_PROC_FILEDESC, filedesc,
     CTLFLAG_RD|CTLFLAG_MPSAFE, sysctl_kern_proc_filedesc,
     "Process filedesc entries");
@@ -3929,6 +3600,13 @@ badfo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
 	return (EBADF);
 }
 
+static int
+badfo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+	return (0);
+}
+
 struct fileops badfileops = {
 	.fo_read = badfo_readwrite,
 	.fo_write = badfo_readwrite,
@@ -3941,8 +3619,17 @@ struct fileops badfileops = {
 	.fo_chmod = badfo_chmod,
 	.fo_chown = badfo_chown,
 	.fo_sendfile = badfo_sendfile,
+	.fo_fill_kinfo = badfo_fill_kinfo,
 };
 
+int
+invfo_rdwr(struct file *fp, struct uio *uio, struct ucred *active_cred,
+    int flags, struct thread *td)
+{
+
+	return (EOPNOTSUPP);
+}
+
 int
 invfo_truncate(struct file *fp, off_t length, struct ucred *active_cred,
     struct thread *td)
@@ -3951,6 +3638,29 @@ invfo_truncate(struct file *fp, off_t length, struct ucred *active_cred,
 	return (EINVAL);
 }
 
+int
+invfo_ioctl(struct file *fp, u_long com, void *data,
+    struct ucred *active_cred, struct thread *td)
+{
+
+	return (ENOTTY);
+}
+
+int
+invfo_poll(struct file *fp, int events, struct ucred *active_cred,
+    struct thread *td)
+{
+
+	return (poll_no_poll(events));
+}
+
+int
+invfo_kqfilter(struct file *fp, struct knote *kn)
+{
+
+	return (EINVAL);
+}
+
 int
 invfo_chmod(struct file *fp, mode_t mode, struct ucred *active_cred,
     struct thread *td)
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index fc256f120525..7488652c20de 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/taskqueue.h>
 #include <sys/uio.h>
+#include <sys/user.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
@@ -109,19 +110,17 @@ static void 	kqueue_wakeup(struct kqueue *kq);
 static struct filterops *kqueue_fo_find(int filt);
 static void	kqueue_fo_release(int filt);
 
-static fo_rdwr_t	kqueue_read;
-static fo_rdwr_t	kqueue_write;
-static fo_truncate_t	kqueue_truncate;
 static fo_ioctl_t	kqueue_ioctl;
 static fo_poll_t	kqueue_poll;
 static fo_kqfilter_t	kqueue_kqfilter;
 static fo_stat_t	kqueue_stat;
 static fo_close_t	kqueue_close;
+static fo_fill_kinfo_t	kqueue_fill_kinfo;
 
 static struct fileops kqueueops = {
-	.fo_read = kqueue_read,
-	.fo_write = kqueue_write,
-	.fo_truncate = kqueue_truncate,
+	.fo_read = invfo_rdwr,
+	.fo_write = invfo_rdwr,
+	.fo_truncate = invfo_truncate,
 	.fo_ioctl = kqueue_ioctl,
 	.fo_poll = kqueue_poll,
 	.fo_kqfilter = kqueue_kqfilter,
@@ -130,6 +129,7 @@ static struct fileops kqueueops = {
 	.fo_chmod = invfo_chmod,
 	.fo_chown = invfo_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = kqueue_fill_kinfo,
 };
 
 static int 	knote_attach(struct knote *kn, struct kqueue *kq);
@@ -1602,35 +1602,6 @@ kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops,
 	return (error);
 }
 
-/*
- * XXX
- * This could be expanded to call kqueue_scan, if desired.
- */
-/*ARGSUSED*/
-static int
-kqueue_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
-	int flags, struct thread *td)
-{
-	return (ENXIO);
-}
-
-/*ARGSUSED*/
-static int
-kqueue_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
-	 int flags, struct thread *td)
-{
-	return (ENXIO);
-}
-
-/*ARGSUSED*/
-static int
-kqueue_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-	struct thread *td)
-{
-
-	return (EINVAL);
-}
-
 /*ARGSUSED*/
 static int
 kqueue_ioctl(struct file *fp, u_long cmd, void *data,
@@ -1834,6 +1805,14 @@ kqueue_close(struct file *fp, struct thread *td)
 	return (0);
 }
 
+static int
+kqueue_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+	kif->kf_type = KF_TYPE_KQUEUE;
+	return (0);
+}
+
 static void
 kqueue_wakeup(struct kqueue *kq)
 {
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 8ef082162d95..fd1e21483e41 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -379,29 +379,10 @@ do_execve(td, args, mac_p)
 	/*
 	 * Initialize part of the common data
 	 */
+	bzero(imgp, sizeof(*imgp));
 	imgp->proc = p;
-	imgp->execlabel = NULL;
 	imgp->attr = &attr;
-	imgp->entry_addr = 0;
-	imgp->reloc_base = 0;
-	imgp->vmspace_destroyed = 0;
-	imgp->interpreted = 0;
-	imgp->opened = 0;
-	imgp->interpreter_name = NULL;
-	imgp->auxargs = NULL;
-	imgp->vp = NULL;
-	imgp->object = NULL;
-	imgp->firstpage = NULL;
-	imgp->ps_strings = 0;
-	imgp->auxarg_size = 0;
 	imgp->args = args;
-	imgp->execpath = imgp->freepath = NULL;
-	imgp->execpathp = 0;
-	imgp->canary = 0;
-	imgp->canarylen = 0;
-	imgp->pagesizes = 0;
-	imgp->pagesizeslen = 0;
-	imgp->stack_prot = 0;
 
 #ifdef MAC
 	error = mac_execve_enter(imgp, mac_p);
@@ -409,8 +390,6 @@ do_execve(td, args, mac_p)
 		goto exec_fail;
 #endif
 
-	imgp->image_header = NULL;
-
 	/*
 	 * Translate the file name. namei() returns a vnode pointer
 	 *	in ni_vp amoung other things.
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 25032f278c1d..6e9a4e8e48d2 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -249,7 +249,7 @@ intr_event_update(struct intr_event *ie)
 int
 intr_event_create(struct intr_event **event, void *source, int flags, int irq,
     void (*pre_ithread)(void *), void (*post_ithread)(void *),
-    void (*post_filter)(void *), int (*assign_cpu)(void *, u_char),
+    void (*post_filter)(void *), int (*assign_cpu)(void *, int),
     const char *fmt, ...)
 {
 	struct intr_event *ie;
@@ -292,7 +292,7 @@ intr_event_create(struct intr_event **event, void *source, int flags, int irq,
  * the interrupt event.
  */
 int
-intr_event_bind(struct intr_event *ie, u_char cpu)
+intr_event_bind(struct intr_event *ie, int cpu)
 {
 	lwpid_t id;
 	int error;
@@ -1078,7 +1078,7 @@ intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *it)
  * a PIC.
  */
 static int
-swi_assign_cpu(void *arg, u_char cpu)
+swi_assign_cpu(void *arg, int cpu)
 {
 
 	return (0);
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 47cd5687c653..f8ae0e6bfb00 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -1812,9 +1812,11 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags)
 
 #ifdef RACCT
 	if (!created) {
-		sx_sunlock(&allprison_lock);
+		if (!(flags & JAIL_ATTACH))
+			sx_sunlock(&allprison_lock);
 		prison_racct_modify(pr);
-		sx_slock(&allprison_lock);
+		if (!(flags & JAIL_ATTACH))
+			sx_slock(&allprison_lock);
 	}
 #endif
 
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index c39f14359bf9..9e29030fb6f0 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -717,6 +717,8 @@ kmeminit(void)
 	 * a given architecture.
 	 */
 	mem_size = vm_cnt.v_page_count;
+	if (mem_size <= 32768) /* delphij XXX 128MB */
+		kmem_zmax = PAGE_SIZE;
 
 	if (vm_kmem_size_scale < 1)
 		vm_kmem_size_scale = VM_KMEM_SIZE_SCALE;
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 00cc93298f30..7ab650949c8b 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -447,9 +447,9 @@ mb_dtor_mbuf(void *mem, int size, void *arg)
 	m = (struct mbuf *)mem;
 	flags = (unsigned long)arg;
 
+	KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
 	if ((m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags))
 		m_tag_delete_chain(m, NULL);
-	KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
 #ifdef INVARIANTS
 	trash_dtor(mem, size, arg);
 #endif
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index f8bc8009c32d..04b4e7936a1e 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -451,19 +451,6 @@ netisr_poll(void)
 	mtx_unlock(&poll_mtx);
 }
 
-/* The following should be temporary, till all drivers use the driver API */
-int
-ether_poll_register_drv(poll_handler_drv_t *h, if_t ifh)
-{
-	return (ether_poll_register((poll_handler_t *)h, (struct ifnet *)ifh));
-}
-
-int
-ether_poll_deregister_drv(if_t ifh)
-{
-	return (ether_poll_deregister((struct ifnet *)ifh));
-}
-
 /*
  * Try to register routine for polling. Returns 0 if successful
  * (and polling should be enabled), error code otherwise.
@@ -472,7 +459,7 @@ ether_poll_deregister_drv(if_t ifh)
  * This is called from within the *_ioctl() functions.
  */
 int
-ether_poll_register(poll_handler_t *h, struct ifnet *ifp)
+ether_poll_register(poll_handler_t *h, if_t ifp)
 {
 	int i;
 
@@ -519,7 +506,7 @@ ether_poll_register(poll_handler_t *h, struct ifnet *ifp)
  * Remove interface from the polling list. Called from *_ioctl(), too.
  */
 int
-ether_poll_deregister(struct ifnet *ifp)
+ether_poll_deregister(if_t ifp)
 {
 	int i;
 
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 37c538b64b73..02a8cf911e44 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -362,7 +362,7 @@ pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags)
 	if (sbt == 0)
 		sbt = tick_sbt;
 
-	if (cold) {
+	if (cold || kdb_active) {
 		/*
 		 * We delay one second at a time to avoid overflowing the
 		 * system specific DELAY() function(s):
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 0a63c01d8188..473e334e64a9 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -1037,6 +1037,14 @@ tdq_notify(struct tdq *tdq, struct thread *td)
 	ctd = pcpu_find(cpu)->pc_curthread;
 	if (!sched_shouldpreempt(pri, ctd->td_priority, 1))
 		return;
+
+	/*
+	 * Make sure that our caller's earlier update to tdq_load is
+	 * globally visible before we read tdq_cpu_idle.  Idle thread
+	 * accesses both of them without locks, and the order is important.
+	 */
+	mb();
+
 	if (TD_IS_IDLETHREAD(ctd)) {
 		/*
 		 * If the MD code has an idle wakeup routine try that before
@@ -2640,6 +2648,12 @@ sched_idletd(void *dummy)
 
 		/* Run main MD idle handler. */
 		tdq->tdq_cpu_idle = 1;
+		/*
+		 * Make sure that tdq_cpu_idle update is globally visible
+		 * before cpu_idle() read tdq_load.  The order is important
+		 * to avoid race with tdq_notify.
+		 */
+		mb();
 		cpu_idle(switchcnt * 4 > sched_idlespinthresh);
 		tdq->tdq_cpu_idle = 0;
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 7e2e5fb7e998..974c54039962 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -135,6 +135,7 @@ struct device {
 #define	DF_DONENOMATCH	0x20		/* don't execute DEVICE_NOMATCH again */
 #define	DF_EXTERNALSOFTC 0x40		/* softc not allocated by us */
 #define	DF_REBID	0x80		/* Can rebid after attach */
+#define	DF_SUSPENDED	0x100		/* Device is suspended. */
 	u_int	order;			/**< order from device_add_child_ordered() */
 	void	*ivars;			/**< instance variables  */
 	void	*softc;			/**< current driver's variables  */
@@ -3301,7 +3302,10 @@ resource_list_alloc(struct resource_list *rl, device_t bus, device_t child,
 			rle->flags |= RLE_ALLOCATED;
 			return (rle->res);
 		}
-		panic("resource_list_alloc: resource entry is busy");
+		device_printf(bus,
+		    "resource entry %#x type %d for child %s is busy\n", *rid,
+		    type, device_get_nameunit(child));
+		return (NULL);
 	}
 
 	if (isdefault) {
@@ -3630,6 +3634,39 @@ bus_generic_shutdown(device_t dev)
 	return (0);
 }
 
+/**
+ * @brief Default function for suspending a child device.
+ *
+ * This function is to be used by a bus's DEVICE_SUSPEND_CHILD().
+ */
+int
+bus_generic_suspend_child(device_t dev, device_t child)
+{
+	int	error;
+
+	error = DEVICE_SUSPEND(child);
+
+	if (error == 0)
+		dev->flags |= DF_SUSPENDED;
+
+	return (error);
+}
+
+/**
+ * @brief Default function for resuming a child device.
+ *
+ * This function is to be used by a bus's DEVICE_RESUME_CHILD().
+ */
+int
+bus_generic_resume_child(device_t dev, device_t child)
+{
+
+	DEVICE_RESUME(child);
+	dev->flags &= ~DF_SUSPENDED;
+
+	return (0);
+}
+
 /**
  * @brief Helper function for implementing DEVICE_SUSPEND()
  *
@@ -3646,12 +3683,12 @@ bus_generic_suspend(device_t dev)
 	device_t	child, child2;
 
 	TAILQ_FOREACH(child, &dev->children, link) {
-		error = DEVICE_SUSPEND(child);
+		error = BUS_SUSPEND_CHILD(dev, child);
 		if (error) {
 			for (child2 = TAILQ_FIRST(&dev->children);
 			     child2 && child2 != child;
 			     child2 = TAILQ_NEXT(child2, link))
-				DEVICE_RESUME(child2);
+				BUS_RESUME_CHILD(dev, child2);
 			return (error);
 		}
 	}
@@ -3670,7 +3707,7 @@ bus_generic_resume(device_t dev)
 	device_t	child;
 
 	TAILQ_FOREACH(child, &dev->children, link) {
-		DEVICE_RESUME(child);
+		BUS_RESUME_CHILD(dev, child);
 		/* if resume fails, there's nothing we can usefully do... */
 	}
 	return (0);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 01cfeb9c1ffd..b39c4fe2e247 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -115,6 +115,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/uio.h>
+#include <sys/user.h>
 #include <sys/event.h>
 
 #include <security/mac/mac_framework.h>
@@ -152,6 +153,7 @@ static fo_stat_t	pipe_stat;
 static fo_close_t	pipe_close;
 static fo_chmod_t	pipe_chmod;
 static fo_chown_t	pipe_chown;
+static fo_fill_kinfo_t	pipe_fill_kinfo;
 
 struct fileops pipeops = {
 	.fo_read = pipe_read,
@@ -165,6 +167,7 @@ struct fileops pipeops = {
 	.fo_chmod = pipe_chmod,
 	.fo_chown = pipe_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = pipe_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE
 };
 
@@ -1324,11 +1327,15 @@ pipe_truncate(fp, length, active_cred, td)
 	struct ucred *active_cred;
 	struct thread *td;
 {
+	struct pipe *cpipe;
+	int error;
 
-	/* For named pipes call the vnode operation. */
-	if (fp->f_vnode != NULL)
-		return (vnops.fo_truncate(fp, length, active_cred, td));
-	return (EINVAL);
+	cpipe = fp->f_data;
+	if (cpipe->pipe_state & PIPE_NAMED)
+		error = vnops.fo_truncate(fp, length, active_cred, td);
+	else
+		error = invfo_truncate(fp, length, active_cred, td);
+	return (error);
 }
 
 /*
@@ -1603,6 +1610,21 @@ pipe_chown(fp, uid, gid, active_cred, td)
 	return (error);
 }
 
+static int
+pipe_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+	struct pipe *pi;
+
+	if (fp->f_type == DTYPE_FIFO)
+		return (vn_fill_kinfo(fp, kif, fdp));
+	kif->kf_type = KF_TYPE_PIPE;
+	pi = fp->f_data;
+	kif->kf_un.kf_pipe.kf_pipe_addr = (uintptr_t)pi;
+	kif->kf_un.kf_pipe.kf_pipe_peer = (uintptr_t)pi->pipe_peer;
+	kif->kf_un.kf_pipe.kf_pipe_buffer_cnt = pi->pipe_buffer.cnt;
+	return (0);
+}
+
 static void
 pipe_free_kmem(cpipe)
 	struct pipe *cpipe;
diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c
index 1039dac6e2a8..948595f8751e 100644
--- a/sys/kern/sys_procdesc.c
+++ b/sys/kern/sys_procdesc.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/ucred.h>
+#include <sys/user.h>
 
 #include <security/audit/audit.h>
 
@@ -87,29 +88,25 @@ FEATURE(process_descriptors, "Process Descriptors");
 
 static uma_zone_t procdesc_zone;
 
-static fo_rdwr_t	procdesc_read;
-static fo_rdwr_t	procdesc_write;
-static fo_truncate_t	procdesc_truncate;
-static fo_ioctl_t	procdesc_ioctl;
 static fo_poll_t	procdesc_poll;
 static fo_kqfilter_t	procdesc_kqfilter;
 static fo_stat_t	procdesc_stat;
 static fo_close_t	procdesc_close;
-static fo_chmod_t	procdesc_chmod;
-static fo_chown_t	procdesc_chown;
+static fo_fill_kinfo_t	procdesc_fill_kinfo;
 
 static struct fileops procdesc_ops = {
-	.fo_read = procdesc_read,
-	.fo_write = procdesc_write,
-	.fo_truncate = procdesc_truncate,
-	.fo_ioctl = procdesc_ioctl,
+	.fo_read = invfo_rdwr,
+	.fo_write = invfo_rdwr,
+	.fo_truncate = invfo_truncate,
+	.fo_ioctl = invfo_ioctl,
 	.fo_poll = procdesc_poll,
 	.fo_kqfilter = procdesc_kqfilter,
 	.fo_stat = procdesc_stat,
 	.fo_close = procdesc_close,
-	.fo_chmod = procdesc_chmod,
-	.fo_chown = procdesc_chown,
+	.fo_chmod = invfo_chmod,
+	.fo_chown = invfo_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = procdesc_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE,
 };
 
@@ -412,38 +409,6 @@ procdesc_close(struct file *fp, struct thread *td)
 	return (0);
 }
 
-static int
-procdesc_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-procdesc_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-procdesc_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-procdesc_ioctl(struct file *fp, u_long com, void *data,
-    struct ucred *active_cred, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
 static int
 procdesc_poll(struct file *fp, int events, struct ucred *active_cred,
     struct thread *td)
@@ -570,17 +535,13 @@ procdesc_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
 }
 
 static int
-procdesc_chmod(struct file *fp, mode_t mode, struct ucred *active_cred,
-    struct thread *td)
+procdesc_fill_kinfo(struct file *fp, struct kinfo_file *kif,
+    struct filedesc *fdp)
 {
+	struct procdesc *pdp;
 
-	return (EOPNOTSUPP);
-}
-
-static int
-procdesc_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EOPNOTSUPP);
+	kif->kf_type = KF_TYPE_PROCDESC;
+	pdp = fp->f_data;
+	kif->kf_un.kf_proc.kf_pid = pdp->pd_pid;
+	return (0);
 }
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index b30e12a5ac63..d97b5834a15f 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1240,7 +1240,7 @@ protect_setchild(struct thread *td, struct proc *p, int flags)
 {
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (p->p_flag & P_SYSTEM || p_cansee(td, p) != 0)
+	if (p->p_flag & P_SYSTEM || p_cansched(td, p) != 0)
 		return (0);
 	if (flags & PPROT_SET) {
 		p->p_flag |= P_PROTECTED;
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 4af12e0be1e7..47cedfeab4b8 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -34,8 +34,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/domain.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
+#include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/sigio.h>
@@ -48,12 +50,18 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/ucred.h>
+#include <sys/un.h>
+#include <sys/unpcb.h>
+#include <sys/user.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
+#include <netinet/in.h>
+#include <netinet/in_pcb.h>
+
 #include <security/mac/mac_framework.h>
 
 static fo_rdwr_t soo_read;
@@ -63,6 +71,7 @@ static fo_poll_t soo_poll;
 extern fo_kqfilter_t soo_kqfilter;
 static fo_stat_t soo_stat;
 static fo_close_t soo_close;
+static fo_fill_kinfo_t soo_fill_kinfo;
 
 struct fileops	socketops = {
 	.fo_read = soo_read,
@@ -76,6 +85,7 @@ struct fileops	socketops = {
 	.fo_chmod = invfo_chmod,
 	.fo_chown = invfo_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = soo_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE
 };
 
@@ -293,3 +303,58 @@ soo_close(struct file *fp, struct thread *td)
 		error = soclose(so);
 	return (error);
 }
+
+static int
+soo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+	struct sockaddr *sa;
+	struct inpcb *inpcb;
+	struct unpcb *unpcb;
+	struct socket *so;
+	int error;
+
+	kif->kf_type = KF_TYPE_SOCKET;
+	so = fp->f_data;
+	kif->kf_sock_domain = so->so_proto->pr_domain->dom_family;
+	kif->kf_sock_type = so->so_type;
+	kif->kf_sock_protocol = so->so_proto->pr_protocol;
+	kif->kf_un.kf_sock.kf_sock_pcb = (uintptr_t)so->so_pcb;
+	switch (kif->kf_sock_domain) {
+	case AF_INET:
+	case AF_INET6:
+		if (kif->kf_sock_protocol == IPPROTO_TCP) {
+			if (so->so_pcb != NULL) {
+				inpcb = (struct inpcb *)(so->so_pcb);
+				kif->kf_un.kf_sock.kf_sock_inpcb =
+				    (uintptr_t)inpcb->inp_ppcb;
+			}
+		}
+		break;
+	case AF_UNIX:
+		if (so->so_pcb != NULL) {
+			unpcb = (struct unpcb *)(so->so_pcb);
+			if (unpcb->unp_conn) {
+				kif->kf_un.kf_sock.kf_sock_unpconn =
+				    (uintptr_t)unpcb->unp_conn;
+				kif->kf_un.kf_sock.kf_sock_rcv_sb_state =
+				    so->so_rcv.sb_state;
+				kif->kf_un.kf_sock.kf_sock_snd_sb_state =
+				    so->so_snd.sb_state;
+			}
+		}
+		break;
+	}
+	error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa);
+	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_local)) {
+		bcopy(sa, &kif->kf_sa_local, sa->sa_len);
+		free(sa, M_SONAME);
+	}
+	error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
+	if (error == 0 && sa->sa_len <= sizeof(kif->kf_sa_peer)) {
+		bcopy(sa, &kif->kf_sa_peer, sa->sa_len);
+		free(sa, M_SONAME);
+	}
+	strncpy(kif->kf_path, so->so_proto->pr_domain->dom_name,
+	    sizeof(kif->kf_path));
+	return (0);	
+}
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index e918d1cfd187..e2a0fa3582a3 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1055,13 +1055,13 @@ tty_rel_free(struct tty *tp)
 	tp->t_dev = NULL;
 	tty_unlock(tp);
 
-	sx_xlock(&tty_list_sx);
-	TAILQ_REMOVE(&tty_list, tp, t_list);
-	tty_list_count--;
-	sx_xunlock(&tty_list_sx);
-
-	if (dev != NULL)
+	if (dev != NULL) {
+		sx_xlock(&tty_list_sx);
+		TAILQ_REMOVE(&tty_list, tp, t_list);
+		tty_list_count--;
+		sx_xunlock(&tty_list_sx);
 		destroy_dev_sched_cb(dev, tty_dealloc, tp);
+	}
 }
 
 void
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index 8d2ac0324b35..58cbc526d273 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/tty.h>
 #include <sys/ttycom.h>
+#include <sys/user.h>
 
 #include <machine/stdarg.h>
 
@@ -252,14 +253,6 @@ done:	ttydisc_rint_done(tp);
 	return (error);
 }
 
-static int
-ptsdev_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EINVAL);
-}
-
 static int
 ptsdev_ioctl(struct file *fp, u_long cmd, void *data,
     struct ucred *active_cred, struct thread *td)
@@ -588,10 +581,22 @@ ptsdev_close(struct file *fp, struct thread *td)
 	return (0);
 }
 
+static int
+ptsdev_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+	struct tty *tp;
+
+	kif->kf_type = KF_TYPE_PTS;
+	tp = fp->f_data;
+	kif->kf_un.kf_pts.kf_pts_dev = tty_udev(tp);
+	strlcpy(kif->kf_path, tty_devname(tp), sizeof(kif->kf_path));
+	return (0);
+}
+
 static struct fileops ptsdev_ops = {
 	.fo_read	= ptsdev_read,
 	.fo_write	= ptsdev_write,
-	.fo_truncate	= ptsdev_truncate,
+	.fo_truncate	= invfo_truncate,
 	.fo_ioctl	= ptsdev_ioctl,
 	.fo_poll	= ptsdev_poll,
 	.fo_kqfilter	= ptsdev_kqfilter,
@@ -600,6 +605,7 @@ static struct fileops ptsdev_ops = {
 	.fo_chmod	= invfo_chmod,
 	.fo_chown	= invfo_chown,
 	.fo_sendfile	= invfo_sendfile,
+	.fo_fill_kinfo	= ptsdev_fill_kinfo,
 	.fo_flags	= DFLAG_PASSABLE,
 };
 
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 8ddf356488af..154c1e76613d 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <sys/unistd.h>
+#include <sys/user.h>
 #include <sys/vnode.h>
 #include <machine/atomic.h>
 
@@ -2417,35 +2418,6 @@ mq_proc_exit(void *arg __unused, struct proc *p)
 	KASSERT(LIST_EMPTY(&p->p_mqnotifier), ("mq notifiers left"));
 }
 
-static int
-mqf_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
-	int flags, struct thread *td)
-{
-	return (EOPNOTSUPP);
-}
-
-static int
-mqf_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
-	int flags, struct thread *td)
-{
-	return (EOPNOTSUPP);
-}
-
-static int
-mqf_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EINVAL);
-}
-
-static int
-mqf_ioctl(struct file *fp, u_long cmd, void *data,
-	struct ucred *active_cred, struct thread *td)
-{
-	return (ENOTTY);
-}
-
 static int
 mqf_poll(struct file *fp, int events, struct ucred *active_cred,
 	struct thread *td)
@@ -2600,18 +2572,27 @@ filt_mqwrite(struct knote *kn, long hint)
 	return (mq->mq_curmsgs < mq->mq_maxmsg);
 }
 
+static int
+mqf_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+	kif->kf_type = KF_TYPE_MQUEUE;
+	return (0);
+}
+
 static struct fileops mqueueops = {
-	.fo_read		= mqf_read,
-	.fo_write		= mqf_write,
-	.fo_truncate		= mqf_truncate,
-	.fo_ioctl		= mqf_ioctl,
+	.fo_read		= invfo_rdwr,
+	.fo_write		= invfo_rdwr,
+	.fo_truncate		= invfo_truncate,
+	.fo_ioctl		= invfo_ioctl,
 	.fo_poll		= mqf_poll,
 	.fo_kqfilter		= mqf_kqfilter,
 	.fo_stat		= mqf_stat,
+	.fo_close		= mqf_close,
 	.fo_chmod		= mqf_chmod,
 	.fo_chown		= mqf_chown,
-	.fo_close		= mqf_close,
 	.fo_sendfile		= invfo_sendfile,
+	.fo_fill_kinfo		= mqf_fill_kinfo,
 };
 
 static struct vop_vector mqfs_vnodeops = {
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index b957d9bf49dc..63b1cec0e036 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/sx.h>
+#include <sys/user.h>
 #include <sys/vnode.h>
 
 #include <security/mac/mac_framework.h>
@@ -126,82 +127,31 @@ static int	ksem_module_init(void);
 static int	ksem_remove(char *path, Fnv32_t fnv, struct ucred *ucred);
 static int	sem_modload(struct module *module, int cmd, void *arg);
 
-static fo_rdwr_t	ksem_read;
-static fo_rdwr_t	ksem_write;
-static fo_truncate_t	ksem_truncate;
-static fo_ioctl_t	ksem_ioctl;
-static fo_poll_t	ksem_poll;
-static fo_kqfilter_t	ksem_kqfilter;
 static fo_stat_t	ksem_stat;
 static fo_close_t	ksem_closef;
 static fo_chmod_t	ksem_chmod;
 static fo_chown_t	ksem_chown;
+static fo_fill_kinfo_t	ksem_fill_kinfo;
 
 /* File descriptor operations. */
 static struct fileops ksem_ops = {
-	.fo_read = ksem_read,
-	.fo_write = ksem_write,
-	.fo_truncate = ksem_truncate,
-	.fo_ioctl = ksem_ioctl,
-	.fo_poll = ksem_poll,
-	.fo_kqfilter = ksem_kqfilter,
+	.fo_read = invfo_rdwr,
+	.fo_write = invfo_rdwr,
+	.fo_truncate = invfo_truncate,
+	.fo_ioctl = invfo_ioctl,
+	.fo_poll = invfo_poll,
+	.fo_kqfilter = invfo_kqfilter,
 	.fo_stat = ksem_stat,
 	.fo_close = ksem_closef,
 	.fo_chmod = ksem_chmod,
 	.fo_chown = ksem_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = ksem_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE
 };
 
 FEATURE(posix_sem, "POSIX semaphores");
 
-static int
-ksem_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-ksem_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-ksem_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EINVAL);
-}
-
-static int
-ksem_ioctl(struct file *fp, u_long com, void *data,
-    struct ucred *active_cred, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-ksem_poll(struct file *fp, int events, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-ksem_kqfilter(struct file *fp, struct knote *kn)
-{
-
-	return (EOPNOTSUPP);
-}
-
 static int
 ksem_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
     struct thread *td)
@@ -305,6 +255,26 @@ ksem_closef(struct file *fp, struct thread *td)
 	return (0);
 }
 
+static int
+ksem_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+	struct ksem *ks;
+
+	kif->kf_type = KF_TYPE_SEM;
+	ks = fp->f_data;
+	mtx_lock(&sem_lock);
+	kif->kf_un.kf_sem.kf_sem_value = ks->ks_value;
+	kif->kf_un.kf_sem.kf_sem_mode = S_IFREG | ks->ks_mode;	/* XXX */
+	mtx_unlock(&sem_lock);
+	if (ks->ks_path != NULL) {
+		sx_slock(&ksem_dict_lock);
+		if (ks->ks_path != NULL)
+			strlcpy(kif->kf_path, ks->ks_path, sizeof(kif->kf_path));
+		sx_sunlock(&ksem_dict_lock);
+	}
+	return (0);
+}
+
 /*
  * ksem object management including creation and reference counting
  * routines.
@@ -441,20 +411,6 @@ ksem_remove(char *path, Fnv32_t fnv, struct ucred *ucred)
 	return (ENOENT);
 }
 
-static void
-ksem_info_impl(struct ksem *ks, char *path, size_t size, uint32_t *value)
-{
-
-	if (ks->ks_path == NULL)
-		return;
-	sx_slock(&ksem_dict_lock);
-	if (ks->ks_path != NULL)
-		strlcpy(path, ks->ks_path, size);
-	if (value != NULL)
-		*value = ks->ks_value;
-	sx_sunlock(&ksem_dict_lock);
-}
-
 static int
 ksem_create_copyout_semid(struct thread *td, semid_t *semidp, int fd,
     int compat32)
@@ -1036,7 +992,6 @@ ksem_module_init(void)
 	p31b_setcfg(CTL_P1003_1B_SEMAPHORES, 200112L);
 	p31b_setcfg(CTL_P1003_1B_SEM_NSEMS_MAX, SEM_MAX);
 	p31b_setcfg(CTL_P1003_1B_SEM_VALUE_MAX, SEM_VALUE_MAX);
-	ksem_info = ksem_info_impl;
 
 	error = syscall_helper_register(ksem_syscalls);
 	if (error)
@@ -1058,7 +1013,6 @@ ksem_module_destroy(void)
 #endif
 	syscall_helper_unregister(ksem_syscalls);
 
-	ksem_info = NULL;
 	p31b_setcfg(CTL_P1003_1B_SEMAPHORES, 0);
 	hashdestroy(ksem_dictionary, M_KSEM, ksem_hash);
 	sx_destroy(&ksem_dict_lock);
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index 435b8e10be23..7829620a7be6 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/unistd.h>
+#include <sys/user.h>
 
 #include <security/mac/mac_framework.h>
 
@@ -120,29 +121,28 @@ static int	shm_dotruncate(struct shmfd *shmfd, off_t length);
 static fo_rdwr_t	shm_read;
 static fo_rdwr_t	shm_write;
 static fo_truncate_t	shm_truncate;
-static fo_ioctl_t	shm_ioctl;
-static fo_poll_t	shm_poll;
-static fo_kqfilter_t	shm_kqfilter;
 static fo_stat_t	shm_stat;
 static fo_close_t	shm_close;
 static fo_chmod_t	shm_chmod;
 static fo_chown_t	shm_chown;
 static fo_seek_t	shm_seek;
+static fo_fill_kinfo_t	shm_fill_kinfo;
 
 /* File descriptor operations. */
 static struct fileops shm_ops = {
 	.fo_read = shm_read,
 	.fo_write = shm_write,
 	.fo_truncate = shm_truncate,
-	.fo_ioctl = shm_ioctl,
-	.fo_poll = shm_poll,
-	.fo_kqfilter = shm_kqfilter,
+	.fo_ioctl = invfo_ioctl,
+	.fo_poll = invfo_poll,
+	.fo_kqfilter = invfo_kqfilter,
 	.fo_stat = shm_stat,
 	.fo_close = shm_close,
 	.fo_chmod = shm_chmod,
 	.fo_chown = shm_chown,
 	.fo_sendfile = vn_sendfile,
 	.fo_seek = shm_seek,
+	.fo_fill_kinfo = shm_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE
 };
 
@@ -354,29 +354,6 @@ shm_truncate(struct file *fp, off_t length, struct ucred *active_cred,
 	return (shm_dotruncate(shmfd, length));
 }
 
-static int
-shm_ioctl(struct file *fp, u_long com, void *data,
-    struct ucred *active_cred, struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-shm_poll(struct file *fp, int events, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return (EOPNOTSUPP);
-}
-
-static int
-shm_kqfilter(struct file *fp, struct knote *kn)
-{
-
-	return (EOPNOTSUPP);
-}
-
 static int
 shm_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
     struct thread *td)
@@ -1048,14 +1025,24 @@ shm_unmap(struct file *fp, void *mem, size_t size)
 	return (0);
 }
 
-void
-shm_path(struct shmfd *shmfd, char *path, size_t size)
+static int
+shm_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
 {
+	struct shmfd *shmfd;
 
-	if (shmfd->shm_path == NULL)
-		return;
-	sx_slock(&shm_dict_lock);
-	if (shmfd->shm_path != NULL)
-		strlcpy(path, shmfd->shm_path, size);
-	sx_sunlock(&shm_dict_lock);
+	kif->kf_type = KF_TYPE_SHM;
+	shmfd = fp->f_data;
+
+	mtx_lock(&shm_timestamp_lock);
+	kif->kf_un.kf_file.kf_file_mode = S_IFREG | shmfd->shm_mode;	/* XXX */
+	mtx_unlock(&shm_timestamp_lock);
+	kif->kf_un.kf_file.kf_file_size = shmfd->shm_size;
+	if (shmfd->shm_path != NULL) {
+		sx_slock(&shm_dict_lock);
+		if (shmfd->shm_path != NULL)
+			strlcpy(kif->kf_path, shmfd->shm_path,
+			    sizeof(kif->kf_path));
+		sx_sunlock(&shm_dict_lock);
+	}
+	return (0);
 }
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 258208959801..c74343b8f812 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -1014,6 +1014,37 @@ sbsndptr(struct sockbuf *sb, u_int off, u_int len, u_int *moff)
 	return (ret);
 }
 
+/*
+ * Return the first mbuf and the mbuf data offset for the provided
+ * send offset without changing the "sb_sndptroff" field.
+ */
+struct mbuf *
+sbsndmbuf(struct sockbuf *sb, u_int off, u_int *moff)
+{
+	struct mbuf *m;
+
+	KASSERT(sb->sb_mb != NULL, ("%s: sb_mb is NULL", __func__));
+
+	/*
+	 * If the "off" is below the stored offset, which happens on
+	 * retransmits, just use "sb_mb":
+	 */
+	if (sb->sb_sndptr == NULL || sb->sb_sndptroff > off) {
+		m = sb->sb_mb;
+	} else {
+		m = sb->sb_sndptr;
+		off -= sb->sb_sndptroff;
+	}
+	while (off > 0 && m != NULL) {
+		if (off < m->m_len)
+			break;
+		off -= m->m_len;
+		m = m->m_next;
+	}
+	*moff = off;
+	return (m);
+}
+
 /*
  * Drop a record off the front of a sockbuf and move the next record to the
  * front.
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9b12bd7c467d..706632716b1f 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -391,26 +391,25 @@ soalloc(struct vnet *vnet)
 	sx_init(&so->so_snd.sb_sx, "so_snd_sx");
 	sx_init(&so->so_rcv.sb_sx, "so_rcv_sx");
 	TAILQ_INIT(&so->so_aiojobq);
+#ifdef VIMAGE
+	VNET_ASSERT(vnet != NULL, ("%s:%d vnet is NULL, so=%p",
+	    __func__, __LINE__, so));
+	so->so_vnet = vnet;
+#endif
+	/* We shouldn't need the so_global_mtx */
+	if (hhook_run_socket(so, NULL, HHOOK_SOCKET_CREATE)) {
+		/* Do we need more comprehensive error returns? */
+		uma_zfree(socket_zone, so);
+		return (NULL);
+	}
 	mtx_lock(&so_global_mtx);
 	so->so_gencnt = ++so_gencnt;
 	++numopensockets;
 #ifdef VIMAGE
-	VNET_ASSERT(vnet != NULL, ("%s:%d vnet is NULL, so=%p",
-	    __func__, __LINE__, so));
 	vnet->vnet_sockcnt++;
-	so->so_vnet = vnet;
 #endif
 	mtx_unlock(&so_global_mtx);
 
-	CURVNET_SET(vnet);
-	/* We shouldn't need the so_global_mtx */
-	if (V_socket_hhh[HHOOK_SOCKET_CREATE]->hhh_nhooks > 0) {
-		if (hhook_run_socket(so, NULL, HHOOK_SOCKET_CREATE))
-			/* Do we need more comprehensive error returns? */
-			so = NULL;
-	}
-	CURVNET_RESTORE();
-
 	return (so);
 }
 
@@ -447,10 +446,7 @@ sodealloc(struct socket *so)
 #ifdef MAC
 	mac_socket_destroy(so);
 #endif
-	CURVNET_SET(so->so_vnet);
-	if (V_socket_hhh[HHOOK_SOCKET_CLOSE]->hhh_nhooks > 0)
-		hhook_run_socket(so, NULL, HHOOK_SOCKET_CLOSE);
-	CURVNET_RESTORE();
+	hhook_run_socket(so, NULL, HHOOK_SOCKET_CLOSE);
 
 	crfree(so->so_cred);
 	khelp_destroy_osd(&so->osd);
@@ -2406,10 +2402,13 @@ hhook_run_socket(struct socket *so, void *hctx, int32_t h_id)
 	struct socket_hhook_data hhook_data = {
 		.so = so,
 		.hctx = hctx,
-		.m = NULL
+		.m = NULL,
+		.status = 0
 	};
 
-	hhook_run_hooks(V_socket_hhh[h_id], &hhook_data, &so->osd);
+	CURVNET_SET(so->so_vnet);
+	HHOOKS_RUN_IF(V_socket_hhh[h_id], &hhook_data, &so->osd);
+	CURVNET_RESTORE();
 
 	/* Ugly but needed, since hhooks return void for now */
 	return (hhook_data.status);
@@ -3265,11 +3264,8 @@ filt_soread(struct knote *kn, long hint)
 			return 1;
 	}
 
-	if (V_socket_hhh[HHOOK_FILT_SOREAD]->hhh_nhooks > 0)
-		/* This hook returning non-zero indicates an event, not error */
-		return (hhook_run_socket(so, NULL, HHOOK_FILT_SOREAD));
-	
-	return (0);
+	/* This hook returning non-zero indicates an event, not error */
+	return (hhook_run_socket(so, NULL, HHOOK_FILT_SOREAD));
 }
 
 static void
@@ -3294,8 +3290,7 @@ filt_sowrite(struct knote *kn, long hint)
 	SOCKBUF_LOCK_ASSERT(&so->so_snd);
 	kn->kn_data = sbspace(&so->so_snd);
 
-	if (V_socket_hhh[HHOOK_FILT_SOWRITE]->hhh_nhooks > 0)
-		hhook_run_socket(so, kn, HHOOK_FILT_SOWRITE);
+	hhook_run_socket(so, kn, HHOOK_FILT_SOWRITE);
 
 	if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
 		kn->kn_flags |= EV_EOF;
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 2c011173d2ab..439d06e6eb9d 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -721,7 +721,6 @@ vop_stdgetpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
@@ -744,7 +743,6 @@ vop_stdputpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 9289e6a3524a..8d2e07e84103 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1863,8 +1863,15 @@ sched_sync(void)
 				continue;
 			}
 
-			if (first_printf == 0)
+			if (first_printf == 0) {
+				/*
+				 * Drop the sync mutex, because some watchdog
+				 * drivers need to sleep while patting
+				 */
+				mtx_unlock(&sync_mtx);
 				wdog_kern_pat(WD_LASTVAL);
+				mtx_lock(&sync_mtx);
+			}
 
 		}
 		if (syncer_state == SYNCER_FINAL_DELAY && syncer_final_iter > 0)
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 1406e0f8bc5f..976da4ed1475 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1551,10 +1551,10 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2,
 	cap_rights_t rights;
 	int error;
 
+again:
 	bwillwrite();
 	NDINIT_AT(&nd, LOOKUP, follow | AUDITVNODE1, segflg, path1, fd1, td);
 
-again:
 	if ((error = namei(&nd)) != 0)
 		return (error);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -1563,50 +1563,65 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2,
 		vrele(vp);
 		return (EPERM);		/* POSIX */
 	}
-	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) {
-		vrele(vp);
-		return (error);
-	}
 	NDINIT_ATRIGHTS(&nd, CREATE, LOCKPARENT | SAVENAME | AUDITVNODE2,
 	    segflg, path2, fd2, cap_rights_init(&rights, CAP_LINKAT), td);
 	if ((error = namei(&nd)) == 0) {
 		if (nd.ni_vp != NULL) {
+			NDFREE(&nd, NDF_ONLY_PNBUF);
 			if (nd.ni_dvp == nd.ni_vp)
 				vrele(nd.ni_dvp);
 			else
 				vput(nd.ni_dvp);
 			vrele(nd.ni_vp);
-			error = EEXIST;
-		} else if ((error = vn_lock(vp, LK_EXCLUSIVE)) == 0) {
+			vrele(vp);
+			return (EEXIST);
+		} else if (nd.ni_dvp->v_mount != vp->v_mount) {
 			/*
-			 * Check for cross-device links.  No need to
-			 * recheck vp->v_type, since it cannot change
-			 * for non-doomed vnode.
+			 * Cross-device link.  No need to recheck
+			 * vp->v_type, since it cannot change, except
+			 * to VBAD.
 			 */
-			if (nd.ni_dvp->v_mount != vp->v_mount)
-				error = EXDEV;
-			else
-				error = can_hardlink(vp, td->td_ucred);
-			if (error == 0)
+			NDFREE(&nd, NDF_ONLY_PNBUF);
+			vput(nd.ni_dvp);
+			vrele(vp);
+			return (EXDEV);
+		} else if ((error = vn_lock(vp, LK_EXCLUSIVE)) == 0) {
+			error = can_hardlink(vp, td->td_ucred);
 #ifdef MAC
+			if (error == 0)
 				error = mac_vnode_check_link(td->td_ucred,
 				    nd.ni_dvp, vp, &nd.ni_cnd);
-			if (error == 0)
 #endif
-				error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
+			if (error != 0) {
+				vput(vp);
+				vput(nd.ni_dvp);
+				NDFREE(&nd, NDF_ONLY_PNBUF);
+				return (error);
+			}
+			error = vn_start_write(vp, &mp, V_NOWAIT);
+			if (error != 0) {
+				vput(vp);
+				vput(nd.ni_dvp);
+				NDFREE(&nd, NDF_ONLY_PNBUF);
+				error = vn_start_write(NULL, &mp,
+				    V_XSLEEP | PCATCH);
+				if (error != 0)
+					return (error);
+				goto again;
+			}
+			error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
 			VOP_UNLOCK(vp, 0);
 			vput(nd.ni_dvp);
+			vn_finished_write(mp);
+			NDFREE(&nd, NDF_ONLY_PNBUF);
 		} else {
 			vput(nd.ni_dvp);
 			NDFREE(&nd, NDF_ONLY_PNBUF);
 			vrele(vp);
-			vn_finished_write(mp);
 			goto again;
 		}
-		NDFREE(&nd, NDF_ONLY_PNBUF);
 	}
 	vrele(vp);
-	vn_finished_write(mp);
 	return (error);
 }
 
@@ -2055,6 +2070,9 @@ kern_accessat(struct thread *td, int fd, char *path, enum uio_seg pathseg,
 	cap_rights_t rights;
 	int error;
 
+	if (amode != F_OK && (amode & ~(R_OK | W_OK | X_OK)) != 0)
+		return (EINVAL);
+
 	/*
 	 * Create and modify a temporary credential instead of one that
 	 * is potentially shared.
@@ -3516,6 +3534,7 @@ kern_renameat(struct thread *td, int oldfd, char *old, int newfd, char *new,
 	cap_rights_t rights;
 	int error;
 
+again:
 	bwillwrite();
 #ifdef MAC
 	NDINIT_ATRIGHTS(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART |
@@ -3536,14 +3555,6 @@ kern_renameat(struct thread *td, int oldfd, char *old, int newfd, char *new,
 		VOP_UNLOCK(fromnd.ni_vp, 0);
 #endif
 	fvp = fromnd.ni_vp;
-	if (error == 0)
-		error = vn_start_write(fvp, &mp, V_WAIT | PCATCH);
-	if (error != 0) {
-		NDFREE(&fromnd, NDF_ONLY_PNBUF);
-		vrele(fromnd.ni_dvp);
-		vrele(fvp);
-		goto out1;
-	}
 	NDINIT_ATRIGHTS(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE |
 	    SAVESTART | AUDITVNODE2, pathseg, new, newfd,
 	    cap_rights_init(&rights, CAP_LINKAT), td);
@@ -3556,11 +3567,30 @@ kern_renameat(struct thread *td, int oldfd, char *old, int newfd, char *new,
 		NDFREE(&fromnd, NDF_ONLY_PNBUF);
 		vrele(fromnd.ni_dvp);
 		vrele(fvp);
-		vn_finished_write(mp);
 		goto out1;
 	}
 	tdvp = tond.ni_dvp;
 	tvp = tond.ni_vp;
+	error = vn_start_write(fvp, &mp, V_NOWAIT);
+	if (error != 0) {
+		NDFREE(&fromnd, NDF_ONLY_PNBUF);
+		NDFREE(&tond, NDF_ONLY_PNBUF);
+		if (tvp != NULL)
+			vput(tvp);
+		if (tdvp == tvp)
+			vrele(tdvp);
+		else
+			vput(tdvp);
+		vrele(fromnd.ni_dvp);
+		vrele(fvp);
+		vrele(tond.ni_startdir);
+		if (fromnd.ni_startdir != NULL)
+			vrele(fromnd.ni_startdir);
+		error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH);
+		if (error != 0)
+			return (error);
+		goto again;
+	}
 	if (tvp != NULL) {
 		if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
 			error = ENOTDIR;
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 98823f383433..617bda0d4ce6 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/syslog.h>
 #include <sys/unistd.h>
+#include <sys/user.h>
 
 #include <security/audit/audit.h>
 #include <security/mac/mac_framework.h>
@@ -103,6 +104,7 @@ struct 	fileops vnops = {
 	.fo_chown = vn_chown,
 	.fo_sendfile = vn_sendfile,
 	.fo_seek = vn_seek,
+	.fo_fill_kinfo = vn_fill_kinfo,
 	.fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE
 };
 
@@ -2249,3 +2251,61 @@ vn_utimes_perm(struct vnode *vp, struct vattr *vap, struct ucred *cred,
 		error = VOP_ACCESS(vp, VWRITE, cred, td);
 	return (error);
 }
+
+int
+vn_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+	struct vnode *vp;
+	int error;
+
+	if (fp->f_type == DTYPE_FIFO)
+		kif->kf_type = KF_TYPE_FIFO;
+	else
+		kif->kf_type = KF_TYPE_VNODE;
+	vp = fp->f_vnode;
+	vref(vp);
+	FILEDESC_SUNLOCK(fdp);
+	error = vn_fill_kinfo_vnode(vp, kif);
+	vrele(vp);
+	FILEDESC_SLOCK(fdp);
+	return (error);
+}
+
+int
+vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif)
+{
+	struct vattr va;
+	char *fullpath, *freepath;
+	int error;
+
+	kif->kf_vnode_type = vntype_to_kinfo(vp->v_type);
+	freepath = NULL;
+	fullpath = "-";
+	error = vn_fullpath(curthread, vp, &fullpath, &freepath);
+	if (error == 0) {
+		strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
+	}
+	if (freepath != NULL)
+		free(freepath, M_TEMP);
+
+	/*
+	 * Retrieve vnode attributes.
+	 */
+	va.va_fsid = VNOVAL;
+	va.va_rdev = NODEV;
+	vn_lock(vp, LK_SHARED | LK_RETRY);
+	error = VOP_GETATTR(vp, &va, curthread->td_ucred);
+	VOP_UNLOCK(vp, 0);
+	if (error != 0)
+		return (error);
+	if (va.va_fsid != VNOVAL)
+		kif->kf_un.kf_file.kf_file_fsid = va.va_fsid;
+	else
+		kif->kf_un.kf_file.kf_file_fsid =
+		    vp->v_mount->mnt_stat.f_fsid.val[0];
+	kif->kf_un.kf_file.kf_file_fileid = va.va_fileid;
+	kif->kf_un.kf_file.kf_file_mode = MAKEIMODE(va.va_type, va.va_mode);
+	kif->kf_un.kf_file.kf_file_size = va.va_size;
+	kif->kf_un.kf_file.kf_file_rdev = va.va_rdev;
+	return (0);
+}
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 3793ef35d37f..6399ff4e7219 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -473,7 +473,6 @@ vop_getpages {
 	IN vm_page_t *m;
 	IN int count;
 	IN int reqpage;
-	IN vm_ooffset_t offset;
 };
 
 
@@ -485,7 +484,6 @@ vop_putpages {
 	IN int count;
 	IN int sync;
 	IN int *rtvals;
-	IN vm_ooffset_t offset;
 };
 
 
diff --git a/sys/libkern/memmem.c b/sys/libkern/memmem.c
new file mode 100644
index 000000000000..11c3d9eec508
--- /dev/null
+++ b/sys/libkern/memmem.c
@@ -0,0 +1,62 @@
+/*-
+ * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
+ *
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/libkern.h>
+#include <sys/param.h>
+
+void *
+memmem(const void *l, size_t l_len, const void *s, size_t s_len)
+{
+        register char *cur, *last;
+        const char *cl = (const char *)l;
+        const char *cs = (const char *)s;
+
+        /* we need something to compare */
+        if (l_len == 0 || s_len == 0)
+                return NULL;
+
+        /* "s" must be smaller or equal to "l" */
+        if (l_len < s_len)
+                return NULL;
+
+        /* special case where s_len == 1 */
+        if (s_len == 1)
+                return memchr(l, (int)*cs, l_len);
+
+        /* the last position where its possible to find "s" in "l" */
+        last = __DECONST(char *, cl) + l_len - s_len;
+
+        for (cur = __DECONST(char *, cl); cur <= last; cur++)
+                if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
+                        return cur;
+
+        return NULL;
+}
diff --git a/sys/mips/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c
index b06901522233..11f96b5f4ed3 100644
--- a/sys/mips/adm5120/if_admsw.c
+++ b/sys/mips/adm5120/if_admsw.c
@@ -925,7 +925,7 @@ admsw_txintr(struct admsw_softc *sc, int prio)
 		gotone = 1;
 		/* printf("clear tx slot %d\n",i); */
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		sc->sc_txfree++;
 	}
@@ -1047,7 +1047,7 @@ admsw_rxintr(struct admsw_softc *sc, int high)
 
 		m = ds->ds_mbuf;
 		if (admsw_add_rxlbuf(sc, i) != 0) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			ADMSW_INIT_RXLDESC(sc, i);
 			bus_dmamap_sync(sc->sc_bufs_dmat, ds->ds_dmamap,
 			    BUS_DMASYNC_PREREAD);
@@ -1066,7 +1066,7 @@ admsw_rxintr(struct admsw_softc *sc, int high)
 
 		/* Pass it on. */
 		(*ifp->if_input)(ifp, m);
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	}
 
 	/* Update the receive pointer. */
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 0ce9177b1508..854cd6560f0d 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -122,8 +122,12 @@ ar724x_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func,
 
 	/* Register access is 32-bit aligned */
 	shift = (reg & 3) * 8;
-	if (shift)
-		mask = (1 << shift) - 1;
+
+	/* Create a mask based on the width, post-shift */
+	if (bytes == 2)
+		mask = 0xffff;
+	else if (bytes == 1)
+		mask = 0xff;
 	else
 		mask = 0xffffffff;
 
@@ -155,10 +159,18 @@ ar724x_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func,
 		return;
 
 	/*
-	 * WAR for BAR issue on AR7240 - We are unable to access the PCI device
-	 * space if we set the BAR with proper base address.
+	 * WAR for BAR issue on AR7240 - We are unable to access the PCI
+	 * device space if we set the BAR with proper base address.
+	 *
+	 * However, we _do_ want to allow programming in the probe value
+	 * (0xffffffff) so the PCI code can find out how big the memory
+	 * map is for this device.  Without it, it'll think the memory
+	 * map is 32 bits wide, the PCI code will then end up thinking
+	 * the register window is '0' and fail to allocate resources.
 	 */
-	if (reg == PCIR_BAR(0) && bytes == 4 && ar71xx_soc == AR71XX_SOC_AR7240)
+	if (reg == PCIR_BAR(0) && bytes == 4
+	    && ar71xx_soc == AR71XX_SOC_AR7240
+	    && data != 0xffffffff)
 		ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, 0xffff, bytes);
 	else
 		ar724x_pci_write(AR724X_PCI_CFG_BASE, reg, data, bytes);
@@ -337,7 +349,6 @@ ar724x_pci_slot_fixup(device_t dev)
 			return;
 		}
 
-
 		device_printf(dev, "found EEPROM at 0x%lx on %d.%d.%d\n",
 		    flash_addr, 0, 0, 0);
 		ar724x_pci_fixup(dev, flash_addr, size);
@@ -486,7 +497,6 @@ ar724x_pci_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		}
 	} 
 
-
 	return (rv);
 }
 
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index 85617387f5d7..e88f1e81c39d 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -2147,7 +2147,7 @@ arge_tx_locked(struct arge_softc *sc)
 
 		txd = &sc->arge_cdata.arge_txdesc[cons];
 
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		bus_dmamap_sync(sc->arge_cdata.arge_tx_tag, txd->tx_dmamap,
 		    BUS_DMASYNC_POSTWRITE);
@@ -2209,7 +2209,7 @@ arge_rx_locked(struct arge_softc *sc)
 		m->m_pkthdr.rcvif = ifp;
 		/* Skip 4 bytes of CRC */
 		m->m_pkthdr.len = m->m_len = packet_len - ETHER_CRC_LEN;
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		rx_npkts++;
 
 		ARGE_UNLOCK(sc);
diff --git a/sys/mips/beri/beri_simplebus.c b/sys/mips/beri/beri_simplebus.c
index 3862a04e481e..87ad3beb1f15 100644
--- a/sys/mips/beri/beri_simplebus.c
+++ b/sys/mips/beri/beri_simplebus.c
@@ -198,7 +198,7 @@ simplebus_attach(device_t dev)
 			continue;
 		}
 
-		if (fdt_intr_to_rl(dev, dt_child, &di->di_res, di->di_intr_sl)) {
+		if (ofw_bus_intr_to_rl(dev, dt_child, &di->di_res)) {
 			device_printf(dev, "%s: could not process "
 			    "'interrupts' property\n", di->di_ofw.obd_name);
 			resource_list_free(&di->di_res);
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c
index 87895bb4960b..4e069f9b1aab 100644
--- a/sys/mips/cavium/ciu.c
+++ b/sys/mips/cavium/ciu.c
@@ -91,13 +91,13 @@ static void		ciu_hinted_child(device_t, const char *, int);
 static void		ciu_en0_intr_mask(void *);
 static void		ciu_en0_intr_unmask(void *);
 #ifdef SMP
-static int		ciu_en0_intr_bind(void *, u_char);
+static int		ciu_en0_intr_bind(void *, int);
 #endif
 
 static void		ciu_en1_intr_mask(void *);
 static void		ciu_en1_intr_unmask(void *);
 #ifdef SMP
-static int		ciu_en1_intr_bind(void *, u_char);
+static int		ciu_en1_intr_bind(void *, int);
 #endif
 
 static int		ciu_intr(void *);
@@ -208,7 +208,7 @@ ciu_setup_intr(device_t bus, device_t child, struct resource *res, int flags,
 	struct intr_event *event, **eventp;
 	void (*mask_func)(void *);
 	void (*unmask_func)(void *);
-	int (*bind_func)(void *, u_char);
+	int (*bind_func)(void *, int);
 	mips_intrcnt_t intrcnt;
 	int error;
 	int irq;
@@ -343,7 +343,7 @@ ciu_en0_intr_unmask(void *arg)
 
 #ifdef SMP
 static int
-ciu_en0_intr_bind(void *arg, u_char target)
+ciu_en0_intr_bind(void *arg, int target)
 {
 	uint64_t mask;
 	int core;
@@ -389,7 +389,7 @@ ciu_en1_intr_unmask(void *arg)
 
 #ifdef SMP
 static int
-ciu_en1_intr_bind(void *arg, u_char target)
+ciu_en1_intr_bind(void *arg, int target)
 {
 	uint64_t mask;
 	int core;
diff --git a/sys/mips/cavium/if_octm.c b/sys/mips/cavium/if_octm.c
index 461d1bbb0ef9..a689a0fe6726 100644
--- a/sys/mips/cavium/if_octm.c
+++ b/sys/mips/cavium/if_octm.c
@@ -347,10 +347,10 @@ octm_transmit(struct ifnet *ifp, struct mbuf *m)
 	if (result == CVMX_MGMT_PORT_SUCCESS) {
 		ETHER_BPF_MTAP(ifp, m);
 
-		ifp->if_opackets++;
-		ifp->if_obytes += m->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	} else
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	m_freem(m);
 
@@ -517,7 +517,7 @@ octm_rx_intr(void *arg)
 			m->m_pkthdr.rcvif = sc->sc_ifp;
 			m->m_pkthdr.len = m->m_len = len;
 
-			sc->sc_ifp->if_ipackets++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
 
 			(*sc->sc_ifp->if_input)(sc->sc_ifp, m);
 
@@ -529,7 +529,7 @@ octm_rx_intr(void *arg)
 		if (len == 0)
 			break;
 
-		sc->sc_ifp->if_ierrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1);
 	}
 
 	/* Acknowledge interrupts.  */
diff --git a/sys/mips/cavium/octe/ethernet-mdio.c b/sys/mips/cavium/octe/ethernet-mdio.c
index d95669a6037f..c61a2a643bc6 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.c
+++ b/sys/mips/cavium/octe/ethernet-mdio.c
@@ -71,6 +71,7 @@ int cvm_oct_mdio_read(struct ifnet *ifp, int phy_id, int location)
 	cvmx_write_csr(CVMX_SMI_CMD, smi_cmd.u64);
 
 	do {
+		cvmx_wait(1000);
 		smi_rd.u64 = cvmx_read_csr(CVMX_SMI_RD_DAT);
 	} while (smi_rd.s.pending);
 
@@ -108,6 +109,7 @@ void cvm_oct_mdio_write(struct ifnet *ifp, int phy_id, int location, int val)
 	cvmx_write_csr(CVMX_SMI_CMD, smi_cmd.u64);
 
 	do {
+		cvmx_wait(1000);
 		smi_wr.u64 = cvmx_read_csr(CVMX_SMI_WR_DAT);
 	} while (smi_wr.s.pending);
 	MDIO_UNLOCK();
diff --git a/sys/mips/cavium/octe/ethernet-rx.c b/sys/mips/cavium/octe/ethernet-rx.c
index 79470be1dd46..492d3e0b3265 100644
--- a/sys/mips/cavium/octe/ethernet-rx.c
+++ b/sys/mips/cavium/octe/ethernet-rx.c
@@ -304,7 +304,7 @@ void cvm_oct_tasklet_rx(void *context, int pending)
 					m->m_pkthdr.csum_flags = 0; /* XXX */
 				}
 
-				ifp->if_ipackets++;
+				if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 				(*ifp->if_input)(ifp, m);
 			} else {
diff --git a/sys/mips/cavium/octe/ethernet-tx.c b/sys/mips/cavium/octe/ethernet-tx.c
index b55ada64db20..b1d1f1435803 100644
--- a/sys/mips/cavium/octe/ethernet-tx.c
+++ b/sys/mips/cavium/octe/ethernet-tx.c
@@ -158,7 +158,7 @@ int cvm_oct_xmit(struct mbuf *m, struct ifnet *ifp)
 		work = cvmx_fpa_alloc(CVMX_FPA_WQE_POOL);
 		if (work == NULL) {
 			m_freem(m);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return 1;
 		}
 
@@ -231,7 +231,7 @@ int cvm_oct_xmit(struct mbuf *m, struct ifnet *ifp)
 	if (__predict_false(dropped)) {
 		m_freem(m);
 		cvmx_fau_atomic_add32(priv->fau+qos*4, -1);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	} else {
 		/* Put this packet on the queue to be freed later */
 		_IF_ENQUEUE(&priv->tx_free_queue[qos], m);
@@ -239,8 +239,8 @@ int cvm_oct_xmit(struct mbuf *m, struct ifnet *ifp)
 		/* Pass it to any BPF listeners.  */
 		ETHER_BPF_MTAP(ifp, m);
 
-		ifp->if_opackets++;
-		ifp->if_obytes += m->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	}
 
 	/* Free mbufs not in use by the hardware */
diff --git a/sys/mips/cavium/octeon_ds1337.c b/sys/mips/cavium/octeon_ds1337.c
index a5cba94e7457..73405a939056 100644
--- a/sys/mips/cavium/octeon_ds1337.c
+++ b/sys/mips/cavium/octeon_ds1337.c
@@ -81,7 +81,7 @@ static int validate_ct_struct(struct clocktime *ct)
     CT_CHECK(ct->min < 0  || ct->min > 59,  "minute");
     CT_CHECK(ct->hour < 0 || ct->hour > 23, "hour");
     CT_CHECK(ct->day < 1 || ct->day > 31, "day");
-    CT_CHECK(ct->dow < 1 || ct->dow > 7,  "day of week");
+    CT_CHECK(ct->dow < 0 || ct->dow > 6,  "day of week");
     CT_CHECK(ct->mon < 1  || ct->mon > 12,  "month");
     CT_CHECK(ct->year > 2037,"year");
 
@@ -124,7 +124,7 @@ uint32_t cvmx_rtc_ds1337_read(void)
     {
 	ct.hour = (ct.hour + 12) % 24;
     }
-    ct.dow = (reg[3] & 0x7);         /* Day of week field is 1..7 */
+    ct.dow = (reg[3] & 0x7) - 1; /* Day of week field is 0..6 */
     ct.day = bcd2bin(reg[4] & 0x3f);
     ct.mon  = bcd2bin(reg[5] & 0x1f); /* Month field is 1..12 */
 #if defined(OCTEON_BOARD_CAPK_0100ND)
@@ -136,7 +136,6 @@ uint32_t cvmx_rtc_ds1337_read(void)
     ct.year = ((reg[5] & 0x80) ? 2000 : 1900) + bcd2bin(reg[6]);
 #endif
 
-
     if (validate_ct_struct(&ct))
 	cvmx_dprintf("Warning: RTC calendar is not configured properly\n");
 
@@ -174,13 +173,15 @@ int cvmx_rtc_ds1337_write(uint32_t time)
     reg[0] = bin2bcd(ct.sec);
     reg[1] = bin2bcd(ct.min);
     reg[2] = bin2bcd(ct.hour);       /* Force 0..23 format even if using AM/PM */
-    reg[3] = bin2bcd(ct.dow);
+    reg[3] = bin2bcd(ct.dow + 1);
     reg[4] = bin2bcd(ct.day);
     reg[5] = bin2bcd(ct.mon);
+#if !defined(OCTEON_BOARD_CAPK_0100ND)
     if (ct.year >= 2000)             /* Set century bit*/
     {
 	reg[5] |= 0x80;
     }
+#endif
     reg[6] = bin2bcd(ct.year % 100);
 
     /* Lockless write: detects the infrequent roll-over and retries */
diff --git a/sys/mips/conf/TP-MR3020 b/sys/mips/conf/TP-MR3020
new file mode 100644
index 000000000000..f0ecb4be017a
--- /dev/null
+++ b/sys/mips/conf/TP-MR3020
@@ -0,0 +1,65 @@
+#
+# TP Link MR3020 - an AR9331 based SoC wifi device.
+#
+# This is for the 32 RAM/4 flash part. There is little to no
+# chance that this will ever boot FreeBSD directly from the 3.5MB
+# of flash.  The kernel can fit into the space, but userland is just
+# too big even when stripped down to its limits.
+#
+# * AR9331 SoC
+# * 32MB RAM
+# * 4MB flash
+# * Integrated 1x1 2GHz wifi and 10/100 bridge
+# * USB powered
+# * USB storage
+#
+# $FreeBSD$
+#
+
+# Include the default AR933x parameters
+include	"AR933X_BASE"
+
+ident	TP-MR3020
+
+# Override hints with board values
+hints	"TP-MR3020.hints"
+
+# Board memory - 32MB
+options	AR71XX_REALMEM=(32*1024*1024)
+
+# i2c GPIO bus
+device	gpioiic
+device	iicbb
+device	iicbus
+device	iic
+
+# Options required for miiproxy and mdiobus
+options	ARGE_MDIO	# Export an MDIO bus separate from arge
+device	miiproxy	# MDIO bus <-> MII PHY rendezvous
+
+device	etherswitch
+device	arswitch
+
+# Enable the uboot environment stuff rather then the
+# redboot stuff.
+options	AR71XX_ENV_UBOOT
+
+# uzip - to boot natively from flash
+device	geom_uncompress
+
+# Used for the static uboot partition map
+device	geom_map
+
+# Boot off of the rootfs, as defined in the geom_map setup.
+# Probably, this should be a USB device as the memory available
+# compressed rootfs is simply too small for FreeBSD
+#options	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+
+# Boot off of a uboot tftp ramdisk kernel image.  Because the flash
+# on this unit is so small, this is the only way to do dev work.
+# For full deployment, you will *have* to use a usb storage device
+# as a rootfs and use the flash to hold the kernel only.
+options		MD_ROOT         # md device usable as a potential root device
+options		MD_ROOT_SIZE=10240
+#makeoptions	MFS_IMAGE=/tftpboot/mfsroot-tl-mr3020.img.ulzma
+options		ROOTDEVNAME=\"ufs:md0.uncompress\"
diff --git a/sys/mips/conf/TP-MR3020.hints b/sys/mips/conf/TP-MR3020.hints
new file mode 100644
index 000000000000..dfabb42c14d3
--- /dev/null
+++ b/sys/mips/conf/TP-MR3020.hints
@@ -0,0 +1,101 @@
+#
+# This file adds to the values in AR933X_BASE.hints
+#
+# $FreeBSD$
+
+# mdiobus on arge1
+hint.argemdio.0.at="nexus0"
+hint.argemdio.0.maddr=0x1a000000
+hint.argemdio.0.msize=0x1000
+hint.argemdio.0.order=0
+
+# There's no need to set the ar933x GMAC configuration bits.
+# This just creates a switch instance and correctly uses it.
+
+# Embedded Atheros Switch
+hint.arswitch.0.at="mdio0"
+
+# XXX this should really say it's an AR933x switch, as there
+# are some vlan specific differences here!
+hint.arswitch.0.is_7240=1
+hint.arswitch.0.numphys=4
+hint.arswitch.0.phy4cpu=1	# phy 4 is a "CPU" separate PHY
+hint.arswitch.0.is_rgmii=0
+hint.arswitch.0.is_gmii=1	# arge1 <-> switch PHY is GMII
+
+# arge0 - MII, autoneg, phy(4)
+hint.arge.0.phymask=0x10	# PHY4
+hint.arge.0.mdio=mdioproxy1	# .. off of the switch mdiobus
+
+# arge1 - GMII, 1000/full
+hint.arge.1.phymask=0x0		# No directly mapped PHYs
+hint.arge.1.media=1000
+hint.arge.1.fduplex=1
+
+# Where the ART is - last 64k in the flash
+# 0x9fff1000 ?
+hint.ath.0.eepromaddr=0x1fff0000
+hint.ath.0.eepromsize=16384
+
+# The board 16MiB flash layout in uboot env:
+#
+# 256k(u-boot),64k(u-boot-env),2752k(rootfs),896k(uImage),64k(NVRAM),64k(ART)
+
+# However, it boots from 0x9f050000, which is the front of the flsah!
+# Thus the kernel/rootfs are switched around.
+
+# 256KB
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x00040000
+hint.map.0.name="uboot"
+hint.map.0.readonly=1
+
+# 64KB
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x00040000
+hint.map.1.end=0x00050000
+hint.map.1.name="uboot-env"
+hint.map.1.readonly=0
+
+# 2752KB
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00050000
+hint.map.2.end="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.2.name="kernel"
+hint.map.2.readonly=0
+
+# 896KB
+hint.map.3.at="flash/spi0"
+hint.map.3.start="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.3.end=0x003e0000
+hint.map.3.name="rootfs"
+hint.map.3.readonly=0
+
+# 64K NVRAM
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x003e0000
+hint.map.4.end=0x003f0000
+hint.map.4.name="cfg"
+hint.map.4.readonly=0
+
+# 64K ART
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x003f0000
+hint.map.5.end=0x00400000
+hint.map.5.name="art"
+hint.map.5.readonly=1
+
+# GPIO specific configuration block
+
+# Don't flip on anything that isn't already enabled.
+# This includes leaving the SPI CS1/CS2 pins as GPIO pins as they're
+# not used here.
+hint.gpio.0.function_set=0x00000000
+hint.gpio.0.function_clear=0x00000000
+
+# These are the GPIO LEDs and buttons which can be software controlled.
+#hint.gpio.0.pinmask=0x001c02ae
+#hint.gpio.0.pinmask=0x00001803
+
+# XXX TODO: the button and LEDs!
diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index ce864035f2df..8f84776a7f63 100644
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -21,12 +21,6 @@ options 	AR71XX_REALMEM=64*1024*1024
 options 	AR71XX_ENV_UBOOT
 
 options 	BOOTVERBOSE
-# Don't include the SCSI/CAM strings in the default build
-options 	SCSI_NO_SENSE_STRINGS
-options 	SCSI_NO_OP_STRINGS
-
-# .. And no sysctl strings
-options 	NO_SYSCTL_DESCR
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
diff --git a/sys/mips/conf/WZR-300HP.hints b/sys/mips/conf/WZR-300HP.hints
index 070f38172577..07d8a7170242 100644
--- a/sys/mips/conf/WZR-300HP.hints
+++ b/sys/mips/conf/WZR-300HP.hints
@@ -108,7 +108,7 @@ hint.map.4.name="rootfs"
 hint.map.4.readonly=1
 
 #hint.map.5.at="flash/spi1"
-hint.map.5.at="flash/spi0"
+hint.map.5.at="flash/spi1"
 hint.map.5.start=0x00FF0000
 hint.map.5.end=  0x01000000
 hint.map.5.name="cfg"
diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c
index fdd60ea01a0e..4b5d3bfb43d0 100644
--- a/sys/mips/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
@@ -1395,13 +1395,13 @@ kr_tx(struct kr_softc *sc)
 		txd = &sc->kr_cdata.kr_txdesc[cons];
 
 		if (devcs & KR_DMATX_DEVCS_TOK)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		else {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* collisions: medium busy, late collision */
 			if ((devcs & KR_DMATX_DEVCS_EC) || 
 			    (devcs & KR_DMATX_DEVCS_LC))
-				ifp->if_collisions++;
+				if_inc_counter(ifp, IFCOUNTER_COLLISIONS, 1);
 		}
 
 		bus_dmamap_sync(sc->kr_cdata.kr_tx_tag, txd->tx_dmamap,
@@ -1460,11 +1460,11 @@ kr_rx(struct kr_softc *sc)
 		error = 1;
 
 		if (packet_len != count)
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		else if (count < 64)
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		else if ((cur_rx->kr_devcs & KR_DMARX_DEVCS_LD) == 0)
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		else if ((cur_rx->kr_devcs & KR_DMARX_DEVCS_ROK) != 0) {
 			error = 0;
 			bus_dmamap_sync(sc->kr_cdata.kr_rx_tag, rxd->rx_dmamap,
@@ -1474,7 +1474,7 @@ kr_rx(struct kr_softc *sc)
 			m->m_pkthdr.rcvif = ifp;
 			/* Skip 4 bytes of CRC */
 			m->m_pkthdr.len = m->m_len = packet_len - ETHER_CRC_LEN;
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 			KR_UNLOCK(sc);
 			(*ifp->if_input)(ifp, m);
diff --git a/sys/mips/include/sf_buf.h b/sys/mips/include/sf_buf.h
index 76fb993da878..d61bc9153697 100644
--- a/sys/mips/include/sf_buf.h
+++ b/sys/mips/include/sf_buf.h
@@ -47,5 +47,23 @@ sf_buf_page(struct sf_buf *sf)
 	return ((vm_page_t)sf);
 }
 
-#endif /* __mips_n64 */
+#else	/* !__mips_n64 */
+
+static inline void
+sf_buf_map(struct sf_buf *sf, int flags)
+{
+
+	pmap_qenter(sf->kva, &sf->m, 1);
+}
+
+static inline int
+sf_buf_unmap(struct sf_buf *sf)
+{
+
+	pmap_qremove(sf->kva, 1);
+	return (1);
+}
+
+#endif	/* __mips_n64 */
+
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index d3b833ebd4a8..756a8a60a3f8 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -189,6 +189,7 @@
 
 #ifndef __mips_n64
 #define	SFBUF
+#define	SFBUF_MAP
 #endif
 
 #endif /* !_MACHINE_VMPARAM_H_ */
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index 6e9a4bdfb995..5d25d881fb6c 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -167,9 +167,6 @@ extern char MipsCache[], MipsCacheEnd[];
 extern char MipsWaitStart[], MipsWaitEnd[];
 
 extern char edata[], end[];
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
 
 u_int32_t bootdev;
 struct bootinfo bootinfo;
@@ -434,6 +431,8 @@ mips_postboot_fixup(void)
 #ifdef DDB
 	Elf_Size *trampoline_data = (Elf_Size*)kernel_kseg0_end;
 	Elf_Size symtabsize = 0;
+	vm_offset_t ksym_start;
+	vm_offset_t ksym_end;
 
 	if (trampoline_data[0] == SYMTAB_MAGIC) {
 		symtabsize = trampoline_data[1];
@@ -443,6 +442,7 @@ mips_postboot_fixup(void)
 		kernel_kseg0_end += symtabsize;
 		/* end of .strtab */
 		ksym_end = kernel_kseg0_end;
+		db_fetch_ksymtab(ksym_start, ksym_end);
 	}
 #endif
 }
diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c
index 2c6cba5ec647..41962dfaebdb 100644
--- a/sys/mips/nlm/dev/net/xlpge.c
+++ b/sys/mips/nlm/dev/net/xlpge.c
@@ -897,8 +897,7 @@ xlpge_tx(struct ifnet *ifp, struct mbuf *mbuf_chain)
 	if (p2p)
 		uma_zfree(nl_tx_desc_zone, p2p);
 	m_freem(mbuf_chain);
-	/*atomic_incr_long(&ifp->if_iqdrops); */
-	ifp->if_iqdrops++;
+	if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	return (err);
 }
 
@@ -1433,8 +1432,7 @@ nlm_xlpge_rx(struct nlm_xlpge_softc *sc, int port, vm_paddr_t paddr, int len)
 	} else
 		m->m_pkthdr.len = m->m_len = len;
 
-	/*atomic_incr_long(&ifp->if_ipackets);*/
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 #ifdef XLP_DRIVER_LOOPBACK
 	if (port == 16 || port == 17)
 		(*ifp->if_input)(ifp, m);
@@ -1515,8 +1513,7 @@ nlm_xlpge_msgring_handler(int vc, int size, int code, int src_id,
 
 		nlm_xlpge_release_mbuf(phys_addr);
 
-		/*atomic_incr_long(&ifp->if_opackets);*/
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 	} else if (size > 1) { /* Recieve packet */
 		phys_addr = msg->msg[1] & 0xffffffffc0ULL;
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 9c7ff052d4fa..832c518224c7 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -697,7 +697,9 @@ nlge_msgring_handler(int bucket, int size, int code, int stid,
 			printf("ERROR: Tx fb error (%d) on port %d\n", tx_error,
 			    port);
 		}
-		tx_error ? ifp->if_oerrors++ : ifp->if_opackets++;
+		tx_error ?
+		    if_inc_counter(ifp, IFCOUNTER_OERRORS, 1) :
+		    if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	} else if (ctrl == CTRL_SNGL || ctrl == CTRL_START) {
 		/* Rx Packet */
 
@@ -776,7 +778,7 @@ nlge_start_locked(struct ifnet *ifp, struct nlge_softc *sc, struct mbuf *m)
 			NLGE_UNLOCK(sc);
 		}
 		m_freem(m);
-		ifp->if_iqdrops++;
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	}
 	return (error);
 }
@@ -825,7 +827,7 @@ nlge_rx(struct nlge_softc *sc, vm_paddr_t paddr, int len)
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.rcvif = ifp;
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	(*ifp->if_input)(ifp, m);
 }
 
diff --git a/sys/mips/rmi/dev/xlr/rge.c b/sys/mips/rmi/dev/xlr/rge.c
index 2d2ba9e4bf79..6fd2bc68b1e4 100644
--- a/sys/mips/rmi/dev/xlr/rge.c
+++ b/sys/mips/rmi/dev/xlr/rge.c
@@ -2019,7 +2019,7 @@ rge_rx(struct rge_softc *sc, vm_paddr_t paddr, int len)
 		printf("\n");
 	}
 #endif
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	(*ifp->if_input) (ifp, m);
 }
 
@@ -2116,7 +2116,7 @@ rge_start_locked(struct ifnet *ifp, int threshold)
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			return;
 		} else {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			xlr_rge_tx_done[vcpu]++;
 		}
 	}
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 50e437148b8d..58ddecca06f4 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -242,7 +242,7 @@ SUBDIR=	\
 	my \
 	${_nandfs} \
 	${_nandsim} \
-	${_ncp} \
+	${_ncr} \
 	${_ncv} \
 	${_ndis} \
 	netfpga10g \
@@ -537,6 +537,7 @@ _mlx4ib=	mlx4ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
+_ncr=		ncr
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
@@ -624,8 +625,6 @@ _iwnfw=		iwnfw
 .endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
-_ixl=		ixl
-_ixlv=		ixlv
 _mly=		mly
 _nfe=		nfe
 _nvd=		nvd
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
deleted file mode 100644
index 572269224272..000000000000
--- a/sys/modules/acpi/acpi/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-# $FreeBSD$
-
-.if !defined(FORCE_BUILD)
-.error "The ACPI module is deprecated, set FORCE_BUILD to force it"
-.endif
-
-.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
-.error "The ACPI module is only for amd64 and i386"
-.endif
-
-.PATH:	${.CURDIR}/../../../contrib/dev/acpica/components/debugger \
-	${.CURDIR}/../../../contrib/dev/acpica/components/disassembler \
-	${.CURDIR}/../../../contrib/dev/acpica/components/dispatcher \
-	${.CURDIR}/../../../contrib/dev/acpica/components/events \
-	${.CURDIR}/../../../contrib/dev/acpica/components/executer \
-	${.CURDIR}/../../../contrib/dev/acpica/components/hardware \
-	${.CURDIR}/../../../contrib/dev/acpica/components/namespace \
-	${.CURDIR}/../../../contrib/dev/acpica/components/parser \
-	${.CURDIR}/../../../contrib/dev/acpica/components/resources \
-	${.CURDIR}/../../../contrib/dev/acpica/components/tables \
-	${.CURDIR}/../../../contrib/dev/acpica/components/utilities \
-	${.CURDIR}/../../../pci \
-	${.CURDIR}/../../../dev/acpica \
-	${.CURDIR}/../../../dev/acpica/Osd \
-	${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica \
-	${.CURDIR}/../../../x86/acpica
-
-KMOD=	acpi
-
-# ACPI CA sources
-SRCS=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c dbhistry.c
-SRCS+=	dbinput.c dbmethod.c dbnames.c dbstats.c dbutils.c dbxface.c
-SRCS+=	dmbuffer.c dmdeferred.c dmnames.c dmopcode.c dmobject.c dmresrc.c
-SRCS+=	dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c
-SRCS+=	dsargs.c dscontrol.c dsfield.c dsinit.c dsmethod.c dsmthdat.c
-SRCS+=	dsobject.c dsopcode.c dsutils.c dswexec.c dswload.c dswload2.c
-SRCS+=	dswscope.c dswstate.c
-SRCS+=	evevent.c evglock.c evgpe.c evgpeblk.c evgpeinit.c evgpeutil.c
-SRCS+=	evhandler.c evmisc.c evregion.c evrgnini.c evsci.c evxface.c
-SRCS+=	evxfevnt.c evxfgpe.c evxfregn.c
-SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c exfield.c
-SRCS+=	exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c
-SRCS+=	exoparg3.c exoparg6.c exprep.c exregion.c exresnte.c exresolv.c
-SRCS+=	exresop.c exstore.c exstoren.c exstorob.c exsystem.c exutils.c
-SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwtimer.c
-SRCS+=	hwvalid.c hwxface.c hwxfsleep.c
-SRCS+=	nsaccess.c nsalloc.c nsarguments.c nsconvert.c nsdump.c nseval.c
-SRCS+=	nsinit.c nsload.c nsnames.c nsobject.c nsparse.c nspredef.c nsprepkg.c
-SRCS+=	nsrepair.c nsrepair2.c nssearch.c nsutils.c nswalk.c nsxfeval.c
-SRCS+=	nsxfname.c nsxfobj.c
-SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c psparse.c
-SRCS+=	psscope.c pstree.c psutils.c pswalk.c psxface.c
-SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c rsinfo.c rsio.c
-SRCS+=	rsirq.c rslist.c rsmemory.c rsmisc.c rsserial.c rsutils.c rsxface.c
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbprint.c tbutils.c tbxface.c tbxfload.c
-SRCS+=	tbxfroot.c
-SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c utdebug.c
-SRCS+=	utdecode.c utdelete.c uterror.c uteval.c utexcep.c utglobal.c utids.c
-SRCS+=	utinit.c utlock.c utmath.c utmisc.c utmutex.c utobject.c utosi.c
-SRCS+=	utownerid.c utpredef.c utresrc.c utstate.c utstring.c utxface.c
-SRCS+=	utxferror.c utxfinit.c
-#SRCS+=	utxfmutex.c
-
-# OSPM layer and core hardware drivers
-SRCS+=	acpi.c acpi_button.c acpi_isab.c acpi_package.c acpi_pci.c acpi_pcib.c
-SRCS+=	acpi_pcib_acpi.c acpi_pcib_pci.c acpi_powerres.c acpi_quirk.c
-SRCS+=	acpi_resource.c acpi_timer.c acpi_pci_link.c acpi_thermal.c
-
-# ACPI hardware drivers, mostly used for mobile systems.
-SRCS+=	acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c acpi_ec.c
-SRCS+=	acpi_hpet.c acpi_lid.c acpi_perf.c acpi_smbat.c acpi_throttle.c
-
-# OSD layer
-SRCS+=	OsdDebug.c
-SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c OsdStream.c
-SRCS+=	OsdSynch.c OsdTable.c OsdEnvironment.c
-SRCS+=	opt_acpi.h opt_bus.h opt_ddb.h acpi_if.h acpi_quirks.h bus_if.h
-SRCS+=	cpufreq_if.h device_if.h isa_if.h pci_if.h pcib_if.h
-
-# XXX ACPI should not depend on the following headers but this is currently
-# needed for the build of assym.s.
-# This obviously needs a better and more structural fix.
-SRCS+=	opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h
-
-.if !defined(KERNBUILDDIR)
-.if KTR
-CFLAGS+=-DKTR
-.endif
-.if SMP
-CFLAGS+=-DSMP
-.endif
-.if ACPI_MAX_TASKS
-CFLAGS+=-DACPI_MAX_TASKS=${ACPI_MAX_TASKS}
-.endif
-.if ACPI_MAX_THREADS
-CFLAGS+=-DACPI_MAX_THREADS=${ACPI_MAX_THREADS}
-.endif
-.if ACPI_DEBUG
-CFLAGS+=-DACPI_DEBUG
-opt_ddb.h: Makefile
-	echo "#define DDB 1" > ${.TARGET}
-.else
-opt_ddb.h: Makefile
-	echo -n > ${.TARGET}
-.endif
-.endif
-
-# Machine-specific code such as sleep/wakeup
-SRCS+=	acpi_apm.c acpi_machdep.c acpi_wakecode.h acpi_wakedata.h acpi_wakeup.c
-SRCS+=	assym.s madt.c
-CLEANFILES+=acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o acpi_wakedata.h
-
-SRCS+=	opt_global.h
-
-.include <bsd.kmod.mk>
-
-acpi_wakecode.o: acpi_wakecode.S assym.s
-	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} ${CLANG_NO_IAS} \
-	    ${WERROR} ${.IMPSRC}
-acpi_wakecode.bin: acpi_wakecode.o
-	objcopy -S -O binary acpi_wakecode.o ${.TARGET}
-acpi_wakecode.h: acpi_wakecode.bin
-	file2c -sx 'static char wakecode[] = {' '};' < acpi_wakecode.bin > \
-	    ${.TARGET}
-acpi_wakedata.h: acpi_wakecode.o
-	${NM} -n --defined-only acpi_wakecode.o | \
-	    while read offset dummy what; do \
-	    echo "#define	$${what}	0x$${offset}"; \
-	    done > ${.TARGET}
diff --git a/sys/modules/bce/Makefile b/sys/modules/bce/Makefile
index 44b0713fdca8..1be2a3f98ce2 100644
--- a/sys/modules/bce/Makefile
+++ b/sys/modules/bce/Makefile
@@ -5,9 +5,4 @@ SRCS=	opt_bce.h if_bce.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DBCE_DEBUG=0
 
-clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
-	rm -f *.o *.kld *.ko
-	rm -f @ machine x86 miibus_if.h miidevs.h opt_bce.h
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile
index dff22bdc6a8f..b2e32f7db05c 100644
--- a/sys/modules/bxe/Makefile
+++ b/sys/modules/bxe/Makefile
@@ -18,9 +18,4 @@ SRCS	+= bxe.c               \
 
 CFLAGS += -I${BXE}
 
-clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
-	rm -f *.o *.kld *.ko
-	rm -f @ machine x86
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile
index 75f08d24182b..61657c61661c 100644
--- a/sys/modules/drm2/i915kms/Makefile
+++ b/sys/modules/drm2/i915kms/Makefile
@@ -7,6 +7,7 @@ SRCS	= \
 	i915_dma.c \
 	i915_drv.c \
 	i915_gem.c \
+	i915_gem_context.c \
 	i915_gem_execbuffer.c \
 	i915_gem_evict.c \
 	i915_gem_gtt.c \
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index 43b85f50cf11..40eb42719379 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -2,11 +2,10 @@
 
 KMOD=	fdc
 
+.PATH:  ${.CURDIR}/../../dev/fdc
 .if ${MACHINE} == "pc98"
-.PATH:  ${.CURDIR}/../../pc98/cbus
 SRCS=	fdc.c fdc_cbus.c
 .else
-.PATH:  ${.CURDIR}/../../dev/fdc
 SRCS=	fdc.c fdc_isa.c fdc_pccard.c
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 SRCS+=	opt_acpi.h acpi_if.h fdc_acpi.c
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index 57a242801449..f94e4410aecd 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	hv_utils
-SRCS=	hv_util.c
+SRCS=	hv_util.c hv_kvp.c
 SRCS+=	bus_if.h device_if.h
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile
index 885b983a8998..adddfb796f39 100644
--- a/sys/modules/i2c/controllers/alpm/Makefile
+++ b/sys/modules/i2c/controllers/alpm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../../pci
+.PATH:		${.CURDIR}/../../../../dev/alpm
 KMOD		= alpm
 SRCS		= device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \
 		  alpm.c
diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile
index 5f6d7ed295ba..2f6fcec1201b 100644
--- a/sys/modules/i2c/controllers/amdpm/Makefile
+++ b/sys/modules/i2c/controllers/amdpm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../../pci
+.PATH:		${.CURDIR}/../../../../dev/amdpm
 KMOD		= amdpm
 SRCS		= device_if.h bus_if.h pci_if.h smbus_if.h \
 		  amdpm.c
diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile
index d7306cebf689..43d1122b9751 100644
--- a/sys/modules/i2c/controllers/amdsmb/Makefile
+++ b/sys/modules/i2c/controllers/amdsmb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../../pci
+.PATH: ${.CURDIR}/../../../../dev/amdsmb
 
 KMOD=	amdsmb
 SRCS=	amdsmb.c
diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile
index 7cef578707b9..73d5254076ee 100644
--- a/sys/modules/i2c/controllers/intpm/Makefile
+++ b/sys/modules/i2c/controllers/intpm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../../pci
+.PATH:		${.CURDIR}/../../../../dev/intpm
 KMOD		= intpm
 SRCS		= device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \
 		  opt_intpm.h intpmreg.h intpm.c
diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile
index 21b67f3196f9..bb2a0f2fe5a1 100644
--- a/sys/modules/i2c/controllers/nfsmb/Makefile
+++ b/sys/modules/i2c/controllers/nfsmb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../../pci
+.PATH: ${.CURDIR}/../../../../dev/nfsmb
 
 KMOD=	nfsmb
 SRCS=	nfsmb.c
diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile
index 37100301b84a..f08b053c2cfa 100644
--- a/sys/modules/i2c/controllers/viapm/Makefile
+++ b/sys/modules/i2c/controllers/viapm/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../../pci
+.PATH:		${.CURDIR}/../../../../dev/viapm
 KMOD		= viapm
 SRCS		= device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \
 		  opt_isa.h viapm.c
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index fd1ace27ebb0..9e2ae973adbc 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -9,7 +9,7 @@ KMOD=	if_gif
 SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 
 .if defined(KERNBUILDDIR)
-OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h
+OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
 .if empty(OPT_INET6)
 MK_INET6_SUPPORT=no
 .endif
diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile
index 16bee5b1e1d0..923e2174d02c 100644
--- a/sys/modules/ixgbe/Makefile
+++ b/sys/modules/ixgbe/Makefile
@@ -10,6 +10,6 @@ SRCS    += ixgbe.c ixv.c
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
 SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
-CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
+CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 25615a7464b8..e02ac880a611 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -13,6 +13,7 @@ SRCS=	linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
+	linux_timer.c \
 	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
 	device_if.h bus_if.h assym.s
 
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index dec1ba955f68..1087123dd535 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -2,7 +2,7 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 KMOD    = mlx4
-SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
+SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h opt_inet.h opt_inet6.h
 SRCS+= alloc.c catas.c cmd.c cq.c eq.c fw.c icm.c intf.c main.c mcg.c mr.c linux_compat.c linux_radix.c	linux_idr.c
 SRCS+=	pd.c port.c profile.c qp.c reset.c sense.c srq.c resource_tracker.c sys_tune.c
 
diff --git a/sys/modules/mlxen/Makefile b/sys/modules/mlxen/Makefile
index 4e1415d8578f..258cf7e7bf98 100644
--- a/sys/modules/mlxen/Makefile
+++ b/sys/modules/mlxen/Makefile
@@ -3,8 +3,8 @@
 
 KMOD    = mlxen
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
-SRCS	+= en_cq.c en_frag.c en_main.c en_netdev.c en_port.c en_resources.c
-SRCS	+= en_rx.c en_tx.c
+SRCS	+= en_cq.c en_main.c en_netdev.c en_port.c en_resources.c
+SRCS	+= en_rx.c en_tx.c utils.c
 SRCS	+= opt_inet.h opt_inet6.h
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
diff --git a/sys/modules/ncr/Makefile b/sys/modules/ncr/Makefile
new file mode 100644
index 000000000000..7ba6c68381a5
--- /dev/null
+++ b/sys/modules/ncr/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/ncr
+
+KMOD=	ncr
+SRCS=	ncr.c
+SRCS+=	device_if.h bus_if.h pci_if.h opt_ncr.h opt_cam.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/netmap/Makefile b/sys/modules/netmap/Makefile
index 647cd103600f..8e5364bbe7a2 100644
--- a/sys/modules/netmap/Makefile
+++ b/sys/modules/netmap/Makefile
@@ -16,5 +16,6 @@ SRCS	+= netmap_vale.c
 SRCS	+= netmap_freebsd.c
 SRCS	+= netmap_offloadings.c
 SRCS	+= netmap_pipe.c
+SRCS	+= netmap_monitor.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index e846579a8ed7..16046adc59bb 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/rl
 
 KMOD=	if_rl
 SRCS=	if_rl.c device_if.h bus_if.h pci_if.h
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index 76f9364433fb..702587bb72c1 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -19,7 +19,6 @@ SRCS+=	vmm.c		\
 	vmm_ipi.c	\
 	vmm_lapic.c	\
 	vmm_mem.c	\
-	vmm_msr.c	\
 	vmm_stat.c	\
 	vmm_util.c	\
 	x86.c		\
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 3e857264d1b9..ad9f398e057d 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -21,6 +21,7 @@ SRCS+=	u8_textprep.c
 
 .PATH:	${SYSDIR}/cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_acl.c
+SRCS+=	opensolaris_dtrace.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
 SRCS+=	opensolaris_lookup.c
@@ -93,8 +94,10 @@ CFLAGS+=-DBUILDING_ZFS
 CFLAGS+=-mminimal-toc
 .endif
 
-#CFLAGS+=-DDEBUG=1
-#DEBUG_FLAGS=-g
+.ifdef ZFS_DEBUG
+CFLAGS+=-DDEBUG=1
+DEBUG_FLAGS=-g
+.endif
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
index 12cc72176187..548e81b8baa8 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -190,14 +190,15 @@ static const char *lacp_format_portid(const struct lacp_portid *, char *,
 static void	lacp_dprintf(const struct lacp_port *, const char *, ...)
 		    __attribute__((__format__(__printf__, 2, 3)));
 
-static int lacp_debug = 0;
+static VNET_DEFINE(int, lacp_debug);
+#define	V_lacp_debug	VNET(lacp_debug)
 SYSCTL_NODE(_net_link_lagg, OID_AUTO, lacp, CTLFLAG_RD, 0, "ieee802.3ad");
-SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, debug, CTLFLAG_RWTUN,
-    &lacp_debug, 0, "Enable LACP debug logging (1=debug, 2=trace)");
+SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, debug, CTLFLAG_RWTUN | CTLFLAG_VNET,
+    &VNET_NAME(lacp_debug), 0, "Enable LACP debug logging (1=debug, 2=trace)");
 
-#define LACP_DPRINTF(a) if (lacp_debug & 0x01) { lacp_dprintf a ; }
-#define LACP_TRACE(a) if (lacp_debug & 0x02) { lacp_dprintf(a,"%s\n",__func__); }
-#define LACP_TPRINTF(a) if (lacp_debug & 0x04) { lacp_dprintf a ; }
+#define LACP_DPRINTF(a) if (V_lacp_debug & 0x01) { lacp_dprintf a ; }
+#define LACP_TRACE(a) if (V_lacp_debug & 0x02) { lacp_dprintf(a,"%s\n",__func__); }
+#define LACP_TPRINTF(a) if (V_lacp_debug & 0x04) { lacp_dprintf a ; }
 
 /*
  * partner administration variables.
@@ -300,7 +301,7 @@ lacp_pdu_input(struct lacp_port *lp, struct mbuf *m)
 		goto bad;
 	}
 
-        if (lacp_debug > 0) {
+        if (V_lacp_debug > 0) {
 		lacp_dprintf(lp, "lacpdu receive\n");
 		lacp_dump_lacpdu(du);
 	}
@@ -385,7 +386,7 @@ lacp_xmit_lacpdu(struct lacp_port *lp)
 	    sizeof(du->ldu_collector));
 	du->ldu_collector.lci_maxdelay = 0;
 
-	if (lacp_debug > 0) {
+	if (V_lacp_debug > 0) {
 		lacp_dprintf(lp, "lacpdu transmit\n");
 		lacp_dump_lacpdu(du);
 	}
@@ -497,12 +498,14 @@ lacp_tick(void *arg)
 		if ((lp->lp_state & LACP_STATE_AGGREGATION) == 0)
 			continue;
 
+		CURVNET_SET(lp->lp_ifp->if_vnet);
 		lacp_run_timers(lp);
 
 		lacp_select(lp);
 		lacp_sm_mux(lp);
 		lacp_sm_tx(lp);
 		lacp_sm_ptx_tx_schedule(lp);
+		CURVNET_RESTORE();
 	}
 	callout_reset(&lsc->lsc_callout, hz, lacp_tick, lsc);
 }
@@ -528,7 +531,8 @@ lacp_port_create(struct lagg_port *lgp)
 	    LLADDR(&sdl), ETHER_ADDR_LEN);
 	error = if_addmulti(ifp, (struct sockaddr *)&sdl, &rifma);
 	if (error) {
-		printf("%s: ADDMULTI failed on %s\n", __func__, lgp->lp_ifname);
+		printf("%s: ADDMULTI failed on %s\n", __func__,
+		    lgp->lp_ifp->if_xname);
 		return (error);
 	}
 
@@ -538,7 +542,7 @@ lacp_port_create(struct lagg_port *lgp)
 		return (ENOMEM);
 
 	LACP_LOCK(lsc);
-	lgp->lp_psc = (caddr_t)lp;
+	lgp->lp_psc = lp;
 	lp->lp_ifp = ifp;
 	lp->lp_lagg = lgp;
 	lp->lp_lsc = lsc;
@@ -585,7 +589,7 @@ lacp_port_destroy(struct lagg_port *lgp)
 }
 
 void
-lacp_req(struct lagg_softc *sc, caddr_t data)
+lacp_req(struct lagg_softc *sc, void *data)
 {
 	struct lacp_opreq *req = (struct lacp_opreq *)data;
 	struct lacp_softc *lsc = LACP_SOFTC(sc);
@@ -593,7 +597,7 @@ lacp_req(struct lagg_softc *sc, caddr_t data)
 
 	bzero(req, sizeof(struct lacp_opreq));
 	
-	/* 
+	/*
 	 * If the LACP softc is NULL, return with the opreq structure full of
 	 * zeros.  It is normal for the softc to be NULL while the lagg is
 	 * being destroyed.
@@ -624,7 +628,7 @@ lacp_req(struct lagg_softc *sc, caddr_t data)
 }
 
 void
-lacp_portreq(struct lagg_port *lgp, caddr_t data)
+lacp_portreq(struct lagg_port *lgp, void *data)
 {
 	struct lacp_opreq *req = (struct lacp_opreq *)data;
 	struct lacp_port *lp = LACP_PORT(lgp);
@@ -746,55 +750,14 @@ lacp_transit_expire(void *vp)
 	lsc->lsc_suppress_distributing = FALSE;
 }
 
-static void
-lacp_attach_sysctl(struct lacp_softc *lsc, struct sysctl_oid *p_oid)
-{
-	struct lagg_softc *sc = lsc->lsc_softc;
-
-	SYSCTL_ADD_UINT(&sc->ctx, SYSCTL_CHILDREN(p_oid), OID_AUTO,
-	    "lacp_strict_mode",
-	    CTLFLAG_RW,
-	    &lsc->lsc_strict_mode,
-	    lsc->lsc_strict_mode,
-	    "Enable LACP strict mode");
-}
-
-static void
-lacp_attach_sysctl_debug(struct lacp_softc *lsc, struct sysctl_oid *p_oid)
-{
-	struct lagg_softc *sc = lsc->lsc_softc;
-	struct sysctl_oid *oid;
-
-	/* Create a child of the parent lagg interface */
-	oid = SYSCTL_ADD_NODE(&sc->ctx, SYSCTL_CHILDREN(p_oid),
-	    OID_AUTO, "debug", CTLFLAG_RD, NULL, "DEBUG");
-
-	SYSCTL_ADD_UINT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-	    "rx_test",
-	    CTLFLAG_RW,
-	    &lsc->lsc_debug.lsc_rx_test,
-	    lsc->lsc_debug.lsc_rx_test,
-	    "Bitmap of if_dunit entries to drop RX frames for");
-	SYSCTL_ADD_UINT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-	    "tx_test",
-	    CTLFLAG_RW,
-	    &lsc->lsc_debug.lsc_tx_test,
-	    lsc->lsc_debug.lsc_tx_test,
-	    "Bitmap of if_dunit entries to drop TX frames for");
-}
-
-int
+void
 lacp_attach(struct lagg_softc *sc)
 {
 	struct lacp_softc *lsc;
-	struct sysctl_oid *oid;
 
-	lsc = malloc(sizeof(struct lacp_softc),
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (lsc == NULL)
-		return (ENOMEM);
+	lsc = malloc(sizeof(struct lacp_softc), M_DEVBUF, M_WAITOK | M_ZERO);
 
-	sc->sc_psc = (caddr_t)lsc;
+	sc->sc_psc = lsc;
 	lsc->lsc_softc = sc;
 
 	lsc->lsc_hashkey = arc4random();
@@ -804,41 +767,29 @@ lacp_attach(struct lagg_softc *sc)
 	TAILQ_INIT(&lsc->lsc_aggregators);
 	LIST_INIT(&lsc->lsc_ports);
 
-	/* Create a child of the parent lagg interface */
-	oid = SYSCTL_ADD_NODE(&sc->ctx, SYSCTL_CHILDREN(sc->sc_oid),
-	    OID_AUTO, "lacp", CTLFLAG_RD, NULL, "LACP");
-
-	/* Attach sysctl nodes */
-	lacp_attach_sysctl(lsc, oid);
-	lacp_attach_sysctl_debug(lsc, oid);
-
 	callout_init_mtx(&lsc->lsc_transit_callout, &lsc->lsc_mtx, 0);
 	callout_init_mtx(&lsc->lsc_callout, &lsc->lsc_mtx, 0);
 
 	/* if the lagg is already up then do the same */
 	if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING)
 		lacp_init(sc);
-
-	return (0);
 }
 
-int
-lacp_detach(struct lagg_softc *sc)
+void
+lacp_detach(void *psc)
 {
-	struct lacp_softc *lsc = LACP_SOFTC(sc);
+	struct lacp_softc *lsc = (struct lacp_softc *)psc;
 
 	KASSERT(TAILQ_EMPTY(&lsc->lsc_aggregators),
 	    ("aggregators still active"));
 	KASSERT(lsc->lsc_active_aggregator == NULL,
 	    ("aggregator still attached"));
 
-	sc->sc_psc = NULL;
 	callout_drain(&lsc->lsc_transit_callout);
 	callout_drain(&lsc->lsc_callout);
 
 	LACP_LOCK_DESTROY(lsc);
 	free(lsc, M_DEVBUF);
-	return (0);
 }
 
 void
@@ -881,7 +832,7 @@ lacp_select_tx_port(struct lagg_softc *sc, struct mbuf *m)
 		return (NULL);
 	}
 
-	if (sc->use_flowid && (m->m_flags & M_FLOWID))
+	if ((sc->sc_opts & LAGG_OPT_USE_FLOWID) && (m->m_flags & M_FLOWID))
 		hash = m->m_pkthdr.flowid >> sc->flowid_shift;
 	else
 		hash = lagg_hashmbuf(sc, m, lsc->lsc_hashkey);
@@ -993,13 +944,13 @@ lacp_select_active_aggregator(struct lacp_softc *lsc)
 		    lacp_format_lagid_aggregator(la, buf, sizeof(buf)),
 		    speed, la->la_nports));
 
-		/* This aggregator is chosen if
-		 *      the partner has a better system priority
-		 *  or, the total aggregated speed is higher
-		 *  or, it is already the chosen aggregator
+		/*
+		 * This aggregator is chosen if the partner has a better
+		 * system priority or, the total aggregated speed is higher
+		 * or, it is already the chosen aggregator
 		 */
 		if ((best_la != NULL && LACP_SYS_PRI(la->la_partner) <
-		     LACP_SYS_PRI(best_la->la_partner)) ||
+		    LACP_SYS_PRI(best_la->la_partner)) ||
 		    speed > best_speed ||
 		    (speed == best_speed &&
 		    la == lsc->lsc_active_aggregator)) {
@@ -1380,7 +1331,7 @@ lacp_sm_mux(struct lacp_port *lp)
 	enum lacp_selected selected = lp->lp_selected;
 	struct lacp_aggregator *la;
 
-	if (lacp_debug > 1)
+	if (V_lacp_debug > 1)
 		lacp_dprintf(lp, "%s: state= 0x%x, selected= 0x%x, "
 		    "p_sync= 0x%x, p_collecting= 0x%x\n", __func__,
 		    lp->lp_mux_state, selected, p_sync, p_collecting);
diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h
index ca5f76eaaba9..535cf1fd1dfa 100644
--- a/sys/net/ieee8023ad_lacp.h
+++ b/sys/net/ieee8023ad_lacp.h
@@ -282,15 +282,15 @@ struct lacp_softc {
 
 struct mbuf	*lacp_input(struct lagg_port *, struct mbuf *);
 struct lagg_port *lacp_select_tx_port(struct lagg_softc *, struct mbuf *);
-int		lacp_attach(struct lagg_softc *);
-int		lacp_detach(struct lagg_softc *);
+void		lacp_attach(struct lagg_softc *);
+void		lacp_detach(void *);
 void		lacp_init(struct lagg_softc *);
 void		lacp_stop(struct lagg_softc *);
 int		lacp_port_create(struct lagg_port *);
 void		lacp_port_destroy(struct lagg_port *);
 void		lacp_linkstate(struct lagg_port *);
-void		lacp_req(struct lagg_softc *, caddr_t);
-void		lacp_portreq(struct lagg_port *, caddr_t);
+void		lacp_req(struct lagg_softc *, void *);
+void		lacp_portreq(struct lagg_port *, void *);
 
 static __inline int
 lacp_isactive(struct lagg_port *lgp)
diff --git a/sys/net/if.c b/sys/net/if.c
index 06993e3cb46e..a7fb2a95feec 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -468,6 +468,10 @@ if_alloc(u_char type)
 
 	refcount_init(&ifp->if_refcount, 1);	/* Index reference. */
 	ifnet_setbyindex(ifp->if_index, ifp);
+
+	for (int i = 0; i < IFCOUNTERS; i++)
+		ifp->if_counters[i] = counter_u64_alloc(M_WAITOK);
+
 	return (ifp);
 }
 
@@ -495,6 +499,10 @@ if_free_internal(struct ifnet *ifp)
 	IF_AFDATA_DESTROY(ifp);
 	IF_ADDR_LOCK_DESTROY(ifp);
 	ifq_delete(&ifp->if_snd);
+
+	for (int i = 0; i < IFCOUNTERS; i++)
+		counter_u64_free(ifp->if_counters[i]);
+
 	free(ifp, M_IFNET);
 }
 
@@ -584,6 +592,57 @@ if_attach(struct ifnet *ifp)
 	if_attach_internal(ifp, 0);
 }
 
+/*
+ * Compute the least common TSO limit.
+ */
+void
+if_hw_tsomax_common(if_t ifp, struct ifnet_hw_tsomax *pmax)
+{
+	/*
+	 * 1) If there is no limit currently, take the limit from
+	 * the network adapter.
+	 *
+	 * 2) If the network adapter has a limit below the current
+	 * limit, apply it.
+	 */
+	if (pmax->tsomaxbytes == 0 || (ifp->if_hw_tsomax != 0 &&
+	    ifp->if_hw_tsomax < pmax->tsomaxbytes)) {
+		pmax->tsomaxbytes = ifp->if_hw_tsomax;
+	}
+	if (pmax->tsomaxsegcount == 0 || (ifp->if_hw_tsomaxsegcount != 0 &&
+	    ifp->if_hw_tsomaxsegcount < pmax->tsomaxsegcount)) {
+		pmax->tsomaxsegcount = ifp->if_hw_tsomaxsegcount;
+	}
+	if (pmax->tsomaxsegsize == 0 || (ifp->if_hw_tsomaxsegsize != 0 &&
+	    ifp->if_hw_tsomaxsegsize < pmax->tsomaxsegsize)) {
+		pmax->tsomaxsegsize = ifp->if_hw_tsomaxsegsize;
+	}
+}
+
+/*
+ * Update TSO limit of a network adapter.
+ *
+ * Returns zero if no change. Else non-zero.
+ */
+int
+if_hw_tsomax_update(if_t ifp, struct ifnet_hw_tsomax *pmax)
+{
+	int retval = 0;
+	if (ifp->if_hw_tsomax != pmax->tsomaxbytes) {
+		ifp->if_hw_tsomax = pmax->tsomaxbytes;
+		retval++;
+	}
+	if (ifp->if_hw_tsomaxsegsize != pmax->tsomaxsegsize) {
+		ifp->if_hw_tsomaxsegsize = pmax->tsomaxsegsize;
+		retval++;
+	}
+	if (ifp->if_hw_tsomaxsegcount != pmax->tsomaxsegcount) {
+		ifp->if_hw_tsomaxsegcount = pmax->tsomaxsegcount;
+		retval++;
+	}
+	return (retval);
+}
+
 static void
 if_attach_internal(struct ifnet *ifp, int vmove)
 {
@@ -616,7 +675,7 @@ if_attach_internal(struct ifnet *ifp, int vmove)
 	}
 
 	if (ifp->if_get_counter == NULL)
-		ifp->if_get_counter = if_get_counter_compat;
+		ifp->if_get_counter = if_get_counter_default;
 
 	if (!vmove) {
 #ifdef MAC
@@ -659,13 +718,36 @@ if_attach_internal(struct ifnet *ifp, int vmove)
 		ifp->if_broadcastaddr = NULL;
 
 #if defined(INET) || defined(INET6)
-		/* Initialize to max value. */
-		if (ifp->if_hw_tsomax == 0)
-			ifp->if_hw_tsomax = min(IP_MAXPACKET, 32 * MCLBYTES -
+		/* Use defaults for TSO, if nothing is set */
+		if (ifp->if_hw_tsomax == 0 &&
+		    ifp->if_hw_tsomaxsegcount == 0 &&
+		    ifp->if_hw_tsomaxsegsize == 0) {
+			/*
+			 * The TSO defaults needs to be such that an
+			 * NFS mbuf list of 35 mbufs totalling just
+			 * below 64K works and that a chain of mbufs
+			 * can be defragged into at most 32 segments:
+			 */
+			ifp->if_hw_tsomax = min(IP_MAXPACKET, (32 * MCLBYTES) -
 			    (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN));
-		KASSERT(ifp->if_hw_tsomax <= IP_MAXPACKET &&
-		    ifp->if_hw_tsomax >= IP_MAXPACKET / 8,
-		    ("%s: tsomax outside of range", __func__));
+			ifp->if_hw_tsomaxsegcount = 35;
+			ifp->if_hw_tsomaxsegsize = 2048;	/* 2K */
+
+			/* XXX some drivers set IFCAP_TSO after ethernet attach */
+			if (ifp->if_capabilities & IFCAP_TSO) {
+				if_printf(ifp, "Using defaults for TSO: %u/%u/%u\n",
+				    ifp->if_hw_tsomax,
+				    ifp->if_hw_tsomaxsegcount,
+				    ifp->if_hw_tsomaxsegsize);
+			}
+		}
+		/*
+		 * If the "if_hw_tsomax" limit is set, check if it is
+		 * too small:
+		 */
+		KASSERT(ifp->if_hw_tsomax == 0 ||
+		    ifp->if_hw_tsomax >= (IP_MAXPACKET / 8),
+		    ("%s: if_hw_tsomax is outside of range", __func__));
 #endif
 	}
 #ifdef VIMAGE
@@ -1386,39 +1468,28 @@ if_rtdel(struct radix_node *rn, void *arg)
 }
 
 /*
- * Return counter values from old racy non-pcpu counters.
+ * Return counter values from counter(9)s stored in ifnet.
  */
 uint64_t
-if_get_counter_compat(struct ifnet *ifp, ifnet_counter cnt)
+if_get_counter_default(struct ifnet *ifp, ift_counter cnt)
 {
 
-	switch (cnt) {
-		case IFCOUNTER_IPACKETS:
-			return (ifp->if_ipackets);
-		case IFCOUNTER_IERRORS:
-			return (ifp->if_ierrors);
-		case IFCOUNTER_OPACKETS:
-			return (ifp->if_opackets);
-		case IFCOUNTER_OERRORS:
-			return (ifp->if_oerrors);
-		case IFCOUNTER_COLLISIONS:
-			return (ifp->if_collisions);
-		case IFCOUNTER_IBYTES:
-			return (ifp->if_ibytes);
-		case IFCOUNTER_OBYTES:
-			return (ifp->if_obytes);
-		case IFCOUNTER_IMCASTS:
-			return (ifp->if_imcasts);
-		case IFCOUNTER_OMCASTS:
-			return (ifp->if_omcasts);
-		case IFCOUNTER_IQDROPS:
-			return (ifp->if_iqdrops);
-		case IFCOUNTER_OQDROPS:
-			return (ifp->if_oqdrops);
-		case IFCOUNTER_NOPROTO:
-			return (ifp->if_noproto);
-	}
-	panic("%s: unknown counter %d", __func__, cnt);
+	KASSERT(cnt < IFCOUNTERS, ("%s: invalid cnt %d", __func__, cnt));
+
+	return (counter_u64_fetch(ifp->if_counters[cnt]));
+}
+
+/*
+ * Increase an ifnet counter. Usually used for counters shared
+ * between the stack and a driver, but function supports them all.
+ */
+void
+if_inc_counter(struct ifnet *ifp, ift_counter cnt, int64_t inc)
+{
+
+	KASSERT(cnt < IFCOUNTERS, ("%s: invalid cnt %d", __func__, cnt));
+
+	counter_u64_add(ifp->if_counters[cnt], inc);
 }
 
 /*
@@ -1694,13 +1765,15 @@ ifa_ifwithaddr_check(struct sockaddr *addr)
  */
 /* ARGSUSED */
 struct ifaddr *
-ifa_ifwithbroadaddr(struct sockaddr *addr)
+ifa_ifwithbroadaddr(struct sockaddr *addr, int fibnum)
 {
 	struct ifnet *ifp;
 	struct ifaddr *ifa;
 
 	IFNET_RLOCK_NOSLEEP();
 	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
+		if ((fibnum != RT_ALL_FIBS) && (ifp->if_fib != fibnum))
+			continue;
 		IF_ADDR_RLOCK(ifp);
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			if (ifa->ifa_addr->sa_family != addr->sa_family)
@@ -1727,7 +1800,7 @@ ifa_ifwithbroadaddr(struct sockaddr *addr)
  */
 /*ARGSUSED*/
 struct ifaddr *
-ifa_ifwithdstaddr_fib(struct sockaddr *addr, int fibnum)
+ifa_ifwithdstaddr(struct sockaddr *addr, int fibnum)
 {
 	struct ifnet *ifp;
 	struct ifaddr *ifa;
@@ -1757,19 +1830,12 @@ ifa_ifwithdstaddr_fib(struct sockaddr *addr, int fibnum)
 	return (ifa);
 }
 
-struct ifaddr *
-ifa_ifwithdstaddr(struct sockaddr *addr)
-{
-
-	return (ifa_ifwithdstaddr_fib(addr, RT_ALL_FIBS));
-}
-
 /*
  * Find an interface on a specific network.  If many, choice
  * is most specific found.
  */
 struct ifaddr *
-ifa_ifwithnet_fib(struct sockaddr *addr, int ignore_ptp, int fibnum)
+ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp, int fibnum)
 {
 	struct ifnet *ifp;
 	struct ifaddr *ifa;
@@ -1867,13 +1933,6 @@ next:				continue;
 	return (ifa);
 }
 
-struct ifaddr *
-ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp)
-{
-
-	return (ifa_ifwithnet_fib(addr, ignore_ptp, RT_ALL_FIBS));
-}
-
 /*
  * Find an interface address specific to an interface best matching
  * a given address.
@@ -3483,15 +3542,15 @@ if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp, int adjust)
 
 	IF_LOCK(ifq);
 	if (_IF_QFULL(ifq)) {
-		_IF_DROP(ifq);
 		IF_UNLOCK(ifq);
+		if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
 		m_freem(m);
 		return (0);
 	}
 	if (ifp != NULL) {
-		ifp->if_obytes += m->m_pkthdr.len + adjust;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len + adjust);
 		if (m->m_flags & (M_BCAST|M_MCAST))
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		active = ifp->if_drv_flags & IFF_DRV_OACTIVE;
 	}
 	_IF_ENQUEUE(ifq, m);
@@ -3735,139 +3794,12 @@ if_getvtag(struct mbuf *m)
 	return (m->m_pkthdr.ether_vtag);
 }
 
-/* Statistics */
-int
-if_incipackets(if_t ifp, int pkts)
-{
-	((struct ifnet *)ifp)->if_ipackets += pkts;
-	return (0);
-}
-
-int
-if_incopackets(if_t ifp, int pkts)
-{
-	((struct ifnet *)ifp)->if_opackets += pkts;
-	return (0);
-}
-
-int
-if_incierrors(if_t ifp, int ierrors)
-{
-	((struct ifnet *)ifp)->if_ierrors += ierrors;
-	return (0);
-}
-
-
-int
-if_setierrors(if_t ifp, int ierrors)
-{
-	((struct ifnet *)ifp)->if_ierrors = ierrors;
-	return (0);
-}
-
-int
-if_setoerrors(if_t ifp, int oerrors)
-{
-	((struct ifnet *)ifp)->if_oerrors = oerrors;
-	return (0);
-}
-
-int if_incoerrors(if_t ifp, int oerrors)
-{
-	((struct ifnet *)ifp)->if_oerrors += oerrors;
-	return (0);
-}
-
-int if_inciqdrops(if_t ifp, int val)
-{
-	((struct ifnet *)ifp)->if_iqdrops += val;
-	return (0);
-}
-
-int
-if_setcollisions(if_t ifp, int collisions)
-{
-	((struct ifnet *)ifp)->if_collisions = collisions;
-	return (0);
-}
-
-int
-if_inccollisions(if_t ifp, int collisions)
-{
-	((struct ifnet *)ifp)->if_collisions += collisions;
-	return (0);
-}
- 
-int
-if_setipackets(if_t ifp, int pkts)
-{
-	((struct ifnet *)ifp)->if_ipackets = pkts;
-	return (0);
-}
-
-int
-if_setopackets(if_t ifp, int pkts)
-{
-	((struct ifnet *)ifp)->if_opackets = pkts;
-	return (0);
-}
-
-int
-if_incobytes(if_t ifp, int bytes)
-{
-	((struct ifnet *)ifp)->if_obytes += bytes;
-	return (0);
-}
-
-int
-if_setibytes(if_t ifp, int bytes)
-{
-	((struct ifnet *)ifp)->if_ibytes = bytes;
-	return (0);
-}
-
-int
-if_setobytes(if_t ifp, int bytes)
-{
-	((struct ifnet *)ifp)->if_obytes = bytes;
-	return (0);
-}
-
-
 int
 if_sendq_empty(if_t ifp)
 {
 	return IFQ_DRV_IS_EMPTY(&((struct ifnet *)ifp)->if_snd);
 }
 
-int if_getiqdrops(if_t ifp)
-{
-	return ((struct ifnet *)ifp)->if_iqdrops;
-}
-
-int
-if_incimcasts(if_t ifp, int mcast)
-{
-	((struct ifnet *)ifp)->if_imcasts += mcast;
-	return (0);
-}
-
-
-int
-if_incomcasts(if_t ifp, int mcast)
-{
-	((struct ifnet *)ifp)->if_omcasts += mcast;
-	return (0);
-}
-
-int
-if_setimcasts(if_t ifp, int mcast)
-{
-	((struct ifnet *)ifp)->if_imcasts = mcast;
-	return (0);
-}
-
-
 struct ifaddr *
 if_getifaddr(if_t ifp)
 {
@@ -4057,6 +3989,13 @@ void if_setqflushfn(if_t ifp, if_qflush_fn_t flush_fn)
 	
 }
 
+void
+if_setgetcounterfn(if_t ifp, if_get_counter_t fn)
+{
+
+	ifp->if_get_counter = fn;
+}
+
 /* Revisit these - These are inline functions originally. */
 int
 drbr_inuse_drv(if_t ifh, struct buf_ring *br)
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index f59315040abb..617f9ee13d88 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -357,7 +357,7 @@ arc_defrag(struct ifnet *ifp, struct mbuf *m)
 	if (m->m_len < ARC_HDRNEWLEN) {
 		m = m_pullup(m, ARC_HDRNEWLEN);
 		if (m == NULL) {
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			return NULL;
 		}
 	}
@@ -377,7 +377,7 @@ arc_defrag(struct ifnet *ifp, struct mbuf *m)
 		if (m->m_len < ARC_HDRNEWLEN) {
 			m = m_pullup(m, ARC_HDRNEWLEN);
 			if (m == NULL) {
-				++ifp->if_ierrors;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return NULL;
 			}
 		}
@@ -530,11 +530,11 @@ arc_input(struct ifnet *ifp, struct mbuf *m)
 		return;
 	}
 
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	if (ah->arc_dhost == arcbroadcastaddr) {
 		m->m_flags |= M_BCAST|M_MCAST;
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 	}
 
 	atype = ah->arc_type;
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 8bf8534bc851..e1c4a6753973 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -252,7 +252,7 @@ atm_input(struct ifnet *ifp, struct atm_pseudohdr *ah, struct mbuf *m,
 #ifdef MAC
 	mac_ifnet_create_mbuf(ifp, m);
 #endif
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	if (ng_atm_input_p != NULL) {
 		(*ng_atm_input_p)(ifp, &m, ah, rxhand);
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 59d63ee4f227..252404f328e6 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1848,7 +1848,7 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
 			if (m == NULL) {
 				if_printf(dst_ifp,
 				    "unable to prepend VLAN header\n");
-				dst_ifp->if_oerrors++;
+				if_inc_counter(dst_ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 			m->m_flags &= ~M_VLANTAG;
@@ -1856,14 +1856,14 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
 
 		if ((err = dst_ifp->if_transmit(dst_ifp, m))) {
 			m_freem(m0);
-			sc->sc_ifp->if_oerrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 			break;
 		}
 
-		sc->sc_ifp->if_opackets++;
-		sc->sc_ifp->if_obytes += len;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1);
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, len);
 		if (mflags & M_MCAST)
-			sc->sc_ifp->if_omcasts++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_OMCASTS, 1);
 	}
 
 	return (err);
@@ -1994,7 +1994,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
 			} else {
 				mc = m_copypacket(m, M_NOWAIT);
 				if (mc == NULL) {
-					sc->sc_ifp->if_oerrors++;
+					if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 					continue;
 				}
 			}
@@ -2084,8 +2084,8 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
 	src_if = m->m_pkthdr.rcvif;
 	ifp = sc->sc_ifp;
 
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	vlan = VLANTAGOF(m);
 
 	if ((sbif->bif_flags & IFBIF_STP) &&
@@ -2137,7 +2137,7 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
 			goto drop;
 
 		/* ...forward it to all interfaces. */
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 		dst_if = NULL;
 	}
 
@@ -2245,8 +2245,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 	if ((bifp->if_flags & IFF_MONITOR) != 0) {
 		m->m_pkthdr.rcvif  = bifp;
 		ETHER_BPF_MTAP(bifp, m);
-		bifp->if_ipackets++;
-		bifp->if_ibytes += m->m_pkthdr.len;
+		if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1);
+		if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 		m_freem(m);
 		return (NULL);
 	}
@@ -2347,8 +2347,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 	    ) {								\
 		if ((iface)->if_type == IFT_BRIDGE) {			\
 			ETHER_BPF_MTAP(iface, m);			\
-			iface->if_ipackets++;				\
-			iface->if_ibytes += m->m_pkthdr.len;		\
+			if_inc_counter(iface, IFCOUNTER_IPACKETS, 1);				\
+			if_inc_counter(iface, IFCOUNTER_IBYTES, m->m_pkthdr.len);		\
 			/* Filter on the physical interface. */		\
 			if (pfil_local_phys &&				\
 			    (PFIL_HOOKED(&V_inet_pfil_hook)		\
@@ -2478,7 +2478,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 		} else {
 			mc = m_dup(m, M_NOWAIT);
 			if (mc == NULL) {
-				sc->sc_ifp->if_oerrors++;
+				if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		}
@@ -2498,7 +2498,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 				i = min(mc->m_pkthdr.len, max_protohdr);
 				mc = m_copyup(mc, i, ETHER_ALIGN);
 				if (mc == NULL) {
-					sc->sc_ifp->if_oerrors++;
+					if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 					continue;
 				}
 			}
@@ -2541,7 +2541,7 @@ bridge_span(struct bridge_softc *sc, struct mbuf *m)
 
 		mc = m_copypacket(m, M_NOWAIT);
 		if (mc == NULL) {
-			sc->sc_ifp->if_oerrors++;
+			if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 			continue;
 		}
 
diff --git a/sys/net/if_debug.c b/sys/net/if_debug.c
index e731937462c9..1d198eb925f2 100644
--- a/sys/net/if_debug.c
+++ b/sys/net/if_debug.c
@@ -79,7 +79,6 @@ if_show_ifnet(struct ifnet *ifp)
 	IF_DB_PRINTF("%p", if_snd.ifq_tail);
 	IF_DB_PRINTF("%d", if_snd.ifq_len);
 	IF_DB_PRINTF("%d", if_snd.ifq_maxlen);
-	IF_DB_PRINTF("%d", if_snd.ifq_drops);
 	IF_DB_PRINTF("%p", if_snd.ifq_drv_head);
 	IF_DB_PRINTF("%p", if_snd.ifq_drv_tail);
 	IF_DB_PRINTF("%d", if_snd.ifq_drv_len);
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 370cce822e5b..4cce4847d02b 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -174,8 +174,8 @@ discoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 	m->m_pkthdr.rcvif = ifp;
 
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	m_freem(m);
 	return (0);
diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
index 3ee1c6d864af..b75f134c9bc6 100644
--- a/sys/net/if_edsc.c
+++ b/sys/net/if_edsc.c
@@ -291,8 +291,8 @@ edsc_start(struct ifnet *ifp)
 		/*
 		 * Update the interface counters.
 		 */
-		ifp->if_obytes += m->m_pkthdr.len;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 
 		/*
 		 * Finally, just drop the packet.
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
index 3c5c94ed3e81..13d7e0b30d1a 100644
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -418,7 +418,7 @@ epair_start_locked(struct ifnet *ifp)
 		 */
 		if ((oifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
 		    (oifp->if_flags & IFF_UP) ==0) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(m);
 			continue;
 		}
@@ -434,15 +434,15 @@ epair_start_locked(struct ifnet *ifp)
 		error = netisr_queue(NETISR_EPAIR, m);
 		CURVNET_RESTORE();
 		if (!error) {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			/* Someone else received the packet. */
-			oifp->if_ipackets++;
+			if_inc_counter(oifp, IFCOUNTER_IPACKETS, 1);
 		} else {
 			/* The packet was freed already. */
 			epair_dpcpu->epair_drv_flags |= IFF_DRV_OACTIVE;
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			(void) epair_add_ifp_for_draining(ifp);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			EPAIR_REFCOUNT_RELEASE(&sc->refcount);
 			EPAIR_REFCOUNT_ASSERT((int)sc->refcount >= 1,
 			    ("%s: ifp=%p sc->refcount not >= 1: %d",
@@ -503,7 +503,7 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf *m)
 	oifp = sc->oifp;
 	if ((oifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
 	    (oifp->if_flags & IFF_UP) ==0) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		return (0);
 	}
@@ -517,12 +517,12 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf *m)
 	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
 		ALTQ_ENQUEUE(&ifp->if_snd, m, NULL, error);
 		if (error)
-			ifp->if_snd.ifq_drops++;
+			if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
 		IF_UNLOCK(&ifp->if_snd);
 		if (!error) {
-			ifp->if_obytes += len;
+			if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
 			if (mflags & (M_BCAST|M_MCAST))
-				ifp->if_omcasts++;
+				if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 			
 			if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0)
 				epair_start_locked(ifp);
@@ -556,22 +556,22 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf *m)
 	error = netisr_queue(NETISR_EPAIR, m);
 	CURVNET_RESTORE();
 	if (!error) {
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		/*
 		 * IFQ_HANDOFF_ADJ/ip_handoff() update statistics,
 		 * but as we bypass all this we have to duplicate
 		 * the logic another time.
 		 */
-		ifp->if_obytes += len;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
 		if (mflags & (M_BCAST|M_MCAST))
-			ifp->if_omcasts++;
+			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 		/* Someone else received the packet. */
-		oifp->if_ipackets++;
+		if_inc_counter(oifp, IFCOUNTER_IPACKETS, 1);
 	} else {
 		/* The packet was freed already. */
 		epair_dpcpu->epair_drv_flags |= IFF_DRV_OACTIVE;
 		ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		EPAIR_REFCOUNT_RELEASE(&sc->refcount);
 		EPAIR_REFCOUNT_ASSERT((int)sc->refcount >= 1,
 		    ("%s: ifp=%p sc->refcount not >= 1: %d",
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 4c2bd4ecb70b..5f315ec02cb8 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -306,7 +306,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m,
 				update_mbuf_csumflags(m, n);
 				(void)if_simloop(ifp, n, dst->sa_family, hlen);
 			} else
-				ifp->if_iqdrops++;
+				if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		} else if (bcmp(eh->ether_dhost, eh->ether_shost,
 				ETHER_ADDR_LEN) == 0) {
 			update_mbuf_csumflags(m, m);
@@ -404,7 +404,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 	 */
 	if ((m->m_flags & M_PKTHDR) == 0) {
 		if_printf(ifp, "discard frame w/o packet header\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
@@ -413,7 +413,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 		if_printf(ifp, "discard frame w/o leading ethernet "
 				"header (len %u pkt len %u)\n",
 				m->m_len, m->m_pkthdr.len);
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
@@ -421,7 +421,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 	etype = ntohs(eh->ether_type);
 	if (m->m_pkthdr.rcvif == NULL) {
 		if_printf(ifp, "discard frame w/o interface pointer\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
@@ -439,7 +439,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 			m->m_flags |= M_BCAST;
 		else
 			m->m_flags |= M_MCAST;
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 	}
 
 #ifdef MAC
@@ -466,7 +466,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 	}
 
 	if (!(ifp->if_capenable & IFCAP_HWSTATS))
-		ifp->if_ibytes += m->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	/* Allow monitor mode to claim this frame, after stats are updated. */
 	if (ifp->if_flags & IFF_MONITOR) {
@@ -502,7 +502,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 #ifdef DIAGNOSTIC
 			if_printf(ifp, "cannot pullup VLAN header\n");
 #endif
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			m_freem(m);
 			CURVNET_RESTORE();
 			return;
@@ -715,7 +715,7 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
 	if ((m->m_flags & M_VLANTAG) &&
 	    EVL_VLANOFTAG(m->m_pkthdr.ether_vtag) != 0) {
 		if (ifp->if_vlantrunk == NULL) {
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			m_freem(m);
 			return;
 		}
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 5d22a4a9dbe0..2aeb14adfdbb 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -211,8 +211,8 @@ faithoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		return (rt->rt_flags & RTF_BLACKHOLE ? 0 :
 		        rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
 	}
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	switch (af) {
 #ifdef INET
 	case AF_INET:
@@ -232,8 +232,8 @@ faithoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	/* XXX do we need more sanity checks? */
 
 	m->m_pkthdr.rcvif = ifp;
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	netisr_dispatch(isr, m);
 	return (0);
 }
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 1680dcac1dd8..4056396b6a68 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -288,12 +288,12 @@ fddi_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 	error = (ifp->if_transmit)(ifp, m);
 	if (error)
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	return (error);
 
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if (m)
 		m_freem(m);
 	return (error);
@@ -317,20 +317,20 @@ fddi_input(ifp, m)
 	 */
 	if ((m->m_flags & M_PKTHDR) == 0) {
 		if_printf(ifp, "discard frame w/o packet header\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
 	if (m->m_pkthdr.rcvif == NULL) {
 		if_printf(ifp, "discard frame w/o interface pointer\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
         }
 
 	m = m_pullup(m, FDDI_HDR_LEN);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto dropanyway;
 	}
 	fh = mtod(m, struct fddi_header *);
@@ -362,7 +362,7 @@ fddi_input(ifp, m)
 	/*
 	 * Update interface statistics.
 	 */
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	getmicrotime(&ifp->if_lastchange);
 
 	/*
@@ -383,7 +383,7 @@ fddi_input(ifp, m)
 			m->m_flags |= M_BCAST;
 		else
 			m->m_flags |= M_MCAST;
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 	}
 
 #ifdef M_LINK0
@@ -401,7 +401,7 @@ fddi_input(ifp, m)
 
 	m = m_pullup(m, LLC_SNAPFRAMELEN);
 	if (m == 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto dropanyway;
 	}
 	l = mtod(m, struct llc *);
@@ -412,13 +412,13 @@ fddi_input(ifp, m)
 		u_int16_t type;
 		if ((l->llc_control != LLC_UI) ||
 		    (l->llc_ssap != LLC_SNAP_LSAP)) {
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 		if (l->llc_snap.org_code[0] != 0 ||
 		    l->llc_snap.org_code[1] != 0 ||
 		    l->llc_snap.org_code[2] != 0) {
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 
@@ -451,7 +451,7 @@ fddi_input(ifp, m)
 #endif
 		default:
 			/* printf("fddi_input: unknown protocol 0x%x\n", type); */
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 		break;
@@ -459,7 +459,7 @@ fddi_input(ifp, m)
 		
 	default:
 		/* printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */
-		ifp->if_noproto++;
+		if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 		goto dropanyway;
 	}
 	M_SETFIB(m, ifp->if_fib);
@@ -467,7 +467,7 @@ fddi_input(ifp, m)
 	return;
 
 dropanyway:
-	ifp->if_iqdrops++;
+	if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	if (m)
 		m_freem(m);
 	return;
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index 5f0f9238794c..39e9cf9fd867 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -537,7 +537,7 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
 
 	if (m->m_pkthdr.rcvif == NULL) {
 		if_printf(ifp, "discard frame w/o interface pointer\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
@@ -582,7 +582,7 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
 		return;
 	}
 
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	/* Discard packet if interface is not up */
 	if ((ifp->if_flags & IFF_UP) == 0) {
@@ -591,7 +591,7 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src)
 	}
 
 	if (m->m_flags & (M_BCAST|M_MCAST))
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 
 	switch (type) {
 #ifdef INET
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 6cf04373a4d8..f4cc3d8ca060 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -92,13 +92,20 @@
 static const char gifname[] = "gif";
 
 /*
- * gif_mtx protects the global gif_softc_list.
+ * gif_mtx protects a per-vnet gif_softc_list.
  */
-static struct mtx gif_mtx;
+static VNET_DEFINE(struct mtx, gif_mtx);
+#define	V_gif_mtx		VNET(gif_mtx)
 static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
 static VNET_DEFINE(LIST_HEAD(, gif_softc), gif_softc_list);
 #define	V_gif_softc_list	VNET(gif_softc_list)
 
+#define	GIF_LIST_LOCK_INIT(x)		mtx_init(&V_gif_mtx, "gif_mtx", \
+					    NULL, MTX_DEF)
+#define	GIF_LIST_LOCK_DESTROY(x)	mtx_destroy(&V_gif_mtx)
+#define	GIF_LIST_LOCK(x)		mtx_lock(&V_gif_mtx)
+#define	GIF_LIST_UNLOCK(x)		mtx_unlock(&V_gif_mtx)
+
 void	(*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
 void	(*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af);
 void	(*ng_gif_attach_p)(struct ifnet *ifp);
@@ -107,7 +114,8 @@ void	(*ng_gif_detach_p)(struct ifnet *ifp);
 static void	gif_start(struct ifnet *);
 static int	gif_clone_create(struct if_clone *, int, caddr_t);
 static void	gif_clone_destroy(struct ifnet *);
-static struct if_clone *gif_cloner;
+static VNET_DEFINE(struct if_clone *, gif_cloner);
+#define	V_gif_cloner	VNET(gif_cloner)
 
 static int gifmodevent(module_t, int, void *);
 
@@ -189,9 +197,9 @@ gif_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 	if (ng_gif_attach_p != NULL)
 		(*ng_gif_attach_p)(GIF2IFP(sc));
 
-	mtx_lock(&gif_mtx);
+	GIF_LIST_LOCK();
 	LIST_INSERT_HEAD(&V_gif_softc_list, sc, gif_list);
-	mtx_unlock(&gif_mtx);
+	GIF_LIST_UNLOCK();
 
 	return (0);
 }
@@ -204,9 +212,9 @@ gif_clone_destroy(struct ifnet *ifp)
 #endif
 	struct gif_softc *sc = ifp->if_softc;
 
-	mtx_lock(&gif_mtx);
+	GIF_LIST_LOCK();
 	LIST_REMOVE(sc, gif_list);
-	mtx_unlock(&gif_mtx);
+	GIF_LIST_UNLOCK();
 
 	gif_delete_tunnel(ifp);
 #ifdef INET6
@@ -238,9 +246,22 @@ vnet_gif_init(const void *unused __unused)
 {
 
 	LIST_INIT(&V_gif_softc_list);
+	GIF_LIST_LOCK_INIT();
+	V_gif_cloner = if_clone_simple(gifname, gif_clone_create,
+	    gif_clone_destroy, 0);
 }
-VNET_SYSINIT(vnet_gif_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_gif_init,
-    NULL);
+VNET_SYSINIT(vnet_gif_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_gif_init, NULL);
+
+static void
+vnet_gif_uninit(const void *unused __unused)
+{
+
+	if_clone_detach(V_gif_cloner);
+	GIF_LIST_LOCK_DESTROY();
+}
+VNET_SYSUNINIT(vnet_gif_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_gif_uninit, NULL);
 
 static int
 gifmodevent(module_t mod, int type, void *data)
@@ -248,19 +269,12 @@ gifmodevent(module_t mod, int type, void *data)
 
 	switch (type) {
 	case MOD_LOAD:
-		mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF);
-		gif_cloner = if_clone_simple(gifname, gif_clone_create,
-		    gif_clone_destroy, 0);
-		break;
-
 	case MOD_UNLOAD:
-		if_clone_detach(gif_cloner);
-		mtx_destroy(&gif_mtx);
 		break;
 	default:
-		return EOPNOTSUPP;
+		return (EOPNOTSUPP);
 	}
-	return 0;
+	return (0);
 }
 
 static moduledata_t gif_mod = {
@@ -364,7 +378,7 @@ gif_start(struct ifnet *ifp)
 #endif
 #ifdef INET6
 		if (sc->gif_psrc->sa_family == AF_INET6) 
-		    m->m_pkthdr.len -= GIF_HDR_LEN6;
+			m->m_pkthdr.len -= GIF_HDR_LEN6;
 #endif
 #endif
 		/* 
@@ -373,15 +387,15 @@ gif_start(struct ifnet *ifp)
 		 */
 		af = m->m_pkthdr.csum_data;
 		
+		/* override to IPPROTO_ETHERIP for bridged traffic */
 		if (ifp->if_bridge)
 			af = AF_LINK;
 
 		BPF_MTAP2(ifp, &af, sizeof(af), m);
-		ifp->if_opackets++;	
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);	
 
 /*              Done by IFQ_HANDOFF */
-/* 		ifp->if_obytes += m->m_pkthdr.len;*/
-		/* override to IPPROTO_ETHERIP for bridged traffic */
+/* 		if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);*/
 
 		M_SETFIB(m, sc->gif_fibnum);
 		/* inner AF-specific encapsulation */
@@ -403,7 +417,7 @@ gif_start(struct ifnet *ifp)
 			error = ENETDOWN;
 		}
 		if (error)
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	}
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -513,7 +527,7 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	IFQ_HANDOFF(ifp, m, error);
   end:
 	if (error)
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	return (error);
 }
 
@@ -544,8 +558,8 @@ gif_input(struct mbuf *m, int af, struct ifnet *ifp)
 	}
 
 	if ((ifp->if_flags & IFF_MONITOR) != 0) {
-		ifp->if_ipackets++;
-		ifp->if_ibytes += m->m_pkthdr.len;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+		if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 		m_freem(m);
 		return;
 	}
@@ -583,7 +597,7 @@ gif_input(struct mbuf *m, int af, struct ifnet *ifp)
 		if (n > m->m_len) {
 			m = m_pullup(m, n);
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				return;
 			}
 		}
@@ -622,7 +636,7 @@ gif_input(struct mbuf *m, int af, struct ifnet *ifp)
 					m->m_flags |= M_BCAST;
 				else
 					m->m_flags |= M_MCAST;
-				ifp->if_imcasts++;
+				if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 			}
 			BRIDGE_INPUT(ifp, m);
 
@@ -647,8 +661,8 @@ gif_input(struct mbuf *m, int af, struct ifnet *ifp)
 		return;
 	}
 
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	M_SETFIB(m, ifp->if_fib);
 	netisr_dispatch(isr, m);
 }
@@ -904,7 +918,7 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
 	struct sockaddr *osrc, *odst, *sa;
 	int error = 0; 
 
-	mtx_lock(&gif_mtx);
+	GIF_LIST_LOCK();
 	LIST_FOREACH(sc2, &V_gif_softc_list, gif_list) {
 		if (sc2 == sc)
 			continue;
@@ -924,13 +938,13 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
 		    bcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 &&
 		    bcmp(sc2->gif_psrc, src, src->sa_len) == 0) {
 			error = EADDRNOTAVAIL;
-			mtx_unlock(&gif_mtx);
+			GIF_LIST_UNLOCK();
 			goto bad;
 		}
 
 		/* XXX both end must be valid? (I mean, not 0.0.0.0) */
 	}
-	mtx_unlock(&gif_mtx);
+	GIF_LIST_UNLOCK();
 
 	/* XXX we can detach from both, but be polite just in case */
 	if (sc->gif_psrc)
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 302780a03b8c..8954f5c56ee8 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -102,15 +102,16 @@ struct mtag_gre_nesting {
  * gre_mtx protects all global variables in if_gre.c.
  * XXX: gre_softc data not protected yet.
  */
-struct mtx gre_mtx;
+VNET_DEFINE(struct mtx, gre_mtx);
+VNET_DEFINE(struct gre_softc_head, gre_softc_list);
+
 static const char grename[] = "gre";
 static MALLOC_DEFINE(M_GRE, grename, "Generic Routing Encapsulation");
 
-struct gre_softc_head gre_softc_list;
-
 static int	gre_clone_create(struct if_clone *, int, caddr_t);
 static void	gre_clone_destroy(struct ifnet *);
-static struct if_clone *gre_cloner;
+static VNET_DEFINE(struct if_clone *, gre_cloner);
+#define	V_gre_cloner	VNET(gre_cloner)
 
 static int	gre_ioctl(struct ifnet *, u_long, caddr_t);
 static int	gre_output(struct ifnet *, struct mbuf *,
@@ -118,8 +119,6 @@ static int	gre_output(struct ifnet *, struct mbuf *,
 
 static int gre_compute_route(struct gre_softc *sc);
 
-static void	greattach(void);
-
 #ifdef INET
 extern struct domain inetdomain;
 static const struct protosw in_gre_protosw = {
@@ -160,26 +159,34 @@ static SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW, 0,
  */
 #define MAX_GRE_NEST 1
 #endif
-static int max_gre_nesting = MAX_GRE_NEST;
-SYSCTL_INT(_net_link_gre, OID_AUTO, max_nesting, CTLFLAG_RW,
-    &max_gre_nesting, 0, "Max nested tunnels");
+static VNET_DEFINE(int, max_gre_nesting) = MAX_GRE_NEST;
+#define	V_max_gre_nesting	VNET(max_gre_nesting)
+SYSCTL_INT(_net_link_gre, OID_AUTO, max_nesting, CTLFLAG_RW | CTLFLAG_VNET,
+    &VNET_NAME(max_gre_nesting), 0, "Max nested tunnels");
 
-/* ARGSUSED */
 static void
-greattach(void)
+vnet_gre_init(const void *unused __unused)
 {
-
-	mtx_init(&gre_mtx, "gre_mtx", NULL, MTX_DEF);
-	LIST_INIT(&gre_softc_list);
-	gre_cloner = if_clone_simple(grename, gre_clone_create,
+	LIST_INIT(&V_gre_softc_list);
+	GRE_LIST_LOCK_INIT();
+	V_gre_cloner = if_clone_simple(grename, gre_clone_create,
 	    gre_clone_destroy, 0);
 }
+VNET_SYSINIT(vnet_gre_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_gre_init, NULL);
+
+static void
+vnet_gre_uninit(const void *unused __unused)
+{
+
+	if_clone_detach(V_gre_cloner);
+	GRE_LIST_LOCK_DESTROY();
+}
+VNET_SYSUNINIT(vnet_gre_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_gre_uninit, NULL);
 
 static int
-gre_clone_create(ifc, unit, params)
-	struct if_clone *ifc;
-	int unit;
-	caddr_t params;
+gre_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 {
 	struct gre_softc *sc;
 
@@ -210,21 +217,20 @@ gre_clone_create(ifc, unit, params)
 	sc->key = 0;
 	if_attach(GRE2IFP(sc));
 	bpfattach(GRE2IFP(sc), DLT_NULL, sizeof(u_int32_t));
-	mtx_lock(&gre_mtx);
-	LIST_INSERT_HEAD(&gre_softc_list, sc, sc_list);
-	mtx_unlock(&gre_mtx);
+	GRE_LIST_LOCK();
+	LIST_INSERT_HEAD(&V_gre_softc_list, sc, sc_list);
+	GRE_LIST_UNLOCK();
 	return (0);
 }
 
 static void
-gre_clone_destroy(ifp)
-	struct ifnet *ifp;
+gre_clone_destroy(struct ifnet *ifp)
 {
 	struct gre_softc *sc = ifp->if_softc;
 
-	mtx_lock(&gre_mtx);
+	GRE_LIST_LOCK();
 	LIST_REMOVE(sc, sc_list);
-	mtx_unlock(&gre_mtx);
+	GRE_LIST_UNLOCK();
 
 #ifdef INET
 	if (sc->encap != NULL)
@@ -269,7 +275,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 		gt = (struct mtag_gre_nesting *)(mtag + 1);
 		gt->count++;
-		if (gt->count > min(gt->max,max_gre_nesting)) {
+		if (gt->count > min(gt->max, V_max_gre_nesting)) {
 			printf("%s: hit maximum recursion limit %u on %s\n",
 				__func__, gt->count - 1, ifp->if_xname);
 			m_freem(m);
@@ -301,7 +307,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		 * Note: the sysctl does not actually check for saneness, so we
 		 * limit the maximum numbers of possible recursions here.
 		 */
-		max = imin(max_gre_nesting, 256);
+		max = imin(V_max_gre_nesting, 256);
 		/* If someone sets the sysctl <= 0, we want at least 1. */
 		max = imax(max, 1);
 		len = sizeof(struct mtag_gre_nesting) +
@@ -361,7 +367,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 			 * be encapsulated.
 			 */
 			if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) {
-				_IF_DROP(&ifp->if_snd);
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				m_freem(m);
 				error = EINVAL;    /* is there better errno? */
 				goto end;
@@ -390,7 +396,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 			if ((m->m_data - msiz) < m->m_pktdat) {
 				m0 = m_gethdr(M_NOWAIT, MT_DATA);
 				if (m0 == NULL) {
-					_IF_DROP(&ifp->if_snd);
+					if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 					m_freem(m);
 					error = ENOBUFS;
 					goto end;
@@ -415,7 +421,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 			memcpy((caddr_t)(ip + 1), &mob_h, (unsigned)msiz);
 			ip->ip_len = htons(ntohs(ip->ip_len) + msiz);
 		} else {  /* AF_INET */
-			_IF_DROP(&ifp->if_snd);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(m);
 			error = EINVAL;
 			goto end;
@@ -440,7 +446,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 			break;
 #endif
 		default:
-			_IF_DROP(&ifp->if_snd);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(m);
 			error = EAFNOSUPPORT;
 			goto end;
@@ -452,14 +458,14 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 			hdrlen += sizeof(uint32_t);
 		M_PREPEND(m, hdrlen, M_NOWAIT);
 	} else {
-		_IF_DROP(&ifp->if_snd);
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		error = EINVAL;
 		goto end;
 	}
 
 	if (m == NULL) {	/* mbuf allocation failed */
-		_IF_DROP(&ifp->if_snd);
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		error = ENOBUFS;
 		goto end;
 	}
@@ -494,8 +500,8 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		gh->gi_len = htons(m->m_pkthdr.len);
 	}
 
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	/*
 	 * Send it off and with IP_FORWARD flag to prevent it from
 	 * overwriting the ip_id again.  ip_id is already set to the
@@ -505,7 +511,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	    (struct ip_moptions *)NULL, (struct inpcb *)NULL);
   end:
 	if (error)
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	return (error);
 }
 
@@ -909,16 +915,12 @@ gremodevent(module_t mod, int type, void *data)
 
 	switch (type) {
 	case MOD_LOAD:
-		greattach();
-		break;
 	case MOD_UNLOAD:
-		if_clone_detach(gre_cloner);
-		mtx_destroy(&gre_mtx);
 		break;
 	default:
-		return EOPNOTSUPP;
+		return (EOPNOTSUPP);
 	}
-	return 0;
+	return (0);
 }
 
 static moduledata_t gre_mod = {
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 74d16b1c57eb..cb2a44b9d774 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -176,8 +176,16 @@ struct mobip_h {
 
 #ifdef _KERNEL
 LIST_HEAD(gre_softc_head, gre_softc);
-extern struct mtx gre_mtx;
-extern struct gre_softc_head gre_softc_list;
+VNET_DECLARE(struct gre_softc_head, gre_softc_list);
+#define	V_gre_softc_list	VNET(gre_softc_list)
+
+VNET_DECLARE(struct mtx, gre_mtx);
+#define	V_gre_mtx	VNET(gre_mtx)
+#define	GRE_LIST_LOCK_INIT(x)		mtx_init(&V_gre_mtx, "gre_mtx", NULL, \
+					    MTX_DEF)
+#define	GRE_LIST_LOCK_DESTROY(x)	mtx_destroy(&V_gre_mtx)
+#define	GRE_LIST_LOCK(x)		mtx_lock(&V_gre_mtx)
+#define	GRE_LIST_UNLOCK(x)		mtx_unlock(&V_gre_mtx)
 
 u_int16_t	gre_in_cksum(u_int16_t *, u_int);
 #endif /* _KERNEL */
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 2c93b20a7c29..b03b70d79797 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -381,12 +381,12 @@ iso88025_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	IFQ_HANDOFF_ADJ(ifp, m, ISO88025_HDR_LEN + LLC_SNAPFRAMELEN, error);
 	if (error) {
 		printf("iso88025_output: packet dropped QFULL.\n");
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 	return (error);
 
 bad:
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if (m)
 		m_freem(m);
 	return (error);
@@ -411,20 +411,20 @@ iso88025_input(ifp, m)
 	 */
 	if ((m->m_flags & M_PKTHDR) == 0) {
 		if_printf(ifp, "discard frame w/o packet header\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		m_freem(m);
 		return;
 	}
 	if (m->m_pkthdr.rcvif == NULL) {
 		if_printf(ifp, "discard frame w/o interface pointer\n");
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
  		m_freem(m);
 		return;
 	}
 
 	m = m_pullup(m, ISO88025_HDR_LEN);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto dropanyway;
 	}
 	th = mtod(m, struct iso88025_header *);
@@ -456,7 +456,7 @@ iso88025_input(ifp, m)
 	/*
 	 * Update interface statistics.
 	 */
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	getmicrotime(&ifp->if_lastchange);
 
 	/*
@@ -478,7 +478,7 @@ iso88025_input(ifp, m)
 			m->m_flags |= M_BCAST;
 		else
 			m->m_flags |= M_MCAST;
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 	}
 
 	mac_hdr_len = ISO88025_HDR_LEN;
@@ -491,7 +491,7 @@ iso88025_input(ifp, m)
 
 	m = m_pullup(m, LLC_SNAPFRAMELEN);
 	if (m == 0) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		goto dropanyway;
 	}
 	l = mtod(m, struct llc *);
@@ -501,14 +501,14 @@ iso88025_input(ifp, m)
 		u_int16_t type;
 		if ((l->llc_control != LLC_UI) ||
 		    (l->llc_ssap != LLC_SNAP_LSAP)) {
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 
 		if (l->llc_snap.org_code[0] != 0 ||
 		    l->llc_snap.org_code[1] != 0 ||
 		    l->llc_snap.org_code[2] != 0) {
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 
@@ -537,7 +537,7 @@ iso88025_input(ifp, m)
 #endif	/* INET6 */
 		default:
 			printf("iso88025_input: unexpected llc_snap ether_type  0x%02x\n", type);
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 		}
 		break;
@@ -546,7 +546,7 @@ iso88025_input(ifp, m)
 	case LLC_ISO_LSAP:
 		switch (l->llc_control) {
 		case LLC_UI:
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 			break;
                 case LLC_XID:
@@ -595,7 +595,7 @@ iso88025_input(ifp, m)
 		}
 		default:
 			printf("iso88025_input: unexpected llc control 0x%02x\n", l->llc_control);
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto dropanyway;
 			break;
 		}
@@ -603,7 +603,7 @@ iso88025_input(ifp, m)
 #endif	/* ISO */
 	default:
 		printf("iso88025_input: unknown dsap 0x%x\n", l->llc_dsap);
-		ifp->if_noproto++;
+		if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 		goto dropanyway;
 		break;
 	}
@@ -613,7 +613,7 @@ iso88025_input(ifp, m)
 	return;
 
 dropanyway:
-	ifp->if_iqdrops++;
+	if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 	if (m)
 		m_freem(m);
 	return;
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index 8d53526c6a02..67895de1895a 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -3,6 +3,7 @@
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
+ * Copyright (c) 2014 Marcelo Araujo <araujo@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/bpf.h>
+#include <net/vnet.h>
 
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
@@ -80,13 +82,21 @@ static struct {
 	{0, NULL}
 };
 
-SLIST_HEAD(__trhead, lagg_softc) lagg_list;	/* list of laggs */
-static struct mtx	lagg_list_mtx;
+VNET_DEFINE(SLIST_HEAD(__trhead, lagg_softc), lagg_list); /* list of laggs */
+#define	V_lagg_list	VNET(lagg_list)
+static VNET_DEFINE(struct mtx, lagg_list_mtx);
+#define	V_lagg_list_mtx	VNET(lagg_list_mtx)
+#define	LAGG_LIST_LOCK_INIT(x)		mtx_init(&V_lagg_list_mtx, \
+					"if_lagg list", NULL, MTX_DEF)
+#define	LAGG_LIST_LOCK_DESTROY(x)	mtx_destroy(&V_lagg_list_mtx)
+#define	LAGG_LIST_LOCK(x)		mtx_lock(&V_lagg_list_mtx)
+#define	LAGG_LIST_UNLOCK(x)		mtx_unlock(&V_lagg_list_mtx)
 eventhandler_tag	lagg_detach_cookie = NULL;
 
 static int	lagg_clone_create(struct if_clone *, int, caddr_t);
 static void	lagg_clone_destroy(struct ifnet *);
-static struct if_clone *lagg_cloner;
+static VNET_DEFINE(struct if_clone *, lagg_cloner);
+#define	V_lagg_cloner	VNET(lagg_cloner)
 static const char laggname[] = "lagg";
 
 static void	lagg_lladdr(struct lagg_softc *, uint8_t *);
@@ -114,6 +124,7 @@ static int	lagg_ether_cmdmulti(struct lagg_port *, int);
 static	int	lagg_setflag(struct lagg_port *, int, int,
 		    int (*func)(struct ifnet *, int));
 static	int	lagg_setflags(struct lagg_port *, int status);
+static uint64_t lagg_get_counter(struct ifnet *ifp, ift_counter cnt);
 static int	lagg_transmit(struct ifnet *, struct mbuf *);
 static void	lagg_qflush(struct ifnet *);
 static int	lagg_media_change(struct ifnet *);
@@ -121,25 +132,21 @@ static void	lagg_media_status(struct ifnet *, struct ifmediareq *);
 static struct lagg_port *lagg_link_active(struct lagg_softc *,
 	    struct lagg_port *);
 static const void *lagg_gethdr(struct mbuf *, u_int, u_int, void *);
-static int	lagg_sysctl_active(SYSCTL_HANDLER_ARGS);
 
 /* Simple round robin */
-static int	lagg_rr_attach(struct lagg_softc *);
-static int	lagg_rr_detach(struct lagg_softc *);
+static void	lagg_rr_attach(struct lagg_softc *);
 static int	lagg_rr_start(struct lagg_softc *, struct mbuf *);
 static struct mbuf *lagg_rr_input(struct lagg_softc *, struct lagg_port *,
 		    struct mbuf *);
 
 /* Active failover */
-static int	lagg_fail_attach(struct lagg_softc *);
-static int	lagg_fail_detach(struct lagg_softc *);
 static int	lagg_fail_start(struct lagg_softc *, struct mbuf *);
 static struct mbuf *lagg_fail_input(struct lagg_softc *, struct lagg_port *,
 		    struct mbuf *);
 
 /* Loadbalancing */
-static int	lagg_lb_attach(struct lagg_softc *);
-static int	lagg_lb_detach(struct lagg_softc *);
+static void	lagg_lb_attach(struct lagg_softc *);
+static void	lagg_lb_detach(struct lagg_softc *);
 static int	lagg_lb_port_create(struct lagg_port *);
 static void	lagg_lb_port_destroy(struct lagg_port *);
 static int	lagg_lb_start(struct lagg_softc *, struct mbuf *);
@@ -147,56 +154,141 @@ static struct mbuf *lagg_lb_input(struct lagg_softc *, struct lagg_port *,
 		    struct mbuf *);
 static int	lagg_lb_porttable(struct lagg_softc *, struct lagg_port *);
 
+/* Broadcast */
+static int    lagg_bcast_start(struct lagg_softc *, struct mbuf *);
+static struct mbuf *lagg_bcast_input(struct lagg_softc *, struct lagg_port *,
+		    struct mbuf *);
+
 /* 802.3ad LACP */
-static int	lagg_lacp_attach(struct lagg_softc *);
-static int	lagg_lacp_detach(struct lagg_softc *);
+static void	lagg_lacp_attach(struct lagg_softc *);
+static void	lagg_lacp_detach(struct lagg_softc *);
 static int	lagg_lacp_start(struct lagg_softc *, struct mbuf *);
 static struct mbuf *lagg_lacp_input(struct lagg_softc *, struct lagg_port *,
 		    struct mbuf *);
 static void	lagg_lacp_lladdr(struct lagg_softc *);
 
-static void	lagg_callout(void *);
-
 /* lagg protocol table */
-static const struct {
-	int			ti_proto;
-	int			(*ti_attach)(struct lagg_softc *);
+static const struct lagg_proto {
+	lagg_proto	pr_num;
+	void		(*pr_attach)(struct lagg_softc *);
+	void		(*pr_detach)(struct lagg_softc *);
+	int		(*pr_start)(struct lagg_softc *, struct mbuf *);
+	struct mbuf *	(*pr_input)(struct lagg_softc *, struct lagg_port *,
+			    struct mbuf *);
+	int		(*pr_addport)(struct lagg_port *);
+	void		(*pr_delport)(struct lagg_port *);
+	void		(*pr_linkstate)(struct lagg_port *);
+	void 		(*pr_init)(struct lagg_softc *);
+	void 		(*pr_stop)(struct lagg_softc *);
+	void 		(*pr_lladdr)(struct lagg_softc *);
+	void		(*pr_request)(struct lagg_softc *, void *);
+	void		(*pr_portreq)(struct lagg_port *, void *);
 } lagg_protos[] = {
-	{ LAGG_PROTO_ROUNDROBIN,	lagg_rr_attach },
-	{ LAGG_PROTO_FAILOVER,		lagg_fail_attach },
-	{ LAGG_PROTO_LOADBALANCE,	lagg_lb_attach },
-	{ LAGG_PROTO_ETHERCHANNEL,	lagg_lb_attach },
-	{ LAGG_PROTO_LACP,		lagg_lacp_attach },
-	{ LAGG_PROTO_NONE,		NULL }
+    {
+	.pr_num = LAGG_PROTO_NONE
+    },
+    {
+	.pr_num = LAGG_PROTO_ROUNDROBIN,
+	.pr_attach = lagg_rr_attach,
+	.pr_start = lagg_rr_start,
+	.pr_input = lagg_rr_input,
+    },
+    {
+	.pr_num = LAGG_PROTO_FAILOVER,
+	.pr_start = lagg_fail_start,
+	.pr_input = lagg_fail_input,
+    },
+    {
+	.pr_num = LAGG_PROTO_LOADBALANCE,
+	.pr_attach = lagg_lb_attach,
+	.pr_detach = lagg_lb_detach,
+	.pr_start = lagg_lb_start,
+	.pr_input = lagg_lb_input,
+	.pr_addport = lagg_lb_port_create,
+	.pr_delport = lagg_lb_port_destroy,
+    },
+    {
+	.pr_num = LAGG_PROTO_LACP,
+	.pr_attach = lagg_lacp_attach,
+	.pr_detach = lagg_lacp_detach,
+	.pr_start = lagg_lacp_start,
+	.pr_input = lagg_lacp_input,
+	.pr_addport = lacp_port_create,
+	.pr_delport = lacp_port_destroy,
+	.pr_linkstate = lacp_linkstate,
+	.pr_init = lacp_init,
+	.pr_stop = lacp_stop,
+	.pr_lladdr = lagg_lacp_lladdr,
+	.pr_request = lacp_req,
+	.pr_portreq = lacp_portreq,
+    },
+    {
+	.pr_num = LAGG_PROTO_ETHERCHANNEL,
+	.pr_attach = lagg_lb_attach,
+	.pr_detach = lagg_lb_detach,
+	.pr_start = lagg_lb_start,
+	.pr_input = lagg_lb_input,
+    },
+    {
+	.pr_num = LAGG_PROTO_BROADCAST,
+	.pr_start = lagg_bcast_start,
+	.pr_input = lagg_bcast_input,
+    },
 };
 
 SYSCTL_DECL(_net_link);
 SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0,
     "Link Aggregation");
 
-static int lagg_failover_rx_all = 0; /* Allow input on any failover links */
-SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW,
-    &lagg_failover_rx_all, 0,
+/* Allow input on any failover links */
+static VNET_DEFINE(int, lagg_failover_rx_all);
+#define	V_lagg_failover_rx_all	VNET(lagg_failover_rx_all)
+SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW | CTLFLAG_VNET,
+    &VNET_NAME(lagg_failover_rx_all), 0,
     "Accept input from any interface in a failover lagg");
-static int def_use_flowid = 1; /* Default value for using M_FLOWID */
+
+/* Default value for using M_FLOWID */
+static VNET_DEFINE(int, def_use_flowid) = 1;
+#define	V_def_use_flowid	VNET(def_use_flowid)
 SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RWTUN,
-    &def_use_flowid, 0,
+    &VNET_NAME(def_use_flowid), 0,
     "Default setting for using flow id for load sharing");
-static int def_flowid_shift = 16; /* Default value for using M_FLOWID */
+
+/* Default value for using M_FLOWID */
+static VNET_DEFINE(int, def_flowid_shift) = 16;
+#define	V_def_flowid_shift	VNET(def_flowid_shift)
 SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RWTUN,
-    &def_flowid_shift, 0,
+    &VNET_NAME(def_flowid_shift), 0,
     "Default setting for flowid shift for load sharing");
 
+static void
+vnet_lagg_init(const void *unused __unused)
+{
+
+	LAGG_LIST_LOCK_INIT();
+	SLIST_INIT(&V_lagg_list);
+	V_lagg_cloner = if_clone_simple(laggname, lagg_clone_create,
+	    lagg_clone_destroy, 0);
+}
+VNET_SYSINIT(vnet_lagg_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_lagg_init, NULL);
+
+static void
+vnet_lagg_uninit(const void *unused __unused)
+{
+
+	if_clone_detach(V_lagg_cloner);
+	LAGG_LIST_LOCK_DESTROY();
+}
+VNET_SYSUNINIT(vnet_lagg_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
+    vnet_lagg_uninit, NULL);
+
 static int
 lagg_modevent(module_t mod, int type, void *data)
 {
 
 	switch (type) {
 	case MOD_LOAD:
-		mtx_init(&lagg_list_mtx, "if_lagg list", NULL, MTX_DEF);
-		SLIST_INIT(&lagg_list);
-		lagg_cloner = if_clone_simple(laggname, lagg_clone_create,
-		    lagg_clone_destroy, 0);
 		lagg_input_p = lagg_input;
 		lagg_linkstate_p = lagg_port_state;
 		lagg_detach_cookie = EVENTHANDLER_REGISTER(
@@ -206,10 +298,8 @@ lagg_modevent(module_t mod, int type, void *data)
 	case MOD_UNLOAD:
 		EVENTHANDLER_DEREGISTER(ifnet_departure_event,
 		    lagg_detach_cookie);
-		if_clone_detach(lagg_cloner);
 		lagg_input_p = NULL;
 		lagg_linkstate_p = NULL;
-		mtx_destroy(&lagg_list_mtx);
 		break;
 	default:
 		return (EOPNOTSUPP);
@@ -226,6 +316,117 @@ static moduledata_t lagg_mod = {
 DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(if_lagg, 1);
 
+static void
+lagg_proto_attach(struct lagg_softc *sc, lagg_proto pr)
+{
+
+	KASSERT(sc->sc_proto == LAGG_PROTO_NONE, ("%s: sc %p has proto",
+	    __func__, sc));
+
+	if (sc->sc_ifflags & IFF_DEBUG)
+		if_printf(sc->sc_ifp, "using proto %u\n", pr);
+
+	if (lagg_protos[pr].pr_attach != NULL)
+		lagg_protos[pr].pr_attach(sc);
+	sc->sc_proto = pr;
+}
+
+static void
+lagg_proto_detach(struct lagg_softc *sc)
+{
+	lagg_proto pr;
+
+	LAGG_WLOCK_ASSERT(sc);
+
+	pr = sc->sc_proto;
+	sc->sc_proto = LAGG_PROTO_NONE;
+
+	if (lagg_protos[pr].pr_detach != NULL)
+		lagg_protos[pr].pr_detach(sc);
+	else
+		LAGG_WUNLOCK(sc);
+}
+
+static int
+lagg_proto_start(struct lagg_softc *sc, struct mbuf *m)
+{
+
+	return (lagg_protos[sc->sc_proto].pr_start(sc, m));
+}
+
+static struct mbuf *
+lagg_proto_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
+{
+
+	return (lagg_protos[sc->sc_proto].pr_input(sc, lp, m));
+}
+
+static int
+lagg_proto_addport(struct lagg_softc *sc, struct lagg_port *lp)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_addport == NULL)
+		return (0);
+	else
+		return (lagg_protos[sc->sc_proto].pr_addport(lp));
+}
+
+static void
+lagg_proto_delport(struct lagg_softc *sc, struct lagg_port *lp)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_delport != NULL)
+		lagg_protos[sc->sc_proto].pr_delport(lp);
+}
+
+static void
+lagg_proto_linkstate(struct lagg_softc *sc, struct lagg_port *lp)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_linkstate != NULL)
+		lagg_protos[sc->sc_proto].pr_linkstate(lp);
+}
+
+static void
+lagg_proto_init(struct lagg_softc *sc)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_init != NULL)
+		lagg_protos[sc->sc_proto].pr_init(sc);
+}
+
+static void
+lagg_proto_stop(struct lagg_softc *sc)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_stop != NULL)
+		lagg_protos[sc->sc_proto].pr_stop(sc);
+}
+
+static void
+lagg_proto_lladdr(struct lagg_softc *sc)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_lladdr != NULL)
+		lagg_protos[sc->sc_proto].pr_lladdr(sc);
+}
+
+static void
+lagg_proto_request(struct lagg_softc *sc, void *v)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_request != NULL)
+		lagg_protos[sc->sc_proto].pr_request(sc, v);
+}
+
+static void
+lagg_proto_portreq(struct lagg_softc *sc, struct lagg_port *lp, void *v)
+{
+
+	if (lagg_protos[sc->sc_proto].pr_portreq != NULL)
+		lagg_protos[sc->sc_proto].pr_portreq(lp, v);
+}
+
 /*
  * This routine is run via an vlan
  * config EVENT
@@ -233,19 +434,19 @@ MODULE_VERSION(if_lagg, 1);
 static void
 lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag)
 {
-        struct lagg_softc       *sc = ifp->if_softc;
-        struct lagg_port        *lp;
-        struct rm_priotracker   tracker;
+	struct lagg_softc *sc = ifp->if_softc;
+	struct lagg_port *lp;
+	struct rm_priotracker tracker;
 
-        if (ifp->if_softc !=  arg)   /* Not our event */
-                return;
+	if (ifp->if_softc !=  arg)   /* Not our event */
+		return;
 
-        LAGG_RLOCK(sc, &tracker);
-        if (!SLIST_EMPTY(&sc->sc_ports)) {
-                SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
-                        EVENTHANDLER_INVOKE(vlan_config, lp->lp_ifp, vtag);
-        }
-        LAGG_RUNLOCK(sc, &tracker);
+	LAGG_RLOCK(sc, &tracker);
+	if (!SLIST_EMPTY(&sc->sc_ports)) {
+		SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
+			EVENTHANDLER_INVOKE(vlan_config, lp->lp_ifp, vtag);
+	}
+	LAGG_RUNLOCK(sc, &tracker);
 }
 
 /*
@@ -255,19 +456,19 @@ lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag)
 static void
 lagg_unregister_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag)
 {
-        struct lagg_softc       *sc = ifp->if_softc;
-        struct lagg_port        *lp;
-        struct rm_priotracker   tracker;
+	struct lagg_softc *sc = ifp->if_softc;
+	struct lagg_port *lp;
+	struct rm_priotracker tracker;
 
-        if (ifp->if_softc !=  arg)   /* Not our event */
-                return;
+	if (ifp->if_softc !=  arg)   /* Not our event */
+		return;
 
-        LAGG_RLOCK(sc, &tracker);
-        if (!SLIST_EMPTY(&sc->sc_ports)) {
-                SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
-                        EVENTHANDLER_INVOKE(vlan_unconfig, lp->lp_ifp, vtag);
-        }
-        LAGG_RUNLOCK(sc, &tracker);
+	LAGG_RLOCK(sc, &tracker);
+	if (!SLIST_EMPTY(&sc->sc_ports)) {
+		SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
+			EVENTHANDLER_INVOKE(vlan_unconfig, lp->lp_ifp, vtag);
+	}
+	LAGG_RUNLOCK(sc, &tracker);
 }
 
 static int
@@ -275,10 +476,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 {
 	struct lagg_softc *sc;
 	struct ifnet *ifp;
-	int i, error = 0;
 	static const u_char eaddr[6];	/* 00:00:00:00:00:00 */
-	struct sysctl_oid *oid;
-	char num[14];			/* sufficient for 32 bits */
 
 	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO);
 	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
@@ -287,60 +485,19 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 		return (ENOSPC);
 	}
 
-	sc->sc_ipackets = counter_u64_alloc(M_WAITOK);
-	sc->sc_opackets = counter_u64_alloc(M_WAITOK);
-	sc->sc_ibytes = counter_u64_alloc(M_WAITOK);
-	sc->sc_obytes = counter_u64_alloc(M_WAITOK);
+	if (V_def_use_flowid)
+		sc->sc_opts |= LAGG_OPT_USE_FLOWID;
+	sc->flowid_shift = V_def_flowid_shift;
 
-	sysctl_ctx_init(&sc->ctx);
-	snprintf(num, sizeof(num), "%u", unit);
-	sc->use_flowid = def_use_flowid;
-	sc->flowid_shift = def_flowid_shift;
-	sc->sc_oid = oid = SYSCTL_ADD_NODE(&sc->ctx,
-		&SYSCTL_NODE_CHILDREN(_net_link, lagg),
-		OID_AUTO, num, CTLFLAG_RD, NULL, "");
-	SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"use_flowid", CTLTYPE_INT|CTLFLAG_RW, &sc->use_flowid,
-		sc->use_flowid, "Use flow id for load sharing");
-	SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"flowid_shift", CTLTYPE_INT|CTLFLAG_RW, &sc->flowid_shift,
-		sc->flowid_shift,
-		"Shift flowid bits to prevent multiqueue collisions");
-	SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"count", CTLTYPE_INT|CTLFLAG_RD, &sc->sc_count, sc->sc_count,
-		"Total number of ports");
-	SYSCTL_ADD_PROC(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"active", CTLTYPE_INT|CTLFLAG_RD, sc, 0, lagg_sysctl_active,
-		"I", "Total number of active ports");
-	SYSCTL_ADD_INT(&sc->ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
-		"flapping", CTLTYPE_INT|CTLFLAG_RD, &sc->sc_flapping,
-		sc->sc_flapping, "Total number of port change events");
 	/* Hash all layers by default */
 	sc->sc_flags = LAGG_F_HASHL2|LAGG_F_HASHL3|LAGG_F_HASHL4;
 
-	sc->sc_proto = LAGG_PROTO_NONE;
-	for (i = 0; lagg_protos[i].ti_proto != LAGG_PROTO_NONE; i++) {
-		if (lagg_protos[i].ti_proto == LAGG_PROTO_DEFAULT) {
-			sc->sc_proto = lagg_protos[i].ti_proto;
-			if ((error = lagg_protos[i].ti_attach(sc)) != 0) {
-				if_free(ifp);
-				free(sc, M_DEVBUF);
-				return (error);
-			}
-			break;
-		}
-	}
+	lagg_proto_attach(sc, LAGG_PROTO_DEFAULT);
+
 	LAGG_LOCK_INIT(sc);
-	LAGG_CALLOUT_LOCK_INIT(sc);
 	SLIST_INIT(&sc->sc_ports);
 	TASK_INIT(&sc->sc_lladdr_task, 0, lagg_port_setlladdr, sc);
 
-	/*
-	 * This uses the callout lock rather than the rmlock; one can't
-	 * hold said rmlock during SWI.
-	 */
-	callout_init_mtx(&sc->sc_callout, &sc->sc_call_mtx, 0);
-
 	/* Initialise pseudo media types */
 	ifmedia_init(&sc->sc_media, 0, lagg_media_change,
 	    lagg_media_status);
@@ -353,6 +510,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 	ifp->if_qflush = lagg_qflush;
 	ifp->if_init = lagg_init;
 	ifp->if_ioctl = lagg_ioctl;
+	ifp->if_get_counter = lagg_get_counter;
 	ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
 	ifp->if_capenable = ifp->if_capabilities = IFCAP_HWSTATS;
 
@@ -368,11 +526,9 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 		lagg_unregister_vlan, sc, EVENTHANDLER_PRI_FIRST);
 
 	/* Insert into the global list of laggs */
-	mtx_lock(&lagg_list_mtx);
-	SLIST_INSERT_HEAD(&lagg_list, sc, sc_entries);
-	mtx_unlock(&lagg_list_mtx);
-
-	callout_reset(&sc->sc_callout, hz, lagg_callout, sc);
+	LAGG_LIST_LOCK();
+	SLIST_INSERT_HEAD(&V_lagg_list, sc, sc_entries);
+	LAGG_LIST_UNLOCK();
 
 	return (0);
 }
@@ -395,32 +551,18 @@ lagg_clone_destroy(struct ifnet *ifp)
 	while ((lp = SLIST_FIRST(&sc->sc_ports)) != NULL)
 		lagg_port_destroy(lp, 1);
 	/* Unhook the aggregation protocol */
-	if (sc->sc_detach != NULL)
-		(*sc->sc_detach)(sc);
+	lagg_proto_detach(sc);
 
-	LAGG_WUNLOCK(sc);
-
-	sysctl_ctx_free(&sc->ctx);
 	ifmedia_removeall(&sc->sc_media);
 	ether_ifdetach(ifp);
 	if_free(ifp);
 
-	/* This grabs sc_callout_mtx, serialising it correctly */
-	callout_drain(&sc->sc_callout);
-
-	/* At this point it's drained; we can free this */
-	counter_u64_free(sc->sc_ipackets);
-	counter_u64_free(sc->sc_opackets);
-	counter_u64_free(sc->sc_ibytes);
-	counter_u64_free(sc->sc_obytes);
-
-	mtx_lock(&lagg_list_mtx);
-	SLIST_REMOVE(&lagg_list, sc, lagg_softc, sc_entries);
-	mtx_unlock(&lagg_list_mtx);
+	LAGG_LIST_LOCK();
+	SLIST_REMOVE(&V_lagg_list, sc, lagg_softc, sc_entries);
+	LAGG_LIST_UNLOCK();
 
 	taskqueue_drain(taskqueue_swi, &sc->sc_lladdr_task);
 	LAGG_LOCK_DESTROY(sc);
-	LAGG_CALLOUT_LOCK_DESTROY(sc);
 	free(sc, M_DEVBUF);
 }
 
@@ -434,8 +576,7 @@ lagg_lladdr(struct lagg_softc *sc, uint8_t *lladdr)
 
 	bcopy(lladdr, IF_LLADDR(ifp), ETHER_ADDR_LEN);
 	/* Let the protocol know the MAC has changed */
-	if (sc->sc_lladdr != NULL)
-		(*sc->sc_lladdr)(sc);
+	lagg_proto_lladdr(sc);
 	EVENTHANDLER_INVOKE(iflladdr_event, ifp);
 }
 
@@ -445,23 +586,18 @@ lagg_capabilities(struct lagg_softc *sc)
 	struct lagg_port *lp;
 	int cap = ~0, ena = ~0;
 	u_long hwa = ~0UL;
-#if defined(INET) || defined(INET6)
-	u_int hw_tsomax = IP_MAXPACKET;	/* Initialize to the maximum value. */
-#else
-	u_int hw_tsomax = ~0;	/* if_hw_tsomax is only for INET/INET6, but.. */
-#endif
+	struct ifnet_hw_tsomax hw_tsomax;
 
 	LAGG_WLOCK_ASSERT(sc);
 
+	memset(&hw_tsomax, 0, sizeof(hw_tsomax));
+
 	/* Get capabilities from the lagg ports */
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) {
 		cap &= lp->lp_ifp->if_capabilities;
 		ena &= lp->lp_ifp->if_capenable;
 		hwa &= lp->lp_ifp->if_hwassist;
-		/* Set to the minimum value of the lagg ports. */
-		if (lp->lp_ifp->if_hw_tsomax < hw_tsomax &&
-		    lp->lp_ifp->if_hw_tsomax > 0)
-			hw_tsomax = lp->lp_ifp->if_hw_tsomax;
+		if_hw_tsomax_common(lp->lp_ifp, &hw_tsomax);
 	}
 	cap = (cap == ~0 ? 0 : cap);
 	ena = (ena == ~0 ? 0 : ena);
@@ -470,11 +606,10 @@ lagg_capabilities(struct lagg_softc *sc)
 	if (sc->sc_ifp->if_capabilities != cap ||
 	    sc->sc_ifp->if_capenable != ena ||
 	    sc->sc_ifp->if_hwassist != hwa ||
-	    sc->sc_ifp->if_hw_tsomax != hw_tsomax) {
+	    if_hw_tsomax_update(sc->sc_ifp, &hw_tsomax) != 0) {
 		sc->sc_ifp->if_capabilities = cap;
 		sc->sc_ifp->if_capenable = ena;
 		sc->sc_ifp->if_hwassist = hwa;
-		sc->sc_ifp->if_hw_tsomax = hw_tsomax;
 		getmicrotime(&sc->sc_ifp->if_lastchange);
 
 		if (sc->sc_ifflags & IFF_DEBUG)
@@ -562,8 +697,9 @@ static int
 lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp)
 {
 	struct lagg_softc *sc_ptr;
-	struct lagg_port *lp;
-	int error = 0;
+	struct lagg_port *lp, *tlp;
+	int error, i;
+	uint64_t *pval;
 
 	LAGG_WLOCK_ASSERT(sc);
 
@@ -626,10 +762,10 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp)
 		return (ENOMEM);
 
 	/* Check if port is a stacked lagg */
-	mtx_lock(&lagg_list_mtx);
-	SLIST_FOREACH(sc_ptr, &lagg_list, sc_entries) {
+	LAGG_LIST_LOCK();
+	SLIST_FOREACH(sc_ptr, &V_lagg_list, sc_entries) {
 		if (ifp == sc_ptr->sc_ifp) {
-			mtx_unlock(&lagg_list_mtx);
+			LAGG_LIST_UNLOCK();
 			free(lp, M_DEVBUF);
 			return (EINVAL);
 			/* XXX disable stacking for the moment, its untested */
@@ -637,14 +773,14 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp)
 			lp->lp_flags |= LAGG_PORT_STACK;
 			if (lagg_port_checkstacking(sc_ptr) >=
 			    LAGG_MAX_STACKING) {
-				mtx_unlock(&lagg_list_mtx);
+				LAGG_LIST_UNLOCK();
 				free(lp, M_DEVBUF);
 				return (E2BIG);
 			}
 #endif
 		}
 	}
-	mtx_unlock(&lagg_list_mtx);
+	LAGG_LIST_UNLOCK();
 
 	/* Change the interface type */
 	lp->lp_iftype = ifp->if_type;
@@ -669,27 +805,39 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet *ifp)
 		lagg_port_lladdr(lp, IF_LLADDR(sc->sc_ifp));
 	}
 
-	/* Insert into the list of ports */
-	SLIST_INSERT_HEAD(&sc->sc_ports, lp, lp_entries);
+	/* Insert into the list of ports. Keep ports sorted by if_index. */
+	SLIST_FOREACH(tlp, &sc->sc_ports, lp_entries) {
+		if (tlp->lp_ifp->if_index < ifp->if_index && (
+		    SLIST_NEXT(tlp, lp_entries) == NULL ||
+		    SLIST_NEXT(tlp, lp_entries)->lp_ifp->if_index <
+		    ifp->if_index))
+			break;
+	}
+	if (tlp != NULL)
+		SLIST_INSERT_AFTER(tlp, lp, lp_entries);
+	else
+		SLIST_INSERT_HEAD(&sc->sc_ports, lp, lp_entries);
 	sc->sc_count++;
 
 	/* Update lagg capabilities */
 	lagg_capabilities(sc);
 	lagg_linkstate(sc);
 
+	/* Read port counters */
+	pval = lp->port_counters.val;
+	for (i = 0; i < IFCOUNTERS; i++, pval++)
+		*pval = ifp->if_get_counter(ifp, i);
 	/* Add multicast addresses and interface flags to this port */
 	lagg_ether_cmdmulti(lp, 1);
 	lagg_setflags(lp, 1);
 
-	if (sc->sc_port_create != NULL)
-		error = (*sc->sc_port_create)(lp);
-	if (error) {
-		/* remove the port again, without calling sc_port_destroy */
+	if ((error = lagg_proto_addport(sc, lp)) != 0) {
+		/* Remove the port, without calling pr_delport. */
 		lagg_port_destroy(lp, 0);
 		return (error);
 	}
 
-	return (error);
+	return (0);
 }
 
 #ifdef LAGG_PORT_STACKING
@@ -714,17 +862,19 @@ lagg_port_checkstacking(struct lagg_softc *sc)
 #endif
 
 static int
-lagg_port_destroy(struct lagg_port *lp, int runpd)
+lagg_port_destroy(struct lagg_port *lp, int rundelport)
 {
 	struct lagg_softc *sc = lp->lp_softc;
 	struct lagg_port *lp_ptr;
 	struct lagg_llq *llq;
 	struct ifnet *ifp = lp->lp_ifp;
+	uint64_t *pval, vdiff;
+	int i;
 
 	LAGG_WLOCK_ASSERT(sc);
 
-	if (runpd && sc->sc_port_destroy != NULL)
-		(*sc->sc_port_destroy)(lp);
+	if (rundelport)
+		lagg_proto_delport(sc, lp);
 
 	/*
 	 * Remove multicast addresses and interface flags from this port and
@@ -742,6 +892,13 @@ lagg_port_destroy(struct lagg_port *lp, int runpd)
 	ifp->if_output = lp->lp_output;
 	ifp->if_lagg = NULL;
 
+	/* Update detached port counters */
+	pval = lp->port_counters.val;
+	for (i = 0; i < IFCOUNTERS; i++, pval++) {
+		vdiff = ifp->if_get_counter(ifp, i) - *pval;
+		sc->detached_counters.val[i] += vdiff;
+	}
+
 	/* Finally, remove the port from the lagg */
 	SLIST_REMOVE(&sc->sc_ports, lp, lagg_port, lp_entries);
 	sc->sc_count--;
@@ -854,6 +1011,61 @@ lagg_port_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	return (EINVAL);
 }
 
+/*
+ * Requests counter @cnt data. 
+ *
+ * Counter value is calculated the following way:
+ * 1) for each port, sum  difference between current and "initial" measurements.
+ * 2) add lagg logical interface counters.
+ * 3) add data from detached_counters array.
+ *
+ * We also do the following things on ports attach/detach:
+ * 1) On port attach we store all counters it has into port_counter array. 
+ * 2) On port detach we add the different between "initial" and
+ *   current counters data to detached_counters array.
+ */
+static uint64_t
+lagg_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct lagg_softc *sc;
+	struct lagg_port *lp;
+	struct ifnet *lpifp;
+	struct rm_priotracker tracker;
+	uint64_t newval, oldval, vsum;
+
+	/* Revise this when we've got non-generic counters. */
+	KASSERT(cnt < IFCOUNTERS, ("%s: invalid cnt %d", __func__, cnt));
+
+	sc = (struct lagg_softc *)ifp->if_softc;
+	LAGG_RLOCK(sc, &tracker);
+
+	vsum = 0;
+	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) {
+		/* Saved attached value */
+		oldval = lp->port_counters.val[cnt];
+		/* current value */
+		lpifp = lp->lp_ifp;
+		newval = lpifp->if_get_counter(lpifp, cnt);
+		/* Calculate diff and save new */
+		vsum += newval - oldval;
+	}
+
+	/*
+	 * Add counter data which might be added by upper
+	 * layer protocols operating on logical interface.
+	 */
+	vsum += if_get_counter_default(ifp, cnt);
+
+	/*
+	 * Add counter data from detached ports counters
+	 */
+	vsum += sc->detached_counters.val[cnt];
+
+	LAGG_RUNLOCK(sc, &tracker);
+
+	return (vsum);
+}
+
 /*
  * For direct output to child ports.
  */
@@ -903,8 +1115,7 @@ lagg_port2req(struct lagg_port *lp, struct lagg_reqport *rp)
 	strlcpy(rp->rp_portname, lp->lp_ifp->if_xname, sizeof(rp->rp_portname));
 	rp->rp_prio = lp->lp_prio;
 	rp->rp_flags = lp->lp_flags;
-	if (sc->sc_portreq != NULL)
-		(*sc->sc_portreq)(lp, (caddr_t)&rp->rp_psc);
+	lagg_proto_portreq(sc, lp, &rp->rp_psc);
 
 	/* Add protocol specific flags */
 	switch (sc->sc_proto) {
@@ -918,6 +1129,7 @@ lagg_port2req(struct lagg_port *lp, struct lagg_reqport *rp)
 		case LAGG_PROTO_ROUNDROBIN:
 		case LAGG_PROTO_LOADBALANCE:
 		case LAGG_PROTO_ETHERCHANNEL:
+		case LAGG_PROTO_BROADCAST:
 			if (LAGG_PORTACTIVE(lp))
 				rp->rp_flags |= LAGG_PORT_ACTIVE;
 			break;
@@ -952,8 +1164,7 @@ lagg_init(void *xsc)
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
 		lagg_port_lladdr(lp, IF_LLADDR(ifp));
 
-	if (sc->sc_init != NULL)
-		(*sc->sc_init)(sc);
+	lagg_proto_init(sc);
 
 	LAGG_WUNLOCK(sc);
 }
@@ -970,8 +1181,7 @@ lagg_stop(struct lagg_softc *sc)
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 
-	if (sc->sc_stop != NULL)
-		(*sc->sc_stop)(sc);
+	lagg_proto_stop(sc);
 }
 
 static int
@@ -979,6 +1189,7 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc;
 	struct lagg_reqall *ra = (struct lagg_reqall *)data;
+	struct lagg_reqopts *ro = (struct lagg_reqopts *)data;
 	struct lagg_reqport *rp = (struct lagg_reqport *)data, rpbuf;
 	struct lagg_reqflags *rf = (struct lagg_reqflags *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
@@ -1004,9 +1215,7 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 		LAGG_RLOCK(sc, &tracker);
 		ra->ra_proto = sc->sc_proto;
-		if (sc->sc_req != NULL)
-			(*sc->sc_req)(sc, (caddr_t)&ra->ra_psc);
-
+		lagg_proto_request(sc, &ra->ra_psc);
 		count = 0;
 		buf = outbuf;
 		len = min(ra->ra_size, buflen);
@@ -1030,50 +1239,115 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		error = priv_check(td, PRIV_NET_LAGG);
 		if (error)
 			break;
-		if (ra->ra_proto >= LAGG_PROTO_MAX) {
+		if (ra->ra_proto < 1 || ra->ra_proto >= LAGG_PROTO_MAX) {
 			error = EPROTONOSUPPORT;
 			break;
 		}
+
 		LAGG_WLOCK(sc);
-		if (sc->sc_proto != LAGG_PROTO_NONE) {
-			/* Reset protocol first in case detach unlocks */
-			sc->sc_proto = LAGG_PROTO_NONE;
-			error = sc->sc_detach(sc);
-			sc->sc_detach = NULL;
-			sc->sc_start = NULL;
-			sc->sc_input = NULL;
-			sc->sc_port_create = NULL;
-			sc->sc_port_destroy = NULL;
-			sc->sc_linkstate = NULL;
-			sc->sc_init = NULL;
-			sc->sc_stop = NULL;
-			sc->sc_lladdr = NULL;
-			sc->sc_req = NULL;
-			sc->sc_portreq = NULL;
-		} else if (sc->sc_input != NULL) {
-			/* Still detaching */
-			error = EBUSY;
+		lagg_proto_detach(sc);
+		lagg_proto_attach(sc, ra->ra_proto);
+		break;
+	case SIOCGLAGGOPTS:
+		ro->ro_opts = sc->sc_opts;
+		if (sc->sc_proto == LAGG_PROTO_LACP) {
+			struct lacp_softc *lsc;
+
+			lsc = (struct lacp_softc *)sc->sc_psc;
+			if (lsc->lsc_debug.lsc_tx_test != 0)
+				ro->ro_opts |= LAGG_OPT_LACP_TXTEST;
+			if (lsc->lsc_debug.lsc_rx_test != 0)
+				ro->ro_opts |= LAGG_OPT_LACP_RXTEST;
+			if (lsc->lsc_strict_mode != 0)
+				ro->ro_opts |= LAGG_OPT_LACP_STRICT;
+
+			ro->ro_active = sc->sc_active;
+		} else {
+			ro->ro_active = 0;
+			SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
+				ro->ro_active += LAGG_PORTACTIVE(lp);
 		}
-		if (error != 0) {
-			LAGG_WUNLOCK(sc);
+		ro->ro_flapping = sc->sc_flapping;
+		ro->ro_flowid_shift = sc->flowid_shift;
+		break;
+	case SIOCSLAGGOPTS:
+		error = priv_check(td, PRIV_NET_LAGG);
+		if (error)
+			break;
+		if (ro->ro_opts == 0)
+			break;
+		/*
+		 * Set options.  LACP options are stored in sc->sc_psc,
+		 * not in sc_opts.
+		 */
+		int valid, lacp;
+
+		switch (ro->ro_opts) {
+		case LAGG_OPT_USE_FLOWID:
+		case -LAGG_OPT_USE_FLOWID:
+		case LAGG_OPT_FLOWIDSHIFT:
+			valid = 1;
+			lacp = 0;
+			break;
+		case LAGG_OPT_LACP_TXTEST:
+		case -LAGG_OPT_LACP_TXTEST:
+		case LAGG_OPT_LACP_RXTEST:
+		case -LAGG_OPT_LACP_RXTEST:
+		case LAGG_OPT_LACP_STRICT:
+		case -LAGG_OPT_LACP_STRICT:
+			valid = lacp = 1;
+			break;
+		default:
+			valid = lacp = 0;
 			break;
 		}
-		for (int i = 0; i < (sizeof(lagg_protos) /
-		    sizeof(lagg_protos[0])); i++) {
-			if (lagg_protos[i].ti_proto == ra->ra_proto) {
-				if (sc->sc_ifflags & IFF_DEBUG)
-					printf("%s: using proto %u\n",
-					    sc->sc_ifname,
-					    lagg_protos[i].ti_proto);
-				sc->sc_proto = lagg_protos[i].ti_proto;
-				if (sc->sc_proto != LAGG_PROTO_NONE)
-					error = lagg_protos[i].ti_attach(sc);
-				LAGG_WUNLOCK(sc);
-				return (error);
+
+		LAGG_WLOCK(sc);
+		if (valid == 0 ||
+		    (lacp == 1 && sc->sc_proto != LAGG_PROTO_LACP)) {
+			/* Invalid combination of options specified. */
+			error = EINVAL;
+			LAGG_WUNLOCK(sc);
+			break;	/* Return from SIOCSLAGGOPTS. */ 
+		}
+		/*
+		 * Store new options into sc->sc_opts except for
+		 * FLOWIDSHIFT and LACP options.
+		 */
+		if (lacp == 0) {
+			if (ro->ro_opts == LAGG_OPT_FLOWIDSHIFT)
+				sc->flowid_shift = ro->ro_flowid_shift;
+			else if (ro->ro_opts > 0)
+				sc->sc_opts |= ro->ro_opts;
+			else
+				sc->sc_opts &= ~ro->ro_opts;
+		} else {
+			struct lacp_softc *lsc;
+
+			lsc = (struct lacp_softc *)sc->sc_psc;
+
+			switch (ro->ro_opts) {
+			case LAGG_OPT_LACP_TXTEST:
+				lsc->lsc_debug.lsc_tx_test = 1;
+				break;
+			case -LAGG_OPT_LACP_TXTEST:
+				lsc->lsc_debug.lsc_tx_test = 0;
+				break;
+			case LAGG_OPT_LACP_RXTEST:
+				lsc->lsc_debug.lsc_rx_test = 1;
+				break;
+			case -LAGG_OPT_LACP_RXTEST:
+				lsc->lsc_debug.lsc_rx_test = 0;
+				break;
+			case LAGG_OPT_LACP_STRICT:
+				lsc->lsc_strict_mode = 1;
+				break;
+			case -LAGG_OPT_LACP_STRICT:
+				lsc->lsc_strict_mode = 0;
+				break;
 			}
 		}
 		LAGG_WUNLOCK(sc);
-		error = EPROTONOSUPPORT;
 		break;
 	case SIOCGLAGGFLAGS:
 		rf->rf_flags = sc->sc_flags;
@@ -1258,7 +1532,7 @@ lagg_ether_cmdmulti(struct lagg_port *lp, int set)
 /* Handle a ref counted flag that should be set on the lagg port as well */
 static int
 lagg_setflag(struct lagg_port *lp, int flag, int status,
-	     int (*func)(struct ifnet *, int))
+    int (*func)(struct ifnet *, int))
 {
 	struct lagg_softc *sc = lp->lp_softc;
 	struct ifnet *scifp = sc->sc_ifp;
@@ -1323,21 +1597,17 @@ lagg_transmit(struct ifnet *ifp, struct mbuf *m)
 	if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) {
 		LAGG_RUNLOCK(sc, &tracker);
 		m_freem(m);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return (ENXIO);
 	}
 
 	ETHER_BPF_MTAP(ifp, m);
 
-	error = (*sc->sc_start)(sc, m);
+	error = lagg_proto_start(sc, m);
 	LAGG_RUNLOCK(sc, &tracker);
 
-	if (error == 0) {
-		counter_u64_add(sc->sc_opackets, 1);
-		counter_u64_add(sc->sc_obytes, len);
-		ifp->if_omcasts += mcast;
-	} else
-		ifp->if_oerrors++;
+	if (error != 0)
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 
 	return (error);
 }
@@ -1369,12 +1639,9 @@ lagg_input(struct ifnet *ifp, struct mbuf *m)
 
 	ETHER_BPF_MTAP(scifp, m);
 
-	m = (*sc->sc_input)(sc, lp, m);
+	m = lagg_proto_input(sc, lp, m);
 
 	if (m != NULL) {
-		counter_u64_add(sc->sc_ipackets, 1);
-		counter_u64_add(sc->sc_ibytes, m->m_pkthdr.len);
-
 		if (scifp->if_flags & IFF_MONITOR) {
 			m_freem(m);
 			m = NULL;
@@ -1424,7 +1691,7 @@ lagg_linkstate(struct lagg_softc *sc)
 
 	/* Our link is considered up if at least one of our ports is active */
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) {
-		if (lp->lp_link_state == LINK_STATE_UP) {
+		if (lp->lp_ifp->if_link_state == LINK_STATE_UP) {
 			new_link = LINK_STATE_UP;
 			break;
 		}
@@ -1440,6 +1707,7 @@ lagg_linkstate(struct lagg_softc *sc)
 		case LAGG_PROTO_ROUNDROBIN:
 		case LAGG_PROTO_LOADBALANCE:
 		case LAGG_PROTO_ETHERCHANNEL:
+		case LAGG_PROTO_BROADCAST:
 			speed = 0;
 			SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
 				speed += lp->lp_ifp->if_baudrate;
@@ -1464,8 +1732,7 @@ lagg_port_state(struct ifnet *ifp, int state)
 
 	LAGG_WLOCK(sc);
 	lagg_linkstate(sc);
-	if (sc->sc_linkstate != NULL)
-		(*sc->sc_linkstate)(lp);
+	lagg_proto_linkstate(sc, lp);
 	LAGG_WUNLOCK(sc);
 }
 
@@ -1532,27 +1799,6 @@ lagg_gethdr(struct mbuf *m, u_int off, u_int len, void *buf)
 	return (mtod(m, char *) + off);
 }
 
-static int
-lagg_sysctl_active(SYSCTL_HANDLER_ARGS)
-{
-	struct lagg_softc *sc = (struct lagg_softc *)arg1;
-	struct lagg_port *lp;
-	int error;
-
-	/* LACP tracks active links automatically, the others do not */
-	if (sc->sc_proto != LAGG_PROTO_LACP) {
-		sc->sc_active = 0;
-		SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
-			sc->sc_active += LAGG_PORTACTIVE(lp);
-	}
-
-	error = sysctl_handle_int(oidp, &sc->sc_active, 0, req);
-	if ((error) || (req->newptr == NULL))
-		return (error);
-
-	return (0);
-}
-
 uint32_t
 lagg_hashmbuf(struct lagg_softc *sc, struct mbuf *m, uint32_t key)
 {
@@ -1665,24 +1911,11 @@ lagg_enqueue(struct ifnet *ifp, struct mbuf *m)
 /*
  * Simple round robin aggregation
  */
-
-static int
+static void
 lagg_rr_attach(struct lagg_softc *sc)
 {
-	sc->sc_detach = lagg_rr_detach;
-	sc->sc_start = lagg_rr_start;
-	sc->sc_input = lagg_rr_input;
-	sc->sc_port_create = NULL;
 	sc->sc_capabilities = IFCAP_LAGG_FULLDUPLEX;
 	sc->sc_seq = 0;
-
-	return (0);
-}
-
-static int
-lagg_rr_detach(struct lagg_softc *sc)
-{
-	return (0);
 }
 
 static int
@@ -1721,28 +1954,70 @@ lagg_rr_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
 	return (m);
 }
 
+/*
+ * Broadcast mode
+ */
+static int
+lagg_bcast_start(struct lagg_softc *sc, struct mbuf *m)
+{
+	int active_ports = 0;
+	int errors = 0;
+	int ret;
+	struct lagg_port *lp, *last = NULL;
+	struct mbuf *m0;
+
+	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries) {
+		if (!LAGG_PORTACTIVE(lp))
+			continue;
+
+		active_ports++;
+
+		if (last != NULL) {
+			m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+			if (m0 == NULL) {
+				ret = ENOBUFS;
+				errors++;
+				break;
+			}
+
+			ret = lagg_enqueue(last->lp_ifp, m0);
+			if (ret != 0)
+				errors++;
+		}
+		last = lp;
+	}
+	if (last == NULL) {
+		m_freem(m);
+		return (ENOENT);
+	}
+	if ((last = lagg_link_active(sc, last)) == NULL) {
+		m_freem(m);
+		return (ENETDOWN);
+	}
+
+	ret = lagg_enqueue(last->lp_ifp, m);
+	if (ret != 0)
+		errors++;
+
+	if (errors == 0)
+		return (ret);
+
+	return (0);
+}
+
+static struct mbuf*
+lagg_bcast_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
+{
+	struct ifnet *ifp = sc->sc_ifp;
+
+	/* Just pass in the packet to our lagg device */
+	m->m_pkthdr.rcvif = ifp;
+	return (m);
+}
+
 /*
  * Active failover
  */
-
-static int
-lagg_fail_attach(struct lagg_softc *sc)
-{
-	sc->sc_detach = lagg_fail_detach;
-	sc->sc_start = lagg_fail_start;
-	sc->sc_input = lagg_fail_input;
-	sc->sc_port_create = NULL;
-	sc->sc_port_destroy = NULL;
-
-	return (0);
-}
-
-static int
-lagg_fail_detach(struct lagg_softc *sc)
-{
-	return (0);
-}
-
 static int
 lagg_fail_start(struct lagg_softc *sc, struct mbuf *m)
 {
@@ -1764,7 +2039,7 @@ lagg_fail_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
 	struct ifnet *ifp = sc->sc_ifp;
 	struct lagg_port *tmp_tp;
 
-	if (lp == sc->sc_primary || lagg_failover_rx_all) {
+	if (lp == sc->sc_primary || V_lagg_failover_rx_all) {
 		m->m_pkthdr.rcvif = ifp;
 		return (m);
 	}
@@ -1788,40 +2063,32 @@ lagg_fail_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
 /*
  * Loadbalancing
  */
-
-static int
+static void
 lagg_lb_attach(struct lagg_softc *sc)
 {
 	struct lagg_port *lp;
 	struct lagg_lb *lb;
 
-	if ((lb = (struct lagg_lb *)malloc(sizeof(struct lagg_lb),
-	    M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL)
-		return (ENOMEM);
+	lb = malloc(sizeof(struct lagg_lb), M_DEVBUF, M_WAITOK | M_ZERO);
 
-	sc->sc_detach = lagg_lb_detach;
-	sc->sc_start = lagg_lb_start;
-	sc->sc_input = lagg_lb_input;
-	sc->sc_port_create = lagg_lb_port_create;
-	sc->sc_port_destroy = lagg_lb_port_destroy;
 	sc->sc_capabilities = IFCAP_LAGG_FULLDUPLEX;
 
 	lb->lb_key = arc4random();
-	sc->sc_psc = (caddr_t)lb;
+	sc->sc_psc = lb;
 
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
 		lagg_lb_port_create(lp);
-
-	return (0);
 }
 
-static int
+static void
 lagg_lb_detach(struct lagg_softc *sc)
 {
-	struct lagg_lb *lb = (struct lagg_lb *)sc->sc_psc;
+	struct lagg_lb *lb;
+
+	lb = (struct lagg_lb *)sc->sc_psc;
+	LAGG_WUNLOCK(sc);
 	if (lb != NULL)
 		free(lb, M_DEVBUF);
-	return (0);
 }
 
 static int
@@ -1839,7 +2106,7 @@ lagg_lb_porttable(struct lagg_softc *sc, struct lagg_port *lp)
 			return (EINVAL);
 		if (sc->sc_ifflags & IFF_DEBUG)
 			printf("%s: port %s at index %d\n",
-			    sc->sc_ifname, lp_next->lp_ifname, i);
+			    sc->sc_ifname, lp_next->lp_ifp->if_xname, i);
 		lb->lb_ports[i++] = lp_next;
 	}
 
@@ -1867,7 +2134,7 @@ lagg_lb_start(struct lagg_softc *sc, struct mbuf *m)
 	struct lagg_port *lp = NULL;
 	uint32_t p = 0;
 
-	if (sc->use_flowid && (m->m_flags & M_FLOWID))
+	if ((sc->sc_opts & LAGG_OPT_USE_FLOWID) && (m->m_flags & M_FLOWID))
 		p = m->m_pkthdr.flowid >> sc->flowid_shift;
 	else
 		p = lagg_hashmbuf(sc, m, lb->lb_key);
@@ -1901,50 +2168,30 @@ lagg_lb_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
 /*
  * 802.3ad LACP
  */
-
-static int
+static void
 lagg_lacp_attach(struct lagg_softc *sc)
 {
 	struct lagg_port *lp;
-	int error;
-
-	sc->sc_detach = lagg_lacp_detach;
-	sc->sc_port_create = lacp_port_create;
-	sc->sc_port_destroy = lacp_port_destroy;
-	sc->sc_linkstate = lacp_linkstate;
-	sc->sc_start = lagg_lacp_start;
-	sc->sc_input = lagg_lacp_input;
-	sc->sc_init = lacp_init;
-	sc->sc_stop = lacp_stop;
-	sc->sc_lladdr = lagg_lacp_lladdr;
-	sc->sc_req = lacp_req;
-	sc->sc_portreq = lacp_portreq;
-
-	error = lacp_attach(sc);
-	if (error)
-		return (error);
 
+	lacp_attach(sc);
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
 		lacp_port_create(lp);
-
-	return (error);
 }
 
-static int
+static void
 lagg_lacp_detach(struct lagg_softc *sc)
 {
 	struct lagg_port *lp;
-	int error;
+	void *psc;
 
 	SLIST_FOREACH(lp, &sc->sc_ports, lp_entries)
 		lacp_port_destroy(lp);
 
-	/* unlocking is safe here */
+	psc = sc->sc_psc;
+	sc->sc_psc = NULL;
 	LAGG_WUNLOCK(sc);
-	error = lacp_detach(sc);
-	LAGG_WLOCK(sc);
 
-	return (error);
+	lacp_detach(psc);
 }
 
 static void
@@ -2006,16 +2253,3 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m)
 	return (m);
 }
 
-static void
-lagg_callout(void *arg)
-{
-	struct lagg_softc *sc = (struct lagg_softc *)arg;
-	struct ifnet *ifp = sc->sc_ifp;
-
-	ifp->if_ipackets = counter_u64_fetch(sc->sc_ipackets);
-	ifp->if_opackets = counter_u64_fetch(sc->sc_opackets);
-	ifp->if_ibytes = counter_u64_fetch(sc->sc_ibytes);
-	ifp->if_obytes = counter_u64_fetch(sc->sc_obytes);
-
-	callout_reset(&sc->sc_callout, hz, lagg_callout, sc);
-}
diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h
index 4a1d9a0a77cb..bbb3497f96cd 100644
--- a/sys/net/if_lagg.h
+++ b/sys/net/if_lagg.h
@@ -47,26 +47,30 @@
 				  "\05DISTRIBUTING\06DISABLED"
 
 /* Supported lagg PROTOs */
-#define	LAGG_PROTO_NONE		0	/* no lagg protocol defined */
-#define	LAGG_PROTO_ROUNDROBIN	1	/* simple round robin */
-#define	LAGG_PROTO_FAILOVER	2	/* active failover */
-#define	LAGG_PROTO_LOADBALANCE	3	/* loadbalance */
-#define	LAGG_PROTO_LACP		4	/* 802.3ad lacp */
-#define	LAGG_PROTO_ETHERCHANNEL	5	/* Cisco FEC */
-#define	LAGG_PROTO_MAX		6
+typedef enum {
+	LAGG_PROTO_NONE = 0,	/* no lagg protocol defined */
+	LAGG_PROTO_ROUNDROBIN,	/* simple round robin */
+	LAGG_PROTO_FAILOVER,	/* active failover */
+	LAGG_PROTO_LOADBALANCE,	/* loadbalance */
+	LAGG_PROTO_LACP,	/* 802.3ad lacp */
+	LAGG_PROTO_ETHERCHANNEL,/* Cisco FEC */
+	LAGG_PROTO_BROADCAST,	/* broadcast */
+	LAGG_PROTO_MAX,
+} lagg_proto;
 
 struct lagg_protos {
 	const char		*lpr_name;
-	int			lpr_proto;
+	lagg_proto		lpr_proto;
 };
 
 #define	LAGG_PROTO_DEFAULT	LAGG_PROTO_FAILOVER
 #define LAGG_PROTOS	{						\
-	{ "failover",		LAGG_PROTO_FAILOVER },			\
+	{ "failover",		LAGG_PROTO_FAILOVER },		\
 	{ "fec",		LAGG_PROTO_ETHERCHANNEL },		\
 	{ "lacp",		LAGG_PROTO_LACP },			\
 	{ "loadbalance",	LAGG_PROTO_LOADBALANCE },		\
-	{ "roundrobin",		LAGG_PROTO_ROUNDROBIN },		\
+	{ "roundrobin",	LAGG_PROTO_ROUNDROBIN },		\
+	{ "broadcast",	LAGG_PROTO_BROADCAST },		\
 	{ "none",		LAGG_PROTO_NONE },			\
 	{ "default",		LAGG_PROTO_DEFAULT }			\
 }
@@ -134,19 +138,35 @@ struct lagg_reqflags {
 #define	SIOCGLAGGFLAGS		_IOWR('i', 145, struct lagg_reqflags)
 #define	SIOCSLAGGHASH		 _IOW('i', 146, struct lagg_reqflags)
 
-#ifdef _KERNEL
+struct lagg_reqopts {
+	char			ro_ifname[IFNAMSIZ];	/* name of the lagg */
 
-#include <sys/counter.h>
+	int			ro_opts;		/* Option bitmap */
+#define	LAGG_OPT_NONE			0x00
+#define	LAGG_OPT_USE_FLOWID		0x01		/* use M_FLOWID */
+/* Pseudo flags which are used in ro_opts but not stored into sc_opts. */
+#define	LAGG_OPT_FLOWIDSHIFT		0x02		/* Set flowid */
+#define	LAGG_OPT_FLOWIDSHIFT_MASK	0x1f		/* flowid is uint32_t */
+#define	LAGG_OPT_LACP_STRICT		0x10		/* LACP strict mode */
+#define	LAGG_OPT_LACP_TXTEST		0x20		/* LACP debug: txtest */
+#define	LAGG_OPT_LACP_RXTEST		0x40		/* LACP debug: rxtest */
+	u_int			ro_count;		/* number of ports */
+	u_int			ro_active;		/* active port count */
+	u_int			ro_flapping;		/* number of flapping */
+	int			ro_flowid_shift;	/* shift the flowid */
+};
+
+#define	SIOCGLAGGOPTS		_IOWR('i', 152, struct lagg_reqopts)
+#define	SIOCSLAGGOPTS		 _IOW('i', 153, struct lagg_reqopts)
+
+#ifdef _KERNEL
 
 /*
  * Internal kernel part
  */
 
-#define	lp_ifname		lp_ifp->if_xname	/* interface name */
-#define	lp_link_state		lp_ifp->if_link_state	/* link state */
-
 #define	LAGG_PORTACTIVE(_tp)	(					\
-	((_tp)->lp_link_state == LINK_STATE_UP) &&			\
+	((_tp)->lp_ifp->if_link_state == LINK_STATE_UP) &&		\
 	((_tp)->lp_ifp->if_flags & IFF_UP)				\
 )
 
@@ -186,10 +206,13 @@ struct lagg_llq {
 	SLIST_ENTRY(lagg_llq)	llq_entries;
 };
 
+struct lagg_counters {
+	uint64_t	val[IFCOUNTERS];
+};
+
 struct lagg_softc {
 	struct ifnet			*sc_ifp;	/* virtual interface */
 	struct rmlock			sc_mtx;
-	struct mtx			sc_call_mtx;
 	int				sc_proto;	/* lagg protocol */
 	u_int				sc_count;	/* number of ports */
 	u_int				sc_active;	/* active port count */
@@ -197,42 +220,22 @@ struct lagg_softc {
 							 * events */
 	struct lagg_port		*sc_primary;	/* primary port */
 	struct ifmedia			sc_media;	/* media config */
-	caddr_t				sc_psc;		/* protocol data */
+	void				*sc_psc;	/* protocol data */
 	uint32_t			sc_seq;		/* sequence counter */
 	uint32_t			sc_flags;
 
-	counter_u64_t			sc_ipackets;
-	counter_u64_t			sc_opackets;
-	counter_u64_t			sc_ibytes;
-	counter_u64_t			sc_obytes;
-
 	SLIST_HEAD(__tplhd, lagg_port)	sc_ports;	/* list of interfaces */
 	SLIST_ENTRY(lagg_softc)	sc_entries;
 
 	struct task			sc_lladdr_task;
 	SLIST_HEAD(__llqhd, lagg_llq)	sc_llq_head;	/* interfaces to program
 							   the lladdr on */
-
-	/* lagg protocol callbacks */
-	int	(*sc_detach)(struct lagg_softc *);
-	int	(*sc_start)(struct lagg_softc *, struct mbuf *);
-	struct mbuf *(*sc_input)(struct lagg_softc *, struct lagg_port *,
-		    struct mbuf *);
-	int	(*sc_port_create)(struct lagg_port *);
-	void	(*sc_port_destroy)(struct lagg_port *);
-	void	(*sc_linkstate)(struct lagg_port *);
-	void	(*sc_init)(struct lagg_softc *);
-	void	(*sc_stop)(struct lagg_softc *);
-	void	(*sc_lladdr)(struct lagg_softc *);
-	void	(*sc_req)(struct lagg_softc *, caddr_t);
-	void	(*sc_portreq)(struct lagg_port *, caddr_t);
 	eventhandler_tag vlan_attach;
 	eventhandler_tag vlan_detach;
 	struct callout			sc_callout;
-	struct sysctl_ctx_list		ctx;		/* sysctl variables */
-	struct sysctl_oid		*sc_oid;	/* sysctl tree oid */
-	int				use_flowid;	/* use M_FLOWID */
+	u_int				sc_opts;
 	int				flowid_shift;	/* shift the flowid */
+	struct lagg_counters		detached_counters; /* detached ports sum */
 };
 
 struct lagg_port {
@@ -245,7 +248,7 @@ struct lagg_port {
 	uint32_t			lp_flags;	/* port flags */
 	int				lp_ifflags;	/* saved ifp flags */
 	void				*lh_cookie;	/* if state hook */
-	caddr_t				lp_psc;		/* protocol data */
+	void				*lp_psc;	/* protocol data */
 	int				lp_detaching;	/* ifnet is detaching */
 
 	SLIST_HEAD(__mclhd, lagg_mc)	lp_mc_head;	/* multicast addresses */
@@ -254,6 +257,7 @@ struct lagg_port {
 	int	(*lp_ioctl)(struct ifnet *, u_long, caddr_t);
 	int	(*lp_output)(struct ifnet *, struct mbuf *,
 		     const struct sockaddr *, struct route *);
+	struct lagg_counters		port_counters;	/* ifp counters copy */
 
 	SLIST_ENTRY(lagg_port)		lp_entries;
 };
@@ -267,11 +271,6 @@ struct lagg_port {
 #define	LAGG_RLOCK_ASSERT(_sc)	rm_assert(&(_sc)->sc_mtx, RA_RLOCKED)
 #define	LAGG_WLOCK_ASSERT(_sc)	rm_assert(&(_sc)->sc_mtx, RA_WLOCKED)
 
-#define	LAGG_CALLOUT_LOCK_INIT(_sc)					\
-	    mtx_init(&(_sc)->sc_call_mtx, "if_lagg callout mutex", NULL,\
-	    MTX_DEF)
-#define	LAGG_CALLOUT_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_call_mtx)
-
 extern struct mbuf *(*lagg_input_p)(struct ifnet *, struct mbuf *);
 extern void	(*lagg_linkstate_p)(struct ifnet *, int );
 
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 068705029d4e..6d2b9143dfb1 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -226,8 +226,8 @@ looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		        rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
 	}
 
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	/* BPF writes need to be handled specially. */
 	if (dst->sa_family == AF_UNSPEC)
@@ -358,8 +358,8 @@ if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen)
 		m_freem(m);
 		return (EAFNOSUPPORT);
 	}
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	netisr_queue(isr, m);	/* mbuf is free'd on failure. */
 	return (0);
 }
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 3c90235aa043..b6d245a7aa8f 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -105,7 +105,8 @@ sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XXX bad syntax! */
 		ifmd.ifmd_flags = ifp->if_flags | ifp->if_drv_flags;
 		ifmd.ifmd_snd_len = ifp->if_snd.ifq_len;
 		ifmd.ifmd_snd_maxlen = ifp->if_snd.ifq_maxlen;
-		ifmd.ifmd_snd_drops = ifp->if_snd.ifq_drops;
+		ifmd.ifmd_snd_drops =
+		    ifp->if_get_counter(ifp, IFCOUNTER_OQDROPS);
 
 		error = SYSCTL_OUT(req, &ifmd, sizeof ifmd);
 		if (error)
diff --git a/sys/net/if_spppfr.c b/sys/net/if_spppfr.c
index 8fda38b8797e..d84cc46c7cb6 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -250,9 +250,9 @@ bad:            m_freem (m);
 
 	switch (proto) {
 	default:
-		++ifp->if_noproto;
-drop:		++ifp->if_ierrors;
-		++ifp->if_iqdrops;
+		if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
+drop:		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		m_freem (m);
 		return;
 #ifdef INET
@@ -394,7 +394,7 @@ void sppp_fr_keepalive (struct sppp *sp)
 			(u_char) sp->pp_rseq[IDX_LCP]);
 
 	if (! IF_HANDOFF_ADJ(&sp->pp_cpq, m, ifp, 3))
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
@@ -508,7 +508,7 @@ static void sppp_fr_arp (struct sppp *sp, struct arp_req *req,
 	reply->ptarget2 = htonl (his_ip_address) >> 16;
 
 	if (! IF_HANDOFF_ADJ(&sp->pp_cpq, m, ifp, 3))
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 3340612e6ff5..9dc55c5ba12c 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -518,7 +518,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 
 	if (ifp->if_flags & IFF_UP)
 		/* Count received bytes, add FCS and one flag */
-		ifp->if_ibytes += m->m_pkthdr.len + 3;
+		if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len + 3);
 
 	if (m->m_pkthdr.len <= PPP_HEADER_LEN) {
 		/* Too small packet, drop it. */
@@ -530,8 +530,8 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 		m_freem (m);
 		SPPP_UNLOCK(sp);
 	  drop2:
-		++ifp->if_ierrors;
-		++ifp->if_iqdrops;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+		if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
 		return;
 	}
 
@@ -570,7 +570,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 				sppp_cp_send (sp, PPP_LCP, PROTO_REJ,
 					++sp->pp_seq[IDX_LCP], m->m_pkthdr.len + 2,
 					&h->protocol);
-			++ifp->if_noproto;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto drop;
 		case PPP_LCP:
 			sppp_cp_input(&lcp, sp, m);
@@ -682,7 +682,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
 		}
 		switch (ntohs (h->protocol)) {
 		default:
-			++ifp->if_noproto;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			goto invalid;
 		case CISCO_KEEPALIVE:
 			sppp_cisco_input (sp, m);
@@ -906,7 +906,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 nobufs:		if (debug)
 			log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
 				SPP_ARGS(ifp));
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		SPPP_UNLOCK(sp);
 		return (ENOBUFS);
 	}
@@ -966,7 +966,7 @@ nobufs:		if (debug)
 #endif
 	default:
 		m_freem (m);
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		SPPP_UNLOCK(sp);
 		return (EAFNOSUPPORT);
 	}
@@ -981,7 +981,7 @@ nobufs:		if (debug)
 	else
 		IFQ_HANDOFF_ADJ(ifp, m, 3, error);
 	if (error) {
-		++ifp->if_oerrors;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		SPPP_UNLOCK(sp);
 		return (rv? rv: ENOBUFS);
 	}
@@ -1393,7 +1393,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2)
 			(u_long)ch->par2, (u_int)ch->rel, (u_int)ch->time0, (u_int)ch->time1);
 
 	if (! IF_HANDOFF_ADJ(&sp->pp_cpq, m, ifp, 3))
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
@@ -1442,7 +1442,7 @@ sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
 		log(-1, ">\n");
 	}
 	if (! IF_HANDOFF_ADJ(&sp->pp_cpq, m, ifp, 3))
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
@@ -1484,7 +1484,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 				log(-1, SPP_FMT "%s invalid conf-req length %d\n",
 				       SPP_ARGS(ifp), cp->name,
 				       len);
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		/* handle states where RCR doesn't get a SCA/SCN */
@@ -1540,7 +1540,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	case CONF_ACK:
@@ -1549,7 +1549,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 				log(-1, SPP_FMT "%s id mismatch 0x%x != 0x%x\n",
 				       SPP_ARGS(ifp), cp->name,
 				       h->ident, sp->confid[cp->protoidx]);
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		switch (sp->state[cp->protoidx]) {
@@ -1584,7 +1584,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	case CONF_NAK:
@@ -1594,7 +1594,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 				log(-1, SPP_FMT "%s id mismatch 0x%x != 0x%x\n",
 				       SPP_ARGS(ifp), cp->name,
 				       h->ident, sp->confid[cp->protoidx]);
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		if (h->type == CONF_NAK)
@@ -1634,7 +1634,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 
@@ -1667,7 +1667,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	case TERM_ACK:
@@ -1698,7 +1698,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	case CODE_REJ:
@@ -1725,7 +1725,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	case PROTO_REJ:
@@ -1784,7 +1784,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name,
 			       sppp_cp_type_name(h->type),
 			       sppp_state_name(sp->state[cp->protoidx]));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		}
 		break;
 	    }
@@ -1800,7 +1800,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			if (debug)
 				log(-1, SPP_FMT "lcp echo req but lcp closed\n",
 				       SPP_ARGS(ifp));
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		if (len < 8) {
@@ -1834,7 +1834,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 		if (cp->proto != PPP_LCP)
 			goto illegal;
 		if (h->ident != sp->lcp.echoid) {
-			++ifp->if_ierrors;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			break;
 		}
 		if (len < 8) {
@@ -1859,7 +1859,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 			       SPP_ARGS(ifp), cp->name, h->type);
 		sppp_cp_send(sp, cp->proto, CODE_REJ,
 			     ++sp->pp_seq[cp->protoidx], m->m_pkthdr.len, h);
-		++ifp->if_ierrors;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 	}
 }
 
@@ -4740,7 +4740,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp,
 		log(-1, ">\n");
 	}
 	if (! IF_HANDOFF_ADJ(&sp->pp_cpq, m, ifp, 3))
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 }
 
 /*
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 7b6fbcfb7418..b92346e9ec45 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -442,7 +442,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	/* just in case */
 	if ((ifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return ENETDOWN;
 	}
 
@@ -454,7 +454,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	ia6 = stf_getsrcifa6(ifp);
 	if (ia6 == NULL) {
 		m_freem(m);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return ENETDOWN;
 	}
 
@@ -462,7 +462,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		m = m_pullup(m, sizeof(*ip6));
 		if (!m) {
 			ifa_free(&ia6->ia_ifa);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return ENOBUFS;
 		}
 	}
@@ -481,7 +481,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 	else {
 		ifa_free(&ia6->ia_ifa);
 		m_freem(m);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return ENETUNREACH;
 	}
 	bcopy(ptr, &in4, sizeof(in4));
@@ -503,7 +503,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
 		ifa_free(&ia6->ia_ifa);
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return ENOBUFS;
 	}
 	ip = mtod(m, struct ip *);
@@ -549,7 +549,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 		if (sc->sc_ro.ro_rt == NULL) {
 			m_freem(m);
 			mtx_unlock(&(sc)->sc_ro_mtx);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return ENETUNREACH;
 		}
 	}
@@ -557,7 +557,7 @@ stf_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 
 sendit:
 	M_SETFIB(m, sc->sc_fibnum);
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	error = ip_output(m, NULL, cached_route, 0, NULL, NULL);
 
 	if (cached_route != NULL)
@@ -770,8 +770,8 @@ in_stf_input(struct mbuf **mp, int *offp, int proto)
 	 * See net/if_gif.c for possible issues with packet processing
 	 * reorder due to extra queueing.
 	 */
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	M_SETFIB(m, ifp->if_fib);
 	netisr_dispatch(NETISR_IPV6, m);
 	return (IPPROTO_DONE);
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 89cac22f264e..5de424ca9b45 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -682,7 +682,7 @@ tapifstart(struct ifnet *ifp)
 			IF_DEQUEUE(&ifp->if_snd, m);
 			if (m != NULL) {
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else
 				break;
 		}
@@ -707,7 +707,7 @@ tapifstart(struct ifnet *ifp)
 
 		selwakeuppri(&tp->tap_rsel, PZERO+1);
 		KNOTE_LOCKED(&tp->tap_rsel.si_note, 0);
-		ifp->if_opackets ++; /* obytes are counted in ether_output */
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); /* obytes are counted in ether_output */
 	}
 
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -947,7 +947,7 @@ tapwrite(struct cdev *dev, struct uio *uio, int flag)
 
 	if ((m = m_uiotombuf(uio, M_NOWAIT, 0, ETHER_ALIGN,
 	    M_PKTHDR)) == NULL) {
-		ifp->if_ierrors ++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (ENOBUFS);
 	}
 
@@ -974,7 +974,7 @@ tapwrite(struct cdev *dev, struct uio *uio, int flag)
 	CURVNET_SET(ifp->if_vnet);
 	(*ifp->if_input)(ifp, m);
 	CURVNET_RESTORE();
-	ifp->if_ipackets ++; /* ibytes are counted in parent */
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); /* ibytes are counted in parent */
 
 	return (0);
 } /* tapwrite */
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index e4bc2afc7afc..89af2882643d 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -619,8 +619,8 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
-			ifp->if_iqdrops++;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return (ENOBUFS);
 		} else {
 			bcopy(dst, m0->m_data, dst->sa_len);
@@ -633,8 +633,8 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
-			ifp->if_iqdrops++;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return (ENOBUFS);
 		} else
 			*(u_int32_t *)m0->m_data = htonl(af);
@@ -651,7 +651,7 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst,
 	error = (ifp->if_transmit)(ifp, m0);
 	if (error)
 		return (ENOBUFS);
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	return (0);
 }
 
@@ -866,7 +866,7 @@ tunwrite(struct cdev *dev, struct uio *uio, int flag)
 	}
 
 	if ((m = m_uiotombuf(uio, M_NOWAIT, 0, 0, M_PKTHDR)) == NULL) {
-		ifp->if_ierrors++;
+		if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 		return (ENOBUFS);
 	}
 
@@ -908,8 +908,8 @@ tunwrite(struct cdev *dev, struct uio *uio, int flag)
 	}
 	if (harvest.point_to_point)
 		random_harvest(&(m->m_data), 12, 2, RANDOM_NET_TUN);
-	ifp->if_ibytes += m->m_pkthdr.len;
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	CURVNET_SET(ifp->if_vnet);
 	M_SETFIB(m, ifp->if_fib);
 	netisr_dispatch(isr, m);
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 3bffefe107c1..f043717e5d0b 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -96,7 +96,7 @@ VNET_DECLARE(struct pfil_head, link_pfil_hook);	/* packet filter hooks */
 #endif /* _KERNEL */
 
 typedef enum {
-	IFCOUNTER_IPACKETS = 1,
+	IFCOUNTER_IPACKETS = 0,
 	IFCOUNTER_IERRORS,
 	IFCOUNTER_OPACKETS,
 	IFCOUNTER_OERRORS,
@@ -108,7 +108,8 @@ typedef enum {
 	IFCOUNTER_IQDROPS,
 	IFCOUNTER_OQDROPS,
 	IFCOUNTER_NOPROTO,
-} ifnet_counter;
+	IFCOUNTERS /* Array size. */
+} ift_counter;
 
 typedef struct ifnet * if_t;
 
@@ -117,7 +118,13 @@ typedef	int (*if_ioctl_fn_t)(if_t, u_long, caddr_t);
 typedef	void (*if_init_fn_t)(void *);
 typedef void (*if_qflush_fn_t)(if_t);
 typedef int (*if_transmit_fn_t)(if_t, struct mbuf *);
-typedef	uint64_t (*if_get_counter_t)(if_t, ifnet_counter);
+typedef	uint64_t (*if_get_counter_t)(if_t, ift_counter);
+
+struct ifnet_hw_tsomax {
+	u_int	tsomaxbytes;	/* TSO total burst length limit in bytes */
+	u_int	tsomaxsegcount;	/* TSO maximum segment count */
+	u_int	tsomaxsegsize;	/* TSO maximum segment size in bytes */
+};
 
 /*
  * Structure defining a network interface.
@@ -221,27 +228,19 @@ struct ifnet {
 		(struct ifnet *, struct vnet *, char *);
 	if_get_counter_t if_get_counter; /* get counter values */
 
+	/* Statistics. */
+	counter_u64_t	if_counters[IFCOUNTERS];
+
 	/* Stuff that's only temporary and doesn't belong here. */
-	u_int	if_hw_tsomax;		/* tso burst length limit, the minimum
-					 * is (IP_MAXPACKET / 8).
-					 * XXXAO: Have to find a better place
-					 * for it eventually. */
-	/*
-	 * Old, racy and expensive statistics, should not be used in
-	 * new drivers.
-	 */
-	uint64_t	if_ipackets;	/* packets received on interface */
-	uint64_t	if_ierrors;	/* input errors on interface */
-	uint64_t	if_opackets;	/* packets sent on interface */
-	uint64_t	if_oerrors;	/* output errors on interface */
-	uint64_t	if_collisions;	/* collisions on csma interfaces */
-	uint64_t	if_ibytes;	/* total number of octets received */
-	uint64_t	if_obytes;	/* total number of octets sent */
-	uint64_t	if_imcasts;	/* packets received via multicast */
-	uint64_t	if_omcasts;	/* packets sent via multicast */
-	uint64_t	if_iqdrops;	/* dropped on input */
-	uint64_t	if_oqdrops;	/* dropped on output */
-	uint64_t	if_noproto;	/* destined for unsupported protocol */
+	u_int	if_hw_tsomax;		/* TSO total burst length
+					 * limit in bytes. A value of
+					 * zero means no limit. Have
+					 * to find a better place for
+					 * it eventually. */
+
+	/* TSO fields for segment limits. If a field is zero below, there is no limit. */
+	u_int		if_hw_tsomaxsegcount;	/* TSO maximum segment count */
+	u_int		if_hw_tsomaxsegsize;	/* TSO maximum segment size in bytes */
 
 	/*
 	 * Spare fields to be added before branching a stable branch, so
@@ -250,8 +249,6 @@ struct ifnet {
 	 */
 };
 
-#include <net/ifq.h>	/* XXXAO: temporary unconditional include */
-
 /* for compatibility with other BSDs */
 #define	if_addrlist	if_addrhead
 #define	if_list		if_link
@@ -513,13 +510,10 @@ int	ifa_switch_loopback_route(struct ifaddr *, struct sockaddr *, int fib);
 
 struct	ifaddr *ifa_ifwithaddr(struct sockaddr *);
 int		ifa_ifwithaddr_check(struct sockaddr *);
-struct	ifaddr *ifa_ifwithbroadaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr_fib(struct sockaddr *, int);
-struct	ifaddr *ifa_ifwithnet(struct sockaddr *, int);
-struct	ifaddr *ifa_ifwithnet_fib(struct sockaddr *, int, int);
-struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
-struct	ifaddr *ifa_ifwithroute_fib(int, struct sockaddr *, struct sockaddr *, u_int);
+struct	ifaddr *ifa_ifwithbroadaddr(struct sockaddr *, int);
+struct	ifaddr *ifa_ifwithdstaddr(struct sockaddr *, int);
+struct	ifaddr *ifa_ifwithnet(struct sockaddr *, int, int);
+struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *, u_int);
 struct	ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
 int	ifa_preferred(struct ifaddr *, struct ifaddr *);
 
@@ -530,7 +524,8 @@ typedef	void if_com_free_t(void *com, u_char type);
 void	if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f);
 void	if_deregister_com_alloc(u_char type);
 void	if_data_copy(struct ifnet *, struct if_data *);
-uint64_t if_get_counter_compat(struct ifnet *, ifnet_counter);
+uint64_t if_get_counter_default(struct ifnet *, ift_counter);
+void	if_inc_counter(struct ifnet *, ift_counter, int64_t);
 
 #define IF_LLADDR(ifp)							\
     LLADDR((struct sockaddr_dl *)((ifp)->if_addr->ifa_addr))
@@ -584,33 +579,13 @@ int if_multiaddr_count(if_t ifp, int max);
 int if_getamcount(if_t ifp);
 struct ifaddr * if_getifaddr(if_t ifp);
 
-/* Statistics */
-
-int if_incipackets(if_t ifp, int pkt);
-int if_incopackets(if_t ifp, int pkts);
-int if_incierrors(if_t ifp, int ierrors);
-int if_incoerrors(if_t ifp, int oerrors);
-int if_inciqdrops(if_t ifp, int val);
-int if_setierrors(if_t ifp, int ierrors);
-int if_setoerrors(if_t ifp, int oerrors);
-int if_setcollisions(if_t ifp, int collisions);
-int if_inccollisions(if_t ifp, int collisions);
-int if_incobytes(if_t ifp, int bytes);
-int if_getiqdrops(if_t ifp);
-int if_incimcasts(if_t ifp, int imcasts);
-int if_incomcasts(if_t ifp, int imcasts);
-int if_setipackets(if_t ifp, int pkts);
-int if_setopackets(if_t ifp, int pkts);
-int if_setibytes(if_t ifp, int bytes);
-int if_setobytes(if_t ifp, int bytes);
-int if_setimcasts(if_t ifp, int pkts);
-
 /* Functions */
 void if_setinitfn(if_t ifp, void (*)(void *));
 void if_setioctlfn(if_t ifp, int (*)(if_t, u_long, caddr_t));
 void if_setstartfn(if_t ifp, void (*)(if_t));
 void if_settransmitfn(if_t ifp, if_transmit_fn_t);
 void if_setqflushfn(if_t ifp, if_qflush_fn_t);
+void if_setgetcounterfn(if_t ifp, if_get_counter_t);
  
 /* Revisit the below. These are inline functions originally */
 int drbr_inuse_drv(if_t ifp, struct buf_ring *br);
@@ -618,5 +593,20 @@ struct mbuf* drbr_dequeue_drv(if_t ifp, struct buf_ring *br);
 int drbr_needs_enqueue_drv(if_t ifp, struct buf_ring *br);
 int drbr_enqueue_drv(if_t ifp, struct buf_ring *br, struct mbuf *m);
 
+/* TSO */
+void if_hw_tsomax_common(if_t ifp, struct ifnet_hw_tsomax *);
+int if_hw_tsomax_update(if_t ifp, struct ifnet_hw_tsomax *);
+
+#ifdef DEVICE_POLLING
+enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS };
+
+typedef	int poll_handler_t(if_t ifp, enum poll_cmd cmd, int count);
+int    ether_poll_register(poll_handler_t *h, if_t ifp);
+int    ether_poll_deregister(if_t ifp);
+#endif /* DEVICE_POLLING */
+
 #endif /* _KERNEL */
+
+#include <net/ifq.h>	/* XXXAO: temporary unconditional include */
+
 #endif /* !_NET_IF_VAR_H_ */
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index f551ffd618fc..1be288882019 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
-#include <sys/rwlock.h>
+#include <sys/rmlock.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -84,7 +84,7 @@ LIST_HEAD(ifvlanhead, ifvlan);
 
 struct ifvlantrunk {
 	struct	ifnet   *parent;	/* parent interface of this trunk */
-	struct	rwlock	rw;
+	struct	rmlock	lock;
 #ifdef VLAN_ARRAY
 #define	VLAN_ARRAY_SIZE	(EVL_VLID_MASK + 1)
 	struct	ifvlan	*vlans[VLAN_ARRAY_SIZE]; /* static table */
@@ -104,9 +104,15 @@ struct vlan_mc_entry {
 struct	ifvlan {
 	struct	ifvlantrunk *ifv_trunk;
 	struct	ifnet *ifv_ifp;
-	void	*ifv_cookie;
+	counter_u64_t	ifv_ipackets;
+	counter_u64_t	ifv_ibytes;
+	counter_u64_t	ifv_opackets;
+	counter_u64_t	ifv_obytes;
+	counter_u64_t	ifv_omcasts;
+	counter_u64_t	ifv_oerrors;
 #define	TRUNK(ifv)	((ifv)->ifv_trunk)
 #define	PARENT(ifv)	((ifv)->ifv_trunk->parent)
+	void	*ifv_cookie;
 	int	ifv_pflags;	/* special flags we have set on parent */
 	struct	ifv_linkmib {
 		int	ifvm_encaplen;	/* encapsulation length */
@@ -142,9 +148,10 @@ static SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0,
 static SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0,
     "for consistency");
 
-static int soft_pad = 0;
-SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW, &soft_pad, 0,
-	   "pad short frames before tagging");
+static VNET_DEFINE(int, soft_pad);
+#define	V_soft_pad	VNET(soft_pad)
+SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW | CTLFLAG_VNET,
+    &VNET_NAME(soft_pad), 0, "pad short frames before tagging");
 
 static const char vlanname[] = "vlan";
 static MALLOC_DEFINE(M_VLAN, vlanname, "802.1Q Virtual LAN Interface");
@@ -170,14 +177,15 @@ static struct sx ifv_lock;
 #define	VLAN_LOCK_ASSERT()	sx_assert(&ifv_lock, SA_LOCKED)
 #define	VLAN_LOCK()		sx_xlock(&ifv_lock)
 #define	VLAN_UNLOCK()		sx_xunlock(&ifv_lock)
-#define	TRUNK_LOCK_INIT(trunk)	rw_init(&(trunk)->rw, vlanname)
-#define	TRUNK_LOCK_DESTROY(trunk) rw_destroy(&(trunk)->rw)
-#define	TRUNK_LOCK(trunk)	rw_wlock(&(trunk)->rw)
-#define	TRUNK_UNLOCK(trunk)	rw_wunlock(&(trunk)->rw)
-#define	TRUNK_LOCK_ASSERT(trunk) rw_assert(&(trunk)->rw, RA_WLOCKED)
-#define	TRUNK_RLOCK(trunk)	rw_rlock(&(trunk)->rw)
-#define	TRUNK_RUNLOCK(trunk)	rw_runlock(&(trunk)->rw)
-#define	TRUNK_LOCK_RASSERT(trunk) rw_assert(&(trunk)->rw, RA_RLOCKED)
+#define	TRUNK_LOCK_INIT(trunk)	rm_init(&(trunk)->lock, vlanname)
+#define	TRUNK_LOCK_DESTROY(trunk) rm_destroy(&(trunk)->lock)
+#define	TRUNK_LOCK(trunk)	rm_wlock(&(trunk)->lock)
+#define	TRUNK_UNLOCK(trunk)	rm_wunlock(&(trunk)->lock)
+#define	TRUNK_LOCK_ASSERT(trunk) rm_assert(&(trunk)->lock, RA_WLOCKED)
+#define	TRUNK_RLOCK(trunk)	rm_rlock(&(trunk)->lock, &tracker)
+#define	TRUNK_RUNLOCK(trunk)	rm_runlock(&(trunk)->lock, &tracker)
+#define	TRUNK_LOCK_RASSERT(trunk) rm_assert(&(trunk)->lock, RA_RLOCKED)
+#define	TRUNK_LOCK_READER	struct rm_priotracker tracker
 
 #ifndef VLAN_ARRAY
 static	void vlan_inithash(struct ifvlantrunk *trunk);
@@ -194,6 +202,7 @@ static	void vlan_init(void *foo);
 static	void vlan_input(struct ifnet *ifp, struct mbuf *m);
 static	int vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr);
 static	void vlan_qflush(struct ifnet *ifp);
+static uint64_t vlan_get_counter(struct ifnet *ifp, ift_counter cnt);
 static	int vlan_setflag(struct ifnet *ifp, int flag, int status,
     int (*func)(struct ifnet *, int));
 static	int vlan_setflags(struct ifnet *ifp, int status);
@@ -681,6 +690,7 @@ vlan_devat(struct ifnet *ifp, uint16_t vid)
 {
 	struct ifvlantrunk *trunk;
 	struct ifvlan *ifv;
+	TRUNK_LOCK_READER;
 
 	trunk = ifp->if_vlantrunk;
 	if (trunk == NULL)
@@ -945,6 +955,13 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
 		return (ENOSPC);
 	}
 	SLIST_INIT(&ifv->vlan_mc_listhead);
+	/* Prepare pcpu counters */
+	ifv->ifv_ipackets = counter_u64_alloc(M_WAITOK);
+	ifv->ifv_opackets = counter_u64_alloc(M_WAITOK);
+	ifv->ifv_ibytes = counter_u64_alloc(M_WAITOK);
+	ifv->ifv_obytes = counter_u64_alloc(M_WAITOK);
+	ifv->ifv_omcasts = counter_u64_alloc(M_WAITOK);
+	ifv->ifv_oerrors = counter_u64_alloc(M_WAITOK);
 
 	ifp->if_softc = ifv;
 	/*
@@ -964,6 +981,7 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
 	ifp->if_qflush = vlan_qflush;
 	ifp->if_ioctl = vlan_ioctl;
 	ifp->if_flags = VLAN_IFFLAGS;
+	ifp->if_get_counter = vlan_get_counter;
 	ether_ifattach(ifp, eaddr);
 	/* Now undo some of the damage... */
 	ifp->if_baudrate = 0;
@@ -1006,6 +1024,12 @@ vlan_clone_destroy(struct if_clone *ifc, struct ifnet *ifp)
 	ether_ifdetach(ifp);	/* first, remove it from system-wide lists */
 	vlan_unconfig(ifp);	/* now it can be unconfigured and freed */
 	if_free(ifp);
+	counter_u64_free(ifv->ifv_ipackets);
+	counter_u64_free(ifv->ifv_opackets);
+	counter_u64_free(ifv->ifv_ibytes);
+	counter_u64_free(ifv->ifv_obytes);
+	counter_u64_free(ifv->ifv_omcasts);
+	counter_u64_free(ifv->ifv_oerrors);
 	free(ifv, M_VLAN);
 	ifc_free_unit(ifc, unit);
 
@@ -1043,7 +1067,7 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
 	 */
 	if (!UP_AND_RUNNING(p)) {
 		m_freem(m);
-		ifp->if_oerrors++;
+		counter_u64_add(ifv->ifv_oerrors, 1);
 		return (ENETDOWN);
 	}
 
@@ -1059,7 +1083,7 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
 	 * devices that just discard such runts instead or mishandle
 	 * them somehow.
 	 */
-	if (soft_pad && p->if_type == IFT_ETHER) {
+	if (V_soft_pad && p->if_type == IFT_ETHER) {
 		static char pad[8];	/* just zeros */
 		int n;
 
@@ -1070,7 +1094,7 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
 
 		if (n > 0) {
 			if_printf(ifp, "cannot pad short frame\n");
-			ifp->if_oerrors++;
+			counter_u64_add(ifv->ifv_oerrors, 1);
 			m_freem(m);
 			return (0);
 		}
@@ -1090,7 +1114,7 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
 		m = ether_vlanencap(m, ifv->ifv_vid);
 		if (m == NULL) {
 			if_printf(ifp, "unable to prepend VLAN header\n");
-			ifp->if_oerrors++;
+			counter_u64_add(ifv->ifv_oerrors, 1);
 			return (0);
 		}
 	}
@@ -1099,15 +1123,41 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
 	 * Send it, precisely as ether_output() would have.
 	 */
 	error = (p->if_transmit)(p, m);
-	if (!error) {
-		ifp->if_opackets++;
-		ifp->if_omcasts += mcast;
-		ifp->if_obytes += len;
+	if (error == 0) {
+		counter_u64_add(ifv->ifv_opackets, 1);
+		counter_u64_add(ifv->ifv_obytes, len);
+		counter_u64_add(ifv->ifv_omcasts, mcast);
 	} else
-		ifp->if_oerrors++;
+		counter_u64_add(ifv->ifv_oerrors, 1);
 	return (error);
 }
 
+static uint64_t
+vlan_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+	struct ifvlan *ifv;
+
+	ifv = ifp->if_softc;
+
+	switch (cnt) {
+		case IFCOUNTER_IPACKETS:
+			return (counter_u64_fetch(ifv->ifv_ipackets));
+		case IFCOUNTER_OPACKETS:
+			return (counter_u64_fetch(ifv->ifv_opackets));
+		case IFCOUNTER_IBYTES:
+			return (counter_u64_fetch(ifv->ifv_ibytes));
+		case IFCOUNTER_OBYTES:
+			return (counter_u64_fetch(ifv->ifv_obytes));
+		case IFCOUNTER_OMCASTS:
+			return (counter_u64_fetch(ifv->ifv_omcasts));
+		case IFCOUNTER_OERRORS:
+			return (counter_u64_fetch(ifv->ifv_oerrors));
+		default:
+			return (if_get_counter_default(ifp, cnt));
+	}
+	/* NOTREACHED */
+}
+
 /*
  * The ifp->if_qflush entry point for vlan(4) is a no-op.
  */
@@ -1121,6 +1171,7 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
 {
 	struct ifvlantrunk *trunk = ifp->if_vlantrunk;
 	struct ifvlan *ifv;
+	TRUNK_LOCK_READER;
 	uint16_t vid;
 
 	KASSERT(trunk != NULL, ("%s: no trunk", __func__));
@@ -1165,7 +1216,7 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
 			      __func__, ifp->if_xname, ifp->if_type);
 #endif
 			m_freem(m);
-			ifp->if_noproto++;
+			if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 			return;
 		}
 	}
@@ -1175,13 +1226,14 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
 	if (ifv == NULL || !UP_AND_RUNNING(ifv->ifv_ifp)) {
 		TRUNK_RUNLOCK(trunk);
 		m_freem(m);
-		ifp->if_noproto++;
+		if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
 		return;
 	}
 	TRUNK_RUNLOCK(trunk);
 
 	m->m_pkthdr.rcvif = ifv->ifv_ifp;
-	ifv->ifv_ifp->if_ipackets++;
+	counter_u64_add(ifv->ifv_ipackets, 1);
+	counter_u64_add(ifv->ifv_ibytes, m->m_pkthdr.len);
 
 	/* Pass it back through the parent's input routine. */
 	(*ifp->if_input)(ifv->ifv_ifp, m);
@@ -1485,6 +1537,7 @@ vlan_capabilities(struct ifvlan *ifv)
 {
 	struct ifnet *p = PARENT(ifv);
 	struct ifnet *ifp = ifv->ifv_ifp;
+	struct ifnet_hw_tsomax hw_tsomax;
 
 	TRUNK_LOCK_ASSERT(TRUNK(ifv));
 
@@ -1511,8 +1564,9 @@ vlan_capabilities(struct ifvlan *ifv)
 	 * propagate the hardware-assisted flag. TSO on VLANs
 	 * does not necessarily require hardware VLAN tagging.
 	 */
-	if (p->if_hw_tsomax > 0)
-		ifp->if_hw_tsomax = p->if_hw_tsomax;
+	memset(&hw_tsomax, 0, sizeof(hw_tsomax));
+	if_hw_tsomax_common(p, &hw_tsomax);
+	if_hw_tsomax_update(ifp, &hw_tsomax);
 	if (p->if_capabilities & IFCAP_VLAN_HWTSO)
 		ifp->if_capabilities |= p->if_capabilities & IFCAP_TSO;
 	if (p->if_capenable & IFCAP_VLAN_HWTSO) {
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
index cf0c5066fea1..d1fc3fe9e083 100644
--- a/sys/net/ifq.h
+++ b/sys/net/ifq.h
@@ -41,6 +41,10 @@
 #include <sys/lock.h>		/* XXX */
 #include <sys/mutex.h>		/* struct ifqueue */
 
+/*
+ * Couple of ugly extra definitions that are required since ifq.h
+ * is splitted from if_var.h.
+ */
 #define	IF_DUNIT_NONE	-1
 
 #include <altq/if_altq.h>
@@ -53,7 +57,6 @@ struct	ifqueue {
 	struct	mbuf *ifq_tail;
 	int	ifq_len;
 	int	ifq_maxlen;
-	int	ifq_drops;
 	struct	mtx ifq_mtx;
 };
 
@@ -68,7 +71,6 @@ struct	ifqueue {
 #define IF_UNLOCK(ifq)		mtx_unlock(&(ifq)->ifq_mtx)
 #define	IF_LOCK_ASSERT(ifq)	mtx_assert(&(ifq)->ifq_mtx, MA_OWNED)
 #define	_IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	_IF_DROP(ifq)		((ifq)->ifq_drops++)
 #define	_IF_QLEN(ifq)		((ifq)->ifq_len)
 
 #define	_IF_ENQUEUE(ifq, m) do { 				\
@@ -171,8 +173,6 @@ do {									\
 			(err) = 0;					\
 		}							\
 	}								\
-	if (err)							\
-		(ifq)->ifq_drops++;					\
 	IF_UNLOCK(ifq);							\
 } while (0)
 
@@ -234,7 +234,6 @@ do {									\
 #define	IFQ_IS_EMPTY(ifq)		((ifq)->ifq_len == 0)
 #define	IFQ_INC_LEN(ifq)		((ifq)->ifq_len++)
 #define	IFQ_DEC_LEN(ifq)		(--(ifq)->ifq_len)
-#define	IFQ_INC_DROPS(ifq)		((ifq)->ifq_drops++)
 #define	IFQ_SET_MAXLEN(ifq, len)	((ifq)->ifq_maxlen = (len))
 
 /*
@@ -250,12 +249,13 @@ do {									\
 	mflags = (m)->m_flags;						\
 	IFQ_ENQUEUE(&(ifp)->if_snd, m, err);				\
 	if ((err) == 0) {						\
-		(ifp)->if_obytes += len + (adj);			\
+		if_inc_counter((ifp), IFCOUNTER_OBYTES, len + (adj));	\
 		if (mflags & M_MCAST)					\
-			(ifp)->if_omcasts++;				\
+			if_inc_counter((ifp), IFCOUNTER_OMCASTS, 1);	\
 		if (((ifp)->if_drv_flags & IFF_DRV_OACTIVE) == 0)	\
 			if_start(ifp);					\
-	}								\
+	} else								\
+		if_inc_counter((ifp), IFCOUNTER_OQDROPS, 1);		\
 } while (0)
 
 #define	IFQ_HANDOFF(ifp, m, err)					\
@@ -321,6 +321,8 @@ drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m)
 #ifdef ALTQ
 	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
 		IFQ_ENQUEUE(&ifp->if_snd, m, error);
+		if (error)
+			if_inc_counter((ifp), IFCOUNTER_OQDROPS, 1);
 		return (error);
 	}
 #endif
@@ -478,17 +480,5 @@ void	if_qflush(struct ifnet *);
 void	ifq_init(struct ifaltq *, struct ifnet *ifp);
 void	ifq_delete(struct ifaltq *);
 
-#ifdef DEVICE_POLLING
-enum poll_cmd {	POLL_ONLY, POLL_AND_CHECK_STATUS };
-
-typedef	int poll_handler_t(struct ifnet *ifp, enum poll_cmd cmd, int count);
-int    ether_poll_register(poll_handler_t *h, struct ifnet *ifp);
-int    ether_poll_deregister(struct ifnet *ifp);
-/* The following should be temporary, till all drivers use the driver API */
-typedef	int poll_handler_drv_t(if_t ifh, enum poll_cmd cmd, int count);
-int	ether_poll_register_drv(poll_handler_drv_t *h, if_t ifh);
-int	ether_poll_deregister_drv(if_t ifh);
-#endif /* DEVICE_POLLING */
-
 #endif /* _KERNEL */
 #endif /* !_NET_IFQ_H_ */
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index b011c2162bb6..94a6cc479c5f 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -57,6 +57,8 @@
 #define	NETISR_IPV6	6
 #define	NETISR_NATM	7
 #define	NETISR_EPAIR	8		/* if_epair(4) */
+#define	NETISR_IP_DIRECT	9	/* direct-dispatch IPv4 */
+#define	NETISR_IPV6_DIRECT	10	/* direct-dispatch IPv6 */
 
 /*
  * Protocol ordering and affinity policy constants.  See the detailed
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 62f57f80dac2..0447cba6f665 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1122,9 +1122,6 @@ rn_inithead_internal(void **head, int off)
 	R_Zalloc(rnh, struct radix_node_head *, sizeof (*rnh));
 	if (rnh == 0)
 		return (0);
-#ifdef _KERNEL
-	RADIX_NODE_HEAD_LOCK_INIT(rnh);
-#endif
 	*head = rnh;
 	t = rn_newpair(rn_zeros, off, rnh->rnh_nodes);
 	ttt = rnh->rnh_nodes + 2;
@@ -1181,6 +1178,18 @@ rn_inithead(void **head, int off)
 	return (1);
 }
 
+static int
+rn_freeentry(struct radix_node *rn, void *arg)
+{
+	struct radix_node_head * const rnh = arg;
+	struct radix_node *x;
+
+	x = (struct radix_node *)rn_delete(rn + 2, NULL, rnh);
+	if (x != NULL)
+		Free(x);
+	return (0);
+}
+
 int
 rn_detachhead(void **head)
 {
@@ -1191,6 +1200,7 @@ rn_detachhead(void **head)
 
 	rnh = *head;
 
+	rn_walktree(rnh->rnh_masks, rn_freeentry, rnh->rnh_masks);
 	rn_detachhead_internal((void **)&rnh->rnh_masks);
 	rn_detachhead_internal(head);
 	return (1);
diff --git a/sys/net/route.c b/sys/net/route.c
index 547418af84b9..38e610a841a3 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -108,9 +108,9 @@ SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RDTUN, &rt_numfibs, 0, "");
  * always work given the fib can be overridden and prefixes can be added
  * from the network stack context.
  */
-u_int rt_add_addr_allfibs = 1;
-SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RWTUN,
-    &rt_add_addr_allfibs, 0, "");
+VNET_DEFINE(u_int, rt_add_addr_allfibs) = 1;
+SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RWTUN | CTLFLAG_VNET,
+    &VNET_NAME(rt_add_addr_allfibs), 0, "");
 
 VNET_DEFINE(struct rtstat, rtstat);
 #define	V_rtstat	VNET(rtstat)
@@ -570,7 +570,7 @@ rtredirect_fib(struct sockaddr *dst,
 	}
 
 	/* verify the gateway is directly reachable */
-	if ((ifa = ifa_ifwithnet_fib(gateway, 0, fibnum)) == NULL) {
+	if ((ifa = ifa_ifwithnet(gateway, 0, fibnum)) == NULL) {
 		error = ENETUNREACH;
 		goto out;
 	}
@@ -700,18 +700,8 @@ rtioctl_fib(u_long req, caddr_t data, u_int fibnum)
 #endif /* INET */
 }
 
-/*
- * For both ifa_ifwithroute() routines, 'ifa' is returned referenced.
- */
 struct ifaddr *
-ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway)
-{
-
-	return (ifa_ifwithroute_fib(flags, dst, gateway, RT_DEFAULT_FIB));
-}
-
-struct ifaddr *
-ifa_ifwithroute_fib(int flags, struct sockaddr *dst, struct sockaddr *gateway,
+ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway,
 				u_int fibnum)
 {
 	struct ifaddr *ifa;
@@ -727,7 +717,7 @@ ifa_ifwithroute_fib(int flags, struct sockaddr *dst, struct sockaddr *gateway,
 		 */
 		ifa = NULL;
 		if (flags & RTF_HOST)
-			ifa = ifa_ifwithdstaddr_fib(dst, fibnum);
+			ifa = ifa_ifwithdstaddr(dst, fibnum);
 		if (ifa == NULL)
 			ifa = ifa_ifwithaddr(gateway);
 	} else {
@@ -736,10 +726,10 @@ ifa_ifwithroute_fib(int flags, struct sockaddr *dst, struct sockaddr *gateway,
 		 * or host, the gateway may still be on the
 		 * other end of a pt to pt link.
 		 */
-		ifa = ifa_ifwithdstaddr_fib(gateway, fibnum);
+		ifa = ifa_ifwithdstaddr(gateway, fibnum);
 	}
 	if (ifa == NULL)
-		ifa = ifa_ifwithnet_fib(gateway, 0, fibnum);
+		ifa = ifa_ifwithnet(gateway, 0, fibnum);
 	if (ifa == NULL) {
 		struct rtentry *rt = rtalloc1_fib(gateway, 0, RTF_RNH_LOCKED, fibnum);
 		if (rt == NULL)
@@ -853,7 +843,7 @@ rt_getifa_fib(struct rt_addrinfo *info, u_int fibnum)
 	 */
 	if (info->rti_ifp == NULL && ifpaddr != NULL &&
 	    ifpaddr->sa_family == AF_LINK &&
-	    (ifa = ifa_ifwithnet_fib(ifpaddr, 0, fibnum)) != NULL) {
+	    (ifa = ifa_ifwithnet(ifpaddr, 0, fibnum)) != NULL) {
 		info->rti_ifp = ifa->ifa_ifp;
 		ifa_free(ifa);
 	}
@@ -867,10 +857,10 @@ rt_getifa_fib(struct rt_addrinfo *info, u_int fibnum)
 		if (sa != NULL && info->rti_ifp != NULL)
 			info->rti_ifa = ifaof_ifpforaddr(sa, info->rti_ifp);
 		else if (dst != NULL && gateway != NULL)
-			info->rti_ifa = ifa_ifwithroute_fib(flags, dst, gateway,
+			info->rti_ifa = ifa_ifwithroute(flags, dst, gateway,
 							fibnum);
 		else if (sa != NULL)
-			info->rti_ifa = ifa_ifwithroute_fib(flags, sa, sa,
+			info->rti_ifa = ifa_ifwithroute(flags, sa, sa,
 							fibnum);
 	}
 	if ((ifa = info->rti_ifa) != NULL) {
@@ -1623,9 +1613,9 @@ rtinit1(struct ifaddr *ifa, int cmd, int flags, int fibnum)
 		break;
 	}
 	if (fibnum == RT_ALL_FIBS) {
-		if (rt_add_addr_allfibs == 0 && cmd == (int)RTM_ADD) {
+		if (V_rt_add_addr_allfibs == 0 && cmd == (int)RTM_ADD)
 			startfib = endfib = ifa->ifa_ifp->if_fib;
-		} else {
+		else {
 			startfib = 0;
 			endfib = rt_numfibs - 1;
 		}
diff --git a/sys/net/route.h b/sys/net/route.h
index df2fc5864a57..bbdf98dfc7c1 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -34,6 +34,7 @@
 #define _NET_ROUTE_H_
 
 #include <sys/counter.h>
+#include <net/vnet.h>
 
 /*
  * Kernel resident routing tables.
@@ -84,8 +85,11 @@ struct rt_metrics {
 
 #define	RT_DEFAULT_FIB	0	/* Explicitly mark fib=0 restricted cases */
 #define	RT_ALL_FIBS	-1	/* Announce event for every fib */
+#ifdef _KERNEL
 extern u_int rt_numfibs;	/* number of usable routing tables */
-extern u_int rt_add_addr_allfibs;	/* Announce interfaces to all fibs */
+VNET_DECLARE(u_int, rt_add_addr_allfibs); /* Announce interfaces to all fibs */
+#define	V_rt_add_addr_allfibs	VNET(rt_add_addr_allfibs)
+#endif
 
 /*
  * We distinguish between routes to hosts and routes to networks,
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 10baeb2aa070..6fcbbc6ec431 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -752,7 +752,8 @@ route_output(struct mbuf *m, struct socket *so, ...)
 			    rt->rt_ifp->if_type == IFT_PROPVIRTUAL) {
 				struct ifaddr *ifa;
 
-				ifa = ifa_ifwithnet(info.rti_info[RTAX_DST], 1);
+				ifa = ifa_ifwithnet(info.rti_info[RTAX_DST], 1,
+						RT_ALL_FIBS);
 				if (ifa != NULL)
 					rt_maskedcopy(ifa->ifa_addr,
 						      &laddr,
@@ -1576,9 +1577,6 @@ sysctl_iflist_ifml(struct ifnet *ifp, struct rt_addrinfo *info,
 
 	if_data_copy(ifp, ifd);
 
-	/* Some drivers still use ifqueue(9), add its stats. */
-	ifd->ifi_oqdrops += ifp->if_snd.ifq_drops;
-
 	return (SYSCTL_OUT(w->w_req, (caddr_t)ifm, len));
 }
 
@@ -1611,9 +1609,6 @@ sysctl_iflist_ifm(struct ifnet *ifp, struct rt_addrinfo *info,
 
 	if_data_copy(ifp, ifd);
 
-	/* Some drivers still use ifqueue(9), add its stats. */
-	ifd->ifi_oqdrops += ifp->if_snd.ifq_drops;
-
 	return (SYSCTL_OUT(w->w_req, (caddr_t)ifm, len));
 }
 
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 73018c18ebaa..e406f0f6fa76 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -238,7 +238,7 @@ static int
 null_transmit(struct ifnet *ifp, struct mbuf *m)
 {
 	m_freem(m);
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	return EACCES;		/* XXX EIO/EPERM? */
 }
 
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index 181b9220de62..c1b4b518a289 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -653,7 +653,7 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 		break;
 	}
 err:
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 8cb97b04f6a1..32eec45975c2 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -368,7 +368,7 @@ hostap_deliver_data(struct ieee80211vap *vap,
 	/*
 	 * Do accounting.
 	 */
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	IEEE80211_NODE_STAT(ni, rx_data);
 	IEEE80211_NODE_STAT_ADD(ni, rx_bytes, m->m_pkthdr.len);
 	if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
@@ -384,7 +384,7 @@ hostap_deliver_data(struct ieee80211vap *vap,
 		if (m->m_flags & M_MCAST) {
 			mcopy = m_dup(m, M_NOWAIT);
 			if (mcopy == NULL)
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			else
 				mcopy->m_flags |= M_MCAST;
 		} else {
@@ -422,7 +422,7 @@ hostap_deliver_data(struct ieee80211vap *vap,
 			if (err) {
 				/* NB: IFQ_HANDOFF reclaims mcopy */
 			} else {
-				ifp->if_opackets++;
+				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 			}
 		}
 	}
@@ -909,7 +909,7 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 		break;
 	}
 err:
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 6ea4f9bfcce8..a0f737dc2036 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -261,7 +261,7 @@ ieee80211_deliver_data(struct ieee80211vap *vap,
 	/*
 	 * Do accounting.
 	 */
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	IEEE80211_NODE_STAT(ni, rx_data);
 	IEEE80211_NODE_STAT_ADD(ni, rx_bytes, m->m_pkthdr.len);
 	if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index 51db327d9fad..e84d7f777bd7 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -1047,7 +1047,7 @@ mesh_transmit_to_gate(struct ieee80211vap *vap, struct mbuf *m,
 
 	ni = ieee80211_mesh_find_txnode(vap, rt_gate->rt_dest);
 	if (ni == NULL) {
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		return;
 	}
@@ -1183,7 +1183,7 @@ mesh_forward(struct ieee80211vap *vap, struct mbuf *m,
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, cannot dup");
 		vap->iv_stats.is_mesh_fwd_nobuf++;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return;
 	}
 	mcopy = m_pullup(mcopy, ieee80211_hdrspace(ic, wh) +
@@ -1192,7 +1192,7 @@ mesh_forward(struct ieee80211vap *vap, struct mbuf *m,
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, too short");
 		vap->iv_stats.is_mesh_fwd_tooshort++;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(mcopy);
 		return;
 	}
@@ -1250,7 +1250,7 @@ mesh_forward(struct ieee80211vap *vap, struct mbuf *m,
 		/* NB: IFQ_HANDOFF reclaims mbuf */
 		ieee80211_free_node(ni);
 	} else {
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 }
 
@@ -1844,7 +1844,7 @@ mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 		break;
 	}
 err:
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
@@ -3333,8 +3333,9 @@ mesh_airtime_calc(struct ieee80211_node *ni)
 	    ifp->if_mtu + IEEE80211_MESH_MAXOVERHEAD, rate, 0) << M_BITS;
 	/* Error rate in percentage */
 	/* XXX assuming small failures are ok */
-	errrate = (((ifp->if_oerrors +
-	    ifp->if_ierrors) / 100) << M_BITS) / 100;
+	errrate = (((ifp->if_get_counter(ifp, IFCOUNTER_OERRORS) +
+	    ifp->if_get_counter(ifp, IFCOUNTER_IERRORS)) / 100) << M_BITS)
+	    / 100;
 	res = (overhead + (nbits / rate)) *
 	    ((1 << S_FACTOR) / ((1 << M_BITS) - errrate));
 
diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c
index f52b0fb0763c..8909339bde29 100644
--- a/sys/net80211/ieee80211_monitor.c
+++ b/sys/net80211/ieee80211_monitor.c
@@ -130,7 +130,7 @@ monitor_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ifnet *ifp = vap->iv_ifp;
 
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	if (ieee80211_radiotap_active_vap(vap))
 		ieee80211_radiotap_rx(vap, m);
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index b923600108dd..a8d92f976283 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -157,7 +157,7 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m,
 		    ni->ni_macaddr, NULL,
 		    "%s", "classification failure");
 		vap->iv_stats.is_tx_classify++;
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		m_freem(m);
 		ieee80211_free_node(ni);
 
@@ -251,7 +251,7 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m,
 		/* NB: IFQ_HANDOFF reclaims mbuf */
 		ieee80211_free_node(ni);
 	} else {
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 	ic->ic_lastdata = ticks;
 
@@ -299,7 +299,7 @@ ieee80211_start_pkt(struct ieee80211vap *vap, struct mbuf *m)
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
 		    "discard frame, %s\n", "m_pullup failed");
 		vap->iv_stats.is_tx_nobuf++;	/* XXX */
-		ifp->if_oerrors++;
+		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return (ENOBUFS);
 	}
 	eh = mtod(m, struct ether_header *);
@@ -332,7 +332,7 @@ ieee80211_start_pkt(struct ieee80211vap *vap, struct mbuf *m)
 		ni = ieee80211_find_txnode(vap, eh->ether_dhost);
 		if (ni == NULL) {
 			/* NB: ieee80211_find_txnode does stat+msg */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(m);
 			/* XXX better status? */
 			return (ENOBUFS);
@@ -344,7 +344,7 @@ ieee80211_start_pkt(struct ieee80211vap *vap, struct mbuf *m)
 			    "sta not associated (type 0x%04x)",
 			    htons(eh->ether_type));
 			vap->iv_stats.is_tx_notassoc++;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(m);
 			ieee80211_free_node(ni);
 			/* XXX better status? */
@@ -363,7 +363,7 @@ ieee80211_start_pkt(struct ieee80211vap *vap, struct mbuf *m)
 				    eh->ether_dhost, NULL,
 				    "%s", "proxy not enabled");
 				vap->iv_stats.is_mesh_notproxy++;
-				ifp->if_oerrors++;
+				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				m_freem(m);
 				/* XXX better status? */
 				return (ENOBUFS);
@@ -380,7 +380,7 @@ ieee80211_start_pkt(struct ieee80211vap *vap, struct mbuf *m)
 			 * NB: ieee80211_mesh_discover holds/disposes
 			 * frame (e.g. queueing on path discovery).
 			 */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* XXX better status? */
 			return (ENOBUFS);
 		}
@@ -608,7 +608,7 @@ ieee80211_output(struct ifnet *ifp, struct mbuf *m,
 	if (ieee80211_classify(ni, m))
 		senderr(EIO);		/* XXX */
 
-	ifp->if_opackets++;
+	if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	IEEE80211_NODE_STAT(ni, tx_data);
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 		IEEE80211_NODE_STAT(ni, tx_mcast);
@@ -636,7 +636,7 @@ ieee80211_output(struct ifnet *ifp, struct mbuf *m,
 		m_freem(m);
 	if (ni != NULL)
 		ieee80211_free_node(ni);
-	ifp->if_oerrors++;
+	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	return error;
 #undef senderr
 }
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index 302ddfcfafa0..89ed85627d60 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -938,7 +938,7 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 		break;
 	}
 err:
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
diff --git a/sys/net80211/ieee80211_superg.c b/sys/net80211/ieee80211_superg.c
index 94af70d53880..598c17ef7fa9 100644
--- a/sys/net80211/ieee80211_superg.c
+++ b/sys/net80211/ieee80211_superg.c
@@ -480,7 +480,7 @@ ff_transmit(struct ieee80211_node *ni, struct mbuf *m)
 			/* NB: IFQ_HANDOFF reclaims mbuf */
 			ieee80211_free_node(ni);
 		} else {
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		}
 	} else
 		ieee80211_free_node(ni);
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
index fdeaf25f06ae..ec1bd856062c 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -258,14 +258,14 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m)
 		 */
 		mcopy = m_copypacket(m, M_NOWAIT);
 		if (mcopy == NULL) {
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			/* XXX stat + msg */
 			continue;
 		}
 		ni = ieee80211_find_txnode(vap, eh->ether_dhost);
 		if (ni == NULL) {
 			/* NB: ieee80211_find_txnode does stat+msg */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(mcopy);
 			continue;
 		}
@@ -276,7 +276,7 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m)
 			    eh->ether_dhost, NULL,
 			    "%s", "classification failure");
 			vap->iv_stats.is_tx_classify++;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			m_freem(mcopy);
 			ieee80211_free_node(ni);
 			continue;
@@ -299,10 +299,10 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m)
 		err = ieee80211_parent_xmitpkt(ic, mcopy);
 		if (err) {
 			/* NB: IFQ_HANDOFF reclaims mbuf */
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			ieee80211_free_node(ni);
 		} else
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 }
 
@@ -730,7 +730,7 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
 		break;
 	}
 err:
-	ifp->if_ierrors++;
+	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 out:
 	if (m != NULL) {
 		if (need_tap && ieee80211_radiotap_active_vap(vap))
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index f2930abcdb02..9b174bb4c34e 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -560,7 +560,6 @@ ng_bt3c_rcvdata(hook_p hook, item_p item)
 		NG_BT3C_ERR(sc->dev,
 "Outgoing queue is full. Dropping mbuf, len=%d\n", m->m_pkthdr.len);
 
-		_IF_DROP(&sc->outq);
 		NG_BT3C_STAT_OERROR(sc->stat);
 
 		NG_FREE_M(m);
@@ -939,7 +938,6 @@ bt3c_receive(bt3c_softc_p sc)
 				NG_BT3C_ERR(sc->dev,
 "Incoming queue is full. Dropping mbuf, len=%d\n", sc->m->m_pkthdr.len);
 
-				_IF_DROP(&sc->inq);
 				NG_BT3C_STAT_IERROR(sc->stat);
 
 				NG_FREE_M(sc->m);
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 97cee2ed29ad..5cb0386b0ba6 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -798,7 +798,6 @@ ng_h4_rcvdata(hook_p hook, item_p item)
 			NG_NODE_NAME(sc->node), m->m_pkthdr.len);
 
 		NG_H4_STAT_OERROR(sc->stat);
-		_IF_DROP(&sc->outq);
 
 		NG_H4_UNLOCK(sc);
 
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index deea5b3db0df..493ea42146a6 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -162,7 +162,7 @@ struct ng_btsocket_l2cap_pcb {
 	u_int16_t			 flush_timo; /* flush timeout */   
 	u_int16_t			 link_timo;  /* link timeout */ 
 
-	struct callout_handle		 timo;       /* timeout */
+	struct callout			 timo;       /* timeout */
 
 	u_int32_t			 token;	     /* message token */
 	ng_btsocket_l2cap_rtentry_p	 rt;         /* routing info */
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 4aaa658bd9ee..fdc1d00cbe6e 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -296,7 +296,7 @@ struct ng_btsocket_rfcomm_pcb {
 	int16_t					 tx_cred; /* TX credits */
 
 	struct mtx				 pcb_mtx; /* PCB lock */
-	struct callout_handle			 timo;    /* timeout */
+	struct callout				 timo;    /* timeout */
 
 	LIST_ENTRY(ng_btsocket_rfcomm_pcb)	 session_next;/* link to next */
 	LIST_ENTRY(ng_btsocket_rfcomm_pcb)	 next;	  /* link to next */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index af2ce1a5f468..bab8bbbbdd85 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1967,8 +1967,6 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td)
 	pcb->flush_timo = NG_L2CAP_FLUSH_TIMO_DEFAULT;
 	pcb->link_timo = NG_L2CAP_LINK_TIMO_DEFAULT;
 
-	callout_handle_init(&pcb->timo);
-
 	/*
 	 * XXX Mark PCB mutex as DUPOK to prevent "duplicated lock of
 	 * the same type" message. When accepting new L2CAP connection 
@@ -1978,6 +1976,7 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td)
 		
 	mtx_init(&pcb->pcb_mtx, "btsocks_l2cap_pcb_mtx", NULL,
 		MTX_DEF|MTX_DUPOK);
+	callout_init_mtx(&pcb->timo, &pcb->pcb_mtx, 0);
 
         /*
 	 * Add the PCB to the list
@@ -2664,8 +2663,8 @@ ng_btsocket_l2cap_timeout(ng_btsocket_l2cap_pcb_p pcb)
 
 	if (!(pcb->flags & NG_BTSOCKET_L2CAP_TIMO)) {
 		pcb->flags |= NG_BTSOCKET_L2CAP_TIMO;
-		pcb->timo = timeout(ng_btsocket_l2cap_process_timeout, pcb,
-					bluetooth_l2cap_ertx_timeout());
+		callout_reset(&pcb->timo, bluetooth_l2cap_ertx_timeout(),
+		    ng_btsocket_l2cap_process_timeout, pcb);
 	} else
 		KASSERT(0,
 ("%s: Duplicated socket timeout?!\n", __func__));
@@ -2681,7 +2680,7 @@ ng_btsocket_l2cap_untimeout(ng_btsocket_l2cap_pcb_p pcb)
 	mtx_assert(&pcb->pcb_mtx, MA_OWNED);
 
 	if (pcb->flags & NG_BTSOCKET_L2CAP_TIMO) {
-		untimeout(ng_btsocket_l2cap_process_timeout, pcb, pcb->timo);
+		callout_stop(&pcb->timo);
 		pcb->flags &= ~NG_BTSOCKET_L2CAP_TIMO;
 	} else
 		KASSERT(0,
@@ -2697,7 +2696,7 @@ ng_btsocket_l2cap_process_timeout(void *xpcb)
 {
 	ng_btsocket_l2cap_pcb_p	pcb = (ng_btsocket_l2cap_pcb_p) xpcb;
 
-	mtx_lock(&pcb->pcb_mtx);
+	mtx_assert(&pcb->pcb_mtx, MA_OWNED);
 
 	pcb->flags &= ~NG_BTSOCKET_L2CAP_TIMO;
 	pcb->so->so_error = ETIMEDOUT;
@@ -2731,8 +2730,6 @@ ng_btsocket_l2cap_process_timeout(void *xpcb)
 "%s: Invalid socket state=%d\n", __func__, pcb->state);
 		break;
 	}
-
-	mtx_unlock(&pcb->pcb_mtx);
 } /* ng_btsocket_l2cap_process_timeout */
 
 /*
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 215843cf94b6..cb3753d4bf04 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -434,7 +434,7 @@ ng_btsocket_rfcomm_attach(struct socket *so, int proto, struct thread *td)
 	pcb->rx_cred = RFCOMM_DEFAULT_CREDITS;
 
 	mtx_init(&pcb->pcb_mtx, "btsocks_rfcomm_pcb_mtx", NULL, MTX_DEF);
-	callout_handle_init(&pcb->timo);
+	callout_init_mtx(&pcb->timo, &pcb->pcb_mtx, 0);
 
 	/* Add the PCB to the list */
 	mtx_lock(&ng_btsocket_rfcomm_sockets_mtx);
@@ -3451,8 +3451,8 @@ ng_btsocket_rfcomm_timeout(ng_btsocket_rfcomm_pcb_p pcb)
 	if (!(pcb->flags & NG_BTSOCKET_RFCOMM_DLC_TIMO)) {
 		pcb->flags |= NG_BTSOCKET_RFCOMM_DLC_TIMO;
 		pcb->flags &= ~NG_BTSOCKET_RFCOMM_DLC_TIMEDOUT;
-		pcb->timo = timeout(ng_btsocket_rfcomm_process_timeout, pcb,
-					ng_btsocket_rfcomm_timo * hz);
+		callout_reset(&pcb->timo, ng_btsocket_rfcomm_timo * hz,
+		    ng_btsocket_rfcomm_process_timeout, pcb);
 	} else
 		panic("%s: Duplicated socket timeout?!\n", __func__);
 } /* ng_btsocket_rfcomm_timeout */
@@ -3467,7 +3467,7 @@ ng_btsocket_rfcomm_untimeout(ng_btsocket_rfcomm_pcb_p pcb)
 	mtx_assert(&pcb->pcb_mtx, MA_OWNED);
 
 	if (pcb->flags & NG_BTSOCKET_RFCOMM_DLC_TIMO) {
-		untimeout(ng_btsocket_rfcomm_process_timeout, pcb, pcb->timo);
+		callout_stop(&pcb->timo);
 		pcb->flags &= ~NG_BTSOCKET_RFCOMM_DLC_TIMO;
 		pcb->flags &= ~NG_BTSOCKET_RFCOMM_DLC_TIMEDOUT;
 	} else
@@ -3483,7 +3483,7 @@ ng_btsocket_rfcomm_process_timeout(void *xpcb)
 {
 	ng_btsocket_rfcomm_pcb_p	pcb = (ng_btsocket_rfcomm_pcb_p) xpcb;
 
-	mtx_lock(&pcb->pcb_mtx);
+	mtx_assert(&pcb->pcb_mtx, MA_OWNED);
 
 	NG_BTSOCKET_RFCOMM_INFO(
 "%s: Timeout, so=%p, dlci=%d, state=%d, flags=%#x\n",
@@ -3510,8 +3510,6 @@ ng_btsocket_rfcomm_process_timeout(void *xpcb)
 	}
 
 	ng_btsocket_rfcomm_task_wakeup();
-
-	mtx_unlock(&pcb->pcb_mtx);
 } /* ng_btsocket_rfcomm_process_timeout */
 
 /*
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 723fbca8379e..cb40e69a9ae2 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -270,7 +270,6 @@ ng_device_rcvdata(hook_p hook, item_p item)
 
 	IF_LOCK(&priv->readq);
 	if (_IF_QFULL(&priv->readq)) {
-		_IF_DROP(&priv->readq);
 		IF_UNLOCK(&priv->readq);
 		NG_FREE_M(m);
 		return (ENOBUFS);
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index a390e1bbc876..ae573da02541 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -247,7 +247,7 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2)
 		BPF_MTAP(ifp, m);
 
 		if (ifp->if_flags & IFF_MONITOR) {
-			ifp->if_ipackets++;
+			if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 			m_freem(m);
 			continue;
 		}
@@ -262,9 +262,9 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2)
 
 		/* Update stats */
 		if (error == 0)
-			ifp->if_opackets++;
+			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		else
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	}
 
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -597,7 +597,7 @@ ng_eiface_rcvdata(hook_p hook, item_p item)
 	m->m_pkthdr.rcvif = ifp;
 
 	/* Update interface stats */
-	ifp->if_ipackets++;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 	(*ifp->if_input)(ifp, m);
 
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index b44dcdd4f86e..7326d3e42381 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -393,10 +393,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m,
 	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
 		M_PREPEND(m, sizeof(sa_family_t), M_NOWAIT);
 		if (m == NULL) {
-			IFQ_LOCK(&ifp->if_snd);
-			IFQ_INC_DROPS(&ifp->if_snd);
-			IFQ_UNLOCK(&ifp->if_snd);
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
 			return (ENOBUFS);
 		}
 		*(sa_family_t *)m->m_data = af;
@@ -472,8 +469,8 @@ ng_iface_send(struct ifnet *ifp, struct mbuf *m, sa_family_t sa)
 
 	/* Update stats. */
 	if (error == 0) {
-		ifp->if_obytes += len;
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 	}
 
 	return (error);
@@ -736,8 +733,8 @@ ng_iface_rcvdata(hook_p hook, item_p item)
 	}
 
 	/* Update interface stats */
-	ifp->if_ipackets++;
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	/* Note receiving interface */
 	m->m_pkthdr.rcvif = ifp;
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 9db1a2fb1eb5..e1a8a2a31985 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -237,6 +237,7 @@ static ng_rcvdata_t	ng_ppp_rcvdata;
 static ng_disconnect_t	ng_ppp_disconnect;
 
 static ng_rcvdata_t	ng_ppp_rcvdata_inet;
+static ng_rcvdata_t	ng_ppp_rcvdata_inet_fast;
 static ng_rcvdata_t	ng_ppp_rcvdata_ipv6;
 static ng_rcvdata_t	ng_ppp_rcvdata_ipx;
 static ng_rcvdata_t	ng_ppp_rcvdata_atalk;
@@ -659,7 +660,7 @@ ng_ppp_rcvmsg(node_p node, item_p item, hook_p lasthook)
 			    &priv->bundleStats : &priv->links[linkNum].stats;
 
 			/* Make 64bit reply. */
-			if (msg->header.cmd == NGM_PPP_GET_LINK_STATS64 || 
+			if (msg->header.cmd == NGM_PPP_GET_LINK_STATS64 ||
 			    msg->header.cmd == NGM_PPP_GETCLR_LINK_STATS64) {
 				NG_MKRESPONSE(resp, msg,
 				    sizeof(struct ng_ppp_link_stat64), M_NOWAIT);
@@ -668,7 +669,7 @@ ng_ppp_rcvmsg(node_p node, item_p item, hook_p lasthook)
 				bcopy(stats, resp->data, sizeof(*stats));
 			} else
 			/* Make 32bit reply. */
-			if (msg->header.cmd == NGM_PPP_GET_LINK_STATS || 
+			if (msg->header.cmd == NGM_PPP_GET_LINK_STATS ||
 			    msg->header.cmd == NGM_PPP_GETCLR_LINK_STATS) {
 				struct ng_ppp_link_stat *rs;
 				NG_MKRESPONSE(resp, msg,
@@ -792,6 +793,19 @@ ng_ppp_rcvdata_inet(hook_p hook, item_p item)
 	return (ng_ppp_hcomp_xmit(NG_HOOK_NODE(hook), item, PROT_IP));
 }
 
+/*
+ * Receive data on a hook inet and pass it directly to first link.
+ */
+static int
+ng_ppp_rcvdata_inet_fast(hook_p hook, item_p item)
+{
+	const node_p node = NG_HOOK_NODE(hook);
+	const priv_p priv = NG_NODE_PRIVATE(node);
+
+	return (ng_ppp_link_xmit(node, item, PROT_IP, priv->activeLinks[0],
+	    NGI_M(item)->m_pkthdr.len));
+}
+
 /*
  * Receive data on a hook ipv6.
  */
@@ -1077,10 +1091,10 @@ ng_ppp_comp_xmit(node_p node, item_p item, uint16_t proto)
 	    proto != PROT_COMPD &&
 	    proto != PROT_CRYPTD &&
 	    priv->hooks[HOOK_INDEX_COMPRESS] != NULL) {
-	        struct mbuf *m;
+		struct mbuf *m;
 		int error;
 
-	        NGI_GET_M(item, m);
+		NGI_GET_M(item, m);
 		if ((m = ng_ppp_addproto(m, proto, 0)) == NULL) {
 			NG_FREE_ITEM(item);
 			return (ENOBUFS);
@@ -1183,8 +1197,8 @@ ng_ppp_rcvdata_decompress(hook_p hook, item_p item)
 	}
 	NGI_GET_M(item, m);
 	if ((m = ng_ppp_cutproto(m, &proto)) == NULL) {
-	        NG_FREE_ITEM(item);
-	        return (EIO);
+		NG_FREE_ITEM(item);
+		return (EIO);
 	}
 	NGI_M(item) = m;
 	if (!PROT_VALID(proto)) {
@@ -1211,7 +1225,7 @@ ng_ppp_crypt_xmit(node_p node, item_p item, uint16_t proto)
 		struct mbuf *m;
 		int error;
 
-	        NGI_GET_M(item, m);
+		NGI_GET_M(item, m);
 		if ((m = ng_ppp_addproto(m, proto, 0)) == NULL) {
 			NG_FREE_ITEM(item);
 			return (ENOBUFS);
@@ -1283,8 +1297,8 @@ ng_ppp_rcvdata_decrypt(hook_p hook, item_p item)
 	}
 	NGI_GET_M(item, m);
 	if ((m = ng_ppp_cutproto(m, &proto)) == NULL) {
-	        NG_FREE_ITEM(item);
-	        return (EIO);
+		NG_FREE_ITEM(item);
+		return (EIO);
 	}
 	NGI_M(item) = m;
 	if (!PROT_VALID(proto)) {
@@ -1599,7 +1613,7 @@ ng_ppp_mp_recv(node_p node, item_p item, uint16_t proto, uint16_t linkNum)
 			TAILQ_INSERT_AFTER(&priv->frags, qent, frag, f_qent);
 			inserted = 1;
 			break;
-		} else if (diff == 0) {	     /* should never happen! */
+		} else if (diff == 0) {		/* should never happen! */
 			link->stats.dupFragments++;
 			NG_FREE_M(frag->data);
 			TAILQ_INSERT_HEAD(&priv->fragsfree, frag, f_qent);
@@ -1833,7 +1847,7 @@ ng_ppp_frag_process(node_p node, item_p oitem)
 			if (item != NULL) {
 				/* Stats */
 				priv->bundleStats.recvFrames++;
-				priv->bundleStats.recvOctets += 
+				priv->bundleStats.recvOctets +=
 				    NGI_M(item)->m_pkthdr.len;
 
 				/* Drop mutex for the sending time.
@@ -2369,10 +2383,9 @@ ng_ppp_mp_strategy(node_p node, int len, int *distrib)
 			struct ng_ppp_link *const link =
 			    &priv->links[priv->activeLinks[sortByLatency[i]]];
 
-			if (distrib[sortByLatency[slow]] == 0
-			  || (distrib[sortByLatency[i]] > 0
-			    && link->conf.bandwidth <
-			      slowLink->conf.bandwidth)) {
+			if (distrib[sortByLatency[slow]] == 0 ||
+			    (distrib[sortByLatency[i]] > 0 &&
+			    link->conf.bandwidth < slowLink->conf.bandwidth)) {
 				slow = i;
 				slowLink = link;
 			}
@@ -2474,7 +2487,7 @@ ng_ppp_update(node_p node, int newConf)
 
 			if (priv->links[i].conf.bandwidth == 0)
 			    continue;
-			    
+
 			hdrBytes = MP_AVERAGE_LINK_OVERHEAD
 			    + (priv->links[i].conf.enableACFComp ? 0 : 2)
 			    + (priv->links[i].conf.enableProtoComp ? 1 : 2)
@@ -2530,6 +2543,20 @@ ng_ppp_update(node_p node, int newConf)
 			link->seq = MP_NOSEQ;
 		}
 	}
+
+	if (priv->hooks[HOOK_INDEX_INET] != NULL) {
+		if (priv->conf.enableIP == 1 &&
+		    priv->numActiveLinks == 1 &&
+		    priv->conf.enableMultilink == 0 &&
+		    priv->conf.enableCompression == 0 &&
+		    priv->conf.enableEncryption == 0 &&
+		    priv->conf.enableVJCompression == 0)
+			NG_HOOK_SET_RCVDATA(priv->hooks[HOOK_INDEX_INET],
+			    ng_ppp_rcvdata_inet_fast);
+		else
+			NG_HOOK_SET_RCVDATA(priv->hooks[HOOK_INDEX_INET],
+			    ng_ppp_rcvdata_inet);
+	}
 }
 
 /*
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 44db053ca447..95e9a60f56f9 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -364,7 +364,7 @@ ng_sppp_rcvdata (hook_p hook, item_p item)
 	}
 
 	/* Update interface stats */
-	SP2IFP(pp)->if_ipackets++;
+	if_inc_counter(SP2IFP(pp), IFCOUNTER_IPACKETS, 1);
 
 	/* Note receiving interface */
 	m->m_pkthdr.rcvif = SP2IFP(pp);
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 35e17344825f..5e794a8a577f 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -327,7 +327,6 @@ ngt_rcvdata(hook_p hook, item_p item)
 
 	IF_LOCK(&sc->outq);
 	if (_IF_QFULL(&sc->outq)) {
-		_IF_DROP(&sc->outq);
 		IF_UNLOCK(&sc->outq);
 		NG_FREE_M(m);
 		return (ENOBUFS);
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 52fc446c70b0..0a2b130d752d 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -674,7 +674,7 @@ in_addprefix(struct in_ifaddr *target, int flags)
 			} else {
 				int fibnum;
 
-				fibnum = rt_add_addr_allfibs ? RT_ALL_FIBS :
+				fibnum = V_rt_add_addr_allfibs ? RT_ALL_FIBS :
 					target->ia_ifp->if_fib;
 				rt_addrmsg(RTM_ADD, &target->ia_ifa, fibnum);
 				IN_IFADDR_RUNLOCK();
@@ -745,7 +745,7 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
 	if ((target->ia_flags & IFA_ROUTE) == 0) {
 		int fibnum;
 		
-		fibnum = rt_add_addr_allfibs ? RT_ALL_FIBS :
+		fibnum = V_rt_add_addr_allfibs ? RT_ALL_FIBS :
 			target->ia_ifp->if_fib;
 		rt_addrmsg(RTM_DELETE, &target->ia_ifa, fibnum);
 		return (0);
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 254401fc75e4..4776278e1b17 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -492,6 +492,8 @@ __END_DECLS
 #define	IP_FLOWID		90   /* get flow id for the given socket/inp */
 #define	IP_FLOWTYPE		91   /* get flow type (M_HASHTYPE) */
 #define	IP_RSSBUCKETID		92   /* get RSS flowid -> bucket mapping */
+#define	IP_RECVFLOWID		93   /* bool; receive IP flowid/flowtype w/ datagram */
+#define	IP_RECVRSSBUCKETID	94   /* bool; receive IP RSS bucket id w/ datagram */
 
 /*
  * Defaults and limits for options
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 26d4e8e3a135..c377e4905be1 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -2928,7 +2928,7 @@ sysctl_ip_mcast_filters(SYSCTL_HANDLER_ARGS)
 	return (retval);
 }
 
-#ifdef KTR
+#if defined(KTR) && (KTR_COMPILE & KTR_IGMPV3)
 
 static const char *inm_modestrs[] = { "un", "in", "ex" };
 
@@ -3000,7 +3000,7 @@ inm_print(const struct in_multi *inm)
 	printf("%s: --- end inm %p ---\n", __func__, inm);
 }
 
-#else /* !KTR */
+#else /* !KTR || !(KTR_COMPILE & KTR_IGMPV3) */
 
 void
 inm_print(const struct in_multi *inm)
@@ -3008,6 +3008,6 @@ inm_print(const struct in_multi *inm)
 
 }
 
-#endif /* KTR */
+#endif /* KTR && (KTR_COMPILE & KTR_IGMPV3) */
 
 RB_GENERATE(ip_msource_tree, ip_msource, ims_link, ip_msource_cmp);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 1a5de4012cfa..a0a1b30a0272 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -792,9 +792,11 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr,
 		struct in_ifaddr *ia;
 		struct ifnet *ifp;
 
-		ia = ifatoia(ifa_ifwithdstaddr((struct sockaddr *)sin));
+		ia = ifatoia(ifa_ifwithdstaddr((struct sockaddr *)sin,
+					inp->inp_socket->so_fibnum));
 		if (ia == NULL)
-			ia = ifatoia(ifa_ifwithnet((struct sockaddr *)sin, 0));
+			ia = ifatoia(ifa_ifwithnet((struct sockaddr *)sin, 0,
+						inp->inp_socket->so_fibnum));
 		if (ia == NULL) {
 			error = ENETUNREACH;
 			goto done;
@@ -909,9 +911,11 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr,
 		sain.sin_len = sizeof(struct sockaddr_in);
 		sain.sin_addr.s_addr = faddr->s_addr;
 
-		ia = ifatoia(ifa_ifwithdstaddr(sintosa(&sain)));
+		ia = ifatoia(ifa_ifwithdstaddr(sintosa(&sain),
+					inp->inp_socket->so_fibnum));
 		if (ia == NULL)
-			ia = ifatoia(ifa_ifwithnet(sintosa(&sain), 0));
+			ia = ifatoia(ifa_ifwithnet(sintosa(&sain), 0,
+						inp->inp_socket->so_fibnum));
 		if (ia == NULL)
 			ia = ifatoia(ifa_ifwithaddr(sintosa(&sain)));
 
@@ -2046,7 +2050,7 @@ in_pcbinshash_internal(struct inpcb *inp, int do_pcbgroup_update)
 
 #ifdef INET6
 	if (inp->inp_vflag & INP_IPV6)
-		hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
+		hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr);
 	else
 #endif
 	hashkey_faddr = inp->inp_faddr.s_addr;
@@ -2133,7 +2137,7 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m)
 
 #ifdef INET6
 	if (inp->inp_vflag & INP_IPV6)
-		hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
+		hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr);
 	else
 #endif
 	hashkey_faddr = inp->inp_faddr.s_addr;
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 8c73f2d657ad..185bcfb2d06e 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -94,6 +94,7 @@ struct in_endpoints {
 		struct	in_addr_4in6 ie46_local;
 		struct	in6_addr ie6_local;
 	} ie_dependladdr;
+	u_int32_t	ie6_zoneid;		/* scope zone id */
 };
 #define	ie_faddr	ie_dependfaddr.ie46_foreign.ia46_addr4
 #define	ie_laddr	ie_dependladdr.ie46_local.ia46_addr4
@@ -124,6 +125,7 @@ struct in_conninfo {
 #define	inc_laddr	inc_ie.ie_laddr
 #define	inc6_faddr	inc_ie.ie6_faddr
 #define	inc6_laddr	inc_ie.ie6_laddr
+#define	inc6_zoneid	inc_ie.ie6_zoneid
 
 struct	icmp6_filter;
 
@@ -229,6 +231,7 @@ struct inpcb {
 
 #define	in6p_faddr	inp_inc.inc6_faddr
 #define	in6p_laddr	inp_inc.inc6_laddr
+#define	in6p_zoneid	inp_inc.inc6_zoneid
 #define	in6p_hops	inp_depend6.inp6_hops	/* default hop limit */
 #define	in6p_flowinfo	inp_flow
 #define	in6p_options	inp_depend6.inp6_options
@@ -487,6 +490,7 @@ short	inp_so_options(const struct inpcb *inp);
 	(((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask))
 #define INP_PCBPORTHASH(lport, mask) \
 	(ntohs((lport)) & (mask))
+#define	INP6_PCBHASHKEY(faddr)	((faddr)->s6_addr32[3])
 
 /*
  * Flags for inp_vflags -- historically version flags only
@@ -549,6 +553,8 @@ short	inp_so_options(const struct inpcb *inp);
 #define	INP_REUSEADDR		0x00000020 /* SO_REUSEADDR option is set */
 #define	INP_BINDMULTI		0x00000040 /* IP_BINDMULTI option is set */
 #define	INP_RSS_BUCKET_SET	0x00000080 /* IP_RSS_LISTEN_BUCKET is set */
+#define	INP_RECVFLOWID		0x00000100 /* populate recv datagram with flow info */
+#define	INP_RECVRSSBUCKETID	0x00000200 /* populate recv datagram with bucket id */
 
 /*
  * Flags passed to in_pcblookup*() functions.
diff --git a/sys/netinet/in_pcbgroup.c b/sys/netinet/in_pcbgroup.c
index aa2f1c642a23..4157290382d7 100644
--- a/sys/netinet/in_pcbgroup.c
+++ b/sys/netinet/in_pcbgroup.c
@@ -416,7 +416,7 @@ in_pcbgroup_update_internal(struct inpcbinfo *pcbinfo,
 	if (newpcbgroup != NULL && oldpcbgroup != newpcbgroup) {
 #ifdef INET6
 		if (inp->inp_vflag & INP_IPV6)
-			hashkey_faddr = inp->in6p_faddr.s6_addr32[3]; /* XXX */
+			hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr);
 		else
 #endif
 			hashkey_faddr = inp->inp_faddr.s_addr;
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index bd5835ea29c8..09669e67cfc3 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -352,10 +352,12 @@ in_inithead(void **head, int off)
 	if (!rn_inithead(head, 32))
 		return 0;
 
+	rnh = *head;
+	RADIX_NODE_HEAD_LOCK_INIT(rnh);
+
 	if (off == 0)		/* XXX MRT  see above */
 		return 1;	/* only do the rest for a real routing table */
 
-	rnh = *head;
 	rnh->rnh_addaddr = in_addroute;
 	in_setmatchfunc(rnh, V_drop_redirect);
 	rnh->rnh_close = in_clsroute;
diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c
index 33b061aed395..7a548c2a8d2e 100644
--- a/sys/netinet/in_rss.c
+++ b/sys/netinet/in_rss.c
@@ -57,6 +57,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 #include <netinet/toeplitz.h>
 
+/* for software rss hash support */
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+
 /*-
  * Operating system parts of receiver-side scaling (RSS), which allows
  * network cards to direct flows to particular receive queues based on hashes
@@ -170,6 +175,8 @@ struct rss_table_entry {
 };
 static struct rss_table_entry	rss_table[RSS_TABLE_MAXLEN];
 
+static inline u_int rss_gethashconfig_local(void);
+
 static void
 rss_init(__unused void *arg)
 {
@@ -490,6 +497,261 @@ rss_m2bucket(struct mbuf *m, uint32_t *bucket_id)
 	    bucket_id));
 }
 
+/*
+ * Calculate an appropriate ipv4 2-tuple or 4-tuple given the given
+ * IPv4 source/destination address, UDP or TCP source/destination ports
+ * and the protocol type.
+ *
+ * The protocol code may wish to do a software hash of the given
+ * tuple.  This depends upon the currently configured RSS hash types.
+ *
+ * This assumes that the packet in question isn't a fragment.
+ *
+ * It also assumes the packet source/destination address
+ * are in "incoming" packet order (ie, source is "far" address.)
+ */
+int
+rss_proto_software_hash_v4(struct in_addr s, struct in_addr d,
+    u_short sp, u_short dp, int proto,
+    uint32_t *hashval, uint32_t *hashtype)
+{
+	uint32_t hash;
+
+	/*
+	 * Next, choose the hash type depending upon the protocol
+	 * identifier.
+	 */
+	if ((proto == IPPROTO_TCP) &&
+	    (rss_gethashconfig_local() & RSS_HASHTYPE_RSS_TCP_IPV4)) {
+		hash = rss_hash_ip4_4tuple(s, sp, d, dp);
+		*hashval = hash;
+		*hashtype = M_HASHTYPE_RSS_TCP_IPV4;
+		return (0);
+	} else if ((proto == IPPROTO_UDP) &&
+	    (rss_gethashconfig_local() & RSS_HASHTYPE_RSS_UDP_IPV4)) {
+		hash = rss_hash_ip4_4tuple(s, sp, d, dp);
+		*hashval = hash;
+		*hashtype = M_HASHTYPE_RSS_UDP_IPV4;
+		return (0);
+	} else if (rss_gethashconfig_local() & RSS_HASHTYPE_RSS_IPV4) {
+		/* RSS doesn't hash on other protocols like SCTP; so 2-tuple */
+		hash = rss_hash_ip4_2tuple(s, d);
+		*hashval = hash;
+		*hashtype = M_HASHTYPE_RSS_IPV4;
+		return (0);
+	}
+
+	/* No configured available hashtypes! */
+	printf("%s: no available hashtypes!\n", __func__);
+	return (-1);
+}
+
+/*
+ * Do a software calculation of the RSS for the given mbuf.
+ *
+ * This is typically used by the input path to recalculate the RSS after
+ * some form of packet processing (eg de-capsulation, IP fragment reassembly.)
+ *
+ * dir is the packet direction - RSS_HASH_PKT_INGRESS for incoming and
+ * RSS_HASH_PKT_EGRESS for outgoing.
+ *
+ * Returns 0 if a hash was done, -1 if no hash was done, +1 if
+ * the mbuf already had a valid RSS flowid.
+ *
+ * This function doesn't modify the mbuf.  It's up to the caller to
+ * assign flowid/flowtype as appropriate.
+ */
+int
+rss_mbuf_software_hash_v4(const struct mbuf *m, int dir, uint32_t *hashval,
+    uint32_t *hashtype)
+{
+	const struct ip *ip;
+	const struct tcphdr *th;
+	const struct udphdr *uh;
+	uint8_t proto;
+	int iphlen;
+	int is_frag = 0;
+
+	/*
+	 * XXX For now this only handles hashing on incoming mbufs.
+	 */
+	if (dir != RSS_HASH_PKT_INGRESS) {
+		printf("%s: called on EGRESS packet!\n", __func__);
+		return (-1);
+	}
+
+	/*
+	 * First, validate that the mbuf we have is long enough
+	 * to have an IPv4 header in it.
+	 */
+	if (m->m_pkthdr.len < (sizeof(struct ip))) {
+		printf("%s: short mbuf pkthdr\n", __func__);
+		return (-1);
+	}
+	if (m->m_len < (sizeof(struct ip))) {
+		printf("%s: short mbuf len\n", __func__);
+		return (-1);
+	}
+
+	/* Ok, let's dereference that */
+	ip = mtod(m, struct ip *);
+	proto = ip->ip_p;
+	iphlen = ip->ip_hl << 2;
+
+	/*
+	 * If this is a fragment then it shouldn't be four-tuple
+	 * hashed just yet.  Once it's reassembled into a full
+	 * frame it should be re-hashed.
+	 */
+	if (ip->ip_off & htons(IP_MF | IP_OFFMASK))
+		is_frag = 1;
+
+	/*
+	 * If the mbuf flowid/flowtype matches the packet type,
+	 * and we don't support the 4-tuple version of the given protocol,
+	 * then signal to the owner that it can trust the flowid/flowtype
+	 * details.
+	 *
+	 * This is a little picky - eg, if TCPv4 / UDPv4 hashing
+	 * is supported but we got a TCP/UDP frame only 2-tuple hashed,
+	 * then we shouldn't just "trust" the 2-tuple hash.  We need
+	 * a 4-tuple hash.
+	 */
+	if (m->m_flags & M_FLOWID) {
+		uint32_t flowid, flowtype;
+
+		flowid = m->m_pkthdr.flowid;
+		flowtype = M_HASHTYPE_GET(m);
+
+		switch (proto) {
+		case IPPROTO_UDP:
+			if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_UDP_IPV4) &&
+			    (flowtype == M_HASHTYPE_RSS_UDP_IPV4) &&
+			    (is_frag == 0)) {
+				return (1);
+			}
+			/*
+			 * Only allow 2-tuple for UDP frames if we don't also
+			 * support 4-tuple for UDP.
+			 */
+			if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_IPV4) &&
+			    ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_UDP_IPV4) == 0) &&
+			    flowtype == M_HASHTYPE_RSS_IPV4) {
+				return (1);
+			}
+			break;
+		case IPPROTO_TCP:
+			if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_TCP_IPV4) &&
+			    (flowtype == M_HASHTYPE_RSS_TCP_IPV4) &&
+			    (is_frag == 0)) {
+				return (1);
+			}
+			/*
+			 * Only allow 2-tuple for TCP frames if we don't also
+			 * support 2-tuple for TCP.
+			 */
+			if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_IPV4) &&
+			    ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_TCP_IPV4) == 0) &&
+			    flowtype == M_HASHTYPE_RSS_IPV4) {
+				return (1);
+			}
+			break;
+		default:
+			if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_IPV4) &&
+			    flowtype == M_HASHTYPE_RSS_IPV4) {
+				return (1);
+			}
+			break;
+		}
+	}
+
+	/*
+	 * Decode enough information to make a hash decision.
+	 *
+	 * XXX TODO: does the hardware hash on 4-tuple if IP
+	 *    options are present?
+	 */
+	if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_TCP_IPV4) &&
+	    (proto == IPPROTO_TCP) &&
+	    (is_frag == 0)) {
+		if (m->m_len < iphlen + sizeof(struct tcphdr)) {
+			printf("%s: short TCP frame?\n", __func__);
+			return (-1);
+		}
+		th = (struct tcphdr *)((caddr_t)ip + iphlen);
+		return rss_proto_software_hash_v4(ip->ip_src, ip->ip_dst,
+		    th->th_sport,
+		    th->th_dport,
+		    proto,
+		    hashval,
+		    hashtype);
+	} else if ((rss_gethashconfig_local() & RSS_HASHTYPE_RSS_UDP_IPV4) &&
+	    (proto == IPPROTO_UDP) &&
+	    (is_frag == 0)) {
+		uh = (struct udphdr *)((caddr_t)ip + iphlen);
+		if (m->m_len < iphlen + sizeof(struct udphdr)) {
+			printf("%s: short UDP frame?\n", __func__);
+			return (-1);
+		}
+		return rss_proto_software_hash_v4(ip->ip_src, ip->ip_dst,
+		    uh->uh_sport,
+		    uh->uh_dport,
+		    proto,
+		    hashval,
+		    hashtype);
+	} else if (rss_gethashconfig_local() & RSS_HASHTYPE_RSS_IPV4) {
+		/* Default to 2-tuple hash */
+		return rss_proto_software_hash_v4(ip->ip_src, ip->ip_dst,
+		    0,	/* source port */
+		    0,	/* destination port */
+		    0,	/* IPPROTO_IP */
+		    hashval,
+		    hashtype);
+	} else {
+		printf("%s: no available hashtypes!\n", __func__);
+		return (-1);
+	}
+}
+
+/*
+ * Similar to rss_m2cpuid, but designed to be used by the IP NETISR
+ * on incoming frames.
+ *
+ * If an existing RSS hash exists and it matches what the configured
+ * hashing is, then use it.
+ *
+ * If there's an existing RSS hash but the desired hash is different,
+ * or if there's no useful RSS hash, then calculate it via
+ * the software path.
+ *
+ * XXX TODO: definitely want statistics here!
+ */
+struct mbuf *
+rss_soft_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid)
+{
+	uint32_t hash_val, hash_type;
+	int ret;
+
+	M_ASSERTPKTHDR(m);
+
+	ret = rss_mbuf_software_hash_v4(m, RSS_HASH_PKT_INGRESS,
+	    &hash_val, &hash_type);
+	if (ret > 0) {
+		/* mbuf has a valid hash already; don't need to modify it */
+		*cpuid = rss_hash2cpuid(m->m_pkthdr.flowid, M_HASHTYPE_GET(m));
+	} else if (ret == 0) {
+		/* hash was done; update */
+		m->m_pkthdr.flowid = hash_val;
+		M_HASHTYPE_SET(m, hash_type);
+		m->m_flags |= M_FLOWID;
+		*cpuid = rss_hash2cpuid(m->m_pkthdr.flowid, M_HASHTYPE_GET(m));
+	} else { /* ret < 0 */
+		/* no hash was done */
+		*cpuid = NETISR_CPUID_NONE;
+	}
+	return (m);
+}
+
 /*
  * Query the RSS hash algorithm.
  */
@@ -538,15 +800,10 @@ rss_getnumcpus(void)
 	return (rss_ncpus);
 }
 
-/*
- * Return the supported RSS hash configuration.
- *
- * NICs should query this to determine what to configure in their redirection
- * matching table.
- */
-u_int
-rss_gethashconfig(void)
+static inline u_int
+rss_gethashconfig_local(void)
 {
+
 	/* Return 4-tuple for TCP; 2-tuple for others */
 	/*
 	 * UDP may fragment more often than TCP and thus we'll end up with
@@ -572,6 +829,19 @@ rss_gethashconfig(void)
 	);
 }
 
+/*
+ * Return the supported RSS hash configuration.
+ *
+ * NICs should query this to determine what to configure in their redirection
+ * matching table.
+ */
+u_int
+rss_gethashconfig(void)
+{
+
+	return (rss_gethashconfig_local());
+}
+
 /*
  * XXXRW: Confirm that sysctl -a won't dump this keying material, don't want
  * it appearing in debugging output unnecessarily.
diff --git a/sys/netinet/in_rss.h b/sys/netinet/in_rss.h
index a911e3c0f926..66fb61149091 100644
--- a/sys/netinet/in_rss.h
+++ b/sys/netinet/in_rss.h
@@ -82,6 +82,16 @@
  */
 #define	RSS_KEYSIZE	40
 
+/*
+ * For RSS hash methods that do a software hash on an mbuf, the packet
+ * direction (ingress / egress) is required.
+ *
+ * The default direction (INGRESS) is the "receive into the NIC" - ie,
+ * what the hardware is hashing on.
+ */
+#define	RSS_HASH_PKT_INGRESS	0
+#define	RSS_HASH_PKT_EGRESS	1
+
 /*
  * Device driver interfaces to query RSS properties that must be programmed
  * into hardware.
@@ -116,4 +126,17 @@ int		rss_hash2bucket(uint32_t hash_val, uint32_t hash_type,
 		uint32_t *bucket_id);
 int		rss_m2bucket(struct mbuf *m, uint32_t *bucket_id);
 
+/*
+ * Functions to calculate a software RSS hash for a given mbuf or
+ * packet detail.
+ */
+int		rss_mbuf_software_hash_v4(const struct mbuf *m, int dir,
+		    uint32_t *hashval, uint32_t *hashtype);
+int		rss_proto_software_hash_v4(struct in_addr src,
+		    struct in_addr dst, u_short src_port, u_short dst_port,
+		    int proto, uint32_t *hashval,
+		    uint32_t *hashtype);
+struct mbuf *	rss_soft_m2cpuid(struct mbuf *m, uintptr_t source,
+		    u_int *cpuid);
+
 #endif /* !_NETINET_IN_RSS_H_ */
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 3a6e9255279c..6f0dcbf7872b 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -411,6 +411,7 @@ void	in_rtqdrain(void);
 int	in_addprefix(struct in_ifaddr *, int);
 int	in_scrubprefix(struct in_ifaddr *, u_int);
 void	ip_input(struct mbuf *);
+void	ip_direct_input(struct mbuf *);
 void	in_ifadown(struct ifaddr *ifa, int);
 struct	mbuf	*ip_fastforward(struct mbuf *);
 void	*in_domifattach(struct ifnet *);
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 5b41dfdd3b78..ded9103f31bb 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -296,9 +296,9 @@ ip_fastforward(struct mbuf *m)
 	 * Only IP packets without options
 	 */
 	if (ip->ip_hl != (sizeof(struct ip) >> 2)) {
-		if (ip_doopts == 1)
+		if (V_ip_doopts == 1)
 			return m;
-		else if (ip_doopts == 2) {
+		else if (V_ip_doopts == 2) {
 			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_FILTER_PROHIB,
 				0, 0);
 			return NULL;	/* mbuf already free'd */
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 21a665a99e22..897adac41b33 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -142,8 +142,8 @@ gre_input2(struct mbuf *m ,int hlen, u_char proto)
 	}
 	gip = mtod(m, struct greip *);
 
-	GRE2IFP(sc)->if_ipackets++;
-	GRE2IFP(sc)->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(GRE2IFP(sc), IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(GRE2IFP(sc), IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	switch (proto) {
 	case IPPROTO_GRE:
@@ -243,8 +243,8 @@ gre_mobile_input(struct mbuf **mp, int *offp, int proto)
 	ip = mtod(m, struct ip *);
 	mip = mtod(m, struct mobip_h *);
 
-	GRE2IFP(sc)->if_ipackets++;
-	GRE2IFP(sc)->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(GRE2IFP(sc), IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(GRE2IFP(sc), IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	if (ntohs(mip->mh.proto) & MOB_H_SBIT) {
 		msiz = MOB_H_SIZ_L;
@@ -315,18 +315,18 @@ gre_lookup(struct mbuf *m, u_int8_t proto)
 	struct ip *ip = mtod(m, struct ip *);
 	struct gre_softc *sc;
 
-	mtx_lock(&gre_mtx);
-	for (sc = LIST_FIRST(&gre_softc_list); sc != NULL;
+	GRE_LIST_LOCK();
+	for (sc = LIST_FIRST(&V_gre_softc_list); sc != NULL;
 	     sc = LIST_NEXT(sc, sc_list)) {
 		if ((sc->g_dst.s_addr == ip->ip_src.s_addr) &&
 		    (sc->g_src.s_addr == ip->ip_dst.s_addr) &&
 		    (sc->g_proto == proto) &&
 		    ((GRE2IFP(sc)->if_flags & IFF_UP) != 0)) {
-			mtx_unlock(&gre_mtx);
+			GRE_LIST_UNLOCK();
 			return (sc);
 		}
 	}
-	mtx_unlock(&gre_mtx);
+	GRE_LIST_UNLOCK();
 
 	return (NULL);
 }
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 007364375834..e5d32f03daea 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -149,6 +149,10 @@ SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW,
 	&VNET_NAME(icmpbmcastecho), 0,
 	"");
 
+static VNET_DEFINE(int, icmptstamprepl) = 1;
+#define	V_icmptstamprepl		VNET(icmptstamprepl)
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, tstamprepl, CTLFLAG_RW,
+	&VNET_NAME(icmptstamprepl), 0, "Respond to ICMP Timestamp packets");
 
 #ifdef ICMPPRINTFS
 int	icmpprintfs = 0;
@@ -545,6 +549,8 @@ icmp_input(struct mbuf **mp, int *offp, int proto)
 			goto reflect;
 
 	case ICMP_TSTAMP:
+		if (V_icmptstamprepl == 0)
+			break;
 		if (!V_icmpbmcastecho
 		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
 			ICMPSTAT_INC(icps_bmcasttstamp);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index d622e011ead0..01a4756a49ca 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipstealth.h"
 #include "opt_ipsec.h"
 #include "opt_route.h"
+#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #ifdef IPSEC
 #include <netinet/ip_ipsec.h>
 #endif /* IPSEC */
+#include <netinet/in_rss.h>
 
 #include <sys/socketvar.h>
 
@@ -144,9 +146,33 @@ static struct netisr_handler ip_nh = {
 	.nh_name = "ip",
 	.nh_handler = ip_input,
 	.nh_proto = NETISR_IP,
+#ifdef	RSS
+	.nh_m2cpuid = rss_soft_m2cpuid,
+	.nh_policy = NETISR_POLICY_CPU,
+	.nh_dispatch = NETISR_DISPATCH_HYBRID,
+#else
 	.nh_policy = NETISR_POLICY_FLOW,
+#endif
 };
 
+#ifdef	RSS
+/*
+ * Directly dispatched frames are currently assumed
+ * to have a flowid already calculated.
+ *
+ * It should likely have something that assert it
+ * actually has valid flow details.
+ */
+static struct netisr_handler ip_direct_nh = {
+	.nh_name = "ip_direct",
+	.nh_handler = ip_direct_input,
+	.nh_proto = NETISR_IP_DIRECT,
+	.nh_m2cpuid = rss_m2cpuid,
+	.nh_policy = NETISR_POLICY_CPU,
+	.nh_dispatch = NETISR_DISPATCH_HYBRID,
+};
+#endif
+
 extern	struct domain inetdomain;
 extern	struct protosw inetsw[];
 u_char	ip_protox[IPPROTO_MAX];
@@ -266,6 +292,46 @@ SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops,
     CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_netinet_intr_queue_drops, "I",
     "Number of packets dropped from the IP input queue");
 
+#ifdef	RSS
+static int
+sysctl_netinet_intr_direct_queue_maxlen(SYSCTL_HANDLER_ARGS)
+{
+	int error, qlimit;
+
+	netisr_getqlimit(&ip_direct_nh, &qlimit);
+	error = sysctl_handle_int(oidp, &qlimit, 0, req);
+	if (error || !req->newptr)
+		return (error);
+	if (qlimit < 1)
+		return (EINVAL);
+	return (netisr_setqlimit(&ip_direct_nh, qlimit));
+}
+SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_direct_queue_maxlen,
+    CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_netinet_intr_direct_queue_maxlen, "I",
+    "Maximum size of the IP direct input queue");
+
+static int
+sysctl_netinet_intr_direct_queue_drops(SYSCTL_HANDLER_ARGS)
+{
+	u_int64_t qdrops_long;
+	int error, qdrops;
+
+	netisr_getqdrops(&ip_direct_nh, &qdrops_long);
+	qdrops = qdrops_long;
+	error = sysctl_handle_int(oidp, &qdrops, 0, req);
+	if (error || !req->newptr)
+		return (error);
+	if (qdrops != 0)
+		return (EINVAL);
+	netisr_clearqdrops(&ip_direct_nh);
+	return (0);
+}
+
+SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQDROPS, intr_direct_queue_drops,
+    CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_netinet_intr_direct_queue_drops, "I",
+    "Number of packets dropped from the IP direct input queue");
+#endif	/* RSS */
+
 /*
  * IP initialization: fill in IP protocol switch table.
  * All protocols not implemented in kernel go to raw IP protocol handler.
@@ -327,6 +393,9 @@ ip_init(void)
 	/* Initialize various other remaining things. */
 	IPQ_LOCK_INIT();
 	netisr_register(&ip_nh);
+#ifdef	RSS
+	netisr_register(&ip_direct_nh);
+#endif
 }
 
 #ifdef VIMAGE
@@ -350,6 +419,28 @@ ip_destroy(void)
 }
 #endif
 
+#ifdef	RSS
+/*
+ * IP direct input routine.
+ *
+ * This is called when reinjecting completed fragments where
+ * all of the previous checking and book-keeping has been done.
+ */
+void
+ip_direct_input(struct mbuf *m)
+{
+	struct ip *ip;
+	int hlen;
+
+	ip = mtod(m, struct ip *);
+	hlen = ip->ip_hl << 2;
+
+	IPSTAT_INC(ips_delivered);
+	(*inetsw[ip_protox[ip->ip_p]].pr_input)(&m, &hlen, ip->ip_p);
+	return;
+}
+#endif
+
 /*
  * Ip input routine.  Checksum and byte swap header.  If fragmented
  * try to reassemble.  Process options.  Pass to next level.
@@ -463,6 +554,7 @@ ip_input(struct mbuf *m)
 		} else
 			m_adj(m, ip_len - m->m_pkthdr.len);
 	}
+
 #ifdef IPSEC
 	/*
 	 * Bypass packet filtering for packets previously handled by IPsec.
@@ -817,6 +909,9 @@ ip_reass(struct mbuf *m)
 	int i, hlen, next;
 	u_int8_t ecn, ecn0;
 	u_short hash;
+#ifdef	RSS
+	uint32_t rss_hash, rss_type;
+#endif
 
 	/* If maxnipq or maxfragsperpacket are 0, never accept fragments. */
 	if (V_maxnipq == 0 || V_maxfragsperpacket == 0) {
@@ -1106,6 +1201,40 @@ ip_reass(struct mbuf *m)
 		m_fixhdr(m);
 	IPSTAT_INC(ips_reassembled);
 	IPQ_UNLOCK();
+
+#ifdef	RSS
+	/*
+	 * Query the RSS layer for the flowid / flowtype for the
+	 * mbuf payload.
+	 *
+	 * For now, just assume we have to calculate a new one.
+	 * Later on we should check to see if the assigned flowid matches
+	 * what RSS wants for the given IP protocol and if so, just keep it.
+	 *
+	 * We then queue into the relevant netisr so it can be dispatched
+	 * to the correct CPU.
+	 *
+	 * Note - this may return 1, which means the flowid in the mbuf
+	 * is correct for the configured RSS hash types and can be used.
+	 */
+	if (rss_mbuf_software_hash_v4(m, 0, &rss_hash, &rss_type) == 0) {
+		m->m_pkthdr.flowid = rss_hash;
+		M_HASHTYPE_SET(m, rss_type);
+		m->m_flags |= M_FLOWID;
+	}
+
+	/*
+	 * Queue/dispatch for reprocessing.
+	 *
+	 * Note: this is much slower than just handling the frame in the
+	 * current receive context.  It's likely worth investigating
+	 * why this is.
+	 */
+	netisr_dispatch(NETISR_IP_DIRECT, m);
+	return (NULL);
+#endif
+
+	/* Handle in-line */
 	return (m);
 
 dropfrag:
@@ -1662,6 +1791,43 @@ ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip,
 		if (*mp)
 			mp = &(*mp)->m_next;
 	}
+
+	if (inp->inp_flags2 & INP_RECVFLOWID) {
+		uint32_t flowid, flow_type;
+
+		flowid = m->m_pkthdr.flowid;
+		flow_type = M_HASHTYPE_GET(m);
+
+		/*
+		 * XXX should handle the failure of one or the
+		 * other - don't populate both?
+		 */
+		*mp = sbcreatecontrol((caddr_t) &flowid,
+		    sizeof(uint32_t), IP_FLOWID, IPPROTO_IP);
+		if (*mp)
+			mp = &(*mp)->m_next;
+		*mp = sbcreatecontrol((caddr_t) &flow_type,
+		    sizeof(uint32_t), IP_FLOWTYPE, IPPROTO_IP);
+		if (*mp)
+			mp = &(*mp)->m_next;
+	}
+
+#ifdef	RSS
+	if (inp->inp_flags2 & INP_RECVRSSBUCKETID) {
+		uint32_t flowid, flow_type;
+		uint32_t rss_bucketid;
+
+		flowid = m->m_pkthdr.flowid;
+		flow_type = M_HASHTYPE_GET(m);
+
+		if (rss_hash2bucket(flowid, flow_type, &rss_bucketid) == 0) {
+			*mp = sbcreatecontrol((caddr_t) &rss_bucketid,
+			   sizeof(uint32_t), IP_RSSBUCKETID, IPPROTO_IP);
+			if (*mp)
+				mp = &(*mp)->m_next;
+		}
+	}
+#endif
 }
 
 /*
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c
index 6bd42c0a48c6..bf9f81f64f19 100644
--- a/sys/netinet/ip_ipsec.c
+++ b/sys/netinet/ip_ipsec.c
@@ -63,15 +63,12 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/in_cksum.h>
 
-#ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/xform.h>
 #include <netipsec/key.h>
-#endif /*IPSEC*/
 
 extern	struct protosw inetsw[];
 
-#ifdef IPSEC
 #ifdef IPSEC_FILTERTUNNEL
 static VNET_DEFINE(int, ip4_ipsec_filtertunnel) = 1;
 #else
@@ -83,7 +80,6 @@ SYSCTL_DECL(_net_inet_ipsec);
 SYSCTL_VNET_INT(_net_inet_ipsec, OID_AUTO, filtertunnel,
 	CTLFLAG_RW, &VNET_NAME(ip4_ipsec_filtertunnel), 0,
 	"If set filter packets from an IPsec tunnel.");
-#endif /* IPSEC */
 
 /*
  * Check if we have to jump over firewall processing for this packet.
@@ -93,7 +89,6 @@ SYSCTL_VNET_INT(_net_inet_ipsec, OID_AUTO, filtertunnel,
 int
 ip_ipsec_filtertunnel(struct mbuf *m)
 {
-#ifdef IPSEC
 
 	/*
 	 * Bypass packet filtering for packets previously handled by IPsec.
@@ -101,7 +96,6 @@ ip_ipsec_filtertunnel(struct mbuf *m)
 	if (!V_ip4_ipsec_filtertunnel &&
 	    m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL)
 		return 1;
-#endif
 	return 0;
 }
 
@@ -114,7 +108,6 @@ ip_ipsec_filtertunnel(struct mbuf *m)
 int
 ip_ipsec_fwd(struct mbuf *m)
 {
-#ifdef IPSEC
 	struct m_tag *mtag;
 	struct tdb_ident *tdbi;
 	struct secpolicy *sp;
@@ -143,7 +136,6 @@ ip_ipsec_fwd(struct mbuf *m)
 		IPSTAT_INC(ips_cantforward);
 		return 1;
 	}
-#endif /* IPSEC */
 	return 0;
 }
 
@@ -157,7 +149,6 @@ ip_ipsec_fwd(struct mbuf *m)
 int
 ip_ipsec_input(struct mbuf *m)
 {
-#ifdef IPSEC
 	struct ip *ip = mtod(m, struct ip *);
 	struct m_tag *mtag;
 	struct tdb_ident *tdbi;
@@ -198,7 +189,6 @@ ip_ipsec_input(struct mbuf *m)
 		if (error)
 			return 1;
 	}
-#endif /* IPSEC */
 	return 0;
 }
 
@@ -256,7 +246,6 @@ ip_ipsec_mtu(struct mbuf *m, int mtu)
 int
 ip_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error)
 {
-#ifdef IPSEC
 	struct secpolicy *sp = NULL;
 	struct tdb_ident *tdbi;
 	struct m_tag *mtag;
@@ -388,6 +377,4 @@ ip_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error)
 	if (sp != NULL)
 		KEY_FREESP(&sp);
 	return 1;
-#endif /* IPSEC */
-	return 0;
 }
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c
index 891199261c9c..cdb98be83388 100644
--- a/sys/netinet/ip_options.c
+++ b/sys/netinet/ip_options.c
@@ -65,18 +65,21 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/socketvar.h>
 
-static int	ip_dosourceroute = 0;
-SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
-    &ip_dosourceroute, 0, "Enable forwarding source routed IP packets");
+static VNET_DEFINE(int, ip_dosourceroute);
+SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute,
+    CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_dosourceroute), 0,
+    "Enable forwarding source routed IP packets");
+#define	V_ip_dosourceroute	VNET(ip_dosourceroute)
 
-static int	ip_acceptsourceroute = 0;
+static VNET_DEFINE(int,	ip_acceptsourceroute);
 SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute, 
-    CTLFLAG_RW, &ip_acceptsourceroute, 0, 
+    CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_acceptsourceroute), 0, 
     "Enable accepting source routed IP packets");
+#define	V_ip_acceptsourceroute	VNET(ip_acceptsourceroute)
 
-int		ip_doopts = 1;	/* 0 = ignore, 1 = process, 2 = reject */
-SYSCTL_INT(_net_inet_ip, OID_AUTO, process_options, CTLFLAG_RW,
-    &ip_doopts, 0, "Enable IP options processing ([LS]SRR, RR, TS)");
+VNET_DEFINE(int, ip_doopts) = 1; /* 0 = ignore, 1 = process, 2 = reject */
+SYSCTL_INT(_net_inet_ip, OID_AUTO, process_options, CTLFLAG_VNET | CTLFLAG_RW,
+    &VNET_NAME(ip_doopts), 0, "Enable IP options processing ([LS]SRR, RR, TS)");
 
 static void	save_rte(struct mbuf *m, u_char *, struct in_addr);
 
@@ -104,9 +107,9 @@ ip_dooptions(struct mbuf *m, int pass)
 	struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
 
 	/* Ignore or reject packets with IP options. */
-	if (ip_doopts == 0)
+	if (V_ip_doopts == 0)
 		return 0;
-	else if (ip_doopts == 2) {
+	else if (V_ip_doopts == 2) {
 		type = ICMP_UNREACH;
 		code = ICMP_UNREACH_FILTER_PROHIB;
 		goto bad;
@@ -167,7 +170,7 @@ ip_dooptions(struct mbuf *m, int pass)
 					code = ICMP_UNREACH_SRCFAIL;
 					goto bad;
 				}
-				if (!ip_dosourceroute)
+				if (!V_ip_dosourceroute)
 					goto nosourcerouting;
 				/*
 				 * Loose routing, and not at next destination
@@ -180,7 +183,7 @@ ip_dooptions(struct mbuf *m, int pass)
 				/*
 				 * End of source route.  Should be for us.
 				 */
-				if (!ip_acceptsourceroute)
+				if (!V_ip_acceptsourceroute)
 					goto nosourcerouting;
 				save_rte(m, cp, ip->ip_src);
 				break;
@@ -189,7 +192,7 @@ ip_dooptions(struct mbuf *m, int pass)
 			if (V_ipstealth)
 				goto dropit;
 #endif
-			if (!ip_dosourceroute) {
+			if (!V_ip_dosourceroute) {
 				if (V_ipforwarding) {
 					char buf[16]; /* aaa.bbb.ccc.ddd\0 */
 					/*
@@ -227,8 +230,11 @@ ip_dooptions(struct mbuf *m, int pass)
 			if (opt == IPOPT_SSRR) {
 #define	INA	struct in_ifaddr *
 #define	SA	struct sockaddr *
-			    if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == NULL)
-				    ia = (INA)ifa_ifwithnet((SA)&ipaddr, 0);
+			    ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr,
+					    RT_ALL_FIBS);
+			    if (ia == NULL)
+				    ia = (INA)ifa_ifwithnet((SA)&ipaddr, 0,
+						    RT_ALL_FIBS);
 			} else
 /* XXX MRT 0 for routing */
 				ia = ip_rtaddr(ipaddr.sin_addr, M_GETFIB(m));
diff --git a/sys/netinet/ip_options.h b/sys/netinet/ip_options.h
index 7cb447e05469..4a6ea420e20e 100644
--- a/sys/netinet/ip_options.h
+++ b/sys/netinet/ip_options.h
@@ -47,7 +47,8 @@ struct ipopt_tag {
 	struct	ipoptrt ip_srcrt;
 };
 
-extern	int	ip_doopts;		/* process or ignore IP options */
+VNET_DECLARE(int, ip_doopts);		/* process or ignore IP options */
+#define	V_ip_doopts	VNET(ip_doopts)
 
 int		 ip_checkrouteralert(struct mbuf *);
 int		 ip_dooptions(struct mbuf *, int);
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 8503b2fe4475..827d25af34b6 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -136,7 +136,9 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	struct rtentry *rte;	/* cache for ro->ro_rt */
 	struct in_addr odst;
 	struct m_tag *fwd_tag = NULL;
+	uint32_t fibnum;
 	int have_ia_ref;
+	int needfiblookup;
 #ifdef IPSEC
 	int no_route_but_check_spd = 0;
 #endif
@@ -145,7 +147,8 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	if (inp != NULL) {
 		INP_LOCK_ASSERT(inp);
 		M_SETFIB(m, inp->inp_inc.inc_fibnum);
-		if (inp->inp_flags & (INP_HW_FLOWID|INP_SW_FLOWID)) {
+		if (((flags & IP_NODEFAULTFLOWID) == 0) &&
+		    inp->inp_flags & (INP_HW_FLOWID|INP_SW_FLOWID)) {
 			m->m_pkthdr.flowid = inp->inp_flowid;
 			M_HASHTYPE_SET(m, inp->inp_flowtype);
 			m->m_flags |= M_FLOWID;
@@ -201,6 +204,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	 * therefore we need restore gw if we're redoing lookup.
 	 */
 	gw = dst = (struct sockaddr_in *)&ro->ro_dst;
+	fibnum = (inp != NULL) ? inp->inp_inc.inc_fibnum : M_GETFIB(m);
 again:
 	ia = NULL;
 	have_ia_ref = 0;
@@ -234,8 +238,10 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	 * or the destination address of a ptp interface.
 	 */
 	if (flags & IP_SENDONES) {
-		if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL &&
-		    (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL) {
+		if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst),
+						      M_GETFIB(m)))) == NULL &&
+		    (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst),
+						    M_GETFIB(m)))) == NULL) {
 			IPSTAT_INC(ips_noroute);
 			error = ENETUNREACH;
 			goto bad;
@@ -247,8 +253,10 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		ip->ip_ttl = 1;
 		isbroadcast = 1;
 	} else if (flags & IP_ROUTETOIF) {
-		if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL &&
-		    (ia = ifatoia(ifa_ifwithnet(sintosa(dst), 0))) == NULL) {
+		if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst),
+						    M_GETFIB(m)))) == NULL &&
+		    (ia = ifatoia(ifa_ifwithnet(sintosa(dst), 0,
+						M_GETFIB(m)))) == NULL) {
 			IPSTAT_INC(ips_noroute);
 			error = ENETUNREACH;
 			goto bad;
@@ -278,10 +286,9 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 #ifdef RADIX_MPATH
 			rtalloc_mpath_fib(ro,
 			    ntohl(ip->ip_src.s_addr ^ ip->ip_dst.s_addr),
-			    inp ? inp->inp_inc.inc_fibnum : M_GETFIB(m));
+			    fibnum);
 #else
-			in_rtalloc_ign(ro, 0,
-			    inp ? inp->inp_inc.inc_fibnum : M_GETFIB(m));
+			in_rtalloc_ign(ro, 0, fibnum);
 #endif
 			rte = ro->ro_rt;
 		}
@@ -440,43 +447,6 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		}
 	}
 
-	/*
-	 * Both in the SMP world, pre-emption world if_transmit() world,
-	 * the following code doesn't really function as intended any further.
-	 *
-	 * + There can and will be multiple CPUs running this code path
-	 *   in parallel, and we do no lock holding when checking the
-	 *   queue depth;
-	 * + And since other threads can be running concurrently, even if
-	 *   we do pass this check, another thread may queue some frames
-	 *   before this thread does and it will end up partially or fully
-	 *   failing to send anyway;
-	 * + if_transmit() based drivers don't necessarily set ifq_len
-	 *   at all.
-	 *
-	 * This should be replaced with a method of pushing an entire list
-	 * of fragment frames to the driver and have the driver decide
-	 * whether it can queue or not queue the entire set.
-	 */
-#if 0
-	/*
-	 * Verify that we have any chance at all of being able to queue the
-	 * packet or packet fragments, unless ALTQ is enabled on the given
-	 * interface in which case packetdrop should be done by queueing.
-	 */
-	n = ip_len / mtu + 1; /* how many fragments ? */
-	if (
-#ifdef ALTQ
-	    (!ALTQ_IS_ENABLED(&ifp->if_snd)) &&
-#endif /* ALTQ */
-	    (ifp->if_snd.ifq_len + n) >= ifp->if_snd.ifq_maxlen ) {
-		error = ENOBUFS;
-		IPSTAT_INC(ips_odropped);
-		ifp->if_snd.ifq_drops += n;
-		goto bad;
-	}
-#endif
-
 	/*
 	 * Look for broadcast address and
 	 * verify user is allowed to send
@@ -536,6 +506,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		goto done;
 
 	ip = mtod(m, struct ip *);
+	needfiblookup = 0;
 
 	/* See if destination IP address was changed by packet filter. */
 	if (odst.s_addr != ip->ip_dst.s_addr) {
@@ -561,9 +532,18 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		} else {
 			if (have_ia_ref)
 				ifa_free(&ia->ia_ifa);
-			goto again;	/* Redo the routing table lookup. */
+			needfiblookup = 1; /* Redo the routing table lookup. */
 		}
 	}
+	/* See if fib was changed by packet filter. */
+	if (fibnum != M_GETFIB(m)) {
+		m->m_flags |= M_SKIP_FIREWALL;
+		fibnum = M_GETFIB(m);
+		RO_RTFREE(ro);
+		needfiblookup = 1;
+	}
+	if (needfiblookup)
+		goto again;
 
 	/* See if local, if yes, send it to netisr with IP_FASTFWD_OURS. */
 	if (m->m_flags & M_FASTFWD_OURS) {
@@ -1015,6 +995,10 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 		case IP_ONESBCAST:
 		case IP_DONTFRAG:
 		case IP_RECVTOS:
+		case IP_RECVFLOWID:
+#ifdef	RSS
+		case IP_RECVRSSBUCKETID:
+#endif
 			error = sooptcopyin(sopt, &optval, sizeof optval,
 					    sizeof optval);
 			if (error)
@@ -1093,6 +1077,9 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 			case IP_BINDMULTI:
 				OPTSET2(INP_BINDMULTI, optval);
 				break;
+			case IP_RECVFLOWID:
+				OPTSET2(INP_RECVFLOWID, optval);
+				break;
 #ifdef	RSS
 			case IP_RSS_LISTEN_BUCKET:
 				if ((optval >= 0) &&
@@ -1103,6 +1090,9 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 					error = EINVAL;
 				}
 				break;
+			case IP_RECVRSSBUCKETID:
+				OPTSET2(INP_RECVRSSBUCKETID, optval);
+				break;
 #endif
 			}
 			break;
@@ -1218,8 +1208,10 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 		case IP_BINDMULTI:
 		case IP_FLOWID:
 		case IP_FLOWTYPE:
+		case IP_RECVFLOWID:
 #ifdef	RSS
 		case IP_RSSBUCKETID:
+		case IP_RECVRSSBUCKETID:
 #endif
 			switch (sopt->sopt_name) {
 
@@ -1289,6 +1281,9 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 			case IP_FLOWTYPE:
 				optval = inp->inp_flowtype;
 				break;
+			case IP_RECVFLOWID:
+				optval = OPTBIT2(INP_RECVFLOWID);
+				break;
 #ifdef	RSS
 			case IP_RSSBUCKETID:
 				retval = rss_hash2bucket(inp->inp_flowid,
@@ -1299,6 +1294,9 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 				else
 					error = EINVAL;
 				break;
+			case IP_RECVRSSBUCKETID:
+				optval = OPTBIT2(INP_RECVRSSBUCKETID);
+				break;
 #endif
 			case IP_BINDMULTI:
 				optval = OPTBIT2(INP_BINDMULTI);
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index c2ab8b43d843..9f4410107a96 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -161,6 +161,7 @@ void	kmod_ipstat_dec(int statnum);
 #define	IP_SENDTOIF		0x8		/* send on specific ifnet */
 #define IP_ROUTETOIF		SO_DONTROUTE	/* 0x10 bypass routing tables */
 #define IP_ALLOWBROADCAST	SO_BROADCAST	/* 0x20 can send broadcast packets */
+#define	IP_NODEFAULTFLOWID	0x40		/* Don't set the flowid from inp */
 
 #ifdef __NO_STRICT_ALIGNMENT
 #define IP_HDR_ALIGNED_P(ip)	1
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 127710171c38..6e44d151a692 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -148,7 +148,7 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 {
 	struct sctp_nets *net;
 	struct mbuf *m_reply = NULL;
-	struct sockaddr_storage sa_store;
+	union sctp_sockstore store;
 	struct sctp_paramhdr *ph;
 	uint16_t param_type, aparam_length;
 
@@ -177,7 +177,7 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 #if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
 #endif
-	sa = (struct sockaddr *)&sa_store;
+	sa = &store.sa;
 	switch (param_type) {
 #ifdef INET
 	case SCTP_IPV4_ADDRESS:
@@ -186,7 +186,7 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 			return (NULL);
 		}
 		v4addr = (struct sctp_ipv4addr_param *)ph;
-		sin = (struct sockaddr_in *)&sa_store;
+		sin = &store.sin;
 		bzero(sin, sizeof(*sin));
 		sin->sin_family = AF_INET;
 		sin->sin_len = sizeof(struct sockaddr_in);
@@ -209,7 +209,7 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 			return (NULL);
 		}
 		v6addr = (struct sctp_ipv6addr_param *)ph;
-		sin6 = (struct sockaddr_in6 *)&sa_store;
+		sin6 = &store.sin6;
 		bzero(sin6, sizeof(*sin6));
 		sin6->sin6_family = AF_INET6;
 		sin6->sin6_len = sizeof(struct sockaddr_in6);
@@ -302,7 +302,7 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
     struct sctp_tcb *stcb, int response_required)
 {
 	struct mbuf *m_reply = NULL;
-	struct sockaddr_storage sa_store;
+	union sctp_sockstore store;
 	struct sctp_paramhdr *ph;
 	uint16_t param_type, aparam_length;
 
@@ -331,7 +331,7 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
 #if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
 #endif
-	sa = (struct sockaddr *)&sa_store;
+	sa = &store.sa;
 	switch (param_type) {
 #ifdef INET
 	case SCTP_IPV4_ADDRESS:
@@ -340,7 +340,7 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
 			return (NULL);
 		}
 		v4addr = (struct sctp_ipv4addr_param *)ph;
-		sin = (struct sockaddr_in *)&sa_store;
+		sin = &store.sin;
 		bzero(sin, sizeof(*sin));
 		sin->sin_family = AF_INET;
 		sin->sin_len = sizeof(struct sockaddr_in);
@@ -360,7 +360,7 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
 			return (NULL);
 		}
 		v6addr = (struct sctp_ipv6addr_param *)ph;
-		sin6 = (struct sockaddr_in6 *)&sa_store;
+		sin6 = &store.sin6;
 		bzero(sin6, sizeof(*sin6));
 		sin6->sin6_family = AF_INET6;
 		sin6->sin6_len = sizeof(struct sockaddr_in6);
@@ -437,7 +437,7 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
     struct sctp_tcb *stcb, int response_required)
 {
 	struct mbuf *m_reply = NULL;
-	struct sockaddr_storage sa_store;
+	union sctp_sockstore store;
 	struct sctp_paramhdr *ph;
 	uint16_t param_type, aparam_length;
 
@@ -465,7 +465,7 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
 #if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
 #endif
-	sa = (struct sockaddr *)&sa_store;
+	sa = &store.sa;
 	switch (param_type) {
 #ifdef INET
 	case SCTP_IPV4_ADDRESS:
@@ -474,7 +474,7 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
 			return (NULL);
 		}
 		v4addr = (struct sctp_ipv4addr_param *)ph;
-		sin = (struct sockaddr_in *)&sa_store;
+		sin = &store.sin;
 		bzero(sin, sizeof(*sin));
 		sin->sin_family = AF_INET;
 		sin->sin_len = sizeof(struct sockaddr_in);
@@ -492,7 +492,7 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
 			return (NULL);
 		}
 		v6addr = (struct sctp_ipv6addr_param *)ph;
-		sin6 = (struct sockaddr_in6 *)&sa_store;
+		sin6 = &store.sin6;
 		bzero(sin6, sizeof(*sin6));
 		sin6->sin6_family = AF_INET6;
 		sin6->sin6_len = sizeof(struct sockaddr_in6);
@@ -1268,7 +1268,7 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *stcb, struct sctp_ifa *ifa,
 		{
 			struct sockaddr_in6 *sin6;
 
-			sin6 = (struct sockaddr_in6 *)&ifa->address.sa;
+			sin6 = &ifa->address.sin6;
 			aa->ap.addrp.ph.param_type = SCTP_IPV6_ADDRESS;
 			aa->ap.addrp.ph.param_length = (sizeof(struct sctp_ipv6addr_param));
 			aa->ap.aph.ph.param_length = sizeof(struct sctp_asconf_paramhdr) +
@@ -1283,7 +1283,7 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *stcb, struct sctp_ifa *ifa,
 		{
 			struct sockaddr_in *sin;
 
-			sin = (struct sockaddr_in *)&ifa->address.sa;
+			sin = &ifa->address.sin;
 			aa->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS;
 			aa->ap.addrp.ph.param_length = (sizeof(struct sctp_ipv4addr_param));
 			aa->ap.aph.ph.param_length = sizeof(struct sctp_asconf_paramhdr) +
@@ -1925,7 +1925,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		{
 			struct sockaddr_in6 *sin6;
 
-			sin6 = (struct sockaddr_in6 *)&ifa->address.sin6;
+			sin6 = &ifa->address.sin6;
 			if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 				/* we skip unspecifed addresses */
 				return;
@@ -1958,7 +1958,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 			    SCTP_IPV6_V6ONLY(inp6))
 				return;
 
-			sin = (struct sockaddr_in *)&ifa->address.sa;
+			sin = &ifa->address.sin;
 			if (sin->sin_addr.s_addr == 0) {
 				/* we skip unspecifed addresses */
 				return;
@@ -2115,7 +2115,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 					else
 						continue;
 				}
-				sin6 = (struct sockaddr_in6 *)&ifa->address.sin6;
+				sin6 = &ifa->address.sin6;
 				if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 					/* we skip unspecifed addresses */
 					continue;
@@ -2149,7 +2149,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 				    SCTP_IPV6_V6ONLY(inp6))
 					continue;
 
-				sin = (struct sockaddr_in *)&ifa->address.sa;
+				sin = &ifa->address.sin;
 				if (sin->sin_addr.s_addr == 0) {
 					/* we skip unspecifed addresses */
 					continue;
@@ -2466,7 +2466,7 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
 				if (stcb->asoc.scope.ipv4_addr_legal) {
 					struct sockaddr_in *sin;
 
-					sin = (struct sockaddr_in *)&sctp_ifa->address.sa;
+					sin = &sctp_ifa->address.sin;
 					if (sin->sin_addr.s_addr == 0) {
 						/* skip unspecifed addresses */
 						continue;
@@ -2500,7 +2500,7 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
 					if (sctp_ifa->localifa_flags & SCTP_ADDR_IFA_UNUSEABLE) {
 						continue;
 					}
-					sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sa;
+					sin6 = &sctp_ifa->address.sin6;
 					if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 						/*
 						 * we skip unspecifed
@@ -2772,18 +2772,16 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 	struct sctp_paramhdr tmp_param, *ph;
 	uint16_t plen, ptype;
 	struct sctp_ifa *sctp_ifa;
+	union sctp_sockstore store;
 
 #ifdef INET6
 	struct sctp_ipv6addr_param addr6_store;
-	struct sockaddr_in6 sin6;
 
 #endif
 #ifdef INET
 	struct sctp_ipv4addr_param addr4_store;
-	struct sockaddr_in sin;
 
 #endif
-	struct sockaddr *sa;
 	uint32_t vrf_id;
 
 	SCTPDBG(SCTP_DEBUG_ASCONF2, "processing init-ack addresses\n");
@@ -2796,21 +2794,6 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 	if ((offset + sizeof(struct sctp_paramhdr)) > length) {
 		return;
 	}
-	/* init the addresses */
-#ifdef INET6
-	bzero(&sin6, sizeof(sin6));
-	sin6.sin6_family = AF_INET6;
-	sin6.sin6_len = sizeof(sin6);
-	sin6.sin6_port = stcb->rport;
-#endif
-
-#ifdef INET
-	bzero(&sin, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_len = sizeof(sin);
-	sin.sin_port = stcb->rport;
-#endif
-
 	/* go through the addresses in the init-ack */
 	ph = (struct sctp_paramhdr *)
 	    sctp_m_getptr(m, offset, sizeof(struct sctp_paramhdr),
@@ -2833,9 +2816,11 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 				    a6p == NULL) {
 					return;
 				}
-				memcpy(&sin6.sin6_addr, a6p->addr,
-				    sizeof(struct in6_addr));
-				sa = (struct sockaddr *)&sin6;
+				memset(&store, 0, sizeof(union sctp_sockstore));
+				store.sin6.sin6_family = AF_INET6;
+				store.sin6.sin6_len = sizeof(struct sockaddr_in6);
+				store.sin6.sin6_port = stcb->rport;
+				memcpy(&store.sin6.sin6_addr, a6p->addr, sizeof(struct in6_addr));
 				break;
 			}
 #endif
@@ -2852,8 +2837,11 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 				    a4p == NULL) {
 					return;
 				}
-				sin.sin_addr.s_addr = a4p->addr;
-				sa = (struct sockaddr *)&sin;
+				memset(&store, 0, sizeof(union sctp_sockstore));
+				store.sin.sin_family = AF_INET;
+				store.sin.sin_len = sizeof(struct sockaddr_in);
+				store.sin.sin_port = stcb->rport;
+				store.sin.sin_addr.s_addr = a4p->addr;
 				break;
 			}
 #endif
@@ -2867,7 +2855,7 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 		} else {
 			vrf_id = SCTP_DEFAULT_VRFID;
 		}
-		sctp_ifa = sctp_find_ifa_by_addr(sa, vrf_id,
+		sctp_ifa = sctp_find_ifa_by_addr(&store.sa, vrf_id,
 		    SCTP_ADDR_NOT_LOCKED);
 		if (sctp_ifa == NULL) {
 			/* address doesn't exist anymore */
@@ -2878,7 +2866,7 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 			    SCTP_PCB_FLAGS_DO_ASCONF)) &&
 			    stcb->asoc.asconf_supported) {
 				/* queue an ASCONF DEL_IP_ADDRESS */
-				status = sctp_asconf_queue_sa_delete(stcb, sa);
+				status = sctp_asconf_queue_sa_delete(stcb, &store.sa);
 				/*
 				 * if queued ok, and in correct state, send
 				 * out the ASCONF.
@@ -3125,7 +3113,7 @@ sctp_check_address_list_all(struct sctp_tcb *stcb, struct mbuf *m, int offset,
 			switch (sctp_ifa->address.sa.sa_family) {
 #ifdef INET
 			case AF_INET:
-				sin = (struct sockaddr_in *)&sctp_ifa->address.sin;
+				sin = &sctp_ifa->address.sin;
 				if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
 				    &sin->sin_addr) != 0) {
 					continue;
@@ -3139,7 +3127,7 @@ sctp_check_address_list_all(struct sctp_tcb *stcb, struct mbuf *m, int offset,
 #endif
 #ifdef INET6
 			case AF_INET6:
-				sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sin6;
+				sin6 = &sctp_ifa->address.sin6;
 				if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
 				    &sin6->sin6_addr) != 0) {
 					continue;
diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c
index 1f301030b2d4..8ce2aab4f936 100644
--- a/sys/netinet/sctp_auth.c
+++ b/sys/netinet/sctp_auth.c
@@ -631,7 +631,7 @@ sctp_copy_skeylist(const struct sctp_keyhead *src, struct sctp_keyhead *dest)
 
 
 sctp_hmaclist_t *
-sctp_alloc_hmaclist(uint8_t num_hmacs)
+sctp_alloc_hmaclist(uint16_t num_hmacs)
 {
 	sctp_hmaclist_t *new_list;
 	int alloc_size;
@@ -1438,8 +1438,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m,
 			p_random = (struct sctp_auth_random *)phdr;
 			random_len = plen - sizeof(*p_random);
 		} else if (ptype == SCTP_HMAC_LIST) {
-			int num_hmacs;
-			int i;
+			uint16_t num_hmacs;
+			uint16_t i;
 
 			if (plen > sizeof(hmacs_store))
 				break;
diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h
index 423a5cc50538..b98764e255cd 100644
--- a/sys/netinet/sctp_auth.h
+++ b/sys/netinet/sctp_auth.h
@@ -154,7 +154,7 @@ sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t keyid,
 
 
 /* hmac list handling */
-extern sctp_hmaclist_t *sctp_alloc_hmaclist(uint8_t num_hmacs);
+extern sctp_hmaclist_t *sctp_alloc_hmaclist(uint16_t num_hmacs);
 extern void sctp_free_hmaclist(sctp_hmaclist_t * list);
 extern int sctp_auth_add_hmacid(sctp_hmaclist_t * list, uint16_t hmac_id);
 extern sctp_hmaclist_t *sctp_copy_hmaclist(sctp_hmaclist_t * list);
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
index d788ff2ffcda..e32faf95a0cf 100644
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -1130,12 +1130,9 @@ sctp_cwnd_update_after_packet_dropped(struct sctp_tcb *stcb,
     uint32_t * bottle_bw, uint32_t * on_queue)
 {
 	uint32_t bw_avail;
-	int rtt;
 	unsigned int incr;
 	int old_cwnd = net->cwnd;
 
-	/* need real RTT in msd for this calc */
-	rtt = net->rtt / 1000;
 	/* get bottle neck bw */
 	*bottle_bw = ntohl(cp->bottle_bw);
 	/* and whats on queue */
@@ -1144,10 +1141,11 @@ sctp_cwnd_update_after_packet_dropped(struct sctp_tcb *stcb,
 	 * adjust the on-queue if our flight is more it could be that the
 	 * router has not yet gotten data "in-flight" to it
 	 */
-	if (*on_queue < net->flight_size)
+	if (*on_queue < net->flight_size) {
 		*on_queue = net->flight_size;
-	/* calculate the available space */
-	bw_avail = (*bottle_bw * rtt) / 1000;
+	}
+	/* rtt is measured in micro seconds, bottle_bw in bytes per second */
+	bw_avail = (uint32_t) (((uint64_t) (*bottle_bw) * net->rtt) / (uint64_t) 1000000);
 	if (bw_avail > *bottle_bw) {
 		/*
 		 * Cap the growth to no more than the bottle neck. This can
@@ -1167,7 +1165,6 @@ sctp_cwnd_update_after_packet_dropped(struct sctp_tcb *stcb,
 		int seg_inflight, seg_onqueue, my_portion;
 
 		net->partial_bytes_acked = 0;
-
 		/* how much are we over queue size? */
 		incr = *on_queue - bw_avail;
 		if (stcb->asoc.seen_a_sack_this_pkt) {
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index 0ede04ca92df..de451651a6a6 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -267,18 +267,9 @@ __FBSDID("$FreeBSD$");
 /* how many addresses per assoc remote and local */
 #define SCTP_SCALE_FOR_ADDR	2
 
-/* default AUTO_ASCONF mode enable(1)/disable(0) value (sysctl) */
-#define SCTP_DEFAULT_AUTO_ASCONF	1
-
 /* default MULTIPLE_ASCONF mode enable(1)/disable(0) value (sysctl) */
 #define SCTP_DEFAULT_MULTIPLE_ASCONFS	0
 
-/* default MOBILITY_BASE mode enable(1)/disable(0) value (sysctl) */
-#define SCTP_DEFAULT_MOBILITY_BASE	0
-
-/* default MOBILITY_FASTHANDOFF mode enable(1)/disable(0) value (sysctl) */
-#define SCTP_DEFAULT_MOBILITY_FASTHANDOFF	0
-
 /*
  * Theshold for rwnd updates, we have to read (sb_hiwat >>
  * SCTP_RWND_HIWAT_SHIFT) before we will look to see if we need to send a
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index f7ebe57f4f17..fa108a394de9 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -562,21 +562,12 @@ static void
 sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp,
     struct sctp_tcb *stcb, struct sctp_nets *net)
 {
-	struct sockaddr_storage store;
+	union sctp_sockstore store;
 	struct sctp_nets *r_net, *f_net;
 	struct timeval tv;
 	int req_prim = 0;
 	uint16_t old_error_counter;
 
-#ifdef INET
-	struct sockaddr_in *sin;
-
-#endif
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-
-#endif
-
 	if (ntohs(cp->ch.chunk_length) != sizeof(struct sctp_heartbeat_chunk)) {
 		/* Invalid length */
 		return;
@@ -586,12 +577,11 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp,
 #ifdef INET
 	case AF_INET:
 		if (cp->heartbeat.hb_info.addr_len == sizeof(struct sockaddr_in)) {
-			sin = (struct sockaddr_in *)&store;
-			sin->sin_family = cp->heartbeat.hb_info.addr_family;
-			sin->sin_len = cp->heartbeat.hb_info.addr_len;
-			sin->sin_port = stcb->rport;
-			memcpy(&sin->sin_addr, cp->heartbeat.hb_info.address,
-			    sizeof(sin->sin_addr));
+			store.sin.sin_family = cp->heartbeat.hb_info.addr_family;
+			store.sin.sin_len = cp->heartbeat.hb_info.addr_len;
+			store.sin.sin_port = stcb->rport;
+			memcpy(&store.sin.sin_addr, cp->heartbeat.hb_info.address,
+			    sizeof(store.sin.sin_addr));
 		} else {
 			return;
 		}
@@ -600,12 +590,10 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp,
 #ifdef INET6
 	case AF_INET6:
 		if (cp->heartbeat.hb_info.addr_len == sizeof(struct sockaddr_in6)) {
-			sin6 = (struct sockaddr_in6 *)&store;
-			sin6->sin6_family = cp->heartbeat.hb_info.addr_family;
-			sin6->sin6_len = cp->heartbeat.hb_info.addr_len;
-			sin6->sin6_port = stcb->rport;
-			memcpy(&sin6->sin6_addr, cp->heartbeat.hb_info.address,
-			    sizeof(sin6->sin6_addr));
+			store.sin6.sin6_family = cp->heartbeat.hb_info.addr_family;
+			store.sin6.sin6_len = cp->heartbeat.hb_info.addr_len;
+			store.sin6.sin6_port = stcb->rport;
+			memcpy(&store.sin6.sin6_addr, cp->heartbeat.hb_info.address, sizeof(struct in6_addr));
 		} else {
 			return;
 		}
@@ -614,7 +602,7 @@ sctp_handle_heartbeat_ack(struct sctp_heartbeat_chunk *cp,
 	default:
 		return;
 	}
-	r_net = sctp_findnet(stcb, (struct sockaddr *)&store);
+	r_net = sctp_findnet(stcb, &store.sa);
 	if (r_net == NULL) {
 		SCTPDBG(SCTP_DEBUG_INPUT1, "Huh? I can't find the address I sent it to, discard\n");
 		return;
@@ -2030,22 +2018,13 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
 	struct sctp_tcb *stcb;
 	struct sctp_init_chunk *init_cp, init_buf;
 	struct sctp_init_ack_chunk *initack_cp, initack_buf;
-	struct sockaddr_storage sa_store;
-	struct sockaddr *initack_src = (struct sockaddr *)&sa_store;
+	union sctp_sockstore store;
 	struct sctp_association *asoc;
 	int init_offset, initack_offset, initack_limit;
 	int retval;
 	int error = 0;
 	uint8_t auth_chunk_buf[SCTP_PARAM_BUFFER_SIZE];
 
-#ifdef INET
-	struct sockaddr_in *sin;
-
-#endif
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-
-#endif
 #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
 	struct socket *so;
 
@@ -2269,23 +2248,20 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
 #ifdef INET
 	case SCTP_IPV4_ADDRESS:
 		/* source addr is IPv4 */
-		sin = (struct sockaddr_in *)initack_src;
-		memset(sin, 0, sizeof(*sin));
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(struct sockaddr_in);
-		sin->sin_addr.s_addr = cookie->laddress[0];
+		memset(&store.sin, 0, sizeof(struct sockaddr_in));
+		store.sin.sin_family = AF_INET;
+		store.sin.sin_len = sizeof(struct sockaddr_in);
+		store.sin.sin_addr.s_addr = cookie->laddress[0];
 		break;
 #endif
 #ifdef INET6
 	case SCTP_IPV6_ADDRESS:
 		/* source addr is IPv6 */
-		sin6 = (struct sockaddr_in6 *)initack_src;
-		memset(sin6, 0, sizeof(*sin6));
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_len = sizeof(struct sockaddr_in6);
-		sin6->sin6_scope_id = cookie->scope_id;
-		memcpy(&sin6->sin6_addr, cookie->laddress,
-		    sizeof(sin6->sin6_addr));
+		memset(&store.sin6, 0, sizeof(struct sockaddr_in6));
+		store.sin6.sin6_family = AF_INET6;
+		store.sin6.sin6_len = sizeof(struct sockaddr_in6);
+		store.sin6.sin6_scope_id = cookie->scope_id;
+		memcpy(&store.sin6.sin6_addr, cookie->laddress, sizeof(struct in6_addr));
 		break;
 #endif
 	default:
@@ -2366,7 +2342,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset,
 	sctp_check_address_list(stcb, m,
 	    initack_offset + sizeof(struct sctp_init_ack_chunk),
 	    initack_limit - (initack_offset + sizeof(struct sctp_init_ack_chunk)),
-	    initack_src, cookie->local_scope, cookie->site_scope,
+	    &store.sa, cookie->local_scope, cookie->site_scope,
 	    cookie->ipv4_scope, cookie->loopback_scope);
 
 
@@ -2906,9 +2882,9 @@ sctp_handle_cookie_ack(struct sctp_cookie_ack_chunk *cp SCTP_UNUSED,
 
 	SCTPDBG(SCTP_DEBUG_INPUT2,
 	    "sctp_handle_cookie_ack: handling COOKIE-ACK\n");
-	if (stcb == NULL)
+	if ((stcb == NULL) || (net == NULL)) {
 		return;
-
+	}
 	asoc = &stcb->asoc;
 
 	sctp_stop_all_cookie_timers(stcb);
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index b241f75a0152..558d4e18357c 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -152,16 +152,10 @@ MALLOC_DECLARE(SCTP_M_MCORE);
 #define V_system_base_info VNET(system_base_info)
 #define SCTP_BASE_INFO(__m) V_system_base_info.sctppcbinfo.__m
 #define SCTP_BASE_STATS V_system_base_info.sctpstat
-#define SCTP_BASE_STATS_SYSCTL VNET_NAME(system_base_info.sctpstat)
-#define SCTP_BASE_STAT(__m)     V_system_base_info.sctpstat.__m
-#define SCTP_BASE_SYSCTL(__m) VNET_NAME(system_base_info.sctpsysctl.__m)
+#define SCTP_BASE_STAT(__m) V_system_base_info.sctpstat.__m
+#define SCTP_BASE_SYSCTL(__m) V_system_base_info.sctpsysctl.__m
 #define SCTP_BASE_VAR(__m) V_system_base_info.__m
 
-/*
- *
- */
-#define USER_ADDR_NULL	(NULL)	/* FIX ME: temp */
-
 #define SCTP_PRINTF(params...)	printf(params)
 #if defined(SCTP_DEBUG)
 #define SCTPDBG(level, params...)					\
@@ -175,9 +169,9 @@ MALLOC_DECLARE(SCTP_M_MCORE);
 #define SCTPDBG_ADDR(level, addr)					\
 {									\
 	do {								\
-	if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {			\
-		sctp_print_address(addr);				\
-	}								\
+		if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {		\
+			sctp_print_address(addr);			\
+		}							\
 	} while (0);							\
 }
 #else
@@ -328,7 +322,7 @@ typedef struct callout sctp_os_timer_t;
 /*      MTU              */
 /*************************/
 #define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index, af) ((struct ifnet *)ifn)->if_mtu
-#define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, rt) ((rt != NULL) ? rt->rt_mtu : 0)
+#define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, rt) ((uint32_t)((rt != NULL) ? rt->rt_mtu : 0))
 #define SCTP_GATHER_MTU_FROM_INTFC(sctp_ifn) ((sctp_ifn->ifn_p != NULL) ? ((struct ifnet *)(sctp_ifn->ifn_p))->if_mtu : 0)
 #define SCTP_SET_MTU_OF_ROUTE(sa, rt, mtu) do { \
                                               if (rt != NULL) \
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index e1a6a03a1c41..c9b7722f2367 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1881,7 +1881,7 @@ sctp_is_address_in_scope(struct sctp_ifa *ifa,
 		if (scope->ipv4_addr_legal) {
 			struct sockaddr_in *sin;
 
-			sin = (struct sockaddr_in *)&ifa->address.sin;
+			sin = &ifa->address.sin;
 			if (sin->sin_addr.s_addr == 0) {
 				/* not in scope , unspecified */
 				return (0);
@@ -1912,7 +1912,7 @@ sctp_is_address_in_scope(struct sctp_ifa *ifa,
 				return (0);
 			}
 			/* ok to use deprecated addresses? */
-			sin6 = (struct sockaddr_in6 *)&ifa->address.sin6;
+			sin6 = &ifa->address.sin6;
 			if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 				/* skip unspecifed addresses */
 				return (0);
@@ -1987,7 +1987,7 @@ sctp_add_addr_to_mbuf(struct mbuf *m, struct sctp_ifa *ifa, uint16_t * len)
 			struct sctp_ipv4addr_param *ipv4p;
 			struct sockaddr_in *sin;
 
-			sin = (struct sockaddr_in *)&ifa->address.sin;
+			sin = &ifa->address.sin;
 			ipv4p = (struct sctp_ipv4addr_param *)parmh;
 			parmh->param_type = htons(SCTP_IPV4_ADDRESS);
 			parmh->param_length = htons(plen);
@@ -2002,7 +2002,7 @@ sctp_add_addr_to_mbuf(struct mbuf *m, struct sctp_ifa *ifa, uint16_t * len)
 			struct sctp_ipv6addr_param *ipv6p;
 			struct sockaddr_in6 *sin6;
 
-			sin6 = (struct sockaddr_in6 *)&ifa->address.sin6;
+			sin6 = &ifa->address.sin6;
 			ipv6p = (struct sctp_ipv6addr_param *)parmh;
 			parmh->param_type = htons(SCTP_IPV6_ADDRESS);
 			parmh->param_length = htons(plen);
@@ -5921,8 +5921,8 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
 		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
 		ph->param_type = htons(SCTP_HAS_NAT_SUPPORT);
-		ph->param_length = htons(sizeof(struct sctp_paramhdr));
-		chunk_len += sizeof(struct sctp_paramhdr);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
 	}
 	/* And now tell the peer which extensions we support */
 	num_ext = 0;
@@ -11301,7 +11301,7 @@ sctp_send_hb(struct sctp_tcb *stcb, struct sctp_nets *net, int so_locked
 	hb->heartbeat.hb_info.time_value_1 = now.tv_sec;
 	hb->heartbeat.hb_info.time_value_2 = now.tv_usec;
 	/* Did our user request this one, put it in */
-	hb->heartbeat.hb_info.addr_family = net->ro._l_addr.sa.sa_family;
+	hb->heartbeat.hb_info.addr_family = (uint8_t) net->ro._l_addr.sa.sa_family;
 	hb->heartbeat.hb_info.addr_len = net->ro._l_addr.sa.sa_len;
 	if (net->dest_state & SCTP_ADDR_UNCONFIRMED) {
 		/*
@@ -13552,7 +13552,7 @@ sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t * ro)
 	}
 	ifa = (struct ifaddr *)sifa->ifa;
 	mask = (struct sockaddr_in *)(ifa->ifa_netmask);
-	sin = (struct sockaddr_in *)&sifa->address.sin;
+	sin = &sifa->address.sin;
 	srcnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr);
 	SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: src address is ");
 	SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &sifa->address.sa);
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 39348a472042..2fa99b9e6243 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -625,7 +625,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index,
 		{
 			struct sockaddr_in *sin;
 
-			sin = (struct sockaddr_in *)&sctp_ifap->address.sin;
+			sin = &sctp_ifap->address.sin;
 			if (SCTP_IFN_IS_IFT_LOOP(sctp_ifap->ifn_p) ||
 			    (IN4_ISLOOPBACK_ADDRESS(&sin->sin_addr))) {
 				sctp_ifap->src_is_loop = 1;
@@ -645,7 +645,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index,
 			/* ok to use deprecated addresses? */
 			struct sockaddr_in6 *sin6;
 
-			sin6 = (struct sockaddr_in6 *)&sctp_ifap->address.sin6;
+			sin6 = &sctp_ifap->address.sin6;
 			if (SCTP_IFN_IS_IFT_LOOP(sctp_ifap->ifn_p) ||
 			    (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))) {
 				sctp_ifap->src_is_loop = 1;
@@ -974,7 +974,7 @@ sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 				{
 					struct sockaddr_in *sin, *rsin;
 
-					sin = (struct sockaddr_in *)&laddr->ifa->address.sin;
+					sin = &laddr->ifa->address.sin;
 					rsin = (struct sockaddr_in *)to;
 					if (sin->sin_addr.s_addr == rsin->sin_addr.s_addr) {
 						SCTP_IPI_ADDR_RUNLOCK();
@@ -988,7 +988,7 @@ sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 				{
 					struct sockaddr_in6 *sin6, *rsin6;
 
-					sin6 = (struct sockaddr_in6 *)&laddr->ifa->address.sin6;
+					sin6 = &laddr->ifa->address.sin6;
 					rsin6 = (struct sockaddr_in6 *)to;
 					if (SCTP6_ARE_ADDR_EQUAL(sin6, rsin6)) {
 						SCTP_IPI_ADDR_RUNLOCK();
@@ -2330,7 +2330,7 @@ sctp_findassociation_ep_asconf(struct mbuf *m, int offset,
     struct sctp_inpcb **inp_p, struct sctp_nets **netp, uint32_t vrf_id)
 {
 	struct sctp_tcb *stcb;
-	struct sockaddr_storage remote_store;
+	union sctp_sockstore remote_store;
 	struct sctp_paramhdr parm_buf, *phdr;
 	int ptype;
 	int zero_address = 0;
@@ -2372,7 +2372,7 @@ sctp_findassociation_ep_asconf(struct mbuf *m, int offset,
 				    __FUNCTION__);
 				return (NULL);
 			}
-			sin6 = (struct sockaddr_in6 *)&remote_store;
+			sin6 = &remote_store.sin6;
 			sin6->sin6_family = AF_INET6;
 			sin6->sin6_len = sizeof(*sin6);
 			sin6->sin6_port = sh->src_port;
@@ -2399,7 +2399,7 @@ sctp_findassociation_ep_asconf(struct mbuf *m, int offset,
 				    __FUNCTION__);
 				return (NULL);
 			}
-			sin = (struct sockaddr_in *)&remote_store;
+			sin = &remote_store.sin;
 			sin->sin_family = AF_INET;
 			sin->sin_len = sizeof(*sin);
 			sin->sin_port = sh->src_port;
@@ -2422,7 +2422,7 @@ sctp_findassociation_ep_asconf(struct mbuf *m, int offset,
 		}
 	} else {
 		stcb = sctp_findassociation_ep_addr(inp_p,
-		    (struct sockaddr *)&remote_store, netp,
+		    &remote_store.sa, netp,
 		    dst, NULL);
 	}
 	return (stcb);
@@ -3126,31 +3126,21 @@ sctp_inpcb_bind(struct socket *so, struct sockaddr *addr,
 		 * too (before adding).
 		 */
 		struct sctp_ifa *ifa;
-		struct sockaddr_storage store_sa;
+		union sctp_sockstore store;
 
-		memset(&store_sa, 0, sizeof(store_sa));
+		memset(&store, 0, sizeof(store));
 		switch (addr->sa_family) {
 #ifdef INET
 		case AF_INET:
-			{
-				struct sockaddr_in *sin;
-
-				sin = (struct sockaddr_in *)&store_sa;
-				memcpy(sin, addr, sizeof(struct sockaddr_in));
-				sin->sin_port = 0;
-				break;
-			}
+			memcpy(&store.sin, addr, sizeof(struct sockaddr_in));
+			store.sin.sin_port = 0;
+			break;
 #endif
 #ifdef INET6
 		case AF_INET6:
-			{
-				struct sockaddr_in6 *sin6;
-
-				sin6 = (struct sockaddr_in6 *)&store_sa;
-				memcpy(sin6, addr, sizeof(struct sockaddr_in6));
-				sin6->sin6_port = 0;
-				break;
-			}
+			memcpy(&store.sin6, addr, sizeof(struct sockaddr_in6));
+			store.sin6.sin6_port = 0;
+			break;
 #endif
 		default:
 			break;
@@ -3168,7 +3158,7 @@ sctp_inpcb_bind(struct socket *so, struct sockaddr *addr,
 			 * pass things in via the sctp_ifap argument
 			 * (Panda).
 			 */
-			ifa = sctp_find_ifa_by_addr((struct sockaddr *)&store_sa,
+			ifa = sctp_find_ifa_by_addr(&store.sa,
 			    vrf_id, SCTP_ADDR_NOT_LOCKED);
 		}
 		if (ifa == NULL) {
@@ -5976,6 +5966,9 @@ sctp_pcb_finish(void)
 	LIST_FOREACH_SAFE(wi, &SCTP_BASE_INFO(addr_wq), sctp_nxt_addr, nwi) {
 		LIST_REMOVE(wi, sctp_nxt_addr);
 		SCTP_DECR_LADDR_COUNT();
+		if (wi->action == SCTP_DEL_IP_ADDRESS) {
+			SCTP_FREE(wi->ifa, SCTP_M_IFA);
+		}
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), wi);
 	}
 	SCTP_WQ_ADDR_UNLOCK();
@@ -6130,7 +6123,6 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 	peer_supports_prsctp = 0;
 	peer_supports_auth = 0;
 	peer_supports_asconf = 0;
-	peer_supports_asconf = 0;
 	peer_supports_reconfig = 0;
 	peer_supports_nrsack = 0;
 	peer_supports_pktdrop = 0;
@@ -6517,8 +6509,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 			}
 			got_random = 1;
 		} else if (ptype == SCTP_HMAC_LIST) {
-			int num_hmacs;
-			int i;
+			uint16_t num_hmacs;
+			uint16_t i;
 
 			if (plen > sizeof(hmacs_store))
 				break;
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index 24c456c82654..3f6d935ba173 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -418,8 +418,8 @@ TAILQ_HEAD(sctpchunk_listhead, sctp_tmit_chunk);
 #define CHUNK_FLAGS_FRAGMENT_OK	        0x0100
 
 struct chk_id {
-	uint16_t id;
-	uint16_t can_take_data;
+	uint8_t id;
+	uint8_t can_take_data;
 };
 
 
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 460be0f0defd..6280af55571c 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -105,9 +105,7 @@ sctp_init_sysctls()
 	SCTP_BASE_SYSCTL(sctp_min_residual) = SCTPCTL_MIN_RESIDUAL_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_max_retran_chunk) = SCTPCTL_MAX_RETRAN_CHUNK_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_logging_level) = SCTPCTL_LOGGING_LEVEL_DEFAULT;
-	/* JRS - Variable for default congestion control module */
 	SCTP_BASE_SYSCTL(sctp_default_cc_module) = SCTPCTL_DEFAULT_CC_MODULE_DEFAULT;
-	/* RS - Variable for default stream scheduling module */
 	SCTP_BASE_SYSCTL(sctp_default_ss_module) = SCTPCTL_DEFAULT_SS_MODULE_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_default_frag_interleave) = SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_mobility_base) = SCTPCTL_MOBILITY_BASE_DEFAULT;
@@ -139,7 +137,7 @@ sctp_init_sysctls()
 
 /* It returns an upper limit. No filtering is done here */
 static unsigned int
-number_of_addresses(struct sctp_inpcb *inp)
+sctp_sysctl_number_of_addresses(struct sctp_inpcb *inp)
 {
 	unsigned int cnt;
 	struct sctp_vrf *vrf;
@@ -189,7 +187,7 @@ number_of_addresses(struct sctp_inpcb *inp)
 }
 
 static int
-copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sysctl_req *req)
+sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sysctl_req *req)
 {
 	struct sctp_ifn *sctp_ifn;
 	struct sctp_ifa *sctp_ifa;
@@ -254,7 +252,7 @@ copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct s
 					if (ipv4_addr_legal) {
 						struct sockaddr_in *sin;
 
-						sin = (struct sockaddr_in *)&sctp_ifa->address.sa;
+						sin = &sctp_ifa->address.sin;
 						if (sin->sin_addr.s_addr == 0)
 							continue;
 						if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
@@ -273,7 +271,7 @@ copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct s
 					if (ipv6_addr_legal) {
 						struct sockaddr_in6 *sin6;
 
-						sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sa;
+						sin6 = &sctp_ifa->address.sin6;
 						if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
 							continue;
 						if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
@@ -355,7 +353,7 @@ copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct s
  * sysctl functions
  */
 static int
-sctp_assoclist(SYSCTL_HANDLER_ARGS)
+sctp_sysctl_handle_assoclist(SYSCTL_HANDLER_ARGS)
 {
 	unsigned int number_of_endpoints;
 	unsigned int number_of_local_addresses;
@@ -377,14 +375,14 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 	number_of_remote_addresses = 0;
 
 	SCTP_INP_INFO_RLOCK();
-	if (req->oldptr == USER_ADDR_NULL) {
+	if (req->oldptr == NULL) {
 		LIST_FOREACH(inp, &SCTP_BASE_INFO(listhead), sctp_list) {
 			SCTP_INP_RLOCK(inp);
 			number_of_endpoints++;
-			number_of_local_addresses += number_of_addresses(inp);
+			number_of_local_addresses += sctp_sysctl_number_of_addresses(inp);
 			LIST_FOREACH(stcb, &inp->sctp_asoc_list, sctp_tcblist) {
 				number_of_associations++;
-				number_of_local_addresses += number_of_addresses(inp);
+				number_of_local_addresses += sctp_sysctl_number_of_addresses(inp);
 				TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
 					number_of_remote_addresses++;
 				}
@@ -401,7 +399,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 		req->oldidx = (n + n / 8);
 		return (0);
 	}
-	if (req->newptr != USER_ADDR_NULL) {
+	if (req->newptr != NULL) {
 		SCTP_INP_INFO_RUNLOCK();
 		SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTP_SYSCTL, EPERM);
 		return (EPERM);
@@ -439,7 +437,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 		}
 		SCTP_INP_INFO_RLOCK();
 		SCTP_INP_RLOCK(inp);
-		error = copy_out_local_addresses(inp, NULL, req);
+		error = sctp_sysctl_copy_out_local_addresses(inp, NULL, req);
 		if (error) {
 			SCTP_INP_DECR_REF(inp);
 			return (error);
@@ -490,7 +488,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 			}
 			SCTP_INP_INFO_RLOCK();
 			SCTP_INP_RLOCK(inp);
-			error = copy_out_local_addresses(inp, stcb, req);
+			error = sctp_sysctl_copy_out_local_addresses(inp, stcb, req);
 			if (error) {
 				SCTP_INP_DECR_REF(inp);
 				atomic_subtract_int(&stcb->asoc.refcnt, 1);
@@ -558,196 +556,97 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-
-#define RANGECHK(var, min, max) \
-	if ((var) < (min)) { (var) = (min); } \
-	else if ((var) > (max)) { (var) = (max); }
-
 static int
-sysctl_sctp_udp_tunneling_check(SYSCTL_HANDLER_ARGS)
+sctp_sysctl_handle_udp_tunneling(SYSCTL_HANDLER_ARGS)
 {
 	int error;
-	uint32_t old_sctp_udp_tunneling_port;
+	uint32_t old, new;
 
 	SCTP_INP_INFO_RLOCK();
-	old_sctp_udp_tunneling_port = SCTP_BASE_SYSCTL(sctp_udp_tunneling_port);
+	old = SCTP_BASE_SYSCTL(sctp_udp_tunneling_port);
 	SCTP_INP_INFO_RUNLOCK();
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-	if (error == 0) {
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_udp_tunneling_port), SCTPCTL_UDP_TUNNELING_PORT_MIN, SCTPCTL_UDP_TUNNELING_PORT_MAX);
-		if (old_sctp_udp_tunneling_port == SCTP_BASE_SYSCTL(sctp_udp_tunneling_port)) {
-			error = 0;
-			goto out;
-		}
-		SCTP_INP_INFO_WLOCK();
-		if (old_sctp_udp_tunneling_port) {
-			sctp_over_udp_stop();
-		}
-		if (SCTP_BASE_SYSCTL(sctp_udp_tunneling_port)) {
-			if (sctp_over_udp_start()) {
-				SCTP_BASE_SYSCTL(sctp_udp_tunneling_port) = 0;
+	new = old;
+	error = sysctl_handle_int(oidp, &new, 0, req);
+	if ((error == 0) &&
+	    (req->newptr != NULL)) {
+		if ((new < SCTPCTL_UDP_TUNNELING_PORT_MIN) ||
+		    (new > SCTPCTL_UDP_TUNNELING_PORT_MAX)) {
+			error = EINVAL;
+		} else {
+			SCTP_INP_INFO_WLOCK();
+			SCTP_BASE_SYSCTL(sctp_udp_tunneling_port) = new;
+			if (old != 0) {
+				sctp_over_udp_stop();
 			}
+			if (new != 0) {
+				error = sctp_over_udp_start();
+			}
+			SCTP_INP_INFO_WUNLOCK();
 		}
-		SCTP_INP_INFO_WUNLOCK();
 	}
-out:
 	return (error);
 }
 
 
 static int
-sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
+sctp_sysctl_handle_auth(SYSCTL_HANDLER_ARGS)
+{
+	int error;
+	uint32_t new;
+
+	new = SCTP_BASE_SYSCTL(sctp_auth_enable);
+	error = sysctl_handle_int(oidp, &new, 0, req);
+	if ((error == 0) &&
+	    (req->newptr != NULL)) {
+		if ((new < SCTPCTL_AUTH_ENABLE_MIN) ||
+		    (new > SCTPCTL_AUTH_ENABLE_MAX) ||
+		    ((new == 0) && (SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1))) {
+			error = EINVAL;
+		} else {
+			SCTP_BASE_SYSCTL(sctp_auth_enable) = new;
+		}
+	}
+	return (error);
+}
+
+static int
+sctp_sysctl_handle_asconf(SYSCTL_HANDLER_ARGS)
+{
+	int error;
+	uint32_t new;
+
+	new = SCTP_BASE_SYSCTL(sctp_asconf_enable);
+	error = sysctl_handle_int(oidp, &new, 0, req);
+	if ((error == 0) &&
+	    (req->newptr != NULL)) {
+		if ((new < SCTPCTL_ASCONF_ENABLE_MIN) ||
+		    (new > SCTPCTL_ASCONF_ENABLE_MAX) ||
+		    ((new == 1) && (SCTP_BASE_SYSCTL(sctp_auth_enable) == 0))) {
+			error = EINVAL;
+		} else {
+			SCTP_BASE_SYSCTL(sctp_asconf_enable) = new;
+		}
+	}
+	return (error);
+}
+
+static int
+sctp_sysctl_handle_stats(SYSCTL_HANDLER_ARGS)
 {
 	int error;
 
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-	if (error == 0) {
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_sendspace), SCTPCTL_MAXDGRAM_MIN, SCTPCTL_MAXDGRAM_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_recvspace), SCTPCTL_RECVSPACE_MIN, SCTPCTL_RECVSPACE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_auto_asconf), SCTPCTL_AUTOASCONF_MIN, SCTPCTL_AUTOASCONF_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_ecn_enable), SCTPCTL_ECN_ENABLE_MIN, SCTPCTL_ECN_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_pr_enable), SCTPCTL_PR_ENABLE_MIN, SCTPCTL_PR_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_reconfig_enable), SCTPCTL_RECONFIG_ENABLE_MIN, SCTPCTL_RECONFIG_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_nrsack_enable), SCTPCTL_NRSACK_ENABLE_MIN, SCTPCTL_NRSACK_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_pktdrop_enable), SCTPCTL_PKTDROP_ENABLE_MIN, SCTPCTL_PKTDROP_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_strict_sacks), SCTPCTL_STRICT_SACKS_MIN, SCTPCTL_STRICT_SACKS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_peer_chunk_oh), SCTPCTL_PEER_CHKOH_MIN, SCTPCTL_PEER_CHKOH_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_max_burst_default), SCTPCTL_MAXBURST_MIN, SCTPCTL_MAXBURST_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_fr_max_burst_default), SCTPCTL_FRMAXBURST_MIN, SCTPCTL_FRMAXBURST_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue), SCTPCTL_MAXCHUNKS_MIN, SCTPCTL_MAXCHUNKS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_hashtblsize), SCTPCTL_TCBHASHSIZE_MIN, SCTPCTL_TCBHASHSIZE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_pcbtblsize), SCTPCTL_PCBHASHSIZE_MIN, SCTPCTL_PCBHASHSIZE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_min_split_point), SCTPCTL_MIN_SPLIT_POINT_MIN, SCTPCTL_MIN_SPLIT_POINT_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_chunkscale), SCTPCTL_CHUNKSCALE_MIN, SCTPCTL_CHUNKSCALE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_delayed_sack_time_default), SCTPCTL_DELAYED_SACK_TIME_MIN, SCTPCTL_DELAYED_SACK_TIME_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_sack_freq_default), SCTPCTL_SACK_FREQ_MIN, SCTPCTL_SACK_FREQ_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_system_free_resc_limit), SCTPCTL_SYS_RESOURCE_MIN, SCTPCTL_SYS_RESOURCE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit), SCTPCTL_ASOC_RESOURCE_MIN, SCTPCTL_ASOC_RESOURCE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_heartbeat_interval_default), SCTPCTL_HEARTBEAT_INTERVAL_MIN, SCTPCTL_HEARTBEAT_INTERVAL_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_pmtu_raise_time_default), SCTPCTL_PMTU_RAISE_TIME_MIN, SCTPCTL_PMTU_RAISE_TIME_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_shutdown_guard_time_default), SCTPCTL_SHUTDOWN_GUARD_TIME_MIN, SCTPCTL_SHUTDOWN_GUARD_TIME_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_secret_lifetime_default), SCTPCTL_SECRET_LIFETIME_MIN, SCTPCTL_SECRET_LIFETIME_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rto_max_default), SCTPCTL_RTO_MAX_MIN, SCTPCTL_RTO_MAX_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rto_min_default), SCTPCTL_RTO_MIN_MIN, SCTPCTL_RTO_MIN_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rto_initial_default), SCTPCTL_RTO_INITIAL_MIN, SCTPCTL_RTO_INITIAL_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_init_rto_max_default), SCTPCTL_INIT_RTO_MAX_MIN, SCTPCTL_INIT_RTO_MAX_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_valid_cookie_life_default), SCTPCTL_VALID_COOKIE_LIFE_MIN, SCTPCTL_VALID_COOKIE_LIFE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_init_rtx_max_default), SCTPCTL_INIT_RTX_MAX_MIN, SCTPCTL_INIT_RTX_MAX_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_assoc_rtx_max_default), SCTPCTL_ASSOC_RTX_MAX_MIN, SCTPCTL_ASSOC_RTX_MAX_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_path_rtx_max_default), SCTPCTL_PATH_RTX_MAX_MIN, SCTPCTL_PATH_RTX_MAX_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_path_pf_threshold), SCTPCTL_PATH_PF_THRESHOLD_MIN, SCTPCTL_PATH_PF_THRESHOLD_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_add_more_threshold), SCTPCTL_ADD_MORE_ON_OUTPUT_MIN, SCTPCTL_ADD_MORE_ON_OUTPUT_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default), SCTPCTL_INCOMING_STREAMS_MIN, SCTPCTL_INCOMING_STREAMS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default), SCTPCTL_OUTGOING_STREAMS_MIN, SCTPCTL_OUTGOING_STREAMS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_cmt_on_off), SCTPCTL_CMT_ON_OFF_MIN, SCTPCTL_CMT_ON_OFF_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_cmt_use_dac), SCTPCTL_CMT_USE_DAC_MIN, SCTPCTL_CMT_USE_DAC_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_use_cwnd_based_maxburst), SCTPCTL_CWND_MAXBURST_MIN, SCTPCTL_CWND_MAXBURST_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_nat_friendly), SCTPCTL_NAT_FRIENDLY_MIN, SCTPCTL_NAT_FRIENDLY_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_L2_abc_variable), SCTPCTL_ABC_L_VAR_MIN, SCTPCTL_ABC_L_VAR_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count), SCTPCTL_MAX_CHAINED_MBUFS_MIN, SCTPCTL_MAX_CHAINED_MBUFS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_do_drain), SCTPCTL_DO_SCTP_DRAIN_MIN, SCTPCTL_DO_SCTP_DRAIN_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_hb_maxburst), SCTPCTL_HB_MAX_BURST_MIN, SCTPCTL_HB_MAX_BURST_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_abort_if_one_2_one_hits_limit), SCTPCTL_ABORT_AT_LIMIT_MIN, SCTPCTL_ABORT_AT_LIMIT_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_strict_data_order), SCTPCTL_STRICT_DATA_ORDER_MIN, SCTPCTL_STRICT_DATA_ORDER_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_min_residual), SCTPCTL_MIN_RESIDUAL_MIN, SCTPCTL_MIN_RESIDUAL_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_max_retran_chunk), SCTPCTL_MAX_RETRAN_CHUNK_MIN, SCTPCTL_MAX_RETRAN_CHUNK_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_logging_level), SCTPCTL_LOGGING_LEVEL_MIN, SCTPCTL_LOGGING_LEVEL_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_default_cc_module), SCTPCTL_DEFAULT_CC_MODULE_MIN, SCTPCTL_DEFAULT_CC_MODULE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_default_ss_module), SCTPCTL_DEFAULT_SS_MODULE_MIN, SCTPCTL_DEFAULT_SS_MODULE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_default_frag_interleave), SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MIN, SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_vtag_time_wait), SCTPCTL_TIME_WAIT_MIN, SCTPCTL_TIME_WAIT_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_buffer_splitting), SCTPCTL_BUFFER_SPLITTING_MIN, SCTPCTL_BUFFER_SPLITTING_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_initial_cwnd), SCTPCTL_INITIAL_CWND_MIN, SCTPCTL_INITIAL_CWND_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_bw), SCTPCTL_RTTVAR_BW_MIN, SCTPCTL_RTTVAR_BW_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_rtt), SCTPCTL_RTTVAR_RTT_MIN, SCTPCTL_RTTVAR_RTT_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_rttvar_eqret), SCTPCTL_RTTVAR_EQRET_MIN, SCTPCTL_RTTVAR_EQRET_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_steady_step), SCTPCTL_RTTVAR_STEADYS_MIN, SCTPCTL_RTTVAR_STEADYS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_use_dccc_ecn), SCTPCTL_RTTVAR_DCCCECN_MIN, SCTPCTL_RTTVAR_DCCCECN_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_base), SCTPCTL_MOBILITY_BASE_MIN, SCTPCTL_MOBILITY_BASE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_mobility_fasthandoff), SCTPCTL_MOBILITY_FASTHANDOFF_MIN, SCTPCTL_MOBILITY_FASTHANDOFF_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_enable_sack_immediately), SCTPCTL_SACK_IMMEDIATELY_ENABLE_MIN, SCTPCTL_SACK_IMMEDIATELY_ENABLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_inits_include_nat_friendly), SCTPCTL_NAT_FRIENDLY_INITS_MIN, SCTPCTL_NAT_FRIENDLY_INITS_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_blackhole), SCTPCTL_BLACKHOLE_MIN, SCTPCTL_BLACKHOLE_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_diag_info_code), SCTPCTL_DIAG_INFO_CODE_MIN, SCTPCTL_DIAG_INFO_CODE_MAX);
+#if defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+	int cpu;
+	struct sctpstat sb, *sarry;
 
-#ifdef SCTP_DEBUG
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_debug_on), SCTPCTL_DEBUG_MIN, SCTPCTL_DEBUG_MAX);
 #endif
-#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_output_unlocked), SCTPCTL_OUTPUT_UNLOCKED_MIN, SCTPCTL_OUTPUT_UNLOCKED_MAX);
-#endif
-	}
-	return (error);
-}
 
-static int
-sysctl_sctp_auth_check(SYSCTL_HANDLER_ARGS)
-{
-	int error;
-
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-	if (error == 0) {
-		if (SCTP_BASE_SYSCTL(sctp_auth_enable) < SCTPCTL_AUTH_ENABLE_MIN) {
-			SCTP_BASE_SYSCTL(sctp_auth_enable) = SCTPCTL_AUTH_ENABLE_MIN;
-		}
-		if (SCTP_BASE_SYSCTL(sctp_auth_enable) > SCTPCTL_AUTH_ENABLE_MAX) {
-			SCTP_BASE_SYSCTL(sctp_auth_enable) = SCTPCTL_AUTH_ENABLE_MAX;
-		}
-		if ((SCTP_BASE_SYSCTL(sctp_auth_enable) == 0) &&
-		    (SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1)) {
-			/*
-			 * You can't disable AUTH with disabling ASCONF
-			 * first
-			 */
-			SCTP_BASE_SYSCTL(sctp_auth_enable) = 1;
-		}
-	}
-	return (error);
-}
-
-static int
-sysctl_sctp_asconf_check(SYSCTL_HANDLER_ARGS)
-{
-	int error;
-
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-	if (error == 0) {
-		if (SCTP_BASE_SYSCTL(sctp_asconf_enable) < SCTPCTL_ASCONF_ENABLE_MIN) {
-			SCTP_BASE_SYSCTL(sctp_asconf_enable) = SCTPCTL_ASCONF_ENABLE_MIN;
-		}
-		if (SCTP_BASE_SYSCTL(sctp_asconf_enable) > SCTPCTL_ASCONF_ENABLE_MAX) {
-			SCTP_BASE_SYSCTL(sctp_asconf_enable) = SCTPCTL_ASCONF_ENABLE_MAX;
-		}
-		if ((SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1) &&
-		    (SCTP_BASE_SYSCTL(sctp_auth_enable) == 0)) {
-			/*
-			 * You can't enable ASCONF without enabling AUTH
-			 * first
-			 */
-			SCTP_BASE_SYSCTL(sctp_asconf_enable) = 0;
-		}
-	}
-	return (error);
-}
-
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
-static int
-sysctl_stat_get(SYSCTL_HANDLER_ARGS)
-{
-	int cpu, error;
-	struct sctpstat sb, *sarry, *cpin = NULL;
-
-	if ((req->newptr) && (req->newlen == sizeof(struct sctpstat))) {
-		/*
-		 * User wants us to clear or at least reset the counters to
-		 * the specified values.
-		 */
-		cpin = (struct sctpstat *)req->newptr;
-	} else if (req->newptr) {
-		/* Must be a stat structure */
+	if ((req->newptr != NULL) &&
+	    (req->newlen != sizeof(struct sctpstat))) {
 		return (EINVAL);
 	}
-	memset(&sb, 0, sizeof(sb));
+#if defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+	memset(&sb, 0, sizeof(struct sctpstat));
 	for (cpu = 0; cpu < mp_maxid; cpu++) {
 		sarry = &SCTP_BASE_STATS[cpu];
 		if (sarry->sctps_discontinuitytime.tv_sec > sb.sctps_discontinuitytime.tv_sec) {
@@ -875,19 +774,29 @@ sysctl_stat_get(SYSCTL_HANDLER_ARGS)
 		sb.sctps_send_burst_avoid += sarry->sctps_send_burst_avoid;
 		sb.sctps_send_cwnd_avoid += sarry->sctps_send_cwnd_avoid;
 		sb.sctps_fwdtsn_map_over += sarry->sctps_fwdtsn_map_over;
-		if (cpin) {
-			memcpy(sarry, cpin, sizeof(struct sctpstat));
+		if (req->newptr != NULL) {
+			memcpy(sarry, req->newptr, sizeof(struct sctpstat));
 		}
 	}
-	error = SYSCTL_OUT(req, &sb, sizeof(sb));
+	error = SYSCTL_OUT(req, &sb, sizeof(struct sctpstat));
+#else
+	error = SYSCTL_OUT(req, &SCTP_BASE_STATS, sizeof(struct sctpstat));
+#endif
 	return (error);
 }
 
-#endif
-
 #if defined(SCTP_LOCAL_TRACE_BUF)
 static int
-sysctl_sctp_cleartrace(SYSCTL_HANDLER_ARGS)
+sctp_sysctl_handle_trace_log(SYSCTL_HANDLER_ARGS)
+{
+	int error;
+
+	error = SYSCTL_OUT(req, &SCTP_BASE_SYSCTL(sctp_log), sizeof(struct sctp_log));
+	return (error);
+}
+
+static int
+sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS)
 {
 	int error = 0;
 
@@ -897,326 +806,119 @@ sysctl_sctp_cleartrace(SYSCTL_HANDLER_ARGS)
 
 #endif
 
+#define SCTP_UINT_SYSCTL(mib_name, var_name, prefix)			\
+	static int							\
+	sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS)		\
+	{								\
+		int error;						\
+		uint32_t new;						\
+									\
+		new = SCTP_BASE_SYSCTL(var_name);			\
+		error = sysctl_handle_int(oidp, &new, 0, req);		\
+		if ((error == 0) && (req->newptr != NULL)) {		\
+			if ((new < prefix##_MIN) ||			\
+			    (new > prefix##_MAX)) {			\
+				error = EINVAL;				\
+			} else {					\
+				SCTP_BASE_SYSCTL(var_name) = new;	\
+			}						\
+		}							\
+		return (error);						\
+	}								\
+	SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name,			\
+	                 CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0,	\
+	                 sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC);
 
 /*
  * sysctl definitions
  */
 
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, sendspace, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_sendspace), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MAXDGRAM_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, recvspace, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_recvspace), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RECVSPACE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, auto_asconf, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_auto_asconf), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_AUTOASCONF_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, ecn_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_ecn_enable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ECN_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pr_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_pr_enable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PR_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, auth_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_auth_enable), 0, sysctl_sctp_auth_check, "IU",
-    SCTPCTL_AUTH_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, asconf_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_asconf_enable), 0, sysctl_sctp_asconf_check, "IU",
-    SCTPCTL_ASCONF_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, reconfig_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_reconfig_enable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RECONFIG_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nrsack_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_nrsack_enable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_NRSACK_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pktdrop_enable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_pktdrop_enable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PKTDROP_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, strict_sacks, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_strict_sacks), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_STRICT_SACKS_DESC);
-
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, peer_chkoh, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_peer_chunk_oh), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PEER_CHKOH_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, maxburst, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_max_burst_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MAXBURST_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, fr_maxburst, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_fr_max_burst_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_FRMAXBURST_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, maxchunks, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MAXCHUNKS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, tcbhashsize, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_hashtblsize), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_TCBHASHSIZE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pcbhashsize, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_pcbtblsize), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PCBHASHSIZE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, min_split_point, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_min_split_point), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MIN_SPLIT_POINT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, chunkscale, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_chunkscale), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_CHUNKSCALE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, delayed_sack_time, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_delayed_sack_time_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DELAYED_SACK_TIME_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, sack_freq, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_sack_freq_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_SACK_FREQ_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, sys_resource, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_system_free_resc_limit), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_SYS_RESOURCE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, asoc_resource, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ASOC_RESOURCE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, heartbeat_interval, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_heartbeat_interval_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_HEARTBEAT_INTERVAL_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pmtu_raise_time, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_pmtu_raise_time_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PMTU_RAISE_TIME_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, shutdown_guard_time, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_shutdown_guard_time_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_SHUTDOWN_GUARD_TIME_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, secret_lifetime, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_secret_lifetime_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_SECRET_LIFETIME_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rto_max, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rto_max_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTO_MAX_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rto_min, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rto_min_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTO_MIN_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rto_initial, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rto_initial_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTO_INITIAL_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, init_rto_max, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_init_rto_max_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_INIT_RTO_MAX_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, valid_cookie_life, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_valid_cookie_life_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_VALID_COOKIE_LIFE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, init_rtx_max, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_init_rtx_max_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_INIT_RTX_MAX_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, assoc_rtx_max, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_assoc_rtx_max_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ASSOC_RTX_MAX_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, path_rtx_max, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_path_rtx_max_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PATH_RTX_MAX_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, path_pf_threshold, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_path_pf_threshold), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_PATH_PF_THRESHOLD_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, add_more_on_output, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_add_more_threshold), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ADD_MORE_ON_OUTPUT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, incoming_streams, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_INCOMING_STREAMS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, outgoing_streams, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_OUTGOING_STREAMS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cmt_on_off, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_cmt_on_off), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_CMT_ON_OFF_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cmt_use_dac, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_cmt_use_dac), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_CMT_USE_DAC_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cwnd_maxburst, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_use_cwnd_based_maxburst), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_CWND_MAXBURST_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nat_friendly, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_nat_friendly), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_NAT_FRIENDLY_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, abc_l_var, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_L2_abc_variable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ABC_L_VAR_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, max_chained_mbufs, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MAX_CHAINED_MBUFS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, do_sctp_drain, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_do_drain), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DO_SCTP_DRAIN_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, hb_max_burst, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_hb_maxburst), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_HB_MAX_BURST_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, abort_at_limit, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_abort_if_one_2_one_hits_limit), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ABORT_AT_LIMIT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, strict_data_order, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_strict_data_order), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_STRICT_DATA_ORDER_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, min_residual, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_min_residual), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MIN_RESIDUAL_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, max_retran_chunk, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_max_retran_chunk), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MAX_RETRAN_CHUNK_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, log_level, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_logging_level), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_LOGGING_LEVEL_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, default_cc_module, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_default_cc_module), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DEFAULT_CC_MODULE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, default_ss_module, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_default_ss_module), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DEFAULT_SS_MODULE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, default_frag_interleave, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_default_frag_interleave), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, mobility_base, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_mobility_base), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MOBILITY_BASE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, mobility_fasthandoff, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_mobility_fasthandoff), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_MOBILITY_FASTHANDOFF_DESC);
-
+SCTP_UINT_SYSCTL(sendspace, sctp_sendspace, SCTPCTL_MAXDGRAM)
+SCTP_UINT_SYSCTL(recvspace, sctp_recvspace, SCTPCTL_RECVSPACE)
+SCTP_UINT_SYSCTL(auto_asconf, sctp_auto_asconf, SCTPCTL_AUTOASCONF)
+SCTP_UINT_SYSCTL(ecn_enable, sctp_ecn_enable, SCTPCTL_ECN_ENABLE)
+SCTP_UINT_SYSCTL(pr_enable, sctp_pr_enable, SCTPCTL_PR_ENABLE)
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, auth_enable, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+    NULL, 0, sctp_sysctl_handle_auth, "IU", SCTPCTL_AUTH_ENABLE_DESC);
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, asconf_enable, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+    NULL, 0, sctp_sysctl_handle_asconf, "IU", SCTPCTL_ASCONF_ENABLE_DESC);
+SCTP_UINT_SYSCTL(reconfig_enable, sctp_reconfig_enable, SCTPCTL_RECONFIG_ENABLE)
+SCTP_UINT_SYSCTL(nrsack_enable, sctp_nrsack_enable, SCTPCTL_NRSACK_ENABLE)
+SCTP_UINT_SYSCTL(pktdrop_enable, sctp_pktdrop_enable, SCTPCTL_PKTDROP_ENABLE)
+SCTP_UINT_SYSCTL(strict_sacks, sctp_strict_sacks, SCTPCTL_STRICT_SACKS)
+SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH)
+SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST)
+SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST)
+SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS)
+SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE)
+SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE)
+SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT)
+SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE)
+SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME)
+SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ)
+SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE)
+SCTP_UINT_SYSCTL(asoc_resource, sctp_asoc_free_resc_limit, SCTPCTL_ASOC_RESOURCE)
+SCTP_UINT_SYSCTL(heartbeat_interval, sctp_heartbeat_interval_default, SCTPCTL_HEARTBEAT_INTERVAL)
+SCTP_UINT_SYSCTL(pmtu_raise_time, sctp_pmtu_raise_time_default, SCTPCTL_PMTU_RAISE_TIME)
+SCTP_UINT_SYSCTL(shutdown_guard_time, sctp_shutdown_guard_time_default, SCTPCTL_SHUTDOWN_GUARD_TIME)
+SCTP_UINT_SYSCTL(secret_lifetime, sctp_secret_lifetime_default, SCTPCTL_SECRET_LIFETIME)
+SCTP_UINT_SYSCTL(rto_max, sctp_rto_max_default, SCTPCTL_RTO_MAX)
+SCTP_UINT_SYSCTL(rto_min, sctp_rto_min_default, SCTPCTL_RTO_MIN)
+SCTP_UINT_SYSCTL(rto_initial, sctp_rto_initial_default, SCTPCTL_RTO_INITIAL)
+SCTP_UINT_SYSCTL(init_rto_max, sctp_init_rto_max_default, SCTPCTL_INIT_RTO_MAX)
+SCTP_UINT_SYSCTL(valid_cookie_life, sctp_valid_cookie_life_default, SCTPCTL_VALID_COOKIE_LIFE)
+SCTP_UINT_SYSCTL(init_rtx_max, sctp_init_rtx_max_default, SCTPCTL_INIT_RTX_MAX)
+SCTP_UINT_SYSCTL(assoc_rtx_max, sctp_assoc_rtx_max_default, SCTPCTL_ASSOC_RTX_MAX)
+SCTP_UINT_SYSCTL(path_rtx_max, sctp_path_rtx_max_default, SCTPCTL_PATH_RTX_MAX)
+SCTP_UINT_SYSCTL(path_pf_threshold, sctp_path_pf_threshold, SCTPCTL_PATH_PF_THRESHOLD)
+SCTP_UINT_SYSCTL(add_more_on_output, sctp_add_more_threshold, SCTPCTL_ADD_MORE_ON_OUTPUT)
+SCTP_UINT_SYSCTL(incoming_streams, sctp_nr_incoming_streams_default, SCTPCTL_INCOMING_STREAMS)
+SCTP_UINT_SYSCTL(outgoing_streams, sctp_nr_outgoing_streams_default, SCTPCTL_OUTGOING_STREAMS)
+SCTP_UINT_SYSCTL(cmt_on_off, sctp_cmt_on_off, SCTPCTL_CMT_ON_OFF)
+SCTP_UINT_SYSCTL(cmt_use_dac, sctp_cmt_use_dac, SCTPCTL_CMT_USE_DAC)
+SCTP_UINT_SYSCTL(cwnd_maxburst, sctp_use_cwnd_based_maxburst, SCTPCTL_CWND_MAXBURST)
+SCTP_UINT_SYSCTL(nat_friendly, sctp_nat_friendly, SCTPCTL_NAT_FRIENDLY)
+SCTP_UINT_SYSCTL(abc_l_var, sctp_L2_abc_variable, SCTPCTL_ABC_L_VAR)
+SCTP_UINT_SYSCTL(max_chained_mbufs, sctp_mbuf_threshold_count, SCTPCTL_MAX_CHAINED_MBUFS)
+SCTP_UINT_SYSCTL(do_sctp_drain, sctp_do_drain, SCTPCTL_DO_SCTP_DRAIN)
+SCTP_UINT_SYSCTL(hb_max_burst, sctp_hb_maxburst, SCTPCTL_HB_MAX_BURST)
+SCTP_UINT_SYSCTL(abort_at_limit, sctp_abort_if_one_2_one_hits_limit, SCTPCTL_ABORT_AT_LIMIT)
+SCTP_UINT_SYSCTL(strict_data_order, sctp_strict_data_order, SCTPCTL_STRICT_DATA_ORDER)
+SCTP_UINT_SYSCTL(min_residual, sctp_min_residual, SCTPCTL_MIN_RESIDUAL)
+SCTP_UINT_SYSCTL(max_retran_chunk, sctp_max_retran_chunk, SCTPCTL_MAX_RETRAN_CHUNK)
+SCTP_UINT_SYSCTL(log_level, sctp_logging_level, SCTPCTL_LOGGING_LEVEL)
+SCTP_UINT_SYSCTL(default_cc_module, sctp_default_cc_module, SCTPCTL_DEFAULT_CC_MODULE)
+SCTP_UINT_SYSCTL(default_ss_module, sctp_default_ss_module, SCTPCTL_DEFAULT_SS_MODULE)
+SCTP_UINT_SYSCTL(default_frag_interleave, sctp_default_frag_interleave, SCTPCTL_DEFAULT_FRAG_INTERLEAVE)
+SCTP_UINT_SYSCTL(mobility_base, sctp_mobility_base, SCTPCTL_MOBILITY_BASE)
+SCTP_UINT_SYSCTL(mobility_fasthandoff, sctp_mobility_fasthandoff, SCTPCTL_MOBILITY_FASTHANDOFF)
 #if defined(SCTP_LOCAL_TRACE_BUF)
-SYSCTL_VNET_STRUCT(_net_inet_sctp, OID_AUTO, log, CTLFLAG_RD,
-    &SCTP_BASE_SYSCTL(sctp_log), sctp_log,
-    "SCTP logging (struct sctp_log)");
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, clear_trace, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_log), 0, sysctl_sctp_cleartrace, "IU",
-    "Clear SCTP Logging buffer");
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, log, CTLFLAG_VNET | CTLTYPE_STRUCT | CTLFLAG_RD,
+    NULL, 0, sctp_sysctl_handle_trace_log, "S,sctplog", "SCTP logging (struct sctp_log)");
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, clear_trace, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+    NULL, 0, sctp_sysctl_handle_trace_log_clear, "IU", "Clear SCTP Logging buffer");
 #endif
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, udp_tunneling_port, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_udp_tunneling_port), 0, sysctl_sctp_udp_tunneling_check, "IU",
-    SCTPCTL_UDP_TUNNELING_PORT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, enable_sack_immediately, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_enable_sack_immediately), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_SACK_IMMEDIATELY_ENABLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nat_friendly_init, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_inits_include_nat_friendly), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_NAT_FRIENDLY_INITS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, vtag_time_wait, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_vtag_time_wait), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_TIME_WAIT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, buffer_splitting, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_buffer_splitting), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_BUFFER_SPLITTING_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, initial_cwnd, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_initial_cwnd), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_INITIAL_CWND_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_bw, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rttvar_bw), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTTVAR_BW_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_rtt, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rttvar_rtt), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTTVAR_RTT_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_eqret, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_rttvar_eqret), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTTVAR_EQRET_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, rttvar_steady_step, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_steady_step), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTTVAR_STEADYS_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, use_dcccecn, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_use_dccc_ecn), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_RTTVAR_DCCCECN_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, blackhole, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_blackhole), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_BLACKHOLE_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, diag_info_code, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_diag_info_code), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DIAG_INFO_CODE_DESC);
-
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, udp_tunneling_port, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW,
+    NULL, 0, sctp_sysctl_handle_udp_tunneling, "IU", SCTPCTL_UDP_TUNNELING_PORT_DESC);
+SCTP_UINT_SYSCTL(enable_sack_immediately, sctp_enable_sack_immediately, SCTPCTL_SACK_IMMEDIATELY_ENABLE)
+SCTP_UINT_SYSCTL(nat_friendly_init, sctp_inits_include_nat_friendly, SCTPCTL_NAT_FRIENDLY_INITS)
+SCTP_UINT_SYSCTL(vtag_time_wait, sctp_vtag_time_wait, SCTPCTL_TIME_WAIT)
+SCTP_UINT_SYSCTL(buffer_splitting, sctp_buffer_splitting, SCTPCTL_BUFFER_SPLITTING)
+SCTP_UINT_SYSCTL(initial_cwnd, sctp_initial_cwnd, SCTPCTL_INITIAL_CWND)
+SCTP_UINT_SYSCTL(rttvar_bw, sctp_rttvar_bw, SCTPCTL_RTTVAR_BW)
+SCTP_UINT_SYSCTL(rttvar_rtt, sctp_rttvar_rtt, SCTPCTL_RTTVAR_RTT)
+SCTP_UINT_SYSCTL(rttvar_eqret, sctp_rttvar_eqret, SCTPCTL_RTTVAR_EQRET)
+SCTP_UINT_SYSCTL(rttvar_steady_step, sctp_steady_step, SCTPCTL_RTTVAR_STEADYS)
+SCTP_UINT_SYSCTL(use_dcccecn, sctp_use_dccc_ecn, SCTPCTL_RTTVAR_DCCCECN)
+SCTP_UINT_SYSCTL(blackhole, sctp_blackhole, SCTPCTL_BLACKHOLE)
+SCTP_UINT_SYSCTL(diag_info_code, sctp_diag_info_code, SCTPCTL_DIAG_INFO_CODE)
 #ifdef SCTP_DEBUG
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, debug, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_debug_on), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_DEBUG_DESC);
+SCTP_UINT_SYSCTL(debug, sctp_debug_on, SCTPCTL_DEBUG)
 #endif
-
-
 #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, output_unlocked, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_output_unlocked), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_OUTPUT_UNLOCKED_DESC);
+SCTP_UINT_SYSCTL(output_unlocked, sctp_output_unlocked, SCTPCTL_OUTPUT_UNLOCKED)
 #endif
-
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, stats,
-    CTLTYPE_STRUCT | CTLFLAG_RW,
-    0, 0, sysctl_stat_get, "S,sctpstat",
-    "SCTP statistics (struct sctp_stat)");
-#else
-SYSCTL_VNET_STRUCT(_net_inet_sctp, OID_AUTO, stats, CTLFLAG_RW,
-    &SCTP_BASE_STATS_SYSCTL, sctpstat,
-    "SCTP statistics (struct sctp_stat)");
-#endif
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, assoclist, CTLTYPE_OPAQUE | CTLFLAG_RD,
-    0, 0, sctp_assoclist,
-    "S,xassoc", "List of active SCTP associations");
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, stats, CTLFLAG_VNET | CTLTYPE_STRUCT | CTLFLAG_RW,
+    NULL, 0, sctp_sysctl_handle_stats, "S,sctpstat", "SCTP statistics (struct sctp_stat)");
+SYSCTL_PROC(_net_inet_sctp, OID_AUTO, assoclist, CTLFLAG_VNET | CTLTYPE_OPAQUE | CTLFLAG_RD,
+    NULL, 0, sctp_sysctl_handle_assoclist, "S,xassoc", "List of active SCTP associations");
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 8488919cb56f..e86910c69e55 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -143,7 +143,7 @@ struct sctp_sysctl {
 #define SCTPCTL_AUTOASCONF_DESC		"Enable SCTP Auto-ASCONF"
 #define SCTPCTL_AUTOASCONF_MIN		0
 #define SCTPCTL_AUTOASCONF_MAX		1
-#define SCTPCTL_AUTOASCONF_DEFAULT	SCTP_DEFAULT_AUTO_ASCONF
+#define SCTPCTL_AUTOASCONF_DEFAULT	1
 
 /* autoasconf: Enable SCTP Auto-ASCONF */
 #define SCTPCTL_MULTIPLEASCONFS_DESC	"Enable SCTP Muliple-ASCONFs"
@@ -474,13 +474,13 @@ struct sctp_sysctl {
 #define SCTPCTL_MOBILITY_BASE_DESC	"Enable SCTP base mobility"
 #define SCTPCTL_MOBILITY_BASE_MIN	0
 #define SCTPCTL_MOBILITY_BASE_MAX	1
-#define SCTPCTL_MOBILITY_BASE_DEFAULT	SCTP_DEFAULT_MOBILITY_BASE
+#define SCTPCTL_MOBILITY_BASE_DEFAULT	0
 
 /* mobility_fasthandoff: Enable SCTP fast handoff support */
 #define SCTPCTL_MOBILITY_FASTHANDOFF_DESC	"Enable SCTP fast handoff"
 #define SCTPCTL_MOBILITY_FASTHANDOFF_MIN	0
 #define SCTPCTL_MOBILITY_FASTHANDOFF_MAX	1
-#define SCTPCTL_MOBILITY_FASTHANDOFF_DEFAULT	SCTP_DEFAULT_MOBILITY_FASTHANDOFF
+#define SCTPCTL_MOBILITY_FASTHANDOFF_DEFAULT	0
 
 /* Enable SCTP/UDP tunneling port */
 #define SCTPCTL_UDP_TUNNELING_PORT_DESC		"Set the SCTP/UDP tunneling port"
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index da22c1fbb089..e1fa35194ba8 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1188,7 +1188,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 					if (ipv4_addr_legal) {
 						struct sockaddr_in *sin;
 
-						sin = (struct sockaddr_in *)&sctp_ifa->address.sa;
+						sin = &sctp_ifa->address.sin;
 						if (sin->sin_addr.s_addr == 0) {
 							/*
 							 * we skip
@@ -1233,7 +1233,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 					if (ipv6_addr_legal) {
 						struct sockaddr_in6 *sin6;
 
-						sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sa;
+						sin6 = &sctp_ifa->address.sin6;
 						if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 							/*
 							 * we skip
@@ -4208,12 +4208,13 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 			uint32_t i;
 
 			SCTP_CHECK_AND_CAST(shmac, optval, struct sctp_hmacalgo, optsize);
-			if (optsize < sizeof(struct sctp_hmacalgo) + shmac->shmac_number_of_idents * sizeof(uint16_t)) {
+			if ((optsize < sizeof(struct sctp_hmacalgo) + shmac->shmac_number_of_idents * sizeof(uint16_t)) ||
+			    (shmac->shmac_number_of_idents > 0xffff)) {
 				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
 				error = EINVAL;
 				break;
 			}
-			hmaclist = sctp_alloc_hmaclist(shmac->shmac_number_of_idents);
+			hmaclist = sctp_alloc_hmaclist((uint16_t) shmac->shmac_number_of_idents);
 			if (hmaclist == NULL) {
 				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOMEM);
 				error = ENOMEM;
@@ -6922,7 +6923,7 @@ sctp_ingetaddr(struct socket *so, struct sockaddr **addr)
 			if (laddr->ifa->address.sa.sa_family == AF_INET) {
 				struct sockaddr_in *sin_a;
 
-				sin_a = (struct sockaddr_in *)&laddr->ifa->address.sa;
+				sin_a = &laddr->ifa->address.sin;
 				sin->sin_addr = sin_a->sin_addr;
 				fnd = 1;
 				break;
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 6bb1001268c0..fde23efc5572 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2403,8 +2403,8 @@ sctp_calculate_rto(struct sctp_tcb *stcb,
 	net->rtt = (uint64_t) 1000000 *(uint64_t) now.tv_sec +
 	        (uint64_t) now.tv_usec;
 
-	/* computer rtt in ms */
-	rtt = net->rtt / 1000;
+	/* compute rtt in ms */
+	rtt = (int32_t) (net->rtt / 1000);
 	if ((asoc->cc_functions.sctp_rtt_calculated) && (rtt_from_sack == SCTP_RTT_FROM_DATA)) {
 		/*
 		 * Tell the CC module that a new update has just occurred
@@ -6710,7 +6710,7 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
 					if (ipv4_addr_legal) {
 						struct sockaddr_in *sin;
 
-						sin = (struct sockaddr_in *)&sctp_ifa->address.sa;
+						sin = &sctp_ifa->address.sin;
 						if (sin->sin_addr.s_addr == 0) {
 							/*
 							 * skip unspecified
@@ -6738,7 +6738,7 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
 					if (ipv6_addr_legal) {
 						struct sockaddr_in6 *sin6;
 
-						sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sa;
+						sin6 = &sctp_ifa->address.sin6;
 						if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 							continue;
 						}
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index d53323529890..a215325155f2 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -295,6 +295,7 @@ tcp_hc_lookup(struct in_conninfo *inc)
 	 */
 	TAILQ_FOREACH(hc_entry, &hc_head->hch_bucket, rmx_q) {
 		if (inc->inc_flags & INC_ISIPV6) {
+			/* XXX: check ip6_zoneid */
 			if (memcmp(&inc->inc6_faddr, &hc_entry->ip6,
 			    sizeof(inc->inc6_faddr)) == 0)
 				return hc_entry;
@@ -386,9 +387,10 @@ tcp_hc_insert(struct in_conninfo *inc)
 	 * Initialize basic information of hostcache entry.
 	 */
 	bzero(hc_entry, sizeof(*hc_entry));
-	if (inc->inc_flags & INC_ISIPV6)
-		bcopy(&inc->inc6_faddr, &hc_entry->ip6, sizeof(hc_entry->ip6));
-	else
+	if (inc->inc_flags & INC_ISIPV6) {
+		hc_entry->ip6 = inc->inc6_faddr;
+		hc_entry->ip6_zoneid = inc->inc6_zoneid;
+	} else
 		hc_entry->ip4 = inc->inc_faddr;
 	hc_entry->rmx_head = hc_head;
 	hc_entry->rmx_expire = V_tcp_hostcache.expire;
diff --git a/sys/netinet/tcp_hostcache.h b/sys/netinet/tcp_hostcache.h
index 8569edccec25..05aea125f3fb 100644
--- a/sys/netinet/tcp_hostcache.h
+++ b/sys/netinet/tcp_hostcache.h
@@ -51,6 +51,7 @@ struct hc_metrics {
 	struct	hc_head *rmx_head; /* head of bucket tail queue */
 	struct	in_addr ip4;	/* IP address */
 	struct	in6_addr ip6;	/* IP6 address */
+	uint32_t ip6_zoneid;	/* IPv6 scope zone id */
 	/* endpoint specific values for tcp */
 	u_long	rmx_mtu;	/* MTU for this path */
 	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 1be94340b035..e338b1ee573a 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -186,11 +186,17 @@ SYSCTL_VNET_INT(_net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW,
     &VNET_NAME(tcp_ecn_maxretries), 0,
     "Max retries before giving up on ECN");
 
+VNET_DEFINE(int, tcp_insecure_syn) = 0;
+#define	V_tcp_insecure_syn	VNET(tcp_insecure_syn)
+SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, insecure_syn, CTLFLAG_RW,
+    &VNET_NAME(tcp_insecure_syn), 0,
+    "Follow RFC793 instead of RFC5961 criteria for accepting SYN packets");
+
 VNET_DEFINE(int, tcp_insecure_rst) = 0;
 #define	V_tcp_insecure_rst	VNET(tcp_insecure_rst)
 SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_RW,
     &VNET_NAME(tcp_insecure_rst), 0,
-    "Follow the old (insecure) criteria for accepting RST packets");
+    "Follow RFC793 instead of RFC5961 criteria for accepting RST packets");
 
 VNET_DEFINE(int, tcp_recvspace) = 1024*64;
 #define	V_tcp_recvspace	VNET(tcp_recvspace)
@@ -2044,102 +2050,87 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 	 * Then check that at least some bytes of segment are within
 	 * receive window.  If segment begins before rcv_nxt,
 	 * drop leading data (and SYN); if nothing left, just ack.
-	 *
-	 *
-	 * If the RST bit is set, check the sequence number to see
-	 * if this is a valid reset segment.
-	 * RFC 793 page 37:
-	 *   In all states except SYN-SENT, all reset (RST) segments
-	 *   are validated by checking their SEQ-fields.  A reset is
-	 *   valid if its sequence number is in the window.
-	 * Note: this does not take into account delayed ACKs, so
-	 *   we should test against last_ack_sent instead of rcv_nxt.
-	 *   The sequence number in the reset segment is normally an
-	 *   echo of our outgoing acknowlegement numbers, but some hosts
-	 *   send a reset with the sequence number at the rightmost edge
-	 *   of our receive window, and we have to handle this case.
-	 * Note 2: Paul Watson's paper "Slipping in the Window" has shown
-	 *   that brute force RST attacks are possible.  To combat this,
-	 *   we use a much stricter check while in the ESTABLISHED state,
-	 *   only accepting RSTs where the sequence number is equal to
-	 *   last_ack_sent.  In all other states (the states in which a
-	 *   RST is more likely), the more permissive check is used.
-	 * If we have multiple segments in flight, the initial reset
-	 * segment sequence numbers will be to the left of last_ack_sent,
-	 * but they will eventually catch up.
-	 * In any case, it never made sense to trim reset segments to
-	 * fit the receive window since RFC 1122 says:
-	 *   4.2.2.12  RST Segment: RFC-793 Section 3.4
-	 *
-	 *    A TCP SHOULD allow a received RST segment to include data.
-	 *
-	 *    DISCUSSION
-	 *         It has been suggested that a RST segment could contain
-	 *         ASCII text that encoded and explained the cause of the
-	 *         RST.  No standard has yet been established for such
-	 *         data.
-	 *
-	 * If the reset segment passes the sequence number test examine
-	 * the state:
-	 *    SYN_RECEIVED STATE:
-	 *	If passive open, return to LISTEN state.
-	 *	If active open, inform user that connection was refused.
-	 *    ESTABLISHED, FIN_WAIT_1, FIN_WAIT_2, CLOSE_WAIT STATES:
-	 *	Inform user that connection was reset, and close tcb.
-	 *    CLOSING, LAST_ACK STATES:
-	 *	Close the tcb.
-	 *    TIME_WAIT STATE:
-	 *	Drop the segment - see Stevens, vol. 2, p. 964 and
-	 *      RFC 1337.
 	 */
 	if (thflags & TH_RST) {
-		if (SEQ_GEQ(th->th_seq, tp->last_ack_sent - 1) &&
-		    SEQ_LEQ(th->th_seq, tp->last_ack_sent + tp->rcv_wnd)) {
-			switch (tp->t_state) {
+		/*
+		 * RFC5961 Section 3.2
+		 *
+		 * - RST drops connection only if SEG.SEQ == RCV.NXT.
+		 * - If RST is in window, we send challenge ACK.
+		 *
+		 * Note: to take into account delayed ACKs, we should
+		 *   test against last_ack_sent instead of rcv_nxt.
+		 * Note 2: we handle special case of closed window, not
+		 *   covered by the RFC.
+		 */
+		if ((SEQ_GEQ(th->th_seq, tp->last_ack_sent) &&
+		    SEQ_LT(th->th_seq, tp->last_ack_sent + tp->rcv_wnd)) ||
+		    (tp->rcv_wnd == 0 && tp->last_ack_sent == th->th_seq)) {
 
-			case TCPS_SYN_RECEIVED:
-				so->so_error = ECONNREFUSED;
-				goto close;
+			INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
+			KASSERT(ti_locked == TI_WLOCKED,
+			    ("%s: TH_RST ti_locked %d, th %p tp %p",
+			    __func__, ti_locked, th, tp));
+			KASSERT(tp->t_state != TCPS_SYN_SENT,
+			    ("%s: TH_RST for TCPS_SYN_SENT th %p tp %p",
+			    __func__, th, tp));
 
-			case TCPS_ESTABLISHED:
-				if (V_tcp_insecure_rst == 0 &&
-				    !(SEQ_GEQ(th->th_seq, tp->rcv_nxt - 1) &&
-				    SEQ_LEQ(th->th_seq, tp->rcv_nxt + 1)) &&
-				    !(SEQ_GEQ(th->th_seq, tp->last_ack_sent - 1) &&
-				    SEQ_LEQ(th->th_seq, tp->last_ack_sent + 1))) {
-					TCPSTAT_INC(tcps_badrst);
-					goto drop;
-				}
-				/* FALLTHROUGH */
-			case TCPS_FIN_WAIT_1:
-			case TCPS_FIN_WAIT_2:
-			case TCPS_CLOSE_WAIT:
-				so->so_error = ECONNRESET;
-			close:
-				KASSERT(ti_locked == TI_WLOCKED,
-				    ("tcp_do_segment: TH_RST 1 ti_locked %d",
-				    ti_locked));
-				INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
-
-				tcp_state_change(tp, TCPS_CLOSED);
+			if (V_tcp_insecure_rst ||
+			    tp->last_ack_sent == th->th_seq) {
 				TCPSTAT_INC(tcps_drops);
-				tp = tcp_close(tp);
-				break;
-
-			case TCPS_CLOSING:
-			case TCPS_LAST_ACK:
-				KASSERT(ti_locked == TI_WLOCKED,
-				    ("tcp_do_segment: TH_RST 2 ti_locked %d",
-				    ti_locked));
-				INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
-
-				tp = tcp_close(tp);
-				break;
+				/* Drop the connection. */
+				switch (tp->t_state) {
+				case TCPS_SYN_RECEIVED:
+					so->so_error = ECONNREFUSED;
+					goto close;
+				case TCPS_ESTABLISHED:
+				case TCPS_FIN_WAIT_1:
+				case TCPS_FIN_WAIT_2:
+				case TCPS_CLOSE_WAIT:
+					so->so_error = ECONNRESET;
+				close:
+					tcp_state_change(tp, TCPS_CLOSED);
+					/* FALLTHROUGH */
+				default:
+					tp = tcp_close(tp);
+				}
+			} else {
+				TCPSTAT_INC(tcps_badrst);
+				/* Send challenge ACK. */
+				tcp_respond(tp, mtod(m, void *), th, m,
+				    tp->rcv_nxt, tp->snd_nxt, TH_ACK);
+				tp->last_ack_sent = tp->rcv_nxt;
+				m = NULL;
 			}
 		}
 		goto drop;
 	}
 
+	/*
+	 * RFC5961 Section 4.2
+	 * Send challenge ACK for any SYN in synchronized state.
+	 */
+	if ((thflags & TH_SYN) && tp->t_state != TCPS_SYN_SENT) {
+		KASSERT(ti_locked == TI_WLOCKED,
+		    ("tcp_do_segment: TH_SYN ti_locked %d", ti_locked));
+		INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
+
+		TCPSTAT_INC(tcps_badsyn);
+		if (V_tcp_insecure_syn &&
+		    SEQ_GEQ(th->th_seq, tp->last_ack_sent) &&
+		    SEQ_LT(th->th_seq, tp->last_ack_sent + tp->rcv_wnd)) {
+			tp = tcp_drop(tp, ECONNRESET);
+			rstreason = BANDLIM_UNLIMITED;
+		} else {
+			/* Send challenge ACK. */
+			tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt,
+			    tp->snd_nxt, TH_ACK);
+			tp->last_ack_sent = tp->rcv_nxt;
+			m = NULL;
+		}
+		goto drop;
+	}
+
 	/*
 	 * RFC 1323 PAWS: If we have a timestamp reply on this segment
 	 * and it's less than ts_recent, drop it.
@@ -2185,11 +2176,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 
 	todrop = tp->rcv_nxt - th->th_seq;
 	if (todrop > 0) {
-		/*
-		 * If this is a duplicate SYN for our current connection,
-		 * advance over it and pretend and it's not a SYN.
-		 */
-		if (thflags & TH_SYN && th->th_seq == tp->irs) {
+		if (thflags & TH_SYN) {
 			thflags &= ~TH_SYN;
 			th->th_seq++;
 			if (th->th_urp > 1)
@@ -2310,20 +2297,6 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 		tp->ts_recent = to.to_tsval;
 	}
 
-	/*
-	 * If a SYN is in the window, then this is an
-	 * error and we send an RST and drop the connection.
-	 */
-	if (thflags & TH_SYN) {
-		KASSERT(ti_locked == TI_WLOCKED,
-		    ("tcp_do_segment: TH_SYN ti_locked %d", ti_locked));
-		INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
-
-		tp = tcp_drop(tp, ECONNRESET);
-		rstreason = BANDLIM_UNLIMITED;
-		goto drop;
-	}
-
 	/*
 	 * If the ACK bit is off:  if in SYN-RECEIVED state or SENDSYN
 	 * flag is on (half-synchronized state), then queue data for
@@ -3618,6 +3591,8 @@ tcp_mss(struct tcpcb *tp, int offer)
 	if (cap.ifcap & CSUM_TSO) {
 		tp->t_flags |= TF_TSO;
 		tp->t_tsomax = cap.tsomax;
+		tp->t_tsomaxsegcount = cap.tsomaxsegcount;
+		tp->t_tsomaxsegsize = cap.tsomaxsegsize;
 	}
 }
 
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 12d8e754ab5b..069776754432 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -767,28 +767,113 @@ tcp_output(struct tcpcb *tp)
 		flags &= ~TH_FIN;
 
 		if (tso) {
+			u_int if_hw_tsomax;
+			u_int if_hw_tsomaxsegcount;
+			u_int if_hw_tsomaxsegsize;
+			struct mbuf *mb;
+			u_int moff;
+			int max_len;
+
+			/* extract TSO information */
+			if_hw_tsomax = tp->t_tsomax;
+			if_hw_tsomaxsegcount = tp->t_tsomaxsegcount;
+			if_hw_tsomaxsegsize = tp->t_tsomaxsegsize;
+
+			/*
+			 * Limit a TSO burst to prevent it from
+			 * overflowing or exceeding the maximum length
+			 * allowed by the network interface:
+			 */
 			KASSERT(ipoptlen == 0,
 			    ("%s: TSO can't do IP options", __func__));
 
 			/*
-			 * Limit a burst to t_tsomax minus IP,
-			 * TCP and options length to keep ip->ip_len
-			 * from overflowing or exceeding the maximum
-			 * length allowed by the network interface.
+			 * Check if we should limit by maximum payload
+			 * length:
 			 */
-			if (len > tp->t_tsomax - hdrlen) {
-				len = tp->t_tsomax - hdrlen;
-				sendalot = 1;
+			if (if_hw_tsomax != 0) {
+				/* compute maximum TSO length */
+				max_len = (if_hw_tsomax - hdrlen);
+				if (max_len <= 0) {
+					len = 0;
+				} else if (len > (u_int)max_len) {
+					sendalot = 1;
+					len = (u_int)max_len;
+				}
+			}
+
+			/*
+			 * Check if we should limit by maximum segment
+			 * size and count:
+			 */
+			if (if_hw_tsomaxsegcount != 0 && if_hw_tsomaxsegsize != 0) {
+				max_len = 0;
+				mb = sbsndmbuf(&so->so_snd, off, &moff);
+
+				while (mb != NULL && (u_int)max_len < len) {
+					u_int cur_length;
+					u_int cur_frags;
+
+					/*
+					 * Get length of mbuf fragment
+					 * and how many hardware
+					 * frags, rounded up, it would
+					 * use:
+					 */
+					cur_length = (mb->m_len - moff);
+					cur_frags = (cur_length + if_hw_tsomaxsegsize -
+					    1) / if_hw_tsomaxsegsize;
+
+					/* Handle special case: Zero Length Mbuf */
+					if (cur_frags == 0)
+						cur_frags = 1;
+
+					/*
+					 * Check if the fragment limit
+					 * will be reached or
+					 * exceeded:
+					 */
+					if (cur_frags >= if_hw_tsomaxsegcount) {
+						max_len += min(cur_length,
+						    if_hw_tsomaxsegcount *
+						    if_hw_tsomaxsegsize);
+						break;
+					}
+					max_len += cur_length;
+					if_hw_tsomaxsegcount -= cur_frags;
+					moff = 0;
+					mb = mb->m_next;
+				}
+				if (max_len <= 0) {
+					len = 0;
+				} else if (len > (u_int)max_len) {
+					sendalot = 1;
+					len = (u_int)max_len;
+				}
 			}
 
 			/*
 			 * Prevent the last segment from being
-			 * fractional unless the send sockbuf can
-			 * be emptied.
+			 * fractional unless the send sockbuf can be
+			 * emptied:
 			 */
-			if (sendalot && off + len < so->so_snd.sb_cc) {
-				len -= len % (tp->t_maxopd - optlen);
+			max_len = (tp->t_maxopd - optlen);
+			if ((off + len) < so->so_snd.sb_cc) {
+				moff = len % (u_int)max_len;
+				if (moff != 0) {
+					len -= moff;
+					sendalot = 1;
+				}
+			}
+
+			/*
+			 * In case there are too many small fragments
+			 * don't use TSO:
+			 */
+			if (len <= (u_int)max_len) {
+				len = (u_int)max_len;
 				sendalot = 1;
+				tso = 0;
 			}
 
 			/*
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index b8b08cf72425..65346f10010d 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1819,6 +1819,8 @@ tcp_maxmtu(struct in_conninfo *inc, struct tcp_ifcap *cap)
 			    ifp->if_hwassist & CSUM_TSO) {
 				cap->ifcap |= CSUM_TSO;
 				cap->tsomax = ifp->if_hw_tsomax;
+				cap->tsomaxsegcount = ifp->if_hw_tsomaxsegcount;
+				cap->tsomaxsegsize = ifp->if_hw_tsomaxsegsize;
 			}
 		}
 		RTFREE(sro.ro_rt);
@@ -1858,6 +1860,8 @@ tcp_maxmtu6(struct in_conninfo *inc, struct tcp_ifcap *cap)
 			    ifp->if_hwassist & CSUM_TSO) {
 				cap->ifcap |= CSUM_TSO;
 				cap->tsomax = ifp->if_hw_tsomax;
+				cap->tsomaxsegcount = ifp->if_hw_tsomaxsegcount;
+				cap->tsomaxsegsize = ifp->if_hw_tsomaxsegsize;
 			}
 		}
 		RTFREE(sro6.ro_rt);
@@ -1924,55 +1928,20 @@ tcp_signature_apply(void *fstate, void *data, u_int len)
 }
 
 /*
- * Compute TCP-MD5 hash of a TCP segment. (RFC2385)
- *
- * Parameters:
- * m		pointer to head of mbuf chain
- * _unused	
- * len		length of TCP segment data, excluding options
- * optlen	length of TCP segment options
- * buf		pointer to storage for computed MD5 digest
- * direction	direction of flow (IPSEC_DIR_INBOUND or OUTBOUND)
- *
- * We do this over ip, tcphdr, segment data, and the key in the SADB.
- * When called from tcp_input(), we can be sure that th_sum has been
- * zeroed out and verified already.
- *
- * Return 0 if successful, otherwise return -1.
- *
  * XXX The key is retrieved from the system's PF_KEY SADB, by keying a
  * search with the destination IP address, and a 'magic SPI' to be
  * determined by the application. This is hardcoded elsewhere to 1179
- * right now. Another branch of this code exists which uses the SPD to
- * specify per-application flows but it is unstable.
- */
-int
-tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
-    u_char *buf, u_int direction)
+*/
+struct secasvar *
+tcp_get_sav(struct mbuf *m, u_int direction)
 {
 	union sockaddr_union dst;
-#ifdef INET
-	struct ippseudo ippseudo;
-#endif
-	MD5_CTX ctx;
-	int doff;
-	struct ip *ip;
-#ifdef INET
-	struct ipovly *ipovly;
-#endif
 	struct secasvar *sav;
-	struct tcphdr *th;
+	struct ip *ip;
 #ifdef INET6
 	struct ip6_hdr *ip6;
-	struct in6_addr in6;
 	char ip6buf[INET6_ADDRSTRLEN];
-	uint32_t plen;
-	uint16_t nhdr;
 #endif
-	u_short savecsum;
-
-	KASSERT(m != NULL, ("NULL mbuf chain"));
-	KASSERT(buf != NULL, ("NULL signature pointer"));
 
 	/* Extract the destination from the IP header in the mbuf. */
 	bzero(&dst, sizeof(union sockaddr_union));
@@ -1999,7 +1968,7 @@ tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
 		break;
 #endif
 	default:
-		return (EINVAL);
+		return (NULL);
 		/* NOTREACHED */
 		break;
 	}
@@ -2014,9 +1983,61 @@ tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
 			    ip6_sprintf(ip6buf, &dst.sin6.sin6_addr) :
 #endif
 			"(unsupported)"));
-		return (EINVAL);
 	}
 
+	return (sav);
+}
+
+/*
+ * Compute TCP-MD5 hash of a TCP segment. (RFC2385)
+ *
+ * Parameters:
+ * m		pointer to head of mbuf chain
+ * len		length of TCP segment data, excluding options
+ * optlen	length of TCP segment options
+ * buf		pointer to storage for computed MD5 digest
+ * sav		pointer to security assosiation
+ *
+ * We do this over ip, tcphdr, segment data, and the key in the SADB.
+ * When called from tcp_input(), we can be sure that th_sum has been
+ * zeroed out and verified already.
+ *
+ * Releases reference to SADB key before return. 
+ *
+ * Return 0 if successful, otherwise return -1.
+ *
+ */
+int
+tcp_signature_do_compute(struct mbuf *m, int len, int optlen,
+    u_char *buf, struct secasvar *sav)
+{
+#ifdef INET
+	struct ippseudo ippseudo;
+#endif
+	MD5_CTX ctx;
+	int doff;
+	struct ip *ip;
+#ifdef INET
+	struct ipovly *ipovly;
+#endif
+	struct tcphdr *th;
+#ifdef INET6
+	struct ip6_hdr *ip6;
+	struct in6_addr in6;
+	uint32_t plen;
+	uint16_t nhdr;
+#endif
+	u_short savecsum;
+
+	KASSERT(m != NULL, ("NULL mbuf chain"));
+	KASSERT(buf != NULL, ("NULL signature pointer"));
+
+	/* Extract the destination from the IP header in the mbuf. */
+	ip = mtod(m, struct ip *);
+#ifdef INET6
+	ip6 = NULL;	/* Make the compiler happy. */
+#endif
+
 	MD5Init(&ctx);
 	/*
 	 * Step 1: Update MD5 hash with IP(v6) pseudo-header.
@@ -2073,7 +2094,7 @@ tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
 		break;
 #endif
 	default:
-		return (EINVAL);
+		return (-1);
 		/* NOTREACHED */
 		break;
 	}
@@ -2106,6 +2127,23 @@ tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
 	return (0);
 }
 
+/*
+ * Compute TCP-MD5 hash of a TCP segment. (RFC2385)
+ *
+ * Return 0 if successful, otherwise return -1.
+ */
+int
+tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
+    u_char *buf, u_int direction)
+{
+	struct secasvar *sav;
+
+	if ((sav = tcp_get_sav(m, direction)) == NULL)
+		return (-1);
+
+	return (tcp_signature_do_compute(m, len, optlen, buf, sav));
+}
+
 /*
  * Verify the TCP-MD5 hash of a TCP segment. (RFC2385)
  *
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 55a504460e6d..17f85ed38434 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -122,7 +122,7 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, syncookies_only, CTLFLAG_RW,
 static void	 syncache_drop(struct syncache *, struct syncache_head *);
 static void	 syncache_free(struct syncache *);
 static void	 syncache_insert(struct syncache *, struct syncache_head *);
-static int	 syncache_respond(struct syncache *);
+static int	 syncache_respond(struct syncache *, struct syncache_head *, int);
 static struct	 socket *syncache_socket(struct syncache *, struct socket *,
 		    struct mbuf *m);
 static void	 syncache_timeout(struct syncache *sc, struct syncache_head *sch,
@@ -467,7 +467,7 @@ syncache_timer(void *xsch)
 			free(s, M_TCPLOG);
 		}
 
-		(void) syncache_respond(sc);
+		syncache_respond(sc, sch, 1);
 		TCPSTAT_INC(tcps_sc_retransmitted);
 		syncache_timeout(sc, sch, 0);
 	}
@@ -1213,7 +1213,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 			    s, __func__);
 			free(s, M_TCPLOG);
 		}
-		if (syncache_respond(sc) == 0) {
+		if (syncache_respond(sc, sch, 1) == 0) {
 			sc->sc_rxmits = 0;
 			syncache_timeout(sc, sch, 1);
 			TCPSTAT_INC(tcps_sndacks);
@@ -1325,11 +1325,9 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 	}
 #ifdef TCP_SIGNATURE
 	/*
-	 * If listening socket requested TCP digests, and received SYN
+	 * If listening socket requested TCP digests, OR received SYN
 	 * contains the option, flag this in the syncache so that
 	 * syncache_respond() will do the right thing with the SYN+ACK.
-	 * XXX: Currently we always record the option by default and will
-	 * attempt to use it in syncache_respond().
 	 */
 	if (to->to_flags & TOF_SIGNATURE || ltflags & TF_SIGNATURE)
 		sc->sc_flags |= SCF_SIGNATURE;
@@ -1359,7 +1357,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 	/*
 	 * Do a standard 3-way handshake.
 	 */
-	if (syncache_respond(sc) == 0) {
+	if (syncache_respond(sc, sch, 0) == 0) {
 		if (V_tcp_syncookies && V_tcp_syncookiesonly && sc != &scs)
 			syncache_free(sc);
 		else if (sc != &scs)
@@ -1387,7 +1385,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 }
 
 static int
-syncache_respond(struct syncache *sc)
+syncache_respond(struct syncache *sc, struct syncache_head *sch, int locked)
 {
 	struct ip *ip = NULL;
 	struct mbuf *m;
@@ -1398,6 +1396,9 @@ syncache_respond(struct syncache *sc)
 #ifdef INET6
 	struct ip6_hdr *ip6 = NULL;
 #endif
+#ifdef TCP_SIGNATURE
+	struct secasvar *sav;
+#endif
 
 	hlen =
 #ifdef INET6
@@ -1508,8 +1509,29 @@ syncache_respond(struct syncache *sc)
 		if (sc->sc_flags & SCF_SACK)
 			to.to_flags |= TOF_SACKPERM;
 #ifdef TCP_SIGNATURE
-		if (sc->sc_flags & SCF_SIGNATURE)
-			to.to_flags |= TOF_SIGNATURE;
+		sav = NULL;
+		if (sc->sc_flags & SCF_SIGNATURE) {
+			sav = tcp_get_sav(m, IPSEC_DIR_OUTBOUND);
+			if (sav != NULL)
+				to.to_flags |= TOF_SIGNATURE;
+			else {
+
+				/*
+				 * We've got SCF_SIGNATURE flag
+				 * inherited from listening socket,
+				 * but to SADB key for given source
+				 * address. Assume signature is not
+				 * required and remove signature flag
+				 * instead of silently dropping
+				 * connection.
+				 */
+				if (locked == 0)
+					SCH_LOCK(sch);
+				sc->sc_flags &= ~SCF_SIGNATURE;
+				if (locked == 0)
+					SCH_UNLOCK(sch);
+			}
+		}
 #endif
 		optlen = tcp_addoptions(&to, (u_char *)(th + 1));
 
@@ -1520,8 +1542,8 @@ syncache_respond(struct syncache *sc)
 
 #ifdef TCP_SIGNATURE
 		if (sc->sc_flags & SCF_SIGNATURE)
-			tcp_signature_compute(m, 0, 0, optlen,
-			    to.to_signature, IPSEC_DIR_OUTBOUND);
+			tcp_signature_do_compute(m, 0, optlen,
+			    to.to_signature, sav);
 #endif
 #ifdef INET6
 		if (sc->sc_inc.inc_flags & INC_ISIPV6)
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 42c1e1d6ccd6..22a160ca2b28 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1160,10 +1160,7 @@ tcp_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 static int
 tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 {
-	struct inpcb *inp = tp->t_inpcb, *oinp;
-	struct socket *so = inp->inp_socket;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam;
-	struct in6_addr addr6;
+	struct inpcb *inp = tp->t_inpcb;
 	int error;
 
 	INP_WLOCK_ASSERT(inp);
@@ -1174,39 +1171,9 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 		if (error)
 			goto out;
 	}
-
-	/*
-	 * Cannot simply call in_pcbconnect, because there might be an
-	 * earlier incarnation of this same connection still in
-	 * TIME_WAIT state, creating an ADDRINUSE error.
-	 * in6_pcbladdr() also handles scope zone IDs.
-	 *
-	 * XXXRW: We wouldn't need to expose in6_pcblookup_hash_locked()
-	 * outside of in6_pcb.c if there were an in6_pcbconnect_setup().
-	 */
-	error = in6_pcbladdr(inp, nam, &addr6);
-	if (error)
+	error = in6_pcbconnect(inp, nam, td->td_ucred);
+	if (error != 0)
 		goto out;
-	oinp = in6_pcblookup_hash_locked(inp->inp_pcbinfo,
-				  &sin6->sin6_addr, sin6->sin6_port,
-				  IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)
-				  ? &addr6
-				  : &inp->in6p_laddr,
-				  inp->inp_lport,  0, NULL);
-	if (oinp) {
-		error = EADDRINUSE;
-		goto out;
-	}
-	if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
-		inp->in6p_laddr = addr6;
-	inp->in6p_faddr = sin6->sin6_addr;
-	inp->inp_fport = sin6->sin6_port;
-	/* update flowinfo - draft-itojun-ipv6-flowlabel-api-00 */
-	inp->inp_flow &= ~IPV6_FLOWLABEL_MASK;
-	if (inp->inp_flags & IN6P_AUTOFLOWLABEL)
-		inp->inp_flow |=
-		    (htonl(ip6_randomflowlabel()) & IPV6_FLOWLABEL_MASK);
-	in_pcbrehash(inp);
 	INP_HASH_WUNLOCK(&V_tcbinfo);
 
 	/* Compute window scaling to request.  */
@@ -1214,7 +1181,7 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
 	    (TCP_MAXWIN << tp->request_r_scale) < sb_max)
 		tp->request_r_scale++;
 
-	soisconnecting(so);
+	soisconnecting(inp->inp_socket);
 	TCPSTAT_INC(tcps_connattempt);
 	tcp_state_change(tp, TCPS_SYN_SENT);
 	tp->iss = tcp_new_isn(tp);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 5163f6e7177c..ac87f888169b 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -199,9 +199,12 @@ struct tcpcb {
 	u_int	t_keepintvl;		/* interval between keepalives */
 	u_int	t_keepcnt;		/* number of keepalives before close */
 
-	u_int	t_tsomax;		/* tso burst length limit */
+	u_int	t_tsomax;		/* TSO total burst length limit in bytes */
+
+	uint32_t t_ispare[6];		/* 5 UTO, 1 TBD */
+	uint32_t t_tsomaxsegcount;	/* TSO maximum segment count */
+	uint32_t t_tsomaxsegsize;	/* TSO maximum segment size in bytes */
 
-	uint32_t t_ispare[8];		/* 5 UTO, 3 TBD */
 	void	*t_pspare2[4];		/* 1 TCP_SIGNATURE, 3 TBD */
 	uint64_t _pad[6];		/* 6 TBD (1-2 CC/RTT?) */
 };
@@ -324,6 +327,8 @@ struct hc_metrics_lite {	/* must stay in sync with hc_metrics */
 struct tcp_ifcap {
 	int	ifcap;
 	u_int	tsomax;
+	u_int	tsomaxsegcount;
+	u_int	tsomaxsegsize;
 };
 
 #ifndef _NETINET_IN_PCB_H_
@@ -680,9 +685,15 @@ int	 tcp_twcheck(struct inpcb *, struct tcpopt *, struct tcphdr *,
 	    struct mbuf *, int);
 void	 tcp_setpersist(struct tcpcb *);
 #ifdef TCP_SIGNATURE
+struct secasvar;
+struct secasvar *tcp_get_sav(struct mbuf *, u_int);
+int	 tcp_signature_do_compute(struct mbuf *, int, int, u_char *,
+	    struct secasvar *);
 int	 tcp_signature_compute(struct mbuf *, int, int, int, u_char *, u_int);
 int	 tcp_signature_verify(struct mbuf *, int, int, int, struct tcpopt *,
 	    struct tcphdr *, u_int);
+int	tcp_signature_check(struct mbuf *m, int off0, int tlen, int optlen,
+	    struct tcpopt *to, struct tcphdr *th, u_int tcpbflag);
 #endif
 void	 tcp_slowtimo(void);
 struct tcptemp *
diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c
index 12f2c38e7ea0..1ab6c73c1ddb 100644
--- a/sys/netinet/toecore.c
+++ b/sys/netinet/toecore.c
@@ -329,7 +329,6 @@ toe_syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
 {
 	struct socket *lso = inp->inp_socket;
 
-	INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 	INP_WLOCK_ASSERT(inp);
 
 	syncache_add(inc, to, th, inp, &lso, NULL, tod, todctx);
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 5860c579e749..92edcd196849 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -89,6 +90,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/udplite.h>
+#include <netinet/in_rss.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
@@ -206,6 +208,13 @@ void
 udp_init(void)
 {
 
+	/*
+	 * For now default to 2-tuple UDP hashing - until the fragment
+	 * reassembly code can also update the flowid.
+	 *
+	 * Once we can calculate the flowid that way and re-establish
+	 * a 4-tuple, flip this to 4-tuple.
+	 */
 	in_pcbinfo_init(&V_udbinfo, "udp", &V_udb, UDBHASHSIZE, UDBHASHSIZE,
 	    "udp_inpcb", udp_inpcb_init, NULL, UMA_ZONE_NOFREE,
 	    IPI_HASHFIELDS_2TUPLE);
@@ -435,9 +444,10 @@ udp_input(struct mbuf **mp, int *offp, int proto)
 	 */
 	len = ntohs((u_short)uh->uh_ulen);
 	ip_len = ntohs(ip->ip_len) - iphlen;
-	if (proto == IPPROTO_UDPLITE && len == 0) {
+	if (proto == IPPROTO_UDPLITE && (len == 0 || len == ip_len)) {
 		/* Zero means checksum over the complete packet. */
-		len = ip_len;
+		if (len == 0)
+			len = ip_len;
 		cscov_partial = 0;
 	}
 	if (ip_len != len) {
@@ -488,8 +498,16 @@ udp_input(struct mbuf **mp, int *offp, int proto)
 			m_freem(m);
 			return (IPPROTO_DONE);
 		}
-	} else
-		UDPSTAT_INC(udps_nosum);
+	} else {
+		if (proto == IPPROTO_UDP) {
+			UDPSTAT_INC(udps_nosum);
+		} else {
+			/* UDPLite requires a checksum */
+			/* XXX: What is the right UDPLite MIB counter here? */
+			m_freem(m);
+			return (IPPROTO_DONE);
+		}
+	}
 
 	pcbinfo = get_inpcbinfo(proto);
 	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
@@ -671,7 +689,7 @@ udp_input(struct mbuf **mp, int *offp, int proto)
 		struct udpcb *up;
 
 		up = intoudpcb(inp);
-		if (up->u_rxcslen > len) {
+		if (up->u_rxcslen == 0 || up->u_rxcslen > len) {
 			INP_RUNLOCK(inp);
 			m_freem(m);
 			return (IPPROTO_DONE);
@@ -1008,7 +1026,7 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt)
 			INP_WLOCK(inp);
 			up = intoudpcb(inp);
 			KASSERT(up != NULL, ("%s: up == NULL", __func__));
-			if (optval != 0 && optval < 8) {
+			if ((optval != 0 && optval < 8) || (optval > 65535)) {
 				INP_WUNLOCK(inp);
 				error = EINVAL;
 				break;
@@ -1084,6 +1102,9 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
 	u_char tos;
 	uint8_t pr;
 	uint16_t cscov = 0;
+	uint32_t flowid = 0;
+	int flowid_type = 0;
+	int use_flowid = 0;
 
 	/*
 	 * udp_output() may need to temporarily bind or connect the current
@@ -1147,6 +1168,32 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
 				tos = *(u_char *)CMSG_DATA(cm);
 				break;
 
+			case IP_FLOWID:
+				if (cm->cmsg_len != CMSG_LEN(sizeof(uint32_t))) {
+					error = EINVAL;
+					break;
+				}
+				flowid = *(uint32_t *) CMSG_DATA(cm);
+				break;
+
+			case IP_FLOWTYPE:
+				if (cm->cmsg_len != CMSG_LEN(sizeof(uint32_t))) {
+					error = EINVAL;
+					break;
+				}
+				flowid_type = *(uint32_t *) CMSG_DATA(cm);
+				use_flowid = 1;
+				break;
+
+#ifdef	RSS
+			case IP_RSSBUCKETID:
+				if (cm->cmsg_len != CMSG_LEN(sizeof(uint32_t))) {
+					error = EINVAL;
+					break;
+				}
+				/* This is just a placeholder for now */
+				break;
+#endif	/* RSS */
 			default:
 				error = ENOPROTOOPT;
 				break;
@@ -1395,6 +1442,59 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
 	((struct ip *)ui)->ip_tos = tos;		/* XXX */
 	UDPSTAT_INC(udps_opackets);
 
+	/*
+	 * Setup flowid / RSS information for outbound socket.
+	 *
+	 * Once the UDP code decides to set a flowid some other way,
+	 * this allows the flowid to be overridden by userland.
+	 */
+	if (use_flowid) {
+		m->m_flags |= M_FLOWID;
+		m->m_pkthdr.flowid = flowid;
+		M_HASHTYPE_SET(m, flowid_type);
+#ifdef	RSS
+	} else {
+		uint32_t hash_val, hash_type;
+		/*
+		 * Calculate an appropriate RSS hash for UDP and
+		 * UDP Lite.
+		 *
+		 * The called function will take care of figuring out
+		 * whether a 2-tuple or 4-tuple hash is required based
+		 * on the currently configured scheme.
+		 *
+		 * Later later on connected socket values should be
+		 * cached in the inpcb and reused, rather than constantly
+		 * re-calculating it.
+		 *
+		 * UDP Lite is a different protocol number and will
+		 * likely end up being hashed as a 2-tuple until
+		 * RSS / NICs grow UDP Lite protocol awareness.
+		 */
+		if (rss_proto_software_hash_v4(faddr, laddr, fport, lport,
+		    pr, &hash_val, &hash_type) == 0) {
+			m->m_pkthdr.flowid = hash_val;
+			m->m_flags |= M_FLOWID;
+			M_HASHTYPE_SET(m, hash_type);
+		}
+#endif
+	}
+
+#ifdef	RSS
+	/*
+	 * Don't override with the inp cached flowid value.
+	 *
+	 * Depending upon the kind of send being done, the inp
+	 * flowid/flowtype values may actually not be appropriate
+	 * for this particular socket send.
+	 *
+	 * We should either leave the flowid at zero (which is what is
+	 * currently done) or set it to some software generated
+	 * hash value based on the packet contents.
+	 */
+	ipflags |= IP_NODEFAULTFLOWID;
+#endif	/* RSS */
+
 	if (unlock_udbinfo == UH_WLOCKED)
 		INP_HASH_WUNLOCK(pcbinfo);
 	else if (unlock_udbinfo == UH_RLOCKED)
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index a619318fad79..56f9aa199e90 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1714,6 +1714,29 @@ in6ifa_ifpforlinklocal(struct ifnet *ifp, int ignoreflags)
 }
 
 
+/*
+ * find the internet address corresponding to a given address.
+ * ifaddr is returned referenced.
+ */
+struct in6_ifaddr *
+in6ifa_ifwithaddr(const struct in6_addr *addr, uint32_t zoneid)
+{
+	struct in6_ifaddr *ia;
+
+	IN6_IFADDR_RLOCK();
+	LIST_FOREACH(ia, IN6ADDR_HASH(addr), ia6_hash) {
+		if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), addr)) {
+			if (zoneid != 0 &&
+			    zoneid != ia->ia_addr.sin6_scope_id)
+				continue;
+			ifa_ref(&ia->ia_ifa);
+			break;
+		}
+	}
+	IN6_IFADDR_RUNLOCK();
+	return (ia);
+}
+
 /*
  * find the internet address corresponding to a given interface and address.
  * ifaddr is returned referenced.
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 34daed8f46ec..5fbcf5f23d9f 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -647,9 +647,11 @@ struct ip6_hdr;
 
 int	in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t);
 int	in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t);
+int	in6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t,
+			  u_int32_t);
 int	in6_localaddr(struct in6_addr *);
 int	in6_localip(struct in6_addr *);
-int	in6_addrscope(struct in6_addr *);
+int	in6_addrscope(const struct in6_addr *);
 struct	in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *);
 extern void in6_if_up(struct ifnet *);
 struct sockaddr;
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index da8a2e6bf3c1..ce1961a60082 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -145,9 +145,11 @@ in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum)
  * off is an offset where TCP/UDP/ICMP6 header starts.
  * len is a total length of a transport segment.
  * (e.g. TCP header + TCP payload)
+ * cov is the number of bytes to be taken into account for the checksum
  */
 int
-in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
+in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off,
+    u_int32_t len, u_int32_t cov)
 {
 	struct ip6_hdr *ip6;
 	u_int16_t *w, scope;
@@ -215,9 +217,9 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
 	}
 	w = (u_int16_t *)(mtod(m, u_char *) + off);
 	mlen = m->m_len - off;
-	if (len < mlen)
-		mlen = len;
-	len -= mlen;
+	if (cov < mlen)
+		mlen = cov;
+	cov -= mlen;
 	/*
 	 * Force to even boundary.
 	 */
@@ -273,7 +275,7 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
 	 * Lastly calculate a summary of the rest of mbufs.
 	 */
 
-	for (;m && len; m = m->m_next) {
+	for (;m && cov; m = m->m_next) {
 		if (m->m_len == 0)
 			continue;
 		w = mtod(m, u_int16_t *);
@@ -290,12 +292,12 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
 			sum += s_util.s;
 			w = (u_int16_t *)((char *)w + 1);
 			mlen = m->m_len - 1;
-			len--;
+			cov--;
 		} else
 			mlen = m->m_len;
-		if (len < mlen)
-			mlen = len;
-		len -= mlen;
+		if (cov < mlen)
+			mlen = cov;
+		cov -= mlen;
 		/*
 		 * Force to even boundary.
 		 */
@@ -343,7 +345,7 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
 		} else if (mlen == -1)
 			s_util.c[0] = *(char *)w;
 	}
-	if (len)
+	if (cov)
 		panic("in6_cksum: out of data");
 	if (mlen == -1) {
 		/* The last mbuf has odd # of bytes. Follow the
@@ -355,3 +357,9 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
 	REDUCE;
 	return (~sum & 0xffff);
 }
+
+int
+in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len)
+{
+	return (in6_cksum_partial(m, nxt, off, len, len));
+}
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 65f7824f1006..2be2e8366af2 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -108,6 +108,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/in6_pcb.h>
 #include <netinet6/scope6_var.h>
 
+static struct inpcb *in6_pcblookup_hash_locked(struct inpcbinfo *,
+    struct in6_addr *, u_int, struct in6_addr *, u_int, int, struct ifnet *);
+
 int
 in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
     struct ucred *cred)
@@ -319,7 +322,7 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
  *   a bit of a kludge, but cleaning up the internal interfaces would
  *   have forced minor changes in every protocol).
  */
-int
+static int
 in6_pcbladdr(register struct inpcb *inp, struct sockaddr *nam,
     struct in6_addr *plocal_addr6)
 {
@@ -709,8 +712,9 @@ in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr,
 		 * Look for an unconnected (wildcard foreign addr) PCB that
 		 * matches the local address and port we're looking for.
 		 */
-		head = &pcbinfo->ipi_hashbase[INP_PCBHASH(INADDR_ANY, lport,
-		    0, pcbinfo->ipi_hashmask)];
+		head = &pcbinfo->ipi_hashbase[INP_PCBHASH(
+		    INP6_PCBHASHKEY(&in6addr_any), lport, 0,
+		    pcbinfo->ipi_hashmask)];
 		LIST_FOREACH(inp, head, inp_hash) {
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV6) == 0)
@@ -878,9 +882,8 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
 	 */
 	tmpinp = NULL;
 	INP_GROUP_LOCK(pcbgroup);
-	head = &pcbgroup->ipg_hashbase[
-	    INP_PCBHASH(faddr->s6_addr32[3] /* XXX */, lport, fport,
-	    pcbgroup->ipg_hashmask)];
+	head = &pcbgroup->ipg_hashbase[INP_PCBHASH(
+	    INP6_PCBHASHKEY(faddr), lport, fport, pcbgroup->ipg_hashmask)];
 	LIST_FOREACH(inp, head, inp_pcbgrouphash) {
 		/* XXX inp locking */
 		if ((inp->inp_vflag & INP_IPV6) == 0)
@@ -985,8 +988,9 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
 		 *      3. non-jailed, non-wild.
 		 *      4. non-jailed, wild.
 		 */
-		head = &pcbinfo->ipi_wildbase[INP_PCBHASH(INADDR_ANY, lport,
-		    0, pcbinfo->ipi_wildmask)];
+		head = &pcbinfo->ipi_wildbase[INP_PCBHASH(
+		    INP6_PCBHASHKEY(&in6addr_any), lport, 0,
+		    pcbinfo->ipi_wildmask)];
 		LIST_FOREACH(inp, head, inp_pcbgroup_wild) {
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV6) == 0)
@@ -1057,7 +1061,7 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
 /*
  * Lookup PCB in hash list.
  */
-struct inpcb *
+static struct inpcb *
 in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr,
     u_int fport_arg, struct in6_addr *laddr, u_int lport_arg,
     int lookupflags, struct ifnet *ifp)
@@ -1081,9 +1085,8 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr,
 	 * First look for an exact match.
 	 */
 	tmpinp = NULL;
-	head = &pcbinfo->ipi_hashbase[
-	    INP_PCBHASH(faddr->s6_addr32[3] /* XXX */, lport, fport,
-	    pcbinfo->ipi_hashmask)];
+	head = &pcbinfo->ipi_hashbase[INP_PCBHASH(
+	    INP6_PCBHASHKEY(faddr), lport, fport, pcbinfo->ipi_hashmask)];
 	LIST_FOREACH(inp, head, inp_hash) {
 		/* XXX inp locking */
 		if ((inp->inp_vflag & INP_IPV6) == 0)
@@ -1121,8 +1124,9 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr,
 		 *      3. non-jailed, non-wild.
 		 *      4. non-jailed, wild.
 		 */
-		head = &pcbinfo->ipi_hashbase[INP_PCBHASH(INADDR_ANY, lport,
-		    0, pcbinfo->ipi_hashmask)];
+		head = &pcbinfo->ipi_hashbase[INP_PCBHASH(
+		    INP6_PCBHASHKEY(&in6addr_any), lport, 0,
+		    pcbinfo->ipi_hashmask)];
 		LIST_FOREACH(inp, head, inp_hash) {
 			/* XXX inp locking */
 			if ((inp->inp_vflag & INP_IPV6) == 0)
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 19d151b7d5d4..e758dacea3b8 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -86,7 +86,6 @@ int	in6_pcbconnect(struct inpcb *, struct sockaddr *, struct ucred *);
 int	in6_pcbconnect_mbuf(struct inpcb *, struct sockaddr *,
 	    struct ucred *, struct mbuf *);
 void	in6_pcbdisconnect(struct inpcb *);
-int	in6_pcbladdr(struct inpcb *, struct sockaddr *, struct in6_addr *);
 struct	inpcb *
 	in6_pcblookup_local(struct inpcbinfo *,
 				 struct in6_addr *, u_short, int,
@@ -95,10 +94,6 @@ struct	inpcb *
 	in6_pcblookup(struct inpcbinfo *, struct in6_addr *,
 			   u_int, struct in6_addr *, u_int, int,
 			   struct ifnet *);
-struct	inpcb *
-	in6_pcblookup_hash_locked(struct inpcbinfo *, struct in6_addr *,
-			   u_int, struct in6_addr *, u_int, int,
-			   struct ifnet *);
 struct	inpcb *
 	in6_pcblookup_mbuf(struct inpcbinfo *, struct in6_addr *,
 			   u_int, struct in6_addr *, u_int, int,
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 10e833a8ae58..c1caf2c721d6 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -270,10 +270,12 @@ in6_inithead(void **head, int off)
 	if (!rn_inithead(head, offsetof(struct sockaddr_in6, sin6_addr) << 3))
 		return 0;		/* See above */
 
+	rnh = *head;
+	RADIX_NODE_HEAD_LOCK_INIT(rnh);
+
 	if (off == 0)		/* See above */
 		return 1;	/* only do the rest for the real thing */
 
-	rnh = *head;
 	rnh->rnh_addaddr = in6_addroute;
 
 	if (V__in6_rt_was_here == 0) {
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 34fa0801354b..9e163da8a41d 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -451,6 +451,16 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts,
 		if (ifa_preferred(&ia->ia_ifa, &ia_best->ia_ifa))
 			NEXT(9);
 
+		/*
+		 * Rule 10: prefer address with `prefer_source' flag.
+		 */
+		if ((ia_best->ia6_flags & IN6_IFF_PREFER_SOURCE) == 0 &&
+		    (ia->ia6_flags & IN6_IFF_PREFER_SOURCE) != 0)
+			REPLACE(10);
+		if ((ia_best->ia6_flags & IN6_IFF_PREFER_SOURCE) != 0 &&
+		    (ia->ia6_flags & IN6_IFF_PREFER_SOURCE) == 0)
+			NEXT(10);
+
 		/*
 		 * Rule 14: Use longest matching prefix.
 		 * Note: in the address selection draft, this rule is
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 70e3a94025ba..3fc7fee4fd79 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -498,6 +498,7 @@ struct	in6_rrenumreq {
 					 */
 #define IN6_IFF_AUTOCONF	0x40	/* autoconfigurable address. */
 #define IN6_IFF_TEMPORARY	0x80	/* temporary (anonymous) address. */
+#define	IN6_IFF_PREFER_SOURCE	0x0100	/* preferred address for SAS */
 #define IN6_IFF_NOPFX		0x8000	/* skip kernel prefix management.
 					 * XXX: this should be temporary.
 					 */
@@ -525,7 +526,7 @@ VNET_DECLARE(u_long, in6_ifaddrhmask);
     (&V_in6_ifaddrhashtbl[IN6ADDR_HASHVAL(x) & V_in6_ifaddrhmask])
 
 static __inline uint32_t
-in6_addrhash(struct in6_addr *in6)
+in6_addrhash(const struct in6_addr *in6)
 {
 	uint32_t x;
 
@@ -811,6 +812,7 @@ void	in6_setmaxmtu(void);
 int	in6_if2idlen(struct ifnet *);
 struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int);
 struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *);
+struct in6_ifaddr *in6ifa_ifwithaddr(const struct in6_addr *, uint32_t);
 struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *);
 char	*ip6_sprintf(char *, const struct in6_addr *);
 int	in6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *);
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index fb8cedd779be..1b1b9d058b3a 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -422,8 +422,6 @@ ip6_forward(struct mbuf *m, int srcrt)
 		if (mcopy) {
 			u_long mtu;
 #ifdef IPSEC
-			struct secpolicy *sp;
-			int ipsecerror;
 			size_t ipsechdrsiz;
 #endif /* IPSEC */
 
@@ -436,15 +434,10 @@ ip6_forward(struct mbuf *m, int srcrt)
 			 * case, as we have the outgoing interface for
 			 * encapsulated packet as "rt->rt_ifp".
 			 */
-			sp = ipsec_getpolicybyaddr(mcopy, IPSEC_DIR_OUTBOUND,
-				IP_FORWARDING, &ipsecerror);
-			if (sp) {
-				ipsechdrsiz = ipsec_hdrsiz(mcopy,
-					IPSEC_DIR_OUTBOUND, NULL);
-				if (ipsechdrsiz < mtu)
-					mtu -= ipsechdrsiz;
-			}
-
+			ipsechdrsiz = ipsec_hdrsiz(mcopy, IPSEC_DIR_OUTBOUND,
+			    NULL);
+			if (ipsechdrsiz < mtu)
+				mtu -= ipsechdrsiz;
 			/*
 			 * if mtu becomes less than minimum MTU,
 			 * tell minimum MTU (and I'll need to fragment it).
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 6f2e8927af5d..298a0d3bd078 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -227,6 +227,9 @@ in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset)
  *
  * ifpp - XXX: just for statistics
  */
+/*
+ * XXX TODO: no flowid is assigned for outbound flows?
+ */
 int
 ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
     struct route_in6 *ro, int flags, struct ip6_moptions *im6o,
@@ -252,6 +255,8 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 	struct route_in6 *ro_pmtu = NULL;
 	int hdrsplit = 0;
 	int sw_csum, tso;
+	int needfiblookup;
+	uint32_t fibnum;
 	struct m_tag *fwd_tag = NULL;
 
 	ip6 = mtod(m, struct ip6_hdr *);
@@ -260,8 +265,14 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 		goto bad;
 	}
 
-	if (inp != NULL)
+	if (inp != NULL) {
 		M_SETFIB(m, inp->inp_inc.inc_fibnum);
+		if (((flags & IP_NODEFAULTFLOWID) == 0) &&
+		(inp->inp_flags & (INP_HW_FLOWID|INP_SW_FLOWID))) {
+			m->m_pkthdr.flowid = inp->inp_flowid;
+			m->m_flags |= M_FLOWID;
+		}
+	}
 
 	finaldst = ip6->ip6_dst;
 	bzero(&exthdrs, sizeof(exthdrs));
@@ -439,6 +450,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 	if (ro->ro_rt == NULL)
 		(void )flowtable_lookup(AF_INET6, m, (struct route *)ro);
 #endif
+	fibnum = (inp != NULL) ? inp->inp_inc.inc_fibnum : M_GETFIB(m);
 again:
 	/*
 	 * if specified, try to fill in the traffic class field.
@@ -480,7 +492,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 			dst_sa.sin6_addr = ip6->ip6_dst;
 		}
 		error = in6_selectroute_fib(&dst_sa, opt, im6o, ro, &ifp,
-		    &rt, inp ? inp->inp_inc.inc_fibnum : M_GETFIB(m));
+		    &rt, fibnum);
 		if (error != 0) {
 			if (ifp != NULL)
 				in6_ifstat_inc(ifp, ifs6_out_discard);
@@ -640,7 +652,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 
 	/* Determine path MTU. */
 	if ((error = ip6_getpmtu(ro_pmtu, ro, ifp, &finaldst, &mtu,
-	    &alwaysfrag, inp ? inp->inp_inc.inc_fibnum : M_GETFIB(m))) != 0)
+	    &alwaysfrag, fibnum)) != 0)
 		goto bad;
 
 	/*
@@ -718,6 +730,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 		goto done;
 	ip6 = mtod(m, struct ip6_hdr *);
 
+	needfiblookup = 0;
 	/* See if destination IP address was changed by packet filter. */
 	if (!IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst)) {
 		m->m_flags |= M_SKIP_FIREWALL;
@@ -738,8 +751,17 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt,
 			error = netisr_queue(NETISR_IPV6, m);
 			goto done;
 		} else
-			goto again;	/* Redo the routing table lookup. */
+			needfiblookup = 1; /* Redo the routing table lookup. */
 	}
+	/* See if fib was changed by packet filter. */
+	if (fibnum != M_GETFIB(m)) {
+		m->m_flags |= M_SKIP_FIREWALL;
+		fibnum = M_GETFIB(m);
+		RO_RTFREE(ro);
+		needfiblookup = 1;
+	}
+	if (needfiblookup)
+		goto again;
 
 	/* See if local, if yes, send it to netisr. */
 	if (m->m_flags & M_FASTFWD_OURS) {
@@ -2550,7 +2572,8 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
 		    sticky && !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) {
 			return (EINVAL);
 		}
-
+		if (IN6_IS_ADDR_MULTICAST(&pktinfo->ipi6_addr))
+			return (EINVAL);
 		/* validate the interface index if specified. */
 		if (pktinfo->ipi6_ifindex > V_if_index)
 			 return (ENXIO);
@@ -2559,7 +2582,19 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
 			if (ifp == NULL)
 				return (ENXIO);
 		}
+		if (ifp != NULL && (
+		    ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED))
+			return (ENETDOWN);
 
+		if (ifp != NULL &&
+		    !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) {
+			struct in6_ifaddr *ia;
+
+			ia = in6ifa_ifpwithaddr(ifp, &pktinfo->ipi6_addr);
+			if (ia == NULL)
+				return (EADDRNOTAVAIL);
+			ifa_free(&ia->ia_ifa);
+		}
 		/*
 		 * We store the address anyway, and let in6_selectsrc()
 		 * validate the specified address.  This is because ipi6_addr
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 54366eecd948..e48cb8a7e5f5 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -945,7 +945,7 @@ nd6_is_new_addr_neighbor(struct sockaddr_in6 *addr, struct ifnet *ifp)
 	 * If the address is assigned on the node of the other side of
 	 * a p2p interface, the address should be a neighbor.
 	 */
-	dstaddr = ifa_ifwithdstaddr((struct sockaddr *)addr);
+	dstaddr = ifa_ifwithdstaddr((struct sockaddr *)addr, RT_ALL_FIBS);
 	if (dstaddr != NULL) {
 		if (dstaddr->ifa_ifp == ifp) {
 			ifa_free(dstaddr);
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index d0c665597a9f..63e925b99536 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -100,22 +100,14 @@ scope6_ifattach(struct ifnet *ifp)
 {
 	struct scope6_id *sid;
 
-	sid = (struct scope6_id *)malloc(sizeof(*sid), M_IFADDR, M_WAITOK);
-	bzero(sid, sizeof(*sid));
-
+	sid = malloc(sizeof(*sid), M_IFADDR, M_WAITOK | M_ZERO);
 	/*
 	 * XXX: IPV6_ADDR_SCOPE_xxx macros are not standard.
 	 * Should we rather hardcode here?
 	 */
 	sid->s6id_list[IPV6_ADDR_SCOPE_INTFACELOCAL] = ifp->if_index;
 	sid->s6id_list[IPV6_ADDR_SCOPE_LINKLOCAL] = ifp->if_index;
-#ifdef MULTI_SCOPE
-	/* by default, we don't care about scope boundary for these scopes. */
-	sid->s6id_list[IPV6_ADDR_SCOPE_SITELOCAL] = 1;
-	sid->s6id_list[IPV6_ADDR_SCOPE_ORGLOCAL] = 1;
-#endif
-
-	return sid;
+	return (sid);
 }
 
 void
@@ -235,62 +227,24 @@ scope6_get(struct ifnet *ifp, struct scope6_id *idlist)
  * Get a scope of the address. Node-local, link-local, site-local or global.
  */
 int
-in6_addrscope(struct in6_addr *addr)
+in6_addrscope(const struct in6_addr *addr)
 {
-	int scope;
-
-	if (addr->s6_addr[0] == 0xfe) {
-		scope = addr->s6_addr[1] & 0xc0;
-
-		switch (scope) {
-		case 0x80:
-			return IPV6_ADDR_SCOPE_LINKLOCAL;
-			break;
-		case 0xc0:
-			return IPV6_ADDR_SCOPE_SITELOCAL;
-			break;
-		default:
-			return IPV6_ADDR_SCOPE_GLOBAL; /* just in case */
-			break;
-		}
-	}
-
-
-	if (addr->s6_addr[0] == 0xff) {
-		scope = addr->s6_addr[1] & 0x0f;
 
+	if (IN6_IS_ADDR_MULTICAST(addr)) {
 		/*
-		 * due to other scope such as reserved,
-		 * return scope doesn't work.
+		 * Addresses with reserved value F must be treated as
+		 * global multicast addresses.
 		 */
-		switch (scope) {
-		case IPV6_ADDR_SCOPE_INTFACELOCAL:
-			return IPV6_ADDR_SCOPE_INTFACELOCAL;
-			break;
-		case IPV6_ADDR_SCOPE_LINKLOCAL:
-			return IPV6_ADDR_SCOPE_LINKLOCAL;
-			break;
-		case IPV6_ADDR_SCOPE_SITELOCAL:
-			return IPV6_ADDR_SCOPE_SITELOCAL;
-			break;
-		default:
-			return IPV6_ADDR_SCOPE_GLOBAL;
-			break;
-		}
+		if (IPV6_ADDR_MC_SCOPE(addr) == 0x0f)
+			return (IPV6_ADDR_SCOPE_GLOBAL);
+		return (IPV6_ADDR_MC_SCOPE(addr));
 	}
-
-	/*
-	 * Regard loopback and unspecified addresses as global, since
-	 * they have no ambiguity.
-	 */
-	if (bcmp(&in6addr_loopback, addr, sizeof(*addr) - 1) == 0) {
-		if (addr->s6_addr[15] == 1) /* loopback */
-			return IPV6_ADDR_SCOPE_LINKLOCAL;
-		if (addr->s6_addr[15] == 0) /* unspecified */
-			return IPV6_ADDR_SCOPE_GLOBAL; /* XXX: correct? */
-	}
-
-	return IPV6_ADDR_SCOPE_GLOBAL;
+	if (IN6_IS_ADDR_LINKLOCAL(addr) ||
+	    IN6_IS_ADDR_LOOPBACK(addr))
+		return (IPV6_ADDR_SCOPE_LINKLOCAL);
+	if (IN6_IS_ADDR_SITELOCAL(addr))
+		return (IPV6_ADDR_SCOPE_SITELOCAL);
+	return (IPV6_ADDR_SCOPE_GLOBAL);
 }
 
 /*
@@ -505,3 +459,77 @@ in6_getscope(struct in6_addr *in6)
 
 	return (0);
 }
+
+/*
+ * Return pointer to ifnet structure, corresponding to the zone id of
+ * link-local scope.
+ */
+struct ifnet*
+in6_getlinkifnet(uint32_t zoneid)
+{
+
+	return (ifnet_byindex((u_short)zoneid));
+}
+
+/*
+ * Return zone id for the specified scope.
+ */
+uint32_t
+in6_getscopezone(const struct ifnet *ifp, int scope)
+{
+
+	if (scope == IPV6_ADDR_SCOPE_INTFACELOCAL ||
+	    scope == IPV6_ADDR_SCOPE_LINKLOCAL)
+		return (ifp->if_index);
+	if (scope >= 0 && scope < IPV6_ADDR_SCOPES_COUNT)
+		return (SID(ifp)->s6id_list[scope]);
+	return (0);
+}
+
+/*
+ * This function is for checking sockaddr_in6 structure passed
+ * from the application level (usually).
+ *
+ * sin6_scope_id should be set for link-local unicast, link-local and
+ * interface-local  multicast addresses.
+ *
+ * If it is zero, then look into default zone ids. If default zone id is
+ * not set or disabled, then return error.
+ */
+int
+sa6_checkzone(struct sockaddr_in6 *sa6)
+{
+	int scope;
+
+	scope = in6_addrscope(&sa6->sin6_addr);
+	if (scope == IPV6_ADDR_SCOPE_GLOBAL)
+		return (sa6->sin6_scope_id ? EINVAL: 0);
+	if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr) &&
+	    scope != IPV6_ADDR_SCOPE_LINKLOCAL &&
+	    scope != IPV6_ADDR_SCOPE_INTFACELOCAL) {
+		if (sa6->sin6_scope_id == 0 && V_ip6_use_defzone != 0)
+			sa6->sin6_scope_id = V_sid_default.s6id_list[scope];
+		return (0);
+	}
+	/*
+	 * Since ::1 address always configured on the lo0, we can
+	 * automatically set its zone id, when it is not specified.
+	 * Return error, when specified zone id doesn't match with
+	 * actual value.
+	 */
+	if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr)) {
+		if (sa6->sin6_scope_id == 0)
+			sa6->sin6_scope_id = in6_getscopezone(V_loif, scope);
+		else if (sa6->sin6_scope_id != in6_getscopezone(V_loif, scope))
+			return (EADDRNOTAVAIL);
+	}
+	/* XXX: we can validate sin6_scope_id here */
+	if (sa6->sin6_scope_id != 0)
+		return (0);
+	if (V_ip6_use_defzone != 0)
+		sa6->sin6_scope_id = V_sid_default.s6id_list[scope];
+	/* Return error if we can't determine zone id */
+	return (sa6->sin6_scope_id ? 0: EADDRNOTAVAIL);
+}
+
+
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index 3398bbe6bd04..8a4b6fcf7754 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -36,12 +36,13 @@
 #ifdef _KERNEL
 #include <net/vnet.h>
 
+#define	IPV6_ADDR_SCOPES_COUNT	16
 struct scope6_id {
 	/*
 	 * 16 is correspondent to 4bit multicast scope field.
 	 * i.e. from node-local to global with some reserved/unassigned types.
 	 */
-	u_int32_t s6id_list[16];
+	uint32_t s6id_list[IPV6_ADDR_SCOPES_COUNT];
 };
 
 VNET_DECLARE(int, deembed_scopeid);
@@ -56,9 +57,12 @@ int	scope6_get_default(struct scope6_id *);
 u_int32_t scope6_addr2default(struct in6_addr *);
 int	sa6_embedscope(struct sockaddr_in6 *, int);
 int	sa6_recoverscope(struct sockaddr_in6 *);
+int	sa6_checkzone(struct sockaddr_in6 *);
 int	in6_setscope(struct in6_addr *, struct ifnet *, u_int32_t *);
 int	in6_clearscope(struct in6_addr *);
 uint16_t in6_getscope(struct in6_addr *);
+uint32_t in6_getscopezone(const struct ifnet *, int);
+struct ifnet* in6_getlinkifnet(uint32_t);
 #endif /* _KERNEL */
 
 #endif /* _NETINET6_SCOPE6_VAR_H_ */
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 6c9f9ee1fc3e..a2393ec51202 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -844,7 +844,7 @@ sctp6_connect(struct socket *so, struct sockaddr *addr, struct thread *p)
 #ifdef INET
 	struct in6pcb *inp6;
 	struct sockaddr_in6 *sin6;
-	struct sockaddr_storage ss;
+	union sctp_sockstore store;
 
 #endif
 
@@ -928,8 +928,8 @@ sctp6_connect(struct socket *so, struct sockaddr *addr, struct thread *p)
 	}
 	if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
 		/* convert v4-mapped into v4 addr */
-		in6_sin6_2_sin((struct sockaddr_in *)&ss, sin6);
-		addr = (struct sockaddr *)&ss;
+		in6_sin6_2_sin(&store.sin, sin6);
+		addr = &store.sa;
 	}
 #endif				/* INET */
 	/* Now do we connect? */
@@ -1057,7 +1057,7 @@ sctp6_getaddr(struct socket *so, struct sockaddr **addr)
 			if (laddr->ifa->address.sa.sa_family == AF_INET6) {
 				struct sockaddr_in6 *sin_a;
 
-				sin_a = (struct sockaddr_in6 *)&laddr->ifa->address.sin6;
+				sin_a = &laddr->ifa->address.sin6;
 				sin6->sin6_addr = sin_a->sin6_addr;
 				fnd = 1;
 				break;
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 63afbef82ae8..e36f77896e59 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
+#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>
@@ -111,6 +112,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/udplite.h>
+#include <netinet/in_rss.h>
 
 #include <netinet6/ip6protosw.h>
 #include <netinet6/ip6_var.h>
@@ -225,21 +227,26 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 
 	nxt = ip6->ip6_nxt;
 	cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0;
-	if (nxt == IPPROTO_UDPLITE && ulen == 0) {
+	if (nxt == IPPROTO_UDPLITE) {
 		/* Zero means checksum over the complete packet. */
-		ulen = plen;
-		cscov_partial = 0;
-	}
-	if (plen != ulen) {
-		UDPSTAT_INC(udps_badlen);
-		goto badunlocked;
-	}
-
-	/*
-	 * Checksum extended UDP header and data.
-	 */
-	if (uh->uh_sum == 0) {
-		if (ulen > plen || ulen < sizeof(struct udphdr)) {
+		if (ulen == 0)
+			ulen = plen;
+		if (ulen == plen)
+			cscov_partial = 0;
+		if ((ulen < sizeof(struct udphdr)) || (ulen > plen)) {
+			/* XXX: What is the right UDPLite MIB counter? */
+			goto badunlocked;
+		}
+		if (uh->uh_sum == 0) {
+			/* XXX: What is the right UDPLite MIB counter? */
+			goto badunlocked;
+		}
+	} else {
+		if ((ulen < sizeof(struct udphdr)) || (plen != ulen)) {
+			UDPSTAT_INC(udps_badlen);
+			goto badunlocked;
+		}
+		if (uh->uh_sum == 0) {
 			UDPSTAT_INC(udps_nosum);
 			goto badunlocked;
 		}
@@ -254,11 +261,11 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 			    m->m_pkthdr.csum_data);
 		uh_sum ^= 0xffff;
 	} else
-		uh_sum = in6_cksum(m, nxt, off, ulen);
+		uh_sum = in6_cksum_partial(m, nxt, off, plen, ulen);
 
 	if (uh_sum != 0) {
 		UDPSTAT_INC(udps_badsum);
-		goto badunlocked;
+		/*goto badunlocked;*/
 	}
 
 	/*
@@ -478,7 +485,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 	INP_RLOCK_ASSERT(inp);
 	up = intoudpcb(inp);
 	if (cscov_partial) {
-		if (up->u_rxcslen > ulen) {
+		if (up->u_rxcslen == 0 || up->u_rxcslen > ulen) {
 			INP_RUNLOCK(inp);
 			m_freem(m);
 			return (IPPROTO_DONE);
@@ -841,8 +848,8 @@ udp6_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr6,
 		ip6->ip6_dst	= *faddr;
 
 		if (cscov_partial) {
-			if ((udp6->uh_sum = in6_cksum(m, 0,
-			    sizeof(struct ip6_hdr), cscov)) == 0)
+			if ((udp6->uh_sum = in6_cksum_partial(m, nxt,
+			    sizeof(struct ip6_hdr), plen, cscov)) == 0)
 				udp6->uh_sum = 0xffff;
 		} else {
 			udp6->uh_sum = in6_cksum_pseudo(ip6, plen, nxt, 0);
@@ -850,8 +857,30 @@ udp6_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr6,
 			m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum);
 		}
 
+		/*
+		 * XXX for now assume UDP is 2-tuple.
+		 * Later on this may become configurable as 4-tuple;
+		 * we should support that.
+		 *
+		 * XXX .. and we should likely cache this in the inpcb.
+		 */
+#ifdef	RSS
+		m->m_pkthdr.flowid = rss_hash_ip6_2tuple(*faddr, *laddr);
+		m->m_flags |= M_FLOWID;
+		M_HASHTYPE_SET(m, M_HASHTYPE_RSS_IPV6);
+#endif
 		flags = 0;
 
+#ifdef	RSS
+		/*
+		 * Don't override with the inp cached flowid.
+		 *
+		 * Until the whole UDP path is vetted, it may actually
+		 * be incorrect.
+		 */
+		flags |= IP_NODEFAULTFLOWID;
+#endif
+
 		UDP_PROBE(send, NULL, inp, ip6, inp, udp6);
 		UDPSTAT_INC(udps_opackets);
 		error = ip6_output(m, optp, NULL, flags, inp->in6p_moptions,
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 717ae9a805f7..b778fe5def23 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -376,8 +376,8 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 	prot = ip->ip_p;
 
 #ifdef DEV_ENC
-	encif->if_ipackets++;
-	encif->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(encif, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(encif, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	/*
 	 * Pass the mbuf to enc0 for bpf and pfil. We will filter the IPIP
@@ -391,7 +391,8 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 #endif /* DEV_ENC */
 
 	/* IP-in-IP encapsulation */
-	if (prot == IPPROTO_IPIP) {
+	if (prot == IPPROTO_IPIP &&
+	    saidx->mode != IPSEC_MODE_TRANSPORT) {
 
 		if (m->m_pkthdr.len - skip < sizeof(struct ip)) {
 			IPSEC_ISTAT(sproto, hdrops);
@@ -431,7 +432,8 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 	}
 #ifdef INET6
 	/* IPv6-in-IP encapsulation. */
-	if (prot == IPPROTO_IPV6) {
+	if (prot == IPPROTO_IPV6 &&
+	    saidx->mode != IPSEC_MODE_TRANSPORT) {
 
 		if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) {
 			IPSEC_ISTAT(sproto, hdrops);
@@ -502,6 +504,12 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 
 	key_sa_recordxfer(sav, m);		/* record data transfer */
 
+	/*
+	 * In transport mode requeue decrypted mbuf back to IPv4 protocol
+	 * handler. This is necessary to correctly expose rcvif.
+	 */
+	if (saidx->mode == IPSEC_MODE_TRANSPORT)
+		prot = IPPROTO_IPIP;
 #ifdef DEV_ENC
 	/*
 	 * Pass the mbuf to enc0 for bpf and pfil.
@@ -663,8 +671,8 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto
 	m_copydata(m, protoff, 1, (unsigned char *) &prot);
 
 #ifdef DEV_ENC
-	encif->if_ipackets++;
-	encif->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(encif, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(encif, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 
 	/*
 	 * Pass the mbuf to enc0 for bpf and pfil. We will filter the IPIP
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 8566bb4ffa38..1f03196453d9 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -441,8 +441,8 @@ ipsec4_process_packet(
 	sav = isr->sav;
 
 #ifdef DEV_ENC
-	encif->if_opackets++;
-	encif->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(encif, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(encif, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	/* pass the mbuf to enc0 for bpf processing */
 	ipsec_bpf(m, sav, AF_INET, ENC_OUT|ENC_BEFORE);
@@ -641,8 +641,8 @@ ipsec6_process_packet(
 	dst = &sav->sah->saidx.dst;
 
 #ifdef DEV_ENC
-	encif->if_opackets++;
-	encif->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(encif, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(encif, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 
 	/* pass the mbuf to enc0 for bpf processing */
 	ipsec_bpf(m, isr->sav, AF_INET6, ENC_OUT|ENC_BEFORE);
diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index df298ae2dea8..b4cb69040f4a 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -751,10 +751,15 @@ dummynet_send(struct mbuf *m)
 			/* extract the dummynet info, rename the tag
 			 * to carry reinject info.
 			 */
-			dst = pkt->dn_dir;
-			ifp = pkt->ifp;
-			tag->m_tag_cookie = MTAG_IPFW_RULE;
-			tag->m_tag_id = 0;
+			if (pkt->dn_dir == (DIR_OUT | PROTO_LAYER2) &&
+				pkt->ifp == NULL) {
+				dst = DIR_DROP;
+			} else {
+				dst = pkt->dn_dir;
+				ifp = pkt->ifp;
+				tag->m_tag_cookie = MTAG_IPFW_RULE;
+				tag->m_tag_id = 0;
+			}
 		}
 
 		switch (dst) {
diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index 30e345724bb0..4f34eeeac9b6 100644
--- a/sys/netpfil/pf/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
@@ -159,7 +159,6 @@ pflogstart(struct ifnet *ifp)
 
 	for (;;) {
 		IF_LOCK(&ifp->if_snd);
-		_IF_DROP(&ifp->if_snd);
 		_IF_DEQUEUE(&ifp->if_snd, m);
 		IF_UNLOCK(&ifp->if_snd);
 
@@ -253,8 +252,8 @@ pflog_packet(struct pfi_kif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir,
 	}
 #endif /* INET */
 
-	ifn->if_opackets++;
-	ifn->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m);
 
 	return (0);
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index ffefbc4a883c..813f6596e9aa 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -598,8 +598,8 @@ pfsync_input(struct mbuf **mp, int *offp __unused, int proto __unused)
 		goto done;
 	}
 
-	sc->sc_ifp->if_ipackets++;
-	sc->sc_ifp->if_ibytes += m->m_pkthdr.len;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
 	/* verify that the IP TTL is 255. */
 	if (ip->ip_ttl != PFSYNC_DFLTTL) {
 		V_pfsyncstats.pfsyncs_badttl++;
@@ -1525,7 +1525,7 @@ pfsync_sendout(int schedswi)
 
 	m = m_get2(max_linkhdr + sc->sc_len, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
-		sc->sc_ifp->if_oerrors++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
 		V_pfsyncstats.pfsyncs_onomem++;
 		return;
 	}
@@ -1632,15 +1632,15 @@ pfsync_sendout(int schedswi)
 		return;
 	}
 
-	sc->sc_ifp->if_opackets++;
-	sc->sc_ifp->if_obytes += m->m_pkthdr.len;
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1);
+	if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
 	sc->sc_len = PFSYNC_MINPKT;
 
 	if (!_IF_QFULL(&sc->sc_ifp->if_snd))
 		_IF_ENQUEUE(&sc->sc_ifp->if_snd, m);
 	else {
 		m_freem(m);
-		sc->sc_ifp->if_snd.ifq_drops++;
+		if_inc_counter(sc->sc_ifp, IFCOUNTER_OQDROPS, 1);
 	}
 	if (schedswi)
 		swi_sched(V_pfsync_swi_cookie, 0);
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 195aeb381461..dba56745fae8 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -191,6 +191,7 @@ static volatile VNET_DEFINE(int, pf_pfil_hooked);
 VNET_DEFINE(int,		pf_end_threads);
 
 struct rwlock			pf_rules_lock;
+struct sx			pf_ioctl_lock;
 
 /* pfsync */
 pfsync_state_import_t 		*pfsync_state_import_ptr = NULL;
@@ -1095,20 +1096,18 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 
 	switch (cmd) {
 	case DIOCSTART:
-		PF_RULES_WLOCK();
+		sx_xlock(&pf_ioctl_lock);
 		if (V_pf_status.running)
 			error = EEXIST;
 		else {
 			int cpu;
 
-			PF_RULES_WUNLOCK();
 			error = hook_pf();
 			if (error) {
 				DPFPRINTF(PF_DEBUG_MISC,
 				    ("pf: pfil registration failed\n"));
 				break;
 			}
-			PF_RULES_WLOCK();
 			V_pf_status.running = 1;
 			V_pf_status.since = time_second;
 
@@ -1117,27 +1116,23 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 
 			DPFPRINTF(PF_DEBUG_MISC, ("pf: started\n"));
 		}
-		PF_RULES_WUNLOCK();
 		break;
 
 	case DIOCSTOP:
-		PF_RULES_WLOCK();
+		sx_xlock(&pf_ioctl_lock);
 		if (!V_pf_status.running)
 			error = ENOENT;
 		else {
 			V_pf_status.running = 0;
-			PF_RULES_WUNLOCK();
 			error = dehook_pf();
 			if (error) {
 				V_pf_status.running = 1;
 				DPFPRINTF(PF_DEBUG_MISC,
 				    ("pf: pfil unregistration failed\n"));
 			}
-			PF_RULES_WLOCK();
 			V_pf_status.since = time_second;
 			DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n"));
 		}
-		PF_RULES_WUNLOCK();
 		break;
 
 	case DIOCADDRULE: {
@@ -3261,6 +3256,8 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 		break;
 	}
 fail:
+	if (sx_xlocked(&pf_ioctl_lock))
+		sx_xunlock(&pf_ioctl_lock);
 	CURVNET_RESTORE();
 
 	return (error);
@@ -3734,6 +3731,7 @@ pf_load(void)
 	VNET_LIST_RUNLOCK();
 
 	rw_init(&pf_rules_lock, "pf rulesets");
+	sx_init(&pf_ioctl_lock, "pf ioctl");
 
 	pf_dev = make_dev(&pf_cdevsw, 0, 0, 0, 0600, PF_NAME);
 	if ((error = pfattach()) != 0)
@@ -3747,9 +3745,7 @@ pf_unload(void)
 {
 	int error = 0;
 
-	PF_RULES_WLOCK();
 	V_pf_status.running = 0;
-	PF_RULES_WUNLOCK();
 	swi_remove(V_pf_swi_cookie);
 	error = dehook_pf();
 	if (error) {
@@ -3778,6 +3774,7 @@ pf_unload(void)
 	PF_RULES_WUNLOCK();
 	destroy_dev(pf_dev);
 	rw_destroy(&pf_rules_lock);
+	sx_destroy(&pf_ioctl_lock);
 
 	return (error);
 }
diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c
index d88a761eb648..b9f13b93de03 100644
--- a/sys/netpfil/pf/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c
@@ -1853,14 +1853,10 @@ pfr_destroy_ktable(struct pfr_ktable *kt, int flushaddr)
 		pfr_clean_node_mask(kt, &addrq);
 		pfr_destroy_kentries(&addrq);
 	}
-	if (kt->pfrkt_ip4 != NULL) {
-		RADIX_NODE_HEAD_DESTROY(kt->pfrkt_ip4);
-		free((caddr_t)kt->pfrkt_ip4, M_RTABLE);
-	}
-	if (kt->pfrkt_ip6 != NULL) {
-		RADIX_NODE_HEAD_DESTROY(kt->pfrkt_ip6);
-		free((caddr_t)kt->pfrkt_ip6, M_RTABLE);
-	}
+	if (kt->pfrkt_ip4 != NULL)
+		rn_detachhead((void **)&kt->pfrkt_ip4);
+	if (kt->pfrkt_ip6 != NULL)
+		rn_detachhead((void **)&kt->pfrkt_ip6);
 	if (kt->pfrkt_shadow != NULL)
 		pfr_destroy_ktable(kt->pfrkt_shadow, flushaddr);
 	if (kt->pfrkt_rs != NULL) {
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 1f07b4696c9c..1a5b15639d18 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -122,24 +122,21 @@ nfs_getpages(struct vop_getpages_args *ap)
 
 	npages = btoc(count);
 
+	/*
+	 * Since the caller has busied the requested page, that page's valid
+	 * field will not be changed by other threads.
+	 */
+	vm_page_assert_xbusied(pages[ap->a_reqpage]);
+
 	/*
 	 * If the requested page is partially valid, just return it and
 	 * allow the pager to zero-out the blanks.  Partially valid pages
 	 * can only occur at the file EOF.
 	 */
-	VM_OBJECT_WLOCK(object);
 	if (pages[ap->a_reqpage]->valid != 0) {
-		for (i = 0; i < npages; ++i) {
-			if (i != ap->a_reqpage) {
-				vm_page_lock(pages[i]);
-				vm_page_free(pages[i]);
-				vm_page_unlock(pages[i]);
-			}
-		}
-		VM_OBJECT_WUNLOCK(object);
-		return (0);
+		vm_pager_free_nonreq(object, pages, ap->a_reqpage, npages);
+		return (VM_PAGER_OK);
 	}
-	VM_OBJECT_WUNLOCK(object);
 
 	/*
 	 * We use only the kva address for the buffer, but this is extremely
@@ -169,15 +166,7 @@ nfs_getpages(struct vop_getpages_args *ap)
 
 	if (error && (uio.uio_resid == count)) {
 		nfs_printf("nfs_getpages: error %d\n", error);
-		VM_OBJECT_WLOCK(object);
-		for (i = 0; i < npages; ++i) {
-			if (i != ap->a_reqpage) {
-				vm_page_lock(pages[i]);
-				vm_page_free(pages[i]);
-				vm_page_unlock(pages[i]);
-			}
-		}
-		VM_OBJECT_WUNLOCK(object);
+		vm_pager_free_nonreq(object, pages, ap->a_reqpage, npages);
 		return (VM_PAGER_ERROR);
 	}
 
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/mad.c b/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
index b35cf1c2429e..74bbf5c5f352 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
@@ -1081,7 +1081,7 @@ static void handle_lid_change_event(struct mlx4_ib_dev *dev, u8 port_num)
 
 	if (mlx4_is_master(dev->dev) && !dev->sriov.is_going_down)
 		mlx4_gen_slaves_port_mgt_ev(dev->dev, port_num,
-					    MLX4_EQ_PORT_INFO_LID_CHANGE_MASK);
+					    MLX4_EQ_PORT_INFO_LID_CHANGE_MASK, 0, 0);
 }
 
 static void handle_client_rereg_event(struct mlx4_ib_dev *dev, u8 port_num)
@@ -1093,7 +1093,7 @@ static void handle_client_rereg_event(struct mlx4_ib_dev *dev, u8 port_num)
 		if (!dev->sriov.is_going_down) {
 			mlx4_ib_mcg_port_cleanup(&dev->sriov.demux[port_num - 1], 0);
 			mlx4_gen_slaves_port_mgt_ev(dev->dev, port_num,
-						    MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK);
+						    MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK, 0, 0);
 		}
 	}
 	mlx4_ib_dispatch_event(dev, port_num, IB_EVENT_CLIENT_REREGISTER);
@@ -1191,7 +1191,7 @@ void handle_port_mgmt_change_event(struct work_struct *work)
 			/*if master, notify all slaves*/
 			if (mlx4_is_master(dev->dev))
 				mlx4_gen_slaves_port_mgt_ev(dev->dev, port,
-							    MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK);
+							    MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK, 0, 0);
 		}
 
 		if (changed_attr & MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK)
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/main.c b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
index 1e728267b21d..343b193e81f4 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/main.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
@@ -1005,7 +1005,7 @@ static int flow_spec_to_net_rule(struct ib_device *dev, struct ib_flow_spec *flo
 	case IB_FLOW_IB_UC:
 		spec_l2->id = MLX4_NET_TRANS_RULE_ID_IB;
 		if(flow_spec->l2_id.ib_uc.qpn) {
-			spec_l2->ib.r_u_qpn = cpu_to_be32(flow_spec->l2_id.ib_uc.qpn);
+			spec_l2->ib.l3_qpn = cpu_to_be32(flow_spec->l2_id.ib_uc.qpn);
 			spec_l2->ib.qpn_msk = cpu_to_be32(0xffffff);
                     }
 		break;
@@ -2013,7 +2013,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 	for (i = 0; i < ibdev->num_ports; ++i) {
 		if (mlx4_ib_port_link_layer(&ibdev->ib_dev, i + 1) ==
 						IB_LINK_LAYER_ETHERNET) {
-			err = mlx4_counter_alloc(ibdev->dev, &ibdev->counters[i]);
+			err = mlx4_counter_alloc(ibdev->dev, i + 1, &ibdev->counters[i]);
 			if (err)
 				ibdev->counters[i] = -1;
 		} else
@@ -2112,7 +2112,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 err_counter:
 	for (; i; --i)
 		if (ibdev->counters[i - 1] != -1)
-			mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);
+			mlx4_counter_free(ibdev->dev, i, ibdev->counters[i - 1]);
 
 err_map:
 	iounmap(ibdev->priv_uar.map);
@@ -2200,7 +2200,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
 	iounmap(ibdev->priv_uar.map);
 	for (p = 0; p < ibdev->num_ports; ++p)
 		if (ibdev->counters[p] != -1)
-			mlx4_counter_free(ibdev->dev, ibdev->counters[p]);
+			mlx4_counter_free(ibdev->dev, p + 1, ibdev->counters[p]);
 	mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)
 		mlx4_CLOSE_PORT(dev, p);
 
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
index 4c7d81920f1f..c5ebe6bac8c1 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
@@ -2679,10 +2679,10 @@ static int mlx4_wq_overflow(struct mlx4_ib_wq *wq, int nreq, struct ib_cq *ib_cq
 
 static __be32 convert_access(int acc)
 {
-	return (acc & IB_ACCESS_REMOTE_ATOMIC ? cpu_to_be32(MLX4_WQE_FMR_PERM_ATOMIC)       : 0) |
-	       (acc & IB_ACCESS_REMOTE_WRITE  ? cpu_to_be32(MLX4_WQE_FMR_PERM_REMOTE_WRITE) : 0) |
-	       (acc & IB_ACCESS_REMOTE_READ   ? cpu_to_be32(MLX4_WQE_FMR_PERM_REMOTE_READ)  : 0) |
-	       (acc & IB_ACCESS_LOCAL_WRITE   ? cpu_to_be32(MLX4_WQE_FMR_PERM_LOCAL_WRITE)  : 0) |
+	return (acc & IB_ACCESS_REMOTE_ATOMIC ? cpu_to_be32(MLX4_WQE_FMR_AND_BIND_PERM_ATOMIC)		: 0) |
+	       (acc & IB_ACCESS_REMOTE_WRITE  ? cpu_to_be32(MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_WRITE)	: 0) |
+	       (acc & IB_ACCESS_REMOTE_READ   ? cpu_to_be32(MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_READ)	: 0) |
+	       (acc & IB_ACCESS_LOCAL_WRITE   ? cpu_to_be32(MLX4_WQE_FMR_PERM_LOCAL_WRITE)  		: 0) |
 		cpu_to_be32(MLX4_WQE_FMR_PERM_LOCAL_READ);
 }
 
@@ -2709,10 +2709,12 @@ static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)
 
 static void set_local_inv_seg(struct mlx4_wqe_local_inval_seg *iseg, u32 rkey)
 {
-	iseg->flags	= 0;
-	iseg->mem_key	= cpu_to_be32(rkey);
-	iseg->guest_id	= 0;
-	iseg->pa	= 0;
+	iseg->mem_key = cpu_to_be32(rkey);
+
+	iseg->reserved1    = 0;
+	iseg->reserved2    = 0;
+	iseg->reserved3[0] = 0;
+	iseg->reserved3[1] = 0;
 }
 
 static __always_inline void set_raddr_seg(struct mlx4_wqe_raddr_seg *rseg,
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 2a9326973668..7763493d4223 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -510,7 +510,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 		ipoib_dbg(priv, "cm recv error "
 			   "(status=%d, wrid=%d vend_err %x)\n",
 			   wc->status, wr_id, wc->vendor_err);
-		++dev->if_ierrors;
+		if_inc_counter(dev, IFCOUNTER_IERRORS, 1);
 		if (has_srq)
 			goto repost;
 		else {
@@ -542,7 +542,7 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 		 * this packet and reuse the old buffer.
 		 */
 		ipoib_dbg(priv, "failed to allocate receive buffer %d\n", wr_id);
-		++dev->if_ierrors;
+		if_inc_counter(dev, IFCOUNTER_IERRORS, 1);
 		memcpy(&rx_ring[wr_id], &saverx, sizeof(saverx));
 		goto repost;
 	}
@@ -554,8 +554,8 @@ void ipoib_cm_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 
 	ipoib_dma_mb(priv, mb, wc->byte_len);
 
-	++dev->if_ipackets;
-	dev->if_ibytes += mb->m_pkthdr.len;
+	if_inc_counter(dev, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(dev, IFCOUNTER_IBYTES, mb->m_pkthdr.len);
 
 	mb->m_pkthdr.rcvif = dev;
 	proto = *mtod(mb, uint16_t *);
@@ -615,7 +615,7 @@ void ipoib_cm_send(struct ipoib_dev_priv *priv, struct mbuf *mb, struct ipoib_cm
 	if (unlikely(mb->m_pkthdr.len > tx->mtu)) {
 		ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
 			   mb->m_pkthdr.len, tx->mtu);
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		ipoib_cm_mb_too_long(priv, mb, IPOIB_CM_MTU(tx->mtu));
 		return;
 	}
@@ -635,7 +635,7 @@ void ipoib_cm_send(struct ipoib_dev_priv *priv, struct mbuf *mb, struct ipoib_cm
 	tx_req->mb = mb;
 	if (unlikely(ipoib_dma_map_tx(priv->ca, (struct ipoib_tx_buf *)tx_req,
 	    priv->cm.num_frags))) {
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		if (tx_req->mb)
 			m_freem(tx_req->mb);
 		return;
@@ -643,7 +643,7 @@ void ipoib_cm_send(struct ipoib_dev_priv *priv, struct mbuf *mb, struct ipoib_cm
 
 	if (unlikely(post_send(priv, tx, tx_req, tx->tx_head & (ipoib_sendq_size - 1)))) {
 		ipoib_warn(priv, "post_send failed\n");
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		ipoib_dma_unmap_tx(priv->ca, (struct ipoib_tx_buf *)tx_req);
 		m_freem(mb);
 	} else {
@@ -681,7 +681,7 @@ void ipoib_cm_handle_tx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 	ipoib_dma_unmap_tx(priv->ca, (struct ipoib_tx_buf *)tx_req);
 
 	/* FIXME: is this right? Shouldn't we only increment on success? */
-	++dev->if_opackets;
+	if_inc_counter(dev, IFCOUNTER_OPACKETS, 1);
 
 	m_freem(tx_req->mb);
 
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 339e30500786..6005a394170c 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -240,7 +240,7 @@ ipoib_ib_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 	 */
 	if (unlikely(!ipoib_alloc_rx_mb(priv, wr_id))) {
 		memcpy(&priv->rx_ring[wr_id], &saverx, sizeof(saverx));
-		dev->if_iqdrops++;
+		if_inc_counter(dev, IFCOUNTER_IQDROPS, 1);
 		goto repost;
 	}
 
@@ -250,8 +250,8 @@ ipoib_ib_handle_rx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 	ipoib_dma_unmap_rx(priv, &saverx);
 	ipoib_dma_mb(priv, mb, wc->byte_len);
 
-	++dev->if_ipackets;
-	dev->if_ibytes += mb->m_pkthdr.len;
+	if_inc_counter(dev, IFCOUNTER_IPACKETS, 1);
+	if_inc_counter(dev, IFCOUNTER_IBYTES, mb->m_pkthdr.len);
 	mb->m_pkthdr.rcvif = dev;
 	m_adj(mb, sizeof(struct ib_grh) - INFINIBAND_ALEN);
 	eh = mtod(mb, struct ipoib_header *);
@@ -344,7 +344,7 @@ static void ipoib_ib_handle_tx_wc(struct ipoib_dev_priv *priv, struct ib_wc *wc)
 
 	ipoib_dma_unmap_tx(priv->ca, tx_req);
 
-	++dev->if_opackets;
+	if_inc_counter(dev, IFCOUNTER_OPACKETS, 1);
 
 	m_freem(tx_req->mb);
 
@@ -487,7 +487,7 @@ ipoib_send(struct ipoib_dev_priv *priv, struct mbuf *mb,
 		phead = mtod(mb, void *);
 		if (mb->m_len < hlen) {
 			ipoib_warn(priv, "linear data too small\n");
-			++dev->if_oerrors;
+			if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 			m_freem(mb);
 			return;
 		}
@@ -496,7 +496,7 @@ ipoib_send(struct ipoib_dev_priv *priv, struct mbuf *mb,
 		if (unlikely(mb->m_pkthdr.len - IPOIB_ENCAP_LEN > priv->mcast_mtu)) {
 			ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
 				   mb->m_pkthdr.len, priv->mcast_mtu);
-			++dev->if_oerrors;
+			if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 			ipoib_cm_mb_too_long(priv, mb, priv->mcast_mtu);
 			return;
 		}
@@ -517,7 +517,7 @@ ipoib_send(struct ipoib_dev_priv *priv, struct mbuf *mb,
 	tx_req = &priv->tx_ring[priv->tx_head & (ipoib_sendq_size - 1)];
 	tx_req->mb = mb;
 	if (unlikely(ipoib_dma_map_tx(priv->ca, tx_req, IPOIB_UD_TX_SG))) {
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		if (tx_req->mb)
 			m_freem(tx_req->mb);
 		return;
@@ -539,7 +539,7 @@ ipoib_send(struct ipoib_dev_priv *priv, struct mbuf *mb,
 	    priv->tx_head & (ipoib_sendq_size - 1), address->ah, qpn,
 	    tx_req, phead, hlen))) {
 		ipoib_warn(priv, "post_send failed\n");
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		--priv->tx_outstanding;
 		ipoib_dma_unmap_tx(priv->ca, tx_req);
 		m_freem(mb);
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 46cd5d1a2038..5cd344187a8b 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -665,7 +665,7 @@ ipoib_unicast_send(struct mbuf *mb, struct ipoib_dev_priv *priv, struct ipoib_he
 			} else
 				__path_add(priv, path);
 		} else {
-			++priv->dev->if_oerrors;
+			if_inc_counter(priv->dev, IFCOUNTER_OERRORS, 1);
 			m_freem(mb);
 		}
 
@@ -680,7 +680,7 @@ ipoib_unicast_send(struct mbuf *mb, struct ipoib_dev_priv *priv, struct ipoib_he
 		    path->queue.ifq_len < IPOIB_MAX_PATH_REC_QUEUE) {
 		_IF_ENQUEUE(&path->queue, mb);
 	} else {
-		++priv->dev->if_oerrors;
+		if_inc_counter(priv->dev, IFCOUNTER_OERRORS, 1);
 		m_freem(mb);
 	}
 }
@@ -745,7 +745,7 @@ ipoib_vlan_start(struct ifnet *dev)
 		if (mb == NULL)
 			break;
 		m_freem(mb);
-		dev->if_oerrors++;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 	}
 }
 
@@ -1452,7 +1452,7 @@ ipoib_input(struct ifnet *ifp, struct mbuf *m)
 			m->m_flags |= M_BCAST;
 		else
 			m->m_flags |= M_MCAST;
-		ifp->if_imcasts++;
+		if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
 	}
 
 	ipoib_demux(ifp, m, ntohs(eh->proto));
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index e5c40bf364b1..9c7bcec1a6f9 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -70,7 +70,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
 	tx_dropped = mcast->pkt_queue.ifq_len;
 	_IF_DRAIN(&mcast->pkt_queue);	/* XXX Locking. */
 
-	dev->if_oerrors += tx_dropped;
+	if_inc_counter(dev, IFCOUNTER_OERRORS, tx_dropped);
 
 	kfree(mcast);
 }
@@ -255,7 +255,7 @@ ipoib_mcast_sendonly_join_complete(int status,
 					mcast->mcmember.mgid.raw, ":", status);
 
 		/* Flush out any queued packets */
-		priv->dev->if_oerrors += mcast->pkt_queue.ifq_len;
+		if_inc_counter(priv->dev, IFCOUNTER_OERRORS, mcast->pkt_queue.ifq_len);
 		_IF_DRAIN(&mcast->pkt_queue);
 
 		/* Clear the busy flag so we try again */
@@ -617,7 +617,7 @@ ipoib_mcast_send(struct ipoib_dev_priv *priv, void *mgid, struct mbuf *mb)
 	if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)		||
 	    !priv->broadcast					||
 	    !test_bit(IPOIB_MCAST_FLAG_ATTACHED, &priv->broadcast->flags)) {
-		++dev->if_oerrors;
+		if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 		m_freem(mb);
 		return;
 	}
@@ -632,7 +632,7 @@ ipoib_mcast_send(struct ipoib_dev_priv *priv, void *mgid, struct mbuf *mb)
 		if (!mcast) {
 			ipoib_warn(priv, "unable to allocate memory for "
 				   "multicast structure\n");
-			++dev->if_oerrors;
+			if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 			m_freem(mb);
 			goto out;
 		}
@@ -647,7 +647,7 @@ ipoib_mcast_send(struct ipoib_dev_priv *priv, void *mgid, struct mbuf *mb)
 		if (mcast->pkt_queue.ifq_len < IPOIB_MAX_MCAST_QUEUE) {
 			_IF_ENQUEUE(&mcast->pkt_queue, mb);
 		} else {
-			++dev->if_oerrors;
+			if_inc_counter(dev, IFCOUNTER_OERRORS, 1);
 			m_freem(mb);
 		}
 
diff --git a/sys/ofed/drivers/net/mlx4/alloc.c b/sys/ofed/drivers/net/mlx4/alloc.c
index b444bbdaa032..da36b34d98b5 100644
--- a/sys/ofed/drivers/net/mlx4/alloc.c
+++ b/sys/ofed/drivers/net/mlx4/alloc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -34,7 +34,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/bitops.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 
@@ -70,9 +70,9 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
 	return obj;
 }
 
-void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
+void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj, int use_rr)
 {
-	mlx4_bitmap_free_range(bitmap, obj, 1);
+	mlx4_bitmap_free_range(bitmap, obj, 1, use_rr);
 }
 
 static unsigned long find_aligned_range(unsigned long *bitmap,
@@ -148,11 +148,17 @@ u32 mlx4_bitmap_avail(struct mlx4_bitmap *bitmap)
 	return bitmap->avail;
 }
 
-void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt)
+void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt,
+			    int use_rr)
 {
 	obj &= bitmap->max + bitmap->reserved_top - 1;
 
 	spin_lock(&bitmap->lock);
+	if (!use_rr) {
+		bitmap->last = min(bitmap->last, obj);
+		bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
+				& bitmap->mask;
+	}
 	bitmap_clear(bitmap->table, obj, cnt);
 	bitmap->avail += cnt;
 	spin_unlock(&bitmap->lock);
diff --git a/sys/ofed/drivers/net/mlx4/catas.c b/sys/ofed/drivers/net/mlx4/catas.c
index 185129a4b1d7..f62c16c9f583 100644
--- a/sys/ofed/drivers/net/mlx4/catas.c
+++ b/sys/ofed/drivers/net/mlx4/catas.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -34,10 +34,11 @@
 #include <linux/workqueue.h>
 #include <linux/module.h>
 
+#include <asm/byteorder.h>
+
 #include "mlx4.h"
 
-#define MLX4_CATAS_POLL_INTERVAL        (5 * HZ)
-
+#define 	MLX4_CATAS_POLL_INTERVAL	(5 * HZ)
 
 static DEFINE_SPINLOCK(catas_lock);
 
@@ -156,11 +157,13 @@ void mlx4_stop_catas_poll(struct mlx4_dev *dev)
 
 	del_timer_sync(&priv->catas_err.timer);
 
-	if (priv->catas_err.map)
+	if (priv->catas_err.map) {
 		iounmap(priv->catas_err.map);
+		priv->catas_err.map = NULL;
+	}
 
 	spin_lock_irq(&catas_lock);
-	list_del(&priv->catas_err.list);
+	list_del_init(&priv->catas_err.list);
 	spin_unlock_irq(&catas_lock);
 }
 
diff --git a/sys/ofed/drivers/net/mlx4/cmd.c b/sys/ofed/drivers/net/mlx4/cmd.c
index edbde9ce318e..828009d7ba65 100644
--- a/sys/ofed/drivers/net/mlx4/cmd.c
+++ b/sys/ofed/drivers/net/mlx4/cmd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -34,14 +34,17 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/errno.h>
 
 #include <linux/mlx4/cmd.h>
+#include <linux/mlx4/device.h>
 #include <linux/semaphore.h>
 #include <rdma/ib_smi.h>
 
 #include <asm/io.h>
+#include <linux/ktime.h>
 
 #include "mlx4.h"
 #include "fw.h"
@@ -110,6 +113,14 @@ enum {
 	GO_BIT_TIMEOUT_MSECS	= 10000
 };
 
+enum mlx4_vlan_transition {
+	MLX4_VLAN_TRANSITION_VST_VST = 0,
+	MLX4_VLAN_TRANSITION_VST_VGT = 1,
+	MLX4_VLAN_TRANSITION_VGT_VST = 2,
+	MLX4_VLAN_TRANSITION_VGT_VGT = 3,
+};
+
+
 struct mlx4_cmd_context {
 	struct completion	done;
 	int			result;
@@ -152,6 +163,131 @@ static int mlx4_status_to_errno(u8 status)
 	return trans_table[status];
 }
 
+static const char *cmd_to_str(u16 cmd)
+{
+	switch (cmd) {
+	case MLX4_CMD_SYS_EN:		return "SYS_EN";
+	case MLX4_CMD_SYS_DIS:		return "SYS_DIS";
+	case MLX4_CMD_MAP_FA:		return "MAP_FA";
+	case MLX4_CMD_UNMAP_FA:		return "UNMAP_FA";
+	case MLX4_CMD_RUN_FW:		return "RUN_FW";
+	case MLX4_CMD_MOD_STAT_CFG:	return "MOD_STAT_CFG";
+	case MLX4_CMD_QUERY_DEV_CAP:	return "QUERY_DEV_CAP";
+	case MLX4_CMD_QUERY_FW:		return "QUERY_FW";
+	case MLX4_CMD_ENABLE_LAM:	return "ENABLE_LAM";
+	case MLX4_CMD_DISABLE_LAM:	return "DISABLE_LAM";
+	case MLX4_CMD_QUERY_DDR:	return "QUERY_DDR";
+	case MLX4_CMD_QUERY_ADAPTER:	return "QUERY_ADAPTER";
+	case MLX4_CMD_INIT_HCA:		return "INIT_HCA";
+	case MLX4_CMD_CLOSE_HCA:	return "CLOSE_HCA";
+	case MLX4_CMD_INIT_PORT:	return "INIT_PORT";
+	case MLX4_CMD_CLOSE_PORT:	return "CLOSE_PORT";
+	case MLX4_CMD_QUERY_HCA:	return "QUERY_HCA";
+	case MLX4_CMD_QUERY_PORT:	return "QUERY_PORT";
+	case MLX4_CMD_SENSE_PORT:	return "SENSE_PORT";
+	case MLX4_CMD_HW_HEALTH_CHECK:  return "HW_HEALTH_CHECK";
+	case MLX4_CMD_SET_PORT:		return "SET_PORT";
+	case MLX4_CMD_SET_NODE:		return "SET_NODE";
+	case MLX4_CMD_QUERY_FUNC:	return "QUERY_FUNC";
+	case MLX4_CMD_MAP_ICM:		return "MAP_ICM";
+	case MLX4_CMD_UNMAP_ICM:	return "UNMAP_ICM";
+	case MLX4_CMD_MAP_ICM_AUX:	return "MAP_ICM_AUX";
+	case MLX4_CMD_UNMAP_ICM_AUX:	return "UNMAP_ICM_AUX";
+	case MLX4_CMD_SET_ICM_SIZE:	return "SET_ICM_SIZE";
+		/*master notify fw on finish for slave's flr*/
+	case MLX4_CMD_INFORM_FLR_DONE:	return "INFORM_FLR_DONE";
+	case MLX4_CMD_GET_OP_REQ:	return "GET_OP_REQ";
+
+		/* TPT commands */
+	case MLX4_CMD_SW2HW_MPT:	return "SW2HW_MPT";
+	case MLX4_CMD_QUERY_MPT:	return "QUERY_MPT";
+	case MLX4_CMD_HW2SW_MPT:	return "HW2SW_MPT";
+	case MLX4_CMD_READ_MTT:		return "READ_MTT";
+	case MLX4_CMD_WRITE_MTT:	return "WRITE_MTT";
+	case MLX4_CMD_SYNC_TPT:		return "SYNC_TPT";
+
+		/* EQ commands */
+	case MLX4_CMD_MAP_EQ:		return "MAP_EQ";
+	case MLX4_CMD_SW2HW_EQ:		return "SW2HW_EQ";
+	case MLX4_CMD_HW2SW_EQ:		return "HW2SW_EQ";
+	case MLX4_CMD_QUERY_EQ:		return "QUERY_EQ";
+
+		/* CQ commands */
+	case MLX4_CMD_SW2HW_CQ:		return "SW2HW_CQ";
+	case MLX4_CMD_HW2SW_CQ:		return "HW2SW_CQ";
+	case MLX4_CMD_QUERY_CQ:		return "QUERY_CQ:";
+	case MLX4_CMD_MODIFY_CQ:	return "MODIFY_CQ:";
+
+		/* SRQ commands */
+	case MLX4_CMD_SW2HW_SRQ:	return "SW2HW_SRQ";
+	case MLX4_CMD_HW2SW_SRQ:	return "HW2SW_SRQ";
+	case MLX4_CMD_QUERY_SRQ:	return "QUERY_SRQ";
+	case MLX4_CMD_ARM_SRQ:		return "ARM_SRQ";
+
+		/* QP/EE commands */
+	case MLX4_CMD_RST2INIT_QP:	return "RST2INIT_QP";
+	case MLX4_CMD_INIT2RTR_QP:	return "INIT2RTR_QP";
+	case MLX4_CMD_RTR2RTS_QP:	return "RTR2RTS_QP";
+	case MLX4_CMD_RTS2RTS_QP:	return "RTS2RTS_QP";
+	case MLX4_CMD_SQERR2RTS_QP:	return "SQERR2RTS_QP";
+	case MLX4_CMD_2ERR_QP:		return "2ERR_QP";
+	case MLX4_CMD_RTS2SQD_QP:	return "RTS2SQD_QP";
+	case MLX4_CMD_SQD2SQD_QP:	return "SQD2SQD_QP";
+	case MLX4_CMD_SQD2RTS_QP:	return "SQD2RTS_QP";
+	case MLX4_CMD_2RST_QP:		return "2RST_QP";
+	case MLX4_CMD_QUERY_QP:		return "QUERY_QP";
+	case MLX4_CMD_INIT2INIT_QP:	return "INIT2INIT_QP";
+	case MLX4_CMD_SUSPEND_QP:	return "SUSPEND_QP";
+	case MLX4_CMD_UNSUSPEND_QP:	return "UNSUSPEND_QP";
+		/* special QP and management commands */
+	case MLX4_CMD_CONF_SPECIAL_QP:	return "CONF_SPECIAL_QP";
+	case MLX4_CMD_MAD_IFC:		return "MAD_IFC";
+
+		/* multicast commands */
+	case MLX4_CMD_READ_MCG:		return "READ_MCG";
+	case MLX4_CMD_WRITE_MCG:	return "WRITE_MCG";
+	case MLX4_CMD_MGID_HASH:	return "MGID_HASH";
+
+		/* miscellaneous commands */
+	case MLX4_CMD_DIAG_RPRT:	return "DIAG_RPRT";
+	case MLX4_CMD_NOP:		return "NOP";
+	case MLX4_CMD_ACCESS_MEM:	return "ACCESS_MEM";
+	case MLX4_CMD_SET_VEP:		return "SET_VEP";
+
+		/* Ethernet specific commands */
+	case MLX4_CMD_SET_VLAN_FLTR:	return "SET_VLAN_FLTR";
+	case MLX4_CMD_SET_MCAST_FLTR:	return "SET_MCAST_FLTR";
+	case MLX4_CMD_DUMP_ETH_STATS:	return "DUMP_ETH_STATS";
+
+		/* Communication channel commands */
+	case MLX4_CMD_ARM_COMM_CHANNEL:	return "ARM_COMM_CHANNEL";
+	case MLX4_CMD_GEN_EQE:		return "GEN_EQE";
+
+		/* virtual commands */
+	case MLX4_CMD_ALLOC_RES:	return "ALLOC_RES";
+	case MLX4_CMD_FREE_RES:		return "FREE_RES";
+	case MLX4_CMD_MCAST_ATTACH:	return "MCAST_ATTACH";
+	case MLX4_CMD_UCAST_ATTACH:	return "UCAST_ATTACH";
+	case MLX4_CMD_PROMISC:		return "PROMISC";
+	case MLX4_CMD_QUERY_FUNC_CAP:	return "QUERY_FUNC_CAP";
+	case MLX4_CMD_QP_ATTACH:	return "QP_ATTACH";
+
+		/* debug commands */
+	case MLX4_CMD_QUERY_DEBUG_MSG:	return "QUERY_DEBUG_MSG";
+	case MLX4_CMD_SET_DEBUG_MSG:	return "SET_DEBUG_MSG";
+
+		/* statistics commands */
+	case MLX4_CMD_QUERY_IF_STAT:	return "QUERY_IF_STAT";
+	case MLX4_CMD_SET_IF_STAT:	return "SET_IF_STAT";
+
+		/* register/delete flow steering network rules */
+	case MLX4_QP_FLOW_STEERING_ATTACH:	return "QP_FLOW_STEERING_ATTACH";
+	case MLX4_QP_FLOW_STEERING_DETACH:	return "QP_FLOW_STEERING_DETACH";
+	case MLX4_FLOW_STEERING_IB_UC_QP_RANGE:	return "FLOW_STEERING_IB_UC_QP_RANGE";
+	default: return "OTHER";
+	}
+}
+
 static u8 mlx4_errno_to_status(int errno)
 {
 	switch (errno) {
@@ -244,6 +380,17 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op,
 
 	down(&cmd->event_sem);
 
+	end = msecs_to_jiffies(timeout) + jiffies;
+	while (comm_pending(dev) && time_before(jiffies, end))
+		cond_resched();
+	if (comm_pending(dev)) {
+		mlx4_warn(dev, "mlx4_comm_cmd_wait: Comm channel "
+			  "is not idle. My toggle is %d (op: 0x%x)\n",
+			  mlx4_priv(dev)->cmd.comm_toggle, op);
+		up(&cmd->event_sem);
+		return -EAGAIN;
+	}
+
 	spin_lock(&cmd->context_lock);
 	BUG_ON(cmd->free_head < 0);
 	context = &cmd->context[cmd->free_head];
@@ -255,12 +402,8 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op,
 
 	mlx4_comm_cmd_post(dev, op, param);
 
-	if (!wait_for_completion_timeout(&context->done,
-					 msecs_to_jiffies(timeout))) {
-		mlx4_warn(dev, "communication channel command 0x%x timed out\n", op);
-		err = -EBUSY;
-		goto out;
-	}
+	/* In slave, wait unconditionally for completion */
+	wait_for_completion(&context->done);
 
 	err = context->result;
 	if (err && context->fw_status != CMD_STAT_MULTI_FUNC_REQ) {
@@ -309,14 +452,29 @@ static int cmd_pending(struct mlx4_dev *dev)
 		 !!(status & swab32(1 << HCR_T_BIT)));
 }
 
-static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,
-			 u32 in_modifier, u8 op_modifier, u16 op, u16 token,
-			 int event)
+static int get_status(struct mlx4_dev *dev, u32 *status, int *go_bit,
+		      int *t_bit)
+{
+	if (pci_channel_offline(dev->pdev))
+		return -EIO;
+
+	*status = readl(mlx4_priv(dev)->cmd.hcr + HCR_STATUS_OFFSET);
+	*t_bit = !!(*status & swab32(1 << HCR_T_BIT));
+	*go_bit = !!(*status & swab32(1 << HCR_GO_BIT));
+
+	return 0;
+}
+
+static int mlx4_cmd_post(struct mlx4_dev *dev, struct timespec *ts1,
+			 u64 in_param, u64 out_param, u32 in_modifier,
+			 u8 op_modifier, u16 op, u16 token, int event)
 {
 	struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd;
 	u32 __iomem *hcr = cmd->hcr;
 	int ret = -EAGAIN;
 	unsigned long end;
+	int err, go_bit = 0, t_bit = 0;
+	u32 status = 0;
 
 	mutex_lock(&cmd->hcr_mutex);
 
@@ -363,6 +521,9 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,
 	__raw_writel((__force u32) cpu_to_be32(out_param & 0xfffffffful), hcr + 4);
 	__raw_writel((__force u32) cpu_to_be32(token << 16),		  hcr + 5);
 
+	if (ts1)
+		ktime_get_ts(ts1);
+
 	/* __raw_writel may not order writes. */
 	wmb();
 
@@ -383,6 +544,15 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param,
 	ret = 0;
 
 out:
+	if (ret) {
+		err = get_status(dev, &status, &go_bit, &t_bit);
+		mlx4_warn(dev, "Could not post command %s (0x%x): ret=%d, "
+			  "in_param=0x%llx, in_mod=0x%x, op_mod=0x%x, "
+			  "get_status err=%d, status_reg=0x%x, go_bit=%d, "
+			  "t_bit=%d, toggle=0x%x\n", cmd_to_str(op), op, ret,
+			  (unsigned long long) in_param, in_modifier, op_modifier, err, status,
+			  go_bit, t_bit, cmd->toggle);
+	}
 	mutex_unlock(&cmd->hcr_mutex);
 	return ret;
 }
@@ -439,7 +609,7 @@ static int mlx4_slave_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 			ret = mlx4_status_to_errno(vhcr->status);
 		} else
 			mlx4_err(dev, "failed execution of VHCR_POST command"
-				 "opcode 0x%x\n", op);
+				 "opcode %s (0x%x)\n", cmd_to_str(op), op);
 	}
 
 	mutex_unlock(&priv->cmd.slave_cmd_mutex);
@@ -467,7 +637,7 @@ static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 		goto out;
 	}
 
-	err = mlx4_cmd_post(dev, in_param, out_param ? *out_param : 0,
+	err = mlx4_cmd_post(dev, NULL, in_param, out_param ? *out_param : 0,
 			    in_modifier, op_modifier, op, CMD_POLL_TOKEN, 0);
 	if (err)
 		goto out;
@@ -487,7 +657,8 @@ static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 	}
 
 	if (cmd_pending(dev)) {
-		mlx4_warn(dev, "command 0x%x timed out (go bit not cleared)\n", op);
+		mlx4_warn(dev, "command %s (0x%x) timed out (go bit not cleared)\n",
+			  cmd_to_str(op), op);
 		err = -ETIMEDOUT;
 		goto out;
 	}
@@ -502,8 +673,8 @@ static int mlx4_cmd_poll(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 			   __raw_readl(hcr + HCR_STATUS_OFFSET)) >> 24;
 	err = mlx4_status_to_errno(stat);
 	if (err)
-		mlx4_err(dev, "command 0x%x failed: fw status = 0x%x\n",
-			 op, stat);
+		mlx4_err(dev, "command %s (0x%x) failed: fw status = 0x%x\n",
+			 cmd_to_str(op), op, stat);
 
 out:
 	up(&priv->cmd.poll_sem);
@@ -527,19 +698,6 @@ void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 status, u64 out_param)
 	complete(&context->done);
 }
 
-static int get_status(struct mlx4_dev *dev, u32 *status, int *go_bit,
-		      int *t_bit)
-{
-	if (pci_channel_offline(dev->pdev))
-		return -EIO;
-
-	*status = readl(mlx4_priv(dev)->cmd.hcr + HCR_STATUS_OFFSET);
-	*t_bit = !!(*status & swab32(1 << HCR_T_BIT));
-	*go_bit = !!(*status & swab32(1 << HCR_GO_BIT));
-
-	return 0;
-}
-
 static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 			 int out_is_imm, u32 in_modifier, u8 op_modifier,
 			 u16 op, unsigned long timeout)
@@ -549,6 +707,12 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 	int err = 0;
 	int go_bit = 0, t_bit = 0, stat_err;
 	u32 status = 0;
+	struct timespec	ts1, ts2;
+	ktime_t t1, t2, delta;
+	s64 ds;
+
+	if (out_is_imm && !out_param)
+		return -EINVAL;
 
 	down(&cmd->event_sem);
 
@@ -561,29 +725,38 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
 
 	init_completion(&context->done);
 
-	err = mlx4_cmd_post(dev, in_param, out_param ? *out_param : 0,
+	err = mlx4_cmd_post(dev, &ts1, in_param, out_param ? *out_param : 0,
 			    in_modifier, op_modifier, op, context->token, 1);
-	if (err) {
-		mlx4_warn(dev, "command 0x%x could not be posted (%d)\n",
-			  op, err);
+	if (err)
 		goto out;
-	}
 
 	if (!wait_for_completion_timeout(&context->done,
 					 msecs_to_jiffies(timeout))) {
 		stat_err = get_status(dev, &status, &go_bit, &t_bit);
-		mlx4_warn(dev, "command 0x%x timed out: "
-			  "get_status err=%d, status=0x%x, go_bit=%d, "
-			  "t_bit=%d, toggle=0x%x\n", op, stat_err, status,
-			  go_bit, t_bit, mlx4_priv(dev)->cmd.toggle);
+		mlx4_warn(dev, "command %s (0x%x) timed out: in_param=0x%llx, "
+			  "in_mod=0x%x, op_mod=0x%x, get_status err=%d, "
+			  "status_reg=0x%x, go_bit=%d, t_bit=%d, toggle=0x%x\n"
+			  , cmd_to_str(op), op, (unsigned long long) in_param, in_modifier,
+			  op_modifier, stat_err, status, go_bit, t_bit,
+			  mlx4_priv(dev)->cmd.toggle);
 		err = -EBUSY;
 		goto out;
 	}
+	if (mlx4_debug_level & MLX4_DEBUG_MASK_CMD_TIME) {
+		ktime_get_ts(&ts2);
+		t1 = timespec_to_ktime(ts1);
+		t2 = timespec_to_ktime(ts2);
+		delta = ktime_sub(t2, t1);
+		ds = ktime_to_ns(delta);
+		pr_info("mlx4: fw exec time for %s is %lld nsec\n", cmd_to_str(op), (long long) ds);
+	}
 
 	err = context->result;
 	if (err) {
-		mlx4_err(dev, "command 0x%x failed: fw status = 0x%x\n",
-			 op, context->fw_status);
+		mlx4_err(dev, "command %s (0x%x) failed: in_param=0x%llx, "
+			 "in_mod=0x%x, op_mod=0x%x, fw status = 0x%x\n",
+			 cmd_to_str(op), op, (unsigned long long) in_param, in_modifier,
+			 op_modifier, context->fw_status);
 		goto out;
 	}
 
@@ -640,7 +813,7 @@ static int mlx4_ACCESS_MEM(struct mlx4_dev *dev, u64 master_addr,
 	    (slave & ~0x7f) | (size & 0xff)) {
 		mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx "
 			      "master_addr:0x%llx slave_id:%d size:%d\n",
-			      (long long)slave_addr, (long long)master_addr, slave, size);
+			      (unsigned long long) slave_addr, (unsigned long long) master_addr, slave, size);
 		return -EINVAL;
 	}
 
@@ -813,6 +986,24 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave,
 				    vhcr->op, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE);
 }
 
+static int MLX4_CMD_DIAG_RPRT_wrapper(struct mlx4_dev *dev, int slave,
+		     struct mlx4_vhcr *vhcr,
+		     struct mlx4_cmd_mailbox *inbox,
+		     struct mlx4_cmd_mailbox *outbox,
+		     struct mlx4_cmd_info *cmd)
+{
+	return -EPERM;
+}
+
+static int MLX4_CMD_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave,
+		     struct mlx4_vhcr *vhcr,
+		     struct mlx4_cmd_mailbox *inbox,
+		     struct mlx4_cmd_mailbox *outbox,
+		     struct mlx4_cmd_info *cmd)
+{
+	return -EPERM;
+}
+
 int mlx4_DMA_wrapper(struct mlx4_dev *dev, int slave,
 		     struct mlx4_vhcr *vhcr,
 		     struct mlx4_cmd_mailbox *inbox,
@@ -949,6 +1140,16 @@ static struct mlx4_cmd_info cmd_info[] = {
 		.verify = NULL,
 		.wrapper = NULL
 	},
+	{
+		.opcode = MLX4_CMD_DIAG_RPRT,
+		.has_inbox = false,
+		.has_outbox = false,
+		.out_is_imm = false,
+		.encode_slave_id = false,
+		.skip_err_print = true,
+		.verify = NULL,
+		.wrapper = MLX4_CMD_DIAG_RPRT_wrapper
+	},
 	{
 		.opcode = MLX4_CMD_NOP,
 		.has_inbox = false,
@@ -1246,6 +1447,16 @@ static struct mlx4_cmd_info cmd_info[] = {
 		.verify = NULL,
 		.wrapper = mlx4_GEN_QP_wrapper
 	},
+	{
+		.opcode = MLX4_CMD_UPDATE_QP,
+		.has_inbox = false,
+		.has_outbox = false,
+		.out_is_imm = false,
+		.encode_slave_id = false,
+		.skip_err_print = true,
+		.verify = NULL,
+		.wrapper = MLX4_CMD_UPDATE_QP_wrapper
+	},
 	{
 		.opcode = MLX4_CMD_CONF_SPECIAL_QP,
 		.has_inbox = false,
@@ -1348,6 +1559,17 @@ static struct mlx4_cmd_info cmd_info[] = {
 		.verify = NULL,
 		.wrapper = mlx4_QP_FLOW_STEERING_DETACH_wrapper
 	},
+	/* wol commands */
+	{
+		.opcode = MLX4_CMD_MOD_STAT_CFG,
+		.has_inbox = false,
+		.has_outbox = false,
+		.out_is_imm = false,
+		.encode_slave_id = false,
+		.skip_err_print = true,
+		.verify = NULL,
+		.wrapper = mlx4_MOD_STAT_CFG_wrapper
+	},
 };
 
 static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
@@ -1401,8 +1623,8 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 		}
 	}
 	if (!cmd) {
-		mlx4_err(dev, "Unknown command:0x%x accepted from slave:%d\n",
-			 vhcr->op, slave);
+		mlx4_err(dev, "unparavirt command: %s (0x%x) accepted from slave:%d\n",
+			 cmd_to_str(vhcr->op), vhcr->op, slave);
 		vhcr_cmd->status = CMD_STAT_BAD_PARAM;
 		goto out_status;
 	}
@@ -1420,8 +1642,8 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 		if (mlx4_ACCESS_MEM(dev, inbox->dma, slave,
 				    vhcr->in_param,
 				    MLX4_MAILBOX_SIZE, 1)) {
-			mlx4_err(dev, "%s: Failed reading inbox (cmd:0x%x)\n",
-				 __func__, cmd->opcode);
+			mlx4_err(dev, "%s: Failed reading inbox for cmd %s (0x%x)\n",
+				 __func__, cmd_to_str(cmd->opcode), cmd->opcode);
 			vhcr_cmd->status = CMD_STAT_INTERNAL_ERR;
 			goto out_status;
 		}
@@ -1429,9 +1651,9 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 
 	/* Apply permission and bound checks if applicable */
 	if (cmd->verify && cmd->verify(dev, slave, vhcr, inbox)) {
-		mlx4_warn(dev, "Command:0x%x from slave: %d failed protection "
-			  "checks for resource_id:%d\n", vhcr->op, slave,
-			  vhcr->in_modifier);
+		mlx4_warn(dev, "Command %s (0x%x) from slave: %d failed protection "
+			  "checks for resource_id: %d\n", cmd_to_str(vhcr->op),
+			  vhcr->op, slave, vhcr->in_modifier);
 		vhcr_cmd->status = CMD_STAT_BAD_OP;
 		goto out_status;
 	}
@@ -1470,9 +1692,13 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 	}
 
 	if (err) {
-		mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with"
-			  " error:%d, status %d\n",
-			  vhcr->op, slave, vhcr->errno, err);
+		if (!cmd->skip_err_print)
+			mlx4_warn(dev, "vhcr command %s (0x%x) slave:%d "
+				  "in_param 0x%llx in_mod=0x%x, op_mod=0x%x "
+				  "failed with error:%d, status %d\n",
+				  cmd_to_str(vhcr->op), vhcr->op, slave,
+				  (unsigned long long) vhcr->in_param, vhcr->in_modifier,
+				  vhcr->op_modifier, vhcr->errno, err);
 		vhcr_cmd->status = mlx4_errno_to_status(err);
 		goto out_status;
 	}
@@ -1487,7 +1713,7 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 			/* If we failed to write back the outbox after the
 			 *command was successfully executed, we must fail this
 			 * slave, as it is now in undefined state */
-			mlx4_err(dev, "%s:Failed writing outbox\n", __func__);
+			mlx4_err(dev, "%s: Failed writing outbox\n", __func__);
 			goto out;
 		}
 	}
@@ -1516,6 +1742,75 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
 	return ret;
 }
 
+static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv,
+					    int slave, int port)
+{
+	struct mlx4_vport_oper_state *vp_oper;
+	struct mlx4_vport_state *vp_admin;
+	struct mlx4_vf_immed_vlan_work *work;
+	int err;
+	int admin_vlan_ix = NO_INDX;
+
+	vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+	vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
+
+	if (vp_oper->state.default_vlan == vp_admin->default_vlan &&
+	    vp_oper->state.default_qos == vp_admin->default_qos)
+		return 0;
+
+	work = kzalloc(sizeof(*work), GFP_KERNEL);
+	if (!work)
+		return -ENOMEM;
+
+	if (vp_oper->state.default_vlan != vp_admin->default_vlan) {
+		if (MLX4_VGT != vp_admin->default_vlan) {
+			err = __mlx4_register_vlan(&priv->dev, port,
+						   vp_admin->default_vlan,
+						   &admin_vlan_ix);
+			if (err) {
+				mlx4_warn((&priv->dev),
+					  "No vlan resources slave %d, port %d\n",
+					  slave, port);
+				return err;
+			}
+		} else {
+			admin_vlan_ix = NO_INDX;
+		}
+		work->flags |= MLX4_VF_IMMED_VLAN_FLAG_VLAN;
+		mlx4_dbg((&(priv->dev)),
+			 "alloc vlan %d idx  %d slave %d port %d\n",
+			 (int)(vp_admin->default_vlan),
+			 admin_vlan_ix, slave, port);
+	}
+
+	/* save original vlan ix and vlan id */
+	work->orig_vlan_id = vp_oper->state.default_vlan;
+	work->orig_vlan_ix = vp_oper->vlan_idx;
+
+	/* handle new qos */
+	if (vp_oper->state.default_qos != vp_admin->default_qos)
+		work->flags |= MLX4_VF_IMMED_VLAN_FLAG_QOS;
+
+	if (work->flags & MLX4_VF_IMMED_VLAN_FLAG_VLAN)
+		vp_oper->vlan_idx = admin_vlan_ix;
+
+	vp_oper->state.default_vlan = vp_admin->default_vlan;
+	vp_oper->state.default_qos = vp_admin->default_qos;
+
+	/* iterate over QPs owned by this slave, using UPDATE_QP */
+	work->port = port;
+	work->slave = slave;
+	work->qos = vp_oper->state.default_qos;
+	work->vlan_id = vp_oper->state.default_vlan;
+	work->vlan_ix = vp_oper->vlan_idx;
+	work->priv = priv;
+	INIT_WORK(&work->work, mlx4_vf_immed_vlan_work_handler);
+	queue_work(priv->mfunc.master.comm_wq, &work->work);
+
+	return 0;
+}
+
+
 static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
 {
 	int port, err;
@@ -1527,7 +1822,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
 		vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
 		vp_oper->state = *vp_admin;
 		if (MLX4_VGT != vp_admin->default_vlan) {
-			err = mlx4_register_vlan(&priv->dev, port,
+			err = __mlx4_register_vlan(&priv->dev, port,
 						 vp_admin->default_vlan, &(vp_oper->vlan_idx));
 			if (err) {
 				vp_oper->vlan_idx = NO_INDX;
@@ -1548,12 +1843,12 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
 				err = vp_oper->mac_idx;
 				vp_oper->mac_idx = NO_INDX;
 				mlx4_warn((&priv->dev),
-					  "No mac resorces slave %d, port %d\n",
+					  "No mac resources slave %d, port %d\n",
 					  slave, port);
 				return err;
 			}
 			mlx4_dbg((&(priv->dev)), "alloc mac %llx idx  %d slave %d port %d\n",
-				 (long long)vp_oper->state.mac, vp_oper->mac_idx, slave, port);
+				 (unsigned long long) vp_oper->state.mac, vp_oper->mac_idx, slave, port);
 		}
 	}
 	return 0;
@@ -1599,6 +1894,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 	if (cmd == MLX4_COMM_CMD_RESET) {
 		mlx4_warn(dev, "Received reset from slave:%d\n", slave);
 		slave_state[slave].active = false;
+		slave_state[slave].old_vlan_api = false;
 		mlx4_master_deactivate_admin_state(priv, slave);
 		for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i) {
 				slave_state[slave].event_eq[i].eqn = -1;
@@ -1619,7 +1915,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 	/*command from slave in the middle of FLR*/
 	if (cmd != MLX4_COMM_CMD_RESET &&
 	    MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {
-		mlx4_warn(dev, "slave:%d is Trying to run cmd(0x%x) "
+		mlx4_warn(dev, "slave:%d is Trying to run cmd (0x%x) "
 			  "in the middle of FLR\n", slave, cmd);
 		return;
 	}
@@ -1630,7 +1926,6 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 			goto reset_slave;
 		slave_state[slave].vhcr_dma = ((u64) param) << 48;
 		priv->mfunc.master.slave_state[slave].cookie = 0;
-		mutex_init(&priv->mfunc.master.gen_eqe_mutex[slave]);
 		break;
 	case MLX4_COMM_CMD_VHCR1:
 		if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR0)
@@ -1658,7 +1953,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 
 		mutex_lock(&priv->cmd.slave_cmd_mutex);
 		if (mlx4_master_process_vhcr(dev, slave, NULL)) {
-			mlx4_err(dev, "Failed processing vhcr for slave:%d,"
+			mlx4_err(dev, "Failed processing vhcr for slave: %d,"
 				 " resetting slave.\n", slave);
 			mutex_unlock(&priv->cmd.slave_cmd_mutex);
 			goto reset_slave;
@@ -1666,7 +1961,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 		mutex_unlock(&priv->cmd.slave_cmd_mutex);
 		break;
 	default:
-		mlx4_warn(dev, "Bad comm cmd:%d from slave:%d\n", cmd, slave);
+		mlx4_warn(dev, "Bad comm cmd: %d from slave: %d\n", cmd, slave);
 		goto reset_slave;
 	}
 	spin_lock_irqsave(&priv->mfunc.master.slave_state_lock, flags);
@@ -1676,8 +1971,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 		is_going_down = 1;
 	spin_unlock_irqrestore(&priv->mfunc.master.slave_state_lock, flags);
 	if (is_going_down) {
-		mlx4_warn(dev, "Slave is going down aborting command(%d)"
-			  " executing from slave:%d\n",
+		mlx4_warn(dev, "Slave is going down aborting command (%d)"
+			  " executing from slave: %d\n",
 			  cmd, slave);
 		return;
 	}
@@ -1696,8 +1991,6 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
 	spin_unlock_irqrestore(&priv->mfunc.master.slave_state_lock, flags);
 	/*with slave in the middle of flr, no need to clean resources again.*/
 inform_slave_state:
-	memset(&slave_state[slave].event_eq, 0,
-	       sizeof(struct mlx4_slave_event_eq_info));
 	__raw_writel((__force u32) cpu_to_be32(reply),
 		     &priv->mfunc.comm[slave].slave_read);
 	wmb();
@@ -1751,7 +2044,10 @@ void mlx4_master_comm_channel(struct work_struct *work)
 						   comm_cmd >> 16 & 0xff,
 						   comm_cmd & 0xffff, toggle);
 				++served;
-			}
+			} else
+				mlx4_err(dev, "slave %d out of sync."
+				  " read toggle %d, write toggle %d.\n", slave, slt,
+				  toggle);
 		}
 	}
 
@@ -1759,6 +2055,19 @@ void mlx4_master_comm_channel(struct work_struct *work)
 		mlx4_warn(dev, "Got command event with bitmask from %d slaves"
 			  " but %d were served\n",
 			  reported, served);
+}
+/* master command processing */
+void mlx4_master_arm_comm_channel(struct work_struct *work)
+{
+	struct mlx4_mfunc_master_ctx *master =
+		container_of(work,
+			     struct mlx4_mfunc_master_ctx,
+			     arm_comm_work);
+	struct mlx4_mfunc *mfunc =
+		container_of(master, struct mlx4_mfunc, master);
+	struct mlx4_priv *priv =
+		container_of(mfunc, struct mlx4_priv, mfunc);
+	struct mlx4_dev *dev = &priv->dev;
 
 	if (mlx4_ARM_COMM_CHANNEL(dev))
 		mlx4_warn(dev, "Failed to arm comm channel events\n");
@@ -1839,6 +2148,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
 		for (i = 0; i < dev->num_slaves; ++i) {
 			s_state = &priv->mfunc.master.slave_state[i];
 			s_state->last_cmd = MLX4_COMM_CMD_RESET;
+			mutex_init(&priv->mfunc.master.gen_eqe_mutex[i]);
 			for (j = 0; j < MLX4_EVENT_TYPES_NUM; ++j)
 				s_state->event_eq[j].eqn = -1;
 			__raw_writel((__force u32) 0,
@@ -1868,6 +2178,8 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
 		priv->mfunc.master.cmd_eqe.type = MLX4_EVENT_TYPE_CMD;
 		INIT_WORK(&priv->mfunc.master.comm_work,
 			  mlx4_master_comm_channel);
+		INIT_WORK(&priv->mfunc.master.arm_comm_work,
+			  mlx4_master_arm_comm_channel);
 		INIT_WORK(&priv->mfunc.master.slave_event_work,
 			  mlx4_gen_slave_eqe);
 		INIT_WORK(&priv->mfunc.master.slave_flr_event_work,
@@ -2081,6 +2393,8 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
 		return ERR_PTR(-ENOMEM);
 	}
 
+	memset(mailbox->buf, 0, MLX4_MAILBOX_SIZE);
+
 	return mailbox;
 }
 EXPORT_SYMBOL_GPL(mlx4_alloc_cmd_mailbox);
@@ -2101,23 +2415,32 @@ u32 mlx4_comm_get_version(void)
 	 return ((u32) CMD_CHAN_IF_REV << 8) | (u32) CMD_CHAN_VER;
 }
 
+static int mlx4_get_slave_indx(struct mlx4_dev *dev, int vf)
+{
+	if ((vf < 0) || (vf >= dev->num_vfs)) {
+		mlx4_err(dev, "Bad vf number:%d (number of activated vf: %d)\n", vf, dev->num_vfs);
+		return -EINVAL;
+	}
+	return (vf+1);
+}
+
 int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u8 *mac)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct mlx4_vport_state *s_info;
+	int slave;
 
 	if (!mlx4_is_master(dev))
 		return -EPROTONOSUPPORT;
 
-	if ((vf <= 0) || (vf > dev->num_vfs)) {
-		mlx4_err(dev, "Bad vf number:%d (max vf activated: %d)\n", vf, dev->num_vfs);
+	slave = mlx4_get_slave_indx(dev, vf);
+	if (slave < 0)
 		return -EINVAL;
-	}
 
-	s_info = &priv->mfunc.master.vf_admin[vf].vport[port];
+	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
 	s_info->mac = mlx4_mac_to_u64(mac);
 	mlx4_info(dev, "default mac on vf %d port %d to %llX will take afect only after vf restart\n",
-		  vf, port, (long long)s_info->mac);
+		  vf, port, (unsigned long long) s_info->mac);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
@@ -2125,40 +2448,145 @@ EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
 int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	struct mlx4_vport_state *s_info;
+	struct mlx4_vport_oper_state *vf_oper;
+	struct mlx4_vport_state *vf_admin;
+	int slave;
 
 	if ((!mlx4_is_master(dev)) ||
-	    !(dev->caps.flags & MLX4_DEV_CAP_FLAG_ESWITCH_SUPPORT))
+	    !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_VLAN_CONTROL))
 		return -EPROTONOSUPPORT;
 
-	if ((vf <= 0) || (vf > dev->num_vfs) || (vlan > 4095) || (qos > 7))
+	if ((vlan > 4095) || (qos > 7))
 		return -EINVAL;
 
-	s_info = &priv->mfunc.master.vf_admin[vf].vport[port];
+	slave = mlx4_get_slave_indx(dev, vf);
+	if (slave < 0)
+		return -EINVAL;
+
+	vf_admin = &priv->mfunc.master.vf_admin[slave].vport[port];
+	vf_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+
 	if ((0 == vlan) && (0 == qos))
-		s_info->default_vlan = MLX4_VGT;
+		vf_admin->default_vlan = MLX4_VGT;
 	else
-		s_info->default_vlan = vlan;
-	s_info->default_qos = qos;
+		vf_admin->default_vlan = vlan;
+	vf_admin->default_qos = qos;
+
+	if (priv->mfunc.master.slave_state[slave].active &&
+	    dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_UPDATE_QP) {
+		mlx4_info(dev, "updating vf %d port %d config params immediately\n",
+			  vf, port);
+		mlx4_master_immediate_activate_vlan_qos(priv, slave, port);
+	}
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_set_vf_vlan);
 
+ /* mlx4_get_slave_default_vlan -
+ * retrun true if VST ( default vlan)
+ * if VST will fill vlan & qos (if not NULL) */
+bool mlx4_get_slave_default_vlan(struct mlx4_dev *dev, int port, int slave, u16 *vlan, u8 *qos)
+{
+	struct mlx4_vport_oper_state *vp_oper;
+	struct mlx4_priv *priv;
+
+	priv = mlx4_priv(dev);
+	vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+
+	if (MLX4_VGT != vp_oper->state.default_vlan) {
+		if (vlan)
+			*vlan = vp_oper->state.default_vlan;
+		if (qos)
+			*qos = vp_oper->state.default_qos;
+		return true;
+	}
+	return false;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_slave_default_vlan);
+
 int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct mlx4_vport_state *s_info;
+	int slave;
 
 	if ((!mlx4_is_master(dev)) ||
-	    !(dev->caps.flags & MLX4_DEV_CAP_FLAG_ESWITCH_SUPPORT))
+	    !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FSM))
 		return -EPROTONOSUPPORT;
 
-	if ((vf <= 0) || (vf > dev->num_vfs))
+	slave = mlx4_get_slave_indx(dev, vf);
+	if (slave < 0)
 		return -EINVAL;
 
-	s_info = &priv->mfunc.master.vf_admin[vf].vport[port];
+	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
 	s_info->spoofchk = setting;
 
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_set_vf_spoofchk);
+
+int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct mlx4_vport_state *s_info;
+	struct mlx4_vport_oper_state *vp_oper;
+	int slave;
+	u8 link_stat_event;
+
+	slave = mlx4_get_slave_indx(dev, vf);
+	if (slave < 0)
+		return -EINVAL;
+
+	switch (link_state) {
+	case IFLA_VF_LINK_STATE_AUTO:
+		/* get link curent state */
+		if (!priv->sense.do_sense_port[port])
+			link_stat_event = MLX4_PORT_CHANGE_SUBTYPE_ACTIVE;
+		else
+			link_stat_event = MLX4_PORT_CHANGE_SUBTYPE_DOWN;
+	    break;
+
+	case IFLA_VF_LINK_STATE_ENABLE:
+		link_stat_event = MLX4_PORT_CHANGE_SUBTYPE_ACTIVE;
+	    break;
+
+	case IFLA_VF_LINK_STATE_DISABLE:
+		link_stat_event = MLX4_PORT_CHANGE_SUBTYPE_DOWN;
+	    break;
+
+	default:
+		mlx4_warn(dev, "unknown value for link_state %02x on slave %d port %d\n",
+			  link_state, slave, port);
+		return -EINVAL;
+	};
+	/* update the admin & oper state on the link state */
+	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+	vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+	s_info->link_state = link_state;
+	vp_oper->state.link_state = link_state;
+
+	/* send event */
+	mlx4_gen_port_state_change_eqe(dev, slave, port, link_stat_event);
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_set_vf_link_state);
+
+int mlx4_get_vf_link_state(struct mlx4_dev *dev, int port, int vf)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct mlx4_vport_state *s_info;
+	int slave;
+
+	if (!mlx4_is_master(dev))
+		return -EPROTONOSUPPORT;
+
+	slave = mlx4_get_slave_indx(dev, vf);
+	if (slave < 0)
+		return -EINVAL;
+
+	s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+
+	return s_info->link_state;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_vf_link_state);
+
diff --git a/sys/ofed/drivers/net/mlx4/cq.c b/sys/ofed/drivers/net/mlx4/cq.c
index f87025acb191..b133ae615ea4 100644
--- a/sys/ofed/drivers/net/mlx4/cq.c
+++ b/sys/ofed/drivers/net/mlx4/cq.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -35,7 +35,7 @@
  */
 
 #include <linux/hardirq.h>
-
+#include <linux/module.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/cq.h>
 
@@ -56,12 +56,14 @@ void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn)
 	struct mlx4_cq_table *cq_table = &mlx4_priv(dev)->cq_table;
 	struct mlx4_cq *cq;
 
-	spin_lock(&cq_table->lock);
+	read_lock(&cq_table->cq_table_lock);
+
 	cq = radix_tree_lookup(&mlx4_priv(dev)->cq_table.tree,
 			       cqn & (dev->caps.num_cqs - 1));
 	if (cq)
 		atomic_inc(&cq->refcount);
-	spin_unlock(&cq_table->lock);
+
+	read_unlock(&cq_table->cq_table_lock);
 
 	if (!cq) {
 		mlx4_dbg(dev, "Completion event for bogus CQ %08x\n", cqn);
@@ -81,13 +83,13 @@ void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type)
 	struct mlx4_cq_table *cq_table = &mlx4_priv(dev)->cq_table;
 	struct mlx4_cq *cq;
 
-	spin_lock(&cq_table->lock);
+	read_lock(&cq_table->cq_table_lock);
 
 	cq = radix_tree_lookup(&cq_table->tree, cqn & (dev->caps.num_cqs - 1));
 	if (cq)
 		atomic_inc(&cq->refcount);
 
-	spin_unlock(&cq_table->lock);
+	read_unlock(&cq_table->cq_table_lock);
 
 	if (!cq) {
 		mlx4_warn(dev, "Async event for bogus CQ %08x\n", cqn);
@@ -220,7 +222,7 @@ int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn)
 	mlx4_table_put(dev, &cq_table->table, *cqn);
 
 err_out:
-	mlx4_bitmap_free(&cq_table->bitmap, *cqn);
+	mlx4_bitmap_free(&cq_table->bitmap, *cqn, MLX4_NO_RR);
 	return err;
 }
 
@@ -250,7 +252,7 @@ void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)
 
 	mlx4_table_put(dev, &cq_table->cmpt_table, cqn);
 	mlx4_table_put(dev, &cq_table->table, cqn);
-	mlx4_bitmap_free(&cq_table->bitmap, cqn);
+	mlx4_bitmap_free(&cq_table->bitmap, cqn, MLX4_NO_RR);
 }
 
 static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)
@@ -269,23 +271,6 @@ static void mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn)
 		__mlx4_cq_free_icm(dev, cqn);
 }
 
-static int mlx4_find_least_loaded_vector(struct mlx4_priv *priv)
-{
-        int i;
-        int index = 0;
-        int min = priv->eq_table.eq[0].load;
-
-        for (i = 1; i < priv->dev.caps.num_comp_vectors; i++) {
-                if (priv->eq_table.eq[i].load < min) {
-                        index = i;
-                        min = priv->eq_table.eq[i].load;
-                }
-        }
-
-        return index;
-}
-
-
 int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,
 		  struct mlx4_mtt *mtt, struct mlx4_uar *uar, u64 db_rec,
 		  struct mlx4_cq *cq, unsigned vector, int collapsed,
@@ -298,24 +283,20 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,
 	u64 mtt_addr;
 	int err;
 
-        cq->vector = (vector == MLX4_LEAST_ATTACHED_VECTOR) ?
-                mlx4_find_least_loaded_vector(priv) : vector;
-
-	if (cq->vector > dev->caps.num_comp_vectors + dev->caps.comp_pool) {
+	if (vector > dev->caps.num_comp_vectors + dev->caps.comp_pool)
 		return -EINVAL;
-        }
+
+	cq->vector = vector;
 
 	err = mlx4_cq_alloc_icm(dev, &cq->cqn);
-	if (err) {
+	if (err)
 		return err;
-        }
 
 	spin_lock_irq(&cq_table->lock);
 	err = radix_tree_insert(&cq_table->tree, cq->cqn, cq);
 	spin_unlock_irq(&cq_table->lock);
-	if (err){
+	if (err)
 		goto err_icm;
-        }
 
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 	if (IS_ERR(mailbox)) {
@@ -331,7 +312,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,
 		cq_context->flags  |= cpu_to_be32(1 << 19);
 
 	cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);
-	cq_context->comp_eqn	    = priv->eq_table.eq[cq->vector].eqn;
+	cq_context->comp_eqn	    = priv->eq_table.eq[vector].eqn;
 	cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
 
 	mtt_addr = mlx4_mtt_addr(dev, mtt);
@@ -344,7 +325,6 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent,
 	if (err)
 		goto err_radix;
 
-        priv->eq_table.eq[cq->vector].load++;
 	cq->cons_index = 0;
 	cq->arm_sn     = 1;
 	cq->uar        = uar;
@@ -378,8 +358,6 @@ void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq)
 	if (err)
 		mlx4_warn(dev, "HW2SW_CQ failed (%d) for CQN %06x\n", err, cq->cqn);
 
-
-        priv->eq_table.eq[cq->vector].load--;
 	synchronize_irq(priv->eq_table.eq[cq->vector].irq);
 
 	spin_lock_irq(&cq_table->lock);
@@ -400,6 +378,7 @@ int mlx4_init_cq_table(struct mlx4_dev *dev)
 	int err;
 
 	spin_lock_init(&cq_table->lock);
+	rwlock_init(&cq_table->cq_table_lock);
 	INIT_RADIX_TREE(&cq_table->tree, GFP_ATOMIC);
 	if (mlx4_is_slave(dev))
 		return 0;
diff --git a/sys/ofed/drivers/net/mlx4/en_cq.c b/sys/ofed/drivers/net/mlx4/en_cq.c
index 9783e233774f..be043ce113ea 100644
--- a/sys/ofed/drivers/net/mlx4/en_cq.c
+++ b/sys/ofed/drivers/net/mlx4/en_cq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,12 +31,13 @@
  *
  */
 
-#include "mlx4_en.h"
-
 #include <linux/mlx4/cq.h>
 #include <linux/mlx4/qp.h>
 #include <linux/mlx4/cmd.h>
 
+#include "mlx4_en.h"
+
+
 static void mlx4_en_cq_event(struct mlx4_cq *cq, enum mlx4_event event)
 {
 	return;
@@ -44,52 +45,72 @@ static void mlx4_en_cq_event(struct mlx4_cq *cq, enum mlx4_event event)
 
 
 int mlx4_en_create_cq(struct mlx4_en_priv *priv,
-		      struct mlx4_en_cq *cq,
-		      int entries, int ring, enum cq_type mode)
+		      struct mlx4_en_cq **pcq,
+		      int entries, int ring, enum cq_type mode,
+		      int node)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_cq *cq;
 	int err;
 
+	cq = kzalloc_node(sizeof(struct mlx4_en_cq), GFP_KERNEL, node);
+	if (!cq) {
+		cq = kzalloc(sizeof(struct mlx4_en_cq), GFP_KERNEL);
+		if (!cq) {
+			en_err(priv, "Failed to allocate CW struture\n");
+			return -ENOMEM;
+		}
+	}
+
 	cq->size = entries;
+	cq->buf_size = cq->size * mdev->dev->caps.cqe_size;
+
 	cq->tq = taskqueue_create_fast("mlx4_en_que", M_NOWAIT,
-	    taskqueue_thread_enqueue, &cq->tq);
-	if (mode == RX) {
-		cq->buf_size = cq->size * sizeof(struct mlx4_cqe);
-		cq->vector   = (ring + priv->port) %
-				mdev->dev->caps.num_comp_vectors;
+                        taskqueue_thread_enqueue, &cq->tq);
+        if (mode == RX) {
 		TASK_INIT(&cq->cq_task, 0, mlx4_en_rx_que, cq);
 		taskqueue_start_threads(&cq->tq, 1, PI_NET, "%s rx cq",
-		    if_name(priv->dev));
+				if_name(priv->dev));
+
 	} else {
-		cq->buf_size = sizeof(struct mlx4_cqe);
-		cq->vector   = MLX4_LEAST_ATTACHED_VECTOR;
 		TASK_INIT(&cq->cq_task, 0, mlx4_en_tx_que, cq);
 		taskqueue_start_threads(&cq->tq, 1, PI_NET, "%s tx cq",
-		    if_name(priv->dev));
+				if_name(priv->dev));
 	}
 
 	cq->ring = ring;
 	cq->is_tx = mode;
-	mtx_init(&cq->lock.m, "mlx4 cq", NULL, MTX_DEF);
+	spin_lock_init(&cq->lock);
 
 	err = mlx4_alloc_hwq_res(mdev->dev, &cq->wqres,
 				cq->buf_size, 2 * PAGE_SIZE);
 	if (err)
-		return err;
+		goto err_cq;
 
 	err = mlx4_en_map_buffer(&cq->wqres.buf);
 	if (err)
-		mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
-	else
-		cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf;
+		goto err_res;
 
+	cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf;
+	*pcq = cq;
+
+	return 0;
+
+err_res:
+	mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
+err_cq:
+	kfree(cq);
 	return err;
 }
 
-int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
+
+int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+			int cq_idx)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
-	int err;
+	int err = 0;
+	char name[25];
+	int timestamp_en = 0;
 
 	cq->dev = mdev->pndev[priv->port];
 	cq->mcq.set_ci_db  = cq->wqres.db.db;
@@ -98,52 +119,83 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 	*cq->mcq.arm_db    = 0;
 	memset(cq->buf, 0, cq->buf_size);
 
+	if (cq->is_tx == RX) {
+		if (mdev->dev->caps.comp_pool) {
+			if (!cq->vector) {
+				sprintf(name, "%s-%d", if_name(priv->dev),
+					cq->ring);
+				/* Set IRQ for specific name (per ring) */
+				if (mlx4_assign_eq(mdev->dev, name, &cq->vector)) {
+					cq->vector = (cq->ring + 1 + priv->port)
+					    % mdev->dev->caps.num_comp_vectors;
+					mlx4_warn(mdev, "Failed Assigning an EQ to "
+						  "%s ,Falling back to legacy EQ's\n",
+						  name);
+				}
+			}
+		} else {
+			cq->vector = (cq->ring + 1 + priv->port) %
+				mdev->dev->caps.num_comp_vectors;
+		}
+	} else {
+		struct mlx4_en_cq *rx_cq;
+		/*
+		 * For TX we use the same irq per
+		 * ring we assigned for the RX
+		 */
+		cq_idx = cq_idx % priv->rx_ring_num;
+		rx_cq = priv->rx_cq[cq_idx];
+		cq->vector = rx_cq->vector;
+	}
+
 	if (!cq->is_tx)
-		cq->size = priv->rx_ring[cq->ring].actual_size;
-
-
-	err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar,
-			    cq->wqres.db.dma, &cq->mcq, cq->vector, cq->is_tx, 0); 
-	if (err) {
+		cq->size = priv->rx_ring[cq->ring]->actual_size;
+	err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt,
+			    &mdev->priv_uar, cq->wqres.db.dma, &cq->mcq,
+			    cq->vector, 0, timestamp_en);
+	if (err)
 		return err;
-        }
 
 	cq->mcq.comp  = cq->is_tx ? mlx4_en_tx_irq : mlx4_en_rx_irq;
 	cq->mcq.event = mlx4_en_cq_event;
 
-	if (cq->is_tx) {
-		init_timer(&cq->timer);
-		cq->timer.function = mlx4_en_poll_tx_cq;
-		cq->timer.data = (unsigned long) cq;
-	}
+        if (cq->is_tx) {
+                init_timer(&cq->timer);
+                cq->timer.function = mlx4_en_poll_tx_cq;
+                cq->timer.data = (unsigned long) cq;
+        }
+
 
 	return 0;
 }
 
-void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq **pcq)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_cq *cq = *pcq;
 
 	taskqueue_drain(cq->tq, &cq->cq_task);
 	taskqueue_free(cq->tq);
 	mlx4_en_unmap_buffer(&cq->wqres.buf);
 	mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
-	cq->buf_size = 0;
-	cq->buf = NULL;
-	mtx_destroy(&cq->lock.m);
+	if (priv->mdev->dev->caps.comp_pool && cq->vector)
+		mlx4_release_eq(priv->mdev->dev, cq->vector);
+	kfree(cq);
+	*pcq = NULL;
 }
 
 void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 {
-	struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_dev *mdev = priv->mdev;
 
-	taskqueue_drain(cq->tq, &cq->cq_task);
-	if (cq->is_tx)
-		del_timer(&cq->timer);
+        taskqueue_drain(cq->tq, &cq->cq_task);
+        if (cq->is_tx)
+                del_timer(&cq->timer);
 
-	mlx4_cq_free(mdev->dev, &cq->mcq);
+        mlx4_cq_free(mdev->dev, &cq->mcq);
 }
 
+
 /* Set rx cq moderation parameters */
 int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 {
diff --git a/sys/ofed/drivers/net/mlx4/en_ethtool.c b/sys/ofed/drivers/net/mlx4/en_ethtool.c
index 927994413144..6569a535f412 100644
--- a/sys/ofed/drivers/net/mlx4/en_ethtool.c
+++ b/sys/ofed/drivers/net/mlx4/en_ethtool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -34,26 +34,57 @@
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
-#include <linux/if_vlan.h>
+#include <linux/mlx4/driver.h>
+#include <linux/in.h>
+#include <net/ip.h>
+#include <linux/bitmap.h>
 
 #include "mlx4_en.h"
 #include "en_port.h"
 
+#define EN_ETHTOOL_QP_ATTACH (1ull << 63)
 
-static void mlx4_en_update_lro_stats(struct mlx4_en_priv *priv)
-{
-	int i;
+union mlx4_ethtool_flow_union {
+	struct ethtool_tcpip4_spec		tcp_ip4_spec;
+	struct ethtool_tcpip4_spec		udp_ip4_spec;
+	struct ethtool_tcpip4_spec		sctp_ip4_spec;
+	struct ethtool_ah_espip4_spec		ah_ip4_spec;
+	struct ethtool_ah_espip4_spec		esp_ip4_spec;
+	struct ethtool_usrip4_spec		usr_ip4_spec;
+	struct ethhdr				ether_spec;
+	__u8					hdata[52];
+};
 
-	priv->port_stats.lro_aggregated = 0;
-	priv->port_stats.lro_flushed = 0;
-	priv->port_stats.lro_no_desc = 0;
+struct mlx4_ethtool_flow_ext {
+	__u8		padding[2];
+	unsigned char	h_dest[ETH_ALEN];
+	__be16		vlan_etype;
+	__be16		vlan_tci;
+	__be32		data[2];
+};
 
-	for (i = 0; i < priv->rx_ring_num; i++) {
-		priv->port_stats.lro_aggregated += priv->rx_ring[i].lro.stats.aggregated;
-		priv->port_stats.lro_flushed += priv->rx_ring[i].lro.stats.flushed;
-		priv->port_stats.lro_no_desc += priv->rx_ring[i].lro.stats.no_desc;
-	}
-}
+struct mlx4_ethtool_rx_flow_spec {
+	__u32		flow_type;
+	union mlx4_ethtool_flow_union h_u;
+	struct mlx4_ethtool_flow_ext h_ext;
+	union mlx4_ethtool_flow_union m_u;
+	struct mlx4_ethtool_flow_ext m_ext;
+	__u64		ring_cookie;
+	__u32		location;
+};
+
+struct mlx4_ethtool_rxnfc {
+	__u32				cmd;
+	__u32				flow_type;
+	__u64				data;
+	struct mlx4_ethtool_rx_flow_spec	fs;
+	__u32				rule_cnt;
+	__u32				rule_locs[0];
+};
+
+#ifndef FLOW_MAC_EXT
+#define	FLOW_MAC_EXT	0x40000000
+#endif
 
 static void
 mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
@@ -61,104 +92,142 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	struct mlx4_en_dev *mdev = priv->mdev;
 
-	sprintf(drvinfo->driver, DRV_NAME " (%s)", mdev->dev->board_id);
-	strncpy(drvinfo->version, DRV_VERSION " (" DRV_RELDATE ")", 32);
-	sprintf(drvinfo->fw_version, "%d.%d.%d",
+	strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
+	strlcpy(drvinfo->version, DRV_VERSION " (" DRV_RELDATE ")",
+		sizeof(drvinfo->version));
+	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+		"%d.%d.%d",
 		(u16) (mdev->dev->caps.fw_ver >> 32),
 		(u16) ((mdev->dev->caps.fw_ver >> 16) & 0xffff),
 		(u16) (mdev->dev->caps.fw_ver & 0xffff));
-	strncpy(drvinfo->bus_info, pci_name(mdev->dev->pdev), 32);
+	strlcpy(drvinfo->bus_info, pci_name(mdev->dev->pdev),
+		sizeof(drvinfo->bus_info));
 	drvinfo->n_stats = 0;
 	drvinfo->regdump_len = 0;
 	drvinfo->eedump_len = 0;
 }
 
-static u32 mlx4_en_get_tso(struct net_device *dev)
-{
-	return (dev->features & NETIF_F_TSO) != 0;
-}
-
-static int mlx4_en_set_tso(struct net_device *dev, u32 data)
-{
-	struct mlx4_en_priv *priv = netdev_priv(dev);
-
-	if (data) {
-		if (!priv->mdev->LSO_support)
-			return -EPERM;
-		dev->features |= (NETIF_F_TSO | NETIF_F_TSO6);
-#ifdef HAVE_NETDEV_VLAN_FEATURES
-		dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO6);
-#else
-		if (priv->vlgrp) {
-			int i;
-			struct net_device *vdev;
-			for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
-				vdev = vlan_group_get_device(priv->vlgrp, i);
-				if (vdev) {
-					vdev->features |= (NETIF_F_TSO | NETIF_F_TSO6);
-					vlan_group_set_device(priv->vlgrp, i, vdev);
-				}
-			}
-		}
-#endif
-	} else {
-		dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
-#ifdef HAVE_NETDEV_VLAN_FEATURES
-		dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
-#else
-		if (priv->vlgrp) {
-			int i;
-			struct net_device *vdev;
-			for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
-				vdev = vlan_group_get_device(priv->vlgrp, i);
-				if (vdev) {
-					vdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
-					vlan_group_set_device(priv->vlgrp, i, vdev);
-				}
-			}
-		}
-#endif
-	}
-	return 0;
-}
-
-static u32 mlx4_en_get_rx_csum(struct net_device *dev)
-{
-	struct mlx4_en_priv *priv = netdev_priv(dev);
-	return priv->rx_csum;
-}
-
-static int mlx4_en_set_rx_csum(struct net_device *dev, u32 data)
-{
-	struct mlx4_en_priv *priv = netdev_priv(dev);
-	priv->rx_csum = (data != 0);
-	return 0;
-}
-
 static const char main_strings[][ETH_GSTRING_LEN] = {
-	"rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
-	"tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
-	"rx_length_errors", "rx_over_errors", "rx_crc_errors",
-	"rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
-	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
-	"tx_heartbeat_errors", "tx_window_errors",
+	/* packet statistics */
+	"rx_packets",
+	"rx_bytes",
+	"rx_multicast_packets",
+	"rx_broadcast_packets",
+	"rx_errors",
+	"rx_dropped",
+	"rx_length_errors",
+	"rx_over_errors",
+	"rx_crc_errors",
+	"rx_jabbers",
+	"rx_in_range_length_error",
+	"rx_out_range_length_error",
+	"rx_lt_64_bytes_packets",
+	"rx_127_bytes_packets",
+	"rx_255_bytes_packets",
+	"rx_511_bytes_packets",
+	"rx_1023_bytes_packets",
+	"rx_1518_bytes_packets",
+	"rx_1522_bytes_packets",
+	"rx_1548_bytes_packets",
+	"rx_gt_1548_bytes_packets",
+	"tx_packets",
+	"tx_bytes",
+	"tx_multicast_packets",
+	"tx_broadcast_packets",
+	"tx_errors",
+	"tx_dropped",
+	"tx_lt_64_bytes_packets",
+	"tx_127_bytes_packets",
+	"tx_255_bytes_packets",
+	"tx_511_bytes_packets",
+	"tx_1023_bytes_packets",
+	"tx_1518_bytes_packets",
+	"tx_1522_bytes_packets",
+	"tx_1548_bytes_packets",
+	"tx_gt_1548_bytes_packets",
+	"rx_prio_0_packets", "rx_prio_0_bytes",
+	"rx_prio_1_packets", "rx_prio_1_bytes",
+	"rx_prio_2_packets", "rx_prio_2_bytes",
+	"rx_prio_3_packets", "rx_prio_3_bytes",
+	"rx_prio_4_packets", "rx_prio_4_bytes",
+	"rx_prio_5_packets", "rx_prio_5_bytes",
+	"rx_prio_6_packets", "rx_prio_6_bytes",
+	"rx_prio_7_packets", "rx_prio_7_bytes",
+	"rx_novlan_packets", "rx_novlan_bytes",
+	"tx_prio_0_packets", "tx_prio_0_bytes",
+	"tx_prio_1_packets", "tx_prio_1_bytes",
+	"tx_prio_2_packets", "tx_prio_2_bytes",
+	"tx_prio_3_packets", "tx_prio_3_bytes",
+	"tx_prio_4_packets", "tx_prio_4_bytes",
+	"tx_prio_5_packets", "tx_prio_5_bytes",
+	"tx_prio_6_packets", "tx_prio_6_bytes",
+	"tx_prio_7_packets", "tx_prio_7_bytes",
+	"tx_novlan_packets", "tx_novlan_bytes",
+
+	/* flow control statistics */
+	"rx_pause_prio_0", "rx_pause_duration_prio_0",
+	"rx_pause_transition_prio_0", "tx_pause_prio_0",
+	"tx_pause_duration_prio_0", "tx_pause_transition_prio_0",
+	"rx_pause_prio_1", "rx_pause_duration_prio_1",
+	"rx_pause_transition_prio_1", "tx_pause_prio_1",
+	"tx_pause_duration_prio_1", "tx_pause_transition_prio_1",
+	"rx_pause_prio_2", "rx_pause_duration_prio_2",
+	"rx_pause_transition_prio_2", "tx_pause_prio_2",
+	"tx_pause_duration_prio_2", "tx_pause_transition_prio_2",
+	"rx_pause_prio_3", "rx_pause_duration_prio_3",
+	"rx_pause_transition_prio_3", "tx_pause_prio_3",
+	"tx_pause_duration_prio_3", "tx_pause_transition_prio_3",
+	"rx_pause_prio_4", "rx_pause_duration_prio_4",
+	"rx_pause_transition_prio_4", "tx_pause_prio_4",
+	"tx_pause_duration_prio_4", "tx_pause_transition_prio_4",
+	"rx_pause_prio_5", "rx_pause_duration_prio_5",
+	"rx_pause_transition_prio_5", "tx_pause_prio_5",
+	"tx_pause_duration_prio_5", "tx_pause_transition_prio_5",
+	"rx_pause_prio_6", "rx_pause_duration_prio_6",
+	"rx_pause_transition_prio_6", "tx_pause_prio_6",
+	"tx_pause_duration_prio_6", "tx_pause_transition_prio_6",
+	"rx_pause_prio_7", "rx_pause_duration_prio_7",
+	"rx_pause_transition_prio_7", "tx_pause_prio_7",
+	"tx_pause_duration_prio_7", "tx_pause_transition_prio_7",
+
+	/* VF statistics */
+	"rx_packets",
+	"rx_bytes",
+	"rx_multicast_packets",
+	"rx_broadcast_packets",
+	"rx_errors",
+	"rx_dropped",
+	"tx_packets",
+	"tx_bytes",
+	"tx_multicast_packets",
+	"tx_broadcast_packets",
+	"tx_errors",
+
+	/* VPort statistics */
+	"vport_rx_unicast_packets",
+	"vport_rx_unicast_bytes",
+	"vport_rx_multicast_packets",
+	"vport_rx_multicast_bytes",
+	"vport_rx_broadcast_packets",
+	"vport_rx_broadcast_bytes",
+	"vport_rx_dropped",
+	"vport_rx_errors",
+	"vport_tx_unicast_packets",
+	"vport_tx_unicast_bytes",
+	"vport_tx_multicast_packets",
+	"vport_tx_multicast_bytes",
+	"vport_tx_broadcast_packets",
+	"vport_tx_broadcast_bytes",
+	"vport_tx_errors",
 
 	/* port statistics */
-	"lro_aggregated", "lro_flushed", "lro_no_desc", "tso_packets",
-	"queue_stopped", "wake_queue", "tx_timeout", "rx_alloc_failed",
+	"tx_tso_packets",
+	"tx_queue_stopped", "tx_wake_queue", "tx_timeout", "rx_alloc_failed",
 	"rx_csum_good", "rx_csum_none", "tx_chksum_offload",
-
-	/* packet statistics */
-	"broadcast", "rx_prio_0", "rx_prio_1", "rx_prio_2", "rx_prio_3",
-	"rx_prio_4", "rx_prio_5", "rx_prio_6", "rx_prio_7", "tx_prio_0",
-	"tx_prio_1", "tx_prio_2", "tx_prio_3", "tx_prio_4", "tx_prio_5",
-	"tx_prio_6", "tx_prio_7",
 };
-#define NUM_MAIN_STATS	21
-#define NUM_ALL_STATS	(NUM_MAIN_STATS + NUM_PORT_STATS + NUM_PKT_STATS + NUM_PERF_STATS)
 
 static const char mlx4_en_test_names[][ETH_GSTRING_LEN]= {
-	"Interupt Test",
+	"Interrupt Test",
 	"Link Test",
 	"Speed Test",
 	"Register Test",
@@ -178,56 +247,265 @@ static void mlx4_en_set_msglevel(struct net_device *dev, u32 val)
 static void mlx4_en_get_wol(struct net_device *netdev,
 			    struct ethtool_wolinfo *wol)
 {
-	wol->supported = 0;
-	wol->wolopts = 0;
+	struct mlx4_en_priv *priv = netdev_priv(netdev);
+	int err = 0;
+	u64 config = 0;
+	u64 mask;
 
-	return;
+	if ((priv->port < 1) || (priv->port > 2)) {
+		en_err(priv, "Failed to get WoL information\n");
+		return;
+	}
+
+	mask = (priv->port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :
+		MLX4_DEV_CAP_FLAG_WOL_PORT2;
+
+	if (!(priv->mdev->dev->caps.flags & mask)) {
+		wol->supported = 0;
+		wol->wolopts = 0;
+		return;
+	}
+
+	err = mlx4_wol_read(priv->mdev->dev, &config, priv->port);
+	if (err) {
+		en_err(priv, "Failed to get WoL information\n");
+		return;
+	}
+
+	if (config & MLX4_EN_WOL_MAGIC)
+		wol->supported = WAKE_MAGIC;
+	else
+		wol->supported = 0;
+
+	if (config & MLX4_EN_WOL_ENABLED)
+		wol->wolopts = WAKE_MAGIC;
+	else
+		wol->wolopts = 0;
 }
 
-static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
+static int mlx4_en_set_wol(struct net_device *netdev,
+			    struct ethtool_wolinfo *wol)
+{
+	struct mlx4_en_priv *priv = netdev_priv(netdev);
+	u64 config = 0;
+	int err = 0;
+	u64 mask;
+
+	if ((priv->port < 1) || (priv->port > 2))
+		return -EOPNOTSUPP;
+
+	mask = (priv->port == 1) ? MLX4_DEV_CAP_FLAG_WOL_PORT1 :
+		MLX4_DEV_CAP_FLAG_WOL_PORT2;
+
+	if (!(priv->mdev->dev->caps.flags & mask))
+		return -EOPNOTSUPP;
+
+	if (wol->supported & ~WAKE_MAGIC)
+		return -EINVAL;
+
+	err = mlx4_wol_read(priv->mdev->dev, &config, priv->port);
+	if (err) {
+		en_err(priv, "Failed to get WoL info, unable to modify\n");
+		return err;
+	}
+
+	if (wol->wolopts & WAKE_MAGIC) {
+		config |= MLX4_EN_WOL_DO_MODIFY | MLX4_EN_WOL_ENABLED |
+				MLX4_EN_WOL_MAGIC;
+	} else {
+		config &= ~(MLX4_EN_WOL_ENABLED | MLX4_EN_WOL_MAGIC);
+		config |= MLX4_EN_WOL_DO_MODIFY;
+	}
+
+	err = mlx4_wol_write(priv->mdev->dev, config, priv->port);
+	if (err)
+		en_err(priv, "Failed to set WoL information\n");
+
+	return err;
+}
+
+struct bitmap_sim_iterator {
+	bool advance_array;
+	unsigned long *stats_bitmap;
+	unsigned int count;
+	unsigned int j;
+};
+
+static inline void bitmap_sim_iterator_init(struct bitmap_sim_iterator *h,
+					    unsigned long *stats_bitmap,
+					    int count)
+{
+	h->j = 0;
+	h->advance_array = !bitmap_empty(stats_bitmap, count);
+	h->count = h->advance_array ? bitmap_weight(stats_bitmap, count)
+		: count;
+	h->stats_bitmap = stats_bitmap;
+}
+
+static inline int bitmap_sim_iterator_test(struct bitmap_sim_iterator *h)
+{
+	return !h->advance_array ? 1 : test_bit(h->j, h->stats_bitmap);
+}
+
+static inline int bitmap_sim_iterator_inc(struct bitmap_sim_iterator *h)
+{
+	return h->j++;
+}
+
+static inline unsigned int bitmap_sim_iterator_count(
+		struct bitmap_sim_iterator *h)
+{
+	return h->count;
+}
+
+int mlx4_en_get_sset_count(struct net_device *dev, int sset)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct bitmap_sim_iterator it;
+
+	int num_of_stats = NUM_ALL_STATS -
+		((priv->mdev->dev->caps.flags2 &
+		 MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) ? 0 : NUM_FLOW_STATS);
+
+	bitmap_sim_iterator_init(&it, priv->stats_bitmap, num_of_stats);
 
 	switch (sset) {
 	case ETH_SS_STATS:
-		return NUM_ALL_STATS +
-			(priv->tx_ring_num + priv->rx_ring_num) * 2;
+		return bitmap_sim_iterator_count(&it) +
+			(priv->tx_ring_num * 2) +
+#ifdef LL_EXTENDED_STATS
+			(priv->rx_ring_num * 5);
+#else
+			(priv->rx_ring_num * 2);
+#endif
 	case ETH_SS_TEST:
-		return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.loopback_support) * 2;
+		return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.flags
+					& MLX4_DEV_CAP_FLAG_UC_LOOPBACK) * 2;
 	default:
 		return -EOPNOTSUPP;
 	}
 }
 
-static void mlx4_en_get_ethtool_stats(struct net_device *dev,
-		struct ethtool_stats *stats, uint64_t *data)
+void mlx4_en_get_ethtool_stats(struct net_device *dev,
+		struct ethtool_stats *stats, u64 *data)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	int index = 0;
 	int i;
+	struct bitmap_sim_iterator it;
+
+	int num_of_stats = NUM_ALL_STATS -
+		((priv->mdev->dev->caps.flags2 &
+		 MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) ? 0 : NUM_FLOW_STATS);
+
+	bitmap_sim_iterator_init(&it, priv->stats_bitmap, num_of_stats);
+
+	if (!data || !priv->port_up)
+		return;
 
 	spin_lock_bh(&priv->stats_lock);
 
-	mlx4_en_update_lro_stats(priv);
+	for (i = 0; i < NUM_PKT_STATS; i++,
+			bitmap_sim_iterator_inc(&it))
+		if (bitmap_sim_iterator_test(&it))
+			data[index++] =
+				((unsigned long *)&priv->pkstats)[i];
+	for (i = 0; i < NUM_FLOW_STATS; i++,
+			bitmap_sim_iterator_inc(&it))
+		if (priv->mdev->dev->caps.flags2 &
+		    MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN)
+			if (bitmap_sim_iterator_test(&it))
+				data[index++] =
+					((u64 *)&priv->flowstats)[i];
+	for (i = 0; i < NUM_VF_STATS; i++,
+			bitmap_sim_iterator_inc(&it))
+		if (bitmap_sim_iterator_test(&it))
+			data[index++] =
+				((unsigned long *)&priv->vf_stats)[i];
+	for (i = 0; i < NUM_VPORT_STATS; i++,
+			bitmap_sim_iterator_inc(&it))
+		if (bitmap_sim_iterator_test(&it))
+			data[index++] =
+				((unsigned long *)&priv->vport_stats)[i];
+	for (i = 0; i < NUM_PORT_STATS; i++,
+			bitmap_sim_iterator_inc(&it))
+		if (bitmap_sim_iterator_test(&it))
+			data[index++] =
+				((unsigned long *)&priv->port_stats)[i];
 
-	for (i = 0; i < NUM_MAIN_STATS; i++)
-		data[index++] = ((unsigned long *) &priv->stats)[i];
-	for (i = 0; i < NUM_PORT_STATS; i++)
-		data[index++] = ((unsigned long *) &priv->port_stats)[i];
 	for (i = 0; i < priv->tx_ring_num; i++) {
-		data[index++] = priv->tx_ring[i].packets;
-		data[index++] = priv->tx_ring[i].bytes;
+		data[index++] = priv->tx_ring[i]->packets;
+		data[index++] = priv->tx_ring[i]->bytes;
 	}
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		data[index++] = priv->rx_ring[i].packets;
-		data[index++] = priv->rx_ring[i].bytes;
+		data[index++] = priv->rx_ring[i]->packets;
+		data[index++] = priv->rx_ring[i]->bytes;
+#ifdef LL_EXTENDED_STATS
+		data[index++] = priv->rx_ring[i]->yields;
+		data[index++] = priv->rx_ring[i]->misses;
+		data[index++] = priv->rx_ring[i]->cleaned;
+#endif
 	}
-	for (i = 0; i < NUM_PKT_STATS; i++)
-		data[index++] = ((unsigned long *) &priv->pkstats)[i];
 	spin_unlock_bh(&priv->stats_lock);
 
 }
 
+void mlx4_en_restore_ethtool_stats(struct mlx4_en_priv *priv, u64 *data)
+{
+	int index = 0;
+	int i;
+	struct bitmap_sim_iterator it;
+
+	int num_of_stats = NUM_ALL_STATS -
+		((priv->mdev->dev->caps.flags2 &
+		 MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) ? 0 : NUM_FLOW_STATS);
+
+	bitmap_sim_iterator_init(&it, priv->stats_bitmap, num_of_stats);
+
+	if (!data || !priv->port_up)
+		return;
+
+	spin_lock_bh(&priv->stats_lock);
+
+	for (i = 0; i < NUM_PKT_STATS; i++,
+	      bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				((unsigned long *)&priv->pkstats)[i] =
+					data[index++];
+	for (i = 0; i < NUM_FLOW_STATS; i++,
+	      bitmap_sim_iterator_inc(&it))
+		if (priv->mdev->dev->caps.flags2 &
+		    MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN)
+			if (bitmap_sim_iterator_test(&it))
+				((u64 *)&priv->flowstats)[i] =
+					 data[index++];
+	for (i = 0; i < NUM_VF_STATS; i++,
+	      bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				((unsigned long *)&priv->vf_stats)[i] =
+					data[index++];
+	for (i = 0; i < NUM_VPORT_STATS; i++,
+	      bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				((unsigned long *)&priv->vport_stats)[i] =
+					data[index++];
+	for (i = 0; i < NUM_PORT_STATS; i++,
+	      bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				((unsigned long *)&priv->port_stats)[i] =
+					data[index++];
+
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		priv->tx_ring[i]->packets = data[index++];
+		priv->tx_ring[i]->bytes = data[index++];
+	}
+	for (i = 0; i < priv->rx_ring_num; i++) {
+		priv->rx_ring[i]->packets = data[index++];
+		priv->rx_ring[i]->bytes = data[index++];
+	}
+	spin_unlock_bh(&priv->stats_lock);
+}
+
 static void mlx4_en_self_test(struct net_device *dev,
 			      struct ethtool_test *etest, u64 *buf)
 {
@@ -239,24 +517,47 @@ static void mlx4_en_get_strings(struct net_device *dev,
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	int index = 0;
-	int i;
+	int i, k;
+	struct bitmap_sim_iterator it;
+
+	int num_of_stats = NUM_ALL_STATS -
+		((priv->mdev->dev->caps.flags2 &
+		 MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) ? 0 : NUM_FLOW_STATS);
+
+	bitmap_sim_iterator_init(&it, priv->stats_bitmap, num_of_stats);
 
 	switch (stringset) {
 	case ETH_SS_TEST:
 		for (i = 0; i < MLX4_EN_NUM_SELF_TEST - 2; i++)
 			strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);
-		if (priv->mdev->dev->caps.loopback_support)
+		if (priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UC_LOOPBACK)
 			for (; i < MLX4_EN_NUM_SELF_TEST; i++)
 				strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);
 		break;
 
 	case ETH_SS_STATS:
 		/* Add main counters */
-		for (i = 0; i < NUM_MAIN_STATS; i++)
-			strcpy(data + (index++) * ETH_GSTRING_LEN, main_strings[i]);
-		for (i = 0; i< NUM_PORT_STATS; i++)
-			strcpy(data + (index++) * ETH_GSTRING_LEN,
-			main_strings[i + NUM_MAIN_STATS]);
+		for (i = 0; i < NUM_PKT_STATS; i++,
+		     bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				strcpy(data + (index++) * ETH_GSTRING_LEN,
+				       main_strings[i]);
+
+		for (k = 0; k < NUM_FLOW_STATS; k++,
+		     bitmap_sim_iterator_inc(&it))
+			if (priv->mdev->dev->caps.flags2 &
+			    MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN)
+				if (bitmap_sim_iterator_test(&it))
+					strcpy(data + (index++) *
+					       ETH_GSTRING_LEN,
+						main_strings[i + k]);
+
+		for (; (i + k) < num_of_stats; i++,
+		     bitmap_sim_iterator_inc(&it))
+			if (bitmap_sim_iterator_test(&it))
+				strcpy(data + (index++) * ETH_GSTRING_LEN,
+				       main_strings[i + k]);
+
 		for (i = 0; i < priv->tx_ring_num; i++) {
 			sprintf(data + (index++) * ETH_GSTRING_LEN,
 				"tx%d_packets", i);
@@ -268,32 +569,79 @@ static void mlx4_en_get_strings(struct net_device *dev,
 				"rx%d_packets", i);
 			sprintf(data + (index++) * ETH_GSTRING_LEN,
 				"rx%d_bytes", i);
+#ifdef LL_EXTENDED_STATS
+			sprintf(data + (index++) * ETH_GSTRING_LEN,
+				"rx%d_napi_yield", i);
+			sprintf(data + (index++) * ETH_GSTRING_LEN,
+				"rx%d_misses", i);
+			sprintf(data + (index++) * ETH_GSTRING_LEN,
+				"rx%d_cleaned", i);
+#endif
 		}
-		for (i = 0; i< NUM_PKT_STATS; i++)
-			strcpy(data + (index++) * ETH_GSTRING_LEN,
-			main_strings[i + NUM_MAIN_STATS + NUM_PORT_STATS]);
 		break;
 	}
 }
 
+static u32 mlx4_en_autoneg_get(struct net_device *dev)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	u32 autoneg = AUTONEG_DISABLE;
+
+	if ((mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP) &&
+	    priv->port_state.autoneg) {
+		autoneg = AUTONEG_ENABLE;
+	}
+
+	return autoneg;
+}
+
 static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	int trans_type;
 
-	cmd->autoneg = AUTONEG_DISABLE;
-	cmd->supported = SUPPORTED_10000baseT_Full;
-	cmd->advertising = ADVERTISED_10000baseT_Full;
+	/* SUPPORTED_1000baseT_Half isn't supported */
+	cmd->supported = SUPPORTED_1000baseT_Full
+			|SUPPORTED_10000baseT_Full;
+
+	cmd->advertising = ADVERTISED_1000baseT_Full
+			  |ADVERTISED_10000baseT_Full;
+
+	cmd->supported |= SUPPORTED_1000baseKX_Full
+			|SUPPORTED_10000baseKX4_Full
+			|SUPPORTED_10000baseKR_Full
+			|SUPPORTED_10000baseR_FEC
+			|SUPPORTED_40000baseKR4_Full
+			|SUPPORTED_40000baseCR4_Full
+			|SUPPORTED_40000baseSR4_Full
+			|SUPPORTED_40000baseLR4_Full;
+
+	/* ADVERTISED_1000baseT_Half isn't advertised */
+	cmd->advertising |= ADVERTISED_1000baseKX_Full
+			  |ADVERTISED_10000baseKX4_Full
+			  |ADVERTISED_10000baseKR_Full
+			  |ADVERTISED_10000baseR_FEC
+			  |ADVERTISED_40000baseKR4_Full
+			  |ADVERTISED_40000baseCR4_Full
+			  |ADVERTISED_40000baseSR4_Full
+			  |ADVERTISED_40000baseLR4_Full;
 
 	if (mlx4_en_QUERY_PORT(priv->mdev, priv->port))
 		return -ENOMEM;
 
+	cmd->autoneg = mlx4_en_autoneg_get(dev);
+	if (cmd->autoneg == AUTONEG_ENABLE) {
+		cmd->supported |= SUPPORTED_Autoneg;
+		cmd->advertising |= ADVERTISED_Autoneg;
+	}
+
 	trans_type = priv->port_state.transciver;
 	if (netif_carrier_ok(dev)) {
-		cmd->speed = priv->port_state.link_speed;
+		ethtool_cmd_speed_set(cmd, priv->port_state.link_speed);
 		cmd->duplex = DUPLEX_FULL;
 	} else {
-		cmd->speed = -1;
+		ethtool_cmd_speed_set(cmd, -1);
 		cmd->duplex = -1;
 	}
 
@@ -314,13 +662,38 @@ static int mlx4_en_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 	return 0;
 }
 
+static const char *mlx4_en_duplex_to_string(int duplex)
+{
+	switch (duplex) {
+	case DUPLEX_FULL:
+		return "FULL";
+	case DUPLEX_HALF:
+		return "HALF";
+	default:
+		break;
+	}
+	return "UNKNOWN";
+}
+
 static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-	if ((cmd->autoneg == AUTONEG_ENABLE) ||
-	    (cmd->speed != SPEED_10000) || (cmd->duplex != DUPLEX_FULL))
-		return -EINVAL;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_port_state *port_state = &priv->port_state;
 
-	/* Nothing to change */
+	if ((cmd->autoneg != port_state->autoneg) ||
+	    (ethtool_cmd_speed(cmd) != port_state->link_speed) ||
+	    (cmd->duplex != DUPLEX_FULL)) {
+		en_info(priv, "Changing port state properties (auto-negotiation"
+			      " , speed/duplex) is not supported. Current:"
+			      " auto-negotiation=%d speed/duplex=%d/%s\n",
+			      port_state->autoneg, port_state->link_speed,
+			      mlx4_en_duplex_to_string(DUPLEX_FULL));
+		return -EOPNOTSUPP;
+	}
+
+	/* User provided same port state properties that are currently set.
+	 * Nothing to change
+	 */
 	return 0;
 }
 
@@ -329,8 +702,8 @@ static int mlx4_en_get_coalesce(struct net_device *dev,
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 
-	coal->tx_coalesce_usecs = 0;
-	coal->tx_max_coalesced_frames = 0;
+	coal->tx_coalesce_usecs = priv->tx_usecs;
+	coal->tx_max_coalesced_frames = priv->tx_frames;
 	coal->rx_coalesce_usecs = priv->rx_usecs;
 	coal->rx_max_coalesced_frames = priv->rx_frames;
 
@@ -359,6 +732,21 @@ static int mlx4_en_set_coalesce(struct net_device *dev,
 				MLX4_EN_RX_COAL_TIME :
 				coal->rx_coalesce_usecs;
 
+	/* Setting TX coalescing parameters */
+	if (coal->tx_coalesce_usecs != priv->tx_usecs ||
+	    coal->tx_max_coalesced_frames != priv->tx_frames) {
+		priv->tx_usecs = coal->tx_coalesce_usecs;
+		priv->tx_frames = coal->tx_max_coalesced_frames;
+		if (priv->port_up) {
+			for (i = 0; i < priv->tx_ring_num; i++) {
+				priv->tx_cq[i]->moder_cnt = priv->tx_frames;
+				priv->tx_cq[i]->moder_time = priv->tx_usecs;
+				if (mlx4_en_set_cq_moder(priv, priv->tx_cq[i]))
+					en_warn(priv, "Failed changing moderation for TX cq %d\n", i);
+			}
+		}
+	}
+
 	/* Set adaptive coalescing params */
 	priv->pkt_rate_low = coal->pkt_rate_low;
 	priv->rx_usecs_low = coal->rx_coalesce_usecs_low;
@@ -369,14 +757,17 @@ static int mlx4_en_set_coalesce(struct net_device *dev,
 	if (priv->adaptive_rx_coal)
 		return 0;
 
-	for (i = 0; i < priv->rx_ring_num; i++) {
-		priv->rx_cq[i].moder_cnt = priv->rx_frames;
-		priv->rx_cq[i].moder_time = priv->rx_usecs;
-		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
-		err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);
-		if (err)
-			return err;
+	if (priv->port_up) {
+		for (i = 0; i < priv->rx_ring_num; i++) {
+			priv->rx_cq[i]->moder_cnt = priv->rx_frames;
+			priv->rx_cq[i]->moder_time = priv->rx_usecs;
+			priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
+				err = mlx4_en_set_cq_moder(priv, priv->rx_cq[i]);
+			if (err)
+				return err;
+		}
 	}
+
 	return 0;
 }
 
@@ -387,10 +778,13 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
 	struct mlx4_en_dev *mdev = priv->mdev;
 	int err;
 
+	if (pause->autoneg)
+		return -EOPNOTSUPP;
+
 	priv->prof->tx_pause = pause->tx_pause != 0;
 	priv->prof->rx_pause = pause->rx_pause != 0;
 	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
-				    priv->rx_mb_size + ETH_FCS_LEN,
+				    priv->rx_skb_size + ETH_FCS_LEN,
 				    priv->prof->tx_pause,
 				    priv->prof->tx_ppp,
 				    priv->prof->rx_pause,
@@ -408,6 +802,41 @@ static void mlx4_en_get_pauseparam(struct net_device *dev,
 
 	pause->tx_pause = priv->prof->tx_pause;
 	pause->rx_pause = priv->prof->rx_pause;
+	pause->autoneg = mlx4_en_autoneg_get(dev);
+}
+
+/* rtnl lock must be taken before calling */
+int mlx4_en_pre_config(struct mlx4_en_priv *priv)
+{
+#ifdef CONFIG_RFS_ACCEL
+	struct cpu_rmap *rmap;
+
+	if (!priv->dev->rx_cpu_rmap)
+		return 0;
+
+	/* Disable RFS events
+	 * Must have all RFS jobs flushed before freeing resources
+	 */
+	rmap = priv->dev->rx_cpu_rmap;
+	priv->dev->rx_cpu_rmap = NULL;
+
+	rtnl_unlock();
+	free_irq_cpu_rmap(rmap);
+	rtnl_lock();
+
+	if (priv->dev->rx_cpu_rmap)
+		return -EBUSY; /* another configuration completed while lock
+				* was free
+				*/
+
+	/* Make sure all currently running filter_work are being processed
+	 * Other work will return immediatly because of disable_rfs
+	 */
+	flush_workqueue(priv->mdev->workqueue);
+
+#endif
+
+	return 0;
 }
 
 static int mlx4_en_set_ringparam(struct net_device *dev,
@@ -418,7 +847,11 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 	u32 rx_size, tx_size;
 	int port_up = 0;
 	int err = 0;
-	int i;
+	int i, n_stats;
+	u64 *data = NULL;
+
+	if (!priv->port_up)
+		return -ENOMEM;
 
 	if (param->rx_jumbo_pending || param->rx_mini_pending)
 		return -EINVAL;
@@ -430,10 +863,13 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 	tx_size = max_t(u32, tx_size, MLX4_EN_MIN_TX_SIZE);
 	tx_size = min_t(u32, tx_size, MLX4_EN_MAX_TX_SIZE);
 
-	if (rx_size == (priv->port_up ? priv->rx_ring[0].actual_size :
-					priv->rx_ring[0].size) &&
-	    tx_size == priv->tx_ring[0].size)
+	if (rx_size == (priv->port_up ? priv->rx_ring[0]->actual_size :
+					priv->rx_ring[0]->size) &&
+	    tx_size == priv->tx_ring[0]->size)
 		return 0;
+	err = mlx4_en_pre_config(priv);
+	if (err)
+		return err;
 
 	mutex_lock(&mdev->state_lock);
 	if (priv->port_up) {
@@ -441,6 +877,14 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 		mlx4_en_stop_port(dev);
 	}
 
+	/* Cache port statistics */
+	n_stats = mlx4_en_get_sset_count(dev, ETH_SS_STATS);
+	if (n_stats > 0) {
+		data = kmalloc(n_stats * sizeof(u64), GFP_KERNEL);
+		if (data)
+			mlx4_en_get_ethtool_stats(dev, NULL, data);
+	}
+
 	mlx4_en_free_resources(priv);
 
 	priv->prof->tx_ring_size = tx_size;
@@ -451,22 +895,30 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 		en_err(priv, "Failed reallocating port resources\n");
 		goto out;
 	}
+
+	/* Restore port statistics */
+	if (n_stats > 0 && data)
+		mlx4_en_restore_ethtool_stats(priv, data);
+
 	if (port_up) {
 		err = mlx4_en_start_port(dev);
-		if (err)
+		if (err) {
 			en_err(priv, "Failed starting port\n");
-	}
-
-	for (i = 0; i < priv->rx_ring_num; i++) {
-		priv->rx_cq[i].moder_cnt = priv->rx_frames;
-		priv->rx_cq[i].moder_time = priv->rx_usecs;
-		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
-		err = mlx4_en_set_cq_moder(priv, &priv->rx_cq[i]);
-		if (err)
 			goto out;
+		}
+
+		for (i = 0; i < priv->rx_ring_num; i++) {
+			priv->rx_cq[i]->moder_cnt = priv->rx_frames;
+			priv->rx_cq[i]->moder_time = priv->rx_usecs;
+			priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
+			err = mlx4_en_set_cq_moder(priv, priv->rx_cq[i]);
+			if (err)
+				goto out;
+		}
 	}
 
 out:
+	kfree(data);
 	mutex_unlock(&mdev->state_lock);
 	return err;
 }
@@ -476,29 +928,665 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 
+	if (!priv->port_up)
+		return;
+
 	memset(param, 0, sizeof(*param));
 	param->rx_max_pending = MLX4_EN_MAX_RX_SIZE;
 	param->tx_max_pending = MLX4_EN_MAX_TX_SIZE;
 	param->rx_pending = priv->port_up ?
-		priv->rx_ring[0].actual_size : priv->rx_ring[0].size;
-	param->tx_pending = priv->tx_ring[0].size;
+		priv->rx_ring[0]->actual_size : priv->rx_ring[0]->size;
+	param->tx_pending = priv->tx_ring[0]->size;
+}
+
+static u32 mlx4_en_get_rxfh_indir_size(struct net_device *dev)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+
+	return priv->rx_ring_num;
+}
+
+static int mlx4_en_get_rxfh_indir(struct net_device *dev, u32 *ring_index)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_rss_map *rss_map = &priv->rss_map;
+	int rss_rings;
+	size_t n = priv->rx_ring_num;
+	int err = 0;
+
+	rss_rings = priv->prof->rss_rings ?: priv->rx_ring_num;
+	rss_rings = 1 << ilog2(rss_rings);
+
+	while (n--) {
+		ring_index[n] = rss_map->qps[n % rss_rings].qpn -
+			rss_map->base_qpn;
+	}
+
+	return err;
+}
+
+static int mlx4_en_set_rxfh_indir(struct net_device *dev,
+		const u32 *ring_index)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int port_up = 0;
+	int err = 0;
+	int i;
+	int rss_rings = 0;
+
+	/* Calculate RSS table size and make sure flows are spread evenly
+	 * between rings
+	 */
+	for (i = 0; i < priv->rx_ring_num; i++) {
+		if (i > 0 && !ring_index[i] && !rss_rings)
+			rss_rings = i;
+
+		if (ring_index[i] != (i % (rss_rings ?: priv->rx_ring_num)))
+			return -EINVAL;
+	}
+
+	if (!rss_rings)
+		rss_rings = priv->rx_ring_num;
+
+	/* RSS table size must be an order of 2 */
+	if (!is_power_of_2(rss_rings))
+		return -EINVAL;
+
+	mutex_lock(&mdev->state_lock);
+	if (priv->port_up) {
+		port_up = 1;
+		mlx4_en_stop_port(dev);
+	}
+
+	priv->prof->rss_rings = rss_rings;
+
+	if (port_up) {
+		err = mlx4_en_start_port(dev);
+		if (err)
+			en_err(priv, "Failed starting port\n");
+	}
+
+	mutex_unlock(&mdev->state_lock);
+	return err;
+}
+
+#define all_zeros_or_all_ones(field)		\
+	((field) == 0 || (field) == (__force typeof(field))-1)
+
+static int mlx4_en_validate_flow(struct net_device *dev,
+				 struct mlx4_ethtool_rxnfc *cmd)
+{
+	struct ethtool_usrip4_spec *l3_mask;
+	struct ethtool_tcpip4_spec *l4_mask;
+	struct ethhdr *eth_mask;
+
+	if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
+		return -EINVAL;
+
+	if (cmd->fs.flow_type & FLOW_MAC_EXT) {
+		/* dest mac mask must be ff:ff:ff:ff:ff:ff */
+		if (!is_broadcast_ether_addr(cmd->fs.m_ext.h_dest))
+			return -EINVAL;
+	}
+
+	switch (cmd->fs.flow_type & ~(FLOW_EXT | FLOW_MAC_EXT)) {
+	case TCP_V4_FLOW:
+	case UDP_V4_FLOW:
+		if (cmd->fs.m_u.tcp_ip4_spec.tos)
+			return -EINVAL;
+		l4_mask = &cmd->fs.m_u.tcp_ip4_spec;
+		/* don't allow mask which isn't all 0 or 1 */
+		if (!all_zeros_or_all_ones(l4_mask->ip4src) ||
+		    !all_zeros_or_all_ones(l4_mask->ip4dst) ||
+		    !all_zeros_or_all_ones(l4_mask->psrc) ||
+		    !all_zeros_or_all_ones(l4_mask->pdst))
+			return -EINVAL;
+		break;
+	case IP_USER_FLOW:
+		l3_mask = &cmd->fs.m_u.usr_ip4_spec;
+		if (l3_mask->l4_4_bytes || l3_mask->tos || l3_mask->proto ||
+		    cmd->fs.h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4 ||
+		    (!l3_mask->ip4src && !l3_mask->ip4dst) ||
+		    !all_zeros_or_all_ones(l3_mask->ip4src) ||
+		    !all_zeros_or_all_ones(l3_mask->ip4dst))
+			return -EINVAL;
+		break;
+	case ETHER_FLOW:
+		eth_mask = &cmd->fs.m_u.ether_spec;
+		/* source mac mask must not be set */
+		if (!is_zero_ether_addr(eth_mask->h_source))
+			return -EINVAL;
+
+		/* dest mac mask must be ff:ff:ff:ff:ff:ff */
+		if (!is_broadcast_ether_addr(eth_mask->h_dest))
+			return -EINVAL;
+
+		if (!all_zeros_or_all_ones(eth_mask->h_proto))
+			return -EINVAL;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	if ((cmd->fs.flow_type & FLOW_EXT)) {
+		if (cmd->fs.m_ext.vlan_etype ||
+		    !(cmd->fs.m_ext.vlan_tci == 0 ||
+		      cmd->fs.m_ext.vlan_tci == cpu_to_be16(0xfff)))
+			return -EINVAL;
+		if (cmd->fs.m_ext.vlan_tci) {
+			if (be16_to_cpu(cmd->fs.h_ext.vlan_tci) <
+			    VLAN_MIN_VALUE ||
+			    be16_to_cpu(cmd->fs.h_ext.vlan_tci) >
+			    VLAN_MAX_VALUE)
+				return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+static int mlx4_en_ethtool_add_mac_rule(struct mlx4_ethtool_rxnfc *cmd,
+					struct list_head *rule_list_h,
+					struct mlx4_spec_list *spec_l2,
+					unsigned char *mac)
+{
+	int err = 0;
+	__be64 mac_msk = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+	spec_l2->id = MLX4_NET_TRANS_RULE_ID_ETH;
+	memcpy(spec_l2->eth.dst_mac_msk, &mac_msk, ETH_ALEN);
+	memcpy(spec_l2->eth.dst_mac, mac, ETH_ALEN);
+
+	if ((cmd->fs.flow_type & FLOW_EXT) && cmd->fs.m_ext.vlan_tci) {
+		spec_l2->eth.vlan_id = cmd->fs.h_ext.vlan_tci;
+		spec_l2->eth.vlan_id_msk = cpu_to_be16(0xfff);
+	}
+
+	list_add_tail(&spec_l2->list, rule_list_h);
+
+	return err;
+}
+
+static int mlx4_en_ethtool_add_mac_rule_by_ipv4(struct mlx4_en_priv *priv,
+						struct mlx4_ethtool_rxnfc *cmd,
+						struct list_head *rule_list_h,
+						struct mlx4_spec_list *spec_l2,
+						__be32 ipv4_dst)
+{
+	unsigned char mac[ETH_ALEN];
+
+	if (!ipv4_is_multicast(ipv4_dst)) {
+		if (cmd->fs.flow_type & FLOW_MAC_EXT)
+			memcpy(&mac, cmd->fs.h_ext.h_dest, ETH_ALEN);
+		else
+			memcpy(&mac, priv->dev->dev_addr, ETH_ALEN);
+	} else {
+		ip_eth_mc_map(ipv4_dst, mac);
+	}
+
+	return mlx4_en_ethtool_add_mac_rule(cmd, rule_list_h, spec_l2, &mac[0]);
+}
+
+static int add_ip_rule(struct mlx4_en_priv *priv,
+				struct mlx4_ethtool_rxnfc *cmd,
+				struct list_head *list_h)
+{
+	struct mlx4_spec_list *spec_l2 = NULL;
+	struct mlx4_spec_list *spec_l3 = NULL;
+	struct ethtool_usrip4_spec *l3_mask = &cmd->fs.m_u.usr_ip4_spec;
+
+	spec_l3 = kzalloc(sizeof(*spec_l3), GFP_KERNEL);
+	spec_l2 = kzalloc(sizeof(*spec_l2), GFP_KERNEL);
+	if (!spec_l2 || !spec_l3) {
+		en_err(priv, "Fail to alloc ethtool rule.\n");
+		kfree(spec_l2);
+		kfree(spec_l3);
+		return -ENOMEM;
+	}
+
+	mlx4_en_ethtool_add_mac_rule_by_ipv4(priv, cmd, list_h, spec_l2,
+					     cmd->fs.h_u.
+					     usr_ip4_spec.ip4dst);
+	spec_l3->id = MLX4_NET_TRANS_RULE_ID_IPV4;
+	spec_l3->ipv4.src_ip = cmd->fs.h_u.usr_ip4_spec.ip4src;
+	if (l3_mask->ip4src)
+		spec_l3->ipv4.src_ip_msk = MLX4_BE_WORD_MASK;
+	spec_l3->ipv4.dst_ip = cmd->fs.h_u.usr_ip4_spec.ip4dst;
+	if (l3_mask->ip4dst)
+		spec_l3->ipv4.dst_ip_msk = MLX4_BE_WORD_MASK;
+	list_add_tail(&spec_l3->list, list_h);
+
+	return 0;
+}
+
+static int add_tcp_udp_rule(struct mlx4_en_priv *priv,
+			     struct mlx4_ethtool_rxnfc *cmd,
+			     struct list_head *list_h, int proto)
+{
+	struct mlx4_spec_list *spec_l2 = NULL;
+	struct mlx4_spec_list *spec_l3 = NULL;
+	struct mlx4_spec_list *spec_l4 = NULL;
+	struct ethtool_tcpip4_spec *l4_mask = &cmd->fs.m_u.tcp_ip4_spec;
+
+	spec_l2 = kzalloc(sizeof(*spec_l2), GFP_KERNEL);
+	spec_l3 = kzalloc(sizeof(*spec_l3), GFP_KERNEL);
+	spec_l4 = kzalloc(sizeof(*spec_l4), GFP_KERNEL);
+	if (!spec_l2 || !spec_l3 || !spec_l4) {
+		en_err(priv, "Fail to alloc ethtool rule.\n");
+		kfree(spec_l2);
+		kfree(spec_l3);
+		kfree(spec_l4);
+		return -ENOMEM;
+	}
+
+	spec_l3->id = MLX4_NET_TRANS_RULE_ID_IPV4;
+
+	if (proto == TCP_V4_FLOW) {
+		mlx4_en_ethtool_add_mac_rule_by_ipv4(priv, cmd, list_h,
+						     spec_l2,
+						     cmd->fs.h_u.
+						     tcp_ip4_spec.ip4dst);
+		spec_l4->id = MLX4_NET_TRANS_RULE_ID_TCP;
+		spec_l3->ipv4.src_ip = cmd->fs.h_u.tcp_ip4_spec.ip4src;
+		spec_l3->ipv4.dst_ip = cmd->fs.h_u.tcp_ip4_spec.ip4dst;
+		spec_l4->tcp_udp.src_port = cmd->fs.h_u.tcp_ip4_spec.psrc;
+		spec_l4->tcp_udp.dst_port = cmd->fs.h_u.tcp_ip4_spec.pdst;
+	} else {
+		mlx4_en_ethtool_add_mac_rule_by_ipv4(priv, cmd, list_h,
+						     spec_l2,
+						     cmd->fs.h_u.
+						     udp_ip4_spec.ip4dst);
+		spec_l4->id = MLX4_NET_TRANS_RULE_ID_UDP;
+		spec_l3->ipv4.src_ip = cmd->fs.h_u.udp_ip4_spec.ip4src;
+		spec_l3->ipv4.dst_ip = cmd->fs.h_u.udp_ip4_spec.ip4dst;
+		spec_l4->tcp_udp.src_port = cmd->fs.h_u.udp_ip4_spec.psrc;
+		spec_l4->tcp_udp.dst_port = cmd->fs.h_u.udp_ip4_spec.pdst;
+	}
+
+	if (l4_mask->ip4src)
+		spec_l3->ipv4.src_ip_msk = MLX4_BE_WORD_MASK;
+	if (l4_mask->ip4dst)
+		spec_l3->ipv4.dst_ip_msk = MLX4_BE_WORD_MASK;
+
+	if (l4_mask->psrc)
+		spec_l4->tcp_udp.src_port_msk = MLX4_BE_SHORT_MASK;
+	if (l4_mask->pdst)
+		spec_l4->tcp_udp.dst_port_msk = MLX4_BE_SHORT_MASK;
+
+	list_add_tail(&spec_l3->list, list_h);
+	list_add_tail(&spec_l4->list, list_h);
+
+	return 0;
+}
+
+static int mlx4_en_ethtool_to_net_trans_rule(struct net_device *dev,
+					     struct mlx4_ethtool_rxnfc *cmd,
+					     struct list_head *rule_list_h)
+{
+	int err;
+	struct ethhdr *eth_spec;
+	struct mlx4_spec_list *spec_l2;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+
+	err = mlx4_en_validate_flow(dev, cmd);
+	if (err)
+		return err;
+
+	switch (cmd->fs.flow_type & ~(FLOW_EXT | FLOW_MAC_EXT)) {
+	case ETHER_FLOW:
+		spec_l2 = kzalloc(sizeof(*spec_l2), GFP_KERNEL);
+		if (!spec_l2)
+			return -ENOMEM;
+
+		eth_spec = &cmd->fs.h_u.ether_spec;
+		mlx4_en_ethtool_add_mac_rule(cmd, rule_list_h, spec_l2, &eth_spec->h_dest[0]);
+		spec_l2->eth.ether_type = eth_spec->h_proto;
+		if (eth_spec->h_proto)
+			spec_l2->eth.ether_type_enable = 1;
+		break;
+	case IP_USER_FLOW:
+		err = add_ip_rule(priv, cmd, rule_list_h);
+		break;
+	case TCP_V4_FLOW:
+		err = add_tcp_udp_rule(priv, cmd, rule_list_h, TCP_V4_FLOW);
+		break;
+	case UDP_V4_FLOW:
+		err = add_tcp_udp_rule(priv, cmd, rule_list_h, UDP_V4_FLOW);
+		break;
+	}
+
+	return err;
+}
+
+static int mlx4_en_flow_replace(struct net_device *dev,
+				struct mlx4_ethtool_rxnfc *cmd)
+{
+	int err;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct ethtool_flow_id *loc_rule;
+	struct mlx4_spec_list *spec, *tmp_spec;
+	u32 qpn;
+	u64 reg_id;
+
+	struct mlx4_net_trans_rule rule = {
+		.queue_mode = MLX4_NET_TRANS_Q_FIFO,
+		.exclusive = 0,
+		.allow_loopback = 1,
+		.promisc_mode = MLX4_FS_REGULAR,
+	};
+
+	rule.port = priv->port;
+	rule.priority = MLX4_DOMAIN_ETHTOOL | cmd->fs.location;
+	INIT_LIST_HEAD(&rule.list);
+
+	/* Allow direct QP attaches if the EN_ETHTOOL_QP_ATTACH flag is set */
+	if (cmd->fs.ring_cookie == RX_CLS_FLOW_DISC)
+		qpn = priv->drop_qp.qpn;
+	else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
+		qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
+	} else {
+		if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
+			en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist.\n",
+				cmd->fs.ring_cookie);
+			return -EINVAL;
+		}
+		qpn = priv->rss_map.qps[cmd->fs.ring_cookie].qpn;
+		if (!qpn) {
+			en_warn(priv, "rxnfc: RX ring (%llu) is inactive.\n",
+				cmd->fs.ring_cookie);
+			return -EINVAL;
+		}
+	}
+	rule.qpn = qpn;
+	err = mlx4_en_ethtool_to_net_trans_rule(dev, cmd, &rule.list);
+	if (err)
+		goto out_free_list;
+
+	mutex_lock(&mdev->state_lock);
+	loc_rule = &priv->ethtool_rules[cmd->fs.location];
+	if (loc_rule->id) {
+		err = mlx4_flow_detach(priv->mdev->dev, loc_rule->id);
+		if (err) {
+			en_err(priv, "Fail to detach network rule at location %d. registration id = %llx\n",
+			       cmd->fs.location, loc_rule->id);
+			goto unlock;
+		}
+		loc_rule->id = 0;
+		memset(&loc_rule->flow_spec, 0,
+		       sizeof(struct ethtool_rx_flow_spec));
+		list_del(&loc_rule->list);
+	}
+	err = mlx4_flow_attach(priv->mdev->dev, &rule, &reg_id);
+	if (err) {
+		en_err(priv, "Fail to attach network rule at location %d.\n",
+		       cmd->fs.location);
+		goto unlock;
+	}
+	loc_rule->id = reg_id;
+	memcpy(&loc_rule->flow_spec, &cmd->fs,
+	       sizeof(struct ethtool_rx_flow_spec));
+	list_add_tail(&loc_rule->list, &priv->ethtool_list);
+
+unlock:
+	mutex_unlock(&mdev->state_lock);
+out_free_list:
+	list_for_each_entry_safe(spec, tmp_spec, &rule.list, list) {
+		list_del(&spec->list);
+		kfree(spec);
+	}
+	return err;
+}
+
+static int mlx4_en_flow_detach(struct net_device *dev,
+			       struct mlx4_ethtool_rxnfc *cmd)
+{
+	int err = 0;
+	struct ethtool_flow_id *rule;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+
+	if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
+		return -EINVAL;
+
+	mutex_lock(&mdev->state_lock);
+	rule = &priv->ethtool_rules[cmd->fs.location];
+	if (!rule->id) {
+		err =  -ENOENT;
+		goto out;
+	}
+
+	err = mlx4_flow_detach(priv->mdev->dev, rule->id);
+	if (err) {
+		en_err(priv, "Fail to detach network rule at location %d. registration id = 0x%llx\n",
+		       cmd->fs.location, rule->id);
+		goto out;
+	}
+	rule->id = 0;
+	memset(&rule->flow_spec, 0, sizeof(struct ethtool_rx_flow_spec));
+
+	list_del(&rule->list);
+out:
+	mutex_unlock(&mdev->state_lock);
+	return err;
+
+}
+
+static int mlx4_en_get_flow(struct net_device *dev, struct mlx4_ethtool_rxnfc *cmd,
+			    int loc)
+{
+	int err = 0;
+	struct ethtool_flow_id *rule;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+
+	if (loc < 0 || loc >= MAX_NUM_OF_FS_RULES)
+		return -EINVAL;
+
+	rule = &priv->ethtool_rules[loc];
+	if (rule->id)
+		memcpy(&cmd->fs, &rule->flow_spec,
+		       sizeof(struct ethtool_rx_flow_spec));
+	else
+		err = -ENOENT;
+
+	return err;
+}
+
+static int mlx4_en_get_num_flows(struct mlx4_en_priv *priv)
+{
+
+	int i, res = 0;
+	for (i = 0; i < MAX_NUM_OF_FS_RULES; i++) {
+		if (priv->ethtool_rules[i].id)
+			res++;
+	}
+	return res;
+
+}
+
+static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c,
+			     u32 *rule_locs)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int err = 0;
+	int i = 0, priority = 0;
+	struct mlx4_ethtool_rxnfc *cmd = (struct mlx4_ethtool_rxnfc *)c;
+
+	if ((cmd->cmd == ETHTOOL_GRXCLSRLCNT ||
+	     cmd->cmd == ETHTOOL_GRXCLSRULE ||
+	     cmd->cmd == ETHTOOL_GRXCLSRLALL) &&
+	    (mdev->dev->caps.steering_mode !=
+	     MLX4_STEERING_MODE_DEVICE_MANAGED || !priv->port_up))
+		return -EINVAL;
+
+	switch (cmd->cmd) {
+	case ETHTOOL_GRXRINGS:
+		cmd->data = priv->rx_ring_num;
+		break;
+	case ETHTOOL_GRXCLSRLCNT:
+		cmd->rule_cnt = mlx4_en_get_num_flows(priv);
+		break;
+	case ETHTOOL_GRXCLSRULE:
+		err = mlx4_en_get_flow(dev, cmd, cmd->fs.location);
+		break;
+	case ETHTOOL_GRXCLSRLALL:
+		while ((!err || err == -ENOENT) && priority < cmd->rule_cnt) {
+			err = mlx4_en_get_flow(dev, cmd, i);
+			if (!err)
+				rule_locs[priority++] = i;
+			i++;
+		}
+		err = 0;
+		break;
+	default:
+		err = -EOPNOTSUPP;
+		break;
+	}
+
+	return err;
+}
+
+static int mlx4_en_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c)
+{
+	int err = 0;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_ethtool_rxnfc *cmd = (struct mlx4_ethtool_rxnfc *)c;
+
+	if (mdev->dev->caps.steering_mode !=
+	    MLX4_STEERING_MODE_DEVICE_MANAGED || !priv->port_up)
+		return -EINVAL;
+
+	switch (cmd->cmd) {
+	case ETHTOOL_SRXCLSRLINS:
+		err = mlx4_en_flow_replace(dev, cmd);
+		break;
+	case ETHTOOL_SRXCLSRLDEL:
+		err = mlx4_en_flow_detach(dev, cmd);
+		break;
+	default:
+		en_warn(priv, "Unsupported ethtool command. (%d)\n", cmd->cmd);
+		return -EINVAL;
+	}
+
+	return err;
+}
+
+static void mlx4_en_get_channels(struct net_device *dev,
+				 struct ethtool_channels *channel)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+
+	memset(channel, 0, sizeof(*channel));
+
+	channel->max_rx = MAX_RX_RINGS;
+	channel->max_tx = MLX4_EN_MAX_TX_RING_P_UP;
+
+	channel->rx_count = priv->rx_ring_num;
+	channel->tx_count = priv->tx_ring_num / MLX4_EN_NUM_UP;
+}
+
+static int mlx4_en_set_channels(struct net_device *dev,
+				struct ethtool_channels *channel)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int port_up = 0;
+	int i;
+	int err = 0;
+
+	if (channel->other_count || channel->combined_count ||
+	    channel->tx_count > MLX4_EN_MAX_TX_RING_P_UP ||
+	    channel->rx_count > MAX_RX_RINGS ||
+	    !channel->tx_count || !channel->rx_count)
+		return -EINVAL;
+
+	err = mlx4_en_pre_config(priv);
+	if (err)
+		return err;
+
+	mutex_lock(&mdev->state_lock);
+	if (priv->port_up) {
+		port_up = 1;
+		mlx4_en_stop_port(dev);
+	}
+
+	mlx4_en_free_resources(priv);
+
+	priv->num_tx_rings_p_up = channel->tx_count;
+	priv->tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
+	priv->rx_ring_num = channel->rx_count;
+
+	err = mlx4_en_alloc_resources(priv);
+	if (err) {
+		en_err(priv, "Failed reallocating port resources\n");
+		goto out;
+	}
+
+	netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
+	netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
+
+	mlx4_en_setup_tc(dev, MLX4_EN_NUM_UP);
+
+	en_warn(priv, "Using %d TX rings\n", priv->tx_ring_num);
+	en_warn(priv, "Using %d RX rings\n", priv->rx_ring_num);
+
+	if (port_up) {
+		err = mlx4_en_start_port(dev);
+		if (err)
+			en_err(priv, "Failed starting port\n");
+
+		for (i = 0; i < priv->rx_ring_num; i++) {
+			priv->rx_cq[i]->moder_cnt = priv->rx_frames;
+			priv->rx_cq[i]->moder_time = priv->rx_usecs;
+			priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
+			err = mlx4_en_set_cq_moder(priv, priv->rx_cq[i]);
+			if (err)
+				goto out;
+		}
+	}
+
+out:
+	mutex_unlock(&mdev->state_lock);
+	return err;
+}
+
+static int mlx4_en_get_ts_info(struct net_device *dev,
+			       struct ethtool_ts_info *info)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int ret;
+
+	ret = ethtool_op_get_ts_info(dev, info);
+	if (ret)
+		return ret;
+
+	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) {
+		info->so_timestamping |=
+			SOF_TIMESTAMPING_TX_HARDWARE |
+			SOF_TIMESTAMPING_RX_HARDWARE |
+			SOF_TIMESTAMPING_RAW_HARDWARE;
+
+		info->tx_types =
+			(1 << HWTSTAMP_TX_OFF) |
+			(1 << HWTSTAMP_TX_ON);
+
+		info->rx_filters =
+			(1 << HWTSTAMP_FILTER_NONE) |
+			(1 << HWTSTAMP_FILTER_ALL);
+	}
+
+	return ret;
 }
 
 const struct ethtool_ops mlx4_en_ethtool_ops = {
 	.get_drvinfo = mlx4_en_get_drvinfo,
 	.get_settings = mlx4_en_get_settings,
 	.set_settings = mlx4_en_set_settings,
-#ifdef NETIF_F_TSO
-	.get_tso = mlx4_en_get_tso,
-	.set_tso = mlx4_en_set_tso,
-#endif
-	.get_sg = ethtool_op_get_sg,
-	.set_sg = ethtool_op_set_sg,
 	.get_link = ethtool_op_get_link,
-	.get_rx_csum = mlx4_en_get_rx_csum,
-	.set_rx_csum = mlx4_en_set_rx_csum,
-	.get_tx_csum = ethtool_op_get_tx_csum,
-	.set_tx_csum = ethtool_op_set_tx_ipv6_csum,
 	.get_strings = mlx4_en_get_strings,
 	.get_sset_count = mlx4_en_get_sset_count,
 	.get_ethtool_stats = mlx4_en_get_ethtool_stats,
@@ -513,8 +1601,14 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
 	.set_pauseparam = mlx4_en_set_pauseparam,
 	.get_ringparam = mlx4_en_get_ringparam,
 	.set_ringparam = mlx4_en_set_ringparam,
-	.get_flags = ethtool_op_get_flags,
-	.set_flags = ethtool_op_set_flags,
+	.get_rxnfc = mlx4_en_get_rxnfc,
+	.set_rxnfc = mlx4_en_set_rxnfc,
+	.get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,
+	.get_rxfh_indir = mlx4_en_get_rxfh_indir,
+	.set_rxfh_indir = mlx4_en_set_rxfh_indir,
+	.get_channels = mlx4_en_get_channels,
+	.set_channels = mlx4_en_set_channels,
+	.get_ts_info = mlx4_en_get_ts_info,
 };
 
 
diff --git a/sys/ofed/drivers/net/mlx4/en_main.c b/sys/ofed/drivers/net/mlx4/en_main.c
index 302be528544d..cbbf37df0e5d 100644
--- a/sys/ofed/drivers/net/mlx4/en_main.c
+++ b/sys/ofed/drivers/net/mlx4/en_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -34,6 +34,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
@@ -60,20 +61,9 @@ static const char mlx4_en_version[] =
  * Device scope module parameters
  */
 
-
-/* Enable RSS TCP traffic */
-MLX4_EN_PARM_INT(tcp_rss, 1,
-		 "Enable RSS for incomming TCP traffic or disabled (0)");
 /* Enable RSS UDP traffic */
 MLX4_EN_PARM_INT(udp_rss, 1,
-		 "Enable RSS for incomming UDP traffic or disabled (0)");
-
-/* Number of LRO sessions per Rx ring (rounded up to a power of two) */
-MLX4_EN_PARM_INT(num_lro, MLX4_EN_MAX_LRO_DESCRIPTORS,
-		 "Number of LRO sessions per ring or disabled (0)");
-
-/* Allow reassembly of fragmented IP packets */
-MLX4_EN_PARM_INT(ip_reasm, 1, "Allow reassembly of fragmented IP packets (!0)");
+		 "Enable RSS for incoming UDP traffic");
 
 /* Priority pausing */
 MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
@@ -81,20 +71,23 @@ MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
 MLX4_EN_PARM_INT(pfcrx, 0, "Priority based Flow Control policy on RX[7:0]."
 			   " Per priority bit mask");
 
+#define MAX_PFC_TX	0xff
+#define MAX_PFC_RX	0xff
+
+
 static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 {
 	struct mlx4_en_profile *params = &mdev->profile;
 	int i;
 
-	params->tcp_rss = tcp_rss;
 	params->udp_rss = udp_rss;
-        if (params->udp_rss && !(mdev->dev->caps.flags
-                                        & MLX4_DEV_CAP_FLAG_UDP_RSS)) {
+	params->num_tx_rings_p_up = min_t(int, mp_ncpus,
+			MLX4_EN_MAX_TX_RING_P_UP);
+	if (params->udp_rss && !(mdev->dev->caps.flags
+					& MLX4_DEV_CAP_FLAG_UDP_RSS)) {
 		mlx4_warn(mdev, "UDP RSS is not supported on this device.\n");
 		params->udp_rss = 0;
 	}
-	params->num_lro = min_t(int, num_lro , MLX4_EN_MAX_LRO_DESCRIPTORS);
-	params->ip_reasm = ip_reasm;
 	for (i = 1; i <= MLX4_MAX_PORTS; i++) {
 		params->prof[i].rx_pause = 1;
 		params->prof[i].rx_ppp = pfcrx;
@@ -102,14 +95,15 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 		params->prof[i].tx_ppp = pfctx;
 		params->prof[i].tx_ring_size = MLX4_EN_DEF_TX_RING_SIZE;
 		params->prof[i].rx_ring_size = MLX4_EN_DEF_RX_RING_SIZE;
-		params->prof[i].tx_ring_num = MLX4_EN_NUM_HASH_RINGS + 1 +
-			(!!pfcrx) * MLX4_EN_NUM_PPP_RINGS;
+		params->prof[i].tx_ring_num = params->num_tx_rings_p_up *
+			MLX4_EN_NUM_UP;
+		params->prof[i].rss_rings = 0;
 	}
 
 	return 0;
 }
 
-static void *get_netdev(struct mlx4_dev *dev, void *ctx, u8 port)
+static void *mlx4_en_get_netdev(struct mlx4_dev *dev, void *ctx, u8 port)
 {
 	struct mlx4_en_dev *endev = ctx;
 
@@ -138,6 +132,9 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
 		mlx4_err(mdev, "Internal error detected, restarting device\n");
 		break;
 
+	case MLX4_DEV_EVENT_SLAVE_INIT:
+	case MLX4_DEV_EVENT_SLAVE_SHUTDOWN:
+		break;
 	default:
 		if (port < 1 || port > dev->caps.num_ports ||
 		    !mdev->pndev[port])
@@ -150,7 +147,7 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
 static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
 {
 	struct mlx4_en_dev *mdev = endev_ptr;
-	int i;
+	int i, ret;
 
 	mutex_lock(&mdev->state_lock);
 	mdev->device_up = false;
@@ -162,25 +159,22 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
 
 	flush_workqueue(mdev->workqueue);
 	destroy_workqueue(mdev->workqueue);
-	mlx4_mr_free(dev, &mdev->mr);
+	ret = mlx4_mr_free(dev, &mdev->mr);
+	if (ret)
+		mlx4_err(mdev, "Error deregistering MR. The system may have become unstable.");
+	iounmap(mdev->uar_map);
 	mlx4_uar_free(dev, &mdev->priv_uar);
 	mlx4_pd_free(dev, mdev->priv_pdn);
-	sx_destroy(&mdev->state_lock.sx);
-	mtx_destroy(&mdev->uar_lock.m);
 	kfree(mdev);
 }
 
 static void *mlx4_en_add(struct mlx4_dev *dev)
 {
-	static int mlx4_en_version_printed;
 	struct mlx4_en_dev *mdev;
 	int i;
 	int err;
 
-	if (!mlx4_en_version_printed) {
-		printk(KERN_INFO "%s", mlx4_en_version);
-		mlx4_en_version_printed++;
-	}
+	printk_once(KERN_INFO "%s", mlx4_en_version);
 
 	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
 	if (!mdev) {
@@ -196,10 +190,11 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 	if (mlx4_uar_alloc(dev, &mdev->priv_uar))
 		goto err_pd;
 
-	mtx_init(&mdev->uar_lock.m, "mlx4 uar", NULL, MTX_DEF);
-	mdev->uar_map = ioremap(mdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+	mdev->uar_map = ioremap((phys_addr_t) mdev->priv_uar.pfn << PAGE_SHIFT,
+				PAGE_SIZE);
 	if (!mdev->uar_map)
 		goto err_uar;
+	spin_lock_init(&mdev->uar_lock);
 
 	mdev->dev = dev;
 	mdev->dma_device = &(dev->pdev->dev);
@@ -215,7 +210,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 			 MLX4_PERM_LOCAL_WRITE |  MLX4_PERM_LOCAL_READ,
 			 0, 0, &mdev->mr)) {
 		mlx4_err(mdev, "Failed allocating memory region\n");
-		goto err_uar;
+		goto err_map;
 	}
 	if (mlx4_mr_enable(mdev->dev, &mdev->mr)) {
 		mlx4_err(mdev, "Failed enabling memory region\n");
@@ -229,21 +224,24 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 		goto err_mr;
 	}
 
-	/* Configure wich ports to start according to module parameters */
+	/* Configure which ports to start according to module parameters */
 	mdev->port_cnt = 0;
 	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
 		mdev->port_cnt++;
 
-	/* If we did not receive an explicit number of Rx rings, default to
-	 * the number of completion vectors populated by the mlx4_core */
-	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-		mlx4_info(mdev, "Using %d tx rings for port:%d\n",
-			  mdev->profile.prof[i].tx_ring_num, i);
-		mdev->profile.prof[i].rx_ring_num = rounddown_pow_of_two(
-			min_t(int, dev->caps.num_comp_vectors, MAX_RX_RINGS));
 
-		mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
-			  mdev->profile.prof[i].rx_ring_num, i);
+	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
+		if (!dev->caps.comp_pool) {
+			mdev->profile.prof[i].rx_ring_num =
+				rounddown_pow_of_two(max_t(int, MIN_RX_RINGS,
+							   min_t(int,
+								 dev->caps.num_comp_vectors,
+								 DEF_RX_RINGS)));
+		} else {
+			mdev->profile.prof[i].rx_ring_num = rounddown_pow_of_two(
+				min_t(int, dev->caps.comp_pool/
+				      dev->caps.num_ports - 1 , MAX_MSIX_P_PORT - 1));
+		}
 	}
 
 	/* Create our own workqueue for reset/multicast tasks
@@ -257,7 +255,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 
 	/* At this stage all non-port specific tasks are complete:
 	 * mark the card state as up */
-	sx_init(&mdev->state_lock.sx, "mlxen state");
+	mutex_init(&mdev->state_lock);
 	mdev->device_up = true;
 
 	/* Setup ports */
@@ -265,32 +263,20 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 	/* Create a netdev for each port */
 	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
 		mlx4_info(mdev, "Activating port:%d\n", i);
-		if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i])) {
+		if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
 			mdev->pndev[i] = NULL;
-			goto err_free_netdev;
-		}
 	}
+
 	return mdev;
 
-
-err_free_netdev:
-	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-		if (mdev->pndev[i])
-			mlx4_en_destroy_netdev(mdev->pndev[i]);
-	}
-
-	mutex_lock(&mdev->state_lock);
-	mdev->device_up = false;
-	mutex_unlock(&mdev->state_lock);
-	flush_workqueue(mdev->workqueue);
-
-	/* Stop event queue before we drop down to release shared SW state */
-	destroy_workqueue(mdev->workqueue);
-
 err_mr:
-	mlx4_mr_free(dev, &mdev->mr);
+	err = mlx4_mr_free(dev, &mdev->mr);
+	if (err)
+		mlx4_err(mdev, "Error deregistering MR. The system may have become unstable.");
+err_map:
+	if (mdev->uar_map)
+		iounmap(mdev->uar_map);
 err_uar:
-	mtx_destroy(&mdev->uar_lock.m);
 	mlx4_uar_free(dev, &mdev->priv_uar);
 err_pd:
 	mlx4_pd_free(dev, mdev->priv_pdn);
@@ -300,73 +286,51 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
 	return NULL;
 }
 
-enum mlx4_query_reply mlx4_en_query(void *endev_ptr, void *int_dev)
-{
-	struct mlx4_en_dev *mdev = endev_ptr;
-	struct net_device *netdev = int_dev;
-	int p;
-	
-	for (p = 1; p <= MLX4_MAX_PORTS; ++p)
-		if (mdev->pndev[p] == netdev)
-			return p;
-
-	return MLX4_QUERY_NOT_MINE;
-}
-
-#if 0
-static struct pci_device_id mlx4_en_pci_table[] = {
-	{ PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */
-	{ PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */
-	{ PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */
-	{ PCI_VDEVICE(MELLANOX, 0x6732) }, /* MT25408 "Hermon" DDR PCIe gen2 */
-	{ PCI_VDEVICE(MELLANOX, 0x673c) }, /* MT25408 "Hermon" QDR PCIe gen2 */
-	{ PCI_VDEVICE(MELLANOX, 0x6368) }, /* MT25408 "Hermon" EN 10GigE */
-	{ PCI_VDEVICE(MELLANOX, 0x6750) }, /* MT25408 "Hermon" EN 10GigE PCIe gen2 */
-	{ PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */
-	{ PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */
-	{ PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2 */
-	{ PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE Virt+ */
-	{ PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX EN 40GigE PCIe 2.0 5GT/s */
-	{ PCI_VDEVICE(MELLANOX, 0x6778) }, /* MT26488 ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE Virt+ */
-	{ PCI_VDEVICE(MELLANOX, 0x1000) },
-	{ PCI_VDEVICE(MELLANOX, 0x1001) },
-	{ PCI_VDEVICE(MELLANOX, 0x1002) },
-	{ PCI_VDEVICE(MELLANOX, 0x1003) },
-	{ PCI_VDEVICE(MELLANOX, 0x1004) },
-	{ PCI_VDEVICE(MELLANOX, 0x1005) },
-	{ PCI_VDEVICE(MELLANOX, 0x1006) },
-	{ PCI_VDEVICE(MELLANOX, 0x1007) },
-	{ PCI_VDEVICE(MELLANOX, 0x1008) },
-	{ PCI_VDEVICE(MELLANOX, 0x1009) },
-	{ PCI_VDEVICE(MELLANOX, 0x100a) },
-	{ PCI_VDEVICE(MELLANOX, 0x100b) },
-	{ PCI_VDEVICE(MELLANOX, 0x100c) },
-	{ PCI_VDEVICE(MELLANOX, 0x100d) },
-	{ PCI_VDEVICE(MELLANOX, 0x100e) },
-	{ PCI_VDEVICE(MELLANOX, 0x100f) },
-	{ 0, }
-};
-
-MODULE_DEVICE_TABLE(pci, mlx4_en_pci_table);
-#endif
-
 static struct mlx4_interface mlx4_en_interface = {
-	.add	= mlx4_en_add,
-	.remove	= mlx4_en_remove,
-	.event	= mlx4_en_event,
-	.query  = mlx4_en_query,
-	.get_dev	= get_netdev,
+	.add		= mlx4_en_add,
+	.remove		= mlx4_en_remove,
+	.event		= mlx4_en_event,
+	.get_dev	= mlx4_en_get_netdev,
 	.protocol	= MLX4_PROT_ETH,
 };
 
+static void mlx4_en_verify_params(void)
+{
+        if (pfctx > MAX_PFC_TX) {
+                pr_warn("mlx4_en: WARNING: illegal module parameter pfctx 0x%x - "
+                                "should be in range 0-0x%x, will be changed to default (0)\n",
+                                pfctx, MAX_PFC_TX);
+                pfctx = 0;
+        }
+
+        if (pfcrx > MAX_PFC_RX) {
+                pr_warn("mlx4_en: WARNING: illegal module parameter pfcrx 0x%x - "
+                                "should be in range 0-0x%x, will be changed to default (0)\n",
+                                pfcrx, MAX_PFC_RX);
+                pfcrx = 0;
+        }
+}
+
+
 static int __init mlx4_en_init(void)
 {
+        mlx4_en_verify_params();
+
+#ifdef CONFIG_DEBUG_FS
+	int err = 0;
+	err = mlx4_en_register_debugfs();
+	if (err)
+		pr_err(KERN_ERR "Failed to register debugfs\n");
+#endif
 	return mlx4_register_interface(&mlx4_en_interface);
 }
 
 static void __exit mlx4_en_cleanup(void)
 {
 	mlx4_unregister_interface(&mlx4_en_interface);
+#ifdef CONFIG_DEBUG_FS
+	mlx4_en_unregister_debugfs();
+#endif
 }
 
 module_init(mlx4_en_init);
diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c
index d8b015b1407d..e76da65f288e 100644
--- a/sys/ofed/drivers/net/mlx4/en_netdev.c
+++ b/sys/ofed/drivers/net/mlx4/en_netdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,221 +31,809 @@
  *
  */
 
-#include "mlx4_en.h"
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#ifdef CONFIG_NET_RX_BUSY_POLL
+#include <net/busy_poll.h>
+#endif
+
+#include <linux/list.h>
+#include <linux/if_ether.h>
 
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/cq.h>
 
-#include <linux/delay.h>
-#include <net/ethernet.h>
-#include <net/if_vlan_var.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 
-static void mlx4_en_init_locked(struct mlx4_en_priv *priv);
+#include "mlx4_en.h"
+#include "en_port.h"
+
 static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv);
+static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv);
+static int mlx4_en_unit;
+
+#ifdef CONFIG_NET_RX_BUSY_POLL
+/* must be called with local_bh_disable()d */
+static int mlx4_en_low_latency_recv(struct napi_struct *napi)
+{
+	struct mlx4_en_cq *cq = container_of(napi, struct mlx4_en_cq, napi);
+	struct net_device *dev = cq->dev;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_rx_ring *rx_ring = priv->rx_ring[cq->ring];
+	int done;
+
+	if (!priv->port_up)
+		return LL_FLUSH_FAILED;
+
+	if (!mlx4_en_cq_lock_poll(cq))
+		return LL_FLUSH_BUSY;
+
+	done = mlx4_en_process_rx_cq(dev, cq, 4);
+#ifdef LL_EXTENDED_STATS
+	if (done)
+		rx_ring->cleaned += done;
+	else
+		rx_ring->misses++;
+#endif
+
+	mlx4_en_cq_unlock_poll(cq);
+
+	return done;
+}
+#endif	/* CONFIG_NET_RX_BUSY_POLL */
+
+#ifdef CONFIG_RFS_ACCEL
+
+struct mlx4_en_filter {
+	struct list_head next;
+	struct work_struct work;
+
+	u8     ip_proto;
+	__be32 src_ip;
+	__be32 dst_ip;
+	__be16 src_port;
+	__be16 dst_port;
+
+	int rxq_index;
+	struct mlx4_en_priv *priv;
+	u32 flow_id;			/* RFS infrastructure id */
+	int id;				/* mlx4_en driver id */
+	u64 reg_id;			/* Flow steering API id */
+	u8 activated;			/* Used to prevent expiry before filter
+					 * is attached
+					 */
+	struct hlist_node filter_chain;
+};
+
+static void mlx4_en_filter_rfs_expire(struct mlx4_en_priv *priv);
+
+static enum mlx4_net_trans_rule_id mlx4_ip_proto_to_trans_rule_id(u8 ip_proto)
+{
+	switch (ip_proto) {
+	case IPPROTO_UDP:
+		return MLX4_NET_TRANS_RULE_ID_UDP;
+	case IPPROTO_TCP:
+		return MLX4_NET_TRANS_RULE_ID_TCP;
+	default:
+		return -EPROTONOSUPPORT;
+	}
+};
+
+static void mlx4_en_filter_work(struct work_struct *work)
+{
+	struct mlx4_en_filter *filter = container_of(work,
+						     struct mlx4_en_filter,
+						     work);
+	struct mlx4_en_priv *priv = filter->priv;
+	struct mlx4_spec_list spec_tcp_udp = {
+		.id = mlx4_ip_proto_to_trans_rule_id(filter->ip_proto),
+		{
+			.tcp_udp = {
+				.dst_port = filter->dst_port,
+				.dst_port_msk = (__force __be16)-1,
+				.src_port = filter->src_port,
+				.src_port_msk = (__force __be16)-1,
+			},
+		},
+	};
+	struct mlx4_spec_list spec_ip = {
+		.id = MLX4_NET_TRANS_RULE_ID_IPV4,
+		{
+			.ipv4 = {
+				.dst_ip = filter->dst_ip,
+				.dst_ip_msk = (__force __be32)-1,
+				.src_ip = filter->src_ip,
+				.src_ip_msk = (__force __be32)-1,
+			},
+		},
+	};
+	struct mlx4_spec_list spec_eth = {
+		.id = MLX4_NET_TRANS_RULE_ID_ETH,
+	};
+	struct mlx4_net_trans_rule rule = {
+		.list = LIST_HEAD_INIT(rule.list),
+		.queue_mode = MLX4_NET_TRANS_Q_LIFO,
+		.exclusive = 1,
+		.allow_loopback = 1,
+		.promisc_mode = MLX4_FS_REGULAR,
+		.port = priv->port,
+		.priority = MLX4_DOMAIN_RFS,
+	};
+	int rc;
+	__be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+	if (spec_tcp_udp.id < 0) {
+		en_warn(priv, "RFS: ignoring unsupported ip protocol (%d)\n",
+			filter->ip_proto);
+		goto ignore;
+	}
+	list_add_tail(&spec_eth.list, &rule.list);
+	list_add_tail(&spec_ip.list, &rule.list);
+	list_add_tail(&spec_tcp_udp.list, &rule.list);
+
+	rule.qpn = priv->rss_map.qps[filter->rxq_index].qpn;
+	memcpy(spec_eth.eth.dst_mac, priv->dev->dev_addr, ETH_ALEN);
+	memcpy(spec_eth.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
+
+	filter->activated = 0;
+
+	if (filter->reg_id) {
+		rc = mlx4_flow_detach(priv->mdev->dev, filter->reg_id);
+		if (rc && rc != -ENOENT)
+			en_err(priv, "Error detaching flow. rc = %d\n", rc);
+	}
+
+	rc = mlx4_flow_attach(priv->mdev->dev, &rule, &filter->reg_id);
+	if (rc)
+		en_err(priv, "Error attaching flow. err = %d\n", rc);
+
+ignore:
+	mlx4_en_filter_rfs_expire(priv);
+
+	filter->activated = 1;
+}
+
+static inline struct hlist_head *
+filter_hash_bucket(struct mlx4_en_priv *priv, __be32 src_ip, __be32 dst_ip,
+		   __be16 src_port, __be16 dst_port)
+{
+	unsigned long l;
+	int bucket_idx;
+
+	l = (__force unsigned long)src_port |
+	    ((__force unsigned long)dst_port << 2);
+	l ^= (__force unsigned long)(src_ip ^ dst_ip);
+
+	bucket_idx = hash_long(l, MLX4_EN_FILTER_HASH_SHIFT);
+
+	return &priv->filter_hash[bucket_idx];
+}
+
+static struct mlx4_en_filter *
+mlx4_en_filter_alloc(struct mlx4_en_priv *priv, int rxq_index, __be32 src_ip,
+		     __be32 dst_ip, u8 ip_proto, __be16 src_port,
+		     __be16 dst_port, u32 flow_id)
+{
+	struct mlx4_en_filter *filter = NULL;
+
+	filter = kzalloc(sizeof(struct mlx4_en_filter), GFP_ATOMIC);
+	if (!filter)
+		return NULL;
+
+	filter->priv = priv;
+	filter->rxq_index = rxq_index;
+	INIT_WORK(&filter->work, mlx4_en_filter_work);
+
+	filter->src_ip = src_ip;
+	filter->dst_ip = dst_ip;
+	filter->ip_proto = ip_proto;
+	filter->src_port = src_port;
+	filter->dst_port = dst_port;
+
+	filter->flow_id = flow_id;
+
+	filter->id = priv->last_filter_id++ % RPS_NO_FILTER;
+
+	list_add_tail(&filter->next, &priv->filters);
+	hlist_add_head(&filter->filter_chain,
+		       filter_hash_bucket(priv, src_ip, dst_ip, src_port,
+					  dst_port));
+
+	return filter;
+}
+
+static void mlx4_en_filter_free(struct mlx4_en_filter *filter)
+{
+	struct mlx4_en_priv *priv = filter->priv;
+	int rc;
+
+	list_del(&filter->next);
+
+	rc = mlx4_flow_detach(priv->mdev->dev, filter->reg_id);
+	if (rc && rc != -ENOENT)
+		en_err(priv, "Error detaching flow. rc = %d\n", rc);
+
+	kfree(filter);
+}
+
+static inline struct mlx4_en_filter *
+mlx4_en_filter_find(struct mlx4_en_priv *priv, __be32 src_ip, __be32 dst_ip,
+		    u8 ip_proto, __be16 src_port, __be16 dst_port)
+{
+	struct hlist_node *elem;
+	struct mlx4_en_filter *filter;
+	struct mlx4_en_filter *ret = NULL;
+
+	hlist_for_each_entry(filter, elem,
+			     filter_hash_bucket(priv, src_ip, dst_ip,
+						src_port, dst_port),
+			     filter_chain) {
+		if (filter->src_ip == src_ip &&
+		    filter->dst_ip == dst_ip &&
+		    filter->ip_proto == ip_proto &&
+		    filter->src_port == src_port &&
+		    filter->dst_port == dst_port) {
+			ret = filter;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+static int
+mlx4_en_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
+		   u16 rxq_index, u32 flow_id)
+{
+	struct mlx4_en_priv *priv = netdev_priv(net_dev);
+	struct mlx4_en_filter *filter;
+	const struct iphdr *ip;
+	const __be16 *ports;
+	u8 ip_proto;
+	__be32 src_ip;
+	__be32 dst_ip;
+	__be16 src_port;
+	__be16 dst_port;
+	int nhoff = skb_network_offset(skb);
+	int ret = 0;
+
+	if (skb->protocol != htons(ETH_P_IP))
+		return -EPROTONOSUPPORT;
+
+	ip = (const struct iphdr *)(skb->data + nhoff);
+	if (ip_is_fragment(ip))
+		return -EPROTONOSUPPORT;
+
+	if ((ip->protocol != IPPROTO_TCP) && (ip->protocol != IPPROTO_UDP))
+		return -EPROTONOSUPPORT;
+	ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
+
+	ip_proto = ip->protocol;
+	src_ip = ip->saddr;
+	dst_ip = ip->daddr;
+	src_port = ports[0];
+	dst_port = ports[1];
+
+	spin_lock_bh(&priv->filters_lock);
+	filter = mlx4_en_filter_find(priv, src_ip, dst_ip, ip_proto,
+				     src_port, dst_port);
+	if (filter) {
+		if (filter->rxq_index == rxq_index)
+			goto out;
+
+		filter->rxq_index = rxq_index;
+	} else {
+		filter = mlx4_en_filter_alloc(priv, rxq_index,
+					      src_ip, dst_ip, ip_proto,
+					      src_port, dst_port, flow_id);
+		if (!filter) {
+			ret = -ENOMEM;
+			goto err;
+		}
+	}
+
+	queue_work(priv->mdev->workqueue, &filter->work);
+
+out:
+	ret = filter->id;
+err:
+	spin_unlock_bh(&priv->filters_lock);
+
+	return ret;
+}
+
+void mlx4_en_cleanup_filters(struct mlx4_en_priv *priv,
+			     struct mlx4_en_rx_ring *rx_ring)
+{
+	struct mlx4_en_filter *filter, *tmp;
+	LIST_HEAD(del_list);
+
+	spin_lock_bh(&priv->filters_lock);
+	list_for_each_entry_safe(filter, tmp, &priv->filters, next) {
+		list_move(&filter->next, &del_list);
+		hlist_del(&filter->filter_chain);
+	}
+	spin_unlock_bh(&priv->filters_lock);
+
+	list_for_each_entry_safe(filter, tmp, &del_list, next) {
+		cancel_work_sync(&filter->work);
+		mlx4_en_filter_free(filter);
+	}
+}
+
+static void mlx4_en_filter_rfs_expire(struct mlx4_en_priv *priv)
+{
+	struct mlx4_en_filter *filter = NULL, *tmp, *last_filter = NULL;
+	LIST_HEAD(del_list);
+	int i = 0;
+
+	spin_lock_bh(&priv->filters_lock);
+	list_for_each_entry_safe(filter, tmp, &priv->filters, next) {
+		if (i > MLX4_EN_FILTER_EXPIRY_QUOTA)
+			break;
+
+		if (filter->activated &&
+		    !work_pending(&filter->work) &&
+		    rps_may_expire_flow(priv->dev,
+					filter->rxq_index, filter->flow_id,
+					filter->id)) {
+			list_move(&filter->next, &del_list);
+			hlist_del(&filter->filter_chain);
+		} else
+			last_filter = filter;
+
+		i++;
+	}
+
+	if (last_filter && (&last_filter->next != priv->filters.next))
+		list_move(&priv->filters, &last_filter->next);
+
+	spin_unlock_bh(&priv->filters_lock);
+
+	list_for_each_entry_safe(filter, tmp, &del_list, next)
+		mlx4_en_filter_free(filter);
+}
+#endif
 
 static void mlx4_en_vlan_rx_add_vid(void *arg, struct net_device *dev, u16 vid)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int err;
 	int idx;
-	u8 field;
 
 	if (arg != priv)
 		return;
 
-	if ((vid == 0) || (vid > 4095))    /* Invalid */
-		return;
 	en_dbg(HW, priv, "adding VLAN:%d\n", vid);
-	idx = vid >> 5;
-	field = 1 << (vid & 0x1f);
-	spin_lock(&priv->vlan_lock);
-	priv->vlgrp_modified = true;
-	if (priv->vlan_unregister[idx] & field)
-		priv->vlan_unregister[idx] &= ~field;
-	else
-		priv->vlan_register[idx] |= field;
-	priv->vlans[idx] |= field;
-	spin_unlock(&priv->vlan_lock);
+
+	set_bit(vid, priv->active_vlans);
+
+	/* Add VID to port VLAN filter */
+	mutex_lock(&mdev->state_lock);
+	if (mdev->device_up && priv->port_up) {
+		err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
+		if (err)
+			en_err(priv, "Failed configuring VLAN filter\n");
+	}
+	if (mlx4_register_vlan(mdev->dev, priv->port, vid, &idx))
+		en_dbg(HW, priv, "failed adding vlan %d\n", vid);
+	mutex_unlock(&mdev->state_lock);
+
 }
 
 static void mlx4_en_vlan_rx_kill_vid(void *arg, struct net_device *dev, u16 vid)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
-	int idx;
-	u8 field;
+	struct mlx4_en_dev *mdev = priv->mdev;
+	int err;
 
 	if (arg != priv)
 		return;
 
-	if ((vid == 0) || (vid > 4095))    /* Invalid */
-		return;
 	en_dbg(HW, priv, "Killing VID:%d\n", vid);
-	idx = vid >> 5;
-	field = 1 << (vid & 0x1f);
-	spin_lock(&priv->vlan_lock);
-	priv->vlgrp_modified = true;
-	if (priv->vlan_register[idx] & field)
-		priv->vlan_register[idx] &= ~field;
-	else
-		priv->vlan_unregister[idx] |= field;
-	priv->vlans[idx] &= ~field;
-	spin_unlock(&priv->vlan_lock);
+
+	clear_bit(vid, priv->active_vlans);
+
+	/* Remove VID from port VLAN filter */
+	mutex_lock(&mdev->state_lock);
+	mlx4_unregister_vlan(mdev->dev, priv->port, vid);
+
+	if (mdev->device_up && priv->port_up) {
+		err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
+		if (err)
+			en_err(priv, "Failed configuring VLAN filter\n");
+	}
+	mutex_unlock(&mdev->state_lock);
+
 }
 
-u64 mlx4_en_mac_to_u64(u8 *addr)
+static int mlx4_en_uc_steer_add(struct mlx4_en_priv *priv,
+				unsigned char *mac, int *qpn, u64 *reg_id)
 {
-	u64 mac = 0;
-	int i;
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_dev *dev = mdev->dev;
+	int err;
 
-	for (i = 0; i < ETHER_ADDR_LEN; i++) {
-		mac <<= 8;
-		mac |= addr[i];
+	switch (dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_B0: {
+		struct mlx4_qp qp;
+		u8 gid[16] = {0};
+
+		qp.qpn = *qpn;
+		memcpy(&gid[10], mac, ETH_ALEN);
+		gid[5] = priv->port;
+
+		err = mlx4_unicast_attach(dev, &qp, gid, 0, MLX4_PROT_ETH);
+		break;
 	}
-	return mac;
+	case MLX4_STEERING_MODE_DEVICE_MANAGED: {
+		struct mlx4_spec_list spec_eth = { {NULL} };
+		__be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+		struct mlx4_net_trans_rule rule = {
+			.queue_mode = MLX4_NET_TRANS_Q_FIFO,
+			.exclusive = 0,
+			.allow_loopback = 1,
+			.promisc_mode = MLX4_FS_REGULAR,
+			.priority = MLX4_DOMAIN_NIC,
+		};
+
+		rule.port = priv->port;
+		rule.qpn = *qpn;
+		INIT_LIST_HEAD(&rule.list);
+
+		spec_eth.id = MLX4_NET_TRANS_RULE_ID_ETH;
+		memcpy(spec_eth.eth.dst_mac, mac, ETH_ALEN);
+		memcpy(spec_eth.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
+		list_add_tail(&spec_eth.list, &rule.list);
+
+		err = mlx4_flow_attach(dev, &rule, reg_id);
+		break;
+	}
+	default:
+		return -EINVAL;
+	}
+	if (err)
+		en_warn(priv, "Failed Attaching Unicast\n");
+
+	return err;
 }
 
-static int mlx4_en_cache_mclist(struct net_device *dev, u64 **mcaddrp)
+static void mlx4_en_uc_steer_release(struct mlx4_en_priv *priv,
+				     unsigned char *mac, int qpn, u64 reg_id)
 {
-	struct ifmultiaddr *ifma;
-	u64 *mcaddr;
-	int cnt;
-	int i;
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_dev *dev = mdev->dev;
 
-	*mcaddrp = NULL;
-restart:
-	cnt = 0;
-	if_maddr_rlock(dev);
-	TAILQ_FOREACH(ifma, &dev->if_multiaddrs, ifma_link) {
-		if (ifma->ifma_addr->sa_family != AF_LINK)
-			continue;
-		if (((struct sockaddr_dl *)ifma->ifma_addr)->sdl_alen !=
-		    ETHER_ADDR_LEN)
-			continue;
-		cnt++;
+	switch (dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_B0: {
+		struct mlx4_qp qp;
+		u8 gid[16] = {0};
+
+		qp.qpn = qpn;
+		memcpy(&gid[10], mac, ETH_ALEN);
+		gid[5] = priv->port;
+
+		mlx4_unicast_detach(dev, &qp, gid, MLX4_PROT_ETH);
+		break;
 	}
-	if_maddr_runlock(dev);
-	if (cnt == 0)
-		return (0);
-	mcaddr = kmalloc(sizeof(u64) * cnt, GFP_KERNEL);
-	if (mcaddr == NULL)
-		return (0);
-	i = 0;
-	if_maddr_rlock(dev);
-	TAILQ_FOREACH(ifma, &dev->if_multiaddrs, ifma_link) {
-		if (ifma->ifma_addr->sa_family != AF_LINK)
-			continue;
-		if (((struct sockaddr_dl *)ifma->ifma_addr)->sdl_alen !=
-		    ETHER_ADDR_LEN)
-			continue;
-		/* Make sure the list didn't grow. */
-		if (i == cnt) {
-			if_maddr_runlock(dev);
-			kfree(mcaddr);
-			goto restart;
+	case MLX4_STEERING_MODE_DEVICE_MANAGED: {
+		mlx4_flow_detach(dev, reg_id);
+		break;
+	}
+	default:
+		en_err(priv, "Invalid steering mode.\n");
+	}
+}
+
+static int mlx4_en_get_qp(struct mlx4_en_priv *priv)
+{
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_dev *dev = mdev->dev;
+	struct mlx4_mac_entry *entry;
+	int index = 0;
+	int err = 0;
+	u64 reg_id;
+	int *qpn = &priv->base_qpn;
+	u64 mac = mlx4_mac_to_u64(IF_LLADDR(priv->dev));
+
+	en_dbg(DRV, priv, "Registering MAC: %pM for adding\n",
+	       IF_LLADDR(priv->dev));
+	index = mlx4_register_mac(dev, priv->port, mac);
+	if (index < 0) {
+		err = index;
+		en_err(priv, "Failed adding MAC: %pM\n",
+		       IF_LLADDR(priv->dev));
+		return err;
+	}
+
+	if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {
+		int base_qpn = mlx4_get_base_qpn(dev, priv->port);
+		*qpn = base_qpn + index;
+		return 0;
+	}
+
+	err = mlx4_qp_reserve_range(dev, 1, 1, qpn, 0);
+	en_dbg(DRV, priv, "Reserved qp %d\n", *qpn);
+	if (err) {
+		en_err(priv, "Failed to reserve qp for mac registration\n");
+		goto qp_err;
+	}
+
+	err = mlx4_en_uc_steer_add(priv, IF_LLADDR(priv->dev), qpn, &reg_id);
+	if (err)
+		goto steer_err;
+
+	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+	if (!entry) {
+		err = -ENOMEM;
+		goto alloc_err;
+	}
+	memcpy(entry->mac, IF_LLADDR(priv->dev), sizeof(entry->mac));
+	entry->reg_id = reg_id;
+
+	hlist_add_head(&entry->hlist,
+			   &priv->mac_hash[entry->mac[MLX4_EN_MAC_HASH_IDX]]);
+
+	return 0;
+
+alloc_err:
+	mlx4_en_uc_steer_release(priv, IF_LLADDR(priv->dev), *qpn, reg_id);
+
+steer_err:
+	mlx4_qp_release_range(dev, *qpn, 1);
+
+qp_err:
+	mlx4_unregister_mac(dev, priv->port, mac);
+	return err;
+}
+
+static void mlx4_en_put_qp(struct mlx4_en_priv *priv)
+{
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_dev *dev = mdev->dev;
+	int qpn = priv->base_qpn;
+	u64 mac;
+
+	if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {
+		mac = mlx4_mac_to_u64(IF_LLADDR(priv->dev));
+		en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",
+		       IF_LLADDR(priv->dev));
+		mlx4_unregister_mac(dev, priv->port, mac);
+	} else {
+		struct mlx4_mac_entry *entry;
+		struct hlist_node *n, *tmp;
+		struct hlist_head *bucket;
+		unsigned int i;
+
+		for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {
+			bucket = &priv->mac_hash[i];
+			hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+				mac = mlx4_mac_to_u64(entry->mac);
+				en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",
+				       entry->mac);
+				mlx4_en_uc_steer_release(priv, entry->mac,
+							 qpn, entry->reg_id);
+
+				mlx4_unregister_mac(dev, priv->port, mac);
+				hlist_del(&entry->hlist);
+				kfree(entry);
+			}
 		}
-		mcaddr[i++] = mlx4_en_mac_to_u64(
-		    LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
+
+		en_dbg(DRV, priv, "Releasing qp: port %d, qpn %d\n",
+		       priv->port, qpn);
+		mlx4_qp_release_range(dev, qpn, 1);
+		priv->flags &= ~MLX4_EN_FLAG_FORCE_PROMISC;
 	}
-	if_maddr_runlock(dev);
-	*mcaddrp = mcaddr;
-	return (i);
 }
 
-static void mlx4_en_stop_port(struct net_device *dev)
+static void mlx4_en_clear_list(struct net_device *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
- 
-	queue_work(priv->mdev->workqueue, &priv->stop_port_task);
+	struct mlx4_en_mc_list *tmp, *mc_to_del;
+
+	list_for_each_entry_safe(mc_to_del, tmp, &priv->mc_list, list) {
+		list_del(&mc_to_del->list);
+		kfree(mc_to_del);
+	}
 }
 
-static void mlx4_en_start_port(struct net_device *dev)
+static void mlx4_en_cache_mclist(struct net_device *dev)
 {
+        struct ifmultiaddr *ifma;
+	struct mlx4_en_mc_list *tmp;
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 
-	queue_work(priv->mdev->workqueue, &priv->start_port_task);
+        TAILQ_FOREACH(ifma, &dev->if_multiaddrs, ifma_link) {
+                if (ifma->ifma_addr->sa_family != AF_LINK)
+                        continue;
+                if (((struct sockaddr_dl *)ifma->ifma_addr)->sdl_alen !=
+                                ETHER_ADDR_LEN)
+                        continue;
+                /* Make sure the list didn't grow. */
+		tmp = kzalloc(sizeof(struct mlx4_en_mc_list), GFP_ATOMIC);
+		memcpy(tmp->addr,
+			LLADDR((struct sockaddr_dl *)ifma->ifma_addr), ETH_ALEN);
+		list_add_tail(&tmp->list, &priv->mc_list);
+        }
 }
 
-static void mlx4_en_set_multicast(struct net_device *dev)
+static void update_mclist_flags(struct mlx4_en_priv *priv,
+				struct list_head *dst,
+				struct list_head *src)
+{
+	struct mlx4_en_mc_list *dst_tmp, *src_tmp, *new_mc;
+	bool found;
+
+	/* Find all the entries that should be removed from dst,
+	 * These are the entries that are not found in src
+	 */
+	list_for_each_entry(dst_tmp, dst, list) {
+		found = false;
+		list_for_each_entry(src_tmp, src, list) {
+			if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
+				found = true;
+				break;
+			}
+		}
+		if (!found)
+			dst_tmp->action = MCLIST_REM;
+	}
+
+	/* Add entries that exist in src but not in dst
+	 * mark them as need to add
+	 */
+	list_for_each_entry(src_tmp, src, list) {
+		found = false;
+		list_for_each_entry(dst_tmp, dst, list) {
+			if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
+				dst_tmp->action = MCLIST_NONE;
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			new_mc = kmalloc(sizeof(struct mlx4_en_mc_list),
+					 GFP_KERNEL);
+			if (!new_mc) {
+				en_err(priv, "Failed to allocate current multicast list\n");
+				return;
+			}
+			memcpy(new_mc, src_tmp,
+			       sizeof(struct mlx4_en_mc_list));
+			new_mc->action = MCLIST_ADD;
+			list_add_tail(&new_mc->list, dst);
+		}
+	}
+}
+
+static void mlx4_en_set_rx_mode(struct net_device *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 
 	if (!priv->port_up)
 		return;
 
-	queue_work(priv->mdev->workqueue, &priv->mcast_task);
+	queue_work(priv->mdev->workqueue, &priv->rx_mode_task);
 }
 
-static void mlx4_en_do_set_multicast(struct work_struct *work)
+static void mlx4_en_set_promisc_mode(struct mlx4_en_priv *priv,
+				     struct mlx4_en_dev *mdev)
 {
-	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
-						 mcast_task);
-	struct net_device *dev = priv->dev;
-	struct mlx4_en_dev *mdev = priv->mdev;
-	int err;
+	int err = 0;
+	if (!(priv->flags & MLX4_EN_FLAG_PROMISC)) {
+		priv->flags |= MLX4_EN_FLAG_PROMISC;
 
-	mutex_lock(&mdev->state_lock);
-	if (!mdev->device_up) {
-		en_dbg(HW, priv, "Card is not up, "
-				 "ignoring multicast change.\n");
-		goto out;
-	}
-	if (!priv->port_up) {
-		en_dbg(HW, priv, "Port is down, "
-				 "ignoring  multicast change.\n");
-		goto out;
-	}
-
-	/*
-	 * Promsicuous mode: disable all filters
-	 */
-
-	if (dev->if_flags & IFF_PROMISC) {
-		if (!(priv->flags & MLX4_EN_FLAG_PROMISC)) {
-			priv->flags |= MLX4_EN_FLAG_PROMISC;
-
-			/* Enable promiscouos mode */
-			err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-						     priv->base_qpn, 1);
+		/* Enable promiscouos mode */
+		switch (mdev->dev->caps.steering_mode) {
+		case MLX4_STEERING_MODE_DEVICE_MANAGED:
+			err = mlx4_flow_steer_promisc_add(mdev->dev,
+							  priv->port,
+							  priv->base_qpn,
+							  MLX4_FS_ALL_DEFAULT);
 			if (err)
-				en_err(priv, "Failed enabling "
-					     "promiscous mode\n");
+				en_err(priv, "Failed enabling promiscuous mode\n");
+			priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+			break;
 
-			/* Disable port multicast filter (unconditionally) */
-			err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
-						  0, MLX4_MCAST_DISABLE);
+		case MLX4_STEERING_MODE_B0:
+			err = mlx4_unicast_promisc_add(mdev->dev,
+						       priv->base_qpn,
+						       priv->port);
 			if (err)
-				en_err(priv, "Failed disabling "
-					     "multicast filter\n");
+				en_err(priv, "Failed enabling unicast promiscuous mode\n");
 
-			/* Disable port VLAN filter */
-			err = mlx4_SET_VLAN_FLTR(mdev->dev, priv->port, NULL);
+			/* Add the default qp number as multicast
+			 * promisc
+			 */
+			if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+				err = mlx4_multicast_promisc_add(mdev->dev,
+								 priv->base_qpn,
+								 priv->port);
+				if (err)
+					en_err(priv, "Failed enabling multicast promiscuous mode\n");
+				priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+			}
+			break;
+
+		case MLX4_STEERING_MODE_A0:
+			err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+						     priv->port,
+						     priv->base_qpn,
+						     1);
 			if (err)
-				en_err(priv, "Failed disabling VLAN filter\n");
+				en_err(priv, "Failed enabling promiscuous mode\n");
+			break;
 		}
-		goto out;
+
+		/* Disable port multicast filter (unconditionally) */
+		err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
+					  0, MLX4_MCAST_DISABLE);
+		if (err)
+			en_err(priv, "Failed disabling multicast filter\n");
 	}
+}
 
-	/*
-	 * Not in promiscous mode
-	 */
+static void mlx4_en_clear_promisc_mode(struct mlx4_en_priv *priv,
+				       struct mlx4_en_dev *mdev)
+{
+	int err = 0;
 
-	if (priv->flags & MLX4_EN_FLAG_PROMISC) {
-		priv->flags &= ~MLX4_EN_FLAG_PROMISC;
+	priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
-		/* Disable promiscouos mode */
-		err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
+	/* Disable promiscouos mode */
+	switch (mdev->dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_DEVICE_MANAGED:
+		err = mlx4_flow_steer_promisc_remove(mdev->dev,
+						     priv->port,
+						     MLX4_FS_ALL_DEFAULT);
+		if (err)
+			en_err(priv, "Failed disabling promiscuous mode\n");
+		priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+		break;
+
+	case MLX4_STEERING_MODE_B0:
+		err = mlx4_unicast_promisc_remove(mdev->dev,
+						  priv->base_qpn,
+						  priv->port);
+		if (err)
+			en_err(priv, "Failed disabling unicast promiscuous mode\n");
+		/* Disable Multicast promisc */
+		if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+			err = mlx4_multicast_promisc_remove(mdev->dev,
+							    priv->base_qpn,
+							    priv->port);
+			if (err)
+				en_err(priv, "Failed disabling multicast promiscuous mode\n");
+			priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+		}
+		break;
+
+	case MLX4_STEERING_MODE_A0:
+		err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+					     priv->port,
 					     priv->base_qpn, 0);
 		if (err)
-			en_err(priv, "Failed disabling promiscous mode\n");
-
-		/* Enable port VLAN filter */
-		err = mlx4_SET_VLAN_FLTR(mdev->dev, priv->port, priv->vlans);
-		if (err)
-			en_err(priv, "Failed enabling VLAN filter\n");
+			en_err(priv, "Failed disabling promiscuous mode\n");
+		break;
 	}
+}
+
+static void mlx4_en_do_multicast(struct mlx4_en_priv *priv,
+				 struct net_device *dev,
+				 struct mlx4_en_dev *mdev)
+{
+	struct mlx4_en_mc_list *mclist, *tmp;
+	u8 mc_list[16] = {0};
+	int err = 0;
+	u64 mcast_addr = 0;
+
 
 	/* Enable/disable the multicast filter according to IFF_ALLMULTI */
 	if (dev->if_flags & IFF_ALLMULTI) {
@@ -253,10 +841,53 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
 					  0, MLX4_MCAST_DISABLE);
 		if (err)
 			en_err(priv, "Failed disabling multicast filter\n");
+
+		/* Add the default qp number as multicast promisc */
+		if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+			switch (mdev->dev->caps.steering_mode) {
+			case MLX4_STEERING_MODE_DEVICE_MANAGED:
+				err = mlx4_flow_steer_promisc_add(mdev->dev,
+								  priv->port,
+								  priv->base_qpn,
+								  MLX4_FS_MC_DEFAULT);
+				break;
+
+			case MLX4_STEERING_MODE_B0:
+				err = mlx4_multicast_promisc_add(mdev->dev,
+								 priv->base_qpn,
+								 priv->port);
+				break;
+
+			case MLX4_STEERING_MODE_A0:
+				break;
+			}
+			if (err)
+				en_err(priv, "Failed entering multicast promisc mode\n");
+			priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+		}
 	} else {
-		u64 *mcaddr;
-		int mccount;
-		int i;
+		/* Disable Multicast promisc */
+		if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+			switch (mdev->dev->caps.steering_mode) {
+			case MLX4_STEERING_MODE_DEVICE_MANAGED:
+				err = mlx4_flow_steer_promisc_remove(mdev->dev,
+								     priv->port,
+								     MLX4_FS_MC_DEFAULT);
+				break;
+
+			case MLX4_STEERING_MODE_B0:
+				err = mlx4_multicast_promisc_remove(mdev->dev,
+								    priv->base_qpn,
+								    priv->port);
+				break;
+
+			case MLX4_STEERING_MODE_A0:
+				break;
+			}
+			if (err)
+				en_err(priv, "Failed disabling multicast promiscuous mode\n");
+			priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+		}
 
 		err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
 					  0, MLX4_MCAST_DISABLE);
@@ -269,17 +900,93 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
 
 		/* Update multicast list - we cache all addresses so they won't
 		 * change while HW is updated holding the command semaphor */
-		mccount = mlx4_en_cache_mclist(dev, &mcaddr);
-		for (i = 0; i < mccount; i++)
+		mlx4_en_cache_mclist(dev);
+		list_for_each_entry(mclist, &priv->mc_list, list) {
+			mcast_addr = mlx4_mac_to_u64(mclist->addr);
 			mlx4_SET_MCAST_FLTR(mdev->dev, priv->port,
-					    mcaddr[i], 0, MLX4_MCAST_CONFIG);
+					mcast_addr, 0, MLX4_MCAST_CONFIG);
+		}
 		err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
 					  0, MLX4_MCAST_ENABLE);
 		if (err)
 			en_err(priv, "Failed enabling multicast filter\n");
 
-		kfree(mcaddr);
+		update_mclist_flags(priv, &priv->curr_list, &priv->mc_list);
+		list_for_each_entry_safe(mclist, tmp, &priv->curr_list, list) {
+			if (mclist->action == MCLIST_REM) {
+				/* detach this address and delete from list */
+				memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
+				mc_list[5] = priv->port;
+				err = mlx4_multicast_detach(mdev->dev,
+							    &priv->rss_map.indir_qp,
+							    mc_list,
+							    MLX4_PROT_ETH,
+							    mclist->reg_id);
+				if (err)
+					en_err(priv, "Fail to detach multicast address\n");
+
+				/* remove from list */
+				list_del(&mclist->list);
+				kfree(mclist);
+			} else if (mclist->action == MCLIST_ADD) {
+				/* attach the address */
+				memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
+				/* needed for B0 steering support */
+				mc_list[5] = priv->port;
+				err = mlx4_multicast_attach(mdev->dev,
+							    &priv->rss_map.indir_qp,
+							    mc_list,
+							    priv->port, 0,
+							    MLX4_PROT_ETH,
+							    &mclist->reg_id);
+				if (err)
+					en_err(priv, "Fail to attach multicast address\n");
+
+			}
+		}
 	}
+}
+
+static void mlx4_en_do_set_rx_mode(struct work_struct *work)
+{
+	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
+						 rx_mode_task);
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct net_device *dev = priv->dev;
+
+
+	mutex_lock(&mdev->state_lock);
+	if (!mdev->device_up) {
+		en_dbg(HW, priv, "Card is not up, ignoring rx mode change.\n");
+		goto out;
+	}
+	if (!priv->port_up) {
+		en_dbg(HW, priv, "Port is down, ignoring rx mode change.\n");
+		goto out;
+	}
+	if (!mlx4_en_QUERY_PORT(mdev, priv->port)) {
+		if (priv->port_state.link_state) {
+			priv->last_link_state = MLX4_DEV_EVENT_PORT_UP;
+			/* Important note: the following call for if_link_state_change
+			 * is needed for interface up scenario (start port, link state
+			 * change) */
+			if_link_state_change(priv->dev, LINK_STATE_UP);
+			en_dbg(HW, priv, "Link Up\n");
+		}
+	}
+
+	/* Promsicuous mode: disable all filters */
+	if ((dev->if_flags & IFF_PROMISC) ||
+	    (priv->flags & MLX4_EN_FLAG_FORCE_PROMISC)) {
+		mlx4_en_set_promisc_mode(priv, mdev);
+		goto out;
+	}
+
+	/* Not in promiscuous mode */
+	if (priv->flags & MLX4_EN_FLAG_PROMISC)
+		mlx4_en_clear_promisc_mode(priv, mdev);
+
+	mlx4_en_do_multicast(priv, dev, mdev);
 out:
 	mutex_unlock(&mdev->state_lock);
 }
@@ -293,7 +1000,7 @@ static void mlx4_en_netpoll(struct net_device *dev)
 	int i;
 
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		cq = &priv->rx_cq[i];
+		cq = priv->rx_cq[i];
 		spin_lock_irqsave(&cq->lock, flags);
 		napi_synchronize(&cq->napi);
 		mlx4_en_process_rx_cq(dev, cq, 0);
@@ -304,38 +1011,40 @@ static void mlx4_en_netpoll(struct net_device *dev)
 
 static void mlx4_en_watchdog_timeout(void *arg)
 {
-	struct mlx4_en_priv *priv = arg;
-	struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_priv *priv = arg;
+        struct mlx4_en_dev *mdev = priv->mdev;
 
-	en_dbg(DRV, priv, "Scheduling watchdog\n");
-	queue_work(mdev->workqueue, &priv->watchdog_task);
-	if (priv->port_up)
-		callout_reset(&priv->watchdog_timer, MLX4_EN_WATCHDOG_TIMEOUT,
-		    mlx4_en_watchdog_timeout, priv);
+        en_dbg(DRV, priv, "Scheduling watchdog\n");
+        queue_work(mdev->workqueue, &priv->watchdog_task);
+        if (priv->port_up)
+                callout_reset(&priv->watchdog_timer, MLX4_EN_WATCHDOG_TIMEOUT,
+                                mlx4_en_watchdog_timeout, priv);
 }
 
 
-/* XXX This clears user settings in too many cases. */
+
 static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 {
 	struct mlx4_en_cq *cq;
 	int i;
 
 	/* If we haven't received a specific coalescing setting
-	 * (module param), we set the moderation paramters as follows:
+	 * (module param), we set the moderation parameters as follows:
 	 * - moder_cnt is set to the number of mtu sized packets to
 	 *   satisfy our coelsing target.
 	 * - moder_time is set to a fixed value.
 	 */
 	priv->rx_frames = MLX4_EN_RX_COAL_TARGET / priv->dev->if_mtu + 1;
 	priv->rx_usecs = MLX4_EN_RX_COAL_TIME;
-	en_dbg(INTR, priv, "Default coalesing params for mtu:%u - "
-			   "rx_frames:%d rx_usecs:%d\n",
-		 priv->dev->if_mtu, priv->rx_frames, priv->rx_usecs);
+	priv->tx_frames = MLX4_EN_TX_COAL_PKTS;
+	priv->tx_usecs = MLX4_EN_TX_COAL_TIME;
+	en_dbg(INTR, priv, "Default coalesing params for mtu: %u - "
+	       "rx_frames:%d rx_usecs:%d\n",
+	       (unsigned)priv->dev->if_mtu, priv->rx_frames, priv->rx_usecs);
 
 	/* Setup cq moderation params */
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		cq = &priv->rx_cq[i];
+		cq = priv->rx_cq[i];
 		cq->moder_cnt = priv->rx_frames;
 		cq->moder_time = priv->rx_usecs;
 		priv->last_moder_time[i] = MLX4_EN_AUTO_CONF;
@@ -344,9 +1053,9 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 	}
 
 	for (i = 0; i < priv->tx_ring_num; i++) {
-		cq = &priv->tx_cq[i];
-		cq->moder_cnt = MLX4_EN_TX_COAL_PKTS;
-		cq->moder_time = MLX4_EN_TX_COAL_TIME;
+		cq = priv->tx_cq[i];
+		cq->moder_cnt = priv->tx_frames;
+		cq->moder_time = priv->tx_usecs;
 	}
 
 	/* Reset auto-moderation params */
@@ -375,10 +1084,11 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 
 	if (!priv->adaptive_rx_coal || period < priv->sample_interval * HZ)
 		return;
+
 	for (ring = 0; ring < priv->rx_ring_num; ring++) {
-		spin_lock(&priv->stats_lock);
-		rx_packets = priv->rx_ring[ring].packets;
-		rx_bytes = priv->rx_ring[ring].bytes;
+                spin_lock(&priv->stats_lock);
+		rx_packets = priv->rx_ring[ring]->packets;
+		rx_bytes = priv->rx_ring[ring]->bytes;
 		spin_unlock(&priv->stats_lock);
 
 		rx_pkt_diff = ((unsigned long) (rx_packets -
@@ -389,11 +1099,10 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 				priv->last_moder_bytes[ring])) / packets : 0;
 
 		/* Apply auto-moderation only when packet rate
-		* exceeds a rate that it matters */
+		 * exceeds a rate that it matters */
 		if (rate > (MLX4_EN_RX_RATE_THRESH / priv->rx_ring_num) &&
-				avg_pkt_size > MLX4_EN_AVG_PKT_SMALL) {
-			if (rate < priv->pkt_rate_low ||
-			    avg_pkt_size < MLX4_EN_AVG_PKT_SMALL)
+		    avg_pkt_size > MLX4_EN_AVG_PKT_SMALL) {
+			if (rate < priv->pkt_rate_low)
 				moder_time = priv->rx_usecs_low;
 			else if (rate > priv->pkt_rate_high)
 				moder_time = priv->rx_usecs_high;
@@ -408,12 +1117,12 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 
 		if (moder_time != priv->last_moder_time[ring]) {
 			priv->last_moder_time[ring] = moder_time;
-			cq = &priv->rx_cq[ring];
+			cq = priv->rx_cq[ring];
 			cq->moder_time = moder_time;
 			err = mlx4_en_set_cq_moder(priv, cq);
 			if (err)
-				en_err(priv, "Failed modifying moderation "
-					"for cq:%d\n", ring);
+				en_err(priv, "Failed modifying moderation for cq:%d\n",
+				       ring);
 		}
 		priv->last_moder_packets[ring] = rx_packets;
 		priv->last_moder_bytes[ring] = rx_bytes;
@@ -422,47 +1131,6 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 	priv->last_moder_jiffies = jiffies;
 }
 
-static void mlx4_en_handle_vlans(struct mlx4_en_priv *priv)
-{
-	u8 vlan_register[VLAN_FLTR_SIZE];
-	u8 vlan_unregister[VLAN_FLTR_SIZE];
-	int i, j, idx;
-	u16 vid;
-
-	/* cache the vlan data for processing 
-	 * done under lock to avoid changes during work */
-	spin_lock(&priv->vlan_lock);
-	for (i = 0; i < VLAN_FLTR_SIZE; i++) {
-		vlan_register[i] = priv->vlan_register[i];
-		priv->vlan_register[i] = 0;
-		vlan_unregister[i] = priv->vlan_unregister[i];
-		priv->vlan_unregister[i] = 0;
-	}
-	priv->vlgrp_modified = false;
-	spin_unlock(&priv->vlan_lock);
-
-	/* Configure the vlan filter 
-	 * The vlgrp is updated with all the vids that need to be allowed */
-	if (mlx4_SET_VLAN_FLTR(priv->mdev->dev, priv->port, priv->vlans))
-		en_err(priv, "Failed configuring VLAN filter\n");
-
-	/* Configure the VLAN table */
-	for (i = 0; i < VLAN_FLTR_SIZE; i++) {
-		for (j = 0; j < 32; j++) {
-			vid = (i << 5) + j;
-			if (vlan_register[i] & (1 << j))
-				if (mlx4_register_vlan(priv->mdev->dev, priv->port, vid, &idx))
-					en_dbg(HW, priv, "failed registering vlan %d\n", vid);
-			if (vlan_unregister[i] & (1 << j)) {
-				if (!mlx4_find_cached_vlan(priv->mdev->dev, priv->port, vid, &idx))
-					mlx4_unregister_vlan(priv->mdev->dev, priv->port, idx);
-				else
-					en_dbg(HW, priv, "could not find vid %d in cache\n", vid);
-			}
-		}
-	}
-}
-
 static void mlx4_en_do_get_stats(struct work_struct *work)
 {
 	struct delayed_work *delay = to_delayed_work(work);
@@ -471,23 +1139,36 @@ static void mlx4_en_do_get_stats(struct work_struct *work)
 	struct mlx4_en_dev *mdev = priv->mdev;
 	int err;
 
-	err = mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 0);
-	if (err)
-		en_dbg(HW, priv, "Could not update stats \n");
-
-
 	mutex_lock(&mdev->state_lock);
 	if (mdev->device_up) {
 		if (priv->port_up) {
-			if (priv->vlgrp_modified)
-				mlx4_en_handle_vlans(priv);
+                        err = mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 0);
+			if (err)
+				en_dbg(HW, priv, "Could not update stats\n");
 
 			mlx4_en_auto_moderation(priv);
 		}
 
 		queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
 	}
-	mlx4_en_QUERY_PORT(priv->mdev, priv->port);
+	mutex_unlock(&mdev->state_lock);
+}
+
+/* mlx4_en_service_task - Run service task for tasks that needed to be done
+ * periodically
+ */
+static void mlx4_en_service_task(struct work_struct *work)
+{
+	struct delayed_work *delay = to_delayed_work(work);
+	struct mlx4_en_priv *priv = container_of(delay, struct mlx4_en_priv,
+						 service_task);
+	struct mlx4_en_dev *mdev = priv->mdev;
+
+	mutex_lock(&mdev->state_lock);
+	if (mdev->device_up) {
+		queue_delayed_work(mdev->workqueue, &priv->service_task,
+				   SERVICE_TASK_DELAY);
+	}
 	mutex_unlock(&mdev->state_lock);
 }
 
@@ -503,8 +1184,15 @@ static void mlx4_en_linkstate(struct work_struct *work)
 	 * report to system log */
 	if (priv->last_link_state != linkstate) {
 		if (linkstate == MLX4_DEV_EVENT_PORT_DOWN) {
+			en_info(priv, "Link Down\n");
 			if_link_state_change(priv->dev, LINK_STATE_DOWN);
-		} else {
+		/* make sure the port is up before notifying the OS. 
+		 * This is tricky since we get here on INIT_PORT and 
+		 * in such case we can't tell the OS the port is up.
+		 * To solve this there is a call to if_link_state_change
+		 * in set_rx_mode.
+		 * */
+		} else if (priv->port_up && (linkstate == MLX4_DEV_EVENT_PORT_UP)){
 			en_info(priv, "Link Up\n");
 			if_link_state_change(priv->dev, LINK_STATE_UP);
 		}
@@ -513,51 +1201,38 @@ static void mlx4_en_linkstate(struct work_struct *work)
 	mutex_unlock(&mdev->state_lock);
 }
 
-static void mlx4_en_lock_and_stop_port(struct work_struct *work)
-{
-	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
-						 stop_port_task);
-	struct net_device *dev = priv->dev;
-	struct mlx4_en_dev *mdev = priv->mdev;
- 
-	mutex_lock(&mdev->state_lock);
-	mlx4_en_do_stop_port(dev);
-	mutex_unlock(&mdev->state_lock);
-}
 
-static void mlx4_en_lock_and_start_port(struct work_struct *work)
-{
-	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
-						 start_port_task);
-	struct net_device *dev = priv->dev;
-	struct mlx4_en_dev *mdev = priv->mdev;
-
-	mutex_lock(&mdev->state_lock);
-	mlx4_en_do_start_port(dev);
-	mutex_unlock(&mdev->state_lock);
-}
-
-int mlx4_en_do_start_port(struct net_device *dev)
+int mlx4_en_start_port(struct net_device *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	struct mlx4_en_dev *mdev = priv->mdev;
 	struct mlx4_en_cq *cq;
 	struct mlx4_en_tx_ring *tx_ring;
-	u64 config;
 	int rx_index = 0;
 	int tx_index = 0;
 	int err = 0;
 	int i;
 	int j;
+	u8 mc_list[16] = {0};
+
 
 	if (priv->port_up) {
 		en_dbg(DRV, priv, "start port called while port already up\n");
 		return 0;
 	}
 
+	INIT_LIST_HEAD(&priv->mc_list);
+	INIT_LIST_HEAD(&priv->curr_list);
+	INIT_LIST_HEAD(&priv->ethtool_list);
+
 	/* Calculate Rx buf size */
 	dev->if_mtu = min(dev->if_mtu, priv->max_mtu);
-	mlx4_en_calc_rx_buf(dev);
+        mlx4_en_calc_rx_buf(dev);
+	priv->rx_alloc_size = max_t(int, 2 * roundup_pow_of_two(priv->rx_mb_size),
+				    PAGE_SIZE);
+	priv->rx_alloc_order = get_order(priv->rx_alloc_size);
+	priv->rx_buf_size = roundup_pow_of_two(priv->rx_mb_size);
+	priv->log_rx_info = ROUNDUP_LOG2(sizeof(struct mlx4_en_rx_buf));
 	en_dbg(DRV, priv, "Rx buf size:%d\n", priv->rx_mb_size);
 
 	/* Configure rx cq's and rings */
@@ -566,11 +1241,11 @@ int mlx4_en_do_start_port(struct net_device *dev)
 		en_err(priv, "Failed to activate RX rings\n");
 		return err;
 	}
-
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		cq = &priv->rx_cq[i];
+		cq = priv->rx_cq[i];
 
-		err = mlx4_en_activate_cq(priv, cq);
+		mlx4_en_cq_init_lock(cq);
+		err = mlx4_en_activate_cq(priv, cq, i);
 		if (err) {
 			en_err(priv, "Failed activating Rx CQ\n");
 			goto cq_err;
@@ -584,21 +1259,41 @@ int mlx4_en_do_start_port(struct net_device *dev)
 			goto cq_err;
 		}
 		mlx4_en_arm_cq(priv, cq);
-		priv->rx_ring[i].cqn = cq->mcq.cqn;
+		priv->rx_ring[i]->cqn = cq->mcq.cqn;
 		++rx_index;
 	}
 
+	/* Set qp number */
+	en_dbg(DRV, priv, "Getting qp number for port %d\n", priv->port);
+	err = mlx4_en_get_qp(priv);
+	if (err) {
+		en_err(priv, "Failed getting eth qp\n");
+		goto cq_err;
+	}
+	mdev->mac_removed[priv->port] = 0;
+
+	/* gets default allocated counter index from func cap */
+	/* or sink counter index if no resources */
+	priv->counter_index = mdev->dev->caps.def_counter_index[priv->port - 1];
+
+	en_dbg(DRV, priv, "%s: default counter index %d for port %d\n",
+	       __func__, priv->counter_index, priv->port);
+
 	err = mlx4_en_config_rss_steer(priv);
 	if (err) {
 		en_err(priv, "Failed configuring rss steering\n");
-		goto cq_err;
+		goto mac_err;
 	}
 
+	err = mlx4_en_create_drop_qp(priv);
+	if (err)
+		goto rss_err;
+
 	/* Configure tx cq's and rings */
 	for (i = 0; i < priv->tx_ring_num; i++) {
 		/* Configure cq */
-		cq = &priv->tx_cq[i];
-		err = mlx4_en_activate_cq(priv, cq);
+		cq = priv->tx_cq[i];
+		err = mlx4_en_activate_cq(priv, cq, i);
 		if (err) {
 			en_err(priv, "Failed allocating Tx CQ\n");
 			goto tx_err;
@@ -613,13 +1308,19 @@ int mlx4_en_do_start_port(struct net_device *dev)
 		cq->buf->wqe_index = cpu_to_be16(0xffff);
 
 		/* Configure ring */
-		tx_ring = &priv->tx_ring[i];
-		err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn);
+		tx_ring = priv->tx_ring[i];
+
+		err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn,
+					       i / priv->num_tx_rings_p_up);
 		if (err) {
 			en_err(priv, "Failed allocating Tx ring\n");
 			mlx4_en_deactivate_cq(priv, cq);
 			goto tx_err;
 		}
+
+		/* Arm CQ for TX completions */
+		mlx4_en_arm_cq(priv, cq);
+
 		/* Set initial ownership of all Tx TXBBs to SW (1) */
 		for (j = 0; j < tx_ring->buf_size; j += STAMP_STRIDE)
 			*((u32 *) (tx_ring->buf + j)) = 0xffffffff;
@@ -628,14 +1329,14 @@ int mlx4_en_do_start_port(struct net_device *dev)
 
 	/* Configure port */
 	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
-				    priv->rx_mb_size + ETHER_CRC_LEN,
+				    priv->rx_mb_size,
 				    priv->prof->tx_pause,
 				    priv->prof->tx_ppp,
 				    priv->prof->rx_pause,
 				    priv->prof->rx_ppp);
 	if (err) {
-		en_err(priv, "Failed setting port general configurations "
-			     "for port %d, with error %d\n", priv->port, err);
+		en_err(priv, "Failed setting port general configurations for port %d, with error %d\n",
+		       priv->port, err);
 		goto tx_err;
 	}
 	/* Set default qp number */
@@ -644,134 +1345,166 @@ int mlx4_en_do_start_port(struct net_device *dev)
 		en_err(priv, "Failed setting default qp numbers\n");
 		goto tx_err;
 	}
-	/* Set port mac number */
-	en_dbg(DRV, priv, "Setting mac for port %d\n", priv->port);
-	err = mlx4_register_mac(mdev->dev, priv->port,
-				mlx4_en_mac_to_u64(IF_LLADDR(dev)));
-	if (err < 0) {
-		en_err(priv, "Failed setting port mac err=%d\n", err);
-		goto tx_err;
-	}
-	mdev->mac_removed[priv->port] = 0;
 
 	/* Init port */
 	en_dbg(HW, priv, "Initializing port\n");
 	err = mlx4_INIT_PORT(mdev->dev, priv->port);
 	if (err) {
 		en_err(priv, "Failed Initializing port\n");
-		goto mac_err;
+		goto tx_err;
 	}
 
-	/* Set the various hardware offload abilities */
-	dev->if_hwassist = 0;
-	if (dev->if_capenable & IFCAP_TSO4)
-		dev->if_hwassist |= CSUM_TSO;
-	if (dev->if_capenable & IFCAP_TXCSUM)
-		dev->if_hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP);
-	if (dev->if_capenable & IFCAP_RXCSUM)
-		priv->rx_csum = 1;
-	else
-		priv->rx_csum = 0;
+	/* Attach rx QP to bradcast address */
+	memset(&mc_list[10], 0xff, ETH_ALEN);
+	mc_list[5] = priv->port; /* needed for B0 steering support */
+	if (mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
+				  priv->port, 0, MLX4_PROT_ETH,
+				  &priv->broadcast_id))
+		mlx4_warn(mdev, "Failed Attaching Broadcast\n");
 
-	err = mlx4_wol_read(priv->mdev->dev, &config, priv->port);
-	if (err) {
-		en_err(priv, "Failed to get WoL info, unable to modify\n");
-		goto wol_err;
-	}
-	if (dev->if_capenable & IFCAP_WOL_MAGIC) {
-		config |= MLX4_EN_WOL_DO_MODIFY | MLX4_EN_WOL_ENABLED |
-		    MLX4_EN_WOL_MAGIC;
-	} else {
-		config &= ~(MLX4_EN_WOL_ENABLED | MLX4_EN_WOL_MAGIC);
-		config |= MLX4_EN_WOL_DO_MODIFY;
-	}
+	/* Must redo promiscuous mode setup. */
+	priv->flags &= ~(MLX4_EN_FLAG_PROMISC | MLX4_EN_FLAG_MC_PROMISC);
 
-	err = mlx4_wol_write(priv->mdev->dev, config, priv->port);
-	if (err) {
-		en_err(priv, "Failed to set WoL information\n");
-		goto wol_err;
-	}
+	/* Schedule multicast task to populate multicast list */
+	queue_work(mdev->workqueue, &priv->rx_mode_task);
+
+	mlx4_set_stats_bitmap(mdev->dev, priv->stats_bitmap);
 
 	priv->port_up = true;
 
-	/* Populate multicast list */
-	mlx4_en_set_multicast(dev);
+        /* Enable the queues. */
+        dev->if_drv_flags &= ~IFF_DRV_OACTIVE;
+        dev->if_drv_flags |= IFF_DRV_RUNNING;
+#ifdef CONFIG_DEBUG_FS
+	mlx4_en_create_debug_files(priv);
+#endif
+        callout_reset(&priv->watchdog_timer, MLX4_EN_WATCHDOG_TIMEOUT,
+                    mlx4_en_watchdog_timeout, priv);
 
-	/* Enable the queues. */
-	dev->if_drv_flags &= ~IFF_DRV_OACTIVE;
-	dev->if_drv_flags |= IFF_DRV_RUNNING;
-
-	callout_reset(&priv->watchdog_timer, MLX4_EN_WATCHDOG_TIMEOUT,
-	    mlx4_en_watchdog_timeout, priv);
 
 	return 0;
 
-wol_err:
-	/* close port*/
-	mlx4_CLOSE_PORT(mdev->dev, priv->port);
-
-mac_err:
-	mlx4_unregister_mac(mdev->dev, priv->port, priv->mac);
 tx_err:
 	while (tx_index--) {
-		mlx4_en_deactivate_tx_ring(priv, &priv->tx_ring[tx_index]);
-		mlx4_en_deactivate_cq(priv, &priv->tx_cq[tx_index]);
+		mlx4_en_deactivate_tx_ring(priv, priv->tx_ring[tx_index]);
+		mlx4_en_deactivate_cq(priv, priv->tx_cq[tx_index]);
 	}
-
+	mlx4_en_destroy_drop_qp(priv);
+rss_err:
 	mlx4_en_release_rss_steer(priv);
+mac_err:
+	mlx4_en_put_qp(priv);
 cq_err:
 	while (rx_index--)
-		mlx4_en_deactivate_cq(priv, &priv->rx_cq[rx_index]);
+		mlx4_en_deactivate_cq(priv, priv->rx_cq[rx_index]);
 	for (i = 0; i < priv->rx_ring_num; i++)
-		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);
+		mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);
 
 	return err; /* need to close devices */
 }
 
 
-void mlx4_en_do_stop_port(struct net_device *dev)
+void mlx4_en_stop_port(struct net_device *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_mc_list *mclist, *tmp;
 	int i;
+	u8 mc_list[16] = {0};
 
 	if (!priv->port_up) {
 		en_dbg(DRV, priv, "stop port called while port already down\n");
 		return;
 	}
 
-	/* Set port as not active */
-	priv->port_up = false;
-
-	/* Unregister Mac address for the port */
-	mlx4_unregister_mac(mdev->dev, priv->port, priv->mac);
-	mdev->mac_removed[priv->port] = 1;
-
-	/* Free TX Rings */
-	for (i = 0; i < priv->tx_ring_num; i++) {
-		mlx4_en_deactivate_tx_ring(priv, &priv->tx_ring[i]);
-		mlx4_en_deactivate_cq(priv, &priv->tx_cq[i]);
-	}
-	msleep(10);
-
-	for (i = 0; i < priv->tx_ring_num; i++)
-		mlx4_en_free_tx_buf(dev, &priv->tx_ring[i]);
-
-	/* Free RSS qps */
-	mlx4_en_release_rss_steer(priv);
-
-	/* Free RX Rings */
-	for (i = 0; i < priv->rx_ring_num; i++) {
-		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);
-		mlx4_en_deactivate_cq(priv, &priv->rx_cq[i]);
-	}
+#ifdef CONFIG_DEBUG_FS
+	mlx4_en_delete_debug_files(priv);
+#endif
 
 	/* close port*/
 	mlx4_CLOSE_PORT(mdev->dev, priv->port);
 
-	callout_stop(&priv->watchdog_timer);
+	/* Set port as not active */
+	priv->port_up = false;
+	if (priv->counter_index != 0xff) {
+		mlx4_counter_free(mdev->dev, priv->port, priv->counter_index);
+		priv->counter_index = 0xff;
+	}
 
-	dev->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	/* Promsicuous mode */
+	if (mdev->dev->caps.steering_mode ==
+	    MLX4_STEERING_MODE_DEVICE_MANAGED) {
+		priv->flags &= ~(MLX4_EN_FLAG_PROMISC |
+				 MLX4_EN_FLAG_MC_PROMISC);
+		mlx4_flow_steer_promisc_remove(mdev->dev,
+					       priv->port,
+					       MLX4_FS_ALL_DEFAULT);
+		mlx4_flow_steer_promisc_remove(mdev->dev,
+					       priv->port,
+					       MLX4_FS_MC_DEFAULT);
+	} else if (priv->flags & MLX4_EN_FLAG_PROMISC) {
+		priv->flags &= ~MLX4_EN_FLAG_PROMISC;
+
+		/* Disable promiscouos mode */
+		mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
+					    priv->port);
+
+		/* Disable Multicast promisc */
+		if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+			mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
+						      priv->port);
+			priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+		}
+	}
+
+	/* Detach All multicasts */
+	memset(&mc_list[10], 0xff, ETH_ALEN);
+	mc_list[5] = priv->port; /* needed for B0 steering support */
+	mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
+			      MLX4_PROT_ETH, priv->broadcast_id);
+	list_for_each_entry(mclist, &priv->curr_list, list) {
+		memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
+		mc_list[5] = priv->port;
+		mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp,
+				      mc_list, MLX4_PROT_ETH, mclist->reg_id);
+	}
+	mlx4_en_clear_list(dev);
+	list_for_each_entry_safe(mclist, tmp, &priv->curr_list, list) {
+		list_del(&mclist->list);
+		kfree(mclist);
+	}
+
+	/* Flush multicast filter */
+	mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);
+	mlx4_en_destroy_drop_qp(priv);
+
+	/* Free TX Rings */
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		mlx4_en_deactivate_tx_ring(priv, priv->tx_ring[i]);
+		mlx4_en_deactivate_cq(priv, priv->tx_cq[i]);
+	}
+	msleep(10);
+
+	for (i = 0; i < priv->tx_ring_num; i++)
+		mlx4_en_free_tx_buf(dev, priv->tx_ring[i]);
+
+	/* Free RSS qps */
+	mlx4_en_release_rss_steer(priv);
+
+	/* Unregister Mac address for the port */
+	mlx4_en_put_qp(priv);
+	mdev->mac_removed[priv->port] = 1;
+
+	/* Free RX Rings */
+	for (i = 0; i < priv->rx_ring_num; i++) {
+		struct mlx4_en_cq *cq = priv->rx_cq[i];
+		mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);
+		mlx4_en_deactivate_cq(priv, cq);
+	}
+
+        callout_stop(&priv->watchdog_timer);
+
+        dev->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 }
 
 static void mlx4_en_restart(struct work_struct *work)
@@ -783,12 +1516,13 @@ static void mlx4_en_restart(struct work_struct *work)
 	struct mlx4_en_tx_ring *ring;
 	int i;
 
+
 	if (priv->blocked == 0 || priv->port_up == 0)
 		return;
 	for (i = 0; i < priv->tx_ring_num; i++) {
-		ring = &priv->tx_ring[i];
+		ring = priv->tx_ring[i];
 		if (ring->blocked &&
-		    ring->watchdog_time + MLX4_EN_WATCHDOG_TIMEOUT < ticks)
+				ring->watchdog_time + MLX4_EN_WATCHDOG_TIMEOUT < ticks)
 			goto reset;
 	}
 	return;
@@ -799,129 +1533,175 @@ static void mlx4_en_restart(struct work_struct *work)
 
 	mutex_lock(&mdev->state_lock);
 	if (priv->port_up) {
-		mlx4_en_do_stop_port(dev);
-		if (mlx4_en_do_start_port(dev))
+		mlx4_en_stop_port(dev);
+                //for (i = 0; i < priv->tx_ring_num; i++)         
+                //        netdev_tx_reset_queue(priv->tx_ring[i]->tx_queue);
+		if (mlx4_en_start_port(dev))
 			en_err(priv, "Failed restarting port %d\n", priv->port);
 	}
 	mutex_unlock(&mdev->state_lock);
 }
 
-
-static void
-mlx4_en_init(void *arg)
+static void mlx4_en_clear_stats(struct net_device *dev)
 {
-	struct mlx4_en_priv *priv;
-	struct mlx4_en_dev *mdev;
-
-	priv = arg;
-	mdev = priv->mdev;
-	mutex_lock(&mdev->state_lock);
-	mlx4_en_init_locked(priv);
-	mutex_unlock(&mdev->state_lock);
-}
-
-static void
-mlx4_en_init_locked(struct mlx4_en_priv *priv)
-{
-
-	struct mlx4_en_dev *mdev;
-	struct ifnet *dev;
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_en_dev *mdev = priv->mdev;
 	int i;
 
-	dev = priv->dev;
-	mdev = priv->mdev;
-	if (dev->if_drv_flags & IFF_DRV_RUNNING)
-		mlx4_en_do_stop_port(dev);
+	if (!mlx4_is_slave(mdev->dev))
+		if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))
+			en_dbg(HW, priv, "Failed dumping statistics\n");
+
+	memset(&priv->pstats, 0, sizeof(priv->pstats));
+	memset(&priv->pkstats, 0, sizeof(priv->pkstats));
+	memset(&priv->port_stats, 0, sizeof(priv->port_stats));
+	memset(&priv->vport_stats, 0, sizeof(priv->vport_stats));
+
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		priv->tx_ring[i]->bytes = 0;
+		priv->tx_ring[i]->packets = 0;
+		priv->tx_ring[i]->tx_csum = 0;
+	}
+	for (i = 0; i < priv->rx_ring_num; i++) {
+		priv->rx_ring[i]->bytes = 0;
+		priv->rx_ring[i]->packets = 0;
+		priv->rx_ring[i]->csum_ok = 0;
+		priv->rx_ring[i]->csum_none = 0;
+	}
+}
+
+static void mlx4_en_open(void* arg)
+{
+
+        struct mlx4_en_priv *priv;
+        struct mlx4_en_dev *mdev;
+        struct net_device *dev;
+        int err = 0;
+
+        priv = arg;
+        mdev = priv->mdev;
+        dev = priv->dev;
+
+
+	mutex_lock(&mdev->state_lock);
 
 	if (!mdev->device_up) {
 		en_err(priv, "Cannot open - device down/disabled\n");
-		return;
+		goto out;
 	}
 
-	/* Reset HW statistics and performance counters */
-	if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))
-		en_dbg(HW, priv, "Failed dumping statistics\n");
+	/* Reset HW statistics and SW counters */
+	mlx4_en_clear_stats(dev);
 
-	memset(&priv->pstats, 0, sizeof(priv->pstats));
-
-	for (i = 0; i < priv->tx_ring_num; i++) {
-		priv->tx_ring[i].bytes = 0;
-		priv->tx_ring[i].packets = 0;
-	}
-	for (i = 0; i < priv->rx_ring_num; i++) {
-		priv->rx_ring[i].bytes = 0;
-		priv->rx_ring[i].packets = 0;
-	}
-
-	mlx4_en_set_default_moderation(priv);
-	if (mlx4_en_do_start_port(dev))
+	err = mlx4_en_start_port(dev);
+	if (err)
 		en_err(priv, "Failed starting port:%d\n", priv->port);
+
+out:
+	mutex_unlock(&mdev->state_lock);
+	return;
 }
 
 void mlx4_en_free_resources(struct mlx4_en_priv *priv)
 {
 	int i;
 
+#ifdef CONFIG_RFS_ACCEL
+	if (priv->dev->rx_cpu_rmap) {
+		free_irq_cpu_rmap(priv->dev->rx_cpu_rmap);
+		priv->dev->rx_cpu_rmap = NULL;
+	}
+#endif
+
 	for (i = 0; i < priv->tx_ring_num; i++) {
-		if (priv->tx_ring[i].tx_info)
+		if (priv->tx_ring && priv->tx_ring[i])
 			mlx4_en_destroy_tx_ring(priv, &priv->tx_ring[i]);
-		if (priv->tx_cq[i].buf)
+		if (priv->tx_cq && priv->tx_cq[i])
 			mlx4_en_destroy_cq(priv, &priv->tx_cq[i]);
 	}
 
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		if (priv->rx_ring[i].rx_info)
-			mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i]);
-		if (priv->rx_cq[i].buf)
+		if (priv->rx_ring[i])
+			mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i],
+				priv->prof->rx_ring_size, priv->stride);
+		if (priv->rx_cq[i])
 			mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
 	}
-	/* Free the stats tree when we resize the rings. */
+
 	if (priv->sysctl)
 		sysctl_ctx_free(&priv->stat_ctx);
 
+
 }
 
 int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 {
 	struct mlx4_en_port_profile *prof = priv->prof;
 	int i;
-
-	/* Create tx Rings */
-	for (i = 0; i < priv->tx_ring_num; i++) {
-		if (mlx4_en_create_cq(priv, &priv->tx_cq[i],
-				      prof->tx_ring_size, i, TX))
-			goto err;
-
-		if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i],
-					   prof->tx_ring_size, TXBB_SIZE))
-			goto err;
-	}
+	int node = 0;
 
 	/* Create rx Rings */
 	for (i = 0; i < priv->rx_ring_num; i++) {
 		if (mlx4_en_create_cq(priv, &priv->rx_cq[i],
-				      prof->rx_ring_size, i, RX))
+				      prof->rx_ring_size, i, RX, node))
 			goto err;
 
 		if (mlx4_en_create_rx_ring(priv, &priv->rx_ring[i],
-					   prof->rx_ring_size))
+					   prof->rx_ring_size, node))
 			goto err;
 	}
 
-	/* Re-create stat sysctls in case the number of rings changed. */
+	/* Create tx Rings */
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		if (mlx4_en_create_cq(priv, &priv->tx_cq[i],
+				      prof->tx_ring_size, i, TX, node))
+			goto err;
+
+		if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i],
+					   prof->tx_ring_size, TXBB_SIZE, node, i))
+			goto err;
+	}
+
+#ifdef CONFIG_RFS_ACCEL
+	priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->rx_ring_num);
+	if (!priv->dev->rx_cpu_rmap)
+		goto err;
+#endif
+        /* Re-create stat sysctls in case the number of rings changed. */
 	mlx4_en_sysctl_stat(priv);
-
-	/* Populate Tx priority mappings */
-	mlx4_en_set_prio_map(priv, priv->tx_prio_map,
-			     priv->tx_ring_num - MLX4_EN_NUM_HASH_RINGS);
-
 	return 0;
 
 err:
 	en_err(priv, "Failed to allocate NIC resources\n");
+	for (i = 0; i < priv->rx_ring_num; i++) {
+		if (priv->rx_ring[i])
+			mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i],
+						prof->rx_ring_size,
+						priv->stride);
+		if (priv->rx_cq[i])
+			mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
+	}
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		if (priv->tx_ring[i])
+			mlx4_en_destroy_tx_ring(priv, &priv->tx_ring[i]);
+		if (priv->tx_cq[i])
+			mlx4_en_destroy_cq(priv, &priv->tx_cq[i]);
+	}
+	priv->port_up = false;
 	return -ENOMEM;
 }
 
+struct en_port_attribute {
+	struct attribute attr;
+	ssize_t (*show)(struct en_port *, struct en_port_attribute *, char *buf);
+	ssize_t (*store)(struct en_port *, struct en_port_attribute *, char *buf, size_t count);
+};
+
+#define PORT_ATTR_RO(_name) \
+struct en_port_attribute en_port_attr_##_name = __ATTR_RO(_name)
+
+#define EN_PORT_ATTR(_name, _mode, _show, _store) \
+struct en_port_attribute en_port_attr_##_name = __ATTR(_name, _mode, _show, _store)
 
 void mlx4_en_destroy_netdev(struct net_device *dev)
 {
@@ -930,10 +1710,10 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 
 	en_dbg(DRV, priv, "Destroying netdev on port:%d\n", priv->port);
 
-	if (priv->vlan_attach != NULL)
-		EVENTHANDLER_DEREGISTER(vlan_config, priv->vlan_attach);
-	if (priv->vlan_detach != NULL)
-		EVENTHANDLER_DEREGISTER(vlan_unconfig, priv->vlan_detach);
+        if (priv->vlan_attach != NULL)
+                EVENTHANDLER_DEREGISTER(vlan_config, priv->vlan_attach);
+        if (priv->vlan_detach != NULL)
+                EVENTHANDLER_DEREGISTER(vlan_unconfig, priv->vlan_detach);
 
 	/* Unregister device - this will close the port if it was up */
 	if (priv->registered)
@@ -943,28 +1723,34 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 		mlx4_free_hwq_res(mdev->dev, &priv->res, MLX4_EN_PAGE_SIZE);
 
 	mutex_lock(&mdev->state_lock);
-	mlx4_en_do_stop_port(dev);
+	mlx4_en_stop_port(dev);
 	mutex_unlock(&mdev->state_lock);
 
+
 	cancel_delayed_work(&priv->stats_task);
+	cancel_delayed_work(&priv->service_task);
 	/* flush any pending task for this netdev */
 	flush_workqueue(mdev->workqueue);
-	callout_drain(&priv->watchdog_timer);
+        callout_drain(&priv->watchdog_timer);
 
 	/* Detach the netdev so tasks would not attempt to access it */
 	mutex_lock(&mdev->state_lock);
 	mdev->pndev[priv->port] = NULL;
 	mutex_unlock(&mdev->state_lock);
 
+
 	mlx4_en_free_resources(priv);
 
+	/* freeing the sysctl conf cannot be called from within mlx4_en_free_resources */
 	if (priv->sysctl)
 		sysctl_ctx_free(&priv->conf_ctx);
 
-	mtx_destroy(&priv->stats_lock.m);
-	mtx_destroy(&priv->vlan_lock.m);
-	kfree(priv);
-	if_free(dev);
+	kfree(priv->tx_ring);
+	kfree(priv->tx_cq);
+
+        kfree(priv);
+        if_free(dev);
+
 }
 
 static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
@@ -973,8 +1759,8 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
 	struct mlx4_en_dev *mdev = priv->mdev;
 	int err = 0;
 
-	en_dbg(DRV, priv, "Change MTU called - current:%u new:%d\n",
-		 dev->if_mtu, new_mtu);
+	en_dbg(DRV, priv, "Change MTU called - current:%u new:%u\n",
+	       (unsigned)dev->if_mtu, (unsigned)new_mtu);
 
 	if ((new_mtu < MLX4_EN_MIN_MTU) || (new_mtu > priv->max_mtu)) {
 		en_err(priv, "Bad MTU size:%d.\n", new_mtu);
@@ -985,15 +1771,14 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
 	if (dev->if_drv_flags & IFF_DRV_RUNNING) {
 		if (!mdev->device_up) {
 			/* NIC is probably restarting - let watchdog task reset
-			 * the port */
+			 *                          * the port */
 			en_dbg(DRV, priv, "Change MTU called with card down!?\n");
 		} else {
-			mlx4_en_do_stop_port(dev);
-			mlx4_en_set_default_moderation(priv);
-			err = mlx4_en_do_start_port(dev);
+			mlx4_en_stop_port(dev);
+			err = mlx4_en_start_port(dev);
 			if (err) {
 				en_err(priv, "Failed restarting port:%d\n",
-					 priv->port);
+						priv->port);
 				queue_work(mdev->workqueue, &priv->watchdog_task);
 			}
 		}
@@ -1042,7 +1827,6 @@ static int mlx4_en_calc_media(struct mlx4_en_priv *priv)
 	return (active);
 }
 
-
 static void mlx4_en_media_status(struct ifnet *dev, struct ifmediareq *ifmr)
 {
 	struct mlx4_en_priv *priv;
@@ -1077,9 +1861,10 @@ static int mlx4_en_media_change(struct ifnet *dev)
 	case IFM_10G_SR:
 	case IFM_10G_CX4:
 	case IFM_1000_T:
-		if (IFM_SUBTYPE(ifm->ifm_media) ==
-		    IFM_SUBTYPE(mlx4_en_calc_media(priv)) &&
-		    (ifm->ifm_media & IFM_FDX))
+	case IFM_40G_CR4:
+		if ((IFM_SUBTYPE(ifm->ifm_media)
+			== IFM_SUBTYPE(mlx4_en_calc_media(priv)))
+			&& (ifm->ifm_media & IFM_FDX))
 			break;
 		/* Fallthrough */
 	default:
@@ -1116,36 +1901,28 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long command, caddr_t data)
 	mdev = priv->mdev;
 	ifr = (struct ifreq *) data;
 	switch (command) {
+
 	case SIOCSIFMTU:
 		error = -mlx4_en_change_mtu(dev, ifr->ifr_mtu);
 		break;
 	case SIOCSIFFLAGS:
+		mutex_lock(&mdev->state_lock);
 		if (dev->if_flags & IFF_UP) {
 			if ((dev->if_drv_flags & IFF_DRV_RUNNING) == 0)
 				mlx4_en_start_port(dev);
 			else
-				mlx4_en_set_multicast(dev);
+				mlx4_en_set_rx_mode(dev);
 		} else {
 			if (dev->if_drv_flags & IFF_DRV_RUNNING) {
 				mlx4_en_stop_port(dev);
                                 if_link_state_change(dev, LINK_STATE_DOWN);
-                                /*
-				 * Since mlx4_en_stop_port is defered we
-				 * have to wait till it's finished.
-				 */
-                                for (int count=0; count<10; count++) {
-                                        if (dev->if_drv_flags & IFF_DRV_RUNNING) {
-                                                DELAY(20000);
-                                        } else {
-                                                break;
-                                        }
-                                }
 			}
 		}
+		mutex_unlock(&mdev->state_lock);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		mlx4_en_set_multicast(dev);
+		mlx4_en_set_rx_mode(dev);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
@@ -1158,6 +1935,8 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long command, caddr_t data)
 			dev->if_capenable ^= IFCAP_HWCSUM;
 		if (mask & IFCAP_TSO4)
 			dev->if_capenable ^= IFCAP_TSO4;
+		if (mask & IFCAP_TSO6)
+			dev->if_capenable ^= IFCAP_TSO6;
 		if (mask & IFCAP_LRO)
 			dev->if_capenable ^= IFCAP_LRO;
 		if (mask & IFCAP_VLAN_HWTAGGING)
@@ -1167,7 +1946,7 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long command, caddr_t data)
 		if (mask & IFCAP_WOL_MAGIC)
 			dev->if_capenable ^= IFCAP_WOL_MAGIC;
 		if (dev->if_drv_flags & IFF_DRV_RUNNING)
-			mlx4_en_init_locked(priv);
+			mlx4_en_start_port(dev);
 		mutex_unlock(&mdev->state_lock);
 		VLAN_CAPABILITIES(dev);
 		break;
@@ -1179,228 +1958,441 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long command, caddr_t data)
 	return (error);
 }
 
+
+int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
+			struct mlx4_en_port_profile *prof)
+{
+	struct net_device *dev;
+	struct mlx4_en_priv *priv;
+	uint8_t dev_addr[ETHER_ADDR_LEN];
+	int err;
+	int i;
+
+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+	dev = priv->dev = if_alloc(IFT_ETHER);
+	if (dev == NULL) {
+		en_err(priv, "Net device allocation failed\n");
+		kfree(priv);
+		return -ENOMEM;
+	}
+	dev->if_softc = priv;
+	if_initname(dev, "mlxen", atomic_fetchadd_int(&mlx4_en_unit, 1));
+	dev->if_mtu = ETHERMTU;
+	dev->if_baudrate = 1000000000;
+	dev->if_init = mlx4_en_open;
+	dev->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	dev->if_ioctl = mlx4_en_ioctl;
+	dev->if_transmit = mlx4_en_transmit;
+	dev->if_qflush = mlx4_en_qflush;
+	dev->if_snd.ifq_maxlen = prof->tx_ring_size;
+
+	/*
+	 * Initialize driver private data
+	 */
+	priv->counter_index = 0xff;
+	spin_lock_init(&priv->stats_lock);
+	INIT_WORK(&priv->rx_mode_task, mlx4_en_do_set_rx_mode);
+	INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
+	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
+	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
+	INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);
+	callout_init(&priv->watchdog_timer, 1);
+#ifdef CONFIG_RFS_ACCEL
+	INIT_LIST_HEAD(&priv->filters);
+	spin_lock_init(&priv->filters_lock);
+#endif
+
+	priv->msg_enable = MLX4_EN_MSG_LEVEL;
+	priv->dev = dev;
+	priv->mdev = mdev;
+	priv->ddev = &mdev->pdev->dev;
+	priv->prof = prof;
+	priv->port = port;
+	priv->port_up = false;
+	priv->flags = prof->flags;
+        priv->ctrl_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |
+                        MLX4_WQE_CTRL_SOLICITED);
+
+	priv->num_tx_rings_p_up = mdev->profile.num_tx_rings_p_up;
+	priv->tx_ring_num = prof->tx_ring_num;
+	priv->tx_ring = kcalloc(MAX_TX_RINGS,
+				sizeof(struct mlx4_en_tx_ring *), GFP_KERNEL);
+	if (!priv->tx_ring) {
+		err = -ENOMEM;
+		goto out;
+	}
+	priv->tx_cq = kcalloc(sizeof(struct mlx4_en_cq *), MAX_TX_RINGS,
+			GFP_KERNEL);
+	if (!priv->tx_cq) {
+		err = -ENOMEM;
+		goto out;
+	}
+        
+	priv->rx_ring_num = prof->rx_ring_num;
+	priv->cqe_factor = (mdev->dev->caps.cqe_size == 64) ? 1 : 0;
+	priv->mac_index = -1;
+	priv->last_ifq_jiffies = 0;
+	priv->if_counters_rx_errors = 0;
+	priv->if_counters_rx_no_buffer = 0;
+#ifdef CONFIG_MLX4_EN_DCB
+	if (!mlx4_is_slave(priv->mdev->dev)) {
+		priv->dcbx_cap = DCB_CAP_DCBX_HOST;
+		priv->flags |= MLX4_EN_FLAG_DCB_ENABLED;
+		if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETS_CFG) {
+			dev->dcbnl_ops = &mlx4_en_dcbnl_ops;
+		} else {
+			en_info(priv, "QoS disabled - no HW support\n");
+			dev->dcbnl_ops = &mlx4_en_dcbnl_pfc_ops;
+		}
+	}
+#endif
+
+	for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i)
+		INIT_HLIST_HEAD(&priv->mac_hash[i]);
+
+
+	/* Query for default mac and max mtu */
+	priv->max_mtu = mdev->dev->caps.eth_mtu_cap[priv->port];
+        priv->mac = mdev->dev->caps.def_mac[priv->port];
+        if (ILLEGAL_MAC(priv->mac)) {
+#if BITS_PER_LONG == 64
+                en_err(priv, "Port: %d, invalid mac burned: 0x%lx, quiting\n",
+                                priv->port, priv->mac);
+#elif BITS_PER_LONG == 32
+                en_err(priv, "Port: %d, invalid mac burned: 0x%llx, quiting\n",
+                                priv->port, priv->mac);
+#endif
+                err = -EINVAL;
+                goto out;
+        }
+
+
+
+	priv->stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
+					  DS_SIZE);
+
+	mlx4_en_sysctl_conf(priv);
+
+	err = mlx4_en_alloc_resources(priv);
+	if (err)
+		goto out;
+
+	/* Allocate page for receive rings */
+	err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
+				MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);
+	if (err) {
+		en_err(priv, "Failed to allocate page for rx qps\n");
+		goto out;
+	}
+	priv->allocated = 1;
+
+	/*
+	 * Set driver features
+	 */
+	dev->if_capabilities |= IFCAP_RXCSUM | IFCAP_TXCSUM;
+	dev->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
+	dev->if_capabilities |= IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWFILTER;
+	dev->if_capabilities |= IFCAP_LINKSTATE | IFCAP_JUMBO_MTU;
+	dev->if_capabilities |= IFCAP_LRO;
+
+	if (mdev->LSO_support)
+		dev->if_capabilities |= IFCAP_TSO4 | IFCAP_TSO6 | IFCAP_VLAN_HWTSO;
+
+	/* set TSO limits so that we don't have to drop TX packets */
+	dev->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
+	dev->if_hw_tsomaxsegcount = 16;
+	dev->if_hw_tsomaxsegsize = 65536;       /* XXX can do up to 4GByte */
+
+	dev->if_capenable = dev->if_capabilities;
+
+	dev->if_hwassist = 0;
+	if (dev->if_capenable & (IFCAP_TSO4 | IFCAP_TSO6))
+		dev->if_hwassist |= CSUM_TSO;
+	if (dev->if_capenable & IFCAP_TXCSUM)
+		dev->if_hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP);
+
+
+        /* Register for VLAN events */
+	priv->vlan_attach = EVENTHANDLER_REGISTER(vlan_config,
+            mlx4_en_vlan_rx_add_vid, priv, EVENTHANDLER_PRI_FIRST);
+	priv->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
+            mlx4_en_vlan_rx_kill_vid, priv, EVENTHANDLER_PRI_FIRST);
+
+	mdev->pndev[priv->port] = dev;
+
+	priv->last_link_state = MLX4_DEV_EVENT_PORT_DOWN;
+        mlx4_en_set_default_moderation(priv);
+
+	/* Set default MAC */
+	for (i = 0; i < ETHER_ADDR_LEN; i++)
+		dev_addr[ETHER_ADDR_LEN - 1 - i] = (u8) (priv->mac >> (8 * i));
+
+
+	ether_ifattach(dev, dev_addr);
+	if_link_state_change(dev, LINK_STATE_DOWN);
+	ifmedia_init(&priv->media, IFM_IMASK | IFM_ETH_FMASK,
+	    mlx4_en_media_change, mlx4_en_media_status);
+	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_1000_T, 0, NULL);
+	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_10G_SR, 0, NULL);
+	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_10G_CX4, 0, NULL);
+	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_40G_CR4, 0, NULL);
+	ifmedia_add(&priv->media, IFM_ETHER | IFM_AUTO, 0, NULL);
+	ifmedia_set(&priv->media, IFM_ETHER | IFM_AUTO);
+
+	en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
+	en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
+
+	priv->registered = 1;
+
+        en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
+        en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
+
+
+	priv->rx_mb_size = dev->if_mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
+	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
+				    priv->rx_mb_size,
+				    prof->tx_pause, prof->tx_ppp,
+				    prof->rx_pause, prof->rx_ppp);
+	if (err) {
+		en_err(priv, "Failed setting port general configurations "
+		       "for port %d, with error %d\n", priv->port, err);
+		goto out;
+	}
+
+	/* Init port */
+	en_warn(priv, "Initializing port\n");
+	err = mlx4_INIT_PORT(mdev->dev, priv->port);
+	if (err) {
+		en_err(priv, "Failed Initializing port\n");
+		goto out;
+	}
+
+	queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
+
+        if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
+                queue_delayed_work(mdev->workqueue, &priv->service_task, SERVICE_TASK_DELAY);
+
+        
+
+	return 0;
+
+out:
+	mlx4_en_destroy_netdev(dev);
+	return err;
+}
 static int mlx4_en_set_ring_size(struct net_device *dev,
     int rx_size, int tx_size)
 {
-	struct mlx4_en_priv *priv = netdev_priv(dev);
-	struct mlx4_en_dev *mdev = priv->mdev;
-	int port_up = 0;
-	int err = 0;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int port_up = 0;
+        int err = 0;
 
-	rx_size = roundup_pow_of_two(rx_size);
-	rx_size = max_t(u32, rx_size, MLX4_EN_MIN_RX_SIZE);
-	rx_size = min_t(u32, rx_size, MLX4_EN_MAX_RX_SIZE);
-	tx_size = roundup_pow_of_two(tx_size);
-	tx_size = max_t(u32, tx_size, MLX4_EN_MIN_TX_SIZE);
-	tx_size = min_t(u32, tx_size, MLX4_EN_MAX_TX_SIZE);
+        rx_size = roundup_pow_of_two(rx_size);
+        rx_size = max_t(u32, rx_size, MLX4_EN_MIN_RX_SIZE);
+        rx_size = min_t(u32, rx_size, MLX4_EN_MAX_RX_SIZE);
+        tx_size = roundup_pow_of_two(tx_size);
+        tx_size = max_t(u32, tx_size, MLX4_EN_MIN_TX_SIZE);
+        tx_size = min_t(u32, tx_size, MLX4_EN_MAX_TX_SIZE);
 
-	if (rx_size == (priv->port_up ?
-	    priv->rx_ring[0].actual_size : priv->rx_ring[0].size) &&
-	    tx_size == priv->tx_ring[0].size)
-		return 0;
-
-	mutex_lock(&mdev->state_lock);
-	if (priv->port_up) {
-		port_up = 1;
-		mlx4_en_do_stop_port(dev);
-	}
-	mlx4_en_free_resources(priv);
-	priv->prof->tx_ring_size = tx_size;
-	priv->prof->rx_ring_size = rx_size;
-	err = mlx4_en_alloc_resources(priv);
-	if (err) {
-		en_err(priv, "Failed reallocating port resources\n");
-		goto out;
-	}
-	if (port_up) {
-		err = mlx4_en_do_start_port(dev);
-		if (err)
-			en_err(priv, "Failed starting port\n");
-	}
+        if (rx_size == (priv->port_up ?
+            priv->rx_ring[0]->actual_size : priv->rx_ring[0]->size) &&
+            tx_size == priv->tx_ring[0]->size)
+                return 0;
+        mutex_lock(&mdev->state_lock);
+        if (priv->port_up) {
+                port_up = 1;
+                mlx4_en_stop_port(dev);
+        }
+        mlx4_en_free_resources(priv);
+        priv->prof->tx_ring_size = tx_size;
+        priv->prof->rx_ring_size = rx_size;
+        err = mlx4_en_alloc_resources(priv);
+        if (err) {
+                en_err(priv, "Failed reallocating port resources\n");
+                goto out;
+        }
+        if (port_up) {
+                err = mlx4_en_start_port(dev);
+                if (err)
+                        en_err(priv, "Failed starting port\n");
+        }
 out:
-	mutex_unlock(&mdev->state_lock);
-	return err;
+        mutex_unlock(&mdev->state_lock);
+        return err;
 }
-
 static int mlx4_en_set_rx_ring_size(SYSCTL_HANDLER_ARGS)
 {
-	struct mlx4_en_priv *priv;
-	int size;
-	int error;
+        struct mlx4_en_priv *priv;
+        int size;
+        int error;
 
-	priv = arg1;
-	size = priv->prof->rx_ring_size;
-	error = sysctl_handle_int(oidp, &size, 0, req);
-	if (error || !req->newptr)
-		return (error);
-	error = -mlx4_en_set_ring_size(priv->dev, size,
-	    priv->prof->tx_ring_size);
-
-	return (error);
+        priv = arg1;
+        size = priv->prof->rx_ring_size;
+        error = sysctl_handle_int(oidp, &size, 0, req);
+        if (error || !req->newptr)
+                return (error);
+        error = -mlx4_en_set_ring_size(priv->dev, size,
+            priv->prof->tx_ring_size);
+        return (error);
 }
 
 static int mlx4_en_set_tx_ring_size(SYSCTL_HANDLER_ARGS)
 {
-	struct mlx4_en_priv *priv;
-	int size;
-	int error;
+        struct mlx4_en_priv *priv;
+        int size;
+        int error;
 
-	priv = arg1;
-	size = priv->prof->tx_ring_size;
-	error = sysctl_handle_int(oidp, &size, 0, req);
-	if (error || !req->newptr)
-		return (error);
-	error = -mlx4_en_set_ring_size(priv->dev, priv->prof->rx_ring_size,
-	    size);
+        priv = arg1;
+        size = priv->prof->tx_ring_size;
+        error = sysctl_handle_int(oidp, &size, 0, req);
+        if (error || !req->newptr)
+                return (error);
+        error = -mlx4_en_set_ring_size(priv->dev, priv->prof->rx_ring_size,
+            size);
 
-	return (error);
+        return (error);
 }
 
 static int mlx4_en_set_tx_ppp(SYSCTL_HANDLER_ARGS)
 {
-	struct mlx4_en_priv *priv;
-	int ppp;
-	int error;
+        struct mlx4_en_priv *priv;
+        int ppp;
+        int error;
 
-	priv = arg1;
-	ppp = priv->prof->tx_ppp;
-	error = sysctl_handle_int(oidp, &ppp, 0, req);
-	if (error || !req->newptr)
-		return (error);
-	if (ppp > 0xff || ppp < 0)
-		return (-EINVAL);
-	priv->prof->tx_ppp = ppp;
-	error = -mlx4_SET_PORT_general(priv->mdev->dev, priv->port,
-				       priv->rx_mb_size + ETHER_CRC_LEN,
-				       priv->prof->tx_pause,
-				       priv->prof->tx_ppp,
-				       priv->prof->rx_pause,
-				       priv->prof->rx_ppp);
+        priv = arg1;
+        ppp = priv->prof->tx_ppp;
+        error = sysctl_handle_int(oidp, &ppp, 0, req);
+        if (error || !req->newptr)
+                return (error);
+        if (ppp > 0xff || ppp < 0)
+                return (-EINVAL);
+        priv->prof->tx_ppp = ppp;
+        error = -mlx4_SET_PORT_general(priv->mdev->dev, priv->port,
+                                       priv->rx_mb_size + ETHER_CRC_LEN,
+                                       priv->prof->tx_pause,
+                                       priv->prof->tx_ppp,
+                                       priv->prof->rx_pause,
+                                       priv->prof->rx_ppp);
 
-	return (error);
+        return (error);
 }
 
 static int mlx4_en_set_rx_ppp(SYSCTL_HANDLER_ARGS)
 {
-	struct mlx4_en_priv *priv;
-	struct mlx4_en_dev *mdev;
-	int tx_ring_num;
-	int ppp;
-	int error;
-	int port_up;
+        struct mlx4_en_priv *priv;
+        struct mlx4_en_dev *mdev;
+        int ppp;
+        int error;
+        int port_up;
 
-	port_up = 0;
-	priv = arg1;
-	mdev = priv->mdev;
-	ppp = priv->prof->rx_ppp;
-	error = sysctl_handle_int(oidp, &ppp, 0, req);
-	if (error || !req->newptr)
-		return (error);
-	if (ppp > 0xff || ppp < 0)
-		return (-EINVAL);
-	/* See if we have to change the number of tx queues. */
-	if (!ppp != !priv->prof->rx_ppp) {
-		tx_ring_num = MLX4_EN_NUM_HASH_RINGS + 1 +
-		    (!!ppp) * MLX4_EN_NUM_PPP_RINGS;
-		mutex_lock(&mdev->state_lock);
-		if (priv->port_up) {
-			port_up = 1;
-			mlx4_en_do_stop_port(priv->dev);
-		}
-		mlx4_en_free_resources(priv);
-		priv->tx_ring_num = tx_ring_num;
-		priv->prof->rx_ppp = ppp;
-		error = -mlx4_en_alloc_resources(priv);
-		if (error)
-			en_err(priv, "Failed reallocating port resources\n");
-		if (error == 0 && port_up) {
-			error = -mlx4_en_do_start_port(priv->dev);
-			if (error)
-				en_err(priv, "Failed starting port\n");
-		}
-		mutex_unlock(&mdev->state_lock);
-		return (error);
+        port_up = 0;
+        priv = arg1;
+        mdev = priv->mdev;
+        ppp = priv->prof->rx_ppp;
+        error = sysctl_handle_int(oidp, &ppp, 0, req);
+        if (error || !req->newptr)
+                return (error);
+        if (ppp > 0xff || ppp < 0)
+                return (-EINVAL);
+        /* See if we have to change the number of tx queues. */
+        if (!ppp != !priv->prof->rx_ppp) {
+                mutex_lock(&mdev->state_lock);
+                if (priv->port_up) {
+                        port_up = 1;
+                        mlx4_en_stop_port(priv->dev);
+                }
+                mlx4_en_free_resources(priv);
+                priv->prof->rx_ppp = ppp;
+                error = -mlx4_en_alloc_resources(priv);
+                if (error)
+                        en_err(priv, "Failed reallocating port resources\n");
+                if (error == 0 && port_up) {
+                        error = -mlx4_en_start_port(priv->dev);
+                        if (error)
+                                en_err(priv, "Failed starting port\n");
+                }
+                mutex_unlock(&mdev->state_lock);
+                return (error);
 
-	}
-	priv->prof->rx_ppp = ppp;
-	error = -mlx4_SET_PORT_general(priv->mdev->dev, priv->port,
-				       priv->rx_mb_size + ETHER_CRC_LEN,
-				       priv->prof->tx_pause,
-				       priv->prof->tx_ppp,
-				       priv->prof->rx_pause,
-				       priv->prof->rx_ppp);
+        }
+        priv->prof->rx_ppp = ppp;
+        error = -mlx4_SET_PORT_general(priv->mdev->dev, priv->port,
+                                       priv->rx_mb_size + ETHER_CRC_LEN,
+                                       priv->prof->tx_pause,
+                                       priv->prof->tx_ppp,
+                                       priv->prof->rx_pause,
+                                       priv->prof->rx_ppp);
 
-	return (error);
+        return (error);
 }
 
 static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv)
 {
-	struct net_device *dev;
-	struct sysctl_ctx_list *ctx;
-	struct sysctl_oid *node;
-	struct sysctl_oid_list *node_list;
-	struct sysctl_oid *coal;
-	struct sysctl_oid_list *coal_list;
+        struct net_device *dev;
+        struct sysctl_ctx_list *ctx;
+        struct sysctl_oid *node;
+        struct sysctl_oid_list *node_list;
+        struct sysctl_oid *coal;
+        struct sysctl_oid_list *coal_list;
 
-	dev = priv->dev;
-	ctx = &priv->conf_ctx;
+        dev = priv->dev;
+        ctx = &priv->conf_ctx;
 
-	sysctl_ctx_init(ctx);
-	priv->sysctl = SYSCTL_ADD_NODE(ctx, SYSCTL_STATIC_CHILDREN(_hw),
-	    OID_AUTO, dev->if_xname, CTLFLAG_RD, 0, "mlx4 10gig ethernet");
-	node = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(priv->sysctl), OID_AUTO,
-	    "conf", CTLFLAG_RD, NULL, "Configuration");
-	node_list = SYSCTL_CHILDREN(node);
+        sysctl_ctx_init(ctx);
+        priv->sysctl = SYSCTL_ADD_NODE(ctx, SYSCTL_STATIC_CHILDREN(_hw),
+            OID_AUTO, dev->if_xname, CTLFLAG_RD, 0, "mlx4 10gig ethernet");
+        node = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(priv->sysctl), OID_AUTO,
+            "conf", CTLFLAG_RD, NULL, "Configuration");
+        node_list = SYSCTL_CHILDREN(node);
 
-	SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "msg_enable",
-	    CTLFLAG_RW, &priv->msg_enable, 0,
-	    "Driver message enable bitfield");
-	SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "rx_rings",
-	    CTLTYPE_INT | CTLFLAG_RD, &priv->rx_ring_num, 0,
-	    "Number of receive rings");
-	SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "tx_rings",
-	    CTLTYPE_INT | CTLFLAG_RD, &priv->tx_ring_num, 0,
-	    "Number of transmit rings");
-	SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_size",
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
-	    mlx4_en_set_rx_ring_size, "I", "Receive ring size");
-	SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "tx_size",
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
-	    mlx4_en_set_tx_ring_size, "I", "Transmit ring size");
-	SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "ip_reasm",
-	    CTLFLAG_RW, &priv->ip_reasm, 0,
-	    "Allow reassembly of IP fragments.");
-	SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "tx_ppp",
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
-	    mlx4_en_set_tx_ppp, "I", "TX Per-priority pause");
-	SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_ppp",
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
-	    mlx4_en_set_rx_ppp, "I", "RX Per-priority pause");
+        SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "msg_enable",
+            CTLFLAG_RW, &priv->msg_enable, 0,
+            "Driver message enable bitfield");
+        SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "rx_rings",
+            CTLTYPE_INT | CTLFLAG_RD, &priv->rx_ring_num, 0,
+            "Number of receive rings");
+        SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "tx_rings",
+            CTLTYPE_INT | CTLFLAG_RD, &priv->tx_ring_num, 0,
+            "Number of transmit rings");
+        SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_size",
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
+            mlx4_en_set_rx_ring_size, "I", "Receive ring size");
+        SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "tx_size",
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
+            mlx4_en_set_tx_ring_size, "I", "Transmit ring size");
+        SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "tx_ppp",
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
+            mlx4_en_set_tx_ppp, "I", "TX Per-priority pause");
+        SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_ppp",
+            CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0,
+            mlx4_en_set_rx_ppp, "I", "RX Per-priority pause");
 
-	/* Add coalescer configuration. */
-	coal = SYSCTL_ADD_NODE(ctx, node_list, OID_AUTO,
-	    "coalesce", CTLFLAG_RD, NULL, "Interrupt coalesce configuration");
-	coal_list = SYSCTL_CHILDREN(node);
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "pkt_rate_low",
-	    CTLFLAG_RW, &priv->pkt_rate_low, 0,
-	    "Packets per-second for minimum delay");
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "rx_usecs_low",
-	    CTLFLAG_RW, &priv->rx_usecs_low, 0,
-	    "Minimum RX delay in micro-seconds");
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "pkt_rate_high",
-	    CTLFLAG_RW, &priv->pkt_rate_high, 0,
-	    "Packets per-second for maximum delay");
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "rx_usecs_high",
-	    CTLFLAG_RW, &priv->rx_usecs_high, 0,
-	    "Maximum RX delay in micro-seconds");
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "sample_interval",
-	    CTLFLAG_RW, &priv->sample_interval, 0,
-	    "adaptive frequency in units of HZ ticks");
-	SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "adaptive_rx_coal",
-	    CTLFLAG_RW, &priv->adaptive_rx_coal, 0,
-	    "Enable adaptive rx coalescing");
+        /* Add coalescer configuration. */
+        coal = SYSCTL_ADD_NODE(ctx, node_list, OID_AUTO,
+            "coalesce", CTLFLAG_RD, NULL, "Interrupt coalesce configuration");
+        coal_list = SYSCTL_CHILDREN(node);
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "pkt_rate_low",
+            CTLFLAG_RW, &priv->pkt_rate_low, 0,
+            "Packets per-second for minimum delay");
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "rx_usecs_low",
+            CTLFLAG_RW, &priv->rx_usecs_low, 0,
+            "Minimum RX delay in micro-seconds");
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "pkt_rate_high",
+            CTLFLAG_RW, &priv->pkt_rate_high, 0,
+            "Packets per-second for maximum delay");
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "rx_usecs_high",
+            CTLFLAG_RW, &priv->rx_usecs_high, 0,
+            "Maximum RX delay in micro-seconds");
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "sample_interval",
+            CTLFLAG_RW, &priv->sample_interval, 0,
+            "adaptive frequency in units of HZ ticks");
+        SYSCTL_ADD_UINT(ctx, coal_list, OID_AUTO, "adaptive_rx_coal",
+            CTLFLAG_RW, &priv->adaptive_rx_coal, 0,
+            "Enable adaptive rx coalescing");
 }
 
+
 static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv)
 {
 	struct net_device *dev;
@@ -1454,43 +2446,111 @@ static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv)
 	    "TX checksum offloads");
 
 	/* Could strdup the names and add in a loop.  This is simpler. */
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "broadcast", CTLFLAG_RD,
-	    &priv->pkstats.broadcast, "Broadcast packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio0", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[0], "TX Priority 0 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio1", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[1], "TX Priority 1 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio2", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[2], "TX Priority 2 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio3", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[3], "TX Priority 3 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio4", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[4], "TX Priority 4 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio5", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[5], "TX Priority 5 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio6", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[6], "TX Priority 6 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_prio7", CTLFLAG_RD,
-	    &priv->pkstats.tx_prio[7], "TX Priority 7 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio0", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[0], "RX Priority 0 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio1", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[1], "RX Priority 1 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio2", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[2], "RX Priority 2 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio3", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[3], "RX Priority 3 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio4", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[4], "RX Priority 4 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio5", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[5], "RX Priority 5 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio6", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[6], "RX Priority 6 packets");
-	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_prio7", CTLFLAG_RD,
-	    &priv->pkstats.rx_prio[7], "RX Priority 7 packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_bytes", CTLFLAG_RD,
+	    &priv->pkstats.rx_bytes, "RX Bytes");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_packets, "RX packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_multicast_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_multicast_packets, "RX Multicast Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_broadcast_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_broadcast_packets, "RX Broadcast Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_errors", CTLFLAG_RD,
+	    &priv->pkstats.rx_errors, "RX Errors");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_dropped", CTLFLAG_RD,
+	    &priv->pkstats.rx_dropped, "RX Dropped");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_length_errors", CTLFLAG_RD,
+	    &priv->pkstats.rx_length_errors, "RX Length Errors");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_over_errors", CTLFLAG_RD,
+	    &priv->pkstats.rx_over_errors, "RX Over Errors");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_crc_errors", CTLFLAG_RD,
+	    &priv->pkstats.rx_crc_errors, "RX CRC Errors");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_jabbers", CTLFLAG_RD,
+	    &priv->pkstats.rx_jabbers, "RX Jabbers");
+
+
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_in_range_length_error", CTLFLAG_RD,
+	    &priv->pkstats.rx_in_range_length_error, "RX IN_Range Length Error");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_out_range_length_error",
+		CTLFLAG_RD, &priv->pkstats.rx_out_range_length_error,
+		"RX Out Range Length Error");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_lt_64_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_lt_64_bytes_packets, "RX Lt 64 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_127_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_127_bytes_packets, "RX 127 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_255_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_255_bytes_packets, "RX 255 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_511_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_511_bytes_packets, "RX 511 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_1023_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_1023_bytes_packets, "RX 1023 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_1518_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_1518_bytes_packets, "RX 1518 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_1522_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_1522_bytes_packets, "RX 1522 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_1548_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_1548_bytes_packets, "RX 1548 bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "rx_gt_1548_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.rx_gt_1548_bytes_packets,
+	    "RX Greater Then 1548 bytes Packets");
+
+struct mlx4_en_pkt_stats {
+	unsigned long tx_packets;
+	unsigned long tx_bytes;
+	unsigned long tx_multicast_packets;
+	unsigned long tx_broadcast_packets;
+	unsigned long tx_errors;
+	unsigned long tx_dropped;
+	unsigned long tx_lt_64_bytes_packets;
+	unsigned long tx_127_bytes_packets;
+	unsigned long tx_255_bytes_packets;
+	unsigned long tx_511_bytes_packets;
+	unsigned long tx_1023_bytes_packets;
+	unsigned long tx_1518_bytes_packets;
+	unsigned long tx_1522_bytes_packets;
+	unsigned long tx_1548_bytes_packets;
+	unsigned long tx_gt_1548_bytes_packets;
+	unsigned long rx_prio[NUM_PRIORITIES][NUM_PRIORITY_STATS];
+	unsigned long tx_prio[NUM_PRIORITIES][NUM_PRIORITY_STATS];
+#define NUM_PKT_STATS		72
+};
+
+
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_packets, "TX packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_bytes", CTLFLAG_RD,
+	    &priv->pkstats.tx_packets, "TX Bytes");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_multicast_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_multicast_packets, "TX Multicast Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_broadcast_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_broadcast_packets, "TX Broadcast Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_errors", CTLFLAG_RD,
+	    &priv->pkstats.tx_errors, "TX Errors");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_dropped", CTLFLAG_RD,
+	    &priv->pkstats.tx_dropped, "TX Dropped");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_lt_64_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_lt_64_bytes_packets, "TX Less Then 64 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_127_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_127_bytes_packets, "TX 127 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_255_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_255_bytes_packets, "TX 255 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_511_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_511_bytes_packets, "TX 511 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_1023_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_1023_bytes_packets, "TX 1023 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_1518_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_1518_bytes_packets, "TX 1518 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_1522_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_1522_bytes_packets, "TX 1522 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_1548_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_1548_bytes_packets, "TX 1548 Bytes Packets");
+	SYSCTL_ADD_ULONG(ctx, node_list, OID_AUTO, "tx_gt_1548_bytes_packets", CTLFLAG_RD,
+	    &priv->pkstats.tx_gt_1548_bytes_packets,
+	    "TX Greater Then 1548 Bytes Packets");
+
+
 
 	for (i = 0; i < priv->tx_ring_num; i++) {
-		tx_ring = &priv->tx_ring[i];
+		tx_ring = priv->tx_ring[i];
 		snprintf(namebuf, sizeof(namebuf), "tx_ring%d", i);
 		ring_node = SYSCTL_ADD_NODE(ctx, node_list, OID_AUTO, namebuf,
 		    CTLFLAG_RD, NULL, "TX Ring");
@@ -1499,12 +2559,10 @@ static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv)
 		    CTLFLAG_RD, &tx_ring->packets, "TX packets");
 		SYSCTL_ADD_ULONG(ctx, ring_list, OID_AUTO, "bytes",
 		    CTLFLAG_RD, &tx_ring->bytes, "TX bytes");
-		SYSCTL_ADD_ULONG(ctx, ring_list, OID_AUTO, "error",
-		    CTLFLAG_RD, &tx_ring->errors, "TX soft errors");
 
 	}
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		rx_ring = &priv->rx_ring[i];
+		rx_ring = priv->rx_ring[i];
 		snprintf(namebuf, sizeof(namebuf), "rx_ring%d", i);
 		ring_node = SYSCTL_ADD_NODE(ctx, node_list, OID_AUTO, namebuf,
 		    CTLFLAG_RD, NULL, "RX Ring");
@@ -1515,153 +2573,5 @@ static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv)
 		    CTLFLAG_RD, &rx_ring->bytes, "RX bytes");
 		SYSCTL_ADD_ULONG(ctx, ring_list, OID_AUTO, "error",
 		    CTLFLAG_RD, &rx_ring->errors, "RX soft errors");
-		SYSCTL_ADD_UINT(ctx, ring_list, OID_AUTO, "lro_queued",
-		    CTLFLAG_RD, &rx_ring->lro.lro_queued, 0, "LRO Queued");
-		SYSCTL_ADD_UINT(ctx, ring_list, OID_AUTO, "lro_flushed",
-		    CTLFLAG_RD, &rx_ring->lro.lro_flushed, 0, "LRO Flushed");
 	}
 }
-
-int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
-			struct mlx4_en_port_profile *prof)
-{
-	static volatile int mlx4_en_unit;
-	struct net_device *dev;
-	struct mlx4_en_priv *priv;
-	uint8_t dev_addr[ETHER_ADDR_LEN];
-	int err;
-	int i;
-
-	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-	dev = priv->dev = if_alloc(IFT_ETHER);
-	if (dev == NULL) {
-		mlx4_err(mdev, "Net device allocation failed\n");
-		kfree(priv);
-		return -ENOMEM;
-	}
-	dev->if_softc = priv;
-	if_initname(dev, "mlxen", atomic_fetchadd_int(&mlx4_en_unit, 1));
-	dev->if_mtu = ETHERMTU;
-	dev->if_baudrate = 1000000000;
-	dev->if_init = mlx4_en_init;
-	dev->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	dev->if_ioctl = mlx4_en_ioctl;
-	dev->if_transmit = mlx4_en_transmit;
-	dev->if_qflush = mlx4_en_qflush;
-	dev->if_snd.ifq_maxlen = prof->tx_ring_size;
-
-	/*
-	 * Initialize driver private data
-	 */
-	priv->dev = dev;
-	priv->mdev = mdev;
-	priv->prof = prof;
-	priv->port = port;
-	priv->port_up = false;
-	priv->rx_csum = 1;
-	priv->flags = prof->flags;
-	priv->tx_ring_num = prof->tx_ring_num;
-	priv->rx_ring_num = prof->rx_ring_num;
-	priv->mac_index = -1;
-	priv->msg_enable = MLX4_EN_MSG_LEVEL;
-	priv->ip_reasm = priv->mdev->profile.ip_reasm;
-	mtx_init(&priv->stats_lock.m, "mlx4 stats", NULL, MTX_DEF);
-	mtx_init(&priv->vlan_lock.m, "mlx4 vlan", NULL, MTX_DEF);
-	INIT_WORK(&priv->start_port_task, mlx4_en_lock_and_start_port);
-	INIT_WORK(&priv->stop_port_task, mlx4_en_lock_and_stop_port);
-	INIT_WORK(&priv->mcast_task, mlx4_en_do_set_multicast);
-	INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
-	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
-	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
-	callout_init(&priv->watchdog_timer, 1);
-
-	/* Query for default mac and max mtu */
-	priv->max_mtu = mdev->dev->caps.eth_mtu_cap[priv->port];
-	priv->mac = mdev->dev->caps.def_mac[priv->port];
-
-	if (ILLEGAL_MAC(priv->mac)) {
-		en_err(priv, "Port: %d, invalid mac burned: 0x%llx, quiting\n",
-			 priv->port, (long long)priv->mac);
-		err = -EINVAL;
-		goto out;
-	}
-
-	mlx4_en_sysctl_conf(priv);
-
-	err = mlx4_en_alloc_resources(priv);
-	if (err)
-		goto out;
-
-	/* Allocate page for receive rings */
-	err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
-				MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);
-	if (err) {
-		en_err(priv, "Failed to allocate page for rx qps\n");
-		goto out;
-	}
-	priv->allocated = 1;
-
-	/*
-	 * Set driver features
-	 */
-	dev->if_capabilities |= IFCAP_RXCSUM | IFCAP_TXCSUM;
-	dev->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
-	dev->if_capabilities |= IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWFILTER;
-	dev->if_capabilities |= IFCAP_LINKSTATE | IFCAP_JUMBO_MTU;
-	if (mdev->LSO_support)
-		dev->if_capabilities |= IFCAP_TSO4 | IFCAP_VLAN_HWTSO;
-	if (mdev->profile.num_lro)
-		dev->if_capabilities |= IFCAP_LRO;
-	dev->if_capenable = dev->if_capabilities;
-	/*
-	 * Setup wake-on-lan.
-	 */
-#if 0
-	if (priv->mdev->dev->caps.wol) {
-		u64 config;
-		if (mlx4_wol_read(priv->mdev->dev, &config, priv->port) == 0) {
-			if (config & MLX4_EN_WOL_MAGIC)
-				dev->if_capabilities |= IFCAP_WOL_MAGIC;
-			if (config & MLX4_EN_WOL_ENABLED)
-				dev->if_capenable |= IFCAP_WOL_MAGIC;
-		}
-	}
-#endif
-
-        /* Register for VLAN events */
-	priv->vlan_attach = EVENTHANDLER_REGISTER(vlan_config,
-            mlx4_en_vlan_rx_add_vid, priv, EVENTHANDLER_PRI_FIRST);
-	priv->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
-            mlx4_en_vlan_rx_kill_vid, priv, EVENTHANDLER_PRI_FIRST);
-
-	mdev->pndev[priv->port] = dev;
-
-	priv->last_link_state = MLX4_DEV_EVENT_PORT_DOWN;
-	if_link_state_change(dev, LINK_STATE_DOWN);
-
-	/* Set default MAC */
-	for (i = 0; i < ETHER_ADDR_LEN; i++)
-		dev_addr[ETHER_ADDR_LEN - 1 - i] = (u8) (priv->mac >> (8 * i));
-
-	ether_ifattach(dev, dev_addr);
-	ifmedia_init(&priv->media, IFM_IMASK | IFM_ETH_FMASK,
-	    mlx4_en_media_change, mlx4_en_media_status);
-	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_1000_T, 0, NULL);
-	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_10G_SR, 0, NULL);
-	ifmedia_add(&priv->media, IFM_ETHER | IFM_FDX | IFM_10G_CX4, 0, NULL);
-	ifmedia_add(&priv->media, IFM_ETHER | IFM_AUTO, 0, NULL);
-	ifmedia_set(&priv->media, IFM_ETHER | IFM_AUTO);
-
-	en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
-	en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
-
-	priv->registered = 1;
-	queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
-
-	return 0;
-
-out:
-	mlx4_en_destroy_netdev(dev);
-	return err;
-}
-
diff --git a/sys/ofed/drivers/net/mlx4/en_port.c b/sys/ofed/drivers/net/mlx4/en_port.c
index 303bb2bef1f9..33eb0b9f4542 100644
--- a/sys/ofed/drivers/net/mlx4/en_port.c
+++ b/sys/ofed/drivers/net/mlx4/en_port.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,28 +31,25 @@
  *
  */
 
-
-#include "mlx4_en.h"
-
+#include <sys/types.h>
 #include <linux/if_vlan.h>
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/cmd.h>
 
-#if 0 //  moved to port.c
-int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port,
-			u64 mac, u64 clear, u8 mode)
-{
-	return mlx4_cmd(dev, (mac | (clear << 63)), port, mode,
-			MLX4_CMD_SET_MCAST_FLTR, MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
-}
-#endif
+#include "en_port.h"
+#include "mlx4_en.h"
+#define EN_IFQ_MIN_INTERVAL 3000
 
-int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, u32 *vlans)
+
+int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv)
 {
 	struct mlx4_cmd_mailbox *mailbox;
 	struct mlx4_set_vlan_fltr_mbox *filter;
-	int i, j;
+	int i;
+	int j;
+	int index = 0;
+	u32 entry;
 	int err = 0;
 
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
@@ -60,86 +57,21 @@ int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, u32 *vlans)
 		return PTR_ERR(mailbox);
 
 	filter = mailbox->buf;
-	memset(filter, 0, sizeof *filter);
-	if (vlans)
-		for (i = 0, j = VLAN_FLTR_SIZE - 1; i < VLAN_FLTR_SIZE;
-		    i++, j--)
-			filter->entry[j] = cpu_to_be32(vlans[i]);
-	err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_SET_VLAN_FLTR,
-		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
+	memset(filter, 0, sizeof(*filter));
+	for (i = VLAN_FLTR_SIZE - 1; i >= 0; i--) {
+		entry = 0;
+		for (j = 0; j < 32; j++)
+			if (test_bit(index, priv->active_vlans))
+				entry |= 1 << j;
+                        index++;
+		filter->entry[i] = cpu_to_be32(entry);
+	}
+	err = mlx4_cmd(dev, mailbox->dma, priv->port, 0, MLX4_CMD_SET_VLAN_FLTR,
+		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
 	mlx4_free_cmd_mailbox(dev, mailbox);
 	return err;
 }
 
-
-#if 0 //moved to port.c - shahark
-int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
-			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx)
-{
-	struct mlx4_cmd_mailbox *mailbox;
-	struct mlx4_set_port_general_context *context;
-	int err;
-	u32 in_mod;
-
-	mailbox = mlx4_alloc_cmd_mailbox(dev);
-	if (IS_ERR(mailbox))
-		return PTR_ERR(mailbox);
-	context = mailbox->buf;
-	memset(context, 0, sizeof *context);
-
-	context->flags = SET_PORT_GEN_ALL_VALID;
-	context->mtu = cpu_to_be16(mtu);
-	context->pptx = (pptx * (!pfctx)) << 7;
-	context->pfctx = pfctx;
-	context->pprx = (pprx * (!pfcrx)) << 7;
-	context->pfcrx = pfcrx;
-
-	in_mod = MLX4_SET_PORT_GENERAL << 8 | port;
-	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,
-		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
-
-	mlx4_free_cmd_mailbox(dev, mailbox);
-	return err;
-}
-int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
-			   u8 promisc)
-{
-
-        printf("%s %s:%d\n", __func__, __FILE__, __LINE__);
-
-
-
-	struct mlx4_cmd_mailbox *mailbox;
-	struct mlx4_set_port_rqp_calc_context *context;
-	int err;
-	u32 in_mod;
-
-	mailbox = mlx4_alloc_cmd_mailbox(dev);
-	if (IS_ERR(mailbox))
-		return PTR_ERR(mailbox);
-	context = mailbox->buf;
-	memset(context, 0, sizeof *context);
-
-	context->base_qpn = cpu_to_be32(base_qpn);
-	context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_EN_SHIFT | base_qpn);
-/*
-	context->mcast = cpu_to_be32((dev->caps.mc_promisc_mode <<
-				      SET_PORT_PROMISC_MODE_SHIFT) | base_qpn);
-*/
-	context->intra_no_vlan = 0;
-	context->no_vlan = MLX4_NO_VLAN_IDX;
-	context->intra_vlan_miss = 0;
-	context->vlan_miss = MLX4_VLAN_MISS_IDX;
-
-	in_mod = MLX4_SET_PORT_RQP_CALC << 8 | port;
-	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,
-		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
-
-	mlx4_free_cmd_mailbox(dev, mailbox);
-	return err;
-}
-#endif
-
 int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port)
 {
 	struct mlx4_en_query_port_context *qport_context;
@@ -153,7 +85,8 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port)
 		return PTR_ERR(mailbox);
 	memset(mailbox->buf, 0, sizeof(*qport_context));
 	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, port, 0,
-			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
+			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,
+			   MLX4_CMD_WRAPPED);
 	if (err)
 		goto out;
 	qport_context = mailbox->buf;
@@ -169,95 +102,77 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port)
 	case MLX4_EN_10G_SPEED_XFI:
 		state->link_speed = 10000;
 		break;
+	case MLX4_EN_20G_SPEED:
+		state->link_speed = 20000;
+		break;
 	case MLX4_EN_40G_SPEED:
 		state->link_speed = 40000;
 		break;
+	case MLX4_EN_56G_SPEED:
+		state->link_speed = 56000;
+		break;
 	default:
 		state->link_speed = -1;
 		break;
 	}
 	state->transciver = qport_context->transceiver;
-	if (be32_to_cpu(qport_context->transceiver_code_hi) & 0x400)
-		state->transciver = 0x80;
+	state->autoneg = !!(qport_context->autoneg & MLX4_EN_AUTONEG_MASK);
 
 out:
 	mlx4_free_cmd_mailbox(mdev->dev, mailbox);
 	return err;
 }
 
-#if 0
-static int read_iboe_counters(struct mlx4_dev *dev, int index, u64 counters[])
-{
-	struct mlx4_cmd_mailbox *mailbox;
-	int err;
-	int mode;
-	struct mlx4_counters_ext *ext;
-	struct mlx4_counters *reg;
-
-	mailbox = mlx4_alloc_cmd_mailbox(dev);
-	if (IS_ERR(mailbox))
-		return -ENOMEM;
-
-	err = mlx4_cmd_box(dev, 0, mailbox->dma, index, 0,
-			   MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_WRAPPED);
-	if (err)
-		goto out;
-
-	mode = be32_to_cpu(((struct mlx4_counters *)mailbox->buf)->counter_mode) & 0xf;
-	switch (mode) {
-	case 0:
-		reg = mailbox->buf;
-		counters[0] = be64_to_cpu(reg->rx_frames);
-		counters[1] = be64_to_cpu(reg->tx_frames);
-		counters[2] = be64_to_cpu(reg->rx_bytes);
-		counters[3] = be64_to_cpu(reg->tx_bytes);
-		break;
-	case 1:
-		ext = mailbox->buf;
-		counters[0] = be64_to_cpu(ext->rx_uni_frames);
-		counters[1] = be64_to_cpu(ext->tx_uni_frames);
-		counters[2] = be64_to_cpu(ext->rx_uni_bytes);
-		counters[3] = be64_to_cpu(ext->tx_uni_bytes);
-		break;
-	default:
-		err = -EINVAL;
-	}
-
-out:
-	mlx4_free_cmd_mailbox(dev, mailbox);
-	return err;
-}
-#endif
-
 int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
 {
 	struct mlx4_en_stat_out_mbox *mlx4_en_stats;
-	struct net_device *dev;
-	struct mlx4_en_priv *priv;
-	struct mlx4_cmd_mailbox *mailbox;
+	struct mlx4_en_stat_out_flow_control_mbox *flowstats;
+	struct mlx4_en_priv *priv = netdev_priv(mdev->pndev[port]);
+	struct mlx4_en_vport_stats *vport_stats = &priv->vport_stats;
+	struct mlx4_cmd_mailbox *mailbox = NULL;
+	struct mlx4_cmd_mailbox *mailbox_flow = NULL;
 	u64 in_mod = reset << 8 | port;
-	unsigned long oerror;
-	unsigned long ierror;
 	int err;
 	int i;
-	//int counter;
-	u64 counters[4];
+	int do_if_stat = 1;
+	unsigned long period = (unsigned long) (jiffies - priv->last_ifq_jiffies);
+	struct mlx4_en_vport_stats tmp_vport_stats;
+        struct net_device *dev;
 
-	dev = mdev->pndev[port];
-	priv = netdev_priv(dev);
-	memset(counters, 0, sizeof counters);
-        /*
-	counter = mlx4_get_iboe_counter(priv->mdev->dev, port);
-	if (counter >= 0)
-		err = read_iboe_counters(priv->mdev->dev, counter, counters);
-        */
+	if (jiffies_to_msecs(period) < EN_IFQ_MIN_INTERVAL ||
+				priv->counter_index == 0xff)
+		do_if_stat = 0;
 
 	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);
-	if (IS_ERR(mailbox))
-		return PTR_ERR(mailbox);
-	memset(mailbox->buf, 0, sizeof(*mlx4_en_stats));
+	if (IS_ERR(mailbox)) {
+		err = PTR_ERR(mailbox);
+		goto mailbox_out;
+	}
+
+	mailbox_flow = mlx4_alloc_cmd_mailbox(mdev->dev);
+	if (IS_ERR(mailbox_flow)) {
+		mlx4_free_cmd_mailbox(mdev->dev, mailbox);
+		err = PTR_ERR(mailbox_flow);
+		goto mailbox_out;
+	}
+
+	/* 0xffs indicates invalid value */
+	memset(mailbox_flow->buf, 0xff, sizeof(*flowstats) *
+		MLX4_NUM_PRIORITIES);
+
+	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) {
+		memset(mailbox_flow->buf, 0, sizeof(*flowstats));
+		err = mlx4_cmd_box(mdev->dev, 0, mailbox_flow->dma,
+				   in_mod | 1<<12, 0, MLX4_CMD_DUMP_ETH_STATS,
+				   MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
+
+		if (err)
+			goto out;
+	}
+
 	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, in_mod, 0,
-			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
+			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,
+			   MLX4_CMD_NATIVE);
 	if (err)
 		goto out;
 
@@ -265,74 +180,404 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
 
 	spin_lock(&priv->stats_lock);
 
-	oerror = ierror = 0;
-	dev->if_ipackets = counters[0];
-	dev->if_ibytes = counters[2];
+	priv->port_stats.rx_chksum_good = 0;
+	priv->port_stats.rx_chksum_none = 0;
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		dev->if_ipackets += priv->rx_ring[i].packets;
-		dev->if_ibytes += priv->rx_ring[i].bytes;
-		ierror += priv->rx_ring[i].errors;
-	}
-	dev->if_opackets = counters[1];
-	dev->if_obytes = counters[3];
-	for (i = 0; i <= priv->tx_ring_num; i++) {
-		dev->if_opackets += priv->tx_ring[i].packets;
-		dev->if_obytes += priv->tx_ring[i].bytes;
-		oerror += priv->tx_ring[i].errors;
+		priv->port_stats.rx_chksum_good += priv->rx_ring[i]->csum_ok;
+		priv->port_stats.rx_chksum_none += priv->rx_ring[i]->csum_none;
 	}
 
-	dev->if_ierrors = be32_to_cpu(mlx4_en_stats->RDROP) + ierror;
-	dev->if_oerrors = be32_to_cpu(mlx4_en_stats->TDROP) + oerror;
-	dev->if_imcasts = be64_to_cpu(mlx4_en_stats->MCAST_prio_0) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_1) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_2) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_3) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_4) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_5) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_6) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_prio_7) +
-			  be64_to_cpu(mlx4_en_stats->MCAST_novlan);
-	dev->if_omcasts = be64_to_cpu(mlx4_en_stats->TMCAST_prio_0) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_1) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_2) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_3) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_4) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_5) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_6) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_prio_7) +
-			  be64_to_cpu(mlx4_en_stats->TMCAST_novlan);
-	dev->if_collisions = 0;
+	priv->port_stats.tx_chksum_offload = 0;
+	priv->port_stats.queue_stopped = 0;
+	priv->port_stats.wake_queue = 0;
+	for (i = 0; i < priv->tx_ring_num; i++) {
+		priv->port_stats.tx_chksum_offload += priv->tx_ring[i]->tx_csum;
+		priv->port_stats.queue_stopped += priv->tx_ring[i]->queue_stopped;
+		priv->port_stats.wake_queue += priv->tx_ring[i]->wake_queue;
+	}
+	/* RX Statistics */
+	priv->pkstats.rx_packets = be64_to_cpu(mlx4_en_stats->RTOT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->RTOT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->RTOT_novlan);
+	priv->pkstats.rx_bytes = be64_to_cpu(mlx4_en_stats->ROCT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->ROCT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->ROCT_novlan);
+	priv->pkstats.rx_multicast_packets = be64_to_cpu(mlx4_en_stats->MCAST_prio_0) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_1) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_2) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_3) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_4) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_5) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_6) +
+		be64_to_cpu(mlx4_en_stats->MCAST_prio_7) +
+		be64_to_cpu(mlx4_en_stats->MCAST_novlan);
+	priv->pkstats.rx_broadcast_packets = be64_to_cpu(mlx4_en_stats->RBCAST_prio_0) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_1) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_2) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_3) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_4) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_5) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_6) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_prio_7) +
+		be64_to_cpu(mlx4_en_stats->RBCAST_novlan);
+	priv->pkstats.rx_errors = be64_to_cpu(mlx4_en_stats->PCS) +
+		be32_to_cpu(mlx4_en_stats->RJBBR) +
+		be32_to_cpu(mlx4_en_stats->RCRC) +
+		be32_to_cpu(mlx4_en_stats->RRUNT) +
+		be64_to_cpu(mlx4_en_stats->RInRangeLengthErr) +
+		be64_to_cpu(mlx4_en_stats->ROutRangeLengthErr) +
+		be32_to_cpu(mlx4_en_stats->RSHORT) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->RGIANT_novlan);
+	priv->pkstats.rx_dropped = be32_to_cpu(mlx4_en_stats->RdropOvflw);
+	priv->pkstats.rx_length_errors = be32_to_cpu(mlx4_en_stats->RdropLength);
+	priv->pkstats.rx_over_errors = be32_to_cpu(mlx4_en_stats->RdropOvflw);
+	priv->pkstats.rx_crc_errors = be32_to_cpu(mlx4_en_stats->RCRC);
+	priv->pkstats.rx_jabbers = be32_to_cpu(mlx4_en_stats->RJBBR);
+	priv->pkstats.rx_in_range_length_error = be64_to_cpu(mlx4_en_stats->RInRangeLengthErr);
+	priv->pkstats.rx_out_range_length_error = be64_to_cpu(mlx4_en_stats->ROutRangeLengthErr);
+	priv->pkstats.rx_lt_64_bytes_packets = be64_to_cpu(mlx4_en_stats->R64_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R64_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R64_novlan);
+	priv->pkstats.rx_127_bytes_packets = be64_to_cpu(mlx4_en_stats->R127_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R127_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R127_novlan);
+	priv->pkstats.rx_255_bytes_packets = be64_to_cpu(mlx4_en_stats->R255_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R255_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R255_novlan);
+	priv->pkstats.rx_511_bytes_packets = be64_to_cpu(mlx4_en_stats->R511_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R511_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R511_novlan);
+	priv->pkstats.rx_1023_bytes_packets = be64_to_cpu(mlx4_en_stats->R1023_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R1023_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R1023_novlan);
+	priv->pkstats.rx_1518_bytes_packets = be64_to_cpu(mlx4_en_stats->R1518_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R1518_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R1518_novlan);
+	priv->pkstats.rx_1522_bytes_packets = be64_to_cpu(mlx4_en_stats->R1522_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R1522_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R1522_novlan);
+	priv->pkstats.rx_1548_bytes_packets = be64_to_cpu(mlx4_en_stats->R1548_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R1548_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R1548_novlan);
+	priv->pkstats.rx_gt_1548_bytes_packets = be64_to_cpu(mlx4_en_stats->R2MTU_prio_0) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_1) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_2) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_3) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_4) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_5) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_6) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_prio_7) +
+		be64_to_cpu(mlx4_en_stats->R2MTU_novlan);
+
+	/* Tx Stats */
+	priv->pkstats.tx_packets = be64_to_cpu(mlx4_en_stats->TTOT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->TTOT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->TTOT_novlan);
+	priv->pkstats.tx_bytes = be64_to_cpu(mlx4_en_stats->TOCT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->TOCT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->TOCT_novlan);
+	priv->pkstats.tx_multicast_packets = be64_to_cpu(mlx4_en_stats->TMCAST_prio_0) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_1) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_2) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_3) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_4) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_5) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_6) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_prio_7) +
+		be64_to_cpu(mlx4_en_stats->TMCAST_novlan);
+	priv->pkstats.tx_broadcast_packets = be64_to_cpu(mlx4_en_stats->TBCAST_prio_0) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_1) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_2) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_3) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_4) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_5) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_6) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_prio_7) +
+		be64_to_cpu(mlx4_en_stats->TBCAST_novlan);
+	priv->pkstats.tx_errors = be64_to_cpu(mlx4_en_stats->TGIANT_prio_0) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_1) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_2) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_3) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_4) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_5) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_6) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_prio_7) +
+		be64_to_cpu(mlx4_en_stats->TGIANT_novlan);
+	priv->pkstats.tx_dropped = be32_to_cpu(mlx4_en_stats->TDROP) -
+		priv->pkstats.tx_errors;
+	priv->pkstats.tx_lt_64_bytes_packets = be64_to_cpu(mlx4_en_stats->T64_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T64_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T64_novlan);
+	priv->pkstats.tx_127_bytes_packets = be64_to_cpu(mlx4_en_stats->T127_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T127_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T127_novlan);
+	priv->pkstats.tx_255_bytes_packets = be64_to_cpu(mlx4_en_stats->T255_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T255_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T255_novlan);
+	priv->pkstats.tx_511_bytes_packets = be64_to_cpu(mlx4_en_stats->T511_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T511_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T511_novlan);
+	priv->pkstats.tx_1023_bytes_packets = be64_to_cpu(mlx4_en_stats->T1023_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T1023_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T1023_novlan);
+	priv->pkstats.tx_1518_bytes_packets = be64_to_cpu(mlx4_en_stats->T1518_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T1518_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T1518_novlan);
+	priv->pkstats.tx_1522_bytes_packets = be64_to_cpu(mlx4_en_stats->T1522_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T1522_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T1522_novlan);
+	priv->pkstats.tx_1548_bytes_packets = be64_to_cpu(mlx4_en_stats->T1548_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T1548_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T1548_novlan);
+	priv->pkstats.tx_gt_1548_bytes_packets = be64_to_cpu(mlx4_en_stats->T2MTU_prio_0) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_1) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_2) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_3) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_4) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_5) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_6) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_prio_7) +
+		be64_to_cpu(mlx4_en_stats->T2MTU_novlan);
+
+	priv->pkstats.rx_prio[0][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_0);
+	priv->pkstats.rx_prio[0][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_0);
+	priv->pkstats.rx_prio[1][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_1);
+	priv->pkstats.rx_prio[1][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_1);
+	priv->pkstats.rx_prio[2][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_2);
+	priv->pkstats.rx_prio[2][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_2);
+	priv->pkstats.rx_prio[3][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_3);
+	priv->pkstats.rx_prio[3][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_3);
+	priv->pkstats.rx_prio[4][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_4);
+	priv->pkstats.rx_prio[4][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_4);
+	priv->pkstats.rx_prio[5][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_5);
+	priv->pkstats.rx_prio[5][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_5);
+	priv->pkstats.rx_prio[6][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_6);
+	priv->pkstats.rx_prio[6][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_6);
+	priv->pkstats.rx_prio[7][0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_7);
+	priv->pkstats.rx_prio[7][1] = be64_to_cpu(mlx4_en_stats->ROCT_prio_7);
+	priv->pkstats.rx_prio[8][0] = be64_to_cpu(mlx4_en_stats->RTOT_novlan);
+	priv->pkstats.rx_prio[8][1] = be64_to_cpu(mlx4_en_stats->ROCT_novlan);
+	priv->pkstats.tx_prio[0][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_0);
+	priv->pkstats.tx_prio[0][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_0);
+	priv->pkstats.tx_prio[1][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_1);
+	priv->pkstats.tx_prio[1][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_1);
+	priv->pkstats.tx_prio[2][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_2);
+	priv->pkstats.tx_prio[2][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_2);
+	priv->pkstats.tx_prio[3][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_3);
+	priv->pkstats.tx_prio[3][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_3);
+	priv->pkstats.tx_prio[4][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_4);
+	priv->pkstats.tx_prio[4][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_4);
+	priv->pkstats.tx_prio[5][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_5);
+	priv->pkstats.tx_prio[5][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_5);
+	priv->pkstats.tx_prio[6][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_6);
+	priv->pkstats.tx_prio[6][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_6);
+	priv->pkstats.tx_prio[7][0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_7);
+	priv->pkstats.tx_prio[7][1] = be64_to_cpu(mlx4_en_stats->TOCT_prio_7);
+	priv->pkstats.tx_prio[8][0] = be64_to_cpu(mlx4_en_stats->TTOT_novlan);
+	priv->pkstats.tx_prio[8][1] = be64_to_cpu(mlx4_en_stats->TOCT_novlan);
+
+	flowstats = mailbox_flow->buf;
+
+	for (i = 0; i < MLX4_NUM_PRIORITIES; i++)	{
+		priv->flowstats[i].rx_pause =
+			be64_to_cpu(flowstats[i].rx_pause);
+		priv->flowstats[i].rx_pause_duration =
+			be64_to_cpu(flowstats[i].rx_pause_duration);
+		priv->flowstats[i].rx_pause_transition =
+			be64_to_cpu(flowstats[i].rx_pause_transition);
+		priv->flowstats[i].tx_pause =
+			be64_to_cpu(flowstats[i].tx_pause);
+		priv->flowstats[i].tx_pause_duration =
+			be64_to_cpu(flowstats[i].tx_pause_duration);
+		priv->flowstats[i].tx_pause_transition =
+			be64_to_cpu(flowstats[i].tx_pause_transition);
+	}
+
+	memset(&tmp_vport_stats, 0, sizeof(tmp_vport_stats));
+	spin_unlock(&priv->stats_lock);
+	err = mlx4_get_vport_ethtool_stats(mdev->dev, port,
+					   &tmp_vport_stats, reset);
+	spin_lock(&priv->stats_lock);
+	if (!err) {
+		/* ethtool stats format */
+		vport_stats->rx_unicast_packets = tmp_vport_stats.rx_unicast_packets;
+		vport_stats->rx_unicast_bytes = tmp_vport_stats.rx_unicast_bytes;
+		vport_stats->rx_multicast_packets = tmp_vport_stats.rx_multicast_packets;
+		vport_stats->rx_multicast_bytes = tmp_vport_stats.rx_multicast_bytes;
+		vport_stats->rx_broadcast_packets = tmp_vport_stats.rx_broadcast_packets;
+		vport_stats->rx_broadcast_bytes = tmp_vport_stats.rx_broadcast_bytes;
+		vport_stats->rx_dropped = tmp_vport_stats.rx_dropped;
+		vport_stats->rx_errors = tmp_vport_stats.rx_errors;
+		vport_stats->tx_unicast_packets = tmp_vport_stats.tx_unicast_packets;
+		vport_stats->tx_unicast_bytes = tmp_vport_stats.tx_unicast_bytes;
+		vport_stats->tx_multicast_packets = tmp_vport_stats.tx_multicast_packets;
+		vport_stats->tx_multicast_bytes = tmp_vport_stats.tx_multicast_bytes;
+		vport_stats->tx_broadcast_packets = tmp_vport_stats.tx_broadcast_packets;
+		vport_stats->tx_broadcast_bytes = tmp_vport_stats.tx_broadcast_bytes;
+		vport_stats->tx_errors = tmp_vport_stats.tx_errors;
+	}
+
+	if (!mlx4_is_mfunc(mdev->dev)) {
+		if (reset == 0) {
+			/* netdevice stats format */
+			dev                     = mdev->pndev[port];
+			if_inc_counter(dev, IFCOUNTER_IPACKETS,
+			    priv->pkstats.rx_packets - priv->pkstats_last.rx_packets);
+			if_inc_counter(dev, IFCOUNTER_OPACKETS,
+			    priv->pkstats.tx_packets - priv->pkstats_last.tx_packets);
+			if_inc_counter(dev, IFCOUNTER_IBYTES,
+			    priv->pkstats.rx_bytes - priv->pkstats_last.rx_bytes);
+			if_inc_counter(dev, IFCOUNTER_OBYTES,
+			    priv->pkstats.tx_bytes - priv->pkstats_last.tx_bytes);
+			if_inc_counter(dev, IFCOUNTER_IERRORS,
+			    priv->pkstats.rx_errors - priv->pkstats_last.rx_errors);
+			if_inc_counter(dev, IFCOUNTER_IQDROPS,
+			    priv->pkstats.rx_dropped - priv->pkstats_last.rx_dropped);
+			if_inc_counter(dev, IFCOUNTER_IMCASTS,
+			    priv->pkstats.rx_multicast_packets - priv->pkstats_last.rx_multicast_packets);
+			if_inc_counter(dev, IFCOUNTER_OMCASTS,
+			    priv->pkstats.tx_multicast_packets - priv->pkstats_last.tx_multicast_packets);
+		}
+		priv->pkstats_last = priv->pkstats;
+	}
 
-	priv->pkstats.broadcast =
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_0) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_1) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_2) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_3) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_4) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_5) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_6) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_prio_7) +
-				be64_to_cpu(mlx4_en_stats->RBCAST_novlan);
-	priv->pkstats.rx_prio[0] = be64_to_cpu(mlx4_en_stats->RTOT_prio_0);
-	priv->pkstats.rx_prio[1] = be64_to_cpu(mlx4_en_stats->RTOT_prio_1);
-	priv->pkstats.rx_prio[2] = be64_to_cpu(mlx4_en_stats->RTOT_prio_2);
-	priv->pkstats.rx_prio[3] = be64_to_cpu(mlx4_en_stats->RTOT_prio_3);
-	priv->pkstats.rx_prio[4] = be64_to_cpu(mlx4_en_stats->RTOT_prio_4);
-	priv->pkstats.rx_prio[5] = be64_to_cpu(mlx4_en_stats->RTOT_prio_5);
-	priv->pkstats.rx_prio[6] = be64_to_cpu(mlx4_en_stats->RTOT_prio_6);
-	priv->pkstats.rx_prio[7] = be64_to_cpu(mlx4_en_stats->RTOT_prio_7);
-	priv->pkstats.tx_prio[0] = be64_to_cpu(mlx4_en_stats->TTOT_prio_0);
-	priv->pkstats.tx_prio[1] = be64_to_cpu(mlx4_en_stats->TTOT_prio_1);
-	priv->pkstats.tx_prio[2] = be64_to_cpu(mlx4_en_stats->TTOT_prio_2);
-	priv->pkstats.tx_prio[3] = be64_to_cpu(mlx4_en_stats->TTOT_prio_3);
-	priv->pkstats.tx_prio[4] = be64_to_cpu(mlx4_en_stats->TTOT_prio_4);
-	priv->pkstats.tx_prio[5] = be64_to_cpu(mlx4_en_stats->TTOT_prio_5);
-	priv->pkstats.tx_prio[6] = be64_to_cpu(mlx4_en_stats->TTOT_prio_6);
-	priv->pkstats.tx_prio[7] = be64_to_cpu(mlx4_en_stats->TTOT_prio_7);
 	spin_unlock(&priv->stats_lock);
 
 out:
+	mlx4_free_cmd_mailbox(mdev->dev, mailbox_flow);
 	mlx4_free_cmd_mailbox(mdev->dev, mailbox);
+
+mailbox_out:
+	if (do_if_stat)
+		priv->last_ifq_jiffies = jiffies;
+
 	return err;
 }
-
diff --git a/sys/ofed/drivers/net/mlx4/en_port.h b/sys/ofed/drivers/net/mlx4/en_port.h
index 531981452333..6301717e1814 100644
--- a/sys/ofed/drivers/net/mlx4/en_port.h
+++ b/sys/ofed/drivers/net/mlx4/en_port.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -36,39 +36,10 @@
 
 
 #define SET_PORT_GEN_ALL_VALID	0x7
-#define SET_PORT_PROMISC_EN_SHIFT	31
-#define SET_PORT_PROMISC_MODE_SHIFT	30
+#define SET_PORT_PROMISC_SHIFT	31
+#define SET_PORT_MC_PROMISC_SHIFT	30
 
-#if 0 //moved to port.c - shahark
-
-struct mlx4_set_port_general_context {
-	u8 reserved[3];
-	u8 flags;
-	u16 reserved2;
-	__be16 mtu;
-	u8 pptx;
-	u8 pfctx;
-	u16 reserved3;
-	u8 pprx;
-	u8 pfcrx;
-	u16 reserved4;
-};
-
-struct mlx4_set_port_rqp_calc_context {
-	__be32 base_qpn;
-	__be32 flags;
-	u8 reserved[3];
-	u8 mac_miss;
-	u8 intra_no_vlan;
-	u8 no_vlan;
-	u8 intra_vlan_miss;
-	u8 vlan_miss;
-	u8 reserved2[3];
-	u8 no_vlan_prio;
-	__be32 promisc;
-	__be32 mcast;
-};
-#endif
+#define MLX4_EN_NUM_TC		8
 
 #define VLAN_FLTR_SIZE	128
 struct mlx4_set_vlan_fltr_mbox {
@@ -83,29 +54,27 @@ enum {
 };
 
 enum {
-	MLX4_EN_1G_SPEED	= 0x02,
-	MLX4_EN_10G_SPEED_XFI	= 0x01,
 	MLX4_EN_10G_SPEED_XAUI	= 0x00,
+	MLX4_EN_10G_SPEED_XFI	= 0x01,
+	MLX4_EN_1G_SPEED	= 0x02,
+	MLX4_EN_20G_SPEED	= 0x08,
 	MLX4_EN_40G_SPEED	= 0x40,
+	MLX4_EN_56G_SPEED	= 0x20,
 	MLX4_EN_OTHER_SPEED	= 0x0f,
 };
 
 struct mlx4_en_query_port_context {
 	u8 link_up;
 #define MLX4_EN_LINK_UP_MASK	0x80
-	u8 reserved;
+	u8 autoneg;
+#define MLX4_EN_AUTONEG_MASK	0x80
 	__be16 mtu;
 	u8 reserved2;
 	u8 link_speed;
-#define MLX4_EN_SPEED_MASK	0x43
+#define MLX4_EN_SPEED_MASK	0x6b
 	u16 reserved3[5];
 	__be64 mac;
 	u8 transceiver;
-	u8 reserved4[3];
-	__be32 wavelenth;
-	u32 reserved5;
-	__be32 transceiver_code_hi;
-	__be32 transceiver_code_low;
 };
 
 
@@ -590,6 +559,5 @@ struct mlx4_en_stat_out_mbox {
 	__be32 TDROP;
 };
 
-enum mlx4_query_reply mlx4_en_query(void *endev_ptr, void *int_dev);
 
 #endif
diff --git a/sys/ofed/drivers/net/mlx4/en_resources.c b/sys/ofed/drivers/net/mlx4/en_resources.c
index a147153803fd..669ecbd11843 100644
--- a/sys/ofed/drivers/net/mlx4/en_resources.c
+++ b/sys/ofed/drivers/net/mlx4/en_resources.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,24 +31,26 @@
  *
  */
 
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mlx4/qp.h>
 
 #include "mlx4_en.h"
 
+
 void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
 			     int is_tx, int rss, int qpn, int cqn,
-			     struct mlx4_qp_context *context)
+			     int user_prio, struct mlx4_qp_context *context)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct net_device *dev = priv->dev;
 
 	memset(context, 0, sizeof *context);
-	context->flags = cpu_to_be32(7 << 16 | rss << 13);
+	context->flags = cpu_to_be32(7 << 16 | rss << MLX4_RSS_QPC_FLAG_OFFSET);
 	context->pd = cpu_to_be32(mdev->priv_pdn);
 	context->mtu_msgmax = 0xff;
-	if (!is_tx && !rss) {
+	if (!is_tx && !rss)
 		context->rq_size_stride = ilog2(size) << 3 | (ilog2(stride) - 4);
-	}
 	if (is_tx)
 		context->sq_size_stride = ilog2(size) << 3 | (ilog2(stride) - 4);
 	else
@@ -57,10 +59,25 @@ void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
 	context->local_qpn = cpu_to_be32(qpn);
 	context->pri_path.ackto = 1 & 0x07;
 	context->pri_path.sched_queue = 0x83 | (priv->port - 1) << 6;
-	context->pri_path.counter_index = 0xff;
+	if (user_prio >= 0) {
+		context->pri_path.sched_queue |= user_prio << 3;
+		context->pri_path.feup = 1 << 6;
+	}
+	context->pri_path.counter_index = (u8)(priv->counter_index);
+	if (!rss &&
+	    (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_LB_SRC_CHK) &&
+	    context->pri_path.counter_index != 0xFF) {
+		/* disable multicast loopback to qp with same counter */
+		context->pri_path.fl |= MLX4_FL_ETH_SRC_CHECK_MC_LB;
+		context->pri_path.vlan_control |=
+			MLX4_VLAN_CTRL_ETH_SRC_CHECK_IF_COUNTER;
+	}
+
 	context->cqn_send = cpu_to_be32(cqn);
 	context->cqn_recv = cpu_to_be32(cqn);
 	context->db_rec_addr = cpu_to_be64(priv->res.db.dma << 2);
+	if (!(dev->if_capabilities & IFCAP_VLAN_HWCSUM))
+		context->param3 |= cpu_to_be32(1 << 30);
 }
 
 
@@ -69,6 +86,8 @@ int mlx4_en_map_buffer(struct mlx4_buf *buf)
 	struct page **pages;
 	int i;
 
+        // if nbufs == 1 - there is no need to vmap 
+        // if buf->direct.buf is not NULL it means that vmap was already done by mlx4_alloc_buff
 	if (buf->direct.buf != NULL || buf->nbufs == 1)
 		return 0;
 
@@ -89,11 +108,10 @@ int mlx4_en_map_buffer(struct mlx4_buf *buf)
 
 void mlx4_en_unmap_buffer(struct mlx4_buf *buf)
 {
-	if (buf->direct.buf != NULL || buf->nbufs == 1)
+	if (BITS_PER_LONG == 64 || buf->nbufs == 1)
 		return;
 
 	vunmap(buf->direct.buf);
-	buf->direct.buf = NULL;
 }
 
 void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event)
diff --git a/sys/ofed/drivers/net/mlx4/en_rx.c b/sys/ofed/drivers/net/mlx4/en_rx.c
index ca46721dd28b..320462ec02ad 100644
--- a/sys/ofed/drivers/net/mlx4/en_rx.c
+++ b/sys/ofed/drivers/net/mlx4/en_rx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -30,20 +30,48 @@
  * SOFTWARE.
  *
  */
-
 #include "opt_inet.h"
+#include <linux/mlx4/cq.h>
+#include <linux/slab.h>
+#include <linux/mlx4/qp.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <linux/vmalloc.h>
+#include <linux/mlx4/driver.h>
+#ifdef CONFIG_NET_RX_BUSY_POLL
+#include <net/busy_poll.h>
+#endif
+
 #include "mlx4_en.h"
 
-#include <linux/mlx4/cq.h>
-#include <linux/mlx4/qp.h>
 
-#include <net/ethernet.h>
-#include <net/if_vlan_var.h>
-#include <sys/mbuf.h>
+static void mlx4_en_init_rx_desc(struct mlx4_en_priv *priv,
+				 struct mlx4_en_rx_ring *ring,
+				 int index)
+{
+	struct mlx4_en_rx_desc *rx_desc = ring->buf + ring->stride * index;
+	int possible_frags;
+	int i;
 
-enum {
-	MIN_RX_ARM = 1024,
-};
+
+	/* Set size and memtype fields */
+	for (i = 0; i < priv->num_frags; i++) {
+		rx_desc->data[i].byte_count =
+			cpu_to_be32(priv->frag_info[i].frag_size);
+		rx_desc->data[i].lkey = cpu_to_be32(priv->mdev->mr.key);
+	}
+
+	/* If the number of used fragments does not fill up the ring stride,
+	 *          * remaining (unused) fragments must be padded with null address/size
+	 *                   * and a special memory key */
+	possible_frags = (ring->stride - sizeof(struct mlx4_en_rx_desc)) / DS_SIZE;
+	for (i = priv->num_frags; i < possible_frags; i++) {
+		rx_desc->data[i].byte_count = 0;
+		rx_desc->data[i].lkey = cpu_to_be32(MLX4_EN_MEMTYPE_PAD);
+		rx_desc->data[i].addr = 0;
+	}
+
+}
 
 static int mlx4_en_alloc_buf(struct mlx4_en_priv *priv,
 			     struct mlx4_en_rx_desc *rx_desc,
@@ -70,48 +98,24 @@ static int mlx4_en_alloc_buf(struct mlx4_en_priv *priv,
 	return 0;
 }
 
-static void mlx4_en_init_rx_desc(struct mlx4_en_priv *priv,
-				 struct mlx4_en_rx_ring *ring, int index)
-{
-	struct mlx4_en_rx_desc *rx_desc = ring->buf + ring->stride * index;
-	int possible_frags;
-	int i;
-
-	/* Set size and memtype fields */
-	for (i = 0; i < priv->num_frags; i++) {
-		rx_desc->data[i].byte_count =
-			cpu_to_be32(priv->frag_info[i].frag_size);
-		rx_desc->data[i].lkey = cpu_to_be32(priv->mdev->mr.key);
-	}
-
-	/* If the number of used fragments does not fill up the ring stride,
-	 * remaining (unused) fragments must be padded with null address/size
-	 * and a special memory key */
-	possible_frags = (ring->stride - sizeof(struct mlx4_en_rx_desc)) / DS_SIZE;
-	for (i = priv->num_frags; i < possible_frags; i++) {
-		rx_desc->data[i].byte_count = 0;
-		rx_desc->data[i].lkey = cpu_to_be32(MLX4_EN_MEMTYPE_PAD);
-		rx_desc->data[i].addr = 0;
-	}
-}
 
 static int mlx4_en_prepare_rx_desc(struct mlx4_en_priv *priv,
-				   struct mlx4_en_rx_ring *ring, int index)
+                                   struct mlx4_en_rx_ring *ring, int index)
 {
-	struct mlx4_en_rx_desc *rx_desc = ring->buf + (index * ring->stride);
-	struct mbuf **mb_list = ring->rx_info + (index << priv->log_rx_info);
-	int i;
+        struct mlx4_en_rx_desc *rx_desc = ring->buf + (index * ring->stride);
+        struct mbuf **mb_list = ring->rx_info + (index << priv->log_rx_info);
+        int i;
 
-	for (i = 0; i < priv->num_frags; i++)
-		if (mlx4_en_alloc_buf(priv, rx_desc, mb_list, i))
-			goto err;
+        for (i = 0; i < priv->num_frags; i++)
+                if (mlx4_en_alloc_buf(priv, rx_desc, mb_list, i))
+                        goto err;
 
-	return 0;
+        return 0;
 
 err:
-	while (i--)
-		m_free(mb_list[i]);
-	return -ENOMEM;
+        while (i--)
+                m_free(mb_list[i]);
+        return -ENOMEM;
 }
 
 static inline void mlx4_en_update_rx_prod_db(struct mlx4_en_rx_ring *ring)
@@ -136,7 +140,11 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv,
  		frag_info = &priv->frag_info[nr];
 		dma = be64_to_cpu(rx_desc->data[nr].addr);
 
-		en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (long long) dma);
+#if BITS_PER_LONG == 64
+		en_dbg(DRV, priv, "Unmaping buffer at dma:0x%lx\n", (u64) dma);
+#elif BITS_PER_LONG == 32
+                en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma);
+#endif
 		pci_unmap_single(mdev->pdev, dma, frag_info->frag_size,
 				 PCI_DMA_FROMDEVICE);
 		m_free(mb_list[nr]);
@@ -153,7 +161,7 @@ static int mlx4_en_fill_rx_buffers(struct mlx4_en_priv *priv)
 
 	for (buf_ind = 0; buf_ind < priv->prof->rx_ring_size; buf_ind++) {
 		for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
-			ring = &priv->rx_ring[ring_ind];
+			ring = priv->rx_ring[ring_ind];
 
 			err = mlx4_en_prepare_rx_desc(priv, ring,
 						      ring->actual_size);
@@ -163,7 +171,8 @@ static int mlx4_en_fill_rx_buffers(struct mlx4_en_priv *priv)
 						     "enough rx buffers\n");
 					return -ENOMEM;
 				} else {
-					new_size = rounddown_pow_of_two(ring->actual_size);
+					new_size =
+						rounddown_pow_of_two(ring->actual_size);
 					en_warn(priv, "Only %d buffers allocated "
 						      "reducing ring size to %d\n",
 						ring->actual_size, new_size);
@@ -178,7 +187,7 @@ static int mlx4_en_fill_rx_buffers(struct mlx4_en_priv *priv)
 
 reduce_rings:
 	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
-		ring = &priv->rx_ring[ring_ind];
+		ring = priv->rx_ring[ring_ind];
 		while (ring->actual_size > new_size) {
 			ring->actual_size--;
 			ring->prod--;
@@ -207,407 +216,6 @@ static void mlx4_en_free_rx_buf(struct mlx4_en_priv *priv,
 	}
 }
 
-
-int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
-			   struct mlx4_en_rx_ring *ring, u32 size)
-{
-	struct mlx4_en_dev *mdev = priv->mdev;
-	int err;
-	int tmp;
-
-
-	ring->prod = 0;
-	ring->cons = 0;
-	ring->size = size;
-	ring->size_mask = size - 1;
-	ring->stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
-					  DS_SIZE * MLX4_EN_MAX_RX_FRAGS);
-	ring->log_stride = ffs(ring->stride) - 1;
-	ring->buf_size = ring->size * ring->stride + TXBB_SIZE;
-
-	tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
-					sizeof(struct mbuf *));
-
-	ring->rx_info = kmalloc(tmp, GFP_KERNEL);
-	if (!ring->rx_info) {
-		en_err(priv, "Failed allocating rx_info ring\n");
-		return -ENOMEM;
-	}
-	en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d stride:%d (%d)\n",
-		 ring->rx_info, tmp, ring->stride, ring->log_stride);
-
-	err = mlx4_alloc_hwq_res(mdev->dev, &ring->wqres,
-				 ring->buf_size, 2 * PAGE_SIZE);
-	if (err)
-		goto err_ring;
-
-	err = mlx4_en_map_buffer(&ring->wqres.buf);
-	if (err) {
-		en_err(priv, "Failed to map RX buffer\n");
-		goto err_hwq;
-	}
-	ring->buf = ring->wqres.buf.direct.buf;
-
-	return 0;
-
-	mlx4_en_unmap_buffer(&ring->wqres.buf);
-err_hwq:
-	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
-err_ring:
-	kfree(ring->rx_info);
-	ring->rx_info = NULL;
-	return err;
-}
-
-int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
-{
-	struct mlx4_en_rx_ring *ring;
-	int i;
-	int ring_ind;
-	int err;
-	int stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
-					DS_SIZE * priv->num_frags);
-	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
-		ring = &priv->rx_ring[ring_ind];
-
-		ring->prod = 0;
-		ring->cons = 0;
-		ring->actual_size = 0;
-		ring->cqn = priv->rx_cq[ring_ind].mcq.cqn;
-		ring->stride = stride;
-		if (ring->stride <= TXBB_SIZE)
-			ring->buf += TXBB_SIZE;
-
-		ring->log_stride = ffs(ring->stride) - 1;
-		ring->buf_size = ring->size * ring->stride;
-
-		memset(ring->buf, 0, ring->buf_size);
-		mlx4_en_update_rx_prod_db(ring);
-
-		/* Initailize all descriptors */
-		for (i = 0; i < ring->size; i++)
-			mlx4_en_init_rx_desc(priv, ring, i);
-#ifdef INET
-		/* Configure lro mngr */
-		if (priv->dev->if_capenable & IFCAP_LRO) {
-			if (tcp_lro_init(&ring->lro))
-				priv->dev->if_capenable &= ~IFCAP_LRO;
-			else
-				ring->lro.ifp = priv->dev;
-		}
-#endif
-	}
-	err = mlx4_en_fill_rx_buffers(priv);
-	if (err)
-		goto err_buffers;
-
-	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
-		ring = &priv->rx_ring[ring_ind];
-
-		ring->size_mask = ring->actual_size - 1;
-		mlx4_en_update_rx_prod_db(ring);
-	}
-
-
-	return 0;
-
-err_buffers:
-	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++)
-		mlx4_en_free_rx_buf(priv, &priv->rx_ring[ring_ind]);
-
-	return err;
-}
-
-void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
-			     struct mlx4_en_rx_ring *ring)
-{
-	struct mlx4_en_dev *mdev = priv->mdev;
-
-	mlx4_en_unmap_buffer(&ring->wqres.buf);
-	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size + TXBB_SIZE);
-	kfree(ring->rx_info);
-	ring->rx_info = NULL;
-}
-
-void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
-				struct mlx4_en_rx_ring *ring)
-{
-#ifdef INET
-	tcp_lro_free(&ring->lro);
-#endif
-	mlx4_en_free_rx_buf(priv, ring);
-	if (ring->stride <= TXBB_SIZE)
-		ring->buf -= TXBB_SIZE;
-}
-
-
-/* Unmap a completed descriptor and free unused pages */
-static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
-				    struct mlx4_en_rx_desc *rx_desc,
-				    struct mbuf **mb_list,
-				    int length)
-{
-	struct mlx4_en_dev *mdev = priv->mdev;
-	struct mlx4_en_frag_info *frag_info;
-	dma_addr_t dma;
-	struct mbuf *mb;
-	int nr;
-
-	mb = mb_list[0];
-	mb->m_pkthdr.len = length;
-	/* Collect used fragments while replacing them in the HW descirptors */
-	for (nr = 0; nr < priv->num_frags; nr++) {
-		frag_info = &priv->frag_info[nr];
-		if (length <= frag_info->frag_prefix_size)
-			break;
-		if (nr) 
-			mb->m_next = mb_list[nr];
-		mb = mb_list[nr];
-		mb->m_len = frag_info[nr].frag_size;
-		dma = be64_to_cpu(rx_desc->data[nr].addr);
-
-		/* Allocate a replacement page */
-		if (mlx4_en_alloc_buf(priv, rx_desc, mb_list, nr))
-			goto fail;
-
-		/* Unmap buffer */
-		pci_unmap_single(mdev->pdev, dma, frag_info[nr].frag_size,
-				 PCI_DMA_FROMDEVICE);
-	}
-	/* Adjust size of last fragment to match actual length */
-	mb->m_len = length - priv->frag_info[nr - 1].frag_prefix_size;
-	mb->m_next = NULL;
-	return 0;
-
-fail:
-	/* Drop all accumulated fragments (which have already been replaced in
-	 * the descriptor) of this packet; remaining fragments are reused... */
-	while (nr > 0) {
-		nr--;
-		m_free(mb_list[nr]);
-	}
-	return -ENOMEM;
-}
-
-
-static inline int invalid_cqe(struct mlx4_en_priv *priv,
-			      struct mlx4_cqe *cqe)
-{
-	/* Drop packet on bad receive or bad checksum */
-	if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
-		     MLX4_CQE_OPCODE_ERROR)) {
-		en_err(priv, "CQE completed in error - vendor "
-			 "syndrom:%d syndrom:%d\n",
-			 ((struct mlx4_err_cqe *) cqe)->vendor_err_syndrome,
-			 ((struct mlx4_err_cqe *) cqe)->syndrome);
-		return 1;
-	}
-	if (unlikely(cqe->badfcs_enc & MLX4_CQE_BAD_FCS)) {
-		en_dbg(RX_ERR, priv, "Accepted frame with bad FCS\n");
-		return 1;
-	}
-
-	return 0;
-}
-
-static void validate_loopback(struct mlx4_en_priv *priv, struct mbuf *mb)
-{
-	int i;
-	int offset = ETHER_HDR_LEN;
-
-	for (i = 0; i < MLX4_LOOPBACK_TEST_PAYLOAD; i++, offset++) {
-		if (*(mb->m_data + offset) != (unsigned char) (i & 0xff))
-			goto out_loopback;
-	}
-	/* Loopback found */
-	priv->loopback_ok = 1;
-
-out_loopback:
-	m_freem(mb);
-}
-
-static struct mbuf *mlx4_en_rx_mb(struct mlx4_en_priv *priv,
-				  struct mlx4_en_rx_desc *rx_desc,
-				  struct mbuf **mb_list,
-				  unsigned int length)
-{
-	struct mbuf *mb;
-
-	mb = mb_list[0];
-	/* Move relevant fragments to mb */
-	if (unlikely(mlx4_en_complete_rx_desc(priv, rx_desc, mb_list, length)))
-		return NULL;
-
-	return mb;
-}
-
-
-int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget)
-{
-	struct mlx4_en_priv *priv = netdev_priv(dev);
-	struct mlx4_cqe *cqe;
-	struct mlx4_en_rx_ring *ring = &priv->rx_ring[cq->ring];
-	struct mbuf **mb_list;
-	struct mlx4_en_rx_desc *rx_desc;
-	struct mbuf *mb;
-#ifdef INET
-	struct lro_entry *queued;
-#endif
-	int index;
-	unsigned int length;
-	int polled = 0;
-
-	if (!priv->port_up)
-		return 0;
-
-	/* We assume a 1:1 mapping between CQEs and Rx descriptors, so Rx
-	 * descriptor offset can be deduced from the CQE index instead of
-	 * reading 'cqe->index' */
-	index = cq->mcq.cons_index & ring->size_mask;
-	cqe = &cq->buf[index];
-
-	/* Process all completed CQEs */
-	while (XNOR(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK,
-		    cq->mcq.cons_index & cq->size)) {
-
-		mb_list = ring->rx_info + (index << priv->log_rx_info);
-		rx_desc = ring->buf + (index << ring->log_stride);
-
-		/*
-		 * make sure we read the CQE after we read the ownership bit
-		 */
-		rmb();
-
-		if (invalid_cqe(priv, cqe))
-			goto next;
-
-		/*
-		 * Packet is OK - process it.
-		 */
-		length = be32_to_cpu(cqe->byte_cnt);
-		mb = mlx4_en_rx_mb(priv, rx_desc, mb_list, length);
-		if (!mb) {
-			ring->errors++;
-			goto next;
-		}
-
-		ring->bytes += length;
-		ring->packets++;
-
-                if (unlikely(priv->validate_loopback)) {
-			validate_loopback(priv, mb);
-			goto next;
-		}
-
-		mb->m_pkthdr.flowid = cq->ring;
-		mb->m_flags |= M_FLOWID;
-		mb->m_pkthdr.rcvif = dev;
-		if (be32_to_cpu(cqe->vlan_my_qpn) &
-		    MLX4_CQE_VLAN_PRESENT_MASK) {
-			mb->m_pkthdr.ether_vtag = be16_to_cpu(cqe->sl_vid);
-			mb->m_flags |= M_VLANTAG;
-		}
-		if (likely(priv->rx_csum) &&
-		    (cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
-		    (cqe->checksum == cpu_to_be16(0xffff))) {
-			priv->port_stats.rx_chksum_good++;
-			mb->m_pkthdr.csum_flags = 
-			    CSUM_IP_CHECKED | CSUM_IP_VALID |
-			    CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
-			mb->m_pkthdr.csum_data = htons(0xffff);
-			/* This packet is eligible for LRO if it is:
-			 * - DIX Ethernet (type interpretation)
-			 * - TCP/IP (v4)
-			 * - without IP options
-			 * - not an IP fragment
-			 */
-#ifdef INET
-			if (mlx4_en_can_lro(cqe->status) &&
-			    (dev->if_capenable & IFCAP_LRO)) {
-				if (ring->lro.lro_cnt != 0 &&
-				    tcp_lro_rx(&ring->lro, mb, 0) == 0)
-					goto next;
-			}
-#endif
-
-			/* LRO not possible, complete processing here */
-			INC_PERF_COUNTER(priv->pstats.lro_misses);
-		} else {
-			mb->m_pkthdr.csum_flags = 0;
-			priv->port_stats.rx_chksum_none++;
-#ifdef INET
-			if (priv->ip_reasm &&
-			    cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPV4) &&
-			    !mlx4_en_rx_frags(priv, ring, mb, cqe))
-				goto next;
-#endif
-		}
-
-		/* Push it up the stack */
-		dev->if_input(dev, mb);
-
-next:
-		++cq->mcq.cons_index;
-		index = (cq->mcq.cons_index) & ring->size_mask;
-		cqe = &cq->buf[index];
-		if (++polled == budget)
-			goto out;
-	}
-	/* Flush all pending IP reassembly sessions */
-out:
-#ifdef INET
-	mlx4_en_flush_frags(priv, ring);
-	while ((queued = SLIST_FIRST(&ring->lro.lro_active)) != NULL) {
-		SLIST_REMOVE_HEAD(&ring->lro.lro_active, next);
-		tcp_lro_flush(&ring->lro, queued);
-	}
-#endif
-	AVG_PERF_COUNTER(priv->pstats.rx_coal_avg, polled);
-	mlx4_cq_set_ci(&cq->mcq);
-	wmb(); /* ensure HW sees CQ consumer before we post new buffers */
-	ring->cons = cq->mcq.cons_index;
-	ring->prod += polled; /* Polled descriptors were realocated in place */
-	mlx4_en_update_rx_prod_db(ring);
-	return polled;
-}
-
-
-/* Rx CQ polling - called by NAPI */
-static int mlx4_en_poll_rx_cq(struct mlx4_en_cq *cq, int budget)
-{
-	struct net_device *dev = cq->dev;
-	int done;
-
-	done = mlx4_en_process_rx_cq(dev, cq, budget);
-	cq->tot_rx += done;
-
-	return done;
-}
-
-void mlx4_en_rx_que(void *context, int pending)
-{
-	struct mlx4_en_cq *cq;
-
-        cq = context;
-	while (mlx4_en_poll_rx_cq(cq, MLX4_EN_MAX_RX_POLL)
-	    == MLX4_EN_MAX_RX_POLL);
-	mlx4_en_arm_cq(cq->dev->if_softc, cq);
-}
-
-void mlx4_en_rx_irq(struct mlx4_cq *mcq)
-{
-	struct mlx4_en_cq *cq = container_of(mcq, struct mlx4_en_cq, mcq);
-	struct mlx4_en_priv *priv = netdev_priv(cq->dev);
-	int done;
-
-	done = mlx4_en_poll_rx_cq(cq, MLX4_EN_MAX_RX_POLL);
-	if (done == MLX4_EN_MAX_RX_POLL)
-		taskqueue_enqueue(cq->tq, &cq->cq_task);
-	else
-		mlx4_en_arm_cq(priv, cq);
-}
-
-
 #if MLX4_EN_MAX_RX_FRAGS == 3
 static int frag_sizes[] = {
 	FRAG_SZ0,
@@ -626,7 +234,7 @@ static int frag_sizes[] = {
 void mlx4_en_calc_rx_buf(struct net_device *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
-	int eff_mtu = dev->if_mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + ETH_LLC_SNAP_SIZE;
+	int eff_mtu = dev->if_mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
 	int buf_size = 0;
 	int i, frag;
 
@@ -652,10 +260,456 @@ void mlx4_en_calc_rx_buf(struct net_device *dev)
 	for (i = 0; i < priv->num_frags; i++) {
 		en_dbg(DRV, priv, "  frag:%d - size:%d prefix:%d\n", i,
 				priv->frag_info[i].frag_size,
-				priv->frag_info[i].frag_prefix_size)
+				priv->frag_info[i].frag_prefix_size);
 	}
 }
 
+
+int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
+			   struct mlx4_en_rx_ring **pring,
+			   u32 size, int node)
+{
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_rx_ring *ring;
+	int err = -ENOMEM;
+	int tmp;
+
+        ring = kzalloc(sizeof(struct mlx4_en_rx_ring), GFP_KERNEL);
+        if (!ring) {
+                en_err(priv, "Failed to allocate RX ring structure\n");
+                return -ENOMEM;
+        }
+ 
+	ring->prod = 0;
+	ring->cons = 0;
+	ring->size = size;
+	ring->size_mask = size - 1;
+	ring->stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
+	                                          DS_SIZE * MLX4_EN_MAX_RX_FRAGS);
+	ring->log_stride = ffs(ring->stride) - 1;
+	ring->buf_size = ring->size * ring->stride + TXBB_SIZE;
+
+	tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
+	                                        sizeof(struct mbuf *));
+
+        ring->rx_info = kmalloc(tmp, GFP_KERNEL);
+        if (!ring->rx_info) {
+                err = -ENOMEM;
+                goto err_ring;
+        }
+
+	en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d\n",
+		 ring->rx_info, tmp);
+
+	err = mlx4_alloc_hwq_res(mdev->dev, &ring->wqres,
+				 ring->buf_size, 2 * PAGE_SIZE);
+	if (err)
+		goto err_info;
+
+	err = mlx4_en_map_buffer(&ring->wqres.buf);
+	if (err) {
+		en_err(priv, "Failed to map RX buffer\n");
+		goto err_hwq;
+	}
+	ring->buf = ring->wqres.buf.direct.buf;
+	*pring = ring;
+	return 0;
+
+err_hwq:
+	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
+err_info:
+	vfree(ring->rx_info);
+err_ring:
+	kfree(ring);
+
+	return err;
+}
+
+
+int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
+{
+	struct mlx4_en_rx_ring *ring;
+	int i;
+	int ring_ind;
+	int err;
+	int stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
+	                                        DS_SIZE * priv->num_frags);
+
+	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
+		ring = priv->rx_ring[ring_ind];
+
+		ring->prod = 0;
+		ring->cons = 0;
+		ring->actual_size = 0;
+		ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn;
+		ring->rx_alloc_order = priv->rx_alloc_order;
+		ring->rx_alloc_size = priv->rx_alloc_size;
+		ring->rx_buf_size = priv->rx_buf_size;
+                ring->rx_mb_size = priv->rx_mb_size;
+
+		ring->stride = stride;
+		if (ring->stride <= TXBB_SIZE)
+			ring->buf += TXBB_SIZE;
+
+		ring->log_stride = ffs(ring->stride) - 1;
+		ring->buf_size = ring->size * ring->stride;
+
+		memset(ring->buf, 0, ring->buf_size);
+		mlx4_en_update_rx_prod_db(ring);
+
+		/* Initialize all descriptors */
+		for (i = 0; i < ring->size; i++)
+			mlx4_en_init_rx_desc(priv, ring, i);
+
+#ifdef INET
+		/* Configure lro mngr */
+		if (priv->dev->if_capenable & IFCAP_LRO) {
+			if (tcp_lro_init(&ring->lro))
+				priv->dev->if_capenable &= ~IFCAP_LRO;
+			else
+				ring->lro.ifp = priv->dev;
+		}
+#endif
+	}
+
+
+	err = mlx4_en_fill_rx_buffers(priv);
+	if (err)
+		goto err_buffers;
+
+	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
+		ring = priv->rx_ring[ring_ind];
+
+		ring->size_mask = ring->actual_size - 1;
+		mlx4_en_update_rx_prod_db(ring);
+	}
+
+	return 0;
+
+err_buffers:
+	for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++)
+		mlx4_en_free_rx_buf(priv, priv->rx_ring[ring_ind]);
+
+	ring_ind = priv->rx_ring_num - 1;
+
+	while (ring_ind >= 0) {
+		ring = priv->rx_ring[ring_ind];
+		if (ring->stride <= TXBB_SIZE)
+			ring->buf -= TXBB_SIZE;
+		ring_ind--;
+	}
+
+	return err;
+}
+
+
+void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
+			     struct mlx4_en_rx_ring **pring,
+			     u32 size, u16 stride)
+{
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_rx_ring *ring = *pring;
+
+	mlx4_en_unmap_buffer(&ring->wqres.buf);
+	mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE);
+	vfree(ring->rx_info);
+	kfree(ring);
+	*pring = NULL;
+#ifdef CONFIG_RFS_ACCEL
+	mlx4_en_cleanup_filters(priv, ring);
+#endif
+}
+
+
+void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
+				struct mlx4_en_rx_ring *ring)
+{
+#ifdef INET
+	tcp_lro_free(&ring->lro);
+#endif
+	mlx4_en_free_rx_buf(priv, ring);
+	if (ring->stride <= TXBB_SIZE)
+		ring->buf -= TXBB_SIZE;
+}
+
+
+static void validate_loopback(struct mlx4_en_priv *priv, struct mbuf *mb)
+{
+	int i;
+	int offset = ETHER_HDR_LEN;
+
+	for (i = 0; i < MLX4_LOOPBACK_TEST_PAYLOAD; i++, offset++) {
+		if (*(mb->m_data + offset) != (unsigned char) (i & 0xff))
+			goto out_loopback;
+	}
+	/* Loopback found */
+	priv->loopback_ok = 1;
+
+out_loopback:
+	m_freem(mb);
+}
+
+
+static inline int invalid_cqe(struct mlx4_en_priv *priv,
+			      struct mlx4_cqe *cqe)
+{
+	/* Drop packet on bad receive or bad checksum */
+	if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
+		     MLX4_CQE_OPCODE_ERROR)) {
+		en_err(priv, "CQE completed in error - vendor syndrom:%d syndrom:%d\n",
+		       ((struct mlx4_err_cqe *)cqe)->vendor_err_syndrome,
+		       ((struct mlx4_err_cqe *)cqe)->syndrome);
+		return 1;
+	}
+	if (unlikely(cqe->badfcs_enc & MLX4_CQE_BAD_FCS)) {
+		en_dbg(RX_ERR, priv, "Accepted frame with bad FCS\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+
+/* Unmap a completed descriptor and free unused pages */
+static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
+				    struct mlx4_en_rx_desc *rx_desc,
+				    struct mbuf **mb_list,
+				    int length)
+{
+	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_frag_info *frag_info;
+	dma_addr_t dma;
+	struct mbuf *mb;
+	int nr;
+
+	mb = mb_list[0];
+	mb->m_pkthdr.len = length;
+	/* Collect used fragments while replacing them in the HW descirptors */
+	for (nr = 0; nr < priv->num_frags; nr++) {
+		frag_info = &priv->frag_info[nr];
+		if (length <= frag_info->frag_prefix_size)
+			break;
+		if (nr)
+			mb->m_next = mb_list[nr];
+		mb = mb_list[nr];
+		mb->m_len = frag_info[nr].frag_size;
+		dma = be64_to_cpu(rx_desc->data[nr].addr);
+
+                /* Allocate a replacement page */
+                if (mlx4_en_alloc_buf(priv, rx_desc, mb_list, nr))
+                        goto fail;
+
+		/* Unmap buffer */
+		pci_unmap_single(mdev->pdev, dma, frag_info[nr].frag_size,
+				 PCI_DMA_FROMDEVICE);
+	}
+	/* Adjust size of last fragment to match actual length */
+	mb->m_len = length - priv->frag_info[nr - 1].frag_prefix_size;
+	mb->m_next = NULL;
+	return 0;
+
+fail:
+        /* Drop all accumulated fragments (which have already been replaced in
+         * the descriptor) of this packet; remaining fragments are reused... */
+        while (nr > 0) {
+                nr--;
+                m_free(mb_list[nr]);
+        }
+        return -ENOMEM;
+
+}
+
+static struct mbuf *mlx4_en_rx_mb(struct mlx4_en_priv *priv,
+				  struct mlx4_en_rx_desc *rx_desc,
+				  struct mbuf **mb_list,
+				  unsigned int length)
+{
+	struct mbuf *mb;
+
+	mb = mb_list[0];
+	/* Move relevant fragments to mb */
+	if (unlikely(mlx4_en_complete_rx_desc(priv, rx_desc, mb_list, length)))
+		return NULL;
+
+	return mb;
+}
+
+/* For cpu arch with cache line of 64B the performance is better when cqe size==64B
+ * To enlarge cqe size from 32B to 64B --> 32B of garbage (i.e. 0xccccccc)
+ * was added in the beginning of each cqe (the real data is in the corresponding 32B).
+ * The following calc ensures that when factor==1, it means we are alligned to 64B
+ * and we get the real cqe data*/
+#define CQE_FACTOR_INDEX(index, factor) ((index << factor) + factor)
+int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget)
+{
+	struct mlx4_en_priv *priv = netdev_priv(dev);
+	struct mlx4_cqe *cqe;
+	struct mlx4_en_rx_ring *ring = priv->rx_ring[cq->ring];
+	struct mbuf **mb_list;
+	struct mlx4_en_rx_desc *rx_desc;
+	struct mbuf *mb;
+	struct mlx4_cq *mcq = &cq->mcq;
+	struct mlx4_cqe *buf = cq->buf;
+#ifdef INET
+	struct lro_entry *queued;
+#endif
+	int index;
+	unsigned int length;
+	int polled = 0;
+	u32 cons_index = mcq->cons_index;
+	u32 size_mask = ring->size_mask;
+	int size = cq->size;
+	int factor = priv->cqe_factor;
+
+	if (!priv->port_up)
+		return 0;
+
+	/* We assume a 1:1 mapping between CQEs and Rx descriptors, so Rx
+	 * descriptor offset can be deducted from the CQE index instead of
+	 * reading 'cqe->index' */
+	index = cons_index & size_mask;
+	cqe = &buf[CQE_FACTOR_INDEX(index, factor)];
+
+	/* Process all completed CQEs */
+	while (XNOR(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK,
+		    cons_index & size)) {
+		mb_list = ring->rx_info + (index << priv->log_rx_info);
+		rx_desc = ring->buf + (index << ring->log_stride);
+
+		/*
+		 * make sure we read the CQE after we read the ownership bit
+		 */
+		rmb();
+
+		if (invalid_cqe(priv, cqe)) {
+			goto next;
+		}
+		/*
+		 * Packet is OK - process it.
+		 */
+		length = be32_to_cpu(cqe->byte_cnt);
+		length -= ring->fcs_del;
+		mb = mlx4_en_rx_mb(priv, rx_desc, mb_list, length);
+		if (!mb) {
+			ring->errors++;
+			goto next;
+		}
+
+		ring->bytes += length;
+		ring->packets++;
+
+		if (unlikely(priv->validate_loopback)) {
+			validate_loopback(priv, mb);
+			goto next;
+		}
+
+		mb->m_pkthdr.flowid = cq->ring;
+		mb->m_flags |= M_FLOWID;
+		mb->m_pkthdr.rcvif = dev;
+		if (be32_to_cpu(cqe->vlan_my_qpn) &
+		    MLX4_CQE_VLAN_PRESENT_MASK) {
+			mb->m_pkthdr.ether_vtag = be16_to_cpu(cqe->sl_vid);
+			mb->m_flags |= M_VLANTAG;
+		}
+		if (likely(dev->if_capabilities & IFCAP_RXCSUM) &&
+		    (cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
+		    (cqe->checksum == cpu_to_be16(0xffff))) {
+			priv->port_stats.rx_chksum_good++;
+			mb->m_pkthdr.csum_flags =
+			    CSUM_IP_CHECKED | CSUM_IP_VALID |
+			    CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
+			mb->m_pkthdr.csum_data = htons(0xffff);
+			/* This packet is eligible for LRO if it is:
+			 * - DIX Ethernet (type interpretation)
+			 * - TCP/IP (v4)
+			 * - without IP options
+			 * - not an IP fragment
+			 */
+#ifdef INET
+			if (mlx4_en_can_lro(cqe->status) &&
+					(dev->if_capenable & IFCAP_LRO)) {
+				if (ring->lro.lro_cnt != 0 &&
+						tcp_lro_rx(&ring->lro, mb, 0) == 0)
+					goto next;
+			}
+
+#endif
+			/* LRO not possible, complete processing here */
+			INC_PERF_COUNTER(priv->pstats.lro_misses);
+		} else {
+			mb->m_pkthdr.csum_flags = 0;
+			priv->port_stats.rx_chksum_none++;
+		}
+
+		/* Push it up the stack */
+		dev->if_input(dev, mb);
+
+next:
+		++cons_index;
+		index = cons_index & size_mask;
+		cqe = &buf[CQE_FACTOR_INDEX(index, factor)];
+		if (++polled == budget)
+			goto out;
+	}
+	/* Flush all pending IP reassembly sessions */
+out:
+#ifdef INET
+	while ((queued = SLIST_FIRST(&ring->lro.lro_active)) != NULL) {
+		SLIST_REMOVE_HEAD(&ring->lro.lro_active, next);
+		tcp_lro_flush(&ring->lro, queued);
+	}
+#endif
+	AVG_PERF_COUNTER(priv->pstats.rx_coal_avg, polled);
+	mcq->cons_index = cons_index;
+	mlx4_cq_set_ci(mcq);
+	wmb(); /* ensure HW sees CQ consumer before we post new buffers */
+	ring->cons = mcq->cons_index;
+	ring->prod += polled; /* Polled descriptors were realocated in place */
+	mlx4_en_update_rx_prod_db(ring);
+	return polled;
+
+}
+
+/* Rx CQ polling - called by NAPI */
+static int mlx4_en_poll_rx_cq(struct mlx4_en_cq *cq, int budget)
+{
+        struct net_device *dev = cq->dev;
+        int done;
+
+        done = mlx4_en_process_rx_cq(dev, cq, budget);
+        cq->tot_rx += done;
+
+        return done;
+
+}
+void mlx4_en_rx_irq(struct mlx4_cq *mcq)
+{
+	struct mlx4_en_cq *cq = container_of(mcq, struct mlx4_en_cq, mcq);
+	struct mlx4_en_priv *priv = netdev_priv(cq->dev);
+        int done;
+
+        // Shoot one within the irq context 
+        // Because there is no NAPI in freeBSD
+        done = mlx4_en_poll_rx_cq(cq, MLX4_EN_RX_BUDGET);
+	if (priv->port_up  && (done == MLX4_EN_RX_BUDGET) ) {
+		taskqueue_enqueue(cq->tq, &cq->cq_task);
+        }
+	else {
+		mlx4_en_arm_cq(priv, cq);
+	}
+}
+
+void mlx4_en_rx_que(void *context, int pending)
+{
+        struct mlx4_en_cq *cq;
+
+        cq = context;
+        while (mlx4_en_poll_rx_cq(cq, MLX4_EN_RX_BUDGET)
+                        == MLX4_EN_RX_BUDGET);
+        mlx4_en_arm_cq(cq->dev->if_softc, cq);
+}
+
+
 /* RSS related functions */
 
 static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
@@ -672,6 +726,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
 		en_err(priv, "Failed to allocate qp context\n");
 		return -ENOMEM;
 	}
+
 	err = mlx4_qp_alloc(mdev->dev, qpn, qp);
 	if (err) {
 		en_err(priv, "Failed to allocate qp #%x\n", qpn);
@@ -681,9 +736,16 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
 
 	memset(context, 0, sizeof *context);
 	mlx4_en_fill_qp_context(priv, ring->actual_size, ring->stride, 0, 0,
-				qpn, ring->cqn, context);
+				qpn, ring->cqn, -1, context);
 	context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma);
 
+	/* Cancel FCS removal if FW allows */
+	if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_FCS_KEEP) {
+		context->param3 |= cpu_to_be32(1 << 29);
+		ring->fcs_del = ETH_FCS_LEN;
+	} else
+		ring->fcs_del = 0;
+
 	err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, context, qp, state);
 	if (err) {
 		mlx4_qp_remove(mdev->dev, qp);
@@ -695,26 +757,57 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
 	return err;
 }
 
+int mlx4_en_create_drop_qp(struct mlx4_en_priv *priv)
+{
+	int err;
+	u32 qpn;
+
+	err = mlx4_qp_reserve_range(priv->mdev->dev, 1, 1, &qpn, 0);
+	if (err) {
+		en_err(priv, "Failed reserving drop qpn\n");
+		return err;
+	}
+	err = mlx4_qp_alloc(priv->mdev->dev, qpn, &priv->drop_qp);
+	if (err) {
+		en_err(priv, "Failed allocating drop qp\n");
+		mlx4_qp_release_range(priv->mdev->dev, qpn, 1);
+		return err;
+	}
+
+	return 0;
+}
+
+void mlx4_en_destroy_drop_qp(struct mlx4_en_priv *priv)
+{
+	u32 qpn;
+
+	qpn = priv->drop_qp.qpn;
+	mlx4_qp_remove(priv->mdev->dev, &priv->drop_qp);
+	mlx4_qp_free(priv->mdev->dev, &priv->drop_qp);
+	mlx4_qp_release_range(priv->mdev->dev, qpn, 1);
+}
+
 /* Allocate rx qp's and configure them according to rss map */
 int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
 	struct mlx4_en_rss_map *rss_map = &priv->rss_map;
 	struct mlx4_qp_context context;
-	struct mlx4_en_rss_context *rss_context;
+	struct mlx4_rss_context *rss_context;
+	int rss_rings;
 	void *ptr;
-	u8 rss_mask;
-	int i, qpn;
+	u8 rss_mask = (MLX4_RSS_IPV4 | MLX4_RSS_TCP_IPV4 | MLX4_RSS_IPV6 |
+			MLX4_RSS_TCP_IPV6);
+	int i;
 	int err = 0;
 	int good_qps = 0;
+	static const u32 rsskey[10] = { 0xD181C62C, 0xF7F4DB5B, 0x1983A2FC,
+				0x943E1ADB, 0xD9389E6B, 0xD1039C2C, 0xA74499AD,
+				0x593D56D9, 0xF3253C06, 0x2ADC1FFC};
 
-	if (mdev->profile.udp_rss)
-		rss_mask = 0x3f;
-	else
-		rss_mask = 0x14;
 	en_dbg(DRV, priv, "Configuring rss steering\n");
 	err = mlx4_qp_reserve_range(mdev->dev, priv->rx_ring_num,
-				    roundup_pow_of_two(priv->rx_ring_num),
+				    priv->rx_ring_num,
 				    &rss_map->base_qpn, 0);
 	if (err) {
 		en_err(priv, "Failed reserving %d qps\n", priv->rx_ring_num);
@@ -722,9 +815,9 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
 	}
 
 	for (i = 0; i < priv->rx_ring_num; i++) {
-		qpn = rss_map->base_qpn + i;
-		err = mlx4_en_config_rss_qp(priv, qpn,
-					    &priv->rx_ring[i],
+		priv->rx_ring[i]->qpn = rss_map->base_qpn + i;
+		err = mlx4_en_config_rss_qp(priv, priv->rx_ring[i]->qpn,
+					    priv->rx_ring[i],
 					    &rss_map->state[i],
 					    &rss_map->qps[i]);
 		if (err)
@@ -734,28 +827,34 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
 	}
 
 	/* Configure RSS indirection qp */
-	err = mlx4_qp_reserve_range(mdev->dev, 1, 1, &priv->base_qpn, 0);
-	if (err) {
-		en_err(priv, "Failed to reserve range for RSS "
-			     "indirection qp\n");
-		goto rss_err;
-	}
 	err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, &rss_map->indir_qp);
 	if (err) {
 		en_err(priv, "Failed to allocate RSS indirection QP\n");
-		goto reserve_err;
+		goto rss_err;
 	}
 	rss_map->indir_qp.event = mlx4_en_sqp_event;
 	mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
-				priv->rx_ring[0].cqn, &context);
+				priv->rx_ring[0]->cqn, -1, &context);
 
-	ptr = ((void *) &context) + 0x3c;
-	rss_context = (struct mlx4_en_rss_context *) ptr;
-	rss_context->base_qpn = cpu_to_be32(ilog2(priv->rx_ring_num) << 24 |
+	if (!priv->prof->rss_rings || priv->prof->rss_rings > priv->rx_ring_num)
+		rss_rings = priv->rx_ring_num;
+	else
+		rss_rings = priv->prof->rss_rings;
+
+	ptr = ((void *) &context) + offsetof(struct mlx4_qp_context, pri_path)
+					+ MLX4_RSS_OFFSET_IN_QPC_PRI_PATH;
+	rss_context = ptr;
+	rss_context->base_qpn = cpu_to_be32(ilog2(rss_rings) << 24 |
 					    (rss_map->base_qpn));
 	rss_context->default_qpn = cpu_to_be32(rss_map->base_qpn);
+	if (priv->mdev->profile.udp_rss) {
+		rss_mask |=  MLX4_RSS_UDP_IPV4 | MLX4_RSS_UDP_IPV6;
+		rss_context->base_qpn_udp = rss_context->default_qpn;
+	}
 	rss_context->flags = rss_mask;
-	rss_context->base_qpn_udp = rss_context->default_qpn;
+	rss_context->hash_fn = MLX4_RSS_HASH_TOP;
+	for (i = 0; i < 10; i++)
+		rss_context->rss_key[i] = cpu_to_be32(rsskey[i]);
 
 	err = mlx4_qp_to_ready(mdev->dev, &priv->res.mtt, &context,
 			       &rss_map->indir_qp, &rss_map->indir_state);
@@ -769,8 +868,6 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
 		       MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
 	mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
 	mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-reserve_err:
-	mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 rss_err:
 	for (i = 0; i < good_qps; i++) {
 		mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
@@ -792,7 +889,6 @@ void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv)
 		       MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
 	mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
 	mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-	mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 
 	for (i = 0; i < priv->rx_ring_num; i++) {
 		mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
@@ -802,3 +898,4 @@ void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv)
 	}
 	mlx4_qp_release_range(mdev->dev, rss_map->base_qpn, priv->rx_ring_num);
 }
+
diff --git a/sys/ofed/drivers/net/mlx4/en_selftest.c b/sys/ofed/drivers/net/mlx4/en_selftest.c
index 0e62027321c7..2a28315d5965 100644
--- a/sys/ofed/drivers/net/mlx4/en_selftest.c
+++ b/sys/ofed/drivers/net/mlx4/en_selftest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,24 +31,24 @@
  *
  */
 
-#include "mlx4_en.h"
-
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 #include <linux/mlx4/driver.h>
 
+#include "mlx4_en.h"
+
 
 static int mlx4_en_test_registers(struct mlx4_en_priv *priv)
 {
 	return mlx4_cmd(priv->mdev->dev, 0, 0, 0, MLX4_CMD_HW_HEALTH_CHECK,
-			MLX4_CMD_TIME_CLASS_A);
+			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
 }
 
 static int mlx4_en_test_loopback_xmit(struct mlx4_en_priv *priv)
 {
-	struct mbuf *mb;
+	struct sk_buff *skb;
 	struct ethhdr *ethh;
 	unsigned char *packet;
 	unsigned int packet_size = MLX4_LOOPBACK_TEST_PAYLOAD;
@@ -57,24 +57,24 @@ static int mlx4_en_test_loopback_xmit(struct mlx4_en_priv *priv)
 
 
 	/* build the pkt before xmit */
-	mb = netdev_alloc_mb(priv->dev, MLX4_LOOPBACK_TEST_PAYLOAD + ETH_HLEN + NET_IP_ALIGN);
-	if (!mb) {
-		en_err(priv, "-LOOPBACK_TEST_XMIT- failed to create mb for xmit\n");
+	skb = netdev_alloc_skb(priv->dev, MLX4_LOOPBACK_TEST_PAYLOAD + ETH_HLEN + NET_IP_ALIGN);
+	if (!skb) {
+		en_err(priv, "-LOOPBACK_TEST_XMIT- failed to create skb for xmit\n");
 		return -ENOMEM;
 	}
-	mb_reserve(mb, NET_IP_ALIGN);
+	skb_reserve(skb, NET_IP_ALIGN);
 
-	ethh = (struct ethhdr *)mb_put(mb, sizeof(struct ethhdr));
-	packet	= (unsigned char *)mb_put(mb, packet_size);
+	ethh = (struct ethhdr *)skb_put(skb, sizeof(struct ethhdr));
+	packet	= (unsigned char *)skb_put(skb, packet_size);
 	memcpy(ethh->h_dest, priv->dev->dev_addr, ETH_ALEN);
 	memset(ethh->h_source, 0, ETH_ALEN);
 	ethh->h_proto = htons(ETH_P_ARP);
-	mb_set_mac_header(mb, 0);
+	skb_set_mac_header(skb, 0);
 	for (i = 0; i < packet_size; ++i)	/* fill our packet */
 		packet[i] = (unsigned char)(i & 0xff);
 
 	/* xmit the pkt */
-	err = mlx4_en_xmit(mb, priv->dev);
+	err = mlx4_en_xmit(skb, priv->dev);
 	return err;
 }
 
@@ -87,6 +87,8 @@ static int mlx4_en_test_loopback(struct mlx4_en_priv *priv)
         priv->loopback_ok = 0;
 	priv->validate_loopback = 1;
 
+	mlx4_en_update_loopback_state(priv->dev, priv->dev->features);
+
 	/* xmit */
 	if (mlx4_en_test_loopback_xmit(priv)) {
 		en_err(priv, "Transmitting loopback packet failed\n");
@@ -107,7 +109,8 @@ static int mlx4_en_test_loopback(struct mlx4_en_priv *priv)
 mlx4_en_test_loopback_exit:
 
 	priv->validate_loopback = 0;
-	return (!loopback_ok);
+	mlx4_en_update_loopback_state(priv->dev, priv->dev->features);
+	return !loopback_ok;
 }
 
 
@@ -127,8 +130,10 @@ static int mlx4_en_test_speed(struct mlx4_en_priv *priv)
 	if (mlx4_en_QUERY_PORT(priv->mdev, priv->port))
 		return -ENOMEM;
 
-	/* The device currently only supports 10G speed */
-	if (priv->port_state.link_speed != SPEED_10000)
+	/* The device supports 1G, 10G and 40G speed */
+	if (priv->port_state.link_speed != MLX4_EN_LINK_SPEED_1G &&
+	    priv->port_state.link_speed != MLX4_EN_LINK_SPEED_10G &&
+	    priv->port_state.link_speed != MLX4_EN_LINK_SPEED_40G)
 		return priv->port_state.link_speed;
 	return 0;
 }
@@ -138,7 +143,6 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	struct mlx4_en_dev *mdev = priv->mdev;
-	struct mlx4_en_tx_ring *tx_ring;
 	int i, carrier_ok;
 
 	memset(buf, 0, sizeof(u64) * MLX4_EN_NUM_SELF_TEST);
@@ -148,20 +152,16 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf)
 		carrier_ok = netif_carrier_ok(dev);
 
 		netif_carrier_off(dev);
-retry_tx:
-		/* Wait untill all tx queues are empty.
+		/* Wait until all tx queues are empty.
 		 * there should not be any additional incoming traffic
 		 * since we turned the carrier off */
 		msleep(200);
-		for (i = 0; i < priv->tx_ring_num && carrier_ok; i++) {
-			tx_ring = &priv->tx_ring[i];
-			if (tx_ring->prod != (tx_ring->cons + tx_ring->last_nr_txbb))
-				goto retry_tx;
-		}
 
-		if (priv->mdev->dev->caps.loopback_support){
+		if (priv->mdev->dev->caps.flags &
+					MLX4_DEV_CAP_FLAG_UC_LOOPBACK) {
 			buf[3] = mlx4_en_test_registers(priv);
-			buf[4] = mlx4_en_test_loopback(priv);
+			if (priv->port_up)
+				buf[4] = mlx4_en_test_loopback(priv);
 		}
 
 		if (carrier_ok)
diff --git a/sys/ofed/drivers/net/mlx4/en_tx.c b/sys/ofed/drivers/net/mlx4/en_tx.c
index 4661024a3eb8..94ac8c547d2d 100644
--- a/sys/ofed/drivers/net/mlx4/en_tx.c
+++ b/sys/ofed/drivers/net/mlx4/en_tx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -31,15 +31,13 @@
  *
  */
 
-#include "mlx4_en.h"
-
+#include <asm/page.h>
 #include <linux/mlx4/cq.h>
+#include <linux/slab.h>
 #include <linux/mlx4/qp.h>
+#include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
-
-#include <net/ethernet.h>
-#include <net/if_vlan_var.h>
-#include <sys/mbuf.h>
+#include <linux/moduleparam.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -50,59 +48,78 @@
 #include <netinet/tcp_lro.h>
 #include <netinet/udp.h>
 
+#include "mlx4_en.h"
+#include "utils.h"
+
 enum {
 	MAX_INLINE = 104, /* 128 - 16 - 4 - 4 */
 	MAX_BF = 256,
+	MIN_PKT_LEN = 17,
 };
 
-static int inline_thold = MAX_INLINE;
+static int inline_thold __read_mostly = MAX_INLINE;
 
-module_param_named(inline_thold, inline_thold, int, 0444);
-MODULE_PARM_DESC(inline_thold, "treshold for using inline data");
+module_param_named(inline_thold, inline_thold, uint, 0444);
+MODULE_PARM_DESC(inline_thold, "threshold for using inline data");
 
 int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
-			   struct mlx4_en_tx_ring *ring, u32 size,
-			   u16 stride)
+			   struct mlx4_en_tx_ring **pring, u32 size,
+			   u16 stride, int node, int queue_idx)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_tx_ring *ring;
 	int tmp;
 	int err;
 
+	ring = kzalloc_node(sizeof(struct mlx4_en_tx_ring), GFP_KERNEL, node);
+	if (!ring) {
+		ring = kzalloc(sizeof(struct mlx4_en_tx_ring), GFP_KERNEL);
+		if (!ring) {
+			en_err(priv, "Failed allocating TX ring\n");
+			return -ENOMEM;
+		}
+	}
+
 	ring->size = size;
 	ring->size_mask = size - 1;
 	ring->stride = stride;
-
-	inline_thold = min(inline_thold, MAX_INLINE);
-
+	ring->full_size = ring->size - HEADROOM - MAX_DESC_TXBBS;
+	ring->inline_thold = min(inline_thold, MAX_INLINE);
 	mtx_init(&ring->tx_lock.m, "mlx4 tx", NULL, MTX_DEF);
 	mtx_init(&ring->comp_lock.m, "mlx4 comp", NULL, MTX_DEF);
 
 	/* Allocate the buf ring */
 	ring->br = buf_ring_alloc(MLX4_EN_DEF_TX_QUEUE_SIZE, M_DEVBUF,
-	    M_WAITOK, &ring->tx_lock.m);
+		M_WAITOK, &ring->tx_lock.m);
 	if (ring->br == NULL) {
 		en_err(priv, "Failed allocating tx_info ring\n");
 		return -ENOMEM;
 	}
 
 	tmp = size * sizeof(struct mlx4_en_tx_info);
-	ring->tx_info = kmalloc(tmp, GFP_KERNEL);
+	ring->tx_info = vmalloc_node(tmp, node);
 	if (!ring->tx_info) {
-		en_err(priv, "Failed allocating tx_info ring\n");
-		err = -ENOMEM;
-		goto err_tx;
+		ring->tx_info = vmalloc(tmp);
+		if (!ring->tx_info) {
+			err = -ENOMEM;
+			goto err_ring;
+		}
 	}
+
 	en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n",
 		 ring->tx_info, tmp);
 
-	ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);
+	ring->bounce_buf = kmalloc_node(MAX_DESC_SIZE, GFP_KERNEL, node);
 	if (!ring->bounce_buf) {
-		en_err(priv, "Failed allocating bounce buffer\n");
-		err = -ENOMEM;
-		goto err_tx;
+		ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);
+		if (!ring->bounce_buf) {
+			err = -ENOMEM;
+			goto err_info;
+		}
 	}
 	ring->buf_size = ALIGN(size * ring->stride, MLX4_EN_PAGE_SIZE);
 
+	/* Allocate HW buffers on provided NUMA node */
 	err = mlx4_alloc_hwq_res(mdev->dev, &ring->wqres, ring->buf_size,
 				 2 * PAGE_SIZE);
 	if (err) {
@@ -122,9 +139,10 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 	       "buf_size:%d dma:%llx\n", ring, ring->buf, ring->size,
 	       ring->buf_size, (unsigned long long) ring->wqres.buf.direct.map);
 
-	err = mlx4_qp_reserve_range(mdev->dev, 1, 256, &ring->qpn, MLX4_RESERVE_BF_QP);
+	err = mlx4_qp_reserve_range(mdev->dev, 1, 1, &ring->qpn,
+				    MLX4_RESERVE_BF_QP);
 	if (err) {
-		en_err(priv, "Failed reserving qp for tx ring.\n");
+		en_err(priv, "failed reserving qp for TX ring\n");
 		goto err_map;
 	}
 
@@ -135,14 +153,19 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 	}
 	ring->qp.event = mlx4_en_sqp_event;
 
-	err = mlx4_bf_alloc(mdev->dev, &ring->bf, 0);
+	err = mlx4_bf_alloc(mdev->dev, &ring->bf, node);
 	if (err) {
+		en_dbg(DRV, priv, "working without blueflame (%d)", err);
 		ring->bf.uar = &mdev->priv_uar;
 		ring->bf.uar->map = mdev->uar_map;
 		ring->bf_enabled = false;
 	} else
 		ring->bf_enabled = true;
+	ring->queue_index = queue_idx;
+	if (queue_idx < priv->num_tx_rings_p_up )
+		CPU_SET(queue_idx, &ring->affinity_mask);
 
+	*pring = ring;
 	return 0;
 
 err_reserve:
@@ -153,18 +176,19 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
 err_bounce:
 	kfree(ring->bounce_buf);
-	ring->bounce_buf = NULL;
-err_tx:
+err_info:
+	vfree(ring->tx_info);
+err_ring:
 	buf_ring_free(ring->br, M_DEVBUF);
-	kfree(ring->tx_info);
-	ring->tx_info = NULL;
+	kfree(ring);
 	return err;
 }
 
 void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
-			     struct mlx4_en_tx_ring *ring)
+			     struct mlx4_en_tx_ring **pring)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
+	struct mlx4_en_tx_ring *ring = *pring;
 	en_dbg(DRV, priv, "Destroying tx ring, qpn: %d\n", ring->qpn);
 
 	buf_ring_free(ring->br, M_DEVBUF);
@@ -172,20 +196,20 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
 		mlx4_bf_free(mdev->dev, &ring->bf);
 	mlx4_qp_remove(mdev->dev, &ring->qp);
 	mlx4_qp_free(mdev->dev, &ring->qp);
-	mlx4_qp_release_range(mdev->dev, ring->qpn, 1);
+	mlx4_qp_release_range(priv->mdev->dev, ring->qpn, 1);
 	mlx4_en_unmap_buffer(&ring->wqres.buf);
 	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
 	kfree(ring->bounce_buf);
-	ring->bounce_buf = NULL;
-	kfree(ring->tx_info);
-	ring->tx_info = NULL;
+	vfree(ring->tx_info);
 	mtx_destroy(&ring->tx_lock.m);
 	mtx_destroy(&ring->comp_lock.m);
+	kfree(ring);
+	*pring = NULL;
 }
 
 int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
 			     struct mlx4_en_tx_ring *ring,
-			     int cq)
+			     int cq, int user_prio)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
 	int err;
@@ -200,16 +224,15 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
 	memset(ring->buf, 0, ring->buf_size);
 
 	ring->qp_state = MLX4_QP_STATE_RST;
-	ring->doorbell_qpn = swab32(ring->qp.qpn << 8);
+	ring->doorbell_qpn = ring->qp.qpn << 8;
 
 	mlx4_en_fill_qp_context(priv, ring->size, ring->stride, 1, 0, ring->qpn,
-				ring->cqn, &ring->context);
+				ring->cqn, user_prio, &ring->context);
 	if (ring->bf_enabled)
 		ring->context.usr_page = cpu_to_be32(ring->bf.uar->index);
 
 	err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, &ring->context,
 			       &ring->qp, &ring->qp_state);
-
 	return err;
 }
 
@@ -222,65 +245,98 @@ void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
 		       MLX4_QP_STATE_RST, NULL, 0, 0, &ring->qp);
 }
 
+static void mlx4_en_stamp_wqe(struct mlx4_en_priv *priv,
+		       struct mlx4_en_tx_ring *ring,
+		       int index, u8 owner)
+{
+	struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
+	struct mlx4_en_tx_desc *tx_desc = ring->buf + index * TXBB_SIZE;
+	void *end = ring->buf + ring->buf_size;
+	__be32 *ptr = (__be32 *)tx_desc;
+	__be32 stamp = cpu_to_be32(STAMP_VAL | (!!owner << STAMP_SHIFT));
+	int i;
+
+	/* Optimize the common case when there are no wraparounds */
+	if (likely((void *)tx_desc + tx_info->nr_txbb * TXBB_SIZE <= end))
+		/* Stamp the freed descriptor */
+		for (i = 0; i < tx_info->nr_txbb * TXBB_SIZE; i += STAMP_STRIDE) {
+			*ptr = stamp;
+			ptr += STAMP_DWORDS;
+		}
+	else
+		/* Stamp the freed descriptor */
+		for (i = 0; i < tx_info->nr_txbb * TXBB_SIZE; i += STAMP_STRIDE) {
+			*ptr = stamp;
+			ptr += STAMP_DWORDS;
+			if ((void *)ptr >= end) {
+				ptr = ring->buf;
+				stamp ^= cpu_to_be32(0x80000000);
+			}
+		}
+}
 
 static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
 				struct mlx4_en_tx_ring *ring,
-				int index, u8 owner)
+				int index, u8 owner, u64 timestamp)
 {
 	struct mlx4_en_dev *mdev = priv->mdev;
 	struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
 	struct mlx4_en_tx_desc *tx_desc = ring->buf + index * TXBB_SIZE;
 	struct mlx4_wqe_data_seg *data = (void *) tx_desc + tx_info->data_offset;
-	struct mbuf *mb = tx_info->mb;
+        struct mbuf *mb = tx_info->mb;
 	void *end = ring->buf + ring->buf_size;
-	int frags = tx_info->nr_segs;
+	int frags = tx_info->nr_segs;;
 	int i;
-	__be32 *ptr = (__be32 *)tx_desc;
-	__be32 stamp = cpu_to_be32(STAMP_VAL | (!!owner << STAMP_SHIFT));
 
 	/* Optimize the common case when there are no wraparounds */
 	if (likely((void *) tx_desc + tx_info->nr_txbb * TXBB_SIZE <= end)) {
 		if (!tx_info->inl) {
+			if (tx_info->linear) {
+				dma_unmap_single(priv->ddev,
+					(dma_addr_t) be64_to_cpu(data->addr),
+					 be32_to_cpu(data->byte_count),
+					 PCI_DMA_TODEVICE);
+				++data;
+			}
+
 			for (i = 0; i < frags; i++) {
-				pci_unmap_single(mdev->pdev,
-					(dma_addr_t) be64_to_cpu(data[i].addr),
-					data[i].byte_count, PCI_DMA_TODEVICE);
+                                pci_unmap_single(mdev->pdev,
+                                                (dma_addr_t) be64_to_cpu(data[i].addr),
+                                                data[i].byte_count, PCI_DMA_TODEVICE);
 			}
 		}
-		/* Stamp the freed descriptor */
-		for (i = 0; i < tx_info->nr_txbb * TXBB_SIZE; i += STAMP_STRIDE) {
-			*ptr = stamp;
-			ptr += STAMP_DWORDS;
-		}
-
 	} else {
 		if (!tx_info->inl) {
+			if ((void *) data >= end) {
+				data = ring->buf + ((void *)data - end);
+			}
+
+			if (tx_info->linear) {
+				dma_unmap_single(priv->ddev,
+					(dma_addr_t) be64_to_cpu(data->addr),
+					 be32_to_cpu(data->byte_count),
+					 PCI_DMA_TODEVICE);
+				++data;
+			}
+
 			for (i = 0; i < frags; i++) {
 				/* Check for wraparound before unmapping */
 				if ((void *) data >= end)
-					data = (struct mlx4_wqe_data_seg *) ring->buf;
-				pci_unmap_single(mdev->pdev,
-					(dma_addr_t) be64_to_cpu(data->addr),
-					data->byte_count, PCI_DMA_TODEVICE);
+					data = ring->buf;
+                                pci_unmap_single(mdev->pdev,
+                                                (dma_addr_t) be64_to_cpu(data->addr),
+                                                data->byte_count, PCI_DMA_TODEVICE);
 				++data;
 			}
 		}
-		/* Stamp the freed descriptor */
-		for (i = 0; i < tx_info->nr_txbb * TXBB_SIZE; i += STAMP_STRIDE) {
-			*ptr = stamp;
-			ptr += STAMP_DWORDS;
-			if ((void *) ptr >= end) {
-				ptr = ring->buf;
-				stamp ^= cpu_to_be32(0x80000000);
-			}
-		}
-
 	}
-	m_freem(mb);
+	/* Send a copy of the frame to the BPF listener */
+        if (priv->dev && priv->dev->if_bpf)
+                ETHER_BPF_MTAP(priv->dev, mb);
+        m_freem(mb);
 	return tx_info->nr_txbb;
 }
 
-
 int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -292,14 +348,14 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
 		 ring->cons, ring->prod);
 
 	if ((u32) (ring->prod - ring->cons) > ring->size) {
-		en_warn(priv, "Tx consumer passed producer!\n");
+                en_warn(priv, "Tx consumer passed producer!\n");
 		return 0;
 	}
 
 	while (ring->cons != ring->prod) {
 		ring->last_nr_txbb = mlx4_en_free_tx_desc(priv, ring,
 						ring->cons & ring->size_mask,
-						!!(ring->cons & ring->size));
+						!!(ring->cons & ring->size), 0);
 		ring->cons += ring->last_nr_txbb;
 		cnt++;
 	}
@@ -310,109 +366,105 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
 	return cnt;
 }
 
-void mlx4_en_set_prio_map(struct mlx4_en_priv *priv, u16 *prio_map, u32 ring_num)
-{
-	int block = 8 / ring_num;
-	int extra = 8 - (block * ring_num);
-	int num = 0;
-	u16 ring = 1;
-	int prio;
-
-	if (ring_num == 1) {
-		for (prio = 0; prio < 8; prio++)
-			prio_map[prio] = 0;
-		return;
-	}
-
-	for (prio = 0; prio < 8; prio++) {
-		if (extra && (num == block + 1)) {
-			ring++;
-			num = 0;
-			extra--;
-		} else if (!extra && (num == block)) {
-			ring++;
-			num = 0;
-		}
-		prio_map[prio] = ring;
-		en_dbg(DRV, priv, " prio:%d --> ring:%d\n", prio, ring);
-		num++;
-	}
-}
-
-static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
+static int mlx4_en_process_tx_cq(struct net_device *dev,
+				 struct mlx4_en_cq *cq)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
 	struct mlx4_cq *mcq = &cq->mcq;
-	struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
-	struct mlx4_cqe *cqe = cq->buf;
+	struct mlx4_en_tx_ring *ring = priv->tx_ring[cq->ring];
+	struct mlx4_cqe *cqe;
 	u16 index;
-	u16 new_index;
+	u16 new_index, ring_index, stamp_index;
 	u32 txbbs_skipped = 0;
-	u32 cq_last_sav;
+	u32 txbbs_stamp = 0;
+	u32 cons_index = mcq->cons_index;
+	int size = cq->size;
+	u32 size_mask = ring->size_mask;
+	struct mlx4_cqe *buf = cq->buf;
+	u32 packets = 0;
+	u32 bytes = 0;
+	int factor = priv->cqe_factor;
+	u64 timestamp = 0;
+	int done = 0;
 
-	/* index always points to the first TXBB of the last polled descriptor */
-	index = ring->cons & ring->size_mask;
-	new_index = be16_to_cpu(cqe->wqe_index) & ring->size_mask;
-	if (index == new_index)
-		return;
 
 	if (!priv->port_up)
-		return;
+		return 0;
+
+	index = cons_index & size_mask;
+	cqe = &buf[(index << factor) + factor];
+	ring_index = ring->cons & size_mask;
+	stamp_index = ring_index;
+
+	/* Process all completed CQEs */
+	while (XNOR(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK,
+			cons_index & size)) {
+		/*
+		 * make sure we read the CQE after we read the
+		 * ownership bit
+		 */
+		rmb();
+
+		if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
+			     MLX4_CQE_OPCODE_ERROR)) {
+			en_err(priv, "CQE completed in error - vendor syndrom: 0x%x syndrom: 0x%x\n",
+			       ((struct mlx4_err_cqe *)cqe)->
+				       vendor_err_syndrome,
+			       ((struct mlx4_err_cqe *)cqe)->syndrome);
+		}
+
+		/* Skip over last polled CQE */
+		new_index = be16_to_cpu(cqe->wqe_index) & size_mask;
 
-	/*
-	 * We use a two-stage loop:
-	 * - the first samples the HW-updated CQE
-	 * - the second frees TXBBs until the last sample
-	 * This lets us amortize CQE cache misses, while still polling the CQ
-	 * until is quiescent.
-	 */
-	cq_last_sav = mcq->cons_index;
-	do {
 		do {
-			/* Skip over last polled CQE */
-			index = (index + ring->last_nr_txbb) & ring->size_mask;
 			txbbs_skipped += ring->last_nr_txbb;
-
-			/* Poll next CQE */
+			ring_index = (ring_index + ring->last_nr_txbb) & size_mask;
+			/* free next descriptor */
 			ring->last_nr_txbb = mlx4_en_free_tx_desc(
-						priv, ring, index,
-						!!((ring->cons + txbbs_skipped) &
-						   ring->size));
-			++mcq->cons_index;
+					priv, ring, ring_index,
+					!!((ring->cons + txbbs_skipped) &
+					ring->size), timestamp);
+			mlx4_en_stamp_wqe(priv, ring, stamp_index,
+					  !!((ring->cons + txbbs_stamp) &
+						ring->size));
+			stamp_index = ring_index;
+			txbbs_stamp = txbbs_skipped;
+			packets++;
+			bytes += ring->tx_info[ring_index].nr_bytes;
+		} while (ring_index != new_index);
 
-		} while (index != new_index);
+		++cons_index;
+		index = cons_index & size_mask;
+		cqe = &buf[(index << factor) + factor];
+	}
 
-		new_index = be16_to_cpu(cqe->wqe_index) & ring->size_mask;
-	} while (index != new_index);
-	AVG_PERF_COUNTER(priv->pstats.tx_coal_avg,
-			 (u32) (mcq->cons_index - cq_last_sav));
 
 	/*
 	 * To prevent CQ overflow we first update CQ consumer and only then
 	 * the ring consumer.
 	 */
+	mcq->cons_index = cons_index;
 	mlx4_cq_set_ci(mcq);
 	wmb();
 	ring->cons += txbbs_skipped;
 
-	/* Wakeup Tx queue if this ring stopped it */
-	if (unlikely(ring->blocked)) {
-		if ((u32) (ring->prod - ring->cons) <=
-		     ring->size - HEADROOM - MAX_DESC_TXBBS) {
-			ring->blocked = 0;
-			if (atomic_fetchadd_int(&priv->blocked, -1) == 1)
-				atomic_clear_int(&dev->if_drv_flags,
-				    IFF_DRV_OACTIVE);
-			priv->port_stats.wake_queue++;
-		}
+	/* Wakeup Tx queue if it was stopped and ring is not full */
+	if (unlikely(ring->blocked) &&
+	    (ring->prod - ring->cons) <= ring->full_size) {
+		ring->blocked = 0;
+		if (atomic_fetchadd_int(&priv->blocked, -1) == 1)
+			atomic_clear_int(&dev->if_drv_flags ,IFF_DRV_OACTIVE);
+		ring->wake_queue++;
+		priv->port_stats.wake_queue++;
 	}
+	return done;
 }
 
 void mlx4_en_tx_irq(struct mlx4_cq *mcq)
 {
 	struct mlx4_en_cq *cq = container_of(mcq, struct mlx4_en_cq, mcq);
 	struct mlx4_en_priv *priv = netdev_priv(cq->dev);
-	struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
+	struct mlx4_en_tx_ring *ring = priv->tx_ring[cq->ring];
 
 	if (!spin_trylock(&ring->comp_lock))
 		return;
@@ -421,12 +473,11 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq)
 	spin_unlock(&ring->comp_lock);
 }
 
-
 void mlx4_en_poll_tx_cq(unsigned long data)
 {
 	struct mlx4_en_cq *cq = (struct mlx4_en_cq *) data;
 	struct mlx4_en_priv *priv = netdev_priv(cq->dev);
-	struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
+	struct mlx4_en_tx_ring *ring = priv->tx_ring[cq->ring];
 	u32 inflight;
 
 	INC_PERF_COUNTER(priv->pstats.tx_poll);
@@ -477,8 +528,8 @@ static struct mlx4_en_tx_desc *mlx4_en_bounce_to_desc(struct mlx4_en_priv *priv,
 
 static inline void mlx4_en_xmit_poll(struct mlx4_en_priv *priv, int tx_ind)
 {
-	struct mlx4_en_cq *cq = &priv->tx_cq[tx_ind];
-	struct mlx4_en_tx_ring *ring = &priv->tx_ring[tx_ind];
+	struct mlx4_en_cq *cq = priv->tx_cq[tx_ind];
+	struct mlx4_en_tx_ring *ring = priv->tx_ring[tx_ind];
 
 	/* If we don't have a pending timer, set one up to catch our recent
 	   post in case the interface becomes idle */
@@ -493,14 +544,13 @@ static inline void mlx4_en_xmit_poll(struct mlx4_en_priv *priv, int tx_ind)
 		}
 }
 
-static int is_inline(struct mbuf *mb)
+static int is_inline(struct mbuf *mb, int thold)
 {
-
-	if (inline_thold && mb->m_pkthdr.len <= inline_thold &&
-	    (mb->m_pkthdr.csum_flags & CSUM_TSO) == 0)
+	if (thold && mb->m_pkthdr.len <= thold &&
+		(mb->m_pkthdr.csum_flags & CSUM_TSO) == 0)
 		return 1;
 
-	return 0;
+        return 0;
 }
 
 static int inline_size(struct mbuf *mb)
@@ -519,81 +569,108 @@ static int inline_size(struct mbuf *mb)
 
 static int get_head_size(struct mbuf *mb)
 {
-	struct tcphdr *th;
-	struct ip *ip;
-	int ip_hlen, tcp_hlen;
-	int len;
+	struct ether_vlan_header *eh;
+        struct tcphdr *th;
+        struct ip *ip;
+        int ip_hlen, tcp_hlen;
+	struct ip6_hdr *ip6;
+	uint16_t eth_type;
+	int eth_hdr_len;
 
-	len = ETHER_HDR_LEN;
-	if (mb->m_len < len + sizeof(struct ip))
+	eh = mtod(mb, struct ether_vlan_header *);
+	if (mb->m_len < ETHER_HDR_LEN)
 		return (0);
-	ip = (struct ip *)(mtod(mb, char *) + len);
-	if (ip->ip_p != IPPROTO_TCP)
+	if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) {
+		eth_type = ntohs(eh->evl_proto);
+		eth_hdr_len = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
+	} else {
+		eth_type = ntohs(eh->evl_encap_proto);
+		eth_hdr_len = ETHER_HDR_LEN;
+	}
+	if (mb->m_len < eth_hdr_len)
 		return (0);
-	ip_hlen = ip->ip_hl << 2;
-	len += ip_hlen;
-	if (mb->m_len < len + sizeof(struct tcphdr))
+	switch (eth_type) {
+	case ETHERTYPE_IP:
+		ip = (struct ip *)(mb->m_data + eth_hdr_len);
+		if (mb->m_len < eth_hdr_len + sizeof(*ip))
+			return (0);
+		if (ip->ip_p != IPPROTO_TCP)
+			return (0);
+		ip_hlen = ip->ip_hl << 2;
+		eth_hdr_len += ip_hlen;
+		break;
+	case ETHERTYPE_IPV6:
+		ip6 = (struct ip6_hdr *)(mb->m_data + eth_hdr_len);
+		if (mb->m_len < eth_hdr_len + sizeof(*ip6))
+			return (0);
+		if (ip6->ip6_nxt != IPPROTO_TCP)
+			return (0);
+		eth_hdr_len += sizeof(*ip6);
+		break;
+	default:
 		return (0);
-	th = (struct tcphdr *)(mtod(mb, char *) + len);
+	}
+	if (mb->m_len < eth_hdr_len + sizeof(*th))
+		return (0);
+	th = (struct tcphdr *)(mb->m_data + eth_hdr_len);
 	tcp_hlen = th->th_off << 2;
-	len += tcp_hlen;
-	if (mb->m_len < len)
+	eth_hdr_len += tcp_hlen;
+	if (mb->m_len < eth_hdr_len)
 		return (0);
-	return (len);
+	return (eth_hdr_len);
 }
 
-static int get_real_size(struct mbuf *mb, struct net_device *dev, int *segsp,
-    int *lso_header_size)
+static int get_real_size(struct mbuf *mb, struct net_device *dev, int *p_n_segs,
+    int *lso_header_size, int inl)
 {
-	struct mbuf *m;
-	int nr_segs;
+        struct mbuf *m;
+        int nr_segs = 0;
 
-	nr_segs = 0;
-	for (m = mb; m != NULL; m = m->m_next)
-		if (m->m_len)
-			nr_segs++;
+        for (m = mb; m != NULL; m = m->m_next)
+                if (m->m_len)
+                        nr_segs++;
 
-	if (mb->m_pkthdr.csum_flags & CSUM_TSO) {
-		*lso_header_size = get_head_size(mb);
-		if (*lso_header_size) {
-			if (mb->m_len == *lso_header_size)
-				nr_segs--;
-			*segsp = nr_segs;
-			return CTRL_SIZE + nr_segs * DS_SIZE +
-			    ALIGN(*lso_header_size + 4, DS_SIZE);
-		}
-	} else
-		*lso_header_size = 0;
-	*segsp = nr_segs;
-	if (is_inline(mb))
-		return inline_size(mb);
-	return (CTRL_SIZE + nr_segs * DS_SIZE);
+        if (mb->m_pkthdr.csum_flags & CSUM_TSO) {
+                *lso_header_size = get_head_size(mb);
+                if (*lso_header_size) {
+                        if (mb->m_len == *lso_header_size)
+                                nr_segs--;
+                        *p_n_segs = nr_segs;
+                        return CTRL_SIZE + nr_segs * DS_SIZE +
+                            ALIGN(*lso_header_size + 4, DS_SIZE);
+                }
+        } else
+                *lso_header_size = 0;
+        *p_n_segs = nr_segs;
+        if (inl)
+                return inline_size(mb);
+        return (CTRL_SIZE + nr_segs * DS_SIZE);
 }
 
 static struct mbuf *mb_copy(struct mbuf *mb, int *offp, char *data, int len)
 {
-	int bytes;
-	int off;
+        int bytes;
+        int off;
 
-	off = *offp;
-	while (len) {
-		bytes = min(mb->m_len - off, len);
-		if (bytes)
-			memcpy(data, mb->m_data + off, bytes);
-		len -= bytes;
-		data += bytes;
-		off += bytes;
-		if (off == mb->m_len) {
-			off = 0;
-			mb = mb->m_next;
-		}
-	}
-	*offp = off;
-	return (mb);
+        off = *offp;
+        while (len) {
+                bytes = min(mb->m_len - off, len);
+                if (bytes)
+                        memcpy(data, mb->m_data + off, bytes);
+                len -= bytes;
+                data += bytes;
+                off += bytes;
+                if (off == mb->m_len) {
+                        off = 0;
+                        mb = mb->m_next;
+                }
+        }
+        *offp = off;
+        return (mb);
 }
 
 static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct mbuf *mb,
-			     int real_size, u16 *vlan_tag, int tx_ind)
+                             int real_size, u16 *vlan_tag, int tx_ind)
 {
 	struct mlx4_wqe_inline_seg *inl = &tx_desc->inl;
 	int spc = MLX4_INLINE_ALIGN - CTRL_SIZE - sizeof *inl;
@@ -603,8 +680,12 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct mbuf *mb,
 	off = 0;
 	len = mb->m_pkthdr.len;
 	if (len <= spc) {
-		inl->byte_count = cpu_to_be32(1 << 31 | len);
+		inl->byte_count = cpu_to_be32(1 << 31 |
+				(max_t(typeof(len), len, MIN_PKT_LEN)));
 		mb_copy(mb, &off, (void *)(inl + 1), len);
+		if (len < MIN_PKT_LEN)
+                        memset(((void *)(inl + 1)) + len, 0,
+                               MIN_PKT_LEN - len);
 	} else {
 		inl->byte_count = cpu_to_be32(1 << 31 | spc);
 		mb = mb_copy(mb, &off, (void *)(inl + 1), spc);
@@ -618,74 +699,50 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct mbuf *mb,
 	tx_desc->ctrl.fence_size = (real_size / 16) & 0x3f;
 }
 
+static unsigned long hashrandom;
+static void hashrandom_init(void *arg)
+{
+	hashrandom = random();
+}
+SYSINIT(hashrandom_init, SI_SUB_KLD, SI_ORDER_SECOND, &hashrandom_init, NULL);
+
 u16 mlx4_en_select_queue(struct net_device *dev, struct mbuf *mb)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
-	struct mlx4_en_tx_hash_entry *entry;
-	struct ether_header *eth;
-	struct tcphdr *th;
-	struct ip *iph;
-	u32 hash_index;
-	int tx_ind = 0;
-	u16 vlan_tag = 0;
-	int len;
+	u32 rings_p_up = priv->num_tx_rings_p_up;
+	u32 vlan_tag = 0;
+	u32 up = 0;
+	u32 queue_index;
 
 	/* Obtain VLAN information if present */
 	if (mb->m_flags & M_VLANTAG) {
 		vlan_tag = mb->m_pkthdr.ether_vtag;
-		/* Set the Tx ring to use according to vlan priority */
-		tx_ind = priv->tx_prio_map[vlan_tag >> 13];
-		if (tx_ind)
-			return tx_ind;
-	}
-	if (mb->m_len <
-	    ETHER_HDR_LEN + sizeof(struct ip) + sizeof(struct tcphdr))
-		return MLX4_EN_NUM_HASH_RINGS;
-	eth = mtod(mb, struct ether_header *);
-	/* Hashing is only done for TCP/IP or UDP/IP packets */
-	if (be16_to_cpu(eth->ether_type) != ETHERTYPE_IP)
-		return MLX4_EN_NUM_HASH_RINGS;
-	len = ETHER_HDR_LEN;
-	iph = (struct ip *)(mtod(mb, char *) + len);
-	len += iph->ip_hl << 2;
-	th = (struct tcphdr *)(mtod(mb, char *) + len);
-	hash_index = be32_to_cpu(iph->ip_dst.s_addr) & MLX4_EN_TX_HASH_MASK;
-	switch(iph->ip_p) {
-	case IPPROTO_UDP:
-		break;
-	case IPPROTO_TCP:
-		if (mb->m_len < len + sizeof(struct tcphdr))
-			return MLX4_EN_NUM_HASH_RINGS;
-		hash_index =
-		    (hash_index ^ be16_to_cpu(th->th_dport ^ th->th_sport)) &
-		    MLX4_EN_TX_HASH_MASK;
-		break;
-	default:
-		return MLX4_EN_NUM_HASH_RINGS;
+	        up = (vlan_tag >> 13);
 	}
 
-	entry = &priv->tx_hash[hash_index];
-	if(unlikely(!entry->cnt)) {
-		tx_ind = hash_index & (MLX4_EN_NUM_HASH_RINGS / 2 - 1);
-		if (2 * entry->small_pkts > entry->big_pkts)
-			tx_ind += MLX4_EN_NUM_HASH_RINGS / 2;
-		entry->small_pkts = entry->big_pkts = 0;
-		entry->ring = tx_ind;
-	}
+	/* hash mbuf */
+	queue_index = mlx4_en_hashmbuf(MLX4_F_HASHL3 | MLX4_F_HASHL4, mb, hashrandom);
 
-	entry->cnt++;
-	if (mb->m_pkthdr.len > MLX4_EN_SMALL_PKT_SIZE)
-		entry->big_pkts++;
-	else
-		entry->small_pkts++;
-	return entry->ring;
+	return ((queue_index % rings_p_up) + (up * rings_p_up));
 }
 
-static void mlx4_bf_copy(unsigned long *dst, unsigned long *src, unsigned bytecnt)
+static void mlx4_bf_copy(void __iomem *dst, unsigned long *src, unsigned bytecnt)
 {
 	__iowrite64_copy(dst, src, bytecnt / 8);
 }
 
+static u64 mlx4_en_mac_to_u64(u8 *addr)
+{
+        u64 mac = 0;
+        int i;
+
+        for (i = 0; i < ETHER_ADDR_LEN; i++) {
+                mac <<= 8;
+                mac |= addr[i];
+        }
+        return mac;
+}
+
 static int mlx4_en_xmit(struct net_device *dev, int tx_ind, struct mbuf **mbp)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -701,57 +758,73 @@ static int mlx4_en_xmit(struct net_device *dev, int tx_ind, struct mbuf **mbp)
 	int desc_size;
 	int real_size;
 	dma_addr_t dma;
-	u32 index, bf_index;
+	u32 index, bf_index, ring_size;
 	__be32 op_own;
 	u16 vlan_tag = 0;
 	int i;
 	int lso_header_size;
 	bool bounce = false;
+	bool inl = false;
 	struct mbuf *mb;
+	mb = *mbp;
 	int defrag = 1;
 
-	ring = &priv->tx_ring[tx_ind];
-	mb = *mbp;
 	if (!priv->port_up)
 		goto tx_drop;
 
+	ring = priv->tx_ring[tx_ind];
+	ring_size = ring->size;
+	inl = is_inline(mb, ring->inline_thold);
+
 retry:
-	real_size = get_real_size(mb, dev, &nr_segs, &lso_header_size);
+	real_size = get_real_size(mb, dev, &nr_segs, &lso_header_size, inl);
 	if (unlikely(!real_size))
 		goto tx_drop;
 
-	/* Allign descriptor to TXBB size */
+	/* Align descriptor to TXBB size */
 	desc_size = ALIGN(real_size, TXBB_SIZE);
 	nr_txbb = desc_size / TXBB_SIZE;
 	if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
 		if (defrag) {
-			mb = m_defrag(*mbp, M_NOWAIT);
-			if (mb == NULL) {
-				mb = *mbp;
-				goto tx_drop;
-			}
-			*mbp = mb;
-			defrag = 0;
-			goto retry;
-		}
+                        mb = m_defrag(*mbp, M_NOWAIT);
+                        if (mb == NULL) {
+                                mb = *mbp;
+                                goto tx_drop;
+                        }
+                        *mbp = mb;
+                        defrag = 0;
+                        goto retry;
+                }
+		en_warn(priv, "Oversized header or SG list\n");
 		goto tx_drop;
 	}
 
-	/* Check available TXBBs And 2K spare for prefetch */
-	if (unlikely(((int)(ring->prod - ring->cons)) >
-		     ring->size - HEADROOM - MAX_DESC_TXBBS)) {
+	/* Obtain VLAN information if present */
+	if (mb->m_flags & M_VLANTAG) {
+		vlan_tag = mb->m_pkthdr.ether_vtag;
+	}
+
+	/* Check available TXBBs and 2K spare for prefetch
+	 * Even if netif_tx_stop_queue() will be called
+	 * driver will send current packet to ensure
+	 * that at least one completion will be issued after
+	 * stopping the queue
+	 */
+	if (unlikely((int)(ring->prod - ring->cons) > ring->full_size)) {
 		/* every full Tx ring stops queue */
 		if (ring->blocked == 0)
-			atomic_add_int(&priv->blocked, 1);
+                        atomic_add_int(&priv->blocked, 1);
+		/* Set HW-queue-is-full flag */
 		atomic_set_int(&dev->if_drv_flags, IFF_DRV_OACTIVE);
 		ring->blocked = 1;
 		priv->port_stats.queue_stopped++;
+		ring->queue_stopped++;
 
 		/* Use interrupts to find out when queue opened */
-		cq = &priv->tx_cq[tx_ind];
+		cq = priv->tx_cq[tx_ind];
 		mlx4_en_arm_cq(priv, cq);
 		return EBUSY;
-	}
+        }
 
 	/* Track current inflight packets for performance analysis */
 	AVG_PERF_COUNTER(priv->pstats.inflight_avg,
@@ -763,128 +836,135 @@ static int mlx4_en_xmit(struct net_device *dev, int tx_ind, struct mbuf **mbp)
 
 	/* See if we have enough space for whole descriptor TXBB for setting
 	 * SW ownership on next descriptor; if not, use a bounce buffer. */
-	if (likely(index + nr_txbb <= ring->size))
+	if (likely(index + nr_txbb <= ring_size))
 		tx_desc = ring->buf + index * TXBB_SIZE;
 	else {
 		tx_desc = (struct mlx4_en_tx_desc *) ring->bounce_buf;
 		bounce = true;
 	}
 
+	/* Save mb in tx_info ring */
+	tx_info = &ring->tx_info[index];
+	tx_info->mb = mb;
+	tx_info->nr_txbb = nr_txbb;
+	tx_info->nr_segs = nr_segs;
+
+	if (lso_header_size) {
+		memcpy(tx_desc->lso.header, mb->m_data, lso_header_size);
+		data = ((void *)&tx_desc->lso + ALIGN(lso_header_size + 4,
+						      DS_SIZE));
+		/* lso header is part of m_data.
+		 * need to omit when mapping DMA */
+		mb->m_data += lso_header_size;
+		mb->m_len -= lso_header_size;
+	}
+	else
+		data = &tx_desc->data;
+
+	/* valid only for none inline segments */
+	tx_info->data_offset = (void *)data - (void *)tx_desc;
+
+	if (inl) {
+		tx_info->inl = 1;
+	} else {
+		for (i = 0, m = mb; i < nr_segs; i++, m = m->m_next) {
+                        if (m->m_len == 0) {
+                                i--;
+                                continue;
+                        }
+                        dma = pci_map_single(mdev->dev->pdev, m->m_data,
+                                             m->m_len, PCI_DMA_TODEVICE);
+                        data->addr = cpu_to_be64(dma);
+                        data->lkey = cpu_to_be32(mdev->mr.key);
+                        wmb();
+                        data->byte_count = cpu_to_be32(m->m_len);
+                        data++;
+                }
+                if (lso_header_size) {
+                        mb->m_data -= lso_header_size;
+                        mb->m_len += lso_header_size;
+                }
+                tx_info->inl = 0;
+	}
+
+
 	/* Prepare ctrl segement apart opcode+ownership, which depends on
 	 * whether LSO is used */
-	if (mb->m_flags & M_VLANTAG)
-		vlan_tag = mb->m_pkthdr.ether_vtag;
 	tx_desc->ctrl.vlan_tag = cpu_to_be16(vlan_tag);
-	tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN * !!vlan_tag;
+	tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN *
+		!!vlan_tag;
 	tx_desc->ctrl.fence_size = (real_size / 16) & 0x3f;
-	tx_desc->ctrl.srcrb_flags = cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE |
-						MLX4_WQE_CTRL_SOLICITED);
-	if (mb->m_pkthdr.csum_flags & (CSUM_IP|CSUM_TCP|CSUM_UDP)) {
-		if (mb->m_pkthdr.csum_flags & CSUM_IP)
-			tx_desc->ctrl.srcrb_flags |=
-			    cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM);
-		if (mb->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP))
-			tx_desc->ctrl.srcrb_flags |=
-			    cpu_to_be32(MLX4_WQE_CTRL_TCP_UDP_CSUM);
+	tx_desc->ctrl.srcrb_flags = priv->ctrl_flags;
+	if (mb->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TSO |
+		CSUM_TCP | CSUM_UDP | CSUM_TCP_IPV6 | CSUM_UDP_IPV6)) {
+		if (mb->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TSO))
+			tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM);
+		if (mb->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP |
+		    CSUM_UDP_IPV6 | CSUM_TCP_IPV6 | CSUM_TSO))
+			tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_TCP_UDP_CSUM);
 		priv->port_stats.tx_chksum_offload++;
-	}
+                ring->tx_csum++;
+        }
 
 	if (unlikely(priv->validate_loopback)) {
 		/* Copy dst mac address to wqe */
-		struct ether_header *ethh;
-		u64 mac;
-		u32 mac_l, mac_h;
+                struct ether_header *ethh;
+                u64 mac;
+                u32 mac_l, mac_h;
 
-		ethh = mtod(mb, struct ether_header *);
-		mac = mlx4_en_mac_to_u64(ethh->ether_dhost);
-		if (mac) {
-			mac_h = (u32) ((mac & 0xffff00000000ULL) >> 16);
-			mac_l = (u32) (mac & 0xffffffff);
-			tx_desc->ctrl.srcrb_flags |= cpu_to_be32(mac_h);
-			tx_desc->ctrl.imm = cpu_to_be32(mac_l);
-		}
+                ethh = mtod(mb, struct ether_header *);
+                mac = mlx4_en_mac_to_u64(ethh->ether_dhost);
+                if (mac) {
+                        mac_h = (u32) ((mac & 0xffff00000000ULL) >> 16);
+                        mac_l = (u32) (mac & 0xffffffff);
+                        tx_desc->ctrl.srcrb_flags |= cpu_to_be32(mac_h);
+                        tx_desc->ctrl.imm = cpu_to_be32(mac_l);
+                }
 	}
 
 	/* Handle LSO (TSO) packets */
 	if (lso_header_size) {
 		int segsz;
-
 		/* Mark opcode as LSO */
 		op_own = cpu_to_be32(MLX4_OPCODE_LSO | (1 << 6)) |
-			((ring->prod & ring->size) ?
+			((ring->prod & ring_size) ?
 				cpu_to_be32(MLX4_EN_BIT_DESC_OWN) : 0);
 
 		/* Fill in the LSO prefix */
 		tx_desc->lso.mss_hdr_size = cpu_to_be32(
 			mb->m_pkthdr.tso_segsz << 16 | lso_header_size);
 
-		/* Copy headers;
-		 * note that we already verified that it is linear */
-		memcpy(tx_desc->lso.header, mb->m_data, lso_header_size);
-		data = ((void *) &tx_desc->lso +
-			ALIGN(lso_header_size + 4, DS_SIZE));
-
-		priv->port_stats.tso_packets++;
-		segsz = mb->m_pkthdr.tso_segsz;
-		i = ((mb->m_pkthdr.len - lso_header_size) / segsz) +
-			!!((mb->m_pkthdr.len - lso_header_size) % segsz);
-		ring->bytes += mb->m_pkthdr.len + (i - 1) * lso_header_size;
-		ring->packets += i;
-		mb->m_data += lso_header_size;
-		mb->m_len -= lso_header_size;
+                priv->port_stats.tso_packets++;
+                segsz = mb->m_pkthdr.tso_segsz;
+                i = ((mb->m_pkthdr.len - lso_header_size + segsz - 1) / segsz);
+                tx_info->nr_bytes= mb->m_pkthdr.len + (i - 1) * lso_header_size;
+                ring->packets += i;
 	} else {
 		/* Normal (Non LSO) packet */
 		op_own = cpu_to_be32(MLX4_OPCODE_SEND) |
-			((ring->prod & ring->size) ?
+			((ring->prod & ring_size) ?
 			 cpu_to_be32(MLX4_EN_BIT_DESC_OWN) : 0);
-		data = &tx_desc->data;
-		ring->bytes += max(mb->m_pkthdr.len,
-		    (unsigned int)ETHER_MIN_LEN - ETHER_CRC_LEN);
+		tx_info->nr_bytes = max(mb->m_pkthdr.len,
+                    (unsigned int)ETHER_MIN_LEN - ETHER_CRC_LEN);
 		ring->packets++;
 
 	}
+	ring->bytes += tx_info->nr_bytes;
 	AVG_PERF_COUNTER(priv->pstats.tx_pktsz_avg, mb->m_pkthdr.len);
 
-	/* Save mb in tx_info ring */
-	tx_info = &ring->tx_info[index];
-	tx_info->mb = mb;
-	tx_info->nr_txbb = nr_txbb;
-	tx_info->nr_segs = nr_segs;
-	/* valid only for non inline segments */
-	tx_info->data_offset = (void *) data - (void *) tx_desc;
-
-	if (!is_inline(mb)) {
-		for (i = 0, m = mb; i < nr_segs; i++, m = m->m_next) {
-			if (m->m_len == 0) {
-				i--;
-				continue;
-			}
-			dma = pci_map_single(mdev->dev->pdev, m->m_data,
-					     m->m_len, PCI_DMA_TODEVICE);
-			data->addr = cpu_to_be64(dma);
-			data->lkey = cpu_to_be32(mdev->mr.key);
-			wmb();
-			data->byte_count = cpu_to_be32(m->m_len);
-			data++;
-		}
-		if (lso_header_size) {
-			mb->m_data -= lso_header_size;
-			mb->m_len += lso_header_size;
-		}
-		tx_info->inl = 0;
-	} else {
+	if (tx_info->inl) {
 		build_inline_wqe(tx_desc, mb, real_size, &vlan_tag, tx_ind);
 		tx_info->inl = 1;
 	}
 
 	ring->prod += nr_txbb;
 
-	/* If we used a bounce buffer then copy descriptor back into place */
-	if (bounce)
-		tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size);
 
+	/* If we used a bounce buffer then copy descriptor back into place */
+	if (unlikely(bounce))
+		tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size);
 	if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tag) {
-		*(u32 *) (&tx_desc->ctrl.vlan_tag) |= ring->doorbell_qpn;
+		*(__be32 *) (&tx_desc->ctrl.vlan_tag) |= cpu_to_be32(ring->doorbell_qpn);
 		op_own |= htonl((bf_index & 0xffff) << 8);
 		/* Ensure new descirptor hits memory
 		* before setting ownership of this descriptor to HW */
@@ -905,19 +985,16 @@ static int mlx4_en_xmit(struct net_device *dev, int tx_ind, struct mbuf **mbp)
 		wmb();
 		tx_desc->ctrl.owner_opcode = op_own;
 		wmb();
-		writel(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL);
+		writel(cpu_to_be32(ring->doorbell_qpn), ring->bf.uar->map + MLX4_SEND_DOORBELL);
 	}
 
 	return 0;
-
 tx_drop:
 	*mbp = NULL;
 	m_freem(mb);
-	ring->errors++;
 	return EINVAL;
 }
 
-
 static int
 mlx4_en_transmit_locked(struct ifnet *dev, int tx_ind, struct mbuf *m)
 {
@@ -926,12 +1003,12 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ind, struct mbuf *m)
 	struct mbuf *next;
 	int enqueued, err = 0;
 
-	ring = &priv->tx_ring[tx_ind];
+	ring = priv->tx_ring[tx_ind];
 	if ((dev->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
 	    IFF_DRV_RUNNING || priv->port_up == 0) {
 		if (m != NULL)
 			err = drbr_enqueue(dev, ring->br, m);
-		return (err);  
+		return (err);
 	}
 
 	enqueued = 0;
@@ -951,11 +1028,6 @@ mlx4_en_transmit_locked(struct ifnet *dev, int tx_ind, struct mbuf *m)
 		}
 		drbr_advance(dev, ring->br);
 		enqueued++;
-		dev->if_obytes += next->m_pkthdr.len;
-		if (next->m_flags & M_MCAST)
-			dev->if_omcasts++;
-		/* Send a copy of the frame to the BPF listener */
-		ETHER_BPF_MTAP(dev, next);
 		if ((dev->if_drv_flags & IFF_DRV_RUNNING) == 0)
 			break;
 	}
@@ -974,12 +1046,11 @@ mlx4_en_tx_que(void *context, int pending)
 	struct net_device *dev;
 	struct mlx4_en_cq *cq;
 	int tx_ind;
-
 	cq = context;
 	dev = cq->dev;
 	priv = dev->if_softc;
 	tx_ind = cq->ring;
-	ring = &priv->tx_ring[tx_ind];
+	ring = priv->tx_ring[tx_ind];
         if (dev->if_drv_flags & IFF_DRV_RUNNING) {
 		mlx4_en_xmit_poll(priv, tx_ind);
 		spin_lock(&ring->tx_lock);
@@ -998,12 +1069,13 @@ mlx4_en_transmit(struct ifnet *dev, struct mbuf *m)
 	int i = 0, err = 0;
 
 	/* Which queue to use */
-	if ((m->m_flags & (M_FLOWID | M_VLANTAG)) == M_FLOWID)
-		i = m->m_pkthdr.flowid % (MLX4_EN_NUM_HASH_RINGS - 1);
-	else
+	if ((m->m_flags & (M_FLOWID | M_VLANTAG)) == M_FLOWID) {
+		i = m->m_pkthdr.flowid % (priv->tx_ring_num - 1);
+	}
+	else {
 		i = mlx4_en_select_queue(dev, m);
-
-	ring = &priv->tx_ring[i];
+	}
+	ring = priv->tx_ring[i];
 
 	if (spin_trylock(&ring->tx_lock)) {
 		err = mlx4_en_transmit_locked(dev, i, m);
@@ -1012,7 +1084,7 @@ mlx4_en_transmit(struct ifnet *dev, struct mbuf *m)
 		mlx4_en_xmit_poll(priv, i);
 	} else {
 		err = drbr_enqueue(dev, ring->br, m);
-		cq = &priv->tx_cq[i];
+		cq = priv->tx_cq[i];
 		taskqueue_enqueue(cq->tq, &cq->cq_task);
 	}
 
@@ -1026,10 +1098,11 @@ void
 mlx4_en_qflush(struct ifnet *dev)
 {
 	struct mlx4_en_priv *priv = netdev_priv(dev);
-	struct mlx4_en_tx_ring *ring = priv->tx_ring;
+	struct mlx4_en_tx_ring *ring;
 	struct mbuf *m;
 
-	for (int i = 0; i < priv->tx_ring_num; i++, ring++) {
+	for (int i = 0; i < priv->tx_ring_num; i++) {
+		ring = priv->tx_ring[i];
 		spin_lock(&ring->tx_lock);
 		while ((m = buf_ring_dequeue_sc(ring->br)) != NULL)
 			m_freem(m);
diff --git a/sys/ofed/drivers/net/mlx4/eq.c b/sys/ofed/drivers/net/mlx4/eq.c
index b585e8cbfcff..31fafbe01d72 100644
--- a/sys/ofed/drivers/net/mlx4/eq.c
+++ b/sys/ofed/drivers/net/mlx4/eq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -33,6 +33,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 
@@ -86,6 +87,8 @@ static u64 get_async_ev_mask(struct mlx4_dev *dev)
 	u64 async_ev_mask = MLX4_ASYNC_EVENT_MASK;
 	if (dev->caps.flags & MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV)
 		async_ev_mask |= (1ull << MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT);
+	if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT)
+		async_ev_mask |= (1ull << MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT);
 
 	return async_ev_mask;
 }
@@ -147,12 +150,9 @@ void mlx4_gen_slave_eqe(struct work_struct *work)
 		/* All active slaves need to receive the event */
 		if (slave == ALL_SLAVES) {
 			for (i = 0; i < dev->num_slaves; i++) {
-				if (i != dev->caps.function &&
-				    master->slave_state[i].active)
-					if (mlx4_GEN_EQE(dev, i, eqe))
-						mlx4_warn(dev, "Failed to "
-							  " generate event "
-							  "for slave %d\n", i);
+				if (mlx4_GEN_EQE(dev, i, eqe))
+					mlx4_warn(dev, "Failed to generate "
+						  "event for slave %d\n", i);
 			}
 		} else {
 			if (mlx4_GEN_EQE(dev, slave, eqe))
@@ -197,13 +197,13 @@ static void mlx4_slave_event(struct mlx4_dev *dev, int slave,
 			     struct mlx4_eqe *eqe)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	struct mlx4_slave_state *s_slave =
-		&priv->mfunc.master.slave_state[slave];
 
-	if (!s_slave->active) {
-		/*mlx4_warn(dev, "Trying to pass event to inactive slave\n");*/
+	if (slave < 0 || slave >= dev->num_slaves ||
+	    slave == dev->caps.function)
+		return;
+
+	if (!priv->mfunc.master.slave_state[slave].active)
 		return;
-	}
 
 	slave_event(dev, slave, eqe);
 }
@@ -375,7 +375,7 @@ int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave,
 
 EXPORT_SYMBOL(set_and_calc_slave_port_state);
 
-int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr)
+int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr, u16 sm_lid, u8 sm_sl)
 {
 	struct mlx4_eqe eqe;
 
@@ -386,6 +386,12 @@ int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr)
 	eqe.event.port_mgmt_change.port = port;
 	eqe.event.port_mgmt_change.params.port_info.changed_attr =
 		cpu_to_be32((u32) attr);
+	if (attr & MSTR_SM_CHANGE_MASK) {
+		eqe.event.port_mgmt_change.params.port_info.mstr_sm_lid =
+			cpu_to_be16(sm_lid);
+		eqe.event.port_mgmt_change.params.port_info.mstr_sm_sl =
+			sm_sl;
+	}
 
 	slave_event(dev, ALL_SLAVES, &eqe);
 	return 0;
@@ -446,6 +452,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 	int i;
 	enum slave_port_gen_event gen_event;
 	unsigned long flags;
+	struct mlx4_vport_state *s_info;
 
 	while ((eqe = next_eqe_sw(eq, dev->caps.eqe_factor))) {
 		/*
@@ -495,8 +502,9 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 			break;
 
 		case MLX4_EVENT_TYPE_SRQ_LIMIT:
-			mlx4_warn(dev, "%s: MLX4_EVENT_TYPE_SRQ_LIMIT\n",
-				  __func__);
+			mlx4_dbg(dev, "%s: MLX4_EVENT_TYPE_SRQ_LIMIT\n",
+				 __func__);
+		/* fall through */
 		case MLX4_EVENT_TYPE_SRQ_CATAS_ERROR:
 			if (mlx4_is_master(dev)) {
 				/* forward only to slave owning the SRQ */
@@ -513,17 +521,15 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 						  eq->eqn, eq->cons_index, ret);
 					break;
 				}
-				mlx4_warn(dev, "%s: slave:%d, srq_no:0x%x,"
-					  " event: %02x(%02x)\n", __func__,
-					  slave,
-					  be32_to_cpu(eqe->event.srq.srqn),
-					  eqe->type, eqe->subtype);
+				mlx4_dbg(dev, "%s: slave:%d, srq_no:0x%x, event: %02x(%02x)\n",
+					 __func__, slave,
+					 be32_to_cpu(eqe->event.srq.srqn),
+					 eqe->type, eqe->subtype);
 
 				if (!ret && slave != dev->caps.function) {
-					mlx4_warn(dev, "%s: sending event "
-						  "%02x(%02x) to slave:%d\n",
-						   __func__, eqe->type,
-						  eqe->subtype, slave);
+					mlx4_dbg(dev, "%s: sending event %02x(%02x) to slave:%d\n",
+						 __func__, eqe->type,
+						 eqe->subtype, slave);
 					mlx4_slave_event(dev, slave, eqe);
 					break;
 				}
@@ -554,7 +560,9 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 						mlx4_dbg(dev, "%s: Sending MLX4_PORT_CHANGE_SUBTYPE_DOWN"
 							 " to slave: %d, port:%d\n",
 							 __func__, i, port);
-						mlx4_slave_event(dev, i, eqe);
+						s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state;
+						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)
+							mlx4_slave_event(dev, i, eqe);
 					} else {  /* IB port */
 						set_and_calc_slave_port_state(dev, i, port,
 									      MLX4_PORT_STATE_DEV_EVENT_PORT_DOWN,
@@ -578,7 +586,9 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 					for (i = 0; i < dev->num_slaves; i++) {
 						if (i == mlx4_master_func_num(dev))
 							continue;
-						mlx4_slave_event(dev, i, eqe);
+						s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state;
+						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)
+							mlx4_slave_event(dev, i, eqe);
 					}
 				else /* IB port */
 					/* port-up event will be sent to a slave when the
@@ -635,11 +645,18 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 					       "for non master device\n");
 				break;
 			}
+
 			memcpy(&priv->mfunc.master.comm_arm_bit_vector,
 			       eqe->event.comm_channel_arm.bit_vec,
 			       sizeof eqe->event.comm_channel_arm.bit_vec);
-			queue_work(priv->mfunc.master.comm_wq,
-				   &priv->mfunc.master.comm_work);
+
+			if (!queue_work(priv->mfunc.master.comm_wq,
+				   &priv->mfunc.master.comm_work))
+				mlx4_warn(dev, "Failed to queue comm channel work\n");
+
+			if (!queue_work(priv->mfunc.master.comm_wq,
+				   &priv->mfunc.master.arm_comm_work))
+				mlx4_warn(dev, "Failed to queue arm comm channel work\n");
 			break;
 
 		case MLX4_EVENT_TYPE_FLR_EVENT:
@@ -704,6 +721,27 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 					    (unsigned long) eqe);
 			break;
 
+		case MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT:
+			switch (eqe->subtype) {
+			case MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_BAD_CABLE:
+				mlx4_warn(dev, "Bad cable detected on port %u\n",
+					  eqe->event.bad_cable.port);
+				break;
+			case MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_UNSUPPORTED_CABLE:
+				mlx4_warn(dev, "Unsupported cable detected\n");
+				break;
+			default:
+				mlx4_dbg(dev, "Unhandled recoverable error event "
+					 "detected: %02x(%02x) on EQ %d at index %u. "
+					 "owner=%x, nent=0x%x, ownership=%s\n",
+					 eqe->type, eqe->subtype, eq->eqn,
+					 eq->cons_index, eqe->owner, eq->nent,
+					 !!(eqe->owner & 0x80) ^
+					 !!(eq->cons_index & eq->nent) ? "HW" : "SW");
+				break;
+			}
+			break;
+
 		case MLX4_EVENT_TYPE_EEC_CATAS_ERROR:
 		case MLX4_EVENT_TYPE_ECC_DETECT:
 		default:
@@ -747,7 +785,6 @@ static irqreturn_t mlx4_interrupt(int irq, void *dev_ptr)
 	int work = 0;
 	int i;
 
-
 	writel(priv->eq_table.clr_mask, priv->eq_table.clr_int);
 
 	for (i = 0; i < dev->caps.num_comp_vectors + 1; ++i)
@@ -777,7 +814,7 @@ int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave,
 	struct mlx4_slave_event_eq_info *event_eq =
 		priv->mfunc.master.slave_state[slave].event_eq;
 	u32 in_modifier = vhcr->in_modifier;
-	u32 eqn = in_modifier & 0x1FF;
+	u32 eqn = in_modifier & 0x3FF;
 	u64 in_param =  vhcr->in_param;
 	int err = 0;
 	int i;
@@ -956,7 +993,7 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent,
 	mlx4_mtt_cleanup(dev, &eq->mtt);
 
 err_out_free_eq:
-	mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn);
+	mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn, MLX4_USE_RR);
 
 err_out_free_pages:
 	for (i = 0; i < npages; ++i)
@@ -1011,7 +1048,7 @@ static void mlx4_free_eq(struct mlx4_dev *dev,
 				    eq->page_list[i].map);
 
 	kfree(eq->page_list);
-	mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn);
+	mlx4_bitmap_free(&priv->eq_table.bitmap, eq->eqn, MLX4_USE_RR);
 	mlx4_free_cmd_mailbox(dev, mailbox);
 }
 
@@ -1306,7 +1343,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
 }
 EXPORT_SYMBOL(mlx4_test_interrupts);
 
-int mlx4_assign_eq(struct mlx4_dev *dev, char *name, int *vector)
+int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
 {
 
 	struct mlx4_priv *priv = mlx4_priv(dev);
diff --git a/sys/ofed/drivers/net/mlx4/fw.c b/sys/ofed/drivers/net/mlx4/fw.c
index cf079eab233c..93f7f714700f 100644
--- a/sys/ofed/drivers/net/mlx4/fw.c
+++ b/sys/ofed/drivers/net/mlx4/fw.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -32,8 +32,10 @@
  * SOFTWARE.
  */
 
+#include <linux/etherdevice.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/module.h>
+#include <linux/cache.h>
 
 #include "fw.h"
 #include "icm.h"
@@ -106,6 +108,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags)
 		[40] = "UDP RSS support",
 		[41] = "Unicast VEP steering support",
 		[42] = "Multicast VEP steering support",
+		[44] = "Cross-channel (sync_qp) operations support",
 		[48] = "Counters support",
 		[59] = "Port management change event support",
 		[60] = "eSwitch support",
@@ -126,7 +129,18 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags)
 		[0] = "RSS support",
 		[1] = "RSS Toeplitz Hash Function support",
 		[2] = "RSS XOR Hash Function support",
-		[3] = "Device manage flow steering support"
+		[3] = "Device manage flow steering support",
+		[4] = "FSM (MAC unti-spoofing) support",
+		[5] = "VST (control vlan insertion/stripping) support",
+		[6] = "Dynamic QP updates support",
+		[7] = "Loopback source checks support",
+		[8] = "Device managed flow steering IPoIB support",
+		[9] = "ETS configuration support",
+		[10] = "ETH backplane autoneg report",
+		[11] = "Ethernet Flow control statistics support",
+		[12] = "Recoverable error events support",
+		[13] = "Time stamping support",
+		[14] = "Report driver version to FW support"
 	};
 	int i;
 
@@ -170,7 +184,7 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 				struct mlx4_cmd_info *cmd)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	u8	field;
+	u8	field, port;
 	u32	size;
 	int	err = 0;
 
@@ -178,23 +192,32 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 #define QUERY_FUNC_CAP_NUM_PORTS_OFFSET		0x1
 #define QUERY_FUNC_CAP_PF_BHVR_OFFSET		0x4
 #define QUERY_FUNC_CAP_FMR_OFFSET		0x8
-#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET		0x10
-#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET		0x14
-#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET		0x18
-#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET		0x20
-#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET		0x24
-#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET		0x28
+#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET_DEP	0x10
+#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET_DEP	0x14
+#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET_DEP	0x18
+#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET_DEP	0x20
+#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET_DEP	0x24
+#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET_DEP	0x28
 #define QUERY_FUNC_CAP_MAX_EQ_OFFSET		0x2c
 #define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET	0x30
 
+#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET		0x50
+#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET		0x54
+#define QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET		0x58
+#define QUERY_FUNC_CAP_MPT_QUOTA_OFFSET		0x60
+#define QUERY_FUNC_CAP_MTT_QUOTA_OFFSET		0x64
+#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET		0x68
+
 #define QUERY_FUNC_CAP_FMR_FLAG			0x80
 #define QUERY_FUNC_CAP_FLAG_RDMA		0x40
 #define QUERY_FUNC_CAP_FLAG_ETH			0x80
+#define QUERY_FUNC_CAP_FLAG_QUOTAS		0x10
 
 /* when opcode modifier = 1 */
 #define QUERY_FUNC_CAP_PHYS_PORT_OFFSET		0x3
-#define QUERY_FUNC_CAP_RDMA_PROPS_OFFSET	0x8
-#define QUERY_FUNC_CAP_ETH_PROPS_OFFSET		0xc
+#define QUERY_FUNC_CAP_FLAGS0_OFFSET		0x8
+#define QUERY_FUNC_CAP_FLAGS1_OFFSET		0xc
+#define QUERY_FUNC_CAP_COUNTER_INDEX_OFFSET	0xd
 
 #define QUERY_FUNC_CAP_QP0_TUNNEL		0x10
 #define QUERY_FUNC_CAP_QP0_PROXY		0x14
@@ -203,35 +226,45 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 
 #define QUERY_FUNC_CAP_ETH_PROPS_FORCE_MAC	0x40
 #define QUERY_FUNC_CAP_ETH_PROPS_FORCE_VLAN	0x80
+#define QUERY_FUNC_CAP_PROPS_DEF_COUNTER	0x20
 
 #define QUERY_FUNC_CAP_RDMA_PROPS_FORCE_PHY_WQE_GID 0x80
 
 	if (vhcr->op_modifier == 1) {
-		field = 0;
-		/* ensure force vlan and force mac bits are not set */
-		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);
-		/* ensure that phy_wqe_gid bit is not set */
-		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_RDMA_PROPS_OFFSET);
+		port = vhcr->in_modifier; /* phys-port = logical-port */
+		MLX4_PUT(outbox->buf, port, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);
 
-		field = vhcr->in_modifier; /* phys-port = logical-port */
-		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_PHYS_PORT_OFFSET);
+		field = 0;
+		/* ensure that phy_wqe_gid bit is not set */
+		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS0_OFFSET);
+
+		/* ensure force vlan and force mac bits are not set
+		 * and that default counter bit is set
+		 */
+		field = QUERY_FUNC_CAP_PROPS_DEF_COUNTER; /* def counter */
+		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS1_OFFSET);
+
+		/* There is always default counter legal or sink counter */
+		field = mlx4_get_default_counter_index(dev, slave, vhcr->in_modifier);
+		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_COUNTER_INDEX_OFFSET);
 
 		/* size is now the QP number */
-		size = dev->phys_caps.base_tunnel_sqpn + 8 * slave + field - 1;
+		size = dev->phys_caps.base_tunnel_sqpn + 8 * slave + port - 1;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP0_TUNNEL);
 
 		size += 2;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP1_TUNNEL);
 
-		size = dev->phys_caps.base_proxy_sqpn + 8 * slave + field - 1;
+		size = dev->phys_caps.base_proxy_sqpn + 8 * slave + port - 1;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP0_PROXY);
 
 		size += 2;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP1_PROXY);
 
 	} else if (vhcr->op_modifier == 0) {
-		/* enable rdma and ethernet interfaces */
-		field = (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA);
+		/* enable rdma and ethernet interfaces, and new quota locations */
+		field = (QUERY_FUNC_CAP_FLAG_ETH | QUERY_FUNC_CAP_FLAG_RDMA |
+			 QUERY_FUNC_CAP_FLAG_QUOTAS);
 		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);
 
 		field = dev->caps.num_ports;
@@ -245,12 +278,18 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 
 		size = priv->mfunc.master.res_tracker.res_alloc[RES_QP].quota[slave];
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);
+		size = dev->caps.num_qps;
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_QP_QUOTA_OFFSET_DEP);
 
 		size = priv->mfunc.master.res_tracker.res_alloc[RES_SRQ].quota[slave];
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET);
+		size = dev->caps.num_srqs;
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET_DEP);
 
 		size = priv->mfunc.master.res_tracker.res_alloc[RES_CQ].quota[slave];
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET);
+		size = dev->caps.num_cqs;
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET_DEP);
 
 		size = dev->caps.num_eqs;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MAX_EQ_OFFSET);
@@ -260,12 +299,17 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 
 		size = priv->mfunc.master.res_tracker.res_alloc[RES_MPT].quota[slave];
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET);
+		size = dev->caps.num_mpts;
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET_DEP);
 
 		size = priv->mfunc.master.res_tracker.res_alloc[RES_MTT].quota[slave];
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET);
+		size = dev->caps.num_mtts;
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET_DEP);
 
 		size = dev->caps.num_mgms + dev->caps.num_amgms;
 		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);
+		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET_DEP);
 
 	} else
 		err = -EINVAL;
@@ -280,7 +324,7 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 	u32			*outbox;
 	u8			field, op_modifier;
 	u32			size;
-	int			err = 0;
+	int			err = 0, quotas = 0;
 
 	op_modifier = !!gen_or_port; /* 0 = general, 1 = logical port */
 
@@ -304,6 +348,7 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 			goto out;
 		}
 		func_cap->flags = field;
+		quotas = !!(func_cap->flags & QUERY_FUNC_CAP_FLAG_QUOTAS);
 
 		MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
 		func_cap->num_ports = field;
@@ -311,29 +356,50 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 		MLX4_GET(size, outbox, QUERY_FUNC_CAP_PF_BHVR_OFFSET);
 		func_cap->pf_context_behaviour = size;
 
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);
-		func_cap->qp_quota = size & 0xFFFFFF;
+		if (quotas) {
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP_QUOTA_OFFSET);
+			func_cap->qp_quota = size & 0xFFFFFF;
 
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET);
-		func_cap->srq_quota = size & 0xFFFFFF;
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET);
+			func_cap->srq_quota = size & 0xFFFFFF;
 
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET);
-		func_cap->cq_quota = size & 0xFFFFFF;
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET);
+			func_cap->cq_quota = size & 0xFFFFFF;
 
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET);
+			func_cap->mpt_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET);
+			func_cap->mtt_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);
+			func_cap->mcg_quota = size & 0xFFFFFF;
+
+		} else {
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP_QUOTA_OFFSET_DEP);
+			func_cap->qp_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_SRQ_QUOTA_OFFSET_DEP);
+			func_cap->srq_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_CQ_QUOTA_OFFSET_DEP);
+			func_cap->cq_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET_DEP);
+			func_cap->mpt_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET_DEP);
+			func_cap->mtt_quota = size & 0xFFFFFF;
+
+			MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET_DEP);
+			func_cap->mcg_quota = size & 0xFFFFFF;
+		}
 		MLX4_GET(size, outbox, QUERY_FUNC_CAP_MAX_EQ_OFFSET);
 		func_cap->max_eq = size & 0xFFFFFF;
 
 		MLX4_GET(size, outbox, QUERY_FUNC_CAP_RESERVED_EQ_OFFSET);
 		func_cap->reserved_eq = size & 0xFFFFFF;
 
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_MPT_QUOTA_OFFSET);
-		func_cap->mpt_quota = size & 0xFFFFFF;
-
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_MTT_QUOTA_OFFSET);
-		func_cap->mtt_quota = size & 0xFFFFFF;
-
-		MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);
-		func_cap->mcg_quota = size & 0xFFFFFF;
 		goto out;
 	}
 
@@ -344,7 +410,7 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 	}
 
 	if (dev->caps.port_type[gen_or_port] == MLX4_PORT_TYPE_ETH) {
-		MLX4_GET(field, outbox, QUERY_FUNC_CAP_ETH_PROPS_OFFSET);
+		MLX4_GET(field, outbox, QUERY_FUNC_CAP_FLAGS1_OFFSET);
 		if (field & QUERY_FUNC_CAP_ETH_PROPS_FORCE_VLAN) {
 			mlx4_err(dev, "VLAN is enforced on this port\n");
 			err = -EPROTONOSUPPORT;
@@ -357,7 +423,7 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 			goto out;
 		}
 	} else if (dev->caps.port_type[gen_or_port] == MLX4_PORT_TYPE_IB) {
-		MLX4_GET(field, outbox, QUERY_FUNC_CAP_RDMA_PROPS_OFFSET);
+		MLX4_GET(field, outbox, QUERY_FUNC_CAP_FLAGS0_OFFSET);
 		if (field & QUERY_FUNC_CAP_RDMA_PROPS_FORCE_PHY_WQE_GID) {
 			mlx4_err(dev, "phy_wqe_gid is "
 				 "enforced on this ib port\n");
@@ -373,6 +439,14 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u32 gen_or_port,
 		goto out;
 	}
 
+	MLX4_GET(field, outbox, QUERY_FUNC_CAP_FLAGS1_OFFSET);
+	if (field & QUERY_FUNC_CAP_PROPS_DEF_COUNTER) {
+		MLX4_GET(field, outbox, QUERY_FUNC_CAP_COUNTER_INDEX_OFFSET);
+		func_cap->def_counter_index = field;
+	} else {
+		func_cap->def_counter_index = MLX4_SINK_COUNTER_INDEX;
+	}
+
 	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP0_TUNNEL);
 	func_cap->qp0_tunnel_qpn = size & 0xFFFFFF;
 
@@ -466,7 +540,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_MAX_XRC_OFFSET		0x67
 #define QUERY_DEV_CAP_MAX_BASIC_COUNTERS_OFFSET	0x68
 #define QUERY_DEV_CAP_MAX_EXTENDED_COUNTERS_OFFSET	0x6c
+#define QUERY_DEV_CAP_PORT_FLOWSTATS_COUNTERS_OFFSET	0x70
 #define QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET	0x76
+#define QUERY_DEV_CAP_EXT_2_FLAGS_OFFSET		0x70
+#define QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET	0x74
 #define QUERY_DEV_CAP_FLOW_STEERING_MAX_QP_OFFSET	0x77
 #define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET	0x80
 #define QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET	0x82
@@ -480,6 +557,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_D_MPT_ENTRY_SZ_OFFSET	0x92
 #define QUERY_DEV_CAP_BMME_FLAGS_OFFSET		0x94
 #define QUERY_DEV_CAP_RSVD_LKEY_OFFSET		0x98
+#define QUERY_DEV_CAP_ETS_CFG_OFFSET		0x9c
 #define QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET		0xa0
 
 	dev_cap->flags2 = 0;
@@ -551,16 +629,23 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 	dev_cap->num_ports = field & 0xf;
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MSG_SZ_OFFSET);
 	dev_cap->max_msg_sz = 1 << (field & 0x1f);
+	MLX4_GET(field, outbox, QUERY_DEV_CAP_PORT_FLOWSTATS_COUNTERS_OFFSET);
+	if (field & 0x10)
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN;
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);
 	if (field & 0x80)
 		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FS_EN;
+	MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET);
+	if (field & 0x80)
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_DMFS_IPOIB;
 	dev_cap->fs_log_max_ucast_qp_range_size = field & 0x1f;
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_MAX_QP_OFFSET);
 	dev_cap->fs_max_num_qp_per_entry = field;
 	MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);
 	dev_cap->stat_rate_support = stat_rate;
 	MLX4_GET(field, outbox, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);
-	dev_cap->timestamp_support = field & 0x80;
+	if (field & 0x80)
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_TS;
 	MLX4_GET(ext_flags, outbox, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
 	MLX4_GET(flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
 	dev_cap->flags = flags | (u64)ext_flags << 32;
@@ -644,6 +729,16 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 		 QUERY_DEV_CAP_BMME_FLAGS_OFFSET);
 	MLX4_GET(dev_cap->reserved_lkey, outbox,
 		 QUERY_DEV_CAP_RSVD_LKEY_OFFSET);
+	MLX4_GET(field32, outbox, QUERY_DEV_CAP_ETS_CFG_OFFSET);
+	if (field32 & (1 << 0))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP;
+	if (field32 & (1 << 7))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT;
+	if (field32 & (1 << 8))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW;
+	if (field32 & (1 << 13))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_ETS_CFG;
+
 	MLX4_GET(dev_cap->max_icm_sz, outbox,
 		 QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);
 	if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)
@@ -655,6 +750,16 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 		MLX4_GET(dev_cap->max_extended_counters, outbox,
 			 QUERY_DEV_CAP_MAX_EXTENDED_COUNTERS_OFFSET);
 
+	MLX4_GET(field32, outbox, QUERY_DEV_CAP_EXT_2_FLAGS_OFFSET);
+	if (field32 & (1 << 16))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_UPDATE_QP;
+	if (field32 & (1 << 19))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_LB_SRC_CHK;
+	if (field32 & (1 << 20))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FSM;
+	if (field32 & (1 << 26))
+		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_VLAN_CONTROL;
+
 	if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {
 		for (i = 1; i <= dev_cap->num_ports; ++i) {
 			MLX4_GET(field, outbox, QUERY_DEV_CAP_VL_PORT_OFFSET);
@@ -786,6 +891,14 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
 	field &= 0x7f;
 	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET);
 
+	/* turn off device-managed steering capability if not enabled */
+	if (dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED) {
+		MLX4_GET(field, outbox->buf,
+			 QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);
+		field &= 0x7f;
+		MLX4_PUT(outbox->buf, field,
+			 QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);
+	}
 	return 0;
 }
 
@@ -800,8 +913,10 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
 	u8 port_type;
 	u16 short_field;
 	int err;
+	int admin_link_state;
 
 #define MLX4_VF_PORT_NO_LINK_SENSE_MASK	0xE0
+#define MLX4_PORT_LINK_UP_MASK		0x80
 #define QUERY_PORT_CUR_MAX_PKEY_OFFSET	0x0c
 #define QUERY_PORT_CUR_MAX_GID_OFFSET	0x0e
 
@@ -810,12 +925,8 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
 			   MLX4_CMD_NATIVE);
 
 	if (!err && dev->caps.function != slave) {
-		/* set slave default_mac address */
-		MLX4_GET(def_mac, outbox->buf, QUERY_PORT_MAC_OFFSET);
-		def_mac += slave << 8;
-		/* if config MAC in DB use it */
-		if (priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac)
-			def_mac = priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac;
+		/* set slave default_mac address to be zero MAC */
+		def_mac = priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac;
 		MLX4_PUT(outbox->buf, def_mac, QUERY_PORT_MAC_OFFSET);
 
 		/* get port type - currently only eth is enabled */
@@ -827,6 +938,12 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
 		/* set port type to currently operating port type */
 		port_type |= (dev->caps.port_type[vhcr->in_modifier] & 0x3);
 
+		admin_link_state = priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.link_state;
+		if (IFLA_VF_LINK_STATE_ENABLE == admin_link_state)
+			port_type |= MLX4_PORT_LINK_UP_MASK;
+		else if (IFLA_VF_LINK_STATE_DISABLE == admin_link_state)
+			port_type &= ~MLX4_PORT_LINK_UP_MASK;
+
 		MLX4_PUT(outbox->buf, port_type,
 			 QUERY_PORT_SUPPORTED_TYPE_OFFSET);
 
@@ -1078,14 +1195,14 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
 	MLX4_GET(fw->comm_bar,  outbox, QUERY_FW_COMM_BAR_OFFSET);
 	fw->comm_bar = (fw->comm_bar >> 6) * 2;
 	mlx4_dbg(dev, "Communication vector bar:%d offset:0x%llx\n",
-		 fw->comm_bar, (long long)fw->comm_base);
+		 fw->comm_bar, (unsigned long long)fw->comm_base);
 	mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2);
 
 	MLX4_GET(fw->clock_offset, outbox, QUERY_FW_CLOCK_OFFSET);
 	MLX4_GET(fw->clock_bar,    outbox, QUERY_FW_CLOCK_BAR);
 	fw->clock_bar = (fw->clock_bar >> 6) * 2;
 	mlx4_dbg(dev, "Internal clock bar:%d offset:0x%llx\n",
-		 fw->comm_bar, (long long)fw->comm_base);
+		 fw->comm_bar, (unsigned long long)fw->comm_base);
 
 	/*
 	 * Round up number of system pages needed in case
@@ -1127,7 +1244,7 @@ int mlx4_QUERY_FW_wrapper(struct mlx4_dev *dev, int slave,
 	return 0;
 }
 
-static void get_board_id(void *vsd, char *board_id)
+static void get_board_id(void *vsd, char *board_id, char *vsdstr)
 {
 	int i;
 
@@ -1135,9 +1252,16 @@ static void get_board_id(void *vsd, char *board_id)
 #define VSD_OFFSET_SIG2		0xde
 #define VSD_OFFSET_MLX_BOARD_ID	0xd0
 #define VSD_OFFSET_TS_BOARD_ID	0x20
+#define VSD_LEN			0xd0
 
 #define VSD_SIGNATURE_TOPSPIN	0x5ad
 
+	memset(vsdstr, 0, MLX4_VSD_LEN);
+
+	for (i = 0; i < VSD_LEN / 4; i++)
+		((u32 *)vsdstr)[i] =
+			swab32(*(u32 *)(vsd + i * 4));
+
 	memset(board_id, 0, MLX4_BOARD_ID_LEN);
 
 	if (be16_to_cpup(vsd + VSD_OFFSET_SIG1) == VSD_SIGNATURE_TOPSPIN &&
@@ -1164,6 +1288,7 @@ int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter)
 #define QUERY_ADAPTER_OUT_SIZE             0x100
 #define QUERY_ADAPTER_INTA_PIN_OFFSET      0x10
 #define QUERY_ADAPTER_VSD_OFFSET           0x20
+#define QUERY_ADAPTER_VSD_VENDOR_ID_OFFSET 0x1e
 
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 	if (IS_ERR(mailbox))
@@ -1177,8 +1302,11 @@ int mlx4_QUERY_ADAPTER(struct mlx4_dev *dev, struct mlx4_adapter *adapter)
 
 	MLX4_GET(adapter->inta_pin, outbox,    QUERY_ADAPTER_INTA_PIN_OFFSET);
 
+	adapter->vsd_vendor_id = be16_to_cpup((u16 *)outbox +
+				QUERY_ADAPTER_VSD_VENDOR_ID_OFFSET / 2);
+
 	get_board_id(outbox + QUERY_ADAPTER_VSD_OFFSET / 4,
-		     adapter->board_id);
+		     adapter->board_id, adapter->vsd);
 
 out:
 	mlx4_free_cmd_mailbox(dev, mailbox);
@@ -1189,13 +1317,16 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 {
 	struct mlx4_cmd_mailbox *mailbox;
 	__be32 *inbox;
+	u32 mw_enable;
 	int err;
 
 #define INIT_HCA_IN_SIZE		 0x200
+#define INIT_HCA_DRV_NAME_FOR_FW_MAX_SIZE 64
 #define INIT_HCA_VERSION_OFFSET		 0x000
 #define	 INIT_HCA_VERSION		 2
 #define INIT_HCA_CACHELINE_SZ_OFFSET	 0x0e
 #define INIT_HCA_FLAGS_OFFSET		 0x014
+#define INIT_HCA_RECOVERABLE_ERROR_EVENT_OFFSET 0x018
 #define INIT_HCA_QPC_OFFSET		 0x020
 #define	 INIT_HCA_QPC_BASE_OFFSET	 (INIT_HCA_QPC_OFFSET + 0x10)
 #define	 INIT_HCA_LOG_QP_OFFSET		 (INIT_HCA_QPC_OFFSET + 0x17)
@@ -1217,6 +1348,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 #define  INIT_HCA_UC_STEERING_OFFSET	 (INIT_HCA_MCAST_OFFSET + 0x18)
 #define	 INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)
 #define  INIT_HCA_DEVICE_MANAGED_FLOW_STEERING_EN	0x6
+#define  INIT_HCA_DRIVER_VERSION_OFFSET   0x140
 #define  INIT_HCA_FS_PARAM_OFFSET         0x1d0
 #define  INIT_HCA_FS_BASE_OFFSET          (INIT_HCA_FS_PARAM_OFFSET + 0x00)
 #define  INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x12)
@@ -1227,6 +1359,8 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 #define  INIT_HCA_FS_IB_NUM_ADDRS_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x26)
 #define INIT_HCA_TPT_OFFSET		 0x0f0
 #define	 INIT_HCA_DMPT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x00)
+#define  INIT_HCA_TPT_MW_OFFSET		 (INIT_HCA_TPT_OFFSET + 0x08)
+#define  INIT_HCA_TPT_MW_ENABLE		 (1 << 31)
 #define	 INIT_HCA_LOG_MPT_SZ_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x0b)
 #define	 INIT_HCA_MTT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x10)
 #define	 INIT_HCA_CMPT_BASE_OFFSET	 (INIT_HCA_TPT_OFFSET + 0x18)
@@ -1244,7 +1378,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 	*((u8 *) mailbox->buf + INIT_HCA_VERSION_OFFSET) = INIT_HCA_VERSION;
 
 	*((u8 *) mailbox->buf + INIT_HCA_CACHELINE_SZ_OFFSET) =
-		((ilog2(CACHE_LINE_SIZE) - 4) << 5) | (1 << 4);
+		((ilog2(cache_line_size()) - 4) << 5) | (1 << 4);
 
 #if defined(__LITTLE_ENDIAN)
 	*(inbox + INIT_HCA_FLAGS_OFFSET / 4) &= ~cpu_to_be32(1 << 1);
@@ -1290,6 +1424,17 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 		dev->caps.cqe_size   = 32;
 	}
 
+	if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT)
+		*(inbox + INIT_HCA_RECOVERABLE_ERROR_EVENT_OFFSET / 4) |= cpu_to_be32(1 << 31);
+
+	if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW) {
+		strncpy((u8 *)mailbox->buf + INIT_HCA_DRIVER_VERSION_OFFSET,
+			DRV_NAME_FOR_FW,
+			INIT_HCA_DRV_NAME_FOR_FW_MAX_SIZE - 1);
+		mlx4_dbg(dev, "Reporting Driver Version to FW: %s\n",
+			 (u8 *)mailbox->buf + INIT_HCA_DRIVER_VERSION_OFFSET);
+	}
+
 	/* QPC/EEC/CQC/EQC/RDMARC attributes */
 
 	MLX4_PUT(inbox, param->qpc_base,      INIT_HCA_QPC_BASE_OFFSET);
@@ -1339,15 +1484,16 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 			 INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
 		MLX4_PUT(inbox, param->log_mc_table_sz,
 			 INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
-		if (dev->caps.steering_mode == MLX4_STEERING_MODE_B0) {
+		if (dev->caps.steering_mode == MLX4_STEERING_MODE_B0)
 			MLX4_PUT(inbox, (u8) (1 << 3),
 				 INIT_HCA_UC_STEERING_OFFSET);
-                }
 	}
 
 	/* TPT attributes */
 
 	MLX4_PUT(inbox, param->dmpt_base,  INIT_HCA_DMPT_BASE_OFFSET);
+	mw_enable = param->mw_enable ? INIT_HCA_TPT_MW_ENABLE : 0;
+	MLX4_PUT(inbox, mw_enable,	   INIT_HCA_TPT_MW_OFFSET);
 	MLX4_PUT(inbox, param->log_mpt_sz, INIT_HCA_LOG_MPT_SZ_OFFSET);
 	MLX4_PUT(inbox, param->mtt_base,   INIT_HCA_MTT_BASE_OFFSET);
 	MLX4_PUT(inbox, param->cmpt_base,  INIT_HCA_CMPT_BASE_OFFSET);
@@ -1373,6 +1519,7 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
 	struct mlx4_cmd_mailbox *mailbox;
 	__be32 *outbox;
 	u32 dword_field;
+	u32 mw_enable;
 	int err;
 	u8 byte_field;
 
@@ -1414,13 +1561,12 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
 		param->steering_mode = MLX4_STEERING_MODE_DEVICE_MANAGED;
 	} else {
 		MLX4_GET(byte_field, outbox, INIT_HCA_UC_STEERING_OFFSET);
-		if (byte_field & 0x8) {
+		if (byte_field & 0x8)
 			param->steering_mode = MLX4_STEERING_MODE_B0;
-                }
-		else {
+		else
 			param->steering_mode = MLX4_STEERING_MODE_A0;
-                }
 	}
+	/* steering attributes */
 	if (param->steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED) {
 		MLX4_GET(param->mc_base, outbox, INIT_HCA_FS_BASE_OFFSET);
 		MLX4_GET(param->log_mc_entry_sz, outbox,
@@ -1447,6 +1593,9 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
 	/* TPT attributes */
 
 	MLX4_GET(param->dmpt_base,  outbox, INIT_HCA_DMPT_BASE_OFFSET);
+	MLX4_GET(mw_enable,	    outbox, INIT_HCA_TPT_MW_OFFSET);
+	param->mw_enable = (mw_enable & INIT_HCA_TPT_MW_ENABLE) ==
+			   INIT_HCA_TPT_MW_ENABLE;
 	MLX4_GET(param->log_mpt_sz, outbox, INIT_HCA_LOG_MPT_SZ_OFFSET);
 	MLX4_GET(param->mtt_base,   outbox, INIT_HCA_MTT_BASE_OFFSET);
 	MLX4_GET(param->cmpt_base,  outbox, INIT_HCA_CMPT_BASE_OFFSET);
@@ -1682,6 +1831,15 @@ int mlx4_query_diag_counters(struct mlx4_dev *dev, int array_length,
 }
 EXPORT_SYMBOL_GPL(mlx4_query_diag_counters);
 
+int mlx4_MOD_STAT_CFG_wrapper(struct mlx4_dev *dev, int slave,
+			  struct mlx4_vhcr *vhcr,
+			  struct mlx4_cmd_mailbox *inbox,
+			  struct mlx4_cmd_mailbox *outbox,
+			  struct mlx4_cmd_info *cmd)
+{
+	return -EPERM;
+}
+
 #define MLX4_WOL_SETUP_MODE (5 << 28)
 int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port)
 {
diff --git a/sys/ofed/drivers/net/mlx4/fw.h b/sys/ofed/drivers/net/mlx4/fw.h
index 5fe77821aeb3..0efd047ec3ad 100644
--- a/sys/ofed/drivers/net/mlx4/fw.h
+++ b/sys/ofed/drivers/net/mlx4/fw.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -143,10 +143,13 @@ struct mlx4_func_cap {
 	u32	qp1_proxy_qpn;
 	u8	physical_port;
 	u8	port_flags;
+	u8	def_counter_index;
 };
 
 struct mlx4_adapter {
+	u16 vsd_vendor_id;
 	char board_id[MLX4_BOARD_ID_LEN];
+	char vsd[MLX4_VSD_LEN];
 	u8   inta_pin;
 };
 
@@ -175,6 +178,8 @@ struct mlx4_init_hca_param {
 	u8  log_mpt_sz;
 	u8  log_uar_sz;
 	u8  uar_page_sz; /* log pg sz in 4k chunks */
+	u8  mw_enable;	/* Enable memory windows */
+	u8  fs_hash_enable_bits;
 	u8  steering_mode; /* for QUERY_HCA */
 	u64 dev_cap_enabled;
 };
@@ -218,8 +223,6 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param);
 int mlx4_CLOSE_HCA(struct mlx4_dev *dev, int panic);
 int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt);
 int mlx4_SET_ICM_SIZE(struct mlx4_dev *dev, u64 icm_size, u64 *aux_pages);
-int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm);
-int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev);
 int mlx4_NOP(struct mlx4_dev *dev);
 int mlx4_MOD_STAT_CFG(struct mlx4_dev *dev, struct mlx4_mod_stat_cfg *cfg);
 void mlx4_opreq_action(struct work_struct *work);
diff --git a/sys/ofed/drivers/net/mlx4/icm.c b/sys/ofed/drivers/net/mlx4/icm.c
index d18fde150daa..25ae7b7fb8cc 100644
--- a/sys/ofed/drivers/net/mlx4/icm.c
+++ b/sys/ofed/drivers/net/mlx4/icm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -35,6 +35,7 @@
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
+#include <linux/math64.h>
 
 #include <linux/mlx4/cmd.h>
 
@@ -288,10 +289,14 @@ void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj)
 
 	if (--table->icm[i]->refcount == 0) {
 		offset = (u64) i * MLX4_TABLE_CHUNK_SIZE;
-		mlx4_UNMAP_ICM(dev, table->virt + offset,
-			       MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
-		mlx4_free_icm(dev, table->icm[i], table->coherent);
-		table->icm[i] = NULL;
+
+		if (!mlx4_UNMAP_ICM(dev, table->virt + offset,
+				    MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE)) {
+			mlx4_free_icm(dev, table->icm[i], table->coherent);
+			table->icm[i] = NULL;
+		} else {
+			pr_warn("mlx4_core: mlx4_UNMAP_ICM failed.\n");
+		}
 	}
 
 	mutex_unlock(&table->mutex);
@@ -378,7 +383,7 @@ void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 }
 
 int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
-			u64 virt, int obj_size,	u32 nobj, int reserved,
+			u64 virt, int obj_size,	u64 nobj, int reserved,
 			int use_lowmem, int use_coherent)
 {
 	int obj_per_chunk;
@@ -388,7 +393,7 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 	u64 size;
 
 	obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size;
-	num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk;
+	num_icm = div_u64((nobj + obj_per_chunk - 1), obj_per_chunk);
 
 	table->icm      = kcalloc(num_icm, sizeof *table->icm, GFP_KERNEL);
 	if (!table->icm)
@@ -431,11 +436,15 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 err:
 	for (i = 0; i < num_icm; ++i)
 		if (table->icm[i]) {
-			mlx4_UNMAP_ICM(dev, virt + i * MLX4_TABLE_CHUNK_SIZE,
-				       MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
-			mlx4_free_icm(dev, table->icm[i], use_coherent);
+			if (!mlx4_UNMAP_ICM(dev,
+					    virt + i * MLX4_TABLE_CHUNK_SIZE,
+					    MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE)) {
+				mlx4_free_icm(dev, table->icm[i], use_coherent);
+			} else {
+				pr_warn("mlx4_core: mlx4_UNMAP_ICM failed.\n");
+				return -ENOMEM;
+			}
 		}
-
 	kfree(table->icm);
 
 	return -ENOMEM;
@@ -443,14 +452,22 @@ int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 
 void mlx4_cleanup_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table)
 {
-	int i;
+	int i, err = 0;
 
 	for (i = 0; i < table->num_icm; ++i)
 		if (table->icm[i]) {
-			mlx4_UNMAP_ICM(dev, table->virt + i * MLX4_TABLE_CHUNK_SIZE,
-				       MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
-			mlx4_free_icm(dev, table->icm[i], table->coherent);
+			err = mlx4_UNMAP_ICM(dev,
+					     table->virt + i * MLX4_TABLE_CHUNK_SIZE,
+					     MLX4_TABLE_CHUNK_SIZE / MLX4_ICM_PAGE_SIZE);
+			if (!err) {
+				mlx4_free_icm(dev, table->icm[i],
+					      table->coherent);
+			} else {
+				pr_warn("mlx4_core: mlx4_UNMAP_ICM failed.\n");
+				break;
+			}
 		}
 
-	kfree(table->icm);
+	if (!err)
+		kfree(table->icm);
 }
diff --git a/sys/ofed/drivers/net/mlx4/icm.h b/sys/ofed/drivers/net/mlx4/icm.h
index f83ad8141dc4..f7a2537bfbc0 100644
--- a/sys/ofed/drivers/net/mlx4/icm.h
+++ b/sys/ofed/drivers/net/mlx4/icm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -37,6 +37,7 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <linux/mutex.h>
+#include <linux/scatterlist.h>
 
 #define MLX4_ICM_CHUNK_LEN						\
 	((256 - sizeof (struct list_head) - 2 * sizeof (int)) /		\
@@ -78,7 +79,7 @@ int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
 			  u32 start, u32 end);
 int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table,
-			u64 virt, int obj_size,	u32 nobj, int reserved,
+			u64 virt, int obj_size,	u64 nobj, int reserved,
 			int use_lowmem, int use_coherent);
 void mlx4_cleanup_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table);
 void *mlx4_table_find(struct mlx4_icm_table *table, u32 obj, dma_addr_t *dma_handle);
@@ -122,5 +123,7 @@ static inline unsigned long mlx4_icm_size(struct mlx4_icm_iter *iter)
 	return sg_dma_len(&iter->chunk->mem[iter->page_idx]);
 }
 
+int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm);
+int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev);
 
 #endif /* MLX4_ICM_H */
diff --git a/sys/ofed/drivers/net/mlx4/intf.c b/sys/ofed/drivers/net/mlx4/intf.c
index 0f6754bc547e..141629801d2f 100644
--- a/sys/ofed/drivers/net/mlx4/intf.c
+++ b/sys/ofed/drivers/net/mlx4/intf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,6 +32,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include "mlx4.h"
 
@@ -160,7 +161,7 @@ void mlx4_unregister_device(struct mlx4_dev *dev)
 	list_for_each_entry(intf, &intf_list, list)
 		mlx4_remove_device(intf, priv);
 
-	list_del(&priv->dev_list);
+	list_del_init(&priv->dev_list);
 
 	mutex_unlock(&intf_mutex);
 }
diff --git a/sys/ofed/drivers/net/mlx4/main.c b/sys/ofed/drivers/net/mlx4/main.c
index 5fe77d6e8a79..12c583601714 100644
--- a/sys/ofed/drivers/net/mlx4/main.c
+++ b/sys/ofed/drivers/net/mlx4/main.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -33,6 +33,11 @@
  * SOFTWARE.
  */
 
+#include <linux/kmod.h> 
+/* 
+ * kmod.h must be included before module.h since it includes (indirectly) sys/module.h
+ * To use the FBSD macro sys/module.h should define MODULE_VERSION before linux/module does.
+*/
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
@@ -41,6 +46,7 @@
 #include <linux/io-mapping.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
+#include <linux/string.h>
 #include <linux/fs.h>
 
 #include <linux/mlx4/device.h>
@@ -49,11 +55,11 @@
 #include "mlx4.h"
 #include "fw.h"
 #include "icm.h"
+#include "mlx4_stats.h"
 
 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("Mellanox ConnectX HCA low-level driver");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_VERSION(DRV_VERSION);
 
 struct workqueue_struct *mlx4_wq;
 
@@ -69,7 +75,7 @@ MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
 
 static int msi_x = 1;
 module_param(msi_x, int, 0444);
-MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero");
+MODULE_PARM_DESC(msi_x, "0 - don't use MSI-X, 1 - use MSI-X, >1 - limit number of MSI-X irqs to msi_x (non-SRIOV only)");
 
 #else /* CONFIG_PCI_MSI */
 
@@ -85,14 +91,60 @@ int mlx4_blck_lb = 1;
 module_param_named(block_loopback, mlx4_blck_lb, int, 0644);
 MODULE_PARM_DESC(block_loopback, "Block multicast loopback packets if > 0 "
 				 "(default: 1)");
+enum {
+	DEFAULT_DOMAIN	= 0,
+	BDF_STR_SIZE	= 8, /* bb:dd.f- */
+	DBDF_STR_SIZE	= 13 /* mmmm:bb:dd.f- */
+};
 
-static int num_vfs;
-module_param(num_vfs, int, 0444);
-MODULE_PARM_DESC(num_vfs, "enable #num_vfs functions if num_vfs > 0");
+enum {
+	NUM_VFS,
+	PROBE_VF,
+	PORT_TYPE_ARRAY
+};
 
-static int probe_vf;
-module_param(probe_vf, int, 0644);
-MODULE_PARM_DESC(probe_vf, "number of vfs to probe by pf driver (num_vfs > 0)");
+enum {
+	VALID_DATA,
+	INVALID_DATA,
+	INVALID_STR
+};
+
+struct param_data {
+	int				id;
+	struct mlx4_dbdf2val_lst	dbdf2val;
+};
+
+static struct param_data num_vfs = {
+	.id		= NUM_VFS,
+	.dbdf2val = {
+		.name		= "num_vfs param",
+		.num_vals	= 1,
+		.def_val	= {0},
+		.range		= {0, MLX4_MAX_NUM_VF}
+	}
+};
+module_param_string(num_vfs, num_vfs.dbdf2val.str,
+		    sizeof(num_vfs.dbdf2val.str), 0444);
+MODULE_PARM_DESC(num_vfs,
+		 "Either single value (e.g. '5') to define uniform num_vfs value for all devices functions\n"
+		 "\t\tor a string to map device function numbers to their num_vfs values (e.g. '0000:04:00.0-5,002b:1c:0b.a-15').\n"
+		 "\t\tHexadecimal digits for the device function (e.g. 002b:1c:0b.a) and decimal for num_vfs value (e.g. 15).");
+
+static struct param_data probe_vf = {
+	.id		= PROBE_VF,
+	.dbdf2val = {
+		.name		= "probe_vf param",
+		.num_vals	= 1,
+		.def_val	= {0},
+		.range		= {0, MLX4_MAX_NUM_VF}
+	}
+};
+module_param_string(probe_vf, probe_vf.dbdf2val.str,
+		    sizeof(probe_vf.dbdf2val.str), 0444);
+MODULE_PARM_DESC(probe_vf,
+		 "Either single value (e.g. '3') to define uniform number of VFs to probe by the pf driver for all devices functions\n"
+		 "\t\tor a string to map device function numbers to their probe_vf values (e.g. '0000:04:00.0-3,002b:1c:0b.a-13').\n"
+		 "\t\tHexadecimal digits for the device function (e.g. 002b:1c:0b.a) and decimal for probe_vf value (e.g. 13).");
 
 int mlx4_log_num_mgm_entry_size = MLX4_DEFAULT_MGM_LOG_ENTRY_SIZE;
 
@@ -115,10 +167,10 @@ module_param_named(fast_drop, fast_drop, int, 0444);
 MODULE_PARM_DESC(fast_drop,
 		 "Enable fast packet drop when no recieve WQEs are posted");
 
-int mlx4_enable_64b_cqe_eqe;
+int mlx4_enable_64b_cqe_eqe = 1;
 module_param_named(enable_64b_cqe_eqe, mlx4_enable_64b_cqe_eqe, int, 0644);
 MODULE_PARM_DESC(enable_64b_cqe_eqe,
-		 "Enable 64 byte CQEs/EQEs when the the FW supports this, if nonzero");
+		 "Enable 64 byte CQEs/EQEs when the the FW supports this if non-zero (default: 1)");
 
 #define HCA_GLOBAL_CAP_MASK            0
 
@@ -144,13 +196,23 @@ module_param_named(log_mtts_per_seg, log_mtts_per_seg, int, 0444);
 MODULE_PARM_DESC(log_mtts_per_seg, "Log2 number of MTT entries per segment "
 		 "(0-7) (default: 0)");
 
-static int port_type_array[2] = {MLX4_PORT_TYPE_NONE, MLX4_PORT_TYPE_NONE};
-#if 0 
-static int arr_argc = 2;
-module_param_array(port_type_array, int, &arr_argc, 0444);
-MODULE_PARM_DESC(port_type_array, "Array of port types: HW_DEFAULT (0) is default "
-				"1 for IB, 2 for Ethernet");
-#endif
+static struct param_data port_type_array = {
+	.id		= PORT_TYPE_ARRAY,
+	.dbdf2val = {
+		.name		= "port_type_array param",
+		.num_vals	= 2,
+		.def_val	= {MLX4_PORT_TYPE_ETH, MLX4_PORT_TYPE_ETH},
+		.range		= {MLX4_PORT_TYPE_IB, MLX4_PORT_TYPE_NA}
+	}
+};
+module_param_string(port_type_array, port_type_array.dbdf2val.str,
+		    sizeof(port_type_array.dbdf2val.str), 0444);
+MODULE_PARM_DESC(port_type_array,
+		 "Either pair of values (e.g. '1,2') to define uniform port1/port2 types configuration for all devices functions\n"
+		 "\t\tor a string to map device function numbers to their pair of port types values (e.g. '0000:04:00.0-1;2,002b:1c:0b.a-1;1').\n"
+		 "\t\tValid port types: 1-ib, 2-eth, 3-auto, 4-N/A\n"
+		 "\t\tIn case that only one port is available use the N/A port type for port2 (e.g '1,4').");
+
 
 struct mlx4_port_config {
 	struct list_head list;
@@ -170,7 +232,7 @@ static struct mlx4_profile mod_param_profile = {
 	.num_cq         = 16,
 	.num_mcg        = 13,
 	.num_mpt        = 19,
-	.num_mtt        = 0, /* max(20, 2*MTTs for host memory)) */
+	.num_mtt_segs   = 0, /* max(20, 2*MTTs for host memory)) */
 };
 
 module_param_named(log_num_qp, mod_param_profile.num_qp, int, 0444);
@@ -197,7 +259,7 @@ MODULE_PARM_DESC(log_num_mpt,
 		 "log maximum number of memory protection table entries per "
 		 "HCA (default: 19)");
 
-module_param_named(log_num_mtt, mod_param_profile.num_mtt, int, 0444);
+module_param_named(log_num_mtt, mod_param_profile.num_mtt_segs, int, 0444);
 MODULE_PARM_DESC(log_num_mtt,
 		 "log maximum number of memory translation table segments per "
 		 "HCA (default: max(20, 2*MTTs for register all of the host memory limited to 30))");
@@ -206,9 +268,263 @@ enum {
 	MLX4_IF_STATE_BASIC,
 	MLX4_IF_STATE_EXTENDED
 };
+
+static inline u64 dbdf_to_u64(int domain, int bus, int dev, int fn)
+{
+	return (domain << 20) | (bus << 12) | (dev << 4) | fn;
+}
+
+static inline void pr_bdf_err(const char *dbdf, const char *pname)
+{
+	pr_warn("mlx4_core: '%s' is not valid bdf in '%s'\n", dbdf, pname);
+}
+
+static inline void pr_val_err(const char *dbdf, const char *pname,
+			      const char *val)
+{
+	pr_warn("mlx4_core: value '%s' of bdf '%s' in '%s' is not valid\n"
+		, val, dbdf, pname);
+}
+
+static inline void pr_out_of_range_bdf(const char *dbdf, int val,
+				       struct mlx4_dbdf2val_lst *dbdf2val)
+{
+	pr_warn("mlx4_core: value %d in bdf '%s' of '%s' is out of its valid range (%d,%d)\n"
+		, val, dbdf, dbdf2val->name , dbdf2val->range.min,
+		dbdf2val->range.max);
+}
+
+static inline void pr_out_of_range(struct mlx4_dbdf2val_lst *dbdf2val)
+{
+	pr_warn("mlx4_core: value of '%s' is out of its valid range (%d,%d)\n"
+		, dbdf2val->name , dbdf2val->range.min, dbdf2val->range.max);
+}
+
+static inline int is_in_range(int val, struct mlx4_range *r)
+{
+	return (val >= r->min && val <= r->max);
+}
+
+static int update_defaults(struct param_data *pdata)
+{
+	long int val[MLX4_MAX_BDF_VALS];
+	int ret;
+	char *t, *p = pdata->dbdf2val.str;
+	char sval[32];
+	int val_len;
+
+	if (!strlen(p) || strchr(p, ':') || strchr(p, '.') || strchr(p, ';'))
+		return INVALID_STR;
+
+	switch (pdata->id) {
+	case PORT_TYPE_ARRAY:
+		t = strchr(p, ',');
+		if (!t || t == p || (t - p) > sizeof(sval))
+			return INVALID_STR;
+
+		val_len = t - p;
+		strncpy(sval, p, val_len);
+		sval[val_len] = 0;
+
+		ret = kstrtol(sval, 0, &val[0]);
+		if (ret == -EINVAL)
+			return INVALID_STR;
+		if (ret || !is_in_range(val[0], &pdata->dbdf2val.range)) {
+			pr_out_of_range(&pdata->dbdf2val);
+			return INVALID_DATA;
+		}
+
+		ret = kstrtol(t + 1, 0, &val[1]);
+		if (ret == -EINVAL)
+			return INVALID_STR;
+		if (ret || !is_in_range(val[1], &pdata->dbdf2val.range)) {
+			pr_out_of_range(&pdata->dbdf2val);
+			return INVALID_DATA;
+		}
+
+		pdata->dbdf2val.tbl[0].val[0] = val[0];
+		pdata->dbdf2val.tbl[0].val[1] = val[1];
+		break;
+
+	case NUM_VFS:
+	case PROBE_VF:
+		ret = kstrtol(p, 0, &val[0]);
+		if (ret == -EINVAL)
+			return INVALID_STR;
+		if (ret || !is_in_range(val[0], &pdata->dbdf2val.range)) {
+			pr_out_of_range(&pdata->dbdf2val);
+			return INVALID_DATA;
+		}
+		pdata->dbdf2val.tbl[0].val[0] = val[0];
+		break;
+	}
+	pdata->dbdf2val.tbl[1].dbdf = MLX4_ENDOF_TBL;
+
+	return VALID_DATA;
+}
+
+int mlx4_fill_dbdf2val_tbl(struct mlx4_dbdf2val_lst *dbdf2val_lst)
+{
+	int domain, bus, dev, fn;
+	u64 dbdf;
+	char *p, *t, *v;
+	char tmp[32];
+	char sbdf[32];
+	char sep = ',';
+	int j, k, str_size, i = 1;
+	int prfx_size;
+
+	p = dbdf2val_lst->str;
+
+	for (j = 0; j < dbdf2val_lst->num_vals; j++)
+		dbdf2val_lst->tbl[0].val[j] = dbdf2val_lst->def_val[j];
+	dbdf2val_lst->tbl[1].dbdf = MLX4_ENDOF_TBL;
+
+	str_size = strlen(dbdf2val_lst->str);
+
+	if (str_size == 0)
+		return 0;
+
+	while (strlen(p)) {
+		prfx_size = BDF_STR_SIZE;
+		sbdf[prfx_size] = 0;
+		strncpy(sbdf, p, prfx_size);
+		domain = DEFAULT_DOMAIN;
+		if (sscanf(sbdf, "%02x:%02x.%x-", &bus, &dev, &fn) != 3) {
+			prfx_size = DBDF_STR_SIZE;
+			sbdf[prfx_size] = 0;
+			strncpy(sbdf, p, prfx_size);
+			if (sscanf(sbdf, "%04x:%02x:%02x.%x-", &domain, &bus,
+				   &dev, &fn) != 4) {
+				pr_bdf_err(sbdf, dbdf2val_lst->name);
+				goto err;
+			}
+			sprintf(tmp, "%04x:%02x:%02x.%x-", domain, bus, dev,
+				fn);
+		} else {
+			sprintf(tmp, "%02x:%02x.%x-", bus, dev, fn);
+		}
+
+		if (strnicmp(sbdf, tmp, sizeof(tmp))) {
+			pr_bdf_err(sbdf, dbdf2val_lst->name);
+			goto err;
+		}
+
+		dbdf = dbdf_to_u64(domain, bus, dev, fn);
+
+		for (j = 1; j < i; j++)
+			if (dbdf2val_lst->tbl[j].dbdf == dbdf) {
+				pr_warn("mlx4_core: in '%s', %s appears multiple times\n"
+					, dbdf2val_lst->name, sbdf);
+				goto err;
+			}
+
+		if (i >= MLX4_DEVS_TBL_SIZE) {
+			pr_warn("mlx4_core: Too many devices in '%s'\n"
+				, dbdf2val_lst->name);
+			goto err;
+		}
+
+		p += prfx_size;
+		t = strchr(p, sep);
+		t = t ? t : p + strlen(p);
+		if (p >= t) {
+			pr_val_err(sbdf, dbdf2val_lst->name, "");
+			goto err;
+		}
+
+		for (k = 0; k < dbdf2val_lst->num_vals; k++) {
+			char sval[32];
+			long int val;
+			int ret, val_len;
+			char vsep = ';';
+
+			v = (k == dbdf2val_lst->num_vals - 1) ? t : strchr(p, vsep);
+			if (!v || v > t || v == p || (v - p) > sizeof(sval)) {
+				pr_val_err(sbdf, dbdf2val_lst->name, p);
+				goto err;
+			}
+			val_len = v - p;
+			strncpy(sval, p, val_len);
+			sval[val_len] = 0;
+
+			ret = kstrtol(sval, 0, &val);
+			if (ret) {
+				if (strchr(p, vsep))
+					pr_warn("mlx4_core: too many vals in bdf '%s' of '%s'\n"
+						, sbdf, dbdf2val_lst->name);
+				else
+					pr_val_err(sbdf, dbdf2val_lst->name,
+						   sval);
+				goto err;
+			}
+			if (!is_in_range(val, &dbdf2val_lst->range)) {
+				pr_out_of_range_bdf(sbdf, val, dbdf2val_lst);
+				goto err;
+			}
+
+			dbdf2val_lst->tbl[i].val[k] = val;
+			p = v;
+			if (p[0] == vsep)
+				p++;
+		}
+
+		dbdf2val_lst->tbl[i].dbdf = dbdf;
+		if (strlen(p)) {
+			if (p[0] != sep) {
+				pr_warn("mlx4_core: expect separator '%c' before '%s' in '%s'\n"
+					, sep, p, dbdf2val_lst->name);
+				goto err;
+			}
+			p++;
+		}
+		i++;
+		if (i < MLX4_DEVS_TBL_SIZE)
+			dbdf2val_lst->tbl[i].dbdf = MLX4_ENDOF_TBL;
+	}
+
+	return 0;
+
+err:
+	dbdf2val_lst->tbl[1].dbdf = MLX4_ENDOF_TBL;
+	pr_warn("mlx4_core: The value of '%s' is incorrect. The value is discarded!\n"
+		, dbdf2val_lst->name);
+
+	return -EINVAL;
+}
+EXPORT_SYMBOL(mlx4_fill_dbdf2val_tbl);
+
+int mlx4_get_val(struct mlx4_dbdf2val *tbl, struct pci_dev *pdev, int idx,
+		 int *val)
+{
+	u64 dbdf;
+	int i = 1;
+
+	*val = tbl[0].val[idx];
+	if (!pdev)
+		return -EINVAL;
+
+	if (!pdev->bus) {
+		return -EINVAL;
+	}
+
+        dbdf = dbdf_to_u64(pci_get_domain(pdev->dev.bsddev), pci_get_bus(pdev->dev.bsddev),
+			   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+
+	while ((i < MLX4_DEVS_TBL_SIZE) && (tbl[i].dbdf != MLX4_ENDOF_TBL)) {
+		if (tbl[i].dbdf == dbdf) {
+			*val = tbl[i].val[idx];
+			return 0;
+		}
+		i++;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL(mlx4_get_val);
+
 static void process_mod_param_profile(struct mlx4_profile *profile)
 {
-
         vm_size_t hwphyssz;
         hwphyssz = 0;
         TUNABLE_ULONG_FETCH("hw.realmem", (u_long *) &hwphyssz);
@@ -232,10 +548,10 @@ static void process_mod_param_profile(struct mlx4_profile *profile)
 	 * That limits us to 4TB of memory registration per HCA with
 	 * 4KB pages, which is probably OK for the next few months.
 	 */
-	if (mod_param_profile.num_mtt)
-		profile->num_mtt = 1 << mod_param_profile.num_mtt;
+	if (mod_param_profile.num_mtt_segs)
+		profile->num_mtt_segs = 1 << mod_param_profile.num_mtt_segs;
 	else {
-		profile->num_mtt =
+		profile->num_mtt_segs =
 			roundup_pow_of_two(max_t(unsigned,
 						1 << (MLX4_LOG_NUM_MTT - log_mtts_per_seg),
 						min(1UL << 
@@ -245,7 +561,7 @@ static void process_mod_param_profile(struct mlx4_profile *profile)
 						>> log_mtts_per_seg)));
 		/* set the actual value, so it will be reflected to the user
 		   using the sysfs */
-		mod_param_profile.num_mtt = ilog2(profile->num_mtt * (1 << log_mtts_per_seg));
+		mod_param_profile.num_mtt_segs = ilog2(profile->num_mtt_segs);
 	}
 }
 
@@ -406,14 +722,26 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 				 MLX4_PORT_TYPE_IB)
 				dev->caps.port_type[i] = MLX4_PORT_TYPE_IB;
 			else {
-				/* if IB and ETH are supported, we set the port
+				/*
+				 * if IB and ETH are supported, we set the port
 				 * type according to user selection of port type;
-				 * if user selected none, take the FW hint */
-				if (port_type_array[i - 1] == MLX4_PORT_TYPE_NONE)
+				 * if there is no user selection, take the FW hint
+				 */
+				int pta;
+				mlx4_get_val(port_type_array.dbdf2val.tbl,
+					     pci_physfn(dev->pdev), i - 1,
+					     &pta);
+				if (pta == MLX4_PORT_TYPE_NONE) {
 					dev->caps.port_type[i] = dev->caps.suggested_type[i] ?
 						MLX4_PORT_TYPE_ETH : MLX4_PORT_TYPE_IB;
-				else
-					dev->caps.port_type[i] = port_type_array[i - 1];
+				} else if (pta == MLX4_PORT_TYPE_NA) {
+					mlx4_err(dev, "Port %d is valid port. "
+						 "It is not allowed to configure its type to N/A(%d)\n",
+						 i, MLX4_PORT_TYPE_NA);
+					return -EINVAL;
+				} else {
+					dev->caps.port_type[i] = pta;
+				}
 			}
 		}
 		/*
@@ -427,6 +755,9 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 			 (dev->caps.flags & MLX4_DEV_CAP_FLAG_DPDP) &&
 			 (dev->caps.flags & MLX4_DEV_CAP_FLAG_SENSE_SUPPORT));
 
+		/* Disablling auto sense for default Eth ports support */
+		mlx4_priv(dev)->sense.sense_allowed[i] = 0;
+
 		/*
 		 * If "default_sense" bit is set, we move the port to "AUTO" mode
 		 * and perform sense_port FW command to try and set the correct
@@ -478,9 +809,12 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 		dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_EXCH];
 
 	dev->caps.sync_qp = dev_cap->sync_qp;
+	if (dev->pdev->device == 0x1003)
+		dev->caps.cq_flags |= MLX4_DEV_CAP_CQ_FLAG_IO;
+
 	dev->caps.sqp_demux = (mlx4_is_master(dev)) ? MLX4_MAX_NUM_SLAVES : 0;
 
-	if (!mlx4_enable_64b_cqe_eqe) {
+	if (!mlx4_enable_64b_cqe_eqe && !mlx4_is_slave(dev)) {
 		if (dev_cap->flags &
 		    (MLX4_DEV_CAP_FLAG_64B_CQE | MLX4_DEV_CAP_FLAG_64B_EQE)) {
 			mlx4_warn(dev, "64B EQEs/CQEs supported by the device but not enabled\n");
@@ -494,6 +828,11 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 	    mlx4_is_master(dev))
 		dev->caps.function_caps |= MLX4_FUNC_CAP_64B_EQE_CQE;
 
+	if (!mlx4_is_slave(dev)) {
+		for (i = 0; i < dev->caps.num_ports; ++i)
+			dev->caps.def_counter_index[i] = i << 1;
+	}
+
 	return 0;
 }
 /*The function checks if there are live vf, return the num of them*/
@@ -634,6 +973,11 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
 	if (err)
 		mlx4_err(dev, "QUERY_FW command failed: could not get FW version.\n");
 
+	if (!hca_param.mw_enable) {
+		dev->caps.flags      &= ~MLX4_DEV_CAP_FLAG_MEM_WINDOW;
+		dev->caps.bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN;
+	}
+
 	page_size = ~dev->caps.page_size_cap + 1;
 	mlx4_warn(dev, "HCA minimum page size:%d\n", page_size);
 	if (page_size > PAGE_SIZE) {
@@ -711,6 +1055,8 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
 		dev->caps.qp0_proxy[i - 1] = func_cap.qp0_proxy_qpn;
 		dev->caps.qp1_tunnel[i - 1] = func_cap.qp1_tunnel_qpn;
 		dev->caps.qp1_proxy[i - 1] = func_cap.qp1_proxy_qpn;
+		dev->caps.def_counter_index[i - 1] = func_cap.def_counter_index;
+
 		dev->caps.port_mask[i] = dev->caps.port_type[i];
 		err = mlx4_get_slave_pkey_gid_tbl_len(dev, i,
 						      &dev->caps.gid_table_len[i],
@@ -745,6 +1091,9 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
 		dev->caps.cqe_size   = 32;
 	}
 
+	dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+	mlx4_warn(dev, "Timestamping is not supported in slave mode.\n");
+
 	slave_adjust_steering_mode(dev, &dev_cap, &hca_param);
 
 	return 0;
@@ -760,6 +1109,27 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
 	return err;
 }
 
+static void mlx4_request_modules(struct mlx4_dev *dev)
+{
+	int port;
+	int has_ib_port = false;
+	int has_eth_port = false;
+#define EN_DRV_NAME	"mlx4_en"
+#define IB_DRV_NAME	"mlx4_ib"
+
+	for (port = 1; port <= dev->caps.num_ports; port++) {
+		if (dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)
+			has_ib_port = true;
+		else if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
+			has_eth_port = true;
+	}
+
+	if (has_ib_port)
+		request_module_nowait(IB_DRV_NAME);
+	if (has_eth_port)
+		request_module_nowait(EN_DRV_NAME);
+}
+
 /*
  * Change the port configuration of the device.
  * Every user of this function must hold the port mutex.
@@ -791,6 +1161,11 @@ int mlx4_change_port_types(struct mlx4_dev *dev,
 		}
 		mlx4_set_port_mask(dev);
 		err = mlx4_register_device(dev);
+		if (err) {
+			mlx4_err(dev, "Failed to register device\n");
+			goto out;
+		}
+		mlx4_request_modules(dev);
 	}
 
 out:
@@ -841,7 +1216,14 @@ static ssize_t set_port_type(struct device *dev,
 		return -EINVAL;
 	}
 
-        mlx4_stop_sense(mdev);
+	if ((info->tmp_type & mdev->caps.supported_type[info->port]) !=
+	    info->tmp_type) {
+		mlx4_err(mdev, "Requested port type for port %d is not supported on this HCA\n",
+			 info->port);
+		return -EINVAL;
+	}
+
+	mlx4_stop_sense(mdev);
 	mutex_lock(&priv->port_mutex);
 	/* Possible type is always the one that was delivered */
 	mdev->caps.possible_type[info->port] = info->tmp_type;
@@ -984,7 +1366,7 @@ static ssize_t set_port_ib_mtu(struct device *dev,
 static int mlx4_load_fw(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	int err;
+	int err, unmap_flag = 0;
 
 	priv->fw.fw_icm = mlx4_alloc_icm(dev, priv->fw.fw_pages,
 					 GFP_HIGHUSER | __GFP_NOWARN, 0);
@@ -1008,10 +1390,13 @@ static int mlx4_load_fw(struct mlx4_dev *dev)
 	return 0;
 
 err_unmap_fa:
-	mlx4_UNMAP_FA(dev);
+	unmap_flag = mlx4_UNMAP_FA(dev);
+	if (unmap_flag)
+		pr_warn("mlx4_core: mlx4_UNMAP_FA failed.\n");
 
 err_free:
-	mlx4_free_icm(dev, priv->fw.fw_icm, 0);
+	if (!unmap_flag)
+		mlx4_free_icm(dev, priv->fw.fw_icm, 0);
 	return err;
 }
 
@@ -1081,7 +1466,7 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	u64 aux_pages;
 	int num_eqs;
-	int err;
+	int err, unmap_flag = 0;
 
 	err = mlx4_SET_ICM_SIZE(dev, icm_size, &aux_pages);
 	if (err) {
@@ -1272,10 +1657,13 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,
 	mlx4_cleanup_icm_table(dev, &priv->qp_table.cmpt_table);
 
 err_unmap_aux:
-	mlx4_UNMAP_ICM_AUX(dev);
+	unmap_flag = mlx4_UNMAP_ICM_AUX(dev);
+	if (unmap_flag)
+		pr_warn("mlx4_core: mlx4_UNMAP_ICM_AUX failed.\n");
 
 err_free_aux:
-	mlx4_free_icm(dev, priv->fw.aux_icm, 0);
+	if (!unmap_flag)
+		mlx4_free_icm(dev, priv->fw.aux_icm, 0);
 
 	return err;
 }
@@ -1299,8 +1687,10 @@ static void mlx4_free_icms(struct mlx4_dev *dev)
 	mlx4_cleanup_icm_table(dev, &priv->srq_table.cmpt_table);
 	mlx4_cleanup_icm_table(dev, &priv->qp_table.cmpt_table);
 
-	mlx4_UNMAP_ICM_AUX(dev);
-	mlx4_free_icm(dev, priv->fw.aux_icm, 0);
+	if (!mlx4_UNMAP_ICM_AUX(dev))
+		mlx4_free_icm(dev, priv->fw.aux_icm, 0);
+	else
+		pr_warn("mlx4_core: mlx4_UNMAP_ICM_AUX failed.\n");
 }
 
 static void mlx4_slave_exit(struct mlx4_dev *dev)
@@ -1340,13 +1730,16 @@ static void unmap_bf_area(struct mlx4_dev *dev)
 		io_mapping_free(mlx4_priv(dev)->bf_mapping);
 }
 
-cycle_t mlx4_read_clock(struct mlx4_dev *dev)
+int mlx4_read_clock(struct mlx4_dev *dev)
 {
 	u32 clockhi, clocklo, clockhi1;
 	cycle_t cycles;
 	int i;
 	struct mlx4_priv *priv = mlx4_priv(dev);
 
+	if (!priv->clock_mapping)
+		return -ENOTSUPP;
+
 	for (i = 0; i < 10; i++) {
 		clockhi = swab32(readl(priv->clock_mapping));
 		clocklo = swab32(readl(priv->clock_mapping + 4));
@@ -1376,6 +1769,25 @@ static int map_internal_clock(struct mlx4_dev *dev)
 	return 0;
 }
 
+
+int mlx4_get_internal_clock_params(struct mlx4_dev *dev,
+				   struct mlx4_clock_params *params)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+
+	if (mlx4_is_slave(dev))
+		return -ENOTSUPP;
+	if (!params)
+		return -EINVAL;
+
+	params->bar = priv->fw.clock_bar;
+	params->offset = priv->fw.clock_offset;
+	params->size = MLX4_CLOCK_SIZE;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_internal_clock_params);
+
 static void unmap_internal_clock(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -1388,13 +1800,16 @@ static void mlx4_close_hca(struct mlx4_dev *dev)
 {
 	unmap_internal_clock(dev);
 	unmap_bf_area(dev);
-	if (mlx4_is_slave(dev))
+	if (mlx4_is_slave(dev)) {
 		mlx4_slave_exit(dev);
-	else {
+	} else {
 		mlx4_CLOSE_HCA(dev, 0);
 		mlx4_free_icms(dev);
-		mlx4_UNMAP_FA(dev);
-		mlx4_free_icm(dev, mlx4_priv(dev)->fw.fw_icm, 0);
+
+		if (!mlx4_UNMAP_FA(dev))
+			 mlx4_free_icm(dev, mlx4_priv(dev)->fw.fw_icm, 0);
+		else
+			pr_warn("mlx4_core: mlx4_UNMAP_FA failed.\n");
 	}
 }
 
@@ -1497,13 +1912,9 @@ static int choose_log_fs_mgm_entry_size(int qp_per_entry)
 static void choose_steering_mode(struct mlx4_dev *dev,
 				 struct mlx4_dev_cap *dev_cap)
 {
-        // This is only valid to the integrated driver.
-        // The new ported mlx4_core driver is in B0 steering mode by default
-        // and the old mlx4_en driver is in A0 steering mode by default.
-        // If high_rate_steer == TRUE it means that A0 steering mode is on.
-        // The integration fix is to hard code high_rate_steer to TRUE.
-        high_rate_steer = 1;
+	int nvfs;
 
+	mlx4_get_val(num_vfs.dbdf2val.tbl, pci_physfn(dev->pdev), 0, &nvfs);
 	if (high_rate_steer && !mlx4_is_mfunc(dev)) {
 		dev->caps.flags &= ~(MLX4_DEV_CAP_FLAG_VEP_MC_STEER |
 				     MLX4_DEV_CAP_FLAG_VEP_UC_STEER);
@@ -1512,9 +1923,8 @@ static void choose_steering_mode(struct mlx4_dev *dev,
 
 	if (mlx4_log_num_mgm_entry_size == -1 &&
 	    dev_cap->flags2 & MLX4_DEV_CAP_FLAG2_FS_EN &&
-	    dev_cap->fs_log_max_ucast_qp_range_size == 0 &&
 	    (!mlx4_is_mfunc(dev) ||
-	     (dev_cap->fs_max_num_qp_per_entry >= (num_vfs + 1))) &&
+	     (dev_cap->fs_max_num_qp_per_entry >= (nvfs + 1))) &&
 	    choose_log_fs_mgm_entry_size(dev_cap->fs_max_num_qp_per_entry) >=
 		MLX4_MIN_MGM_LOG_ENTRY_SIZE) {
 		dev->oper_log_mgm_entry_size =
@@ -1523,9 +1933,8 @@ static void choose_steering_mode(struct mlx4_dev *dev,
 		dev->caps.num_qp_per_mgm = dev_cap->fs_max_num_qp_per_entry;
 	} else {
 		if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER &&
-		    dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) {
+		    dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER)
 			dev->caps.steering_mode = MLX4_STEERING_MODE_B0;
-                }
 		else {
 			dev->caps.steering_mode = MLX4_STEERING_MODE_A0;
 
@@ -1618,11 +2027,42 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 		if (err)
 			goto err_stop_fw;
 
+		init_hca.mw_enable = 1;
+
 		err = mlx4_INIT_HCA(dev, &init_hca);
 		if (err) {
 			mlx4_err(dev, "INIT_HCA command failed, aborting.\n");
 			goto err_free_icm;
 		}
+
+		/*
+		 * Read HCA frequency by QUERY_HCA command
+		 */
+		if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) {
+			memset(&init_hca, 0, sizeof(init_hca));
+			err = mlx4_QUERY_HCA(dev, &init_hca);
+			if (err) {
+				mlx4_err(dev, "QUERY_HCA command failed, disable timestamp.\n");
+				dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+			} else {
+				dev->caps.hca_core_clock =
+					init_hca.hca_core_clock;
+			}
+
+			/* In case we got HCA frequency 0 - disable timestamping
+			 * to avoid dividing by zero
+			 */
+			if (!dev->caps.hca_core_clock) {
+				dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+				mlx4_err(dev, "HCA frequency is 0. Timestamping is not supported.");
+			} else if (map_internal_clock(dev)) {
+				/* Map internal clock,
+				 * in case of failure disable timestamping
+				 */
+				dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_TS;
+				mlx4_err(dev, "Failed to map internal clock. Timestamping is not supported.\n");
+			}
+		}
 	} else {
 		err = mlx4_init_slave(dev);
 		if (err) {
@@ -1640,39 +2080,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 	if (map_bf_area(dev))
 		mlx4_dbg(dev, "Failed to map blue flame area\n");
 
-	/*
-	 * Read HCA frequency by QUERY_HCA command
-	 */
-	if (dev->caps.cq_timestamp) {
-		memset(&init_hca, 0, sizeof(init_hca));
-		err = mlx4_QUERY_HCA(dev, &init_hca);
-		if (err) {
-			mlx4_err(dev, "QUERY_HCA command failed, disable timestamp.\n");
-			dev->caps.cq_timestamp = 0;
-		} else
-			dev->caps.hca_core_clock = init_hca.hca_core_clock;
-
-		/*
-		 * In case we got HCA frequency 0 - disable timestamping
-		 * to avoid dividing by zero
-		 */
-		if (!dev->caps.hca_core_clock) {
-			dev->caps.cq_timestamp = 0;
-			mlx4_err(dev, "HCA frequency is 0. "
-				 "Timestamping is not supported.");
-		}
-
-		/*
-		 * Map internal clock, in case of failure disable timestamping
-		 */
-		if (map_internal_clock(dev)) {
-			dev->caps.cq_timestamp = 0;
-			mlx4_err(dev, "Failed to map internal clock. "
-				 "Timestamping is not supported.\n");
-		}
-	}
-
-	/*Only the master set the ports, all the rest got it from it.*/
+	/* Only the master set the ports, all the rest got it from it.*/
 	if (!mlx4_is_slave(dev))
 		mlx4_set_port_mask(dev);
 
@@ -1684,6 +2092,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 
 	priv->eq_table.inta_pin = adapter.inta_pin;
 	memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);
+	memcpy(dev->vsd, adapter.vsd, sizeof(dev->vsd));
+	dev->vsd_vendor_id = adapter.vsd_vendor_id;
 
 	if (!mlx4_is_slave(dev))
 		kfree(dev_cap);
@@ -1691,7 +2101,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 	return 0;
 
 unmap_bf:
-	unmap_internal_clock(dev);
+	if (!mlx4_is_slave(dev))
+		unmap_internal_clock(dev);
 	unmap_bf_area(dev);
 
 	if (mlx4_is_slave(dev)) {
@@ -1713,10 +2124,11 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 
 err_stop_fw:
 	if (!mlx4_is_slave(dev)) {
-		mlx4_UNMAP_FA(dev);
-		mlx4_free_icm(dev, priv->fw.fw_icm, 0);
-		if (dev_cap)
-			kfree(dev_cap);
+		if (!mlx4_UNMAP_FA(dev))
+			mlx4_free_icm(dev, priv->fw.fw_icm, 0);
+		else
+			pr_warn("mlx4_core: mlx4_UNMAP_FA failed.\n");
+		kfree(dev_cap);
 	}
 	return err;
 }
@@ -1724,92 +2136,539 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 static int mlx4_init_counters_table(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	int res;
-	int nent_pow2;
+	int nent_pow2, port_indx, vf_index, num_counters;
+	int res, index = 0;
+	struct counter_index *new_counter_index;
+
 
 	if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
 		return -ENOENT;
 
-	nent_pow2 = roundup_pow_of_two(dev->caps.max_counters);
-	res = mlx4_bitmap_init(&priv->counters_bitmap, nent_pow2,
-				nent_pow2 - 1, 0,
-				nent_pow2 - dev->caps.max_counters);
-	if (res)
-		return res;
+	if (!mlx4_is_slave(dev) &&
+	    dev->caps.max_counters == dev->caps.max_extended_counters) {
+		res = mlx4_cmd(dev, MLX4_IF_STATE_EXTENDED, 0, 0,
+			       MLX4_CMD_SET_IF_STAT,
+			       MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
+		if (res) {
+			mlx4_err(dev, "Failed to set extended counters (err=%d)\n", res);
+			return res;
+		}
+	}
 
-	if (dev->caps.max_counters == dev->caps.max_basic_counters)
+	mutex_init(&priv->counters_table.mutex);
+
+	if (mlx4_is_slave(dev)) {
+		for (port_indx = 0; port_indx < dev->caps.num_ports; port_indx++) {
+			INIT_LIST_HEAD(&priv->counters_table.global_port_list[port_indx]);
+			if (dev->caps.def_counter_index[port_indx] != 0xFF) {
+				new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+				if (!new_counter_index)
+					return -ENOMEM;
+				new_counter_index->index = dev->caps.def_counter_index[port_indx];
+				list_add_tail(&new_counter_index->list, &priv->counters_table.global_port_list[port_indx]);
+			}
+		}
+		mlx4_dbg(dev, "%s: slave allocated %d counters for %d ports\n",
+			 __func__, dev->caps.num_ports, dev->caps.num_ports);
 		return 0;
+	}
 
-	res = mlx4_cmd(dev, MLX4_IF_STATE_EXTENDED, 0, 0,
-		MLX4_CMD_SET_IF_STAT, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
+	nent_pow2 = roundup_pow_of_two(dev->caps.max_counters);
 
-	if (res)
-		mlx4_err(dev, "Failed to set extended counters (err=%d)\n",
-				res);
-	return res;
+	for (port_indx = 0; port_indx < dev->caps.num_ports; port_indx++) {
+		INIT_LIST_HEAD(&priv->counters_table.global_port_list[port_indx]);
+		/* allocating 2 counters per port for PFs */
+                /* For the PF, the ETH default counters are 0,2; */
+		/* and the RoCE default counters are 1,3 */
+		for (num_counters = 0; num_counters < 2; num_counters++, index++) {
+			new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+			if (!new_counter_index)
+				return -ENOMEM;
+			new_counter_index->index = index;
+			list_add_tail(&new_counter_index->list,
+				      &priv->counters_table.global_port_list[port_indx]);
+		}
+	}
+
+	if (mlx4_is_master(dev)) {
+		for (vf_index = 0; vf_index < dev->num_vfs; vf_index++) {
+			for (port_indx = 0; port_indx < dev->caps.num_ports; port_indx++) {
+				INIT_LIST_HEAD(&priv->counters_table.vf_list[vf_index][port_indx]);
+				new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+				if (!new_counter_index)
+					return -ENOMEM;
+				if (index <  nent_pow2 - 2) {
+					new_counter_index->index = index;
+					index++;
+				} else {
+					new_counter_index->index = MLX4_SINK_COUNTER_INDEX;
+				}
+
+				list_add_tail(&new_counter_index->list,
+					      &priv->counters_table.vf_list[vf_index][port_indx]);
+			}
+		}
+
+		res = mlx4_bitmap_init(&priv->counters_table.bitmap,
+				       nent_pow2, nent_pow2 - 1,
+				       index, 1);
+		mlx4_dbg(dev, "%s: master allocated %d counters for %d VFs\n",
+			 __func__, index, dev->num_vfs);
+	} else {
+		res = mlx4_bitmap_init(&priv->counters_table.bitmap,
+				nent_pow2, nent_pow2 - 1,
+				index, 1);
+		mlx4_dbg(dev, "%s: native allocated %d counters for %d ports\n",
+			 __func__, index, dev->caps.num_ports);
+	}
+
+	return 0;
 
 }
 
 static void mlx4_cleanup_counters_table(struct mlx4_dev *dev)
 {
-	if (!mlx4_is_slave(dev) &&
-		(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
-		mlx4_bitmap_cleanup(&mlx4_priv(dev)->counters_bitmap);
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	int i, j;
+	struct counter_index *port, *tmp_port;
+	struct counter_index *vf, *tmp_vf;
+
+	mutex_lock(&priv->counters_table.mutex);
+
+	if (dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS) {
+		for (i = 0; i < dev->caps.num_ports; i++) {
+			list_for_each_entry_safe(port, tmp_port,
+						 &priv->counters_table.global_port_list[i],
+						 list) {
+				list_del(&port->list);
+				kfree(port);
+			}
+		}
+		if (!mlx4_is_slave(dev)) {
+			for (i = 0; i < dev->num_vfs; i++) {
+				for (j = 0; j < dev->caps.num_ports; j++) {
+					list_for_each_entry_safe(vf, tmp_vf,
+								 &priv->counters_table.vf_list[i][j],
+								 list) {
+						/* clear the counter statistic */
+						if (__mlx4_clear_if_stat(dev, vf->index))
+							mlx4_dbg(dev, "%s: reset counter %d failed\n",
+								 __func__, vf->index);
+						list_del(&vf->list);
+						kfree(vf);
+					}
+				}
+			}
+			mlx4_bitmap_cleanup(&priv->counters_table.bitmap);
+		}
+	}
+	mutex_unlock(&priv->counters_table.mutex);
 }
 
-int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
+int __mlx4_slave_counters_free(struct mlx4_dev *dev, int slave)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
+	int i, first;
+	struct counter_index *vf, *tmp_vf;
 
-	if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
-		return -ENOENT;
+	/* clean VF's counters for the next useg */
+	if (slave > 0 && slave <= dev->num_vfs) {
+		mlx4_dbg(dev, "%s: free counters of slave(%d)\n"
+			 , __func__, slave);
 
-	*idx = mlx4_bitmap_alloc(&priv->counters_bitmap);
-	if (*idx == -1)
-		return -ENOMEM;
+		mutex_lock(&priv->counters_table.mutex);
+		for (i = 0; i < dev->caps.num_ports; i++) {
+			first = 0;
+			list_for_each_entry_safe(vf, tmp_vf,
+						 &priv->counters_table.vf_list[slave - 1][i],
+						 list) {
+				/* clear the counter statistic */
+				if (__mlx4_clear_if_stat(dev, vf->index))
+					mlx4_dbg(dev, "%s: reset counter %d failed\n",
+						 __func__, vf->index);
+				if (first++ && vf->index != MLX4_SINK_COUNTER_INDEX) {
+					mlx4_dbg(dev, "%s: delete counter index %d for slave %d and port %d\n"
+						 , __func__, vf->index, slave, i + 1);
+					mlx4_bitmap_free(&priv->counters_table.bitmap, vf->index, MLX4_USE_RR);
+					list_del(&vf->list);
+					kfree(vf);
+				} else {
+					mlx4_dbg(dev, "%s: can't delete default counter index %d for slave %d and port %d\n"
+						 , __func__, vf->index, slave, i + 1);
+				}
+			}
+		}
+		mutex_unlock(&priv->counters_table.mutex);
+	}
 
 	return 0;
 }
 
-int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx)
+int __mlx4_counter_alloc(struct mlx4_dev *dev, int slave, int port, u32 *idx)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *new_counter_index;
+
+	if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_COUNTERS))
+		return -ENOENT;
+
+	if ((slave > MLX4_MAX_NUM_VF) || (slave < 0) ||
+	    (port < 0) || (port > MLX4_MAX_PORTS)) {
+		mlx4_dbg(dev, "%s: invalid slave(%d) or port(%d) index\n",
+			 __func__, slave, port);
+		return -EINVAL;
+	}
+
+	/* handle old guest request does not support request by port index */
+	if (port == 0) {
+		*idx = MLX4_SINK_COUNTER_INDEX;
+		mlx4_dbg(dev, "%s: allocated default counter index %d for slave %d port %d\n"
+			 , __func__, *idx, slave, port);
+		return 0;
+	}
+
+	mutex_lock(&priv->counters_table.mutex);
+
+	*idx = mlx4_bitmap_alloc(&priv->counters_table.bitmap);
+	/* if no resources return the default counter of the slave and port */
+	if (*idx == -1) {
+		if (slave == 0) { /* its the ethernet counter ?????? */
+			new_counter_index = list_entry(priv->counters_table.global_port_list[port - 1].next,
+						       struct counter_index,
+						       list);
+		} else {
+			new_counter_index = list_entry(priv->counters_table.vf_list[slave - 1][port - 1].next,
+						       struct counter_index,
+						       list);
+		}
+
+		*idx = new_counter_index->index;
+		mlx4_dbg(dev, "%s: allocated defualt counter index %d for slave %d port %d\n"
+			 , __func__, *idx, slave, port);
+		goto out;
+	}
+
+	if (slave == 0) { /* native or master */
+		new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+		if (!new_counter_index)
+			goto no_mem;
+		new_counter_index->index = *idx;
+		list_add_tail(&new_counter_index->list, &priv->counters_table.global_port_list[port - 1]);
+	} else {
+		new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+		if (!new_counter_index)
+			goto no_mem;
+		new_counter_index->index = *idx;
+		list_add_tail(&new_counter_index->list, &priv->counters_table.vf_list[slave - 1][port - 1]);
+	}
+
+	mlx4_dbg(dev, "%s: allocated counter index %d for slave %d port %d\n"
+		 , __func__, *idx, slave, port);
+out:
+	mutex_unlock(&priv->counters_table.mutex);
+	return 0;
+
+no_mem:
+	mlx4_bitmap_free(&priv->counters_table.bitmap, *idx, MLX4_USE_RR);
+	mutex_unlock(&priv->counters_table.mutex);
+	*idx = MLX4_SINK_COUNTER_INDEX;
+	mlx4_dbg(dev, "%s: failed err (%d)\n"
+		 , __func__, -ENOMEM);
+	return -ENOMEM;
+}
+
+int mlx4_counter_alloc(struct mlx4_dev *dev, u8 port, u32 *idx)
 {
 	u64 out_param;
 	int err;
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *new_counter_index, *c_index;
 
 	if (mlx4_is_mfunc(dev)) {
-		err = mlx4_cmd_imm(dev, 0, &out_param, RES_COUNTER,
+		err = mlx4_cmd_imm(dev, 0, &out_param,
+				   ((u32) port) << 8 | (u32) RES_COUNTER,
 				   RES_OP_RESERVE, MLX4_CMD_ALLOC_RES,
 				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
-		if (!err)
+		if (!err) {
 			*idx = get_param_l(&out_param);
+			if (*idx == MLX4_SINK_COUNTER_INDEX)
+				return -ENOSPC;
 
+			mutex_lock(&priv->counters_table.mutex);
+			c_index = list_entry(priv->counters_table.global_port_list[port - 1].next,
+					     struct counter_index,
+					     list);
+			mutex_unlock(&priv->counters_table.mutex);
+			if (c_index->index == *idx)
+				return -EEXIST;
+
+			if (mlx4_is_slave(dev)) {
+				new_counter_index = kmalloc(sizeof(struct counter_index), GFP_KERNEL);
+				if (!new_counter_index) {
+					mlx4_counter_free(dev, port, *idx);
+					return -ENOMEM;
+				}
+				new_counter_index->index = *idx;
+				mutex_lock(&priv->counters_table.mutex);
+				list_add_tail(&new_counter_index->list, &priv->counters_table.global_port_list[port - 1]);
+				mutex_unlock(&priv->counters_table.mutex);
+				mlx4_dbg(dev, "%s: allocated counter index %d for port %d\n"
+					 , __func__, *idx, port);
+			}
+		}
 		return err;
 	}
-	return __mlx4_counter_alloc(dev, idx);
+	return __mlx4_counter_alloc(dev, 0, port, idx);
 }
 EXPORT_SYMBOL_GPL(mlx4_counter_alloc);
 
-void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
+void __mlx4_counter_free(struct mlx4_dev *dev, int slave, int port, u32 idx)
 {
-	mlx4_bitmap_free(&mlx4_priv(dev)->counters_bitmap, idx);
-	return;
+	/* check if native or slave and deletes acordingly */
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *pf, *tmp_pf;
+	struct counter_index *vf, *tmp_vf;
+	int first;
+
+
+	if (idx == MLX4_SINK_COUNTER_INDEX) {
+		mlx4_dbg(dev, "%s: try to delete default counter index %d for port %d\n"
+			 , __func__, idx, port);
+			return;
+	}
+
+	if ((slave > MLX4_MAX_NUM_VF) || (slave < 0) ||
+	    (port < 0) || (port > MLX4_MAX_PORTS)) {
+		mlx4_warn(dev, "%s: deletion failed due to invalid slave(%d) or port(%d) index\n"
+			 , __func__, slave, idx);
+			return;
+	}
+
+	mutex_lock(&priv->counters_table.mutex);
+	if (slave == 0) {
+		first = 0;
+		list_for_each_entry_safe(pf, tmp_pf,
+					 &priv->counters_table.global_port_list[port - 1],
+					 list) {
+			/* the first 2 counters are reserved */
+			if (pf->index == idx) {
+				/* clear the counter statistic */
+				if (__mlx4_clear_if_stat(dev, pf->index))
+					mlx4_dbg(dev, "%s: reset counter %d failed\n",
+						 __func__, pf->index);
+				if (1 < first && idx != MLX4_SINK_COUNTER_INDEX) {
+					list_del(&pf->list);
+					kfree(pf);
+					mlx4_dbg(dev, "%s: delete counter index %d for native device (%d) port %d\n"
+						 , __func__, idx, slave, port);
+					mlx4_bitmap_free(&priv->counters_table.bitmap, idx, MLX4_USE_RR);
+					goto out;
+				} else {
+					mlx4_dbg(dev, "%s: can't delete default counter index %d for native device (%d) port %d\n"
+						 , __func__, idx, slave, port);
+					goto out;
+				}
+			}
+			first++;
+		}
+		mlx4_dbg(dev, "%s: can't delete counter index %d for native device (%d) port %d\n"
+			 , __func__, idx, slave, port);
+	} else {
+		first = 0;
+		list_for_each_entry_safe(vf, tmp_vf,
+					 &priv->counters_table.vf_list[slave - 1][port - 1],
+					 list) {
+			/* the first element is reserved */
+			if (vf->index == idx) {
+				/* clear the counter statistic */
+				if (__mlx4_clear_if_stat(dev, vf->index))
+					mlx4_dbg(dev, "%s: reset counter %d failed\n",
+						 __func__, vf->index);
+				if (first) {
+					list_del(&vf->list);
+					kfree(vf);
+					mlx4_dbg(dev, "%s: delete counter index %d for slave %d port %d\n",
+						 __func__, idx, slave, port);
+					mlx4_bitmap_free(&priv->counters_table.bitmap, idx, MLX4_USE_RR);
+					goto out;
+				} else {
+					mlx4_dbg(dev, "%s: can't delete default slave (%d) counter index %d for port %d\n"
+						 , __func__, slave, idx, port);
+					goto out;
+				}
+			}
+			first++;
+		}
+		mlx4_dbg(dev, "%s: can't delete slave (%d) counter index %d for port %d\n"
+			 , __func__, slave, idx, port);
+	}
+
+out:
+	mutex_unlock(&priv->counters_table.mutex);
 }
 
-void mlx4_counter_free(struct mlx4_dev *dev, u32 idx)
+void mlx4_counter_free(struct mlx4_dev *dev, u8 port, u32 idx)
 {
 	u64 in_param = 0;
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *counter, *tmp_counter;
+	int first = 0;
 
 	if (mlx4_is_mfunc(dev)) {
 		set_param_l(&in_param, idx);
-		mlx4_cmd(dev, in_param, RES_COUNTER, RES_OP_RESERVE,
+		mlx4_cmd(dev, in_param,
+			 ((u32) port) << 8 | (u32) RES_COUNTER,
+			 RES_OP_RESERVE,
 			 MLX4_CMD_FREE_RES, MLX4_CMD_TIME_CLASS_A,
 			 MLX4_CMD_WRAPPED);
+
+		if (mlx4_is_slave(dev) && idx != MLX4_SINK_COUNTER_INDEX) {
+			mutex_lock(&priv->counters_table.mutex);
+			list_for_each_entry_safe(counter, tmp_counter,
+						 &priv->counters_table.global_port_list[port - 1],
+						 list) {
+				if (counter->index == idx && first++) {
+					list_del(&counter->list);
+					kfree(counter);
+					mlx4_dbg(dev, "%s: delete counter index %d for port %d\n"
+						 , __func__, idx, port);
+					mutex_unlock(&priv->counters_table.mutex);
+					return;
+				}
+			}
+			mutex_unlock(&priv->counters_table.mutex);
+		}
+
 		return;
 	}
-	__mlx4_counter_free(dev, idx);
+	__mlx4_counter_free(dev, 0, port, idx);
 }
 EXPORT_SYMBOL_GPL(mlx4_counter_free);
 
+int __mlx4_clear_if_stat(struct mlx4_dev *dev,
+			 u8 counter_index)
+{
+	struct mlx4_cmd_mailbox *if_stat_mailbox = NULL;
+	int err = 0;
+	u32 if_stat_in_mod = (counter_index & 0xff) | (1 << 31);
+
+	if (counter_index == MLX4_SINK_COUNTER_INDEX)
+		return -EINVAL;
+
+	if (mlx4_is_slave(dev))
+		return 0;
+
+	if_stat_mailbox = mlx4_alloc_cmd_mailbox(dev);
+	if (IS_ERR(if_stat_mailbox)) {
+		err = PTR_ERR(if_stat_mailbox);
+		return err;
+	}
+
+	err = mlx4_cmd_box(dev, 0, if_stat_mailbox->dma, if_stat_in_mod, 0,
+			   MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C,
+			   MLX4_CMD_NATIVE);
+
+	mlx4_free_cmd_mailbox(dev, if_stat_mailbox);
+	return err;
+}
+
+u8 mlx4_get_default_counter_index(struct mlx4_dev *dev, int slave, int port)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *new_counter_index;
+
+	if (dev->caps.port_type[port] == MLX4_PORT_TYPE_IB) {
+		mlx4_dbg(dev, "%s: return counter index %d for slave %d port (MLX4_PORT_TYPE_IB) %d\n",
+			 __func__, MLX4_SINK_COUNTER_INDEX, slave, port);
+		return (u8)MLX4_SINK_COUNTER_INDEX;
+	}
+
+	mutex_lock(&priv->counters_table.mutex);
+	if (slave == 0) {
+		new_counter_index = list_entry(priv->counters_table.global_port_list[port - 1].next,
+					       struct counter_index,
+					       list);
+	} else {
+		new_counter_index = list_entry(priv->counters_table.vf_list[slave - 1][port - 1].next,
+					       struct counter_index,
+					       list);
+	}
+	mutex_unlock(&priv->counters_table.mutex);
+
+	mlx4_dbg(dev, "%s: return counter index %d for slave %d port %d\n",
+		 __func__, new_counter_index->index, slave, port);
+
+
+	return (u8)new_counter_index->index;
+}
+
+int mlx4_get_vport_ethtool_stats(struct mlx4_dev *dev, int port,
+			 struct mlx4_en_vport_stats *vport_stats,
+			 int reset)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct mlx4_cmd_mailbox *if_stat_mailbox = NULL;
+	union  mlx4_counter *counter;
+	int err = 0;
+	u32 if_stat_in_mod;
+	struct counter_index *vport, *tmp_vport;
+
+	if (!vport_stats)
+		return -EINVAL;
+
+	if_stat_mailbox = mlx4_alloc_cmd_mailbox(dev);
+	if (IS_ERR(if_stat_mailbox)) {
+		err = PTR_ERR(if_stat_mailbox);
+		return err;
+	}
+
+	mutex_lock(&priv->counters_table.mutex);
+	list_for_each_entry_safe(vport, tmp_vport,
+				 &priv->counters_table.global_port_list[port - 1],
+				 list) {
+		if (vport->index == MLX4_SINK_COUNTER_INDEX)
+			continue;
+
+		memset(if_stat_mailbox->buf, 0, sizeof(union  mlx4_counter));
+		if_stat_in_mod = (vport->index & 0xff) | ((reset & 1) << 31);
+		err = mlx4_cmd_box(dev, 0, if_stat_mailbox->dma,
+				   if_stat_in_mod, 0,
+				   MLX4_CMD_QUERY_IF_STAT,
+				   MLX4_CMD_TIME_CLASS_C,
+				   MLX4_CMD_NATIVE);
+		if (err) {
+			mlx4_dbg(dev, "%s: failed to read statistics for counter index %d\n",
+				 __func__, vport->index);
+			goto if_stat_out;
+		}
+		counter = (union mlx4_counter *)if_stat_mailbox->buf;
+		if ((counter->control.cnt_mode & 0xf) == 1) {
+			vport_stats->rx_broadcast_packets += be64_to_cpu(counter->ext.counters[0].IfRxBroadcastFrames);
+			vport_stats->rx_unicast_packets += be64_to_cpu(counter->ext.counters[0].IfRxUnicastFrames);
+			vport_stats->rx_multicast_packets += be64_to_cpu(counter->ext.counters[0].IfRxMulticastFrames);
+			vport_stats->tx_broadcast_packets += be64_to_cpu(counter->ext.counters[0].IfTxBroadcastFrames);
+			vport_stats->tx_unicast_packets += be64_to_cpu(counter->ext.counters[0].IfTxUnicastFrames);
+			vport_stats->tx_multicast_packets += be64_to_cpu(counter->ext.counters[0].IfTxMulticastFrames);
+			vport_stats->rx_broadcast_bytes += be64_to_cpu(counter->ext.counters[0].IfRxBroadcastOctets);
+			vport_stats->rx_unicast_bytes += be64_to_cpu(counter->ext.counters[0].IfRxUnicastOctets);
+			vport_stats->rx_multicast_bytes += be64_to_cpu(counter->ext.counters[0].IfRxMulticastOctets);
+			vport_stats->tx_broadcast_bytes += be64_to_cpu(counter->ext.counters[0].IfTxBroadcastOctets);
+			vport_stats->tx_unicast_bytes += be64_to_cpu(counter->ext.counters[0].IfTxUnicastOctets);
+			vport_stats->tx_multicast_bytes += be64_to_cpu(counter->ext.counters[0].IfTxMulticastOctets);
+			vport_stats->rx_errors += be64_to_cpu(counter->ext.counters[0].IfRxErrorFrames);
+			vport_stats->rx_dropped += be64_to_cpu(counter->ext.counters[0].IfRxNoBufferFrames);
+			vport_stats->tx_errors += be64_to_cpu(counter->ext.counters[0].IfTxDroppedFrames);
+		}
+	}
+
+if_stat_out:
+	mutex_unlock(&priv->counters_table.mutex);
+	mlx4_free_cmd_mailbox(dev, if_stat_mailbox);
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_get_vport_ethtool_stats);
+
 static int mlx4_setup_hca(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -1862,11 +2721,21 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 		goto err_xrcd_table_free;
 	}
 
+	if (!mlx4_is_slave(dev)) {
+		err = mlx4_init_mcg_table(dev);
+		if (err) {
+			mlx4_err(dev, "Failed to initialize "
+				 "multicast group table (err=%d), aborting.\n",
+				 err);
+			goto err_mr_table_free;
+		}
+	}
+
 	err = mlx4_init_eq_table(dev);
 	if (err) {
 		mlx4_err(dev, "Failed to initialize "
 			 "event queue table (err=%d), aborting.\n", err);
-		goto err_mr_table_free;
+		goto err_mcg_table_free;
 	}
 
 	err = mlx4_cmd_use_events(dev);
@@ -1917,22 +2786,14 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 		goto err_srq_table_free;
 	}
 
+	err = mlx4_init_counters_table(dev);
+	if (err && err != -ENOENT) {
+		mlx4_err(dev, "Failed to initialize counters table (err=%d), "
+			 "aborting.\n", err);
+		goto err_qp_table_free;
+	}
+
 	if (!mlx4_is_slave(dev)) {
-		err = mlx4_init_mcg_table(dev);
-		if (err) {
-			mlx4_err(dev, "Failed to initialize "
-				 "multicast group table (err=%d), aborting.\n",
-				 err);
-			goto err_qp_table_free;
-		}
-
-		err = mlx4_init_counters_table(dev);
-		if (err && err != -ENOENT) {
-			mlx4_err(dev, "Failed to initialize counters table (err=%d), "
-				 "aborting.\n", err);
-			goto err_mcg_table_free;
-		}
-
 		for (port = 1; port <= dev->caps.num_ports; port++) {
 			ib_port_default_caps = 0;
 			err = mlx4_get_port_ib_caps(dev, port,
@@ -1954,10 +2815,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 				}
 			}
 
-			if (mlx4_is_mfunc(dev))
-				dev->caps.port_ib_mtu[port] = IB_MTU_2048;
-			else
-				dev->caps.port_ib_mtu[port] = IB_MTU_4096;
+			dev->caps.port_ib_mtu[port] = IB_MTU_4096;
 
 			err = mlx4_SET_PORT(dev, port, mlx4_is_master(dev) ?
 					    dev->caps.pkey_table_len[port] : -1);
@@ -1974,9 +2832,6 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 err_counters_table_free:
 	mlx4_cleanup_counters_table(dev);
 
-err_mcg_table_free:
-	mlx4_cleanup_mcg_table(dev);
-
 err_qp_table_free:
 	mlx4_cleanup_qp_table(dev);
 
@@ -1992,6 +2847,10 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 err_eq_table_free:
 	mlx4_cleanup_eq_table(dev);
 
+err_mcg_table_free:
+	if (!mlx4_is_slave(dev))
+		mlx4_cleanup_mcg_table(dev);
+
 err_mr_table_free:
 	mlx4_cleanup_mr_table(dev);
 
@@ -2026,6 +2885,9 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 		nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
 			     nreq);
 
+		if (msi_x > 1 && !mlx4_is_mfunc(dev))
+			nreq = min_t(int, nreq, msi_x);
+
 		entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
 		if (!entries)
 			goto no_msi;
@@ -2237,6 +3099,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 	struct mlx4_dev *dev;
 	int err;
 	int port;
+	int nvfs, prb_vf;
 
 	pr_info(DRV_NAME ": Initializing %s\n", pci_name(pdev));
 
@@ -2246,13 +3109,16 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 			"aborting.\n");
 		return err;
 	}
-	if (num_vfs > MLX4_MAX_NUM_VF) {
+
+	mlx4_get_val(num_vfs.dbdf2val.tbl, pci_physfn(pdev), 0, &nvfs);
+	mlx4_get_val(probe_vf.dbdf2val.tbl, pci_physfn(pdev), 0, &prb_vf);
+	if (nvfs > MLX4_MAX_NUM_VF) {
 		dev_err(&pdev->dev, "There are more VF's (%d) than allowed(%d)\n",
-			num_vfs, MLX4_MAX_NUM_VF);
+			nvfs, MLX4_MAX_NUM_VF);
 		return -EINVAL;
 	}
 
-	if (num_vfs < 0) {
+	if (nvfs < 0) {
 		dev_err(&pdev->dev, "num_vfs module parameter cannot be negative\n");
 		return -EINVAL;
 	}
@@ -2315,6 +3181,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 
 	dev       = &priv->dev;
 	dev->pdev = pdev;
+	INIT_LIST_HEAD(&priv->dev_list);
 	INIT_LIST_HEAD(&priv->ctx_list);
 	spin_lock_init(&priv->ctx_lock);
 
@@ -2332,7 +3199,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 	if (pci_dev_data & MLX4_PCI_DEV_IS_VF) {
 		/* When acting as pf, we normally skip vfs unless explicitly
 		 * requested to probe them. */
-		if (num_vfs && extended_func_num(pdev) > probe_vf) {
+		if (nvfs && extended_func_num(pdev) > prb_vf) {
 			mlx4_warn(dev, "Skipping virtual function:%d\n",
 						extended_func_num(pdev));
 			err = -ENODEV;
@@ -2356,9 +3223,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 			}
 		}
 
-		if (num_vfs) {
-			mlx4_warn(dev, "Enabling SR-IOV with %d VFs\n", num_vfs);
-			err = pci_enable_sriov(pdev, num_vfs);
+		if (nvfs) {
+			mlx4_warn(dev, "Enabling SR-IOV with %d VFs\n", nvfs);
+			err = pci_enable_sriov(pdev, nvfs);
 			if (err) {
 				mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n",
 					 err);
@@ -2367,7 +3234,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 				mlx4_warn(dev, "Running in master mode\n");
 				dev->flags |= MLX4_FLAG_SRIOV |
 					      MLX4_FLAG_MASTER;
-				dev->num_vfs = num_vfs;
+				dev->num_vfs = nvfs;
 			}
 		}
 
@@ -2481,10 +3348,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 	if (err)
 		goto err_port;
 
-	err = mlx4_sense_init(dev);
-	if (err)
-		goto err_port;
+	mlx4_request_modules(dev);
 
+	mlx4_sense_init(dev);
 	mlx4_start_sense(dev);
 
 	priv->pci_dev_data = pci_dev_data;
@@ -2497,12 +3363,12 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 		mlx4_cleanup_port_info(&priv->port[port]);
 
 	mlx4_cleanup_counters_table(dev);
-	mlx4_cleanup_mcg_table(dev);
 	mlx4_cleanup_qp_table(dev);
 	mlx4_cleanup_srq_table(dev);
 	mlx4_cleanup_cq_table(dev);
 	mlx4_cmd_use_polling(dev);
 	mlx4_cleanup_eq_table(dev);
+	mlx4_cleanup_mcg_table(dev);
 	mlx4_cleanup_mr_table(dev);
 	mlx4_cleanup_xrcd_table(dev);
 	mlx4_cleanup_pd_table(dev);
@@ -2516,8 +3382,10 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
 	mlx4_free_eq_table(dev);
 
 err_master_mfunc:
-	if (mlx4_is_master(dev))
+	if (mlx4_is_master(dev)) {
+		mlx4_free_resource_tracker(dev, RES_TR_FREE_STRUCTS_ONLY);
 		mlx4_multi_func_cleanup(dev);
+	}
 
 	if (mlx4_is_slave(dev)) {
 		kfree(dev->caps.qp0_tunnel);
@@ -2579,7 +3447,7 @@ static void mlx4_remove_one(struct pci_dev *pdev)
 			if (mlx4_how_many_lives_vf(dev))
 				mlx4_err(dev, "Removing PF when there are assigned VF's !!!\n");
 		}
-		mlx4_sense_cleanup(dev);
+		mlx4_stop_sense(dev);
 		mlx4_unregister_device(dev);
 
 		for (p = 1; p <= dev->caps.num_ports; p++) {
@@ -2592,12 +3460,12 @@ static void mlx4_remove_one(struct pci_dev *pdev)
 						   RES_TR_FREE_SLAVES_ONLY);
 
 		mlx4_cleanup_counters_table(dev);
-		mlx4_cleanup_mcg_table(dev);
 		mlx4_cleanup_qp_table(dev);
 		mlx4_cleanup_srq_table(dev);
 		mlx4_cleanup_cq_table(dev);
 		mlx4_cmd_use_polling(dev);
 		mlx4_cleanup_eq_table(dev);
+		mlx4_cleanup_mcg_table(dev);
 		mlx4_cleanup_mr_table(dev);
 		mlx4_cleanup_xrcd_table(dev);
 		mlx4_cleanup_pd_table(dev);
@@ -2641,15 +3509,48 @@ static void mlx4_remove_one(struct pci_dev *pdev)
 	}
 }
 
+static int restore_current_port_types(struct mlx4_dev *dev,
+				      enum mlx4_port_type *types,
+				      enum mlx4_port_type *poss_types)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	int err, i;
+
+	mlx4_stop_sense(dev);
+	mutex_lock(&priv->port_mutex);
+	for (i = 0; i < dev->caps.num_ports; i++)
+		dev->caps.possible_type[i + 1] = poss_types[i];
+	err = mlx4_change_port_types(dev, types);
+	mlx4_start_sense(dev);
+	mutex_unlock(&priv->port_mutex);
+	return err;
+}
+
 int mlx4_restart_one(struct pci_dev *pdev)
 {
 	struct mlx4_dev	 *dev  = pci_get_drvdata(pdev);
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	int		  pci_dev_data;
+	enum mlx4_port_type curr_type[MLX4_MAX_PORTS];
+	enum mlx4_port_type poss_type[MLX4_MAX_PORTS];
+	int pci_dev_data, err, i;
 
 	pci_dev_data = priv->pci_dev_data;
+	for (i = 0; i < dev->caps.num_ports; i++) {
+		curr_type[i] = dev->caps.port_type[i + 1];
+		poss_type[i] = dev->caps.possible_type[i + 1];
+	}
+
 	mlx4_remove_one(pdev);
-	return __mlx4_init_one(pdev, pci_dev_data);
+	err = __mlx4_init_one(pdev, pci_dev_data);
+	if (err)
+		return err;
+
+	dev = pci_get_drvdata(pdev);
+	err = restore_current_port_types(dev, curr_type, poss_type);
+	if (err)
+		mlx4_err(dev, "mlx4_restart_one: could not restore original port types (%d)\n",
+			 err);
+	return 0;
 }
 
 static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {
@@ -2725,16 +3626,6 @@ static int suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	mlx4_remove_one(pdev);
 
-	if (mlx4_log_num_mgm_entry_size != -1 &&
-	    (mlx4_log_num_mgm_entry_size < MLX4_MIN_MGM_LOG_ENTRY_SIZE ||
-	     mlx4_log_num_mgm_entry_size > MLX4_MAX_MGM_LOG_ENTRY_SIZE)) {
-		pr_warning("mlx4_core: mlx4_log_num_mgm_entry_size (%d) not "
-			   "in legal range (-1 or %d..%d)\n",
-			   mlx4_log_num_mgm_entry_size,
-			   MLX4_MIN_MGM_LOG_ENTRY_SIZE,
-			   MLX4_MAX_MGM_LOG_ENTRY_SIZE);
-		return -1;
-	}
 	return 0;
 }
 
@@ -2745,16 +3636,47 @@ static int resume(struct pci_dev *pdev)
 
 static struct pci_driver mlx4_driver = {
 	.name		= DRV_NAME,
-	.id_table	= (struct pci_device_id*)mlx4_pci_table,
+	.id_table	= mlx4_pci_table,
 	.probe		= mlx4_init_one,
 	.remove		= __devexit_p(mlx4_remove_one),
 	.suspend	= suspend,
 	.resume		= resume,
-	.err_handler    = (struct pci_error_handlers*)&mlx4_err_handler,
+	.err_handler    = &mlx4_err_handler,
 };
 
 static int __init mlx4_verify_params(void)
 {
+	int status;
+
+	status = update_defaults(&port_type_array);
+	if (status == INVALID_STR) {
+		if (mlx4_fill_dbdf2val_tbl(&port_type_array.dbdf2val))
+			return -1;
+	} else if (status == INVALID_DATA) {
+		return -1;
+	}
+
+	status = update_defaults(&num_vfs);
+	if (status == INVALID_STR) {
+		if (mlx4_fill_dbdf2val_tbl(&num_vfs.dbdf2val))
+			return -1;
+	} else if (status == INVALID_DATA) {
+		return -1;
+	}
+
+	status = update_defaults(&probe_vf);
+	if (status == INVALID_STR) {
+		if (mlx4_fill_dbdf2val_tbl(&probe_vf.dbdf2val))
+			return -1;
+	} else if (status == INVALID_DATA) {
+		return -1;
+	}
+
+	if (msi_x < 0) {
+		pr_warn("mlx4_core: bad msi_x: %d\n", msi_x);
+		return -1;
+	}
+
 	if ((log_num_mac < 0) || (log_num_mac > 7)) {
 		pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);
 		return -1;
@@ -2772,12 +3694,6 @@ static int __init mlx4_verify_params(void)
 		return -1;
 	}
 
-	/* Check if module param for ports type has legal combination */
-	if (port_type_array[0] == false && port_type_array[1] == true) {
-		pr_warning("mlx4_core: module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");
-		port_type_array[0] = true;
-	}
-
 	if (mlx4_log_num_mgm_entry_size != -1 &&
 	    (mlx4_log_num_mgm_entry_size < MLX4_MIN_MGM_LOG_ENTRY_SIZE ||
 	     mlx4_log_num_mgm_entry_size > MLX4_MAX_MGM_LOG_ENTRY_SIZE)) {
@@ -2813,15 +3729,16 @@ static int __init mlx4_verify_params(void)
 		return -1;
 	}
 
-	if (mod_param_profile.num_mtt && mod_param_profile.num_mtt < 15) {
+	if (mod_param_profile.num_mtt_segs &&
+	    mod_param_profile.num_mtt_segs < 15) {
 		pr_warning("mlx4_core: too low log_num_mtt: %d\n",
-			   mod_param_profile.num_mtt);
+			   mod_param_profile.num_mtt_segs);
 		return -1;
 	}
 
-	if (mod_param_profile.num_mtt > MLX4_MAX_LOG_NUM_MTT) {
+	if (mod_param_profile.num_mtt_segs > MLX4_MAX_LOG_NUM_MTT) {
 		pr_warning("mlx4_core: too high log_num_mtt: %d\n",
-			   mod_param_profile.num_mtt);
+			   mod_param_profile.num_mtt_segs);
 		return -1;
 	}
 	return 0;
@@ -2844,10 +3761,18 @@ static int __init mlx4_init(void)
 		sys_tune_init();
 
 	ret = pci_register_driver(&mlx4_driver);
-	if (ret < 0 && enable_sys_tune)
+	if (ret < 0)
+		goto err;
+
+	return 0;
+
+err:
+	if (enable_sys_tune)
 		sys_tune_fini();
 
-	return ret < 0 ? ret : 0;
+	destroy_workqueue(mlx4_wq);
+
+	return ret;
 }
 
 static void __exit mlx4_cleanup(void)
@@ -2862,17 +3787,16 @@ static void __exit mlx4_cleanup(void)
 module_init_order(mlx4_init, SI_ORDER_MIDDLE);
 module_exit(mlx4_cleanup);
 
-#undef MODULE_VERSION
 #include <sys/module.h>
 static int
 mlx4_evhand(module_t mod, int event, void *arg)
 {
-	return (0);
+        return (0);
 }
 
 static moduledata_t mlx4_mod = {
-	.name = "mlx4",
-	.evhand = mlx4_evhand,
+        .name = "mlx4",
+        .evhand = mlx4_evhand,
 };
 MODULE_VERSION(mlx4, 1);
 DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
diff --git a/sys/ofed/drivers/net/mlx4/mcg.c b/sys/ofed/drivers/net/mlx4/mcg.c
index 60ac9517da55..52c52f80bc11 100644
--- a/sys/ofed/drivers/net/mlx4/mcg.c
+++ b/sys/ofed/drivers/net/mlx4/mcg.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,8 +32,10 @@
  */
 
 #include <linux/string.h>
+#include <linux/etherdevice.h>
 
 #include <linux/mlx4/cmd.h>
+#include <linux/module.h>
 
 #include "mlx4.h"
 
@@ -124,9 +126,14 @@ static struct mlx4_promisc_qp *get_promisc_qp(struct mlx4_dev *dev, u8 port,
 					      enum mlx4_steer_type steer,
 					      u32 qpn)
 {
-	struct mlx4_steer *s_steer = &mlx4_priv(dev)->steer[port - 1];
+	struct mlx4_steer *s_steer;
 	struct mlx4_promisc_qp *pqp;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return NULL;
+
+	s_steer = &mlx4_priv(dev)->steer[port - 1];
+
 	list_for_each_entry(pqp, &s_steer->promisc_qps[steer], list) {
 		if (pqp->qpn == qpn)
 			return pqp;
@@ -153,6 +160,9 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
 	u32 prot;
 	int err;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return -EINVAL;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 	new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL);
 	if (!new_entry)
@@ -237,6 +247,9 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
 	struct mlx4_promisc_qp *pqp;
 	struct mlx4_promisc_qp *dqp;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return -EINVAL;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 
 	pqp = get_promisc_qp(dev, port, steer, qpn);
@@ -258,7 +271,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
 	 * we need to add it as a duplicate to this entry
 	 * for future references */
 	list_for_each_entry(dqp, &entry->duplicates, list) {
-		if (qpn == pqp->qpn)
+		if (qpn == dqp->qpn)
 			return 0; /* qp is already duplicated */
 	}
 
@@ -282,6 +295,9 @@ static bool check_duplicate_entry(struct mlx4_dev *dev, u8 port,
 	struct mlx4_steer_index *tmp_entry, *entry = NULL;
 	struct mlx4_promisc_qp *dqp, *tmp_dqp;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return NULL;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 
 	/* if qp is not promisc, it cannot be duplicated */
@@ -309,20 +325,24 @@ static bool check_duplicate_entry(struct mlx4_dev *dev, u8 port,
 	return true;
 }
 
-/* I a steering entry contains only promisc QPs, it can be removed. */
-static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,
+/*
+ * returns true if all the QPs != tqpn contained in this entry
+ * are Promisc QPs. return false otherwise.
+ */
+static bool promisc_steering_entry(struct mlx4_dev *dev, u8 port,
 				      enum mlx4_steer_type steer,
-				      unsigned int index, u32 tqpn)
+				      unsigned int index, u32 tqpn, u32 *members_count)
 {
 	struct mlx4_steer *s_steer;
 	struct mlx4_cmd_mailbox *mailbox;
 	struct mlx4_mgm *mgm;
-	struct mlx4_steer_index *entry = NULL, *tmp_entry;
-	u32 qpn;
-	u32 members_count;
+	u32 m_count;
 	bool ret = false;
 	int i;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return false;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
@@ -332,15 +352,42 @@ static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,
 
 	if (mlx4_READ_ENTRY(dev, index, mailbox))
 		goto out;
-	members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
-	for (i = 0;  i < members_count; i++) {
-		qpn = be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK;
+	m_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+	if (members_count)
+		*members_count = m_count;
+
+	for (i = 0;  i < m_count; i++) {
+		u32 qpn = be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK;
 		if (!get_promisc_qp(dev, port, steer, qpn) && qpn != tqpn) {
 			/* the qp is not promisc, the entry can't be removed */
 			goto out;
 		}
 	}
-	 /* All the qps currently registered for this entry are promiscuous,
+	ret = true;
+out:
+	mlx4_free_cmd_mailbox(dev, mailbox);
+	return ret;
+}
+
+/* IF a steering entry contains only promisc QPs, it can be removed. */
+static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,
+				      enum mlx4_steer_type steer,
+				      unsigned int index, u32 tqpn)
+{
+	struct mlx4_steer *s_steer;
+	struct mlx4_steer_index *entry = NULL, *tmp_entry;
+	u32 members_count;
+	bool ret = false;
+
+	if (port < 1 || port > dev->caps.num_ports)
+		return NULL;
+
+	s_steer = &mlx4_priv(dev)->steer[port - 1];
+
+	if (!promisc_steering_entry(dev, port, steer, index, tqpn, &members_count))
+		goto out;
+
+	/* All the qps currently registered for this entry are promiscuous,
 	  * Checking for duplicates */
 	ret = true;
 	list_for_each_entry_safe(entry, tmp_entry, &s_steer->steer_entries[steer], list) {
@@ -369,7 +416,6 @@ static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,
 	}
 
 out:
-	mlx4_free_cmd_mailbox(dev, mailbox);
 	return ret;
 }
 
@@ -389,6 +435,9 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
 	int err;
 	struct mlx4_priv *priv = mlx4_priv(dev);
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return -EINVAL;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 
 	mutex_lock(&priv->mcg_table.mutex);
@@ -412,43 +461,45 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
 	}
 	mgm = mailbox->buf;
 
-	/* the promisc qp needs to be added for each one of the steering
-	 * entries, if it already exists, needs to be added as a duplicate
-	 * for this entry */
-	list_for_each_entry(entry, &s_steer->steer_entries[steer], list) {
-		err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
-		if (err)
-			goto out_mailbox;
+	if (!(mlx4_is_mfunc(dev) && steer == MLX4_UC_STEER)) {
+		/* the promisc qp needs to be added for each one of the steering
+		 * entries, if it already exists, needs to be added as a duplicate
+		 * for this entry */
+		list_for_each_entry(entry, &s_steer->steer_entries[steer], list) {
+			err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
+			if (err)
+				goto out_mailbox;
 
-		members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
-		prot = be32_to_cpu(mgm->members_count) >> 30;
-		found = false;
-		for (i = 0; i < members_count; i++) {
-			if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
-				/* Entry already exists, add to duplicates */
-				dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
-				if (!dqp) {
+			members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+			prot = be32_to_cpu(mgm->members_count) >> 30;
+			found = false;
+			for (i = 0; i < members_count; i++) {
+				if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
+					/* Entry already exists, add to duplicates */
+					dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+					if (!dqp) {
+						err = -ENOMEM;
+						goto out_mailbox;
+					}
+					dqp->qpn = qpn;
+					list_add_tail(&dqp->list, &entry->duplicates);
+					found = true;
+				}
+			}
+			if (!found) {
+				/* Need to add the qpn to mgm */
+				if (members_count == dev->caps.num_qp_per_mgm) {
+					/* entry is full */
 					err = -ENOMEM;
 					goto out_mailbox;
 				}
-				dqp->qpn = qpn;
-				list_add_tail(&dqp->list, &entry->duplicates);
-				found = true;
+				mgm->qp[members_count++] = cpu_to_be32(qpn & MGM_QPN_MASK);
+				mgm->members_count = cpu_to_be32(members_count | (prot << 30));
+				err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
+				if (err)
+					goto out_mailbox;
 			}
 		}
-		if (!found) {
-			/* Need to add the qpn to mgm */
-			if (members_count == dev->caps.num_qp_per_mgm) {
-				/* entry is full */
-				err = -ENOMEM;
-				goto out_mailbox;
-			}
-			mgm->qp[members_count++] = cpu_to_be32(qpn & MGM_QPN_MASK);
-			mgm->members_count = cpu_to_be32(members_count | (prot << 30));
-			err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
-			if (err)
-				goto out_mailbox;
-		}
 	}
 
 	/* add the new qpn to list of promisc qps */
@@ -492,7 +543,7 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 port,
 	struct mlx4_steer *s_steer;
 	struct mlx4_cmd_mailbox *mailbox;
 	struct mlx4_mgm *mgm;
-	struct mlx4_steer_index *entry;
+	struct mlx4_steer_index *entry, *tmp_entry;
 	struct mlx4_promisc_qp *pqp;
 	struct mlx4_promisc_qp *dqp;
 	u32 members_count;
@@ -501,6 +552,9 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 port,
 	int i, loc = -1;
 	int err;
 
+	if (port < 1 || port > dev->caps.num_ports)
+		return -EINVAL;
+
 	s_steer = &mlx4_priv(dev)->steer[port - 1];
 	mutex_lock(&priv->mcg_table.mutex);
 
@@ -533,49 +587,58 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 port,
 	if (err)
 		goto out_mailbox;
 
-	/* remove the qp from all the steering entries*/
-	list_for_each_entry(entry, &s_steer->steer_entries[steer], list) {
-		found = false;
-		list_for_each_entry(dqp, &entry->duplicates, list) {
-			if (dqp->qpn == qpn) {
-				found = true;
-				break;
-			}
-		}
-		if (found) {
-			/* a duplicate, no need to change the mgm,
-			 * only update the duplicates list */
-			list_del(&dqp->list);
-			kfree(dqp);
-		} else {
-			err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
-				if (err)
-					goto out_mailbox;
-			members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
-			for (i = 0; i < members_count; ++i)
-				if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
-					loc = i;
+	if (!(mlx4_is_mfunc(dev) && steer == MLX4_UC_STEER)) {
+		/* remove the qp from all the steering entries*/
+		list_for_each_entry_safe(entry, tmp_entry, &s_steer->steer_entries[steer], list) {
+			found = false;
+			list_for_each_entry(dqp, &entry->duplicates, list) {
+				if (dqp->qpn == qpn) {
+					found = true;
 					break;
 				}
-
-			if (loc < 0) {
-				mlx4_err(dev, "QP %06x wasn't found in entry %d\n",
-					 qpn, entry->index);
-				err = -EINVAL;
-				goto out_mailbox;
 			}
+			if (found) {
+				/* a duplicate, no need to change the mgm,
+				 * only update the duplicates list */
+				list_del(&dqp->list);
+				kfree(dqp);
+			} else {
+				err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
+					if (err)
+						goto out_mailbox;
+				members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+				if (!members_count) {
+					mlx4_warn(dev, "QP %06x wasn't found in entry %x mcount=0."
+					               " deleting entry...\n", qpn, entry->index);
+					list_del(&entry->list);
+					kfree(entry);
+					continue;
+				}
 
-			/* copy the last QP in this MGM over removed QP */
-			mgm->qp[loc] = mgm->qp[members_count - 1];
-			mgm->qp[members_count - 1] = 0;
-			mgm->members_count = cpu_to_be32(--members_count |
-							 (MLX4_PROT_ETH << 30));
+				for (i = 0; i < members_count; ++i)
+					if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
+						loc = i;
+						break;
+					}
 
-			err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
-				if (err)
+				if (loc < 0) {
+					mlx4_err(dev, "QP %06x wasn't found in entry %d\n",
+						 qpn, entry->index);
+					err = -EINVAL;
 					goto out_mailbox;
-		}
+				}
 
+				/* copy the last QP in this MGM over removed QP */
+				mgm->qp[loc] = mgm->qp[members_count - 1];
+				mgm->qp[members_count - 1] = 0;
+				mgm->members_count = cpu_to_be32(--members_count |
+								 (MLX4_PROT_ETH << 30));
+
+				err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
+					if (err)
+						goto out_mailbox;
+			}
+		}
 	}
 
 out_mailbox:
@@ -661,26 +724,37 @@ static int find_entry(struct mlx4_dev *dev, u8 port,
 	return err;
 }
 
+static const u8 __promisc_mode[] = {
+	[MLX4_FS_REGULAR]   = 0x0,
+	[MLX4_FS_ALL_DEFAULT] = 0x1,
+	[MLX4_FS_MC_DEFAULT] = 0x3,
+	[MLX4_FS_UC_SNIFFER] = 0x4,
+	[MLX4_FS_MC_SNIFFER] = 0x5,
+};
+
+int map_sw_to_hw_steering_mode(struct mlx4_dev *dev,
+			       enum mlx4_net_trans_promisc_mode flow_type)
+{
+	if (flow_type >= MLX4_FS_MODE_NUM || flow_type < 0) {
+		mlx4_err(dev, "Invalid flow type. type = %d\n", flow_type);
+		return -EINVAL;
+	}
+	return __promisc_mode[flow_type];
+}
+EXPORT_SYMBOL_GPL(map_sw_to_hw_steering_mode);
+
 static void trans_rule_ctrl_to_hw(struct mlx4_net_trans_rule *ctrl,
 				  struct mlx4_net_trans_rule_hw_ctrl *hw)
 {
-	static const u8 __promisc_mode[] = {
-		[MLX4_FS_REGULAR]   = 0x0,
-		[MLX4_FS_ALL_DEFAULT] = 0x1,
-		[MLX4_FS_MC_DEFAULT] = 0x3,
-		[MLX4_FS_UC_SNIFFER] = 0x4,
-		[MLX4_FS_MC_SNIFFER] = 0x5,
-	};
+	u8 flags = 0;
 
-	u32 dw = 0;
+	flags = ctrl->queue_mode == MLX4_NET_TRANS_Q_LIFO ? 1 : 0;
+	flags |= ctrl->exclusive ? (1 << 2) : 0;
+	flags |= ctrl->allow_loopback ? (1 << 3) : 0;
 
-	dw = ctrl->queue_mode == MLX4_NET_TRANS_Q_LIFO ? 1 : 0;
-	dw |= ctrl->exclusive ? (1 << 2) : 0;
-	dw |= ctrl->allow_loopback ? (1 << 3) : 0;
-	dw |= __promisc_mode[ctrl->promisc_mode] << 8;
-	dw |= ctrl->priority << 16;
-
-	hw->ctrl = cpu_to_be32(dw);
+	hw->flags = flags;
+	hw->type = __promisc_mode[ctrl->promisc_mode];
+	hw->prio = cpu_to_be16(ctrl->priority);
 	hw->port = ctrl->port;
 	hw->qpn = cpu_to_be32(ctrl->qpn);
 }
@@ -694,29 +768,51 @@ const u16 __sw_id_hw[] = {
 	[MLX4_NET_TRANS_RULE_ID_UDP]     = 0xE006
 };
 
+int map_sw_to_hw_steering_id(struct mlx4_dev *dev,
+			     enum mlx4_net_trans_rule_id id)
+{
+	if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+		mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
+		return -EINVAL;
+	}
+	return __sw_id_hw[id];
+}
+EXPORT_SYMBOL_GPL(map_sw_to_hw_steering_id);
+
+static const int __rule_hw_sz[] = {
+	[MLX4_NET_TRANS_RULE_ID_ETH] =
+		sizeof(struct mlx4_net_trans_rule_hw_eth),
+	[MLX4_NET_TRANS_RULE_ID_IB] =
+		sizeof(struct mlx4_net_trans_rule_hw_ib),
+	[MLX4_NET_TRANS_RULE_ID_IPV6] = 0,
+	[MLX4_NET_TRANS_RULE_ID_IPV4] =
+		sizeof(struct mlx4_net_trans_rule_hw_ipv4),
+	[MLX4_NET_TRANS_RULE_ID_TCP] =
+		sizeof(struct mlx4_net_trans_rule_hw_tcp_udp),
+	[MLX4_NET_TRANS_RULE_ID_UDP] =
+		sizeof(struct mlx4_net_trans_rule_hw_tcp_udp)
+};
+
+int hw_rule_sz(struct mlx4_dev *dev,
+	       enum mlx4_net_trans_rule_id id)
+{
+	if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+		mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
+		return -EINVAL;
+	}
+
+	return __rule_hw_sz[id];
+}
+EXPORT_SYMBOL_GPL(hw_rule_sz);
+
 static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec,
 			    struct _rule_hw *rule_hw)
 {
-	static const size_t __rule_hw_sz[] = {
-		[MLX4_NET_TRANS_RULE_ID_ETH] =
-			sizeof(struct mlx4_net_trans_rule_hw_eth),
-		[MLX4_NET_TRANS_RULE_ID_IB] =
-			sizeof(struct mlx4_net_trans_rule_hw_ib),
-		[MLX4_NET_TRANS_RULE_ID_IPV6] = 0,
-		[MLX4_NET_TRANS_RULE_ID_IPV4] =
-			sizeof(struct mlx4_net_trans_rule_hw_ipv4),
-		[MLX4_NET_TRANS_RULE_ID_TCP] =
-			sizeof(struct mlx4_net_trans_rule_hw_tcp_udp),
-		[MLX4_NET_TRANS_RULE_ID_UDP] =
-			sizeof(struct mlx4_net_trans_rule_hw_tcp_udp)
-	};
-	if (spec->id >= MLX4_NET_TRANS_RULE_NUM) {
-		mlx4_err(dev, "Invalid network rule id. id = %d\n", spec->id);
+	if (hw_rule_sz(dev, spec->id) < 0)
 		return -EINVAL;
-	}
-	memset(rule_hw, 0, __rule_hw_sz[spec->id]);
+	memset(rule_hw, 0, hw_rule_sz(dev, spec->id));
 	rule_hw->id = cpu_to_be16(__sw_id_hw[spec->id]);
-	rule_hw->size = __rule_hw_sz[spec->id] >> 2;
+	rule_hw->size = hw_rule_sz(dev, spec->id) >> 2;
 
 	switch (spec->id) {
 	case MLX4_NET_TRANS_RULE_ID_ETH:
@@ -730,12 +826,12 @@ static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec,
 			rule_hw->eth.ether_type_enable = 1;
 			rule_hw->eth.ether_type = spec->eth.ether_type;
 		}
-		rule_hw->eth.vlan_id = spec->eth.vlan_id;
-		rule_hw->eth.vlan_id_msk = spec->eth.vlan_id_msk;
+		rule_hw->eth.vlan_tag = spec->eth.vlan_id;
+		rule_hw->eth.vlan_tag_msk = spec->eth.vlan_id_msk;
 		break;
 
 	case MLX4_NET_TRANS_RULE_ID_IB:
-		rule_hw->ib.r_u_qpn = spec->ib.r_u_qpn;
+		rule_hw->ib.l3_qpn = spec->ib.l3_qpn;
 		rule_hw->ib.qpn_mask = spec->ib.qpn_msk;
 		memcpy(&rule_hw->ib.dst_gid, &spec->ib.dst_gid, 16);
 		memcpy(&rule_hw->ib.dst_gid_msk, &spec->ib.dst_gid_msk, 16);
@@ -886,7 +982,7 @@ int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id)
 	err = mlx4_QP_FLOW_STEERING_DETACH(dev, reg_id);
 	if (err)
 		mlx4_err(dev, "Fail to detach network rule. registration id = 0x%llx\n",
-			 (long long)reg_id);
+			 (unsigned long long)reg_id);
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx4_flow_detach);
@@ -977,8 +1073,9 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 	if (err)
 		goto out;
 
+	/* if !link, still add the new entry. */
 	if (!link)
-		goto out;
+		goto skip_link;
 
 	err = mlx4_READ_ENTRY(dev, prev, mailbox);
 	if (err)
@@ -990,6 +1087,7 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 	if (err)
 		goto out;
 
+skip_link:
 	if (prot == MLX4_PROT_ETH) {
 		/* manage the steering entry for promisc mode */
 		if (new_entry)
@@ -1006,7 +1104,7 @@ int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 				  index, dev->caps.num_mgms);
 		else
 			mlx4_bitmap_free(&priv->mcg_table.bitmap,
-					 index - dev->caps.num_mgms);
+					 index - dev->caps.num_mgms, MLX4_USE_RR);
 	}
 	mutex_unlock(&priv->mcg_table.mutex);
 
@@ -1045,10 +1143,14 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 		goto out;
 	}
 
-	/* if this pq is also a promisc qp, it shouldn't be removed */
+	/*
+	  if this QP is also a promisc QP, it shouldn't be removed only if
+	  at least one none promisc QP is also attached to this MCG
+	*/
 	if (prot == MLX4_PROT_ETH &&
-	    check_duplicate_entry(dev, port, steer, index, qp->qpn))
-		goto out;
+	    check_duplicate_entry(dev, port, steer, index, qp->qpn) &&
+	    !promisc_steering_entry(dev, port, steer, index, qp->qpn, NULL))
+			goto out;
 
 	members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
 	for (i = 0; i < members_count; ++i)
@@ -1099,7 +1201,7 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 					  index, amgm_index, dev->caps.num_mgms);
 			else
 				mlx4_bitmap_free(&priv->mcg_table.bitmap,
-						 amgm_index - dev->caps.num_mgms);
+						 amgm_index - dev->caps.num_mgms, MLX4_USE_RR);
 		}
 	} else {
 		/* Remove entry from AMGM */
@@ -1119,7 +1221,7 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 				  prev, index, dev->caps.num_mgms);
 		else
 			mlx4_bitmap_free(&priv->mcg_table.bitmap,
-					 index - dev->caps.num_mgms);
+					 index - dev->caps.num_mgms, MLX4_USE_RR);
 	}
 
 out:
@@ -1148,7 +1250,7 @@ static int mlx4_QP_ATTACH(struct mlx4_dev *dev, struct mlx4_qp *qp,
 	qpn = qp->qpn;
 	qpn |= (prot << 28);
 	if (attach && block_loopback)
-		qpn |= (1U << 31);
+		qpn |= (1 << 31);
 
 	err = mlx4_cmd(dev, mailbox->dma, qpn, attach,
 		       MLX4_CMD_QP_ATTACH, MLX4_CMD_TIME_CLASS_A,
@@ -1158,28 +1260,11 @@ static int mlx4_QP_ATTACH(struct mlx4_dev *dev, struct mlx4_qp *qp,
 	return err;
 }
 
-int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-			  u8 port, int block_mcast_loopback,
-			  enum mlx4_protocol prot, u64 *reg_id)
+int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp,
+			      u8 gid[16], u8 port,
+			      int block_mcast_loopback,
+			      enum mlx4_protocol prot, u64 *reg_id)
 {
-
-	switch (dev->caps.steering_mode) {
-	case MLX4_STEERING_MODE_A0:
-		if (prot == MLX4_PROT_ETH)
-			return 0;
-
-	case MLX4_STEERING_MODE_B0:
-		if (prot == MLX4_PROT_ETH)
-			gid[7] |= (MLX4_MC_STEER << 1);
-
-		if (mlx4_is_mfunc(dev))
-			return mlx4_QP_ATTACH(dev, qp, gid, 1,
-					      block_mcast_loopback, prot);
-		return mlx4_qp_attach_common(dev, qp, gid,
-					     block_mcast_loopback, prot,
-					     MLX4_MC_STEER);
-
-	case MLX4_STEERING_MODE_DEVICE_MANAGED: {
 		struct mlx4_spec_list spec = { {NULL} };
 		__be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
 
@@ -1213,8 +1298,35 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 		list_add_tail(&spec.list, &rule.list);
 
 		return mlx4_flow_attach(dev, &rule, reg_id);
-	}
+}
 
+int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+			  u8 port, int block_mcast_loopback,
+			  enum mlx4_protocol prot, u64 *reg_id)
+{
+	enum mlx4_steer_type steer;
+	steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
+
+	switch (dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_A0:
+		if (prot == MLX4_PROT_ETH)
+			return 0;
+
+	case MLX4_STEERING_MODE_B0:
+		if (prot == MLX4_PROT_ETH)
+			gid[7] |= (steer << 1);
+
+		if (mlx4_is_mfunc(dev))
+			return mlx4_QP_ATTACH(dev, qp, gid, 1,
+					      block_mcast_loopback, prot);
+		return mlx4_qp_attach_common(dev, qp, gid,
+					     block_mcast_loopback, prot,
+					     MLX4_MC_STEER);
+
+	case MLX4_STEERING_MODE_DEVICE_MANAGED:
+		return mlx4_trans_to_dmfs_attach(dev, qp, gid, port,
+						 block_mcast_loopback,
+						 prot, reg_id);
 	default:
 		return -EINVAL;
 	}
@@ -1224,6 +1336,9 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
 int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 			  enum mlx4_protocol prot, u64 reg_id)
 {
+	enum mlx4_steer_type steer;
+	steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
+
 	switch (dev->caps.steering_mode) {
 	case MLX4_STEERING_MODE_A0:
 		if (prot == MLX4_PROT_ETH)
@@ -1231,7 +1346,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
 	case MLX4_STEERING_MODE_B0:
 		if (prot == MLX4_PROT_ETH)
-			gid[7] |= (MLX4_MC_STEER << 1);
+			gid[7] |= (steer << 1);
 
 		if (mlx4_is_mfunc(dev))
 			return mlx4_QP_ATTACH(dev, qp, gid, 0, 0, prot);
@@ -1345,8 +1460,8 @@ int mlx4_PROMISC_wrapper(struct mlx4_dev *dev, int slave,
 	u8 port = vhcr->in_param >> 62;
 	enum mlx4_steer_type steer = vhcr->in_modifier;
 
-	/* Promiscuous unicast is not allowed in mfunc */
-	if (mlx4_is_mfunc(dev) && steer == MLX4_UC_STEER)
+	/* Promiscuous unicast is not allowed in mfunc for VFs */
+	if ((slave != dev->caps.function) && (steer == MLX4_UC_STEER))
 		return 0;
 
 	if (vhcr->op_modifier)
diff --git a/sys/ofed/drivers/net/mlx4/mlx4.h b/sys/ofed/drivers/net/mlx4/mlx4.h
index b342d9aee395..624a61ca2ceb 100644
--- a/sys/ofed/drivers/net/mlx4/mlx4.h
+++ b/sys/ofed/drivers/net/mlx4/mlx4.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -43,7 +43,7 @@
 #include <linux/timer.h>
 #include <linux/semaphore.h>
 #include <linux/workqueue.h>
-
+#include <linux/device.h>
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/doorbell.h>
@@ -51,8 +51,12 @@
 
 #define DRV_NAME	"mlx4_core"
 #define PFX		DRV_NAME ": "
-#define DRV_VERSION	"1.1"
-#define DRV_RELDATE	"Dec, 2011"
+#define DRV_VERSION	"2.1"
+#define DRV_RELDATE	__DATE__
+
+#define DRV_STACK_NAME		"Linux-MLNX_OFED"
+#define DRV_STACK_VERSION	"2.1"
+#define DRV_NAME_FOR_FW		DRV_STACK_NAME","DRV_STACK_VERSION
 
 #define MLX4_FS_UDP_UC_EN		(1 << 1)
 #define MLX4_FS_TCP_UC_EN		(1 << 2)
@@ -108,10 +112,10 @@ enum {
 	MLX4_NUM_CMPTS		= MLX4_CMPT_NUM_TYPE << MLX4_CMPT_SHIFT
 };
 
-enum mlx4_mr_state {
-	MLX4_MR_DISABLED = 0,
-	MLX4_MR_EN_HW,
-	MLX4_MR_EN_SW
+enum mlx4_mpt_state {
+	MLX4_MPT_DISABLED = 0,
+	MLX4_MPT_EN_HW,
+	MLX4_MPT_EN_SW
 };
 
 #define MLX4_COMM_TIME		10000
@@ -139,9 +143,10 @@ enum mlx4_resource {
 	RES_MTT,
 	RES_MAC,
 	RES_VLAN,
-	RES_EQ,
+	RES_NPORT_ID,
 	RES_COUNTER,
 	RES_FS_RULE,
+	RES_EQ,
 	MLX4_NUM_OF_RESOURCE_TYPE
 };
 
@@ -180,13 +185,14 @@ struct mlx4_vhcr {
 struct mlx4_vhcr_cmd {
 	__be64 in_param;
 	__be32 in_modifier;
+	u32 reserved1;
 	__be64 out_param;
 	__be16 token;
 	u16 reserved;
 	u8 status;
 	u8 flags;
 	__be16 opcode;
-};
+} __packed;
 
 struct mlx4_cmd_info {
 	u16 opcode;
@@ -194,6 +200,7 @@ struct mlx4_cmd_info {
 	bool has_outbox;
 	bool out_is_imm;
 	bool encode_slave_id;
+	bool skip_err_print;
 	int (*verify)(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr,
 		      struct mlx4_cmd_mailbox *inbox);
 	int (*wrapper)(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr,
@@ -202,6 +209,10 @@ struct mlx4_cmd_info {
 		       struct mlx4_cmd_info *cmd);
 };
 
+enum {
+	MLX4_DEBUG_MASK_CMD_TIME = 0x100,
+};
+
 #ifdef CONFIG_MLX4_DEBUG
 extern int mlx4_debug_level;
 #else /* CONFIG_MLX4_DEBUG */
@@ -260,6 +271,22 @@ struct mlx4_icm_table {
 	struct mlx4_icm	      **icm;
 };
 
+#define MLX4_MPT_FLAG_SW_OWNS	    (0xfUL << 28)
+#define MLX4_MPT_FLAG_FREE	    (0x3UL << 28)
+#define MLX4_MPT_FLAG_MIO	    (1 << 17)
+#define MLX4_MPT_FLAG_BIND_ENABLE   (1 << 15)
+#define MLX4_MPT_FLAG_PHYSICAL	    (1 <<  9)
+#define MLX4_MPT_FLAG_REGION	    (1 <<  8)
+
+#define MLX4_MPT_PD_FLAG_FAST_REG   (1 << 27)
+#define MLX4_MPT_PD_FLAG_RAE	    (1 << 28)
+#define MLX4_MPT_PD_FLAG_EN_INV	    (3 << 24)
+
+#define MLX4_MPT_QP_FLAG_BOUND_QP   (1 << 7)
+
+#define MLX4_MPT_STATUS_SW		0xF0
+#define MLX4_MPT_STATUS_HW		0x00
+
 /*
  * Must be packed because mtt_seg is 64 bits but only aligned to 32 bits.
  */
@@ -353,7 +380,6 @@ struct mlx4_eq {
 	u16			irq;
 	u16			have_irq;
 	int			nent;
-        int                     load;
 	struct mlx4_buf_list   *page_list;
 	struct mlx4_mtt		mtt;
 };
@@ -376,7 +402,7 @@ struct mlx4_profile {
 	int			num_cq;
 	int			num_mcg;
 	int			num_mpt;
-	unsigned		num_mtt;
+	unsigned		num_mtt_segs;
 };
 
 struct mlx4_fw {
@@ -434,6 +460,7 @@ struct mlx4_slave_state {
 	u8 last_cmd;
 	u8 init_port_mask;
 	bool active;
+	bool old_vlan_api;
 	u8 function;
 	dma_addr_t vhcr_dma;
 	u16 mtu[MLX4_MAX_PORTS + 1];
@@ -455,12 +482,14 @@ struct mlx4_slave_state {
 #define MLX4_VGT 4095
 #define NO_INDX  (-1)
 
+
 struct mlx4_vport_state {
 	u64 mac;
 	u16 default_vlan;
 	u8  default_qos;
 	u32 tx_rate;
 	bool spoofchk;
+	u32 link_state;
 };
 
 struct mlx4_vf_admin_state {
@@ -531,6 +560,7 @@ struct mlx4_mfunc_master_ctx {
 	struct mlx4_resource_tracker res_tracker;
 	struct workqueue_struct *comm_wq;
 	struct work_struct	comm_work;
+	struct work_struct	arm_comm_work;
 	struct work_struct	slave_event_work;
 	struct work_struct	slave_flr_event_work;
 	spinlock_t		slave_state_lock;
@@ -576,6 +606,24 @@ struct mlx4_cmd {
 	u8			comm_toggle;
 };
 
+enum {
+	MLX4_VF_IMMED_VLAN_FLAG_VLAN = 1 << 0,
+	MLX4_VF_IMMED_VLAN_FLAG_QOS = 1 << 1,
+};
+struct mlx4_vf_immed_vlan_work {
+	struct work_struct	work;
+	struct mlx4_priv	*priv;
+	int			flags;
+	int			slave;
+	int			vlan_ix;
+	int			orig_vlan_ix;
+	u8			port;
+	u8			qos;
+	u16			vlan_id;
+	u16			orig_vlan_id;
+};
+
+
 struct mlx4_uar_table {
 	struct mlx4_bitmap	bitmap;
 };
@@ -592,6 +640,7 @@ struct mlx4_mr_table {
 struct mlx4_cq_table {
 	struct mlx4_bitmap	bitmap;
 	spinlock_t		lock;
+	rwlock_t		cq_table_lock;
 	struct radix_tree_root	tree;
 	struct mlx4_icm_table	table;
 	struct mlx4_icm_table	cmpt_table;
@@ -724,8 +773,6 @@ struct mlx4_sense {
 	u8			do_sense_port[MLX4_MAX_PORTS + 1];
 	u8			sense_allowed[MLX4_MAX_PORTS + 1];
 	struct delayed_work	sense_poll;
-        struct workqueue_struct *sense_wq;
-        u32                     resched;
 };
 
 struct mlx4_msix_ctl {
@@ -738,85 +785,6 @@ struct mlx4_steer {
 	struct list_head steer_entries[MLX4_NUM_STEERS];
 };
 
-struct mlx4_net_trans_rule_hw_ctrl {
-	__be32 ctrl;
-	u8 rsvd1;
-	u8 funcid;
-	u8 vep;
-	u8 port;
-	__be32 qpn;
-	__be32 rsvd2;
-};
-
-struct mlx4_net_trans_rule_hw_ib {
-	u8 size;
-	u8 rsvd1;
-	__be16 id;
-	u32 rsvd2;
-	__be32 r_u_qpn;
-	__be32 qpn_mask;
-	u8 dst_gid[16];
-	u8 dst_gid_msk[16];
-} __packed;
-
-struct mlx4_net_trans_rule_hw_eth {
-	u8	size;
-	u8	rsvd;
-	__be16	id;
-	u8	rsvd1[6];
-	u8	dst_mac[6];
-	u16	rsvd2;
-	u8	dst_mac_msk[6];
-	u16	rsvd3;
-	u8	src_mac[6];
-	u16	rsvd4;
-	u8	src_mac_msk[6];
-	u8      rsvd5;
-	u8      ether_type_enable;
-	__be16  ether_type;
-	__be16  vlan_id_msk;
-	__be16  vlan_id;
-} __packed;
-
-struct mlx4_net_trans_rule_hw_tcp_udp {
-	u8	size;
-	u8	rsvd;
-	__be16	id;
-	__be16	rsvd1[3];
-	__be16	dst_port;
-	__be16	rsvd2;
-	__be16	dst_port_msk;
-	__be16	rsvd3;
-	__be16	src_port;
-	__be16	rsvd4;
-	__be16	src_port_msk;
-} __packed;
-
-struct mlx4_net_trans_rule_hw_ipv4 {
-	u8	size;
-	u8	rsvd;
-	__be16	id;
-	__be32	rsvd1;
-	__be32	dst_ip;
-	__be32	dst_ip_msk;
-	__be32	src_ip;
-	__be32	src_ip_msk;
-} __packed;
-
-struct _rule_hw {
-	union {
-		struct {
-			u8 size;
-			u8 rsvd;
-			__be16 id;
-		};
-		struct mlx4_net_trans_rule_hw_eth eth;
-		struct mlx4_net_trans_rule_hw_ib ib;
-		struct mlx4_net_trans_rule_hw_ipv4 ipv4;
-		struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
-	};
-};
-
 enum {
 	MLX4_PCI_DEV_IS_VF		= 1 << 0,
 	MLX4_PCI_DEV_FORCE_SENSE_PORT	= 1 << 1,
@@ -826,6 +794,23 @@ struct mlx4_roce_gid_entry {
 	u8 raw[16];
 };
 
+struct counter_index {
+	struct  list_head	list;
+	u32			index;
+};
+
+struct mlx4_counters {
+	struct mlx4_bitmap	bitmap;
+	struct list_head	global_port_list[MLX4_MAX_PORTS];
+	struct list_head	vf_list[MLX4_MAX_NUM_VF][MLX4_MAX_PORTS];
+	struct mutex		mutex;
+};
+
+enum {
+	MLX4_NO_RR	= 0,
+	MLX4_USE_RR	= 1,
+};
+
 struct mlx4_priv {
 	struct mlx4_dev		dev;
 
@@ -851,7 +836,7 @@ struct mlx4_priv {
 	struct mlx4_srq_table	srq_table;
 	struct mlx4_qp_table	qp_table;
 	struct mlx4_mcg_table	mcg_table;
-	struct mlx4_bitmap	counters_bitmap;
+	struct mlx4_counters	counters_table;
 
 	struct mlx4_catas_err	catas_err;
 
@@ -887,10 +872,11 @@ static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
 extern struct workqueue_struct *mlx4_wq;
 
 u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap);
-void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj);
+void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj, int use_rr);
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt,
 			    int align, u32 skip_mask);
-void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt);
+void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt,
+			    int use_rr);
 u32 mlx4_bitmap_avail(struct mlx4_bitmap *bitmap);
 int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
 		     u32 reserved_bot, u32 resetrved_top);
@@ -926,10 +912,10 @@ int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn);
 void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn);
 int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn);
 void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn);
-int __mlx4_mr_reserve(struct mlx4_dev *dev);
-void __mlx4_mr_release(struct mlx4_dev *dev, u32 index);
-int __mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index);
-void __mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index);
+int __mlx4_mpt_reserve(struct mlx4_dev *dev);
+void __mlx4_mpt_release(struct mlx4_dev *dev, u32 index);
+int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index);
+void __mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index);
 u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order);
 void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 first_seg, int order);
 
@@ -969,14 +955,20 @@ int mlx4_DMA_wrapper(struct mlx4_dev *dev, int slave,
 		     struct mlx4_cmd_mailbox *outbox,
 		     struct mlx4_cmd_info *cmd);
 int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
-			    int *base, u8 bf_qp);
+			    int *base, u8 flags);
 void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt);
 int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 		     int start_index, int npages, u64 *page_list);
-int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
-void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
+int __mlx4_counter_alloc(struct mlx4_dev *dev, int slave, int port, u32 *idx);
+void __mlx4_counter_free(struct mlx4_dev *dev, int slave, int port, u32 idx);
+
+int __mlx4_slave_counters_free(struct mlx4_dev *dev, int slave);
+int __mlx4_clear_if_stat(struct mlx4_dev *dev,
+			 u8 counter_index);
+u8 mlx4_get_default_counter_index(struct mlx4_dev *dev, int slave, int port);
+
 int __mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn);
 void __mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn);
 
@@ -997,6 +989,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
 		      struct mlx4_dev_cap *dev_cap,
 		      struct mlx4_init_hca_param *init_hca);
 void mlx4_master_comm_channel(struct work_struct *work);
+void mlx4_master_arm_comm_channel(struct work_struct *work);
 void mlx4_gen_slave_eqe(struct work_struct *work);
 void mlx4_master_handle_slave_flr(struct work_struct *work);
 
@@ -1164,8 +1157,7 @@ void mlx4_do_sense_ports(struct mlx4_dev *dev,
 			 enum mlx4_port_type *defaults);
 void mlx4_start_sense(struct mlx4_dev *dev);
 void mlx4_stop_sense(struct mlx4_dev *dev);
-void mlx4_sense_cleanup(struct mlx4_dev *dev);
-int  mlx4_sense_init(struct mlx4_dev *dev);
+void mlx4_sense_init(struct mlx4_dev *dev);
 int mlx4_check_port_params(struct mlx4_dev *dev,
 			   enum mlx4_port_type *port_type);
 int mlx4_change_port_types(struct mlx4_dev *dev,
@@ -1238,6 +1230,10 @@ int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 			  int block_mcast_loopback, enum mlx4_protocol prot,
 			  enum mlx4_steer_type steer);
+int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp,
+			      u8 gid[16], u8 port,
+			      int block_mcast_loopback,
+			      enum mlx4_protocol prot, u64 *reg_id);
 int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave,
 				struct mlx4_vhcr *vhcr,
 				struct mlx4_cmd_mailbox *inbox,
@@ -1250,8 +1246,6 @@ int mlx4_SET_VLAN_FLTR_wrapper(struct mlx4_dev *dev, int slave,
 			       struct mlx4_cmd_info *cmd);
 int mlx4_common_set_vlan_fltr(struct mlx4_dev *dev, int function,
 				     int port, void *buf);
-int mlx4_common_dump_eth_stats(struct mlx4_dev *dev, int slave, u32 in_mod,
-				struct mlx4_cmd_mailbox *outbox);
 int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,
 				   struct mlx4_vhcr *vhcr,
 				   struct mlx4_cmd_mailbox *inbox,
@@ -1277,6 +1271,11 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
 					 struct mlx4_cmd_mailbox *inbox,
 					 struct mlx4_cmd_mailbox *outbox,
 					 struct mlx4_cmd_info *cmd);
+int mlx4_MOD_STAT_CFG_wrapper(struct mlx4_dev *dev, int slave,
+			  struct mlx4_vhcr *vhcr,
+			  struct mlx4_cmd_mailbox *inbox,
+			  struct mlx4_cmd_mailbox *outbox,
+			  struct mlx4_cmd_info *cmd);
 
 int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);
 int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);
@@ -1315,5 +1314,6 @@ void mlx4_init_quotas(struct mlx4_dev *dev);
 
 int mlx4_get_slave_num_gids(struct mlx4_dev *dev, int slave);
 int mlx4_get_base_gid_ix(struct mlx4_dev *dev, int slave);
+void mlx4_vf_immed_vlan_work_handler(struct work_struct *_work);
 
 #endif /* MLX4_H */
diff --git a/sys/ofed/drivers/net/mlx4/mlx4_en.h b/sys/ofed/drivers/net/mlx4/mlx4_en.h
index 0dc5fe6b3734..1cb19e3f77e8 100644
--- a/sys/ofed/drivers/net/mlx4/mlx4_en.h
+++ b/sys/ofed/drivers/net/mlx4/mlx4_en.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -34,13 +34,17 @@
 #ifndef _MLX4_EN_H_
 #define _MLX4_EN_H_
 
-#include <sys/cdefs.h>
-
-#include <linux/types.h>
+#include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
+#include <linux/kobject.h>
 #include <linux/netdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/if_ether.h>
+#ifdef CONFIG_MLX4_EN_DCB
+#include <linux/dcbnl.h>
+#endif
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/qp.h>
@@ -49,56 +53,17 @@
 #include <linux/mlx4/doorbell.h>
 #include <linux/mlx4/cmd.h>
 
-#include <net/if_media.h>
 #include <netinet/tcp_lro.h>
 
 #include "en_port.h"
+#include "mlx4_stats.h"
 
 #define DRV_NAME	"mlx4_en"
-#define DRV_VERSION	"1.5.2"
-#define DRV_RELDATE	"July 2010"
-
-/* XXX */
-#define	NETIF_MSG_LINK		0x1
-#define	NETIF_MSG_IFDOWN	0x2
-#define	NETIF_MSG_HW		0x4
-#define	NETIF_MSG_DRV		0x8
-#define	NETIF_MSG_INTR		0x10
-#define	NETIF_MSG_RX_ERR	0x20
+#define DRV_VERSION	"2.1"
+#define DRV_RELDATE	__DATE__
 
 #define MLX4_EN_MSG_LEVEL	(NETIF_MSG_LINK | NETIF_MSG_IFDOWN)
 
-#define en_print(level, priv, format, arg...)			\
-	{							\
-	if ((priv)->registered)					\
-		printk(level "%s: %s: " format, DRV_NAME,	\
-			(priv->dev)->if_xname, ## arg);	\
-	else							\
-		printk(level "%s: %s: Port %d: " format,	\
-			DRV_NAME, dev_name(&priv->mdev->pdev->dev), \
-			(priv)->port, ## arg);			\
-	}
-
-#define en_dbg(mlevel, priv, format, arg...)	\
-	if (NETIF_MSG_##mlevel & priv->msg_enable) \
-		en_print(KERN_DEBUG, priv, format, ## arg)
-#define en_warn(priv, format, arg...) \
-	en_print(KERN_WARNING, priv, format, ## arg)
-#define en_err(priv, format, arg...) \
-	en_print(KERN_ERR, priv, format, ## arg)
-#define en_info(priv, format, arg...) \
-	en_print(KERN_INFO, priv, format, ## arg)
-
-#define mlx4_err(mdev, format, arg...) \
-	printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
-		dev_name(&mdev->pdev->dev) , ## arg)
-#define mlx4_info(mdev, format, arg...) \
-	printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
-		dev_name(&mdev->pdev->dev) , ## arg)
-#define mlx4_warn(mdev, format, arg...) \
-	printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
-		dev_name(&mdev->pdev->dev) , ## arg)
-
 /*
  * Device constants
  */
@@ -106,8 +71,9 @@
 
 #define MLX4_EN_PAGE_SHIFT	12
 #define MLX4_EN_PAGE_SIZE	(1 << MLX4_EN_PAGE_SHIFT)
-#define MAX_TX_RINGS		(MLX4_EN_NUM_HASH_RINGS + 1 + MLX4_EN_NUM_PPP_RINGS)
-#define MAX_RX_RINGS		16
+#define DEF_RX_RINGS		16
+#define MAX_RX_RINGS		128
+#define MIN_RX_RINGS		4
 #define TXBB_SIZE		64
 #define HEADROOM		(2048 / TXBB_SIZE + 1)
 #define STAMP_STRIDE		64
@@ -115,6 +81,19 @@
 #define STAMP_SHIFT		31
 #define STAMP_VAL		0x7fffffff
 #define STATS_DELAY		(HZ / 4)
+#define SERVICE_TASK_DELAY	(HZ / 4)
+#define MAX_NUM_OF_FS_RULES	256
+
+#define MLX4_EN_FILTER_HASH_SHIFT 4
+#define MLX4_EN_FILTER_EXPIRY_QUOTA 60
+
+#ifdef CONFIG_NET_RX_BUSY_POLL
+#define LL_EXTENDED_STATS
+#endif
+
+/* vlan valid range */
+#define VLAN_MIN_VALUE		1
+#define VLAN_MAX_VALUE		4094
 
 /* Typical TSO descriptor with 16 gather entries is 352 bytes... */
 #define MAX_DESC_SIZE		512
@@ -126,8 +105,13 @@
 
 #define MLX4_EN_WATCHDOG_TIMEOUT	(15 * HZ)
 
-#define MLX4_EN_MAX_LRO_DESCRIPTORS	32
-#define MLX4_EN_NUM_IPFRAG_SESSIONS	16
+#define MLX4_EN_ALLOC_SIZE     PAGE_ALIGN(PAGE_SIZE)
+#define MLX4_EN_ALLOC_ORDER    get_order(MLX4_EN_ALLOC_SIZE)
+
+enum mlx4_en_alloc_type {
+	MLX4_EN_ALLOC_NEW = 0,
+	MLX4_EN_ALLOC_REPLACEMENT = 1,
+};
 
 /* Receive fragment sizes; we use at most 3 fragments (for 9600 byte MTU
  * and 4K allocations) */
@@ -149,29 +133,38 @@ enum {
 #error	"Unknown PAGE_SIZE"
 #endif
 
+/* Maximum ring sizes */
+#define MLX4_EN_DEF_TX_QUEUE_SIZE       4096
+
+/* Minimum packet number till arming the CQ */
+#define MLX4_EN_MIN_RX_ARM	2048
+#define MLX4_EN_MIN_TX_ARM	2048
+
 /* Maximum ring sizes */
 #define MLX4_EN_MAX_TX_SIZE	8192
 #define MLX4_EN_MAX_RX_SIZE	8192
 
-#define MLX4_EN_MIN_RX_SIZE	(128)
+/* Minimum ring sizes */
+#define MLX4_EN_MIN_RX_SIZE	(4096 / TXBB_SIZE)
 #define MLX4_EN_MIN_TX_SIZE	(4096 / TXBB_SIZE)
 
 #define MLX4_EN_SMALL_PKT_SIZE		64
-#define MLX4_EN_TX_HASH_SIZE		256
-#define MLX4_EN_TX_HASH_MASK		(MLX4_EN_TX_HASH_SIZE - 1)
-#define MLX4_EN_NUM_HASH_RINGS		4
-#define MLX4_EN_NUM_PPP_RINGS		8
-#define MLX4_EN_DEF_TX_RING_SIZE	512
-#define MLX4_EN_DEF_TX_QUEUE_SIZE	4096
+
+#define MLX4_EN_MAX_TX_RING_P_UP	32
+#define MLX4_EN_NUM_UP			1
+
+#define MAX_TX_RINGS			(MLX4_EN_MAX_TX_RING_P_UP * \
+					 (MLX4_EN_NUM_UP + 1))
+
+#define MLX4_EN_DEF_TX_RING_SIZE	1024
 #define MLX4_EN_DEF_RX_RING_SIZE  	1024
-#define	MLX4_EN_MAX_RX_POLL		1024
 
 /* Target number of bytes to coalesce with interrupt moderation */
 #define MLX4_EN_RX_COAL_TARGET	0x20000
 #define MLX4_EN_RX_COAL_TIME	0x10
 
-#define MLX4_EN_TX_COAL_PKTS	5
-#define MLX4_EN_TX_COAL_TIME	0x80
+#define MLX4_EN_TX_COAL_PKTS	64
+#define MLX4_EN_TX_COAL_TIME	64
 
 #define MLX4_EN_RX_RATE_LOW		400000
 #define MLX4_EN_RX_COAL_TIME_LOW	0
@@ -187,14 +180,13 @@ enum {
 #define MLX4_EN_DEF_RX_PAUSE	1
 #define MLX4_EN_DEF_TX_PAUSE	1
 
-/* Interval between sucessive polls in the Tx routine when polling is used
+/* Interval between successive polls in the Tx routine when polling is used
    instead of interrupts (in per-core Tx rings) - should be power of 2 */
 #define MLX4_EN_TX_POLL_MODER	16
 #define MLX4_EN_TX_POLL_TIMEOUT	(HZ / 4)
 
-#define ETH_LLC_SNAP_SIZE	8
-
-#define SMALL_PACKET_SIZE      (MHLEN)
+#define MLX4_EN_64_ALIGN	(64 - NET_SKB_PAD)
+#define SMALL_PACKET_SIZE      (256 - NET_IP_ALIGN)
 #define HEADER_COPY_SIZE       (128)
 #define MLX4_LOOPBACK_TEST_PAYLOAD (HEADER_COPY_SIZE - ETHER_HDR_LEN)
 
@@ -208,7 +200,6 @@ enum {
 /* Number of samples to 'average' */
 #define AVG_SIZE			128
 #define AVG_FACTOR			1024
-#define NUM_PERF_STATS			NUM_PERF_COUNTERS
 
 #define INC_PERF_COUNTER(cnt)		(++(cnt))
 #define ADD_PERF_COUNTER(cnt, add)	((cnt) += (add))
@@ -219,7 +210,6 @@ enum {
 
 #else
 
-#define NUM_PERF_STATS			0
 #define INC_PERF_COUNTER(cnt)		do {} while (0)
 #define ADD_PERF_COUNTER(cnt, add)	do {} while (0)
 #define AVG_PERF_COUNTER(cnt, sample)	do {} while (0)
@@ -244,13 +234,17 @@ enum cq_type {
 #define XNOR(x, y)		(!(x) == !(y))
 #define ILLEGAL_MAC(addr)	(addr == 0xffffffffffffULL || addr == 0x0)
 
-
 struct mlx4_en_tx_info {
-	struct mbuf *mb;
-	u32 nr_txbb;
-	u8 nr_segs;
-	u8 data_offset;
-	u8 inl;
+        struct mbuf *mb;
+        u32 nr_txbb;
+	u32 nr_bytes;
+        u8 linear;
+        u8 nr_segs;
+        u8 data_offset;
+        u8 inl;
+#if 0
+	u8 ts_requested;
+#endif
 };
 
 
@@ -271,8 +265,14 @@ struct mlx4_en_tx_desc {
 
 #define MLX4_EN_USE_SRQ		0x01000000
 
+#define MLX4_EN_TX_BUDGET 64*4 //Compensate for no NAPI in freeBSD - might need some fine tunning in the future.
+#define MLX4_EN_RX_BUDGET 64
+
+#define MLX4_EN_CX3_LOW_ID	0x1000
+#define MLX4_EN_CX3_HIGH_ID	0x1005
+
 struct mlx4_en_tx_ring {
-	spinlock_t tx_lock;
+        spinlock_t tx_lock;
 	struct mlx4_hwq_resources wqres;
 	u32 size ; /* number of TXBBs */
 	u32 size_mask;
@@ -285,9 +285,11 @@ struct mlx4_en_tx_ring {
 	void *buf;
 	u16 poll_cnt;
 	int blocked;
-	struct buf_ring *br;
 	struct mlx4_en_tx_info *tx_info;
 	u8 *bounce_buf;
+	u8 queue_index;
+	cpuset_t affinity_mask;
+	struct buf_ring *br;
 	u32 last_nr_txbb;
 	struct mlx4_qp qp;
 	struct mlx4_qp_context context;
@@ -296,29 +298,30 @@ struct mlx4_en_tx_ring {
 	struct mlx4_srq dummy;
 	unsigned long bytes;
 	unsigned long packets;
-	unsigned long errors;
-	spinlock_t comp_lock;
+	unsigned long tx_csum;
+	unsigned long queue_stopped;
+	unsigned long wake_queue;
 	struct mlx4_bf bf;
 	bool bf_enabled;
+	struct netdev_queue *tx_queue;
+	int hwtstamp_tx_type;
+	spinlock_t comp_lock;
+	int full_size;
+	int inline_thold;
 	u64 watchdog_time;
 };
 
-struct mlx4_en_ipfrag {
-	struct mbuf *fragments;
-	struct mbuf *last;
-	__be32		saddr;
-	__be32		daddr;
-	__be16		id;
-	u8		protocol;
-	int		total_len;
-	u16		offset;
-};
-
 struct mlx4_en_rx_desc {
 	/* actual number of entries depends on rx ring stride */
 	struct mlx4_wqe_data_seg data[0];
 };
 
+struct mlx4_en_rx_buf {
+	dma_addr_t dma;
+	struct page *page;
+	unsigned int page_offset;
+};
+
 struct mlx4_en_rx_ring {
 	struct mlx4_hwq_resources wqres;
 	u32 size ;	/* number of Rx descs*/
@@ -330,38 +333,66 @@ struct mlx4_en_rx_ring {
 	u32 prod;
 	u32 cons;
 	u32 buf_size;
+	u8  fcs_del;
+	u16 rx_alloc_order;
+	u32 rx_alloc_size;
+	u32 rx_buf_size;
+	u32 rx_mb_size;
+	int qpn;
 	void *buf;
 	void *rx_info;
+	unsigned long errors;
 	unsigned long bytes;
 	unsigned long packets;
-	unsigned long errors;
+#ifdef LL_EXTENDED_STATS
+	unsigned long yields;
+	unsigned long misses;
+	unsigned long cleaned;
+#endif
+	unsigned long csum_ok;
+	unsigned long csum_none;
+	int hwtstamp_rx_filter;
+	int numa_node;
 	struct lro_ctrl lro;
-	struct mlx4_en_ipfrag ipfrag[MLX4_EN_NUM_IPFRAG_SESSIONS];
 };
 
-
 static inline int mlx4_en_can_lro(__be16 status)
 {
-	return (status & cpu_to_be16(MLX4_CQE_STATUS_IPV4	|
-				     MLX4_CQE_STATUS_IPV4F	|
-				     MLX4_CQE_STATUS_IPV6	|
-				     MLX4_CQE_STATUS_IPV4OPT	|
-				     MLX4_CQE_STATUS_TCP	|
-				     MLX4_CQE_STATUS_UDP	|
-				     MLX4_CQE_STATUS_IPOK)) ==
-		cpu_to_be16(MLX4_CQE_STATUS_IPV4 |
-			    MLX4_CQE_STATUS_IPOK |
-			    MLX4_CQE_STATUS_TCP);
+	static __be16 status_all;
+	static __be16 status_ipv4_ipok_tcp;
+	static __be16 status_ipv6_ipok_tcp;
+
+	status_all                         = cpu_to_be16(
+			MLX4_CQE_STATUS_IPV4    |
+			MLX4_CQE_STATUS_IPV4F   |
+			MLX4_CQE_STATUS_IPV6    |
+			MLX4_CQE_STATUS_IPV4OPT |
+			MLX4_CQE_STATUS_TCP     |
+			MLX4_CQE_STATUS_UDP     |
+			MLX4_CQE_STATUS_IPOK);
+	status_ipv4_ipok_tcp               = cpu_to_be16(
+			MLX4_CQE_STATUS_IPV4    |
+			MLX4_CQE_STATUS_IPOK    |
+			MLX4_CQE_STATUS_TCP);
+	status_ipv6_ipok_tcp               = cpu_to_be16(
+			MLX4_CQE_STATUS_IPV6    |
+			MLX4_CQE_STATUS_IPOK    |
+			MLX4_CQE_STATUS_TCP);
+
+	status &= status_all;
+	return (status == status_ipv4_ipok_tcp ||
+			status == status_ipv6_ipok_tcp);
 }
 
+
 struct mlx4_en_cq {
 	struct mlx4_cq          mcq;
 	struct mlx4_hwq_resources wqres;
 	int                     ring;
 	spinlock_t              lock;
 	struct net_device      *dev;
-	/* Per-core Tx cq processing support */
-	struct timer_list timer;
+        /* Per-core Tx cq processing support */
+        struct timer_list timer;
 	int size;
 	int buf_size;
 	unsigned vector;
@@ -373,6 +404,20 @@ struct mlx4_en_cq {
 	struct taskqueue *tq;
 #define MLX4_EN_OPCODE_ERROR	0x1e
 	u32 tot_rx;
+	u32 tot_tx;
+
+#ifdef CONFIG_NET_RX_BUSY_POLL
+	unsigned int state;
+#define MLX4_EN_CQ_STATEIDLE        0
+#define MLX4_EN_CQ_STATENAPI     1    /* NAPI owns this CQ */
+#define MLX4_EN_CQ_STATEPOLL     2    /* poll owns this CQ */
+#define MLX4_CQ_LOCKED (MLX4_EN_CQ_STATENAPI | MLX4_EN_CQ_STATEPOLL)
+#define MLX4_EN_CQ_STATENAPI_YIELD  4    /* NAPI yielded this CQ */
+#define MLX4_EN_CQ_STATEPOLL_YIELD  8    /* poll yielded this CQ */
+#define CQ_YIELD (MLX4_EN_CQ_STATENAPI_YIELD | MLX4_EN_CQ_STATEPOLL_YIELD)
+#define CQ_USER_PEND (MLX4_EN_CQ_STATEPOLL | MLX4_EN_CQ_STATEPOLL_YIELD)
+	spinlock_t poll_lock; /* protects from LLS/napi conflicts */
+#endif  /* CONFIG_NET_RX_BUSY_POLL */
 };
 
 struct mlx4_en_port_profile {
@@ -382,41 +427,42 @@ struct mlx4_en_port_profile {
 	u32 tx_ring_size;
 	u32 rx_ring_size;
 	u8 rx_pause;
+	u8 rx_ppp;
 	u8 tx_pause;
-	u32 rx_ppp;
-	u32 tx_ppp;
+	u8 tx_ppp;
+	int rss_rings;
 };
 
 struct mlx4_en_profile {
 	int rss_xor;
-	int num_lro;
-	int ip_reasm;
-	int tcp_rss;
 	int udp_rss;
 	u8 rss_mask;
 	u32 active_ports;
 	u32 small_pkt_int;
 	u8 no_reset;
+	u8 num_tx_rings_p_up;
 	struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
 };
 
 struct mlx4_en_dev {
-	struct mlx4_dev         *dev;
+	struct mlx4_dev		*dev;
 	struct pci_dev		*pdev;
 	struct mutex		state_lock;
-	struct net_device       *pndev[MLX4_MAX_PORTS + 1];
-	u32                     port_cnt;
+	struct net_device	*pndev[MLX4_MAX_PORTS + 1];
+	u32			port_cnt;
 	bool			device_up;
-	struct mlx4_en_profile  profile;
+	struct mlx4_en_profile	profile;
 	u32			LSO_support;
 	struct workqueue_struct *workqueue;
-	struct device           *dma_device;
-	void __iomem            *uar_map;
-	struct mlx4_uar         priv_uar;
+	struct device		*dma_device;
+	void __iomem		*uar_map;
+	struct mlx4_uar		priv_uar;
 	struct mlx4_mr		mr;
-	u32                     priv_pdn;
-	spinlock_t              uar_lock;
+	u32			priv_pdn;
+	spinlock_t		uar_lock;
 	u8			mac_removed[MLX4_MAX_PORTS + 1];
+	unsigned long		last_overflow_check;
+	unsigned long		overflow_period;
 };
 
 
@@ -428,71 +474,76 @@ struct mlx4_en_rss_map {
 	enum mlx4_qp_state indir_state;
 };
 
-struct mlx4_en_rss_context {
-	__be32 base_qpn;
-	__be32 default_qpn;
-	u16 reserved;
-	u8 hash_fn;
-	u8 flags;
-	__be32 rss_key[10];
-	__be32 base_qpn_udp;
-};
-
 struct mlx4_en_port_state {
 	int link_state;
 	int link_speed;
 	int transciver;
+	int autoneg;
 };
 
-struct mlx4_en_pkt_stats {
-	unsigned long broadcast;
-	unsigned long rx_prio[8];
-	unsigned long tx_prio[8];
-#define NUM_PKT_STATS		17
+enum mlx4_en_mclist_act {
+	MCLIST_NONE,
+	MCLIST_REM,
+	MCLIST_ADD,
 };
 
-struct mlx4_en_port_stats {
-	unsigned long tso_packets;
-	unsigned long queue_stopped;
-	unsigned long wake_queue;
-	unsigned long tx_timeout;
-	unsigned long rx_alloc_failed;
-	unsigned long rx_chksum_good;
-	unsigned long rx_chksum_none;
-	unsigned long tx_chksum_offload;
+struct mlx4_en_mc_list {
+	struct list_head	list;
+	enum mlx4_en_mclist_act	action;
+	u8			addr[ETH_ALEN];
+	u64			reg_id;
 };
 
-struct mlx4_en_perf_stats {
-	u32 tx_poll;
-	u64 tx_pktsz_avg;
-	u32 inflight_avg;
-	u32 tx_coal_avg;
-	u32 rx_coal_avg;
+#ifdef CONFIG_MLX4_EN_DCB
+/* Minimal TC BW - setting to 0 will block traffic */
+#define MLX4_EN_BW_MIN 1
+#define MLX4_EN_BW_MAX 100 /* Utilize 100% of the line */
+
+#define MLX4_EN_TC_ETS 7
+
+#endif
+
+
+enum {
+	MLX4_EN_FLAG_PROMISC		= (1 << 0),
+	MLX4_EN_FLAG_MC_PROMISC		= (1 << 1),
+	/* whether we need to enable hardware loopback by putting dmac
+	 * in Tx WQE
+	 */
+	MLX4_EN_FLAG_ENABLE_HW_LOOPBACK	= (1 << 2),
+	/* whether we need to drop packets that hardware loopback-ed */
+	MLX4_EN_FLAG_RX_FILTER_NEEDED	= (1 << 3),
+	MLX4_EN_FLAG_FORCE_PROMISC	= (1 << 4),
+#ifdef CONFIG_MLX4_EN_DCB
+	MLX4_EN_FLAG_DCB_ENABLED	= (1 << 5)
+#endif
+};
+
+#define MLX4_EN_MAC_HASH_SIZE (1 << BITS_PER_BYTE)
+#define MLX4_EN_MAC_HASH_IDX 5
+
+struct en_port {
+	struct kobject		kobj;
+	struct mlx4_dev		*dev;
+	u8			port_num;
+	u8			vport_num;
 };
 
 struct mlx4_en_frag_info {
-	u16 frag_size;
-	u16 frag_prefix_size;
+        u16 frag_size;
+        u16 frag_prefix_size;
 };
 
-struct mlx4_en_tx_hash_entry {
-	u8 cnt;
-	unsigned int small_pkts;
-	unsigned int big_pkts;
-	unsigned int ring;
-};
 
 struct mlx4_en_priv {
 	struct mlx4_en_dev *mdev;
 	struct mlx4_en_port_profile *prof;
 	struct net_device *dev;
-	bool vlgrp_modified;
-	u32 vlan_register[VLAN_FLTR_SIZE];
-	u32 vlan_unregister[VLAN_FLTR_SIZE];
-	u32 vlans[VLAN_FLTR_SIZE];
-	spinlock_t vlan_lock;
+	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
 	struct mlx4_en_port_state port_state;
 	spinlock_t stats_lock;
+	/* To allow rules removal while port is going down */
+	struct list_head ethtool_list;
 
 	unsigned long last_moder_packets[MAX_RX_RINGS];
 	unsigned long last_moder_tx_packets;
@@ -520,139 +571,381 @@ struct mlx4_en_priv {
 	int port;
 	int registered;
 	int allocated;
-	int rx_csum;
-	u64 mac;
+	int stride;
+	unsigned char current_mac[ETH_ALEN + 2];
+        u64 mac;
 	int mac_index;
 	unsigned max_mtu;
 	int base_qpn;
+	int cqe_factor;
 
 	struct mlx4_en_rss_map rss_map;
-	u16 tx_prio_map[8];
+	__be32 ctrl_flags;
 	u32 flags;
-#define MLX4_EN_FLAG_PROMISC	0x1
+	u8 num_tx_rings_p_up;
 	u32 tx_ring_num;
 	u32 rx_ring_num;
 	u32 rx_mb_size;
-	struct mlx4_en_frag_info frag_info[MLX4_EN_MAX_RX_FRAGS];
-	u16 num_frags;
+        struct mlx4_en_frag_info frag_info[MLX4_EN_MAX_RX_FRAGS];
+	u16 rx_alloc_order;
+	u32 rx_alloc_size;
+	u32 rx_buf_size;
+        u16 num_frags;
 	u16 log_rx_info;
-	int ip_reasm;
-	bool wol;
 
-	struct mlx4_en_tx_ring tx_ring[MAX_TX_RINGS];
-	struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
-	struct mlx4_en_cq tx_cq[MAX_TX_RINGS];
-	struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
-	struct mlx4_en_tx_hash_entry tx_hash[MLX4_EN_TX_HASH_SIZE];
-	struct work_struct mcast_task;
-	struct work_struct start_port_task;
-	struct work_struct stop_port_task;
+	struct mlx4_en_tx_ring **tx_ring;
+	struct mlx4_en_rx_ring *rx_ring[MAX_RX_RINGS];
+	struct mlx4_en_cq **tx_cq;
+	struct mlx4_en_cq *rx_cq[MAX_RX_RINGS];
+	struct mlx4_qp drop_qp;
+	struct work_struct rx_mode_task;
 	struct work_struct watchdog_task;
 	struct work_struct linkstate_task;
 	struct delayed_work stats_task;
+	struct delayed_work service_task;
 	struct mlx4_en_perf_stats pstats;
 	struct mlx4_en_pkt_stats pkstats;
+	struct mlx4_en_pkt_stats pkstats_last;
+	struct mlx4_en_flow_stats flowstats[MLX4_NUM_PRIORITIES];
 	struct mlx4_en_port_stats port_stats;
+	struct mlx4_en_vport_stats vport_stats;
+	struct mlx4_en_vf_stats vf_stats;
+	DECLARE_BITMAP(stats_bitmap, NUM_ALL_STATS);
+	struct list_head mc_list;
+	struct list_head curr_list;
+	u64 broadcast_id;
 	struct mlx4_en_stat_out_mbox hw_stats;
-	struct ifmedia media;
+	int vids[128];
+	bool wol;
+	struct device *ddev;
+	struct dentry *dev_root;
+	u32 counter_index;
 	eventhandler_tag vlan_attach;
 	eventhandler_tag vlan_detach;
 	struct callout watchdog_timer;
+        struct ifmedia media;
 	volatile int blocked;
 	struct sysctl_oid *sysctl;
 	struct sysctl_ctx_list conf_ctx;
 	struct sysctl_ctx_list stat_ctx;
+#define MLX4_EN_MAC_HASH_IDX 5
+	struct hlist_head mac_hash[MLX4_EN_MAC_HASH_SIZE];
+
+#ifdef CONFIG_MLX4_EN_DCB
+	struct ieee_ets ets;
+	u16 maxrate[IEEE_8021QAZ_MAX_TCS];
+	u8 dcbx_cap;
+#endif
+#ifdef CONFIG_RFS_ACCEL
+	spinlock_t filters_lock;
+	int last_filter_id;
+	struct list_head filters;
+	struct hlist_head filter_hash[1 << MLX4_EN_FILTER_HASH_SHIFT];
+#endif
+	struct en_port *vf_ports[MLX4_MAX_NUM_VF];
+	unsigned long last_ifq_jiffies;
+	u64 if_counters_rx_errors;
+	u64 if_counters_rx_no_buffer;
+
 };
 
 enum mlx4_en_wol {
 	MLX4_EN_WOL_MAGIC = (1ULL << 61),
 	MLX4_EN_WOL_ENABLED = (1ULL << 62),
-	MLX4_EN_WOL_DO_MODIFY = (1ULL << 63),
 };
 
-int mlx4_en_transmit(struct net_device *dev, struct mbuf *mb);
-void mlx4_en_qflush(struct net_device *dev);
+struct mlx4_mac_entry {
+	struct hlist_node hlist;
+	unsigned char mac[ETH_ALEN + 2];
+	u64 reg_id;
+};
+
+#ifdef CONFIG_NET_RX_BUSY_POLL
+static inline void mlx4_en_cq_init_lock(struct mlx4_en_cq *cq)
+{
+	spin_lock_init(&cq->poll_lock);
+	cq->state = MLX4_EN_CQ_STATEIDLE;
+}
+
+/* called from the device poll rutine to get ownership of a cq */
+static inline bool mlx4_en_cq_lock_napi(struct mlx4_en_cq *cq)
+{
+	int rc = true;
+	spin_lock(&cq->poll_lock);
+	if (cq->state & MLX4_CQ_LOCKED) {
+		WARN_ON(cq->state & MLX4_EN_CQ_STATENAPI);
+		cq->state |= MLX4_EN_CQ_STATENAPI_YIELD;
+		rc = false;
+	} else
+		/* we don't care if someone yielded */
+		cq->state = MLX4_EN_CQ_STATENAPI;
+	spin_unlock(&cq->poll_lock);
+	return rc;
+}
+
+/* returns true is someone tried to get the cq while napi had it */
+static inline bool mlx4_en_cq_unlock_napi(struct mlx4_en_cq *cq)
+{
+	int rc = false;
+	spin_lock(&cq->poll_lock);
+	WARN_ON(cq->state & (MLX4_EN_CQ_STATEPOLL |
+			     MLX4_EN_CQ_STATENAPI_YIELD));
+
+	if (cq->state & MLX4_EN_CQ_STATEPOLL_YIELD)
+		rc = true;
+	cq->state = MLX4_EN_CQ_STATEIDLE;
+	spin_unlock(&cq->poll_lock);
+	return rc;
+}
+
+/* called from mlx4_en_low_latency_poll() */
+static inline bool mlx4_en_cq_lock_poll(struct mlx4_en_cq *cq)
+{
+	int rc = true;
+	spin_lock_bh(&cq->poll_lock);
+	if ((cq->state & MLX4_CQ_LOCKED)) {
+		struct net_device *dev = cq->dev;
+		struct mlx4_en_priv *priv = netdev_priv(dev);
+		struct mlx4_en_rx_ring *rx_ring = priv->rx_ring[cq->ring];
+
+		cq->state |= MLX4_EN_CQ_STATEPOLL_YIELD;
+		rc = false;
+#ifdef LL_EXTENDED_STATS
+		rx_ring->yields++;
+#endif
+	} else
+		/* preserve yield marks */
+		cq->state |= MLX4_EN_CQ_STATEPOLL;
+	spin_unlock_bh(&cq->poll_lock);
+	return rc;
+}
+
+/* returns true if someone tried to get the cq while it was locked */
+static inline bool mlx4_en_cq_unlock_poll(struct mlx4_en_cq *cq)
+{
+	int rc = false;
+	spin_lock_bh(&cq->poll_lock);
+	WARN_ON(cq->state & (MLX4_EN_CQ_STATENAPI));
+
+	if (cq->state & MLX4_EN_CQ_STATEPOLL_YIELD)
+		rc = true;
+	cq->state = MLX4_EN_CQ_STATEIDLE;
+	spin_unlock_bh(&cq->poll_lock);
+	return rc;
+}
+
+/* true if a socket is polling, even if it did not get the lock */
+static inline bool mlx4_en_cq_ll_polling(struct mlx4_en_cq *cq)
+{
+	WARN_ON(!(cq->state & MLX4_CQ_LOCKED));
+	return cq->state & CQ_USER_PEND;
+}
+#else
+static inline void mlx4_en_cq_init_lock(struct mlx4_en_cq *cq)
+{
+}
+
+static inline bool mlx4_en_cq_lock_napi(struct mlx4_en_cq *cq)
+{
+	return true;
+}
+
+static inline bool mlx4_en_cq_unlock_napi(struct mlx4_en_cq *cq)
+{
+	return false;
+}
+
+static inline bool mlx4_en_cq_lock_poll(struct mlx4_en_cq *cq)
+{
+	return false;
+}
+
+static inline bool mlx4_en_cq_unlock_poll(struct mlx4_en_cq *cq)
+{
+	return false;
+}
+
+static inline bool mlx4_en_cq_ll_polling(struct mlx4_en_cq *cq)
+{
+	return false;
+}
+#endif /* CONFIG_NET_RX_BUSY_POLL */
+
+#define MLX4_EN_WOL_DO_MODIFY (1ULL << 63)
 
-int mlx4_en_rx_frags(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring,
-		     struct mbuf *mb, struct mlx4_cqe *cqe);
-void mlx4_en_flush_frags(struct mlx4_en_priv *priv,
-			 struct mlx4_en_rx_ring *ring);
 void mlx4_en_destroy_netdev(struct net_device *dev);
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 			struct mlx4_en_port_profile *prof);
 
-int mlx4_en_do_start_port(struct net_device *dev);
-void mlx4_en_do_stop_port(struct net_device *dev);
+int mlx4_en_start_port(struct net_device *dev);
+void mlx4_en_stop_port(struct net_device *dev);
 
 void mlx4_en_free_resources(struct mlx4_en_priv *priv);
 int mlx4_en_alloc_resources(struct mlx4_en_priv *priv);
 
-int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
-		      int entries, int ring, enum cq_type mode);
-void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
-int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+int mlx4_en_pre_config(struct mlx4_en_priv *priv);
+int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq **pcq,
+		      int entries, int ring, enum cq_type mode, int node);
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq **pcq);
+int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+			int cq_idx);
 void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 
-void mlx4_en_poll_tx_cq(unsigned long data);
 void mlx4_en_tx_irq(struct mlx4_cq *mcq);
 u16 mlx4_en_select_queue(struct net_device *dev, struct mbuf *mb);
 
-int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring,
-			   u32 size, u16 stride);
-void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring);
+int mlx4_en_transmit(struct ifnet *dev, struct mbuf *m);
+int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
+			   struct mlx4_en_tx_ring **pring,
+			   u32 size, u16 stride, int node, int queue_idx);
+void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
+			     struct mlx4_en_tx_ring **pring);
 int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
 			     struct mlx4_en_tx_ring *ring,
-			     int cq);
+			     int cq, int user_prio);
 void mlx4_en_deactivate_tx_ring(struct mlx4_en_priv *priv,
 				struct mlx4_en_tx_ring *ring);
+void mlx4_en_qflush(struct ifnet *dev);
 
 int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
-			   struct mlx4_en_rx_ring *ring, u32 size);
+			   struct mlx4_en_rx_ring **pring,
+			   u32 size, int node);
 void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
-			     struct mlx4_en_rx_ring *ring);
+			     struct mlx4_en_rx_ring **pring,
+			     u32 size, u16 stride);
+void mlx4_en_tx_que(void *context, int pending);
+void mlx4_en_rx_que(void *context, int pending);
 int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv);
 void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
 				struct mlx4_en_rx_ring *ring);
 int mlx4_en_process_rx_cq(struct net_device *dev,
 			  struct mlx4_en_cq *cq,
 			  int budget);
-int mlx4_en_process_rx_cq_mb(struct net_device *dev,
-			      struct mlx4_en_cq *cq,
-			      int budget);
-void mlx4_en_tx_que(void *context, int pending);
-void mlx4_en_rx_que(void *context, int pending);
+void mlx4_en_poll_tx_cq(unsigned long data);
 void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
-			     int is_tx, int rss, int qpn, int cqn,
-			     struct mlx4_qp_context *context);
+		int is_tx, int rss, int qpn, int cqn, int user_prio,
+		struct mlx4_qp_context *context);
 void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event);
 int mlx4_en_map_buffer(struct mlx4_buf *buf);
 void mlx4_en_unmap_buffer(struct mlx4_buf *buf);
-
 void mlx4_en_calc_rx_buf(struct net_device *dev);
-void mlx4_en_set_prio_map(struct mlx4_en_priv *priv, u16 *prio_map, u32 ring_num);
+
 int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv);
 void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv);
+int mlx4_en_create_drop_qp(struct mlx4_en_priv *priv);
+void mlx4_en_destroy_drop_qp(struct mlx4_en_priv *priv);
 int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring);
 void mlx4_en_rx_irq(struct mlx4_cq *mcq);
 
-//int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode);
-int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, u32 *vlans);
-//int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
-//			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
-//int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
-//			   u8 promisc);
+int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode);
+int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv);
 
 int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset);
 int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port);
+int mlx4_en_get_vport_stats(struct mlx4_en_dev *mdev, u8 port);
+void mlx4_en_create_debug_files(struct mlx4_en_priv *priv);
+void mlx4_en_delete_debug_files(struct mlx4_en_priv *priv);
+int mlx4_en_register_debugfs(void);
+void mlx4_en_unregister_debugfs(void);
+
+#ifdef CONFIG_MLX4_EN_DCB
+extern const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops;
+extern const struct dcbnl_rtnl_ops mlx4_en_dcbnl_pfc_ops;
+#endif
+
+int mlx4_en_setup_tc(struct net_device *dev, u8 up);
+
+#ifdef CONFIG_RFS_ACCEL
+void mlx4_en_cleanup_filters(struct mlx4_en_priv *priv,
+			     struct mlx4_en_rx_ring *rx_ring);
+#endif
 
 #define MLX4_EN_NUM_SELF_TEST	5
 void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf);
-u64 mlx4_en_mac_to_u64(u8 *addr);
+void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev);
+
+/*
+ * Functions for time stamping
+ */
+#define SKBTX_HW_TSTAMP (1 << 0)
+#define SKBTX_IN_PROGRESS (1 << 2)
+
+u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe);
+
+/* Functions for caching and restoring statistics */
+int mlx4_en_get_sset_count(struct net_device *dev, int sset);
+void mlx4_en_restore_ethtool_stats(struct mlx4_en_priv *priv,
+				    u64 *data);
 
 /*
  * Globals
  */
 extern const struct ethtool_ops mlx4_en_ethtool_ops;
+
+/*
+ * Defines for link speed - needed by selftest
+ */
+#define MLX4_EN_LINK_SPEED_1G	1000
+#define MLX4_EN_LINK_SPEED_10G	10000
+#define MLX4_EN_LINK_SPEED_40G	40000
+
+enum {
+        NETIF_MSG_DRV           = 0x0001,
+        NETIF_MSG_PROBE         = 0x0002,
+        NETIF_MSG_LINK          = 0x0004,
+        NETIF_MSG_TIMER         = 0x0008,
+        NETIF_MSG_IFDOWN        = 0x0010,
+        NETIF_MSG_IFUP          = 0x0020,
+        NETIF_MSG_RX_ERR        = 0x0040,
+        NETIF_MSG_TX_ERR        = 0x0080,
+        NETIF_MSG_TX_QUEUED     = 0x0100,
+        NETIF_MSG_INTR          = 0x0200,
+        NETIF_MSG_TX_DONE       = 0x0400,
+        NETIF_MSG_RX_STATUS     = 0x0800,
+        NETIF_MSG_PKTDATA       = 0x1000,
+        NETIF_MSG_HW            = 0x2000,
+        NETIF_MSG_WOL           = 0x4000,
+};
+
+
+/*
+ * printk / logging functions
+ */
+
+#define en_print(level, priv, format, arg...)                   \
+        {                                                       \
+        if ((priv)->registered)                                 \
+                printk(level "%s: %s: " format, DRV_NAME,       \
+                        (priv->dev)->if_xname, ## arg); \
+        else                                                    \
+                printk(level "%s: %s: Port %d: " format,        \
+                        DRV_NAME, dev_name(&priv->mdev->pdev->dev), \
+                        (priv)->port, ## arg);                  \
+        }
+
+
+#define en_dbg(mlevel, priv, format, arg...)			\
+do {								\
+	if (NETIF_MSG_##mlevel & priv->msg_enable)		\
+		en_print(KERN_DEBUG, priv, format, ##arg);	\
+} while (0)
+#define en_warn(priv, format, arg...)			\
+	en_print(KERN_WARNING, priv, format, ##arg)
+#define en_err(priv, format, arg...)			\
+	en_print(KERN_ERR, priv, format, ##arg)
+#define en_info(priv, format, arg...)			\
+	en_print(KERN_INFO, priv, format, ## arg)
+
+#define mlx4_err(mdev, format, arg...)			\
+	pr_err("%s %s: " format, DRV_NAME,		\
+	       dev_name(&mdev->pdev->dev), ##arg)
+#define mlx4_info(mdev, format, arg...)			\
+	pr_info("%s %s: " format, DRV_NAME,		\
+		dev_name(&mdev->pdev->dev), ##arg)
+#define mlx4_warn(mdev, format, arg...)			\
+	pr_warning("%s %s: " format, DRV_NAME,		\
+		   dev_name(&mdev->pdev->dev), ##arg)
+
 #endif
diff --git a/sys/ofed/drivers/net/mlx4/mlx4_stats.h b/sys/ofed/drivers/net/mlx4/mlx4_stats.h
new file mode 100644
index 000000000000..0270cefd0ec4
--- /dev/null
+++ b/sys/ofed/drivers/net/mlx4/mlx4_stats.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2014 Mellanox Technologies Ltd.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _MLX4_STATS_
+#define _MLX4_STATS_
+
+
+#ifdef MLX4_EN_PERF_STAT
+#define NUM_PERF_STATS			NUM_PERF_COUNTERS
+#else
+#define NUM_PERF_STATS			0
+#endif
+
+#define NUM_PRIORITIES	9
+#define NUM_PRIORITY_STATS 2
+
+struct mlx4_en_pkt_stats {
+	unsigned long rx_packets;
+	unsigned long rx_bytes;
+	unsigned long rx_multicast_packets;
+	unsigned long rx_broadcast_packets;
+	unsigned long rx_errors;
+	unsigned long rx_dropped;
+	unsigned long rx_length_errors;
+	unsigned long rx_over_errors;
+	unsigned long rx_crc_errors;
+	unsigned long rx_jabbers;
+	unsigned long rx_in_range_length_error;
+	unsigned long rx_out_range_length_error;
+	unsigned long rx_lt_64_bytes_packets;
+	unsigned long rx_127_bytes_packets;
+	unsigned long rx_255_bytes_packets;
+	unsigned long rx_511_bytes_packets;
+	unsigned long rx_1023_bytes_packets;
+	unsigned long rx_1518_bytes_packets;
+	unsigned long rx_1522_bytes_packets;
+	unsigned long rx_1548_bytes_packets;
+	unsigned long rx_gt_1548_bytes_packets;
+	unsigned long tx_packets;
+	unsigned long tx_bytes;
+	unsigned long tx_multicast_packets;
+	unsigned long tx_broadcast_packets;
+	unsigned long tx_errors;
+	unsigned long tx_dropped;
+	unsigned long tx_lt_64_bytes_packets;
+	unsigned long tx_127_bytes_packets;
+	unsigned long tx_255_bytes_packets;
+	unsigned long tx_511_bytes_packets;
+	unsigned long tx_1023_bytes_packets;
+	unsigned long tx_1518_bytes_packets;
+	unsigned long tx_1522_bytes_packets;
+	unsigned long tx_1548_bytes_packets;
+	unsigned long tx_gt_1548_bytes_packets;
+	unsigned long rx_prio[NUM_PRIORITIES][NUM_PRIORITY_STATS];
+	unsigned long tx_prio[NUM_PRIORITIES][NUM_PRIORITY_STATS];
+#define NUM_PKT_STATS		72
+};
+
+struct mlx4_en_vf_stats {
+	unsigned long rx_packets;
+	unsigned long rx_bytes;
+	unsigned long rx_multicast_packets;
+	unsigned long rx_broadcast_packets;
+	unsigned long rx_errors;
+	unsigned long rx_dropped;
+	unsigned long tx_packets;
+	unsigned long tx_bytes;
+	unsigned long tx_multicast_packets;
+	unsigned long tx_broadcast_packets;
+	unsigned long tx_errors;
+#define NUM_VF_STATS		11
+};
+
+struct mlx4_en_vport_stats {
+	unsigned long rx_unicast_packets;
+	unsigned long rx_unicast_bytes;
+	unsigned long rx_multicast_packets;
+	unsigned long rx_multicast_bytes;
+	unsigned long rx_broadcast_packets;
+	unsigned long rx_broadcast_bytes;
+	unsigned long rx_dropped;
+	unsigned long rx_errors;
+	unsigned long tx_unicast_packets;
+	unsigned long tx_unicast_bytes;
+	unsigned long tx_multicast_packets;
+	unsigned long tx_multicast_bytes;
+	unsigned long tx_broadcast_packets;
+	unsigned long tx_broadcast_bytes;
+	unsigned long tx_errors;
+#define NUM_VPORT_STATS		15
+};
+
+struct mlx4_en_port_stats {
+	unsigned long tso_packets;
+	unsigned long queue_stopped;
+	unsigned long wake_queue;
+	unsigned long tx_timeout;
+	unsigned long rx_alloc_failed;
+	unsigned long rx_chksum_good;
+	unsigned long rx_chksum_none;
+	unsigned long tx_chksum_offload;
+#define NUM_PORT_STATS		8
+};
+
+struct mlx4_en_perf_stats {
+	u32 tx_poll;
+	u64 tx_pktsz_avg;
+	u32 inflight_avg;
+	u16 tx_coal_avg;
+	u16 rx_coal_avg;
+	u32 napi_quota;
+#define NUM_PERF_COUNTERS		6
+};
+
+struct mlx4_en_flow_stats {
+	u64 rx_pause;
+	u64 rx_pause_duration;
+	u64 rx_pause_transition;
+	u64 tx_pause;
+	u64 tx_pause_duration;
+	u64 tx_pause_transition;
+};
+#define MLX4_NUM_PRIORITIES	8
+#define NUM_FLOW_PRIORITY_STATS	6
+#define NUM_FLOW_STATS		(NUM_FLOW_PRIORITY_STATS*MLX4_NUM_PRIORITIES)
+
+
+struct mlx4_en_stat_out_flow_control_mbox {
+	/* Total number of PAUSE frames received from the far-end port */
+	__be64 rx_pause;
+	/* Total number of microseconds that far-end port requested to pause
+	 * transmission of packets
+	 */
+	__be64 rx_pause_duration;
+	/* Number of received transmission from XOFF state to XON state */
+	__be64 rx_pause_transition;
+	/* Total number of PAUSE frames sent from the far-end port */
+	__be64 tx_pause;
+	/* Total time in microseconds that transmission of packets has been
+	 * paused
+	 */
+	__be64 tx_pause_duration;
+	/* Number of transmitter transitions from XOFF state to XON state */
+	__be64 tx_pause_transition;
+	/* Reserverd */
+	__be64 reserved[2];
+};
+
+int mlx4_get_vport_ethtool_stats(struct mlx4_dev *dev, int port,
+                         struct mlx4_en_vport_stats *vport_stats,
+                         int reset);
+
+#define NUM_ALL_STATS	(NUM_PKT_STATS + NUM_FLOW_STATS + NUM_VPORT_STATS + \
+			 NUM_VF_STATS + NUM_PORT_STATS + NUM_PERF_STATS)
+#endif
diff --git a/sys/ofed/drivers/net/mlx4/mr.c b/sys/ofed/drivers/net/mlx4/mr.c
index 69a0abd922e6..876d16dba1a3 100644
--- a/sys/ofed/drivers/net/mlx4/mr.c
+++ b/sys/ofed/drivers/net/mlx4/mr.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -32,30 +32,20 @@
  * SOFTWARE.
  */
 
+#include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
 
 #include <linux/mlx4/cmd.h>
 
+#include <linux/math64.h>
+
 #include "mlx4.h"
 #include "icm.h"
 
-#define MLX4_MPT_FLAG_SW_OWNS	    (0xfUL << 28)
-#define MLX4_MPT_FLAG_FREE	    (0x3UL << 28)
-#define MLX4_MPT_FLAG_MIO	    (1 << 17)
-#define MLX4_MPT_FLAG_BIND_ENABLE   (1 << 15)
-#define MLX4_MPT_FLAG_PHYSICAL	    (1 <<  9)
-#define MLX4_MPT_FLAG_REGION	    (1 <<  8)
-
-#define MLX4_MPT_PD_FLAG_FAST_REG   (1 << 27)
-#define MLX4_MPT_PD_FLAG_RAE	    (1 << 28)
-#define MLX4_MPT_PD_FLAG_EN_INV	    (3 << 24)
-
-#define MLX4_MPT_STATUS_SW		0xF0
-#define MLX4_MPT_STATUS_HW		0x00
-
 static u32 mlx4_buddy_alloc(struct mlx4_buddy *buddy, int order)
 {
 	int o;
@@ -129,9 +119,8 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
 	for (i = 0; i <= buddy->max_order; ++i) {
 		s = BITS_TO_LONGS(1 << (buddy->max_order - i));
 		buddy->bits[i] = kcalloc(s, sizeof (long), GFP_KERNEL | __GFP_NOWARN);
-		if (!buddy->bits[i]) {
-                        goto err_out_free;
-		}
+		if (!buddy->bits[i]) 
+			goto err_out_free;
 	}
 
 	set_bit(0, buddy->bits[buddy->max_order]);
@@ -141,8 +130,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
 
 err_out_free:
 	for (i = 0; i <= buddy->max_order; ++i)
-		if ( buddy->bits[i] )
-			kfree(buddy->bits[i]);
+		kfree(buddy->bits[i]);
 
 err_out:
 	kfree(buddy->bits);
@@ -156,7 +144,7 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
 	int i;
 
 	for (i = 0; i <= buddy->max_order; ++i)
-                kfree(buddy->bits[i]);
+		kfree(buddy->bits[i]);
 
 	kfree(buddy->bits);
 	kfree(buddy->num_free);
@@ -315,7 +303,7 @@ static int mlx4_mr_alloc_reserved(struct mlx4_dev *dev, u32 mridx, u32 pd,
 	mr->size       = size;
 	mr->pd	       = pd;
 	mr->access     = access;
-	mr->enabled    = MLX4_MR_DISABLED;
+	mr->enabled    = MLX4_MPT_DISABLED;
 	mr->key	       = hw_index_to_key(mridx);
 
 	return mlx4_mtt_init(dev, npages, page_shift, &mr->mtt);
@@ -329,14 +317,14 @@ static int mlx4_WRITE_MTT(struct mlx4_dev *dev,
 			MLX4_CMD_TIME_CLASS_A,  MLX4_CMD_WRAPPED);
 }
 
-int __mlx4_mr_reserve(struct mlx4_dev *dev)
+int __mlx4_mpt_reserve(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 
 	return mlx4_bitmap_alloc(&priv->mr_table.mpt_bitmap);
 }
 
-static int mlx4_mr_reserve(struct mlx4_dev *dev)
+static int mlx4_mpt_reserve(struct mlx4_dev *dev)
 {
 	u64 out_param;
 
@@ -347,17 +335,17 @@ static int mlx4_mr_reserve(struct mlx4_dev *dev)
 			return -1;
 		return get_param_l(&out_param);
 	}
-	return  __mlx4_mr_reserve(dev);
+	return  __mlx4_mpt_reserve(dev);
 }
 
-void __mlx4_mr_release(struct mlx4_dev *dev, u32 index)
+void __mlx4_mpt_release(struct mlx4_dev *dev, u32 index)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 
-	mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, index);
+	mlx4_bitmap_free(&priv->mr_table.mpt_bitmap, index, MLX4_NO_RR);
 }
 
-static void mlx4_mr_release(struct mlx4_dev *dev, u32 index)
+static void mlx4_mpt_release(struct mlx4_dev *dev, u32 index)
 {
 	u64 in_param = 0;
 
@@ -370,17 +358,17 @@ static void mlx4_mr_release(struct mlx4_dev *dev, u32 index)
 				  index);
 		return;
 	}
-	__mlx4_mr_release(dev, index);
+	__mlx4_mpt_release(dev, index);
 }
 
-int __mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index)
+int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index)
 {
 	struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
 
 	return mlx4_table_get(dev, &mr_table->dmpt_table, index);
 }
 
-static int mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index)
+static int mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index)
 {
 	u64 param = 0;
 
@@ -391,17 +379,17 @@ static int mlx4_mr_alloc_icm(struct mlx4_dev *dev, u32 index)
 							MLX4_CMD_TIME_CLASS_A,
 							MLX4_CMD_WRAPPED);
 	}
-	return __mlx4_mr_alloc_icm(dev, index);
+	return __mlx4_mpt_alloc_icm(dev, index);
 }
 
-void __mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index)
+void __mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index)
 {
 	struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
 
 	mlx4_table_put(dev, &mr_table->dmpt_table, index);
 }
 
-static void mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index)
+static void mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index)
 {
 	u64 in_param = 0;
 
@@ -414,7 +402,7 @@ static void mlx4_mr_free_icm(struct mlx4_dev *dev, u32 index)
 				  index);
 		return;
 	}
-	return __mlx4_mr_free_icm(dev, index);
+	return __mlx4_mpt_free_icm(dev, index);
 }
 
 int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
@@ -423,41 +411,52 @@ int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
 	u32 index;
 	int err;
 
-	index = mlx4_mr_reserve(dev);
+	index = mlx4_mpt_reserve(dev);
 	if (index == -1)
 		return -ENOMEM;
 
 	err = mlx4_mr_alloc_reserved(dev, index, pd, iova, size,
 				     access, npages, page_shift, mr);
 	if (err)
-		mlx4_mr_release(dev, index);
+		mlx4_mpt_release(dev, index);
 
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_alloc);
 
-static void mlx4_mr_free_reserved(struct mlx4_dev *dev, struct mlx4_mr *mr)
+static int mlx4_mr_free_reserved(struct mlx4_dev *dev, struct mlx4_mr *mr)
 {
 	int err;
 
-	if (mr->enabled == MLX4_MR_EN_HW) {
+	if (mr->enabled == MLX4_MPT_EN_HW) {
 		err = mlx4_HW2SW_MPT(dev, NULL,
 				     key_to_hw_index(mr->key) &
 				     (dev->caps.num_mpts - 1));
-		if (err)
-			mlx4_warn(dev, "xxx HW2SW_MPT failed (%d)\n", err);
+		if (err) {
+			mlx4_warn(dev, "HW2SW_MPT failed (%d).", err);
+			mlx4_warn(dev, "Most likely the MR has MWs bound to it.\n");
+			return err;
+		}
 
-		mr->enabled = MLX4_MR_EN_SW;
+		mr->enabled = MLX4_MPT_EN_SW;
 	}
 	mlx4_mtt_cleanup(dev, &mr->mtt);
+
+	return 0;
 }
 
-void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr)
+int mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr)
 {
-	mlx4_mr_free_reserved(dev, mr);
+	int ret;
+
+	ret = mlx4_mr_free_reserved(dev, mr);
+	if (ret)
+		return ret;
 	if (mr->enabled)
-		mlx4_mr_free_icm(dev, key_to_hw_index(mr->key));
-	mlx4_mr_release(dev, key_to_hw_index(mr->key));
+		mlx4_mpt_free_icm(dev, key_to_hw_index(mr->key));
+	mlx4_mpt_release(dev, key_to_hw_index(mr->key));
+
+	return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_free);
 
@@ -467,7 +466,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
 	struct mlx4_mpt_entry *mpt_entry;
 	int err;
 
-	err = mlx4_mr_alloc_icm(dev, key_to_hw_index(mr->key));
+	err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mr->key));
 	if (err)
 		return err;
 
@@ -514,7 +513,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
 		mlx4_warn(dev, "SW2HW_MPT failed (%d)\n", err);
 		goto err_cmd;
 	}
-	mr->enabled = MLX4_MR_EN_HW;
+	mr->enabled = MLX4_MPT_EN_HW;
 
 	mlx4_free_cmd_mailbox(dev, mailbox);
 
@@ -524,7 +523,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
 	mlx4_free_cmd_mailbox(dev, mailbox);
 
 err_table:
-	mlx4_mr_free_icm(dev, key_to_hw_index(mr->key));
+	mlx4_mpt_free_icm(dev, key_to_hw_index(mr->key));
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_enable);
@@ -651,6 +650,95 @@ int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 }
 EXPORT_SYMBOL_GPL(mlx4_buf_write_mtt);
 
+int mlx4_mw_alloc(struct mlx4_dev *dev, u32 pd, enum mlx4_mw_type type,
+		  struct mlx4_mw *mw)
+{
+	u32 index;
+
+	index = mlx4_mpt_reserve(dev);
+	if (index == -1)
+		return -ENOMEM;
+
+	mw->key	    = hw_index_to_key(index);
+	mw->pd      = pd;
+	mw->type    = type;
+	mw->enabled = MLX4_MPT_DISABLED;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_mw_alloc);
+
+int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw)
+{
+	struct mlx4_cmd_mailbox *mailbox;
+	struct mlx4_mpt_entry *mpt_entry;
+	int err;
+
+	err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mw->key));
+	if (err)
+		return err;
+
+	mailbox = mlx4_alloc_cmd_mailbox(dev);
+	if (IS_ERR(mailbox)) {
+		err = PTR_ERR(mailbox);
+		goto err_table;
+	}
+	mpt_entry = mailbox->buf;
+
+	memset(mpt_entry, 0, sizeof(*mpt_entry));
+
+	/* Note that the MLX4_MPT_FLAG_REGION bit in mpt_entry->flags is turned
+	* off, thus creating a memory window and not a memory region.
+	*/
+	mpt_entry->key	       = cpu_to_be32(key_to_hw_index(mw->key));
+	mpt_entry->pd_flags    = cpu_to_be32(mw->pd);
+	if (mw->type == MLX4_MW_TYPE_2) {
+		mpt_entry->flags    |= cpu_to_be32(MLX4_MPT_FLAG_FREE);
+		mpt_entry->qpn       = cpu_to_be32(MLX4_MPT_QP_FLAG_BOUND_QP);
+		mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_EN_INV);
+	}
+
+	err = mlx4_SW2HW_MPT(dev, mailbox,
+			     key_to_hw_index(mw->key) &
+			     (dev->caps.num_mpts - 1));
+	if (err) {
+		mlx4_warn(dev, "SW2HW_MPT failed (%d)\n", err);
+		goto err_cmd;
+	}
+	mw->enabled = MLX4_MPT_EN_HW;
+
+	mlx4_free_cmd_mailbox(dev, mailbox);
+
+	return 0;
+
+err_cmd:
+	mlx4_free_cmd_mailbox(dev, mailbox);
+
+err_table:
+	mlx4_mpt_free_icm(dev, key_to_hw_index(mw->key));
+	return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_mw_enable);
+
+void mlx4_mw_free(struct mlx4_dev *dev, struct mlx4_mw *mw)
+{
+	int err;
+
+	if (mw->enabled == MLX4_MPT_EN_HW) {
+		err = mlx4_HW2SW_MPT(dev, NULL,
+				     key_to_hw_index(mw->key) &
+				     (dev->caps.num_mpts - 1));
+		if (err)
+			mlx4_warn(dev, "xxx HW2SW_MPT failed (%d)\n", err);
+
+		mw->enabled = MLX4_MPT_EN_SW;
+	}
+	if (mw->enabled)
+		mlx4_mpt_free_icm(dev, key_to_hw_index(mw->key));
+	mlx4_mpt_release(dev, key_to_hw_index(mw->key));
+}
+EXPORT_SYMBOL_GPL(mlx4_mw_free);
+
 int mlx4_init_mr_table(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -671,8 +759,8 @@ int mlx4_init_mr_table(struct mlx4_dev *dev)
 		return err;
 
 	err = mlx4_buddy_init(&mr_table->mtt_buddy,
-			      ilog2((u32)dev->caps.num_mtts /
-			      (1 << log_mtts_per_seg)));
+			      ilog2(div_u64(dev->caps.num_mtts,
+			      (1 << log_mtts_per_seg))));
 	if (err)
 		goto err_buddy;
 
@@ -791,7 +879,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
 		   int max_maps, u8 page_shift, struct mlx4_fmr *fmr)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
-	int err = -ENOMEM;
+	int err = -ENOMEM, ret;
 
 	if (max_maps > dev->caps.max_fmr_maps)
 		return -EINVAL;
@@ -825,7 +913,9 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
 	return 0;
 
 err_free:
-	mlx4_mr_free(dev, &fmr->mr);
+	ret = mlx4_mr_free(dev, &fmr->mr);
+	if (ret)
+		mlx4_err(dev, "Error deregistering MR. The system may have become unstable.");
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx4_fmr_alloc);
@@ -851,40 +941,48 @@ EXPORT_SYMBOL_GPL(mlx4_fmr_enable);
 void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr,
 		    u32 *lkey, u32 *rkey)
 {
-	struct mlx4_cmd_mailbox *mailbox;
-	int err;
+	u32 key;
 
 	if (!fmr->maps)
 		return;
 
+	key = key_to_hw_index(fmr->mr.key) & (dev->caps.num_mpts - 1);
+
+	*(u8 *)fmr->mpt = MLX4_MPT_STATUS_SW;
+
+	/* Make sure MPT status is visible before changing MPT fields */
+	wmb();
+
+	fmr->mr.key = hw_index_to_key(key);
+
+	fmr->mpt->key    = cpu_to_be32(key);
+	fmr->mpt->lkey   = cpu_to_be32(key);
+	fmr->mpt->length = 0;
+	fmr->mpt->start  = 0;
+
+	/* Make sure MPT data is visible before changing MPT status */
+	wmb();
+
+	*(u8 *)fmr->mpt = MLX4_MPT_STATUS_HW;
+
+	/* Make sure MPT satus is visible */
+	wmb();
+
 	fmr->maps = 0;
-
-	mailbox = mlx4_alloc_cmd_mailbox(dev);
-	if (IS_ERR(mailbox)) {
-		err = PTR_ERR(mailbox);
-		mlx4_warn(dev, "mlx4_alloc_cmd_mailbox failed (%d)\n", err);
-		return;
-	}
-
-	err = mlx4_HW2SW_MPT(dev, NULL,
-			     key_to_hw_index(fmr->mr.key) &
-			     (dev->caps.num_mpts - 1));
-	mlx4_free_cmd_mailbox(dev, mailbox);
-	if (err) {
-		mlx4_warn(dev, "mlx4_HW2SW_MPT failed (%d)\n", err);
-		return;
-	}
-	fmr->mr.enabled = MLX4_MR_EN_SW;
 }
 EXPORT_SYMBOL_GPL(mlx4_fmr_unmap);
 
 int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr)
 {
+	int ret;
+
 	if (fmr->maps)
 		return -EBUSY;
 
-	mlx4_mr_free(dev, &fmr->mr);
-	fmr->mr.enabled = MLX4_MR_DISABLED;
+	ret = mlx4_mr_free(dev, &fmr->mr);
+	if (ret)
+		return ret;
+	fmr->mr.enabled = MLX4_MPT_DISABLED;
 
 	return 0;
 }
diff --git a/sys/ofed/drivers/net/mlx4/pd.c b/sys/ofed/drivers/net/mlx4/pd.c
index 2c525aad130d..5162a47d5b48 100644
--- a/sys/ofed/drivers/net/mlx4/pd.c
+++ b/sys/ofed/drivers/net/mlx4/pd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,6 +32,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/io-mapping.h>
 
 #include <asm/page.h>
@@ -57,7 +58,7 @@ EXPORT_SYMBOL_GPL(mlx4_pd_alloc);
 
 void mlx4_pd_free(struct mlx4_dev *dev, u32 pdn)
 {
-	mlx4_bitmap_free(&mlx4_priv(dev)->pd_bitmap, pdn);
+	mlx4_bitmap_free(&mlx4_priv(dev)->pd_bitmap, pdn, MLX4_USE_RR);
 }
 EXPORT_SYMBOL_GPL(mlx4_pd_free);
 
@@ -94,7 +95,7 @@ EXPORT_SYMBOL_GPL(mlx4_xrcd_alloc);
 
 void __mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
 {
-	mlx4_bitmap_free(&mlx4_priv(dev)->xrcd_bitmap, xrcdn);
+	mlx4_bitmap_free(&mlx4_priv(dev)->xrcd_bitmap, xrcdn, MLX4_USE_RR);
 }
 
 void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
@@ -162,7 +163,7 @@ EXPORT_SYMBOL_GPL(mlx4_uar_alloc);
 
 void mlx4_uar_free(struct mlx4_dev *dev, struct mlx4_uar *uar)
 {
-	mlx4_bitmap_free(&mlx4_priv(dev)->uar_table.bitmap, uar->index);
+	mlx4_bitmap_free(&mlx4_priv(dev)->uar_table.bitmap, uar->index, MLX4_USE_RR);
 }
 EXPORT_SYMBOL_GPL(mlx4_uar_free);
 
diff --git a/sys/ofed/drivers/net/mlx4/port.c b/sys/ofed/drivers/net/mlx4/port.c
index 2a009ead879e..c653d4ba35c2 100644
--- a/sys/ofed/drivers/net/mlx4/port.c
+++ b/sys/ofed/drivers/net/mlx4/port.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,10 +32,14 @@
 
 #include <linux/errno.h>
 #include <linux/if_ether.h>
+#include <linux/module.h>
+#include <linux/err.h>
 
 #include <linux/mlx4/cmd.h>
 #include <linux/moduleparam.h>
 #include "mlx4.h"
+#include "mlx4_stats.h"
+
 
 int mlx4_set_4k_mtu = -1;
 module_param_named(set_4k_mtu, mlx4_set_4k_mtu, int, 0444);
@@ -48,12 +52,6 @@ MODULE_PARM_DESC(set_4k_mtu,
 #define MLX4_VLAN_VALID		(1u << 31)
 #define MLX4_VLAN_MASK		0xfff
 
-#define MLX4_STATS_TRAFFIC_COUNTERS_MASK	0xfULL
-#define MLX4_STATS_TRAFFIC_DROPS_MASK		0xc0ULL
-#define MLX4_STATS_ERROR_COUNTERS_MASK		0x1ffc30ULL
-#define MLX4_STATS_PORT_COUNTERS_MASK		0x1fe00000ULL
-#define MLX4_STATS_IF_RX_ERRORS_COUNTERS_MASK	0x8010ULL
-
 void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table)
 {
 	int i;
@@ -85,7 +83,7 @@ static int validate_index(struct mlx4_dev *dev,
 {
 	int err = 0;
 
-	if (index < 0 || index >= table->max || !table->entries[index]) {
+	if (index < 0 || index >= table->max || !table->refs[index]) {
 		mlx4_warn(dev, "No valid Mac entry for the given index\n");
 		err = -EINVAL;
 	}
@@ -140,14 +138,15 @@ int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)
 
 	mutex_lock(&table->mutex);
 	for (i = 0; i < MLX4_MAX_MAC_NUM; i++) {
-		if (free < 0 && !table->entries[i]) {
+		if (free < 0 && !table->refs[i]) {
 			free = i;
 			continue;
 		}
 
-		if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
+		if ((mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) &&
+		    table->refs[i]) {
 			/* MAC already registered, Must not have duplicates */
-		       err = i;
+			err = i;
 			++table->refs[i];
 			goto out;
 		}
@@ -184,13 +183,24 @@ EXPORT_SYMBOL_GPL(__mlx4_register_mac);
 int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac)
 {
 	u64 out_param = 0;
-	int err;
+	int err = -EINVAL;
 
 	if (mlx4_is_mfunc(dev)) {
-		err = mlx4_cmd_imm(dev, mac, &out_param,
-				   ((u32) port) << 8 | (u32) RES_MAC,
-				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,
-				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+		if (!(dev->flags & MLX4_FLAG_OLD_REG_MAC)) {
+			err = mlx4_cmd_imm(dev, mac, &out_param,
+					   ((u32) port) << 8 | (u32) RES_MAC,
+					   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,
+					   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+		}
+		if (err && err == -EINVAL && mlx4_is_slave(dev)) {
+			/* retry using old REG_MAC format */
+			set_param_l(&out_param, port);
+			err = mlx4_cmd_imm(dev, mac, &out_param, RES_MAC,
+					   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,
+					   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+			if (!err)
+				dev->flags |= MLX4_FLAG_OLD_REG_MAC;
+		}
 		if (err)
 			return err;
 
@@ -245,10 +255,18 @@ void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)
 	u64 out_param = 0;
 
 	if (mlx4_is_mfunc(dev)) {
-		(void) mlx4_cmd_imm(dev, mac, &out_param,
-				    ((u32) port) << 8 | (u32) RES_MAC,
-				    RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,
-				    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+		if (!(dev->flags & MLX4_FLAG_OLD_REG_MAC)) {
+			(void) mlx4_cmd_imm(dev, mac, &out_param,
+					    ((u32) port) << 8 | (u32) RES_MAC,
+					    RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,
+					    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+		} else {
+			/* use old unregister mac format */
+			set_param_l(&out_param, port);
+			(void) mlx4_cmd_imm(dev, mac, &out_param, RES_MAC,
+					    RES_OP_RESERVE_AND_MAP, MLX4_CMD_FREE_RES,
+					    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
+		}
 		return;
 	}
 	__mlx4_unregister_mac(dev, port, mac);
@@ -535,17 +553,21 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
 	__be32 new_cap_mask;
 
 	port = in_mod & 0xff;
-	in_modifier = in_mod >> 8;
+	in_modifier = (in_mod >> 8) & 0xff;
 	is_eth = op_mod;
 	port_info = &priv->port[port];
 
+	if (op_mod > 1)
+		return -EINVAL;
+
 	/* Slaves cannot perform SET_PORT operations except changing MTU */
 	if (is_eth) {
 		if (slave != dev->caps.function &&
 		    in_modifier != MLX4_SET_PORT_GENERAL &&
 		    in_modifier != MLX4_SET_PORT_GID_TABLE) {
-			mlx4_warn(dev, "denying SET_PORT for slave:%d\n",
-					slave);
+			mlx4_warn(dev, "denying SET_PORT for slave:%d,"
+				  "port %d, config_select 0x%x\n",
+				  slave, port, in_modifier);
 			return -EINVAL;
 		}
 		switch (in_modifier) {
@@ -570,7 +592,8 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
 			/* Mtu is configured as the max MTU among all the
 			 * the functions on the port. */
 			mtu = be16_to_cpu(gen_context->mtu);
-			mtu = min_t(int, mtu, dev->caps.eth_mtu_cap[port]);
+			mtu = min_t(int, mtu, dev->caps.eth_mtu_cap[port] +
+				    ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
 			prev_mtu = slave_st->mtu[port];
 			slave_st->mtu[port] = mtu;
 			if (mtu > master->max_mtu[port])
@@ -650,7 +673,7 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
 
 			break;
 		}
-		return mlx4_cmd(dev, inbox->dma, in_mod, op_mod,
+		return mlx4_cmd(dev, inbox->dma, in_mod & 0xffff, op_mod,
 				MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B,
 				MLX4_CMD_NATIVE);
 	}
@@ -727,19 +750,10 @@ enum {
 	MLX4_CHANGE_PORT_MTU_CAP = 22,
 };
 
-#define	CX3_PPF_DEV_ID 0x1003
-static int vl_cap_start(struct mlx4_dev *dev)
-{
-	/* for non CX3 devices, start with 4 VLs to avoid errors in syslog */
-	if (dev->pdev->device != CX3_PPF_DEV_ID)
-		return 4;
-	return 8;
-}
-
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port, int pkey_tbl_sz)
 {
 	struct mlx4_cmd_mailbox *mailbox;
-	int err, vl_cap, pkey_tbl_flag = 0;
+	int err = -EINVAL, vl_cap, pkey_tbl_flag = 0;
 	u32 in_mod;
 
 	if (dev->caps.port_type[port] == MLX4_PORT_TYPE_NONE)
@@ -765,7 +779,8 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port, int pkey_tbl_sz)
 		}
 
 		/* IB VL CAP enum isn't used by the firmware, just numerical values */
-		for (vl_cap = vl_cap_start(dev); vl_cap >= 1; vl_cap >>= 1) {
+		for (vl_cap = dev->caps.vl_cap[port];
+				vl_cap >= 1; vl_cap >>= 1) {
 			((__be32 *) mailbox->buf)[0] = cpu_to_be32(
 				(1 << MLX4_CHANGE_PORT_MTU_CAP) |
 				(1 << MLX4_CHANGE_PORT_VL_CAP)  |
@@ -822,10 +837,9 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 	u32 in_mod;
 	u32 m_promisc = (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) ?
 		MCAST_DIRECT : MCAST_DEFAULT;
-/*
+
 	if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0)
 		return 0;
-*/
 
 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 	if (IS_ERR(mailbox))
@@ -834,10 +848,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 	memset(context, 0, sizeof *context);
 
 	context->base_qpn = cpu_to_be32(base_qpn);
-        /* 
-        * This assignment breaks vlan support - I don't know why. Probablya an A0 issue - shahar Klein
-	* context->n_mac = dev->caps.log_num_macs;
-        */
+	context->n_mac = dev->caps.log_num_macs;
 	context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_SHIFT |
 				       base_qpn);
 	context->mcast = cpu_to_be32(m_promisc << SET_PORT_MC_PROMISC_SHIFT |
@@ -960,40 +971,44 @@ int mlx4_SET_VLAN_FLTR_wrapper(struct mlx4_dev *dev, int slave,
 	return err;
 }
 
-int mlx4_common_dump_eth_stats(struct mlx4_dev *dev, int slave,
-			       u32 in_mod, struct mlx4_cmd_mailbox *outbox)
-{
-	return mlx4_cmd_box(dev, 0, outbox->dma, in_mod, 0,
-			    MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,
-			    MLX4_CMD_NATIVE);
-}
-
 int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,
 				struct mlx4_vhcr *vhcr,
 				struct mlx4_cmd_mailbox *inbox,
 				struct mlx4_cmd_mailbox *outbox,
 				struct mlx4_cmd_info *cmd)
 {
-	if (slave != dev->caps.function)
-		return 0;
-	return mlx4_common_dump_eth_stats(dev, slave,
-					  vhcr->in_modifier, outbox);
+	return 0;
 }
 
-void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap)
+void mlx4_set_stats_bitmap(struct mlx4_dev *dev, unsigned long *stats_bitmap)
 {
-	if (!mlx4_is_mfunc(dev)) {
-		*stats_bitmap = 0;
-		return;
+	int last_i = 0;
+
+	bitmap_zero(stats_bitmap, NUM_ALL_STATS);
+
+	if (mlx4_is_slave(dev)) {
+		last_i = dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN ?
+			NUM_PKT_STATS + NUM_FLOW_STATS : NUM_PKT_STATS;
+	} else {
+		bitmap_set(stats_bitmap, last_i, NUM_PKT_STATS);
+		last_i = NUM_PKT_STATS;
+
+		if (dev->caps.flags2 &
+		    MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN) {
+			bitmap_set(stats_bitmap, last_i, NUM_FLOW_STATS);
+			last_i += NUM_FLOW_STATS;
+		}
 	}
 
-	*stats_bitmap = (MLX4_STATS_TRAFFIC_COUNTERS_MASK |
-			 MLX4_STATS_TRAFFIC_DROPS_MASK |
-			 MLX4_STATS_PORT_COUNTERS_MASK |
-			 MLX4_STATS_IF_RX_ERRORS_COUNTERS_MASK);
+	if (mlx4_is_slave(dev))
+		bitmap_set(stats_bitmap, last_i, NUM_VF_STATS);
+	last_i += NUM_VF_STATS;
 
 	if (mlx4_is_master(dev))
-		*stats_bitmap |= MLX4_STATS_ERROR_COUNTERS_MASK;
+		bitmap_set(stats_bitmap, last_i, NUM_VPORT_STATS);
+	last_i += NUM_VPORT_STATS;
+
+	bitmap_set(stats_bitmap, last_i, NUM_PORT_STATS);
 }
 EXPORT_SYMBOL(mlx4_set_stats_bitmap);
 
diff --git a/sys/ofed/drivers/net/mlx4/profile.c b/sys/ofed/drivers/net/mlx4/profile.c
index d3042f012146..aa5f957feccd 100644
--- a/sys/ofed/drivers/net/mlx4/profile.c
+++ b/sys/ofed/drivers/net/mlx4/profile.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -76,7 +76,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
 		u64 size;
 		u64 start;
 		int type;
-		u32 num;
+		u64 num;
 		int log_num;
 	};
 
@@ -112,7 +112,8 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
 					min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
 	profile[MLX4_RES_DMPT].num    = request->num_mpt;
 	profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
-	profile[MLX4_RES_MTT].num     = request->num_mtt * (1 << log_mtts_per_seg);
+	profile[MLX4_RES_MTT].num     = ((u64)request->num_mtt_segs) *
+					(1 << log_mtts_per_seg);
 	profile[MLX4_RES_MCG].num     = request->num_mcg;
 
 	for (i = 0; i < MLX4_RES_NUM; ++i) {
diff --git a/sys/ofed/drivers/net/mlx4/qp.c b/sys/ofed/drivers/net/mlx4/qp.c
index 2e2033d92815..fe8d3c2de07f 100644
--- a/sys/ofed/drivers/net/mlx4/qp.c
+++ b/sys/ofed/drivers/net/mlx4/qp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -33,6 +33,10 @@
  * SOFTWARE.
  */
 
+#include <linux/types.h>
+#include <linux/gfp.h>
+#include <linux/module.h>
+
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/qp.h>
 
@@ -210,13 +214,18 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 EXPORT_SYMBOL_GPL(mlx4_qp_modify);
 
 int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
-			    int *base, u8 bf_qp)
+			    int *base, u8 flags)
 {
+	int bf_qp = !!(flags & (u8) MLX4_RESERVE_BF_QP);
+
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct mlx4_qp_table *qp_table = &priv->qp_table;
 
+	/* Only IPoIB uses a large cnt. In this case, just allocate
+	 * as usual, ignoring bf skipping, since IPoIB does not run over RoCE
+	 */
 	if (cnt > MLX4_MAX_BF_QP_RANGE && bf_qp)
-		return -ENOMEM;
+		bf_qp = 0;
 
 	*base = mlx4_bitmap_alloc_range(&qp_table->bitmap, cnt, align,
 					bf_qp ? MLX4_BF_QP_SKIP_MASK : 0);
@@ -227,14 +236,14 @@ int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
 }
 
 int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
-			  int *base, u8 bf_qp)
+			  int *base, u8 flags)
 {
 	u64 in_param = 0;
 	u64 out_param;
 	int err;
 
 	if (mlx4_is_mfunc(dev)) {
-		set_param_l(&in_param, (((!!bf_qp) << 31) | (u32)cnt));
+		set_param_l(&in_param, (((u32) flags) << 24) | (u32) cnt);
 		set_param_h(&in_param, align);
 		err = mlx4_cmd_imm(dev, in_param, &out_param,
 				   RES_QP, RES_OP_RESERVE,
@@ -246,7 +255,7 @@ int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
 		*base = get_param_l(&out_param);
 		return 0;
 	}
-	return __mlx4_qp_reserve_range(dev, cnt, align, base, bf_qp);
+	return __mlx4_qp_reserve_range(dev, cnt, align, base, flags);
 }
 EXPORT_SYMBOL_GPL(mlx4_qp_reserve_range);
 
@@ -257,7 +266,7 @@ void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)
 
 	if (mlx4_is_qp_reserved(dev, (u32) base_qpn))
 		return;
-	mlx4_bitmap_free_range(&qp_table->bitmap, base_qpn, cnt);
+	mlx4_bitmap_free_range(&qp_table->bitmap, base_qpn, cnt, MLX4_USE_RR);
 }
 
 void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)
diff --git a/sys/ofed/drivers/net/mlx4/reset.c b/sys/ofed/drivers/net/mlx4/reset.c
index 43b15411bec0..44ec1e12b898 100644
--- a/sys/ofed/drivers/net/mlx4/reset.c
+++ b/sys/ofed/drivers/net/mlx4/reset.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -77,7 +77,7 @@ int mlx4_reset(struct mlx4_dev *dev)
 		goto out;
 	}
 
-	pcie_cap = pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
+	pcie_cap = pci_pcie_cap(dev->pdev);
 
 	for (i = 0; i < 64; ++i) {
 		if (i == 22 || i == 23)
@@ -119,8 +119,8 @@ int mlx4_reset(struct mlx4_dev *dev)
 	writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
 	iounmap(reset);
 
-	/* Docs say to wait one second before accessing device */
-	msleep(2000);
+	/* wait half a second before accessing device */
+	msleep(500);
 
 	end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
 	do {
@@ -138,11 +138,10 @@ int mlx4_reset(struct mlx4_dev *dev)
 		goto out;
 	}
 
-
 	/* Now restore the PCI headers */
 	if (pcie_cap) {
 		devctl = hca_header[(pcie_cap + PCI_EXP_DEVCTL) / 4];
-		if (pci_write_config_word(dev->pdev, pcie_cap + PCI_EXP_DEVCTL,
+		if (pcie_capability_write_word(dev->pdev, PCI_EXP_DEVCTL,
 					       devctl)) {
 			err = -ENODEV;
 			mlx4_err(dev, "Couldn't restore HCA PCI Express "
@@ -150,7 +149,7 @@ int mlx4_reset(struct mlx4_dev *dev)
 			goto out;
 		}
 		linkctl = hca_header[(pcie_cap + PCI_EXP_LNKCTL) / 4];
-		if (pci_write_config_word(dev->pdev, pcie_cap + PCI_EXP_LNKCTL,
+		if (pcie_capability_write_word(dev->pdev, PCI_EXP_LNKCTL,
 					       linkctl)) {
 			err = -ENODEV;
 			mlx4_err(dev, "Couldn't restore HCA PCI Express "
diff --git a/sys/ofed/drivers/net/mlx4/resource_tracker.c b/sys/ofed/drivers/net/mlx4/resource_tracker.c
index 65fc1dd21213..743c8871fcaf 100644
--- a/sys/ofed/drivers/net/mlx4/resource_tracker.c
+++ b/sys/ofed/drivers/net/mlx4/resource_tracker.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies.
+ * Copyright (c) 2005, 2006, 2007, 2008, 2014 Mellanox Technologies.
  * All rights reserved.
  * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc.  All rights reserved.
  *
@@ -42,7 +42,7 @@
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/qp.h>
 #include <linux/if_ether.h>
-#include <linux/compat.h>
+#include <linux/etherdevice.h>
 
 #include "mlx4.h"
 #include "fw.h"
@@ -85,6 +85,7 @@ struct res_gid {
 	u8			gid[16];
 	enum mlx4_protocol	prot;
 	enum mlx4_steer_type	steer;
+	u64			reg_id;
 };
 
 enum res_qp_states {
@@ -109,6 +110,16 @@ struct res_qp {
 	struct list_head	mcg_list;
 	spinlock_t		mcg_spl;
 	int			local_qpn;
+	atomic_t		ref_count;
+	u32			qpc_flags;
+	/* saved qp params before VST enforcement in order to restore on VGT */
+	u8			sched_queue;
+	__be32			param3;
+	u8			vlan_control;
+	u8			fvl_rx;
+	u8			pri_path_fl;
+	u8			vlan_index;
+	u8			feup;
 };
 
 enum res_mtt_states {
@@ -207,6 +218,7 @@ enum res_fs_rule_states {
 
 struct res_fs_rule {
 	struct res_common	com;
+	int			qpn;
 };
 
 static int mlx4_is_eth(struct mlx4_dev *dev, int port)
@@ -622,9 +634,33 @@ static void update_gid(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *inbox,
 	}
 }
 
+static int check_counter_index_validity(struct mlx4_dev *dev, int slave, int port, int idx)
+{
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct counter_index *counter, *tmp_counter;
+
+	if (slave == 0) {
+		list_for_each_entry_safe(counter, tmp_counter,
+					 &priv->counters_table.global_port_list[port - 1],
+					 list) {
+			if (counter->index == idx)
+				return 0;
+		}
+		return -EINVAL;
+	} else {
+		list_for_each_entry_safe(counter, tmp_counter,
+					 &priv->counters_table.vf_list[slave - 1][port - 1],
+					 list) {
+			if (counter->index == idx)
+				return 0;
+		}
+		return -EINVAL;
+	}
+}
+
 static int update_vport_qp_param(struct mlx4_dev *dev,
 				 struct mlx4_cmd_mailbox *inbox,
-				 u8 slave)
+				 u8 slave, u32 qpn)
 {
 	struct mlx4_qp_context	*qpc = inbox->buf + 8;
 	struct mlx4_vport_oper_state *vp_oper;
@@ -635,31 +671,63 @@ static int update_vport_qp_param(struct mlx4_dev *dev,
 	port = (qpc->pri_path.sched_queue & 0x40) ? 2 : 1;
 	priv = mlx4_priv(dev);
 	vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
+	qp_type	= (be32_to_cpu(qpc->flags) >> 16) & 0xff;
+
+	if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH &&
+	    qpc->pri_path.counter_index != MLX4_SINK_COUNTER_INDEX) {
+		if (check_counter_index_validity(dev, slave, port,
+						 qpc->pri_path.counter_index))
+			return -EINVAL;
+	}
+
+	mlx4_dbg(dev, "%s: QP counter_index %d for slave %d port %d\n",
+		 __func__, qpc->pri_path.counter_index, slave, port);
+
+	if ((dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_LB_SRC_CHK) &&
+	    dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH &&
+	    !mlx4_is_qp_reserved(dev, qpn) &&
+	    qp_type == MLX4_QP_ST_MLX &&
+	    qpc->pri_path.counter_index != 0xFF) {
+		/* disable multicast loopback to qp with same counter */
+		qpc->pri_path.fl |= MLX4_FL_ETH_SRC_CHECK_MC_LB;
+		qpc->pri_path.vlan_control |=
+			MLX4_VLAN_CTRL_ETH_SRC_CHECK_IF_COUNTER;
+	}
 
 	if (MLX4_VGT != vp_oper->state.default_vlan) {
-		qp_type	= (be32_to_cpu(qpc->flags) >> 16) & 0xff;
-		if (MLX4_QP_ST_RC == qp_type)
-			return -EINVAL;
+		/* the reserved QPs (special, proxy, tunnel)
+		 * do not operate over vlans
+		 */
+		if (mlx4_is_qp_reserved(dev, qpn))
+			return 0;
 
-		qpc->srqn |= cpu_to_be32(1 << 25); /*set cqe vlan mask */
+		/* force strip vlan by clear vsd */
+		qpc->param3 &= ~cpu_to_be32(MLX4_STRIP_VLAN);
+		/* preserve IF_COUNTER flag */
+		qpc->pri_path.vlan_control &=
+			MLX4_VLAN_CTRL_ETH_SRC_CHECK_IF_COUNTER;
+		if (MLX4_QP_ST_RC != qp_type) {
+			if (0 != vp_oper->state.default_vlan) {
+				qpc->pri_path.vlan_control |=
+					MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED |
+					MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED |
+					MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED;
+			} else { /* priority tagged */
+				qpc->pri_path.vlan_control |=
+					MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED |
+					MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED;
+			}
+		}
+		qpc->pri_path.fvl_rx |= MLX4_FVL_RX_FORCE_ETH_VLAN;
 		qpc->pri_path.vlan_index = vp_oper->vlan_idx;
-		qpc->pri_path.fl = 1 << 6; /* set cv bit*/
-		qpc->pri_path.feup |= 1 << 3; /* set fvl bit */
+		qpc->pri_path.fl |= MLX4_FL_CV | MLX4_FL_ETH_HIDE_CQE_VLAN;
+		qpc->pri_path.feup |= MLX4_FEUP_FORCE_ETH_UP | MLX4_FVL_FORCE_ETH_VLAN;
 		qpc->pri_path.sched_queue &= 0xC7;
 		qpc->pri_path.sched_queue |= (vp_oper->state.default_qos) << 3;
-		mlx4_dbg(dev, "qp %d  port %d Q 0x%x set vlan to %d vidx %d feup %x fl %x\n",
-			 be32_to_cpu(qpc->local_qpn) & 0xffffff, port,
-			 (int)(qpc->pri_path.sched_queue), vp_oper->state.default_vlan,
-			 vp_oper->vlan_idx, (int)(qpc->pri_path.feup),
-			 (int)(qpc->pri_path.fl));
 	}
 	if (vp_oper->state.spoofchk) {
-		qpc->pri_path.feup |= 1 << 5; /* set fsm bit */;
+		qpc->pri_path.feup |= MLX4_FSM_FORCE_ETH_SRC_MAC;
 		qpc->pri_path.grh_mylmc = (0x80 & qpc->pri_path.grh_mylmc) + vp_oper->mac_idx;
-		mlx4_dbg(dev, "spoof qp %d  port %d feup  0x%x, myLmc 0x%x mindx %d\n",
-			 be32_to_cpu(qpc->local_qpn) & 0xffffff, port,
-			 (int)qpc->pri_path.feup, (int)qpc->pri_path.grh_mylmc,
-			 vp_oper->mac_idx);
 	}
 	return 0;
 }
@@ -669,7 +737,7 @@ static int mpt_mask(struct mlx4_dev *dev)
 	return dev->caps.num_mpts - 1;
 }
 
-static void *find_res(struct mlx4_dev *dev, int res_id,
+static void *find_res(struct mlx4_dev *dev, u64 res_id,
 		      enum mlx4_resource type)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -688,7 +756,7 @@ static int get_res(struct mlx4_dev *dev, int slave, u64 res_id,
 	spin_lock_irq(mlx4_tlock(dev));
 	r = find_res(dev, res_id, type);
 	if (!r) {
-		err = -ENOENT;
+		err = -ENONET;
 		goto exit;
 	}
 
@@ -761,6 +829,7 @@ static struct res_common *alloc_qp_tr(int id)
 	ret->local_qpn = id;
 	INIT_LIST_HEAD(&ret->mcg_list);
 	spin_lock_init(&ret->mcg_spl);
+	atomic_set(&ret->ref_count, 0);
 
 	return &ret->com;
 }
@@ -868,7 +937,7 @@ static struct res_common *alloc_xrcdn_tr(int id)
 	return &ret->com;
 }
 
-static struct res_common *alloc_fs_rule_tr(u64 id)
+static struct res_common *alloc_fs_rule_tr(u64 id, int qpn)
 {
 	struct res_fs_rule *ret;
 
@@ -878,7 +947,7 @@ static struct res_common *alloc_fs_rule_tr(u64 id)
 
 	ret->com.res_id = id;
 	ret->com.state = RES_FS_RULE_ALLOCATED;
-
+	ret->qpn = qpn;
 	return &ret->com;
 }
 
@@ -916,7 +985,7 @@ static struct res_common *alloc_tr(u64 id, enum mlx4_resource type, int slave,
 		ret = alloc_xrcdn_tr(id);
 		break;
 	case RES_FS_RULE:
-		ret = alloc_fs_rule_tr(id);
+		ret = alloc_fs_rule_tr(id, extra);
 		break;
 	default:
 		return NULL;
@@ -970,8 +1039,10 @@ static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
 	return 0;
 
 undo:
-	for (--i; i >= base; --i)
+	for (--i; i >= 0; --i) {
 		rb_erase(&res_arr[i]->node, root);
+		list_del_init(&res_arr[i]->list);
+	}
 
 	spin_unlock_irq(mlx4_tlock(dev));
 
@@ -985,10 +1056,14 @@ static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
 
 static int remove_qp_ok(struct res_qp *res)
 {
-	if (res->com.state == RES_QP_BUSY)
+	if (res->com.state == RES_QP_BUSY || atomic_read(&res->ref_count) ||
+	    !list_empty(&res->mcg_list)) {
+		pr_err("resource tracker: fail to remove qp, state %d, ref_count %d\n",
+		       res->com.state, atomic_read(&res->ref_count));
 		return -EBUSY;
-	else if (res->com.state != RES_QP_RESERVED)
+	} else if (res->com.state != RES_QP_RESERVED) {
 		return -EPERM;
+	}
 
 	return 0;
 }
@@ -1166,7 +1241,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
 		switch (state) {
 		case RES_QP_BUSY:
 			mlx4_dbg(dev, "%s: failed RES_QP, 0x%llx\n",
-				 __func__, (long long)r->com.res_id);
+				 __func__, (unsigned long long)r->com.res_id);
 			err = -EBUSY;
 			break;
 
@@ -1174,7 +1249,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
 			if (r->com.state == RES_QP_MAPPED && !alloc)
 				break;
 
-			mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", (long long)r->com.res_id);
+			mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", (unsigned long long)r->com.res_id);
 			err = -EINVAL;
 			break;
 
@@ -1184,7 +1259,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
 				break;
 			else {
 				mlx4_dbg(dev, "failed RES_QP, 0x%llx\n",
-					  (long long)r->com.res_id);
+					  (unsigned long long)r->com.res_id);
 				err = -EINVAL;
 			}
 
@@ -1464,18 +1539,18 @@ static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 	int align;
 	int base;
 	int qpn;
-	u8 bf_qp;
+	u8 flags;
 
 	switch (op) {
 	case RES_OP_RESERVE:
 		count = get_param_l(&in_param) & 0xffffff;
-		bf_qp = get_param_l(&in_param) >> 31;
+		flags = get_param_l(&in_param) >> 24;
 		align = get_param_h(&in_param);
 		err = mlx4_grant_resource(dev, slave, RES_QP, count, 0);
 		if (err)
 			return err;
 
-		err = __mlx4_qp_reserve_range(dev, count, align, &base, bf_qp);
+		err = __mlx4_qp_reserve_range(dev, count, align, &base, flags);
 		if (err) {
 			mlx4_release_resource(dev, slave, RES_QP, count, 0);
 			return err;
@@ -1566,7 +1641,7 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 		if (err)
 			break;
 
-		index = __mlx4_mr_reserve(dev);
+		index = __mlx4_mpt_reserve(dev);
 		if (index == -1) {
 			mlx4_release_resource(dev, slave, RES_MPT, 1, 0);
 			break;
@@ -1576,7 +1651,7 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 		err = add_res_range(dev, slave, id, 1, RES_MPT, index);
 		if (err) {
 			mlx4_release_resource(dev, slave, RES_MPT, 1, 0);
-			__mlx4_mr_release(dev, index);
+			__mlx4_mpt_release(dev, index);
 			break;
 		}
 		set_param_l(out_param, index);
@@ -1589,7 +1664,7 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 		if (err)
 			return err;
 
-		err = __mlx4_mr_alloc_icm(dev, mpt->key);
+		err = __mlx4_mpt_alloc_icm(dev, mpt->key);
 		if (err) {
 			res_abort_move(dev, slave, RES_MPT, id);
 			return err;
@@ -1867,11 +1942,16 @@ static void rem_slave_vlans(struct mlx4_dev *dev, int slave)
 }
 
 static int vlan_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
-			  u64 in_param, u64 *out_param, int port)
+			  u64 in_param, u64 *out_param, int in_port)
 {
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct mlx4_slave_state *slave_state = priv->mfunc.master.slave_state;
 	int err = -EINVAL;
 	u16 vlan;
 	int vlan_index;
+	int port;
+
+	port = !in_port ? get_param_l(out_param) : in_port;
 
 	if (!port)
 		return err;
@@ -1879,6 +1959,12 @@ static int vlan_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 	if (op != RES_OP_RESERVE_AND_MAP)
 		return err;
 
+	/* upstream kernels had NOP for reg/unreg vlan. Continue this. */
+	if (!in_port && port > 0 && port <= dev->caps.num_ports) {
+		slave_state[slave].old_vlan_api = true;
+		return 0;
+	}
+
 	vlan = (u16) in_param;
 
 	err = __mlx4_register_vlan(dev, port, vlan, &vlan_index);
@@ -1892,7 +1978,7 @@ static int vlan_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 }
 
 static int counter_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
-			     u64 in_param, u64 *out_param)
+			     u64 in_param, u64 *out_param, int port)
 {
 	u32 index;
 	int err;
@@ -1900,23 +1986,9 @@ static int counter_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 	if (op != RES_OP_RESERVE)
 		return -EINVAL;
 
-	err = mlx4_grant_resource(dev, slave, RES_COUNTER, 1, 0);
-	if (err)
-		return err;
-
-	err = __mlx4_counter_alloc(dev, &index);
-	if (err) {
-		mlx4_release_resource(dev, slave, RES_COUNTER, 1, 0);
-		return err;
-	}
-
-	err = add_res_range(dev, slave, index, 1, RES_COUNTER, 0);
-	if (err) {
-		__mlx4_counter_free(dev, index);
-		mlx4_release_resource(dev, slave, RES_COUNTER, 1, 0);
-	} else {
+	err = __mlx4_counter_alloc(dev, slave, port, &index);
+	if (!err)
 		set_param_l(out_param, index);
-	}
 
 	return err;
 }
@@ -1992,7 +2064,8 @@ int mlx4_ALLOC_RES_wrapper(struct mlx4_dev *dev, int slave,
 
 	case RES_COUNTER:
 		err = counter_alloc_res(dev, slave, vhcr->op_modifier, alop,
-					vhcr->in_param, &vhcr->out_param);
+					vhcr->in_param, &vhcr->out_param,
+					(vhcr->in_modifier >> 8) & 0xFF);
 		break;
 
 	case RES_XRCD:
@@ -2090,7 +2163,7 @@ static int mpt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 		if (err)
 			break;
 		mlx4_release_resource(dev, slave, RES_MPT, 1, 0);
-		__mlx4_mr_release(dev, index);
+		__mlx4_mpt_release(dev, index);
 		break;
 	case RES_OP_MAP_ICM:
 			index = get_param_l(&in_param);
@@ -2100,7 +2173,7 @@ static int mpt_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 			if (err)
 				return err;
 
-			__mlx4_mr_free_icm(dev, mpt->key);
+			__mlx4_mpt_free_icm(dev, mpt->key);
 			res_end_move(dev, slave, RES_MPT, id);
 			return err;
 		break;
@@ -2185,10 +2258,14 @@ static int mac_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 static int vlan_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 			    u64 in_param, u64 *out_param, int port)
 {
+	struct mlx4_priv *priv = mlx4_priv(dev);
+	struct mlx4_slave_state *slave_state = priv->mfunc.master.slave_state;
 	int err = 0;
 
 	switch (op) {
 	case RES_OP_RESERVE_AND_MAP:
+		if (slave_state[slave].old_vlan_api == true)
+			return 0;
 		if (!port)
 			return -EINVAL;
 		vlan_del_from_slave(dev, slave, in_param, port);
@@ -2203,23 +2280,18 @@ static int vlan_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
 }
 
 static int counter_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
-			    u64 in_param, u64 *out_param)
+			    u64 in_param, u64 *out_param, int port)
 {
 	int index;
-	int err;
 
 	if (op != RES_OP_RESERVE)
 		return -EINVAL;
 
 	index = get_param_l(&in_param);
-	err = rem_res_range(dev, slave, index, 1, RES_COUNTER, 0);
-	if (err)
-		return err;
 
-	__mlx4_counter_free(dev, index);
-	mlx4_release_resource(dev, slave, RES_COUNTER, 1, 0);
+	__mlx4_counter_free(dev, slave, port, index);
 
-	return err;
+	return 0;
 }
 
 static int xrcdn_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
@@ -2290,7 +2362,8 @@ int mlx4_FREE_RES_wrapper(struct mlx4_dev *dev, int slave,
 
 	case RES_COUNTER:
 		err = counter_free_res(dev, slave, vhcr->op_modifier, alop,
-				       vhcr->in_param, &vhcr->out_param);
+				       vhcr->in_param, &vhcr->out_param,
+				       (vhcr->in_modifier >> 8) & 0xFF);
 		break;
 
 	case RES_XRCD:
@@ -2319,6 +2392,26 @@ static int mr_get_mtt_size(struct mlx4_mpt_entry *mpt)
 	return be32_to_cpu(mpt->mtt_sz);
 }
 
+static u32 mr_get_pd(struct mlx4_mpt_entry *mpt)
+{
+	return be32_to_cpu(mpt->pd_flags) & 0x00ffffff;
+}
+
+static int mr_is_fmr(struct mlx4_mpt_entry *mpt)
+{
+	return be32_to_cpu(mpt->pd_flags) & MLX4_MPT_PD_FLAG_FAST_REG;
+}
+
+static int mr_is_bind_enabled(struct mlx4_mpt_entry *mpt)
+{
+	return be32_to_cpu(mpt->flags) & MLX4_MPT_FLAG_BIND_ENABLE;
+}
+
+static int mr_is_region(struct mlx4_mpt_entry *mpt)
+{
+	return be32_to_cpu(mpt->flags) & MLX4_MPT_FLAG_REGION;
+}
+
 static int qp_get_mtt_addr(struct mlx4_qp_context *qpc)
 {
 	return be32_to_cpu(qpc->mtt_base_addr_l) & 0xfffffff8;
@@ -2338,7 +2431,8 @@ static int qp_get_mtt_size(struct mlx4_qp_context *qpc)
 	int log_rq_stride = qpc->rq_size_stride & 7;
 	int srq = (be32_to_cpu(qpc->srqn) >> 24) & 1;
 	int rss = (be32_to_cpu(qpc->flags) >> 13) & 1;
-	int xrc = (be32_to_cpu(qpc->local_qpn) >> 23) & 1;
+	u32 ts = (be32_to_cpu(qpc->flags) >> 16) & 0xff;
+	int xrc = (ts == MLX4_QP_ST_XRC) ? 1 : 0;
 	int sq_size;
 	int rq_size;
 	int total_pages;
@@ -2379,12 +2473,43 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,
 	int mtt_base = mr_get_mtt_addr(inbox->buf) / dev->caps.mtt_entry_sz;
 	int phys;
 	int id;
+	u32 pd;
+	int pd_slave;
 
 	id = index & mpt_mask(dev);
 	err = mr_res_start_move_to(dev, slave, id, RES_MPT_HW, &mpt);
 	if (err)
 		return err;
 
+	/* Currently disable memory windows since this feature isn't tested yet
+	* under virtualization.
+	*/
+	if (!mr_is_region(inbox->buf)) {
+		err = -ENOSYS;
+		goto ex_abort;
+	}
+
+	/* Make sure that the PD bits related to the slave id are zeros. */
+	pd = mr_get_pd(inbox->buf);
+	pd_slave = (pd >> 17) & 0x7f;
+	if (pd_slave != 0 && pd_slave != slave) {
+		err = -EPERM;
+		goto ex_abort;
+	}
+
+	if (mr_is_fmr(inbox->buf)) {
+		/* FMR and Bind Enable are forbidden in slave devices. */
+		if (mr_is_bind_enabled(inbox->buf)) {
+			err = -EPERM;
+			goto ex_abort;
+		}
+		/* FMR and Memory Windows are also forbidden. */
+		if (!mr_is_region(inbox->buf)) {
+			err = -EPERM;
+			goto ex_abort;
+		}
+	}
+
 	phys = mr_phys_mpt(inbox->buf);
 	if (!phys) {
 		err = get_res(dev, slave, mtt_base, RES_MTT, &mtt);
@@ -2534,6 +2659,14 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
 	if (err)
 		return err;
 	qp->local_qpn = local_qpn;
+	qp->sched_queue = 0;
+	qp->param3 = 0;
+	qp->vlan_control = 0;
+	qp->fvl_rx = 0;
+	qp->pri_path_fl = 0;
+	qp->vlan_index = 0;
+	qp->feup = 0;
+	qp->qpc_flags = be32_to_cpu(qpc->flags);
 
 	err = get_res(dev, slave, mtt_base, RES_MTT, &mtt);
 	if (err)
@@ -2851,6 +2984,12 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
 	if (!priv->mfunc.master.slave_state)
 		return -EINVAL;
 
+	/* check for slave valid, slave not PF, and slave active */
+	if (slave < 0 || slave >= dev->num_slaves ||
+	    slave == dev->caps.function ||
+	    !priv->mfunc.master.slave_state[slave].active)
+		return 0;
+
 	event_eq = &priv->mfunc.master.slave_state[slave].event_eq[eqe->type];
 
 	/* Create the event only if the slave is registered */
@@ -3288,6 +3427,15 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
 {
 	int err;
 	struct mlx4_qp_context *qpc = inbox->buf + 8;
+	int qpn = vhcr->in_modifier & 0x7fffff;
+	struct res_qp *qp;
+	u8 orig_sched_queue;
+	__be32	orig_param3 = qpc->param3;
+	u8 orig_vlan_control = qpc->pri_path.vlan_control;
+	u8 orig_fvl_rx = qpc->pri_path.fvl_rx;
+	u8 orig_pri_path_fl = qpc->pri_path.fl;
+	u8 orig_vlan_index = qpc->pri_path.vlan_index;
+	u8 orig_feup = qpc->pri_path.feup;
 
 	err = verify_qp_parameters(dev, inbox, QP_TRANS_INIT2RTR, slave);
 	if (err)
@@ -3299,11 +3447,40 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
 	update_pkey_index(dev, slave, inbox);
 	update_gid(dev, inbox, (u8)slave);
 	adjust_proxy_tun_qkey(dev, vhcr, qpc);
-	err = update_vport_qp_param(dev, inbox, slave);
+	orig_sched_queue = qpc->pri_path.sched_queue;
+
+	err = get_res(dev, slave, qpn, RES_QP, &qp);
 	if (err)
 		return err;
+	if (qp->com.from_state != RES_QP_HW) {
+		err = -EBUSY;
+		goto out;
+	}
 
-	return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+	/* do not modify vport QP params for RSS QPs */
+	if (!(qp->qpc_flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET))) {
+		err = update_vport_qp_param(dev, inbox, slave, qpn);
+		if (err)
+			goto out;
+	}
+
+	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+out:
+	/* if no error, save sched queue value passed in by VF. This is
+	 * essentially the QOS value provided by the VF. This will be useful
+	 * if we allow dynamic changes from VST back to VGT
+	 */
+	if (!err) {
+		qp->sched_queue = orig_sched_queue;
+		qp->param3	= orig_param3;
+		qp->vlan_control = orig_vlan_control;
+		qp->fvl_rx	=  orig_fvl_rx;
+		qp->pri_path_fl = orig_pri_path_fl;
+		qp->vlan_index  = orig_vlan_index;
+		qp->feup	= orig_feup;
+	}
+	put_res(dev, slave, qpn, RES_QP);
+	return err;
 }
 
 int mlx4_RTR2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
@@ -3439,7 +3616,7 @@ static struct res_gid *find_gid(struct mlx4_dev *dev, int slave,
 
 static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 		       u8 *gid, enum mlx4_protocol prot,
-		       enum mlx4_steer_type steer)
+		       enum mlx4_steer_type steer, u64 reg_id)
 {
 	struct res_gid *res;
 	int err;
@@ -3456,6 +3633,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 		memcpy(res->gid, gid, 16);
 		res->prot = prot;
 		res->steer = steer;
+		res->reg_id = reg_id;
 		list_add_tail(&res->list, &rqp->mcg_list);
 		err = 0;
 	}
@@ -3466,7 +3644,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 
 static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 		       u8 *gid, enum mlx4_protocol prot,
-		       enum mlx4_steer_type steer)
+		       enum mlx4_steer_type steer, u64 *reg_id)
 {
 	struct res_gid *res;
 	int err;
@@ -3476,6 +3654,7 @@ static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 	if (!res || res->prot != prot || res->steer != steer)
 		err = -EINVAL;
 	else {
+		*reg_id = res->reg_id;
 		list_del(&res->list);
 		kfree(res);
 		err = 0;
@@ -3485,6 +3664,37 @@ static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 	return err;
 }
 
+static int qp_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+		     int block_loopback, enum mlx4_protocol prot,
+		     enum mlx4_steer_type type, u64 *reg_id)
+{
+	switch (dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_DEVICE_MANAGED:
+		return mlx4_trans_to_dmfs_attach(dev, qp, gid, gid[5],
+						block_loopback, prot,
+						reg_id);
+	case MLX4_STEERING_MODE_B0:
+		return mlx4_qp_attach_common(dev, qp, gid,
+					    block_loopback, prot, type);
+	default:
+		return -EINVAL;
+	}
+}
+
+static int qp_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+		     enum mlx4_protocol prot, enum mlx4_steer_type type,
+		     u64 reg_id)
+{
+	switch (dev->caps.steering_mode) {
+	case MLX4_STEERING_MODE_DEVICE_MANAGED:
+		return mlx4_flow_detach(dev, reg_id);
+	case MLX4_STEERING_MODE_B0:
+		return mlx4_qp_detach_common(dev, qp, gid, prot, type);
+	default:
+		return -EINVAL;
+	}
+}
+
 int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 			       struct mlx4_vhcr *vhcr,
 			       struct mlx4_cmd_mailbox *inbox,
@@ -3497,6 +3707,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 	int err;
 	int qpn;
 	struct res_qp *rqp;
+	u64 reg_id = 0;
 	int attach = vhcr->op_modifier;
 	int block_loopback = vhcr->in_modifier >> 31;
 	u8 steer_type_mask = 2;
@@ -3509,30 +3720,32 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 
 	qp.qpn = qpn;
 	if (attach) {
-		err = add_mcg_res(dev, slave, rqp, gid, prot, type);
-		if (err)
+		err = qp_attach(dev, &qp, gid, block_loopback, prot,
+				type, &reg_id);
+		if (err) {
+			pr_err("Fail to attach rule to qp 0x%x\n", qpn);
 			goto ex_put;
-
-		err = mlx4_qp_attach_common(dev, &qp, gid,
-					    block_loopback, prot, type);
+		}
+		err = add_mcg_res(dev, slave, rqp, gid, prot, type, reg_id);
 		if (err)
-			goto ex_rem;
+			goto ex_detach;
 	} else {
-		err = rem_mcg_res(dev, slave, rqp, gid, prot, type);
+		err = rem_mcg_res(dev, slave, rqp, gid, prot, type, &reg_id);
 		if (err)
 			goto ex_put;
-		err = mlx4_qp_detach_common(dev, &qp, gid, prot, type);
+
+		err = qp_detach(dev, &qp, gid, prot, type, reg_id);
+		if (err)
+			pr_err("Fail to detach rule from qp 0x%x reg_id = 0x%llx\n",
+			       qpn, (unsigned long long)reg_id);
 	}
-
 	put_res(dev, slave, qpn, RES_QP);
-	return 0;
+	return err;
 
-ex_rem:
-	/* ignore error return below, already in error */
-	(void) rem_mcg_res(dev, slave, rqp, gid, prot, type);
+ex_detach:
+	qp_detach(dev, &qp, gid, prot, type, reg_id);
 ex_put:
 	put_res(dev, slave, qpn, RES_QP);
-
 	return err;
 }
 
@@ -3540,7 +3753,6 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
  * MAC validation for Flow Steering rules.
  * VF can attach rules only with a mac address which is assigned to it.
  */
-
 static int validate_eth_header_mac(int slave, struct _rule_hw *eth_header,
 				   struct list_head *rlist)
 {
@@ -3633,6 +3845,8 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 	struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
 	struct list_head *rlist = &tracker->slave_list[slave].res_list[RES_MAC];
 	int err;
+	int qpn;
+	struct res_qp *rqp;
 	struct mlx4_net_trans_rule_hw_ctrl *ctrl;
 	struct _rule_hw  *rule_header;
 	int header_id;
@@ -3642,13 +3856,21 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 		return -EOPNOTSUPP;
 
 	ctrl = (struct mlx4_net_trans_rule_hw_ctrl *)inbox->buf;
+	qpn = be32_to_cpu(ctrl->qpn) & 0xffffff;
+	err = get_res(dev, slave, qpn, RES_QP, &rqp);
+	if (err) {
+		pr_err("Steering rule with qpn 0x%x rejected.\n", qpn);
+		return err;
+	}
 	rule_header = (struct _rule_hw *)(ctrl + 1);
 	header_id = map_hw_to_sw_id(be16_to_cpu(rule_header->id));
 
 	switch (header_id) {
 	case MLX4_NET_TRANS_RULE_ID_ETH:
-		if (validate_eth_header_mac(slave, rule_header, rlist))
-			return -EINVAL;
+		if (validate_eth_header_mac(slave, rule_header, rlist)) {
+			err = -EINVAL;
+			goto err_put;
+		}
 		break;
 	case MLX4_NET_TRANS_RULE_ID_IB:
 		break;
@@ -3656,14 +3878,17 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 	case MLX4_NET_TRANS_RULE_ID_TCP:
 	case MLX4_NET_TRANS_RULE_ID_UDP:
 		pr_warn("Can't attach FS rule without L2 headers, adding L2 header.\n");
-		if (add_eth_header(dev, slave, inbox, rlist, header_id))
-			return -EINVAL;
+		if (add_eth_header(dev, slave, inbox, rlist, header_id)) {
+			err = -EINVAL;
+			goto err_put;
+		}
 		vhcr->in_modifier +=
 			sizeof(struct mlx4_net_trans_rule_hw_eth) >> 2;
 		break;
 	default:
 		pr_err("Corrupted mailbox.\n");
-		return -EINVAL;
+		err = -EINVAL;
+		goto err_put;
 	}
 
 	err = mlx4_cmd_imm(dev, inbox->dma, &vhcr->out_param,
@@ -3671,16 +3896,20 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 			   MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
 			   MLX4_CMD_NATIVE);
 	if (err)
-		return err;
+		goto err_put;
 
-	err = add_res_range(dev, slave, vhcr->out_param, 1, RES_FS_RULE, 0);
+	err = add_res_range(dev, slave, vhcr->out_param, 1, RES_FS_RULE, qpn);
 	if (err) {
 		mlx4_err(dev, "Fail to add flow steering resources.\n ");
 		/* detach rule*/
 		mlx4_cmd(dev, vhcr->out_param, 0, 0,
-			 MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
+			 MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
 			 MLX4_CMD_NATIVE);
+		goto err_put;
 	}
+	atomic_inc(&rqp->ref_count);
+err_put:
+	put_res(dev, slave, qpn, RES_QP);
 	return err;
 }
 
@@ -3691,20 +3920,38 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
 					 struct mlx4_cmd_info *cmd)
 {
 	int err;
+	struct res_qp *rqp;
+	struct res_fs_rule *rrule;
 
 	if (dev->caps.steering_mode !=
 	    MLX4_STEERING_MODE_DEVICE_MANAGED)
 		return -EOPNOTSUPP;
 
-	err = rem_res_range(dev, slave, vhcr->in_param, 1, RES_FS_RULE, 0);
-	if (err) {
-		mlx4_err(dev, "Fail to remove flow steering resources.\n ");
+	err = get_res(dev, slave, vhcr->in_param, RES_FS_RULE, &rrule);
+	if (err)
+		return err;
+	/* Release the rule form busy state before removal */
+	put_res(dev, slave, vhcr->in_param, RES_FS_RULE);
+	err = get_res(dev, slave, rrule->qpn, RES_QP, &rqp);
+	if (err)
 		return err;
-	}
 
 	err = mlx4_cmd(dev, vhcr->in_param, 0, 0,
 		       MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
 		       MLX4_CMD_NATIVE);
+	if (!err) {
+		err = rem_res_range(dev, slave, vhcr->in_param, 1, RES_FS_RULE,
+				    0);
+		atomic_dec(&rqp->ref_count);
+
+		if (err) {
+			mlx4_err(dev, "Fail to remove flow steering resources.\n ");
+			goto out;
+		}
+	}
+
+out:
+	put_res(dev, slave, rrule->qpn, RES_QP);
 	return err;
 }
 
@@ -3719,14 +3966,9 @@ int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave,
 			       struct mlx4_cmd_info *cmd)
 {
 	int err;
-	int index = vhcr->in_modifier & 0xffff;
-
-	err = get_res(dev, slave, index, RES_COUNTER, NULL);
-	if (err)
-		return err;
 
 	err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
-	put_res(dev, slave, index, RES_COUNTER);
+
 	return err;
 }
 
@@ -3737,9 +3979,16 @@ static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)
 	struct mlx4_qp qp; /* dummy for calling attach/detach */
 
 	list_for_each_entry_safe(rgid, tmp, &rqp->mcg_list, list) {
-		qp.qpn = rqp->local_qpn;
-		(void) mlx4_qp_detach_common(dev, &qp, rgid->gid, rgid->prot,
-					     rgid->steer);
+		switch (dev->caps.steering_mode) {
+		case MLX4_STEERING_MODE_DEVICE_MANAGED:
+			mlx4_flow_detach(dev, rgid->reg_id);
+			break;
+		case MLX4_STEERING_MODE_B0:
+			qp.qpn = rqp->local_qpn;
+			(void) mlx4_qp_detach_common(dev, &qp, rgid->gid,
+						     rgid->prot, rgid->steer);
+			break;
+		}
 		list_del(&rgid->list);
 		kfree(rgid);
 	}
@@ -3766,7 +4015,7 @@ static int _move_all_busy(struct mlx4_dev *dev, int slave,
 						mlx4_dbg(dev,
 							 "%s id 0x%llx is busy\n",
 							  ResourceType(type),
-							  (long long)r->res_id);
+							  (unsigned long long)r->res_id);
 					++busy;
 				} else {
 					r->from_state = r->state;
@@ -3834,6 +4083,11 @@ static void rem_slave_qps(struct mlx4_dev *dev, int slave)
 						 &tracker->res_tree[RES_QP]);
 					list_del(&qp->com.list);
 					spin_unlock_irq(mlx4_tlock(dev));
+					if (!valid_reserved(dev, slave, qpn)) {
+						__mlx4_qp_release_range(dev, qpn, 1);
+						mlx4_release_resource(dev, slave,
+								      RES_QP, 1, 0);
+					}
 					kfree(qp);
 					state = 0;
 					break;
@@ -3905,6 +4159,8 @@ static void rem_slave_srqs(struct mlx4_dev *dev, int slave)
 						 &tracker->res_tree[RES_SRQ]);
 					list_del(&srq->com.list);
 					spin_unlock_irq(mlx4_tlock(dev));
+					mlx4_release_resource(dev, slave,
+							      RES_SRQ, 1, 0);
 					kfree(srq);
 					state = 0;
 					break;
@@ -3971,6 +4227,8 @@ static void rem_slave_cqs(struct mlx4_dev *dev, int slave)
 						 &tracker->res_tree[RES_CQ]);
 					list_del(&cq->com.list);
 					spin_unlock_irq(mlx4_tlock(dev));
+					mlx4_release_resource(dev, slave,
+							      RES_CQ, 1, 0);
 					kfree(cq);
 					state = 0;
 					break;
@@ -4028,18 +4286,20 @@ static void rem_slave_mrs(struct mlx4_dev *dev, int slave)
 			while (state != 0) {
 				switch (state) {
 				case RES_MPT_RESERVED:
-					__mlx4_mr_release(dev, mpt->key);
+					__mlx4_mpt_release(dev, mpt->key);
 					spin_lock_irq(mlx4_tlock(dev));
 					rb_erase(&mpt->com.node,
 						 &tracker->res_tree[RES_MPT]);
 					list_del(&mpt->com.list);
 					spin_unlock_irq(mlx4_tlock(dev));
+					mlx4_release_resource(dev, slave,
+							      RES_MPT, 1, 0);
 					kfree(mpt);
 					state = 0;
 					break;
 
 				case RES_MPT_MAPPED:
-					__mlx4_mr_free_icm(dev, mpt->key);
+					__mlx4_mpt_free_icm(dev, mpt->key);
 					state = RES_MPT_RESERVED;
 					break;
 
@@ -4103,6 +4363,8 @@ static void rem_slave_mtts(struct mlx4_dev *dev, int slave)
 						 &tracker->res_tree[RES_MTT]);
 					list_del(&mtt->com.list);
 					spin_unlock_irq(mlx4_tlock(dev));
+					mlx4_release_resource(dev, slave, RES_MTT,
+							      1 << mtt->order, 0);
 					kfree(mtt);
 					state = 0;
 					break;
@@ -4238,32 +4500,7 @@ static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
 
 static void rem_slave_counters(struct mlx4_dev *dev, int slave)
 {
-	struct mlx4_priv *priv = mlx4_priv(dev);
-	struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
-	struct list_head *counter_list =
-		&tracker->slave_list[slave].res_list[RES_COUNTER];
-	struct res_counter *counter;
-	struct res_counter *tmp;
-	int err;
-	int index;
-
-	err = move_all_busy(dev, slave, RES_COUNTER);
-	if (err)
-		mlx4_warn(dev, "rem_slave_counters: Could not move all counters to "
-			  "busy for slave %d\n", slave);
-
-	spin_lock_irq(mlx4_tlock(dev));
-	list_for_each_entry_safe(counter, tmp, counter_list, com.list) {
-		if (counter->com.owner == slave) {
-			index = counter->com.res_id;
-			rb_erase(&counter->com.node,
-				 &tracker->res_tree[RES_COUNTER]);
-			list_del(&counter->com.list);
-			kfree(counter);
-			__mlx4_counter_free(dev, index);
-		}
-	}
-	spin_unlock_irq(mlx4_tlock(dev));
+	__mlx4_slave_counters_free(dev, slave);
 }
 
 static void rem_slave_xrcdns(struct mlx4_dev *dev, int slave)
@@ -4302,6 +4539,7 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)
 	mutex_lock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
 	rem_slave_macs(dev, slave);
 	rem_slave_vlans(dev, slave);
+	rem_slave_fs_rule(dev, slave);
 	rem_slave_qps(dev, slave);
 	rem_slave_srqs(dev, slave);
 	rem_slave_cqs(dev, slave);
@@ -4310,6 +4548,139 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)
 	rem_slave_mtts(dev, slave);
 	rem_slave_counters(dev, slave);
 	rem_slave_xrcdns(dev, slave);
-	rem_slave_fs_rule(dev, slave);
 	mutex_unlock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
 }
+
+void mlx4_vf_immed_vlan_work_handler(struct work_struct *_work)
+{
+	struct mlx4_vf_immed_vlan_work *work =
+		container_of(_work, struct mlx4_vf_immed_vlan_work, work);
+	struct mlx4_cmd_mailbox *mailbox;
+	struct mlx4_update_qp_context *upd_context;
+	struct mlx4_dev *dev = &work->priv->dev;
+	struct mlx4_resource_tracker *tracker =
+		&work->priv->mfunc.master.res_tracker;
+	struct list_head *qp_list =
+		&tracker->slave_list[work->slave].res_list[RES_QP];
+	struct res_qp *qp;
+	struct res_qp *tmp;
+	u64 qp_path_mask_vlan_ctrl =
+		       ((1ULL << MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_UNTAGGED) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_1P) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_TAGGED) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_UNTAGGED) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_1P) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_TAGGED));
+
+	u64 qp_path_mask = ((1ULL << MLX4_UPD_QP_PATH_MASK_VLAN_INDEX) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_FVL) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_CV) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_ETH_HIDE_CQE_VLAN) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_FEUP) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_FVL_RX) |
+		       (1ULL << MLX4_UPD_QP_PATH_MASK_SCHED_QUEUE));
+
+	int err;
+	int port, errors = 0;
+	u8 vlan_control;
+
+	if (mlx4_is_slave(dev)) {
+		mlx4_warn(dev, "Trying to update-qp in slave %d\n",
+			  work->slave);
+		goto out;
+	}
+
+	mailbox = mlx4_alloc_cmd_mailbox(dev);
+	if (IS_ERR(mailbox))
+		goto out;
+
+	if (!work->vlan_id)
+		vlan_control = MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED |
+			MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED;
+	else
+		vlan_control = MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED |
+			MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED |
+			MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED;
+
+	upd_context = mailbox->buf;
+	upd_context->qp_mask = cpu_to_be64(MLX4_UPD_QP_MASK_VSD);
+
+	spin_lock_irq(mlx4_tlock(dev));
+	list_for_each_entry_safe(qp, tmp, qp_list, com.list) {
+		spin_unlock_irq(mlx4_tlock(dev));
+		if (qp->com.owner == work->slave) {
+			if (qp->com.from_state != RES_QP_HW ||
+			    !qp->sched_queue ||  /* no INIT2RTR trans yet */
+			    mlx4_is_qp_reserved(dev, qp->local_qpn) ||
+			    qp->qpc_flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET)) {
+				spin_lock_irq(mlx4_tlock(dev));
+				continue;
+			}
+			port = (qp->sched_queue >> 6 & 1) + 1;
+			if (port != work->port) {
+				spin_lock_irq(mlx4_tlock(dev));
+				continue;
+			}
+			if (MLX4_QP_ST_RC == ((qp->qpc_flags >> 16) & 0xff))
+				upd_context->primary_addr_path_mask = cpu_to_be64(qp_path_mask);
+			else
+				upd_context->primary_addr_path_mask =
+					cpu_to_be64(qp_path_mask | qp_path_mask_vlan_ctrl);
+			if (work->vlan_id == MLX4_VGT) {
+				upd_context->qp_context.param3 = qp->param3;
+				upd_context->qp_context.pri_path.vlan_control = qp->vlan_control;
+				upd_context->qp_context.pri_path.fvl_rx = qp->fvl_rx;
+				upd_context->qp_context.pri_path.vlan_index = qp->vlan_index;
+				upd_context->qp_context.pri_path.fl = qp->pri_path_fl;
+				upd_context->qp_context.pri_path.feup = qp->feup;
+				upd_context->qp_context.pri_path.sched_queue =
+					qp->sched_queue;
+			} else {
+				upd_context->qp_context.param3 = qp->param3 & ~cpu_to_be32(MLX4_STRIP_VLAN);
+				upd_context->qp_context.pri_path.vlan_control = vlan_control;
+				upd_context->qp_context.pri_path.vlan_index = work->vlan_ix;
+				upd_context->qp_context.pri_path.fvl_rx =
+					qp->fvl_rx | MLX4_FVL_RX_FORCE_ETH_VLAN;
+				upd_context->qp_context.pri_path.fl =
+					qp->pri_path_fl | MLX4_FL_CV | MLX4_FL_ETH_HIDE_CQE_VLAN;
+				upd_context->qp_context.pri_path.feup =
+					qp->feup | MLX4_FEUP_FORCE_ETH_UP | MLX4_FVL_FORCE_ETH_VLAN;
+				upd_context->qp_context.pri_path.sched_queue =
+					qp->sched_queue & 0xC7;
+				upd_context->qp_context.pri_path.sched_queue |=
+					((work->qos & 0x7) << 3);
+			}
+
+			err = mlx4_cmd(dev, mailbox->dma,
+				       qp->local_qpn & 0xffffff,
+				       0, MLX4_CMD_UPDATE_QP,
+				       MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE);
+			if (err) {
+				mlx4_info(dev, "UPDATE_QP failed for slave %d, "
+					  "port %d, qpn %d (%d)\n",
+					  work->slave, port, qp->local_qpn,
+					  err);
+				errors++;
+			}
+		}
+		spin_lock_irq(mlx4_tlock(dev));
+	}
+	spin_unlock_irq(mlx4_tlock(dev));
+	mlx4_free_cmd_mailbox(dev, mailbox);
+
+	if (errors)
+		mlx4_err(dev, "%d UPDATE_QP failures for slave %d, port %d\n",
+			 errors, work->slave, work->port);
+
+	/* unregister previous vlan_id if needed and we had no errors
+	 * while updating the QPs
+	 */
+	if (work->flags & MLX4_VF_IMMED_VLAN_FLAG_VLAN && !errors &&
+	    NO_INDX != work->orig_vlan_ix)
+		__mlx4_unregister_vlan(&work->priv->dev, work->port,
+				       work->orig_vlan_id);
+out:
+	kfree(work);
+	return;
+}
+
diff --git a/sys/ofed/drivers/net/mlx4/sense.c b/sys/ofed/drivers/net/mlx4/sense.c
index 5e1665e15227..3615e6513e9f 100644
--- a/sys/ofed/drivers/net/mlx4/sense.c
+++ b/sys/ofed/drivers/net/mlx4/sense.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -53,7 +53,7 @@ int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
 	}
 
 	if (out_param > 2) {
-		mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", (long long)out_param);
+		mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", (unsigned long long)out_param);
 		return -EINVAL;
 	}
 
@@ -108,9 +108,8 @@ static void mlx4_sense_port(struct work_struct *work)
 
 sense_again:
 	mutex_unlock(&priv->port_mutex);
-	if (sense->resched)
-		queue_delayed_work(sense->sense_wq , &sense->sense_poll,
-				   round_jiffies(MLX4_SENSE_RANGE));
+	queue_delayed_work(mlx4_wq , &sense->sense_poll,
+			   round_jiffies_relative(MLX4_SENSE_RANGE));
 }
 
 void mlx4_start_sense(struct mlx4_dev *dev)
@@ -121,40 +120,24 @@ void mlx4_start_sense(struct mlx4_dev *dev)
 	if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_DPDP))
 		return;
 
-	sense->resched = 1;
-	queue_delayed_work(sense->sense_wq , &sense->sense_poll,
-			   round_jiffies(MLX4_SENSE_RANGE));
+	queue_delayed_work(mlx4_wq , &sense->sense_poll,
+			   round_jiffies_relative(MLX4_SENSE_RANGE));
 }
 
 void mlx4_stop_sense(struct mlx4_dev *dev)
 {
-	mlx4_priv(dev)->sense.resched = 0;
+	cancel_delayed_work_sync(&mlx4_priv(dev)->sense.sense_poll);
 }
 
-void mlx4_sense_cleanup(struct mlx4_dev *dev)
-{
-        mlx4_stop_sense(dev);
-        cancel_delayed_work(&mlx4_priv(dev)->sense.sense_poll);
-        destroy_workqueue(mlx4_priv(dev)->sense.sense_wq);
-}
-
-
-int  mlx4_sense_init(struct mlx4_dev *dev)
+void  mlx4_sense_init(struct mlx4_dev *dev)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct mlx4_sense *sense = &priv->sense;
 	int port;
 
-
 	sense->dev = dev;
-	sense->sense_wq = create_singlethread_workqueue("mlx4_sense");
-	if (!sense->sense_wq)
-		return -ENOMEM;
-
 	for (port = 1; port <= dev->caps.num_ports; port++)
 		sense->do_sense_port[port] = 1;
 
 	INIT_DEFERRABLE_WORK(&sense->sense_poll, mlx4_sense_port);
-
-        return 0;
 }
diff --git a/sys/ofed/drivers/net/mlx4/srq.c b/sys/ofed/drivers/net/mlx4/srq.c
index c37f68286565..fcb6255c7e62 100644
--- a/sys/ofed/drivers/net/mlx4/srq.c
+++ b/sys/ofed/drivers/net/mlx4/srq.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2007, 2008, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -32,6 +32,8 @@
  */
 
 #include <linux/mlx4/cmd.h>
+#include <linux/mlx4/srq.h>
+#include <linux/module.h>
 #include <linux/gfp.h>
 
 #include "mlx4.h"
@@ -113,7 +115,7 @@ int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn)
 	mlx4_table_put(dev, &srq_table->table, *srqn);
 
 err_out:
-	mlx4_bitmap_free(&srq_table->bitmap, *srqn);
+	mlx4_bitmap_free(&srq_table->bitmap, *srqn, MLX4_NO_RR);
 	return err;
 }
 
@@ -141,7 +143,7 @@ void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn)
 
 	mlx4_table_put(dev, &srq_table->cmpt_table, srqn);
 	mlx4_table_put(dev, &srq_table->table, srqn);
-	mlx4_bitmap_free(&srq_table->bitmap, srqn);
+	mlx4_bitmap_free(&srq_table->bitmap, srqn, MLX4_NO_RR);
 }
 
 static void mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn)
@@ -295,3 +297,18 @@ void mlx4_cleanup_srq_table(struct mlx4_dev *dev)
 		return;
 	mlx4_bitmap_cleanup(&mlx4_priv(dev)->srq_table.bitmap);
 }
+
+struct mlx4_srq *mlx4_srq_lookup(struct mlx4_dev *dev, u32 srqn)
+{
+	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+	struct mlx4_srq *srq;
+	unsigned long flags;
+
+	spin_lock_irqsave(&srq_table->lock, flags);
+	srq = radix_tree_lookup(&srq_table->tree,
+				srqn & (dev->caps.num_srqs - 1));
+	spin_unlock_irqrestore(&srq_table->lock, flags);
+
+	return srq;
+}
+EXPORT_SYMBOL_GPL(mlx4_srq_lookup);
diff --git a/sys/ofed/drivers/net/mlx4/sys_tune.c b/sys/ofed/drivers/net/mlx4/sys_tune.c
index 0675e90eacf5..87eb30e6ccfe 100644
--- a/sys/ofed/drivers/net/mlx4/sys_tune.c
+++ b/sys/ofed/drivers/net/mlx4/sys_tune.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2010, 2014 Mellanox Technologies. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -39,8 +39,6 @@
 
 #if defined(CONFIG_X86) && defined(CONFIG_APM_MODULE)
 
-
-
 /* Each CPU is put into a group.  In most cases, the group number is
  * equal to the CPU number of one of the CPUs in the group.  The
  * exception is group NR_CPUS which is the default group.  This is
diff --git a/sys/ofed/drivers/net/mlx4/utils.c b/sys/ofed/drivers/net/mlx4/utils.c
new file mode 100644
index 000000000000..2444ec5961c9
--- /dev/null
+++ b/sys/ofed/drivers/net/mlx4/utils.c
@@ -0,0 +1,189 @@
+/*	$OpenBSD: if_trunk.c,v 1.30 2007/01/31 06:20:19 reyk Exp $	*/
+
+/*
+ * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+#include "opt_inet6.h"
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/module.h>
+#include <sys/priv.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/hash.h>
+#include <sys/lock.h>
+#include <sys/rmlock.h>
+#include <sys/taskqueue.h>
+#include <sys/eventhandler.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_clone.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_llc.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_var.h>
+#include <net/bpf.h>
+
+#if defined(INET) || defined(INET6)
+#include <netinet/in.h>
+#endif
+#ifdef INET
+#include <netinet/in_systm.h>
+#include <netinet/if_ether.h>
+#include <netinet/ip.h>
+#endif
+
+#ifdef INET6
+#include <netinet/ip6.h>
+#include <netinet6/in6_var.h>
+#include <netinet6/in6_ifattach.h>
+#endif
+
+#include <net/if_vlan_var.h>
+
+#include "utils.h"
+
+/* XXX this code should be factored out */
+/* XXX copied from if_lagg.c */
+
+static const void *
+mlx4_en_gethdr(struct mbuf *m, u_int off, u_int len, void *buf)
+{
+	if (m->m_pkthdr.len < (off + len)) {
+		return (NULL);
+	} else if (m->m_len < (off + len)) {
+		m_copydata(m, off, len, buf);
+		return (buf);
+	}
+	return (mtod(m, char *) + off);
+}
+
+uint32_t
+mlx4_en_hashmbuf(uint32_t flags, struct mbuf *m, uint32_t key)
+{
+	uint16_t etype;
+	uint32_t p = key;
+	int off;
+	struct ether_header *eh;
+	const struct ether_vlan_header *vlan;
+#ifdef INET
+	const struct ip *ip;
+	const uint32_t *ports;
+	int iphlen;
+#endif
+#ifdef INET6
+	const struct ip6_hdr *ip6;
+	uint32_t flow;
+#endif
+	union {
+#ifdef INET
+		struct ip ip;
+#endif
+#ifdef INET6
+		struct ip6_hdr ip6;
+#endif
+		struct ether_vlan_header vlan;
+		uint32_t port;
+	} buf;
+
+
+	off = sizeof(*eh);
+	if (m->m_len < off)
+		goto out;
+	eh = mtod(m, struct ether_header *);
+	etype = ntohs(eh->ether_type);
+	if (flags & MLX4_F_HASHL2) {
+		p = hash32_buf(&eh->ether_shost, ETHER_ADDR_LEN, p);
+		p = hash32_buf(&eh->ether_dhost, ETHER_ADDR_LEN, p);
+	}
+
+	/* Special handling for encapsulating VLAN frames */
+	if ((m->m_flags & M_VLANTAG) && (flags & MLX4_F_HASHL2)) {
+		p = hash32_buf(&m->m_pkthdr.ether_vtag,
+		    sizeof(m->m_pkthdr.ether_vtag), p);
+	} else if (etype == ETHERTYPE_VLAN) {
+		vlan = mlx4_en_gethdr(m, off,  sizeof(*vlan), &buf);
+		if (vlan == NULL)
+			goto out;
+
+		if (flags & MLX4_F_HASHL2)
+			p = hash32_buf(&vlan->evl_tag, sizeof(vlan->evl_tag), p);
+		etype = ntohs(vlan->evl_proto);
+		off += sizeof(*vlan) - sizeof(*eh);
+	}
+
+	switch (etype) {
+#ifdef INET
+	case ETHERTYPE_IP:
+		ip = mlx4_en_gethdr(m, off, sizeof(*ip), &buf);
+		if (ip == NULL)
+			goto out;
+
+		if (flags & MLX4_F_HASHL3) {
+			p = hash32_buf(&ip->ip_src, sizeof(struct in_addr), p);
+			p = hash32_buf(&ip->ip_dst, sizeof(struct in_addr), p);
+		}
+		if (!(flags & MLX4_F_HASHL4))
+			break;
+		switch (ip->ip_p) {
+			case IPPROTO_TCP:
+			case IPPROTO_UDP:
+			case IPPROTO_SCTP:
+				iphlen = ip->ip_hl << 2;
+				if (iphlen < sizeof(*ip))
+					break;
+				off += iphlen;
+				ports = mlx4_en_gethdr(m, off, sizeof(*ports), &buf);
+				if (ports == NULL)
+					break;
+				p = hash32_buf(ports, sizeof(*ports), p);
+				break;
+		}
+		break;
+#endif
+#ifdef INET6
+	case ETHERTYPE_IPV6:
+		if (!(flags & MLX4_F_HASHL3))
+			break;
+		ip6 = mlx4_en_gethdr(m, off, sizeof(*ip6), &buf);
+		if (ip6 == NULL)
+			goto out;
+
+		p = hash32_buf(&ip6->ip6_src, sizeof(struct in6_addr), p);
+		p = hash32_buf(&ip6->ip6_dst, sizeof(struct in6_addr), p);
+		flow = ip6->ip6_flow & IPV6_FLOWLABEL_MASK;
+		p = hash32_buf(&flow, sizeof(flow), p);	/* IPv6 flow label */
+		break;
+#endif
+	}
+out:
+	return (p);
+}
diff --git a/sys/ofed/drivers/net/mlx4/utils.h b/sys/ofed/drivers/net/mlx4/utils.h
new file mode 100644
index 000000000000..51a654ccb1cc
--- /dev/null
+++ b/sys/ofed/drivers/net/mlx4/utils.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014 Mellanox Technologies Ltd.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _MLX4_UTILS_H_
+#define	_MLX4_UTILS_H_
+
+/* Lagg flags */
+#define	MLX4_F_HASHL2		0x00000001	/* hash layer 2 */
+#define	MLX4_F_HASHL3		0x00000002	/* hash layer 3 */
+#define	MLX4_F_HASHL4		0x00000004	/* hash layer 4 */
+#define	MLX4_F_HASHMASK		0x00000007
+
+uint32_t mlx4_en_hashmbuf(uint32_t flags, struct mbuf *m, uint32_t key);
+
+#endif		/* _MLX4_UTILS_H_ */
diff --git a/sys/ofed/include/linux/linux_compat.c b/sys/ofed/include/linux/linux_compat.c
index e8e73c065403..c2fb4d7d7abf 100644
--- a/sys/ofed/include/linux/linux_compat.c
+++ b/sys/ofed/include/linux/linux_compat.c
@@ -568,14 +568,35 @@ linux_file_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *cred,
 	return (error);
 }
 
+static int
+linux_file_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
+    struct thread *td)
+{
+
+	return (EOPNOTSUPP);
+}
+
+static int
+linux_file_fill_kinfo(struct file *fp, struct kinfo_file *kif,
+    struct filedesc *fdp)
+{
+
+	return (0);
+}
+
 struct fileops linuxfileops = {
 	.fo_read = linux_file_read,
-	.fo_poll = linux_file_poll,
-	.fo_close = linux_file_close,
+	.fo_write = invfo_rdwr,
+	.fo_truncate = invfo_truncate,
 	.fo_ioctl = linux_file_ioctl,
+	.fo_poll = linux_file_poll,
+	.fo_kqfilter = invfo_kqfilter,
+	.fo_stat = linux_file_stat,
+	.fo_close = linux_file_close,
 	.fo_chmod = invfo_chmod,
 	.fo_chown = invfo_chown,
 	.fo_sendfile = invfo_sendfile,
+	.fo_fill_kinfo = linux_file_fill_kinfo,
 };
 
 /*
diff --git a/sys/ofed/include/linux/mlx4/cmd.h b/sys/ofed/include/linux/mlx4/cmd.h
index d83ee3a53453..e2d41bcf417a 100644
--- a/sys/ofed/include/linux/mlx4/cmd.h
+++ b/sys/ofed/include/linux/mlx4/cmd.h
@@ -34,6 +34,7 @@
 #define MLX4_CMD_H
 
 #include <linux/dma-mapping.h>
+#include <linux/types.h>
 
 enum {
 	/* initialization and general commands */
@@ -111,6 +112,7 @@ enum {
 	MLX4_CMD_INIT2INIT_QP	 = 0x2d,
 	MLX4_CMD_SUSPEND_QP	 = 0x32,
 	MLX4_CMD_UNSUSPEND_QP	 = 0x33,
+	MLX4_CMD_UPDATE_QP	 = 0x61,
 	/* special QP and management commands */
 	MLX4_CMD_CONF_SPECIAL_QP = 0x23,
 	MLX4_CMD_MAD_IFC	 = 0x24,
@@ -152,10 +154,6 @@ enum {
 	MLX4_CMD_QUERY_IF_STAT	 = 0X54,
 	MLX4_CMD_SET_IF_STAT	 = 0X55,
 
-	/* set port opcode modifiers */
-	MLX4_SET_PORT_PRIO2TC = 0x8,
-	MLX4_SET_PORT_SCHEDULER  = 0x9,
-
 	/* register/delete flow steering network rules */
 	MLX4_QP_FLOW_STEERING_ATTACH = 0x65,
 	MLX4_QP_FLOW_STEERING_DETACH = 0x66,
@@ -175,12 +173,14 @@ enum {
 
 enum {
 	/* set port opcode modifiers */
-	MLX4_SET_PORT_GENERAL   = 0x0,
-	MLX4_SET_PORT_RQP_CALC  = 0x1,
-	MLX4_SET_PORT_MAC_TABLE = 0x2,
-	MLX4_SET_PORT_VLAN_TABLE = 0x3,
-	MLX4_SET_PORT_PRIO_MAP  = 0x4,
-	MLX4_SET_PORT_GID_TABLE = 0x5,
+	MLX4_SET_PORT_GENERAL		= 0x0,
+	MLX4_SET_PORT_RQP_CALC		= 0x1,
+	MLX4_SET_PORT_MAC_TABLE		= 0x2,
+	MLX4_SET_PORT_VLAN_TABLE	= 0x3,
+	MLX4_SET_PORT_PRIO_MAP		= 0x4,
+	MLX4_SET_PORT_GID_TABLE		= 0x5,
+	MLX4_SET_PORT_PRIO2TC		= 0x8,
+	MLX4_SET_PORT_SCHEDULER		= 0x9
 };
 
 enum {
@@ -237,7 +237,21 @@ u32 mlx4_comm_get_version(void);
 int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u8 *mac);
 int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos);
 int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting);
+int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state);
+int mlx4_get_vf_link_state(struct mlx4_dev *dev, int port, int vf);
+/*
+ * mlx4_get_slave_default_vlan -
+ * retrun true if VST ( default vlan)
+ * if VST will fill vlan & qos (if not NULL)
+ */
+bool mlx4_get_slave_default_vlan(struct mlx4_dev *dev, int port, int slave, u16 *vlan, u8 *qos);
 
+enum {
+	IFLA_VF_LINK_STATE_AUTO,	/* link state of the uplink */
+	IFLA_VF_LINK_STATE_ENABLE,	/* link always up */
+	IFLA_VF_LINK_STATE_DISABLE,	/* link always down */
+	__IFLA_VF_LINK_STATE_MAX,
+};
 
 #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)
 
diff --git a/sys/ofed/include/linux/mlx4/cq.h b/sys/ofed/include/linux/mlx4/cq.h
index 08216692452e..ed6bec188edb 100644
--- a/sys/ofed/include/linux/mlx4/cq.h
+++ b/sys/ofed/include/linux/mlx4/cq.h
@@ -42,17 +42,31 @@ struct mlx4_cqe {
 	__be32			vlan_my_qpn;
 	__be32			immed_rss_invalid;
 	__be32			g_mlpath_rqpn;
-	__be16			sl_vid;
-	__be16			rlid;
-	__be16			status;
-	u8			ipv6_ext_mask;
-	u8			badfcs_enc;
+	union {
+		struct {
+			union {
+				struct {
+					__be16			sl_vid;
+					__be16	rlid;
+				};
+				__be32			timestamp_16_47;
+			};
+			__be16  status;
+			u8      ipv6_ext_mask;
+			u8      badfcs_enc;
+		};
+		struct {
+			__be16 reserved1;
+			u8  smac[6];
+		};
+	};
 	__be32			byte_cnt;
 	__be16			wqe_index;
 	__be16			checksum;
-	u8			reserved[3];
+	u8			reserved2[1];
+	__be16			timestamp_0_15;
 	u8			owner_sr_opcode;
-};
+} __packed;
 
 struct mlx4_err_cqe {
 	__be32			my_qpn;
@@ -83,6 +97,7 @@ struct mlx4_ts_cqe {
 enum {
 	MLX4_CQE_VLAN_PRESENT_MASK	= 1 << 29,
 	MLX4_CQE_QPN_MASK		= 0xffffff,
+	MLX4_CQE_VID_MASK		= 0xfff,
 };
 
 enum {
diff --git a/sys/ofed/include/linux/mlx4/device.h b/sys/ofed/include/linux/mlx4/device.h
index 2828ef073120..a1beedbc092f 100644
--- a/sys/ofed/include/linux/mlx4/device.h
+++ b/sys/ofed/include/linux/mlx4/device.h
@@ -36,11 +36,12 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/radix-tree.h>
-//#include <linux/cpu_rmap.h> /* XXX SK Probably not needed in freeBSD XXX */
-
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/workqueue.h>
 #include <asm/atomic.h>
 
-#include <linux/clocksource.h> /* XXX SK ported to freeBSD */
+#include <linux/clocksource.h>
 
 #define MAX_MSIX_P_PORT		17
 #define MAX_MSIX		64
@@ -61,9 +62,7 @@
 #define MLX4_RATELIMIT_1G_UNITS		4	/* 1 Gbps */
 #define MLX4_RATELIMIT_DEFAULT		0x00ff
 
-
-
-#define MLX4_LEAST_ATTACHED_VECTOR      0xffffffff
+#define CORE_CLOCK_MASK 0xffffffffffffULL
 
 enum {
 	MLX4_FLAG_MSI_X		= 1 << 0,
@@ -71,6 +70,8 @@ enum {
 	MLX4_FLAG_MASTER	= 1 << 2,
 	MLX4_FLAG_SLAVE		= 1 << 3,
 	MLX4_FLAG_SRIOV		= 1 << 4,
+	MLX4_FLAG_DEV_NUM_STR	= 1 << 5,
+	MLX4_FLAG_OLD_REG_MAC   = 1 << 6,
 };
 
 enum {
@@ -91,7 +92,8 @@ enum {
 #define MLX4_RESERVED_QKEY_MASK  (0xFFFF0000)
 
 enum {
-	MLX4_BOARD_ID_LEN = 64
+	MLX4_BOARD_ID_LEN = 64,
+	MLX4_VSD_LEN = 208
 };
 
 enum {
@@ -159,13 +161,13 @@ enum {
 	MLX4_DEV_CAP_FLAG_UDP_RSS	= 1LL << 40,
 	MLX4_DEV_CAP_FLAG_VEP_UC_STEER	= 1LL << 41,
 	MLX4_DEV_CAP_FLAG_VEP_MC_STEER	= 1LL << 42,
+	MLX4_DEV_CAP_FLAG_CROSS_CHANNEL	= 1LL << 44,
 	MLX4_DEV_CAP_FLAG_COUNTERS	= 1LL << 48,
 	MLX4_DEV_CAP_FLAG_COUNTERS_EXT	= 1LL << 49,
 	MLX4_DEV_CAP_FLAG_SET_PORT_ETH_SCHED = 1LL << 53,
 	MLX4_DEV_CAP_FLAG_SENSE_SUPPORT	= 1LL << 55,
 	MLX4_DEV_CAP_FLAG_FAST_DROP	= 1LL << 57,
 	MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 1LL << 59,
-	MLX4_DEV_CAP_FLAG_ESWITCH_SUPPORT = 1LL << 60,
 	MLX4_DEV_CAP_FLAG_64B_EQE	= 1LL << 61,
 	MLX4_DEV_CAP_FLAG_64B_CQE	= 1LL << 62
 };
@@ -174,7 +176,34 @@ enum {
 	MLX4_DEV_CAP_FLAG2_RSS			= 1LL <<  0,
 	MLX4_DEV_CAP_FLAG2_RSS_TOP		= 1LL <<  1,
 	MLX4_DEV_CAP_FLAG2_RSS_XOR		= 1LL <<  2,
-	MLX4_DEV_CAP_FLAG2_FS_EN		= 1LL <<  3
+	MLX4_DEV_CAP_FLAG2_FS_EN		= 1LL <<  3,
+	MLX4_DEV_CAP_FLAG2_FSM			= 1LL <<  4,
+	MLX4_DEV_CAP_FLAG2_VLAN_CONTROL		= 1LL <<  5,
+	MLX4_DEV_CAP_FLAG2_UPDATE_QP		= 1LL <<  6,
+	MLX4_DEV_CAP_FLAG2_LB_SRC_CHK		= 1LL <<  7,
+	MLX4_DEV_CAP_FLAG2_DMFS_IPOIB		= 1LL <<  8,
+	MLX4_DEV_CAP_FLAG2_ETS_CFG		= 1LL <<  9,
+	MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP	= 1LL <<  10,
+	MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN		= 1LL <<  11,
+	MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT = 1LL << 12,
+	MLX4_DEV_CAP_FLAG2_TS                   = 1LL <<  13,
+	MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW    = 1LL <<  14
+};
+
+/* bit enums for an 8-bit flags field indicating special use
+ * QPs which require special handling in qp_reserve_range.
+ * Currently, this only includes QPs used by the ETH interface,
+ * where we expect to use blueflame.  These QPs must not have
+ * bits 6 and 7 set in their qp number.
+ *
+ * This enum may use only bits 0..7.
+ */
+enum {
+	MLX4_RESERVE_BF_QP	= 1 << 7,
+};
+
+enum {
+	MLX4_DEV_CAP_CQ_FLAG_IO			= 1 <<  0
 };
 
 enum {
@@ -190,22 +219,11 @@ enum {
 	MLX4_FUNC_CAP_64B_EQE_CQE	= 1L << 0
 };
 
-/* bit enums for an 8-bit flags field indicating special use
- * QPs which require special handling in qp_reserve_range.
- * Currently, this only includes QPs used by the ETH interface,
- * where we expect to use blueflame.  These QPs must not have
- * bits 6 and 7 set in their qp number.
- *
- * This enum may use only bits 0..7.
- */
-enum {
-        MLX4_RESERVE_BF_QP      = 1 << 7,
-};
-
 
 #define MLX4_ATTR_EXTENDED_PORT_INFO	cpu_to_be16(0xff90)
 
 enum {
+	MLX4_BMME_FLAG_WIN_TYPE_2B	= 1 << 1,
 	MLX4_BMME_FLAG_LOCAL_INV	= 1 <<  6,
 	MLX4_BMME_FLAG_REMOTE_INV	= 1 <<  7,
 	MLX4_BMME_FLAG_TYPE_2_WIN	= 1 <<  9,
@@ -238,6 +256,7 @@ enum mlx4_event {
 	MLX4_EVENT_TYPE_FATAL_WARNING	   = 0x1b,
 	MLX4_EVENT_TYPE_FLR_EVENT	   = 0x1c,
 	MLX4_EVENT_TYPE_PORT_MNG_CHG_EVENT = 0x1d,
+	MLX4_EVENT_TYPE_RECOVERABLE_ERROR_EVENT  = 0x3e,
 	MLX4_EVENT_TYPE_NONE		   = 0xff,
 };
 
@@ -246,6 +265,11 @@ enum {
 	MLX4_PORT_CHANGE_SUBTYPE_ACTIVE	= 4
 };
 
+enum {
+	MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_BAD_CABLE		= 1,
+	MLX4_RECOVERABLE_ERROR_EVENT_SUBTYPE_UNSUPPORTED_CABLE	= 2,
+};
+
 enum {
 	MLX4_FATAL_WARNING_SUBTYPE_WARMING = 0,
 };
@@ -274,7 +298,8 @@ enum {
 	MLX4_PERM_LOCAL_WRITE	= 1 << 11,
 	MLX4_PERM_REMOTE_READ	= 1 << 12,
 	MLX4_PERM_REMOTE_WRITE	= 1 << 13,
-	MLX4_PERM_ATOMIC	= 1 << 14
+	MLX4_PERM_ATOMIC	= 1 << 14,
+	MLX4_PERM_BIND_MW	= 1 << 15,
 };
 
 enum {
@@ -335,7 +360,8 @@ enum mlx4_port_type {
 	MLX4_PORT_TYPE_NONE	= 0,
 	MLX4_PORT_TYPE_IB	= 1,
 	MLX4_PORT_TYPE_ETH	= 2,
-	MLX4_PORT_TYPE_AUTO	= 3
+	MLX4_PORT_TYPE_AUTO	= 3,
+	MLX4_PORT_TYPE_NA	= 4
 };
 
 enum mlx4_special_vlan_idx {
@@ -435,7 +461,7 @@ struct mlx4_caps {
 	int			comp_pool;
 	int			num_mpts;
 	int			max_fmr_maps;
-	int			num_mtts;
+	u64			num_mtts;
 	int			fmr_reserved_mtts;
 	int			reserved_mtts;
 	int			reserved_mrws;
@@ -476,6 +502,7 @@ struct mlx4_caps {
 	u8			port_ib_mtu[MLX4_MAX_PORTS + 1];
 	u16			sqp_demux;
 	u32			sync_qp;
+	u32			cq_flags;
 	u32			eqe_size;
 	u32			cqe_size;
 	u8			eqe_factor;
@@ -485,6 +512,7 @@ struct mlx4_caps {
 	u16			hca_core_clock;
 	u32			max_basic_counters;
 	u32			max_extended_counters;
+	u8			def_counter_index[MLX4_MAX_PORTS + 1];
 };
 
 struct mlx4_buf_list {
@@ -548,6 +576,18 @@ struct mlx4_mr {
 	int			enabled;
 };
 
+enum mlx4_mw_type {
+	MLX4_MW_TYPE_1 = 1,
+	MLX4_MW_TYPE_2 = 2,
+};
+
+struct mlx4_mw {
+	u32			key;
+	u32			pd;
+	enum mlx4_mw_type	type;
+	int			enabled;
+};
+
 struct mlx4_fmr {
 	struct mlx4_mr		mr;
 	struct mlx4_mpt_entry  *mpt;
@@ -641,7 +681,8 @@ struct mlx4_eth_av {
 	u8		hop_limit;
 	__be32		sl_tclass_flowlabel;
 	u8		dgid[16];
-	u32		reserved4[2];
+	u8		s_mac[6];
+	u8	reserved4[2];
 	__be16		vlan;
 	u8		mac[6];
 };
@@ -731,6 +772,8 @@ struct mlx4_dev {
 	struct radix_tree_root	qp_table_tree;
 	u8			rev_id;
 	char			board_id[MLX4_BOARD_ID_LEN];
+	u16			vsd_vendor_id;
+	char			vsd[MLX4_VSD_LEN];
 	int			num_vfs;
 	int			numa_node;
 	int			oper_log_mgm_entry_size;
@@ -738,6 +781,12 @@ struct mlx4_dev {
 	u64			regid_allmulti_array[MLX4_MAX_PORTS + 1];
 };
 
+struct mlx4_clock_params {
+	u64 offset;
+	u8 bar;
+	u8 size;
+};
+
 struct mlx4_eqe {
 	u8			reserved1;
 	u8			type;
@@ -807,6 +856,11 @@ struct mlx4_eqe {
 				} __packed tbl_change_info;
 			} params;
 		} __packed port_mgmt_change;
+		struct {
+			u8 reserved[3];
+			u8 port;
+			u32 reserved1[5];
+		} __packed bad_cable;
 	}			event;
 	u8			slave_id;
 	u8			reserved3[2];
@@ -842,6 +896,8 @@ struct mlx4_init_port_param {
 
 #define MLX4_INVALID_SLAVE_ID	0xFF
 
+#define MLX4_SINK_COUNTER_INDEX 0xff
+
 void handle_port_mgmt_change_event(struct work_struct *work);
 
 static inline int mlx4_master_func_num(struct mlx4_dev *dev)
@@ -915,8 +971,12 @@ u64 mlx4_mtt_addr(struct mlx4_dev *dev, struct mlx4_mtt *mtt);
 
 int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
 		  int npages, int page_shift, struct mlx4_mr *mr);
-void mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr);
+int mlx4_mr_free(struct mlx4_dev *dev, struct mlx4_mr *mr);
 int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr);
+int mlx4_mw_alloc(struct mlx4_dev *dev, u32 pd, enum mlx4_mw_type type,
+		  struct mlx4_mw *mw);
+void mlx4_mw_free(struct mlx4_dev *dev, struct mlx4_mw *mw);
+int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw);
 int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 		   int start_index, int npages, u64 *page_list);
 int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
@@ -936,7 +996,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
 void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq);
 
 int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align,
-			  int *base, u8 bf_qp);
+			  int *base, u8 flags);
 void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt);
 
 int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp);
@@ -990,12 +1050,14 @@ static inline int map_hw_to_sw_id(u16 header_id)
 	}
 	return -EINVAL;
 }
+
 enum mlx4_net_trans_promisc_mode {
-	MLX4_FS_REGULAR		= 0,
-	MLX4_FS_ALL_DEFAULT	= 1,
-	MLX4_FS_MC_DEFAULT	= 3,
-	MLX4_FS_UC_SNIFFER	= 4,
-	MLX4_FS_MC_SNIFFER	= 5,
+	MLX4_FS_REGULAR		= 1,
+	MLX4_FS_ALL_DEFAULT,
+	MLX4_FS_MC_DEFAULT,
+	MLX4_FS_UC_SNIFFER,
+	MLX4_FS_MC_SNIFFER,
+	MLX4_FS_MODE_NUM, /* should be last */
 };
 
 struct mlx4_spec_eth {
@@ -1024,7 +1086,7 @@ struct mlx4_spec_ipv4 {
 };
 
 struct mlx4_spec_ib {
-	__be32 r_u_qpn;
+	__be32 l3_qpn;
 	__be32 qpn_msk;
 	u8 dst_gid[16];
 	u8 dst_gid_msk[16];
@@ -1057,6 +1119,87 @@ struct mlx4_net_trans_rule {
 	u32	qpn;
 };
 
+struct mlx4_net_trans_rule_hw_ctrl {
+	__be16 prio;
+	u8 type;
+	u8 flags;
+	u8 rsvd1;
+	u8 funcid;
+	u8 vep;
+	u8 port;
+	__be32 qpn;
+	__be32 rsvd2;
+};
+
+struct mlx4_net_trans_rule_hw_ib {
+	u8 size;
+	u8 rsvd1;
+	__be16 id;
+	u32 rsvd2;
+	__be32 l3_qpn;
+	__be32 qpn_mask;
+	u8 dst_gid[16];
+	u8 dst_gid_msk[16];
+} __packed;
+
+struct mlx4_net_trans_rule_hw_eth {
+	u8	size;
+	u8	rsvd;
+	__be16	id;
+	u8	rsvd1[6];
+	u8	dst_mac[6];
+	u16	rsvd2;
+	u8	dst_mac_msk[6];
+	u16	rsvd3;
+	u8	src_mac[6];
+	u16	rsvd4;
+	u8	src_mac_msk[6];
+	u8      rsvd5;
+	u8      ether_type_enable;
+	__be16  ether_type;
+	__be16  vlan_tag_msk;
+	__be16  vlan_tag;
+} __packed;
+
+struct mlx4_net_trans_rule_hw_tcp_udp {
+	u8	size;
+	u8	rsvd;
+	__be16	id;
+	__be16	rsvd1[3];
+	__be16	dst_port;
+	__be16	rsvd2;
+	__be16	dst_port_msk;
+	__be16	rsvd3;
+	__be16	src_port;
+	__be16	rsvd4;
+	__be16	src_port_msk;
+} __packed;
+
+struct mlx4_net_trans_rule_hw_ipv4 {
+	u8	size;
+	u8	rsvd;
+	__be16	id;
+	__be32	rsvd1;
+	__be32	dst_ip;
+	__be32	dst_ip_msk;
+	__be32	src_ip;
+	__be32	src_ip_msk;
+} __packed;
+
+struct _rule_hw {
+	union {
+		struct {
+			u8 size;
+			u8 rsvd;
+			__be16 id;
+		};
+		struct mlx4_net_trans_rule_hw_eth eth;
+		struct mlx4_net_trans_rule_hw_ib ib;
+		struct mlx4_net_trans_rule_hw_ipv4 ipv4;
+		struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
+	};
+};
+
 int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port, u32 qpn,
 				enum mlx4_net_trans_promisc_mode mode);
 int mlx4_flow_steer_promisc_remove(struct mlx4_dev *dev, u8 port,
@@ -1071,7 +1214,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 int mlx4_get_base_qpn(struct mlx4_dev *dev, u8 port);
 int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
-void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);
+void mlx4_set_stats_bitmap(struct mlx4_dev *dev, unsigned long *stats_bitmap);
 int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
 			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);
 int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
@@ -1097,18 +1240,23 @@ int mlx4_query_diag_counters(struct mlx4_dev *mlx4_dev, int array_length,
 			     u32 counter_out[]);
 
 int mlx4_test_interrupts(struct mlx4_dev *dev);
-int mlx4_assign_eq(struct mlx4_dev *dev, char *name, int *vector);
+int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector);
 void mlx4_release_eq(struct mlx4_dev *dev, int vec);
 
 int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port);
 int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port);
 
-int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
-void mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
+int mlx4_counter_alloc(struct mlx4_dev *dev, u8 port, u32 *idx);
+void mlx4_counter_free(struct mlx4_dev *dev, u8 port, u32 idx);
 
 int mlx4_flow_attach(struct mlx4_dev *dev,
 		     struct mlx4_net_trans_rule *rule, u64 *reg_id);
 int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id);
+int map_sw_to_hw_steering_mode(struct mlx4_dev *dev,
+			       enum mlx4_net_trans_promisc_mode flow_type);
+int map_sw_to_hw_steering_id(struct mlx4_dev *dev,
+			     enum mlx4_net_trans_rule_id id);
+int hw_rule_sz(struct mlx4_dev *dev, enum mlx4_net_trans_rule_id id);
 
 void mlx4_sync_pkey_table(struct mlx4_dev *dev, int slave, int port,
 			  int i, int val);
@@ -1118,7 +1266,7 @@ int mlx4_get_parav_qkey(struct mlx4_dev *dev, u32 qpn, u32 *qkey);
 int mlx4_is_slave_active(struct mlx4_dev *dev, int slave);
 int mlx4_gen_pkey_eqe(struct mlx4_dev *dev, int slave, u8 port);
 int mlx4_gen_guid_change_eqe(struct mlx4_dev *dev, int slave, u8 port);
-int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr);
+int mlx4_gen_slaves_port_mgt_ev(struct mlx4_dev *dev, u8 port, int attr, u16 lid, u8 sl);
 int mlx4_gen_port_state_change_eqe(struct mlx4_dev *dev, int slave, u8 port, u8 port_subtype_change);
 enum slave_port_state mlx4_get_slave_port_state(struct mlx4_dev *dev, int slave, u8 port);
 int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave, u8 port, int event, enum slave_port_gen_event *gen_event);
@@ -1130,6 +1278,8 @@ int mlx4_get_roce_gid_from_slave(struct mlx4_dev *dev, int port, int slave_id, u
 
 int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn, u32 max_range_qpn);
 
-cycle_t mlx4_read_clock(struct mlx4_dev *dev);
+int mlx4_read_clock(struct mlx4_dev *dev);
+int mlx4_get_internal_clock_params(struct mlx4_dev *dev,
+				   struct mlx4_clock_params *params);
 
 #endif /* MLX4_DEVICE_H */
diff --git a/sys/ofed/include/linux/mlx4/driver.h b/sys/ofed/include/linux/mlx4/driver.h
index 8235a97d0244..2a7fd21ed4d9 100644
--- a/sys/ofed/include/linux/mlx4/driver.h
+++ b/sys/ofed/include/linux/mlx4/driver.h
@@ -51,32 +51,72 @@ enum mlx4_dev_event {
 	MLX4_DEV_EVENT_SLAVE_SHUTDOWN,
 };
 
-enum mlx4_query_reply {
-	MLX4_QUERY_NOT_MINE	= -1,
-	MLX4_QUERY_MINE_NOPORT 	= 0
-};
-
-enum mlx4_mcast_prot {
-	MLX4_MCAST_PROT_IB = 0,
-	MLX4_MCAST_PROT_EN = 1,
-};
-
 struct mlx4_interface {
 	void *			(*add)	 (struct mlx4_dev *dev);
 	void			(*remove)(struct mlx4_dev *dev, void *context);
 	void			(*event) (struct mlx4_dev *dev, void *context,
 					  enum mlx4_dev_event event, unsigned long param);
 	void *			(*get_dev)(struct mlx4_dev *dev, void *context, u8 port);
-
-	enum mlx4_query_reply	(*query) (void *context, void *);
 	struct list_head	list;
 	enum mlx4_protocol	protocol;
 };
 
+enum {
+	MLX4_MAX_DEVICES	= 32,
+	MLX4_DEVS_TBL_SIZE	= MLX4_MAX_DEVICES + 1,
+	MLX4_DBDF2VAL_STR_SIZE	= 512,
+	MLX4_STR_NAME_SIZE	= 64,
+	MLX4_MAX_BDF_VALS	= 2,
+	MLX4_ENDOF_TBL		= -1LL
+};
+
+struct mlx4_dbdf2val {
+	u64 dbdf;
+	int val[MLX4_MAX_BDF_VALS];
+};
+
+struct mlx4_range {
+	int min;
+	int max;
+};
+
+/*
+ * mlx4_dbdf2val_lst struct holds all the data needed to convert
+ * dbdf-to-value-list string into dbdf-to-value table.
+ * dbdf-to-value-list string is a comma separated list of dbdf-to-value strings.
+ * the format of dbdf-to-value string is: "[mmmm:]bb:dd.f-v1[;v2]"
+ * mmmm - Domain number (optional)
+ * bb - Bus number
+ * dd - device number
+ * f  - Function number
+ * v1 - First value related to the domain-bus-device-function.
+ * v2 - Second value related to the domain-bus-device-function (optional).
+ * bb, dd - Two hexadecimal digits without preceding 0x.
+ * mmmm - Four hexadecimal digits without preceding 0x.
+ * f  - One hexadecimal without preceding 0x.
+ * v1,v2 - Number with normal convention (e.g 100, 0xd3).
+ * dbdf-to-value-list string format:
+ *     "[mmmm:]bb:dd.f-v1[;v2],[mmmm:]bb:dd.f-v1[;v2],..."
+ *
+ */
+struct mlx4_dbdf2val_lst {
+	char		name[MLX4_STR_NAME_SIZE];    /* String name */
+	char		str[MLX4_DBDF2VAL_STR_SIZE]; /* dbdf2val list str */
+	struct mlx4_dbdf2val tbl[MLX4_DEVS_TBL_SIZE];/* dbdf to value table */
+	int		num_vals;		     /* # of vals per dbdf */
+	int		def_val[MLX4_MAX_BDF_VALS];  /* Default values */
+	struct mlx4_range range;		     /* Valid values range */
+};
+
+int mlx4_fill_dbdf2val_tbl(struct mlx4_dbdf2val_lst *dbdf2val_lst);
+int mlx4_get_val(struct mlx4_dbdf2val *tbl, struct pci_dev *pdev, int idx,
+		 int *val);
+
 int mlx4_register_interface(struct mlx4_interface *intf);
 void mlx4_unregister_interface(struct mlx4_interface *intf);
 
-void *mlx4_get_protocol_dev(struct mlx4_dev *dev, enum mlx4_protocol proto, int port);
+void *mlx4_get_protocol_dev(struct mlx4_dev *dev, enum mlx4_protocol proto,
+			    int port);
 
 #ifndef ETH_ALEN
 #define ETH_ALEN	6
diff --git a/sys/ofed/include/linux/mlx4/qp.h b/sys/ofed/include/linux/mlx4/qp.h
index 2d45a9d624fe..8ab9bb4722c6 100644
--- a/sys/ofed/include/linux/mlx4/qp.h
+++ b/sys/ofed/include/linux/mlx4/qp.h
@@ -104,9 +104,9 @@ enum {
 	MLX4_QP_BIT_RWE				= 1 << 14,
 	MLX4_QP_BIT_RAE				= 1 << 13,
 	MLX4_QP_BIT_RIC				= 1 <<	4,
-	MLX4_QP_BIT_COLL_SYNC_RQ                = 1 <<  2,
-	MLX4_QP_BIT_COLL_SYNC_SQ                = 1 <<  1,
-	MLX4_QP_BIT_COLL_MASTER                 = 1 <<  0
+	MLX4_QP_BIT_COLL_SYNC_RQ                = 1 << 2,
+	MLX4_QP_BIT_COLL_SYNC_SQ                = 1 << 1,
+	MLX4_QP_BIT_COLL_MASTER                 = 1 << 0
 };
 
 enum {
@@ -138,7 +138,7 @@ struct mlx4_rss_context {
 
 struct mlx4_qp_path {
 	u8			fl;
-	u8			reserved1[1];
+	u8			vlan_control;
 	u8			disable_pkey_check;
 	u8			pkey_index;
 	u8			counter_index;
@@ -153,11 +153,35 @@ struct mlx4_qp_path {
 	u8			sched_queue;
 	u8			vlan_index;
 	u8			feup;
-	u8			reserved3;
+	u8			fvl_rx;
 	u8			reserved4[2];
 	u8			dmac[6];
 };
 
+enum { /* fl */
+	MLX4_FL_CV	= 1 << 6,
+	MLX4_FL_ETH_HIDE_CQE_VLAN	= 1 << 2,
+	MLX4_FL_ETH_SRC_CHECK_MC_LB	= 1 << 1,
+	MLX4_FL_ETH_SRC_CHECK_UC_LB	= 1 << 0,
+};
+enum { /* vlan_control */
+	MLX4_VLAN_CTRL_ETH_SRC_CHECK_IF_COUNTER	= 1 << 7,
+	MLX4_VLAN_CTRL_ETH_TX_BLOCK_TAGGED	= 1 << 6,
+	MLX4_VLAN_CTRL_ETH_RX_BLOCK_TAGGED	= 1 << 2,
+	MLX4_VLAN_CTRL_ETH_RX_BLOCK_PRIO_TAGGED	= 1 << 1,/* 802.1p priorty tag*/
+	MLX4_VLAN_CTRL_ETH_RX_BLOCK_UNTAGGED	= 1 << 0
+};
+
+enum { /* feup */
+	MLX4_FEUP_FORCE_ETH_UP		= 1 << 6, /* force Eth UP */
+	MLX4_FSM_FORCE_ETH_SRC_MAC	= 1 << 5, /* force Source MAC */
+	MLX4_FVL_FORCE_ETH_VLAN		= 1 << 3  /* force Eth vlan */
+};
+
+enum { /* fvl_rx */
+	MLX4_FVL_RX_FORCE_ETH_VLAN	= 1 << 0 /* enforce Eth rx vlan */
+};
+
 struct mlx4_qp_context {
 	__be32			flags;
 	__be32			pd;
@@ -197,6 +221,45 @@ struct mlx4_qp_context {
 	u32			reserved5[10];
 };
 
+struct mlx4_update_qp_context {
+	__be64			qp_mask;
+	__be64			primary_addr_path_mask;
+	__be64			secondary_addr_path_mask;
+	u64			reserved1;
+	struct mlx4_qp_context	qp_context;
+	u64			reserved2[58];
+};
+
+enum {
+	MLX4_UPD_QP_MASK_PM_STATE	= 32,
+	MLX4_UPD_QP_MASK_VSD		= 33,
+};
+
+enum {
+	MLX4_UPD_QP_PATH_MASK_PKEY_INDEX		= 0 + 32,
+	MLX4_UPD_QP_PATH_MASK_FSM			= 1 + 32,
+	MLX4_UPD_QP_PATH_MASK_MAC_INDEX			= 2 + 32,
+	MLX4_UPD_QP_PATH_MASK_FVL			= 3 + 32,
+	MLX4_UPD_QP_PATH_MASK_CV			= 4 + 32,
+	MLX4_UPD_QP_PATH_MASK_VLAN_INDEX		= 5 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_HIDE_CQE_VLAN		= 6 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_UNTAGGED	= 7 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_1P		= 8 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_TX_BLOCK_TAGGED	= 9 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_UNTAGGED	= 10 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_1P		= 11 + 32,
+	MLX4_UPD_QP_PATH_MASK_ETH_RX_BLOCK_TAGGED	= 12 + 32,
+	MLX4_UPD_QP_PATH_MASK_FEUP			= 13 + 32,
+	MLX4_UPD_QP_PATH_MASK_SCHED_QUEUE		= 14 + 32,
+	MLX4_UPD_QP_PATH_MASK_IF_COUNTER_INDEX		= 15 + 32,
+	MLX4_UPD_QP_PATH_MASK_FVL_RX			= 16 + 32,
+};
+
+enum { /* param3 */
+	MLX4_STRIP_VLAN	= 1 << 30
+};
+
+
 /* Which firmware version adds support for NEC (NoErrorCompletion) bit */
 #define MLX4_FW_VER_WQE_CTRL_NEC mlx4_fw_ver(2, 2, 232)
 
@@ -277,6 +340,11 @@ struct mlx4_wqe_lso_seg {
 	__be32			header[0];
 };
 
+enum mlx4_wqe_bind_seg_flags2 {
+	MLX4_WQE_BIND_TYPE_2     = (1<<31),
+	MLX4_WQE_BIND_ZERO_BASED = (1<<30),
+};
+
 struct mlx4_wqe_bind_seg {
 	__be32			flags1;
 	__be32			flags2;
@@ -289,9 +357,9 @@ struct mlx4_wqe_bind_seg {
 enum {
 	MLX4_WQE_FMR_PERM_LOCAL_READ	= 1 << 27,
 	MLX4_WQE_FMR_PERM_LOCAL_WRITE	= 1 << 28,
-	MLX4_WQE_FMR_PERM_REMOTE_READ	= 1 << 29,
-	MLX4_WQE_FMR_PERM_REMOTE_WRITE	= 1 << 30,
-	MLX4_WQE_FMR_PERM_ATOMIC	= 1 << 31
+	MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_READ	= 1 << 29,
+	MLX4_WQE_FMR_AND_BIND_PERM_REMOTE_WRITE	= 1 << 30,
+	MLX4_WQE_FMR_AND_BIND_PERM_ATOMIC	= 1 << 31
 };
 
 struct mlx4_wqe_fmr_seg {
@@ -316,12 +384,10 @@ struct mlx4_wqe_fmr_ext_seg {
 };
 
 struct mlx4_wqe_local_inval_seg {
-	__be32			flags;
-	u32			reserved1;
+	u64			reserved1;
 	__be32			mem_key;
-	u32			reserved2[2];
-	__be32			guest_id;
-	__be64			pa;
+	u32			reserved2;
+	u64			reserved3[2];
 };
 
 struct mlx4_wqe_raddr_seg {
diff --git a/sys/ofed/include/linux/mlx4/srq.h b/sys/ofed/include/linux/mlx4/srq.h
index 799a0697a383..192e0f7784f2 100644
--- a/sys/ofed/include/linux/mlx4/srq.h
+++ b/sys/ofed/include/linux/mlx4/srq.h
@@ -39,4 +39,6 @@ struct mlx4_wqe_srq_next_seg {
 	u32			reserved2[3];
 };
 
+struct mlx4_srq *mlx4_srq_lookup(struct mlx4_dev *dev, u32 srqn);
+
 #endif /* MLX4_SRQ_H */
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 4d16833cf0f1..bf461381cfbd 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/fcntl.h>
 #include <sys/bus.h>
+#include <sys/user.h>
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
@@ -281,30 +282,27 @@ struct fcrypt {
 	int		sesn;
 };
 
-static	int cryptof_rw(struct file *fp, struct uio *uio,
-		    struct ucred *cred, int flags, struct thread *);
-static	int cryptof_truncate(struct file *, off_t, struct ucred *,
-		    struct thread *);
 static	int cryptof_ioctl(struct file *, u_long, void *,
 		    struct ucred *, struct thread *);
-static	int cryptof_poll(struct file *, int, struct ucred *, struct thread *);
-static	int cryptof_kqfilter(struct file *, struct knote *);
 static	int cryptof_stat(struct file *, struct stat *,
 		    struct ucred *, struct thread *);
 static	int cryptof_close(struct file *, struct thread *);
+static	int cryptof_fill_kinfo(struct file *, struct kinfo_file *,
+		    struct filedesc *);
 
 static struct fileops cryptofops = {
-    .fo_read = cryptof_rw,
-    .fo_write = cryptof_rw,
-    .fo_truncate = cryptof_truncate,
+    .fo_read = invfo_rdwr,
+    .fo_write = invfo_rdwr,
+    .fo_truncate = invfo_truncate,
     .fo_ioctl = cryptof_ioctl,
-    .fo_poll = cryptof_poll,
-    .fo_kqfilter = cryptof_kqfilter,
+    .fo_poll = invfo_poll,
+    .fo_kqfilter = invfo_kqfilter,
     .fo_stat = cryptof_stat,
     .fo_close = cryptof_close,
     .fo_chmod = invfo_chmod,
     .fo_chown = invfo_chown,
     .fo_sendfile = invfo_sendfile,
+    .fo_fill_kinfo = cryptof_fill_kinfo,
 };
 
 static struct csession *csefind(struct fcrypt *, u_int);
@@ -320,29 +318,6 @@ static	int cryptodev_op(struct csession *, struct crypt_op *,
 static	int cryptodev_key(struct crypt_kop *);
 static	int cryptodev_find(struct crypt_find_op *);
 
-static int
-cryptof_rw(
-	struct file *fp,
-	struct uio *uio,
-	struct ucred *active_cred,
-	int flags,
-	struct thread *td)
-{
-
-	return (EIO);
-}
-
-static int
-cryptof_truncate(
-	struct file *fp,
-	off_t length,
-	struct ucred *active_cred,
-	struct thread *td)
-{
-
-	return (EINVAL);
-}
-
 /*
  * Check a crypto identifier to see if it requested
  * a software device/driver.  This can be done either
@@ -959,26 +934,6 @@ cryptodev_find(struct crypt_find_op *find)
 	return (0);
 }
 
-/* ARGSUSED */
-static int
-cryptof_poll(
-	struct file *fp,
-	int events,
-	struct ucred *active_cred,
-	struct thread *td)
-{
-
-	return (0);
-}
-
-/* ARGSUSED */
-static int
-cryptof_kqfilter(struct file *fp, struct knote *kn)
-{
-
-	return (0);
-}
-
 /* ARGSUSED */
 static int
 cryptof_stat(
@@ -1007,6 +962,14 @@ cryptof_close(struct file *fp, struct thread *td)
 	return 0;
 }
 
+static int
+cryptof_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+	kif->kf_type = KF_TYPE_CRYPTO;
+	return (0);
+}
+
 static struct csession *
 csefind(struct fcrypt *fcr, u_int ses)
 {
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
deleted file mode 100644
index fd65d7247e46..000000000000
--- a/sys/pc98/cbus/fdc.c
+++ /dev/null
@@ -1,2596 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Don Ahn.
- *
- * Libretto PCMCIA floppy support by David Horwitt (dhorwitt@ucsd.edu)
- * aided by the Linux floppy driver modifications from David Bateman
- * (dbateman@eng.uts.edu.au).
- *
- * Copyright (c) 1993, 1994 by
- *  jc@irbs.UUCP (John Capo)
- *  vak@zebub.msk.su (Serge Vakulenko)
- *  ache@astral.msk.su (Andrew A. Chernov)
- *
- * Copyright (c) 1993, 1994, 1995 by
- *  joerg_wunsch@uriah.sax.de (Joerg Wunsch)
- *  dufault@hda.com (Peter Dufault)
- *
- * Copyright (c) 2001 Joerg Wunsch,
- *  joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch)
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
- */
-
-#include "opt_fdc.h"
-
-#include <sys/param.h>
-#include <sys/bio.h>
-#include <sys/bus.h>
-#include <sys/devicestat.h>
-#include <sys/disk.h>
-#include <sys/fcntl.h>
-#include <sys/fdcio.h>
-#include <sys/filio.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/priv.h>
-#include <sys/proc.h>
-#include <sys/rman.h>
-#include <sys/systm.h>
-
-#include <machine/bus.h>
-#include <machine/stdarg.h>
-
-#ifdef PC98
-#include <isa/isavar.h>
-#include <pc98/cbus/fdcreg.h>
-#include <pc98/cbus/fdcvar.h>
-#include <pc98/pc98/pc98_machdep.h>
-#else
-#include <isa/isavar.h>
-#include <isa/isareg.h>
-#include <dev/fdc/fdcreg.h>
-#include <dev/fdc/fdcvar.h>
-#include <isa/rtc.h>
-#endif
-
-#define FDBIO_FORMAT	BIO_CMD2
-
-/* configuration flags for fdc */
-#define FDC_NO_FIFO	(1 << 2)	/* do not enable FIFO  */
-
-/*
- * Stop retrying after this many DMA overruns.  Since each retry takes
- * one revolution, with 300 rpm., 25 retries take approximately 5
- * seconds which the read attempt will block in case the DMA overrun
- * is persistent.
- */
-#define FDC_DMAOV_MAX	25
-
-/*
- * Timeout value for the PIO loops to wait until the FDC main status
- * register matches our expectations (request for master, direction
- * bit).  This is supposed to be a number of microseconds, although
- * timing might actually not be very accurate.
- *
- * Timeouts of 100 msec are believed to be required for some broken
- * (old) hardware.
- */
-#define	FDSTS_TIMEOUT	100000
-
-/*
- * Number of subdevices that can be used for different density types.
- */
-#ifdef PC98
-#define NUMDENS		12
-#else
-#define NUMDENS		16
-#endif
-
-#define FDBIO_RDSECTID	BIO_CMD1
-
-/*
- * List of native drive densities.  Order must match enum fd_drivetype
- * in <sys/fdcio.h>.  Upon attaching the drive, each of the
- * programmable subdevices is initialized with the native density
- * definition.
- */
-#ifdef PC98
-static struct fd_type fd_native_types[] =
-{
-{ 0 },						/* FDT_NONE */
-{ 0 },						/* FDT_360K */
-{ 15,2,0xFF,0x1B,80,2400,0,2,0x54,1,0,FL_MFM },	/* FDT_12M  */
-{ 0 },						/* FDT_720K */
-{ 18,2,0xFF,0x1B,80,2880,2,2,0x54,1,0,FL_MFM },	/* FDT_144M */
-{ 0 },						/* FDT_288M */
-};
-
-static struct fd_type fd_searchlist_12m[] = {
-{ 15,2,0xFF,0x1B,80,2400,0,2,0x54,1,0,FL_MFM },	/* 1.2M */
-#if 0
-{ 10,2,0xFF,0x10,82,1640,1,2,0x30,1,0,FL_MFM },	/* 820K */
-{ 10,2,0xFF,0x10,80,1600,1,2,0x30,1,0,FL_MFM },	/* 800K */
-#endif
-{  9,2,0xFF,0x20,80,1440,1,2,0x50,1,0,FL_MFM },	/* 720K */
-{  9,2,0xFF,0x20,40, 720,1,2,0x50,1,0,FL_MFM|FL_2STEP },/* 360K */
-{  8,2,0xFF,0x2A,80,1280,1,2,0x50,1,0,FL_MFM },	/* 640K */
-{  8,3,0xFF,0x35,77,1232,0,2,0x74,1,0,FL_MFM },	/* 1.23M 1024/sec */
-#if 0
-{  8,3,0xFF,0x35,80,1280,0,2,0x74,1,0,FL_MFM },	/* 1.28M 1024/sec */
-#endif
-};
-static struct fd_type fd_searchlist_144m[] = {
-#if 0
-{ 21,2,0xFF,0x04,82,3444,2,2,0x0C,2,0,FL_MFM },	/* 1.72M in 3mode */
-{ 18,2,0xFF,0x1B,82,2952,2,2,0x54,1,0,FL_MFM },	/* 1.48M in 3mode */
-#endif
-{ 18,2,0xFF,0x1B,80,2880,2,2,0x54,1,0,FL_MFM },	/* 1.44M in 3mode */
-{ 15,2,0xFF,0x1B,80,2400,0,2,0x54,1,0,FL_MFM },	/* 1.2M */
-#if 0
-{ 10,2,0xFF,0x10,82,1640,1,2,0x30,1,0,FL_MFM },	/* 820K */
-{ 10,2,0xFF,0x10,80,1600,1,2,0x30,1,0,FL_MFM },	/* 800K */
-#endif
-{  9,2,0xFF,0x20,80,1440,1,2,0x50,1,0,FL_MFM },	/* 720K */
-{  9,2,0xFF,0x20,40, 720,1,2,0x50,1,0,FL_MFM|FL_2STEP },/* 360K */
-{  8,2,0xFF,0x2A,80,1280,1,2,0x50,1,0,FL_MFM },	/* 640K */
-{  8,3,0xFF,0x35,77,1232,0,2,0x74,1,0,FL_MFM },	/* 1.23M 1024/sec */
-#if 0
-{  8,3,0xFF,0x35,80,1280,0,2,0x74,1,0,FL_MFM },	/* 1.28M 1024/sec */
-{  9,3,0xFF,0x35,82,1476,0,2,0x47,1,0,FL_MFM },	/* 1.48M 1024/sec 9sec */
-{ 10,3,0xFF,0x1B,82,1640,2,2,0x54,1,0,FL_MFM },	/* 1.64M in 3mode - Reserve */
-#endif
-};
-#else /* PC98 */
-static struct fd_type fd_native_types[] =
-{
-{ 0 },				/* FDT_NONE */
-{  9,2,0xFF,0x2A,40, 720,FDC_250KBPS,2,0x50,1,0,FL_MFM }, /* FDT_360K */
-{ 15,2,0xFF,0x1B,80,2400,FDC_500KBPS,2,0x54,1,0,FL_MFM }, /* FDT_12M  */
-{  9,2,0xFF,0x20,80,1440,FDC_250KBPS,2,0x50,1,0,FL_MFM }, /* FDT_720K */
-{ 18,2,0xFF,0x1B,80,2880,FDC_500KBPS,2,0x6C,1,0,FL_MFM }, /* FDT_144M */
-#if 0				/* we currently don't handle 2.88 MB */
-{ 36,2,0xFF,0x1B,80,5760,FDC_1MBPS,  2,0x4C,1,1,FL_MFM|FL_PERPND } /*FDT_288M*/
-#else
-{ 18,2,0xFF,0x1B,80,2880,FDC_500KBPS,2,0x6C,1,0,FL_MFM }, /* FDT_144M */
-#endif
-};
-
-/*
- * 360 KB 5.25" and 720 KB 3.5" drives don't have automatic density
- * selection, they just start out with their native density (or lose).
- * So 1.2 MB 5.25", 1.44 MB 3.5", and 2.88 MB 3.5" drives have their
- * respective lists of densities to search for.
- */
-static struct fd_type fd_searchlist_12m[] = {
-{ 15,2,0xFF,0x1B,80,2400,FDC_500KBPS,2,0x54,1,0,FL_MFM }, /* 1.2M */
-{  9,2,0xFF,0x23,40, 720,FDC_300KBPS,2,0x50,1,0,FL_MFM|FL_2STEP }, /* 360K */
-{  9,2,0xFF,0x20,80,1440,FDC_300KBPS,2,0x50,1,0,FL_MFM }, /* 720K */
-};
-
-static struct fd_type fd_searchlist_144m[] = {
-{ 18,2,0xFF,0x1B,80,2880,FDC_500KBPS,2,0x6C,1,0,FL_MFM }, /* 1.44M */
-{  9,2,0xFF,0x20,80,1440,FDC_250KBPS,2,0x50,1,0,FL_MFM }, /* 720K */
-};
-
-/* We search for 1.44M first since this is the most common case. */
-static struct fd_type fd_searchlist_288m[] = {
-{ 18,2,0xFF,0x1B,80,2880,FDC_500KBPS,2,0x6C,1,0,FL_MFM }, /* 1.44M */
-#if 0
-{ 36,2,0xFF,0x1B,80,5760,FDC_1MBPS,  2,0x4C,1,1,FL_MFM|FL_PERPND } /* 2.88M */
-#endif
-{  9,2,0xFF,0x20,80,1440,FDC_250KBPS,2,0x50,1,0,FL_MFM }, /* 720K */
-};
-#endif /* PC98 */
-
-#define MAX_SEC_SIZE	(128 << 3)
-#define MAX_CYLINDER	85	/* some people really stress their drives
-				 * up to cyl 82 */
-#define MAX_HEAD	1
-
-devclass_t fdc_devclass;
-
-/*
- * Per drive structure (softc).
- */
-struct fd_data {
-	struct	fdc_data *fdc;	/* pointer to controller structure */
-	int	fdsu;		/* this units number on this controller */
-	enum	fd_drivetype type; /* drive type */
-	struct	fd_type *ft;	/* pointer to current type descriptor */
-	struct	fd_type fts[NUMDENS]; /* type descriptors */
-	int	flags;
-#define	FD_OPEN		0x01	/* it's open		*/
-#define	FD_NONBLOCK	0x02	/* O_NONBLOCK set	*/
-#define	FD_ACTIVE	0x04	/* it's active		*/
-#define	FD_MOTOR	0x08	/* motor should be on	*/
-#define	FD_MOTOR_WAIT	0x10	/* motor coming up	*/
-#define	FD_UA		0x20	/* force unit attention */
-	int	skip;
-	int	hddrv;
-#define FD_NO_TRACK -2
-	int	track;		/* where we think the head is */
-	int	options;	/* user configurable options, see fdcio.h */
-	struct	callout_handle toffhandle;
-	struct	callout_handle tohandle;
-	struct	devstat *device_stats;
-	struct cdev *masterdev;
-	device_t dev;
-	fdu_t	fdu;
-#ifdef PC98
-	int	pc98_trans;
-#endif
-};
-
-struct fdc_ivars {
-	int	fdunit;
-	int	fdtype;
-};
-
-static devclass_t fd_devclass;
-
-/* configuration flags for fd */
-#define FD_TYPEMASK	0x0f	/* drive type, matches enum
-				 * fd_drivetype; on i386 machines, if
-				 * given as 0, use RTC type for fd0
-				 * and fd1 */
-#define FD_DTYPE(flags)	((flags) & FD_TYPEMASK)
-#define FD_NO_CHLINE	0x10	/* drive does not support changeline
-				 * aka. unit attention */
-#define FD_NO_PROBE	0x20	/* don't probe drive (seek test), just
-				 * assume it is there */
-
-/*
- * Throughout this file the following conventions will be used:
- *
- * fd is a pointer to the fd_data struct for the drive in question
- * fdc is a pointer to the fdc_data struct for the controller
- * fdu is the floppy drive unit number
- * fdcu is the floppy controller unit number
- * fdsu is the floppy drive unit number on that controller. (sub-unit)
- */
-
-/*
- * Function declarations, same (chaotic) order as they appear in the
- * file.  Re-ordering is too late now, it would only obfuscate the
- * diffs against old and offspring versions (like the PC98 one).
- *
- * Anyone adding functions here, please keep this sequence the same
- * as below -- makes locating a particular function in the body much
- * easier.
- */
-static u_int8_t fdsts_rd(fdc_p);
-static void fddata_wr(fdc_p, u_int8_t);
-static u_int8_t fddata_rd(fdc_p);
-static int fdc_err(struct fdc_data *, const char *);
-static int enable_fifo(fdc_p fdc);
-static int fd_sense_drive_status(fdc_p, int *);
-static int fd_sense_int(fdc_p, int *, int *);
-static int fd_read_status(fdc_p);
-static int fd_probe(device_t);
-static int fd_attach(device_t);
-static int fd_detach(device_t);
-static void set_motor(struct fdc_data *, int, int);
-#  define TURNON 1
-#  define TURNOFF 0
-static timeout_t fd_turnoff;
-static timeout_t fd_motor_on;
-static void fd_turnon(struct fd_data *);
-static void fdc_reset(fdc_p);
-static int fd_in(struct fdc_data *, int *);
-static int out_fdc(struct fdc_data *, int);
-static	d_open_t	fdopen;
-static	d_close_t	fdclose;
-static	d_strategy_t	fdstrategy;
-static void fdstart(struct fdc_data *);
-static timeout_t fd_iotimeout;
-static timeout_t fd_pseudointr;
-static driver_intr_t fdc_intr;
-static int fdcpio(fdc_p, long, caddr_t, u_int);
-static int fdautoselect(struct cdev *);
-static int fdstate(struct fdc_data *);
-static int retrier(struct fdc_data *);
-static void fdbiodone(struct bio *);
-static int fdmisccmd(struct cdev *, u_int, void *);
-static	d_ioctl_t	fdioctl;
-
-static int fifo_threshold = 8;	/* XXX: should be accessible via sysctl */
-
-#ifdef	FDC_DEBUG
-/* CAUTION: fd_debug causes huge amounts of logging output */
-static int volatile fd_debug = 0;
-#define TRACE0(arg) do { if (fd_debug) printf(arg); } while (0)
-#define TRACE1(arg1, arg2) do { if (fd_debug) printf(arg1, arg2); } while (0)
-#else /* FDC_DEBUG */
-#define TRACE0(arg) do { } while (0)
-#define TRACE1(arg1, arg2) do { } while (0)
-#endif /* FDC_DEBUG */
-
-/*
- * Bus space handling (access to low-level IO).
- */
-#ifndef PC98
-void
-fdout_wr(fdc_p fdc, u_int8_t v)
-{
-	bus_space_write_1(fdc->portt, fdc->porth, FDOUT+fdc->port_off, v);
-}
-#endif
-
-static u_int8_t
-fdsts_rd(fdc_p fdc)
-{
-	return bus_space_read_1(fdc->portt, fdc->porth, FDSTS+fdc->port_off);
-}
-
-static void
-fddata_wr(fdc_p fdc, u_int8_t v)
-{
-	bus_space_write_1(fdc->portt, fdc->porth, FDDATA+fdc->port_off, v);
-}
-
-static u_int8_t
-fddata_rd(fdc_p fdc)
-{
-	return bus_space_read_1(fdc->portt, fdc->porth, FDDATA+fdc->port_off);
-}
-
-#ifdef PC98
-static void
-fdctl_wr(fdc_p fdc, u_int8_t v)
-{
-	bus_space_write_1(fdc->portt, fdc->porth, FDCTL, v);
-}
-#endif
-
-#ifndef PC98
-static u_int8_t
-fdin_rd(fdc_p fdc)
-{
-	return bus_space_read_1(fdc->portt, fdc->porth, FDIN);
-}
-#endif /* PC98 */
-
-static struct cdevsw fd_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_open =	fdopen,
-	.d_close =	fdclose,
-	.d_read =	physread,
-	.d_write =	physwrite,
-	.d_ioctl =	fdioctl,
-	.d_strategy =	fdstrategy,
-	.d_name =	"fd",
-	.d_flags =	D_DISK | D_NEEDGIANT,
-};
-
-/*
- * Auxiliary functions.  Well, some only.  Others are scattered
- * throughout the entire file.
- */
-static int
-fdc_err(struct fdc_data *fdc, const char *s)
-{
-	fdc->fdc_errs++;
-	if (s) {
-		if (fdc->fdc_errs < FDC_ERRMAX)
-			device_printf(fdc->fdc_dev, "%s", s);
-		else if (fdc->fdc_errs == FDC_ERRMAX)
-			device_printf(fdc->fdc_dev, "too many errors, not "
-						    "logging any more\n");
-	}
-
-	return FD_FAILED;
-}
-
-/*
- * fd_cmd: Send a command to the chip.  Takes a varargs with this structure:
- * Unit number,
- * # of output bytes, output bytes as ints ...,
- * # of input bytes, input bytes as ints ...
- */
-int
-fd_cmd(struct fdc_data *fdc, int n_out, ...)
-{
-	u_char cmd;
-	int n_in;
-	int n;
-	va_list ap;
-
-	va_start(ap, n_out);
-	cmd = (u_char)(va_arg(ap, int));
-	va_end(ap);
-	va_start(ap, n_out);
-	for (n = 0; n < n_out; n++)
-	{
-		if (out_fdc(fdc, va_arg(ap, int)) < 0)
-		{
-			char msg[50];
-			snprintf(msg, sizeof(msg),
-				"cmd %x failed at out byte %d of %d\n",
-				cmd, n + 1, n_out);
-			return fdc_err(fdc, msg);
-		}
-	}
-	n_in = va_arg(ap, int);
-	for (n = 0; n < n_in; n++)
-	{
-		int *ptr = va_arg(ap, int *);
-		if (fd_in(fdc, ptr) < 0)
-		{
-			char msg[50];
-			snprintf(msg, sizeof(msg),
-				"cmd %02x failed at in byte %d of %d\n",
-				cmd, n + 1, n_in);
-			return fdc_err(fdc, msg);
-		}
-	}
-
-	return 0;
-}
-
-static int 
-enable_fifo(fdc_p fdc)
-{
-	int i, j;
-
-	if ((fdc->flags & FDC_HAS_FIFO) == 0) {
-		
-		/*
-		 * Cannot use fd_cmd the normal way here, since
-		 * this might be an invalid command. Thus we send the
-		 * first byte, and check for an early turn of data directon.
-		 */
-		
-		if (out_fdc(fdc, I8207X_CONFIG) < 0)
-			return fdc_err(fdc, "Enable FIFO failed\n");
-		
-		/* If command is invalid, return */
-		j = FDSTS_TIMEOUT;
-		while ((i = fdsts_rd(fdc) & (NE7_DIO | NE7_RQM))
-		       != NE7_RQM && j-- > 0) {
-			if (i == (NE7_DIO | NE7_RQM)) {
-				fdc_reset(fdc);
-				return FD_FAILED;
-			}
-			DELAY(1);
-		}
-		if (j<0 || 
-		    fd_cmd(fdc, 3,
-			   0, (fifo_threshold - 1) & 0xf, 0, 0) < 0) {
-			fdc_reset(fdc);
-			return fdc_err(fdc, "Enable FIFO failed\n");
-		}
-		fdc->flags |= FDC_HAS_FIFO;
-		return 0;
-	}
-	if (fd_cmd(fdc, 4,
-		   I8207X_CONFIG, 0, (fifo_threshold - 1) & 0xf, 0, 0) < 0)
-		return fdc_err(fdc, "Re-enable FIFO failed\n");
-	return 0;
-}
-
-static int
-fd_sense_drive_status(fdc_p fdc, int *st3p)
-{
-	int st3;
-
-	if (fd_cmd(fdc, 2, NE7CMD_SENSED, fdc->fdu, 1, &st3))
-	{
-		return fdc_err(fdc, "Sense Drive Status failed\n");
-	}
-	if (st3p)
-		*st3p = st3;
-
-	return 0;
-}
-
-static int
-fd_sense_int(fdc_p fdc, int *st0p, int *cylp)
-{
-	int cyl, st0, ret;
-
-	ret = fd_cmd(fdc, 1, NE7CMD_SENSEI, 1, &st0);
-	if (ret) {
-		(void)fdc_err(fdc,
-			      "sense intr err reading stat reg 0\n");
-		return ret;
-	}
-
-	if (st0p)
-		*st0p = st0;
-
-	if ((st0 & NE7_ST0_IC) == NE7_ST0_IC_IV) {
-		/*
-		 * There doesn't seem to have been an interrupt.
-		 */
-		return FD_NOT_VALID;
-	}
-
-	if (fd_in(fdc, &cyl) < 0) {
-		return fdc_err(fdc, "can't get cyl num\n");
-	}
-
-	if (cylp)
-		*cylp = cyl;
-
-	return 0;
-}
-
-
-static int
-fd_read_status(fdc_p fdc)
-{
-	int i, ret;
-
-	for (i = ret = 0; i < 7; i++) {
-		/*
-		 * XXX types are poorly chosen.  Only bytes can be read
-		 * from the hardware, but fdc->status[] wants u_ints and
-		 * fd_in() gives ints.
-		 */
-		int status;
-
-		ret = fd_in(fdc, &status);
-		fdc->status[i] = status;
-		if (ret != 0)
-			break;
-	}
-
-	if (ret == 0)
-		fdc->flags |= FDC_STAT_VALID;
-	else
-		fdc->flags &= ~FDC_STAT_VALID;
-
-	return ret;
-}
-
-#ifdef PC98
-static int pc98_trans = 0; /* 0 : HD , 1 : DD , 2 : 1.44 */
-static int pc98_trans_prev = -1;
-
-static void set_density(fdc_p fdc)
-{
-	/* always motor on */
-	bus_space_write_1(fdc->sc_fdsiot, fdc->sc_fdsioh, 0,
-			  (pc98_trans != 1 ? FDP_FDDEXC : 0) | FDP_PORTEXC);
-	DELAY(100);
-	fdctl_wr(fdc, FDC_RST | FDC_DMAE);
-	/* in the case of note W, always inhibit 100ms timer */
-}
-
-static int pc98_fd_check_ready(fdu_t fdu)
-{
-	fd_p fd = devclass_get_softc(fd_devclass, fdu);
-	struct fdc_data *fdc = fd->fdc;
-	int retry = 0, status;
-
-	while (retry++ < 30000) {
-		set_motor(fdc, fd->fdsu, TURNON);
-		out_fdc(fdc, NE7CMD_SENSED); /* Sense Drive Status */
-		DELAY(100);
-		out_fdc(fdc, fdu); /* Drive number */
-		DELAY(100);
-		if ((fd_in(fdc, &status) == 0) && (status & NE7_ST3_RD)) {
-			fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
-			DELAY(10);
-			return 0;
-		}
-	}
-	return -1;
-}
-
-static void pc98_fd_check_type(struct fd_data *fd)
-{
-	struct fdc_data *fdc;
-
-	if (fd->type != FDT_NONE || fd->fdu < 0 || fd->fdu > 3)
-		return;
-
-	fdc = fd->fdc;
-
-	/* Look up what the BIOS thinks we have. */
-	if (!((PC98_SYSTEM_PARAMETER(0x55c) >> fd->fdu) & 0x01)) {
-		fd->type = FDT_NONE;
-		return;
-	}
-	if ((PC98_SYSTEM_PARAMETER(0x5ae) >> fd->fdu) & 0x01) {
-		/* Check 3mode I/F */
-		fd->pc98_trans = 0;
-		bus_space_write_1(fdc->sc_fdemsiot, fdc->sc_fdemsioh, 0,
-				  (fd->fdu << 5) | 0x10);
-		if (!(bus_space_read_1(fdc->sc_fdemsiot, fdc->sc_fdemsioh, 0) &
-		    0x01)) {
-			fd->type = FDT_144M;
-			return;
-		}
-		device_printf(fd->dev,
-			      "Warning: can't control 3mode I/F, fallback to 2mode.\n");
-	}
-
-	fd->type = FDT_12M;
-}
-#endif /* PC98 */
-
-void
-fdc_release_resources(struct fdc_data *fdc)
-{
-	device_t dev;
-
-	dev = fdc->fdc_dev;
-	if (fdc->fdc_intr) {
-		bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr);
-		fdc->fdc_intr = NULL;
-	}
-	if (fdc->res_irq != 0) {
-		bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq,
-				     fdc->res_irq);
-		fdc->res_irq = NULL;
-	}
-#ifndef PC98
-	if (fdc->res_ctl != 0) {
-		bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl,
-				     fdc->res_ctl);
-		fdc->res_ctl = NULL;
-	}
-#endif
-#ifdef PC98
-	if (fdc->res_fdsio != 0) {
-		bus_release_resource(dev, SYS_RES_IOPORT, 3, fdc->res_fdsio);
-		fdc->res_fdsio = NULL;
-	}
-	if (fdc->res_fdemsio != 0) {
-		bus_release_resource(dev, SYS_RES_IOPORT, 4, fdc->res_fdemsio);
-		fdc->res_fdemsio = NULL;
-	}
-#endif
-	if (fdc->res_ioport != 0) {
-		bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport,
-				     fdc->res_ioport);
-		fdc->res_ioport = NULL;
-	}
-	if (fdc->res_drq != 0) {
-		bus_release_resource(dev, SYS_RES_DRQ, fdc->rid_drq,
-				     fdc->res_drq);
-		fdc->res_drq = NULL;
-	}
-}
-
-/*
- * Configuration/initialization stuff, per controller.
- */
-
-int
-fdc_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
-	struct fdc_ivars *ivars = device_get_ivars(child);
-
-	switch (which) {
-	case FDC_IVAR_FDUNIT:
-		*result = ivars->fdunit;
-		break;
-	case FDC_IVAR_FDTYPE:
-		*result = ivars->fdtype;
-		break;
-	default:
-		return (ENOENT);
-	}
-	return (0);
-}
-
-int
-fdc_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
-{
-	struct fdc_ivars *ivars = device_get_ivars(child);
-
-	switch (which) {
-	case FDC_IVAR_FDUNIT:
-		ivars->fdunit = value;
-		break;
-	case FDC_IVAR_FDTYPE:
-		ivars->fdtype = value;
-		break;
-	default:
-		return (ENOENT);
-	}
-	return (0);
-}
-
-int
-fdc_initial_reset(struct fdc_data *fdc)
-{
-#ifdef PC98
-	/* see if it can handle a command */
-	if (fd_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(4, 240), 
-		   NE7_SPEC_2(2, 0), 0))
-		return (ENXIO);
-#else
-	/* First, reset the floppy controller. */
-	fdout_wr(fdc, 0);
-	DELAY(100);
-	fdout_wr(fdc, FDO_FRST);
-
-	/* Then, see if it can handle a command. */
-	if (fd_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(3, 240), 
-	    NE7_SPEC_2(2, 0), 0))
-		return (ENXIO);
-#endif
-	return (0);
-}
-
-int
-fdc_detach(device_t dev)
-{
-	struct	fdc_data *fdc;
-	int	error;
-
-	fdc = device_get_softc(dev);
-
-	/* have our children detached first */
-	if ((error = bus_generic_detach(dev)))
-		return (error);
-
-#ifdef PC98
-	/* reset controller, turn motor off */
-	fdc_reset(fdc);
-#else
-	/* reset controller, turn motor off */
-	fdout_wr(fdc, 0);
-#endif
-
-	fdc_release_resources(fdc);
-	return (0);
-}
-
-/*
- * Add a child device to the fdc controller.  It will then be probed etc.
- */
-device_t
-fdc_add_child(device_t dev, const char *name, int unit)
-{
-	struct fdc_ivars *ivar;
-	device_t child;
-
-	ivar = malloc(sizeof *ivar, M_DEVBUF /* XXX */, M_NOWAIT | M_ZERO);
-	if (ivar == NULL)
-		return (NULL);
-	child = device_add_child(dev, name, unit);
-	if (child == NULL) {
-		free(ivar, M_DEVBUF);
-		return (NULL);
-	}
-	device_set_ivars(child, ivar);
-	ivar->fdunit = unit;
-	ivar->fdtype = FDT_NONE;
-	if (resource_disabled(name, unit))
-		device_disable(child);
-	return (child);
-}
-
-int
-fdc_attach(device_t dev)
-{
-	struct	fdc_data *fdc;
-	int	error;
-
-	fdc = device_get_softc(dev);
-	fdc->fdc_dev = dev;
-	error = bus_setup_intr(dev, fdc->res_irq,
-			       INTR_TYPE_BIO | INTR_ENTROPY, NULL, fdc_intr, fdc,
-			       &fdc->fdc_intr);
-	if (error) {
-		device_printf(dev, "cannot setup interrupt\n");
-		return error;
-	}
-	fdc->fdcu = device_get_unit(dev);
-	fdc->flags |= FDC_NEEDS_RESET;
-
-	fdc->state = DEVIDLE;
-
-#ifdef PC98
-	/* reset controller, turn motor off, clear fdout mirror reg */
-	fdc_reset(fdc);
-#else
-	/* reset controller, turn motor off, clear fdout mirror reg */
-	fdout_wr(fdc, fdc->fdout = 0);
-#endif
-	bioq_init(&fdc->head);
-
-	return (0);
-}
-
-int
-fdc_hints_probe(device_t dev)
-{
-	const char *name, *dname;
-	int i, error, dunit;
-
-	/*
-	 * Probe and attach any children.  We should probably detect
-	 * devices from the BIOS unless overridden.
-	 */
-	name = device_get_nameunit(dev);
-	i = 0;
-	while ((resource_find_match(&i, &dname, &dunit, "at", name)) == 0) {
-		resource_int_value(dname, dunit, "drive", &dunit);
-		fdc_add_child(dev, dname, dunit);
-	}
-
-	if ((error = bus_generic_attach(dev)) != 0)
-		return (error);
-	return (0);
-}
-
-int
-fdc_print_child(device_t me, device_t child)
-{
-	int retval = 0, flags;
-
-	retval += bus_print_child_header(me, child);
-	retval += printf(" on %s drive %d", device_get_nameunit(me),
-	       fdc_get_fdunit(child));
-	if ((flags = device_get_flags(me)) != 0)
-		retval += printf(" flags %#x", flags);
-	retval += printf("\n");
-	
-	return (retval);
-}
-
-/*
- * Configuration/initialization, per drive.
- */
-static int
-fd_probe(device_t dev)
-{
-	int	i;
-#ifndef PC98
-	u_int	st0, st3;
-#endif
-	struct	fd_data *fd;
-	struct	fdc_data *fdc;
-	fdsu_t	fdsu;
-	int	flags, type;
-
-	fdsu = fdc_get_fdunit(dev);
-	fd = device_get_softc(dev);
-	fdc = device_get_softc(device_get_parent(dev));
-	flags = device_get_flags(dev);
-
-	fd->dev = dev;
-	fd->fdc = fdc;
-	fd->fdsu = fdsu;
-	fd->fdu = device_get_unit(dev);
-
-	/* Auto-probe if fdinfo is present, but always allow override. */
-	type = FD_DTYPE(flags);
-	if (type == FDT_NONE && (type = fdc_get_fdtype(dev)) != FDT_NONE) {
-		fd->type = type;
-		goto done;
-	} else {
-		/* make sure fdautoselect() will be called */
-		fd->flags = FD_UA;
-		fd->type = type;
-	}
-
-#ifdef PC98
-	pc98_fd_check_type(fd);
-#else
-/*
- * XXX I think using __i386__ is wrong here since we actually want to probe
- * for the machine type, not the CPU type (so non-PC arch's like the PC98 will
- * fail the probe).
- */
-#ifdef __i386__
-	if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) {
-		/* Look up what the BIOS thinks we have. */
-		if (fd->fdu == 0) {
-			if ((fdc->flags & FDC_ISPCMCIA))
-				/*
-				 * Somewhat special.  No need to force the
-				 * user to set device flags, since the Y-E
-				 * Data PCMCIA floppy is always a 1.44 MB
-				 * device.
-				 */
-				fd->type = FDT_144M;
-			else
-				fd->type = (rtcin(RTC_FDISKETTE) & 0xf0) >> 4;
-		} else {
-			fd->type = rtcin(RTC_FDISKETTE) & 0x0f;
-		}
-		if (fd->type == FDT_288M_1)
-			fd->type = FDT_288M;
-	}
-#endif /* __i386__ */
-#endif /* PC98 */
-
-	/* is there a unit? */
-	if (fd->type == FDT_NONE)
-		return (ENXIO);
-
-#ifndef PC98
-	/* select it */
-	set_motor(fdc, fdsu, TURNON);
-	fdc_reset(fdc);		/* XXX reset, then unreset, etc. */
-	DELAY(1000000);	/* 1 sec */
-
-	if ((flags & FD_NO_PROBE) == 0) {
-		/* If we're at track 0 first seek inwards. */
-		if ((fd_sense_drive_status(fdc, &st3) == 0) &&
-		    (st3 & NE7_ST3_T0)) {
-			/* Seek some steps... */
-			if (fd_cmd(fdc, 3, NE7CMD_SEEK, fdsu, 10, 0) == 0) {
-				/* ...wait a moment... */
-				DELAY(300000);
-				/* make ctrlr happy: */
-				fd_sense_int(fdc, 0, 0);
-			}
-		}
-
-		for (i = 0; i < 2; i++) {
-			/*
-			 * we must recalibrate twice, just in case the
-			 * heads have been beyond cylinder 76, since
-			 * most FDCs still barf when attempting to
-			 * recalibrate more than 77 steps
-			 */
-			/* go back to 0: */
-			if (fd_cmd(fdc, 2, NE7CMD_RECAL, fdsu, 0) == 0) {
-				/* a second being enough for full stroke seek*/
-				DELAY(i == 0 ? 1000000 : 300000);
-
-				/* anything responding? */
-				if (fd_sense_int(fdc, &st0, 0) == 0 &&
-				    (st0 & NE7_ST0_EC) == 0)
-					break; /* already probed succesfully */
-			}
-		}
-	}
-
-	set_motor(fdc, fdsu, TURNOFF);
-
-	if ((flags & FD_NO_PROBE) == 0 &&
-	    (st0 & NE7_ST0_EC) != 0) /* no track 0 -> no drive present */
-		return (ENXIO);
-#endif /* PC98 */
-
-done:
-#ifndef PC98
-	/* This doesn't work before the first reset. */
-	if ((fdc->flags & FDC_HAS_FIFO) == 0 &&
-	    fdc->fdct == FDC_ENHANCED &&
-	    (device_get_flags(fdc->fdc_dev) & FDC_NO_FIFO) == 0 &&
-	    enable_fifo(fdc) == 0) {
-		device_printf(device_get_parent(dev),
-		    "FIFO enabled, %d bytes threshold\n", fifo_threshold);
-	}
-#endif /* PC98 */
-
-#ifdef PC98
-	switch (fd->type) {
-	case FDT_144M:
-		device_set_desc(dev, "1.44M FDD");
-		break;
-	case FDT_12M:
-		device_set_desc(dev, "1M/640K FDD");
-		break;
-	default:
-		return (ENXIO);
-	}
-#else
-	switch (fd->type) {
-	case FDT_12M:
-		device_set_desc(dev, "1200-KB 5.25\" drive");
-		break;
-	case FDT_144M:
-		device_set_desc(dev, "1440-KB 3.5\" drive");
-		break;
-	case FDT_288M:
-		device_set_desc(dev, "2880-KB 3.5\" drive (in 1440-KB mode)");
-		break;
-	case FDT_360K:
-		device_set_desc(dev, "360-KB 5.25\" drive");
-		break;
-	case FDT_720K:
-		device_set_desc(dev, "720-KB 3.5\" drive");
-		break;
-	default:
-		return (ENXIO);
-	}
-#endif
-	fd->track = FD_NO_TRACK;
-	fd->fdc = fdc;
-	fd->fdsu = fdsu;
-	fd->options = 0;
-#ifdef PC98
-	fd->pc98_trans = 0;
-#endif
-	callout_handle_init(&fd->toffhandle);
-	callout_handle_init(&fd->tohandle);
-
-	/* initialize densities for subdevices */
-#ifdef PC98
-	for (i = 0; i < NUMDENS; i++)
-		memcpy(fd->fts + i, fd_searchlist_144m + i,
-		       sizeof(struct fd_type));
-#else
-	for (i = 0; i < NUMDENS; i++)
-		memcpy(fd->fts + i, fd_native_types + fd->type,
-		       sizeof(struct fd_type));
-#endif
-	return (0);
-}
-
-static int
-fd_attach(device_t dev)
-{
-	struct	fd_data *fd;
-
-	fd = device_get_softc(dev);
-	fd->masterdev = make_dev(&fd_cdevsw, fd->fdu,
-				 UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu);
-	fd->masterdev->si_drv1 = fd;
-	fd->device_stats = devstat_new_entry(device_get_name(dev), 
-			  device_get_unit(dev), 0, DEVSTAT_NO_ORDERED_TAGS,
-			  DEVSTAT_TYPE_FLOPPY | DEVSTAT_TYPE_IF_OTHER,
-			  DEVSTAT_PRIORITY_FD);
-	return (0);
-}
-
-static int
-fd_detach(device_t dev)
-{
-	struct	fd_data *fd;
-
-	fd = device_get_softc(dev);
-	untimeout(fd_turnoff, fd, fd->toffhandle);
-	devstat_remove_entry(fd->device_stats);
-	destroy_dev(fd->masterdev);
-
-	return (0);
-}
-
-static device_method_t fd_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		fd_probe),
-	DEVMETHOD(device_attach,	fd_attach),
-	DEVMETHOD(device_detach,	fd_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend), /* XXX */
-	DEVMETHOD(device_resume,	bus_generic_resume), /* XXX */
-
-	{ 0, 0 }
-};
-
-static driver_t fd_driver = {
-	"fd",
-	fd_methods,
-	sizeof(struct fd_data)
-};
-
-DRIVER_MODULE(fd, fdc, fd_driver, fd_devclass, 0, 0);
-
-/*
- * More auxiliary functions.
- */
-/*
- * Motor control stuff.
- * Remember to not deselect the drive we're working on.
- */
-static void
-set_motor(struct fdc_data *fdc, int fdsu, int turnon)
-{
-#ifdef PC98
-	bus_space_write_1(fdc->sc_fdsiot, fdc->sc_fdsioh, 0,
-			  (pc98_trans != 1 ? FDP_FDDEXC : 0) | FDP_PORTEXC);
-	DELAY(10);
-	fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
-#else
-	int fdout;
-
-	fdout = fdc->fdout;
-	if (turnon) {
-		fdout &= ~FDO_FDSEL;
-		fdout |= (FDO_MOEN0 << fdsu) | FDO_FDMAEN | FDO_FRST | fdsu;
-	} else
-		fdout &= ~(FDO_MOEN0 << fdsu);
-	fdc->fdout = fdout;
-	fdout_wr(fdc, fdout);
-	TRACE1("[0x%x->FDOUT]", fdout);
-#endif
-}
-
-static void
-fd_turnoff(void *xfd)
-{
-	int	s;
-	fd_p fd = xfd;
-
-	TRACE1("[fd%d: turnoff]", fd->fdu);
-
-	s = splbio();
-	/*
-	 * Don't turn off the motor yet if the drive is active.
-	 *
-	 * If we got here, this could only mean we missed an interrupt.
-	 * This can e. g. happen on the Y-E Date PCMCIA floppy controller
-	 * after a controller reset.  Just schedule a pseudo-interrupt
-	 * so the state machine gets re-entered.
-	 */
-	if (fd->fdc->state != DEVIDLE && fd->fdc->fdu == fd->fdu) {
-		fdc_intr(fd->fdc);
-		splx(s);
-		return;
-	}
-
-	fd->flags &= ~FD_MOTOR;
-	set_motor(fd->fdc, fd->fdsu, TURNOFF);
-	splx(s);
-}
-
-static void
-fd_motor_on(void *xfd)
-{
-	int	s;
-	fd_p fd = xfd;
-
-	s = splbio();
-	fd->flags &= ~FD_MOTOR_WAIT;
-	if((fd->fdc->fd == fd) && (fd->fdc->state == MOTORWAIT))
-	{
-		fdc_intr(fd->fdc);
-	}
-	splx(s);
-}
-
-static void
-fd_turnon(fd_p fd)
-{
-	if(!(fd->flags & FD_MOTOR))
-	{
-		fd->flags |= (FD_MOTOR + FD_MOTOR_WAIT);
-		set_motor(fd->fdc, fd->fdsu, TURNON);
-		timeout(fd_motor_on, fd, hz); /* in 1 sec its ok */
-	}
-}
-
-static void
-fdc_reset(fdc_p fdc)
-{
-	/* Try a reset, keep motor on */
-#ifdef PC98
-	set_density(fdc);
-	if (pc98_machine_type & M_EPSON_PC98)
-		fdctl_wr(fdc, FDC_RST | FDC_RDY | FDC_DD | FDC_MTON);
-	else
-		fdctl_wr(fdc, FDC_RST | FDC_RDY | FDC_DMAE | FDC_MTON);
-	DELAY(200);
-	fdctl_wr(fdc, FDC_DMAE | FDC_MTON);
-	DELAY(10);
-#else
-	fdout_wr(fdc, fdc->fdout & ~(FDO_FRST|FDO_FDMAEN));
-	TRACE1("[0x%x->FDOUT]", fdc->fdout & ~(FDO_FRST|FDO_FDMAEN));
-	DELAY(100);
-	/* enable FDC, but defer interrupts a moment */
-	fdout_wr(fdc, fdc->fdout & ~FDO_FDMAEN);
-	TRACE1("[0x%x->FDOUT]", fdc->fdout & ~FDO_FDMAEN);
-	DELAY(100);
-	fdout_wr(fdc, fdc->fdout);
-	TRACE1("[0x%x->FDOUT]", fdc->fdout);
-#endif
-
-	/* XXX after a reset, silently believe the FDC will accept commands */
-#ifdef PC98
-	(void)fd_cmd(fdc, 3, NE7CMD_SPECIFY,
-		     NE7_SPEC_1(4, 240), NE7_SPEC_2(2, 0),
-		     0);
-#else
-	(void)fd_cmd(fdc, 3, NE7CMD_SPECIFY,
-		     NE7_SPEC_1(3, 240), NE7_SPEC_2(2, 0),
-		     0);
-#endif
-	if (fdc->flags & FDC_HAS_FIFO)
-		(void) enable_fifo(fdc);
-}
-
-/*
- * FDC IO functions, take care of the main status register, timeout
- * in case the desired status bits are never set.
- *
- * These PIO loops initially start out with short delays between
- * each iteration in the expectation that the required condition
- * is usually met quickly, so it can be handled immediately.  After
- * about 1 ms, stepping is increased to achieve a better timing
- * accuracy in the calls to DELAY().
- */
-static int
-fd_in(struct fdc_data *fdc, int *ptr)
-{
-	int i, j, step;
-
-	for (j = 0, step = 1;
-	    (i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) != (NE7_DIO|NE7_RQM) &&
-	    j < FDSTS_TIMEOUT;
-	    j += step) {
-		if (i == NE7_RQM)
-			return (fdc_err(fdc, "ready for output in input\n"));
-		if (j == 1000)
-			step = 1000;
-		DELAY(step);
-	}
-	if (j >= FDSTS_TIMEOUT)
-		return (fdc_err(fdc, bootverbose? "input ready timeout\n": 0));
-#ifdef	FDC_DEBUG
-	i = fddata_rd(fdc);
-	TRACE1("[FDDATA->0x%x]", (unsigned char)i);
-	*ptr = i;
-	return (0);
-#else	/* !FDC_DEBUG */
-	i = fddata_rd(fdc);
-	if (ptr)
-		*ptr = i;
-	return (0);
-#endif	/* FDC_DEBUG */
-}
-
-static int
-out_fdc(struct fdc_data *fdc, int x)
-{
-	int i, j, step;
-
-	for (j = 0, step = 1;
-	    (i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) != NE7_RQM &&
-	    j < FDSTS_TIMEOUT;
-	    j += step) {
-		if (i == (NE7_DIO|NE7_RQM))
-			return (fdc_err(fdc, "ready for input in output\n"));
-		if (j == 1000)
-			step = 1000;
-		DELAY(step);
-	}
-	if (j >= FDSTS_TIMEOUT)
-		return (fdc_err(fdc, bootverbose? "output ready timeout\n": 0));
-
-	/* Send the command and return */
-	fddata_wr(fdc, x);
-	TRACE1("[0x%x->FDDATA]", x);
-	return (0);
-}
-
-/*
- * Block device driver interface functions (interspersed with even more
- * auxiliary functions).
- */
-static int
-fdopen(struct cdev *dev, int flags, int mode, struct thread *td)
-{
-	fd_p	fd;
-	fdc_p	fdc;
-#ifdef PC98
-	fdu_t	fdu;
-#endif
- 	int rv, unitattn, dflags;
-
-	fd = dev->si_drv1;
-	if (fd == NULL)
-		return (ENXIO);
-	fdc = fd->fdc;
-	if ((fdc == NULL) || (fd->type == FDT_NONE))
-		return (ENXIO);
-#ifdef PC98
-	fdu = fd->fdu;
-#endif
-	dflags = device_get_flags(fd->dev);
-	/*
-	 * This is a bit bogus.  It's still possible that e. g. a
-	 * descriptor gets inherited to a child, but then it's at
-	 * least for the same subdevice.  By checking FD_OPEN here, we
-	 * can ensure that a device isn't attempted to be opened with
-	 * different densities at the same time where the second open
-	 * could clobber the settings from the first one.
-	 */
-	if (fd->flags & FD_OPEN)
-		return (EBUSY);
-
-#ifdef PC98
-	if (pc98_fd_check_ready(fdu) == -1)
-		return(EIO);
-#endif
-
-	if (flags & FNONBLOCK) {
-		/*
-		 * Unfortunately, physio(9) discards its ioflag
-		 * argument, thus preventing us from seeing the
-		 * O_NONBLOCK bit.  So we need to keep track
-		 * ourselves.
-		 */
-		fd->flags |= FD_NONBLOCK;
-		fd->ft = 0;
-	} else {
-		/*
-		 * Figure out a unit attention condition.
-		 *
-		 * If UA has been forced, proceed.
-		 *
-		 * If the drive has no changeline support,
-		 * or if the drive parameters have been lost
-		 * due to previous non-blocking access,
-		 * assume a forced UA condition.
-		 *
-		 * If motor is off, turn it on for a moment
-		 * and select our drive, in order to read the
-		 * UA hardware signal.
-		 *
-		 * If motor is on, and our drive is currently
-		 * selected, just read the hardware bit.
-		 *
-		 * If motor is on, but active for another
-		 * drive on that controller, we are lost.  We
-		 * cannot risk to deselect the other drive, so
-		 * we just assume a forced UA condition to be
-		 * on the safe side.
-		 */
-		unitattn = 0;
-		if ((dflags & FD_NO_CHLINE) != 0 ||
-		    (fd->flags & FD_UA) != 0 ||
-		    fd->ft == 0) {
-			unitattn = 1;
-			fd->flags &= ~FD_UA;
-#ifndef PC98
-		} else if (fdc->fdout & (FDO_MOEN0 | FDO_MOEN1 |
-					 FDO_MOEN2 | FDO_MOEN3)) {
-			if ((fdc->fdout & FDO_FDSEL) == fd->fdsu)
-				unitattn = fdin_rd(fdc) & FDI_DCHG;
-			else
-				unitattn = 1;
-		} else {
-			set_motor(fdc, fd->fdsu, TURNON);
-			unitattn = fdin_rd(fdc) & FDI_DCHG;
-			set_motor(fdc, fd->fdsu, TURNOFF);
-#endif /* PC98 */
-		}
-		if (unitattn && (rv = fdautoselect(dev)) != 0)
-			return (rv);
-	}
-	fd->flags |= FD_OPEN;
-
-	if ((fdc->flags & FDC_NODMA) == 0) {
-		if (fdc->dmacnt++ == 0) {
-			isa_dma_acquire(fdc->dmachan);
-			isa_dmainit(fdc->dmachan, MAX_SEC_SIZE);
-		}
-	}
-
-	/*
-	 * Clearing the DMA overrun counter at open time is a bit messy.
-	 * Since we're only managing one counter per controller, opening
-	 * the second drive could mess it up.  Anyway, if the DMA overrun
-	 * condition is really persistent, it will eventually time out
-	 * still.  OTOH, clearing it here will ensure we'll at least start
-	 * trying again after a previous (maybe even long ago) failure.
-	 * Also, this is merely a stop-gap measure only that should not
-	 * happen during normal operation, so we can tolerate it to be a
-	 * bit sloppy about this.
-	 */
-	fdc->dma_overruns = 0;
-
-	return 0;
-}
-
-static int
-fdclose(struct cdev *dev, int flags, int mode, struct thread *td)
-{
-	struct fd_data *fd;
- 	fdc_p	fdc;
-
-	fd = dev->si_drv1;
-	fdc = fd->fdc;
-	fd->flags &= ~(FD_OPEN | FD_NONBLOCK);
-	fd->options &= ~(FDOPT_NORETRY | FDOPT_NOERRLOG | FDOPT_NOERROR);
-
-	if ((fdc->flags & FDC_NODMA) == 0)
-		if (--fdc->dmacnt == 0)
-			isa_dma_release(fdc->dmachan);
-
-	return (0);
-}
-
-static void
-fdstrategy(struct bio *bp)
-{
-	long blknum, nblocks;
- 	int	s;
- 	fdu_t	fdu;
- 	fdc_p	fdc;
- 	fd_p	fd;
-	size_t	fdblk;
-
-	fd = bp->bio_dev->si_drv1;
- 	fdu = fd->fdu;
-	fdc = fd->fdc;
-	bp->bio_resid = bp->bio_bcount;
-	if (fd->type == FDT_NONE || fd->ft == 0) {
-		if (fd->type != FDT_NONE && (fd->flags & FD_NONBLOCK))
-			bp->bio_error = EAGAIN;
-		else
-			bp->bio_error = ENXIO;
-		bp->bio_flags |= BIO_ERROR;
-		goto bad;
-	}
-	fdblk = 128 << (fd->ft->secsize);
-	if (bp->bio_cmd != FDBIO_FORMAT && bp->bio_cmd != FDBIO_RDSECTID) {
-		if (fd->flags & FD_NONBLOCK) {
-			bp->bio_error = EAGAIN;
-			bp->bio_flags |= BIO_ERROR;
-			goto bad;
-		}
-		if (bp->bio_offset < 0) {
-			printf(
-		"fd%d: fdstrat: bad request offset = %ju, bcount = %ld\n",
-			       fdu, (intmax_t)bp->bio_offset, bp->bio_bcount);
-			bp->bio_error = EINVAL;
-			bp->bio_flags |= BIO_ERROR;
-			goto bad;
-		}
-		if ((bp->bio_bcount % fdblk) != 0) {
-			bp->bio_error = EINVAL;
-			bp->bio_flags |= BIO_ERROR;
-			goto bad;
-		}
-	}
-
-	/*
-	 * Set up block calculations.
-	 */
-#ifndef PC98
-	if (bp->bio_offset >= ((off_t)128 << fd->ft->secsize) * fd->ft->size) {
-		bp->bio_error = EINVAL;
-		bp->bio_flags |= BIO_ERROR;
-		goto bad;
-	}
-#endif
-	blknum = bp->bio_offset / fdblk;
- 	nblocks = fd->ft->size;
-	if (blknum + bp->bio_bcount / fdblk > nblocks) {
-		if (blknum >= nblocks) {
-			if (bp->bio_cmd != BIO_READ) {
-				bp->bio_error = ENOSPC;
-				bp->bio_flags |= BIO_ERROR;
-			}
-			goto bad;	/* not always bad, but EOF */
-		}
-		bp->bio_bcount = (nblocks - blknum) * fdblk;
-	}
- 	bp->bio_pblkno = blknum;
-	s = splbio();
-	bioq_disksort(&fdc->head, bp);
-	untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */
-	devstat_start_transaction_bio(fd->device_stats, bp);
-	device_busy(fd->dev);
-	fdstart(fdc);
-	splx(s);
-	return;
-
-bad:
-	biodone(bp);
-}
-
-/*
- * fdstart
- *
- * We have just queued something.  If the controller is not busy
- * then simulate the case where it has just finished a command
- * So that it (the interrupt routine) looks on the queue for more
- * work to do and picks up what we just added.
- *
- * If the controller is already busy, we need do nothing, as it
- * will pick up our work when the present work completes.
- */
-static void
-fdstart(struct fdc_data *fdc)
-{
-	int s;
-
-	s = splbio();
-	if(fdc->state == DEVIDLE)
-	{
-		fdc_intr(fdc);
-	}
-	splx(s);
-}
-
-static void
-fd_iotimeout(void *xfdc)
-{
- 	fdc_p fdc;
-	int s;
-
-	fdc = xfdc;
-	TRACE1("fd%d[fd_iotimeout()]", fdc->fdu);
-
-	/*
-	 * Due to IBM's brain-dead design, the FDC has a faked ready
-	 * signal, hardwired to ready == true. Thus, any command
-	 * issued if there's no diskette in the drive will _never_
-	 * complete, and must be aborted by resetting the FDC.
-	 * Many thanks, Big Blue!
-	 * The FDC must not be reset directly, since that would
-	 * interfere with the state machine.  Instead, pretend that
-	 * the command completed but was invalid.  The state machine
-	 * will reset the FDC and retry once.
-	 */
-	s = splbio();
-	fdc->status[0] = NE7_ST0_IC_IV;
-	fdc->flags &= ~FDC_STAT_VALID;
-	fdc->state = IOTIMEDOUT;
-	fdc_intr(fdc);
-	splx(s);
-}
-
-/* Just ensure it has the right spl. */
-static void
-fd_pseudointr(void *xfdc)
-{
-	int	s;
-
-	s = splbio();
-	fdc_intr(xfdc);
-	splx(s);
-}
-
-/*
- * fdc_intr
- *
- * Keep calling the state machine until it returns a 0.
- * Always called at splbio.
- */
-static void
-fdc_intr(void *xfdc)
-{
-	fdc_p fdc = xfdc;
-	while(fdstate(fdc))
-		;
-}
-
-/*
- * Magic pseudo-DMA initialization for YE FDC. Sets count and
- * direction.
- */
-#define SET_BCDR(fdc,wr,cnt,port) \
-	bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port,	 \
-	    ((cnt)-1) & 0xff);						 \
-	bus_space_write_1(fdc->portt, fdc->porth, fdc->port_off + port + 1, \
-	    ((wr ? 0x80 : 0) | ((((cnt)-1) >> 8) & 0x7f)));
-
-/*
- * fdcpio(): perform programmed IO read/write for YE PCMCIA floppy.
- */
-static int
-fdcpio(fdc_p fdc, long flags, caddr_t addr, u_int count)
-{
-	u_char *cptr = (u_char *)addr;
-
-	if (flags == BIO_READ) {
-		if (fdc->state != PIOREAD) {
-			fdc->state = PIOREAD;
-			return(0);
-		}
-		SET_BCDR(fdc, 0, count, 0);
-		bus_space_read_multi_1(fdc->portt, fdc->porth, fdc->port_off +
-		    FDC_YE_DATAPORT, cptr, count);
-	} else {
-		bus_space_write_multi_1(fdc->portt, fdc->porth, fdc->port_off +
-		    FDC_YE_DATAPORT, cptr, count);
-		SET_BCDR(fdc, 0, count, 0);
-	}
-	return(1);
-}
-
-/*
- * Try figuring out the density of the media present in our device.
- */
-static int
-fdautoselect(struct cdev *dev)
-{
- 	fd_p fd;
-	struct fd_type *fdtp;
-	struct fdc_readid id;
-	int i, n, oopts, rv;
-
-	fd = dev->si_drv1;
-
-	switch (fd->type) {
-	default:
-		return (ENXIO);
-
-#ifndef PC98
-	case FDT_360K:
-	case FDT_720K:
-		/* no autoselection on those drives */
-		fd->ft = fd_native_types + fd->type;
-		return (0);
-#endif
-
-	case FDT_12M:
-		fdtp = fd_searchlist_12m;
-		n = sizeof fd_searchlist_12m / sizeof(struct fd_type);
-		break;
-
-	case FDT_144M:
-		fdtp = fd_searchlist_144m;
-		n = sizeof fd_searchlist_144m / sizeof(struct fd_type);
-		break;
-
-#ifndef PC98
-	case FDT_288M:
-		fdtp = fd_searchlist_288m;
-		n = sizeof fd_searchlist_288m / sizeof(struct fd_type);
-		break;
-#endif
-	}
-
-	/*
-	 * Try reading sector ID fields, first at cylinder 0, head 0,
-	 * then at cylinder 2, head N.  We don't probe cylinder 1,
-	 * since for 5.25in DD media in a HD drive, there are no data
-	 * to read (2 step pulses per media cylinder required).  For
-	 * two-sided media, the second probe always goes to head 1, so
-	 * we can tell them apart from single-sided media.  As a
-	 * side-effect this means that single-sided media should be
-	 * mentioned in the search list after two-sided media of an
-	 * otherwise identical density.  Media with a different number
-	 * of sectors per track but otherwise identical parameters
-	 * cannot be distinguished at all.
-	 *
-	 * If we successfully read an ID field on both cylinders where
-	 * the recorded values match our expectation, we are done.
-	 * Otherwise, we try the next density entry from the table.
-	 *
-	 * Stepping to cylinder 2 has the side-effect of clearing the
-	 * unit attention bit.
-	 */
-	oopts = fd->options;
-	fd->options |= FDOPT_NOERRLOG | FDOPT_NORETRY;
-	for (i = 0; i < n; i++, fdtp++) {
-		fd->ft = fdtp;
-
-		id.cyl = id.head = 0;
-		rv = fdmisccmd(dev, FDBIO_RDSECTID, &id);
-		if (rv != 0)
-			continue;
-		if (id.cyl != 0 || id.head != 0 ||
-		    id.secshift != fdtp->secsize)
-			continue;
-		id.cyl = 2;
-		id.head = fd->ft->heads - 1;
-		rv = fdmisccmd(dev, FDBIO_RDSECTID, &id);
-		if (id.cyl != 2 || id.head != fdtp->heads - 1 ||
-		    id.secshift != fdtp->secsize)
-			continue;
-		if (rv == 0)
-			break;
-	}
-
-	fd->options = oopts;
-	if (i == n) {
-		if (bootverbose)
-			device_printf(fd->dev, "autoselection failed\n");
-		fd->ft = 0;
-		return (EIO);
-	} else {
-		if (bootverbose)
-			device_printf(fd->dev, "autoselected %d KB medium\n",
-#ifdef PC98
-				      (128 << (fd->ft->secsize)) *
-				      fd->ft->size / 1024);
-#else
-				      fd->ft->size / 2);
-#endif
-		return (0);
-	}
-}
-
-
-/*
- * The controller state machine.
- *
- * If it returns a non zero value, it should be called again immediately.
- */
-static int
-fdstate(fdc_p fdc)
-{
-	struct fdc_readid *idp;
-	int read, format, rdsectid, cylinder, head, i, sec = 0, sectrac;
-	int st0, cyl, st3, idf, ne7cmd, mfm, steptrac;
-	unsigned long blknum;
-	fdu_t fdu = fdc->fdu;
-	fd_p fd;
-	register struct bio *bp;
-	struct fd_formb *finfo = NULL;
-	size_t fdblk;
-
-	bp = fdc->bp;
-	if (bp == NULL) {
-		bp = bioq_takefirst(&fdc->head);
-		if (bp != NULL)
-			fdc->bp = bp;
-	}
-	if (bp == NULL) {
-		/*
-		 * Nothing left for this controller to do,
-		 * force into the IDLE state.
-		 */
-		fdc->state = DEVIDLE;
-		if (fdc->fd) {
-			device_printf(fdc->fdc_dev,
-			    "unexpected valid fd pointer\n");
-			fdc->fd = (fd_p) 0;
-			fdc->fdu = -1;
-		}
-		TRACE1("[fdc%d IDLE]", fdc->fdcu);
- 		return (0);
-	}
-	fd = bp->bio_dev->si_drv1;
-	fdu = fd->fdu;
-	fdblk = 128 << fd->ft->secsize;
-	if (fdc->fd && (fd != fdc->fd))
-		device_printf(fd->dev, "confused fd pointers\n");
-	read = bp->bio_cmd == BIO_READ;
-	mfm = (fd->ft->flags & FL_MFM)? NE7CMD_MFM: 0;
-	steptrac = (fd->ft->flags & FL_2STEP)? 2: 1;
-	if (read)
-		idf = ISADMA_READ;
-	else
-		idf = ISADMA_WRITE;
-	format = bp->bio_cmd == FDBIO_FORMAT;
-	rdsectid = bp->bio_cmd == FDBIO_RDSECTID;
-	if (format)
-		finfo = (struct fd_formb *)bp->bio_data;
-	TRACE1("fd%d", fdu);
-	TRACE1("[%s]", fdstates[fdc->state]);
-	TRACE1("(0x%x)", fd->flags);
-	untimeout(fd_turnoff, fd, fd->toffhandle);
-	fd->toffhandle = timeout(fd_turnoff, fd, 4 * hz);
-	switch (fdc->state)
-	{
-	case DEVIDLE:
-	case FINDWORK:	/* we have found new work */
-		fdc->retry = 0;
-		fd->skip = 0;
-		fdc->fd = fd;
-		fdc->fdu = fdu;
-#ifdef PC98
-		pc98_trans = fd->ft->trans;
-		if (pc98_trans_prev != pc98_trans) {
-			int i;
-			set_density(fdc);
-			for (i = 0; i < 10; i++) {
-				outb(0x5f, 0);
-				outb(0x5f, 0);
-			}
-			pc98_trans_prev = pc98_trans;
-		}
-		if (pc98_trans != fd->pc98_trans) {
-			if (fd->type == FDT_144M) {
-				bus_space_write_1(fdc->sc_fdemsiot,
-						  fdc->sc_fdemsioh,
-						  0,
-						  (fdu << 5) | 0x10 |
-						  (pc98_trans >> 1));
-				outb(0x5f, 0);
-				outb(0x5f, 0);
-			}
-			fd->pc98_trans = pc98_trans;
-		}
-#else
-		fdc->fdctl_wr(fdc, fd->ft->trans);
-#endif
-		TRACE1("[0x%x->FDCTL]", fd->ft->trans);
-		/*
-		 * If the next drive has a motor startup pending, then
-		 * it will start up in its own good time.
-		 */
-		if(fd->flags & FD_MOTOR_WAIT) {
-			fdc->state = MOTORWAIT;
-			return (0); /* will return later */
-		}
-		/*
-		 * Maybe if it's not starting, it SHOULD be starting.
-		 */
-		if (!(fd->flags & FD_MOTOR))
-		{
-			fdc->state = MOTORWAIT;
-			fd_turnon(fd);
-			return (0); /* will return later */
-		}
-		else	/* at least make sure we are selected */
-		{
-			set_motor(fdc, fd->fdsu, TURNON);
-		}
-		if (fdc->flags & FDC_NEEDS_RESET) {
-			fdc->state = RESETCTLR;
-			fdc->flags &= ~FDC_NEEDS_RESET;
-		} else
-			fdc->state = DOSEEK;
-		return (1);	/* will return immediately */
-
-	case DOSEEK:
-		blknum = bp->bio_pblkno + fd->skip / fdblk;
-		cylinder = blknum / (fd->ft->sectrac * fd->ft->heads);
-		if (cylinder == fd->track)
-		{
-			fdc->state = SEEKCOMPLETE;
-			return (1); /* will return immediately */
-		}
-#ifdef PC98
-		pc98_fd_check_ready(fdu);
-#endif
-		if (fd_cmd(fdc, 3, NE7CMD_SEEK,
-			   fd->fdsu, cylinder * steptrac, 0))
-		{
-			/*
-			 * Seek command not accepted, looks like
-			 * the FDC went off to the Saints...
-			 */
-			fdc->retry = 6;	/* try a reset */
-			return(retrier(fdc));
-		}
-		fd->track = FD_NO_TRACK;
-		fdc->state = SEEKWAIT;
-		return(0);	/* will return later */
-
-	case SEEKWAIT:
-		/* allow heads to settle */
-		timeout(fd_pseudointr, fdc, hz / 16);
-		fdc->state = SEEKCOMPLETE;
-		return(0);	/* will return later */
-
-	case SEEKCOMPLETE : /* seek done, start DMA */
-		blknum = bp->bio_pblkno + fd->skip / fdblk;
-		cylinder = blknum / (fd->ft->sectrac * fd->ft->heads);
-
-		/* Make sure seek really happened. */
-		if(fd->track == FD_NO_TRACK) {
-			int descyl = cylinder * steptrac;
-			do {
-				/*
-				 * This might be a "ready changed" interrupt,
-				 * which cannot really happen since the
-				 * RDY pin is hardwired to + 5 volts.  This
-				 * generally indicates a "bouncing" intr
-				 * line, so do one of the following:
-				 *
-				 * When running on an enhanced FDC that is
-				 * known to not go stuck after responding
-				 * with INVALID, fetch all interrupt states
-				 * until seeing either an INVALID or a
-				 * real interrupt condition.
-				 *
-				 * When running on a dumb old NE765, give
-				 * up immediately.  The controller will
-				 * provide up to four dummy RC interrupt
-				 * conditions right after reset (for the
-				 * corresponding four drives), so this is
-				 * our only chance to get notice that it
-				 * was not the FDC that caused the interrupt.
-				 */
-				if (fd_sense_int(fdc, &st0, &cyl)
-				    == FD_NOT_VALID)
-					return (0); /* will return later */
-				if(fdc->fdct == FDC_NE765
-				   && (st0 & NE7_ST0_IC) == NE7_ST0_IC_RC)
-					return (0); /* hope for a real intr */
-			} while ((st0 & NE7_ST0_IC) == NE7_ST0_IC_RC);
-
-			if (0 == descyl) {
-				int failed = 0;
-				/*
-				 * seek to cyl 0 requested; make sure we are
-				 * really there
-				 */
-				if (fd_sense_drive_status(fdc, &st3))
-					failed = 1;
-				if ((st3 & NE7_ST3_T0) == 0) {
-					printf(
-		"fd%d: Seek to cyl 0, but not really there (ST3 = %b)\n",
-					       fdu, st3, NE7_ST3BITS);
-					failed = 1;
-				}
-
-				if (failed) {
-					if(fdc->retry < 3)
-						fdc->retry = 3;
-					return (retrier(fdc));
-				}
-			}
-
-			if (cyl != descyl) {
-				printf(
-		"fd%d: Seek to cyl %d failed; am at cyl %d (ST0 = 0x%x)\n",
-				       fdu, descyl, cyl, st0);
-				if (fdc->retry < 3)
-					fdc->retry = 3;
-				return (retrier(fdc));
-			}
-		}
-
-		fd->track = cylinder;
-		if (format)
-			fd->skip = (char *)&(finfo->fd_formb_cylno(0))
-			    - (char *)finfo;
-		if (!rdsectid && !(fdc->flags & FDC_NODMA))
-			isa_dmastart(idf, bp->bio_data+fd->skip,
-				format ? bp->bio_bcount : fdblk, fdc->dmachan);
-		blknum = bp->bio_pblkno + fd->skip / fdblk;
-		sectrac = fd->ft->sectrac;
-		sec = blknum %  (sectrac * fd->ft->heads);
-		head = sec / sectrac;
-		sec = sec % sectrac + 1;
-		if (head != 0 && fd->ft->offset_side2 != 0)
-			sec += fd->ft->offset_side2;
-		fd->hddrv = ((head&1)<<2)+fdu;
-
-		if(format || !(read || rdsectid))
-		{
-			/* make sure the drive is writable */
-			if(fd_sense_drive_status(fdc, &st3) != 0)
-			{
-				/* stuck controller? */
-				if (!(fdc->flags & FDC_NODMA))
-					isa_dmadone(idf,
-						    bp->bio_data + fd->skip,
-						    format ? bp->bio_bcount : fdblk,
-						    fdc->dmachan);
-				fdc->retry = 6;	/* reset the beast */
-				return (retrier(fdc));
-			}
-			if(st3 & NE7_ST3_WP)
-			{
-				/*
-				 * XXX YES! this is ugly.
-				 * in order to force the current operation
-				 * to fail, we will have to fake an FDC
-				 * error - all error handling is done
-				 * by the retrier()
-				 */
-				fdc->status[0] = NE7_ST0_IC_AT;
-				fdc->status[1] = NE7_ST1_NW;
-				fdc->status[2] = 0;
-				fdc->status[3] = fd->track;
-				fdc->status[4] = head;
-				fdc->status[5] = sec;
-				fdc->retry = 8;	/* break out immediately */
-				fdc->state = IOTIMEDOUT; /* not really... */
-				return (1); /* will return immediately */
-			}
-		}
-
-		if (format) {
-			ne7cmd = NE7CMD_FORMAT | mfm;
-			if (fdc->flags & FDC_NODMA) {
-				/*
-				 * This seems to be necessary for
-				 * whatever obscure reason; if we omit
-				 * it, we end up filling the sector ID
-				 * fields of the newly formatted track
-				 * entirely with garbage, causing
-				 * `wrong cylinder' errors all over
-				 * the place when trying to read them
-				 * back.
-				 *
-				 * Umpf.
-				 */
-				SET_BCDR(fdc, 1, bp->bio_bcount, 0);
-
-				(void)fdcpio(fdc,bp->bio_cmd,
-					bp->bio_data+fd->skip,
-					bp->bio_bcount);
-
-			}
-			/* formatting */
-			if(fd_cmd(fdc, 6,  ne7cmd, head << 2 | fdu,
-				  finfo->fd_formb_secshift,
-				  finfo->fd_formb_nsecs,
-				  finfo->fd_formb_gaplen,
-				  finfo->fd_formb_fillbyte, 0)) {
-				/* controller fell over */
-				if (!(fdc->flags & FDC_NODMA))
-					isa_dmadone(idf,
-						    bp->bio_data + fd->skip,
-						    format ? bp->bio_bcount : fdblk,
-						    fdc->dmachan);
-				fdc->retry = 6;
-				return (retrier(fdc));
-			}
-		} else if (rdsectid) {
-			ne7cmd = NE7CMD_READID | mfm;
-			if (fd_cmd(fdc, 2, ne7cmd, head << 2 | fdu, 0)) {
-				/* controller jamming */
-				fdc->retry = 6;
-				return (retrier(fdc));
-			}
-		} else {
-			/* read or write operation */
-			ne7cmd = (read ? NE7CMD_READ | NE7CMD_SK : NE7CMD_WRITE) | mfm;
-			if (fdc->flags & FDC_NODMA) {
-				/*
-				 * This seems to be necessary even when
-				 * reading data.
-				 */
-				SET_BCDR(fdc, 1, fdblk, 0);
-
-				/*
-				 * Perform the write pseudo-DMA before
-				 * the WRITE command is sent.
-				 */
-				if (!read)
-					(void)fdcpio(fdc,bp->bio_cmd,
-					    bp->bio_data+fd->skip,
-					    fdblk);
-			}
-			if (fd_cmd(fdc, 9,
-				   ne7cmd,
-				   head << 2 | fdu,  /* head & unit */
-				   fd->track,        /* track */
-				   head,
-				   sec,              /* sector + 1 */
-				   fd->ft->secsize,  /* sector size */
-				   sectrac,          /* sectors/track */
-				   fd->ft->gap,      /* gap size */
-				   fd->ft->datalen,  /* data length */
-				   0)) {
-				/* the beast is sleeping again */
-				if (!(fdc->flags & FDC_NODMA))
-					isa_dmadone(idf,
-						    bp->bio_data + fd->skip,
-						    format ? bp->bio_bcount : fdblk,
-						    fdc->dmachan);
-				fdc->retry = 6;
-				return (retrier(fdc));
-			}
-		}
-		if (!rdsectid && (fdc->flags & FDC_NODMA))
-			/*
-			 * If this is a read, then simply await interrupt
-			 * before performing PIO.
-			 */
-			if (read && !fdcpio(fdc,bp->bio_cmd,
-			    bp->bio_data+fd->skip,fdblk)) {
-				fd->tohandle = timeout(fd_iotimeout, fdc, hz);
-				return(0);      /* will return later */
-			}
-
-		/*
-		 * Write (or format) operation will fall through and
-		 * await completion interrupt.
-		 */
-		fdc->state = IOCOMPLETE;
-		fd->tohandle = timeout(fd_iotimeout, fdc, hz);
-		return (0);	/* will return later */
-
-	case PIOREAD:
-		/* 
-		 * Actually perform the PIO read.  The IOCOMPLETE case
-		 * removes the timeout for us.
-		 */
-		(void)fdcpio(fdc,bp->bio_cmd,bp->bio_data+fd->skip,fdblk);
-		fdc->state = IOCOMPLETE;
-		/* FALLTHROUGH */
-	case IOCOMPLETE: /* IO done, post-analyze */
-		untimeout(fd_iotimeout, fdc, fd->tohandle);
-
-		if (fd_read_status(fdc)) {
-			if (!rdsectid && !(fdc->flags & FDC_NODMA))
-				isa_dmadone(idf, bp->bio_data + fd->skip,
-					    format ? bp->bio_bcount : fdblk,
-					    fdc->dmachan);
-			if (fdc->retry < 6)
-				fdc->retry = 6;	/* force a reset */
-			return (retrier(fdc));
-  		}
-
-		fdc->state = IOTIMEDOUT;
-
-		/* FALLTHROUGH */
-	case IOTIMEDOUT:
-		if (!rdsectid && !(fdc->flags & FDC_NODMA))
-			isa_dmadone(idf, bp->bio_data + fd->skip,
-				format ? bp->bio_bcount : fdblk, fdc->dmachan);
-		if (fdc->status[0] & NE7_ST0_IC) {
-                        if ((fdc->status[0] & NE7_ST0_IC) == NE7_ST0_IC_AT
-			    && fdc->status[1] & NE7_ST1_OR) {
-                                /*
-				 * DMA overrun. Someone hogged the bus and
-				 * didn't release it in time for the next
-				 * FDC transfer.
-				 *
-				 * We normally restart this without bumping
-				 * the retry counter.  However, in case
-				 * something is seriously messed up (like
-				 * broken hardware), we rather limit the
-				 * number of retries so the IO operation
-				 * doesn't block indefinately.
-				 */
-				if (fdc->dma_overruns++ < FDC_DMAOV_MAX) {
-					fdc->state = SEEKCOMPLETE;
-					return (1);/* will return immediately */
-				} /* else fall through */
-                        }
-			if((fdc->status[0] & NE7_ST0_IC) == NE7_ST0_IC_IV
-				&& fdc->retry < 6)
-				fdc->retry = 6;	/* force a reset */
-			else if((fdc->status[0] & NE7_ST0_IC) == NE7_ST0_IC_AT
-				&& fdc->status[2] & NE7_ST2_WC
-				&& fdc->retry < 3)
-				fdc->retry = 3;	/* force recalibrate */
-			return (retrier(fdc));
-		}
-		/* All OK */
-		if (rdsectid) {
-			/* copy out ID field contents */
-			idp = (struct fdc_readid *)bp->bio_data;
-			idp->cyl = fdc->status[3];
-			idp->head = fdc->status[4];
-			idp->sec = fdc->status[5];
-			idp->secshift = fdc->status[6];
-		}
-		/* Operation successful, retry DMA overruns again next time. */
-		fdc->dma_overruns = 0;
-		fd->skip += fdblk;
-		if (!rdsectid && !format && fd->skip < bp->bio_bcount) {
-			/* set up next transfer */
-			fdc->state = DOSEEK;
-		} else {
-			/* ALL DONE */
-			fd->skip = 0;
-			bp->bio_resid = 0;
-			fdc->bp = NULL;
-			device_unbusy(fd->dev);
-			biofinish(bp, fd->device_stats, 0);
-			fdc->fd = (fd_p) 0;
-			fdc->fdu = -1;
-			fdc->state = FINDWORK;
-		}
-		return (1);	/* will return immediately */
-
-	case RESETCTLR:
-		fdc_reset(fdc);
-		fdc->retry++;
-		fdc->state = RESETCOMPLETE;
-		return (0);	/* will return later */
-
-	case RESETCOMPLETE:
-		/*
-		 * Discard all the results from the reset so that they
-		 * can't cause an unexpected interrupt later.
-		 */
-		for (i = 0; i < 4; i++)
-			(void)fd_sense_int(fdc, &st0, &cyl);
-		fdc->state = STARTRECAL;
-		/* FALLTHROUGH */
-	case STARTRECAL:
-#ifdef PC98
-		pc98_fd_check_ready(fdu);
-#endif
-		if(fd_cmd(fdc, 2, NE7CMD_RECAL, fdu, 0)) {
-			/* arrgl */
-			fdc->retry = 6;
-			return (retrier(fdc));
-		}
-		fdc->state = RECALWAIT;
-		return (0);	/* will return later */
-
-	case RECALWAIT:
-		/* allow heads to settle */
-		timeout(fd_pseudointr, fdc, hz / 8);
-		fdc->state = RECALCOMPLETE;
-		return (0);	/* will return later */
-
-	case RECALCOMPLETE:
-		do {
-			/*
-			 * See SEEKCOMPLETE for a comment on this:
-			 */
-			if (fd_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID)
-				return (0); /* will return later */
-			if(fdc->fdct == FDC_NE765
-			   && (st0 & NE7_ST0_IC) == NE7_ST0_IC_RC)
-				return (0); /* hope for a real intr */
-		} while ((st0 & NE7_ST0_IC) == NE7_ST0_IC_RC);
-		if ((st0 & NE7_ST0_IC) != NE7_ST0_IC_NT || cyl != 0)
-		{
-			if(fdc->retry > 3)
-				/*
-				 * A recalibrate from beyond cylinder 77
-				 * will "fail" due to the FDC limitations;
-				 * since people used to complain much about
-				 * the failure message, try not logging
-				 * this one if it seems to be the first
-				 * time in a line.
-				 */
-				printf("fd%d: recal failed ST0 %b cyl %d\n",
-				       fdu, st0, NE7_ST0BITS, cyl);
-			if(fdc->retry < 3) fdc->retry = 3;
-			return (retrier(fdc));
-		}
-		fd->track = 0;
-		/* Seek (probably) necessary */
-		fdc->state = DOSEEK;
-		return (1);	/* will return immediately */
-
-	case MOTORWAIT:
-		if(fd->flags & FD_MOTOR_WAIT)
-		{
-			return (0); /* time's not up yet */
-		}
-		if (fdc->flags & FDC_NEEDS_RESET) {
-			fdc->state = RESETCTLR;
-			fdc->flags &= ~FDC_NEEDS_RESET;
-		} else
-			fdc->state = DOSEEK;
-		return (1);	/* will return immediately */
-
-	default:
-		device_printf(fdc->fdc_dev, "unexpected FD int->");
-		if (fd_read_status(fdc) == 0)
-			printf("FDC status :%x %x %x %x %x %x %x   ",
-			       fdc->status[0],
-			       fdc->status[1],
-			       fdc->status[2],
-			       fdc->status[3],
-			       fdc->status[4],
-			       fdc->status[5],
-			       fdc->status[6] );
-		else
-			printf("No status available   ");
-		if (fd_sense_int(fdc, &st0, &cyl) != 0)
-		{
-			printf("[controller is dead now]\n");
-			return (0); /* will return later */
-		}
-		printf("ST0 = %x, PCN = %x\n", st0, cyl);
-		return (0);	/* will return later */
-	}
-	/* noone should ever get here */
-}
-
-static int
-retrier(struct fdc_data *fdc)
-{
-	struct bio *bp;
-	struct fd_data *fd;
-	int fdu;
-
-	bp = fdc->bp;
-
-	/* XXX shouldn't this be cached somewhere?  */
-	fd = bp->bio_dev->si_drv1;
-	fdu = fd->fdu;
-	if (fd->options & FDOPT_NORETRY)
-		goto fail;
-
-	switch (fdc->retry) {
-	case 0: case 1: case 2:
-		fdc->state = SEEKCOMPLETE;
-		break;
-	case 3: case 4: case 5:
-		fdc->state = STARTRECAL;
-		break;
-	case 6:
-		fdc->state = RESETCTLR;
-		break;
-	case 7:
-		break;
-	default:
-	fail:
-		if ((fd->options & FDOPT_NOERRLOG) == 0) {
-			disk_err(bp, "hard error",
-			    fdc->fd->skip / DEV_BSIZE, 0);
-			if (fdc->flags & FDC_STAT_VALID) {
-				printf(
-				" (ST0 %b ST1 %b ST2 %b cyl %u hd %u sec %u)\n",
-				       fdc->status[0], NE7_ST0BITS,
-				       fdc->status[1], NE7_ST1BITS,
-				       fdc->status[2], NE7_ST2BITS,
-				       fdc->status[3], fdc->status[4],
-				       fdc->status[5]);
-			}
-			else
-				printf(" (No status)\n");
-		}
-		if ((fd->options & FDOPT_NOERROR) == 0) {
-			bp->bio_flags |= BIO_ERROR;
-			bp->bio_error = EIO;
-			bp->bio_resid = bp->bio_bcount - fdc->fd->skip;
-		} else
-			bp->bio_resid = 0;
-		fdc->bp = NULL;
-		fdc->fd->skip = 0;
-		device_unbusy(fd->dev);
-		biofinish(bp, fdc->fd->device_stats, 0);
-		fdc->state = FINDWORK;
-		fdc->flags |= FDC_NEEDS_RESET;
-		fdc->fd = (fd_p) 0;
-		fdc->fdu = -1;
-		return (1);
-	}
-	fdc->retry++;
-	return (1);
-}
-
-static void
-fdbiodone(struct bio *bp)
-{
-	wakeup(bp);
-}
-
-static int
-fdmisccmd(struct cdev *dev, u_int cmd, void *data)
-{
- 	fdu_t fdu;
- 	fd_p fd;
-	struct bio *bp;
-	struct fd_formb *finfo;
-	struct fdc_readid *idfield;
-	size_t fdblk;
-	int error;
-
-	fd = dev->si_drv1;
- 	fdu = fd->fdu;
-	fdblk = 128 << fd->ft->secsize;
-	finfo = (struct fd_formb *)data;
-	idfield = (struct fdc_readid *)data;
-
-	bp = malloc(sizeof(struct bio), M_TEMP, M_WAITOK | M_ZERO);
-
-	/*
-	 * Set up a bio request for fdstrategy().  bio_offset is faked
-	 * so that fdstrategy() will seek to the requested
-	 * cylinder, and use the desired head.
-	 */
-	bp->bio_cmd = cmd;
-	if (cmd == FDBIO_FORMAT) {
-		bp->bio_offset =
-		    (finfo->cyl * (fd->ft->sectrac * fd->ft->heads) +
-		     finfo->head * fd->ft->sectrac) * fdblk;
-		bp->bio_bcount = sizeof(struct fd_idfield_data) *
-		    finfo->fd_formb_nsecs;
-	} else if (cmd == FDBIO_RDSECTID) {
-		bp->bio_offset =
-		    (idfield->cyl * (fd->ft->sectrac * fd->ft->heads) +
-		     idfield->head * fd->ft->sectrac) * fdblk;
-		bp->bio_bcount = sizeof(struct fdc_readid);
-	} else
-		panic("wrong cmd in fdmisccmd()");
-	bp->bio_data = data;
-	bp->bio_dev = dev;
-	bp->bio_done = fdbiodone;
-	bp->bio_flags = 0;
-
-	/* Now run the command. */
-	fdstrategy(bp);
-	error = biowait(bp, "fdcmd");
-
-	free(bp, M_TEMP);
-	return (error);
-}
-
-static int
-fdioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
-{
- 	fdu_t fdu;
- 	fd_p fd;
-	struct fdc_status *fsp;
-	struct fdc_readid *rid;
-	int error;
-
- 	fd = dev->si_drv1;
- 	fdu = fd->fdu;
-
-#ifdef PC98
-	pc98_fd_check_ready(fdu);
-#endif	
-
-	/*
-	 * First, handle everything that could be done with
-	 * FD_NONBLOCK still being set.
-	 */
-	switch (cmd) {
-
-	case DIOCGMEDIASIZE:
-		if (fd->ft == 0)
-			return ((fd->flags & FD_NONBLOCK) ? EAGAIN : ENXIO);
-		*(off_t *)addr = (128 << (fd->ft->secsize)) * fd->ft->size;
-		return (0);
-
-	case DIOCGSECTORSIZE:
-		if (fd->ft == 0)
-			return ((fd->flags & FD_NONBLOCK) ? EAGAIN : ENXIO);
-		*(u_int *)addr = 128 << (fd->ft->secsize);
-		return (0);
-
-	case FIONBIO:
-		if (*(int *)addr != 0)
-			fd->flags |= FD_NONBLOCK;
-		else {
-			if (fd->ft == 0) {
-				/*
-				 * No drive type has been selected yet,
-				 * cannot turn FNONBLOCK off.
-				 */
-				return (EINVAL);
-			}
-			fd->flags &= ~FD_NONBLOCK;
-		}
-		return (0);
-
-	case FIOASYNC:
-		/* keep the generic fcntl() code happy */
-		return (0);
-
-	case FD_GTYPE:                  /* get drive type */
-		if (fd->ft == 0)
-			/* no type known yet, return the native type */
-			*(struct fd_type *)addr = fd_native_types[fd->type];
-		else
-			*(struct fd_type *)addr = *fd->ft;
-		return (0);
-
-	case FD_STYPE:                  /* set drive type */
-		/*
-		 * Allow setting drive type temporarily iff
-		 * currently unset.  Used for fdformat so any
-		 * user can set it, and then start formatting.
-		 */
-		if (fd->ft)
-			return (EINVAL); /* already set */
-		fd->fts[0] = *(struct fd_type *)addr;
-		fd->ft = &fd->fts[0];
-		fd->flags |= FD_UA;
-		return (0);
-
-	case FD_GOPTS:			/* get drive options */
-		*(int *)addr = fd->options + FDOPT_AUTOSEL;
-		return (0);
-
-	case FD_SOPTS:			/* set drive options */
-		fd->options = *(int *)addr & ~FDOPT_AUTOSEL;
-		return (0);
-
-#ifdef FDC_DEBUG
-	case FD_DEBUG:
-		if ((fd_debug != 0) != (*(int *)addr != 0)) {
-			fd_debug = (*(int *)addr != 0);
-			printf("fd%d: debugging turned %s\n",
-			    fd->fdu, fd_debug ? "on" : "off");
-		}
-		return (0);
-#endif
-
-	case FD_CLRERR:
-		if (priv_check(td, PRIV_DRIVER) != 0)
-			return (EPERM);
-		fd->fdc->fdc_errs = 0;
-		return (0);
-
-	case FD_GSTAT:
-		fsp = (struct fdc_status *)addr;
-		if ((fd->fdc->flags & FDC_STAT_VALID) == 0)
-			return (EINVAL);
-		memcpy(fsp->status, fd->fdc->status, 7 * sizeof(u_int));
-		return (0);
-
-	case FD_GDTYPE:
-		*(enum fd_drivetype *)addr = fd->type;
-		return (0);
-	}
-
-	/*
-	 * Now handle everything else.  Make sure we have a valid
-	 * drive type.
-	 */
-	if (fd->flags & FD_NONBLOCK)
-		return (EAGAIN);
-	if (fd->ft == 0)
-		return (ENXIO);
-	error = 0;
-
-	switch (cmd) {
-
-	case FD_FORM:
-		if ((flag & FWRITE) == 0)
-			return (EBADF);	/* must be opened for writing */
-		if (((struct fd_formb *)addr)->format_version !=
-		    FD_FORMAT_VERSION)
-			return (EINVAL); /* wrong version of formatting prog */
-		error = fdmisccmd(dev, FDBIO_FORMAT, addr);
-		break;
-
-	case FD_GTYPE:                  /* get drive type */
-		*(struct fd_type *)addr = *fd->ft;
-		break;
-
-	case FD_STYPE:                  /* set drive type */
-		/* this is considered harmful; only allow for superuser */
-		if (priv_check(td, PRIV_DRIVER) != 0)
-			return (EPERM);
-		*fd->ft = *(struct fd_type *)addr;
-		break;
-
-	case FD_GOPTS:			/* get drive options */
-		*(int *)addr = fd->options;
-		break;
-
-	case FD_SOPTS:			/* set drive options */
-		fd->options = *(int *)addr;
-		break;
-
-#ifdef FDC_DEBUG
-	case FD_DEBUG:
-		if ((fd_debug != 0) != (*(int *)addr != 0)) {
-			fd_debug = (*(int *)addr != 0);
-			printf("fd%d: debugging turned %s\n",
-			    fd->fdu, fd_debug ? "on" : "off");
-		}
-		break;
-#endif
-
-	case FD_CLRERR:
-		if (priv_check(td, PRIV_DRIVER) != 0)
-			return (EPERM);
-		fd->fdc->fdc_errs = 0;
-		break;
-
-	case FD_GSTAT:
-		fsp = (struct fdc_status *)addr;
-		if ((fd->fdc->flags & FDC_STAT_VALID) == 0)
-			return (EINVAL);
-		memcpy(fsp->status, fd->fdc->status, 7 * sizeof(u_int));
-		break;
-
-	case FD_READID:
-		rid = (struct fdc_readid *)addr;
-		if (rid->cyl > MAX_CYLINDER || rid->head > MAX_HEAD)
-			return (EINVAL);
-		error = fdmisccmd(dev, FDBIO_RDSECTID, addr);
-		break;
-
-	default:
-		error = ENOTTY;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
deleted file mode 100644
index 6d8e7e115d0d..000000000000
--- a/sys/pc98/cbus/fdcreg.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
- */
-
-/*
- * AT floppy controller registers and bitfields
- */
-
-/* uses NEC765 controller */
-#include <dev/ic/nec765.h>
-
-#ifdef PC98
-/* registers */
-#define	FDSTS	0	/* NEC 765 Main Status Register (R) */
-#define	FDDATA	1	/* NEC 765 Data Register (R/W) */
-#define	FDCTL	2	/* FD Control Register */
-#define	FDC_RST		0x80	/*  FDC RESET */
-#define	FDC_RDY		0x40	/*  force READY */
-#define	FDC_DD		0x20	/*  FDD Mode Exchange 0:1M 1:640K */
-#define	FDC_DMAE	0x10	/*  enable floppy DMA */
-#define	FDC_MTON	0x08	/*  MOTOR ON (when EMTON=1)*/
-#define	FDC_TMSK	0x04	/*  TIMER MASK */
-#define	FDC_TTRG	0x01	/*  TIMER TRIGER */
-
-#define	FDP_EMTON	0x04	/*  enable MTON */
-#define	FDP_FDDEXC	0x02	/*  FDD Mode Exchange 1:1M 0:640K */
-#define	FDP_PORTEXC	0x01	/*  PORT Exchane 1:1M 0:640K */
-
-#else
-/* registers */
-#define	FDOUT	2	/* Digital Output Register (W) */
-#define	FDO_FDSEL	0x03	/*  floppy device select */
-#define	FDO_FRST	0x04	/*  floppy controller reset */
-#define	FDO_FDMAEN	0x08	/*  enable floppy DMA and Interrupt */
-#define	FDO_MOEN0	0x10	/*  motor enable drive 0 */
-#define	FDO_MOEN1	0x20	/*  motor enable drive 1 */
-#define	FDO_MOEN2	0x40	/*  motor enable drive 2 */
-#define	FDO_MOEN3	0x80	/*  motor enable drive 3 */
-
-#define	FDSTS	4	/* NEC 765 Main Status Register (R) */
-#define	FDDATA	5	/* NEC 765 Data Register (R/W) */
-#define	FDCTL	7	/* Control Register (W) */
-#endif /* PC98 */
-
-/*
- * The definitions for FDC_500KBPS etc. have been moved out to <sys/fdcio.h>
- * since they need to be visible in userland.  They cover the lower two bits
- * of FDCTL when used for output.
- */
-/*
- * this is the secret PIO data port (offset from base)
- */
-#define FDC_YE_DATAPORT 6
-
-#ifndef PC98
-#define	FDIN	7	/* Digital Input Register (R) */
-#define	FDI_DCHG	0x80	/* diskette has been changed */
-				/* requires drive and motor being selected */
-				/* is cleared by any step pulse to drive */
-#endif
diff --git a/sys/pc98/cbus/fdcvar.h b/sys/pc98/cbus/fdcvar.h
deleted file mode 100644
index 4ae53d95ac59..000000000000
--- a/sys/pc98/cbus/fdcvar.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * Copyright (c) 2004 M. Warner Losh.
- * All rights reserved.
- *
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-/* XXX should audit this file to see if additional copyrights needed */
-
-enum fdc_type
-{
-	FDC_NE765, FDC_ENHANCED, FDC_UNKNOWN = -1
-};
-
-enum fdc_states {
-	DEVIDLE,
-	FINDWORK,
-	DOSEEK,
-	SEEKCOMPLETE ,
-	IOCOMPLETE,
-	RECALCOMPLETE,
-	STARTRECAL,
-	RESETCTLR,
-	SEEKWAIT,
-	RECALWAIT,
-	MOTORWAIT,
-	IOTIMEDOUT,
-	RESETCOMPLETE,
-	PIOREAD
-};
-
-#ifdef	FDC_DEBUG
-static char const * const fdstates[] = {
-	"DEVIDLE",
-	"FINDWORK",
-	"DOSEEK",
-	"SEEKCOMPLETE",
-	"IOCOMPLETE",
-	"RECALCOMPLETE",
-	"STARTRECAL",
-	"RESETCTLR",
-	"SEEKWAIT",
-	"RECALWAIT",
-	"MOTORWAIT",
-	"IOTIMEDOUT",
-	"RESETCOMPLETE",
-	"PIOREAD"
-};
-#endif
-
-/*
- * Per controller structure (softc).
- */
-struct fdc_data
-{
-	int	fdcu;		/* our unit number */
-	int	dmacnt;
-	int	dmachan;
-	int	flags;
-#define FDC_STAT_VALID	0x08
-#define FDC_HAS_FIFO	0x10
-#define FDC_NEEDS_RESET	0x20
-#define FDC_NODMA	0x40
-#define FDC_ISPNP	0x80
-#define FDC_ISPCMCIA	0x100
-	struct	fd_data *fd;
-	int	fdu;		/* the active drive	*/
-	enum	fdc_states state;
-	int	retry;
-#ifndef PC98
-	int	fdout;		/* mirror of the w/o digital output reg */
-#endif
-	u_int	status[7];	/* copy of the registers */
-	enum	fdc_type fdct;	/* chip version of FDC */
-	int	fdc_errs;	/* number of logged errors */
-	int	dma_overruns;	/* number of DMA overruns */
-	struct	bio_queue_head head;
-	struct	bio *bp;	/* active buffer */
-#ifdef PC98
-	struct	resource *res_ioport, *res_fdsio, *res_fdemsio;
-	struct	resource *res_irq, *res_drq;
-	int	rid_ioport, rid_irq, rid_drq;
-#else
-	struct	resource *res_ioport, *res_ctl, *res_irq, *res_drq;
-	int	rid_ioport, rid_ctl, rid_irq, rid_drq;
-#endif
-	int	port_off;
-	bus_space_tag_t portt;
-	bus_space_handle_t porth;
-#ifdef PC98
-        bus_space_tag_t		sc_fdsiot;
-        bus_space_handle_t	sc_fdsioh;
-        bus_space_tag_t		sc_fdemsiot;
-        bus_space_handle_t	sc_fdemsioh;
-#else
-	bus_space_tag_t ctlt;
-	bus_space_handle_t ctlh;
-#endif
-	void	*fdc_intr;
-	struct	device *fdc_dev;
-#ifndef PC98
-	void	(*fdctl_wr)(struct fdc_data *fdc, u_int8_t v);
-#endif
-};
-
-typedef int	fdu_t;
-typedef int	fdcu_t;
-typedef int	fdsu_t;
-typedef	struct fd_data *fd_p;
-typedef struct fdc_data *fdc_p;
-typedef enum fdc_type fdc_t;
-
-/* error returns for fd_cmd() */
-#define FD_FAILED -1
-#define FD_NOT_VALID -2
-#define FDC_ERRMAX	100	/* do not log more */
-
-extern devclass_t fdc_devclass;
-
-enum fdc_device_ivars {
-	FDC_IVAR_FDUNIT,
-	FDC_IVAR_FDTYPE,
-};
-
-__BUS_ACCESSOR(fdc, fdunit, FDC, FDUNIT, int);
-__BUS_ACCESSOR(fdc, fdtype, FDC, FDTYPE, int);
-
-int fdc_alloc_resources(struct fdc_data *);
-#ifndef PC98
-void fdout_wr(fdc_p, u_int8_t);
-#endif
-int fd_cmd(struct fdc_data *, int, ...);
-void fdc_release_resources(struct fdc_data *);
-int fdc_attach(device_t);
-int fdc_hints_probe(device_t);
-int fdc_detach(device_t dev);
-device_t fdc_add_child(device_t, const char *, int);
-int fdc_initial_reset(struct fdc_data *);
-int fdc_print_child(device_t, device_t);
-int fdc_read_ivar(device_t, device_t, int, uintptr_t *);
-int fdc_write_ivar(device_t, device_t, int, uintptr_t);
-#ifndef PC98
-int fdc_isa_alloc_resources(device_t, struct fdc_data *);
-#endif
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 2423d6e86e24..9aa821271c8e 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -140,6 +140,7 @@ struct lpt_softc {
 	struct resource *res_port;
 	struct resource *res_irq;
 	void *sc_ih;
+	struct callout timer;
 
 	int	sc_port;
 	short	sc_state;
@@ -319,6 +320,7 @@ lpt_attach(device_t dev)
 
 	unit = device_get_unit(dev);
 	sc = device_get_softc(dev);
+	callout_init(&sc->timer, 0);
 
 	rid = 0;
 	sc->res_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid,
@@ -418,8 +420,8 @@ lptopen (struct cdev *dev, int flags, int fmt, struct thread *td)
 	lprintf(("irq %x\n", sc->sc_irq));
 	if (sc->sc_irq & LP_USE_IRQ) {
 		sc->sc_state |= TOUT;
-		timeout (lptout, (caddr_t)sc,
-			 (sc->sc_backoff = hz/LPTOUTINITIAL));
+		sc->sc_backoff = hz / LPTOUTINITIAL;;
+		callout_reset(&sc->timer, sc->sc_backoff, lptout, sc);
 	}
 
 	lprintf(("opened.\n"));
@@ -437,7 +439,7 @@ lptout (void *arg)
 		sc->sc_backoff++;
 		if (sc->sc_backoff > hz/LPTOUTMAX)
 			sc->sc_backoff = sc->sc_backoff > hz/LPTOUTMAX;
-		timeout (lptout, (caddr_t)sc, sc->sc_backoff);
+		callout_reset(&sc->timer, sc->sc_backoff, lptout, sc);
 	} else
 		sc->sc_state &= ~TOUT;
 
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index e424294f0e75..92331b6a7a87 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -52,6 +52,19 @@
 /* device configuration flags */
 #define KB_CONF_FAIL_IF_NO_KBD	(1 << 0) /* don't install if no kbd is found */
 
+typedef caddr_t		KBDC;
+
+typedef struct pckbd_state {
+	KBDC		kbdc;		/* keyboard controller */
+	int		ks_mode;	/* input mode (K_XLATE,K_RAW,K_CODE) */
+	int		ks_flags;	/* flags */
+#define COMPOSE		(1 << 0)
+	int		ks_state;	/* shift/lock key state */
+	int		ks_accents;	/* accent key index (> 0) */
+	u_int		ks_composed_char; /* composed char code (> 0) */
+	struct callout	ks_timer;
+} pckbd_state_t;
+
 static devclass_t	pckbd_devclass;
 
 static int		pckbdprobe(device_t dev);
@@ -186,6 +199,7 @@ static int
 pckbd_attach_unit(device_t dev, keyboard_t **kbd, int port, int irq, int flags)
 {
 	keyboard_switch_t *sw;
+	pckbd_state_t *state;
 	int args[2];
 	int error;
 	int unit;
@@ -218,6 +232,8 @@ pckbd_attach_unit(device_t dev, keyboard_t **kbd, int port, int irq, int flags)
 	 * This is a kludge to compensate for lost keyboard interrupts.
 	 * A similar code used to be in syscons. See below. XXX
 	 */
+	state = (pckbd_state_t *)(*kbd)->kb_data;
+	callout_init(&state->ks_timer, 0);
 	pckbd_timeout(*kbd);
 
 	if (bootverbose)
@@ -229,6 +245,7 @@ pckbd_attach_unit(device_t dev, keyboard_t **kbd, int port, int irq, int flags)
 static void
 pckbd_timeout(void *arg)
 {
+	pckbd_state_t *state;
 	keyboard_t *kbd;
 	int s;
 
@@ -259,7 +276,8 @@ pckbd_timeout(void *arg)
 			kbdd_intr(kbd, NULL);
 	}
 	splx(s);
-	timeout(pckbd_timeout, arg, hz/10);
+	state = (pckbd_state_t *)kbd->kb_data;
+	callout_reset(&state->ks_timer, hz / 10, pckbd_timeout, arg);
 }
 
 /* LOW-LEVEL */
@@ -268,18 +286,6 @@ pckbd_timeout(void *arg)
 
 #define PC98KBD_DEFAULT	0
 
-typedef caddr_t		KBDC;
-
-typedef struct pckbd_state {
-	KBDC		kbdc;		/* keyboard controller */
-	int		ks_mode;	/* input mode (K_XLATE,K_RAW,K_CODE) */
-	int		ks_flags;	/* flags */
-#define COMPOSE		(1 << 0)
-	int		ks_state;	/* shift/lock key state */
-	int		ks_accents;	/* accent key index (> 0) */
-	u_int		ks_composed_char; /* composed char code (> 0) */
-} pckbd_state_t;
-
 /* keyboard driver declaration */
 static int		pckbd_configure(int flags);
 static kbd_probe_t	pckbd_probe;
@@ -486,7 +492,10 @@ pckbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 static int
 pckbd_term(keyboard_t *kbd)
 {
+	pckbd_state_t *state = (pckbd_state_t *)kbd->kb_data;
+
 	kbd_unregister(kbd);
+	callout_drain(&state->ks_timer);
 	return 0;
 }
 
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 7386c1f737d3..9882bc4b1bbf 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -35,6 +35,7 @@ options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
@@ -60,15 +61,18 @@ options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	CAPABILITY_MODE		# Capsicum capability mode
 options 	CAPABILITIES		# Capsicum capabilities
 options 	MAC			# TrustedBSD MAC Framework
-options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options 	KDB			# Kernel debugger related code
-options 	KDB_TRACE		# Print a stack trace for a panic
+options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
+
+# Debugging support.  Always need this:
+options 	KDB			# Enable kernel debugger support.
+options 	KDB_TRACE		# Print a stack trace for a panic.
 
 # To make an SMP kernel, the next two lines are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -81,47 +85,48 @@ device		pci
 device		fdc
 
 # ATA controllers
-device		ahci		# AHCI-compatible SATA controllers
-device		ata		# Legacy ATA/SATA controllers
-options 	ATA_STATIC_ID	# Static device numbering
-device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
-device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
+device		ahci			# AHCI-compatible SATA controllers
+device		ata			# Legacy ATA/SATA controllers
+options 	ATA_STATIC_ID		# Static device numbering
+device		mvs			# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device		siis			# SiliconImage SiI3124/SiI3132/SiI3531 SATA
 
 # SCSI Controllers
-device		adv		# Advansys SCSI adapters
-device		ahc		# AHA2940 and onboard AIC7xxx devices
-device		esp		# AMD Am53C974 (Tekram DC-390(T))
-device		isp		# Qlogic family
-#device		ncr		# NCR/Symbios Logic
-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
+device		ahc			# AHA2940 and onboard AIC7xxx devices
+device		esp			# AMD Am53C974 (Tekram DC-390(T))
+device		isp			# Qlogic family
+#device		ncr			# NCR/Symbios Logic
+device		sym			# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
-device		aic		# PC-9801-100
-device		ct		# host adapter using WD33C93[ABC] chip (C bus)
+device		adv			# Advansys SCSI adapters
+device		aic			# PC-9801-100
+device		ct			# host adapter using WD33C93[ABC] chip
 
-device		ncv		# NCR 53C500
-device		nsp		# Workbit Ninja SCSI-3
-device		stg		# TMC 18C30/18C50
+device		ncv			# NCR 53C500
+device		nsp			# Workbit Ninja SCSI-3
+device		stg			# TMC 18C30/18C50
 
 # ATA/SCSI peripherals
-device		scbus		# SCSI bus (required for ATA/SCSI)
-device		ch		# SCSI media changers
-device		da		# Direct Access (disks)
-device		sa		# Sequential Access (tape etc)
-device		cd		# CD
-device		pass		# Passthrough device (direct ATA/SCSI access)
-device		ses		# Enclosure Services (SES and SAF-TE)
+device		scbus			# SCSI bus (required for ATA/SCSI)
+device		ch			# SCSI media changers
+device		da			# Direct Access (disks)
+device		sa			# Sequential Access (tape etc)
+device		cd			# CD
+device		pass			# Passthrough device (direct ATA/SCSI access)
+device		ses			# Enclosure Services (SES and SAF-TE)
+#device		ctl			# CAM Target Layer
 
 # keyboard driver
-device		pckbd		# PC98 keyboard
+device		pckbd			# PC98 keyboard
 
-device		gdc		# GDC screen
+device		gdc			# GDC screen
 
-device		splash		# Splash screen and screen saver support
+device		splash			# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 device		sc
 
-#device		agp		# support several AGP chipsets
+#device		agp			# support several AGP chipsets
 
 # Power management support (see NOTES for more options)
 #device		apm
@@ -133,114 +138,116 @@ device		sc
 
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
-device		cbb		# cardbus (yenta) bridge
-device		pccard		# PC Card (16-bit) bus
-device		cardbus		# CardBus (32-bit) bus
+device		cbb			# cardbus (yenta) bridge
+device		pccard			# PC Card (16-bit) bus
+device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
 #options 	COM_MULTIPORT
-#options 	COM_ESP		# ESP98
-#device		sio		# 8250, 16[45]50, 8251 based serial ports
-device		uart		# Generic UART driver
+#options 	COM_ESP			# ESP98
+#device		sio			# 8250, 16[45]50, 8251 based serial ports
+device		uart			# Generic UART driver
 
 device		mse
 #device		joy
 
-# NEW Parallel port
+# Parallel port
 device		ppc
-device		ppbus		# Parallel port bus (required)
-device		lpt		# Printer
-device		ppi		# Parallel port interface device
-#device		vpo		# Requires scbus and da
+device		ppbus			# Parallel port bus (required)
+device		lpt			# Printer
+device		ppi			# Parallel port interface device
+#device		vpo			# Requires scbus and da
 # OLD Parallel port
 #device		olpt
 
+device		puc			# Multi I/O cards and multi-channel UARTs
+
 # PCI Ethernet NICs.
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-#device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
-device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-#device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
-device		txp		# 3Com 3cR990 (``Typhoon'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
+device		de			# DEC/Intel DC21x4x (``Tulip'')
+#device		em			# Intel PRO/1000 Gigabit Ethernet Family
+device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
+#device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
+device		txp			# 3Com 3cR990 (``Typhoon'')
+device		vx			# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device		miibus		# MII bus support
-device		bfe		# Broadcom BCM440x 10/100 Ethernet
-#device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		dc		# DEC/Intel 21143 and various workalikes
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-#device		lge		# Level 1 LXT1001 gigabit Ethernet
-#device		nge		# NatSemi DP83820 gigabit Ethernet
-device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
-device		re		# RealTek 8139C+/8169/8169S/8110S
-device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
-#device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		tl		# Texas Instruments ThunderLAN
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
-#device		vge		# VIA VT612x gigabit Ethernet
-device		vr		# VIA Rhine, Rhine II
-device		wb		# Winbond W89C840F
-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		miibus			# MII bus support
+device		bfe			# Broadcom BCM440x 10/100 Ethernet
+#device		bge			# Broadcom BCM570xx Gigabit Ethernet
+device		dc			# DEC/Intel 21143 and various workalikes
+device		fxp			# Intel EtherExpress PRO/100B (82557, 82558)
+#device		lge			# Level 1 LXT1001 gigabit Ethernet
+#device		nge			# NatSemi DP83820 gigabit Ethernet
+device		pcn			# AMD Am79C97x PCI 10/100 (precedence over 'le')
+device		re			# RealTek 8139C+/8169/8169S/8110S
+device		rl			# RealTek 8129/8139
+device		sf			# Adaptec AIC-6915 (``Starfire'')
+device		sis			# Silicon Integrated Systems SiS 900/SiS 7016
+#device		sk			# SysKonnect SK-984x & SK-982x gigabit Ethernet
+device		ste			# Sundance ST201 (D-Link DFE-550TX)
+device		tl			# Texas Instruments ThunderLAN
+device		tx			# SMC EtherPower II (83c170 ``EPIC'')
+#device		vge			# VIA VT612x gigabit Ethernet
+device		vr			# VIA Rhine, Rhine II
+device		wb			# Winbond W89C840F
+device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.  pccard NICs included.
 # 'device ed' requires 'device miibus'
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
-device		ep		# Etherlink III based cards
-device		fe		# Fujitsu MB8696x based cards
-device		sn		# SMC's 9000 series of Ethernet chips
+device		ed			# NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device		ep			# Etherlink III based cards
+device		fe			# Fujitsu MB8696x based cards
+device		sn			# SMC's 9000 series of Ethernet chips
 device		snc
-device		xe		# Xircom pccard Ethernet
+device		xe			# Xircom pccard Ethernet
 
 # Wireless NIC cards
-#device		wlan		# 802.11 support
-#options 	IEEE80211_DEBUG	# enable debug msgs
+#device		wlan			# 802.11 support
+#options 	IEEE80211_DEBUG		# enable debug msgs
 #options 	IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
-#device		wlan_wep	# 802.11 WEP support
-#device		wlan_ccmp	# 802.11 CCMP support
-#device		wlan_tkip	# 802.11 TKIP support
-#device		wlan_amrr	# AMRR transmit rate control algorithm
-#device		an		# Aironet 4500/4800 802.11 wireless NICs.
-#device		ath		# Atheros NICs
-#device		ath_pci		# Atheros pci/cardbus glue
-#device		ath_hal		# pci/cardbus chip support
+#device		wlan_wep		# 802.11 WEP support
+#device		wlan_ccmp		# 802.11 CCMP support
+#device		wlan_tkip		# 802.11 TKIP support
+#device		wlan_amrr		# AMRR transmit rate control algorithm
+#device		an			# Aironet 4500/4800 802.11 wireless NICs.
+#device		ath			# Atheros NICs
+#device		ath_pci			# Atheros pci/cardbus glue
+#device		ath_hal			# pci/cardbus chip support
 options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
-#device		ath_rate_sample	# SampleRate tx rate control for ath
-#device		ral		# Ralink Technology RT2500 wireless NICs.
-#device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
+#device		ath_rate_sample		# SampleRate tx rate control for ath
+#device		ral			# Ralink Technology RT2500 wireless NICs.
+#device		wi			# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+#device		wl			# Older non 802.11 Wavelan wireless NIC.
 
 # Pseudo devices.
-device		loop		# Network loopback
-device		random		# Entropy device
-device		ether		# Ethernet support
-device		vlan		# 802.1Q VLAN support
-device		tun		# Packet tunnel.
-device		md		# Memory "disks"
-device		gif		# IPv6 and IPv4 tunneling
-device		faith		# IPv6-to-IPv4 relaying (translation)
-device		firmware	# firmware assist module
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		vlan			# 802.1Q VLAN support
+device		tun			# Packet tunnel.
+device		md			# Memory "disks"
+device		gif			# IPv6 and IPv4 tunneling
+device		faith			# IPv6-to-IPv4 relaying (translation)
+device		firmware		# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
-device		bpf		# Berkeley packet filter
+device		bpf			# Berkeley packet filter
 
 # USB support
-#options 	USB_DEBUG	# enable debug msgs
-#device		uhci		# UHCI PCI->USB interface
-#device		ohci		# OHCI PCI->USB interface
-#device		ehci		# EHCI PCI->USB interface (USB 2.0)
-#device		usb		# USB Bus (required)
-#device		ukbd		# Keyboard
-#device		umass		# Disks/Mass storage - Requires scbus and da
+#options 	USB_DEBUG		# enable debug msgs
+#device		uhci			# UHCI PCI->USB interface
+#device		ohci			# OHCI PCI->USB interface
+#device		ehci			# EHCI PCI->USB interface (USB 2.0)
+#device		usb			# USB Bus (required)
+#device		ukbd			# Keyboard
+#device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
-#device		sound		# Generic sound driver (required)
-#device		snd_mss		# Microsoft Sound System
-#device		"snd_sb16"	# Sound Blaster 16
-#device		snd_sbc		# Sound Blaster
+#device		sound			# Generic sound driver (required)
+#device		snd_mss			# Microsoft Sound System
+#device		"snd_sb16"		# Sound Blaster 16
+#device		snd_sbc			# Sound Blaster
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
deleted file mode 100644
index 4ae80ae5eada..000000000000
--- a/sys/pc98/pc98/machdep.c
+++ /dev/null
@@ -1,3003 +0,0 @@
-/*-
- * Copyright (c) 1992 Terrence R. Lambert.
- * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_apic.h"
-#include "opt_atpic.h"
-#include "opt_compat.h"
-#include "opt_cpu.h"
-#include "opt_ddb.h"
-#include "opt_inet.h"
-#include "opt_isa.h"
-#include "opt_kstack_pages.h"
-#include "opt_maxmem.h"
-#include "opt_mp_watchdog.h"
-#include "opt_npx.h"
-#include "opt_perfmon.h"
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
-#include <sys/callout.h>
-#include <sys/cons.h>
-#include <sys/cpu.h>
-#include <sys/eventhandler.h>
-#include <sys/exec.h>
-#include <sys/imgact.h>
-#include <sys/kdb.h>
-#include <sys/kernel.h>
-#include <sys/ktr.h>
-#include <sys/linker.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/memrange.h>
-#include <sys/msgbuf.h>
-#include <sys/mutex.h>
-#include <sys/pcpu.h>
-#include <sys/ptrace.h>
-#include <sys/reboot.h>
-#include <sys/rwlock.h>
-#include <sys/sched.h>
-#include <sys/signalvar.h>
-#ifdef SMP
-#include <sys/smp.h>
-#endif
-#include <sys/syscallsubr.h>
-#include <sys/sysctl.h>
-#include <sys/sysent.h>
-#include <sys/sysproto.h>
-#include <sys/ucontext.h>
-#include <sys/vmmeter.h>
-
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-#include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vm_param.h>
-
-#ifdef DDB
-#ifndef KDB
-#error KDB must be enabled in order for DDB to work!
-#endif
-#include <ddb/ddb.h>
-#include <ddb/db_sym.h>
-#endif
-
-#include <pc98/pc98/pc98_machdep.h>
-
-#include <net/netisr.h>
-
-#include <machine/bootinfo.h>
-#include <machine/clock.h>
-#include <machine/cpu.h>
-#include <machine/cputypes.h>
-#include <machine/intr_machdep.h>
-#include <x86/mca.h>
-#include <machine/md_var.h>
-#include <machine/mp_watchdog.h>
-#include <machine/pc/bios.h>
-#include <machine/pcb.h>
-#include <machine/pcb_ext.h>
-#include <machine/proc.h>
-#include <machine/reg.h>
-#include <machine/sigframe.h>
-#include <machine/specialreg.h>
-#include <machine/vm86.h>
-#include <x86/init.h>
-#ifdef PERFMON
-#include <machine/perfmon.h>
-#endif
-#ifdef SMP
-#include <machine/smp.h>
-#endif
-
-#ifdef DEV_APIC
-#include <x86/apicvar.h>
-#endif
-
-#ifdef DEV_ISA
-#include <x86/isa/icu.h>
-#endif
-
-/* Sanity check for __curthread() */
-CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
-
-extern void init386(int first);
-extern void dblfault_handler(void);
-
-#define	CS_SECURE(cs)		(ISPL(cs) == SEL_UPL)
-#define	EFL_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
-
-#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU)
-#define CPU_ENABLE_SSE
-#endif
-
-static void cpu_startup(void *);
-static void fpstate_drop(struct thread *td);
-static void get_fpcontext(struct thread *td, mcontext_t *mcp);
-static int  set_fpcontext(struct thread *td, const mcontext_t *mcp);
-#ifdef CPU_ENABLE_SSE
-static void set_fpregs_xmm(struct save87 *, struct savexmm *);
-static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
-#endif /* CPU_ENABLE_SSE */
-SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
-
-int	need_pre_dma_flush;	/* If 1, use wbinvd befor DMA transfer. */
-int	need_post_dma_flush;	/* If 1, use invd after DMA transfer. */
-
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
-int	_udatasel, _ucodesel;
-u_int	basemem;
-
-static int	ispc98 = 1;
-SYSCTL_INT(_machdep, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, "");
-
-int cold = 1;
-
-#ifdef COMPAT_43
-static void osendsig(sig_t catcher, ksiginfo_t *, sigset_t *mask);
-#endif
-#ifdef COMPAT_FREEBSD4
-static void freebsd4_sendsig(sig_t catcher, ksiginfo_t *, sigset_t *mask);
-#endif
-
-long Maxmem = 0;
-long realmem = 0;
-
-/*
- * The number of PHYSMAP entries must be one less than the number of
- * PHYSSEG entries because the PHYSMAP entry that spans the largest
- * physical address that is accessible by ISA DMA is split into two
- * PHYSSEG entries.
- */
-#define	PHYSMAP_SIZE	(2 * (VM_PHYSSEG_MAX - 1))
-
-vm_paddr_t phys_avail[PHYSMAP_SIZE + 2];
-vm_paddr_t dump_avail[PHYSMAP_SIZE + 2];
-
-/* must be 2 less so 0 0 can signal end of chunks */
-#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2)
-#define DUMP_AVAIL_ARRAY_END ((sizeof(dump_avail) / sizeof(dump_avail[0])) - 2)
-
-struct kva_md_info kmi;
-
-static struct trapframe proc0_tf;
-struct pcpu __pcpu[MAXCPU];
-
-struct mtx icu_lock;
-
-struct mem_range_softc mem_range_softc;
-
- /* Default init_ops implementation. */
- struct init_ops init_ops = {
-	.early_clock_source_init =	i8254_init,
-	.early_delay =			i8254_delay,
- };
-
-static void
-cpu_startup(dummy)
-	void *dummy;
-{
-	uintmax_t memsize;
-
-	/*
-	 * Good {morning,afternoon,evening,night}.
-	 */
-	startrtclock();
-	printcpuinfo();
-	panicifcpuunsupported();
-#ifdef PERFMON
-	perfmon_init();
-#endif
-	realmem = Maxmem;
-
-	/*
-	 * Display physical memory.
-	 */
-	memsize = ptoa((uintmax_t)Maxmem);
-	printf("real memory  = %ju (%ju MB)\n", memsize, memsize >> 20);
-
-	/*
-	 * Display any holes after the first chunk of extended memory.
-	 */
-	if (bootverbose) {
-		int indx;
-
-		printf("Physical memory chunk(s):\n");
-		for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
-			vm_paddr_t size;
-
-			size = phys_avail[indx + 1] - phys_avail[indx];
-			printf(
-			    "0x%016jx - 0x%016jx, %ju bytes (%ju pages)\n",
-			    (uintmax_t)phys_avail[indx],
-			    (uintmax_t)phys_avail[indx + 1] - 1,
-			    (uintmax_t)size, (uintmax_t)size / PAGE_SIZE);
-		}
-	}
-
-	vm_ksubmap_init(&kmi);
-
-	printf("avail memory = %ju (%ju MB)\n",
-	    ptoa((uintmax_t)vm_cnt.v_free_count),
-	    ptoa((uintmax_t)vm_cnt.v_free_count) / 1048576);
-
-	/*
-	 * Set up buffers, so they can be used to read disk labels.
-	 */
-	bufinit();
-	vm_pager_bufferinit();
-	cpu_setregs();
-}
-
-/*
- * Send an interrupt to process.
- *
- * Stack is set up to allow sigcode stored
- * at top to call routine, followed by kcall
- * to sigreturn routine below.  After sigreturn
- * resets the signal mask, the stack, and the
- * frame pointer, it returns to the user
- * specified pc, psl.
- */
-#ifdef COMPAT_43
-static void
-osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
-{
-	struct osigframe sf, *fp;
-	struct proc *p;
-	struct thread *td;
-	struct sigacts *psp;
-	struct trapframe *regs;
-	int sig;
-	int oonstack;
-
-	td = curthread;
-	p = td->td_proc;
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	sig = ksi->ksi_signo;
-	psp = p->p_sigacts;
-	mtx_assert(&psp->ps_mtx, MA_OWNED);
-	regs = td->td_frame;
-	oonstack = sigonstack(regs->tf_esp);
-
-	/* Allocate space for the signal handler context. */
-	if ((td->td_pflags & TDP_ALTSTACK) && !oonstack &&
-	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		fp = (struct osigframe *)(td->td_sigstk.ss_sp +
-		    td->td_sigstk.ss_size - sizeof(struct osigframe));
-#if defined(COMPAT_43)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-#endif
-	} else
-		fp = (struct osigframe *)regs->tf_esp - 1;
-
-	/* Translate the signal if appropriate. */
-	if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize)
-		sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)];
-
-	/* Build the argument list for the signal handler. */
-	sf.sf_signum = sig;
-	sf.sf_scp = (register_t)&fp->sf_siginfo.si_sc;
-	bzero(&sf.sf_siginfo, sizeof(sf.sf_siginfo));
-	if (SIGISMEMBER(psp->ps_siginfo, sig)) {
-		/* Signal handler installed with SA_SIGINFO. */
-		sf.sf_arg2 = (register_t)&fp->sf_siginfo;
-		sf.sf_siginfo.si_signo = sig;
-		sf.sf_siginfo.si_code = ksi->ksi_code;
-		sf.sf_ahu.sf_action = (__osiginfohandler_t *)catcher;
-		sf.sf_addr = 0;
-	} else {
-		/* Old FreeBSD-style arguments. */
-		sf.sf_arg2 = ksi->ksi_code;
-		sf.sf_addr = (register_t)ksi->ksi_addr;
-		sf.sf_ahu.sf_handler = catcher;
-	}
-	mtx_unlock(&psp->ps_mtx);
-	PROC_UNLOCK(p);
-
-	/* Save most if not all of trap frame. */
-	sf.sf_siginfo.si_sc.sc_eax = regs->tf_eax;
-	sf.sf_siginfo.si_sc.sc_ebx = regs->tf_ebx;
-	sf.sf_siginfo.si_sc.sc_ecx = regs->tf_ecx;
-	sf.sf_siginfo.si_sc.sc_edx = regs->tf_edx;
-	sf.sf_siginfo.si_sc.sc_esi = regs->tf_esi;
-	sf.sf_siginfo.si_sc.sc_edi = regs->tf_edi;
-	sf.sf_siginfo.si_sc.sc_cs = regs->tf_cs;
-	sf.sf_siginfo.si_sc.sc_ds = regs->tf_ds;
-	sf.sf_siginfo.si_sc.sc_ss = regs->tf_ss;
-	sf.sf_siginfo.si_sc.sc_es = regs->tf_es;
-	sf.sf_siginfo.si_sc.sc_fs = regs->tf_fs;
-	sf.sf_siginfo.si_sc.sc_gs = rgs();
-	sf.sf_siginfo.si_sc.sc_isp = regs->tf_isp;
-
-	/* Build the signal context to be used by osigreturn(). */
-	sf.sf_siginfo.si_sc.sc_onstack = (oonstack) ? 1 : 0;
-	SIG2OSIG(*mask, sf.sf_siginfo.si_sc.sc_mask);
-	sf.sf_siginfo.si_sc.sc_sp = regs->tf_esp;
-	sf.sf_siginfo.si_sc.sc_fp = regs->tf_ebp;
-	sf.sf_siginfo.si_sc.sc_pc = regs->tf_eip;
-	sf.sf_siginfo.si_sc.sc_ps = regs->tf_eflags;
-	sf.sf_siginfo.si_sc.sc_trapno = regs->tf_trapno;
-	sf.sf_siginfo.si_sc.sc_err = regs->tf_err;
-
-	/*
-	 * If we're a vm86 process, we want to save the segment registers.
-	 * We also change eflags to be our emulated eflags, not the actual
-	 * eflags.
-	 */
-	if (regs->tf_eflags & PSL_VM) {
-		/* XXX confusing names: `tf' isn't a trapframe; `regs' is. */
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-
-		sf.sf_siginfo.si_sc.sc_gs = tf->tf_vm86_gs;
-		sf.sf_siginfo.si_sc.sc_fs = tf->tf_vm86_fs;
-		sf.sf_siginfo.si_sc.sc_es = tf->tf_vm86_es;
-		sf.sf_siginfo.si_sc.sc_ds = tf->tf_vm86_ds;
-
-		if (vm86->vm86_has_vme == 0)
-			sf.sf_siginfo.si_sc.sc_ps =
-			    (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) |
-			    (vm86->vm86_eflags & (PSL_VIF | PSL_VIP));
-
-		/* See sendsig() for comments. */
-		tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP);
-	}
-
-	/*
-	 * Copy the sigframe out to the user's stack.
-	 */
-	if (copyout(&sf, fp, sizeof(*fp)) != 0) {
-#ifdef DEBUG
-		printf("process %ld has trashed its stack\n", (long)p->p_pid);
-#endif
-		PROC_LOCK(p);
-		sigexit(td, SIGILL);
-	}
-
-	regs->tf_esp = (int)fp;
-	if (p->p_sysent->sv_sigcode_base != 0) {
-		regs->tf_eip = p->p_sysent->sv_sigcode_base + szsigcode -
-		    szosigcode;
-	} else {
-		/* a.out sysentvec does not use shared page */
-		regs->tf_eip = p->p_sysent->sv_psstrings - szosigcode;
-	}
-	regs->tf_eflags &= ~(PSL_T | PSL_D);
-	regs->tf_cs = _ucodesel;
-	regs->tf_ds = _udatasel;
-	regs->tf_es = _udatasel;
-	regs->tf_fs = _udatasel;
-	load_gs(_udatasel);
-	regs->tf_ss = _udatasel;
-	PROC_LOCK(p);
-	mtx_lock(&psp->ps_mtx);
-}
-#endif /* COMPAT_43 */
-
-#ifdef COMPAT_FREEBSD4
-static void
-freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
-{
-	struct sigframe4 sf, *sfp;
-	struct proc *p;
-	struct thread *td;
-	struct sigacts *psp;
-	struct trapframe *regs;
-	int sig;
-	int oonstack;
-
-	td = curthread;
-	p = td->td_proc;
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	sig = ksi->ksi_signo;
-	psp = p->p_sigacts;
-	mtx_assert(&psp->ps_mtx, MA_OWNED);
-	regs = td->td_frame;
-	oonstack = sigonstack(regs->tf_esp);
-
-	/* Save user context. */
-	bzero(&sf, sizeof(sf));
-	sf.sf_uc.uc_sigmask = *mask;
-	sf.sf_uc.uc_stack = td->td_sigstk;
-	sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK)
-	    ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE;
-	sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
-	sf.sf_uc.uc_mcontext.mc_gs = rgs();
-	bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs));
-	bzero(sf.sf_uc.uc_mcontext.mc_fpregs,
-	    sizeof(sf.sf_uc.uc_mcontext.mc_fpregs));
-	bzero(sf.sf_uc.uc_mcontext.__spare__,
-	    sizeof(sf.sf_uc.uc_mcontext.__spare__));
-	bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
-
-	/* Allocate space for the signal handler context. */
-	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
-	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		sfp = (struct sigframe4 *)(td->td_sigstk.ss_sp +
-		    td->td_sigstk.ss_size - sizeof(struct sigframe4));
-#if defined(COMPAT_43)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-#endif
-	} else
-		sfp = (struct sigframe4 *)regs->tf_esp - 1;
-
-	/* Translate the signal if appropriate. */
-	if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize)
-		sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)];
-
-	/* Build the argument list for the signal handler. */
-	sf.sf_signum = sig;
-	sf.sf_ucontext = (register_t)&sfp->sf_uc;
-	bzero(&sf.sf_si, sizeof(sf.sf_si));
-	if (SIGISMEMBER(psp->ps_siginfo, sig)) {
-		/* Signal handler installed with SA_SIGINFO. */
-		sf.sf_siginfo = (register_t)&sfp->sf_si;
-		sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher;
-
-		/* Fill in POSIX parts */
-		sf.sf_si.si_signo = sig;
-		sf.sf_si.si_code = ksi->ksi_code;
-		sf.sf_si.si_addr = ksi->ksi_addr;
-	} else {
-		/* Old FreeBSD-style arguments. */
-		sf.sf_siginfo = ksi->ksi_code;
-		sf.sf_addr = (register_t)ksi->ksi_addr;
-		sf.sf_ahu.sf_handler = catcher;
-	}
-	mtx_unlock(&psp->ps_mtx);
-	PROC_UNLOCK(p);
-
-	/*
-	 * If we're a vm86 process, we want to save the segment registers.
-	 * We also change eflags to be our emulated eflags, not the actual
-	 * eflags.
-	 */
-	if (regs->tf_eflags & PSL_VM) {
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-
-		sf.sf_uc.uc_mcontext.mc_gs = tf->tf_vm86_gs;
-		sf.sf_uc.uc_mcontext.mc_fs = tf->tf_vm86_fs;
-		sf.sf_uc.uc_mcontext.mc_es = tf->tf_vm86_es;
-		sf.sf_uc.uc_mcontext.mc_ds = tf->tf_vm86_ds;
-
-		if (vm86->vm86_has_vme == 0)
-			sf.sf_uc.uc_mcontext.mc_eflags =
-			    (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) |
-			    (vm86->vm86_eflags & (PSL_VIF | PSL_VIP));
-
-		/*
-		 * Clear PSL_NT to inhibit T_TSSFLT faults on return from
-		 * syscalls made by the signal handler.  This just avoids
-		 * wasting time for our lazy fixup of such faults.  PSL_NT
-		 * does nothing in vm86 mode, but vm86 programs can set it
-		 * almost legitimately in probes for old cpu types.
-		 */
-		tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP);
-	}
-
-	/*
-	 * Copy the sigframe out to the user's stack.
-	 */
-	if (copyout(&sf, sfp, sizeof(*sfp)) != 0) {
-#ifdef DEBUG
-		printf("process %ld has trashed its stack\n", (long)p->p_pid);
-#endif
-		PROC_LOCK(p);
-		sigexit(td, SIGILL);
-	}
-
-	regs->tf_esp = (int)sfp;
-	regs->tf_eip = p->p_sysent->sv_sigcode_base + szsigcode -
-	    szfreebsd4_sigcode;
-	regs->tf_eflags &= ~(PSL_T | PSL_D);
-	regs->tf_cs = _ucodesel;
-	regs->tf_ds = _udatasel;
-	regs->tf_es = _udatasel;
-	regs->tf_fs = _udatasel;
-	regs->tf_ss = _udatasel;
-	PROC_LOCK(p);
-	mtx_lock(&psp->ps_mtx);
-}
-#endif	/* COMPAT_FREEBSD4 */
-
-void
-sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
-{
-	struct sigframe sf, *sfp;
-	struct proc *p;
-	struct thread *td;
-	struct sigacts *psp;
-	char *sp;
-	struct trapframe *regs;
-	struct segment_descriptor *sdp;
-	int sig;
-	int oonstack;
-
-	td = curthread;
-	p = td->td_proc;
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	sig = ksi->ksi_signo;
-	psp = p->p_sigacts;
-	mtx_assert(&psp->ps_mtx, MA_OWNED);
-#ifdef COMPAT_FREEBSD4
-	if (SIGISMEMBER(psp->ps_freebsd4, sig)) {
-		freebsd4_sendsig(catcher, ksi, mask);
-		return;
-	}
-#endif
-#ifdef COMPAT_43
-	if (SIGISMEMBER(psp->ps_osigset, sig)) {
-		osendsig(catcher, ksi, mask);
-		return;
-	}
-#endif
-	regs = td->td_frame;
-	oonstack = sigonstack(regs->tf_esp);
-
-	/* Save user context. */
-	bzero(&sf, sizeof(sf));
-	sf.sf_uc.uc_sigmask = *mask;
-	sf.sf_uc.uc_stack = td->td_sigstk;
-	sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK)
-	    ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE;
-	sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
-	sf.sf_uc.uc_mcontext.mc_gs = rgs();
-	bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs));
-	sf.sf_uc.uc_mcontext.mc_len = sizeof(sf.sf_uc.uc_mcontext); /* magic */
-	get_fpcontext(td, &sf.sf_uc.uc_mcontext);
-	fpstate_drop(td);
-	/*
-	 * Unconditionally fill the fsbase and gsbase into the mcontext.
-	 */
-	sdp = &td->td_pcb->pcb_fsd;
-	sf.sf_uc.uc_mcontext.mc_fsbase = sdp->sd_hibase << 24 |
-	    sdp->sd_lobase;
-	sdp = &td->td_pcb->pcb_gsd;
-	sf.sf_uc.uc_mcontext.mc_gsbase = sdp->sd_hibase << 24 |
-	    sdp->sd_lobase;
-	sf.sf_uc.uc_mcontext.mc_flags = 0;
-	bzero(sf.sf_uc.uc_mcontext.mc_spare2,
-	    sizeof(sf.sf_uc.uc_mcontext.mc_spare2));
-	bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
-
-	/* Allocate space for the signal handler context. */
-	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
-	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		sp = td->td_sigstk.ss_sp +
-		    td->td_sigstk.ss_size - sizeof(struct sigframe);
-#if defined(COMPAT_43)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-#endif
-	} else
-		sp = (char *)regs->tf_esp - sizeof(struct sigframe);
-	/* Align to 16 bytes. */
-	sfp = (struct sigframe *)((unsigned int)sp & ~0xF);
-
-	/* Translate the signal if appropriate. */
-	if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize)
-		sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)];
-
-	/* Build the argument list for the signal handler. */
-	sf.sf_signum = sig;
-	sf.sf_ucontext = (register_t)&sfp->sf_uc;
-	bzero(&sf.sf_si, sizeof(sf.sf_si));
-	if (SIGISMEMBER(psp->ps_siginfo, sig)) {
-		/* Signal handler installed with SA_SIGINFO. */
-		sf.sf_siginfo = (register_t)&sfp->sf_si;
-		sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher;
-
-		/* Fill in POSIX parts */
-		sf.sf_si = ksi->ksi_info;
-		sf.sf_si.si_signo = sig; /* maybe a translated signal */
-	} else {
-		/* Old FreeBSD-style arguments. */
-		sf.sf_siginfo = ksi->ksi_code;
-		sf.sf_addr = (register_t)ksi->ksi_addr;
-		sf.sf_ahu.sf_handler = catcher;
-	}
-	mtx_unlock(&psp->ps_mtx);
-	PROC_UNLOCK(p);
-
-	/*
-	 * If we're a vm86 process, we want to save the segment registers.
-	 * We also change eflags to be our emulated eflags, not the actual
-	 * eflags.
-	 */
-	if (regs->tf_eflags & PSL_VM) {
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-
-		sf.sf_uc.uc_mcontext.mc_gs = tf->tf_vm86_gs;
-		sf.sf_uc.uc_mcontext.mc_fs = tf->tf_vm86_fs;
-		sf.sf_uc.uc_mcontext.mc_es = tf->tf_vm86_es;
-		sf.sf_uc.uc_mcontext.mc_ds = tf->tf_vm86_ds;
-
-		if (vm86->vm86_has_vme == 0)
-			sf.sf_uc.uc_mcontext.mc_eflags =
-			    (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) |
-			    (vm86->vm86_eflags & (PSL_VIF | PSL_VIP));
-
-		/*
-		 * Clear PSL_NT to inhibit T_TSSFLT faults on return from
-		 * syscalls made by the signal handler.  This just avoids
-		 * wasting time for our lazy fixup of such faults.  PSL_NT
-		 * does nothing in vm86 mode, but vm86 programs can set it
-		 * almost legitimately in probes for old cpu types.
-		 */
-		tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP);
-	}
-
-	/*
-	 * Copy the sigframe out to the user's stack.
-	 */
-	if (copyout(&sf, sfp, sizeof(*sfp)) != 0) {
-#ifdef DEBUG
-		printf("process %ld has trashed its stack\n", (long)p->p_pid);
-#endif
-		PROC_LOCK(p);
-		sigexit(td, SIGILL);
-	}
-
-	regs->tf_esp = (int)sfp;
-	regs->tf_eip = p->p_sysent->sv_sigcode_base;
-	if (regs->tf_eip == 0)
-		regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode;
-	regs->tf_eflags &= ~(PSL_T | PSL_D);
-	regs->tf_cs = _ucodesel;
-	regs->tf_ds = _udatasel;
-	regs->tf_es = _udatasel;
-	regs->tf_fs = _udatasel;
-	regs->tf_ss = _udatasel;
-	PROC_LOCK(p);
-	mtx_lock(&psp->ps_mtx);
-}
-
-/*
- * System call to cleanup state after a signal
- * has been taken.  Reset signal mask and
- * stack state from context left by sendsig (above).
- * Return to previous pc and psl as specified by
- * context left by sendsig. Check carefully to
- * make sure that the user has not modified the
- * state to gain improper privileges.
- *
- * MPSAFE
- */
-#ifdef COMPAT_43
-int
-osigreturn(td, uap)
-	struct thread *td;
-	struct osigreturn_args /* {
-		struct osigcontext *sigcntxp;
-	} */ *uap;
-{
-	struct osigcontext sc;
-	struct trapframe *regs;
-	struct osigcontext *scp;
-	int eflags, error;
-	ksiginfo_t ksi;
-
-	regs = td->td_frame;
-	error = copyin(uap->sigcntxp, &sc, sizeof(sc));
-	if (error != 0)
-		return (error);
-	scp = &sc;
-	eflags = scp->sc_ps;
-	if (eflags & PSL_VM) {
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86;
-
-		/*
-		 * if pcb_ext == 0 or vm86_inited == 0, the user hasn't
-		 * set up the vm86 area, and we can't enter vm86 mode.
-		 */
-		if (td->td_pcb->pcb_ext == 0)
-			return (EINVAL);
-		vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-		if (vm86->vm86_inited == 0)
-			return (EINVAL);
-
-		/* Go back to user mode if both flags are set. */
-		if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) {
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-		}
-
-		if (vm86->vm86_has_vme) {
-			eflags = (tf->tf_eflags & ~VME_USERCHANGE) |
-			    (eflags & VME_USERCHANGE) | PSL_VM;
-		} else {
-			vm86->vm86_eflags = eflags;	/* save VIF, VIP */
-			eflags = (tf->tf_eflags & ~VM_USERCHANGE) |
-			    (eflags & VM_USERCHANGE) | PSL_VM;
-		}
-		tf->tf_vm86_ds = scp->sc_ds;
-		tf->tf_vm86_es = scp->sc_es;
-		tf->tf_vm86_fs = scp->sc_fs;
-		tf->tf_vm86_gs = scp->sc_gs;
-		tf->tf_ds = _udatasel;
-		tf->tf_es = _udatasel;
-		tf->tf_fs = _udatasel;
-	} else {
-		/*
-		 * Don't allow users to change privileged or reserved flags.
-		 */
-		if (!EFL_SECURE(eflags, regs->tf_eflags)) {
-	    		return (EINVAL);
-		}
-
-		/*
-		 * Don't allow users to load a valid privileged %cs.  Let the
-		 * hardware check for invalid selectors, excess privilege in
-		 * other selectors, invalid %eip's and invalid %esp's.
-		 */
-		if (!CS_SECURE(scp->sc_cs)) {
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_trapno = T_PROTFLT;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-			return (EINVAL);
-		}
-		regs->tf_ds = scp->sc_ds;
-		regs->tf_es = scp->sc_es;
-		regs->tf_fs = scp->sc_fs;
-	}
-
-	/* Restore remaining registers. */
-	regs->tf_eax = scp->sc_eax;
-	regs->tf_ebx = scp->sc_ebx;
-	regs->tf_ecx = scp->sc_ecx;
-	regs->tf_edx = scp->sc_edx;
-	regs->tf_esi = scp->sc_esi;
-	regs->tf_edi = scp->sc_edi;
-	regs->tf_cs = scp->sc_cs;
-	regs->tf_ss = scp->sc_ss;
-	regs->tf_isp = scp->sc_isp;
-	regs->tf_ebp = scp->sc_fp;
-	regs->tf_esp = scp->sc_sp;
-	regs->tf_eip = scp->sc_pc;
-	regs->tf_eflags = eflags;
-
-#if defined(COMPAT_43)
-	if (scp->sc_onstack & 1)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-	else
-		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
-#endif
-	kern_sigprocmask(td, SIG_SETMASK, (sigset_t *)&scp->sc_mask, NULL,
-	    SIGPROCMASK_OLD);
-	return (EJUSTRETURN);
-}
-#endif /* COMPAT_43 */
-
-#ifdef COMPAT_FREEBSD4
-/*
- * MPSAFE
- */
-int
-freebsd4_sigreturn(td, uap)
-	struct thread *td;
-	struct freebsd4_sigreturn_args /* {
-		const ucontext4 *sigcntxp;
-	} */ *uap;
-{
-	struct ucontext4 uc;
-	struct trapframe *regs;
-	struct ucontext4 *ucp;
-	int cs, eflags, error;
-	ksiginfo_t ksi;
-
-	error = copyin(uap->sigcntxp, &uc, sizeof(uc));
-	if (error != 0)
-		return (error);
-	ucp = &uc;
-	regs = td->td_frame;
-	eflags = ucp->uc_mcontext.mc_eflags;
-	if (eflags & PSL_VM) {
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86;
-
-		/*
-		 * if pcb_ext == 0 or vm86_inited == 0, the user hasn't
-		 * set up the vm86 area, and we can't enter vm86 mode.
-		 */
-		if (td->td_pcb->pcb_ext == 0)
-			return (EINVAL);
-		vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-		if (vm86->vm86_inited == 0)
-			return (EINVAL);
-
-		/* Go back to user mode if both flags are set. */
-		if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) {
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-		}
-		if (vm86->vm86_has_vme) {
-			eflags = (tf->tf_eflags & ~VME_USERCHANGE) |
-			    (eflags & VME_USERCHANGE) | PSL_VM;
-		} else {
-			vm86->vm86_eflags = eflags;	/* save VIF, VIP */
-			eflags = (tf->tf_eflags & ~VM_USERCHANGE) |
-			    (eflags & VM_USERCHANGE) | PSL_VM;
-		}
-		bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe));
-		tf->tf_eflags = eflags;
-		tf->tf_vm86_ds = tf->tf_ds;
-		tf->tf_vm86_es = tf->tf_es;
-		tf->tf_vm86_fs = tf->tf_fs;
-		tf->tf_vm86_gs = ucp->uc_mcontext.mc_gs;
-		tf->tf_ds = _udatasel;
-		tf->tf_es = _udatasel;
-		tf->tf_fs = _udatasel;
-	} else {
-		/*
-		 * Don't allow users to change privileged or reserved flags.
-		 */
-		if (!EFL_SECURE(eflags, regs->tf_eflags)) {
-			uprintf("pid %d (%s): freebsd4_sigreturn eflags = 0x%x\n",
-			    td->td_proc->p_pid, td->td_name, eflags);
-	    		return (EINVAL);
-		}
-
-		/*
-		 * Don't allow users to load a valid privileged %cs.  Let the
-		 * hardware check for invalid selectors, excess privilege in
-		 * other selectors, invalid %eip's and invalid %esp's.
-		 */
-		cs = ucp->uc_mcontext.mc_cs;
-		if (!CS_SECURE(cs)) {
-			uprintf("pid %d (%s): freebsd4_sigreturn cs = 0x%x\n",
-			    td->td_proc->p_pid, td->td_name, cs);
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_trapno = T_PROTFLT;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-			return (EINVAL);
-		}
-
-		bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
-	}
-
-#if defined(COMPAT_43)
-	if (ucp->uc_mcontext.mc_onstack & 1)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-	else
-		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
-#endif
-	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
-	return (EJUSTRETURN);
-}
-#endif	/* COMPAT_FREEBSD4 */
-
-/*
- * MPSAFE
- */
-int
-sys_sigreturn(td, uap)
-	struct thread *td;
-	struct sigreturn_args /* {
-		const struct __ucontext *sigcntxp;
-	} */ *uap;
-{
-	ucontext_t uc;
-	struct trapframe *regs;
-	ucontext_t *ucp;
-	int cs, eflags, error, ret;
-	ksiginfo_t ksi;
-
-	error = copyin(uap->sigcntxp, &uc, sizeof(uc));
-	if (error != 0)
-		return (error);
-	ucp = &uc;
-	regs = td->td_frame;
-	eflags = ucp->uc_mcontext.mc_eflags;
-	if (eflags & PSL_VM) {
-		struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs;
-		struct vm86_kernel *vm86;
-
-		/*
-		 * if pcb_ext == 0 or vm86_inited == 0, the user hasn't
-		 * set up the vm86 area, and we can't enter vm86 mode.
-		 */
-		if (td->td_pcb->pcb_ext == 0)
-			return (EINVAL);
-		vm86 = &td->td_pcb->pcb_ext->ext_vm86;
-		if (vm86->vm86_inited == 0)
-			return (EINVAL);
-
-		/* Go back to user mode if both flags are set. */
-		if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) {
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-		}
-
-		if (vm86->vm86_has_vme) {
-			eflags = (tf->tf_eflags & ~VME_USERCHANGE) |
-			    (eflags & VME_USERCHANGE) | PSL_VM;
-		} else {
-			vm86->vm86_eflags = eflags;	/* save VIF, VIP */
-			eflags = (tf->tf_eflags & ~VM_USERCHANGE) |
-			    (eflags & VM_USERCHANGE) | PSL_VM;
-		}
-		bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe));
-		tf->tf_eflags = eflags;
-		tf->tf_vm86_ds = tf->tf_ds;
-		tf->tf_vm86_es = tf->tf_es;
-		tf->tf_vm86_fs = tf->tf_fs;
-		tf->tf_vm86_gs = ucp->uc_mcontext.mc_gs;
-		tf->tf_ds = _udatasel;
-		tf->tf_es = _udatasel;
-		tf->tf_fs = _udatasel;
-	} else {
-		/*
-		 * Don't allow users to change privileged or reserved flags.
-		 */
-		if (!EFL_SECURE(eflags, regs->tf_eflags)) {
-			uprintf("pid %d (%s): sigreturn eflags = 0x%x\n",
-			    td->td_proc->p_pid, td->td_name, eflags);
-	    		return (EINVAL);
-		}
-
-		/*
-		 * Don't allow users to load a valid privileged %cs.  Let the
-		 * hardware check for invalid selectors, excess privilege in
-		 * other selectors, invalid %eip's and invalid %esp's.
-		 */
-		cs = ucp->uc_mcontext.mc_cs;
-		if (!CS_SECURE(cs)) {
-			uprintf("pid %d (%s): sigreturn cs = 0x%x\n",
-			    td->td_proc->p_pid, td->td_name, cs);
-			ksiginfo_init_trap(&ksi);
-			ksi.ksi_signo = SIGBUS;
-			ksi.ksi_code = BUS_OBJERR;
-			ksi.ksi_trapno = T_PROTFLT;
-			ksi.ksi_addr = (void *)regs->tf_eip;
-			trapsignal(td, &ksi);
-			return (EINVAL);
-		}
-
-		ret = set_fpcontext(td, &ucp->uc_mcontext);
-		if (ret != 0)
-			return (ret);
-		bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs));
-	}
-
-#if defined(COMPAT_43)
-	if (ucp->uc_mcontext.mc_onstack & 1)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-	else
-		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
-#endif
-
-	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
-	return (EJUSTRETURN);
-}
-
-/*
- * Machine dependent boot() routine
- *
- * I haven't seen anything to put here yet
- * Possibly some stuff might be grafted back here from boot()
- */
-void
-cpu_boot(int howto)
-{
-}
-
-/*
- * Flush the D-cache for non-DMA I/O so that the I-cache can
- * be made coherent later.
- */
-void
-cpu_flush_dcache(void *ptr, size_t len)
-{
-	/* Not applicable */
-}
-
-/* Get current clock frequency for the given cpu id. */
-int
-cpu_est_clockrate(int cpu_id, uint64_t *rate)
-{
-	uint64_t tsc1, tsc2;
-	register_t reg;
-
-	if (pcpu_find(cpu_id) == NULL || rate == NULL)
-		return (EINVAL);
-	if ((cpu_feature & CPUID_TSC) == 0)
-		return (EOPNOTSUPP);
-
-#ifdef SMP
-	if (smp_cpus > 1) {
-		/* Schedule ourselves on the indicated cpu. */
-		thread_lock(curthread);
-		sched_bind(curthread, cpu_id);
-		thread_unlock(curthread);
-	}
-#endif
-
-	/* Calibrate by measuring a short delay. */
-	reg = intr_disable();
-	tsc1 = rdtsc();
-	DELAY(1000);
-	tsc2 = rdtsc();
-	intr_restore(reg);
-	*rate = (tsc2 - tsc1) * 1000;
-
-#ifdef SMP
-	if (smp_cpus > 1) {
-		thread_lock(curthread);
-		sched_unbind(curthread);
-		thread_unlock(curthread);
-	}
-#endif
-
-	return (0);
-}
-
-
-/*
- * Shutdown the CPU as much as possible
- */
-void
-cpu_halt(void)
-{
-	for (;;)
-		halt();
-}
-
-static int	idle_mwait = 1;		/* Use MONITOR/MWAIT for short idle. */
-SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
-    0, "Use MONITOR/MWAIT for short idle");
-
-#define	STATE_RUNNING	0x0
-#define	STATE_MWAIT	0x1
-#define	STATE_SLEEPING	0x2
-
-static void
-cpu_idle_hlt(sbintime_t sbt)
-{
-	int *state;
-
-	state = (int *)PCPU_PTR(monitorbuf);
-	*state = STATE_SLEEPING;
-
-	/*
-	 * Since we may be in a critical section from cpu_idle(), if
-	 * an interrupt fires during that critical section we may have
-	 * a pending preemption.  If the CPU halts, then that thread
-	 * may not execute until a later interrupt awakens the CPU.
-	 * To handle this race, check for a runnable thread after
-	 * disabling interrupts and immediately return if one is
-	 * found.  Also, we must absolutely guarentee that hlt is
-	 * the next instruction after sti.  This ensures that any
-	 * interrupt that fires after the call to disable_intr() will
-	 * immediately awaken the CPU from hlt.  Finally, please note
-	 * that on x86 this works fine because of interrupts enabled only
-	 * after the instruction following sti takes place, while IF is set
-	 * to 1 immediately, allowing hlt instruction to acknowledge the
-	 * interrupt.
-	 */
-	disable_intr();
-	if (sched_runnable())
-		enable_intr();
-	else
-		__asm __volatile("sti; hlt");
-	*state = STATE_RUNNING;
-}
-
-/*
- * MWAIT cpu power states.  Lower 4 bits are sub-states.
- */
-#define	MWAIT_C0	0xf0
-#define	MWAIT_C1	0x00
-#define	MWAIT_C2	0x10
-#define	MWAIT_C3	0x20
-#define	MWAIT_C4	0x30
-
-static void
-cpu_idle_mwait(sbintime_t sbt)
-{
-	int *state;
-
-	state = (int *)PCPU_PTR(monitorbuf);
-	*state = STATE_MWAIT;
-
-	/* See comments in cpu_idle_hlt(). */
-	disable_intr();
-	if (sched_runnable()) {
-		enable_intr();
-		*state = STATE_RUNNING;
-		return;
-	}
-	cpu_monitor(state, 0, 0);
-	if (*state == STATE_MWAIT)
-		__asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0));
-	else
-		enable_intr();
-	*state = STATE_RUNNING;
-}
-
-static void
-cpu_idle_spin(sbintime_t sbt)
-{
-	int *state;
-	int i;
-
-	state = (int *)PCPU_PTR(monitorbuf);
-	*state = STATE_RUNNING;
-
-	/*
-	 * The sched_runnable() call is racy but as long as there is
-	 * a loop missing it one time will have just a little impact if any 
-	 * (and it is much better than missing the check at all).
-	 */
-	for (i = 0; i < 1000; i++) {
-		if (sched_runnable())
-			return;
-		cpu_spinwait();
-	}
-}
-
-void (*cpu_idle_fn)(sbintime_t) = cpu_idle_hlt;
-
-void
-cpu_idle(int busy)
-{
-	sbintime_t sbt = -1;
-
-	CTR2(KTR_SPARE2, "cpu_idle(%d) at %d",
-	    busy, curcpu);
-#if defined(MP_WATCHDOG)
-	ap_watchdog(PCPU_GET(cpuid));
-#endif
-	/* If we are busy - try to use fast methods. */
-	if (busy) {
-		if ((cpu_feature2 & CPUID2_MON) && idle_mwait) {
-			cpu_idle_mwait(busy);
-			goto out;
-		}
-	}
-
-	/* If we have time - switch timers into idle mode. */
-	if (!busy) {
-		critical_enter();
-		sbt = cpu_idleclock();
-	}
-
-	/* Call main idle method. */
-	cpu_idle_fn(sbt);
-
-	/* Switch timers back into active mode. */
-	if (!busy) {
-		cpu_activeclock();
-		critical_exit();
-	}
-out:
-	CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done",
-	    busy, curcpu);
-}
-
-int
-cpu_idle_wakeup(int cpu)
-{
-	struct pcpu *pcpu;
-	int *state;
-
-	pcpu = pcpu_find(cpu);
-	state = (int *)pcpu->pc_monitorbuf;
-	/*
-	 * This doesn't need to be atomic since missing the race will
-	 * simply result in unnecessary IPIs.
-	 */
-	if (*state == STATE_SLEEPING)
-		return (0);
-	if (*state == STATE_MWAIT)
-		*state = STATE_RUNNING;
-	return (1);
-}
-
-/*
- * Ordered by speed/power consumption.
- */
-struct {
-	void	*id_fn;
-	char	*id_name;
-} idle_tbl[] = {
-	{ cpu_idle_spin, "spin" },
-	{ cpu_idle_mwait, "mwait" },
-	{ cpu_idle_hlt, "hlt" },
-	{ NULL, NULL }
-};
-
-static int
-idle_sysctl_available(SYSCTL_HANDLER_ARGS)
-{
-	char *avail, *p;
-	int error;
-	int i;
-
-	avail = malloc(256, M_TEMP, M_WAITOK);
-	p = avail;
-	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
-		if (strstr(idle_tbl[i].id_name, "mwait") &&
-		    (cpu_feature2 & CPUID2_MON) == 0)
-			continue;
-		p += sprintf(p, "%s%s", p != avail ? ", " : "",
-		    idle_tbl[i].id_name);
-	}
-	error = sysctl_handle_string(oidp, avail, 0, req);
-	free(avail, M_TEMP);
-	return (error);
-}
-
-SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
-    0, 0, idle_sysctl_available, "A", "list of available idle functions");
-
-static int
-idle_sysctl(SYSCTL_HANDLER_ARGS)
-{
-	char buf[16];
-	int error;
-	char *p;
-	int i;
-
-	p = "unknown";
-	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
-		if (idle_tbl[i].id_fn == cpu_idle_fn) {
-			p = idle_tbl[i].id_name;
-			break;
-		}
-	}
-	strncpy(buf, p, sizeof(buf));
-	error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
-	if (error != 0 || req->newptr == NULL)
-		return (error);
-	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
-		if (strstr(idle_tbl[i].id_name, "mwait") &&
-		    (cpu_feature2 & CPUID2_MON) == 0)
-			continue;
-		if (strcmp(idle_tbl[i].id_name, buf))
-			continue;
-		cpu_idle_fn = idle_tbl[i].id_fn;
-		return (0);
-	}
-	return (EINVAL);
-}
-
-SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
-    idle_sysctl, "A", "currently selected idle function");
-
-/*
- * Reset registers to default values on exec.
- */
-void
-exec_setregs(struct thread *td, struct image_params *imgp, u_long stack)
-{
-	struct trapframe *regs = td->td_frame;
-	struct pcb *pcb = td->td_pcb;
-
-	/* Reset pc->pcb_gs and %gs before possibly invalidating it. */
-	pcb->pcb_gs = _udatasel;
-	load_gs(_udatasel);
-
-	mtx_lock_spin(&dt_lock);
-	if (td->td_proc->p_md.md_ldt)
-		user_ldt_free(td);
-	else
-		mtx_unlock_spin(&dt_lock);
-  
-	bzero((char *)regs, sizeof(struct trapframe));
-	regs->tf_eip = imgp->entry_addr;
-	regs->tf_esp = stack;
-	regs->tf_eflags = PSL_USER | (regs->tf_eflags & PSL_T);
-	regs->tf_ss = _udatasel;
-	regs->tf_ds = _udatasel;
-	regs->tf_es = _udatasel;
-	regs->tf_fs = _udatasel;
-	regs->tf_cs = _ucodesel;
-
-	/* PS_STRINGS value for BSD/OS binaries.  It is 0 for non-BSD/OS. */
-	regs->tf_ebx = imgp->ps_strings;
-
-        /*
-         * Reset the hardware debug registers if they were in use.
-         * They won't have any meaning for the newly exec'd process.  
-         */
-        if (pcb->pcb_flags & PCB_DBREGS) {
-                pcb->pcb_dr0 = 0;
-                pcb->pcb_dr1 = 0;
-                pcb->pcb_dr2 = 0;
-                pcb->pcb_dr3 = 0;
-                pcb->pcb_dr6 = 0;
-                pcb->pcb_dr7 = 0;
-                if (pcb == curpcb) {
-		        /*
-			 * Clear the debug registers on the running
-			 * CPU, otherwise they will end up affecting
-			 * the next process we switch to.
-			 */
-		        reset_dbregs();
-                }
-                pcb->pcb_flags &= ~PCB_DBREGS;
-        }
-
-	/*
-	 * Initialize the math emulator (if any) for the current process.
-	 * Actually, just clear the bit that says that the emulator has
-	 * been initialized.  Initialization is delayed until the process
-	 * traps to the emulator (if it is done at all) mainly because
-	 * emulators don't provide an entry point for initialization.
-	 */
-	td->td_pcb->pcb_flags &= ~FP_SOFTFP;
-	pcb->pcb_initial_npxcw = __INITIAL_NPXCW__;
-
-	/*
-	 * Drop the FP state if we hold it, so that the process gets a
-	 * clean FP state if it uses the FPU again.
-	 */
-	fpstate_drop(td);
-
-	/*
-	 * XXX - Linux emulator
-	 * Make sure sure edx is 0x0 on entry. Linux binaries depend
-	 * on it.
-	 */
-	td->td_retval[1] = 0;
-}
-
-void
-cpu_setregs(void)
-{
-	unsigned int cr0;
-
-	cr0 = rcr0();
-
-	/*
-	 * CR0_MP, CR0_NE and CR0_TS are set for NPX (FPU) support:
-	 *
-	 * Prepare to trap all ESC (i.e., NPX) instructions and all WAIT
-	 * instructions.  We must set the CR0_MP bit and use the CR0_TS
-	 * bit to control the trap, because setting the CR0_EM bit does
-	 * not cause WAIT instructions to trap.  It's important to trap
-	 * WAIT instructions - otherwise the "wait" variants of no-wait
-	 * control instructions would degenerate to the "no-wait" variants
-	 * after FP context switches but work correctly otherwise.  It's
-	 * particularly important to trap WAITs when there is no NPX -
-	 * otherwise the "wait" variants would always degenerate.
-	 *
-	 * Try setting CR0_NE to get correct error reporting on 486DX's.
-	 * Setting it should fail or do nothing on lesser processors.
-	 */
-	cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM;
-	load_cr0(cr0);
-	load_gs(_udatasel);
-}
-
-u_long bootdev;		/* not a struct cdev *- encoding is different */
-SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev,
-	CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)");
-
-/*
- * Initialize 386 and configure to run kernel
- */
-
-/*
- * Initialize segments & interrupt table
- */
-
-int _default_ldt;
-
-union descriptor gdt[NGDT * MAXCPU];	/* global descriptor table */
-union descriptor ldt[NLDT];		/* local descriptor table */
-static struct gate_descriptor idt0[NIDT];
-struct gate_descriptor *idt = &idt0[0];	/* interrupt descriptor table */
-struct region_descriptor r_gdt, r_idt;	/* table descriptors */
-struct mtx dt_lock;			/* lock for GDT and LDT */
-
-#if defined(I586_CPU) && !defined(NO_F00F_HACK)
-extern int has_f00f_bug;
-#endif
-
-static struct i386tss dblfault_tss;
-static char dblfault_stack[PAGE_SIZE];
-
-extern  vm_offset_t	proc0kstack;
-
-
-/*
- * software prototypes -- in more palatable form.
- *
- * GCODE_SEL through GUDATA_SEL must be in this order for syscall/sysret
- * GUFS_SEL and GUGS_SEL must be in this order (swtch.s knows it)
- */
-struct soft_segment_descriptor gdt_segs[] = {
-/* GNULL_SEL	0 Null Descriptor */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = SEL_KPL,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-/* GPRIV_SEL	1 SMP Per-Processor Private Data Descriptor */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_KPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GUFS_SEL	2 %fs Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GUGS_SEL	3 %gs Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GCODE_SEL	4 Code Descriptor for kernel */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMERA,
-	.ssd_dpl = SEL_KPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GDATA_SEL	5 Data Descriptor for kernel */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_KPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GUCODE_SEL	6 Code Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMERA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GUDATA_SEL	7 Data Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GBIOSLOWMEM_SEL 8 BIOS access to realmode segment 0x40, must be #8 in GDT */
-{	.ssd_base = 0x400,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_KPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GPROC0_SEL	9 Proc 0 Tss Descriptor */
-{
-	.ssd_base = 0x0,
-	.ssd_limit = sizeof(struct i386tss)-1,
-	.ssd_type = SDT_SYS386TSS,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-/* GLDT_SEL	10 LDT Descriptor */
-{	.ssd_base = (int) ldt,
-	.ssd_limit = sizeof(ldt)-1,
-	.ssd_type = SDT_SYSLDT,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-/* GUSERLDT_SEL	11 User LDT Descriptor per process */
-{	.ssd_base = (int) ldt,
-	.ssd_limit = (512 * sizeof(union descriptor)-1),
-	.ssd_type = SDT_SYSLDT,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-/* GPANIC_SEL	12 Panic Tss Descriptor */
-{	.ssd_base = (int) &dblfault_tss,
-	.ssd_limit = sizeof(struct i386tss)-1,
-	.ssd_type = SDT_SYS386TSS,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-/* GBIOSCODE32_SEL 13 BIOS 32-bit interface (32bit Code) */
-{	.ssd_base = 0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMERA,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 1		},
-/* GBIOSCODE16_SEL 14 BIOS 32-bit interface (16bit Code) */
-{	.ssd_base = 0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMERA,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 1		},
-/* GBIOSDATA_SEL 15 BIOS 32-bit interface (Data) */
-{	.ssd_base = 0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-/* GBIOSUTIL_SEL 16 BIOS 16-bit interface (Utility) */
-{	.ssd_base = 0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 1		},
-/* GBIOSARGS_SEL 17 BIOS 16-bit interface (Arguments) */
-{	.ssd_base = 0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = 0,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 1		},
-/* GNDIS_SEL	18 NDIS Descriptor */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = 0,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-};
-
-static struct soft_segment_descriptor ldt_segs[] = {
-	/* Null Descriptor - overwritten by call gate */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = 0,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-	/* Null Descriptor - overwritten by call gate */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = 0,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-	/* Null Descriptor - overwritten by call gate */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = 0,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-	/* Code Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMERA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-	/* Null Descriptor - overwritten by call gate */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0x0,
-	.ssd_type = 0,
-	.ssd_dpl = 0,
-	.ssd_p = 0,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 0,
-	.ssd_gran = 0		},
-	/* Data Descriptor for user */
-{	.ssd_base = 0x0,
-	.ssd_limit = 0xfffff,
-	.ssd_type = SDT_MEMRWA,
-	.ssd_dpl = SEL_UPL,
-	.ssd_p = 1,
-	.ssd_xx = 0, .ssd_xx1 = 0,
-	.ssd_def32 = 1,
-	.ssd_gran = 1		},
-};
-
-void
-setidt(idx, func, typ, dpl, selec)
-	int idx;
-	inthand_t *func;
-	int typ;
-	int dpl;
-	int selec;
-{
-	struct gate_descriptor *ip;
-
-	ip = idt + idx;
-	ip->gd_looffset = (int)func;
-	ip->gd_selector = selec;
-	ip->gd_stkcpy = 0;
-	ip->gd_xx = 0;
-	ip->gd_type = typ;
-	ip->gd_dpl = dpl;
-	ip->gd_p = 1;
-	ip->gd_hioffset = ((int)func)>>16 ;
-}
-
-extern inthand_t
-	IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl),
-	IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm),
-	IDTVEC(tss), IDTVEC(missing), IDTVEC(stk), IDTVEC(prot),
-	IDTVEC(page), IDTVEC(mchk), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align),
-	IDTVEC(xmm),
-#ifdef KDTRACE_HOOKS
-	IDTVEC(dtrace_ret),
-#endif
-	IDTVEC(lcall_syscall), IDTVEC(int0x80_syscall);
-
-#ifdef DDB
-/*
- * Display the index and function name of any IDT entries that don't use
- * the default 'rsvd' entry point.
- */
-DB_SHOW_COMMAND(idt, db_show_idt)
-{
-	struct gate_descriptor *ip;
-	int idx;
-	uintptr_t func;
-
-	ip = idt;
-	for (idx = 0; idx < NIDT && !db_pager_quit; idx++) {
-		func = (ip->gd_hioffset << 16 | ip->gd_looffset);
-		if (func != (uintptr_t)&IDTVEC(rsvd)) {
-			db_printf("%3d\t", idx);
-			db_printsym(func, DB_STGY_PROC);
-			db_printf("\n");
-		}
-		ip++;
-	}
-}
-
-/* Show privileged registers. */
-DB_SHOW_COMMAND(sysregs, db_show_sysregs)
-{
-	uint64_t idtr, gdtr;
-
-	idtr = ridt();
-	db_printf("idtr\t0x%08x/%04x\n",
-	    (u_int)(idtr >> 16), (u_int)idtr & 0xffff);
-	gdtr = rgdt();
-	db_printf("gdtr\t0x%08x/%04x\n",
-	    (u_int)(gdtr >> 16), (u_int)gdtr & 0xffff);
-	db_printf("ldtr\t0x%04x\n", rldt());
-	db_printf("tr\t0x%04x\n", rtr());
-	db_printf("cr0\t0x%08x\n", rcr0());
-	db_printf("cr2\t0x%08x\n", rcr2());
-	db_printf("cr3\t0x%08x\n", rcr3());
-	db_printf("cr4\t0x%08x\n", rcr4());
-}
-#endif
-
-void
-sdtossd(sd, ssd)
-	struct segment_descriptor *sd;
-	struct soft_segment_descriptor *ssd;
-{
-	ssd->ssd_base  = (sd->sd_hibase << 24) | sd->sd_lobase;
-	ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit;
-	ssd->ssd_type  = sd->sd_type;
-	ssd->ssd_dpl   = sd->sd_dpl;
-	ssd->ssd_p     = sd->sd_p;
-	ssd->ssd_def32 = sd->sd_def32;
-	ssd->ssd_gran  = sd->sd_gran;
-}
-
-static void
-basemem_setup(void)
-{
-	vm_paddr_t pa;
-	pt_entry_t *pte;
-	int i;
-
-	if (basemem > 640) {
-		printf("Preposterous BIOS basemem of %uK, truncating to 640K\n",
-			basemem);
-		basemem = 640;
-	}
-
-	/*
-	 * XXX if biosbasemem is now < 640, there is a `hole'
-	 * between the end of base memory and the start of
-	 * ISA memory.  The hole may be empty or it may
-	 * contain BIOS code or data.  Map it read/write so
-	 * that the BIOS can write to it.  (Memory from 0 to
-	 * the physical end of the kernel is mapped read-only
-	 * to begin with and then parts of it are remapped.
-	 * The parts that aren't remapped form holes that
-	 * remain read-only and are unused by the kernel.
-	 * The base memory area is below the physical end of
-	 * the kernel and right now forms a read-only hole.
-	 * The part of it from PAGE_SIZE to
-	 * (trunc_page(biosbasemem * 1024) - 1) will be
-	 * remapped and used by the kernel later.)
-	 *
-	 * This code is similar to the code used in
-	 * pmap_mapdev, but since no memory needs to be
-	 * allocated we simply change the mapping.
-	 */
-	for (pa = trunc_page(basemem * 1024);
-	     pa < ISA_HOLE_START; pa += PAGE_SIZE)
-		pmap_kenter(KERNBASE + pa, pa);
-
-	/*
-	 * Map pages between basemem and ISA_HOLE_START, if any, r/w into
-	 * the vm86 page table so that vm86 can scribble on them using
-	 * the vm86 map too.  XXX: why 2 ways for this and only 1 way for
-	 * page 0, at least as initialized here?
-	 */
-	pte = (pt_entry_t *)vm86paddr;
-	for (i = basemem / 4; i < 160; i++)
-		pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U;
-}
-
-/*
- * Populate the (physmap) array with base/bound pairs describing the
- * available physical memory in the system, then test this memory and
- * build the phys_avail array describing the actually-available memory.
- *
- * If we cannot accurately determine the physical memory map, then use
- * value from the 0xE801 call, and failing that, the RTC.
- *
- * Total memory size may be set by the kernel environment variable
- * hw.physmem or the compile-time define MAXMEM.
- *
- * XXX first should be vm_paddr_t.
- */
-static void
-getmemsize(int first)
-{
-	int off, physmap_idx, pa_indx, da_indx;
-	u_long physmem_tunable, memtest;
-	vm_paddr_t physmap[PHYSMAP_SIZE];
-	pt_entry_t *pte;
-	quad_t dcons_addr, dcons_size;
-	int i;
-	int pg_n;
-	u_int extmem;
-	u_int under16;
-	vm_paddr_t pa;
-
-	bzero(physmap, sizeof(physmap));
-
-	/* XXX - some of EPSON machines can't use PG_N */
-	pg_n = PG_N;
-	if (pc98_machine_type & M_EPSON_PC98) {
-		switch (epson_machine_id) {
-#ifdef WB_CACHE
-		default:
-#endif
-		case EPSON_PC486_HX:
-		case EPSON_PC486_HG:
-		case EPSON_PC486_HA:
-			pg_n = 0;
-			break;
-		}
-	}
-
-	under16 = pc98_getmemsize(&basemem, &extmem);
-	basemem_setup();
-
-	physmap[0] = 0;
-	physmap[1] = basemem * 1024;
-	physmap_idx = 2;
-	physmap[physmap_idx] = 0x100000;
-	physmap[physmap_idx + 1] = physmap[physmap_idx] + extmem * 1024;
-
-	/*
-	 * Now, physmap contains a map of physical memory.
-	 */
-
-#ifdef SMP
-	/* make hole for AP bootstrap code */
-	physmap[1] = mp_bootaddress(physmap[1]);
-#endif
-
-	/*
-	 * Maxmem isn't the "maximum memory", it's one larger than the
-	 * highest page of the physical address space.  It should be
-	 * called something like "Maxphyspage".  We may adjust this 
-	 * based on ``hw.physmem'' and the results of the memory test.
-	 */
-	Maxmem = atop(physmap[physmap_idx + 1]);
-
-#ifdef MAXMEM
-	Maxmem = MAXMEM / 4;
-#endif
-
-	if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable))
-		Maxmem = atop(physmem_tunable);
-
-	/*
-	 * By default keep the memtest enabled.  Use a general name so that
-	 * one could eventually do more with the code than just disable it.
-	 */
-	memtest = 1;
-	TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest);
-
-	if (atop(physmap[physmap_idx + 1]) != Maxmem &&
-	    (boothowto & RB_VERBOSE))
-		printf("Physical memory use set to %ldK\n", Maxmem * 4);
-
-	/*
-	 * If Maxmem has been increased beyond what the system has detected,
-	 * extend the last memory segment to the new limit.
-	 */ 
-	if (atop(physmap[physmap_idx + 1]) < Maxmem)
-		physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem);
-
-	/*
-	 * We need to divide chunk if Maxmem is larger than 16MB and
-	 * under 16MB area is not full of memory.
-	 * (1) system area (15-16MB region) is cut off
-	 * (2) extended memory is only over 16MB area (ex. Melco "HYPERMEMORY")
-	 */
-	if ((under16 != 16 * 1024) && (extmem > 15 * 1024)) {
-		/* 15M - 16M region is cut off, so need to divide chunk */
-		physmap[physmap_idx + 1] = under16 * 1024;
-		physmap_idx += 2;
-		physmap[physmap_idx] = 0x1000000;
-		physmap[physmap_idx + 1] = physmap[2] + extmem * 1024;
-	}
-
-	/* call pmap initialization to make new kernel address space */
-	pmap_bootstrap(first);
-
-	/*
-	 * Size up each available chunk of physical memory.
-	 */
-	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
-	pa_indx = 0;
-	da_indx = 1;
-	phys_avail[pa_indx++] = physmap[0];
-	phys_avail[pa_indx] = physmap[0];
-	dump_avail[da_indx] = physmap[0];
-	pte = CMAP3;
-
-	/*
-	 * Get dcons buffer address
-	 */
-	if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
-	    getenv_quad("dcons.size", &dcons_size) == 0)
-		dcons_addr = 0;
-
-	/*
-	 * physmap is in bytes, so when converting to page boundaries,
-	 * round up the start address and round down the end address.
-	 */
-	for (i = 0; i <= physmap_idx; i += 2) {
-		vm_paddr_t end;
-
-		end = ptoa((vm_paddr_t)Maxmem);
-		if (physmap[i + 1] < end)
-			end = trunc_page(physmap[i + 1]);
-		for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
-			int tmp, page_bad, full;
-			int *ptr = (int *)CADDR3;
-
-			full = FALSE;
-			/*
-			 * block out kernel memory as not available.
-			 */
-			if (pa >= KERNLOAD && pa < first)
-				goto do_dump_avail;
-
-			/*
-			 * block out dcons buffer
-			 */
-			if (dcons_addr > 0
-			    && pa >= trunc_page(dcons_addr)
-			    && pa < dcons_addr + dcons_size)
-				goto do_dump_avail;
-
-			page_bad = FALSE;
-			if (memtest == 0)
-				goto skip_memtest;
-
-			/*
-			 * map page into kernel: valid, read/write,non-cacheable
-			 */
-			*pte = pa | PG_V | PG_RW | pg_n;
-			invltlb();
-
-			tmp = *(int *)ptr;
-			/*
-			 * Test for alternating 1's and 0's
-			 */
-			*(volatile int *)ptr = 0xaaaaaaaa;
-			if (*(volatile int *)ptr != 0xaaaaaaaa)
-				page_bad = TRUE;
-			/*
-			 * Test for alternating 0's and 1's
-			 */
-			*(volatile int *)ptr = 0x55555555;
-			if (*(volatile int *)ptr != 0x55555555)
-				page_bad = TRUE;
-			/*
-			 * Test for all 1's
-			 */
-			*(volatile int *)ptr = 0xffffffff;
-			if (*(volatile int *)ptr != 0xffffffff)
-				page_bad = TRUE;
-			/*
-			 * Test for all 0's
-			 */
-			*(volatile int *)ptr = 0x0;
-			if (*(volatile int *)ptr != 0x0)
-				page_bad = TRUE;
-			/*
-			 * Restore original value.
-			 */
-			*(int *)ptr = tmp;
-
-skip_memtest:
-			/*
-			 * Adjust array of valid/good pages.
-			 */
-			if (page_bad == TRUE)
-				continue;
-			/*
-			 * If this good page is a continuation of the
-			 * previous set of good pages, then just increase
-			 * the end pointer. Otherwise start a new chunk.
-			 * Note that "end" points one higher than end,
-			 * making the range >= start and < end.
-			 * If we're also doing a speculative memory
-			 * test and we at or past the end, bump up Maxmem
-			 * so that we keep going. The first bad page
-			 * will terminate the loop.
-			 */
-			if (phys_avail[pa_indx] == pa) {
-				phys_avail[pa_indx] += PAGE_SIZE;
-			} else {
-				pa_indx++;
-				if (pa_indx == PHYS_AVAIL_ARRAY_END) {
-					printf(
-		"Too many holes in the physical address space, giving up\n");
-					pa_indx--;
-					full = TRUE;
-					goto do_dump_avail;
-				}
-				phys_avail[pa_indx++] = pa;	/* start */
-				phys_avail[pa_indx] = pa + PAGE_SIZE; /* end */
-			}
-			physmem++;
-do_dump_avail:
-			if (dump_avail[da_indx] == pa) {
-				dump_avail[da_indx] += PAGE_SIZE;
-			} else {
-				da_indx++;
-				if (da_indx == DUMP_AVAIL_ARRAY_END) {
-					da_indx--;
-					goto do_next;
-				}
-				dump_avail[da_indx++] = pa;	/* start */
-				dump_avail[da_indx] = pa + PAGE_SIZE; /* end */
-			}
-do_next:
-			if (full)
-				break;
-		}
-	}
-	*pte = 0;
-	invltlb();
-	
-	/*
-	 * XXX
-	 * The last chunk must contain at least one page plus the message
-	 * buffer to avoid complicating other code (message buffer address
-	 * calculation, etc.).
-	 */
-	while (phys_avail[pa_indx - 1] + PAGE_SIZE +
-	    round_page(msgbufsize) >= phys_avail[pa_indx]) {
-		physmem -= atop(phys_avail[pa_indx] - phys_avail[pa_indx - 1]);
-		phys_avail[pa_indx--] = 0;
-		phys_avail[pa_indx--] = 0;
-	}
-
-	Maxmem = atop(phys_avail[pa_indx]);
-
-	/* Trim off space for the message buffer. */
-	phys_avail[pa_indx] -= round_page(msgbufsize);
-
-	/* Map the message buffer. */
-	for (off = 0; off < round_page(msgbufsize); off += PAGE_SIZE)
-		pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] +
-		    off);
-
-	PT_UPDATES_FLUSH();
-}
-
-void
-init386(first)
-	int first;
-{
-	struct gate_descriptor *gdp;
-	int gsel_tss, metadata_missing, x, pa;
-	size_t kstack0_sz;
-	struct pcpu *pc;
-
-	thread0.td_kstack = proc0kstack;
-	thread0.td_kstack_pages = KSTACK_PAGES;
-	kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
-	thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
-
-	/*
- 	 * This may be done better later if it gets more high level
- 	 * components in it. If so just link td->td_proc here.
-	 */
-	proc_linkup0(&proc0, &thread0);
-
-	/*
-	 * Initialize DMAC
-	 */
-	pc98_init_dmac();
-
-	metadata_missing = 0;
-	if (bootinfo.bi_modulep) {
-		preload_metadata = (caddr_t)bootinfo.bi_modulep + KERNBASE;
-		preload_bootstrap_relocate(KERNBASE);
-	} else {
-		metadata_missing = 1;
-	}
-	if (envmode == 1)
-		kern_envp = static_env;
-	else if (bootinfo.bi_envp)
-		kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE;
-
-	/* Init basic tunables, hz etc */
-	init_param1();
-
-	/*
-	 * Make gdt memory segments.  All segments cover the full 4GB
-	 * of address space and permissions are enforced at page level.
-	 */
-	gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GDATA_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GUCODE_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GUDATA_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1);
-
-	pc = &__pcpu[0];
-	gdt_segs[GPRIV_SEL].ssd_limit = atop(0 - 1);
-	gdt_segs[GPRIV_SEL].ssd_base = (int) pc;
-	gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss;
-
-	for (x = 0; x < NGDT; x++)
-		ssdtosd(&gdt_segs[x], &gdt[x].sd);
-
-	r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
-	r_gdt.rd_base =  (int) gdt;
-	mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN);
-	lgdt(&r_gdt);
-
-	pcpu_init(pc, 0, sizeof(struct pcpu));
-	for (pa = first; pa < first + DPCPU_SIZE; pa += PAGE_SIZE)
-		pmap_kenter(pa + KERNBASE, pa);
-	dpcpu_init((void *)(first + KERNBASE), 0);
-	first += DPCPU_SIZE;
-	PCPU_SET(prvspace, pc);
-	PCPU_SET(curthread, &thread0);
-	PCPU_SET(curpcb, thread0.td_pcb);
-
-	/*
-	 * Initialize mutexes.
-	 *
-	 * icu_lock: in order to allow an interrupt to occur in a critical
-	 * 	     section, to set pcpu->ipending (etc...) properly, we
-	 *	     must be able to get the icu lock, so it can't be
-	 *	     under witness.
-	 */
-	mutex_init();
-	mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS | MTX_NOPROFILE);
-
-	/* make ldt memory segments */
-	ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1);
-	ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1);
-	for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++)
-		ssdtosd(&ldt_segs[x], &ldt[x].sd);
-
-	_default_ldt = GSEL(GLDT_SEL, SEL_KPL);
-	lldt(_default_ldt);
-	PCPU_SET(currentldt, _default_ldt);
-
-	/* exceptions */
-	for (x = 0; x < NIDT; x++)
-		setidt(x, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL,
-		    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_DE, &IDTVEC(div),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_DB, &IDTVEC(dbg),  SDT_SYS386IGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_NMI, &IDTVEC(nmi),  SDT_SYS386IGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
- 	setidt(IDT_BP, &IDTVEC(bpt),  SDT_SYS386IGT, SEL_UPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_OF, &IDTVEC(ofl),  SDT_SYS386TGT, SEL_UPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_BR, &IDTVEC(bnd),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_UD, &IDTVEC(ill),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_NM, &IDTVEC(dna),  SDT_SYS386TGT, SEL_KPL
-	    , GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_DF, 0,  SDT_SYSTASKGT, SEL_KPL, GSEL(GPANIC_SEL, SEL_KPL));
-	setidt(IDT_FPUGP, &IDTVEC(fpusegm),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_TS, &IDTVEC(tss),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_NP, &IDTVEC(missing),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_SS, &IDTVEC(stk),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_GP, &IDTVEC(prot),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_PF, &IDTVEC(page),  SDT_SYS386IGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_MF, &IDTVEC(fpu),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_AC, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_MC, &IDTVEC(mchk),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_XF, &IDTVEC(xmm), SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
- 	setidt(IDT_SYSCALL, &IDTVEC(int0x80_syscall), SDT_SYS386TGT, SEL_UPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-#ifdef KDTRACE_HOOKS
-	setidt(IDT_DTRACE_RET, &IDTVEC(dtrace_ret), SDT_SYS386TGT, SEL_UPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-#endif
-
-	r_idt.rd_limit = sizeof(idt0) - 1;
-	r_idt.rd_base = (int) idt;
-	lidt(&r_idt);
-
-	/*
-	 * Initialize the i8254 before the console so that console
-	 * initialization can use DELAY().
-	 */
-	clock_init();
-
-	/*
-	 * Initialize the console before we print anything out.
-	 */
-	cninit();
-
-	if (metadata_missing)
-		printf("WARNING: loader(8) metadata is missing!\n");
-
-#ifdef DEV_ISA
-#ifdef DEV_ATPIC
-	atpic_startup();
-#else
-	/* Reset and mask the atpics and leave them shut down. */
-	atpic_reset();
-
-	/*
-	 * Point the ICU spurious interrupt vectors at the APIC spurious
-	 * interrupt handler.
-	 */
-	setidt(IDT_IO_INTS + 7, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_IO_INTS + 15, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-#endif
-#endif
-
-#ifdef DDB
-	ksym_start = bootinfo.bi_symtab;
-	ksym_end = bootinfo.bi_esymtab;
-#endif
-
-	kdb_init();
-
-#ifdef KDB
-	if (boothowto & RB_KDB)
-		kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger");
-#endif
-
-	finishidentcpu();	/* Final stage of CPU initialization */
-	setidt(IDT_UD, &IDTVEC(ill),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	setidt(IDT_GP, &IDTVEC(prot),  SDT_SYS386TGT, SEL_KPL,
-	    GSEL(GCODE_SEL, SEL_KPL));
-	initializecpu();	/* Initialize CPU registers */
-
-	/* make an initial tss so cpu can get interrupt stack on syscall! */
-	/* Note: -16 is so we can grow the trapframe if we came from vm86 */
-	PCPU_SET(common_tss.tss_esp0, thread0.td_kstack +
-	    kstack0_sz - sizeof(struct pcb) - 16);
-	PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL));
-	gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
-	PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd);
-	PCPU_SET(common_tssd, *PCPU_GET(tss_gdt));
-	PCPU_SET(common_tss.tss_ioopt, (sizeof (struct i386tss)) << 16);
-	ltr(gsel_tss);
-
-	/* pointer to selector slot for %fs/%gs */
-	PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd);
-
-	dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 =
-	    dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)];
-	dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 =
-	    dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL);
-	dblfault_tss.tss_cr3 = (int)IdlePTD;
-	dblfault_tss.tss_eip = (int)dblfault_handler;
-	dblfault_tss.tss_eflags = PSL_KERNEL;
-	dblfault_tss.tss_ds = dblfault_tss.tss_es =
-	    dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL);
-	dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL);
-	dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL);
-	dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL);
-
-	vm86_initialize();
-	getmemsize(first);
-	init_param2(physmem);
-
-	/* now running on new page tables, configured,and u/iom is accessible */
-
-	msgbufinit(msgbufp, msgbufsize);
-
-	/* make a call gate to reenter kernel with */
-	gdp = &ldt[LSYS5CALLS_SEL].gd;
-
-	x = (int) &IDTVEC(lcall_syscall);
-	gdp->gd_looffset = x;
-	gdp->gd_selector = GSEL(GCODE_SEL,SEL_KPL);
-	gdp->gd_stkcpy = 1;
-	gdp->gd_type = SDT_SYS386CGT;
-	gdp->gd_dpl = SEL_UPL;
-	gdp->gd_p = 1;
-	gdp->gd_hioffset = x >> 16;
-
-	/* XXX does this work? */
-	/* XXX yes! */
-	ldt[LBSDICALLS_SEL] = ldt[LSYS5CALLS_SEL];
-	ldt[LSOL26CALLS_SEL] = ldt[LSYS5CALLS_SEL];
-
-	/* transfer to user mode */
-
-	_ucodesel = GSEL(GUCODE_SEL, SEL_UPL);
-	_udatasel = GSEL(GUDATA_SEL, SEL_UPL);
-
-	/* setup proc 0's pcb */
-	thread0.td_pcb->pcb_flags = 0;
-	thread0.td_pcb->pcb_cr3 = (int)IdlePTD;
-	thread0.td_pcb->pcb_ext = 0;
-	thread0.td_frame = &proc0_tf;
-}
-
-void
-cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size)
-{
-
-}
-
-void
-spinlock_enter(void)
-{
-	struct thread *td;
-	register_t flags;
-
-	td = curthread;
-	if (td->td_md.md_spinlock_count == 0) {
-		flags = intr_disable();
-		td->td_md.md_spinlock_count = 1;
-		td->td_md.md_saved_flags = flags;
-	} else
-		td->td_md.md_spinlock_count++;
-	critical_enter();
-}
-
-void
-spinlock_exit(void)
-{
-	struct thread *td;
-	register_t flags;
-
-	td = curthread;
-	critical_exit();
-	flags = td->td_md.md_saved_flags;
-	td->td_md.md_spinlock_count--;
-	if (td->td_md.md_spinlock_count == 0)
-		intr_restore(flags);
-}
-
-#if defined(I586_CPU) && !defined(NO_F00F_HACK)
-static void f00f_hack(void *unused);
-SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL);
-
-static void
-f00f_hack(void *unused)
-{
-	struct gate_descriptor *new_idt;
-	vm_offset_t tmp;
-
-	if (!has_f00f_bug)
-		return;
-
-	GIANT_REQUIRED;
-
-	printf("Intel Pentium detected, installing workaround for F00F bug\n");
-
-	tmp = kmem_malloc(kernel_arena, PAGE_SIZE * 2, M_WAITOK | M_ZERO);
-	if (tmp == 0)
-		panic("kmem_alloc returned 0");
-
-	/* Put the problematic entry (#6) at the end of the lower page. */
-	new_idt = (struct gate_descriptor*)
-	    (tmp + PAGE_SIZE - 7 * sizeof(struct gate_descriptor));
-	bcopy(idt, new_idt, sizeof(idt0));
-	r_idt.rd_base = (u_int)new_idt;
-	lidt(&r_idt);
-	idt = new_idt;
-	pmap_protect(kernel_pmap, tmp, tmp + PAGE_SIZE, VM_PROT_READ);
-}
-#endif /* defined(I586_CPU) && !NO_F00F_HACK */
-
-/*
- * Construct a PCB from a trapframe. This is called from kdb_trap() where
- * we want to start a backtrace from the function that caused us to enter
- * the debugger. We have the context in the trapframe, but base the trace
- * on the PCB. The PCB doesn't have to be perfect, as long as it contains
- * enough for a backtrace.
- */
-void
-makectx(struct trapframe *tf, struct pcb *pcb)
-{
-
-	pcb->pcb_edi = tf->tf_edi;
-	pcb->pcb_esi = tf->tf_esi;
-	pcb->pcb_ebp = tf->tf_ebp;
-	pcb->pcb_ebx = tf->tf_ebx;
-	pcb->pcb_eip = tf->tf_eip;
-	pcb->pcb_esp = (ISPL(tf->tf_cs)) ? tf->tf_esp : (int)(tf + 1) - 8;
-}
-
-int
-ptrace_set_pc(struct thread *td, u_long addr)
-{
-
-	td->td_frame->tf_eip = addr;
-	return (0);
-}
-
-int
-ptrace_single_step(struct thread *td)
-{
-	td->td_frame->tf_eflags |= PSL_T;
-	return (0);
-}
-
-int
-ptrace_clear_single_step(struct thread *td)
-{
-	td->td_frame->tf_eflags &= ~PSL_T;
-	return (0);
-}
-
-int
-fill_regs(struct thread *td, struct reg *regs)
-{
-	struct pcb *pcb;
-	struct trapframe *tp;
-
-	tp = td->td_frame;
-	pcb = td->td_pcb;
-	regs->r_gs = pcb->pcb_gs;
-	return (fill_frame_regs(tp, regs));
-}
-
-int
-fill_frame_regs(struct trapframe *tp, struct reg *regs)
-{
-	regs->r_fs = tp->tf_fs;
-	regs->r_es = tp->tf_es;
-	regs->r_ds = tp->tf_ds;
-	regs->r_edi = tp->tf_edi;
-	regs->r_esi = tp->tf_esi;
-	regs->r_ebp = tp->tf_ebp;
-	regs->r_ebx = tp->tf_ebx;
-	regs->r_edx = tp->tf_edx;
-	regs->r_ecx = tp->tf_ecx;
-	regs->r_eax = tp->tf_eax;
-	regs->r_eip = tp->tf_eip;
-	regs->r_cs = tp->tf_cs;
-	regs->r_eflags = tp->tf_eflags;
-	regs->r_esp = tp->tf_esp;
-	regs->r_ss = tp->tf_ss;
-	return (0);
-}
-
-int
-set_regs(struct thread *td, struct reg *regs)
-{
-	struct pcb *pcb;
-	struct trapframe *tp;
-
-	tp = td->td_frame;
-	if (!EFL_SECURE(regs->r_eflags, tp->tf_eflags) ||
-	    !CS_SECURE(regs->r_cs))
-		return (EINVAL);
-	pcb = td->td_pcb;
-	tp->tf_fs = regs->r_fs;
-	tp->tf_es = regs->r_es;
-	tp->tf_ds = regs->r_ds;
-	tp->tf_edi = regs->r_edi;
-	tp->tf_esi = regs->r_esi;
-	tp->tf_ebp = regs->r_ebp;
-	tp->tf_ebx = regs->r_ebx;
-	tp->tf_edx = regs->r_edx;
-	tp->tf_ecx = regs->r_ecx;
-	tp->tf_eax = regs->r_eax;
-	tp->tf_eip = regs->r_eip;
-	tp->tf_cs = regs->r_cs;
-	tp->tf_eflags = regs->r_eflags;
-	tp->tf_esp = regs->r_esp;
-	tp->tf_ss = regs->r_ss;
-	pcb->pcb_gs = regs->r_gs;
-	return (0);
-}
-
-#ifdef CPU_ENABLE_SSE
-static void
-fill_fpregs_xmm(sv_xmm, sv_87)
-	struct savexmm *sv_xmm;
-	struct save87 *sv_87;
-{
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
-	int i;
-
-	bzero(sv_87, sizeof(*sv_87));
-
-	/* FPU control/status */
-	penv_87->en_cw = penv_xmm->en_cw;
-	penv_87->en_sw = penv_xmm->en_sw;
-	penv_87->en_tw = penv_xmm->en_tw;
-	penv_87->en_fip = penv_xmm->en_fip;
-	penv_87->en_fcs = penv_xmm->en_fcs;
-	penv_87->en_opcode = penv_xmm->en_opcode;
-	penv_87->en_foo = penv_xmm->en_foo;
-	penv_87->en_fos = penv_xmm->en_fos;
-
-	/* FPU registers */
-	for (i = 0; i < 8; ++i)
-		sv_87->sv_ac[i] = sv_xmm->sv_fp[i].fp_acc;
-}
-
-static void
-set_fpregs_xmm(sv_87, sv_xmm)
-	struct save87 *sv_87;
-	struct savexmm *sv_xmm;
-{
-	register struct env87 *penv_87 = &sv_87->sv_env;
-	register struct envxmm *penv_xmm = &sv_xmm->sv_env;
-	int i;
-
-	/* FPU control/status */
-	penv_xmm->en_cw = penv_87->en_cw;
-	penv_xmm->en_sw = penv_87->en_sw;
-	penv_xmm->en_tw = penv_87->en_tw;
-	penv_xmm->en_fip = penv_87->en_fip;
-	penv_xmm->en_fcs = penv_87->en_fcs;
-	penv_xmm->en_opcode = penv_87->en_opcode;
-	penv_xmm->en_foo = penv_87->en_foo;
-	penv_xmm->en_fos = penv_87->en_fos;
-
-	/* FPU registers */
-	for (i = 0; i < 8; ++i)
-		sv_xmm->sv_fp[i].fp_acc = sv_87->sv_ac[i];
-}
-#endif /* CPU_ENABLE_SSE */
-
-int
-fill_fpregs(struct thread *td, struct fpreg *fpregs)
-{
-
-	KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
-	    P_SHOULDSTOP(td->td_proc),
-	    ("not suspended thread %p", td));
-#ifdef DEV_NPX
-	npxgetregs(td);
-#else
-	bzero(fpregs, sizeof(*fpregs));
-#endif
-#ifdef CPU_ENABLE_SSE
-	if (cpu_fxsr)
-		fill_fpregs_xmm(&td->td_pcb->pcb_user_save.sv_xmm,
-		    (struct save87 *)fpregs);
-	else
-#endif /* CPU_ENABLE_SSE */
-		bcopy(&td->td_pcb->pcb_user_save.sv_87, fpregs,
-		    sizeof(*fpregs));
-	return (0);
-}
-
-int
-set_fpregs(struct thread *td, struct fpreg *fpregs)
-{
-
-#ifdef CPU_ENABLE_SSE
-	if (cpu_fxsr)
-		set_fpregs_xmm((struct save87 *)fpregs,
-		    &td->td_pcb->pcb_user_save.sv_xmm);
-	else
-#endif /* CPU_ENABLE_SSE */
-		bcopy(fpregs, &td->td_pcb->pcb_user_save.sv_87,
-		    sizeof(*fpregs));
-#ifdef DEV_NPX
-	npxuserinited(td);
-#endif
-	return (0);
-}
-
-/*
- * Get machine context.
- */
-int
-get_mcontext(struct thread *td, mcontext_t *mcp, int flags)
-{
-	struct trapframe *tp;
-	struct segment_descriptor *sdp;
-
-	tp = td->td_frame;
-
-	PROC_LOCK(curthread->td_proc);
-	mcp->mc_onstack = sigonstack(tp->tf_esp);
-	PROC_UNLOCK(curthread->td_proc);
-	mcp->mc_gs = td->td_pcb->pcb_gs;
-	mcp->mc_fs = tp->tf_fs;
-	mcp->mc_es = tp->tf_es;
-	mcp->mc_ds = tp->tf_ds;
-	mcp->mc_edi = tp->tf_edi;
-	mcp->mc_esi = tp->tf_esi;
-	mcp->mc_ebp = tp->tf_ebp;
-	mcp->mc_isp = tp->tf_isp;
-	mcp->mc_eflags = tp->tf_eflags;
-	if (flags & GET_MC_CLEAR_RET) {
-		mcp->mc_eax = 0;
-		mcp->mc_edx = 0;
-		mcp->mc_eflags &= ~PSL_C;
-	} else {
-		mcp->mc_eax = tp->tf_eax;
-		mcp->mc_edx = tp->tf_edx;
-	}
-	mcp->mc_ebx = tp->tf_ebx;
-	mcp->mc_ecx = tp->tf_ecx;
-	mcp->mc_eip = tp->tf_eip;
-	mcp->mc_cs = tp->tf_cs;
-	mcp->mc_esp = tp->tf_esp;
-	mcp->mc_ss = tp->tf_ss;
-	mcp->mc_len = sizeof(*mcp);
-	get_fpcontext(td, mcp);
-	sdp = &td->td_pcb->pcb_fsd;
-	mcp->mc_fsbase = sdp->sd_hibase << 24 | sdp->sd_lobase;
-	sdp = &td->td_pcb->pcb_gsd;
-	mcp->mc_gsbase = sdp->sd_hibase << 24 | sdp->sd_lobase;
-	mcp->mc_flags = 0;
-	bzero(mcp->mc_spare2, sizeof(mcp->mc_spare2));
-	return (0);
-}
-
-/*
- * Set machine context.
- *
- * However, we don't set any but the user modifiable flags, and we won't
- * touch the cs selector.
- */
-int
-set_mcontext(struct thread *td, const mcontext_t *mcp)
-{
-	struct trapframe *tp;
-	int eflags, ret;
-
-	tp = td->td_frame;
-	if (mcp->mc_len != sizeof(*mcp))
-		return (EINVAL);
-	eflags = (mcp->mc_eflags & PSL_USERCHANGE) |
-	    (tp->tf_eflags & ~PSL_USERCHANGE);
-	if ((ret = set_fpcontext(td, mcp)) == 0) {
-		tp->tf_fs = mcp->mc_fs;
-		tp->tf_es = mcp->mc_es;
-		tp->tf_ds = mcp->mc_ds;
-		tp->tf_edi = mcp->mc_edi;
-		tp->tf_esi = mcp->mc_esi;
-		tp->tf_ebp = mcp->mc_ebp;
-		tp->tf_ebx = mcp->mc_ebx;
-		tp->tf_edx = mcp->mc_edx;
-		tp->tf_ecx = mcp->mc_ecx;
-		tp->tf_eax = mcp->mc_eax;
-		tp->tf_eip = mcp->mc_eip;
-		tp->tf_eflags = eflags;
-		tp->tf_esp = mcp->mc_esp;
-		tp->tf_ss = mcp->mc_ss;
-		td->td_pcb->pcb_gs = mcp->mc_gs;
-		ret = 0;
-	}
-	return (ret);
-}
-
-static void
-get_fpcontext(struct thread *td, mcontext_t *mcp)
-{
-
-#ifndef DEV_NPX
-	mcp->mc_fpformat = _MC_FPFMT_NODEV;
-	mcp->mc_ownedfp = _MC_FPOWNED_NONE;
-	bzero(mcp->mc_fpstate, sizeof(mcp->mc_fpstate));
-#else
-	mcp->mc_ownedfp = npxgetregs(td);
-	bcopy(&td->td_pcb->pcb_user_save, &mcp->mc_fpstate[0],
-	    sizeof(mcp->mc_fpstate));
-	mcp->mc_fpformat = npxformat();
-#endif
-}
-
-static int
-set_fpcontext(struct thread *td, const mcontext_t *mcp)
-{
-
-	if (mcp->mc_fpformat == _MC_FPFMT_NODEV)
-		return (0);
-	else if (mcp->mc_fpformat != _MC_FPFMT_387 &&
-	    mcp->mc_fpformat != _MC_FPFMT_XMM)
-		return (EINVAL);
-	else if (mcp->mc_ownedfp == _MC_FPOWNED_NONE)
-		/* We don't care what state is left in the FPU or PCB. */
-		fpstate_drop(td);
-	else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU ||
-	    mcp->mc_ownedfp == _MC_FPOWNED_PCB) {
-#ifdef DEV_NPX
-#ifdef CPU_ENABLE_SSE
-		if (cpu_fxsr)
-			((union savefpu *)&mcp->mc_fpstate)->sv_xmm.sv_env.
-			    en_mxcsr &= cpu_mxcsr_mask;
-#endif
-		npxsetregs(td, (union savefpu *)&mcp->mc_fpstate);
-#endif
-	} else
-		return (EINVAL);
-	return (0);
-}
-
-static void
-fpstate_drop(struct thread *td)
-{
-
-	KASSERT(PCB_USER_FPU(td->td_pcb), ("fpstate_drop: kernel-owned fpu"));
-	critical_enter();
-#ifdef DEV_NPX
-	if (PCPU_GET(fpcurthread) == td)
-		npxdrop();
-#endif
-	/*
-	 * XXX force a full drop of the npx.  The above only drops it if we
-	 * owned it.  npxgetregs() has the same bug in the !cpu_fxsr case.
-	 *
-	 * XXX I don't much like npxgetregs()'s semantics of doing a full
-	 * drop.  Dropping only to the pcb matches fnsave's behaviour.
-	 * We only need to drop to !PCB_INITDONE in sendsig().  But
-	 * sendsig() is the only caller of npxgetregs()... perhaps we just
-	 * have too many layers.
-	 */
-	curthread->td_pcb->pcb_flags &= ~(PCB_NPXINITDONE |
-	    PCB_NPXUSERINITDONE);
-	critical_exit();
-}
-
-int
-fill_dbregs(struct thread *td, struct dbreg *dbregs)
-{
-	struct pcb *pcb;
-
-	if (td == NULL) {
-		dbregs->dr[0] = rdr0();
-		dbregs->dr[1] = rdr1();
-		dbregs->dr[2] = rdr2();
-		dbregs->dr[3] = rdr3();
-		dbregs->dr[4] = rdr4();
-		dbregs->dr[5] = rdr5();
-		dbregs->dr[6] = rdr6();
-		dbregs->dr[7] = rdr7();
-	} else {
-		pcb = td->td_pcb;
-		dbregs->dr[0] = pcb->pcb_dr0;
-		dbregs->dr[1] = pcb->pcb_dr1;
-		dbregs->dr[2] = pcb->pcb_dr2;
-		dbregs->dr[3] = pcb->pcb_dr3;
-		dbregs->dr[4] = 0;
-		dbregs->dr[5] = 0;
-		dbregs->dr[6] = pcb->pcb_dr6;
-		dbregs->dr[7] = pcb->pcb_dr7;
-	}
-	return (0);
-}
-
-int
-set_dbregs(struct thread *td, struct dbreg *dbregs)
-{
-	struct pcb *pcb;
-	int i;
-
-	if (td == NULL) {
-		load_dr0(dbregs->dr[0]);
-		load_dr1(dbregs->dr[1]);
-		load_dr2(dbregs->dr[2]);
-		load_dr3(dbregs->dr[3]);
-		load_dr4(dbregs->dr[4]);
-		load_dr5(dbregs->dr[5]);
-		load_dr6(dbregs->dr[6]);
-		load_dr7(dbregs->dr[7]);
-	} else {
-		/*
-		 * Don't let an illegal value for dr7 get set.	Specifically,
-		 * check for undefined settings.  Setting these bit patterns
-		 * result in undefined behaviour and can lead to an unexpected
-		 * TRCTRAP.
-		 */
-		for (i = 0; i < 4; i++) {
-			if (DBREG_DR7_ACCESS(dbregs->dr[7], i) == 0x02)
-				return (EINVAL);
-			if (DBREG_DR7_LEN(dbregs->dr[7], i) == 0x02)
-				return (EINVAL);
-		}
-		
-		pcb = td->td_pcb;
-		
-		/*
-		 * Don't let a process set a breakpoint that is not within the
-		 * process's address space.  If a process could do this, it
-		 * could halt the system by setting a breakpoint in the kernel
-		 * (if ddb was enabled).  Thus, we need to check to make sure
-		 * that no breakpoints are being enabled for addresses outside
-		 * process's address space.
-		 *
-		 * XXX - what about when the watched area of the user's
-		 * address space is written into from within the kernel
-		 * ... wouldn't that still cause a breakpoint to be generated
-		 * from within kernel mode?
-		 */
-
-		if (DBREG_DR7_ENABLED(dbregs->dr[7], 0)) {
-			/* dr0 is enabled */
-			if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS)
-				return (EINVAL);
-		}
-			
-		if (DBREG_DR7_ENABLED(dbregs->dr[7], 1)) {
-			/* dr1 is enabled */
-			if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS)
-				return (EINVAL);
-		}
-			
-		if (DBREG_DR7_ENABLED(dbregs->dr[7], 2)) {
-			/* dr2 is enabled */
-			if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS)
-				return (EINVAL);
-		}
-			
-		if (DBREG_DR7_ENABLED(dbregs->dr[7], 3)) {
-			/* dr3 is enabled */
-			if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS)
-				return (EINVAL);
-		}
-
-		pcb->pcb_dr0 = dbregs->dr[0];
-		pcb->pcb_dr1 = dbregs->dr[1];
-		pcb->pcb_dr2 = dbregs->dr[2];
-		pcb->pcb_dr3 = dbregs->dr[3];
-		pcb->pcb_dr6 = dbregs->dr[6];
-		pcb->pcb_dr7 = dbregs->dr[7];
-
-		pcb->pcb_flags |= PCB_DBREGS;
-	}
-
-	return (0);
-}
-
-/*
- * Return > 0 if a hardware breakpoint has been hit, and the
- * breakpoint was in user space.  Return 0, otherwise.
- */
-int
-user_dbreg_trap(void)
-{
-        u_int32_t dr7, dr6; /* debug registers dr6 and dr7 */
-        u_int32_t bp;       /* breakpoint bits extracted from dr6 */
-        int nbp;            /* number of breakpoints that triggered */
-        caddr_t addr[4];    /* breakpoint addresses */
-        int i;
-        
-        dr7 = rdr7();
-        if ((dr7 & 0x000000ff) == 0) {
-                /*
-                 * all GE and LE bits in the dr7 register are zero,
-                 * thus the trap couldn't have been caused by the
-                 * hardware debug registers
-                 */
-                return 0;
-        }
-
-        nbp = 0;
-        dr6 = rdr6();
-        bp = dr6 & 0x0000000f;
-
-        if (!bp) {
-                /*
-                 * None of the breakpoint bits are set meaning this
-                 * trap was not caused by any of the debug registers
-                 */
-                return 0;
-        }
-
-        /*
-         * at least one of the breakpoints were hit, check to see
-         * which ones and if any of them are user space addresses
-         */
-
-        if (bp & 0x01) {
-                addr[nbp++] = (caddr_t)rdr0();
-        }
-        if (bp & 0x02) {
-                addr[nbp++] = (caddr_t)rdr1();
-        }
-        if (bp & 0x04) {
-                addr[nbp++] = (caddr_t)rdr2();
-        }
-        if (bp & 0x08) {
-                addr[nbp++] = (caddr_t)rdr3();
-        }
-
-        for (i = 0; i < nbp; i++) {
-                if (addr[i] < (caddr_t)VM_MAXUSER_ADDRESS) {
-                        /*
-                         * addr[i] is in user space
-                         */
-                        return nbp;
-                }
-        }
-
-        /*
-         * None of the breakpoints are in user space.
-         */
-        return 0;
-}
-
-#ifdef KDB
-
-/*
- * Provide inb() and outb() as functions.  They are normally only available as
- * inline functions, thus cannot be called from the debugger.
- */
-
-/* silence compiler warnings */
-u_char inb_(u_short);
-void outb_(u_short, u_char);
-
-u_char
-inb_(u_short port)
-{
-	return inb(port);
-}
-
-void
-outb_(u_short port, u_char data)
-{
-	outb(port, data);
-}
-
-#endif /* KDB */
diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S
index 65c4999a1e2d..0c26e01125b3 100644
--- a/sys/powerpc/aim/locore64.S
+++ b/sys/powerpc/aim/locore64.S
@@ -160,6 +160,7 @@ ASENTRY_NOPROF(__start)
 	li	8,1
 	insrdi	9,8,1,0
 	mtmsrd	9
+	isync
 	
 	bl	OF_initial_setup
 	nop
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 16b22904075e..17fc452f55e7 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -129,10 +129,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ofw/openfirm.h>
 
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
 int cold = 1;
 #ifdef __powerpc64__
 extern int n_slbs;
@@ -268,6 +264,10 @@ powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
 	#ifndef __powerpc64__
 	int		ppc64;
 	#endif
+#ifdef DDB
+	vm_offset_t ksym_start;
+	vm_offset_t ksym_end;
+#endif
 
 	kmdp = NULL;
 	trap_offset = 0;
@@ -302,6 +302,7 @@ powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
 #ifdef DDB
 			ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t);
 			ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
+			db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
 		}
 	}
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index fc98ed6e1ef7..d3de34c81434 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -142,7 +142,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 
 #ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
+#include <ddb/ddb.h>
 #endif
 
 #ifdef  DEBUG
@@ -300,6 +300,10 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	struct pcpu *pc;
 	void *kmdp, *mdp;
 	vm_offset_t dtbp, end;
+#ifdef DDB
+	vm_offset_t ksym_start;
+	vm_offset_t ksym_end;
+#endif
 
 	kmdp = NULL;
 
@@ -360,6 +364,7 @@ booke_init(uint32_t arg1, uint32_t arg2)
 #ifdef DDB
 			ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t);
 			ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
+			db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
 		}
 	} else {
diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c
index aa943ac11f8e..66fa34163b68 100644
--- a/sys/powerpc/ofw/ofw_pcibus.c
+++ b/sys/powerpc/ofw/ofw_pcibus.c
@@ -200,29 +200,8 @@ ofw_pcibus_enum_devtree(device_t dev, u_int domain, u_int busno)
 		 * interrupts property, so add that value to the device's
 		 * resource list.
 		 */
-		if (dinfo->opd_dinfo.cfg.intpin == 0) {
-			ofw_pci_intr_t intr[2];
-			phandle_t iparent;
-			int icells;
-
-			if (OF_getprop(child, "interrupts", &intr, 
-			    sizeof(intr)) > 0) {
-				iparent = 0;
-				icells = 1;
-				OF_getprop(child, "interrupt-parent", &iparent,
-				    sizeof(iparent));
-				if (iparent != 0) {
-					OF_getprop(OF_node_from_xref(iparent),
-					    "#interrupt-cells", &icells,
-					    sizeof(icells));
-					intr[0] = ofw_bus_map_intr(dev, iparent,
-					    icells, intr);
-				}
-
-				resource_list_add(&dinfo->opd_dinfo.resources,
-				    SYS_RES_IRQ, 0, intr[0], intr[0], 1);
-			}
-		}
+		if (dinfo->opd_dinfo.cfg.intpin == 0)
+			ofw_bus_intr_to_rl(dev, child, &dinfo->opd_dinfo.resources);
 	}
 }
 
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index af3fec884aa5..cc7624f61e4d 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -293,7 +293,7 @@ powerpc_intr_post_ithread(void *arg)
 }
 
 static int
-powerpc_assign_intr_cpu(void *arg, u_char cpu)
+powerpc_assign_intr_cpu(void *arg, int cpu)
 {
 #ifdef SMP
 	struct powerpc_intr *i = arg;
diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c
index 3b34f1832e4c..a22429744158 100644
--- a/sys/powerpc/ps3/if_glc.c
+++ b/sys/powerpc/ps3/if_glc.c
@@ -731,7 +731,7 @@ glc_rxintr(struct glc_softc *sc)
 			restart_rxdma = 1;
 
 		if (sc->sc_rxdmadesc[i].rxerror & GELIC_RXERRORS) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto requeue;
 		}
 
@@ -747,11 +747,11 @@ glc_rxintr(struct glc_softc *sc)
 		}
 
 		if (glc_add_rxbuf(sc, i)) {
-			ifp->if_ierrors++;
+			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			goto requeue;
 		}
 
-		ifp->if_ipackets++;
+		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 		m->m_pkthdr.rcvif = ifp;
 		m->m_len = sc->sc_rxdmadesc[i].valid_size;
 		m->m_pkthdr.len = m->m_len;
@@ -810,7 +810,7 @@ glc_txintr(struct glc_softc *sc)
 		    != 0) {
 			lv1_net_stop_tx_dma(sc->sc_bus, sc->sc_dev, 0);
 			kickstart = 1;
-			ifp->if_oerrors++;
+			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		}
 
 		if (sc->sc_txdmadesc[txs->txs_lastdesc].cmd_stat &
@@ -818,7 +818,7 @@ glc_txintr(struct glc_softc *sc)
 			kickstart = 1;
 
 		STAILQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q);
-		ifp->if_opackets++;
+		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		progress = 1;
 	}
 
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index 1c4f4d850bc4..1b669aa3866a 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -78,6 +78,8 @@ static struct vt_driver vt_ps3fb_driver = {
 	.vd_blank = vt_fb_blank,
 	.vd_bitblt_text = vt_fb_bitblt_text,
 	.vd_bitblt_bmp = vt_fb_bitblt_bitmap,
+	.vd_drawrect = vt_fb_drawrect,
+	.vd_setpixel = vt_fb_setpixel,
 	.vd_fb_ioctl = vt_fb_ioctl,
 	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */
diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c
index 51f2bb14fd3d..0b25f398fb83 100644
--- a/sys/powerpc/pseries/phyp_llan.c
+++ b/sys/powerpc/pseries/phyp_llan.c
@@ -345,13 +345,13 @@ llan_intr(void *xsc)
 
 		/* llan_add_rxbuf does DMA sync and unload as well as requeue */
 		if (llan_add_rxbuf(sc, rx) != 0) {
-			sc->ifp->if_ierrors++;
+			if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1);
 			phyp_hcall(H_ADD_LOGICAL_LAN_BUFFER, sc->unit,
 			    rx->rx_bufdesc);
 			continue;
 		}
 
-		sc->ifp->if_ipackets++;
+		if_inc_counter(sc->ifp, IFCOUNTER_IPACKETS, 1);
 		m_adj(m, sc->rx_buf[sc->rx_dma_slot].offset);
 		m->m_len = sc->rx_buf[sc->rx_dma_slot].length;
 		m->m_pkthdr.rcvif = sc->ifp;
diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c
index d2c399b9581d..8dadd630a196 100644
--- a/sys/powerpc/pseries/vdevice.c
+++ b/sys/powerpc/pseries/vdevice.c
@@ -128,8 +128,6 @@ vdevice_attach(device_t dev)
 {
 	phandle_t root, child;
 	device_t cdev;
-	int icells, i, nintr, *intr;
-	phandle_t iparent;
 	struct vdevice_devinfo *dinfo;
 
 	root = ofw_bus_get_node(dev);
@@ -144,25 +142,7 @@ vdevice_attach(device_t dev)
                 }
 		resource_list_init(&dinfo->mdi_resources);
 
-		if (OF_searchprop(child, "#interrupt-cells", &icells,
-		    sizeof(icells)) <= 0)
-			icells = 2;
-		if (OF_getprop(child, "interrupt-parent", &iparent,
-		    sizeof(iparent)) <= 0)
-			iparent = -1;
-		nintr = OF_getprop_alloc(child, "interrupts", sizeof(*intr),
-		    (void **)&intr);
-		if (nintr > 0) {
-			for (i = 0; i < nintr; i += icells) {
-				u_int irq = intr[i];
-				if (iparent != -1)
-					irq = ofw_bus_map_intr(dev, iparent,
-					    icells, &intr[i]);
-
-				resource_list_add(&dinfo->mdi_resources,
-				    SYS_RES_IRQ, i, irq, irq, i);
-			}
-		}
+		ofw_bus_intr_to_rl(dev, child, &dinfo->mdi_resources);
 
                 cdev = device_add_child(dev, NULL, -1);
                 if (cdev == NULL) {
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index dab11c2d50ef..fe467f0e03d6 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -116,7 +116,7 @@ static void intr_assign_next_cpu(struct intr_vector *iv);
 static void intr_shuffle_irqs(void *arg __unused);
 #endif
 
-static int intr_assign_cpu(void *arg, u_char cpu);
+static int intr_assign_cpu(void *arg, int cpu);
 static void intr_execute_handlers(void *);
 static void intr_stray_level(struct trapframe *);
 static void intr_stray_vector(void *);
@@ -256,7 +256,7 @@ intr_init2()
 }
 
 static int
-intr_assign_cpu(void *arg, u_char cpu)
+intr_assign_cpu(void *arg, int cpu)
 {
 #ifdef SMP
 	struct pcpu *pc;
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 587c90899a7b..0ee6de3a5131 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -114,10 +114,6 @@ __FBSDID("$FreeBSD$");
 
 typedef int ofw_vec_t(void *);
 
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
 int dtlb_slots;
 int itlb_slots;
 struct tlb_entry *kernel_tlbs;
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 86bd40af7de0..f4579055a0dc 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -339,6 +339,7 @@ int	bus_generic_read_ivar(device_t dev, device_t child, int which,
 int	bus_generic_release_resource(device_t bus, device_t child,
 				     int type, int rid, struct resource *r);
 int	bus_generic_resume(device_t dev);
+int	bus_generic_resume_child(device_t dev, device_t child);
 int	bus_generic_setup_intr(device_t dev, device_t child,
 			       struct resource *irq, int flags,
 			       driver_filter_t *filter, driver_intr_t *intr, 
@@ -357,6 +358,7 @@ int	bus_generic_rl_release_resource (device_t, device_t, int, int,
 
 int	bus_generic_shutdown(device_t dev);
 int	bus_generic_suspend(device_t dev);
+int	bus_generic_suspend_child(device_t dev, device_t child);
 int	bus_generic_teardown_intr(device_t dev, device_t child,
 				  struct resource *irq, void *cookie);
 int	bus_generic_write_ivar(device_t dev, device_t child, int which,
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index e1ad341d3b24..ba2b7ceaa98a 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -118,7 +118,7 @@ struct cpuset *cpuset_thread0(void);
 struct cpuset *cpuset_ref(struct cpuset *);
 void	cpuset_rel(struct cpuset *);
 int	cpuset_setthread(lwpid_t id, cpuset_t *);
-int	cpuset_setithread(lwpid_t id, u_char cpu);
+int	cpuset_setithread(lwpid_t id, int cpu);
 int	cpuset_create_root(struct prison *, struct cpuset **);
 int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
 char	*cpusetobj_strprint(char *, const cpuset_t *);
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index e3ffc249cb7c..c4d39c2af31e 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -181,27 +181,17 @@ enum fd_drivetype {
  * XXX: should have been done 20 years ago to make sense.
  */
 #ifdef PC98
-#define FDF_3_1722 21,2,0xFF,0x04,82,0,2,2,0x0C,2,0,FL_MFM
-#define FDF_3_1476 18,2,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
 #define FDF_3_1440 18,2,0xFF,0x1B,80,0,2,2,0x54,1,0,FL_MFM
 #define FDF_3_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_3_820  10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_3_800  10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
 #define FDF_3_720   9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
 #define FDF_3_360   9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
 #define FDF_3_640   8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
 #define FDF_3_1230  8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1280  8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1480  9,3,0xFF,0x35,82,0,0,2,0x47,1,0,FL_MFM
-#define FDF_3_1640 10,3,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
 #define FDF_5_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_5_820  10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_5_800  10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
 #define FDF_5_720   9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
 #define FDF_5_360   9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
 #define FDF_5_640   8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
 #define FDF_5_1230  8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_5_1280  8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
 #else /* PC98 */
 #define FDF_3_2880 36,2,0xFF,0x1B,80,0,FDC_1MBPS,002,0x4C,1,1,FL_MFM|FL_PERPND
 #define FDF_3_1722 21,2,0xFF,0x04,82,0,FDC_500KBPS,2,0x0C,2,0,FL_MFM
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 63072e0a03cf..e593d4326240 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -43,6 +43,7 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 
+struct filedesc;
 struct stat;
 struct thread;
 struct uio;
@@ -70,6 +71,7 @@ struct socket;
 
 struct file;
 struct filecaps;
+struct kinfo_file;
 struct ucred;
 
 #define	FOF_OFFSET	0x01	/* Use the offset in uio argument */
@@ -114,6 +116,8 @@ typedef int fo_sendfile_t(struct file *fp, int sockfd, struct uio *hdr_uio,
 		    struct sendfile_sync *sfs, struct thread *td);
 typedef int fo_seek_t(struct file *fp, off_t offset, int whence,
 		    struct thread *td);
+typedef int fo_fill_kinfo_t(struct file *fp, struct kinfo_file *kif,
+		    struct filedesc *fdp);
 typedef	int fo_flags_t;
 
 struct fileops {
@@ -129,6 +133,7 @@ struct fileops {
 	fo_chown_t	*fo_chown;
 	fo_sendfile_t	*fo_sendfile;
 	fo_seek_t	*fo_seek;
+	fo_fill_kinfo_t	*fo_fill_kinfo;
 	fo_flags_t	fo_flags;	/* DFLAG_* below */
 };
 
@@ -231,13 +236,19 @@ int fget_write(struct thread *td, int fd, cap_rights_t *rightsp,
     struct file **fpp);
 int _fdrop(struct file *fp, struct thread *td);
 
+fo_rdwr_t	invfo_rdwr;
+fo_truncate_t	invfo_truncate;
+fo_ioctl_t	invfo_ioctl;
+fo_poll_t	invfo_poll;
+fo_kqfilter_t	invfo_kqfilter;
 fo_chmod_t	invfo_chmod;
 fo_chown_t	invfo_chown;
 fo_sendfile_t	invfo_sendfile;
-fo_truncate_t	invfo_truncate;
 
 fo_sendfile_t	vn_sendfile;
 fo_seek_t	vn_seek;
+fo_fill_kinfo_t	vn_fill_kinfo;
+int vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif);
 
 void finit(struct file *, u_int, short, void *, struct fileops *);
 int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp,
@@ -374,6 +385,13 @@ fo_seek(struct file *fp, off_t offset, int whence, struct thread *td)
 	return ((*fp->f_ops->fo_seek)(fp, offset, whence, td));
 }
 
+static __inline int
+fo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+{
+
+	return ((*fp->f_ops->fo_fill_kinfo)(fp, kif, fdp));
+}
+
 #endif /* _KERNEL */
 
 #endif /* !SYS_FILE_H */
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index d407cd20f44b..cda6c4ec7303 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -33,11 +33,14 @@
 #ifndef _SYS_FILEDESC_H_
 #define	_SYS_FILEDESC_H_
 
+#include "opt_capsicum.h"
+
 #include <sys/caprights.h>
 #include <sys/queue.h>
 #include <sys/event.h>
 #include <sys/lock.h>
 #include <sys/priority.h>
+#include <sys/seq.h>
 #include <sys/sx.h>
 
 #include <machine/_limits.h>
@@ -50,6 +53,9 @@ struct filecaps {
 };
 
 struct filedescent {
+#ifdef CAPABILITIES
+	seq_t		 fde_seq;		/* if you need fde_file and fde_caps in sync */
+#endif
 	struct file	*fde_file;		/* file structure for open file */
 	struct filecaps	 fde_caps;		/* per-descriptor rights */
 	uint8_t		 fde_flags;		/* per-process open file flags */
@@ -58,6 +64,13 @@ struct filedescent {
 #define	fde_fcntls	fde_caps.fc_fcntls
 #define	fde_ioctls	fde_caps.fc_ioctls
 #define	fde_nioctls	fde_caps.fc_nioctls
+#ifdef CAPABILITIES
+#define	fde_change(fde)	((char *)(fde) + sizeof(seq_t))
+#define	fde_change_size	(sizeof(struct filedescent) - sizeof(seq_t))
+#else
+#define	fde_change(fde)	((fde))
+#define	fde_change_size	(sizeof(struct filedescent))
+#endif
 
 /*
  * This structure is used for the management of descriptors.  It may be
@@ -82,6 +95,9 @@ struct filedesc {
 	int	fd_holdleaderscount;	/* block fdfree() for shared close() */
 	int	fd_holdleaderswakeup;	/* fdfree() needs wakeup */
 };
+#ifdef	CAPABILITIES
+#define	fd_seq(fdp, fd)	(&(fdp)->fd_ofiles[(fd)].fde_seq)
+#endif
 
 /*
  * Structure to keep track of (process leader, struct fildedesc) tuples.
@@ -109,11 +125,6 @@ struct filedesc_to_leader {
 
 #ifdef _KERNEL
 
-/* Flags for do_dup() */
-#define	DUP_FIXED	0x1	/* Force fixed allocation. */
-#define	DUP_FCNTL	0x2	/* fcntl()-style errors. */
-#define	DUP_CLOEXEC	0x4	/* Atomically set FD_CLOEXEC. */
-
 /* Lock a file descriptor table. */
 #define	FILEDESC_LOCK_INIT(fdp)	sx_init(&(fdp)->fd_sx, "filedesc structure")
 #define	FILEDESC_LOCK_DESTROY(fdp)	sx_destroy(&(fdp)->fd_sx)
@@ -137,8 +148,6 @@ void	filecaps_move(struct filecaps *src, struct filecaps *dst);
 void	filecaps_free(struct filecaps *fcaps);
 
 int	closef(struct file *fp, struct thread *td);
-int	do_dup(struct thread *td, int flags, int old, int new,
-	    register_t *retval);
 int	dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode,
 	    int openerror, int *indxp);
 int	falloc(struct thread *td, struct file **resultfp, int *resultfd,
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 3dace82ed3b4..c320e5fc8f12 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -112,13 +112,13 @@ struct intr_event {
 	void		(*ie_pre_ithread)(void *);
 	void		(*ie_post_ithread)(void *);
 	void		(*ie_post_filter)(void *);
-	int		(*ie_assign_cpu)(void *, u_char);
+	int		(*ie_assign_cpu)(void *, int);
 	int		ie_flags;
 	int		ie_count;	/* Loop counter. */
 	int		ie_warncnt;	/* Rate-check interrupt storm warns. */
 	struct timeval	ie_warntm;
 	int		ie_irq;		/* Physical irq number if !SOFT. */
-	u_char		ie_cpu;		/* CPU this event is bound to. */
+	int		ie_cpu;		/* CPU this event is bound to. */
 };
 
 /* Interrupt event flags kept in ie_flags. */
@@ -161,11 +161,11 @@ u_char	intr_priority(enum intr_type flags);
 int	intr_event_add_handler(struct intr_event *ie, const char *name,
 	    driver_filter_t filter, driver_intr_t handler, void *arg, 
 	    u_char pri, enum intr_type flags, void **cookiep);	    
-int	intr_event_bind(struct intr_event *ie, u_char cpu);
+int	intr_event_bind(struct intr_event *ie, int cpu);
 int	intr_event_create(struct intr_event **event, void *source,
 	    int flags, int irq, void (*pre_ithread)(void *),
 	    void (*post_ithread)(void *), void (*post_filter)(void *),
-	    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
+	    int (*assign_cpu)(void *, int), const char *fmt, ...)
 	    __printflike(9, 10);
 int	intr_event_describe_handler(struct intr_event *ie, void *cookie,
 	    const char *descr);
diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h
index c11c8656b64d..b337a2bfb6fb 100644
--- a/sys/sys/ksem.h
+++ b/sys/sys/ksem.h
@@ -63,9 +63,4 @@ struct ksem {
 #define	KS_ANONYMOUS	0x0001		/* Anonymous (unnamed) semaphore. */
 #define	KS_DEAD		0x0002		/* No new waiters allowed. */
 
-#ifdef _KERNEL
-extern void	(*ksem_info)(struct ksem *ks, char *path, size_t size,
-		    uint32_t *value);
-#endif
-
 #endif /* !_POSIX4_KSEM_H_ */
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 5f850fb2da85..ec5f761e7a86 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -103,6 +103,7 @@ int	 locc(int, char *, u_int);
 void	*memchr(const void *s, int c, size_t n);
 void	*memcchr(const void *s, int c, size_t n);
 int	 memcmp(const void *b1, const void *b2, size_t len);
+void	*memmem(const void *l, size_t l_len, const void *s, size_t s_len);
 void	 qsort(void *base, size_t nmemb, size_t size,
 	    int (*compar)(const void *, const void *));
 void	 qsort_r(void *base, size_t nmemb, size_t size, void *thunk,
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 1a64eb037aee..d3e6ce080e1e 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -672,7 +672,7 @@ m_clget(struct mbuf *m, int how)
 {
 
 	if (m->m_flags & M_EXT)
-		printf("%s: %p mbuf already has cluster\n", __func__, m);
+		printf("%s: %p mbuf already has external storage\n", __func__, m);
 	m->m_ext.ext_buf = (char *)NULL;
 	uma_zalloc_arg(zone_clust, m, how);
 	/*
@@ -698,7 +698,7 @@ m_cljget(struct mbuf *m, int how, int size)
 	uma_zone_t zone;
 
 	if (m && m->m_flags & M_EXT)
-		printf("%s: %p mbuf already has cluster\n", __func__, m);
+		printf("%s: %p mbuf already has external storage\n", __func__, m);
 	if (m != NULL)
 		m->m_ext.ext_buf = NULL;
 
@@ -842,30 +842,51 @@ m_last(struct mbuf *m)
 	    ~(sizeof(long) - 1); 					\
 } while (0)
 
+/*
+ * Return the address of the start of the buffer associated with an mbuf,
+ * handling external storage, packet-header mbufs, and regular data mbufs.
+ */
+#define	M_START(m)							\
+	(((m)->m_flags & M_EXT) ? (m)->m_ext.ext_buf :			\
+	 ((m)->m_flags & M_PKTHDR) ? &(m)->m_pktdat[0] :		\
+	 &(m)->m_dat[0])
+
+/*
+ * Return the size of the buffer associated with an mbuf, handling external
+ * storage, packet-header mbufs, and regular data mbufs.
+ */
+#define	M_SIZE(m)							\
+	(((m)->m_flags & M_EXT) ? (m)->m_ext.ext_size :			\
+	 ((m)->m_flags & M_PKTHDR) ? MHLEN :				\
+	 MLEN)
+
 /*
  * Compute the amount of space available before the current start of data in
  * an mbuf.
  *
  * The M_WRITABLE() is a temporary, conservative safety measure: the burden
  * of checking writability of the mbuf data area rests solely with the caller.
+ *
+ * NB: In previous versions, M_LEADINGSPACE() would only check M_WRITABLE()
+ * for mbufs with external storage.  We now allow mbuf-embedded data to be
+ * read-only as well.
  */
 #define	M_LEADINGSPACE(m)						\
-	((m)->m_flags & M_EXT ?						\
-	    (M_WRITABLE(m) ? (m)->m_data - (m)->m_ext.ext_buf : 0):	\
-	    (m)->m_flags & M_PKTHDR ? (m)->m_data - (m)->m_pktdat :	\
-	    (m)->m_data - (m)->m_dat)
+	(M_WRITABLE(m) ? ((m)->m_data - M_START(m)) : 0)
 
 /*
  * Compute the amount of space available after the end of data in an mbuf.
  *
  * The M_WRITABLE() is a temporary, conservative safety measure: the burden
  * of checking writability of the mbuf data area rests solely with the caller.
+ *
+ * NB: In previous versions, M_TRAILINGSPACE() would only check M_WRITABLE()
+ * for mbufs with external storage.  We now allow mbuf-embedded data to be
+ * read-only as well.
  */
 #define	M_TRAILINGSPACE(m)						\
-	((m)->m_flags & M_EXT ?						\
-	    (M_WRITABLE(m) ? (m)->m_ext.ext_buf + (m)->m_ext.ext_size	\
-		- ((m)->m_data + (m)->m_len) : 0) :			\
-	    &(m)->m_dat[MLEN] - ((m)->m_data + (m)->m_len))
+	(M_WRITABLE(m) ?						\
+	    ((M_START(m) + M_SIZE(m)) - ((m)->m_data + (m)->m_len)) : 0)
 
 /*
  * Arrange to prepend space of size plen to mbuf m.  If a new mbuf must be
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index a13e3d1612d5..f0e01b696bb3 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -234,7 +234,6 @@ int	shm_mmap(struct shmfd *shmfd, vm_size_t objsize, vm_ooffset_t foff,
 	    vm_object_t *obj);
 int	shm_map(struct file *fp, size_t size, off_t offset, void **memp);
 int	shm_unmap(struct file *fp, void *mem, size_t size);
-void	shm_path(struct shmfd *shmfd, char *path, size_t size);
 
 #else /* !_KERNEL */
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 50be879486d4..18d92b270108 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100030	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100036	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
@@ -80,6 +80,7 @@
 #define	P_OSREL_SIGWAIT		700000
 #define	P_OSREL_SIGSEGV		700004
 #define	P_OSREL_MAP_ANON	800104
+#define	P_OSREL_MAP_FSTRICT	1100036
 
 #define	P_OSREL_MAJOR(x)	((x) / 100000)
 #endif
diff --git a/sys/sys/seq.h b/sys/sys/seq.h
new file mode 100644
index 000000000000..ba6e80295a48
--- /dev/null
+++ b/sys/sys/seq.h
@@ -0,0 +1,139 @@
+/*-
+ * Copyright (c) 2014 Mateusz Guzik <mjg@FreeBSD.org>
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _SYS_SEQ_H_
+#define _SYS_SEQ_H_
+
+#ifdef _KERNEL
+
+/*
+ * Typical usage:
+ *
+ * writers:
+ * 	lock_exclusive(&obj->lock);
+ * 	seq_write_begin(&obj->seq);
+ * 	.....
+ * 	seq_write_end(&obj->seq);
+ * 	unlock_exclusive(&obj->unlock);
+ *
+ * readers:
+ * 	obj_t lobj;
+ * 	seq_t seq;
+ *
+ * 	for (;;) {
+ * 		seq = seq_read(&gobj->seq);
+ * 		lobj = gobj;
+ * 		if (seq_consistent(&gobj->seq, seq))
+ * 			break;
+ * 		cpu_spinwait();
+ * 	}
+ * 	foo(lobj);
+ */		
+
+typedef uint32_t seq_t;
+
+/* A hack to get MPASS macro */
+#include <sys/systm.h>
+#include <sys/lock.h>
+
+#include <machine/cpu.h>
+
+/*
+ * This is a temporary hack until memory barriers are cleaned up.
+ *
+ * atomic_load_acq_int at least on amd64 provides a full memory barrier,
+ * in a way which affects perforance.
+ *
+ * Hack below covers all architectures and avoids most of the penalty at least
+ * on amd64.
+ */
+static __inline int
+atomic_load_acq_rmb_int(volatile u_int *p)
+{
+	volatile u_int v;
+
+	v = *p;
+	atomic_load_acq_int(&v);
+	return (v);
+}
+
+static __inline bool
+seq_in_modify(seq_t seqp)
+{
+
+	return (seqp & 1);
+}
+
+static __inline void
+seq_write_begin(seq_t *seqp)
+{
+
+	MPASS(!seq_in_modify(*seqp));
+	atomic_add_acq_int(seqp, 1);
+}
+
+static __inline void
+seq_write_end(seq_t *seqp)
+{
+
+	atomic_add_rel_int(seqp, 1);
+	MPASS(!seq_in_modify(*seqp));
+}
+
+static __inline seq_t
+seq_read(seq_t *seqp)
+{
+	seq_t ret;
+
+	for (;;) {
+		ret = atomic_load_acq_rmb_int(seqp);
+		if (seq_in_modify(ret)) {
+			cpu_spinwait();
+			continue;
+		}
+		break;
+	}
+
+	return (ret);
+}
+
+static __inline seq_t
+seq_consistent(seq_t *seqp, seq_t oldseq)
+{
+
+	return (atomic_load_acq_rmb_int(seqp) == oldseq);
+}
+
+static __inline seq_t
+seq_consistent_nomb(seq_t *seqp, seq_t oldseq)
+{
+
+	return (*seqp == oldseq);
+}
+
+#endif	/* _KERNEL */
+#endif	/* _SYS_SEQ_H_ */
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index dcb1b48141c4..cdb7a3985f2a 100644
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -46,13 +46,6 @@
  * call sleepq_set_timeout() after sleepq_add() to setup a timeout.  It
  * should then use one of the sleepq_timedwait() functions to block.
  *
- * If the thread wants the sleep to be interruptible by signals, it can
- * call sleepq_catch_signals() after sleepq_add().  It should then use
- * one of the sleepq_wait_sig() functions to block.  After the thread has
- * been resumed, it should call sleepq_calc_signal_retval() to determine
- * if it should return EINTR or ERESTART passing in the value returned from
- * the earlier call to sleepq_catch_signals().
- *
  * A thread is normally resumed from a sleep queue by either the
  * sleepq_signal() or sleepq_broadcast() functions.  Sleepq_signal() wakes
  * the thread with the highest priority that is sleeping on the specified
diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h
index 877b5307ee2e..ef80e9c14571 100644
--- a/sys/sys/sockbuf.h
+++ b/sys/sys/sockbuf.h
@@ -158,6 +158,8 @@ int	sbreserve_locked(struct sockbuf *sb, u_long cc, struct socket *so,
 	    struct thread *td);
 struct mbuf *
 	sbsndptr(struct sockbuf *sb, u_int off, u_int len, u_int *moff);
+struct mbuf *
+	sbsndmbuf(struct sockbuf *sb, u_int off, u_int *moff);
 void	sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb);
 int	sbwait(struct sockbuf *sb);
 int	sblock(struct sockbuf *sb, int flags);
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index bc447ab3bda5..05e9be832f24 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -97,6 +97,7 @@ int	kern_fchmodat(struct thread *td, int fd, char *path,
 int	kern_fchownat(struct thread *td, int fd, char *path,
 	    enum uio_seg pathseg, int uid, int gid, int flag);
 int	kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg);
+int	kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg);
 int	kern_fhstat(struct thread *td, fhandle_t fh, struct stat *buf);
 int	kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf);
 int	kern_fstat(struct thread *td, int fd, struct stat *sbp);
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index d9d13a812756..4b75fcc77e62 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -2,6 +2,7 @@
  ***********************************************************************
  *								       *
  * Copyright (c) David L. Mills 1993-2001			       *
+ * Copyright (c) Poul-Henning Kamp 2000-2001                           *
  *								       *
  * Permission to use, copy, modify, and distribute this software and   *
  * its documentation for any purpose and without fee is hereby	       *
@@ -15,94 +16,30 @@
  * purpose. It is provided "as is" without express or implied	       *
  * warranty.							       *
  *								       *
- **********************************************************************/
-
-/*
- * Modification history timex.h
- *
- * 16 Aug 00	David L. Mills
- *	API Version 4. Added MOD_TAI and tai member of ntptimeval
- *	structure.
- *
- * 17 Nov 98	David L. Mills
- *	Revised for nanosecond kernel and user interface.
- *
- * 26 Sep 94	David L. Mills
- *	Added defines for hybrid phase/frequency-lock loop.
- *
- * 19 Mar 94	David L. Mills
- *	Moved defines from kernel routines to header file and added new
- *	defines for PPS phase-lock loop.
- *
- * 20 Feb 94	David L. Mills
- *	Revised status codes and structures for external clock and PPS
- *	signal discipline.
- *
- * 28 Nov 93	David L. Mills
- *	Adjusted parameters to improve stability and increase poll
- *	interval.
- *
- * 17 Sep 93    David L. Mills
- *      Created file
+ ***********************************************************************
  *
  * $FreeBSD$
- */
-/*
+ *
  * This header file defines the Network Time Protocol (NTP) interfaces
- * for user and daemon application programs. These are implemented using
- * defined syscalls and data structures and require specific kernel
- * support.
+ * for user and daemon application programs.
  *
- * The original precision time kernels developed from 1993 have an
- * ultimate resolution of one microsecond; however, the most recent
- * kernels have an ultimate resolution of one nanosecond. In these
- * kernels, a ntp_adjtime() syscalls can be used to determine which
- * resolution is in use and to select either one at any time. The
- * resolution selected affects the scaling of certain fields in the
- * ntp_gettime() and ntp_adjtime() syscalls, as described below.
+ * This file was originally created 17 Sep 93 by David L. Mills, Professor
+ * of University of Delaware, building on work which had already been ongoing
+ * for a decade and a half at that point in time.
  *
- * NAME
- *	ntp_gettime - NTP user application interface
+ * In 2000 the APIs got a upgrade from microseconds to nanoseconds,
+ * a joint work between Poul-Henning Kamp and David L. Mills.
  *
- * SYNOPSIS
- *	#include <sys/timex.h>
- *
- *	int ntp_gettime(struct ntptimeval *ntv);
- *
- * DESCRIPTION
- *	The time returned by ntp_gettime() is in a timespec structure,
- *	but may be in either microsecond (seconds and microseconds) or
- *	nanosecond (seconds and nanoseconds) format. The particular
- *	format in use is determined by the STA_NANO bit of the status
- *	word returned by the ntp_adjtime() syscall.
- *
- * NAME
- *	ntp_adjtime - NTP daemon application interface
- *
- * SYNOPSIS
- *	#include <sys/timex.h>
- *	#include <sys/syscall.h>
- *
- *	int syscall(SYS_ntp_adjtime, tptr);
- *	int SYS_ntp_adjtime;
- *	struct timex *tptr;
- *
- * DESCRIPTION
- *	Certain fields of the timex structure are interpreted in either
- *	microseconds or nanoseconds according to the state of the
- *	STA_NANO bit in the status word. See the description below for
- *	further information.
  */
+
 #ifndef _SYS_TIMEX_H_
 #define _SYS_TIMEX_H_ 1
-#define NTP_API		4	/* NTP API version */
+
+#define NTP_API		4		/* NTP API version */
 
 #ifdef __FreeBSD__
 #include <sys/_timespec.h>
 #endif /* __FreeBSD__ */
-#ifndef MSDOS			/* Microsoft specific */
-#include <sys/syscall.h>
-#endif /* MSDOS */
 
 /*
  * The following defines establish the performance envelope of the
@@ -113,112 +50,107 @@
  * mode. Between these two limits the operating mode is selected by the
  * STA_FLL bit in the status word.
  */
-#define MAXPHASE	500000000L /* max phase error (ns) */
-#define MAXFREQ		500000L	/* max freq error (ns/s) */
-#define MINSEC		256	/* min FLL update interval (s) */
-#define MAXSEC		2048	/* max PLL update interval (s) */
-#define NANOSECOND	1000000000L /* nanoseconds in one second */
-#define SCALE_PPM	(65536 / 1000) /* crude ns/s to scaled PPM */
-#define MAXTC		10	/* max time constant */
+
+#define MAXPHASE	500000000L	/* max phase error (ns) */
+#define MAXFREQ		500000L		/* max freq error (ns/s) */
+#define MINSEC		256		/* min FLL update interval (s) */
+#define MAXSEC		2048		/* max PLL update interval (s) */
+#define NANOSECOND	1000000000L	/* nanoseconds in one second */
+#define SCALE_PPM	(65536 / 1000)	/* crude ns/s to scaled PPM */
+#define MAXTC		10		/* max time constant */
 
 /*
- * The following defines and structures define the user interface for
- * the ntp_gettime() and ntp_adjtime() syscalls.
- *
  * Control mode codes (timex.modes)
  */
-#define MOD_OFFSET	0x0001	/* set time offset */
-#define MOD_FREQUENCY	0x0002	/* set frequency offset */
-#define MOD_MAXERROR	0x0004	/* set maximum time error */
-#define MOD_ESTERROR	0x0008	/* set estimated time error */
-#define MOD_STATUS	0x0010	/* set clock status bits */
-#define MOD_TIMECONST	0x0020	/* set PLL time constant */
-#define MOD_PPSMAX	0x0040	/* set PPS maximum averaging time */
-#define MOD_TAI		0x0080	/* set TAI offset */
-#define	MOD_MICRO	0x1000	/* select microsecond resolution */
-#define	MOD_NANO	0x2000	/* select nanosecond resolution */
-#define MOD_CLKB	0x4000	/* select clock B */
-#define MOD_CLKA	0x8000	/* select clock A */
+#define MOD_OFFSET	0x0001		/* set time offset */
+#define MOD_FREQUENCY	0x0002		/* set frequency offset */
+#define MOD_MAXERROR	0x0004		/* set maximum time error */
+#define MOD_ESTERROR	0x0008		/* set estimated time error */
+#define MOD_STATUS	0x0010		/* set clock status bits */
+#define MOD_TIMECONST	0x0020		/* set PLL time constant */
+#define MOD_PPSMAX	0x0040		/* set PPS maximum averaging time */
+#define MOD_TAI		0x0080		/* set TAI offset */
+#define	MOD_MICRO	0x1000		/* select microsecond resolution */
+#define	MOD_NANO	0x2000		/* select nanosecond resolution */
+#define MOD_CLKB	0x4000		/* select clock B */
+#define MOD_CLKA	0x8000		/* select clock A */
 
 /*
  * Status codes (timex.status)
  */
-#define STA_PLL		0x0001	/* enable PLL updates (rw) */
-#define STA_PPSFREQ	0x0002	/* enable PPS freq discipline (rw) */
-#define STA_PPSTIME	0x0004	/* enable PPS time discipline (rw) */
-#define STA_FLL		0x0008	/* enable FLL mode (rw) */
-#define STA_INS		0x0010	/* insert leap (rw) */
-#define STA_DEL		0x0020	/* delete leap (rw) */
-#define STA_UNSYNC	0x0040	/* clock unsynchronized (rw) */
-#define STA_FREQHOLD	0x0080	/* hold frequency (rw) */
-#define STA_PPSSIGNAL	0x0100	/* PPS signal present (ro) */
-#define STA_PPSJITTER	0x0200	/* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER	0x0400	/* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR	0x0800	/* PPS signal calibration error (ro) */
-#define STA_CLOCKERR	0x1000	/* clock hardware fault (ro) */
-#define STA_NANO	0x2000	/* resolution (0 = us, 1 = ns) (ro) */
-#define STA_MODE	0x4000	/* mode (0 = PLL, 1 = FLL) (ro) */
-#define STA_CLK		0x8000	/* clock source (0 = A, 1 = B) (ro) */
+#define STA_PLL		0x0001		/* enable PLL updates (rw) */
+#define STA_PPSFREQ	0x0002		/* enable PPS freq discipline (rw) */
+#define STA_PPSTIME	0x0004		/* enable PPS time discipline (rw) */
+#define STA_FLL		0x0008		/* enable FLL mode (rw) */
+#define STA_INS		0x0010		/* insert leap (rw) */
+#define STA_DEL		0x0020		/* delete leap (rw) */
+#define STA_UNSYNC	0x0040		/* clock unsynchronized (rw) */
+#define STA_FREQHOLD	0x0080		/* hold frequency (rw) */
+#define STA_PPSSIGNAL	0x0100		/* PPS signal present (ro) */
+#define STA_PPSJITTER	0x0200		/* PPS signal jitter exceeded (ro) */
+#define STA_PPSWANDER	0x0400		/* PPS signal wander exceeded (ro) */
+#define STA_PPSERROR	0x0800		/* PPS signal calibration error (ro) */
+#define STA_CLOCKERR	0x1000		/* clock hardware fault (ro) */
+#define STA_NANO	0x2000		/* resolution (0 = us, 1 = ns) (ro) */
+#define STA_MODE	0x4000		/* mode (0 = PLL, 1 = FLL) (ro) */
+#define STA_CLK		0x8000		/* clock source (0 = A, 1 = B) (ro) */
 
 #define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
     STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
 
 /*
- * Clock states (time_state)
+ * Clock states (ntptimeval.time_state)
  */
-#define TIME_OK		0	/* no leap second warning */
-#define TIME_INS	1	/* insert leap second warning */
-#define TIME_DEL	2	/* delete leap second warning */
-#define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occured */
-#define TIME_ERROR	5	/* error (see status word) */
+#define TIME_OK		0		/* no leap second warning */
+#define TIME_INS	1		/* insert leap second warning */
+#define TIME_DEL	2		/* delete leap second warning */
+#define TIME_OOP	3		/* leap second in progress */
+#define TIME_WAIT	4		/* leap second has occured */
+#define TIME_ERROR	5		/* error (see status word) */
 
 /*
- * NTP user interface (ntp_gettime()) - used to read kernel clock values
- *
- * Note: The time member is in microseconds if STA_NANO is zero and
- * nanoseconds if not.
+ * NTP user interface -- ntp_gettime(2) - used to read kernel clock values
  */
 struct ntptimeval {
-	struct timespec time;	/* current time (ns) (ro) */
-	long maxerror;		/* maximum error (us) (ro) */
-	long esterror;		/* estimated error (us) (ro) */
-	long tai;		/* TAI offset */
-	int time_state;		/* time status */
+	struct timespec time;		/* current time (ns) (ro) */
+	long maxerror;			/* maximum error (us) (ro) */
+	long esterror;			/* estimated error (us) (ro) */
+	long tai;			/* TAI offset */
+	int time_state;			/* time status */
 };
 
 /*
- * NTP daemon interface (ntp_adjtime()) - used to discipline CPU clock
- * oscillator and determine status.
+ * NTP daemon interface -- ntp_adjtime(2) -- used to discipline CPU clock
+ * oscillator and control/determine status.
  *
  * Note: The offset, precision and jitter members are in microseconds if
  * STA_NANO is zero and nanoseconds if not.
  */
 struct timex {
-	unsigned int modes;	/* clock mode bits (wo) */
-	long	offset;		/* time offset (ns/us) (rw) */
-	long	freq;		/* frequency offset (scaled PPM) (rw) */
-	long	maxerror;	/* maximum error (us) (rw) */
-	long	esterror;	/* estimated error (us) (rw) */
-	int	status;		/* clock status bits (rw) */
-	long	constant;	/* poll interval (log2 s) (rw) */
-	long	precision;	/* clock precision (ns/us) (ro) */
-	long	tolerance;	/* clock frequency tolerance (scaled
-				 * PPM) (ro) */
+	unsigned int modes;		/* clock mode bits (wo) */
+	long	offset;			/* time offset (ns/us) (rw) */
+	long	freq;			/* frequency offset (scaled PPM) (rw) */
+	long	maxerror;		/* maximum error (us) (rw) */
+	long	esterror;		/* estimated error (us) (rw) */
+	int	status;			/* clock status bits (rw) */
+	long	constant;		/* poll interval (log2 s) (rw) */
+	long	precision;		/* clock precision (ns/us) (ro) */
+	long	tolerance;		/* clock frequency tolerance (scaled
+				 	 * PPM) (ro) */
 	/*
 	 * The following read-only structure members are implemented
 	 * only if the PPS signal discipline is configured in the
 	 * kernel. They are included in all configurations to insure
 	 * portability.
 	 */
-	long	ppsfreq;	/* PPS frequency (scaled PPM) (ro) */
-	long	jitter;		/* PPS jitter (ns/us) (ro) */
-	int	shift;		/* interval duration (s) (shift) (ro) */
-	long	stabil;		/* PPS stability (scaled PPM) (ro) */
-	long	jitcnt;		/* jitter limit exceeded (ro) */
-	long	calcnt;		/* calibration intervals (ro) */
-	long	errcnt;		/* calibration errors (ro) */
-	long	stbcnt;		/* stability limit exceeded (ro) */
+	long	ppsfreq;		/* PPS frequency (scaled PPM) (ro) */
+	long	jitter;			/* PPS jitter (ns/us) (ro) */
+	int	shift;			/* interval duration (s) (shift) (ro) */
+	long	stabil;			/* PPS stability (scaled PPM) (ro) */
+	long	jitcnt;			/* jitter limit exceeded (ro) */
+	long	calcnt;			/* calibration intervals (ro) */
+	long	errcnt;			/* calibration errors (ro) */
+	long	stbcnt;			/* stability limit exceeded (ro) */
 };
 
 #ifdef __FreeBSD__
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index acddfc089da8..6b0729510bc1 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -503,7 +503,9 @@ extern struct vnodeop_desc *vnodeop_descs[];
  * reliable since if the thread sleeps between changing the lock
  * state and checking it with the assert, some other thread could
  * change the state.  They are good enough for debugging a single
- * filesystem using a single-threaded test.
+ * filesystem using a single-threaded test.  Note that the unreliability is
+ * limited to false negatives; efforts were made to ensure that false
+ * positives cannot occur.
  */
 void	assert_vi_locked(struct vnode *vp, const char *str);
 void	assert_vi_unlocked(struct vnode *vp, const char *str);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 423d811689f6..0dd4d1691c0d 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -104,7 +104,6 @@ extern int	ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone);
 #endif
 static vop_fsync_t	ffs_fsync;
 static vop_lock1_t	ffs_lock;
-static vop_getpages_t	ffs_getpages;
 static vop_read_t	ffs_read;
 static vop_write_t	ffs_write;
 static int	ffs_extread(struct vnode *vp, struct uio *uio, int ioflag);
@@ -124,7 +123,7 @@ static vop_vptofh_t	ffs_vptofh;
 struct vop_vector ffs_vnodeops1 = {
 	.vop_default =		&ufs_vnodeops,
 	.vop_fsync =		ffs_fsync,
-	.vop_getpages =		ffs_getpages,
+	.vop_getpages =		vnode_pager_local_getpages,
 	.vop_lock1 =		ffs_lock,
 	.vop_read =		ffs_read,
 	.vop_reallocblks =	ffs_reallocblks,
@@ -143,7 +142,7 @@ struct vop_vector ffs_fifoops1 = {
 struct vop_vector ffs_vnodeops2 = {
 	.vop_default =		&ufs_vnodeops,
 	.vop_fsync =		ffs_fsync,
-	.vop_getpages =		ffs_getpages,
+	.vop_getpages =		vnode_pager_local_getpages,
 	.vop_lock1 =		ffs_lock,
 	.vop_read =		ffs_read,
 	.vop_reallocblks =	ffs_reallocblks,
@@ -846,48 +845,6 @@ ffs_write(ap)
 	return (error);
 }
 
-/*
- * get page routine
- */
-static int
-ffs_getpages(ap)
-	struct vop_getpages_args *ap;
-{
-	int i;
-	vm_page_t mreq;
-	int pcount;
-
-	pcount = round_page(ap->a_count) / PAGE_SIZE;
-	mreq = ap->a_m[ap->a_reqpage];
-
-	/*
-	 * if ANY DEV_BSIZE blocks are valid on a large filesystem block,
-	 * then the entire page is valid.  Since the page may be mapped,
-	 * user programs might reference data beyond the actual end of file
-	 * occuring within the page.  We have to zero that data.
-	 */
-	VM_OBJECT_WLOCK(mreq->object);
-	if (mreq->valid) {
-		if (mreq->valid != VM_PAGE_BITS_ALL)
-			vm_page_zero_invalid(mreq, TRUE);
-		for (i = 0; i < pcount; i++) {
-			if (i != ap->a_reqpage) {
-				vm_page_lock(ap->a_m[i]);
-				vm_page_free(ap->a_m[i]);
-				vm_page_unlock(ap->a_m[i]);
-			}
-		}
-		VM_OBJECT_WUNLOCK(mreq->object);
-		return VM_PAGER_OK;
-	}
-	VM_OBJECT_WUNLOCK(mreq->object);
-
-	return vnode_pager_generic_getpages(ap->a_vp, ap->a_m,
-					    ap->a_count,
-					    ap->a_reqpage);
-}
-
-
 /*
  * Extended attribute area reading.
  */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 68ae0d2f4829..b8d67bd30a3e 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -133,6 +133,8 @@ static void _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min,
 static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map);
 static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
 static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry);
+static void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
+    vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags);
 #ifdef INVARIANTS
 static void vm_map_zdtor(void *mem, int size, void *arg);
 static void vmspace_zdtor(void *mem, int size, void *arg);
@@ -1809,7 +1811,7 @@ vm_map_submap(
  *	being created speculatively, cached pages are not reactivated and
  *	mapped.
  */
-void
+static void
 vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
     vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags)
 {
@@ -2195,7 +2197,14 @@ vm_map_madvise(
 
 			vm_object_madvise(current->object.vm_object, pstart,
 			    pend, behav);
-			if (behav == MADV_WILLNEED) {
+
+			/*
+			 * Pre-populate paging structures in the
+			 * WILLNEED case.  For wired entries, the
+			 * paging structures are already populated.
+			 */
+			if (behav == MADV_WILLNEED &&
+			    current->wired_count == 0) {
 				vm_map_pmap_enter(map,
 				    useStart,
 				    current->protection,
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 8cced057ea12..3bf7a6719ad8 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -302,9 +302,8 @@ long vmspace_resident_count(struct vmspace *vmspace);
 #endif	/* _KERNEL */
 
 
-/* XXX: number of kernel maps and entries to statically allocate */
+/* XXX: number of kernel maps to statically allocate */
 #define MAX_KMAP	10
-#define	MAX_KMAPENT	128
 
 /*
  * Copy-on-write flags for vm_map operations
@@ -380,15 +379,13 @@ int vm_map_lookup_locked(vm_map_t *, vm_offset_t, vm_prot_t, vm_map_entry_t *, v
     vm_pindex_t *, vm_prot_t *, boolean_t *);
 void vm_map_lookup_done (vm_map_t, vm_map_entry_t);
 boolean_t vm_map_lookup_entry (vm_map_t, vm_offset_t, vm_map_entry_t *);
-void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
-    vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags);
 int vm_map_protect (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t);
 int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t);
+void vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry);
 void vm_map_startup (void);
 int vm_map_submap (vm_map_t, vm_offset_t, vm_offset_t, vm_map_t);
 int vm_map_sync(vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t);
 int vm_map_madvise (vm_map_t, vm_offset_t, vm_offset_t, int);
-void vm_map_simplify_entry (vm_map_t, vm_map_entry_t);
 int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int);
 int vm_map_growstack (struct proc *p, vm_offset_t addr);
 int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 1ae7189b97ca..9506efedf385 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -203,17 +203,17 @@ sys_mmap(td, uap)
 	struct vnode *vp;
 	vm_offset_t addr;
 	vm_size_t size, pageoff;
-	vm_prot_t cap_maxprot, prot, maxprot;
+	vm_prot_t cap_maxprot, maxprot;
 	void *handle;
 	objtype_t handle_type;
-	int align, error, flags;
+	int align, error, flags, prot;
 	off_t pos;
 	struct vmspace *vms = td->td_proc->p_vmspace;
 	cap_rights_t rights;
 
 	addr = (vm_offset_t) uap->addr;
 	size = uap->len;
-	prot = uap->prot & VM_PROT_ALL;
+	prot = uap->prot;
 	flags = uap->flags;
 	pos = uap->pos;
 
@@ -244,8 +244,21 @@ sys_mmap(td, uap)
 		flags |= MAP_ANON;
 		pos = 0;
 	}
+	if ((flags & ~(MAP_SHARED | MAP_PRIVATE | MAP_FIXED | MAP_RENAME |
+	    MAP_NORESERVE | MAP_HASSEMAPHORE | MAP_STACK | MAP_NOSYNC |
+	    MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ |
+#ifdef MAP_32BIT
+	    MAP_32BIT |
+#endif
+	    MAP_ALIGNMENT_MASK)) != 0)
+		return (EINVAL);
 	if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL)
 		return (EINVAL);
+	if ((flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE))
+		return (EINVAL);
+	if (prot != PROT_NONE &&
+	    (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0)
+		return (EINVAL);
 
 	/*
 	 * Align the file position to a page boundary,
@@ -342,6 +355,11 @@ sys_mmap(td, uap)
 		error = fget_mmap(td, uap->fd, &rights, &cap_maxprot, &fp);
 		if (error != 0)
 			goto done;
+		if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 &&
+		    td->td_proc->p_osrel >= P_OSREL_MAP_FSTRICT) {
+			error = EINVAL;
+			goto done;
+		}
 		if (fp->f_type == DTYPE_SHM) {
 			handle = fp->f_data;
 			handle_type = OBJT_SWAP;
@@ -415,6 +433,8 @@ sys_mmap(td, uap)
 map:
 	td->td_fpop = fp;
 	maxprot &= cap_maxprot;
+
+	/* This relies on VM_PROT_* matching PROT_*. */
 	error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot,
 	    flags, handle_type, handle, pos);
 	td->td_fpop = NULL;
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 48ba743bf2ec..ab3c7d3af30f 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -199,7 +199,7 @@ struct vm_object {
 
 #define OBJPC_SYNC	0x1			/* sync I/O */
 #define OBJPC_INVAL	0x2			/* invalidate */
-#define OBJPC_NOSYNC	0x4			/* skip if PG_NOSYNC */
+#define OBJPC_NOSYNC	0x4			/* skip if VPO_NOSYNC */
 
 /*
  * The following options are supported by vm_object_page_remove().
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 9835d8d60c58..ca9d7f9a3b5b 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -76,6 +76,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_vm.h"
+#include "opt_kdtrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -89,6 +90,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/racct.h>
 #include <sys/resourcevar.h>
 #include <sys/sched.h>
+#include <sys/sdt.h>
 #include <sys/signalvar.h>
 #include <sys/smp.h>
 #include <sys/vnode.h>
@@ -133,6 +135,10 @@ static struct kproc_desc page_kp = {
 SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_SECOND, kproc_start,
     &page_kp);
 
+SDT_PROVIDER_DEFINE(vm);
+SDT_PROBE_DEFINE(vm, , , vm__lowmem_cache);
+SDT_PROBE_DEFINE(vm, , , vm__lowmem_scan);
+
 #if !defined(NO_SWAPPING)
 /* the kernel process "vm_daemon"*/
 static void vm_daemon(void);
@@ -667,6 +673,7 @@ vm_pageout_grow_cache(int tries, vm_paddr_t low, vm_paddr_t high)
 		 * may acquire locks and/or sleep, so they can only be invoked
 		 * when "tries" is greater than zero.
 		 */
+		SDT_PROBE0(vm, , , vm__lowmem_cache);
 		EVENTHANDLER_INVOKE(vm_lowmem, 0);
 
 		/*
@@ -916,10 +923,11 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 	 * some.  We rate limit to avoid thrashing.
 	 */
 	if (vmd == &vm_dom[0] && pass > 0 &&
-	    lowmem_ticks + (lowmem_period * hz) < ticks) {
+	    (ticks - lowmem_ticks) / hz >= lowmem_period) {
 		/*
 		 * Decrease registered cache sizes.
 		 */
+		SDT_PROBE0(vm, , , vm__lowmem_scan);
 		EVENTHANDLER_INVOKE(vm_lowmem, 0);
 		/*
 		 * We do this explicitly after the caches have been
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index c7d038b090ec..65193c3d31a7 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -281,6 +281,33 @@ vm_pager_object_lookup(struct pagerlst *pg_list, void *handle)
 	return (object);
 }
 
+/*
+ * Free the non-requested pages from the given array.
+ */
+void
+vm_pager_free_nonreq(vm_object_t object, vm_page_t ma[], int reqpage,
+    int npages)
+{
+	int i;
+	boolean_t object_locked;
+
+	VM_OBJECT_ASSERT_UNLOCKED(object);
+	object_locked = FALSE;
+	for (i = 0; i < npages; ++i) {
+		if (i != reqpage) {
+			if (!object_locked) {
+				VM_OBJECT_WLOCK(object);
+				object_locked = TRUE;
+			}
+			vm_page_lock(ma[i]);
+			vm_page_free(ma[i]);
+			vm_page_unlock(ma[i]);
+		}
+	}
+	if (object_locked)
+		VM_OBJECT_WUNLOCK(object);
+}
+
 /*
  * initialize a physical buffer
  */
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 62265a23d277..e3d292d745af 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -106,6 +106,8 @@ static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int);
 static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *);
 void vm_pager_init(void);
 vm_object_t vm_pager_object_lookup(struct pagerlst *, void *);
+void vm_pager_free_nonreq(vm_object_t object, vm_page_t ma[], int reqpage,
+    int npages);
 
 /*
  *	vm_page_get_pages:
diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c
index 2a38d0175207..4d35a4f53aa9 100644
--- a/sys/vm/vm_reserv.c
+++ b/sys/vm/vm_reserv.c
@@ -364,7 +364,7 @@ vm_reserv_populate(vm_reserv_t rv, int index)
 
 /*
  * Allocates a contiguous set of physical pages of the given size "npages"
- * from an existing or newly-created reservation.  All of the physical pages
+ * from existing or newly created reservations.  All of the physical pages
  * must be at or above the given physical address "low" and below the given
  * physical address "high".  The given value "alignment" determines the
  * alignment of the first physical page in the set.  If the given value
@@ -436,8 +436,8 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
 
 	/*
 	 * Could at least one reservation fit between the first index to the
-	 * left that can be used and the first index to the right that cannot
-	 * be used?
+	 * left that can be used ("leftcap") and the first index to the right
+	 * that cannot be used ("rightcap")?
 	 */
 	first = pindex - VM_RESERV_INDEX(object, pindex);
 	if (mpred != NULL) {
@@ -459,6 +459,13 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
 		if (first + maxpages > rightcap) {
 			if (maxpages == VM_LEVEL_0_NPAGES)
 				return (NULL);
+
+			/*
+			 * At least one reservation will fit between "leftcap"
+			 * and "rightcap".  However, a reservation for the
+			 * last of the requested pages will not fit.  Reduce
+			 * the size of the upcoming allocation accordingly.
+			 */
 			allocpages = minpages;
 		}
 	}
@@ -482,16 +489,23 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
 	}
 
 	/*
-	 * Allocate and populate the new reservations.  The alignment and
-	 * boundary specified for this allocation may be different from the
-	 * alignment and boundary specified for the requested pages.  For
-	 * instance, the specified index may not be the first page within the
-	 * first new reservation.
+	 * Allocate the physical pages.  The alignment and boundary specified
+	 * for this allocation may be different from the alignment and
+	 * boundary specified for the requested pages.  For instance, the
+	 * specified index may not be the first page within the first new
+	 * reservation.
 	 */
 	m = vm_phys_alloc_contig(allocpages, low, high, ulmax(alignment,
 	    VM_LEVEL_0_SIZE), boundary > VM_LEVEL_0_SIZE ? boundary : 0);
 	if (m == NULL)
 		return (NULL);
+
+	/*
+	 * The allocated physical pages always begin at a reservation
+	 * boundary, but they do not always end at a reservation boundary.
+	 * Initialize every reservation that is completely covered by the
+	 * allocated physical pages.
+	 */
 	m_ret = NULL;
 	index = VM_RESERV_INDEX(object, pindex);
 	do {
@@ -525,7 +539,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
 		m += VM_LEVEL_0_NPAGES;
 		first += VM_LEVEL_0_NPAGES;
 		allocpages -= VM_LEVEL_0_NPAGES;
-	} while (allocpages > 0);
+	} while (allocpages >= VM_LEVEL_0_NPAGES);
 	return (m_ret);
 
 	/*
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 8058bdb4279c..050f1b0a8196 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -83,7 +83,7 @@ static int vnode_pager_input_smlfs(vm_object_t object, vm_page_t m);
 static int vnode_pager_input_old(vm_object_t object, vm_page_t m);
 static void vnode_pager_dealloc(vm_object_t);
 static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int);
-static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *);
+static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, int, int *);
 static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *);
 static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t,
     vm_ooffset_t, struct ucred *cred);
@@ -657,13 +657,46 @@ vnode_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 
 	vp = object->handle;
 	VM_OBJECT_WUNLOCK(object);
-	rtval = VOP_GETPAGES(vp, m, bytes, reqpage, 0);
+	rtval = VOP_GETPAGES(vp, m, bytes, reqpage);
 	KASSERT(rtval != EOPNOTSUPP,
 	    ("vnode_pager: FS getpages not implemented\n"));
 	VM_OBJECT_WLOCK(object);
 	return rtval;
 }
 
+/*
+ * The implementation of VOP_GETPAGES() for local filesystems, where
+ * partially valid pages can only occur at the end of file.
+ */
+int
+vnode_pager_local_getpages(struct vop_getpages_args *ap)
+{
+	vm_page_t mreq;
+
+	mreq = ap->a_m[ap->a_reqpage];
+
+	/*
+	 * Since the caller has busied the requested page, that page's valid
+	 * field will not be changed by other threads.
+	 */
+	vm_page_assert_xbusied(mreq);
+
+	/*
+	 * The requested page has valid blocks.  Invalid part can only
+	 * exist at the end of file, and the page is made fully valid
+	 * by zeroing in vm_pager_getpages().  Free non-requested
+	 * pages, since no i/o is done to read its content.
+	 */
+	if (mreq->valid != 0) {
+		vm_pager_free_nonreq(mreq->object, ap->a_m, ap->a_reqpage,
+		    round_page(ap->a_count) / PAGE_SIZE);
+		return (VM_PAGER_OK);
+	}
+
+	return (vnode_pager_generic_getpages(ap->a_vp, ap->a_m,
+	    ap->a_count, ap->a_reqpage));
+}
+
 /*
  * This is now called from local media FS's to operate against their
  * own vnodes if they fail to implement VOP_GETPAGES.
@@ -722,14 +755,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
 		VM_OBJECT_WUNLOCK(object);
 		return (error);
 	} else if (error != 0) {
-		VM_OBJECT_WLOCK(object);
-		for (i = 0; i < count; i++)
-			if (i != reqpage) {
-				vm_page_lock(m[i]);
-				vm_page_free(m[i]);
-				vm_page_unlock(m[i]);
-			}
-		VM_OBJECT_WUNLOCK(object);
+		vm_pager_free_nonreq(object, m, reqpage, count);
 		return (VM_PAGER_ERROR);
 
 		/*
@@ -739,38 +765,31 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
 		 */
 	} else if ((PAGE_SIZE / bsize) > 1 &&
 	    (vp->v_mount->mnt_stat.f_type != nfs_mount_type)) {
-		VM_OBJECT_WLOCK(object);
-		for (i = 0; i < count; i++)
-			if (i != reqpage) {
-				vm_page_lock(m[i]);
-				vm_page_free(m[i]);
-				vm_page_unlock(m[i]);
-			}
-		VM_OBJECT_WUNLOCK(object);
+		vm_pager_free_nonreq(object, m, reqpage, count);
 		PCPU_INC(cnt.v_vnodein);
 		PCPU_INC(cnt.v_vnodepgsin);
 		return vnode_pager_input_smlfs(object, m[reqpage]);
 	}
 
+	/*
+	 * Since the caller has busied the requested page, that page's valid
+	 * field will not be changed by other threads.
+	 */
+	vm_page_assert_xbusied(m[reqpage]);
+
 	/*
 	 * If we have a completely valid page available to us, we can
 	 * clean up and return.  Otherwise we have to re-read the
 	 * media.
 	 */
-	VM_OBJECT_WLOCK(object);
 	if (m[reqpage]->valid == VM_PAGE_BITS_ALL) {
-		for (i = 0; i < count; i++)
-			if (i != reqpage) {
-				vm_page_lock(m[i]);
-				vm_page_free(m[i]);
-				vm_page_unlock(m[i]);
-			}
-		VM_OBJECT_WUNLOCK(object);
-		return VM_PAGER_OK;
+		vm_pager_free_nonreq(object, m, reqpage, count);
+		return (VM_PAGER_OK);
 	} else if (reqblock == -1) {
 		pmap_zero_page(m[reqpage]);
 		KASSERT(m[reqpage]->dirty == 0,
 		    ("vnode_pager_generic_getpages: page %p is dirty", m));
+		VM_OBJECT_WLOCK(object);
 		m[reqpage]->valid = VM_PAGE_BITS_ALL;
 		for (i = 0; i < count; i++)
 			if (i != reqpage) {
@@ -780,9 +799,11 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
 			}
 		VM_OBJECT_WUNLOCK(object);
 		return (VM_PAGER_OK);
+	} else if (m[reqpage]->valid != 0) {
+		VM_OBJECT_WLOCK(object);
+		m[reqpage]->valid = 0;
+		VM_OBJECT_WUNLOCK(object);
 	}
-	m[reqpage]->valid = 0;
-	VM_OBJECT_WUNLOCK(object);
 
 	/*
 	 * here on direct device I/O
@@ -1008,7 +1029,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
  */
 static void
 vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
-    boolean_t sync, int *rtvals)
+    int flags, int *rtvals)
 {
 	int rtval;
 	struct vnode *vp;
@@ -1026,16 +1047,16 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
 	 * daemon up.  This should be probably be addressed XXX.
 	 */
 
-	if ((vm_cnt.v_free_count + vm_cnt.v_cache_count) <
+	if (vm_cnt.v_free_count + vm_cnt.v_cache_count <
 	    vm_cnt.v_pageout_free_min)
-		sync |= OBJPC_SYNC;
+		flags |= VM_PAGER_PUT_SYNC;
 
 	/*
 	 * Call device-specific putpages function
 	 */
 	vp = object->handle;
 	VM_OBJECT_WUNLOCK(object);
-	rtval = VOP_PUTPAGES(vp, m, bytes, sync, rtvals, 0);
+	rtval = VOP_PUTPAGES(vp, m, bytes, flags, rtvals);
 	KASSERT(rtval != EOPNOTSUPP, 
 	    ("vnode_pager: stale FS putpages\n"));
 	VM_OBJECT_WLOCK(object);
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 02cf4c31453d..b6b85f45e308 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -45,6 +45,7 @@ int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m,
 int vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m,
 					  int count, boolean_t sync,
 					  int *rtvals);
+int vnode_pager_local_getpages(struct vop_getpages_args *ap);
 
 void vnode_pager_release_writecount(vm_object_t object, vm_offset_t start,
     vm_offset_t end);
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c
index fb4698396db8..3d5e1fe37a77 100644
--- a/sys/x86/acpica/acpi_wakeup.c
+++ b/sys/x86/acpica/acpi_wakeup.c
@@ -75,10 +75,10 @@ extern int		acpi_resume_beep;
 extern int		acpi_reset_video;
 
 #ifdef SMP
-extern struct pcb	**susppcbs;
+extern struct susppcb	**susppcbs;
 static cpuset_t		suspcpus;
 #else
-static struct pcb	**susppcbs;
+static struct susppcb	**susppcbs;
 #endif
 
 static void		*acpi_alloc_wakeup_handler(void);
@@ -117,14 +117,15 @@ acpi_stop_beep(void *arg)
 static int
 acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
 {
+	struct pcb *pcb;
 	int		vector = (WAKECODE_PADDR(sc) >> 12) & 0xff;
 	int		apic_id = cpu_apic_ids[cpu];
 	int		ms;
 
-	WAKECODE_FIXUP(wakeup_pcb, struct pcb *, susppcbs[cpu]);
-	WAKECODE_FIXUP(wakeup_gdt, uint16_t, susppcbs[cpu]->pcb_gdt.rd_limit);
-	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
-	    susppcbs[cpu]->pcb_gdt.rd_base);
+	pcb = &susppcbs[cpu]->sp_pcb;
+	WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
+	WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
+	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 	ipi_startup(apic_id, vector);
 
@@ -188,6 +189,7 @@ int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
 	ACPI_STATUS	status;
+	struct pcb	*pcb;
 
 	if (sc->acpi_wakeaddr == 0ul)
 		return (-1);	/* couldn't alloc wake memory */
@@ -204,11 +206,12 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 
 	intr_suspend();
 
-	if (savectx(susppcbs[0])) {
+	pcb = &susppcbs[0]->sp_pcb;
+	if (savectx(pcb)) {
 #ifdef __amd64__
-		fpususpend(susppcbs[0]->pcb_fpususpend);
+		fpususpend(susppcbs[0]->sp_fpususpend);
 #elif defined(DEV_NPX)
-		npxsuspend(&susppcbs[0]->pcb_fpususpend);
+		npxsuspend(&susppcbs[0]->sp_fpususpend);
 #endif
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
@@ -221,13 +224,11 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
 
 #ifndef __amd64__
-		WAKECODE_FIXUP(wakeup_cr4, register_t, susppcbs[0]->pcb_cr4);
+		WAKECODE_FIXUP(wakeup_cr4, register_t, pcb->pcb_cr4);
 #endif
-		WAKECODE_FIXUP(wakeup_pcb, struct pcb *, susppcbs[0]);
-		WAKECODE_FIXUP(wakeup_gdt, uint16_t,
-		    susppcbs[0]->pcb_gdt.rd_limit);
-		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
-		    susppcbs[0]->pcb_gdt.rd_base);
+		WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
+		WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
+		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 		/* Call ACPICA to enter the desired sleep state */
 		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
@@ -244,8 +245,10 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 		for (;;)
 			ia32_pause();
 	} else {
-#ifdef DEV_NPX
-		npxresume(&susppcbs[0]->pcb_fpususpend);
+#ifdef __amd64__
+		fpuresume(susppcbs[0]->sp_fpususpend);
+#elif defined(DEV_NPX)
+		npxresume(&susppcbs[0]->sp_fpususpend);
 #endif
 	}
 
@@ -325,7 +328,7 @@ acpi_alloc_wakeup_handler(void)
 	for (i = 0; i < mp_ncpus; i++) {
 		susppcbs[i] = malloc(sizeof(**susppcbs), M_DEVBUF, M_WAITOK);
 #ifdef __amd64__
-		susppcbs[i]->pcb_fpususpend = alloc_fpusave(M_WAITOK);
+		susppcbs[i]->sp_fpususpend = alloc_fpusave(M_WAITOK);
 #endif
 	}
 
diff --git a/sys/x86/include/fpu.h b/sys/x86/include/fpu.h
index ddb17c2ab2ea..73af34c4fd20 100644
--- a/sys/x86/include/fpu.h
+++ b/sys/x86/include/fpu.h
@@ -150,9 +150,11 @@ struct savefpu {
 
 struct xstate_hdr {
 	uint64_t	xstate_bv;
-	uint8_t		xstate_rsrv0[16];
+	uint64_t	xstate_xcomp_bv;
+	uint8_t		xstate_rsrv0[8];
 	uint8_t		xstate_rsrv[40];
 };
+#define	XSTATE_XCOMP_BV_COMPACT	(1ULL << 63)
 
 struct savexmm_xstate {
 	struct xstate_hdr	sx_hd;
diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h
index 47dc4f5839e8..7cc679827e23 100644
--- a/sys/x86/include/init.h
+++ b/sys/x86/include/init.h
@@ -41,6 +41,7 @@ struct init_ops {
 	void	(*parse_memmap)(caddr_t, vm_paddr_t *, int *);
 	u_int	(*mp_bootaddress)(u_int);
 	int	(*start_all_aps)(void);
+	void	(*msi_init)(void);
 };
 
 extern struct init_ops init_ops;
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index bdc16e7fcb74..96bdf2b32fc8 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -296,6 +296,9 @@
  * CPUID instruction 0xd Processor Extended State Enumeration Sub-leaf 1
  */
 #define	CPUID_EXTSTATE_XSAVEOPT	0x00000001
+#define	CPUID_EXTSTATE_XSAVEC	0x00000002
+#define	CPUID_EXTSTATE_XINUSE	0x00000004
+#define	CPUID_EXTSTATE_XSAVES	0x00000008
 
 /*
  * AMD extended function 8000_0007h edx info
@@ -434,6 +437,10 @@
 #define	MSR_MC4_STATUS		0x411
 #define	MSR_MC4_ADDR		0x412
 #define	MSR_MC4_MISC		0x413
+#define	MSR_PKG_ENERGY_STATUS	0x611
+#define	MSR_DRAM_ENERGY_STATUS	0x619
+#define	MSR_PP0_ENERGY_STATUS	0x639
+#define	MSR_PP1_ENERGY_STATUS	0x641
 
 /*
  * VMX MSRs
@@ -487,6 +494,8 @@
 #define	MSR_APIC_DCR_TIMER	0x83e
 #define	MSR_APIC_SELF_IPI	0x83f
 
+#define	MSR_IA32_XSS		0xda0
+
 /*
  * Constants related to MSR's.
  */
diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c
index e33ab8a2fe71..8d4b5d7760c0 100644
--- a/sys/x86/x86/identcpu.c
+++ b/sys/x86/x86/identcpu.c
@@ -405,30 +405,11 @@ printcpuinfo(void)
 			break;
 		case 0x5a0:
 			strcat(cpu_model, "Geode LX");
-			/*
-			 * Make sure the TSC runs through suspension,
-			 * otherwise we can't use it as timecounter
-			 */
-			wrmsr(0x1900, rdmsr(0x1900) | 0x20ULL);
 			break;
 		default:
 			strcat(cpu_model, "Unknown");
 			break;
 		}
-#if defined(I586_CPU) && defined(CPU_WT_ALLOC)
-		if ((cpu_id & 0xf00) == 0x500) {
-			if (((cpu_id & 0x0f0) > 0)
-			    && ((cpu_id & 0x0f0) < 0x60)
-			    && ((cpu_id & 0x00f) > 3))
-				enable_K5_wt_alloc();
-			else if (((cpu_id & 0x0f0) > 0x80)
-				 || (((cpu_id & 0x0f0) == 0x80)
-				     && (cpu_id & 0x00f) > 0x07))
-				enable_K6_2_wt_alloc();
-			else if ((cpu_id & 0x0f0) > 0x50)
-				enable_K6_wt_alloc();
-		}
-#endif
 #else
 		if ((cpu_id & 0xf00) == 0xf00)
 			strcat(cpu_model, "AMD64 Processor");
@@ -932,6 +913,19 @@ printcpuinfo(void)
 				       );
 			}
 
+			if ((cpu_feature2 & CPUID2_XSAVE) != 0) {
+				cpuid_count(0xd, 0x1, regs);
+				if (regs[0] != 0) {
+					printf("\n  XSAVE Features=0x%b",
+					    regs[0],
+					    "\020"
+					    "\001XSAVEOPT"
+					    "\002XSAVEC"
+					    "\003XINUSE"
+					    "\004XSAVES");
+				}
+			}
+
 			if (via_feature_rng != 0 || via_feature_xcrypt != 0)
 				print_via_padlock_info();
 
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index 448494da040a..7241b123e529 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -86,7 +86,7 @@ char intrnames[INTRCNT_COUNT * (MAXCOMLEN + 1)];
 size_t sintrcnt = sizeof(intrcnt);
 size_t sintrnames = sizeof(intrnames);
 
-static int	intr_assign_cpu(void *arg, u_char cpu);
+static int	intr_assign_cpu(void *arg, int cpu);
 static void	intr_disable_src(void *arg);
 static void	intr_init(void *__dummy);
 static int	intr_pic_registered(struct pic *pic);
@@ -305,7 +305,7 @@ intr_suspend(void)
 }
 
 static int
-intr_assign_cpu(void *arg, u_char cpu)
+intr_assign_cpu(void *arg, int cpu)
 {
 #ifdef SMP
 	struct intsrc *isrc;
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index a9b8c442724d..2aa18f57aeca 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <x86/apicreg.h>
-#include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
@@ -64,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/smp.h>
 #include <machine/specialreg.h>
+#include <x86/init.h>
 
 #ifdef DDB
 #include <sys/interrupt.h>
@@ -1331,9 +1331,6 @@ static void
 apic_init(void *dummy __unused)
 {
 	struct apic_enumerator *enumerator;
-#ifndef __amd64__
-	uint64_t apic_base;
-#endif
 	int retval, best;
 
 	/* We only support built in local APICs. */
@@ -1375,12 +1372,7 @@ apic_init(void *dummy __unused)
 	 * CPUs during early startup.  We need to turn the local APIC back
 	 * on on such CPUs now.
 	 */
-	if (cpu == CPU_686 && cpu_vendor_id == CPU_VENDOR_INTEL &&
-	    (cpu_id & 0xff0) == 0x610) {
-		apic_base = rdmsr(MSR_APICBASE);
-		apic_base |= APICBASE_ENABLED;
-		wrmsr(MSR_APICBASE, apic_base);
-	}
+	ppro_reenable_apic();
 #endif
 
 	/* Probe the CPU's in the system. */
@@ -1447,7 +1439,7 @@ apic_setup_io(void *dummy __unused)
 		lapic_dump("BSP");
 
 	/* Enable the MSI "pic". */
-	msi_init();
+	init_ops.msi_init();
 }
 SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_THIRD, apic_setup_io, NULL);
 
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c
index c98c8bc912cd..140d13ff4f83 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004 Christian Limpach.
  * Copyright (c) 2004-2006,2008 Kip Macy
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.
  *
@@ -29,12 +30,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/rwlock.h>
 #include <sys/boot.h>
@@ -56,16 +60,22 @@ __FBSDID("$FreeBSD$");
 #include <x86/init.h>
 #include <machine/pc/bios.h>
 #include <machine/smp.h>
+#include <machine/intr_machdep.h>
 
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xenstore/xenstorevar.h>
 #include <xen/xen_pv.h>
+#include <xen/xen_msi.h>
 
 #include <xen/interface/vcpu.h>
 
 #include <dev/xen/timer/timer.h>
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 /* Native initial function */
 extern u_int64_t hammer_time(u_int64_t, u_int64_t);
 /* Xen initial function */
@@ -93,6 +103,12 @@ extern int bootAP;
 extern char *bootSTK;
 #endif
 
+/*
+ * Placed by the linker at the end of the bss section, which is the last
+ * section loaded by Xen before loading the symtab and strtab.
+ */
+extern uint32_t end;
+
 /*-------------------------------- Global Data -------------------------------*/
 /* Xen init_ops implementation. */
 struct init_ops xen_init_ops = {
@@ -103,6 +119,7 @@ struct init_ops xen_init_ops = {
 #ifdef SMP
 	.start_all_aps			= xen_pv_start_all_aps,
 #endif
+	.msi_init =			xen_msi_init,
 };
 
 static struct bios_smap xen_smap[MAX_E820_ENTRIES];
@@ -297,6 +314,68 @@ xen_pv_set_boothowto(void)
 	}
 }
 
+#ifdef DDB
+/*
+ * The way Xen loads the symtab is different from the native boot loader,
+ * because it's tailored for NetBSD. So we have to adapt and use the same
+ * method as NetBSD. Portions of the code below have been picked from NetBSD:
+ * sys/kern/kern_ksyms.c CVS Revision 1.71.
+ */
+static void
+xen_pv_parse_symtab(void)
+{
+	Elf_Ehdr *ehdr;
+	Elf_Shdr *shdr;
+	vm_offset_t sym_end;
+	uint32_t size;
+	int i, j;
+
+	size = end;
+	sym_end = HYPERVISOR_start_info->mod_start != 0 ?
+	    HYPERVISOR_start_info->mod_start :
+	    HYPERVISOR_start_info->mfn_list;
+
+	/*
+	 * Make sure the size is right headed, sym_end is just a
+	 * high boundary, but at least allows us to fail earlier.
+	 */
+	if ((vm_offset_t)&end + size > sym_end) {
+		xc_printf("Unable to load ELF symtab: size mismatch\n");
+		return;
+	}
+
+	ehdr = (Elf_Ehdr *)(&end + 1);
+	if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG) ||
+	    ehdr->e_ident[EI_CLASS] != ELF_TARG_CLASS ||
+	    ehdr->e_version > 1) {
+		xc_printf("Unable to load ELF symtab: invalid symbol table\n");
+		return;
+	}
+
+	shdr = (Elf_Shdr *)((uint8_t *)ehdr + ehdr->e_shoff);
+	/* Find the symbol table and the corresponding string table. */
+	for (i = 1; i < ehdr->e_shnum; i++) {
+		if (shdr[i].sh_type != SHT_SYMTAB)
+			continue;
+		if (shdr[i].sh_offset == 0)
+			continue;
+		ksymtab = (uintptr_t)((uint8_t *)ehdr + shdr[i].sh_offset);
+		ksymtab_size = shdr[i].sh_size;
+		j = shdr[i].sh_link;
+		if (shdr[j].sh_offset == 0)
+			continue; /* Can this happen? */
+		kstrtab = (uintptr_t)((uint8_t *)ehdr + shdr[j].sh_offset);
+		break;
+	}
+
+	if (ksymtab == 0 || kstrtab == 0) {
+		xc_printf(
+    "Unable to load ELF symtab: could not find symtab or strtab\n");
+		return;
+	}
+}
+#endif
+
 static caddr_t
 xen_pv_parse_preload_data(u_int64_t modulep)
 {
@@ -304,6 +383,10 @@ xen_pv_parse_preload_data(u_int64_t modulep)
 	xen_pv_set_env();
 	xen_pv_set_boothowto();
 
+#ifdef DDB
+	xen_pv_parse_symtab();
+#endif
+
 	return (NULL);
 }
 
diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
index a4318c140b1a..83f1db30fa0e 100644
--- a/sys/x86/xen/xen_intr.c
+++ b/sys/x86/xen/xen_intr.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/intr_machdep.h>
 #include <x86/apicvar.h>
+#include <x86/apicreg.h>
 #include <machine/smp.h>
 #include <machine/stdarg.h>
 
@@ -63,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/evtchn/evtchnvar.h>
 
 #include <dev/xen/xenpci/xenpcivar.h>
+#include <dev/pci/pcivar.h>
 
 #ifdef DDB
 #include <ddb/ddb.h>
@@ -179,8 +181,6 @@ struct pic xen_intr_pirq_pic = {
 	.pic_disable_intr   = xen_intr_pirq_disable_intr,
 	.pic_vector         = xen_intr_vector,
 	.pic_source_pending = xen_intr_source_pending,
-	.pic_suspend        = xen_intr_suspend,
-	.pic_resume         = xen_intr_resume,
 	.pic_config_intr    = xen_intr_pirq_config_intr,
 	.pic_assign_cpu     = xen_intr_assign_cpu
 };
@@ -1374,6 +1374,64 @@ xen_register_pirq(int vector, enum intr_trigger trig, enum intr_polarity pol)
 	return (0);
 }
 
+int
+xen_register_msi(device_t dev, int vector, int count)
+{
+	struct physdev_map_pirq msi_irq;
+	struct xenisrc *isrc;
+	int ret;
+
+	memset(&msi_irq, 0, sizeof(msi_irq));
+	msi_irq.domid = DOMID_SELF;
+	msi_irq.type = count == 1 ?
+	    MAP_PIRQ_TYPE_MSI_SEG : MAP_PIRQ_TYPE_MULTI_MSI;
+	msi_irq.index = -1;
+	msi_irq.pirq = -1;
+	msi_irq.bus = pci_get_bus(dev) | (pci_get_domain(dev) << 16);
+	msi_irq.devfn = (pci_get_slot(dev) << 3) | pci_get_function(dev);
+	msi_irq.entry_nr = count;
+
+	ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &msi_irq);
+	if (ret != 0)
+		return (ret);
+	if (count != msi_irq.entry_nr) {
+		panic("unable to setup all requested MSI vectors "
+		    "(expected %d got %d)", count, msi_irq.entry_nr);
+	}
+
+	mtx_lock(&xen_intr_isrc_lock);
+	for (int i = 0; i < count; i++) {
+		isrc = xen_intr_alloc_isrc(EVTCHN_TYPE_PIRQ, vector + i);
+		KASSERT(isrc != NULL,
+		    ("xen: unable to allocate isrc for interrupt"));
+		isrc->xi_pirq = msi_irq.pirq + i;
+	}
+	mtx_unlock(&xen_intr_isrc_lock);
+
+	return (0);
+}
+
+int
+xen_release_msi(int vector)
+{
+	struct physdev_unmap_pirq unmap;
+	struct xenisrc *isrc;
+	int ret;
+
+	isrc = (struct xenisrc *)intr_lookup_source(vector);
+	if (isrc == NULL)
+		return (ENXIO);
+
+	unmap.pirq = isrc->xi_pirq;
+	ret = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap);
+	if (ret != 0)
+		return (ret);
+
+	xen_intr_release_isrc(isrc);
+
+	return (0);
+}
+
 int
 xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...)
 {
diff --git a/sys/x86/xen/xen_msi.c b/sys/x86/xen/xen_msi.c
new file mode 100644
index 000000000000..0f678b164344
--- /dev/null
+++ b/sys/x86/xen/xen_msi.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/sx.h>
+#include <sys/systm.h>
+#include <x86/apicreg.h>
+#include <machine/cputypes.h>
+#include <machine/md_var.h>
+#include <machine/frame.h>
+#include <machine/intr_machdep.h>
+#include <x86/apicvar.h>
+#include <machine/specialreg.h>
+#include <dev/pci/pcivar.h>
+
+#include <xen/xen_intr.h>
+#include <xen/xen_msi.h>
+
+static struct mtx msi_lock;
+static int msi_last_irq;
+
+void
+xen_msi_init(void)
+{
+
+	mtx_init(&msi_lock, "msi", NULL, MTX_DEF);
+}
+
+/*
+ * Try to allocate 'count' interrupt sources with contiguous IDT values.
+ */
+int
+xen_msi_alloc(device_t dev, int count, int maxcount, int *irqs)
+{
+	int i, ret = 0;
+
+	mtx_lock(&msi_lock);
+
+	/* If we would exceed the max, give up. */
+	if ((msi_last_irq + count) > NUM_MSI_INTS) {
+		mtx_unlock(&msi_lock);
+		return (ENXIO);
+	}
+
+	/* Allocate MSI vectors */
+	for (i = 0; i < count; i++)
+		irqs[i] = FIRST_MSI_INT + msi_last_irq++;
+
+	mtx_unlock(&msi_lock);
+
+	ret = xen_register_msi(dev, irqs[0], count);
+	if (ret != 0)
+		return (ret);
+
+	for (i = 0; i < count; i++)
+		nexus_add_irq(irqs[i]);
+
+	return (0);
+}
+
+int
+xen_msi_release(int *irqs, int count)
+{
+	int i, ret;
+
+	for (i = 0; i < count; i++) {
+		ret = xen_release_msi(irqs[i]);
+		if (ret != 0)
+			return (ret);
+	}
+
+	return (0);
+}
+
+int
+xen_msi_map(int irq, uint64_t *addr, uint32_t *data)
+{
+
+	return (0);
+}
+
+int
+xen_msix_alloc(device_t dev, int *irq)
+{
+
+	return (ENXIO);
+}
+
+int
+xen_msix_release(int irq)
+{
+
+	return (ENOENT);
+}
diff --git a/sys/x86/xen/xen_nexus.c b/sys/x86/xen/xen_nexus.c
index e4634f93ae36..1baeb7d9391f 100644
--- a/sys/x86/xen/xen_nexus.c
+++ b/sys/x86/xen/xen_nexus.c
@@ -45,6 +45,9 @@ __FBSDID("$FreeBSD$");
 
 #include <xen/xen-os.h>
 #include <xen/xen_intr.h>
+#include <xen/xen_msi.h>
+
+#include "pcib_if.h"
 
 /*
  * Xen nexus(4) driver.
@@ -111,6 +114,41 @@ nexus_xen_config_intr(device_t dev, int irq, enum intr_trigger trig,
 	return (intr_config_intr(irq, trig, pol));
 }
 
+static int
+nexus_xen_alloc_msix(device_t pcib, device_t dev, int *irq)
+{
+
+	return (xen_msix_alloc(dev, irq));
+}
+
+static int
+nexus_xen_release_msix(device_t pcib, device_t dev, int irq)
+{
+
+	return (xen_msix_release(irq));
+}
+
+static int
+nexus_xen_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs)
+{
+
+	return (xen_msi_alloc(dev, count, maxcount, irqs));
+}
+
+static int
+nexus_xen_release_msi(device_t pcib, device_t dev, int count, int *irqs)
+{
+
+	return (xen_msi_release(irqs, count));
+}
+
+static int
+nexus_xen_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr, uint32_t *data)
+{
+
+	return (xen_msi_map(irq, addr, data));
+}
+
 static device_method_t nexus_xen_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		nexus_xen_probe),
@@ -119,6 +157,13 @@ static device_method_t nexus_xen_methods[] = {
 	/* INTR */
 	DEVMETHOD(bus_config_intr,	nexus_xen_config_intr),
 
+	/* MSI */
+	DEVMETHOD(pcib_alloc_msi,	nexus_xen_alloc_msi),
+	DEVMETHOD(pcib_release_msi,	nexus_xen_release_msi),
+	DEVMETHOD(pcib_alloc_msix,	nexus_xen_alloc_msix),
+	DEVMETHOD(pcib_release_msix,	nexus_xen_release_msix),
+	DEVMETHOD(pcib_map_msi,		nexus_xen_map_msi),
+
 	{ 0, 0 }
 };
 
diff --git a/sys/x86/xen/xen_pci.c b/sys/x86/xen/xen_pci.c
new file mode 100644
index 000000000000..d4a427d4cf96
--- /dev/null
+++ b/sys/x86/xen/xen_pci.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+
+#include <sys/pciio.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pci_private.h>
+
+#include <xen/xen-os.h>
+#include <xen/hypervisor.h>
+
+#include "pcib_if.h"
+#include "pci_if.h"
+
+static int xen_pci_probe(device_t dev);
+
+static void xen_pci_enable_msi_method(device_t dev, device_t child,
+    uint64_t address, uint16_t data);
+static void xen_pci_disable_msi_method(device_t dev, device_t child);
+static void xen_pci_child_added_method(device_t dev, device_t child);
+
+static device_method_t xen_pci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		xen_pci_probe),
+
+	/* PCI interface overwrites */
+	DEVMETHOD(pci_enable_msi,	xen_pci_enable_msi_method),
+	DEVMETHOD(pci_disable_msi,	xen_pci_disable_msi_method),
+	DEVMETHOD(pci_child_added,	xen_pci_child_added_method),
+
+	DEVMETHOD_END
+};
+
+static devclass_t pci_devclass;
+
+DECLARE_CLASS(acpi_pci_driver);
+DEFINE_CLASS_1(pci, xen_pci_driver, xen_pci_methods, sizeof(struct pci_softc),
+    acpi_pci_driver);
+DRIVER_MODULE(xen_pci, pcib, xen_pci_driver, pci_devclass, 0, 0);
+MODULE_DEPEND(xen_pci, pci, 1, 1, 1);
+MODULE_DEPEND(xen_pci, acpi, 1, 1, 1);
+MODULE_VERSION(xen_pci, 1);
+
+static int
+xen_pci_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xen PCI bus");
+
+	if (!xen_pv_domain())
+		return (ENXIO);
+
+	return (BUS_PROBE_SPECIFIC);
+}
+
+static void
+xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
+     uint16_t data)
+{
+	struct pci_devinfo *dinfo = device_get_ivars(child);
+	struct pcicfg_msi *msi = &dinfo->cfg.msi;
+
+	/* Enable MSI in the control register. */
+	msi->msi_ctrl |= PCIM_MSICTRL_MSI_ENABLE;
+	pci_write_config(child, msi->msi_location + PCIR_MSI_CTRL,
+	    msi->msi_ctrl, 2);
+}
+
+static void
+xen_pci_disable_msi_method(device_t dev, device_t child)
+{
+	struct pci_devinfo *dinfo = device_get_ivars(child);
+	struct pcicfg_msi *msi = &dinfo->cfg.msi;
+
+	msi->msi_ctrl &= ~PCIM_MSICTRL_MSI_ENABLE;
+	pci_write_config(child, msi->msi_location + PCIR_MSI_CTRL,
+	    msi->msi_ctrl, 2);
+}
+
+static void
+xen_pci_child_added_method(device_t dev, device_t child)
+{
+	struct pci_devinfo *dinfo;
+	struct physdev_pci_device_add add_pci;
+	int error;
+
+	dinfo = device_get_ivars(child);
+	KASSERT((dinfo != NULL),
+	    ("xen_pci_add_child_method called with NULL dinfo"));
+
+	bzero(&add_pci, sizeof(add_pci));
+	add_pci.seg = dinfo->cfg.domain;
+	add_pci.bus = dinfo->cfg.bus;
+	add_pci.devfn = (dinfo->cfg.slot << 3) | dinfo->cfg.func;
+	error = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_add, &add_pci);
+	if (error)
+		panic("unable to add device bus %u devfn %u error: %d\n",
+		    add_pci.bus, add_pci.devfn, error);
+}
diff --git a/sys/xen/interface/physdev.h b/sys/xen/interface/physdev.h
index b78eeba9ca4a..56b8be045d5e 100644
--- a/sys/xen/interface/physdev.h
+++ b/sys/xen/interface/physdev.h
@@ -151,6 +151,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_irq_t);
 #define MAP_PIRQ_TYPE_GSI               0x1
 #define MAP_PIRQ_TYPE_UNKNOWN           0x2
 #define MAP_PIRQ_TYPE_MSI_SEG           0x3
+#define MAP_PIRQ_TYPE_MULTI_MSI         0x4
 
 #define PHYSDEVOP_map_pirq               13
 struct physdev_map_pirq {
diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h
index a1ff6666b17a..a29414d9a3ee 100644
--- a/sys/xen/xen_intr.h
+++ b/sys/xen/xen_intr.h
@@ -224,4 +224,26 @@ void xen_intr_signal(xen_intr_handle_t handle);
  */
 evtchn_port_t xen_intr_port(xen_intr_handle_t handle);
 
+/**
+ * Setup MSI vector interrupt(s).
+ *
+ * \param dev     The device that requests the binding.
+ *
+ * \param vector  Requested initial vector to bind the MSI interrupt(s) to.
+ *
+ * \param count   Number of vectors to allocate.
+ *
+ * \returns  0 on success, otherwise an errno.
+ */
+int xen_register_msi(device_t dev, int vector, int count);
+
+/**
+ * Teardown a MSI vector interrupt.
+ *
+ * \param vector  Requested vector to release.
+ *
+ * \returns  0 on success, otherwise an errno.
+ */
+int xen_release_msi(int vector);
+
 #endif /* _XEN_INTR_H_ */
diff --git a/sys/amd64/vmm/vmm_msr.h b/sys/xen/xen_msi.h
similarity index 66%
rename from sys/amd64/vmm/vmm_msr.h
rename to sys/xen/xen_msi.h
index e07003771f21..baec4c1afda5 100644
--- a/sys/amd64/vmm/vmm_msr.h
+++ b/sys/xen/xen_msi.h
@@ -1,5 +1,5 @@
-/*-
- * Copyright (c) 2011 NetApp, Inc.
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,10 +11,10 @@
  *    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 NETAPP, INC ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 NETAPP, INC OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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)
@@ -26,19 +26,14 @@
  * $FreeBSD$
  */
 
-#ifndef	_VMM_MSR_H_
-#define	_VMM_MSR_H_
+#ifndef __XEN_MSI_H__
+#define __XEN_MSI_H__
 
-#define	VMM_MSR_NUM	16
-struct vm;
+void	xen_msi_init(void);
+int	xen_msi_map(int irq, uint64_t *addr, uint32_t *data);
+int	xen_msi_alloc(device_t dev, int count, int maxcount, int *irqs);
+int	xen_msi_release(int *irqs, int count);
+int	xen_msix_alloc(device_t dev, int *irq);
+int	xen_msix_release(int irq);
 
-void	vmm_msr_init(void);
-int	emulate_wrmsr(struct vm *vm, int vcpu, u_int msr, uint64_t val,
-	    bool *retu);
-int	emulate_rdmsr(struct vm *vm, int vcpu, u_int msr, bool *retu);
-void	guest_msrs_init(struct vm *vm, int cpu);
-void	guest_msr_valid(int msr);
-void	restore_host_msrs(struct vm *vm, int cpu);
-void	restore_guest_msrs(struct vm *vm, int cpu);
-
-#endif
+#endif /* !__XEN_MSI_H__ */
\ No newline at end of file
diff --git a/sys/xen/xenstore/xenstore_internal.h b/sys/xen/xenstore/xenstore_internal.h
index 0398aef708aa..3355c2789413 100644
--- a/sys/xen/xenstore/xenstore_internal.h
+++ b/sys/xen/xenstore/xenstore_internal.h
@@ -32,8 +32,5 @@
  * $FreeBSD$
  */
 
-/* Initialize support for userspace access to the XenStore. */
-void xs_dev_init(void);
-
 /* Used by the XenStore character device to borrow kernel's store connection. */
 int xs_dev_request_and_reply(struct xsd_sockmsg *msg, void **result);
diff --git a/tests/sys/kern/unix_seqpacket_test.c b/tests/sys/kern/unix_seqpacket_test.c
index c009e6892d8c..ccbacafbd7a1 100644
--- a/tests/sys/kern/unix_seqpacket_test.c
+++ b/tests/sys/kern/unix_seqpacket_test.c
@@ -397,7 +397,7 @@ ATF_TC_BODY(create_socket, tc)
 	int s;
 
 	s = socket(PF_LOCAL, SOCK_SEQPACKET, 0);
-	ATF_CHECK(s >= 0);
+	ATF_REQUIRE(s >= 0);
 	close(s);
 }
 
diff --git a/tests/sys/netinet/fibs_test.sh b/tests/sys/netinet/fibs_test.sh
index 72ebcfca1dbc..2dc316950cd6 100755
--- a/tests/sys/netinet/fibs_test.sh
+++ b/tests/sys/netinet/fibs_test.sh
@@ -366,7 +366,6 @@ udp_dontroute_head()
 
 udp_dontroute_body()
 {
-	atf_expect_fail "kern/187553 Source address selection for UDP packets with SO_DONTROUTE uses the default FIB"
 	# Configure the TAP interface to use an RFC5737 nonrouteable address
 	# and a non-default fib
 	ADDR0="192.0.2.2"
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 78878c2ea459..a12775b8b083 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3510,9 +3510,9 @@ OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
 .endif
 
-#.if ${MK_OPENSSL} == no
-# to be filled in
-#.endif
+.if ${MK_OPENSSL} == no
+OLD_FILES+=etc/rc.d/keyserv
+.endif
 
 .if ${MK_PC_SYSINSTALL} == no
 # backend-partmanager
@@ -3606,6 +3606,7 @@ OLD_DIRS+=usr/share/examples/pc-sysinstall
 .if ${MK_PF} == no
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
+OLD_FILES+=etc/rc.d/ftp-proxy
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/libexec/tftp-proxy
@@ -3766,6 +3767,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
+OLD_FILES+=etc/rc.d/rwho
 OLD_FILES+=etc/periodic/daily/140.clean-rwho 
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 OLD_FILES+=rescue/rcp
@@ -3797,6 +3799,7 @@ OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/sbin/etcupdate
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/ident.1.gz
@@ -3809,6 +3812,7 @@ OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
+OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
 .endif
 
 #.if ${MK_RESCUE} == no
@@ -4764,3 +4768,11 @@ OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
 OLD_FILES+=usr/share/examples/dma/mailer.conf
 .endif
+
+.if ${MK_HYPERV} == no
+OLD_FILES+=etc/devd/hyperv.conf
+OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
+OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
+OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
+OLD_FILES+=usr/sbin/hv_kvpd
+.endif
diff --git a/tools/build/options/WITHOUT_HYPERV b/tools/build/options/WITHOUT_HYPERV
new file mode 100644
index 000000000000..ef63f70ea80e
--- /dev/null
+++ b/tools/build/options/WITHOUT_HYPERV
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build or install HyperV utilities.
diff --git a/tools/build/options/WITHOUT_RCS b/tools/build/options/WITHOUT_RCS
index 2a4ddecab440..e21e0270d52d 100644
--- a/tools/build/options/WITHOUT_RCS
+++ b/tools/build/options/WITHOUT_RCS
@@ -1,4 +1,6 @@
 .\" $FreeBSD$
 Set to not build
 .Xr rcs 1
-and related utilities.
+,
+.Xr etcupdate 8
+, and related utilities.
diff --git a/tools/build/options/WITH_HYPERV b/tools/build/options/WITH_HYPERV
new file mode 100644
index 000000000000..a6bdf72ff3e3
--- /dev/null
+++ b/tools/build/options/WITH_HYPERV
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build and install HyperV utilities.
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index dcd1c208698c..84bf895efeb7 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -89,12 +89,12 @@ main()
 	fi
 
 	prebuild_libs=$(
-		awk -F"${FS}" '{ print $2 }' ${LIBDEPENDS} |rs 0 1 |sort -u
+		awk -F"${FS}" '{ print $2 }' ${LIBDEPENDS} | tr ' ' '\n' |
+		    sort -u
 	)
 	echo "Libraries with dependents:"
 	echo
-	echo ${prebuild_libs} |
-	rs 0 1
+	echo ${prebuild_libs} | tr ' ' '\n'
 	echo
 
 	echo "List of interdependencies:"
diff --git a/tools/regression/acltools/01.t b/tools/regression/acltools/01.t
index 00004afece8b..f84e0a98b463 100644
--- a/tools/regression/acltools/01.t
+++ b/tools/regression/acltools/01.t
@@ -51,7 +51,7 @@ TESTDIR=$(dirname $(realpath $0))
 # Set up the test filesystem.
 MD=`mdconfig -at swap -s 64m`
 MNT=`mktemp -dt acltools`
-zpool create -R $MNT acltools /dev/$MD
+zpool create -m $MNT acltools /dev/$MD
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
diff --git a/tools/regression/acltools/03.t b/tools/regression/acltools/03.t
index a577b7a0541f..a0b4199c2bf2 100644
--- a/tools/regression/acltools/03.t
+++ b/tools/regression/acltools/03.t
@@ -48,7 +48,7 @@ MNTROOT=`mktemp -dt acltools`
 MD1=`mdconfig -at swap -s 64m`
 MNT1=$MNTROOT/nfs4
 mkdir $MNT1
-zpool create -R $MNT1 acltools /dev/$MD1
+zpool create -m $MNT1 acltools /dev/$MD1
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
diff --git a/tools/regression/acltools/04.t b/tools/regression/acltools/04.t
index ccb992803ba1..1a13183475fe 100644
--- a/tools/regression/acltools/04.t
+++ b/tools/regression/acltools/04.t
@@ -43,7 +43,7 @@ TESTDIR=$(dirname $(realpath $0))
 # Set up the test filesystem.
 MD=`mdconfig -at swap -s 64m`
 MNT=`mktemp -dt acltools`
-zpool create -R $MNT acltools /dev/$MD
+zpool create -m $MNT acltools /dev/$MD
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
diff --git a/tools/regression/lib/msun/test-cexp.c b/tools/regression/lib/msun/test-cexp.c
index 78c3f1a32044..69897d32155e 100644
--- a/tools/regression/lib/msun/test-cexp.c
+++ b/tools/regression/lib/msun/test-cexp.c
@@ -117,6 +117,7 @@ test_nan()
 	/* cexp(x + NaNi) = NaN + NaNi and optionally raises invalid */
 	/* cexp(NaN + yi) = NaN + NaNi and optionally raises invalid (|y|>0) */
 	for (i = 0; i < N(finites); i++) {
+		printf("# Run %d..\n", i);
 		testall(CMPLXL(finites[i], NAN), CMPLXL(NAN, NAN),
 			ALL_STD_EXCEPT & ~FE_INVALID, 0, 0);
 		if (finites[i] == 0.0)
@@ -148,6 +149,7 @@ test_inf(void)
 
 	/* cexp(x + inf i) = NaN + NaNi and raises invalid */
 	for (i = 0; i < N(finites); i++) {
+		printf("# Run %d..\n", i);
 		testall(CMPLXL(finites[i], INFINITY), CMPLXL(NAN, NAN),
 			ALL_STD_EXCEPT, FE_INVALID, 1);
 	}
@@ -189,6 +191,7 @@ test_reals(void)
 
 	for (i = 0; i < N(finites); i++) {
 		/* XXX could check exceptions more meticulously */
+		printf("# Run %d..\n", i);
 		test(cexp, CMPLXL(finites[i], 0.0),
 		     CMPLXL(exp(finites[i]), 0.0),
 		     FE_INVALID | FE_DIVBYZERO, 0, 1);
@@ -210,6 +213,7 @@ test_imaginaries(void)
 	int i;
 
 	for (i = 0; i < N(finites); i++) {
+		printf("# Run %d..\n", i);
 		test(cexp, CMPLXL(0.0, finites[i]),
 		     CMPLXL(cos(finites[i]), sin(finites[i])),
 		     ALL_STD_EXCEPT & ~FE_INEXACT, 0, 1);
@@ -241,6 +245,7 @@ test_small(void)
 	int i;
 
 	for (i = 0; i < N(tests); i += 4) {
+		printf("# Run %d..\n", i);
 		a = tests[i];
 		b = tests[i + 1];
 		x = tests[i + 2];
@@ -297,8 +302,12 @@ main(int argc, char *argv[])
 	test_inf();
 	printf("ok 3 - cexp inf\n");
 
+#if defined(__i386__)
+	printf("not ok 4 - cexp reals # TODO: PR # 191676 fails assertion on i386\n");
+#else
 	test_reals();
 	printf("ok 4 - cexp reals\n");
+#endif
 
 	test_imaginaries();
 	printf("ok 5 - cexp imaginaries\n");
diff --git a/tools/regression/lib/msun/test-conj.c b/tools/regression/lib/msun/test-conj.c
index c261f60160b7..7426f9eccf2c 100644
--- a/tools/regression/lib/msun/test-conj.c
+++ b/tools/regression/lib/msun/test-conj.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include "test-utils.h"
 
-#pragma	STDC CX_LIMITED_RANGE	off
+#pragma	STDC CX_LIMITED_RANGE	OFF
 
 /* Make sure gcc doesn't use builtin versions of these or honor __pure2. */
 static float complex (*libconjf)(float complex) = conjf;
diff --git a/tools/regression/lib/msun/test-csqrt.c b/tools/regression/lib/msun/test-csqrt.c
index 39176eb68e51..bc1817f5ae5c 100644
--- a/tools/regression/lib/msun/test-csqrt.c
+++ b/tools/regression/lib/msun/test-csqrt.c
@@ -62,7 +62,7 @@ _csqrt(long double complex d)
 	return (csqrt((double complex)d));
 }
 
-#pragma	STDC CX_LIMITED_RANGE	off
+#pragma	STDC CX_LIMITED_RANGE	OFF
 
 /*
  * Compare d1 and d2 using special rules: NaN == NaN and +0 != -0.
diff --git a/tools/regression/lib/msun/test-invctrig.c b/tools/regression/lib/msun/test-invctrig.c
index e78c26b7423f..78b11197e814 100644
--- a/tools/regression/lib/msun/test-invctrig.c
+++ b/tools/regression/lib/msun/test-invctrig.c
@@ -315,25 +315,20 @@ test_small(void)
 	 *     asin(z) = Pi/4 + i ln(2)/2
 	 *     atan(z) = atan(4)/2 + i ln(17/9)/4
 	 */
-	static const struct {
-		complex long double z;
-		complex long double acos_z;
-		complex long double asin_z;
-		complex long double atan_z;
-	} tests[] = {
-		{ CMPLXL(0.75L, 0.25L),
-		  CMPLXL(pi / 4, -0.34657359027997265470861606072908828L),
-		  CMPLXL(pi / 4, 0.34657359027997265470861606072908828L),
-		  CMPLXL(0.66290883183401623252961960521423782L,
-			 0.15899719167999917436476103600701878L) },
-	};
-	int i;
+	complex long double z;
+	complex long double acos_z;
+	complex long double asin_z;
+	complex long double atan_z;
 
-	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
-		testall_tol(cacos, tests[i].z, tests[i].acos_z, 2);
-		testall_odd_tol(casin, tests[i].z, tests[i].asin_z, 2);
-		testall_odd_tol(catan, tests[i].z, tests[i].atan_z, 2);
-        }
+	z = CMPLXL(0.75L, 0.25L);
+	acos_z = CMPLXL(pi / 4, -0.34657359027997265470861606072908828L);
+	asin_z = CMPLXL(pi / 4, 0.34657359027997265470861606072908828L);
+	atan_z = CMPLXL(0.66290883183401623252961960521423782L,
+			 0.15899719167999917436476103600701878L);
+
+	testall_tol(cacos, z, acos_z, 2);
+	testall_odd_tol(casin, z, asin_z, 2);
+	testall_odd_tol(catan, z, atan_z, 2);
 }
 
 /* Test inputs that might cause overflow in a sloppy implementation. */
diff --git a/tools/regression/pjdfstest/tests/open/16.t b/tools/regression/pjdfstest/tests/open/16.t
deleted file mode 100644
index a15cd9b3c07f..000000000000
--- a/tools/regression/pjdfstest/tests/open/16.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-desc="open returns ELOOP when O_NOFOLLOW was specified and the target is a symbolic link"
-
-dir=`dirname $0`
-. ${dir}/../misc.sh
-
-echo "1..6"
-
-n0=`namegen`
-n1=`namegen`
-
-expect 0 symlink ${n0} ${n1}
-expect ELOOP open ${n1} O_RDONLY,O_CREAT,O_NOFOLLOW 0644
-expect ELOOP open ${n1} O_RDONLY,O_NOFOLLOW
-expect ELOOP open ${n1} O_WRONLY,O_NOFOLLOW
-expect ELOOP open ${n1} O_RDWR,O_NOFOLLOW
-expect 0 unlink ${n1}
diff --git a/tools/sched/schedgraph.py b/tools/sched/schedgraph.py
index 4335574972e5..e5925141e69c 100644
--- a/tools/sched/schedgraph.py
+++ b/tools/sched/schedgraph.py
@@ -856,7 +856,7 @@ def ysize(self):
 		return (Y_EVENTSOURCE)
 
 	def eventat(self, i):
-		if (i >= len(self.events)):
+		if (i >= len(self.events) or i < 0):
 			return (None)
 		event = self.events[i]
 		return (event)
diff --git a/tools/test/dtrace/Makefile b/tools/test/dtrace/Makefile
index 012a116097f6..405d536b36fa 100644
--- a/tools/test/dtrace/Makefile
+++ b/tools/test/dtrace/Makefile
@@ -85,7 +85,8 @@ IGNORE=		\
 	${TESTSRCDIR}/tst/common/ip/tst.localtcpstate.ksh		\
 	${TESTSRCDIR}/tst/common/ip/tst.remotetcpstate.ksh		\
 	${TESTSRCDIR}/tst/common/scripting/tst.projid.ksh		\
-	${TESTSRCDIR}/tst/common/scripting/tst.taskid.ksh
+	${TESTSRCDIR}/tst/common/scripting/tst.taskid.ksh		\
+	${TESTSRCDIR}/tst/common/json/tst.usdt.c
 
 
 
diff --git a/tools/tools/ath/athalq/ar9300_ds.c b/tools/tools/ath/athalq/ar9300_ds.c
index d303351e708d..a554929f28e1 100644
--- a/tools/tools/ath/athalq/ar9300_ds.c
+++ b/tools/tools/ath/athalq/ar9300_ds.c
@@ -317,6 +317,80 @@ ar9300_decode_rxstatus(struct if_ath_alq_payload *a)
 	    (unsigned int) be32toh(a->hdr.tstamp_sec),
 	    (unsigned int) be32toh(a->hdr.tstamp_usec),
 	    (unsigned long long) be64toh(a->hdr.threadid));
+
+	/* status1 */
+	/* .. and status5 */
+	printf("    RSSI %d/%d/%d / %d/%d/%d; combined: %d; rate=0x%02x\n",
+	    MS(rxs.status1, AR_rx_rssi_ant00),
+	    MS(rxs.status1, AR_rx_rssi_ant01),
+	    MS(rxs.status1, AR_rx_rssi_ant02),
+	    MS(rxs.status5, AR_rx_rssi_ant10),
+	    MS(rxs.status5, AR_rx_rssi_ant11),
+	    MS(rxs.status5, AR_rx_rssi_ant12),
+	    MS(rxs.status5, AR_rx_rssi_combined),
+	    MS(rxs.status1, AR_rx_rate));
+
+	/* status2 */
+	printf("    Len: %d; more=%d, delim=%d, upload=%d\n",
+	    MS(rxs.status2, AR_data_len),
+	    MF(rxs.status2, AR_rx_more),
+	    MS(rxs.status2, AR_num_delim),
+	    MS(rxs.status2, AR_hw_upload_data));
+
+	/* status3 */
+	printf("    RX timestamp: %d\n", rxs.status3);
+
+	/* status4 */
+	printf("    GI: %d, 2040: %d, parallel40: %d, stbc=%d\n",
+	    MF(rxs.status4, AR_gi),
+	    MF(rxs.status4, AR_2040),
+	    MF(rxs.status4, AR_parallel40),
+	    MF(rxs.status4, AR_rx_stbc));
+	printf("    Not sounding: %d, ness: %d, upload_valid: %d\n",
+	    MF(rxs.status4, AR_rx_not_sounding),
+	    MS(rxs.status4, AR_rx_ness),
+	    MS(rxs.status4, AR_hw_upload_data_valid));
+	printf("    RX antenna: 0x%08x\n",
+	    MS(rxs.status4, AR_rx_antenna));
+
+	/* EVM */
+	/* status6 - 9 */
+	printf("    EVM: 0x%08x; 0x%08x; 0x%08x; 0x%08x\n",
+	    rxs.status6,
+	    rxs.status7,
+	    rxs.status8,
+	    rxs.status9);
+
+	/* status10 - ? */
+
+	/* status11 */
+	printf("    RX done: %d, RX frame ok: %d, CRC error: %d\n",
+	    MF(rxs.status11, AR_rx_done),
+	    MF(rxs.status11, AR_rx_frame_ok),
+	    MF(rxs.status11, AR_crc_err));
+	printf("    Decrypt CRC err: %d, PHY err: %d, MIC err: %d\n",
+	    MF(rxs.status11, AR_decrypt_crc_err),
+	    MF(rxs.status11, AR_phyerr),
+	    MF(rxs.status11, AR_michael_err));
+	printf("    Pre delim CRC err: %d, uAPSD Trig: %d\n",
+	    MF(rxs.status11, AR_pre_delim_crc_err),
+	    MF(rxs.status11, AR_apsd_trig));
+	printf("    RXKeyIdxValid: %d, KeyIdx: %d, PHY error: %d\n",
+	    MF(rxs.status11, AR_rx_key_idx_valid),
+	    MS(rxs.status11, AR_key_idx),
+	    MS(rxs.status11, AR_phy_err_code));
+	printf("    RX more Aggr: %d, RX aggr %d, post delim CRC err: %d\n",
+	    MF(rxs.status11, AR_rx_more_aggr),
+	    MF(rxs.status11, AR_rx_aggr),
+	    MF(rxs.status11, AR_post_delim_crc_err));
+	printf("    hw upload data type: %d; position bit: %d\n",
+	    MS(rxs.status11, AR_hw_upload_data_type),
+	    MF(rxs.status11, AR_position_bit));
+	printf("    Hi RX chain: %d, RxFirstAggr: %d, DecryptBusy: %d, KeyMiss: %d\n",
+	    MF(rxs.status11, AR_hi_rx_chain),
+	    MF(rxs.status11, AR_rx_first_aggr),
+	    MF(rxs.status11, AR_decrypt_busy_err),
+	    MF(rxs.status11, AR_key_miss));
 }
 
 void
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 5f4500ba343b..6e072d65d006 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -367,6 +367,7 @@ writefile(time_t runtimer, char queue)
 
 	if (export)
 	{
+	    (void)fputs("export ", fp);
 	    fwrite(*atenv, sizeof(char), eqp-*atenv, fp);
 	    for(ap = eqp;*ap != '\0'; ap++)
 	    {
@@ -389,8 +390,6 @@ writefile(time_t runtimer, char queue)
 		    fputc(*ap, fp);
 		}
 	    }
-	    fputs("; export ", fp);
-	    fwrite(*atenv, sizeof(char), eqp-*atenv -1, fp);
 	    fputc('\n', fp);
 	    
 	}
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index 9205bd9f23f3..fc6df82b921c 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -52,6 +52,7 @@
 02/03	Jason Helfman <jgh@FreeBSD.org> born in Royal Oak, Michigan, United States, 1972
 02/04	Eitan Adler <eadler@FreeBSD.org> born in West Hempstead, New York, United States, 1991
 02/05	Frank Laszlo <laszlof@FreeBSD.org> born in Howell, Michigan, United States, 1983
+02/06	Julien Charbon <jch@FreeBSD.org> born in Saint Etienne, Loire, France, 1978
 02/10	David Greenman <dg@FreeBSD.org> born in Portland, Oregon, United States, 1968
 02/10	Paul Richards <paul@FreeBSD.org> born in Ammanford, Carmarthenshire, United Kingdom, 1968
 02/10	Simon Barner <barner@FreeBSD.org> born in Rosenheim, Bayern, Germany, 1980
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index dbb3171213ee..a549d5391934 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -50,7 +50,7 @@ The options are as follows:
 .It Fl a
 Dump all information.
 .It Fl c
-Dump shared headers.
+Dump section headers.
 .It Fl d
 Dump dynamic symbols.
 .It Fl e
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index c0c24dc27c17..a4c614f2f499 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -11,7 +11,7 @@ PROG=	bsdgrep
 CLEANFILES+= bsdgrep.1
 
 bsdgrep.1: grep.1
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 .endif
 SRCS=	file.c grep.c queue.c util.c
 
diff --git a/usr.bin/grep/regex/tre-fastmatch.c b/usr.bin/grep/regex/tre-fastmatch.c
index eddab2631473..0881c557ecff 100644
--- a/usr.bin/grep/regex/tre-fastmatch.c
+++ b/usr.bin/grep/regex/tre-fastmatch.c
@@ -727,7 +727,7 @@ tre_compile_fast(fastmatch_t *fg, const tre_char_t *pat, size_t n,
       for (unsigned int i = 0; i < fg->len; i++)
 	if (fg->pattern[i] == '\\')
 	  escaped = !escaped;
-	else if (fg->pattern[i] == '.' && escaped)
+	else if (fg->pattern[i] == '.' && fg->escmap && escaped)
 	  {
 	    fg->escmap[i] = true;
 	    escaped = false;
diff --git a/usr.bin/iscsictl/iscsictl.8 b/usr.bin/iscsictl/iscsictl.8
index 845718beada3..93bf7ed18f87 100644
--- a/usr.bin/iscsictl/iscsictl.8
+++ b/usr.bin/iscsictl/iscsictl.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 18, 2014
+.Dd September 12, 2014
 .Dt ISCSICTL 8
 .Os
 .Sh NAME
@@ -171,6 +171,7 @@ Attach to target iqn.2012-06.com.example:target0, served by 192.168.1.1:
 Disconnect all iSCSI sessions:
 .Dl Nm Fl Ra
 .Sh SEE ALSO
+.Xr iscsi 4 ,
 .Xr iscsi.conf 5 ,
 .Xr iscsid 8
 .Sh HISTORY
@@ -181,6 +182,6 @@ command appeared in
 .Sh AUTHORS
 The
 .Nm
-was developed by
+utility was developed by
 .An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 4763cc624f6e..7517a64cb21c 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 3, 2011
+.Dd September 26, 2014
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -58,6 +58,28 @@ is provided,
 .Nm
 restricts the search to the specific section of the manual.
 .Pp
+The sections of the manual are:
+.Bl -enum -offset indent -compact
+.It
+.Fx General Commands Manual
+.It
+.Fx System Calls Manual
+.It
+.Fx Library Functions Manual
+.It
+.Fx Kernel Interfaces Manual
+.It
+.Fx File Formats Manual
+.It
+.Fx Games Manual
+.It
+.Fx Miscellaneous Information Manual
+.It
+.Fx System Manager's Manual
+.It
+.Fx Kernel Developer's Manual
+.El
+.Pp
 Options that
 .Nm
 understands:
@@ -318,6 +340,14 @@ Local configuration files.
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr intro 1 ,
+.Xr intro 2 ,
+.Xr intro 3 ,
+.Xr intro 4 ,
+.Xr intro 5 ,
+.Xr intro 6 ,
+.Xr intro 7 ,
+.Xr intro 8 ,
+.Xr intro 9 ,
 .Xr locale 1 ,
 .Xr manpath 1 ,
 .Xr nroff 1 ,
diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile
index b802799f96ed..28aac7ded9db 100644
--- a/usr.bin/mkimg/Makefile
+++ b/usr.bin/mkimg/Makefile
@@ -1,13 +1,20 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	mkimg
 SRCS=	format.c image.c mkimg.c scheme.c
 MAN=	mkimg.1
 
+MKIMG_VERSION=20141003
+mkimg.o: Makefile
+
+CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION}
 CFLAGS+=-DSPARSE_WRITE
 
 # List of formats to support
 SRCS+= \
+	qcow.c \
 	raw.c \
 	vhd.c \
 	vmdk.c
@@ -29,4 +36,8 @@ LDADD=	-lutil
 
 WARNS?=	6
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c
index 12add8e4cb8a..de92cc0e9b92 100644
--- a/usr.bin/mkimg/apm.c
+++ b/usr.bin/mkimg/apm.c
@@ -57,13 +57,12 @@ static struct mkimg_alias apm_aliases[] = {
     {	ALIAS_NONE, 0 }
 };
 
-static u_int
-apm_metadata(u_int where)
+static lba_t
+apm_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	secs = (where == SCHEME_META_IMG_START) ? nparts + 2 : 0;
-	return (secs);
+	blk += (where == SCHEME_META_IMG_START) ? nparts + 2 : 0;
+	return (round_block(blk));
 }
 
 static int
diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c
index 03af5cd2e863..75e554f39b4f 100644
--- a/usr.bin/mkimg/bsd.c
+++ b/usr.bin/mkimg/bsd.c
@@ -52,13 +52,17 @@ static struct mkimg_alias bsd_aliases[] = {
     {	ALIAS_NONE, 0 }
 };
 
-static u_int
-bsd_metadata(u_int where)
+static lba_t
+bsd_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	secs = BBSIZE / secsz;
-	return ((where == SCHEME_META_IMG_START) ? secs : 0);
+	if (where == SCHEME_META_IMG_START)
+		blk += BBSIZE / secsz;
+	else if (where == SCHEME_META_IMG_END)
+		blk = round_cylinder(blk);
+	else
+		blk = round_block(blk);
+	return (blk);
 }
 
 static int
@@ -68,7 +72,7 @@ bsd_write(lba_t imgsz, void *bootcode)
 	struct disklabel *d;
 	struct partition *dp;
 	struct part *part;
-	int error, n;
+	int bsdparts, error, n;
 	uint16_t checksum;
 
 	buf = malloc(BBSIZE);
@@ -76,16 +80,13 @@ bsd_write(lba_t imgsz, void *bootcode)
 		return (ENOMEM);
 	if (bootcode != NULL) {
 		memcpy(buf, bootcode, BBSIZE);
-		memset(buf + secsz, 0, secsz);
+		memset(buf + secsz, 0, sizeof(struct disklabel));
 	} else
 		memset(buf, 0, BBSIZE);
 
-	imgsz = (lba_t)ncyls * nheads * nsecs;
-	error = image_set_size(imgsz);
-	if (error) {
-		free(buf);
-		return (error);
-	}
+	bsdparts = nparts + 1;	/* Account for c partition */
+	if (bsdparts < MAXPARTITIONS)
+		bsdparts = MAXPARTITIONS;
 
 	d = (void *)(buf + secsz);
 	le32enc(&d->d_magic, DISKMAGIC);
@@ -97,7 +98,7 @@ bsd_write(lba_t imgsz, void *bootcode)
 	le32enc(&d->d_secperunit, imgsz);
 	le16enc(&d->d_rpm, 3600);
 	le32enc(&d->d_magic2, DISKMAGIC);
-	le16enc(&d->d_npartitions, (8 > nparts + 1) ? 8 : nparts + 1);
+	le16enc(&d->d_npartitions, bsdparts);
 	le32enc(&d->d_bbsize, BBSIZE);
 
 	dp = &d->d_partitions[RAW_PART];
@@ -107,12 +108,15 @@ bsd_write(lba_t imgsz, void *bootcode)
 		dp = &d->d_partitions[n];
 		le32enc(&dp->p_size, part->size);
 		le32enc(&dp->p_offset, part->block);
+		le32enc(&dp->p_fsize, 0);
 		dp->p_fstype = ALIAS_TYPE2INT(part->type);
+		dp->p_frag = 0;
+		le16enc(&dp->p_cpg, 0);
 	}
 
-	dp = &d->d_partitions[nparts + 1];
+	dp = &d->d_partitions[bsdparts];
 	checksum = 0;
-	for (p = buf; p < (u_char *)dp; p += 2)
+	for (p = (void *)d; p < (u_char *)dp; p += 2)
 		checksum ^= le16dec(p);
 	le16enc(&d->d_checksum, checksum);
 
diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c
index 77204d70e813..28931ea4de8c 100644
--- a/usr.bin/mkimg/ebr.c
+++ b/usr.bin/mkimg/ebr.c
@@ -49,22 +49,23 @@ static struct mkimg_alias ebr_aliases[] = {
     {	ALIAS_NONE, 0 }
 };
 
-static u_int
-ebr_metadata(u_int where)
+static lba_t
+ebr_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	secs = (where == SCHEME_META_PART_BEFORE) ? nsecs : 0;
-	return (secs);
+	blk += (where == SCHEME_META_PART_BEFORE) ? 1 : 0;
+	return (round_track(blk));
 }
 
 static void
-ebr_chs(u_char *cyl, u_char *hd, u_char *sec, uint32_t lba __unused)
+ebr_chs(u_char *cylp, u_char *hdp, u_char *secp, lba_t lba)
 {
+	u_int cyl, hd, sec;
 
-	*cyl = 0xff;		/* XXX */
-	*hd = 0xff;		/* XXX */
-	*sec = 0xff;		/* XXX */
+	mkimg_chs(lba, 1023, &cyl, &hd, &sec);
+	*cylp = cyl;
+	*hdp = hd;
+	*secp = (sec & 0x3f) | ((cyl >> 2) & 0xc0);
 }
 
 static int
@@ -73,7 +74,7 @@ ebr_write(lba_t imgsz __unused, void *bootcode __unused)
 	u_char *ebr;
 	struct dos_partition *dp;
 	struct part *part, *next;
-	lba_t block;
+	lba_t block, size;
 	int error;
 
 	ebr = malloc(secsz);
@@ -85,24 +86,26 @@ ebr_write(lba_t imgsz __unused, void *bootcode __unused)
 	error = 0;
 	STAILQ_FOREACH_SAFE(part, &partlist, link, next) {
 		block = part->block - nsecs;
+		size = round_track(part->size);
 		dp = (void *)(ebr + DOSPARTOFF);
 		ebr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect, nsecs);
 		dp->dp_typ = ALIAS_TYPE2INT(part->type);
 		ebr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
-		    part->block + part->size - 1);
+		    part->block + size - 1);
 		le32enc(&dp->dp_start, nsecs);
-		le32enc(&dp->dp_size, part->size);
+		le32enc(&dp->dp_size, size);
 
 		/* Add link entry */
 		if (next != NULL) {
+			size = round_track(next->size);
 			dp++;
 			ebr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
 			    next->block - nsecs);
 			dp->dp_typ = DOSPTYP_EXT;
 			ebr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
-			    next->block + next->size - 1);
+			    next->block + size - 1);
 			le32enc(&dp->dp_start, next->block - nsecs);
-			le32enc(&dp->dp_size, next->size + nsecs);
+			le32enc(&dp->dp_size, size + nsecs);
 		}
 
 		error = image_write(block, ebr, 1);
diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
index 959deb37bc0d..5773a6a612f7 100644
--- a/usr.bin/mkimg/gpt.c
+++ b/usr.bin/mkimg/gpt.c
@@ -153,17 +153,15 @@ gpt_tblsz(void)
 	return ((nparts + ents - 1) / ents);
 }
 
-static u_int
-gpt_metadata(u_int where)
+static lba_t
+gpt_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	if (where != SCHEME_META_IMG_START && where != SCHEME_META_IMG_END)
-		return (0);
-
-	secs = gpt_tblsz();
-	secs += (where == SCHEME_META_IMG_START) ? 2 : 1;
-	return (secs);
+	if (where == SCHEME_META_IMG_START || where == SCHEME_META_IMG_END) {
+		blk += gpt_tblsz();
+		blk += (where == SCHEME_META_IMG_START) ? 2 : 1;
+	}
+	return (round_block(blk));
 }
 
 static int
diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c
index f448d98f0f92..3e7c7d2945a5 100644
--- a/usr.bin/mkimg/image.c
+++ b/usr.bin/mkimg/image.c
@@ -27,70 +27,461 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/mman.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <paths.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "image.h"
 #include "mkimg.h"
 
-#define	BUFFER_SIZE	(1024*1024)
+struct chunk {
+	STAILQ_ENTRY(chunk) ch_list;
+	size_t	ch_size;		/* Size of chunk in bytes. */
+	lba_t	ch_block;		/* Block address in image. */
+	union {
+		struct {
+			off_t	ofs;	/* Offset in backing file. */
+			int	fd;	/* FD of backing file. */
+		} file;
+		struct {
+			void	*ptr;	/* Pointer to data in memory */
+		} mem;
+	} ch_u;
+	u_int	ch_type;
+#define	CH_TYPE_ZEROES		0	/* Chunk is a gap (no data). */
+#define	CH_TYPE_FILE		1	/* File-backed chunk. */
+#define	CH_TYPE_MEMORY		2	/* Memory-backed chunk */
+};
+
+static STAILQ_HEAD(chunk_head, chunk) image_chunks;
+static u_int image_nchunks;
+
+static char image_swap_file[PATH_MAX];
+static int image_swap_fd = -1;
+static u_int image_swap_pgsz;
+static off_t image_swap_size;
 
-static char image_tmpfile[PATH_MAX];
-static int image_fd = -1;
 static lba_t image_size;
 
-static void
-cleanup(void)
+static int
+is_empty_sector(void *buf)
 {
+	uint64_t *p = buf;
+	size_t n, max;
 
-	if (image_fd != -1)
-		close(image_fd);
-	unlink(image_tmpfile);
+	assert(((uintptr_t)p & 3) == 0);
+
+	max = secsz / sizeof(uint64_t);
+	for (n = 0; n < max; n++) {
+		if (p[n] != 0UL)
+			return (0);
+	}
+	return (1);
+}
+
+/*
+ * Swap file handlng.
+ */
+
+static off_t
+image_swap_alloc(size_t size)
+{
+	off_t ofs;
+	size_t unit;
+
+	unit = (secsz > image_swap_pgsz) ? secsz : image_swap_pgsz;
+	assert((unit & (unit - 1)) == 0);
+
+	size = (size + unit - 1) & ~(unit - 1);
+
+	ofs = image_swap_size;
+	image_swap_size += size;
+	if (ftruncate(image_swap_fd, image_swap_size) == -1) {
+		image_swap_size = ofs;
+		ofs = -1LL;
+	}
+	return (ofs);
+}
+
+/*
+ * Image chunk handling.
+ */
+
+static struct chunk *
+image_chunk_find(lba_t blk)
+{
+	static struct chunk *last = NULL;
+	struct chunk *ch;
+
+	ch = (last != NULL && last->ch_block <= blk)
+	    ? last : STAILQ_FIRST(&image_chunks);
+	while (ch != NULL) {
+		if (ch->ch_block <= blk &&
+		    (lba_t)(ch->ch_block + (ch->ch_size / secsz)) > blk) {
+			last = ch;
+			break;
+		}
+		ch = STAILQ_NEXT(ch, ch_list);
+	}
+	return (ch);
+}
+
+static size_t
+image_chunk_grow(struct chunk *ch, size_t sz)
+{
+	size_t dsz, newsz;
+
+	newsz = ch->ch_size + sz;
+	if (newsz > ch->ch_size) {
+		ch->ch_size = newsz;
+		return (0);
+	}
+	/* We would overflow -- create new chunk for remainder. */
+	dsz = SIZE_MAX - ch->ch_size;
+	assert(dsz < sz);
+	ch->ch_size = SIZE_MAX;
+	return (sz - dsz);
+}
+
+static struct chunk *
+image_chunk_memory(struct chunk *ch, lba_t blk)
+{
+	struct chunk *new;
+	void *ptr;
+
+	ptr = calloc(1, secsz);
+	if (ptr == NULL)
+		return (NULL);
+
+	if (ch->ch_block < blk) {
+		new = malloc(sizeof(*new));
+		if (new == NULL) {
+			free(ptr);
+			return (NULL);
+		}
+		memcpy(new, ch, sizeof(*new));
+		ch->ch_size = (blk - ch->ch_block) * secsz;
+		new->ch_block = blk;
+		new->ch_size -= ch->ch_size;
+		STAILQ_INSERT_AFTER(&image_chunks, ch, new, ch_list);
+		image_nchunks++;
+		ch = new;
+	}
+
+	if (ch->ch_size > secsz) {
+		new = malloc(sizeof(*new));
+		if (new == NULL) {
+			free(ptr);
+			return (NULL);
+		}
+		memcpy(new, ch, sizeof(*new));
+		ch->ch_size = secsz;
+		new->ch_block++;
+		new->ch_size -= secsz;
+		STAILQ_INSERT_AFTER(&image_chunks, ch, new, ch_list);
+		image_nchunks++;
+	}
+
+	ch->ch_type = CH_TYPE_MEMORY;
+	ch->ch_u.mem.ptr = ptr;
+	return (ch);
+}
+
+static int
+image_chunk_skipto(lba_t to)
+{
+	struct chunk *ch;
+	lba_t from;
+	size_t sz;
+
+	ch = STAILQ_LAST(&image_chunks, chunk, ch_list);
+	from = (ch != NULL) ? ch->ch_block + (ch->ch_size / secsz) : 0LL;
+
+	assert(from <= to);
+
+	/* Nothing to do? */
+	if (from == to)
+		return (0);
+	/* Avoid bugs due to overflows. */
+	if ((uintmax_t)(to - from) > (uintmax_t)(SIZE_MAX / secsz))
+		return (EFBIG);
+	sz = (to - from) * secsz;
+	if (ch != NULL && ch->ch_type == CH_TYPE_ZEROES) {
+		sz = image_chunk_grow(ch, sz);
+		if (sz == 0)
+			return (0);
+		from = ch->ch_block + (ch->ch_size / secsz);
+	}
+	ch = malloc(sizeof(*ch));
+	if (ch == NULL)
+		return (ENOMEM);
+	memset(ch, 0, sizeof(*ch));
+	ch->ch_block = from;
+	ch->ch_size = sz;
+	ch->ch_type = CH_TYPE_ZEROES;
+	STAILQ_INSERT_TAIL(&image_chunks, ch, ch_list);
+	image_nchunks++;
+	return (0);
+}
+
+static int
+image_chunk_append(lba_t blk, size_t sz, off_t ofs, int fd)
+{
+	struct chunk *ch;
+
+	ch = STAILQ_LAST(&image_chunks, chunk, ch_list);
+	if (ch != NULL && ch->ch_type == CH_TYPE_FILE) {
+		if (fd == ch->ch_u.file.fd &&
+		    blk == (lba_t)(ch->ch_block + (ch->ch_size / secsz)) &&
+		    ofs == (off_t)(ch->ch_u.file.ofs + ch->ch_size)) {
+			sz = image_chunk_grow(ch, sz);
+			if (sz == 0)
+				return (0);
+			blk = ch->ch_block + (ch->ch_size / secsz);
+			ofs = ch->ch_u.file.ofs + ch->ch_size;
+		}
+	}
+	ch = malloc(sizeof(*ch));
+	if (ch == NULL)
+		return (ENOMEM);
+	memset(ch, 0, sizeof(*ch));
+	ch->ch_block = blk;
+	ch->ch_size = sz;
+	ch->ch_type = CH_TYPE_FILE;
+	ch->ch_u.file.ofs = ofs;
+	ch->ch_u.file.fd = fd;
+	STAILQ_INSERT_TAIL(&image_chunks, ch, ch_list);
+	image_nchunks++;
+	return (0);
+}
+
+static int
+image_chunk_copyin(lba_t blk, void *buf, size_t sz, off_t ofs, int fd)
+{
+	uint8_t *p = buf;
+	int error;
+
+	error = 0;
+	sz = (sz + secsz - 1) & ~(secsz - 1);
+	while (!error && sz > 0) {
+		if (is_empty_sector(p))
+			error = image_chunk_skipto(blk + 1);
+		else
+			error = image_chunk_append(blk, secsz, ofs, fd);
+		blk++;
+		p += secsz;
+		sz -= secsz;
+		ofs += secsz;
+	}
+	return (error);
+}
+
+/*
+ * File mapping support.
+ */
+
+static void *
+image_file_map(int fd, off_t ofs, size_t sz)
+{
+	void *ptr;
+	size_t unit;
+	int flags, prot;
+
+	unit = (secsz > image_swap_pgsz) ? secsz : image_swap_pgsz;
+	assert((unit & (unit - 1)) == 0);
+
+	flags = MAP_NOCORE | MAP_NOSYNC | MAP_SHARED;
+	/* Allow writing to our swap file only. */
+	prot = PROT_READ | ((fd == image_swap_fd) ? PROT_WRITE : 0);
+	sz = (sz + unit - 1) & ~(unit - 1);
+	ptr = mmap(NULL, sz, prot, flags, fd, ofs);
+	return ((ptr == MAP_FAILED) ? NULL : ptr);
+}
+
+static int
+image_file_unmap(void *buffer, size_t sz)
+{
+	size_t unit;
+
+	unit = (secsz > image_swap_pgsz) ? secsz : image_swap_pgsz;
+	sz = (sz + unit - 1) & ~(unit - 1);
+	munmap(buffer, sz);
+	return (0);
+}
+
+/*
+ * Input/source file handling.
+ */
+
+static int
+image_copyin_stream(lba_t blk, int fd, uint64_t *sizep)
+{
+	char *buffer;
+	uint64_t bytesize;
+	off_t swofs;
+	size_t iosz;
+	ssize_t rdsz;
+	int error;
+
+	/*
+	 * This makes sure we're doing I/O in multiples of the page
+	 * size as well as of the sector size. 2MB is the minimum
+	 * by virtue of secsz at least 512 bytes and the page size
+	 * at least 4K bytes.
+	 */
+	iosz = secsz * image_swap_pgsz;
+
+	bytesize = 0;
+	do {
+		swofs = image_swap_alloc(iosz);
+		if (swofs == -1LL)
+			return (errno);
+		buffer = image_file_map(image_swap_fd, swofs, iosz);
+		if (buffer == NULL)
+			return (errno);
+		rdsz = read(fd, buffer, iosz);
+		if (rdsz > 0)
+			error = image_chunk_copyin(blk, buffer, rdsz, swofs,
+			    image_swap_fd);
+		else if (rdsz < 0)
+			error = errno;
+		else
+			error = 0;
+		image_file_unmap(buffer, iosz);
+		/* XXX should we relinguish unused swap space? */
+		if (error)
+			return (error);
+
+		bytesize += rdsz;
+		blk += (rdsz + secsz - 1) / secsz;
+	} while (rdsz > 0);
+
+	if (sizep != NULL)
+		*sizep = bytesize;
+	return (0);
+}
+
+static int
+image_copyin_mapped(lba_t blk, int fd, uint64_t *sizep)
+{
+	off_t cur, data, end, hole, pos;
+	void *buf;
+	uint64_t bytesize;
+	size_t iosz, sz;
+	int error;
+
+	/*
+	 * We'd like to know the size of the file and we must
+	 * be able to seek in order to mmap(2). If this isn't
+	 * possible, then treat the file as a stream/pipe.
+	 */
+	end = lseek(fd, 0L, SEEK_END);
+	if (end == -1L)
+		return (image_copyin_stream(blk, fd, sizep));
+
+	/*
+	 * We need the file opened for the duration and our
+	 * caller is going to close the file. Make a dup(2)
+	 * so that control the faith of the descriptor.
+	 */
+	fd = dup(fd);
+	if (fd == -1)
+		return (errno);
+
+	iosz = secsz * image_swap_pgsz;
+
+	bytesize = 0;
+	cur = pos = 0;
+	error = 0;
+	while (!error && cur < end) {
+		hole = lseek(fd, cur, SEEK_HOLE);
+		data = lseek(fd, cur, SEEK_DATA);
+
+		/*
+		 * Treat the entire file as data if sparse files
+		 * are not supported by the underlying file system.
+		 */
+		if (hole == -1 && data == -1) {
+			data = cur;
+			hole = end;
+		}
+
+		if (cur == hole && data > hole) {
+			hole = pos;
+			pos = data & ~((uint64_t)secsz - 1);
+
+			blk += (pos - hole) / secsz;
+			error = image_chunk_skipto(blk);
+
+			bytesize += pos - hole;
+			cur = data;
+		} else if (cur == data && hole > data) {
+			data = pos;
+			pos = (hole + secsz - 1) & ~((uint64_t)secsz - 1);
+
+			while (data < pos) {
+				sz = (pos - data > (off_t)iosz)
+				    ? iosz : (size_t)(pos - data);
+
+				buf = image_file_map(fd, data, sz);
+				if (buf != NULL) {
+					error = image_chunk_copyin(blk, buf,
+					    sz, data, fd);
+					image_file_unmap(buf, sz);
+				} else
+					error = errno;
+
+				blk += sz / secsz;
+				bytesize += sz;
+				data += sz;
+			}
+			cur = hole;
+		} else {
+			/*
+			 * I don't know what this means or whether it
+			 * can happen at all...
+			 */
+			error = EDOOFUS;
+			break;
+		}
+	}
+	if (error)
+		close(fd);
+	if (!error && sizep != NULL)
+		*sizep = bytesize;
+	return (error);
 }
 
 int
 image_copyin(lba_t blk, int fd, uint64_t *sizep)
 {
-	char *buffer;
-	uint64_t bytesize;
-	ssize_t bcnt, rdsz;
-	int error, partial;
+	struct stat sb;
+	int error;
 
-	assert(BUFFER_SIZE % secsz == 0);
-
-	buffer = malloc(BUFFER_SIZE);
-	if (buffer == NULL)
-		return (ENOMEM);
-	bytesize = 0;
-	partial = 0;
-	while (1) {
-		rdsz = read(fd, buffer, BUFFER_SIZE);
-		if (rdsz <= 0) {
-			error = (rdsz < 0) ? errno : 0;
-			break;
-		}
-		if (partial)
-			abort();
-		bytesize += rdsz;
-		bcnt = (rdsz + secsz - 1) / secsz;
-		error = image_write(blk, buffer, bcnt);
-		if (error)
-			break;
-		blk += bcnt;
-		partial = ((ssize_t)(bcnt * secsz) != rdsz) ? 1 : 0;
+	error = image_chunk_skipto(blk);
+	if (!error) {
+		if (fstat(fd, &sb) == -1 || !S_ISREG(sb.st_mode))
+			error = image_copyin_stream(blk, fd, sizep);
+		else
+			error = image_copyin_mapped(blk, fd, sizep);
 	}
-	free(buffer);
-	if (sizep != NULL)
-		*sizep = bytesize;
 	return (error);
 }
 
+/*
+ * Output/sink file handling.
+ */
+
 int
 image_copyout(int fd)
 {
@@ -115,71 +506,124 @@ image_copyout_done(int fd)
 	return (error);
 }
 
+static int
+image_copyout_memory(int fd, size_t size, void *ptr)
+{
+
+	if (write(fd, ptr, size) == -1)
+		return (errno);
+	return (0);
+}
+
+static int
+image_copyout_zeroes(int fd, size_t size)
+{
+	static uint8_t *zeroes = NULL;
+	size_t sz;
+	int error;
+
+	if (lseek(fd, (off_t)size, SEEK_CUR) != -1)
+		return (0);
+
+	/*
+	 * If we can't seek, we must write.
+	 */
+
+	if (zeroes == NULL) {
+		zeroes = calloc(1, secsz);
+		if (zeroes == NULL)
+			return (ENOMEM);
+	}
+
+	while (size > 0) {
+		sz = (size > secsz) ? secsz : size;
+		error = image_copyout_memory(fd, sz, zeroes);
+		if (error)
+			return (error);
+		size -= sz;
+	}
+	return (0);
+}
+
+static int
+image_copyout_file(int fd, size_t size, int ifd, off_t iofs)
+{
+	void *buf;
+	size_t iosz, sz;
+	int error;
+
+	iosz = secsz * image_swap_pgsz;
+
+	while (size > 0) {
+		sz = (size > iosz) ? iosz : size;
+		buf = image_file_map(ifd, iofs, sz);
+		if (buf == NULL)
+			return (errno);
+		error = image_copyout_memory(fd, sz, buf);
+		image_file_unmap(buf, sz);
+		if (error)
+			return (error);
+		size -= sz;
+		iofs += sz;
+	}
+	return (0);
+}
+
 int
 image_copyout_region(int fd, lba_t blk, lba_t size)
 {
-	char *buffer;
-	off_t ofs;
-	size_t sz;
-	ssize_t rdsz, wrsz;
+	struct chunk *ch;
+	size_t ofs, sz;
 	int error;
 
-	ofs = lseek(fd, 0L, SEEK_CUR);
-
-	blk *= secsz;
-	if (lseek(image_fd, blk, SEEK_SET) != blk)
-		return (errno);
-	buffer = malloc(BUFFER_SIZE);
-	if (buffer == NULL)
-		return (errno);
-	error = 0;
 	size *= secsz;
+
 	while (size > 0) {
-		sz = (BUFFER_SIZE < size) ? BUFFER_SIZE : size;
-		rdsz = read(image_fd, buffer, sz);
-		if (rdsz <= 0) {
-			error = (rdsz < 0) ? errno : 0;
+		ch = image_chunk_find(blk);
+		if (ch == NULL)
+			return (EINVAL);
+		ofs = (blk - ch->ch_block) * secsz;
+		sz = ch->ch_size - ofs;
+		sz = ((lba_t)sz < size) ? sz : (size_t)size;
+		switch (ch->ch_type) {
+		case CH_TYPE_ZEROES:
+			error = image_copyout_zeroes(fd, sz);
 			break;
-		}
-		wrsz = (ofs == -1) ?
-		    write(fd, buffer, rdsz) :
-		    sparse_write(fd, buffer, rdsz);
-		if (wrsz < 0) {
-			error = errno;
+		case CH_TYPE_FILE:
+			error = image_copyout_file(fd, sz, ch->ch_u.file.fd,
+			    ch->ch_u.file.ofs + ofs);
 			break;
+		case CH_TYPE_MEMORY:
+			error = image_copyout_memory(fd, sz, ch->ch_u.mem.ptr);
+			break;
+		default:
+			return (EDOOFUS);
 		}
-		assert(wrsz == rdsz);
-		size -= rdsz;
+		size -= sz;
+		blk += sz / secsz;
 	}
-	free(buffer);
-	return (error);
+	return (0);
 }
 
 int
 image_data(lba_t blk, lba_t size)
 {
-	char *buffer, *p;
+	struct chunk *ch;
+	lba_t lim;
 
-	blk *= secsz;
-	if (lseek(image_fd, blk, SEEK_SET) != blk)
-		return (1);
-
-	size *= secsz;
-	buffer = malloc(size);
-	if (buffer == NULL)
-		return (1);
-
-	if (read(image_fd, buffer, size) != (ssize_t)size) {
-		free(buffer);
-		return (1);
+	while (1) {
+		ch = image_chunk_find(blk);
+		if (ch == NULL)
+			return (0);
+		if (ch->ch_type != CH_TYPE_ZEROES)
+			return (1);
+		lim = ch->ch_block + (ch->ch_size / secsz);
+		if (lim >= blk + size)
+			return (0);
+		size -= lim - blk;
+		blk = lim;
 	}
-
-	p = buffer;
-	while (size > 0 && *p == '\0')
-		size--, p++;
-
-	free(buffer);
-	return ((size == 0) ? 0 : 1);
+	/*NOTREACHED*/
 }
 
 lba_t
@@ -192,39 +636,87 @@ image_get_size(void)
 int
 image_set_size(lba_t blk)
 {
+	int error;
 
-	image_size = blk;
-	if (ftruncate(image_fd, blk * secsz) == -1)
-		return (errno);
-	return (0);
+	error = image_chunk_skipto(blk);
+	if (!error)
+		image_size = blk;
+	return (error);
 }
 
 int
 image_write(lba_t blk, void *buf, ssize_t len)
 {
+	struct chunk *ch;
 
-	blk *= secsz;
-	if (lseek(image_fd, blk, SEEK_SET) != blk)
-		return (errno);
-	len *= secsz;
-	if (sparse_write(image_fd, buf, len) != len)
-		return (errno);
+	while (len > 0) {
+		if (!is_empty_sector(buf)) {
+			ch = image_chunk_find(blk);
+			if (ch == NULL)
+				return (ENXIO);
+			/* We may not be able to write to files. */
+			if (ch->ch_type == CH_TYPE_FILE)
+				return (EINVAL);
+			if (ch->ch_type == CH_TYPE_ZEROES) {
+				ch = image_chunk_memory(ch, blk);
+				if (ch == NULL)
+					return (ENOMEM);
+			}
+			assert(ch->ch_type == CH_TYPE_MEMORY);
+			memcpy(ch->ch_u.mem.ptr, buf, secsz);
+		}
+		blk++;
+		buf = (char *)buf + secsz;
+		len--;
+	}
 	return (0);
 }
 
+static void
+image_cleanup(void)
+{
+	struct chunk *ch;
+
+	while ((ch = STAILQ_FIRST(&image_chunks)) != NULL) {
+		switch (ch->ch_type) {
+		case CH_TYPE_FILE:
+			/* We may be closing the same file multiple times. */
+			if (ch->ch_u.file.fd != -1)
+				close(ch->ch_u.file.fd);
+			break;
+		case CH_TYPE_MEMORY:
+			free(ch->ch_u.mem.ptr);
+			break;
+		default:
+			break;
+		}
+		STAILQ_REMOVE_HEAD(&image_chunks, ch_list);
+		free(ch);
+	}
+	if (image_swap_fd != -1)
+		close(image_swap_fd);
+	unlink(image_swap_file);
+}
+
 int
 image_init(void)
 {
 	const char *tmpdir;
 
-	if (atexit(cleanup) == -1)
+	STAILQ_INIT(&image_chunks);
+	image_nchunks = 0;
+
+	image_swap_size = 0;
+	image_swap_pgsz = getpagesize();
+
+	if (atexit(image_cleanup) == -1)
 		return (errno);
 	if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0')
 		tmpdir = _PATH_TMP;
-	snprintf(image_tmpfile, sizeof(image_tmpfile), "%s/mkimg-XXXXXX",
+	snprintf(image_swap_file, sizeof(image_swap_file), "%s/mkimg-XXXXXX",
 	    tmpdir);
-	image_fd = mkstemp(image_tmpfile);
-	if (image_fd == -1)
+	image_swap_fd = mkstemp(image_swap_file);
+	if (image_swap_fd == -1)
 		return (errno);
 	return (0);
 }
diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c
index 4b0f24262dbb..c1b7822efe30 100644
--- a/usr.bin/mkimg/mbr.c
+++ b/usr.bin/mkimg/mbr.c
@@ -50,22 +50,23 @@ static struct mkimg_alias mbr_aliases[] = {
     {	ALIAS_NONE, 0 }		/* Keep last! */
 };
 
-static u_int
-mbr_metadata(u_int where)
+static lba_t
+mbr_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	secs = (where == SCHEME_META_IMG_START) ? nsecs : 0;
-	return (secs);
+	blk += (where == SCHEME_META_IMG_START) ? 1 : 0;
+	return (round_track(blk));
 }
 
 static void
-mbr_chs(u_char *cyl, u_char *hd, u_char *sec, uint32_t lba __unused)
+mbr_chs(u_char *cylp, u_char *hdp, u_char *secp, lba_t lba)
 {
+	u_int cyl, hd, sec;
 
-	*cyl = 0xff;		/* XXX */
-	*hd = 0xff;		/* XXX */
-	*sec = 0xff;		/* XXX */
+	mkimg_chs(lba, 1023, &cyl, &hd, &sec);
+	*cylp = cyl;
+	*hdp = hd;
+	*secp = (sec & 0x3f) | ((cyl >> 2) & 0xc0);
 }
 
 static int
@@ -74,6 +75,7 @@ mbr_write(lba_t imgsz __unused, void *bootcode)
 	u_char *mbr;
 	struct dos_partition *dpbase, *dp;
 	struct part *part;
+	lba_t size;
 	int error;
 
 	mbr = malloc(secsz);
@@ -87,15 +89,16 @@ mbr_write(lba_t imgsz __unused, void *bootcode)
 	le16enc(mbr + DOSMAGICOFFSET, DOSMAGIC);
 	dpbase = (void *)(mbr + DOSPARTOFF);
 	STAILQ_FOREACH(part, &partlist, link) {
+		size = round_track(part->size);
 		dp = dpbase + part->index;
 		dp->dp_flag = (part->index == 0 && bootcode != NULL) ? 0x80 : 0;
 		mbr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
 		    part->block);
 		dp->dp_typ = ALIAS_TYPE2INT(part->type);
 		mbr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
-		    part->block + part->size - 1);
+		    part->block + size - 1);
 		le32enc(&dp->dp_start, part->block);
-		le32enc(&dp->dp_size, part->size);
+		le32enc(&dp->dp_size, size);
 	}
 	error = image_write(0, mbr, 1);
 	free(mbr);
diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1
index ed14cc8f9f74..bfe05c01cc09 100644
--- a/usr.bin/mkimg/mkimg.1
+++ b/usr.bin/mkimg/mkimg.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 4, 2014
+.Dd September 27, 2014
 .Dt MKIMG 1
 .Os
 .Sh NAME
@@ -44,6 +44,8 @@
 .Fl s Ar scheme
 .Fl p Ar partition
 .Op Fl p Ar partition ...
+.Nm
+.Ar --formats | --schemes | --version
 .Sh DESCRIPTION
 The
 .Nm
@@ -122,10 +124,32 @@ utility will generate predictable values for Universally Unique Identifiers
 .Nm
 utility will create images that are identical.
 .Pp
-For a complete list of supported partitioning schemes or supported output
-format, or for a detailed description of how to specify partitions, run the
+A set of long options exist to query about the
+.Nm
+utilty itself.
+Options in this set should be given by themselves because the
+.Nm
+utility exits immediately after providing the requested information.
+The version of the
+.Nm
+utility is printed when the
+.Ar --version
+option is given.
+The list of supported output formats is printed when the
+.Ar --formats
+option is given and the list of supported partitioning schemes is printed
+when the
+.Ar --schemes
+option is given.
+Both the format and scheme lists a space-separated lists for easy handling
+in scripts.
+.Pp
+For a more descriptive list of supported partitioning schemes or supported
+output format, or for a detailed description of how to specify partitions,
+run the
 .Nm
 utility without any arguments.
+This will print a usage message with all the necessary details.
 .Sh ENVIRONMENT
 .Bl -tag -width "TMPDIR" -compact
 .It Ev TMPDIR
@@ -171,6 +195,25 @@ utility as follows:
 .Dl % mkimg -s mbr -b /boot/mbr -p freebsd:-'mkimg -s bsd -b /boot/boot \
 -p freebsd-ufs:=root-file-system.ufs -p freebsd-swap::1G' -o mbr-bsd.img
 .Pp
+To accomodate the need to have partitions named or numbered in a certain
+way, the
+.Nm
+utility allows for the specification of empty partitions.
+For example, to create an image that is compatible with partition layouts
+found in
+.Pa /etc/disktab ,
+the 'd' partition often needs to be skipped.
+This is accomplished by inserting an unused partition after the first 2
+partition specifications.
+It is worth noting at this time that the BSD scheme will automatically
+skip the 'c' partition by virtue of it referring to the entire disk.
+To create an image that is compatible with the qp120at disk, use the
+.Nm
+utility as follows:
+.Dl % mkimg -s bsd -b /boot/boot -p freebsd-ufs:=root-file-system.ufs \
+-p freebsd-swap::20M -p- -p- -p- -p- -p freebsd-ufs:=usr-file-system.ufs \
+-o bsd.img
+.Pp
 For partitioning schemes that feature partition labels, the
 .Nm
 utility supports assigning labels to the partitions specified.
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index 4513e665e443..b55ee7e8fdaa 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <err.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <libutil.h>
 #include <limits.h>
 #include <stdio.h>
@@ -48,6 +49,17 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#define	LONGOPT_FORMATS	0x01000001
+#define	LONGOPT_SCHEMES	0x01000002
+#define	LONGOPT_VERSION	0x01000003
+
+static struct option longopts[] = {
+	{ "formats", no_argument, NULL, LONGOPT_FORMATS },
+	{ "schemes", no_argument, NULL, LONGOPT_SCHEMES },
+	{ "version", no_argument, NULL, LONGOPT_VERSION },
+	{ NULL, 0, NULL, 0 }
+};
+
 struct partlisthead partlist = STAILQ_HEAD_INITIALIZER(partlist);
 u_int nparts = 0;
 
@@ -61,15 +73,79 @@ u_int secsz = 512;
 u_int blksz = 0;
 
 static void
-usage(const char *why)
+print_formats(int usage)
 {
 	struct mkimg_format *f, **f_iter;
+	const char *sep;
+
+	if (usage) {
+		fprintf(stderr, "    formats:\n");
+		SET_FOREACH(f_iter, formats) {
+			f = *f_iter;
+			fprintf(stderr, "\t%s\t-  %s\n", f->name,
+			    f->description);
+		}
+	} else {
+		sep = "";
+		SET_FOREACH(f_iter, formats) {
+			f = *f_iter;
+			printf("%s%s", sep, f->name);
+			sep = " ";
+		}
+		putchar('\n');
+	}
+}
+
+static void
+print_schemes(int usage)
+{
 	struct mkimg_scheme *s, **s_iter;
+	const char *sep;
+
+	if (usage) {
+		fprintf(stderr, "    schemes:\n");
+		SET_FOREACH(s_iter, schemes) {
+			s = *s_iter;
+			fprintf(stderr, "\t%s\t-  %s\n", s->name,
+			    s->description);
+		}
+	} else {
+		sep = "";
+		SET_FOREACH(s_iter, schemes) {
+			s = *s_iter;
+			printf("%s%s", sep, s->name);
+			sep = " ";
+		}
+		putchar('\n');
+	}
+}
+
+static void
+print_version(void)
+{
+	u_int width;
+
+#ifdef __LP64__
+	width = 64;
+#else
+	width = 32;
+#endif
+	printf("mkimg %u (%u-bit)\n", MKIMG_VERSION, width);
+}
+
+static void
+usage(const char *why)
+{
 
 	warnx("error: %s", why);
-	fprintf(stderr, "\nusage: %s <options>\n", getprogname());
+	fputc('\n', stderr);
+	fprintf(stderr, "usage: %s <options>\n", getprogname());
 
 	fprintf(stderr, "    options:\n");
+	fprintf(stderr, "\t--formats\t-  list image formats\n");
+	fprintf(stderr, "\t--schemes\t-  list partition schemes\n");
+	fprintf(stderr, "\t--version\t-  show version information\n");
+	fputc('\n', stderr);
 	fprintf(stderr, "\t-b <file>\t-  file containing boot code\n");
 	fprintf(stderr, "\t-f <format>\n");
 	fprintf(stderr, "\t-o <file>\t-  file to write image into\n");
@@ -81,26 +157,19 @@ usage(const char *why)
 	fprintf(stderr, "\t-P <num>\t-  physical sector size\n");
 	fprintf(stderr, "\t-S <num>\t-  logical sector size\n");
 	fprintf(stderr, "\t-T <num>\t-  number of tracks to simulate\n");
-
-	fprintf(stderr, "\n    formats:\n");
-	SET_FOREACH(f_iter, formats) {
-		f = *f_iter;
-		fprintf(stderr, "\t%s\t-  %s\n", f->name, f->description);
-	}
-
-	fprintf(stderr, "\n    schemes:\n");
-	SET_FOREACH(s_iter, schemes) {
-		s = *s_iter;
-		fprintf(stderr, "\t%s\t-  %s\n", s->name, s->description);
-	}
-
-	fprintf(stderr, "\n    partition specification:\n");
+	fputc('\n', stderr);
+	print_formats(1);
+	fputc('\n', stderr);
+	print_schemes(1);
+	fputc('\n', stderr);
+	fprintf(stderr, "    partition specification:\n");
 	fprintf(stderr, "\t<t>[/<l>]::<size>\t-  empty partition of given "
 	    "size\n");
 	fprintf(stderr, "\t<t>[/<l>]:=<file>\t-  partition content and size "
 	    "are determined\n\t\t\t\t   by the named file\n");
 	fprintf(stderr, "\t<t>[/<l>]:-<cmd>\t-  partition content and size "
 	    "are taken from\n\t\t\t\t   the output of the command to run\n");
+	fprintf(stderr, "\t-\t\t\t-  unused partition entry\n");
 	fprintf(stderr, "\t    where:\n");
 	fprintf(stderr, "\t\t<t>\t-  scheme neutral partition type\n");
 	fprintf(stderr, "\t\t<l>\t-  optional scheme-dependent partition "
@@ -140,6 +209,9 @@ pwr_of_two(u_int nr)
  *		  '-'   contents holds a command to run; the output of
  *			which is the contents of the partition.
  *	contents  the specification of a partition's contents
+ *
+ * A specification that is a single dash indicates an unused partition
+ * entry.
  */
 static int
 parse_part(const char *spec)
@@ -149,6 +221,11 @@ parse_part(const char *spec)
 	size_t len;
 	int error;
 
+	if (strcmp(spec, "-") == 0) {
+		nparts++;
+		return (0);
+	}
+
 	part = calloc(1, sizeof(struct part));
 	if (part == NULL)
 		return (ENOMEM);
@@ -262,6 +339,27 @@ sparse_write(int fd, const void *ptr, size_t sz)
 }
 #endif /* SPARSE_WRITE */
 
+void
+mkimg_chs(lba_t lba, u_int maxcyl, u_int *cylp, u_int *hdp, u_int *secp)
+{
+	u_int hd, sec;
+
+	*cylp = *hdp = *secp = ~0U;
+	if (nsecs == 1 || nheads == 1)
+		return;
+
+	sec = lba % nsecs + 1;
+	lba /= nsecs;
+	hd = lba % nheads;
+	lba /= nheads;
+	if (lba > maxcyl)
+		return;
+
+	*cylp = lba;
+	*hdp = hd;
+	*secp = sec;
+}
+
 void
 mkimg_uuid(struct uuid *uuid)
 {
@@ -357,7 +455,8 @@ main(int argc, char *argv[])
 
 	bcfd = -1;
 	outfd = 1;	/* Write to stdout by default */
-	while ((c = getopt(argc, argv, "b:f:o:p:s:vyH:P:S:T:")) != -1) {
+	while ((c = getopt_long(argc, argv, "b:f:o:p:s:vyH:P:S:T:",
+	    longopts, NULL)) != -1) {
 		switch (c) {
 		case 'b':	/* BOOT CODE */
 			if (bcfd != -1)
@@ -423,6 +522,18 @@ main(int argc, char *argv[])
 			if (error)
 				errc(EX_DATAERR, error, "track size");
 			break;
+		case LONGOPT_FORMATS:
+			print_formats(0);
+			exit(EX_OK);
+			/*NOTREACHED*/
+		case LONGOPT_SCHEMES:
+			print_schemes(0);
+			exit(EX_OK);
+			/*NOTREACHED*/
+		case LONGOPT_VERSION:
+			print_version();
+			exit(EX_OK);
+			/*NOTREACHED*/
 		default:
 			usage("unknown option");
 		}
diff --git a/usr.bin/mkimg/mkimg.h b/usr.bin/mkimg/mkimg.h
index 9558b863d36d..281beebc9dcb 100644
--- a/usr.bin/mkimg/mkimg.h
+++ b/usr.bin/mkimg/mkimg.h
@@ -66,12 +66,29 @@ round_block(lba_t n)
 	return ((n + b - 1) & ~(b - 1));
 }
 
+static inline lba_t
+round_cylinder(lba_t n)
+{
+	u_int cyl = nsecs * nheads;
+	u_int r = n % cyl;
+	return ((r == 0) ? n : n + cyl - r);
+}
+
+static inline lba_t
+round_track(lba_t n)
+{
+	u_int r = n % nsecs;
+	return ((r == 0) ? n : n + nsecs - r);
+}
+
 #if !defined(SPARSE_WRITE)
 #define	sparse_write	write
 #else
 ssize_t sparse_write(int, const void *, size_t);
 #endif
 
+void mkimg_chs(lba_t, u_int, u_int *, u_int *, u_int *);
+
 struct uuid;
 void mkimg_uuid(struct uuid *);
 
diff --git a/usr.bin/mkimg/pc98.c b/usr.bin/mkimg/pc98.c
index 24b9156bf09c..2db0394fb296 100644
--- a/usr.bin/mkimg/pc98.c
+++ b/usr.bin/mkimg/pc98.c
@@ -59,22 +59,23 @@ static struct mkimg_alias pc98_aliases[] = {
     {	ALIAS_NONE, 0 }
 };
 
-static u_int
-pc98_metadata(u_int where)
+static lba_t
+pc98_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
-
-	secs = PC98_BOOTCODESZ / secsz;
-	return ((where == SCHEME_META_IMG_START) ? secs : 0);
+	if (where == SCHEME_META_IMG_START)
+		blk += PC98_BOOTCODESZ / secsz;
+	return (round_track(blk));
 }
 
 static void
-pc98_chs(u_short *cyl, u_char *hd, u_char *sec, uint32_t lba __unused)
+pc98_chs(u_short *cylp, u_char *hdp, u_char *secp, lba_t lba)
 {
+	u_int cyl, hd, sec;
 
-	*cyl = 0xffff;		/* XXX */
-	*hd = 0xff;		/* XXX */
-	*sec = 0xff;		/* XXX */
+	mkimg_chs(lba, 0xffff, &cyl, &hd, &sec);
+	le16enc(cylp, cyl);
+	*hdp = hd;
+	*secp = sec;
 }
 
 static int
@@ -83,6 +84,7 @@ pc98_write(lba_t imgsz __unused, void *bootcode)
 	struct part *part;
 	struct pc98_partition *dpbase, *dp;
 	u_char *buf;
+	lba_t size;
 	int error, ptyp;
 
 	buf = malloc(PC98_BOOTCODESZ);
@@ -96,6 +98,7 @@ pc98_write(lba_t imgsz __unused, void *bootcode)
 	le16enc(buf + PC98_MAGICOFS, PC98_MAGIC);
 	dpbase = (void *)(buf + secsz);
 	STAILQ_FOREACH(part, &partlist, link) {
+		size = round_track(part->size);
 		dp = dpbase + part->index;
 		ptyp = ALIAS_TYPE2INT(part->type);
 		dp->dp_mid = ptyp;
@@ -103,7 +106,7 @@ pc98_write(lba_t imgsz __unused, void *bootcode)
 		pc98_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
 		    part->block);
 		pc98_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
-		    part->block + part->size - 1);
+		    part->block + size - 1);
 		if (part->label != NULL)
 			memcpy(dp->dp_name, part->label, strlen(part->label));
 	}
diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c
new file mode 100644
index 000000000000..5033286821b3
--- /dev/null
+++ b/usr.bin/mkimg/qcow.c
@@ -0,0 +1,369 @@
+/*-
+ * Copyright (c) 2014 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "image.h"
+#include "format.h"
+#include "mkimg.h"
+
+/* Default cluster sizes. */
+#define	QCOW1_CLSTR_LOG2SZ	12	/* 4KB */
+#define	QCOW2_CLSTR_LOG2SZ	16	/* 64KB */
+
+/* Flag bits in cluster offsets */
+#define	QCOW_CLSTR_COMPRESSED	(1ULL << 62)
+#define	QCOW_CLSTR_COPIED	(1ULL << 63)
+
+struct qcow_header {
+	uint32_t	magic;
+#define	QCOW_MAGIC		0x514649fb
+	uint32_t	version;
+#define	QCOW_VERSION_1		1
+#define	QCOW_VERSION_2		2
+	uint64_t	path_offset;
+	uint32_t	path_length;
+	uint32_t	clstr_log2sz;	/* v2 only */
+	uint64_t	disk_size;
+	union {
+		struct {
+			uint8_t		clstr_log2sz;
+			uint8_t		l2_log2sz;
+			uint16_t	_pad;
+			uint32_t	encryption;
+			uint64_t	l1_offset;
+		} v1;
+		struct {
+			uint32_t	encryption;
+			uint32_t	l1_entries;
+			uint64_t	l1_offset;
+			uint64_t	refcnt_offset;
+			uint32_t	refcnt_entries;
+			uint32_t	snapshot_count;
+			uint64_t	snapshot_offset;
+		} v2;
+	} u;
+};
+
+static u_int clstr_log2sz;
+
+static uint64_t
+round_clstr(uint64_t ofs)
+{
+	uint64_t clstrsz;
+
+	clstrsz = 1UL << clstr_log2sz;
+	return ((ofs + clstrsz - 1) & ~(clstrsz - 1));
+}
+
+static int
+qcow_resize(lba_t imgsz, u_int version)
+{
+	uint64_t imagesz;
+
+	switch (version) {
+	case QCOW_VERSION_1:
+		clstr_log2sz = QCOW1_CLSTR_LOG2SZ;
+		break;
+	case QCOW_VERSION_2:
+		clstr_log2sz = QCOW2_CLSTR_LOG2SZ;
+		break;
+	default:
+		return (EDOOFUS);
+	}
+
+	imagesz = round_clstr(imgsz * secsz);
+
+	if (verbose)
+		fprintf(stderr, "QCOW: image size = %ju, cluster size = %u\n",
+		    (uintmax_t)imagesz, (u_int)(1U << clstr_log2sz));
+
+	return (image_set_size(imagesz / secsz));
+}
+
+static int
+qcow1_resize(lba_t imgsz)
+{
+
+	return (qcow_resize(imgsz, QCOW_VERSION_1));
+}
+
+static int
+qcow2_resize(lba_t imgsz)
+{
+
+	return (qcow_resize(imgsz, QCOW_VERSION_2));
+}
+
+static int
+qcow_write(int fd, u_int version)
+{
+	struct qcow_header *hdr;
+	uint64_t *l1tbl, *l2tbl, *rctbl;
+	uint16_t *rcblk;
+	uint64_t clstr_imgsz, clstr_l2tbls, clstr_l1tblsz;
+	uint64_t clstr_rcblks, clstr_rctblsz;
+	uint64_t n, imagesz, nclstrs, ofs, ofsflags;
+	lba_t blk, blkofs, blk_imgsz;
+	u_int l1clno, l2clno, rcclno;
+	u_int blk_clstrsz;
+	u_int clstrsz, l1idx, l2idx;
+	int error;
+
+	if (clstr_log2sz == 0)
+		return (EDOOFUS);
+
+	clstrsz = 1U << clstr_log2sz;
+	blk_clstrsz = clstrsz / secsz;
+	blk_imgsz = image_get_size();
+	imagesz = blk_imgsz * secsz;
+	clstr_imgsz = imagesz >> clstr_log2sz;
+	clstr_l2tbls = round_clstr(clstr_imgsz * 8) >> clstr_log2sz;
+	clstr_l1tblsz = round_clstr(clstr_l2tbls * 8) >> clstr_log2sz;
+	nclstrs = clstr_imgsz + clstr_l2tbls + clstr_l1tblsz + 1;
+	clstr_rcblks = clstr_rctblsz = 0;
+	do {
+		n = clstr_rcblks + clstr_rctblsz;
+		clstr_rcblks = round_clstr((nclstrs + n) * 2) >> clstr_log2sz;
+		clstr_rctblsz = round_clstr(clstr_rcblks * 8) >> clstr_log2sz;
+	} while (n < (clstr_rcblks + clstr_rctblsz));
+
+	/*
+	 * We got all the sizes in clusters. Start the layout.
+	 * 0 - header
+	 * 1 - L1 table
+	 * 2 - RC table (v2 only)
+	 * 3 - L2 tables
+	 * 4 - RC block (v2 only)
+	 * 5 - data
+	 */
+
+	l1clno = 1;
+	rcclno = 0;
+	rctbl = l2tbl = l1tbl = NULL;
+	rcblk = NULL;
+
+	hdr = calloc(1, clstrsz);
+	if (hdr == NULL)
+		return (errno);
+
+	be32enc(&hdr->magic, QCOW_MAGIC);
+	be32enc(&hdr->version, version);
+	be64enc(&hdr->disk_size, imagesz);
+	switch (version) {
+	case QCOW_VERSION_1:
+		ofsflags = 0;
+		l2clno = l1clno + clstr_l1tblsz;
+		hdr->u.v1.clstr_log2sz = clstr_log2sz;
+		hdr->u.v1.l2_log2sz = clstr_log2sz - 3;
+		be64enc(&hdr->u.v1.l1_offset, clstrsz * l1clno);
+		break;
+	case QCOW_VERSION_2:
+		ofsflags = QCOW_CLSTR_COPIED;
+		rcclno = l1clno + clstr_l1tblsz;
+		l2clno = rcclno + clstr_rctblsz;
+		be32enc(&hdr->clstr_log2sz, clstr_log2sz);
+		be32enc(&hdr->u.v2.l1_entries, clstr_l2tbls);
+		be64enc(&hdr->u.v2.l1_offset, clstrsz * l1clno);
+		be64enc(&hdr->u.v2.refcnt_offset, clstrsz * rcclno);
+		be32enc(&hdr->u.v2.refcnt_entries, clstr_rcblks);
+		break;
+	default:
+		return (EDOOFUS);
+	}
+
+	if (sparse_write(fd, hdr, clstrsz) < 0) {
+                error = errno;
+		goto out;
+	}
+
+	free(hdr);
+	hdr = NULL;
+
+	ofs = clstrsz * l2clno;
+	nclstrs = 1 + clstr_l1tblsz + clstr_rctblsz;
+
+	l1tbl = calloc(1, clstrsz * clstr_l1tblsz);
+	if (l1tbl == NULL) {
+		error = ENOMEM;
+		goto out;
+	}
+
+	for (n = 0; n < clstr_imgsz; n++) {
+		blk = n * blk_clstrsz;
+		if (image_data(blk, blk_clstrsz)) {
+			nclstrs++;
+			l1idx = n >> (clstr_log2sz - 3);
+			if (l1tbl[l1idx] == 0) {
+				be64enc(l1tbl + l1idx, ofs + ofsflags);
+				ofs += clstrsz;
+				nclstrs++;
+			}
+		}
+	}
+
+	if (sparse_write(fd, l1tbl, clstrsz * clstr_l1tblsz) < 0) {
+		error = errno;
+		goto out;
+	}
+
+	clstr_rcblks = 0;
+	do {
+		n = clstr_rcblks;
+		clstr_rcblks = round_clstr((nclstrs + n) * 2) >> clstr_log2sz;
+	} while (n < clstr_rcblks);
+
+	if (rcclno > 0) {
+		rctbl = calloc(1, clstrsz * clstr_rctblsz);
+		if (rctbl == NULL) {
+			error = ENOMEM;
+			goto out;
+		}
+		for (n = 0; n < clstr_rcblks; n++) {
+			be64enc(rctbl + n, ofs);
+			ofs += clstrsz;
+			nclstrs++;
+		}
+		if (sparse_write(fd, rctbl, clstrsz * clstr_rctblsz) < 0) {
+			error = errno;
+			goto out;
+		}
+		free(rctbl);
+		rctbl = NULL;
+	}
+
+	l2tbl = malloc(clstrsz);
+	if (l2tbl == NULL) {
+		error = ENOMEM;
+		goto out;
+	}
+
+	for (l1idx = 0; l1idx < clstr_l2tbls; l1idx++) {
+		if (l1tbl[l1idx] == 0)
+			continue;
+		memset(l2tbl, 0, clstrsz);
+		blkofs = (lba_t)l1idx * blk_clstrsz * (clstrsz >> 3);
+		for (l2idx = 0; l2idx < (clstrsz >> 3); l2idx++) {
+			blk = blkofs + (lba_t)l2idx * blk_clstrsz;
+			if (blk >= blk_imgsz)
+				break;
+			if (image_data(blk, blk_clstrsz)) {
+				be64enc(l2tbl + l2idx, ofs + ofsflags);
+				ofs += clstrsz;
+			}
+		}
+		if (sparse_write(fd, l2tbl, clstrsz) < 0) {
+			error = errno;
+			goto out;
+		}
+	}
+
+	free(l2tbl);
+	l2tbl = NULL;
+	free(l1tbl);
+	l1tbl = NULL;
+
+	if (rcclno > 0) {
+		rcblk = calloc(1, clstrsz * clstr_rcblks);
+		if (rcblk == NULL) {
+			error = ENOMEM;
+			goto out;
+		}
+		for (n = 0; n < nclstrs; n++)
+			be16enc(rcblk + n, 1);
+		if (sparse_write(fd, rcblk, clstrsz * clstr_rcblks) < 0) {
+			error = errno;
+			goto out;
+		}
+		free(rcblk);
+		rcblk = NULL;
+	}
+
+	error = 0;
+	for (n = 0; n < clstr_imgsz; n++) {
+		blk = n * blk_clstrsz;
+		if (image_data(blk, blk_clstrsz)) {
+			error = image_copyout_region(fd, blk, blk_clstrsz);
+			if (error)
+				break;
+		}
+	}
+	if (!error)
+		error = image_copyout_done(fd);
+
+ out:
+	if (rcblk != NULL)
+		free(rcblk);
+	if (l2tbl != NULL)
+		free(l2tbl);
+	if (rctbl != NULL)
+		free(rctbl);
+	if (l1tbl != NULL)
+		free(l1tbl);
+	if (hdr != NULL)
+		free(hdr);
+	return (error);
+}
+
+static int
+qcow1_write(int fd)
+{
+
+	return (qcow_write(fd, QCOW_VERSION_1));
+}
+
+static int
+qcow2_write(int fd)
+{
+
+	return (qcow_write(fd, QCOW_VERSION_2));
+}
+
+static struct mkimg_format qcow1_format = {
+	.name = "qcow",
+	.description = "QEMU Copy-On-Write, version 1",
+	.resize = qcow1_resize,
+	.write = qcow1_write,
+};
+FORMAT_DEFINE(qcow1_format);
+
+static struct mkimg_format qcow2_format = {
+	.name = "qcow2",
+	.description = "QEMU Copy-On-Write, version 2",
+	.resize = qcow2_resize,
+	.write = qcow2_write,
+};
+FORMAT_DEFINE(qcow2_format);
diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
index 7546ae289f34..ff5e2014a7e5 100644
--- a/usr.bin/mkimg/scheme.c
+++ b/usr.bin/mkimg/scheme.c
@@ -171,10 +171,8 @@ scheme_max_secsz(void)
 lba_t
 scheme_metadata(u_int where, lba_t start)
 {
-	lba_t secs;
 
-	secs = scheme->metadata(where);
-	return (round_block(start + secs));
+	return (scheme->metadata(where, start));
 }
 
 int
diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h
index 8224930d8d28..d594a1917d67 100644
--- a/usr.bin/mkimg/scheme.h
+++ b/usr.bin/mkimg/scheme.h
@@ -62,7 +62,7 @@ struct mkimg_scheme {
 	const char	*name;
 	const char	*description;
 	struct mkimg_alias *aliases;
-	u_int		(*metadata)(u_int);
+	lba_t		(*metadata)(u_int, lba_t);
 #define	SCHEME_META_IMG_START	1
 #define	SCHEME_META_IMG_END	2
 #define	SCHEME_META_PART_BEFORE	3
diff --git a/usr.bin/mkimg/tests/Makefile b/usr.bin/mkimg/tests/Makefile
new file mode 100644
index 000000000000..144b4fc83ae3
--- /dev/null
+++ b/usr.bin/mkimg/tests/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/mkimg
+
+ATF_TESTS_SH=	mkimg
+
+SOURCES!=	cd ${.CURDIR}; echo *.uu
+FILES=		${SOURCES:S,.gz.uu,,g}
+FILESDIR=	${TESTSDIR}
+
+${FILES}:
+	uudecode -p ${.CURDIR}/${.TARGET}.gz.uu | gunzip -c > ${.TARGET}
+
+CLEANFILES+=	${FILES}
+
+rebase:
+	(cd ${.CURDIR}; atf-sh mkimg.sh rebase)
+
+.include <bsd.test.mk>
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow.gz.uu
new file mode 100644
index 000000000000..0f8ec4e03c34
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.qcow.gz
+M'XL("*DS(E0``VEM9RTQ>#$M-#`Y-BUA<&TN<6-O=RYO=70`K9W9CAW9<47?
+M^RLN9[(XW8C(D;,$N0$_&&A;T+.4(R!`MA.R`+_PXUW%.D-5W+T9E+NI0H-$
+M(3>R3BTN":W%P_/Y]L?IU,JIZ4[->-KGT_6OTX><[OSB_L?IZ[___*]O[O[X
+M^M/MF)R_\Y3[=:,G27/WMGY?Y_3FJ>5T'G]@[OH#SMUY._LGWN[.%WLY=_73
+M[1>+GU,V:/<&3VGNG-Y/R.DU/_9^7]R7*[>G]]M]N4J^W)8-=O<&?TES?TGO
+MI^3+[=G<<&_N<%^NDB]W9'/3=V%1`LO,YI9@KH%/K6QN"^9:^-2.Y^0[W]O;
+MN0X^)6Q.X=RIS/7P*6-SS;VY\YL,=)X;X%.$.PFY&^%3A#L)N9O@4X0[";F;
+MX5.$.PFY6^!3A#L)N5OA4X0[#;G;X%.$.PVYV^%3A#N-N!/\%.%.(^X$^4X9
+M=QIQ)\AWRKC3B#M!OE/&G4;<"?*=,NXTXDZ0[Y1Q9Q%W@GQGC#N+N!/D.V/<
+M6<@=\ITQ[BSD#OG.&'<6<H=\9XP["[E#OC/&G87<(=\9X\Y"[I#OC''7A-PA
+MWS6,NR;D#OFN8=PU$7>*GR+<-1%WBGS7,.Z:B#M%OFL8=TW$G2+?-8R[)N).
+MD>\:QET3<:?(=PWCKHVX4^2[EG'71MPI\EW+N&M#[I#O6L9=&W*'?-<R[MJ0
+M.^2[EG'7AMPAW[6,NS;D#OFN9=RU(7?(=RWCK@NY0[[K&'==R!WR7<>XZR+N
+M##]%N.LB[@SYKF/<=1%WAGS7,>ZZB#M#ONL8=UW$G2'?=8R[+N+.D.\ZQET?
+M<6?(=SWCKH^X,^2[GG'7A]PAW_6,NS[D#OFN9]SU(7?(=SWCK@^Y0[[K&7=]
+MR!WR7<^XZT/ND.]ZQMT0<H=\-S#NAI`[Y+N!<3=$W#7X*<+=$''7(-\-C+LA
+MXJY!OAL8=T/$78-\-S#NAHB[!OEN8-P-$7<-\MW`N,O_^IO/(=^-C+LQXJY!
+MOAL9=V/('?+=R+@;0^Z0[T;&W1ARAWPW,N[&D#ODNY%Q-X;<(=^-C+LQY`[Y
+M;F3<32%WR'<3XVX*N4.^FQAW4\1=BY\BW$T1=RWRW<2XFR+N6N2[B7$W1=RU
+MR'<3XVZ*N&N1[R;&W11QUR+?38R[_']#\CGDNYEQ-T?<M<AW,^-N#KE#OIL9
+M=W/('?+=S+B;0^Z0[V;&W1QRAWPW,^[FD#ODNYEQ-X?<(=_-C+LEY`[Y;F'<
+M+2%WR'<+XVZ)N.OP4X2[)>*N0[Y;&'=+Q%V'?+<P[I:(NP[Y;F'<+1%W'?+=
+MPKA;(NXZY+N%<;=&W'7(=ROC;HVXZY#O5L;=&G*'?+<R[M:0.^2[E7&WAMPA
+MWZV,NS7D#OEN9=RM(7?(=ROC;@VY0[Y;&7=;R!WRW<:XVT+ND.\VQMT6<=?C
+MIPAW6\1=CWRW,>ZVB+L>^6YCW&T1=SWRW<:XVR+N>N2[C7&W1=SUR'<;XVZ/
+MN.N1[W;&W1YQUR/?[8R[/>0.^6YGW.TA=\AW.^-N#[E#OML9=WO('?+=SKC;
+M0^Z0[W;&W1YRAWRW$^XD_X3/`=_)F7`GYY`[X#LY$^[D''$WX*<P=Q+V=P/P
+MG;#^3L+^;@"^$];?2=C?#<!WPOH["?N[`?A.6'\G87\W`-\)Z^\D[.\&X#MA
+M_9V$_=T`?">LOY.POQN`[X3U=Q+V=P/PG;#^3L+^;@"^$];?2=C?#<!WPOH[
+M"?N[`?A.6'\G87\W`-\)Z^\D[.\&Y#O6WTG8WPW(=ZR_D["_&_%3A+NPOQN1
+M[UA_)V%_-R+?L?Y.POYN1+YC_9V$_=V(?,?Z.PG[NQ'YCO5W$O9W(_(=Z^\D
+M[.]&Y#O6WTG8WXW(=ZR_D["_&Y'O6'\G87\W(M^Q_D["_FY$OF/]G83]W8A\
+MQ_H["?N[$?F.]7<2]G<C\AWK[R3L[T;D.];?2=C?3?@IPEW8WTW(=ZR_D["_
+MFY#O6'\G87\W(=^Q_D["_FY"OF/]G83]W81\Q_H["?N["?F.]7<2]G<3\AWK
+M[R3L[R;D.];?2=C?3<AWK+^3L+^;D.]8?R=A?S<AW['^3L+^;D*^8_V=A/W=
+MA'S'^CL)^[L)^8[U=Q+V=Q/R'>OO).SO9OP4X2[L[V;D.];?2=C?S<AWK+^3
+ML+^;D>]8?R=A?S<CW['^3L+^;D:^8_V=A/W=C'S'^CL)^[L9^8[U=Q+V=S/R
+M'>OO).SO9N0[UM])V-_-R'>LOY.POYN1[UA_)V%_-R/?L?Y.POYN1KYC_9V$
+M_=V,?,?Z.PG[NQGYCO5W$O9W"WZ*<!?V=POR'>OO).SO%N0[UM])V-\MR'>L
+MOY.POUN0[UA_)V%_MR#?L?Y.POYN0;YC_9V$_=V"?,?Z.PG[NP7YCO5W$O9W
+M"_(=Z^\D[.\6Y#O6WTG8WRW(=ZR_D["_6Y#O6'\G87^W(-^Q_D["_FY!OF/]
+MG83]W8)\Q_H["?N[%3]%N`O[NQ7YCO5W$O9W*_(=Z^\D[.]6Y#O6WTG8WZW(
+M=ZR_D["_6Y'O6'\G87^W(M^Q_D["_FY%OF/]G83]W8I\Q_H["?N[%?F.]7<2
+M]G<K\AWK[R3L[U;D.];?2=C?K<AWK+^3L+];D>]8?R=A?[<BW['^3L+^;D6^
+M8_V=A/W=AI\BW(7]W89\Q_H["?N[#?F.]7<2]G<;\AWK[R3L[S;D.];?2=C?
+M;<AWK+^3L+_;D.]8?R=A?[<AW['^3L+^;D.^8_V=A/W=AGS'^CL)^[L-^8[U
+M=Q+V=QOR'>OO).SO-N0[UM])V-]MR'>LOY.PO]N0[UA_)V%_MR'?L?Y.POYN
+MQT\1[L+^;D>^8_V=A/W=CGS'^CL)^[L=^8[U=Q+V=SOR'>OO).SO=N0[UM])
+MV-_MR'>LOY.PO]N1[UA_)V%_MR/?L?Y.POYN1[YC_9V$_=V.?,?Z.PG[NQWY
+MCO5W$O9W._(=Z^\D[.]VY#O6WVG^B9L[U3G@N^NG,'?J^KM\G]ZI<@=\IZR_
+M4]??G1)WI\R=G?%3F#MU_=TI<7?Z2YD#OE/6WZGK[TZ'.SM#]]\IZ^_4]7?E
+M[.H<\)VR_DY=?P?F@.^4]7?J^CLP!WRGK+]3U]_EN0=U#OA.67^GKK][D.=.
+M90[X3EE_IZZ_>Y"X>U"Y`[Y3UM^IZ^\>).X>5.Z`[Y3U=^KZNP?'Q=D!WRGK
+M[]3U=^7LZASPG;+^3EU_!^:`[Y3U=^KZ.S`'?*>LOU/7W^6YAW4.^8[U=^KZ
+MNX=YKG*'?,?Z.W7]W</$W</"';K_3EE_IZZ_>YBX>UBX0_??*>OOU/5W#P]_
+M=NC^.V7]G;K^KIQ=G4.^8_V=NOX.S"'?L?Y.77\'YI#O6'^GKK_+<X_J'/(=
+MZ^_4]7>/\ESA#MU_IZR_4]??/4K</:K<(=^Q_DY=?_<H<?>H<H=\Q_H[=?W=
+MH^/B[)#O6'^GKK\K9U?GD.]8?Z>NOP-SR'>LOU/7WX$YY#O6WZGK[_+<XSJ'
+M?,?Z.W7]W>,\5[E#OF/]G;K^[G'B[G'A#MU_IZR_4]??/4[</2[<H?OOE/5W
+MZOJ[QX<_.W3_G;+^3EU_5\ZNSB'?L?Y.77\'YI#O6'^GKK\#<\AWK+]3U]_E
+MN2=U#OF.]7?J^KLG>:YPA^Z_4];?J>OOGB3NGE3ND.]8?Z>NOWN2N'M2N4.^
+M8_V=NO[NR7%Q=LAWK+]3U]^5LZMSR'>LOU/7WX$YY#O6WZGK[\`<\AWK[]3U
+M=WGN:9U#OF/]G;K^[FF>J]PAW['^3EU_]S1Q][1PA^Z_4];?J>OOGB;NGA;N
+MT/UWROH[=?W=T\.?';K_3EE_IZZ_*V=7YY#O6'^GKK\#<\AWK+]3U]^!.>0[
+MUM^IZ^_RW+,ZAWS'^CMU_=VS/%>X0_??*>OOU/5WSQ)WSRIWR'>LOU/7WSU+
+MW#VKW"'?L?Y.77_W[+@X.^0[UM^IZ^_*V=4YY#O6WZGK[\`<\AWK[]3U=V`.
+M^8[U=^KZNSSWO,XAW['^3EU_]SS/5>Z0[UA_IZZ_>YZX>UZX0_??*>OOU/5W
+MSQ-WSPMWZ/X[9?V=NO[N^>'/#MU_IZR_4]??E;.K<\AWK+]3U]^!.>0[UM^I
+MZ^_`'/(=Z^_4]7=Y[D6=0[YC_9VZ_NY%GBO<H?OOE/5WZOJ[%XF[%Y4[Y#O6
+MWZGK[UXD[EY4[I#O6'^GKK][<5R<'?(=Z^_4]7?E[.H<\AWK[]3U=V`.^8[U
+M=^KZ.S"'?,?Z.W7]79Z[JG/(=ZR_4]??7>6YRAWR'>OOU/5W5XF[J\(=NO].
+M67^GKK^[2MQ=%>[0_7?*^CMU_=W5X<\.W7^GK+]3U]^5LZMSR'>LOU/7WX$Y
+MY#O6WZGK[\`<\AWK[]3U=WGN99U#OF/]G;K^[F6>*]RA^^^4]7?J^KN7B;N7
+ME3OD.];?J>OO7B;N7E;ND.]8?Z>NOWMY7)P=\AWK[]3U=^7LZASR'>OOU/5W
+M8`[YCO5WZOH[,(=\Q_H[=?U=GGM5YY#O6'^GKK][E><J=\AWK+]3U]^]2MR]
+M*MRA^^^4]7?J^KM7B;M7A3MT_YVR_DY=?_?J\&>'[K]3UM^IZ^_*V=4YY#O6
+MWZGK[\`<\AWK[]3U=V`.^8[U=^KZNSSWNLXAW['^3EU_]SK/%>[0_7?*^CMU
+M_=WKQ-WKRAWR'>OOU/5WKQ-WKRMWR'>LOU/7W[T^+LX.^8[U=^KZNW)V=0[Y
+MCO5WZOH[,(=\Q_H[=?T=F$.^8_V=NOXNS[VI<\AWK+_3J+\S=/^=LOY.H_[.
+MT/UWROH[C?H[0_??*>OO-.KO#-U_IZR_TZB_,W3_G;+^3J/^SM#]=\KZ.XWZ
+M.T/WWRGK[Y3T=V_K'/(=Z^_4]7=O\USA#MU_IZR_4]??O4W<O:W<(=^Q_DY=
+M?_<V<?>V<H=\Q_H[=?W=V^/B[)#O6'^GKK\K9U?GD.]8?Z>NOP-SR'>LOU/7
+MWX$YY#O6WUG^B9L[USG@.V/]W?4G[G&7_72NW`'?&>OOS/5WY[1W+MRA^^^,
+M]7?F^KMSXNY<N$/WWQGK[\SU=^?#GQVZ_\Y8?V>NORMG5^>`[XSU=^;Z.S`'
+M?&>LOS/7WX$YX#MC_9VY_B[/29T#OC/6WYGK[R3/%>[0_7?&^CMS_9VDUY/*
+M'?"=L?[.7'\GB3NIW`'?&>OOS/5W<ER<'?"=L?[.7']7SJ[.`=\9Z^_,]7=@
+M#OC.6']GKK\#<\!WQOH[<_U=GM,ZAWS'^CMS_9WFN<H=\AWK[\SU=YJXT\(=
+MNO_.6']GKK_3Q)T6[M#]=\;Z.W/]G1[^[-#]=\;Z.W/]73F[.H=\Q_H[<_T=
+MF$.^8_V=N?X.S"'?L?[.7'^7YZS.(=^Q_LY<?V=YKG"'[K\SUM^9Z^\L<6>5
+M.^0[UM^9Z^\L<6>5.^0[UM^9Z^_LN#@[Y#O6WYGK[\K9U3GD.];?F>OOP!SR
+M'>OOS/5W8`[YCO5WYOJ[/-?4.>0[UM^9Z^^:/%>Y0[YC_9VY_JY)W#6%.W3_
+MG;'^SEQ_UR3NFL(=NO_.6']GKK]K#G]VZ/X[8_V=N?ZNG%V=0[YC_9VY_@[,
+M(=^Q_LY<?P?FD.]8?V>NO\MS;9U#OF/]G;G^KLUSA3MT_YVQ_LY<?]<F[MK*
+M'?(=Z^_,]7=MXJZMW"'?L?[.7'_7'A=GAWS'^CMS_5TYNSJ'?,?Z.W/]'9A#
+MOF/]G;G^#LPAW['^SEQ_E^>Z.H=\Q_H[<_U=E^<J=\AWK+\SU]]UB;NN<(?N
+MOS/6WYGK[[K$75>X0_??&>OOS/5WW>'/#MU_9ZR_,]??E;.K<\AWK+\SU]^!
+M.>0[UM^9Z^_`'/(=Z^_,]7=YKJ]SR'>LOS/7W_5YKG"'[K\SUM^9Z^_ZQ%U?
+MN4.^8_V=N?ZN3]SUE3OD.];?F>OO^N/B[)#O6']GKK\K9U?GD.]8?V>NOP-S
+MR'>LOS/7WX$YY#O6WYGK[_+<4.>0[UA_9ZZ_&_)<Y0[YCO5WYOJ[(7$W%.[0
+M_7?&^CMS_=V0N!L*=^C^.V/]G;G^;CC\V:'[[XSU=^;ZNW)V=0[YCO5WYOH[
+M,(=\Q_H[<_T=F$.^8_V=N?XNSXUU#OF.]7?F^KLQSQ7NT/UWQOH[<_W=F+@;
+M*W?(=ZR_,]??C8F[L7*'?,?Z.W/]W7A<G!WR'>OOS/5WY>SJ'/(=Z^_,]7=@
+M#OF.]7?F^CLPAWS'^CMS_5V>>U?GD.]8?V>NOWN7YRIWR'>LOS/7W[U+W+TK
+MW*'[[XSU=^;ZNW>)NW>%.W3_G;'^SEQ_]^[P9X?NOS/6WYGK[\K9U3GD.];?
+MF>OOP!SR'>OOS/5W8`[YCO5WYOJ[//>^SB'?L?[.7'_W/L\5[M#]=\;Z.W/]
+MW?O$W?O*'?(=Z^_,]7?O$W?O*W?(=ZR_,]??O3\NS@[YCO5WYOJ[<G9U#OF.
+M]7?F^CLPAWS'^CMS_1V80[YC_9VY_B[/?:ASR'>LOS/7WWW(<Y4[Y#O6WYGK
+M[SXD[CX4[M#]=\;Z.W/]W8?$W8?"';K_SEA_9ZZ_^W#XLT/WWQGK[\SU=^7L
+MZASR'>OOS/5W8`[YCO5WYOH[,(=\Q_H[<_U=GOM8YY#O6']GKK_[F.<*=^C^
+M.V/]G;G^[F/B[F/E#OF.]7?F^KN/B;N/E3OD.];?F>OO/AX79X=\Q_H[<_U=
+M.;LZAWS'^CMS_1V80[YC_9VY_@[,(=^Q_LY<?Y?G/M4YY#O6WYGK[S[EN<H=
+M\AWK[\SU=Y\2=Y\*=^C^.V/]G;G^[E/B[E/A#MU_9ZR_,]???3K\V:'[[XSU
+M=^;ZNW)V=0[YCO5WYOH[,(=\Q_H[<_T=F$.^8_V=N?XNSWVN<\AWK+\SU]]]
+MSG.%.W3_G;'^SEQ_]SEQ][ERAWS'^CMS_=WGQ-WGRAWR'>OOS/5WGX^+LT.^
+M8_V=N?ZNG%V=0[YC_9VY_@[,(=^Q_LY<?P?FD.]8?]?DG[BY+W4.^*YA_5WC
+M^KLO>:YR!WQW_13FKG']W9?$W9?,77/&3Y&_]]A]L5]R;_RFS*&_;[L\%<S=
+M^?'UIZMO@^VW]VO:4ZNGL]8G;JY_&[XW^"__<3/SP+U?^YN_W[?[9:Y/JUDO
+MGK.[@W+_$U]_^3<_>#MW\W[-MW#L^J.[_M_3[0^]W^^.XV\;F$-_7_G_Z\N]
+MG;/+MVN_6:63TZG74]^<NC']L[N6U';SZ?1V?SZFO__CK__XZW__UY_SW,U_
+M7W3KS</]/_-V_SD=\.W0WU?^:[ZWS0]^;_._PL^_<^]_;_/OW!;]V?)?]W[?
+MOAW=S<%??R.N/QH]M79JFIL_'G%JVYO/M78Y^//?M^WW?_S#ZS_]_,>[YX?^
+M./BO>K_N!\Y/[YS?[6^2N^=WNOM^Z,]N_;KW^^[Y]7;J>\!F/;__^=];$//[
+C_<;GUYW3^9TG\$_^B:^_O+G_G]O!YMO@3_\'*;=.DB.F````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow2.gz.uu
new file mode 100644
index 000000000000..0caab8bdc681
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.qcow2.gz
+M'XL(")T[(U0``VEM9RTQ>#$M-#`Y-BUA<&TN<6-O=S(N;W5T`*V826_;,!!&
+M[_D53/>F32K.D)35/9N!'@JD#7H.O,A`@"Y&&J`7__A2ULB4J1DQ-N0(1@SB
+M>Q@/GT>FLZQ^*&6U,DZ90BVFRK^F"U3KQ?:E5M_&7T[:C]5!#=.9D&(6#&YP
+M6ZSS@`,)E^GN@N9QK>J0P4&3ZH)2."-6U[?`X(X.UJU;;\8H2N`^P!HG;L9>
+M]4%=7YPP>]8'0]>'?/]LDXL77']]6-<7IW()-TKB@$D5$FZ2Q"&3FDJX61)G
+MF-1<PI5)G&52"P&G$ZIXG&-26L)!$I<S*91P)HD;,2G).YWVKF!2DG<Z[=V$
+M24G>Z;1W4R8E>:?3WLV8E.2=3GLW9U*2=R!XIP*N9%*2=Q!Y=TBX1P&W8%*2
+M=Q!Y]YAP3S8XS:4D[R#R[BGAG@4<,^]`\@XB[YX3[D7`,?,.).\@\NXEX8X"
+MCIEW('D'D7>O"/<ZX)AY!Y)W$'EWW/%.,_,.).\P\NX-L;*`8^8=2MYAY)TF
+M'`0<,^]0\@XC[Y!P)N"8>8>2=QAY9PGG`HZ9=RAYAY%W.>%&`<?,.Y2\P\B[
+M@G!O`XZ9=RAYAY%W[PCW/N"8>8>2=QAY]X%P'P..F7<H>6<B[SX1[G/`,?/.
+M2-Z9R+M3PIT%'#/OC.2=B;P[)]S%!@=<:N-=EO$7X2X[GUD8]ONG"=^/-?,L
+M+_0`1[L`^RJL<<6@;]C6;]CO@(5PCLK6=\A1+_#R>X4YW*[/#GT@L+4P?C*;
+M>2>'TH'/+ZRNOC+]L[4P_N/@IZF_W$PY^Z#Z3I?+GR6#DT^WNQ^G/`Z[U=G%
+M^G\O2PXJ-\H5].P6RI75,E5WLYS<W=_>W_[Y?=/@JANDFU?A?)?J?DV6;'5V
+MX+TU#]S;YGX!!-S>6]749X9VSZRWPU6-]QOA+S\N+593SG_-4-96:Q:[P/%=
+M69Y=7QS_&%^W^V>&_;'!^A-5NG_0ZE_](6GW3[7K<T/WS_7V+T>5YXR;H7]_
+J_]4B-O4-W#^=4?_\2;W[+"^LKDZV_VJ@(>!@%1I73>>#_Z4*H1'E$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.raw.gz.uu
new file mode 100644
index 000000000000..3f148c01beb4
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.raw.gz
+M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN<F%W+F]U=`"MD\UJPS`0A.]^
+MBNFU4"/)*RD]MK2Y%4)#S\'4#@3:Q*2!7O3PE2*)R#\)+FB]"(ME/\:S:\9\
+M`"0A!9A-%E)PL`4N]T'"O+Z7-N[*&*;P,,YN=%W'E8,PQ;T'"E>6#-2,^JH4
+MR/L%LWH;`CW.Z2,.S5RJ3R@Y2]]3UWVU$SB1ZW,]KAJKD]OS.P>T@":HQW"J
+M+53KRD'=IJN/I]UI=]AO(HXL3C6N6?]'W7?=3:J3F6=+,V>[B$L9@/W9(NJC
+MW+M'YW$H9[P=A$T2D!6((!HK7+J:O8^`RV/;/J]?'CZ6Z]0_HLSZU`S_1.*?
+M_TE2_Y#J4[G]4S?]TQ6TGMC-BW\_OWX1H[[,_G$6_&/UQ'F]8%9E__%`"L!L
+."DDX8/$'F8$ZXZ<%````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
new file mode 100644
index 000000000000..324579020e61
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.vhd.gz
+M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4?<^O
+MN-+>*BT"#+A[7-7F;5*U:L\M<W`5:6VC)M+ZD!\_+A\!V^`F&0Y!6/@>#N=^
+M`"'N`9`-R!ZD!BEPW'*0WZ"]!C"3OC';4_\*A^[M57?[S<?2/X>%`Z,DM1J:
+MHSUK@)M%6F`*%Y%K',,AP"R_W#U?;5Z>`QSS<&%A+H$S$`:$3]:1Y,@.D58W
+M#[<6\BFR:Z;LHI7Y_^9`.%":?-$$=D]'CD<X;JSZWK86E+(T0QN\#";B9D=P
+M@HRL$IHY49/-YN#DG-4Y<%<+[PL7*B8P6M,;Z2BT#,<F;((.DV9"Y6.W5>\[
+M/>+'"J$BC_SH9*XI;Y?Y4&'A8\^`8SC/;1<LRGX,EPF5_U)/#NVX'Q@1B`@3
+MS&Y_J%Z$@I2?I&1&\[(SBOP4\C.I*5A(=MN:SS9\]Q-AR-@=JN#=B_7K<-ID
+M"%_GHB*^C'/W_D<V7#KDQRF&,49RAS%\"K_OV^T?G8%CM;;KX)HI.]'[G+-)
+MYTJT[5WI%GU@]VBR;;_9;]Y>'P,<%BHLM1;Q='8O:IME)RK[5I_HV^LD3\C$
+MMQ#XZ=JQIZT[)`J/)Z2(9Q!;&^("Y\S[!'#UKK4YA;[^6CVD^FE>EQ\E)^C'
+M$OU<DJ3ZI;6%E@[QR_G-ZH>'29N)S:C?[J\+Q,"OMG[*ZT=4IB]/'.Z7PY\#
+M9+Z85JO.+%:_.@RY!ZS&D,<<KL60ZEEGGNMEZ1E6NNK*<I6YY*J+<!6ONM*7
+CK*(5.>NJ*WW)JG351;B*5UV$JWK5E;:@+OX!7ZN]MA\-````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
new file mode 100644
index 000000000000..3e83de7755bf
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.vhdf.gz
+M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K571:L(P%'WW
+M*R[L35A)DYM;][@Q?1O(9,]:;2N%J<4)VT,_?DF3V-16<2/I)23<YO3DG.26
+M,=,`4(+DP%0P&Z+IV_E%0#U]CU1CD6OUR(#%MU9=AXLN6CT:&T"NTY(!9KUU
+MP@>,NXEZ_G8):.`T/XPA83IH`R3OXO=<59_Y`!P/M5T#)_KL9-&,8X"$0X)`
+M3[:G`BC7:<MN6:7'4WDJ#_NE@T,%1YE>G/R%W2ZM!MG)P-[BG=Y.[(!;P*ZW
+MX/AAZ+.'C1VDA5=&J$`.4@`B\$P1ESJGYCW`V3'/7Q:OCQ^SA:\?8F!^=(=^
+MW-//7!)?/_#Y46C]Z*9^B8`D&3B;K7Y?W^8@.GZ!]8N9U8^E`_WU1#V/NH\!
+M1`L8C"'9ZDS"WG4MHG`U8.(#\M;>!G!SV.>;4_GCWV"RU;DHAD.OYT+_"R@!
+MGC8E)M-CC]_#=#LN=UL'YZJ?^[#R^FSQY2ZIN]V9,KB!7+7L1%\D\M5;(S"$
+M..YLW+);^>H9.#QO-B]@+1N:+CJ33F*P-FNXIOKY+__76P-'@8^*^E&.?@&@
+'6R\`T@<`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-apm.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-apm.vmdk.gz.uu
new file mode 100644
index 000000000000..4b6923a8c6ff
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-apm.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-apm.vmdk.gz
+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
+J^HSK5Z2^?N[^SD_^O__"^</%]K\U8>X3FJTP=S>?35_]'S/@3HZ37@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow.gz.uu
new file mode 100644
index 000000000000..e9033f43a71f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow.gz.uu
@@ -0,0 +1,125 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.qcow.gz
+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
+D_.\5P>Z'6?[RW!Y^U!_X]J^W]_^Y&QQ^#/[Q_[+N5S>!I0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow2.gz.uu
new file mode 100644
index 000000000000..34b715e64dc3
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.qcow2.gz
+M'XL(")X[(U0``VEM9RTQ>#$M-#`Y-BUB<V0N<6-O=S(N;W5T`*V8VY+20!"&
+M[WF*6<^NBIGN24@\K+KK6N6=WN@UL/`4/+P;ILDDG?XS2`52J:*&_ZN>S)=F
+M0E'$EW.E=Z%RH7'[C7O\+`>YWH?AX0Z_?_Q<]E^'183Y`J2,@<`=;L"Z2SA"
+MN,*/![R-ZU7'!HY.J3$HAPNPNJD!`W>].%ZZXV+4*L&7`",.+L9%]5&L3R?"
+MA?71W/6Q??W*4TX/5-/U<:Q/IU8(5V=Q9*0:A%MG<6RD-@BWS>*"D7I`N%T6
+M5QJI/<#YC"J/N,I(>82C+&YEI!CA0A97&RGDG<][UQ@IY)W/>[<V4L@[G_=N
+M8Z20=S[OW=9((>]\WKL'(X6\(^"=2[B=D4+>D?+N2G!/$FYOI)!WI+Q[*KAG
+M'<Y;*>0=*>^>"^Y%PAG]CI!WI+Q[*;A7"6?T.T+>D?+NM>"N$\[H=X2\(^7=
+M&\&]33BCWQ'RCI1W[T;>>:/?$?*.E7?OA54DG-'O&'G'RCLO.$HXH]\Q\HZ5
+M=RRXD'!&OV/D'2OO2L%5"6?T.T;>L?)N);@ZX8Q^Q\@[5MXU@ON0<$:_8^0=
+M*^\^"NY3PAG]CI%WK+S[++B;A#/Z'2/O@O+NB^"^)IS1[P+R+BCOO@GN-N&,
+M?A>0=T%Y=R>X[QV.K%3G75'8A^#N1_<LS;O_#&E_[(TS'I@`UO\#G*HPXII9
+M)US&";<:K(TS'CC<+H?O#GA<X7+5KFI9N9K.K?#O_9_QA,L95SCB\..H#'0%
+M^W-PQ\?1WC?K_N8"#@PW%U<)-_DXVNZQ=]8`K*Z<61:J5:Z_SJ[9'Q]23MU=
+M;<VZ]76I/D-F&DQWHCXWGF[[J]$]W:E5;'&4F:X;XC:3:SM=W=6XNNW,B\'Z
+MSCCSSFTAPSLWXFC>1D#Q?ZFB_=;XC`<.OY;#=P0&`<YV!4/5]K[%/SE0:JE#
+#$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.raw.gz.uu
new file mode 100644
index 000000000000..d48f3435644a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.raw.gz.uu
@@ -0,0 +1,10 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.raw.gz
+M'XL(".[%'50``VEM9RTQ>#$M-#`Y-BUB<V0N<F%W+F]U=`"ME,$.@R`,AN\^
+M1;WN0$J%Z:Y+=M]I.SNS/04//U!4*@-=0C$DI.V7O]2".!F`(L#^QYYVF*O@
+MRU2G:J21`^H6E`9]ALZ&X_JQ`W.8Y^TA0C,>)W-9:9S8V(RC/=PB6![!-2XK
+MB+1J22ZXE&/"U9Y5KSB54V<1^/ZK6%WJ[N;>=IN\L,^`'\`!L/,^XL"EO[#J
+MN\0RB)6;T0=QN;W#M3Q>!CC:*1<X[I7M;5Y=':L;"C>CV4[&P<EU$#ZY$X[*
+C/@0TOBSV#[11\9YVF+O@:P(J#RQV@XH<L/H"TT^@ZP4%````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
new file mode 100644
index 000000000000..1c0e8d758b0e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.vhd.gz
+M'XL(".[%'50``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD+F]U=`"MESUOPR`0AO?\
+MBI.Z98C@C+&[1DWG2I7:-8YC1QGZH29#!O_X<C;88(R3M-@$8<$]O'<<B##6
+M/0`R`5F#K$"FU,X$R$?(<@#5J0NV-=>?T)1?GU5Y/EY6^FD6'8PSV\HU)WM,
+M0*A),L"")I%[:D-C,*N'S6%Y_#@8'&J<F5A($`BI@@AO'LEZ=41Z7K\^M<CM
+MH"[QU0U6ZK<3P`1P;HU(C+IMK[''"655UVW)H"A:F:8X'T['X.P(E[*1E25S
+M*JB6LU,X.6=U#VZYT&O1I8I*C$S5*G0<,J2V2AL3!Z^H5+F<OHN?4S72AX%4
+MD;T^[O4E87=1IPJ:P5J!H'2><Q=:RGF,FTB5?T5/NG9"-U006&HZL'7?C=Z`
+M`EN?Y&PFYN'%".HK2)_:6ZR8J,,=S7KEOCVP)&":T79/)>1X:P3?-V]3ZUL&
+MTN6/NZ/$:[A>,+\%E^B]:U&2`1?JZ'!,L]B`$W/J*&>JNYQ-(R=SF8_L['4&
+M7@/?`\NMK+:`_?K"H._1EX&.NS/ZP'>W(%SFCN<6#J^X"RYN-[NV\^J8KZZ,
+MO!C[\<ZX<><2Q-VY'0[C'@38GBPJ`]4HOPYW-"\K]^V`J(^J:&<?FJ,JED*A
+M@=$4*F`562%6L\EV;Q9*K3#219)P$2^2A(MXD21<Q(LDX2)>)`D7\2))N*@7
+02:G^(C"V^`74/'YQ?0P`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
new file mode 100644
index 000000000000..66607656c3de
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu
@@ -0,0 +1,13 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.vhdf.gz
+M'XL("._%'50``VEM9RTQ>#$M-#`Y-BUB<V0N=FAD9BYO=70`K91-;X,P#(;O
+M_`I+N_6`DI`8>JW6G2=-VJX%"E4/W2X[[)`?OQ@"Q'RUFPA1!'+\\-I.+$0[
+M`+0"D<^LRP9[B/ECHUW4T!0!30K:@$'(W'8Q3/;!#/;C^!Z'PWJ<7/-:QL6C
+MT>'4/5PO6#Z"2\A+,DHRX)8,+4YXEAAP>DV=RX2H_A2LV2IW76VSD5]89Y`U
+MR#.(S-L4!_;UA4'??BI#L7!7],$TW)QP*=\O`YRZ$RYP7+%:VW5U8JJNW+@8
+MR?AF/'AS"<)O;HM3VS8"U706=P+=KNFZ;+"O,7]:H/;`S3*(OO=A`E@#5H"&
+MWE,-N(<T"X&*GR1;?GU6Y??U)ZPPX:@@=3T_R5\E=%LP!9733_!,[X&^I^-E
+M=[U=.ES7JKH?:Z2D&P?1DW"1A_MR>'MND*=!73)-$H;9*S0(#5*RP+VZ$S_.
+IA--]L%4-A6ED=I-],,-LJR*<$2.O_]:VQ>'&1\4=ON@7D=A:0S`'````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-bsd.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vmdk.gz.uu
new file mode 100644
index 000000000000..ac4864b37817
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-bsd.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-bsd.vmdk.gz
+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
+-/@=\\W^I>^KAH%T`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow.gz.uu
new file mode 100644
index 000000000000..0dfdc6cfba53
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.qcow.gz
+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
+4^+>=X+`>O[_*/_X7*6^YQ%^G````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow2.gz.uu
new file mode 100644
index 000000000000..426de83180ed
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.qcow2.gz
+M'XL("*`[(U0``VEM9RTQ>#$M-#`Y-BUE8G(N<6-O=S(N;W5T`*V76[/2,!#'
+MW_D4P<M1CXK-;E**EZ.>BS.^Z8/Z7"[]%'QXVV9IVNUN`TRAP\"$_V\VY)>E
+MR;+P,,9;XW+C-J;:FOHS76!Z'X:7.?[^\7/5?QP7`68S)24,..QP`]9#Q(&&
+MR^QXP,JX7G4HX."4&H-2.*=6-S4@X&X7[4_7+D;!$G@-,.#4Q;BJ/@CU\82[
+MLCZ8NSZ4?S]_RO&!?+H^#/7QU%K#%4D<"*F-ABN3.!126PVW2^*<D-IKN$,2
+MYX54I>!L0I4:EPLIJ^$@B5L+*=1P+HDKA)3FG4U[MQ%2FG<V[5TII#3O;-J[
+MK9#2O+-I[W9"2O/.IKW;"RG-.U"\,Q%W$%*:=\"\6Q+N6<150DKS#IAWSPGW
+MHL-9*:5Y!\R[EX2[B3BAWX'F'3#O7A'N=<0)_0XT[X!Y]X9PMQ$G]#O0O`/F
+MW5O"O8LXH=^!YATP[]Z/O+-"OP/-.V3>?2!6%G%"OT/-.V3>6<)!Q`G]#C7O
+MD'F'A',1)_0[U+Q#YITG7!YQ0K]#S3MDWJT)5T2<T.]0\PZ9=QO"?8PXH=^A
+MYATR[SX1[G/$"?T.->^0>?>%<'<1)_0[U+QSS+NOA/L6<4*_<YIWCGGWG7#W
+M$2?T.Z=YYYAW#X1[['`@I3KOLDR^"/<TVK,P[_VGB_?'5GC5!R:`Q27`J0H#
+M;C/KA'W8&Y<!JTJKSX>]47^AODI/;^HK3(_RMO<'+-2W[./V<T^WN@SHO2G+
+M$?#/J;Y6YV83E<*K/G"\7PV?77VN`?IULR=\;@HX=\+_GOY*R^%FVQ\!IQ_F
+M::`KV)Z#:P_SO6_VS=`'AK=FRXB;/,PW)Y2#-*!6YV=VSQ4LUU_G]FBUBV=0
+M=F/;K:^)]0FM``;3G:C/C*?;_.=V9V.VBNT")*9KAKCMY-I.5[<<5[>;>3$\
+MWQEG[MP&,MRY`0?S-@)H.TMM8/VM\:L^</RU&CX#T!%PME_0Y<U?Y>(_(V[D
+%[($4````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.raw.gz.uu
new file mode 100644
index 000000000000..bbf68364ea1b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.raw.gz
+M'XL("._%'50``VEM9RTQ>#$M-#`Y-BUE8G(N<F%W+F]U=`"ME,T.@R`,Q^\^
+M17?=P4`'TUV7[+[+MC.Z^10\_(KX`2*H"8!H4OK+O[:%,3L`Z%E=<8,N%T,7
+MYZ*G\>8PL.M6@1;7DA<=H*7D\$&+<0?'&2"/ZSNYN&_N<+MC0"E!J0#X&O6A
+M\1((3*WL<8.^E_Z<]`D#E!4("?(*->X-^/-XKZ5#\%S_S^)P"S<)YGMP%^/E
+MG'0K(V[0<YG8]X@3*76$8+]#P<K,M2?JA9^;9V#4)2VP>K"A#YSR"[.^6R@#
+MO7`3^B`,5QE<Y9_G#@XWP@4?UR1SFU9W"M6UF9,AEYVQLW,-Q.]<B\.\%P'V
+?-PM5()T*][A!/TM_6J`8@-G^H$`#+/YC5JB9E`8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
new file mode 100644
index 000000000000..6eb54df46a06
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.vhd.gz
+M'XL("._%'50``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD+F]U=`"METU3PR`0AN_]
+M%>MX\]"!#6S:JZ.>G7'4JVE,'`]^C'KPD!\O!$@@"=@H34J3@7WR[K)L*&/F
+M`T`%4`O4`$E]70J@/90[`-5I3^Q;;F^AJ]]>F_KK^7MK/]W&P#CSK4)S;8\%
+M"/60$K#2#Z%'?0V=PVQ/+Y_.GE^>'`XMSCU8$`@$J2!B]AQB@SI-NCJ_N>B1
+M#Z.Z8JYNM%+?@P`F@'-O1.'4/0P:!YQ05FW;GR5452_3G<%-T#$Z.\%)-K'R
+M9"X%U7-V"4<IJS6XLXV="Y,J*C%*U:K0<2A17ZNT<7&8G2I5OC_?JX_/9J(/
+M(ZE"@SX^ZROB[J)-%72#K0*ATSGE+O24KREN(57^%3T*[82]4$%@TG5@[WX8
+MO1$%OC[B+!'S^&1$]55)O_[@\.&P&AA1:'#UX'`E1X],DHS!1![7=^+C'G.[
+MVZX#2JDKQA1XZ_35VDJ5.E8MM/&.[GP;'H.^1@-EJ:NO)-CAL0[?7]XM34<3
+M6;WKXV=P^!MN$,R/P16VE+J1?F;$.[HQ3<ROPXF4.KV$FU7.RLRYU^PF=OX\
+M`U.KI`:VLWT8`H?YA5'??BX#`W<3^F#N;J5Q93B>>SC\Q5T(<8?DW*;5G<S5
+MU9DGHYVNC"-7KH:$*]?@,&\AP+ZRJ`Q4H^9MO*.[WH:'`:)]<V1[%:&M?=D4
+M"@O,IE"X8II/8<&2R;8V"\DJS+2OIWBY_\N^GKQRGV%?3Z[<QZS8JGT]V7*?
+<:5]/KMSGV==K7-9]/:E_;(QM?@!J8S.+#`X`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
new file mode 100644
index 000000000000..f298a705ad23
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.vhdf.gz
+M'XL("/#%'50``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q;H,P$(;W
+M/,5%W3)$MK$/LD9-YTI5VS5`(,J0=NG0@8>OC3'Q82"D,A@P.M_'?[ZS8<P>
+M`/H:;=.&9CLXFM5FU=)X\3"PKD>!%E=J+SU`MUQU'=T8]W"<@>#3^M8^[A0[
+MW/HQH%*0YP'PW>D3QDL*8/G(?=K0[+?T[/5)`U0I2`4*(1-+`_X\?(RE0_)8
+M\V=QXAZN%\R7X!+CY8WT*V/:T-S*Q#X=3LZITPA6/12LBEQ[,AOX^7D&IE=)
+M"2SK;(("^_S"3=\NE"%(N#/Z(`PW-[B4CN<>3MP)%RBNF,WMO+IUJ*Z,G`PU
+M7!D+5ZZ!T)5K<2+N1B#:G457H!X5WJ<-S>N6GA8H.V"T&<3N5X0)8`U8`2K3
+M3R7@#M+,!PI:24WY_565/Y=?/\,&Q_L_1]B,OTC,:L$41&X^@B?3]_0]'<Z;
+MR_7L<&ZK<A^6:"9=:8@,PD4:[LO^[;E%'F_JDG"2T)^]0@*3P#D)O%-WI.6,
+I[3[O@JUJ*%0KTS7R0@RC6Y7!*3;P^F]N+0XCEXJNO=4?V8%!.+\(````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-ebr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vmdk.gz.uu
new file mode 100644
index 000000000000..4db541f4c904
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-ebr.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-ebr.vmdk.gz
+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
+>=_S&];O3_L^6L/0)S3I8N@].R[_Z/_V4$^TO7P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.gz.uu
new file mode 100644
index 000000000000..a67e3ebeb5af
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.gz.uu
@@ -0,0 +1,132 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.qcow.gz
+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
+8Q"_BY[E'_2+>'HXWWOOM/_VP*B?UK```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.gz.uu
new file mode 100644
index 000000000000..c9d99d14fb7e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.gz.uu
@@ -0,0 +1,26 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.qcow2.gz
+M'XL("*([(U0``VEM9RTQ>#$M-#`Y-BUG<'0N<6-O=S(N;W5T`*V92V_4,!"`
+M[_T5+F]:6.)7DN51:$LK]=8BN'')\UB)*PK\=N+8B9/)3-PNWK6BKJSY9#O?
+MC)TT2>R',<V92IG:L[9D_6_7!)O]6#;6W5W?[.:?[LC">$)$(1U*3K@%Z]+C
+M!(5+^+J#X[C9Z"2"$V/4&A3"*7)T6QT([N1H6+KA9N0@0AX"M#CR9APT/F''
+M!R/4@>,3L<<G\?738QSL2+?')^WX8%1&X?(@3B!1>PI7!'$2B2HI7!7$*22J
+MIG!-$*>1J);`\8`J/2Y%HCB%$T%<AD1)"J>"N!R)HKSC8>_V2!3E'0][5R!1
+ME'<\[%V)1%'>\;!W%1)%><?#WM5(%.6=(+QC'M<@491W`GAW['!//*Y%HBCO
+M!/#NJ<,]FW`<BZ*\$\"[YP[WPN.0>B<H[P3P[J7#O?(XI-X)RCL!O'OM<"<>
+MA]0[07DG@'>G#O?&XY!Z)RCO!/#N[<H[CM0[07DG@7?O'"OQ.*3>2<H[";SC
+M#B<\#JEWDO).`N^DPRF/0^J=I+R3P#OM<*G'(?5.4MY)X%WF<+G'(?5.4MY)
+MX-W>X=Y['%+O).6=!-Y]<+B/'H?4.TEY)X%WGQSNS..0>B<I[Q3P[K/#??$X
+MI-XIRCL%O#MWN`N/0^J=HKQ3P+M+A_LZX006-7F7)'ASN*M5S@JDWJGT@;CK
+M-8Y^6#GD.*O\<9LC5[IC`Y@_'DCNM<J>4^)-6-L)&ZL*Y$IW=!>[Y7<"#KG[
+M".`XPB7.35C;W+4/C$W#VM8UNU(N.)\=$)`)'^]FN#KR^@WI]@B@UJPH5L`?
+MX_B&=.OSR[X;Z.W60S'0@FDUX8:YZFH^OJOK&W9[_NV[@?WTTQW2+2M8Q5F1
+MLP*.CE/3_8W9IVVZ92U<[1$G*=QT+`,X<[S(Z@T<UECWA\"IK:CII<,#[JW%
+MZ609-2];9ILH)6L+5M0$[@S@TLCF*=-=IBRK6-J8]TE5:_ZH4_.4QO(^3>RV
+M+88SUIYEW)S=>F!W?[>[M["WNU^G;GR*.R.P1G=0JZ>&RIQ3T\W\@P`Q7;;$
+M8:^1_FOU3%TN=;35VSM9L$9WD*M7V-7#%\FL'IHRW;AJ8\*-N#+NZG'["C,Q
+M]7M]I3NZV]WR:X'*`:.-4*5M%3$[#"YB=AA<Q.PPN*C988`1L\/@(F:'P47,
+M#H.+FAT]L$GB;>(&9]PK,E8+\YRX^'_!UG;<#8^/Z^DV8FOKW]C$\9O11-S$
+B#6YS$\\:>K+V\Q=,-N(F;G!1-W&5F>/WT3\!FKQU%1H`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.gz.uu
new file mode 100644
index 000000000000..c8adeb3c699a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.raw.gz
+M'XL("/#%'50``VEM9RTQ>#$M-#`Y-BUG<'0N<F%W+F]U=`"MEC]O@S`0Q?=\
+MBI>U52W;V`262JW42MW2JMW:@3]FC-2=#U\?A@2(C1KIP$)(Q_UR]_#C(F4X
+M`*,AJ\@U'>B?Q?+L=W>[@:;JVX#^]ZF$%5!X8,`U/B@U/>,<NFY<4@U9(5E)
+M:#7>3SAQ.?9BAFO/6=<K'9CC1,!-[7:W`:U%55T!OZ;Z]/`Z+$P.4T+[YR6,
+M@M6PYHP;>K7-O+Z7US<<GSX^"?9]:5=[:5#[_!95!K<22:IDNS_K=@-.4U:W
+M5GO"94G</H[+**O=P,56&F>VLL(>^M^[#3@KEUG%/"MSJ#-T%:HV@7M<X7+F
+MG6<H7.<X-,@=K$+3T4V;0RF@\#8I!HB&]B66."CHFH#]Z5V<`NQ!_-Z/]1DU
+M[HC82@=2ZIEAJQ2I=@^TMS?;Q1*7<:M7D'J63;URW"RQE0XDU:N">G&12+VH
+M9?I)M<DA$Z[F54\-4\/[PW^_KZ_I0'\4RS,`S0ADJ]!H/S;XW$$X1G<0CM$=
+MA&-U!P$9W4$X1G<0CM$=A&-UAP<ZR3?$":?"F.Q:%!HN6]67&L>7^I;M.KTU
+F^C>&>/QE.,8A3KCM(>YN;99QB!..=8@;_W]*RMT?5F[7A(@+````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
new file mode 100644
index 000000000000..6936b1379dc6
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.vhd.gz
+M'XL("/'%'50``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD+F]U=`"MF$MOVS`,Q^_Y
+M%!QVZS#7DB79N0Q8L1;8K7O==JCER$4/RQ[IH1C\X2?*\D.VY"$M$]5(H/#G
+M/RF*8IWG_0M`%:!:4`:4Q,^E`+6'L@*PDWYP=V7^*W3-SZ-I'A^>,O_J=CV,
+MY7.KT!SM>0'"WJ0$7N--U`$_0S=@LM?7]Q<//^X''/>XX<9"@>`@+42L[J/R
+M41V2;JZ^?'#(NTE=L58W6=D_+2`7P-CL%\6@[F[4..*$M6I;-THH:[0=1_`E
+MF$#<WRQ;XV2^L)K)C`5UYFP,I[:LSL%=[/Q:]*EB$Z.T5QLZ!B7'SS9MACBL
+MADV5I].O^L_)+/3Q1*JH41];S15I=[E/%3[\V"L0F,Y;[H*C/"YQD51Y4?14
+M:#>LK@U"+H<)[MP/HS>A8*Y/L7PCYNG%2.JK49_=6WD=N:8GNJLL?(]`K<\#
+M#A$,<:/#NL'XN3IBS.11GR138(N-!<EG\=,'XO75[7E`*:&N5\!O@[[&+8=T
+M!6^/B6&+@V`@;?&;TMGY+INYONN;CW#[_O-7A'V?W&TP70X<J@::/;1ZH6Z]
+MT[9K2\/[[.-MU-DBB;N,XW"SM8<-7&RD<6++RA]E9S@K\]"JFEL5!G0!;0WU
+M(8%[M\!1UV6#TUI!V>`1+ADT[BP_*#S(H++;I'(0#MQ*M`>[/84U`KOCI^S8
+MP]YFO]]X?8;YC(B-]$0J>L;5Y2KE;CD5[(2[$.*HZ[*I,'J2+'I[GRRQD9Y(
+M1J_NHQ</$D8OMG7'4RW+7H4X31L]YDX-NS]L_5Y?TQ/=;1:^>R#WQQ#9N<9]
+M(253*#R03*'P^Y=0(3.;BWGN*BN_*$05!G&$%09QA!4&<:05!H&$%09QA!4&
+M<805!G&D%4;1-D+*-T)%!8;A/RXZS)IT2]-5V:D7=AFXZQJA9/NTT0C%%X.R
+M$5+_:X1:DW)VY"R<)6R$%'4CI'PA)7J6H89&:*WA.<\RU-`(S6[\@F<9*MX(
+>/?=9!N((GV4@CO!9!N*(4X79WF7W#]HOQ!D`$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
new file mode 100644
index 000000000000..0c18ed8876e1
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu
@@ -0,0 +1,19 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.vhdf.gz
+M'XL("/'%'50``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K9<[;]PP#(#W
+M^Q4LNJ6HH_?IE@`-F@#=TD>V#O%#"C+DBJ(=.OC'5Y3LL^23C%XAFS!TH/F9
+MI$G11T@X``0#TF:N9<5XVZ3GN+O:>1KM+@.ZYZ,+*V#C@`'7.R5A>(\Q8.TD
+MA'JK8.R$DV7M<<URD";"#;'52LJ*&-<$W!RNO0PH);3M&?!Q]H_YUR%!*!`'
+M8.Y^`H*"9"#%">=CEWWLW]W])WCX\.4;PKXOX3+JE`,#W4-_`-NMO*/_'F[`
+M.8<P^\QF@^5%W'4>QQ$W;.!R4L:)+:M00Y<$*TEJI6,K;J#C8%MHAP+N9H53
+ME2M/H+I3L.]!&9`4>HN+00&E`-JUB?80!LRY>(`]!=8A<#Q^;HX!]K[Y^6[R
+M3]"I(G)25I2R)[!4B"Z%N\?:W@P74AROG3V-V9/5LG>8BB4G944Q>VW(7CY)
+MF+U<ZSK<E+7F38KKZF:/^JGA^L/MW^?7LF)\:-(S`,4$K.:AM+:OV!V(J]@=
+MB*O8'8BKVAT(K-@=B*O8'8BKV!V(J]H=#FA(O2&..*P]KL%0V'/HTJHIC^-1
+M-[^"8]=)N(9MC?Z-(9Y_&:;B$$?<YA"WIA3LB;,*MN(01US5(:ZFSV_%0?G^
+M4A+7>P'*M92.@6RI&0_L?QQ-__OE3YP]Y7=F6#Z25X+VC&-A*M<B+3Y$#;B.
+M_'M[]WSU\OH\X]@4U?Q@K&A7Q0XBSL)5:;CWMU\_>N33XEUFFU)Q]CH!1.`6
+M$P<^>?>4EHKR7T!SL,:"EFA[DN1'HL@6,N)\J<0W_^^[#;C:I>+^&NS^`N3M
+&#A:S#0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.gz.uu
new file mode 100644
index 000000000000..782cb6c93c80
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.gz.uu
@@ -0,0 +1,87 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-gpt.vmdk.gz
+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
+G,1A>Q#W<DQ?Q<4@FRY\'R1I>Q#V<Z46\\'?OS#[Y/TT579ZT90``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow.gz.uu
new file mode 100644
index 000000000000..40c4fb37845f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.qcow.gz
+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
+BX=_Z)[[]\^W]?WX.#O/@WW:"PWK\_BI_^W]F=\)"L*<`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow2.gz.uu
new file mode 100644
index 000000000000..09fa383361aa
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.qcow2.gz
+M'XL("*0[(U0``VEM9RTQ>#$M-#`Y-BUM8G(N<6-O=S(N;W5T`*V8V;+3,`Q`
+MW_L5+LL%+E!BR4Y3E@O<A1G>X`%X3I=\13^>)%;C1)'BMI/6DVG'T1G9/E:6
+M+`L?8[PU+C=N8ZJMJ?]3`]/[,VSF^/O'SU7_<UP$F,V4**'#88<;L!XB#C1<
+M9L<=5L;ULD,!!Z>H,2B%<VIV4QT"[G;13EV[&`6+P&N``:<NQE7Y0<B/1[@K
+M\X.Y\T-Y_OPICG?DT_EAR(]'K35<D<2!$+71<&42AT+45L/MDC@G1.TUW"&)
+M\T)4I>!L0I4:EPM15L-!$K<6HE##N22N$*(T[VS:NXT0I7EGT]Z50I3FG4U[
+MMQ6B-.]LVKN=$*5Y9]/>[84HS3M0O#,1=Q"B-.^`>;<DW+.(JX0HS3M@WCTG
+MW(L.9Z4HS3M@WKTDW$W$"?4.-.^`>?>*<*\C3JAWH'D'S+LWA+N-.*'>@>8=
+M,._>$NY=Q`GU#C3O@'GW?N2=%>H=:-XA\^X#L;*($^H=:MXA\\X2#B).J'>H
+M>8?,.R2<BSBAWJ'F'3+O/.'RB!/J'6K>(?-N3;@BXH1ZAYIWR+S;$.YCQ`GU
+M#C7OD'GWB7"?(TZH=ZAYA\R[+X2[BSBAWJ'FG6/>?27<MX@3ZIW3O'/,N^^$
+MNX\XH=XYS3O'O'L@W&.'`RFJ\R[+Y$:XI]&>A7GO/UV\/[;"4>^8`!:7`*<R
+M#+C-K`/V8<"-!J5PU#N.]ZOAMP.VF^T"8#T_534"TH!]V&SU"74K/?VH6Y@O
+M&I[M7=&%`2]7/=Q^YOEK]\<%0.]-68Z`?T[YP=S+X1J@7S>;S.>F@','_._I
+M[]B_&C?;A@LX_>T`=70)VW-P[=N!WIE],_2.X;W>,N(FWPXTCSP'J4/-SL_L
+MGBM87'^=VV>U77RH97?*W?J:F)]06V`PW(G\S'BXS46\>]AFJ]@N0&*X9HC;
+M3J[M=';+<7:[F1?#\YUQYLYM(,.=&W`P;R&`MK+4!M9GC8]ZQ_'7:O@-0$?`
+1V6;0Y<VE:/$?-R^$K](4````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.raw.gz.uu
new file mode 100644
index 000000000000..f256873d8657
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.raw.gz
+M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N<F%W+F]U=`"ME,NRPB`,AO=]
+MBKAUP80(Q[IUQKT;=8WU]"EX>(/I!8JM[0R04F8"W_PA!$1I`(8`W9=QWN'/
+M*NV^VE<?FGYN`]8(;9L!%0,%US".%[`YVTW84$,0SA^;1B#=S<7`J['M5(1[
+M#;MRFW?$."6X/MQV&]!:<"X#WGI]5#H=)@#M$8P%^P<UK0WX<;E/`A:<+G5^
+M@J-?N$&P7H,[A%W1ROAFS#O\>$WDW^/,DCI&X/^F8&WANV?JR;XXSX!<)0U@
+MW?DH!0[YA5'?*9=!2;@+^B`/UP7<,5VO(QS]"!=2W',QM\OJ=KFZIG`R[+0R
+L5E9N@*25*S@J^Q#0YV7A&\BK\G'>X:\J[0(T';#8"1H*P.H-:WH%_)0&````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
new file mode 100644
index 000000000000..92039f8fa627
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.vhd.gz
+M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD+F]U=`"METU3@S`0AN_]
+M%>MX\]!)EF2A5T<].^.H5P'!\>#'J`</_'@32$("!(NFI10FV8=W/[)-&1M>
+M`)0!M4`-D-37N0`Z0%X`J$%S8'_FYA:Z^NVUJ;^>O_?FU>T&&&>^56BN[3$#
+MH1Z2`Y;Z(?2HKZ&SF/WIY=/9\\N3Q:'!V0<+`H$@%43,GD/,J=.DJ_.;BQ[Y
+M,*K+YNI&*_6I!#`!G'LS,JONP6ET.*&LVK8_<BC+7J8]@IM@8'1V@I-L8N7)
+M7`JJY^P2CM:LMN#.=B870ZFHPLC5686.0X[Z6I6-C</L4*7R_?E>?GPV$WT8
+M*15R^OAL+(N[BZ94T$XV"H0NYS5WH:=\37$+I?*OZ%%H)\R%"@*3=@![]\/H
+MC2CP]1%G*S&/)R.JK]3ZU-IBY<(Y/M"=[\.W`U;5-F#!!H4ASCE<U<[A4HX>
+M#44R!A-Y/"$G7ORJQ\3YK=IM0"EUQY@";ZV^.G4Z&@V4N>Z^DJ#`8QV^O[Q;
+M6FY-9/7^L5DU^!O.">;'X#+32NU,OS+B`]U8)L.WQ8DU=7H)-YN<E8EKKRDF
+M=GZ>@:E54@,KO";C`5U^8=1WF,O`P-T5?3!WM]2X/)S//1S^XBZ$N&HUM^OJ
+M3N;JZL3):*<KX\B5JR'ARAUPF+818-]95`6J6?-S?*"[WH?O`8CFER/93Q&:
+MWI=,H3#`9`J%;:;I%&9LM=BV5B$9A8GV]11O]W_9UY/7[A/LZ\FV^Y@5V[2O
+?)]/N$^WKR;;[-/MZC4NZKR?UCXVQW0]_N`=E#`X`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
new file mode 100644
index 000000000000..171e991a8e4f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.vhdf.gz
+M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K96Q;H,P$(;W
+M/,5%W3(@^[`/LD9-YTI5VS5`(,J0=NG0@8>OC3'8.)"D,AQ@=/;'?[ZS8<P<
+M``*!%5?N\XYVE_AGN]JL.AHO'P/F#)HF`"8*:'"5PJD.R@K9-Y0Q#EJXNI1Q
+M!LC[MC%HD_%8)P[N.(P*;=[AXA*#L^$VCP&EA*((@.]6'\9.A]!`F8&0(`ER
+MO#?@S_W')&"#X['FS^#P%FX0S._!I7J4T].MC'E'.Y:)>5J<6%*G$*Q^*%@9
+MN?9$/AGGYAF86B45L+SWH0\<\@NCOFTH`[UP%_1!&&ZA<9G?GSLXO!$N^+AR
+M,;?+ZM:ANBIR,N1T9=RY<C7$7[D&AW$W`NQV%E6!JE=XGW>TKXE_&J#H@=%F
+MD/I?$:5`#5`-)'4[$T!;R'(7B'XEM=7W5UW]G'_=#&L<'_X<H>GQF.K50AE@
+MH3]"1]UV]#WM3YOSY61Q=JNR'Q:D)UTJB`C")3_<E]W;<X<\C.K2<)+(G;U2
+M`!/`N1=XK^[@ES-U^[P-MFZ@E)U,:]Z+Y[BZ56F<9)-1_\VMP5'D4E&UM_H#
+(GF2M3+\(````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-mbr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vmdk.gz.uu
new file mode 100644
index 000000000000..bcbad1e62259
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-mbr.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-mbr.vmdk.gz
+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
+E69AE]6+<_KW_Q/6[T_:_%;`,@&8=+/TGL>5?_1_0^/1A@%\`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu
new file mode 100644
index 000000000000..efca490443b9
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.qcow.gz
+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
+"````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu
new file mode 100644
index 000000000000..afb67c951962
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.qcow2.gz
+M'XL("*8[(U0``VEM9RTQ>#$M-#`Y-BUP8SDX+G%C;W<R+F]U=`"MF-N2TS`,
+MAN_[%"Z'!18HL62G"8<%]L`,=W`!7+?=]BGZ\&QB;90H4MSMI,UDIN/^W\CQ
+M%S5N4:27<]&[4+I0N\/6/7RF`USOP_!PQ]\_?J[ZK^,BP7QAI)2!@!UNP+IA
+M'%BXPH\'O([K58<*#AY38U`.%\SJI@84W.6BO73M8E0B@><`$\Y<C+/J@U2?
+M3(0SZX.YZT/]^L7'G!PHI^O#5)],K2U<E<6!DJHMW":+0R6UM7"[+"XHJ7L+
+MM\_BHI(Z&#B?4>4!5RHI;^$@BULK*;1P(8NKE)3EG<][5RLIRSN?]VZCI"SO
+M?-Z[K9*RO/-Y[W9*RO+.Y[V[5U*6=V!XYQBW5U*6=R"\6Q+N&>,.2LKR#H1W
+MSPGWHL-Y+65Y!\*[EX2[8)S2[\#R#H1WKPCWFG%*OP/+.Q#>O2'<)>.4?@>6
+M=R"\>TNX=XQ3^AU8WH'P[OW(.Z_T.["\0^'=!V(5C%/Z'5K>H?#.$PX8I_0[
+MM+Q#X1T2+C!.Z7=H>8?"NTBXDG%*OT/+.Q3>K0E7,4[I=VAYA\*[FG`?&:?T
+M.[2\0^'=)\)]9IS2[]#R#H5W7PAWQ3BEWZ'E71#>?27<-\8I_2Y8W@7AW7?"
+M73-.Z7?!\BX([VX(=]OA0$MUWA6%?A#N;G3/PKS/GX&?C[URM@<F@-53@%,5
+M)EP]ZX1CFG"CP48YVP/'Z]7PW0%;89X`C-%MQL`_:<(Q"5,'MPO:O`X'/DZX
+M?G%N86*S)+->/V@G'-?-71%+5\&I%?Z[^ZM,&.:;<,+9VWD:Z`KVI^#:[7SO
+MF[[_<&8.#!_.EHR;W,XW>Y2]-F!6%^>5!:`2N?XZMYNK'>]"Q:-MM[Z.ZU.:
+M`0RF.U&?&T^W^=7M=L=B%=L%R$S7#7';R;6=KFXYKFXW\V*@O#-.O',;R/#.
+I33B8MQ&$]+]>T?;(T=D>./Y:#=\)&`@XVQ4,9?/;L?@/'U:4T(,4````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu
new file mode 100644
index 000000000000..5398eaef066e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.raw.gz
+M'XL("//%'50``VEM9RTQ>#$M-#`Y-BUP8SDX+G)A=RYO=70`K91!#H,@$$7W
+MGF+<=F%@'*INFW3?3=NU-?44'+X@5`4$-0$,,?GP\C\#,&8:`"&P?F.,"_)6
+MN5T6EV*B\?$<4`CH0^!3`2<<:G\=P4"@_KP/QG'Y'$%67OOCN!)#D%T5%39P
+M-BYEWC^<`HL&2("X0HM'';[OKXW`F"^PP>$>;C;,C^!JO6HU4[E%/N-B@L&5
+MEE4N.$JY4PCV/156Y#TLB*VW;EUG8.H,#\!:JZ$+G.L+B[\NM(%.W(0_"./V
+M&M>X\_D*ASMQP<5]DK5-NRM#=T/F8M3^S3AX<S7$O;D&AWD?`II>9G4"]1L9
+9C'%!/BJW&R!98+8=)-3`X@?$\J!S108`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
new file mode 100644
index 000000000000..8df641e4f705
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.vhd.gz
+M'XL("//%'50``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9"YO=70`K9=-;X,P#(;O
+M_16N=NNA2HP3VNNT[CQIVG8M9;3:81]:>^B!'[\8$DCX6KL%*`H*?O+:<4PJ
+M1'T`Z`3T'G0!6G$[)=!K2%<`IM->6-VE?80R__PH\M/;>6F/<E;#I/"M0G.V
+MQP3(#)("9CR(?N4VE`ZSO-D<%F_O!X=#BW,#DP9"4`9"O7&T:-0QZ?[V\:Y"
+M;EMU25]=:V5^.P)!(*7W1N+4;1N-#8Z,U7Y?72ED62737<%#T-$ZV\$IT;'R
+M9`X%U7-V"*>GK*[!+69V+NI4,8F1FKL)G804N6W2QL6A=YE4.1^_LN]CT=&'
+M(ZFB&WVRUY>,NXLV5="];!40I_.4NU!13EW<0*K\*WHZM"/;,$$0RG5@Y7X8
+MO18%OCXMQ43,QR=C5%_&^LS:$MG`?;RCO%V&9P/<[:\#*L5+J`M\<@[GK&]-
+MD--0W'TG+UH=^4CV_7E^B\CQP\IAE7*Y5!I6>*G"E\WS@,,8S^$:A[_A&L'R
+M$EQB:Y][TZC%YFLSVE'CYI8U;W$TI8[77'&5LRINLF"^ZMCY\PS"Y'`.8N55
+M!0_8S"^T^M9]&1BX.Z$/^NYFC$O#]Z6'PU_<A1"WFYS;:77SOKH\\F2\=E?&
+MA2N7(>'*K7$8MQ!059E-!G*-[-W'.\J'97C60+2E/MJW`VUMCJ:0+#":0K+5
+M.:)"*B:3[=HLU%9AI(TXXR)NQ!D7<2/.N(@;<<9%W(@S+N)&G'%1-^+:_,42
++8O8#/[LV_KT-````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
new file mode 100644
index 000000000000..49a64aac2ce1
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.vhdf.gz
+M'XL("//%'50``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5L6Z#,!"&
+M]SS%1=TR1/BP#UBCIG.EJNT:0B'*T';IT(&'KVU,\&$@266PD-'AC__WV><D
+MZ2X`B9"4$\_Y0+O;\KM=;5:6)IK[@$I!&0)?-=#BT.@K)%02=&_4H&F&Q@+M
+M=G3U.*&#(<B-F@U,X)Q=&7G^T!I6&4@%BB#'6Q6^[]\F#&,\PQT.K^$N@L4M
+MN-2,\K[4:E%<<'.!#K=VK/6`DTOJ-"*I[S*KXBX6Q'PTSL\S)'H-5Y#D+H8<
+M>,DO#/J*4`8RNPOZ(+1;&ES&OQ<>#J_8!8X[+N9V6=TZ5%=%3D8ZWADW[EP#
+MX3NWPV'<0B!M9=8KT-3(X#D?:)^W_.Z`T@&CS2"YLX-2H`:H!E*FGTF@`K+<
+M!R)?26WU_557/^=?/\,&)T85W6]F/*9FMU`&6)J?T(?I>_H>]J?-^?/4X_I2
+MU?]8DIETI2$RL$O<[M/NY=$B#X.Z-)PD\F?OJ$\H"4(PXT[=@2]GLOGMS=8-
+D')65V3?VP@*3I<K@5#(:]=_<=CB*O%3TJ;;Z`TU!^3)P"```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu
new file mode 100644
index 000000000000..f76b425d12e7
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-pc98.vmdk.gz
+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
+.8+X`OOH_SBV/UN!>````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.gz.uu
new file mode 100644
index 000000000000..ddcfe733f234
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.gz.uu
@@ -0,0 +1,125 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.qcow.gz
+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
+J//?S&:<?4MK#W_4O?/O7V_M_W:$RS(-_&WO#>OO]4_[Q?X8;4W9_I0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.gz.uu
new file mode 100644
index 000000000000..426bfa74b1e6
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.qcow2.gz
+M'XL("*@[(U0``VEM9RTQ>#$M-#`Y-BUV=&]C."YQ8V]W,BYO=70`K9C;CM,P
+M$(;O^Q3N<EY@B6?L-.&PP.ZR$A=((%Z`IG$?@.L^/$[LULED)BY5VK129?V?
+MQO;7J=.B"`^EK%:F5*96^T;YS_$"-?@POM3AU^/WF^'CL`HP70@I9L#@"3=B
+MW2<<2+A"3P<TCQM4APP.CJDI*(<S8G5S`PSN>M4O7;\9%4G@)<"`$S?CHOH@
+MU$<3YL+Z8.GZD%\_>\S1@7*^/@SUT=1&PE59'#"I6L)MLSAD4HV$VV5QADFU
+M$LYE<99)[06<SJCB<263TA(.LK@-DT()9[*XBDE)WNF\=S63DKS3>>^V3$KR
+M3N>]:YB4Y)W.>[=C4I)W.N]=RZ0D[T#P3B6<8U*2=T"\6T?<5<+MF93D'1#O
+MGD3<TQ-.<RG).R#>/8NXYPG']#N0O`/BW8N(>YEP3+\#R3L@WKV*N.N$8_H=
+M2-X!\>YUQ+U).*;?@>0=$._>3KS33+\#R3LDWKV+K"+AF'Z'DG=(O-,1!PG'
+M]#N4O$/B'4:<23BFWZ'D'1+O;,25"<?T.Y2\0^+=)N*JA&/Z'4K>(?&NCKCW
+M"<?T.Y2\0^+=AXC[F'!,OT/).R3>?8JXVX1C^AU*WAGBW>>(^Y)P3+\SDG>&
+M>/<UXNX2CNEW1O+.$._N(^[AA`,N=?*N*/@KXKY-OK.P[/G3I/.Q9M[E@1E@
+M]3_`N0H#KEYTPC9,V-\Z;D"5MKN\$A:[G?1-1)E6`C[^=>[N]X/Y,:S/+GU#
+M8-/Z%=PR4535'\=!6C\[6K\ZB\MLAPT'LT6F&W#-N3C_X^*/]JU3SA'<GP%N
+MM_!FZ,ET77?R]\>IZ@S@>@`,N&ZZ(4QWF/EOX#BL#NM)?0&7I@N#"(QPFJO.
+MGQ;[UQC7)IRF/6MVLFNV.K>H*GU?/@O7;E7CNI-MLYG@KHZXOB_[`Y"_:9V^
+;RP.'GS?C9U#%1.!B[IFR:U2K?VQQ7;KP$@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.gz.uu
new file mode 100644
index 000000000000..f5ae94e4a3e3
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.gz.uu
@@ -0,0 +1,10 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.raw.gz
+M'XL("/3%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YR87<N;W5T`*V230Z",!"%
+M]YSBX=(%:8=296N,.Q,3+R#8>@#7/;QMA@0*Y<>$H73S>%_F,2,$%Z`T3@1=
+MA:,(50FE4"HO&'A]>N!N7VLOSZNZ%UPN8YCT8M(BE@17C,IEQPYXCGQR&7B&
+MJ"$H"61<W;OJ5=Q2?XQK]HK+N'8K3OO;P%A8.\*]!KCWSL.0D[@6?N`DPY]<
+M!>;CN#+$9?-XPK,X+[A\TA_C^K@TL%"$DZGN4/`;XTR/DW^M2I[LSNZZ*O*S
+M%6<:M!9$*/4$=]`=CH*K\M\WB7M><(\B?GA55`?<;?<4!6#V`]&)2;VR!```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
new file mode 100644
index 000000000000..aadaa429871a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.vhd.gz
+M'XL("/3%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&0N;W5T`*V6R6[",!"&
+M[SS%2+UQ0-[BP+5JN56JU!?`21S40Q<!!PX\?&<29W$2!R@.QC)RYO,_X[$9
+MQNH'0$O0)6@+.J%QJD!O(%T#X*1KHNJY^PF7_.?;YJ?/\\H]ET4-XZQOY9N3
+MO9"@<)$4A*%%=$%CN#28U=/K?OGYM6]PPN&:A94&)2!!B!JMHUFKCDC;YX^7
+M"KGKU,FQNLX*OYD"IH#SWANR4;=K-;8XA59E6;44C*ED-LW[X4UTS@YP"1M8
+M]61.!;7G[!1.SUG=@ULNW%[4J8*)D6*/H>.0"AICVC1Q&#5,E?/QUQR.=J!/
+M!%)%M_KX:$Z&W14N543SLE.@*)WGW(6*<AKB)E+EH>AIWTZY`0:!)<V$J-SW
+MH]>AH*]/<S83\_!F!/49TH?'"W>4;H&D.V=2XT01<GA[L!9/FG[SXV<"N_OO
+M^)FU9W?E=*R!;>C6"::+V716F\</FS&QW*UQV:TXNKX**"Q8.\#M>K@\\F9D
+M(W<M9;*\#<B&[F;DKAR\SUT?P-%%RD;Z:ESGKNB9"`\WNEQ(';3'K(\K6MQ0
+MXQ5GV:0Z&S55LO)67&$@LR`ER&2$DXG#Y62%?T3,3/3AB<O[RO_4J2+<O1+M
+MHA*Q%2H'C*80@3:R0LYF,^/>\ZN=PDA5'^$B5GV$BUCU$2YBU4>XB%4?X2)6
+2?82+6O7I*O<6?^^O%OLJ#```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
new file mode 100644
index 000000000000..bcf2071ac264
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.vhdf.gz
+M'XL("/7%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME,MN@S`0
+M1??YBBMUEP7R<PC;JLVN4J7^0""8J(NV4M5%%_[XVK%)L'$>JC"#!1KF>*X]
+M#&-A`(I0"Y#VI@2TA%*0Y!P]G']NL-MO8Q[?GNBE"L.N`HP[9S&$77/8*AMV
+MM8[`31+'KP,W8`V8*`(#KCE'-3=QU_(+N'8IN0'7W8LC-_?H#8S)<+L);K_P
+M8?"97`-WX/(^(,OE<B]79M_S.%_`.8=EL_P"[BQ73$)$@N.E[%"%.\7U)UR>
+MXPVQK)B=6;14^'`OKF_1&4@)J6<XJ2-.^"CMOF\+\V6'?:W2*Y2*BL#%:H]B
+MHR()&D#FV*LD:@5J4&^F0)$<,^S^Z]/L?]Y_I_M'L5$-0]E\O'!-T"U20[1^
+M$>K]\R2_A^?#^OWC,.)$5#4N[%KJJ9/F*BF5NW5]=/QU1YR<;Q)-=Z]38`J<
+M)\)C=KNT6#Q.G<2:`9T^ICE:\I(XBK7G<9IE4?\O98^CA4O%U=[J#P!,R,C=
+#!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.gz.uu
new file mode 100644
index 000000000000..238837c7ad0c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-1x1-4096-vtoc8.vmdk.gz
+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
+5%`'0[+U7^,]AS;[Z/YH4:2:>70``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.qcow.gz.uu
new file mode 100644
index 000000000000..99f2a7bbd11e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.qcow.gz
+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
+HSV](YW>>P#_Y)[[^\N;^?VX'FS3XF[UA<[[^!I]_^C_<Q@LX=*8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.qcow2.gz.uu
new file mode 100644
index 000000000000..88ef9cd1c9d3
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.qcow2.gz
+M'XL("(\[(U0``VEM9RTQ>#$M-3$R+6%P;2YQ8V]W,BYO=70`K9A);]LP$$;O
+M^15,]Z9-*LZ0E-P]FX$>"J0->@Z\R$"`+D8:H!?_^%+6R)2I&3$VY`A"#.)[
+M&`^?QZ:SK'XH9;4R3IF16DR5?TX7J-:3[4NMOHV_G+0?JX,:IC,AQ2P8W."V
+M6.<!!Q(NT]T%S>-:U2&#@R;5!:5P1JRN;X'!'1VL6[?>C")*X#[`&B=NQE[U
+M05U?G#![U@=#UX=\_VR3BQ=<?WU8UQ>G<@E7)''`I$82;I+$(9.:2KA9$F>8
+MU%S"E4F<95(+`:<3JGB<8U):PD$2ES,IE'`FB2N8E.2=3GLW8E*2=SKMW81)
+M2=[IM'=3)B5YI]/>S9B4Y)U.>S=G4I)W('BG`JYD4I)W$'EW2+A'`;=@4I)W
+M$'GWF'!/-CC-I23O(/+N*>&>!1PS[T#R#B+OGA/N1<`Q\PXD[R#R[B7AC@*.
+MF7<@>0>1=Z\(]SK@F'D'DG<0>7?<\4XS\PXD[S#R[@VQLH!CYAU*WF'DG28<
+M!!PS[U#R#B/OD'`FX)AYAY)W&'EG"><"CIEW*'F'D7<YX8J`8^8=2MYAY-V(
+M<&\#CIEW*'F'D7?O"/<^X)AYAY)W&'GW@7`?`XZ9=RAY9R+O/A'N<\`Q\\Y(
+MWIG(NU/"G04<,^^,Y)V)O#LGW,4&!UQJXUV6\1?A+COO61CV^Z<)WX\U<Y<7
+M>H#%+L"^"FO<:-`7;.L7['?`0CA'9>M/R*(7>/F]PAQNUV>'/A#86A@_F<V\
+MDT/IP.<75E=?F?[96AC_=O#3U%]NIIQ]4'VGR^7/DL')I]O=CU,>A]WJ[&+]
+MOY<E!Y4;Y49T=POERFJ9JKM93N[N;^]O__R^:7#5!Z2;5^%\E^I^399L=7;@
+MO34/W-MFJ@`!M_=6-?69H=TSZ^UP5>/]1OC+CTN+U93S7S.4M=6:Q2YP?%>6
+M9]<7QS_&U^W^F6%_;+#^1)7N'[3Z5[])VOU3[?K<T/USO?W+4>4YXV;HW]]_
+HM8A-?4/WKZ#^^9-Z]RXOK*Y.MO]JH"'@8!4:5TWG@_\+*`W"Y1,`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.raw.gz.uu
new file mode 100644
index 000000000000..025d7ad4a149
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.raw.gz
+M'XL(".3%'50``VEM9RTQ>#$M-3$R+6%P;2YR87<N;W5T`*V3S6K#,!"$[WZ*
+MZ;50(\DKJ3FFM+D50D//P=0.!-K4I(%>]/"5(HG(/PDN:+T(BV4_QK-KQGP`
+M)"$%F$T64G`PPN4^2)B7M]+&71G#%![&V8VNZ[AR$*:X]T#ARI*!FE%?E0)Y
+MOV#6KT.@QSE]Q*&92_4!)6?I6W;=9SN!$[D^U^.JL3JY.[]S0`MH@EJ$4^V@
+M6E<.ZK9=?3SM3_OOPS;BR.)4XYKU?]1]U=VD.IEYMC1SMA27,@#[LT741[EW
+MC\[C4,YX.PB;)"`K$$$T5KAT-7L?`5?'MGW:/#^\KS:I?T29]:D9_HG$/_^3
+MI/XAU:=R^Z=N^J<K:#VQFQ?_?G[](D9]N?U[#/ZQ>N*\7C#KLO]X(`5@-H4D
+,'+#X`^%)]I"G!0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
new file mode 100644
index 000000000000..ad1859a2056c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.vhd.gz
+M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV:&0N;W5T`*U6RVX;(13=^RNN
+ME%VD6L#`G739JO&N4I2HZV0Z9B)+36+%EIJ%/SY<'H9Y,+5=QA@Q8N[A<.X#
+M&',/`%:`':`&5#2N)>!7J&\`S*1OPO;<O\*A?7O5[7[SL?3/8>'`.$NM^N9D
+M+RJ09I$:1$.+X)K&<`@PRZO;Y^O-RW.`$QXN+"P1I`!E0.1H'61'=H2T^O[P
+MPT(^17;5F%VT,O_?$I@$SI,OJL#NZ<CQ"">-5=?95D/36)JA]5YZ$W&S`SC%
+M!E8)S2E1D\U.P>&<U3EPUPOO"Q<J)C!JTQOI.-2"QB9L@@ZC9D+E8[=MWG=Z
+MP$]D0@6/_/AHKLIO5_A0$>%CST!2.,]M%RS*?@@W$2K_I1[V[:0?&!&8"A/"
+M;K^O7H2"E!]R-J-YWAE9?@WQ,ZFI1$AVVZI_;?CVGF#8T!U-QKL7Z]?2M,D0
+MN9Z*BO@RS-V[GY/ATA(_R2F,*9);BN%3^'W;;O_H"3A1:KL.KAJS4YW/.9MT
+MKD3;WI5NU05VCR;;]IO]YNWU,<!1H:)2:Q%/9_?2;"?9J<*^U2?Z-B2-\(!]
+MWT+@ITO'GK;N0!*>3D@5SR"Q-L05S9GW$>#J76MS"GWYM7I(]=.R+#_.3M!/
+M)/JY)$GU2VL+SQWBE_.;U8\.DWHB-J-^N[\N$`._TOH)KQ]K)OK\Q.%NV?\Y
+M0.&+:;'J+&+U*\-0>L!B#&7,X5(,.<XZ\UPOHV=8Z*J+^2ISR567X`I>==&7
+BK*P5.^NJB[YD%;KJ$ES!JR[!%;WJHBVHBT^(Z?)+'PT`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
new file mode 100644
index 000000000000..189b488a594b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.vhdf.gz
+M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M54UOPC`,O?,K
+M+.V&M*I-'(<=-PUND]#0SE!HBRH-J!C2=NB/7SYI2@MB4U,K2N3F]?G9<>/8
+M#@`4(!C$RF)GW,S-_L*@GKY':L21'_7(@B6W3EV'BRY&/1I;0*;=(@;,.N=X
+M")BT'?7\[1+0PFE^F(",M=$&2-S%[[FJ/O,>.#94N!:.=]F)PJP3`,E`(M"3
+MFZD`RK7;L5M6Z?%4GLK#?NGA4,%1I@_+O[#;I54O.S%P;O'.W*);,`?8SBUX
+M?CAT[:%)!VGA52*4(0/!`1%8IH@+[5/[#N#LF.<OB]?'C]DBU`]Q8'YTAWXL
+MT,]>DE`_"/G1T/K13?TD!RE[:K/1[^O;%J+G-[1^$Z=?G/;,UQWU/&H_%A`=
+MX&`,R75GXNZN:Q&Y[P&3$)`UZ36`F\,^WYS*G_`&D^O.1=%O^CSC^E]`$EAJ
+M6DRFUP&_A^EV7.ZV'LYW/_]AE>MSBB^CI':X,Y5@`[EJV/&N2!2JMT9=RTG2
+M"MRQ6X7J63@\!YL7L!:&IK?6IN7H[<T:SG2_\.7_YM;"T<"EHGZ4HU\LKXQY
+$T@<`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-apm.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-apm.vmdk.gz.uu
new file mode 100644
index 000000000000..d704c00d0767
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-apm.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-512-apm.vmdk.gz
+M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV;61K+F]U=`"MG%MOW,@1A=_]
+M*PCORR)`!)[A_<%`UI$-!,$"QGJ3/&YXC878EB`)20S,CP^;[-,ZE$0WL2IE
+MM)SR5-5T5X]*RE<'3-/U*TGR+LGS)!^2HDQ2)/,_K8\DS1Z,^7&J^<+YKY<_
+M__V"7S]>7)Q?K<G@HB0$J:838_,^YXM'7TQW^E[4YH7Y<8JFRUQ4]R30ISOM
+MO+";+I]?/#T7PM6UR\N#>R+IDI`HV:0KGMG3[F:_M[H_O/+%<^O+W!KFXRV;
+MI,J2LO-F4A:+G275:7DM3:K9:9H3_I!<7MW].[D<[_K;JYO[:[^^DSO;V3DO
+MG7_9NPSSQJK2/7$ON'2-2U&.238D&=S+R?GV_=7G\>(_X^W=U?77-^!V3^YL
+M\RS)&[<<YY\^/#:&>Y,T*>'>(SG_^2^7;_PG-[VX:6^9SD7-"YG?>]Z'YBW+
+MQ'T_?2RK&[_>NXR3_PJK<V?KBU,L[YV[)T6>5$VR+*=PN4_SRX/?\E*[_G9L
+M[\=?O]V,;UY_N?X::N?.UI6L61+52Z&RI,A<*K\U5[["970?F^74DO/GJ_M/
+M5_W'>9MWX^N+'Q*F*UWMY@.L_;K67<\AY>[)SLL^O_O?_;S?9/`G>\5TRR*6
+M3<SO79R2HG*YY@-<CN*49+E[-O_3O.!Y)SF<4W*^_GKQRS_F'W%7K(\??OJ%
+MZ>HY:O:<%SB'S!O:[*E8]U\\_E@FYX_ODM=ND[]^&I=/(-,UZX^9<U[/`8MY
+M<D]\U=;TKHGE[H7E9)/+]KY-WK9WX\4/EY=OP\FV;K/Y\IB7-KHLY9K:?;Z7
+M<LZ%6T]Z/>CE*(:ANVB']N9^O'7'&XZB<R4:_$[=L>8/Q[A]GVHYJ<E]8I+S
+MF^3UU3"?J4O[K_'Z"]/UZ\=X7H?[2#1+8.:>S)^>)?WHWV']Q+AC<NG&^]MO
+M%_VWSU=?A_D'+7G#=,-:NWDYZVD^'.9\@/,*GUW@7+O7RZF&Y3'=Z%8W/%G@
+M<IZ^D&%1X6V3\Y=E>9_&=IB7-N=FNLFM[O3\.GRE'KW5G#TY/U1MR7OGTV6I
+M;P&9;V6;$H7EK&\H#73L[Z]OUX6]EGZ</?Y=]M)^G#_YE5K]SH1K.NOUE>FC
+MWV>9QN5B%)N$[K=8.G__:?[^\+"^TJVO%,]*HVHQFDVZ?\XI;IYNMW0_A:UX
+M=AK5BS$<J5[I6MLHGM/CZO%/#<CS_73\6X">F4;E8A2;='NU*WSMZ%EI5"U&
+MLTFW5[O2UXZ>G4;U8@R'-EOYVM%STBAWX9]22`_\65;6OG;TS#0J%Z/8I-NK
+M7>-K1\]*HVHQFDVZO=JUOG;T[#2J%V,XM-G.UXZ>DT:Y"QL$Y/E^NM[7CIZ9
+M1N5B%)MT>[4;?.WH66E4+4:S2;=7N]'7CIZ=1O5B#(<V._G:T7/2*'?)I79Y
+M+%V5^MK1,].H7(QBDVZG=A7['3TKC:K%:#;I=FI7L=_1L].H7HSAT&;9[^@Y
+M:92[%%*[(IJ._8Z>F4;E8A2;='NU8[^C9Z51M1C-)MU>[=COZ-EI5"_&<&BS
+M['?TG#3*74JI71E-QWY'STRC<C&*3;J]VK'?T;/2J%J,9I-NKW;L=_3L-*H7
+M8SBT6?8[>DX:Y2[\(PCR?#\=^QT],XW*Q2@VZ?9JQWY'STJC:C&:3;J]VK'?
+MT;/3J%Z,X=!FV>_H.6F4NQ#(0)[OIJM37SMZ9AJ5BU%LTNW4KF:_HV>E4;48
+MS2;=3NUJ]CMZ=AK5BS$<VBS['3TGC7*71FK71-.QW]$STZA<C&*3;J]V['?T
+MK#2J%J/9I-NK'?L=/3N-ZL48#FV6_8Z>DT:Y"___$^3Y?CKV.WIF&I6+46S2
+M[=6._8Z>E4;58C2;='NU8[^C9Z=1O1C#H<VRW]%STBAW(7^$/-]/QWY'STRC
+M<C&*3;J]VK'?T;/2J%J,9I-NKW;L=_3L-*H78SBT6?8[>DX:Y2Z]U*Z/I6M2
+M7SMZ9AJ5BU%LTNW4KF&_HV>E4;48S2;=3NT:]CMZ=AK5BS$<VBS['3TGC7*7
+M06HW1-.QW]$STZA<C&*3;J]V['?TK#2J%J/9I-NK'?L=/3N-ZL48#FV6_8Z>
+MDT:YRRBU&Z/IV._HF6E4+D:Q2;=7._8[>E8:58O1;-+MU8[]CIZ=1O5B#(<V
+MRWY'STFCW&62VDW1=.QW],PT*A>CV*3;JQW['3TKC:K%:#;I]FK'?D?/3J-Z
+M,89#FV6_H^>D4:E,SR#/=].UZ5J[X)EI5"Y&L4FW4[O6][O@66E4+4:S2;=3
+MN];WN^#9:50OQG!HL[[?!<])HUS)A-\ABK1:W^\@_`[*[R#\#E%^U_I^!^%W
+M4'X'X7>(\KO6]SL(OX/R.PB_.[!9W^\@_`[*[R#\#E&DU?I^!^%W4'X'X7>(
+M\KO6]SL(OX/R.PB_0Y3?M;[?0?@=E-]!^-V!S?I^!^%W4'X'X7>((JW6]SL(
+MOX/R.PB_0Y3?M;[?0?@=E-]!^!VB_*[U_0["[Z#\#L+O#FS6]SL(OX/R.PB_
+M0Q1I=:FOG?`[*+^#\#M$^5W'?B?\#LKO(/P.47[7L=\)OX/R.PB_.[!9]COA
+M=U!^!^%WB"*MCOU.^!V4WT'X':+\KF._$WX'Y7<0?H<HO^O8[X3?0?D=A-\=
+MV"S[G?`[*+^#\#M$D5;'?B?\#LKO(/P.47[7L=\)OX/R.PB_0Y3?=>QWPN^@
+M_`["[PYLEOU.^!V4WT'X':)(JV._$WX'Y7<0?H<HO^O8[X3?0?D=A-\ARN\Z
+M]COA=U!^!^%W!S;+?B?\#LKO(/P.4:35I[YVPN^@_`["[Q#E=SW[G?`[*+^#
+M\#M$^5W/?B?\#LKO(/SNP&;9[X3?0?D=A-\ABK1Z]COA=U!^!^%WB/*[GOU.
+M^!V4WT'X':+\KF>_$WX'Y7<0?G=@L^QWPN^@_`["[Q!%6CW[G?`[*+^#\#M$
+M^5W/?B?\#LKO(/P.47[7L]\)OX/R.PB_.[!9]COA=U!^!^%WB"*MGOU.^!V4
+MWT'X':+\KF>_$WX'Y7<0?H<HO^O9[X3?0?D=A-\=V"S[G?`[*+^#\#M$D=:0
+M^MH)OX/R.PB_0Y3?#>QWPN^@_`["[Q#E=P/[G?`[*+^#\+L#FV6_$WX'Y7<0
+M?H<HTAK8[X3?0?D=A-\ARN\&]COA=U!^!^%WB/*[@?U.^!V4WT'XW8'-LM\)
+MOX/R.PB_0Q1I#>QWPN^@_`["[Q#E=P/[G?`[*+^#\#M$^=W`?B?\#LKO(/SN
+MP&;9[X3?0?D=A-\ABK0&]COA=U!^!^%WB/*[@?U.^!V4WT'X':+\;F"_$WX'
+MY7<0?G=@L^QWPN^@_"Z(Z2#/)5VR?OMT8[K6[EE)^3/_%&J7/+NZT5@?B$4?
+M&&8*ZZY^7\(UG?7ZPGR;CQ?I%Q'FVWR\2+^(,-_FXT7Z183Y-A\OTB\BS+=-
+M](L(\VT3_2+"?-M$OX@PWS;1+R+,MTWTBPCS;1/](L)\VT2_B##?-M$O(LRW
+M3?2+"/-M$_TBPGS;1+^(,-\VT2\BS+=-](L(\VT3_2+"?-M$OX@PWS;1+R+,
+MMTWTBPCS;1/](L)\VT2_B##?-M$O(LRW3?2+"/-M$_TBPGS;1+^(,-\VT2\B
+MS+=-](L(\VT3_2+"?-M$OX@PWS;1+X+S;1O](CC?MM$O@O-M&_TB.-^VT2^"
+M\VT;_2(XW[;1+X+S;1O](CC?MM$O@O-M&_TB.-^VT2^"\VT;_2(XW[;1+X+S
+M;1O](CC?MM$O@O-M&_TB.-^VT2^"\VT;_2(XW[;1+X+S;1O](CC?MM$O@O-M
+M&_TB.-^VT2^"\VT;_2(XW[;1+X+S;1O](CC?MM$O@O-M&_TB.-^VT2^"\VT;
+M_2(XW[;1+X+S;1O](CC?MM$O(LRWZ?DB_2+"?)N>+](O(LRWZ?DB_2+"?)N>
+M+](O(LRW3?2+"/-M$_TBPGS;1+^(,-\VT2\BS+=-](L(\VT3_2+"?-M$OX@P
+MWS;1+R+,MTWTBPCS;1/](L)\VT2_B##?-M$O(LRW3?2+"/-M$_TBPGS;1+^(
+M,-\VT2\BS+=-](L(\VT3_2+"?-M$OX@PWS;1+R+,MTWTBPCS;1/](L)\VT2_
+MB##?-M$O(LRW3?2+"/-M$_TBPGS;1+^(,-\VT2^"\VT;_2)&4_TB1E/](D93
+M_2)&4_TB1E/](D93_2)&4_TB1E/](D93_2)&4_TB1E/](D93_2)&4_TB1E/]
+M(D93_2*F-#74+V(RU2]B,M4O8C+5+V(RU2]B,M4O8C+5+V(RU2]B,M4O8C+5
+M+V(RU2]B,M4O8C+5+V(RU2]B,M4O8C+5+Y[2-#74+YZ>W$OX8+JGFUWU@?FR
+MOKQP]R[5>_VN=S7^3L)WO[@T/SY:7VZ^ON5^O>[VJL.3N$P38OO"^<//S]4O
+M7^[7FR^W-76W,5WOUWM@?3_=W'P>GTGWY%[,OW>[:[KLZ>J*R=_H=[ES9\Z[
+MY?*>PL7$U?UVT][>7]U?77_]C>F6^_4._C:NQU?WI;UY=G7&]V+.\X-G2R)R
+M\@FW9YMP?=;W_LSSY3A*WN^X<'?1+98[ZIZ&>>&%>ZW(GB9\?SN.;S]>_O%O
+M[S]J_?+<>'WE@?JI%&[](='Z);H^:^UQ7GZW?E665-4SG\V'^MW]=_T@<GW6
+G]:M]_=S]G9_\=_^%\X>+[?_6A+E/:+;"W-U\-GWU?YW"XEV37@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow.gz.uu
new file mode 100644
index 000000000000..1aab94860233
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow.gz.uu
@@ -0,0 +1,125 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.qcow.gz
+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
+C[Q7![H=9_O+<'G[4'_CVK[?W_[D;''X,_O'_LNY7-X&E````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow2.gz.uu
new file mode 100644
index 000000000000..0fb99580fd8c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.qcow2.gz
+M'XL(")$[(U0``VEM9RTQ>#$M-3$R+6)S9"YQ8V]W,BYO=70`K9C;DM)`$(;O
+M>8I9SZZ*F>Y)2#RLNNM:Y9W>Z#6P\!0\O!NFR22=_C-(!5*IHH;_JY[,EV9"
+M4<27<Z5WH7*A<?N->_PL![G>A^'A#K]__%SV7X=%A/D"I(R!P!UNP+I+.$*X
+MPH\'O(WK5<<&CDZI,2B'"["ZJ0$#=[TX7KKC8M0JP9<`(PXNQD7U4:Q/)\*%
+M]='<];%]_<I33@]4T_5QK$^G5@A79W%DI!J$6V=Q;*0V"+?-XH*1>D"X7197
+M&JD]P/F,*H^XRDAYA*,L;F6D&.%"%E<;*>2=SWO7&"GDG<][MS92R#N?]VYC
+MI)!W/N_=UD@A[WS>NP<CA;PCX)U+N)V10MZ1\NY*<$\2;F^DD'>DO'LJN&<=
+MSELIY!TI[YX+[D7"&?V.D'>DO'LIN%<)9_0[0MZ1\NZUX*X3SNAWA+PCY=T;
+MP;U-.*/?$?*.E'?O1MYYH]\1\HZ5=^^%522<T>\8><?*.R\X2CBCWS'RCI5W
+M++B0<$:_8^0=*^]*P54)9_0[1MZQ\FXEN#KAC'['R#M6WC6"^Y!P1K]CY!TK
+M[SX*[E/"&?V.D7>LO/LLN)N$,_H=(^^"\NZ+X+XFG-'O`O(N*.^^">XVX8Q^
+M%Y!W07EW)[CO'8ZL5.==4=B'X.Y']RS-N_\,:7_LC3,>F`#6_P.<JC#BFEDG
+M7,8)MQJLC3,>.-PNA^\.>%SA<M6N:EFYFLZM\._]G_&$RQE7..+PXZ@,=`7[
+M<W#'Q]'>-^O^Y@(.##<75PDW^3C:[K%WU@"LKIQ9%JI5KK_.KMD?'U).W5UM
+MS;KU=:D^0V8:3'>B/C>>;ONKT3W=J55L<929KAOB-I-K.UW=U;BZ[<R+P?K.
+M.//.;2'#.S?B:-Y&0/%_J:+]UOB,!PZ_EL-W!`8!SG8%0]7VOL4_.5!JJ4,3
+"````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.raw.gz.uu
new file mode 100644
index 000000000000..874e5704f2f0
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.raw.gz.uu
@@ -0,0 +1,10 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.raw.gz
+M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YR87<N;W5T`*V4P0Z#(`R&[SY%
+MO>Y`2H7IKDMVWVD[.[,]!0\_4%0J`UU",22D[9>_U((X&8`BP/['GG:8J^#+
+M5*=JI)$#ZA:4!GV&SH;C^K$#<YCG[2%",QXG<UEIG-C8C*,]W")8'L$U+BN(
+MM&I)+KB48\+5GE6O.)539Q'X_JM87>KNYMYVF[RPSX`?P`&P\S[BP*6_L.J[
+MQ#*(E9O1!W&YO<.U/%X&.-HI%SCNE>UM7ET=JQL*-Z/93L;!R740/KD3CLH^
+B!#2^+/8/M%'QGG:8N^!K`BH/+':#BARP^@+33Z#K!04`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
new file mode 100644
index 000000000000..ef644e42fab2
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.vhd.gz
+M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YV:&0N;W5T`*V7/6_#(!"&]_R*
+MD[IEB.",L;M&3>=*E=HUCF-'&?JA)D,&__AR-MA@C).TV`1AP3V\=QR(,-8]
+M`#(!68.L0*;4S@3(1\AR`-6I"[8UUY_0E%^?57D^7E;Z:18=C#/;RC4G>TQ`
+MJ$DRP((FD7MJ0V,PJX?-87G\.!@<:IR96$@0"*F""&\>R7IU1'I>OSZUR.V@
+M+O'5#5;JMQ/`!'!NC4B,NFVOL<<)9577;<F@*%J9IC@?3L?@[`B7LI&5)7,J
+MJ):S4S@Y9W4/;KG0:]&EBDJ,3-4J=!PRI+9*&Q,'KZA4N9R^BY]3-=*'@521
+MO3[N]25A=U&G"IK!6H&@=)YS%UK*>8R;2)5_14^Z=D(W5!!8:CJP==^-WH`"
+M6Y_D;";FX<4(ZBM(G]I;K)BHPQW->N6^/;`D8)K1=D\EY'AK!-\W;U/K6P;2
+MY8^[H\1KN%XPOP67Z+UK49(!%^KH<$RSV(`3<^HH9ZJ[G$TC)W.9C^SL=09>
+M`]\#RZVLMH#]^L*@[]&7@8Z[,_K`=[<@7.:.YQ8.K[@++FXWN[;SZIBOKHR\
+M&/OQSKAQYQ+$W;D=#N,>!-B>+"H#U2B_#G<T+ROW[8"HCZIH9Q^:HRJ60J&!
+MT10J8!59(5:SR79O%DJM,-)%DG`1+Y*$BWB1)%S$BR3A(EXD"1?Q(DFXJ!=)
+/J?XB,+;X!=0\?G%]#```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
new file mode 100644
index 000000000000..7edc3a04d84f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu
@@ -0,0 +1,13 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.vhdf.gz
+M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME$UO@S`,AN_\
+M"DN[]8"2D!AZK=:=)TW:K@4*50_=+COLD!^_&`+$?+6;"%$$<OSPVDXL1#L`
+MM`*1SZS+!GN(^6.C7=30%`%-"MJ`0<C<=C%,]L$,]N/X'H?#>IQ<\UK&Q:/1
+MX=0]7"]8/H)+R$LR2C+@E@PM3GB6&'!Z39W+A*C^%*S9*G==;;.17UAGD#7(
+M,XC,VQ0']O6%0=]^*D.Q<%?TP33<G'`IWR\#G+H3+G!<L5K;=75BJJ[<N!C)
+M^&8\>',)PF]NBU/;-@+5=!9W`MVNZ;ILL*\Q?UJ@]L#-,HB^]V$"6`-6@(;>
+M4PVXAS0+@8J?)%M^?5;E]_4GK##AJ"!U/3_)7R5T6S`%E=-/\$SO@;ZGXV5W
+MO5TZ7->JNA]KI*0;!]&3<)&'^W)X>VZ0IT%=,DT2AMDK-`@-4K+`O;H3/\Z$
+HTWVP50V%:61VDWTPPVRK(IP1(Z__UK;%X<9'Q1V^Z!>1V%I#,`<`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-bsd.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-bsd.vmdk.gz.uu
new file mode 100644
index 000000000000..84e2c3e48411
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-bsd.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-1x1-512-bsd.vmdk.gz
+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
+,!WSS?ZE[ZN&@70``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow.gz.uu
new file mode 100644
index 000000000000..8e8e277b4f0c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.qcow.gz
+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
+3MYW@L!Z_O\H__A<I;[G$7Z<`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow2.gz.uu
new file mode 100644
index 000000000000..07c721f09788
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.qcow2.gz
+M'XL("),[(U0``VEM9RTQ>#$M-3$R+65B<BYQ8V]W,BYO=70`K9=;L](P$,??
+M^13!RU&/BLUN4HJ7HYZ+,[[I@_I<+OT4?'C;9FG:[6X#3*'#P(3_;S;DEZ7)
+MLO`PQEOC<N,VIMJ:^C-=8'H?AI<Y_O[Q<]5_'!<!9C,E)0PX['`#UD/$@8;+
+M['C`RKA>=2C@X)0:@U(XIU8W-2#@;A?M3]<N1L$2>`TPX-3%N*H^"/7QA+NR
+M/IB[/I1_/W_*\8%\NCX,]?'46L,521P(J8V&*Y,X%%);#;=+XIR0VFNX0Q+G
+MA52EX&Q"E1J7"RFKX2")6PLIU'`NB2N$E.:=37NW$5*:=S;M72FD-.]LVKNM
+MD-*\LVGO=D)*\\ZFO=L+*<T[4+PS$7<04IIWP+Q;$NY9Q%5"2O,.F'?/"?>B
+MPUDII7D'S+N7A+N).*'?@>8=,.]>$>YUQ`G]#C3O@'GWAG"W$2?T.]"\`^;=
+M6\*]BSBAWX'F'3#OWH^\LT*_`\T[9-Y](%86<4*_0\T[9-Y9PD'$"?T.->^0
+M>8>$<Q$G]#O4O$/FG2=<'G%"OT/-.V3>K0E71)S0[U#S#IEW&\)]C#BAWZ'F
+M'3+O/A'N<\0)_0XU[Y!Y]X5P=Q$G]#O4O'/,NZ^$^Q9Q0K]SFG>.>?>=</<1
+M)_0[IWGGF'</A'OL<""E.N^R3+X(]S3:LS#O_:>+]\=6>-4')H#%)<"I"@-N
+M,^N$?=@;EP&K2JO/A[U1?Z&^2D]OZBM,C_*V]P<LU+?LX_9S3[>Z#.B]*<L1
+M\,^IOE;G9A.5PJL^<+Q?#9]=?:X!^G6S)WQN"CAWPO^>_DK+X6;;'P&G'^9I
+MH"O8GH-K#_.];_;-T`>&MV;+B)L\S#<GE(,TH%;G9W;/%2S77^?V:+6+9U!V
+M8]NMKXGU":T`!M.=J,^,I]O\YW9G8[:*[0(DIFN&N.WDVDY7MQQ7MYMY,3S?
+M&6?NW`8RW+D!!_,V`F@[2VU@_:WQJSYP_+4:/@/0$7"V7]#ES5_EXC\C;N3L
+$@10`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.raw.gz.uu
new file mode 100644
index 000000000000..70326d339dae
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.raw.gz
+M'XL(".?%'50``VEM9RTQ>#$M-3$R+65B<BYR87<N;W5T`*V4S0Z#(`S'[SY%
+M=]W!0`?379?LOLNV,[KY%#S\BO@!(J@)@&A2^LN_MH4Q.P#H65UQ@RX70Q?G
+MHJ?QYC"PZU:!%M>2%QV@I>3P08MQ!\<9((_K.[FX;^YPNV-`*4&I`/@:]:'Q
+M$@A,K>QQ@[Z7_IST"0.4%0@)\@HU[@WX\WBOI4/P7/_/XG`+-PGF>W`7X^6<
+M="LC;M!SF=CWB!,I=81@OT/!RLRU)^J%GYMG8-0E+;!ZL*$/G/(+L[Y;*`.]
+M<!/Z(`Q7&5SEG^<.#C?"!1_7)'.;5G<*U;69DR&7G;&S<PW$[UR+P[P7`?8W
+>"U4@G0KWN$$_2W]:H!B`V?Z@0`,L_F-6J)F4!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
new file mode 100644
index 000000000000..c1f997c4041b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.vhd.gz
+M'XL(".?%'50``VEM9RTQ>#$M-3$R+65B<BYV:&0N;W5T`*V735/#(!"&[_T5
+MZWCST($-;-JKHYZ=<=2K:4P<#WZ,>O"0'R\$2"`)V"A-2I.!??+NLFPH8^8#
+M0`50"]0`27U="J`]E#L`U6E/[%MN;Z&KWUZ;^NOY>VL_W<;`./.M0G-MCP4(
+M]9`2L-(/H4=]#9W#;$\OG\Z>7YX<#BW./5@0"`2I(&+V'&*#.DVZ.K^YZ)$/
+MH[IBKFZT4M^#`":`<V]$X=0]#!H'G%!6;=N?)515+].=P4W0,3H[P4DVL?)D
+M+@75<W8)1RFK-;BSC9T+DRHJ,4K5JM!Q*%%?J[1Q<9B=*E6^/]^KC\]FH@\C
+MJ4*#/C[K*^+NHDT5=(.M`J'3.>4N])2O*6XA5?X5/0KMA+U006#2=6#O?AB]
+M$06^/N(L$?/X9$3U54F__N#PX;`:&%%H</7@<"5'CTR2C,%$'M=WXN,><[O;
+MK@-*J2O&%'CK]-7:2I4Z5BVT\8[N?!L>@[Y&`V6IJZ\DV.&Q#M]?WBU-1Q-9
+MO>OC9W#X&VX0S(_!%;:4NI%^9L0[NC%-S*_#B90ZO82;5<[*S+G7["9V_CP#
+M4ZND!K:S?1@"A_F%4=]^+@,#=Q/Z8.YNI7%E.)Y[./S%70AQA^3<IM6=S-75
+MF2>CG:Z,(U>NAH0KU^`P;R'`OK*H#%2CYFV\H[O>AH<!HGUS9'L5H:U]V10*
+M"\RF4+ABFD]AP9+)MC8+R2K,M*^G>+G_R[Z>O'*?85]/KMS'K-BJ?3W9<I]I
+;7T^NW.?9UVM<UGT]J7]LC&U^`&IC,XL,#@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
new file mode 100644
index 000000000000..c7d0a8137077
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.vhdf.gz
+M'XL(".?%'50``VEM9RTQ>#$M-3$R+65B<BYV:&1F+F]U=`"ME;%N@S`0AO<\
+MQ47=,D2VL0^R1DWG2E7;-4`@RI!VZ="!AZ^-,?%A(*0R&#`ZW\=_OK-AS!X`
+M^AIMTX9F.SB:U6;5TGCQ,+"N1X$65VHO/4"W7'4=W1CW<)R!X-/ZUC[N%#O<
+M^C&@4I#G`?#=Z1/&2PI@^<A]VM#LM_3L]4D#5"E(!0HA$TL#_CQ\C*5#\ECS
+M9W'B'JX7S)?@$N/EC?0K8]K0W,K$/AU.SJG3"%8]%*R*7'LR&_CY>0:F5TD)
+M+.ML@@+[_,)-WRZ4(4BX,_H@##<WN)2.YQY.W`D7**Z8S>V\NG6HKHR<##5<
+M&0M7KH'0E6MQ(NY&(-J=15>@'A7>IPW-ZY:>%B@[8+09Q.Y7A`E@#5@!*M-/
+M)>`.TLP'"EI)3?G]594_EU\_PP;'^S]'V(R_2,QJP11$;CZ")]/W]#T=SIO+
+M]>QP;JMR'Y9H)EUIB`S"11KNR_[MN44>;^J2<)+0G[U"`I/`.0F\4W>DY8SM
+H/N^"K6HH5"O3-?)"#*-;E<$I-O#Z;VXM#B.7BJZ]U1_9@4$XOP@`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-ebr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-ebr.vmdk.gz.uu
new file mode 100644
index 000000000000..9ad3787b91bc
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-ebr.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-512-ebr.vmdk.gz
+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
+=_,;UN]/^SY:P]`G-.EBZ#T[+O_H__903[2]?````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.gz.uu
new file mode 100644
index 000000000000..93e4a77e839f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.gz.uu
@@ -0,0 +1,132 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.qcow.gz
+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
+4N4?](MX>AAN9_O;_@'C+'O6L````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.gz.uu
new file mode 100644
index 000000000000..7528fc4bcfba
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.gz.uu
@@ -0,0 +1,26 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.qcow2.gz
+M'XL(")4[(U0``VEM9RTQ>#$M-3$R+6=P="YQ8V]W,BYO=70`K9A+;YPP$(#O
+M^15.WTT:BL<VC[Z3-"OE4B55>VL/+(]3%:EWVM]>C`T&,P/)UKMHE<B:3V/S
+MS=@0Q^;#F.),)DSFK-FS[G][`9O\,[]8>[N[CJ:?]LC`>$Q$(0-2C+@9Z]+A
+M@,+%?#G`<=PD.X'@8(A:@K9PDLQN;0#!G1SU2]??C,R+$(<`#8Z\&0?E!R8_
+M/T(>F!^$SD_@ZZ>&.'\@6<]/F/S\J)3"99LX0*)R"E=LX@02M:=PY29.(E$5
+MA:LW<0J):@@<WU"EPR5(%*=PL(E+D2A!X>0F+D.B*._XMG<Y$D5YQ[>]*Y`H
+MRCN^[=T>B:*\X]O>E4@4Y1W?]JY"HBCO@/"..5R-1%'>@>?=L<4]<K@&B:*\
+M`\^[QQ;W9,1Q+(KR#CSOGEK<,X=#^AU0WH'GW7.+>^%P2+\#RCOPO'MI<2<.
+MA_0[H+P#S[M3BWOE<$B_`\H[\+P[6WC'D7X'E'?"\^ZU9<4.A_0[07DG/.^X
+MQ8'#(?U.4-X)SSMA<=+AD'XG*.^$YYVRN,3AD'XG*.^$YUUJ<9G#(?U.4-X)
+MS[O<XMXX'-+O!.6=\+Q[:W'O'`[I=X+R3GC>O;>X#PZ']#M!>2<][SY:W">'
+M0_J=I+R3GG?G%G?A<$B_DY1WTO/NTN(^CSC`HD;OXAB_+.YJ4;.`]#N9W!.W
+M6^+HAY5#CK/2';<Y\DL/K`"SAP/)O5::<TJX"2LS86U5@?S2`^U%-/^.P+YV
+M'P`<,ISC[(25J5WSP%C7K&GL95;*!F>3`P(RX>-H@JL"KU]?;@\`*L6*8@'\
+M/N37EUM77^;=0&>WZIN!`J;DB.OGJLII?E>[:W9S_O6;AOUPT^W+3>-J_;!4
+M)%YVG)KNU1?$/F7*+6W\U1YP@L*-QS(/IX\7:;6"PR[6_B%P<BUJ?.EPCWMK
+M<"J>1TW;%LL4RX`E):L*$O=KADL"FR?U\#YA:<F26K]/*AO]1Y7HIS26=65B
+MMFWHSU@Y2[D^NW7`]NXVNC.PL^CWJ<U/<FL$=M$#U.I)6#-")[4Q73;'8:^1
+M_FOU=%_>JV"KEUM9L(L>(%>O,*N'+Y)."BV9=EBUH>`&W#[PZB5ZN*N/KG\O
+M?^F!]B::?PU06F"P#&72E`&K0^,"5H?&!:P.C0M:'1H8L#HT+F!U:%S`ZM"X
+MH-71`>LXW":N<=J]/&.J8KED335/@]R.V^@G.MT:UK;^E4T<OQEUP$U<XU8W
+?\;0F)VL_?[W)!MS$-2[H)BY3??P^^@=.=Z`2%1H`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.gz.uu
new file mode 100644
index 000000000000..98d994542da4
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.raw.gz
+M'XL(".C%'50``VEM9RTQ>#$M-3$R+6=P="YR87<N;W5T`*V534_#,`R&[_L5
+MWA5$E*1)FIWXD$#B-A#<N/1C/:%)W,M_)VX:UG9Q89+3J*KD^JGM^*VEC`O`
+M:)!5YDX;^@<QO_K-U6:@J?HR8/@^AK``B@",N"88I<9W#@?HNG%+-7A%9VE!
+MJ_0\XL1I;<4$UYZ\SC9MF.)$Q*5TN\N`UD)5G0'?4WQZ.`X+QH'9@0[O2S`*
+MK`9K?G%#KK:9QO?X]`S[^]<WA'V<TM4J&%4#1D)30MLMHE-DNG?+="-.HY=9
+M5COA"A*WS>.*>+8T+K=IG%GSBCWTO[.-."OG7G[JY2UX#:Z!MB)QGS.<8^X\
+M@^;:0=F`.X!5T'3XT#I0*L079.('2*AO"W('I0)=([`_OHACA-V(K^LQ/J/&
+MCLAMVD!5S^BUCL"@_D@7YKB"NWH>JV?9JK<;FR6W:0-9O2I6+U\D4C)]JEI2
+M2,+5S-5S:`[Z"/_O\SMMZ/=B?D6@&8%L$8;F<XSJ0!RC.A#'J`[$L:H#@8SJ
+M0!RC.A#'J`[$L:HC`+WD&^*(&X:X@;*%MH!B.<2I<=R+;W&;2=?KM=&_,L3S
+CA^$9ASCBUH=X02:;UB)9QB&..-8A'H"5E)L?B^NWCH@+````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
new file mode 100644
index 000000000000..61a70ffb93f4
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.vhd.gz
+M'XL(".C%'50``VEM9RTQ>#$M-3$R+6=P="YV:&0N;W5T`*V82V^<,!"`[_D5
+M4_66JA0;V[#'1DVDWM+7+8>`@6BE=OM(#E'%CZ_'V(`7FW238;V(E7<^YN7Q
+MR'D^7@"J`-6#ZD!)?"X%J!V4%8"9=(/;.W,_8=`_#YU^V#]F[AK.1AC+EU*A
+M.,KS`H1Y20F\QI>H%I]A\)CL]>7=^?['G<=QA_,O%@H$!VD@8O4>E4_:(>GJ
+MXLL'B[R=M2O6VLU2YML(R`4PMOA'X;6[G72<<,)(];T=)90URDXC^!%,(.YO
+MEJUQ,C^26J@9<^K"V!A.;4F=@CL_<[$84\4D1FGNQG4,2H[/)FV\'U;#I,KC
+M_:_ZSWUWI!]/I(J:]&.KN2)M+G>IPOV?G08"TWG+7+"4AV-<)%5>Y#T5ROGH
+M&B?DTD]P:W[HO1D%2_T4RS=\G@Y&4K\:]3-K*Z\C]_3$<)&%GPG8-*<!O0=#
+MW&1PH]%_MHYTW6S1F"2S8XN-@.0+_S4M<7R;_C2@E%#7*^`WKY^VX9"VX.TP
+M,4QQ$`RD*7YS.EO;I5[J=WGU$:[??_Z*L)O97(WITK6X@DS5[=LC[=8K;3)W
+M'UMLFH_9Q_NHL442]RZZ=C4N-J-4&A<;:9S8DG);V?\74BWS4*I:2E42*@Y*
+M0ULG<=\#''5=[G"Z45!JW,(E`VWW\E;A1@:562:5A7#@)NYF8S>[<(/`X?`I
+M.XRPM]GO-TZ_CKF,B(WT1,I['=_*"%3J"7,AQ%'7Y:Y"[TDR[^U<LL1&>B+I
+MO7KT7MQ)J%1LZ4Z[6I:]"G$-K?>8;1_-^C#U>WU/3PS76?@9@=QM0V3[&G>%
+ME$Q#X8!D&@JW?@DU9&(SF*=&6;F@$%48Q!%6&,015AC$D588!!)6&,015AC$
+M$588Q)%6&$7;""G7".6E#4`!31>JD6QI!A\(WW)X'-]JGS8:H7@P*!LA]50C
+MU'=)8_UU9"QA(Z2H&R'E"BG168;RC=!:A^><92C?""U>_(*S#!5OA)Y[EH$X
+8PK,,Q!&>92"..%6P;SG[!W<O66(`$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
new file mode 100644
index 000000000000..7e6c7361ee91
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.vhdf.gz
+M'XL(".G%'50``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"METMOU#`0@._[
+M*P;U5D2P'=O)'EO12MS*Z]9#\["KE6`1$@<.^?%X_"!VU@X4.1E%64W\99X9
+M+R'N`.`,R)"YEA7+;9.>R^'Z8&ET?!G0O!]-V``;`W2XR2@)PV>4`JV]$&I7
+MN<5&6K+>6URS'J2)<'.\:B-E18QK'"ZXJU\&%`*&X0+X)=C';#H$<`G\",P\
+M3X!3$`P$_X.SOHLIMN_N_CT\W'S\C+#'U5U&C5+-0%J01]#SQCI:=O>T<=?A
+MC$$8?::SSK9%W-MM]!RN1=R\@\M)&<?W5KD:^K?<.IP@Z:H^7M4+Z!G(">:A
+MB/N:X&3ERN.H'B5T$T@%@L*D\6:60*FQS[1);R$,F,G[$3H*;$3@<O[0G!WL
+M3?/CM;>/4U\1.2DK2M'C;*\BT*B_N`LIKJT=O1ZC)ZI%[^B+)2=E13%Z@XM>
+M/DAH5*YU#<Y'K7F5XL;*T9.H-OUAOM^7U[)B>6C2TP&Y!U:S4&@]5>P.Q%7L
+M#L15[`[$5>T.!%;L#L15[`[$5>P.Q%7M#@-4I-X01YRMO<XFH(51I684Q_$2
+M$A'&9<"QO=&_,\3SR5`5ASCB=H>X5D5GP[%QMN(01US5(2[]]EN:W9GM+RGP
+MON.X6>OZ&,C6FK'`Z?M933]/O^+H(8ZZBL@*KF<M%J;L@`WX$CGC?63?U=WS
+M]>G;<\`Q[U5X,5:TJ6(#X1?NRM3=^]M/[RSR:;4N\YF2<?1&#H3C)R9VW%OW
+ME):*M#N@X*S2F$O"5TE^)(IL(2/.EDK\\/_FUN%JEXKY:W#X#1@%S56S#0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.gz.uu
new file mode 100644
index 000000000000..cec7ced55c68
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.gz.uu
@@ -0,0 +1,87 @@
+# $FreeBSD$
+begin 644 img-1x1-512-gpt.vmdk.gz
+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
+BDU_BXY!.-OP\2-;P2]S#F7Z)%_[IG=D7_P=,%9H/M&4`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow.gz.uu
new file mode 100644
index 000000000000..903950a45447
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.qcow.gz
+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
+AW_HGOOWS[?U_?@X.\^#?=H+#>OS^*G_[?V9WPD*PIP``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow2.gz.uu
new file mode 100644
index 000000000000..0b7d7dbb85df
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.qcow2.gz
+M'XL(")<[(U0``VEM9RTQ>#$M-3$R+6UB<BYQ8V]W,BYO=70`K9C9LM,P#$#?
+M^Q4NRP4N4&+)3E.6"]R%&=[@`7A.EWQ%/YXD5N-$D>*VD]:3:<?1&=D^5I8L
+M"Q]CO#4N-VYCJJVI_U,#T_LS;.;X^\?/5?]S7`28S90HH<-AAQNP'B(.-%QF
+MQQU6QO6R0P$'IZ@Q*(5S:G93'0+N=M%.7;L8!8O`:X`!IR[&5?E!R(]'N"OS
+M@[GS0WG^_"F.=^33^6'(CT>M-5R1Q($0M=%P91*'0M16P^V2."=$[37<(8GS
+M0E2EX&Q"E1J7"U%6PT$2MQ:B4,.Y)*X0HC3O;-J[C1"E>6?3WI5"E.:=37NW
+M%:(T[VS:NYT0I7EGT][MA2C-.U"\,Q%W$*(T[X!YMR3<LXBKA"C-.V#>/2?<
+MBPYGI2C-.V#>O23<3<0)]0XT[X!Y]XIPKR-.J'>@>0?,NS>$NXTXH=Z!YATP
+M[]X2[EW$"?4.-.^`>?=^Y)T5ZAUHWB'S[@.QLH@3ZAUJWB'SSA(.(DZH=ZAY
+MA\P[))R+.*'>H>8=,N\\X?*($^H=:MXA\VY-N"+BA'J'FG?(O-L0[F/$"?4.
+M->^0>?>)<)\C3JAWJ'F'S+LOA+N+.*'>H>:=8]Y])=RWB!/JG=.\<\R[[X2[
+MCSBAWCG-.\>\>R#<8X<#*:KS+LOD1KBGT9Z%>>\_7;P_ML)1[Y@`%I<`IS(,
+MN,VL`_9AP(T&I7#4.X[WJ^&W`[:;[0)@/3]5-0+2@'W8;/4)=2L]_:A;F"\:
+MGNU=T84!+U<]W'[F^6OWQP5`[TU9CH!_3OG!W,OA&J!?-YO,YZ:`<P?\[^GO
+MV+\:-]N&"SC][0!U=`G;<W#MVX'>F7TS]([AO=XRXB;?#C2//`>I0\W.S^R>
+M*UA<?YW;9[5=?*AE=\K=^IJ8GU!;8##<B?S,>+C-1;Q[V&:KV"Y`8KAFB-M.
+MKNUT=LMQ=KN9%\/SG7'FSFT@PYT;<#!O(8"VLM0&UF>-CWK'\==J^`U`1\#9
+09M#ES:5H\1\W+X2OTA0`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.raw.gz.uu
new file mode 100644
index 000000000000..494fe712eb74
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.raw.gz
+M'XL(".G%'50``VEM9RTQ>#$M-3$R+6UB<BYR87<N;W5T`*V4R[+"(`R&]WV*
+MN'7!A`C'NG7&O1MUC?7T*7AX@^D%BJWM#)!29@+?_"$$1&D`A@#=EW'>X<\J
+M[;[:5Q^:?FX#U@AMFP$5`P77,(X7L#G;3=A00Q#.'YM&(-W-Q<"KL>U4A'L-
+MNW*;=\0X);@^W'8;T%IP+@/>>GU4.ATF`.T1C`7[!S6M#?AQN4\"%IPN=7Z"
+MHU^X0;!>@SN$7='*^&;,._QX3>3?X\R2.D;@_Z9@;>&[9^K)OCC/@%PE#6#=
+M^2@%#OF%4=\IET%)N`OZ(`_7!=PQ7:\C'/T(%U+<<S&WR^IVN;JF<#+LM#)6
+K5FZ`I)4K."K[$-#G9>$;R*OR<=[AKRKM`C0=L-@)&@K`Z@UK>@7\E`8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
new file mode 100644
index 000000000000..69446fd3e64d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.vhd.gz
+M'XL(".K%'50``VEM9RTQ>#$M-3$R+6UB<BYV:&0N;W5T`*V735.#,!"&[_T5
+MZWCST$F69*%71ST[XZA7`<'QX,>H!P_\>!-(0@($BZ:E%";9AW<_LDT9&UX`
+ME`&U0`V0U->Y`#I`7@"H07-@?^;F%KKZ[;6IOYZ_]^;5[0889[Y5:*[M,0.A
+M'I(#EOHA]*BOH;.8_>GET]GSRY/%H<'9!PL"@2`51,R>0\RITZ2K\YN+'ODP
+MJLOFZD8K]:D$,`&<>S,RJ^[!:70XH:S:MC]R*,M>ICV"FV!@=':"DVQBY<E<
+M"JKG[!*.UJRVX,YV)A=#J:C"R-59A8Y#COI:E8V-P^Q0I?+]^5Y^?#83?1@I
+M%7+Z^&PLB[N+IE303C8*A"[G-7>AIWQ-<0NE\J_H46@GS(4*`I-V`'OWP^B-
+M*/#U$6<K,8\G(ZJOU/K4VF+EPCD^T)WOP[<#5M4V8,$&A2'..5S5SN%2CAX-
+M13(&$WD\(2=>_*K'Q/FMVFU`*77'F`)OK;XZ=3H:#92Y[KZ2H,!C';Z_O%M:
+M;DUD]?ZQ637X&\X)YL?@,M-*[4R_,N(#W5@FP[?%B35U>@DWFYR5B6NO*29V
+M?IZ!J552`RN\)N,!77YAU'>8R\#`W15],'>WU+@\G,\]'/[B+H2X:C6WZ^I.
+MYNKJQ,EHIROCR)6K(>'*'7"8MA%@WUE4!:I9\W-\H+O>A^\!B.:7(]E/$9K>
+METRA,,!D"H5MIND49FRUV+96(1F%B?;U%&_W?]G7D]?N$^SKR;;[F!7;M*\G
+>T^X3[>O)MOLT^WJ-2[JO)_6/C;'=#W^X!V4,#@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
new file mode 100644
index 000000000000..b9c8a97c9d63
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.vhdf.gz
+M'XL(".K%'50``VEM9RTQ>#$M-3$R+6UB<BYV:&1F+F]U=`"ME;%N@S`0AO<\
+MQ47=,B#[L`^R1DWG2E7;-4`@RI!VZ="!AZ^-,=@XD*0R'&!T]L=_OK-AS!P`
+M`H$55^[SCG:7^&>[VJPZ&B\?`^8,FB8`)@IH<)7"J0[*"MDWE#$.6KBZE'$&
+MR/NV,6B3\5@G#NXXC`IMWN'B$H.SX3:/`:6$H@B`[U8?QDZ'T$"9@9`@"7*\
+M-^#/_<<D8(/CL>;/X/`6;A#,[\&E>I33TZV,>4<[EHEY6IQ84J<0K'XH6!FY
+M]D0^&>?F&9A:)16PO/>A#QSR"Z.^;2@#O7`7]$$8;J%QF=^?.SB\$2[XN'(Q
+MM\OJUJ&Z*G(RY'1EW+ER-<1?N0:'<3<"['8658&J5WB?=[2OB7\:H.B!T6:0
+M^E\1I4`-4`TD=3L30%O(<A>(?B6UU?=77?V<?]T,:QP?_ARAZ?&8ZM5"&6"A
+M/T)'W7;T/>U/F_/E9'%VJ[(?%J0G72J(",(E/]R7W=MSASR,ZM)PDLB=O5(`
+M$\"Y%WBO[N"7,W7[O`VV;J"4G4QKWHOGN+I5:9QDDU'_S:W!4>124;6W^@.>
+'9*U,OP@`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-mbr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-mbr.vmdk.gz.uu
new file mode 100644
index 000000000000..24643628ba1f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-mbr.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-512-mbr.vmdk.gz
+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
+DF&7U8MS^O?_$];O3]K\5L`R`9ATL_2>QY5_]']#X]&&`7P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu
new file mode 100644
index 000000000000..5a36a47ff1bb
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.qcow.gz
+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
+!````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu
new file mode 100644
index 000000000000..632e42a18e46
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.qcow2.gz
+M'XL(")D[(U0``VEM9RTQ>#$M-3$R+7!C.3@N<6-O=S(N;W5T`*V8VY+3,`R&
+M[_L4+H<%%BBQ9*<)AP7VP`QW<`%<M]WV*?KP;&)ME"A2W.VDS62FX_[?R/$7
+M-6Y1I)=ST;M0NE"[P]8]?*8#7._#\'#'WS]^KOJOXR+!?&&DE(&`'6[`NF$<
+M6+C"CP>\CNM5APH.'E-C4`X7S.JF!A3<Y:*]=.UB5"*!YP`3SER,L^J#5)],
+MA#/K@[GK0_WZQ<><'"BGZ\-4GTRM+5R5Q8&2JBW<)HM#);6U<+LL+BBI>PNW
+MS^*BDCH8.)]1Y0%7*BEOX2"+6RLIM'`ABZN4E.6=SWM7*RG+.Y_W;J.D+.]\
+MWKNMDK*\\WGO=DK*\L[GO;M74I9W8'CG&+=74I9W(+Q;$NX9XPY*RO(.A'?/
+M"?>BPWDM97D'PKN7A+M@G-+OP/(.A'>O"/>:<4J_`\L[$-Z](=PEXY1^!Y9W
+M(+Q[2[AWC%/Z'5C>@?#N_<@[K_0[L+Q#X=T'8A6,4_H=6MZA\,X3#ABG]#NT
+MO$/A'1(N,$[I=VAYA\*[2+B2<4J_0\L[%-ZM"5<Q3NEW:'F'PKN:<!\9I_0[
+MM+Q#X=TGPGUFG-+OT/(.A7=?"'?%.*7?H>5=$-Y])=PWQBG]+EC>!>'==\)=
+M,T[I=\'R+@CO;@AWV^%`2W7>%85^$.YN=,_"O,^?@9^/O7*V!R:`U5.`4Q4F
+M7#WKA&.:<*/!1CG;`\?KU?#=`5MAG@",T6W&P#]IPC$)4P>W"]J\#@<^3KA^
+M<6YA8K,DLUX_:"<<U\U=$4M7P:D5_KO[JTP8YIMPPMG;>1KH"O:GX-KM?.^;
+MOO]P9@X,'\Z6C)O<SC=[E+TV8%87YY4%H!*Y_CJWFZL=[T+%HVVWOH[K4YH!
+M#*8[49\;3[?YU>UVQV(5VP7(3-<-<=O)M9VN;CFN;C?S8J"\,TZ\<QO(\,Y-
+H.)BW$83TOU[1]LC1V1XX_EH-WPD8"#C;%0QE\]NQ^`\?5I30@Q0`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu
new file mode 100644
index 000000000000..4145c82b041d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.raw.gz
+M'XL(".K%'50``VEM9RTQ>#$M-3$R+7!C.3@N<F%W+F]U=`"ME$$.@R`01?>>
+M8MQV86`<JFZ;=-]-V[4U]10<OB!4!00U`0PQ^?#R/P,P9AH`(;!^8XP+\E:Y
+M71:78J+Q\1Q0".A#X%,!)QQJ?QW!0*#^O`_&<?D<059>^^.X$D.07145-G`V
+M+F7>/YP"BP9(@+A"BT<=ON^OC<"8+[#!X1YN-LR/X&J]:C53N44^XV*"P966
+M52XX2KE3"/8]%5;D/2R(K;=N76=@Z@P/P%JKH0N<ZPN+ORZT@4[<A#\(X_8:
+MU[CS^0J'.W'!Q7V2M4V[*T-W0^9BU/[-.'AS-<2]N0:'>1\"FEYF=0+U&QF,
+8<4$^*K<;(%E@MATDU,#B!\3RH'-%!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
new file mode 100644
index 000000000000..01016a55890e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.vhd.gz
+M'XL(".O%'50``VEM9RTQ>#$M-3$R+7!C.3@N=FAD+F]U=`"METUO@S`,AN_]
+M%:YVZZ%*C!/:Z[3N/&G:=BUEM-IA'UI[Z($?OQ@22/A:NP4H"@I^\MIQ3"I$
+M?0#H!/0>=`%:<3LET&M(5P"FTUY8W:5]A#+__"CRT]MY:8]R5L.D\*U"<[;'
+M!,@,D@)F/(A^Y3:4#K.\V1P6;^\'AT.+<P.3!D)0!D*]<;1HU#'I_O;QKD)N
+M6W5)7UUK97X[`D$@I?=&XM1M&XT-CHS5?E]=*619)=-=P4/0T3K;P2G1L?)D
+M#@75<W8(IZ>LKL$M9G8NZE0QB9&:NPF=A!2Y;=+&Q:%WF50Y'[^R[V/1T8<C
+MJ:(;?;+7EXR[BS95T+UL%1"G\Y2[4%%.7=Q`JOPK>CJT(]LP01#*=6#E?AB]
+M%@6^/BW%1,S')V-47\;ZS-H2V<!]O*.\789G`]SMKP,JQ4NH"WQR#N>L;TV0
+MTU#<?2<O6AWY2/;]>7Z+R/'#RF&5<KE4&E9XJ<*7S?.`PQC/X1J'O^$:P?(2
+M7&)KGWO3J,7F:S/:4>/FEC5O<32ECM=<<96S*FZR8+[JV/GS#,+D<`YBY54%
+M#]C,+[3ZUGT9&+@[H0_Z[F:,2\/WI8?#7]R%$+>;G-MI=?.^NCSR9+QV5\:%
+M*Y<AX<JM<1BW$%!5F4T&<HWLW<<[RH=E>-9`M*4^VK<#;6V.II`L,)I"LM4Y
+MHD(J)I/MVBS45F&DC3CC(F[$&1=Q(\ZXB!MQQD7<B#,NXD:<<5$WXMK\Q1)B
+*]@,_NS;^O0T`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
new file mode 100644
index 000000000000..94e27d62e5a7
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.vhdf.gz
+M'XL(".O%'50``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K96Q;H,P$(;W
+M/,5%W3)$^+`/6*.F<Z6J[1I"(<K0=NG0@8>O;4SP82!)9;"0T>&/__?9YR3I
+M+@")D)03S_E`N]ORNUUM5I8FFON`2D$9`E\UT.+0Z"LD5!)T;]2@:8;&`NUV
+M=/4XH8,AR(V:#4S@G%T9>?[0&E892`6*(,=;%;[OWR8,8SS#'0ZOX2Z"Q2VX
+MU(SROM1J45QP<X$.MW:L]8"32^HT(JGO,JOB+A;$?#3.SS,D>@U7D.0NAAQX
+MR2\,^HI0!C*["_H@M%L:7,:_%QX.K]@%CCLNYG99W3I45T5.1CK>&3?N7`/A
+M.[?#8=Q"(&UEUBO0U,C@.1]HG[?\[H#2`:/-(+FS@U*@!J@&4J:?2:`"LMP'
+M(E]);?7]55<_YU\_PP8G1A7=;V8\IF:W4`98FI_0A^E[^A[VI\WY\]3C^E+5
+M_UB2F72E(3*P2]SNT^[ET2(/@[HTG"3R9^^H3R@)0C#C3MV!+V>R^>W-U@T<
+CE979-_;"`I.ERN!4,AKUW]QV.(J\5/2IMOH#34'Y,G`(````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu
new file mode 100644
index 000000000000..7f13ae450062
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu
@@ -0,0 +1,82 @@
+# $FreeBSD$
+begin 644 img-1x1-512-pc98.vmdk.gz
+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
+-O@"^^C_.+8_6X%X`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.gz.uu
new file mode 100644
index 000000000000..e8eb9e28a7fa
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.gz.uu
@@ -0,0 +1,125 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.qcow.gz
+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
+I]_,9IQ]2VL/?]2]\^]?;^W_=H3+,@W\;>\-Z^_U3_O%_AAM3=G^E````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.gz.uu
new file mode 100644
index 000000000000..c389b8f5f6de
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.qcow2.gz
+M'XL(")L[(U0``VEM9RTQ>#$M-3$R+79T;V,X+G%C;W<R+F]U=`"MF-N.TS`0
+MAN_[%.YR7F")9^PTX;#`[K(2%T@@7H"F<1^`ZSX\3NS6R60F+E7:M%)E_9_&
+M]M>ITZ((#Z6L5J94IE;[1OG/\0(U^#"^U.'7X_>;X>.P"C!=""EFP.`)-V+=
+M)QQ(N$)/!S2/&U2'#`Z.J2DHAS-B=7,##.YZU2]=OQD52>`EP(`3-^.B^B#4
+M1Q/FPOI@Z?J07S][S-&!<KX^#/71U$;"55D<,*E:PFVS.&12C83;97&&2;42
+MSF5QEDGM!9S.J.)Q)9/2$@ZRN`V30@EGLKB*24G>Z;QW-9.2O--Y[[9,2O).
+MY[UKF)3DG<Y[MV-2DG<Z[UW+I"3O0/!.)9QC4I)W0+Q;1]Q5PNV9E.0=$.^>
+M1-S3$TYS*<D[(-X]B[CG"<?T.Y"\`^+=BXA[F7!,OP/).R#>O8JXZX1C^AU(
+MW@'Q[G7$O4DXIM^!Y!T0[]Y.O--,OP/).R3>O8NL(N&8?H>2=TB\TQ$'"<?T
+M.Y2\0^(=1IQ).*;?H>0=$N]LQ)4)Q_0[E+Q#XMTFXJJ$8_H=2MXA\:Z.N/<)
+MQ_0[E+Q#XMV'B/N8<$R_0\D[)-Y]BKC;A&/Z'4K>&>+=YXC[DG!,OS.2=X9X
+M]S7B[A*.Z7=&\LX0[^XC[N&$`RYU\JXH^"OBODV^L[#L^=.D\[%FWN6!&6#U
+M/\"Y"@.N7G3"-DS8WSIN0)6VN[P2%KN=]$U$F58"/OYU[N[W@_DQK,\N?4-@
+MT_H5W#)15-4?QT%:/SM:OSJ+RVR'#0>S1:8;<,VY./_CXH_VK5/.$=R?`6ZW
+M\&;HR71==_+WQZGJ#.!Z``RX;KHA3'>8^6_@.*P.ZTE]`9>F"X,(C'":J\Z?
+M%OO7&-<FG*8]:W:R:[8ZMZ@J?5\^"]=N5>.ZDVVSF>"NCKB^+_L#D+]IG;[+
+:`X>?-^-G4,5$X&+NF;)K5*M_;'%=NO`2````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.gz.uu
new file mode 100644
index 000000000000..c35f98dc8060
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.gz.uu
@@ -0,0 +1,10 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.raw.gz
+M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G)A=RYO=70`K9)-#H(P$(7W
+MG.+AT@5IAU)E:XP[$Q,O(-AZ`-<]O&V&!`KEQX2A=/-X7^8Q(P07H#1.!%V%
+MHPA5":50*B\8>'UZX&Y?:R_/J[H77"YCF/1BTB*6!%>,RF7'#GB.?'(9>(:H
+M(2@)9%S=N^I5W%)_C&OVBLNX=BM.^]O`6%@[PKT&N/?.PY"3N!9^X"3#GUP%
+MYN.X,L1E\WC"LS@ON'S2'^/ZN#2P4(23J>Y0\!OC3(^3?ZU*GNS.[KHJ\K,5
+L9QJT%D0H]01WT!V.@JORWS>)>UYPCR)^>%54!]QM]Q0%8/8#T8E)O;($````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
new file mode 100644
index 000000000000..e3f9594789d8
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.vhd.gz
+M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G9H9"YO=70`K9;);L(P$(;O
+M/,5(O7%`WN+`M6JY5:K4%\!)'-1#%P$'#CQ\9Q)G<1('*`[&,G+F\S_CL1G&
+MZ@=`2]`E:`LZH7&J0&\@70/@I&NBZKG["9?\Y]OFI\_SRCV710WCK&_EFY.]
+MD*!PD12$H45T06.X-)C5T^M^^?FU;W#"X9J%E08E($&(&JVC6:N.2-OGCY<*
+MN>O4R;&ZS@J_F0*F@//>&[)1MVLUMCB%5F59M12,J60VS?OA373.#G`)&UCU
+M9$X%M>?L%$[/6=V#6R[<7M2I@HF18H^AXY`*&F/:-'$8-4R5\_'7'(YVH$\$
+M4D6W^OAH3H;=%2Y51/.R4Z`HG>?<A8IR&N(F4N6AZ&G?3KD!!H$ES82HW/>C
+MUZ&@KT]S-A/S\&8$]1G2A\<+=Y1N@:0[9U+C1!%R>'NP%D^:?O/C9P*[^^_X
+MF;5G=^5TK(%MZ-8)IHO9=%:;QP^;,;'<K7'9K3BZO@HH+%@[P.UZN#SR9F0C
+M=RUELKP-R(;N9N2N'+S/71_`T47*1OIJ7.>NZ)D(#S>Z7$@=M,>LCRM:W%#C
+M%6?9I#H;-56R\E9<82"S("7(9(23B</E9(5_1,Q,].&)R_O*_]2I(MR]$NVB
+M$K$5*@>,IA"!-K)"SF8SX][SJYW"2%4?X2)6?82+6/41+F+51[B(51_A(E9]
+1A(M:]>DJ]Q9_[Z\6^RH,````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
new file mode 100644
index 000000000000..bb8e69831df8
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.vhdf.gz
+M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V4RVZ#,!!%
+M]_F**W67!?)S"-NJS:Y2I?Y`()BHB[92U447_OC:L4FP<1ZJ,(,%&N9XKCT,
+M8V$`BE`+D/:F!+2$4I#D'#V<?VZPVV]C'M^>Z*4*PZX"C#MG,81=<]@J&W:U
+MCL!-$L>O`S=@#9@H`@.N.4<U-W'7\@NX=BFY`=?=BR,W]^@-C,EPNPENO_!A
+M\)E<`W?@\CX@R^5R+U=FW_,X7\`YAV6S_`+N+%=,0D2"XZ7L4(4[Q?4G7)[C
+M#;&LF)U9M%3X<"^N;]$92`FI9SBI(T[X*.V^;POS98=]K=(KE(J*P,5JCV*C
+M(@D:0.;8JR1J!6I0;Z9`D1PS[/[KT^Q_WG^G^T>Q40U#V7R\<$W0+5)#M'X1
+MZOWS)+^'Y\/Z_>,PXD14-2[L6NJID^8J*96[=7UT_'5'G)QO$DUWKU-@"IPG
+MPF-VN[18/$Z=Q)H!G3ZF.5KRDCB*M>=QFF51_R]ECZ.%2\75WNH/`$S(R-T&
+"````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.gz.uu b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.gz.uu
new file mode 100644
index 000000000000..2cc570c86059
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-1x1-512-vtoc8.vmdk.gz
+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
+4`=#LO5?XSV'-OOH_FA1I)IY=````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow.gz.uu
new file mode 100644
index 000000000000..491ab8063ef8
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.qcow.gz
+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
+F$//[_<;GUYW3^9TG\$_^B:^_O+G_G]O!YMO@3_\'*;=.DB.F````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow2.gz.uu
new file mode 100644
index 000000000000..aa257d4b971f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.qcow2.gz
+M'XL("+@[(U0``VEM9RTV,W@R-34M-#`Y-BUA<&TN<6-O=S(N;W5T`*V826_;
+M,!!&[_D53/>F32K.D)35/9N!'@JD#7H.O,A`@"Y&&J`7__A2ULB4J1DQ-N0(
+M1@SB>Q@/GT>FLZQ^*&6U,DZ90BVFRK^F"U3KQ?:E5M_&7T[:C]5!#=.9D&(6
+M#&YP6ZSS@`,)E^GN@N9QK>J0P4&3ZH)2."-6U[?`X(X.UJU;;\8H2N`^P!HG
+M;L9>]4%=7YPP>]8'0]>'?/]LDXL77']]6-<7IW()-TKB@$D5$FZ2Q"&3FDJX
+M61)GF-1<PI5)G&52"P&G$ZIXG&-26L)!$I<S*91P)HD;,2G).YWVKF!2DG<Z
+M[=V$24G>Z;1W4R8E>:?3WLV8E.2=3GLW9U*2=R!XIP*N9%*2=Q!Y=TBX1P&W
+M8%*2=Q!Y]YAP3S8XS:4D[R#R[BGAG@4<,^]`\@XB[YX3[D7`,?,.).\@\NXE
+MX8X"CIEW('D'D7>O"/<ZX)AY!Y)W$'EWW/%.,_,.).\P\NX-L;*`8^8=2MYA
+MY)TF'`0<,^]0\@XC[Y!P)N"8>8>2=QAY9PGG`HZ9=RAYAY%W.>%&`<?,.Y2\
+MP\B[@G!O`XZ9=RAYAY%W[PCW/N"8>8>2=QAY]X%P'P..F7<H>6<B[SX1[G/`
+M,?/.2-Z9R+M3PIT%'#/OC.2=B;P[)]S%!@=<:N-=EO$7X2X[GUD8]ONG"=^/
+M-?,L+_0`1[L`^RJL<<6@;]C6;]CO@(5PCLK6=\A1+_#R>X4YW*[/#GT@L+4P
+M?C*;>2>'TH'/+ZRNOC+]L[4P_N/@IZF_W$PY^Z#Z3I?+GR6#DT^WNQ^G/`Z[
+MU=G%^G\O2PXJ-\H5].P6RI75,E5WLYS<W=_>W_[Y?=/@JANDFU?A?)?J?DV6
+M;'5VX+TU#]S;YGX!!-S>6]749X9VSZRWPU6-]QOA+S\N+593SG_-4-96:Q:[
+MP/%=69Y=7QS_&%^W^V>&_;'!^A-5NG_0ZE_](6GW3[7K<T/WS_7V+T>5YXR;
+MH7]__]4B-O4-W#^=4?_\2;W[+"^LKDZV_VJ@(>!@%1I73>>#_Z4*H1'E$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.raw.gz.uu
new file mode 100644
index 000000000000..13210f03aded
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.raw.gz
+M'XL("/[%'50``VEM9RTV,W@R-34M-#`Y-BUA<&TN<F%W+F]U=`"MD\UJPS`0
+MA.]^BNFU4"/)*RD]MK2Y%4)#S\'4#@3:Q*2!7O3PE2*)R#\)+FB]"(ME/\:S
+M:\9\`"0A!9A-%E)PL`4N]T'"O+Z7-N[*&*;P,,YN=%W'E8,PQ;T'"E>6#-2,
+M^JH4R/L%LWH;`CW.Z2,.S5RJ3R@Y2]]3UWVU$SB1ZW,]KAJKD]OS.P>T@":H
+MQW"J+53KRD'=IJN/I]UI=]AO(HXL3C6N6?]'W7?=3:J3F6=+,V>[B$L9@/W9
+M(NJCW+M'YW$H9[P=A$T2D!6((!HK7+J:O8^`RV/;/J]?'CZ6Z]0_HLSZU`S_
+M1.*?_TE2_Y#J4[G]4S?]TQ6TGMC-BW\_OWX1H[[,_G$6_&/UQ'F]8%9E__%`
+1"L!L"DDX8/$'F8$ZXZ<%````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
new file mode 100644
index 000000000000..03492316e6ac
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.vhd.gz
+M'XL("/_%'50``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4
+M?<^ON-+>*BT"#-?=T]1JS=ND:M6>6\O!5:2UC9I(ZX-__+A\U#@&U\UP$,'"
+M]W`X]P,8<P\`5H`=H`94-*XEX#>H+P',I&_"]MR_0M^^/.OVN'M;^Z=?.3#.
+M8JNQ.=F+"J19I`;1T"*XI3'T`6;]Y>;Q8O?T&."$APL+2P0I0!D0.5D'V3L[
+M0MI<W_VPD`\#NVK*;K!R?UT'51=]405V#[;_'F]6&BOS/;4:*F5IAC9Z&4T0
+MG%I'3X!3[,0JHID2-=IL"@[GK#X#=['ROG"A8@*C-KV1CD,M:&S")N@P:294
+MW@[[YO6@3_B)3*C@.S\^F:ORVQ4^5$3XV#.0%,YSVP6+<CR%2X3*?ZF'8SOI
+M!T8$IL*$L-L?JS=`0<P/.9O1/.^,++^&^)G45"(DNVW51QN^^44P[-0=3<:[
+M9^O7TK3)$+E-1<7PPL<3_>W/9+BTQ$]R"F.*Y)9B>`F_J_W^CT[`B5+;=7#5
+ME)WJ?,[9I',EVO:N=*LNL+LWV7;<'7<OS_<!C@H5E5J+N)S=4[-/LE.%?:L7
+M^O8RRA,V\2T$?KIT[&GK#B3AZ814PQDDMH:XHCGS/@'<O&IM3J&OOS=WL7Y:
+MEN7'V0+]1*2?2Y)8O[BV\-PA?CZ_6?WH,*D3L3GH=_CK`C'P*ZU?X_5C3:+/
+M3_2WZ_'/`0I?3(M59S%4OS(,I0<LQE`..5R*(=>SSORLE]$S+'35Q7R5.>>J
+J2W`%K[KH2U;6ROTMO>JB+UF%KKH$5_"J2W!%K[IH"^KJ'[J1;&,?#0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
new file mode 100644
index 000000000000..e1b66268c980
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.vhdf.gz
+M'XL("/_%'50``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD9BYO=70`K57);L(P
+M$+WS%2/UAM3(\3*FIRXJW"JAHIXA(@F*5""B2.TA'U^OX"P@6MF,+$<3/]Z\
+M9T\(L0.`"Q`4B`KB@IGY_-P):*;OB1HD\:,96;#TVJ[+<$EG-*.Q!:0Z+0CP
+MO+>/A8!I.]',W[J`%D[SXRE(H@/7@.(F?L]U_5D,P-%8Y5HXUF<G2K-.`20%
+MR0$?W(PE8*'3CMVRS@['ZECM=TL/QQ4<YGJS_`N[;58/LA.1O>4W>CMQ"^H`
+MV]Z"Y\=CGSUN[$`MO#)"!:<@&'`.-%?$A<ZIYQ[@[%`4+XO7^X_9(M2/\\C\
+M\`;]:*"?O22A?A#RP]CZX57])`,I!\[F6;^O;WL0/;_(^J7$Z4>R@?ERHIDG
+M[9\%Y`XP&D-TW1F9N^M:1.9[P"0$I&=[#>!ZORO6Q^HGO,'HNG-9#H?>3YG^
+M%J`$FID6D^MUP.]NNAE7VXV'\]W/_['R^F1QMTILESM3!AO(U9D=ZXN$'?44
+M3U:V"G?L5F9^#(OEIV*+$KBEZ:/UT$IHN*>V&1;.=+_PY?]Z:^$P\E%1'\K1
+)+TV"K"_2!P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-apm.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-apm.vmdk.gz.uu
new file mode 100644
index 000000000000..860e005e645a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-apm.vmdk.gz.uu
@@ -0,0 +1,83 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-apm.vmdk.gz
+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
+,]*O_`W*E&0&37@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow.gz.uu
new file mode 100644
index 000000000000..c016f6e94416
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow.gz.uu
@@ -0,0 +1,126 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.qcow.gz
+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
+#I0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow2.gz.uu
new file mode 100644
index 000000000000..b27f56cb6bab
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.qcow2.gz
+M'XL("+H[(U0``VEM9RTV,W@R-34M-#`Y-BUB<V0N<6-O=S(N;W5T`*V8VY+3
+M,`R&[_L4Y@P+E%AR3ARVL+#,<`<W<-UVVZ?H\.RL:R5*%"E>.FD[F>FX_S=R
+M_%E)6A3IY5SI7:A<:-UQY^Z_TP?<X,OXXTZ_OO]8#U^G58+YPD@I`_6AQXU8
+M?QD'%J[PTP&OXP;5H8*#+C4%Y7#!K&YN0,%=K<ZG[KP8C4C@)<"$,Q?CHOH@
+MU2<3X<+Z8.GZ4#]_99>3`]5\?9CJDZG:PC59'"BIUL)MLSA44CL+M\_B@I*Z
+MLW#&SAW@2B5U-'`^H\H]KE)2WL)!%E<K*;1P(8MKE)3EG<][URHIRSN?]VZK
+MI"SO?-Z[G9*RO/-Y[_9*RO+.Y[V[4U*6=V!XYQAW4%*6=R"\>T2XQXP[*BG+
+M.Q#>/2'<TQ[GM93E'0COGA'N.>.4?@>6=R"\>T&XEXQ3^AU8WH'P[A7AKABG
+M]#NPO`/AW6O"O6&<TN_`\@Z$=V\GWGFEWX'E'0KOWA&K8)S2[]#R#H5WGG#`
+M.*7?H>4="N^0<(%Q2K]#RSL4WI6$JQBG]#NTO$/A74VXAG%*OT/+.Q3>M81[
+MSSBEWZ'E'0KO/A#N(^.4?H>6=RB\^T2X:\8I_0XM[X+P;D.XSXQ3^EVPO`O"
+MNR^$NV&<TN^"Y5T0WGTEW+<>!UJJ]ZXH]`_A;B=[%I:]_PQ\?^R5HSTP`VS^
+M!SA78<*UBTZX3!..&FR5HSUPNEF/WSWPO,)E'5>UK%P##ZWPS^WOZ83+!5<X
+MX>S'41KH"NZWX`2W&>#B%>TX^.5P'=W>\_8?$@>XZ\3K<+./H_$>^Z`-F),M
+M%Y8%&I$;KG.\M8MWX%UW%[=F_?HZKD^1&4;3G:G/3:<;KQK]TYU8CXB#S'3=
+M&!>O&F)?\A)FSMYF6MU^X<5`N3,>N',C9+QS$PZ6;020_I<JXJ^F1WO@]',]
+6?B=@(.!B9S!4L?>M_@&MW,<Y0Q,`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.raw.gz.uu
new file mode 100644
index 000000000000..b44538eccd5d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.raw.gz
+M'XL("`#&'50``VEM9RTV,W@R-34M-#`Y-BUB<V0N<F%W+F]U=`"ME#L.@S`,
+M0'=.X;E#E&])%RI5ZMZIG2F%4^3P38`4FQ#H$`<B(MM/_N!P/@F`EL#;C3VO
+M<#=&EZM.U4B3`6AJT`;,&:PWY\M##D3A7O<GP^)FG-CSRN/82B).'N%BP&K(
+MX:X(I[QR0)9<(*].@.KG`_Y&N&9Z(T[O1><KP?LM13994ZIVL;=VY8?[#*('
+MH8#;62<I\-=?6.*[I&%(DNY.?)"FVP9<3>T%PLF#=('BW@&'^DE:>%"])HVN
+M*]P,M9Z,/R<W0.CD3CA9]B*0X\WB_T!OE>YYA7LPNB:@GH'%*EA_K"=67[CE
+&;;$%!0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
new file mode 100644
index 000000000000..9e1039688b42
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.vhd.gz
+M'XL("`#&'50``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD+F]U=`"MESUOPR`0
+MAO?\BI.Z9;#P&6-W::*HZ5RI4CN[Q(XR]$--APS^\>5LB`]_)6VQ"<*">WB/
+M.Q`1HGT`5`*J`E6"2JF=25"WD.4`IM,6;.K8?D*M/]Y+_7TX1?:I%RTL%MS*
+M-R=[3$":23+`@B91.VI#[3#1S7:_/+SM'0XMSDTL%4B$U$#D8)Y<G-41Z6'S
+M=-]7EPS5=5;M/%4%2<5&)%Q=%*TX3AHK,YZ*@DHV,EWQ/KP.CO/4I:)GQ62.
+M+2IS=@RGYJQ^@ULN;"S:5#&)D9E:@(HA0VJ;M''K,"@F54['S^+K6/;TX42J
+M*!:,?I^<=A=MJJ`;;!5($CCG+C248Q\WDBK_6CWEVTG;,(L@4M>!C?O^ZG4H
+MX/I4+&;6?#H8D_H*TF?VEBA&ZNF.>A/Y[QFH"9AFM-U3!3E>NX(OV^>Q^.J)
+M=/GC[M!X"><$\]/`QZT8+FG#T5%8\H*.(2F[;SF"NS._=8>3<^HH9\JQCDEG
+MT\#)K/.>'8\SQ"7$"8B<934#GN,+G;[;H0STW)W1!T-W"\)E_OB8X?""N^#C
+M7NVYS`9W(;RP>NNA.ATX&+O^SKARYQ+$W[DM#L,>!-B<+"8#S:AA/=U1/T;^
+MVP+1'E7!SCYT1U4HA=("@RDTP#*P0BQGD^VW6:BLPD`72<(%O$@2+N!%DG`!
+>+Y*$"WB1)%S`BR3A@EXDE?F+(,3B!S97<<M]#```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
new file mode 100644
index 000000000000..1605f5a30ddb
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.vhdf.gz
+M'XL("`#&'50``VEM9RTV,W@R-34M-#`Y-BUB<V0N=FAD9BYO=70`K90[3\,P
+M$(#W_(J3V#I$?L==:%519B0DF$-PJ@[`PL#@'X\OB1M?G@C%=J)8=_?E'O8Q
+MU@X`)8"5$^]Y@3_E=/ILES4T@4!=@-*@#=B@SOI%-D3@7\\O>3I\A^-+5O.X
+M?#`B3JSAHL.RGL,=$IP,PCK19#RQJCA(U^_5!.X^/,<>IY:\"YE@;DHP&ZS>
+M*G>QMG9@E]89N`,N@=E.)BCP5E_H_=N/W1`DW`7_8!QNB;B"ZO,$)U;"!8I[
+M0QPGRGT)5[)W''M7;5P,.;P9?[RY"*$WM\6);1N!:#I+.(%!:_R>%_BGG,X6
+MJ#K@9AFT7>\S$DP-QH'1^%TH,'LH;`H4]"3YZNO35=_7G[3"B.-M,YA<:"\D
+MWA93@"CQ)^8=OQ/_[LZ7W?7C$G&Q5<4?*X-)UP&B1N%:&N[CZ?EAZ)T<)\F2
+M[''T,VU[(7"2O4.*4[=@G6M:(.\7V1#!9*M"G&8#J__6ML69C8]*.'S9+_P)
+&SWLP!P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-bsd.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vmdk.gz.uu
new file mode 100644
index 000000000000..3df9b01e40e9
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-bsd.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-bsd.vmdk.gz
+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
+G^\Y=TYUM&T&U=)9U^'_[]_X3UV]/V__6A,62\(O_`X=39<Z@70``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
new file mode 100644
index 000000000000..c5c9257065bc
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
@@ -0,0 +1,128 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.qcow.gz
+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
+A?^>_\/4?[Q_^=3?8I,$_[02;;_2=SX_^!PM'3SM0J```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
new file mode 100644
index 000000000000..304b69423447
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.qcow2.gz
+M'XL("%[N+50``VEM9RTV,W@R-34M-#`Y-BUE8G(N<6-O=S(N;W5T`*V8VY+3
+M,`R&[_<IS!D6*+'DI`F'%A:6&>[@`KA.3T_1X=FI:R5V%"G>=M)V,NVX_S=R
+M_%E-6A3A84QIC:N,:\QA8TZ?Z04F^3!\F>.O[S\6Z>-X$V"V4%+"P'+?XP:L
+M?Q$'&JZPXP$KXY+J4,!!EQJ#<CBG5C<U(.!N;\ZG[KP8-4O@-<"`4Q?CJOH@
+MU,<3[LKZ8.[Z4#Y_99?C`]5T?1CJXZFEAJNS.!!2C89KLS@44AL-M\WBG)#:
+M:3AEYR:X4D@=%)S-J'+"54+*:CC(XI9""C6<R^)J(:5Y9_/>-4)*\\[FO6N%
+ME.:=S7NW$5*:=S;OW59(:=[9O'<[(:5Y!XIW)N+V0DKS#IAWCPCW..(.0DKS
+M#IAW3PCWM,=9*:5Y!\R[9X1['G%"OP/-.V#>O2#<RX@3^AUHW@'S[A7A;B-.
+MZ'>@>0?,N]>$>Q-Q0K\#S3M@WKT=>6>%?@>:=\B\>T>L(N*$?H>:=\B\LX2#
+MB!/Z'6K>(?,."><B3NAWJ'F'S+N2<%7$"?T.->^0>;<D7!UQ0K]#S3MDWC6$
+M>Q]Q0K]#S3MDWGT@W,>($_H=:MXA\^X3X581)_0[U+QSS+LUX3Y'G-#OG.:=
+M8]Y](=Q=Q`G]SFG>.>;=5\)]ZW$@I7KOBD)^$>Y^M&=AWNM/%Z^/K7#4!R:`
+M]27`J0H#KIEUPF78&Q<"Y0D'G-\;83)MV9ELR6?*;VW<%6E]ZV#S*L7MYI[N
+MX3)@69JV'0%_=_7!9!F7U[?<^V&_*UOAJ`\<[Q;#9P>LP[\#2[_)RLK4\-`*
+M_][_$=:WGN^&+^#T?P=HH"NX[X@CW#K!^0N,0_+-=%L-O$O?)[C5(G;F$V[R
+MWP%_R[.7!M3)EO/*4O>]I;<U66=_I>UOB+H?6W:EW*^OB?4)O04&TYVHSXRG
+MZW_$^YMMMAX>!YGIFB%NTW<680DS9V\UKFX[\V)8OC,>N',]9+AS`P[F;03-
+DN;.<##Q]:WS4!XX_%\-G`#H"SG8&7>5_>V_^`UMI__/2%```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
new file mode 100644
index 000000000000..024a0b2549c3
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.raw.gz
+M'XL("%[N+50``VEM9RTV,W@R-34M-#`Y-BUE8G(N<F%W+F]U=`"ME,T.@R`,
+MQ^\^1<\[&$"9[*+)DMUWV79&IT_APZ\5=2#XE4"%2`J__$L+C)D&@#WXK3OZ
+M=-'ZY)(,-%Z?!_(@T.`:VL5IF98T9AU-:9QQ#<[;@+X*#5MIX[ZQP^W.`:4$
+MK3W@:](G(J>C:,F="V`Z,*X[^GOJV@140\'(`G()\@I*'%7X>;P#^56,QPK8
+MX,0>;A)L*BB$JRQ<AL[.6FDJ<=QEUYW];^%*TR=<OJ4.3X*U(<=JL#)NL2@T
+M=Y^=9^`M\`R8&GW"!<[YA;^^FR]#..%NZ`,_7$VXPEW/+9S8"1=<7#V_+($4
+M[IQ>Z:MK(B>#+V_&P9M+$/?F&IR(^Q#<AI<%*Q!7^>.ZHW^FKAE@/@*CG2"]
+,?(PE/\L2J-?E!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
new file mode 100644
index 000000000000..4a2ad29f823b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.vhd.gz
+M'XL("%_N+50``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD+F]U=`"METUOXR`0
+MAN_Y%2/UUH.%QX#=2R)5S9Y7JMJ>L6M7/>R'FCWDX!^_C(%D\%>:EI@@K&$>
+MWH$!"R'<#T`7H#O0+6A%[5*"OH.R`K!&7W"H<_\*??/G=]O\>S]F_M=O'"P7
+MW"MV)W\L0-I!2D!#@^A7:D,?,-G-_NWV_==;P*''A8&E!HF@+$1.QJG$21V1
+M?MP_/HS5%5-U9R\W3M=!T;$>!5>793N.D];+]J>BH9.#S%"BE\C`<9$Z)49>
+M3.;<I+)@YW!ZS>L:W.W&KX5+%9L8I:T%Z!Q*I+9-FS`/DV)3Y7CX:SX.[4@?
+M+J2*9HLQMLGE<-&G"H;.7H$D@6OAPD`YC'$SJ?*MV=.QG_0-.PE"!0,.X<>S
+M=T8!UZ=SL3+GRXNQJ,^LQO6%@.OZ>N#*[J@;OSL$&$4U[=+<[U7OW]CW=D;?
+MSFW;+<>]I@ZWNPZH%!@S`3X%?4WBY:@J,MNS4YB9>MG0WV?Q<P(.":-*.LZ5
+MA@H_J_!E_SRSOI59.`ZN#]CA\!(N".:G?8S;,5SAMAM/U;,7SSO>9KBM^P><
+M7%-'9T([9U@,5B5.%E.-_/@Z0]Y"7H"HO`UCX&E]X:SO;BH#HW!7],$T7$.X
+M,NZ?,QQ>"!=B7'TZ66:6\,+L;:?JFL2+48]WQB=W+D'BG>MPF/8@,,/)8C/0
+M]IK6RX;^9Q8_#HC^4Y3LVX;^,$VF4'I@,H46V"96:-)^/[17F.BB0+B$%P7"
+D);PH$"[A18%P"2\*A$MX42!<THN"ME=`(3;_`?39ZI==#@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
new file mode 100644
index 000000000000..c48c7d276790
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.vhdf.gz
+M'XL("%_N+50``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD9BYO=70`K94[;\,@
+M$(#W_(J3NF6(``,F2R)%3>=*5=O9<7&4H>W2H8-_?#EC',[&>508C$`'G^_%
+MF3'_`+@WV><%[6KTM(OEHJ/QP_U`G@1Z7(VG.&ZK%(Y%@TL<!USMUC:AW]8U
+M]VQBW$=N<YO[@$I!54V`KT$_D3D<I46Q%,"JQ#@O:'<KV@+0=`FC2I`*E`8C
+M;M7P??^6B*]A/)?!'B>NX8+"/H-2N&V$*YRPB7;Z3.Q/Q7D7SR/<QK\!)R]I
+MYSS!;$HP:ZS*FRS&-7HNCC-P"[P`9GJ9H,`AOG#6;SU50Q!S+^@'4W,KQ)5T
+M/X]PXHJY0'&'H;(D0GC%>YNI=G7F8/#QS;CQYB*$WER/$WD+P;JK+"X#W:[I
+M."]HGU>T>:#L@=D\:/I_FRY`-Z`M:(7S4H)>0VEBH*"9U-;?7[;^.?W&$48<
+M]\4@V?&\*/"VZ!)$A1_1'SB/]'O8'Y>GSV/`A5(5/BPU.ETYB)R8:ZBY3[N7
+MQ[%VQ=1)AGB/HYYQV7.&$^]M8YP<C+6V*X'\W,F"")*E"G&*C4[]-[8>IS.G
+.BOOO+OX`/$*Q[A`)````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
new file mode 100644
index 000000000000..3ad6aa6f77fa
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-ebr.vmdk.gz
+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
+7)L!+!#3KX"7\'I'LB_\#:C6@$!Y@````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.gz.uu
new file mode 100644
index 000000000000..624c3269a491
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.gz.uu
@@ -0,0 +1,132 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.qcow.gz
+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
+;Z)M]Q"_BY[E'_2+>'HXWWOOM/_VP*B?UK```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.gz.uu
new file mode 100644
index 000000000000..b082a2de9712
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.gz.uu
@@ -0,0 +1,26 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.qcow2.gz
+M'XL("+X[(U0``VEM9RTV,W@R-34M-#`Y-BUG<'0N<6-O=S(N;W5T`*V92V_4
+M,!"`[_T5+F]:6.)7DN51:$LK]=8BN'')\UB)*PK\=N+8B9/)3-PNWK6BKJSY
+M9#O?C)TT2>R',<V92IG:L[9D_6_7!)O]6#;6W5W?[.:?[LC">$)$(1U*3K@%
+MZ]+C!(5+^+J#X[C9Z"2"$V/4&A3"*7)T6QT([N1H6+KA9N0@0AX"M#CR9APT
+M/F''!R/4@>,3L<<G\?738QSL2+?')^WX8%1&X?(@3B!1>PI7!'$2B2HI7!7$
+M*22JIG!-$*>1J);`\8`J/2Y%HCB%$T%<AD1)"J>"N!R)HKSC8>_V2!3E'0][
+M5R!1E'<\[%V)1%'>\;!W%1)%><?#WM5(%.6=(+QC'M<@491W`GAW['!//*Y%
+MHBCO!/#NJ<,]FW`<BZ*\$\"[YP[WPN.0>B<H[P3P[J7#O?(XI-X)RCL!O'OM
+M<"<>A]0[07DG@'>G#O?&XY!Z)RCO!/#N[<H[CM0[07DG@7?O'"OQ.*3>2<H[
+M";SC#B<\#JEWDO).`N^DPRF/0^J=I+R3P#OM<*G'(?5.4MY)X%WF<+G'(?5.
+M4MY)X-W>X=Y['%+O).6=!-Y]<+B/'H?4.TEY)X%WGQSNS..0>B<I[Q3P[K/#
+M??$XI-XIRCL%O#MWN`N/0^J=HKQ3P+M+A_LZX006-7F7)'ASN*M5S@JDWJGT
+M@;CK-8Y^6#GD.*O\<9LC5[IC`Y@_'DCNM<J>4^)-6-L)&ZL*Y$IW=!>[Y7<"
+M#KG[".`XPB7.35C;W+4/C$W#VM8UNU(N.)\=$)`)'^]FN#KR^@WI]@B@UJPH
+M5L`?X_B&=.OSR[X;Z.W60S'0@FDUX8:YZFH^OJOK&W9[_NV[@?WTTQW2+2M8
+MQ5F1LP*.CE/3_8W9IVVZ92U<[1$G*=QT+`,X<[S(Z@T<UECWA\"IK:CII<,#
+M[JW%Z609-2];9ILH)6L+5M0$[@S@TLCF*=-=IBRK6-J8]TE5:_ZH4_.4QO(^
+M3>RV+88SUIYEW)S=>F!W?[>[M["WNU^G;GR*.R.P1G=0JZ>&RIQ3T\W\@P`Q
+M7;;$8:^1_FOU3%TN=;35VSM9L$9WD*M7V-7#%\FL'IHRW;AJ8\*-N#+NZG'[
+M"C,Q]7M]I3NZV]WR:X'*`:.-4*5M%3$[#"YB=AA<Q.PPN*C988`1L\/@(F:'
+MP47,#H.+FAT]L$GB;>(&9]PK,E8+\YRX^'_!UG;<#8^/Z^DV8FOKW]C$\9O1
+E1-S$#6YS$\\:>K+V\Q=,-N(F;G!1-W&5F>/WT3\!FKQU%1H`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.gz.uu
new file mode 100644
index 000000000000..d413df2e2b4a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.raw.gz
+M'XL("`+&'50``VEM9RTV,W@R-34M-#`Y-BUG<'0N<F%W+F]U=`"MEC]O@S`0
+MQ?=\BI>U52W;V`262JW42MW2JMW:@3]FC-2=#U\?A@2(C1KIP$)(Q_UR]_#C
+M(F4X`*,AJ\@U'>B?Q?+L=W>[@:;JVX#^]ZF$%5!X8,`U/B@U/>,<NFY<4@U9
+M(5E):#7>3SAQ.?9BAFO/6=<K'9CC1,!-[7:W`:U%55T!OZ;Z]/`Z+$P.4T+[
+MYR6,@M6PYHP;>K7-O+Z7US<<GSX^"?9]:5=[:5#[_!95!K<22:IDNS_K=@-.
+M4U:W5GO"94G</H[+**O=P,56&F>VLL(>^M^[#3@KEUG%/"MSJ#-T%:HV@7M<
+MX7+FG6<H7.<X-,@=K$+3T4V;0RF@\#8I!HB&]B66."CHFH#]Z5V<`NQ!_-Z/
+M]1DU[HC82@=2ZIEAJQ2I=@^TMS?;Q1*7<:M7D'J63;URW"RQE0XDU:N">G&1
+M2+VH9?I)M<DA$Z[F54\-4\/[PW^_KZ_I0'\4RS,`S0ADJ]!H/S;XW$$X1G<0
+MCM$=A&-U!P$9W4$X1G<0CM$=A&-UAP<ZR3?$":?"F.Q:%!HN6]67&L>7^I;M
+I.KTU^C>&>/QE.,8A3KCM(>YN;99QB!..=8@;_W]*RMT?5F[7A(@+````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
new file mode 100644
index 000000000000..0dfa2d8094ba
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.vhd.gz
+M'XL("`+&'50``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD+F]U=`"MF#MOW#`,
+M@/?[%2RZI:ACR9+L6UHT:`)T2U];A_@A!QEZ?5R&#/[Q%67Y(5MRX81W@LZ&
+MS,\D15$\I6G_`5`9J!:4!B7Q.A>@CI`7`&;0-6Y[YFZAJW^==/WX\)2X3W?H
+M82R=2_GB*,\S$.8E.?`27Z(:O(9NP"2OK^\O'G[>#SCN<,.+A0+!01J(6+U'
+MI:-V2+JY^OK1(N\F[;*U=I-4_].VD+6S)[)!NSO;OY\;*XR4>1Y;#JF$5$S-
+MN_$&)F,7OI/I0FJF9LBI,V-#.+4EM0=W<7!ST8>*"8S<],9U#'*.UR9L!C^L
+MF@F5I_/O\N]9+_3CD5!1HWYL-9;%S>4N5/CPL--`8#AOF0N6\KC$!4+E1=Y3
+MOMPPN\8))G#<#;?F^]Z;4##73[%TP^?QR8CJ5Z)^9FVE9:"/#W17B?\=@56U
+M#SAXT,>-!E<U^L_F$:TGB_H@F1R;;4Q(.O-?U1#/;]7N`TH)9;D"?A_TJ^UT
+M2)OPCA@8)CD(!M(DORF<K>VRGNMW??,);C]\^8:P'Y.Y-89+PZ&HH3Y"6RVT
+M6Z^T[=Q2\S[Z>!LT-HOB+L,X7&QMLX$+M3A.;$FYK6R'L3+UI8JY5*:ARJ`M
+MH6PBN'<+''5>UCA<*<AKW,(E@]KNY8T"Q@`*LTP*"^'`C8IF8S>[<(7`[O0Y
+M.?6PM\F?-TX_S5Q$A%I\(.8];?-R$3,WGQ)VQ%SP<=1Y61?H/4GFO:,+EE"+
+M#T2]5_;>"SL)O1=:NN.NEB2O?%Q%ZSUF=PVS/DS^7O?Q@>XV\;\]D+MMB&Q?
+MXRZ1DFDH')!,0^'6+Z&&3&].YMY95FY2B#(,X@@S#.((,PSB2#,,`@DS#.((
+M,PSB"#,,XD@SC*(MA)0KA+("-,,_+I4?-?&2IBN2<Z_8I6>N+82BY=-&(12>
+M#,I"2/VO$&IUS-B1LS"6L!!2U(60<HF4Z"Q##8706H?GG&6HH1":O?@%9QDJ
+@7`@]]RP#<81G&8@C/,M`''&H,%.['/X!4B?R+P`3````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
new file mode 100644
index 000000000000..820c91d6d91b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu
@@ -0,0 +1,19 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.vhdf.gz
+M'XL("`/&'50``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD9BYO=70`K9<[;]PP
+M#,?W^Q0LLJ6HHK=]2XL&38!NZ6OK$#^D($.O*-JA@S]\1<EWEGR2T0MD$X8/
+MM'[FGR9-'Z5A`Y`<:)<YEAW3+4GW:7>]\S367P9T]\<05D#B@`$W."?E>(TQ
+M8.ULE/E58;$S09=SCR/+1DF$&^-5*RL[8AP)N*-<>QE0*>BZ,^"W8WS</PX%
+M4H/<`W?74Y`,%`<E3SBO70UQ?'?W'^'A_>>O"/N^R.7,.4<.[0##'FR_BH[]
+MO]R`<P%A]KG-BA5%W$T>)Q`W;N!R5L;)K56AABX1JVBZJHU7"0.]`-M!-Q9P
+M;U<X7;GR)+I[#<T`VH!B,%@\&34P!M"Z-FD]A`-W(>ZA8<![!$Z'3^008&_(
+MK]=S?)+-%9&SLJ.4/8FE0MN2W`9K>U,NI#A1.WLM9D]5R]Y^+I:<E1W%['4A
+M>_DD8?9RK>MP<];(JQ37U\T>\U/#]8=[?Y\?RX[I@:1[`,H96"U"9>U0L3L0
+M5[$[$%>Q.Q!7M3L06+$[$%>Q.Q!7L3L05[4['-#0>D,<<5A[H@7#H!'0IU53
+M'L=32WZ'P&X2N89OC?Z-(9Y_&*;B$$?<YA"WIB3VQ%F)K3C$$5=UB.OY\UL+
+MT+Z_M,+S1H)V+=7&0+[4C`<./P]F^//\-\Z>]F]F6#Z25X;KN<#"U*Y%.KR)
+M'O$\BN_J[NGZ^<?3$<=G5<<;8T6[*G80>297IW+O;[]\\,C');K,:TJOLN?B
+M%#81/D?WZ(_O8K'R)-98<,JI7"SYD3BRA8PX7RKQQ2]]M@%7NU3<7X/=/VC0
+&,#.S#0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.gz.uu
new file mode 100644
index 000000000000..829240355e69
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.gz.uu
@@ -0,0 +1,88 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-gpt.vmdk.gz
+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
+)_ZT-&`6T90``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
new file mode 100644
index 000000000000..2a4ea04ec888
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
@@ -0,0 +1,128 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.qcow.gz
+M'XL("&'N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N<6-O=RYO=70`K9W)CE79
+M$47G]16/'I+N1<1M:3)3EFS),WM@>UJW';\/0/YV`WF:S+A[$Y0+0*5$67?K
+MO9.+1:E8.IS/=]].IU9.37=JQM,^G[[^//V0T[V?//QQ^O+/O_W]W?UO7WZ[
+M&Y/S#YYR/^^W,O=@Z[]U3K\]M9S.XT_,??TA:.[>J[,_\.KNO=GCW-5O=V\6
+M/Z=LT!X,GM+<.;T^(:?7_-SKNW5O5^Y.[]>]725OM_VYP7^XUZ=_"):?>GU_
+M\.O;P<'?R^MKX%,]FQL>S%T.;[>%3XUL;OHAS'KNX%,SFUN"N1X^M;*Y+9@;
+MX%,[GI,??&WOYD;XE+`YA7.G,C?!IXS--0_FSFGNMLS-\"GRZT(<=_G71>5N
+M@4\1[B3D;H5/$>XDY&Z#3Q'N).1NAT\1[B3B3O!3A#N-N!.D*&7<:<2=(",K
+MXTXC[@3Y3AEW&G$GR'?*N-.(.T&^4\:=1MP)\ITR[C3B3I#OE'&G(7?(=\JX
+MLY`[Y#MCW%G('?*=,>XLY`[YSAAW%G*'?&>,.PNY0[XSQIV%W"'?&>/.0NZ0
+M[XQQ9Q%WBI\BW#41=XI\US#NFH@[1;YK&'=-Q)TBWS6,NR;B3I'O&L9=$W&G
+MR'<-XZZ)N%/DNX9QUT3<*?)=P[AK0NZ0[QK&71MRAWS7,N[:D#ODNY9QUX;<
+M(=^UC+LVY`[YKF7<M2%WR'<MXZX-N4.^:QEW;<@=\EW+N&LC[@P_1;CK(NX,
+M^:YCW'41=X9\US'NNH@[0[[K&'==Q)TAWW6,NR[BSI#O.L9=%W%GR'<=XZZ+
+MN#/DNXYQUX7<(=]UC+L^Y`[YKF?<]2%WR'<]XZX/N4.^ZQEW?<@=\EW/N.M#
+M[I#O>L9='W*'?-<S[OJ0.^2[GG'71]PU^"G"W1!QUR#?#8R[(>*N0;X;&'=#
+MQ%V#?#<P[H:(NP;Y;F#<#1%W#?+=P+@;(NX:Y+N!<3=$W#7(=P/C;@BY0[X;
+M&'?Y?\_S.>2[D7$WAMPAWXV,NS'D#OEN9-R-(7?(=R/C;@RY0[X;&7=CR!WR
+MW<BX&T/ND.]&QMT8<=?BIPAW4\1=BWPW,>ZFB+L6^6YBW$T1=RWRW<2XFR+N
+M6N2[B7$W1=RUR'<3XVZ*N&N1[R;&W11QUR+?38R[*>0.^6YBW.4_)N5SR'<S
+MXVX.N4.^FQEW<\@=\MW,N)M#[I#O9L;=''*'?#<S[N:0.^2[F7$WA]PAW\V,
+MNSGBKL-/$>Z6B+L.^6YAW"T1=QWRW<*X6R+N.N2[A7&W1-QUR'<+XVZ)N.N0
+M[Q;&W1)QUR'?+8R[)>*N0[Y;&'=+R!WRW<*X6T/ND.]6QMT:<H=\MS+NUI`[
+MY+N5<;>&W"'?K8R[->0.^6YEW*TA=\AW*^-N#;E#OEL9=VO$78^?(MR10.C>
+M'/+=QKC;(NYZY+N-<;=%W/7(=QOC;HNXZY'O-L;=%G'7(]]MC+LMXJY'OML8
+M=UO$78]\MS'NMI`[Y+N-<;>'W"'?[8R[/>0.^6YGW.TA=\AW.^-N#[E#OML9
+M=WO('?+=SKC;0^Z0[W;&W1YRAWRW,^[VB+L!/X6YD_P!GP.^DS/A3LX1=P/P
+MG9P)=W*.N!N`[X3U@>+[NP-W`_"=L/Y.POYN`+X3UM])V-\-P'?"^CL)^[L!
+M^$Y8?R=A?S<`WPGK[R3L[P;@.V']G83]W0!\)ZR_D["_&X#OA/5W$O9W`_"=
+ML/Y.POYN`+X3UM])V-\-P'?"^CL)^[L!^$Y8?R=A?S?BIPAW87\W(M^Q_D["
+M_FY$OF/]G83]W8A\Q_H["?N[$?F.]7<2]G<C\AWK[R3L[T;D.];?2=C?C<AW
+MK+^3L+\;D>]8?R=A?S<BW['^3L+^;D2^8_V=A/W=B'S'^CL)^[L1^8[U=Q+V
+M=R/R'>OO).SO1N0[UM])V-^-R'>LOY.POYOP4X2[L+^;D.]8?R=A?S<AW['^
+M3L+^;D*^8_V=A/W=A'S'^CL)^[L)^8[U=Q+V=Q/R'>OO).SO)N0[UM])V-]-
+MR'>LOY.POYN0[UA_)V%_-R'?L?Y.POYN0KYC_9V$_=V$?,?Z.PG[NPGYCO5W
+M$O9W$_(=Z^\D[.\FY#O6WTG8W\WX*<)=V-_-R'>LOY.POYN1[UA_)V%_-R/?
+ML?Y.POYN1KYC_9V$_=V,?,?Z.PG[NQGYCO5W$O9W,_(=Z^\D[.]FY#O6WTG8
+MW\W(=ZR_D["_FY'O6'\G87\W(]^Q_D["_FY&OF/]G83]W8Q\Q_H["?N[&?F.
+M]7<2]G<S\AWK[R3L[Q;\%.$N[.\6Y#O6WTG8WRW(=ZR_D["_6Y#O6'\G87^W
+M(-^Q_D["_FY!OF/]G83]W8)\Q_H["?N[!?F.]7<2]G<+\AWK[R3L[Q;D.];?
+M2=C?+<AWK+^3L+];D.]8?R=A?[<@W['^3L+^;D&^8_V=A/W=@GS'^CL)^[L%
+M^8[U=Q+V=RM^BG`7]G<K\AWK[R3L[U;D.];?2=C?K<AWK+^3L+];D>]8?R=A
+M?[<BW['^3L+^;D6^8_V=A/W=BGS'^CL)^[L5^8[U=Q+V=ROR'>OO).SO5N0[
+MUM])V-^MR'>LOY.POUN1[UA_)V%_MR+?L?Y.POYN1;YC_9V$_=V*?,?Z.PG[
+MNPT_1;@+^[L-^8[U=Q+V=QOR'>OO).SO-N0[UM])V-]MR'>LOY.PO]N0[UA_
+M)V%_MR'?L?Y.POYN0[YC_9V$_=V&?,?Z.PG[NPWYCO5W$O9W&_(=Z^\D[.\V
+MY#O6WTG8WVW(=ZR_D["_VY#O6'\G87^W(=^Q_D["_FY#OF/]G83]W8Z?(MR%
+M_=V.?,?Z.PG[NQWYCO5W$O9W._(=Z^\D[.]VY#O6WTG8W^W(=ZR_D["_VY'O
+M6'\G87^W(]^Q_D["_FY'OF/]G83]W8Y\Q_H["?N['?F.]7<2]G<[\AWK[R3L
+M[W;D.];?2=C?[<AWK+^3L+_;D>]8?R=A?[<CW['^3J+^SL[X*<R=Y@_<W*G.
+M`=]]?0ISIZZ_R_?]G4YE#OA.67^GKK\[)>Y.MV4.^$Y9?Z>NOSLE[DZ_ESG@
+M.V7]G;K^[G0YG!WPG;+^3EU_5\ZNS@'?*>OOU/5W8`[X3EE_IZZ_`W/`=\KZ
+M.W7]79Y[5.>`[Y3U=^KZNT=YKG('?*>LOU/7WSU*W#VJW`'?*>OOU/5WCQ)W
+MCRIWP'?*^CMU_=VCR^'L@.^4]7?J^KMR=G4.^$Y9?Z>NOP-SP'?*^CMU_=UQ
+M#MU_IZR_4]??Y;G'=0[YCO5WZOJ[QWFN<(?NOU/6WZGK[QXG[AX7[M#]=\KZ
+M.W7]W>/$W>/"';K_3EE_IZZ_>WPYG!WR'>OOU/5WY>SJ'/(=Z^_4]7=@#OF.
+M]7?J^CLPAWS'^CMU_5V>>U+GD.]8?Z>NOWN2YRIWR'>LOU/7WSU)W#VIW"'?
+ML?Y.77_W)''WI'*'?,?Z.W7]W9/+X>R0[UA_IZZ_*V=7YY#O6'^GKK\#<\AW
+MK+]3U]\=Y]#]=\KZ.W7]79Y[6N>0[UA_IZZ_>YKG"G?H_CME_9VZ_NYIXNYI
+MX0[=?Z>LOU/7WSU-W#TMW*'[[Y3U=^KZNZ>7P]DAW['^3EU_5\ZNSB'?L?Y.
+M77\'YI#O6'^GKK\#<\AWK+]3U]_EN6=U#OF.]7?J^KMG>:YRAWS'^CMU_=VS
+MQ-VSRAWR'>OOU/5WSQ)WSRIWR'>LOU/7WSV[',X.^8[U=^KZNW)V=0[YCO5W
+MZOH[,(=\Q_H[=?W=<0[=?Z>LOU/7W^6YYW4.^8[U=^KZN^=YKG"'[K]3UM^I
+MZ^^>)^Z>%^[0_7?*^CMU_=WSQ-WSPAVZ_TY9?Z>NOWM^.9P=\AWK[]3U=^7L
+MZASR'>OOU/5W8`[YCO5WZOH[,(=\Q_H[=?U=GGM1YY#O6'^GKK][D><J=\AW
+MK+]3U]^]2-R]J-PAW['^3EU_]R)Q]Z)RAWS'^CMU_=V+R^'LD.]8?Z>NORMG
+M5^>0[UA_IZZ_`W/(=ZR_4]??'>?0_7?*^CMU_5V>>UGGD.]8?Z>NOWN9YPIW
+MZ/X[9?V=NO[N9>+N9>$.W7^GK+]3U]^]3-R]+-RA^^^4]7?J^KN7E\/9(=^Q
+M_DY=?U?.KLXAW['^3EU_!^:0[UA_IZZ_`W/(=ZR_4]??Y;E7=0[YCO5WZOJ[
+M5WFN<H=\Q_H[=?W=J\3=J\H=\AWK[]3U=Z\2=Z\J=\AWK+]3U]^]NAS.#OF.
+M]7?J^KMR=G4.^8[U=^KZ.S"'?,?Z.W7]W7$.W7^GK+]3U]_EN:LZAWS'^CMU
+M_=U5GBO<H?OOE/5WZOJ[J\3=5>$.W7^GK+]3U]]=)>ZN"G?H_CME_9VZ_N[J
+M<C@[Y#O6WZGK[\K9U3GD.];?J>OOP!SR'>OOU/5W8`[YCO5WZOJ[//>ZSB'?
+ML?Y.77_W.L]5[I#O6'^GKK][G;A[7;E#OF/]G;K^[G7B[G7E#OF.]7?J^KO7
+ME\/9(=^Q_DY=?U?.KLXAW['^3EU_!^:0[UA_IZZ_.\ZA^^^4]7?J^KL\]Z;.
+M(=^Q_DY=?_<FSQ7NT/UWROH[=?W=F\3=F\(=NO].67^GKK][D[A[4[A#]]\I
+MZ^_4]7=O+H>S0[YC_9VZ_JZ<79U#OF/]G;K^#LPAW['^3EU_!^:0[UA_IZZ_
+MRW-OZQSR'>OOU/5W;_-<Y0[YCO5WZOJ[MXF[MY4[Y#O6WZGK[]XF[MY6[I#O
+M6'^GKK][>SF<'?(=Z^_4]7?E[.H<\AWK[]3U=V`.^8[U=^KZN^,<NO].67^G
+MKK_+<^_J'/(=Z^\TZN\,W7^GK+_3J+\S=/^=LOY.H_[.T/UWROH[C?H[0_??
+M*>OO-.KO#-U_IZR_TZB_,W3_G;+^3J/^SM#]=\KZ.R7]W?LZAWS'^CMU_=W[
+M/%>Y0[YC_9VZ_NY]XNY]Y0[YCO5WZOJ[]XF[]Y4[Y#O6WZGK[]Y?#F>'?,?Z
+M.W7]73F[.H=\Q_H[=?T=F$.^8_V=NO[N.(?NOU/6WUG^P,V=ZQSPG;'^[NLG
+M'G"7_70NW*'[[XSU=^;ZNW/:.Q?NT/UWQOH[<_W=.7%W+MRA^^^,]7?F^KOS
+MY7!VP'?&^CMS_5TYNSH'?&>LOS/7WX$YX#MC_9VY_@[,`=\9Z^_,]7=Y3NH<
+M\)VQ_LY<?R=YKG('?&>LOS/7WTEZ>5*Y`[XSUM^9Z^\D<2>5.^`[8_V=N?Y.
+M+H>S`[XSUM^9Z^_*V=4YX#MC_9VY_@[,`=\9Z^_,]7?'.73_G;'^SEQ_E^>T
+MSB'?L?[.7'^G>:YPA^Z_,];?F>OO-'&GA3MT_YVQ_LY<?Z>).RW<H?OOC/5W
+MYOH[O1S.#OF.]7?F^KMR=G4.^8[U=^;Z.S"'?,?Z.W/]'9A#OF/]G;G^+L]9
+MG4.^8_V=N?[.\ESE#OF.]7?F^CM+W%GE#OF.]7?F^CM+W%GE#OF.]7?F^CN[
+M',X.^8[U=^;ZNW)V=0[YCO5WYOH[,(=\Q_H[<_W=<0[=?V>LOS/7W^6YILXA
+MW['^SEQ_U^2YPAVZ_\Y8?V>NOVL2=TWA#MU_9ZR_,]??-8F[IG"'[K\SUM^9
+MZ^^:R^'LD.]8?V>NORMG5^>0[UA_9ZZ_`W/(=ZR_,]??@3GD.];?F>OO\EQ;
+MYY#O6']GKK]K\USE#OF.]7?F^KLV<==6[I#O6']GKK]K$W=MY0[YCO5WYOJ[
+M]G(X.^0[UM^9Z^_*V=4YY#O6WYGK[\`<\AWK[\SU=\<Y=/^=L?[.7'^7Y[HZ
+MAWS'^CMS_5V7YPIWZ/X[8_V=N?ZN2]QUA3MT_YVQ_LY<?]<E[KK"';K_SEA_
+M9ZZ_ZRZ'LT.^8_V=N?ZNG%V=0[YC_9VY_@[,(=^Q_LY<?P?FD.]8?V>NO\MS
+M?9U#OF/]G;G^KL]SE3OD.];?F>OO^L1=7[E#OF/]G;G^KD_<]94[Y#O6WYGK
+M[_K+X>R0[UA_9ZZ_*V=7YY#O6']GKK\#<\AWK+\SU]\=Y]#]=\;Z.W/]79X;
+MZASR'>OOS/5W0YXKW*'[[XSU=^;ZNR%Q-Q3NT/UWQOH[<_W=D+@;"G?H_CMC
+M_9VY_FZX',X.^8[U=^;ZNW)V=0[YCO5WYOH[,(=\Q_H[<_T=F$.^8_V=N?XN
+MSXUU#OF.]7?F^KLQSU7ND.]8?V>NOQL3=V/E#OF.]7?F^KLQ<3=6[I#O6']G
+MKK\;+X>S0[YC_9VY_JZ<79U#OF/]G;G^#LPAW['^SEQ_=YQ#]]\9Z^_,]7=Y
+M[D.=0[YC_9VY_NY#GBO<H?OOC/5WYOJ[#XF[#X4[=/^=L?[.7'_W(7'WH7"'
+M[K\SUM^9Z^\^7`YGAWS'^CMS_5TYNSJ'?,?Z.W/]'9A#OF/]G;G^#LPAW['^
+MSEQ_E^<^UCGD.];?F>OO/N:YRAWR'>OOS/5W'Q-W'RMWR'>LOS/7WWU,W'VL
+MW"'?L?[.7'_W\7(X.^0[UM^9Z^_*V=4YY#O6WYGK[\`<\AWK[\SU=\<Y=/^=
+ML?[.7'^7YS[5.>0[UM^9Z^\^Y;G"';K_SEA_9ZZ_^Y2X^U2X0_??&>OOS/5W
+MGQ)WGPIWZ/X[8_V=N?[NT^5P=LAWK+\SU]^5LZMSR'>LOS/7WX$YY#O6WYGK
+M[\`<\AWK[\SU=WGN<YU#OF/]G;G^[G.>J]PAW['^SEQ_]SEQ][ERAWS'^CMS
+M_=WGQ-WGRAWR'>OOS/5WGR^'LT.^8_V=N?ZNG%V=0[YC_9VY_@[,(=^Q_LY<
+M?W><0_??&>OOS/5W>>ZZSB'?L?[.7']WG><*=^C^.V/]G;G^[CIQ=UVX0_??
+M&>OOS/5WUXF[Z\(=NO_.6']GKK^[OAS.#OF.]7?F^KMR=G4.^8[U=^;Z.S"'
+M?,?Z.W/]'9A#OF/]G;G^+L_=U#GD.];?F>OO;O)<Y0[YCO5WYOJ[F\3=3>4.
+M^8[U=^;ZNYO$W4WE#OF.]7?F^KN;R^'LD.]8?V>NORMG5^>0[UA_9ZZ_`W/(
+M=ZR_,]??'>::,WX*<]?D#]S<;9T#OFM8?]>X_NXVSYW*'/#=UZ<P=XWK[VX3
+M=[>W90[XKF']7>/ZN]O$W>WO90[XKF']7>/ZN]O+X>S0W[==3IQ^XLL[]^W+
+M;U??!]OO7]M&3^<)_)-_XLM?WCW\7@:_WVOT!P:_O6$Y#.8WW-[=:_2]K9O:
+M!-[7G][9+;V]1>KOLO??\,T=?-?O[LVAOS?ZSYP?NHKH1X-M>YJFP^"_\NM#
+M5Q']F=?7;;_XZ]M_!Z;M3TU[:KO3H#_["O_SUW^[5W@W!V3P_[WANSD@@X=S
+M^067WQ\/<S?WYK[)8+_W;Y[EWE/WN;O_\;VYZW?W?@/OD0SJW#<!;N@3],W^
+M8AGTAPLG[W^=O]_);*=S_O,9=]%I^?J>ZNM#@?^#M_N#UW<ZOMWO_X'1/_SW
+MY=Z<!F_W]'!N+F8!7\+@]*Z/KP[]!?=_YHMQN#;Q)W_E?AMY^"OW;DY_K0B&
+H[V;Y]MOB!/[)/_'E'^\>?K\;;-+@+SO!YBM]Y_-O_P.[1]$3H:@`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
new file mode 100644
index 000000000000..4524f2b8b903
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.qcow2.gz
+M'XL("&+N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N<6-O=S(N;W5T`*V8VY+3
+M,`Q`W_<KS!T6*+'DW+BTL+#,\`8/P'-Z^XH.WTY2*[&C2/&VDS:3:<?5&=D^
+M4I-DF7\9DUOC"N-J<]R:]CL=8*(OX\.<?GW_L8I?IQL/LYD2)0R4AP$W8OT+
+M.-!PF9T.6!D798<"#OJH*2B%<VIV<P,"[O;FO'3GS:A8!%X#]#AU,Z[*#WQ^
+M/,)=F1\LG1_*ZY?W<7R@F,\/?7X\JM1P51('0E2MX9HD#H6HK8;;)7%.B-IK
+M.*5R(UPN1!T5G$VHTN(*(<IJ.$CB2B$*-9Q+XBHA2O/.IKVKA2C-.YOVKA&B
+M-.]LVKNM$*5Y9]/>[80HS3N;]FXO1&G>@>*=";B#$*5Y!\R[1X1[''!'(4KS
+M#IAW3PCW=,!9*4KS#IAWSPCW/."$?@>:=\"\>T&XEP$G]#O0O`/FW2O"W0:<
+MT.]`\PZ8=Z\)]R;@A'X'FG?`O'L[\<X*_0XT[Y!Y]XY86<`)_0XU[Y!Y9PD'
+M`2?T.]2\0^8=$LX%G-#O4/,.F7<YX8J`$_H=:MXA\ZXD7!5P0K]#S3MDWM6$
+M>Q]P0K]#S3MDWGT@W,>`$_H=:MXA\^X3X=8!)_0[U+QSS+L-X3X'G-#OG.:=
+M8]Y](=Q=P`G]SFG>.>;=5\)]&W`@10W>99E\$.Y^4K.P[/6G"]?'5CCK`S/`
+MZA+@7(8>5R\ZX=Q/N-.@$<[ZP.EN-7X/P'.Q70"L:`7'.)IP[HO-KTZ3]Z5A
+MJ4!H>CL;RBR>\,:7QWH5X?8+K]^Y/BX`YKEIF@GP=Y\?S*9Q>7[E8>']K?SC
+MAK*KVKPP%3PTP[_W?Z9"M[C%*MCC],<---`G/+38"6X3X;HKEF/TR[A.1][%
+MGR/<>A5:?8N;?=S0W4,=I`%ULOFRLE1#LQILC?:YNW3O[K#Z?V]VZ3WLKPGY
+M"<T*1M.=R<],I]M=%0QW[VP_.APDIFO&N.W0680M3*S>>IK=;N'-L+PR'EBY
+M'61<N1X'RS:"^MQ96@/;7TW/^L#IYVK\]D!'P,56T!7=?]O-?U_U;%8C%0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
new file mode 100644
index 000000000000..b3375d732668
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.raw.gz
+M'XL("&+N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N<F%W+F]U=`"ME,V.A"`,
+MQ^\^1<][(`5E92Y.LLG>][(S9\;5I_#AMUAURN#'F$"18`J__$L+B-P`*@/H
+M5\9MQ_"E8AN*CV*DZ<<YH$-`G0`5`1G7$HX6D$QOPUCVX3>,P8&AM_3?37/N
+M,!!!7<FH-4K@_I9=:=]VC#C9GN'VYX#6@O<)\'?69W9EG-=7=YGSZ\:"L354
+M%NPG./.NPOOW[44AXW2N@!EGCG"S8*Z@-=Q5X$IR]F(E5^*T2]:=G`M<P]^,
+MJ_;4T4E@M^;8#-;F+19'%N^3>0;=@2X!W>0S,7#)+SSU75(9)@IW1Q^DX?J`
+MJ^/U6N#,0;@0XQ[+R[*2PH/3:U)U;>9DZ->;\>;-#9#XYC+.Y'T(+N/+0A5(
+<J])QVS'\J-@86$W`;"<87C[$XA^HPB9UY08`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
new file mode 100644
index 000000000000..695a3e982aa6
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.vhd.gz
+M'XL("&+N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD+F]U=`"METMOW"`0
+MQ^_[*4;J+0<+CP&3RZX4-3U7JMJ>L6-'.?2A;@\Y^,.7,>`%OS;;S)I%6,"/
+M/\S#0@C_`]`5Z!YT!UI1NY:@[Z$V`*XS%!SK,KS"T/[ZV;5_7UZ+\!L.'E:*
+M=%8^G>9C!=(M4@-:6D0_41N&B"D^/#[?O?QXCC@,N+BPU"`1E(/(Q3I&3.J(
+M].GAR\>YNFJI[C++K]/W4/7)B"I55Q2G%"?=+#>>BH9>CC)CR5ZRCA27J5-B
+M-BN1N7:HR6;7<'IOUBVXNT.PA7<5YQBUJP7H$FJDMG.;>`Z+XESE]?S;_CEW
+M,WVXX2HZ,<:\3VYO%X.K8!P<%$@2N+==&"GG.6[%5=YU>CJ?)T/#'8)0L0/'
+M[>>G=T%!JD^78N?,MXVQJ<^2/A=;PJ[4VQW#0Y$_$[!I;@,:X:,CQTT;;MH0
+M'0*LHIJBM`RQ&LZO=>_=BD%./FR/R?DU3\SV;?K;@$J!M0O@UZBOW95QNSYC
+MF.UK1H=1-:5SI<'@6Q5^?_RV$K_&;J2#_\M^QN(U7!2<9OL<=TIPE0^W"R5)
+M3IG?I>T$=_3_B)-[ZB@G=&L=FYM5S,YBS6Q>:F<H.R@K$";T80Z<[`L7??=+
+M&9AM=T<?++=K"5?GX\L$AU>V"SFNF3++B@FOG-YQJ:YE-D8SCXPW1BY!\LCU
+M..1-!';,+,X#W:AEO=TQ?"[RQP,Q?(K8OFT8DBF;0AF`;`H=L&-6:'F_'SHH
+L9+HH$([QHD`XQHL"X1@O"H1CO"@0CO&B0#C6BX)V5T`A#O\`HP_9YET.````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
new file mode 100644
index 000000000000..1e1f5378332f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.vhdf.gz
+M'XL("&+N+50``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD9BYO=70`K94];\,@
+M$(;W_(J3NF6P``,F2R)%3>=*5=O9<7"4(>W2H8-_?.^,[8"Q\U%A",(Z>/(>
+M=YP9<P^`%,#*B7'>T&RSL#6+Y:*E\?UC0,.`\0B8(=#A*L3A`I19*AKSFEYI
+M)`.C7N&[[>:N0X.$;(,-GW7FX0[#KKC/&UJ<_US<K1\#*@5E&0'?>WWBJHS'
+M]14V<7Q-FS"J`*E`:3#B7H6?NX^10H?CJ1QV.'$+UPMV&32%VWBX'(VUM])E
+M8K?+SSM_[N'6[M?CY#5U>!+,3AEFG55ID\5@"_?Y<09N@>?`3&<3(7"(+UST
+MK6(9(G#WBCZ(W2T)5X3KN8<3-]R%$+<?*LM$"&^<WCI65R4.!A_?C#MO+D'"
+MF^MP(FTA6+65!3,05\7CO*%YS<+F@+(#)CM!TWW;=`ZZ!FU!*YH7$O0*"N,#
+M19A)3?7]9:N?TZ\?8<)Q5PPF.^T7.=T678`HZ4_T@>:>OJ?=<7DZ'WM<7ZKZ
+M/Y::#ETA1$;NFM#=E^W;\UA='A^2"4Z/DTZ_[*'CP>EM?)P<G+6V+8'\TH.7
+=P#!9J@BGV&C7?V/K<#IQJN!W=_$'S:-I2Q`)````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
new file mode 100644
index 000000000000..5ebc9fc021af
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-mbr.vmdk.gz
+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
+>O7WCZ;O3_,\$>(F`9AV\A%],DGWQ?Q6YC7-O8```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
new file mode 100644
index 000000000000..bfa03be0f1d2
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
@@ -0,0 +1,126 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.qcow.gz
+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
+J".9;L_SX[70'_]8O?/OZ[N$_/P>'-OC;GN#P'9?U^H__!PSBQAVCJ```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
new file mode 100644
index 000000000000..be431e6cfaa7
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.qcow2.gz
+M'XL("&/N+50``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G%C;W<R+F]U=`"MF-MR
+MTS`00-_S%>(.!8*U*_G")2F%,L,;/`#/B9M\189O)XH42U[O6FU0XO$TH^Z9
+ME?9H(Z>J_$LIJY6IE>G4?JN.G\,%*ODPOM3AY[?OR_1U6'B8KH0H9J#9#;@1
+MZV_$@82K]'1`\[@D.V1P<(Z:@G(X(V8W-\#@KA:GI3L5HR41>`G0X\1B7)0?
+M^/QHA+DP/RB='_+K9\]Q=*">SP]]?C2JD7!M%@=,5"?A-ED<,E%;"==G<8:)
+MNI-PPLY-<):)V@LXG5'EB*N9*"WA((MKF"B4<":+:YDHR3N=]ZYCHB3O=-Z[
+M#1,E>:?SWFV9*,D[G?>N9Z(D[W3>NSLF2O(.!.]4Q.V8*,D[(-X]"KC'$;=G
+MHB3O@'CW).">#CC-14G>`?'N6<`]CSBFWX'D'1#O7@3<RXAC^AU(W@'Q[E7`
+M744<T^]`\@Z(=Z\#[DW$,?T.).^`>/=VXIUF^AU(WB'Q[EU@51'']#N4O$/B
+MG0XXB#BFWZ'D'1+O,.!,Q#']#B7OD'AG`ZZ..*;?H>0=$N^:@&LCCNEW*'F'
+MQ+LNX-Y''-/O4/(.B7<?`NYCQ#']#B7OD'CW*>!6$<?T.Y2\,\2[=<!=1QS3
+M[XSDG2'>?0ZXFXAC^IV1O#/$NR\!]W7``1<U>%=5_!5PMY,]"V7/GR:>CS5S
+MEP=F@.U#@',9>EQ7=,+63]AIL&'N\L#A9CE^#\"3,`\`6JLV4^`O/V'KA>F,
+MZ@TWK[!/M#SA=;I^MK0PUI6DZ/H!^X3V'QDVN\(9MOX'A\;M6UNK%NZ;X9_;
+MWU.EC[AB)?$X^0>','!.>&BR$]PZP;DSRS[YSU0VU>O8X-._$]QJ&9O]$3?[
+M@X-[BMIQ`^)D;5E9VJ%=G:^TSN[P[IZQSM_?Y/`]U%?%_)AV!:/ISN2GIM-U
+MYX+A^9W4P^$@,UTUQKES05K/40DSJ[>:9M<7+H:F.^.>.]=!QCO7XZ!L(^A.
+CG>5HH.OBD[L\</BQ'+\]T`1@L14TM?MV6_P#%UJW"245````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
new file mode 100644
index 000000000000..3e69394ce4de
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.raw.gz
+M'XL("&3N+50``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G)A=RYO=70`K91-CX,@
+M$(;O_HKWO`<#(U2]M$F3WO>RNV=K]%?XXY<O+2-^M`F@B!EX\@XSC!"^`8H@
+MNHUQWS#=2]ZGXJMP-#E^!M0:70K\,4"'(ZNO5>@5S&SUH!K=3":&J0SM%KXS
+M3AIC"@J[=@T+KEQPP5V5^?Q('`KY7&$]9%;8.(6ZAM+0%S3TKL*_Q^]*H<=E
+M"XG'T1EN%AR29P-WBW"5,8[1RCC9T$M40_B)YQ'NZM\9IX[4F9,0PY9AUUF=
+M-UD:T_F^.,Z0`V0%T00;<>`27[STM:D,8NX>Z$/J;F=Q-5\O(QR=N`N.>UI<
+M%$\6PI/3NZ;J^LS!D.N;\>;-M1!^<SV.\A:"UE46DX&VBB?COF'Z+GGW0!6`
+0V4[05CXABG]2`B^9YP8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
new file mode 100644
index 000000000000..056cb492290d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.vhd.gz
+M'XL("&3N+50``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9"YO=70`K9=-3^P@
+M%(;W\RM.XLY%0T^!,ALG,>K:Q.A=,[VM<7'5."Y<],?+*3"%TG8<+],.H0$>
+MWO,!!,;L#T!6(#N0+4A!]9J#W$*M`$RC>W$H2_<)??/VVC:?+U^%^_4;"RM9
+M."H>3N.Q`FXFJ0$U32+_4AUZCRDN;I\O7_X]>QPZG)^82^`(PD!X,H]B1W5$
+MNKM^N)FJJU)UXR@[3]=!U04]JE!=4>Q"'#>C3']Z)71\D.G?Z"-J"'&1.L$F
+MHP*9<TX-C)W#R;51Y^`N-RX6-E5,8M2F9"!+J)'J)FV\'Y+7I,K7X5U_'-J)
+M/EQ(%1D$8]K&E\U%ERKH.SL%G`2NF0L#Y3#%S:3*?WE/QN.XJQ@G,.$;<#`_
+M]MZ(@E"?+-F*SY>#L:A/DSZSMIB>*9<;^NLB?H[`?7<>4`C0*?#1&]R0OBV'
+MAL_YW2W9)&-&@W=Q?)N%[/MU?-O,_D.]*N1\A4IE5J@&A:*F#5U(4/A3A7]N
+MGV96L-+90F)Q>`KG!8?[?8S;!;C*+KB1$B0;-"54K?L(ZP'NROX]CJ^IHUVA
+MG6M8-%9D3A:M)N/".$/90ED!4ZX-8^`QOC#JVZ8R,#)W11^DYFK"U7'_,L#A
+M"7,AQNW=R>M[1B$\X;VK5%V3.1C[Z<KXX<HE2+QR+0[S;@1ZV%E,!M(NGI3+
+M#?U]$3\6B.XPRG:ZH3L]LBGD#IA-(7?G1T:%NEE-MG.S4#J%F:X*A,MX52!<
+CQJL"X3)>%0B7\:I`N(Q7!<)EO2I(<PED;/,-H6X,)U\.````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
new file mode 100644
index 000000000000..8662222120a0
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.vhdf.gz
+M'XL("&3N+50``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5.V^#
+M,!#']WR*D[IE0'YCED2*FLZ5JK8SI2;*D';IT($/7QL;XL.01V5,B-'A'_][
+M^"#$'P""`:EGKLN&;E?@T:W6JYY&V_N`4D*=`E\ML,<QIZ\2T`BPL\D)O.UG
+M-#%T13BVX7_`46M,06'5HF'$%2,NN"LRQX^1BT+N5UB:S`IUKU"6("1(!9K=
+MJO!]_S91Z''94N)Q[!IN$!R*9P:WC7#<&MOHR;C8H*'`3;B)YQ%NXW\#3EQ2
+M9R-!S)QAT5F9MUBT'7A=G&>@!B@'HH.-8>"87SCKJU(9#+E[01^D[M8.5^+G
+M:81C5]P%C/MPN"B?*(57HK=)U369DT&G.^/&G>L@>.=Z',O;"*J^L]@*=%T\
+MN2X;NN<"#P\4`9@M@CI\W10'U8(RH*2;EP)4!:6.@0Q74M=\?YGFY_@;9]CA
+MJ&\&LZ=;S[C;+:H$5KN7J$\WC_0][`_KX^DPX(96-;Q8*!=T:2$B<5=C=Y]V
+M+X]3=3P-DD;1HTYGW/:LXRAZVQ@G1F>-Z5L@/9_H!AEF6Y7#23)9]=_<>IS*
+/7"KVP[OZ`WO*69D2"0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
new file mode 100644
index 000000000000..c3521af3e482
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-pc98.vmdk.gz
+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
+3@&8=S/Q'DR1?_!^)[K:L<6``````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.gz.uu
new file mode 100644
index 000000000000..50e4d02facaf
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.qcow.gz
+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
+F#'Z6Y@S^SC_PZ\\_WO_KZV#*@W_9*TQW7CF??_@_"8E_G;^F````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow2.gz.uu
new file mode 100644
index 000000000000..32a7f31e2dd5
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.qcow2.gz
+M'XL(",0[(U0``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YQ8V]W,BYO=70`K9C;
+M;M-`$(;O\Q3+J4"!DIW9=6Q.A1XB<8$$X@6(8_L!N$/*P[.Q-QE[/.--(J=6
+MI-3]/\VNO_ZUNUQV+V.\-2XSKC!-:<+G>(#I?1@>9O=K_?VF_]HM.IA=*JG1
+M"6M6Q1$W8/TC'&BX$!>^)>)ZTZ&`@T-J#$KAG#K=U`D!=[UHMZZ]&#E+X"7`
+M#J=>C(OF@VX^GG`7S@=SSX?R_OD+Y\/YY\-Z*L<'SU+S82.D5AHN3^&<E"HT
+MW":)LT*JU'#;)`Z$5*7AZB0.A52CX&Q2%>>$E-5PD,1Y(84:SB5QF9#R&B[I
+MG5L)*<T[F_8N%U*:=S;M72&D-.]LVKN-D-*\LVGO2B&E>0>*=X9P6R&E>0?,
+MNR<1]Y1PE9#2O`/FW;.(>TZX6DAIW@'S[D7$71%.Z#O0O`/FW<N(>W7$>2FE
+M>0?,N]<1=TTXH>]`\PZ8=V\B[BWAA+X#S3M@WKT;>>>%O@/-.V3>O8^L)>&$
+MOD/-.V3>V8@#P@E]AYIWR+S#B'.$$_H.->^0>><C+B.<T'>H>8?,NU7$Y803
+M^@XU[Y!Y5T3<!\()?8>:=\B\^QAQGP@G]!UJWB'S[G/$?2&<T'>H>>>8=[<1
+M]Y5P0M\YS3O'O/L6<7>$$_K.:=XYYMU]Q#T03N@[IWGGF'>/$;<F7#/K_:>C
+M^W<KO.LG)H#Y^4#UCV/`%;,NV'<+#AN]`I/Y_1&4\+B_DJ&3]@WC*A&X_EO7
+M=[\?`'_TYO-S/Q!XVK_E8(,48-[>CH.V?WZP?T42-S5?A]O,M=P.5YZ*"_4=
+M;NVKVM0UP_WIX;8S7PP[6FY]N//'"Y9K#\M%^N&F;;[0?PJN]\MVRW&T7&`I
+M^D>-E:8SXG35$5=NJ?-.V;U["3?Y9'O^WIW<?-7&E,$3:YJMCH/)(<Y6)<M;
+C8+AG"4_!XW?]Q.[GS?"K`[H(G&W"\(`67HO_;MD=L>$3````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.gz.uu
new file mode 100644
index 000000000000..941ae5b49fac
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.raw.gz
+M'XL("`;&'50``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YR87<N;W5T`*V206[#
+M(!!%]S[%7W=A,8!MO*J45ME5JM0+U#9P@*PY?$AP0HRQXT0>T`AIYC_-%\-8
+M"$#6:#CJZG(E1R4@)00'A']I^);DPAU/QAS^OKGX*:_AB@`C7YSWCZK%@BN3
+M<,7'"%03':T#%5@+QK/`@&NCJGV*6YLOX+J][`9<OQ57^ZRA#8Q)</\/N&'G
+MSZ"970,*#_&&7;K9%;'9VDL6=@E'$?>9XJ)=GJ@XHCXS';+3Z3NN'R#%5+5J
+M]BN',[NN"MFM.-VA]WM"L,,RCJ\.\>JJ-%I=@97OZC)YN>!^R^D)P'X$[C4A
+.-4K5C!5GC7NA2P,%````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
new file mode 100644
index 000000000000..7c4a413cb062
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.vhd.gz
+M'XL("`;&'50``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&0N;W5T`*V6S6[;
+M,`S'[WD*`KOU8,B4+-NG`NO6VX`!>X')MEP4P]:AW:&'//Q(6XXE?ZU9F0B.
+M#(D__2E1#)4:/P!6@^W!>K`%]TL#MH:R`J#!T'!XYN$5SNW3+]_^>7S-PN=\
+M&F&YBJU2<[9'#886*0$=+V([[L-YPF0?/C_<//Y\F'`8<-/"QH)!*`AB%NOD
+M4*F+.B;=?_SV::E.+]7%5ORCH>]!]]$,':O+LML89\B*YG.ST(\RIY:\)`,Q
+M+E%7J(55I'1K4R-GMW#VR.H:W,TIG,48*A08)3T5V!Q*Y#Z%S;0/JT:A\OKR
+MVSV_^(4^W`D5>]&7K\;:?7<QA`I.DX,"BN7FT%T8*#^6N%6HO'/W;&IGTDV*
+M7\89M#NJV'?7SKN'TZ91(]6J/#J,;/!7K7"H#JR.<#ON.G:7;BL%"">58KZV
+M&@$T];K-_;M_]IXN+NHOB3ZW$RS_?1RN2NS^<=DJ4#4GL=WC</5L5;__[CHG
+MY>Z(:]Z*HYRA.N@\>+_`?8]PK?!A-"MW_1#_:DB_5[O;3.[J>?)XKRBS[^"B
+MO'R[Q+7)58L;PFR_H0XVU7477-."T:G5H;-W6S@O&BI-_U9<YZ"A.,FA/\C*
+M[:&(:T,%0UX12U0HK5!WE>=A^BM7;N.Y/W#^FJ7?$6B"0C&7"2BKT`:@F$)+
+M1:2HPK*K4?24JZ!0J&YFG&#=S#C!NIEQ@G4SXP3K9L8)ULV,$ZV;"4BQ=_H+
+(%O'FLVP-````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
new file mode 100644
index 000000000000..d5ecd33a2377
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.vhdf.gz
+M'XL("`?&'50``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME+UN
+MPR`4A?<\Q9&Z98C,C[$]1>I/MDJ5^@*U#409VDI5APY^^&*P8R#832-CA(C@
+M?)Q++C?+7`.X0$$A\KYSBIR!<S`*,#.3,%NBCN[PI=3]ZR-ESSO;NHV#$;-X
+MN7]0S2YTNZAUF^T`+`,=60:6R"ID-`ETN&I257_BEOPY7+U6N`[77(L39I20
+M"DI%N#</UZ[\9Y"+<!6(F[`;PB5CN&S:K'4_,CV'(Q-N'^.F<&FDHICT"7=(
+MNI-G7-."LU"U&.Q#"J=6316BK\7)&HW)$P+=SN/HHHG_IDHA2PO,S:XZ,<XO
+M="^[\'/`9@"NY9"40^43#$)#*%O\&`H.4:$H?2`-\@9=^_FAVN_3CW>#%M=7
+M/I.]R=[KJ:FEYI`"M.X/$;*?>_[NGH[;T_MQQ-$AJO%@4Z//I3E^$F48[L$4
+MYM@=BR_)5[DW:'PR'3X:__;V/HZ?@S4%2#?6YMB#'\%"*OLL+L\BU<UOP^+$
+/RJEB<F_S"YNC6FHN!P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.gz.uu
new file mode 100644
index 000000000000..06f3b92e8b97
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.gz.uu
@@ -0,0 +1,83 @@
+# $FreeBSD$
+begin 644 img-63x255-4096-vtoc8.vmdk.gz
+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
+H_/^/2K\`KOZ`R__OO^"_9VS_6P$U`IJ=4/U[HRR_^A][EZ;PS5\`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.qcow.gz.uu
new file mode 100644
index 000000000000..d0370635c7fe
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.qcow.gz
+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
+K]_NMSV](YW>>P#_Y)[[^\N;^?VX'FS3XF[UA<[[^!I]_^C_<Q@LX=*8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.qcow2.gz.uu
new file mode 100644
index 000000000000..290ead46a7b4
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.qcow2.gz
+M'XL("*H[(U0``VEM9RTV,W@R-34M-3$R+6%P;2YQ8V]W,BYO=70`K9A);]LP
+M$$;O^15,]Z9-*LZ0E-P]FX$>"J0->@Z\R$"`+D8:H!?_^%+6R)2I&3$VY`A"
+M#.)[&`^?QZ:SK'XH9;4R3IF16DR5?TX7J-:3[4NMOHV_G+0?JX,:IC,AQ2P8
+MW."V6.<!!Q(NT]T%S>-:U2&#@R;5!:5P1JRN;X'!'1VL6[?>C")*X#[`&B=N
+MQE[U05U?G#![U@=#UX=\_VR3BQ=<?WU8UQ>G<@E7)''`I$82;I+$(9.:2KA9
+M$F>8U%S"E4F<95(+`:<3JGB<8U):PD$2ES,IE'`FB2N8E.2=3GLW8E*2=SKM
+MW81)2=[IM'=3)B5YI]/>S9B4Y)U.>S=G4I)W('BG`JYD4I)W$'EW2+A'`;=@
+M4I)W$'GWF'!/-CC-I23O(/+N*>&>!1PS[T#R#B+OGA/N1<`Q\PXD[R#R[B7A
+MC@*.F7<@>0>1=Z\(]SK@F'D'DG<0>7?<\4XS\PXD[S#R[@VQLH!CYAU*WF'D
+MG28<!!PS[U#R#B/OD'`FX)AYAY)W&'EG"><"CIEW*'F'D7<YX8J`8^8=2MYA
+MY-V(<&\#CIEW*'F'D7?O"/<^X)AYAY)W&'GW@7`?`XZ9=RAY9R+O/A'N<\`Q
+M\\Y(WIG(NU/"G04<,^^,Y)V)O#LGW,4&!UQJXUV6\1?A+COO61CV^Z<)WX\U
+M<Y<7>H#%+L"^"FO<:-`7;.L7['?`0CA'9>M/R*(7>/F]PAQNUV>'/A#86A@_
+MF<V\DT/IP.<75E=?F?[96AC_=O#3U%]NIIQ]4'VGR^7/DL')I]O=CU,>A]WJ
+M[&+]OY<E!Y4;Y49T=POERFJ9JKM93N[N;^]O__R^:7#5!Z2;5^%\E^I^399L
+M=7;@O34/W-MFJ@`!M_=6-?69H=TSZ^UP5>/]1OC+CTN+U93S7S.4M=6:Q2YP
+M?%>69]<7QS_&U^W^F6%_;+#^1)7N'[3Z5[])VOU3[?K<T/USO?W+4>4YXV;H
+KW]]_M8A-?4/WKZ#^^9-Z]RXOK*Y.MO]JH"'@8!4:5TWG@_\+*`W"Y1,`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.raw.gz.uu
new file mode 100644
index 000000000000..b47d4c617b0d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.raw.gz
+M'XL("/7%'50``VEM9RTV,W@R-34M-3$R+6%P;2YR87<N;W5T`*V3S6K#,!"$
+M[WZ*Z;50(\DKJ3FFM+D50D//P=0.!-K4I(%>]/"5(HG(/PDN:+T(BV4_QK-K
+MQGP`)"$%F$T64G`PPN4^2)B7M]+&71G#%![&V8VNZ[AR$*:X]T#ARI*!FE%?
+ME0)YOV#6KT.@QSE]Q*&92_4!)6?I6W;=9SN!$[D^U^.JL3JY.[]S0`MH@EJ$
+M4^V@6E<.ZK9=?3SM3_OOPS;BR.)4XYKU?]1]U=VD.IEYMC1SMA27,@#[LT74
+M1[EWC\[C4,YX.PB;)"`K$$$T5KAT-7L?`5?'MGW:/#^\KS:I?T29]:D9_HG$
+M/_^3I/XAU:=R^Z=N^J<K:#VQFQ?_?G[](D9]N?U[#/ZQ>N*\7C#KLO]X(`5@
+/-H4D'+#X`^%)]I"G!0``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
new file mode 100644
index 000000000000..68c383866a79
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.vhd.gz
+M'XL("/;%'50``VEM9RTV,W@R-34M-3$R+6%P;2YV:&0N;W5T`*U66VO;,!1^
+MSZ\XT+="@Z['W=/86/,V*"M[;HTCE\#:AB:P/OC'5T>76HYES\WD"$5&/I\^
+M?><B,>8?`)2`+:`!U#2N%.`7J*X![&1HPO4\O$+7O#R;YKA[6X>G6WDPSE*K
+MH3G9"PG*+E*!J&D1W-(8N@BSOKAYO-P]/48X$>#BP@I!"=`61(W60?;!CI`V
+MW^]^.,B'GIT<L^NM_%_;@FR3+V1D]^#ZK^EFE;6RWU.K0&I',[;!RV""X/0Z
+M>2*<9B=6"<V<J,EF<W`X9_49N,M5\(4/%1L8E>VM=!PJ06,;-E&'4;.A\G;8
+MUZ\'<\)/3(0*?O#CHSDYO5T10D7$CP,#1>$\MUUP*,=3N$RH_)=Z.+1386!%
+M8#I."+?]H7H]%*3\D+,9S:>=,<FO)GXV-;6(R>Z:_->&;WX1##MU1SWAW;/U
+M:VC:9HC:YJ*B?^'#B>[V9S9<&N*G.(4Q17)#,;R$W[?]_H_)P(E2V_5P<LQ.
+MMR'G7-+Y$NUZ7[IU&]G=VVP[[HZ[E^?["$>%BDJM0US.[JG>9]GIPKXU"WT;
+MDT8$P*%O(?(SI6//.'<@"4\GI.[/(+&UQ#7-V?<1X.;5&'L*7?W>W*7Z&566
+M'V<+]!.)?CY)4OW2VL*G#O'S^<WJ1X=)E8G-7K_#7Q^(D5]I_430C]69?GJB
+MNUT/?QY0A&):K#J+OOJ58:@"8#&&JL_A4@PYSCKSLU[&P+#051>GJ\PY5UV"
+I*WC5Q5"R)JW\W]*K+H:25>BJ2W`%K[H$5_2JBZZ@KMX!;=,CGA\-````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
new file mode 100644
index 000000000000..6096dacbb0a9
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.vhdf.gz
+M'XL("/;%'50``VEM9RTV,W@R-34M-3$R+6%P;2YV:&1F+F]U=`"M54UKPD`0
+MO?LK!GH3&I+=R<2>^D'U5I!*SQI,(H&JP0KM(3^^^ZF[211;=AV6#9-]OGEO
+M=Q+'>@!@"BF#6$1L@JOY_-P):*?OD1AQ9$<[TF#)M5V7X:+.:$=C#<AD.HT!
+MB]X^[@(F?J*=OW4!-9SDAPEDL0Q:`Z4W\7MNFL]R`(Z%*E?#\3Z[M%+K!"!C
+MD"'0@YFI`BIEVK!;-OGA6!_K_6YIX5#`42$W9W]AM\V;079I8&_Q1F_1+)@!
+M]+T%RP]#GSU4=I`47A@A`AFD'!"!%8)X*G/BN0<X.Y3ER^+U_F.V</5##,R/
+M;M"/.?KI2^+J!RX_"JT?7=4OXY!E`V?SK-_7MSZ(EE]H_29&OS@?F"\GVGGD
+M_S0@&L!@#,ET9^+FKDL1N>T!$Q>0G>U5@.O]KEP?ZQ_W!I/ISE4U''(_X_);
+M0!FP7+680JX=?G?3S;C>;BR<[7[VCX77)XN[59)?[DP8K"!79W:\+Q)UU!,\
+M>>45;MBMU/SH%HNG8LL*4-.TX3UX"0GWY)NAX53W<U_^K[<:C@(?%?&A'/T"
+(P78/5M('````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-apm.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-apm.vmdk.gz.uu
new file mode 100644
index 000000000000..89cfd3eeb457
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-apm.vmdk.gz.uu
@@ -0,0 +1,83 @@
+# $FreeBSD$
+begin 644 img-63x255-512-apm.vmdk.gz
+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
+)!]R'M=*37@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow.gz.uu
new file mode 100644
index 000000000000..97e3920217cc
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow.gz.uu
@@ -0,0 +1,126 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.qcow.gz
+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
+"````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow2.gz.uu
new file mode 100644
index 000000000000..3663da0f939d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.qcow2.gz
+M'XL("*P[(U0``VEM9RTV,W@R-34M-3$R+6)S9"YQ8V]W,BYO=70`K9C;DM,P
+M#(;O^Q3F#`N46').'+:PL,QP!S=PW7;;I^CP[*QK)4H4*5XZ:3N9Z;C_-W+\
+M64E:%.GE7.E=J%QHW7'G[K_3!]S@R_CC3K^^_U@/7Z=5@OG"2"D#]:''C5A_
+M&0<6KO#3`:_C!M6A@H,N-07E<,&L;FY`P5VMSJ?NO!B-2.`EP(0S%^.B^B#5
+M)Q/APOI@Z?I0/W]EEY,#U7Q]F.J3J=K"-5D<**G6PFVS.%12.PNWS^*"DKJS
+M<,;.'>!*)74T<#ZCRCVN4E+>PD$65RLIM'`ABVN4E.6=SWO7*BG+.Y_W;JND
+M+.]\WKN=DK*\\WGO]DK*\L[GO;M34I9W8'CG&'=04I9W(+Q[1+C'C#LJ*<L[
+M$-X](=S3'N>UE.4=".^>$>XYXY1^!Y9W(+Q[0;B7C%/Z'5C>@?#N%>&N&*?T
+M.["\`^'=:\*]89S2[\#R#H1W;R?>>:7?@>4="N_>$:M@G-+OT/(.A7>><,`X
+MI=^AY1T*[Y!P@7%*OT/+.Q3>E82K&*?T.[2\0^%=3;B&<4J_0\L[%-ZUA'O/
+M.*7?H>4="N\^$.XCXY1^AY9W*+S[1+AKQBG]#BWO@O!N0[C/C%/Z7;"\"\*[
+M+X2[89S2[X+E71#>?27<MQX'6JKWKBCT#^%N)WL6EKW_#'Q_[)6C/3`#;/X'
+M.%=APK6+3KA,$XX:;)6C/7"Z68_?/?"\PF4=5[6L7`,/K?#/[>_IA,L%5SCA
+M[,=1&N@*[K?@!+<9X.(5[3CXY7`=W=[S]A\2![CKQ.MPLX^C\1[[H`V8DRT7
+ME@4:D1NN<[RUBW?@77<7MV;]^CJN3Y$91M.=J<]-IQNO&OW3G5B/B(/,=-T8
+M%Z\:8E_R$F;.WF9:W7[AQ4"Y,QZX<R-DO',3#I9M!)#^ERKBKZ9'>^#T<SU^
+5)V`@X&)G,%2Q]ZW^`:W<QSE#$P``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.raw.gz.uu
new file mode 100644
index 000000000000..31141a5727ec
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.raw.gz
+M'XL("/;%'50``VEM9RTV,W@R-34M-3$R+6)S9"YR87<N;W5T`*V4.PZ#,`Q`
+M=T[AN4.4;TD7*E7JWJF=*853Y/!-@!2;$.@0!R(BVT_^X'`^"8"6P-N-/:]P
+M-T:7JT[52),!:&K0!LP9K#?GRT,.1.%>]R?#XF:<V//*X]A*(DX>X6+`:LCA
+MK@BGO')`EEP@KTZ`ZN<#_D:X9GHC3N]%YRO!^RU%-EE3JG:QMW;EA_L,H@>A
+M@-M9)RGPUU]8XKND84B2[DY\D*;;!EQ-[07"R8-T@>+>`8?Z25IX4+TFC:XK
+MW`RUGHP_)S=`Z.1..%GV(I#CS>+_0&^5[GF%>S"Z)J">@<4J6'^L)U9?N.5M
+%L04%````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
new file mode 100644
index 000000000000..2e7c6573ef52
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu
@@ -0,0 +1,17 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.vhd.gz
+M'XL("/?%'50``VEM9RTV,W@R-34M-3$R+6)S9"YV:&0N;W5T`*V7/6_#(!"&
+M]_R*D[IEL/`98W=IHJCI7*E2.[O$CC+T0TV'#/[QY6R(#W\E;;$)PH)[>(\[
+M$!&B?0!4`JH"58)*J9U)4+>0Y0"FTQ9LZMA^0JT_WDO]?3A%]JD7+2P6W,HW
+M)WM,0)I),L"")E$[:D/M,-'-=K\\O.T=#BW.32P52(340.1@GER<U1'I8?-T
+MWU>7#-5U5NT\505)Q48D7%T4K3A.&BLSGHJ"2C8R7?$^O`Z.\]2EHF?%9(XM
+M*G-V#*?FK'Z#6RYL+-I4,8F1F5J`BB%#:INT<>LP*"953L?/XNM8]O3A1*HH
+M%HQ^GYQV%VVJH!ML%4@2..<N-)1C'S>2*O]:/>7;2=LPBR!2UX&-^_[J=2C@
+M^E0L9M9\.AB3^@K29_:6*$;JZ8YZ$_GO&:@)F&:TW5,%.5Z[@B_;Y['XZHET
+M^>/NT'@)YP3ST\#'K1@N:</145CR@HXA*;MO.8*[,[]UAY-SZBAGRK&.26?3
+MP,FL\YX=CS/$)<0)B)QE-0.>XPN=OMNA#/3<G=$'0W<+PF7^^)CA\(*[X.->
+M[;G,!G<AO+!ZZZ$Z'3@8N_[.N'+G$L3?N2T.PQX$V)PL)@/-J&$]W5$_1O[;
+M`M$>5<'./G1'52B%T@*#*33`,K!"+&>3[;=9J*S"0!=)P@6\2!(NX$62<`$O
+=DH0+>)$D7,"+).&"7B25^8L@Q.('-E=QRWT,````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
new file mode 100644
index 000000000000..c102a9fd6bc6
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.vhdf.gz
+M'XL("/?%'50``VEM9RTV,W@R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#M/PS`0
+M@/?\BI/8.D1^QUUH55%F)"280W"J#L#"P.`?CR^)&U^>",5VHEAW]^4>]C'6
+M#@`E@)43[WF!/^5T^FR7-32!0%V`TJ`-V*#.^D4V1.!?SR]Y.GR'XTM6\[A\
+M,").K.&BP[*>PQT2G`S".M%D/+&J.$C7[]4$[CX\QQZGEKP+F6!N2C`;K-XJ
+M=[&V=F"7UAFX`RZ!V4XF*/!67^C]VX_=$"3<!?]@'&Z)N(+J\P0G5L(%BGM#
+M'"?*?0E7LG<<>U=M7`PYO!E_O+D(H3>WQ8EM&X%H.DLX@4%K_)X7^*><SA:H
+M.N!F&;1=[S,23`W&@='X72@P>RAL"A3T)/GJZ]-5W]>?M,*(XVTSF%QH+R3>
+M%E.`*/$GYAV_$__NSI?=]>,2<;%5Q1\K@TG7`:)&X5H:[N/I^6'HG1PGR9+L
+M<?0S;7LA<)*]0XI3MV"=:UH@[Q?9$,%DJT*<9@.K_]:VQ9F-CTHX?-DO_`G/
+%>S`'````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-bsd.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-bsd.vmdk.gz.uu
new file mode 100644
index 000000000000..79b142eba461
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-bsd.vmdk.gz.uu
@@ -0,0 +1,81 @@
+# $FreeBSD$
+begin 644 img-63x255-512-bsd.vmdk.gz
+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
+FSEW3G6T;0;5TEG7X?_OW_A/7;T_;_]:$Q9+PB_\#AU-ESJ!=````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
new file mode 100644
index 000000000000..39509f6ce742
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
@@ -0,0 +1,128 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.qcow.gz
+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
+@Y[_P]1_O'_YU-]BDP3_M!)MO])W/C_X'"T=/.U"H````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
new file mode 100644
index 000000000000..71e3879fa9ec
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.qcow2.gz
+M'XL("%+N+50``VEM9RTV,W@R-34M-3$R+65B<BYQ8V]W,BYO=70`K9C;DM,P
+M#(;O]RG,&18HL>2D"8<6%I89[N`"N$Y/3]'AV:EK)784*=YVTG8R[;C_-W+\
+M64U:%.%A3&F-JXQKS&%C3I_I!2;Y,'R9XZ_O/Q;IXW@38+904L+`<M_C!JQ_
+M$0<:KK#C`2OCDNI0P$&7&H-R.*=6-S4@X&YOSJ?NO!@U2^`UP(!3%^.J^B#4
+MQQ/NROI@[OI0/G]EE^,#U71]&.KCJ:6&J[,X$%*-AFNS.!12&PVWS>*<D-II
+M.&7G)KA22!T4G,VH<L)50LIJ.,CBED(*-9S+XFHAI7EG\]XU0DKSSN:]:X64
+MYIW->[<14IIW-N_=5DAIWMF\=SLAI7D'BG<FXO9"2O,.F'>/"/<XX@Y"2O,.
+MF'=/"/>TQUDII7D'S+MGA'L><4*_`\T[8-Z](-S+B!/Z'6C>`?/N%>%N(T[H
+M=Z!Y!\R[UX1[$W%"OP/-.V#>O1UY9X5^!YIWR+Q[1ZPBXH1^AYIWR+RSA(.(
+M$_H=:MXA\PX)YR).Z'>H>8?,NY)P5<0)_0XU[Y!YMR1<'7%"OT/-.V3>-81[
+M'W%"OT/-.V3>?2#<QX@3^AUJWB'S[A/A5A$G]#O4O'/,NS7A/D><T.^<YIUC
+MWGTAW%W$"?W.:=XYYMU7PGWK<2"E>N^*0GX1[GZT9V'>ZT\7KX^M<-0')H#U
+M)<"I"@.NF77"9=@;%P+E"0><WQMA,FW9F6S)9\IO;=P5:7WK8/,JQ>WFGN[A
+M,F!9FK8=`7]W]<%D&9?7M]S[8;\K6^&H#QSO%L-G!ZS#OP-+O\G*RM3PT`K_
+MWO\1UK>>[X8OX/1_!VB@*[COB"/<.L'Y"XQ#\LUT6PV\2]\GN-4B=N83;O+?
+M`7_+LY<&U,F6\\I2][VEMS599W^E[6^(NA];=J7<KZ^)]0F]!0;3G:C/C*?K
+M?\3[FVVV'AX'F>F:(6[3=Q9A"3-G;S6N;COS8EB^,QZX<SUDN',##N9M!,VY
+CLYP,/'UK?-0'CC\7PV<`.@+.=@9=Y7][;_X#6VG_\](4````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
new file mode 100644
index 000000000000..019b4879553d
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.raw.gz
+M'XL("%+N+50``VEM9RTV,W@R-34M-3$R+65B<BYR87<N;W5T`*V4S0Z#(`S'
+M[SY%SSL80)GLHLF2W7?9=D:G3^'#KQ5U(/B50(5("K_\2PN,F0:`/?BM._IT
+MT?KDD@PT7I\'\B#0X!K:Q6F9EC1F'4UIG'$-SMN`O@H-6VGCOK'#[<X!I02M
+M/>!KTB<BIZ-HR9T+8#HPKCOZ>^K:!%1#P<@"<@GR"DH<5?AYO`/Y58S'"MC@
+MQ!YN$FPJ*(2K+%R&SLY::2IQW&77G?UOX4K3)UR^I0Y/@K4AQVJP,FZQ*#1W
+MGYUGX"WP#)@:?<(%SOF%O[Z;+T,XX6[H`S]<3;C"7<\MG-@)%UQ</;\L@13N
+MG%[IJVLB)X,O;\;!FTL0]^8:G(C[$-R&EP4K$%?YX[JC?Z:N&6`^`J.=(+U\
++C"4_RQ*HU^4&````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
new file mode 100644
index 000000000000..eae437d6652b
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.vhd.gz
+M'XL("%/N+50``VEM9RTV,W@R-34M-3$R+65B<BYV:&0N;W5T`*V736_C(!"&
+M[_D5(_76@X7'@-U+(E7-GE>JVIZQ:U<][(>:/>3@'[^,@63P5YJ6F""L81[>
+M@0$+(=P/0!>@.]`M:$7M4H*^@[("L$9?<*AS_PI]\^=WV_Q[/V;^UV\<+!?<
+M*W8G?RQ`VD%*0$.#Z%=J0Q\PV<W^[?;]UUO`H<>%@:4&B:`L1$[&J<1)'9%^
+MW#\^C-454W5G+S=.UT'1L1X%5Y=E.XZ3ULOVIZ*ADX/,4**7R,!QD3HE1EY,
+MYMRDLF#G<'K-ZQK<[<:OA4L5FQBEK07H'$JDMDV;,`^38E/E>/AK/@[M2!\N
+MI(IFBS&VR>5PT:<*ALY>@22!:^'"0#F,<3.I\JW9T[&?]`T["4(%`P[AQ[-W
+M1@'7IW.Q,N?+B[&HSZS&]86`Z_IZX,KNJ!N_.P08137MTMSO5>_?V/=V1M_.
+M;=LMQ[VF#K>[#J@4&#,!/@5]3>+EJ"HRV[-3F)EZV=#?9_%S`@X)HTHZSI6&
+M"C^K\&7_/+.^E5DX#JX/V.'P$BX(YJ=]C-LQ7.&V&T_5LQ?/.]YFN*W[!YQ<
+M4T=G0CMG6`Q6)4X64XW\^#I#WD)>@*B\#6/@:7WAK.]N*@.C<%?TP31<0[@R
+M[I\S'%X(%V)<?3I99I;PPNQMI^J:Q(M1CW?&)W<N0>*=ZW"8]B`PP\EB,]#V
+MFM;+AOYG%C\.B/Y3E.S;AOXP3:90>F`RA1;8)E9HTGX_M%>8Z*)`N(07!<(E
+CO"@0+N%%@7`)+PJ$2WA1(%S2BX*V5T`A-O\!]-GJEUT.````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
new file mode 100644
index 000000000000..edf435474725
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.vhdf.gz
+M'XL("%/N+50``VEM9RTV,W@R-34M-3$R+65B<BYV:&1F+F]U=`"ME3MOPR`0
+M@/?\BI.Z98@``R9+(D5-YTI5V]EQ<92A[=*A@W]\.6,<SL9Y5!B,0`>?[\69
+M,?\`N#?9YP7M:O2TB^6BH_'#_4">!'I<C:<X;JL4CD6#2QP'7.W6-J'?UC7W
+M;&+<1VYSF_N`2D%538"O03^1.1RE1;$4P*K$."]H=RO:`M!T":-*D`J4!B-N
+MU?!]_Y:(KV$\E\$>)Z[A@L(^@U*X;80KG+")=OI,[$_%>1?/(]S&OP$G+VGG
+M/,%L2C!KK,J;+,8U>BZ.,W`+O`!F>IF@P"&^<-9O/55#$',OZ`=3<RO$E70_
+MCW#BBKE`<8>ALB1">,5[FZEV=>9@\/'-N/'F(H3>7(\3>0O!NJLL+@/=KNDX
+M+VB?5[1YH.R!V3QH^G^;+D`WH"UHA?-2@EY#:6*@H)G4UM]?MOXY_<811ASW
+MQ2#9\;PH\+;H$D2%']$?.(_T>]@?EZ?/8\"%4A4^+#4Z73F(G)AKJ+E/NY?'
+ML7;%U$F&>(^CGG'9<X83[VUCG!R,M;8K@?S<R8((DJ4*<8J-3OTWMAZG,Z>*
+-^^\N_@`\0K'N$`D`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
new file mode 100644
index 000000000000..ada1aea35e94
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-512-ebr.vmdk.gz
+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
+6P$L$-.O@)?P>D>R+_P-J-:`0'F``````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.gz.uu
new file mode 100644
index 000000000000..4753ee6b9f3a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.gz.uu
@@ -0,0 +1,132 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.qcow.gz
+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
+7+^+GN4?](MX>AAN9_O;_@'C+'O6L````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.gz.uu
new file mode 100644
index 000000000000..26ffd0b9f976
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.gz.uu
@@ -0,0 +1,26 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.qcow2.gz
+M'XL("+`[(U0``VEM9RTV,W@R-34M-3$R+6=P="YQ8V]W,BYO=70`K9A+;YPP
+M$(#O^15.WTT:BL<VC[Z3-"OE4B55>VL/+(]3%:EWVM]>C`T&,P/)UKMHE<B:
+M3V/SS=@0Q^;#F.),)DSFK-FS[G][`9O\,[]8>[N[CJ:?]LC`>$Q$(0-2C+@9
+MZ]+A@,+%?#G`<=PD.X'@8(A:@K9PDLQN;0#!G1SU2]??C,R+$(<`#8Z\&0?E
+M!R8_/T(>F!^$SD_@ZZ>&.'\@6<]/F/S\J)3"99LX0*)R"E=LX@02M:=PY29.
+M(E$5A:LW<0J):@@<WU"EPR5(%*=PL(E+D2A!X>0F+D.B*._XMG<Y$D5YQ[>]
+M*Y`HRCN^[=T>B:*\X]O>E4@4Y1W?]JY"HBCO@/"..5R-1%'>@>?=L<4]<K@&
+MB:*\`\^[QQ;W9,1Q+(KR#CSOGEK<,X=#^AU0WH'GW7.+>^%P2+\#RCOPO'MI
+M<2<.A_0[H+P#S[M3BWOE<$B_`\H[\+P[6WC'D7X'E'?"\^ZU9<4.A_0[07DG
+M/.^XQ8'#(?U.4-X)SSMA<=+AD'XG*.^$YYVRN,3AD'XG*.^$YUUJ<9G#(?U.
+M4-X)S[O<XMXX'-+O!.6=\+Q[:W'O'`[I=X+R3GC>O;>X#PZ']#M!>2<][SY:
+MW">'0_J=I+R3GG?G%G?A<$B_DY1WTO/NTN(^CSC`HD;OXAB_+.YJ4;.`]#N9
+MW!.W6^+HAY5#CK/2';<Y\DL/K`"SAP/)O5::<TJX"2LS86U5@?S2`^U%-/^.
+MP+YV'P`<,ISC[(25J5WSP%C7K&GL95;*!F>3`P(RX>-H@JL"KU]?;@\`*L6*
+M8@'\/N37EUM77^;=0&>WZIN!`J;DB.OGJLII?E>[:W9S_O6;AOUPT^W+3>-J
+M_;!4)%YVG)KNU1?$/F7*+6W\U1YP@L*-QS(/IX\7:;6"PR[6_B%P<BUJ?.EP
+MCWMK<"J>1TW;%LL4RX`E):L*$O=KADL"FR?U\#YA:<F26K]/*AO]1Y7HIS26
+M=65BMFWHSU@Y2[D^NW7`]NXVNC.PL^CWJ<U/<FL$=M$#U.I)6#-")[4Q73;'
+M8:^1_FOU=%_>JV"KEUM9L(L>(%>O,*N'+Y)."BV9=EBUH>`&W#[PZB5ZN*N/
+MKG\O?^F!]B::?PU06F"P#&72E`&K0^,"5H?&!:P.C0M:'1H8L#HT+F!U:%S`
+MZM"XH-71`>LXW":N<=J]/&.J8KED335/@]R.V^@G.MT:UK;^E4T<OQEUP$U<
+BXU8W\;0F)VL_?[W)!MS$-2[H)BY3??P^^@=.=Z`2%1H`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.gz.uu
new file mode 100644
index 000000000000..2a259cb9f7d3
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.raw.gz
+M'XL("/G%'50``VEM9RTV,W@R-34M-3$R+6=P="YR87<N;W5T`*V534_#,`R&
+M[_L5WA5$E*1)FIWXD$#B-A#<N/1C/:%)W,M_)VX:UG9Q89+3J*KD^JGM^*VE
+MC`O`:)!5YDX;^@<QO_K-U6:@J?HR8/@^AK``B@",N"88I<9W#@?HNG%+-7A%
+M9VE!J_0\XL1I;<4$UYZ\SC9MF.)$Q*5TN\N`UD)5G0'?4WQZ.`X+QH'9@0[O
+M2S`*K`9K?G%#KK:9QO?X]`S[^]<WA'V<TM4J&%4#1D)30MLMHE-DNG?+="-.
+MHY=95COA"A*WS>.*>+8T+K=IG%GSBCWTO[.-."OG7G[JY2UX#:Z!MB)QGS.<
+M8^X\@^;:0=F`.X!5T'3XT#I0*L079.('2*AO"W('I0)=([`_OHACA-V(K^LQ
+M/J/&CLAMVD!5S^BUCL"@_D@7YKB"NWH>JV?9JK<;FR6W:0-9O2I6+U\D4C)]
+MJEI22,+5S-5S:`[Z"/_O\SMMZ/=B?D6@&8%L$8;F<XSJ0!RC.A#'J`[$L:H#
+M@8SJ0!RC.A#'J`[$L:HC`+WD&^*(&X:X@;*%MH!B.<2I<=R+;W&;2=?KM=&_
+F,L3SA^$9ASCBUH=X02:;UB)9QB&..-8A'H"5E)L?B^NWCH@+````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
new file mode 100644
index 000000000000..0473ed986b1a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.vhd.gz
+M'XL("/G%'50``VEM9RTV,W@R-34M-3$R+6=P="YV:&0N;W5T`*U82V^<,!"^
+MYU=,U5NJ4F-LPYZJ1DVDWM)';CT$#$0KM=M'<LB!'U^/L1<,-NDFPUI>D)F/
+M;YX>F;'Q`E`%J!Y4!TKB?2E`[:"L`,RB&]S.N7N$0?\Z=/IA_YBY:S@;P7(V
+MEPK%49X7(,Q'2N`U?D2U>`^#A\E>7]Z=[W_>>3CNX/R'A0+!01H0L?J.8D=V
+MB'1U\?6CA;R=V!5K=I/4^-?W4/2S-PK/[M;.[^?*"B-EWL=1`I/`Q#2"AV!A
+M4G9A.\D64C.:,:/.E(W!J2VI4^#.SYPOQE`Q@5&:V9@NAY+CO0D;;X?5,*'R
+M>/^[_GO?+?CQ1*BH([]\M5:DU>4N5+A_V3$0&,Y;ZH)%>5C"14+E1=93H9SW
+MKC&""1SWP*WZH?4F*)CS4SG;L'G:&4E^-?(SN<7JR)Q>&"ZR\'<$;)K3`+T%
+M0[BCPHU&^]DZTG631F.03(8M-AS"9O9K6F+_-OUI@%)"7:\`;SP_;=TA;<';
+M86"8XB!RD*;X3>%L=9=ZSN_RZA-<?_CR#<&^3^IJ#)>NQ0PR5;=O%^S6F794
+M=Q]+-LW'Z.-]5-DB"?<NFKL:D\V02L/%1AI.;$FYK>S_"ZF6+)2JYE*5A(J#
+MTM#62;@?`1QU7>YPN5%0:MS"90[:[N6M@CPW_$R:5!:$`S=^-QN[V84;!!P.
+MG[/#"/8V^_/&\>MR%Q&QD5Y(6:_C6Q&!I)Y0%T(XZKK<56@]26:]G0N6V$@O
+M)*U7C]:+&PE)Q5+WN*MEV:L0KJ&U7F[;1Y,?IGZOY_3"<)V%OQ&0NVV(;%_C
+MKI"2,10.D(RA</E+R#`7F\X\U<O*.86HPB`<885!.,(*@W"D%08!"2L,PA%6
+M&(0CK#`(1UIA%&TCI%PCQ$KK@`*:+J21;&D&[PC?<G@XOM4^;31"<6=0-D+J
+MJ4:H[Y+*^FNA+&$CI*@;(>4**=%9AO*-T)K#<\XRE&^$9A]^P5F&BC="SSW+
+:0#C"LPR$(SS+0#CB4,&^Y>P?_R=O5``3````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
new file mode 100644
index 000000000000..b9a9b8a1a58c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu
@@ -0,0 +1,19 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.vhdf.gz
+M'XL("/G%'50``VEM9RTV,W@R-34M-3$R+6=P="YV:&1F+F]U=`"METUOU#`0
+MAN_[*P9Q*R+8CNUD3XB*5N)6/GKCT'S8U4JP"(D#A_QX9NRDL;-VH,B)%7DU
+M\9-YQS.9+&/^`)`"6)>XY@W3=16?T^'JX&B\?QX0GT\N;(`5`CUN0",3=(\Q
+M8.T\&'>K_&(<-5OG#E>M!ZL"W!BNVHR\(<15'K?(M<\#*@5==P&\7_P3;CL4
+M2`WR"`+O9R`Y*`%*/N&<=C6$_MW<?H"[=Y^^$.SK*E=P-)H16`WZ"';<>,?S
+M<D\;N1Z'#E'TA4V*K;.X-]OH>5Q-N'$'EQIYG-Q;Y7/HW_;6XQ2+5[7AJE9!
+M*T`/,'99W+<(IPMGGB1SKZ$90!M0'`9+DU$#Y^@?EDGK(`($[OL1&@ZB)^!T
+M_EB=/>QU]?/5[)_D<T:D1MZ0BYX4>QE!3OU%+L2XNG3T6HJ>*A:]XYPLJ9$W
+M9*/7^>BE@T1.I4H7<7/4JA<QKB\</4UFK`]\?U]>\X;IKHI/#Y0SL)B'RMJA
+M8'40KF!U$*Y@=1"N:'40L&!U$*Y@=1"N8'40KFAU(-"P<DV<<"[W&K<!-?0F
+M=B/;CJ=E(Y9VN>#$7NO?:>+IS3`%FSCA=INX-5FQR[$16[")$ZYH$]?SY[?&
+MKS-77UK1O)'TL=:T(5"L.>.`PX^S&7Z=?H?1(QSW&9$<M%[4E)BZ`='10_1(
+M\\"_ES>/5Z?OCPM.S*J6!U-&8Q8C1%[(U;'<V^O/[QWR8?4N\9K2F^BAG[6-
+MA,_>/;CKVU"L?!)K+*!R)M<1_8@,R40FG$N5\.;_W5N/*YTJ^-?@\`>4./-P
+$LPT`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.gz.uu
new file mode 100644
index 000000000000..ea3a546f8163
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.gz.uu
@@ -0,0 +1,88 @@
+# $FreeBSD$
+begin 644 img-63x255-512-gpt.vmdk.gz
+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
+%E+1E````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
new file mode 100644
index 000000000000..e99d8f803f7e
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
@@ -0,0 +1,128 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.qcow.gz
+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
+G9OGVV^($_LD_\>4?[QY^OQMLTN`O.\'F*WWG\V__`[M'T1.AJ```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
new file mode 100644
index 000000000000..bea1353303ef
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.qcow2.gz
+M'XL("%7N+50``VEM9RTV,W@R-34M-3$R+6UB<BYQ8V]W,BYO=70`K9C;DM,P
+M#$#?]RO,'18HL>3<N+2PL,SP!@_`<WK[B@[?3E(KL:-(\;:3-I-IQ]49V3Y2
+MDV29?QF36^,*XVISW)KV.QU@HB_CPYQ^??^QBE^G&P^SF1(E#)2'`3=B_0LX
+MT'"9G0Y8&1=EAP(.^J@I*(5S:G9S`P+N]N:\=.?-J%@$7@/T.'4SKLH/?'X\
+MPEV9'RR='\KKE_=Q?*"8SP]]?CRJU'!5$@="5*WAFB0.A:BMAMLE<4Z(VFLX
+MI7(C7"Y$'16<3:C2X@HARFHX2.)*(0HUG$OB*B%*\\ZFO:N%*,T[F_:N$:(T
+M[VS:NZT0I7EGT][MA"C-.YOV;B]$:=Z!XIT)N(,0I7D'S+M'A'L<<$<A2O,.
+MF'=/"/=TP%DI2O,.F'?/"/<\X(1^!YIWP+Q[0;B7`2?T.]"\`^;=*\+=!IS0
+M[T#S#IAWKPGW)N"$?@>:=\"\>SOQS@K]#C3OD'GWCEA9P`G]#C7OD'EG"0<!
+M)_0[U+Q#YAT2S@6<T.]0\PZ9=SGABH`3^AUJWB'SKB1<%7!"OT/-.V3>U81[
+M'W!"OT/-.V3>?2#<QX`3^AUJWB'S[A/AU@$G]#O4O'/,NPWA/@><T.^<YIUC
+MWGTAW%W`"?W.:=XYYMU7PGT;<"!%#=YEF7P0[GY2L[#L]:<+U\=6..L#,\#J
+M$N!<AAY7+SKAW$^XTZ`1SOK`Z6XU?@_`<[%=`*QH!<<XFG#NB\VO3I/WI6&I
+M0&AZ.QO*+)[PQI?'>A7A]@NOW[D^+@#FN6F:"?!WGQ_,IG%Y?N5AX?VM_..&
+MLJO:O#`5/#3#O_=_ID*WN,4JV./TQPTTT"<\M-@);A/ANBN68_3+N$Y'WL6?
+M(]QZ%5I]BYM]W-#=0QVD`76R^;*R5$.S&FR-]KF[=._NL/I_;W;I/>RO"?D)
+MS0I&TYW)STRGVUT5#'?O;#\Z'"2F:\:X[=!9A"U,K-YZFMUNX<VPO#(>6+D=
+L9%RY'@?+-H+ZW%E:`]M?3<_ZP.GG:OSV0$?`Q5;0%=U_V\U_7_5L5B,5````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
new file mode 100644
index 000000000000..dc6c0cb6efe6
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.raw.gz
+M'XL("%;N+50``VEM9RTV,W@R-34M-3$R+6UB<BYR87<N;W5T`*V4S8Z$(`S'
+M[SY%SWL@!65E+DZRR=[WLC-GQM6G\.&W6'7*X,>80)%@"K_\2PN(W``J`^A7
+MQFW'\*5B&XJ/8J3IQSF@0T"=`!4!&=<2CA:03&_#6/;A-XS!@:&W]-]-<^XP
+M$$%=R:@U2N#^EEUIWW:,.-F>X?;G@-:"]PGP=]9G=F6<UU=WF?/KQH*Q-506
+M["<X\Z["^_?M12'C=*Z`&6>.<+-@KJ`UW%7@2G+V8B57XK1+UIV<"US#WXRK
+M]M3126"WYM@,UN8M%D<6[Y-Y!MV!+@'=Y#,Q<,DO//5=4ADF"G=''Z3A^H"K
+MX_5:X,Q!N!#C'LO+LI+"@]-K4G5MYF3HUYOQYLT-D/CF,L[D?0@NX\M"%4BK
+;TG';,?RHV!A83<!L)QA>/L3B'ZC")G7E!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
new file mode 100644
index 000000000000..251e27e9698a
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.vhd.gz
+M'XL("%;N+50``VEM9RTV,W@R-34M-3$R+6UB<BYV:&0N;W5T`*V72V_<(!#'
+M[_LI1NHM!PN/`9/+KA0U/5>JVIZQ8T<Y]*%N#SGXPY<QX`6_-MO,FD58P(\_
+MS,-""/\#T!7H'G0'6E&[EJ#OH38`KC,4'.LRO,+0_OK9M7]?7HOP&PX>5HIT
+M5CZ=YF,%TBU2`UI:1#]1&X:(*3X\/M^]_'B..`RXN+#4(!&4@\C%.D9,ZHCT
+MZ>'+Q[FZ:JGN,LNOT_=0]<F(*E57%*<4)]TL-YZ*AEZ.,F/)7K*.%)>I4V(V
+M*Y&Y=JC)9M=P>F_6+;B[0["%=Q7G&+6K!>@2:J2V<YMX#HOB7.7U_-O^.7<S
+M?;CA*CHQQKQ/;F\7@ZM@'!P42!*XMUT8*><Y;L55WG5Z.I\G0\,=@E"Q`\?M
+MYZ=W04&J3Y=BY\RWC;&ISY(^%UO"KM3;'<-#D3\3L&EN`QKAHR/'31MNVA`=
+M`JRBFJ*T#+$:SJ]U[]V*04X^;(_)^35/S/9M^MN`2H&U"^#7J*_=E7&[/F.8
+M[6M&AU$UI7.EP>!;%7Y__+82O\9NI(/_RW[&XC5<%)QF^QQW2G"5#[<+)4E.
+MF=^E[01W]/^(DWOJ*"=T:QV;FU7,SF+-;%YJ9R@[*"L0)O1A#ISL"Q=]]TL9
+MF&UW1Q\LMVL)5^?CRP2'5[8+.:Z9,LN*":^<WG&IKF4V1C./C#=&+D'RR/4X
+MY$T$=LPLS@/=J&6]W3%\+O+'`S%\BMB^;1B2*9M"&8!L"AVP8U9H>;\?.BAD
+KNB@0CO&B0#C&BP+A&"\*A&.\*!".\:)`.-:+@G970"$._P"C#]GF70X`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
new file mode 100644
index 000000000000..0ba75331f78c
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.vhdf.gz
+M'XL("%;N+50``VEM9RTV,W@R-34M-3$R+6UB<BYV:&1F+F]U=`"ME3UOPR`0
+MAO?\BI.Z9;```R9+(D5-YTI5V]EQ<)0A[=*A@W]\[XSM@+'S46$(PCIX\AYW
+MG!ES#X`4P,J)<=[0;+.P-8OEHJ7Q_6-`PX#Q")@AT.$JQ.$"E%DJ&O.:7FDD
+M`Z->X;OMYJY#@X1L@PV?=>;A#L.NN,\;6IS_7-RM'P,J!649`=][?>*JC,?U
+M%39Q?$V;,*H`J4!I,.)>A9^[CY%"A^.I''8X<0O7"W89-(7;>+@<C;6WTF5B
+MM\O/.W_NX=;NU^/D-75X$LQ.&6:=56F3Q6`+]_EQ!FZ!Y\!,9Q,A<(@O7/2M
+M8ADB</>*/HC=+0E7A.NYAQ,WW(40MQ\JRT0(;YS>.E97)0X&']^,.V\N0<*;
+MZW`B;2%8M94%,Q!7Q>.\H7G-PN:`L@,F.T'3?=MT#KH&;4$KFA<2]`H*XP-%
+MF$E-]?UEJY_3KQ]APG%7#"8[[1<YW19=@"CI3_2!YIZ^I]UQ>3H?>UQ?JOH_
+MEIH.72%$1NZ:T-V7[=OS6%T>'Y()3H^33K_LH>/!Z6U\G!R<M;8M@?S2@Y?`
+<,%FJ"*?8:-=_8^MP.G&JX'=W\0?-HVE+$`D`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
new file mode 100644
index 000000000000..fe22486c7a4f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-512-mbr.vmdk.gz
+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
+=?>/IN]/\SP1XB8!F';R$7TR2??%_%;F-<V]@````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
new file mode 100644
index 000000000000..75e7cd548495
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
@@ -0,0 +1,126 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.qcow.gz
+M'XL("%?N+50``VEM9RTV,W@R-34M-3$R+7!C.3@N<6-O=RYO=70`K9W;CA19
+M<T;OYRF*,S2GBHC,JDP.W<B2+?D.7]B^_>MX/0^`_.R&9G?N[JCU33`:&#0"
+M%?DI*VOU`LTL;=;KG]]6J]%6PV8US*OS?O7]Y^V[K>[]Y.'WU;?_^H__?'?_
+MV[<_?H[9^B^N2C_?GI:Y!UO_U^?\QU6'U7K^A;GOWXWF[MU=_(V[N_=F+^>N
+M_OCY9ODZ5X/Q8'#5YM;M_DP\O>'7[N]+>KOV\^G]OK?KXNV.:G#S8/!KF_M7
+MNS__6[#\TOW]S<]WBX-_+O<WX%63FIO_DCY?CWC53LWMB[D-7G50<\=B;HM7
+MG=3<N9B;X"I3'X457[F^GO$J\85FQ1>:KW=XE?A"LSO"TQ?:UV5NCU=MU-Q#
+M[OYUP=T!KQ+<6<G=$:\2W%G)W0FO$MQ9R=T9KQ+<6<6=T56NN/.*.R-%N>+.
+M*^Z,C.R*.Z^X,_*=*^Z\XL[(=ZZX\XH[(]^YXLXK[HQ\YXH[K[@S\ITK[KSD
+MCGP7BKLHN2/?A>(N2N[(=Z&XBY([\ETH[J+DCGP7BKLHN2/?A>(N2N[(=Z&X
+MBY([\ETH[J+BSNFJ07$W5-PY^6Y0W`T5=TZ^&Q1W0\6=D^\&Q=U0<>?DNT%Q
+M-U3<.?EN4-P-%7=.OAL4=T/%G9/O!L7=4')'OAL5=V/)'?EN5-R-)7?DNU%Q
+M-Y;<D>]&Q=U8<D>^&Q5W8\D=^6Y4W(TE=^2[47$WEMR1[T;%W5AQ%W351G&W
+MJ;@+\MU&<;>IN`ORW49QMZFX"_+=1G&WJ;@+\MU&<;>IN`ORW49QMZFX"_+=
+M1G&WJ;@+\MU&<;<IN2/?;15WVY([\MU6<;<MN2/?;15WVY([\MU6<;<MN2/?
+M;15WVY([\MU6<;<MN2/?;15WVY([\MU6<;>MN!OHJDEQ-U7<#>2[27$W5=P-
+MY+M)<3=5W`WDNTEQ-U7<#>2[27$W5=P-Y+M)<3=5W`WDNTEQ-U7<#>2[27$W
+ME=R1[^[^*SR\4'%'OIL5=W/)'?EN5MS-)7?DNUEQ-Y?<D>]FQ=U<<D>^FQ5W
+M<\D=^6Y6W,TE=^2[67$W5]R-=-5.<;>KN!O)=SO%W:[B;B3?[11WNXJ[D7RW
+M4]SM*NY&\MU.<;>KN!O)=SO%W:[B;B3?[11WNXJ[D7RW4]SM2N[(=W?_-Q1>
+MJ+@CW^T5=_N2._+=7G&W+[DCW^T5=_N2._+=7G&W+[DCW^T5=_N2._+=7G&W
+M+[DCW^T5=_N*NPU==5#<'2KN-N2[@^+N4'&W(=\=%'>'BKL-^>Z@N#M4W&W(
+M=P?%W:'B;D.^.RCN#A5W&_+=07%WJ+C;D.\.BKM#R1WY[JBX.Y;<D>^.BKMC
+MR1WY[JBX.Y;<D>^.BKMCR1WY[JBX.Y;<D>^.BKMCR1WY[JBX.Y;<D>^.BKMC
+MQ=V6KEHZH,L7"NZVY+N3XNY4<;<EWYT4=Z>*NRWY[J2X.U7<;<EW)\7=J>)N
+M2[X[*>Y.%7=;\MU)<7>JN-N2[TZ*NU/)'?GNK+@[E]R1[\Z*NW/)'?GNK+@[
+ME]R1[\Z*NW/)'?GNK+@[E]R1[\Z*NW/)'?GNK+@[E]R1[\Z*NW/%W017V=T/
+MX(6"NPE\9RHXM"HX]`E\9RHXM'7%W02^L[7@SG)_=\'=!+XSU=]9V=]-X#M3
+M_9V5_=T$OC/5WUG9WTW@.U/]G97]W02^,]7?6=G?3>`[4_V=E?W=!+XSU=]9
+MV=]-X#M3_9V5_=T$OC/5WUG9WTW@.U/]G97]W02^,]7?6=G?3>`[4_V=E?W=
+M3%>I_L[*_FXFWZG^SLK^;B;?J?[.ROYN)M^I_L[*_FXFWZG^SLK^;B;?J?[.
+MROYN)M^I_L[*_FXFWZG^SLK^;B;?J?[.ROYN)M^I_L[*_FXFWZG^SLK^;B;?
+MJ?[.ROYN)M^I_L[*_FXFWZG^SLK^;B;?J?[.ROYN)M^I_L[*_FY'5ZG^SLK^
+M;D>^4_V=E?W=CGRG^CLK^[L=^4[U=U;V=SORG>KOK.SO=N0[U=]9V=_MR'>J
+MO[.RO]N1[U1_9V5_MR/?J?[.ROYN1[Y3_9V5_=V.?*?Z.RO[NQWY3O5W5O9W
+M._*=ZN^L[.]VY#O5WUG9W^W(=ZJ_L[*_VY'O5']G97^WIZM4?V=E?[<GWZG^
+MSLK^;D^^4_V=E?W=GGRG^CLK^[L]^4[U=U;V=WORG>KOK.SO]N0[U=]9V=_M
+MR7>JO[.RO]N3[U1_9V5_MR??J?[.ROYN3[Y3_9V5_=V>?*?Z.RO[NSWY3O5W
+M5O9W>_*=ZN^L[._VY#O5WUG9W^W)=ZJ_L[*_.]!5JK^SLK\[D.]4?V=E?W<@
+MWZG^SLK^[D"^4_V=E?W=@7RG^CLK^[L#^4[U=U;V=P?RG>KOK.SO#N0[U=]9
+MV=\=R'>JO[.ROSN0[U1_9V5_=R#?J?[.RO[N0+Y3_9V5_=V!?*?Z.RO[NP/Y
+M3O5W5O9W!_*=ZN^L[.\.Y#O5WUG9WQWI*M7?6=G?'<EWJK^SLK\[DN]4?V=E
+M?W<DWZG^SLK^[DB^4_V=E?W=D7RG^CLK^[LC^4[U=U;V=T?RG>KOK.SOCN0[
+MU=]9V=\=R7>JO[.ROSN2[U1_9V5_=R3?J?[.RO[N2+Y3_9V5_=V1?*?Z.RO[
+MNR/Y3O5W5O9W1_*=ZN^L[.].=)7J[ZSL[T[D.]7?6=G?G<AWJK^SLK\[D>]4
+M?V=E?W<BWZG^SLK^[D2^4_V=E?W=B7RG^CLK^[L3^4[U=U;V=R?RG>KOK.SO
+M3N0[U=]9V=^=R'>JO[.ROSN1[U1_9V5_=R+?J?[.RO[N1+Y3_9V5_=V)?*?Z
+M.RO[NQ/Y3O5W5O9W9[I*]7=6]G=G\IWJ[ZSL[\[D.]7?6=G?G<EWJK^SLK\[
+MD^]4?V=E?W<FWZG^SLK^[DR^4_V=E?W=F7RG^CLK^[LS^4[U=U;V=V?RG>KO
+MK.SOSN0[U=]9V=^=R7>JO[.ROSN3[U1_9V5_=R;?J?[.RO[N3+Y3_9V5_=V9
+M?*?Z.ZOZNUC#57[W`WCA`7=WG*SZ'/C.57_GJ;];M;W5>ID#W[GJ[SSU=ZO&
+MW>KK,@>^<]7?>>KO5HV[U9_+'/C.57_GJ;^#9P>^<]7?>>KO8`Y\YZJ_\]3?
+MP1SXSE5_YZF_@SGPG:O^SE-_]ZC-/>ISX#M7_9VG_NY1N[U'G3OPG:O^SE-_
+M]ZAQ]ZAS![YSU=]YZN\>->X>=>[`=Z[Z.T_]'3P[\)VK_LY3?P=SX#M7_9VG
+M_@[FP'>N^CM/_=WE')U_YZJ_\]3?/6YSC_L<^4[U=Y[ZN\>-N\<+=W3^G:O^
+MSE-_][AQ]WCACLZ_<]7?>>KO'C?N'B_<T?EWKOH[3_T=/#ORG>KO//5W,$>^
+M4_V=I_X.YLAWJK_SU-_!'/E.]7>>^KLG;>Y)GR/?J?[.4W_WI''WI'-'OE/]
+MG:?^[DGC[DGGCGRG^CM/_=V3QMV3SAWY3O5WGOH[>';D.]7?>>KO8(Y\I_H[
+M3_T=S)'O5'_GJ;^[G*/S[USU=Y[ZNZ=M[FF?(]^I_LY3?_>T<?=TX8[.OW/5
+MWWGJ[YXV[IXNW-'Y=Z[Z.T_]W=/&W=.%.SK_SE5_YZF_@V='OE/]G:?^#N;(
+M=ZJ_\]3?P1SY3O5WGOH[F"/?J?[.4W_WK,T]ZW/D.]7?>>KOGC7NGG7NR'>J
+MO_/4WSUKW#WKW)'O5'_GJ;][UKA[UKDCWZG^SE-_!\^.?*?Z.T_]'<R1[U1_
+MYZF_@SGRG>KO//5WEW-T_IVK_LY3?_>\S3WO<^0[U=]YZN^>-^Z>+]S1^7>N
+M^CM/_=WSQMWSA3LZ_\Y5?^>IOWO>N'N^<$?GW[GJ[SSU=_#LR'>JO_/4W\$<
+M^4[U=Y[Z.Y@CWZG^SE-_!W/D.]7?>>KO7K2Y%WV.?*?Z.T_]W8O&W8O.'?E.
+M]7>>^KL7C;L7G3ORG>KO//5W+QIW+SIWY#O5WWGJ[^#9D>]4?^>IOX,Y\IWJ
+M[SSU=S!'OE/]G:?^[G*.SK]SU=]YZN]>MKF7?8Y\I_H[3_W=R\;=RX4[.O_.
+M57_GJ;][V;A[N7!'Y]^YZN\\]7<O&W<O%^[H_#M7_9VG_@Z>'?E.]7>>^CN8
+M(]^I_LY3?P=SY#O5WWGJ[V".?*?Z.T_]W:LV]ZK/D>]4?^>IOWO5N'O5N2/?
+MJ?[.4W_WJG'WJG-'OE/]G:?^[E7C[E7GCGRG^CM/_1T\._*=ZN\\]7<P1[Y3
+M_9VG_@[FR'>JO_/4WUW.T?EWKOH[3_W=59N[ZG/D.]7?>>KOKAIW5PMW=/Z=
+MJ_[.4W]WU;B[6KBC\^]<]7>>^KNKQMW5PAV=?^>JO_/4W\&S(]^I_LY3?P=S
+MY#O5WWGJ[V".?*?Z.T_]'<R1[U1_YZF_>]WF7O<Y\IWJ[SSU=Z\;=Z\[=^0[
+MU=]YZN]>-^Y>=^[(=ZJ_\]3?O6[<O>[<D>]4?^>IOX-G1[Y3_9VG_@[FR'>J
+MO_/4W\$<^4[U=Y[ZN\LY.O_.57_GJ;][T^;>]#GRG>KO//5W;QIW;Q;NZ/P[
+M5_V=I_[N3>/NS<(=G7_GJK_SU-^]:=R]6;BC\^]<]7>>^CMX=N0[U=]YZN]@
+MCGRG^CM/_1W,D>]4?^>IOX,Y\IWJ[SSU=V_;W-L^1[Y3_9VG_NYMX^YMYXY\
+MI_H[3_W=V\;=V\X=^4[U=Y[ZN[>-N[>=._*=ZN\\]7?P[,AWJK_SU-_!'/E.
+M]7>>^CN8(]^I_LY3?W<Y1^??N>KOO.KO@LZ_<]7?>=7?!9U_YZJ_\ZJ_"SK_
+MSE5_YU5_%W3^G:O^SJO^+NC\.U?]G5?]7=#Y=Z[Z.Z_ZNZ#S[USU=U[U=T'G
+MW[GJ[SSU=^_;UOL^1[Y3_9VG_NY]X^Y]YXY\I_H[3_W=^\;=^\X=^4[U=Y[Z
+MN_>-N_>=._*=ZN\\]7?P[,AWJK_SU-_!'/E.]7>>^CN8(]^I_LY3?W<Y1^??
+MQ=T/X(4'W*W;W+K/@>^^7\7<1>KOUHV[]<(=G7\7JK^+U-^M&W?KA3LZ_RY4
+M?Q>IOULW[M8+=W3^7:C^+E)_!\\.?!>JOXO4W\$<^"Y4?Q>IOX,Y\%VH_BY2
+M?P=SX+M0_5VD_L[:G/4Y\%VH_BY2?V>-.^O<@>]"]7>1^CMKW%GG#GP7JK^+
+MU-]9X\XZ=^"[4/U=I/X.GAWX+E1_%ZF_@SGP7:C^+E)_!W/@NU#]7:3^[G*.
+MSK\+U=]%ZN^\S7F?(]^I_BY2?^>-.U^XH_/O0O5WD?H[;]SYPAV=?Q>JOXO4
+MWWGCSA?NZ/R[4/U=I/X.GAWY3O5WD?H[F"/?J?XN4G\'<^0[U=]%ZN]@CGRG
+M^KM(_5VTN>ASY#O5WT7J[Z)Q%YT[\IWJ[R+U=]&XB\X=^4[U=Y'ZNVC<1>>.
+M?*?ZNTC]'3P[\IWJ[R+U=S!'OE/]7:3^#N;(=ZJ_B]3?7<[1^7>A^KM(_=W0
+MYH8^1[Y3_5VD_FYHW`T+=W3^7:C^+E)_-S3NAH4[.O\N5'\7J;\;&G?#PAV=
+M?Q>JOXO4W\&S(]^I_BY2?P=SY#O5WT7J[V".?*?ZNTC]'<R1[U1_%ZF_&]O<
+MV.?(=ZJ_B]3?C8V[L7-'OE/]7:3^;FS<C9T[\IWJ[R+U=V/C;NS<D>]4?Q>I
+MOX-G1[Y3_5VD_@[FR'>JOXO4W\$<^4[U=Y'ZN\LY.O\N5'\7J;_;M+E-GR/?
+MJ?XN4G^W:=QM%N[H_+M0_5VD_F[3N-LLW-'Y=Z'ZNTC]W:9QMUFXH_/O0O5W
+MD?H[>';D.]7?1>KO8(Y\I_J[2/T=S)'O5'\7J;^#.?*=ZN\B]7?;-K?M<^0[
+MU=]%ZN^VC;MMYXY\I_J[2/W=MG&W[=R1[U1_%ZF_VS;NMIT[\IWJ[R+U=_#L
+MR'>JOXO4W\$<^4[U=Y'Z.Y@CWZG^+E)_=SE'Y]^%ZN\B]7=3FYOZ'/E.]7>1
+M^KNI<3<MW-'Y=Z'ZNTC]W=2XFQ;NZ/R[4/U=I/YN:MQ-"W=T_EVH_BY2?P?/
+MCGRG^KM(_1W,D>]4?Q>IOX,Y\IWJ[R+U=S!'OE/]7:3^;FYS<Y\CWZG^+E)_
+M-S?NYLX=^4[U=Y'ZN[EQ-W?NR'>JOXO4W\V-N[ES1[Y3_5VD_@Z>'?E.]7>1
+M^CN8(]^I_BY2?P=SY#O5WT7J[R[GZ/R[4/U=I/[N0YO[T.?(=ZJ_B]3??6C<
+M?5BXH_/O0O5WD?J[#XV[#PMW=/Y=J/XN4G_WH7'W8>&.SK\+U=]%ZN_@V9'O
+M5'\7J;^#.?*=ZN\B]7<P1[Y3_5VD_@[FR'>JOXO4WWUL<Q_['/E.]7>1^KN/
+MC;N/G3ORG>KO(O5W'QMW'SMWY#O5WT7J[SXV[CYV[LAWJK^+U-_!LR/?J?XN
+M4G\'<^0[U=]%ZN]@CGRG^KM(_=WE')U_%ZJ_B]3??6ISG_H<^4[U=Y'ZNT^-
+MNT\+=W3^7:C^+E)_]ZEQ]VGACLZ_"]7?1>KO/C7N/BW<T?EWH?J[2/T=/#OR
+MG>KO(O5W,$>^4_U=I/X.YLAWJK^+U-_!'/E.]7>1^KO/;>YSGR/?J?XN4G_W
+MN7'WN7-'OE/]7:3^[G/C[G/GCGRG^KM(_=WGQMWGSAWY3O5WD?H[>';D.]7?
+M1>KO8(Y\I_J[2/T=S)'O5'\7J;^[G*/S[T+U=Y'ZN^LV=]WGR'>JOXO4WUTW
+M[JX7[NC\NU#]7:3^[KIQ=[UP1^??A>KO(O5WUXV[ZX4[.O\N5'\7J;^#9T>^
+M4_U=I/X.YLAWJK^+U-_!'/E.]7>1^CN8(]^I_BY2?W?3YF[Z'/E.]7>1^KN;
+MQMU-YXY\I_J[2/W=3>/NIG-'OE/]7:3^[J9Q=].Y(]^I_BY2?P?/CGRG^KM(
+M_1W,D>]4?Q>IOX,Y\IWJ[R+U=Q=SPQJN&NY^`"\\X.XNZ/W2Y\!W@^KOOK_P
+M@+LOC;LOZV4.?#>H_FY(_=V7=GM?OBYSX+M!]7=#ZN^^-.Z^_+G,@>\&U=\-
+MJ;^#9T=_W[;Z*/H+W]ZE;]_^N+H='&\_V\%7ZQW\6[_P[=_>/?QG&;P]F^=O
+M#([C:G<Y^-_M#8^W9_/,P^HPT/MJ]C/]AF^6-_QSCOZN]W_R_(;?_/RV],7V
+M3^YP>_K-=SC=WN&X70WC:MRL)O_5._S??_^?=(<_YW[;1_)S#G3P<.[NAI??
+M.B_F;N[-_=#!^=ZOO`_;ZF#]#W[W?WQO[OK=O=_")])!G_LASA.](-_L;];!
+M=''DY/W/^?8LYUBM[_[7C3\<7#[?5;\_2OP?O-V_N+_5Y=N]_2/&]N&OMWMS
+M7KS=U<.YVS]BW/L\'WR$Q=.[OKP[^BON_\F'<7%PXB]^Y?X8>?B5^W/.?Z\(
+IYENS_/CM=`?_UB]\^_KNX3\_!X<V^-N>X/`=E_7ZC_\'#.+&':.H````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
new file mode 100644
index 000000000000..2d392cdc5a48
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
@@ -0,0 +1,22 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.qcow2.gz
+M'XL("%?N+50``VEM9RTV,W@R-34M-3$R+7!C.3@N<6-O=S(N;W5T`*V8VW+3
+M,!!`W_,5X@X%@K4K^<(E*84RPQL\`,^)FWQ%AF\GBA1+7N]:;5#B\32C[IF5
+M]F@CIZK\2RFKE:F5Z=1^JXZ?PP4J^3"^U.'GM^_+]'58>)BNA"AFH-D-N!'K
+M;\2!A*OT=$#SN"0[9'!PCIJ"<C@C9C<WP."N%J>E.Q6C)1%X"=#CQ&)<E!_X
+M_&B$N3`_*)T?\NMGSW%TH)[/#WU^-*J1<&T6!TQ4)^$V61PR45L)UV=QAHFZ
+MDW#"SDUPEHG:"SB=4>6(JYDH+>$@BVN8*)1P)HMKF2C).YWWKF.B).]TWKL-
+M$R5YI_/>;9DHR3N=]ZYGHB3O=-Z[.R9*\@X$[U3$[9@HR3L@WCT*N,<1MV>B
+M).^`>/<DX)X..,U%2=X!\>Y9P#V/.*;?@>0=$.]>!-S+B&/Z'4C>`?'N5<!=
+M11S3[T#R#HAWKP/N3<0Q_0XD[X!X]W;BG6;Z'4C>(?'N76!5$<?T.Y2\0^*=
+M#CB(.*;?H>0=$N\PX$S$,?T.)>^0>&<#KHXXIM^AY!T2[YJ`:R..Z7<H>8?$
+MNR[@WD<<T^]0\@Z)=Q\"[F/$,?T.)>^0>/<IX%81Q_0[E+PSQ+MUP%U''-/O
+MC.2=(=Y]#KB;B&/ZG9&\,\2[+P'W=<`!%S5X5U7\%7"WDST+9<^?)IZ/-7.7
+M!V:`[4.`<QEZ7%=TPM9/V&FP8>[RP.%F.7X/P),P#P!:JS93X"\_8>N%Z8SJ
+M#3>OL$^T/.%UNGZVM##6E:3H^@'[A/8?&3:[PAFV_@>'QNU;6ZL6[IOAG]O?
+M4Z6/N&(E\3CY!X<P<$YX:+(3W#K!N3/+/OG/5#;5Z]C@T[\3W&H9F_T1-_N#
+M@WN*VG$#XF1M65G:H5V=K[3.[O#NGK'.W]_D\#W45\7\F'8%H^G.Y*>FTW7G
+M@N'YG=3#X2`S737&N7-!6L]1"3.KMYIFUQ<NAJ8[XYX[UT'&.]?CH&PCZ$Z=
+BY6B@Z^*3NSQP^+$<OSW0!&"Q%32U^W9;_`,76K<))14`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
new file mode 100644
index 000000000000..029e51d5f99f
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
@@ -0,0 +1,12 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.raw.gz
+M'XL("%?N+50``VEM9RTV,W@R-34M-3$R+7!C.3@N<F%W+F]U=`"ME$V/@R`0
+MAN_^BO>\!P,C5+VT29/>][*[9VOT5_CCER\M(WZT":"(&7CR#C.,$+X!BB"Z
+MC7'?,-U+WJ?BJW`T.7X&U!I="OPQ0(<CJZ]5Z!7,;/6@&MU,)H:I#.T6OC-.
+M&F,*"KMV#0NN7'#!797Y_$@<"OE<83UD5M@XA;J&TM`7-/2NPK_'[TJAQV4+
+MB<?1&6X6'))G`W>+<)4QCM'*.-G02U1#^(GG$>[JWQFGCM29DQ##EF'769TW
+M61K3^;XXSI`#9`71!!MQX!)?O/2UJ0QB[A[H0^IN9W$U7R\C')VX"XY[6EP4
+M3Q;"D].[INKZS,&0ZYOQYLVU$'YS/8[R%H+651:3@;:*)^.^8?HN>?=`%8#9
+/3M!6/B&*?U("+YGG!@``
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
new file mode 100644
index 000000000000..dd481004e925
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.vhd.gz
+M'XL("%CN+50``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD+F]U=`"METU/["`4
+MAO?S*T[BSD5#3X$R&R<QZMK$Z%TSO:UQ<=4X+ESTQ\LI,(72=APOTPZA`1[>
+M\P$$QNP/0%8@.Y`M2$'UFH/<0JT`3*-[<2A+]PE]\_;:-I\O7X7[]1L+*UDX
+M*AY.X[$";B:I`35-(O]2'7J/*2YNGR]?_CU['#J<GYA+X`C"0'@RCV)'=42Z
+MNWZXF:JK4G7C*#M/UT'5!3VJ4%U1[$(<-Z-,?WHE='R0Z=_H(VH(<9$ZP2:C
+M`IES3@V,G</)M5'GX"XW+A8V54QBU*9D($NHD>HF;;P?DM>DRM?A77\<VHD^
+M7$@5&01CVL:7S467*N@[.P6<!*Z9"P/E,,7-I,I_>4_&X[BK&"<PX1MP,#_V
+MWHB"4)\LV8K/EX.QJ$^3/K.VF)XIEQOZZR)^CL!]=QY0"-`I\-$;W)"^+8>&
+MS_G=+=DD8T:#=W%\FX7L^W5\V\S^0[TJY'R%2F56J`:%HJ8-74A0^%.%?VZ?
+M9E:PTME"8G%X"N<%A_M]C-L%N,HNN)$2)!LT)52M^PCK`>[*_CV.KZFC7:&=
+M:U@T5F1.%JTFX\(X0]E"60%3K@UCX#&^,.K;IC(P,G=%'Z3F:L+5<?\RP.$)
+M<R'&[=W)ZWM&(3SAO:M479,Y&/OIROCARB5(O'(M#O-N!'K864P&TBZ>E,L-
+M_7T1/Q:([C#*=KJA.SVR*>0.F$TA=^='1H6Z64VV<[-0.H69K@J$RWA5(%S&
+BJP+A,EX5")?QJD"XC%<%PF6]*DAS"61L\PVA;@PG7PX`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
new file mode 100644
index 000000000000..5600c7aba7c4
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
@@ -0,0 +1,15 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.vhdf.gz
+M'XL("%CN+50``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD9BYO=70`K94[;X,P
+M$,?W?(J3NF5`?F.61(J:SI6JMC.E)LJ0=NG0@0]?&QOBPY!'94R(T>$?_WOX
+M(,0?`((!J6>NRX9N5^#1K=:KGD;;^X!20IT"7RVPQS&GKQ+0"+"SR0F\[6<T
+M,71%.+;A?\!1:TQ!8=6B8<05(RZX*S+'CY&+0NY76)K,"G6O4)8@)$@%FMVJ
+M\'W_-E'H<=E2XG'L&FX0'(IG!K>-<-P:V^C)N-B@H<!-N(GG$6[C?P-.7%)G
+M(T',G&'169FW6+0=>%V<9Z`&*`>B@XUAX)A?..NK4AD,N7M!'Z3NU@Y7XN=I
+MA&-7W`6,^W"X*)\HA5>BMTG5-9F30:<[X\:=ZR!XYWH<R]L(JKZSV`IT73RY
+M+ANZYP(/#Q0!F"V".GS=%`?5@C*@I)N7`E0%I8Z!#%=2UWQ_F>;G^!MGV.&H
+M;P:SIUO/N-LMJ@16NY>H3S>/]#WL#^OCZ3#@AE8UO%@H%W1I(2)Q5V-WGW8O
+MCU-U/`V21M&C3F?<]JSC*'K;&"=&9XWI6R`]G^@&&69;E<-),EGUW]QZG,I<
+.*O;#N_H#>\I9F1()````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
new file mode 100644
index 000000000000..b2d29cc5eeeb
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
@@ -0,0 +1,84 @@
+# $FreeBSD$
+begin 644 img-63x255-512-pc98.vmdk.gz
+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
+29AW,_$>3)%_\'XGNMJQQ8```
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.gz.uu
new file mode 100644
index 000000000000..791a1e015359
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.gz.uu
@@ -0,0 +1,127 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.qcow.gz
+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
+E?I;F#/[./_#KSS_>_^OK8,J#?]DK3'=>.9]_^#\)B7^=OZ8`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.gz.uu
new file mode 100644
index 000000000000..0a79ac256b65
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.gz.uu
@@ -0,0 +1,21 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.qcow2.gz
+M'XL("+8[(U0``VEM9RTV,W@R-34M-3$R+79T;V,X+G%C;W<R+F]U=`"MF-MN
+MTT`0AN_S%,NI0(&2G=EU;$Z%'B)Q@03B!8AC^P&X0\K#L[$W&7L\XTTBIU:D
+MU/T_S:Z__K6[7'8O8[PU+C.N,$UIPN=X@.E]&!YF]VO]_:;_VBTZF%TJJ=$)
+M:U;%$3=@_2,<:+@0%[XEXGK3H8"#0VH,2N&<.MW4"0%WO6BWKKT8.4O@)<`.
+MIUZ,B^:#;CZ><!?.!W//A_+^^0OGP_GGPWHJQP?/4O-A(Z16&BY/X9R4*C3<
+M)HFS0JK4<-LD#H14I>'J)`Z%5*/@;%(5YX24U7"0Q'DAA1K.)7&9D/(:+NF=
+M6PDIS3N;]BX74IIW-NU=(:0T[VS:NXV0TKRS:>]*(:5Y!XIWAG!;(:5Y!\R[
+M)Q'WE'"5D-*\`^;=LXA[3KA:2&G>`?/N1<1=$4[H.]"\`^;=RXA[=<1Y*:5Y
+M!\R[UQ%W33BA[T#S#IAW;R+N+>&$O@/-.V#>O1MYYX6^`\T[9-Z]CZPEX82^
+M0\T[9-[9B`/""7V'FG?(O,.(<X03^@XU[Y!YYR,N(YS0=ZAYA\R[5<3EA!/Z
+M#C7OD'E71-P'P@E]AYIWR+S[&'&?""?T'6K>(?/N<\1](9S0=ZAYYYAWMQ'W
+ME7!"WSG-.\>\^Q9Q=X03^LYIWCGFW7W$/1!.Z#NG>>>8=X\1MR9<,^O]IZ/[
+M=RN\ZR<F@/GY0/6/8\`5LR[8=PL.&[T"D_G]$93PN+^2H9/V#>,J$;C^6]=W
+MOQ\`?_3F\W,_$'C:O^5@@Q1@WMZ.@[9_?K!_11(W-5^'V\RUW`Y7GHH+]1UN
+M[:O:U#7#_>GAMC-?##M:;GVX\\<+EFL/RT7ZX:9MOM!_"J[WRW;+<;1<8"GZ
+M1XV5IC/B=-415VZI\T[9O7L)-_ED>_[>G=Q\U<:4P1-KFJV.@\DASE8ERUM@
+BN&<)3\'C=_W$[N?-\*L#N@B<;<+P@!9>B_]NV1VQX1,`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.gz.uu
new file mode 100644
index 000000000000..c949873459fc
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.gz.uu
@@ -0,0 +1,11 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.raw.gz
+M'XL("/W%'50``VEM9RTV,W@R-34M-3$R+79T;V,X+G)A=RYO=70`K9)!;L,@
+M$$7W/L5?=V$Q@&V\JI16V56JU`O4-G"`K#E\2'!"C+'C1![0"&GF/\T7PU@(
+M0-9H..KJ<B5')2`E!`>$?VGXEN3"'4_&'/Z^N?@IK^&*`"-?G/>/JL6"*Y-P
+MQ<<(5!,=K0,56`O&L\"`:Z.J?8I;FR_@NKWL!ER_%5?[K*$-C$EP_P^X8>?/
+MH)E=`PH/\89=NMD5L=G:2Q9V"4<1]YGBHEV>J#BB/C,=LM/I.ZX?(,54M6KV
+M*X<SNZX*V:TXW:'W>T*PPS*.KP[QZJHT6EV!E>_J,GFYX'[+Z0G`?@3N-2$U
+-2M6,%6>->Z%+`P4`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
new file mode 100644
index 000000000000..523a1ae8f369
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu
@@ -0,0 +1,18 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.vhd.gz
+M'XL("/W%'50``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9"YO=70`K9;-;MLP
+M#,?O>0H"N_5@R)0LVZ<"Z];;@`%[@<FV7!3#UJ'=H8<\_$A;CB5_K5F9"(X,
+MB3_]*5$,E1H_`%:#[<%ZL`7W2P.VAK("H,'0<'CFX17.[=,OW_YY?,W"YWP:
+M8;F*K5)SMD<-AA8I`1TO8CONPWG"9!\^/]P\_GR8<!APT\+&@D$H"&(6Z^10
+MJ8LZ)MU__/9IJ4XOU<56_*.A[T'WT0P=J\NRVQAGR(KF<[/0CS*GEKPD`S$N
+M45>HA56D=&M3(V>W</;(ZAK<S2F<Q1@J%!@E/178'$KD/H7-M`^K1J'R^O+;
+M/;_XA3[<"15[T9>OQMI]=S&$"DZ3@P**Y>;071@H/Y:X5:B\<_=L:F?238I?
+MQAFT.ZK8=]?.NX?3IE$CU:H\.HQL\%>M<*@.K(YP.^XZ=I=N*P4()Y5BOK8:
+M`33UNLW]NW_VGBXNZB^)/K<3+/]]'*Y*[/YQV2I0-2>QW>-P]6Q5O__N.B?E
+M[HAKWHJCG*$ZZ#QXO\!]CW"M\&$T*W?]$/]J2+]7N]M,[NIY\GBO*+/OX**\
+M?+O$M<E5BQO";+^A#C;5=1=<TX+1J=6ALW=;."\:*DW_5ESGH*$XR:$_R,KM
+MH8AK0P5#7A%+5"BM4'>5YV'Z*U=NX[D_</Z:I=\1:()",9<)**O0!J"80DM%
+MI*C"LJM1])2KH%"H;F:<8-W,.,&ZF7&"=3/C!.MFQ@G6S8P3K9L)2+%W^@L6
+'\>:S;`T`````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
new file mode 100644
index 000000000000..d8c4d3d6bf31
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu
@@ -0,0 +1,14 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.vhdf.gz
+M'XL("/[%'50``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4O6[#
+M(!2%]SS%D;IEB,R/L3U%ZD^V2I7Z`K4-1!G:2E6'#G[X8K!C(-A-(V.$B.!\
+MG$LN-\M<`[A`02'ROG.*G(%S,`HP,Y,P6Z*.[O"EU/WK(V7/.]NZC8,1LWBY
+M?U#-+G2[J'6;[0`L`QU9!I;(*F0T"72X:E)5?^*6_#E<O5:X#M=<BQ-FE)`*
+M2D6X-P_7KOQGD(MP%8B;L!O")6.X;-JL=3\R/8<C$VX?XZ9P::2BF/0)=TBZ
+MDV=<TX*S4+48[$,*IU9-%:*OQ<D:C<D3`MW.X^BBB?^F2B%+"\S-KCHQSB]T
+M+[OP<\!F`*[ED)1#Y1,,0D,H6_P8"@Y1H2A](`WR!EW[^:':[]./=X,6UU<^
+MD[W)WNNIJ:7FD`*T[@\1LI][_NZ>CMO3^W'$T2&J\6!3H\^E.7X291CNP13F
+MV!V++\E7N3=H?#(=/AK_]O8^CI^#-05(-];FV(,?P4(J^RPNSR+5S6_#XL3*
+.J6)R;_,+FZ-::BX'````
+`
+end
diff --git a/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.gz.uu b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.gz.uu
new file mode 100644
index 000000000000..d9340d12bc61
--- /dev/null
+++ b/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.gz.uu
@@ -0,0 +1,83 @@
+# $FreeBSD$
+begin 644 img-63x255-512-vtoc8.vmdk.gz
+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
+G_X]*OP"N_H#+_^^_X+]G;/];`34"FIU0_7NC++_Z'WN7IO#-7P``
+`
+end
diff --git a/usr.bin/mkimg/tests/mkimg.sh b/usr.bin/mkimg/tests/mkimg.sh
new file mode 100755
index 000000000000..8dfb74c40d04
--- /dev/null
+++ b/usr.bin/mkimg/tests/mkimg.sh
@@ -0,0 +1,164 @@
+# $FreeBSD$
+
+mkimg_blksz_list="512 4096"
+mkimg_format_list="qcow qcow2 raw vhd vhdf vmdk"
+mkimg_geom_list="1x1 63x255"
+mkimg_scheme_list="apm bsd ebr gpt mbr pc98 vtoc8"
+
+bootcode()
+{
+    case $1 in
+      bsd|pc98)	echo 8192 ;;
+      gpt|mbr)	echo 512 ;;
+      *)	echo 0 ;;
+    esac
+    return 0
+}
+
+mkcontents()
+{
+    local byte count name
+
+    byte=$1
+    count=$2
+
+    name=_tmp-$byte-$count.bin
+    jot -b $byte $(($count/2)) > $name
+    echo $name
+    return 0
+}
+
+makeimage()
+{
+    local blksz bootarg bootsz format geom nhds nsecs partarg pfx scheme
+
+    format=$1
+    scheme=$2
+    blksz=$3
+    geom=$4
+    pfx=$5
+    shift 5
+
+    nsecs=${geom%x*}
+    nhds=${geom#*x}
+
+    bootsz=`bootcode $scheme`
+    if test $bootsz -gt 0; then
+	bootarg="-b `mkcontents B $bootsz`"
+    else
+	bootarg=""
+    fi
+
+    partarg=""
+    for P in $*; do
+	partarg="$partarg -p $P"
+    done
+    if test -z "$partarg"; then
+	local swap ufs
+	swap="-p freebsd-swap::128K"
+	ufs="-p freebsd-ufs:=`mkcontents P 4194304`"
+	partarg="$ufs $swap"
+    fi
+
+    imagename=$pfx-$geom-$blksz-$scheme.$format
+
+    mkimg -y -f $format -o $imagename -s $scheme -P $blksz -H $nhds -T $nsecs \
+	    $bootarg $partarg
+    echo $imagename
+    return 0
+}
+
+mkimg_rebase()
+{
+    local baseline image result tmpfile update
+
+    image=$1
+    result=$2
+
+    baseline=$image.gz.uu
+    update=yes
+
+    if test -f $baseline; then
+	tmpfile=_tmp-baseline
+	uudecode -p $baseline | gunzip -c > $tmpfile
+	if cmp -s $tmpfile $result; then
+	    update=no
+	fi
+    fi
+
+    if test $update = yes; then
+	# Prevent keyword expansion when writing the keyword.
+	(echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline
+	gzip -c $result | uuencode $image.gz >> $baseline
+    fi
+
+    rm $image $result _tmp-*
+    return 0
+}
+
+mkimg_test()
+{
+    local blksz format geom scheme
+
+    geom=$1
+    blksz=$2
+    scheme=$3
+    format=$4
+
+    case $scheme in
+      ebr|mbr|pc98)
+	bsd=`makeimage raw bsd $blksz $geom _tmp`
+	partinfo="freebsd:=$bsd"
+	;;
+      *)
+	partinfo=""
+	;;
+    esac
+    image=`makeimage $format $scheme $blksz $geom img $partinfo`
+    result=$image.out
+    hexdump -C $image > $result
+    if test "x$mkimg_update_baseline" = "xyes"; then
+	mkimg_rebase $image $result
+    else
+	baseline=`atf_get_srcdir`/$image
+	atf_check -s exit:0 cmp -s $baseline $result
+    fi
+    return 0
+}
+
+atf_test_case rebase
+rebase_body()
+{
+    local nm
+
+    mkimg_update_baseline=yes
+    for nm in $mkimg_tests; do
+	${nm}_body
+    done
+    return 0
+}
+
+atf_init_test_cases()
+{
+    local B F G S nm
+
+    for G in $mkimg_geom_list; do
+	for B in $mkimg_blksz_list; do
+	    for S in $mkimg_scheme_list; do
+		for F in $mkimg_format_list; do
+		    nm="${S}_${G}_${B}_${F}"
+		    atf_test_case $nm
+		    eval "${nm}_body() { mkimg_test $G $B $S $F; }"
+		    mkimg_tests="${mkimg_tests} ${nm}"
+		    atf_add_test_case $nm
+		done
+	    done
+	done
+    done
+
+    # XXX hack to make updating the baseline easier
+    if test "${__RUNNING_INSIDE_ATF_RUN}" != "internal-yes-value"; then
+	atf_add_test_case rebase
+    fi
+}
+
diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c
index af3d95eaccd7..6b9d6a087d61 100644
--- a/usr.bin/mkimg/vhd.c
+++ b/usr.bin/mkimg/vhd.c
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 
 struct vhd_footer {
 	uint64_t	cookie;
-#define	VHD_FOOTER_COOKIE	0x636f6e6563746978
+#define	VHD_FOOTER_COOKIE	0x636f6e6563746978ULL
 	uint32_t	features;
 #define	VHD_FEATURES_TEMPORARY	0x01
 #define	VHD_FEATURES_RESERVED	0x02
@@ -236,7 +236,7 @@ vhd_resize(lba_t imgsz)
 
 struct vhd_dyn_header {
 	uint64_t	cookie;
-#define	VHD_HEADER_COOKIE	0x6378737061727365
+#define	VHD_HEADER_COOKIE	0x6378737061727365ULL
 	uint64_t	data_offset;
 	uint64_t	table_offset;
 	uint32_t	version;
diff --git a/usr.bin/mkimg/vtoc8.c b/usr.bin/mkimg/vtoc8.c
index 8eb7d24080bd..2f5cf0f706e3 100644
--- a/usr.bin/mkimg/vtoc8.c
+++ b/usr.bin/mkimg/vtoc8.c
@@ -53,13 +53,12 @@ static struct mkimg_alias vtoc8_aliases[] = {
     {	ALIAS_NONE, 0 }
 };
 
-static u_int
-vtoc8_metadata(u_int where)
+static lba_t
+vtoc8_metadata(u_int where, lba_t blk)
 {
-	u_int secs;
 
-	secs = (where == SCHEME_META_IMG_START) ? nsecs * nheads : 0;
-	return (secs);
+	blk += (where == SCHEME_META_IMG_START) ? 1 : 0;
+	return (round_cylinder(blk));
 }
 
 static int
@@ -87,10 +86,6 @@ vtoc8_write(lba_t imgsz, void *bootcode __unused)
 	be16enc(&vtoc8.nsecs, nsecs);
 	be16enc(&vtoc8.magic, VTOC_MAGIC);
 
-	error = image_set_size(imgsz);
-	if (error)
-		return (error);
-
 	be32enc(&vtoc8.map[VTOC_RAW_PART].nblks, imgsz);
 	STAILQ_FOREACH(part, &partlist, link) {
 		n = part->index + ((part->index >= VTOC_RAW_PART) ? 1 : 0);
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index a44ff3ebf44f..96fdcaf6f7e3 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -346,7 +346,7 @@ static const char *srcrule_str[] = {
 	"public/temporary address",
 	"alive interface",
 	"better virtual status",
-	"rule #10",
+	"preferred source",
 	"rule #11",
 	"rule #12",
 	"rule #13",
diff --git a/usr.bin/rctl/rctl.8 b/usr.bin/rctl/rctl.8
index f7afee99aede..3f72b9122171 100644
--- a/usr.bin/rctl/rctl.8
+++ b/usr.bin/rctl/rctl.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 16, 2014
+.Dd September 11, 2014
 .Dt RCTL 8
 .Os
 .Sh NAME
@@ -209,7 +209,7 @@ resource would be
 .Bl -column -offset 3n "pseudoterminals"
 .It Em action
 .It Sy deny Ta deny the allocation; not supported for
-.Sy cpu
+.Sy cputime
 and
 .Sy wallclock
 .It Sy log Ta "log a warning to the console"
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index d811a868bc6c..372c661d40ee 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -897,7 +897,7 @@ fix_obsolete_keys(int *argc, char **argv)
 						}
 					}
 				}
-				sprintf(sopt, "-k%d.%d", f1, c1);
+				sprintf(sopt, "-k%d.%d%s", f1, c1, sopts1);
 				argv[i] = sort_strdup(sopt);
 			}
 		}
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 4cfe01c4d616..35e575631a1b 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -68,14 +68,14 @@ struct if_stat {
 	struct	ifmibdata if_mib;
 	struct	timeval tv;
 	struct	timeval tv_lastchanged;
-	u_long	if_in_curtraffic;
-	u_long	if_out_curtraffic;
-	u_long	if_in_traffic_peak;
-	u_long	if_out_traffic_peak;
-	u_long	if_in_curpps;
-	u_long	if_out_curpps;
-	u_long	if_in_pps_peak;
-	u_long	if_out_pps_peak;
+	uint64_t if_in_curtraffic;
+	uint64_t if_out_curtraffic;
+	uint64_t if_in_traffic_peak;
+	uint64_t if_out_traffic_peak;
+	uint64_t if_in_curpps;
+	uint64_t if_out_curpps;
+	uint64_t if_in_pps_peak;
+	uint64_t if_out_pps_peak;
 	u_int	if_row;			/* Index into ifmib sysctl */
 	int 	if_ypos;		/* -1 if not being displayed */
 	u_int	display;
@@ -269,8 +269,8 @@ fetchifstat(void)
 	struct	if_stat *ifp = NULL;
 	struct	timeval tv, new_tv, old_tv;
 	double	elapsed = 0.0;
-	u_int	new_inb, new_outb, old_inb, old_outb = 0;
-	u_int	new_inp, new_outp, old_inp, old_outp = 0;
+	uint64_t new_inb, new_outb, old_inb, old_outb = 0;
+	uint64_t new_inp, new_outp, old_inp, old_outp = 0;
 
 	SLIST_FOREACH(ifp, &curlist, link) {
 		/*
diff --git a/usr.bin/truss/arm-fbsd.c b/usr.bin/truss/arm-fbsd.c
index b71761986f8a..3bac40095c7c 100644
--- a/usr.bin/truss/arm-fbsd.c
+++ b/usr.bin/truss/arm-fbsd.c
@@ -201,7 +201,7 @@ arm_syscall_entry(struct trussinfo *trussinfo, int nargs)
 		 */
 		// XXX BAD constant used here
 		iorequest.piod_op = PIOD_READ_D;
-		iorequest.piod_offs = (void *)(regs.r[_REG_SP] +
+		iorequest.piod_offs = (void *)(regs.r_sp +
 		    4 * sizeof(uint32_t));
 		iorequest.piod_addr = &fsc->args[4];
 		iorequest.piod_len = (nargs - 4) * sizeof(fsc->args[0]);
@@ -316,7 +316,7 @@ arm_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
 	}
 
 	retval = regs.r[0];
-	errorp = !!(regs.r_cpsr & PSR_C_bit);
+	errorp = !!(regs.r_cpsr & PSR_C);
 
 	/*
 	 * This code, while simpler than the initial versions I used, could
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 227f3c26adc2..669ac3fba095 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -657,6 +657,8 @@ dovmstat(unsigned int interval, int reps)
 	uptime = getuptime();
 	halfuptime = uptime / 2;
 	rate_adj = 1;
+	ncpus = 1;
+	maxid = 0;
 
 	/*
 	 * If the user stops the program (control-Z) and then resumes it,
@@ -702,7 +704,7 @@ dovmstat(unsigned int interval, int reps)
 	}
 	for (hdrcnt = 1;;) {
 		if (!--hdrcnt)
-			printhdr(ncpus, cpumask);
+			printhdr(maxid, cpumask);
 		if (kd != NULL) {
 			if (kvm_getcptime(kd, cur.cp_time) < 0)
 				errx(1, "kvm_getcptime: %s", kvm_geterr(kd));
@@ -753,7 +755,7 @@ dovmstat(unsigned int interval, int reps)
 				errx(1, "%s", devstat_errbuf);
 				break;
 			case 1:
-				printhdr(ncpus, cpumask);
+				printhdr(maxid, cpumask);
 				break;
 			default:
 				break;
@@ -822,7 +824,7 @@ dovmstat(unsigned int interval, int reps)
 }
 
 static void
-printhdr(int ncpus, u_long cpumask)
+printhdr(int maxid, u_long cpumask)
 {
 	int i, num_shown;
 
@@ -834,7 +836,7 @@ printhdr(int ncpus, u_long cpumask)
 		(void)printf("disk");
 	(void)printf("   faults         ");
 	if (Pflag) {
-		for (i = 0; i < ncpus; i++) {
+		for (i = 0; i <= maxid; i++) {
 			if (cpumask & (1ul << i))
 				printf("cpu%-2d    ", i);
 		}
@@ -850,8 +852,10 @@ printhdr(int ncpus, u_long cpumask)
 				     dev_select[i].unit_number);
 	(void)printf("  in   sy   cs");
 	if (Pflag) {
-		for (i = 0; i < ncpus; i++)
-			printf(" us sy id");
+		for (i = 0; i <= maxid; i++) {
+			if (cpumask & (1ul << i))
+				printf(" us sy id");
+		}
 		printf("\n");
 	} else
 		printf(" us sy id\n");
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index f40cdc5e7870..b59db70bf99d 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1263,13 +1263,18 @@ install_dir(char *path)
 		if (!*p || (p != path && *p  == '/')) {
 			ch = *p;
 			*p = '\0';
-			if (stat(path, &sb)) {
-				if (errno != ENOENT || mkdir(path, 0755) < 0) {
+again:
+			if (stat(path, &sb) < 0) {
+				if (errno != ENOENT)
+					err(EX_OSERR, "stat %s", path);
+				if (mkdir(path, 0755) < 0) {
+					if (errno == EEXIST)
+						goto again;
 					err(EX_OSERR, "mkdir %s", path);
-					/* NOTREACHED */
-				} else if (verbose)
+				}
+				if (verbose)
 					(void)printf("install: mkdir %s\n",
-						     path);
+					    path);
 			} else if (!S_ISDIR(sb.st_mode))
 				errx(EX_OSERR, "%s exists but is not a directory", path);
 			if (!(*p = ch))
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f4c51d2e7a60..b0cff950bf2b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -26,7 +26,6 @@ SUBDIR=	adduser \
 	digictl \
 	diskinfo \
 	dumpcis \
-	etcupdate \
 	extattr \
 	extattrctl \
 	fifolog \
@@ -278,6 +277,10 @@ SUBDIR+=	repquota
 SUBDIR+=	rwhod
 .endif
 
+.if ${MK_RCS} != "no"
+SUBDIR+=	etcupdate
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=	editmap
 SUBDIR+=	mailstats
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64
index b82162580bbc..2d1a3e8daadd 100644
--- a/usr.sbin/Makefile.amd64
+++ b/usr.sbin/Makefile.amd64
@@ -18,6 +18,9 @@ SUBDIR+=	boot0cfg
 SUBDIR+=	btxld
 .endif
 SUBDIR+=	cpucontrol
+.if ${MK_HYPERV} != "no"
+SUBDIR+=	hyperv
+.endif
 SUBDIR+=	kgmon
 SUBDIR+=	lptcontrol
 SUBDIR+=	mount_smbfs
diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386
index 7d66f783f28a..de7bb464f581 100644
--- a/usr.sbin/Makefile.i386
+++ b/usr.sbin/Makefile.i386
@@ -9,6 +9,9 @@ SUBDIR+=	asf
 SUBDIR+=	btxld
 .endif
 SUBDIR+=	cpucontrol
+.if ${MK_HYPERV} != "no"
+SUBDIR+=	hyperv
+.endif
 SUBDIR+=	kgmon
 SUBDIR+=	kgzip
 SUBDIR+=	lptcontrol
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index 5f862a2c621e..0bbadc1e8fb9 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -3,5 +3,6 @@
 
 PROG=	acpiconf
 MAN=	acpiconf.8
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index c08c70b41b62..15d114d7892e 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -3,10 +3,13 @@
 PROG=	acpidb
 SRCS=	acpidb.c
 
+# common
+SRCS+=	acgetline.c ahids.c ahuuids.c cmfsize.c
+
 # components/debugger
 SRCS+=	dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c	\
 	dbhistry.c dbinput.c dbmethod.c dbnames.c dbstats.c	\
-	dbutils.c dbxface.c
+	dbtest.c dbutils.c dbxface.c
 
 # components/disassembler
 SRCS+=	dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c	\
@@ -46,26 +49,27 @@ SRCS+=	psargs.c psloop.c psobject.c psopcode.c psopinfo.c	\
 	psparse.c psscope.c pstree.c psutils.c pswalk.c		\
 	psxface.c
 
-# components/os_specific/service_layers
-SRCS+=	osunixxf.c
-
 # components/resources
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsdumpinfo.c	\
 	rsinfo.c rsio.c rsirq.c rslist.c rsmemory.c rsmisc.c	\
 	rsserial.c rsutils.c rsxface.c
 
 # components/tables
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbprint.c tbutils.c	\
-	tbxface.c tbxfload.c
+SRCS+=	tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c		\
+	tbutils.c tbxface.c tbxfload.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
 	utdebug.c utdecode.c utdelete.c uterror.c uteval.c	\
-	utexcep.c utglobal.c utids.c utinit.c utlock.c utmath.c	\
-	utmisc.c utmutex.c utobject.c utosi.c utownerid.c	\
-	utpredef.c utresrc.c utstate.c utstring.c uttrack.c	\
+	utexcep.c utfileio.c utglobal.c uthex.c utids.c		\
+	utinit.c utlock.c utmath.c utmisc.c utmutex.c		\
+	utobject.c utosi.c utownerid.c utpredef.c utprint.c	\
+	utresrc.c utstate.c utstring.c uttrack.c utuuid.c	\
 	utxface.c utxferror.c utxfinit.c
 
+# os_specific/service_layers
+SRCS+=	oslibcfs.c osunixxf.c
+
 MAN=	acpidb.8
 WARNS?=	3
 
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 3cd8d3fc7456..3688cafd70cd 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -45,6 +45,7 @@
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/acdebug.h>
+#include <contrib/dev/acpica/include/amlresrc.h>
 
 /*
  * Dummy DSDT Table Header
@@ -89,9 +90,9 @@ static UINT64		 aml_simulate_prompt(char *msg, UINT64 def_val);
 static void		 aml_simulation_regload(const char *dumpfile);
 static void		 aml_simulation_regdump(const char *dumpfile);
 
-/* Stubs to simplify linkage to the ACPI CA core subsystem. */
+/* Stubs to simplify linkage to the ACPICA core subsystem. */
 ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer(void)
+AcpiOsGetRootPointer(void)
 {
 
 	return (0);
@@ -102,6 +103,18 @@ AeTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable)
 {
 }
 
+void
+MpSaveGpioInfo(ACPI_PARSE_OBJECT *Op, AML_RESOURCE *Resource,
+    UINT32 PinCount, UINT16 *PinList, char *DeviceName)
+{
+}
+
+void
+MpSaveSerialInfo(ACPI_PARSE_OBJECT *Op, AML_RESOURCE *Resource,
+    char *DeviceName)
+{
+}
+
 static void
 aml_simulation_init(void)
 {
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index e00450091222..e258f8e34f05 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -3,5 +3,6 @@
 PROG=	acpidump
 MAN=	acpidump.8
 SRCS=	acpi.c acpi_user.c acpidump.c
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 66cd7bd0087d..ae7ebf2b8931 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -934,10 +934,10 @@ acpi_handle_dmar_remapping_structure(void *addr, int remaining)
 	case ACPI_DMAR_TYPE_RESERVED_MEMORY:
 		acpi_handle_dmar_rmrr(addr);
 		break;
-	case ACPI_DMAR_TYPE_ATSR:
+	case ACPI_DMAR_TYPE_ROOT_ATS:
 		acpi_handle_dmar_atsr(addr);
 		break;
-	case ACPI_DMAR_HARDWARE_AFFINITY:
+	case ACPI_DMAR_TYPE_HARDWARE_AFFINITY:
 		acpi_handle_dmar_rhsa(addr);
 		break;
 	default:
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index 161b2f412348..8f021a3d7e7a 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,29 +1,31 @@
 # $FreeBSD$
 
 PROG=	iasl
-SRCS=	adfile.c adisasm.c adwalk.c
 
 # common
-SRCS+=	ahpredef.c dmextern.c dmrestag.c dmtable.c dmtbdump.c	\
-	dmtbinfo.c getopt.c
+SRCS=	adfile.c adisasm.c adwalk.c ahids.c ahpredef.c		\
+	ahuuids.c cmfsize.c dmextern.c dmrestag.c dmtable.c	\
+	dmtbdump.c dmtbinfo.c getopt.c
 
 # compiler
-SRCS+=	aslanalyze.c aslbtypes.c aslcodegen.c aslcompile.c	\
-	aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
-	aslerror.c aslfileio.c aslfiles.c aslfold.c aslhex.c	\
-	asllength.c asllisting.c asllistsup.c aslload.c		\
-	asllookup.c aslmain.c aslmap.c aslmethod.c aslnamesp.c	\
-	asloffset.c aslopcodes.c asloperands.c aslopt.c		\
-	asloptions.c aslpredef.c aslprepkg.c aslresource.c	\
-	aslrestype1.c aslrestype1i.c aslrestype2.c		\
-	aslrestype2d.c aslrestype2e.c aslrestype2q.c		\
-	aslrestype2s.c aslrestype2w.c aslstartup.c aslstubs.c	\
-	asltransform.c asltree.c aslutils.c asluuid.c		\
-	aslwalks.c aslxref.c dtcompile.c dtexpress.c dtfield.c	\
-	dtio.c dtparser.y.h dtparserlex.c dtparserparse.c	\
-	dtsubtable.c dttable.c dttemplate.c dtutils.c		\
-	prexpress.c prmacros.c prparser.y.h prparserlex.c	\
-	prparserparse.c prscan.c prutils.c
+SRCS+=	aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c	\
+	aslcompile.c aslcompiler.y.h aslcompilerlex.c		\
+	aslcompilerparse.c aslerror.c aslfileio.c aslfiles.c	\
+	aslfold.c aslhex.c asllength.c asllisting.c		\
+	asllistsup.c aslload.c asllookup.c aslmain.c aslmap.c	\
+	aslmapenter.c aslmapoutput.c aslmaputils.c		\
+	aslmessages.c aslmethod.c aslnamesp.c asloffset.c	\
+	aslopcodes.c asloperands.c aslopt.c asloptions.c	\
+	aslpredef.c aslprepkg.c aslresource.c aslrestype1.c	\
+	aslrestype1i.c aslrestype2.c aslrestype2d.c		\
+	aslrestype2e.c aslrestype2q.c aslrestype2s.c		\
+	aslrestype2w.c aslstartup.c aslstubs.c asltransform.c	\
+	asltree.c aslutils.c asluuid.c aslwalks.c aslxref.c	\
+	dtcompile.c dtexpress.c dtfield.c dtio.c dtparser.y.h	\
+	dtparserlex.c dtparserparse.c dtsubtable.c dttable.c	\
+	dttemplate.c dtutils.c prexpress.c prmacros.c		\
+	prparser.y.h prparserlex.c prparserparse.c prscan.c	\
+	prutils.c
 
 # components/debugger
 SRCS+=	dbfileio.c
@@ -52,17 +54,19 @@ SRCS+=	nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c	\
 	nsparse.c nssearch.c nsutils.c nswalk.c
 
 # components/tables
-SRCS+=	tbfadt.c tbinstal.c tbprint.c tbutils.c tbxface.c
+SRCS+=	tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c	\
+	tbxface.c
 
 # components/utilities
 SRCS+=	utaddress.c utalloc.c utbuffer.c utcache.c utcopy.c	\
 	utdebug.c utdecode.c utdelete.c uterror.c utexcep.c	\
-	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
-	utmutex.c utobject.c utownerid.c utpredef.c utresrc.c	\
-	utstate.c utstring.c utxface.c utxferror.c
+	utfileio.c utglobal.c uthex.c utinit.c utlock.c		\
+	utmath.c utmisc.c utmutex.c utobject.c utownerid.c	\
+	utpredef.c utprint.c utresrc.c utstate.c utstring.c	\
+	utuuid.c utxface.c utxferror.c
 
 # os_specific/service_layers
-SRCS+=	osunixxf.c
+SRCS+=	oslibcfs.c osunixxf.c
 
 WARNS?=	2
 
@@ -72,15 +76,20 @@ CFLAGS+= -DACPI_ASL_COMPILER -I.
 LFLAGS= -i -s
 YFLAGS= -d
 
-CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c	\
-	aslcompilerparse.h dtparser.y.h dtparserlex.c		\
-	dtparserparse.c dtparserparse.h prparser.y.h		\
-	prparserlex.c prparserparse.c prparserparse.h
+CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c	\
+	aslcompilerparse.c aslcompilerparse.h dtparser.y.h	\
+	dtparserlex.c dtparserparse.c dtparserparse.h		\
+	prparser.y.h prparserlex.c prparserparse.c		\
+	prparserparse.h
 
 aslcompilerlex.c: aslcompiler.l aslsupport.l
 	${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \
 	    ${ACPICA_DIR}/compiler/aslcompiler.l
 
+aslcompiler.y: aslparser.y aslrules.y aslsupport.y asltokens.y asltypes.y
+	m4 -P -I${ACPICA_DIR}/compiler \
+	    ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET}
+
 .ORDER: aslcompilerparse.c aslcompilerparse.h
 aslcompilerparse.c aslcompilerparse.h: aslcompiler.y
 	${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c ${.ALLSRC}
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 1d1117c2ba8e..cefbcc8b3104 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -673,11 +673,21 @@ node_find(struct node *node, const char *path)
 {
 	struct node *child, *found;
 	char *tmp;
+	size_t tmplen;
 
 	//log_debugx("looking up %s in %s", path, node->n_key);
 
 	tmp = node_path(node);
-	if (strncmp(tmp, path, strlen(tmp)) != 0) {
+	tmplen = strlen(tmp);
+	if (strncmp(tmp, path, tmplen) != 0) {
+		free(tmp);
+		return (NULL);
+	}
+	if (path[tmplen] != '/' && path[tmplen] != '\0') {
+		/*
+		 * If we have two map entries like 'foo' and 'foobar', make
+		 * sure the search for 'foobar' won't match 'foo' instead.
+		 */
 		free(tmp);
 		return (NULL);
 	}
diff --git a/usr.sbin/autofs/token.l b/usr.sbin/autofs/token.l
index 8224042114d8..5062a137a23a 100644
--- a/usr.sbin/autofs/token.l
+++ b/usr.sbin/autofs/token.l
@@ -48,6 +48,7 @@ extern int	yylex(void);
 %option noyywrap
 
 %%
+\"[^"]+\"		{ yytext++; yytext[strlen(yytext) - 1] = '\0'; return STR; };
 [a-zA-Z0-9\.\+-_/\:\[\]$&{}]+ { return STR; }
 #.*\n			{ lineno++; return NEWLINE; };
 \\\n			{ lineno++; };
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 5dea3001de22..b955eccecec6 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -430,7 +430,10 @@ basl_fwrite_fadt(FILE *fp)
 	EFPRINTF(fp, "\n");
 
 	EFPRINTF(fp, "[0001]\t\tValue to cause reset : 06\n");
-	EFPRINTF(fp, "[0003]\t\tReserved : 000000\n");
+	EFPRINTF(fp, "[0002]\t\tARM Flags (decoded below): 0000\n");
+	EFPRINTF(fp, "\t\t\tPSCI Compliant : 0\n");
+	EFPRINTF(fp, "\t\t\tMust use HVC for PSCI : 0\n");
+	EFPRINTF(fp, "[0001]\t\tFADT Minor Revision : 01\n");
 	EFPRINTF(fp, "[0008]\t\tFACS Address : 00000000%08X\n",
 	    basl_acpi_base + FACS_OFFSET);
 	EFPRINTF(fp, "[0008]\t\tDSDT Address : 00000000%08X\n",
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index 114aaf162533..755fa3356b34 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 26, 2014
+.Dd September 17, 2014
 .Dt BHYVE 8
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Ar vmname
 .Sh DESCRIPTION
 .Nm
-is an experimental hypervisor that runs guest operating systems inside a
+is a hypervisor that runs guest operating systems inside a
 virtual machine.
 .Pp
 Parameters such as the number of virtual CPUs, amount of guest memory, and
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 7dcf6d016b87..b2b36bb17478 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -803,6 +803,12 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
+	error = init_msr();
+	if (error) {
+		fprintf(stderr, "init_msr error %d", error);
+		exit(1);
+	}
+
 	init_mem();
 	init_inout();
 	pci_irq_init(ctx);
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index 1ec0344f3fca..b03822807d4b 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -278,6 +278,7 @@ blockif_open(const char *optstr, const char *ident)
 
 	bc->bc_magic = BLOCKIF_SIG;
 	bc->bc_fd = fd;
+	bc->bc_rdonly = ro;
 	bc->bc_size = size;
 	bc->bc_sectsz = sectsz;
 	pthread_mutex_init(&bc->bc_mtx, NULL);
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index cf1c65557015..394b116b3028 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -133,6 +133,7 @@ static struct virtio_consts vtblk_vi_consts = {
 	pci_vtblk_notify,	/* device-wide qnotify */
 	pci_vtblk_cfgread,	/* read PCI config */
 	pci_vtblk_cfgwrite,	/* write PCI config */
+	NULL,			/* apply negotiated features */
 	VTBLK_S_HOSTCAPS,	/* our capabilities */
 };
 
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index c3b8690bb6e0..5ac9ecd45d11 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -135,11 +135,14 @@ struct pci_vtnet_softc {
 	int		vsc_rx_ready;
 	volatile int	resetting;	/* set and checked outside lock */
 
-	uint32_t	vsc_features;
+	uint64_t	vsc_features;	/* negotiated features */
+	
 	struct virtio_net_config vsc_config;
 
 	pthread_mutex_t	rx_mtx;
 	int		rx_in_progress;
+	int		rx_vhdrlen;
+	int		rx_merge;	/* merged rx bufs in use */
 
 	pthread_t 	tx_tid;
 	pthread_mutex_t	tx_mtx;
@@ -151,6 +154,7 @@ static void pci_vtnet_reset(void *);
 /* static void pci_vtnet_notify(void *, struct vqueue_info *); */
 static int pci_vtnet_cfgread(void *, int, int, uint32_t *);
 static int pci_vtnet_cfgwrite(void *, int, int, uint32_t);
+static void pci_vtnet_neg_features(void *, uint64_t);
 
 static struct virtio_consts vtnet_vi_consts = {
 	"vtnet",		/* our name */
@@ -160,6 +164,7 @@ static struct virtio_consts vtnet_vi_consts = {
 	NULL,			/* device-wide qnotify -- not used */
 	pci_vtnet_cfgread,	/* read PCI config */
 	pci_vtnet_cfgwrite,	/* write PCI config */
+	pci_vtnet_neg_features,	/* apply negotiated features */
 	VTNET_S_HOSTCAPS,	/* our capabilities */
 };
 
@@ -212,6 +217,8 @@ pci_vtnet_reset(void *vsc)
 	pci_vtnet_rxwait(sc);
 
 	sc->vsc_rx_ready = 0;
+	sc->rx_merge = 1;
+	sc->rx_vhdrlen = sizeof(struct virtio_net_rxhdr);
 
 	/* now reset rings, MSI-X vectors, and negotiated capabilities */
 	vi_reset_dev(&sc->vsc_vs);
@@ -253,14 +260,34 @@ pci_vtnet_tap_tx(struct pci_vtnet_softc *sc, struct iovec *iov, int iovcnt,
  */
 static uint8_t dummybuf[2048];
 
+static __inline struct iovec *
+rx_iov_trim(struct iovec *iov, int *niov, int tlen)
+{
+	struct iovec *riov;
+
+	/* XXX short-cut: assume first segment is >= tlen */
+	assert(iov[0].iov_len >= tlen);
+
+	iov[0].iov_len -= tlen;
+	if (iov[0].iov_len == 0) {
+		assert(*niov > 1);
+		*niov -= 1;
+		riov = &iov[1];
+	} else {
+		iov[0].iov_base = (void *)((uintptr_t)iov[0].iov_base + tlen);
+		riov = &iov[0];
+	}
+
+	return (riov);
+}
+
 static void
 pci_vtnet_tap_rx(struct pci_vtnet_softc *sc)
 {
+	struct iovec iov[VTNET_MAXSEGS], *riov;
 	struct vqueue_info *vq;
-	struct virtio_net_rxhdr *vrx;
-	uint8_t *buf;
-	int len;
-	struct iovec iov;
+	void *vrx;
+	int len, n;
 
 	/*
 	 * Should never be called without a valid tap fd
@@ -296,21 +323,19 @@ pci_vtnet_tap_rx(struct pci_vtnet_softc *sc)
 
 	do {
 		/*
-		 * Get descriptor chain, which should have just
-		 * one descriptor in it.
-		 * ??? allow guests to use multiple descs?
+		 * Get descriptor chain.
 		 */
-		assert(vq_getchain(vq, &iov, 1, NULL) == 1);
+		n = vq_getchain(vq, iov, VTNET_MAXSEGS, NULL);
+		assert(n >= 1 && n <= VTNET_MAXSEGS);
 
 		/*
 		 * Get a pointer to the rx header, and use the
 		 * data immediately following it for the packet buffer.
 		 */
-		vrx = iov.iov_base;
-		buf = (uint8_t *)(vrx + 1);
+		vrx = iov[0].iov_base;
+		riov = rx_iov_trim(iov, &n, sc->rx_vhdrlen);
 
-		len = read(sc->vsc_tapfd, buf,
-			   iov.iov_len - sizeof(struct virtio_net_rxhdr));
+		len = readv(sc->vsc_tapfd, riov, n);
 
 		if (len < 0 && errno == EWOULDBLOCK) {
 			/*
@@ -323,16 +348,21 @@ pci_vtnet_tap_rx(struct pci_vtnet_softc *sc)
 
 		/*
 		 * The only valid field in the rx packet header is the
-		 * number of buffers, which is always 1 without TSO
-		 * support.
+		 * number of buffers if merged rx bufs were negotiated.
 		 */
-		memset(vrx, 0, sizeof(struct virtio_net_rxhdr));
-		vrx->vrh_bufs = 1;
+		memset(vrx, 0, sc->rx_vhdrlen);
+
+		if (sc->rx_merge) {
+			struct virtio_net_rxhdr *vrxh;
+
+			vrxh = vrx;
+			vrxh->vrh_bufs = 1;
+		}
 
 		/*
 		 * Release this chain and handle more chains.
 		 */
-		vq_relchain(vq, len + sizeof(struct virtio_net_rxhdr));
+		vq_relchain(vq, len + sc->rx_vhdrlen);
 	} while (vq_has_descs(vq));
 
 	/* Interrupt if needed, including for NOTIFY_ON_EMPTY. */
@@ -623,6 +653,8 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 
 	sc->resetting = 0;
 
+	sc->rx_merge = 1;
+	sc->rx_vhdrlen = sizeof(struct virtio_net_rxhdr);
 	sc->rx_in_progress = 0;
 	pthread_mutex_init(&sc->rx_mtx, NULL); 
 
@@ -656,9 +688,10 @@ pci_vtnet_cfgwrite(void *vsc, int offset, int size, uint32_t value)
 		ptr = &sc->vsc_config.mac[offset];
 		memcpy(ptr, &value, size);
 	} else {
+		/* silently ignore other writes */
 		DPRINTF(("vtnet: write to readonly reg %d\n\r", offset));
-		return (1);
 	}
+
 	return (0);
 }
 
@@ -673,6 +706,20 @@ pci_vtnet_cfgread(void *vsc, int offset, int size, uint32_t *retval)
 	return (0);
 }
 
+static void
+pci_vtnet_neg_features(void *vsc, uint64_t negotiated_features)
+{
+	struct pci_vtnet_softc *sc = vsc;
+
+	sc->vsc_features = negotiated_features;
+
+	if (!(sc->vsc_features & VIRTIO_NET_F_MRG_RXBUF)) {
+		sc->rx_merge = 0;
+		/* non-merge rx header is 2 bytes shorter */
+		sc->rx_vhdrlen -= 2;
+	}
+}
+
 struct pci_devemu pci_de_vnet = {
 	.pe_emu = 	"virtio-net",
 	.pe_init =	pci_vtnet_init,
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index 4d531834cbe2..0a31080114c0 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -80,6 +80,7 @@ static struct virtio_consts vtrnd_vi_consts = {
 	pci_vtrnd_notify,	/* device-wide qnotify */
 	NULL,			/* read virtio config */
 	NULL,			/* write virtio config */
+	NULL,			/* apply negotiated features */
 	0,			/* our capabilities */
 };
 
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index 28c7eb2c74b4..59a1358bd0b0 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -737,7 +737,7 @@ smbios_ep_initializer(struct smbios_entry_point *smbios_ep, uint32_t staddr)
 	smbios_ep->eplen = 0x1F;
 	assert(sizeof (struct smbios_entry_point) == smbios_ep->eplen);
 	smbios_ep->major = 2;
-	smbios_ep->minor = 4;
+	smbios_ep->minor = 6;
 	smbios_ep->revision = 0;
 	memcpy(smbios_ep->ianchor, SMBIOS_ENTRY_IANCHOR,
 	    SMBIOS_ENTRY_IANCHORLEN);
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 2f04b90ab44f..19c0d4710d28 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -698,6 +698,9 @@ vi_pci_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
 	switch (offset) {
 	case VTCFG_R_GUESTCAP:
 		vs->vs_negotiated_caps = value & vc->vc_hv_caps;
+		if (vc->vc_apply_features)
+			(*vc->vc_apply_features)(DEV_SOFTC(vs),
+			    vs->vs_negotiated_caps);
 		break;
 	case VTCFG_R_PFN:
 		if (vs->vs_curq >= vc->vc_nvq)
diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h
index 1f29dfa8ef73..6f655f3f7980 100644
--- a/usr.sbin/bhyve/virtio.h
+++ b/usr.sbin/bhyve/virtio.h
@@ -352,6 +352,8 @@ struct virtio_consts {
 					/* called to read config regs */
 	int	(*vc_cfgwrite)(void *, int, int, uint32_t);
 					/* called to write config regs */
+	void    (*vc_apply_features)(void *, uint64_t);
+				/* called to apply negotiated features */
 	uint64_t vc_hv_caps;		/* hypervisor-provided capabilities */
 };
 
diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c
index 63522bf023be..c0ab7c55f3bc 100644
--- a/usr.sbin/bhyve/xmsr.c
+++ b/usr.sbin/bhyve/xmsr.c
@@ -31,33 +31,84 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+#include <machine/cpufunc.h>
 #include <machine/vmm.h>
+#include <machine/specialreg.h>
+
 #include <vmmapi.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "xmsr.h"
 
+static int cpu_vendor_intel, cpu_vendor_amd;
+
 int
 emulate_wrmsr(struct vmctx *ctx, int vcpu, uint32_t code, uint64_t val)
 {
 
-	switch (code) {
-	case 0xd04:			/* Sandy Bridge uncore PMC MSRs */
-	case 0xc24:
-		return (0);
-	case 0x79:
-		return (0);		/* IA32_BIOS_UPDT_TRIG MSR */
-	default:
-		break;
+	if (cpu_vendor_intel) {
+		switch (code) {
+		case 0xd04:		/* Sandy Bridge uncore PMCs */
+		case 0xc24:
+			return (0);
+		case MSR_BIOS_UPDT_TRIG:
+			return (0);
+		case MSR_BIOS_SIGN:
+			return (0);
+		default:
+			break;
+		}
 	}
 	return (-1);
 }
 
 int
-emulate_rdmsr(struct vmctx *ctx, int vcpu, uint32_t code, uint64_t *val)
+emulate_rdmsr(struct vmctx *ctx, int vcpu, uint32_t num, uint64_t *val)
 {
+	int error = 0;
 
-	return (-1);
+	if (cpu_vendor_intel) {
+		switch (num) {
+		case MSR_BIOS_SIGN:
+		case MSR_IA32_PLATFORM_ID:
+		case MSR_PKG_ENERGY_STATUS:
+		case MSR_PP0_ENERGY_STATUS:
+		case MSR_PP1_ENERGY_STATUS:
+		case MSR_DRAM_ENERGY_STATUS:
+			*val = 0;
+			break;
+		default:
+			error = -1;
+			break;
+		}
+	}
+	return (error);
+}
+
+int
+init_msr(void)
+{
+	int error;
+	u_int regs[4];
+	char cpu_vendor[13];
+
+	do_cpuid(0, regs);
+	((u_int *)&cpu_vendor)[0] = regs[1];
+	((u_int *)&cpu_vendor)[1] = regs[3];
+	((u_int *)&cpu_vendor)[2] = regs[2];
+	cpu_vendor[12] = '\0';
+
+	error = 0;
+	if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+		cpu_vendor_amd = 1;
+	} else if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
+		cpu_vendor_intel = 1;
+	} else {
+		fprintf(stderr, "Unknown cpu vendor \"%s\"\n", cpu_vendor);
+		error = -1;
+	}
+	return (error);
 }
diff --git a/usr.sbin/bhyve/xmsr.h b/usr.sbin/bhyve/xmsr.h
index b097cf885357..bcf65b712736 100644
--- a/usr.sbin/bhyve/xmsr.h
+++ b/usr.sbin/bhyve/xmsr.h
@@ -29,6 +29,7 @@
 #ifndef	_XMSR_H_
 #define	_XMSR_H_
 
+int init_msr(void);
 int emulate_wrmsr(struct vmctx *ctx, int vcpu, uint32_t code, uint64_t val);
 int emulate_rdmsr(struct vmctx *ctx, int vcpu, uint32_t code, uint64_t *val);
 
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index b6006b72a767..f5e50d35b219 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -309,7 +309,7 @@ dump_vmcs_msr_bitmap(int vcpu, u_long addr)
 	if (fd < 0)
 		goto done;
 
-	bitmap = mmap(NULL, PAGE_SIZE, PROT_READ, 0, fd, addr);
+	bitmap = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, addr);
 	if (bitmap == MAP_FAILED)
 		goto done;
 
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index a35dbd606c19..54e0171cfe90 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2011 Nathan Whitehorn
+ * Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,114 +23,199 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
-#include <stdio.h>
+#include <archive.h>
+#include <ctype.h>
+#include <dialog.h>
+#include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <archive.h>
-#include <dialog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-static int extract_files(int nfiles, const char **files);
+/* Data to process */
+static char *distdir = NULL;
+struct file_node {
+	char	*path;
+	char	*name;
+	int	length;
+	struct file_node *next;
+};
+static struct file_node *dists = NULL;
+
+/* Function prototypes */
+static int	count_files(const char *file);
+static int	extract_files(int nfiles, struct file_node *files);
+
+#if __FreeBSD_version <= 1000008 /* r232154: bump for libarchive update */
+#define archive_read_support_filter_all(x) \
+	archive_read_support_compression_all(x)
+#endif
+
+#define _errx(...) (end_dialog(), errx(__VA_ARGS__))
 
 int
 main(void)
 {
-	char *diststring;
-	const char **dists;
-	int i, retval, ndists = 0;
+	char *chrootdir;
+	char *distributions;
+	int ndists = 0;
+	int retval;
+	size_t file_node_size = sizeof(struct file_node);
+	size_t span;
+	struct file_node *dist = dists;
+	char error[PATH_MAX + 512];
 
-	if (getenv("DISTRIBUTIONS") == NULL) {
-		fprintf(stderr, "DISTRIBUTIONS variable is not set\n");
-		return (1);
-	}
-
-	diststring = strdup(getenv("DISTRIBUTIONS"));
-	for (i = 0; diststring[i] != 0; i++)
-		if (isspace(diststring[i]) && !isspace(diststring[i+1]))
-			ndists++;
-	ndists++; /* Last one */
-
-	dists = calloc(ndists, sizeof(const char *));
-	if (dists == NULL) {
-		fprintf(stderr, "Out of memory!\n");
-		free(diststring);
-		return (1);
-	}
-
-	for (i = 0; i < ndists; i++)
-		dists[i] = strsep(&diststring, " \t");
+	if ((distributions = getenv("DISTRIBUTIONS")) == NULL)
+		errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set");
+	if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL)
+		distdir = __DECONST(char *, "");
 
+	/* Initialize dialog(3) */
 	init_dialog(stdin, stdout);
 	dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");
 	dlg_put_backtitle();
 
-	if (chdir(getenv("BSDINSTALL_CHROOT")) != 0) {
-		char error[512];
-		sprintf(error, "Could could change to directory %s: %s\n",
-		    getenv("BSDINSTALL_DISTDIR"), strerror(errno));
+	dialog_msgbox("",
+	    "Checking distribution archives.\nPlease wait...", 4, 35, FALSE);
+
+	/*
+	 * Parse $DISTRIBUTIONS into linked-list
+	 */
+	while (*distributions != '\0') {
+		span = strcspn(distributions, "\t\n\v\f\r ");
+		if (span < 1) { /* currently on whitespace */
+			distributions++;
+			continue;
+		}
+		ndists++;
+
+		/* Allocate a new struct for the distribution */
+		if (dist == NULL) {
+			if ((dist = calloc(1, file_node_size)) == NULL)
+				_errx(EXIT_FAILURE, "Out of memory!");
+			dists = dist;
+		} else {
+			dist->next = calloc(1, file_node_size);
+			if (dist->next == NULL)
+				_errx(EXIT_FAILURE, "Out of memory!");
+			dist = dist->next;
+		}
+
+		/* Set path */
+		if ((dist->path = malloc(span + 1)) == NULL)
+			_errx(EXIT_FAILURE, "Out of memory!");
+		snprintf(dist->path, span + 1, "%s", distributions);
+		dist->path[span] = '\0';
+
+		/* Set display name */
+		dist->name = strrchr(dist->path, '/');
+		if (dist->name == NULL)
+			dist->name = dist->path;
+
+		/* Set initial length in files (-1 == error) */
+		dist->length = count_files(dist->path);
+		if (dist->length < 0) {
+			end_dialog();
+			return (EXIT_FAILURE);
+		}
+
+		distributions += span;
+	}
+
+	/* Optionally chdir(2) into $BSDINSTALL_CHROOT */
+	chrootdir = getenv("BSDINSTALL_CHROOT");
+	if (chrootdir != NULL && chdir(chrootdir) != 0) {
+		snprintf(error, sizeof(error),
+		    "Could not change to directory %s: %s\n",
+		    chrootdir, strerror(errno));
 		dialog_msgbox("Error", error, 0, 0, TRUE);
 		end_dialog();
-		return (1);
+		return (EXIT_FAILURE);
 	}
 
 	retval = extract_files(ndists, dists);
 
 	end_dialog();
 
-	free(diststring);
-	free(dists);
+	while ((dist = dists) != NULL) {
+		dists = dist->next;
+		if (dist->path != NULL)
+			free(dist->path);
+		free(dist);
+	}
 
 	return (retval);
 }
 
+/*
+ * Returns number of files in archive file. Parses $BSDINSTALL_DISTDIR/MANIFEST
+ * if it exists, otherwise uses archive(3) to read the archive file.
+ */
 static int
 count_files(const char *file)
 {
+	static FILE *manifest = NULL;
+	char *p;
+	int file_count;
+	int retval;
+	size_t span;
 	struct archive *archive;
 	struct archive_entry *entry;
-	static FILE *manifest = NULL;
-	char path[MAXPATHLEN];
-	char errormsg[512];
-	int file_count, err;
+	char line[512];
+	char path[PATH_MAX];
+	char errormsg[PATH_MAX + 512];
 
 	if (manifest == NULL) {
-		sprintf(path, "%s/MANIFEST", getenv("BSDINSTALL_DISTDIR"));
+		snprintf(path, sizeof(path), "%s/MANIFEST", distdir);
 		manifest = fopen(path, "r");
 	}
 
 	if (manifest != NULL) {
-		char line[512];
-		char *tok1, *tok2;
-
 		rewind(manifest);
 		while (fgets(line, sizeof(line), manifest) != NULL) {
-			tok2 = line;
-			tok1 = strsep(&tok2, "\t");
-			if (tok1 == NULL || strcmp(tok1, file) != 0)
+			p = &line[0];
+			span = strcspn(p, "\t") ;
+			if (span < 1 || strncmp(p, file, span) != 0)
 				continue;
 
 			/*
 			 * We're at the right manifest line. The file count is
 			 * in the third element
 			 */
-			tok1 = strsep(&tok2, "\t");
-			tok1 = strsep(&tok2, "\t");
-			if (tok1 != NULL)
-				return atoi(tok1);
+			span = strcspn(p += span + (*p != '\0' ? 1 : 0), "\t");
+			span = strcspn(p += span + (*p != '\0' ? 1 : 0), "\t");
+			if (span > 0) {
+				file_count = (int)strtol(p, (char **)NULL, 10);
+				if (file_count == 0 && errno == EINVAL)
+					continue;
+				return (file_count);
+			}
 		}
 	}
 
-	/* Either we didn't have a manifest, or this archive wasn't there */
-	archive = archive_read_new();
+	/*
+	 * Either no manifest, or manifest didn't mention this archive.
+	 * Use archive(3) to read the archive, counting files within.
+	 */
+	if ((archive = archive_read_new()) == NULL) {
+		snprintf(errormsg, sizeof(errormsg),
+		    "Error: %s\n", archive_error_string(NULL));
+		dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
+		return (-1);
+	}
 	archive_read_support_format_all(archive);
 	archive_read_support_filter_all(archive);
-	sprintf(path, "%s/%s", getenv("BSDINSTALL_DISTDIR"), file);
-	err = archive_read_open_filename(archive, path, 4096);
-	if (err != ARCHIVE_OK) {
+	snprintf(path, sizeof(path), "%s/%s", distdir, file);
+	retval = archive_read_open_filename(archive, path, 4096);
+	if (retval != ARCHIVE_OK) {
 		snprintf(errormsg, sizeof(errormsg),
 		    "Error while extracting %s: %s\n", file,
 		    archive_error_string(archive));
@@ -146,76 +232,83 @@ count_files(const char *file)
 }
 
 static int
-extract_files(int nfiles, const char **files)
+extract_files(int nfiles, struct file_node *files)
 {
-	const char *items[nfiles*2];
-	char path[PATH_MAX];
+	int archive_file;
 	int archive_files[nfiles];
-	int total_files, current_files, archive_file;
+	int current_files = 0;
+	int i;
+	int last_progress;
+	int progress = 0;
+	int retval;
+	int total_files = 0;
 	struct archive *archive;
 	struct archive_entry *entry;
-	char errormsg[512];
+	struct file_node *file;
 	char status[8];
-	int i, err, progress, last_progress;
+	static char title[] = "Archive Extraction";
+	static char pprompt[] = "Extracting distribution files...\n";
+	char path[PATH_MAX];
+	char errormsg[PATH_MAX + 512];
+	const char *items[nfiles*2];
 
-	err = 0;
-	progress = 0;
-	
 	/* Make the transfer list for dialog */
-	for (i = 0; i < nfiles; i++) {
-		items[i*2] = strrchr(files[i], '/');
-		if (items[i*2] != NULL)
-			items[i*2]++;
-		else
-			items[i*2] = files[i];
+	i = 0;
+	for (file = files; file != NULL; file = file->next) {
+		items[i*2] = file->name;
 		items[i*2 + 1] = "Pending";
+		archive_files[i] = file->length;
+
+		total_files += file->length;
+		i++;
 	}
 
-	dialog_msgbox("",
-	    "Checking distribution archives.\nPlease wait...", 0, 0, FALSE);
-
-	/* Count all the files */
-	total_files = 0;
-	for (i = 0; i < nfiles; i++) {
-		archive_files[i] = count_files(files[i]);
-		if (archive_files[i] < 0)
-			return (-1);
-		total_files += archive_files[i];
-	}
-
-	current_files = 0;
-
-	for (i = 0; i < nfiles; i++) {
-		archive = archive_read_new();
+	i = 0;
+	for (file = files; file != NULL; file = file->next) {
+		if ((archive = archive_read_new()) == NULL) {
+			snprintf(errormsg, sizeof(errormsg),
+			    "Error: %s\n", archive_error_string(NULL));
+			dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
+			return (EXIT_FAILURE);
+		}
 		archive_read_support_format_all(archive);
 		archive_read_support_filter_all(archive);
-		sprintf(path, "%s/%s", getenv("BSDINSTALL_DISTDIR"), files[i]);
-		err = archive_read_open_filename(archive, path, 4096);
+		snprintf(path, sizeof(path), "%s/%s", distdir, file->path);
+		retval = archive_read_open_filename(archive, path, 4096);
+		if (retval != 0) {
+			snprintf(errormsg, sizeof(errormsg),
+			    "Error opening %s: %s\n", file->name,
+			    archive_error_string(archive));
+			dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
+			return (EXIT_FAILURE);
+		}
 
 		items[i*2 + 1] = "In Progress";
 		archive_file = 0;
 
-		while ((err = archive_read_next_header(archive, &entry)) ==
+		dialog_mixedgauge(title, pprompt, 0, 0, progress, nfiles,
+		    __DECONST(char **, items));
+
+		while ((retval = archive_read_next_header(archive, &entry)) ==
 		    ARCHIVE_OK) {
 			last_progress = progress;
 			progress = (current_files*100)/total_files; 
 
-			sprintf(status, "-%d",
+			snprintf(status, sizeof(status), "-%d",
 			    (archive_file*100)/archive_files[i]);
 			items[i*2 + 1] = status;
 
 			if (progress > last_progress)
-				dialog_mixedgauge("Archive Extraction",
-				    "Extracting distribution files...", 0, 0,
+				dialog_mixedgauge(title, pprompt, 0, 0,
 				    progress, nfiles,
 				    __DECONST(char **, items));
 
-			err = archive_read_extract(archive, entry,
+			retval = archive_read_extract(archive, entry,
 			    ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_OWNER |
 			    ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_ACL |
 			    ARCHIVE_EXTRACT_XATTR | ARCHIVE_EXTRACT_FFLAGS);
 
-			if (err != ARCHIVE_OK)
+			if (retval != ARCHIVE_OK)
 				break;
 
 			archive_file++;
@@ -224,18 +317,22 @@ extract_files(int nfiles, const char **files)
 
 		items[i*2 + 1] = "Done";
 
-		if (err != ARCHIVE_EOF) {
+		if (retval != ARCHIVE_EOF) {
 			snprintf(errormsg, sizeof(errormsg),
 			    "Error while extracting %s: %s\n", items[i*2],
 			    archive_error_string(archive));
 			items[i*2 + 1] = "Failed";
-			dialog_msgbox("Extract Error", errormsg, 0, 0,
-			    TRUE);
-			return (err);
+			dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
+			return (retval);
 		}
 
+		progress = (current_files*100)/total_files; 
+		dialog_mixedgauge(title, pprompt, 0, 0, progress, nfiles,
+		    __DECONST(char **, items));
+
 		archive_read_free(archive);
+		i++;
 	}
 
-	return (0);
+	return (EXIT_SUCCESS);
 }
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index ae5766c75082..4e870c8bbdbf 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2011 Nathan Whitehorn
+ * Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,15 +23,21 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
-#include <stdio.h>
+#include <ctype.h>
+#include <err.h>
+#include <dialog.h>
 #include <errno.h>
 #include <fetch.h>
-#include <dialog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 static int fetch_files(int nfiles, char **urls);
 
@@ -39,12 +46,13 @@ main(void)
 {
 	char *diststring;
 	char **urls;
-	int i, nfetched, ndists = 0;
+	int i;
+	int ndists = 0;
+	int nfetched;
+	char error[PATH_MAX + 512];
 
-	if (getenv("DISTRIBUTIONS") == NULL) {
-		fprintf(stderr, "DISTRIBUTIONS variable is not set\n");
-		return (1);
-	}
+	if (getenv("DISTRIBUTIONS") == NULL)
+		errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set");
 
 	diststring = strdup(getenv("DISTRIBUTIONS"));
 	for (i = 0; diststring[i] != 0; i++)
@@ -54,9 +62,8 @@ main(void)
 
 	urls = calloc(ndists, sizeof(const char *));
 	if (urls == NULL) {
-		fprintf(stderr, "Out of memory!\n");
 		free(diststring);
-		return (1);
+		errx(EXIT_FAILURE, "Out of memory!");
 	}
 
 	init_dialog(stdin, stdout);
@@ -65,17 +72,17 @@ main(void)
 
 	for (i = 0; i < ndists; i++) {
 		urls[i] = malloc(PATH_MAX);
-		sprintf(urls[i], "%s/%s", getenv("BSDINSTALL_DISTSITE"),
-		    strsep(&diststring, " \t"));
+		snprintf(urls[i], PATH_MAX, "%s/%s",
+		    getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t"));
 	}
 
 	if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) {
-		char error[512];
-		sprintf(error, "Could could change to directory %s: %s\n",
+		snprintf(error, sizeof(error),
+		    "Could could change to directory %s: %s\n",
 		    getenv("BSDINSTALL_DISTDIR"), strerror(errno));
 		dialog_msgbox("Error", error, 0, 0, TRUE);
 		end_dialog();
-		return (1);
+		return (EXIT_FAILURE);
 	}
 
 	nfetched = fetch_files(ndists, urls);
@@ -87,31 +94,32 @@ main(void)
 		free(urls[i]);
 	free(urls);
 
-	return ((nfetched == ndists) ? 0 : 1);
+	return ((nfetched == ndists) ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
 static int
 fetch_files(int nfiles, char **urls)
 {
+	FILE *fetch_out;
+	FILE *file_out;
 	const char **items;
-	FILE *fetch_out, *file_out;
-	struct url_stat ustat;
-	off_t total_bytes, current_bytes, fsize;
-	char status[8];
-	char errormsg[512];
-	uint8_t block[4096];
-	size_t chunk;
-	int i, progress, last_progress;
+	int i;
+	int last_progress;
 	int nsuccess = 0; /* Number of files successfully downloaded */
+	int progress = 0;
+	size_t chunk;
+	off_t current_bytes;
+	off_t fsize;
+	off_t total_bytes;
+	char status[8];
+	struct url_stat ustat;
+	char errormsg[PATH_MAX + 512];
+	uint8_t block[4096];
 
-	progress = 0;
-	
 	/* Make the transfer list for dialog */
 	items = calloc(sizeof(char *), nfiles * 2);
-	if (items == NULL) {
-		fprintf(stderr, "Out of memory!\n");
-		return (-1);
-	}
+	if (items == NULL)
+		errx(EXIT_FAILURE, "Out of memory!");
 
 	for (i = 0; i < nfiles; i++) {
 		items[i*2] = strrchr(urls[i], '/');
@@ -177,7 +185,8 @@ fetch_files(int nfiles, char **urls)
 			}
 
 			if (ustat.size > 0) {
-				sprintf(status, "-%jd", (fsize*100)/ustat.size);
+				snprintf(status, sizeof(status), "-%jd",
+				    (fsize*100)/ustat.size);
 				items[i*2 + 1] = status;
 			}
 
@@ -212,4 +221,3 @@ fetch_files(int nfiles, char **urls)
 	free(items);
 	return (nsuccess);
 }
-
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index 27feb577e823..37b172e8cb39 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -27,6 +27,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <libutil.h>
 #include <inttypes.h>
@@ -119,6 +120,53 @@ newfs_command(const char *fstype, char *command, int use_default)
 			else if (strcmp(items[i].name, "TRIM") == 0)
 				strcat(command, "-t ");
 		}
+	} else if (strcmp(fstype, "freebsd-zfs") == 0) {
+		int i;
+		DIALOG_LISTITEM items[] = {
+			{"fletcher4", "checksum algorithm: fletcher4",
+			    "Use fletcher4 for data integrity checking. "
+			    "(default)", 1 },
+			{"fletcher2", "checksum algorithm: fletcher2",
+			    "Use fletcher2 for data integrity checking. "
+			    "(not recommended)", 0 },
+			{"sha256", "checksum algorithm: sha256",
+			    "Use sha256 for data integrity checking. "
+			    "(not recommended)", 0 },
+			{"atime", "Update atimes for files",
+			    "Disable atime update", 0 },
+		};
+
+		if (!use_default) {
+			int choice;
+			choice = dlg_checklist("ZFS Options", "", 0, 0, 0,
+			    sizeof(items)/sizeof(items[0]), items, NULL,
+			    FLAG_CHECK, &i);
+			if (choice == 1) /* Cancel */
+				return;
+		}
+
+		strcpy(command, "zpool create -f -m none ");
+		if (getenv("BSDINSTALL_TMPBOOT") != NULL) {
+			char zfsboot_path[MAXPATHLEN];
+			sprintf(zfsboot_path, "%s/zfs",
+			    getenv("BSDINSTALL_TMPBOOT"));
+			mkdir(zfsboot_path, S_IRWXU | S_IRGRP | S_IXGRP |
+			    S_IROTH | S_IXOTH);
+			sprintf(command, "%s -o cachefile=%s/zpool.cache ",
+			    command, zfsboot_path);
+		}
+		for (i = 0; i < (int)(sizeof(items)/sizeof(items[0])); i++) {
+			if (items[i].state == 0)
+				continue;
+			if (strcmp(items[i].name, "fletcher4") == 0)
+				strcat(command, "-O checksum=fletcher4 ");
+			else if (strcmp(items[i].name, "fletcher2") == 0)
+				strcat(command, "-O checksum=fletcher2 ");
+			else if (strcmp(items[i].name, "sha256") == 0)
+				strcat(command, "-O checksum=sha256 ");
+			else if (strcmp(items[i].name, "atime") == 0)
+				strcat(command, "-O atime=off ");
+		}
 	} else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0) {
 		int i;
 		DIALOG_LISTITEM items[] = {
@@ -329,7 +377,7 @@ gpart_bootcode(struct ggeom *gp)
 }
 
 static void
-gpart_partcode(struct gprovider *pp)
+gpart_partcode(struct gprovider *pp, const char *fstype)
 {
 	struct gconfig *gc;
 	const char *scheme;
@@ -344,7 +392,7 @@ gpart_partcode(struct gprovider *pp)
 	}
 
 	/* Make sure this partition scheme needs partcode on this platform */
-	if (partcode_path(scheme) == NULL)
+	if (partcode_path(scheme, fstype) == NULL)
 		return;
 
 	LIST_FOREACH(gc, &pp->lg_config, lg_config) {
@@ -356,7 +404,7 @@ gpart_partcode(struct gprovider *pp)
 
 	/* Shell out to gpart for partcode for now */
 	sprintf(command, "gpart bootcode -p %s -i %s %s",
-	    partcode_path(scheme), indexstr, pp->lg_geom->lg_name);
+	    partcode_path(scheme, fstype), indexstr, pp->lg_geom->lg_name);
 	if (system(command) != 0) {
 		sprintf(message, "Error installing partcode on partition %s",
 		    pp->lg_name);
@@ -416,15 +464,15 @@ gpart_edit(struct gprovider *pp)
 	const char *errstr, *oldtype, *scheme;
 	struct partition_metadata *md;
 	char sizestr[32];
-	char newfs[64];
+	char newfs[255];
 	intmax_t idx;
 	int hadlabel, choice, junk, nitems;
 	unsigned i;
 
 	DIALOG_FORMITEM items[] = {
 		{0, "Type:", 5, 0, 0, FALSE, "", 11, 0, 12, 15, 0,
-		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-swap)",
-		    FALSE},
+		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-zfs, "
+		    "freebsd-swap)", FALSE},
 		{0, "Size:", 5, 1, 0, FALSE, "", 11, 1, 12, 0, 0,
 		    FALSE, "Partition size. Append K, M, G for kilobytes, "
 		    "megabytes or gigabytes.", FALSE},
@@ -565,6 +613,8 @@ set_default_part_metadata(const char *name, const char *scheme,
     const char *type, const char *mountpoint, const char *newfs)
 {
 	struct partition_metadata *md;
+	char *zpool_name = NULL;
+	int i;
 
 	/* Set part metadata */
 	md = get_part_metadata(name, 1);
@@ -577,8 +627,18 @@ set_default_part_metadata(const char *name, const char *scheme,
 
 		if (newfs != NULL && newfs[0] != '\0') {
 			md->newfs = malloc(strlen(newfs) + strlen(" /dev/") +
-			    strlen(name) + 1);
-			sprintf(md->newfs, "%s /dev/%s", newfs, name);
+			    strlen(mountpoint) + 5 + strlen(name) + 1);
+			if (strcmp("freebsd-zfs", type) == 0) {
+				zpool_name = strdup((strlen(mountpoint) == 1) ?
+				    "root" : &mountpoint[1]);
+				for (i = 0; zpool_name[i] != 0; i++)
+					if (!isalnum(zpool_name[i]))
+						zpool_name[i] = '_';
+				sprintf(md->newfs, "%s %s /dev/%s", newfs,
+				    zpool_name, name);
+			} else {
+				sprintf(md->newfs, "%s /dev/%s", newfs, name);
+			}
 		}
 	}
 
@@ -587,8 +647,9 @@ set_default_part_metadata(const char *name, const char *scheme,
 	if (strcmp(type, bootpart_type(scheme)) == 0)
 		md->bootcode = 1;
 
-	/* VTOC8 needs partcode in UFS partitions */
-	if (strcmp(scheme, "VTOC8") == 0 && strcmp(type, "freebsd-ufs") == 0)
+	/* VTOC8 needs partcode at the start of partitions */
+	if (strcmp(scheme, "VTOC8") == 0 && (strcmp(type, "freebsd-ufs") == 0
+	    || strcmp(type, "freebsd-zfs") == 0))
 		md->bootcode = 1;
 
 	if (mountpoint == NULL || mountpoint[0] == '\0') {
@@ -611,8 +672,13 @@ set_default_part_metadata(const char *name, const char *scheme,
 			free(md->fstab->fs_mntops);
 			free(md->fstab->fs_type);
 		}
-		md->fstab->fs_spec = malloc(strlen(name) + 6);
-		sprintf(md->fstab->fs_spec, "/dev/%s", name);
+		if (strcmp("freebsd-zfs", type) == 0) {
+			md->fstab->fs_spec = strdup(zpool_name);
+		} else {
+			md->fstab->fs_spec = malloc(strlen(name) +
+			    strlen("/dev/") + 1);
+			sprintf(md->fstab->fs_spec, "/dev/%s", name);
+		}
 		md->fstab->fs_file = strdup(mountpoint);
 		/* Get VFS from text after freebsd-, if possible */
 		if (strncmp("freebsd-", type, 8) == 0)
@@ -625,6 +691,10 @@ set_default_part_metadata(const char *name, const char *scheme,
 			md->fstab->fs_type = strdup(FSTAB_SW);
 			md->fstab->fs_freq = 0;
 			md->fstab->fs_passno = 0;
+		} else if (strcmp(type, "freebsd-zfs") == 0) {
+			md->fstab->fs_type = strdup(FSTAB_RW);
+			md->fstab->fs_freq = 0;
+			md->fstab->fs_passno = 0;
 		} else {
 			md->fstab->fs_type = strdup(FSTAB_RW);
 			if (strcmp(mountpoint, "/") == 0) {
@@ -637,6 +707,9 @@ set_default_part_metadata(const char *name, const char *scheme,
 		}
 		md->fstab->fs_mntops = strdup(md->fstab->fs_type);
 	}
+
+	if (zpool_name != NULL)
+		free(zpool_name);
 }
 
 static
@@ -748,7 +821,7 @@ gpart_create(struct gprovider *pp, char *default_type, char *default_size,
 	struct ggeom *geom;
 	const char *errstr, *scheme;
 	char sizestr[32], startstr[32], output[64], *newpartname;
-	char newfs[64], options_fstype[64];
+	char newfs[255], options_fstype[64];
 	intmax_t maxsize, size, sector, firstfree, stripe;
 	uint64_t bytes;
 	int nitems, choice, junk;
@@ -756,8 +829,8 @@ gpart_create(struct gprovider *pp, char *default_type, char *default_size,
 
 	DIALOG_FORMITEM items[] = {
 		{0, "Type:", 5, 0, 0, FALSE, "freebsd-ufs", 11, 0, 12, 15, 0,
-		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-swap)",
-		    FALSE},
+		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-zfs, "
+		    "freebsd-swap)", FALSE},
 		{0, "Size:", 5, 1, 0, FALSE, "", 11, 1, 12, 15, 0,
 		    FALSE, "Partition size. Append K, M, G for kilobytes, "
 		    "megabytes or gigabytes.", FALSE},
@@ -935,6 +1008,20 @@ gpart_create(struct gprovider *pp, char *default_type, char *default_size,
 			goto addpartform;
 	}
 
+	/* If this is the root partition, check that this fs is bootable */
+	if (strcmp(items[2].text, "/") == 0 && !is_fs_bootable(scheme,
+	    items[0].text)) {
+		char message[512];
+		sprintf(message, "This file system (%s) is not bootable "
+		    "on this system. Are you sure you want to proceed?",
+		    items[0].text);
+		dialog_vars.defaultno = TRUE;
+		choice = dialog_yesno("Warning", message, 0, 0);
+		dialog_vars.defaultno = FALSE;
+		if (choice == 1) /* cancel */
+			goto addpartform;
+	}
+
 	/*
 	 * If this is the root partition, and we need a boot partition, ask
 	 * the user to add one.
@@ -1177,12 +1264,22 @@ gpart_commit(struct gmesh *mesh)
 	struct gctl_req *r;
 	const char *errstr;
 	const char *modified;
+	const char *rootfs;
 
 	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
 		if (strcmp(classp->lg_name, "PART") == 0)
 			break;
 	}
 
+	/* Figure out what filesystem / uses */
+	rootfs = "ufs"; /* Assume ufs if nothing else present */
+	TAILQ_FOREACH(md, &part_metadata, metadata) {
+		if (md->fstab != NULL && strcmp(md->fstab->fs_file, "/") == 0) {
+			rootfs = md->fstab->fs_vfstype;
+			break;
+		}
+	}
+
 	if (strcmp(classp->lg_name, "PART") != 0) {
 		dialog_msgbox("Error", "gpart not found!", 0, 0, TRUE);
 		return;
@@ -1222,7 +1319,7 @@ gpart_commit(struct gmesh *mesh)
 					break;
 
 			if (cp == NULL) /* No sub-partitions */
-				gpart_partcode(pp);
+				gpart_partcode(pp, rootfs);
 		}
 
 		r = gctl_get_handle();
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index a304fb83039c..3f7ccd59a1a2 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -31,6 +31,9 @@
 #include <libutil.h>
 #include <inttypes.h>
 
+#include <sys/sysctl.h>
+#include <string.h>
+
 #include <libgeom.h>
 #include <dialog.h>
 #include <dlg_keys.h>
@@ -44,10 +47,16 @@ static char *boot_disk(struct gmesh *mesh);
 static char *wizard_partition(struct gmesh *mesh, const char *disk);
 
 int
-part_wizard(void) {
+part_wizard(const char *fsreq) {
 	int error;
 	struct gmesh mesh;
 	char *disk, *schemeroot;
+	const char *fstype;
+
+	if (fsreq != NULL)
+		fstype = fsreq;
+	else
+		fstype = "ufs";
 
 startwizard:
 	error = geom_gettree(&mesh);
@@ -70,11 +79,11 @@ part_wizard(void) {
 	dlg_put_backtitle();
 	error = geom_gettree(&mesh);
 
-	error = wizard_makeparts(&mesh, schemeroot, 1);
+	error = wizard_makeparts(&mesh, schemeroot, fstype, 1);
 	if (error)
 		goto startwizard;
 	free(schemeroot);
-	
+
 	geom_deletetree(&mesh);
 
 	return (0);
@@ -106,9 +115,9 @@ boot_disk(struct gmesh *mesh)
 			LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
 				desc = type = NULL;
 				LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-					if (strcmp(gc->lg_name, "type") == 0) 
+					if (strcmp(gc->lg_name, "type") == 0)
 						type = gc->lg_val;
-					if (strcmp(gc->lg_name, "descr") == 0) 
+					if (strcmp(gc->lg_name, "descr") == 0)
 						desc = gc->lg_val;
 				}
 
@@ -200,7 +209,7 @@ wizard_partition(struct gmesh *mesh, const char *disk)
 			break;
 
 	if (classp != NULL) {
-		LIST_FOREACH(gpart, &classp->lg_geom, lg_geom) 
+		LIST_FOREACH(gpart, &classp->lg_geom, lg_geom)
 			if (strcmp(gpart->lg_name, disk) == 0)
 				break;
 	}
@@ -282,21 +291,29 @@ wizard_partition(struct gmesh *mesh, const char *disk)
 }
 
 int
-wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive)
+wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, int interactive)
 {
 	struct gmesh submesh;
 	struct gclass *classp;
 	struct ggeom *gp;
 	struct gprovider *pp;
 	intmax_t swapsize, available;
-	char swapsizestr[10], rootsizestr[10];
+	char swapsizestr[10], rootsizestr[10], *fsname;
+	char *fsnames[] = {"freebsd-ufs", "freebsd-zfs"};
 	int retval;
 
+	if (strcmp(fstype, "zfs") == 0) {
+		fsname = fsnames[1];
+	} else {
+		/* default to UFS */
+		fsname = fsnames[0];
+	}
+
 	LIST_FOREACH(classp, &mesh->lg_class, lg_class)
 		if (strcmp(classp->lg_name, "PART") == 0)
 			break;
 
-	LIST_FOREACH(gp, &classp->lg_geom, lg_geom) 
+	LIST_FOREACH(gp, &classp->lg_geom, lg_geom)
 		if (strcmp(gp->lg_name, disk) == 0)
 			break;
 
@@ -331,7 +348,7 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive)
 
 	geom_gettree(&submesh);
 	pp = provider_for_name(&submesh, disk);
-	gpart_create(pp, "freebsd-ufs", rootsizestr, "/", NULL, 0);
+	gpart_create(pp, fsname, rootsizestr, "/", NULL, 0);
 	geom_deletetree(&submesh);
 
 	geom_gettree(&submesh);
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index eff87feaef54..ac3cd8a9c9c0 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -95,7 +95,12 @@ main(int argc, const char **argv)
 	if (strcmp(basename(argv[0]), "autopart") == 0) { /* Guided */
 		prompt = "Please review the disk setup. When complete, press "
 		    "the Finish button.";
-		part_wizard();
+		/* Experimental ZFS autopartition support */
+		if (argc > 1 && strcmp(argv[1], "zfs") == 0) {
+			part_wizard("zfs");
+		} else {
+			part_wizard("ufs");
+		}
 	} else if (strcmp(basename(argv[0]), "scriptedpart") == 0) {
 		error = scripted_editor(argc, argv);
 		prompt = NULL;
@@ -162,7 +167,7 @@ main(int argc, const char **argv)
 			init_fstab_metadata();
 			break;
 		case 4: /* Auto */
-			part_wizard();
+			part_wizard("ufs");
 			break;
 		}
 
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index 32e3a36f374b..b6f725893cbd 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -54,9 +54,10 @@ struct partition_metadata {
 struct partition_metadata *get_part_metadata(const char *name, int create);
 void delete_part_metadata(const char *name);
 
-int part_wizard(void);
+int part_wizard(const char *fstype);
 int scripted_editor(int argc, const char **argv);
-int wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive);
+int wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype,
+    int interactive);
 
 /* gpart operations */
 void gpart_delete(struct gprovider *pp);
@@ -75,9 +76,10 @@ void set_default_part_metadata(const char *name, const char *scheme,
 /* machine-dependent bootability checks */
 const char *default_scheme(void);
 int is_scheme_bootable(const char *scheme);
+int is_fs_bootable(const char *scheme, const char *fs);
 size_t bootpart_size(const char *scheme);
 const char *bootpart_type(const char *scheme);
 const char *bootcode_path(const char *scheme);
-const char *partcode_path(const char *scheme);
+const char *partcode_path(const char *scheme, const char *fs_type);
 
 #endif
diff --git a/usr.sbin/bsdinstall/partedit/partedit_generic.c b/usr.sbin/bsdinstall/partedit/partedit_generic.c
index 8498a78ffcb6..ceee95ad8d56 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_generic.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_generic.c
@@ -50,6 +50,11 @@ is_scheme_bootable(const char *part_type) {
 	return (1);
 }
 
+int
+is_fs_bootable(const char *part_type, const char *fs) {
+	return (1);
+}
+
 /* No clue => no boot partition, bootcode, or partcode */
 
 size_t
@@ -68,7 +73,7 @@ bootcode_path(const char *part_type) {
 }
 	
 const char *
-partcode_path(const char *part_type) {
+partcode_path(const char *part_type, const char *fs_type) {
 	return (NULL);
 }
 
diff --git a/usr.sbin/bsdinstall/partedit/partedit_pc98.c b/usr.sbin/bsdinstall/partedit/partedit_pc98.c
index dd075a1af7f9..8e914eab0ca7 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_pc98.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_pc98.c
@@ -45,6 +45,15 @@ is_scheme_bootable(const char *part_type) {
 	return (0);
 }
 
+int
+is_fs_bootable(const char *part_type, const char *fs)
+{
+	if (strcmp(fs, "freebsd-ufs") == 0)
+		return (1);
+	
+	return (0);
+}
+
 size_t
 bootpart_size(const char *part_type) {
 	/* No boot partition */
@@ -67,7 +76,7 @@ bootcode_path(const char *part_type) {
 }
 	
 const char *
-partcode_path(const char *part_type) {
+partcode_path(const char *part_type, const char *fs_type) {
 	/* No partcode */
 	return (NULL);
 }
diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
index 77c682a6b94d..6a5dbb2fdf3e 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -67,6 +67,15 @@ is_scheme_bootable(const char *part_type) {
 	return (0);
 }
 
+int
+is_fs_bootable(const char *part_type, const char *fs)
+{
+	if (strcmp(fs, "freebsd-ufs") == 0)
+		return (1);
+	
+	return (0);
+}
+
 size_t
 bootpart_size(const char *part_type) {
 	size_t platlen = sizeof(platform);
@@ -100,7 +109,7 @@ bootcode_path(const char *part_type) {
 }
 	
 const char *
-partcode_path(const char *part_type) {
+partcode_path(const char *part_type, const char *fs_type) {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
diff --git a/usr.sbin/bsdinstall/partedit/partedit_sparc64.c b/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
index 8232c550c609..c420f6a4efd9 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
@@ -42,6 +42,15 @@ is_scheme_bootable(const char *part_type) {
 	return (0);
 }
 
+int
+is_fs_bootable(const char *part_type, const char *fs)
+{
+	if (strcmp(fs, "freebsd-ufs") == 0 || strcmp(fs, "freebsd-zfs") == 0)
+		return (1);
+	return (0);
+}
+
+
 size_t
 bootpart_size(const char *part_type) {
 	/* No standalone boot partition */
@@ -58,11 +67,16 @@ const char *
 bootcode_path(const char *part_type) {
 	return (NULL);
 }
-	
+
 const char *
-partcode_path(const char *part_type) {
-	if (strcmp(part_type, "VTOC8") == 0)
-		return ("/boot/boot1");
+partcode_path(const char *part_type, const char *fs_type) {
+	if (strcmp(part_type, "VTOC8") == 0) {
+		if (strcmp(fs_type, "ufs") == 0) {
+			return ("/boot/boot1");
+		} else if (strcmp(fs_type, "zfs") == 0) {
+			return ("/boot/zfsboot");
+		}
+	}
 	return (NULL);
 }
 
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index b458475fe6c6..bd98ac55cf39 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -58,6 +58,21 @@ is_scheme_bootable(const char *part_type) {
 	return (0);
 }
 
+int
+is_fs_bootable(const char *part_type, const char *fs) {
+	size_t platlen = sizeof(platform);
+	if (strlen(platform) == 0)
+		sysctlbyname(platform_sysctl, platform, &platlen, NULL, -1);
+
+	if (strcmp(fs, "freebsd-ufs") == 0)
+		return (1);
+
+	if (strcmp(fs, "freebsd-zfs") == 0 && strcmp(platform, "BIOS") == 0)
+		return (1);
+
+	return (0);
+}
+
 size_t
 bootpart_size(const char *scheme) {
 	size_t platlen = sizeof(platform);
@@ -107,7 +122,7 @@ bootcode_path(const char *part_type) {
 }
 	
 const char *
-partcode_path(const char *part_type) {
+partcode_path(const char *part_type, const char *fs_type) {
 	size_t platlen = sizeof(platform);
 	if (strlen(platform) == 0)
 		sysctlbyname(platform_sysctl, platform, &platlen, NULL, -1);
@@ -115,6 +130,8 @@ partcode_path(const char *part_type) {
 	if (strcmp(part_type, "GPT") == 0) {
 		if (strcmp(platform, "UEFI") == 0)
 			return ("/boot/boot1.efifat");
+		else if (strcmp(fs_type, "zfs") == 0)
+			return ("/boot/gptzfsboot");
 		else
 			return ("/boot/gptboot");
 	}
diff --git a/usr.sbin/bsdinstall/partedit/sade.8 b/usr.sbin/bsdinstall/partedit/sade.8
index 79df079e371b..3bb1c65e4206 100644
--- a/usr.sbin/bsdinstall/partedit/sade.8
+++ b/usr.sbin/bsdinstall/partedit/sade.8
@@ -68,7 +68,5 @@ with the equivalent part of
 .Sh BUGS
 The utility misses a lot of nice features, such as tools for
 manipulating
-.Xr gmirror 8
-or
-.Xr zfs 8 .
+.Xr gmirror 8 .
 These will be added later.
diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
index 4ac34824b090..876df5498ba9 100644
--- a/usr.sbin/bsdinstall/partedit/scripted.c
+++ b/usr.sbin/bsdinstall/partedit/scripted.c
@@ -109,7 +109,7 @@ part_config(char *disk, const char *scheme, char *config)
 
 	/* Create partitions */
 	if (config == NULL) {
-		wizard_makeparts(&mesh, disk, 0);
+		wizard_makeparts(&mesh, disk, "ufs", 0);
 		goto finished;
 	}
 
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index d2ac83ddeaa3..433744e9bb62 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -107,14 +107,14 @@ rm -f $PATH_FSTAB
 touch $PATH_FSTAB
 
 PMODES="\
-Guided \"Partitioning Tool (Recommended for Beginners)\" \
-Manual \"Manually Configure Partitions (Expert)\" \
+\"Auto (UFS)\" \"Guided Disk Setup\" \
+Manual \"Manual Disk Setup (experts)\" \
 Shell \"Open a shell and partition by hand\""
 
 CURARCH=$( uname -m )
 case $CURARCH in
 	amd64|i386)	# Booting ZFS Supported
-		PMODES="$PMODES ZFS \"Automatic Root-on-ZFS (Experimental)\""
+		PMODES="$PMODES \"Auto (ZFS)\" \"Guided Root-on-ZFS\""
 		;;
 	*)		# Booting ZFS Unspported
 		;;
@@ -128,7 +128,7 @@ PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
 exec 3>&-
 
 case "$PARTMODE" in
-"Guided")	# Guided
+"Auto (UFS)")	# Guided
 	bsdinstall autopart || error "Partitioning error"
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;
@@ -146,7 +146,7 @@ case "$PARTMODE" in
 	fi
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;
-"ZFS")	# ZFS
+"Auto (ZFS)")	# ZFS
 	bsdinstall zfsboot || error "ZFS setup failed"
 	bsdinstall mount || error "Failed to mount filesystem"
 	;;
@@ -252,7 +252,8 @@ if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then
 fi
 
 dialog --backtitle "FreeBSD Installer" --title "Manual Configuration" \
-    --yesno "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
+    --default-button no --yesno \
+   "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
 if [ $? -eq 0 ]; then
 	clear
 	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config
index 98baade77535..bc3d723afc3b 100755
--- a/usr.sbin/bsdinstall/scripts/config
+++ b/usr.sbin/bsdinstall/scripts/config
@@ -36,6 +36,7 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
 
 cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
 rm $BSDINSTALL_TMPBOOT/loader.conf.*
+df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
 
 cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
 
diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services
index 54c5018610e2..83786c2868e0 100755
--- a/usr.sbin/bsdinstall/scripts/services
+++ b/usr.sbin/bsdinstall/scripts/services
@@ -43,6 +43,7 @@ DAEMONS=$( dialog --backtitle "FreeBSD Installer" \
     --title "System Configuration" --nocancel --separate-output \
     --checklist "Choose the services you would like to be started at boot:" \
     0 0 0 \
+	local_unbound "Local caching validating resolver" ${local_unbound:-off} \
 	sshd	"Secure shell daemon" ${sshd_enable:-off} \
 	moused	"PS/2 mouse pointer on console" ${moused_enable:-off} \
 	ntpd	"Synchronize system and network time" ${ntpd_enable:-off} \
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 9f1abb8b2f2c..2b01dea09e1c 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -156,7 +156,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
 	/usr/src
 
 	# Create /var and friends
-	/var		mountpoint=/var
+	/var		mountpoint=/var,canmount=off
 	/var/crash	exec=off,setuid=off
 	/var/log	exec=off,setuid=off
 	/var/mail	atime=on
@@ -293,6 +293,7 @@ msg_swap_mirror_help="Mirror swap partitions for redundancy, breaks crash dumps"
 msg_swap_size="Swap Size"
 msg_swap_size_help="Customize how much swap space is allocated to each selected disk"
 msg_these_disks_are_too_small="These disks are too small given the amount of requested\nswap (%s) and/or geli(8) (%s) partitions, which would\ntake 50%% or more of each of the following selected disk\ndevices (not recommended):\n\n  %s\n\nRecommend changing partition size(s) and/or selecting a\ndifferent set of devices."
+msg_uefi_not_supported="The FreeBSD UEFI loader does not currently support booting root-on-ZFS. Your system will need to boot in legacy (CSM) mode.\nDo you want to continue?"
 msg_unable_to_get_disk_capacity="Unable to get disk capacity of \`%s'"
 msg_unsupported_partition_scheme="%s is an unsupported partition scheme"
 msg_user_cancelled="User Cancelled."
@@ -687,6 +688,48 @@ dialog_menu_layout()
 	return $DIALOG_OK
 }
 
+# dialog_uefi_prompt
+#
+# Confirm that the user wants to continue with the installation on a BIOS
+# system when they have booted with UEFI
+#
+dialog_uefi_prompt()
+{
+	local title="$DIALOG_TITLE"
+	local btitle="$DIALOG_BACKTITLE"
+	local prompt # Calculated below
+	local hline="$hline_arrows_tab_enter"
+
+	local height=8 width=50 prefix="   "
+	local plen=${#prefix} list= line=
+	local max_width=$(( $width - 3 - $plen ))
+
+	local yes no defaultno extra_args format
+	if [ "$USE_XDIALOG" ]; then
+		yes=ok no=cancel defaultno=default-no
+		extra_args="--wrap --left"
+		format="$msg_uefi_not_supported"
+	else
+		yes=yes no=no defaultno=defaultno
+		extra_args="--cr-wrap"
+		format="$msg_uefi_not_supported"
+	fi
+
+	# Add height for Xdialog(1)
+	[ "$USE_XDIALOG" ] && height=$(( $height + $height / 5 + 3 ))
+
+	prompt=$( printf "$format" )
+	f_dprintf "%s: UEFI prompt" "$0"
+	$DIALOG \
+		--title "$title"        \
+		--backtitle "$btitle"   \
+		--hline "$hline"        \
+		--$yes-label "$msg_yes" \
+		--$no-label "$msg_no"   \
+		$extra_args             \
+		--yesno "$prompt" $height $width
+}
+
 # zfs_create_diskpart $disk $index
 #
 # For each block device to be used in the zpool, rather than just create the
@@ -1272,8 +1315,6 @@ zfs_create_boot()
 	          "$funcname"
 	f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_enable=\"YES\"' \
 	             $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
-	f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \
-	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 	f_eval_catch $funcname echo "$ECHO_APPEND" \
 	             'kern.geom.label.disk_ident.enable=\"0\"' \
 	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
@@ -1385,6 +1426,21 @@ f_dprintf "BSDINSTALL_CHROOT=[%s]" "$BSDINSTALL_CHROOT"
 f_dprintf "BSDINSTALL_TMPETC=[%s]" "$BSDINSTALL_TMPETC"
 f_dprintf "FSTAB_FMT=[%s]" "$FSTAB_FMT"
 
+#
+# If the system was booted with UEFI, warn the user that FreeBSD can't do
+# ZFS with UEFI yet
+#
+if f_interactive; then
+    bootmethod=$(sysctl -n machdep.bootmethod)
+    f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
+    if [ "$bootmethod" != "BIOS" ]; then
+	dialog_uefi_prompt
+	retval=$?
+	f_dprintf "uefi_prompt=[%s]" "$retval"
+	[ $retval -eq $DIALOG_OK ] || f_die
+    fi
+fi
+
 #
 # Loop over the main menu until we've accomplished what we came here to do
 #
diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8
index f58a760f39d3..1cacf64211a5 100644
--- a/usr.sbin/ctladm/ctladm.8
+++ b/usr.sbin/ctladm/ctladm.8
@@ -34,7 +34,7 @@
 .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2014
+.Dd September 13, 2014
 .Dt CTLADM 8
 .Os
 .Sh NAME
@@ -959,8 +959,19 @@ Setting to "on" allows EXTENDED COPY command sent to this LUN access
 other LUNs on this host, not accessible otherwise.
 This allows to offload copying between different iSCSI targets residing
 on the same host in trusted environments.
+.It Va readcache
+Set to "off", disables read caching for the LUN, if supported by the backend.
+.It Va reordering
+Set to "unrestricted", allows target to process commands with SIMPLE task
+attribute in arbitrary order.  Any data integrity exposures related to
+command sequence order shall be explicitly handled by the application
+client through the selection of appropriate commands and task attributes.
+The default value is "restricted".  It improves data integrity, but may
+introduce some additional delays.
 .It Va unmap
-Set to "on", enables UNMAP support for the LUN.
+Set to "on", enables UNMAP support for the LUN, if supported by the backend.
+.It Va writecache
+Set to "off", disables write caching for the LUN, if supported by the backend.
 .El
 .Pp
 Options specific for block backend:
diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5
index 0c73f64d6bf4..efdbcfb51f71 100644
--- a/usr.sbin/ctld/ctl.conf.5
+++ b/usr.sbin/ctld/ctl.conf.5
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 28, 2014
+.Dd September 14, 2014
 .Dt CTL.CONF 5
 .Os
 .Sh NAME
@@ -46,179 +46,250 @@ The general syntax of the
 .Nm
 file is:
 .Bd -literal -offset indent
-pidfile <path>
+.No pidfile Ar path
 
-auth-group <name> {
-	chap <user> <secret>
-	...
+.No auth-group Ar name No {
+.Dl chap Ar user Ar secret
+.Dl ...
 }
 
-portal-group <name> {
-	listen <address>
-	listen-iser <address>
-	discovery-auth-group <name>
-	...
+.No portal-group Ar name No {
+.Dl listen Ar address
+.Dl listen-iser Ar address
+.Dl discovery-auth-group Ar name
+.Dl ...
 }
 
-target <name> {
-	auth-group <name>
-	portal-group <name>
-	lun <number> {
-		path <path>
-	}
-	...
+.No target Ar name {
+.Dl auth-group Ar name
+.Dl portal-group Ar name
+.Dl lun Ar number No {
+.Dl 	path Ar path
+.Dl }
+.Dl ...
 }
 .Ed
-.Ss global level
-The following statements are available at the global level:
+.Ss Global Context
 .Bl -tag -width indent
-.It Ic auth-group Aq Ar name
-Opens an auth-group section, defining an authentication group,
+.It Ic auth-group Ar name
+Create an
+.Sy auth-group
+configuration context,
+defining a new auth-group,
 which can then be assigned to any number of targets.
-.It Ic debug Aq Ar level
-Specifies debug level.
+.It Ic debug Ar level
+The debug verbosity level.
 The default is 0.
-.It Ic maxproc Aq Ar number
-Specifies limit for concurrently running child processes handling
+.It Ic maxproc Ar number
+The limit for concurrently running child processes handling
 incoming connections.
 The default is 30.
-Setting it to 0 disables the limit.
-.It Ic pidfile Aq Ar path
-Specifies path to pidfile.
+A setting of 0 disables the limit.
+.It Ic pidfile Ar path
+The path to the pidfile.
 The default is
 .Pa /var/run/ctld.pid .
-.It Ic portal-group Aq Ar name
-Opens a portal-group section, defining a portal group,
+.It Ic portal-group Ar name
+Create a
+.Sy portal-group
+configuration context,
+defining a new portal-group,
 which can then be assigned to any number of targets.
-.It Ic target Aq Ar name
-Opens a target configuration section.
-.It Ic timeout Aq Ar seconds
-Specifies timeout for login session, after which the connection
+.It Ic target Ar name
+Create a
+.Sy target
+configuration context, which can contain one or more
+.Sy lun
+contexts.
+.It Ic timeout Ar seconds
+The timeout for login sessions, after which the connection
 will be forcibly terminated.
 The default is 60.
-Setting it to 0 disables the timeout.
+A setting of 0 disables the timeout.
 .El
-.Ss auth-group level
-The following statements are available at the auth-group level:
+.Ss auth-group Context
 .Bl -tag -width indent
-.It Ic auth-type Ao Ar type Ac
-Specifies authentication type.
-Type can be either "none", "deny", "chap", or "chap-mutual".
+
+.It Ic auth-type Ar type
+Sets the authentication type.
+Type can be either
+.Qq Ar none ,
+.Qq Ar deny ,
+.Qq Ar chap ,
+or
+.Qq Ar chap-mutual .
 In most cases it is not necessary to set the type using this clause;
-it is usually used to disable authentication for a given auth-group.
-.It Ic chap Ao Ar user Ac Aq Ar secret
-Specifies CHAP authentication credentials.
-.It Ic chap-mutual Ao Ar user Ac Ao Ar secret Ac Ao Ar mutualuser Ac Aq Ar mutualsecret
-Specifies mutual CHAP authentication credentials.
-Note that for any auth-group, configuration may contain either chap,
-or chap-mutual entries; it is an error to mix them.
-.It Ic initiator-name Ao Ar initiator-name Ac
-Specifies iSCSI initiator name.
+it is usually used to disable authentication for a given
+.Sy auth-group .
+.It Ic chap Ar user Ar secret
+A set of CHAP authentication credentials.
+Note that for any
+.Sy auth-group ,
+the configuration may only contain either
+.Sy chap
+or
+.Sy chap-mutual
+entries; it is an error to mix them.
+.It Ic chap-mutual Ar user Ar secret Ar mutualuser Ar mutualsecret
+A set of mutual CHAP authentication credentials.
+Note that for any
+.Sy auth-group ,
+the configuration may only contain either
+.Sy chap
+or
+.Sy chap-mutual
+entries; it is an error to mix them.
+.It Ic initiator-name Ar initiator-name
+An iSCSI initiator name.
+Only initiators with a name matching one of the defined
+names will be allowed to connect.
 If not defined, there will be no restrictions based on initiator
 name.
-Otherwise, only initiators with names matching one of defined
-ones will be allowed to connect.
-.It Ic initiator-portal Ao Ar address Ac
-Specifies iSCSI initiator portal - IPv4 or IPv6 address or network.
+.It Ic initiator-portal Ar address Ns Op / Ns Ar prefixlen
+An iSCSI initiator portal: an IPv4 or IPv6 address, optionally
+followed by a literal slash and a prefix length.
+Only initiators with an address matching one of the defined
+addresses will be allowed to connect.
 If not defined, there will be no restrictions based on initiator
 address.
-Otherwise, only initiators with addresses matching one of defined
-ones will be allowed to connect.
 .El
-.Ss portal-group level
-The following statements are available at the portal-group level:
+.Ss portal-group Context
 .Bl -tag -width indent
-.It Ic discovery-auth-group Aq Ar name
-Assigns previously defined authentication group to the portal group,
+.It Ic discovery-auth-group Ar name
+Assign a previously defined authentication group to the portal group,
 to be used for target discovery.
 By default, portal groups that do not specify their own auth settings,
-using clauses such as "chap" or "initiator-name", are assigned
-predefined auth-group "default", which denies discovery.
-Another predefined auth-group, "no-authentication", may be used
+using clauses such as
+.Sy chap
+or
+.Sy initiator-name ,
+are assigned
+predefined
+.Sy auth-group
+.Qq Ar default ,
+which denies discovery.
+Another predefined
+.Sy auth-group ,
+.Qq Ar no-authentication ,
+may be used
 to permit discovery without authentication.
-.It Ic listen Aq Ar address
-Specifies IPv4 or IPv6 address and port to listen on for incoming connections.
-.It Ic listen-iser Aq Ar address
-Specifies IPv4 or IPv6 address and port to listen on for incoming connections
+.It Ic listen Ar address
+An IPv4 or IPv6 address and port to listen on for incoming connections.
+.It Ic listen-iser Ar address
+An IPv4 or IPv6 address and port to listen on for incoming connections
 using iSER (iSCSI over RDMA) protocol.
 .El
-.Ss target level:
-The following statements are available at the target level:
+.Ss target Context
 .Bl -tag -width indent
-.It Ic alias Aq Ar text
-Assigns human-readable description to the target.
+.It Ic alias Ar text
+Assign a human-readable description to the target.
 There is no default.
-.It Ic auth-group Aq Ar name
-Assigns previously defined authentication group to the target.
+.It Ic auth-group Ar name
+Assign a previously defined authentication group to the target.
 By default, targets that do not specify their own auth settings,
-using clauses such as "chap" or "initiator-name", are assigned
-predefined auth-group "default", which denies all access.
-Another predefined auth-group, "no-authentication", may be used to permit access
+using clauses such as
+.Sy chap
+or
+.Sy initiator-name ,
+are assigned
+predefined
+.Sy auth-group
+.Qq Ar default ,
+which denies all access.
+Another predefined
+.Sy auth-group ,
+.Qq Ar no-authentication ,
+may be used to permit access
 without authentication.
-.It Ic auth-type Ao Ar type Ac
-Specifies authentication type.
-Type can be either "none", "deny", "chap", or "chap-mutual".
+Note that targets must only use one of
+.Sy auth-group , chap , No or Sy chap-mutual ;
+it is a configuration error to mix multiple types in one target.
+.It Ic auth-type Ar type
+Sets the authentication type.
+Type can be either
+.Qq Ar none ,
+.Qq Ar deny ,
+.Qq Ar chap ,
+or
+.Qq Ar chap-mutual .
 In most cases it is not necessary to set the type using this clause;
-it is usually used to disable authentication for a given target.
-This clause is mutually exclusive with auth-group; one cannot use
+it is usually used to disable authentication for a given
+.Sy target .
+This clause is mutually exclusive with
+.Sy auth-group ;
+one cannot use
 both in a single target.
-.It Ic chap Ao Ar user Ac Aq Ar secret
-Specifies CHAP authentication credentials.
-Note that targets must use either auth-group, or chap,
-or chap-mutual clauses; it is a configuration error to mix them in one target.
-.It Ic chap-mutual Ao Ar user Ac Ao Ar secret Ac Ao Ar mutualuser Ac Aq Ar mutualsecret
-Specifies mutual CHAP authentication credentials.
-Note that targets must use either auth-group, chap, or
-chap-mutual clauses; it is a configuration error to mix them in one target.
-.It Ic initiator-name Ao Ar initiator-name Ac
-Specifies iSCSI initiator name.
+.It Ic chap Ar user Ar secret
+A set of CHAP authentication credentials.
+Note that targets must only use one of
+.Sy auth-group , chap , No or Sy chap-mutual ;
+it is a configuration error to mix multiple types in one target.
+.It Ic chap-mutual Ar user Ar secret Ar mutualuser Ar mutualsecret
+A set of mutual CHAP authentication credentials.
+Note that targets must only use one of
+.Sy auth-group , chap , No or Sy chap-mutual ;
+it is a configuration error to mix multiple types in one target.
+.It Ic initiator-name Ar initiator-name
+An iSCSI initiator name.
+Only initiators with a name matching one of the defined
+names will be allowed to connect.
 If not defined, there will be no restrictions based on initiator
 name.
-Otherwise, only initiators with names matching one of defined
-ones will be allowed to connect.
-This clause is mutually exclusive with auth-group; one cannot use
+This clause is mutually exclusive with
+.Sy auth-group ;
+one cannot use
 both in a single target.
-.It Ic initiator-portal Ao Ar address Ac
-Specifies iSCSI initiator portal - IPv4 or IPv6 address.
+.It Ic initiator-portal Ar address Ns Op / Ns Ar prefixlen
+An iSCSI initiator portal: an IPv4 or IPv6 address, optionally
+followed by a literal slash and a prefix length.
+Only initiators with an address matching one of the defined
+addresses will be allowed to connect.
 If not defined, there will be no restrictions based on initiator
 address.
-Otherwise, only initiators with addresses matching one of defined
-ones will be allowed to connect.
-This clause is mutually exclusive with auth-group; one cannot use
+This clause is mutually exclusive with
+.Sy auth-group ;
+one cannot use
 both in a single target.
-.It Ic portal-group Aq Ar name
-Assigns previously defined portal group to the target.
-Default portal group is "default", which makes the target available
+.It Ic portal-group Ar name
+Assign a previously defined portal group to the target.
+The default portal group is
+.Qq Ar default ,
+which makes the target available
 on TCP port 3260 on all configured IPv4 and IPv6 addresses.
-.It Ic lun Aq Ar number
-Opens a lun configuration section, defining LUN exported by a target.
+.It Ic lun Ar number
+Create a
+.Sy lun
+configuration context, defining a LUN exported by the parent target.
 .El
-.Ss lun level
-The following statements are available at the lun level:
+.Ss lun Context
 .Bl -tag -width indent
-.It Ic backend Ao Ar block | Ar ramdisk Ac
-Specifies the CTL backend to use for a given LUN.
+.It Ic backend Ar block No | Ar ramdisk
+The CTL backend to use for a given LUN.
 Valid choices are
-.Dq block
+.Qq Ar block
 and
-.Dq ramdisk ;
+.Qq Ar ramdisk ;
 block is used for LUNs backed
 by files or disk device nodes; ramdisk is a bitsink device, used mostly for
 testing.
 The default backend is block.
-.It Ic blocksize Aq Ar size
-Specifies blocksize visible to the initiator.
+.It Ic blocksize Ar size
+The blocksize visible to the initiator.
 The default blocksize is 512.
-.It Ic device-id Aq Ar string
-Specifies SCSI Device Identification string presented to the initiator.
-.It Ic option Ao Ar name Ac Aq Ar value
-Specifies CTL-specific options passed to the kernel.
-.It Ic path Aq Ar path
-Specifies path to file or device node used to back the LUN.
-.It Ic serial Aq Ar string
-Specifies SCSI serial number presented to the initiator.
-.It Ic size Aq Ar size
-Specifies LUN size, in bytes.
+.It Ic device-id Ar string
+The SCSI Device Identification string presented to the initiator.
+.It Ic option Ar name Ar value
+The CTL-specific options passed to the kernel.
+All CTL-specific options are documented in the
+.Sx OPTIONS
+section of
+.Xr ctladm 8 .
+.It Ic path Ar path
+The path to the file or device node used to back the LUN.
+.It Ic serial Ar string
+The SCSI serial number presented to the initiator.
+.It Ic size Ar size
+The LUN size, in bytes.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /etc/ctl.conf" -compact
@@ -234,6 +305,7 @@ pidfile	/var/run/ctld.pid
 auth-group example2 {
 	chap-mutual "user" "secret" "mutualuser" "mutualsecret"
 	chap-mutual "user2" "secret2" "mutualuser" "mutualsecret"
+	initiator-portal 192.168.1.1/16
 }
 
 portal-group example2 {
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index c1593c2439b4..e4c2eda0fcf7 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -561,8 +561,10 @@ portal_new(struct portal_group *pg)
 static void
 portal_delete(struct portal *portal)
 {
+
 	TAILQ_REMOVE(&portal->p_portal_group->pg_portals, portal, p_next);
-	freeaddrinfo(portal->p_ai);
+	if (portal->p_ai != NULL)
+		freeaddrinfo(portal->p_ai);
 	free(portal->p_listen);
 	free(portal);
 }
@@ -633,8 +635,7 @@ portal_group_add_listen(struct portal_group *pg, const char *value, bool iser)
 	arg = portal->p_listen;
 	if (arg[0] == '\0') {
 		log_warnx("empty listen address");
-		free(portal->p_listen);
-		free(portal);
+		portal_delete(portal);
 		return (1);
 	}
 	if (arg[0] == '[') {
@@ -646,8 +647,7 @@ portal_group_add_listen(struct portal_group *pg, const char *value, bool iser)
 		if (arg == NULL) {
 			log_warnx("invalid listen address %s",
 			    portal->p_listen);
-			free(portal->p_listen);
-			free(portal);
+			portal_delete(portal);
 			return (1);
 		}
 		if (arg[0] == '\0') {
@@ -657,8 +657,7 @@ portal_group_add_listen(struct portal_group *pg, const char *value, bool iser)
 		} else {
 			log_warnx("invalid listen address %s",
 			    portal->p_listen);
-			free(portal->p_listen);
-			free(portal);
+			portal_delete(portal);
 			return (1);
 		}
 	} else {
@@ -691,8 +690,7 @@ portal_group_add_listen(struct portal_group *pg, const char *value, bool iser)
 	if (error != 0) {
 		log_warnx("getaddrinfo for %s failed: %s",
 		    portal->p_listen, gai_strerror(error));
-		free(portal->p_listen);
-		free(portal);
+		portal_delete(portal);
 		return (1);
 	}
 
@@ -1415,7 +1413,8 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 			if (oldtarg != NULL) {
 				oldlun = lun_find(oldtarg, newlun->l_lun);
 				if (oldlun != NULL) {
-					if (newlun->l_size != oldlun->l_size) {
+					if (newlun->l_size != oldlun->l_size ||
+					    newlun->l_size == 0) {
 						log_debugx("resizing lun %d, "
 						    "target %s, CTL lun %d",
 						    newlun->l_lun,
@@ -1760,9 +1759,7 @@ main_loop(struct conf *conf, bool dont_fork)
 			client_salen = sizeof(client_sa);
 			kernel_accept(&connection_id, &portal_id,
 			    (struct sockaddr *)&client_sa, &client_salen);
-			if (client_salen < client_sa.ss_len)
-				log_errx(1, "salen %u < %u",
-				    client_salen, client_sa.ss_len);
+			assert(client_salen >= client_sa.ss_len);
 
 			log_debugx("incoming connection, id %d, portal id %d",
 			    connection_id, portal_id);
@@ -1806,10 +1803,8 @@ main_loop(struct conf *conf, bool dont_fork)
 					    &client_salen);
 					if (client_fd < 0)
 						log_err(1, "accept");
-					if (client_salen < client_sa.ss_len)
-						log_errx(1, "salen %u < %u",
-						    client_salen,
-						    client_sa.ss_len);
+					assert(client_salen >= client_sa.ss_len);
+
 					handle_connection(portal, client_fd,
 					    (struct sockaddr *)&client_sa,
 					    dont_fork);
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index ea4b05483db1..209582bed99e 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -806,6 +806,16 @@ login_negotiate(struct connection *conn, struct pdu *request)
 	login_set_csg(response, BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
 	login_set_nsg(response, BHSLR_STAGE_FULL_FEATURE_PHASE);
 	response_keys = keys_new();
+
+	if (skipped_security &&
+	    conn->conn_session_type == CONN_SESSION_TYPE_NORMAL) {
+		if (conn->conn_target->t_alias != NULL)
+			keys_add(response_keys,
+			    "TargetAlias", conn->conn_target->t_alias);
+		keys_add_int(response_keys, "TargetPortalGroupTag", 
+		    conn->conn_portal->p_portal_group->pg_tag);
+	}
+
 	for (i = 0; i < KEYS_MAX; i++) {
 		if (request_keys->keys_names[i] == NULL)
 			break;
@@ -836,8 +846,6 @@ login(struct connection *conn)
 	struct auth_group *ag;
 	const char *initiator_name, *initiator_alias, *session_type,
 	    *target_name, *auth_method;
-	char *portal_group_tag;
-	int rv;
 
 	/*
 	 * Handle the initial Login Request - figure out required authentication
@@ -1016,13 +1024,8 @@ login(struct connection *conn)
 			if (conn->conn_target->t_alias != NULL)
 				keys_add(response_keys,
 				    "TargetAlias", conn->conn_target->t_alias);
-			rv = asprintf(&portal_group_tag, "%d",
+			keys_add_int(response_keys, "TargetPortalGroupTag", 
 			    conn->conn_portal->p_portal_group->pg_tag);
-			if (rv <= 0)
-				log_err(1, "asprintf");
-			keys_add(response_keys,
-			    "TargetPortalGroupTag", portal_group_tag);
-			free(portal_group_tag);
 		}
 		keys_save(response_keys, response);
 		pdu_send(response);
@@ -1069,16 +1072,11 @@ login(struct connection *conn)
 	response_keys = keys_new();
 	keys_add(response_keys, "AuthMethod", "CHAP");
 	if (conn->conn_session_type == CONN_SESSION_TYPE_NORMAL) {
-		rv = asprintf(&portal_group_tag, "%d",
-		    conn->conn_portal->p_portal_group->pg_tag);
-		if (rv <= 0)
-			log_err(1, "asprintf");
-		keys_add(response_keys,
-		    "TargetPortalGroupTag", portal_group_tag);
-		free(portal_group_tag);
 		if (conn->conn_target->t_alias != NULL)
 			keys_add(response_keys,
 			    "TargetAlias", conn->conn_target->t_alias);
+		keys_add_int(response_keys, "TargetPortalGroupTag", 
+		    conn->conn_portal->p_portal_group->pg_tag);
 	}
 	keys_save(response_keys, response);
 
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index c1f4d8f18dfb..c66b0c11bc00 100644
--- a/usr.sbin/fdread/fdutil.c
+++ b/usr.sbin/fdread/fdutil.c
@@ -92,6 +92,7 @@ static struct fd_type fd_types_auto[1] =
 
 
 static struct fd_type fd_types_288m[] = {
+#ifndef PC98
 #if 0
 	{ FDF_3_2880 },
 #endif
@@ -102,30 +103,18 @@ static struct fd_type fd_types_288m[] = {
 	{ FDF_3_820 },
 	{ FDF_3_800 },
 	{ FDF_3_720 },
+#endif	/* !PC98 */
 	{ 0,0,0,0,0,0,0,0,0,0,0,0 }
 };
 
 static struct fd_type fd_types_144m[] = {
 #ifdef PC98
-#if 0
-	{ FDF_3_1722 },
-	{ FDF_3_1476 },
-#endif
 	{ FDF_3_1440 },
 	{ FDF_3_1200 },
-#if 0
-	{ FDF_3_820 },
-	{ FDF_3_800 },
-#endif
 	{ FDF_3_720 },
 	{ FDF_3_360 },
 	{ FDF_3_640 },
 	{ FDF_3_1230 },
-#if 0
-	{ FDF_3_1280 },
-	{ FDF_3_1480 },
-	{ FDF_3_1640 },
-#endif
 	{ 0,0,0,0,0,0,0,0,0,0,0,0 }
 #else
 	{ FDF_3_1722 },
@@ -142,17 +131,10 @@ static struct fd_type fd_types_144m[] = {
 static struct fd_type fd_types_12m[] = {
 #ifdef PC98
 	{ FDF_5_1200 },
-#if 0
-	{ FDF_5_820 },
-	{ FDF_5_800 },
-#endif
 	{ FDF_5_720 },
 	{ FDF_5_360 },
 	{ FDF_5_640 },
 	{ FDF_5_1230 },
-#if 0
-	{ FDF_5_1280 },
-#endif
 	{ 0,0,0,0,0,0,0,0,0,0,0,0 }
 #else
 	{ FDF_5_1200 },
@@ -170,13 +152,17 @@ static struct fd_type fd_types_12m[] = {
 
 static struct fd_type fd_types_720k[] =
 {
+#ifndef PC98
 	{ FDF_3_720 },
+#endif
 	{ 0,0,0,0,0,0,0,0,0,0,0,0 }
 };
 
 static struct fd_type fd_types_360k[] =
 {
+#ifndef PC98
 	{ FDF_5_360 },
+#endif
 	{ 0,0,0,0,0,0,0,0,0,0,0,0 }
 };
 
diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile
new file mode 100644
index 000000000000..c11b3417c191
--- /dev/null
+++ b/usr.sbin/hyperv/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+SUBDIR = tools 
+
+.include <bsd.subdir.mk>
diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/usr.sbin/hyperv/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/usr.sbin/hyperv/tools/Makefile b/usr.sbin/hyperv/tools/Makefile
new file mode 100644
index 000000000000..3cfc0013cf59
--- /dev/null
+++ b/usr.sbin/hyperv/tools/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/tools
+.PATH: ${HV_KVP_DAEMON_DISTDIR} 
+
+PROG= 	hv_kvp_daemon
+MAN= 	hv_kvp_daemon.8	
+
+CFLAGS+=	-I${.CURDIR}/../../../sys/dev/hyperv/utilities
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/iscsid/iscsid.8 b/usr.sbin/iscsid/iscsid.8
index fbfc55d72c2c..851771804974 100644
--- a/usr.sbin/iscsid/iscsid.8
+++ b/usr.sbin/iscsid/iscsid.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 20, 2012
+.Dd September 12, 2014
 .Dt ISCSID 8
 .Os
 .Sh NAME
@@ -49,12 +49,13 @@ as well as performing SendTargets discovery.
 Upon startup, the
 .Nm
 daemon opens the iSCSI initiator device file and waits for kernel requests.
-It doesn't use any configuration file; all the information it needs it gets
-from the kernel.
+.Nm
+does not use any configuration files.
+All needed information is supplied by the kernel.
 .Pp
 When the
 .Nm
-damon is not running, already established iSCSI connections continue
+daemon is not running, already established iSCSI connections continue
 to work.
 However, establishing new connections, or recovering existing ones in case
 of connection error, is not possible.
@@ -99,6 +100,7 @@ The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
+.Xr iscsi 4 ,
 .Xr iscsictl 8
 .Sh HISTORY
 The
@@ -108,6 +110,6 @@ command appeared in
 .Sh AUTHORS
 The
 .Nm
-was developed by
+utility was developed by
 .An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index 3391f906d258..c0bef632292f 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -213,6 +213,7 @@ login_handle_redirection(struct connection *conn, struct pdu *response)
 
 	log_debugx("received redirection to \"%s\"", target_address);
 	kernel_modify(conn, target_address);
+	keys_delete(response_keys);
 }
 
 static struct pdu *
@@ -574,7 +575,7 @@ login_negotiate(struct connection *conn)
 	struct pdu *request, *response;
 	struct keys *request_keys, *response_keys;
 	struct iscsi_bhs_login_response *bhslr;
-	int i;
+	int i, nrequests = 0;
 
 	log_debugx("beginning operational parameter negotiation");
 	request = login_new_request(conn, BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
@@ -628,19 +629,41 @@ login_negotiate(struct connection *conn)
 		    response_keys->keys_names[i], response_keys->keys_values[i]);
 	}
 
-	bhslr = (struct iscsi_bhs_login_response *)response->pdu_bhs;
-	if ((bhslr->bhslr_flags & BHSLR_FLAGS_TRANSIT) == 0)
-		log_warnx("received final login response "
-		    "without the \"T\" flag");
-	else if (login_nsg(response) != BHSLR_STAGE_FULL_FEATURE_PHASE)
+	keys_delete(response_keys);
+	response_keys = NULL;
+
+	for (;;) {
+		bhslr = (struct iscsi_bhs_login_response *)response->pdu_bhs;
+		if ((bhslr->bhslr_flags & BHSLR_FLAGS_TRANSIT) != 0)
+			break;
+
+		nrequests++;
+		if (nrequests > 5) {
+			log_warnx("received login response "
+			    "without the \"T\" flag too many times; giving up");
+			break;
+		}
+
+		log_debugx("received login response "
+		    "without the \"T\" flag; sending another request");
+
+		pdu_delete(response);
+
+		request = login_new_request(conn,
+		    BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
+		pdu_send(request);
+		pdu_delete(request);
+
+		response = login_receive(conn);
+	}
+
+	if (login_nsg(response) != BHSLR_STAGE_FULL_FEATURE_PHASE)
 		log_warnx("received final login response with wrong NSG 0x%x",
 		    login_nsg(response));
+	pdu_delete(response);
 
 	log_debugx("operational parameter negotiation done; "
 	    "transitioning to Full Feature phase");
-
-	keys_delete(response_keys);
-	pdu_delete(response);
 }
 
 static void
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 9771498acb3d..06ea1b03b236 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -176,7 +176,7 @@ printjob(struct printer *pp)
 	}
 	if(setgid(getegid()) != 0) err(1, "setgid() failed");
 	printpid = getpid();			/* for use with lprm */
-	setpgrp(0, printpid);
+	setpgid((pid_t)0, printpid);
 
 	/*
 	 * At initial lpd startup, printjob may be called with various
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 92d5508f5d24..9fd87ae6ba5e 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -361,7 +361,8 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts)
 	if (ffs_opts->avgfpdir == -1)
 		ffs_opts->avgfpdir = AFPDIR;
 
-	if (roundup(fsopts->minsize, ffs_opts->bsize) > fsopts->maxsize)
+	if (fsopts->maxsize > 0 &&
+	    roundup(fsopts->minsize, ffs_opts->bsize) > fsopts->maxsize)
 		errx(1, "`%s' minsize of %lld rounded up to ffs bsize of %d "
 		    "exceeds maxsize %lld.  Lower bsize, or round the minimum "
 		    "and maximum sizes to bsize.", dir,
diff --git a/usr.sbin/mfiutil/mfi_properties.c b/usr.sbin/mfiutil/mfi_properties.c
index c9c9204d5004..b03d522c3b9b 100644
--- a/usr.sbin/mfiutil/mfi_properties.c
+++ b/usr.sbin/mfiutil/mfi_properties.c
@@ -68,7 +68,7 @@ mfi_ctrl_set_properties(int fd, struct mfi_ctrl_props *info)
 static int
 mfi_ctrl_rebuild_rate(int ac, char **av)
 {
-        int error, fd;
+	int error, fd;
 	struct mfi_ctrl_props ctrl_props;
 
 	if (ac > 2) {
@@ -76,40 +76,40 @@ mfi_ctrl_rebuild_rate(int ac, char **av)
 		return(-1);
 	}
 		
-        fd = mfi_open(mfi_unit, O_RDWR);
-        if (fd < 0) {
-                error = errno;
-                warn("mfi_open");
-                return (error);
-        }
+	fd = mfi_open(mfi_unit, O_RDWR);
+	if (fd < 0) {
+		error = errno;
+		warn("mfi_open");
+		return (error);
+	}
 
 	error = mfi_ctrl_get_properties(fd, &ctrl_props);
-        if ( error < 0) {
-                error = errno;
-                warn("Failed to get controller properties");
-                close(fd);
-                return (error);
-        }
+	if ( error < 0) {
+		error = errno;
+		warn("Failed to get controller properties");
+		close(fd);
+		return (error);
+	}
 	/*
 	 * User requested a change to the rebuild rate
 	 */
 	if (ac > 1) {
 		ctrl_props.rebuild_rate = atoi(av[ac - 1]);
 		error = mfi_ctrl_set_properties(fd, &ctrl_props);
-        	if ( error < 0) {
-                	error = errno;
-                	warn("Failed to set controller properties");
-                	close(fd);
-                	return (error);
-        	}
+		if ( error < 0) {
+			error = errno;
+			warn("Failed to set controller properties");
+			close(fd);
+			return (error);
+		}
 
 		error = mfi_ctrl_get_properties(fd, &ctrl_props);
-        	if ( error < 0) {
-                	error = errno;
-                	warn("Failed to get controller properties");
-                	close(fd);
-                	return (error);
-        	}
+		if ( error < 0) {
+			error = errno;
+			warn("Failed to get controller properties");
+			close(fd);
+			return (error);
+		}
 	}
 	printf ("controller rebuild rate: %%%u \n",
 		ctrl_props.rebuild_rate);
@@ -120,7 +120,7 @@ MFI_COMMAND(ctrlprop, rebuild, mfi_ctrl_rebuild_rate);
 static int
 mfi_ctrl_alarm_enable(int ac, char **av)
 {
-        int error, fd;
+	int error, fd;
 	struct mfi_ctrl_props ctrl_props;
 
 	if (ac > 2) {
@@ -128,40 +128,40 @@ mfi_ctrl_alarm_enable(int ac, char **av)
 		return(-1);
 	}
 		
-        fd = mfi_open(mfi_unit, O_RDWR);
-        if (fd < 0) {
-                error = errno;
-                warn("mfi_open");
-                return (error);
-        }
+	fd = mfi_open(mfi_unit, O_RDWR);
+	if (fd < 0) {
+		error = errno;
+		warn("mfi_open");
+		return (error);
+	}
 
 	error = mfi_ctrl_get_properties(fd, &ctrl_props);
-        if ( error < 0) {
-                error = errno;
-                warn("Failed to get controller properties");
-                close(fd);
-                return (error);
-        }
+	if ( error < 0) {
+		error = errno;
+		warn("Failed to get controller properties");
+		close(fd);
+		return (error);
+	}
 	printf ("controller alarm was : %s\n",
 		(ctrl_props.alarm_enable ? "enabled" : "disabled"));
 
 	if (ac > 1) {
 		ctrl_props.alarm_enable = atoi(av[ac - 1]);
 		error = mfi_ctrl_set_properties(fd, &ctrl_props);
-        	if ( error < 0) {
-                	error = errno;
-                	warn("Failed to set controller properties");
-                	close(fd);
-                	return (error);
-        	}
+		if ( error < 0) {
+			error = errno;
+			warn("Failed to set controller properties");
+			close(fd);
+			return (error);
+		}
 
 		error = mfi_ctrl_get_properties(fd, &ctrl_props);
-        	if ( error < 0) {
-                	error = errno;
-                	warn("Failed to get controller properties");
-                	close(fd);
-                	return (error);
-        	}
+		if ( error < 0) {
+			error = errno;
+			warn("Failed to get controller properties");
+			close(fd);
+			return (error);
+		}
 	}
 	printf ("controller alarm was : %s\n",
 		(ctrl_props.alarm_enable ? "enabled" : "disabled"));
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index e73815aaac35..1ceb52eeb6f5 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -17,6 +17,6 @@ LDADD=	-lmd
 CLEANFILES+=	fmtree.8
 
 fmtree.8: mtree.8
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index e6d79a468ef8..ba3db8a1f200 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -17,7 +17,7 @@
 .\" the suitability of this software for any purpose.  It is
 .\" provided "as is" without express or implied warranty.
 .\"
-.Dd May 19, 2014
+.Dd September 23, 2014
 .Dt NEWSYSLOG 8
 .Os
 .Sh NAME
@@ -156,6 +156,7 @@ will create the
 .Dq rotated
 logfiles using the specified time format instead of the default
 sequential filenames.
+The filename used will be kept until it is deleted.
 The time format is described in the
 .Xr strftime 3
 manual page.
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index eae0b879aa5b..8c5acf901d1c 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -11,4 +11,10 @@ WARNS?=	2
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil
 
+.include <src.opts.mk>
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
new file mode 100644
index 000000000000..577ea9323919
--- /dev/null
+++ b/usr.sbin/pw/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/pw
+
+ATF_TESTS_SH=	pw_delete
+
+FILES=		group helper_functions.shin master.passwd
+FILESDIR=       ${TESTSDIR}
+
+.include <bsd.test.mk>
diff --git a/usr.sbin/pw/tests/group b/usr.sbin/pw/tests/group
new file mode 100644
index 000000000000..620c588faa38
--- /dev/null
+++ b/usr.sbin/pw/tests/group
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+wheel:*:0:root
diff --git a/usr.sbin/pw/tests/helper_functions.shin b/usr.sbin/pw/tests/helper_functions.shin
new file mode 100755
index 000000000000..f87b1e7d9436
--- /dev/null
+++ b/usr.sbin/pw/tests/helper_functions.shin
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+# Workdir to run tests in
+TESTDIR=$(atf_get_srcdir)
+
+# Populate the files pw needs to use into $HOME/etc
+populate_etc_skel() {
+	cp ${TESTDIR}/master.passwd ${HOME} || \
+		atf_fail "Populating master.passwd in ${HOME}"
+	cp ${TESTDIR}/group ${HOME} || atf_fail "Populating group in ${HOME}"
+
+	# Generate the passwd file
+	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+		atf_fail "generate passwd from master.passwd"
+}
diff --git a/usr.sbin/pw/tests/master.passwd b/usr.sbin/pw/tests/master.passwd
new file mode 100644
index 000000000000..f7dc837dabca
--- /dev/null
+++ b/usr.sbin/pw/tests/master.passwd
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+root:*:0:0::0:0:Charlie &:/root:/bin/csh
+toor:*:0:0::0:0:Bourne-again Superuser:/root:
diff --git a/usr.sbin/pw/tests/pw_delete.sh b/usr.sbin/pw/tests/pw_delete.sh
new file mode 100755
index 000000000000..06366294bd4b
--- /dev/null
+++ b/usr.sbin/pw/tests/pw_delete.sh
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test that a user can be deleted when another user is part of this
+# user's default group and does not go into an infinate loop.
+# PR: 191427
+atf_test_case rmuser_seperate_group cleanup
+rmuser_seperate_group_head() {
+	atf_set "timeout" "30"
+}
+rmuser_seperate_group_body() {
+	populate_etc_skel
+	pw -V ${HOME} useradd test || atf_fail "Creating test user"
+	pw -V ${HOME} groupmod test -M 'test,root' || \
+		atf_fail "Modifying the group"
+	pw -V ${HOME} userdel test || atf_fail "delete the user"
+}
+
+
+atf_init_test_cases() {
+	atf_add_test_case rmuser_seperate_group
+}
diff --git a/usr.sbin/unbound/local-setup/local-unbound-setup.sh b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
index 837cf9a19148..a16e6d05a656 100755
--- a/usr.sbin/unbound/local-setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
@@ -178,7 +178,7 @@ gen_forward_conf() {
 	echo "forward-zone:"
 	echo "        name: ."
 	for forwarder ; do
-		if expr "${forwarder}" : "^[0-9:.]\{1,\}$" >/dev/null ; then
+		if expr "${forwarder}" : "^[0-9A-Fa-f:.]\{1,\}$" >/dev/null ; then
 			echo "        forward-addr: ${forwarder}"
 		else
 			echo "        forward-host: ${forwarder}"